From 68f7ca23fba6ece31024cb2a485d70a867de279f Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
Date: Tue, 18 Jun 2024 22:10:25 +0200
Subject: [PATCH] bcm27xx: drop kernel 6.1 support
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

kernel 6.1 can be dropped since 6.6 is the default kernel.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 target/linux/bcm27xx/bcm2708/config-6.1       |   394 -
 target/linux/bcm27xx/bcm2709/config-6.1       |   496 -
 target/linux/bcm27xx/bcm2710/config-6.1       |   482 -
 target/linux/bcm27xx/bcm2711/config-6.1       |   490 -
 target/linux/bcm27xx/bcm2712/config-6.1       |   615 -
 target/linux/bcm27xx/image/Makefile           |    18 +-
 ...-interface-in-mode6-for-18-bit-color.patch |    32 -
 ...-as-an-acceptable-node-for-dma-range.patch |    27 -
 ...-the-2711-HVS-as-a-suitable-DMA-node.patch |    24 -
 ...he-default-DPI-format-to-being-18bpp.patch |    34 -
 ...-fixup-modes-that-haven-t-been-reset.patch |    24 -
 ...06-drm-vc4-Fix-timings-for-VEC-modes.patch |   127 -
 ...drm-vc4-Fix-definition-of-PAL-M-mode.patch |    77 -
 ...support-for-more-analog-TV-standards.patch |   148 -
 ...tting-the-TV-norm-via-module-paramet.patch |   143 -
 ...drm-vc4-Refactor-mode-checking-logic.patch |    82 -
 ...0-0011-drm-vc4-Add-firmware-kms-mode.patch |  2476 -
 ...vc4-Add-support-for-gamma-on-BCM2711.patch |   276 -
 ...gfs-node-that-dumps-the-vc5-gamma-PW.patch |   122 -
 ...vs-Force-modeset-on-gamma-lut-change.patch |   105 -
 ...C-modeline-requirements-and-add-prog.patch |   149 -
 ...-progressive-modes-readily-accessibl.patch |   165 -
 ...r-the-gamma-lut-has-changed-before-u.patch |    30 -
 ...nable-gamma-block-only-when-required.patch |    66 -
 ...m-vc4-Only-add-gamma-properties-once.patch |    26 -
 ...4-Validate-the-size-of-the-gamma_lut.patch |    32 -
 ...Gamma-control-on-HVS5-due-to-issues-.patch |    36 -
 ...-Broadcast-RGB-property-to-allow-ove.patch |   223 -
 ...d-DRM-210101010-RGB-formats-for-hvs5.patch |    51 -
 ...ort-DPI-interface-in-mode3-for-RGB56.patch |    31 -
 ...d-initialise-an-orientation-field-to.patch |    89 -
 ...-the-meaning-and-spec-references-for.patch |    76 -
 ...762-Ignore-EPROBE_DEFER-when-logging.patch |    25 -
 ...-drm-vc4-Rename-bridge-to-out_bridge.patch |    56 -
 ...I-initialisation-to-encoder_mode_set.patch |    64 -
 ...plitting-the-bridge-chain-from-the-d.patch |   118 -
 ...vc4_dsi-to-use-atomic-enable-disable.patch |    84 -
 ...vc4_dsi-to-using-a-bridge-instead-of.patch |   266 -
 ...ntry-to-ULPS-from-vc4_dsi-post_disab.patch |    32 -
 ...epare_upstream_first-flag-to-drm_pan.patch |    49 -
 ...ude-drm_connector.h-from-drm_panel.h.patch |    36 -
 ...-the-pre_enable_upstream_first-flag-.patch |    25 -
 ...8-drm-vc4-Support-zpos-on-all-planes.patch |   144 -
 ...-CSC-for-BT601-709-2020-limited-and-.patch |   301 -
 ...e-Keep-fractional-source-coords-insi.patch |   212 -
 ...ractional-coordinates-using-the-phas.patch |   105 -
 ...042-drm-Add-chroma-siting-properties.patch |   170 -
 ...-Make-use-of-chroma-siting-parameter.patch |    60 -
 ...igger-of-dlist-update-on-margins-cha.patch |    58 -
 ...rs-remove-legacy_cursor_update-hacks.patch |   121 -
 ...ce-a-modeset-when-Broadcast-RGB-sett.patch |    33 -
 ...argins-are-updated-update-all-planes.patch |    60 -
 ...gnore-atomic_flush-if-we-re-disabled.patch |    27 -
 ...alid-value-for-pixel_order_hvs5-so-f.patch |   118 -
 ...el_order-from-the-hvs_format-for-hvs.patch |    54 -
 ...-2-and-4-4-4-4-RGB-RGBX-RGBA-formats.patch |   104 -
 ...ents-for-which-HVS_PIXEL_ORDER_xxx-d.patch |    36 -
 ...ync-update-support-for-cursor-planes.patch |    87 -
 ...c4-Configure-the-HVS-COB-allocations.patch |    96 -
 ...-vc4-Set-AXI-panic-modes-for-the-HVS.patch |    39 -
 ...s-Skip-DebugFS-Registration-for-FKMS.patch |    25 -
 ...ome-RGB-bus-formats-for-VC4-DPI-outp.patch |    40 -
 ...ypi-firmware-Update-mailbox-commands.patch |    99 -
 ...eate-helper-to-retrieve-private-data.patch |    70 -
 ...0-0060-arm64-setup-Fix-build-warning.patch |    24 -
 ...BCM2708-Add-core-Device-Tree-support.patch | 37866 ----------
 ...spberrypi-Add-ISP-to-exported-clocks.patch |    22 -
 ...cks-early-during-the-boot-process-so.patch |    45 -
 ...Mark-used-PLLs-and-dividers-CRITICAL.patch |    28 -
 ...lk-bcm2835-Add-claim-clocks-property.patch |   118 -
 ...35-Read-max-core-clock-from-firmware.patch |   115 -
 ...-bcm2835-Use-zd-when-printing-size_t.patch |    24 -
 ...clk-bcm2835-Don-t-wait-for-pllh-lock.patch |    38 -
 ...support-for-setting-leaf-clock-rates.patch |    53 -
 ...w-reparenting-leaf-clocks-while-they.patch |    71 -
 ...bcm2835-Avoid-null-pointer-exception.patch |    29 -
 ...0-0072-clk-bcm2835-Disable-v3d-clock.patch |    58 -
 ...835-Pass-DT-node-to-rpi_firmware_get.patch |    24 -
 ...clk-bcm2835-Remove-VEC-clock-support.patch |    34 -
 ...vert-702b94bff3c50542a6e4ab9a4f4cef0.patch |    99 -
 ...76-cache-export-clean-and-invalidate.patch |    53 -
 ...v-Fix-CS-polarity-if-GPIO-descriptor.patch |    32 -
 ...-Always-request-for-user-confirmatio.patch |    45 -
 ...-Always-request-for-user-confirmatio.patch |    43 -
 ...net-Request-APD-DLL-disable-and-IDDQ.patch |    29 -
 ...ental-Enable-turbo_mode-and-packetsi.patch |    43 -
 ...ow-mac-address-to-be-set-in-smsc95xx.patch |    99 -
 ...oup-Disable-cgroup-memory-by-default.patch |    85 -
 ...e_resource-against-resources-without.patch |    28 -
 ...cm2836-Avoid-Invalid-trigger-warning.patch |    24 -
 ...0087-irqchip-bcm2835-Add-FIQ-support.patch |   127 -
 ...hip-irq-bcm2835-Add-2836-FIQ-support.patch |    99 -
 ...ompletely-disable-the-spidev-warning.patch |    24 -
 ...5-Load-driver-early-and-support-lega.patch |   101 -
 ...rtc-Add-SPI-alias-for-pcf2123-driver.patch |    20 -
 ...835-Support-setting-reboot-partition.patch |   102 -
 ...-off-rather-than-busy-spinning-when-.patch |    23 -
 ...-Make-RASPBERRYPI_POWER-depend-on-PM.patch |    19 -
 ...void-initialising-if-already-enabled.patch |    25 -
 ...Demote-deferral-errors-to-INFO-level.patch |    35 -
 .../950-0097-Update-vfpmodule.c.patch         |   137 -
 ...0-0098-i2c-bcm2835-Add-debug-support.patch |   189 -
 ...bcm2836-Remove-regmap-and-syscon-use.patch |   112 -
 ...8xx-Enable-LEDs-and-auto-negotiation.patch |    49 -
 ...-Insert-mb-for-correct-FIFO-handling.patch |    27 -
 ...Add-cts-event-workaround-DT-property.patch |    50 -
 ...011-Avoid-rare-write-when-full-error.patch |    42 -
 ...Set-base-to-0-give-expected-gpio-num.patch |    40 -
 ...0105-Main-bcm2708-bcm2709-linux-port.patch |   150 -
 .../950-0106-Add-dwc_otg-driver.patch         | 61022 ----------------
 .../950-0107-bcm2708-framebuffer-driver.patch |  3548 -
 ...lti-frame-buffer-support-from-the-Pi.patch |   778 -
 ...50-0109-fbdev-add-FBIOCOPYAREA-ioctl.patch |   337 -
 ...10-dmaengine-Add-support-for-BCM2708.patch |   652 -
 ...111-MMC-added-alternative-MMC-driver.patch |  2018 -
 ...dhost-driver-and-an-overlay-to-enabl.patch |  2502 -
 ...m-driver-for-querying-firmware-memor.patch |   493 -
 ...device-for-rootless-user-GPIO-access.patch |   299 -
 .../patches-6.1/950-0115-Add-SMI-driver.patch |  1967 -
 ...950-0116-Add-Chris-Boot-s-i2c-driver.patch |   660 -
 ...0-0117-char-broadcom-Add-vcio-module.patch |   273 -
 ...irmware-bcm2835-Support-ARCH_BCM270x.patch |    74 -
 ...ds-Add-the-input-trigger-for-pwr_led.patch |   168 -
 ...dded-Device-IDs-for-August-DVB-T-205.patch |    22 -
 ...o_user-and-__copy_from_user-performa.patch |  1611 -
 ...off-Allow-it-to-work-on-Raspberry-Pi.patch |    35 -
 ...d-Raspberry-Pi-Sense-HAT-core-driver.patch |   850 -
 ...all-the-downstream-rpi-sound-card-dr.patch | 17626 -----
 ...lay-add-backlight-driver-and-overlay.patch |   172 -
 ...bcm2835-virtgpio-Virtual-GPIO-driver.patch |   268 -
 ...127-OF-DT-Overlay-configfs-interface.patch |   404 -
 ...i_h5-Don-t-send-conf_req-when-ACTIVE.patch |    23 -
 ...und-Robin-dispatch-IRQs-between-CPUs.patch |    72 -
 ...ware-emulation-of-deprecated-instruc.patch |    28 -
 ...-AXI-performance-monitor-driver-2222.patch |   691 -
 ...m2835-Set-Serial-number-and-Revision.patch |    63 -
 ...Q-Fix-bad-mode-in-data-abort-handler.patch |   116 -
 ...FIQs-to-avoid-__irq_startup-warnings.patch |    36 -
 ...so-set-bus-numbers-from-reg-property.patch |    35 -
 ...ear-option-to-pps-gpio-via-dtoverlay.patch |    22 -
 ...78xx-Read-initial-EEE-status-from-DT.patch |    40 -
 ...fault-mouse-polling-interval-to-60Hz.patch |    32 -
 ...to-export-gpio-used-by-gpio-poweroff.patch |    93 -
 ...pberrypi-Notify-firmware-of-a-reboot.patch |    84 -
 ...bcm2835-Calc.-FIQ_START-at-boot-time.patch |    66 -
 ...Disable-TCP-Segmentation-Offload-TSO.patch |    56 -
 ...e-enabling-of-EEE-into-PHY-init-code.patch |    64 -
 ...SPI_DRV-should-select-DVB_CXD2880-wi.patch |    20 -
 ...rypi-Add-backward-compatible-get_thr.patch |    79 -
 ...step_wise-add-support-for-hysteresis.patch |    88 -
 ...step_wise-avoid-throttling-at-hyster.patch |    22 -
 ...xx-Support-auto-downshift-to-100Mb-s.patch |    91 -
 ...rypi-Report-the-fw-variant-during-pr.patch |    89 -
 ...e-link-events-to-minimize-poll-storm.patch |    45 -
 ...xx-EEE-support-is-now-a-PHY-property.patch |    26 -
 ...ma-Add-support-for-per-channel-flags.patch |    48 -
 ...8-Add-backup-switchover-mode-support.patch |    82 -
 ...-tc358743-Increase-FIFO-level-to-374.patch |    31 -
 ...-Add-support-for-972Mbit-s-link-freq.patch |    79 -
 ...743-Check-I2C-succeeded-during-probe.patch |    98 -
 ...180-Default-to-the-first-valid-input.patch |    45 -
 ...v7180-Add-YPrPb-support-for-ADV7282M.patch |    24 -
 ...Add-helper-defines-for-printing-FOUR.patch |    28 -
 ...-Document-BCM283x-CSI2-CCP2-receiver.patch |   103 -
 ...-Add-entry-for-BCM2835-Unicam-driver.patch |    28 -
 ...eturn-an-appropriate-colorspace-from.patch |    98 -
 ...chiq-Avoid-use-of-bool-in-structures.patch |    24 -
 ...chiq-Add-support-for-event-callbacks.patch |   356 -
 ...vices-Support-sending-data-to-MMAL-p.patch |    42 -
 ...2-Allow-exporting-of-a-struct-dmabuf.patch |    83 -
 ...iq-Fix-client_component-for-64-bit-k.patch |    35 -
 ...iq-Add-in-the-Bayer-encoding-formats.patch |    51 -
 ...iq-Update-mmal_parameters.h-with-rec.patch |    56 -
 ...iq-Free-the-event-context-for-contro.patch |    28 -
 ...-vchiq-Fix-memory-leak-in-error-path.patch |    76 -
 ...ake-GPIO-an-output-for-strong-pullup.patch |    27 -
 ...75-arm-bcm2835-Fix-FIQ-early-ioremap.patch |    73 -
 ...arm-bcm2835-DMA-can-only-address-1GB.patch |    25 -
 ...genet-constrain-max-DMA-burst-length.patch |    20 -
 ...Better-coalescing-parameter-defaults.patch |    43 -
 ...-link-energy-detect-powerdown-for-ex.patch |    31 -
 ...-for-updating-interrupt-endpoint-int.patch |   104 -
 ...hci_fixup_endpoint-for-interval-adju.patch |   135 -
 ...fixup_endpoint-after-mangling-interv.patch |    23 -
 ...cm2835-Add-bcm2838-compatible-string.patch |    20 -
 ...35-Set-clock-stretch-timeout-to-35ms.patch |    47 -
 ...m-v3d-Clock-V3D-down-when-not-in-use.patch |   158 -
 ...-chardev-for-mmap-ing-the-RPiVid-con.patch |   372 -
 ...ce-quirks-for-Freeway-Airmouse-T3-an.patch |    63 -
 ...t-Workaround-2-for-Pi4-Ethernet-fail.patch |    51 -
 ...ore-event-ring-segment-table-entries.patch |    60 -
 ...arch-arm-Add-model-string-to-cpuinfo.patch |    36 -
 ...Add-Revision-Serial-Model-to-cpuinfo.patch |    58 -
 ...8-Support-for-the-Sony-IMX258-sensor.patch |  1621 -
 ...0-Support-for-the-Sony-IMX290-sensor.patch |  1291 -
 ...7-Support-for-the-Sony-IMX477-sensor.patch |  2701 -
 ...9-Support-for-the-Sony-IMX519-sensor.patch |  2317 -
 ...vicetree-Add-documentation-for-imx37.patch |   142 -
 ...0-0198-v4l2-Add-a-Greyworld-AWB-mode.patch |    23 -
 ...cm2835-camera-Add-greyworld-AWB-mode.patch |    37 -
 ...-v4l2-Add-Greyworld-AWB-control-name.patch |    24 -
 ...camera-Fix-the-cherry-pick-of-AWB-Gr.patch |    28 -
 ...oard-clk-and-pinctrl-to-bcm2711-comp.patch |    26 -
 ...binding-for-the-Infineon-IRS1125-sen.patch |    66 -
 ...driver-for-the-Infineon-IRS1125-dept.patch |  1231 -
 ...Suppress-all-but-the-first-MMU-error.patch |    39 -
 ...950-0206-drm-v3d-Plug-dma_fence-leak.patch |    28 -
 ...m-Register-vcsm-cma-as-a-platform-dr.patch |    40 -
 ...m-Register-bcm2835-codec-as-a-platfo.patch |    40 -
 ...ow-ethernet-LED-mode-to-be-set-via-d.patch |    55 -
 ...Handle-missing-clock-more-gracefully.patch |    27 -
 ...-clock-so-firmware-knows-we-are-usin.patch |    27 -
 ...Allow-cpufreq-driver-to-also-adjust-.patch |    25 -
 ...m-Set-up-dma-ranges-on-child-devices.patch |    33 -
 ...e-the-old-dma-controller-for-OF-conf.patch |    51 -
 ...ckport-BCM2711-support-from-upstream.patch |    47 -
 ...lise-rpi-firmware-before-clk-bcm2835.patch |    47 -
 ...hiq_arm-Give-vchiq-children-DT-nodes.patch |    39 -
 ...trl-bcm2835-Remove-gpiochip-on-error.patch |    25 -
 ...-bcm2708_fb-Use-common-compat-header.patch |    23 -
 ...f-overlay-Correct-symbol-path-fixups.patch |    37 -
 ...-Add-DT-docs-for-Brcmstb-PCIe-device.patch |    77 -
 ...t-Disable-skip_umac_reset-by-default.patch |    23 -
 ...h-Add-a-format-for-column-YUV4-2-0-m.patch |   309 -
 ...s-media-Add-binding-for-the-Raspberr.patch |   106 -
 ...dia-Add-media_request_-pin-unpin-API.patch |    94 -
 ...ivid-Add-Raspberry-Pi-V4L2-H265-deco.patch |  5238 --
 ...CS_HIGH-if-GPIO-descriptors-are-used.patch |    57 -
 ...core-Add-sensor-ancillary-data-V4L2-.patch |    85 -
 ...EDIA_BUS_FMT_SENSOR_DATA-media-bus-f.patch |    63 -
 ...core-Add-ISP-statistics-output-V4L2-.patch |    94 -
 ...trls-Add-CID-base-for-the-bcm2835-is.patch |   169 -
 ...q-Load-bcm2835_isp-driver-from-vchiq.patch |    39 -
 ...35-dma-Add-proper-40-bit-DMA-support.patch |   801 -
 ...i2c-tc358743-Fix-fallthrough-warning.patch |    20 -
 ...8_fb-Disable-FB-if-no-displays-found.patch |    34 -
 ...vices-mmal-vchiq-Update-parameters-l.patch |    28 -
 ...vices-bcm2835-camera-Request-headers.patch |    30 -
 ...238-zswap-Defer-zswap-initialisation.patch |   129 -
 ...-t-prevent-IRQ-usage-of-output-GPIOs.patch |    50 -
 ...mstb-Add-DT-property-to-control-L1SS.patch |    75 -
 ...125-Using-i2c_transfer-for-ic2-reads.patch |    65 -
 ...s1125-Refactoring-and-debug-messages.patch |   123 -
 ...omic-access-to-imager-reconfiguratio.patch |   381 -
 ...5-Keep-HW-in-sync-after-imager-reset.patch |   181 -
 ...icam-Driver-for-CCP2-CSI2-camera-int.patch |  3158 -
 ...icam-Kconfig-Makefile-for-CCP2-CSI2-.patch |    45 -
 ...icam-Add-support-for-get_mbus_config.patch |    56 -
 ...icam-Avoid-gcc-warning-over-0-on-end.patch |    27 -
 ...50-bcm2835aux-defer-if-clock-is-zero.patch |    28 -
 ...l-format-for-MIPI-packed-12bit-luma-.patch |    95 -
 ...l-format-for-MIPI-packed-14bit-luma-.patch |   104 -
 ...icam-Add-support-for-12bit-mono-pack.patch |    25 -
 ...icam-Add-support-for-14bit-mono-sour.patch |    29 -
 ...icam-Add-support-for-unpacked-14bit-.patch |    42 -
 ...55-bcm2835-dma-Add-NO_WAIT_RESP-flag.patch |    54 -
 ...icam-Reinstate-V4L2_CAP_READWRITE-in.patch |    28 -
 ...icam-Ensure-type-is-VIDEO_CAPTURE-in.patch |    36 -
 ...icam-Set-VPU-min-clock-freq-to-250Mh.patch |   127 -
 ...835-unicam-Update-documentation-with.patch |    38 -
 ...950-0260-leds-Add-the-actpwr-trigger.patch |   235 -
 ...835-dma-Advertise-the-full-DMA-range.patch |    77 -
 ...icam-Drop-WARN-on-uing-direct-cache-.patch |    34 -
 ...43-Only-allow-supported-pixel-fmts-i.patch |    30 -
 ...835-unicam-Always-service-interrupts.patch |    51 -
 ...835-unicam-Fix-uninitialized-warning.patch |    21 -
 ...icam-Fixup-review-comments-from-Hans.patch |   215 -
 ...icam-Retain-packing-information-on-G.patch |    48 -
 ...icam-change-minimum-number-of-vb2_qu.patch |    28 -
 ...tft-Add-support-for-display-variants.patch |   293 -
 ...com-char-drivers-back-to-build-files.patch |    30 -
 ...camera-Replace-deprecated-V4L2_PIX_F.patch |    30 -
 ...04_services-Add-new-vc-sm-cma-driver.patch |  2961 -
 ...hiq-mmal-Add-support-for-14bit-Bayer.patch |    27 -
 ...l-vchiq-Add-monochrome-image-formats.patch |    29 -
 ...iq-Use-vc-sm-cma-to-support-zero-cop.patch |   162 -
 ...services-Add-a-V4L2-M2M-codec-driver.patch |  4333 --
 ...-reserve-channel-0-if-legacy-dma-dri.patch |    32 -
 ...isp-Add-bcm2835-isp-uapi-header-file.patch |   338 -
 ...vices-ISP-Add-a-more-complex-ISP-pro.patch |  2408 -
 .../950-0281-gpio-Add-gpio-fsm-driver.patch   |  1304 -
 ...pseudo_pallete-to-prevent-crash-on-f.patch |    30 -
 ...-0283-bcm2708_fb-Fix-a-build-warning.patch |    22 -
 ...-Ignore-params-after-the-partition-n.patch |    29 -
 ...rypi-Add-support-for-tryonce-reboot-.patch |    60 -
 ...it-out-the-BCM54213PE-from-the-BCM54.patch |    71 -
 ...roadcom-Add-bcm54213pe-configuration.patch |    34 -
 ...tb-Restore-initial-fundamental-reset.patch |    35 -
 ...-Poll-the-device-if-no-interrupt-is-.patch |    98 -
 ...rrypi-touchscreen-Use-independent-I2.patch |    58 -
 ...rrypi-ts-Insert-delay-before-polling.patch |    26 -
 ...ings-Add-compatible-for-BCM2711-DSI1.patch |    23 -
 ...icam-Correctly-handle-error-propagat.patch |    27 -
 ...icam-Return-early-from-stop_streamin.patch |    64 -
 ...icam-Clear-clock-state-when-stopping.patch |    25 -
 ...-PCI-brcmstb-Advertise-MSI-X-support.patch |    27 -
 ...-Ack-pending-PHY-ints-when-resetting.patch |    32 -
 ...-0298-vc-sm-cma-fixed-kbuild-problem.patch |    30 -
 ...vices-Add-additional-unpacked-raw-fo.patch |    51 -
 ...isp-Add-the-unpacked-16bpp-raw-forma.patch |   174 -
 ...isp-Log-the-number-of-excess-support.patch |    29 -
 ...void-losing-CS-flags-after-interrupt.patch |    21 -
 ...bcm2835-dma-Add-DMA_WIDE_SOURCE-and-.patch |    64 -
 ...isp-Add-colour-denoise-configuration.patch |    56 -
 ...vices-ISP-Add-colour-denoise-control.patch |    75 -
 ...around-fix-for-zero-length-transfers.patch |    50 -
 ...nce-unavoidable-dtc-overlay-warnings.patch |    31 -
 ...w-formats-with-different-colour-spac.patch |   712 -
 ...icam-Fix-bug-in-buffer-swapping-logi.patch |    75 -
 ...iases-to-different-AES-implementatio.patch |   107 -
 ...n-buffered-mode-run-jobs-if-either-p.patch |    33 -
 ...950-0312-media-i2c-add-ov9281-driver.patch |  1729 -
 ...-return-codes-from-ov5647_write-ov56.patch |    89 -
 ...ov5647-Parse-and-register-properties.patch |    49 -
 ...m2835-camera-Add-support-for-DMABUFs.patch |    37 -
 ...taging-fbtft-Add-minipitft13-variant.patch |   104 -
 ...070me05000-Use-gpiod_set_value_cansl.patch |    67 -
 ...camera-Add-support-for-H264-levels-4.patch |    58 -
 ...ing-bcm2835-isp-Fix-compiler-warning.patch |    25 -
 ...ff-Remember-the-old-poweroff-handler.patch |    53 -
 ...2c-ov5647-Correct-pixel-array-offset.patch |    25 -
 ...-ov5647-Correct-minimum-VBLANK-value.patch |    26 -
 ...-Fix-v4l2-compliance-failure-subscri.patch |    26 -
 ...vices-isp-Set-the-YUV420-YVU420-form.patch |    39 -
 ...icam-Forward-input-status-from-subde.patch |    53 -
 ...v7251-Add-fwnode-properties-controls.patch |    48 -
 ...und-for-bogus-SET_DEQ_PENDING-endpoi.patch |    41 -
 ...vchiq_arm-Add-36-bit-address-support.patch |   256 -
 ...chiq_arm-children-inherit-DMA-config.patch |    36 -
 ...q_arm-Usa-a-DMA-pool-for-small-bulks.patch |   118 -
 ...errypi-touchscreen-Handle-I2C-errors.patch |    34 -
 ...-Add-a-timing-for-the-Raspberry-Pi-7.patch |    59 -
 ...-Clean-up-timer-and-workqueue-on-rem.patch |    31 -
 ...al-Add-buffer-flags-for-interlaced-v.patch |    42 -
 ...al-Add-parameters-for-interlaced-vid.patch |    61 -
 ...al-Add-the-deinterlace-image-effects.patch |    26 -
 ...337-Add-Raspberry-Pi-PoE-HAT-support.patch |   268 -
 ...l-vchiq-Rationalise-included-headers.patch |    36 -
 ...iq-Add-module-parameter-to-enable-lo.patch |   314 -
 ...iq-Reset-buffers_with_vpu-on-port_en.patch |    31 -
 ...-a-driver-that-wraps-the-PWM-API-as-.patch |   192 -
 ...-Sensor-should-report-RAW-color-spac.patch |    51 -
 ...p-Report-input-node-as-wanting-full-.patch |    29 -
 ...5-unicam-Parse-pad-numbers-correctly.patch |   232 -
 ...icam-Add-support-for-configuration-v.patch |  1952 -
 ...camera-Add-support-for-H264_MIN_QP-H.patch |    54 -
 ...camera-Add-support-for-MPEG_VIDEO_FO.patch |    43 -
 ...a-i2c-ov5647-Support-HFLIP-and-VFLIP.patch |   189 -
 ...isp-Allow-multiple-users-for-the-ISP.patch |   175 -
 ...drivers-bcm2835_isp-Fix-div-by-0-bug.patch |    23 -
 ...dev-Restore-loading-from-Device-Tree.patch |    25 -
 ...06-Handle-unreliable-TOUCH_UP-events.patch |    63 -
 ...unicam-Add-logging-message-when-a-fr.patch |    26 -
 ...nel-attiny-Don-t-read-the-LCD-power-.patch |    46 -
 ...-Only-look-at-the-number-of-points-r.patch |    44 -
 ...523-Fix-oscillator-stop-bit-handling.patch |    57 -
 ...le-Populate-bpc-when-using-panel-dpi.patch |    24 -
 ...-Allow-the-bus-format-to-be-read-fro.patch |    28 -
 ...-quirks-add-link-TRB-quirk-for-VL805.patch |    64 -
 ...m_on_ring-for-cases-where-there-is-a.patch |    29 -
 ...t-TRBS_PER_SEGMENT-define-in-runtime.patch |   257 -
 ...usb-xhci-add-VLI_TRB_CACHE_BUG-quirk.patch |    73 -
 ...47-Add-support-for-regulator-control.patch |   111 -
 ...ov7251-Make-the-enable-GPIO-optional.patch |    26 -
 ...2835-isp-Fix-cleanup-after-init-fail.patch |    38 -
 ...ls-Reset-V4L2_CID_USER_BCM2835_ISP_B.patch |    33 -
 ...-Increase-diff-between-VTS-and-max-e.patch |    60 -
 ...-isp-Add-missing-lock-initialization.patch |    51 -
 ...2c-Add-configuration-for-RPi-POE-HAT.patch |    63 -
 ...poe-Add-option-of-being-created-by-M.patch |   170 -
 ...op-CURRENT_AVG-as-it-is-not-hardware.patch |    43 -
 ...d-option-of-being-created-by-MFD-or-.patch |   234 -
 ...unicam-Disable-trigger-mode-operatio.patch |    57 -
 ...881c-driver-support-for-nwe080-panel.patch |   296 -
 ...icam-Set-ret-on-error-path-in-unicam.patch |    43 -
 ...-Initialize-id_msb-to-zero-in-ov9281.patch |    48 -
 ...e-clock-stretch-timeout-configurable.patch |    44 -
 ...-for-SOF_TIMESTAMPING_TX_SOFTWARE-su.patch |    20 -
 ...ent-format-MEDIA_BUS_FMT_RGB565_1X24.patch |    60 -
 ...indings-vendor-prefixes-Add-Geekworm.patch |    23 -
 ...lay-simple-add-Geekworm-MZP280-Panel.patch |    34 -
 ...nel-simple-add-Geekworm-MZP280-Panel.patch |    58 -
 ...-Remove-custom-handling-of-orientati.patch |    51 -
 ...nel-driver-for-Ilitek-ILI9806E-panel.patch |   535 -
 ...nel-driver-for-TDO-Y17B-based-panels.patch |   329 -
 ...dings-Add-sck-idle-input-to-spi-gpio.patch |    23 -
 ...spi-gpio-Add-sck-idle-input-property.patch |    57 -
 ...icam-Handle-a-repeated-frame-start-w.patch |    63 -
 ...uirk-for-Superspeed-bulk-OUT-transfe.patch |    96 -
 ...-Reinstate-setting-ov7251_global_ini.patch |    32 -
 ...ework-XHCI_VLI_SS_BULK_OUT_BUG-quirk.patch |    51 -
 ...i2c-Add-driver-for-Omnivision-OV2311.patch |  1228 -
 ...vices-isp-Permit-all-sRGB-colour-spa.patch |   161 -
 ...bcm2835-isp-Do-not-cleanup-mmal-vcsm.patch |    43 -
 ...media-i2c-Add-binding-for-ad5398-VCM.patch |    39 -
 ...dd-driver-for-AD5398-VCM-lens-driver.patch |   387 -
 ...-Use-v4l2_async_register_subdev_sens.patch |    26 -
 ...edia-i2c-Rename-ad5398-to-ad5398_vcm.patch |   717 -
 ...bcm2835-isp-Clear-LS-table-handle-in.patch |    37 -
 ...a-introduce-a-customisable-threshold.patch |    67 -
 ...2835-Only-return-non-GPIOs-to-inputs.patch |    42 -
 ...-ili9881c-Clean-up-on-mipi_dsi_attac.patch |    31 -
 ...ilitek9881c-Add-prepare_upstream_fir.patch |    28 -
 ...subsys_initcall-for-the-clock-driver.patch |    28 -
 ...-Force-probe-routine-to-run-synchron.patch |    28 -
 ...chiq_arm-Add-log_level-module-params.patch |    27 -
 ...bindings-vendor-prefixes-Add-Arducam.patch |    23 -
 ...s-media-i2c-Add-Arducam-Pivariety-Se.patch |   148 -
 ...iver-of-Arducam-Pivariety-series-cam.patch |  1635 -
 ...-Use-dev_err_probe-to-suppress-defer.patch |    26 -
 ...n-add-microchip-emc2305.yaml-dt-bind.patch |    75 -
 ...ixup-microchip-emc2305.yaml-bindings.patch |    40 -
 ...edia-i2c-Update-ov2311-Kconfig-entry.patch |    22 -
 ...edia-i2c-Update-ov9281-Kconfig-entry.patch |    22 -
 ...dia-i2c-Update-irs1125-Kconfig-entry.patch |    25 -
 ...m-pivariety-Fixup-for-mainline-API-c.patch |    42 -
 ...do-single-sector-reads-during-recove.patch |    34 -
 ...hiq-mmal-Add-defines-for-mmal_es_for.patch |    34 -
 ...e-jump-labels-before-they-are-initia.patch |    86 -
 ...-v3d-Switch-clock-setting-to-new-api.patch |    87 -
 ...Enable-minimize-for-all-firmware-clo.patch |    40 -
 ...s-media-i2c-Add-Arducam-64MP-CMOS-se.patch |   151 -
 ...2c-Add-driver-of-Arducam-64MP-camera.patch |  2458 -
 ...m_64mp-Advertise-embedded-data-node-.patch |   256 -
 ...426-Add-HDMI1-facility-to-the-driver.patch |   296 -
 ...late-phy-driver-block-for-BCM54213PE.patch |    33 -
 ...-bcm-rpi-Add-the-BCM283x-pixel-clock.patch |    26 -
 ...9281-Correct-min-def-vts-for-640x400.patch |    27 -
 ...-Change-exposure-default-value-with-.patch |    29 -
 ...icam-Correctly-handle-FS-FE-ISR-cond.patch |    64 -
 ...panel-simple-hack-ignore-orientation.patch |    24 -
 ...-sm-cma-Handle-upstream-require-vchi.patch |   214 -
 ...Read-CSI2-config-from-FW-and-pass-to.patch |   149 -
 ...rducam-pivariety-Add-custom-controls.patch |    40 -
 ...icam-Fix-for-possible-dummy-buffer-o.patch |    56 -
 ...mitigations-for-VLI_SS_BULK_OUT_BUG-.patch |    89 -
 ...-for-num_trbs_free-when-invalidating.patch |    84 -
 ...name-GEM-CMA-helpers-GEM-DMA-helpers.patch |    35 -
 ...xups-for-driver-submitted-to-mailing.patch |   163 -
 ...-unicam-Fix-up-start-stop-api-change.patch |    39 -
 ...otg-fix-reference-passing-when-check.patch |    59 -
 ...m-vc4-Add-missing-32-bit-RGB-formats.patch |    50 -
 ...ays-Add-i2c-sensor-support-for-AHT10.patch |    58 -
 ...-Add-README-entry-for-i2c-rtc-rv3032.patch |    30 -
 ...stop-GCC-from-patching-FIQ-functions.patch |    43 -
 ...rlays-i2c-sensor-Add-mcp980x-support.patch |    63 -
 ...sound-Make-button-pins-owned-by-card.patch |    49 -
 ...rypi-Introduce-rpi_firmware_find_nod.patch |    76 -
 ...rypi-Move-the-clock-IDs-to-the-firmw.patch |    73 -
 ...rypi-Provide-a-helper-to-query-a-clo.patch |    96 -
 ...hdmi-Fix-hdmi_enable_4kp60-detection.patch |    47 -
 ...ork-hdmi_enable_4kp60-detection-code.patch |   170 -
 ...i-Add-more-checks-for-4k-resolutions.patch |    88 -
 ...e-we-don-t-end-up-with-a-core-clock-.patch |    55 -
 ...-phy-BCM54210PE-does-not-support-PTP.patch |    44 -
 ...mi-Allow-hotplug-detect-to-be-forced.patch |    58 -
 ...-sensor-Add-the-jc42-class-of-sensor.patch |    84 -
 ...tend-audremap-to-supports-other-pins.patch |    79 -
 ...-Nasty-hack-to-allow-input-selection.patch |    89 -
 ...m2835_codec-Allow-larger-images-thro.patch |   101 -
 ...lock-frequency-defaults-to-54MHz-but.patch |    45 -
 ...0p-Corrects-the-volume-level-display.patch |    27 -
 .../950-0465-overlays-Add-overlay-pwm1.patch  |   132 -
 ...ys-audremap-Include-the-fsels-values.patch |    50 -
 ...sor-Make-smbus-timeout-disable-optio.patch |    48 -
 ...ntion-Digi2-Pro-audio-card-in-README.patch |    21 -
 ...9-usb-xhci-add-XHCI_VLI_HUB_TT_QUIRK.patch |   119 -
 ...-Add-module-param-to-select-ext-trig.patch |    88 -
 ...oid-log-spam-for-audio-start-failure.patch |    41 -
 ...-tests-Order-Kunit-tests-in-Makefile.patch |    40 -
 ...950-0473-drm-tests-Add-Kunit-Helpers.patch |   116 -
 ...474-drm-tests-Include-helpers-header.patch |    34 -
 ...5-drm-tests-helpers-Add-module-infos.patch |    31 -
 ...76-drm-tests-helpers-Add-SPDX-header.patch |    37 -
 ...Constify-the-old-new-state-accessors.patch |   199 -
 ...m-vc4-Constify-container_of-wrappers.patch |    91 -
 ...nstify-the-HVS-old-new-state-helpers.patch |    35 -
 ...-the-CRTCs-by-output-before-assignin.patch |   201 -
 ...txp-Reorder-the-variable-assignments.patch |    58 -
 ...50-0482-drm-vc4-Add-TXP-encoder-type.patch |   100 -
 ...ialise-the-CRTC-before-the-encoder-a.patch |    42 -
 ...s-the-device-and-data-in-vc4_crtc_in.patch |   103 -
 ...485-drm-vc4-crtc-Provide-a-CRTC-name.patch |   116 -
 ...drm-tests-helpers-Add-missing-export.patch |    25 -
 ...s-Move-the-helper-header-to-include-.patch |    63 -
 ...uce-a-config-option-for-the-KUnit-he.patch |    74 -
 ...lpers-Document-drm_kunit_device_init.patch |    44 -
 ...-helpers-Switch-to-EXPORT_SYMBOL_GPL.patch |    27 -
 ...elpers-Rename-the-device-init-helper.patch |    63 -
 ...ts-helpers-Remove-the-name-parameter.patch |    66 -
 ...s-Create-the-device-in-another-funct.patch |   127 -
 ...-helpers-Switch-to-a-platform_device.patch |    59 -
 ...elpers-Make-sure-the-device-is-bound.patch |    74 -
 ...s-Allow-for-a-custom-device-struct-t.patch |   135 -
 ...rs-Allow-to-pass-a-custom-drm_driver.patch |   120 -
 ...rm-vc4-Move-HVS-state-to-main-header.patch |   116 -
 ...roduce-a-lower-level-crtc-init-helpe.patch |   131 -
 ...tc-Make-encoder-lookup-helper-public.patch |    78 -
 ...ide-a-function-to-initialize-the-HVS.patch |   131 -
 ...s-Introduce-a-mocking-infrastructure.patch |   736 -
 ...il-the-current-test-if-we-access-a-r.patch |   201 -
 ...dd-unit-test-suite-for-the-PV-muxing.patch |  1159 -
 ...tion-gpu-vc4-Add-KUnit-Tests-Section.patch |    38 -
 ...nel-ilitek9881c-Use-cansleep-methods.patch |    37 -
 ...nel-ilitek9881c-Crystalfontz-support.patch |   276 -
 ...verlays-Add-crystalfontz-cfa050_pi_m.patch |   171 -
 ...et-bcmgenet-Add-eee-module-parameter.patch |    46 -
 ...950-0514-dts-bcm2711-Add-eee-dtparam.patch |    32 -
 ...verlay-cm-swap-i2c0-to-swap-buses-on.patch |    86 -
 ...t-cam_reg-GPIO-assignments-for-CM1-3.patch |    71 -
 ...950-0517-dt-Add-camX_reg_gpio-to-CM4.patch |    59 -
 ...-and-camX_reg_gpio-overrides-to-CM4S.patch |    64 -
 .../950-0519-overlays-Add-disable-emmc2.patch |    75 -
 ...HCI_VLI_HUB_TT_QUIRK-to-old-firmware.patch |    53 -
 ...mple-Add-Innolux-AT056tN53V1-5.6-VGA.patch |   177 -
 ...emap-Fix-setting-of-the-pin-function.patch |    33 -
 ...indings-Add-DW9817-to-DW9807-binding.patch |    46 -
 ...-Add-support-for-DW9817-bidirectiona.patch |   223 -
 ...bindings-Add-regulator-to-dw9807-vcm.patch |    40 -
 ...-Add-regulator-support-to-the-driver.patch |   187 -
 ...-Smooth-the-first-user-movement-of-t.patch |    49 -
 ...a-i2c-Add-IMX708-CMOS-sensor-binding.patch |   155 -
 ...driver-for-the-Sony-IMX708-image-sen.patch |  2045 -
 ...overlays-for-the-IMX708-image-sensor.patch |   434 -
 ...oadcom-Make-LEDs-3-4-shadow-LEDs-1-2.patch |    35 -
 ...-i2c-sensor-MS-temp-pressure-sensors.patch |   150 -
 ...dia-imx708-Enable-long-exposure-mode.patch |   102 -
 ...edia-i2c-imx708-Fix-crop-information.patch |    29 -
 ...dmi-Correct-CSC-setup-for-YCbCr4-4-4.patch |    36 -
 ...-property-to-allow-manual-config-of-.patch |   176 -
 ...c-Honor-return-value-of-mmc_of_parse.patch |    30 -
 ...s-i2c-sensor-Add-mpu6050-and-mpu9250.patch |   168 -
 ...-i2c-sensor-Use-TABs-for-indentation.patch |    67 -
 ...ays-i2c-sensor-Add-BNO055-IMU-sensor.patch |    97 -
 ...-vc4-kms-dpi-generic-for-changed-med.patch |    34 -
 ...4-hvs-Defer-dlist-slots-deallocation.patch |   401 -
 ...lways-enable-GCP-with-AVMUTE-cleared.patch |   104 -
 ...l2-codec-Enable-selection-ioctl-for-.patch |    34 -
 ...verlays-i2c-sensor-Add-SHT4X-support.patch |    74 -
 ...static-key-to-check-if-KUnit-is-acti.patch |    75 -
 ...atic-key-when-retrieving-the-current.patch |   174 -
 ...ialize-the-dlist-allocation-list-ent.patch |    30 -
 ...-the-dlist-allocation-destruction-to.patch |    46 -
 ...roy-dlist-allocations-immediately-wh.patch |    48 -
 ...dts-Set-the-LED-default-state-to-off.patch |   270 -
 ...l2-codec-Add-profile-level-ctrls-to-.patch |   121 -
 ...plane-Add-support-for-YUV444-formats.patch |    53 -
 ...ulate-bpc-based-on-max_requested_bpc.patch |    29 -
 ...bindings-ak7375-Convert-to-DT-schema.patch |    87 -
 ...edia-dt-bindings-ak7375-Add-supplies.patch |    47 -
 ...-i2c-ak7375-Add-regulator-management.patch |   108 -
 ...-dtoverlays-Add-VCM-option-to-imx519.patch |   151 -
 ...MX519-support-to-camera-mux-overlays.patch |   246 -
 ...m2835_codec-Ignore-READ_ONLY-ctrls-i.patch |   181 -
 ...x-Rpi-PROTO-and-audioinjector.net-Pi.patch |    36 -
 ...erlays-Add-VCM-option-to-Arducam64MP.patch |   151 -
 ...rducam64MP-support-to-camera-mux-ove.patch |   251 -
 ...sitronix-st7701-Support-SPI-config-a.patch |   555 -
 ...ys-Remove-lirc-rpi-from-media-center.patch |   101 -
 ...53x-Fix-a-typos-in-the-pcal-variants.patch |    64 -
 ...p3422-Add-correct-compatible-strings.patch |    28 -
 ...u1977-Add-correct-compatible-strings.patch |    32 -
 ...-vendor-qualified-compatible-strings.patch |   155 -
 ...a-i2c-Declare-of-MODULE_DEVICE_TABLE.patch |    23 -
 ...53x-Add-ti-tca9554-compatible-string.patch |    20 -
 ...hwmon-aht10-Add-DT-compatible-string.patch |    29 -
 ...mon-ds1621-Add-DT-compatible-strings.patch |    29 -
 ...-Add-DT-compatible-string-for-ds3234.patch |    29 -
 ...hwmon-sht3x-Add-DT-compatible-string.patch |    32 -
 ...ght-tsl4531-Add-DT-compatible-string.patch |    29 -
 ...ht-veml6070-Add-DT-compatible-string.patch |    29 -
 ...tandardise-on-the-upstream-LED-names.patch |   262 -
 ...-bcm2711-rpi-400-Restore-the-ACT-LED.patch |    64 -
 ...711-rpi-400-Add-dummy-cam1-regulator.patch |    26 -
 ...-vc4-kms-fkms-v3d-Raise-CMA-to-512MB.patch |    37 -
 ...-Sensor-should-report-RAW-color-spac.patch |    33 -
 ...-Correct-the-minimum-vblanking-value.patch |    26 -
 ...-make-HBLANK-r-w-to-allow-longer-exp.patch |   105 -
 ...ertise-embedded-data-node-on-media-p.patch |   356 -
 ...ecessary-and-harmful-HDMI-RGB-format.patch |    37 -
 ...a-i2c-Add-IMX296-CMOS-sensor-binding.patch |   145 -
 ...edia-i2c-IMX296-camera-sensor-driver.patch |  1240 -
 ...a-i2c-imx296-Get-sensor-crop-working.patch |    35 -
 ...6-Disable-binning-for-colour-variant.patch |    32 -
 ...imx296-Add-helper-for-hblank-control.patch |    84 -
 ...-i2c-imx296-Set-a-1-frame-gain-delay.patch |    25 -
 ...-Add-horizontal-vertical-flip-suppor.patch |   150 -
 ...ia-i2c-imx296-Adjust-cropping-limits.patch |    28 -
 ...-off-rather-than-busy-spinning-when-.patch |    33 -
 ...edia-i2c-Add-PDAF-support-for-IMX519.patch |   427 -
 ...educe-the-link-frequencies-of-IMX519.patch |    23 -
 ...c-imx708-Fix-WIDE_DYNAMIC_RANGE-cont.patch |    94 -
 ...dd-explicit-fb_deferred_io_mmap-hook.patch |    26 -
 ...rng-bcm2835-sleep-more-intelligently.patch |    66 -
 ...m2835_codec-Set-MPEG2_LEVEL-control-.patch |    24 -
 ...codec-Add-V4L2_CID_MPEG_VIDEO_B_FRAM.patch |    49 -
 ...codec-Add-support-for-V4L2_CID_MPEG_.patch |    70 -
 ...nverted-override-property-to-ssd1306.patch |    38 -
 ...1-media-i2c-imx290-Reset-to-upstream.patch |  1002 -
 ...-Use-device-lock-for-the-control-han.patch |    30 -
 ...-Print-error-code-when-I2C-transfer-.patch |    40 -
 ...-Replace-macro-with-explicit-ARRAY_S.patch |    53 -
 ...mx290-Drop-imx290_write_buffered_reg.patch |    67 -
 ...6-media-i2c-imx290-Drop-regmap-cache.patch |    27 -
 ...mx290-Specify-HMAX-values-in-decimal.patch |    54 -
 ...290-Support-variable-sized-registers.patch |   431 -
 ...ia-i2c-imx290-Correct-register-sizes.patch |    98 -
 ...-Simplify-error-handling-when-writin.patch |   200 -
 ...c-imx290-Define-more-register-macros.patch |   294 -
 ...i2c-imx290-Add-exposure-time-control.patch |    70 -
 ...-media-i2c-imx290-Fix-max-gain-value.patch |    52 -
 ...-Split-control-initialization-to-sep.patch |   150 -
 ...-Implement-HBLANK-and-VBLANK-control.patch |    83 -
 ...-Create-controls-for-fwnode-properti.patch |    47 -
 ...-Move-registers-with-fixed-value-to-.patch |    69 -
 ...-Factor-out-format-retrieval-to-sepa.patch |    64 -
 ...0-Add-crop-selection-targets-support.patch |   136 -
 ...-Replace-GAIN-control-with-ANALOGUE_.patch |    38 -
 ...c-imx290-Group-functions-in-sections.patch |   714 -
 ...-Factor-out-subdev-init-and-cleanup-.patch |   235 -
 ...-Factor-out-control-update-code-to-a.patch |    78 -
 ...x290-Access-link_freq_index-directly.patch |    49 -
 ...-Pass-format-and-mode-to-imx290_calc.patch |    83 -
 ...-Compute-pixel-rate-and-blanking-in-.patch |   131 -
 ...-Factor-out-black-level-setting-to-a.patch |   131 -
 ...-Factor-out-DT-parsing-to-separate-f.patch |   202 -
 ...9-media-i2c-imx290-Use-dev_err_probe.patch |    56 -
 ...-Factor-out-clock-initialization-to-.patch |   113 -
 ...-imx290-Use-V4L2-subdev-active-state.patch |   398 -
 ...-Rename-extend-and-expand-usage-of-i.patch |   258 -
 ...2c-imx290-Use-runtime-PM-autosuspend.patch |   132 -
 ...-Initialize-runtime-PM-before-subdev.patch |   172 -
 ...0-Configure-data-lanes-at-start-time.patch |    41 -
 ...mx290-Simplify-imx290_set_data_lanes.patch |    59 -
 ...-Handle-error-from-imx290_set_data_l.patch |    34 -
 ...indings-Reset-imx290.txt-to-upstream.patch |    30 -
 ...-bindings-Convert-imx290.txt-to-YAML.patch |   230 -
 ...s-media-i2c-Add-mono-version-to-IMX2.patch |    69 -
 ...s-media-i2c-Add-imx327-version-to-IM.patch |    29 -
 ...-Make-use-of-get_unaligned_le24-put_.patch |    52 -
 ...-Use-device_property_read_u32-direct.patch |    31 -
 ...-Add-support-for-the-mono-sensor-var.patch |   216 -
 ...-Match-kernel-coding-style-on-whites.patch |    66 -
 ...-Set-the-colorspace-fields-in-the-fo.patch |    32 -
 ...-Add-V4L2_SUBDEV_FL_HAS_EVENTS-and-s.patch |    66 -
 ...90-Fix-the-pixel-rate-at-148.5Mpix-s.patch |    89 -
 ...90-Support-60fps-in-2-lane-operation.patch |    71 -
 ...290-Use-CSI-timings-as-per-datasheet.patch |   193 -
 ...-Convert-V4L2_CID_HBLANK-to-read-wri.patch |   134 -
 ...-Convert-V4L2_CID_VBLANK-to-read-wri.patch |   177 -
 ...ia-i2c-imx290-VMAX-is-mode-dependent.patch |    82 -
 ...-Remove-duplicated-write-to-IMX290_C.patch |    33 -
 ...-Add-support-for-74.25MHz-external-c.patch |   274 -
 ...i2c-imx290-Add-support-for-H-V-Flips.patch |   176 -
 ...-Add-the-error-code-to-logs-in-start.patch |    72 -
 ...mx290-Add-support-for-imx327-variant.patch |   122 -
 ...e-compatible-strings-for-imx290-327-.patch |    92 -
 ...ncel-deferred-work-if-pagelist-empty.patch |    36 -
 ...d-add-the-endpoint-context-in-xhci_f.patch |    30 -
 ...x708-Increase-usable-link-frequencie.patch |   224 -
 ...ink-frequency-parameter-for-the-Sony.patch |    36 -
 ...-imx708-Remove-unused-control-fields.patch |    49 -
 ...x708-Tidy-ups-to-address-upstream-re.patch |   191 -
 ...a-i2c-Replace-IMX708-sensor-binding-.patch |   282 -
 ...w-the-standard-devicetree-labels-for.patch |    34 -
 ...x708-Follow-the-standard-devicetree-.patch |    96 -
 ...708-Put-HFLIP-and-VFLIP-controls-in-.patch |    41 -
 ...icam-Start-and-stop-media_pipeline-w.patch |    43 -
 ...sm-Avoid-truncation-of-delay-jiffies.patch |    26 -
 ...codec-Add-missing-alignment-for-V4L2.patch |    26 -
 ...s-bcm27xx-Add-i2c_arm-vc-and-friends.patch |   166 -
 ...50-0684-overlays-Add-pcf857x-support.patch |    80 -
 ...85-overlays-Add-gpio-charger-support.patch |    93 -
 ...-Scale-the-pixel-clock-rate-for-the-.patch |   129 -
 ...d-calls-to-initialise-of-cooling-map.patch |    54 -
 ...nel-driver-for-Waveshare-DSI-touchsc.patch |   461 -
 ...-option-to-poll-instead-of-relying-o.patch |   139 -
 ...n-overlay-for-the-Waveshare-DSI-scre.patch |   190 -
 ...rlays-mipi-dbi-spi-fix-default-brigh.patch |    30 -
 ...verrides-for-alternate-i2c-buses-to-.patch |   116 -
 ...verrides-for-alternate-i2c-buses-to-.patch |    88 -
 ...0694-fixup-Export-optimised-__memcpy.patch |    27 -
 ...ange-OF-properties-pwm-min-pwm-max-t.patch |    69 -
 ...e-i2c-fan-pwm-max-min-overrides-to-u.patch |    26 -
 ...-drm-vc4-Limit-max_bpc-to-8-on-Pi0-3.patch |    37 -
 ...al-8250-Add-NOMSI-bug-for-bcm2835aux.patch |   103 -
 ...oth-hci_bcm-Add-more-invalid-BDADDRs.patch |    44 -
 ...-dts-bcm27xx-Enable-kernel-Bluetooth.patch |   196 -
 ...ate-miniuart-bt-now-krnbt-is-default.patch |   181 -
 ...dts-bcm2711-Add-extra-serial-aliases.patch |   164 -
 ...bcm2835-Workaround-for-edge-IRQ-loss.patch |    67 -
 ...gfs-end-points-to-query-GPU-usage-st.patch |   493 -
 ...bcm2711-rpi-ds-Group-the-common-pins.patch |   693 -
 ...-bcm2711-rpi-ds-Set-default-I-O-pins.patch |    84 -
 ...cm2711-Remove-I-O-pinctrl-references.patch |   207 -
 ...M-dts-bcm27xx-Correct-the-dma-ranges.patch |    89 -
 ...Derive-slave-DMA-addresses-correctly.patch |    73 -
 ...5-i2s-Use-phys-addresses-for-DAI-DMA.patch |    65 -
 ...-phys-addresses-for-slave-DMA-config.patch |    50 -
 ...-phys-addresses-for-slave-DMA-config.patch |    51 -
 ...-phys-addresses-for-slave-DMA-config.patch |    51 -
 ...2709-10-Retain-the-system-timer-node.patch |    59 -
 ...5-sdhost-Use-DT-to-configure-logging.patch |    45 -
 ...se-phys-addresses-for-slave-DMA-conf.patch |    54 -
 ...-phys-addresses-for-slave-DMA-config.patch |    60 -
 ...-phys-addresses-for-slave-DMA-config.patch |    86 -
 ...720-ARM-dts-bcm2711-rpi-Add-i2s_dma4.patch |    96 -
 ...cm2835-mmc-Really-use-phys-addresses.patch |    23 -
 ...5-Fix-position-reporting-for-40-bits.patch |    55 -
 ...5-Use-to_bcm2711_cbaddr-where-releva.patch |    25 -
 ...5-Fix-descriptors-usage-for-40-bits-.patch |   115 -
 ...-bcm2835-dma-Fix-WAIT_RESP-on-memcpy.patch |    25 -
 ...ma-Fix-dma_abort-for-40-bit-channels.patch |    78 -
 ...Fix-dma_abort-for-non-40bit-channels.patch |    68 -
 ...pport-dma-flags-for-multi-beat-burst.patch |    96 -
 ...-to-keep-PROT-bits-set-in-CS-on-40bi.patch |    77 -
 ...witch-to-dma40-channel-for-hdmi-audi.patch |    58 -
 ...dmi-Increase-MAI-fifo-dreq-threshold.patch |    50 -
 ...bcm2711-rpi-Set-a-1GB-ZONE_DMA-limit.patch |    41 -
 ...s-bcm27xx-Add-stdout-path-to-serial0.patch |    39 -
 ...-Only-read-data-for-number-of-points.patch |    58 -
 ...bcm2835-Flush-FIFOs-cleanly-on-error.patch |    45 -
 ...ot-abort-transfers-on-ERR-if-still-a.patch |    28 -
 ...c-bcm2835-Implement-I2C_M_IGNORE_NAK.patch |    61 -
 ...tibility-hack-should-be-X86-specific.patch |    48 -
 ...0739-bcm2835-dma-Fixes-for-dma_abort.patch |   154 -
 ...-definition-of-PROT-bits-to-expected.patch |    33 -
 ...media-imx296-Disable-2x2-binned-mode.patch |    68 -
 ...ix-st7701-Fix-panel-prepare-over-SPI.patch |    37 -
 ...-fix-binning-and-rate_factor-for-480.patch |   306 -
 ...7xx-Read-modem-line-state-at-startup.patch |    28 -
 ...m2835_unicam-Improve-frame-sequence-.patch |    79 -
 ...itft-28-35-overlays-for-6.1-driver-c.patch |    41 -
 ...-imx477-Re-enable-temperature-sensor.patch |    23 -
 ...lo-katana-dac-audio-Reduce-I2C-clock.patch |    25 -
 ...ys-jedec-spi-nor-Add-speed-parameter.patch |   308 -
 ...-constraints-for-E-AC3-DTS-HD-and-ML.patch |   137 -
 ...fix-channel-info-for-compressed-form.patch |    86 -
 ...m_64mp-Modify-the-line-length-of-128.patch |    44 -
 ...rducam_64mp-Add-8000x6000-resolution.patch |   105 -
 ...ia-i2c-arducam_64mp-Add-PDAF-support.patch |   163 -
 ...remap-Document-CM4-40-41-restriction.patch |    24 -
 ...ow-mac-address-to-be-set-in-smsc95xx.patch |   120 -
 ...hip-debian-certificates-as-hex-files.patch |  1455 -
 ...t-for-all-the-downstream-rpi-sound-c.patch |   329 -
 ...62-Set-the-pre_enable_upstream_first.patch |    21 -
 ...-cards-Fix-Codec-Zero-rate-switching.patch |    48 -
 ...trickle-voltage-mv-parameter-to-RTCs.patch |    68 -
 ...mx296-Add-standby-delay-during-probe.patch |    25 -
 ...ays-Add-bmp380-to-i2c-sensor-overlay.patch |    78 -
 ...odule-parameter-for-maximum-pdu-size.patch |   162 -
 ...x296-Updated-imx296-driver-for-exter.patch |    40 -
 ...s-imx258-Fix-alternate-compatible-st.patch |    26 -
 ...-vc_mem-Fix-preprocessor-conditional.patch |    21 -
 ...ers-dwc_otg-Fix-fallthrough-warnings.patch |    32 -
 ...-sm-cma-Switch-one-bit-bitfields-to-.patch |    61 -
 ...311-Fix-uninitialized-variable-usage.patch |    21 -
 ...fault-values-for-Waveshare-7.9-inch-.patch |    29 -
 ...2c-bus-overrides-to-edt-ft5406-overl.patch |   102 -
 ...overlays-Fix-README-text-for-i2c-fan.patch |    25 -
 ...-irqchip-irq-bcm2835-Concurrency-fix.patch |    50 -
 ...s-Add-drm-option-to-piscreen-overlay.patch |    58 -
 ...Resolve-clash-in-spi_device_id-names.patch |    36 -
 ...46-Add-missing-spi_device_id-strings.patch |    50 -
 ...codec-Downgrade-the-level-for-a-debu.patch |    27 -
 ...-functions-into-a-more-logical-order.patch |   286 -
 ...ework-the-atomic-vs-non-atomic-split.patch |   192 -
 ...d-NULL-pointer-dereference-in-f2fs_i.patch |    63 -
 ...rng-iproc-rng200-Add-BCM2838-support.patch |   161 -
 ...t-for-100ms-following-PERST-deassert.patch |    39 -
 ...0-0850-overlays-Add-a-sample-hat_map.patch |    47 -
 ...-usb-phy-generic-Get-the-vbus-supply.patch |    26 -
 ...0853-dts-2712-Update-for-device-tree.patch |  7672 --
 ...mstb-Allow-to-build-for-ARCH_BCM2835.patch |   282 -
 ...-Allow-RESET_BRCMSTB-on-ARCH_BCM2835.patch |    20 -
 ...nctrl-bcm2712-pinctrl-pinconf-driver.patch |  1324 -
 ...-mmc-brcmstb-add-support-for-BCM2712.patch |   498 -
 .../950-0860-sdhci-Add-SD-Express-hook.patch  |    90 -
 ...river-though-not-yet-the-Makesfiles-.patch |  3788 -
 ...q-bcm2712-mip-Support-for-2712-s-MIP.patch |   386 -
 ...et-brcmstb-rescal-Support-shared-use.patch |    47 -
 ...-net-macb-Also-set-DMA-coherent-mask.patch |   418 -
 ...wc3-Set-DMA-and-coherent-masks-early.patch |   384 -
 ...rrypi-touchscreen-Insert-more-delays.patch |    37 -
 ...0867-PCI-brcmstb-Add-BCM2712-support.patch |  1108 -
 ...V4L2-Add-PiSP-opaque-formats-to-V4L2.patch |    42 -
 ...-Add-PiSP-compressed-formats-to-V4L2.patch |    39 -
 ...mfd-Add-binding-for-Raspberry-Pi-RP1.patch |   249 -
 .../950-0872-mfd-Add-rp1-driver.patch         |   442 -
 ...ck-Add-bindings-for-Raspberry-Pi-RP1.patch |    65 -
 .../950-0874-clk-Add-rp1-clock-driver.patch   |  2208 -
 ...trl-Add-bindings-for-Raspberry-Pi-RP.patch |    60 -
 .../950-0876-pinctrl-Add-rp1-driver.patch     |  1666 -
 ...0-0877-serial-pl011-rp1-uart-support.patch |   129 -
 ...f-dwcmshc-define-sdio-timeout-clocks.patch |    83 -
 ...mc-sdhci-of-dwcmshc-rp1-sdio-changes.patch |    83 -
 ...950-0880-clk-rp1-Add-sdio-clk-driver.patch |   641 -
 ...ware-Add-SMBUS-quick-command-support.patch |    76 -
 ...-dmaengine-dw-axi-dmac-Fixes-for-RP1.patch |   355 -
 ...w-Handle-combined-tx-and-rx-messages.patch |    64 -
 ...950-0884-pwm-Add-support-for-RP1-PWM.patch |   292 -
 .../950-0885-drm-Add-RP1-DSI-driver.patch     |  2678 -
 .../950-0886-drm-Add-RP1-DPI-driver.patch     |  1552 -
 .../950-0887-drm-Add-RP1-VEC-driver.patch     |  3078 -
 ...p-compression-format-support-to-v4l2.patch |    75 -
 ...rp1-Add-CFE-Camera-Front-End-support.patch |  4527 --
 ...-net-cdns-macb-AXI-tuning-properties.patch |    38 -
 ...-dwc-list-all-supported-sample-sizes.patch |    29 -
 ...0892-ASoC-dwc-Support-set_bclk_ratio.patch |    59 -
 ...950-0893-ASoC-dwc-Add-DMACR-handling.patch |    81 -
 ...0-0894-ASOC-dwc-Improve-DMA-shutdown.patch |   128 -
 ...5-ASOC-dwc-Fix-16-bit-audio-handling.patch |    88 -
 ...bcm-Remove-dependency-on-BCM2835-I2S.patch |   304 -
 ...n-Add-RP1-ADC-and-temperature-driver.patch |   343 -
 ...d-bcm2835-pm-Add-support-for-BCM2712.patch |    69 -
 ...cm2835-power-Add-support-for-BCM2712.patch |    76 -
 ...spi-gpio-to-correctly-implement-sck-.patch |   150 -
 ...lement-spidelay-when-requested-bit-r.patch |    55 -
 ...ix-up-register-addresses-for-V3D-7.x.patch |   672 -
 ...UAPI-to-match-user-space-for-V3D-7.x.patch |    24 -
 ...-2712-v3d-as-a-compatible-V3D-device.patch |    19 -
 ...v3d-Add-BCM2712-to-compatibility-lis.patch |    19 -
 ...vers-char-add-generic-gpiomem-driver.patch |   328 -
 ...-drivers-char-delete-bcm2835-gpiomem.patch |   301 -
 ...1-adc-check-conversion-validity-befo.patch |    34 -
 ...maengine-bcm2835-Add-BCM2712-support.patch |    36 -
 ...m2835-HACK-Support-DMA-Lite-channels.patch |    57 -
 .../950-0913-clk-bcm-rpi-Add-disp-clock.patch |    46 -
 ...-optionally-enable-link-down-powersa.patch |    26 -
 ...5-Rename-to_bcm2711_cbaddr-to-to_40b.patch |    75 -
 ...cm2835-Fix-dma-driver-for-BCM2835-38.patch |    77 -
 ...0917-drivers-iommu-Add-BCM2712-IOMMU.patch |   855 -
 ...stb-l2-Add-config-for-2711-controlle.patch |    73 -
 ...d-simple-RTC-driver-for-Raspberry-Pi.patch |   237 -
 ...new-binding-for-Raspberry-Pi-RTC-dri.patch |    35 -
 ...m-fan-Add-fan-speed-register-support.patch |   164 -
 ...t-Add-bindings-for-raspberrypi-butto.patch |    63 -
 ...t-Add-bindings-for-raspberrypi-butto.patch |    27 -
 ...d-raspberrypi-button-firmware-driver.patch |   197 -
 ...6-dt-bindings-update-rpi-rtc-binding.patch |    29 -
 ...add-battery-charge-circuit-control-a.patch |   153 -
 ...-Avoid-panic-when-booted-with-no-kms.patch |    29 -
 ...ero-sized-destination-as-full-screen.patch |    28 -
 ...-for-when-the-YUV-chroma-planes-are-.patch |    50 -
 ...-drm-vc4-hdmi-Enable-the-audio-clock.patch |    39 -
 ...n-if-writing-to-an-unknown-HDMI-regi.patch |    31 -
 ...vs-More-logging-for-dlist-generation.patch |    41 -
 ...Print-error-if-we-fail-an-allocation.patch |    66 -
 ...dd-more-debugging-for-LBM-allocation.patch |    36 -
 ...-Use-return-variable-in-atomic_check.patch |    31 -
 ...-Move-assigned_channel-to-a-variable.patch |    47 -
 ...vc4-Introduce-generation-number-enum.patch |  1029 -
 ...-paths-unavailable-on-any-generation.patch |   577 -
 ...switch-statement-to-simplify-vc4_hvs.patch |   125 -
 ...switch-statement-to-simplify-enablin.patch |    74 -
 ...st-if-the-EOF-interrupts-are-enabled.patch |   100 -
 ...-drm-vc4-hvs-Create-hw_init-function.patch |   188 -
 ...drm-vc4-hvs-Create-cob_init-function.patch |   167 -
 ...945-drm-vc4-hvs-Rename-hvs_regs-list.patch |    38 -
 ...plane-Change-ptr0_offset-to-an-array.patch |   103 -
 ...947-drm-vc4-hvs-Rework-LBM-alignment.patch |    45 -
 ...ge-prototype-of-__vc4_hvs_alloc-to-p.patch |    93 -
 ...s-vertical-scaling-must-always-be-en.patch |    30 -
 ...id-hang-with-debug-registers-when-su.patch |    39 -
 ...-buffer-offset-out-of-the-vc4_plane_.patch |   154 -
 ...t-debug-not-resetting-the-next-entry.patch |    33 -
 ...ncorrect-limit-from-hvs_dlist-debugf.patch |    57 -
 ...m-vc4-hvs-Remove-ABORT_ON_EMPTY-flag.patch |    50 -
 ...ble-SCALER_CONTROL-early-in-HVS-init.patch |    59 -
 ...gs-display-Add-BCM2712-HDMI-bindings.patch |    26 -
 ...ngs-display-Add-BCM2712-HVS-bindings.patch |    34 -
 ...play-Add-BCM2712-PixelValve-bindings.patch |    28 -
 ...ngs-display-Add-BCM2712-MOP-bindings.patch |    28 -
 ...-display-Add-BCM2712-MOPLET-bindings.patch |    25 -
 ...play-Add-BCM2712-KMS-driver-bindings.patch |    23 -
 ...950-0962-drm-vc4-drv-Support-BCM2712.patch |    47 -
 ...0963-drm-vc4-hvs-Support-BCM2712-HVS.patch |  2139 -
 ...-Add-support-for-BCM2712-PixelValves.patch |   144 -
 ...-support-for-BCM2712-HDMI-controller.patch |  1057 -
 ...oduce-structure-to-deal-with-revisio.patch |   117 -
 ...rm-vc4-txp-Rename-TXP-data-structure.patch |    66 -
 ...m-vc4-txp-Add-byte-enable-toggle-bit.patch |    56 -
 ...horizontal-and-vertical-size-offset-.patch |    59 -
 ...vc4-txp-Handle-40-bits-DMA-Addresses.patch |    59 -
 ...-the-encoder-type-in-the-variant-str.patch |    44 -
 ...m-vc4-txp-Add-a-new-TXP-encoder-type.patch |   475 -
 ...-vc4-txp-Add-support-for-BCM2712-MOP.patch |    64 -
 ...m-vc4-txp-Add-BCM2712-MOPLET-support.patch |    42 -
 ...-0975-drm-vc4-Add-additional-warn_on.patch |   240 -
 ...Switch-generation-mockup-to-a-switch.patch |    47 -
 ...op-drm-parameter-for-vc4_find_crtc_f.patch |    63 -
 ...c4-tests-Return-the-allocated-output.patch |   174 -
 ...rm-vc4-tests-Add-BCM2712-mock-driver.patch |    87 -
 ...d-tests-for-BCM2712-PixelValve-Muxin.patch |   138 -
 ...-fkms-Rename-plane-related-functions.patch |    64 -
 ...ests-Use-custom-plane-state-for-mock.patch |    95 -
 ...d-function-to-lookup-a-plane-for-a-C.patch |    36 -
 ...d-helper-to-add-a-new-plane-to-a-sta.patch |    62 -
 ...sts-Support-a-few-more-plane-formats.patch |    26 -
 ...Introduce-a-test-for-LBM-buffer-size.patch |   358 -
 ...d-setting-core-and-disp-clocks-for-h.patch |    40 -
 ...ssign-LBM-memory-during-atomic_flush.patch |   240 -
 ...-Alter-the-timing-for-the-Pi-7-DSI-d.patch |    33 -
 ...eshare-Fix-up-timings-for-10.1-panel.patch |    33 -
 ...-Fix-locking-in-imx477_init_controls.patch |    34 -
 ...-0994-overlays-Fix-vc4-kms-dsi-7inch.patch |    57 -
 ...dec-Fix-broken-channel-map-reporting.patch |    56 -
 ...fe-Fix-use-of-freed-memory-on-errors.patch |    48 -
 ...ix-width-height-in-cfe_start_channel.patch |    88 -
 ...edia-rp1-csi2-Fix-missing-reg-writes.patch |    36 -
 ...-0-not-1-when-working-with-unsigned-.patch |    33 -
 ...edia-rp1-cfe-Fix-verbose-debug-print.patch |    26 -
 ...ename-xxx_dbg_irq-to-xxx_dbg_verbose.patch |   227 -
 ...-rp1-Add-back-reg-write-debug-prints.patch |    41 -
 ...e-Add-verbose-debug-module-parameter.patch |    23 -
 ...05-media-rp1-csi2-Track-CSI-2-errors.patch |   245 -
 ...1006-media-rp1-cfe-Drop-unused-field.patch |    31 -
 ...1-csi2-Set-values-for-enum-csi2_mode.patch |    30 -
 ...8-media-rp1-fe-Fix-default-mbus-code.patch |    27 -
 ...-cfe-Fix-default-meta-format-s-field.patch |    25 -
 ...il-streaming-if-FE_CONFIG-node-is-no.patch |    31 -
 ...config-entry-for-IMX477-to-the-camer.patch |    51 -
 ...alias-for-the-displays-to-use-as-the.patch |   109 -
 ...dt-Add-DSI1-and-DSI2-aliases-to-2712.patch |    24 -
 ...e-the-clear-of-SCALER_DISPBKGND_FILL.patch |    64 -
 ...rcmstb-Use-dynamic-GPIO-base-numbers.patch |   117 -
 ...-rpivid-Allow-use-of-iommu-in-rpivid.patch |    57 -
 ...1019-dts-bcm2712-Add-iommu-to-rpivid.patch |    22 -
 ...1_cfe-Remove-PISP-specific-MBUS-form.patch |   117 -
 ...m2835-codec-Correct-alignment-requir.patch |    53 -
 ...n-edt-ft5x06-Suppress-bogus-data-on-.patch |    96 -
 ...7-allow-specification-of-the-i2c-bus.patch |    97 -
 ...-Set-default-I2C-baudrates-to-100kHz.patch |    46 -
 ...e-DMA-memcpy-support-from-bcm2708_fb.patch |   345 -
 ...address-offset-for-planes-with-src_-.patch |    48 -
 ...1_cfe-Fix-link-validate-test-for-pix.patch |    69 -
 ...4-dts-bcm2712-Use-the-new-model-name.patch |    23 -
 ...nt-to-request-a-particular-dev-fbN-n.patch |    93 -
 ...ok-up-preferred-fbdev-node-number-fr.patch |    41 -
 ...-for-drm-framebuffer-allocations-on-.patch |    72 -
 ...ange-DRM-card-alias-from-underscore-.patch |    26 -
 ...r-alias-names-from-_-to-for-drm_dsiN.patch |    24 -
 ...ange-query-for-FB-designation-from-d.patch |    28 -
 ...ames-from-_-to-for-drm_fbN_-override.patch |    43 -
 .../950-1044-Typo-in-overlays-README.patch    |    21 -
 ...-dts-bcm2712-Add-the-krnbt-parameter.patch |    23 -
 ...-up-interrupt-handler-for-both-2835-.patch |   109 -
 ...2-firmware-kms-node-to-using-the-271.patch |    25 -
 ...vers-media-imx477-Disable-the-scaler.patch |    35 -
 ...-Add-drm_fbN_vc4-overrides-for-Pi0-4.patch |    37 -
 ...cp23017-allow-specification-of-the-i.patch |    95 -
 ...sp_be-Add-back-V4L2_PIX_FMT_RPI_BE-f.patch |    54 -
 ...brcmstb-add-optional-property-brcm-t.patch |    32 -
 ...stb-optionally-extend-Tperst_clk-tim.patch |    71 -
 ...arams-for-PCIe-reset-timing-override.patch |    59 -
 ...on-t-unconditionally-enable-MPS-read.patch |    35 -
 ...x477-Set-horizontal-binning-when-dis.patch |    39 -
 ...-Add-Revision-Serial-Model-to-cpuinf.patch |    25 -
 ...0-rpi-zero-2-w-Remove-WLAN-firmwares.patch |    35 -
 ...e-Set-the-CSI-2-link-frequency-corre.patch |   111 -
 ...2712-rpi-5-b-Create-some-dummy-nodes.patch |    42 -
 ...-rp1-Add-spi6-fix-spi1-address-cells.patch |    49 -
 ...art-n-pi5-Add-the-pinctrl-0-property.patch |    67 -
 ...mx477-Add-V4L2_CID_LINK_FREQ-control.patch |    51 -
 ...x477-Correctly-set-IMX477_PIXEL_RATE.patch |    24 -
 ...ect-logic-on-stopping-an-HVS-channel.patch |    52 -
 ...p-WARN-for-HVS-FIFOs-not-being-empty.patch |    30 -
 ...-stale-dlists-if-channel-is-disabled.patch |    85 -
 ...dd-hvs_dlist_allocs-debugfs-function.patch |    64 -
 ...size-of-the-dlist-allocation-that-wa.patch |    23 -
 ...port-odd-horizontal-timings-on-BCM27.patch |   104 -
 ...t-the-last-DMA-scoop-out-of-the-FIFO.patch |    41 -
 ...mc-sdhci-add-SPURIOUS_INT_RESP-quirk.patch |    62 -
 ...sdhci-of-dwcmhsc-Add-Raspberry-Pi-RP.patch |    42 -
 ...i-of-dwcmshc-add-RP1-dt-ID-and-quirk.patch |    41 -
 ...P1-SDHCI-controller-compatible-strin.patch |   104 -
 ...dioinjector_octo-Add-soundcard-owner.patch |    22 -
 ...x708-Adjust-broken-line-correction-p.patch |   139 -
 ...media-cfe-Don-t-confuse-MHz-and-Mbps.patch |    96 -
 ...Fix-cam-port-override-for-regulators.patch |    25 -
 ...v5647-Regularise-vcm-node-label-name.patch |    32 -
 ...ov5647-cam0-mode-should-use-cam0_reg.patch |    27 -
 .../950-1150-w1-Disable-kernel-log-spam.patch |    25 -
 ...s-Add-a-media-bus-format-enum-for-16.patch |    21 -
 ...2-Add-additional-pixel-formats-for-u.patch |    73 -
 ...e-Add-16-bit-and-compressed-mono-for.patch |    52 -
 ...sp_be-Add-mono-and-48-bit-RGB-pixel-.patch |    72 -
 ...ove-check-in-set_bclk_ratio-handling.patch |    32 -
 ...lays-README-Fix-cut-and-paste-errors.patch |    39 -
 ...-Switch-from-V4L2_CID_GAIN-to-V4L2_C.patch |    38 -
 ...lanes-that-are-completely-off-screen.patch |    63 -
 ...play-connector-Select-DRM_KMS_HELPER.patch |    29 -
 ...-dlist-alloc-immediately-if-it-never.patch |    56 -
 ...-Include-I2C-details-in-names-for-th.patch |    48 -
 ...lude-I2C-details-in-names-for-the-de.patch |    52 -
 ...iotlb-bounce-buffers-being-imported-.patch |    84 -
 ...rlays-i2c-sensor-Add-adt7410-support.patch |    75 -
 ...overlays-hat_map-Add-pisound-mapping.patch |    26 -
 ...argins-on-the-composite-connector-st.patch |    47 -
 ...070me05000-Add-prepare_upstream_firs.patch |    26 -
 ...e-Find-the-source-pads-on-the-sensor.patch |    55 -
 ...ption-for-cam0-to-camera-mux-Nport-o.patch |   101 -
 ...dwc-Permit-sample-rates-up-to-384kHz.patch |    26 -
 ...0-1176-ASoC-dwc-Fix-full-duplex-mode.patch |    63 -
 ...2x-Adds-bindings-for-TAS575x-devices.patch |    45 -
 ...rt-for-TAS575x-to-the-pcm512x-driver.patch |   102 -
 .../950-1182-drm-panel-add-panel-dsi.patch    |   176 -
 ...-bindings-display-panel-dsi-bindings.patch |   136 -
 ...e-overlay-for-using-panel-dsi-on-RPi.patch |   176 -
 ...5-allow-specification-of-the-i2c-bus.patch |   159 -
 ...ts-bcm2712-put-usb-under-axi-not-soc.patch |    59 -
 ...rect-HVS-muxing-setup-for-the-moplet.patch |    26 -
 ...moplet-have-different-register-offse.patch |    68 -
 ...orrect-the-size-of-the-register-rang.patch |    25 -
 ...CCI-register-access-helper-functions.patch |   388 -
 ...a-dt-bindings-Add-OmniVision-OV64A40.patch |   114 -
 ...ndings-i2c-Add-Rohm-BU64754-bindings.patch |    83 -
 ...2c-Add-driver-for-OmniVision-OV64A40.patch |  3763 -
 ...HM-BU64754-Camera-Autofocus-Actuator.patch |   368 -
 ...rlay-for-the-OV64A40-Arducam-Camera-.patch |   426 -
 ...edia-rp1-cfe-Fix-verbose-debug-print.patch |    26 -
 ...ia-rp1-cfe-Expose-find_format_by_pix.patch |    33 -
 ...201-media-rp1-cfe-Add-missing-remaps.patch |    43 -
 ...p1-cfe-Add-missing-compressed-remaps.patch |    43 -
 ...d-cfe_find_16bit_code-and-cfe_find_c.patch |    74 -
 ...-media-rp1-csi2-Fix-csi2_pad_set_fmt.patch |    95 -
 ...media-rp1-fe-Fix-pisp_fe_pad_set_fmt.patch |   104 -
 ...se-get_frame_desc-to-get-CSI-2-VC-an.patch |   146 -
 ...1207-media-rp1-cfe-Add-is_image_node.patch |    91 -
 ...dia-rp1-cfe-Dual-purpose-video-nodes.patch |   621 -
 .../950-1209-media-rp1-Drop-LE-handling.patch |   127 -
 ...-rp1-csi2-Use-standard-link_validate.patch |    75 -
 ...ia-rp1-fe-Use-standard-link_validate.patch |    70 -
 ...Improve-link-validation-for-metadata.patch |    61 -
 ...pinctrl-bcm-Kconfig-Fix-BCM2712-help.patch |    24 -
 ...panel-fix-waveshare-panel-software-r.patch |    41 -
 ...-Pass-given-partition-number-through.patch |    33 -
 ...2712-rpi-5-b-Enable-warm-reboot-mode.patch |    23 -
 ...c-imx296-imx477-Configure-tigger_mod.patch |    85 -
 ...ays-on-parameter-to-imx477-and-imx29.patch |    99 -
 ...06-Correct-prefix-length-in-snprintf.patch |    29 -
 ...712-rpi-5-b-Allow-RTC-to-be-disabled.patch |    38 -
 ...sp_be-pisp_fe-Update-UAPI-header-lic.patch |    58 -
 ...dia-cfe-Add-more-robust-ISR-handlers.patch |   207 -
 ...fer-bclk_ratio-handling-to-hw_params.patch |    89 -
 ...x-reading-of-frame-count-on-GEN5-Pi4.patch |    79 -
 ...2712-rpi-5-b-Add-eth_ledx-parameters.patch |    56 -
 ...m2712-rpi-5-b-Add-fan-speed-dtparams.patch |    71 -
 ...-Support-spi0-0cs-and-SPI_NO_CS-mode.patch |    42 -
 ...mx519-Add-V4L2_CID_LINK_FREQ-control.patch |    51 -
 ...ducam_64mp-Add-V4L2_CID_LINK_FREQ-co.patch |    56 -
 ...panel-Modify-the-DSI-mode-to-fix-the.patch |    25 -
 ...panel-Modified-the-timing-of-11.9inc.patch |    22 -
 ...12-support-to-vc4_plane_async_set_fb.patch |    88 -
 ...ic_async_check-to-call-the-right-mod.patch |    38 -
 ...Allow-non-standard-modes-with-variou.patch |   343 -
 ...M-pl011-Add-rs485-to-the-RP1-support.patch |    24 -
 ...q-bcm2712-mip-Support-for-2712-s-MIP.patch |    38 -
 ...-vc4_hvs_dlist_free_work-to-only-rea.patch |    45 -
 ...ale-dlist-entries-if-allocation-fail.patch |    69 -
 ...port-the-button-GPIO-via-sysfs-GPIO-.patch |    55 -
 ...-the-SPI-speed-to-use-from-the-Devic.patch |    94 -
 ...spi-speed-hz-for-Pisound-in-the-Devi.patch |   129 -
 ...ackup-switchover-mode-overlay-value-.patch |    51 -
 ...improvement-on-backup-switchover-mod.patch |    30 -
 ...ma-overlay-pi5-to-enable-32bit-DMA-o.patch |    85 -
 ...re-Use-SCL-rise-and-fall-times-in-DT.patch |    91 -
 ...ware-Support-non-standard-bus-speeds.patch |    80 -
 ...950-1259-ARM-dts-rp1-Add-I2C-timings.patch |    78 -
 ...m2712-don-t-allow-building-as-module.patch |    28 -
 ...depends-on-instead-of-select-MFD_RP1.patch |    59 -
 ...950-1262-Update-touch-PiTFT-overlays.patch |   435 -
 ...dts-rp1-Boost-the-I2C-drive-strength.patch |    95 -
 ...dts-rp1-Add-a-safe-I2C-SDA-hold-time.patch |    75 -
 ...-16bit-sample-support-in-clock-consu.patch |    33 -
 ...t-for-AMP4-Pro-to-the-DAC-Plus-drive.patch |   114 -
 ...-adds-support-for-Hifiberry-AMP4-Pro.patch |   130 -
 ...ro-fix-16bit-sample-support-in-clock.patch |    38 -
 ...lays-Correct-some-compatible-strings.patch |    72 -
 ...ys-Delete-deprecated-overlay-mpu6050.patch |    57 -
 ...e-Increase-default-size-of-embedded-.patch |    36 -
 ...is7xx-Don-t-spin-if-no-data-received.patch |    26 -
 ...-support-for-Interlude-Audio-Digital.patch |   196 -
 ...ded-for-Interlude-Audio-Digital-and-.patch |   179 -
 ...nable-V3D-to-use-different-PAGE_SIZE.patch |   118 -
 ...dau1977-adc-Replace-use-of-i2c-label.patch |    25 -
 ...Add-IQaudio-CodecZero-to-hat_map.dts.patch |    24 -
 ...erry-DAC8X-to-the-simple-card-driver.patch |    82 -
 ...initions-for-HiFiBerry-8-channel-DAC.patch |   113 -
 ...ix-lbm-size-calculation-for-yuv-6012.patch |    31 -
 ...add-waveshare-4inch-dsi-lcd-C-driver.patch |    41 -
 ...-waveshare-4inch-dsi-lcd-C-dtoverlay.patch |    22 -
 ...veshare-11.9inch-touch-orientation-e.patch |    22 -
 ...veshare-4inch-dsi-lcd-C-parameters-t.patch |    21 -
 ...cific-clk-producer-consumer-overlays.patch |   223 -
 ...overlays-hat_map-Add-Hifiberry-cards.patch |    96 -
 ...ample-support-for-Hifiberry-DACplusA.patch |    31 -
 ...s_clk_producer-as-default-for-Hifibe.patch |    79 -
 ...-make-trigger-mode-more-configurable.patch |    77 -
 ...vice-tree-overlays-to-support-trigge.patch |   129 -
 .../960-hwrng-iproc-set-quality-to-1000.patch |    25 -
 ...d-rp1-Support-interrupt-CPU-affinity.patch |    35 -
 ...1-Use-the-correct-per-bank-GPIO-base.patch |    30 -
 ...-Allow-legacy-brcm-pins-on-all-banks.patch |    47 -
 ...l-rp1-Support-interrupt-CPU-affinity.patch |    52 -
 ...1-Clear-events-when-setting-IRQ-type.patch |    31 -
 1106 files changed, 1 insertion(+), 315547 deletions(-)
 delete mode 100644 target/linux/bcm27xx/bcm2708/config-6.1
 delete mode 100644 target/linux/bcm27xx/bcm2709/config-6.1
 delete mode 100644 target/linux/bcm27xx/bcm2710/config-6.1
 delete mode 100644 target/linux/bcm27xx/bcm2711/config-6.1
 delete mode 100644 target/linux/bcm27xx/bcm2712/config-6.1
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0001-Support-RPi-DPI-interface-in-mode6-for-18-bit-color.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0002-drm-vc4-Add-FKMS-as-an-acceptable-node-for-dma-range.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0003-drm-vc4-Add-the-2711-HVS-as-a-suitable-DMA-node.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0004-drm-vc4-Change-the-default-DPI-format-to-being-18bpp.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0005-drm-atomic-Don-t-fixup-modes-that-haven-t-been-reset.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0006-drm-vc4-Fix-timings-for-VEC-modes.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0007-drm-vc4-Fix-definition-of-PAL-M-mode.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0008-drm-vc4-Add-support-for-more-analog-TV-standards.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0009-drm-vc4-Allow-setting-the-TV-norm-via-module-paramet.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0010-drm-vc4-Refactor-mode-checking-logic.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0011-drm-vc4-Add-firmware-kms-mode.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0012-drm-vc4-Add-support-for-gamma-on-BCM2711.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0013-drm-vc4-Add-debugfs-node-that-dumps-the-vc5-gamma-PW.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0014-drm-vc4-hvs-Force-modeset-on-gamma-lut-change.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0015-drm-vc4-Relax-VEC-modeline-requirements-and-add-prog.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0016-drm-vc4-Make-VEC-progressive-modes-readily-accessibl.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0017-drm-Check-whether-the-gamma-lut-has-changed-before-u.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0018-drm-vc4-Enable-gamma-block-only-when-required.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0019-drm-vc4-Only-add-gamma-properties-once.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0020-drm-vc4-Validate-the-size-of-the-gamma_lut.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0021-drm-vc4-Disable-Gamma-control-on-HVS5-due-to-issues-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0022-drm-vc4_hdmi-Add-Broadcast-RGB-property-to-allow-ove.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0023-drm-vc4-Add-DRM-210101010-RGB-formats-for-hvs5.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0024-drm-vc4-dpi-Support-DPI-interface-in-mode3-for-RGB56.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0025-drm-panel-Add-and-initialise-an-orientation-field-to.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0026-drm-dsi-Document-the-meaning-and-spec-references-for.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0027-drm-bridge-tc358762-Ignore-EPROBE_DEFER-when-logging.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0028-drm-vc4-Rename-bridge-to-out_bridge.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0029-drm-vc4-Move-DSI-initialisation-to-encoder_mode_set.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0030-drm-vc4-Remove-splitting-the-bridge-chain-from-the-d.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0031-drm-vc4-Convert-vc4_dsi-to-use-atomic-enable-disable.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0032-drm-vc4-Convert-vc4_dsi-to-using-a-bridge-instead-of.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0033-drm-vc4-Remove-entry-to-ULPS-from-vc4_dsi-post_disab.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0035-drm-panel-Add-prepare_upstream_first-flag-to-drm_pan.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0036-drm-Include-drm_connector.h-from-drm_panel.h.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0037-drm-tc358762-Set-the-pre_enable_upstream_first-flag-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0038-drm-vc4-Support-zpos-on-all-planes.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0039-drm-vc4-hdmi-Add-CSC-for-BT601-709-2020-limited-and-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0040-vc4-drm-vc4_plane-Keep-fractional-source-coords-insi.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0041-vc4-drm-Handle-fractional-coordinates-using-the-phas.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0042-drm-Add-chroma-siting-properties.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0043-vc4-drm-plane-Make-use-of-chroma-siting-parameter.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0044-drm-vc4-Force-trigger-of-dlist-update-on-margins-cha.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0045-drm-atomic-helpers-remove-legacy_cursor_update-hacks.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0046-drm-vc4_hdmi-Force-a-modeset-when-Broadcast-RGB-sett.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0047-drm-atomic-If-margins-are-updated-update-all-planes.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0048-drm-vc4-hvs-Ignore-atomic_flush-if-we-re-disabled.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0049-drm-vc4-0-is-a-valid-value-for-pixel_order_hvs5-so-f.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0050-drm-vc4-Omit-pixel_order-from-the-hvs_format-for-hvs.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0051-drm-vc4-Add-3-3-2-and-4-4-4-4-RGB-RGBX-RGBA-formats.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0052-drm-vc4-Add-comments-for-which-HVS_PIXEL_ORDER_xxx-d.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0053-drm-vc4-Add-async-update-support-for-cursor-planes.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0054-drm-vc4-Configure-the-HVS-COB-allocations.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0055-drm-vc4-Set-AXI-panic-modes-for-the-HVS.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0056-drm-vc4-hvs-Skip-DebugFS-Registration-for-FKMS.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0057-media-uapi-Add-some-RGB-bus-formats-for-VC4-DPI-outp.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0058-raspberrypi-firmware-Update-mailbox-commands.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0059-clk-bcm-rpi-Create-helper-to-retrieve-private-data.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0060-arm64-setup-Fix-build-warning.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0061-BCM2708-Add-core-Device-Tree-support.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0062-clk-raspberrypi-Add-ISP-to-exported-clocks.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0063-Register-the-clocks-early-during-the-boot-process-so.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0064-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0065-clk-bcm2835-Add-claim-clocks-property.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0066-clk-bcm2835-Read-max-core-clock-from-firmware.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0067-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0068-clk-bcm2835-Don-t-wait-for-pllh-lock.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0069-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0070-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0071-clk-bcm2835-Avoid-null-pointer-exception.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0072-clk-bcm2835-Disable-v3d-clock.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0073-clk-bcm2835-Pass-DT-node-to-rpi_firmware_get.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0074-clk-bcm2835-Remove-VEC-clock-support.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0075-arm-partially-revert-702b94bff3c50542a6e4ab9a4f4cef0.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0076-cache-export-clean-and-invalidate.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0077-Revert-spi-spidev-Fix-CS-polarity-if-GPIO-descriptor.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0078-Revert-Bluetooth-Always-request-for-user-confirmatio.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0079-Revert-Bluetooth-Always-request-for-user-confirmatio.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0080-Revert-net-bcmgenet-Request-APD-DLL-disable-and-IDDQ.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0082-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0083-Allow-mac-address-to-be-set-in-smsc95xx.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0084-cgroup-Disable-cgroup-memory-by-default.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0085-Protect-__release_resource-against-resources-without.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0086-irq-bcm2836-Avoid-Invalid-trigger-warning.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0087-irqchip-bcm2835-Add-FIQ-support.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0088-irqchip-irq-bcm2835-Add-2836-FIQ-support.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0089-spi-spidev-Completely-disable-the-spidev-warning.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0090-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0091-rtc-Add-SPI-alias-for-pcf2123-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0092-watchdog-bcm2835-Support-setting-reboot-partition.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0093-reboot-Use-power-off-rather-than-busy-spinning-when-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0094-bcm-Make-RASPBERRYPI_POWER-depend-on-PM.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0095-bcm2835-rng-Avoid-initialising-if-already-enabled.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0096-sound-Demote-deferral-errors-to-INFO-level.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0097-Update-vfpmodule.c.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0098-i2c-bcm2835-Add-debug-support.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0099-irqchip-irq-bcm2836-Remove-regmap-and-syscon-use.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0100-lan78xx-Enable-LEDs-and-auto-negotiation.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0101-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0102-amba_pl011-Add-cts-event-workaround-DT-property.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0103-tty-amba-pl011-Avoid-rare-write-when-full-error.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0104-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0105-Main-bcm2708-bcm2709-linux-port.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0106-Add-dwc_otg-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0107-bcm2708-framebuffer-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0108-Pulled-in-the-multi-frame-buffer-support-from-the-Pi.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0109-fbdev-add-FBIOCOPYAREA-ioctl.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0110-dmaengine-Add-support-for-BCM2708.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0111-MMC-added-alternative-MMC-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0112-Adding-bcm2835-sdhost-driver-and-an-overlay-to-enabl.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0113-vc_mem-Add-vc_mem-driver-for-querying-firmware-memor.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0114-Add-dev-gpiomem-device-for-rootless-user-GPIO-access.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0115-Add-SMI-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0116-Add-Chris-Boot-s-i2c-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0117-char-broadcom-Add-vcio-module.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0118-firmware-bcm2835-Support-ARCH_BCM270x.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0119-leds-Add-the-input-trigger-for-pwr_led.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0120-Added-Device-IDs-for-August-DVB-T-205.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0121-Improve-__copy_to_user-and-__copy_from_user-performa.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0122-gpio-poweroff-Allow-it-to-work-on-Raspberry-Pi.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0123-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0124-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0125-rpi_display-add-backlight-driver-and-overlay.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0126-bcm2835-virtgpio-Virtual-GPIO-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0127-OF-DT-Overlay-configfs-interface.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0128-hci_h5-Don-t-send-conf_req-when-ACTIVE.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0129-ARM64-Round-Robin-dispatch-IRQs-between-CPUs.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0130-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0131-AXI-performance-monitor-driver-2222.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0132-ARM-bcm2835-Set-Serial-number-and-Revision.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0133-dwc-otg-FIQ-Fix-bad-mode-in-data-abort-handler.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0134-ARM-Activate-FIQs-to-avoid-__irq_startup-warnings.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0135-i2c-gpio-Also-set-bus-numbers-from-reg-property.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0136-added-capture_clear-option-to-pps-gpio-via-dtoverlay.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0137-lan78xx-Read-initial-EEE-status-from-DT.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0138-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0139-Add-ability-to-export-gpio-used-by-gpio-poweroff.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0140-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0141-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0142-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0143-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0144-cxd2880-CXD2880_SPI_DRV-should-select-DVB_CXD2880-wi.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0145-firmware-raspberrypi-Add-backward-compatible-get_thr.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0147-drivers-thermal-step_wise-add-support-for-hysteresis.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0148-drivers-thermal-step_wise-avoid-throttling-at-hyster.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0150-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0151-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0152-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0153-lan78xx-EEE-support-is-now-a-PHY-property.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0154-bcm2835-dma-Add-support-for-per-channel-flags.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0155-rtc-rv3028-Add-backup-switchover-mode-support.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0156-media-tc358743-Increase-FIFO-level-to-374.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0157-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0158-media-tc358743-Check-I2C-succeeded-during-probe.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0159-media-adv7180-Default-to-the-first-valid-input.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0160-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0161-media-videodev2-Add-helper-defines-for-printing-FOUR.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0162-dt-bindings-Document-BCM283x-CSI2-CCP2-receiver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0163-MAINTAINERS-Add-entry-for-BCM2835-Unicam-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0164-media-tc358743-Return-an-appropriate-colorspace-from.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0165-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0166-staging-mmal-vchiq-Add-support-for-event-callbacks.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0167-staging-vc04_services-Support-sending-data-to-MMAL-p.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0168-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0169-staging-mmal-vchiq-Fix-client_component-for-64-bit-k.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0170-staging-mmal_vchiq-Add-in-the-Bayer-encoding-formats.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0171-staging-mmal-vchiq-Update-mmal_parameters.h-with-rec.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0172-staging-mmal-vchiq-Free-the-event-context-for-contro.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0173-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0174-w1-w1-gpio-Make-GPIO-an-output-for-strong-pullup.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0175-arm-bcm2835-Fix-FIQ-early-ioremap.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0176-arm-bcm2835-DMA-can-only-address-1GB.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0178-bcmgenet-constrain-max-DMA-burst-length.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0179-bcmgenet-Better-coalescing-parameter-defaults.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0180-net-genet-enable-link-energy-detect-powerdown-for-ex.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0181-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0182-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0183-usbhid-call-usb_fixup_endpoint-after-mangling-interv.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0184-arm-bcm2835-Add-bcm2838-compatible-string.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0185-i2c-bcm2835-Set-clock-stretch-timeout-to-35ms.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0186-drm-v3d-Clock-V3D-down-when-not-in-use.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0187-drivers-char-add-chardev-for-mmap-ing-the-RPiVid-con.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0188-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0189-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0190-xhci-Use-more-event-ring-segment-table-entries.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0191-arch-arm-Add-model-string-to-cpuinfo.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0192-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0193-media-i2c-imx258-Support-for-the-Sony-IMX258-sensor.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0194-media-i2c-imx290-Support-for-the-Sony-IMX290-sensor.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0195-media-i2c-imx477-Support-for-the-Sony-IMX477-sensor.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0196-media-i2c-imx519-Support-for-the-Sony-IMX519-sensor.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0197-Documentation-devicetree-Add-documentation-for-imx37.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0198-v4l2-Add-a-Greyworld-AWB-mode.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0199-staging-bcm2835-camera-Add-greyworld-AWB-mode.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0200-media-v4l2-Add-Greyworld-AWB-control-name.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0201-staging-bcm2835-camera-Fix-the-cherry-pick-of-AWB-Gr.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0202-ARM-bcm-Switch-board-clk-and-pinctrl-to-bcm2711-comp.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0203-dt-bindings-Add-binding-for-the-Infineon-IRS1125-sen.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0204-media-i2c-Add-a-driver-for-the-Infineon-IRS1125-dept.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0205-drm-v3d-Suppress-all-but-the-first-MMU-error.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0206-drm-v3d-Plug-dma_fence-leak.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0207-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0208-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0209-net-phy-2711-Allow-ethernet-LED-mode-to-be-set-via-d.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0210-v3d_drv-Handle-missing-clock-more-gracefully.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0211-v3d_gem-Kick-the-clock-so-firmware-knows-we-are-usin.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0212-clk-raspberrypi-Allow-cpufreq-driver-to-also-adjust-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0213-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0214-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0215-ARM-bcm-Backport-BCM2711-support-from-upstream.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0216-Initialise-rpi-firmware-before-clk-bcm2835.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0217-staging-vchiq_arm-Give-vchiq-children-DT-nodes.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0218-pinctrl-bcm2835-Remove-gpiochip-on-error.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0219-video-fbdev-bcm2708_fb-Use-common-compat-header.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0220-of-overlay-Correct-symbol-path-fixups.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0221-dt-bindings-pci-Add-DT-docs-for-Brcmstb-PCIe-device.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0222-bcmgenet-Disable-skip_umac_reset-by-default.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0223-media-videodev2.h-Add-a-format-for-column-YUV4-2-0-m.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0224-media-dt-bindings-media-Add-binding-for-the-Raspberr.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0225-RFC-media-Add-media_request_-pin-unpin-API.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0226-staging-media-rpivid-Add-Raspberry-Pi-V4L2-H265-deco.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0227-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0228-media-uapi-v4l2-core-Add-sensor-ancillary-data-V4L2-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0229-media-uapi-Add-MEDIA_BUS_FMT_SENSOR_DATA-media-bus-f.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0230-media-uapi-v4l2-core-Add-ISP-statistics-output-V4L2-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0231-media-uapi-v4l-ctrls-Add-CID-base-for-the-bcm2835-is.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0232-staging-vchiq-Load-bcm2835_isp-driver-from-vchiq.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0233-bcm2835-dma-Add-proper-40-bit-DMA-support.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0234-media-i2c-tc358743-Fix-fallthrough-warning.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0235-video-bcm2708_fb-Disable-FB-if-no-displays-found.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0236-staging-vc04_services-mmal-vchiq-Update-parameters-l.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0237-staging-vc04_services-bcm2835-camera-Request-headers.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0238-zswap-Defer-zswap-initialisation.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0239-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0240-PCI-brcmstb-Add-DT-property-to-control-L1SS.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0241-media-irs1125-Using-i2c_transfer-for-ic2-reads.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0242-media-irs1125-Refactoring-and-debug-messages.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0243-media-irs1125-Atomic-access-to-imager-reconfiguratio.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0244-media-irs1125-Keep-HW-in-sync-after-imager-reset.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0245-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0246-media-bcm2835-unicam-Kconfig-Makefile-for-CCP2-CSI2-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0247-media-bcm2835-unicam-Add-support-for-get_mbus_config.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0248-media-bcm2835-unicam-Avoid-gcc-warning-over-0-on-end.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0249-serial-8250-bcm2835aux-defer-if-clock-is-zero.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0250-media-Add-a-pixel-format-for-MIPI-packed-12bit-luma-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0251-media-Add-a-pixel-format-for-MIPI-packed-14bit-luma-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0252-media-bcm2835-unicam-Add-support-for-12bit-mono-pack.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0253-media-bcm2835-unicam-Add-support-for-14bit-mono-sour.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0254-media-bcm2835-unicam-Add-support-for-unpacked-14bit-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0255-bcm2835-dma-Add-NO_WAIT_RESP-flag.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0256-media-bcm2835-unicam-Reinstate-V4L2_CAP_READWRITE-in.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0257-media-bcm2835-unicam-Ensure-type-is-VIDEO_CAPTURE-in.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0258-media-bcm2835-unicam-Set-VPU-min-clock-freq-to-250Mh.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0259-dt-bindings-bcm2835-unicam-Update-documentation-with.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0260-leds-Add-the-actpwr-trigger.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0261-bcm2835-dma-Advertise-the-full-DMA-range.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0262-media-bcm2835-unicam-Drop-WARN-on-uing-direct-cache-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0263-media-i2c-tc358743-Only-allow-supported-pixel-fmts-i.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0264-media-bcm2835-unicam-Always-service-interrupts.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0265-media-bcm2835-unicam-Fix-uninitialized-warning.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0266-media-bcm2835-unicam-Fixup-review-comments-from-Hans.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0267-media-bcm2835-unicam-Retain-packing-information-on-G.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0268-media-bcm2835-unicam-change-minimum-number-of-vb2_qu.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0269-staging-fbtft-Add-support-for-display-variants.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0271-char-Add-broadcom-char-drivers-back-to-build-files.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0272-staging-bcm2835-camera-Replace-deprecated-V4L2_PIX_F.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0273-staging-vc04_services-Add-new-vc-sm-cma-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0274-staging-vchiq-mmal-Add-support-for-14bit-Bayer.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0275-staging-mmal-vchiq-Add-monochrome-image-formats.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0276-staging-mmal-vchiq-Use-vc-sm-cma-to-support-zero-cop.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0277-staging-vc04_services-Add-a-V4L2-M2M-codec-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0278-bcm2835-dma-only-reserve-channel-0-if-legacy-dma-dri.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0279-uapi-bcm2835-isp-Add-bcm2835-isp-uapi-header-file.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0280-staging-vc04_services-ISP-Add-a-more-complex-ISP-pro.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0281-gpio-Add-gpio-fsm-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0282-rpisense-fb-Set-pseudo_pallete-to-prevent-crash-on-f.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0283-bcm2708_fb-Fix-a-build-warning.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0284-watchdog-bcm2835-Ignore-params-after-the-partition-n.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0285-firmware-raspberrypi-Add-support-for-tryonce-reboot-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0286-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0287-phy-broadcom-Add-bcm54213pe-configuration.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0288-PCI-brcmstb-Restore-initial-fundamental-reset.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0289-Input-edt-ft5x06-Poll-the-device-if-no-interrupt-is-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0290-drm-panel-raspberrypi-touchscreen-Use-independent-I2.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0291-drm-panel-raspberrypi-ts-Insert-delay-before-polling.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0292-dt-bindings-Add-compatible-for-BCM2711-DSI1.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0293-media-bcm2835-unicam-Correctly-handle-error-propagat.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0294-media-bcm2835-unicam-Return-early-from-stop_streamin.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0295-media-bcm2835-unicam-Clear-clock-state-when-stopping.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0296-PCI-brcmstb-Advertise-MSI-X-support.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0297-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0298-vc-sm-cma-fixed-kbuild-problem.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0299-staging-vc04_services-Add-additional-unpacked-raw-fo.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0300-staging-bcm2835-isp-Add-the-unpacked-16bpp-raw-forma.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0301-staging-bcm2835-isp-Log-the-number-of-excess-support.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0302-bcm2835-dma-Avoid-losing-CS-flags-after-interrupt.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0303-bcm2835-dma-Add-bcm2835-dma-Add-DMA_WIDE_SOURCE-and-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0304-uapi-bcm2835-isp-Add-colour-denoise-configuration.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0305-staging-vc04_services-ISP-Add-colour-denoise-control.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0306-spi-bcm2835-Workaround-fix-for-zero-length-transfers.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0307-kbuild-Silence-unavoidable-dtc-overlay-warnings.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0308-bcm2835-isp-Allow-formats-with-different-colour-spac.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0309-media-bcm2835-unicam-Fix-bug-in-buffer-swapping-logi.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0310-Assign-crypto-aliases-to-different-AES-implementatio.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0311-media-v4l2_m2m-In-buffered-mode-run-jobs-if-either-p.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0312-media-i2c-add-ov9281-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0313-media-ov5647-Fix-return-codes-from-ov5647_write-ov56.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0314-media-i2c-ov5647-Parse-and-register-properties.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0315-staging-bcm2835-camera-Add-support-for-DMABUFs.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0316-staging-fbtft-Add-minipitft13-variant.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0317-drm-panel-jdi-lt070me05000-Use-gpiod_set_value_cansl.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0318-staging-bcm2835-camera-Add-support-for-H264-levels-4.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0319-staging-bcm2835-isp-Fix-compiler-warning.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0320-gpio-poweroff-Remember-the-old-poweroff-handler.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0321-media-i2c-ov5647-Correct-pixel-array-offset.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0322-media-i2c-ov5647-Correct-minimum-VBLANK-value.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0323-media-i2c-ov5647-Fix-v4l2-compliance-failure-subscri.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0324-staging-vc04_services-isp-Set-the-YUV420-YVU420-form.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0325-media-bcm2835-unicam-Forward-input-status-from-subde.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0326-media-i2c-ov7251-Add-fwnode-properties-controls.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0327-usb-xhci-workaround-for-bogus-SET_DEQ_PENDING-endpoi.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0328-staging-vchiq_arm-Add-36-bit-address-support.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0329-staging-vchiq_arm-children-inherit-DMA-config.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0330-staging-vchiq_arm-Usa-a-DMA-pool-for-small-bulks.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0331-drm-panel-raspberrypi-touchscreen-Handle-I2C-errors.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0332-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0333-Input-edt-ft54x6-Clean-up-timer-and-workqueue-on-rem.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0334-staging-vchiq-mmal-Add-buffer-flags-for-interlaced-v.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0335-staging-vchiq-mmal-Add-parameters-for-interlaced-vid.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0336-staging-vchiq-mmal-Add-the-deinterlace-image-effects.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0337-Add-Raspberry-Pi-PoE-HAT-support.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0338-staging-mmal-vchiq-Rationalise-included-headers.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0339-staging-mmal-vchiq-Add-module-parameter-to-enable-lo.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0340-staging-mmal-vchiq-Reset-buffers_with_vpu-on-port_en.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0341-drivers-gpio-Add-a-driver-that-wraps-the-PWM-API-as-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0342-media-i2c-ov5647-Sensor-should-report-RAW-color-spac.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0343-vc04_services-isp-Report-input-node-as-wanting-full-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0344-media-bcm2835-unicam-Parse-pad-numbers-correctly.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0345-media-bcm2835-unicam-Add-support-for-configuration-v.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0346-staging-bcm2835-camera-Add-support-for-H264_MIN_QP-H.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0347-staging-bcm2835-camera-Add-support-for-MPEG_VIDEO_FO.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0348-media-i2c-ov5647-Support-HFLIP-and-VFLIP.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0349-drivers-bcm2835_isp-Allow-multiple-users-for-the-ISP.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0350-drivers-bcm2835_isp-Fix-div-by-0-bug.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0351-spi-spidev-Restore-loading-from-Device-Tree.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0352-input-edt-ft5x06-Handle-unreliable-TOUCH_UP-events.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0353-drivers-bcm2835_unicam-Add-logging-message-when-a-fr.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0354-regulator-rpi-panel-attiny-Don-t-read-the-LCD-power-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0355-input-edt-ft5x06-Only-look-at-the-number-of-points-r.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0356-rtc-pcf8523-Fix-oscillator-stop-bit-handling.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0357-drm-panel-simple-Populate-bpc-when-using-panel-dpi.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0358-drm-panel-simple-Allow-the-bus-format-to-be-read-fro.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0359-xhci-quirks-add-link-TRB-quirk-for-VL805.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0360-xhci-correct-room_on_ring-for-cases-where-there-is-a.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0361-xhci-refactor-out-TRBS_PER_SEGMENT-define-in-runtime.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0362-usb-xhci-add-VLI_TRB_CACHE_BUG-quirk.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0363-media-i2c-ov5647-Add-support-for-regulator-control.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0364-media-i2c-ov7251-Make-the-enable-GPIO-optional.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0365-staging-bcm2835-isp-Fix-cleanup-after-init-fail.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0366-uapi-v4l2-controls-Reset-V4L2_CID_USER_BCM2835_ISP_B.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0367-media-i2c-ov9281-Increase-diff-between-VTS-and-max-e.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0369-bcm2835-v4l2-isp-Add-missing-lock-initialization.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0370-mfd-simple-mfd-i2c-Add-configuration-for-RPi-POE-HAT.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0371-pwm-raspberrypi-poe-Add-option-of-being-created-by-M.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0372-power-rpi-poe-Drop-CURRENT_AVG-as-it-is-not-hardware.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0373-power-rpi-poe-Add-option-of-being-created-by-MFD-or-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0374-drivers-bcm2835_unicam-Disable-trigger-mode-operatio.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0375-Extending-ili9881c-driver-support-for-nwe080-panel.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0376-media-bcm2835-unicam-Set-ret-on-error-path-in-unicam.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0377-media-i2c-ov9281-Initialize-id_msb-to-zero-in-ov9281.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0378-i2c-bcm2835-Make-clock-stretch-timeout-configurable.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0379-Patching-lan78xx-for-SOF_TIMESTAMPING_TX_SOFTWARE-su.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0380-media-uapi-Document-format-MEDIA_BUS_FMT_RGB565_1X24.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0381-dt-bindings-vendor-prefixes-Add-Geekworm.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0382-dt-bindings-display-simple-add-Geekworm-MZP280-Panel.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0383-drm-panel-simple-add-Geekworm-MZP280-Panel.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0384-drm-panel-simple-Remove-custom-handling-of-orientati.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0385-drm-panel-Add-panel-driver-for-Ilitek-ILI9806E-panel.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0386-drm-panel-Add-panel-driver-for-TDO-Y17B-based-panels.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0387-bindings-Add-sck-idle-input-to-spi-gpio.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0388-spi-gpio-Add-sck-idle-input-property.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0389-media-bcm2835-unicam-Handle-a-repeated-frame-start-w.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0390-usb-xhci-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0391-media-i2c-ov7251-Reinstate-setting-ov7251_global_ini.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0392-usb-xhci-rework-XHCI_VLI_SS_BULK_OUT_BUG-quirk.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0393-media-i2c-Add-driver-for-Omnivision-OV2311.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0394-staging-vc04_services-isp-Permit-all-sRGB-colour-spa.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0395-drivers-staging-bcm2835-isp-Do-not-cleanup-mmal-vcsm.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0396-dt-bindings-media-i2c-Add-binding-for-ad5398-VCM.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0397-media-i2c-Add-driver-for-AD5398-VCM-lens-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0398-media-i2c-ov5647-Use-v4l2_async_register_subdev_sens.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0399-media-i2c-Rename-ad5398-to-ad5398_vcm.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0400-drivers-staging-bcm2835-isp-Clear-LS-table-handle-in.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0401-mm-page_alloc-cma-introduce-a-customisable-threshold.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0402-pinctrl-bcm2835-Only-return-non-GPIOs-to-inputs.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0403-drm-panel-ilitek-ili9881c-Clean-up-on-mipi_dsi_attac.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0404-drm-panel-panel-ilitek9881c-Add-prepare_upstream_fir.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0405-clk-bcm2835-use-subsys_initcall-for-the-clock-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0406-tpm_tis_spi_main-Force-probe-routine-to-run-synchron.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0407-staging-vchiq_arm-Add-log_level-module-params.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0408-dt-bindings-vendor-prefixes-Add-Arducam.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0409-media-dt-bindings-media-i2c-Add-Arducam-Pivariety-Se.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0410-media-i2c-Add-driver-of-Arducam-Pivariety-series-cam.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0411-thermal-broadcom-Use-dev_err_probe-to-suppress-defer.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0412-dt-bindings-hwmon-add-microchip-emc2305.yaml-dt-bind.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0413-dtbindings-Fixup-microchip-emc2305.yaml-bindings.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0414-media-i2c-Update-ov2311-Kconfig-entry.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0415-media-i2c-Update-ov9281-Kconfig-entry.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0416-media-i2c-Update-irs1125-Kconfig-entry.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0417-media-i2c-arducam-pivariety-Fixup-for-mainline-API-c.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0418-mmc-block-Don-t-do-single-sector-reads-during-recove.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0419-vc04_services-vchiq-mmal-Add-defines-for-mmal_es_for.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0420-random-do-not-use-jump-labels-before-they-are-initia.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0421-drm-v3d-Switch-clock-setting-to-new-api.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0422-clk-raspberrypi-Enable-minimize-for-all-firmware-clo.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0423-media-dt-bindings-media-i2c-Add-Arducam-64MP-CMOS-se.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0424-media-i2c-Add-driver-of-Arducam-64MP-camera.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0425-media-i2c-arducam_64mp-Advertise-embedded-data-node-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0426-Add-HDMI1-facility-to-the-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0427-Populate-phy-driver-block-for-BCM54213PE.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0428-clk-bcm-rpi-Add-the-BCM283x-pixel-clock.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0429-media-i2c-ov9281-Correct-min-def-vts-for-640x400.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0430-media-i2c-ov9281-Change-exposure-default-value-with-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0431-media-bcm2835-unicam-Correctly-handle-FS-FE-ISR-cond.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0432-drm-panel-simple-hack-ignore-orientation.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0433-vc04_services-vc-sm-cma-Handle-upstream-require-vchi.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0434-media-video-mux-Read-CSI2-config-from-FW-and-pass-to.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0435-media-i2c-arducam-pivariety-Add-custom-controls.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0436-media-bcm2835-unicam-Fix-for-possible-dummy-buffer-o.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0437-usb-xhci-expand-mitigations-for-VLI_SS_BULK_OUT_BUG-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0438-usb-xhci-account-for-num_trbs_free-when-invalidating.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0440-drm-panel-Rename-GEM-CMA-helpers-GEM-DMA-helpers.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0441-hwmon-emc2305-fixups-for-driver-submitted-to-mailing.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0442-media-bcm2835-unicam-Fix-up-start-stop-api-change.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0443-drivers-usb-dwc_otg-fix-reference-passing-when-check.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0444-drivers-gpu-drm-vc4-Add-missing-32-bit-RGB-formats.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0445-overlays-Add-i2c-sensor-support-for-AHT10.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0446-overlays-Add-README-entry-for-i2c-rtc-rv3032.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0447-drivers-dwc_otg-stop-GCC-from-patching-FIQ-functions.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0448-overlays-i2c-sensor-Add-mcp980x-support.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0449-overlays-pisound-Make-button-pins-owned-by-card.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0450-firmware-raspberrypi-Introduce-rpi_firmware_find_nod.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0451-firmware-raspberrypi-Move-the-clock-IDs-to-the-firmw.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0452-firmware-raspberrypi-Provide-a-helper-to-query-a-clo.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0453-drm-vc4-hdmi-Fix-hdmi_enable_4kp60-detection.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0454-drm-vc4-hdmi-Rework-hdmi_enable_4kp60-detection-code.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0455-drm-vc4-hdmi-Add-more-checks-for-4k-resolutions.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0456-drm-vc4-Make-sure-we-don-t-end-up-with-a-core-clock-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0457-net-phy-BCM54210PE-does-not-support-PTP.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0458-drm-vc4_hdmi-Allow-hotplug-detect-to-be-forced.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0459-overlays-i2c-sensor-Add-the-jc42-class-of-sensor.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0460-overlays-Extend-audremap-to-supports-other-pins.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0461-media-adv7180-Nasty-hack-to-allow-input-selection.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0462-vc04_services-bcm2835_codec-Allow-larger-images-thro.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0463-imx296-overlay-clock-frequency-defaults-to-54MHz-but.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0464-ASoC-ma120x0p-Corrects-the-volume-level-display.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0465-overlays-Add-overlay-pwm1.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0466-overlays-audremap-Include-the-fsels-values.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0467-overlays-i2c-sensor-Make-smbus-timeout-disable-optio.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0468-overlays-Mention-Digi2-Pro-audio-card-in-README.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0469-usb-xhci-add-XHCI_VLI_HUB_TT_QUIRK.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0470-media-i2c-ov7251-Add-module-param-to-select-ext-trig.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0471-vc4_hdmi-Avoid-log-spam-for-audio-start-failure.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0472-drm-tests-Order-Kunit-tests-in-Makefile.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0473-drm-tests-Add-Kunit-Helpers.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0474-drm-tests-Include-helpers-header.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0475-drm-tests-helpers-Add-module-infos.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0476-drm-tests-helpers-Add-SPDX-header.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0477-drm-atomic-Constify-the-old-new-state-accessors.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0478-drm-vc4-Constify-container_of-wrappers.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0479-drm-vc4-kms-Constify-the-HVS-old-new-state-helpers.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0480-drm-vc4-kms-Sort-the-CRTCs-by-output-before-assignin.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0481-drm-vc4-txp-Reorder-the-variable-assignments.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0482-drm-vc4-Add-TXP-encoder-type.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0483-drm-vc4-txp-Initialise-the-CRTC-before-the-encoder-a.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0484-drm-vc4-crtc-Pass-the-device-and-data-in-vc4_crtc_in.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0485-drm-vc4-crtc-Provide-a-CRTC-name.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0486-drm-tests-helpers-Add-missing-export.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0487-drm-tests-helpers-Move-the-helper-header-to-include-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0488-drm-tests-Introduce-a-config-option-for-the-KUnit-he.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0489-drm-tests-helpers-Document-drm_kunit_device_init.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0490-drm-tests-helpers-Switch-to-EXPORT_SYMBOL_GPL.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0491-drm-tests-helpers-Rename-the-device-init-helper.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0492-drm-tests-helpers-Remove-the-name-parameter.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0493-drm-tests-helpers-Create-the-device-in-another-funct.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0494-drm-tests-helpers-Switch-to-a-platform_device.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0495-drm-tests-helpers-Make-sure-the-device-is-bound.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0496-drm-tests-helpers-Allow-for-a-custom-device-struct-t.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0497-drm-tests-helpers-Allow-to-pass-a-custom-drm_driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0498-drm-vc4-Move-HVS-state-to-main-header.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0499-drm-vc4-crtc-Introduce-a-lower-level-crtc-init-helpe.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0500-drm-vc4-crtc-Make-encoder-lookup-helper-public.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0501-drm-vc4-hvs-Provide-a-function-to-initialize-the-HVS.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0502-drm-vc4-tests-Introduce-a-mocking-infrastructure.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0503-drm-vc4-tests-Fail-the-current-test-if-we-access-a-r.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0504-drm-vc4-tests-Add-unit-test-suite-for-the-PV-muxing.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0505-Documentation-gpu-vc4-Add-KUnit-Tests-Section.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0510-drm-panel-panel-ilitek9881c-Use-cansleep-methods.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0511-drm-panel-panel-ilitek9881c-Crystalfontz-support.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0512-overlays-Add-crystalfontz-cfa050_pi_m.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0513-net-bcmgenet-Add-eee-module-parameter.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0514-dts-bcm2711-Add-eee-dtparam.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0515-dtoverlays-Add-overlay-cm-swap-i2c0-to-swap-buses-on.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0516-dt-Correct-cam_reg-GPIO-assignments-for-CM1-3.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0517-dt-Add-camX_reg_gpio-to-CM4.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0518-dt-Add-camX_reg-and-camX_reg_gpio-overrides-to-CM4S.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0519-overlays-Add-disable-emmc2.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0520-xhci-constrain-XHCI_VLI_HUB_TT_QUIRK-to-old-firmware.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0521-drm-panel-simple-Add-Innolux-AT056tN53V1-5.6-VGA.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0522-overlays-audremap-Fix-setting-of-the-pin-function.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0523-media-dt-bindings-Add-DW9817-to-DW9807-binding.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0524-media-dw9807-vcm-Add-support-for-DW9817-bidirectiona.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0525-media-dt-bindings-Add-regulator-to-dw9807-vcm.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0526-media-dw9807-vcm-Add-regulator-support-to-the-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0527-media-dw9807-vcm-Smooth-the-first-user-movement-of-t.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0528-dtbindings-media-i2c-Add-IMX708-CMOS-sensor-binding.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0529-media-i2c-Add-a-driver-for-the-Sony-IMX708-image-sen.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0530-dtoverlays-Add-overlays-for-the-IMX708-image-sensor.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0531-net-phy-broadcom-Make-LEDs-3-4-shadow-LEDs-1-2.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0532-overlays-i2c-sensor-MS-temp-pressure-sensors.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0533-drivers-media-imx708-Enable-long-exposure-mode.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0534-drivers-media-i2c-imx708-Fix-crop-information.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0535-drm-vc4-hdmi-Correct-CSC-setup-for-YCbCr4-4-4.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0536-drm-vc4-hdmi-Add-property-to-allow-manual-config-of-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0537-bcm2835-mmc-Honor-return-value-of-mmc_of_parse.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0539-overlays-i2c-sensor-Add-mpu6050-and-mpu9250.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0541-overlays-i2c-sensor-Use-TABs-for-indentation.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0542-overlays-i2c-sensor-Add-BNO055-IMU-sensor.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0543-dtoverlay-Update-vc4-kms-dpi-generic-for-changed-med.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0544-drm-vc4-hvs-Defer-dlist-slots-deallocation.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0545-vc4-hdmi-Always-enable-GCP-with-AVMUTE-cleared.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0546-media-bcm2835-v4l2-codec-Enable-selection-ioctl-for-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0548-overlays-i2c-sensor-Add-SHT4X-support.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0549-kunit-Provide-a-static-key-to-check-if-KUnit-is-acti.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0550-kunit-Use-the-static-key-when-retrieving-the-current.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0551-drm-vc4-hvs-Initialize-the-dlist-allocation-list-ent.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0552-drm-vc4-hvs-Move-the-dlist-allocation-destruction-to.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0553-drm-vc4-hvs-Destroy-dlist-allocations-immediately-wh.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0554-ARM-dts-Set-the-LED-default-state-to-off.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0557-media-bcm2835-v4l2-codec-Add-profile-level-ctrls-to-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0558-drm-vc4_plane-Add-support-for-YUV444-formats.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0559-drm-vc4-Calculate-bpc-based-on-max_requested_bpc.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0560-media-dt-bindings-ak7375-Convert-to-DT-schema.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0561-media-dt-bindings-ak7375-Add-supplies.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0562-media-i2c-ak7375-Add-regulator-management.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0563-dtoverlays-Add-VCM-option-to-imx519.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0564-dtoverlays-Add-IMX519-support-to-camera-mux-overlays.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0565-vc04_services-bcm2835_codec-Ignore-READ_ONLY-ctrls-i.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0566-ASoC-bcm-Fix-Rpi-PROTO-and-audioinjector.net-Pi.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0567-dtoverlays-Add-VCM-option-to-Arducam64MP.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0568-dtoverlays-Add-Arducam64MP-support-to-camera-mux-ove.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0569-drm-panel-panel-sitronix-st7701-Support-SPI-config-a.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0570-overlays-Remove-lirc-rpi-from-media-center.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0571-overlays-pca953x-Fix-a-typos-in-the-pcal-variants.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0572-iio-adc-mcp3422-Add-correct-compatible-strings.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0573-ASoC-adau1977-Add-correct-compatible-strings.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0574-overlays-Use-vendor-qualified-compatible-strings.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0575-mfd-arizona-i2c-Declare-of-MODULE_DEVICE_TABLE.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0576-gpio-pca953x-Add-ti-tca9554-compatible-string.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0577-hwmon-aht10-Add-DT-compatible-string.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0578-hwmon-ds1621-Add-DT-compatible-strings.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0579-rtc-ds3232-Add-DT-compatible-string-for-ds3234.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0580-hwmon-sht3x-Add-DT-compatible-string.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0581-iio-light-tsl4531-Add-DT-compatible-string.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0582-iio-light-veml6070-Add-DT-compatible-string.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0584-ARM-dts-Standardise-on-the-upstream-LED-names.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0585-ARM-dts-bcm2711-rpi-400-Restore-the-ACT-LED.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0586-ARM-dts-bcm2711-rpi-400-Add-dummy-cam1-regulator.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0587-overlays-vc4-kms-fkms-v3d-Raise-CMA-to-512MB.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0588-media-i2c-imx219-Sensor-should-report-RAW-color-spac.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0589-media-i2c-imx219-Correct-the-minimum-vblanking-value.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0590-media-i2c-imx219-make-HBLANK-r-w-to-allow-longer-exp.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0591-media-imx219-Advertise-embedded-data-node-on-media-p.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0592-drm-vc4-drop-unnecessary-and-harmful-HDMI-RGB-format.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0593-dt-bindings-media-i2c-Add-IMX296-CMOS-sensor-binding.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0594-media-i2c-IMX296-camera-sensor-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0595-media-i2c-imx296-Get-sensor-crop-working.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0596-media-i2c-imx296-Disable-binning-for-colour-variant.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0597-media-i2c-imx296-Add-helper-for-hblank-control.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0598-media-i2c-imx296-Set-a-1-frame-gain-delay.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0599-media-i2c-imx296-Add-horizontal-vertical-flip-suppor.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0600-media-i2c-imx296-Adjust-cropping-limits.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0601-reboot-Use-power-off-rather-than-busy-spinning-when-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0602-media-i2c-Add-PDAF-support-for-IMX519.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0603-dtoverlays-Reduce-the-link-frequencies-of-IMX519.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0604-drivers-media-i2c-imx708-Fix-WIDE_DYNAMIC_RANGE-cont.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0605-rpisense-fb-Add-explicit-fb_deferred_io_mmap-hook.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0606-hwrng-bcm2835-sleep-more-intelligently.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0607-vc04_services-bcm2835_codec-Set-MPEG2_LEVEL-control-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0608-staging-bcm2835-codec-Add-V4L2_CID_MPEG_VIDEO_B_FRAM.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0609-staging-bcm2835-codec-Add-support-for-V4L2_CID_MPEG_.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0610-dtoverlays-Add-inverted-override-property-to-ssd1306.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0611-media-i2c-imx290-Reset-to-upstream.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0612-media-i2c-imx290-Use-device-lock-for-the-control-han.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0613-media-i2c-imx290-Print-error-code-when-I2C-transfer-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0614-media-i2c-imx290-Replace-macro-with-explicit-ARRAY_S.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0615-media-i2c-imx290-Drop-imx290_write_buffered_reg.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0616-media-i2c-imx290-Drop-regmap-cache.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0617-media-i2c-imx290-Specify-HMAX-values-in-decimal.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0618-media-i2c-imx290-Support-variable-sized-registers.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0619-media-i2c-imx290-Correct-register-sizes.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0620-media-i2c-imx290-Simplify-error-handling-when-writin.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0621-media-i2c-imx290-Define-more-register-macros.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0622-media-i2c-imx290-Add-exposure-time-control.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0623-media-i2c-imx290-Fix-max-gain-value.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0624-media-i2c-imx290-Split-control-initialization-to-sep.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0625-media-i2c-imx290-Implement-HBLANK-and-VBLANK-control.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0626-media-i2c-imx290-Create-controls-for-fwnode-properti.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0627-media-i2c-imx290-Move-registers-with-fixed-value-to-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0628-media-i2c-imx290-Factor-out-format-retrieval-to-sepa.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0629-media-i2c-imx290-Add-crop-selection-targets-support.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0630-media-i2c-imx290-Replace-GAIN-control-with-ANALOGUE_.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0631-media-i2c-imx290-Group-functions-in-sections.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0632-media-i2c-imx290-Factor-out-subdev-init-and-cleanup-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0633-media-i2c-imx290-Factor-out-control-update-code-to-a.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0634-media-i2c-imx290-Access-link_freq_index-directly.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0635-media-i2c-imx290-Pass-format-and-mode-to-imx290_calc.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0636-media-i2c-imx290-Compute-pixel-rate-and-blanking-in-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0637-media-i2c-imx290-Factor-out-black-level-setting-to-a.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0638-media-i2c-imx290-Factor-out-DT-parsing-to-separate-f.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0639-media-i2c-imx290-Use-dev_err_probe.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0640-media-i2c-imx290-Factor-out-clock-initialization-to-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0641-media-i2c-imx290-Use-V4L2-subdev-active-state.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0642-media-i2c-imx290-Rename-extend-and-expand-usage-of-i.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0643-media-i2c-imx290-Use-runtime-PM-autosuspend.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0644-media-i2c-imx290-Initialize-runtime-PM-before-subdev.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0645-media-i2c-imx290-Configure-data-lanes-at-start-time.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0646-media-i2c-imx290-Simplify-imx290_set_data_lanes.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0647-media-i2c-imx290-Handle-error-from-imx290_set_data_l.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0648-dtbindings-Reset-imx290.txt-to-upstream.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0649-media-dt-bindings-Convert-imx290.txt-to-YAML.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0650-media-dt-bindings-media-i2c-Add-mono-version-to-IMX2.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0651-media-dt-bindings-media-i2c-Add-imx327-version-to-IM.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0652-media-i2c-imx290-Make-use-of-get_unaligned_le24-put_.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0653-media-i2c-imx290-Use-device_property_read_u32-direct.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0654-media-i2c-imx290-Add-support-for-the-mono-sensor-var.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0655-media-i2c-imx290-Match-kernel-coding-style-on-whites.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0656-media-i2c-imx290-Set-the-colorspace-fields-in-the-fo.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0657-media-i2c-imx290-Add-V4L2_SUBDEV_FL_HAS_EVENTS-and-s.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0658-media-i2c-imx290-Fix-the-pixel-rate-at-148.5Mpix-s.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0659-media-i2c-imx290-Support-60fps-in-2-lane-operation.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0660-media-i2c-imx290-Use-CSI-timings-as-per-datasheet.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0661-media-i2c-imx290-Convert-V4L2_CID_HBLANK-to-read-wri.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0662-media-i2c-imx290-Convert-V4L2_CID_VBLANK-to-read-wri.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0663-media-i2c-imx290-VMAX-is-mode-dependent.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0664-media-i2c-imx290-Remove-duplicated-write-to-IMX290_C.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0665-media-i2c-imx290-Add-support-for-74.25MHz-external-c.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0666-media-i2c-imx290-Add-support-for-H-V-Flips.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0667-media-i2c-imx290-Add-the-error-code-to-logs-in-start.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0668-media-i2c-imx290-Add-support-for-imx327-variant.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0669-dtoverlays-Update-compatible-strings-for-imx290-327-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0670-fbdev-Don-t-cancel-deferred-work-if-pagelist-empty.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0671-usb-xhci-drop-and-add-the-endpoint-context-in-xhci_f.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0672-drivers-media-imx708-Increase-usable-link-frequencie.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0673-dtoverlays-Add-link-frequency-parameter-for-the-Sony.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0674-drivers-media-imx708-Remove-unused-control-fields.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0675-drivers-media-imx708-Tidy-ups-to-address-upstream-re.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0676-dt-bindings-media-i2c-Replace-IMX708-sensor-binding-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0677-dtoverlays-Follow-the-standard-devicetree-labels-for.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0678-drivers-media-imx708-Follow-the-standard-devicetree-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0679-drives-media-imx708-Put-HFLIP-and-VFLIP-controls-in-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0680-media-bcm2835-unicam-Start-and-stop-media_pipeline-w.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0681-fixup-gpio-fsm-Avoid-truncation-of-delay-jiffies.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0682-staging-bcm2835-codec-Add-missing-alignment-for-V4L2.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0683-ARM-dts-bcm27xx-Add-i2c_arm-vc-and-friends.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0684-overlays-Add-pcf857x-support.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0685-overlays-Add-gpio-charger-support.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0686-media-i2c-imx219-Scale-the-pixel-clock-rate-for-the-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0687-hwmon-emc2305-Add-calls-to-initialise-of-cooling-map.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0688-drm-panel-Add-panel-driver-for-Waveshare-DSI-touchsc.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0689-input-goodix-Add-option-to-poll-instead-of-relying-o.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0690-dtoverlays-Add-an-overlay-for-the-Waveshare-DSI-scre.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0691-arm-boot-dts-overlays-mipi-dbi-spi-fix-default-brigh.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0692-dtoverlays-Add-overrides-for-alternate-i2c-buses-to-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0693-dtoverlays-Add-overrides-for-alternate-i2c-buses-to-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0694-fixup-Export-optimised-__memcpy.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0695-hwmon-emc2305-Change-OF-properties-pwm-min-pwm-max-t.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0696-dtoverlays-Change-i2c-fan-pwm-max-min-overrides-to-u.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0697-drm-vc4-Limit-max_bpc-to-8-on-Pi0-3.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0698-serial-8250-Add-NOMSI-bug-for-bcm2835aux.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0700-Bluetooth-hci_bcm-Add-more-invalid-BDADDRs.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0701-ARM-dts-bcm27xx-Enable-kernel-Bluetooth.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0702-overlays-Update-miniuart-bt-now-krnbt-is-default.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0703-ARM-dts-bcm2711-Add-extra-serial-aliases.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0704-pinctrl-bcm2835-Workaround-for-edge-IRQ-loss.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0705-drm-v3d-New-debugfs-end-points-to-query-GPU-usage-st.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0706-ARM-dts-bcm2711-rpi-ds-Group-the-common-pins.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0707-ARM-dts-bcm2711-rpi-ds-Set-default-I-O-pins.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0708-overlays-bcm2711-Remove-I-O-pinctrl-references.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0709-ARM-dts-bcm27xx-Correct-the-dma-ranges.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0710-bcm2835-dma-Derive-slave-DMA-addresses-correctly.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0711-ASoC-bcm2835-i2s-Use-phys-addresses-for-DAI-DMA.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0712-drm-vc4-Use-phys-addresses-for-slave-DMA-config.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0713-bcm2835-smi-Use-phys-addresses-for-slave-DMA-config.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0714-bcm2835-mmc-Use-phys-addresses-for-slave-DMA-config.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0715-ARM-dts-bcm2709-10-Retain-the-system-timer-node.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0716-bcm2835-sdhost-Use-DT-to-configure-logging.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0717-bcm2835-sdhost-Use-phys-addresses-for-slave-DMA-conf.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0718-mmc-bcm2835-Use-phys-addresses-for-slave-DMA-config.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0719-spi-bcm2835-Use-phys-addresses-for-slave-DMA-config.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0720-ARM-dts-bcm2711-rpi-Add-i2s_dma4.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0721-fixup-bcm2835-mmc-Really-use-phys-addresses.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0722-dmaengine-bcm2835-Fix-position-reporting-for-40-bits.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0723-dmaengine-bcm2835-Use-to_bcm2711_cbaddr-where-releva.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0724-dmaengine-bcm2835-Fix-descriptors-usage-for-40-bits-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0725-bcm2835-dma-Fix-WAIT_RESP-on-memcpy.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0726-bcm2835-dma-Fix-dma_abort-for-40-bit-channels.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0727-bcm2835-dma-Fix-dma_abort-for-non-40bit-channels.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0728-bcm2835-dma-Support-dma-flags-for-multi-beat-burst.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0729-bcm2835-dma-Need-to-keep-PROT-bits-set-in-CS-on-40bi.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0730-bcm2711-rpi-ds-Switch-to-dma40-channel-for-hdmi-audi.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0731-drm-vc4-hdmi-Increase-MAI-fifo-dreq-threshold.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0732-ARM-dts-bcm2711-rpi-Set-a-1GB-ZONE_DMA-limit.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0733-ARM-dts-bcm27xx-Add-stdout-path-to-serial0.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0734-input-edt-ft5x06-Only-read-data-for-number-of-points.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0735-i2c-bcm2835-Flush-FIFOs-cleanly-on-error.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0736-i2c-bcm2835-Do-not-abort-transfers-on-ERR-if-still-a.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0737-i2c-bcm2835-Implement-I2C_M_IGNORE_NAK.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0738-pps-Compatibility-hack-should-be-X86-specific.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0739-bcm2835-dma-Fixes-for-dma_abort.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0740-bcm2835-dma-Move-definition-of-PROT-bits-to-expected.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0741-drivers-media-imx296-Disable-2x2-binned-mode.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0742-panel-sitronix-st7701-Fix-panel-prepare-over-SPI.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0790-media-i2c-imx219-fix-binning-and-rate_factor-for-480.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0791-serial-sc16is7xx-Read-modem-line-state-at-startup.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0792-drivers-media-bcm2835_unicam-Improve-frame-sequence-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0793-dtoverlays-Fix-pitft-28-35-overlays-for-6.1-driver-c.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0795-driver-media-i2c-imx477-Re-enable-temperature-sensor.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0796-overlays-allo-katana-dac-audio-Reduce-I2C-clock.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0797-overlays-jedec-spi-nor-Add-speed-parameter.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0798-ALSA-pcm-fix-ELD-constraints-for-E-AC3-DTS-HD-and-ML.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0799-ASoC-hdmi-codec-fix-channel-info-for-compressed-form.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0800-media-i2c-arducam_64mp-Modify-the-line-length-of-128.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0801-media-i2c-arducam_64mp-Add-8000x6000-resolution.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0802-media-i2c-arducam_64mp-Add-PDAF-support.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0803-overlays-audremap-Document-CM4-40-41-restriction.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0804-fixup-Allow-mac-address-to-be-set-in-smsc95xx.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0809-cfg80211-ship-debian-certificates-as-hex-files.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0810-fixup-Add-support-for-all-the-downstream-rpi-sound-c.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0815-fixup-drm-tc358762-Set-the-pre_enable_upstream_first.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0816-rpi-sound-cards-Fix-Codec-Zero-rate-switching.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0818-overlays-Add-trickle-voltage-mv-parameter-to-RTCs.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0819-drivers-media-imx296-Add-standby-delay-during-probe.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0820-overlays-Add-bmp380-to-i2c-sensor-overlay.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0821-can-isotp-add-module-parameter-for-maximum-pdu-size.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0822-drivers-media-imx296-Updated-imx296-driver-for-exter.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0823-media-dt-bindings-imx258-Fix-alternate-compatible-st.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0825-char-broadcom-vc_mem-Fix-preprocessor-conditional.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0826-drivers-dwc_otg-Fix-fallthrough-warnings.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0827-vc04_services-vc-sm-cma-Switch-one-bit-bitfields-to-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0828-media-i2c-ov2311-Fix-uninitialized-variable-usage.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0830-drm-panel-Fix-default-values-for-Waveshare-7.9-inch-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0831-dtoverlays-Add-i2c-bus-overrides-to-edt-ft5406-overl.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0832-dtoverlays-Fix-README-text-for-i2c-fan.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0833-drivers-irqchip-irq-bcm2835-Concurrency-fix.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0835-dtoverlays-Add-drm-option-to-piscreen-overlay.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0836-drm-ili9486-Resolve-clash-in-spi_device_id-names.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0837-input-ads7846-Add-missing-spi_device_id-strings.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0838-staging-bcm2835-codec-Downgrade-the-level-for-a-debu.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0840-gpio-fsm-Sort-functions-into-a-more-logical-order.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0841-gpio_fsm-Rework-the-atomic-vs-non-atomic-split.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0842-f2fs-fix-to-avoid-NULL-pointer-dereference-in-f2fs_i.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0846-hwrng-iproc-rng200-Add-BCM2838-support.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0847-PCI-brcmstb-Wait-for-100ms-following-PERST-deassert.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0850-overlays-Add-a-sample-hat_map.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0851-Revert-usb-phy-generic-Get-the-vbus-supply.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0853-dts-2712-Update-for-device-tree.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0855-gpio_brcmstb-Allow-to-build-for-ARCH_BCM2835.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0856-Allow-RESET_BRCMSTB-on-ARCH_BCM2835.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0857-pinctrl-bcm2712-pinctrl-pinconf-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0859-mmc-brcmstb-add-support-for-BCM2712.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0860-sdhci-Add-SD-Express-hook.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0861-Add-new-pispbe-driver-though-not-yet-the-Makesfiles-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0862-irqchip-irq-bcm2712-mip-Support-for-2712-s-MIP.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0863-reset-reset-brcmstb-rescal-Support-shared-use.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0864-net-macb-Also-set-DMA-coherent-mask.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0865-usb-dwc3-Set-DMA-and-coherent-masks-early.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0866-drm-panel-raspberrypi-touchscreen-Insert-more-delays.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0867-PCI-brcmstb-Add-BCM2712-support.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0868-V4L2-Add-PiSP-opaque-formats-to-V4L2.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0869-V4L2-Add-PiSP-compressed-formats-to-V4L2.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0871-dt-binding-mfd-Add-binding-for-Raspberry-Pi-RP1.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0872-mfd-Add-rp1-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0873-dt-bindings-clock-Add-bindings-for-Raspberry-Pi-RP1.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0874-clk-Add-rp1-clock-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0875-dt-bindings-pinctrl-Add-bindings-for-Raspberry-Pi-RP.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0876-pinctrl-Add-rp1-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0877-serial-pl011-rp1-uart-support.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0878-mmc-sdhci-of-dwcmshc-define-sdio-timeout-clocks.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0879-mmc-sdhci-of-dwcmshc-rp1-sdio-changes.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0880-clk-rp1-Add-sdio-clk-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0881-i2c-designware-Add-SMBUS-quick-command-support.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0882-dmaengine-dw-axi-dmac-Fixes-for-RP1.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0883-spi-dw-Handle-combined-tx-and-rx-messages.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0884-pwm-Add-support-for-RP1-PWM.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0885-drm-Add-RP1-DSI-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0886-drm-Add-RP1-DPI-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0887-drm-Add-RP1-VEC-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0888-v4l2-Add-pisp-compression-format-support-to-v4l2.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0889-media-rp1-Add-CFE-Camera-Front-End-support.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0890-dt-bindings-net-cdns-macb-AXI-tuning-properties.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0891-ASoC-dwc-list-all-supported-sample-sizes.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0892-ASoC-dwc-Support-set_bclk_ratio.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0893-ASoC-dwc-Add-DMACR-handling.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0894-ASOC-dwc-Improve-DMA-shutdown.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0895-ASOC-dwc-Fix-16-bit-audio-handling.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0896-ASoC-bcm-Remove-dependency-on-BCM2835-I2S.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0897-hwmon-Add-RP1-ADC-and-temperature-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0898-mfd-bcm2835-pm-Add-support-for-BCM2712.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0899-soc-bcm-bcm2835-power-Add-support-for-BCM2712.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0900-drivers-spi-Fix-spi-gpio-to-correctly-implement-sck-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0901-spi-spi-gpio-Implement-spidelay-when-requested-bit-r.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0902-drm-v3d-fix-up-register-addresses-for-V3D-7.x.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0903-drm-v3d-update-UAPI-to-match-user-space-for-V3D-7.x.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0904-drm-v3d-add-brcm-2712-v3d-as-a-compatible-V3D-device.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0906-dt-bindings-gpu-v3d-Add-BCM2712-to-compatibility-lis.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0907-drivers-char-add-generic-gpiomem-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0909-drivers-char-delete-bcm2835-gpiomem.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0910-drivers-hwmon-rp1-adc-check-conversion-validity-befo.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0911-dmaengine-bcm2835-Add-BCM2712-support.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0912-dmaengine-bcm2835-HACK-Support-DMA-Lite-channels.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0913-clk-bcm-rpi-Add-disp-clock.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0914-net-phy-broadcom-optionally-enable-link-down-powersa.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0915-dmaengine-bcm2835-Rename-to_bcm2711_cbaddr-to-to_40b.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0916-dmaengine-bcm2835-Fix-dma-driver-for-BCM2835-38.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0917-drivers-iommu-Add-BCM2712-IOMMU.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0918-irqchip-irq-brcmstb-l2-Add-config-for-2711-controlle.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0919-rtc-rtc-rpi-Add-simple-RTC-driver-for-Raspberry-Pi.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0920-dt-bindings-rtc-new-binding-for-Raspberry-Pi-RTC-dri.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0921-hwmon-pwm-fan-Add-fan-speed-register-support.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0923-dt-bindings-input-Add-bindings-for-raspberrypi-butto.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0924-dt-bindings-input-Add-bindings-for-raspberrypi-butto.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0925-Input-Add-raspberrypi-button-firmware-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0926-dt-bindings-update-rpi-rtc-binding.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0927-drivers-rtc-rpi-add-battery-charge-circuit-control-a.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0928-vc4_drv-Avoid-panic-when-booted-with-no-kms.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0929-drm-vc4-Treat-zero-sized-destination-as-full-screen.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0930-drm-vc4-Fix-FKMS-for-when-the-YUV-chroma-planes-are-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0931-drm-vc4-hdmi-Enable-the-audio-clock.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0932-drm-vc4-hdmi-Warn-if-writing-to-an-unknown-HDMI-regi.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0933-drm-vc4-hvs-More-logging-for-dlist-generation.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0934-drm-vc4-hvs-Print-error-if-we-fail-an-allocation.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0935-drm-vc4-plane-Add-more-debugging-for-LBM-allocation.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0936-drm-vc4-plane-Use-return-variable-in-atomic_check.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0937-drm-vc4-crtc-Move-assigned_channel-to-a-variable.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0938-drm-vc4-Introduce-generation-number-enum.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0939-drm-vc4-Make-v3d-paths-unavailable-on-any-generation.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0940-drm-vc4-hvs-Use-switch-statement-to-simplify-vc4_hvs.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0941-drm-vc4-hvs-Use-switch-statement-to-simplify-enablin.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0942-drm-vc4-hvs-Test-if-the-EOF-interrupts-are-enabled.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0943-drm-vc4-hvs-Create-hw_init-function.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0944-drm-vc4-hvs-Create-cob_init-function.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0945-drm-vc4-hvs-Rename-hvs_regs-list.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0946-drm-vc4-plane-Change-ptr0_offset-to-an-array.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0947-drm-vc4-hvs-Rework-LBM-alignment.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0948-drm-vc4-hvs-Change-prototype-of-__vc4_hvs_alloc-to-p.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0949-drm-vc4-UV-planes-vertical-scaling-must-always-be-en.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0950-drm-vc4-hdmi-Avoid-hang-with-debug-registers-when-su.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0951-drm-vc4-Move-the-buffer-offset-out-of-the-vc4_plane_.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0952-drm-vc4-Fix-dlist-debug-not-resetting-the-next-entry.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0953-drm-vc4-Remove-incorrect-limit-from-hvs_dlist-debugf.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0954-drm-vc4-hvs-Remove-ABORT_ON_EMPTY-flag.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0955-drm-vc4-Enable-SCALER_CONTROL-early-in-HVS-init.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0956-dt-bindings-display-Add-BCM2712-HDMI-bindings.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0957-dt-bindings-display-Add-BCM2712-HVS-bindings.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0958-dt-bindings-display-Add-BCM2712-PixelValve-bindings.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0959-dt-bindings-display-Add-BCM2712-MOP-bindings.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0960-dt-bindings-display-Add-BCM2712-MOPLET-bindings.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0961-dt-bindings-display-Add-BCM2712-KMS-driver-bindings.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0962-drm-vc4-drv-Support-BCM2712.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0963-drm-vc4-hvs-Support-BCM2712-HVS.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0964-drm-vc4-crtc-Add-support-for-BCM2712-PixelValves.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0965-drm-vc4-hdmi-Add-support-for-BCM2712-HDMI-controller.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0966-drm-vc4-txp-Introduce-structure-to-deal-with-revisio.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0967-drm-vc4-txp-Rename-TXP-data-structure.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0968-drm-vc4-txp-Add-byte-enable-toggle-bit.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0969-drm-vc4-txp-Add-horizontal-and-vertical-size-offset-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0970-drm-vc4-txp-Handle-40-bits-DMA-Addresses.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0971-drm-vc4-txp-Move-the-encoder-type-in-the-variant-str.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0972-drm-vc4-txp-Add-a-new-TXP-encoder-type.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0973-drm-vc4-txp-Add-support-for-BCM2712-MOP.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0974-drm-vc4-txp-Add-BCM2712-MOPLET-support.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0975-drm-vc4-Add-additional-warn_on.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0976-drm-vc4-tests-Switch-generation-mockup-to-a-switch.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0977-drm-vc4-tests-Drop-drm-parameter-for-vc4_find_crtc_f.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0978-drm-vc4-tests-Return-the-allocated-output.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0979-drm-vc4-tests-Add-BCM2712-mock-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0980-drm-vc4-tests-Add-tests-for-BCM2712-PixelValve-Muxin.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0981-drm-vc4-fkms-Rename-plane-related-functions.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0982-drm-vc4-tests-Use-custom-plane-state-for-mock.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0983-drm-vc4-tests-Add-function-to-lookup-a-plane-for-a-C.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0984-drm-vc4-tests-Add-helper-to-add-a-new-plane-to-a-sta.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0985-drm-vc4-tests-Support-a-few-more-plane-formats.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0986-drm-vc4-tests-Introduce-a-test-for-LBM-buffer-size.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0987-drm-vc4-kms-Avoid-setting-core-and-disp-clocks-for-h.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0988-drm-vc4-Assign-LBM-memory-during-atomic_flush.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0989-drm-panel-simple-Alter-the-timing-for-the-Pi-7-DSI-d.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0990-drm-panel-waveshare-Fix-up-timings-for-10.1-panel.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0991-media-i2c-imx477-Fix-locking-in-imx477_init_controls.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0994-overlays-Fix-vc4-kms-dsi-7inch.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0996-ASoC-hdmi-codec-Fix-broken-channel-map-reporting.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0997-media-rp1-cfe-Fix-use-of-freed-memory-on-errors.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0998-media-rp1-cfe-Fix-width-height-in-cfe_start_channel.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-0999-media-rp1-csi2-Fix-missing-reg-writes.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1000-media-rp1-fe-Use-0-not-1-when-working-with-unsigned-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1001-media-rp1-cfe-Fix-verbose-debug-print.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1002-media-rp1-cfe-Rename-xxx_dbg_irq-to-xxx_dbg_verbose.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1003-media-rp1-Add-back-reg-write-debug-prints.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1004-media-rp1-cfe-Add-verbose-debug-module-parameter.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1005-media-rp1-csi2-Track-CSI-2-errors.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1006-media-rp1-cfe-Drop-unused-field.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1007-media-rp1-csi2-Set-values-for-enum-csi2_mode.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1008-media-rp1-fe-Fix-default-mbus-code.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1009-media-rp1-cfe-Fix-default-meta-format-s-field.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1010-media-rp1-cfe-Fail-streaming-if-FE_CONFIG-node-is-no.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1011-media-i2c-Move-Kconfig-entry-for-IMX477-to-the-camer.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1013-drm-Look-for-an-alias-for-the-displays-to-use-as-the.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1014-dt-Add-DSI1-and-DSI2-aliases-to-2712.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1015-vc4-drm-Remove-the-clear-of-SCALER_DISPBKGND_FILL.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1017-gpio-brcmstb-Use-dynamic-GPIO-base-numbers.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1018-media-rpivid-Allow-use-of-iommu-in-rpivid.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1019-dts-bcm2712-Add-iommu-to-rpivid.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1020-drivers-media-rp1_cfe-Remove-PISP-specific-MBUS-form.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1022-vc04_services-bcm2835-codec-Correct-alignment-requir.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1025-input-touchscreen-edt-ft5x06-Suppress-bogus-data-on-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1029-overlays-mcp23017-allow-specification-of-the-i2c-bus.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1030-dts-bcm2712-Set-default-I2C-baudrates-to-100kHz.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1031-vc_mem-Add-the-DMA-memcpy-support-from-bcm2708_fb.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1032-drm-vc4-Correct-address-offset-for-planes-with-src_-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1033-drivers-media-rp1_cfe-Fix-link-validate-test-for-pix.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1034-dts-bcm2712-Use-the-new-model-name.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1035-fbdev-Allow-client-to-request-a-particular-dev-fbN-n.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1036-drm-fb-helper-Look-up-preferred-fbdev-node-number-fr.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1037-dt-Add-overrides-for-drm-framebuffer-allocations-on-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1039-drm-connector-Change-DRM-card-alias-from-underscore-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1040-dt-Alter-alias-names-from-_-to-for-drm_dsiN.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1041-drm-fb_helper-Change-query-for-FB-designation-from-d.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1042-dt-Alter-alias-names-from-_-to-for-drm_fbN_-override.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1044-Typo-in-overlays-README.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1045-dts-bcm2712-Add-the-krnbt-parameter.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1047-drm-vc4_fkms-Fix-up-interrupt-handler-for-both-2835-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1048-dt-Switch-bcm2712-firmware-kms-node-to-using-the-271.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1049-drivers-media-imx477-Disable-the-scaler.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1050-dt-Add-drm_fbN_vc4-overrides-for-Pi0-4.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1051-fixup-overlays-mcp23017-allow-specification-of-the-i.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1052-drivers-media-pisp_be-Add-back-V4L2_PIX_FMT_RPI_BE-f.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1053-dt-bindings-PCI-brcmstb-add-optional-property-brcm-t.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1054-drivers-pci-brcmstb-optionally-extend-Tperst_clk-tim.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1055-arm-dt-add-dtparams-for-PCIe-reset-timing-override.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1056-arm-dt-bcm2712-don-t-unconditionally-enable-MPS-read.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1057-drivers-media-imx477-Set-horizontal-binning-when-dis.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1058-fixup-arch-arm64-Add-Revision-Serial-Model-to-cpuinf.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1060-dts-bcm2710-rpi-zero-2-w-Remove-WLAN-firmwares.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1061-drivers-media-cfe-Set-the-CSI-2-link-frequency-corre.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1062-dts-bcm2712-rpi-5-b-Create-some-dummy-nodes.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1063-dts-rp1-Add-spi6-fix-spi1-address-cells.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1064-overlays-uart-n-pi5-Add-the-pinctrl-0-property.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1065-drivers-media-imx477-Add-V4L2_CID_LINK_FREQ-control.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1066-drivers-media-imx477-Correctly-set-IMX477_PIXEL_RATE.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1067-drm-vc4-Correct-logic-on-stopping-an-HVS-channel.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1068-drm-vc4-Drop-WARN-for-HVS-FIFOs-not-being-empty.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1069-drm-vc4-Free-all-stale-dlists-if-channel-is-disabled.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1070-drm-vc4-Add-hvs_dlist_allocs-debugfs-function.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1071-drm-vc4-Log-the-size-of-the-dlist-allocation-that-wa.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1072-drm-vc4-crtc-Support-odd-horizontal-timings-on-BCM27.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1073-spi-dw-dma-Get-the-last-DMA-scoop-out-of-the-FIFO.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1075-drivers-mmc-sdhci-add-SPURIOUS_INT_RESP-quirk.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1076-dt-bindings-mmc-sdhci-of-dwcmhsc-Add-Raspberry-Pi-RP.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1077-drivers-mmc-sdhci-of-dwcmshc-add-RP1-dt-ID-and-quirk.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1078-arm-dts-change-RP1-SDHCI-controller-compatible-strin.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1079-ASoC-bcm-audioinjector_octo-Add-soundcard-owner.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1080-drivers-media-imx708-Adjust-broken-line-correction-p.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1082-drivers-media-cfe-Don-t-confuse-MHz-and-Mbps.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1083-overlays-imx296-Fix-cam-port-override-for-regulators.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1148-overlays-ov5647-Regularise-vcm-node-label-name.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1149-overlays-ov5647-cam0-mode-should-use-cam0_reg.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1150-w1-Disable-kernel-log-spam.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1151-include-uapi-mbus-Add-a-media-bus-format-enum-for-16.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1152-include-uapi-v4l2-Add-additional-pixel-formats-for-u.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1153-drivers-media-cfe-Add-16-bit-and-compressed-mono-for.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1154-drivers-media-pisp_be-Add-mono-and-48-bit-RGB-pixel-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1155-ASoC-dwc-Remove-check-in-set_bclk_ratio-handling.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1159-overlays-README-Fix-cut-and-paste-errors.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1160-media-i2c-ov7251-Switch-from-V4L2_CID_GAIN-to-V4L2_C.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1161-drm-vc4-Drop-planes-that-are-completely-off-screen.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1162-drm-bridge-display-connector-Select-DRM_KMS_HELPER.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1163-drm-vc4-Free-the-dlist-alloc-immediately-if-it-never.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1164-input-edt-ft5x06-Include-I2C-details-in-names-for-th.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1165-input-goodix-Include-I2C-details-in-names-for-the-de.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1166-drm-vc4-Block-swiotlb-bounce-buffers-being-imported-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1167-overlays-i2c-sensor-Add-adt7410-support.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1168-overlays-hat_map-Add-pisound-mapping.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1169-drm-vc4-Set-TV-margins-on-the-composite-connector-st.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1170-drm-panel-jdi-lt070me05000-Add-prepare_upstream_firs.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1172-drivers-media-cfe-Find-the-source-pads-on-the-sensor.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1173-dtoverlays-Add-option-for-cam0-to-camera-mux-Nport-o.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1174-ASoC-dwc-Permit-sample-rates-up-to-384kHz.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1176-ASoC-dwc-Fix-full-duplex-mode.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1179-ASoC-pcm512x-Adds-bindings-for-TAS575x-devices.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1180-ASoC-Adds-support-for-TAS575x-to-the-pcm512x-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1182-drm-panel-add-panel-dsi.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1183-dt-bindings-display-panel-dsi-bindings.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1184-overlays-example-overlay-for-using-panel-dsi-on-RPi.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1185-overlays-ADS1115-allow-specification-of-the-i2c-bus.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1186-dts-bcm2712-put-usb-under-axi-not-soc.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1187-drm-vc4-Correct-HVS-muxing-setup-for-the-moplet.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1188-drm-vc4-Mop-and-moplet-have-different-register-offse.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1189-arm-dt-bcm2712-Correct-the-size-of-the-register-rang.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1192-media-Add-MIPI-CCI-register-access-helper-functions.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1193-media-dt-bindings-Add-OmniVision-OV64A40.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1194-media-dt-bindings-i2c-Add-Rohm-BU64754-bindings.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1195-media-i2c-Add-driver-for-OmniVision-OV64A40.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1196-media-i2c-Add-ROHM-BU64754-Camera-Autofocus-Actuator.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1197-overlays-Add-overlay-for-the-OV64A40-Arducam-Camera-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1199-media-rp1-cfe-Fix-verbose-debug-print.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1200-media-rp1-cfe-Expose-find_format_by_pix.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1201-media-rp1-cfe-Add-missing-remaps.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1202-media-rp1-cfe-Add-missing-compressed-remaps.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1203-media-rp1-cfe-Add-cfe_find_16bit_code-and-cfe_find_c.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1204-media-rp1-csi2-Fix-csi2_pad_set_fmt.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1205-media-rp1-fe-Fix-pisp_fe_pad_set_fmt.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1206-media-rp1-csi2-Use-get_frame_desc-to-get-CSI-2-VC-an.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1207-media-rp1-cfe-Add-is_image_node.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1208-media-rp1-cfe-Dual-purpose-video-nodes.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1209-media-rp1-Drop-LE-handling.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1210-media-rp1-csi2-Use-standard-link_validate.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1211-media-rp1-fe-Use-standard-link_validate.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1212-media-rp1-cfe-Improve-link-validation-for-metadata.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1214-drivers-pinctrl-bcm-Kconfig-Fix-BCM2712-help.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1216-drivers-gpu-drm-panel-fix-waveshare-panel-software-r.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1217-firmware-psci-Pass-given-partition-number-through.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1218-dts-bcm2712-rpi-5-b-Enable-warm-reboot-mode.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1222-drivers-media-i2c-imx296-imx477-Configure-tigger_mod.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1223-overlays-Add-always-on-parameter-to-imx477-and-imx29.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1224-input-edt-ft5x06-Correct-prefix-length-in-snprintf.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1225-ARM-dts-bcm2712-rpi-5-b-Allow-RTC-to-be-disabled.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1228-drivers-media-pisp_be-pisp_fe-Update-UAPI-header-lic.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1229-drivers-media-cfe-Add-more-robust-ISR-handlers.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1231-ASoC-dwc-Defer-bclk_ratio-handling-to-hw_params.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1232-drm-vc4-Fix-reading-of-frame-count-on-GEN5-Pi4.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1233-ARM-dts-bcm2712-rpi-5-b-Add-eth_ledx-parameters.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1234-ARM-dts-bcm2712-rpi-5-b-Add-fan-speed-dtparams.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1236-spi-bcm2835-Support-spi0-0cs-and-SPI_NO_CS-mode.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1237-drivers-media-imx519-Add-V4L2_CID_LINK_FREQ-control.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1238-drivers-media-arducam_64mp-Add-V4L2_CID_LINK_FREQ-co.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1239-drivers-gpu-drm-panel-Modify-the-DSI-mode-to-fix-the.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1240-drivers-gpu-drm-panel-Modified-the-timing-of-11.9inc.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1241-drm-vc4-Add-2712-support-to-vc4_plane_async_set_fb.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1242-drm-vc4-Fix-atomic_async_check-to-call-the-right-mod.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1244-drm-rp1-rp1-vec-Allow-non-standard-modes-with-variou.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1245-ARM-pl011-Add-rs485-to-the-RP1-support.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1246-fixup-irqchip-irq-bcm2712-mip-Support-for-2712-s-MIP.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1247-drm-vc4-Optimise-vc4_hvs_dlist_free_work-to-only-rea.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1248-drm-vc4-Flush-stale-dlist-entries-if-allocation-fail.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1249-Pisound-Don-t-export-the-button-GPIO-via-sysfs-GPIO-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1250-Pisound-Read-out-the-SPI-speed-to-use-from-the-Devic.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1251-Pisound-Set-the-spi-speed-hz-for-Pisound-in-the-Devi.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1252-Improvement-on-backup-switchover-mode-overlay-value-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1253-Harmonizing-the-improvement-on-backup-switchover-mod.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1254-Add-pcie-32bit-dma-overlay-pi5-to-enable-32bit-DMA-o.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1257-i2c-designware-Use-SCL-rise-and-fall-times-in-DT.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1258-i2c-designware-Support-non-standard-bus-speeds.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1259-ARM-dts-rp1-Add-I2C-timings.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1260-iommu-bcm2712-don-t-allow-building-as-module.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1261-drm-rp1-depends-on-instead-of-select-MFD_RP1.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1262-Update-touch-PiTFT-overlays.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1263-ARM-dts-rp1-Boost-the-I2C-drive-strength.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1264-ARM-dts-rp1-Add-a-safe-I2C-SDA-hold-time.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1265-ASoC-DACplus-fix-16bit-sample-support-in-clock-consu.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1266-ASoC-adds-support-for-AMP4-Pro-to-the-DAC-Plus-drive.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1267-DT-overlays-adds-support-for-Hifiberry-AMP4-Pro.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1268-ASoC-DACplusADCPro-fix-16bit-sample-support-in-clock.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1269-overlays-Correct-some-compatible-strings.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1270-overlays-Delete-deprecated-overlay-mpu6050.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1271-drivers-media-cfe-Increase-default-size-of-embedded-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1274-serial-sc16is7xx-Don-t-spin-if-no-data-received.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1276-Impliment-driver-support-for-Interlude-Audio-Digital.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1277-Add-overlays-needed-for-Interlude-Audio-Digital-and-.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1279-drm-v3d-Enable-V3D-to-use-different-PAGE_SIZE.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1280-overlays-adau1977-adc-Replace-use-of-i2c-label.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1281-Add-IQaudio-CodecZero-to-hat_map.dts.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1282-ASOc-Add-HiFiBerry-DAC8X-to-the-simple-card-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1283-Overlays-Add-definitions-for-HiFiBerry-8-channel-DAC.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1285-vc4-hvs-Fix-lbm-size-calculation-for-yuv-6012.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1286-Driver-add-waveshare-4inch-dsi-lcd-C-driver.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1287-Dtoverlay-add-waveshare-4inch-dsi-lcd-C-dtoverlay.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1288-Dtoverlay-fix-waveshare-11.9inch-touch-orientation-e.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1289-Dtoverlay-Add-waveshare-4inch-dsi-lcd-C-parameters-t.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1290-Overlays-Add-specific-clk-producer-consumer-overlays.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1291-overlays-hat_map-Add-Hifiberry-cards.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1292-ASoC-Fix-16bit-sample-support-for-Hifiberry-DACplusA.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1293-overlays-Sets-i2s_clk_producer-as-default-for-Hifibe.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1294-imx477-make-trigger-mode-more-configurable.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/950-1295-imx477-Update-device-tree-overlays-to-support-trigge.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/960-hwrng-iproc-set-quality-to-1000.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/961-1-mfd-rp1-Support-interrupt-CPU-affinity.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/961-2-pinctrl-rp1-Use-the-correct-per-bank-GPIO-base.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/961-3-pinctrl-rp1-Allow-legacy-brcm-pins-on-all-banks.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/961-4-pinctrl-rp1-Support-interrupt-CPU-affinity.patch
 delete mode 100644 target/linux/bcm27xx/patches-6.1/961-5-pinctrl-rp1-Clear-events-when-setting-IRQ-type.patch

diff --git a/target/linux/bcm27xx/bcm2708/config-6.1 b/target/linux/bcm27xx/bcm2708/config-6.1
deleted file mode 100644
index d874eb9f8a..0000000000
--- a/target/linux/bcm27xx/bcm2708/config-6.1
+++ /dev/null
@@ -1,394 +0,0 @@
-# CONFIG_AIO is not set
-CONFIG_ALIGNMENT_TRAP=y
-CONFIG_APERTURE_HELPERS=y
-CONFIG_ARCH_32BIT_OFF_T=y
-CONFIG_ARCH_BCM=y
-CONFIG_ARCH_BCM2835=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_KEEP_MEMBLOCK=y
-CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
-CONFIG_ARCH_MULTIPLATFORM=y
-CONFIG_ARCH_MULTI_V6=y
-CONFIG_ARCH_MULTI_V6_V7=y
-CONFIG_ARCH_NR_GPIO=0
-CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARM=y
-CONFIG_ARM_AMBA=y
-CONFIG_ARM_CPU_SUSPEND=y
-CONFIG_ARM_ERRATA_411920=y
-CONFIG_ARM_HAS_GROUP_RELOCS=y
-CONFIG_ARM_L1_CACHE_SHIFT=5
-# CONFIG_ARM_MHU_V2 is not set
-CONFIG_ARM_PATCH_PHYS_VIRT=y
-CONFIG_ARM_RASPBERRYPI_CPUFREQ=y
-CONFIG_ARM_THUMB=y
-CONFIG_ARM_TIMER_SP804=y
-CONFIG_ARM_UNWIND=y
-CONFIG_AUTO_ZRELADDR=y
-CONFIG_BCM2708_VCMEM=y
-# CONFIG_BCM2711_THERMAL is not set
-CONFIG_BCM2835_FAST_MEMCPY=y
-CONFIG_BCM2835_MBOX=y
-CONFIG_BCM2835_POWER=y
-# CONFIG_BCM2835_SMI is not set
-CONFIG_BCM2835_THERMAL=y
-CONFIG_BCM2835_TIMER=y
-CONFIG_BCM2835_VCHIQ=y
-# CONFIG_BCM2835_VCHIQ_MMAL is not set
-CONFIG_BCM2835_WDT=y
-CONFIG_BCM_VCIO=y
-# CONFIG_BCM_VC_SM_CMA is not set
-CONFIG_BCM_VIDEOCORE=y
-CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y
-# CONFIG_BLK_DEV_INITRD is not set
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_SD=y
-CONFIG_BLK_PM=y
-CONFIG_BRCMSTB_L2_IRQ=y
-CONFIG_BRCM_CHAR_DRIVERS=y
-# CONFIG_CACHE_L2X0 is not set
-CONFIG_CC_HAVE_STACKPROTECTOR_TLS=y
-CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
-CONFIG_CC_NO_ARRAY_BOUNDS=y
-CONFIG_CLKSRC_MMIO=y
-CONFIG_CLK_BCM2711_DVP=y
-CONFIG_CLK_BCM2835=y
-CONFIG_CLK_RASPBERRYPI=y
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_CMA=y
-CONFIG_CMA_ALIGNMENT=8
-CONFIG_CMA_AREAS=7
-# CONFIG_CMA_DEBUG is not set
-# CONFIG_CMA_DEBUGFS is not set
-CONFIG_CMA_SIZE_MBYTES=5
-# CONFIG_CMA_SIZE_SEL_MAX is not set
-CONFIG_CMA_SIZE_SEL_MBYTES=y
-# CONFIG_CMA_SIZE_SEL_MIN is not set
-# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
-# CONFIG_CMA_SYSFS is not set
-CONFIG_COMMON_CLK=y
-CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
-CONFIG_COMPAT_32BIT_TIME=y
-CONFIG_CONFIGFS_FS=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_CONTIG_ALLOC=y
-CONFIG_CPUFREQ_DT=y
-CONFIG_CPUFREQ_DT_PLATDEV=y
-CONFIG_CPU_32v6=y
-CONFIG_CPU_32v6K=y
-CONFIG_CPU_ABRT_EV6=y
-CONFIG_CPU_CACHE_V6=y
-CONFIG_CPU_CACHE_VIPT=y
-CONFIG_CPU_COPY_V6=y
-CONFIG_CPU_CP15=y
-CONFIG_CPU_CP15_MMU=y
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-CONFIG_CPU_FREQ_GOV_ATTR_SET=y
-CONFIG_CPU_FREQ_GOV_COMMON=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_STAT=y
-CONFIG_CPU_HAS_ASID=y
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-CONFIG_CPU_LITTLE_ENDIAN=y
-CONFIG_CPU_PABRT_V6=y
-CONFIG_CPU_PM=y
-CONFIG_CPU_THUMB_CAPABLE=y
-CONFIG_CPU_TLB_V6=y
-CONFIG_CPU_V6K=y
-CONFIG_CRC16=y
-CONFIG_CRYPTO_CRC32=y
-CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
-CONFIG_CRYPTO_LIB_SHA1=y
-CONFIG_CRYPTO_LIB_UTILS=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CURRENT_POINTER_IN_TPIDRURO=y
-CONFIG_DCACHE_WORD_ACCESS=y
-CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
-CONFIG_DMABUF_HEAPS=y
-CONFIG_DMABUF_HEAPS_CMA=y
-CONFIG_DMABUF_HEAPS_SYSTEM=y
-CONFIG_DMADEVICES=y
-CONFIG_DMA_BCM2708=y
-CONFIG_DMA_BCM2835=y
-CONFIG_DMA_CMA=y
-CONFIG_DMA_ENGINE=y
-CONFIG_DMA_OF=y
-CONFIG_DMA_OPS=y
-CONFIG_DMA_SHARED_BUFFER=y
-CONFIG_DMA_VIRTUAL_CHANNELS=y
-CONFIG_DNOTIFY=y
-CONFIG_DTC=y
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_EDAC_ATOMIC_SCRUB=y
-CONFIG_EDAC_SUPPORT=y
-CONFIG_EXCLUSIVE_SYSTEM_RAM=y
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-CONFIG_EXTCON=y
-CONFIG_F2FS_FS=y
-CONFIG_FB=y
-CONFIG_FB_BCM2708=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_CMDLINE=y
-CONFIG_FB_SIMPLE=y
-CONFIG_FIQ=y
-CONFIG_FIXED_PHY=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_FONT_8x16=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_SUPPORT=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FREEZER=y
-CONFIG_FS_IOMAP=y
-CONFIG_FS_MBCACHE=y
-CONFIG_FS_POSIX_ACL=y
-CONFIG_FWNODE_MDIO=y
-CONFIG_FW_CACHE=y
-CONFIG_FW_LOADER_PAGED_BUF=y
-CONFIG_FW_LOADER_SYSFS=y
-CONFIG_GCC11_NO_ARRAY_BOUNDS=y
-CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CPU_AUTOPROBE=y
-CONFIG_GENERIC_EARLY_IOREMAP=y
-CONFIG_GENERIC_IDLE_POLL_SETUP=y
-CONFIG_GENERIC_IRQ_CHIP=y
-CONFIG_GENERIC_IRQ_MULTI_HANDLER=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
-CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_PINCONF=y
-CONFIG_GENERIC_PINCTRL_GROUPS=y
-CONFIG_GENERIC_PINMUX_FUNCTIONS=y
-CONFIG_GENERIC_SCHED_CLOCK=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
-CONFIG_GPIOLIB_IRQCHIP=y
-# CONFIG_GPIO_BCM_VIRT is not set
-CONFIG_GPIO_CDEV=y
-# CONFIG_GPIO_FSM is not set
-CONFIG_GPIO_RASPBERRYPI_EXP=y
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT_MAP=y
-CONFIG_HW_CONSOLE=y
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_BCM2835=y
-CONFIG_HZ_FIXED=0
-CONFIG_I2C=y
-# CONFIG_I2C_BCM2708 is not set
-CONFIG_I2C_BOARDINFO=y
-CONFIG_INPUT=y
-CONFIG_INPUT_MOUSEDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_IRQCHIP=y
-CONFIG_IRQSTACKS=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_IRQ_WORK=y
-CONFIG_JBD2=y
-CONFIG_KERNEL_GZIP=y
-# CONFIG_KERNEL_XZ is not set
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_PWM=y
-CONFIG_LEDS_TRIGGER_ACTPWR=y
-CONFIG_LEDS_TRIGGER_INPUT=y
-CONFIG_LIBFDT=y
-CONFIG_LOCK_DEBUGGING_SUPPORT=y
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_CLUT224=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1f6
-CONFIG_MAILBOX=y
-# CONFIG_MAILBOX_TEST is not set
-CONFIG_MDIO_BUS=y
-CONFIG_MDIO_DEVICE=y
-CONFIG_MDIO_DEVRES=y
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_CONTROLLER=y
-CONFIG_MEDIA_PLATFORM_DRIVERS=y
-CONFIG_MEDIA_PLATFORM_SUPPORT=y
-CONFIG_MEDIA_SUPPORT=y
-CONFIG_MEDIA_SUPPORT_FILTER=y
-CONFIG_MEMFD_CREATE=y
-CONFIG_MEMORY_ISOLATION=y
-CONFIG_MFD_CORE=y
-CONFIG_MFD_SYSCON=y
-CONFIG_MIGHT_HAVE_CACHE_L2X0=y
-CONFIG_MIGRATION=y
-CONFIG_MMC=y
-# CONFIG_MMC_BCM2835 is not set
-CONFIG_MMC_BCM2835_DMA=y
-CONFIG_MMC_BCM2835_MMC=y
-CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2
-CONFIG_MMC_BCM2835_SDHOST=y
-CONFIG_MMC_BLOCK=y
-CONFIG_MMC_BLOCK_MINORS=32
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_PLTFM=y
-CONFIG_MODULES_USE_ELF_REL=y
-# CONFIG_MTD is not set
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_PER_CPU_KM=y
-CONFIG_NET_SELFTESTS=y
-CONFIG_NLS=y
-CONFIG_NLS_ASCII=y
-CONFIG_NOP_USB_XCEIV=y
-CONFIG_NO_HZ=y
-CONFIG_NO_HZ_COMMON=y
-CONFIG_NO_HZ_IDLE=y
-CONFIG_NVMEM=y
-CONFIG_NVMEM_LAYOUTS=y
-CONFIG_OF=y
-CONFIG_OF_ADDRESS=y
-CONFIG_OF_CONFIGFS=y
-CONFIG_OF_DYNAMIC=y
-CONFIG_OF_EARLY_FLATTREE=y
-CONFIG_OF_FLATTREE=y
-CONFIG_OF_GPIO=y
-CONFIG_OF_IRQ=y
-CONFIG_OF_KOBJ=y
-CONFIG_OF_MDIO=y
-CONFIG_OF_OVERLAY=y
-CONFIG_OF_RESOLVE=y
-CONFIG_OLD_SIGACTION=y
-CONFIG_OLD_SIGSUSPEND3=y
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_PAGE_POOL=y
-CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
-CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
-CONFIG_PERF_USE_VMALLOC=y
-CONFIG_PGTABLE_LEVELS=2
-CONFIG_PHYLIB=y
-CONFIG_PHYLIB_LEDS=y
-CONFIG_PINCTRL=y
-CONFIG_PINCTRL_BCM2835=y
-CONFIG_PM=y
-CONFIG_PM_CLK=y
-CONFIG_PM_GENERIC_DOMAINS=y
-CONFIG_PM_GENERIC_DOMAINS_OF=y
-CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
-CONFIG_PM_OPP=y
-CONFIG_PM_SLEEP=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_PREEMPT_NONE_BUILD=y
-CONFIG_PRINTK_TIME=y
-CONFIG_PTP_1588_CLOCK_OPTIONAL=y
-CONFIG_PWM=y
-CONFIG_PWM_BCM2835=y
-CONFIG_PWM_SYSFS=y
-CONFIG_RANDSTRUCT_NONE=y
-CONFIG_RASPBERRYPI_FIRMWARE=y
-CONFIG_RASPBERRYPI_GPIOMEM=y
-CONFIG_RASPBERRYPI_POWER=y
-CONFIG_RATIONAL=y
-# CONFIG_RAVE_SP_CORE is not set
-CONFIG_REGMAP=y
-CONFIG_REGMAP_MMIO=y
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_RASPBERRYPI is not set
-CONFIG_RESET_SIMPLE=y
-# CONFIG_RPIVID_MEM is not set
-# CONFIG_RPI_POE_POWER is not set
-CONFIG_SCSI=y
-CONFIG_SCSI_COMMON=y
-# CONFIG_SCSI_LOWLEVEL is not set
-# CONFIG_SCSI_PROC_FS is not set
-CONFIG_SERIAL_8250_BCM2835AUX=y
-# CONFIG_SERIAL_8250_DMA is not set
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_FSL=y
-CONFIG_SERIAL_8250_NR_UARTS=1
-CONFIG_SERIAL_8250_RUNTIME_UARTS=0
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-CONFIG_SERIAL_AMBA_PL011=y
-CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-CONFIG_SERIAL_DEV_BUS=y
-# CONFIG_SERIAL_DEV_CTRL_TTYPORT is not set
-CONFIG_SERIAL_MCTRL_GPIO=y
-CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_SG_POOL=y
-CONFIG_SMSC_PHY=y
-CONFIG_SOFTIRQ_ON_OWN_STACK=y
-CONFIG_SPARSE_IRQ=y
-CONFIG_SRCU=y
-# CONFIG_STRIP_ASM_SYMS is not set
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_SWPHY=y
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-# CONFIG_TEXTSEARCH is not set
-CONFIG_THERMAL=y
-CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
-CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
-CONFIG_THERMAL_GOV_STEP_WISE=y
-CONFIG_THERMAL_OF=y
-CONFIG_THREAD_INFO_IN_TASK=y
-CONFIG_TICK_CPU_ACCOUNTING=y
-CONFIG_TIMER_OF=y
-CONFIG_TIMER_PROBE=y
-CONFIG_TINY_SRCU=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_UEVENT_HELPER_PATH=""
-# CONFIG_UID16 is not set
-CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
-CONFIG_UNWINDER_ARM=y
-CONFIG_USB=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_COMMON=y
-CONFIG_USB_DWCOTG=y
-CONFIG_USB_NET_DRIVERS=y
-CONFIG_USB_NET_SMSC95XX=y
-CONFIG_USB_PHY=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_UAS=y
-CONFIG_USB_USBNET=y
-CONFIG_USE_OF=y
-CONFIG_VCHIQ_CDEV=y
-CONFIG_VFP=y
-CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L2_I2C=y
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_WATCHDOG_CORE=y
-CONFIG_XZ_DEC_ARM=y
-CONFIG_XZ_DEC_BCJ=y
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_ZBOOT_ROM_TEXT=0x0
diff --git a/target/linux/bcm27xx/bcm2709/config-6.1 b/target/linux/bcm27xx/bcm2709/config-6.1
deleted file mode 100644
index 4dcca5dd04..0000000000
--- a/target/linux/bcm27xx/bcm2709/config-6.1
+++ /dev/null
@@ -1,496 +0,0 @@
-# CONFIG_AIO is not set
-CONFIG_ALIGNMENT_TRAP=y
-CONFIG_APERTURE_HELPERS=y
-CONFIG_ARCH_32BIT_OFF_T=y
-CONFIG_ARCH_BCM=y
-CONFIG_ARCH_BCM2835=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_KEEP_MEMBLOCK=y
-CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
-CONFIG_ARCH_MULTIPLATFORM=y
-CONFIG_ARCH_MULTI_V6_V7=y
-CONFIG_ARCH_MULTI_V7=y
-CONFIG_ARCH_NR_GPIO=0
-CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
-CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARM=y
-CONFIG_ARM_AMBA=y
-CONFIG_ARM_ARCH_TIMER=y
-CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
-CONFIG_ARM_CPU_SUSPEND=y
-CONFIG_ARM_GIC=y
-CONFIG_ARM_HAS_GROUP_RELOCS=y
-CONFIG_ARM_L1_CACHE_SHIFT=6
-CONFIG_ARM_L1_CACHE_SHIFT_6=y
-CONFIG_ARM_LPAE=y
-# CONFIG_ARM_MHU_V2 is not set
-CONFIG_ARM_PATCH_IDIV=y
-CONFIG_ARM_PATCH_PHYS_VIRT=y
-CONFIG_ARM_RASPBERRYPI_CPUFREQ=y
-CONFIG_ARM_THUMB=y
-CONFIG_ARM_TIMER_SP804=y
-CONFIG_ARM_UNWIND=y
-CONFIG_ARM_VIRT_EXT=y
-CONFIG_ASSOCIATIVE_ARRAY=y
-CONFIG_AUTO_ZRELADDR=y
-CONFIG_BCM2708_VCMEM=y
-CONFIG_BCM2711_THERMAL=y
-CONFIG_BCM2835_MBOX=y
-CONFIG_BCM2835_POWER=y
-# CONFIG_BCM2835_SMI is not set
-CONFIG_BCM2835_THERMAL=y
-CONFIG_BCM2835_TIMER=y
-CONFIG_BCM2835_VCHIQ=y
-# CONFIG_BCM2835_VCHIQ_MMAL is not set
-CONFIG_BCM2835_WDT=y
-CONFIG_BCM7XXX_PHY=y
-CONFIG_BCMGENET=y
-CONFIG_BCM_NET_PHYLIB=y
-CONFIG_BCM_VCIO=y
-# CONFIG_BCM_VC_SM_CMA is not set
-CONFIG_BCM_VIDEOCORE=y
-CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y
-# CONFIG_BLK_DEV_INITRD is not set
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_SD=y
-CONFIG_BLK_MQ_PCI=y
-CONFIG_BLK_PM=y
-CONFIG_BOUNCE=y
-CONFIG_BRCMSTB_L2_IRQ=y
-CONFIG_BRCM_CHAR_DRIVERS=y
-CONFIG_BROADCOM_PHY=y
-# CONFIG_CACHE_L2X0 is not set
-CONFIG_CC_HAVE_STACKPROTECTOR_TLS=y
-CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
-CONFIG_CC_NO_ARRAY_BOUNDS=y
-CONFIG_CLKSRC_MMIO=y
-CONFIG_CLK_BCM2711_DVP=y
-CONFIG_CLK_BCM2835=y
-CONFIG_CLK_RASPBERRYPI=y
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_CMA=y
-CONFIG_CMA_ALIGNMENT=8
-CONFIG_CMA_AREAS=7
-# CONFIG_CMA_DEBUG is not set
-# CONFIG_CMA_DEBUGFS is not set
-CONFIG_CMA_SIZE_MBYTES=5
-# CONFIG_CMA_SIZE_SEL_MAX is not set
-CONFIG_CMA_SIZE_SEL_MBYTES=y
-# CONFIG_CMA_SIZE_SEL_MIN is not set
-# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
-# CONFIG_CMA_SYSFS is not set
-CONFIG_COMMON_CLK=y
-CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
-CONFIG_COMPAT_32BIT_TIME=y
-CONFIG_CONFIGFS_FS=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_CONTEXT_TRACKING=y
-CONFIG_CONTEXT_TRACKING_IDLE=y
-CONFIG_CONTIG_ALLOC=y
-CONFIG_CPUFREQ_DT=y
-CONFIG_CPUFREQ_DT_PLATDEV=y
-CONFIG_CPU_32v6K=y
-CONFIG_CPU_32v7=y
-CONFIG_CPU_ABRT_EV7=y
-CONFIG_CPU_CACHE_V7=y
-CONFIG_CPU_CACHE_VIPT=y
-CONFIG_CPU_COPY_V6=y
-CONFIG_CPU_CP15=y
-CONFIG_CPU_CP15_MMU=y
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-CONFIG_CPU_FREQ_GOV_ATTR_SET=y
-CONFIG_CPU_FREQ_GOV_COMMON=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_STAT=y
-CONFIG_CPU_HAS_ASID=y
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-CONFIG_CPU_LITTLE_ENDIAN=y
-CONFIG_CPU_PABRT_V7=y
-CONFIG_CPU_PM=y
-CONFIG_CPU_RMAP=y
-CONFIG_CPU_SPECTRE=y
-CONFIG_CPU_THUMB_CAPABLE=y
-CONFIG_CPU_TLB_V7=y
-CONFIG_CPU_V7=y
-CONFIG_CRC16=y
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CRC32=y
-CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CTS=y
-CONFIG_CRYPTO_DRBG=y
-CONFIG_CRYPTO_DRBG_HMAC=y
-CONFIG_CRYPTO_DRBG_MENU=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_JITTERENTROPY=y
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
-CONFIG_CRYPTO_LIB_SHA1=y
-CONFIG_CRYPTO_LIB_SHA256=y
-CONFIG_CRYPTO_LIB_UTILS=y
-CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=y
-CONFIG_CRYPTO_SEQIV=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_XTS=y
-CONFIG_CURRENT_POINTER_IN_TPIDRURO=y
-CONFIG_DCACHE_WORD_ACCESS=y
-CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
-CONFIG_DIMLIB=y
-CONFIG_DMABUF_HEAPS=y
-CONFIG_DMABUF_HEAPS_CMA=y
-CONFIG_DMABUF_HEAPS_SYSTEM=y
-CONFIG_DMADEVICES=y
-CONFIG_DMA_BCM2708=y
-CONFIG_DMA_BCM2835=y
-CONFIG_DMA_CMA=y
-CONFIG_DMA_ENGINE=y
-CONFIG_DMA_OF=y
-CONFIG_DMA_OPS=y
-CONFIG_DMA_SHARED_BUFFER=y
-CONFIG_DMA_VIRTUAL_CHANNELS=y
-CONFIG_DNOTIFY=y
-CONFIG_DTC=y
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_EDAC_ATOMIC_SCRUB=y
-CONFIG_EDAC_SUPPORT=y
-CONFIG_EXCLUSIVE_SYSTEM_RAM=y
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-CONFIG_EXTCON=y
-CONFIG_F2FS_FS=y
-CONFIG_FB=y
-CONFIG_FB_BCM2708=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_CMDLINE=y
-CONFIG_FB_SIMPLE=y
-CONFIG_FIQ=y
-CONFIG_FIXED_PHY=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_FONT_8x16=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_SUPPORT=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FREEZER=y
-CONFIG_FS_ENCRYPTION=y
-CONFIG_FS_ENCRYPTION_ALGS=y
-CONFIG_FS_IOMAP=y
-CONFIG_FS_MBCACHE=y
-CONFIG_FS_POSIX_ACL=y
-CONFIG_FWNODE_MDIO=y
-CONFIG_FW_CACHE=y
-CONFIG_FW_LOADER_PAGED_BUF=y
-CONFIG_FW_LOADER_SYSFS=y
-CONFIG_GCC11_NO_ARRAY_BOUNDS=y
-CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_GENERIC_ARCH_TOPOLOGY=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_GENERIC_CPU_AUTOPROBE=y
-CONFIG_GENERIC_CPU_VULNERABILITIES=y
-CONFIG_GENERIC_EARLY_IOREMAP=y
-CONFIG_GENERIC_GETTIMEOFDAY=y
-CONFIG_GENERIC_IDLE_POLL_SETUP=y
-CONFIG_GENERIC_IRQ_CHIP=y
-CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
-CONFIG_GENERIC_IRQ_MIGRATION=y
-CONFIG_GENERIC_IRQ_MULTI_HANDLER=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
-CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y
-CONFIG_GENERIC_MSI_IRQ=y
-CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_PHY=y
-CONFIG_GENERIC_PINCONF=y
-CONFIG_GENERIC_PINCTRL_GROUPS=y
-CONFIG_GENERIC_PINMUX_FUNCTIONS=y
-CONFIG_GENERIC_SCHED_CLOCK=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GENERIC_VDSO_32=y
-CONFIG_GPIOLIB_IRQCHIP=y
-CONFIG_GPIO_BCM_VIRT=y
-CONFIG_GPIO_CDEV=y
-# CONFIG_GPIO_FSM is not set
-CONFIG_GPIO_RASPBERRYPI_EXP=y
-# CONFIG_HARDEN_BRANCH_HISTORY is not set
-# CONFIG_HARDEN_BRANCH_PREDICTOR is not set
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT_MAP=y
-CONFIG_HAVE_SMP=y
-CONFIG_HIGHMEM=y
-CONFIG_HIGHPTE=y
-CONFIG_HOTPLUG_CPU=y
-CONFIG_HW_CONSOLE=y
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_BCM2835=y
-CONFIG_HW_RANDOM_IPROC_RNG200=y
-CONFIG_HZ_FIXED=0
-CONFIG_I2C=y
-# CONFIG_I2C_BCM2708 is not set
-CONFIG_I2C_BOARDINFO=y
-CONFIG_INPUT=y
-CONFIG_INPUT_MOUSEDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_IRQCHIP=y
-CONFIG_IRQSTACKS=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_IRQ_DOMAIN_HIERARCHY=y
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_IRQ_WORK=y
-CONFIG_JBD2=y
-CONFIG_KEYS=y
-CONFIG_KMAP_LOCAL=y
-CONFIG_KMAP_LOCAL_NON_LINEAR_PTE_ARRAY=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_PWM=y
-CONFIG_LEDS_TRIGGER_ACTPWR=y
-CONFIG_LEDS_TRIGGER_INPUT=y
-CONFIG_LIBFDT=y
-CONFIG_LOCK_DEBUGGING_SUPPORT=y
-CONFIG_LOCK_SPIN_ON_OWNER=y
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_CLUT224=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1f6
-CONFIG_MAILBOX=y
-# CONFIG_MAILBOX_TEST is not set
-CONFIG_MDIO_BCM_UNIMAC=y
-CONFIG_MDIO_BUS=y
-CONFIG_MDIO_DEVICE=y
-CONFIG_MDIO_DEVRES=y
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_CONTROLLER=y
-CONFIG_MEDIA_PLATFORM_DRIVERS=y
-CONFIG_MEDIA_PLATFORM_SUPPORT=y
-CONFIG_MEDIA_SUPPORT=y
-CONFIG_MEDIA_SUPPORT_FILTER=y
-CONFIG_MEMFD_CREATE=y
-CONFIG_MEMORY_ISOLATION=y
-CONFIG_MFD_CORE=y
-CONFIG_MFD_SYSCON=y
-CONFIG_MICROCHIP_PHY=y
-CONFIG_MIGHT_HAVE_CACHE_L2X0=y
-CONFIG_MIGRATION=y
-CONFIG_MMC=y
-# CONFIG_MMC_BCM2835 is not set
-CONFIG_MMC_BCM2835_DMA=y
-CONFIG_MMC_BCM2835_MMC=y
-CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2
-CONFIG_MMC_BCM2835_SDHOST=y
-CONFIG_MMC_BLOCK=y
-CONFIG_MMC_BLOCK_MINORS=32
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_IO_ACCESSORS=y
-CONFIG_MMC_SDHCI_IPROC=y
-# CONFIG_MMC_SDHCI_PCI is not set
-CONFIG_MMC_SDHCI_PLTFM=y
-CONFIG_MODULES_USE_ELF_REL=y
-# CONFIG_MTD is not set
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEON=y
-CONFIG_NET_FLOW_LIMIT=y
-CONFIG_NET_PTP_CLASSIFY=y
-CONFIG_NET_SELFTESTS=y
-CONFIG_NLS=y
-CONFIG_NLS_ASCII=y
-CONFIG_NOP_USB_XCEIV=y
-CONFIG_NO_HZ=y
-CONFIG_NO_HZ_COMMON=y
-CONFIG_NO_HZ_IDLE=y
-CONFIG_NR_CPUS=4
-CONFIG_NVMEM=y
-CONFIG_NVMEM_LAYOUTS=y
-CONFIG_OF=y
-CONFIG_OF_ADDRESS=y
-CONFIG_OF_CONFIGFS=y
-CONFIG_OF_DYNAMIC=y
-CONFIG_OF_EARLY_FLATTREE=y
-CONFIG_OF_FLATTREE=y
-CONFIG_OF_GPIO=y
-CONFIG_OF_IRQ=y
-CONFIG_OF_KOBJ=y
-CONFIG_OF_MDIO=y
-CONFIG_OF_OVERLAY=y
-CONFIG_OF_RESOLVE=y
-CONFIG_OLD_SIGACTION=y
-CONFIG_OLD_SIGSUSPEND3=y
-CONFIG_PADATA=y
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_PAGE_POOL=y
-CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
-CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
-CONFIG_PCI=y
-CONFIG_PCIEAER=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_PCIE_BRCMSTB=y
-CONFIG_PCIE_PME=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCI_DOMAINS_GENERIC=y
-CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_IRQ_DOMAIN=y
-CONFIG_PERF_USE_VMALLOC=y
-CONFIG_PGTABLE_LEVELS=3
-CONFIG_PHYLIB=y
-CONFIG_PHYLIB_LEDS=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_PINCTRL=y
-CONFIG_PINCTRL_BCM2835=y
-CONFIG_PM=y
-CONFIG_PM_CLK=y
-CONFIG_PM_GENERIC_DOMAINS=y
-CONFIG_PM_GENERIC_DOMAINS_OF=y
-CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
-CONFIG_PM_OPP=y
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_PPS=y
-CONFIG_PREEMPT_NONE_BUILD=y
-CONFIG_PRINTK_TIME=y
-CONFIG_PTP_1588_CLOCK=y
-CONFIG_PTP_1588_CLOCK_OPTIONAL=y
-CONFIG_PWM=y
-CONFIG_PWM_BCM2835=y
-CONFIG_PWM_SYSFS=y
-CONFIG_RANDSTRUCT_NONE=y
-CONFIG_RAS=y
-CONFIG_RASPBERRYPI_FIRMWARE=y
-CONFIG_RASPBERRYPI_GPIOMEM=y
-CONFIG_RASPBERRYPI_POWER=y
-CONFIG_RATIONAL=y
-# CONFIG_RAVE_SP_CORE is not set
-CONFIG_REGMAP=y
-CONFIG_REGMAP_MMIO=y
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_GPIO=y
-CONFIG_RESET_CONTROLLER=y
-CONFIG_RESET_RASPBERRYPI=y
-CONFIG_RESET_SIMPLE=y
-CONFIG_RFS_ACCEL=y
-# CONFIG_RPIVID_MEM is not set
-# CONFIG_RPI_POE_POWER is not set
-CONFIG_RPS=y
-CONFIG_RWSEM_SPIN_ON_OWNER=y
-CONFIG_SCSI=y
-CONFIG_SCSI_COMMON=y
-# CONFIG_SCSI_LOWLEVEL is not set
-# CONFIG_SCSI_PROC_FS is not set
-CONFIG_SERIAL_8250_BCM2835AUX=y
-# CONFIG_SERIAL_8250_DMA is not set
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_FSL=y
-CONFIG_SERIAL_8250_NR_UARTS=1
-CONFIG_SERIAL_8250_RUNTIME_UARTS=0
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-CONFIG_SERIAL_AMBA_PL011=y
-CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-CONFIG_SERIAL_DEV_BUS=y
-# CONFIG_SERIAL_DEV_CTRL_TTYPORT is not set
-CONFIG_SERIAL_MCTRL_GPIO=y
-CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_SG_POOL=y
-CONFIG_SMP=y
-CONFIG_SMP_ON_UP=y
-CONFIG_SMSC_PHY=y
-CONFIG_SOCK_RX_QUEUE_MAPPING=y
-CONFIG_SOFTIRQ_ON_OWN_STACK=y
-CONFIG_SPARSE_IRQ=y
-CONFIG_SRCU=y
-# CONFIG_STRIP_ASM_SYMS is not set
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_SWIOTLB=y
-CONFIG_SWPHY=y
-CONFIG_SWP_EMULATE=y
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-# CONFIG_TEXTSEARCH is not set
-CONFIG_THERMAL=y
-CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
-CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
-CONFIG_THERMAL_GOV_STEP_WISE=y
-CONFIG_THERMAL_OF=y
-CONFIG_THREAD_INFO_IN_TASK=y
-CONFIG_TICK_CPU_ACCOUNTING=y
-CONFIG_TIMER_OF=y
-CONFIG_TIMER_PROBE=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TREE_RCU=y
-CONFIG_TREE_SRCU=y
-# CONFIG_UCLAMP_TASK is not set
-CONFIG_UEVENT_HELPER_PATH=""
-# CONFIG_UID16 is not set
-CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
-CONFIG_UNWINDER_ARM=y
-CONFIG_USB=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_COMMON=y
-CONFIG_USB_DWCOTG=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_LAN78XX=y
-CONFIG_USB_NET_DRIVERS=y
-CONFIG_USB_NET_SMSC95XX=y
-CONFIG_USB_PCI=y
-CONFIG_USB_PHY=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_UAS=y
-# CONFIG_USB_UHCI_HCD is not set
-CONFIG_USB_USBNET=y
-CONFIG_USB_XHCI_HCD=y
-CONFIG_USB_XHCI_PCI=y
-CONFIG_USB_XHCI_PLATFORM=y
-CONFIG_USE_OF=y
-CONFIG_VCHIQ_CDEV=y
-CONFIG_VFP=y
-CONFIG_VFPv3=y
-CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L2_I2C=y
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_WATCHDOG_CORE=y
-CONFIG_XPS=y
-CONFIG_XZ_DEC_ARM=y
-CONFIG_XZ_DEC_BCJ=y
-CONFIG_ZBOOT_ROM_BSS=0
-CONFIG_ZBOOT_ROM_TEXT=0
diff --git a/target/linux/bcm27xx/bcm2710/config-6.1 b/target/linux/bcm27xx/bcm2710/config-6.1
deleted file mode 100644
index 8f262671c7..0000000000
--- a/target/linux/bcm27xx/bcm2710/config-6.1
+++ /dev/null
@@ -1,482 +0,0 @@
-CONFIG_64BIT=y
-# CONFIG_AIO is not set
-CONFIG_APERTURE_HELPERS=y
-CONFIG_ARCH_BCM=y
-CONFIG_ARCH_BCM2835=y
-CONFIG_ARCH_BINFMT_ELF_EXTRA_PHDRS=y
-CONFIG_ARCH_CORRECT_STACKTRACE_ON_KRETPROBE=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_KEEP_MEMBLOCK=y
-CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
-CONFIG_ARCH_MMAP_RND_BITS=18
-CONFIG_ARCH_MMAP_RND_BITS_MAX=24
-CONFIG_ARCH_MMAP_RND_BITS_MIN=18
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
-CONFIG_ARCH_NR_GPIO=0
-CONFIG_ARCH_PROC_KCORE_TEXT=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_STACKWALK=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_WANTS_NO_INSTR=y
-CONFIG_ARCH_WANTS_THP_SWAP=y
-CONFIG_ARM64=y
-CONFIG_ARM64_4K_PAGES=y
-CONFIG_ARM64_CNP=y
-CONFIG_ARM64_EPAN=y
-CONFIG_ARM64_ERRATUM_819472=y
-CONFIG_ARM64_ERRATUM_824069=y
-CONFIG_ARM64_ERRATUM_826319=y
-CONFIG_ARM64_ERRATUM_827319=y
-CONFIG_ARM64_ERRATUM_832075=y
-CONFIG_ARM64_ERRATUM_843419=y
-CONFIG_ARM64_HW_AFDBM=y
-CONFIG_ARM64_LD_HAS_FIX_ERRATUM_843419=y
-CONFIG_ARM64_PAGE_SHIFT=12
-CONFIG_ARM64_PAN=y
-CONFIG_ARM64_PA_BITS=48
-CONFIG_ARM64_PA_BITS_48=y
-CONFIG_ARM64_PTR_AUTH=y
-CONFIG_ARM64_PTR_AUTH_KERNEL=y
-CONFIG_ARM64_SVE=y
-CONFIG_ARM64_TAGGED_ADDR_ABI=y
-CONFIG_ARM64_VA_BITS=39
-CONFIG_ARM64_VA_BITS_39=y
-CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y
-CONFIG_ARM_AMBA=y
-CONFIG_ARM_ARCH_TIMER=y
-CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
-CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y
-CONFIG_ARM_GIC=y
-CONFIG_ARM_GIC_V2M=y
-CONFIG_ARM_GIC_V3=y
-CONFIG_ARM_GIC_V3_ITS=y
-CONFIG_ARM_GIC_V3_ITS_PCI=y
-# CONFIG_ARM_MHU_V2 is not set
-CONFIG_ARM_PSCI_FW=y
-CONFIG_ARM_RASPBERRYPI_CPUFREQ=y
-CONFIG_ARM_TIMER_SP804=y
-CONFIG_ASSOCIATIVE_ARRAY=y
-CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
-CONFIG_BCM2708_VCMEM=y
-# CONFIG_BCM2711_THERMAL is not set
-CONFIG_BCM2835_MBOX=y
-CONFIG_BCM2835_POWER=y
-# CONFIG_BCM2835_SMI is not set
-CONFIG_BCM2835_THERMAL=y
-CONFIG_BCM2835_VCHIQ=y
-# CONFIG_BCM2835_VCHIQ_MMAL is not set
-CONFIG_BCM2835_WDT=y
-CONFIG_BCM_VCIO=y
-# CONFIG_BCM_VC_SM_CMA is not set
-CONFIG_BCM_VIDEOCORE=y
-# CONFIG_BLK_DEV_INITRD is not set
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_SD=y
-CONFIG_BLK_MQ_PCI=y
-CONFIG_BLK_PM=y
-CONFIG_BRCMSTB_L2_IRQ=y
-CONFIG_BRCM_CHAR_DRIVERS=y
-CONFIG_CAVIUM_ERRATUM_22375=y
-CONFIG_CAVIUM_ERRATUM_23154=y
-CONFIG_CAVIUM_ERRATUM_27456=y
-CONFIG_CC_HAVE_SHADOW_CALL_STACK=y
-CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y
-CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
-CONFIG_CC_NO_ARRAY_BOUNDS=y
-CONFIG_CLKSRC_MMIO=y
-CONFIG_CLK_BCM2711_DVP=y
-CONFIG_CLK_BCM2835=y
-CONFIG_CLK_RASPBERRYPI=y
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_CMA=y
-CONFIG_CMA_ALIGNMENT=8
-CONFIG_CMA_AREAS=7
-# CONFIG_CMA_DEBUG is not set
-# CONFIG_CMA_DEBUGFS is not set
-CONFIG_CMA_SIZE_MBYTES=5
-# CONFIG_CMA_SIZE_SEL_MAX is not set
-CONFIG_CMA_SIZE_SEL_MBYTES=y
-# CONFIG_CMA_SIZE_SEL_MIN is not set
-# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
-# CONFIG_CMA_SYSFS is not set
-CONFIG_COMMON_CLK=y
-CONFIG_COMMON_CLK_XGENE=y
-CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
-# CONFIG_COMPAT_32BIT_TIME is not set
-CONFIG_CONFIGFS_FS=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_CONTEXT_TRACKING=y
-CONFIG_CONTEXT_TRACKING_IDLE=y
-CONFIG_CONTIG_ALLOC=y
-CONFIG_CPUFREQ_DT=y
-CONFIG_CPUFREQ_DT_PLATDEV=y
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-CONFIG_CPU_FREQ_GOV_ATTR_SET=y
-CONFIG_CPU_FREQ_GOV_COMMON=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_STAT=y
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-CONFIG_CPU_LITTLE_ENDIAN=y
-CONFIG_CPU_PM=y
-CONFIG_CPU_RMAP=y
-CONFIG_CRC16=y
-CONFIG_CRYPTO_AES_ARM64=y
-CONFIG_CRYPTO_AES_ARM64_BS=y
-CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CRC32=y
-CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CRYPTD=y
-CONFIG_CRYPTO_CTS=y
-CONFIG_CRYPTO_DRBG=y
-CONFIG_CRYPTO_DRBG_HMAC=y
-CONFIG_CRYPTO_DRBG_MENU=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_JITTERENTROPY=y
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
-CONFIG_CRYPTO_LIB_SHA1=y
-CONFIG_CRYPTO_LIB_SHA256=y
-CONFIG_CRYPTO_LIB_UTILS=y
-CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=y
-CONFIG_CRYPTO_SEQIV=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA256_ARM64=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_SHA512_ARM64=y
-CONFIG_CRYPTO_XTS=y
-CONFIG_DCACHE_WORD_ACCESS=y
-CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_INFO=y
-CONFIG_DMABUF_HEAPS=y
-CONFIG_DMABUF_HEAPS_CMA=y
-CONFIG_DMABUF_HEAPS_SYSTEM=y
-CONFIG_DMADEVICES=y
-CONFIG_DMA_BCM2708=y
-CONFIG_DMA_BCM2835=y
-CONFIG_DMA_CMA=y
-CONFIG_DMA_DIRECT_REMAP=y
-CONFIG_DMA_ENGINE=y
-CONFIG_DMA_OF=y
-CONFIG_DMA_SHARED_BUFFER=y
-CONFIG_DMA_VIRTUAL_CHANNELS=y
-CONFIG_DNOTIFY=y
-CONFIG_DTC=y
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_EDAC_SUPPORT=y
-CONFIG_EXCLUSIVE_SYSTEM_RAM=y
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-CONFIG_EXTCON=y
-CONFIG_F2FS_FS=y
-CONFIG_FB=y
-CONFIG_FB_BCM2708=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_CMDLINE=y
-CONFIG_FB_SIMPLE=y
-CONFIG_FIXED_PHY=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_FONT_8x16=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_SUPPORT=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FRAME_POINTER=y
-CONFIG_FREEZER=y
-CONFIG_FSL_ERRATUM_A008585=y
-CONFIG_FS_ENCRYPTION=y
-CONFIG_FS_ENCRYPTION_ALGS=y
-CONFIG_FS_IOMAP=y
-CONFIG_FS_MBCACHE=y
-CONFIG_FS_POSIX_ACL=y
-CONFIG_FWNODE_MDIO=y
-CONFIG_FW_CACHE=y
-CONFIG_FW_LOADER_PAGED_BUF=y
-CONFIG_FW_LOADER_SYSFS=y
-CONFIG_GCC11_NO_ARRAY_BOUNDS=y
-CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
-CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_REGS=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_GENERIC_ARCH_TOPOLOGY=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_GENERIC_CPU_AUTOPROBE=y
-CONFIG_GENERIC_CPU_VULNERABILITIES=y
-CONFIG_GENERIC_CSUM=y
-CONFIG_GENERIC_EARLY_IOREMAP=y
-CONFIG_GENERIC_GETTIMEOFDAY=y
-CONFIG_GENERIC_IDLE_POLL_SETUP=y
-CONFIG_GENERIC_IOREMAP=y
-CONFIG_GENERIC_IRQ_CHIP=y
-CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
-CONFIG_GENERIC_IRQ_MIGRATION=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
-CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y
-CONFIG_GENERIC_MSI_IRQ=y
-CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_PINCONF=y
-CONFIG_GENERIC_PINCTRL_GROUPS=y
-CONFIG_GENERIC_PINMUX_FUNCTIONS=y
-CONFIG_GENERIC_SCHED_CLOCK=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GPIOLIB_IRQCHIP=y
-CONFIG_GPIO_BCM_VIRT=y
-CONFIG_GPIO_CDEV=y
-# CONFIG_GPIO_FSM is not set
-CONFIG_GPIO_RASPBERRYPI_EXP=y
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT_MAP=y
-CONFIG_HOTPLUG_CPU=y
-CONFIG_HW_CONSOLE=y
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_BCM2835=y
-CONFIG_I2C=y
-# CONFIG_I2C_BCM2708 is not set
-CONFIG_I2C_BOARDINFO=y
-CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
-CONFIG_INPUT=y
-CONFIG_INPUT_MOUSEDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_IRQCHIP=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_IRQ_DOMAIN_HIERARCHY=y
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_IRQ_WORK=y
-CONFIG_JBD2=y
-CONFIG_KEYS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_PWM=y
-CONFIG_LEDS_TRIGGER_ACTPWR=y
-CONFIG_LEDS_TRIGGER_INPUT=y
-CONFIG_LIBFDT=y
-CONFIG_LOCK_DEBUGGING_SUPPORT=y
-CONFIG_LOCK_SPIN_ON_OWNER=y
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_CLUT224=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1f6
-CONFIG_MAILBOX=y
-# CONFIG_MAILBOX_TEST is not set
-CONFIG_MDIO_BUS=y
-CONFIG_MDIO_DEVICE=y
-CONFIG_MDIO_DEVRES=y
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_CONTROLLER=y
-CONFIG_MEDIA_PLATFORM_DRIVERS=y
-CONFIG_MEDIA_PLATFORM_SUPPORT=y
-CONFIG_MEDIA_SUPPORT=y
-CONFIG_MEDIA_SUPPORT_FILTER=y
-CONFIG_MEMFD_CREATE=y
-CONFIG_MEMORY_ISOLATION=y
-CONFIG_MFD_CORE=y
-CONFIG_MFD_SYSCON=y
-CONFIG_MICROCHIP_PHY=y
-CONFIG_MIGRATION=y
-# CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY is not set
-CONFIG_MMC=y
-# CONFIG_MMC_BCM2835 is not set
-CONFIG_MMC_BCM2835_DMA=y
-CONFIG_MMC_BCM2835_MMC=y
-CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2
-CONFIG_MMC_BCM2835_SDHOST=y
-CONFIG_MMC_BLOCK=y
-CONFIG_MMC_BLOCK_MINORS=32
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_IO_ACCESSORS=y
-CONFIG_MMC_SDHCI_IPROC=y
-# CONFIG_MMC_SDHCI_PCI is not set
-CONFIG_MMC_SDHCI_PLTFM=y
-CONFIG_MODULES_USE_ELF_RELA=y
-# CONFIG_MTD is not set
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_NET_FLOW_LIMIT=y
-CONFIG_NET_SELFTESTS=y
-CONFIG_NLS=y
-CONFIG_NLS_ASCII=y
-CONFIG_NOP_USB_XCEIV=y
-CONFIG_NO_HZ=y
-CONFIG_NO_HZ_COMMON=y
-CONFIG_NO_HZ_IDLE=y
-CONFIG_NR_CPUS=4
-CONFIG_NVMEM=y
-CONFIG_NVMEM_LAYOUTS=y
-CONFIG_OF=y
-CONFIG_OF_ADDRESS=y
-CONFIG_OF_CONFIGFS=y
-CONFIG_OF_DYNAMIC=y
-CONFIG_OF_EARLY_FLATTREE=y
-CONFIG_OF_FLATTREE=y
-CONFIG_OF_GPIO=y
-CONFIG_OF_IRQ=y
-CONFIG_OF_KOBJ=y
-CONFIG_OF_MDIO=y
-CONFIG_OF_OVERLAY=y
-CONFIG_OF_RESOLVE=y
-CONFIG_PADATA=y
-CONFIG_PAGE_POOL=y
-CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
-CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
-CONFIG_PARTITION_PERCPU=y
-CONFIG_PCI=y
-# CONFIG_PCIE_BRCMSTB is not set
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCI_DOMAINS_GENERIC=y
-CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_IRQ_DOMAIN=y
-CONFIG_PGTABLE_LEVELS=3
-CONFIG_PHYLIB=y
-CONFIG_PHYLIB_LEDS=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_PINCTRL=y
-CONFIG_PINCTRL_BCM2835=y
-CONFIG_PM=y
-CONFIG_PM_CLK=y
-CONFIG_PM_GENERIC_DOMAINS=y
-CONFIG_PM_GENERIC_DOMAINS_OF=y
-CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
-CONFIG_PM_OPP=y
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_POSIX_CPU_TIMERS_TASK_WORK=y
-CONFIG_POWER_RESET=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_PREEMPT_NONE_BUILD=y
-CONFIG_PRINTK_TIME=y
-CONFIG_PTP_1588_CLOCK_OPTIONAL=y
-CONFIG_PWM=y
-CONFIG_PWM_BCM2835=y
-CONFIG_PWM_SYSFS=y
-CONFIG_QUEUED_RWLOCKS=y
-CONFIG_QUEUED_SPINLOCKS=y
-CONFIG_RANDSTRUCT_NONE=y
-CONFIG_RASPBERRYPI_FIRMWARE=y
-CONFIG_RASPBERRYPI_GPIOMEM=y
-CONFIG_RASPBERRYPI_POWER=y
-CONFIG_RATIONAL=y
-# CONFIG_RAVE_SP_CORE is not set
-CONFIG_REGMAP=y
-CONFIG_REGMAP_MMIO=y
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_GPIO=y
-CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_RASPBERRYPI is not set
-CONFIG_RESET_SIMPLE=y
-CONFIG_RFS_ACCEL=y
-CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
-# CONFIG_RPIVID_MEM is not set
-# CONFIG_RPI_POE_POWER is not set
-CONFIG_RPS=y
-CONFIG_RWSEM_SPIN_ON_OWNER=y
-CONFIG_SCSI=y
-CONFIG_SCSI_COMMON=y
-# CONFIG_SCSI_LOWLEVEL is not set
-# CONFIG_SCSI_PROC_FS is not set
-CONFIG_SERIAL_8250_BCM2835AUX=y
-# CONFIG_SERIAL_8250_DMA is not set
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_FSL=y
-CONFIG_SERIAL_8250_NR_UARTS=1
-CONFIG_SERIAL_8250_RUNTIME_UARTS=0
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-CONFIG_SERIAL_AMBA_PL011=y
-CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-CONFIG_SERIAL_DEV_BUS=y
-# CONFIG_SERIAL_DEV_CTRL_TTYPORT is not set
-CONFIG_SERIAL_MCTRL_GPIO=y
-CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_SG_POOL=y
-CONFIG_SMP=y
-CONFIG_SMSC_PHY=y
-CONFIG_SOCK_RX_QUEUE_MAPPING=y
-CONFIG_SOFTIRQ_ON_OWN_STACK=y
-CONFIG_SPARSEMEM=y
-CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-CONFIG_SPARSE_IRQ=y
-CONFIG_SRCU=y
-# CONFIG_STRIP_ASM_SYMS is not set
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_SWIOTLB=y
-CONFIG_SWPHY=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-# CONFIG_TEXTSEARCH is not set
-CONFIG_THERMAL=y
-CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
-CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
-CONFIG_THERMAL_GOV_STEP_WISE=y
-CONFIG_THERMAL_OF=y
-CONFIG_THERMAL_WRITABLE_TRIPS=y
-CONFIG_THREAD_INFO_IN_TASK=y
-CONFIG_TICK_CPU_ACCOUNTING=y
-CONFIG_TIMER_OF=y
-CONFIG_TIMER_PROBE=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y
-CONFIG_TREE_RCU=y
-CONFIG_TREE_SRCU=y
-# CONFIG_UCLAMP_TASK is not set
-CONFIG_UEVENT_HELPER_PATH=""
-CONFIG_UNMAP_KERNEL_AT_EL0=y
-CONFIG_USB=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_COMMON=y
-CONFIG_USB_DWCOTG=y
-CONFIG_USB_LAN78XX=y
-CONFIG_USB_NET_DRIVERS=y
-CONFIG_USB_NET_SMSC95XX=y
-CONFIG_USB_PHY=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_UAS=y
-CONFIG_USB_USBNET=y
-CONFIG_VCHIQ_CDEV=y
-CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L2_I2C=y
-CONFIG_VMAP_STACK=y
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_WATCHDOG_CORE=y
-CONFIG_XPS=y
-CONFIG_XZ_DEC_ARM=y
-CONFIG_XZ_DEC_BCJ=y
-CONFIG_ZONE_DMA32=y
diff --git a/target/linux/bcm27xx/bcm2711/config-6.1 b/target/linux/bcm27xx/bcm2711/config-6.1
deleted file mode 100644
index 1556ae5593..0000000000
--- a/target/linux/bcm27xx/bcm2711/config-6.1
+++ /dev/null
@@ -1,490 +0,0 @@
-CONFIG_64BIT=y
-# CONFIG_AIO is not set
-CONFIG_APERTURE_HELPERS=y
-CONFIG_ARCH_BCM=y
-CONFIG_ARCH_BCM2835=y
-CONFIG_ARCH_BINFMT_ELF_EXTRA_PHDRS=y
-CONFIG_ARCH_CORRECT_STACKTRACE_ON_KRETPROBE=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_KEEP_MEMBLOCK=y
-CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
-CONFIG_ARCH_MMAP_RND_BITS=18
-CONFIG_ARCH_MMAP_RND_BITS_MAX=24
-CONFIG_ARCH_MMAP_RND_BITS_MIN=18
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
-CONFIG_ARCH_NR_GPIO=0
-CONFIG_ARCH_PROC_KCORE_TEXT=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_STACKWALK=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_WANTS_NO_INSTR=y
-CONFIG_ARCH_WANTS_THP_SWAP=y
-CONFIG_ARM64=y
-CONFIG_ARM64_4K_PAGES=y
-CONFIG_ARM64_CNP=y
-CONFIG_ARM64_EPAN=y
-CONFIG_ARM64_ERRATUM_1319367=y
-CONFIG_ARM64_HW_AFDBM=y
-CONFIG_ARM64_LD_HAS_FIX_ERRATUM_843419=y
-CONFIG_ARM64_PAGE_SHIFT=12
-CONFIG_ARM64_PAN=y
-CONFIG_ARM64_PA_BITS=48
-CONFIG_ARM64_PA_BITS_48=y
-CONFIG_ARM64_PTR_AUTH=y
-CONFIG_ARM64_PTR_AUTH_KERNEL=y
-CONFIG_ARM64_SVE=y
-CONFIG_ARM64_TAGGED_ADDR_ABI=y
-CONFIG_ARM64_VA_BITS=39
-CONFIG_ARM64_VA_BITS_39=y
-CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT=y
-CONFIG_ARM_AMBA=y
-CONFIG_ARM_ARCH_TIMER=y
-CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
-CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y
-CONFIG_ARM_GIC=y
-CONFIG_ARM_GIC_V2M=y
-CONFIG_ARM_GIC_V3=y
-CONFIG_ARM_GIC_V3_ITS=y
-CONFIG_ARM_GIC_V3_ITS_PCI=y
-# CONFIG_ARM_MHU_V2 is not set
-CONFIG_ARM_PSCI_FW=y
-CONFIG_ARM_RASPBERRYPI_CPUFREQ=y
-CONFIG_ARM_TIMER_SP804=y
-CONFIG_ASSOCIATIVE_ARRAY=y
-CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
-CONFIG_BCM2708_VCMEM=y
-CONFIG_BCM2711_THERMAL=y
-CONFIG_BCM2835_MBOX=y
-CONFIG_BCM2835_POWER=y
-# CONFIG_BCM2835_SMI is not set
-# CONFIG_BCM2835_THERMAL is not set
-CONFIG_BCM2835_VCHIQ=y
-# CONFIG_BCM2835_VCHIQ_MMAL is not set
-CONFIG_BCM2835_WDT=y
-CONFIG_BCM7XXX_PHY=y
-CONFIG_BCMGENET=y
-CONFIG_BCM_NET_PHYLIB=y
-CONFIG_BCM_VCIO=y
-# CONFIG_BCM_VC_SM_CMA is not set
-CONFIG_BCM_VIDEOCORE=y
-# CONFIG_BLK_DEV_INITRD is not set
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_SD=y
-CONFIG_BLK_MQ_PCI=y
-CONFIG_BLK_PM=y
-CONFIG_BRCMSTB_L2_IRQ=y
-CONFIG_BRCM_CHAR_DRIVERS=y
-CONFIG_BROADCOM_PHY=y
-CONFIG_CAVIUM_ERRATUM_22375=y
-CONFIG_CAVIUM_ERRATUM_23154=y
-CONFIG_CAVIUM_ERRATUM_27456=y
-CONFIG_CC_HAVE_SHADOW_CALL_STACK=y
-CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y
-CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
-CONFIG_CC_NO_ARRAY_BOUNDS=y
-CONFIG_CLKSRC_MMIO=y
-CONFIG_CLK_BCM2711_DVP=y
-CONFIG_CLK_BCM2835=y
-CONFIG_CLK_RASPBERRYPI=y
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_CMA=y
-CONFIG_CMA_ALIGNMENT=8
-CONFIG_CMA_AREAS=7
-# CONFIG_CMA_DEBUG is not set
-# CONFIG_CMA_DEBUGFS is not set
-CONFIG_CMA_SIZE_MBYTES=5
-# CONFIG_CMA_SIZE_SEL_MAX is not set
-CONFIG_CMA_SIZE_SEL_MBYTES=y
-# CONFIG_CMA_SIZE_SEL_MIN is not set
-# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
-# CONFIG_CMA_SYSFS is not set
-CONFIG_COMMON_CLK=y
-CONFIG_COMMON_CLK_XGENE=y
-CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
-# CONFIG_COMPAT_32BIT_TIME is not set
-CONFIG_CONFIGFS_FS=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_CONTEXT_TRACKING=y
-CONFIG_CONTEXT_TRACKING_IDLE=y
-CONFIG_CONTIG_ALLOC=y
-CONFIG_CPUFREQ_DT=y
-CONFIG_CPUFREQ_DT_PLATDEV=y
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-CONFIG_CPU_FREQ_GOV_ATTR_SET=y
-CONFIG_CPU_FREQ_GOV_COMMON=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_STAT=y
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-CONFIG_CPU_LITTLE_ENDIAN=y
-CONFIG_CPU_PM=y
-CONFIG_CPU_RMAP=y
-CONFIG_CRC16=y
-CONFIG_CRYPTO_AES_ARM64=y
-CONFIG_CRYPTO_AES_ARM64_BS=y
-CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CRC32=y
-CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CRYPTD=y
-CONFIG_CRYPTO_CTS=y
-CONFIG_CRYPTO_DRBG=y
-CONFIG_CRYPTO_DRBG_HMAC=y
-CONFIG_CRYPTO_DRBG_MENU=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_JITTERENTROPY=y
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
-CONFIG_CRYPTO_LIB_SHA1=y
-CONFIG_CRYPTO_LIB_SHA256=y
-CONFIG_CRYPTO_LIB_UTILS=y
-CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=y
-CONFIG_CRYPTO_SEQIV=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA256_ARM64=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_SHA512_ARM64=y
-CONFIG_CRYPTO_XTS=y
-CONFIG_DCACHE_WORD_ACCESS=y
-CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_INFO=y
-CONFIG_DIMLIB=y
-CONFIG_DMABUF_HEAPS=y
-CONFIG_DMABUF_HEAPS_CMA=y
-CONFIG_DMABUF_HEAPS_SYSTEM=y
-CONFIG_DMADEVICES=y
-CONFIG_DMA_BCM2708=y
-CONFIG_DMA_BCM2835=y
-CONFIG_DMA_CMA=y
-CONFIG_DMA_DIRECT_REMAP=y
-CONFIG_DMA_ENGINE=y
-CONFIG_DMA_OF=y
-CONFIG_DMA_SHARED_BUFFER=y
-CONFIG_DMA_VIRTUAL_CHANNELS=y
-CONFIG_DNOTIFY=y
-CONFIG_DTC=y
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_EDAC_SUPPORT=y
-CONFIG_EXCLUSIVE_SYSTEM_RAM=y
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-CONFIG_EXTCON=y
-CONFIG_F2FS_FS=y
-CONFIG_FB=y
-CONFIG_FB_BCM2708=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_CMDLINE=y
-CONFIG_FB_SIMPLE=y
-CONFIG_FIXED_PHY=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_FONT_8x16=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_SUPPORT=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FRAME_POINTER=y
-CONFIG_FREEZER=y
-CONFIG_FSL_ERRATUM_A008585=y
-CONFIG_FS_ENCRYPTION=y
-CONFIG_FS_ENCRYPTION_ALGS=y
-CONFIG_FS_IOMAP=y
-CONFIG_FS_MBCACHE=y
-CONFIG_FS_POSIX_ACL=y
-CONFIG_FWNODE_MDIO=y
-CONFIG_FW_CACHE=y
-CONFIG_FW_LOADER_PAGED_BUF=y
-CONFIG_FW_LOADER_SYSFS=y
-CONFIG_GCC11_NO_ARRAY_BOUNDS=y
-CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
-CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_REGS=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_GENERIC_ARCH_TOPOLOGY=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_GENERIC_CPU_AUTOPROBE=y
-CONFIG_GENERIC_CPU_VULNERABILITIES=y
-CONFIG_GENERIC_CSUM=y
-CONFIG_GENERIC_EARLY_IOREMAP=y
-CONFIG_GENERIC_GETTIMEOFDAY=y
-CONFIG_GENERIC_IDLE_POLL_SETUP=y
-CONFIG_GENERIC_IOREMAP=y
-CONFIG_GENERIC_IRQ_CHIP=y
-CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
-CONFIG_GENERIC_IRQ_MIGRATION=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
-CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y
-CONFIG_GENERIC_MSI_IRQ=y
-CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_PHY=y
-CONFIG_GENERIC_PINCONF=y
-CONFIG_GENERIC_PINCTRL_GROUPS=y
-CONFIG_GENERIC_PINMUX_FUNCTIONS=y
-CONFIG_GENERIC_SCHED_CLOCK=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GPIOLIB_IRQCHIP=y
-CONFIG_GPIO_BCM_VIRT=y
-CONFIG_GPIO_CDEV=y
-# CONFIG_GPIO_FSM is not set
-CONFIG_GPIO_RASPBERRYPI_EXP=y
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT_MAP=y
-CONFIG_HOTPLUG_CPU=y
-CONFIG_HW_CONSOLE=y
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_IPROC_RNG200=y
-CONFIG_I2C=y
-# CONFIG_I2C_BCM2708 is not set
-CONFIG_I2C_BOARDINFO=y
-CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
-CONFIG_INPUT=y
-CONFIG_INPUT_MOUSEDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_IRQCHIP=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_IRQ_DOMAIN_HIERARCHY=y
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_IRQ_WORK=y
-CONFIG_JBD2=y
-CONFIG_KEYS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_PWM=y
-CONFIG_LEDS_TRIGGER_ACTPWR=y
-CONFIG_LEDS_TRIGGER_INPUT=y
-CONFIG_LIBFDT=y
-CONFIG_LOCK_DEBUGGING_SUPPORT=y
-CONFIG_LOCK_SPIN_ON_OWNER=y
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_CLUT224=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1f6
-CONFIG_MAILBOX=y
-# CONFIG_MAILBOX_TEST is not set
-CONFIG_MDIO_BCM_UNIMAC=y
-CONFIG_MDIO_BUS=y
-CONFIG_MDIO_DEVICE=y
-CONFIG_MDIO_DEVRES=y
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_CONTROLLER=y
-CONFIG_MEDIA_PLATFORM_DRIVERS=y
-CONFIG_MEDIA_PLATFORM_SUPPORT=y
-CONFIG_MEDIA_SUPPORT=y
-CONFIG_MEDIA_SUPPORT_FILTER=y
-CONFIG_MEMFD_CREATE=y
-CONFIG_MEMORY_ISOLATION=y
-CONFIG_MFD_CORE=y
-CONFIG_MFD_SYSCON=y
-CONFIG_MIGRATION=y
-CONFIG_MMC=y
-# CONFIG_MMC_BCM2835 is not set
-CONFIG_MMC_BCM2835_DMA=y
-CONFIG_MMC_BCM2835_MMC=y
-CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2
-CONFIG_MMC_BCM2835_SDHOST=y
-CONFIG_MMC_BLOCK=y
-CONFIG_MMC_BLOCK_MINORS=32
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_IO_ACCESSORS=y
-CONFIG_MMC_SDHCI_IPROC=y
-# CONFIG_MMC_SDHCI_PCI is not set
-CONFIG_MMC_SDHCI_PLTFM=y
-CONFIG_MODULES_USE_ELF_RELA=y
-# CONFIG_MTD is not set
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_NET_FLOW_LIMIT=y
-CONFIG_NET_PTP_CLASSIFY=y
-CONFIG_NET_SELFTESTS=y
-CONFIG_NLS=y
-CONFIG_NLS_ASCII=y
-CONFIG_NOP_USB_XCEIV=y
-CONFIG_NO_HZ=y
-CONFIG_NO_HZ_COMMON=y
-CONFIG_NO_HZ_IDLE=y
-CONFIG_NR_CPUS=4
-CONFIG_NVMEM=y
-CONFIG_NVMEM_LAYOUTS=y
-CONFIG_OF=y
-CONFIG_OF_ADDRESS=y
-CONFIG_OF_CONFIGFS=y
-CONFIG_OF_DYNAMIC=y
-CONFIG_OF_EARLY_FLATTREE=y
-CONFIG_OF_FLATTREE=y
-CONFIG_OF_GPIO=y
-CONFIG_OF_IRQ=y
-CONFIG_OF_KOBJ=y
-CONFIG_OF_MDIO=y
-CONFIG_OF_OVERLAY=y
-CONFIG_OF_RESOLVE=y
-CONFIG_PADATA=y
-CONFIG_PAGE_POOL=y
-CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
-CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
-CONFIG_PARTITION_PERCPU=y
-CONFIG_PCI=y
-CONFIG_PCIEAER=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_PCIE_BRCMSTB=y
-CONFIG_PCIE_PME=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCI_DOMAINS_GENERIC=y
-CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_IRQ_DOMAIN=y
-CONFIG_PGTABLE_LEVELS=3
-CONFIG_PHYLIB=y
-CONFIG_PHYLIB_LEDS=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_PINCTRL=y
-CONFIG_PINCTRL_BCM2835=y
-CONFIG_PM=y
-CONFIG_PM_CLK=y
-CONFIG_PM_GENERIC_DOMAINS=y
-CONFIG_PM_GENERIC_DOMAINS_OF=y
-CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
-CONFIG_PM_OPP=y
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_POSIX_CPU_TIMERS_TASK_WORK=y
-CONFIG_POWER_RESET=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_PPS=y
-CONFIG_PREEMPT_NONE_BUILD=y
-CONFIG_PRINTK_TIME=y
-CONFIG_PTP_1588_CLOCK=y
-CONFIG_PTP_1588_CLOCK_OPTIONAL=y
-CONFIG_PWM=y
-CONFIG_PWM_BCM2835=y
-CONFIG_PWM_SYSFS=y
-CONFIG_QUEUED_RWLOCKS=y
-CONFIG_QUEUED_SPINLOCKS=y
-CONFIG_RANDSTRUCT_NONE=y
-CONFIG_RAS=y
-CONFIG_RASPBERRYPI_FIRMWARE=y
-CONFIG_RASPBERRYPI_GPIOMEM=y
-CONFIG_RASPBERRYPI_POWER=y
-CONFIG_RATIONAL=y
-# CONFIG_RAVE_SP_CORE is not set
-CONFIG_REGMAP=y
-CONFIG_REGMAP_MMIO=y
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_GPIO=y
-CONFIG_RESET_CONTROLLER=y
-CONFIG_RESET_RASPBERRYPI=y
-CONFIG_RESET_SIMPLE=y
-CONFIG_RFS_ACCEL=y
-CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
-# CONFIG_RPIVID_MEM is not set
-# CONFIG_RPI_POE_POWER is not set
-CONFIG_RPS=y
-CONFIG_RWSEM_SPIN_ON_OWNER=y
-CONFIG_SCSI=y
-CONFIG_SCSI_COMMON=y
-# CONFIG_SCSI_LOWLEVEL is not set
-# CONFIG_SCSI_PROC_FS is not set
-CONFIG_SERIAL_8250_BCM2835AUX=y
-# CONFIG_SERIAL_8250_DMA is not set
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_FSL=y
-CONFIG_SERIAL_8250_NR_UARTS=1
-CONFIG_SERIAL_8250_RUNTIME_UARTS=0
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-CONFIG_SERIAL_AMBA_PL011=y
-CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-CONFIG_SERIAL_DEV_BUS=y
-# CONFIG_SERIAL_DEV_CTRL_TTYPORT is not set
-CONFIG_SERIAL_MCTRL_GPIO=y
-CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_SG_POOL=y
-CONFIG_SMP=y
-CONFIG_SOCK_RX_QUEUE_MAPPING=y
-CONFIG_SOFTIRQ_ON_OWN_STACK=y
-CONFIG_SPARSEMEM=y
-CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-CONFIG_SPARSE_IRQ=y
-CONFIG_SRCU=y
-# CONFIG_STRIP_ASM_SYMS is not set
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_SWIOTLB=y
-CONFIG_SWPHY=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-# CONFIG_TEXTSEARCH is not set
-CONFIG_THERMAL=y
-CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
-CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
-CONFIG_THERMAL_GOV_STEP_WISE=y
-CONFIG_THERMAL_OF=y
-CONFIG_THERMAL_WRITABLE_TRIPS=y
-CONFIG_THREAD_INFO_IN_TASK=y
-CONFIG_TICK_CPU_ACCOUNTING=y
-CONFIG_TIMER_OF=y
-CONFIG_TIMER_PROBE=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y
-CONFIG_TREE_RCU=y
-CONFIG_TREE_SRCU=y
-# CONFIG_UCLAMP_TASK is not set
-CONFIG_UEVENT_HELPER_PATH=""
-CONFIG_UNMAP_KERNEL_AT_EL0=y
-CONFIG_USB=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_COMMON=y
-CONFIG_USB_DWCOTG=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_PCI=y
-CONFIG_USB_PHY=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_UAS=y
-# CONFIG_USB_UHCI_HCD is not set
-CONFIG_USB_XHCI_HCD=y
-CONFIG_USB_XHCI_PCI=y
-CONFIG_USB_XHCI_PLATFORM=y
-CONFIG_VCHIQ_CDEV=y
-CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L2_I2C=y
-CONFIG_VMAP_STACK=y
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_WATCHDOG_CORE=y
-CONFIG_XPS=y
-CONFIG_XZ_DEC_ARM=y
-CONFIG_XZ_DEC_BCJ=y
-CONFIG_ZONE_DMA32=y
diff --git a/target/linux/bcm27xx/bcm2712/config-6.1 b/target/linux/bcm27xx/bcm2712/config-6.1
deleted file mode 100644
index ed2b623cfe..0000000000
--- a/target/linux/bcm27xx/bcm2712/config-6.1
+++ /dev/null
@@ -1,615 +0,0 @@
-CONFIG_64BIT=y
-# CONFIG_AIO is not set
-CONFIG_APERTURE_HELPERS=y
-CONFIG_ARCH_BCM=y
-CONFIG_ARCH_BCM2835=y
-CONFIG_ARCH_BINFMT_ELF_EXTRA_PHDRS=y
-CONFIG_ARCH_BRCMSTB=y
-CONFIG_ARCH_CORRECT_STACKTRACE_ON_KRETPROBE=y
-CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_KEEP_MEMBLOCK=y
-CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
-CONFIG_ARCH_MMAP_RND_BITS=18
-CONFIG_ARCH_MMAP_RND_BITS_MAX=24
-CONFIG_ARCH_MMAP_RND_BITS_MIN=18
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
-CONFIG_ARCH_NR_GPIO=0
-CONFIG_ARCH_PROC_KCORE_TEXT=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_STACKWALK=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_WANTS_NO_INSTR=y
-CONFIG_ARCH_WANTS_THP_SWAP=y
-CONFIG_ARM64=y
-CONFIG_ARM64_4K_PAGES=y
-CONFIG_ARM64_CNP=y
-CONFIG_ARM64_EPAN=y
-CONFIG_ARM64_ERRATUM_1165522=y
-CONFIG_ARM64_ERRATUM_1286807=y
-CONFIG_ARM64_ERRATUM_1463225=y
-CONFIG_ARM64_HW_AFDBM=y
-CONFIG_ARM64_LD_HAS_FIX_ERRATUM_843419=y
-CONFIG_ARM64_PAGE_SHIFT=12
-CONFIG_ARM64_PAN=y
-CONFIG_ARM64_PA_BITS=48
-CONFIG_ARM64_PA_BITS_48=y
-CONFIG_ARM64_PTR_AUTH=y
-CONFIG_ARM64_PTR_AUTH_KERNEL=y
-CONFIG_ARM64_SVE=y
-CONFIG_ARM64_TAGGED_ADDR_ABI=y
-CONFIG_ARM64_VA_BITS=39
-CONFIG_ARM64_VA_BITS_39=y
-CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y
-CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT=y
-CONFIG_ARM_AMBA=y
-CONFIG_ARM_ARCH_TIMER=y
-CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
-CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y
-CONFIG_ARM_BRCMSTB_AVS_CPUFREQ=y
-CONFIG_ARM_GIC=y
-CONFIG_ARM_GIC_V2M=y
-CONFIG_ARM_GIC_V3=y
-CONFIG_ARM_GIC_V3_ITS=y
-CONFIG_ARM_GIC_V3_ITS_PCI=y
-# CONFIG_ARM_MHU_V2 is not set
-# CONFIG_ARM_PL172_MPMC is not set
-CONFIG_ARM_PSCI_FW=y
-CONFIG_ARM_RASPBERRYPI_CPUFREQ=y
-# CONFIG_ARM_SMMU is not set
-# CONFIG_ARM_SMMU_V3 is not set
-CONFIG_ARM_TIMER_SP804=y
-CONFIG_ASSOCIATIVE_ARRAY=y
-CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
-CONFIG_BCM2708_VCMEM=y
-CONFIG_BCM2711_THERMAL=y
-CONFIG_BCM2712_IOMMU=y
-CONFIG_BCM2712_MIP=y
-CONFIG_BCM2835_MBOX=y
-CONFIG_BCM2835_POWER=y
-CONFIG_BCM2835_SMI=y
-CONFIG_BCM2835_SMI_DEV=m
-CONFIG_BCM2835_THERMAL=y
-CONFIG_BCM2835_VCHIQ=y
-# CONFIG_BCM2835_VCHIQ_MMAL is not set
-CONFIG_BCM2835_WDT=y
-CONFIG_BCM7038_L1_IRQ=y
-CONFIG_BCM7120_L2_IRQ=y
-CONFIG_BCM7XXX_PHY=y
-CONFIG_BCMA=y
-CONFIG_BCMA_BLOCKIO=y
-# CONFIG_BCMA_DEBUG is not set
-# CONFIG_BCMA_DRIVER_GMAC_CMN is not set
-CONFIG_BCMA_DRIVER_PCI=y
-CONFIG_BCMA_FALLBACK_SPROM=y
-CONFIG_BCMA_HOST_PCI=y
-CONFIG_BCMA_HOST_PCI_POSSIBLE=y
-# CONFIG_BCMA_HOST_SOC is not set
-CONFIG_BCMGENET=y
-CONFIG_BCM_NET_PHYLIB=y
-CONFIG_BCM_VCIO=y
-# CONFIG_BCM_VC_SM_CMA is not set
-CONFIG_BCM_VIDEOCORE=y
-# CONFIG_BLK_DEV_INITRD is not set
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_NVME=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_SD=y
-CONFIG_BLK_MQ_PCI=y
-CONFIG_BLK_PM=y
-CONFIG_BRCMSTB_DPFE=y
-CONFIG_BRCMSTB_L2_IRQ=y
-CONFIG_BRCMSTB_MEMC=y
-CONFIG_BRCMSTB_PM=y
-# CONFIG_BRCMSTB_THERMAL is not set
-CONFIG_BRCM_CHAR_DRIVERS=y
-CONFIG_BRCM_USB_PINMAP=y
-CONFIG_BROADCOM_PHY=y
-CONFIG_CC_HAVE_SHADOW_CALL_STACK=y
-CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y
-CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
-CONFIG_CC_NO_ARRAY_BOUNDS=y
-CONFIG_CLKSRC_MMIO=y
-CONFIG_CLK_BCM2711_DVP=y
-CONFIG_CLK_BCM2835=y
-CONFIG_CLK_RASPBERRYPI=y
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_CMA=y
-CONFIG_CMA_ALIGNMENT=8
-CONFIG_CMA_AREAS=7
-# CONFIG_CMA_DEBUG is not set
-# CONFIG_CMA_DEBUGFS is not set
-CONFIG_CMA_SIZE_MBYTES=5
-# CONFIG_CMA_SIZE_SEL_MAX is not set
-CONFIG_CMA_SIZE_SEL_MBYTES=y
-# CONFIG_CMA_SIZE_SEL_MIN is not set
-# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
-# CONFIG_CMA_SYSFS is not set
-CONFIG_COMMON_CLK=y
-CONFIG_COMMON_CLK_RP1=y
-# CONFIG_COMMON_CLK_RP1_SDIO is not set
-CONFIG_COMMON_CLK_XGENE=y
-CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
-# CONFIG_COMPAT_32BIT_TIME is not set
-CONFIG_CONFIGFS_FS=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_CONTEXT_TRACKING=y
-CONFIG_CONTEXT_TRACKING_IDLE=y
-CONFIG_CONTIG_ALLOC=y
-CONFIG_CPUFREQ_DT=y
-CONFIG_CPUFREQ_DT_PLATDEV=y
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-CONFIG_CPU_FREQ_GOV_ATTR_SET=y
-CONFIG_CPU_FREQ_GOV_COMMON=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_STAT=y
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-CONFIG_CPU_LITTLE_ENDIAN=y
-CONFIG_CPU_PM=y
-CONFIG_CPU_RMAP=y
-CONFIG_CRC16=y
-CONFIG_CRYPTO_AES_ARM64=y
-CONFIG_CRYPTO_AES_ARM64_BS=y
-CONFIG_CRYPTO_AES_ARM64_CE=y
-CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
-CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CRC32=y
-CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CRYPTD=y
-CONFIG_CRYPTO_CTS=y
-CONFIG_CRYPTO_DRBG=y
-CONFIG_CRYPTO_DRBG_HMAC=y
-CONFIG_CRYPTO_DRBG_MENU=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_GHASH_ARM64_CE=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_JITTERENTROPY=y
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
-CONFIG_CRYPTO_LIB_SHA1=y
-CONFIG_CRYPTO_LIB_SHA256=y
-CONFIG_CRYPTO_LIB_UTILS=y
-CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=y
-CONFIG_CRYPTO_SEQIV=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA1_ARM64_CE=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA256_ARM64=y
-CONFIG_CRYPTO_SHA2_ARM64_CE=y
-CONFIG_CRYPTO_SHA3=y
-CONFIG_CRYPTO_SHA3_ARM64=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_SHA512_ARM64=y
-CONFIG_CRYPTO_SHA512_ARM64_CE=y
-CONFIG_CRYPTO_SM3=y
-CONFIG_CRYPTO_SM3_ARM64_CE=y
-CONFIG_CRYPTO_SM4=y
-CONFIG_CRYPTO_SM4_ARM64_CE=y
-CONFIG_CRYPTO_SM4_ARM64_CE_BLK=y
-CONFIG_CRYPTO_XTS=y
-CONFIG_DCACHE_WORD_ACCESS=y
-CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_INFO=y
-CONFIG_DIMLIB=y
-CONFIG_DMABUF_HEAPS=y
-CONFIG_DMABUF_HEAPS_CMA=y
-CONFIG_DMABUF_HEAPS_SYSTEM=y
-CONFIG_DMADEVICES=y
-CONFIG_DMA_BCM2708=y
-CONFIG_DMA_BCM2835=y
-CONFIG_DMA_CMA=y
-CONFIG_DMA_DIRECT_REMAP=y
-CONFIG_DMA_ENGINE=y
-CONFIG_DMA_OF=y
-CONFIG_DMA_OPS=y
-CONFIG_DMA_SHARED_BUFFER=y
-CONFIG_DMA_VIRTUAL_CHANNELS=y
-CONFIG_DNOTIFY=y
-CONFIG_DTC=y
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_EDAC_SUPPORT=y
-CONFIG_EXCLUSIVE_SYSTEM_RAM=y
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-CONFIG_EXTCON=y
-CONFIG_F2FS_FS=y
-CONFIG_FB=y
-CONFIG_FB_BCM2708=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_CMDLINE=y
-CONFIG_FB_SIMPLE=y
-CONFIG_FIXED_PHY=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_FONT_8x16=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_SUPPORT=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FRAME_POINTER=y
-CONFIG_FREEZER=y
-CONFIG_FSL_ERRATUM_A008585=y
-CONFIG_FS_ENCRYPTION=y
-CONFIG_FS_ENCRYPTION_ALGS=y
-CONFIG_FS_IOMAP=y
-CONFIG_FS_MBCACHE=y
-CONFIG_FS_POSIX_ACL=y
-CONFIG_FWNODE_MDIO=y
-CONFIG_FW_CACHE=y
-CONFIG_FW_LOADER_PAGED_BUF=y
-CONFIG_FW_LOADER_SYSFS=y
-CONFIG_GCC11_NO_ARRAY_BOUNDS=y
-CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y
-CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_REGS=y
-CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_GENERIC_ARCH_TOPOLOGY=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_GENERIC_CPU_AUTOPROBE=y
-CONFIG_GENERIC_CPU_VULNERABILITIES=y
-CONFIG_GENERIC_CSUM=y
-CONFIG_GENERIC_EARLY_IOREMAP=y
-CONFIG_GENERIC_GETTIMEOFDAY=y
-CONFIG_GENERIC_IDLE_POLL_SETUP=y
-CONFIG_GENERIC_IOREMAP=y
-CONFIG_GENERIC_IRQ_CHIP=y
-CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
-CONFIG_GENERIC_IRQ_INJECTION=y
-CONFIG_GENERIC_IRQ_MIGRATION=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
-CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y
-CONFIG_GENERIC_MSI_IRQ=y
-CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
-CONFIG_GENERIC_PCI_IOMAP=y
-CONFIG_GENERIC_PHY=y
-CONFIG_GENERIC_PINCONF=y
-CONFIG_GENERIC_PINCTRL_GROUPS=y
-CONFIG_GENERIC_PINMUX_FUNCTIONS=y
-CONFIG_GENERIC_SCHED_CLOCK=y
-CONFIG_GENERIC_SMP_IDLE_THREAD=y
-CONFIG_GENERIC_STRNCPY_FROM_USER=y
-CONFIG_GENERIC_STRNLEN_USER=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_GLOB=y
-CONFIG_GPIOLIB_IRQCHIP=y
-CONFIG_GPIO_BCM_VIRT=y
-CONFIG_GPIO_BRCMSTB=y
-CONFIG_GPIO_CDEV=y
-# CONFIG_GPIO_FSM is not set
-CONFIG_GPIO_GENERIC=y
-CONFIG_GPIO_RASPBERRYPI_EXP=y
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT_MAP=y
-CONFIG_HOTPLUG_CPU=y
-CONFIG_HOTPLUG_PCI=y
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-# CONFIG_HOTPLUG_PCI_PCIE is not set
-CONFIG_HOTPLUG_PCI_SHPC=y
-CONFIG_HWMON=y
-CONFIG_HW_CONSOLE=y
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_IPROC_RNG200=y
-CONFIG_I2C=y
-CONFIG_I2C_ALGOBIT=y
-# CONFIG_I2C_BCM2708 is not set
-CONFIG_I2C_BCM2835=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_BRCMSTB=y
-CONFIG_I2C_DESIGNWARE_CORE=y
-CONFIG_I2C_DESIGNWARE_PLATFORM=y
-CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
-CONFIG_INPUT=y
-CONFIG_INPUT_MOUSEDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_RASPBERRYPI_BUTTON=y
-CONFIG_IOMMU_API=y
-# CONFIG_IOMMU_DEBUGFS is not set
-# CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set
-CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
-# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
-CONFIG_IOMMU_DMA=y
-CONFIG_IOMMU_IOVA=y
-# CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
-# CONFIG_IOMMU_IO_PGTABLE_DART is not set
-# CONFIG_IOMMU_IO_PGTABLE_LPAE is not set
-CONFIG_IOMMU_SUPPORT=y
-CONFIG_IRQCHIP=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_IRQ_DOMAIN_HIERARCHY=y
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_IRQ_MSI_IOMMU=y
-CONFIG_IRQ_WORK=y
-CONFIG_JBD2=y
-CONFIG_KEYS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_PWM=y
-CONFIG_LEDS_TRIGGER_ACTPWR=y
-CONFIG_LEDS_TRIGGER_INPUT=y
-CONFIG_LIBFDT=y
-CONFIG_LOCK_DEBUGGING_SUPPORT=y
-CONFIG_LOCK_SPIN_ON_OWNER=y
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_CLUT224=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_MACB=y
-CONFIG_MACB_PCI=y
-CONFIG_MACB_USE_HWSTAMP=y
-CONFIG_MAC_PARTITION=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1f6
-CONFIG_MAILBOX=y
-# CONFIG_MAILBOX_TEST is not set
-CONFIG_MDIO_BCM_UNIMAC=y
-CONFIG_MDIO_BUS=y
-CONFIG_MDIO_DEVICE=y
-CONFIG_MDIO_DEVRES=y
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_CONTROLLER=y
-CONFIG_MEDIA_PLATFORM_DRIVERS=y
-CONFIG_MEDIA_PLATFORM_SUPPORT=y
-CONFIG_MEDIA_SUPPORT=y
-CONFIG_MEDIA_SUPPORT_FILTER=y
-CONFIG_MEMFD_CREATE=y
-CONFIG_MEMORY=y
-CONFIG_MEMORY_ISOLATION=y
-CONFIG_MFD_CORE=y
-CONFIG_MFD_RP1=y
-CONFIG_MFD_SYSCON=y
-CONFIG_MICROCHIP_PHY=y
-CONFIG_MIGRATION=y
-CONFIG_MMC=y
-# CONFIG_MMC_BCM2835 is not set
-CONFIG_MMC_BCM2835_DMA=y
-CONFIG_MMC_BCM2835_MMC=y
-CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2
-CONFIG_MMC_BCM2835_SDHOST=y
-CONFIG_MMC_BLOCK=y
-CONFIG_MMC_BLOCK_MINORS=32
-CONFIG_MMC_CQHCI=y
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_BRCMSTB=y
-CONFIG_MMC_SDHCI_IO_ACCESSORS=y
-CONFIG_MMC_SDHCI_IPROC=y
-CONFIG_MMC_SDHCI_OF_DWCMSHC=y
-# CONFIG_MMC_SDHCI_PCI is not set
-CONFIG_MMC_SDHCI_PLTFM=y
-CONFIG_MODULES_USE_ELF_RELA=y
-CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NEED_SG_DMA_LENGTH=y
-CONFIG_NET_FLOW_LIMIT=y
-CONFIG_NET_PTP_CLASSIFY=y
-CONFIG_NET_SELFTESTS=y
-CONFIG_NLS=y
-CONFIG_NLS_ASCII=y
-CONFIG_NOP_USB_XCEIV=y
-CONFIG_NO_HZ=y
-CONFIG_NO_HZ_COMMON=y
-CONFIG_NO_HZ_IDLE=y
-CONFIG_NR_CPUS=4
-CONFIG_NVMEM=y
-CONFIG_NVMEM_LAYOUTS=y
-CONFIG_NVME_CORE=y
-# CONFIG_NVME_HWMON is not set
-# CONFIG_NVME_MULTIPATH is not set
-CONFIG_OF=y
-CONFIG_OF_ADDRESS=y
-CONFIG_OF_CONFIGFS=y
-CONFIG_OF_DYNAMIC=y
-CONFIG_OF_EARLY_FLATTREE=y
-CONFIG_OF_FLATTREE=y
-CONFIG_OF_GPIO=y
-CONFIG_OF_IOMMU=y
-CONFIG_OF_IRQ=y
-CONFIG_OF_KOBJ=y
-CONFIG_OF_MDIO=y
-CONFIG_OF_OVERLAY=y
-CONFIG_OF_RESOLVE=y
-CONFIG_PADATA=y
-CONFIG_PAGE_POOL=y
-CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
-CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
-CONFIG_PARTITION_PERCPU=y
-CONFIG_PCI=y
-CONFIG_PCIEAER=y
-CONFIG_PCIEAER_INJECT=y
-CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEFAULT is not set
-# CONFIG_PCIEASPM_PERFORMANCE is not set
-CONFIG_PCIEASPM_POWERSAVE=y
-# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
-CONFIG_PCIEPORTBUS=y
-CONFIG_PCIE_BRCMSTB=y
-CONFIG_PCIE_DPC=y
-CONFIG_PCIE_DW=y
-CONFIG_PCIE_DW_HOST=y
-CONFIG_PCIE_DW_PLAT=y
-CONFIG_PCIE_DW_PLAT_HOST=y
-CONFIG_PCIE_MICROCHIP_HOST=y
-CONFIG_PCIE_PME=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCI_DOMAINS_GENERIC=y
-CONFIG_PCI_ECAM=y
-CONFIG_PCI_HOST_COMMON=y
-CONFIG_PCI_HOST_GENERIC=y
-CONFIG_PCI_MSI=y
-CONFIG_PCI_MSI_IRQ_DOMAIN=y
-CONFIG_PCI_STUB=y
-CONFIG_PGTABLE_LEVELS=3
-CONFIG_PHYLIB=y
-CONFIG_PHYLIB_LEDS=y
-CONFIG_PHYLINK=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-# CONFIG_PHY_BRCM_SATA is not set
-CONFIG_PHY_BRCM_USB=y
-CONFIG_PINCTRL=y
-CONFIG_PINCTRL_BCM2712=y
-CONFIG_PINCTRL_BCM2835=y
-CONFIG_PINCTRL_RP1=y
-CONFIG_PM=y
-CONFIG_PM_CLK=y
-CONFIG_PM_GENERIC_DOMAINS=y
-CONFIG_PM_GENERIC_DOMAINS_OF=y
-CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
-CONFIG_PM_OPP=y
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_POSIX_CPU_TIMERS_TASK_WORK=y
-CONFIG_POWER_RESET=y
-CONFIG_POWER_RESET_GPIO=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_PPS=y
-CONFIG_PREEMPT_NONE_BUILD=y
-CONFIG_PRINTK_TIME=y
-CONFIG_PTP_1588_CLOCK=y
-CONFIG_PTP_1588_CLOCK_OPTIONAL=y
-CONFIG_PWM=y
-CONFIG_PWM_BCM2835=y
-CONFIG_PWM_BRCMSTB=y
-CONFIG_PWM_RP1=y
-CONFIG_PWM_SYSFS=y
-CONFIG_QUEUED_RWLOCKS=y
-CONFIG_QUEUED_SPINLOCKS=y
-CONFIG_RANDSTRUCT_NONE=y
-CONFIG_RAS=y
-CONFIG_RASPBERRYPI_FIRMWARE=y
-CONFIG_RASPBERRYPI_GPIOMEM=y
-CONFIG_RASPBERRYPI_POWER=y
-CONFIG_RATIONAL=y
-# CONFIG_RAVE_SP_CORE is not set
-CONFIG_REGMAP=y
-CONFIG_REGMAP_MMIO=y
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_GPIO=y
-CONFIG_RESET_BRCMSTB=y
-CONFIG_RESET_BRCMSTB_RESCAL=y
-CONFIG_RESET_CONTROLLER=y
-CONFIG_RESET_RASPBERRYPI=y
-CONFIG_RESET_SIMPLE=y
-CONFIG_RFS_ACCEL=y
-CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
-# CONFIG_RPIVID_MEM is not set
-# CONFIG_RPI_POE_POWER is not set
-CONFIG_RPS=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_BRCMSTB=y
-CONFIG_RTC_DRV_RPI=y
-CONFIG_RTC_I2C_AND_SPI=y
-CONFIG_RWSEM_SPIN_ON_OWNER=y
-CONFIG_SCSI=y
-CONFIG_SCSI_COMMON=y
-# CONFIG_SCSI_LOWLEVEL is not set
-# CONFIG_SCSI_PROC_FS is not set
-CONFIG_SENSORS_RASPBERRYPI_HWMON=y
-CONFIG_SENSORS_RP1_ADC=y
-CONFIG_SERIAL_8250_BCM2835AUX=y
-CONFIG_SERIAL_8250_BCM7271=y
-# CONFIG_SERIAL_8250_DMA is not set
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_FSL=y
-CONFIG_SERIAL_8250_NR_UARTS=1
-CONFIG_SERIAL_8250_RUNTIME_UARTS=0
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-CONFIG_SERIAL_AMBA_PL011=y
-CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-CONFIG_SERIAL_DEV_BUS=y
-# CONFIG_SERIAL_DEV_CTRL_TTYPORT is not set
-CONFIG_SERIAL_MCTRL_GPIO=y
-CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_SG_POOL=y
-CONFIG_SMP=y
-CONFIG_SMSC_PHY=y
-CONFIG_SOCK_RX_QUEUE_MAPPING=y
-CONFIG_SOC_BRCMSTB=y
-CONFIG_SOC_BUS=y
-CONFIG_SOFTIRQ_ON_OWN_STACK=y
-CONFIG_SPARSEMEM=y
-CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-CONFIG_SPARSE_IRQ=y
-CONFIG_SRCU=y
-# CONFIG_STRIP_ASM_SYMS is not set
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_SWIOTLB=y
-CONFIG_SWPHY=y
-CONFIG_SYSCTL_EXCEPTION_TRACE=y
-# CONFIG_TEXTSEARCH is not set
-CONFIG_THERMAL=y
-CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
-CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
-CONFIG_THERMAL_GOV_STEP_WISE=y
-CONFIG_THERMAL_OF=y
-CONFIG_THERMAL_WRITABLE_TRIPS=y
-CONFIG_THREAD_INFO_IN_TASK=y
-CONFIG_TICK_CPU_ACCOUNTING=y
-CONFIG_TIMER_OF=y
-CONFIG_TIMER_PROBE=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y
-CONFIG_TREE_RCU=y
-CONFIG_TREE_SRCU=y
-# CONFIG_UACCE is not set
-# CONFIG_UCLAMP_TASK is not set
-CONFIG_UEVENT_HELPER_PATH=""
-CONFIG_UNMAP_KERNEL_AT_EL0=y
-CONFIG_USB=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-# CONFIG_USB_BRCMSTB is not set
-CONFIG_USB_COMMON=y
-CONFIG_USB_DWC3=y
-# CONFIG_USB_DWC3_DUAL_ROLE is not set
-# CONFIG_USB_DWC3_GADGET is not set
-CONFIG_USB_DWC3_HOST=y
-CONFIG_USB_DWCOTG=y
-CONFIG_USB_GADGET=y
-# CONFIG_USB_HCD_BCMA is not set
-CONFIG_USB_PCI=y
-CONFIG_USB_PHY=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_UAS=y
-# CONFIG_USB_UHCI_HCD is not set
-CONFIG_USB_XHCI_HCD=y
-CONFIG_USB_XHCI_PCI=y
-CONFIG_USB_XHCI_PLATFORM=y
-CONFIG_VCHIQ_CDEV=y
-CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L2_I2C=y
-CONFIG_VMAP_STACK=y
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_WATCHDOG_CORE=y
-CONFIG_XPS=y
-CONFIG_XZ_DEC_ARM=y
-CONFIG_XZ_DEC_BCJ=y
-CONFIG_ZONE_DMA32=y
diff --git a/target/linux/bcm27xx/image/Makefile b/target/linux/bcm27xx/image/Makefile
index 4586785bbd..23bc3a35c9 100644
--- a/target/linux/bcm27xx/image/Makefile
+++ b/target/linux/bcm27xx/image/Makefile
@@ -72,17 +72,10 @@ endef
 
 define Device/rpi
   DEVICE_MODEL := A/A+/B/B+/CM/Zero/ZeroW
-ifdef CONFIG_LINUX_6_6
   DEVICE_DTS := \
 	broadcom/bcm2708-rpi-b broadcom/bcm2708-rpi-b-rev1 broadcom/bcm2708-rpi-b-plus \
 	broadcom/bcm2708-rpi-cm \
 	broadcom/bcm2708-rpi-zero broadcom/bcm2708-rpi-zero-w
-else
-  DEVICE_DTS := \
-	bcm2708-rpi-b bcm2708-rpi-b-rev1 bcm2708-rpi-b-plus \
-	bcm2708-rpi-cm \
-	bcm2708-rpi-zero bcm2708-rpi-zero-w
-endif
   SUPPORTED_DEVICES := \
 	rpi-a rpi-a-plus \
 	rpi-b rpi-b-plus \
@@ -110,21 +103,12 @@ define Device/rpi-2
   DEVICE_ALT1_VENDOR := Raspberry Pi
   DEVICE_ALT1_MODEL := 4B/400/CM4
   DEVICE_ALT1_VARIANT := (32bit)
-ifdef CONFIG_LINUX_6_6
   DEVICE_DTS := \
 	broadcom/bcm2709-rpi-2-b broadcom/bcm2710-rpi-2-b \
 	broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus \
 	broadcom/bcm2711-rpi-4-b broadcom/bcm2711-rpi-400 \
 	broadcom/bcm2710-rpi-cm3 broadcom/bcm2711-rpi-cm4 \
-	broadcom/bcm2710-rpi-zero-2
-else
-  DEVICE_DTS := \
-	bcm2709-rpi-2-b bcm2710-rpi-2-b \
-	bcm2710-rpi-3-b bcm2710-rpi-3-b-plus \
-	bcm2711-rpi-4-b bcm2711-rpi-400 \
-	bcm2710-rpi-cm3 bcm2711-rpi-cm4 \
-	bcm2710-rpi-zero-2 bcm2710-rpi-zero-2-w
-endif
+	broadcom/bcm2710-rpi-zero-2 broadcom/bcm2710-rpi-zero-2-w
   SUPPORTED_DEVICES := \
 	rpi-2-b \
 	rpi-3-a-plus \
diff --git a/target/linux/bcm27xx/patches-6.1/950-0001-Support-RPi-DPI-interface-in-mode6-for-18-bit-color.patch b/target/linux/bcm27xx/patches-6.1/950-0001-Support-RPi-DPI-interface-in-mode6-for-18-bit-color.patch
deleted file mode 100644
index 1dd352d189..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0001-Support-RPi-DPI-interface-in-mode6-for-18-bit-color.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 6da5134dcde68af6d86003931375ca1a6e6d0169 Mon Sep 17 00:00:00 2001
-From: Joerg Quinten <aBUGSworstnightmare@gmail.com>
-Date: Fri, 18 Jun 2021 13:02:29 +0200
-Subject: [PATCH] Support RPi DPI interface in mode6 for 18-bit color
-
-A matching media bus format was added and an overlay for using it,
-both with FB and VC4 was added as well.
-
-Signed-off-by: Joerg Quinten <aBUGSworstnightmare@gmail.com>
----
- drivers/gpu/drm/vc4/vc4_dpi.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/drivers/gpu/drm/vc4/vc4_dpi.c
-+++ b/drivers/gpu/drm/vc4/vc4_dpi.c
-@@ -170,10 +170,16 @@ static void vc4_dpi_encoder_enable(struc
- 				dpi_c |= VC4_SET_FIELD(DPI_ORDER_BGR,
- 						       DPI_ORDER);
- 				break;
-+			case MEDIA_BUS_FMT_BGR666_1X24_CPADHI:
-+				dpi_c |= VC4_SET_FIELD(DPI_ORDER_BGR, DPI_ORDER);
-+				fallthrough;
- 			case MEDIA_BUS_FMT_RGB666_1X24_CPADHI:
- 				dpi_c |= VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_2,
- 						       DPI_FORMAT);
- 				break;
-+			case MEDIA_BUS_FMT_BGR666_1X18:
-+				dpi_c |= VC4_SET_FIELD(DPI_ORDER_BGR, DPI_ORDER);
-+				fallthrough;
- 			case MEDIA_BUS_FMT_RGB666_1X18:
- 				dpi_c |= VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_1,
- 						       DPI_FORMAT);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0002-drm-vc4-Add-FKMS-as-an-acceptable-node-for-dma-range.patch b/target/linux/bcm27xx/patches-6.1/950-0002-drm-vc4-Add-FKMS-as-an-acceptable-node-for-dma-range.patch
deleted file mode 100644
index a64d7821db..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0002-drm-vc4-Add-FKMS-as-an-acceptable-node-for-dma-range.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 588c5e6269307ccd908986b7514676d6729e0e0d Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 19 May 2020 16:20:30 +0100
-Subject: [PATCH] drm/vc4: Add FKMS as an acceptable node for dma
- ranges.
-
-Under FKMS, the firmware (via FKMS) also requires the VideoCore cache
-aliases for image planes, as defined by the dma-ranges under /soc.
-
-Add rpi-firmware-kms to the list of acceptable nodes to look for
-to copy dma config from.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_drv.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/gpu/drm/vc4/vc4_drv.c
-+++ b/drivers/gpu/drm/vc4/vc4_drv.c
-@@ -276,6 +276,7 @@ static void vc4_component_unbind_all(voi
- static const struct of_device_id vc4_dma_range_matches[] = {
- 	{ .compatible = "brcm,bcm2711-hvs" },
- 	{ .compatible = "brcm,bcm2835-hvs" },
-+	{ .compatible = "raspberrypi,rpi-firmware-kms" },
- 	{ .compatible = "brcm,bcm2835-v3d" },
- 	{ .compatible = "brcm,cygnus-v3d" },
- 	{ .compatible = "brcm,vc4-v3d" },
diff --git a/target/linux/bcm27xx/patches-6.1/950-0003-drm-vc4-Add-the-2711-HVS-as-a-suitable-DMA-node.patch b/target/linux/bcm27xx/patches-6.1/950-0003-drm-vc4-Add-the-2711-HVS-as-a-suitable-DMA-node.patch
deleted file mode 100644
index a319e1cb3f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0003-drm-vc4-Add-the-2711-HVS-as-a-suitable-DMA-node.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 535402af94be945587cc7c7f3346b31e3fa46bc9 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Mon, 26 Oct 2020 12:38:27 +0000
-Subject: [PATCH] drm/vc4: Add the 2711 HVS as a suitable DMA node
-
-With vc4-drv node not being under /soc on Pi4, we need to
-adopt the correct DMA parameters from a suitable sub-component.
-Add "brcm,bcm2711-hvs" to that list of components.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_drv.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/gpu/drm/vc4/vc4_drv.c
-+++ b/drivers/gpu/drm/vc4/vc4_drv.c
-@@ -276,6 +276,7 @@ static void vc4_component_unbind_all(voi
- static const struct of_device_id vc4_dma_range_matches[] = {
- 	{ .compatible = "brcm,bcm2711-hvs" },
- 	{ .compatible = "brcm,bcm2835-hvs" },
-+	{ .compatible = "brcm,bcm2711-hvs" },
- 	{ .compatible = "raspberrypi,rpi-firmware-kms" },
- 	{ .compatible = "brcm,bcm2835-v3d" },
- 	{ .compatible = "brcm,cygnus-v3d" },
diff --git a/target/linux/bcm27xx/patches-6.1/950-0004-drm-vc4-Change-the-default-DPI-format-to-being-18bpp.patch b/target/linux/bcm27xx/patches-6.1/950-0004-drm-vc4-Change-the-default-DPI-format-to-being-18bpp.patch
deleted file mode 100644
index 317f9fbea1..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0004-drm-vc4-Change-the-default-DPI-format-to-being-18bpp.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 6f0bbf91998cb04030731bc8b254209345cbe9f1 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 12 Feb 2021 17:31:37 +0000
-Subject: [PATCH] drm/vc4: Change the default DPI format to being
- 18bpp, not 24.
-
-DPI hasn't really been used up until now, so the default has
-been meaningless.
-In theory we should be able to pass the desired format for the
-adjacent bridge chip through, but framework seems to be missing
-for that.
-
-As the main device to use DPI is the VGA666 or Adafruit Kippah,
-both of which use RGB666, change the default to being RGB666 instead
-of RGB888.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_dpi.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_dpi.c
-+++ b/drivers/gpu/drm/vc4/vc4_dpi.c
-@@ -150,8 +150,8 @@ static void vc4_dpi_encoder_enable(struc
- 	}
- 	drm_connector_list_iter_end(&conn_iter);
- 
--	/* Default to 24bit if no connector or format found. */
--	dpi_c |= VC4_SET_FIELD(DPI_FORMAT_24BIT_888_RGB, DPI_FORMAT);
-+	/* Default to 18bit if no connector or format found. */
-+	dpi_c |= VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_1, DPI_FORMAT);
- 
- 	if (connector) {
- 		if (connector->display_info.num_bus_formats) {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0005-drm-atomic-Don-t-fixup-modes-that-haven-t-been-reset.patch b/target/linux/bcm27xx/patches-6.1/950-0005-drm-atomic-Don-t-fixup-modes-that-haven-t-been-reset.patch
deleted file mode 100644
index 0682961157..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0005-drm-atomic-Don-t-fixup-modes-that-haven-t-been-reset.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 5e5243cf497ccec7265b79cf84beb0f60550e113 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 7 Jan 2021 16:30:55 +0000
-Subject: [PATCH] drm/atomic: Don't fixup modes that haven't been reset
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/drm_atomic_helper.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/drivers/gpu/drm/drm_atomic_helper.c
-+++ b/drivers/gpu/drm/drm_atomic_helper.c
-@@ -443,6 +443,11 @@ mode_fixup(struct drm_atomic_state *stat
- 		new_crtc_state =
- 			drm_atomic_get_new_crtc_state(state, new_conn_state->crtc);
- 
-+		if (!new_crtc_state->mode_changed &&
-+		    !new_crtc_state->connectors_changed) {
-+			continue;
-+		}
-+
- 		/*
- 		 * Each encoder has at most one connector (since we always steal
- 		 * it away), so we won't call ->mode_fixup twice.
diff --git a/target/linux/bcm27xx/patches-6.1/950-0006-drm-vc4-Fix-timings-for-VEC-modes.patch b/target/linux/bcm27xx/patches-6.1/950-0006-drm-vc4-Fix-timings-for-VEC-modes.patch
deleted file mode 100644
index bc5643ee77..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0006-drm-vc4-Fix-timings-for-VEC-modes.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From 607f72974246d1495059932286b3d5307c1645a5 Mon Sep 17 00:00:00 2001
-From: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
-Date: Thu, 15 Jul 2021 01:07:30 +0200
-Subject: [PATCH] drm/vc4: Fix timings for VEC modes
-
-This commit fixes vertical timings of the VEC (composite output) modes
-to accurately represent the 525-line ("NTSC") and 625-line ("PAL") ITU-R
-standards.
-
-Previous timings were actually defined as 502 and 601 lines, resulting
-in non-standard 62.69 Hz and 52 Hz signals being generated,
-respectively.
-
-Changes to vc4_crtc.c have also been made, to make the PixelValve
-vertical timings accurately correspond to the DRM modeline in interlaced
-modes. The resulting VERTA/VERTB register values have been verified
-against the reference values set by the Raspberry Pi firmware.
-
-Signed-off-by: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
----
- drivers/gpu/drm/vc4/vc4_crtc.c | 70 +++++++++++++++++++++-------------
- 1 file changed, 43 insertions(+), 27 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_crtc.c
-+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
-@@ -326,8 +326,14 @@ static void vc4_crtc_config_pv(struct dr
- 	bool is_dsi = (vc4_encoder->type == VC4_ENCODER_TYPE_DSI0 ||
- 		       vc4_encoder->type == VC4_ENCODER_TYPE_DSI1);
- 	bool is_dsi1 = vc4_encoder->type == VC4_ENCODER_TYPE_DSI1;
-+	bool is_vec = vc4_encoder->type == VC4_ENCODER_TYPE_VEC;
- 	u32 format = is_dsi1 ? PV_CONTROL_FORMAT_DSIV_24 : PV_CONTROL_FORMAT_24;
- 	u8 ppc = pv_data->pixels_per_clock;
-+
-+	u16 vert_bp = mode->crtc_vtotal - mode->crtc_vsync_end;
-+	u16 vert_sync = mode->crtc_vsync_end - mode->crtc_vsync_start;
-+	u16 vert_fp = mode->crtc_vsync_start - mode->crtc_vdisplay;
-+
- 	bool debug_dump_regs = false;
- 	int idx;
- 
-@@ -355,49 +361,59 @@ static void vc4_crtc_config_pv(struct dr
- 		   VC4_SET_FIELD(mode->hdisplay * pixel_rep / ppc,
- 				 PV_HORZB_HACTIVE));
- 
--	CRTC_WRITE(PV_VERTA,
--		   VC4_SET_FIELD(mode->crtc_vtotal - mode->crtc_vsync_end +
--				 interlace,
--				 PV_VERTA_VBP) |
--		   VC4_SET_FIELD(mode->crtc_vsync_end - mode->crtc_vsync_start,
--				 PV_VERTA_VSYNC));
--	CRTC_WRITE(PV_VERTB,
--		   VC4_SET_FIELD(mode->crtc_vsync_start - mode->crtc_vdisplay,
--				 PV_VERTB_VFP) |
--		   VC4_SET_FIELD(mode->crtc_vdisplay, PV_VERTB_VACTIVE));
--
- 	if (interlace) {
-+		bool odd_field_first = false;
-+		u32 field_delay = mode->htotal * pixel_rep / (2 * ppc);
-+		u16 vert_bp_even = vert_bp;
-+		u16 vert_fp_even = vert_fp;
-+
-+		if (is_vec) {
-+			/* VEC (composite output) */
-+			++field_delay;
-+			if (mode->htotal == 858) {
-+				/* 525-line mode (NTSC or PAL-M) */
-+				odd_field_first = true;
-+			}
-+		}
-+
-+		if (odd_field_first)
-+			++vert_fp_even;
-+		else
-+			++vert_bp;
-+
- 		CRTC_WRITE(PV_VERTA_EVEN,
--			   VC4_SET_FIELD(mode->crtc_vtotal -
--					 mode->crtc_vsync_end,
--					 PV_VERTA_VBP) |
--			   VC4_SET_FIELD(mode->crtc_vsync_end -
--					 mode->crtc_vsync_start,
--					 PV_VERTA_VSYNC));
-+			   VC4_SET_FIELD(vert_bp_even, PV_VERTA_VBP) |
-+			   VC4_SET_FIELD(vert_sync, PV_VERTA_VSYNC));
- 		CRTC_WRITE(PV_VERTB_EVEN,
--			   VC4_SET_FIELD(mode->crtc_vsync_start -
--					 mode->crtc_vdisplay,
--					 PV_VERTB_VFP) |
-+			   VC4_SET_FIELD(vert_fp_even, PV_VERTB_VFP) |
- 			   VC4_SET_FIELD(mode->crtc_vdisplay, PV_VERTB_VACTIVE));
- 
--		/* We set up first field even mode for HDMI.  VEC's
--		 * NTSC mode would want first field odd instead, once
--		 * we support it (to do so, set ODD_FIRST and put the
--		 * delay in VSYNCD_EVEN instead).
-+		/* We set up first field even mode for HDMI and VEC's PAL.
-+		 * For NTSC, we need first field odd.
- 		 */
- 		CRTC_WRITE(PV_V_CONTROL,
- 			   PV_VCONTROL_CONTINUOUS |
- 			   (is_dsi ? PV_VCONTROL_DSI : 0) |
- 			   PV_VCONTROL_INTERLACE |
--			   VC4_SET_FIELD(mode->htotal * pixel_rep / (2 * ppc),
--					 PV_VCONTROL_ODD_DELAY));
--		CRTC_WRITE(PV_VSYNCD_EVEN, 0);
-+			   (odd_field_first
-+				   ? PV_VCONTROL_ODD_FIRST
-+				   : VC4_SET_FIELD(field_delay,
-+						   PV_VCONTROL_ODD_DELAY)));
-+		CRTC_WRITE(PV_VSYNCD_EVEN,
-+			   (odd_field_first ? field_delay : 0));
- 	} else {
- 		CRTC_WRITE(PV_V_CONTROL,
- 			   PV_VCONTROL_CONTINUOUS |
- 			   (is_dsi ? PV_VCONTROL_DSI : 0));
- 	}
- 
-+	CRTC_WRITE(PV_VERTA,
-+		   VC4_SET_FIELD(vert_bp, PV_VERTA_VBP) |
-+		   VC4_SET_FIELD(vert_sync, PV_VERTA_VSYNC));
-+	CRTC_WRITE(PV_VERTB,
-+		   VC4_SET_FIELD(vert_fp, PV_VERTB_VFP) |
-+		   VC4_SET_FIELD(mode->crtc_vdisplay, PV_VERTB_VACTIVE));
-+
- 	if (is_dsi)
- 		CRTC_WRITE(PV_HACT_ACT, mode->hdisplay * pixel_rep);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0007-drm-vc4-Fix-definition-of-PAL-M-mode.patch b/target/linux/bcm27xx/patches-6.1/950-0007-drm-vc4-Fix-definition-of-PAL-M-mode.patch
deleted file mode 100644
index b6345ee50b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0007-drm-vc4-Fix-definition-of-PAL-M-mode.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 5bcc290bd33f2b2fb7c6d7b30555b40b1074fd93 Mon Sep 17 00:00:00 2001
-From: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
-Date: Thu, 15 Jul 2021 01:07:53 +0200
-Subject: [PATCH] drm/vc4: Fix definition of PAL-M mode
-
-PAL-M is a Brazilian analog TV standard that uses a PAL-style chroma
-subcarrier at 3.575611[888111] MHz on top of 525-line (480i60) timings.
-This commit makes the driver actually use the proper VEC preset for this
-mode instead of just changing PAL subcarrier frequency.
-
-DRM mode constant names have also been changed, as they no longer
-correspond to the "NTSC" or "PAL" terms.
-
-Signed-off-by: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
----
- drivers/gpu/drm/vc4/vc4_vec.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_vec.c
-+++ b/drivers/gpu/drm/vc4/vc4_vec.c
-@@ -69,6 +69,7 @@
- #define VEC_CONFIG0_STD_MASK		GENMASK(1, 0)
- #define VEC_CONFIG0_NTSC_STD		0
- #define VEC_CONFIG0_PAL_BDGHI_STD	1
-+#define VEC_CONFIG0_PAL_M_STD		2
- #define VEC_CONFIG0_PAL_N_STD		3
- 
- #define VEC_SCHPH			0x108
-@@ -224,14 +225,14 @@ static const struct debugfs_reg32 vec_re
- 	VC4_REG32(VEC_DAC_MISC),
- };
- 
--static const struct drm_display_mode ntsc_mode = {
-+static const struct drm_display_mode drm_mode_480i = {
- 	DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 13500,
- 		 720, 720 + 14, 720 + 14 + 64, 720 + 14 + 64 + 60, 0,
- 		 480, 480 + 7, 480 + 7 + 6, 525, 0,
- 		 DRM_MODE_FLAG_INTERLACE)
- };
- 
--static const struct drm_display_mode pal_mode = {
-+static const struct drm_display_mode drm_mode_576i = {
- 	DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 13500,
- 		 720, 720 + 20, 720 + 20 + 64, 720 + 20 + 64 + 60, 0,
- 		 576, 576 + 4, 576 + 4 + 6, 625, 0,
-@@ -240,25 +241,24 @@ static const struct drm_display_mode pal
- 
- static const struct vc4_vec_tv_mode vc4_vec_tv_modes[] = {
- 	[VC4_VEC_TV_MODE_NTSC] = {
--		.mode = &ntsc_mode,
-+		.mode = &drm_mode_480i,
- 		.config0 = VEC_CONFIG0_NTSC_STD | VEC_CONFIG0_PDEN,
- 		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
- 	},
- 	[VC4_VEC_TV_MODE_NTSC_J] = {
--		.mode = &ntsc_mode,
-+		.mode = &drm_mode_480i,
- 		.config0 = VEC_CONFIG0_NTSC_STD,
- 		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
- 	},
- 	[VC4_VEC_TV_MODE_PAL] = {
--		.mode = &pal_mode,
-+		.mode = &drm_mode_576i,
- 		.config0 = VEC_CONFIG0_PAL_BDGHI_STD,
- 		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
- 	},
- 	[VC4_VEC_TV_MODE_PAL_M] = {
--		.mode = &pal_mode,
--		.config0 = VEC_CONFIG0_PAL_BDGHI_STD,
--		.config1 = VEC_CONFIG1_C_CVBS_CVBS | VEC_CONFIG1_CUSTOM_FREQ,
--		.custom_freq = 0x223b61d1,
-+		.mode = &drm_mode_480i,
-+		.config0 = VEC_CONFIG0_PAL_M_STD,
-+		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
- 	},
- };
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0008-drm-vc4-Add-support-for-more-analog-TV-standards.patch b/target/linux/bcm27xx/patches-6.1/950-0008-drm-vc4-Add-support-for-more-analog-TV-standards.patch
deleted file mode 100644
index e1c9170a55..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0008-drm-vc4-Add-support-for-more-analog-TV-standards.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From 5040ce6a1488fb6bf43d10172e0209c13de99a80 Mon Sep 17 00:00:00 2001
-From: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
-Date: Thu, 15 Jul 2021 01:07:58 +0200
-Subject: [PATCH] drm/vc4: Add support for more analog TV standards
-
-Add support for the following composite output modes (all of them are
-somewhat more obscure than the previously defined ones):
-
-- NTSC_443 - NTSC-style signal with the chroma subcarrier shifted to
-  4.43361875 MHz (the PAL subcarrier frequency). Never used for
-  broadcasting, but sometimes used as a hack to play NTSC content in PAL
-  regions (e.g. on VCRs).
-- PAL_N - PAL with alternative chroma subcarrier frequency,
-  3.58205625 MHz. Used as a broadcast standard in Argentina, Paraguay
-  and Uruguay to fit 576i50 with colour in 6 MHz channel raster.
-- PAL60 - 480i60 signal with PAL-style color at normal European PAL
-  frequency. Another non-standard, non-broadcast mode, used in similar
-  contexts as NTSC_443. Some displays support one but not the other.
-- SECAM - French frequency-modulated analog color standard; also have
-  been broadcast in Eastern Europe and various parts of Africa and Asia.
-  Uses the same 576i50 timings as PAL.
-
-Also added some comments explaining color subcarrier frequency
-registers.
-
-Signed-off-by: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
----
- drivers/gpu/drm/vc4/vc4_vec.c | 63 +++++++++++++++++++++++++++++++++++
- 1 file changed, 63 insertions(+)
-
---- a/drivers/gpu/drm/vc4/vc4_vec.c
-+++ b/drivers/gpu/drm/vc4/vc4_vec.c
-@@ -46,6 +46,7 @@
- #define VEC_CONFIG0_YDEL(x)		((x) << 26)
- #define VEC_CONFIG0_CDEL_MASK		GENMASK(25, 24)
- #define VEC_CONFIG0_CDEL(x)		((x) << 24)
-+#define VEC_CONFIG0_SECAM_STD		BIT(21)
- #define VEC_CONFIG0_PBPR_FIL		BIT(18)
- #define VEC_CONFIG0_CHROMA_GAIN_MASK	GENMASK(17, 16)
- #define VEC_CONFIG0_CHROMA_GAIN_UNITY	(0 << 16)
-@@ -76,6 +77,27 @@
- #define VEC_SOFT_RESET			0x10c
- #define VEC_CLMP0_START			0x144
- #define VEC_CLMP0_END			0x148
-+
-+/*
-+ * These set the color subcarrier frequency
-+ * if VEC_CONFIG1_CUSTOM_FREQ is enabled.
-+ *
-+ * VEC_FREQ1_0 contains the most significant 16-bit half-word,
-+ * VEC_FREQ3_2 contains the least significant 16-bit half-word.
-+ * 0x80000000 seems to be equivalent to the pixel clock
-+ * (which itself is the VEC clock divided by 8).
-+ *
-+ * Reference values (with the default pixel clock of 13.5 MHz):
-+ *
-+ * NTSC  (3579545.[45] Hz)     - 0x21F07C1F
-+ * PAL   (4433618.75 Hz)       - 0x2A098ACB
-+ * PAL-M (3575611.[888111] Hz) - 0x21E6EFE3
-+ * PAL-N (3582056.25 Hz)       - 0x21F69446
-+ *
-+ * NOTE: For SECAM, it is used as the Dr center frequency,
-+ * regardless of whether VEC_CONFIG1_CUSTOM_FREQ is enabled or not;
-+ * that is specified as 4406250 Hz, which corresponds to 0x29C71C72.
-+ */
- #define VEC_FREQ3_2			0x180
- #define VEC_FREQ1_0			0x184
- 
-@@ -118,6 +140,14 @@
- 
- #define VEC_INTERRUPT_CONTROL		0x190
- #define VEC_INTERRUPT_STATUS		0x194
-+
-+/*
-+ * Db center frequency for SECAM; the clock for this is the same as for
-+ * VEC_FREQ3_2/VEC_FREQ1_0, which is used for Dr center frequency.
-+ *
-+ * This is specified as 4250000 Hz, which corresponds to 0x284BDA13.
-+ * That is also the default value, so no need to set it explicitly.
-+ */
- #define VEC_FCW_SECAM_B			0x198
- #define VEC_SECAM_GAIN_VAL		0x19c
- 
-@@ -187,8 +217,12 @@ encoder_to_vc4_vec(struct drm_encoder *e
- enum vc4_vec_tv_mode_id {
- 	VC4_VEC_TV_MODE_NTSC,
- 	VC4_VEC_TV_MODE_NTSC_J,
-+	VC4_VEC_TV_MODE_NTSC_443,
- 	VC4_VEC_TV_MODE_PAL,
- 	VC4_VEC_TV_MODE_PAL_M,
-+	VC4_VEC_TV_MODE_PAL_N,
-+	VC4_VEC_TV_MODE_PAL60,
-+	VC4_VEC_TV_MODE_SECAM,
- };
- 
- struct vc4_vec_tv_mode {
-@@ -250,6 +284,13 @@ static const struct vc4_vec_tv_mode vc4_
- 		.config0 = VEC_CONFIG0_NTSC_STD,
- 		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
- 	},
-+	[VC4_VEC_TV_MODE_NTSC_443] = {
-+		/* NTSC with PAL chroma frequency */
-+		.mode = &drm_mode_480i,
-+		.config0 = VEC_CONFIG0_NTSC_STD,
-+		.config1 = VEC_CONFIG1_C_CVBS_CVBS | VEC_CONFIG1_CUSTOM_FREQ,
-+		.custom_freq = 0x2a098acb,
-+	},
- 	[VC4_VEC_TV_MODE_PAL] = {
- 		.mode = &drm_mode_576i,
- 		.config0 = VEC_CONFIG0_PAL_BDGHI_STD,
-@@ -260,6 +301,24 @@ static const struct vc4_vec_tv_mode vc4_
- 		.config0 = VEC_CONFIG0_PAL_M_STD,
- 		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
- 	},
-+	[VC4_VEC_TV_MODE_PAL_N] = {
-+		.mode = &drm_mode_576i,
-+		.config0 = VEC_CONFIG0_PAL_N_STD,
-+		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
-+	},
-+	[VC4_VEC_TV_MODE_PAL60] = {
-+		/* PAL-M with chroma frequency of regular PAL */
-+		.mode = &drm_mode_480i,
-+		.config0 = VEC_CONFIG0_PAL_M_STD,
-+		.config1 = VEC_CONFIG1_C_CVBS_CVBS | VEC_CONFIG1_CUSTOM_FREQ,
-+		.custom_freq = 0x2a098acb,
-+	},
-+	[VC4_VEC_TV_MODE_SECAM] = {
-+		.mode = &drm_mode_576i,
-+		.config0 = VEC_CONFIG0_SECAM_STD,
-+		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
-+		.custom_freq = 0x29c71c72,
-+	},
- };
- 
- static enum drm_connector_status
-@@ -503,8 +562,12 @@ static const struct of_device_id vc4_vec
- static const char * const tv_mode_names[] = {
- 	[VC4_VEC_TV_MODE_NTSC] = "NTSC",
- 	[VC4_VEC_TV_MODE_NTSC_J] = "NTSC-J",
-+	[VC4_VEC_TV_MODE_NTSC_443] = "NTSC-443",
- 	[VC4_VEC_TV_MODE_PAL] = "PAL",
- 	[VC4_VEC_TV_MODE_PAL_M] = "PAL-M",
-+	[VC4_VEC_TV_MODE_PAL_N] = "PAL-N",
-+	[VC4_VEC_TV_MODE_PAL60] = "PAL60",
-+	[VC4_VEC_TV_MODE_SECAM] = "SECAM",
- };
- 
- static int vc4_vec_bind(struct device *dev, struct device *master, void *data)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0009-drm-vc4-Allow-setting-the-TV-norm-via-module-paramet.patch b/target/linux/bcm27xx/patches-6.1/950-0009-drm-vc4-Allow-setting-the-TV-norm-via-module-paramet.patch
deleted file mode 100644
index cfdcf12d46..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0009-drm-vc4-Allow-setting-the-TV-norm-via-module-paramet.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From b5b92244feaa5b39a66fe0dace0d25d576079f0d Mon Sep 17 00:00:00 2001
-From: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
-Date: Thu, 15 Jul 2021 01:08:01 +0200
-Subject: [PATCH] drm/vc4: Allow setting the TV norm via module
- parameter
-
-Similar to the ch7006 and nouveau drivers, introduce a "tv_mode" module
-parameter that allow setting the TV norm by specifying vc4.tv_norm= on
-the kernel command line.
-
-If that is not specified, try inferring one of the most popular norms
-(PAL or NTSC) from the video mode specified on the command line. On
-Raspberry Pis, this causes the most common cases of the sdtv_mode
-setting in config.txt to be respected.
-
-Signed-off-by: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
----
- drivers/gpu/drm/vc4/vc4_vec.c | 72 ++++++++++++++++++++++++++++-------
- 1 file changed, 58 insertions(+), 14 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_vec.c
-+++ b/drivers/gpu/drm/vc4/vc4_vec.c
-@@ -67,7 +67,7 @@
- #define VEC_CONFIG0_YCDELAY		BIT(4)
- #define VEC_CONFIG0_RAMPEN		BIT(2)
- #define VEC_CONFIG0_YCDIS		BIT(2)
--#define VEC_CONFIG0_STD_MASK		GENMASK(1, 0)
-+#define VEC_CONFIG0_STD_MASK		(VEC_CONFIG0_SECAM_STD | GENMASK(1, 0))
- #define VEC_CONFIG0_NTSC_STD		0
- #define VEC_CONFIG0_PAL_BDGHI_STD	1
- #define VEC_CONFIG0_PAL_M_STD		2
-@@ -186,6 +186,8 @@
- #define VEC_DAC_MISC_DAC_RST_N		BIT(0)
- 
- 
-+static char *vc4_vec_tv_norm;
-+
- struct vc4_vec_variant {
- 	u32 dac_config;
- };
-@@ -321,6 +323,44 @@ static const struct vc4_vec_tv_mode vc4_
- 	},
- };
- 
-+static const char * const tv_mode_names[] = {
-+	[VC4_VEC_TV_MODE_NTSC] = "NTSC",
-+	[VC4_VEC_TV_MODE_NTSC_J] = "NTSC-J",
-+	[VC4_VEC_TV_MODE_NTSC_443] = "NTSC-443",
-+	[VC4_VEC_TV_MODE_PAL] = "PAL",
-+	[VC4_VEC_TV_MODE_PAL_M] = "PAL-M",
-+	[VC4_VEC_TV_MODE_PAL_N] = "PAL-N",
-+	[VC4_VEC_TV_MODE_PAL60] = "PAL60",
-+	[VC4_VEC_TV_MODE_SECAM] = "SECAM",
-+};
-+
-+enum vc4_vec_tv_mode_id
-+vc4_vec_get_default_mode(struct drm_connector *connector)
-+{
-+	int i;
-+
-+	if (vc4_vec_tv_norm) {
-+		for (i = 0; i < ARRAY_SIZE(tv_mode_names); i++)
-+			if (strcmp(vc4_vec_tv_norm, tv_mode_names[i]) == 0)
-+				return (enum vc4_vec_tv_mode_id) i;
-+	} else if (connector->cmdline_mode.specified &&
-+		   ((connector->cmdline_mode.refresh_specified &&
-+		     (connector->cmdline_mode.refresh == 25 ||
-+		      connector->cmdline_mode.refresh == 50)) ||
-+		    (!connector->cmdline_mode.refresh_specified &&
-+		     (connector->cmdline_mode.yres == 288 ||
-+		      connector->cmdline_mode.yres == 576)))) {
-+		/*
-+		 * no explicitly specified TV norm; use PAL if a mode that
-+		 * looks like PAL has been specified on the command line
-+		 */
-+		return VC4_VEC_TV_MODE_PAL;
-+	}
-+
-+	/* in all other cases, default to NTSC */
-+	return VC4_VEC_TV_MODE_NTSC;
-+}
-+
- static enum drm_connector_status
- vc4_vec_connector_detect(struct drm_connector *connector, bool force)
- {
-@@ -344,10 +384,18 @@ static int vc4_vec_connector_get_modes(s
- 	return 1;
- }
- 
-+static void vc4_vec_connector_reset(struct drm_connector *connector)
-+{
-+	drm_atomic_helper_connector_reset(connector);
-+	/* preserve TV standard */
-+	if (connector->state)
-+		connector->state->tv.mode = vc4_vec_get_default_mode(connector);
-+}
-+
- static const struct drm_connector_funcs vc4_vec_connector_funcs = {
- 	.detect = vc4_vec_connector_detect,
- 	.fill_modes = drm_helper_probe_single_connector_modes,
--	.reset = drm_atomic_helper_connector_reset,
-+	.reset = vc4_vec_connector_reset,
- 	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
- 	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
- };
-@@ -372,7 +420,7 @@ static int vc4_vec_connector_init(struct
- 
- 	drm_object_attach_property(&connector->base,
- 				   dev->mode_config.tv_mode_property,
--				   VC4_VEC_TV_MODE_NTSC);
-+				   vc4_vec_get_default_mode(connector));
- 
- 	drm_connector_attach_encoder(connector, &vec->encoder.base);
- 
-@@ -559,17 +607,6 @@ static const struct of_device_id vc4_vec
- 	{ /* sentinel */ },
- };
- 
--static const char * const tv_mode_names[] = {
--	[VC4_VEC_TV_MODE_NTSC] = "NTSC",
--	[VC4_VEC_TV_MODE_NTSC_J] = "NTSC-J",
--	[VC4_VEC_TV_MODE_NTSC_443] = "NTSC-443",
--	[VC4_VEC_TV_MODE_PAL] = "PAL",
--	[VC4_VEC_TV_MODE_PAL_M] = "PAL-M",
--	[VC4_VEC_TV_MODE_PAL_N] = "PAL-N",
--	[VC4_VEC_TV_MODE_PAL60] = "PAL60",
--	[VC4_VEC_TV_MODE_SECAM] = "SECAM",
--};
--
- static int vc4_vec_bind(struct device *dev, struct device *master, void *data)
- {
- 	struct platform_device *pdev = to_platform_device(dev);
-@@ -650,3 +687,10 @@ struct platform_driver vc4_vec_driver =
- 		.of_match_table = vc4_vec_dt_match,
- 	},
- };
-+
-+module_param_named(tv_norm, vc4_vec_tv_norm, charp, 0600);
-+MODULE_PARM_DESC(tv_norm, "Default TV norm.\n"
-+		 "\t\tSupported: NTSC, NTSC-J, NTSC-443, PAL, PAL-M, PAL-N,\n"
-+		 "\t\t\tPAL60, SECAM.\n"
-+		 "\t\tDefault: PAL if a 50 Hz mode has been set via video=,\n"
-+		 "\t\t\tNTSC otherwise");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0010-drm-vc4-Refactor-mode-checking-logic.patch b/target/linux/bcm27xx/patches-6.1/950-0010-drm-vc4-Refactor-mode-checking-logic.patch
deleted file mode 100644
index ca67a9c4cd..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0010-drm-vc4-Refactor-mode-checking-logic.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 3246c9abe5f4358cc5c60b8621485faa9883d06b Mon Sep 17 00:00:00 2001
-From: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
-Date: Thu, 15 Jul 2021 01:08:05 +0200
-Subject: [PATCH] drm/vc4: Refactor mode checking logic
-
-Replace drm_encoder_helper_funcs::atomic_check with
-drm_connector_helper_funcs::atomic_check - the former is not called
-during drm_mode_obj_set_property_ioctl(). Set crtc_state->mode_changed
-if TV norm changes even without explicit mode change. This makes things
-like "xrandr --output Composite-1 --set mode PAL-M" work properly.
-
-Signed-off-by: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
----
- drivers/gpu/drm/vc4/vc4_vec.c | 42 ++++++++++++++++++++++-------------
- 1 file changed, 26 insertions(+), 16 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_vec.c
-+++ b/drivers/gpu/drm/vc4/vc4_vec.c
-@@ -392,6 +392,31 @@ static void vc4_vec_connector_reset(stru
- 		connector->state->tv.mode = vc4_vec_get_default_mode(connector);
- }
- 
-+static int vc4_vec_connector_atomic_check(struct drm_connector *conn,
-+					  struct drm_atomic_state *state)
-+{
-+	struct drm_connector_state *old_state =
-+		drm_atomic_get_old_connector_state(state, conn);
-+	struct drm_connector_state *new_state =
-+		drm_atomic_get_new_connector_state(state, conn);
-+
-+	const struct vc4_vec_tv_mode *vec_mode =
-+		&vc4_vec_tv_modes[new_state->tv.mode];
-+
-+	if (new_state->crtc) {
-+		struct drm_crtc_state *crtc_state =
-+			drm_atomic_get_new_crtc_state(state, new_state->crtc);
-+
-+		if (!drm_mode_equal(vec_mode->mode, &crtc_state->mode))
-+			return -EINVAL;
-+
-+		if (old_state->tv.mode != new_state->tv.mode)
-+			crtc_state->mode_changed = true;
-+	}
-+
-+	return 0;
-+}
-+
- static const struct drm_connector_funcs vc4_vec_connector_funcs = {
- 	.detect = vc4_vec_connector_detect,
- 	.fill_modes = drm_helper_probe_single_connector_modes,
-@@ -402,6 +427,7 @@ static const struct drm_connector_funcs
- 
- static const struct drm_connector_helper_funcs vc4_vec_connector_helper_funcs = {
- 	.get_modes = vc4_vec_connector_get_modes,
-+	.atomic_check = vc4_vec_connector_atomic_check,
- };
- 
- static int vc4_vec_connector_init(struct drm_device *dev, struct vc4_vec *vec)
-@@ -550,23 +576,7 @@ err_dev_exit:
- 	drm_dev_exit(idx);
- }
- 
--static int vc4_vec_encoder_atomic_check(struct drm_encoder *encoder,
--					struct drm_crtc_state *crtc_state,
--					struct drm_connector_state *conn_state)
--{
--	const struct vc4_vec_tv_mode *vec_mode;
--
--	vec_mode = &vc4_vec_tv_modes[conn_state->tv.mode];
--
--	if (conn_state->crtc &&
--	    !drm_mode_equal(vec_mode->mode, &crtc_state->adjusted_mode))
--		return -EINVAL;
--
--	return 0;
--}
--
- static const struct drm_encoder_helper_funcs vc4_vec_encoder_helper_funcs = {
--	.atomic_check = vc4_vec_encoder_atomic_check,
- 	.atomic_disable = vc4_vec_encoder_disable,
- 	.atomic_enable = vc4_vec_encoder_enable,
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0011-drm-vc4-Add-firmware-kms-mode.patch b/target/linux/bcm27xx/patches-6.1/950-0011-drm-vc4-Add-firmware-kms-mode.patch
deleted file mode 100644
index b01a78c015..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0011-drm-vc4-Add-firmware-kms-mode.patch
+++ /dev/null
@@ -1,2476 +0,0 @@
-From 2f74e0d6dd9f545a3b1dcc8d3cdf0ccf55a6f7d0 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Mon, 7 Sep 2020 17:32:27 +0100
-Subject: [PATCH] drm/vc4: Add firmware-kms mode
-
-This is a squash of all firmware-kms related patches from previous
-branches, up to and including
-"drm/vc4: Set the possible crtcs mask correctly for planes with FKMS"
-plus a couple of minor fixups for the 5.9 branch.
-Please refer to earlier branches for full history.
-
-This patch includes work by Eric Anholt, James Hughes, Phil Elwell,
-Dave Stevenson, Dom Cobley, and Jonathon Bell.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-drm/vc4: Fixup firmware-kms after "drm/atomic: Pass the full state to CRTC atomic enable/disable"
-
-Prototype for those calls changed, so amend fkms (which isn't
-upstream) to match.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-drm/vc4: Fixup fkms for API change
-
-Atomic flush and check changed API, so fix up the downstream-only
-FKMS driver.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-drm/vc4: Make normalize_zpos conditional on using fkms
-
-Eric's view was that there was no point in having zpos
-support on vc4 as all the planes had the same functionality.
-
-Can be later squashed into (and fixes):
-drm/vc4: Add firmware-kms mode
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
-
-drm/vc4: FKMS: Change of Broadcast RGB mode needs a mode change
-
-The Broadcast RGB (aka HDMI limited/full range) property is only
-notified to the firmware on mode change, so this needs to be
-signalled when set.
-
-https://github.com/raspberrypi/firmware/issues/1580
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-vc4/drv: Only notify firmware of display done with kms
-
-fkms driver still wants firmware display to be active
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
-
-ydrm/vc4: fkms: Fix margin calculations for the right/bottom edges
-
-The calculations clipped the right/bottom edge of the clipped
-range based on the left/top margins.
-
-https://github.com/raspberrypi/linux/issues/4447
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-drm/vc4: fkms: Use new devm_rpi_firmware_get api
-
-drm/kms: Add allow_fb_modifiers
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/gpu/drm/vc4/Makefile           |    1 +
- drivers/gpu/drm/vc4/vc4_debugfs.c      |    3 +-
- drivers/gpu/drm/vc4/vc4_drv.c          |   29 +-
- drivers/gpu/drm/vc4/vc4_drv.h          |    7 +
- drivers/gpu/drm/vc4/vc4_firmware_kms.c | 1997 ++++++++++++++++++++++++
- drivers/gpu/drm/vc4/vc4_kms.c          |   35 +-
- drivers/gpu/drm/vc4/vc_image_types.h   |  175 +++
- 7 files changed, 2233 insertions(+), 14 deletions(-)
- create mode 100644 drivers/gpu/drm/vc4/vc4_firmware_kms.c
- create mode 100644 drivers/gpu/drm/vc4/vc_image_types.h
-
---- a/drivers/gpu/drm/vc4/Makefile
-+++ b/drivers/gpu/drm/vc4/Makefile
-@@ -9,6 +9,7 @@ vc4-y := \
- 	vc4_dpi.o \
- 	vc4_dsi.o \
- 	vc4_fence.o \
-+	vc4_firmware_kms.o \
- 	vc4_kms.o \
- 	vc4_gem.o \
- 	vc4_hdmi.o \
---- a/drivers/gpu/drm/vc4/vc4_debugfs.c
-+++ b/drivers/gpu/drm/vc4/vc4_debugfs.c
-@@ -24,7 +24,8 @@ vc4_debugfs_init(struct drm_minor *minor
- 	struct vc4_dev *vc4 = to_vc4_dev(minor->dev);
- 	struct drm_device *drm = &vc4->base;
- 
--	drm_WARN_ON(drm, vc4_hvs_debugfs_init(minor));
-+	if (vc4->hvs)
-+		drm_WARN_ON(drm, vc4_hvs_debugfs_init(minor));
- 
- 	if (vc4->v3d) {
- 		drm_WARN_ON(drm, vc4_bo_debugfs_init(minor));
---- a/drivers/gpu/drm/vc4/vc4_drv.c
-+++ b/drivers/gpu/drm/vc4/vc4_drv.c
-@@ -284,6 +284,18 @@ static const struct of_device_id vc4_dma
- 	{}
- };
- 
-+/*
-+ * we need this helper function for determining presence of fkms
-+ * before it's been bound
-+ */
-+static bool firmware_kms(void)
-+{
-+	return of_device_is_available(of_find_compatible_node(NULL, NULL,
-+	       "raspberrypi,rpi-firmware-kms")) ||
-+	       of_device_is_available(of_find_compatible_node(NULL, NULL,
-+	       "raspberrypi,rpi-firmware-kms-2711"));
-+}
-+
- static int vc4_drm_bind(struct device *dev)
- {
- 	struct platform_device *pdev = to_platform_device(dev);
-@@ -357,7 +369,7 @@ static int vc4_drm_bind(struct device *d
- 	if (ret)
- 		return ret;
- 
--	if (firmware) {
-+	if (firmware && !firmware_kms()) {
- 		ret = rpi_firmware_property(firmware,
- 					    RPI_FIRMWARE_NOTIFY_DISPLAY_DONE,
- 					    NULL, 0);
-@@ -375,16 +387,20 @@ static int vc4_drm_bind(struct device *d
- 	if (ret)
- 		return ret;
- 
--	ret = vc4_plane_create_additional_planes(drm);
--	if (ret)
--		goto unbind_all;
-+	if (!vc4->firmware_kms) {
-+		ret = vc4_plane_create_additional_planes(drm);
-+		if (ret)
-+			return ret;
-+	}
- 
- 	ret = vc4_kms_load(drm);
- 	if (ret < 0)
- 		goto unbind_all;
- 
--	drm_for_each_crtc(crtc, drm)
--		vc4_crtc_disable_at_boot(crtc);
-+	if (!vc4->firmware_kms) {
-+		drm_for_each_crtc(crtc, drm)
-+			vc4_crtc_disable_at_boot(crtc);
-+	}
- 
- 	ret = drm_dev_register(drm, 0);
- 	if (ret < 0)
-@@ -428,6 +444,7 @@ static struct platform_driver *const com
- 	&vc4_dsi_driver,
- 	&vc4_txp_driver,
- 	&vc4_crtc_driver,
-+	&vc4_firmware_kms_driver,
- 	&vc4_v3d_driver,
- };
- 
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -82,8 +82,12 @@ struct vc4_dev {
- 
- 	unsigned int irq;
- 
-+	bool firmware_kms;
-+	struct rpi_firmware *firmware;
-+
- 	struct vc4_hvs *hvs;
- 	struct vc4_v3d *v3d;
-+	struct vc4_fkms *fkms;
- 
- 	struct vc4_hang_state *hang_state;
- 
-@@ -905,6 +909,9 @@ extern struct platform_driver vc4_dsi_dr
- /* vc4_fence.c */
- extern const struct dma_fence_ops vc4_fence_ops;
- 
-+/* vc4_firmware_kms.c */
-+extern struct platform_driver vc4_firmware_kms_driver;
-+
- /* vc4_gem.c */
- int vc4_gem_init(struct drm_device *dev);
- int vc4_submit_cl_ioctl(struct drm_device *dev, void *data,
---- /dev/null
-+++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-@@ -0,0 +1,1997 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+/*
-+ * Copyright (C) 2016 Broadcom
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+/**
-+ * DOC: VC4 firmware KMS module.
-+ *
-+ * As a hack to get us from the current closed source driver world
-+ * toward a totally open stack, implement KMS on top of the Raspberry
-+ * Pi's firmware display stack.
-+ */
-+
-+#include <drm/drm_atomic_helper.h>
-+#include <drm/drm_crtc_helper.h>
-+#include <drm/drm_blend.h>
-+#include <drm/drm_drv.h>
-+#include <drm/drm_edid.h>
-+#include <drm/drm_fb_dma_helper.h>
-+#include <drm/drm_fourcc.h>
-+#include <drm/drm_framebuffer.h>
-+#include <drm/drm_gem_atomic_helper.h>
-+#include <drm/drm_plane_helper.h>
-+#include <drm/drm_probe_helper.h>
-+#include <drm/drm_vblank.h>
-+
-+#include <linux/component.h>
-+#include <linux/clk.h>
-+#include <linux/debugfs.h>
-+#include <linux/module.h>
-+
-+#include <soc/bcm2835/raspberrypi-firmware.h>
-+
-+#include "vc4_drv.h"
-+#include "vc4_regs.h"
-+#include "vc_image_types.h"
-+
-+int fkms_max_refresh_rate = 85;
-+module_param(fkms_max_refresh_rate, int, 0644);
-+MODULE_PARM_DESC(fkms_max_refresh_rate, "Max supported refresh rate");
-+
-+struct get_display_cfg {
-+	u32  max_pixel_clock[2];  //Max pixel clock for each display
-+};
-+
-+struct vc4_fkms {
-+	struct get_display_cfg cfg;
-+	bool bcm2711;
-+};
-+
-+#define PLANES_PER_CRTC		8
-+
-+struct set_plane {
-+	u8 display;
-+	u8 plane_id;
-+	u8 vc_image_type;
-+	s8 layer;
-+
-+	u16 width;
-+	u16 height;
-+
-+	u16 pitch;
-+	u16 vpitch;
-+
-+	u32 src_x;	/* 16p16 */
-+	u32 src_y;	/* 16p16 */
-+
-+	u32 src_w;	/* 16p16 */
-+	u32 src_h;	/* 16p16 */
-+
-+	s16 dst_x;
-+	s16 dst_y;
-+
-+	u16 dst_w;
-+	u16 dst_h;
-+
-+	u8 alpha;
-+	u8 num_planes;
-+	u8 is_vu;
-+	u8 color_encoding;
-+
-+	u32 planes[4];  /* DMA address of each plane */
-+
-+	u32 transform;
-+};
-+
-+/* Values for the transform field */
-+#define TRANSFORM_NO_ROTATE	0
-+#define TRANSFORM_ROTATE_180	BIT(1)
-+#define TRANSFORM_FLIP_HRIZ	BIT(16)
-+#define TRANSFORM_FLIP_VERT	BIT(17)
-+
-+struct mailbox_set_plane {
-+	struct rpi_firmware_property_tag_header tag;
-+	struct set_plane plane;
-+};
-+
-+struct mailbox_blank_display {
-+	struct rpi_firmware_property_tag_header tag1;
-+	u32 display;
-+	struct rpi_firmware_property_tag_header tag2;
-+	u32 blank;
-+};
-+
-+struct mailbox_display_pwr {
-+	struct rpi_firmware_property_tag_header tag1;
-+	u32 display;
-+	u32 state;
-+};
-+
-+struct mailbox_get_edid {
-+	struct rpi_firmware_property_tag_header tag1;
-+	u32 block;
-+	u32 display_number;
-+	u8 edid[128];
-+};
-+
-+struct set_timings {
-+	u8 display;
-+	u8 padding;
-+	u16 video_id_code;
-+
-+	u32 clock;		/* in kHz */
-+
-+	u16 hdisplay;
-+	u16 hsync_start;
-+
-+	u16 hsync_end;
-+	u16 htotal;
-+
-+	u16 hskew;
-+	u16 vdisplay;
-+
-+	u16 vsync_start;
-+	u16 vsync_end;
-+
-+	u16 vtotal;
-+	u16 vscan;
-+
-+	u16 vrefresh;
-+	u16 padding2;
-+
-+	u32 flags;
-+#define  TIMINGS_FLAGS_H_SYNC_POS	BIT(0)
-+#define  TIMINGS_FLAGS_H_SYNC_NEG	0
-+#define  TIMINGS_FLAGS_V_SYNC_POS	BIT(1)
-+#define  TIMINGS_FLAGS_V_SYNC_NEG	0
-+#define  TIMINGS_FLAGS_INTERLACE	BIT(2)
-+
-+#define TIMINGS_FLAGS_ASPECT_MASK	GENMASK(7, 4)
-+#define TIMINGS_FLAGS_ASPECT_NONE	(0 << 4)
-+#define TIMINGS_FLAGS_ASPECT_4_3	(1 << 4)
-+#define TIMINGS_FLAGS_ASPECT_16_9	(2 << 4)
-+#define TIMINGS_FLAGS_ASPECT_64_27	(3 << 4)
-+#define TIMINGS_FLAGS_ASPECT_256_135	(4 << 4)
-+
-+/* Limited range RGB flag. Not set corresponds to full range. */
-+#define TIMINGS_FLAGS_RGB_LIMITED	BIT(8)
-+/* DVI monitor, therefore disable infoframes. Not set corresponds to HDMI. */
-+#define TIMINGS_FLAGS_DVI		BIT(9)
-+/* Double clock */
-+#define TIMINGS_FLAGS_DBL_CLK		BIT(10)
-+};
-+
-+struct mailbox_set_mode {
-+	struct rpi_firmware_property_tag_header tag1;
-+	struct set_timings timings;
-+};
-+
-+static const struct vc_image_format {
-+	u32 drm;	/* DRM_FORMAT_* */
-+	u32 vc_image;	/* VC_IMAGE_* */
-+	u32 is_vu;
-+} vc_image_formats[] = {
-+	{
-+		.drm = DRM_FORMAT_XRGB8888,
-+		.vc_image = VC_IMAGE_XRGB8888,
-+	},
-+	{
-+		.drm = DRM_FORMAT_ARGB8888,
-+		.vc_image = VC_IMAGE_ARGB8888,
-+	},
-+/*
-+ *	FIXME: Need to resolve which DRM format goes to which vc_image format
-+ *	for the remaining RGBA and RGBX formats.
-+ *	{
-+ *		.drm = DRM_FORMAT_ABGR8888,
-+ *		.vc_image = VC_IMAGE_RGBA8888,
-+ *	},
-+ *	{
-+ *		.drm = DRM_FORMAT_XBGR8888,
-+ *		.vc_image = VC_IMAGE_RGBA8888,
-+ *	},
-+ */
-+	{
-+		.drm = DRM_FORMAT_RGB565,
-+		.vc_image = VC_IMAGE_RGB565,
-+	},
-+	{
-+		.drm = DRM_FORMAT_RGB888,
-+		.vc_image = VC_IMAGE_BGR888,
-+	},
-+	{
-+		.drm = DRM_FORMAT_BGR888,
-+		.vc_image = VC_IMAGE_RGB888,
-+	},
-+	{
-+		.drm = DRM_FORMAT_YUV422,
-+		.vc_image = VC_IMAGE_YUV422PLANAR,
-+	},
-+	{
-+		.drm = DRM_FORMAT_YUV420,
-+		.vc_image = VC_IMAGE_YUV420,
-+	},
-+	{
-+		.drm = DRM_FORMAT_YVU420,
-+		.vc_image = VC_IMAGE_YUV420,
-+		.is_vu = 1,
-+	},
-+	{
-+		.drm = DRM_FORMAT_NV12,
-+		.vc_image = VC_IMAGE_YUV420SP,
-+	},
-+	{
-+		.drm = DRM_FORMAT_NV21,
-+		.vc_image = VC_IMAGE_YUV420SP,
-+		.is_vu = 1,
-+	},
-+	{
-+		.drm = DRM_FORMAT_P030,
-+		.vc_image = VC_IMAGE_YUV10COL,
-+	},
-+};
-+
-+static const struct vc_image_format *vc4_get_vc_image_fmt(u32 drm_format)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(vc_image_formats); i++) {
-+		if (vc_image_formats[i].drm == drm_format)
-+			return &vc_image_formats[i];
-+	}
-+
-+	return NULL;
-+}
-+
-+/* The firmware delivers a vblank interrupt to us through the SMI
-+ * hardware, which has only this one register.
-+ */
-+#define SMICS 0x0
-+#define SMIDSW0 0x14
-+#define SMIDSW1 0x1C
-+#define SMICS_INTERRUPTS (BIT(9) | BIT(10) | BIT(11))
-+
-+/* Flag to denote that the firmware is giving multiple display callbacks */
-+#define SMI_NEW 0xabcd0000
-+
-+#define vc4_crtc vc4_kms_crtc
-+#define to_vc4_crtc to_vc4_kms_crtc
-+struct vc4_crtc {
-+	struct drm_crtc base;
-+	struct drm_encoder *encoder;
-+	struct drm_connector *connector;
-+	void __iomem *regs;
-+
-+	struct drm_pending_vblank_event *event;
-+	bool vblank_enabled;
-+	u32 display_number;
-+	u32 display_type;
-+};
-+
-+static inline struct vc4_crtc *to_vc4_crtc(struct drm_crtc *crtc)
-+{
-+	return container_of(crtc, struct vc4_crtc, base);
-+}
-+
-+struct vc4_fkms_encoder {
-+	struct drm_encoder base;
-+	bool hdmi_monitor;
-+	bool rgb_range_selectable;
-+	int display_num;
-+};
-+
-+static inline struct vc4_fkms_encoder *
-+to_vc4_fkms_encoder(struct drm_encoder *encoder)
-+{
-+	return container_of(encoder, struct vc4_fkms_encoder, base);
-+}
-+
-+/* "Broadcast RGB" property.
-+ * Allows overriding of HDMI full or limited range RGB
-+ */
-+#define VC4_BROADCAST_RGB_AUTO 0
-+#define VC4_BROADCAST_RGB_FULL 1
-+#define VC4_BROADCAST_RGB_LIMITED 2
-+
-+/* VC4 FKMS connector KMS struct */
-+struct vc4_fkms_connector {
-+	struct drm_connector base;
-+
-+	/* Since the connector is attached to just the one encoder,
-+	 * this is the reference to it so we can do the best_encoder()
-+	 * hook.
-+	 */
-+	struct drm_encoder *encoder;
-+	struct vc4_dev *vc4_dev;
-+	u32 display_number;
-+	u32 display_type;
-+
-+	struct drm_property *broadcast_rgb_property;
-+};
-+
-+static inline struct vc4_fkms_connector *
-+to_vc4_fkms_connector(struct drm_connector *connector)
-+{
-+	return container_of(connector, struct vc4_fkms_connector, base);
-+}
-+
-+/* VC4 FKMS connector state */
-+struct vc4_fkms_connector_state {
-+	struct drm_connector_state base;
-+
-+	int broadcast_rgb;
-+};
-+
-+#define to_vc4_fkms_connector_state(x) \
-+			container_of(x, struct vc4_fkms_connector_state, base)
-+
-+static u32 vc4_get_display_type(u32 display_number)
-+{
-+	const u32 display_types[] = {
-+		/* The firmware display (DispmanX) IDs map to specific types in
-+		 * a fixed manner.
-+		 */
-+		DRM_MODE_ENCODER_DSI,	/* MAIN_LCD - DSI or DPI */
-+		DRM_MODE_ENCODER_DSI,	/* AUX_LCD */
-+		DRM_MODE_ENCODER_TMDS,	/* HDMI0 */
-+		DRM_MODE_ENCODER_TVDAC,	/* VEC */
-+		DRM_MODE_ENCODER_NONE,	/* FORCE_LCD */
-+		DRM_MODE_ENCODER_NONE,	/* FORCE_TV */
-+		DRM_MODE_ENCODER_NONE,	/* FORCE_OTHER */
-+		DRM_MODE_ENCODER_TMDS,	/* HDMI1 */
-+		DRM_MODE_ENCODER_NONE,	/* FORCE_TV2 */
-+	};
-+	return display_number > ARRAY_SIZE(display_types) - 1 ?
-+			DRM_MODE_ENCODER_NONE : display_types[display_number];
-+}
-+
-+/* Firmware's structure for making an FB mbox call. */
-+struct fbinfo_s {
-+	u32 xres, yres, xres_virtual, yres_virtual;
-+	u32 pitch, bpp;
-+	u32 xoffset, yoffset;
-+	u32 base;
-+	u32 screen_size;
-+	u16 cmap[256];
-+};
-+
-+struct vc4_fkms_plane {
-+	struct drm_plane base;
-+	struct fbinfo_s *fbinfo;
-+	dma_addr_t fbinfo_bus_addr;
-+	u32 pitch;
-+	struct mailbox_set_plane mb;
-+};
-+
-+static inline struct vc4_fkms_plane *to_vc4_fkms_plane(struct drm_plane *plane)
-+{
-+	return (struct vc4_fkms_plane *)plane;
-+}
-+
-+static int vc4_plane_set_blank(struct drm_plane *plane, bool blank)
-+{
-+	struct vc4_dev *vc4 = to_vc4_dev(plane->dev);
-+	struct vc4_fkms_plane *vc4_plane = to_vc4_fkms_plane(plane);
-+	struct mailbox_set_plane blank_mb = {
-+		.tag = { RPI_FIRMWARE_SET_PLANE, sizeof(struct set_plane), 0 },
-+		.plane = {
-+			.display = vc4_plane->mb.plane.display,
-+			.plane_id = vc4_plane->mb.plane.plane_id,
-+		}
-+	};
-+	static const char * const plane_types[] = {
-+							"overlay",
-+							"primary",
-+							"cursor"
-+						  };
-+	int ret;
-+
-+	DRM_DEBUG_ATOMIC("[PLANE:%d:%s] %s plane %s",
-+			 plane->base.id, plane->name, plane_types[plane->type],
-+			 blank ? "blank" : "unblank");
-+
-+	if (blank)
-+		ret = rpi_firmware_property_list(vc4->firmware, &blank_mb,
-+						 sizeof(blank_mb));
-+	else
-+		ret = rpi_firmware_property_list(vc4->firmware, &vc4_plane->mb,
-+						 sizeof(vc4_plane->mb));
-+
-+	WARN_ONCE(ret, "%s: firmware call failed. Please update your firmware",
-+		  __func__);
-+	return ret;
-+}
-+
-+static void vc4_fkms_crtc_get_margins(struct drm_crtc_state *state,
-+				      unsigned int *left, unsigned int *right,
-+				      unsigned int *top, unsigned int *bottom)
-+{
-+	struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(state);
-+	struct drm_connector_state *conn_state;
-+	struct drm_connector *conn;
-+	int i;
-+
-+	*left = vc4_state->margins.left;
-+	*right = vc4_state->margins.right;
-+	*top = vc4_state->margins.top;
-+	*bottom = vc4_state->margins.bottom;
-+
-+	/* We have to interate over all new connector states because
-+	 * vc4_fkms_crtc_get_margins() might be called before
-+	 * vc4_fkms_crtc_atomic_check() which means margins info in
-+	 * vc4_crtc_state might be outdated.
-+	 */
-+	for_each_new_connector_in_state(state->state, conn, conn_state, i) {
-+		if (conn_state->crtc != state->crtc)
-+			continue;
-+
-+		*left = conn_state->tv.margins.left;
-+		*right = conn_state->tv.margins.right;
-+		*top = conn_state->tv.margins.top;
-+		*bottom = conn_state->tv.margins.bottom;
-+		break;
-+	}
-+}
-+
-+static int vc4_fkms_margins_adj(struct drm_plane_state *pstate,
-+				struct set_plane *plane)
-+{
-+	unsigned int left, right, top, bottom;
-+	int adjhdisplay, adjvdisplay;
-+	struct drm_crtc_state *crtc_state;
-+
-+	crtc_state = drm_atomic_get_new_crtc_state(pstate->state,
-+						   pstate->crtc);
-+
-+	vc4_fkms_crtc_get_margins(crtc_state, &left, &right, &top, &bottom);
-+
-+	if (!left && !right && !top && !bottom)
-+		return 0;
-+
-+	if (left + right >= crtc_state->mode.hdisplay ||
-+	    top + bottom >= crtc_state->mode.vdisplay)
-+		return -EINVAL;
-+
-+	adjhdisplay = crtc_state->mode.hdisplay - (left + right);
-+	plane->dst_x = DIV_ROUND_CLOSEST(plane->dst_x * adjhdisplay,
-+					 (int)crtc_state->mode.hdisplay);
-+	plane->dst_x += left;
-+	if (plane->dst_x > (int)(crtc_state->mode.hdisplay - right))
-+		plane->dst_x = crtc_state->mode.hdisplay - right;
-+
-+	adjvdisplay = crtc_state->mode.vdisplay - (top + bottom);
-+	plane->dst_y = DIV_ROUND_CLOSEST(plane->dst_y * adjvdisplay,
-+					 (int)crtc_state->mode.vdisplay);
-+	plane->dst_y += top;
-+	if (plane->dst_y > (int)(crtc_state->mode.vdisplay - bottom))
-+		plane->dst_y = crtc_state->mode.vdisplay - bottom;
-+
-+	plane->dst_w = DIV_ROUND_CLOSEST(plane->dst_w * adjhdisplay,
-+					 crtc_state->mode.hdisplay);
-+	plane->dst_h = DIV_ROUND_CLOSEST(plane->dst_h * adjvdisplay,
-+					 crtc_state->mode.vdisplay);
-+
-+	if (!plane->dst_w || !plane->dst_h)
-+		return -EINVAL;
-+
-+	return 0;
-+}
-+
-+static void vc4_plane_atomic_update(struct drm_plane *plane,
-+				    struct drm_atomic_state *old_state)
-+{
-+	struct drm_plane_state *state = plane->state;
-+
-+	/*
-+	 * Do NOT set now, as we haven't checked if the crtc is active or not.
-+	 * Set from vc4_plane_set_blank instead.
-+	 *
-+	 * If the CRTC is on (or going to be on) and we're enabled,
-+	 * then unblank.  Otherwise, stay blank until CRTC enable.
-+	 */
-+	if (state->crtc->state->active)
-+		vc4_plane_set_blank(plane, false);
-+}
-+
-+static void vc4_plane_atomic_disable(struct drm_plane *plane,
-+				     struct drm_atomic_state *old_state)
-+{
-+	struct drm_plane_state *state = plane->state;
-+	struct vc4_fkms_plane *vc4_plane = to_vc4_fkms_plane(plane);
-+
-+	DRM_DEBUG_ATOMIC("[PLANE:%d:%s] plane disable %dx%d@%d +%d,%d\n",
-+			 plane->base.id, plane->name,
-+			 state->crtc_w,
-+			 state->crtc_h,
-+			 vc4_plane->mb.plane.vc_image_type,
-+			 state->crtc_x,
-+			 state->crtc_y);
-+	vc4_plane_set_blank(plane, true);
-+}
-+
-+static bool plane_enabled(struct drm_plane_state *state)
-+{
-+	return state->fb && state->crtc;
-+}
-+
-+static int vc4_plane_to_mb(struct drm_plane *plane,
-+			   struct mailbox_set_plane *mb,
-+			   struct drm_plane_state *state)
-+{
-+	struct drm_framebuffer *fb = state->fb;
-+	struct drm_gem_dma_object *bo = drm_fb_dma_get_gem_obj(fb, 0);
-+	const struct drm_format_info *drm_fmt = fb->format;
-+	const struct vc_image_format *vc_fmt =
-+					vc4_get_vc_image_fmt(drm_fmt->format);
-+	int num_planes = fb->format->num_planes;
-+	unsigned int rotation;
-+
-+	mb->plane.vc_image_type = vc_fmt->vc_image;
-+	mb->plane.width = fb->width;
-+	mb->plane.height = fb->height;
-+	mb->plane.pitch = fb->pitches[0];
-+	mb->plane.src_w = state->src_w;
-+	mb->plane.src_h = state->src_h;
-+	mb->plane.src_x = state->src_x;
-+	mb->plane.src_y = state->src_y;
-+	mb->plane.dst_w = state->crtc_w;
-+	mb->plane.dst_h = state->crtc_h;
-+	mb->plane.dst_x = state->crtc_x;
-+	mb->plane.dst_y = state->crtc_y;
-+	mb->plane.alpha = state->alpha >> 8;
-+	mb->plane.layer = state->normalized_zpos ?
-+					state->normalized_zpos : -127;
-+	mb->plane.num_planes = num_planes;
-+	mb->plane.is_vu = vc_fmt->is_vu;
-+	mb->plane.planes[0] = bo->dma_addr + fb->offsets[0];
-+
-+	rotation = drm_rotation_simplify(state->rotation,
-+					 DRM_MODE_ROTATE_0 |
-+					 DRM_MODE_REFLECT_X |
-+					 DRM_MODE_REFLECT_Y);
-+
-+	mb->plane.transform = TRANSFORM_NO_ROTATE;
-+	if (rotation & DRM_MODE_REFLECT_X)
-+		mb->plane.transform |= TRANSFORM_FLIP_HRIZ;
-+	if (rotation & DRM_MODE_REFLECT_Y)
-+		mb->plane.transform |= TRANSFORM_FLIP_VERT;
-+
-+	vc4_fkms_margins_adj(state, &mb->plane);
-+
-+	if (num_planes > 1) {
-+		/* Assume this must be YUV */
-+		/* Makes assumptions on the stride for the chroma planes as we
-+		 * can't easily plumb in non-standard pitches.
-+		 */
-+		mb->plane.planes[1] = bo->dma_addr + fb->offsets[1];
-+		if (num_planes > 2)
-+			mb->plane.planes[2] = bo->dma_addr + fb->offsets[2];
-+		else
-+			mb->plane.planes[2] = 0;
-+
-+		/* Special case the YUV420 with U and V as line interleaved
-+		 * planes as we have special handling for that case.
-+		 */
-+		if (num_planes == 3 &&
-+		    (fb->offsets[2] - fb->offsets[1]) == fb->pitches[1])
-+			mb->plane.vc_image_type = VC_IMAGE_YUV420_S;
-+
-+		switch (state->color_encoding) {
-+		default:
-+		case DRM_COLOR_YCBCR_BT601:
-+			if (state->color_range == DRM_COLOR_YCBCR_LIMITED_RANGE)
-+				mb->plane.color_encoding =
-+						VC_IMAGE_YUVINFO_CSC_ITUR_BT601;
-+			else
-+				mb->plane.color_encoding =
-+						VC_IMAGE_YUVINFO_CSC_JPEG_JFIF;
-+			break;
-+		case DRM_COLOR_YCBCR_BT709:
-+			/* Currently no support for a full range BT709 */
-+			mb->plane.color_encoding =
-+						VC_IMAGE_YUVINFO_CSC_ITUR_BT709;
-+			break;
-+		case DRM_COLOR_YCBCR_BT2020:
-+			/* Currently no support for a full range BT2020 */
-+			mb->plane.color_encoding =
-+					VC_IMAGE_YUVINFO_CSC_REC_2020;
-+			break;
-+		}
-+	} else {
-+		mb->plane.planes[1] = 0;
-+		mb->plane.planes[2] = 0;
-+	}
-+	mb->plane.planes[3] = 0;
-+
-+	switch (fourcc_mod_broadcom_mod(fb->modifier)) {
-+	case DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED:
-+		switch (mb->plane.vc_image_type) {
-+		case VC_IMAGE_XRGB8888:
-+			mb->plane.vc_image_type = VC_IMAGE_TF_RGBX32;
-+			break;
-+		case VC_IMAGE_ARGB8888:
-+			mb->plane.vc_image_type = VC_IMAGE_TF_RGBA32;
-+			break;
-+		case VC_IMAGE_RGB565:
-+			mb->plane.vc_image_type = VC_IMAGE_TF_RGB565;
-+			break;
-+		}
-+		break;
-+	case DRM_FORMAT_MOD_BROADCOM_SAND128:
-+		switch (mb->plane.vc_image_type) {
-+		case VC_IMAGE_YUV420SP:
-+			mb->plane.vc_image_type = VC_IMAGE_YUV_UV;
-+			break;
-+		/* VC_IMAGE_YUV10COL could be included in here, but it is only
-+		 * valid as a SAND128 format, so the table at the top will have
-+		 * already set the correct format.
-+		 */
-+		}
-+		/* Note that the column pitch is passed across in lines, not
-+		 * bytes.
-+		 */
-+		mb->plane.pitch = fourcc_mod_broadcom_param(fb->modifier);
-+		break;
-+	}
-+
-+	DRM_DEBUG_ATOMIC("[PLANE:%d:%s] plane update %dx%d@%d +dst(%d,%d, %d,%d) +src(%d,%d, %d,%d) 0x%08x/%08x/%08x/%d, alpha %u zpos %u\n",
-+			 plane->base.id, plane->name,
-+			 mb->plane.width,
-+			 mb->plane.height,
-+			 mb->plane.vc_image_type,
-+			 state->crtc_x,
-+			 state->crtc_y,
-+			 state->crtc_w,
-+			 state->crtc_h,
-+			 mb->plane.src_x,
-+			 mb->plane.src_y,
-+			 mb->plane.src_w,
-+			 mb->plane.src_h,
-+			 mb->plane.planes[0],
-+			 mb->plane.planes[1],
-+			 mb->plane.planes[2],
-+			 fb->pitches[0],
-+			 state->alpha,
-+			 state->normalized_zpos);
-+
-+	return 0;
-+}
-+
-+static int vc4_plane_atomic_check(struct drm_plane *plane,
-+				  struct drm_atomic_state *state)
-+{
-+	struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state,
-+										 plane);
-+	struct vc4_fkms_plane *vc4_plane = to_vc4_fkms_plane(plane);
-+
-+	if (!plane_enabled(new_plane_state))
-+		return 0;
-+
-+	return vc4_plane_to_mb(plane, &vc4_plane->mb, new_plane_state);
-+}
-+
-+/* Called during init to allocate the plane's atomic state. */
-+static void vc4_plane_reset(struct drm_plane *plane)
-+{
-+	struct vc4_plane_state *vc4_state;
-+
-+	WARN_ON(plane->state);
-+
-+	vc4_state = kzalloc(sizeof(*vc4_state), GFP_KERNEL);
-+	if (!vc4_state)
-+		return;
-+
-+	__drm_atomic_helper_plane_reset(plane, &vc4_state->base);
-+}
-+
-+static void vc4_plane_destroy(struct drm_plane *plane)
-+{
-+	drm_plane_cleanup(plane);
-+}
-+
-+static bool vc4_fkms_format_mod_supported(struct drm_plane *plane,
-+					  uint32_t format,
-+					  uint64_t modifier)
-+{
-+	/* Support T_TILING for RGB formats only. */
-+	switch (format) {
-+	case DRM_FORMAT_XRGB8888:
-+	case DRM_FORMAT_ARGB8888:
-+	case DRM_FORMAT_RGB565:
-+		switch (modifier) {
-+		case DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED:
-+		case DRM_FORMAT_MOD_LINEAR:
-+			return true;
-+		default:
-+			return false;
-+		}
-+	case DRM_FORMAT_NV12:
-+		switch (fourcc_mod_broadcom_mod(modifier)) {
-+		case DRM_FORMAT_MOD_LINEAR:
-+		case DRM_FORMAT_MOD_BROADCOM_SAND128:
-+			return true;
-+		default:
-+			return false;
-+		}
-+	case DRM_FORMAT_P030:
-+		switch (fourcc_mod_broadcom_mod(modifier)) {
-+		case DRM_FORMAT_MOD_BROADCOM_SAND128:
-+			return true;
-+		default:
-+			return false;
-+		}
-+	case DRM_FORMAT_NV21:
-+	case DRM_FORMAT_RGB888:
-+	case DRM_FORMAT_BGR888:
-+	case DRM_FORMAT_YUV422:
-+	case DRM_FORMAT_YUV420:
-+	case DRM_FORMAT_YVU420:
-+	default:
-+		return (modifier == DRM_FORMAT_MOD_LINEAR);
-+	}
-+}
-+
-+static struct drm_plane_state *vc4_plane_duplicate_state(struct drm_plane *plane)
-+{
-+	struct vc4_plane_state *vc4_state;
-+
-+	if (WARN_ON(!plane->state))
-+		return NULL;
-+
-+	vc4_state = kzalloc(sizeof(*vc4_state), GFP_KERNEL);
-+	if (!vc4_state)
-+		return NULL;
-+
-+	__drm_atomic_helper_plane_duplicate_state(plane, &vc4_state->base);
-+
-+	return &vc4_state->base;
-+}
-+
-+static const struct drm_plane_funcs vc4_plane_funcs = {
-+	.update_plane = drm_atomic_helper_update_plane,
-+	.disable_plane = drm_atomic_helper_disable_plane,
-+	.destroy = vc4_plane_destroy,
-+	.set_property = NULL,
-+	.reset = vc4_plane_reset,
-+	.atomic_duplicate_state = vc4_plane_duplicate_state,
-+	.atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
-+	.format_mod_supported = vc4_fkms_format_mod_supported,
-+};
-+
-+static const struct drm_plane_helper_funcs vc4_plane_helper_funcs = {
-+	.prepare_fb = drm_gem_plane_helper_prepare_fb,
-+	.cleanup_fb = NULL,
-+	.atomic_check = vc4_plane_atomic_check,
-+	.atomic_update = vc4_plane_atomic_update,
-+	.atomic_disable = vc4_plane_atomic_disable,
-+};
-+
-+static struct drm_plane *vc4_fkms_plane_init(struct drm_device *dev,
-+					     enum drm_plane_type type,
-+					     u8 display_num,
-+					     u8 plane_id)
-+{
-+	struct drm_plane *plane = NULL;
-+	struct vc4_fkms_plane *vc4_plane;
-+	u32 formats[ARRAY_SIZE(vc_image_formats)];
-+	unsigned int default_zpos = 0;
-+	u32 num_formats = 0;
-+	int ret = 0;
-+	static const uint64_t modifiers[] = {
-+		DRM_FORMAT_MOD_LINEAR,
-+		/* VC4_T_TILED should come after linear, because we
-+		 * would prefer to scan out linear (less bus traffic).
-+		 */
-+		DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED,
-+		DRM_FORMAT_MOD_BROADCOM_SAND128,
-+		DRM_FORMAT_MOD_INVALID,
-+	};
-+	int i;
-+
-+	vc4_plane = devm_kzalloc(dev->dev, sizeof(*vc4_plane),
-+				 GFP_KERNEL);
-+	if (!vc4_plane) {
-+		ret = -ENOMEM;
-+		goto fail;
-+	}
-+
-+	for (i = 0; i < ARRAY_SIZE(vc_image_formats); i++)
-+		formats[num_formats++] = vc_image_formats[i].drm;
-+
-+	plane = &vc4_plane->base;
-+	ret = drm_universal_plane_init(dev, plane, 0,
-+				       &vc4_plane_funcs,
-+				       formats, num_formats, modifiers,
-+				       type, NULL);
-+
-+	/* FIXME: Do we need to be checking return values from all these calls?
-+	 */
-+	drm_plane_helper_add(plane, &vc4_plane_helper_funcs);
-+
-+	drm_plane_create_alpha_property(plane);
-+	drm_plane_create_rotation_property(plane, DRM_MODE_ROTATE_0,
-+					   DRM_MODE_ROTATE_0 |
-+					   DRM_MODE_ROTATE_180 |
-+					   DRM_MODE_REFLECT_X |
-+					   DRM_MODE_REFLECT_Y);
-+	drm_plane_create_color_properties(plane,
-+					  BIT(DRM_COLOR_YCBCR_BT601) |
-+					  BIT(DRM_COLOR_YCBCR_BT709) |
-+					  BIT(DRM_COLOR_YCBCR_BT2020),
-+					  BIT(DRM_COLOR_YCBCR_LIMITED_RANGE) |
-+					  BIT(DRM_COLOR_YCBCR_FULL_RANGE),
-+					  DRM_COLOR_YCBCR_BT709,
-+					  DRM_COLOR_YCBCR_LIMITED_RANGE);
-+
-+	/*
-+	 * Default frame buffer setup is with FB on -127, and raspistill etc
-+	 * tend to drop overlays on layer 2. Cursor plane was on layer +127.
-+	 *
-+	 * For F-KMS the mailbox call allows for a s8.
-+	 * Remap zpos 0 to -127 for the background layer, but leave all the
-+	 * other layers as requested by KMS.
-+	 */
-+	switch (type) {
-+	default:
-+	case DRM_PLANE_TYPE_PRIMARY:
-+		default_zpos = 0;
-+		break;
-+	case DRM_PLANE_TYPE_OVERLAY:
-+		default_zpos = 1;
-+		break;
-+	case DRM_PLANE_TYPE_CURSOR:
-+		default_zpos = 2;
-+		break;
-+	}
-+	drm_plane_create_zpos_property(plane, default_zpos, 0, 127);
-+
-+	/* Prepare the static elements of the mailbox structure */
-+	vc4_plane->mb.tag.tag = RPI_FIRMWARE_SET_PLANE;
-+	vc4_plane->mb.tag.buf_size = sizeof(struct set_plane);
-+	vc4_plane->mb.tag.req_resp_size = 0;
-+	vc4_plane->mb.plane.display = display_num;
-+	vc4_plane->mb.plane.plane_id = plane_id;
-+	vc4_plane->mb.plane.layer = default_zpos ? default_zpos : -127;
-+
-+	return plane;
-+fail:
-+	if (plane)
-+		vc4_plane_destroy(plane);
-+
-+	return ERR_PTR(ret);
-+}
-+
-+static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc)
-+{
-+	struct drm_device *dev = crtc->dev;
-+	struct vc4_dev *vc4 = to_vc4_dev(dev);
-+	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
-+	struct drm_display_mode *mode = &crtc->state->adjusted_mode;
-+	struct vc4_fkms_encoder *vc4_encoder =
-+					to_vc4_fkms_encoder(vc4_crtc->encoder);
-+	struct mailbox_set_mode mb = {
-+		.tag1 = { RPI_FIRMWARE_SET_TIMING,
-+			  sizeof(struct set_timings), 0},
-+	};
-+	union hdmi_infoframe frame;
-+	int ret;
-+
-+	ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, vc4_crtc->connector, mode);
-+	if (ret < 0) {
-+		DRM_ERROR("couldn't fill AVI infoframe\n");
-+		return;
-+	}
-+
-+	DRM_DEBUG_KMS("Setting mode for display num %u mode name %s, clk %d, h(disp %d, start %d, end %d, total %d, skew %d) v(disp %d, start %d, end %d, total %d, scan %d), vrefresh %d, par %u, flags 0x%04x\n",
-+		      vc4_crtc->display_number, mode->name, mode->clock,
-+		      mode->hdisplay, mode->hsync_start, mode->hsync_end,
-+		      mode->htotal, mode->hskew, mode->vdisplay,
-+		      mode->vsync_start, mode->vsync_end, mode->vtotal,
-+		      mode->vscan, drm_mode_vrefresh(mode),
-+		      mode->picture_aspect_ratio, mode->flags);
-+	mb.timings.display = vc4_crtc->display_number;
-+
-+	mb.timings.clock = mode->clock;
-+	mb.timings.hdisplay = mode->hdisplay;
-+	mb.timings.hsync_start = mode->hsync_start;
-+	mb.timings.hsync_end = mode->hsync_end;
-+	mb.timings.htotal = mode->htotal;
-+	mb.timings.hskew = mode->hskew;
-+	mb.timings.vdisplay = mode->vdisplay;
-+	mb.timings.vsync_start = mode->vsync_start;
-+	mb.timings.vsync_end = mode->vsync_end;
-+	mb.timings.vtotal = mode->vtotal;
-+	mb.timings.vscan = mode->vscan;
-+	mb.timings.vrefresh = drm_mode_vrefresh(mode);
-+	mb.timings.flags = 0;
-+	if (mode->flags & DRM_MODE_FLAG_PHSYNC)
-+		mb.timings.flags |= TIMINGS_FLAGS_H_SYNC_POS;
-+	if (mode->flags & DRM_MODE_FLAG_PVSYNC)
-+		mb.timings.flags |= TIMINGS_FLAGS_V_SYNC_POS;
-+
-+	switch (frame.avi.picture_aspect) {
-+	default:
-+	case HDMI_PICTURE_ASPECT_NONE:
-+		mb.timings.flags |= TIMINGS_FLAGS_ASPECT_NONE;
-+		break;
-+	case HDMI_PICTURE_ASPECT_4_3:
-+		mb.timings.flags |= TIMINGS_FLAGS_ASPECT_4_3;
-+		break;
-+	case HDMI_PICTURE_ASPECT_16_9:
-+		mb.timings.flags |= TIMINGS_FLAGS_ASPECT_16_9;
-+		break;
-+	case HDMI_PICTURE_ASPECT_64_27:
-+		mb.timings.flags |= TIMINGS_FLAGS_ASPECT_64_27;
-+		break;
-+	case HDMI_PICTURE_ASPECT_256_135:
-+		mb.timings.flags |= TIMINGS_FLAGS_ASPECT_256_135;
-+		break;
-+	}
-+
-+	if (mode->flags & DRM_MODE_FLAG_INTERLACE)
-+		mb.timings.flags |= TIMINGS_FLAGS_INTERLACE;
-+	if (mode->flags & DRM_MODE_FLAG_DBLCLK)
-+		mb.timings.flags |= TIMINGS_FLAGS_DBL_CLK;
-+
-+	mb.timings.video_id_code = frame.avi.video_code;
-+
-+	if (!vc4_encoder->hdmi_monitor) {
-+		mb.timings.flags |= TIMINGS_FLAGS_DVI;
-+	} else {
-+		struct vc4_fkms_connector_state *conn_state =
-+			to_vc4_fkms_connector_state(vc4_crtc->connector->state);
-+
-+		if (conn_state->broadcast_rgb == VC4_BROADCAST_RGB_AUTO) {
-+			/* See CEA-861-E - 5.1 Default Encoding Parameters */
-+			if (drm_default_rgb_quant_range(mode) ==
-+					HDMI_QUANTIZATION_RANGE_LIMITED)
-+				mb.timings.flags |= TIMINGS_FLAGS_RGB_LIMITED;
-+		} else {
-+			if (conn_state->broadcast_rgb ==
-+						VC4_BROADCAST_RGB_LIMITED)
-+				mb.timings.flags |= TIMINGS_FLAGS_RGB_LIMITED;
-+
-+			/* If not using the default range, then do not provide
-+			 * a VIC as the HDMI spec requires that we do not
-+			 * signal the opposite of the defined range in the AVI
-+			 * infoframe.
-+			 */
-+			if (!!(mb.timings.flags & TIMINGS_FLAGS_RGB_LIMITED) !=
-+			    (drm_default_rgb_quant_range(mode) ==
-+					HDMI_QUANTIZATION_RANGE_LIMITED))
-+				mb.timings.video_id_code = 0;
-+		}
-+	}
-+
-+	/*
-+	 * FIXME: To implement
-+	 * switch(mode->flag & DRM_MODE_FLAG_3D_MASK) {
-+	 * case DRM_MODE_FLAG_3D_NONE:
-+	 * case DRM_MODE_FLAG_3D_FRAME_PACKING:
-+	 * case DRM_MODE_FLAG_3D_FIELD_ALTERNATIVE:
-+	 * case DRM_MODE_FLAG_3D_LINE_ALTERNATIVE:
-+	 * case DRM_MODE_FLAG_3D_SIDE_BY_SIDE_FULL:
-+	 * case DRM_MODE_FLAG_3D_L_DEPTH:
-+	 * case DRM_MODE_FLAG_3D_L_DEPTH_GFX_GFX_DEPTH:
-+	 * case DRM_MODE_FLAG_3D_TOP_AND_BOTTOM:
-+	 * case DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF:
-+	 * }
-+	 */
-+
-+	ret = rpi_firmware_property_list(vc4->firmware, &mb, sizeof(mb));
-+}
-+
-+static void vc4_crtc_disable(struct drm_crtc *crtc,
-+			     struct drm_atomic_state *state)
-+{
-+	struct drm_device *dev = crtc->dev;
-+	struct drm_plane *plane;
-+
-+	DRM_DEBUG_KMS("[CRTC:%d] vblanks off.\n",
-+		      crtc->base.id);
-+	drm_crtc_vblank_off(crtc);
-+
-+	/* Always turn the planes off on CRTC disable. In DRM, planes
-+	 * are enabled/disabled through the update/disable hooks
-+	 * above, and the CRTC enable/disable independently controls
-+	 * whether anything scans out at all, but the firmware doesn't
-+	 * give us a CRTC-level control for that.
-+	 */
-+
-+	drm_atomic_crtc_for_each_plane(plane, crtc)
-+		vc4_plane_atomic_disable(plane, state);
-+
-+	/*
-+	 * Make sure we issue a vblank event after disabling the CRTC if
-+	 * someone was waiting it.
-+	 */
-+	if (crtc->state->event) {
-+		unsigned long flags;
-+
-+		spin_lock_irqsave(&dev->event_lock, flags);
-+		drm_crtc_send_vblank_event(crtc, crtc->state->event);
-+		crtc->state->event = NULL;
-+		spin_unlock_irqrestore(&dev->event_lock, flags);
-+	}
-+}
-+
-+static void vc4_crtc_consume_event(struct drm_crtc *crtc)
-+{
-+	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
-+	struct drm_device *dev = crtc->dev;
-+	unsigned long flags;
-+
-+	if (!crtc->state->event)
-+		return;
-+
-+	crtc->state->event->pipe = drm_crtc_index(crtc);
-+
-+	WARN_ON(drm_crtc_vblank_get(crtc) != 0);
-+
-+	spin_lock_irqsave(&dev->event_lock, flags);
-+	vc4_crtc->event = crtc->state->event;
-+	crtc->state->event = NULL;
-+	spin_unlock_irqrestore(&dev->event_lock, flags);
-+}
-+
-+static void vc4_crtc_enable(struct drm_crtc *crtc,
-+			    struct drm_atomic_state *state)
-+{
-+	struct drm_plane *plane;
-+
-+	DRM_DEBUG_KMS("[CRTC:%d] vblanks on.\n",
-+		      crtc->base.id);
-+	drm_crtc_vblank_on(crtc);
-+	vc4_crtc_consume_event(crtc);
-+
-+	/* Unblank the planes (if they're supposed to be displayed). */
-+	drm_atomic_crtc_for_each_plane(plane, crtc)
-+		if (plane->state->fb)
-+			vc4_plane_set_blank(plane, plane->state->visible);
-+}
-+
-+static enum drm_mode_status
-+vc4_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode *mode)
-+{
-+	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
-+	struct drm_device *dev = crtc->dev;
-+	struct vc4_dev *vc4 = to_vc4_dev(dev);
-+	struct vc4_fkms *fkms = vc4->fkms;
-+
-+	/* Do not allow doublescan modes from user space */
-+	if (mode->flags & DRM_MODE_FLAG_DBLSCAN) {
-+		DRM_DEBUG_KMS("[CRTC:%d] Doublescan mode rejected.\n",
-+			      crtc->base.id);
-+		return MODE_NO_DBLESCAN;
-+	}
-+
-+	/* Disable refresh rates > defined threshold (default 85Hz) as limited
-+	 * gain from them
-+	 */
-+	if (drm_mode_vrefresh(mode) > fkms_max_refresh_rate)
-+		return MODE_BAD_VVALUE;
-+
-+	/* Limit the pixel clock based on the HDMI clock limits from the
-+	 * firmware
-+	 */
-+	switch (vc4_crtc->display_number) {
-+	case 2:	/* HDMI0 */
-+		if (fkms->cfg.max_pixel_clock[0] &&
-+		    mode->clock > fkms->cfg.max_pixel_clock[0])
-+			return MODE_CLOCK_HIGH;
-+		break;
-+	case 7:	/* HDMI1 */
-+		if (fkms->cfg.max_pixel_clock[1] &&
-+		    mode->clock > fkms->cfg.max_pixel_clock[1])
-+			return MODE_CLOCK_HIGH;
-+		break;
-+	}
-+
-+	/* Pi4 can't generate odd horizontal timings on HDMI, so reject modes
-+	 * that would set them.
-+	 */
-+	if (fkms->bcm2711 &&
-+	    (vc4_crtc->display_number == 2 || vc4_crtc->display_number == 7) &&
-+	    !(mode->flags & DRM_MODE_FLAG_DBLCLK) &&
-+	    ((mode->hdisplay |				/* active */
-+	      (mode->hsync_start - mode->hdisplay) |	/* front porch */
-+	      (mode->hsync_end - mode->hsync_start) |	/* sync pulse */
-+	      (mode->htotal - mode->hsync_end)) & 1))	/* back porch */ {
-+		DRM_DEBUG_KMS("[CRTC:%d] Odd timing rejected %u %u %u %u.\n",
-+			      crtc->base.id, mode->hdisplay, mode->hsync_start,
-+			      mode->hsync_end, mode->htotal);
-+		return MODE_H_ILLEGAL;
-+	}
-+
-+	return MODE_OK;
-+}
-+
-+static int vc4_crtc_atomic_check(struct drm_crtc *crtc,
-+				 struct drm_atomic_state *state)
-+{
-+	struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,
-+									  crtc);
-+	struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc_state);
-+	struct drm_connector *conn;
-+	struct drm_connector_state *conn_state;
-+	int i;
-+
-+	DRM_DEBUG_KMS("[CRTC:%d] crtc_atomic_check.\n", crtc->base.id);
-+
-+	for_each_new_connector_in_state(crtc_state->state, conn, conn_state, i) {
-+		if (conn_state->crtc != crtc)
-+			continue;
-+
-+		vc4_state->margins.left = conn_state->tv.margins.left;
-+		vc4_state->margins.right = conn_state->tv.margins.right;
-+		vc4_state->margins.top = conn_state->tv.margins.top;
-+		vc4_state->margins.bottom = conn_state->tv.margins.bottom;
-+		break;
-+	}
-+	return 0;
-+}
-+
-+static void vc4_crtc_atomic_flush(struct drm_crtc *crtc,
-+				  struct drm_atomic_state *state)
-+{
-+	struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state,
-+									 crtc);
-+
-+	DRM_DEBUG_KMS("[CRTC:%d] crtc_atomic_flush.\n",
-+		      crtc->base.id);
-+	if (crtc->state->active && old_state->active && crtc->state->event)
-+		vc4_crtc_consume_event(crtc);
-+}
-+
-+static void vc4_crtc_handle_page_flip(struct vc4_crtc *vc4_crtc)
-+{
-+	struct drm_crtc *crtc = &vc4_crtc->base;
-+	struct drm_device *dev = crtc->dev;
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&dev->event_lock, flags);
-+	if (vc4_crtc->event) {
-+		drm_crtc_send_vblank_event(crtc, vc4_crtc->event);
-+		vc4_crtc->event = NULL;
-+		drm_crtc_vblank_put(crtc);
-+	}
-+	spin_unlock_irqrestore(&dev->event_lock, flags);
-+}
-+
-+static irqreturn_t vc4_crtc_irq_handler(int irq, void *data)
-+{
-+	struct vc4_crtc **crtc_list = data;
-+	int i;
-+	u32 stat = readl(crtc_list[0]->regs + SMICS);
-+	irqreturn_t ret = IRQ_NONE;
-+	u32 chan;
-+
-+	if (stat & SMICS_INTERRUPTS) {
-+		writel(0, crtc_list[0]->regs + SMICS);
-+
-+		chan = readl(crtc_list[0]->regs + SMIDSW0);
-+
-+		if ((chan & 0xFFFF0000) != SMI_NEW) {
-+			/* Older firmware. Treat the one interrupt as vblank/
-+			 * complete for all crtcs.
-+			 */
-+			for (i = 0; crtc_list[i]; i++) {
-+				if (crtc_list[i]->vblank_enabled)
-+					drm_crtc_handle_vblank(&crtc_list[i]->base);
-+				vc4_crtc_handle_page_flip(crtc_list[i]);
-+			}
-+		} else {
-+			if (chan & 1) {
-+				writel(SMI_NEW, crtc_list[0]->regs + SMIDSW0);
-+				if (crtc_list[0]->vblank_enabled)
-+					drm_crtc_handle_vblank(&crtc_list[0]->base);
-+				vc4_crtc_handle_page_flip(crtc_list[0]);
-+			}
-+
-+			if (crtc_list[1]) {
-+				/* Check for the secondary display too */
-+				chan = readl(crtc_list[0]->regs + SMIDSW1);
-+
-+				if (chan & 1) {
-+					writel(SMI_NEW, crtc_list[0]->regs + SMIDSW1);
-+
-+					if (crtc_list[1]->vblank_enabled)
-+						drm_crtc_handle_vblank(&crtc_list[1]->base);
-+					vc4_crtc_handle_page_flip(crtc_list[1]);
-+				}
-+			}
-+		}
-+
-+		ret = IRQ_HANDLED;
-+	}
-+
-+	return ret;
-+}
-+
-+static int vc4_fkms_page_flip(struct drm_crtc *crtc,
-+			      struct drm_framebuffer *fb,
-+			      struct drm_pending_vblank_event *event,
-+			      uint32_t flags,
-+			      struct drm_modeset_acquire_ctx *ctx)
-+{
-+	if (flags & DRM_MODE_PAGE_FLIP_ASYNC) {
-+		DRM_ERROR("Async flips aren't allowed\n");
-+		return -EINVAL;
-+	}
-+
-+	return drm_atomic_helper_page_flip(crtc, fb, event, flags, ctx);
-+}
-+
-+static struct drm_crtc_state *
-+vc4_fkms_crtc_duplicate_state(struct drm_crtc *crtc)
-+{
-+	struct vc4_crtc_state *vc4_state, *old_vc4_state;
-+
-+	vc4_state = kzalloc(sizeof(*vc4_state), GFP_KERNEL);
-+	if (!vc4_state)
-+		return NULL;
-+
-+	old_vc4_state = to_vc4_crtc_state(crtc->state);
-+	vc4_state->margins = old_vc4_state->margins;
-+
-+	__drm_atomic_helper_crtc_duplicate_state(crtc, &vc4_state->base);
-+	return &vc4_state->base;
-+}
-+
-+static void
-+vc4_fkms_crtc_reset(struct drm_crtc *crtc)
-+{
-+	if (crtc->state)
-+		__drm_atomic_helper_crtc_destroy_state(crtc->state);
-+
-+	crtc->state = kzalloc(sizeof(*crtc->state), GFP_KERNEL);
-+	if (crtc->state)
-+		crtc->state->crtc = crtc;
-+}
-+
-+static int vc4_fkms_enable_vblank(struct drm_crtc *crtc)
-+{
-+	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
-+
-+	DRM_DEBUG_KMS("[CRTC:%d] enable_vblank.\n",
-+		      crtc->base.id);
-+	vc4_crtc->vblank_enabled = true;
-+
-+	return 0;
-+}
-+
-+static void vc4_fkms_disable_vblank(struct drm_crtc *crtc)
-+{
-+	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
-+
-+	DRM_DEBUG_KMS("[CRTC:%d] disable_vblank.\n",
-+		      crtc->base.id);
-+	vc4_crtc->vblank_enabled = false;
-+}
-+
-+static const struct drm_crtc_funcs vc4_crtc_funcs = {
-+	.set_config = drm_atomic_helper_set_config,
-+	.destroy = drm_crtc_cleanup,
-+	.page_flip = vc4_fkms_page_flip,
-+	.set_property = NULL,
-+	.cursor_set = NULL, /* handled by drm_mode_cursor_universal */
-+	.cursor_move = NULL, /* handled by drm_mode_cursor_universal */
-+	.reset = vc4_fkms_crtc_reset,
-+	.atomic_duplicate_state = vc4_fkms_crtc_duplicate_state,
-+	.atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,
-+	.enable_vblank = vc4_fkms_enable_vblank,
-+	.disable_vblank = vc4_fkms_disable_vblank,
-+};
-+
-+static const struct drm_crtc_helper_funcs vc4_crtc_helper_funcs = {
-+	.mode_set_nofb = vc4_crtc_mode_set_nofb,
-+	.mode_valid = vc4_crtc_mode_valid,
-+	.atomic_check = vc4_crtc_atomic_check,
-+	.atomic_flush = vc4_crtc_atomic_flush,
-+	.atomic_enable = vc4_crtc_enable,
-+	.atomic_disable = vc4_crtc_disable,
-+};
-+
-+static const struct of_device_id vc4_firmware_kms_dt_match[] = {
-+	{ .compatible = "raspberrypi,rpi-firmware-kms" },
-+	{ .compatible = "raspberrypi,rpi-firmware-kms-2711",
-+	  .data = (void *)1 },
-+	{}
-+};
-+
-+static enum drm_connector_status
-+vc4_fkms_connector_detect(struct drm_connector *connector, bool force)
-+{
-+	DRM_DEBUG_KMS("connector detect.\n");
-+	return connector_status_connected;
-+}
-+
-+/* Queries the firmware to populate a drm_mode structure for this display */
-+static int vc4_fkms_get_fw_mode(struct vc4_fkms_connector *fkms_connector,
-+				struct drm_display_mode *mode)
-+{
-+	struct vc4_dev *vc4 = fkms_connector->vc4_dev;
-+	struct set_timings timings = { 0 };
-+	int ret;
-+
-+	timings.display = fkms_connector->display_number;
-+
-+	ret = rpi_firmware_property(vc4->firmware,
-+				    RPI_FIRMWARE_GET_DISPLAY_TIMING, &timings,
-+				    sizeof(timings));
-+	if (ret || !timings.clock)
-+		/* No mode returned - abort */
-+		return -1;
-+
-+	/* Equivalent to DRM_MODE macro. */
-+	memset(mode, 0, sizeof(*mode));
-+	strncpy(mode->name, "FIXED_MODE", sizeof(mode->name));
-+	mode->status = 0;
-+	mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED;
-+	mode->clock = timings.clock;
-+	mode->hdisplay = timings.hdisplay;
-+	mode->hsync_start = timings.hsync_start;
-+	mode->hsync_end = timings.hsync_end;
-+	mode->htotal = timings.htotal;
-+	mode->hskew = 0;
-+	mode->vdisplay = timings.vdisplay;
-+	mode->vsync_start = timings.vsync_start;
-+	mode->vsync_end = timings.vsync_end;
-+	mode->vtotal = timings.vtotal;
-+	mode->vscan = timings.vscan;
-+
-+	if (timings.flags & TIMINGS_FLAGS_H_SYNC_POS)
-+		mode->flags |= DRM_MODE_FLAG_PHSYNC;
-+	else
-+		mode->flags |= DRM_MODE_FLAG_NHSYNC;
-+
-+	if (timings.flags & TIMINGS_FLAGS_V_SYNC_POS)
-+		mode->flags |= DRM_MODE_FLAG_PVSYNC;
-+	else
-+		mode->flags |= DRM_MODE_FLAG_NVSYNC;
-+
-+	if (timings.flags & TIMINGS_FLAGS_INTERLACE)
-+		mode->flags |= DRM_MODE_FLAG_INTERLACE;
-+
-+	return 0;
-+}
-+
-+static int vc4_fkms_get_edid_block(void *data, u8 *buf, unsigned int block,
-+				   size_t len)
-+{
-+	struct vc4_fkms_connector *fkms_connector =
-+					(struct vc4_fkms_connector *)data;
-+	struct vc4_dev *vc4 = fkms_connector->vc4_dev;
-+	struct mailbox_get_edid mb = {
-+		.tag1 = { RPI_FIRMWARE_GET_EDID_BLOCK_DISPLAY,
-+			  128 + 8, 0 },
-+		.block = block,
-+		.display_number = fkms_connector->display_number,
-+	};
-+	int ret = 0;
-+
-+	ret = rpi_firmware_property_list(vc4->firmware, &mb, sizeof(mb));
-+
-+	if (!ret)
-+		memcpy(buf, mb.edid, len);
-+
-+	return ret;
-+}
-+
-+static int vc4_fkms_connector_get_modes(struct drm_connector *connector)
-+{
-+	struct vc4_fkms_connector *fkms_connector =
-+					to_vc4_fkms_connector(connector);
-+	struct drm_encoder *encoder = fkms_connector->encoder;
-+	struct vc4_fkms_encoder *vc4_encoder = to_vc4_fkms_encoder(encoder);
-+	struct drm_display_mode fw_mode;
-+	struct drm_display_mode *mode;
-+	struct edid *edid;
-+	int num_modes;
-+
-+	if (!vc4_fkms_get_fw_mode(fkms_connector, &fw_mode)) {
-+		drm_mode_debug_printmodeline(&fw_mode);
-+		mode = drm_mode_duplicate(connector->dev,
-+					  &fw_mode);
-+		drm_mode_probed_add(connector, mode);
-+		num_modes = 1;	/* 1 mode */
-+	} else {
-+		edid = drm_do_get_edid(connector, vc4_fkms_get_edid_block,
-+				       fkms_connector);
-+
-+		/* FIXME: Can we do CEC?
-+		 * cec_s_phys_addr_from_edid(vc4->hdmi->cec_adap, edid);
-+		 * if (!edid)
-+		 *	return -ENODEV;
-+		 */
-+
-+		vc4_encoder->hdmi_monitor = drm_detect_hdmi_monitor(edid);
-+
-+		drm_connector_update_edid_property(connector, edid);
-+		num_modes = drm_add_edid_modes(connector, edid);
-+		kfree(edid);
-+	}
-+
-+	return num_modes;
-+}
-+
-+/* This is the DSI panel resolution. Use this as a default should the firmware
-+ * not respond to our request for the timings.
-+ */
-+static const struct drm_display_mode lcd_mode = {
-+	DRM_MODE("800x480", DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED,
-+		 25979400 / 1000,
-+		 800, 800 + 1, 800 + 1 + 2, 800 + 1 + 2 + 46, 0,
-+		 480, 480 + 7, 480 + 7 + 2, 480 + 7 + 2 + 21, 0,
-+		 0)
-+};
-+
-+static int vc4_fkms_lcd_connector_get_modes(struct drm_connector *connector)
-+{
-+	struct vc4_fkms_connector *fkms_connector =
-+					to_vc4_fkms_connector(connector);
-+	struct drm_display_mode *mode;
-+	struct drm_display_mode fw_mode;
-+
-+	if (!vc4_fkms_get_fw_mode(fkms_connector, &fw_mode) && fw_mode.clock)
-+		mode = drm_mode_duplicate(connector->dev,
-+					  &fw_mode);
-+	else
-+		mode = drm_mode_duplicate(connector->dev,
-+					  &lcd_mode);
-+
-+	if (!mode) {
-+		DRM_ERROR("Failed to create a new display mode\n");
-+		return -ENOMEM;
-+	}
-+
-+	drm_mode_probed_add(connector, mode);
-+
-+	/* We have one mode */
-+	return 1;
-+}
-+
-+static struct drm_encoder *
-+vc4_fkms_connector_best_encoder(struct drm_connector *connector)
-+{
-+	struct vc4_fkms_connector *fkms_connector =
-+		to_vc4_fkms_connector(connector);
-+	DRM_DEBUG_KMS("best_connector.\n");
-+	return fkms_connector->encoder;
-+}
-+
-+static void vc4_fkms_connector_destroy(struct drm_connector *connector)
-+{
-+	DRM_DEBUG_KMS("[CONNECTOR:%d] destroy.\n",
-+		      connector->base.id);
-+	drm_connector_unregister(connector);
-+	drm_connector_cleanup(connector);
-+}
-+
-+/**
-+ * vc4_connector_duplicate_state - duplicate connector state
-+ * @connector: digital connector
-+ *
-+ * Allocates and returns a copy of the connector state (both common and
-+ * digital connector specific) for the specified connector.
-+ *
-+ * Returns: The newly allocated connector state, or NULL on failure.
-+ */
-+struct drm_connector_state *
-+vc4_connector_duplicate_state(struct drm_connector *connector)
-+{
-+	struct vc4_fkms_connector_state *state;
-+
-+	state = kmemdup(connector->state, sizeof(*state), GFP_KERNEL);
-+	if (!state)
-+		return NULL;
-+
-+	__drm_atomic_helper_connector_duplicate_state(connector, &state->base);
-+	return &state->base;
-+}
-+
-+/**
-+ * vc4_connector_atomic_get_property - hook for connector->atomic_get_property.
-+ * @connector: Connector to get the property for.
-+ * @state: Connector state to retrieve the property from.
-+ * @property: Property to retrieve.
-+ * @val: Return value for the property.
-+ *
-+ * Returns the atomic property value for a digital connector.
-+ */
-+int vc4_connector_atomic_get_property(struct drm_connector *connector,
-+				      const struct drm_connector_state *state,
-+				      struct drm_property *property,
-+				      uint64_t *val)
-+{
-+	struct vc4_fkms_connector *fkms_connector =
-+					to_vc4_fkms_connector(connector);
-+	struct vc4_fkms_connector_state *vc4_conn_state =
-+					to_vc4_fkms_connector_state(state);
-+
-+	if (property == fkms_connector->broadcast_rgb_property) {
-+		*val = vc4_conn_state->broadcast_rgb;
-+	} else {
-+		DRM_DEBUG_ATOMIC("Unknown property [PROP:%d:%s]\n",
-+				 property->base.id, property->name);
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
-+
-+/**
-+ * vc4_connector_atomic_set_property - hook for connector->atomic_set_property.
-+ * @connector: Connector to set the property for.
-+ * @state: Connector state to set the property on.
-+ * @property: Property to set.
-+ * @val: New value for the property.
-+ *
-+ * Sets the atomic property value for a digital connector.
-+ */
-+int vc4_connector_atomic_set_property(struct drm_connector *connector,
-+				      struct drm_connector_state *state,
-+				      struct drm_property *property,
-+				      uint64_t val)
-+{
-+	struct vc4_fkms_connector *fkms_connector =
-+					to_vc4_fkms_connector(connector);
-+	struct vc4_fkms_connector_state *vc4_conn_state =
-+					to_vc4_fkms_connector_state(state);
-+
-+	if (property == fkms_connector->broadcast_rgb_property) {
-+		vc4_conn_state->broadcast_rgb = val;
-+		return 0;
-+	}
-+
-+	DRM_DEBUG_ATOMIC("Unknown property [PROP:%d:%s]\n",
-+			 property->base.id, property->name);
-+	return -EINVAL;
-+}
-+
-+int vc4_connector_atomic_check(struct drm_connector *connector,
-+			       struct drm_atomic_state *state)
-+{
-+	struct drm_connector_state *old_state =
-+		drm_atomic_get_old_connector_state(state, connector);
-+	struct vc4_fkms_connector_state *vc4_old_state =
-+					to_vc4_fkms_connector_state(old_state);
-+	struct drm_connector_state *new_state =
-+		drm_atomic_get_new_connector_state(state, connector);
-+	struct vc4_fkms_connector_state *vc4_new_state =
-+					to_vc4_fkms_connector_state(new_state);
-+	struct drm_crtc *crtc = new_state->crtc;
-+
-+	if (!crtc)
-+		return 0;
-+
-+	if (vc4_old_state->broadcast_rgb != vc4_new_state->broadcast_rgb) {
-+		struct drm_crtc_state *crtc_state;
-+
-+		crtc_state = drm_atomic_get_crtc_state(state, crtc);
-+		if (IS_ERR(crtc_state))
-+			return PTR_ERR(crtc_state);
-+
-+		crtc_state->mode_changed = true;
-+	}
-+	return 0;
-+}
-+
-+static void vc4_hdmi_connector_reset(struct drm_connector *connector)
-+{
-+	drm_atomic_helper_connector_reset(connector);
-+	drm_atomic_helper_connector_tv_reset(connector);
-+}
-+
-+static const struct drm_connector_funcs vc4_fkms_connector_funcs = {
-+	.detect = vc4_fkms_connector_detect,
-+	.fill_modes = drm_helper_probe_single_connector_modes,
-+	.destroy = vc4_fkms_connector_destroy,
-+	.reset = vc4_hdmi_connector_reset,
-+	.atomic_duplicate_state = vc4_connector_duplicate_state,
-+	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
-+	.atomic_get_property = vc4_connector_atomic_get_property,
-+	.atomic_set_property = vc4_connector_atomic_set_property,
-+};
-+
-+static const struct drm_connector_helper_funcs vc4_fkms_connector_helper_funcs = {
-+	.get_modes = vc4_fkms_connector_get_modes,
-+	.best_encoder = vc4_fkms_connector_best_encoder,
-+	.atomic_check = vc4_connector_atomic_check,
-+};
-+
-+static const struct drm_connector_helper_funcs vc4_fkms_lcd_conn_helper_funcs = {
-+	.get_modes = vc4_fkms_lcd_connector_get_modes,
-+	.best_encoder = vc4_fkms_connector_best_encoder,
-+};
-+
-+static const struct drm_prop_enum_list broadcast_rgb_names[] = {
-+	{ VC4_BROADCAST_RGB_AUTO, "Automatic" },
-+	{ VC4_BROADCAST_RGB_FULL, "Full" },
-+	{ VC4_BROADCAST_RGB_LIMITED, "Limited 16:235" },
-+};
-+
-+static void
-+vc4_attach_broadcast_rgb_property(struct vc4_fkms_connector *fkms_connector)
-+{
-+	struct drm_device *dev = fkms_connector->base.dev;
-+	struct drm_property *prop;
-+
-+	prop = fkms_connector->broadcast_rgb_property;
-+	if (!prop) {
-+		prop = drm_property_create_enum(dev, DRM_MODE_PROP_ENUM,
-+						"Broadcast RGB",
-+						broadcast_rgb_names,
-+						ARRAY_SIZE(broadcast_rgb_names));
-+		if (!prop)
-+			return;
-+
-+		fkms_connector->broadcast_rgb_property = prop;
-+	}
-+
-+	drm_object_attach_property(&fkms_connector->base.base, prop, 0);
-+}
-+
-+static struct drm_connector *
-+vc4_fkms_connector_init(struct drm_device *dev, struct drm_encoder *encoder,
-+			u32 display_num)
-+{
-+	struct drm_connector *connector = NULL;
-+	struct vc4_fkms_connector *fkms_connector;
-+	struct vc4_fkms_connector_state *conn_state = NULL;
-+	struct vc4_dev *vc4_dev = to_vc4_dev(dev);
-+	int ret = 0;
-+
-+	DRM_DEBUG_KMS("connector_init, display_num %u\n", display_num);
-+
-+	fkms_connector = devm_kzalloc(dev->dev, sizeof(*fkms_connector),
-+				      GFP_KERNEL);
-+	if (!fkms_connector)
-+		return ERR_PTR(-ENOMEM);
-+
-+	/*
-+	 * Allocate enough memory to hold vc4_fkms_connector_state,
-+	 */
-+	conn_state = kzalloc(sizeof(*conn_state), GFP_KERNEL);
-+	if (!conn_state) {
-+		kfree(fkms_connector);
-+		return ERR_PTR(-ENOMEM);
-+	}
-+
-+	connector = &fkms_connector->base;
-+
-+	fkms_connector->encoder = encoder;
-+	fkms_connector->display_number = display_num;
-+	fkms_connector->display_type = vc4_get_display_type(display_num);
-+	fkms_connector->vc4_dev = vc4_dev;
-+
-+	__drm_atomic_helper_connector_reset(connector,
-+					    &conn_state->base);
-+
-+	if (fkms_connector->display_type == DRM_MODE_ENCODER_DSI) {
-+		drm_connector_init(dev, connector, &vc4_fkms_connector_funcs,
-+				   DRM_MODE_CONNECTOR_DSI);
-+		drm_connector_helper_add(connector,
-+					 &vc4_fkms_lcd_conn_helper_funcs);
-+		connector->interlace_allowed = 0;
-+	} else if (fkms_connector->display_type == DRM_MODE_ENCODER_TVDAC) {
-+		drm_connector_init(dev, connector, &vc4_fkms_connector_funcs,
-+				   DRM_MODE_CONNECTOR_Composite);
-+		drm_connector_helper_add(connector,
-+					 &vc4_fkms_lcd_conn_helper_funcs);
-+		connector->interlace_allowed = 1;
-+	} else {
-+		drm_connector_init(dev, connector, &vc4_fkms_connector_funcs,
-+				   DRM_MODE_CONNECTOR_HDMIA);
-+		drm_connector_helper_add(connector,
-+					 &vc4_fkms_connector_helper_funcs);
-+		connector->interlace_allowed = 1;
-+	}
-+
-+	ret = drm_mode_create_tv_margin_properties(dev);
-+	if (ret)
-+		goto fail;
-+
-+	drm_connector_attach_tv_margin_properties(connector);
-+
-+	connector->polled = (DRM_CONNECTOR_POLL_CONNECT |
-+			     DRM_CONNECTOR_POLL_DISCONNECT);
-+
-+	connector->doublescan_allowed = 0;
-+
-+	vc4_attach_broadcast_rgb_property(fkms_connector);
-+
-+	drm_connector_attach_encoder(connector, encoder);
-+
-+	return connector;
-+
-+ fail:
-+	if (connector)
-+		vc4_fkms_connector_destroy(connector);
-+
-+	return ERR_PTR(ret);
-+}
-+
-+static void vc4_fkms_encoder_destroy(struct drm_encoder *encoder)
-+{
-+	DRM_DEBUG_KMS("Encoder_destroy\n");
-+	drm_encoder_cleanup(encoder);
-+}
-+
-+static const struct drm_encoder_funcs vc4_fkms_encoder_funcs = {
-+	.destroy = vc4_fkms_encoder_destroy,
-+};
-+
-+static void vc4_fkms_display_power(struct drm_encoder *encoder, bool power)
-+{
-+	struct vc4_fkms_encoder *vc4_encoder = to_vc4_fkms_encoder(encoder);
-+	struct vc4_dev *vc4 = to_vc4_dev(encoder->dev);
-+
-+	struct mailbox_display_pwr pwr = {
-+		.tag1 = {RPI_FIRMWARE_SET_DISPLAY_POWER, 8, 0, },
-+		.display = vc4_encoder->display_num,
-+		.state = power ? 1 : 0,
-+	};
-+
-+	rpi_firmware_property_list(vc4->firmware, &pwr, sizeof(pwr));
-+}
-+
-+static void vc4_fkms_encoder_enable(struct drm_encoder *encoder)
-+{
-+	vc4_fkms_display_power(encoder, true);
-+	DRM_DEBUG_KMS("Encoder_enable\n");
-+}
-+
-+static void vc4_fkms_encoder_disable(struct drm_encoder *encoder)
-+{
-+	vc4_fkms_display_power(encoder, false);
-+	DRM_DEBUG_KMS("Encoder_disable\n");
-+}
-+
-+static const struct drm_encoder_helper_funcs vc4_fkms_encoder_helper_funcs = {
-+	.enable = vc4_fkms_encoder_enable,
-+	.disable = vc4_fkms_encoder_disable,
-+};
-+
-+static int vc4_fkms_create_screen(struct device *dev, struct drm_device *drm,
-+				  int display_idx, int display_ref,
-+				  struct vc4_crtc **ret_crtc)
-+{
-+	struct vc4_dev *vc4 = to_vc4_dev(drm);
-+	struct vc4_crtc *vc4_crtc;
-+	struct vc4_fkms_encoder *vc4_encoder;
-+	struct drm_crtc *crtc;
-+	struct drm_plane *destroy_plane, *temp;
-+	struct mailbox_blank_display blank = {
-+		.tag1 = {RPI_FIRMWARE_FRAMEBUFFER_SET_DISPLAY_NUM, 4, 0, },
-+		.display = display_idx,
-+		.tag2 = { RPI_FIRMWARE_FRAMEBUFFER_BLANK, 4, 0, },
-+		.blank = 1,
-+	};
-+	struct drm_plane *planes[PLANES_PER_CRTC];
-+	int ret, i;
-+
-+	vc4_crtc = devm_kzalloc(dev, sizeof(*vc4_crtc), GFP_KERNEL);
-+	if (!vc4_crtc)
-+		return -ENOMEM;
-+	crtc = &vc4_crtc->base;
-+
-+	vc4_crtc->display_number = display_ref;
-+	vc4_crtc->display_type = vc4_get_display_type(display_ref);
-+
-+	/* Blank the firmware provided framebuffer */
-+	rpi_firmware_property_list(vc4->firmware, &blank, sizeof(blank));
-+
-+	for (i = 0; i < PLANES_PER_CRTC; i++) {
-+		planes[i] = vc4_fkms_plane_init(drm,
-+						(i == 0) ?
-+						  DRM_PLANE_TYPE_PRIMARY :
-+						  (i == PLANES_PER_CRTC - 1) ?
-+							DRM_PLANE_TYPE_CURSOR :
-+							DRM_PLANE_TYPE_OVERLAY,
-+						display_ref,
-+						i + (display_idx * PLANES_PER_CRTC)
-+					       );
-+		if (IS_ERR(planes[i])) {
-+			dev_err(dev, "failed to construct plane %u\n", i);
-+			ret = PTR_ERR(planes[i]);
-+			goto err;
-+		}
-+	}
-+
-+	drm_crtc_init_with_planes(drm, crtc, planes[0],
-+				  planes[PLANES_PER_CRTC - 1], &vc4_crtc_funcs,
-+				  NULL);
-+	drm_crtc_helper_add(crtc, &vc4_crtc_helper_funcs);
-+
-+	/* Update the possible_crtcs mask for the overlay plane(s) */
-+	for (i = 1; i < (PLANES_PER_CRTC - 1); i++)
-+		planes[i]->possible_crtcs = drm_crtc_mask(crtc);
-+
-+	vc4_encoder = devm_kzalloc(dev, sizeof(*vc4_encoder), GFP_KERNEL);
-+	if (!vc4_encoder)
-+		return -ENOMEM;
-+	vc4_crtc->encoder = &vc4_encoder->base;
-+
-+	vc4_encoder->display_num = display_ref;
-+	vc4_encoder->base.possible_crtcs |= drm_crtc_mask(crtc);
-+
-+	drm_encoder_init(drm, &vc4_encoder->base, &vc4_fkms_encoder_funcs,
-+			 vc4_crtc->display_type, NULL);
-+	drm_encoder_helper_add(&vc4_encoder->base,
-+			       &vc4_fkms_encoder_helper_funcs);
-+
-+	vc4_crtc->connector = vc4_fkms_connector_init(drm, &vc4_encoder->base,
-+						      display_ref);
-+	if (IS_ERR(vc4_crtc->connector)) {
-+		ret = PTR_ERR(vc4_crtc->connector);
-+		goto err_destroy_encoder;
-+	}
-+
-+	*ret_crtc = vc4_crtc;
-+
-+	return 0;
-+
-+err_destroy_encoder:
-+	vc4_fkms_encoder_destroy(vc4_crtc->encoder);
-+	list_for_each_entry_safe(destroy_plane, temp,
-+				 &drm->mode_config.plane_list, head) {
-+		if (destroy_plane->possible_crtcs == 1 << drm_crtc_index(crtc))
-+			destroy_plane->funcs->destroy(destroy_plane);
-+	}
-+err:
-+	return ret;
-+}
-+
-+static int vc4_fkms_bind(struct device *dev, struct device *master, void *data)
-+{
-+	struct platform_device *pdev = to_platform_device(dev);
-+	struct drm_device *drm = dev_get_drvdata(master);
-+	struct vc4_dev *vc4 = to_vc4_dev(drm);
-+	struct device_node *firmware_node;
-+	const struct of_device_id *match;
-+	struct vc4_crtc **crtc_list;
-+	u32 num_displays, display_num;
-+	struct vc4_fkms *fkms;
-+	int ret;
-+	u32 display_id;
-+
-+	vc4->firmware_kms = true;
-+
-+	fkms = devm_kzalloc(dev, sizeof(*fkms), GFP_KERNEL);
-+	if (!fkms)
-+		return -ENOMEM;
-+
-+	match = of_match_device(vc4_firmware_kms_dt_match, dev);
-+	if (!match)
-+		return -ENODEV;
-+	if (match->data)
-+		fkms->bcm2711 = true;
-+
-+	firmware_node = of_parse_phandle(dev->of_node, "brcm,firmware", 0);
-+	vc4->firmware = devm_rpi_firmware_get(&pdev->dev, firmware_node);
-+	if (!vc4->firmware) {
-+		DRM_DEBUG("Failed to get Raspberry Pi firmware reference.\n");
-+		return -EPROBE_DEFER;
-+	}
-+	of_node_put(firmware_node);
-+
-+	ret = rpi_firmware_property(vc4->firmware,
-+				    RPI_FIRMWARE_FRAMEBUFFER_GET_NUM_DISPLAYS,
-+				    &num_displays, sizeof(u32));
-+
-+	/* If we fail to get the number of displays, then
-+	 * assume old firmware that doesn't have the mailbox call, so just
-+	 * set one display
-+	 */
-+	if (ret) {
-+		num_displays = 1;
-+		DRM_WARN("Unable to determine number of displays - assuming 1\n");
-+		ret = 0;
-+	}
-+
-+	ret = rpi_firmware_property(vc4->firmware,
-+				    RPI_FIRMWARE_GET_DISPLAY_CFG,
-+				    &fkms->cfg, sizeof(fkms->cfg));
-+
-+	if (ret)
-+		return -EINVAL;
-+	/* The firmware works in Hz. This will be compared against kHz, so div
-+	 * 1000 now rather than multiple times later.
-+	 */
-+	fkms->cfg.max_pixel_clock[0] /= 1000;
-+	fkms->cfg.max_pixel_clock[1] /= 1000;
-+
-+	/* Allocate a list, with space for a NULL on the end */
-+	crtc_list = devm_kzalloc(dev, sizeof(crtc_list) * (num_displays + 1),
-+				 GFP_KERNEL);
-+	if (!crtc_list)
-+		return -ENOMEM;
-+
-+	for (display_num = 0; display_num < num_displays; display_num++) {
-+		display_id = display_num;
-+		ret = rpi_firmware_property(vc4->firmware,
-+					    RPI_FIRMWARE_FRAMEBUFFER_GET_DISPLAY_ID,
-+					    &display_id, sizeof(display_id));
-+		/* FIXME: Determine the correct error handling here.
-+		 * Should we fail to create the one "screen" but keep the
-+		 * others, or fail the whole thing?
-+		 */
-+		if (ret)
-+			DRM_ERROR("Failed to get display id %u\n", display_num);
-+
-+		ret = vc4_fkms_create_screen(dev, drm, display_num, display_id,
-+					     &crtc_list[display_num]);
-+		if (ret)
-+			DRM_ERROR("Oh dear, failed to create display %u\n",
-+				  display_num);
-+	}
-+
-+	if (num_displays > 0) {
-+		/* Map the SMI interrupt reg */
-+		crtc_list[0]->regs = vc4_ioremap_regs(pdev, 0);
-+		if (IS_ERR(crtc_list[0]->regs))
-+			DRM_ERROR("Oh dear, failed to map registers\n");
-+
-+		writel(0, crtc_list[0]->regs + SMICS);
-+		ret = devm_request_irq(dev, platform_get_irq(pdev, 0),
-+				       vc4_crtc_irq_handler, 0,
-+				       "vc4 firmware kms", crtc_list);
-+		if (ret)
-+			DRM_ERROR("Oh dear, failed to register IRQ\n");
-+	} else {
-+		DRM_WARN("No displays found. Consider forcing hotplug if HDMI is attached\n");
-+	}
-+
-+	vc4->fkms = fkms;
-+
-+	platform_set_drvdata(pdev, crtc_list);
-+
-+	return 0;
-+}
-+
-+static void vc4_fkms_unbind(struct device *dev, struct device *master,
-+			    void *data)
-+{
-+	struct platform_device *pdev = to_platform_device(dev);
-+	struct vc4_crtc **crtc_list = dev_get_drvdata(dev);
-+	int i;
-+
-+	for (i = 0; crtc_list[i]; i++) {
-+		vc4_fkms_connector_destroy(crtc_list[i]->connector);
-+		vc4_fkms_encoder_destroy(crtc_list[i]->encoder);
-+		drm_crtc_cleanup(&crtc_list[i]->base);
-+	}
-+
-+	platform_set_drvdata(pdev, NULL);
-+}
-+
-+static const struct component_ops vc4_fkms_ops = {
-+	.bind   = vc4_fkms_bind,
-+	.unbind = vc4_fkms_unbind,
-+};
-+
-+static int vc4_fkms_probe(struct platform_device *pdev)
-+{
-+	return component_add(&pdev->dev, &vc4_fkms_ops);
-+}
-+
-+static int vc4_fkms_remove(struct platform_device *pdev)
-+{
-+	component_del(&pdev->dev, &vc4_fkms_ops);
-+	return 0;
-+}
-+
-+struct platform_driver vc4_firmware_kms_driver = {
-+	.probe = vc4_fkms_probe,
-+	.remove = vc4_fkms_remove,
-+	.driver = {
-+		.name = "vc4_firmware_kms",
-+		.of_match_table = vc4_firmware_kms_dt_match,
-+	},
-+};
---- a/drivers/gpu/drm/vc4/vc4_kms.c
-+++ b/drivers/gpu/drm/vc4/vc4_kms.c
-@@ -162,6 +162,9 @@ vc4_ctm_commit(struct vc4_dev *vc4, stru
- 	struct vc4_ctm_state *ctm_state = to_vc4_ctm_state(vc4->ctm_manager.state);
- 	struct drm_color_ctm *ctm = ctm_state->ctm;
- 
-+	if (vc4->firmware_kms)
-+		return;
-+
- 	if (ctm_state->fifo) {
- 		HVS_WRITE(SCALER_OLEDCOEF2,
- 			  VC4_SET_FIELD(vc4_ctm_s31_32_to_s0_9(ctm->matrix[0]),
-@@ -367,7 +370,7 @@ static void vc4_atomic_commit_tail(struc
- 	for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) {
- 		struct vc4_crtc_state *vc4_crtc_state;
- 
--		if (!new_crtc_state->commit)
-+		if (!new_crtc_state->commit || vc4->firmware_kms)
- 			continue;
- 
- 		vc4_crtc_state = to_vc4_crtc_state(new_crtc_state);
-@@ -393,7 +396,7 @@ static void vc4_atomic_commit_tail(struc
- 		old_hvs_state->fifo_state[channel].pending_commit = NULL;
- 	}
- 
--	if (vc4->is_vc5) {
-+	if (vc4->is_vc5 && !vc4->firmware_kms) {
- 		unsigned long state_rate = max(old_hvs_state->core_clock_rate,
- 					       new_hvs_state->core_clock_rate);
- 		unsigned long core_rate = max_t(unsigned long,
-@@ -412,10 +415,12 @@ static void vc4_atomic_commit_tail(struc
- 
- 	vc4_ctm_commit(vc4, state);
- 
--	if (vc4->is_vc5)
--		vc5_hvs_pv_muxing_commit(vc4, state);
--	else
--		vc4_hvs_pv_muxing_commit(vc4, state);
-+	if (!vc4->firmware_kms) {
-+		if (vc4->is_vc5)
-+			vc5_hvs_pv_muxing_commit(vc4, state);
-+		else
-+			vc4_hvs_pv_muxing_commit(vc4, state);
-+	}
- 
- 	drm_atomic_helper_commit_planes(dev, state,
- 					DRM_PLANE_COMMIT_ACTIVE_ONLY);
-@@ -430,7 +435,7 @@ static void vc4_atomic_commit_tail(struc
- 
- 	drm_atomic_helper_cleanup_planes(dev, state);
- 
--	if (vc4->is_vc5) {
-+	if (vc4->is_vc5 && !vc4->firmware_kms) {
- 		drm_dbg(dev, "Running the core clock at %lu Hz\n",
- 			new_hvs_state->core_clock_rate);
- 
-@@ -447,11 +452,21 @@ static void vc4_atomic_commit_tail(struc
- 
- static int vc4_atomic_commit_setup(struct drm_atomic_state *state)
- {
-+	struct drm_device *dev = state->dev;
-+	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 	struct drm_crtc_state *crtc_state;
- 	struct vc4_hvs_state *hvs_state;
- 	struct drm_crtc *crtc;
- 	unsigned int i;
- 
-+	/* We know for sure we don't want an async update here. Set
-+	 * state->legacy_cursor_update to false to prevent
-+	 * drm_atomic_helper_setup_commit() from auto-completing
-+	 * commit->flip_done.
-+	 */
-+	if (!vc4->firmware_kms)
-+		state->legacy_cursor_update = false;
-+
- 	hvs_state = vc4_hvs_get_new_global_state(state);
- 	if (WARN_ON(IS_ERR(hvs_state)))
- 		return PTR_ERR(hvs_state);
-@@ -806,6 +821,7 @@ static int vc4_hvs_channels_obj_init(str
- static int vc4_pv_muxing_atomic_check(struct drm_device *dev,
- 				      struct drm_atomic_state *state)
- {
-+	struct vc4_dev *vc4 = to_vc4_dev(state->dev);
- 	struct vc4_hvs_state *hvs_new_state;
- 	struct drm_crtc_state *old_crtc_state, *new_crtc_state;
- 	struct drm_crtc *crtc;
-@@ -829,6 +845,9 @@ static int vc4_pv_muxing_atomic_check(st
- 		unsigned int matching_channels;
- 		unsigned int channel;
- 
-+		if (vc4->firmware_kms)
-+			continue;
-+
- 		drm_dbg(dev, "%s: Trying to find a channel.\n", crtc->name);
- 
- 		/* Nothing to do here, let's skip it */
-@@ -1047,6 +1066,8 @@ int vc4_kms_load(struct drm_device *dev)
- 	dev->mode_config.helper_private = &vc4_mode_config_helpers;
- 	dev->mode_config.preferred_depth = 24;
- 	dev->mode_config.async_page_flip = true;
-+	if (vc4->firmware_kms)
-+		dev->mode_config.normalize_zpos = true;
- 
- 	ret = vc4_ctm_obj_init(vc4);
- 	if (ret)
---- /dev/null
-+++ b/drivers/gpu/drm/vc4/vc_image_types.h
-@@ -0,0 +1,175 @@
-+
-+/*
-+ * Copyright (c) 2012, Broadcom Europe Ltd
-+ *
-+ * Values taken from vc_image_types.h released by Broadcom at
-+ * https://github.com/raspberrypi/userland/blob/master/interface/vctypes/vc_image_types.h
-+ * and vc_image_structs.h at
-+ * https://github.com/raspberrypi/userland/blob/master/interface/vctypes/vc_image_structs.h
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+enum {
-+	VC_IMAGE_MIN = 0, //bounds for error checking
-+
-+	VC_IMAGE_RGB565 = 1,
-+	VC_IMAGE_1BPP,
-+	VC_IMAGE_YUV420,
-+	VC_IMAGE_48BPP,
-+	VC_IMAGE_RGB888,
-+	VC_IMAGE_8BPP,
-+	/* 4bpp palettised image */
-+	VC_IMAGE_4BPP,
-+	/* A separated format of 16 colour/light shorts followed by 16 z
-+	 * values
-+	 */
-+	VC_IMAGE_3D32,
-+	/* 16 colours followed by 16 z values */
-+	VC_IMAGE_3D32B,
-+	/* A separated format of 16 material/colour/light shorts followed by
-+	 * 16 z values
-+	 */
-+	VC_IMAGE_3D32MAT,
-+	/* 32 bit format containing 18 bits of 6.6.6 RGB, 9 bits per short */
-+	VC_IMAGE_RGB2X9,
-+	/* 32-bit format holding 18 bits of 6.6.6 RGB */
-+	VC_IMAGE_RGB666,
-+	/* 4bpp palettised image with embedded palette */
-+	VC_IMAGE_PAL4_OBSOLETE,
-+	/* 8bpp palettised image with embedded palette */
-+	VC_IMAGE_PAL8_OBSOLETE,
-+	/* RGB888 with an alpha byte after each pixel */
-+	VC_IMAGE_RGBA32,
-+	/* a line of Y (32-byte padded), a line of U (16-byte padded), and a
-+	 * line of V (16-byte padded)
-+	 */
-+	VC_IMAGE_YUV422,
-+	/* RGB565 with a transparent patch */
-+	VC_IMAGE_RGBA565,
-+	/* Compressed (4444) version of RGBA32 */
-+	VC_IMAGE_RGBA16,
-+	/* VCIII codec format */
-+	VC_IMAGE_YUV_UV,
-+	/* VCIII T-format RGBA8888 */
-+	VC_IMAGE_TF_RGBA32,
-+	/* VCIII T-format RGBx8888 */
-+	VC_IMAGE_TF_RGBX32,
-+	/* VCIII T-format float */
-+	VC_IMAGE_TF_FLOAT,
-+	/* VCIII T-format RGBA4444 */
-+	VC_IMAGE_TF_RGBA16,
-+	/* VCIII T-format RGB5551 */
-+	VC_IMAGE_TF_RGBA5551,
-+	/* VCIII T-format RGB565 */
-+	VC_IMAGE_TF_RGB565,
-+	/* VCIII T-format 8-bit luma and 8-bit alpha */
-+	VC_IMAGE_TF_YA88,
-+	/* VCIII T-format 8 bit generic sample */
-+	VC_IMAGE_TF_BYTE,
-+	/* VCIII T-format 8-bit palette */
-+	VC_IMAGE_TF_PAL8,
-+	/* VCIII T-format 4-bit palette */
-+	VC_IMAGE_TF_PAL4,
-+	/* VCIII T-format Ericsson Texture Compressed */
-+	VC_IMAGE_TF_ETC1,
-+	/* RGB888 with R & B swapped */
-+	VC_IMAGE_BGR888,
-+	/* RGB888 with R & B swapped, but with no pitch, i.e. no padding after
-+	 * each row of pixels
-+	 */
-+	VC_IMAGE_BGR888_NP,
-+	/* Bayer image, extra defines which variant is being used */
-+	VC_IMAGE_BAYER,
-+	/* General wrapper for codec images e.g. JPEG from camera */
-+	VC_IMAGE_CODEC,
-+	/* VCIII codec format */
-+	VC_IMAGE_YUV_UV32,
-+	/* VCIII T-format 8-bit luma */
-+	VC_IMAGE_TF_Y8,
-+	/* VCIII T-format 8-bit alpha */
-+	VC_IMAGE_TF_A8,
-+	/* VCIII T-format 16-bit generic sample */
-+	VC_IMAGE_TF_SHORT,
-+	/* VCIII T-format 1bpp black/white */
-+	VC_IMAGE_TF_1BPP,
-+	VC_IMAGE_OPENGL,
-+	/* VCIII-B0 HVS YUV 4:4:4 interleaved samples */
-+	VC_IMAGE_YUV444I,
-+	/* Y, U, & V planes separately (VC_IMAGE_YUV422 has them interleaved on
-+	 * a per line basis)
-+	 */
-+	VC_IMAGE_YUV422PLANAR,
-+	/* 32bpp with 8bit alpha at MS byte, with R, G, B (LS byte) */
-+	VC_IMAGE_ARGB8888,
-+	/* 32bpp with 8bit unused at MS byte, with R, G, B (LS byte) */
-+	VC_IMAGE_XRGB8888,
-+
-+	/* interleaved 8 bit samples of Y, U, Y, V (4 flavours) */
-+	VC_IMAGE_YUV422YUYV,
-+	VC_IMAGE_YUV422YVYU,
-+	VC_IMAGE_YUV422UYVY,
-+	VC_IMAGE_YUV422VYUY,
-+
-+	/* 32bpp like RGBA32 but with unused alpha */
-+	VC_IMAGE_RGBX32,
-+	/* 32bpp, corresponding to RGBA with unused alpha */
-+	VC_IMAGE_RGBX8888,
-+	/* 32bpp, corresponding to BGRA with unused alpha */
-+	VC_IMAGE_BGRX8888,
-+
-+	/* Y as a plane, then UV byte interleaved in plane with same pitch,
-+	 * half height
-+	 */
-+	VC_IMAGE_YUV420SP,
-+
-+	/* Y, U, & V planes separately 4:4:4 */
-+	VC_IMAGE_YUV444PLANAR,
-+
-+	/* T-format 8-bit U - same as TF_Y8 buf from U plane */
-+	VC_IMAGE_TF_U8,
-+	/* T-format 8-bit U - same as TF_Y8 buf from V plane */
-+	VC_IMAGE_TF_V8,
-+
-+	/* YUV4:2:0 planar, 16bit values */
-+	VC_IMAGE_YUV420_16,
-+	/* YUV4:2:0 codec format, 16bit values */
-+	VC_IMAGE_YUV_UV_16,
-+	/* YUV4:2:0 with U,V in side-by-side format */
-+	VC_IMAGE_YUV420_S,
-+	/* 10-bit YUV 420 column image format */
-+	VC_IMAGE_YUV10COL,
-+	/* 32-bpp, 10-bit R/G/B, 2-bit Alpha */
-+	VC_IMAGE_RGBA1010102,
-+
-+	VC_IMAGE_MAX,     /* bounds for error checking */
-+	VC_IMAGE_FORCE_ENUM_16BIT = 0xffff,
-+};
-+
-+enum {
-+	/* Unknown or unset - defaults to BT601 interstitial */
-+	VC_IMAGE_YUVINFO_UNSPECIFIED    = 0,
-+
-+	/* colour-space conversions data [4 bits] */
-+
-+	/* ITU-R BT.601-5 [SDTV] (compatible with VideoCore-II) */
-+	VC_IMAGE_YUVINFO_CSC_ITUR_BT601      = 1,
-+	/* ITU-R BT.709-3 [HDTV] */
-+	VC_IMAGE_YUVINFO_CSC_ITUR_BT709      = 2,
-+	/* JPEG JFIF */
-+	VC_IMAGE_YUVINFO_CSC_JPEG_JFIF       = 3,
-+	/* Title 47 Code of Federal Regulations (2003) 73.682 (a) (20) */
-+	VC_IMAGE_YUVINFO_CSC_FCC             = 4,
-+	/* Society of Motion Picture and Television Engineers 240M (1999) */
-+	VC_IMAGE_YUVINFO_CSC_SMPTE_240M      = 5,
-+	/* ITU-R BT.470-2 System M */
-+	VC_IMAGE_YUVINFO_CSC_ITUR_BT470_2_M  = 6,
-+	/* ITU-R BT.470-2 System B,G */
-+	VC_IMAGE_YUVINFO_CSC_ITUR_BT470_2_BG = 7,
-+	/* JPEG JFIF, but with 16..255 luma */
-+	VC_IMAGE_YUVINFO_CSC_JPEG_JFIF_Y16_255 = 8,
-+	/* Rec 2020 */
-+	VC_IMAGE_YUVINFO_CSC_REC_2020        = 9,
-+};
diff --git a/target/linux/bcm27xx/patches-6.1/950-0012-drm-vc4-Add-support-for-gamma-on-BCM2711.patch b/target/linux/bcm27xx/patches-6.1/950-0012-drm-vc4-Add-support-for-gamma-on-BCM2711.patch
deleted file mode 100644
index 1ec4c4252e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0012-drm-vc4-Add-support-for-gamma-on-BCM2711.patch
+++ /dev/null
@@ -1,276 +0,0 @@
-From 387b65c16c0d763ee4610675ce61e1072fa6cd72 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 27 Apr 2021 14:24:21 +0200
-Subject: [PATCH] drm/vc4: Add support for gamma on BCM2711
-
-BCM2711 changes from a 256 entry lookup table to a 16 point
-piecewise linear function as the pipeline bitdepth has increased
-to make a LUT unwieldy.
-
-Implement a simple conversion from a 256 entry LUT that userspace
-is likely to expect to 16 evenly spread points in the PWL. This
-could be improved with curve fitting at a later date.
-
-Co-developed-by: Juerg Haefliger <juergh@canonical.com>
-Signed-off-by: Juerg Haefliger <juergh@canonical.com>
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_crtc.c | 35 ++++++++++---
- drivers/gpu/drm/vc4/vc4_drv.h  | 28 +++++++++--
- drivers/gpu/drm/vc4/vc4_hvs.c  | 89 ++++++++++++++++++++++++++++++++--
- drivers/gpu/drm/vc4/vc4_regs.h | 22 +++++++++
- 4 files changed, 162 insertions(+), 12 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_crtc.c
-+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
-@@ -1326,19 +1326,42 @@ int vc4_crtc_init(struct drm_device *drm
- 
- 	if (!vc4->is_vc5) {
- 		drm_mode_crtc_set_gamma_size(crtc, ARRAY_SIZE(vc4_crtc->lut_r));
-+	} else {
-+		/* This is a lie for hvs5 which uses a 16 point PWL, but it
-+		 * allows for something smarter than just 16 linearly spaced
-+		 * segments. Conversion is done in vc5_hvs_update_gamma_lut.
-+		 */
-+		drm_mode_crtc_set_gamma_size(crtc, 256);
-+	}
- 
--		drm_crtc_enable_color_mgmt(crtc, 0, false, crtc->gamma_size);
-+	drm_crtc_enable_color_mgmt(crtc, 0, false, crtc->gamma_size);
- 
-+	if (!vc4->is_vc5) {
- 		/* We support CTM, but only for one CRTC at a time. It's therefore
- 		 * implemented as private driver state in vc4_kms, not here.
- 		 */
- 		drm_crtc_enable_color_mgmt(crtc, 0, true, crtc->gamma_size);
--	}
- 
--	for (i = 0; i < crtc->gamma_size; i++) {
--		vc4_crtc->lut_r[i] = i;
--		vc4_crtc->lut_g[i] = i;
--		vc4_crtc->lut_b[i] = i;
-+		/* Initialize the VC4 gamma LUTs */
-+		for (i = 0; i < crtc->gamma_size; i++) {
-+			vc4_crtc->lut_r[i] = i;
-+			vc4_crtc->lut_g[i] = i;
-+			vc4_crtc->lut_b[i] = i;
-+		}
-+	} else {
-+		/* Initialize the VC5 gamma PWL entries. Assume 12-bit pipeline,
-+		 * evenly spread over full range.
-+		 */
-+		for (i = 0; i < SCALER5_DSPGAMMA_NUM_POINTS; i++) {
-+			vc4_crtc->pwl_r[i] =
-+				VC5_HVS_SET_GAMMA_ENTRY(i << 8, i << 12, 1 << 8);
-+			vc4_crtc->pwl_g[i] =
-+				VC5_HVS_SET_GAMMA_ENTRY(i << 8, i << 12, 1 << 8);
-+			vc4_crtc->pwl_b[i] =
-+				VC5_HVS_SET_GAMMA_ENTRY(i << 8, i << 12, 1 << 8);
-+			vc4_crtc->pwl_a[i] =
-+				VC5_HVS_SET_GAMMA_ENTRY(i << 8, i << 12, 1 << 8);
-+		}
- 	}
- 
- 	return 0;
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -20,6 +20,7 @@
- #include <drm/drm_modeset_lock.h>
- 
- #include "uapi/drm/vc4_drm.h"
-+#include "vc4_regs.h"
- 
- struct drm_device;
- struct drm_gem_object;
-@@ -481,6 +482,17 @@ struct vc4_pv_data {
- 	enum vc4_encoder_type encoder_types[4];
- };
- 
-+struct vc5_gamma_entry {
-+	u32 x_c_terms;
-+	u32 grad_term;
-+};
-+
-+#define VC5_HVS_SET_GAMMA_ENTRY(x, c, g) (struct vc5_gamma_entry){	\
-+	.x_c_terms = VC4_SET_FIELD((x), SCALER5_DSPGAMMA_OFF_X) | 	\
-+		     VC4_SET_FIELD((c), SCALER5_DSPGAMMA_OFF_C),	\
-+	.grad_term = (g)						\
-+}
-+
- struct vc4_crtc {
- 	struct drm_crtc base;
- 	struct platform_device *pdev;
-@@ -490,9 +502,19 @@ struct vc4_crtc {
- 	/* Timestamp at start of vblank irq - unaffected by lock delays. */
- 	ktime_t t_vblank;
- 
--	u8 lut_r[256];
--	u8 lut_g[256];
--	u8 lut_b[256];
-+	union {
-+		struct {  /* VC4 gamma LUT */
-+			u8 lut_r[256];
-+			u8 lut_g[256];
-+			u8 lut_b[256];
-+		};
-+		struct {  /* VC5 gamma PWL entries */
-+			struct vc5_gamma_entry pwl_r[SCALER5_DSPGAMMA_NUM_POINTS];
-+			struct vc5_gamma_entry pwl_g[SCALER5_DSPGAMMA_NUM_POINTS];
-+			struct vc5_gamma_entry pwl_b[SCALER5_DSPGAMMA_NUM_POINTS];
-+			struct vc5_gamma_entry pwl_a[SCALER5_DSPGAMMA_NUM_POINTS];
-+		};
-+	};
- 
- 	struct drm_pending_vblank_event *event;
- 
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -241,7 +241,8 @@ static void vc4_hvs_lut_load(struct vc4_
- static void vc4_hvs_update_gamma_lut(struct vc4_hvs *hvs,
- 				     struct vc4_crtc *vc4_crtc)
- {
--	struct drm_crtc_state *crtc_state = vc4_crtc->base.state;
-+	struct drm_crtc *crtc = &vc4_crtc->base;
-+	struct drm_crtc_state *crtc_state = crtc->state;
- 	struct drm_color_lut *lut = crtc_state->gamma_lut->data;
- 	u32 length = drm_color_lut_size(crtc_state->gamma_lut);
- 	u32 i;
-@@ -255,6 +256,81 @@ static void vc4_hvs_update_gamma_lut(str
- 	vc4_hvs_lut_load(hvs, vc4_crtc);
- }
- 
-+static void vc5_hvs_write_gamma_entry(struct vc4_hvs *hvs,
-+				      u32 offset,
-+				      struct vc5_gamma_entry *gamma)
-+{
-+	HVS_WRITE(offset, gamma->x_c_terms);
-+	HVS_WRITE(offset + 4, gamma->grad_term);
-+}
-+
-+static void vc5_hvs_lut_load(struct vc4_hvs *hvs,
-+			     struct vc4_crtc *vc4_crtc)
-+{
-+	struct drm_crtc *crtc = &vc4_crtc->base;
-+	struct drm_crtc_state *crtc_state = crtc->state;
-+	struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc_state);
-+	u32 i;
-+	u32 offset = SCALER5_DSPGAMMA_START +
-+		vc4_state->assigned_channel * SCALER5_DSPGAMMA_CHAN_OFFSET;
-+
-+	for (i = 0; i < SCALER5_DSPGAMMA_NUM_POINTS; i++, offset += 8)
-+		vc5_hvs_write_gamma_entry(hvs, offset, &vc4_crtc->pwl_r[i]);
-+	for (i = 0; i < SCALER5_DSPGAMMA_NUM_POINTS; i++, offset += 8)
-+		vc5_hvs_write_gamma_entry(hvs, offset, &vc4_crtc->pwl_g[i]);
-+	for (i = 0; i < SCALER5_DSPGAMMA_NUM_POINTS; i++, offset += 8)
-+		vc5_hvs_write_gamma_entry(hvs, offset, &vc4_crtc->pwl_b[i]);
-+
-+	if (vc4_state->assigned_channel == 2) {
-+		/* Alpha only valid on channel 2 */
-+		for (i = 0; i < SCALER5_DSPGAMMA_NUM_POINTS; i++, offset += 8)
-+			vc5_hvs_write_gamma_entry(hvs, offset, &vc4_crtc->pwl_a[i]);
-+	}
-+}
-+
-+static void vc5_hvs_update_gamma_lut(struct vc4_hvs *hvs,
-+				     struct vc4_crtc *vc4_crtc)
-+{
-+	struct drm_crtc *crtc = &vc4_crtc->base;
-+	struct drm_color_lut *lut = crtc->state->gamma_lut->data;
-+	unsigned int step, i;
-+	u32 start, end;
-+
-+#define VC5_HVS_UPDATE_GAMMA_ENTRY_FROM_LUT(pwl, chan)			\
-+	start = drm_color_lut_extract(lut[i * step].chan, 12);		\
-+	end = drm_color_lut_extract(lut[(i + 1) * step - 1].chan, 12);	\
-+									\
-+	/* Negative gradients not permitted by the hardware, so		\
-+	 * flatten such points out.					\
-+	 */								\
-+	if (end < start)						\
-+		end = start;						\
-+									\
-+	/* Assume 12bit pipeline.					\
-+	 * X evenly spread over full range (12 bit).			\
-+	 * C as U12.4 format.						\
-+	 * Gradient as U4.8 format.					\
-+	*/								\
-+	vc4_crtc->pwl[i] =						\
-+		VC5_HVS_SET_GAMMA_ENTRY(i << 8, start << 4,		\
-+				((end - start) << 4) / (step - 1))
-+
-+	/* HVS5 has a 16 point piecewise linear function for each colour
-+	 * channel (including alpha on channel 2) on each display channel.
-+	 *
-+	 * Currently take a crude subsample of the gamma LUT, but this could
-+	 * be improved to implement curve fitting.
-+	 */
-+	step = crtc->gamma_size / SCALER5_DSPGAMMA_NUM_POINTS;
-+	for (i = 0; i < SCALER5_DSPGAMMA_NUM_POINTS; i++) {
-+		VC5_HVS_UPDATE_GAMMA_ENTRY_FROM_LUT(pwl_r, red);
-+		VC5_HVS_UPDATE_GAMMA_ENTRY_FROM_LUT(pwl_g, green);
-+		VC5_HVS_UPDATE_GAMMA_ENTRY_FROM_LUT(pwl_b, blue);
-+	}
-+
-+	vc5_hvs_lut_load(hvs, vc4_crtc);
-+}
-+
- u8 vc4_hvs_get_fifo_frame_count(struct vc4_hvs *hvs, unsigned int fifo)
- {
- 	struct drm_device *drm = &hvs->vc4->base;
-@@ -398,7 +474,10 @@ static int vc4_hvs_init_channel(struct v
- 	/* Reload the LUT, since the SRAMs would have been disabled if
- 	 * all CRTCs had SCALER_DISPBKGND_GAMMA unset at once.
- 	 */
--	vc4_hvs_lut_load(hvs, vc4_crtc);
-+	if (!vc4->is_vc5)
-+		vc4_hvs_lut_load(hvs, vc4_crtc);
-+	else
-+		vc5_hvs_lut_load(hvs, vc4_crtc);
- 
- 	drm_dev_exit(idx);
- 
-@@ -628,7 +707,11 @@ void vc4_hvs_atomic_flush(struct drm_crt
- 		u32 dispbkgndx = HVS_READ(SCALER_DISPBKGNDX(channel));
- 
- 		if (crtc->state->gamma_lut) {
--			vc4_hvs_update_gamma_lut(hvs, vc4_crtc);
-+			if (!vc4->is_vc5)
-+				vc4_hvs_update_gamma_lut(hvs, vc4_crtc);
-+			else
-+				vc5_hvs_update_gamma_lut(hvs, vc4_crtc);
-+
- 			dispbkgndx |= SCALER_DISPBKGND_GAMMA;
- 		} else {
- 			/* Unsetting DISPBKGND_GAMMA skips the gamma lut step
---- a/drivers/gpu/drm/vc4/vc4_regs.h
-+++ b/drivers/gpu/drm/vc4/vc4_regs.h
-@@ -512,6 +512,28 @@
- #define SCALER_DLIST_START                      0x00002000
- #define SCALER_DLIST_SIZE                       0x00004000
- 
-+/* Gamma PWL for each channel. 16 points for each of 4 colour channels (alpha
-+ * only on channel 2). 8 bytes per entry, offsets first, then gradient:
-+ *   Y = GRAD * X + C
-+ *
-+ * Values for X and C are left justified, and vary depending on the width of
-+ * the HVS channel:
-+ *    8-bit pipeline: X uses [31:24], C is U8.8 format, and GRAD is U4.8.
-+ *   12-bit pipeline: X uses [31:20], C is U12.4 format, and GRAD is U4.8.
-+ *
-+ * The 3 HVS channels start at 0x400 offsets (ie chan 1 starts at 0x2400, and
-+ * chan 2 at 0x2800).
-+ */
-+#define SCALER5_DSPGAMMA_NUM_POINTS		16
-+#define SCALER5_DSPGAMMA_START			0x00002000
-+#define SCALER5_DSPGAMMA_CHAN_OFFSET		0x400
-+# define SCALER5_DSPGAMMA_OFF_X_MASK		VC4_MASK(31, 20)
-+# define SCALER5_DSPGAMMA_OFF_X_SHIFT		20
-+# define SCALER5_DSPGAMMA_OFF_C_MASK		VC4_MASK(15, 0)
-+# define SCALER5_DSPGAMMA_OFF_C_SHIFT		0
-+# define SCALER5_DSPGAMMA_GRAD_MASK		VC4_MASK(11, 0)
-+# define SCALER5_DSPGAMMA_GRAD_SHIFT		0
-+
- #define SCALER5_DLIST_START			0x00004000
- 
- # define VC4_HDMI_SW_RESET_FORMAT_DETECT	BIT(1)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0013-drm-vc4-Add-debugfs-node-that-dumps-the-vc5-gamma-PW.patch b/target/linux/bcm27xx/patches-6.1/950-0013-drm-vc4-Add-debugfs-node-that-dumps-the-vc5-gamma-PW.patch
deleted file mode 100644
index 4b4dcb64df..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0013-drm-vc4-Add-debugfs-node-that-dumps-the-vc5-gamma-PW.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 3905be68859b15731ec41b3d22cd1a9069375f7f Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 28 Apr 2021 12:32:10 +0200
-Subject: [PATCH] drm/vc4: Add debugfs node that dumps the vc5 gamma
- PWL entries
-
-This helps with debugging the conversion from a 256 point gamma LUT to
-16 point PWL entries as used by the BCM2711.
-
-Co-developed-by: Juerg Haefliger <juergh@canonical.com>
-Signed-off-by: Juerg Haefliger <juergh@canonical.com>
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_hvs.c | 85 ++++++++++++++++++++++++++++++++++-
- 1 file changed, 84 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -141,6 +141,85 @@ static int vc4_hvs_debugfs_dlist(struct
- 	return 0;
- }
- 
-+static int vc5_hvs_debugfs_gamma(struct seq_file *m, void *data)
-+{
-+	struct drm_info_node *node = m->private;
-+	struct drm_device *dev = node->minor->dev;
-+	struct vc4_dev *vc4 = to_vc4_dev(dev);
-+	struct vc4_hvs *hvs = vc4->hvs;
-+	struct drm_printer p = drm_seq_file_printer(m);
-+	unsigned int i, chan;
-+	u32 dispstat, dispbkgndx;
-+
-+	for (chan = 0; chan < SCALER_CHANNELS_COUNT; chan++) {
-+		u32 x_c, grad;
-+		u32 offset = SCALER5_DSPGAMMA_START +
-+			chan * SCALER5_DSPGAMMA_CHAN_OFFSET;
-+
-+		dispstat = VC4_GET_FIELD(HVS_READ(SCALER_DISPSTATX(chan)),
-+					 SCALER_DISPSTATX_MODE);
-+		if (dispstat == SCALER_DISPSTATX_MODE_DISABLED ||
-+		    dispstat == SCALER_DISPSTATX_MODE_EOF) {
-+			drm_printf(&p, "HVS channel %u: Channel disabled\n", chan);
-+			continue;
-+		}
-+
-+		dispbkgndx = HVS_READ(SCALER_DISPBKGNDX(chan));
-+		if (!(dispbkgndx & SCALER_DISPBKGND_GAMMA)) {
-+			drm_printf(&p, "HVS channel %u: Gamma disabled\n", chan);
-+			continue;
-+		}
-+
-+		drm_printf(&p, "HVS channel %u:\n", chan);
-+		drm_printf(&p, "  red:\n");
-+		for (i = 0; i < SCALER5_DSPGAMMA_NUM_POINTS; i++, offset += 8) {
-+			x_c = HVS_READ(offset);
-+			grad = HVS_READ(offset + 4);
-+			drm_printf(&p, "  %08x %08x - x %u, c %u, grad %u\n",
-+				   x_c, grad,
-+				   VC4_GET_FIELD(x_c, SCALER5_DSPGAMMA_OFF_X),
-+				   VC4_GET_FIELD(x_c, SCALER5_DSPGAMMA_OFF_C),
-+				   grad);
-+		}
-+		drm_printf(&p, "  green:\n");
-+		for (i = 0; i < SCALER5_DSPGAMMA_NUM_POINTS; i++, offset += 8) {
-+			x_c = HVS_READ(offset);
-+			grad = HVS_READ(offset + 4);
-+			drm_printf(&p, "  %08x %08x - x %u, c %u, grad %u\n",
-+				   x_c, grad,
-+				   VC4_GET_FIELD(x_c, SCALER5_DSPGAMMA_OFF_X),
-+				   VC4_GET_FIELD(x_c, SCALER5_DSPGAMMA_OFF_C),
-+				   grad);
-+		}
-+		drm_printf(&p, "  blue:\n");
-+		for (i = 0; i < SCALER5_DSPGAMMA_NUM_POINTS; i++, offset += 8) {
-+			x_c = HVS_READ(offset);
-+			grad = HVS_READ(offset + 4);
-+			drm_printf(&p, "  %08x %08x - x %u, c %u, grad %u\n",
-+				   x_c, grad,
-+				   VC4_GET_FIELD(x_c, SCALER5_DSPGAMMA_OFF_X),
-+				   VC4_GET_FIELD(x_c, SCALER5_DSPGAMMA_OFF_C),
-+				   grad);
-+		}
-+
-+		/* Alpha only valid on channel 2 */
-+		if (chan != 2)
-+			continue;
-+
-+		drm_printf(&p, "  alpha:\n");
-+		for (i = 0; i < SCALER5_DSPGAMMA_NUM_POINTS; i++, offset += 8) {
-+			x_c = HVS_READ(offset);
-+			grad = HVS_READ(offset + 4);
-+			drm_printf(&p, "  %08x %08x - x %u, c %u, grad %u\n",
-+				   x_c, grad,
-+				   VC4_GET_FIELD(x_c, SCALER5_DSPGAMMA_OFF_X),
-+				   VC4_GET_FIELD(x_c, SCALER5_DSPGAMMA_OFF_C),
-+				   grad);
-+		}
-+	}
-+	return 0;
-+}
-+
- /* The filter kernel is composed of dwords each containing 3 9-bit
-  * signed integers packed next to each other.
-  */
-@@ -833,11 +912,15 @@ int vc4_hvs_debugfs_init(struct drm_mino
- 	if (!vc4->hvs)
- 		return -ENODEV;
- 
--	if (!vc4->is_vc5)
-+	if (!vc4->is_vc5) {
- 		debugfs_create_bool("hvs_load_tracker", S_IRUGO | S_IWUSR,
- 				    minor->debugfs_root,
- 				    &vc4->load_tracker_enabled);
- 
-+		vc4_debugfs_add_file(minor, "hvs_gamma", vc5_hvs_debugfs_gamma,
-+				     NULL);
-+	}
-+
- 	ret = vc4_debugfs_add_file(minor, "hvs_dlists",
- 				   vc4_hvs_debugfs_dlist, NULL);
- 	if (ret)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0014-drm-vc4-hvs-Force-modeset-on-gamma-lut-change.patch b/target/linux/bcm27xx/patches-6.1/950-0014-drm-vc4-hvs-Force-modeset-on-gamma-lut-change.patch
deleted file mode 100644
index cb6f834861..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0014-drm-vc4-hvs-Force-modeset-on-gamma-lut-change.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 132865ef0ce76d66a27152eee131ba4335639df4 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Mon, 14 Jun 2021 15:28:30 +0200
-Subject: [PATCH] drm/vc4: hvs: Force modeset on gamma lut change
-
-The HVS Gamma block can only be updated when idle, so we need to disable
-the HVS channel when the gamma property is set in an atomic commit.
-
-Since the pixelvalve cannot have its assigned channel halted without
-stalling unless it's disabled as well, in our case that means forcing a
-full disable / enable cycle on the pipeline.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_crtc.c | 17 +++++++++++++++++
- drivers/gpu/drm/vc4/vc4_drv.h  |  3 +++
- drivers/gpu/drm/vc4/vc4_hvs.c  | 32 +++++++++++++++++++++++++++++++-
- 3 files changed, 51 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/vc4/vc4_crtc.c
-+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
-@@ -293,6 +293,23 @@ struct drm_encoder *vc4_get_crtc_encoder
- 	return NULL;
- }
- 
-+#define drm_for_each_connector_mask(connector, dev, connector_mask) \
-+	list_for_each_entry((connector), &(dev)->mode_config.connector_list, head) \
-+		for_each_if ((connector_mask) & drm_connector_mask(connector))
-+
-+struct drm_connector *vc4_get_crtc_connector(struct drm_crtc *crtc,
-+					     struct drm_crtc_state *state)
-+{
-+	struct drm_connector *connector;
-+
-+	WARN_ON(hweight32(state->connector_mask) > 1);
-+
-+	drm_for_each_connector_mask(connector, crtc->dev, state->connector_mask)
-+		return connector;
-+
-+	return NULL;
-+}
-+
- static void vc4_crtc_pixelvalve_reset(struct drm_crtc *crtc)
- {
- 	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -568,6 +568,9 @@ vc4_crtc_to_vc4_pv_data(const struct vc4
- 	return container_of(data, struct vc4_pv_data, base);
- }
- 
-+struct drm_connector *vc4_get_crtc_connector(struct drm_crtc *crtc,
-+					     struct drm_crtc_state *state);
-+
- struct drm_encoder *vc4_get_crtc_encoder(struct drm_crtc *crtc,
- 					 struct drm_crtc_state *state);
- 
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -594,6 +594,36 @@ out:
- 	drm_dev_exit(idx);
- }
- 
-+static int vc4_hvs_gamma_check(struct drm_crtc *crtc,
-+			       struct drm_atomic_state *state)
-+{
-+	struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
-+	struct drm_connector_state *conn_state;
-+	struct drm_connector *connector;
-+	struct drm_device *dev = crtc->dev;
-+	struct vc4_dev *vc4 = to_vc4_dev(dev);
-+
-+	if (!vc4->is_vc5)
-+		return 0;
-+
-+	if (!crtc_state->color_mgmt_changed)
-+		return 0;
-+
-+	connector = vc4_get_crtc_connector(crtc, crtc_state);
-+	if (!connector)
-+		return -EINVAL;
-+
-+	if (!(connector->connector_type == DRM_MODE_CONNECTOR_HDMIA))
-+		return 0;
-+
-+	conn_state = drm_atomic_get_connector_state(state, connector);
-+	if (!conn_state)
-+		return -EINVAL;
-+
-+	crtc_state->mode_changed = true;
-+	return 0;
-+}
-+
- int vc4_hvs_atomic_check(struct drm_crtc *crtc, struct drm_atomic_state *state)
- {
- 	struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
-@@ -624,7 +654,7 @@ int vc4_hvs_atomic_check(struct drm_crtc
- 	if (ret)
- 		return ret;
- 
--	return 0;
-+	return vc4_hvs_gamma_check(crtc, state);
- }
- 
- static void vc4_hvs_install_dlist(struct drm_crtc *crtc)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0015-drm-vc4-Relax-VEC-modeline-requirements-and-add-prog.patch b/target/linux/bcm27xx/patches-6.1/950-0015-drm-vc4-Relax-VEC-modeline-requirements-and-add-prog.patch
deleted file mode 100644
index 9b7bc332ef..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0015-drm-vc4-Relax-VEC-modeline-requirements-and-add-prog.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-From a4614b6f6c4e3a9ef80c88f272c1503b91f7ef8c Mon Sep 17 00:00:00 2001
-From: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
-Date: Thu, 15 Jul 2021 01:08:08 +0200
-Subject: [PATCH] drm/vc4: Relax VEC modeline requirements and add
- progressive mode support
-
-Make vc4_vec_encoder_atomic_check() accept arbitrary modelines, as long
-as they result in somewhat sane output from the VEC. The bounds have
-been determined empirically. Additionally, add support for the
-progressive 262-line and 312-line modes.
-
-Signed-off-by: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
----
- drivers/gpu/drm/vc4/vc4_crtc.c |  1 +
- drivers/gpu/drm/vc4/vc4_vec.c  | 94 ++++++++++++++++++++++++++++++----
- 2 files changed, 85 insertions(+), 10 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_crtc.c
-+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
-@@ -422,6 +422,7 @@ static void vc4_crtc_config_pv(struct dr
- 		CRTC_WRITE(PV_V_CONTROL,
- 			   PV_VCONTROL_CONTINUOUS |
- 			   (is_dsi ? PV_VCONTROL_DSI : 0));
-+		CRTC_WRITE(PV_VSYNCD_EVEN, 0);
- 	}
- 
- 	CRTC_WRITE(PV_VERTA,
---- a/drivers/gpu/drm/vc4/vc4_vec.c
-+++ b/drivers/gpu/drm/vc4/vc4_vec.c
-@@ -400,18 +400,11 @@ static int vc4_vec_connector_atomic_chec
- 	struct drm_connector_state *new_state =
- 		drm_atomic_get_new_connector_state(state, conn);
- 
--	const struct vc4_vec_tv_mode *vec_mode =
--		&vc4_vec_tv_modes[new_state->tv.mode];
--
--	if (new_state->crtc) {
-+	if (new_state->crtc && old_state->tv.mode != new_state->tv.mode) {
- 		struct drm_crtc_state *crtc_state =
- 			drm_atomic_get_new_crtc_state(state, new_state->crtc);
- 
--		if (!drm_mode_equal(vec_mode->mode, &crtc_state->mode))
--			return -EINVAL;
--
--		if (old_state->tv.mode != new_state->tv.mode)
--			crtc_state->mode_changed = true;
-+		crtc_state->mode_changed = true;
- 	}
- 
- 	return 0;
-@@ -546,7 +539,10 @@ static void vc4_vec_encoder_enable(struc
- 	VEC_WRITE(VEC_CLMP0_START, 0xac);
- 	VEC_WRITE(VEC_CLMP0_END, 0xec);
- 	VEC_WRITE(VEC_CONFIG2,
--		  VEC_CONFIG2_UV_DIG_DIS | VEC_CONFIG2_RGB_DIG_DIS);
-+		  VEC_CONFIG2_UV_DIG_DIS |
-+		  VEC_CONFIG2_RGB_DIG_DIS |
-+		  ((encoder->crtc->state->adjusted_mode.flags &
-+		    DRM_MODE_FLAG_INTERLACE) ? 0 : VEC_CONFIG2_PROG_SCAN));
- 	VEC_WRITE(VEC_CONFIG3, VEC_CONFIG3_HORIZ_LEN_STD);
- 	VEC_WRITE(VEC_DAC_CONFIG, vec->variant->dac_config);
- 
-@@ -575,8 +571,86 @@ err_put_runtime_pm:
- err_dev_exit:
- 	drm_dev_exit(idx);
- }
-+static int vc4_vec_encoder_atomic_check(struct drm_encoder *encoder,
-+					struct drm_crtc_state *crtc_state,
-+					struct drm_connector_state *conn_state)
-+{
-+	const struct drm_display_mode *reference_mode =
-+		vc4_vec_tv_modes[conn_state->tv.mode].mode;
-+
-+	if (crtc_state->adjusted_mode.crtc_clock != reference_mode->clock ||
-+	    crtc_state->adjusted_mode.crtc_htotal != reference_mode->htotal ||
-+	    crtc_state->adjusted_mode.crtc_hdisplay % 4 != 0 ||
-+	    crtc_state->adjusted_mode.crtc_hsync_end -
-+		    crtc_state->adjusted_mode.crtc_hsync_start < 1)
-+		return -EINVAL;
-+
-+	switch (reference_mode->vtotal) {
-+	case 525:
-+		if (crtc_state->adjusted_mode.crtc_vdisplay < 1 ||
-+		    crtc_state->adjusted_mode.crtc_vdisplay > 253 ||
-+		    crtc_state->adjusted_mode.crtc_vsync_start -
-+			    crtc_state->adjusted_mode.crtc_vdisplay < 1 ||
-+		    crtc_state->adjusted_mode.crtc_vsync_end -
-+			    crtc_state->adjusted_mode.crtc_vsync_start != 3 ||
-+		    crtc_state->adjusted_mode.crtc_vtotal -
-+			    crtc_state->adjusted_mode.crtc_vsync_end < 4 ||
-+		    crtc_state->adjusted_mode.crtc_vtotal > 262)
-+			return -EINVAL;
-+
-+		if ((crtc_state->adjusted_mode.flags &
-+		     DRM_MODE_FLAG_INTERLACE) &&
-+		    (crtc_state->adjusted_mode.vdisplay % 2 != 0 ||
-+		     crtc_state->adjusted_mode.vsync_start % 2 != 1 ||
-+		     crtc_state->adjusted_mode.vsync_end % 2 != 1 ||
-+		     crtc_state->adjusted_mode.vtotal % 2 != 1))
-+			return -EINVAL;
-+
-+		/* progressive mode is hard-wired to 262 total lines */
-+		if (!(crtc_state->adjusted_mode.flags &
-+		      DRM_MODE_FLAG_INTERLACE) &&
-+		    crtc_state->adjusted_mode.crtc_vtotal != 262)
-+			return -EINVAL;
-+
-+		break;
-+
-+	case 625:
-+		if (crtc_state->adjusted_mode.crtc_vdisplay < 1 ||
-+		    crtc_state->adjusted_mode.crtc_vdisplay > 305 ||
-+		    crtc_state->adjusted_mode.crtc_vsync_start -
-+			    crtc_state->adjusted_mode.crtc_vdisplay < 1 ||
-+		    crtc_state->adjusted_mode.crtc_vsync_end -
-+			    crtc_state->adjusted_mode.crtc_vsync_start != 3 ||
-+		    crtc_state->adjusted_mode.crtc_vtotal -
-+			    crtc_state->adjusted_mode.crtc_vsync_end < 2 ||
-+		    crtc_state->adjusted_mode.crtc_vtotal > 312)
-+			return -EINVAL;
-+
-+		if ((crtc_state->adjusted_mode.flags &
-+		     DRM_MODE_FLAG_INTERLACE) &&
-+		    (crtc_state->adjusted_mode.vdisplay % 2 != 0 ||
-+		     crtc_state->adjusted_mode.vsync_start % 2 != 0 ||
-+		     crtc_state->adjusted_mode.vsync_end % 2 != 0 ||
-+		     crtc_state->adjusted_mode.vtotal % 2 != 1))
-+			return -EINVAL;
-+
-+		/* progressive mode is hard-wired to 312 total lines */
-+		if (!(crtc_state->adjusted_mode.flags &
-+		      DRM_MODE_FLAG_INTERLACE) &&
-+		    crtc_state->adjusted_mode.crtc_vtotal != 312)
-+			return -EINVAL;
-+
-+		break;
-+
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
- 
- static const struct drm_encoder_helper_funcs vc4_vec_encoder_helper_funcs = {
-+	.atomic_check = vc4_vec_encoder_atomic_check,
- 	.atomic_disable = vc4_vec_encoder_disable,
- 	.atomic_enable = vc4_vec_encoder_enable,
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0016-drm-vc4-Make-VEC-progressive-modes-readily-accessibl.patch b/target/linux/bcm27xx/patches-6.1/950-0016-drm-vc4-Make-VEC-progressive-modes-readily-accessibl.patch
deleted file mode 100644
index 43eab7edda..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0016-drm-vc4-Make-VEC-progressive-modes-readily-accessibl.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-From bfd6f67af0450e29378d390386210ac91c5dcfce Mon Sep 17 00:00:00 2001
-From: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
-Date: Thu, 15 Jul 2021 01:08:11 +0200
-Subject: [PATCH] drm/vc4: Make VEC progressive modes readily
- accessible
-
-Add predefined modelines for the 240p (NTSC) and 288p (PAL) progressive
-modes, and report them through vc4_vec_connector_get_modes().
-
-Signed-off-by: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
----
- drivers/gpu/drm/vc4/vc4_vec.c | 73 ++++++++++++++++++++++++++---------
- 1 file changed, 55 insertions(+), 18 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_vec.c
-+++ b/drivers/gpu/drm/vc4/vc4_vec.c
-@@ -228,7 +228,8 @@ enum vc4_vec_tv_mode_id {
- };
- 
- struct vc4_vec_tv_mode {
--	const struct drm_display_mode *mode;
-+	const struct drm_display_mode *interlaced_mode;
-+	const struct drm_display_mode *progressive_mode;
- 	u32 config0;
- 	u32 config1;
- 	u32 custom_freq;
-@@ -262,61 +263,81 @@ static const struct debugfs_reg32 vec_re
- };
- 
- static const struct drm_display_mode drm_mode_480i = {
--	DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 13500,
-+	DRM_MODE("720x480i", DRM_MODE_TYPE_DRIVER, 13500,
- 		 720, 720 + 14, 720 + 14 + 64, 720 + 14 + 64 + 60, 0,
- 		 480, 480 + 7, 480 + 7 + 6, 525, 0,
- 		 DRM_MODE_FLAG_INTERLACE)
- };
- 
-+static const struct drm_display_mode drm_mode_240p = {
-+	DRM_MODE("720x240", DRM_MODE_TYPE_DRIVER, 13500,
-+		 720, 720 + 14, 720 + 14 + 64, 720 + 14 + 64 + 60, 0,
-+		 240, 240 + 3, 240 + 3 + 3, 262, 0, 0)
-+};
-+
- static const struct drm_display_mode drm_mode_576i = {
--	DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 13500,
-+	DRM_MODE("720x576i", DRM_MODE_TYPE_DRIVER, 13500,
- 		 720, 720 + 20, 720 + 20 + 64, 720 + 20 + 64 + 60, 0,
- 		 576, 576 + 4, 576 + 4 + 6, 625, 0,
- 		 DRM_MODE_FLAG_INTERLACE)
- };
- 
-+static const struct drm_display_mode drm_mode_288p = {
-+	DRM_MODE("720x288", DRM_MODE_TYPE_DRIVER, 13500,
-+		 720, 720 + 20, 720 + 20 + 64, 720 + 20 + 64 + 60, 0,
-+		 288, 288 + 2, 288 + 2 + 3, 312, 0, 0)
-+};
-+
- static const struct vc4_vec_tv_mode vc4_vec_tv_modes[] = {
- 	[VC4_VEC_TV_MODE_NTSC] = {
--		.mode = &drm_mode_480i,
-+		.interlaced_mode = &drm_mode_480i,
-+		.progressive_mode = &drm_mode_240p,
- 		.config0 = VEC_CONFIG0_NTSC_STD | VEC_CONFIG0_PDEN,
- 		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
- 	},
- 	[VC4_VEC_TV_MODE_NTSC_J] = {
--		.mode = &drm_mode_480i,
-+		.interlaced_mode = &drm_mode_480i,
-+		.progressive_mode = &drm_mode_240p,
- 		.config0 = VEC_CONFIG0_NTSC_STD,
- 		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
- 	},
- 	[VC4_VEC_TV_MODE_NTSC_443] = {
- 		/* NTSC with PAL chroma frequency */
--		.mode = &drm_mode_480i,
-+		.interlaced_mode = &drm_mode_480i,
-+		.progressive_mode = &drm_mode_240p,
- 		.config0 = VEC_CONFIG0_NTSC_STD,
- 		.config1 = VEC_CONFIG1_C_CVBS_CVBS | VEC_CONFIG1_CUSTOM_FREQ,
- 		.custom_freq = 0x2a098acb,
- 	},
- 	[VC4_VEC_TV_MODE_PAL] = {
--		.mode = &drm_mode_576i,
-+		.interlaced_mode = &drm_mode_576i,
-+		.progressive_mode = &drm_mode_288p,
- 		.config0 = VEC_CONFIG0_PAL_BDGHI_STD,
- 		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
- 	},
- 	[VC4_VEC_TV_MODE_PAL_M] = {
--		.mode = &drm_mode_480i,
-+		.interlaced_mode = &drm_mode_480i,
-+		.progressive_mode = &drm_mode_240p,
- 		.config0 = VEC_CONFIG0_PAL_M_STD,
- 		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
- 	},
- 	[VC4_VEC_TV_MODE_PAL_N] = {
--		.mode = &drm_mode_576i,
-+		.interlaced_mode = &drm_mode_576i,
-+		.progressive_mode = &drm_mode_288p,
- 		.config0 = VEC_CONFIG0_PAL_N_STD,
- 		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
- 	},
- 	[VC4_VEC_TV_MODE_PAL60] = {
- 		/* PAL-M with chroma frequency of regular PAL */
--		.mode = &drm_mode_480i,
-+		.interlaced_mode = &drm_mode_480i,
-+		.progressive_mode = &drm_mode_240p,
- 		.config0 = VEC_CONFIG0_PAL_M_STD,
- 		.config1 = VEC_CONFIG1_C_CVBS_CVBS | VEC_CONFIG1_CUSTOM_FREQ,
- 		.custom_freq = 0x2a098acb,
- 	},
- 	[VC4_VEC_TV_MODE_SECAM] = {
--		.mode = &drm_mode_576i,
-+		.interlaced_mode = &drm_mode_576i,
-+		.progressive_mode = &drm_mode_288p,
- 		.config0 = VEC_CONFIG0_SECAM_STD,
- 		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
- 		.custom_freq = 0x29c71c72,
-@@ -370,16 +391,32 @@ vc4_vec_connector_detect(struct drm_conn
- static int vc4_vec_connector_get_modes(struct drm_connector *connector)
- {
- 	struct drm_connector_state *state = connector->state;
--	struct drm_display_mode *mode;
-+	struct drm_display_mode *interlaced_mode, *progressive_mode;
- 
--	mode = drm_mode_duplicate(connector->dev,
--				  vc4_vec_tv_modes[state->tv.mode].mode);
--	if (!mode) {
-+	interlaced_mode =
-+		drm_mode_duplicate(connector->dev,
-+				   vc4_vec_tv_modes[state->tv.mode].interlaced_mode);
-+	progressive_mode =
-+		drm_mode_duplicate(connector->dev,
-+				   vc4_vec_tv_modes[state->tv.mode].progressive_mode);
-+	if (!interlaced_mode || !progressive_mode) {
- 		DRM_ERROR("Failed to create a new display mode\n");
-+		drm_mode_destroy(connector->dev, interlaced_mode);
-+		drm_mode_destroy(connector->dev, progressive_mode);
- 		return -ENOMEM;
- 	}
- 
--	drm_mode_probed_add(connector, mode);
-+	if (connector->cmdline_mode.specified &&
-+	    connector->cmdline_mode.refresh_specified &&
-+	    !connector->cmdline_mode.interlace)
-+		/* progressive mode set at boot, let's make it preferred */
-+		progressive_mode->type |= DRM_MODE_TYPE_PREFERRED;
-+	else
-+		/* otherwise, interlaced mode is preferred */
-+		interlaced_mode->type |= DRM_MODE_TYPE_PREFERRED;
-+
-+	drm_mode_probed_add(connector, interlaced_mode);
-+	drm_mode_probed_add(connector, progressive_mode);
- 
- 	return 1;
- }
-@@ -576,7 +613,7 @@ static int vc4_vec_encoder_atomic_check(
- 					struct drm_connector_state *conn_state)
- {
- 	const struct drm_display_mode *reference_mode =
--		vc4_vec_tv_modes[conn_state->tv.mode].mode;
-+		vc4_vec_tv_modes[conn_state->tv.mode].interlaced_mode;
- 
- 	if (crtc_state->adjusted_mode.crtc_clock != reference_mode->clock ||
- 	    crtc_state->adjusted_mode.crtc_htotal != reference_mode->htotal ||
diff --git a/target/linux/bcm27xx/patches-6.1/950-0017-drm-Check-whether-the-gamma-lut-has-changed-before-u.patch b/target/linux/bcm27xx/patches-6.1/950-0017-drm-Check-whether-the-gamma-lut-has-changed-before-u.patch
deleted file mode 100644
index c5b06b4442..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0017-drm-Check-whether-the-gamma-lut-has-changed-before-u.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 39a1d2daa0440779a0790ca32543f30220b451da Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 2 Nov 2021 16:01:36 +0000
-Subject: [PATCH] drm: Check whether the gamma lut has changed before
- updating
-
-drm_crtc_legacy_gamma_set updates the gamma_lut blob unconditionally,
-which leads to unnecessary reprogramming of hardware.
-
-Check whether the blob contents has actually changed before
-signalling that it has been updated.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/drm_color_mgmt.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/drm_color_mgmt.c
-+++ b/drivers/gpu/drm/drm_color_mgmt.c
-@@ -330,7 +330,9 @@ static int drm_crtc_legacy_gamma_set(str
- 	replaced = drm_property_replace_blob(&crtc_state->degamma_lut,
- 					     use_gamma_lut ? NULL : blob);
- 	replaced |= drm_property_replace_blob(&crtc_state->ctm, NULL);
--	replaced |= drm_property_replace_blob(&crtc_state->gamma_lut,
-+	if (!crtc_state->gamma_lut || !crtc_state->gamma_lut->data ||
-+	    memcmp(crtc_state->gamma_lut->data, blob_data, blob->length))
-+		replaced |= drm_property_replace_blob(&crtc_state->gamma_lut,
- 					      use_gamma_lut ? blob : NULL);
- 	crtc_state->color_mgmt_changed |= replaced;
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0018-drm-vc4-Enable-gamma-block-only-when-required.patch b/target/linux/bcm27xx/patches-6.1/950-0018-drm-vc4-Enable-gamma-block-only-when-required.patch
deleted file mode 100644
index 0a49472ddb..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0018-drm-vc4-Enable-gamma-block-only-when-required.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 23c8491ac23b95c0557fc398f338ecc62393cf53 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Mon, 8 Nov 2021 17:32:45 +0000
-Subject: [PATCH] drm/vc4: Enable gamma block only when required.
-
-With HVS5 the gamma block is now only reprogrammed with
-a disable/enable. Loading the table from vc4_hvs_init_channel
-(called from vc4_hvs_atomic_enable) appears to be at an
-invalid point in time and so isn't applied.
-
-Switch to enabling and disabling the gamma table instead. This
-isn't safe if the pipeline is running, but it isn't now.
-For HVS4 it is safe to enable and disable dynamically, so
-adopt that approach there too.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_hvs.c | 22 ++++++++++++++++------
- 1 file changed, 16 insertions(+), 6 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -546,8 +546,11 @@ static int vc4_hvs_init_channel(struct v
- 	dispbkgndx &= ~SCALER_DISPBKGND_GAMMA;
- 	dispbkgndx &= ~SCALER_DISPBKGND_INTERLACE;
- 
-+	if (crtc->state->gamma_lut)
-+		/* Enable gamma on if required */
-+		dispbkgndx |= SCALER_DISPBKGND_GAMMA;
-+
- 	HVS_WRITE(SCALER_DISPBKGNDX(chan), dispbkgndx |
--		  ((!vc4->is_vc5) ? SCALER_DISPBKGND_GAMMA : 0) |
- 		  (interlace ? SCALER_DISPBKGND_INTERLACE : 0));
- 
- 	/* Reload the LUT, since the SRAMs would have been disabled if
-@@ -816,18 +819,25 @@ void vc4_hvs_atomic_flush(struct drm_crt
- 		u32 dispbkgndx = HVS_READ(SCALER_DISPBKGNDX(channel));
- 
- 		if (crtc->state->gamma_lut) {
--			if (!vc4->is_vc5)
-+			if (!vc4->is_vc5) {
- 				vc4_hvs_update_gamma_lut(hvs, vc4_crtc);
--			else
-+				dispbkgndx |= SCALER_DISPBKGND_GAMMA;
-+			} else {
- 				vc5_hvs_update_gamma_lut(hvs, vc4_crtc);
--
--			dispbkgndx |= SCALER_DISPBKGND_GAMMA;
-+			}
- 		} else {
- 			/* Unsetting DISPBKGND_GAMMA skips the gamma lut step
- 			 * in hardware, which is the same as a linear lut that
- 			 * DRM expects us to use in absence of a user lut.
-+			 *
-+			 * Do NOT change state dynamically for hvs5 as it
-+			 * inserts a delay in the pipeline that will cause
-+			 * stalls if enabled/disabled whilst running. The other
-+			 * should already be disabling/enabling the pipeline
-+			 * when gamma changes.
- 			 */
--			dispbkgndx &= ~SCALER_DISPBKGND_GAMMA;
-+			if (!vc4->is_vc5)
-+				dispbkgndx &= ~SCALER_DISPBKGND_GAMMA;
- 		}
- 		HVS_WRITE(SCALER_DISPBKGNDX(channel), dispbkgndx);
- 	}
diff --git a/target/linux/bcm27xx/patches-6.1/950-0019-drm-vc4-Only-add-gamma-properties-once.patch b/target/linux/bcm27xx/patches-6.1/950-0019-drm-vc4-Only-add-gamma-properties-once.patch
deleted file mode 100644
index c817b62877..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0019-drm-vc4-Only-add-gamma-properties-once.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7b997c4910042491c90202df414f0e574a320258 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Mon, 8 Nov 2021 18:25:49 +0000
-Subject: [PATCH] drm/vc4: Only add gamma properties once.
-
-Two calls were made to drm_crtc_enable_color_mgmt to add gamma
-and CTM, however they were both set to add the gamma properties,
-so they ended up added twice.
-
-Fixes: 766cc6b1f7fc "drm/vc4: Add CTM support"
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_crtc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/vc4/vc4_crtc.c
-+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
-@@ -1358,7 +1358,7 @@ int vc4_crtc_init(struct drm_device *drm
- 		/* We support CTM, but only for one CRTC at a time. It's therefore
- 		 * implemented as private driver state in vc4_kms, not here.
- 		 */
--		drm_crtc_enable_color_mgmt(crtc, 0, true, crtc->gamma_size);
-+		drm_crtc_enable_color_mgmt(crtc, 0, true, 0);
- 
- 		/* Initialize the VC4 gamma LUTs */
- 		for (i = 0; i < crtc->gamma_size; i++) {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0020-drm-vc4-Validate-the-size-of-the-gamma_lut.patch b/target/linux/bcm27xx/patches-6.1/950-0020-drm-vc4-Validate-the-size-of-the-gamma_lut.patch
deleted file mode 100644
index 1d4ba76e70..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0020-drm-vc4-Validate-the-size-of-the-gamma_lut.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From fc4d71fb629da4be7fee128bced80b9625acf3bb Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 10 Nov 2021 16:36:12 +0000
-Subject: [PATCH] drm/vc4: Validate the size of the gamma_lut
-
-Add a check to vc4_hvs_gamma_check to ensure a new non-empty
-gamma LUT is of the correct length before accepting it.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_hvs.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -612,6 +612,16 @@ static int vc4_hvs_gamma_check(struct dr
- 	if (!crtc_state->color_mgmt_changed)
- 		return 0;
- 
-+	if (crtc_state->gamma_lut) {
-+		unsigned int len = drm_color_lut_size(crtc_state->gamma_lut);
-+
-+		if (len != crtc->gamma_size) {
-+			DRM_DEBUG_KMS("Invalid LUT size; got %u, expected %u\n",
-+				      len, crtc->gamma_size);
-+			return -EINVAL;
-+		}
-+	}
-+
- 	connector = vc4_get_crtc_connector(crtc, crtc_state);
- 	if (!connector)
- 		return -EINVAL;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0021-drm-vc4-Disable-Gamma-control-on-HVS5-due-to-issues-.patch b/target/linux/bcm27xx/patches-6.1/950-0021-drm-vc4-Disable-Gamma-control-on-HVS5-due-to-issues-.patch
deleted file mode 100644
index 8b443b9d56..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0021-drm-vc4-Disable-Gamma-control-on-HVS5-due-to-issues-.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From bb3a24c168067c1813b9b607b6c44c43a4a889e8 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 13 Jan 2022 11:30:42 +0000
-Subject: [PATCH] drm/vc4: Disable Gamma control on HVS5 due to issues
- writing the table
-
-Still under investigation, but the conditions under which the HVS
-will accept values written to the gamma PWL are not straightforward.
-
-Disable gamma on HVS5 again until it can be resolved to avoid
-gamma being enabled with an incorrect table.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_crtc.c | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_crtc.c
-+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
-@@ -1344,15 +1344,9 @@ int vc4_crtc_init(struct drm_device *drm
- 
- 	if (!vc4->is_vc5) {
- 		drm_mode_crtc_set_gamma_size(crtc, ARRAY_SIZE(vc4_crtc->lut_r));
--	} else {
--		/* This is a lie for hvs5 which uses a 16 point PWL, but it
--		 * allows for something smarter than just 16 linearly spaced
--		 * segments. Conversion is done in vc5_hvs_update_gamma_lut.
--		 */
--		drm_mode_crtc_set_gamma_size(crtc, 256);
-+		drm_crtc_enable_color_mgmt(crtc, 0, false, crtc->gamma_size);
- 	}
- 
--	drm_crtc_enable_color_mgmt(crtc, 0, false, crtc->gamma_size);
- 
- 	if (!vc4->is_vc5) {
- 		/* We support CTM, but only for one CRTC at a time. It's therefore
diff --git a/target/linux/bcm27xx/patches-6.1/950-0022-drm-vc4_hdmi-Add-Broadcast-RGB-property-to-allow-ove.patch b/target/linux/bcm27xx/patches-6.1/950-0022-drm-vc4_hdmi-Add-Broadcast-RGB-property-to-allow-ove.patch
deleted file mode 100644
index 60a96ca8e4..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0022-drm-vc4_hdmi-Add-Broadcast-RGB-property-to-allow-ove.patch
+++ /dev/null
@@ -1,223 +0,0 @@
-From b975642ea1ebaf66f6ed0ac403dfa82fa9d0e206 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 8 Apr 2020 16:12:02 +0100
-Subject: [PATCH] drm/vc4_hdmi: Add Broadcast RGB property to allow
- override of RGB range
-
-Copy Intel's "Broadcast RGB" property semantics to add manual override
-of the HDMI pixel range for monitors that don't abide by the content
-of the AVI Infoframe.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_hdmi.c | 104 +++++++++++++++++++++++++++++++++
- drivers/gpu/drm/vc4/vc4_hdmi.h |  15 +++++
- 2 files changed, 119 insertions(+)
-
---- a/drivers/gpu/drm/vc4/vc4_hdmi.c
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -57,6 +57,14 @@
- #include "vc4_hdmi_regs.h"
- #include "vc4_regs.h"
- 
-+/*
-+ * "Broadcast RGB" property.
-+ * Allows overriding of HDMI full or limited range RGB
-+ */
-+#define VC4_BROADCAST_RGB_AUTO 0
-+#define VC4_BROADCAST_RGB_FULL 1
-+#define VC4_BROADCAST_RGB_LIMITED 2
-+
- #define VC5_HDMI_HORZA_HFP_SHIFT		16
- #define VC5_HDMI_HORZA_HFP_MASK			VC4_MASK(28, 16)
- #define VC5_HDMI_HORZA_VPOS			BIT(15)
-@@ -155,6 +163,11 @@ static bool vc4_hdmi_is_full_range_rgb(s
- {
- 	struct drm_display_info *display = &vc4_hdmi->connector.display_info;
- 
-+	if (vc4_hdmi->broadcast_rgb == VC4_BROADCAST_RGB_LIMITED)
-+		return false;
-+	else if (vc4_hdmi->broadcast_rgb == VC4_BROADCAST_RGB_FULL)
-+		return true;
-+
- 	return !display->is_hdmi ||
- 		drm_default_rgb_quant_range(mode) == HDMI_QUANTIZATION_RANGE_FULL;
- }
-@@ -544,6 +557,65 @@ static int vc4_hdmi_connector_atomic_che
- 	return 0;
- }
- 
-+/**
-+ * vc4_hdmi_connector_atomic_get_property - hook for
-+ *						connector->atomic_get_property.
-+ * @connector: Connector to get the property for.
-+ * @state: Connector state to retrieve the property from.
-+ * @property: Property to retrieve.
-+ * @val: Return value for the property.
-+ *
-+ * Returns the atomic property value for a digital connector.
-+ */
-+int vc4_hdmi_connector_get_property(struct drm_connector *connector,
-+				    const struct drm_connector_state *state,
-+				    struct drm_property *property,
-+				    uint64_t *val)
-+{
-+	struct vc4_hdmi *vc4_hdmi = connector_to_vc4_hdmi(connector);
-+	const struct vc4_hdmi_connector_state *vc4_conn_state =
-+				const_conn_state_to_vc4_hdmi_conn_state(state);
-+
-+	if (property == vc4_hdmi->broadcast_rgb_property) {
-+		*val = vc4_conn_state->broadcast_rgb;
-+	} else {
-+		DRM_DEBUG_ATOMIC("Unknown property [PROP:%d:%s]\n",
-+				 property->base.id, property->name);
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
-+
-+/**
-+ * vc4_hdmi_connector_atomic_set_property - hook for
-+ *						connector->atomic_set_property.
-+ * @connector: Connector to set the property for.
-+ * @state: Connector state to set the property on.
-+ * @property: Property to set.
-+ * @val: New value for the property.
-+ *
-+ * Sets the atomic property value for a digital connector.
-+ */
-+int vc4_hdmi_connector_set_property(struct drm_connector *connector,
-+				    struct drm_connector_state *state,
-+				    struct drm_property *property,
-+				    uint64_t val)
-+{
-+	struct vc4_hdmi *vc4_hdmi = connector_to_vc4_hdmi(connector);
-+	struct vc4_hdmi_connector_state *vc4_conn_state =
-+				conn_state_to_vc4_hdmi_conn_state(state);
-+
-+	if (property == vc4_hdmi->broadcast_rgb_property) {
-+		vc4_conn_state->broadcast_rgb = val;
-+		return 0;
-+	}
-+
-+	DRM_DEBUG_ATOMIC("Unknown property [PROP:%d:%s]\n",
-+			 property->base.id, property->name);
-+	return -EINVAL;
-+}
-+
- static void vc4_hdmi_connector_reset(struct drm_connector *connector)
- {
- 	struct vc4_hdmi_connector_state *old_state =
-@@ -580,6 +652,7 @@ vc4_hdmi_connector_duplicate_state(struc
- 	new_state->tmds_char_rate = vc4_state->tmds_char_rate;
- 	new_state->output_bpc = vc4_state->output_bpc;
- 	new_state->output_format = vc4_state->output_format;
-+	new_state->broadcast_rgb = vc4_state->broadcast_rgb;
- 	__drm_atomic_helper_connector_duplicate_state(connector, &new_state->base);
- 
- 	return &new_state->base;
-@@ -590,6 +663,8 @@ static const struct drm_connector_funcs
- 	.reset = vc4_hdmi_connector_reset,
- 	.atomic_duplicate_state = vc4_hdmi_connector_duplicate_state,
- 	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
-+	.atomic_get_property = vc4_hdmi_connector_get_property,
-+	.atomic_set_property = vc4_hdmi_connector_set_property,
- };
- 
- static const struct drm_connector_helper_funcs vc4_hdmi_connector_helper_funcs = {
-@@ -598,6 +673,32 @@ static const struct drm_connector_helper
- 	.atomic_check = vc4_hdmi_connector_atomic_check,
- };
- 
-+static const struct drm_prop_enum_list broadcast_rgb_names[] = {
-+	{ VC4_BROADCAST_RGB_AUTO, "Automatic" },
-+	{ VC4_BROADCAST_RGB_FULL, "Full" },
-+	{ VC4_BROADCAST_RGB_LIMITED, "Limited 16:235" },
-+};
-+
-+static void
-+vc4_hdmi_attach_broadcast_rgb_property(struct drm_device *dev,
-+				       struct vc4_hdmi *vc4_hdmi)
-+{
-+	struct drm_property *prop = vc4_hdmi->broadcast_rgb_property;
-+
-+	if (!prop) {
-+		prop = drm_property_create_enum(dev, DRM_MODE_PROP_ENUM,
-+						"Broadcast RGB",
-+						broadcast_rgb_names,
-+						ARRAY_SIZE(broadcast_rgb_names));
-+		if (!prop)
-+			return;
-+
-+		vc4_hdmi->broadcast_rgb_property = prop;
-+	}
-+
-+	drm_object_attach_property(&vc4_hdmi->connector.base, prop, 0);
-+}
-+
- static int vc4_hdmi_connector_init(struct drm_device *dev,
- 				   struct vc4_hdmi *vc4_hdmi)
- {
-@@ -644,6 +745,8 @@ static int vc4_hdmi_connector_init(struc
- 	if (vc4_hdmi->variant->supports_hdr)
- 		drm_connector_attach_hdr_output_metadata_property(connector);
- 
-+	vc4_hdmi_attach_broadcast_rgb_property(dev, vc4_hdmi);
-+
- 	drm_connector_attach_encoder(connector, encoder);
- 
- 	return 0;
-@@ -1683,6 +1786,7 @@ static void vc4_hdmi_encoder_atomic_mode
- 	mutex_lock(&vc4_hdmi->mutex);
- 	drm_mode_copy(&vc4_hdmi->saved_adjusted_mode,
- 		      &crtc_state->adjusted_mode);
-+	vc4_hdmi->broadcast_rgb = vc4_state->broadcast_rgb;
- 	vc4_hdmi->output_bpc = vc4_state->output_bpc;
- 	vc4_hdmi->output_format = vc4_state->output_format;
- 	mutex_unlock(&vc4_hdmi->mutex);
---- a/drivers/gpu/drm/vc4/vc4_hdmi.h
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
-@@ -129,6 +129,8 @@ struct vc4_hdmi {
- 
- 	struct delayed_work scrambling_work;
- 
-+	struct drm_property *broadcast_rgb_property;
-+
- 	struct i2c_adapter *ddc;
- 	void __iomem *hdmicore_regs;
- 	void __iomem *hd_regs;
-@@ -229,6 +231,12 @@ struct vc4_hdmi {
- 	 * for use outside of KMS hooks. Protected by @mutex.
- 	 */
- 	enum vc4_hdmi_output_format output_format;
-+
-+	/**
-+	 * @broadcast_rgb: Copy of @vc4_connector_state.broadcast_rgb
-+	 * for use outside of KMS hooks. Protected by @mutex.
-+	 */
-+	int broadcast_rgb;
- };
- 
- static inline struct vc4_hdmi *
-@@ -249,6 +257,7 @@ struct vc4_hdmi_connector_state {
- 	unsigned long long		tmds_char_rate;
- 	unsigned int 			output_bpc;
- 	enum vc4_hdmi_output_format	output_format;
-+	int				broadcast_rgb;
- };
- 
- static inline struct vc4_hdmi_connector_state *
-@@ -256,6 +265,12 @@ conn_state_to_vc4_hdmi_conn_state(struct
- {
- 	return container_of(conn_state, struct vc4_hdmi_connector_state, base);
- }
-+
-+static inline const struct vc4_hdmi_connector_state *
-+const_conn_state_to_vc4_hdmi_conn_state(const struct drm_connector_state *conn_state)
-+{
-+	return container_of(conn_state, struct vc4_hdmi_connector_state, base);
-+}
- 
- void vc4_hdmi_phy_init(struct vc4_hdmi *vc4_hdmi,
- 		       struct vc4_hdmi_connector_state *vc4_conn_state);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0023-drm-vc4-Add-DRM-210101010-RGB-formats-for-hvs5.patch b/target/linux/bcm27xx/patches-6.1/950-0023-drm-vc4-Add-DRM-210101010-RGB-formats-for-hvs5.patch
deleted file mode 100644
index 3d66af6e88..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0023-drm-vc4-Add-DRM-210101010-RGB-formats-for-hvs5.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 496704e90c065015a808fc31356c7aecc5bfeccd Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Mon, 31 Jan 2022 16:28:43 +0000
-Subject: [PATCH] drm/vc4: Add DRM 210101010 RGB formats for hvs5.
-
-HVS5 supports the 210101010 RGB[A|X] formats, but they were
-missing from the DRM to HVS mapping list, so weren't available.
-Add them in.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_plane.c | 28 ++++++++++++++++++++++++++++
- 1 file changed, 28 insertions(+)
-
---- a/drivers/gpu/drm/vc4/vc4_plane.c
-+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -139,6 +139,34 @@ static const struct hvs_format {
- 		.pixel_order = HVS_PIXEL_ORDER_XYCBCR,
- 		.hvs5_only = true,
- 	},
-+	{
-+		.drm = DRM_FORMAT_XRGB2101010,
-+		.hvs = HVS_PIXEL_FORMAT_RGBA1010102,
-+		.pixel_order = HVS_PIXEL_ORDER_ABGR,
-+		.pixel_order_hvs5 = HVS_PIXEL_ORDER_ARGB,
-+		.hvs5_only = true,
-+	},
-+	{
-+		.drm = DRM_FORMAT_ARGB2101010,
-+		.hvs = HVS_PIXEL_FORMAT_RGBA1010102,
-+		.pixel_order = HVS_PIXEL_ORDER_ABGR,
-+		.pixel_order_hvs5 = HVS_PIXEL_ORDER_ARGB,
-+		.hvs5_only = true,
-+	},
-+	{
-+		.drm = DRM_FORMAT_ABGR2101010,
-+		.hvs = HVS_PIXEL_FORMAT_RGBA1010102,
-+		.pixel_order = HVS_PIXEL_ORDER_ARGB,
-+		.pixel_order_hvs5 = HVS_PIXEL_ORDER_ABGR,
-+		.hvs5_only = true,
-+	},
-+	{
-+		.drm = DRM_FORMAT_XBGR2101010,
-+		.hvs = HVS_PIXEL_FORMAT_RGBA1010102,
-+		.pixel_order = HVS_PIXEL_ORDER_ARGB,
-+		.pixel_order_hvs5 = HVS_PIXEL_ORDER_ABGR,
-+		.hvs5_only = true,
-+	},
- };
- 
- static const struct hvs_format *vc4_get_hvs_format(u32 drm_format)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0024-drm-vc4-dpi-Support-DPI-interface-in-mode3-for-RGB56.patch b/target/linux/bcm27xx/patches-6.1/950-0024-drm-vc4-dpi-Support-DPI-interface-in-mode3-for-RGB56.patch
deleted file mode 100644
index 2142cf58ce..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0024-drm-vc4-dpi-Support-DPI-interface-in-mode3-for-RGB56.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1c22021723d142524d744f6e2a6d81fc39b1b366 Mon Sep 17 00:00:00 2001
-From: Chris Morgan <macromorgan@hotmail.com>
-Date: Fri, 28 Jan 2022 17:39:54 -0600
-Subject: [PATCH] drm/vc4: dpi: Support DPI interface in mode3 for
- RGB565
-
-Add support for the VC4 DPI driver to utilize DPI mode 3. This is
-defined here as xxxRRRRRxxGGGGGGxxxBBBBB:
-https://www.raspberrypi.com/documentation/computers/raspberry-pi.html#parallel-display-interface-dpi
-
-This mode is required to use the Geekworm MZP280 DPI display.
-
-Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
-Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_dpi.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/gpu/drm/vc4/vc4_dpi.c
-+++ b/drivers/gpu/drm/vc4/vc4_dpi.c
-@@ -188,6 +188,10 @@ static void vc4_dpi_encoder_enable(struc
- 				dpi_c |= VC4_SET_FIELD(DPI_FORMAT_16BIT_565_RGB_1,
- 						       DPI_FORMAT);
- 				break;
-+			case MEDIA_BUS_FMT_RGB565_1X24_CPADHI:
-+				dpi_c |= VC4_SET_FIELD(DPI_FORMAT_16BIT_565_RGB_2,
-+						       DPI_FORMAT);
-+				break;
- 			default:
- 				DRM_ERROR("Unknown media bus format %d\n",
- 					  bus_format);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0025-drm-panel-Add-and-initialise-an-orientation-field-to.patch b/target/linux/bcm27xx/patches-6.1/950-0025-drm-panel-Add-and-initialise-an-orientation-field-to.patch
deleted file mode 100644
index 67c1e18266..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0025-drm-panel-Add-and-initialise-an-orientation-field-to.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 49d74639d19ec3ae9810a1d6ae6c0ff725c75881 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 1 Feb 2022 12:20:20 +0000
-Subject: [PATCH] drm/panel: Add and initialise an orientation field to
- drm_panel
-
-Current usage of drm_connector_set_panel_orientation is from a panel's
-get_modes call. However if the panel orientation property doesn't
-exist on the connector at this point, then drm_mode_object triggers
-WARNs as the connector is already registered.
-
-Add an orientation variable to struct drm_panel and initialise it from
-drm_panel_init.
-panel_bridge_attach can then create the property before the connector
-is registered.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/bridge/panel.c |  4 ++++
- drivers/gpu/drm/drm_panel.c    | 15 ++++++++++-----
- include/drm/drm_panel.h        |  8 ++++++++
- 3 files changed, 22 insertions(+), 5 deletions(-)
-
---- a/drivers/gpu/drm/bridge/panel.c
-+++ b/drivers/gpu/drm/bridge/panel.c
-@@ -81,6 +81,10 @@ static int panel_bridge_attach(struct dr
- 		return ret;
- 	}
- 
-+	/* set up connector's "panel orientation" property */
-+	drm_connector_set_panel_orientation(&panel_bridge->connector,
-+					    panel_bridge->panel->orientation);
-+
- 	drm_connector_attach_encoder(&panel_bridge->connector,
- 					  bridge->encoder);
- 
---- a/drivers/gpu/drm/drm_panel.c
-+++ b/drivers/gpu/drm/drm_panel.c
-@@ -61,6 +61,9 @@ void drm_panel_init(struct drm_panel *pa
- 	panel->dev = dev;
- 	panel->funcs = funcs;
- 	panel->connector_type = connector_type;
-+
-+	panel->orientation = DRM_MODE_PANEL_ORIENTATION_UNKNOWN;
-+	of_drm_get_panel_orientation(dev->of_node, &panel->orientation);
- }
- EXPORT_SYMBOL(drm_panel_init);
- 
-@@ -294,16 +297,18 @@ int of_drm_get_panel_orientation(const s
- 	if (ret < 0)
- 		return ret;
- 
--	if (rotation == 0)
-+	if (rotation == 0) {
- 		*orientation = DRM_MODE_PANEL_ORIENTATION_NORMAL;
--	else if (rotation == 90)
-+	} else if (rotation == 90) {
- 		*orientation = DRM_MODE_PANEL_ORIENTATION_RIGHT_UP;
--	else if (rotation == 180)
-+	} else if (rotation == 180) {
- 		*orientation = DRM_MODE_PANEL_ORIENTATION_BOTTOM_UP;
--	else if (rotation == 270)
-+	} else if (rotation == 270) {
- 		*orientation = DRM_MODE_PANEL_ORIENTATION_LEFT_UP;
--	else
-+	} else {
-+		DRM_ERROR("%pOF: invalid orientation %d\n", np, ret);
- 		return -EINVAL;
-+	}
- 
- 	return 0;
- }
---- a/include/drm/drm_panel.h
-+++ b/include/drm/drm_panel.h
-@@ -183,6 +183,14 @@ struct drm_panel {
- 	int connector_type;
- 
- 	/**
-+	 * @orientation:
-+	 *
-+	 * Panel orientation at initialisation. This is used to initialise the
-+	 * drm_connector property for panel orientation.
-+	 */
-+	enum drm_panel_orientation orientation;
-+
-+	/**
- 	 * @list:
- 	 *
- 	 * Panel entry in registry.
diff --git a/target/linux/bcm27xx/patches-6.1/950-0026-drm-dsi-Document-the-meaning-and-spec-references-for.patch b/target/linux/bcm27xx/patches-6.1/950-0026-drm-dsi-Document-the-meaning-and-spec-references-for.patch
deleted file mode 100644
index a26f56e03e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0026-drm-dsi-Document-the-meaning-and-spec-references-for.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From b99fa92c1ff228cf2d6c6ee02cdc2650fe7bfef1 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 17 Dec 2021 13:36:52 +0000
-Subject: [PATCH] drm/dsi: Document the meaning and spec references for
- MIPI_DSI_MODE_*
-
-The MIPI_DSI_MODE_* flags have fairly terse descriptions and no reference
-to the DSI specification as to their exact meaning. Usage has therefore
-been rather fluid.
-
-Extend the descriptions and provide references to the part of the
-MIPI DSI specification regarding what they mean.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- include/drm/drm_mipi_dsi.h | 38 ++++++++++++++++++++++++++------------
- 1 file changed, 26 insertions(+), 12 deletions(-)
-
---- a/include/drm/drm_mipi_dsi.h
-+++ b/include/drm/drm_mipi_dsi.h
-@@ -113,29 +113,43 @@ struct mipi_dsi_host *of_find_mipi_dsi_h
- 
- /* DSI mode flags */
- 
--/* video mode */
-+/* Video mode display.
-+ * Not set denotes a command mode display.
-+ */
- #define MIPI_DSI_MODE_VIDEO		BIT(0)
--/* video burst mode */
-+/* Video burst mode.
-+ * Link frequency to be configured via platform configuration.
-+ * This should always be set in conjunction with MIPI_DSI_MODE_VIDEO.
-+ * (DSI spec V1.1 8.11.4)
-+ */
- #define MIPI_DSI_MODE_VIDEO_BURST	BIT(1)
--/* video pulse mode */
-+/* Video pulse mode.
-+ * Not set denotes sync event mode. (DSI spec V1.1 8.11.2)
-+ */
- #define MIPI_DSI_MODE_VIDEO_SYNC_PULSE	BIT(2)
--/* enable auto vertical count mode */
-+/* Enable auto vertical count mode */
- #define MIPI_DSI_MODE_VIDEO_AUTO_VERT	BIT(3)
--/* enable hsync-end packets in vsync-pulse and v-porch area */
-+/* Enable hsync-end packets in vsync-pulse and v-porch area */
- #define MIPI_DSI_MODE_VIDEO_HSE		BIT(4)
--/* disable hfront-porch area */
-+/* Transmit NULL packets or LP mode during hfront-porch area.
-+ * Not set denotes sending a blanking packet instead. (DSI spec V1.1 8.11.1)
-+ */
- #define MIPI_DSI_MODE_VIDEO_NO_HFP	BIT(5)
--/* disable hback-porch area */
-+/* Transmit NULL packets or LP mode during hback-porch area.
-+ * Not set denotes sending a blanking packet instead. (DSI spec V1.1 8.11.1)
-+ */
- #define MIPI_DSI_MODE_VIDEO_NO_HBP	BIT(6)
--/* disable hsync-active area */
-+/* Transmit NULL packets or LP mode during hsync-active area.
-+ * Not set denotes sending a blanking packet instead. (DSI spec V1.1 8.11.1)
-+ */
- #define MIPI_DSI_MODE_VIDEO_NO_HSA	BIT(7)
--/* flush display FIFO on vsync pulse */
-+/* Flush display FIFO on vsync pulse */
- #define MIPI_DSI_MODE_VSYNC_FLUSH	BIT(8)
--/* disable EoT packets in HS mode */
-+/* Disable EoT packets in HS mode. (DSI spec V1.1 8.1)  */
- #define MIPI_DSI_MODE_NO_EOT_PACKET	BIT(9)
--/* device supports non-continuous clock behavior (DSI spec 5.6.1) */
-+/* Device supports non-continuous clock behavior (DSI spec V1.1 5.6.1) */
- #define MIPI_DSI_CLOCK_NON_CONTINUOUS	BIT(10)
--/* transmit data in low power */
-+/* Transmit data in low power */
- #define MIPI_DSI_MODE_LPM		BIT(11)
- /* transmit data ending at the same time for all lanes within one hsync */
- #define MIPI_DSI_HS_PKT_END_ALIGNED	BIT(12)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0027-drm-bridge-tc358762-Ignore-EPROBE_DEFER-when-logging.patch b/target/linux/bcm27xx/patches-6.1/950-0027-drm-bridge-tc358762-Ignore-EPROBE_DEFER-when-logging.patch
deleted file mode 100644
index ce9bab645a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0027-drm-bridge-tc358762-Ignore-EPROBE_DEFER-when-logging.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 135340b06a02d3a5ad0b214b3c0d59f6adb79dba Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 20 Jan 2022 17:29:36 +0000
-Subject: [PATCH] drm/bridge: tc358762: Ignore EPROBE_DEFER when
- logging errors
-
-mipi_dsi_attach can fail due to resources not being available
-yet, therefore do not log error messages should they occur.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/bridge/tc358762.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/bridge/tc358762.c
-+++ b/drivers/gpu/drm/bridge/tc358762.c
-@@ -235,7 +235,7 @@ static int tc358762_probe(struct mipi_ds
- 	ret = mipi_dsi_attach(dsi);
- 	if (ret < 0) {
- 		drm_bridge_remove(&ctx->bridge);
--		dev_err(dev, "failed to attach dsi\n");
-+		dev_err_probe(dev, ret, "failed to attach dsi\n");
- 	}
- 
- 	return ret;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0028-drm-vc4-Rename-bridge-to-out_bridge.patch b/target/linux/bcm27xx/patches-6.1/950-0028-drm-vc4-Rename-bridge-to-out_bridge.patch
deleted file mode 100644
index 1ebf4efd51..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0028-drm-vc4-Rename-bridge-to-out_bridge.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From ed34c4192a6189ef27ea4a1958ea843906afbe4d Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 30 Sep 2021 17:51:16 +0100
-Subject: [PATCH] drm/vc4: Rename bridge to out_bridge
-
-In preparation for converting the encoder to being a bridge,
-rename the variable holding the next bridge in the chain to
-out_bridge, so that our bridge can be called bridge.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_dsi.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_dsi.c
-+++ b/drivers/gpu/drm/vc4/vc4_dsi.c
-@@ -556,7 +556,7 @@ struct vc4_dsi {
- 
- 	struct platform_device *pdev;
- 
--	struct drm_bridge *bridge;
-+	struct drm_bridge *out_bridge;
- 	struct list_head bridge_chain;
- 
- 	void __iomem *regs;
-@@ -800,7 +800,7 @@ static void vc4_dsi_encoder_disable(stru
- 		if (iter->funcs->disable)
- 			iter->funcs->disable(iter);
- 
--		if (iter == dsi->bridge)
-+		if (iter == dsi->out_bridge)
- 			break;
- 	}
- 
-@@ -1723,9 +1723,9 @@ static int vc4_dsi_bind(struct device *d
- 		return ret;
- 	}
- 
--	dsi->bridge = drmm_of_get_bridge(drm, dev->of_node, 0, 0);
--	if (IS_ERR(dsi->bridge))
--		return PTR_ERR(dsi->bridge);
-+	dsi->out_bridge = drmm_of_get_bridge(drm, dev->of_node, 0, 0);
-+	if (IS_ERR(dsi->out_bridge))
-+		return PTR_ERR(dsi->out_bridge);
- 
- 	/* The esc clock rate is supposed to always be 100Mhz. */
- 	ret = clk_set_rate(dsi->escape_clock, 100 * 1000000);
-@@ -1751,7 +1751,7 @@ static int vc4_dsi_bind(struct device *d
- 	if (ret)
- 		return ret;
- 
--	ret = drm_bridge_attach(encoder, dsi->bridge, NULL, 0);
-+	ret = drm_bridge_attach(encoder, dsi->out_bridge, NULL, 0);
- 	if (ret)
- 		return ret;
- 	/* Disable the atomic helper calls into the bridge.  We
diff --git a/target/linux/bcm27xx/patches-6.1/950-0029-drm-vc4-Move-DSI-initialisation-to-encoder_mode_set.patch b/target/linux/bcm27xx/patches-6.1/950-0029-drm-vc4-Move-DSI-initialisation-to-encoder_mode_set.patch
deleted file mode 100644
index 9803df95d1..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0029-drm-vc4-Move-DSI-initialisation-to-encoder_mode_set.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 5590c79c417064363236f24ffe40d87d6cfd128e Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Mon, 7 Feb 2022 17:14:51 +0000
-Subject: [PATCH] drm/vc4: Move DSI initialisation to encoder_mode_set.
-
-Breaking the bridge chain does not work for atomic bridges/panels
-and generally causes issues.
-We need to initialise the DSI host before the bridge pre_enables
-are called, so move that to encoder_mode_set in the same way that
-dw-mipi-dsi does.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_dsi.c | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_dsi.c
-+++ b/drivers/gpu/drm/vc4/vc4_dsi.c
-@@ -867,18 +867,18 @@ static bool vc4_dsi_encoder_mode_fixup(s
- 	return true;
- }
- 
--static void vc4_dsi_encoder_enable(struct drm_encoder *encoder)
-+static void vc4_dsi_encoder_mode_set(struct drm_encoder *encoder,
-+				     struct drm_display_mode *mode,
-+				     struct drm_display_mode *adjusted_mode)
- {
--	struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode;
- 	struct vc4_dsi *dsi = to_vc4_dsi(encoder);
- 	struct device *dev = &dsi->pdev->dev;
- 	bool debug_dump_regs = false;
--	struct drm_bridge *iter;
- 	unsigned long hs_clock;
- 	u32 ui_ns;
- 	/* Minimum LP state duration in escape clock cycles. */
- 	u32 lpx = dsi_esc_timing(60);
--	unsigned long pixel_clock_hz = mode->clock * 1000;
-+	unsigned long pixel_clock_hz = adjusted_mode->clock * 1000;
- 	unsigned long dsip_clock;
- 	unsigned long phy_clock;
- 	int ret;
-@@ -1105,6 +1105,14 @@ static void vc4_dsi_encoder_enable(struc
- 		       ~DSI_PORT_BIT(PHY_AFEC0_RESET));
- 
- 	vc4_dsi_ulps(dsi, false);
-+}
-+
-+static void vc4_dsi_encoder_enable(struct drm_encoder *encoder)
-+{
-+	struct vc4_dsi_encoder *vc4_encoder = to_vc4_dsi_encoder(encoder);
-+	struct vc4_dsi *dsi = vc4_encoder->dsi;
-+	bool debug_dump_regs = false;
-+	struct drm_bridge *iter;
- 
- 	list_for_each_entry_reverse(iter, &dsi->bridge_chain, chain_node) {
- 		if (iter->funcs->pre_enable)
-@@ -1370,6 +1378,7 @@ static const struct drm_encoder_helper_f
- 	.disable = vc4_dsi_encoder_disable,
- 	.enable = vc4_dsi_encoder_enable,
- 	.mode_fixup = vc4_dsi_encoder_mode_fixup,
-+	.mode_set = vc4_dsi_encoder_mode_set,
- };
- 
- static int vc4_dsi_late_register(struct drm_encoder *encoder)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0030-drm-vc4-Remove-splitting-the-bridge-chain-from-the-d.patch b/target/linux/bcm27xx/patches-6.1/950-0030-drm-vc4-Remove-splitting-the-bridge-chain-from-the-d.patch
deleted file mode 100644
index 7718e3be81..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0030-drm-vc4-Remove-splitting-the-bridge-chain-from-the-d.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From bd58cbe5c5155279ccd85c29ddef53094cf6dc81 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 15 Dec 2021 17:44:49 +0000
-Subject: [PATCH] drm/vc4: Remove splitting the bridge chain from the
- driver.
-
-Splitting the bridge chain fails for atomic bridges as the
-framework can't add the relevant state in
-drm_atomic_add_encoder_bridges.
-The chain was split because we needed to power up before
-calling pre_enable, but that is now done in mode_set, and will
-move into the framework.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_dsi.c | 47 -----------------------------------
- 1 file changed, 47 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_dsi.c
-+++ b/drivers/gpu/drm/vc4/vc4_dsi.c
-@@ -557,7 +557,6 @@ struct vc4_dsi {
- 	struct platform_device *pdev;
- 
- 	struct drm_bridge *out_bridge;
--	struct list_head bridge_chain;
- 
- 	void __iomem *regs;
- 
-@@ -794,23 +793,9 @@ static void vc4_dsi_encoder_disable(stru
- {
- 	struct vc4_dsi *dsi = to_vc4_dsi(encoder);
- 	struct device *dev = &dsi->pdev->dev;
--	struct drm_bridge *iter;
--
--	list_for_each_entry_reverse(iter, &dsi->bridge_chain, chain_node) {
--		if (iter->funcs->disable)
--			iter->funcs->disable(iter);
--
--		if (iter == dsi->out_bridge)
--			break;
--	}
- 
- 	vc4_dsi_ulps(dsi, true);
- 
--	list_for_each_entry_from(iter, &dsi->bridge_chain, chain_node) {
--		if (iter->funcs->post_disable)
--			iter->funcs->post_disable(iter);
--	}
--
- 	clk_disable_unprepare(dsi->pll_phy_clock);
- 	clk_disable_unprepare(dsi->escape_clock);
- 	clk_disable_unprepare(dsi->pixel_clock);
-@@ -1112,12 +1097,6 @@ static void vc4_dsi_encoder_enable(struc
- 	struct vc4_dsi_encoder *vc4_encoder = to_vc4_dsi_encoder(encoder);
- 	struct vc4_dsi *dsi = vc4_encoder->dsi;
- 	bool debug_dump_regs = false;
--	struct drm_bridge *iter;
--
--	list_for_each_entry_reverse(iter, &dsi->bridge_chain, chain_node) {
--		if (iter->funcs->pre_enable)
--			iter->funcs->pre_enable(iter);
--	}
- 
- 	if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO) {
- 		DSI_PORT_WRITE(DISP0_CTRL,
-@@ -1134,11 +1113,6 @@ static void vc4_dsi_encoder_enable(struc
- 			       DSI_DISP0_ENABLE);
- 	}
- 
--	list_for_each_entry(iter, &dsi->bridge_chain, chain_node) {
--		if (iter->funcs->enable)
--			iter->funcs->enable(iter);
--	}
--
- 	if (debug_dump_regs) {
- 		struct drm_printer p = drm_info_printer(&dsi->pdev->dev);
- 		dev_info(&dsi->pdev->dev, "DSI regs after:\n");
-@@ -1626,7 +1600,6 @@ static int vc4_dsi_bind(struct device *d
- 
- 	dsi->variant = of_device_get_match_data(dev);
- 
--	INIT_LIST_HEAD(&dsi->bridge_chain);
- 	dsi->encoder.type = dsi->variant->port ?
- 		VC4_ENCODER_TYPE_DSI1 : VC4_ENCODER_TYPE_DSI0;
- 
-@@ -1763,32 +1736,12 @@ static int vc4_dsi_bind(struct device *d
- 	ret = drm_bridge_attach(encoder, dsi->out_bridge, NULL, 0);
- 	if (ret)
- 		return ret;
--	/* Disable the atomic helper calls into the bridge.  We
--	 * manually call the bridge pre_enable / enable / etc. calls
--	 * from our driver, since we need to sequence them within the
--	 * encoder's enable/disable paths.
--	 */
--	list_splice_init(&encoder->bridge_chain, &dsi->bridge_chain);
- 
- 	return 0;
- }
- 
--static void vc4_dsi_unbind(struct device *dev, struct device *master,
--			   void *data)
--{
--	struct vc4_dsi *dsi = dev_get_drvdata(dev);
--	struct drm_encoder *encoder = &dsi->encoder.base;
--
--	/*
--	 * Restore the bridge_chain so the bridge detach procedure can happen
--	 * normally.
--	 */
--	list_splice_init(&dsi->bridge_chain, &encoder->bridge_chain);
--}
--
- static const struct component_ops vc4_dsi_ops = {
- 	.bind   = vc4_dsi_bind,
--	.unbind = vc4_dsi_unbind,
- };
- 
- static int vc4_dsi_dev_probe(struct platform_device *pdev)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0031-drm-vc4-Convert-vc4_dsi-to-use-atomic-enable-disable.patch b/target/linux/bcm27xx/patches-6.1/950-0031-drm-vc4-Convert-vc4_dsi-to-use-atomic-enable-disable.patch
deleted file mode 100644
index 2554944748..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0031-drm-vc4-Convert-vc4_dsi-to-use-atomic-enable-disable.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From ab6f22f1747903266a88b73f628eb4f89474c84c Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 15 Dec 2021 17:47:14 +0000
-Subject: [PATCH] drm/vc4: Convert vc4_dsi to use atomic
- enable/disable/mode_set.
-
-The atomic calls are preferred as the non-atomic ones
-are deprecated. In preparation for conversion to a bridge,
-switch to the atomic calls.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_dsi.c | 23 +++++++++++++++--------
- 1 file changed, 15 insertions(+), 8 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_dsi.c
-+++ b/drivers/gpu/drm/vc4/vc4_dsi.c
-@@ -789,7 +789,8 @@ dsi_esc_timing(u32 ns)
- 	return DIV_ROUND_UP(ns, ESC_TIME_NS);
- }
- 
--static void vc4_dsi_encoder_disable(struct drm_encoder *encoder)
-+static void vc4_dsi_encoder_disable(struct drm_encoder *encoder,
-+				    struct drm_atomic_state *state)
- {
- 	struct vc4_dsi *dsi = to_vc4_dsi(encoder);
- 	struct device *dev = &dsi->pdev->dev;
-@@ -853,17 +854,18 @@ static bool vc4_dsi_encoder_mode_fixup(s
- }
- 
- static void vc4_dsi_encoder_mode_set(struct drm_encoder *encoder,
--				     struct drm_display_mode *mode,
--				     struct drm_display_mode *adjusted_mode)
-+				     struct drm_crtc_state *crtc_state,
-+				     struct drm_connector_state *conn_state)
- {
- 	struct vc4_dsi *dsi = to_vc4_dsi(encoder);
- 	struct device *dev = &dsi->pdev->dev;
-+	const struct drm_display_mode *mode;
- 	bool debug_dump_regs = false;
- 	unsigned long hs_clock;
- 	u32 ui_ns;
- 	/* Minimum LP state duration in escape clock cycles. */
- 	u32 lpx = dsi_esc_timing(60);
--	unsigned long pixel_clock_hz = adjusted_mode->clock * 1000;
-+	unsigned long pixel_clock_hz;
- 	unsigned long dsip_clock;
- 	unsigned long phy_clock;
- 	int ret;
-@@ -880,6 +882,10 @@ static void vc4_dsi_encoder_mode_set(str
- 		drm_print_regset32(&p, &dsi->regset);
- 	}
- 
-+	mode = &crtc_state->adjusted_mode;
-+
-+	pixel_clock_hz = mode->clock * 1000;
-+
- 	/* Round up the clk_set_rate() request slightly, since
- 	 * PLLD_DSI1 is an integer divider and its rate selection will
- 	 * never round up.
-@@ -1092,7 +1098,8 @@ static void vc4_dsi_encoder_mode_set(str
- 	vc4_dsi_ulps(dsi, false);
- }
- 
--static void vc4_dsi_encoder_enable(struct drm_encoder *encoder)
-+static void vc4_dsi_encoder_enable(struct drm_encoder *encoder,
-+				   struct drm_atomic_state *state)
- {
- 	struct vc4_dsi_encoder *vc4_encoder = to_vc4_dsi_encoder(encoder);
- 	struct vc4_dsi *dsi = vc4_encoder->dsi;
-@@ -1349,10 +1356,10 @@ static const struct mipi_dsi_host_ops vc
- };
- 
- static const struct drm_encoder_helper_funcs vc4_dsi_encoder_helper_funcs = {
--	.disable = vc4_dsi_encoder_disable,
--	.enable = vc4_dsi_encoder_enable,
-+	.atomic_disable = vc4_dsi_encoder_disable,
-+	.atomic_enable = vc4_dsi_encoder_enable,
- 	.mode_fixup = vc4_dsi_encoder_mode_fixup,
--	.mode_set = vc4_dsi_encoder_mode_set,
-+	.atomic_mode_set = vc4_dsi_encoder_mode_set,
- };
- 
- static int vc4_dsi_late_register(struct drm_encoder *encoder)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0032-drm-vc4-Convert-vc4_dsi-to-using-a-bridge-instead-of.patch b/target/linux/bcm27xx/patches-6.1/950-0032-drm-vc4-Convert-vc4_dsi-to-using-a-bridge-instead-of.patch
deleted file mode 100644
index 480a600e63..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0032-drm-vc4-Convert-vc4_dsi-to-using-a-bridge-instead-of.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-From c0611a36761fb6abf5a806bbfe417db1f4464a56 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 15 Dec 2021 17:57:45 +0000
-Subject: [PATCH] drm/vc4: Convert vc4_dsi to using a bridge instead of
- encoder.
-
-Remove the encoder functions, and create a bridge attached to
-this dumb encoder which implements the same functionality.
-
-As a bridge has state which an encoder doesn't, we need to
-add the state management functions as well.
-
-As there is no bridge atomic_mode_set, move the initialisation
-code that was in mode_set into _pre_enable.
-The code to actually enable and disable sending video are split
-from the general control into _enable and _disable.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_dsi.c | 122 +++++++++++++++++++++++++---------
- 1 file changed, 90 insertions(+), 32 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_dsi.c
-+++ b/drivers/gpu/drm/vc4/vc4_dsi.c
-@@ -557,6 +557,7 @@ struct vc4_dsi {
- 	struct platform_device *pdev;
- 
- 	struct drm_bridge *out_bridge;
-+	struct drm_bridge bridge;
- 
- 	void __iomem *regs;
- 
-@@ -608,6 +609,12 @@ to_vc4_dsi(struct drm_encoder *encoder)
- 	return container_of(encoder, struct vc4_dsi, encoder.base);
- }
- 
-+static inline struct vc4_dsi *
-+bridge_to_vc4_dsi(struct drm_bridge *bridge)
-+{
-+	return container_of(bridge, struct vc4_dsi, bridge);
-+}
-+
- static inline void
- dsi_dma_workaround_write(struct vc4_dsi *dsi, u32 offset, u32 val)
- {
-@@ -789,10 +796,21 @@ dsi_esc_timing(u32 ns)
- 	return DIV_ROUND_UP(ns, ESC_TIME_NS);
- }
- 
--static void vc4_dsi_encoder_disable(struct drm_encoder *encoder,
--				    struct drm_atomic_state *state)
-+static void vc4_dsi_bridge_disable(struct drm_bridge *bridge,
-+				   struct drm_bridge_state *state)
- {
--	struct vc4_dsi *dsi = to_vc4_dsi(encoder);
-+	struct vc4_dsi *dsi = bridge_to_vc4_dsi(bridge);
-+	u32 disp0_ctrl;
-+
-+	disp0_ctrl = DSI_PORT_READ(DISP0_CTRL);
-+	disp0_ctrl &= ~DSI_DISP0_ENABLE;
-+	DSI_PORT_WRITE(DISP0_CTRL, disp0_ctrl);
-+}
-+
-+static void vc4_dsi_bridge_post_disable(struct drm_bridge *bridge,
-+					struct drm_bridge_state *state)
-+{
-+	struct vc4_dsi *dsi = bridge_to_vc4_dsi(bridge);
- 	struct device *dev = &dsi->pdev->dev;
- 
- 	vc4_dsi_ulps(dsi, true);
-@@ -817,11 +835,11 @@ static void vc4_dsi_encoder_disable(stru
-  * higher-than-expected clock rate to the panel, but that's what the
-  * firmware does too.
-  */
--static bool vc4_dsi_encoder_mode_fixup(struct drm_encoder *encoder,
--				       const struct drm_display_mode *mode,
--				       struct drm_display_mode *adjusted_mode)
-+static bool vc4_dsi_bridge_mode_fixup(struct drm_bridge *bridge,
-+				      const struct drm_display_mode *mode,
-+				      struct drm_display_mode *adjusted_mode)
- {
--	struct vc4_dsi *dsi = to_vc4_dsi(encoder);
-+	struct vc4_dsi *dsi = bridge_to_vc4_dsi(bridge);
- 	struct clk *phy_parent = clk_get_parent(dsi->pll_phy_clock);
- 	unsigned long parent_rate = clk_get_rate(phy_parent);
- 	unsigned long pixel_clock_hz = mode->clock * 1000;
-@@ -853,15 +871,18 @@ static bool vc4_dsi_encoder_mode_fixup(s
- 	return true;
- }
- 
--static void vc4_dsi_encoder_mode_set(struct drm_encoder *encoder,
--				     struct drm_crtc_state *crtc_state,
--				     struct drm_connector_state *conn_state)
-+static void vc4_dsi_bridge_pre_enable(struct drm_bridge *bridge,
-+				      struct drm_bridge_state *old_state)
- {
--	struct vc4_dsi *dsi = to_vc4_dsi(encoder);
-+	struct drm_atomic_state *state = old_state->base.state;
-+	struct vc4_dsi *dsi = bridge_to_vc4_dsi(bridge);
-+	const struct drm_crtc_state *crtc_state;
- 	struct device *dev = &dsi->pdev->dev;
- 	const struct drm_display_mode *mode;
-+	struct drm_connector *connector;
- 	bool debug_dump_regs = false;
- 	unsigned long hs_clock;
-+	struct drm_crtc *crtc;
- 	u32 ui_ns;
- 	/* Minimum LP state duration in escape clock cycles. */
- 	u32 lpx = dsi_esc_timing(60);
-@@ -882,6 +903,14 @@ static void vc4_dsi_encoder_mode_set(str
- 		drm_print_regset32(&p, &dsi->regset);
- 	}
- 
-+	/*
-+	 * Retrieve the CRTC adjusted mode. This requires a little dance to go
-+	 * from the bridge to the encoder, to the connector and to the CRTC.
-+	 */
-+	connector = drm_atomic_get_new_connector_for_encoder(state,
-+							     bridge->encoder);
-+	crtc = drm_atomic_get_new_connector_state(state, connector)->crtc;
-+	crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
- 	mode = &crtc_state->adjusted_mode;
- 
- 	pixel_clock_hz = mode->clock * 1000;
-@@ -1096,14 +1125,6 @@ static void vc4_dsi_encoder_mode_set(str
- 		       ~DSI_PORT_BIT(PHY_AFEC0_RESET));
- 
- 	vc4_dsi_ulps(dsi, false);
--}
--
--static void vc4_dsi_encoder_enable(struct drm_encoder *encoder,
--				   struct drm_atomic_state *state)
--{
--	struct vc4_dsi_encoder *vc4_encoder = to_vc4_dsi_encoder(encoder);
--	struct vc4_dsi *dsi = vc4_encoder->dsi;
--	bool debug_dump_regs = false;
- 
- 	if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO) {
- 		DSI_PORT_WRITE(DISP0_CTRL,
-@@ -1112,13 +1133,23 @@ static void vc4_dsi_encoder_enable(struc
- 			       VC4_SET_FIELD(dsi->format, DSI_DISP0_PFORMAT) |
- 			       VC4_SET_FIELD(DSI_DISP0_LP_STOP_PERFRAME,
- 					     DSI_DISP0_LP_STOP_CTRL) |
--			       DSI_DISP0_ST_END |
--			       DSI_DISP0_ENABLE);
-+			       DSI_DISP0_ST_END);
- 	} else {
- 		DSI_PORT_WRITE(DISP0_CTRL,
--			       DSI_DISP0_COMMAND_MODE |
--			       DSI_DISP0_ENABLE);
-+			       DSI_DISP0_COMMAND_MODE);
- 	}
-+}
-+
-+static void vc4_dsi_bridge_enable(struct drm_bridge *bridge,
-+				  struct drm_bridge_state *old_state)
-+{
-+	struct vc4_dsi *dsi = bridge_to_vc4_dsi(bridge);
-+	bool debug_dump_regs = false;
-+	u32 disp0_ctrl;
-+
-+	disp0_ctrl = DSI_PORT_READ(DISP0_CTRL);
-+	disp0_ctrl |= DSI_DISP0_ENABLE;
-+	DSI_PORT_WRITE(DISP0_CTRL, disp0_ctrl);
- 
- 	if (debug_dump_regs) {
- 		struct drm_printer p = drm_info_printer(&dsi->pdev->dev);
-@@ -1127,6 +1158,16 @@ static void vc4_dsi_encoder_enable(struc
- 	}
- }
- 
-+static int vc4_dsi_bridge_attach(struct drm_bridge *bridge,
-+				 enum drm_bridge_attach_flags flags)
-+{
-+	struct vc4_dsi *dsi = bridge_to_vc4_dsi(bridge);
-+
-+	/* Attach the panel or bridge to the dsi bridge */
-+	return drm_bridge_attach(bridge->encoder, dsi->out_bridge,
-+				 &dsi->bridge, flags);
-+}
-+
- static ssize_t vc4_dsi_host_transfer(struct mipi_dsi_host *host,
- 				     const struct mipi_dsi_msg *msg)
- {
-@@ -1303,6 +1344,7 @@ static int vc4_dsi_host_attach(struct mi
- 			       struct mipi_dsi_device *device)
- {
- 	struct vc4_dsi *dsi = host_to_dsi(host);
-+	int ret;
- 
- 	dsi->lanes = device->lanes;
- 	dsi->channel = device->channel;
-@@ -1337,7 +1379,15 @@ static int vc4_dsi_host_attach(struct mi
- 		return 0;
- 	}
- 
--	return component_add(&dsi->pdev->dev, &vc4_dsi_ops);
-+	drm_bridge_add(&dsi->bridge);
-+
-+	ret = component_add(&dsi->pdev->dev, &vc4_dsi_ops);
-+	if (ret) {
-+		drm_bridge_remove(&dsi->bridge);
-+		return ret;
-+	}
-+
-+	return 0;
- }
- 
- static int vc4_dsi_host_detach(struct mipi_dsi_host *host,
-@@ -1346,6 +1396,7 @@ static int vc4_dsi_host_detach(struct mi
- 	struct vc4_dsi *dsi = host_to_dsi(host);
- 
- 	component_del(&dsi->pdev->dev, &vc4_dsi_ops);
-+	drm_bridge_remove(&dsi->bridge);
- 	return 0;
- }
- 
-@@ -1355,11 +1406,16 @@ static const struct mipi_dsi_host_ops vc
- 	.transfer = vc4_dsi_host_transfer,
- };
- 
--static const struct drm_encoder_helper_funcs vc4_dsi_encoder_helper_funcs = {
--	.atomic_disable = vc4_dsi_encoder_disable,
--	.atomic_enable = vc4_dsi_encoder_enable,
--	.mode_fixup = vc4_dsi_encoder_mode_fixup,
--	.atomic_mode_set = vc4_dsi_encoder_mode_set,
-+static const struct drm_bridge_funcs vc4_dsi_bridge_funcs = {
-+	.atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state,
-+	.atomic_destroy_state = drm_atomic_helper_bridge_destroy_state,
-+	.atomic_reset = drm_atomic_helper_bridge_reset,
-+	.atomic_pre_enable = vc4_dsi_bridge_pre_enable,
-+	.atomic_enable = vc4_dsi_bridge_enable,
-+	.atomic_disable = vc4_dsi_bridge_disable,
-+	.atomic_post_disable = vc4_dsi_bridge_post_disable,
-+	.attach = vc4_dsi_bridge_attach,
-+	.mode_fixup = vc4_dsi_bridge_mode_fixup,
- };
- 
- static int vc4_dsi_late_register(struct drm_encoder *encoder)
-@@ -1734,13 +1790,11 @@ static int vc4_dsi_bind(struct device *d
- 	if (ret)
- 		return ret;
- 
--	drm_encoder_helper_add(encoder, &vc4_dsi_encoder_helper_funcs);
--
- 	ret = devm_pm_runtime_enable(dev);
- 	if (ret)
- 		return ret;
- 
--	ret = drm_bridge_attach(encoder, dsi->out_bridge, NULL, 0);
-+	ret = drm_bridge_attach(encoder, &dsi->bridge, NULL, 0);
- 	if (ret)
- 		return ret;
- 
-@@ -1762,7 +1816,11 @@ static int vc4_dsi_dev_probe(struct plat
- 	dev_set_drvdata(dev, dsi);
- 
- 	kref_init(&dsi->kref);
-+
- 	dsi->pdev = pdev;
-+	dsi->bridge.funcs = &vc4_dsi_bridge_funcs;
-+	dsi->bridge.of_node = dev->of_node;
-+	dsi->bridge.type = DRM_MODE_CONNECTOR_DSI;
- 	dsi->dsi_host.ops = &vc4_dsi_host_ops;
- 	dsi->dsi_host.dev = dev;
- 	mipi_dsi_host_register(&dsi->dsi_host);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0033-drm-vc4-Remove-entry-to-ULPS-from-vc4_dsi-post_disab.patch b/target/linux/bcm27xx/patches-6.1/950-0033-drm-vc4-Remove-entry-to-ULPS-from-vc4_dsi-post_disab.patch
deleted file mode 100644
index e9aefd181b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0033-drm-vc4-Remove-entry-to-ULPS-from-vc4_dsi-post_disab.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b0b5ae1ea6701cf9395f3132d559a5379a4fb73e Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 11 Feb 2022 14:15:26 +0000
-Subject: [PATCH] drm/vc4: Remove entry to ULPS from vc4_dsi
- post_disable
-
-Post_disable was sending the D-PHY sequence to put any device
-into ULPS suspend mode, and then cutting power to the DSI block.
-The power-on reset state of the DSI block is for DSI to be in
-an operational state, not ULPS, so it then never sent the sequence
-for exiting ULPS. Any attached device that didn't have an external
-reset therefore remained in ULPS / standby, and didn't function.
-
-Use of ULPS isn't well specified in DRM, therefore remove entering
-it to avoid the above situation.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_dsi.c | 2 --
- 1 file changed, 2 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_dsi.c
-+++ b/drivers/gpu/drm/vc4/vc4_dsi.c
-@@ -813,8 +813,6 @@ static void vc4_dsi_bridge_post_disable(
- 	struct vc4_dsi *dsi = bridge_to_vc4_dsi(bridge);
- 	struct device *dev = &dsi->pdev->dev;
- 
--	vc4_dsi_ulps(dsi, true);
--
- 	clk_disable_unprepare(dsi->pll_phy_clock);
- 	clk_disable_unprepare(dsi->escape_clock);
- 	clk_disable_unprepare(dsi->pixel_clock);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0035-drm-panel-Add-prepare_upstream_first-flag-to-drm_pan.patch b/target/linux/bcm27xx/patches-6.1/950-0035-drm-panel-Add-prepare_upstream_first-flag-to-drm_pan.patch
deleted file mode 100644
index 1e54e61301..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0035-drm-panel-Add-prepare_upstream_first-flag-to-drm_pan.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 5ea6b17027810ffbdb5bea7d0a2b1d312dd1021c Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Mon, 5 Dec 2022 17:33:27 +0000
-Subject: [PATCH] drm/panel: Add prepare_prev_first flag to drm_panel
-
-Mapping to the drm_bridge flag pre_enable_prev_first,
-add a new flag prepare_prev_first to drm_panel to allow
-the panel driver to request that the upstream bridge should
-be pre_enabled before the panel prepare.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Link: https://lore.kernel.org/r/20221205173328.1395350-6-dave.stevenson@raspberrypi.com
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/bridge/panel.c |  2 ++
- include/drm/drm_panel.h        | 10 ++++++++++
- 2 files changed, 12 insertions(+)
-
---- a/drivers/gpu/drm/bridge/panel.c
-+++ b/drivers/gpu/drm/bridge/panel.c
-@@ -368,6 +368,8 @@ struct drm_bridge *devm_drm_panel_bridge
- 		devres_free(ptr);
- 	}
- 
-+	bridge->pre_enable_prev_first = panel->prepare_prev_first;
-+
- 	return bridge;
- }
- EXPORT_SYMBOL(devm_drm_panel_bridge_add_typed);
---- a/include/drm/drm_panel.h
-+++ b/include/drm/drm_panel.h
-@@ -196,6 +196,16 @@ struct drm_panel {
- 	 * Panel entry in registry.
- 	 */
- 	struct list_head list;
-+
-+	/**
-+	 * @prepare_prev_first:
-+	 *
-+	 * The previous controller should be prepared first, before the prepare
-+	 * for the panel is called. This is largely required for DSI panels
-+	 * where the DSI host controller should be initialised to LP-11 before
-+	 * the panel is powered up.
-+	 */
-+	bool prepare_prev_first;
- };
- 
- void drm_panel_init(struct drm_panel *panel, struct device *dev,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0036-drm-Include-drm_connector.h-from-drm_panel.h.patch b/target/linux/bcm27xx/patches-6.1/950-0036-drm-Include-drm_connector.h-from-drm_panel.h.patch
deleted file mode 100644
index 75a4a30caf..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0036-drm-Include-drm_connector.h-from-drm_panel.h.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 16e9466e562335961f89ec25bd60bff4cf82f7ad Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 11 Mar 2022 17:24:37 +0000
-Subject: [PATCH] drm: Include drm_connector.h from drm_panel.h
-
-drm_panel.h wants to reference enum drm_panel_orientation which is defined
-in drm_connector.h (despite the name).
-Include drm_connector.h in drm_panel.h to avoid the rare situation where
-drm_panel.h is used with drm_connector.h
-
-https://github.com/raspberrypi/linux/issues/4919
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- include/drm/drm_panel.h | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
---- a/include/drm/drm_panel.h
-+++ b/include/drm/drm_panel.h
-@@ -24,6 +24,7 @@
- #ifndef __DRM_PANEL_H__
- #define __DRM_PANEL_H__
- 
-+#include <drm/drm_connector.h>
- #include <linux/err.h>
- #include <linux/errno.h>
- #include <linux/list.h>
-@@ -36,8 +37,6 @@ struct drm_device;
- struct drm_panel;
- struct display_timing;
- 
--enum drm_panel_orientation;
--
- /**
-  * struct drm_panel_funcs - perform operations on a given panel
-  *
diff --git a/target/linux/bcm27xx/patches-6.1/950-0037-drm-tc358762-Set-the-pre_enable_upstream_first-flag-.patch b/target/linux/bcm27xx/patches-6.1/950-0037-drm-tc358762-Set-the-pre_enable_upstream_first-flag-.patch
deleted file mode 100644
index 2cf35236bd..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0037-drm-tc358762-Set-the-pre_enable_upstream_first-flag-.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2551dd11f3c6f1633f7aa9ec2c68b1c9831b3559 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 16 Dec 2021 15:33:43 +0000
-Subject: [PATCH] drm/tc358762: Set the pre_enable_upstream_first flag
- to configure DSI host
-
-TC358762 wants the DSI host to be prepared before it is powered up, so
-set the flag to request that the upstream bridges have their
-pre_enable called first.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/bridge/tc358762.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/gpu/drm/bridge/tc358762.c
-+++ b/drivers/gpu/drm/bridge/tc358762.c
-@@ -229,6 +229,7 @@ static int tc358762_probe(struct mipi_ds
- 	ctx->bridge.funcs = &tc358762_bridge_funcs;
- 	ctx->bridge.type = DRM_MODE_CONNECTOR_DPI;
- 	ctx->bridge.of_node = dev->of_node;
-+	ctx->bridge.pre_enable_upstream_first = true;
- 
- 	drm_bridge_add(&ctx->bridge);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0038-drm-vc4-Support-zpos-on-all-planes.patch b/target/linux/bcm27xx/patches-6.1/950-0038-drm-vc4-Support-zpos-on-all-planes.patch
deleted file mode 100644
index cc8310bf67..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0038-drm-vc4-Support-zpos-on-all-planes.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From 7354aa4ed8b97b3bd7706e6440a087491a47fb39 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 25 Jan 2022 17:28:18 +0000
-Subject: [PATCH] drm/vc4: Support zpos on all planes
-
-Adds the zpos property to all planes, and creates the dlist
-by placing the fragments in the correct order based on zpos.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_hvs.c   | 43 +++++++++++++++++++++------------
- drivers/gpu/drm/vc4/vc4_kms.c   |  3 +--
- drivers/gpu/drm/vc4/vc4_plane.c | 22 ++++++++++++++---
- 3 files changed, 48 insertions(+), 20 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -769,6 +769,8 @@ void vc4_hvs_atomic_flush(struct drm_crt
- 	bool enable_bg_fill = false;
- 	u32 __iomem *dlist_start = vc4->hvs->dlist + vc4_state->mm.start;
- 	u32 __iomem *dlist_next = dlist_start;
-+	unsigned int zpos = 0;
-+	bool found = false;
- 	int idx;
- 
- 	if (!drm_dev_enter(dev, &idx)) {
-@@ -782,23 +784,34 @@ void vc4_hvs_atomic_flush(struct drm_crt
- 	}
- 
- 	/* Copy all the active planes' dlist contents to the hardware dlist. */
--	drm_atomic_crtc_for_each_plane(plane, crtc) {
--		/* Is this the first active plane? */
--		if (dlist_next == dlist_start) {
--			/* We need to enable background fill when a plane
--			 * could be alpha blending from the background, i.e.
--			 * where no other plane is underneath. It suffices to
--			 * consider the first active plane here since we set
--			 * needs_bg_fill such that either the first plane
--			 * already needs it or all planes on top blend from
--			 * the first or a lower plane.
--			 */
--			vc4_plane_state = to_vc4_plane_state(plane->state);
--			enable_bg_fill = vc4_plane_state->needs_bg_fill;
-+	do {
-+		found = false;
-+
-+		drm_atomic_crtc_for_each_plane(plane, crtc) {
-+			if (plane->state->normalized_zpos != zpos)
-+				continue;
-+
-+			/* Is this the first active plane? */
-+			if (dlist_next == dlist_start) {
-+				/* We need to enable background fill when a plane
-+				 * could be alpha blending from the background, i.e.
-+				 * where no other plane is underneath. It suffices to
-+				 * consider the first active plane here since we set
-+				 * needs_bg_fill such that either the first plane
-+				 * already needs it or all planes on top blend from
-+				 * the first or a lower plane.
-+				 */
-+				vc4_plane_state = to_vc4_plane_state(plane->state);
-+				enable_bg_fill = vc4_plane_state->needs_bg_fill;
-+			}
-+
-+			dlist_next += vc4_plane_write_dlist(plane, dlist_next);
-+
-+			found = true;
- 		}
- 
--		dlist_next += vc4_plane_write_dlist(plane, dlist_next);
--	}
-+		zpos++;
-+	} while (found);
- 
- 	writel(SCALER_CTL0_END, dlist_next);
- 	dlist_next++;
---- a/drivers/gpu/drm/vc4/vc4_kms.c
-+++ b/drivers/gpu/drm/vc4/vc4_kms.c
-@@ -1066,8 +1066,7 @@ int vc4_kms_load(struct drm_device *dev)
- 	dev->mode_config.helper_private = &vc4_mode_config_helpers;
- 	dev->mode_config.preferred_depth = 24;
- 	dev->mode_config.async_page_flip = true;
--	if (vc4->firmware_kms)
--		dev->mode_config.normalize_zpos = true;
-+	dev->mode_config.normalize_zpos = true;
- 
- 	ret = vc4_ctm_obj_init(vc4);
- 	if (ret)
---- a/drivers/gpu/drm/vc4/vc4_plane.c
-+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -1597,9 +1597,14 @@ struct drm_plane *vc4_plane_init(struct
- 					  DRM_COLOR_YCBCR_BT709,
- 					  DRM_COLOR_YCBCR_LIMITED_RANGE);
- 
-+	if (type == DRM_PLANE_TYPE_PRIMARY)
-+		drm_plane_create_zpos_immutable_property(plane, 0);
-+
- 	return plane;
- }
- 
-+#define VC4_NUM_OVERLAY_PLANES	16
-+
- int vc4_plane_create_additional_planes(struct drm_device *drm)
- {
- 	struct drm_plane *cursor_plane;
-@@ -1615,24 +1620,35 @@ int vc4_plane_create_additional_planes(s
- 	 * modest number of planes to expose, that should hopefully
- 	 * still cover any sane usecase.
- 	 */
--	for (i = 0; i < 16; i++) {
-+	for (i = 0; i < VC4_NUM_OVERLAY_PLANES; i++) {
- 		struct drm_plane *plane =
- 			vc4_plane_init(drm, DRM_PLANE_TYPE_OVERLAY,
- 				       GENMASK(drm->mode_config.num_crtc - 1, 0));
- 
- 		if (IS_ERR(plane))
- 			continue;
-+
-+		/* Create zpos property. Max of all the overlays + 1 primary +
-+		 * 1 cursor plane on a crtc.
-+		 */
-+		drm_plane_create_zpos_property(plane, i + 1, 1,
-+					       VC4_NUM_OVERLAY_PLANES + 1);
- 	}
- 
- 	drm_for_each_crtc(crtc, drm) {
- 		/* Set up the legacy cursor after overlay initialization,
--		 * since we overlay planes on the CRTC in the order they were
--		 * initialized.
-+		 * since the zpos fallback is that planes are rendered by plane
-+		 * ID order, and that then puts the cursor on top.
- 		 */
- 		cursor_plane = vc4_plane_init(drm, DRM_PLANE_TYPE_CURSOR,
- 					      drm_crtc_mask(crtc));
- 		if (!IS_ERR(cursor_plane)) {
- 			crtc->cursor = cursor_plane;
-+
-+			drm_plane_create_zpos_property(cursor_plane,
-+						       VC4_NUM_OVERLAY_PLANES + 1,
-+						       1,
-+						       VC4_NUM_OVERLAY_PLANES + 1);
- 		}
- 	}
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0039-drm-vc4-hdmi-Add-CSC-for-BT601-709-2020-limited-and-.patch b/target/linux/bcm27xx/patches-6.1/950-0039-drm-vc4-hdmi-Add-CSC-for-BT601-709-2020-limited-and-.patch
deleted file mode 100644
index b1fa4825e5..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0039-drm-vc4-hdmi-Add-CSC-for-BT601-709-2020-limited-and-.patch
+++ /dev/null
@@ -1,301 +0,0 @@
-From 6729f3d6ace95770cfda201fd04fafcc2e46fd36 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Mon, 7 Mar 2022 15:19:38 +0000
-Subject: [PATCH] drm/vc4: hdmi: Add CSC for BT601/709/2020 limited and
- full range output
-
-The HVS always composes in the RGB domain, but there is a colourspace
-conversion block on the output to allow for sending YCbCr over the
-HDMI interface.
-The colourspace on that link is configurable via the "Colorspace"
-property on the connector, and that updates the infoframes. There
-is also selection of limited or full range based on the mode selected
-or an override.
-
-Add code to update the CSC as well so that the metadata matches the
-image data.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_hdmi.c | 196 ++++++++++++++++++++++++---------
- 1 file changed, 145 insertions(+), 51 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hdmi.c
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -158,8 +158,8 @@ static bool vc4_hdmi_mode_needs_scrambli
- 	return clock > HDMI_14_MAX_TMDS_CLK;
- }
- 
--static bool vc4_hdmi_is_full_range_rgb(struct vc4_hdmi *vc4_hdmi,
--				       const struct drm_display_mode *mode)
-+static bool vc4_hdmi_is_full_range(struct vc4_hdmi *vc4_hdmi,
-+				   const struct drm_display_mode *mode)
- {
- 	struct drm_display_info *display = &vc4_hdmi->connector.display_info;
- 
-@@ -901,7 +901,7 @@ static void vc4_hdmi_set_avi_infoframe(s
- 
- 	drm_hdmi_avi_infoframe_quant_range(&frame.avi,
- 					   connector, mode,
--					   vc4_hdmi_is_full_range_rgb(vc4_hdmi, mode) ?
-+					   vc4_hdmi_is_full_range(vc4_hdmi, mode) ?
- 					   HDMI_QUANTIZATION_RANGE_FULL :
- 					   HDMI_QUANTIZATION_RANGE_LIMITED);
- 	drm_hdmi_avi_infoframe_colorimetry(&frame.avi, cstate);
-@@ -1154,7 +1154,7 @@ static void vc4_hdmi_csc_setup(struct vc
- 	csc_ctl = VC4_SET_FIELD(VC4_HD_CSC_CTL_ORDER_BGR,
- 				VC4_HD_CSC_CTL_ORDER);
- 
--	if (!vc4_hdmi_is_full_range_rgb(vc4_hdmi, mode)) {
-+	if (!vc4_hdmi_is_full_range(vc4_hdmi, mode)) {
- 		/* CEA VICs other than #1 requre limited range RGB
- 		 * output unless overridden by an AVI infoframe.
- 		 * Apply a colorspace conversion to squash 0-255 down
-@@ -1193,15 +1193,6 @@ static void vc4_hdmi_csc_setup(struct vc
-  * [ 0      1      0      0]
-  * [ 0      0      1      0]
-  *
-- * Matrix is signed 2p13 fixed point, with signed 9p6 offsets
-- */
--static const u16 vc5_hdmi_csc_full_rgb_unity[3][4] = {
--	{ 0x2000, 0x0000, 0x0000, 0x0000 },
--	{ 0x0000, 0x2000, 0x0000, 0x0000 },
--	{ 0x0000, 0x0000, 0x2000, 0x0000 },
--};
--
--/*
-  * CEA VICs other than #1 require limited range RGB output unless
-  * overridden by an AVI infoframe. Apply a colorspace conversion to
-  * squash 0-255 down to 16-235. The matrix here is:
-@@ -1212,43 +1203,105 @@ static const u16 vc5_hdmi_csc_full_rgb_u
-  *
-  * Matrix is signed 2p13 fixed point, with signed 9p6 offsets
-  */
--static const u16 vc5_hdmi_csc_full_rgb_to_limited_rgb[3][4] = {
--	{ 0x1b80, 0x0000, 0x0000, 0x0400 },
--	{ 0x0000, 0x1b80, 0x0000, 0x0400 },
--	{ 0x0000, 0x0000, 0x1b80, 0x0400 },
-+static const u16 vc5_hdmi_csc_full_rgb_to_rgb[2][3][4] = {
-+	{
-+		/* Full range - unity */
-+		{ 0x2000, 0x0000, 0x0000, 0x0000 },
-+		{ 0x0000, 0x2000, 0x0000, 0x0000 },
-+		{ 0x0000, 0x0000, 0x2000, 0x0000 },
-+	}, {
-+		/* Limited range */
-+		{ 0x1b80, 0x0000, 0x0000, 0x0400 },
-+		{ 0x0000, 0x1b80, 0x0000, 0x0400 },
-+		{ 0x0000, 0x0000, 0x1b80, 0x0400 },
-+	}
-+};
-+
-+/*
-+ * Conversion between Full Range RGB and YUV using the BT.601 Colorspace
-+ *
-+ * Full range
-+ * [    0.299000   0.587000   0.114000   0.000000 ]
-+ * [   -0.168736  -0.331264   0.500000 128.000000 ]
-+ * [    0.500000  -0.418688  -0.081312 128.000000 ]
-+ *
-+ * Limited range
-+ * [    0.255785   0.502160   0.097523  16.000000 ]
-+ * [   -0.147644  -0.289856   0.437500 128.000000 ]
-+ * [    0.437500  -0.366352  -0.071148 128.000000 ]
-+ *
-+ * Matrix is signed 2p13 fixed point, with signed 9p6 offsets
-+ */
-+static const u16 vc5_hdmi_csc_full_rgb_to_yuv_bt601[2][3][4] = {
-+	{
-+		/* Full range */
-+		{ 0x0991, 0x12c9, 0x03a6, 0x0000 },
-+		{ 0xfa9b, 0xf567, 0x1000, 0x2000 },
-+		{ 0x1000, 0xf29b, 0xfd67, 0x2000 },
-+	}, {
-+		/* Limited range */
-+		{ 0x082f, 0x1012, 0x031f, 0x0400 },
-+		{ 0xfb48, 0xf6ba, 0x0e00, 0x2000 },
-+		{ 0x0e00, 0xf448, 0xfdba, 0x2000 },
-+	}
- };
- 
- /*
-- * Conversion between Full Range RGB and Full Range YUV422 using the
-- * BT.709 Colorspace
-+ * Conversion between Full Range RGB and YUV using the BT.709 Colorspace
-  *
-+ * Full range
-+ * [    0.212600   0.715200   0.072200   0.000000 ]
-+ * [   -0.114572  -0.385428   0.500000 128.000000 ]
-+ * [    0.500000  -0.454153  -0.045847 128.000000 ]
-  *
-- * [  0.181906  0.611804  0.061758  16  ]
-- * [ -0.100268 -0.337232  0.437500  128 ]
-- * [  0.437500 -0.397386 -0.040114  128 ]
-+ * Limited range
-+ * [    0.181873   0.611831   0.061765  16.000000 ]
-+ * [   -0.100251  -0.337249   0.437500 128.000000 ]
-+ * [    0.437500  -0.397384  -0.040116 128.000000 ]
-  *
-  * Matrix is signed 2p13 fixed point, with signed 9p6 offsets
-  */
--static const u16 vc5_hdmi_csc_full_rgb_to_limited_yuv422_bt709[3][4] = {
--	{ 0x05d2, 0x1394, 0x01fa, 0x0400 },
--	{ 0xfccc, 0xf536, 0x0e00, 0x2000 },
--	{ 0x0e00, 0xf34a, 0xfeb8, 0x2000 },
-+static const u16 vc5_hdmi_csc_full_rgb_to_yuv_bt709[2][3][4] = {
-+	{
-+		/* Full range */
-+		{ 0x06ce, 0x16e3, 0x024f, 0x0000 },
-+		{ 0xfc56, 0xf3ac, 0x1000, 0x2000 },
-+		{ 0x1000, 0xf179, 0xfe89, 0x2000 },
-+	}, {
-+		/* Limited range	*/
-+		{ 0x05d2, 0x1394, 0x01fa, 0x0400 },
-+		{ 0xfccc, 0xf536, 0x0e00, 0x2000 },
-+		{ 0x0e00, 0xf34a, 0xfeb8, 0x2000 },
-+	}
- };
- 
- /*
-- * Conversion between Full Range RGB and Full Range YUV444 using the
-- * BT.709 Colorspace
-+ * Conversion between Full Range RGB and YUV using the BT.2020 Colorspace
-  *
-- * [ -0.100268 -0.337232  0.437500  128 ]
-- * [  0.437500 -0.397386 -0.040114  128 ]
-- * [  0.181906  0.611804  0.061758  16  ]
-+ * Full range
-+ * [    0.262700   0.678000   0.059300   0.000000 ]
-+ * [   -0.139630  -0.360370   0.500000 128.000000 ]
-+ * [    0.500000  -0.459786  -0.040214 128.000000 ]
-+ *
-+ * Limited range
-+ * [    0.224732   0.580008   0.050729  16.000000 ]
-+ * [   -0.122176  -0.315324   0.437500 128.000000 ]
-+ * [    0.437500  -0.402312  -0.035188 128.000000 ]
-  *
-  * Matrix is signed 2p13 fixed point, with signed 9p6 offsets
-  */
--static const u16 vc5_hdmi_csc_full_rgb_to_limited_yuv444_bt709[3][4] = {
--	{ 0xfccc, 0xf536, 0x0e00, 0x2000 },
--	{ 0x0e00, 0xf34a, 0xfeb8, 0x2000 },
--	{ 0x05d2, 0x1394, 0x01fa, 0x0400 },
-+static const u16 vc5_hdmi_csc_full_rgb_to_yuv_bt2020[2][3][4] = {
-+	{
-+		/* Full range */
-+		{ 0x0868, 0x15b2, 0x01e6, 0x0000 },
-+		{ 0xfb89, 0xf479, 0x1000, 0x2000 },
-+		{ 0x1000, 0xf14a, 0xfeb8, 0x2000 },
-+	}, {
-+		/* Limited range */
-+		{ 0x0731, 0x128f, 0x01a0, 0x0400 },
-+		{ 0xfc18, 0xf5ea, 0x0e00, 0x2000 },
-+		{ 0x0e00, 0xf321, 0xfee1, 0x2000 },
-+	}
- };
- 
- static void vc5_hdmi_set_csc_coeffs(struct vc4_hdmi *vc4_hdmi,
-@@ -1264,6 +1317,20 @@ static void vc5_hdmi_set_csc_coeffs(stru
- 	HDMI_WRITE(HDMI_CSC_34_33, (coeffs[2][3] << 16) | coeffs[2][2]);
- }
- 
-+static void vc5_hdmi_set_csc_coeffs_swap(struct vc4_hdmi *vc4_hdmi,
-+					 const u16 coeffs[3][4])
-+{
-+	lockdep_assert_held(&vc4_hdmi->hw_lock);
-+
-+	/* YUV444 needs the CSC matrices using the channels in a different order */
-+	HDMI_WRITE(HDMI_CSC_12_11, (coeffs[2][1] << 16) | coeffs[2][0]);
-+	HDMI_WRITE(HDMI_CSC_14_13, (coeffs[2][3] << 16) | coeffs[2][2]);
-+	HDMI_WRITE(HDMI_CSC_22_21, (coeffs[0][1] << 16) | coeffs[0][0]);
-+	HDMI_WRITE(HDMI_CSC_24_23, (coeffs[0][3] << 16) | coeffs[0][2]);
-+	HDMI_WRITE(HDMI_CSC_32_31, (coeffs[1][1] << 16) | coeffs[1][0]);
-+	HDMI_WRITE(HDMI_CSC_34_33, (coeffs[1][3] << 16) | coeffs[1][2]);
-+}
-+
- static void vc5_hdmi_csc_setup(struct vc4_hdmi *vc4_hdmi,
- 			       struct drm_connector_state *state,
- 			       const struct drm_display_mode *mode)
-@@ -1271,6 +1338,8 @@ static void vc5_hdmi_csc_setup(struct vc
- 	struct drm_device *drm = vc4_hdmi->connector.dev;
- 	struct vc4_hdmi_connector_state *vc4_state =
- 		conn_state_to_vc4_hdmi_conn_state(state);
-+	unsigned int lim_range = vc4_hdmi_is_full_range(vc4_hdmi, mode) ? 0 : 1;
-+	const u16 (*csc)[4];
- 	unsigned long flags;
- 	u32 if_cfg = 0;
- 	u32 if_xbar = 0x543210;
-@@ -1286,31 +1355,56 @@ static void vc5_hdmi_csc_setup(struct vc
- 
- 	switch (vc4_state->output_format) {
- 	case VC4_HDMI_OUTPUT_YUV444:
--		vc5_hdmi_set_csc_coeffs(vc4_hdmi, vc5_hdmi_csc_full_rgb_to_limited_yuv444_bt709);
--		break;
--
- 	case VC4_HDMI_OUTPUT_YUV422:
--		csc_ctl |= VC4_SET_FIELD(VC5_MT_CP_CSC_CTL_FILTER_MODE_444_TO_422_STANDARD,
--					 VC5_MT_CP_CSC_CTL_FILTER_MODE_444_TO_422) |
--			VC5_MT_CP_CSC_CTL_USE_444_TO_422 |
--			VC5_MT_CP_CSC_CTL_USE_RNG_SUPPRESSION;
--
--		csc_chan_ctl |= VC4_SET_FIELD(VC5_MT_CP_CHANNEL_CTL_OUTPUT_REMAP_LEGACY_STYLE,
--					      VC5_MT_CP_CHANNEL_CTL_OUTPUT_REMAP);
-+		switch (state->colorspace) {
-+		default:
-+		case DRM_MODE_COLORIMETRY_NO_DATA:
-+		case DRM_MODE_COLORIMETRY_BT709_YCC:
-+		case DRM_MODE_COLORIMETRY_XVYCC_709:
-+		case DRM_MODE_COLORIMETRY_RGB_WIDE_FIXED:
-+		case DRM_MODE_COLORIMETRY_RGB_WIDE_FLOAT:
-+			csc = vc5_hdmi_csc_full_rgb_to_yuv_bt709[lim_range];
-+			break;
-+		case DRM_MODE_COLORIMETRY_SMPTE_170M_YCC:
-+		case DRM_MODE_COLORIMETRY_XVYCC_601:
-+		case DRM_MODE_COLORIMETRY_SYCC_601:
-+		case DRM_MODE_COLORIMETRY_OPYCC_601:
-+		case DRM_MODE_COLORIMETRY_BT601_YCC:
-+			csc = vc5_hdmi_csc_full_rgb_to_yuv_bt601[lim_range];
-+			break;
-+		case DRM_MODE_COLORIMETRY_BT2020_CYCC:
-+		case DRM_MODE_COLORIMETRY_BT2020_YCC:
-+		case DRM_MODE_COLORIMETRY_BT2020_RGB:
-+		case DRM_MODE_COLORIMETRY_DCI_P3_RGB_D65:
-+		case DRM_MODE_COLORIMETRY_DCI_P3_RGB_THEATER:
-+			csc = vc5_hdmi_csc_full_rgb_to_yuv_bt2020[lim_range];
-+			break;
-+		}
- 
--		if_cfg |= VC4_SET_FIELD(VC5_DVP_HT_VEC_INTERFACE_CFG_SEL_422_FORMAT_422_LEGACY,
--					VC5_DVP_HT_VEC_INTERFACE_CFG_SEL_422);
-+		if (vc4_state->output_format == VC4_HDMI_OUTPUT_YUV422) {
-+			csc_ctl |= VC4_SET_FIELD(VC5_MT_CP_CSC_CTL_FILTER_MODE_444_TO_422_STANDARD,
-+						 VC5_MT_CP_CSC_CTL_FILTER_MODE_444_TO_422) |
-+				VC5_MT_CP_CSC_CTL_USE_444_TO_422 |
-+				VC5_MT_CP_CSC_CTL_USE_RNG_SUPPRESSION;
-+
-+			csc_chan_ctl |= VC4_SET_FIELD(VC5_MT_CP_CHANNEL_CTL_OUTPUT_REMAP_LEGACY_STYLE,
-+						      VC5_MT_CP_CHANNEL_CTL_OUTPUT_REMAP);
-+
-+			if_cfg |= VC4_SET_FIELD(VC5_DVP_HT_VEC_INTERFACE_CFG_SEL_422_FORMAT_422_LEGACY,
-+						VC5_DVP_HT_VEC_INTERFACE_CFG_SEL_422);
-+
-+			vc5_hdmi_set_csc_coeffs(vc4_hdmi, csc);
-+		} else {
-+			vc5_hdmi_set_csc_coeffs_swap(vc4_hdmi, csc);
-+		}
- 
--		vc5_hdmi_set_csc_coeffs(vc4_hdmi, vc5_hdmi_csc_full_rgb_to_limited_yuv422_bt709);
- 		break;
- 
- 	case VC4_HDMI_OUTPUT_RGB:
- 		if_xbar = 0x354021;
- 
--		if (!vc4_hdmi_is_full_range_rgb(vc4_hdmi, mode))
--			vc5_hdmi_set_csc_coeffs(vc4_hdmi, vc5_hdmi_csc_full_rgb_to_limited_rgb);
--		else
--			vc5_hdmi_set_csc_coeffs(vc4_hdmi, vc5_hdmi_csc_full_rgb_unity);
-+		vc5_hdmi_set_csc_coeffs(vc4_hdmi,
-+					vc5_hdmi_csc_full_rgb_to_rgb[lim_range]);
- 		break;
- 
- 	default:
diff --git a/target/linux/bcm27xx/patches-6.1/950-0040-vc4-drm-vc4_plane-Keep-fractional-source-coords-insi.patch b/target/linux/bcm27xx/patches-6.1/950-0040-vc4-drm-vc4_plane-Keep-fractional-source-coords-insi.patch
deleted file mode 100644
index 0b4b2bc6cd..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0040-vc4-drm-vc4_plane-Keep-fractional-source-coords-insi.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-From dabc8fbdb2e159d27b5f02ac428fa5788c2c4c2a Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Mon, 14 Mar 2022 17:56:10 +0000
-Subject: [PATCH] vc4/drm: vc4_plane: Keep fractional source coords
- inside state
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/gpu/drm/vc4/vc4_drv.h   |  2 +-
- drivers/gpu/drm/vc4/vc4_plane.c | 68 ++++++++++++++++-----------------
- 2 files changed, 34 insertions(+), 36 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -384,7 +384,7 @@ struct vc4_plane_state {
- 
- 	/* Clipped coordinates of the plane on the display. */
- 	int crtc_x, crtc_y, crtc_w, crtc_h;
--	/* Clipped area being scanned from in the FB. */
-+	/* Clipped area being scanned from in the FB in u16.16 format */
- 	u32 src_x, src_y;
- 
- 	u32 src_w[2], src_h[2];
---- a/drivers/gpu/drm/vc4/vc4_plane.c
-+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -183,9 +183,9 @@ static const struct hvs_format *vc4_get_
- 
- static enum vc4_scaling_mode vc4_get_scaling_mode(u32 src, u32 dst)
- {
--	if (dst == src)
-+	if (dst == src >> 16)
- 		return VC4_SCALING_NONE;
--	if (3 * dst >= 2 * src)
-+	if (3 * dst >= 2 * (src >> 16))
- 		return VC4_SCALING_PPF;
- 	else
- 		return VC4_SCALING_TPZ;
-@@ -394,15 +394,10 @@ static int vc4_plane_setup_clipping_and_
- 		vc4_state->offsets[i] = bo->dma_addr + fb->offsets[i];
- 	}
- 
--	/*
--	 * We don't support subpixel source positioning for scaling,
--	 * but fractional coordinates can be generated by clipping
--	 * so just round for now
--	 */
--	vc4_state->src_x = DIV_ROUND_CLOSEST(state->src.x1, 1 << 16);
--	vc4_state->src_y = DIV_ROUND_CLOSEST(state->src.y1, 1 << 16);
--	vc4_state->src_w[0] = DIV_ROUND_CLOSEST(state->src.x2, 1 << 16) - vc4_state->src_x;
--	vc4_state->src_h[0] = DIV_ROUND_CLOSEST(state->src.y2, 1 << 16) - vc4_state->src_y;
-+	vc4_state->src_x = state->src.x1;
-+	vc4_state->src_y = state->src.y1;
-+	vc4_state->src_w[0] = state->src.x2 - vc4_state->src_x;
-+	vc4_state->src_h[0] = state->src.y2 - vc4_state->src_y;
- 
- 	vc4_state->crtc_x = state->dst.x1;
- 	vc4_state->crtc_y = state->dst.y1;
-@@ -455,7 +450,7 @@ static void vc4_write_tpz(struct vc4_pla
- {
- 	u32 scale, recip;
- 
--	scale = (1 << 16) * src / dst;
-+	scale = src / dst;
- 
- 	/* The specs note that while the reciprocal would be defined
- 	 * as (1<<32)/scale, ~0 is close enough.
-@@ -501,7 +496,7 @@ static u32 vc4_lbm_size(struct drm_plane
- 	if (vc4_state->x_scaling[0] == VC4_SCALING_TPZ)
- 		pix_per_line = vc4_state->crtc_w;
- 	else
--		pix_per_line = vc4_state->src_w[0];
-+		pix_per_line = vc4_state->src_w[0] >> 16;
- 
- 	if (!vc4_state->is_yuv) {
- 		if (vc4_state->y_scaling[0] == VC4_SCALING_TPZ)
-@@ -592,7 +587,8 @@ static void vc4_plane_calc_load(struct d
- 	for (i = 0; i < fb->format->num_planes; i++) {
- 		/* Even if the bandwidth/plane required for a single frame is
- 		 *
--		 * vc4_state->src_w[i] * vc4_state->src_h[i] * cpp * vrefresh
-+		 * (vc4_state->src_w[i] >> 16) * (vc4_state->src_h[i] >> 16) *
-+		 *  cpp * vrefresh
- 		 *
- 		 * when downscaling, we have to read more pixels per line in
- 		 * the time frame reserved for a single line, so the bandwidth
-@@ -601,11 +597,11 @@ static void vc4_plane_calc_load(struct d
- 		 * load by this number. We're likely over-estimating the read
- 		 * demand, but that's better than under-estimating it.
- 		 */
--		vscale_factor = DIV_ROUND_UP(vc4_state->src_h[i],
-+		vscale_factor = DIV_ROUND_UP(vc4_state->src_h[i] >> 16,
- 					     vc4_state->crtc_h);
--		vc4_state->membus_load += vc4_state->src_w[i] *
--					  vc4_state->src_h[i] * vscale_factor *
--					  fb->format->cpp[i];
-+		vc4_state->membus_load += (vc4_state->src_w[i] >> 16) *
-+					  (vc4_state->src_h[i] >> 16) *
-+					  vscale_factor * fb->format->cpp[i];
- 		vc4_state->hvs_load += vc4_state->crtc_h * vc4_state->crtc_w;
- 	}
- 
-@@ -758,7 +754,8 @@ static int vc4_plane_mode_set(struct drm
- 	bool mix_plane_alpha;
- 	bool covers_screen;
- 	u32 scl0, scl1, pitch0;
--	u32 tiling, src_y;
-+	u32 tiling, src_x, src_y;
-+	u32 width, height;
- 	u32 hvs_format = format->hvs;
- 	unsigned int rotation;
- 	int ret, i;
-@@ -770,6 +767,9 @@ static int vc4_plane_mode_set(struct drm
- 	if (ret)
- 		return ret;
- 
-+	width = vc4_state->src_w[0] >> 16;
-+	height = vc4_state->src_h[0] >> 16;
-+
- 	/* SCL1 is used for Cb/Cr scaling of planar formats.  For RGB
- 	 * and 4:4:4, scl1 should be set to scl0 so both channels of
- 	 * the scaler do the same thing.  For YUV, the Y plane needs
-@@ -790,9 +790,11 @@ static int vc4_plane_mode_set(struct drm
- 					 DRM_MODE_REFLECT_Y);
- 
- 	/* We must point to the last line when Y reflection is enabled. */
--	src_y = vc4_state->src_y;
-+	src_y = vc4_state->src_y >> 16;
- 	if (rotation & DRM_MODE_REFLECT_Y)
--		src_y += vc4_state->src_h[0] - 1;
-+		src_y += height - 1;
-+
-+	src_x = vc4_state->src_x >> 16;
- 
- 	switch (base_format_mod) {
- 	case DRM_FORMAT_MOD_LINEAR:
-@@ -807,7 +809,7 @@ static int vc4_plane_mode_set(struct drm
- 						 (i ? v_subsample : 1) *
- 						 fb->pitches[i];
- 
--			vc4_state->offsets[i] += vc4_state->src_x /
-+			vc4_state->offsets[i] += src_x /
- 						 (i ? h_subsample : 1) *
- 						 fb->format->cpp[i];
- 		}
-@@ -830,7 +832,7 @@ static int vc4_plane_mode_set(struct drm
- 		 *	pitch * tile_h == tile_size * tiles_per_row
- 		 */
- 		u32 tiles_w = fb->pitches[0] >> (tile_size_shift - tile_h_shift);
--		u32 tiles_l = vc4_state->src_x >> tile_w_shift;
-+		u32 tiles_l = src_x >> tile_w_shift;
- 		u32 tiles_r = tiles_w - tiles_l;
- 		u32 tiles_t = src_y >> tile_h_shift;
- 		/* Intra-tile offsets, which modify the base address (the
-@@ -840,7 +842,7 @@ static int vc4_plane_mode_set(struct drm
- 		u32 tile_y = (src_y >> 4) & 1;
- 		u32 subtile_y = (src_y >> 2) & 3;
- 		u32 utile_y = src_y & 3;
--		u32 x_off = vc4_state->src_x & tile_w_mask;
-+		u32 x_off = src_x & tile_w_mask;
- 		u32 y_off = src_y & tile_h_mask;
- 
- 		/* When Y reflection is requested we must set the
-@@ -936,7 +938,7 @@ static int vc4_plane_mode_set(struct drm
- 				 * of the 12-pixels in that 128-bit word is the
- 				 * first pixel to be used
- 				 */
--				u32 remaining_pixels = vc4_state->src_x % 96;
-+				u32 remaining_pixels = src_x % 96;
- 				u32 aligned = remaining_pixels / 12;
- 				u32 last_bits = remaining_pixels % 12;
- 
-@@ -958,12 +960,12 @@ static int vc4_plane_mode_set(struct drm
- 					return -EINVAL;
- 				}
- 				pix_per_tile = tile_w / fb->format->cpp[0];
--				x_off = (vc4_state->src_x % pix_per_tile) /
-+				x_off = (src_x % pix_per_tile) /
- 					(i ? h_subsample : 1) *
- 					fb->format->cpp[i];
- 			}
- 
--			tile = vc4_state->src_x / pix_per_tile;
-+			tile = src_x / pix_per_tile;
- 
- 			vc4_state->offsets[i] += param * tile_w * tile;
- 			vc4_state->offsets[i] += src_y /
-@@ -1024,10 +1026,8 @@ static int vc4_plane_mode_set(struct drm
- 		vc4_dlist_write(vc4_state,
- 				(mix_plane_alpha ? SCALER_POS2_ALPHA_MIX : 0) |
- 				vc4_hvs4_get_alpha_blend_mode(state) |
--				VC4_SET_FIELD(vc4_state->src_w[0],
--					      SCALER_POS2_WIDTH) |
--				VC4_SET_FIELD(vc4_state->src_h[0],
--					      SCALER_POS2_HEIGHT));
-+				VC4_SET_FIELD(width, SCALER_POS2_WIDTH) |
-+				VC4_SET_FIELD(height, SCALER_POS2_HEIGHT));
- 
- 		/* Position Word 3: Context.  Written by the HVS. */
- 		vc4_dlist_write(vc4_state, 0xc0c0c0c0);
-@@ -1085,10 +1085,8 @@ static int vc4_plane_mode_set(struct drm
- 		/* Position Word 2: Source Image Size */
- 		vc4_state->pos2_offset = vc4_state->dlist_count;
- 		vc4_dlist_write(vc4_state,
--				VC4_SET_FIELD(vc4_state->src_w[0],
--					      SCALER5_POS2_WIDTH) |
--				VC4_SET_FIELD(vc4_state->src_h[0],
--					      SCALER5_POS2_HEIGHT));
-+				VC4_SET_FIELD(width, SCALER5_POS2_WIDTH) |
-+				VC4_SET_FIELD(height, SCALER5_POS2_HEIGHT));
- 
- 		/* Position Word 3: Context.  Written by the HVS. */
- 		vc4_dlist_write(vc4_state, 0xc0c0c0c0);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0041-vc4-drm-Handle-fractional-coordinates-using-the-phas.patch b/target/linux/bcm27xx/patches-6.1/950-0041-vc4-drm-Handle-fractional-coordinates-using-the-phas.patch
deleted file mode 100644
index 087ec8ee2b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0041-vc4-drm-Handle-fractional-coordinates-using-the-phas.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 1f344e8eb017093573ddccd939b2dc5d930569dc Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Fri, 9 Apr 2021 15:00:40 +0100
-Subject: [PATCH] vc4/drm: Handle fractional coordinates using the
- phase field
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/gpu/drm/vc4/vc4_plane.c | 61 ++++++++++++++++++++++++++++++---
- 1 file changed, 56 insertions(+), 5 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_plane.c
-+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -464,14 +464,47 @@ static void vc4_write_tpz(struct vc4_pla
- 			VC4_SET_FIELD(recip, SCALER_TPZ1_RECIP));
- }
- 
--static void vc4_write_ppf(struct vc4_plane_state *vc4_state, u32 src, u32 dst)
-+/* phase magnitude bits */
-+#define PHASE_BITS 6
-+
-+static void vc4_write_ppf(struct vc4_plane_state *vc4_state, u32 src, u32 dst, u32 xy, int channel)
- {
--	u32 scale = (1 << 16) * src / dst;
-+	u32 scale = src / dst;
-+	s32 offset, offset2;
-+	s32 phase;
-+
-+	/* Start the phase at 1/2 pixel from the 1st pixel at src_x.
-+	   1/4 pixel for YUV. */
-+	if (channel) {
-+		/* the phase is relative to scale_src->x, so shift it for display list's x value */
-+		offset = (xy & 0x1ffff) >> (16 - PHASE_BITS) >> 1;
-+		offset += -(1 << PHASE_BITS >> 2);
-+	} else {
-+		/* the phase is relative to scale_src->x, so shift it for display list's x value */
-+		offset = (xy & 0xffff) >> (16 - PHASE_BITS);
-+		offset += -(1 << PHASE_BITS >> 1);
-+
-+		/* This is a kludge to make sure the scaling factors are consitent with YUV's luma scaling.
-+		   we lose 1bit precision because of this. */
-+		scale &= ~1;
-+	}
-+
-+	/* There may be a also small error introduced by precision of scale.
-+	   Add half of that as a compromise */
-+	offset2 = src - dst * scale;
-+	offset2 >>= 16 - PHASE_BITS;
-+	phase = offset + (offset2 >> 1);
-+
-+	/* Ensure +ve values don't touch the sign bit, then truncate negative values */
-+	if (phase >= 1 << PHASE_BITS)
-+		phase = (1 << PHASE_BITS) - 1;
-+
-+	phase &= SCALER_PPF_IPHASE_MASK;
- 
- 	vc4_dlist_write(vc4_state,
- 			SCALER_PPF_AGC |
- 			VC4_SET_FIELD(scale, SCALER_PPF_SCALE) |
--			VC4_SET_FIELD(0, SCALER_PPF_IPHASE));
-+			VC4_SET_FIELD(phase, SCALER_PPF_IPHASE));
- }
- 
- static u32 vc4_lbm_size(struct drm_plane_state *state)
-@@ -530,13 +563,13 @@ static void vc4_write_scaling_parameters
- 	/* Ch0 H-PPF Word 0: Scaling Parameters */
- 	if (vc4_state->x_scaling[channel] == VC4_SCALING_PPF) {
- 		vc4_write_ppf(vc4_state,
--			      vc4_state->src_w[channel], vc4_state->crtc_w);
-+			      vc4_state->src_w[channel], vc4_state->crtc_w, vc4_state->src_x, channel);
- 	}
- 
- 	/* Ch0 V-PPF Words 0-1: Scaling Parameters, Context */
- 	if (vc4_state->y_scaling[channel] == VC4_SCALING_PPF) {
- 		vc4_write_ppf(vc4_state,
--			      vc4_state->src_h[channel], vc4_state->crtc_h);
-+			      vc4_state->src_h[channel], vc4_state->crtc_h, vc4_state->src_y, channel);
- 		vc4_dlist_write(vc4_state, 0xc0c0c0c0);
- 	}
- 
-@@ -984,6 +1017,24 @@ static int vc4_plane_mode_set(struct drm
- 		return -EINVAL;
- 	}
- 
-+	/* fetch an extra pixel if we don't actually line up with the left edge. */
-+	if ((vc4_state->src_x & 0xffff) && vc4_state->src_x < (state->fb->width << 16))
-+		width++;
-+
-+	/* same for the right side */
-+	if (((vc4_state->src_x + vc4_state->src_w[0]) & 0xffff) &&
-+	       vc4_state->src_x + vc4_state->src_w[0] < (state->fb->width << 16))
-+		width++;
-+
-+	/* now for the top */
-+	if ((vc4_state->src_y & 0xffff) && vc4_state->src_y < (state->fb->height << 16))
-+		height++;
-+
-+	/* and the bottom */
-+	if (((vc4_state->src_y + vc4_state->src_h[0]) & 0xffff) &&
-+	       vc4_state->src_y + vc4_state->src_h[0] < (state->fb->height << 16))
-+		height++;
-+
- 	/* Don't waste cycles mixing with plane alpha if the set alpha
- 	 * is opaque or there is no per-pixel alpha information.
- 	 * In any case we use the alpha property value as the fixed alpha.
diff --git a/target/linux/bcm27xx/patches-6.1/950-0042-drm-Add-chroma-siting-properties.patch b/target/linux/bcm27xx/patches-6.1/950-0042-drm-Add-chroma-siting-properties.patch
deleted file mode 100644
index 4bfb85449a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0042-drm-Add-chroma-siting-properties.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From ca82414470eea1d81f8fe4169ee19b89245989dc Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Wed, 26 Jan 2022 15:58:13 +0000
-Subject: [PATCH] drm: Add chroma siting properties
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/gpu/drm/drm_atomic_state_helper.c | 14 +++++++++
- drivers/gpu/drm/drm_atomic_uapi.c         |  8 +++++
- drivers/gpu/drm/drm_color_mgmt.c          | 36 +++++++++++++++++++++++
- include/drm/drm_color_mgmt.h              |  3 ++
- include/drm/drm_plane.h                   | 36 +++++++++++++++++++++++
- 5 files changed, 97 insertions(+)
-
---- a/drivers/gpu/drm/drm_atomic_state_helper.c
-+++ b/drivers/gpu/drm/drm_atomic_state_helper.c
-@@ -267,6 +267,20 @@ void __drm_atomic_helper_plane_state_res
- 			plane_state->color_range = val;
- 	}
- 
-+	if (plane->chroma_siting_h_property) {
-+		if (!drm_object_property_get_default_value(&plane->base,
-+							   plane->chroma_siting_h_property,
-+							   &val))
-+			plane_state->chroma_siting_h = val;
-+	}
-+
-+	if (plane->chroma_siting_v_property) {
-+		if (!drm_object_property_get_default_value(&plane->base,
-+							   plane->chroma_siting_v_property,
-+							   &val))
-+			plane_state->chroma_siting_v = val;
-+	}
-+
- 	if (plane->zpos_property) {
- 		if (!drm_object_property_get_default_value(&plane->base,
- 							   plane->zpos_property,
---- a/drivers/gpu/drm/drm_atomic_uapi.c
-+++ b/drivers/gpu/drm/drm_atomic_uapi.c
-@@ -562,6 +562,10 @@ static int drm_atomic_plane_set_property
- 		state->color_encoding = val;
- 	} else if (property == plane->color_range_property) {
- 		state->color_range = val;
-+	} else if (property == plane->chroma_siting_h_property) {
-+		state->chroma_siting_h = val;
-+	} else if (property == plane->chroma_siting_v_property) {
-+		state->chroma_siting_v = val;
- 	} else if (property == config->prop_fb_damage_clips) {
- 		ret = drm_atomic_replace_property_blob_from_id(dev,
- 					&state->fb_damage_clips,
-@@ -628,6 +632,10 @@ drm_atomic_plane_get_property(struct drm
- 		*val = state->color_encoding;
- 	} else if (property == plane->color_range_property) {
- 		*val = state->color_range;
-+	} else if (property == plane->chroma_siting_h_property) {
-+		*val = state->chroma_siting_h;
-+	} else if (property == plane->chroma_siting_v_property) {
-+		*val = state->chroma_siting_v;
- 	} else if (property == config->prop_fb_damage_clips) {
- 		*val = (state->fb_damage_clips) ?
- 			state->fb_damage_clips->base.id : 0;
---- a/drivers/gpu/drm/drm_color_mgmt.c
-+++ b/drivers/gpu/drm/drm_color_mgmt.c
-@@ -591,6 +591,42 @@ int drm_plane_create_color_properties(st
- EXPORT_SYMBOL(drm_plane_create_color_properties);
- 
- /**
-+ * drm_plane_create_chroma_siting_properties - chroma siting related plane properties
-+ * @plane: plane object
-+ *
-+ * Create and attach plane specific CHROMA_SITING
-+ * properties to @plane.
-+ */
-+int drm_plane_create_chroma_siting_properties(struct drm_plane *plane,
-+						int32_t default_chroma_siting_h,
-+						int32_t default_chroma_siting_v)
-+{
-+	struct drm_device *dev = plane->dev;
-+	struct drm_property *prop;
-+
-+	prop = drm_property_create_range(dev, 0, "CHROMA_SITING_H",
-+					0, 1<<16);
-+	if (!prop)
-+		return -ENOMEM;
-+	plane->chroma_siting_h_property = prop;
-+	drm_object_attach_property(&plane->base, prop, default_chroma_siting_h);
-+
-+	prop = drm_property_create_range(dev, 0, "CHROMA_SITING_V",
-+					0, 1<<16);
-+	if (!prop)
-+		return -ENOMEM;
-+	plane->chroma_siting_v_property = prop;
-+	drm_object_attach_property(&plane->base, prop, default_chroma_siting_v);
-+
-+	if (plane->state) {
-+		plane->state->chroma_siting_h = default_chroma_siting_h;
-+		plane->state->chroma_siting_v = default_chroma_siting_v;
-+	}
-+	return 0;
-+}
-+EXPORT_SYMBOL(drm_plane_create_chroma_siting_properties);
-+
-+/**
-  * drm_color_lut_check - check validity of lookup table
-  * @lut: property blob containing LUT to check
-  * @tests: bitmask of tests to run
---- a/include/drm/drm_color_mgmt.h
-+++ b/include/drm/drm_color_mgmt.h
-@@ -94,6 +94,9 @@ int drm_plane_create_color_properties(st
- 				      enum drm_color_encoding default_encoding,
- 				      enum drm_color_range default_range);
- 
-+int drm_plane_create_chroma_siting_properties(struct drm_plane *plane,
-+						int32_t default_chroma_siting_h, int32_t default_chroma_siting_v);
-+
- /**
-  * enum drm_color_lut_tests - hw-specific LUT tests to perform
-  *
---- a/include/drm/drm_plane.h
-+++ b/include/drm/drm_plane.h
-@@ -178,6 +178,24 @@ struct drm_plane_state {
- 	enum drm_color_range color_range;
- 
- 	/**
-+	 * @chroma_siting_h:
-+	 *
-+	 * Location of chroma samples horizontally compared to luma
-+	 * 0 means chroma is sited with left luma
-+	 * 0x8000 is interstitial. 0x10000 is sited with right luma
-+	 */
-+	int32_t chroma_siting_h;
-+
-+	/**
-+	 * @chroma_siting_v:
-+	 *
-+	 * Location of chroma samples vertically compared to luma
-+	 * 0 means chroma is sited with top luma
-+	 * 0x8000 is interstitial. 0x10000 is sited with bottom luma
-+	 */
-+	int32_t chroma_siting_v;
-+
-+	/**
- 	 * @fb_damage_clips:
- 	 *
- 	 * Blob representing damage (area in plane framebuffer that changed
-@@ -748,6 +766,24 @@ struct drm_plane {
- 	 * scaling.
- 	 */
- 	struct drm_property *scaling_filter_property;
-+
-+	/**
-+	 * @chroma_siting_h_property:
-+	 *
-+	 * Optional "CHROMA_SITING_H" property for specifying
-+	 * chroma siting for YUV formats.
-+	 * See drm_plane_create_chroma_siting_properties().
-+	 */
-+	struct drm_property *chroma_siting_h_property;
-+
-+	/**
-+	 * @chroma_siting_v_property:
-+	 *
-+	 * Optional "CHROMA_SITING_V" property for specifying
-+	 * chroma siting for YUV formats.
-+	 * See drm_plane_create_chroma_siting_properties().
-+	 */
-+	struct drm_property *chroma_siting_v_property;
- };
- 
- #define obj_to_plane(x) container_of(x, struct drm_plane, base)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0043-vc4-drm-plane-Make-use-of-chroma-siting-parameter.patch b/target/linux/bcm27xx/patches-6.1/950-0043-vc4-drm-plane-Make-use-of-chroma-siting-parameter.patch
deleted file mode 100644
index fb648b1fc9..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0043-vc4-drm-plane-Make-use-of-chroma-siting-parameter.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 2b8db0ad29be4c12f2a1c5a209e15e5e14efc047 Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Thu, 27 Jan 2022 15:32:04 +0000
-Subject: [PATCH] vc4/drm:plane: Make use of chroma siting parameter
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/gpu/drm/vc4/vc4_plane.c | 13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_plane.c
-+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -467,17 +467,18 @@ static void vc4_write_tpz(struct vc4_pla
- /* phase magnitude bits */
- #define PHASE_BITS 6
- 
--static void vc4_write_ppf(struct vc4_plane_state *vc4_state, u32 src, u32 dst, u32 xy, int channel)
-+static void vc4_write_ppf(struct vc4_plane_state *vc4_state, u32 src, u32 dst, u32 xy, int channel, int chroma_offset)
- {
- 	u32 scale = src / dst;
- 	s32 offset, offset2;
- 	s32 phase;
- 
- 	/* Start the phase at 1/2 pixel from the 1st pixel at src_x.
--	   1/4 pixel for YUV. */
-+	   1/4 pixel for YUV, plus the offset for chroma siting */
- 	if (channel) {
- 		/* the phase is relative to scale_src->x, so shift it for display list's x value */
- 		offset = (xy & 0x1ffff) >> (16 - PHASE_BITS) >> 1;
-+		offset -= chroma_offset >> (17 - PHASE_BITS);
- 		offset += -(1 << PHASE_BITS >> 2);
- 	} else {
- 		/* the phase is relative to scale_src->x, so shift it for display list's x value */
-@@ -563,13 +564,15 @@ static void vc4_write_scaling_parameters
- 	/* Ch0 H-PPF Word 0: Scaling Parameters */
- 	if (vc4_state->x_scaling[channel] == VC4_SCALING_PPF) {
- 		vc4_write_ppf(vc4_state,
--			      vc4_state->src_w[channel], vc4_state->crtc_w, vc4_state->src_x, channel);
-+			      vc4_state->src_w[channel], vc4_state->crtc_w, vc4_state->src_x, channel,
-+			      state->chroma_siting_h);
- 	}
- 
- 	/* Ch0 V-PPF Words 0-1: Scaling Parameters, Context */
- 	if (vc4_state->y_scaling[channel] == VC4_SCALING_PPF) {
- 		vc4_write_ppf(vc4_state,
--			      vc4_state->src_h[channel], vc4_state->crtc_h, vc4_state->src_y, channel);
-+			      vc4_state->src_h[channel], vc4_state->crtc_h, vc4_state->src_y, channel,
-+			      state->chroma_siting_v);
- 		vc4_dlist_write(vc4_state, 0xc0c0c0c0);
- 	}
- 
-@@ -1646,6 +1649,8 @@ struct drm_plane *vc4_plane_init(struct
- 					  DRM_COLOR_YCBCR_BT709,
- 					  DRM_COLOR_YCBCR_LIMITED_RANGE);
- 
-+	drm_plane_create_chroma_siting_properties(plane, 0, 0);
-+
- 	if (type == DRM_PLANE_TYPE_PRIMARY)
- 		drm_plane_create_zpos_immutable_property(plane, 0);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0044-drm-vc4-Force-trigger-of-dlist-update-on-margins-cha.patch b/target/linux/bcm27xx/patches-6.1/950-0044-drm-vc4-Force-trigger-of-dlist-update-on-margins-cha.patch
deleted file mode 100644
index 0820d27ba7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0044-drm-vc4-Force-trigger-of-dlist-update-on-margins-cha.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From b583024119e8ea35f7a6d2d8b143c0eb390afa70 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 1 Apr 2022 11:31:38 +0100
-Subject: [PATCH] drm/vc4: Force trigger of dlist update on margins
- change
-
-When the margins are changed, the dlist needs to be regenerated
-with the changed updated dest regions for each of the planes.
-
-Setting the zpos_changed flag is sufficient to trigger that
-without doing a full modeset, therefore set it should the
-margins be changed.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_crtc.c | 14 ++++++++++----
- drivers/gpu/drm/vc4/vc4_drv.h  |  7 +------
- 2 files changed, 11 insertions(+), 10 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_crtc.c
-+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
-@@ -757,10 +757,16 @@ static int vc4_crtc_atomic_check(struct
- 		if (conn_state->crtc != crtc)
- 			continue;
- 
--		vc4_state->margins.left = conn_state->tv.margins.left;
--		vc4_state->margins.right = conn_state->tv.margins.right;
--		vc4_state->margins.top = conn_state->tv.margins.top;
--		vc4_state->margins.bottom = conn_state->tv.margins.bottom;
-+		if (memcmp(&vc4_state->margins, &conn_state->tv.margins,
-+			   sizeof(vc4_state->margins))) {
-+			memcpy(&vc4_state->margins, &conn_state->tv.margins,
-+			       sizeof(vc4_state->margins));
-+
-+			/* Need to force the dlist entries for all planes to be
-+			 * updated so that the dest rectangles are changed.
-+			 */
-+			crtc_state->zpos_changed = true;
-+		}
- 		break;
- 	}
- 
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -581,12 +581,7 @@ struct vc4_crtc_state {
- 	bool txp_armed;
- 	unsigned int assigned_channel;
- 
--	struct {
--		unsigned int left;
--		unsigned int right;
--		unsigned int top;
--		unsigned int bottom;
--	} margins;
-+	struct drm_connector_tv_margins margins;
- 
- 	unsigned long hvs_load;
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0045-drm-atomic-helpers-remove-legacy_cursor_update-hacks.patch b/target/linux/bcm27xx/patches-6.1/950-0045-drm-atomic-helpers-remove-legacy_cursor_update-hacks.patch
deleted file mode 100644
index b64f2972c5..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0045-drm-atomic-helpers-remove-legacy_cursor_update-hacks.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From 34b4470575bd300507847093497516f1adbc5020 Mon Sep 17 00:00:00 2001
-From: Daniel Vetter <daniel.vetter@ffwll.ch>
-Date: Fri, 23 Oct 2020 14:39:23 +0200
-Subject: [PATCH] drm/atomic-helpers: remove legacy_cursor_update hacks
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The stuff never really worked, and leads to lots of fun because it
-out-of-order frees atomic states. Which upsets KASAN, among other
-things.
-
-For async updates we now have a more solid solution with the
-->atomic_async_check and ->atomic_async_commit hooks. Support for that
-for msm and vc4 landed. nouveau and i915 have their own commit
-routines, doing something similar.
-
-For everyone else it's probably better to remove the use-after-free
-bug, and encourage folks to use the async support instead. The
-affected drivers which register a legacy cursor plane and don't either
-use the new async stuff or their own commit routine are: amdgpu,
-atmel, mediatek, qxl, rockchip, sti, sun4i, tegra, virtio, and vmwgfx.
-
-Inspired by an amdgpu bug report.
-
-v2: Drop RFC, I think with amdgpu converted over to use
-atomic_async_check/commit done in
-
-commit 674e78acae0dfb4beb56132e41cbae5b60f7d662
-Author: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
-Date:   Wed Dec 5 14:59:07 2018 -0500
-
-    drm/amd/display: Add fast path for cursor plane updates
-
-we don't have any driver anymore where we have userspace expecting
-solid legacy cursor support _and_ they are using the atomic helpers in
-their fully glory. So we can retire this.
-
-v3: Paper over msm and i915 regression. The complete_all is the only
-thing missing afaict.
-
-v4: Rebased on recent kernel, added extra link for vc4 bug.
-
-Link: https://bugzilla.kernel.org/show_bug.cgi?id=199425
-Link: https://lore.kernel.org/all/20220221134155.125447-9-maxime@cerno.tech/
-Cc: mikita.lipski@amd.com
-Cc: Michel Dänzer <michel@daenzer.net>
-Cc: harry.wentland@amd.com
-Cc: Rob Clark <robdclark@gmail.com>
-Cc: "Kazlauskas, Nicholas" <nicholas.kazlauskas@amd.com>
-Tested-by: Maxime Ripard <maxime@cerno.tech>
-Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/drm_atomic_helper.c          | 13 -------------
- drivers/gpu/drm/i915/display/intel_display.c | 13 +++++++++++++
- drivers/gpu/drm/msm/msm_atomic.c             |  2 ++
- 3 files changed, 15 insertions(+), 13 deletions(-)
-
---- a/drivers/gpu/drm/drm_atomic_helper.c
-+++ b/drivers/gpu/drm/drm_atomic_helper.c
-@@ -1626,13 +1626,6 @@ drm_atomic_helper_wait_for_vblanks(struc
- 	int i, ret;
- 	unsigned int crtc_mask = 0;
- 
--	 /*
--	  * Legacy cursor ioctls are completely unsynced, and userspace
--	  * relies on that (by doing tons of cursor updates).
--	  */
--	if (old_state->legacy_cursor_update)
--		return;
--
- 	for_each_oldnew_crtc_in_state(old_state, crtc, old_crtc_state, new_crtc_state, i) {
- 		if (!new_crtc_state->active)
- 			continue;
-@@ -2282,12 +2275,6 @@ int drm_atomic_helper_setup_commit(struc
- 			complete_all(&commit->flip_done);
- 			continue;
- 		}
--
--		/* Legacy cursor updates are fully unsynced. */
--		if (state->legacy_cursor_update) {
--			complete_all(&commit->flip_done);
--			continue;
--		}
- 
- 		if (!new_crtc_state->event) {
- 			commit->event = kzalloc(sizeof(*commit->event),
---- a/drivers/gpu/drm/i915/display/intel_display.c
-+++ b/drivers/gpu/drm/i915/display/intel_display.c
-@@ -7754,6 +7754,19 @@ static int intel_atomic_commit(struct dr
- 				state->base.legacy_cursor_update = false;
- 	}
- 
-+	/*
-+	 * FIXME: Cut over to (async) commit helpers instead of hand-rolling
-+	 * everything.
-+	 */
-+	if (state->base.legacy_cursor_update) {
-+		struct intel_crtc_state *new_crtc_state;
-+		struct intel_crtc *crtc;
-+		int i;
-+
-+		for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i)
-+			complete_all(&new_crtc_state->uapi.commit->flip_done);
-+	}
-+
- 	ret = intel_atomic_prepare_commit(state);
- 	if (ret) {
- 		drm_dbg_atomic(&dev_priv->drm,
---- a/drivers/gpu/drm/msm/msm_atomic.c
-+++ b/drivers/gpu/drm/msm/msm_atomic.c
-@@ -222,6 +222,8 @@ void msm_atomic_commit_tail(struct drm_a
- 		/* async updates are limited to single-crtc updates: */
- 		WARN_ON(crtc_mask != drm_crtc_mask(async_crtc));
- 
-+		complete_all(&async_crtc->state->commit->flip_done);
-+
- 		/*
- 		 * Start timer if we don't already have an update pending
- 		 * on this crtc:
diff --git a/target/linux/bcm27xx/patches-6.1/950-0046-drm-vc4_hdmi-Force-a-modeset-when-Broadcast-RGB-sett.patch b/target/linux/bcm27xx/patches-6.1/950-0046-drm-vc4_hdmi-Force-a-modeset-when-Broadcast-RGB-sett.patch
deleted file mode 100644
index 42301da88f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0046-drm-vc4_hdmi-Force-a-modeset-when-Broadcast-RGB-sett.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From bf53b44573db760e243ef2fdf542bc3e991c97a6 Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Thu, 5 May 2022 18:50:04 +0100
-Subject: [PATCH] drm/vc4_hdmi: Force a modeset when Broadcast RGB
- setting changes
-
-Without this the change is not visible until the next modeset
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/gpu/drm/vc4/vc4_hdmi.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/gpu/drm/vc4/vc4_hdmi.c
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -536,14 +536,17 @@ static int vc4_hdmi_connector_atomic_che
- {
- 	struct drm_connector_state *old_state =
- 		drm_atomic_get_old_connector_state(state, connector);
-+	struct vc4_hdmi_connector_state *old_vc4_state = conn_state_to_vc4_hdmi_conn_state(old_state);
- 	struct drm_connector_state *new_state =
- 		drm_atomic_get_new_connector_state(state, connector);
-+	struct vc4_hdmi_connector_state *new_vc4_state = conn_state_to_vc4_hdmi_conn_state(new_state);
- 	struct drm_crtc *crtc = new_state->crtc;
- 
- 	if (!crtc)
- 		return 0;
- 
- 	if (old_state->colorspace != new_state->colorspace ||
-+	    old_vc4_state->broadcast_rgb != new_vc4_state->broadcast_rgb ||
- 	    !drm_connector_atomic_hdr_metadata_equal(old_state, new_state)) {
- 		struct drm_crtc_state *crtc_state;
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0047-drm-atomic-If-margins-are-updated-update-all-planes.patch b/target/linux/bcm27xx/patches-6.1/950-0047-drm-atomic-If-margins-are-updated-update-all-planes.patch
deleted file mode 100644
index 671f651538..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0047-drm-atomic-If-margins-are-updated-update-all-planes.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 62813ba7cbf8c2df7af04036a297175fc0457626 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 1 Apr 2022 17:10:37 +0100
-Subject: [PATCH] drm/atomic: If margins are updated, update all
- planes.
-
-Margins may be implemented by scaling the planes, but as there
-is no way of intercepting the set_property for a standard property,
-and all planes are checked in drm_atomic_check_only before the
-connectors, there's now way to add the planes into the state
-from the driver.
-
-If the margin properties change, add all corresponding planes to
-the state.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/drm_atomic_uapi.c | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
---- a/drivers/gpu/drm/drm_atomic_uapi.c
-+++ b/drivers/gpu/drm/drm_atomic_uapi.c
-@@ -679,6 +679,7 @@ static int drm_atomic_connector_set_prop
- {
- 	struct drm_device *dev = connector->dev;
- 	struct drm_mode_config *config = &dev->mode_config;
-+	bool margins_updated = false;
- 	bool replaced = false;
- 	int ret;
- 
-@@ -698,12 +699,16 @@ static int drm_atomic_connector_set_prop
- 		state->tv.subconnector = val;
- 	} else if (property == config->tv_left_margin_property) {
- 		state->tv.margins.left = val;
-+		margins_updated = true;
- 	} else if (property == config->tv_right_margin_property) {
- 		state->tv.margins.right = val;
-+		margins_updated = true;
- 	} else if (property == config->tv_top_margin_property) {
- 		state->tv.margins.top = val;
-+		margins_updated = true;
- 	} else if (property == config->tv_bottom_margin_property) {
- 		state->tv.margins.bottom = val;
-+		margins_updated = true;
- 	} else if (property == config->tv_mode_property) {
- 		state->tv.mode = val;
- 	} else if (property == config->tv_brightness_property) {
-@@ -784,6 +789,12 @@ static int drm_atomic_connector_set_prop
- 		return -EINVAL;
- 	}
- 
-+	if (margins_updated && state->crtc) {
-+		ret = drm_atomic_add_affected_planes(state->state, state->crtc);
-+
-+		return ret;
-+	}
-+
- 	return 0;
- }
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0048-drm-vc4-hvs-Ignore-atomic_flush-if-we-re-disabled.patch b/target/linux/bcm27xx/patches-6.1/950-0048-drm-vc4-hvs-Ignore-atomic_flush-if-we-re-disabled.patch
deleted file mode 100644
index 4ddda92e16..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0048-drm-vc4-hvs-Ignore-atomic_flush-if-we-re-disabled.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 2f38c1f89175b33aaa091d055a804f4f31c47ec2 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Mon, 6 Dec 2021 16:32:10 +0100
-Subject: [PATCH] drm/vc4: hvs: Ignore atomic_flush if we're disabled
-
-atomic_flush will be called for each CRTC even if they aren't enabled.
-
-The whole code we have there will thus run without a properly affected
-channel, which can then result in all sorts of weird behaviour.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_hvs.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -778,6 +778,9 @@ void vc4_hvs_atomic_flush(struct drm_crt
- 		return;
- 	}
- 
-+	if (vc4_state->assigned_channel == VC4_HVS_CHANNEL_DISABLED)
-+		return;
-+
- 	if (debug_dump_regs) {
- 		DRM_INFO("CRTC %d HVS before:\n", drm_crtc_index(crtc));
- 		vc4_hvs_dump_state(hvs);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0049-drm-vc4-0-is-a-valid-value-for-pixel_order_hvs5-so-f.patch b/target/linux/bcm27xx/patches-6.1/950-0049-drm-vc4-0-is-a-valid-value-for-pixel_order_hvs5-so-f.patch
deleted file mode 100644
index ebc9ce44ec..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0049-drm-vc4-0-is-a-valid-value-for-pixel_order_hvs5-so-f.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From b16dcc5f735739444da66149b473bb88fb44d4d9 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 3 Jun 2022 16:49:09 +0100
-Subject: [PATCH] drm: vc4: 0 is a valid value for pixel_order_hvs5, so
- fix conditionals
-
-vc4_plane_mode_set for HVS5 was using pixel_order unless pixel_order_hvs5
-was non-zero, except 0 is a valid value for the pixel_order.
-
-Specify pixel_order_hvs5 for all formats and remove the conditional.
-
-Reported-by: vrazzer <teamvraz@pipmail.net>
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_plane.c | 20 ++++++++++++++------
- 1 file changed, 14 insertions(+), 6 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_plane.c
-+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -65,11 +65,13 @@ static const struct hvs_format {
- 		.drm = DRM_FORMAT_RGB565,
- 		.hvs = HVS_PIXEL_FORMAT_RGB565,
- 		.pixel_order = HVS_PIXEL_ORDER_XRGB,
-+		.pixel_order_hvs5 = HVS_PIXEL_ORDER_XRGB,
- 	},
- 	{
- 		.drm = DRM_FORMAT_BGR565,
- 		.hvs = HVS_PIXEL_FORMAT_RGB565,
- 		.pixel_order = HVS_PIXEL_ORDER_XBGR,
-+		.pixel_order_hvs5 = HVS_PIXEL_ORDER_XBGR,
- 	},
- 	{
- 		.drm = DRM_FORMAT_ARGB1555,
-@@ -87,56 +89,67 @@ static const struct hvs_format {
- 		.drm = DRM_FORMAT_RGB888,
- 		.hvs = HVS_PIXEL_FORMAT_RGB888,
- 		.pixel_order = HVS_PIXEL_ORDER_XRGB,
-+		.pixel_order_hvs5 = HVS_PIXEL_ORDER_XRGB,
- 	},
- 	{
- 		.drm = DRM_FORMAT_BGR888,
- 		.hvs = HVS_PIXEL_FORMAT_RGB888,
- 		.pixel_order = HVS_PIXEL_ORDER_XBGR,
-+		.pixel_order_hvs5 = HVS_PIXEL_ORDER_XBGR,
- 	},
- 	{
- 		.drm = DRM_FORMAT_YUV422,
- 		.hvs = HVS_PIXEL_FORMAT_YCBCR_YUV422_3PLANE,
- 		.pixel_order = HVS_PIXEL_ORDER_XYCBCR,
-+		.pixel_order_hvs5 = HVS_PIXEL_ORDER_XYCBCR,
- 	},
- 	{
- 		.drm = DRM_FORMAT_YVU422,
- 		.hvs = HVS_PIXEL_FORMAT_YCBCR_YUV422_3PLANE,
- 		.pixel_order = HVS_PIXEL_ORDER_XYCRCB,
-+		.pixel_order_hvs5 = HVS_PIXEL_ORDER_XYCRCB,
- 	},
- 	{
- 		.drm = DRM_FORMAT_YUV420,
- 		.hvs = HVS_PIXEL_FORMAT_YCBCR_YUV420_3PLANE,
- 		.pixel_order = HVS_PIXEL_ORDER_XYCBCR,
-+		.pixel_order_hvs5 = HVS_PIXEL_ORDER_XYCBCR,
- 	},
- 	{
- 		.drm = DRM_FORMAT_YVU420,
- 		.hvs = HVS_PIXEL_FORMAT_YCBCR_YUV420_3PLANE,
- 		.pixel_order = HVS_PIXEL_ORDER_XYCRCB,
-+		.pixel_order_hvs5 = HVS_PIXEL_ORDER_XYCRCB,
- 	},
- 	{
- 		.drm = DRM_FORMAT_NV12,
- 		.hvs = HVS_PIXEL_FORMAT_YCBCR_YUV420_2PLANE,
- 		.pixel_order = HVS_PIXEL_ORDER_XYCBCR,
-+		.pixel_order_hvs5 = HVS_PIXEL_ORDER_XYCBCR,
- 	},
- 	{
- 		.drm = DRM_FORMAT_NV21,
- 		.hvs = HVS_PIXEL_FORMAT_YCBCR_YUV420_2PLANE,
- 		.pixel_order = HVS_PIXEL_ORDER_XYCRCB,
-+		.pixel_order_hvs5 = HVS_PIXEL_ORDER_XYCRCB,
- 	},
- 	{
- 		.drm = DRM_FORMAT_NV16,
- 		.hvs = HVS_PIXEL_FORMAT_YCBCR_YUV422_2PLANE,
- 		.pixel_order = HVS_PIXEL_ORDER_XYCBCR,
-+		.pixel_order_hvs5 = HVS_PIXEL_ORDER_XYCBCR,
- 	},
- 	{
- 		.drm = DRM_FORMAT_NV61,
- 		.hvs = HVS_PIXEL_FORMAT_YCBCR_YUV422_2PLANE,
- 		.pixel_order = HVS_PIXEL_ORDER_XYCRCB,
-+		.pixel_order_hvs5 = HVS_PIXEL_ORDER_XYCRCB,
- 	},
- 	{
- 		.drm = DRM_FORMAT_P030,
- 		.hvs = HVS_PIXEL_FORMAT_YCBCR_10BIT,
- 		.pixel_order = HVS_PIXEL_ORDER_XYCBCR,
-+		.pixel_order_hvs5 = HVS_PIXEL_ORDER_XYCBCR,
- 		.hvs5_only = true,
- 	},
- 	{
-@@ -1087,15 +1100,10 @@ static int vc4_plane_mode_set(struct drm
- 		vc4_dlist_write(vc4_state, 0xc0c0c0c0);
- 
- 	} else {
--		u32 hvs_pixel_order = format->pixel_order;
--
--		if (format->pixel_order_hvs5)
--			hvs_pixel_order = format->pixel_order_hvs5;
--
- 		/* Control word */
- 		vc4_dlist_write(vc4_state,
- 				SCALER_CTL0_VALID |
--				(hvs_pixel_order << SCALER_CTL0_ORDER_SHIFT) |
-+				(format->pixel_order_hvs5 << SCALER_CTL0_ORDER_SHIFT) |
- 				(hvs_format << SCALER_CTL0_PIXEL_FORMAT_SHIFT) |
- 				VC4_SET_FIELD(tiling, SCALER_CTL0_TILING) |
- 				(vc4_state->is_unity ?
diff --git a/target/linux/bcm27xx/patches-6.1/950-0050-drm-vc4-Omit-pixel_order-from-the-hvs_format-for-hvs.patch b/target/linux/bcm27xx/patches-6.1/950-0050-drm-vc4-Omit-pixel_order-from-the-hvs_format-for-hvs.patch
deleted file mode 100644
index e59ab2cf83..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0050-drm-vc4-Omit-pixel_order-from-the-hvs_format-for-hvs.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From e229805297bd5ff53b5fc63d08c5f37c2404c2d6 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Mon, 6 Jun 2022 12:23:28 +0100
-Subject: [PATCH] drm: vc4: Omit pixel_order from the hvs_format for
- hvs5 only formats
-
-pixel_order is used for the earlier versions of the HVS, so is
-redundant on the 10:10:10:2 and 10bit YUV formats that are only
-supported on HVS5.
-Remove the assignment from the table to avoid confusion.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_plane.c | 5 -----
- 1 file changed, 5 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_plane.c
-+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -148,35 +148,30 @@ static const struct hvs_format {
- 	{
- 		.drm = DRM_FORMAT_P030,
- 		.hvs = HVS_PIXEL_FORMAT_YCBCR_10BIT,
--		.pixel_order = HVS_PIXEL_ORDER_XYCBCR,
- 		.pixel_order_hvs5 = HVS_PIXEL_ORDER_XYCBCR,
- 		.hvs5_only = true,
- 	},
- 	{
- 		.drm = DRM_FORMAT_XRGB2101010,
- 		.hvs = HVS_PIXEL_FORMAT_RGBA1010102,
--		.pixel_order = HVS_PIXEL_ORDER_ABGR,
- 		.pixel_order_hvs5 = HVS_PIXEL_ORDER_ARGB,
- 		.hvs5_only = true,
- 	},
- 	{
- 		.drm = DRM_FORMAT_ARGB2101010,
- 		.hvs = HVS_PIXEL_FORMAT_RGBA1010102,
--		.pixel_order = HVS_PIXEL_ORDER_ABGR,
- 		.pixel_order_hvs5 = HVS_PIXEL_ORDER_ARGB,
- 		.hvs5_only = true,
- 	},
- 	{
- 		.drm = DRM_FORMAT_ABGR2101010,
- 		.hvs = HVS_PIXEL_FORMAT_RGBA1010102,
--		.pixel_order = HVS_PIXEL_ORDER_ARGB,
- 		.pixel_order_hvs5 = HVS_PIXEL_ORDER_ABGR,
- 		.hvs5_only = true,
- 	},
- 	{
- 		.drm = DRM_FORMAT_XBGR2101010,
- 		.hvs = HVS_PIXEL_FORMAT_RGBA1010102,
--		.pixel_order = HVS_PIXEL_ORDER_ARGB,
- 		.pixel_order_hvs5 = HVS_PIXEL_ORDER_ABGR,
- 		.hvs5_only = true,
- 	},
diff --git a/target/linux/bcm27xx/patches-6.1/950-0051-drm-vc4-Add-3-3-2-and-4-4-4-4-RGB-RGBX-RGBA-formats.patch b/target/linux/bcm27xx/patches-6.1/950-0051-drm-vc4-Add-3-3-2-and-4-4-4-4-RGB-RGBX-RGBA-formats.patch
deleted file mode 100644
index 2cd79eac1d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0051-drm-vc4-Add-3-3-2-and-4-4-4-4-RGB-RGBX-RGBA-formats.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From db4cb2248e9d98cc513300964c3ecdc80b8bc364 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 3 Jun 2022 16:57:04 +0100
-Subject: [PATCH] drm: vc4: Add 3:3:2 and 4:4:4:4 RGB/RGBX/RGBA formats
-
-The hardware supports the 332 8bpp and 4:4:4:4 16bpp formats,
-but the table of supported formats didn't include them.
-Add them in.
-
-In theory they are supported for T-format as well as linear,
-but without a way to test them just add them as linear for now.
-
-Suggested-by: vrazzer <teamvraz@pipmail.net>
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_plane.c | 70 +++++++++++++++++++++++++++++++++
- 1 file changed, 70 insertions(+)
-
---- a/drivers/gpu/drm/vc4/vc4_plane.c
-+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -175,6 +175,66 @@ static const struct hvs_format {
- 		.pixel_order_hvs5 = HVS_PIXEL_ORDER_ABGR,
- 		.hvs5_only = true,
- 	},
-+	{
-+		.drm = DRM_FORMAT_RGB332,
-+		.hvs = HVS_PIXEL_FORMAT_RGB332,
-+		.pixel_order = HVS_PIXEL_ORDER_ARGB,
-+		.pixel_order_hvs5 = HVS_PIXEL_ORDER_ARGB,
-+	},
-+	{
-+		.drm = DRM_FORMAT_BGR233,
-+		.hvs = HVS_PIXEL_FORMAT_RGB332,
-+		.pixel_order = HVS_PIXEL_ORDER_ABGR,
-+		.pixel_order_hvs5 = HVS_PIXEL_ORDER_ABGR,
-+	},
-+	{
-+		.drm = DRM_FORMAT_XRGB4444,
-+		.hvs = HVS_PIXEL_FORMAT_RGBA4444,
-+		.pixel_order = HVS_PIXEL_ORDER_ABGR,
-+		.pixel_order_hvs5 = HVS_PIXEL_ORDER_ARGB,
-+	},
-+	{
-+		.drm = DRM_FORMAT_ARGB4444,
-+		.hvs = HVS_PIXEL_FORMAT_RGBA4444,
-+		.pixel_order = HVS_PIXEL_ORDER_ABGR,
-+		.pixel_order_hvs5 = HVS_PIXEL_ORDER_ARGB,
-+	},
-+	{
-+		.drm = DRM_FORMAT_XBGR4444,
-+		.hvs = HVS_PIXEL_FORMAT_RGBA4444,
-+		.pixel_order = HVS_PIXEL_ORDER_ARGB,
-+		.pixel_order_hvs5 = HVS_PIXEL_ORDER_ABGR,
-+	},
-+	{
-+		.drm = DRM_FORMAT_ABGR4444,
-+		.hvs = HVS_PIXEL_FORMAT_RGBA4444,
-+		.pixel_order = HVS_PIXEL_ORDER_ARGB,
-+		.pixel_order_hvs5 = HVS_PIXEL_ORDER_ABGR,
-+	},
-+	{
-+		.drm = DRM_FORMAT_BGRX4444,
-+		.hvs = HVS_PIXEL_FORMAT_RGBA4444,
-+		.pixel_order = HVS_PIXEL_ORDER_RGBA,
-+		.pixel_order_hvs5 = HVS_PIXEL_ORDER_BGRA,
-+	},
-+	{
-+		.drm = DRM_FORMAT_BGRA4444,
-+		.hvs = HVS_PIXEL_FORMAT_RGBA4444,
-+		.pixel_order = HVS_PIXEL_ORDER_RGBA,
-+		.pixel_order_hvs5 = HVS_PIXEL_ORDER_BGRA,
-+	},
-+	{
-+		.drm = DRM_FORMAT_RGBX4444,
-+		.hvs = HVS_PIXEL_FORMAT_RGBA4444,
-+		.pixel_order = HVS_PIXEL_ORDER_BGRA,
-+		.pixel_order_hvs5 = HVS_PIXEL_ORDER_RGBA,
-+	},
-+	{
-+		.drm = DRM_FORMAT_RGBA4444,
-+		.hvs = HVS_PIXEL_FORMAT_RGBA4444,
-+		.pixel_order = HVS_PIXEL_ORDER_BGRA,
-+		.pixel_order_hvs5 = HVS_PIXEL_ORDER_RGBA,
-+	},
- };
- 
- static const struct hvs_format *vc4_get_hvs_format(u32 drm_format)
-@@ -1572,6 +1632,16 @@ static bool vc4_format_mod_supported(str
- 	case DRM_FORMAT_BGRX1010102:
- 	case DRM_FORMAT_RGBA1010102:
- 	case DRM_FORMAT_BGRA1010102:
-+	case DRM_FORMAT_XRGB4444:
-+	case DRM_FORMAT_ARGB4444:
-+	case DRM_FORMAT_XBGR4444:
-+	case DRM_FORMAT_ABGR4444:
-+	case DRM_FORMAT_RGBX4444:
-+	case DRM_FORMAT_RGBA4444:
-+	case DRM_FORMAT_BGRX4444:
-+	case DRM_FORMAT_BGRA4444:
-+	case DRM_FORMAT_RGB332:
-+	case DRM_FORMAT_BGR233:
- 	case DRM_FORMAT_YUV422:
- 	case DRM_FORMAT_YVU422:
- 	case DRM_FORMAT_YUV420:
diff --git a/target/linux/bcm27xx/patches-6.1/950-0052-drm-vc4-Add-comments-for-which-HVS_PIXEL_ORDER_xxx-d.patch b/target/linux/bcm27xx/patches-6.1/950-0052-drm-vc4-Add-comments-for-which-HVS_PIXEL_ORDER_xxx-d.patch
deleted file mode 100644
index 83f1fdca90..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0052-drm-vc4-Add-comments-for-which-HVS_PIXEL_ORDER_xxx-d.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 30f0c2f0da952655da949c2af36bf53138092ba5 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Mon, 6 Jun 2022 14:53:56 +0100
-Subject: [PATCH] drm: vc4: Add comments for which HVS_PIXEL_ORDER_xxx
- defines apply
-
-The HVS_PIXEL_ORDER_xxx defines apply to specific HVS_PIXEL_FORMAT_xxx
-modes, so add comments to make this obvious.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_regs.h | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/gpu/drm/vc4/vc4_regs.h
-+++ b/drivers/gpu/drm/vc4/vc4_regs.h
-@@ -870,16 +870,19 @@ enum hvs_pixel_format {
- /* Note: the LSB is the rightmost character shown.  Only valid for
-  * HVS_PIXEL_FORMAT_RGB8888, not RGB888.
-  */
-+/* For modes 332, 4444, 555, 5551, 6666, 8888, 10:10:10:2 */
- #define HVS_PIXEL_ORDER_RGBA			0
- #define HVS_PIXEL_ORDER_BGRA			1
- #define HVS_PIXEL_ORDER_ARGB			2
- #define HVS_PIXEL_ORDER_ABGR			3
- 
-+/* For modes 666 and 888 (4 & 5) */
- #define HVS_PIXEL_ORDER_XBRG			0
- #define HVS_PIXEL_ORDER_XRBG			1
- #define HVS_PIXEL_ORDER_XRGB			2
- #define HVS_PIXEL_ORDER_XBGR			3
- 
-+/* For YCbCr modes (8-12, and 17) */
- #define HVS_PIXEL_ORDER_XYCBCR			0
- #define HVS_PIXEL_ORDER_XYCRCB			1
- #define HVS_PIXEL_ORDER_YXCBCR			2
diff --git a/target/linux/bcm27xx/patches-6.1/950-0053-drm-vc4-Add-async-update-support-for-cursor-planes.patch b/target/linux/bcm27xx/patches-6.1/950-0053-drm-vc4-Add-async-update-support-for-cursor-planes.patch
deleted file mode 100644
index 24e46f87e7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0053-drm-vc4-Add-async-update-support-for-cursor-planes.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From e6f7f8f83e736bb94b146781b149810853b2bff3 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <8911409+pelwell@users.noreply.github.com>
-Date: Wed, 24 Aug 2022 11:14:40 +0100
-Subject: [PATCH] drm/vc4: Add async update support for cursor planes
-
-Now that cursors are implemented as regular planes, all cursor
-movements result in atomic updates. As the firmware-kms driver
-doesn't support asynchronous updates, these are synchronous, which
-limits the update rate to the screen refresh rate. Xorg seems unaware
-of this (or at least of the effect of this), because if the mouse is
-configured with a higher update rate than the screen then continuous
-mouse movement results in an increasing backlog of mouse events -
-cue extreme lag.
-
-Add minimal support for asynchronous updates - limited to cursor
-planes - to eliminate the lag.
-
-See: https://github.com/raspberrypi/linux/pull/4971
-     https://github.com/raspberrypi/linux/issues/4988
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_firmware_kms.c | 46 ++++++++++++++++++++++++++
- 1 file changed, 46 insertions(+)
-
---- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-+++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-@@ -675,6 +675,50 @@ static int vc4_plane_atomic_check(struct
- 	return vc4_plane_to_mb(plane, &vc4_plane->mb, new_plane_state);
- }
- 
-+static void vc4_plane_atomic_async_update(struct drm_plane *plane,
-+					  struct drm_atomic_state *state)
-+{
-+	struct drm_plane_state *new_plane_state =
-+		drm_atomic_get_new_plane_state(state, plane);
-+
-+	swap(plane->state->fb, new_plane_state->fb);
-+	plane->state->crtc_x = new_plane_state->crtc_x;
-+	plane->state->crtc_y = new_plane_state->crtc_y;
-+	plane->state->crtc_w = new_plane_state->crtc_w;
-+	plane->state->crtc_h = new_plane_state->crtc_h;
-+	plane->state->src_x = new_plane_state->src_x;
-+	plane->state->src_y = new_plane_state->src_y;
-+	plane->state->src_w = new_plane_state->src_w;
-+	plane->state->src_h = new_plane_state->src_h;
-+	plane->state->alpha = new_plane_state->alpha;
-+	plane->state->pixel_blend_mode = new_plane_state->pixel_blend_mode;
-+	plane->state->rotation = new_plane_state->rotation;
-+	plane->state->zpos = new_plane_state->zpos;
-+	plane->state->normalized_zpos = new_plane_state->normalized_zpos;
-+	plane->state->color_encoding = new_plane_state->color_encoding;
-+	plane->state->color_range = new_plane_state->color_range;
-+	plane->state->src = new_plane_state->src;
-+	plane->state->dst = new_plane_state->dst;
-+	plane->state->visible = new_plane_state->visible;
-+
-+	vc4_plane_set_blank(plane, false);
-+}
-+
-+static int vc4_plane_atomic_async_check(struct drm_plane *plane,
-+					struct drm_atomic_state *state)
-+{
-+	struct drm_plane_state *new_plane_state =
-+		drm_atomic_get_new_plane_state(state, plane);
-+	int ret = -EINVAL;
-+
-+	if (plane->type == 2 &&
-+	    plane->state->fb &&
-+	    new_plane_state->crtc->state->active)
-+		ret = 0;
-+
-+	return ret;
-+}
-+
- /* Called during init to allocate the plane's atomic state. */
- static void vc4_plane_reset(struct drm_plane *plane)
- {
-@@ -769,6 +813,8 @@ static const struct drm_plane_helper_fun
- 	.atomic_check = vc4_plane_atomic_check,
- 	.atomic_update = vc4_plane_atomic_update,
- 	.atomic_disable = vc4_plane_atomic_disable,
-+	.atomic_async_check = vc4_plane_atomic_async_check,
-+	.atomic_async_update = vc4_plane_atomic_async_update,
- };
- 
- static struct drm_plane *vc4_fkms_plane_init(struct drm_device *dev,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0054-drm-vc4-Configure-the-HVS-COB-allocations.patch b/target/linux/bcm27xx/patches-6.1/950-0054-drm-vc4-Configure-the-HVS-COB-allocations.patch
deleted file mode 100644
index 41d2d00dc5..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0054-drm-vc4-Configure-the-HVS-COB-allocations.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 4477b8c71c8b3b5aa8bd15f9993f48d02d178fc5 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 11 Aug 2022 13:49:16 +0100
-Subject: [PATCH] drm/vc4: Configure the HVS COB allocations
-
-The HVS Composite Output Buffer (COB) is the memory used to
-generate the output pixel data.
-Until now the vc4 driver has been relying on the firmware to
-have set these to sensible values.
-
-In testing triple screen support it has been noted that only
-1 line was being assigned to HVS channel 2. Whilst that is fine
-for the transposer (TXP), and indeed needed as only some pixels
-have an alpha channel, it is insufficient to run a live display.
-
-Split the COB more evenly between the 3 HVS channels.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-Revert vc4_regs change
----
- drivers/gpu/drm/vc4/vc4_hvs.c | 56 ++++++++++++++++++++++++++++++++++-
- 1 file changed, 55 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -1013,7 +1013,7 @@ static int vc4_hvs_bind(struct device *d
- 	struct vc4_hvs *hvs = NULL;
- 	int ret;
- 	u32 dispctrl;
--	u32 reg;
-+	u32 reg, top;
- 
- 	hvs = drmm_kzalloc(drm, sizeof(*hvs), GFP_KERNEL);
- 	if (!hvs)
-@@ -1151,6 +1151,60 @@ static int vc4_hvs_bind(struct device *d
- 
- 	HVS_WRITE(SCALER_DISPCTRL, dispctrl);
- 
-+	/* Recompute Composite Output Buffer (COB) allocations for the displays
-+	 */
-+	if (!vc4->is_vc5) {
-+		/* The COB is 20736 pixels, or just over 10 lines at 2048 wide.
-+		 * The bottom 2048 pixels are full 32bpp RGBA (intended for the
-+		 * TXP composing RGBA to memory), whilst the remainder are only
-+		 * 24bpp RGB.
-+		 *
-+		 * Assign 3 lines to channels 1 & 2, and just over 4 lines to
-+		 * channel 0.
-+		 */
-+		#define VC4_COB_SIZE		20736
-+		#define VC4_COB_LINE_WIDTH	2048
-+		#define VC4_COB_NUM_LINES	3
-+		reg = 0;
-+		top = VC4_COB_LINE_WIDTH * VC4_COB_NUM_LINES;
-+		reg |= (top - 1) << 16;
-+		HVS_WRITE(SCALER_DISPBASE2, reg);
-+		reg = top;
-+		top += VC4_COB_LINE_WIDTH * VC4_COB_NUM_LINES;
-+		reg |= (top - 1) << 16;
-+		HVS_WRITE(SCALER_DISPBASE1, reg);
-+		reg = top;
-+		top = VC4_COB_SIZE;
-+		reg |= (top - 1) << 16;
-+		HVS_WRITE(SCALER_DISPBASE0, reg);
-+	} else {
-+		/* The COB is 44416 pixels, or 10.8 lines at 4096 wide.
-+		 * The bottom 4096 pixels are full RGBA (intended for the TXP
-+		 * composing RGBA to memory), whilst the remainder are only
-+		 * RGB. Addressing is always pixel wide.
-+		 *
-+		 * Assign 3 lines of 4096 to channels 1 & 2, and just over 4
-+		 * lines. to channel 0.
-+		 */
-+		#define VC5_COB_SIZE		44416
-+		#define VC5_COB_LINE_WIDTH	4096
-+		#define VC5_COB_NUM_LINES	3
-+		reg = 0;
-+		top = VC5_COB_LINE_WIDTH * VC5_COB_NUM_LINES;
-+		reg |= top << 16;
-+		HVS_WRITE(SCALER_DISPBASE2, reg);
-+		top += 16;
-+		reg = top;
-+		top += VC5_COB_LINE_WIDTH * VC5_COB_NUM_LINES;
-+		reg |= top << 16;
-+		HVS_WRITE(SCALER_DISPBASE1, reg);
-+		top += 16;
-+		reg = top;
-+		top = VC5_COB_SIZE;
-+		reg |= top << 16;
-+		HVS_WRITE(SCALER_DISPBASE0, reg);
-+	}
-+
- 	ret = devm_request_irq(dev, platform_get_irq(pdev, 0),
- 			       vc4_hvs_irq_handler, 0, "vc4 hvs", drm);
- 	if (ret)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0055-drm-vc4-Set-AXI-panic-modes-for-the-HVS.patch b/target/linux/bcm27xx/patches-6.1/950-0055-drm-vc4-Set-AXI-panic-modes-for-the-HVS.patch
deleted file mode 100644
index 40465b0373..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0055-drm-vc4-Set-AXI-panic-modes-for-the-HVS.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From b6b9915ad0b9c70c3b7edc45dfca2fdcfd4ba5cb Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 11 Aug 2022 13:59:34 +0100
-Subject: [PATCH] drm/vc4: Set AXI panic modes for the HVS
-
-The HVS can change AXI request mode based on how full the COB
-FIFOs are.
-Until now the vc4 driver has been relying on the firmware to
-have set these to sensible values.
-
-With HVS channel 2 now being used for live video, change the
-panic mode for all channels to be explicitly set by the driver,
-and the same for all channels.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_hvs.c | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -1149,6 +1149,17 @@ static int vc4_hvs_bind(struct device *d
- 	dispctrl |= VC4_SET_FIELD(2, SCALER_DISPCTRL_PANIC1);
- 	dispctrl |= VC4_SET_FIELD(2, SCALER_DISPCTRL_PANIC2);
- 
-+	/* Set AXI panic mode.
-+	 * VC4 panics when < 2 lines in FIFO.
-+	 * VC5 panics when less than 1 line in the FIFO.
-+	 */
-+	dispctrl &= ~(SCALER_DISPCTRL_PANIC0_MASK |
-+		      SCALER_DISPCTRL_PANIC1_MASK |
-+		      SCALER_DISPCTRL_PANIC2_MASK);
-+	dispctrl |= VC4_SET_FIELD(2, SCALER_DISPCTRL_PANIC0);
-+	dispctrl |= VC4_SET_FIELD(2, SCALER_DISPCTRL_PANIC1);
-+	dispctrl |= VC4_SET_FIELD(2, SCALER_DISPCTRL_PANIC2);
-+
- 	HVS_WRITE(SCALER_DISPCTRL, dispctrl);
- 
- 	/* Recompute Composite Output Buffer (COB) allocations for the displays
diff --git a/target/linux/bcm27xx/patches-6.1/950-0056-drm-vc4-hvs-Skip-DebugFS-Registration-for-FKMS.patch b/target/linux/bcm27xx/patches-6.1/950-0056-drm-vc4-hvs-Skip-DebugFS-Registration-for-FKMS.patch
deleted file mode 100644
index d40d5a7b25..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0056-drm-vc4-hvs-Skip-DebugFS-Registration-for-FKMS.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6674a753e11c7c623926a8fed128a9ed86530e5c Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Mon, 11 Jul 2022 10:38:25 +0200
-Subject: [PATCH] drm/vc4: hvs: Skip DebugFS Registration for FKMS
-
-FKMS doesn't have an HVS and it's expected. Return from the debugfs init
-function immediately if we're running with fkms.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_hvs.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -975,6 +975,9 @@ int vc4_hvs_debugfs_init(struct drm_mino
- 	struct vc4_hvs *hvs = vc4->hvs;
- 	int ret;
- 
-+	if (vc4->firmware_kms)
-+		return 0;
-+
- 	if (!vc4->hvs)
- 		return -ENODEV;
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0057-media-uapi-Add-some-RGB-bus-formats-for-VC4-DPI-outp.patch b/target/linux/bcm27xx/patches-6.1/950-0057-media-uapi-Add-some-RGB-bus-formats-for-VC4-DPI-outp.patch
deleted file mode 100644
index 2979aede23..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0057-media-uapi-Add-some-RGB-bus-formats-for-VC4-DPI-outp.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 8400889a0f241a12353673c35087bf6c38ea09e9 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Mon, 15 Aug 2022 13:34:02 +0200
-Subject: [PATCH] media: uapi: Add some RGB bus formats for VC4 DPI
- output
-
-The VC4 DPI controller can output more RGB formats that aren't described
-through a media bus format yet, so let's add them.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- include/uapi/linux/media-bus-format.h | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
---- a/include/uapi/linux/media-bus-format.h
-+++ b/include/uapi/linux/media-bus-format.h
-@@ -34,19 +34,22 @@
- 
- #define MEDIA_BUS_FMT_FIXED			0x0001
- 
--/* RGB - next is	0x1022 */
-+/* RGB - next is	0x1025 */
- #define MEDIA_BUS_FMT_RGB444_1X12		0x1016
- #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE	0x1001
- #define MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE	0x1002
- #define MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE	0x1003
- #define MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE	0x1004
- #define MEDIA_BUS_FMT_RGB565_1X16		0x1017
-+#define MEDIA_BUS_FMT_RGB565_1X24_CPADHI	0x1022
- #define MEDIA_BUS_FMT_BGR565_2X8_BE		0x1005
- #define MEDIA_BUS_FMT_BGR565_2X8_LE		0x1006
- #define MEDIA_BUS_FMT_RGB565_2X8_BE		0x1007
- #define MEDIA_BUS_FMT_RGB565_2X8_LE		0x1008
-+#define MEDIA_BUS_FMT_BGR666_1X18		0x1023
- #define MEDIA_BUS_FMT_RGB666_1X18		0x1009
- #define MEDIA_BUS_FMT_RBG888_1X24		0x100e
-+#define MEDIA_BUS_FMT_BGR666_1X24_CPADHI	0x1024
- #define MEDIA_BUS_FMT_RGB666_1X24_CPADHI	0x1015
- #define MEDIA_BUS_FMT_RGB666_1X7X3_SPWG		0x1010
- #define MEDIA_BUS_FMT_BGR888_1X24		0x1013
diff --git a/target/linux/bcm27xx/patches-6.1/950-0058-raspberrypi-firmware-Update-mailbox-commands.patch b/target/linux/bcm27xx/patches-6.1/950-0058-raspberrypi-firmware-Update-mailbox-commands.patch
deleted file mode 100644
index 4db60cca80..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0058-raspberrypi-firmware-Update-mailbox-commands.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 9c48213eaa5603790ef3213637fd49bdb07e234a Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Thu, 7 Apr 2022 18:23:07 +0100
-Subject: [PATCH] raspberrypi-firmware: Update mailbox commands
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- include/soc/bcm2835/raspberrypi-firmware.h | 28 +++++++++++++++++++++-
- 1 file changed, 27 insertions(+), 1 deletion(-)
-
---- a/include/soc/bcm2835/raspberrypi-firmware.h
-+++ b/include/soc/bcm2835/raspberrypi-firmware.h
-@@ -36,6 +36,8 @@ struct rpi_firmware_property_tag_header
- enum rpi_firmware_property_tag {
- 	RPI_FIRMWARE_PROPERTY_END =                           0,
- 	RPI_FIRMWARE_GET_FIRMWARE_REVISION =                  0x00000001,
-+	RPI_FIRMWARE_GET_FIRMWARE_VARIANT =                   0x00000002,
-+	RPI_FIRMWARE_GET_FIRMWARE_HASH =                      0x00000003,
- 
- 	RPI_FIRMWARE_SET_CURSOR_INFO =                        0x00008010,
- 	RPI_FIRMWARE_SET_CURSOR_STATE =                       0x00008011,
-@@ -71,6 +73,7 @@ enum rpi_firmware_property_tag {
- 	RPI_FIRMWARE_GET_DISPMANX_RESOURCE_MEM_HANDLE =       0x00030014,
- 	RPI_FIRMWARE_GET_EDID_BLOCK =                         0x00030020,
- 	RPI_FIRMWARE_GET_CUSTOMER_OTP =                       0x00030021,
-+	RPI_FIRMWARE_GET_EDID_BLOCK_DISPLAY =                 0x00030023,
- 	RPI_FIRMWARE_GET_DOMAIN_STATE =                       0x00030030,
- 	RPI_FIRMWARE_GET_THROTTLED =                          0x00030046,
- 	RPI_FIRMWARE_GET_CLOCK_MEASURED =                     0x00030047,
-@@ -89,8 +92,11 @@ enum rpi_firmware_property_tag {
- 	RPI_FIRMWARE_GET_PERIPH_REG =                         0x00030045,
- 	RPI_FIRMWARE_SET_PERIPH_REG =                         0x00038045,
- 	RPI_FIRMWARE_GET_POE_HAT_VAL =                        0x00030049,
--	RPI_FIRMWARE_SET_POE_HAT_VAL =                        0x00030050,
-+	RPI_FIRMWARE_SET_POE_HAT_VAL =                        0x00038049,
-+	RPI_FIRMWARE_SET_POE_HAT_VAL_OLD =                    0x00030050,
- 	RPI_FIRMWARE_NOTIFY_XHCI_RESET =                      0x00030058,
-+	RPI_FIRMWARE_GET_REBOOT_FLAGS =                       0x00030064,
-+	RPI_FIRMWARE_SET_REBOOT_FLAGS =                       0x00038064,
- 	RPI_FIRMWARE_NOTIFY_DISPLAY_DONE =                    0x00030066,
- 
- 	/* Dispmanx TAGS */
-@@ -105,9 +111,16 @@ enum rpi_firmware_property_tag {
- 	RPI_FIRMWARE_FRAMEBUFFER_GET_VIRTUAL_OFFSET =         0x00040009,
- 	RPI_FIRMWARE_FRAMEBUFFER_GET_OVERSCAN =               0x0004000a,
- 	RPI_FIRMWARE_FRAMEBUFFER_GET_PALETTE =                0x0004000b,
-+	RPI_FIRMWARE_FRAMEBUFFER_GET_LAYER =                  0x0004000c,
-+	RPI_FIRMWARE_FRAMEBUFFER_GET_TRANSFORM =              0x0004000d,
-+	RPI_FIRMWARE_FRAMEBUFFER_GET_VSYNC =                  0x0004000e,
- 	RPI_FIRMWARE_FRAMEBUFFER_GET_TOUCHBUF =               0x0004000f,
- 	RPI_FIRMWARE_FRAMEBUFFER_GET_GPIOVIRTBUF =            0x00040010,
- 	RPI_FIRMWARE_FRAMEBUFFER_RELEASE =                    0x00048001,
-+	RPI_FIRMWARE_FRAMEBUFFER_GET_DISPLAY_ID =             0x00040016,
-+	RPI_FIRMWARE_FRAMEBUFFER_SET_DISPLAY_NUM =            0x00048013,
-+	RPI_FIRMWARE_FRAMEBUFFER_GET_NUM_DISPLAYS =           0x00040013,
-+	RPI_FIRMWARE_FRAMEBUFFER_GET_DISPLAY_SETTINGS =       0x00040014,
- 	RPI_FIRMWARE_FRAMEBUFFER_TEST_PHYSICAL_WIDTH_HEIGHT = 0x00044003,
- 	RPI_FIRMWARE_FRAMEBUFFER_TEST_VIRTUAL_WIDTH_HEIGHT =  0x00044004,
- 	RPI_FIRMWARE_FRAMEBUFFER_TEST_DEPTH =                 0x00044005,
-@@ -116,26 +129,39 @@ enum rpi_firmware_property_tag {
- 	RPI_FIRMWARE_FRAMEBUFFER_TEST_VIRTUAL_OFFSET =        0x00044009,
- 	RPI_FIRMWARE_FRAMEBUFFER_TEST_OVERSCAN =              0x0004400a,
- 	RPI_FIRMWARE_FRAMEBUFFER_TEST_PALETTE =               0x0004400b,
-+	RPI_FIRMWARE_FRAMEBUFFER_TEST_LAYER =                 0x0004400c,
-+	RPI_FIRMWARE_FRAMEBUFFER_TEST_TRANSFORM =             0x0004400d,
- 	RPI_FIRMWARE_FRAMEBUFFER_TEST_VSYNC =                 0x0004400e,
- 	RPI_FIRMWARE_FRAMEBUFFER_SET_PHYSICAL_WIDTH_HEIGHT =  0x00048003,
- 	RPI_FIRMWARE_FRAMEBUFFER_SET_VIRTUAL_WIDTH_HEIGHT =   0x00048004,
- 	RPI_FIRMWARE_FRAMEBUFFER_SET_DEPTH =                  0x00048005,
- 	RPI_FIRMWARE_FRAMEBUFFER_SET_PIXEL_ORDER =            0x00048006,
- 	RPI_FIRMWARE_FRAMEBUFFER_SET_ALPHA_MODE =             0x00048007,
-+	RPI_FIRMWARE_FRAMEBUFFER_SET_PITCH =                  0x00048008,
- 	RPI_FIRMWARE_FRAMEBUFFER_SET_VIRTUAL_OFFSET =         0x00048009,
- 	RPI_FIRMWARE_FRAMEBUFFER_SET_OVERSCAN =               0x0004800a,
- 	RPI_FIRMWARE_FRAMEBUFFER_SET_PALETTE =                0x0004800b,
-+
- 	RPI_FIRMWARE_FRAMEBUFFER_SET_TOUCHBUF =               0x0004801f,
- 	RPI_FIRMWARE_FRAMEBUFFER_SET_GPIOVIRTBUF =            0x00048020,
- 	RPI_FIRMWARE_FRAMEBUFFER_SET_VSYNC =                  0x0004800e,
-+	RPI_FIRMWARE_FRAMEBUFFER_SET_LAYER =                  0x0004800c,
-+	RPI_FIRMWARE_FRAMEBUFFER_SET_TRANSFORM =              0x0004800d,
- 	RPI_FIRMWARE_FRAMEBUFFER_SET_BACKLIGHT =              0x0004800f,
- 
- 	RPI_FIRMWARE_VCHIQ_INIT =                             0x00048010,
- 
-+	RPI_FIRMWARE_SET_PLANE =                              0x00048015,
-+	RPI_FIRMWARE_GET_DISPLAY_TIMING =                     0x00040017,
-+	RPI_FIRMWARE_SET_TIMING =                             0x00048017,
-+	RPI_FIRMWARE_GET_DISPLAY_CFG =                        0x00040018,
-+	RPI_FIRMWARE_SET_DISPLAY_POWER =		      0x00048019,
- 	RPI_FIRMWARE_GET_COMMAND_LINE =                       0x00050001,
- 	RPI_FIRMWARE_GET_DMA_CHANNELS =                       0x00060001,
- };
- 
-+#define GET_DISPLAY_SETTINGS_PAYLOAD_SIZE 64
-+
- #if IS_ENABLED(CONFIG_RASPBERRYPI_FIRMWARE)
- int rpi_firmware_property(struct rpi_firmware *fw,
- 			  u32 tag, void *data, size_t len);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0059-clk-bcm-rpi-Create-helper-to-retrieve-private-data.patch b/target/linux/bcm27xx/patches-6.1/950-0059-clk-bcm-rpi-Create-helper-to-retrieve-private-data.patch
deleted file mode 100644
index 1fd0792ddc..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0059-clk-bcm-rpi-Create-helper-to-retrieve-private-data.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From cdb7a9e14810f5cd40abf9cd3959294ee9283069 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Mon, 11 Jul 2022 15:58:36 +0200
-Subject: [PATCH] clk: bcm: rpi: Create helper to retrieve private data
-
-The RaspberryPi firmware clocks driver uses in several instances a
-container_of to retrieve the struct raspberrypi_clk_data from a pointer
-to struct clk_hw. Let's create a small function to avoid duplicating it
-all over the place.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/clk/bcm/clk-raspberrypi.c | 18 ++++++++++--------
- 1 file changed, 10 insertions(+), 8 deletions(-)
-
---- a/drivers/clk/bcm/clk-raspberrypi.c
-+++ b/drivers/clk/bcm/clk-raspberrypi.c
-@@ -75,6 +75,12 @@ struct raspberrypi_clk_data {
- 	struct raspberrypi_clk *rpi;
- };
- 
-+static inline
-+const struct raspberrypi_clk_data *clk_hw_to_data(const struct clk_hw *hw)
-+{
-+	return container_of(hw, struct raspberrypi_clk_data, hw);
-+}
-+
- struct raspberrypi_clk_variant {
- 	bool		export;
- 	char		*clkdev;
-@@ -187,8 +193,7 @@ static int raspberrypi_clock_property(st
- 
- static int raspberrypi_fw_is_prepared(struct clk_hw *hw)
- {
--	struct raspberrypi_clk_data *data =
--		container_of(hw, struct raspberrypi_clk_data, hw);
-+	const struct raspberrypi_clk_data *data = clk_hw_to_data(hw);
- 	struct raspberrypi_clk *rpi = data->rpi;
- 	u32 val = 0;
- 	int ret;
-@@ -205,8 +210,7 @@ static int raspberrypi_fw_is_prepared(st
- static unsigned long raspberrypi_fw_get_rate(struct clk_hw *hw,
- 					     unsigned long parent_rate)
- {
--	struct raspberrypi_clk_data *data =
--		container_of(hw, struct raspberrypi_clk_data, hw);
-+	const struct raspberrypi_clk_data *data = clk_hw_to_data(hw);
- 	struct raspberrypi_clk *rpi = data->rpi;
- 	u32 val = 0;
- 	int ret;
-@@ -222,8 +226,7 @@ static unsigned long raspberrypi_fw_get_
- static int raspberrypi_fw_set_rate(struct clk_hw *hw, unsigned long rate,
- 				   unsigned long parent_rate)
- {
--	struct raspberrypi_clk_data *data =
--		container_of(hw, struct raspberrypi_clk_data, hw);
-+	const struct raspberrypi_clk_data *data = clk_hw_to_data(hw);
- 	struct raspberrypi_clk *rpi = data->rpi;
- 	u32 _rate = rate;
- 	int ret;
-@@ -240,8 +243,7 @@ static int raspberrypi_fw_set_rate(struc
- static int raspberrypi_fw_dumb_determine_rate(struct clk_hw *hw,
- 					      struct clk_rate_request *req)
- {
--	struct raspberrypi_clk_data *data =
--		container_of(hw, struct raspberrypi_clk_data, hw);
-+	const struct raspberrypi_clk_data *data = clk_hw_to_data(hw);
- 	struct raspberrypi_clk_variant *variant = data->variant;
- 
- 	/*
diff --git a/target/linux/bcm27xx/patches-6.1/950-0060-arm64-setup-Fix-build-warning.patch b/target/linux/bcm27xx/patches-6.1/950-0060-arm64-setup-Fix-build-warning.patch
deleted file mode 100644
index bc6065bce8..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0060-arm64-setup-Fix-build-warning.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From eedea0d30a542f255626876be44929af8efc337a Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Mon, 6 Jun 2022 11:02:16 +0200
-Subject: [PATCH] arm64: setup: Fix build warning
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- arch/arm64/kernel/setup.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/arch/arm64/kernel/setup.c
-+++ b/arch/arm64/kernel/setup.c
-@@ -222,9 +222,9 @@ static void __init request_standard_reso
- 	size_t res_size;
- 
- 	kernel_code.start   = __pa_symbol(_stext);
--	kernel_code.end     = __pa_symbol(__init_begin - 1);
-+	kernel_code.end     = __pa_symbol(__init_begin) - 1;
- 	kernel_data.start   = __pa_symbol(_sdata);
--	kernel_data.end     = __pa_symbol(_end - 1);
-+	kernel_data.end     = __pa_symbol(_end) - 1;
- 	insert_resource(&iomem_resource, &kernel_code);
- 	insert_resource(&iomem_resource, &kernel_data);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0061-BCM2708-Add-core-Device-Tree-support.patch b/target/linux/bcm27xx/patches-6.1/950-0061-BCM2708-Add-core-Device-Tree-support.patch
deleted file mode 100644
index 442abb456f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0061-BCM2708-Add-core-Device-Tree-support.patch
+++ /dev/null
@@ -1,37866 +0,0 @@
-From c34870e7abd75a66d473b1e3c12d47e8b9c349e6 Mon Sep 17 00:00:00 2001
-From: notro <notro@tronnes.org>
-Date: Wed, 9 Jul 2014 14:46:08 +0200
-Subject: [PATCH] BCM2708: Add core Device Tree support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Add the bare minimum needed to boot BCM2708 from a Device Tree.
-
-Signed-off-by: Noralf Tronnes <notro@tronnes.org>
-
-BCM2708: DT: change 'axi' nodename to 'soc'
-
-Change DT node named 'axi' to 'soc' so it matches ARCH_BCM2835.
-The VC4 bootloader fills in certain properties in the 'axi' subtree,
-but since this is part of an upstreaming effort, the name is changed.
-
-Signed-off-by: Noralf Tronnes notro@tronnes.org
-
-BCM2708_DT: Correct length of the peripheral space
-
-Use dts-dirs feature for overlays.
-
-The kernel makefiles have a dts-dirs target that is for vendor subdirectories.
-
-Using this fixes the install_dtbs target, which previously did not install the overlays.
-
-BCM270X_DT: configure I2S DMA channels
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
-
-BCM270X_DT: switch to bcm2835-i2s
-
-I2S soundcard drivers with proper devicetree support (i.e. not linking
-to the cpu_dai/platform via name but to cpu/platform via of_node)
-will work out of the box without any modifications.
-
-When the kernel is compiled without devicetree support the platform
-code will instantiate the bcm2708-i2s driver and I2S soundcard drivers
-will link to it via name, as before.
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
-
-SDIO-overlay: add poll_once-boolean parameter
-
-Add paramter to toggle sdio-device-polling
-done every second or once at boot-time.
-
-Signed-off-by: Patrick Boettcher <patrick.boettcher@posteo.de>
-
-BCM270X_DT: Make mmc overlay compatible with current firmware
-
-The original DT overlay logic followed a merge-then-patch procedure,
-i.e. parameters are applied to the loaded overlay before the overlay
-is merged into the base DTB. This sequence has been changed to
-patch-then-merge, in order to support parameterised node names, and
-to protect against bad overlays. As a result, overrides (parameters)
-must only target labels in the overlay, but the overlay can obviously target nodes in the base DTB.
-
-mmc-overlay.dts (that switches back to the original mmc sdcard
-driver) is the only overlay violating that rule, and this patch
-fixes it.
-
-bcm270x_dt: Use the sdhost MMC controller by default
-
-The "mmc" overlay reverts to using the other controller.
-
-squash: Add cprman to dt
-
-BCM270X_DT: Use clk_core for I2C interfaces
-
-BCM270X_DT: Use bcm283x.dtsi, bcm2835.dtsi and bcm2836.dtsi
-
-The mainline Device Tree files are quite close to downstream now.
-Let's use bcm283x.dtsi, bcm2835.dtsi and bcm2836.dtsi as base files
-for our dts files.
-
-Mainline dts files are based on these files:
-
-          bcm2835-rpi.dtsi
-  bcm2835.dtsi    bcm2836.dtsi
-          bcm283x.dtsi
-
-Current downstream are based on these:
-
-  bcm2708.dtsi    bcm2709.dtsi    bcm2710.dtsi
-             bcm2708_common.dtsi
-
-This patch introduces this dependency:
-
-  bcm2708.dtsi    bcm2709.dtsi
-          bcm2708-rpi.dtsi
-          bcm270x.dtsi
-  bcm2835.dtsi    bcm2836.dtsi
-          bcm283x.dtsi
-
-And:
-          bcm2710.dtsi
-          bcm2708-rpi.dtsi
-          bcm270x.dtsi
-          bcm283x.dtsi
-
-bcm270x.dtsi contains the downstream bcm283x.dtsi diff.
-bcm2708-rpi.dtsi is the downstream version of bcm2835-rpi.dtsi.
-
-Other changes:
-- The led node has moved from /soc/leds to /leds. This is not a problem
-  since the label is used to reference it.
-- The clk_osc reg property changes from 6 to 3.
-- The gpu nodes has their interrupt property set in the base file.
-- the clocks label does not point to the /clocks node anymore, but
-  points to the cprman node. This is not a problem since the overlays
-  that use the clock node refer to it directly: target-path = "/clocks";
-- some nodes now have 2 labels since mainline and downstream differs in
-  this respect: cprman/clocks, spi0/spi, gpu/vc4.
-- some nodes doesn't have an explicit status = "okay" since they're not
-  disabled in the base file: watchdog and random.
-- gpiomem doesn't need an explicit status = "okay".
-- bcm2708-rpi-cm.dts got the hpd-gpios property from bcm2708_common.dtsi,
-  it's now set directly in that file.
-- bcm2709-rpi-2-b.dts has the timer node moved from /soc/timer to /timer.
-- Removed clock-frequency property on the bcm{2709,2710}.dtsi timer nodes.
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-
-BCM270X_DT: Use raspberrypi-power to turn on USB power
-
-Use the raspberrypi-power driver to turn on USB power.
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-
-BCM270X_DT: Add a .dtbo target, use for overlays
-
-Change the filenames and extensions to keep the pre-DDT style of
-overlay (<name>-overlay.dtb) distinct from new ones that use a
-different style of local fixups (<name>.dtbo), and to match other
-platforms.
-
-The RPi firmware uses the DDTK trailer atom to choose which type of
-overlay to use for each kernel.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-BCM270X_DT: Don't generate "linux,phandle" props
-
-The EPAPR standard says to use "phandle" properties to store phandles,
-rather than the deprecated "linux,phandle" version. By default, dtc
-generates both, but adding "-H epapr" causes it to only generate
-"phandle"s, saving some space and clutter.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-BCM270X_DT: Add overlay for enc28j60 on SPI2
-
-Works on SPI2 for compute module
-
-BCM270X_DT: Add midi-uart0 overlay
-
-MIDI requires 31.25kbaud, a baudrate unsupported by Linux. The
-midi-uart0 overlay configures uart0 (ttyAMA0) to use a fake clock
-so that requesting 38.4kbaud actually gets 31.25kbaud.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-BCM270X_DT: Add i2c-sensor overlay
-
-The i2c-sensor overlay is a container for various pressure and
-temperature sensors, currently bmp085 and bmp280. The standalone
-bmp085_i2c-sensor overlay is now deprecated.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-BCM270X_DT: overlays/*-overlay.dtb -> overlays/*.dtbo (#1752)
-
-We now create overlays as .dtbo files.
-
-build: support for .dtbo files for dtb overlays
-
-Kernel 4.4.6+ on RaspberryPi support .dtbo files for overlays, instead of .dtb.
-Patch the kernel, which has faulty rules to generate .dtbo the way yocto does
-
-Signed-off-by: Herve Jourdain <herve.jourdain@neuf.fr>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-BCM270X: Drop position requirement for CMA in VC4 overlay.
-
-No longer necessary since 2aefcd576195a739a7a256099571c9c4a401005f,
-and will probably let peeople that want to choose a larger CMA
-allocation (particularly on pi0/1).
-
-Signed-off-by: Eric Anholt <eric@anholt.net>
-
-BCM270X_DT: RPi Device Tree tidy
-
-Use the upstream sdhost node, add thermal-zones, and factor out some
-common elements.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-kbuild: Silence unhelpful DTC warnings
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-BCM270X_DT: DT build rules no longer arch-specific
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- arch/arm/boot/dts/Makefile                    |   31 +
- arch/arm/boot/dts/bcm2708-rpi-b-plus.dts      |  200 +
- arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts      |  208 +
- arch/arm/boot/dts/bcm2708-rpi-b.dts           |  190 +
- arch/arm/boot/dts/bcm2708-rpi-bt.dtsi         |   26 +
- arch/arm/boot/dts/bcm2708-rpi-cm.dts          |  171 +
- arch/arm/boot/dts/bcm2708-rpi-cm.dtsi         |   22 +
- arch/arm/boot/dts/bcm2708-rpi-zero-w.dts      |  246 +
- arch/arm/boot/dts/bcm2708-rpi-zero.dts        |  187 +
- arch/arm/boot/dts/bcm2708-rpi.dtsi            |   40 +
- arch/arm/boot/dts/bcm2708.dtsi                |   18 +
- arch/arm/boot/dts/bcm2709-rpi-2-b.dts         |  200 +
- arch/arm/boot/dts/bcm2709-rpi-cm2.dts         |  221 +
- arch/arm/boot/dts/bcm2709-rpi.dtsi            |    5 +
- arch/arm/boot/dts/bcm2709.dtsi                |   24 +
- arch/arm/boot/dts/bcm270x-rpi.dtsi            |  177 +
- arch/arm/boot/dts/bcm270x.dtsi                |  294 ++
- arch/arm/boot/dts/bcm2710-rpi-2-b.dts         |  200 +
- arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts    |  289 ++
- arch/arm/boot/dts/bcm2710-rpi-3-b.dts         |  291 ++
- arch/arm/boot/dts/bcm2710-rpi-cm3.dts         |  220 +
- arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts    |  267 +
- arch/arm/boot/dts/bcm2710-rpi-zero-2.dts      |    1 +
- arch/arm/boot/dts/bcm2710.dtsi                |   27 +
- arch/arm/boot/dts/bcm2711-rpi-4-b.dts         |  320 +-
- arch/arm/boot/dts/bcm2711-rpi-400.dts         |  532 +-
- arch/arm/boot/dts/bcm2711-rpi-cm4.dts         |  578 +++
- arch/arm/boot/dts/bcm2711-rpi-cm4s.dts        |  427 ++
- arch/arm/boot/dts/bcm2711-rpi-ds.dtsi         |  292 ++
- arch/arm/boot/dts/bcm2711-rpi.dtsi            |   13 +
- arch/arm/boot/dts/bcm271x-rpi-bt.dtsi         |   26 +
- arch/arm/boot/dts/bcm283x-rpi-csi0-2lane.dtsi |    4 +
- arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi |    4 +
- arch/arm/boot/dts/bcm283x-rpi-csi1-4lane.dtsi |    4 +
- .../boot/dts/bcm283x-rpi-i2c0mux_0_28.dtsi    |    4 +
- .../boot/dts/bcm283x-rpi-i2c0mux_0_44.dtsi    |    4 +
- arch/arm/boot/dts/overlays/Makefile           |  287 ++
- arch/arm/boot/dts/overlays/README             | 4513 +++++++++++++++++
- .../arm/boot/dts/overlays/act-led-overlay.dts |   27 +
- .../dts/overlays/adafruit-st7735r-overlay.dts |   83 +
- .../boot/dts/overlays/adafruit18-overlay.dts  |   55 +
- .../dts/overlays/adau1977-adc-overlay.dts     |   40 +
- .../dts/overlays/adau7002-simple-overlay.dts  |   52 +
- .../arm/boot/dts/overlays/ads1015-overlay.dts |   98 +
- .../arm/boot/dts/overlays/ads1115-overlay.dts |  103 +
- .../arm/boot/dts/overlays/ads7846-overlay.dts |   89 +
- .../boot/dts/overlays/adv7282m-overlay.dts    |   73 +
- .../boot/dts/overlays/adv728x-m-overlay.dts   |   37 +
- .../overlays/akkordion-iqdacplus-overlay.dts  |   49 +
- .../allo-boss-dac-pcm512x-audio-overlay.dts   |   59 +
- .../overlays/allo-boss2-dac-audio-overlay.dts |   57 +
- .../dts/overlays/allo-digione-overlay.dts     |   44 +
- .../allo-katana-dac-audio-overlay.dts         |   57 +
- .../allo-piano-dac-pcm512x-audio-overlay.dts  |   54 +
- ...o-piano-dac-plus-pcm512x-audio-overlay.dts |   57 +
- arch/arm/boot/dts/overlays/anyspi-overlay.dts |  205 +
- .../boot/dts/overlays/apds9960-overlay.dts    |   55 +
- .../boot/dts/overlays/applepi-dac-overlay.dts |   57 +
- .../dts/overlays/arducam-64mp-overlay.dts     |   94 +
- .../overlays/arducam-pivariety-overlay.dts    |   94 +
- .../boot/dts/overlays/at86rf233-overlay.dts   |   57 +
- .../overlays/audioinjector-addons-overlay.dts |   60 +
- .../audioinjector-bare-i2s-overlay.dts        |   50 +
- ...dioinjector-isolated-soundcard-overlay.dts |   55 +
- .../overlays/audioinjector-ultra-overlay.dts  |   71 +
- .../audioinjector-wm8731-audio-overlay.dts    |   39 +
- .../dts/overlays/audiosense-pi-overlay.dts    |   82 +
- .../boot/dts/overlays/audremap-overlay.dts    |   44 +
- .../boot/dts/overlays/balena-fin-overlay.dts  |  125 +
- .../dts/overlays/camera-mux-2port-overlay.dts |  409 ++
- .../dts/overlays/camera-mux-4port-overlay.dts |  684 +++
- .../arm/boot/dts/overlays/cap1106-overlay.dts |   52 +
- .../boot/dts/overlays/chipdip-dac-overlay.dts |   46 +
- .../dts/overlays/cirrus-wm5102-overlay.dts    |  172 +
- arch/arm/boot/dts/overlays/cma-overlay.dts    |   36 +
- .../dts/overlays/cutiepi-panel-overlay.dts    |  117 +
- .../boot/dts/overlays/dacberry400-overlay.dts |   71 +
- arch/arm/boot/dts/overlays/dht11-overlay.dts  |   48 +
- .../dts/overlays/dionaudio-kiwi-overlay.dts   |   39 +
- .../dts/overlays/dionaudio-loco-overlay.dts   |   39 +
- .../overlays/dionaudio-loco-v2-overlay.dts    |   49 +
- .../boot/dts/overlays/disable-bt-overlay.dts  |   64 +
- .../dts/overlays/disable-wifi-overlay.dts     |   20 +
- arch/arm/boot/dts/overlays/dpi18-overlay.dts  |   39 +
- .../boot/dts/overlays/dpi18cpadhi-overlay.dts |   26 +
- arch/arm/boot/dts/overlays/dpi24-overlay.dts  |   39 +
- arch/arm/boot/dts/overlays/draws-overlay.dts  |  208 +
- .../arm/boot/dts/overlays/dwc-otg-overlay.dts |   14 +
- arch/arm/boot/dts/overlays/dwc2-overlay.dts   |   26 +
- .../boot/dts/overlays/edt-ft5406-overlay.dts  |   26 +
- arch/arm/boot/dts/overlays/edt-ft5406.dtsi    |   47 +
- .../boot/dts/overlays/enc28j60-overlay.dts    |   53 +
- .../dts/overlays/enc28j60-spi2-overlay.dts    |   47 +
- .../arm/boot/dts/overlays/exc3000-overlay.dts |   48 +
- arch/arm/boot/dts/overlays/fbtft-overlay.dts  |  611 +++
- .../boot/dts/overlays/fe-pi-audio-overlay.dts |   70 +
- .../boot/dts/overlays/fsm-demo-overlay.dts    |  104 +
- arch/arm/boot/dts/overlays/gc9a01-overlay.dts |  151 +
- .../boot/dts/overlays/ghost-amp-overlay.dts   |  145 +
- arch/arm/boot/dts/overlays/goodix-overlay.dts |   46 +
- .../googlevoicehat-soundcard-overlay.dts      |   49 +
- .../boot/dts/overlays/gpio-fan-overlay.dts    |   89 +
- .../boot/dts/overlays/gpio-hog-overlay.dts    |   27 +
- .../arm/boot/dts/overlays/gpio-ir-overlay.dts |   49 +
- .../boot/dts/overlays/gpio-ir-tx-overlay.dts  |   36 +
- .../boot/dts/overlays/gpio-key-overlay.dts    |   48 +
- .../boot/dts/overlays/gpio-led-overlay.dts    |   97 +
- .../overlays/gpio-no-bank0-irq-overlay.dts    |   14 +
- .../boot/dts/overlays/gpio-no-irq-overlay.dts |   14 +
- .../dts/overlays/gpio-poweroff-overlay.dts    |   39 +
- .../dts/overlays/gpio-shutdown-overlay.dts    |   86 +
- .../boot/dts/overlays/hd44780-lcd-overlay.dts |   46 +
- .../hdmi-backlight-hwhack-gpio-overlay.dts    |   47 +
- .../dts/overlays/hifiberry-amp-overlay.dts    |   39 +
- .../dts/overlays/hifiberry-amp100-overlay.dts |   64 +
- .../dts/overlays/hifiberry-amp3-overlay.dts   |   57 +
- .../dts/overlays/hifiberry-dac-overlay.dts    |   34 +
- .../overlays/hifiberry-dacplus-overlay.dts    |   65 +
- .../overlays/hifiberry-dacplusadc-overlay.dts |   72 +
- .../hifiberry-dacplusadcpro-overlay.dts       |   70 +
- .../overlays/hifiberry-dacplusdsp-overlay.dts |   34 +
- .../overlays/hifiberry-dacplushd-overlay.dts  |   94 +
- .../dts/overlays/hifiberry-digi-overlay.dts   |   41 +
- .../overlays/hifiberry-digi-pro-overlay.dts   |   43 +
- .../boot/dts/overlays/highperi-overlay.dts    |   63 +
- arch/arm/boot/dts/overlays/hy28a-overlay.dts  |   93 +
- .../boot/dts/overlays/hy28b-2017-overlay.dts  |  152 +
- arch/arm/boot/dts/overlays/hy28b-overlay.dts  |  148 +
- .../boot/dts/overlays/i-sabre-q2m-overlay.dts |   39 +
- .../boot/dts/overlays/i2c-bcm2708-overlay.dts |   13 +
- .../arm/boot/dts/overlays/i2c-fan-overlay.dts |  108 +
- .../boot/dts/overlays/i2c-gpio-overlay.dts    |   47 +
- .../arm/boot/dts/overlays/i2c-mux-overlay.dts |  139 +
- .../dts/overlays/i2c-pwm-pca9685a-overlay.dts |   26 +
- .../arm/boot/dts/overlays/i2c-rtc-common.dtsi |  351 ++
- .../dts/overlays/i2c-rtc-gpio-overlay.dts     |   31 +
- .../arm/boot/dts/overlays/i2c-rtc-overlay.dts |   42 +
- .../boot/dts/overlays/i2c-sensor-common.dtsi  |  341 ++
- .../boot/dts/overlays/i2c-sensor-overlay.dts  |   42 +
- arch/arm/boot/dts/overlays/i2c0-overlay.dts   |   83 +
- arch/arm/boot/dts/overlays/i2c1-overlay.dts   |   44 +
- arch/arm/boot/dts/overlays/i2c3-overlay.dts   |   36 +
- arch/arm/boot/dts/overlays/i2c4-overlay.dts   |   36 +
- arch/arm/boot/dts/overlays/i2c5-overlay.dts   |   36 +
- arch/arm/boot/dts/overlays/i2c6-overlay.dts   |   36 +
- .../arm/boot/dts/overlays/i2s-dac-overlay.dts |   34 +
- .../dts/overlays/i2s-gpio28-31-overlay.dts    |   18 +
- .../boot/dts/overlays/ilitek251x-overlay.dts  |   45 +
- arch/arm/boot/dts/overlays/imx219-overlay.dts |   89 +
- arch/arm/boot/dts/overlays/imx219.dtsi        |   27 +
- arch/arm/boot/dts/overlays/imx258-overlay.dts |  131 +
- arch/arm/boot/dts/overlays/imx258.dtsi        |   27 +
- arch/arm/boot/dts/overlays/imx290-overlay.dts |   32 +
- .../boot/dts/overlays/imx290_327-overlay.dtsi |  112 +
- arch/arm/boot/dts/overlays/imx290_327.dtsi    |   24 +
- arch/arm/boot/dts/overlays/imx296-overlay.dts |  103 +
- arch/arm/boot/dts/overlays/imx327-overlay.dts |   32 +
- arch/arm/boot/dts/overlays/imx378-overlay.dts |   10 +
- arch/arm/boot/dts/overlays/imx462-overlay.dts |   32 +
- arch/arm/boot/dts/overlays/imx477-overlay.dts |   10 +
- .../boot/dts/overlays/imx477_378-overlay.dtsi |   83 +
- arch/arm/boot/dts/overlays/imx477_378.dtsi    |   24 +
- arch/arm/boot/dts/overlays/imx519-overlay.dts |   96 +
- .../dts/overlays/iqaudio-codec-overlay.dts    |   42 +
- .../boot/dts/overlays/iqaudio-dac-overlay.dts |   46 +
- .../dts/overlays/iqaudio-dacplus-overlay.dts  |   49 +
- .../iqaudio-digi-wm8804-audio-overlay.dts     |   47 +
- arch/arm/boot/dts/overlays/iqs550-overlay.dts |   59 +
- .../arm/boot/dts/overlays/irs1125-overlay.dts |   90 +
- .../dts/overlays/jedec-spi-nor-overlay.dts    |  309 ++
- .../dts/overlays/justboom-both-overlay.dts    |   65 +
- .../dts/overlays/justboom-dac-overlay.dts     |   46 +
- .../dts/overlays/justboom-digi-overlay.dts    |   41 +
- .../arm/boot/dts/overlays/ltc294x-overlay.dts |   86 +
- .../boot/dts/overlays/max98357a-overlay.dts   |   84 +
- .../boot/dts/overlays/maxtherm-overlay.dts    |  186 +
- .../boot/dts/overlays/mbed-dac-overlay.dts    |   64 +
- .../boot/dts/overlays/mcp23017-overlay.dts    |   69 +
- .../boot/dts/overlays/mcp23s17-overlay.dts    |  732 +++
- .../dts/overlays/mcp2515-can0-overlay.dts     |   73 +
- .../dts/overlays/mcp2515-can1-overlay.dts     |   73 +
- .../arm/boot/dts/overlays/mcp2515-overlay.dts |  156 +
- .../boot/dts/overlays/mcp251xfd-overlay.dts   |  226 +
- .../arm/boot/dts/overlays/mcp3008-overlay.dts |  205 +
- .../arm/boot/dts/overlays/mcp3202-overlay.dts |  205 +
- .../arm/boot/dts/overlays/mcp342x-overlay.dts |  164 +
- .../dts/overlays/media-center-overlay.dts     |  134 +
- .../boot/dts/overlays/merus-amp-overlay.dts   |   59 +
- .../boot/dts/overlays/midi-uart0-overlay.dts  |   36 +
- .../boot/dts/overlays/midi-uart1-overlay.dts  |   43 +
- .../boot/dts/overlays/midi-uart2-overlay.dts  |   37 +
- .../boot/dts/overlays/midi-uart3-overlay.dts  |   38 +
- .../boot/dts/overlays/midi-uart4-overlay.dts  |   38 +
- .../boot/dts/overlays/midi-uart5-overlay.dts  |   38 +
- .../boot/dts/overlays/minipitft13-overlay.dts |   70 +
- .../boot/dts/overlays/miniuart-bt-overlay.dts |   93 +
- .../dts/overlays/mipi-dbi-spi-overlay.dts     |  175 +
- .../boot/dts/overlays/mlx90640-overlay.dts    |   22 +
- arch/arm/boot/dts/overlays/mmc-overlay.dts    |   46 +
- .../arm/boot/dts/overlays/mpu6050-overlay.dts |   29 +
- .../arm/boot/dts/overlays/mz61581-overlay.dts |  117 +
- arch/arm/boot/dts/overlays/ov2311-overlay.dts |   77 +
- arch/arm/boot/dts/overlays/ov2311.dtsi        |   26 +
- arch/arm/boot/dts/overlays/ov5647-overlay.dts |   92 +
- arch/arm/boot/dts/overlays/ov5647.dtsi        |   25 +
- arch/arm/boot/dts/overlays/ov7251-overlay.dts |   77 +
- arch/arm/boot/dts/overlays/ov7251.dtsi        |   28 +
- arch/arm/boot/dts/overlays/ov9281-overlay.dts |   78 +
- arch/arm/boot/dts/overlays/ov9281.dtsi        |   27 +
- arch/arm/boot/dts/overlays/overlay_map.dts    |  211 +
- .../arm/boot/dts/overlays/papirus-overlay.dts |   84 +
- .../arm/boot/dts/overlays/pca953x-overlay.dts |  240 +
- .../dts/overlays/pcie-32bit-dma-overlay.dts   |   38 +
- arch/arm/boot/dts/overlays/pibell-overlay.dts |   81 +
- .../dts/overlays/pifacedigital-overlay.dts    |  144 +
- .../arm/boot/dts/overlays/pifi-40-overlay.dts |   50 +
- .../boot/dts/overlays/pifi-dac-hd-overlay.dts |   49 +
- .../dts/overlays/pifi-dac-zero-overlay.dts    |   49 +
- .../dts/overlays/pifi-mini-210-overlay.dts    |   42 +
- arch/arm/boot/dts/overlays/piglow-overlay.dts |   97 +
- .../boot/dts/overlays/piscreen-overlay.dts    |  102 +
- .../boot/dts/overlays/piscreen2r-overlay.dts  |  106 +
- .../arm/boot/dts/overlays/pisound-overlay.dts |  120 +
- .../arm/boot/dts/overlays/pitft22-overlay.dts |   69 +
- .../overlays/pitft28-capacitive-overlay.dts   |   91 +
- .../overlays/pitft28-resistive-overlay.dts    |  121 +
- .../overlays/pitft35-resistive-overlay.dts    |  122 +
- .../boot/dts/overlays/pps-gpio-overlay.dts    |   39 +
- .../boot/dts/overlays/proto-codec-overlay.dts |   39 +
- .../boot/dts/overlays/pwm-2chan-overlay.dts   |   49 +
- .../boot/dts/overlays/pwm-ir-tx-overlay.dts   |   40 +
- arch/arm/boot/dts/overlays/pwm-overlay.dts    |   45 +
- .../arm/boot/dts/overlays/qca7000-overlay.dts |   55 +
- .../dts/overlays/qca7000-uart0-overlay.dts    |   46 +
- .../arm/boot/dts/overlays/ramoops-overlay.dts |   25 +
- .../boot/dts/overlays/ramoops-pi4-overlay.dts |   25 +
- .../dts/overlays/rotary-encoder-overlay.dts   |   59 +
- .../dts/overlays/rpi-backlight-overlay.dts    |   21 +
- .../dts/overlays/rpi-codeczero-overlay.dts    |    9 +
- .../boot/dts/overlays/rpi-dacplus-overlay.dts |   17 +
- .../boot/dts/overlays/rpi-dacpro-overlay.dts  |   17 +
- .../dts/overlays/rpi-digiampplus-overlay.dts  |   17 +
- .../boot/dts/overlays/rpi-ft5406-overlay.dts  |   25 +
- .../arm/boot/dts/overlays/rpi-poe-overlay.dts |  154 +
- .../dts/overlays/rpi-poe-plus-overlay.dts     |   49 +
- .../boot/dts/overlays/rpi-sense-overlay.dts   |   47 +
- .../dts/overlays/rpi-sense-v2-overlay.dts     |   47 +
- arch/arm/boot/dts/overlays/rpi-tv-overlay.dts |   34 +
- .../rra-digidac1-wm8741-audio-overlay.dts     |   49 +
- .../boot/dts/overlays/sainsmart18-overlay.dts |   52 +
- .../dts/overlays/sc16is750-i2c-overlay.dts    |   43 +
- .../dts/overlays/sc16is752-i2c-overlay.dts    |   43 +
- .../dts/overlays/sc16is752-spi0-overlay.dts   |   49 +
- .../dts/overlays/sc16is752-spi1-overlay.dts   |   67 +
- arch/arm/boot/dts/overlays/sdhost-overlay.dts |   38 +
- arch/arm/boot/dts/overlays/sdio-overlay.dts   |   77 +
- .../overlays/seeed-can-fd-hat-v1-overlay.dts  |  138 +
- .../overlays/seeed-can-fd-hat-v2-overlay.dts  |  117 +
- .../boot/dts/overlays/sh1106-spi-overlay.dts  |   84 +
- .../boot/dts/overlays/si446x-spi0-overlay.dts |   53 +
- .../arm/boot/dts/overlays/smi-dev-overlay.dts |   20 +
- .../boot/dts/overlays/smi-nand-overlay.dts    |   66 +
- arch/arm/boot/dts/overlays/smi-overlay.dts    |   37 +
- .../dts/overlays/spi-gpio35-39-overlay.dts    |   31 +
- .../dts/overlays/spi-gpio40-45-overlay.dts    |   36 +
- .../arm/boot/dts/overlays/spi-rtc-overlay.dts |   75 +
- .../boot/dts/overlays/spi0-0cs-overlay.dts    |   39 +
- .../boot/dts/overlays/spi0-1cs-overlay.dts    |   42 +
- .../boot/dts/overlays/spi0-2cs-overlay.dts    |   37 +
- .../boot/dts/overlays/spi1-1cs-overlay.dts    |   57 +
- .../boot/dts/overlays/spi1-2cs-overlay.dts    |   69 +
- .../boot/dts/overlays/spi1-3cs-overlay.dts    |   81 +
- .../boot/dts/overlays/spi2-1cs-overlay.dts    |   57 +
- .../boot/dts/overlays/spi2-2cs-overlay.dts    |   69 +
- .../boot/dts/overlays/spi2-3cs-overlay.dts    |   81 +
- .../boot/dts/overlays/spi3-1cs-overlay.dts    |   44 +
- .../boot/dts/overlays/spi3-2cs-overlay.dts    |   56 +
- .../boot/dts/overlays/spi4-1cs-overlay.dts    |   44 +
- .../boot/dts/overlays/spi4-2cs-overlay.dts    |   56 +
- .../boot/dts/overlays/spi5-1cs-overlay.dts    |   44 +
- .../boot/dts/overlays/spi5-2cs-overlay.dts    |   56 +
- .../boot/dts/overlays/spi6-1cs-overlay.dts    |   44 +
- .../boot/dts/overlays/spi6-2cs-overlay.dts    |   56 +
- .../arm/boot/dts/overlays/ssd1306-overlay.dts |   36 +
- .../boot/dts/overlays/ssd1306-spi-overlay.dts |   84 +
- .../boot/dts/overlays/ssd1331-spi-overlay.dts |   83 +
- .../boot/dts/overlays/ssd1351-spi-overlay.dts |   83 +
- .../dts/overlays/superaudioboard-overlay.dts  |   73 +
- arch/arm/boot/dts/overlays/sx150x-overlay.dts | 1706 +++++++
- .../dts/overlays/tc358743-audio-overlay.dts   |   52 +
- .../boot/dts/overlays/tc358743-overlay.dts    |  109 +
- .../boot/dts/overlays/tinylcd35-overlay.dts   |  222 +
- .../boot/dts/overlays/tpm-slb9670-overlay.dts |   44 +
- .../boot/dts/overlays/tpm-slb9673-overlay.dts |   50 +
- arch/arm/boot/dts/overlays/uart0-overlay.dts  |   32 +
- arch/arm/boot/dts/overlays/uart1-overlay.dts  |   38 +
- arch/arm/boot/dts/overlays/uart2-overlay.dts  |   27 +
- arch/arm/boot/dts/overlays/uart3-overlay.dts  |   27 +
- arch/arm/boot/dts/overlays/uart4-overlay.dts  |   27 +
- arch/arm/boot/dts/overlays/uart5-overlay.dts  |   27 +
- arch/arm/boot/dts/overlays/udrc-overlay.dts   |  128 +
- .../dts/overlays/ugreen-dabboard-overlay.dts  |   49 +
- .../boot/dts/overlays/upstream-overlay.dts    |  101 +
- .../dts/overlays/upstream-pi4-overlay.dts     |  137 +
- .../dts/overlays/vc4-fkms-v3d-overlay.dts     |   40 +
- .../dts/overlays/vc4-fkms-v3d-pi4-overlay.dts |   44 +
- .../overlays/vc4-kms-dpi-generic-overlay.dts  |   81 +
- .../dts/overlays/vc4-kms-dpi-hyperpixel.dtsi  |   94 +
- .../vc4-kms-dpi-hyperpixel2r-overlay.dts      |  114 +
- .../vc4-kms-dpi-hyperpixel4-overlay.dts       |   57 +
- .../vc4-kms-dpi-hyperpixel4sq-overlay.dts     |   36 +
- .../overlays/vc4-kms-dpi-panel-overlay.dts    |   69 +
- arch/arm/boot/dts/overlays/vc4-kms-dpi.dtsi   |  111 +
- .../overlays/vc4-kms-dsi-7inch-overlay.dts    |  118 +
- .../vc4-kms-dsi-lt070me05000-overlay.dts      |   69 +
- .../vc4-kms-dsi-lt070me05000-v2-overlay.dts   |   64 +
- .../overlays/vc4-kms-kippah-7inch-overlay.dts |   26 +
- .../boot/dts/overlays/vc4-kms-v3d-overlay.dts |  124 +
- .../dts/overlays/vc4-kms-v3d-pi4-overlay.dts  |  200 +
- .../dts/overlays/vc4-kms-vga666-overlay.dts   |  100 +
- arch/arm/boot/dts/overlays/vga666-overlay.dts |   30 +
- arch/arm/boot/dts/overlays/vl805-overlay.dts  |   18 +
- .../arm/boot/dts/overlays/w1-gpio-overlay.dts |   40 +
- .../dts/overlays/w1-gpio-pullup-overlay.dts   |   42 +
- arch/arm/boot/dts/overlays/w5500-overlay.dts  |   63 +
- .../overlays/watterott-display-overlay.dts    |  150 +
- .../waveshare-can-fd-hat-mode-a-overlay.dts   |  140 +
- .../waveshare-can-fd-hat-mode-b-overlay.dts   |  103 +
- .../arm/boot/dts/overlays/wittypi-overlay.dts |   44 +
- .../dts/overlays/wm8960-soundcard-overlay.dts |   82 +
- arch/arm64/boot/dts/Makefile                  |    2 +
- arch/arm64/boot/dts/broadcom/Makefile         |   14 +
- .../boot/dts/broadcom/bcm2710-rpi-2-b.dts     |    1 +
- .../dts/broadcom/bcm2710-rpi-3-b-plus.dts     |    1 +
- .../boot/dts/broadcom/bcm2710-rpi-3-b.dts     |    1 +
- .../boot/dts/broadcom/bcm2710-rpi-cm3.dts     |    1 +
- .../dts/broadcom/bcm2710-rpi-zero-2-w.dts     |    1 +
- .../boot/dts/broadcom/bcm2710-rpi-zero-2.dts  |    1 +
- .../boot/dts/broadcom/bcm2711-rpi-4-b.dts     |    3 +-
- .../boot/dts/broadcom/bcm2711-rpi-400.dts     |    3 +-
- .../boot/dts/broadcom/bcm2711-rpi-cm4.dts     |    1 +
- .../boot/dts/broadcom/bcm2711-rpi-cm4s.dts    |    1 +
- .../dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi  |    1 +
- .../dts/broadcom/bcm283x-rpi-lan7515.dtsi     |    1 +
- arch/arm64/boot/dts/overlays                  |    1 +
- include/dt-bindings/gpio/gpio-fsm.h           |   21 +
- scripts/Makefile.dtbinst                      |    3 +-
- scripts/Makefile.lib                          |   13 +
- 348 files changed, 34772 insertions(+), 16 deletions(-)
- create mode 100644 arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
- create mode 100644 arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
- create mode 100644 arch/arm/boot/dts/bcm2708-rpi-b.dts
- create mode 100644 arch/arm/boot/dts/bcm2708-rpi-bt.dtsi
- create mode 100644 arch/arm/boot/dts/bcm2708-rpi-cm.dts
- create mode 100644 arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
- create mode 100644 arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
- create mode 100644 arch/arm/boot/dts/bcm2708-rpi-zero.dts
- create mode 100644 arch/arm/boot/dts/bcm2708-rpi.dtsi
- create mode 100644 arch/arm/boot/dts/bcm2708.dtsi
- create mode 100644 arch/arm/boot/dts/bcm2709-rpi-2-b.dts
- create mode 100644 arch/arm/boot/dts/bcm2709-rpi-cm2.dts
- create mode 100644 arch/arm/boot/dts/bcm2709-rpi.dtsi
- create mode 100644 arch/arm/boot/dts/bcm2709.dtsi
- create mode 100644 arch/arm/boot/dts/bcm270x-rpi.dtsi
- create mode 100644 arch/arm/boot/dts/bcm270x.dtsi
- create mode 100644 arch/arm/boot/dts/bcm2710-rpi-2-b.dts
- create mode 100644 arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
- create mode 100644 arch/arm/boot/dts/bcm2710-rpi-3-b.dts
- create mode 100644 arch/arm/boot/dts/bcm2710-rpi-cm3.dts
- create mode 100644 arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
- create mode 100644 arch/arm/boot/dts/bcm2710-rpi-zero-2.dts
- create mode 100644 arch/arm/boot/dts/bcm2710.dtsi
- create mode 100644 arch/arm/boot/dts/bcm2711-rpi-cm4.dts
- create mode 100644 arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
- create mode 100644 arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
- create mode 100644 arch/arm/boot/dts/bcm271x-rpi-bt.dtsi
- create mode 100644 arch/arm/boot/dts/bcm283x-rpi-csi0-2lane.dtsi
- create mode 100644 arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi
- create mode 100644 arch/arm/boot/dts/bcm283x-rpi-csi1-4lane.dtsi
- create mode 100644 arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_28.dtsi
- create mode 100644 arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_44.dtsi
- create mode 100644 arch/arm/boot/dts/overlays/Makefile
- create mode 100644 arch/arm/boot/dts/overlays/README
- create mode 100644 arch/arm/boot/dts/overlays/act-led-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/adafruit-st7735r-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/adafruit18-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/adau7002-simple-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/ads1015-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/ads1115-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/ads7846-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/adv7282m-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/adv728x-m-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/akkordion-iqdacplus-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/allo-boss-dac-pcm512x-audio-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/allo-boss2-dac-audio-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/allo-digione-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/allo-katana-dac-audio-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/allo-piano-dac-pcm512x-audio-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/allo-piano-dac-plus-pcm512x-audio-overlay.dts
- create mode 100755 arch/arm/boot/dts/overlays/anyspi-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/apds9960-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/applepi-dac-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/arducam-64mp-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/arducam-pivariety-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/at86rf233-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/audioinjector-addons-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/audioinjector-bare-i2s-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/audioinjector-isolated-soundcard-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/audioinjector-ultra-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/audioinjector-wm8731-audio-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/audiosense-pi-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/audremap-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/balena-fin-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/camera-mux-2port-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/camera-mux-4port-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/cap1106-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/chipdip-dac-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/cirrus-wm5102-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/cma-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/cutiepi-panel-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/dacberry400-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/dht11-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/dionaudio-kiwi-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/dionaudio-loco-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/dionaudio-loco-v2-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/disable-bt-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/disable-wifi-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/dpi18-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/dpi18cpadhi-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/dpi24-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/draws-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/dwc-otg-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/dwc2-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/edt-ft5406-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/edt-ft5406.dtsi
- create mode 100644 arch/arm/boot/dts/overlays/enc28j60-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/enc28j60-spi2-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/exc3000-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/fbtft-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/fe-pi-audio-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/fsm-demo-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/gc9a01-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/ghost-amp-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/goodix-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/googlevoicehat-soundcard-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/gpio-fan-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/gpio-hog-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/gpio-ir-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/gpio-ir-tx-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/gpio-key-overlay.dts
- create mode 100755 arch/arm/boot/dts/overlays/gpio-led-overlay.dts
- create mode 100755 arch/arm/boot/dts/overlays/gpio-no-bank0-irq-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/gpio-no-irq-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/gpio-shutdown-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/hd44780-lcd-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/hdmi-backlight-hwhack-gpio-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/hifiberry-amp-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/hifiberry-amp100-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/hifiberry-amp3-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/hifiberry-dac-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/hifiberry-dacplusdsp-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/hifiberry-dacplushd-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/hifiberry-digi-pro-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/highperi-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/hy28a-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/hy28b-2017-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/hy28b-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/i-sabre-q2m-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/i2c-bcm2708-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/i2c-fan-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/i2c-mux-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/i2c-pwm-pca9685a-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/i2c-rtc-common.dtsi
- create mode 100644 arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts
- create mode 100755 arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi
- create mode 100755 arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/i2c0-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/i2c1-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/i2c3-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/i2c4-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/i2c5-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/i2c6-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/i2s-dac-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/i2s-gpio28-31-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/ilitek251x-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/imx219-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/imx219.dtsi
- create mode 100644 arch/arm/boot/dts/overlays/imx258-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/imx258.dtsi
- create mode 100644 arch/arm/boot/dts/overlays/imx290-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi
- create mode 100644 arch/arm/boot/dts/overlays/imx290_327.dtsi
- create mode 100644 arch/arm/boot/dts/overlays/imx296-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/imx327-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/imx378-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/imx462-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/imx477-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi
- create mode 100644 arch/arm/boot/dts/overlays/imx477_378.dtsi
- create mode 100644 arch/arm/boot/dts/overlays/imx519-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/iqaudio-codec-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/iqaudio-digi-wm8804-audio-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/iqs550-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/irs1125-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/jedec-spi-nor-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/justboom-both-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/justboom-dac-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/justboom-digi-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/ltc294x-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/max98357a-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/maxtherm-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/mbed-dac-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/mcp23017-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/mcp23s17-overlay.dts
- create mode 100755 arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/mcp2515-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/mcp251xfd-overlay.dts
- create mode 100755 arch/arm/boot/dts/overlays/mcp3008-overlay.dts
- create mode 100755 arch/arm/boot/dts/overlays/mcp3202-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/mcp342x-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/media-center-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/merus-amp-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/midi-uart0-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/midi-uart1-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/midi-uart2-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/midi-uart3-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/midi-uart4-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/midi-uart5-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/minipitft13-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/mipi-dbi-spi-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/mlx90640-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/mmc-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/mpu6050-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/mz61581-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/ov2311-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/ov2311.dtsi
- create mode 100644 arch/arm/boot/dts/overlays/ov5647-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/ov5647.dtsi
- create mode 100644 arch/arm/boot/dts/overlays/ov7251-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/ov7251.dtsi
- create mode 100644 arch/arm/boot/dts/overlays/ov9281-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/ov9281.dtsi
- create mode 100644 arch/arm/boot/dts/overlays/overlay_map.dts
- create mode 100644 arch/arm/boot/dts/overlays/papirus-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/pca953x-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/pcie-32bit-dma-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/pibell-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/pifacedigital-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/pifi-40-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/pifi-dac-hd-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/pifi-dac-zero-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/pifi-mini-210-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/piglow-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/piscreen-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/piscreen2r-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/pisound-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/pitft22-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/pitft28-capacitive-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/pps-gpio-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/proto-codec-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/pwm-ir-tx-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/pwm-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/qca7000-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/qca7000-uart0-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/ramoops-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/ramoops-pi4-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/rotary-encoder-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/rpi-backlight-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/rpi-codeczero-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/rpi-dacplus-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/rpi-dacpro-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/rpi-digiampplus-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/rpi-poe-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/rpi-poe-plus-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/rpi-sense-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/rpi-sense-v2-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/rpi-tv-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/rra-digidac1-wm8741-audio-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/sainsmart18-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/sc16is752-i2c-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/sc16is752-spi0-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/sdhost-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/sdio-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/seeed-can-fd-hat-v1-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/seeed-can-fd-hat-v2-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/sh1106-spi-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/si446x-spi0-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/smi-dev-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/smi-nand-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/smi-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/spi-gpio35-39-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/spi-gpio40-45-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/spi-rtc-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/spi0-0cs-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/spi0-1cs-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/spi0-2cs-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/spi1-1cs-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/spi1-2cs-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/spi1-3cs-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/spi2-1cs-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/spi2-2cs-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/spi2-3cs-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/spi3-1cs-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/spi3-2cs-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/spi4-1cs-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/spi4-2cs-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/spi5-1cs-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/spi5-2cs-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/spi6-1cs-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/spi6-2cs-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/ssd1306-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/ssd1306-spi-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/ssd1331-spi-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/ssd1351-spi-overlay.dts
- create mode 100755 arch/arm/boot/dts/overlays/superaudioboard-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/sx150x-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/tc358743-audio-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/tc358743-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/tinylcd35-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/tpm-slb9670-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/tpm-slb9673-overlay.dts
- create mode 100755 arch/arm/boot/dts/overlays/uart0-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/uart1-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/uart2-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/uart3-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/uart4-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/uart5-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/udrc-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/ugreen-dabboard-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/upstream-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/vc4-fkms-v3d-pi4-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel.dtsi
- create mode 100644 arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel2r-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel4-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel4sq-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/vc4-kms-dpi-panel-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/vc4-kms-dpi.dtsi
- create mode 100644 arch/arm/boot/dts/overlays/vc4-kms-dsi-7inch-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/vc4-kms-dsi-lt070me05000-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/vc4-kms-dsi-lt070me05000-v2-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/vc4-kms-kippah-7inch-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/vc4-kms-vga666-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/vga666-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/vl805-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/w1-gpio-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/w1-gpio-pullup-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/w5500-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/watterott-display-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/waveshare-can-fd-hat-mode-a-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/waveshare-can-fd-hat-mode-b-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/wittypi-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/wm8960-soundcard-overlay.dts
- create mode 100644 arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts
- create mode 100644 arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts
- create mode 100644 arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts
- create mode 100644 arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm3.dts
- create mode 100644 arch/arm64/boot/dts/broadcom/bcm2710-rpi-zero-2-w.dts
- create mode 100644 arch/arm64/boot/dts/broadcom/bcm2710-rpi-zero-2.dts
- create mode 100644 arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4.dts
- create mode 100644 arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4s.dts
- create mode 120000 arch/arm64/boot/dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi
- create mode 120000 arch/arm64/boot/dts/broadcom/bcm283x-rpi-lan7515.dtsi
- create mode 120000 arch/arm64/boot/dts/overlays
- create mode 100644 include/dt-bindings/gpio/gpio-fsm.h
-
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 6aa7dc4db2fc..f7d8d09c0a16 100644
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -1,4 +1,25 @@
- # SPDX-License-Identifier: GPL-2.0
-+
-+dtb-$(CONFIG_ARCH_BCM2835) += \
-+	bcm2708-rpi-b.dtb \
-+	bcm2708-rpi-b-rev1.dtb \
-+	bcm2708-rpi-b-plus.dtb \
-+	bcm2708-rpi-cm.dtb \
-+	bcm2708-rpi-zero.dtb \
-+	bcm2708-rpi-zero-w.dtb \
-+	bcm2710-rpi-zero-2.dtb \
-+	bcm2710-rpi-zero-2-w.dtb \
-+	bcm2709-rpi-2-b.dtb \
-+	bcm2710-rpi-2-b.dtb \
-+	bcm2710-rpi-3-b.dtb \
-+	bcm2710-rpi-3-b-plus.dtb \
-+	bcm2711-rpi-4-b.dtb \
-+	bcm2711-rpi-400.dtb \
-+	bcm2709-rpi-cm2.dtb \
-+	bcm2710-rpi-cm3.dtb \
-+	bcm2711-rpi-cm4.dtb \
-+	bcm2711-rpi-cm4s.dtb
-+
- dtb-$(CONFIG_ARCH_ALPINE) += \
- 	alpine-db.dtb
- dtb-$(CONFIG_MACH_ARTPEC6) += \
-@@ -1633,3 +1654,13 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
- 	aspeed-bmc-vegman-n110.dtb \
- 	aspeed-bmc-vegman-rx20.dtb \
- 	aspeed-bmc-vegman-sx20.dtb
-+
-+targets += dtbs dtbs_install
-+targets += $(dtb-y)
-+
-+subdir-y	:= overlays
-+
-+# Enable fixups to support overlays on BCM2835 platforms
-+ifeq ($(CONFIG_ARCH_BCM2835),y)
-+	DTC_FLAGS += -@
-+endif
-diff --git a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
-new file mode 100644
-index 000000000000..b3b18a7b5fe9
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
-@@ -0,0 +1,200 @@
-+/dts-v1/;
-+
-+#include "bcm2708.dtsi"
-+#include "bcm2708-rpi.dtsi"
-+#include "bcm283x-rpi-smsc9514.dtsi"
-+#include "bcm283x-rpi-csi1-2lane.dtsi"
-+#include "bcm283x-rpi-i2c0mux_0_28.dtsi"
-+
-+/ {
-+	compatible = "raspberrypi,model-b-plus", "brcm,bcm2835";
-+	model = "Raspberry Pi Model B+";
-+};
-+
-+&gpio {
-+	/*
-+	 * Taken from Raspberry-Pi-B-Plus-V1.2-Schematics.pdf
-+	 * RPI-BPLUS sheet 1
-+	 *
-+	 * Legend:
-+	 * "NC" = not connected (no rail from the SoC)
-+	 * "FOO" = GPIO line named "FOO" on the schematic
-+	 * "FOO_N" = GPIO line named "FOO" on schematic, active low
-+	 */
-+	gpio-line-names = "ID_SDA",
-+			  "ID_SCL",
-+			  "SDA1",
-+			  "SCL1",
-+			  "GPIO_GCLK",
-+			  "GPIO5",
-+			  "GPIO6",
-+			  "SPI_CE1_N",
-+			  "SPI_CE0_N",
-+			  "SPI_MISO",
-+			  "SPI_MOSI",
-+			  "SPI_SCLK",
-+			  "GPIO12",
-+			  "GPIO13",
-+			  /* Serial port */
-+			  "TXD0",
-+			  "RXD0",
-+			  "GPIO16",
-+			  "GPIO17",
-+			  "GPIO18",
-+			  "GPIO19",
-+			  "GPIO20",
-+			  "GPIO21",
-+			  "GPIO22",
-+			  "GPIO23",
-+			  "GPIO24",
-+			  "GPIO25",
-+			  "GPIO26",
-+			  "GPIO27",
-+			  "SDA0",
-+			  "SCL0",
-+			  "NC", /* GPIO30 */
-+			  "LAN_RUN", /* GPIO31 */
-+			  "CAM_GPIO1", /* GPIO32 */
-+			  "NC", /* GPIO33 */
-+			  "NC", /* GPIO34 */
-+			  "PWR_LOW_N", /* GPIO35 */
-+			  "NC", /* GPIO36 */
-+			  "NC", /* GPIO37 */
-+			  "USB_LIMIT", /* GPIO38 */
-+			  "NC", /* GPIO39 */
-+			  "PWM0_OUT", /* GPIO40 */
-+			  "CAM_GPIO0", /* GPIO41 */
-+			  "NC", /* GPIO42 */
-+			  "NC", /* GPIO43 */
-+			  "ETH_CLK", /* GPIO44 */
-+			  "PWM1_OUT", /* GPIO45 */
-+			  "HDMI_HPD_N",
-+			  "STATUS_LED",
-+			  /* Used by SD Card */
-+			  "SD_CLK_R",
-+			  "SD_CMD_R",
-+			  "SD_DATA0_R",
-+			  "SD_DATA1_R",
-+			  "SD_DATA2_R",
-+			  "SD_DATA3_R";
-+
-+	spi0_pins: spi0_pins {
-+		brcm,pins = <9 10 11>;
-+		brcm,function = <4>; /* alt0 */
-+	};
-+
-+	spi0_cs_pins: spi0_cs_pins {
-+		brcm,pins = <8 7>;
-+		brcm,function = <1>; /* output */
-+	};
-+
-+	i2c0_pins: i2c0 {
-+		brcm,pins = <0 1>;
-+		brcm,function = <4>;
-+	};
-+
-+	i2c1_pins: i2c1 {
-+		brcm,pins = <2 3>;
-+		brcm,function = <4>;
-+	};
-+
-+	i2s_pins: i2s {
-+		brcm,pins = <18 19 20 21>;
-+		brcm,function = <4>; /* alt0 */
-+	};
-+
-+	audio_pins: audio_pins {
-+		brcm,pins = <40 45>;
-+		brcm,function = <4>;
-+		brcm,pull = <0>;
-+	};
-+};
-+
-+&uart0 {
-+	status = "okay";
-+};
-+
-+&spi0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi0_pins &spi0_cs_pins>;
-+	cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
-+
-+	spidev0: spidev@0{
-+		compatible = "spidev";
-+		reg = <0>;	/* CE0 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+
-+	spidev1: spidev@1{
-+		compatible = "spidev";
-+		reg = <1>;	/* CE1 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+};
-+
-+&i2c0if {
-+	clock-frequency = <100000>;
-+};
-+
-+&i2c1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2c1_pins>;
-+	clock-frequency = <100000>;
-+};
-+
-+&i2c2 {
-+	clock-frequency = <100000>;
-+};
-+
-+&i2s {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2s_pins>;
-+};
-+
-+&leds {
-+	act_led: led-act {
-+		label = "led0";
-+		linux,default-trigger = "mmc0";
-+		gpios = <&gpio 47 0>;
-+	};
-+
-+	pwr_led: led-pwr {
-+		label = "led1";
-+		linux,default-trigger = "input";
-+		gpios = <&gpio 35 0>;
-+	};
-+};
-+
-+&hdmi {
-+	hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
-+};
-+
-+&vchiq {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&audio_pins>;
-+};
-+
-+&cam1_reg {
-+	gpio = <&gpio 41 GPIO_ACTIVE_HIGH>;
-+};
-+
-+cam0_reg: &cam_dummy_reg {
-+};
-+
-+/ {
-+	__overrides__ {
-+		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_headphones=1 snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_headphones=0 snd_bcm2835.enable_hdmi=0'}";
-+
-+		act_led_gpio = <&act_led>,"gpios:4";
-+		act_led_activelow = <&act_led>,"gpios:8";
-+		act_led_trigger = <&act_led>,"linux,default-trigger";
-+
-+		pwr_led_gpio = <&pwr_led>,"gpios:4";
-+		pwr_led_activelow = <&pwr_led>,"gpios:8";
-+		pwr_led_trigger = <&pwr_led>,"linux,default-trigger";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts b/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
-new file mode 100644
-index 000000000000..50ac75e8d3d9
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
-@@ -0,0 +1,208 @@
-+/dts-v1/;
-+
-+#include "bcm2708.dtsi"
-+#include "bcm2708-rpi.dtsi"
-+#include "bcm283x-rpi-smsc9512.dtsi"
-+#include "bcm283x-rpi-csi1-2lane.dtsi"
-+
-+/ {
-+	compatible = "raspberrypi,model-b", "brcm,bcm2835";
-+	model = "Raspberry Pi Model B";
-+};
-+
-+&gpio {
-+	/*
-+	 * Taken from Raspberry-Pi-Rev-1.0-Model-AB-Schematics.pdf
-+	 * RPI00021 sheet 02
-+	 *
-+	 * Legend:
-+	 * "NC" = not connected (no rail from the SoC)
-+	 * "FOO" = GPIO line named "FOO" on the schematic
-+	 * "FOO_N" = GPIO line named "FOO" on schematic, active low
-+	 */
-+	gpio-line-names = "SDA0",
-+			  "SCL0",
-+			  "SDA1",
-+			  "SCL1",
-+			  "GPIO_GCLK",
-+			  "CAM_GPIO1",
-+			  "LAN_RUN",
-+			  "SPI_CE1_N",
-+			  "SPI_CE0_N",
-+			  "SPI_MISO",
-+			  "SPI_MOSI",
-+			  "SPI_SCLK",
-+			  "NC", /* GPIO12 */
-+			  "NC", /* GPIO13 */
-+			  /* Serial port */
-+			  "TXD0",
-+			  "RXD0",
-+			  "STATUS_LED_N",
-+			  "GPIO17",
-+			  "GPIO18",
-+			  "NC", /* GPIO19 */
-+			  "NC", /* GPIO20 */
-+			  "GPIO21",
-+			  "GPIO22",
-+			  "GPIO23",
-+			  "GPIO24",
-+			  "GPIO25",
-+			  "NC", /* GPIO26 */
-+			  "CAM_GPIO0",
-+			  /* Binary number representing build/revision */
-+			  "CONFIG0",
-+			  "CONFIG1",
-+			  "CONFIG2",
-+			  "CONFIG3",
-+			  "NC", /* GPIO32 */
-+			  "NC", /* GPIO33 */
-+			  "NC", /* GPIO34 */
-+			  "NC", /* GPIO35 */
-+			  "NC", /* GPIO36 */
-+			  "NC", /* GPIO37 */
-+			  "NC", /* GPIO38 */
-+			  "NC", /* GPIO39 */
-+			  "PWM0_OUT",
-+			  "NC", /* GPIO41 */
-+			  "NC", /* GPIO42 */
-+			  "NC", /* GPIO43 */
-+			  "NC", /* GPIO44 */
-+			  "PWM1_OUT",
-+			  "HDMI_HPD_P",
-+			  "SD_CARD_DET",
-+			  /* Used by SD Card */
-+			  "SD_CLK_R",
-+			  "SD_CMD_R",
-+			  "SD_DATA0_R",
-+			  "SD_DATA1_R",
-+			  "SD_DATA2_R",
-+			  "SD_DATA3_R";
-+
-+	spi0_pins: spi0_pins {
-+		brcm,pins = <9 10 11>;
-+		brcm,function = <4>; /* alt0 */
-+	};
-+
-+	spi0_cs_pins: spi0_cs_pins {
-+		brcm,pins = <8 7>;
-+		brcm,function = <1>; /* output */
-+	};
-+
-+	i2c0_pins: i2c0 {
-+		brcm,pins = <0 1>;
-+		brcm,function = <4>;
-+	};
-+
-+	i2c1_pins: i2c1 {
-+		brcm,pins = <2 3>;
-+		brcm,function = <4>;
-+	};
-+
-+	i2s_pins: i2s {
-+		brcm,pins = <28 29 30 31>;
-+		brcm,function = <6>; /* alt2 */
-+	};
-+
-+	audio_pins: audio_pins {
-+		brcm,pins = <40 45>;
-+		brcm,function = <4>;
-+		brcm,pull = <0>;
-+	};
-+};
-+
-+&uart0 {
-+	status = "okay";
-+};
-+
-+&spi0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi0_pins &spi0_cs_pins>;
-+	cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
-+
-+	spidev0: spidev@0{
-+		compatible = "spidev";
-+		reg = <0>;	/* CE0 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+
-+	spidev1: spidev@1{
-+		compatible = "spidev";
-+		reg = <1>;	/* CE1 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+};
-+
-+/delete-node/ &i2c0mux;
-+
-+i2c0: &i2c0if {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2c0_pins>;
-+	clock-frequency = <100000>;
-+};
-+
-+i2c_csi_dsi: &i2c1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2c1_pins>;
-+	clock-frequency = <100000>;
-+};
-+
-+/ {
-+	aliases {
-+		i2c0 = &i2c0;
-+	};
-+
-+	/* Provide an i2c0mux label to avoid undefined symbols in overlays */
-+	i2c0mux: i2c0mux {
-+	};
-+
-+	__overrides__ {
-+		i2c0 = <&i2c0>, "status";
-+	};
-+};
-+
-+&i2c2 {
-+	clock-frequency = <100000>;
-+};
-+
-+&i2s {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2s_pins>;
-+};
-+
-+&leds {
-+	act_led: led-act {
-+		label = "led0";
-+		linux,default-trigger = "mmc0";
-+		gpios = <&gpio 16 1>;
-+	};
-+};
-+
-+&hdmi {
-+	hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;
-+};
-+
-+&vchiq {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&audio_pins>;
-+};
-+
-+&cam1_reg {
-+	gpio = <&gpio 27 GPIO_ACTIVE_HIGH>;
-+};
-+
-+cam0_reg: &cam_dummy_reg {
-+};
-+
-+/ {
-+	__overrides__ {
-+		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_headphones=1 snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_headphones=0 snd_bcm2835.enable_hdmi=0'}";
-+
-+		act_led_gpio = <&act_led>,"gpios:4";
-+		act_led_activelow = <&act_led>,"gpios:8";
-+		act_led_trigger = <&act_led>,"linux,default-trigger";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/bcm2708-rpi-b.dts b/arch/arm/boot/dts/bcm2708-rpi-b.dts
-new file mode 100644
-index 000000000000..4d7444a31bb6
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts
-@@ -0,0 +1,190 @@
-+/dts-v1/;
-+
-+#include "bcm2708.dtsi"
-+#include "bcm2708-rpi.dtsi"
-+#include "bcm283x-rpi-smsc9512.dtsi"
-+#include "bcm283x-rpi-csi1-2lane.dtsi"
-+#include "bcm283x-rpi-i2c0mux_0_28.dtsi"
-+
-+/ {
-+	compatible = "raspberrypi,model-b", "brcm,bcm2835";
-+	model = "Raspberry Pi Model B";
-+};
-+
-+&gpio {
-+	/*
-+	 * Taken from Raspberry-Pi-Rev-2.0-Model-AB-Schematics.pdf
-+	 * RPI00022 sheet 02
-+	 *
-+	 * Legend:
-+	 * "NC" = not connected (no rail from the SoC)
-+	 * "FOO" = GPIO line named "FOO" on the schematic
-+	 * "FOO_N" = GPIO line named "FOO" on schematic, active low
-+	 */
-+	gpio-line-names = "SDA0",
-+			  "SCL0",
-+			  "SDA1",
-+			  "SCL1",
-+			  "GPIO_GCLK",
-+			  "CAM_GPIO1",
-+			  "LAN_RUN",
-+			  "SPI_CE1_N",
-+			  "SPI_CE0_N",
-+			  "SPI_MISO",
-+			  "SPI_MOSI",
-+			  "SPI_SCLK",
-+			  "NC", /* GPIO12 */
-+			  "NC", /* GPIO13 */
-+			  /* Serial port */
-+			  "TXD0",
-+			  "RXD0",
-+			  "STATUS_LED_N",
-+			  "GPIO17",
-+			  "GPIO18",
-+			  "NC", /* GPIO19 */
-+			  "NC", /* GPIO20 */
-+			  "CAM_GPIO0",
-+			  "GPIO22",
-+			  "GPIO23",
-+			  "GPIO24",
-+			  "GPIO25",
-+			  "NC", /* GPIO26 */
-+			  "GPIO27",
-+			  "GPIO28",
-+			  "GPIO29",
-+			  "GPIO30",
-+			  "GPIO31",
-+			  "NC", /* GPIO32 */
-+			  "NC", /* GPIO33 */
-+			  "NC", /* GPIO34 */
-+			  "NC", /* GPIO35 */
-+			  "NC", /* GPIO36 */
-+			  "NC", /* GPIO37 */
-+			  "NC", /* GPIO38 */
-+			  "NC", /* GPIO39 */
-+			  "PWM0_OUT",
-+			  "NC", /* GPIO41 */
-+			  "NC", /* GPIO42 */
-+			  "NC", /* GPIO43 */
-+			  "NC", /* GPIO44 */
-+			  "PWM1_OUT",
-+			  "HDMI_HPD_P",
-+			  "SD_CARD_DET",
-+			  /* Used by SD Card */
-+			  "SD_CLK_R",
-+			  "SD_CMD_R",
-+			  "SD_DATA0_R",
-+			  "SD_DATA1_R",
-+			  "SD_DATA2_R",
-+			  "SD_DATA3_R";
-+
-+	spi0_pins: spi0_pins {
-+		brcm,pins = <9 10 11>;
-+		brcm,function = <4>; /* alt0 */
-+	};
-+
-+	spi0_cs_pins: spi0_cs_pins {
-+		brcm,pins = <8 7>;
-+		brcm,function = <1>; /* output */
-+	};
-+
-+	i2c0_pins: i2c0 {
-+		brcm,pins = <0 1>;
-+		brcm,function = <4>;
-+	};
-+
-+	i2c1_pins: i2c1 {
-+		brcm,pins = <2 3>;
-+		brcm,function = <4>;
-+	};
-+
-+	i2s_pins: i2s {
-+		brcm,pins = <28 29 30 31>;
-+		brcm,function = <6>; /* alt2 */
-+	};
-+
-+	audio_pins: audio_pins {
-+		brcm,pins = <40 45>;
-+		brcm,function = <4>;
-+		brcm,pull = <0>;
-+	};
-+};
-+
-+&uart0 {
-+	status = "okay";
-+};
-+
-+&spi0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi0_pins &spi0_cs_pins>;
-+	cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
-+
-+	spidev0: spidev@0{
-+		compatible = "spidev";
-+		reg = <0>;	/* CE0 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+
-+	spidev1: spidev@1{
-+		compatible = "spidev";
-+		reg = <1>;	/* CE1 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+};
-+
-+&i2c0if {
-+	clock-frequency = <100000>;
-+};
-+
-+&i2c1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2c1_pins>;
-+	clock-frequency = <100000>;
-+};
-+
-+&i2c2 {
-+	clock-frequency = <100000>;
-+};
-+
-+&i2s {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2s_pins>;
-+};
-+
-+&leds {
-+	act_led: led-act {
-+		label = "led0";
-+		linux,default-trigger = "mmc0";
-+		gpios = <&gpio 16 1>;
-+	};
-+};
-+
-+&hdmi {
-+	hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;
-+};
-+
-+&vchiq {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&audio_pins>;
-+};
-+
-+&cam1_reg {
-+	gpio = <&gpio 21 GPIO_ACTIVE_HIGH>;
-+};
-+
-+cam0_reg: &cam_dummy_reg {
-+};
-+
-+/ {
-+	__overrides__ {
-+		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_headphones=1 snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_headphones=0 snd_bcm2835.enable_hdmi=0'}";
-+
-+		act_led_gpio = <&act_led>,"gpios:4";
-+		act_led_activelow = <&act_led>,"gpios:8";
-+		act_led_trigger = <&act_led>,"linux,default-trigger";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/bcm2708-rpi-bt.dtsi b/arch/arm/boot/dts/bcm2708-rpi-bt.dtsi
-new file mode 100644
-index 000000000000..a18f80af97d3
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm2708-rpi-bt.dtsi
-@@ -0,0 +1,26 @@
-+// SPDX-License-Identifier: GPL-2.0
-+
-+&uart0 {
-+	bt: bluetooth {
-+		compatible = "brcm,bcm43438-bt";
-+		max-speed = <3000000>;
-+		shutdown-gpios = <&gpio 45 GPIO_ACTIVE_HIGH>;
-+		status = "disabled";
-+	};
-+};
-+
-+&uart1 {
-+	minibt: bluetooth {
-+		compatible = "brcm,bcm43438-bt";
-+		max-speed = <460800>;
-+		shutdown-gpios = <&gpio 45 GPIO_ACTIVE_HIGH>;
-+		status = "disabled";
-+	};
-+};
-+
-+/ {
-+	__overrides__ {
-+		krnbt = <&bt>,"status";
-+		krnbt_baudrate = <&bt>,"max-speed:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/bcm2708-rpi-cm.dts b/arch/arm/boot/dts/bcm2708-rpi-cm.dts
-new file mode 100644
-index 000000000000..6a97189afe58
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dts
-@@ -0,0 +1,171 @@
-+/dts-v1/;
-+
-+#include "bcm2708-rpi-cm.dtsi"
-+#include "bcm283x-rpi-csi0-2lane.dtsi"
-+#include "bcm283x-rpi-csi1-4lane.dtsi"
-+#include "bcm283x-rpi-i2c0mux_0_28.dtsi"
-+
-+/ {
-+	compatible = "raspberrypi,compute-module", "brcm,bcm2835";
-+	model = "Raspberry Pi Compute Module";
-+};
-+
-+&cam1_reg {
-+	gpio = <&gpio 2 GPIO_ACTIVE_HIGH>;
-+	status = "disabled";
-+};
-+
-+cam0_reg: &cam0_regulator {
-+	gpio = <&gpio 30 GPIO_ACTIVE_HIGH>;
-+};
-+
-+&uart0 {
-+	status = "okay";
-+};
-+
-+&gpio {
-+	/*
-+	 * This is based on the official GPU firmware DT blob.
-+	 *
-+	 * Legend:
-+	 * "NC" = not connected (no rail from the SoC)
-+	 * "FOO" = GPIO line named "FOO" on the schematic
-+	 * "FOO_N" = GPIO line named "FOO" on schematic, active low
-+	 */
-+	gpio-line-names = "GPIO0",
-+			  "GPIO1",
-+			  "GPIO2",
-+			  "GPIO3",
-+			  "GPIO4",
-+			  "GPIO5",
-+			  "GPIO6",
-+			  "GPIO7",
-+			  "GPIO8",
-+			  "GPIO9",
-+			  "GPIO10",
-+			  "GPIO11",
-+			  "GPIO12",
-+			  "GPIO13",
-+			  "GPIO14",
-+			  "GPIO15",
-+			  "GPIO16",
-+			  "GPIO17",
-+			  "GPIO18",
-+			  "GPIO19",
-+			  "GPIO20",
-+			  "GPIO21",
-+			  "GPIO22",
-+			  "GPIO23",
-+			  "GPIO24",
-+			  "GPIO25",
-+			  "GPIO26",
-+			  "GPIO27",
-+			  "GPIO28",
-+			  "GPIO29",
-+			  "GPIO30",
-+			  "GPIO31",
-+			  "GPIO32",
-+			  "GPIO33",
-+			  "GPIO34",
-+			  "GPIO35",
-+			  "GPIO36",
-+			  "GPIO37",
-+			  "GPIO38",
-+			  "GPIO39",
-+			  "GPIO40",
-+			  "GPIO41",
-+			  "GPIO42",
-+			  "GPIO43",
-+			  "GPIO44",
-+			  "GPIO45",
-+			  "HDMI_HPD_N",
-+			  /* Also used as ACT LED */
-+			  "EMMC_EN_N",
-+			  /* Used by eMMC */
-+			  "SD_CLK_R",
-+			  "SD_CMD_R",
-+			  "SD_DATA0_R",
-+			  "SD_DATA1_R",
-+			  "SD_DATA2_R",
-+			  "SD_DATA3_R";
-+
-+	spi0_pins: spi0_pins {
-+		brcm,pins = <9 10 11>;
-+		brcm,function = <4>; /* alt0 */
-+	};
-+
-+	spi0_cs_pins: spi0_cs_pins {
-+		brcm,pins = <8 7>;
-+		brcm,function = <1>; /* output */
-+	};
-+
-+	i2c0_pins: i2c0 {
-+		brcm,pins = <0 1>;
-+		brcm,function = <4>;
-+	};
-+
-+	i2c1_pins: i2c1 {
-+		brcm,pins = <2 3>;
-+		brcm,function = <4>;
-+	};
-+
-+	i2s_pins: i2s {
-+		brcm,pins = <18 19 20 21>;
-+		brcm,function = <4>; /* alt0 */
-+	};
-+
-+	audio_pins: audio_pins {
-+		brcm,pins;
-+		brcm,function;
-+	};
-+};
-+
-+&spi0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi0_pins &spi0_cs_pins>;
-+	cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
-+
-+	spidev0: spidev@0{
-+		compatible = "spidev";
-+		reg = <0>;	/* CE0 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+
-+	spidev1: spidev@1{
-+		compatible = "spidev";
-+		reg = <1>;	/* CE1 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+};
-+
-+&i2c0if {
-+	clock-frequency = <100000>;
-+};
-+
-+&i2c1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2c1_pins>;
-+	clock-frequency = <100000>;
-+};
-+
-+&i2c2 {
-+	clock-frequency = <100000>;
-+};
-+
-+&i2s {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2s_pins>;
-+};
-+
-+&vchiq {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&audio_pins>;
-+};
-+
-+&hdmi {
-+	hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;
-+};
-diff --git a/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
-new file mode 100644
-index 000000000000..c7845d2ba7ff
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
-@@ -0,0 +1,22 @@
-+#include "bcm2708.dtsi"
-+#include "bcm2708-rpi.dtsi"
-+
-+&leds {
-+	act_led: led-act {
-+		label = "led0";
-+		linux,default-trigger = "mmc0";
-+		gpios = <&gpio 47 0>;
-+	};
-+};
-+
-+/ {
-+	__overrides__ {
-+		act_led_gpio = <&act_led>,"gpios:4";
-+		act_led_activelow = <&act_led>,"gpios:8";
-+		act_led_trigger = <&act_led>,"linux,default-trigger";
-+		cam0_reg = <&cam0_reg>,"status";
-+		cam0_reg_gpio = <&cam0_reg>,"gpio:4";
-+		cam1_reg = <&cam1_reg>,"status";
-+		cam1_reg_gpio = <&cam1_reg>,"gpio:4";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
-new file mode 100644
-index 000000000000..323fa2ebf730
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
-@@ -0,0 +1,246 @@
-+/dts-v1/;
-+
-+#include "bcm2708.dtsi"
-+#include "bcm2708-rpi.dtsi"
-+#include "bcm283x-rpi-csi1-2lane.dtsi"
-+#include "bcm283x-rpi-i2c0mux_0_28.dtsi"
-+#include "bcm2708-rpi-bt.dtsi"
-+
-+/ {
-+	compatible = "raspberrypi,model-zero-w", "brcm,bcm2835";
-+	model = "Raspberry Pi Zero W";
-+
-+	chosen {
-+		bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0";
-+	};
-+
-+	aliases {
-+		serial0 = &uart1;
-+		serial1 = &uart0;
-+		mmc1 = &mmcnr;
-+	};
-+};
-+
-+&gpio {
-+	/*
-+	 * This is based on the official GPU firmware DT blob.
-+	 *
-+	 * Legend:
-+	 * "NC" = not connected (no rail from the SoC)
-+	 * "FOO" = GPIO line named "FOO" on the schematic
-+	 * "FOO_N" = GPIO line named "FOO" on schematic, active low
-+	 */
-+	gpio-line-names = "ID_SDA",
-+			  "ID_SCL",
-+			  "SDA1",
-+			  "SCL1",
-+			  "GPIO_GCLK",
-+			  "GPIO5",
-+			  "GPIO6",
-+			  "SPI_CE1_N",
-+			  "SPI_CE0_N",
-+			  "SPI_MISO",
-+			  "SPI_MOSI",
-+			  "SPI_SCLK",
-+			  "GPIO12",
-+			  "GPIO13",
-+			  /* Serial port */
-+			  "TXD1",
-+			  "RXD1",
-+			  "GPIO16",
-+			  "GPIO17",
-+			  "GPIO18",
-+			  "GPIO19",
-+			  "GPIO20",
-+			  "GPIO21",
-+			  "GPIO22",
-+			  "GPIO23",
-+			  "GPIO24",
-+			  "GPIO25",
-+			  "GPIO26",
-+			  "GPIO27",
-+			  "SDA0",
-+			  "SCL0",
-+			  /* Used by BT module */
-+			  "CTS0",
-+			  "RTS0",
-+			  "TXD0",
-+			  "RXD0",
-+			  /* Used by Wifi */
-+			  "SD1_CLK",
-+			  "SD1_CMD",
-+			  "SD1_DATA0",
-+			  "SD1_DATA1",
-+			  "SD1_DATA2",
-+			  "SD1_DATA3",
-+			  "CAM_GPIO1", /* GPIO40 */
-+			  "WL_ON", /* GPIO41 */
-+			  "NC", /* GPIO42 */
-+			  "WIFI_CLK", /* GPIO43 */
-+			  "CAM_GPIO0", /* GPIO44 */
-+			  "BT_ON", /* GPIO45 */
-+			  "HDMI_HPD_N",
-+			  "STATUS_LED_N",
-+			  /* Used by SD Card */
-+			  "SD_CLK_R",
-+			  "SD_CMD_R",
-+			  "SD_DATA0_R",
-+			  "SD_DATA1_R",
-+			  "SD_DATA2_R",
-+			  "SD_DATA3_R";
-+
-+	spi0_pins: spi0_pins {
-+		brcm,pins = <9 10 11>;
-+		brcm,function = <4>; /* alt0 */
-+	};
-+
-+	spi0_cs_pins: spi0_cs_pins {
-+		brcm,pins = <8 7>;
-+		brcm,function = <1>; /* output */
-+	};
-+
-+	i2c0_pins: i2c0 {
-+		brcm,pins = <0 1>;
-+		brcm,function = <4>;
-+	};
-+
-+	i2c1_pins: i2c1 {
-+		brcm,pins = <2 3>;
-+		brcm,function = <4>;
-+	};
-+
-+	i2s_pins: i2s {
-+		brcm,pins = <18 19 20 21>;
-+		brcm,function = <4>; /* alt0 */
-+	};
-+
-+	sdio_pins: sdio_pins {
-+		brcm,pins = <34 35 36 37 38 39>;
-+		brcm,function = <7>; /* ALT3 = SD1 */
-+		brcm,pull = <0 2 2 2 2 2>;
-+	};
-+
-+	bt_pins: bt_pins {
-+		brcm,pins = <43>;
-+		brcm,function = <4>; /* alt0:GPCLK2 */
-+		brcm,pull = <0>; /* none */
-+	};
-+
-+	uart0_pins: uart0_pins {
-+		brcm,pins = <30 31 32 33>;
-+		brcm,function = <7>; /* alt3=UART0 */
-+		brcm,pull = <2 0 0 2>; /* up none none up */
-+	};
-+
-+	uart1_pins: uart1_pins {
-+		brcm,pins;
-+		brcm,function;
-+		brcm,pull;
-+	};
-+
-+	audio_pins: audio_pins {
-+		brcm,pins = <>;
-+		brcm,function = <>;
-+	};
-+};
-+
-+&mmcnr {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&sdio_pins>;
-+	bus-width = <4>;
-+	status = "okay";
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+
-+	brcmf: wifi@1 {
-+		reg = <1>;
-+		compatible = "brcm,bcm4329-fmac";
-+	};
-+};
-+
-+&uart0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart0_pins &bt_pins>;
-+	status = "okay";
-+};
-+
-+&uart1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart1_pins>;
-+	status = "okay";
-+};
-+
-+&spi0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi0_pins &spi0_cs_pins>;
-+	cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
-+
-+	spidev0: spidev@0{
-+		compatible = "spidev";
-+		reg = <0>;	/* CE0 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+
-+	spidev1: spidev@1{
-+		compatible = "spidev";
-+		reg = <1>;	/* CE1 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+};
-+
-+&i2c0if {
-+	clock-frequency = <100000>;
-+};
-+
-+&i2c1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2c1_pins>;
-+	clock-frequency = <100000>;
-+};
-+
-+&i2c2 {
-+	clock-frequency = <100000>;
-+};
-+
-+&i2s {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2s_pins>;
-+};
-+
-+&leds {
-+	act_led: led-act {
-+		label = "led0";
-+		linux,default-trigger = "actpwr";
-+		gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
-+	};
-+};
-+
-+&hdmi {
-+	hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
-+};
-+
-+&vchiq {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&audio_pins>;
-+};
-+
-+&cam1_reg {
-+	gpio = <&gpio 44 GPIO_ACTIVE_HIGH>;
-+};
-+
-+cam0_reg: &cam_dummy_reg {
-+};
-+
-+/ {
-+	__overrides__ {
-+		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_hdmi=0'}";
-+
-+		act_led_gpio = <&act_led>,"gpios:4";
-+		act_led_activelow = <&act_led>,"gpios:8";
-+		act_led_trigger = <&act_led>,"linux,default-trigger";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero.dts b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
-new file mode 100644
-index 000000000000..406f945d4093
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
-@@ -0,0 +1,187 @@
-+/dts-v1/;
-+
-+#include "bcm2708.dtsi"
-+#include "bcm2708-rpi.dtsi"
-+#include "bcm283x-rpi-csi1-2lane.dtsi"
-+#include "bcm283x-rpi-i2c0mux_0_28.dtsi"
-+
-+/ {
-+	compatible = "raspberrypi,model-zero", "brcm,bcm2835";
-+	model = "Raspberry Pi Zero";
-+};
-+
-+&gpio {
-+	/*
-+	 * This is based on the official GPU firmware DT blob.
-+	 *
-+	 * Legend:
-+	 * "NC" = not connected (no rail from the SoC)
-+	 * "FOO" = GPIO line named "FOO" on the schematic
-+	 * "FOO_N" = GPIO line named "FOO" on schematic, active low
-+	 */
-+	gpio-line-names = "ID_SDA",
-+			  "ID_SCL",
-+			  "SDA1",
-+			  "SCL1",
-+			  "GPIO_GCLK",
-+			  "GPIO5",
-+			  "GPIO6",
-+			  "SPI_CE1_N",
-+			  "SPI_CE0_N",
-+			  "SPI_MISO",
-+			  "SPI_MOSI",
-+			  "SPI_SCLK",
-+			  "GPIO12",
-+			  "GPIO13",
-+			  /* Serial port */
-+			  "TXD0",
-+			  "RXD0",
-+			  "GPIO16",
-+			  "GPIO17",
-+			  "GPIO18",
-+			  "GPIO19",
-+			  "GPIO20",
-+			  "GPIO21",
-+			  "GPIO22",
-+			  "GPIO23",
-+			  "GPIO24",
-+			  "GPIO25",
-+			  "GPIO26",
-+			  "GPIO27",
-+			  "SDA0",
-+			  "SCL0",
-+			  "NC", /* GPIO30 */
-+			  "NC", /* GPIO31 */
-+			  "CAM_GPIO1", /* GPIO32 */
-+			  "NC", /* GPIO33 */
-+			  "NC", /* GPIO34 */
-+			  "NC", /* GPIO35 */
-+			  "NC", /* GPIO36 */
-+			  "NC", /* GPIO37 */
-+			  "NC", /* GPIO38 */
-+			  "NC", /* GPIO39 */
-+			  "NC", /* GPIO40 */
-+			  "CAM_GPIO0", /* GPIO41 */
-+			  "NC", /* GPIO42 */
-+			  "NC", /* GPIO43 */
-+			  "NC", /* GPIO44 */
-+			  "NC", /* GPIO45 */
-+			  "HDMI_HPD_N",
-+			  "STATUS_LED_N",
-+			  /* Used by SD Card */
-+			  "SD_CLK_R",
-+			  "SD_CMD_R",
-+			  "SD_DATA0_R",
-+			  "SD_DATA1_R",
-+			  "SD_DATA2_R",
-+			  "SD_DATA3_R";
-+
-+	spi0_pins: spi0_pins {
-+		brcm,pins = <9 10 11>;
-+		brcm,function = <4>; /* alt0 */
-+	};
-+
-+	spi0_cs_pins: spi0_cs_pins {
-+		brcm,pins = <8 7>;
-+		brcm,function = <1>; /* output */
-+	};
-+
-+	i2c0_pins: i2c0 {
-+		brcm,pins = <0 1>;
-+		brcm,function = <4>;
-+	};
-+
-+	i2c1_pins: i2c1 {
-+		brcm,pins = <2 3>;
-+		brcm,function = <4>;
-+	};
-+
-+	i2s_pins: i2s {
-+		brcm,pins = <18 19 20 21>;
-+		brcm,function = <4>; /* alt0 */
-+	};
-+
-+	audio_pins: audio_pins {
-+		brcm,pins = <>;
-+		brcm,function = <>;
-+	};
-+};
-+
-+&uart0 {
-+	status = "okay";
-+};
-+
-+&spi0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi0_pins &spi0_cs_pins>;
-+	cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
-+
-+	spidev0: spidev@0{
-+		compatible = "spidev";
-+		reg = <0>;	/* CE0 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+
-+	spidev1: spidev@1{
-+		compatible = "spidev";
-+		reg = <1>;	/* CE1 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+};
-+
-+&i2c0if {
-+	clock-frequency = <100000>;
-+};
-+
-+&i2c1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2c1_pins>;
-+	clock-frequency = <100000>;
-+};
-+
-+&i2c2 {
-+	clock-frequency = <100000>;
-+};
-+
-+&i2s {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2s_pins>;
-+};
-+
-+&leds {
-+	act_led: led-act {
-+		label = "led0";
-+		linux,default-trigger = "actpwr";
-+		gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
-+	};
-+};
-+
-+&hdmi {
-+	hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
-+};
-+
-+&vchiq {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&audio_pins>;
-+};
-+
-+&cam1_reg {
-+	gpio = <&gpio 41 GPIO_ACTIVE_HIGH>;
-+};
-+
-+cam0_reg: &cam_dummy_reg {
-+};
-+
-+/ {
-+	__overrides__ {
-+		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_hdmi=0'}";
-+
-+		act_led_gpio = <&act_led>,"gpios:4";
-+		act_led_activelow = <&act_led>,"gpios:8";
-+		act_led_trigger = <&act_led>,"linux,default-trigger";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/bcm2708-rpi.dtsi b/arch/arm/boot/dts/bcm2708-rpi.dtsi
-new file mode 100644
-index 000000000000..f774eda1ae55
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm2708-rpi.dtsi
-@@ -0,0 +1,40 @@
-+/* Downstream modifications common to bcm2835, bcm2836, bcm2837 */
-+
-+#define i2c0 i2c0mux
-+#include "bcm2835-rpi.dtsi"
-+#undef i2c0
-+#include "bcm270x-rpi.dtsi"
-+
-+/ {
-+	memory@0 {
-+		device_type = "memory";
-+		reg = <0x0 0x0>;
-+	};
-+
-+	aliases {
-+		i2c2 = &i2c2;
-+	};
-+
-+	__overrides__ {
-+		hdmi = <&hdmi>,"status";
-+		i2c2_iknowwhatimdoing = <&i2c2>,"status";
-+		i2c2_baudrate = <&i2c2>,"clock-frequency:0";
-+		sd = <&sdhost>,"status";
-+		sd_poll_once = <&sdhost>,"non-removable?";
-+	};
-+};
-+
-+&sdhost {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&sdhost_gpio48>;
-+	status = "okay";
-+};
-+
-+&hdmi {
-+	power-domains = <&power RPI_POWER_DOMAIN_HDMI>;
-+	status = "disabled";
-+};
-+
-+&i2c2 {
-+	status = "disabled";
-+};
-diff --git a/arch/arm/boot/dts/bcm2708.dtsi b/arch/arm/boot/dts/bcm2708.dtsi
-new file mode 100644
-index 000000000000..b3cf34cdcc0e
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm2708.dtsi
-@@ -0,0 +1,18 @@
-+#define i2c0 i2c0if
-+#include "bcm2835.dtsi"
-+#undef i2c0
-+#include "bcm270x.dtsi"
-+
-+/ {
-+	__overrides__ {
-+		arm_freq;
-+	};
-+};
-+
-+&soc {
-+	dma-ranges = <0x80000000 0x00000000 0x20000000>;
-+};
-+
-+&vc4 {
-+	status = "disabled";
-+};
-diff --git a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
-new file mode 100644
-index 000000000000..c6220e6d5fbc
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
-@@ -0,0 +1,200 @@
-+/dts-v1/;
-+
-+#include "bcm2709.dtsi"
-+#include "bcm2709-rpi.dtsi"
-+#include "bcm283x-rpi-smsc9514.dtsi"
-+#include "bcm283x-rpi-csi1-2lane.dtsi"
-+#include "bcm283x-rpi-i2c0mux_0_28.dtsi"
-+
-+/ {
-+	compatible = "raspberrypi,2-model-b", "brcm,bcm2836";
-+	model = "Raspberry Pi 2 Model B";
-+};
-+
-+&gpio {
-+	/*
-+	 * Taken from rpi_SCH_2b_1p2_reduced.pdf and
-+	 * the official GPU firmware DT blob.
-+	 *
-+	 * Legend:
-+	 * "NC" = not connected (no rail from the SoC)
-+	 * "FOO" = GPIO line named "FOO" on the schematic
-+	 * "FOO_N" = GPIO line named "FOO" on schematic, active low
-+	 */
-+	gpio-line-names = "ID_SDA",
-+			  "ID_SCL",
-+			  "SDA1",
-+			  "SCL1",
-+			  "GPIO_GCLK",
-+			  "GPIO5",
-+			  "GPIO6",
-+			  "SPI_CE1_N",
-+			  "SPI_CE0_N",
-+			  "SPI_MISO",
-+			  "SPI_MOSI",
-+			  "SPI_SCLK",
-+			  "GPIO12",
-+			  "GPIO13",
-+			  /* Serial port */
-+			  "TXD0",
-+			  "RXD0",
-+			  "GPIO16",
-+			  "GPIO17",
-+			  "GPIO18",
-+			  "GPIO19",
-+			  "GPIO20",
-+			  "GPIO21",
-+			  "GPIO22",
-+			  "GPIO23",
-+			  "GPIO24",
-+			  "GPIO25",
-+			  "GPIO26",
-+			  "GPIO27",
-+			  "SDA0",
-+			  "SCL0",
-+			  "NC", /* GPIO30 */
-+			  "LAN_RUN",
-+			  "CAM_GPIO1",
-+			  "NC", /* GPIO33 */
-+			  "NC", /* GPIO34 */
-+			  "PWR_LOW_N",
-+			  "NC", /* GPIO36 */
-+			  "NC", /* GPIO37 */
-+			  "USB_LIMIT",
-+			  "NC", /* GPIO39 */
-+			  "PWM0_OUT",
-+			  "CAM_GPIO0",
-+			  "SMPS_SCL",
-+			  "SMPS_SDA",
-+			  "ETH_CLK",
-+			  "PWM1_OUT",
-+			  "HDMI_HPD_N",
-+			  "STATUS_LED",
-+			  /* Used by SD Card */
-+			  "SD_CLK_R",
-+			  "SD_CMD_R",
-+			  "SD_DATA0_R",
-+			  "SD_DATA1_R",
-+			  "SD_DATA2_R",
-+			  "SD_DATA3_R";
-+
-+	spi0_pins: spi0_pins {
-+		brcm,pins = <9 10 11>;
-+		brcm,function = <4>; /* alt0 */
-+	};
-+
-+	spi0_cs_pins: spi0_cs_pins {
-+		brcm,pins = <8 7>;
-+		brcm,function = <1>; /* output */
-+	};
-+
-+	i2c0_pins: i2c0 {
-+		brcm,pins = <0 1>;
-+		brcm,function = <4>;
-+	};
-+
-+	i2c1_pins: i2c1 {
-+		brcm,pins = <2 3>;
-+		brcm,function = <4>;
-+	};
-+
-+	i2s_pins: i2s {
-+		brcm,pins = <18 19 20 21>;
-+		brcm,function = <4>; /* alt0 */
-+	};
-+
-+	audio_pins: audio_pins {
-+		brcm,pins = <40 45>;
-+		brcm,function = <4>;
-+		brcm,pull = <0>;
-+	};
-+};
-+
-+&uart0 {
-+	status = "okay";
-+};
-+
-+&spi0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi0_pins &spi0_cs_pins>;
-+	cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
-+
-+	spidev0: spidev@0{
-+		compatible = "spidev";
-+		reg = <0>;	/* CE0 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+
-+	spidev1: spidev@1{
-+		compatible = "spidev";
-+		reg = <1>;	/* CE1 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+};
-+
-+&i2c0if {
-+	clock-frequency = <100000>;
-+};
-+
-+&i2c1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2c1_pins>;
-+	clock-frequency = <100000>;
-+};
-+
-+&i2c2 {
-+	clock-frequency = <100000>;
-+};
-+
-+&i2s {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2s_pins>;
-+};
-+
-+&leds {
-+	act_led: led-act {
-+		label = "led0";
-+		linux,default-trigger = "mmc0";
-+		gpios = <&gpio 47 0>;
-+	};
-+
-+	pwr_led: led-pwr {
-+		label = "led1";
-+		linux,default-trigger = "input";
-+		gpios = <&gpio 35 0>;
-+	};
-+};
-+
-+&hdmi {
-+	hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
-+};
-+
-+&vchiq {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&audio_pins>;
-+};
-+
-+&cam1_reg {
-+	gpio = <&gpio 41 GPIO_ACTIVE_HIGH>;
-+};
-+
-+cam0_reg: &cam_dummy_reg {
-+};
-+
-+/ {
-+	__overrides__ {
-+		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_headphones=1 snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_headphones=0 snd_bcm2835.enable_hdmi=0'}";
-+
-+		act_led_gpio = <&act_led>,"gpios:4";
-+		act_led_activelow = <&act_led>,"gpios:8";
-+		act_led_trigger = <&act_led>,"linux,default-trigger";
-+
-+		pwr_led_gpio = <&pwr_led>,"gpios:4";
-+		pwr_led_activelow = <&pwr_led>,"gpios:8";
-+		pwr_led_trigger = <&pwr_led>,"linux,default-trigger";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/bcm2709-rpi-cm2.dts b/arch/arm/boot/dts/bcm2709-rpi-cm2.dts
-new file mode 100644
-index 000000000000..c9e47c46f4f7
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm2709-rpi-cm2.dts
-@@ -0,0 +1,221 @@
-+/dts-v1/;
-+
-+#include "bcm2709.dtsi"
-+#include "bcm2709-rpi.dtsi"
-+#include "bcm283x-rpi-csi0-2lane.dtsi"
-+#include "bcm283x-rpi-csi1-4lane.dtsi"
-+#include "bcm283x-rpi-i2c0mux_0_28.dtsi"
-+
-+/ {
-+	compatible = "raspberrypi,2-compute-module", "brcm,bcm2836";
-+	model = "Raspberry Pi Compute Module 2";
-+};
-+
-+&cam1_reg {
-+	gpio = <&gpio 2 GPIO_ACTIVE_HIGH>;
-+	status = "disabled";
-+};
-+
-+cam0_reg: &cam0_regulator {
-+	gpio = <&gpio 30 GPIO_ACTIVE_HIGH>;
-+};
-+
-+&uart0 {
-+	status = "okay";
-+};
-+
-+&gpio {
-+	/*
-+	 * This is based on the official GPU firmware DT blob.
-+	 *
-+	 * Legend:
-+	 * "NC" = not connected (no rail from the SoC)
-+	 * "FOO" = GPIO line named "FOO" on the schematic
-+	 * "FOO_N" = GPIO line named "FOO" on schematic, active low
-+	 */
-+	gpio-line-names = "GPIO0",
-+			  "GPIO1",
-+			  "GPIO2",
-+			  "GPIO3",
-+			  "GPIO4",
-+			  "GPIO5",
-+			  "GPIO6",
-+			  "GPIO7",
-+			  "GPIO8",
-+			  "GPIO9",
-+			  "GPIO10",
-+			  "GPIO11",
-+			  "GPIO12",
-+			  "GPIO13",
-+			  "GPIO14",
-+			  "GPIO15",
-+			  "GPIO16",
-+			  "GPIO17",
-+			  "GPIO18",
-+			  "GPIO19",
-+			  "GPIO20",
-+			  "GPIO21",
-+			  "GPIO22",
-+			  "GPIO23",
-+			  "GPIO24",
-+			  "GPIO25",
-+			  "GPIO26",
-+			  "GPIO27",
-+			  "GPIO28",
-+			  "GPIO29",
-+			  "GPIO30",
-+			  "GPIO31",
-+			  "GPIO32",
-+			  "GPIO33",
-+			  "GPIO34",
-+			  "GPIO35",
-+			  "GPIO36",
-+			  "GPIO37",
-+			  "GPIO38",
-+			  "GPIO39",
-+			  "GPIO40",
-+			  "GPIO41",
-+			  "GPIO42",
-+			  "GPIO43",
-+			  "GPIO44",
-+			  "GPIO45",
-+			  "SMPS_SCL",
-+			  "SMPS_SDA",
-+			  /* Used by eMMC */
-+			  "SD_CLK_R",
-+			  "SD_CMD_R",
-+			  "SD_DATA0_R",
-+			  "SD_DATA1_R",
-+			  "SD_DATA2_R",
-+			  "SD_DATA3_R";
-+
-+	spi0_pins: spi0_pins {
-+		brcm,pins = <9 10 11>;
-+		brcm,function = <4>; /* alt0 */
-+	};
-+
-+	spi0_cs_pins: spi0_cs_pins {
-+		brcm,pins = <8 7>;
-+		brcm,function = <1>; /* output */
-+	};
-+
-+	i2c0_pins: i2c0 {
-+		brcm,pins = <0 1>;
-+		brcm,function = <4>;
-+	};
-+
-+	i2c1_pins: i2c1 {
-+		brcm,pins = <2 3>;
-+		brcm,function = <4>;
-+	};
-+
-+	i2s_pins: i2s {
-+		brcm,pins = <18 19 20 21>;
-+		brcm,function = <4>; /* alt0 */
-+	};
-+
-+	audio_pins: audio_pins {
-+		brcm,pins;
-+		brcm,function;
-+	};
-+};
-+
-+&soc {
-+	virtgpio: virtgpio {
-+		compatible = "brcm,bcm2835-virtgpio";
-+		gpio-controller;
-+		#gpio-cells = <2>;
-+		firmware = <&firmware>;
-+		status = "okay";
-+	};
-+
-+};
-+
-+&firmware {
-+	expgpio: expgpio {
-+		compatible = "raspberrypi,firmware-gpio";
-+		gpio-controller;
-+		#gpio-cells = <2>;
-+		gpio-line-names = "HDMI_HPD_N",
-+				  "EMMC_EN_N",
-+				  "NC",
-+				  "NC",
-+				  "NC",
-+				  "NC",
-+				  "NC",
-+				  "NC";
-+		status = "okay";
-+	};
-+};
-+
-+&spi0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi0_pins &spi0_cs_pins>;
-+	cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
-+
-+	spidev0: spidev@0{
-+		compatible = "spidev";
-+		reg = <0>;	/* CE0 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+
-+	spidev1: spidev@1{
-+		compatible = "spidev";
-+		reg = <1>;	/* CE1 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+};
-+
-+&i2c0if {
-+	clock-frequency = <100000>;
-+};
-+
-+&i2c1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2c1_pins>;
-+	clock-frequency = <100000>;
-+};
-+
-+&i2c2 {
-+	clock-frequency = <100000>;
-+};
-+
-+&i2s {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2s_pins>;
-+};
-+
-+&leds {
-+	act_led: led-act {
-+		label = "led0";
-+		linux,default-trigger = "mmc0";
-+		gpios = <&virtgpio 0 0>;
-+	};
-+};
-+
-+&hdmi {
-+	hpd-gpios = <&expgpio 0 GPIO_ACTIVE_LOW>;
-+};
-+
-+&vchiq {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&audio_pins>;
-+};
-+
-+/ {
-+	__overrides__ {
-+		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_hdmi=0'}";
-+
-+		act_led_gpio = <&act_led>,"gpios:4";
-+		act_led_activelow = <&act_led>,"gpios:8";
-+		act_led_trigger = <&act_led>,"linux,default-trigger";
-+		cam0_reg = <&cam0_reg>,"status";
-+		cam0_reg_gpio = <&cam0_reg>,"gpio:4";
-+		cam1_reg = <&cam1_reg>,"status";
-+		cam1_reg_gpio = <&cam1_reg>,"gpio:4";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/bcm2709-rpi.dtsi b/arch/arm/boot/dts/bcm2709-rpi.dtsi
-new file mode 100644
-index 000000000000..babfa41cd9f7
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm2709-rpi.dtsi
-@@ -0,0 +1,5 @@
-+#include "bcm2708-rpi.dtsi"
-+
-+&vchiq {
-+	compatible = "brcm,bcm2836-vchiq", "brcm,bcm2835-vchiq";
-+};
-diff --git a/arch/arm/boot/dts/bcm2709.dtsi b/arch/arm/boot/dts/bcm2709.dtsi
-new file mode 100644
-index 000000000000..e195f7247813
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm2709.dtsi
-@@ -0,0 +1,24 @@
-+#define i2c0 i2c0if
-+#include "bcm2836.dtsi"
-+#undef i2c0
-+#include "bcm270x.dtsi"
-+
-+/ {
-+	soc {
-+		ranges = <0x7e000000 0x3f000000 0x01000000>,
-+		         <0x40000000 0x40000000 0x00040000>;
-+
-+		/delete-node/ timer@7e003000;
-+	};
-+
-+	__overrides__ {
-+		arm_freq = <&v7_cpu0>, "clock-frequency:0",
-+			   <&v7_cpu1>, "clock-frequency:0",
-+			   <&v7_cpu2>, "clock-frequency:0",
-+			   <&v7_cpu3>, "clock-frequency:0";
-+	};
-+};
-+
-+&vc4 {
-+	status = "disabled";
-+};
-diff --git a/arch/arm/boot/dts/bcm270x-rpi.dtsi b/arch/arm/boot/dts/bcm270x-rpi.dtsi
-new file mode 100644
-index 000000000000..1401d7b261f8
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm270x-rpi.dtsi
-@@ -0,0 +1,177 @@
-+/* Downstream modifications to bcm2835-rpi.dtsi */
-+
-+/ {
-+	aliases {
-+		aux = &aux;
-+		sound = &sound;
-+		soc = &soc;
-+		dma = &dma;
-+		intc = &intc;
-+		watchdog = &watchdog;
-+		random = &random;
-+		mailbox = &mailbox;
-+		gpio = &gpio;
-+		uart0 = &uart0;
-+		uart1 = &uart1;
-+		sdhost = &sdhost;
-+		mmc = &mmc;
-+		mmc1 = &mmc;
-+		mmc0 = &sdhost;
-+		i2s = &i2s;
-+		i2c0 = &i2c0;
-+		i2c1 = &i2c1;
-+		i2c10 = &i2c_csi_dsi;
-+		spi0 = &spi0;
-+		spi1 = &spi1;
-+		spi2 = &spi2;
-+		usb = &usb;
-+		leds = &leds;
-+		fb = &fb;
-+		thermal = &thermal;
-+		axiperf = &axiperf;
-+	};
-+
-+	/* Define these notional regulators for use by overlays */
-+	vdd_3v3_reg: fixedregulator_3v3 {
-+		compatible = "regulator-fixed";
-+		regulator-always-on;
-+		regulator-max-microvolt = <3300000>;
-+		regulator-min-microvolt = <3300000>;
-+		regulator-name = "3v3";
-+	};
-+
-+	vdd_5v0_reg: fixedregulator_5v0 {
-+		compatible = "regulator-fixed";
-+		regulator-always-on;
-+		regulator-max-microvolt = <5000000>;
-+		regulator-min-microvolt = <5000000>;
-+		regulator-name = "5v0";
-+	};
-+
-+	leds: leds {
-+		compatible = "gpio-leds";
-+	};
-+
-+	soc {
-+		gpiomem {
-+			compatible = "brcm,bcm2835-gpiomem";
-+			reg = <0x7e200000 0x1000>;
-+		};
-+
-+		fb: fb {
-+			compatible = "brcm,bcm2708-fb";
-+			firmware = <&firmware>;
-+			status = "okay";
-+		};
-+
-+		/* External sound card */
-+		sound: sound {
-+			status = "disabled";
-+		};
-+	};
-+
-+	__overrides__ {
-+		cache_line_size;
-+
-+		uart0 = <&uart0>,"status";
-+		uart1 = <&uart1>,"status";
-+		i2s = <&i2s>,"status";
-+		spi = <&spi0>,"status";
-+		i2c0 = <&i2c0if>,"status",<&i2c0mux>,"status";
-+		i2c1 = <&i2c1>,"status";
-+		i2c0_baudrate = <&i2c0if>,"clock-frequency:0";
-+		i2c1_baudrate = <&i2c1>,"clock-frequency:0";
-+
-+		watchdog = <&watchdog>,"status";
-+		random = <&random>,"status";
-+		sd_overclock = <&sdhost>,"brcm,overclock-50:0";
-+		sd_force_pio = <&sdhost>,"brcm,force-pio?";
-+		sd_pio_limit = <&sdhost>,"brcm,pio-limit:0";
-+		sd_debug     = <&sdhost>,"brcm,debug";
-+		sdio_overclock = <&mmc>,"brcm,overclock-50:0",
-+				 <&mmcnr>,"brcm,overclock-50:0";
-+		axiperf      = <&axiperf>,"status";
-+	};
-+};
-+
-+&uart0 {
-+	skip-init;
-+};
-+
-+&uart1 {
-+	skip-init;
-+};
-+
-+&txp {
-+	status = "disabled";
-+};
-+
-+&i2c0if {
-+	status = "disabled";
-+};
-+
-+&i2c0mux {
-+	pinctrl-names = "i2c0", "i2c_csi_dsi";
-+	/delete-property/ clock-frequency;
-+	status = "disabled";
-+};
-+
-+&i2c1 {
-+	status = "disabled";
-+};
-+
-+&clocks {
-+	firmware = <&firmware>;
-+};
-+
-+&sdhci {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&emmc_gpio48>;
-+	bus-width = <4>;
-+};
-+
-+&cpu_thermal {
-+	// Add some labels
-+	thermal_trips: trips {
-+		cpu-crit {
-+			// Raise upstream limit of 90C
-+			temperature = <110000>;
-+		};
-+	};
-+	cooling_maps: cooling-maps {
-+	};
-+};
-+
-+&vec {
-+	clocks = <&firmware_clocks 15>;
-+	status = "disabled";
-+};
-+
-+&firmware {
-+#ifndef BCM2711
-+	firmware_clocks: clocks {
-+		compatible = "raspberrypi,firmware-clocks";
-+		#clock-cells = <1>;
-+	};
-+#endif
-+
-+	vcio: vcio {
-+		compatible = "raspberrypi,vcio";
-+	};
-+};
-+
-+&vc4 {
-+	raspberrypi,firmware = <&firmware>;
-+};
-+
-+#ifndef BCM2711
-+
-+&hdmi {
-+	reg-names = "hdmi",
-+		    "hd";
-+	clocks = <&firmware_clocks 9>,
-+		 <&firmware_clocks 13>;
-+	dmas = <&dma (17|(1<<27)|(1<<24))>;
-+};
-+
-+#endif
-diff --git a/arch/arm/boot/dts/bcm270x.dtsi b/arch/arm/boot/dts/bcm270x.dtsi
-new file mode 100644
-index 000000000000..bb8e7a9d1b22
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm270x.dtsi
-@@ -0,0 +1,294 @@
-+/* Downstream bcm283x.dtsi diff */
-+#include <dt-bindings/power/raspberrypi-power.h>
-+
-+/ {
-+	chosen: chosen {
-+		// Disable audio by default
-+		bootargs = "coherent_pool=1M snd_bcm2835.enable_headphones=0";
-+		/delete-property/ stdout-path;
-+	};
-+
-+	soc: soc {
-+		watchdog: watchdog@7e100000 {
-+			/* Add label */
-+		};
-+
-+		random: rng@7e104000 {
-+			/* Add label */
-+		};
-+
-+		spi0: spi@7e204000 {
-+			/* Add label */
-+		};
-+
-+#ifndef BCM2711
-+		pixelvalve0: pixelvalve@7e206000 {
-+			/* Add label */
-+			status = "disabled";
-+		};
-+
-+		pixelvalve1: pixelvalve@7e207000 {
-+			/* Add label */
-+			status = "disabled";
-+		};
-+#endif
-+
-+		/delete-node/ mmc@7e300000;
-+
-+		sdhci: mmc: mmc@7e300000 {
-+			compatible = "brcm,bcm2835-mmc", "brcm,bcm2835-sdhci";
-+			reg = <0x7e300000 0x100>;
-+			interrupts = <2 30>;
-+			clocks = <&clocks BCM2835_CLOCK_EMMC>;
-+			dmas = <&dma 11>;
-+			dma-names = "rx-tx";
-+			brcm,overclock-50 = <0>;
-+			status = "disabled";
-+		};
-+
-+		/* A clone of mmc but with non-removable set */
-+		mmcnr: mmcnr@7e300000 {
-+			compatible = "brcm,bcm2835-mmc", "brcm,bcm2835-sdhci";
-+			reg = <0x7e300000 0x100>;
-+			interrupts = <2 30>;
-+			clocks = <&clocks BCM2835_CLOCK_EMMC>;
-+			dmas = <&dma 11>;
-+			dma-names = "rx-tx";
-+			brcm,overclock-50 = <0>;
-+			non-removable;
-+			status = "disabled";
-+		};
-+
-+		hvs: hvs@7e400000 {
-+			/* Add label */
-+			status = "disabled";
-+		};
-+
-+		firmwarekms: firmwarekms@7e600000 {
-+			compatible = "raspberrypi,rpi-firmware-kms";
-+			/* SMI interrupt reg */
-+			reg = <0x7e600000 0x100>;
-+			interrupts = <2 16>;
-+			brcm,firmware = <&firmware>;
-+			status = "disabled";
-+		};
-+
-+		smi: smi@7e600000 {
-+			compatible = "brcm,bcm2835-smi";
-+			reg = <0x7e600000 0x100>;
-+			interrupts = <2 16>;
-+			clocks = <&clocks BCM2835_CLOCK_SMI>;
-+			assigned-clocks = <&clocks BCM2835_CLOCK_SMI>;
-+			assigned-clock-rates = <125000000>;
-+			dmas = <&dma 4>;
-+			dma-names = "rx-tx";
-+			status = "disabled";
-+		};
-+
-+		csi0: csi@7e800000 {
-+			compatible = "brcm,bcm2835-unicam";
-+			reg = <0x7e800000 0x800>,
-+			      <0x7e802000 0x4>;
-+			interrupts = <2 6>;
-+			clocks = <&clocks BCM2835_CLOCK_CAM0>,
-+				 <&firmware_clocks 4>;
-+			clock-names = "lp", "vpu";
-+			power-domains = <&power RPI_POWER_DOMAIN_UNICAM0>;
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			#clock-cells = <1>;
-+			status = "disabled";
-+		};
-+
-+		csi1: csi@7e801000 {
-+			compatible = "brcm,bcm2835-unicam";
-+			reg = <0x7e801000 0x800>,
-+			      <0x7e802004 0x4>;
-+			interrupts = <2 7>;
-+			clocks = <&clocks BCM2835_CLOCK_CAM1>,
-+				 <&firmware_clocks 4>;
-+			clock-names = "lp", "vpu";
-+			power-domains = <&power RPI_POWER_DOMAIN_UNICAM1>;
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			#clock-cells = <1>;
-+			status = "disabled";
-+		};
-+
-+#ifndef BCM2711
-+		pixelvalve2: pixelvalve@7e807000 {
-+			/* Add label */
-+			status = "disabled";
-+		};
-+#endif
-+
-+		hdmi@7e902000 { /* hdmi */
-+			status = "disabled";
-+		};
-+
-+		usb@7e980000 { /* usb */
-+			compatible = "brcm,bcm2708-usb";
-+			reg = <0x7e980000 0x10000>,
-+			      <0x7e006000 0x1000>;
-+			interrupt-names = "usb",
-+					  "soft";
-+			interrupts = <1 9>,
-+				     <2 0>;
-+		};
-+
-+#ifndef BCM2711
-+		v3d@7ec00000 { /* vd3 */
-+			compatible = "brcm,vc4-v3d";
-+			power-domains = <&power RPI_POWER_DOMAIN_V3D>;
-+			status = "disabled";
-+		};
-+#endif
-+
-+		axiperf: axiperf {
-+			compatible = "brcm,bcm2835-axiperf";
-+			reg = <0x7e009800 0x100>,
-+			      <0x7ee08000 0x100>;
-+			firmware = <&firmware>;
-+			status = "disabled";
-+		};
-+
-+		i2c0mux: i2c0mux {
-+			compatible = "i2c-mux-pinctrl";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			i2c-parent = <&i2c0if>;
-+
-+			status = "disabled";
-+
-+			i2c0: i2c@0 {
-+				reg = <0>;
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+			};
-+
-+			i2c_csi_dsi: i2c@1 {
-+				reg = <1>;
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+			};
-+		};
-+	};
-+
-+	cam1_reg: cam1_regulator {
-+		compatible = "regulator-fixed";
-+		regulator-name = "cam1-reg";
-+		enable-active-high;
-+		/* Needs to be enabled, as removing a regulator is very unsafe */
-+		status = "okay";
-+	};
-+
-+	cam1_clk: cam1_clk {
-+		compatible = "fixed-clock";
-+		#clock-cells = <0>;
-+		status = "disabled";
-+	};
-+
-+	cam0_regulator: cam0_regulator {
-+		compatible = "regulator-fixed";
-+		regulator-name = "cam0-reg";
-+		enable-active-high;
-+		status = "disabled";
-+	};
-+
-+	cam0_clk: cam0_clk {
-+		compatible = "fixed-clock";
-+		#clock-cells = <0>;
-+		status = "disabled";
-+	};
-+
-+	cam_dummy_reg: cam_dummy_reg {
-+		compatible = "regulator-fixed";
-+		regulator-name = "cam-dummy-reg";
-+		status = "okay";
-+	};
-+
-+	__overrides__ {
-+		cam0-pwdn-ctrl;
-+		cam0-pwdn;
-+		cam0-led-ctrl;
-+		cam0-led;
-+	};
-+};
-+
-+&gpio {
-+	interrupts = <2 17>, <2 18>;
-+
-+	dpi_18bit_cpadhi_gpio0: dpi_18bit_cpadhi_gpio0 {
-+		brcm,pins = <0 1 2 3 4 5 6 7 8 9
-+			     12 13 14 15 16 17
-+			     20 21 22 23 24 25>;
-+		brcm,function = <BCM2835_FSEL_ALT2>;
-+		brcm,pull = <0>; /* no pull */
-+	};
-+	dpi_18bit_cpadhi_gpio2: dpi_18bit_cpadhi_gpio2 {
-+		brcm,pins = <2 3 4 5 6 7 8 9
-+			     12 13 14 15 16 17
-+			     20 21 22 23 24 25>;
-+		brcm,function = <BCM2835_FSEL_ALT2>;
-+	};
-+	dpi_18bit_gpio0: dpi_18bit_gpio0 {
-+		brcm,pins = <0 1 2 3 4 5 6 7 8 9 10 11
-+			     12 13 14 15 16 17 18 19
-+			     20 21>;
-+		brcm,function = <BCM2835_FSEL_ALT2>;
-+	};
-+	dpi_18bit_gpio2: dpi_18bit_gpio2 {
-+		brcm,pins = <2 3 4 5 6 7 8 9 10 11
-+			     12 13 14 15 16 17 18 19
-+			     20 21>;
-+		brcm,function = <BCM2835_FSEL_ALT2>;
-+	};
-+	dpi_16bit_gpio0: dpi_16bit_gpio0 {
-+		brcm,pins = <0 1 2 3 4 5 6 7 8 9 10 11
-+			     12 13 14 15 16 17 18 19>;
-+		brcm,function = <BCM2835_FSEL_ALT2>;
-+	};
-+	dpi_16bit_gpio2: dpi_16bit_gpio2 {
-+		brcm,pins = <2 3 4 5 6 7 8 9 10 11
-+			     12 13 14 15 16 17 18 19>;
-+		brcm,function = <BCM2835_FSEL_ALT2>;
-+	};
-+	dpi_16bit_cpadhi_gpio0: dpi_16bit_cpadhi_gpio0 {
-+		brcm,pins = <0 1 2 3 4 5 6 7 8
-+			     12 13 14 15 16 17
-+			     20 21 22 23 24>;
-+		brcm,function = <BCM2835_FSEL_ALT2>;
-+	};
-+	dpi_16bit_cpadhi_gpio2: dpi_16bit_cpadhi_gpio2 {
-+		brcm,pins = <2 3 4 5 6 7 8
-+			     12 13 14 15 16 17
-+			     20 21 22 23 24>;
-+		brcm,function = <BCM2835_FSEL_ALT2>;
-+	};
-+};
-+
-+&uart0 {
-+	/* Enable CTS bug workaround */
-+	cts-event-workaround;
-+};
-+
-+&i2s {
-+	#sound-dai-cells = <0>;
-+	dmas = <&dma 2>, <&dma 3>;
-+	dma-names = "tx", "rx";
-+};
-+
-+&sdhost {
-+	dmas = <&dma (13|(1<<29))>;
-+	dma-names = "rx-tx";
-+	bus-width = <4>;
-+	brcm,overclock-50 = <0>;
-+	brcm,pio-limit = <1>;
-+	firmware = <&firmware>;
-+};
-+
-+&spi0 {
-+	dmas = <&dma 6>, <&dma 7>;
-+	dma-names = "tx", "rx";
-+};
-diff --git a/arch/arm/boot/dts/bcm2710-rpi-2-b.dts b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
-new file mode 100644
-index 000000000000..c77ff30aa738
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
-@@ -0,0 +1,200 @@
-+/dts-v1/;
-+
-+#include "bcm2710.dtsi"
-+#include "bcm2709-rpi.dtsi"
-+#include "bcm283x-rpi-smsc9514.dtsi"
-+#include "bcm283x-rpi-csi1-2lane.dtsi"
-+#include "bcm283x-rpi-i2c0mux_0_28.dtsi"
-+
-+/ {
-+	compatible = "raspberrypi,2-model-b-rev2", "brcm,bcm2837";
-+	model = "Raspberry Pi 2 Model B rev 1.2";
-+};
-+
-+&gpio {
-+	/*
-+	 * Taken from rpi_SCH_2b_1p2_reduced.pdf and
-+	 * the official GPU firmware DT blob.
-+	 *
-+	 * Legend:
-+	 * "NC" = not connected (no rail from the SoC)
-+	 * "FOO" = GPIO line named "FOO" on the schematic
-+	 * "FOO_N" = GPIO line named "FOO" on schematic, active low
-+	 */
-+	gpio-line-names = "ID_SDA",
-+			  "ID_SCL",
-+			  "SDA1",
-+			  "SCL1",
-+			  "GPIO_GCLK",
-+			  "GPIO5",
-+			  "GPIO6",
-+			  "SPI_CE1_N",
-+			  "SPI_CE0_N",
-+			  "SPI_MISO",
-+			  "SPI_MOSI",
-+			  "SPI_SCLK",
-+			  "GPIO12",
-+			  "GPIO13",
-+			  /* Serial port */
-+			  "TXD0",
-+			  "RXD0",
-+			  "GPIO16",
-+			  "GPIO17",
-+			  "GPIO18",
-+			  "GPIO19",
-+			  "GPIO20",
-+			  "GPIO21",
-+			  "GPIO22",
-+			  "GPIO23",
-+			  "GPIO24",
-+			  "GPIO25",
-+			  "GPIO26",
-+			  "GPIO27",
-+			  "SDA0",
-+			  "SCL0",
-+			  "NC", /* GPIO30 */
-+			  "LAN_RUN",
-+			  "CAM_GPIO1",
-+			  "NC", /* GPIO33 */
-+			  "NC", /* GPIO34 */
-+			  "PWR_LOW_N",
-+			  "NC", /* GPIO36 */
-+			  "NC", /* GPIO37 */
-+			  "USB_LIMIT",
-+			  "NC", /* GPIO39 */
-+			  "PWM0_OUT",
-+			  "CAM_GPIO0",
-+			  "SMPS_SCL",
-+			  "SMPS_SDA",
-+			  "ETH_CLK",
-+			  "PWM1_OUT",
-+			  "HDMI_HPD_N",
-+			  "STATUS_LED",
-+			  /* Used by SD Card */
-+			  "SD_CLK_R",
-+			  "SD_CMD_R",
-+			  "SD_DATA0_R",
-+			  "SD_DATA1_R",
-+			  "SD_DATA2_R",
-+			  "SD_DATA3_R";
-+
-+	spi0_pins: spi0_pins {
-+		brcm,pins = <9 10 11>;
-+		brcm,function = <4>; /* alt0 */
-+	};
-+
-+	spi0_cs_pins: spi0_cs_pins {
-+		brcm,pins = <8 7>;
-+		brcm,function = <1>; /* output */
-+	};
-+
-+	i2c0_pins: i2c0 {
-+		brcm,pins = <0 1>;
-+		brcm,function = <4>;
-+	};
-+
-+	i2c1_pins: i2c1 {
-+		brcm,pins = <2 3>;
-+		brcm,function = <4>;
-+	};
-+
-+	i2s_pins: i2s {
-+		brcm,pins = <18 19 20 21>;
-+		brcm,function = <4>; /* alt0 */
-+	};
-+
-+	audio_pins: audio_pins {
-+		brcm,pins = <40 45>;
-+		brcm,function = <4>;
-+		brcm,pull = <0>;
-+	};
-+};
-+
-+&uart0 {
-+	status = "okay";
-+};
-+
-+&spi0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi0_pins &spi0_cs_pins>;
-+	cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
-+
-+	spidev0: spidev@0{
-+		compatible = "spidev";
-+		reg = <0>;	/* CE0 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+
-+	spidev1: spidev@1{
-+		compatible = "spidev";
-+		reg = <1>;	/* CE1 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+};
-+
-+&i2c0if {
-+	clock-frequency = <100000>;
-+};
-+
-+&i2c1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2c1_pins>;
-+	clock-frequency = <100000>;
-+};
-+
-+&i2c2 {
-+	clock-frequency = <100000>;
-+};
-+
-+&i2s {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2s_pins>;
-+};
-+
-+&leds {
-+	act_led: led-act {
-+		label = "led0";
-+		linux,default-trigger = "mmc0";
-+		gpios = <&gpio 47 0>;
-+	};
-+
-+	pwr_led: led-pwr {
-+		label = "led1";
-+		linux,default-trigger = "input";
-+		gpios = <&gpio 35 0>;
-+	};
-+};
-+
-+&hdmi {
-+	hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
-+};
-+
-+&vchiq {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&audio_pins>;
-+};
-+
-+&cam1_reg {
-+	gpio = <&gpio 41 GPIO_ACTIVE_HIGH>;
-+};
-+
-+cam0_reg: &cam_dummy_reg {
-+};
-+
-+/ {
-+	__overrides__ {
-+		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_headphones=1 snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_headphones=0 snd_bcm2835.enable_hdmi=0'}";
-+
-+		act_led_gpio = <&act_led>,"gpios:4";
-+		act_led_activelow = <&act_led>,"gpios:8";
-+		act_led_trigger = <&act_led>,"linux,default-trigger";
-+
-+		pwr_led_gpio = <&pwr_led>,"gpios:4";
-+		pwr_led_activelow = <&pwr_led>,"gpios:8";
-+		pwr_led_trigger = <&pwr_led>,"linux,default-trigger";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
-new file mode 100644
-index 000000000000..04621bd197c3
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
-@@ -0,0 +1,289 @@
-+/dts-v1/;
-+
-+#include "bcm2710.dtsi"
-+#include "bcm2709-rpi.dtsi"
-+#include "bcm283x-rpi-lan7515.dtsi"
-+#include "bcm283x-rpi-csi1-2lane.dtsi"
-+#include "bcm283x-rpi-i2c0mux_0_44.dtsi"
-+#include "bcm271x-rpi-bt.dtsi"
-+
-+/ {
-+	compatible = "raspberrypi,3-model-b-plus", "brcm,bcm2837";
-+	model = "Raspberry Pi 3 Model B+";
-+
-+	chosen {
-+		bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0";
-+	};
-+
-+	aliases {
-+		serial0 = &uart1;
-+		serial1 = &uart0;
-+		mmc1 = &mmcnr;
-+	};
-+};
-+
-+&gpio {
-+	/*
-+	 * Taken from rpi_SCH_3bplus_1p0_reduced.pdf and
-+	 * the official GPU firmware DT blob.
-+	 *
-+	 * Legend:
-+	 * "NC" = not connected (no rail from the SoC)
-+	 * "FOO" = GPIO line named "FOO" on the schematic
-+	 * "FOO_N" = GPIO line named "FOO" on schematic, active low
-+	 */
-+	gpio-line-names = "ID_SDA",
-+			  "ID_SCL",
-+			  "SDA1",
-+			  "SCL1",
-+			  "GPIO_GCLK",
-+			  "GPIO5",
-+			  "GPIO6",
-+			  "SPI_CE1_N",
-+			  "SPI_CE0_N",
-+			  "SPI_MISO",
-+			  "SPI_MOSI",
-+			  "SPI_SCLK",
-+			  "GPIO12",
-+			  "GPIO13",
-+			  /* Serial port */
-+			  "TXD1",
-+			  "RXD1",
-+			  "GPIO16",
-+			  "GPIO17",
-+			  "GPIO18",
-+			  "GPIO19",
-+			  "GPIO20",
-+			  "GPIO21",
-+			  "GPIO22",
-+			  "GPIO23",
-+			  "GPIO24",
-+			  "GPIO25",
-+			  "GPIO26",
-+			  "GPIO27",
-+			  "HDMI_HPD_N",
-+			  "STATUS_LED_G",
-+			  /* Used by BT module */
-+			  "CTS0",
-+			  "RTS0",
-+			  "TXD0",
-+			  "RXD0",
-+			  /* Used by Wifi */
-+			  "SD1_CLK",
-+			  "SD1_CMD",
-+			  "SD1_DATA0",
-+			  "SD1_DATA1",
-+			  "SD1_DATA2",
-+			  "SD1_DATA3",
-+			  "PWM0_OUT",
-+			  "PWM1_OUT",
-+			  "ETH_CLK",
-+			  "WIFI_CLK",
-+			  "SDA0",
-+			  "SCL0",
-+			  "SMPS_SCL",
-+			  "SMPS_SDA",
-+			  /* Used by SD Card */
-+			  "SD_CLK_R",
-+			  "SD_CMD_R",
-+			  "SD_DATA0_R",
-+			  "SD_DATA1_R",
-+			  "SD_DATA2_R",
-+			  "SD_DATA3_R";
-+
-+	spi0_pins: spi0_pins {
-+		brcm,pins = <9 10 11>;
-+		brcm,function = <4>; /* alt0 */
-+	};
-+
-+	spi0_cs_pins: spi0_cs_pins {
-+		brcm,pins = <8 7>;
-+		brcm,function = <1>; /* output */
-+	};
-+
-+	i2c0_pins: i2c0 {
-+		brcm,pins = <0 1>;
-+		brcm,function = <4>;
-+	};
-+
-+	i2c1_pins: i2c1 {
-+		brcm,pins = <2 3>;
-+		brcm,function = <4>;
-+	};
-+
-+	i2s_pins: i2s {
-+		brcm,pins = <18 19 20 21>;
-+		brcm,function = <4>; /* alt0 */
-+	};
-+
-+	sdio_pins: sdio_pins {
-+		brcm,pins =     <34 35 36 37 38 39>;
-+		brcm,function = <7>; // alt3 = SD1
-+		brcm,pull =     <0 2 2 2 2 2>;
-+	};
-+
-+	bt_pins: bt_pins {
-+		brcm,pins = <43>;
-+		brcm,function = <4>; /* alt0:GPCLK2 */
-+		brcm,pull = <0>;
-+	};
-+
-+	uart0_pins: uart0_pins {
-+		brcm,pins = <32 33>;
-+		brcm,function = <7>; /* alt3=UART0 */
-+		brcm,pull = <0 2>;
-+	};
-+
-+	uart1_pins: uart1_pins {
-+		brcm,pins;
-+		brcm,function;
-+		brcm,pull;
-+	};
-+
-+	audio_pins: audio_pins {
-+		brcm,pins = <40 41>;
-+		brcm,function = <4>;
-+		brcm,pull = <0>;
-+	};
-+};
-+
-+&mmcnr {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&sdio_pins>;
-+	bus-width = <4>;
-+	status = "okay";
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+
-+	brcmf: wifi@1 {
-+		reg = <1>;
-+		compatible = "brcm,bcm4329-fmac";
-+	};
-+};
-+
-+&firmware {
-+	expgpio: expgpio {
-+		compatible = "raspberrypi,firmware-gpio";
-+		gpio-controller;
-+		#gpio-cells = <2>;
-+		gpio-line-names = "BT_ON",
-+				  "WL_ON",
-+				  "PWR_LED_R",
-+				  "LAN_RUN",
-+				  "NC",
-+				  "CAM_GPIO0",
-+				  "CAM_GPIO1",
-+				  "NC";
-+		status = "okay";
-+	};
-+};
-+
-+&uart0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart0_pins &bt_pins>;
-+	status = "okay";
-+};
-+
-+&uart1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart1_pins>;
-+	status = "okay";
-+};
-+
-+&spi0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi0_pins &spi0_cs_pins>;
-+	cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
-+
-+	spidev0: spidev@0{
-+		compatible = "spidev";
-+		reg = <0>;	/* CE0 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+
-+	spidev1: spidev@1{
-+		compatible = "spidev";
-+		reg = <1>;	/* CE1 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+};
-+
-+&i2c0if {
-+	clock-frequency = <100000>;
-+};
-+
-+&i2c1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2c1_pins>;
-+	clock-frequency = <100000>;
-+};
-+
-+&i2c2 {
-+	clock-frequency = <100000>;
-+};
-+
-+&i2s {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2s_pins>;
-+};
-+
-+&leds {
-+	act_led: led-act {
-+		label = "led0";
-+		linux,default-trigger = "mmc0";
-+		gpios = <&gpio 29 0>;
-+	};
-+
-+	pwr_led: led-pwr {
-+		label = "led1";
-+		linux,default-trigger = "default-on";
-+		gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
-+	};
-+};
-+
-+&hdmi {
-+	hpd-gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
-+};
-+
-+&vchiq {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&audio_pins>;
-+};
-+
-+&eth_phy {
-+	microchip,eee-enabled;
-+	microchip,tx-lpi-timer = <600>; /* non-aggressive*/
-+	microchip,downshift-after = <2>;
-+};
-+
-+&cam1_reg {
-+	gpio = <&expgpio 5 GPIO_ACTIVE_HIGH>;
-+};
-+
-+cam0_reg: &cam_dummy_reg {
-+};
-+
-+/ {
-+	__overrides__ {
-+		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_headphones=1 snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_headphones=0 snd_bcm2835.enable_hdmi=0'}";
-+
-+		act_led_gpio = <&act_led>,"gpios:4";
-+		act_led_activelow = <&act_led>,"gpios:8";
-+		act_led_trigger = <&act_led>,"linux,default-trigger";
-+
-+		pwr_led_gpio = <&pwr_led>,"gpios:4";
-+		pwr_led_activelow = <&pwr_led>,"gpios:8";
-+		pwr_led_trigger = <&pwr_led>,"linux,default-trigger";
-+
-+		eee = <&eth_phy>,"microchip,eee-enabled?";
-+		tx_lpi_timer = <&eth_phy>,"microchip,tx-lpi-timer:0";
-+		eth_led0 = <&eth_phy>,"microchip,led-modes:0";
-+		eth_led1 = <&eth_phy>,"microchip,led-modes:4";
-+		eth_downshift_after = <&eth_phy>,"microchip,downshift-after:0";
-+		eth_max_speed = <&eth_phy>,"max-speed:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
-new file mode 100644
-index 000000000000..e0b233562c03
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
-@@ -0,0 +1,291 @@
-+/dts-v1/;
-+
-+#include "bcm2710.dtsi"
-+#include "bcm2709-rpi.dtsi"
-+#include "bcm283x-rpi-smsc9514.dtsi"
-+#include "bcm283x-rpi-csi1-2lane.dtsi"
-+#include "bcm283x-rpi-i2c0mux_0_44.dtsi"
-+#include "bcm271x-rpi-bt.dtsi"
-+
-+/ {
-+	compatible = "raspberrypi,3-model-b", "brcm,bcm2837";
-+	model = "Raspberry Pi 3 Model B";
-+
-+	chosen {
-+		bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0";
-+	};
-+
-+	aliases {
-+		serial0 = &uart1;
-+		serial1 = &uart0;
-+		mmc1 = &mmcnr;
-+	};
-+};
-+
-+&gpio {
-+	/*
-+	 * Taken from rpi_SCH_3b_1p2_reduced.pdf and
-+	 * the official GPU firmware DT blob.
-+	 *
-+	 * Legend:
-+	 * "NC" = not connected (no rail from the SoC)
-+	 * "FOO" = GPIO line named "FOO" on the schematic
-+	 * "FOO_N" = GPIO line named "FOO" on schematic, active low
-+	 */
-+	gpio-line-names = "ID_SDA",
-+			  "ID_SCL",
-+			  "SDA1",
-+			  "SCL1",
-+			  "GPIO_GCLK",
-+			  "GPIO5",
-+			  "GPIO6",
-+			  "SPI_CE1_N",
-+			  "SPI_CE0_N",
-+			  "SPI_MISO",
-+			  "SPI_MOSI",
-+			  "SPI_SCLK",
-+			  "GPIO12",
-+			  "GPIO13",
-+			  /* Serial port */
-+			  "TXD1",
-+			  "RXD1",
-+			  "GPIO16",
-+			  "GPIO17",
-+			  "GPIO18",
-+			  "GPIO19",
-+			  "GPIO20",
-+			  "GPIO21",
-+			  "GPIO22",
-+			  "GPIO23",
-+			  "GPIO24",
-+			  "GPIO25",
-+			  "GPIO26",
-+			  "GPIO27",
-+			  "NC", /* GPIO 28 */
-+			  "LAN_RUN_BOOT",
-+			  /* Used by BT module */
-+			  "CTS0",
-+			  "RTS0",
-+			  "TXD0",
-+			  "RXD0",
-+			  /* Used by Wifi */
-+			  "SD1_CLK",
-+			  "SD1_CMD",
-+			  "SD1_DATA0",
-+			  "SD1_DATA1",
-+			  "SD1_DATA2",
-+			  "SD1_DATA3",
-+			  "PWM0_OUT",
-+			  "PWM1_OUT",
-+			  "ETH_CLK",
-+			  "WIFI_CLK",
-+			  "SDA0",
-+			  "SCL0",
-+			  "SMPS_SCL",
-+			  "SMPS_SDA",
-+			  /* Used by SD Card */
-+			  "SD_CLK_R",
-+			  "SD_CMD_R",
-+			  "SD_DATA0_R",
-+			  "SD_DATA1_R",
-+			  "SD_DATA2_R",
-+			  "SD_DATA3_R";
-+
-+	spi0_pins: spi0_pins {
-+		brcm,pins = <9 10 11>;
-+		brcm,function = <4>; /* alt0 */
-+	};
-+
-+	spi0_cs_pins: spi0_cs_pins {
-+		brcm,pins = <8 7>;
-+		brcm,function = <1>; /* output */
-+	};
-+
-+	i2c0_pins: i2c0 {
-+		brcm,pins = <0 1>;
-+		brcm,function = <4>;
-+	};
-+
-+	i2c1_pins: i2c1 {
-+		brcm,pins = <2 3>;
-+		brcm,function = <4>;
-+	};
-+
-+	i2s_pins: i2s {
-+		brcm,pins = <18 19 20 21>;
-+		brcm,function = <4>; /* alt0 */
-+	};
-+
-+	sdio_pins: sdio_pins {
-+		brcm,pins =     <34 35 36 37 38 39>;
-+		brcm,function = <7>; // alt3 = SD1
-+		brcm,pull =     <0 2 2 2 2 2>;
-+	};
-+
-+	bt_pins: bt_pins {
-+		brcm,pins = <43>;
-+		brcm,function = <4>; /* alt0:GPCLK2 */
-+		brcm,pull = <0>;
-+	};
-+
-+	uart0_pins: uart0_pins {
-+		brcm,pins = <32 33>;
-+		brcm,function = <7>; /* alt3=UART0 */
-+		brcm,pull = <0 2>;
-+	};
-+
-+	uart1_pins: uart1_pins {
-+		brcm,pins;
-+		brcm,function;
-+		brcm,pull;
-+	};
-+
-+	audio_pins: audio_pins {
-+		brcm,pins = <40 41>;
-+		brcm,function = <4>;
-+		brcm,pull = <0>;
-+	};
-+};
-+
-+&mmcnr {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&sdio_pins>;
-+	bus-width = <4>;
-+	status = "okay";
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+
-+	brcmf: wifi@1 {
-+		reg = <1>;
-+		compatible = "brcm,bcm4329-fmac";
-+	};
-+};
-+
-+&soc {
-+	virtgpio: virtgpio {
-+		compatible = "brcm,bcm2835-virtgpio";
-+		gpio-controller;
-+		#gpio-cells = <2>;
-+		firmware = <&firmware>;
-+		status = "okay";
-+	};
-+
-+};
-+
-+&firmware {
-+	expgpio: expgpio {
-+		compatible = "raspberrypi,firmware-gpio";
-+		gpio-controller;
-+		#gpio-cells = <2>;
-+		gpio-line-names = "BT_ON",
-+				  "WL_ON",
-+				  "STATUS_LED",
-+				  "LAN_RUN",
-+				  "HDMI_HPD_N",
-+				  "CAM_GPIO0",
-+				  "CAM_GPIO1",
-+				  "PWR_LOW_N";
-+		status = "okay";
-+	};
-+};
-+
-+&uart0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart0_pins &bt_pins>;
-+	status = "okay";
-+};
-+
-+&uart1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart1_pins>;
-+	status = "okay";
-+};
-+
-+&bt {
-+	max-speed = <921600>;
-+};
-+
-+&spi0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi0_pins &spi0_cs_pins>;
-+	cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
-+
-+	spidev0: spidev@0{
-+		compatible = "spidev";
-+		reg = <0>;	/* CE0 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+
-+	spidev1: spidev@1{
-+		compatible = "spidev";
-+		reg = <1>;	/* CE1 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+};
-+
-+&i2c0if {
-+	clock-frequency = <100000>;
-+};
-+
-+&i2c1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2c1_pins>;
-+	clock-frequency = <100000>;
-+};
-+
-+&i2c2 {
-+	clock-frequency = <100000>;
-+};
-+
-+&i2s {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2s_pins>;
-+};
-+
-+&leds {
-+	act_led: led-act {
-+		label = "led0";
-+		linux,default-trigger = "mmc0";
-+		gpios = <&virtgpio 0 0>;
-+	};
-+
-+	pwr_led: led-pwr {
-+		label = "led1";
-+		linux,default-trigger = "input";
-+		gpios = <&expgpio 7 0>;
-+	};
-+};
-+
-+&hdmi {
-+	hpd-gpios = <&expgpio 4 GPIO_ACTIVE_LOW>;
-+};
-+
-+&vchiq {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&audio_pins>;
-+};
-+
-+&cam1_reg {
-+	gpio = <&expgpio 5 GPIO_ACTIVE_HIGH>;
-+};
-+
-+cam0_reg: &cam_dummy_reg {
-+};
-+
-+/ {
-+	__overrides__ {
-+		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_headphones=1 snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_headphones=0 snd_bcm2835.enable_hdmi=0'}";
-+
-+		act_led_gpio = <&act_led>,"gpios:4";
-+		act_led_activelow = <&act_led>,"gpios:8";
-+		act_led_trigger = <&act_led>,"linux,default-trigger";
-+
-+		pwr_led_gpio = <&pwr_led>,"gpios:4";
-+		pwr_led_activelow = <&pwr_led>,"gpios:8";
-+		pwr_led_trigger = <&pwr_led>,"linux,default-trigger";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
-new file mode 100644
-index 000000000000..5b9b44e0f30e
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
-@@ -0,0 +1,220 @@
-+/dts-v1/;
-+
-+#include "bcm2710.dtsi"
-+#include "bcm2709-rpi.dtsi"
-+#include "bcm283x-rpi-csi0-2lane.dtsi"
-+#include "bcm283x-rpi-csi1-4lane.dtsi"
-+#include "bcm283x-rpi-i2c0mux_0_28.dtsi"
-+/ {
-+	compatible = "raspberrypi,3-compute-module", "brcm,bcm2837";
-+	model = "Raspberry Pi Compute Module 3";
-+};
-+
-+&cam1_reg {
-+	gpio = <&gpio 2 GPIO_ACTIVE_HIGH>;
-+	status = "disabled";
-+};
-+
-+cam0_reg: &cam0_regulator {
-+	gpio = <&gpio 30 GPIO_ACTIVE_HIGH>;
-+};
-+
-+&uart0 {
-+	status = "okay";
-+};
-+
-+&gpio {
-+	/*
-+	 * This is based on the official GPU firmware DT blob.
-+	 *
-+	 * Legend:
-+	 * "NC" = not connected (no rail from the SoC)
-+	 * "FOO" = GPIO line named "FOO" on the schematic
-+	 * "FOO_N" = GPIO line named "FOO" on schematic, active low
-+	 */
-+	gpio-line-names = "GPIO0",
-+			  "GPIO1",
-+			  "GPIO2",
-+			  "GPIO3",
-+			  "GPIO4",
-+			  "GPIO5",
-+			  "GPIO6",
-+			  "GPIO7",
-+			  "GPIO8",
-+			  "GPIO9",
-+			  "GPIO10",
-+			  "GPIO11",
-+			  "GPIO12",
-+			  "GPIO13",
-+			  "GPIO14",
-+			  "GPIO15",
-+			  "GPIO16",
-+			  "GPIO17",
-+			  "GPIO18",
-+			  "GPIO19",
-+			  "GPIO20",
-+			  "GPIO21",
-+			  "GPIO22",
-+			  "GPIO23",
-+			  "GPIO24",
-+			  "GPIO25",
-+			  "GPIO26",
-+			  "GPIO27",
-+			  "GPIO28",
-+			  "GPIO29",
-+			  "GPIO30",
-+			  "GPIO31",
-+			  "GPIO32",
-+			  "GPIO33",
-+			  "GPIO34",
-+			  "GPIO35",
-+			  "GPIO36",
-+			  "GPIO37",
-+			  "GPIO38",
-+			  "GPIO39",
-+			  "GPIO40",
-+			  "GPIO41",
-+			  "GPIO42",
-+			  "GPIO43",
-+			  "GPIO44",
-+			  "GPIO45",
-+			  "SMPS_SCL",
-+			  "SMPS_SDA",
-+			  /* Used by eMMC */
-+			  "SD_CLK_R",
-+			  "SD_CMD_R",
-+			  "SD_DATA0_R",
-+			  "SD_DATA1_R",
-+			  "SD_DATA2_R",
-+			  "SD_DATA3_R";
-+
-+	spi0_pins: spi0_pins {
-+		brcm,pins = <9 10 11>;
-+		brcm,function = <4>; /* alt0 */
-+	};
-+
-+	spi0_cs_pins: spi0_cs_pins {
-+		brcm,pins = <8 7>;
-+		brcm,function = <1>; /* output */
-+	};
-+
-+	i2c0_pins: i2c0 {
-+		brcm,pins = <0 1>;
-+		brcm,function = <4>;
-+	};
-+
-+	i2c1_pins: i2c1 {
-+		brcm,pins = <2 3>;
-+		brcm,function = <4>;
-+	};
-+
-+	i2s_pins: i2s {
-+		brcm,pins = <18 19 20 21>;
-+		brcm,function = <4>; /* alt0 */
-+	};
-+
-+	audio_pins: audio_pins {
-+		brcm,pins;
-+		brcm,function;
-+	};
-+};
-+
-+&soc {
-+	virtgpio: virtgpio {
-+		compatible = "brcm,bcm2835-virtgpio";
-+		gpio-controller;
-+		#gpio-cells = <2>;
-+		firmware = <&firmware>;
-+		status = "okay";
-+	};
-+
-+};
-+
-+&firmware {
-+	expgpio: expgpio {
-+		compatible = "raspberrypi,firmware-gpio";
-+		gpio-controller;
-+		#gpio-cells = <2>;
-+		gpio-line-names = "HDMI_HPD_N",
-+				  "EMMC_EN_N",
-+				  "NC",
-+				  "NC",
-+				  "NC",
-+				  "NC",
-+				  "NC",
-+				  "NC";
-+		status = "okay";
-+	};
-+};
-+
-+&spi0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi0_pins &spi0_cs_pins>;
-+	cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
-+
-+	spidev0: spidev@0{
-+		compatible = "spidev";
-+		reg = <0>;	/* CE0 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+
-+	spidev1: spidev@1{
-+		compatible = "spidev";
-+		reg = <1>;	/* CE1 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+};
-+
-+&i2c0if {
-+	clock-frequency = <100000>;
-+};
-+
-+&i2c1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2c1_pins>;
-+	clock-frequency = <100000>;
-+};
-+
-+&i2c2 {
-+	clock-frequency = <100000>;
-+};
-+
-+&i2s {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2s_pins>;
-+};
-+
-+&leds {
-+	act_led: led-act {
-+		label = "led0";
-+		linux,default-trigger = "mmc0";
-+		gpios = <&virtgpio 0 0>;
-+	};
-+};
-+
-+&hdmi {
-+	hpd-gpios = <&expgpio 0 GPIO_ACTIVE_LOW>;
-+};
-+
-+&vchiq {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&audio_pins>;
-+};
-+
-+/ {
-+	__overrides__ {
-+		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_hdmi=0'}";
-+
-+		act_led_gpio = <&act_led>,"gpios:4";
-+		act_led_activelow = <&act_led>,"gpios:8";
-+		act_led_trigger = <&act_led>,"linux,default-trigger";
-+		cam0_reg = <&cam0_reg>,"status";
-+		cam0_reg_gpio = <&cam0_reg>,"gpio:4";
-+		cam1_reg = <&cam1_reg>,"status";
-+		cam1_reg_gpio = <&cam1_reg>,"gpio:4";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts b/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
-new file mode 100644
-index 000000000000..6522d2aa3d52
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
-@@ -0,0 +1,267 @@
-+/dts-v1/;
-+
-+#include "bcm2710.dtsi"
-+#include "bcm2709-rpi.dtsi"
-+#include "bcm283x-rpi-csi1-2lane.dtsi"
-+#include "bcm283x-rpi-i2c0mux_0_44.dtsi"
-+#include "bcm2708-rpi-bt.dtsi"
-+
-+/ {
-+	compatible = "raspberrypi,model-zero-2-w", "brcm,bcm2837";
-+	model = "Raspberry Pi Zero 2 W";
-+
-+	chosen {
-+		bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0";
-+	};
-+
-+	aliases {
-+		serial0 = &uart1;
-+		serial1 = &uart0;
-+		mmc1 = &mmcnr;
-+	};
-+};
-+
-+&gpio {
-+	/*
-+	 * This is based on the official GPU firmware DT blob.
-+	 *
-+	 * Legend:
-+	 * "NC" = not connected (no rail from the SoC)
-+	 * "FOO" = GPIO line named "FOO" on the schematic
-+	 * "FOO_N" = GPIO line named "FOO" on schematic, active low
-+	 */
-+	gpio-line-names = "ID_SDA",
-+			  "ID_SCL",
-+			  "SDA1",
-+			  "SCL1",
-+			  "GPIO_GCLK",
-+			  "GPIO5",
-+			  "GPIO6",
-+			  "SPI_CE1_N",
-+			  "SPI_CE0_N",
-+			  "SPI_MISO",
-+			  "SPI_MOSI",
-+			  "SPI_SCLK",
-+			  "GPIO12",
-+			  "GPIO13",
-+			  /* Serial port */
-+			  "TXD1",
-+			  "RXD1",
-+			  "GPIO16",
-+			  "GPIO17",
-+			  "GPIO18",
-+			  "GPIO19",
-+			  "GPIO20",
-+			  "GPIO21",
-+			  "GPIO22",
-+			  "GPIO23",
-+			  "GPIO24",
-+			  "GPIO25",
-+			  "GPIO26",
-+			  "GPIO27",
-+			  "HDMI_HPD_N",
-+			  "STATUS_LED_N",
-+			  /* Used by BT module */
-+			  "CTS0",
-+			  "RTS0",
-+			  "TXD0",
-+			  "RXD0",
-+			  /* Used by Wifi */
-+			  "SD1_CLK",
-+			  "SD1_CMD",
-+			  "SD1_DATA0",
-+			  "SD1_DATA1",
-+			  "SD1_DATA2",
-+			  "SD1_DATA3",
-+			  "CAM_GPIO1", /* GPIO40 */
-+			  "WL_ON", /* GPIO41 */
-+			  "BT_ON", /* GPIO42 */
-+			  "WIFI_CLK", /* GPIO43 */
-+			  "SDA0", /* GPIO44 */
-+			  "SCL0", /* GPIO45 */
-+			  "SMPS_SCL", /* GPIO46 */
-+			  "SMPS_SDA", /* GPIO47 */
-+			  /* Used by SD Card */
-+			  "SD_CLK_R",
-+			  "SD_CMD_R",
-+			  "SD_DATA0_R",
-+			  "SD_DATA1_R",
-+			  "SD_DATA2_R",
-+			  "SD_DATA3_R";
-+
-+	spi0_pins: spi0_pins {
-+		brcm,pins = <9 10 11>;
-+		brcm,function = <4>; /* alt0 */
-+	};
-+
-+	spi0_cs_pins: spi0_cs_pins {
-+		brcm,pins = <8 7>;
-+		brcm,function = <1>; /* output */
-+	};
-+
-+	i2c0_pins: i2c0 {
-+		brcm,pins = <0 1>;
-+		brcm,function = <4>;
-+	};
-+
-+	i2c1_pins: i2c1 {
-+		brcm,pins = <2 3>;
-+		brcm,function = <4>;
-+	};
-+
-+	i2s_pins: i2s {
-+		brcm,pins = <18 19 20 21>;
-+		brcm,function = <4>; /* alt0 */
-+	};
-+
-+	sdio_pins: sdio_pins {
-+		brcm,pins =     <34 35 36 37 38 39>;
-+		brcm,function = <7>; // alt3 = SD1
-+		brcm,pull =     <0 2 2 2 2 2>;
-+	};
-+
-+	bt_pins: bt_pins {
-+		brcm,pins = <43>;
-+		brcm,function = <4>; /* alt0:GPCLK2 */
-+		brcm,pull = <0>;
-+	};
-+
-+	uart0_pins: uart0_pins {
-+		brcm,pins = <30 31 32 33>;
-+		brcm,function = <7>; /* alt3=UART0 */
-+		brcm,pull = <2 0 0 2>; /* up none none up */
-+	};
-+
-+	uart1_pins: uart1_pins {
-+		brcm,pins;
-+		brcm,function;
-+		brcm,pull;
-+	};
-+
-+	audio_pins: audio_pins {
-+		brcm,pins = <>;
-+		brcm,function = <>;
-+	};
-+};
-+
-+&mmcnr {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&sdio_pins>;
-+	bus-width = <4>;
-+	status = "okay";
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+
-+	brcmf: wifi@1 {
-+		reg = <1>;
-+		compatible = "brcm,bcm4329-fmac";
-+
-+		firmwares {
-+			fw_43436p {
-+				chipid = <43430>;
-+				revmask = <4>;
-+				fw_base = "brcm/brcmfmac43436-sdio";
-+			};
-+			fw_43436s {
-+				chipid = <43430>;
-+				revmask = <2>;
-+				fw_base = "brcm/brcmfmac43436s-sdio";
-+			};
-+		};
-+	};
-+};
-+
-+&uart0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart0_pins &bt_pins>;
-+	status = "okay";
-+};
-+
-+&uart1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart1_pins>;
-+	status = "okay";
-+};
-+
-+&spi0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi0_pins &spi0_cs_pins>;
-+	cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
-+
-+	spidev0: spidev@0{
-+		compatible = "spidev";
-+		reg = <0>;	/* CE0 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+
-+	spidev1: spidev@1{
-+		compatible = "spidev";
-+		reg = <1>;	/* CE1 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+};
-+
-+&i2c0if {
-+	clock-frequency = <100000>;
-+};
-+
-+&i2c1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2c1_pins>;
-+	clock-frequency = <100000>;
-+};
-+
-+&i2c2 {
-+	clock-frequency = <100000>;
-+};
-+
-+&i2s {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2s_pins>;
-+};
-+
-+&leds {
-+	act_led: led-act {
-+		label = "led0";
-+		linux,default-trigger = "actpwr";
-+		gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
-+	};
-+};
-+
-+&hdmi {
-+	hpd-gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
-+};
-+
-+&vchiq {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&audio_pins>;
-+};
-+
-+&bt {
-+	shutdown-gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
-+};
-+
-+&minibt {
-+	shutdown-gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
-+};
-+
-+&cam1_reg {
-+	gpio = <&gpio 40 GPIO_ACTIVE_HIGH>;
-+};
-+
-+cam0_reg: &cam_dummy_reg {
-+};
-+
-+/ {
-+	__overrides__ {
-+		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_hdmi=0'}";
-+
-+		act_led_gpio = <&act_led>,"gpios:4";
-+		act_led_activelow = <&act_led>,"gpios:8";
-+		act_led_trigger = <&act_led>,"linux,default-trigger";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/bcm2710-rpi-zero-2.dts b/arch/arm/boot/dts/bcm2710-rpi-zero-2.dts
-new file mode 100644
-index 000000000000..daa12bd30d6b
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm2710-rpi-zero-2.dts
-@@ -0,0 +1 @@
-+#include "bcm2710-rpi-zero-2-w.dts"
-diff --git a/arch/arm/boot/dts/bcm2710.dtsi b/arch/arm/boot/dts/bcm2710.dtsi
-new file mode 100644
-index 000000000000..31b13b24affb
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm2710.dtsi
-@@ -0,0 +1,27 @@
-+#define i2c0 i2c0if
-+#include "bcm2837.dtsi"
-+#undef i2c0
-+#include "bcm270x.dtsi"
-+
-+/ {
-+	compatible = "brcm,bcm2837", "brcm,bcm2836";
-+
-+	arm-pmu {
-+		compatible = "arm,cortex-a53-pmu", "arm,cortex-a7-pmu";
-+	};
-+
-+	soc {
-+		/delete-node/ timer@7e003000;
-+	};
-+
-+	__overrides__ {
-+		arm_freq = <&cpu0>, "clock-frequency:0",
-+		       <&cpu1>, "clock-frequency:0",
-+		       <&cpu2>, "clock-frequency:0",
-+		       <&cpu3>, "clock-frequency:0";
-+	};
-+};
-+
-+&vc4 {
-+	status = "disabled";
-+};
-diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-index 4432412044de..43a6cdcb7150 100644
---- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-@@ -1,9 +1,15 @@
- // SPDX-License-Identifier: GPL-2.0
- /dts-v1/;
-+#define BCM2711
-+#define i2c0 i2c0if
- #include "bcm2711.dtsi"
--#include "bcm2711-rpi.dtsi"
--#include "bcm283x-rpi-usb-peripheral.dtsi"
- #include "bcm283x-rpi-wifi-bt.dtsi"
-+#undef i2c0
-+#include "bcm270x.dtsi"
-+#define i2c0 i2c0mux
-+#include "bcm2711-rpi.dtsi"
-+#undef i2c0
-+//#include "bcm283x-rpi-usb-peripheral.dtsi"
- 
- / {
- 	compatible = "raspberrypi,4-model-b", "brcm,bcm2711";
-@@ -72,7 +78,7 @@ &expgpio {
- 			  "VDD_SD_IO_SEL",
- 			  "CAM_GPIO",		/*  5 */
- 			  "SD_PWR_ON",
--			  "";
-+			  "SD_OC_N";
- };
- 
- &gpio {
-@@ -240,3 +246,311 @@ &vec {
- &wifi_pwrseq {
- 	reset-gpios = <&expgpio 1 GPIO_ACTIVE_LOW>;
- };
-+
-+// =============================================
-+// Downstream rpi- changes
-+
-+#include "bcm271x-rpi-bt.dtsi"
-+
-+/ {
-+	soc {
-+		/delete-node/ pixelvalve@7e807000;
-+		/delete-node/ hdmi@7e902000;
-+	};
-+};
-+
-+#include "bcm2711-rpi-ds.dtsi"
-+#include "bcm283x-rpi-csi1-2lane.dtsi"
-+#include "bcm283x-rpi-i2c0mux_0_44.dtsi"
-+
-+/ {
-+	chosen {
-+		bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0";
-+	};
-+
-+	aliases {
-+		serial0 = &uart1;
-+		serial1 = &uart0;
-+		mmc0 = &emmc2;
-+		mmc1 = &mmcnr;
-+		mmc2 = &sdhost;
-+		i2c3 = &i2c3;
-+		i2c4 = &i2c4;
-+		i2c5 = &i2c5;
-+		i2c6 = &i2c6;
-+		i2c20 = &ddc0;
-+		i2c21 = &ddc1;
-+		spi3 = &spi3;
-+		spi4 = &spi4;
-+		spi5 = &spi5;
-+		spi6 = &spi6;
-+		/delete-property/ intc;
-+	};
-+
-+	/delete-node/ wifi-pwrseq;
-+};
-+
-+&mmcnr {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&sdio_pins>;
-+	bus-width = <4>;
-+	status = "okay";
-+};
-+
-+&uart0 {
-+	pinctrl-0 = <&uart0_pins &bt_pins>;
-+	status = "okay";
-+};
-+
-+&uart1 {
-+	pinctrl-0 = <&uart1_pins>;
-+};
-+
-+&spi0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi0_pins &spi0_cs_pins>;
-+	cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
-+
-+	spidev0: spidev@0{
-+		compatible = "spidev";
-+		reg = <0>;	/* CE0 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+
-+	spidev1: spidev@1{
-+		compatible = "spidev";
-+		reg = <1>;	/* CE1 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+};
-+
-+&gpio {
-+	spi0_pins: spi0_pins {
-+		brcm,pins = <9 10 11>;
-+		brcm,function = <BCM2835_FSEL_ALT0>;
-+	};
-+
-+	spi0_cs_pins: spi0_cs_pins {
-+		brcm,pins = <8 7>;
-+		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
-+	};
-+
-+	spi3_pins: spi3_pins {
-+		brcm,pins = <1 2 3>;
-+		brcm,function = <BCM2835_FSEL_ALT3>;
-+	};
-+
-+	spi3_cs_pins: spi3_cs_pins {
-+		brcm,pins = <0 24>;
-+		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
-+	};
-+
-+	spi4_pins: spi4_pins {
-+		brcm,pins = <5 6 7>;
-+		brcm,function = <BCM2835_FSEL_ALT3>;
-+	};
-+
-+	spi4_cs_pins: spi4_cs_pins {
-+		brcm,pins = <4 25>;
-+		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
-+	};
-+
-+	spi5_pins: spi5_pins {
-+		brcm,pins = <13 14 15>;
-+		brcm,function = <BCM2835_FSEL_ALT3>;
-+	};
-+
-+	spi5_cs_pins: spi5_cs_pins {
-+		brcm,pins = <12 26>;
-+		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
-+	};
-+
-+	spi6_pins: spi6_pins {
-+		brcm,pins = <19 20 21>;
-+		brcm,function = <BCM2835_FSEL_ALT3>;
-+	};
-+
-+	spi6_cs_pins: spi6_cs_pins {
-+		brcm,pins = <18 27>;
-+		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
-+	};
-+
-+	i2c0_pins: i2c0 {
-+		brcm,pins = <0 1>;
-+		brcm,function = <BCM2835_FSEL_ALT0>;
-+		brcm,pull = <BCM2835_PUD_UP>;
-+	};
-+
-+	i2c1_pins: i2c1 {
-+		brcm,pins = <2 3>;
-+		brcm,function = <BCM2835_FSEL_ALT0>;
-+		brcm,pull = <BCM2835_PUD_UP>;
-+	};
-+
-+	i2c3_pins: i2c3 {
-+		brcm,pins = <4 5>;
-+		brcm,function = <BCM2835_FSEL_ALT5>;
-+		brcm,pull = <BCM2835_PUD_UP>;
-+	};
-+
-+	i2c4_pins: i2c4 {
-+		brcm,pins = <8 9>;
-+		brcm,function = <BCM2835_FSEL_ALT5>;
-+		brcm,pull = <BCM2835_PUD_UP>;
-+	};
-+
-+	i2c5_pins: i2c5 {
-+		brcm,pins = <12 13>;
-+		brcm,function = <BCM2835_FSEL_ALT5>;
-+		brcm,pull = <BCM2835_PUD_UP>;
-+	};
-+
-+	i2c6_pins: i2c6 {
-+		brcm,pins = <22 23>;
-+		brcm,function = <BCM2835_FSEL_ALT5>;
-+		brcm,pull = <BCM2835_PUD_UP>;
-+	};
-+
-+	i2s_pins: i2s {
-+		brcm,pins = <18 19 20 21>;
-+		brcm,function = <BCM2835_FSEL_ALT0>;
-+	};
-+
-+	sdio_pins: sdio_pins {
-+		brcm,pins =     <34 35 36 37 38 39>;
-+		brcm,function = <BCM2835_FSEL_ALT3>; // alt3 = SD1
-+		brcm,pull =     <0 2 2 2 2 2>;
-+	};
-+
-+	bt_pins: bt_pins {
-+		brcm,pins = "-"; // non-empty to keep btuart happy, //4 = 0
-+				 // to fool pinctrl
-+		brcm,function = <0>;
-+		brcm,pull = <2>;
-+	};
-+
-+	uart0_pins: uart0_pins {
-+		brcm,pins = <32 33>;
-+		brcm,function = <BCM2835_FSEL_ALT3>;
-+		brcm,pull = <0 2>;
-+	};
-+
-+	uart1_pins: uart1_pins {
-+		brcm,pins;
-+		brcm,function;
-+		brcm,pull;
-+	};
-+
-+	uart2_pins: uart2_pins {
-+		brcm,pins = <0 1>;
-+		brcm,function = <BCM2835_FSEL_ALT4>;
-+		brcm,pull = <0 2>;
-+	};
-+
-+	uart3_pins: uart3_pins {
-+		brcm,pins = <4 5>;
-+		brcm,function = <BCM2835_FSEL_ALT4>;
-+		brcm,pull = <0 2>;
-+	};
-+
-+	uart4_pins: uart4_pins {
-+		brcm,pins = <8 9>;
-+		brcm,function = <BCM2835_FSEL_ALT4>;
-+		brcm,pull = <0 2>;
-+	};
-+
-+	uart5_pins: uart5_pins {
-+		brcm,pins = <12 13>;
-+		brcm,function = <BCM2835_FSEL_ALT4>;
-+		brcm,pull = <0 2>;
-+	};
-+};
-+
-+&i2c0if {
-+	clock-frequency = <100000>;
-+};
-+
-+&i2c1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2c1_pins>;
-+	clock-frequency = <100000>;
-+};
-+
-+&i2s {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2s_pins>;
-+};
-+
-+// =============================================
-+// Board specific stuff here
-+
-+&sdhost {
-+	status = "disabled";
-+};
-+
-+&phy1 {
-+	led-modes = <0x00 0x08>; /* link/activity link */
-+};
-+
-+&gpio {
-+	audio_pins: audio_pins {
-+		brcm,pins = <40 41>;
-+		brcm,function = <4>;
-+		brcm,pull = <0>;
-+	};
-+};
-+
-+&leds {
-+	act_led: led-act {
-+		label = "led0";
-+		linux,default-trigger = "mmc0";
-+		gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
-+	};
-+
-+	pwr_led: led-pwr {
-+		label = "led1";
-+		linux,default-trigger = "default-on";
-+		gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
-+	};
-+};
-+
-+&pwm1 {
-+	status = "disabled";
-+};
-+
-+&vchiq {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&audio_pins>;
-+};
-+
-+&cam1_reg {
-+	gpio = <&expgpio 5 GPIO_ACTIVE_HIGH>;
-+};
-+
-+cam0_reg: &cam_dummy_reg {
-+};
-+
-+/ {
-+	__overrides__ {
-+		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_headphones=1 snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_headphones=0 snd_bcm2835.enable_hdmi=0'}";
-+
-+		act_led_gpio = <&act_led>,"gpios:4";
-+		act_led_activelow = <&act_led>,"gpios:8";
-+		act_led_trigger = <&act_led>,"linux,default-trigger";
-+
-+		pwr_led_gpio = <&pwr_led>,"gpios:4";
-+		pwr_led_activelow = <&pwr_led>,"gpios:8";
-+		pwr_led_trigger = <&pwr_led>,"linux,default-trigger";
-+
-+		eth_led0 = <&phy1>,"led-modes:0";
-+		eth_led1 = <&phy1>,"led-modes:4";
-+
-+		sd_poll_once = <&emmc2>, "non-removable?";
-+		spi_dma4 = <&spi0>, "dmas:0=", <&dma40>,
-+			   <&spi0>, "dmas:8=", <&dma40>;
-+	};
-+};
-diff --git a/arch/arm/boot/dts/bcm2711-rpi-400.dts b/arch/arm/boot/dts/bcm2711-rpi-400.dts
-index c53d9eb0b802..67df994170c7 100644
---- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
-@@ -1,6 +1,15 @@
- // SPDX-License-Identifier: GPL-2.0
- /dts-v1/;
--#include "bcm2711-rpi-4-b.dts"
-+#define BCM2711
-+#define i2c0 i2c0if
-+#include "bcm2711.dtsi"
-+#include "bcm283x-rpi-wifi-bt.dtsi"
-+#undef i2c0
-+#include "bcm270x.dtsi"
-+#define i2c0 i2c0mux
-+#include "bcm2711-rpi.dtsi"
-+#undef i2c0
-+//#include "bcm283x-rpi-usb-peripheral.dtsi"
- 
- / {
- 	compatible = "raspberrypi,400", "brcm,bcm2711";
-@@ -12,19 +21,55 @@ chosen {
- 	};
- 
- 	leds {
--		/delete-node/ led-act;
-+		led-act {
-+			gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
-+		};
- 
- 		led-pwr {
--			gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
-+			label = "PWR";
-+			gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
-+			default-state = "keep";
-+			linux,default-trigger = "default-on";
- 		};
- 	};
- 
--	gpio-poweroff {
--		compatible = "gpio-poweroff";
--		gpios = <&expgpio 5 GPIO_ACTIVE_HIGH>;
-+	sd_io_1v8_reg: sd_io_1v8_reg {
-+		compatible = "regulator-gpio";
-+		regulator-name = "vdd-sd-io";
-+		regulator-min-microvolt = <1800000>;
-+		regulator-max-microvolt = <3300000>;
-+		regulator-boot-on;
-+		regulator-always-on;
-+		regulator-settling-time-us = <5000>;
-+		gpios = <&expgpio 4 GPIO_ACTIVE_HIGH>;
-+		states = <1800000 0x1>,
-+			 <3300000 0x0>;
-+		status = "okay";
-+	};
-+
-+	sd_vcc_reg: sd_vcc_reg {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc-sd";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		regulator-boot-on;
-+		enable-active-high;
-+		gpio = <&expgpio 6 GPIO_ACTIVE_HIGH>;
- 	};
- };
- 
-+&bt {
-+	shutdown-gpios = <&expgpio 0 GPIO_ACTIVE_HIGH>;
-+};
-+
-+&ddc0 {
-+	status = "okay";
-+};
-+
-+&ddc1 {
-+	status = "okay";
-+};
-+
- &expgpio {
- 	gpio-line-names = "BT_ON",
- 			  "WL_ON",
-@@ -36,10 +81,481 @@ &expgpio {
- 			  "SHUTDOWN_REQUEST";
- };
- 
-+&gpio {
-+	/*
-+	 * Parts taken from rpi_SCH_4b_4p0_reduced.pdf and
-+	 * the official GPU firmware DT blob.
-+	 *
-+	 * Legend:
-+	 * "FOO" = GPIO line named "FOO" on the schematic
-+	 * "FOO_N" = GPIO line named "FOO" on schematic, active low
-+	 */
-+	gpio-line-names = "ID_SDA",
-+			  "ID_SCL",
-+			  "SDA1",
-+			  "SCL1",
-+			  "GPIO_GCLK",
-+			  "GPIO5",
-+			  "GPIO6",
-+			  "SPI_CE1_N",
-+			  "SPI_CE0_N",
-+			  "SPI_MISO",
-+			  "SPI_MOSI",
-+			  "SPI_SCLK",
-+			  "GPIO12",
-+			  "GPIO13",
-+			  /* Serial port */
-+			  "TXD1",
-+			  "RXD1",
-+			  "GPIO16",
-+			  "GPIO17",
-+			  "GPIO18",
-+			  "GPIO19",
-+			  "GPIO20",
-+			  "GPIO21",
-+			  "GPIO22",
-+			  "GPIO23",
-+			  "GPIO24",
-+			  "GPIO25",
-+			  "GPIO26",
-+			  "GPIO27",
-+			  "RGMII_MDIO",
-+			  "RGMIO_MDC",
-+			  /* Used by BT module */
-+			  "CTS0",
-+			  "RTS0",
-+			  "TXD0",
-+			  "RXD0",
-+			  /* Used by Wifi */
-+			  "SD1_CLK",
-+			  "SD1_CMD",
-+			  "SD1_DATA0",
-+			  "SD1_DATA1",
-+			  "SD1_DATA2",
-+			  "SD1_DATA3",
-+			  /* Shared with SPI flash */
-+			  "PWM0_MISO",
-+			  "PWM1_MOSI",
-+			  "STATUS_LED_G_CLK",
-+			  "SPIFLASH_CE_N",
-+			  "SDA0",
-+			  "SCL0",
-+			  "RGMII_RXCLK",
-+			  "RGMII_RXCTL",
-+			  "RGMII_RXD0",
-+			  "RGMII_RXD1",
-+			  "RGMII_RXD2",
-+			  "RGMII_RXD3",
-+			  "RGMII_TXCLK",
-+			  "RGMII_TXCTL",
-+			  "RGMII_TXD0",
-+			  "RGMII_TXD1",
-+			  "RGMII_TXD2",
-+			  "RGMII_TXD3";
-+};
-+
-+&hdmi0 {
-+	status = "okay";
-+};
-+
-+&hdmi1 {
-+	status = "okay";
-+};
-+
-+&pixelvalve0 {
-+	status = "okay";
-+};
-+
-+&pixelvalve1 {
-+	status = "okay";
-+};
-+
-+&pixelvalve2 {
-+	status = "okay";
-+};
-+
-+&pixelvalve4 {
-+	status = "okay";
-+};
-+
-+&pwm1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pwm1_0_gpio40 &pwm1_1_gpio41>;
-+	status = "okay";
-+};
-+
-+/* EMMC2 is used to drive the SD card */
-+&emmc2 {
-+	vqmmc-supply = <&sd_io_1v8_reg>;
-+	vmmc-supply = <&sd_vcc_reg>;
-+	broken-cd;
-+	status = "okay";
-+};
-+
-+&genet {
-+	phy-handle = <&phy1>;
-+	phy-mode = "rgmii-rxid";
-+	status = "okay";
-+};
-+
-+&genet_mdio {
-+	phy1: ethernet-phy@1 {
-+		/* No PHY interrupt */
-+		reg = <0x1>;
-+	};
-+};
-+
-+&pcie0 {
-+	pci@0,0 {
-+		device_type = "pci";
-+		#address-cells = <3>;
-+		#size-cells = <2>;
-+		ranges;
-+
-+		reg = <0 0 0 0 0>;
-+
-+		usb@0,0 {
-+			reg = <0 0 0 0 0>;
-+			resets = <&reset RASPBERRYPI_FIRMWARE_RESET_ID_USB>;
-+		};
-+	};
-+};
-+
-+/* uart0 communicates with the BT module */
-+&uart0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart0_ctsrts_gpio30 &uart0_gpio32>;
-+	uart-has-rtscts;
-+};
-+
-+/* uart1 is mapped to the pin header */
-+&uart1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart1_gpio14>;
-+	status = "okay";
-+};
-+
-+&vc4 {
-+	status = "okay";
-+};
-+
-+&vec {
-+	status = "disabled";
-+};
-+
-+&wifi_pwrseq {
-+	reset-gpios = <&expgpio 1 GPIO_ACTIVE_LOW>;
-+};
-+
-+// =============================================
-+// Downstream rpi- changes
-+
-+#include "bcm271x-rpi-bt.dtsi"
-+
-+/ {
-+	soc {
-+		/delete-node/ pixelvalve@7e807000;
-+		/delete-node/ hdmi@7e902000;
-+	};
-+};
-+
-+#include "bcm2711-rpi-ds.dtsi"
-+#include "bcm283x-rpi-csi1-2lane.dtsi"
-+#include "bcm283x-rpi-i2c0mux_0_44.dtsi"
-+
-+/ {
-+	chosen {
-+		bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0";
-+	};
-+
-+	aliases {
-+		serial0 = &uart1;
-+		serial1 = &uart0;
-+		mmc0 = &emmc2;
-+		mmc1 = &mmcnr;
-+		mmc2 = &sdhost;
-+		i2c3 = &i2c3;
-+		i2c4 = &i2c4;
-+		i2c5 = &i2c5;
-+		i2c6 = &i2c6;
-+		i2c20 = &ddc0;
-+		i2c21 = &ddc1;
-+		spi3 = &spi3;
-+		spi4 = &spi4;
-+		spi5 = &spi5;
-+		spi6 = &spi6;
-+		/delete-property/ intc;
-+	};
-+
-+	/delete-node/ wifi-pwrseq;
-+};
-+
-+&mmcnr {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&sdio_pins>;
-+	bus-width = <4>;
-+	status = "okay";
-+};
-+
-+&uart0 {
-+	pinctrl-0 = <&uart0_pins &bt_pins>;
-+	status = "okay";
-+};
-+
-+&uart1 {
-+	pinctrl-0 = <&uart1_pins>;
-+};
-+
-+&spi0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi0_pins &spi0_cs_pins>;
-+	cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
-+
-+	spidev0: spidev@0{
-+		compatible = "spidev";
-+		reg = <0>;	/* CE0 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+
-+	spidev1: spidev@1{
-+		compatible = "spidev";
-+		reg = <1>;	/* CE1 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+};
-+
-+&gpio {
-+	spi0_pins: spi0_pins {
-+		brcm,pins = <9 10 11>;
-+		brcm,function = <BCM2835_FSEL_ALT0>;
-+	};
-+
-+	spi0_cs_pins: spi0_cs_pins {
-+		brcm,pins = <8 7>;
-+		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
-+	};
-+
-+	spi3_pins: spi3_pins {
-+		brcm,pins = <1 2 3>;
-+		brcm,function = <BCM2835_FSEL_ALT3>;
-+	};
-+
-+	spi3_cs_pins: spi3_cs_pins {
-+		brcm,pins = <0 24>;
-+		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
-+	};
-+
-+	spi4_pins: spi4_pins {
-+		brcm,pins = <5 6 7>;
-+		brcm,function = <BCM2835_FSEL_ALT3>;
-+	};
-+
-+	spi4_cs_pins: spi4_cs_pins {
-+		brcm,pins = <4 25>;
-+		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
-+	};
-+
-+	spi5_pins: spi5_pins {
-+		brcm,pins = <13 14 15>;
-+		brcm,function = <BCM2835_FSEL_ALT3>;
-+	};
-+
-+	spi5_cs_pins: spi5_cs_pins {
-+		brcm,pins = <12 26>;
-+		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
-+	};
-+
-+	spi6_pins: spi6_pins {
-+		brcm,pins = <19 20 21>;
-+		brcm,function = <BCM2835_FSEL_ALT3>;
-+	};
-+
-+	spi6_cs_pins: spi6_cs_pins {
-+		brcm,pins = <18 27>;
-+		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
-+	};
-+
-+	i2c0_pins: i2c0 {
-+		brcm,pins = <0 1>;
-+		brcm,function = <BCM2835_FSEL_ALT0>;
-+		brcm,pull = <BCM2835_PUD_UP>;
-+	};
-+
-+	i2c1_pins: i2c1 {
-+		brcm,pins = <2 3>;
-+		brcm,function = <BCM2835_FSEL_ALT0>;
-+		brcm,pull = <BCM2835_PUD_UP>;
-+	};
-+
-+	i2c3_pins: i2c3 {
-+		brcm,pins = <4 5>;
-+		brcm,function = <BCM2835_FSEL_ALT5>;
-+		brcm,pull = <BCM2835_PUD_UP>;
-+	};
-+
-+	i2c4_pins: i2c4 {
-+		brcm,pins = <8 9>;
-+		brcm,function = <BCM2835_FSEL_ALT5>;
-+		brcm,pull = <BCM2835_PUD_UP>;
-+	};
-+
-+	i2c5_pins: i2c5 {
-+		brcm,pins = <12 13>;
-+		brcm,function = <BCM2835_FSEL_ALT5>;
-+		brcm,pull = <BCM2835_PUD_UP>;
-+	};
-+
-+	i2c6_pins: i2c6 {
-+		brcm,pins = <22 23>;
-+		brcm,function = <BCM2835_FSEL_ALT5>;
-+		brcm,pull = <BCM2835_PUD_UP>;
-+	};
-+
-+	i2s_pins: i2s {
-+		brcm,pins = <18 19 20 21>;
-+		brcm,function = <BCM2835_FSEL_ALT0>;
-+	};
-+
-+	sdio_pins: sdio_pins {
-+		brcm,pins =     <34 35 36 37 38 39>;
-+		brcm,function = <BCM2835_FSEL_ALT3>; // alt3 = SD1
-+		brcm,pull =     <0 2 2 2 2 2>;
-+	};
-+
-+	bt_pins: bt_pins {
-+		brcm,pins = "-"; // non-empty to keep btuart happy, //4 = 0
-+				 // to fool pinctrl
-+		brcm,function = <0>;
-+		brcm,pull = <2>;
-+	};
-+
-+	uart0_pins: uart0_pins {
-+		brcm,pins = <32 33>;
-+		brcm,function = <BCM2835_FSEL_ALT3>;
-+		brcm,pull = <0 2>;
-+	};
-+
-+	uart1_pins: uart1_pins {
-+		brcm,pins;
-+		brcm,function;
-+		brcm,pull;
-+	};
-+
-+	uart2_pins: uart2_pins {
-+		brcm,pins = <0 1>;
-+		brcm,function = <BCM2835_FSEL_ALT4>;
-+		brcm,pull = <0 2>;
-+	};
-+
-+	uart3_pins: uart3_pins {
-+		brcm,pins = <4 5>;
-+		brcm,function = <BCM2835_FSEL_ALT4>;
-+		brcm,pull = <0 2>;
-+	};
-+
-+	uart4_pins: uart4_pins {
-+		brcm,pins = <8 9>;
-+		brcm,function = <BCM2835_FSEL_ALT4>;
-+		brcm,pull = <0 2>;
-+	};
-+
-+	uart5_pins: uart5_pins {
-+		brcm,pins = <12 13>;
-+		brcm,function = <BCM2835_FSEL_ALT4>;
-+		brcm,pull = <0 2>;
-+	};
-+};
-+
-+&i2c0if {
-+	clock-frequency = <100000>;
-+};
-+
-+&i2c1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2c1_pins>;
-+	clock-frequency = <100000>;
-+};
-+
-+&i2s {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2s_pins>;
-+};
-+
-+// =============================================
-+// Board specific stuff here
-+
-+/ {
-+	power_ctrl: power_ctrl {
-+		compatible = "gpio-poweroff";
-+		gpios = <&expgpio 5 0>;
-+		force;
-+	};
-+};
-+
-+&sdhost {
-+	status = "disabled";
-+};
-+
-+&phy1 {
-+	led-modes = <0x00 0x08>; /* link/activity link */
-+};
-+
-+&gpio {
-+	audio_pins: audio_pins {
-+		brcm,pins = <>;
-+		brcm,function = <>;
-+	};
-+};
-+
-+&leds {
-+	act_led: led-act {
-+		label = "led0";
-+		linux,default-trigger = "default-on";
-+		default-state = "on";
-+		gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
-+	};
-+
-+	pwr_led: led-pwr {
-+		label = "led1";
-+		linux,default-trigger = "default-on";
-+		gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
-+	};
-+};
-+
-+&pwm1 {
-+	status = "disabled";
-+};
-+
-+&vchiq {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&audio_pins>;
-+};
-+
- &genet_mdio {
- 	clock-frequency = <1950000>;
- };
- 
--&pm {
--	/delete-property/ system-power-controller;
-+/ {
-+	__overrides__ {
-+		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_hdmi=0'}";
-+
-+		act_led_gpio = <&act_led>,"gpios:4";
-+		act_led_activelow = <&act_led>,"gpios:8";
-+		act_led_trigger = <&act_led>,"linux,default-trigger";
-+
-+		pwr_led_gpio = <&pwr_led>,"gpios:4";
-+		pwr_led_activelow = <&pwr_led>,"gpios:8";
-+		pwr_led_trigger = <&pwr_led>,"linux,default-trigger";
-+
-+		eth_led0 = <&phy1>,"led-modes:0";
-+		eth_led1 = <&phy1>,"led-modes:4";
-+
-+		sd_poll_once = <&emmc2>, "non-removable?";
-+		spi_dma4 = <&spi0>, "dmas:0=", <&dma40>,
-+			   <&spi0>, "dmas:8=", <&dma40>;
-+	};
- };
-diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
-new file mode 100644
-index 000000000000..5510a1b731c1
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
-@@ -0,0 +1,578 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/dts-v1/;
-+#define BCM2711
-+#define i2c0 i2c0if
-+#include "bcm2711.dtsi"
-+#include "bcm283x-rpi-wifi-bt.dtsi"
-+#undef i2c0
-+#include "bcm270x.dtsi"
-+#define i2c0 i2c0mux
-+#include "bcm2711-rpi.dtsi"
-+#undef i2c0
-+//#include "bcm283x-rpi-usb-peripheral.dtsi"
-+
-+/ {
-+	compatible = "raspberrypi,4-compute-module", "brcm,bcm2711";
-+	model = "Raspberry Pi Compute Module 4";
-+
-+	chosen {
-+		/* 8250 auxiliary UART instead of pl011 */
-+		stdout-path = "serial1:115200n8";
-+	};
-+
-+	leds {
-+		led-act {
-+			gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
-+		};
-+
-+		led-pwr {
-+			label = "PWR";
-+			gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
-+			default-state = "keep";
-+			linux,default-trigger = "default-on";
-+		};
-+	};
-+
-+	sd_io_1v8_reg: sd_io_1v8_reg {
-+		compatible = "regulator-gpio";
-+		regulator-name = "vdd-sd-io";
-+		regulator-min-microvolt = <1800000>;
-+		regulator-max-microvolt = <3300000>;
-+		regulator-boot-on;
-+		regulator-always-on;
-+		regulator-settling-time-us = <5000>;
-+		gpios = <&expgpio 4 GPIO_ACTIVE_HIGH>;
-+		states = <1800000 0x1>,
-+			 <3300000 0x0>;
-+		status = "okay";
-+	};
-+
-+	sd_vcc_reg: sd_vcc_reg {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc-sd";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		regulator-boot-on;
-+		enable-active-high;
-+		gpio = <&expgpio 6 GPIO_ACTIVE_HIGH>;
-+	};
-+};
-+
-+&bt {
-+	shutdown-gpios = <&expgpio 0 GPIO_ACTIVE_HIGH>;
-+};
-+
-+&ddc0 {
-+	status = "okay";
-+};
-+
-+&ddc1 {
-+	status = "okay";
-+};
-+
-+&expgpio {
-+	gpio-line-names = "BT_ON",
-+			  "WL_ON",
-+			  "PWR_LED_OFF",
-+			  "ANT1",
-+			  "VDD_SD_IO_SEL",
-+			  "CAM_GPIO",
-+			  "SD_PWR_ON",
-+			  "ANT2";
-+
-+	ant1: ant1 {
-+		gpio-hog;
-+		gpios = <3 GPIO_ACTIVE_HIGH>;
-+		output-high;
-+	};
-+
-+	ant2: ant2 {
-+		gpio-hog;
-+		gpios = <7 GPIO_ACTIVE_HIGH>;
-+		output-low;
-+	};
-+};
-+
-+&gpio {
-+	/*
-+	 * Parts taken from rpi_SCH_4b_4p0_reduced.pdf and
-+	 * the official GPU firmware DT blob.
-+	 *
-+	 * Legend:
-+	 * "FOO" = GPIO line named "FOO" on the schematic
-+	 * "FOO_N" = GPIO line named "FOO" on schematic, active low
-+	 */
-+	gpio-line-names = "ID_SDA",
-+			  "ID_SCL",
-+			  "SDA1",
-+			  "SCL1",
-+			  "GPIO_GCLK",
-+			  "GPIO5",
-+			  "GPIO6",
-+			  "SPI_CE1_N",
-+			  "SPI_CE0_N",
-+			  "SPI_MISO",
-+			  "SPI_MOSI",
-+			  "SPI_SCLK",
-+			  "GPIO12",
-+			  "GPIO13",
-+			  /* Serial port */
-+			  "TXD1",
-+			  "RXD1",
-+			  "GPIO16",
-+			  "GPIO17",
-+			  "GPIO18",
-+			  "GPIO19",
-+			  "GPIO20",
-+			  "GPIO21",
-+			  "GPIO22",
-+			  "GPIO23",
-+			  "GPIO24",
-+			  "GPIO25",
-+			  "GPIO26",
-+			  "GPIO27",
-+			  "RGMII_MDIO",
-+			  "RGMIO_MDC",
-+			  /* Used by BT module */
-+			  "CTS0",
-+			  "RTS0",
-+			  "TXD0",
-+			  "RXD0",
-+			  /* Used by Wifi */
-+			  "SD1_CLK",
-+			  "SD1_CMD",
-+			  "SD1_DATA0",
-+			  "SD1_DATA1",
-+			  "SD1_DATA2",
-+			  "SD1_DATA3",
-+			  /* Shared with SPI flash */
-+			  "PWM0_MISO",
-+			  "PWM1_MOSI",
-+			  "STATUS_LED_G_CLK",
-+			  "SPIFLASH_CE_N",
-+			  "SDA0",
-+			  "SCL0",
-+			  "RGMII_RXCLK",
-+			  "RGMII_RXCTL",
-+			  "RGMII_RXD0",
-+			  "RGMII_RXD1",
-+			  "RGMII_RXD2",
-+			  "RGMII_RXD3",
-+			  "RGMII_TXCLK",
-+			  "RGMII_TXCTL",
-+			  "RGMII_TXD0",
-+			  "RGMII_TXD1",
-+			  "RGMII_TXD2",
-+			  "RGMII_TXD3";
-+};
-+
-+&hdmi0 {
-+	status = "okay";
-+};
-+
-+&hdmi1 {
-+	status = "okay";
-+};
-+
-+&pixelvalve0 {
-+	status = "okay";
-+};
-+
-+&pixelvalve1 {
-+	status = "okay";
-+};
-+
-+&pixelvalve2 {
-+	status = "okay";
-+};
-+
-+&pixelvalve4 {
-+	status = "okay";
-+};
-+
-+&pwm1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pwm1_0_gpio40 &pwm1_1_gpio41>;
-+	status = "okay";
-+};
-+
-+/* EMMC2 is used to drive the EMMC card */
-+&emmc2 {
-+	bus-width = <8>;
-+	vqmmc-supply = <&sd_io_1v8_reg>;
-+	vmmc-supply = <&sd_vcc_reg>;
-+	broken-cd;
-+	status = "okay";
-+};
-+
-+&genet {
-+	phy-handle = <&phy1>;
-+	phy-mode = "rgmii-rxid";
-+	status = "okay";
-+};
-+
-+&genet_mdio {
-+	phy1: ethernet-phy@0 {
-+		/* No PHY interrupt */
-+		reg = <0x0>;
-+	};
-+};
-+
-+&pcie0 {
-+	pci@0,0 {
-+		device_type = "pci";
-+		#address-cells = <3>;
-+		#size-cells = <2>;
-+		ranges;
-+
-+		reg = <0 0 0 0 0>;
-+	};
-+};
-+
-+/* uart0 communicates with the BT module */
-+&uart0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart0_ctsrts_gpio30 &uart0_gpio32>;
-+	uart-has-rtscts;
-+};
-+
-+/* uart1 is mapped to the pin header */
-+&uart1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart1_gpio14>;
-+	status = "okay";
-+};
-+
-+&vc4 {
-+	status = "okay";
-+};
-+
-+&vec {
-+	status = "disabled";
-+};
-+
-+&wifi_pwrseq {
-+	reset-gpios = <&expgpio 1 GPIO_ACTIVE_LOW>;
-+};
-+
-+// =============================================
-+// Downstream rpi- changes
-+
-+#include "bcm271x-rpi-bt.dtsi"
-+
-+/ {
-+	soc {
-+		/delete-node/ pixelvalve@7e807000;
-+		/delete-node/ hdmi@7e902000;
-+	};
-+};
-+
-+#include "bcm2711-rpi-ds.dtsi"
-+#include "bcm283x-rpi-csi0-2lane.dtsi"
-+#include "bcm283x-rpi-csi1-4lane.dtsi"
-+#include "bcm283x-rpi-i2c0mux_0_44.dtsi"
-+
-+/ {
-+	chosen {
-+		bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0";
-+	};
-+
-+	aliases {
-+		serial0 = &uart1;
-+		serial1 = &uart0;
-+		mmc0 = &emmc2;
-+		mmc1 = &mmcnr;
-+		mmc2 = &sdhost;
-+		i2c3 = &i2c3;
-+		i2c4 = &i2c4;
-+		i2c5 = &i2c5;
-+		i2c6 = &i2c6;
-+		i2c20 = &ddc0;
-+		i2c21 = &ddc1;
-+		spi3 = &spi3;
-+		spi4 = &spi4;
-+		spi5 = &spi5;
-+		spi6 = &spi6;
-+		/delete-property/ intc;
-+	};
-+
-+	/delete-node/ wifi-pwrseq;
-+};
-+
-+&mmcnr {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&sdio_pins>;
-+	bus-width = <4>;
-+	status = "okay";
-+};
-+
-+&uart0 {
-+	pinctrl-0 = <&uart0_pins &bt_pins>;
-+	status = "okay";
-+};
-+
-+&uart1 {
-+	pinctrl-0 = <&uart1_pins>;
-+};
-+
-+&spi0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi0_pins &spi0_cs_pins>;
-+	cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
-+
-+	spidev0: spidev@0{
-+		compatible = "spidev";
-+		reg = <0>;	/* CE0 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+
-+	spidev1: spidev@1{
-+		compatible = "spidev";
-+		reg = <1>;	/* CE1 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+};
-+
-+&gpio {
-+	spi0_pins: spi0_pins {
-+		brcm,pins = <9 10 11>;
-+		brcm,function = <BCM2835_FSEL_ALT0>;
-+	};
-+
-+	spi0_cs_pins: spi0_cs_pins {
-+		brcm,pins = <8 7>;
-+		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
-+	};
-+
-+	spi3_pins: spi3_pins {
-+		brcm,pins = <1 2 3>;
-+		brcm,function = <BCM2835_FSEL_ALT3>;
-+	};
-+
-+	spi3_cs_pins: spi3_cs_pins {
-+		brcm,pins = <0 24>;
-+		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
-+	};
-+
-+	spi4_pins: spi4_pins {
-+		brcm,pins = <5 6 7>;
-+		brcm,function = <BCM2835_FSEL_ALT3>;
-+	};
-+
-+	spi4_cs_pins: spi4_cs_pins {
-+		brcm,pins = <4 25>;
-+		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
-+	};
-+
-+	spi5_pins: spi5_pins {
-+		brcm,pins = <13 14 15>;
-+		brcm,function = <BCM2835_FSEL_ALT3>;
-+	};
-+
-+	spi5_cs_pins: spi5_cs_pins {
-+		brcm,pins = <12 26>;
-+		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
-+	};
-+
-+	spi6_pins: spi6_pins {
-+		brcm,pins = <19 20 21>;
-+		brcm,function = <BCM2835_FSEL_ALT3>;
-+	};
-+
-+	spi6_cs_pins: spi6_cs_pins {
-+		brcm,pins = <18 27>;
-+		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
-+	};
-+
-+	i2c0_pins: i2c0 {
-+		brcm,pins = <0 1>;
-+		brcm,function = <BCM2835_FSEL_ALT0>;
-+		brcm,pull = <BCM2835_PUD_UP>;
-+	};
-+
-+	i2c1_pins: i2c1 {
-+		brcm,pins = <2 3>;
-+		brcm,function = <BCM2835_FSEL_ALT0>;
-+		brcm,pull = <BCM2835_PUD_UP>;
-+	};
-+
-+	i2c3_pins: i2c3 {
-+		brcm,pins = <4 5>;
-+		brcm,function = <BCM2835_FSEL_ALT5>;
-+		brcm,pull = <BCM2835_PUD_UP>;
-+	};
-+
-+	i2c4_pins: i2c4 {
-+		brcm,pins = <8 9>;
-+		brcm,function = <BCM2835_FSEL_ALT5>;
-+		brcm,pull = <BCM2835_PUD_UP>;
-+	};
-+
-+	i2c5_pins: i2c5 {
-+		brcm,pins = <12 13>;
-+		brcm,function = <BCM2835_FSEL_ALT5>;
-+		brcm,pull = <BCM2835_PUD_UP>;
-+	};
-+
-+	i2c6_pins: i2c6 {
-+		brcm,pins = <22 23>;
-+		brcm,function = <BCM2835_FSEL_ALT5>;
-+		brcm,pull = <BCM2835_PUD_UP>;
-+	};
-+
-+	i2s_pins: i2s {
-+		brcm,pins = <18 19 20 21>;
-+		brcm,function = <BCM2835_FSEL_ALT0>;
-+	};
-+
-+	sdio_pins: sdio_pins {
-+		brcm,pins =     <34 35 36 37 38 39>;
-+		brcm,function = <BCM2835_FSEL_ALT3>; // alt3 = SD1
-+		brcm,pull =     <0 2 2 2 2 2>;
-+	};
-+
-+	bt_pins: bt_pins {
-+		brcm,pins = "-"; // non-empty to keep btuart happy, //4 = 0
-+				 // to fool pinctrl
-+		brcm,function = <0>;
-+		brcm,pull = <2>;
-+	};
-+
-+	uart0_pins: uart0_pins {
-+		brcm,pins = <32 33>;
-+		brcm,function = <BCM2835_FSEL_ALT3>;
-+		brcm,pull = <0 2>;
-+	};
-+
-+	uart1_pins: uart1_pins {
-+		brcm,pins;
-+		brcm,function;
-+		brcm,pull;
-+	};
-+
-+	uart2_pins: uart2_pins {
-+		brcm,pins = <0 1>;
-+		brcm,function = <BCM2835_FSEL_ALT4>;
-+		brcm,pull = <0 2>;
-+	};
-+
-+	uart3_pins: uart3_pins {
-+		brcm,pins = <4 5>;
-+		brcm,function = <BCM2835_FSEL_ALT4>;
-+		brcm,pull = <0 2>;
-+	};
-+
-+	uart4_pins: uart4_pins {
-+		brcm,pins = <8 9>;
-+		brcm,function = <BCM2835_FSEL_ALT4>;
-+		brcm,pull = <0 2>;
-+	};
-+
-+	uart5_pins: uart5_pins {
-+		brcm,pins = <12 13>;
-+		brcm,function = <BCM2835_FSEL_ALT4>;
-+		brcm,pull = <0 2>;
-+	};
-+};
-+
-+&i2c0if {
-+	clock-frequency = <100000>;
-+};
-+
-+&i2c1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2c1_pins>;
-+	clock-frequency = <100000>;
-+};
-+
-+&i2s {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2s_pins>;
-+};
-+
-+// =============================================
-+// Board specific stuff here
-+
-+&pcie0 {
-+       brcm,enable-l1ss;
-+};
-+
-+&sdhost {
-+	status = "disabled";
-+};
-+
-+&phy1 {
-+	led-modes = <0x00 0x08>; /* link/activity link */
-+};
-+
-+&gpio {
-+	audio_pins: audio_pins {
-+		brcm,pins = <>;
-+		brcm,function = <>;
-+	};
-+};
-+
-+&leds {
-+	act_led: led-act {
-+		label = "led0";
-+		linux,default-trigger = "mmc0";
-+		gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
-+	};
-+
-+	pwr_led: led-pwr {
-+		label = "led1";
-+		linux,default-trigger = "default-on";
-+		gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
-+	};
-+};
-+
-+&pwm1 {
-+	status = "disabled";
-+};
-+
-+&vchiq {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&audio_pins>;
-+};
-+
-+cam0_reg: &cam1_reg {
-+	gpio = <&expgpio 5 GPIO_ACTIVE_HIGH>;
-+};
-+
-+/ {
-+	__overrides__ {
-+		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_hdmi=0'}";
-+
-+		act_led_gpio = <&act_led>,"gpios:4";
-+		act_led_activelow = <&act_led>,"gpios:8";
-+		act_led_trigger = <&act_led>,"linux,default-trigger";
-+
-+		pwr_led_gpio = <&pwr_led>,"gpios:4";
-+		pwr_led_activelow = <&pwr_led>,"gpios:8";
-+		pwr_led_trigger = <&pwr_led>,"linux,default-trigger";
-+
-+		eth_led0 = <&phy1>,"led-modes:0";
-+		eth_led1 = <&phy1>,"led-modes:4";
-+
-+		ant1 =  <&ant1>,"output-high?=on",
-+			<&ant1>, "output-low?=off",
-+			<&ant2>, "output-high?=off",
-+			<&ant2>, "output-low?=on";
-+		ant2 =  <&ant1>,"output-high?=off",
-+			<&ant1>, "output-low?=on",
-+			<&ant2>, "output-high?=on",
-+			<&ant2>, "output-low?=off";
-+		noant = <&ant1>,"output-high?=off",
-+			<&ant1>, "output-low?=on",
-+			<&ant2>, "output-high?=off",
-+			<&ant2>, "output-low?=on";
-+
-+		sd_poll_once = <&emmc2>, "non-removable?";
-+		spi_dma4 = <&spi0>, "dmas:0=", <&dma40>,
-+			   <&spi0>, "dmas:8=", <&dma40>;
-+	};
-+};
-diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
-new file mode 100644
-index 000000000000..1a1d7af1d148
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
-@@ -0,0 +1,427 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/dts-v1/;
-+#define BCM2711
-+#define i2c0 i2c0if
-+#include "bcm2711.dtsi"
-+//#include "bcm283x-rpi-wifi-bt.dtsi"
-+#undef i2c0
-+#include "bcm270x.dtsi"
-+#define i2c0 i2c0mux
-+#include "bcm2711-rpi.dtsi"
-+#undef i2c0
-+
-+/ {
-+	compatible = "raspberrypi,4-compute-module-s", "brcm,bcm2711";
-+	model = "Raspberry Pi Compute Module 4S";
-+
-+	leds {
-+		led-act {
-+			gpios = <&virtgpio 0 0>;
-+		};
-+	};
-+};
-+
-+&ddc0 {
-+	status = "okay";
-+};
-+
-+&gpio {
-+	/*
-+	 * Parts taken from rpi_SCH_4b_4p0_reduced.pdf and
-+	 * the official GPU firmware DT blob.
-+	 *
-+	 * Legend:
-+	 * "FOO" = GPIO line named "FOO" on the schematic
-+	 * "FOO_N" = GPIO line named "FOO" on schematic, active low
-+	 */
-+	gpio-line-names = "ID_SDA",
-+			  "ID_SCL",
-+			  "SDA1",
-+			  "SCL1",
-+			  "GPIO_GCLK",
-+			  "GPIO5",
-+			  "GPIO6",
-+			  "SPI_CE1_N",
-+			  "SPI_CE0_N",
-+			  "SPI_MISO",
-+			  "SPI_MOSI",
-+			  "SPI_SCLK",
-+			  "GPIO12",
-+			  "GPIO13",
-+			  /* Serial port */
-+			  "TXD1",
-+			  "RXD1",
-+			  "GPIO16",
-+			  "GPIO17",
-+			  "GPIO18",
-+			  "GPIO19",
-+			  "GPIO20",
-+			  "GPIO21",
-+			  "GPIO22",
-+			  "GPIO23",
-+			  "GPIO24",
-+			  "GPIO25",
-+			  "GPIO26",
-+			  "GPIO27",
-+			  "GPIO28",
-+			  "GPIO29",
-+			  "GPIO30",
-+			  "GPIO31",
-+			  "GPIO32",
-+			  "GPIO33",
-+			  "GPIO34",
-+			  "GPIO35",
-+			  "GPIO36",
-+			  "GPIO37",
-+			  "GPIO38",
-+			  "GPIO39",
-+			  "PWM0_MISO",
-+			  "PWM1_MOSI",
-+			  "GPIO42",
-+			  "GPIO43",
-+			  "GPIO44",
-+			  "GPIO45";
-+};
-+
-+&hdmi0 {
-+	status = "okay";
-+};
-+
-+&pixelvalve0 {
-+	status = "okay";
-+};
-+
-+&pixelvalve1 {
-+	status = "okay";
-+};
-+
-+&pixelvalve2 {
-+	status = "okay";
-+};
-+
-+&pixelvalve4 {
-+	status = "okay";
-+};
-+
-+&pwm1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pwm1_0_gpio40 &pwm1_1_gpio41>;
-+	status = "okay";
-+};
-+
-+/* EMMC2 is used to drive the EMMC card */
-+&emmc2 {
-+	bus-width = <8>;
-+	broken-cd;
-+	status = "okay";
-+};
-+
-+&pcie0 {
-+	status = "disabled";
-+};
-+
-+&vchiq {
-+	interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
-+};
-+
-+&vc4 {
-+	status = "okay";
-+};
-+
-+&vec {
-+	status = "disabled";
-+};
-+
-+// =============================================
-+// Downstream rpi- changes
-+
-+#include "bcm2711-rpi-ds.dtsi"
-+
-+/ {
-+	soc {
-+		/delete-node/ pixelvalve@7e807000;
-+		/delete-node/ hdmi@7e902000;
-+
-+		virtgpio: virtgpio {
-+			compatible = "brcm,bcm2835-virtgpio";
-+			gpio-controller;
-+			#gpio-cells = <2>;
-+			firmware = <&firmware>;
-+			status = "okay";
-+		};
-+	};
-+};
-+
-+#include "bcm283x-rpi-csi0-2lane.dtsi"
-+#include "bcm283x-rpi-csi1-4lane.dtsi"
-+#include "bcm283x-rpi-i2c0mux_0_28.dtsi"
-+
-+/ {
-+	chosen {
-+		bootargs = "coherent_pool=1M snd_bcm2835.enable_headphones=0";
-+	};
-+
-+	aliases {
-+		serial0 = &uart0;
-+		mmc0 = &emmc2;
-+		mmc1 = &mmcnr;
-+		mmc2 = &sdhost;
-+		i2c3 = &i2c3;
-+		i2c4 = &i2c4;
-+		i2c5 = &i2c5;
-+		i2c6 = &i2c6;
-+		spi3 = &spi3;
-+		spi4 = &spi4;
-+		spi5 = &spi5;
-+		spi6 = &spi6;
-+		/delete-property/ intc;
-+	};
-+
-+	/delete-node/ wifi-pwrseq;
-+};
-+
-+&uart0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart0_pins>;
-+	status = "okay";
-+};
-+
-+&spi0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi0_pins &spi0_cs_pins>;
-+	cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
-+
-+	spidev0: spidev@0{
-+		compatible = "spidev";
-+		reg = <0>;	/* CE0 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+
-+	spidev1: spidev@1{
-+		compatible = "spidev";
-+		reg = <1>;	/* CE1 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+};
-+
-+&gpio {
-+	spi0_pins: spi0_pins {
-+		brcm,pins = <9 10 11>;
-+		brcm,function = <BCM2835_FSEL_ALT0>;
-+	};
-+
-+	spi0_cs_pins: spi0_cs_pins {
-+		brcm,pins = <8 7>;
-+		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
-+	};
-+
-+	spi3_pins: spi3_pins {
-+		brcm,pins = <1 2 3>;
-+		brcm,function = <BCM2835_FSEL_ALT3>;
-+	};
-+
-+	spi3_cs_pins: spi3_cs_pins {
-+		brcm,pins = <0 24>;
-+		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
-+	};
-+
-+	spi4_pins: spi4_pins {
-+		brcm,pins = <5 6 7>;
-+		brcm,function = <BCM2835_FSEL_ALT3>;
-+	};
-+
-+	spi4_cs_pins: spi4_cs_pins {
-+		brcm,pins = <4 25>;
-+		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
-+	};
-+
-+	spi5_pins: spi5_pins {
-+		brcm,pins = <13 14 15>;
-+		brcm,function = <BCM2835_FSEL_ALT3>;
-+	};
-+
-+	spi5_cs_pins: spi5_cs_pins {
-+		brcm,pins = <12 26>;
-+		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
-+	};
-+
-+	spi6_pins: spi6_pins {
-+		brcm,pins = <19 20 21>;
-+		brcm,function = <BCM2835_FSEL_ALT3>;
-+	};
-+
-+	spi6_cs_pins: spi6_cs_pins {
-+		brcm,pins = <18 27>;
-+		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
-+	};
-+
-+	i2c0_pins: i2c0 {
-+		brcm,pins = <0 1>;
-+		brcm,function = <BCM2835_FSEL_ALT0>;
-+		brcm,pull = <BCM2835_PUD_UP>;
-+	};
-+
-+	i2c1_pins: i2c1 {
-+		brcm,pins = <2 3>;
-+		brcm,function = <BCM2835_FSEL_ALT0>;
-+		brcm,pull = <BCM2835_PUD_UP>;
-+	};
-+
-+	i2c3_pins: i2c3 {
-+		brcm,pins = <4 5>;
-+		brcm,function = <BCM2835_FSEL_ALT5>;
-+		brcm,pull = <BCM2835_PUD_UP>;
-+	};
-+
-+	i2c4_pins: i2c4 {
-+		brcm,pins = <8 9>;
-+		brcm,function = <BCM2835_FSEL_ALT5>;
-+		brcm,pull = <BCM2835_PUD_UP>;
-+	};
-+
-+	i2c5_pins: i2c5 {
-+		brcm,pins = <12 13>;
-+		brcm,function = <BCM2835_FSEL_ALT5>;
-+		brcm,pull = <BCM2835_PUD_UP>;
-+	};
-+
-+	i2c6_pins: i2c6 {
-+		brcm,pins = <22 23>;
-+		brcm,function = <BCM2835_FSEL_ALT5>;
-+		brcm,pull = <BCM2835_PUD_UP>;
-+	};
-+
-+	i2s_pins: i2s {
-+		brcm,pins = <18 19 20 21>;
-+		brcm,function = <BCM2835_FSEL_ALT0>;
-+	};
-+
-+	sdio_pins: sdio_pins {
-+		brcm,pins =     <34 35 36 37 38 39>;
-+		brcm,function = <BCM2835_FSEL_ALT3>; // alt3 = SD1
-+		brcm,pull =     <0 2 2 2 2 2>;
-+	};
-+
-+	uart0_pins: uart0_pins {
-+		brcm,pins;
-+		brcm,function;
-+		brcm,pull;
-+	};
-+
-+	uart2_pins: uart2_pins {
-+		brcm,pins = <0 1>;
-+		brcm,function = <BCM2835_FSEL_ALT4>;
-+		brcm,pull = <0 2>;
-+	};
-+
-+	uart3_pins: uart3_pins {
-+		brcm,pins = <4 5>;
-+		brcm,function = <BCM2835_FSEL_ALT4>;
-+		brcm,pull = <0 2>;
-+	};
-+
-+	uart4_pins: uart4_pins {
-+		brcm,pins = <8 9>;
-+		brcm,function = <BCM2835_FSEL_ALT4>;
-+		brcm,pull = <0 2>;
-+	};
-+
-+	uart5_pins: uart5_pins {
-+		brcm,pins = <12 13>;
-+		brcm,function = <BCM2835_FSEL_ALT4>;
-+		brcm,pull = <0 2>;
-+	};
-+};
-+
-+&i2c0if {
-+	clock-frequency = <100000>;
-+};
-+
-+&i2c1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2c1_pins>;
-+	clock-frequency = <100000>;
-+};
-+
-+&i2s {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2s_pins>;
-+};
-+
-+// =============================================
-+// Board specific stuff here
-+
-+/* Enable USB in OTG-aware mode */
-+&usb {
-+	compatible = "brcm,bcm2835-usb";
-+	dr_mode = "otg";
-+	g-np-tx-fifo-size = <32>;
-+	g-rx-fifo-size = <558>;
-+	g-tx-fifo-size = <512 512 512 512 512 256 256>;
-+	status = "okay";
-+};
-+
-+&sdhost {
-+	status = "disabled";
-+};
-+
-+&gpio {
-+	audio_pins: audio_pins {
-+		brcm,pins = <>;
-+		brcm,function = <>;
-+	};
-+};
-+
-+/* Permanently disable HDMI1 */
-+&hdmi1 {
-+	compatible = "disabled";
-+};
-+
-+/* Permanently disable DDC1 */
-+&ddc1 {
-+	compatible = "disabled";
-+};
-+
-+&leds {
-+	act_led: led-act {
-+		label = "led0";
-+		linux,default-trigger = "mmc0";
-+	};
-+};
-+
-+&pwm1 {
-+	status = "disabled";
-+};
-+
-+&vchiq {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&audio_pins>;
-+};
-+
-+&cam1_reg {
-+	gpio = <&gpio 2 GPIO_ACTIVE_HIGH>;
-+	status = "disabled";
-+};
-+
-+cam0_reg: &cam0_regulator {
-+	gpio = <&gpio 30 GPIO_ACTIVE_HIGH>;
-+	status = "disabled";
-+};
-+
-+/ {
-+	__overrides__ {
-+		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_hdmi=0'}";
-+
-+		act_led_gpio = <&act_led>,"gpios:4";
-+		act_led_activelow = <&act_led>,"gpios:8";
-+		act_led_trigger = <&act_led>,"linux,default-trigger";
-+
-+		sd_poll_once = <&emmc2>, "non-removable?";
-+		spi_dma4 = <&spi0>, "dmas:0=", <&dma40>,
-+			   <&spi0>, "dmas:8=", <&dma40>;
-+	};
-+};
-diff --git a/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi b/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
-new file mode 100644
-index 000000000000..5f9a5bad98ad
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
-@@ -0,0 +1,292 @@
-+// SPDX-License-Identifier: GPL-2.0
-+#include "bcm270x-rpi.dtsi"
-+
-+/ {
-+	__overrides__ {
-+		arm_freq;
-+		hdmi = <&hdmi0>,"status",
-+		       <&hdmi1>,"status";
-+		pcie = <&pcie0>,"status";
-+		sd = <&emmc2>,"status";
-+	};
-+
-+	scb: scb {
-+	     /* Add a label */
-+	};
-+
-+	arm-pmu {
-+		compatible = "arm,cortex-a72-pmu", "arm,armv8-pmuv3", "arm,cortex-a7-pmu";
-+
-+	};
-+
-+	chosen {
-+		/delete-property/ stdout-path;
-+	};
-+};
-+
-+&vc4 {
-+	raspberrypi,firmware = <&firmware>;
-+};
-+
-+&cma {
-+	/* Limit cma to the lower 768MB to allow room for HIGHMEM on 32-bit */
-+	alloc-ranges = <0x0 0x00000000 0x30000000>;
-+};
-+
-+&scb {
-+	#size-cells = <2>;
-+
-+	ranges = <0x0 0x7c000000  0x0 0xfc000000  0x0 0x03800000>,
-+		 <0x0 0x40000000  0x0 0xff800000  0x0 0x00800000>,
-+		 <0x6 0x00000000  0x6 0x00000000  0x0 0x40000000>,
-+		 <0x0 0x00000000  0x0 0x00000000  0x0 0xfc000000>;
-+	dma-ranges = <0x0 0x00000000  0x0 0x00000000  0x4 0x00000000>;
-+
-+	dma40: dma@7e007b00 {
-+		compatible = "brcm,bcm2711-dma";
-+		reg = <0x0 0x7e007b00  0x0 0x400>;
-+		interrupts =
-+			<GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>, /* dma4 11 */
-+			<GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>, /* dma4 12 */
-+			<GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>, /* dma4 13 */
-+			<GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>; /* dma4 14 */
-+		interrupt-names = "dma11",
-+			"dma12",
-+			"dma13",
-+			"dma14";
-+		#dma-cells = <1>;
-+		brcm,dma-channel-mask = <0x7800>;
-+	};
-+
-+	xhci: xhci@7e9c0000 {
-+		compatible = "generic-xhci";
-+		status = "disabled";
-+		reg = <0x0 0x7e9c0000  0x0 0x100000>;
-+		interrupts = <GIC_SPI 176 IRQ_TYPE_LEVEL_HIGH>;
-+		power-domains = <&power RPI_POWER_DOMAIN_USB>;
-+	};
-+
-+	codec@7eb10000 {
-+		compatible = "raspberrypi,rpivid-vid-decoder";
-+		reg = <0x0 0x7eb10000  0x0 0x1000>,  /* INTC */
-+		      <0x0 0x7eb00000  0x0 0x10000>; /* HEVC */
-+		reg-names = "intc",
-+			    "hevc";
-+		interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
-+
-+		clocks = <&firmware_clocks 11>;
-+		clock-names = "hevc";
-+	};
-+};
-+
-+&pcie0 {
-+	reg = <0x0 0x7d500000  0x0 0x9310>;
-+	ranges = <0x02000000 0x0 0xc0000000 0x6 0x00000000
-+		  0x0 0x40000000>;
-+};
-+
-+&genet {
-+	reg = <0x0 0x7d580000  0x0 0x10000>;
-+};
-+
-+&dma40 {
-+	/* The VPU firmware uses DMA channel 11 for VCHIQ */
-+	brcm,dma-channel-mask = <0x7000>;
-+};
-+
-+&vchiq {
-+	compatible = "brcm,bcm2711-vchiq";
-+};
-+
-+&firmwarekms {
-+	compatible = "raspberrypi,rpi-firmware-kms-2711";
-+	interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
-+};
-+
-+&smi {
-+	interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
-+};
-+
-+&mmc {
-+	interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>;
-+};
-+
-+&mmcnr {
-+	interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>;
-+};
-+
-+&csi0 {
-+	interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;
-+};
-+
-+&csi1 {
-+	interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
-+};
-+
-+&random {
-+	compatible = "brcm,bcm2711-rng200";
-+	status = "okay";
-+};
-+
-+&usb {
-+	/* Enable the FIQ support */
-+	reg = <0x7e980000 0x10000>,
-+	      <0x7e00b200 0x200>;
-+	interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>,
-+		     <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
-+	status = "disabled";
-+};
-+
-+&gpio {
-+	interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,
-+		     <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
-+};
-+
-+&emmc2 {
-+	mmc-ddr-3_3v;
-+};
-+
-+&vc4 {
-+	status = "disabled";
-+};
-+
-+&pixelvalve0 {
-+	status = "disabled";
-+};
-+
-+&pixelvalve1 {
-+	status = "disabled";
-+};
-+
-+&pixelvalve2 {
-+	status = "disabled";
-+};
-+
-+&pixelvalve3 {
-+	status = "disabled";
-+};
-+
-+&pixelvalve4 {
-+	status = "disabled";
-+};
-+
-+&hdmi0 {
-+	reg = <0x7ef00700 0x300>,
-+	      <0x7ef00300 0x200>,
-+	      <0x7ef00f00 0x80>,
-+	      <0x7ef00f80 0x80>,
-+	      <0x7ef01b00 0x200>,
-+	      <0x7ef01f00 0x400>,
-+	      <0x7ef00200 0x80>,
-+	      <0x7ef04300 0x100>,
-+	      <0x7ef20000 0x100>,
-+	      <0x7ef00100 0x30>;
-+	reg-names = "hdmi",
-+		    "dvp",
-+		    "phy",
-+		    "rm",
-+		    "packet",
-+		    "metadata",
-+		    "csc",
-+		    "cec",
-+		    "hd",
-+		    "intr2";
-+	clocks = <&firmware_clocks 13>,
-+		 <&firmware_clocks 14>,
-+		 <&dvp 0>,
-+		 <&clk_27MHz>;
-+	dmas = <&dma (10|(1<<27)|(1<<24)|(10<<16)|(15<<20))>;
-+	status = "disabled";
-+};
-+
-+&ddc0 {
-+	status = "disabled";
-+};
-+
-+&hdmi1 {
-+	reg = <0x7ef05700 0x300>,
-+	      <0x7ef05300 0x200>,
-+	      <0x7ef05f00 0x80>,
-+	      <0x7ef05f80 0x80>,
-+	      <0x7ef06b00 0x200>,
-+	      <0x7ef06f00 0x400>,
-+	      <0x7ef00280 0x80>,
-+	      <0x7ef09300 0x100>,
-+	      <0x7ef20000 0x100>,
-+	      <0x7ef00100 0x30>;
-+	reg-names = "hdmi",
-+		    "dvp",
-+		    "phy",
-+		    "rm",
-+		    "packet",
-+		    "metadata",
-+		    "csc",
-+		    "cec",
-+		    "hd",
-+		    "intr2";
-+	clocks = <&firmware_clocks 13>,
-+		 <&firmware_clocks 14>,
-+		 <&dvp 1>,
-+		 <&clk_27MHz>;
-+	dmas = <&dma (17|(1<<27)|(1<<24)|(10<<16)|(15<<20))>;
-+	status = "disabled";
-+};
-+
-+&ddc1 {
-+	status = "disabled";
-+};
-+
-+&dvp {
-+	status = "disabled";
-+};
-+
-+&vec {
-+	clocks = <&firmware_clocks 15>;
-+};
-+
-+&aon_intr {
-+	interrupts = <GIC_SPI 96 IRQ_TYPE_EDGE_RISING>;
-+	status = "disabled";
-+};
-+
-+&system_timer {
-+	status = "disabled";
-+};
-+
-+&i2c0 {
-+      /delete-property/ compatible;
-+      /delete-property/ interrupts;
-+};
-+
-+&i2c0if {
-+	compatible = "brcm,bcm2711-i2c", "brcm,bcm2835-i2c";
-+	interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
-+};
-+
-+/delete-node/ &v3d;
-+
-+/ {
-+	v3dbus: v3dbus {
-+		compatible = "simple-bus";
-+		#address-cells = <1>;
-+		#size-cells = <2>;
-+		ranges = <0x7c500000  0x0 0xfc500000  0x0 0x03300000>,
-+			 <0x40000000  0x0 0xff800000  0x0 0x00800000>;
-+		dma-ranges = <0x00000000  0x0 0x00000000  0x4 0x00000000>;
-+
-+		v3d: v3d@7ec04000 {
-+			compatible = "brcm,2711-v3d";
-+			reg =
-+			    <0x7ec00000  0x0 0x4000>,
-+			    <0x7ec04000  0x0 0x4000>;
-+			reg-names = "hub", "core0";
-+
-+			power-domains = <&pm BCM2835_POWER_DOMAIN_GRAFX_V3D>;
-+			resets = <&pm BCM2835_RESET_V3D>;
-+			clocks = <&firmware_clocks 5>;
-+			clocks-names = "v3d";
-+			interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
-+			status = "disabled";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi
-index 98817a6675b9..7b9e946db985 100644
---- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
-+++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
-@@ -15,6 +15,7 @@ aliases {
- 		ethernet0 = &genet;
- 		pcie0 = &pcie0;
- 		blconfig = &blconfig;
-+		blpubkey = &blpubkey;
- 	};
- };
- 
-@@ -67,6 +68,18 @@ blconfig: nvram@0 {
- 		no-map;
- 		status = "disabled";
- 	};
-+	/*
-+	 * RPi4 will copy the binary public key blob (if present) from the bootloader
-+	 * into memory for use by the OS.
-+	 */
-+	blpubkey: nvram@1 {
-+		compatible = "raspberrypi,bootloader-public-key", "nvmem-rmem";
-+		#address-cells = <1>;
-+		#size-cells = <1>;
-+		reg = <0x0 0x0 0x0>;
-+		no-map;
-+		status = "disabled";
-+	};
- };
- 
- &v3d {
-diff --git a/arch/arm/boot/dts/bcm271x-rpi-bt.dtsi b/arch/arm/boot/dts/bcm271x-rpi-bt.dtsi
-new file mode 100644
-index 000000000000..6b9b79f74cf3
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm271x-rpi-bt.dtsi
-@@ -0,0 +1,26 @@
-+// SPDX-License-Identifier: GPL-2.0
-+
-+&uart0 {
-+	bt: bluetooth {
-+		compatible = "brcm,bcm43438-bt";
-+		max-speed = <3000000>;
-+		shutdown-gpios = <&expgpio 0 GPIO_ACTIVE_HIGH>;
-+		status = "disabled";
-+	};
-+};
-+
-+&uart1 {
-+	minibt: bluetooth {
-+		compatible = "brcm,bcm43438-bt";
-+		max-speed = <460800>;
-+		shutdown-gpios = <&expgpio 0 GPIO_ACTIVE_HIGH>;
-+		status = "disabled";
-+	};
-+};
-+
-+/ {
-+	__overrides__ {
-+		krnbt = <&bt>,"status";
-+		krnbt_baudrate = <&bt>,"max-speed:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/bcm283x-rpi-csi0-2lane.dtsi b/arch/arm/boot/dts/bcm283x-rpi-csi0-2lane.dtsi
-new file mode 100644
-index 000000000000..6e4ce8622b47
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm283x-rpi-csi0-2lane.dtsi
-@@ -0,0 +1,4 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+&csi0 {
-+	brcm,num-data-lanes = <2>;
-+};
-diff --git a/arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi b/arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi
-new file mode 100644
-index 000000000000..6938f4daacdc
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi
-@@ -0,0 +1,4 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+&csi1 {
-+	brcm,num-data-lanes = <2>;
-+};
-diff --git a/arch/arm/boot/dts/bcm283x-rpi-csi1-4lane.dtsi b/arch/arm/boot/dts/bcm283x-rpi-csi1-4lane.dtsi
-new file mode 100644
-index 000000000000..b37037437bee
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm283x-rpi-csi1-4lane.dtsi
-@@ -0,0 +1,4 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+&csi1 {
-+	brcm,num-data-lanes = <4>;
-+};
-diff --git a/arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_28.dtsi b/arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_28.dtsi
-new file mode 100644
-index 000000000000..38f0074bce3f
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_28.dtsi
-@@ -0,0 +1,4 @@
-+&i2c0mux {
-+	pinctrl-0 = <&i2c0_gpio0>;
-+	pinctrl-1 = <&i2c0_gpio28>;
-+};
-diff --git a/arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_44.dtsi b/arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_44.dtsi
-new file mode 100644
-index 000000000000..119946d878db
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_44.dtsi
-@@ -0,0 +1,4 @@
-+&i2c0mux {
-+	pinctrl-0 = <&i2c0_gpio0>;
-+	pinctrl-1 = <&i2c0_gpio44>;
-+};
-diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-new file mode 100644
-index 000000000000..37254235b641
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/Makefile
-@@ -0,0 +1,287 @@
-+# Overlays for the Raspberry Pi platform
-+
-+dtb-$(CONFIG_ARCH_BCM2835) += overlay_map.dtb
-+
-+dtbo-$(CONFIG_ARCH_BCM2835) += \
-+	act-led.dtbo \
-+	adafruit-st7735r.dtbo \
-+	adafruit18.dtbo \
-+	adau1977-adc.dtbo \
-+	adau7002-simple.dtbo \
-+	ads1015.dtbo \
-+	ads1115.dtbo \
-+	ads7846.dtbo \
-+	adv7282m.dtbo \
-+	adv728x-m.dtbo \
-+	akkordion-iqdacplus.dtbo \
-+	allo-boss-dac-pcm512x-audio.dtbo \
-+	allo-boss2-dac-audio.dtbo \
-+	allo-digione.dtbo \
-+	allo-katana-dac-audio.dtbo \
-+	allo-piano-dac-pcm512x-audio.dtbo \
-+	allo-piano-dac-plus-pcm512x-audio.dtbo \
-+	anyspi.dtbo \
-+	apds9960.dtbo \
-+	applepi-dac.dtbo \
-+	arducam-64mp.dtbo \
-+	arducam-pivariety.dtbo \
-+	at86rf233.dtbo \
-+	audioinjector-addons.dtbo \
-+	audioinjector-bare-i2s.dtbo \
-+	audioinjector-isolated-soundcard.dtbo \
-+	audioinjector-ultra.dtbo \
-+	audioinjector-wm8731-audio.dtbo \
-+	audiosense-pi.dtbo \
-+	audremap.dtbo \
-+	balena-fin.dtbo \
-+	camera-mux-2port.dtbo \
-+	camera-mux-4port.dtbo \
-+	cap1106.dtbo \
-+	chipdip-dac.dtbo \
-+	cirrus-wm5102.dtbo \
-+	cma.dtbo \
-+	cutiepi-panel.dtbo \
-+	dacberry400.dtbo \
-+	dht11.dtbo \
-+	dionaudio-kiwi.dtbo \
-+	dionaudio-loco.dtbo \
-+	dionaudio-loco-v2.dtbo \
-+	disable-bt.dtbo \
-+	disable-wifi.dtbo \
-+	dpi18.dtbo \
-+	dpi18cpadhi.dtbo \
-+	dpi24.dtbo \
-+	draws.dtbo \
-+	dwc-otg.dtbo \
-+	dwc2.dtbo \
-+	edt-ft5406.dtbo \
-+	enc28j60.dtbo \
-+	enc28j60-spi2.dtbo \
-+	exc3000.dtbo \
-+	fbtft.dtbo \
-+	fe-pi-audio.dtbo \
-+	fsm-demo.dtbo \
-+	gc9a01.dtbo \
-+	ghost-amp.dtbo \
-+	goodix.dtbo \
-+	googlevoicehat-soundcard.dtbo \
-+	gpio-fan.dtbo \
-+	gpio-hog.dtbo \
-+	gpio-ir.dtbo \
-+	gpio-ir-tx.dtbo \
-+	gpio-key.dtbo \
-+	gpio-led.dtbo \
-+	gpio-no-bank0-irq.dtbo \
-+	gpio-no-irq.dtbo \
-+	gpio-poweroff.dtbo \
-+	gpio-shutdown.dtbo \
-+	hd44780-lcd.dtbo \
-+	hdmi-backlight-hwhack-gpio.dtbo \
-+	hifiberry-amp.dtbo \
-+	hifiberry-amp100.dtbo \
-+	hifiberry-amp3.dtbo \
-+	hifiberry-dac.dtbo \
-+	hifiberry-dacplus.dtbo \
-+	hifiberry-dacplusadc.dtbo \
-+	hifiberry-dacplusadcpro.dtbo \
-+	hifiberry-dacplusdsp.dtbo \
-+	hifiberry-dacplushd.dtbo \
-+	hifiberry-digi.dtbo \
-+	hifiberry-digi-pro.dtbo \
-+	highperi.dtbo \
-+	hy28a.dtbo \
-+	hy28b.dtbo \
-+	hy28b-2017.dtbo \
-+	i-sabre-q2m.dtbo \
-+	i2c-bcm2708.dtbo \
-+	i2c-fan.dtbo \
-+	i2c-gpio.dtbo \
-+	i2c-mux.dtbo \
-+	i2c-pwm-pca9685a.dtbo \
-+	i2c-rtc.dtbo \
-+	i2c-rtc-gpio.dtbo \
-+	i2c-sensor.dtbo \
-+	i2c0.dtbo \
-+	i2c1.dtbo \
-+	i2c3.dtbo \
-+	i2c4.dtbo \
-+	i2c5.dtbo \
-+	i2c6.dtbo \
-+	i2s-dac.dtbo \
-+	i2s-gpio28-31.dtbo \
-+	ilitek251x.dtbo \
-+	imx219.dtbo \
-+	imx258.dtbo \
-+	imx290.dtbo \
-+	imx296.dtbo \
-+	imx327.dtbo \
-+	imx378.dtbo \
-+	imx462.dtbo \
-+	imx477.dtbo \
-+	imx519.dtbo \
-+	iqaudio-codec.dtbo \
-+	iqaudio-dac.dtbo \
-+	iqaudio-dacplus.dtbo \
-+	iqaudio-digi-wm8804-audio.dtbo \
-+	iqs550.dtbo \
-+	irs1125.dtbo \
-+	jedec-spi-nor.dtbo \
-+	justboom-both.dtbo \
-+	justboom-dac.dtbo \
-+	justboom-digi.dtbo \
-+	ltc294x.dtbo \
-+	max98357a.dtbo \
-+	maxtherm.dtbo \
-+	mbed-dac.dtbo \
-+	mcp23017.dtbo \
-+	mcp23s17.dtbo \
-+	mcp2515.dtbo \
-+	mcp2515-can0.dtbo \
-+	mcp2515-can1.dtbo \
-+	mcp251xfd.dtbo \
-+	mcp3008.dtbo \
-+	mcp3202.dtbo \
-+	mcp342x.dtbo \
-+	media-center.dtbo \
-+	merus-amp.dtbo \
-+	midi-uart0.dtbo \
-+	midi-uart1.dtbo \
-+	midi-uart2.dtbo \
-+	midi-uart3.dtbo \
-+	midi-uart4.dtbo \
-+	midi-uart5.dtbo \
-+	minipitft13.dtbo \
-+	miniuart-bt.dtbo \
-+	mipi-dbi-spi.dtbo \
-+	mlx90640.dtbo \
-+	mmc.dtbo \
-+	mpu6050.dtbo \
-+	mz61581.dtbo \
-+	ov2311.dtbo \
-+	ov5647.dtbo \
-+	ov7251.dtbo \
-+	ov9281.dtbo \
-+	papirus.dtbo \
-+	pca953x.dtbo \
-+	pcie-32bit-dma.dtbo \
-+	pibell.dtbo \
-+	pifacedigital.dtbo \
-+	pifi-40.dtbo \
-+	pifi-dac-hd.dtbo \
-+	pifi-dac-zero.dtbo \
-+	pifi-mini-210.dtbo \
-+	piglow.dtbo \
-+	piscreen.dtbo \
-+	piscreen2r.dtbo \
-+	pisound.dtbo \
-+	pitft22.dtbo \
-+	pitft28-capacitive.dtbo \
-+	pitft28-resistive.dtbo \
-+	pitft35-resistive.dtbo \
-+	pps-gpio.dtbo \
-+	proto-codec.dtbo \
-+	pwm.dtbo \
-+	pwm-2chan.dtbo \
-+	pwm-ir-tx.dtbo \
-+	qca7000.dtbo \
-+	qca7000-uart0.dtbo \
-+	ramoops.dtbo \
-+	ramoops-pi4.dtbo \
-+	rotary-encoder.dtbo \
-+	rpi-backlight.dtbo \
-+	rpi-codeczero.dtbo \
-+	rpi-dacplus.dtbo \
-+	rpi-dacpro.dtbo \
-+	rpi-digiampplus.dtbo \
-+	rpi-ft5406.dtbo \
-+	rpi-poe.dtbo \
-+	rpi-poe-plus.dtbo \
-+	rpi-sense.dtbo \
-+	rpi-sense-v2.dtbo \
-+	rpi-tv.dtbo \
-+	rra-digidac1-wm8741-audio.dtbo \
-+	sainsmart18.dtbo \
-+	sc16is750-i2c.dtbo \
-+	sc16is752-i2c.dtbo \
-+	sc16is752-spi0.dtbo \
-+	sc16is752-spi1.dtbo \
-+	sdhost.dtbo \
-+	sdio.dtbo \
-+	seeed-can-fd-hat-v1.dtbo \
-+	seeed-can-fd-hat-v2.dtbo \
-+	sh1106-spi.dtbo \
-+	si446x-spi0.dtbo \
-+	smi.dtbo \
-+	smi-dev.dtbo \
-+	smi-nand.dtbo \
-+	spi-gpio35-39.dtbo \
-+	spi-gpio40-45.dtbo \
-+	spi-rtc.dtbo \
-+	spi0-0cs.dtbo \
-+	spi0-1cs.dtbo \
-+	spi0-2cs.dtbo \
-+	spi1-1cs.dtbo \
-+	spi1-2cs.dtbo \
-+	spi1-3cs.dtbo \
-+	spi2-1cs.dtbo \
-+	spi2-2cs.dtbo \
-+	spi2-3cs.dtbo \
-+	spi3-1cs.dtbo \
-+	spi3-2cs.dtbo \
-+	spi4-1cs.dtbo \
-+	spi4-2cs.dtbo \
-+	spi5-1cs.dtbo \
-+	spi5-2cs.dtbo \
-+	spi6-1cs.dtbo \
-+	spi6-2cs.dtbo \
-+	ssd1306.dtbo \
-+	ssd1306-spi.dtbo \
-+	ssd1331-spi.dtbo \
-+	ssd1351-spi.dtbo \
-+	superaudioboard.dtbo \
-+	sx150x.dtbo \
-+	tc358743.dtbo \
-+	tc358743-audio.dtbo \
-+	tinylcd35.dtbo \
-+	tpm-slb9670.dtbo \
-+	tpm-slb9673.dtbo \
-+	uart0.dtbo \
-+	uart1.dtbo \
-+	uart2.dtbo \
-+	uart3.dtbo \
-+	uart4.dtbo \
-+	uart5.dtbo \
-+	udrc.dtbo \
-+	ugreen-dabboard.dtbo \
-+	upstream.dtbo \
-+	upstream-pi4.dtbo \
-+	vc4-fkms-v3d.dtbo \
-+	vc4-fkms-v3d-pi4.dtbo \
-+	vc4-kms-dpi-generic.dtbo \
-+	vc4-kms-dpi-hyperpixel2r.dtbo \
-+	vc4-kms-dpi-hyperpixel4.dtbo \
-+	vc4-kms-dpi-hyperpixel4sq.dtbo \
-+	vc4-kms-dpi-panel.dtbo \
-+	vc4-kms-dsi-7inch.dtbo \
-+	vc4-kms-dsi-lt070me05000.dtbo \
-+	vc4-kms-dsi-lt070me05000-v2.dtbo \
-+	vc4-kms-kippah-7inch.dtbo \
-+	vc4-kms-v3d.dtbo \
-+	vc4-kms-v3d-pi4.dtbo \
-+	vc4-kms-vga666.dtbo \
-+	vga666.dtbo \
-+	vl805.dtbo \
-+	w1-gpio.dtbo \
-+	w1-gpio-pullup.dtbo \
-+	w5500.dtbo \
-+	watterott-display.dtbo \
-+	waveshare-can-fd-hat-mode-a.dtbo \
-+	waveshare-can-fd-hat-mode-b.dtbo \
-+	wittypi.dtbo \
-+	wm8960-soundcard.dtbo
-+
-+targets += dtbs dtbs_install
-+targets += $(dtbo-y)
-+
-+always-y	:= $(dtbo-y)
-+clean-files	:= *.dtbo
-diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-new file mode 100644
-index 000000000000..90d861b85c9e
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -0,0 +1,4513 @@
-+Introduction
-+============
-+
-+This directory contains Device Tree overlays. Device Tree makes it possible
-+to support many hardware configurations with a single kernel and without the
-+need to explicitly load or blacklist kernel modules. Note that this isn't a
-+"pure" Device Tree configuration (c.f. MACH_BCM2835) - some on-board devices
-+are still configured by the board support code, but the intention is to
-+eventually reach that goal.
-+
-+On Raspberry Pi, Device Tree usage is controlled from /boot/config.txt. By
-+default, the Raspberry Pi kernel boots with device tree enabled. You can
-+completely disable DT usage (for now) by adding:
-+
-+    device_tree=
-+
-+to your config.txt, which should cause your Pi to revert to the old way of
-+doing things after a reboot.
-+
-+In /boot you will find a .dtb for each base platform. This describes the
-+hardware that is part of the Raspberry Pi board. The loader (start.elf and its
-+siblings) selects the .dtb file appropriate for the platform by name, and reads
-+it into memory. At this point, all of the optional interfaces (i2c, i2s, spi)
-+are disabled, but they can be enabled using Device Tree parameters:
-+
-+    dtparam=i2c=on,i2s=on,spi=on
-+
-+However, this shouldn't be necessary in many use cases because loading an
-+overlay that requires one of those interfaces will cause it to be enabled
-+automatically, and it is advisable to only enable interfaces if they are
-+needed.
-+
-+Configuring additional, optional hardware is done using Device Tree overlays
-+(see below).
-+
-+GPIO numbering uses the hardware pin numbering scheme (aka BCM scheme) and
-+not the physical pin numbers.
-+
-+raspi-config
-+============
-+
-+The Advanced Options section of the raspi-config utility can enable and disable
-+Device Tree use, as well as toggling the I2C and SPI interfaces. Note that it
-+is possible to both enable an interface and blacklist the driver, if for some
-+reason you should want to defer the loading.
-+
-+Modules
-+=======
-+
-+As well as describing the hardware, Device Tree also gives enough information
-+to allow suitable driver modules to be located and loaded, with the corollary
-+that unneeded modules are not loaded. As a result it should be possible to
-+remove lines from /etc/modules, and /etc/modprobe.d/raspi-blacklist.conf can
-+have its contents deleted (or commented out).
-+
-+Using Overlays
-+==============
-+
-+Overlays are loaded using the "dtoverlay" config.txt setting. As an example,
-+consider I2C Real Time Clock drivers. In the pre-DT world these would be loaded
-+by writing a magic string comprising a device identifier and an I2C address to
-+a special file in /sys/class/i2c-adapter, having first loaded the driver for
-+the I2C interface and the RTC device - something like this:
-+
-+    modprobe i2c-bcm2835
-+    modprobe rtc-ds1307
-+    echo ds1307 0x68 > /sys/class/i2c-adapter/i2c-1/new_device
-+
-+With DT enabled, this becomes a line in config.txt:
-+
-+    dtoverlay=i2c-rtc,ds1307
-+
-+This causes the file /boot/overlays/i2c-rtc.dtbo to be loaded and a "node"
-+describing the DS1307 I2C device to be added to the Device Tree for the Pi. By
-+default it usees address 0x68, but this can be modified with an additional DT
-+parameter:
-+
-+    dtoverlay=i2c-rtc,ds1307,addr=0x68
-+
-+Parameters usually have default values, although certain parameters are
-+mandatory. See the list of overlays below for a description of the parameters
-+and their defaults.
-+
-+Making new Overlays based on existing Overlays
-+==============================================
-+
-+Recent overlays have been designed in a more general way, so that they can be
-+adapted to hardware by changing their parameters. When you have additional
-+hardware with more than one device of a kind, you end up using the same overlay
-+multiple times with other parameters, e.g.
-+
-+    # 2 CAN FD interfaces on spi but with different pins
-+    dtoverlay=mcp251xfd,spi0-0,interrupt=25
-+    dtoverlay=mcp251xfd,spi0-1,interrupt=24
-+
-+    # a realtime clock on i2c
-+    dtoverlay=i2c-rtc,pcf85063
-+
-+While this approach does work, it requires knowledge about the hardware design.
-+It is more feasible to simplify things for the end user by providing a single
-+overlay as it is done the traditional way.
-+
-+A new overlay can be generated by using ovmerge utility.
-+https://github.com/raspberrypi/utils/blob/master/ovmerge/ovmerge
-+
-+To generate an overlay for the above configuration we pass the configuration
-+to ovmerge and add the -c flag.
-+
-+    ovmerge -c mcp251xfd-overlay.dts,spi0-0,interrupt=25 \
-+               mcp251xfd-overlay.dts,spi0-1,interrupt=24 \
-+               i2c-rtc-overlay.dts,pcf85063 \
-+    >> merged-overlay.dts
-+
-+The -c option writes the command above as a comment into the overlay as
-+a marker that this overlay is generated and how it was generated.
-+After compiling the overlay it can be loaded in a single line.
-+
-+    dtoverlay=merged
-+
-+It does the same as the original configuration but without parameters.
-+
-+The Overlay and Parameter Reference
-+===================================
-+
-+N.B. When editing this file, please preserve the indentation levels to make it
-+simple to parse programmatically. NO HARD TABS.
-+
-+
-+Name:   <The base DTB>
-+Info:   Configures the base Raspberry Pi hardware
-+Load:   <loaded automatically>
-+Params:
-+        ant1                    Select antenna 1 (default). CM4 only.
-+
-+        ant2                    Select antenna 2. CM4 only.
-+
-+        noant                   Disable both antennas. CM4 only.
-+
-+        audio                   Set to "on" to enable the onboard ALSA audio
-+                                interface (default "off")
-+
-+        axiperf                 Set to "on" to enable the AXI bus performance
-+                                monitors.
-+                                See /sys/kernel/debug/raspberrypi_axi_monitor
-+                                for the results.
-+
-+        cam0_reg                Enables CAM 0 regulator. CM1 & 3 only.
-+
-+        cam0_reg_gpio           Set GPIO for CAM 0 regulator. Default 30.
-+                                CM1 & 3 only.
-+
-+        cam1_reg                Enables CAM 1 regulator. CM1 & 3 only.
-+
-+        cam1_reg_gpio           Set GPIO for CAM 1 regulator. Default 2.
-+                                CM1 & 3 only.
-+
-+        eee                     Enable Energy Efficient Ethernet support for
-+                                compatible devices (default "on"). See also
-+                                "tx_lpi_timer". Pi3B+ only.
-+
-+        eth_downshift_after     Set the number of auto-negotiation failures
-+                                after which the 1000Mbps modes are disabled.
-+                                Legal values are 2, 3, 4, 5 and 0, where
-+                                0 means never downshift (default 2). Pi3B+ only.
-+
-+        eth_led0                Set mode of LED0 - amber on Pi3B+ (default "1"),
-+                                green on Pi4 (default "0").
-+                                The legal values are:
-+
-+                                Pi3B+
-+
-+                                0=link/activity          1=link1000/activity
-+                                2=link100/activity       3=link10/activity
-+                                4=link100/1000/activity  5=link10/1000/activity
-+                                6=link10/100/activity    14=off    15=on
-+
-+                                Pi4
-+
-+                                0=Speed/Activity         1=Speed
-+                                2=Flash activity         3=FDX
-+                                4=Off                    5=On
-+                                6=Alt                    7=Speed/Flash
-+                                8=Link                   9=Activity
-+
-+        eth_led1                Set mode of LED1 - green on Pi3B+ (default "6"),
-+                                amber on Pi4 (default "8"). See eth_led0 for
-+                                legal values.
-+
-+        eth_max_speed           Set the maximum speed a link is allowed
-+                                to negotiate. Legal values are 10, 100 and
-+                                1000 (default 1000). Pi3B+ only.
-+
-+        hdmi                    Set to "off" to disable the HDMI interface
-+                                (default "on")
-+
-+        i2c_arm                 Set to "on" to enable the ARM's i2c interface
-+                                (default "off")
-+
-+        i2c_vc                  Set to "on" to enable the i2c interface
-+                                usually reserved for the VideoCore processor
-+                                (default "off")
-+
-+        i2c                     An alias for i2c_arm
-+
-+        i2c_arm_baudrate        Set the baudrate of the ARM's i2c interface
-+                                (default "100000")
-+
-+        i2c_vc_baudrate         Set the baudrate of the VideoCore i2c interface
-+                                (default "100000")
-+
-+        i2c_baudrate            An alias for i2c_arm_baudrate
-+
-+        i2s                     Set to "on" to enable the i2s interface
-+                                (default "off")
-+
-+        krnbt                   Set to "on" to enable autoprobing of Bluetooth
-+                                driver without need of hciattach/btattach
-+                                (default "off")
-+
-+        krnbt_baudrate          Set the baudrate of the PL011 UART when used
-+                                with krnbt=on
-+
-+        pcie                    Set to "off" to disable the PCIe interface
-+                                (default "on")
-+                                (2711 only, but not applicable on CM4S)
-+                                N.B. USB-A ports on 4B are subsequently disabled
-+
-+        spi                     Set to "on" to enable the spi interfaces
-+                                (default "off")
-+
-+        spi_dma4                Use to enable 40-bit DMA on spi interfaces
-+                                (the assigned value doesn't matter)
-+                                (2711 only)
-+
-+        random                  Set to "on" to enable the hardware random
-+                                number generator (default "on")
-+
-+        sd                      Set to "off" to disable the SD card (or eMMC on
-+                                non-lite SKU of CM4).
-+                                (default "on")
-+
-+        sd_overclock            Clock (in MHz) to use when the MMC framework
-+                                requests 50MHz
-+
-+        sd_poll_once            Looks for a card once after booting. Useful
-+                                for network booting scenarios to avoid the
-+                                overhead of continuous polling. N.B. Using
-+                                this option restricts the system to using a
-+                                single card per boot (or none at all).
-+                                (default off)
-+
-+        sd_force_pio            Disable DMA support for SD driver (default off)
-+
-+        sd_pio_limit            Number of blocks above which to use DMA for
-+                                SD card (default 1)
-+
-+        sd_debug                Enable debug output from SD driver (default off)
-+
-+        sdio_overclock          Clock (in MHz) to use when the MMC framework
-+                                requests 50MHz for the SDIO/WLAN interface.
-+
-+        tx_lpi_timer            Set the delay in microseconds between going idle
-+                                and entering the low power state (default 600).
-+                                Requires EEE to be enabled - see "eee".
-+
-+        uart0                   Set to "off" to disable uart0 (default "on")
-+
-+        uart1                   Set to "on" or "off" to enable or disable uart1
-+                                (default varies)
-+
-+        watchdog                Set to "on" to enable the hardware watchdog
-+                                (default "off")
-+
-+        act_led_trigger         Choose which activity the LED tracks.
-+                                Use "heartbeat" for a nice load indicator.
-+                                (default "mmc")
-+
-+        act_led_activelow       Set to "on" to invert the sense of the LED
-+                                (default "off")
-+                                N.B. For Pi 3B, 3B+, 3A+ and 4B, use the act-led
-+                                overlay.
-+
-+        act_led_gpio            Set which GPIO to use for the activity LED
-+                                (in case you want to connect it to an external
-+                                device)
-+                                (default "16" on a non-Plus board, "47" on a
-+                                Plus or Pi 2)
-+                                N.B. For Pi 3B, 3B+, 3A+ and 4B, use the act-led
-+                                overlay.
-+
-+        pwr_led_trigger
-+        pwr_led_activelow
-+        pwr_led_gpio
-+                                As for act_led_*, but using the PWR LED.
-+                                Not available on Model A/B boards.
-+
-+        N.B. It is recommended to only enable those interfaces that are needed.
-+        Leaving all interfaces enabled can lead to unwanted behaviour (i2c_vc
-+        interfering with Pi Camera, I2S and SPI hogging GPIO pins, etc.)
-+        Note also that i2c, i2c_arm and i2c_vc are aliases for the physical
-+        interfaces i2c0 and i2c1. Use of the numeric variants is still possible
-+        but deprecated because the ARM/VC assignments differ between board
-+        revisions. The same board-specific mapping applies to i2c_baudrate,
-+        and the other i2c baudrate parameters.
-+
-+
-+Name:   act-led
-+Info:   Pi 3B, 3B+, 3A+ and 4B use a GPIO expander to drive the LEDs which can
-+        only be accessed from the VPU. There is a special driver for this with a
-+        separate DT node, which has the unfortunate consequence of breaking the
-+        act_led_gpio and act_led_activelow dtparams.
-+        This overlay changes the GPIO controller back to the standard one and
-+        restores the dtparams.
-+Load:   dtoverlay=act-led,<param>=<val>
-+Params: activelow               Set to "on" to invert the sense of the LED
-+                                (default "off")
-+
-+        gpio                    Set which GPIO to use for the activity LED
-+                                (in case you want to connect it to an external
-+                                device)
-+                                REQUIRED
-+
-+
-+Name:   adafruit-st7735r
-+Info:   Overlay for the SPI-connected Adafruit 1.8" 160x128 or 128x128 displays,
-+        based on the ST7735R chip.
-+        This overlay uses the newer DRM/KMS "Tiny" driver.
-+Load:   dtoverlay=adafruit-st7735r,<param>=<val>
-+Params: 128x128                 Select the 128x128 driver (default 160x128)
-+        rotate                  Display rotation {0,90,180,270} (default 90)
-+        speed                   SPI bus speed in Hz (default 4000000)
-+        dc_pin                  GPIO pin for D/C (default 24)
-+        reset_pin               GPIO pin for RESET (default 25)
-+        led_pin                 GPIO used to control backlight (default 18)
-+
-+
-+Name:   adafruit18
-+Info:   Overlay for the SPI-connected Adafruit 1.8" display (based on the
-+        ST7735R chip). It includes support for the "green tab" version.
-+        This overlay uses the older fbtft driver.
-+Load:   dtoverlay=adafruit18,<param>=<val>
-+Params: green                   Use the adafruit18_green variant.
-+        rotate                  Display rotation {0,90,180,270}
-+        speed                   SPI bus speed in Hz (default 4000000)
-+        fps                     Display frame rate in Hz
-+        bgr                     Enable BGR mode (default off)
-+        debug                   Debug output level {0-7}
-+        dc_pin                  GPIO pin for D/C (default 24)
-+        reset_pin               GPIO pin for RESET (default 25)
-+        led_pin                 GPIO used to control backlight (default 18)
-+
-+
-+Name:   adau1977-adc
-+Info:   Overlay for activation of ADAU1977 ADC codec over I2C for control
-+        and I2S for data.
-+Load:   dtoverlay=adau1977-adc
-+Params: <None>
-+
-+
-+Name:   adau7002-simple
-+Info:   Overlay for the activation of ADAU7002 stereo PDM to I2S converter.
-+Load:   dtoverlay=adau7002-simple,<param>=<val>
-+Params: card-name               Override the default, "adau7002", card name.
-+
-+
-+Name:   ads1015
-+Info:   Overlay for activation of Texas Instruments ADS1015 ADC over I2C
-+Load:   dtoverlay=ads1015,<param>=<val>
-+Params: addr                    I2C bus address of device. Set based on how the
-+                                addr pin is wired. (default=0x48 assumes addr
-+                                is pulled to GND)
-+        cha_enable              Enable virtual channel a. (default=true)
-+        cha_cfg                 Set the configuration for virtual channel a.
-+                                (default=4 configures this channel for the
-+                                voltage at A0 with respect to GND)
-+        cha_datarate            Set the datarate (samples/sec) for this channel.
-+                                (default=4 sets 1600 sps)
-+        cha_gain                Set the gain of the Programmable Gain
-+                                Amplifier for this channel. (default=2 sets the
-+                                full scale of the channel to 2.048 Volts)
-+
-+        Channel (ch) parameters can be set for each enabled channel.
-+        A maximum of 4 channels can be enabled (letters a thru d).
-+        For more information refer to the device datasheet at:
-+        http://www.ti.com/lit/ds/symlink/ads1015.pdf
-+
-+
-+Name:   ads1115
-+Info:   Texas Instruments ADS1115 ADC
-+Load:   dtoverlay=ads1115,<param>[=<val>]
-+Params: addr                    I2C bus address of device. Set based on how the
-+                                addr pin is wired. (default=0x48 assumes addr
-+                                is pulled to GND)
-+        cha_enable              Enable virtual channel a.
-+        cha_cfg                 Set the configuration for virtual channel a.
-+                                (default=4 configures this channel for the
-+                                voltage at A0 with respect to GND)
-+        cha_datarate            Set the datarate (samples/sec) for this channel.
-+                                (default=7 sets 860 sps)
-+        cha_gain                Set the gain of the Programmable Gain
-+                                Amplifier for this channel. (Default 1 sets the
-+                                full scale of the channel to 4.096 Volts)
-+
-+        Channel parameters can be set for each enabled channel.
-+        A maximum of 4 channels can be enabled (letters a thru d).
-+        For more information refer to the device datasheet at:
-+        http://www.ti.com/lit/ds/symlink/ads1115.pdf
-+
-+
-+Name:   ads7846
-+Info:   ADS7846 Touch controller
-+Load:   dtoverlay=ads7846,<param>=<val>
-+Params: cs                      SPI bus Chip Select (default 1)
-+        speed                   SPI bus speed (default 2MHz, max 3.25MHz)
-+        penirq                  GPIO used for PENIRQ. REQUIRED
-+        penirq_pull             Set GPIO pull (default 0=none, 2=pullup)
-+        swapxy                  Swap x and y axis
-+        xmin                    Minimum value on the X axis (default 0)
-+        ymin                    Minimum value on the Y axis (default 0)
-+        xmax                    Maximum value on the X axis (default 4095)
-+        ymax                    Maximum value on the Y axis (default 4095)
-+        pmin                    Minimum reported pressure value (default 0)
-+        pmax                    Maximum reported pressure value (default 65535)
-+        xohms                   Touchpanel sensitivity (X-plate resistance)
-+                                (default 400)
-+
-+        penirq is required and usually xohms (60-100) has to be set as well.
-+        Apart from that, pmax (255) and swapxy are also common.
-+        The rest of the calibration can be done with xinput-calibrator.
-+        See: github.com/notro/fbtft/wiki/FBTFT-on-Raspian
-+        Device Tree binding document:
-+        www.kernel.org/doc/Documentation/devicetree/bindings/input/ads7846.txt
-+
-+
-+Name:   adv7282m
-+Info:   Analog Devices ADV7282M analogue video to CSI2 bridge.
-+        Uses Unicam1, which is the standard camera connector on most Pi
-+        variants.
-+Load:   dtoverlay=adv7282m,<param>=<val>
-+Params: addr                    Overrides the I2C address (default 0x21)
-+        media-controller        Configure use of Media Controller API for
-+                                configuring the sensor (default off)
-+
-+
-+Name:   adv728x-m
-+Info:   Analog Devices ADV728[0|1|2]-M analogue video to CSI2 bridges.
-+        This is a wrapper for adv7282m, and defaults to ADV7282M.
-+Load:   dtoverlay=adv728x-m,<param>=<val>
-+Params: addr                    Overrides the I2C address (default 0x21)
-+        adv7280m                Select ADV7280-M.
-+        adv7281m                Select ADV7281-M.
-+        adv7281ma               Select ADV7281-MA.
-+        media-controller        Configure use of Media Controller API for
-+                                configuring the sensor (default off)
-+
-+
-+Name:   akkordion-iqdacplus
-+Info:   Configures the Digital Dreamtime Akkordion Music Player (based on the
-+        OEM IQAudIO DAC+ or DAC Zero module).
-+Load:   dtoverlay=akkordion-iqdacplus,<param>=<val>
-+Params: 24db_digital_gain       Allow gain to be applied via the PCM512x codec
-+                                Digital volume control. Enable with
-+                                dtoverlay=akkordion-iqdacplus,24db_digital_gain
-+                                (The default behaviour is that the Digital
-+                                volume control is limited to a maximum of
-+                                0dB. ie. it can attenuate but not provide
-+                                gain. For most users, this will be desired
-+                                as it will prevent clipping. By appending
-+                                the 24db_digital_gain parameter, the Digital
-+                                volume control will allow up to 24dB of
-+                                gain. If this parameter is enabled, it is the
-+                                responsibility of the user to ensure that
-+                                the Digital volume control is set to a value
-+                                that does not result in clipping/distortion!)
-+
-+
-+Name:   allo-boss-dac-pcm512x-audio
-+Info:   Configures the Allo Boss DAC audio cards.
-+Load:   dtoverlay=allo-boss-dac-pcm512x-audio,<param>
-+Params: 24db_digital_gain       Allow gain to be applied via the PCM512x codec
-+                                Digital volume control. Enable with
-+                                "dtoverlay=allo-boss-dac-pcm512x-audio,
-+                                24db_digital_gain"
-+                                (The default behaviour is that the Digital
-+                                volume control is limited to a maximum of
-+                                0dB. ie. it can attenuate but not provide
-+                                gain. For most users, this will be desired
-+                                as it will prevent clipping. By appending
-+                                the 24db_digital_gain parameter, the Digital
-+                                volume control will allow up to 24dB of
-+                                gain. If this parameter is enabled, it is the
-+                                responsibility of the user to ensure that
-+                                the Digital volume control is set to a value
-+                                that does not result in clipping/distortion!)
-+        slave                   Force Boss DAC into slave mode, using Pi a
-+                                master for bit clock and frame clock. Enable
-+                                with "dtoverlay=allo-boss-dac-pcm512x-audio,
-+                                slave"
-+
-+
-+Name:   allo-boss2-dac-audio
-+Info:   Configures the Allo Boss2 DAC audio card
-+Load:   dtoverlay=allo-boss2-dac-audio
-+Params: <None>
-+
-+
-+Name:   allo-digione
-+Info:   Configures the Allo Digione audio card
-+Load:   dtoverlay=allo-digione
-+Params: <None>
-+
-+
-+Name:   allo-katana-dac-audio
-+Info:   Configures the Allo Katana DAC audio card
-+Load:   dtoverlay=allo-katana-dac-audio
-+Params: <None>
-+
-+
-+Name:   allo-piano-dac-pcm512x-audio
-+Info:   Configures the Allo Piano DAC (2.0/2.1) audio cards.
-+        (NB. This initial support is for 2.0 channel audio ONLY! ie. stereo.
-+        The subwoofer outputs on the Piano 2.1 are not currently supported!)
-+Load:   dtoverlay=allo-piano-dac-pcm512x-audio,<param>
-+Params: 24db_digital_gain       Allow gain to be applied via the PCM512x codec
-+                                Digital volume control.
-+                                (The default behaviour is that the Digital
-+                                volume control is limited to a maximum of
-+                                0dB. ie. it can attenuate but not provide
-+                                gain. For most users, this will be desired
-+                                as it will prevent clipping. By appending
-+                                the 24db_digital_gain parameter, the Digital
-+                                volume control will allow up to 24dB of
-+                                gain. If this parameter is enabled, it is the
-+                                responsibility of the user to ensure that
-+                                the Digital volume control is set to a value
-+                                that does not result in clipping/distortion!)
-+
-+
-+Name:   allo-piano-dac-plus-pcm512x-audio
-+Info:   Configures the Allo Piano DAC (2.1) audio cards.
-+Load:   dtoverlay=allo-piano-dac-plus-pcm512x-audio,<param>
-+Params: 24db_digital_gain       Allow gain to be applied via the PCM512x codec
-+                                Digital volume control.
-+                                (The default behaviour is that the Digital
-+                                volume control is limited to a maximum of
-+                                0dB. ie. it can attenuate but not provide
-+                                gain. For most users, this will be desired
-+                                as it will prevent clipping. By appending
-+                                the 24db_digital_gain parameter, the Digital
-+                                volume control will allow up to 24dB of
-+                                gain. If this parameter is enabled, it is the
-+                                responsibility of the user to ensure that
-+                                the Digital volume control is set to a value
-+                                that does not result in clipping/distortion!)
-+        glb_mclk                This option is only with Kali board. If enabled,
-+                                MCLK for Kali is used and PLL is disabled for
-+                                better voice quality. (default Off)
-+
-+
-+Name:   anyspi
-+Info:   Universal device tree overlay for SPI devices
-+
-+        Just specify the SPI address and device name ("compatible" property).
-+        This overlay lacks any device-specific parameter support!
-+
-+        For devices on spi1 or spi2, the interfaces should be enabled
-+        with one of the spi1-1/2/3cs and/or spi2-1/2/3cs overlays.
-+
-+        Examples:
-+        1. SPI NOR flash on spi0.1, maximum SPI clock frequency 45MHz:
-+            dtoverlay=anyspi:spi0-1,dev="jedec,spi-nor",speed=45000000
-+        2. MCP3204 ADC on spi1.2, maximum SPI clock frequency 500kHz:
-+            dtoverlay=anyspi:spi1-2,dev="microchip,mcp3204"
-+Load:   dtoverlay=anyspi,<param>=<val>
-+Params: spi<n>-<m>              Configure device at spi<n>, cs<m>
-+                                (boolean, required)
-+        dev                     Set device name to search compatible module
-+                                (string, required)
-+        speed                   Set SPI clock frequency in Hz
-+                                (integer, optional, default 500000)
-+
-+
-+Name:   apds9960
-+Info:   Configures the AVAGO APDS9960 digital proximity, ambient light, RGB and
-+        gesture sensor
-+Load:   dtoverlay=apds9960,<param>=<val>
-+Params: gpiopin                 GPIO used for INT (default 4)
-+        noints                  Disable the interrupt GPIO line.
-+
-+
-+Name:   applepi-dac
-+Info:   Configures the Orchard Audio ApplePi-DAC audio card
-+Load:   dtoverlay=applepi-dac
-+Params: <None>
-+
-+
-+Name:   arducam-64mp
-+Info:   Arducam 64MP camera module.
-+        Uses Unicam 1, which is the standard camera connector on most Pi
-+        variants.
-+Load:   dtoverlay=arducam-64mp,<param>=<val>
-+Params: rotation                Mounting rotation of the camera sensor (0 or
-+                                180, default 0)
-+        orientation             Sensor orientation (0 = front, 1 = rear,
-+                                2 = external, default external)
-+        media-controller        Configure use of Media Controller API for
-+                                configuring the sensor (default on)
-+        cam0                    Adopt the default configuration for CAM0 on a
-+                                Compute Module (CSI0, i2c_vc, and cam0_reg).
-+
-+
-+Name:   arducam-pivariety
-+Info:   Arducam Pivariety camera module.
-+        Uses Unicam 1, which is the standard camera connector on most Pi
-+        variants.
-+Load:   dtoverlay=arducam-pivariety,<param>=<val>
-+Params: rotation                Mounting rotation of the camera sensor (0 or
-+                                180, default 0)
-+        orientation             Sensor orientation (0 = front, 1 = rear,
-+                                2 = external, default external)
-+        media-controller        Configure use of Media Controller API for
-+                                configuring the sensor (default on)
-+        cam0                    Adopt the default configuration for CAM0 on a
-+                                Compute Module (CSI0, i2c_vc, and cam0_reg).
-+
-+
-+Name:   at86rf233
-+Info:   Configures the Atmel AT86RF233 802.15.4 low-power WPAN transceiver,
-+        connected to spi0.0
-+Load:   dtoverlay=at86rf233,<param>=<val>
-+Params: interrupt               GPIO used for INT (default 23)
-+        reset                   GPIO used for Reset (default 24)
-+        sleep                   GPIO used for Sleep (default 25)
-+        speed                   SPI bus speed in Hz (default 3000000)
-+        trim                    Fine tuning of the internal capacitance
-+                                arrays (0=+0pF, 15=+4.5pF, default 15)
-+
-+
-+Name:   audioinjector-addons
-+Info:   Configures the audioinjector.net audio add on soundcards
-+Load:   dtoverlay=audioinjector-addons,<param>=<val>
-+Params: non-stop-clocks         Keeps the clocks running even when the stream
-+                                is paused or stopped (default off)
-+
-+
-+Name:   audioinjector-bare-i2s
-+Info:   Configures the audioinjector.net audio bare i2s soundcard
-+Load:   dtoverlay=audioinjector-bare-i2s
-+Params: <None>
-+
-+
-+Name:   audioinjector-isolated-soundcard
-+Info:   Configures the audioinjector.net isolated soundcard
-+Load:   dtoverlay=audioinjector-isolated-soundcard
-+Params: <None>
-+
-+
-+Name:   audioinjector-ultra
-+Info:   Configures the audioinjector.net ultra soundcard
-+Load:   dtoverlay=audioinjector-ultra
-+Params: <None>
-+
-+
-+Name:   audioinjector-wm8731-audio
-+Info:   Configures the audioinjector.net audio add on soundcard
-+Load:   dtoverlay=audioinjector-wm8731-audio
-+Params: <None>
-+
-+
-+Name:   audiosense-pi
-+Info:   Configures the audiosense-pi add on soundcard
-+        For more information refer to
-+        https://gitlab.com/kakar0t/audiosense-pi
-+Load:   dtoverlay=audiosense-pi
-+Params: <None>
-+
-+
-+Name:   audremap
-+Info:   Switches PWM sound output to GPIOs on the 40-pin header
-+Load:   dtoverlay=audremap,<param>=<val>
-+Params: swap_lr                 Reverse the channel allocation, which will also
-+                                swap the audio jack outputs (default off)
-+        enable_jack             Don't switch off the audio jack output
-+                                (default off)
-+        pins_12_13              Select GPIOs 12 & 13 (default)
-+        pins_18_19              Select GPIOs 18 & 19
-+
-+
-+Name:   balena-fin
-+Info:   Overlay that enables WLAN, Bluetooth and the GPIO expander on the
-+        balenaFin carrier board for the Raspberry Pi Compute Module 3/3+ Lite.
-+Load:   dtoverlay=balena-fin
-+Params: <None>
-+
-+
-+Name:   bmp085_i2c-sensor
-+Info:   This overlay is now deprecated - see i2c-sensor
-+Load:   <Deprecated>
-+
-+
-+Name:   camera-mux-2port
-+Info:   Configures a 2 port camera multiplexer
-+        Note that currently ALL IMX290 modules share a common clock, therefore
-+        all modules will need to have the same clock frequency.
-+Load:   dtoverlay=camera-mux-2port,<param>=<val>
-+Params: cam0-imx219             Select IMX219 for camera on port 0
-+        cam0-imx258             Select IMX258 for camera on port 0
-+        cam0-imx290             Select IMX290 for camera on port 0
-+        cam0-imx477             Select IMX477 for camera on port 0
-+        cam0-ov2311             Select OV2311 for camera on port 0
-+        cam0-ov5647             Select OV5647 for camera on port 0
-+        cam0-ov7251             Select OV7251 for camera on port 0
-+        cam0-ov9281             Select OV9281 for camera on port 0
-+        cam0-imx290-clk-freq    Set clock frequency for an IMX290 on port 0
-+        cam1-imx219             Select IMX219 for camera on port 1
-+        cam1-imx258             Select IMX258 for camera on port 1
-+        cam1-imx290             Select IMX290 for camera on port 1
-+        cam1-imx477             Select IMX477 for camera on port 1
-+        cam1-ov2311             Select OV2311 for camera on port 1
-+        cam1-ov5647             Select OV5647 for camera on port 1
-+        cam1-ov7251             Select OV7251 for camera on port 1
-+        cam1-ov9281             Select OV9281 for camera on port 1
-+        cam1-imx290-clk-freq    Set clock frequency for an IMX290 on port 1
-+
-+
-+Name:   camera-mux-4port
-+Info:   Configures a 4 port camera multiplexer
-+        Note that currently ALL IMX290 modules share a common clock, therefore
-+        all modules will need to have the same clock frequency.
-+Load:   dtoverlay=camera-mux-4port,<param>=<val>
-+Params: cam0-imx219             Select IMX219 for camera on port 0
-+        cam0-imx258             Select IMX258 for camera on port 0
-+        cam0-imx290             Select IMX290 for camera on port 0
-+        cam0-imx477             Select IMX477 for camera on port 0
-+        cam0-ov2311             Select OV2311 for camera on port 0
-+        cam0-ov5647             Select OV5647 for camera on port 0
-+        cam0-ov7251             Select OV7251 for camera on port 0
-+        cam0-ov9281             Select OV9281 for camera on port 0
-+        cam0-imx290-clk-freq    Set clock frequency for an IMX290 on port 0
-+        cam1-imx219             Select IMX219 for camera on port 1
-+        cam1-imx258             Select IMX258 for camera on port 1
-+        cam1-imx290             Select IMX290 for camera on port 1
-+        cam1-imx477             Select IMX477 for camera on port 1
-+        cam1-ov2311             Select OV2311 for camera on port 1
-+        cam1-ov5647             Select OV5647 for camera on port 1
-+        cam1-ov7251             Select OV7251 for camera on port 1
-+        cam1-ov9281             Select OV9281 for camera on port 1
-+        cam1-imx290-clk-freq    Set clock frequency for an IMX290 on port 1
-+        cam2-imx219             Select IMX219 for camera on port 2
-+        cam2-imx258             Select IMX258 for camera on port 2
-+        cam2-imx290             Select IMX290 for camera on port 2
-+        cam2-imx477             Select IMX477 for camera on port 2
-+        cam2-ov2311             Select OV2311 for camera on port 2
-+        cam2-ov5647             Select OV5647 for camera on port 2
-+        cam2-ov7251             Select OV7251 for camera on port 2
-+        cam2-ov9281             Select OV9281 for camera on port 2
-+        cam2-imx290-clk-freq    Set clock frequency for an IMX290 on port 2
-+        cam3-imx219             Select IMX219 for camera on port 3
-+        cam3-imx258             Select IMX258 for camera on port 3
-+        cam3-imx290             Select IMX290 for camera on port 3
-+        cam3-imx477             Select IMX477 for camera on port 3
-+        cam3-ov2311             Select OV2311 for camera on port 3
-+        cam3-ov5647             Select OV5647 for camera on port 3
-+        cam3-ov7251             Select OV7251 for camera on port 3
-+        cam3-ov9281             Select OV9281 for camera on port 3
-+        cam3-imx290-clk-freq    Set clock frequency for an IMX290 on port 3
-+
-+
-+Name:   cap1106
-+Info:   Enables the ability to use the cap1106 touch sensor as a keyboard
-+Load:   dtoverlay=cap1106,<param>=<val>
-+Params: int_pin                 GPIO pin for interrupt signal (default 23)
-+
-+
-+Name:   chipdip-dac
-+Info:   Configures Chip Dip audio cards.
-+Load:   dtoverlay=chipdip-dac
-+Params: <None>
-+
-+
-+Name:   cirrus-wm5102
-+Info:   Configures the Cirrus Logic Audio Card
-+Load:   dtoverlay=cirrus-wm5102
-+Params: <None>
-+
-+
-+Name:   cma
-+Info:   Set custom CMA sizes, only use if you know what you are doing, might
-+        clash with other overlays like vc4-fkms-v3d and vc4-kms-v3d.
-+Load:   dtoverlay=cma,<param>=<val>
-+Params: cma-512                 CMA is 512MB (needs 1GB)
-+        cma-448                 CMA is 448MB (needs 1GB)
-+        cma-384                 CMA is 384MB (needs 1GB)
-+        cma-320                 CMA is 320MB (needs 1GB)
-+        cma-256                 CMA is 256MB (needs 1GB)
-+        cma-192                 CMA is 192MB (needs 1GB)
-+        cma-128                 CMA is 128MB
-+        cma-96                  CMA is 96MB
-+        cma-64                  CMA is 64MB
-+        cma-size                CMA size in bytes, 4MB aligned
-+        cma-default             Use upstream's default value
-+
-+
-+Name:   cutiepi-panel
-+Info:   8" TFT LCD display and touch panel used by cutiepi.io
-+Load:   dtoverlay=cutiepi-panel
-+Params: <None>
-+
-+
-+Name:   dacberry400
-+Info:   Configures the dacberry400 add on soundcard
-+Load:   dtoverlay=dacberry400
-+Params: <None>
-+
-+
-+Name:   dht11
-+Info:   Overlay for the DHT11/DHT21/DHT22 humidity/temperature sensors
-+        Also sometimes found with the part number(s) AM230x.
-+Load:   dtoverlay=dht11,<param>=<val>
-+Params: gpiopin                 GPIO connected to the sensor's DATA output.
-+                                (default 4)
-+
-+
-+Name:   dionaudio-kiwi
-+Info:   Configures the Dion Audio KIWI STREAMER
-+Load:   dtoverlay=dionaudio-kiwi
-+Params: <None>
-+
-+
-+Name:   dionaudio-loco
-+Info:   Configures the Dion Audio LOCO DAC-AMP
-+Load:   dtoverlay=dionaudio-loco
-+Params: <None>
-+
-+
-+Name:   dionaudio-loco-v2
-+Info:   Configures the Dion Audio LOCO-V2 DAC-AMP
-+Load:   dtoverlay=dionaudio-loco-v2,<param>=<val>
-+Params: 24db_digital_gain       Allow gain to be applied via the PCM512x codec
-+                                Digital volume control. Enable with
-+                                "dtoverlay=hifiberry-dacplus,24db_digital_gain"
-+                                (The default behaviour is that the Digital
-+                                volume control is limited to a maximum of
-+                                0dB. ie. it can attenuate but not provide
-+                                gain. For most users, this will be desired
-+                                as it will prevent clipping. By appending
-+                                the 24dB_digital_gain parameter, the Digital
-+                                volume control will allow up to 24dB of
-+                                gain. If this parameter is enabled, it is the
-+                                responsibility of the user to ensure that
-+                                the Digital volume control is set to a value
-+                                that does not result in clipping/distortion!)
-+
-+
-+Name:   disable-bt
-+Info:   Disable onboard Bluetooth on Pi 3B, 3B+, 3A+, 4B and Zero W, restoring
-+        UART0/ttyAMA0 over GPIOs 14 & 15.
-+        N.B. To disable the systemd service that initialises the modem so it
-+        doesn't use the UART, use 'sudo systemctl disable hciuart'.
-+Load:   dtoverlay=disable-bt
-+Params: <None>
-+
-+
-+Name:   disable-wifi
-+Info:   Disable onboard WLAN on Pi 3B, 3B+, 3A+, 4B and Zero W.
-+Load:   dtoverlay=disable-wifi
-+Params: <None>
-+
-+
-+Name:   dpi18
-+Info:   Overlay for a generic 18-bit DPI display
-+        This uses GPIOs 0-21 (so no I2C, uart etc.), and activates the output
-+        2-3 seconds after the kernel has started.
-+Load:   dtoverlay=dpi18
-+Params: <None>
-+
-+
-+Name:   dpi18cpadhi
-+Info:   Overlay for a generic 18-bit DPI display (in 'mode 6' connection scheme)
-+        This uses GPIOs 0-9,12-17,20-25 (so no I2C, uart etc.), and activates
-+        the output 3-3 seconds after the kernel has started.
-+Load:   dtoverlay=dpi18cpadhi
-+Params: <None>
-+
-+
-+Name:   dpi24
-+Info:   Overlay for a generic 24-bit DPI display
-+        This uses GPIOs 0-27 (so no I2C, uart etc.), and activates the output
-+        2-3 seconds after the kernel has started.
-+Load:   dtoverlay=dpi24
-+Params: <None>
-+
-+
-+Name:   draws
-+Info:   Configures the NW Digital Radio DRAWS Hat
-+
-+        The board includes an ADC to measure various board values and also
-+        provides two analog user inputs on the expansion header.  The ADC
-+        can be configured for various sample rates and gain values to adjust
-+        the input range.  Tables describing the two parameters follow.
-+
-+        ADC Gain Values:
-+            0 = +/- 6.144V
-+            1 = +/- 4.096V
-+            2 = +/- 2.048V
-+            3 = +/- 1.024V
-+            4 = +/- 0.512V
-+            5 = +/- 0.256V
-+            6 = +/- 0.256V
-+            7 = +/- 0.256V
-+
-+        ADC Datarate Values:
-+            0 = 128sps
-+            1 = 250sps
-+            2 = 490sps
-+            3 = 920sps
-+            4 = 1600sps (default)
-+            5 = 2400sps
-+            6 = 3300sps
-+            7 = 3300sps
-+Load:   dtoverlay=draws,<param>=<val>
-+Params: draws_adc_ch4_gain      Sets the full scale resolution of the ADCs
-+                                input voltage sensor (default 1)
-+
-+        draws_adc_ch4_datarate  Sets the datarate of the ADCs input voltage
-+                                sensor
-+
-+        draws_adc_ch5_gain      Sets the full scale resolution of the ADCs
-+                                5V rail voltage sensor (default 1)
-+
-+        draws_adc_ch5_datarate  Sets the datarate of the ADCs 4V rail voltage
-+                                sensor
-+
-+        draws_adc_ch6_gain      Sets the full scale resolution of the ADCs
-+                                AIN2 input (default 2)
-+
-+        draws_adc_ch6_datarate  Sets the datarate of the ADCs AIN2 input
-+
-+        draws_adc_ch7_gain      Sets the full scale resolution of the ADCs
-+                                AIN3 input (default 2)
-+
-+        draws_adc_ch7_datarate  Sets the datarate of the ADCs AIN3 input
-+
-+        alsaname                Name of the ALSA audio device (default "draws")
-+
-+
-+Name:   dwc-otg
-+Info:   Selects the dwc_otg USB controller driver which has fiq support. This
-+        is the default on all except the Pi Zero which defaults to dwc2.
-+Load:   dtoverlay=dwc-otg
-+Params: <None>
-+
-+
-+Name:   dwc2
-+Info:   Selects the dwc2 USB controller driver
-+Load:   dtoverlay=dwc2,<param>=<val>
-+Params: dr_mode                 Dual role mode: "host", "peripheral" or "otg"
-+
-+        g-rx-fifo-size          Size of rx fifo size in gadget mode
-+
-+        g-np-tx-fifo-size       Size of non-periodic tx fifo size in gadget
-+                                mode
-+
-+
-+[ The ds1307-rtc overlay has been deleted. See i2c-rtc. ]
-+
-+
-+Name:   edt-ft5406
-+Info:   Overlay for the EDT FT5406 touchscreen on the CSI/DSI I2C interface.
-+        This works with the Raspberry Pi 7" touchscreen when not being polled
-+        by the firmware.
-+        You MUST use either "disable_touchscreen=1" or "ignore_lcd=1" in
-+        config.txt to stop the firmware polling the touchscreen.
-+Load:   dtoverlay=edt-ft5406,<param>=<val>
-+Params: sizex                   Touchscreen size x (default 800)
-+        sizey                   Touchscreen size y (default 480)
-+        invx                    Touchscreen inverted x axis
-+        invy                    Touchscreen inverted y axis
-+        swapxy                  Touchscreen swapped x y axis
-+
-+
-+Name:   enc28j60
-+Info:   Overlay for the Microchip ENC28J60 Ethernet Controller on SPI0
-+Load:   dtoverlay=enc28j60,<param>=<val>
-+Params: int_pin                 GPIO used for INT (default 25)
-+
-+        speed                   SPI bus speed (default 12000000)
-+
-+
-+Name:   enc28j60-spi2
-+Info:   Overlay for the Microchip ENC28J60 Ethernet Controller on SPI2
-+Load:   dtoverlay=enc28j60-spi2,<param>=<val>
-+Params: int_pin                 GPIO used for INT (default 39)
-+
-+        speed                   SPI bus speed (default 12000000)
-+
-+
-+Name:   exc3000
-+Info:   Enables I2C connected EETI EXC3000 multiple touch controller using
-+        GPIO 4 (pin 7 on GPIO header) for interrupt.
-+Load:   dtoverlay=exc3000,<param>=<val>
-+Params: interrupt               GPIO used for interrupt (default 4)
-+        sizex                   Touchscreen size x (default 4096)
-+        sizey                   Touchscreen size y (default 4096)
-+        invx                    Touchscreen inverted x axis
-+        invy                    Touchscreen inverted y axis
-+        swapxy                  Touchscreen swapped x y axis
-+
-+
-+Name:   fbtft
-+Info:   Overlay for SPI-connected displays using the fbtft drivers.
-+
-+        This overlay seeks to replace the functionality provided by fbtft_device
-+        which is now gone from the kernel.
-+
-+        Most displays from fbtft_device have been ported over.
-+        Example:
-+          dtoverlay=fbtft,spi0-0,rpi-display,reset_pin=23,dc_pin=24,led_pin=18,rotate=270
-+
-+        It is also possible to specify the controller (this will use the default
-+        init sequence in the driver).
-+        Example:
-+          dtoverlay=fbtft,spi0-0,ili9341,bgr,reset_pin=23,dc_pin=24,led_pin=18,rotate=270
-+
-+        For devices on spi1 or spi2, the interfaces should be enabled
-+        with one of the spi1-1/2/3cs and/or spi2-1/2/3cs overlays.
-+
-+        The following features of fbtft_device have not been ported over:
-+        - parallel bus is not supported
-+        - the init property which overrides the controller initialization
-+          sequence is not supported as a parameter due to memory limitations in
-+          the bootloader responsible for applying the overlay.
-+
-+        See https://github.com/notro/fbtft/wiki/FBTFT-RPI-overlays for how to
-+        create an overlay.
-+
-+Load:   dtoverlay=fbtft,<param>=<val>
-+Params:
-+        spi<n>-<m>              Configure device at spi<n>, cs<m>
-+                                (boolean, required)
-+        speed                   SPI bus speed in Hz (default 32000000)
-+        cpha                    Shifted clock phase (CPHA) mode
-+        cpol                    Inverse clock polarity (CPOL) mode
-+
-+        adafruit18              Adafruit 1.8
-+        adafruit22              Adafruit 2.2 (old)
-+        adafruit22a             Adafruit 2.2
-+        adafruit28              Adafruit 2.8
-+        adafruit13m             Adafruit 1.3 OLED
-+        admatec_c-berry28       C-Berry28
-+        dogs102                 EA DOGS102
-+        er_tftm050_2            ER-TFTM070-2
-+        er_tftm070_5            ER-TFTM070-5
-+        ew24ha0                 EW24HA0
-+        ew24ha0_9bit            EW24HA0 in 9-bit mode
-+        freetronicsoled128      Freetronics OLED128
-+        hy28a                   HY28A
-+        hy28b                   HY28B
-+        itdb28_spi              ITDB02-2.8 with SPI interface circuit
-+        mi0283qt-2              Watterott MI0283QT-2
-+        mi0283qt-9a             Watterott MI0283QT-9A
-+        nokia3310               Nokia 3310
-+        nokia3310a              Nokia 3310a
-+        nokia5110               Nokia 5110
-+        piscreen                PiScreen
-+        pitft                   Adafruit PiTFT 2.8
-+        pioled                  ILSoft OLED
-+        rpi-display             Watterott rpi-display
-+        sainsmart18             Sainsmart 1.8
-+        sainsmart32_spi         Sainsmart 3.2 with SPI interfce circuit
-+        tinylcd35               TinyLCD 3.5
-+        tm022hdh26              Tianma TM022HDH26
-+        tontec35_9481           Tontect 3.5 with ILI9481 controller
-+        tontec35_9486           Tontect 3.5 with ILI9486 controller
-+        waveshare32b            Waveshare 3.2
-+        waveshare22             Waveshare 2.2
-+
-+        bd663474                BD663474 display controller
-+        hx8340bn                HX8340BN display controller
-+        hx8347d                 HX8347D display controller
-+        hx8353d                 HX8353D display controller
-+        hx8357d                 HX8357D display controller
-+        ili9163                 ILI9163 display controller
-+        ili9320                 ILI9320 display controller
-+        ili9325                 ILI9325 display controller
-+        ili9340                 ILI9340 display controller
-+        ili9341                 ILI9341 display controller
-+        ili9481                 ILI9481 display controller
-+        ili9486                 ILI9486 display controller
-+        pcd8544                 PCD8544 display controller
-+        ra8875                  RA8875 display controller
-+        s6d02a1                 S6D02A1 display controller
-+        s6d1121                 S6D1121 display controller
-+        seps525                 SEPS525 display controller
-+        sh1106                  SH1106 display controller
-+        ssd1289                 SSD1289 display controller
-+        ssd1305                 SSD1305 display controller
-+        ssd1306                 SSD1306 display controller
-+        ssd1325                 SSD1325 display controller
-+        ssd1331                 SSD1331 display controller
-+        ssd1351                 SSD1351 display controller
-+        st7735r                 ST7735R display controller
-+        st7789v                 ST7789V display controller
-+        tls8204                 TLS8204 display controller
-+        uc1611                  UC1611 display controller
-+        uc1701                  UC1701 display controller
-+        upd161704               UPD161704 display controller
-+
-+        width                   Display width in pixels
-+        height                  Display height in pixels
-+        regwidth                Display controller register width (default is
-+                                driver specific)
-+        buswidth                Display bus interface width (default 8)
-+        debug                   Debug output level {0-7}
-+        rotate                  Display rotation {0, 90, 180, 270} (counter
-+                                clockwise). Not supported by all drivers.
-+        bgr                     Enable BGR mode (default off). Use if Red and
-+                                Blue are swapped. Not supported by all drivers.
-+        fps                     Frames per second (default 30). In effect this
-+                                states how long the driver will wait after video
-+                                memory has been changed until display update
-+                                transfer is started.
-+        txbuflen                Length of the FBTFT transmit buffer
-+                                (default 4096)
-+        startbyte               Sets the Start byte used by fb_ili9320,
-+                                fb_ili9325 and fb_hx8347d. Common value is 0x70.
-+        gamma                   String representation of Gamma Curve(s). Driver
-+                                specific. Not supported by all drivers.
-+        reset_pin               GPIO pin for RESET
-+        dc_pin                  GPIO pin for D/C
-+        led_pin                 GPIO pin for LED backlight
-+
-+
-+Name:   fe-pi-audio
-+Info:   Configures the Fe-Pi Audio Sound Card
-+Load:   dtoverlay=fe-pi-audio
-+Params: <None>
-+
-+
-+Name:   fsm-demo
-+Info:   A demonstration of the gpio-fsm driver. The GPIOs are chosen to work
-+        nicely with a "traffic-light" display of red, amber and green LEDs on
-+        GPIOs 7, 8 and 25 respectively.
-+Load:   dtoverlay=fsm-demo,<param>=<val>
-+Params: fsm_debug               Enable debug logging (default off)
-+
-+
-+Name:   gc9a01
-+Info:   Enables GalaxyCore's GC9A01 single chip driver based displays on
-+        SPI0 as fb1, using GPIOs DC=25, RST=27 and BL=18 (physical
-+        GPIO header pins 22, 13 and 12 respectively) in addition to the
-+        SPI0 pins DIN=10, CLK=11 and CS=8 (physical GPIO header pins 19,
-+        23 and 24 respectively).
-+Load:   dtoverlay=gc9a01,<param>=<val>
-+Params: speed                   Display SPI bus speed
-+
-+        rotate                  Display rotation {0,90,180,270}
-+
-+        width                   Width of the display
-+
-+        height                  Height of the display
-+
-+        fps                     Delay between frame updates
-+
-+        debug                   Debug output level {0-7}
-+
-+
-+Name:   ghost-amp
-+Info:   An overlay for the Ghost amplifier.
-+Load:   dtoverlay=ghost-amp,<param>=<val>
-+Params: fsm_debug               Enable debug logging of the GPIO FSM (default
-+                                off)
-+
-+
-+Name:   goodix
-+Info:   Enables I2C connected Goodix gt9271 multiple touch controller using
-+        GPIOs 4 and 17 (pins 7 and 11 on GPIO header) for interrupt and reset.
-+Load:   dtoverlay=goodix,<param>=<val>
-+Params: interrupt               GPIO used for interrupt (default 4)
-+        reset                   GPIO used for reset (default 17)
-+
-+
-+Name:   googlevoicehat-soundcard
-+Info:   Configures the Google voiceHAT soundcard
-+Load:   dtoverlay=googlevoicehat-soundcard
-+Params: <None>
-+
-+
-+Name:   gpio-fan
-+Info:   Configure a GPIO pin to control a cooling fan.
-+Load:   dtoverlay=gpio-fan,<param>=<val>
-+Params: gpiopin                 GPIO used to control the fan (default 12)
-+        temp                    Temperature at which the fan switches on, in
-+                                millicelcius (default 55000)
-+        hyst                    Temperature delta (in millicelcius) below
-+                                temp at which the fan will drop to minrpm
-+                                (default 10000)
-+
-+
-+Name:   gpio-hog
-+Info:   Activate a "hog" for a GPIO - request that the kernel configures it as
-+        an output, driven low or high as indicated by the presence or absence
-+        of the active_low parameter. Note that a hogged GPIO is not available
-+        to other drivers or for gpioset/gpioget.
-+Load:   dtoverlay=gpio-hog,<param>=<val>
-+Params: gpio                    GPIO pin to hog (default 26)
-+        active_low              If set, the hog drives the GPIO low (defaults
-+                                to off - the GPIO is driven high)
-+
-+
-+Name:   gpio-ir
-+Info:   Use GPIO pin as rc-core style infrared receiver input. The rc-core-
-+        based gpio_ir_recv driver maps received keys directly to a
-+        /dev/input/event* device, all decoding is done by the kernel - LIRC is
-+        not required! The key mapping and other decoding parameters can be
-+        configured by "ir-keytable" tool.
-+Load:   dtoverlay=gpio-ir,<param>=<val>
-+Params: gpio_pin                Input pin number. Default is 18.
-+
-+        gpio_pull               Desired pull-up/down state (off, down, up)
-+                                Default is "up".
-+
-+        invert                  "1" = invert the input (active-low signalling).
-+                                "0" = non-inverted input (active-high
-+                                signalling). Default is "1".
-+
-+        rc-map-name             Default rc keymap (can also be changed by
-+                                ir-keytable), defaults to "rc-rc6-mce"
-+
-+
-+Name:   gpio-ir-tx
-+Info:   Use GPIO pin as bit-banged infrared transmitter output.
-+        This is an alternative to "pwm-ir-tx". gpio-ir-tx doesn't require
-+        a PWM so it can be used together with onboard analog audio.
-+Load:   dtoverlay=gpio-ir-tx,<param>=<val>
-+Params: gpio_pin                Output GPIO (default 18)
-+
-+        invert                  "1" = invert the output (make it active-low).
-+                                Default is "0" (active-high).
-+
-+
-+Name:   gpio-key
-+Info:   This is a generic overlay for activating GPIO keypresses using
-+        the gpio-keys library and this dtoverlay. Multiple keys can be
-+        set up using multiple calls to the overlay for configuring
-+        additional buttons or joysticks. You can see available keycodes
-+        at https://github.com/torvalds/linux/blob/v4.12/include/uapi/
-+        linux/input-event-codes.h#L64
-+Load:   dtoverlay=gpio-key,<param>=<val>
-+Params: gpio                    GPIO pin to trigger on (default 3)
-+        active_low              When this is 1 (active low), a falling
-+                                edge generates a key down event and a
-+                                rising edge generates a key up event.
-+                                When this is 0 (active high), this is
-+                                reversed. The default is 1 (active low)
-+        gpio_pull               Desired pull-up/down state (off, down, up)
-+                                Default is "up". Note that the default pin
-+                                (GPIO3) has an external pullup
-+        label                   Set a label for the key
-+        keycode                 Set the key code for the button
-+
-+
-+
-+Name:   gpio-led
-+Info:   This is a generic overlay for activating LEDs (or any other component)
-+        by a GPIO pin. Multiple LEDs can be set up using multiple calls to the
-+        overlay. While there are many existing methods to activate LEDs on the
-+        RPi, this method offers some advantages:
-+        1) Does not require any userspace programs.
-+        2) LEDs can be connected to the kernel's led-trigger framework,
-+           and drive the LED based on triggers such as cpu load, heartbeat,
-+           kernel panic, key input, timers and others.
-+        3) LED can be tied to the input state of another GPIO pin.
-+        4) The LED is setup early during the kernel boot process (useful
-+           for cpu/heartbeat/panic triggers).
-+
-+        Typical electrical connection is:
-+           RPI-GPIO.19  ->  LED  -> 300ohm resister  -> RPI-GND
-+        The GPIO pin number can be changed with the 'gpio=' parameter.
-+
-+        To control an LED from userspace, write a 0 or 1 value:
-+           echo 1 > /sys/class/leds/myled1/brightness
-+        The 'myled1' name can be changed with the 'label=' parameter.
-+
-+        To connect the LED to a kernel trigger from userspace:
-+           echo cpu > /sys/class/leds/myled1/trigger
-+           echo heartbeat > /sys/class/leds/myled1/trigger
-+           echo none > /sys/class/leds/myled1/trigger
-+        To connect the LED to GPIO.26 pin (physical pin 37):
-+           echo gpio > /sys/class/leds/myled1/trigger
-+           echo 26 > /sys/class/leds/myled1/gpio
-+        Available triggers:
-+           cat /sys/class/leds/myled1/trigger
-+
-+        More information about the Linux kernel LED/Trigger system:
-+           https://www.kernel.org/doc/Documentation/leds/leds-class.rst
-+           https://www.kernel.org/doc/Documentation/leds/ledtrig-oneshot.rst
-+Load:   dtoverlay=gpio-led,<param>=<val>
-+Params: gpio                    GPIO pin connected to the LED (default 19)
-+        label                   The label for this LED. It will appear under
-+                                /sys/class/leds/<label> . Default 'myled1'.
-+        trigger                 Set the led-trigger to connect to this LED.
-+                                default 'none' (LED is user-controlled).
-+                                Some possible triggers:
-+                                 cpu - CPU load (all CPUs)
-+                                 cpu0 - CPU load of first CPU.
-+                                 mmc - disk activity (all disks)
-+                                 panic - turn on on kernel panic
-+                                 heartbeat - indicate system health
-+                                 gpio - connect to a GPIO input pin (note:
-+                                        currently the GPIO PIN can not be set
-+                                        using overlay parameters, must be
-+                                        done in userspace, see examples above.
-+        active_low              Set to 1 to turn invert the LED control
-+                                (writing 0 to /sys/class/leds/XXX/brightness
-+                                will turn on the GPIO/LED). Default '0'.
-+
-+
-+Name:   gpio-no-bank0-irq
-+Info:   Use this overlay to disable GPIO interrupts for GPIOs in bank 0 (0-27),
-+        which can be useful for UIO drivers.
-+        N.B. Using this overlay will trigger a kernel WARN during booting, but
-+        this can safely be ignored - the system should work as expected.
-+Load:   dtoverlay=gpio-no-bank0-irq
-+Params: <None>
-+
-+
-+Name:   gpio-no-irq
-+Info:   Use this overlay to disable all GPIO interrupts, which can be useful
-+        for user-space GPIO edge detection systems.
-+Load:   dtoverlay=gpio-no-irq
-+Params: <None>
-+
-+
-+Name:   gpio-poweroff
-+Info:   Drives a GPIO high or low on poweroff (including halt). Using this
-+        overlay interferes with the normal power-down sequence, preventing the
-+        kernel from resetting the SoC (a necessary step in a normal power-off
-+        or reboot). This also disables the ability to trigger a boot by driving
-+        GPIO3 low.
-+
-+        The GPIO starts in an inactive state. At poweroff time it is driven
-+        active for 100ms, then inactive for 100ms, then active again. It is
-+        safe to remove the power at any point after the initial activation of
-+        the GPIO.
-+
-+        Users of this overlay are required to provide an external mechanism to
-+        switch off the power supply when signalled - failure to do so results
-+        in a kernel BUG, increased power consumption and undefined behaviour.
-+Load:   dtoverlay=gpio-poweroff,<param>=<val>
-+Params: gpiopin                 GPIO for signalling (default 26)
-+
-+        active_low              Set if the power control device requires a
-+                                high->low transition to trigger a power-down.
-+                                Note that this will require the support of a
-+                                custom dt-blob.bin to prevent a power-down
-+                                during the boot process, and that a reboot
-+                                will also cause the pin to go low.
-+        input                   Set if the gpio pin should be configured as
-+                                an input.
-+        export                  Set to export the configured pin to sysfs
-+        active_delay_ms         Initial GPIO active period (default 100)
-+        inactive_delay_ms       Subsequent GPIO inactive period (default 100)
-+        timeout_ms              Specify (in ms) how long the kernel waits for
-+                                power-down before issuing a WARN (default 3000).
-+
-+
-+Name:   gpio-shutdown
-+Info:   Initiates a shutdown when GPIO pin changes. The given GPIO pin
-+        is configured as an input key that generates KEY_POWER events.
-+
-+        This event is handled by systemd-logind by initiating a
-+        shutdown. Systemd versions older than 225 need an udev rule
-+        enable listening to the input device:
-+
-+                ACTION!="REMOVE", SUBSYSTEM=="input", KERNEL=="event*", \
-+                        SUBSYSTEMS=="platform", DRIVERS=="gpio-keys", \
-+                        ATTRS{keys}=="116", TAG+="power-switch"
-+
-+        Alternatively this event can be handled also on systems without
-+        systemd, just by traditional SysV init daemon. KEY_POWER event
-+        (keycode 116) needs to be mapped to KeyboardSignal on console
-+        and then kb::kbrequest inittab action which is triggered by
-+        KeyboardSignal from console can be configured to issue system
-+        shutdown. Steps for this configuration are:
-+
-+            Add following lines to the /etc/console-setup/remap.inc file:
-+
-+                # Key Power as special keypress
-+                keycode 116 = KeyboardSignal
-+
-+            Then add following lines to /etc/inittab file:
-+
-+                # Action on special keypress (Key Power)
-+                kb::kbrequest:/sbin/shutdown -t1 -a -h -P now
-+
-+            And finally reload configuration by calling following commands:
-+
-+                # dpkg-reconfigure console-setup
-+                # service console-setup reload
-+                # init q
-+
-+        This overlay only handles shutdown. After shutdown, the system
-+        can be powered up again by driving GPIO3 low. The default
-+        configuration uses GPIO3 with a pullup, so if you connect a
-+        button between GPIO3 and GND (pin 5 and 6 on the 40-pin header),
-+        you get a shutdown and power-up button. Please note that
-+        Raspberry Pi 1 Model B rev 1 uses GPIO1 instead of GPIO3.
-+Load:   dtoverlay=gpio-shutdown,<param>=<val>
-+Params: gpio_pin                GPIO pin to trigger on (default 3)
-+                                For Raspberry Pi 1 Model B rev 1 set this
-+                                explicitly to value 1, e.g.:
-+
-+                                    dtoverlay=gpio-shutdown,gpio_pin=1
-+
-+        active_low              When this is 1 (active low), a falling
-+                                edge generates a key down event and a
-+                                rising edge generates a key up event.
-+                                When this is 0 (active high), this is
-+                                reversed. The default is 1 (active low).
-+
-+        gpio_pull               Desired pull-up/down state (off, down, up)
-+                                Default is "up".
-+
-+                                Note that the default pin (GPIO3) has an
-+                                external pullup. Same applies for GPIO1
-+                                on Raspberry Pi 1 Model B rev 1.
-+
-+        debounce                Specify the debounce interval in milliseconds
-+                                (default 100)
-+
-+
-+Name:   hd44780-lcd
-+Info:   Configures an HD44780 compatible LCD display. Uses 4 gpio pins for
-+        data, 2 gpio pins for enable and register select and 1 optional pin
-+        for enabling/disabling the backlight display.
-+Load:   dtoverlay=hd44780-lcd,<param>=<val>
-+Params: pin_d4                  GPIO pin for data pin D4 (default 6)
-+
-+        pin_d5                  GPIO pin for data pin D5 (default 13)
-+
-+        pin_d6                  GPIO pin for data pin D6 (default 19)
-+
-+        pin_d7                  GPIO pin for data pin D7 (default 26)
-+
-+        pin_en                  GPIO pin for "Enable" (default 21)
-+
-+        pin_rs                  GPIO pin for "Register Select" (default 20)
-+
-+        pin_bl                  Optional pin for enabling/disabling the
-+                                display backlight. (default disabled)
-+
-+        display_height          Height of the display in characters
-+
-+        display_width           Width of the display in characters
-+
-+
-+Name:   hdmi-backlight-hwhack-gpio
-+Info:   Devicetree overlay for GPIO based backlight on/off capability.
-+        Use this if you have one of those HDMI displays whose backlight cannot
-+        be controlled via DPMS over HDMI and plan to do a little soldering to
-+        use an RPi gpio pin for on/off switching. See:
-+        https://www.waveshare.com/wiki/7inch_HDMI_LCD_(C)#Backlight_Control
-+Load:   dtoverlay=hdmi-backlight-hwhack-gpio,<param>=<val>
-+Params: gpio_pin                GPIO pin used (default 17)
-+        active_low              Set this to 1 if the display backlight is
-+                                switched on when the wire goes low.
-+                                Leave the default (value 0) if the backlight
-+                                expects a high to switch it on.
-+
-+
-+Name:   hifiberry-amp
-+Info:   Configures the HifiBerry Amp and Amp+ audio cards
-+Load:   dtoverlay=hifiberry-amp
-+Params: <None>
-+
-+
-+Name:   hifiberry-amp100
-+Info:   Configures the HifiBerry AMP100 audio card
-+Load:   dtoverlay=hifiberry-amp100,<param>=<val>
-+Params: 24db_digital_gain       Allow gain to be applied via the PCM512x codec
-+                                Digital volume control. Enable with
-+                                "dtoverlay=hifiberry-amp100,24db_digital_gain"
-+                                (The default behaviour is that the Digital
-+                                volume control is limited to a maximum of
-+                                0dB. ie. it can attenuate but not provide
-+                                gain. For most users, this will be desired
-+                                as it will prevent clipping. By appending
-+                                the 24dB_digital_gain parameter, the Digital
-+                                volume control will allow up to 24dB of
-+                                gain. If this parameter is enabled, it is the
-+                                responsibility of the user to ensure that
-+                                the Digital volume control is set to a value
-+                                that does not result in clipping/distortion!)
-+        slave                   Force DAC+ Pro into slave mode, using Pi as
-+                                master for bit clock and frame clock.
-+        leds_off                If set to 'true' the onboard indicator LEDs
-+                                are switched off at all times.
-+        auto_mute               If set to 'true' the amplifier is automatically
-+                                muted when the DAC is not playing.
-+        mute_ext_ctl            The amplifier's HW mute control is enabled
-+                                in ALSA mixer and set to <val>.
-+                                Will be overwritten by ALSA user settings.
-+
-+
-+Name:   hifiberry-amp3
-+Info:   Configures the HifiBerry Amp3 audio card
-+Load:   dtoverlay=hifiberry-amp3
-+Params: <None>
-+
-+
-+Name:   hifiberry-dac
-+Info:   Configures the HifiBerry DAC audio cards
-+Load:   dtoverlay=hifiberry-dac
-+Params: <None>
-+
-+
-+Name:   hifiberry-dacplus
-+Info:   Configures the HifiBerry DAC+ audio card
-+Load:   dtoverlay=hifiberry-dacplus,<param>=<val>
-+Params: 24db_digital_gain       Allow gain to be applied via the PCM512x codec
-+                                Digital volume control. Enable with
-+                                "dtoverlay=hifiberry-dacplus,24db_digital_gain"
-+                                (The default behaviour is that the Digital
-+                                volume control is limited to a maximum of
-+                                0dB. ie. it can attenuate but not provide
-+                                gain. For most users, this will be desired
-+                                as it will prevent clipping. By appending
-+                                the 24dB_digital_gain parameter, the Digital
-+                                volume control will allow up to 24dB of
-+                                gain. If this parameter is enabled, it is the
-+                                responsibility of the user to ensure that
-+                                the Digital volume control is set to a value
-+                                that does not result in clipping/distortion!)
-+        slave                   Force DAC+ Pro into slave mode, using Pi as
-+                                master for bit clock and frame clock.
-+        leds_off                If set to 'true' the onboard indicator LEDs
-+                                are switched off at all times.
-+
-+
-+Name:   hifiberry-dacplusadc
-+Info:   Configures the HifiBerry DAC+ADC audio card
-+Load:   dtoverlay=hifiberry-dacplusadc,<param>=<val>
-+Params: 24db_digital_gain       Allow gain to be applied via the PCM512x codec
-+                                Digital volume control. Enable with
-+                                "dtoverlay=hifiberry-dacplus,24db_digital_gain"
-+                                (The default behaviour is that the Digital
-+                                volume control is limited to a maximum of
-+                                0dB. ie. it can attenuate but not provide
-+                                gain. For most users, this will be desired
-+                                as it will prevent clipping. By appending
-+                                the 24dB_digital_gain parameter, the Digital
-+                                volume control will allow up to 24dB of
-+                                gain. If this parameter is enabled, it is the
-+                                responsibility of the user to ensure that
-+                                the Digital volume control is set to a value
-+                                that does not result in clipping/distortion!)
-+        slave                   Force DAC+ Pro into slave mode, using Pi as
-+                                master for bit clock and frame clock.
-+        leds_off                If set to 'true' the onboard indicator LEDs
-+                                are switched off at all times.
-+
-+
-+Name:   hifiberry-dacplusadcpro
-+Info:   Configures the HifiBerry DAC+ADC PRO audio card
-+Load:   dtoverlay=hifiberry-dacplusadcpro,<param>=<val>
-+Params: 24db_digital_gain       Allow gain to be applied via the PCM512x codec
-+                                Digital volume control. Enable with
-+                                "dtoverlay=hifiberry-dacplusadcpro,24db_digital_gain"
-+                                (The default behaviour is that the Digital
-+                                volume control is limited to a maximum of
-+                                0dB. ie. it can attenuate but not provide
-+                                gain. For most users, this will be desired
-+                                as it will prevent clipping. By appending
-+                                the 24dB_digital_gain parameter, the Digital
-+                                volume control will allow up to 24dB of
-+                                gain. If this parameter is enabled, it is the
-+                                responsibility of the user to ensure that
-+                                the Digital volume control is set to a value
-+                                that does not result in clipping/distortion!)
-+        slave                   Force DAC+ADC Pro into slave mode, using Pi as
-+                                master for bit clock and frame clock.
-+        leds_off                If set to 'true' the onboard indicator LEDs
-+                                are switched off at all times.
-+
-+
-+Name:   hifiberry-dacplusdsp
-+Info:   Configures the HifiBerry DAC+DSP audio card
-+Load:   dtoverlay=hifiberry-dacplusdsp
-+Params: <None>
-+
-+
-+Name:   hifiberry-dacplushd
-+Info:   Configures the HifiBerry DAC+ HD audio card
-+Load:   dtoverlay=hifiberry-dacplushd
-+Params: <None>
-+
-+
-+Name:   hifiberry-digi
-+Info:   Configures the HifiBerry Digi and Digi+ audio card
-+Load:   dtoverlay=hifiberry-digi
-+Params: <None>
-+
-+
-+Name:   hifiberry-digi-pro
-+Info:   Configures the HifiBerry Digi+ Pro audio card
-+Load:   dtoverlay=hifiberry-digi-pro
-+Params: <None>
-+
-+
-+Name:   highperi
-+Info:   Enables "High Peripheral" mode
-+Load:   dtoverlay=highperi
-+Params: <None>
-+
-+
-+Name:   hy28a
-+Info:   HY28A - 2.8" TFT LCD Display Module by HAOYU Electronics
-+        Default values match Texy's display shield
-+Load:   dtoverlay=hy28a,<param>=<val>
-+Params: speed                   Display SPI bus speed
-+
-+        rotate                  Display rotation {0,90,180,270}
-+
-+        fps                     Delay between frame updates
-+
-+        debug                   Debug output level {0-7}
-+
-+        xohms                   Touchpanel sensitivity (X-plate resistance)
-+
-+        resetgpio               GPIO used to reset controller
-+
-+        ledgpio                 GPIO used to control backlight
-+
-+
-+Name:   hy28b
-+Info:   HY28B - 2.8" TFT LCD Display Module by HAOYU Electronics
-+        Default values match Texy's display shield
-+Load:   dtoverlay=hy28b,<param>=<val>
-+Params: speed                   Display SPI bus speed
-+
-+        rotate                  Display rotation {0,90,180,270}
-+
-+        fps                     Delay between frame updates
-+
-+        debug                   Debug output level {0-7}
-+
-+        xohms                   Touchpanel sensitivity (X-plate resistance)
-+
-+        resetgpio               GPIO used to reset controller
-+
-+        ledgpio                 GPIO used to control backlight
-+
-+
-+Name:   hy28b-2017
-+Info:   HY28B 2017 version - 2.8" TFT LCD Display Module by HAOYU Electronics
-+        Default values match Texy's display shield
-+Load:   dtoverlay=hy28b-2017,<param>=<val>
-+Params: speed                   Display SPI bus speed
-+
-+        rotate                  Display rotation {0,90,180,270}
-+
-+        fps                     Delay between frame updates
-+
-+        debug                   Debug output level {0-7}
-+
-+        xohms                   Touchpanel sensitivity (X-plate resistance)
-+
-+        resetgpio               GPIO used to reset controller
-+
-+        ledgpio                 GPIO used to control backlight
-+
-+
-+Name:   i-sabre-q2m
-+Info:   Configures the Audiophonics I-SABRE Q2M DAC
-+Load:   dtoverlay=i-sabre-q2m
-+Params: <None>
-+
-+
-+Name:   i2c-bcm2708
-+Info:   Fall back to the i2c_bcm2708 driver for the i2c_arm bus.
-+Load:   dtoverlay=i2c-bcm2708
-+Params: <None>
-+
-+
-+Name:   i2c-fan
-+Info:   Adds support for a number of I2C fan controllers
-+Load:   dtoverlay=i2c-fan,<param>=<val>
-+Params: addr                    Sets the address for the fan controller. Note
-+                                that the device must be configured to use the
-+                                specified address.
-+
-+        i2c0                    Choose the I2C0 bus on GPIOs 0&1
-+
-+        i2c_csi_dsi             Choose the I2C0 bus on GPIOs 44&45
-+
-+        i2c3                    Choose the I2C3 bus (configure with the i2c3
-+                                overlay - BCM2711 only)
-+
-+        i2c4                    Choose the I2C3 bus (configure with the i2c3
-+                                overlay - BCM2711 only)
-+
-+        i2c5                    Choose the I2C5 bus (configure with the i2c4
-+                                overlay - BCM2711 only)
-+
-+        i2c6                    Choose the I2C6 bus (configure with the i2c6
-+                                overlay - BCM2711 only)
-+
-+        minpwm                  PWM setting for the fan when the SoC is below
-+                                mintemp (range 0-255. default 0)
-+        maxpwm                  PWM setting for the fan when the SoC is above
-+                                maxtemp (range 0-255. default 255)
-+        midtemp                 Temperature (in millicelcius) at which the fan
-+                                begins to speed up (default 50000)
-+
-+        midtemp_hyst            Temperature delta (in millicelcius) below
-+                                mintemp at which the fan will drop to minrpm
-+                                (default 2000)
-+
-+        maxtemp                 Temperature (in millicelcius) at which the fan
-+                                will be held at maxrpm (default 70000)
-+
-+        maxtemp_hyst            Temperature delta (in millicelcius) below
-+                                maxtemp at which the fan begins to slow down
-+                                (default 2000)
-+
-+        emc2301                 Select the Microchip EMC230x controller family
-+                                - EMC2301, EMC2302, EMC2303, EMC2305.
-+
-+
-+Name:   i2c-gpio
-+Info:   Adds support for software i2c controller on gpio pins
-+Load:   dtoverlay=i2c-gpio,<param>=<val>
-+Params: i2c_gpio_sda            GPIO used for I2C data (default "23")
-+
-+        i2c_gpio_scl            GPIO used for I2C clock (default "24")
-+
-+        i2c_gpio_delay_us       Clock delay in microseconds
-+                                (default "2" = ~100kHz)
-+
-+        bus                     Set to a unique, non-zero value if wanting
-+                                multiple i2c-gpio busses. If set, will be used
-+                                as the preferred bus number (/dev/i2c-<n>). If
-+                                not set, the default value is 0, but the bus
-+                                number will be dynamically assigned - probably
-+                                3.
-+
-+
-+Name:   i2c-mux
-+Info:   Adds support for a number of I2C bus multiplexers on i2c_arm
-+Load:   dtoverlay=i2c-mux,<param>=<val>
-+Params: pca9542                 Select the NXP PCA9542 device
-+
-+        pca9545                 Select the NXP PCA9545 device
-+
-+        pca9548                 Select the NXP PCA9548 device
-+
-+        addr                    Change I2C address of the device (default 0x70)
-+
-+
-+[ The i2c-mux-pca9548a overlay has been deleted. See i2c-mux. ]
-+
-+
-+Name:   i2c-pwm-pca9685a
-+Info:   Adds support for an NXP PCA9685A I2C PWM controller on i2c_arm
-+Load:   dtoverlay=i2c-pwm-pca9685a,<param>=<val>
-+Params: addr                    I2C address of PCA9685A (default 0x40)
-+
-+
-+Name:   i2c-rtc
-+Info:   Adds support for a number of I2C Real Time Clock devices
-+Load:   dtoverlay=i2c-rtc,<param>=<val>
-+Params: abx80x                  Select one of the ABx80x family:
-+                                  AB0801, AB0803, AB0804, AB0805,
-+                                  AB1801, AB1803, AB1804, AB1805
-+
-+        bq32000                 Select the TI BQ32000 device
-+
-+        ds1307                  Select the DS1307 device
-+
-+        ds1339                  Select the DS1339 device
-+
-+        ds1340                  Select the DS1340 device
-+
-+        ds3231                  Select the DS3231 device
-+
-+        m41t62                  Select the M41T62 device
-+
-+        mcp7940x                Select the MCP7940x device
-+
-+        mcp7941x                Select the MCP7941x device
-+
-+        pcf2127                 Select the PCF2127 device
-+
-+        pcf2129                 Select the PCF2129 device
-+
-+        pcf85063                Select the PCF85063 device
-+
-+        pcf85063a               Select the PCF85063A device
-+
-+        pcf8523                 Select the PCF8523 device
-+
-+        pcf85363                Select the PCF85363 device
-+
-+        pcf8563                 Select the PCF8563 device
-+
-+        rv1805                  Select the Micro Crystal RV1805 device
-+
-+        rv3028                  Select the Micro Crystal RV3028 device
-+
-+        rv8803                  Select the Micro Crystal RV8803 device
-+
-+        sd3078                  Select the ZXW Shenzhen whwave SD3078 device
-+
-+        s35390a                 Select the ABLIC S35390A device
-+
-+        i2c0                    Choose the I2C0 bus on GPIOs 0&1
-+
-+        i2c_csi_dsi             Choose the I2C0 bus on GPIOs 44&45
-+
-+        i2c3                    Choose the I2C3 bus (configure with the i2c3
-+                                overlay - BCM2711 only)
-+
-+        i2c4                    Choose the I2C3 bus (configure with the i2c3
-+                                overlay - BCM2711 only)
-+
-+        i2c5                    Choose the I2C5 bus (configure with the i2c4
-+                                overlay - BCM2711 only)
-+
-+        i2c6                    Choose the I2C6 bus (configure with the i2c6
-+                                overlay - BCM2711 only)
-+
-+        addr                    Sets the address for the RTC. Note that the
-+                                device must be configured to use the specified
-+                                address.
-+
-+        trickle-diode-disable   Do not use the internal trickle charger diode
-+                                (BQ32000 only)
-+
-+        trickle-diode-type      Diode type for trickle charge - "standard" or
-+                                "schottky" (ABx80x and RV1805 only)
-+
-+        trickle-resistor-ohms   Resistor value for trickle charge (DS1339,
-+                                ABx80x, RV1805, RV3028)
-+
-+        wakeup-source           Specify that the RTC can be used as a wakeup
-+                                source
-+
-+        backup-switchover-mode  Backup power supply switch mode. Must be 0 for
-+                                off or 1 for Vdd < VBackup (RV3028 only)
-+
-+
-+Name:   i2c-rtc-gpio
-+Info:   Adds support for a number of I2C Real Time Clock devices
-+        using the software i2c controller
-+Load:   dtoverlay=i2c-rtc-gpio,<param>=<val>
-+Params: abx80x                  Select one of the ABx80x family:
-+                                  AB0801, AB0803, AB0804, AB0805,
-+                                  AB1801, AB1803, AB1804, AB1805
-+
-+        bq32000                 Select the TI BQ32000 device
-+
-+        ds1307                  Select the DS1307 device
-+
-+        ds1339                  Select the DS1339 device
-+
-+        ds1340                  Select the DS1340 device
-+
-+        ds3231                  Select the DS3231 device
-+
-+        m41t62                  Select the M41T62 device
-+
-+        mcp7940x                Select the MCP7940x device
-+
-+        mcp7941x                Select the MCP7941x device
-+
-+        pcf2127                 Select the PCF2127 device
-+
-+        pcf2129                 Select the PCF2129 device
-+
-+        pcf85063                Select the PCF85063 device
-+
-+        pcf85063a               Select the PCF85063A device
-+
-+        pcf8523                 Select the PCF8523 device
-+
-+        pcf85363                Select the PCF85363 device
-+
-+        pcf8563                 Select the PCF8563 device
-+
-+        rv1805                  Select the Micro Crystal RV1805 device
-+
-+        rv3028                  Select the Micro Crystal RV3028 device
-+
-+        rv8803                  Select the Micro Crystal RV8803 device
-+
-+        sd3078                  Select the ZXW Shenzhen whwave SD3078 device
-+
-+        s35390a                 Select the ABLIC S35390A device
-+
-+        addr                    Sets the address for the RTC. Note that the
-+                                device must be configured to use the specified
-+                                address.
-+
-+        trickle-diode-disable   Do not use the internal trickle charger diode
-+                                (BQ32000 only)
-+
-+        trickle-diode-type      Diode type for trickle charge - "standard" or
-+                                "schottky" (ABx80x and RV1805 only)
-+
-+        trickle-resistor-ohms   Resistor value for trickle charge (DS1339,
-+                                ABx80x, RV1805, RV3028)
-+
-+        wakeup-source           Specify that the RTC can be used as a wakeup
-+                                source
-+
-+        backup-switchover-mode  Backup power supply switch mode. Must be 0 for
-+                                off or 1 for Vdd < VBackup (RV3028 only)
-+
-+        i2c_gpio_sda            GPIO used for I2C data (default "23")
-+
-+        i2c_gpio_scl            GPIO used for I2C clock (default "24")
-+
-+        i2c_gpio_delay_us       Clock delay in microseconds
-+                                (default "2" = ~100kHz)
-+
-+
-+Name:   i2c-sensor
-+Info:   Adds support for a number of I2C barometric pressure, temperature,
-+        light level and chemical sensors on i2c_arm
-+Load:   dtoverlay=i2c-sensor,<param>=<val>
-+Params: addr                    Set the address for the BH1750, BME280, BME680,
-+                                BMP280, CCS811, DS1621, HDC100X, LM75, SHT3x or
-+                                TMP102
-+
-+        bh1750                  Select the Rohm BH1750 ambient light sensor
-+                                Valid addresses 0x23 or 0x5c, default 0x23
-+
-+        bme280                  Select the Bosch Sensortronic BME280
-+                                Valid addresses 0x76-0x77, default 0x76
-+
-+        bme680                  Select the Bosch Sensortronic BME680
-+                                Valid addresses 0x76-0x77, default 0x76
-+
-+        bmp085                  Select the Bosch Sensortronic BMP085
-+
-+        bmp180                  Select the Bosch Sensortronic BMP180
-+
-+        bmp280                  Select the Bosch Sensortronic BMP280
-+                                Valid addresses 0x76-0x77, default 0x76
-+
-+        ccs811                  Select the AMS CCS811 digital gas sensor
-+                                Valid addresses 0x5a-0x5b, default 0x5b
-+
-+        ds1621                  Select the Dallas Semiconductors DS1621 temp
-+                                sensor. Valid addresses 0x48-0x4f, default 0x48
-+
-+        hdc100x                 Select the Texas Instruments HDC100x temp sensor
-+                                Valid addresses 0x40-0x43, default 0x40
-+
-+        htu21                   Select the HTU21 temperature and humidity sensor
-+
-+        int_pin                 Set the GPIO to use for interrupts (max30102
-+                                only)
-+
-+        lm75                    Select the Maxim LM75 temperature sensor
-+                                Valid addresses 0x48-0x4f, default 0x4f
-+
-+        lm75addr                Deprecated - use addr parameter instead
-+
-+        max17040                Select the Maxim Integrated MAX17040 battery
-+                                monitor
-+
-+        max30102                Select the Maxim Integrated MAX30102 heart-rate
-+                                and blood-oxygen sensor
-+
-+        sht3x                   Select the Sensiron SHT3x temperature and
-+                                humidity sensor. Valid addresses 0x44-0x45,
-+                                default 0x44
-+
-+        si7020                  Select the Silicon Labs Si7013/20/21 humidity/
-+                                temperature sensor
-+
-+        sps30                   Select the Sensirion SPS30 particulate matter
-+                                sensor. Fixed address 0x69.
-+
-+        sgp30                   Select the Sensirion SGP30 VOC sensor.
-+                                Fixed address 0x58.
-+
-+        tmp102                  Select the Texas Instruments TMP102 temp sensor
-+                                Valid addresses 0x48-0x4b, default 0x48
-+
-+        tsl4531                 Select the AMS TSL4531 digital ambient light
-+                                sensor
-+
-+        veml6070                Select the Vishay VEML6070 ultraviolet light
-+                                sensor
-+
-+        i2c0                    Choose the I2C0 bus on GPIOs 0&1
-+
-+        i2c_csi_dsi             Choose the I2C0 bus on GPIOs 44&45
-+
-+        i2c3                    Choose the I2C3 bus (configure with the i2c3
-+                                overlay - BCM2711 only)
-+
-+        i2c4                    Choose the I2C3 bus (configure with the i2c3
-+                                overlay - BCM2711 only)
-+
-+        i2c5                    Choose the I2C5 bus (configure with the i2c4
-+                                overlay - BCM2711 only)
-+
-+        i2c6                    Choose the I2C6 bus (configure with the i2c6
-+                                overlay - BCM2711 only)
-+
-+
-+Name:   i2c0
-+Info:   Change i2c0 pin usage. Not all pin combinations are usable on all
-+        platforms - platforms other then Compute Modules can only use this
-+        to disable transaction combining.
-+        Do NOT use in conjunction with dtparam=i2c_vc=on. From the 5.4 kernel
-+        onwards the base DT includes the use of i2c_mux_pinctrl to expose two
-+        muxings of BSC0 - GPIOs 0&1, and whichever combination is used for the
-+        camera and display connectors. This overlay disables that mux and
-+        configures /dev/i2c0 to point at whichever set of pins is requested.
-+        dtparam=i2c_vc=on will try and enable the mux, so combining the two
-+        will cause conflicts.
-+Load:   dtoverlay=i2c0,<param>=<val>
-+Params: pins_0_1                Use pins 0 and 1 (default)
-+        pins_28_29              Use pins 28 and 29
-+        pins_44_45              Use pins 44 and 45
-+        pins_46_47              Use pins 46 and 47
-+        combine                 Allow transactions to be combined (default
-+                                "yes")
-+
-+
-+Name:   i2c0-bcm2708
-+Info:   Deprecated, legacy version of i2c0.
-+Load:   <Deprecated>
-+
-+
-+Name:   i2c1
-+Info:   Change i2c1 pin usage. Not all pin combinations are usable on all
-+        platforms - platforms other then Compute Modules can only use this
-+        to disable transaction combining.
-+Load:   dtoverlay=i2c1,<param>=<val>
-+Params: pins_2_3                Use pins 2 and 3 (default)
-+        pins_44_45              Use pins 44 and 45
-+        combine                 Allow transactions to be combined (default
-+                                "yes")
-+
-+
-+Name:   i2c1-bcm2708
-+Info:   Deprecated, legacy version of i2c1.
-+Load:   <Deprecated>
-+
-+
-+Name:   i2c3
-+Info:   Enable the i2c3 bus. BCM2711 only.
-+Load:   dtoverlay=i2c3,<param>
-+Params: pins_2_3                Use GPIOs 2 and 3
-+        pins_4_5                Use GPIOs 4 and 5 (default)
-+        baudrate                Set the baudrate for the interface (default
-+                                "100000")
-+
-+
-+Name:   i2c4
-+Info:   Enable the i2c4 bus. BCM2711 only.
-+Load:   dtoverlay=i2c4,<param>
-+Params: pins_6_7                Use GPIOs 6 and 7
-+        pins_8_9                Use GPIOs 8 and 9 (default)
-+        baudrate                Set the baudrate for the interface (default
-+                                "100000")
-+
-+
-+Name:   i2c5
-+Info:   Enable the i2c5 bus. BCM2711 only.
-+Load:   dtoverlay=i2c5,<param>
-+Params: pins_10_11              Use GPIOs 10 and 11
-+        pins_12_13              Use GPIOs 12 and 13 (default)
-+        baudrate                Set the baudrate for the interface (default
-+                                "100000")
-+
-+
-+Name:   i2c6
-+Info:   Enable the i2c6 bus. BCM2711 only.
-+Load:   dtoverlay=i2c6,<param>
-+Params: pins_0_1                Use GPIOs 0 and 1
-+        pins_22_23              Use GPIOs 22 and 23 (default)
-+        baudrate                Set the baudrate for the interface (default
-+                                "100000")
-+
-+
-+Name:   i2s-dac
-+Info:   Configures any passive I2S DAC soundcard.
-+Load:   dtoverlay=i2s-dac
-+Params: <None>
-+
-+
-+Name:   i2s-gpio28-31
-+Info:   move I2S function block to GPIO 28 to 31
-+Load:   dtoverlay=i2s-gpio28-31
-+Params: <None>
-+
-+
-+Name:   ilitek251x
-+Info:   Enables I2C connected Ilitek 251x multiple touch controller using
-+        GPIO 4 (pin 7 on GPIO header) for interrupt.
-+Load:   dtoverlay=ilitek251x,<param>=<val>
-+Params: interrupt               GPIO used for interrupt (default 4)
-+        sizex                   Touchscreen size x, horizontal resolution of
-+                                touchscreen (in pixels)
-+        sizey                   Touchscreen size y, vertical resolution of
-+                                touchscreen (in pixels)
-+
-+
-+Name:   imx219
-+Info:   Sony IMX219 camera module.
-+        Uses Unicam 1, which is the standard camera connector on most Pi
-+        variants.
-+Load:   dtoverlay=imx219,<param>=<val>
-+Params: rotation                Mounting rotation of the camera sensor (0 or
-+                                180, default 180)
-+        orientation             Sensor orientation (0 = front, 1 = rear,
-+                                2 = external, default external)
-+        media-controller        Configure use of Media Controller API for
-+                                configuring the sensor (default on)
-+        cam0                    Adopt the default configuration for CAM0 on a
-+                                Compute Module (CSI0, i2c_vc, and cam0_reg).
-+        vcm                     Configure a VCM focus drive on the sensor.
-+
-+
-+Name:   imx258
-+Info:   Sony IMX258 camera module.
-+        Uses Unicam 1, which is the standard camera connector on most Pi
-+        variants.
-+Load:   dtoverlay=imx258,<param>=<val>
-+Params: rotation                Mounting rotation of the camera sensor (0 or
-+                                180, default 180)
-+        orientation             Sensor orientation (0 = front, 1 = rear,
-+                                2 = external, default external)
-+        media-controller        Configure use of Media Controller API for
-+                                configuring the sensor (default on)
-+        cam0                    Adopt the default configuration for CAM0 on a
-+                                Compute Module (CSI0, i2c_vc, and cam0_reg).
-+        vcm                     Configure a VCM focus drive on the sensor.
-+        4lane                   Enable 4 CSI2 lanes. This requires a Compute
-+                                Module (1, 3, or 4).
-+
-+
-+Name:   imx290
-+Info:   Sony IMX290 camera module.
-+        Uses Unicam 1, which is the standard camera connector on most Pi
-+        variants.
-+Load:   dtoverlay=imx290,<param>
-+Params: 4lane                   Enable 4 CSI2 lanes. This requires a Compute
-+                                Module (1, 3, or 4).
-+        clock-frequency         Sets the clock frequency to match that used on
-+                                the board.
-+                                Modules from Vision Components use 37.125MHz
-+                                (the default), whilst those from Innomaker use
-+                                74.25MHz.
-+        mono                    Denote that the module is a mono sensor.
-+        orientation             Sensor orientation (0 = front, 1 = rear,
-+                                2 = external, default external)
-+        rotation                Mounting rotation of the camera sensor (0 or
-+                                180, default 0)
-+        media-controller        Configure use of Media Controller API for
-+                                configuring the sensor (default on)
-+        cam0                    Adopt the default configuration for CAM0 on a
-+                                Compute Module (CSI0, i2c_vc, and cam0_reg).
-+
-+
-+Name:   imx296
-+Info:   Sony IMX296 camera module.
-+        Uses Unicam 1, which is the standard camera connector on most Pi
-+        variants.
-+Load:   dtoverlay=imx296,<param>=<val>
-+Params: rotation                Mounting rotation of the camera sensor (0 or
-+                                180, default 180)
-+        orientation             Sensor orientation (0 = front, 1 = rear,
-+                                2 = external, default external)
-+        media-controller        Configure use of Media Controller API for
-+                                configuring the sensor (default on)
-+        cam0                    Adopt the default configuration for CAM0 on a
-+                                Compute Module (CSI0, i2c_vc, and cam0_reg).
-+
-+
-+Name:   imx327
-+Info:   Sony IMX327 camera module.
-+        Uses Unicam 1, which is the standard camera connector on most Pi
-+        variants.
-+Load:   dtoverlay=imx327,<param>
-+Params: 4lane                   Enable 4 CSI2 lanes. This requires a Compute
-+                                Module (1, 3, or 4).
-+        clock-frequency         Sets the clock frequency to match that used on
-+                                the board.
-+                                Modules from Vision Components use 37.125MHz
-+                                (the default), whilst those from Innomaker use
-+                                74.25MHz.
-+        mono                    Denote that the module is a mono sensor.
-+        orientation             Sensor orientation (0 = front, 1 = rear,
-+                                2 = external, default external)
-+        rotation                Mounting rotation of the camera sensor (0 or
-+                                180, default 0)
-+        media-controller        Configure use of Media Controller API for
-+                                configuring the sensor (default on)
-+        cam0                    Adopt the default configuration for CAM0 on a
-+                                Compute Module (CSI0, i2c_vc, and cam0_reg).
-+
-+
-+Name:   imx378
-+Info:   Sony IMX378 camera module.
-+        Uses Unicam 1, which is the standard camera connector on most Pi
-+        variants.
-+Load:   dtoverlay=imx378,<param>=<val>
-+Params: rotation                Mounting rotation of the camera sensor (0 or
-+                                180, default 180)
-+        orientation             Sensor orientation (0 = front, 1 = rear,
-+                                2 = external, default external)
-+        media-controller        Configure use of Media Controller API for
-+                                configuring the sensor (default on)
-+        cam0                    Adopt the default configuration for CAM0 on a
-+                                Compute Module (CSI0, i2c_vc, and cam0_reg).
-+
-+
-+Name:   imx462
-+Info:   Sony IMX462 camera module.
-+        Uses Unicam 1, which is the standard camera connector on most Pi
-+        variants.
-+Load:   dtoverlay=imx462,<param>
-+Params: 4lane                   Enable 4 CSI2 lanes. This requires a Compute
-+                                Module (1, 3, or 4).
-+        clock-frequency         Sets the clock frequency to match that used on
-+                                the board.
-+                                Modules from Vision Components use 37.125MHz
-+                                (the default), whilst those from Innomaker use
-+                                74.25MHz.
-+        mono                    Denote that the module is a mono sensor.
-+        orientation             Sensor orientation (0 = front, 1 = rear,
-+                                2 = external, default external)
-+        rotation                Mounting rotation of the camera sensor (0 or
-+                                180, default 0)
-+        media-controller        Configure use of Media Controller API for
-+                                configuring the sensor (default on)
-+        cam0                    Adopt the default configuration for CAM0 on a
-+                                Compute Module (CSI0, i2c_vc, and cam0_reg).
-+
-+
-+Name:   imx477
-+Info:   Sony IMX477 camera module.
-+        Uses Unicam 1, which is the standard camera connector on most Pi
-+        variants.
-+Load:   dtoverlay=imx477,<param>=<val>
-+Params: rotation                Mounting rotation of the camera sensor (0 or
-+                                180, default 180)
-+        orientation             Sensor orientation (0 = front, 1 = rear,
-+                                2 = external, default external)
-+        media-controller        Configure use of Media Controller API for
-+                                configuring the sensor (default on)
-+        cam0                    Adopt the default configuration for CAM0 on a
-+                                Compute Module (CSI0, i2c_vc, and cam0_reg).
-+
-+
-+Name:   imx519
-+Info:   Sony IMX519 camera module.
-+        Uses Unicam 1, which is the standard camera connector on most Pi
-+        variants.
-+Load:   dtoverlay=imx519,<param>=<val>
-+Params: rotation                Mounting rotation of the camera sensor (0 or
-+                                180, default 0)
-+        orientation             Sensor orientation (0 = front, 1 = rear,
-+                                2 = external, default external)
-+        media-controller        Configure use of Media Controller API for
-+                                configuring the sensor (default on)
-+        cam0                    Adopt the default configuration for CAM0 on a
-+                                Compute Module (CSI0, i2c_vc, and cam0_reg).
-+
-+
-+Name:   iqaudio-codec
-+Info:   Configures the IQaudio Codec audio card
-+Load:   dtoverlay=iqaudio-codec
-+Params: <None>
-+
-+
-+Name:   iqaudio-dac
-+Info:   Configures the IQaudio DAC audio card
-+Load:   dtoverlay=iqaudio-dac,<param>
-+Params: 24db_digital_gain       Allow gain to be applied via the PCM512x codec
-+                                Digital volume control. Enable with
-+                                "dtoverlay=iqaudio-dac,24db_digital_gain"
-+                                (The default behaviour is that the Digital
-+                                volume control is limited to a maximum of
-+                                0dB. ie. it can attenuate but not provide
-+                                gain. For most users, this will be desired
-+                                as it will prevent clipping. By appending
-+                                the 24db_digital_gain parameter, the Digital
-+                                volume control will allow up to 24dB of
-+                                gain. If this parameter is enabled, it is the
-+                                responsibility of the user to ensure that
-+                                the Digital volume control is set to a value
-+                                that does not result in clipping/distortion!)
-+
-+
-+Name:   iqaudio-dacplus
-+Info:   Configures the IQaudio DAC+ audio card
-+Load:   dtoverlay=iqaudio-dacplus,<param>=<val>
-+Params: 24db_digital_gain       Allow gain to be applied via the PCM512x codec
-+                                Digital volume control. Enable with
-+                                "dtoverlay=iqaudio-dacplus,24db_digital_gain"
-+                                (The default behaviour is that the Digital
-+                                volume control is limited to a maximum of
-+                                0dB. ie. it can attenuate but not provide
-+                                gain. For most users, this will be desired
-+                                as it will prevent clipping. By appending
-+                                the 24db_digital_gain parameter, the Digital
-+                                volume control will allow up to 24dB of
-+                                gain. If this parameter is enabled, it is the
-+                                responsibility of the user to ensure that
-+                                the Digital volume control is set to a value
-+                                that does not result in clipping/distortion!)
-+        auto_mute_amp           If specified, unmute/mute the IQaudIO amp when
-+                                starting/stopping audio playback.
-+        unmute_amp              If specified, unmute the IQaudIO amp once when
-+                                the DAC driver module loads.
-+
-+
-+Name:   iqaudio-digi-wm8804-audio
-+Info:   Configures the IQAudIO Digi WM8804 audio card
-+Load:   dtoverlay=iqaudio-digi-wm8804-audio,<param>=<val>
-+Params: card_name               Override the default, "IQAudIODigi", card name.
-+        dai_name                Override the default, "IQAudIO Digi", dai name.
-+        dai_stream_name         Override the default, "IQAudIO Digi HiFi",
-+                                dai stream name.
-+
-+
-+Name:   iqs550
-+Info:   Enables I2C connected Azoteq IQS550 trackpad/touchscreen controller
-+        using GPIO 4 (pin 7 on GPIO header) for interrupt.
-+Load:   dtoverlay=iqs550,<param>=<val>
-+Params: interrupt               GPIO used for interrupt (default 4)
-+        reset                   GPIO used for reset (optional)
-+        sizex                   Touchscreen size x (default 800)
-+        sizey                   Touchscreen size y (default 480)
-+        invx                    Touchscreen inverted x axis
-+        invy                    Touchscreen inverted y axis
-+        swapxy                  Touchscreen swapped x y axis
-+
-+
-+Name:   irs1125
-+Info:   Infineon irs1125 TOF camera module.
-+        Uses Unicam 1, which is the standard camera connector on most Pi
-+        variants.
-+Load:   dtoverlay=irs1125,<param>=<val>
-+Params: media-controller        Configure use of Media Controller API for
-+                                configuring the sensor (default off)
-+        cam0                    Adopt the default configuration for CAM0 on a
-+                                Compute Module (CSI0, i2c_vc, and cam0_reg).
-+
-+
-+Name:   jedec-spi-nor
-+Info:   Adds support for JEDEC-compliant SPI NOR flash devices.  (Note: The
-+        "jedec,spi-nor" kernel driver was formerly known as "m25p80".)
-+Load:   dtoverlay=jedec-spi-nor,<param>=<val>
-+Params: flash-spi<n>-<m>        Enables flash device on SPI<n>, CS#<m>.
-+        flash-fastr-spi<n>-<m>  Enables flash device with fast read capability
-+                                on SPI<n>, CS#<m>.
-+
-+
-+Name:   justboom-both
-+Info:   Simultaneous usage of an justboom-dac and justboom-digi based
-+        card
-+Load:   dtoverlay=justboom-both,<param>=<val>
-+Params: 24db_digital_gain       Allow gain to be applied via the PCM512x codec
-+                                Digital volume control. Enable with
-+                                "dtoverlay=justboom-dac,24db_digital_gain"
-+                                (The default behaviour is that the Digital
-+                                volume control is limited to a maximum of
-+                                0dB. ie. it can attenuate but not provide
-+                                gain. For most users, this will be desired
-+                                as it will prevent clipping. By appending
-+                                the 24dB_digital_gain parameter, the Digital
-+                                volume control will allow up to 24dB of
-+                                gain. If this parameter is enabled, it is the
-+                                responsibility of the user to ensure that
-+                                the Digital volume control is set to a value
-+                                that does not result in clipping/distortion!)
-+
-+
-+Name:   justboom-dac
-+Info:   Configures the JustBoom DAC HAT, Amp HAT, DAC Zero and Amp Zero audio
-+        cards
-+Load:   dtoverlay=justboom-dac,<param>=<val>
-+Params: 24db_digital_gain       Allow gain to be applied via the PCM512x codec
-+                                Digital volume control. Enable with
-+                                "dtoverlay=justboom-dac,24db_digital_gain"
-+                                (The default behaviour is that the Digital
-+                                volume control is limited to a maximum of
-+                                0dB. ie. it can attenuate but not provide
-+                                gain. For most users, this will be desired
-+                                as it will prevent clipping. By appending
-+                                the 24dB_digital_gain parameter, the Digital
-+                                volume control will allow up to 24dB of
-+                                gain. If this parameter is enabled, it is the
-+                                responsibility of the user to ensure that
-+                                the Digital volume control is set to a value
-+                                that does not result in clipping/distortion!)
-+
-+
-+Name:   justboom-digi
-+Info:   Configures the JustBoom Digi HAT and Digi Zero audio cards
-+Load:   dtoverlay=justboom-digi
-+Params: <None>
-+
-+
-+Name:   lirc-rpi
-+Info:   This overlay has been deprecated and removed - see gpio-ir
-+Load:   <Deprecated>
-+
-+
-+Name:   ltc294x
-+Info:   Adds support for the ltc294x family of battery gauges
-+Load:   dtoverlay=ltc294x,<param>=<val>
-+Params: ltc2941                 Select the ltc2941 device
-+
-+        ltc2942                 Select the ltc2942 device
-+
-+        ltc2943                 Select the ltc2943 device
-+
-+        ltc2944                 Select the ltc2944 device
-+
-+        resistor-sense          The sense resistor value in milli-ohms.
-+                                Can be a 32-bit negative value when the battery
-+                                has been connected to the wrong end of the
-+                                resistor.
-+
-+        prescaler-exponent      Range and accuracy of the gauge. The value is
-+                                programmed into the chip only if it differs
-+                                from the current setting.
-+                                For LTC2941 only:
-+                                - Default value is 128
-+                                - the exponent is in the range 0-7 (default 7)
-+                                See the datasheet for more information.
-+
-+
-+Name:   max98357a
-+Info:   Configures the Maxim MAX98357A I2S DAC
-+Load:   dtoverlay=max98357a,<param>=<val>
-+Params: no-sdmode               Driver does not manage the state of the DAC's
-+                                SD_MODE pin (i.e. chip is always on).
-+        sdmode-pin              integer, GPIO pin connected to the SD_MODE input
-+                                of the DAC (default GPIO4 if parameter omitted).
-+
-+
-+Name:   maxtherm
-+Info:   Configure a MAX6675, MAX31855 or MAX31856 thermocouple as an IIO device.
-+
-+        For devices on spi1 or spi2, the interfaces should be enabled
-+        with one of the spi1-1/2/3cs and/or spi2-1/2/3cs overlays.
-+        The overlay expects to disable the relevant spidev node, so also using
-+        e.g. cs0_spidev=off is unnecessary.
-+
-+        Example:
-+        MAX31855 on /dev/spidev0.0
-+            dtoverlay=maxtherm,spi0-0,max31855
-+        MAX31856 using a type J thermocouple on /dev/spidev2.1
-+            dtoverlay=spi2-2cs
-+            dtoverlay=maxtherm,spi2-1,max31856,type_j
-+
-+Load:   dtoverlay=maxtherm,<param>=<val>
-+Params: spi<n>-<m>              Configure device at spi<n>, cs<m>
-+                                (boolean, required)
-+        max6675                 Enable support for the MAX6675 (default)
-+        max31855                Enable support for the MAX31855
-+        max31855e               Enable support for the MAX31855E
-+        max31855j               Enable support for the MAX31855J
-+        max31855k               Enable support for the MAX31855K
-+        max31855n               Enable support for the MAX31855N
-+        max31855r               Enable support for the MAX31855R
-+        max31855s               Enable support for the MAX31855S
-+        max31855t               Enable support for the MAX31855T
-+        max31856                Enable support for the MAX31856 (with type K)
-+        type_b                  Select a type B sensor for max31856
-+        type_e                  Select a type E sensor for max31856
-+        type_j                  Select a type J sensor for max31856
-+        type_k                  Select a type K sensor for max31856
-+        type_n                  Select a type N sensor for max31856
-+        type_r                  Select a type R sensor for max31856
-+        type_s                  Select a type S sensor for max31856
-+        type_t                  Select a type T sensor for max31856
-+
-+
-+Name:   mbed-dac
-+Info:   Configures the mbed AudioCODEC (TLV320AIC23B)
-+Load:   dtoverlay=mbed-dac
-+Params: <None>
-+
-+
-+Name:   mcp23017
-+Info:   Configures the MCP23017 I2C GPIO expander
-+Load:   dtoverlay=mcp23017,<param>=<val>
-+Params: gpiopin                 Gpio pin connected to the INTA output of the
-+                                MCP23017 (default: 4)
-+
-+        addr                    I2C address of the MCP23017 (default: 0x20)
-+
-+        mcp23008                Configure an MCP23008 instead.
-+        noints                  Disable the interrupt GPIO line.
-+
-+
-+Name:   mcp23s17
-+Info:   Configures the MCP23S08/17 SPI GPIO expanders.
-+        If devices are present on SPI1 or SPI2, those interfaces must be enabled
-+        with one of the spi1-1/2/3cs and/or spi2-1/2/3cs overlays.
-+        If interrupts are enabled for a device on a given CS# on a SPI bus, that
-+        device must be the only one present on that SPI bus/CS#.
-+Load:   dtoverlay=mcp23s17,<param>=<val>
-+Params: s08-spi<n>-<m>-present  4-bit integer, bitmap indicating MCP23S08
-+                                devices present on SPI<n>, CS#<m>
-+
-+        s17-spi<n>-<m>-present  8-bit integer, bitmap indicating MCP23S17
-+                                devices present on SPI<n>, CS#<m>
-+
-+        s08-spi<n>-<m>-int-gpio integer, enables interrupts on a single
-+                                MCP23S08 device on SPI<n>, CS#<m>, specifies
-+                                the GPIO pin to which INT output of MCP23S08
-+                                is connected.
-+
-+        s17-spi<n>-<m>-int-gpio integer, enables mirrored interrupts on a
-+                                single MCP23S17 device on SPI<n>, CS#<m>,
-+                                specifies the GPIO pin to which either INTA
-+                                or INTB output of MCP23S17 is connected.
-+
-+
-+Name:   mcp2515
-+Info:   Configures the MCP2515 CAN controller on spi0/1/2
-+        For devices on spi1 or spi2, the interfaces should be enabled
-+        with one of the spi1-1/2/3cs and/or spi2-1/2/3cs overlays.
-+Load:   dtoverlay=mcp2515,<param>=<val>
-+Params: spi<n>-<m>              Configure device at spi<n>, cs<m>
-+                                (boolean, required)
-+
-+        oscillator              Clock frequency for the CAN controller (Hz)
-+
-+        speed                   Maximum SPI frequence (Hz)
-+
-+        interrupt               GPIO for interrupt signal
-+
-+
-+Name:   mcp2515-can0
-+Info:   Configures the MCP2515 CAN controller on spi0.0
-+Load:   dtoverlay=mcp2515-can0,<param>=<val>
-+Params: oscillator              Clock frequency for the CAN controller (Hz)
-+
-+        spimaxfrequency         Maximum SPI frequence (Hz)
-+
-+        interrupt               GPIO for interrupt signal
-+
-+
-+Name:   mcp2515-can1
-+Info:   Configures the MCP2515 CAN controller on spi0.1
-+Load:   dtoverlay=mcp2515-can1,<param>=<val>
-+Params: oscillator              Clock frequency for the CAN controller (Hz)
-+
-+        spimaxfrequency         Maximum SPI frequence (Hz)
-+
-+        interrupt               GPIO for interrupt signal
-+
-+
-+Name:   mcp251xfd
-+Info:   Configures the MCP251XFD CAN controller family
-+        For devices on spi1 or spi2, the interfaces should be enabled
-+        with one of the spi1-1/2/3cs and/or spi2-1/2/3cs overlays.
-+Load:   dtoverlay=mcp251xfd,<param>=<val>
-+Params: spi<n>-<m>              Configure device at spi<n>, cs<m>
-+                                (boolean, required)
-+
-+        oscillator              Clock frequency for the CAN controller (Hz)
-+
-+        speed                   Maximum SPI frequence (Hz)
-+
-+        interrupt               GPIO for interrupt signal
-+
-+        rx_interrupt            GPIO for RX interrupt signal (nINT1) (optional)
-+
-+        xceiver_enable          GPIO for CAN transceiver enable (optional)
-+
-+        xceiver_active_high     specifiy if CAN transceiver enable pin is
-+                                active high (optional, default: active low)
-+
-+
-+Name:   mcp3008
-+Info:   Configures MCP3008 A/D converters
-+        For devices on spi1 or spi2, the interfaces should be enabled
-+        with one of the spi1-1/2/3cs and/or spi2-1/2/3cs overlays.
-+Load:   dtoverlay=mcp3008,<param>[=<val>]
-+Params: spi<n>-<m>-present      boolean, configure device at spi<n>, cs<m>
-+        spi<n>-<m>-speed        integer, set the spi bus speed for this device
-+
-+
-+Name:   mcp3202
-+Info:   Configures MCP3202 A/D converters
-+        For devices on spi1 or spi2, the interfaces should be enabled
-+        with one of the spi1-1/2/3cs and/or spi2-1/2/3cs overlays.
-+Load:   dtoverlay=mcp3202,<param>[=<val>]
-+Params: spi<n>-<m>-present      boolean, configure device at spi<n>, cs<m>
-+        spi<n>-<m>-speed        integer, set the spi bus speed for this device
-+
-+
-+Name:   mcp342x
-+Info:   Overlay for activation of Microchip MCP3421-3428 ADCs over I2C
-+Load:   dtoverlay=mcp342x,<param>=<val>
-+Params: addr                    I2C bus address of device, for devices with
-+                                addresses that are configurable, e.g. by
-+                                hardware links (default=0x68)
-+        mcp3421                 The device is an MCP3421
-+        mcp3422                 The device is an MCP3422
-+        mcp3423                 The device is an MCP3423
-+        mcp3424                 The device is an MCP3424
-+        mcp3425                 The device is an MCP3425
-+        mcp3426                 The device is an MCP3426
-+        mcp3427                 The device is an MCP3427
-+        mcp3428                 The device is an MCP3428
-+
-+
-+Name:   media-center
-+Info:   Media Center HAT - 2.83" Touch Display + extras by Pi Supply
-+Load:   dtoverlay=media-center,<param>=<val>
-+Params: speed                   Display SPI bus speed
-+        rotate                  Display rotation {0,90,180,270}
-+        fps                     Delay between frame updates
-+        xohms                   Touchpanel sensitivity (X-plate resistance)
-+        swapxy                  Swap x and y axis
-+        backlight               Change backlight GPIO pin {e.g. 12, 18}
-+        gpio_out_pin            GPIO for output (default "17")
-+        gpio_in_pin             GPIO for input (default "18")
-+        gpio_in_pull            Pull up/down/off on the input pin
-+                                (default "down")
-+        sense                   Override the IR receive auto-detection logic:
-+                                 "0" = force active-high
-+                                 "1" = force active-low
-+                                 "-1" = use auto-detection
-+                                (default "-1")
-+        softcarrier             Turn the software carrier "on" or "off"
-+                                (default "on")
-+        invert                  "on" = invert the output pin (default "off")
-+        debug                   "on" = enable additional debug messages
-+                                (default "off")
-+
-+
-+Name:   merus-amp
-+Info:   Configures the merus-amp audio card
-+Load:   dtoverlay=merus-amp
-+Params: <None>
-+
-+
-+Name:   midi-uart0
-+Info:   Configures UART0 (ttyAMA0) so that a requested 38.4kbaud actually gets
-+        31.25kbaud, the frequency required for MIDI
-+Load:   dtoverlay=midi-uart0
-+Params: <None>
-+
-+
-+Name:   midi-uart1
-+Info:   Configures UART1 (ttyS0) so that a requested 38.4kbaud actually gets
-+        31.25kbaud, the frequency required for MIDI
-+Load:   dtoverlay=midi-uart1
-+Params: <None>
-+
-+
-+Name:   midi-uart2
-+Info:   Configures UART2 (ttyAMA1) so that a requested 38.4kbaud actually gets
-+        31.25kbaud, the frequency required for MIDI
-+Load:   dtoverlay=midi-uart2
-+Params: <None>
-+
-+
-+Name:   midi-uart3
-+Info:   Configures UART3 (ttyAMA2) so that a requested 38.4kbaud actually gets
-+        31.25kbaud, the frequency required for MIDI
-+Load:   dtoverlay=midi-uart3
-+Params: <None>
-+
-+
-+Name:   midi-uart4
-+Info:   Configures UART4 (ttyAMA3) so that a requested 38.4kbaud actually gets
-+        31.25kbaud, the frequency required for MIDI
-+Load:   dtoverlay=midi-uart4
-+Params: <None>
-+
-+
-+Name:   midi-uart5
-+Info:   Configures UART5 (ttyAMA4) so that a requested 38.4kbaud actually gets
-+        31.25kbaud, the frequency required for MIDI
-+Load:   dtoverlay=midi-uart5
-+Params: <None>
-+
-+
-+Name:   minipitft13
-+Info:   Overlay for AdaFruit Mini Pi 1.3" TFT via SPI using fbtft driver.
-+Load:   dtoverlay=minipitft13,<param>=<val>
-+Params: speed                   SPI bus speed (default 32000000)
-+        rotate                  Display rotation (0, 90, 180 or 270; default 0)
-+        width                   Display width (default 240)
-+        height                  Display height (default 240)
-+        fps                     Delay between frame updates (default 25)
-+        debug                   Debug output level (0-7; default 0)
-+
-+
-+Name:   miniuart-bt
-+Info:   Switch the onboard Bluetooth function on Pi 3B, 3B+, 3A+, 4B and Zero W
-+        to use the mini-UART (ttyS0) and restore UART0/ttyAMA0 over GPIOs 14 &
-+        15. Note that this may reduce the maximum usable baudrate.
-+        N.B. It is also necessary to edit /lib/systemd/system/hciuart.service
-+        and replace ttyAMA0 with ttyS0, unless using Raspbian or another
-+        distribution with udev rules that create /dev/serial0 and /dev/serial1,
-+        in which case use /dev/serial1 instead because it will always be
-+        correct. Furthermore, you must also set core_freq and core_freq_min to
-+        the same value in config.txt or the miniuart will not work.
-+Load:   dtoverlay=miniuart-bt,<param>=<val>
-+Params: krnbt                   Set to "on" to enable autoprobing of Bluetooth
-+                                driver without need of hciattach/btattach
-+
-+
-+Name:   mipi-dbi-spi
-+Info:   Overlay for SPI-connected MIPI DBI displays using the panel-mipi-dbi
-+        driver. The driver will load a file /lib/firmware/panel.bin containing
-+        the initialisation commands.
-+
-+        Example:
-+          dtoverlay=mipi-dbi-spi,spi0-0,speed=70000000
-+          dtparam=width=320,height=240
-+          dtparam=reset-gpio=23,dc-gpio=24
-+          dtparam=backlight-gpio=18
-+
-+        Compared to fbtft panel-mipi-dbi runs pixel data at spi-max-frequency
-+        and init commands at 10MHz. This makes it possible to push the envelope
-+        without messing up the controller configuration due to command
-+        transmission errors.
-+
-+        For devices on spi1 or spi2, the interfaces should be enabled
-+        with one of the spi1-1/2/3cs and/or spi2-1/2/3cs overlays.
-+
-+        See https://github.com/notro/panel-mipi-dbi/wiki for more info.
-+
-+Load:   dtoverlay=mipi-dbi-spi,<param>=<val>
-+Params:
-+        compatible              Set the compatible string to load a different
-+                                firmware file. Both the panel compatible value
-+                                used to load the firmware file and the value
-+                                used to load the driver has to be set having a
-+                                NUL (\0) separator between them.
-+                                Example:
-+                                dtparam=compatible=mypanel\0panel-mipi-dbi-spi
-+        spi<n>-<m>              Configure device at spi<n>, cs<m>
-+                                (boolean, required)
-+        speed                   SPI bus speed in Hz (default 32000000)
-+        cpha                    Shifted SPI clock phase (CPHA) mode
-+        cpol                    Inverse SPI clock polarity (CPOL) mode
-+        write-only              Controller is not readable
-+                                (ie. MISO is not wired up).
-+
-+        width                   Panel width in pixels (required)
-+        height                  Panel height in pixels (required)
-+        width-mm                Panel width in mm
-+        height-mm               Panel height in mm
-+        x-offset                Panel x-offset in controller RAM
-+        y-offset                Panel y-offset in controller RAM
-+
-+        clock-frequency         Panel clock frequency in Hz
-+                                (optional, just informational).
-+
-+        reset-gpio              GPIO pin to be used for RESET
-+        dc-gpio                 GPIO pin to be used for D/C
-+
-+        backlight-gpio          GPIO pin to be used for backlight control
-+                                (default of none).
-+        backlight-pwm           PWM channel to be used for backlight control
-+                                (default of none). NB Disables audio headphone
-+                                output as that also uses PWM.
-+        backlight-pwm-chan      Choose channel on &pwm node for backlight
-+                                control (default 0).
-+        backlight-pwm-gpio      GPIO pin to be used for the PWM backlight. See
-+                                pwm-2chan for valid options (default 18).
-+        backlight-pwm-func      Pin function of GPIO used for the PWM backlight.
-+                                See pwm-2chan for valid options (default 2).
-+        backlight-def-brightness
-+                                Set the default brightness. Normal range 1-16.
-+                                (default 16).
-+
-+
-+Name:   mlx90640
-+Info:   Overlay for i2c connected mlx90640 thermal camera
-+Load:   dtoverlay=mlx90640
-+Params: <None>
-+
-+
-+Name:   mmc
-+Info:   Selects the bcm2835-mmc SD/MMC driver, optionally with overclock
-+Load:   dtoverlay=mmc,<param>=<val>
-+Params: overclock_50            Clock (in MHz) to use when the MMC framework
-+                                requests 50MHz
-+
-+
-+Name:   mpu6050
-+Info:   Overlay for i2c connected mpu6050 imu
-+Load:   dtoverlay=mpu6050,<param>=<val>
-+Params: interrupt               GPIO pin for interrupt (default 4)
-+        addr                    I2C address of the device (default 0x68)
-+
-+
-+Name:   mz61581
-+Info:   MZ61581 display by Tontec
-+Load:   dtoverlay=mz61581,<param>=<val>
-+Params: speed                   Display SPI bus speed
-+
-+        rotate                  Display rotation {0,90,180,270}
-+
-+        fps                     Delay between frame updates
-+
-+        txbuflen                Transmit buffer length (default 32768)
-+
-+        debug                   Debug output level {0-7}
-+
-+        xohms                   Touchpanel sensitivity (X-plate resistance)
-+
-+
-+Name:   ov2311
-+Info:   Omnivision OV2311 camera module.
-+        Uses Unicam 1, which is the standard camera connector on most Pi
-+        variants.
-+Load:   dtoverlay=ov2311,<param>=<val>
-+Params: rotation                Mounting rotation of the camera sensor (0 or
-+                                180, default 0)
-+        orientation             Sensor orientation (0 = front, 1 = rear,
-+                                2 = external, default external)
-+        media-controller        Configure use of Media Controller API for
-+                                configuring the sensor (default on)
-+        cam0                    Adopt the default configuration for CAM0 on a
-+                                Compute Module (CSI0, i2c_vc, and cam0_reg).
-+
-+
-+Name:   ov5647
-+Info:   Omnivision OV5647 camera module.
-+        Uses Unicam 1, which is the standard camera connector on most Pi
-+        variants.
-+Load:   dtoverlay=ov5647,<param>=<val>
-+Params: rotation                Mounting rotation of the camera sensor (0 or
-+                                180, default 0)
-+        orientation             Sensor orientation (0 = front, 1 = rear,
-+                                2 = external, default external)
-+        media-controller        Configure use of Media Controller API for
-+                                configuring the sensor (default on)
-+        cam0                    Adopt the default configuration for CAM0 on a
-+                                Compute Module (CSI0, i2c_vc, and cam0_reg).
-+        vcm                     Configure a VCM focus drive on the sensor.
-+
-+
-+Name:   ov7251
-+Info:   Omnivision OV7251 camera module.
-+        Uses Unicam 1, which is the standard camera connector on most Pi
-+        variants.
-+Load:   dtoverlay=ov7251,<param>=<val>
-+Params: rotation                Mounting rotation of the camera sensor (0 or
-+                                180, default 0)
-+        orientation             Sensor orientation (0 = front, 1 = rear,
-+                                2 = external, default external)
-+        media-controller        Configure use of Media Controller API for
-+                                configuring the sensor (default off)
-+        cam0                    Adopt the default configuration for CAM0 on a
-+                                Compute Module (CSI0, i2c_vc, and cam0_reg).
-+
-+
-+Name:   ov9281
-+Info:   Omnivision OV9281 camera module.
-+        Uses Unicam 1, which is the standard camera connector on most Pi
-+        variants.
-+Load:   dtoverlay=ov9281,<param>=<val>
-+Params: rotation                Mounting rotation of the camera sensor (0 or
-+                                180, default 0)
-+        orientation             Sensor orientation (0 = front, 1 = rear,
-+                                2 = external, default external)
-+        media-controller        Configure use of Media Controller API for
-+                                configuring the sensor (default on)
-+        cam0                    Adopt the default configuration for CAM0 on a
-+                                Compute Module (CSI0, i2c_vc, and cam0_reg).
-+
-+
-+Name:   papirus
-+Info:   PaPiRus ePaper Screen by Pi Supply (both HAT and pHAT)
-+Load:   dtoverlay=papirus,<param>=<val>
-+Params: panel                   Display panel (required):
-+                                1.44": e1144cs021
-+                                2.0":  e2200cs021
-+                                2.7":  e2271cs021
-+
-+        speed                   Display SPI bus speed
-+
-+
-+Name:   pca953x
-+Info:   TI PCA953x family of I2C GPIO expanders. Default is for NXP PCA9534.
-+Load:   dtoverlay=pca953x,<param>=<val>
-+Params: addr                    I2C address of expander. Default 0x20.
-+        pca6416                 Select the NXP PCA6416 (16 bit)
-+        pca9505                 Select the NXP PCA9505 (40 bit)
-+        pca9535                 Select the NXP PCA9535 (16 bit)
-+        pca9536                 Select the NXP PCA9536 or TI PCA9536 (4 bit)
-+        pca9537                 Select the NXP PCA9537 (4 bit)
-+        pca9538                 Select the NXP PCA9538 (8 bit)
-+        pca9539                 Select the NXP PCA9539 (16 bit)
-+        pca9554                 Select the NXP PCA9554 (8 bit)
-+        pca9555                 Select the NXP PCA9555 (16 bit)
-+        pca9556                 Select the NXP PCA9556 (8 bit)
-+        pca9557                 Select the NXP PCA9557 (8 bit)
-+        pca9574                 Select the NXP PCA9574 (8 bit)
-+        pca9575                 Select the NXP PCA9575 (16 bit)
-+        pca9698                 Select the NXP PCA9698 (40 bit)
-+        pca16416                Select the NXP PCA16416 (16 bit)
-+        pca16524                Select the NXP PCA16524 (24 bit)
-+        pca19555a               Select the NXP PCA19555A (16 bit)
-+        max7310                 Select the Maxim MAX7310 (8 bit)
-+        max7312                 Select the Maxim MAX7312 (16 bit)
-+        max7313                 Select the Maxim MAX7313 (16 bit)
-+        max7315                 Select the Maxim MAX7315 (8 bit)
-+        pca6107                 Select the TI PCA6107 (8 bit)
-+        tca6408                 Select the TI TCA6408 (8 bit)
-+        tca6416                 Select the TI TCA6416 (16 bit)
-+        tca6424                 Select the TI TCA6424 (24 bit)
-+        tca9539                 Select the TI TCA9539 (16 bit)
-+        tca9554                 Select the TI TCA9554 (8 bit)
-+        cat9554                 Select the Onnn CAT9554 (8 bit)
-+        pca9654                 Select the Onnn PCA9654 (8 bit)
-+        xra1202                 Select the Exar XRA1202 (8 bit)
-+
-+
-+Name:   pcie-32bit-dma
-+Info:   Force PCIe config to support 32bit DMA addresses at the expense of
-+        having to bounce buffers.
-+Load:   dtoverlay=pcie-32bit-dma
-+Params: <None>
-+
-+
-+[ The pcf2127-rtc overlay has been deleted. See i2c-rtc. ]
-+
-+
-+[ The pcf8523-rtc overlay has been deleted. See i2c-rtc. ]
-+
-+
-+[ The pcf8563-rtc overlay has been deleted. See i2c-rtc. ]
-+
-+
-+Name:   pi3-act-led
-+Info:   This overlay has been renamed act-led, keeping pi3-act-led as an alias
-+        for backwards compatibility.
-+Load:   <Deprecated>
-+
-+
-+Name:   pi3-disable-bt
-+Info:   This overlay has been renamed disable-bt, keeping pi3-disable-bt as an
-+        alias for backwards compatibility.
-+Load:   <Deprecated>
-+
-+
-+Name:   pi3-disable-wifi
-+Info:   This overlay has been renamed disable-wifi, keeping pi3-disable-wifi as
-+        an alias for backwards compatibility.
-+Load:   <Deprecated>
-+
-+
-+Name:   pi3-miniuart-bt
-+Info:   This overlay has been renamed miniuart-bt, keeping pi3-miniuart-bt as
-+        an alias for backwards compatibility.
-+Load:   <Deprecated>
-+
-+
-+Name:   pibell
-+Info:   Configures the pibell audio card.
-+Load:   dtoverlay=pibell,<param>=<val>
-+Params: alsaname                Set the name as it appears in ALSA (default
-+                                "PiBell")
-+
-+
-+Name:   pifacedigital
-+Info:   Configures the PiFace Digital mcp23s17 GPIO port expander.
-+Load:   dtoverlay=pifacedigital,<param>=<val>
-+Params: spi-present-mask        8-bit integer, bitmap indicating MCP23S17 SPI0
-+                                CS0 address. PiFace Digital supports addresses
-+                                0-3, which can be configured with JP1 and JP2.
-+
-+
-+Name:   pifi-40
-+Info:   Configures the PiFi 40W stereo amplifier
-+Load:   dtoverlay=pifi-40
-+Params: <None>
-+
-+
-+Name:   pifi-dac-hd
-+Info:   Configures the PiFi DAC HD
-+Load:   dtoverlay=pifi-dac-hd
-+Params: <None>
-+
-+
-+Name:   pifi-dac-zero
-+Info:   Configures the PiFi DAC Zero
-+Load:   dtoverlay=pifi-dac-zero
-+Params: <None>
-+
-+
-+Name:   pifi-mini-210
-+Info:   Configures the PiFi Mini stereo amplifier
-+Load:   dtoverlay=pifi-mini-210
-+Params: <None>
-+
-+
-+Name:   piglow
-+Info:   Configures the PiGlow by pimoroni.com
-+Load:   dtoverlay=piglow
-+Params: <None>
-+
-+
-+Name:   piscreen
-+Info:   PiScreen display by OzzMaker.com
-+Load:   dtoverlay=piscreen,<param>=<val>
-+Params: speed                   Display SPI bus speed
-+
-+        rotate                  Display rotation {0,90,180,270}
-+
-+        fps                     Delay between frame updates
-+
-+        debug                   Debug output level {0-7}
-+
-+        xohms                   Touchpanel sensitivity (X-plate resistance)
-+
-+
-+Name:   piscreen2r
-+Info:   PiScreen 2 with resistive TP display by OzzMaker.com
-+Load:   dtoverlay=piscreen2r,<param>=<val>
-+Params: speed                   Display SPI bus speed
-+
-+        rotate                  Display rotation {0,90,180,270}
-+
-+        fps                     Delay between frame updates
-+
-+        debug                   Debug output level {0-7}
-+
-+        xohms                   Touchpanel sensitivity (X-plate resistance)
-+
-+
-+Name:   pisound
-+Info:   Configures the Blokas Labs pisound card
-+Load:   dtoverlay=pisound
-+Params: <None>
-+
-+
-+Name:   pitft22
-+Info:   Adafruit PiTFT 2.2" screen
-+Load:   dtoverlay=pitft22,<param>=<val>
-+Params: speed                   Display SPI bus speed
-+
-+        rotate                  Display rotation {0,90,180,270}
-+
-+        fps                     Delay between frame updates
-+
-+        debug                   Debug output level {0-7}
-+
-+
-+Name:   pitft28-capacitive
-+Info:   Adafruit PiTFT 2.8" capacitive touch screen
-+Load:   dtoverlay=pitft28-capacitive,<param>=<val>
-+Params: speed                   Display SPI bus speed
-+
-+        rotate                  Display rotation {0,90,180,270}
-+
-+        fps                     Delay between frame updates
-+
-+        debug                   Debug output level {0-7}
-+
-+        touch-sizex             Touchscreen size x (default 240)
-+
-+        touch-sizey             Touchscreen size y (default 320)
-+
-+        touch-invx              Touchscreen inverted x axis
-+
-+        touch-invy              Touchscreen inverted y axis
-+
-+        touch-swapxy            Touchscreen swapped x y axis
-+
-+
-+Name:   pitft28-resistive
-+Info:   Adafruit PiTFT 2.8" resistive touch screen
-+Load:   dtoverlay=pitft28-resistive,<param>=<val>
-+Params: speed                   Display SPI bus speed
-+
-+        rotate                  Display rotation {0,90,180,270}
-+
-+        fps                     Delay between frame updates
-+
-+        debug                   Debug output level {0-7}
-+
-+        drm                     Force the use of the mi0283qt DRM driver (by
-+                                default the ili9340 framebuffer driver will
-+                                be used in preference if available)
-+
-+
-+Name:   pitft35-resistive
-+Info:   Adafruit PiTFT 3.5" resistive touch screen
-+Load:   dtoverlay=pitft35-resistive,<param>=<val>
-+Params: speed                   Display SPI bus speed
-+
-+        rotate                  Display rotation {0,90,180,270}
-+
-+        fps                     Delay between frame updates
-+
-+        debug                   Debug output level {0-7}
-+
-+        drm                     Force the use of the hx8357d DRM driver (by
-+                                default the fb_hx8357d framebuffer driver will
-+                                be used in preference if available)
-+
-+
-+Name:   pps-gpio
-+Info:   Configures the pps-gpio (pulse-per-second time signal via GPIO).
-+Load:   dtoverlay=pps-gpio,<param>=<val>
-+Params: gpiopin                 Input GPIO (default "18")
-+        assert_falling_edge     When present, assert is indicated by a falling
-+                                edge, rather than by a rising edge (default
-+                                off)
-+        capture_clear           Generate clear events on the trailing edge
-+                                (default off)
-+        pull                    Desired pull-up/down state (off, down, up)
-+                                Default is "off".
-+
-+
-+Name:   proto-codec
-+Info:   Configures the PROTO Audio Codec card
-+Load:   dtoverlay=proto-codec
-+Params: <None>
-+
-+
-+Name:   pwm
-+Info:   Configures a single PWM channel
-+        Legal pin,function combinations for each channel:
-+          PWM0: 12,4(Alt0) 18,2(Alt5) 40,4(Alt0)            52,5(Alt1)
-+          PWM1: 13,4(Alt0) 19,2(Alt5) 41,4(Alt0) 45,4(Alt0) 53,5(Alt1)
-+        N.B.:
-+          1) Pin 18 is the only one available on all platforms, and
-+             it is the one used by the I2S audio interface.
-+             Pins 12 and 13 might be better choices on an A+, B+ or Pi2.
-+          2) The onboard analogue audio output uses both PWM channels.
-+          3) So be careful mixing audio and PWM.
-+          4) Currently the clock must have been enabled and configured
-+             by other means.
-+Load:   dtoverlay=pwm,<param>=<val>
-+Params: pin                     Output pin (default 18) - see table
-+        func                    Pin function (default 2 = Alt5) - see above
-+        clock                   PWM clock frequency (informational)
-+
-+
-+Name:   pwm-2chan
-+Info:   Configures both PWM channels
-+        Legal pin,function combinations for each channel:
-+          PWM0: 12,4(Alt0) 18,2(Alt5) 40,4(Alt0)            52,5(Alt1)
-+          PWM1: 13,4(Alt0) 19,2(Alt5) 41,4(Alt0) 45,4(Alt0) 53,5(Alt1)
-+        N.B.:
-+          1) Pin 18 is the only one available on all platforms, and
-+             it is the one used by the I2S audio interface.
-+             Pins 12 and 13 might be better choices on an A+, B+ or Pi2.
-+          2) The onboard analogue audio output uses both PWM channels.
-+          3) So be careful mixing audio and PWM.
-+          4) Currently the clock must have been enabled and configured
-+             by other means.
-+Load:   dtoverlay=pwm-2chan,<param>=<val>
-+Params: pin                     Output pin (default 18) - see table
-+        pin2                    Output pin for other channel (default 19)
-+        func                    Pin function (default 2 = Alt5) - see above
-+        func2                   Function for pin2 (default 2 = Alt5)
-+        clock                   PWM clock frequency (informational)
-+
-+
-+Name:   pwm-ir-tx
-+Info:   Use GPIO pin as pwm-assisted infrared transmitter output.
-+        This is an alternative to "gpio-ir-tx". pwm-ir-tx makes use
-+        of PWM0 to reduce the CPU load during transmission compared to
-+        gpio-ir-tx which uses bit-banging.
-+        Legal pin,function combinations are:
-+          12,4(Alt0) 18,2(Alt5) 40,4(Alt0) 52,5(Alt1)
-+Load:   dtoverlay=pwm-ir-tx,<param>=<val>
-+Params: gpio_pin                Output GPIO (default 18)
-+
-+        func                    Pin function (default 2 = Alt5)
-+
-+
-+Name:   qca7000
-+Info:   in-tech's Evaluation Board for PLC Stamp micro
-+        This uses spi0 and a separate GPIO interrupt to connect the QCA7000.
-+Load:   dtoverlay=qca7000,<param>=<val>
-+Params: int_pin                 GPIO pin for interrupt signal (default 23)
-+
-+        speed                   SPI bus speed (default 12 MHz)
-+
-+
-+Name:   qca7000-uart0
-+Info:   in-tech's Evaluation Board for PLC Stamp micro (UART)
-+        This uses uart0/ttyAMA0 over GPIOs 14 & 15 to connect the QCA7000.
-+        But it requires disabling of onboard Bluetooth on
-+        Pi 3B, 3B+, 3A+, 4B and Zero W.
-+Load:   dtoverlay=qca7000-uart0,<param>=<val>
-+Params: baudrate                Set the baudrate for the UART (default
-+                                "115200")
-+
-+
-+Name:   ramoops
-+Info:   Enable the preservation of crash logs across a reboot. With
-+        systemd-pstore enabled (as it is on Raspberry Pi OS) the crash logs
-+        are moved to /var/lib/systemd/pstore/ on reboot.
-+Load:   dtoverlay=ramoops,<param>=<val>
-+Params: base-addr               Where to place the capture buffer (default
-+                                0x0b000000)
-+        total-size              How much memory to allocate altogether (in
-+                                bytes - default 64kB)
-+        record-size             How much space to use for each capture, i.e.
-+                                total-size / record-size = number of captures
-+                                (default 16kB)
-+        console-size            Size of non-panic dmesg captures (default 0)
-+
-+
-+Name:   ramoops-pi4
-+Info:   The version of the ramoops overlay for the Pi 4 family. It should be
-+        loaded automatically if dtoverlay=ramoops is specified on a Pi 4.
-+Load:   dtoverlay=ramoops-pi4,<param>=<val>
-+Params: base-addr               Where to place the capture buffer (default
-+                                0x0b000000)
-+        total-size              How much memory to allocate altogether (in
-+                                bytes - default 64kB)
-+        record-size             How much space to use for each capture, i.e.
-+                                total-size / record-size = number of captures
-+                                (default 16kB)
-+        console-size            Size of non-panic dmesg captures (default 0)
-+
-+
-+Name:   rotary-encoder
-+Info:   Overlay for GPIO connected rotary encoder.
-+Load:   dtoverlay=rotary-encoder,<param>=<val>
-+Params: pin_a                   GPIO connected to rotary encoder channel A
-+                                (default 4).
-+        pin_b                   GPIO connected to rotary encoder channel B
-+                                (default 17).
-+        relative_axis           register a relative axis rather than an
-+                                absolute one. Relative axis will only
-+                                generate +1/-1 events on the input device,
-+                                hence no steps need to be passed.
-+        linux_axis              the input subsystem axis to map to this
-+                                rotary encoder. Defaults to 0 (ABS_X / REL_X)
-+        rollover                Automatic rollover when the rotary value
-+                                becomes greater than the specified steps or
-+                                smaller than 0. For absolute axis only.
-+        steps-per-period        Number of steps (stable states) per period.
-+                                The values have the following meaning:
-+                                1: Full-period mode (default)
-+                                2: Half-period mode
-+                                4: Quarter-period mode
-+        steps                   Number of steps in a full turnaround of the
-+                                encoder. Only relevant for absolute axis.
-+                                Defaults to 24 which is a typical value for
-+                                such devices.
-+        wakeup                  Boolean, rotary encoder can wake up the
-+                                system.
-+        encoding                String, the method used to encode steps.
-+                                Supported are "gray" (the default and more
-+                                common) and "binary".
-+
-+
-+Name:   rpi-backlight
-+Info:   Raspberry Pi official display backlight driver
-+Load:   dtoverlay=rpi-backlight
-+Params: <None>
-+
-+
-+Name:   rpi-cirrus-wm5102
-+Info:   This overlay has been renamed to cirrus-wm5102
-+Load:   <Deprecated>
-+
-+
-+Name:   rpi-codeczero
-+Info:   Configures the Raspberry Pi Codec Zero sound card
-+Load:   dtoverlay=rpi-codeczero
-+Params: <None>
-+
-+
-+Name:   rpi-dac
-+Info:   This overlay has been renaamed to i2s-dac.
-+Load:   <Deprecated>
-+
-+
-+Name:   rpi-dacplus
-+Info:   Configures the Raspberry Pi DAC+ card
-+Load:   dtoverlay=rpi-dacplus,<param>=<val>
-+Params: 24db_digital_gain       Allow gain to be applied via the PCM512x codec
-+                                digital volume control. Enable by adding
-+                                "dtparam=24db_digital_gain" to config.txt
-+                                before any "dtoverlay" lines.
-+                                The default behaviour is that the digital
-+                                volume control is limited to a maximum of
-+                                0dB. ie. it can attenuate but not provide
-+                                gain. For most users, this will be desired
-+                                as it will prevent clipping. By appending
-+                                the 24db_digital_gain parameter, the digital
-+                                volume control will allow up to 24dB of
-+                                gain. If this parameter is enabled, it is the
-+                                responsibility of the user to ensure that
-+                                the digital volume control is set to a value
-+                                that does not result in clipping/distortion!
-+
-+
-+Name:   rpi-dacpro
-+Info:   Configures the Raspberry Pi DAC Pro sound card
-+Load:   dtoverlay=rpi-dacpro,<param>=<val>
-+Params: 24db_digital_gain       Allow gain to be applied via the PCM512x codec
-+                                digital volume control. Enable by adding
-+                                "dtparam=24db_digital_gain" to config.txt
-+                                before any "dtoverlay" lines.
-+                                The default behaviour is that the digital
-+                                volume control is limited to a maximum of
-+                                0dB. ie. it can attenuate but not provide
-+                                gain. For most users, this will be desired
-+                                as it will prevent clipping. By appending
-+                                the 24db_digital_gain parameter, the digital
-+                                volume control will allow up to 24dB of
-+                                gain. If this parameter is enabled, it is the
-+                                responsibility of the user to ensure that
-+                                the digital volume control is set to a value
-+                                that does not result in clipping/distortion!
-+
-+
-+Name:   rpi-digiampplus
-+Info:   Configures the Raspberry Pi DigiAMP+ sound card
-+Load:   dtoverlay=rpi-digiampplus,<param>=<val>
-+Params: 24db_digital_gain       Allow gain to be applied via the PCM512x codec
-+                                digital volume control. Enable by adding
-+                                "dtparam=24db_digital_gain" to config.txt
-+                                before any "dtoverlay" lines.
-+                                The default behaviour is that the digital
-+                                volume control is limited to a maximum of
-+                                0dB. ie. it can attenuate but not provide
-+                                gain. For most users, this will be desired
-+                                as it will prevent clipping. By appending
-+                                the 24db_digital_gain parameter, the digital
-+                                volume control will allow up to 24dB of
-+                                gain. If this parameter is enabled, it is the
-+                                responsibility of the user to ensure that
-+                                the digital volume control is set to a value
-+                                that does not result in clipping/distortion!
-+        auto_mute_amp           If specified, unmute/mute the DigiAMP+ when
-+                                starting/stopping audio playback (default "on").
-+        unmute_amp              If specified, unmute the DigiAMP+ amp once when
-+                                the DAC driver module loads (default "off").
-+
-+
-+Name:   rpi-display
-+Info:   This overlay has been renamed to watterott-display
-+Load:   <Deprecated>
-+
-+
-+Name:   rpi-ft5406
-+Info:   Official Raspberry Pi display touchscreen
-+Load:   dtoverlay=rpi-ft5406,<param>=<val>
-+Params: touchscreen-size-x      Touchscreen X resolution (default 800)
-+        touchscreen-size-y      Touchscreen Y resolution (default 600);
-+        touchscreen-inverted-x  Invert touchscreen X coordinates (default 0);
-+        touchscreen-inverted-y  Invert touchscreen Y coordinates (default 0);
-+        touchscreen-swapped-x-y Swap X and Y cordinates (default 0);
-+
-+
-+Name:   rpi-poe
-+Info:   Raspberry Pi PoE HAT fan
-+Load:   dtoverlay=rpi-poe,<param>[=<val>]
-+Params: poe_fan_temp0           Temperature (in millicelcius) at which the fan
-+                                turns on (default 40000)
-+        poe_fan_temp0_hyst      Temperature delta (in millicelcius) at which
-+                                the fan turns off (default 2000)
-+        poe_fan_temp1           Temperature (in millicelcius) at which the fan
-+                                speeds up (default 45000)
-+        poe_fan_temp1_hyst      Temperature delta (in millicelcius) at which
-+                                the fan slows down (default 2000)
-+        poe_fan_temp2           Temperature (in millicelcius) at which the fan
-+                                speeds up (default 50000)
-+        poe_fan_temp2_hyst      Temperature delta (in millicelcius) at which
-+                                the fan slows down (default 2000)
-+        poe_fan_temp3           Temperature (in millicelcius) at which the fan
-+                                speeds up (default 55000)
-+        poe_fan_temp3_hyst      Temperature delta (in millicelcius) at which
-+                                the fan slows down (default 5000)
-+        i2c                     Control the fan via Linux I2C drivers instead of
-+                                the firmware.
-+
-+
-+Name:   rpi-poe-plus
-+Info:   Raspberry Pi PoE+ HAT fan
-+Load:   dtoverlay=rpi-poe-plus,<param>[=<val>]
-+Params: poe_fan_temp0           Temperature (in millicelcius) at which the fan
-+                                turns on (default 40000)
-+        poe_fan_temp0_hyst      Temperature delta (in millicelcius) at which
-+                                the fan turns off (default 2000)
-+        poe_fan_temp1           Temperature (in millicelcius) at which the fan
-+                                speeds up (default 45000)
-+        poe_fan_temp1_hyst      Temperature delta (in millicelcius) at which
-+                                the fan slows down (default 2000)
-+        poe_fan_temp2           Temperature (in millicelcius) at which the fan
-+                                speeds up (default 50000)
-+        poe_fan_temp2_hyst      Temperature delta (in millicelcius) at which
-+                                the fan slows down (default 2000)
-+        poe_fan_temp3           Temperature (in millicelcius) at which the fan
-+                                speeds up (default 55000)
-+        poe_fan_temp3_hyst      Temperature delta (in millicelcius) at which
-+                                the fan slows down (default 5000)
-+        i2c                     Control the fan via Linux I2C drivers instead of
-+                                the firmware.
-+
-+
-+Name:   rpi-proto
-+Info:   This overlay has been renamaed to proto-codec.
-+Load:   <Deprecated>
-+
-+
-+Name:   rpi-sense
-+Info:   Raspberry Pi Sense HAT
-+Load:   dtoverlay=rpi-sense
-+Params: <None>
-+
-+
-+Name:   rpi-sense-v2
-+Info:   Raspberry Pi Sense HAT v2
-+Load:   dtoverlay=rpi-sense-v2
-+Params: <None>
-+
-+
-+Name:   rpi-tv
-+Info:   Raspberry Pi TV HAT
-+Load:   dtoverlay=rpi-tv
-+Params: <None>
-+
-+
-+Name:   rpivid-v4l2
-+Info:   This overlay has been deprecated and deleted as the V4L2 stateless
-+        video decoder driver is enabled by default.
-+Load:   <Deprecated>
-+
-+
-+Name:   rra-digidac1-wm8741-audio
-+Info:   Configures the Red Rocks Audio DigiDAC1 soundcard
-+Load:   dtoverlay=rra-digidac1-wm8741-audio
-+Params: <None>
-+
-+
-+Name:   sainsmart18
-+Info:   Overlay for the SPI-connected Sainsmart 1.8" display (based on the
-+        ST7735R chip).
-+Load:   dtoverlay=sainsmart18,<param>=<val>
-+Params: rotate                  Display rotation {0,90,180,270}
-+        speed                   SPI bus speed in Hz (default 4000000)
-+        fps                     Display frame rate in Hz
-+        bgr                     Enable BGR mode (default off)
-+        debug                   Debug output level {0-7}
-+        dc_pin                  GPIO pin for D/C (default 24)
-+        reset_pin               GPIO pin for RESET (default 25)
-+
-+
-+Name:   sc16is750-i2c
-+Info:   Overlay for the NXP SC16IS750 UART with I2C Interface
-+        Enables the chip on I2C1 at 0x48 (or the "addr" parameter value). To
-+        select another address, please refer to table 10 in reference manual.
-+Load:   dtoverlay=sc16is750-i2c,<param>=<val>
-+Params: int_pin                 GPIO used for IRQ (default 24)
-+        addr                    Address (default 0x48)
-+        xtal                    On-board crystal frequency (default 14745600)
-+
-+
-+Name:   sc16is752-i2c
-+Info:   Overlay for the NXP SC16IS752 dual UART with I2C Interface
-+        Enables the chip on I2C1 at 0x48 (or the "addr" parameter value). To
-+        select another address, please refer to table 10 in reference manual.
-+Load:   dtoverlay=sc16is752-i2c,<param>=<val>
-+Params: int_pin                 GPIO used for IRQ (default 24)
-+        addr                    Address (default 0x48)
-+        xtal                    On-board crystal frequency (default 14745600)
-+
-+
-+Name:   sc16is752-spi0
-+Info:   Overlay for the NXP SC16IS752 Dual UART with SPI Interface
-+        Enables the chip on SPI0.
-+Load:   dtoverlay=sc16is752-spi0,<param>=<val>
-+Params: int_pin                 GPIO used for IRQ (default 24)
-+        xtal                    On-board crystal frequency (default 14745600)
-+
-+
-+Name:   sc16is752-spi1
-+Info:   Overlay for the NXP SC16IS752 Dual UART with SPI Interface
-+        Enables the chip on SPI1.
-+        N.B.: spi1 is only accessible on devices with a 40pin header, eg:
-+              A+, B+, Zero and PI2 B; as well as the Compute Module.
-+
-+Load:   dtoverlay=sc16is752-spi1,<param>=<val>
-+Params: int_pin                 GPIO used for IRQ (default 24)
-+        xtal                    On-board crystal frequency (default 14745600)
-+
-+
-+Name:   sdhost
-+Info:   Selects the bcm2835-sdhost SD/MMC driver, optionally with overclock.
-+        N.B. This overlay is designed for situations where the mmc driver is
-+        the default, so it disables the other (mmc) interface - this will kill
-+        WLAN on a Pi3. If this isn't what you want, either use the sdtweak
-+        overlay or the new sd_* dtparams of the base DTBs.
-+Load:   dtoverlay=sdhost,<param>=<val>
-+Params: overclock_50            Clock (in MHz) to use when the MMC framework
-+                                requests 50MHz
-+
-+        force_pio               Disable DMA support (default off)
-+
-+        pio_limit               Number of blocks above which to use DMA
-+                                (default 1)
-+
-+        debug                   Enable debug output (default off)
-+
-+
-+Name:   sdio
-+Info:   Selects the bcm2835-sdhost SD/MMC driver, optionally with overclock,
-+        and enables SDIO via GPIOs 22-27. An example of use in 1-bit mode is
-+        "dtoverlay=sdio,bus_width=1,gpios_22_25"
-+Load:   dtoverlay=sdio,<param>=<val>
-+Params: sdio_overclock          SDIO Clock (in MHz) to use when the MMC
-+                                framework requests 50MHz
-+
-+        poll_once               Disable SDIO-device polling every second
-+                                (default on: polling once at boot-time)
-+
-+        bus_width               Set the SDIO host bus width (default 4 bits)
-+
-+        gpios_22_25             Select GPIOs 22-25 for 1-bit mode. Must be used
-+                                with bus_width=1. This replaces the sdio-1bit
-+                                overlay, which is now deprecated.
-+
-+        gpios_34_37             Select GPIOs 34-37 for 1-bit mode. Must be used
-+                                with bus_width=1.
-+
-+        gpios_34_39             Select GPIOs 34-39 for 4-bit mode. Must be used
-+                                with bus_width=4 (the default).
-+
-+
-+Name:   sdio-1bit
-+Info:   This overlay is now deprecated. Use
-+        "dtoverlay=sdio,bus_width=1,gpios_22_25" instead.
-+Load:   <Deprecated>
-+
-+
-+Name:   sdtweak
-+Info:   This overlay is now deprecated. Use the sd_* dtparams in the
-+        base DTB, e.g. "dtoverlay=sdtweak,poll_once" becomes
-+        "dtparam=sd_poll_once".
-+Load:   <Deprecated>
-+
-+
-+Name:   seeed-can-fd-hat-v1
-+Info:   Overlay for Seeed Studio CAN BUS FD HAT with two CAN FD
-+        channels without RTC. Use this overlay if your HAT has no
-+        battery holder.
-+        https://www.seeedstudio.com/2-Channel-CAN-BUS-FD-Shield-for-Raspberry-Pi-p-4072.html
-+Load:   dtoverlay=seeed-can-fd-hat-v1
-+Params: <None>
-+
-+
-+Name:   seeed-can-fd-hat-v2
-+Info:   Overlay for Seeed Studio CAN BUS FD HAT with two CAN FD
-+        channels and an RTC. Use this overlay if your HAT has a
-+        battery holder.
-+        https://www.seeedstudio.com/CAN-BUS-FD-HAT-for-Raspberry-Pi-p-4742.html
-+Load:   dtoverlay=seeed-can-fd-hat-v2
-+Params: <None>
-+
-+
-+Name:   sh1106-spi
-+Info:   Overlay for SH1106 OLED via SPI using fbtft staging driver.
-+Load:   dtoverlay=sh1106-spi,<param>=<val>
-+Params: speed                   SPI bus speed (default 4000000)
-+        rotate                  Display rotation (0, 90, 180 or 270; default 0)
-+        fps                     Delay between frame updates (default 25)
-+        debug                   Debug output level (0-7; default 0)
-+        dc_pin                  GPIO pin for D/C (default 24)
-+        reset_pin               GPIO pin for RESET (default 25)
-+        height                  Display height (32 or 64; default 64)
-+
-+
-+Name:   si446x-spi0
-+Info:   Overlay for Si446x UHF Transceiver via SPI using si446x driver.
-+        The driver is currently out-of-tree at
-+        https://github.com/sunipkmukherjee/silabs.git
-+Load:   dtoverlay=si446x-spi0,<param>=<val>
-+Params: speed                   SPI bus speed (default 4000000)
-+        int_pin                 GPIO pin for interrupts (default 17)
-+        reset_pin               GPIO pin for RESET (default 27)
-+
-+
-+Name:   smi
-+Info:   Enables the Secondary Memory Interface peripheral. Uses GPIOs 2-25!
-+Load:   dtoverlay=smi
-+Params: <None>
-+
-+
-+Name:   smi-dev
-+Info:   Enables the userspace interface for the SMI driver
-+Load:   dtoverlay=smi-dev
-+Params: <None>
-+
-+
-+Name:   smi-nand
-+Info:   Enables access to NAND flash via the SMI interface
-+Load:   dtoverlay=smi-nand
-+Params: <None>
-+
-+
-+Name:   spi-gpio35-39
-+Info:   Move SPI function block to GPIO 35 to 39
-+Load:   dtoverlay=spi-gpio35-39
-+Params: <None>
-+
-+
-+Name:   spi-gpio40-45
-+Info:   Move SPI function block to GPIOs 40 to 45
-+Load:   dtoverlay=spi-gpio40-45
-+Params: <None>
-+
-+
-+Name:   spi-rtc
-+Info:   Adds support for a number of SPI Real Time Clock devices
-+Load:   dtoverlay=spi-rtc,<param>=<val>
-+Params: ds3232                  Select the DS3232 device
-+        ds3234                  Select the DS3234 device
-+        pcf2123                 Select the PCF2123 device
-+
-+        spi0_0                  Use spi0.0 (default)
-+        spi0_1                  Use spi0.1
-+        spi1_0                  Use spi1.0
-+        spi1_1                  Use spi1.1
-+        spi2_0                  Use spi2.0
-+        spi2_1                  Use spi2.1
-+        cs_high                 This device requires an active-high CS
-+
-+
-+Name:   spi0-0cs
-+Info:   Don't claim any CS pins for SPI0. Requires a device with its chip
-+        select permanently enabled, but frees a GPIO for e.g. a DPI display.
-+Load:   dtoverlay=spi0-0cs,<param>=<val>
-+Params: no_miso                 Don't claim and use the MISO pin (9), freeing
-+                                it for other uses.
-+
-+
-+Name:   spi0-1cs
-+Info:   Only use one CS pin for SPI0
-+Load:   dtoverlay=spi0-1cs,<param>=<val>
-+Params: cs0_pin                 GPIO pin for CS0 (default 8)
-+        no_miso                 Don't claim and use the MISO pin (9), freeing
-+                                it for other uses.
-+
-+
-+Name:   spi0-2cs
-+Info:   Change the CS pins for SPI0
-+Load:   dtoverlay=spi0-2cs,<param>=<val>
-+Params: cs0_pin                 GPIO pin for CS0 (default 8)
-+        cs1_pin                 GPIO pin for CS1 (default 7)
-+        no_miso                 Don't claim and use the MISO pin (9), freeing
-+                                it for other uses.
-+
-+
-+Name:   spi0-cs
-+Info:   This overlay has been renamed spi0-2cs, keeping spi0-cs as an
-+        alias for backwards compatibility.
-+Load:   <Deprecated>
-+
-+
-+Name:   spi0-hw-cs
-+Info:   This overlay has been deprecated and removed because it is no longer
-+        necessary and has been seen to prevent spi0 from working.
-+Load:   <Deprecated>
-+
-+
-+Name:   spi1-1cs
-+Info:   Enables spi1 with a single chip select (CS) line and associated spidev
-+        dev node. The gpio pin number for the CS line and spidev device node
-+        creation are configurable.
-+        N.B.: spi1 is only accessible on devices with a 40pin header, eg:
-+              A+, B+, Zero and PI2 B; as well as the Compute Module.
-+Load:   dtoverlay=spi1-1cs,<param>=<val>
-+Params: cs0_pin                 GPIO pin for CS0 (default 18 - BCM SPI1_CE0).
-+        cs0_spidev              Set to 'disabled' to stop the creation of a
-+                                userspace device node /dev/spidev1.0 (default
-+                                is 'okay' or enabled).
-+
-+
-+Name:   spi1-2cs
-+Info:   Enables spi1 with two chip select (CS) lines and associated spidev
-+        dev nodes. The gpio pin numbers for the CS lines and spidev device node
-+        creation are configurable.
-+        N.B.: spi1 is only accessible on devices with a 40pin header, eg:
-+              A+, B+, Zero and PI2 B; as well as the Compute Module.
-+Load:   dtoverlay=spi1-2cs,<param>=<val>
-+Params: cs0_pin                 GPIO pin for CS0 (default 18 - BCM SPI1_CE0).
-+        cs1_pin                 GPIO pin for CS1 (default 17 - BCM SPI1_CE1).
-+        cs0_spidev              Set to 'disabled' to stop the creation of a
-+                                userspace device node /dev/spidev1.0 (default
-+                                is 'okay' or enabled).
-+        cs1_spidev              Set to 'disabled' to stop the creation of a
-+                                userspace device node /dev/spidev1.1 (default
-+                                is 'okay' or enabled).
-+
-+
-+Name:   spi1-3cs
-+Info:   Enables spi1 with three chip select (CS) lines and associated spidev
-+        dev nodes. The gpio pin numbers for the CS lines and spidev device node
-+        creation are configurable.
-+        N.B.: spi1 is only accessible on devices with a 40pin header, eg:
-+              A+, B+, Zero and PI2 B; as well as the Compute Module.
-+Load:   dtoverlay=spi1-3cs,<param>=<val>
-+Params: cs0_pin                 GPIO pin for CS0 (default 18 - BCM SPI1_CE0).
-+        cs1_pin                 GPIO pin for CS1 (default 17 - BCM SPI1_CE1).
-+        cs2_pin                 GPIO pin for CS2 (default 16 - BCM SPI1_CE2).
-+        cs0_spidev              Set to 'disabled' to stop the creation of a
-+                                userspace device node /dev/spidev1.0 (default
-+                                is 'okay' or enabled).
-+        cs1_spidev              Set to 'disabled' to stop the creation of a
-+                                userspace device node /dev/spidev1.1 (default
-+                                is 'okay' or enabled).
-+        cs2_spidev              Set to 'disabled' to stop the creation of a
-+                                userspace device node /dev/spidev1.2 (default
-+                                is 'okay' or enabled).
-+
-+
-+Name:   spi2-1cs
-+Info:   Enables spi2 with a single chip select (CS) line and associated spidev
-+        dev node. The gpio pin number for the CS line and spidev device node
-+        creation are configurable.
-+        N.B.: spi2 is only accessible with the Compute Module.
-+Load:   dtoverlay=spi2-1cs,<param>=<val>
-+Params: cs0_pin                 GPIO pin for CS0 (default 43 - BCM SPI2_CE0).
-+        cs0_spidev              Set to 'disabled' to stop the creation of a
-+                                userspace device node /dev/spidev2.0 (default
-+                                is 'okay' or enabled).
-+
-+
-+Name:   spi2-2cs
-+Info:   Enables spi2 with two chip select (CS) lines and associated spidev
-+        dev nodes. The gpio pin numbers for the CS lines and spidev device node
-+        creation are configurable.
-+        N.B.: spi2 is only accessible with the Compute Module.
-+Load:   dtoverlay=spi2-2cs,<param>=<val>
-+Params: cs0_pin                 GPIO pin for CS0 (default 43 - BCM SPI2_CE0).
-+        cs1_pin                 GPIO pin for CS1 (default 44 - BCM SPI2_CE1).
-+        cs0_spidev              Set to 'disabled' to stop the creation of a
-+                                userspace device node /dev/spidev2.0 (default
-+                                is 'okay' or enabled).
-+        cs1_spidev              Set to 'disabled' to stop the creation of a
-+                                userspace device node /dev/spidev2.1 (default
-+                                is 'okay' or enabled).
-+
-+
-+Name:   spi2-3cs
-+Info:   Enables spi2 with three chip select (CS) lines and associated spidev
-+        dev nodes. The gpio pin numbers for the CS lines and spidev device node
-+        creation are configurable.
-+        N.B.: spi2 is only accessible with the Compute Module.
-+Load:   dtoverlay=spi2-3cs,<param>=<val>
-+Params: cs0_pin                 GPIO pin for CS0 (default 43 - BCM SPI2_CE0).
-+        cs1_pin                 GPIO pin for CS1 (default 44 - BCM SPI2_CE1).
-+        cs2_pin                 GPIO pin for CS2 (default 45 - BCM SPI2_CE2).
-+        cs0_spidev              Set to 'disabled' to stop the creation of a
-+                                userspace device node /dev/spidev2.0 (default
-+                                is 'okay' or enabled).
-+        cs1_spidev              Set to 'disabled' to stop the creation of a
-+                                userspace device node /dev/spidev2.1 (default
-+                                is 'okay' or enabled).
-+        cs2_spidev              Set to 'disabled' to stop the creation of a
-+                                userspace device node /dev/spidev2.2 (default
-+                                is 'okay' or enabled).
-+
-+
-+Name:   spi3-1cs
-+Info:   Enables spi3 with a single chip select (CS) line and associated spidev
-+        dev node. The gpio pin number for the CS line and spidev device node
-+        creation are configurable. BCM2711 only.
-+Load:   dtoverlay=spi3-1cs,<param>=<val>
-+Params: cs0_pin                 GPIO pin for CS0 (default 0 - BCM SPI3_CE0).
-+        cs0_spidev              Set to 'off' to prevent the creation of a
-+                                userspace device node /dev/spidev3.0 (default
-+                                is 'on' or enabled).
-+
-+
-+Name:   spi3-2cs
-+Info:   Enables spi3 with two chip select (CS) lines and associated spidev
-+        dev nodes. The gpio pin numbers for the CS lines and spidev device node
-+        creation are configurable. BCM2711 only.
-+Load:   dtoverlay=spi3-2cs,<param>=<val>
-+Params: cs0_pin                 GPIO pin for CS0 (default 0 - BCM SPI3_CE0).
-+        cs1_pin                 GPIO pin for CS1 (default 24 - BCM SPI3_CE1).
-+        cs0_spidev              Set to 'off' to prevent the creation of a
-+                                userspace device node /dev/spidev3.0 (default
-+                                is 'on' or enabled).
-+        cs1_spidev              Set to 'off' to prevent the creation of a
-+                                userspace device node /dev/spidev3.1 (default
-+                                is 'on' or enabled).
-+
-+
-+Name:   spi4-1cs
-+Info:   Enables spi4 with a single chip select (CS) line and associated spidev
-+        dev node. The gpio pin number for the CS line and spidev device node
-+        creation are configurable. BCM2711 only.
-+Load:   dtoverlay=spi4-1cs,<param>=<val>
-+Params: cs0_pin                 GPIO pin for CS0 (default 4 - BCM SPI4_CE0).
-+        cs0_spidev              Set to 'off' to prevent the creation of a
-+                                userspace device node /dev/spidev4.0 (default
-+                                is 'on' or enabled).
-+
-+
-+Name:   spi4-2cs
-+Info:   Enables spi4 with two chip select (CS) lines and associated spidev
-+        dev nodes. The gpio pin numbers for the CS lines and spidev device node
-+        creation are configurable. BCM2711 only.
-+Load:   dtoverlay=spi4-2cs,<param>=<val>
-+Params: cs0_pin                 GPIO pin for CS0 (default 4 - BCM SPI4_CE0).
-+        cs1_pin                 GPIO pin for CS1 (default 25 - BCM SPI4_CE1).
-+        cs0_spidev              Set to 'off' to prevent the creation of a
-+                                userspace device node /dev/spidev4.0 (default
-+                                is 'on' or enabled).
-+        cs1_spidev              Set to 'off' to prevent the creation of a
-+                                userspace device node /dev/spidev4.1 (default
-+                                is 'on' or enabled).
-+
-+
-+Name:   spi5-1cs
-+Info:   Enables spi5 with a single chip select (CS) line and associated spidev
-+        dev node. The gpio pin numbers for the CS lines and spidev device node
-+        creation are configurable. BCM2711 only.
-+Load:   dtoverlay=spi5-1cs,<param>=<val>
-+Params: cs0_pin                 GPIO pin for CS0 (default 12 - BCM SPI5_CE0).
-+        cs0_spidev              Set to 'off' to prevent the creation of a
-+                                userspace device node /dev/spidev5.0 (default
-+                                is 'on' or enabled).
-+
-+
-+Name:   spi5-2cs
-+Info:   Enables spi5 with two chip select (CS) lines and associated spidev
-+        dev nodes. The gpio pin numbers for the CS lines and spidev device node
-+        creation are configurable. BCM2711 only.
-+Load:   dtoverlay=spi5-2cs,<param>=<val>
-+Params: cs0_pin                 GPIO pin for CS0 (default 12 - BCM SPI5_CE0).
-+        cs1_pin                 GPIO pin for CS1 (default 26 - BCM SPI5_CE1).
-+        cs0_spidev              Set to 'off' to prevent the creation of a
-+                                userspace device node /dev/spidev5.0 (default
-+                                is 'on' or enabled).
-+        cs1_spidev              Set to 'off' to prevent the creation of a
-+                                userspace device node /dev/spidev5.1 (default
-+                                is 'on' or enabled).
-+
-+
-+Name:   spi6-1cs
-+Info:   Enables spi6 with a single chip select (CS) line and associated spidev
-+        dev node. The gpio pin number for the CS line and spidev device node
-+        creation are configurable. BCM2711 only.
-+Load:   dtoverlay=spi6-1cs,<param>=<val>
-+Params: cs0_pin                 GPIO pin for CS0 (default 18 - BCM SPI6_CE0).
-+        cs0_spidev              Set to 'off' to prevent the creation of a
-+                                userspace device node /dev/spidev6.0 (default
-+                                is 'on' or enabled).
-+
-+
-+Name:   spi6-2cs
-+Info:   Enables spi6 with two chip select (CS) lines and associated spidev
-+        dev nodes. The gpio pin numbers for the CS lines and spidev device node
-+        creation are configurable. BCM2711 only.
-+Load:   dtoverlay=spi6-2cs,<param>=<val>
-+Params: cs0_pin                 GPIO pin for CS0 (default 18 - BCM SPI6_CE0).
-+        cs1_pin                 GPIO pin for CS1 (default 27 - BCM SPI6_CE1).
-+        cs0_spidev              Set to 'off' to prevent the creation of a
-+                                userspace device node /dev/spidev6.0 (default
-+                                is 'on' or enabled).
-+        cs1_spidev              Set to 'off' to prevent the creation of a
-+                                userspace device node /dev/spidev6.1 (default
-+                                is 'on' or enabled).
-+
-+
-+Name:   ssd1306
-+Info:   Overlay for activation of SSD1306 over I2C OLED display framebuffer.
-+Load:   dtoverlay=ssd1306,<param>=<val>
-+Params: address                 Location in display memory of first character.
-+                                (default=0)
-+        width                   Width of display. (default=128)
-+        height                  Height of display. (default=64)
-+        offset                  virtual channel a. (default=0)
-+        normal                  Has no effect on displays tested. (default=not
-+                                set)
-+        sequential              Set this if every other scan line is missing.
-+                                (default=not set)
-+        remapped                Set this if display is garbled. (default=not
-+                                set)
-+        inverted                Set this if display is inverted and mirrored.
-+                                (default=not set)
-+
-+        Examples:
-+        Typical usage for 128x64 display: dtoverlay=ssd1306,inverted
-+
-+        Typical usage for 128x32 display: dtoverlay=ssd1306,inverted,sequential
-+
-+        i2c_baudrate=400000 will speed up the display.
-+
-+        i2c_baudrate=1000000 seems to work even though it's not officially
-+        supported by the hardware, and is faster still.
-+
-+        For more information refer to the device datasheet at:
-+        https://cdn-shop.adafruit.com/datasheets/SSD1306.pdf
-+
-+
-+Name:   ssd1306-spi
-+Info:   Overlay for SSD1306 OLED via SPI using fbtft staging driver.
-+Load:   dtoverlay=ssd1306-spi,<param>=<val>
-+Params: speed                   SPI bus speed (default 10000000)
-+        rotate                  Display rotation (0, 90, 180 or 270; default 0)
-+        fps                     Delay between frame updates (default 25)
-+        debug                   Debug output level (0-7; default 0)
-+        dc_pin                  GPIO pin for D/C (default 24)
-+        reset_pin               GPIO pin for RESET (default 25)
-+        height                  Display height (32 or 64; default 64)
-+
-+
-+Name:   ssd1331-spi
-+Info:   Overlay for SSD1331 OLED via SPI using fbtft staging driver.
-+Load:   dtoverlay=ssd1331-spi,<param>=<val>
-+Params: speed                   SPI bus speed (default 4500000)
-+        rotate                  Display rotation (0, 90, 180 or 270; default 0)
-+        fps                     Delay between frame updates (default 25)
-+        debug                   Debug output level (0-7; default 0)
-+        dc_pin                  GPIO pin for D/C (default 24)
-+        reset_pin               GPIO pin for RESET (default 25)
-+
-+
-+Name:   ssd1351-spi
-+Info:   Overlay for SSD1351 OLED via SPI using fbtft staging driver.
-+Load:   dtoverlay=ssd1351-spi,<param>=<val>
-+Params: speed                   SPI bus speed (default 4500000)
-+        rotate                  Display rotation (0, 90, 180 or 270; default 0)
-+        fps                     Delay between frame updates (default 25)
-+        debug                   Debug output level (0-7; default 0)
-+        dc_pin                  GPIO pin for D/C (default 24)
-+        reset_pin               GPIO pin for RESET (default 25)
-+
-+
-+Name:   superaudioboard
-+Info:   Configures the SuperAudioBoard sound card
-+Load:   dtoverlay=superaudioboard,<param>=<val>
-+Params: gpiopin                 GPIO pin for codec reset
-+
-+
-+Name:   sx150x
-+Info:   Configures the Semtech SX150X I2C GPIO expanders.
-+Load:   dtoverlay=sx150x,<param>=<val>
-+Params: sx150<x>-<n>-<m>        Enables SX150X device on I2C#<n> with slave
-+                                address <m>. <x> may be 1-9. <n> may be 0 or 1.
-+                                Permissible values of <m> (which is denoted in
-+                                hex) depend on the device variant. For SX1501,
-+                                SX1502, SX1504 and SX1505, <m> may be 20 or 21.
-+                                For SX1503 and SX1506, <m> may be 20. For
-+                                SX1507 and SX1509, <m> may be 3E, 3F, 70 or 71.
-+                                For SX1508, <m> may be 20, 21, 22 or 23.
-+
-+        sx150<x>-<n>-<m>-int-gpio
-+                                Integer, enables interrupts on SX150X device on
-+                                I2C#<n> with slave address <m>, specifies
-+                                the GPIO pin to which NINT output of SX150X is
-+                                connected.
-+
-+
-+Name:   tc358743
-+Info:   Toshiba TC358743 HDMI to CSI-2 bridge chip.
-+        Uses Unicam 1, which is the standard camera connector on most Pi
-+        variants.
-+Load:   dtoverlay=tc358743,<param>=<val>
-+Params: 4lane                   Use 4 lanes (only applicable to Compute Modules
-+                                CAM1 connector).
-+
-+        link-frequency          Set the link frequency. Only values of 297000000
-+                                (574Mbit/s) and 486000000 (972Mbit/s - default)
-+                                are supported by the driver.
-+        media-controller        Configure use of Media Controller API for
-+                                configuring the sensor (default off)
-+        cam0                    Adopt the default configuration for CAM0 on a
-+                                Compute Module (CSI0, i2c_vc, and cam0_reg).
-+
-+
-+Name:   tc358743-audio
-+Info:   Used in combination with the tc358743-fast overlay to route the audio
-+        from the TC358743 over I2S to the Pi.
-+        Wiring is LRCK/WFS to GPIO 19, BCK/SCK to GPIO 18, and DATA/SD to GPIO
-+        20.
-+Load:   dtoverlay=tc358743-audio,<param>=<val>
-+Params: card-name               Override the default, "tc358743", card name.
-+
-+
-+Name:   tinylcd35
-+Info:   3.5" Color TFT Display by www.tinylcd.com
-+        Options: Touch, RTC, keypad
-+Load:   dtoverlay=tinylcd35,<param>=<val>
-+Params: speed                   Display SPI bus speed
-+
-+        rotate                  Display rotation {0,90,180,270}
-+
-+        fps                     Delay between frame updates
-+
-+        debug                   Debug output level {0-7}
-+
-+        touch                   Enable touch panel
-+
-+        touchgpio               Touch controller IRQ GPIO
-+
-+        xohms                   Touchpanel: Resistance of X-plate in ohms
-+
-+        rtc-pcf                 PCF8563 Real Time Clock
-+
-+        rtc-ds                  DS1307 Real Time Clock
-+
-+        keypad                  Enable keypad
-+
-+        Examples:
-+            Display with touchpanel, PCF8563 RTC and keypad:
-+                dtoverlay=tinylcd35,touch,rtc-pcf,keypad
-+            Old touch display:
-+                dtoverlay=tinylcd35,touch,touchgpio=3
-+
-+
-+Name:   tpm-slb9670
-+Info:   Enables support for Infineon SLB9670 Trusted Platform Module add-on
-+        boards, which can be used as a secure key storage and hwrng,
-+        available as "Iridium SLB9670" by Infineon and "LetsTrust TPM" by pi3g.
-+Load:   dtoverlay=tpm-slb9670
-+Params: <None>
-+
-+
-+Name:   tpm-slb9673
-+Info:   Enables support for Infineon SLB9673 Trusted Platform Module add-on
-+        boards, which can be used as a secure key storage and hwrng
-+        via the I2C protocol.
-+Load:   dtoverlay=tpm-slb9673
-+Params: <None>
-+
-+
-+Name:   uart0
-+Info:   Change the pin usage of uart0
-+Load:   dtoverlay=uart0,<param>=<val>
-+Params: txd0_pin                GPIO pin for TXD0 (14, 32 or 36 - default 14)
-+
-+        rxd0_pin                GPIO pin for RXD0 (15, 33 or 37 - default 15)
-+
-+        pin_func                Alternative pin function - 4(Alt0) for 14&15,
-+                                7(Alt3) for 32&33, 6(Alt2) for 36&37
-+
-+
-+Name:   uart1
-+Info:   Change the pin usage of uart1
-+Load:   dtoverlay=uart1,<param>=<val>
-+Params: txd1_pin                GPIO pin for TXD1 (14, 32 or 40 - default 14)
-+
-+        rxd1_pin                GPIO pin for RXD1 (15, 33 or 41 - default 15)
-+
-+
-+Name:   uart2
-+Info:   Enable uart 2 on GPIOs 0-3. BCM2711 only.
-+Load:   dtoverlay=uart2,<param>
-+Params: ctsrts                  Enable CTS/RTS on GPIOs 2-3 (default off)
-+
-+
-+Name:   uart3
-+Info:   Enable uart 3 on GPIOs 4-7. BCM2711 only.
-+Load:   dtoverlay=uart3,<param>
-+Params: ctsrts                  Enable CTS/RTS on GPIOs 6-7 (default off)
-+
-+
-+Name:   uart4
-+Info:   Enable uart 4 on GPIOs 8-11. BCM2711 only.
-+Load:   dtoverlay=uart4,<param>
-+Params: ctsrts                  Enable CTS/RTS on GPIOs 10-11 (default off)
-+
-+
-+Name:   uart5
-+Info:   Enable uart 5 on GPIOs 12-15. BCM2711 only.
-+Load:   dtoverlay=uart5,<param>
-+Params: ctsrts                  Enable CTS/RTS on GPIOs 14-15 (default off)
-+
-+
-+Name:   udrc
-+Info:   Configures the NW Digital Radio UDRC Hat
-+Load:   dtoverlay=udrc,<param>=<val>
-+Params: alsaname                Name of the ALSA audio device (default "udrc")
-+
-+
-+Name:   ugreen-dabboard
-+Info:   Configures the ugreen-dabboard I2S overlay
-+        This is a simple overlay based on the simple-audio-card and the dmic
-+        codec. It has the speciality that it is configured to use the codec
-+        as a master I2S device. It works for example with the Si468x DAB
-+        receiver on the uGreen DABBoard.
-+Load:   dtoverlay=ugreen-dabboard,<param>=<val>
-+Params: card-name               Override the default, "dabboard", card name.
-+
-+
-+Name:   upstream
-+Info:   Allow usage of downstream .dtb with upstream kernel. Comprises the
-+        vc4-kms-v3d and dwc2 overlays.
-+Load:   dtoverlay=upstream
-+Params: <None>
-+
-+
-+Name:   upstream-aux-interrupt
-+Info:   This overlay has been deprecated and removed because it is no longer
-+        necessary.
-+Load:   <Deprecated>
-+
-+
-+Name:   upstream-pi4
-+Info:   Allow usage of downstream .dtb with upstream kernel on Pi 4. Comprises
-+        the vc4-kms-v3d-pi4 and dwc2 overlays.
-+Load:   dtoverlay=upstream-pi4
-+Params: <None>
-+
-+
-+Name:   vc4-fkms-v3d
-+Info:   Enable Eric Anholt's DRM VC4 V3D driver on top of the dispmanx
-+        display stack.
-+Load:   dtoverlay=vc4-fkms-v3d,<param>
-+Params: cma-512                 CMA is 512MB (needs 1GB)
-+        cma-448                 CMA is 448MB (needs 1GB)
-+        cma-384                 CMA is 384MB (needs 1GB)
-+        cma-320                 CMA is 320MB (needs 1GB)
-+        cma-256                 CMA is 256MB (needs 1GB)
-+        cma-192                 CMA is 192MB (needs 1GB)
-+        cma-128                 CMA is 128MB
-+        cma-96                  CMA is 96MB
-+        cma-64                  CMA is 64MB
-+        cma-size                CMA size in bytes, 4MB aligned
-+        cma-default             Use upstream's default value
-+
-+
-+Name:   vc4-fkms-v3d-pi4
-+Info:   Enable Eric Anholt's DRM VC4 V3D driver on top of the dispmanx
-+        display stack.
-+Load:   dtoverlay=vc4-fkms-v3d-pi4,<param>
-+Params: cma-512                 CMA is 512MB (needs 1GB)
-+        cma-448                 CMA is 448MB (needs 1GB)
-+        cma-384                 CMA is 384MB (needs 1GB)
-+        cma-320                 CMA is 320MB (needs 1GB)
-+        cma-256                 CMA is 256MB (needs 1GB)
-+        cma-192                 CMA is 192MB (needs 1GB)
-+        cma-128                 CMA is 128MB
-+        cma-96                  CMA is 96MB
-+        cma-64                  CMA is 64MB
-+        cma-size                CMA size in bytes, 4MB aligned
-+        cma-default             Use upstream's default value
-+
-+
-+Name:   vc4-kms-dpi-at056tn53v1
-+Info:   This overlay is now deprecated - see vc4-kms-dpi-panel,at056tn53v1
-+Load:   <Deprecated>
-+
-+
-+Name:   vc4-kms-dpi-generic
-+Info:   Enable a generic DPI display under KMS. Default timings are for the
-+        Adafruit Kippah with 800x480 panel and RGB666 (GPIOs 0-21)
-+        Requires vc4-kms-v3d to be loaded.
-+Load:   dtoverlay=vc4-kms-dpi-generic,<param>=<val>
-+Params: clock-frequency         Display clock frequency (Hz)
-+        hactive                 Horizontal active pixels
-+        hfp                     Horizontal front porch
-+        hsync                   Horizontal sync pulse width
-+        hbp                     Horizontal back porch
-+        vactive                 Vertical active lines
-+        vfp                     Vertical front porch
-+        vsync                   Vertical sync pulse width
-+        vbp                     Vertical back porch
-+        hsync-invert            Horizontal sync active low
-+        vsync-invert            Vertical sync active low
-+        de-invert               Data Enable active low
-+        pixclk-invert           Negative edge pixel clock
-+        width-mm                Define the screen width in mm
-+        height-mm               Define the screen height in mm
-+        rgb565                  Change to RGB565 output on GPIOs 0-19
-+        rgb565-padhi            Change to RGB565 output on GPIOs 0-8, 12-17, and
-+                                20-24
-+        bgr666                  Change to BGR666 output on GPIOs 0-21.
-+        bgr666-padhi            Change to BGR666 output on GPIOs 0-9, 12-17, and
-+                                20-25
-+        rgb666-padhi            Change to RGB666 output on GPIOs 0-9, 12-17, and
-+                                20-25
-+        bgr888                  Change to BGR888 output on GPIOs 0-27
-+        rgb888                  Change to RGB888 output on GPIOs 0-27
-+        bus-format              Override the bus format for a MEDIA_BUS_FMT_*
-+                                value. NB also overridden by rgbXXX overrides.
-+        backlight-gpio          Defines a GPIO to be used for backlight control
-+                                (default of none).
-+        backlight-pwm           Defines a PWM channel to be used for backlight
-+                                control (default of none). NB Disables audio
-+                                headphone output as that also uses PWM.
-+        backlight-pwm-chan      Choose channel on &pwm node for backlight
-+                                control.
-+                                (default 0).
-+        backlight-pwm-gpio      GPIO pin to be used for the PWM backlight. See
-+                                pwm-2chan for valid options.
-+                                (default 18 - note this can only work with
-+                                 rgb666-padhi).
-+        backlight-pwm-func      Pin function of GPIO used for the PWM
-+                                backlight.
-+                                See pwm-2chan for valid options.
-+                                (default 2).
-+        backlight-def-brightness
-+                                Set the default brightness. Normal range 1-16.
-+                                (default 16).
-+        rotate                  Display rotation {0,90,180,270} (default 0)
-+
-+
-+Name:   vc4-kms-dpi-hyperpixel2r
-+Info:   Enable the KMS drivers for the Pimoroni HyperPixel2 Round DPI display.
-+        Requires vc4-kms-v3d to be loaded.
-+Load:   dtoverlay=vc4-kms-dpi-hyperpixel2r,<param>=<val>
-+Params: disable-touch           Disables the touch controller
-+        touchscreen-inverted-x  Inverts X direction of touch controller
-+        touchscreen-inverted-y  Inverts Y direction of touch controller
-+        touchscreen-swapped-x-y Swaps X & Y axes of touch controller
-+        rotate                  Display rotation {0,90,180,270} (default 0)
-+
-+
-+Name:   vc4-kms-dpi-hyperpixel4
-+Info:   Enable the KMS drivers for the Pimoroni HyperPixel4 DPI display.
-+        Requires vc4-kms-v3d to be loaded.
-+Load:   dtoverlay=vc4-kms-dpi-hyperpixel4,<param>=<val>
-+Params: disable-touch           Disables the touch controller
-+        touchscreen-inverted-x  Inverts X direction of touch controller
-+        touchscreen-inverted-y  Inverts Y direction of touch controller
-+        touchscreen-swapped-x-y Swaps X & Y axes of touch controller
-+        rotate                  Display rotation {0,90,180,270} (default 0)
-+
-+
-+Name:   vc4-kms-dpi-hyperpixel4sq
-+Info:   Enable the KMS drivers for the Pimoroni HyperPixel4 Square DPI display.
-+        Requires vc4-kms-v3d to be loaded.
-+Load:   dtoverlay=vc4-kms-dpi-hyperpixel4sq,<param>=<val>
-+Params: disable-touch           Disables the touch controller
-+        touchscreen-inverted-x  Inverts X direction of touch controller
-+        touchscreen-inverted-y  Inverts Y direction of touch controller
-+        touchscreen-swapped-x-y Swaps X & Y axes of touch controller
-+        rotate                  Display rotation {0,90,180,270} (default 0)
-+
-+
-+Name:   vc4-kms-dpi-panel
-+Info:   Enable a preconfigured KMS DPI panel.
-+        Requires vc4-kms-v3d to be loaded.
-+Load:   dtoverlay=vc4-kms-dpi-panel,<param>=<val>
-+Params: at056tn53v1             Enable an Innolux 5.6in VGA TFT
-+        kippah-7inch            Enable an Adafruit Kippah with 7inch panel.
-+        mzp280                  Enable a Geekworm MZP280 panel.
-+        backlight-gpio          Defines a GPIO to be used for backlight control
-+                                (default of none).
-+        backlight-pwm           Defines a PWM channel to be used for backlight
-+                                control (default of none). NB Disables audio
-+                                headphone output as that also uses PWM.
-+        backlight-pwm-chan      Choose channel on &pwm node for backlight
-+                                control.
-+                                (default 0).
-+        backlight-pwm-gpio      GPIO pin to be used for the PWM backlight. See
-+                                pwm-2chan for valid options.
-+                                (default 18 - note this can only work with
-+                                 rgb666-padhi).
-+        backlight-pwm-func      Pin function of GPIO used for the PWM
-+                                backlight.
-+                                See pwm-2chan for valid options.
-+                                (default 2).
-+        backlight-def-brightness
-+                                Set the default brightness. Normal range 1-16.
-+                                (default 16).
-+        rotate                  Display rotation {0,90,180,270} (default 0)
-+
-+
-+Name:   vc4-kms-dsi-7inch
-+Info:   Enable the Raspberry Pi DSI 7" screen.
-+        Includes the edt-ft5406 for the touchscreen element.
-+        Requires vc4-kms-v3d to be loaded.
-+Load:   dtoverlay=vc4-kms-dsi-7inch,<param>=<val>
-+Params: sizex                   Touchscreen size x (default 800)
-+        sizey                   Touchscreen size y (default 480)
-+        invx                    Touchscreen inverted x axis
-+        invy                    Touchscreen inverted y axis
-+        swapxy                  Touchscreen swapped x y axis
-+        disable_touch           Disables the touch screen overlay driver
-+
-+
-+Name:   vc4-kms-dsi-lt070me05000
-+Info:   Enable a JDI LT070ME05000 DSI display on DSI1.
-+        Note that this is a 4 lane DSI device, so it will only work on a Compute
-+        Module.
-+        Requires vc4-kms-v3d to be loaded.
-+Load:   dtoverlay=vc4-kms-dsi-lt070me05000,<param>
-+Params: reset                   GPIO for the reset signal (default 17)
-+        enable                  GPIO for the enable signal (default 4)
-+        dcdc-en                 GPIO for the DC-DC converter enable (default 5)
-+
-+
-+Name:   vc4-kms-dsi-lt070me05000-v2
-+Info:   Enable a JDI LT070ME05000 DSI display on DSI1 using Harlab's V2
-+        interface board.
-+        Note that this is a 4 lane DSI device, so it will only work on a Compute
-+        Module.
-+        Requires vc4-kms-v3d to be loaded.
-+Load:   dtoverlay=vc4-kms-dsi-lt070me05000-v2
-+Params: <None>
-+
-+
-+Name:   vc4-kms-kippah-7inch
-+Info:   This overlay is now deprecated - see vc4-kms-dpi-panel,kippah-7inch
-+Load:   <Deprecated>
-+
-+
-+Name:   vc4-kms-v3d
-+Info:   Enable Eric Anholt's DRM VC4 HDMI/HVS/V3D driver.
-+Load:   dtoverlay=vc4-kms-v3d,<param>
-+Params: cma-512                 CMA is 512MB (needs 1GB)
-+        cma-448                 CMA is 448MB (needs 1GB)
-+        cma-384                 CMA is 384MB (needs 1GB)
-+        cma-320                 CMA is 320MB (needs 1GB)
-+        cma-256                 CMA is 256MB (needs 1GB)
-+        cma-192                 CMA is 192MB (needs 1GB)
-+        cma-128                 CMA is 128MB
-+        cma-96                  CMA is 96MB
-+        cma-64                  CMA is 64MB
-+        cma-size                CMA size in bytes, 4MB aligned
-+        cma-default             Use upstream's default value
-+        audio                   Enable or disable audio over HDMI (default "on")
-+        noaudio                 Disable all HDMI audio (default "off")
-+        composite               Enable the composite output (default "off")
-+                                N.B. Disables all other outputs on a Pi 4.
-+        nohdmi                  Disable HDMI output
-+
-+
-+Name:   vc4-kms-v3d-pi4
-+Info:   Enable Eric Anholt's DRM VC4 HDMI/HVS/V3D driver for Pi4.
-+Load:   dtoverlay=vc4-kms-v3d-pi4,<param>
-+Params: cma-512                 CMA is 512MB
-+        cma-448                 CMA is 448MB
-+        cma-384                 CMA is 384MB
-+        cma-320                 CMA is 320MB
-+        cma-256                 CMA is 256MB
-+        cma-192                 CMA is 192MB
-+        cma-128                 CMA is 128MB
-+        cma-96                  CMA is 96MB
-+        cma-64                  CMA is 64MB
-+        cma-size                CMA size in bytes, 4MB aligned
-+        cma-default             Use upstream's default value
-+        audio                   Enable or disable audio over HDMI0 (default
-+                                "on")
-+        audio1                  Enable or disable audio over HDMI1 (default
-+                                "on")
-+        noaudio                 Disable all HDMI audio (default "off")
-+        composite               Enable the composite output (disables all other
-+                                outputs)
-+        nohdmi                  Disable both HDMI 0 & 1 outputs
-+        nohdmi0                 Disable HDMI 0 output
-+        nohdmi1                 Disable HDMI 1 output
-+
-+
-+
-+Name:   vc4-kms-vga666
-+Info:   Enable the VGA666 (resistor ladder ADC) for the vc4-kms-v3d driver.
-+        Requires vc4-kms-v3d to be loaded.
-+Load:   dtoverlay=vc4-kms-vga666,<param>
-+Params: ddc                     Enables GPIOs 0&1 as the I2C to read the EDID
-+                                from the display. NB These are NOT 5V tolerant
-+                                GPIOs, therefore level shifters are required.
-+
-+
-+Name:   vga666
-+Info:   Overlay for the Fen Logic VGA666 board
-+        This uses GPIOs 2-21 (so no I2C), and activates the output 2-3 seconds
-+        after the kernel has started.
-+        NOT for use with vc4-kms-v3d.
-+Load:   dtoverlay=vga666
-+Params: <None>
-+
-+
-+Name:   vl805
-+Info:   Overlay to enable a VIA VL805 USB3 controller on CM4 carriers
-+        Will be loaded automatically by up-to-date firmware if "VL805=1" is
-+        set in the EEPROM config.
-+Load:   dtoverlay=vl805
-+Params: <None>
-+
-+
-+Name:   w1-gpio
-+Info:   Configures the w1-gpio Onewire interface module.
-+        Use this overlay if you *don't* need a GPIO to drive an external pullup.
-+Load:   dtoverlay=w1-gpio,<param>=<val>
-+Params: gpiopin                 GPIO for I/O (default "4")
-+        pullup                  Now enabled by default (ignored)
-+
-+
-+Name:   w1-gpio-pullup
-+Info:   Configures the w1-gpio Onewire interface module.
-+        Use this overlay if you *do* need a GPIO to drive an external pullup.
-+Load:   dtoverlay=w1-gpio-pullup,<param>=<val>
-+Params: gpiopin                 GPIO for I/O (default "4")
-+        extpullup               GPIO for external pullup (default "5")
-+        pullup                  Now enabled by default (ignored)
-+
-+
-+Name:   w5500
-+Info:   Overlay for the Wiznet W5500 Ethernet Controller on SPI0
-+Load:   dtoverlay=w5500,<param>=<val>
-+Params: int_pin                 GPIO used for INT (default 25)
-+
-+        speed                   SPI bus speed (default 30000000)
-+
-+        cs                      SPI bus Chip Select (default 0)
-+
-+
-+Name:   watterott-display
-+Info:   Watterott RPi-Display - 2.8" Touch Display
-+        Linux has 2 drivers that support this display and this overlay supports
-+        both.
-+
-+        Examples:
-+          fbtft/fb_ili9341: dtoverlay=watterott-display
-+          drm/mi0283qt: dtoverlay=watterott-display,drm,backlight-pwm,rotate=180
-+
-+        Some notable differences with the DRM driver compared to fbtft:
-+        - The display is turned on when it's first used and not on driver load
-+          as with fbtft. So if nothing uses the display it stays off.
-+        - Can run with a higher SPI clock increasing framerate. This is possible
-+          since the driver avoids messing up the controller configuration due to
-+          transmission errors by running config commands at 10MHz and only pixel
-+          data at full speed (occasional pixel glitch might occur).
-+        - PWM backlight is supported.
-+
-+Load:   dtoverlay=watterott-display,<param>=<val>
-+Params: speed                   Display SPI bus speed
-+        rotate                  Display rotation {0,90,180,270}
-+        fps                     Delay between frame updates (fbtft only)
-+        debug                   Debug output level {0-7} (fbtft only)
-+        xohms                   Touchpanel sensitivity (X-plate resistance)
-+        swapxy                  Swap x and y axis
-+        backlight               Change backlight GPIO pin {e.g. 12, 18}
-+                                (fbtft only)
-+        drm                     Use DRM/KMS driver mi0283qt instead of fbtft.
-+                                Set the SPI clock to 70MHz.
-+                                This has to be the first parameter.
-+        backlight-pwm           Use pwm for backlight (drm only). NB: Disables
-+                                audio headphone output as that also uses PWM.
-+
-+
-+Name:   waveshare-can-fd-hat-mode-a
-+Info:   Overlay for the Waveshare 2-Channel Isolated CAN FD Expansion HAT
-+        for Raspberry Pi, Multi Protections. Use this overlay when the
-+        HAT is configured in Mode A (Default), with can0 on spi0.0
-+        and can1 on spi1.0.
-+        https://www.waveshare.com/2-ch-can-fd-hat.htm
-+Load:   dtoverlay=waveshare-can-fd-hat-mode-a
-+Params: <None>
-+
-+
-+Name:   waveshare-can-fd-hat-mode-b
-+Info:   Overlay for the Waveshare 2-Channel Isolated CAN FD Expansion HAT
-+        for Raspberry Pi, Multi Protections. Use this overlay when the
-+        HAT is configured in Mode B (requires hardware modification), with
-+        can0 on spi0.0 and can1 on spi0.1.
-+        https://www.waveshare.com/2-ch-can-fd-hat.htm
-+Load:   dtoverlay=waveshare-can-fd-hat-mode-b
-+Params: <None>
-+
-+
-+Name:   wittypi
-+Info:   Configures the wittypi RTC module.
-+Load:   dtoverlay=wittypi,<param>=<val>
-+Params: led_gpio                GPIO for LED (default "17")
-+        led_trigger             Choose which activity the LED tracks (default
-+                                "default-on")
-+
-+
-+Name:   wm8960-soundcard
-+Info:   Overlay for the Waveshare wm8960 soundcard
-+Load:   dtoverlay=wm8960-soundcard,<param>=<val>
-+Params: alsaname                Changes the card name in ALSA
-+        compatible              Changes the codec compatibility
-+
-+
-+Troubleshooting
-+===============
-+
-+If you are experiencing problems that you think are DT-related, enable DT
-+diagnostic output by adding this to /boot/config.txt:
-+
-+    dtdebug=on
-+
-+and rebooting. Then run:
-+
-+    sudo vcdbg log msg
-+
-+and look for relevant messages.
-+
-+Further reading
-+===============
-+
-+This is only meant to be a quick introduction to the subject of Device Tree on
-+Raspberry Pi. There is a more complete explanation here:
-+
-+http://www.raspberrypi.org/documentation/configuration/device-tree.md
-diff --git a/arch/arm/boot/dts/overlays/act-led-overlay.dts b/arch/arm/boot/dts/overlays/act-led-overlay.dts
-new file mode 100644
-index 000000000000..2f4bbb407f89
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/act-led-overlay.dts
-@@ -0,0 +1,27 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/* Pi3 uses a GPIO expander to drive the LEDs which can only be accessed
-+   from the VPU. There is a special driver for this with a separate DT node,
-+   which has the unfortunate consequence of breaking the act_led_gpio and
-+   act_led_activelow dtparams.
-+
-+   This overlay changes the GPIO controller back to the standard one and
-+   restores the dtparams.
-+*/
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&act_led>;
-+		frag0: __overlay__ {
-+			gpios = <&gpio 0 0>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		gpio = <&frag0>,"gpios:4";
-+		activelow = <&frag0>,"gpios:8";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/adafruit-st7735r-overlay.dts b/arch/arm/boot/dts/overlays/adafruit-st7735r-overlay.dts
-new file mode 100644
-index 000000000000..6e69bd7fa031
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/adafruit-st7735r-overlay.dts
-@@ -0,0 +1,83 @@
-+/*
-+ * adafruit-st7735r-overlay.dts
-+ *
-+ * ST7735R based SPI LCD displays. Either
-+ * Adafruit 1.8" 160x128
-+ *   or
-+ * Okaya 1.44" 128x128
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			adafruit_pins: adafruit_pins {
-+				brcm,pins = <25 24>;
-+				brcm,function = <1>; /* out */
-+			};
-+			backlight_pins: backlight_pins {
-+				brcm,pins = <18>;
-+				brcm,function = <1>; /* out */
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target-path = "/";
-+		__overlay__ {
-+			af18_backlight: backlight {
-+				compatible = "gpio-backlight";
-+				gpios = <&gpio 18 GPIO_ACTIVE_HIGH>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&backlight_pins>;
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			af18: adafruit18@0 {
-+				compatible = "jianda,jd-t18003-t01";
-+				reg = <0>;
-+				spi-max-frequency = <32000000>;
-+				dc-gpios = <&gpio 24 GPIO_ACTIVE_HIGH>;
-+				reset-gpios = <&gpio 25 GPIO_ACTIVE_HIGH>;
-+				rotation = <90>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&adafruit_pins>;
-+				backlight = <&af18_backlight>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		128x128 = <&af18>, "compatible=okaya,rh128128t";
-+		speed = <&af18>,"spi-max-frequency:0";
-+		rotate = <&af18>,"rotation:0";
-+		dc_pin = <&af18>,"dc-gpios:4", <&adafruit_pins>,"brcm,pins:4";
-+		reset_pin = <&af18>,"reset-gpios:4",
-+			    <&adafruit_pins>,"brcm,pins:0";
-+		led_pin = <&af18_backlight>,"gpios:4",
-+			  <&backlight_pins>,"brcm,pins:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/adafruit18-overlay.dts b/arch/arm/boot/dts/overlays/adafruit18-overlay.dts
-new file mode 100644
-index 000000000000..e1ce94a8cd3e
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/adafruit18-overlay.dts
-@@ -0,0 +1,55 @@
-+/*
-+ * Device Tree overlay for Adafruit 1.8" TFT LCD with ST7735R chip 160x128
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			af18: adafruit18@0 {
-+				compatible = "fbtft,adafruit18";
-+				reg = <0>;
-+				pinctrl-names = "default";
-+				spi-max-frequency = <40000000>;
-+				rotate = <90>;
-+				buswidth = <8>;
-+				fps = <50>;
-+				height = <160>;
-+				width = <128>;
-+				reset-gpios = <&gpio 25 1>;
-+				dc-gpios = <&gpio 24 0>;
-+				led-gpios = <&gpio 18 0>;
-+				debug = <0>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		green = <&af18>, "compatible=fbtft,adafruit18_green";
-+		speed     = <&af18>,"spi-max-frequency:0";
-+		rotate    = <&af18>,"rotate:0";
-+		fps       = <&af18>,"fps:0";
-+		bgr       = <&af18>,"bgr?";
-+		debug     = <&af18>,"debug:0";
-+		dc_pin    = <&af18>,"dc-gpios:4";
-+		reset_pin = <&af18>,"reset-gpios:4";
-+		led_pin   = <&af18>,"led-gpios:4";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts b/arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts
-new file mode 100644
-index 000000000000..298488e19156
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts
-@@ -0,0 +1,40 @@
-+// Definitions for ADAU1977 ADC
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+    
-+	fragment@0 {
-+        	target = <&i2c>;
-+        	
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+			
-+			adau1977: codec@11 {
-+                        	compatible = "adi,adau1977";
-+                        	reg = <0x11>;
-+                        	reset-gpios = <&gpio 5 0>;
-+				AVDD-supply = <&vdd_3v3_reg>;
-+                	};
-+        	};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "adi,adau1977-adc";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/adau7002-simple-overlay.dts b/arch/arm/boot/dts/overlays/adau7002-simple-overlay.dts
-new file mode 100644
-index 000000000000..5fed769d2526
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/adau7002-simple-overlay.dts
-@@ -0,0 +1,52 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+    compatible = "brcm,bcm2835";
-+
-+    fragment@0 {
-+        target = <&i2s>;
-+        __overlay__ {
-+            status = "okay";
-+        };
-+    };
-+
-+    fragment@1 {
-+        target-path = "/";
-+        __overlay__ {
-+                adau7002_codec: adau7002-codec {
-+                #sound-dai-cells = <0>;
-+                compatible = "adi,adau7002";
-+/*                IOVDD-supply = <&supply>;*/
-+                status = "okay";
-+            };
-+        };
-+    };
-+
-+    fragment@2 {
-+        target = <&sound>;
-+            sound_overlay: __overlay__ {
-+            compatible = "simple-audio-card";
-+            simple-audio-card,format = "i2s";
-+            simple-audio-card,name = "adau7002";
-+            simple-audio-card,bitclock-slave = <&dailink0_slave>;
-+            simple-audio-card,frame-slave = <&dailink0_slave>;
-+            simple-audio-card,widgets =
-+                    "Microphone", "Microphone Jack";
-+            simple-audio-card,routing =
-+                    "PDM_DAT", "Microphone Jack";
-+            status = "okay";
-+            simple-audio-card,cpu {
-+                sound-dai = <&i2s>;
-+            };
-+            dailink0_slave: simple-audio-card,codec {
-+                sound-dai = <&adau7002_codec>;
-+            };
-+        };
-+    };
-+
-+
-+    __overrides__ {
-+        card-name = <&sound_overlay>,"simple-audio-card,name";
-+    };
-+};
-diff --git a/arch/arm/boot/dts/overlays/ads1015-overlay.dts b/arch/arm/boot/dts/overlays/ads1015-overlay.dts
-new file mode 100644
-index 000000000000..dc1764613a8b
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/ads1015-overlay.dts
-@@ -0,0 +1,98 @@
-+/*
-+ * 2016 - Erik Sejr
-+ */
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+    compatible = "brcm,bcm2835";
-+    /* ----------- ADS1015 ------------ */
-+    fragment@0 {
-+        target = <&i2c_arm>;
-+        __overlay__ {
-+            #address-cells = <1>;
-+            #size-cells = <0>;
-+            status = "okay";
-+            ads1015: ads1015@48 {
-+                compatible = "ti,ads1015";
-+                status = "okay";
-+                #address-cells = <1>;
-+                #size-cells = <0>;
-+                reg = <0x48>;
-+            };
-+        };
-+    };
-+
-+    fragment@1 {
-+        target = <&ads1015>;
-+        __overlay__ {
-+            #address-cells = <1>;
-+            #size-cells = <0>;
-+            channel_a: channel_a {
-+                reg = <4>;
-+                ti,gain = <2>;
-+                ti,datarate = <4>;
-+            };
-+        };
-+    };
-+
-+    fragment@2 {
-+        target = <&ads1015>;
-+        __dormant__ {
-+            #address-cells = <1>;
-+            #size-cells = <0>;
-+            channel_b: channel_b {
-+                reg = <5>;
-+                ti,gain = <2>;
-+                ti,datarate = <4>;
-+            };
-+        };
-+    };
-+
-+    fragment@3 {
-+        target = <&ads1015>;
-+        __dormant__ {
-+            #address-cells = <1>;
-+            #size-cells = <0>;
-+            channel_c: channel_c {
-+                reg = <6>;
-+                ti,gain = <2>;
-+                ti,datarate = <4>;
-+            };
-+        };
-+    };
-+
-+    fragment@4 {
-+        target = <&ads1015>;
-+        __dormant__ {
-+            #address-cells = <1>;
-+            #size-cells = <0>;
-+            channel_d: channel_d {
-+                reg = <7>;
-+                ti,gain = <2>;
-+                ti,datarate = <4>;
-+            };
-+        };
-+    };
-+
-+    __overrides__ {
-+        addr =            <&ads1015>,"reg:0";
-+        cha_enable =      <0>,"=1";
-+        cha_cfg =         <&channel_a>,"reg:0";
-+        cha_gain =        <&channel_a>,"ti,gain:0";
-+        cha_datarate =    <&channel_a>,"ti,datarate:0";
-+        chb_enable =      <0>,"=2";
-+        chb_cfg =         <&channel_b>,"reg:0";
-+        chb_gain =        <&channel_b>,"ti,gain:0";
-+        chb_datarate =    <&channel_b>,"ti,datarate:0";
-+        chc_enable =      <0>,"=3";
-+        chc_cfg =         <&channel_c>,"reg:0";
-+        chc_gain =        <&channel_c>,"ti,gain:0";
-+        chc_datarate =    <&channel_c>,"ti,datarate:0";
-+        chd_enable =      <0>,"=4";
-+        chd_cfg =         <&channel_d>,"reg:0";
-+        chd_gain =        <&channel_d>,"ti,gain:0";
-+        chd_datarate =    <&channel_d>,"ti,datarate:0";
-+   };
-+
-+};
-diff --git a/arch/arm/boot/dts/overlays/ads1115-overlay.dts b/arch/arm/boot/dts/overlays/ads1115-overlay.dts
-new file mode 100644
-index 000000000000..e44ced704ee2
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/ads1115-overlay.dts
-@@ -0,0 +1,103 @@
-+/*
-+ * TI ADS1115 multi-channel ADC overlay
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2c_arm>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			ads1115: ads1115@48 {
-+				compatible = "ti,ads1115";
-+				status = "okay";
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				reg = <0x48>;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&ads1115>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			channel_a: channel_a {
-+				reg = <4>;
-+				ti,gain = <1>;
-+				ti,datarate = <7>;
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&ads1115>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			channel_b: channel_b {
-+				reg = <5>;
-+				ti,gain = <1>;
-+				ti,datarate = <7>;
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&ads1115>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			channel_c: channel_c {
-+				reg = <6>;
-+				ti,gain = <1>;
-+				ti,datarate = <7>;
-+			};
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&ads1115>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			channel_d: channel_d {
-+				reg = <7>;
-+				ti,gain = <1>;
-+				ti,datarate = <7>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		addr =            <&ads1115>,"reg:0";
-+		cha_enable =      <0>,"=1";
-+		cha_cfg =         <&channel_a>,"reg:0";
-+		cha_gain =        <&channel_a>,"ti,gain:0";
-+		cha_datarate =    <&channel_a>,"ti,datarate:0";
-+		chb_enable =      <0>,"=2";
-+		chb_cfg =         <&channel_b>,"reg:0";
-+		chb_gain =        <&channel_b>,"ti,gain:0";
-+		chb_datarate =    <&channel_b>,"ti,datarate:0";
-+		chc_enable =      <0>,"=3";
-+		chc_cfg =         <&channel_c>,"reg:0";
-+		chc_gain =        <&channel_c>,"ti,gain:0";
-+		chc_datarate =    <&channel_c>,"ti,datarate:0";
-+		chd_enable =      <0>,"=4";
-+		chd_cfg =         <&channel_d>,"reg:0";
-+		chd_gain =        <&channel_d>,"ti,gain:0";
-+		chd_datarate =    <&channel_d>,"ti,datarate:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/ads7846-overlay.dts b/arch/arm/boot/dts/overlays/ads7846-overlay.dts
-new file mode 100644
-index 000000000000..1c5c9b6bb6ff
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/ads7846-overlay.dts
-@@ -0,0 +1,89 @@
-+/*
-+ * Generic Device Tree overlay for the ADS7846 touch controller
-+ *
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&spidev1>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			ads7846_pins: ads7846_pins {
-+				brcm,pins = <255>; /* illegal default value */
-+				brcm,function = <0>; /* in */
-+				brcm,pull = <0>; /* none */
-+			};
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			ads7846: ads7846@1 {
-+				compatible = "ti,ads7846";
-+				reg = <1>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&ads7846_pins>;
-+
-+				spi-max-frequency = <2000000>;
-+				interrupts = <255 2>; /* high-to-low edge triggered */
-+				interrupt-parent = <&gpio>;
-+				pendown-gpio = <&gpio 255 0>;
-+
-+				/* driver defaults */
-+				ti,x-min = /bits/ 16 <0>;
-+				ti,y-min = /bits/ 16 <0>;
-+				ti,x-max = /bits/ 16 <0x0FFF>;
-+				ti,y-max = /bits/ 16 <0x0FFF>;
-+				ti,pressure-min = /bits/ 16 <0>;
-+				ti,pressure-max = /bits/ 16 <0xFFFF>;
-+				ti,x-plate-ohms = /bits/ 16 <400>;
-+			};
-+		};
-+	};
-+	__overrides__ {
-+		cs =     <&ads7846>,"reg:0";
-+		speed =  <&ads7846>,"spi-max-frequency:0";
-+		penirq = <&ads7846_pins>,"brcm,pins:0", /* REQUIRED */
-+			 <&ads7846>,"interrupts:0",
-+			 <&ads7846>,"pendown-gpio:4";
-+		penirq_pull = <&ads7846_pins>,"brcm,pull:0";
-+		swapxy = <&ads7846>,"ti,swap-xy?";
-+		xmin =   <&ads7846>,"ti,x-min;0";
-+		ymin =   <&ads7846>,"ti,y-min;0";
-+		xmax =   <&ads7846>,"ti,x-max;0";
-+		ymax =   <&ads7846>,"ti,y-max;0";
-+		pmin =   <&ads7846>,"ti,pressure-min;0";
-+		pmax =   <&ads7846>,"ti,pressure-max;0";
-+		xohms =  <&ads7846>,"ti,x-plate-ohms;0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/adv7282m-overlay.dts b/arch/arm/boot/dts/overlays/adv7282m-overlay.dts
-new file mode 100644
-index 000000000000..f7e97c4a13d8
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/adv7282m-overlay.dts
-@@ -0,0 +1,73 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+// Definitions for Analog Devices ADV7282-M video to CSI2 bridge on VC I2C bus
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2c_csi_dsi>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			adv728x: adv728x@21 {
-+				compatible = "adi,adv7282-m";
-+				reg = <0x21>;
-+				status = "okay";
-+				clock-frequency = <24000000>;
-+				port {
-+					adv728x_0: endpoint {
-+						remote-endpoint = <&csi1_ep>;
-+						clock-lanes = <0>;
-+						data-lanes = <1>;
-+						link-frequencies =
-+							/bits/ 64 <297000000>;
-+
-+						mclk-frequency = <12000000>;
-+					};
-+				};
-+			};
-+		};
-+	};
-+	fragment@1 {
-+		target = <&csi1>;
-+		__overlay__ {
-+			status = "okay";
-+
-+			port {
-+				csi1_ep: endpoint {
-+					remote-endpoint = <&adv728x_0>;
-+					data-lanes = <1>;
-+				};
-+			};
-+		};
-+	};
-+	fragment@2 {
-+		target = <&i2c0if>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&i2c0mux>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&csi1>;
-+		__dormant__ {
-+			brcm,media-controller;
-+		};
-+	};
-+
-+	__overrides__ {
-+		addr =			<&adv728x>,"reg:0";
-+		media-controller = <0>,"=4";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/adv728x-m-overlay.dts b/arch/arm/boot/dts/overlays/adv728x-m-overlay.dts
-new file mode 100644
-index 000000000000..ea392e886984
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/adv728x-m-overlay.dts
-@@ -0,0 +1,37 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+// Definitions for Analog Devices ADV728[0|1|2]-M video to CSI2 bridges on VC
-+// I2C bus
-+
-+#include "adv7282m-overlay.dts"
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	// Fragment numbers deliberately high to avoid conflicts with the
-+	// included adv7282m overlay file.
-+
-+	fragment@101 {
-+		target = <&adv728x>;
-+		__dormant__ {
-+			compatible = "adi,adv7280-m";
-+		};
-+	};
-+	fragment@102 {
-+		target = <&adv728x>;
-+		__dormant__ {
-+			compatible = "adi,adv7281-m";
-+		};
-+	};
-+	fragment@103 {
-+		target = <&adv728x>;
-+		__dormant__ {
-+			compatible = "adi,adv7281-ma";
-+		};
-+	};
-+
-+	__overrides__ {
-+		adv7280m = <0>, "+101";
-+		adv7281m = <0>, "+102";
-+		adv7281ma = <0>, "+103";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/akkordion-iqdacplus-overlay.dts b/arch/arm/boot/dts/overlays/akkordion-iqdacplus-overlay.dts
-new file mode 100644
-index 000000000000..82f9b3734fb1
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/akkordion-iqdacplus-overlay.dts
-@@ -0,0 +1,49 @@
-+// Definitions for Digital Dreamtime Akkordion using IQaudIO DAC+ or DACZero
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			pcm5122@4c {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,pcm5122";
-+				reg = <0x4c>;
-+				AVDD-supply = <&vdd_3v3_reg>;
-+				DVDD-supply = <&vdd_3v3_reg>;
-+				CPVDD-supply = <&vdd_3v3_reg>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		frag2: __overlay__ {
-+			compatible = "iqaudio,iqaudio-dac";
-+			card_name = "Akkordion";
-+			dai_name = "IQaudIO DAC";
-+			dai_stream_name = "IQaudIO DAC HiFi";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		24db_digital_gain = <&frag2>,"iqaudio,24db_digital_gain?";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/allo-boss-dac-pcm512x-audio-overlay.dts b/arch/arm/boot/dts/overlays/allo-boss-dac-pcm512x-audio-overlay.dts
-new file mode 100644
-index 000000000000..873cb2fab52b
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/allo-boss-dac-pcm512x-audio-overlay.dts
-@@ -0,0 +1,59 @@
-+/*
-+ * Definitions for Allo Boss DAC board
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target-path = "/";
-+		__overlay__ {
-+			boss_osc: boss_osc {
-+				compatible = "allo,dac-clk";
-+				#clock-cells = <0>;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			pcm5122@4d {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,pcm5122";
-+				clocks = <&boss_osc>;
-+				reg = <0x4d>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&sound>;
-+		boss_dac: __overlay__ {
-+			compatible = "allo,boss-dac";
-+			i2s-controller = <&i2s>;
-+			mute-gpios = <&gpio 6 1>;
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		24db_digital_gain = <&boss_dac>,"allo,24db_digital_gain?";
-+		slave = <&boss_dac>,"allo,slave?";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/allo-boss2-dac-audio-overlay.dts b/arch/arm/boot/dts/overlays/allo-boss2-dac-audio-overlay.dts
-new file mode 100644
-index 000000000000..a6adfb495eb9
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/allo-boss2-dac-audio-overlay.dts
-@@ -0,0 +1,57 @@
-+/* * Definitions for Allo Boss2 DAC boards
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			#sound-dai-cells = <0>;
-+			status = "okay";
-+			cpu_port: port {
-+				cpu_endpoint: endpoint {
-+					remote-endpoint = <&codec_endpoint>;
-+					bitclock-master = <&codec_endpoint>;
-+					frame-master = <&codec_endpoint>;
-+					dai-format = "i2s";
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+			allo-cs43130@30 {
-+				#sound-dai-cells = <0>;
-+				compatible = "allo,allo-cs43198";
-+				clock44-gpio = <&gpio 5 0>;
-+				clock48-gpio = <&gpio 6 0>;
-+				reg = <0x30>;
-+				port {
-+					codec_endpoint: endpoint {
-+					remote-endpoint = <&cpu_endpoint>;
-+					};
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		boss2_dac: __overlay__ {
-+			compatible = "audio-graph-card";
-+			label = "Allo Boss2";
-+			dais = <&cpu_port>;
-+			status = "okay";
-+		};
-+	};
-+};
-+
-diff --git a/arch/arm/boot/dts/overlays/allo-digione-overlay.dts b/arch/arm/boot/dts/overlays/allo-digione-overlay.dts
-new file mode 100644
-index 000000000000..ea018ace34d4
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/allo-digione-overlay.dts
-@@ -0,0 +1,44 @@
-+// Definitions for Allo DigiOne
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			wm8804@3b {
-+				#sound-dai-cells = <0>;
-+				compatible = "wlf,wm8804";
-+				reg = <0x3b>;
-+				PVDD-supply = <&vdd_3v3_reg>;
-+				DVDD-supply = <&vdd_3v3_reg>;
-+				status = "okay";
-+				wlf,reset-gpio = <&gpio 17 0>;
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "allo,allo-digione";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+			clock44-gpio = <&gpio 5 0>;
-+			clock48-gpio = <&gpio 6 0>;
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/allo-katana-dac-audio-overlay.dts b/arch/arm/boot/dts/overlays/allo-katana-dac-audio-overlay.dts
-new file mode 100644
-index 000000000000..b25fd681f09f
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/allo-katana-dac-audio-overlay.dts
-@@ -0,0 +1,57 @@
-+/*
-+ * Definitions for Allo Katana DAC boards
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			#sound-dai-cells = <0>;
-+			status = "okay";
-+			cpu_port: port {
-+				cpu_endpoint: endpoint {
-+					remote-endpoint = <&codec_endpoint>;
-+					bitclock-master = <&codec_endpoint>;
-+					frame-master = <&codec_endpoint>;
-+					dai-format = "i2s";
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			allo-katana-codec@30 {
-+				#sound-dai-cells = <0>;
-+				compatible = "allo,allo-katana-codec";
-+				reg = <0x30>;
-+				port {
-+					codec_endpoint: endpoint {
-+					remote-endpoint = <&cpu_endpoint>;
-+					};
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		katana_dac: __overlay__ {
-+			compatible = "audio-graph-card";
-+			label = "Allo Katana";
-+			dais = <&cpu_port>;
-+			status = "okay";
-+		};
-+	};
-+};
-+
-diff --git a/arch/arm/boot/dts/overlays/allo-piano-dac-pcm512x-audio-overlay.dts b/arch/arm/boot/dts/overlays/allo-piano-dac-pcm512x-audio-overlay.dts
-new file mode 100644
-index 000000000000..bfc66da6295a
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/allo-piano-dac-pcm512x-audio-overlay.dts
-@@ -0,0 +1,54 @@
-+/*
-+ * Definitions for Allo Piano DAC (2.0/2.1) boards
-+ *
-+ * NB. The Piano DAC 2.1 board contains 2x TI PCM5142 DAC's. One DAC is stereo
-+ * (left/right) and the other provides a subwoofer output, using DSP on the
-+ * chip for digital high/low pass crossover.
-+ * The initial support for this hardware, that doesn't require any codec driver
-+ * modifications, uses only one DAC chip for stereo (left/right) output, the
-+ * chip with 0x4c slave address. The other chip at 0x4d is currently ignored!
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			pcm5142@4c {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,pcm5142";
-+				reg = <0x4c>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		piano_dac: __overlay__ {
-+			compatible = "allo,piano-dac";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		24db_digital_gain =
-+			<&piano_dac>,"allo,24db_digital_gain?";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/allo-piano-dac-plus-pcm512x-audio-overlay.dts b/arch/arm/boot/dts/overlays/allo-piano-dac-plus-pcm512x-audio-overlay.dts
-new file mode 100644
-index 000000000000..d47a35def4f7
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/allo-piano-dac-plus-pcm512x-audio-overlay.dts
-@@ -0,0 +1,57 @@
-+// Definitions for Piano DAC
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			allo_pcm5122_4c: pcm5122@4c {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,pcm5122";
-+				reg = <0x4c>;
-+				sound-name-prefix = "Main";
-+				status = "okay";
-+			};
-+			allo_pcm5122_4d: pcm5122@4d {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,pcm5122";
-+				reg = <0x4d>;
-+				sound-name-prefix = "Sub";
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		piano_dac: __overlay__ {
-+			compatible = "allo,piano-dac-plus";
-+			audio-codec = <&allo_pcm5122_4c &allo_pcm5122_4d>;
-+			i2s-controller = <&i2s>;
-+			mute1-gpios = <&gpio 6 1>;
-+			mute2-gpios = <&gpio 25 1>;
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		24db_digital_gain =
-+			<&piano_dac>,"allo,24db_digital_gain?";
-+		glb_mclk =
-+			<&piano_dac>,"allo,glb_mclk?";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/anyspi-overlay.dts b/arch/arm/boot/dts/overlays/anyspi-overlay.dts
-new file mode 100755
-index 000000000000..87523dcca318
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/anyspi-overlay.dts
-@@ -0,0 +1,205 @@
-+/*
-+ * Universal device tree overlay for SPI devices
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spidev0>;
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spidev1>;
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target-path = "spi1/spidev@0";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target-path = "spi1/spidev@1";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@4 {
-+		target-path = "spi1/spidev@2";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@5 {
-+		target-path = "spi2/spidev@0";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@6 {
-+		target-path = "spi2/spidev@1";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@7 {
-+		target-path = "spi2/spidev@2";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@8 {
-+		target = <&spi0>;
-+		__dormant__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			anyspi_00: anyspi@0 {
-+				reg = <0>;
-+				spi-max-frequency = <500000>;
-+			};
-+		};
-+	};
-+
-+	fragment@9 {
-+		target = <&spi0>;
-+		__dormant__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			anyspi_01: anyspi@1 {
-+				reg = <1>;
-+				spi-max-frequency = <500000>;
-+			};
-+		};
-+	};
-+
-+	fragment@10 {
-+		target = <&spi1>;
-+		__dormant__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			anyspi_10: anyspi@0 {
-+				reg = <0>;
-+				spi-max-frequency = <500000>;
-+			};
-+		};
-+	};
-+
-+	fragment@11 {
-+		target = <&spi1>;
-+		__dormant__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			anyspi_11: anyspi@1 {
-+				reg = <1>;
-+				spi-max-frequency = <500000>;
-+			};
-+		};
-+	};
-+
-+	fragment@12 {
-+		target = <&spi1>;
-+		__dormant__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			anyspi_12: anyspi@2 {
-+				reg = <2>;
-+				spi-max-frequency = <500000>;
-+			};
-+		};
-+	};
-+
-+	fragment@13 {
-+		target = <&spi2>;
-+		__dormant__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			anyspi_20: anyspi@0 {
-+				reg = <0>;
-+				spi-max-frequency = <500000>;
-+			};
-+		};
-+	};
-+
-+	fragment@14 {
-+		target = <&spi2>;
-+		__dormant__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			anyspi_21: anyspi@1 {
-+				reg = <1>;
-+				spi-max-frequency = <500000>;
-+			};
-+		};
-+	};
-+
-+	fragment@15 {
-+		target = <&spi2>;
-+		__dormant__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			anyspi_22: anyspi@2 {
-+				reg = <2>;
-+				spi-max-frequency = <500000>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		spi0-0 = <0>, "+0+8";
-+		spi0-1 = <0>, "+1+9";
-+		spi1-0 = <0>, "+2+10";
-+		spi1-1 = <0>, "+3+11";
-+		spi1-2 = <0>, "+4+12";
-+		spi2-0 = <0>, "+5+13";
-+		spi2-1 = <0>, "+6+14";
-+		spi2-2 = <0>, "+7+15";
-+		dev = <&anyspi_00>,"compatible",
-+		      <&anyspi_01>,"compatible",
-+		      <&anyspi_10>,"compatible",
-+		      <&anyspi_11>,"compatible",
-+		      <&anyspi_12>,"compatible",
-+		      <&anyspi_20>,"compatible",
-+		      <&anyspi_21>,"compatible",
-+		      <&anyspi_22>,"compatible";
-+		speed = <&anyspi_00>, "spi-max-frequency:0",
-+		        <&anyspi_01>, "spi-max-frequency:0",
-+		        <&anyspi_10>, "spi-max-frequency:0",
-+		        <&anyspi_11>, "spi-max-frequency:0",
-+		        <&anyspi_12>, "spi-max-frequency:0",
-+		        <&anyspi_20>, "spi-max-frequency:0",
-+		        <&anyspi_21>, "spi-max-frequency:0",
-+		        <&anyspi_22>, "spi-max-frequency:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/apds9960-overlay.dts b/arch/arm/boot/dts/overlays/apds9960-overlay.dts
-new file mode 100644
-index 000000000000..bb18cca1ac66
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/apds9960-overlay.dts
-@@ -0,0 +1,55 @@
-+// Definitions for APDS-9960 ambient light and gesture sensor
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			apds9960_pins: apds9960_pins@39 {
-+				brcm,pins = <4>;
-+				brcm,function = <0>;
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&apds9960>;
-+		apds9960_irq: __overlay__ {
-+			#interrupt-cells = <2>;
-+			interrupt-parent = <&gpio>;
-+			interrupts = <4 1>;
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			apds9960: apds@39 {
-+				compatible = "avago,apds9960";
-+				reg = <0x39>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		gpiopin = <&apds9960_pins>,"brcm,pins:0",
-+				<&apds9960_irq>,"interrupts:0";
-+		noints = <0>,"!1!2";
-+	};
-+};
-+
-diff --git a/arch/arm/boot/dts/overlays/applepi-dac-overlay.dts b/arch/arm/boot/dts/overlays/applepi-dac-overlay.dts
-new file mode 100644
-index 000000000000..4769296ec9d6
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/applepi-dac-overlay.dts
-@@ -0,0 +1,57 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+    compatible = "brcm,bcm2835";
-+
-+    fragment@0 {
-+        target = <&sound>;
-+        __overlay__ {
-+            compatible = "simple-audio-card";
-+            simple-audio-card,name = "ApplePi-DAC";
-+
-+            status = "okay";
-+
-+            playback_link: simple-audio-card,dai-link@1 {
-+                format = "i2s";
-+
-+                p_cpu_dai: cpu {
-+                    sound-dai = <&i2s>;
-+                    dai-tdm-slot-num = <2>;
-+                    dai-tdm-slot-width = <32>;
-+                };
-+
-+                p_codec_dai: codec {
-+                    sound-dai = <&codec_out>;
-+                };
-+            };
-+        };
-+    };
-+
-+    fragment@1 {
-+        target-path = "/";
-+        __overlay__ {
-+            codec_out: pcm1794a-codec {
-+                #sound-dai-cells = <0>;
-+                compatible = "ti,pcm1794a";
-+                status = "okay";
-+            };
-+        };
-+    };
-+
-+    fragment@2 {
-+        target = <&i2s>;
-+        __overlay__ {
-+            #sound-dai-cells = <0>;
-+            status = "okay";
-+        };
-+    };
-+};
-+
-+/*
-+   Written by: Leonid Ayzenshtat
-+   Company: Orchard Audio (www.orchardaudio.com)
-+
-+   compile with:
-+   dtc -@ -H epapr -O dtb -o ApplePi-DAC.dtbo -W no-unit_address_vs_reg ApplePi-DAC.dts
-+*/
-diff --git a/arch/arm/boot/dts/overlays/arducam-64mp-overlay.dts b/arch/arm/boot/dts/overlays/arducam-64mp-overlay.dts
-new file mode 100644
-index 000000000000..19c8cb6e451c
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/arducam-64mp-overlay.dts
-@@ -0,0 +1,94 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+// Definitions for Arducam 64MP camera module on VC I2C bus
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	i2c_frag: fragment@0 {
-+		target = <&i2c_csi_dsi>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			arducam_64mp: arducam_64mp@1a {
-+				compatible = "arducam,64mp";
-+				reg = <0x1a>;
-+				status = "okay";
-+
-+				clocks = <&cam1_clk>;
-+				clock-names = "xclk";
-+
-+				VANA-supply = <&cam1_reg>;	/* 2.8v */
-+				VDIG-supply = <&cam_dummy_reg>;	/* 1.8v */
-+				VDDL-supply = <&cam_dummy_reg>;	/* 1.2v */
-+
-+				rotation = <0>;
-+				orientation = <2>;
-+
-+				port {
-+					arducam_64mp_0: endpoint {
-+						remote-endpoint = <&csi1_ep>;
-+						clock-lanes = <0>;
-+						data-lanes = <1 2>;
-+						clock-noncontinuous;
-+						link-frequencies =
-+							/bits/ 64 <456000000>;
-+					};
-+				};
-+			};
-+		};
-+	};
-+
-+	csi_frag: fragment@1 {
-+		target = <&csi1>;
-+		csi: __overlay__ {
-+			status = "okay";
-+			brcm,media-controller;
-+
-+			port{
-+				csi1_ep: endpoint{
-+					remote-endpoint = <&arducam_64mp_0>;
-+					clock-lanes = <0>;
-+					data-lanes = <1 2>;
-+					clock-noncontinuous;
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c0if>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	clk_frag: fragment@3 {
-+		target = <&cam1_clk>;
-+		__overlay__ {
-+			clock-frequency = <24000000>;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&i2c0mux>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		rotation = <&arducam_64mp>,"rotation:0";
-+		orientation = <&arducam_64mp>,"orientation:0";
-+		media-controller = <&csi>,"brcm,media-controller?";
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
-+		       <&csi_frag>, "target:0=",<&csi0>,
-+		       <&clk_frag>, "target:0=",<&cam0_clk>,
-+		       <&arducam_64mp>, "clocks:0=",<&cam0_clk>,
-+		       <&arducam_64mp>, "VANA-supply:0=",<&cam0_reg>;
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/arducam-pivariety-overlay.dts b/arch/arm/boot/dts/overlays/arducam-pivariety-overlay.dts
-new file mode 100644
-index 000000000000..7434e242dba6
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/arducam-pivariety-overlay.dts
-@@ -0,0 +1,94 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+// Definitions for Arducam Pivariety camera module on VC I2C bus
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	i2c_frag: fragment@0 {
-+		target = <&i2c_csi_dsi>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			arducam_pivariety: arducam_pivariety@c {
-+				compatible = "arducam,arducam-pivariety";
-+				reg = <0x0c>;
-+				status = "okay";
-+
-+				clocks = <&cam1_clk>;
-+				clock-names = "xclk";
-+
-+				VANA-supply = <&cam1_reg>;	/* 2.8v */
-+				VDIG-supply = <&cam_dummy_reg>;	/* 1.8v */
-+				VDDL-supply = <&cam_dummy_reg>;	/* 1.2v */
-+
-+				rotation = <0>;
-+				orientation = <2>;
-+
-+				port {
-+					arducam_pivariety_0: endpoint {
-+						remote-endpoint = <&csi1_ep>;
-+						clock-lanes = <0>;
-+						data-lanes = <1 2>;
-+						clock-noncontinuous;
-+						link-frequencies =
-+							/bits/ 64 <493500000>;
-+					};
-+				};
-+			};
-+		};
-+	};
-+
-+	csi_frag: fragment@1 {
-+		target = <&csi1>;
-+		csi: __overlay__ {
-+			status = "okay";
-+			brcm,media-controller;
-+
-+			port{
-+				csi1_ep: endpoint{
-+					remote-endpoint = <&arducam_pivariety_0>;
-+					clock-lanes = <0>;
-+					data-lanes = <1 2>;
-+					clock-noncontinuous;
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c0if>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	clk_frag: fragment@3 {
-+		target = <&cam1_clk>;
-+		__overlay__ {
-+			clock-frequency = <24000000>;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&i2c0mux>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		rotation = <&arducam_pivariety>,"rotation:0";
-+		orientation = <&arducam_pivariety>,"orientation:0";
-+		media-controller = <&csi>,"brcm,media-controller?";
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
-+		       <&csi_frag>, "target:0=",<&csi0>,
-+		       <&clk_frag>, "target:0=",<&cam0_clk>,
-+		       <&arducam_pivariety>, "clocks:0=",<&cam0_clk>,
-+		       <&arducam_pivariety>, "VANA-supply:0=",<&cam0_reg>;
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/at86rf233-overlay.dts b/arch/arm/boot/dts/overlays/at86rf233-overlay.dts
-new file mode 100644
-index 000000000000..5a3f4571ee78
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/at86rf233-overlay.dts
-@@ -0,0 +1,57 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/* Overlay for Atmel AT86RF233 IEEE 802.15.4 WPAN transceiver on spi0.0 */
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			status = "okay";
-+
-+			lowpan0: at86rf233@0 {
-+				compatible = "atmel,at86rf233";
-+				reg = <0>;
-+				interrupt-parent = <&gpio>;
-+				interrupts = <23 4>; /* active high */
-+				reset-gpio = <&gpio 24 1>;
-+				sleep-gpio = <&gpio 25 1>;
-+				spi-max-frequency = <3000000>;
-+				xtal-trim = /bits/ 8 <0xf>;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			lowpan0_pins: lowpan0_pins {
-+				brcm,pins = <23 24 25>;
-+				brcm,function = <0 1 1>; /* in out out */
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		interrupt = <&lowpan0>, "interrupts:0",
-+			<&lowpan0_pins>, "brcm,pins:0";
-+		reset     = <&lowpan0>, "reset-gpio:4",
-+			<&lowpan0_pins>, "brcm,pins:4";
-+		sleep     = <&lowpan0>, "sleep-gpio:4",
-+			<&lowpan0_pins>, "brcm,pins:8";
-+		speed     = <&lowpan0>, "spi-max-frequency:0";
-+		trim      = <&lowpan0>, "xtal-trim.0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/audioinjector-addons-overlay.dts b/arch/arm/boot/dts/overlays/audioinjector-addons-overlay.dts
-new file mode 100644
-index 000000000000..57a66eac8e9b
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/audioinjector-addons-overlay.dts
-@@ -0,0 +1,60 @@
-+// Definitions for audioinjector.net audio add on soundcard
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target-path = "/";
-+		__overlay__ {
-+			cs42448_mclk: codec-mclk {
-+				compatible = "fixed-clock";
-+				#clock-cells = <0>;
-+				clock-frequency = <49152000>;
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			cs42448: cs42448@48 {
-+				#sound-dai-cells = <0>;
-+				compatible = "cirrus,cs42448";
-+				reg = <0x48>;
-+				clocks = <&cs42448_mclk>;
-+				clock-names = "mclk";
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&sound>;
-+		snd: __overlay__ {
-+			compatible = "ai,audioinjector-octo-soundcard";
-+			mult-gpios = <&gpio 27 0>, <&gpio 22 0>, <&gpio 23 0>,
-+				     <&gpio 24 0>;
-+			reset-gpios = <&gpio 5 0>;
-+			i2s-controller = <&i2s>;
-+			codec = <&cs42448>;
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		non-stop-clocks = <&snd>, "non-stop-clocks?";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/audioinjector-bare-i2s-overlay.dts b/arch/arm/boot/dts/overlays/audioinjector-bare-i2s-overlay.dts
-new file mode 100644
-index 000000000000..7565ac4d1c28
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/audioinjector-bare-i2s-overlay.dts
-@@ -0,0 +1,50 @@
-+// Definitions for audioinjector.net audio soundcard
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target-path = "/";
-+		__overlay__ {
-+			codec_bare: codec_bare {
-+				compatible = "linux,spdif-dit";
-+				#sound-dai-cells = <0>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "simple-audio-card";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+
-+			simple-audio-card,name = "audioinjector-bare";
-+			simple-audio-card,format = "i2s";
-+
-+			simple-audio-card,bitclock-master = <&dailink0_master>;
-+			simple-audio-card,frame-master = <&dailink0_master>;
-+
-+			dailink0_master: simple-audio-card,cpu {
-+				sound-dai = <&i2s>;
-+				dai-tdm-slot-num = <2>;
-+				dai-tdm-slot-width = <32>;
-+			};
-+
-+			snd_codec: simple-audio-card,codec {
-+					sound-dai = <&codec_bare>;
-+			};
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/audioinjector-isolated-soundcard-overlay.dts b/arch/arm/boot/dts/overlays/audioinjector-isolated-soundcard-overlay.dts
-new file mode 100644
-index 000000000000..63e05cf9665d
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/audioinjector-isolated-soundcard-overlay.dts
-@@ -0,0 +1,55 @@
-+// Definitions for audioinjector.net audio isolated soundcard
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target-path = "/";
-+		__overlay__ {
-+			cs4272_mclk: codec-mclk {
-+				compatible = "fixed-clock";
-+				#clock-cells = <0>;
-+				clock-frequency = <24576000>;
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			cs4272: cs4271@10 {
-+				#sound-dai-cells = <0>;
-+				compatible = "cirrus,cs4271";
-+				reg = <0x10>;
-+				reset-gpio = <&gpio 5 0>;
-+				clocks = <&cs4272_mclk>;
-+				clock-names = "mclk";
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&sound>;
-+		snd: __overlay__ {
-+			compatible = "ai,audioinjector-isolated-soundcard";
-+			mute-gpios = <&gpio 17 0>;
-+			i2s-controller = <&i2s>;
-+			codec = <&cs4272>;
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/audioinjector-ultra-overlay.dts b/arch/arm/boot/dts/overlays/audioinjector-ultra-overlay.dts
-new file mode 100644
-index 000000000000..fb4a4678a17a
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/audioinjector-ultra-overlay.dts
-@@ -0,0 +1,71 @@
-+// Definitions for audioinjector.net audio add on soundcard
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			cs4265: cs4265@4e {
-+				#sound-dai-cells = <0>;
-+				compatible = "cirrus,cs4265";
-+				reg = <0x4e>;
-+				reset-gpios = <&gpio 5 0>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "simple-audio-card";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+
-+			simple-audio-card,name = "audioinjector-ultra";
-+
-+			simple-audio-card,widgets =
-+				"Line", "OUTPUTS",
-+				"Line", "INPUTS";
-+
-+			simple-audio-card,routing =
-+				"OUTPUTS","LINEOUTL",
-+				"OUTPUTS","LINEOUTR",
-+				"OUTPUTS","SPDIFOUT",
-+				"LINEINL","INPUTS",
-+				"LINEINR","INPUTS",
-+				"MICL","INPUTS",
-+				"MICR","INPUTS";
-+
-+			simple-audio-card,format = "i2s";
-+
-+			simple-audio-card,bitclock-master = <&sound_master>;
-+			simple-audio-card,frame-master = <&sound_master>;
-+
-+			simple-audio-card,cpu {
-+				sound-dai = <&i2s>;
-+				dai-tdm-slot-num = <2>;
-+				dai-tdm-slot-width = <32>;
-+			};
-+
-+			sound_master: simple-audio-card,codec {
-+				sound-dai = <&cs4265>;
-+				system-clock-frequency = <12288000>;
-+			};
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/audioinjector-wm8731-audio-overlay.dts b/arch/arm/boot/dts/overlays/audioinjector-wm8731-audio-overlay.dts
-new file mode 100644
-index 000000000000..68f4427d86c3
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/audioinjector-wm8731-audio-overlay.dts
-@@ -0,0 +1,39 @@
-+// Definitions for audioinjector.net audio add on soundcard
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			wm8731@1a {
-+				#sound-dai-cells = <0>;
-+				compatible = "wlf,wm8731";
-+				reg = <0x1a>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "ai,audioinjector-pi-soundcard";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/audiosense-pi-overlay.dts b/arch/arm/boot/dts/overlays/audiosense-pi-overlay.dts
-new file mode 100644
-index 000000000000..81af26374d92
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/audiosense-pi-overlay.dts
-@@ -0,0 +1,82 @@
-+// Definitions for audiosense add on soundcard
-+/dts-v1/;
-+/plugin/;
-+#include <dt-bindings/pinctrl/bcm2835.h>
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target-path = "/";
-+		__overlay__ {
-+			codec_reg_1v8: codec-reg-1v8 {
-+				compatible = "regulator-fixed";
-+				regulator-name = "tlv320aic3204_1v8";
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+				regulator-always-on;
-+			};
-+
-+			/* audio external oscillator */
-+			codec_osc: codec_osc {
-+				compatible = "fixed-clock";
-+				#clock-cells = <0>;
-+				clock-frequency = <12000000>;	/* 12 MHz */
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			codec_rst: codec-rst {
-+				brcm,pins = <26>;
-+				brcm,function = <BCM2835_FSEL_GPIO_OUT>;
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			codec: tlv320aic32x4@18 {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,tlv320aic32x4";
-+				reg = <0x18>;
-+
-+				clocks = <&codec_osc>;
-+				clock-names = "mclk";
-+
-+				iov-supply = <&vdd_3v3_reg>;
-+				ldoin-supply = <&vdd_3v3_reg>;
-+
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				reset-gpios = <&gpio 26 GPIO_ACTIVE_HIGH>;
-+
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "as,audiosense-pi";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/audremap-overlay.dts b/arch/arm/boot/dts/overlays/audremap-overlay.dts
-new file mode 100644
-index 000000000000..29399c5c84f6
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/audremap-overlay.dts
-@@ -0,0 +1,44 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+        compatible = "brcm,bcm2835";
-+
-+        fragment@0 {
-+                target = <&audio_pins>;
-+                frag0: __overlay__ {
-+                };
-+        };
-+
-+	fragment@1 {
-+                target = <&audio_pins>;
-+                __overlay__ {
-+                        brcm,pins = < 12 13 >;
-+                        brcm,function = < 4 >; /* alt0 alt0 */
-+                        brcm,pull = < 0 >;
-+                };
-+        };
-+
-+	fragment@2 {
-+		target = <&audio_pins>;
-+		__dormant__ {
-+                        brcm,pins = < 18 19 >;
-+                        brcm,function = < 2 >; /* alt5 alt5 */
-+                        brcm,pull = < 0 >;
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&chosen>;
-+		__overlay__  {
-+			bootargs = "snd_bcm2835.enable_headphones=1";
-+		};
-+	};
-+
-+	__overrides__ {
-+		swap_lr = <&frag0>, "swap_lr?";
-+		enable_jack = <&frag0>, "enable_jack?";
-+		pins_12_13 = <0>,"+1-2";
-+		pins_18_19 = <0>,"-1+2";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/balena-fin-overlay.dts b/arch/arm/boot/dts/overlays/balena-fin-overlay.dts
-new file mode 100644
-index 000000000000..8fc22587e69c
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/balena-fin-overlay.dts
-@@ -0,0 +1,125 @@
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&mmcnr>;
-+		__overlay__ {
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sdio_pins>;
-+			bus-width = <4>;
-+			brcm,overclock-50 = <35>;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			sdio_pins: sdio_ovl_pins {
-+				brcm,pins = <34 35 36 37 38 39>;
-+				brcm,function = <7>; /* ALT3 = SD1 */
-+				brcm,pull = <0 2 2 2 2 2>;
-+			};
-+
-+			power_ctrl_pins: power_ctrl_pins {
-+				brcm,pins = <40>;
-+				brcm,function = <1>; // out
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target-path = "/";
-+		__overlay__ {
-+			// We should switch to mmc-pwrseq-sd8787 after making it
-+			// compatible with sd8887
-+			// Currently that module requires two GPIOs to function since it
-+			// targets a slightly different chip
-+			power_ctrl: power_ctrl {
-+				compatible = "gpio-poweroff";
-+				gpios = <&gpio 40 1>;
-+				force;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&power_ctrl_pins>;
-+			};
-+
-+			i2c_soft: i2c@0 {
-+				compatible = "i2c-gpio";
-+				gpios = <&gpio 43 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN) /* sda */
-+				         &gpio 42 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN) /* scl */>;
-+				i2c-gpio,delay-us = <5>;
-+				i2c-gpio,scl-open-drain;
-+				i2c-gpio,sda-open-drain;
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+			};
-+
-+			sd8xxx-wlan {
-+				drvdbg = <0x6>;
-+				drv_mode = <0x1>;
-+				cfg80211_wext = <0xf>;
-+				sta_name = "wlan";
-+				wfd_name = "p2p";
-+				cal_data_cfg = "none";
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&i2c_soft>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			gpio_expander: gpio_expander@20 {
-+				compatible = "nxp,pca9554";
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				reg = <0x20>;
-+				status = "okay";
-+			};
-+
-+			// rtc clock
-+			ds1307: ds1307@68 {
-+				compatible = "dallas,ds1307";
-+				reg = <0x68>;
-+				status = "okay";
-+			};
-+
-+			// RGB LEDs (>= v1.1.0)
-+			pca9633: pca9633@62 {
-+				compatible = "nxp,pca9633";
-+				reg = <0x62>;
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+
-+				red@0 {
-+					label = "red";
-+					reg = <0>;
-+					linux,default-trigger = "none";
-+				};
-+				green@1 {
-+					label = "green";
-+					reg = <1>;
-+					linux,default-trigger = "none";
-+				};
-+				blue@2 {
-+					label = "blue";
-+					reg = <2>;
-+					linux,default-trigger = "none";
-+				};
-+				unused@3 {
-+					label = "unused";
-+					reg = <3>;
-+					linux,default-trigger = "none";
-+				};
-+			};
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/camera-mux-2port-overlay.dts b/arch/arm/boot/dts/overlays/camera-mux-2port-overlay.dts
-new file mode 100644
-index 000000000000..ef24d5a7f78c
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/camera-mux-2port-overlay.dts
-@@ -0,0 +1,409 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+// Overlay to configure a 2 port camera multiplexer
-+//
-+// Configuration is based on the Arducam Doubleplexer
-+// which uses a PCA9543 I2C multiplexer to handle the
-+// I2C, and GPIO 4 to control the MIPI mux, and GPIO 17
-+// to enable the CSI-2 mux output (gpio-hog).
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	/* Fragments that complete the individual sensor fragments */
-+	/* IMX290 */
-+	fragment@0 {
-+		target = <&imx290_0_ep>;
-+		__overlay__ {
-+			data-lanes = <1 2>;
-+			link-frequencies =
-+				/bits/ 64 <445500000 297000000>;
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&imx290_1_ep>;
-+		__overlay__ {
-+			data-lanes = <1 2>;
-+			link-frequencies =
-+				/bits/ 64 <445500000 297000000>;
-+		};
-+	};
-+
-+	/* IMX477 */
-+	fragment@10 {
-+		target = <&imx477_0>;
-+		__overlay__ {
-+			compatible = "sony,imx477";
-+		};
-+	};
-+
-+	fragment@11 {
-+		target = <&imx477_1>;
-+		__overlay__ {
-+			compatible = "sony,imx477";
-+		};
-+	};
-+
-+	/* Additional fragments affecting the mux nodes */
-+	fragment@100 {
-+		target = <&mux_in0>;
-+		__dormant__ {
-+			data-lanes = <1>;
-+		};
-+	};
-+	fragment@101 {
-+		target = <&mux_in0>;
-+		__overlay__ {
-+			data-lanes = <1 2>;
-+		};
-+	};
-+
-+	fragment@102 {
-+		target = <&mux_in1>;
-+		__dormant__ {
-+			data-lanes = <1>;
-+		};
-+	};
-+	fragment@103 {
-+		target = <&mux_in1>;
-+		__overlay__ {
-+			data-lanes = <1 2>;
-+		};
-+	};
-+
-+	/* Mux define */
-+	fragment@200 {
-+		target = <&i2c_csi_dsi>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			pca@70 {
-+				reg = <0x70>;
-+				compatible = "nxp,pca9543";
-+
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+
-+				i2c@0 {
-+					reg = <0>;
-+					#address-cells = <1>;
-+					#size-cells = <0>;
-+
-+					#define cam_node imx219_0
-+					#define cam_endpoint imx219_0_ep
-+					#define cam1_clk clk_24mhz
-+					#include "imx219.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node imx477_0
-+					#define cam_endpoint imx477_0_ep
-+					#define cam1_clk clk_24mhz
-+					#include "imx477_378.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node ov5647_0
-+					#define cam_endpoint ov5647_0_ep
-+					#define cam1_clk clk_25mhz
-+					#include "ov5647.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node ov7251_0
-+					#define cam_endpoint ov7251_0_ep
-+					#define cam1_clk clk_24mhz
-+					#include "ov7251.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node ov9281_0
-+					#define cam_endpoint ov9281_0_ep
-+					#define cam1_clk clk_24mhz
-+					#include "ov9281.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node imx258_0
-+					#define cam_endpoint imx258_0_ep
-+					#define cam1_clk clk_24mhz
-+					#include "imx258.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node imx290_0
-+					#define cam_endpoint imx290_0_ep
-+					#define cam1_clk clk_imx290
-+					#include "imx290_327.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node ov2311_0
-+					#define cam_endpoint ov2311_0_ep
-+					#define cam1_clk clk_24mhz
-+					#include "ov2311.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+				};
-+
-+				i2c@1 {
-+					reg = <1>;
-+					#address-cells = <1>;
-+					#size-cells = <0>;
-+
-+					#define cam_node imx219_1
-+					#define cam_endpoint imx219_1_ep
-+					#define cam1_clk clk_24mhz
-+					#include "imx219.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node imx477_1
-+					#define cam_endpoint imx477_1_ep
-+					#define cam1_clk clk_24mhz
-+					#include "imx477_378.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node ov5647_1
-+					#define cam_endpoint ov5647_1_ep
-+					#define cam1_clk clk_25mhz
-+					#include "ov5647.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node ov7251_1
-+					#define cam_endpoint ov7251_1_ep
-+					#define cam1_clk clk_24mhz
-+					#include "ov7251.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node ov9281_1
-+					#define cam_endpoint ov9281_1_ep
-+					#define cam1_clk clk_24mhz
-+					#include "ov9281.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node imx258_1
-+					#define cam_endpoint imx258_1_ep
-+					#define cam1_clk clk_24mhz
-+					#include "imx258.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node imx290_1
-+					#define cam_endpoint imx290_1_ep
-+					#define cam1_clk clk_imx290
-+					#include "imx290_327.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node ov2311_1
-+					#define cam_endpoint ov2311_1_ep
-+					#define cam1_clk clk_24mhz
-+					#include "ov2311.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@201 {
-+		target = <&csi1>;
-+		__overlay__ {
-+			status = "okay";
-+
-+			brcm,media-controller;
-+
-+			port {
-+				csi1_ep: endpoint {
-+					remote-endpoint = <&mux_out>;
-+					clock-lanes = <0>;
-+					data-lanes = <1 2>;
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@202 {
-+		target = <&i2c0if>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@203 {
-+		target-path="/";
-+		__overlay__ {
-+			mux: mux-controller {
-+				compatible = "gpio-mux";
-+				#mux-control-cells = <0>;
-+
-+				mux-gpios = <&gpio 4 GPIO_ACTIVE_HIGH>;
-+			};
-+
-+			video-mux {
-+				compatible = "video-mux";
-+				mux-controls = <&mux>;
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+
-+				port@0 {
-+					reg = <0>;
-+
-+					mux_in0: endpoint {
-+						clock-lanes = <0>;
-+					};
-+				};
-+
-+				port@1 {
-+					reg = <1>;
-+
-+					mux_in1: endpoint {
-+						clock-lanes = <0>;
-+					};
-+				};
-+
-+				port@2 {
-+					reg = <2>;
-+
-+					mux_out: endpoint {
-+						remote-endpoint = <&csi1_ep>;
-+						clock-lanes = <0>;
-+					};
-+				};
-+			};
-+
-+			clk_24mhz: clk_24mhz {
-+				compatible = "fixed-clock";
-+				#clock-cells = <0>;
-+
-+				clock-frequency = <24000000>;
-+				status = "okay";
-+			};
-+
-+			clk_25mhz: clk_25mhz {
-+				compatible = "fixed-clock";
-+				#clock-cells = <0>;
-+
-+				clock-frequency = <25000000>;
-+				status = "okay";
-+			};
-+
-+			clk_imx290: clk_imx290 {
-+				compatible = "fixed-clock";
-+				#clock-cells = <0>;
-+
-+				clock-frequency = <37125000>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@204 {
-+		target = <&i2c0mux>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@205 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			mipi_sw_oe_hog {
-+				gpio-hog;
-+				gpios = <17 GPIO_ACTIVE_LOW>;
-+				output-high;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		cam0-imx219 = <&mux_in0>, "remote-endpoint:0=",<&imx219_0_ep>,
-+			      <&imx219_0_ep>, "remote-endpoint:0=",<&mux_in0>,
-+			      <&mux_in0>, "clock-noncontinuous?",
-+			      <&imx219_0>, "status=okay";
-+		cam0-imx477 = <&mux_in0>, "remote-endpoint:0=",<&imx477_0_ep>,
-+			      <&imx477_0_ep>, "remote-endpoint:0=",<&mux_in0>,
-+			      <&mux_in0>, "clock-noncontinuous?",
-+			      <&imx477_0>, "status=okay";
-+		cam0-ov5647 = <&mux_in0>, "remote-endpoint:0=",<&ov5647_0_ep>,
-+			      <&ov5647_0_ep>, "remote-endpoint:0=",<&mux_in0>,
-+			      <&ov5647_0>, "status=okay";
-+		cam0-ov7251 = <&mux_in0>, "remote-endpoint:0=",<&ov7251_0_ep>,
-+			      <&ov7251_0_ep>, "remote-endpoint:0=",<&mux_in0>,
-+			      <&ov7251_0>, "status=okay",
-+			      <0>,"+100-101";
-+		cam0-ov9281 = <&mux_in0>, "remote-endpoint:0=",<&ov9281_0_ep>,
-+			      <&ov9281_0_ep>, "remote-endpoint:0=",<&mux_in0>,
-+			      <&ov9281_0>, "status=okay";
-+		cam0-imx258 = <&mux_in0>, "remote-endpoint:0=",<&imx258_0_ep>,
-+			      <&imx258_0_ep>, "remote-endpoint:0=",<&mux_in0>,
-+			      <&imx258_0>, "status=okay";
-+		cam0-imx290 = <&mux_in0>, "remote-endpoint:0=",<&imx290_0_ep>,
-+			      <&imx290_0_ep>, "remote-endpoint:0=",<&mux_in0>,
-+			      <&imx290_0>, "status=okay";
-+		cam0-ov2311 = <&mux_in0>, "remote-endpoint:0=",<&ov2311_0_ep>,
-+			      <&ov2311_0_ep>, "remote-endpoint:0=",<&mux_in0>,
-+			      <&ov2311_0>, "status=okay";
-+
-+		cam1-imx219 = <&mux_in1>, "remote-endpoint:0=",<&imx219_1_ep>,
-+			      <&imx219_1_ep>, "remote-endpoint:0=",<&mux_in1>,
-+			      <&mux_in1>, "clock-noncontinuous?",
-+			      <&imx219_1>, "status=okay";
-+		cam1-imx477 = <&mux_in1>, "remote-endpoint:0=",<&imx477_1_ep>,
-+			      <&imx477_1_ep>, "remote-endpoint:0=",<&mux_in1>,
-+			      <&mux_in1>, "clock-noncontinuous?",
-+			      <&imx477_1>, "status=okay";
-+		cam1-ov5647 = <&mux_in1>, "remote-endpoint:0=",<&ov5647_1_ep>,
-+			      <&ov5647_1_ep>, "remote-endpoint:0=",<&mux_in1>,
-+			      <&ov5647_1>, "status=okay";
-+		cam1-ov7251 = <&mux_in1>, "remote-endpoint:0=",<&ov7251_1_ep>,
-+			      <&ov7251_1_ep>, "remote-endpoint:0=",<&mux_in1>,
-+			      <&ov7251_1>, "status=okay",
-+			      <0>,"+102-103";
-+		cam1-ov9281 = <&mux_in1>, "remote-endpoint:0=",<&ov9281_1_ep>,
-+			      <&ov9281_1_ep>, "remote-endpoint:0=",<&mux_in1>,
-+			      <&ov9281_1>, "status=okay";
-+		cam1-imx258 = <&mux_in1>, "remote-endpoint:0=",<&imx258_1_ep>,
-+			      <&imx258_1_ep>, "remote-endpoint:0=",<&mux_in1>,
-+			      <&imx258_1>, "status=okay";
-+		cam1-imx290 = <&mux_in1>, "remote-endpoint:0=",<&imx290_1_ep>,
-+			      <&imx290_1_ep>, "remote-endpoint:0=",<&mux_in1>,
-+			      <&imx290_1>, "status=okay";
-+		cam1-ov2311 = <&mux_in1>, "remote-endpoint:0=",<&ov2311_1_ep>,
-+			      <&ov2311_1_ep>, "remote-endpoint:0=",<&mux_in1>,
-+			      <&ov2311_1>, "status=okay";
-+
-+		cam0-imx290-clk-freq = <&clk_imx290>,"clock-frequency:0",
-+				       <&imx290_0>,"clock-frequency:0";
-+		cam1-imx290-clk-freq = <&clk_imx290>,"clock-frequency:0",
-+				       <&imx290_1>,"clock-frequency:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/camera-mux-4port-overlay.dts b/arch/arm/boot/dts/overlays/camera-mux-4port-overlay.dts
-new file mode 100644
-index 000000000000..e1a9529c4173
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/camera-mux-4port-overlay.dts
-@@ -0,0 +1,684 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+
-+// Overlay to configure a 4 port camera multiplexer
-+//
-+// Configuration is based on the Arducam 4 channel multiplexer
-+// which uses a PCA9543 I2C multiplexer to handle the
-+// I2C, and GPIOs 4, 17, and 18 to control the MIPI muxes.
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	/* Fragments that complete the individual sensor fragments */
-+	/* IMX290 */
-+	fragment@0 {
-+		target = <&imx290_0_ep>;
-+		__overlay__ {
-+			data-lanes = <1 2>;
-+			link-frequencies =
-+				/bits/ 64 <445500000 297000000>;
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&imx290_1_ep>;
-+		__overlay__ {
-+			data-lanes = <1 2>;
-+			link-frequencies =
-+				/bits/ 64 <445500000 297000000>;
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&imx290_2_ep>;
-+		__overlay__ {
-+			data-lanes = <1 2>;
-+			link-frequencies =
-+				/bits/ 64 <445500000 297000000>;
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&imx290_3_ep>;
-+		__overlay__ {
-+			data-lanes = <1 2>;
-+			link-frequencies =
-+				/bits/ 64 <445500000 297000000>;
-+		};
-+	};
-+
-+	/* IMX477 */
-+	fragment@10 {
-+		target = <&imx477_0>;
-+		__overlay__ {
-+			compatible = "sony,imx477";
-+		};
-+	};
-+
-+	fragment@11 {
-+		target = <&imx477_1>;
-+		__overlay__ {
-+			compatible = "sony,imx477";
-+		};
-+	};
-+
-+	fragment@12 {
-+		target = <&imx477_2>;
-+		__overlay__ {
-+			compatible = "sony,imx477";
-+		};
-+	};
-+
-+	fragment@13 {
-+		target = <&imx477_3>;
-+		__overlay__ {
-+			compatible = "sony,imx477";
-+		};
-+	};
-+
-+	/* Additional fragments affecting the mux nodes */
-+	fragment@100 {
-+		target = <&mux_in0>;
-+		__dormant__ {
-+			data-lanes = <1>;
-+		};
-+	};
-+	fragment@101 {
-+		target = <&mux_in0>;
-+		__overlay__ {
-+			data-lanes = <1 2>;
-+		};
-+	};
-+
-+	fragment@102 {
-+		target = <&mux_in1>;
-+		__dormant__ {
-+			data-lanes = <1>;
-+		};
-+	};
-+	fragment@103 {
-+		target = <&mux_in1>;
-+		__overlay__ {
-+			data-lanes = <1 2>;
-+		};
-+	};
-+
-+	fragment@104 {
-+		target = <&mux_in2>;
-+		__dormant__ {
-+			data-lanes = <1>;
-+		};
-+	};
-+	fragment@105 {
-+		target = <&mux_in2>;
-+		__overlay__ {
-+			data-lanes = <1 2>;
-+		};
-+	};
-+
-+	fragment@106 {
-+		target = <&mux_in3>;
-+		__dormant__ {
-+			data-lanes = <1>;
-+		};
-+	};
-+	fragment@107 {
-+		target = <&mux_in3>;
-+		__overlay__ {
-+			data-lanes = <1 2>;
-+		};
-+	};
-+
-+	/* Mux define */
-+	fragment@200 {
-+		target = <&i2c_csi_dsi>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			pca@70 {
-+				reg = <0x70>;
-+				compatible = "nxp,pca9544";
-+
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+
-+				i2c@0 {
-+					reg = <0>;
-+					#address-cells = <1>;
-+					#size-cells = <0>;
-+
-+					#define cam_node imx219_0
-+					#define cam_endpoint imx219_0_ep
-+					#define cam1_clk clk_24mhz
-+					#include "imx219.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node imx477_0
-+					#define cam_endpoint imx477_0_ep
-+					#define cam1_clk clk_24mhz
-+					#include "imx477_378.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node ov5647_0
-+					#define cam_endpoint ov5647_0_ep
-+					#define cam1_clk clk_25mhz
-+					#include "ov5647.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node ov7251_0
-+					#define cam_endpoint ov7251_0_ep
-+					#define cam1_clk clk_24mhz
-+					#include "ov7251.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node ov9281_0
-+					#define cam_endpoint ov9281_0_ep
-+					#define cam1_clk clk_24mhz
-+					#include "ov9281.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node imx258_0
-+					#define cam_endpoint imx258_0_ep
-+					#define cam1_clk clk_24mhz
-+					#include "imx258.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node imx290_0
-+					#define cam_endpoint imx290_0_ep
-+					#define cam1_clk clk_imx290
-+					#include "imx290_327.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node ov2311_0
-+					#define cam_endpoint ov2311_0_ep
-+					#define cam1_clk clk_24mhz
-+					#include "ov2311.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+				};
-+
-+				i2c@1 {
-+					reg = <1>;
-+					#address-cells = <1>;
-+					#size-cells = <0>;
-+
-+					#define cam_node imx219_1
-+					#define cam_endpoint imx219_1_ep
-+					#define cam1_clk clk_24mhz
-+					#include "imx219.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node imx477_1
-+					#define cam_endpoint imx477_1_ep
-+					#define cam1_clk clk_24mhz
-+					#include "imx477_378.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node ov5647_1
-+					#define cam_endpoint ov5647_1_ep
-+					#define cam1_clk clk_25mhz
-+					#include "ov5647.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node ov7251_1
-+					#define cam_endpoint ov7251_1_ep
-+					#define cam1_clk clk_24mhz
-+					#include "ov7251.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node ov9281_1
-+					#define cam_endpoint ov9281_1_ep
-+					#define cam1_clk clk_24mhz
-+					#include "ov9281.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node imx258_1
-+					#define cam_endpoint imx258_1_ep
-+					#define cam1_clk clk_24mhz
-+					#include "imx258.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node imx290_1
-+					#define cam_endpoint imx290_1_ep
-+					#define cam1_clk clk_imx290
-+					#include "imx290_327.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node ov2311_1
-+					#define cam_endpoint ov2311_1_ep
-+					#define cam1_clk clk_24mhz
-+					#include "ov2311.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+				};
-+
-+				i2c@2 {
-+					reg = <2>;
-+					#address-cells = <1>;
-+					#size-cells = <0>;
-+
-+					#define cam_node imx219_2
-+					#define cam_endpoint imx219_2_ep
-+					#define cam1_clk clk_24mhz
-+					#include "imx219.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node imx477_2
-+					#define cam_endpoint imx477_2_ep
-+					#define cam1_clk clk_24mhz
-+					#include "imx477_378.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node ov5647_2
-+					#define cam_endpoint ov5647_2_ep
-+					#define cam1_clk clk_25mhz
-+					#include "ov5647.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node ov7251_2
-+					#define cam_endpoint ov7251_2_ep
-+					#define cam1_clk clk_24mhz
-+					#include "ov7251.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node ov9281_2
-+					#define cam_endpoint ov9281_2_ep
-+					#define cam1_clk clk_24mhz
-+					#include "ov9281.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node imx258_2
-+					#define cam_endpoint imx258_2_ep
-+					#define cam1_clk clk_24mhz
-+					#include "imx258.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node imx290_2
-+					#define cam_endpoint imx290_2_ep
-+					#define cam1_clk clk_imx290
-+					#include "imx290_327.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node ov2311_2
-+					#define cam_endpoint ov2311_2_ep
-+					#define cam1_clk clk_24mhz
-+					#include "ov2311.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+				};
-+
-+				i2c@3 {
-+					reg = <3>;
-+					#address-cells = <1>;
-+					#size-cells = <0>;
-+
-+					#define cam_node imx219_3
-+					#define cam_endpoint imx219_3_ep
-+					#define cam1_clk clk_24mhz
-+					#include "imx219.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node imx477_3
-+					#define cam_endpoint imx477_3_ep
-+					#define cam1_clk clk_24mhz
-+					#include "imx477_378.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node ov5647_3
-+					#define cam_endpoint ov5647_3_ep
-+					#define cam1_clk clk_25mhz
-+					#include "ov5647.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node ov7251_3
-+					#define cam_endpoint ov7251_3_ep
-+					#define cam1_clk clk_24mhz
-+					#include "ov7251.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node ov9281_3
-+					#define cam_endpoint ov9281_3_ep
-+					#define cam1_clk clk_24mhz
-+					#include "ov9281.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node imx258_3
-+					#define cam_endpoint imx258_3_ep
-+					#define cam1_clk clk_24mhz
-+					#include "imx258.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node imx290_3
-+					#define cam_endpoint imx290_3_ep
-+					#define cam1_clk clk_imx290
-+					#include "imx290_327.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+
-+					#define cam_node ov2311_3
-+					#define cam_endpoint ov2311_3_ep
-+					#define cam1_clk clk_24mhz
-+					#include "ov2311.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef cam1_clk
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@201 {
-+		target = <&csi1>;
-+		__overlay__ {
-+			status = "okay";
-+
-+			brcm,media-controller;
-+
-+			port {
-+				csi1_ep: endpoint {
-+					remote-endpoint = <&mux_out>;
-+					clock-lanes = <0>;
-+					data-lanes = <1 2>;
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@202 {
-+		target = <&i2c0if>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@203 {
-+		target-path="/";
-+		__overlay__ {
-+			mux: mux-controller {
-+				compatible = "gpio-mux";
-+				#mux-control-cells = <0>;
-+
-+				/* SEL, En2, En1 */
-+				mux-gpios = <&gpio 4 GPIO_ACTIVE_HIGH>,
-+					    <&gpio 18 GPIO_ACTIVE_HIGH>,
-+					    <&gpio 17 GPIO_ACTIVE_HIGH>;
-+			};
-+
-+			video-mux {
-+				compatible = "video-mux";
-+				mux-controls = <&mux>;
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+
-+				/* GPIO mappings settings for selecting the different
-+				 * camera connectors are not direct, hence port@ values
-+				 * are not straight forward.
-+				 */
-+				port@2 {
-+					/* Port A - GPIO 17 = 0, GPIO 18 = 1,GPIO 4 = 0 */
-+					reg = <2>;
-+
-+					mux_in0: endpoint {
-+						clock-lanes = <0>;
-+					};
-+				};
-+
-+				port@3 {
-+					/* Port B - GPIO 17 = 0, GPIO 18 = 1,GPIO 4 = 1 */
-+					reg = <3>;
-+
-+					mux_in1: endpoint {
-+						clock-lanes = <0>;
-+					};
-+				};
-+
-+				port@4 {
-+					/* Port C - GPIO 17 = 1, GPIO 18 = 0, GPIO 4 = 0 */
-+					reg = <4>;
-+
-+					mux_in2: endpoint {
-+						clock-lanes = <0>;
-+					};
-+				};
-+
-+				port@5 {
-+					/* Port D - GPIO 17 = 1, GPIO 18 = 0, GPIO 4 = 1 */
-+					reg = <5>;
-+
-+					mux_in3: endpoint {
-+						clock-lanes = <0>;
-+					};
-+				};
-+
-+				port@6 {
-+					/* Output port needs to be the highest port number */
-+					reg = <6>;
-+
-+					mux_out: endpoint {
-+						remote-endpoint = <&csi1_ep>;
-+						clock-lanes = <0>;
-+					};
-+				};
-+			};
-+
-+			clk_24mhz: clk_24mhz {
-+				compatible = "fixed-clock";
-+				#clock-cells = <0>;
-+
-+				clock-frequency = <24000000>;
-+				status = "okay";
-+			};
-+
-+			clk_25mhz: clk_25mhz {
-+				compatible = "fixed-clock";
-+				#clock-cells = <0>;
-+
-+				clock-frequency = <25000000>;
-+				status = "okay";
-+			};
-+
-+			clk_imx290: clk_imx290 {
-+				compatible = "fixed-clock";
-+				#clock-cells = <0>;
-+
-+				clock-frequency = <37125000>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@204 {
-+		target = <&i2c0mux>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		cam0-imx219 = <&mux_in0>, "remote-endpoint:0=",<&imx219_0_ep>,
-+			      <&imx219_0_ep>, "remote-endpoint:0=",<&mux_in0>,
-+			      <&mux_in0>, "clock-noncontinuous?",
-+			      <&imx219_0>, "status=okay";
-+		cam0-imx477 = <&mux_in0>, "remote-endpoint:0=",<&imx477_0_ep>,
-+			      <&imx477_0_ep>, "remote-endpoint:0=",<&mux_in0>,
-+			      <&mux_in0>, "clock-noncontinuous?",
-+			      <&imx477_0>, "status=okay";
-+		cam0-ov5647 = <&mux_in0>, "remote-endpoint:0=",<&ov5647_0_ep>,
-+			      <&ov5647_0_ep>, "remote-endpoint:0=",<&mux_in0>,
-+			      <&ov5647_0>, "status=okay";
-+		cam0-ov7251 = <&mux_in0>, "remote-endpoint:0=",<&ov7251_0_ep>,
-+			      <&ov7251_0_ep>, "remote-endpoint:0=",<&mux_in0>,
-+			      <&ov7251_0>, "status=okay",
-+			      <0>,"+100-101";
-+		cam0-ov9281 = <&mux_in0>, "remote-endpoint:0=",<&ov9281_0_ep>,
-+			      <&ov9281_0_ep>, "remote-endpoint:0=",<&mux_in0>,
-+			      <&ov9281_0>, "status=okay";
-+		cam0-imx258 = <&mux_in0>, "remote-endpoint:0=",<&imx258_0_ep>,
-+			      <&imx258_0_ep>, "remote-endpoint:0=",<&mux_in0>,
-+			      <&imx258_0>, "status=okay";
-+		cam0-imx290 = <&mux_in0>, "remote-endpoint:0=",<&imx290_0_ep>,
-+			      <&imx290_0_ep>, "remote-endpoint:0=",<&mux_in0>,
-+			      <&imx290_0>, "status=okay";
-+		cam0-ov2311 = <&mux_in0>, "remote-endpoint:0=",<&ov2311_0_ep>,
-+			      <&ov2311_0_ep>, "remote-endpoint:0=",<&mux_in0>,
-+			      <&ov2311_0>, "status=okay";
-+
-+		cam1-imx219 = <&mux_in1>, "remote-endpoint:0=",<&imx219_1_ep>,
-+			      <&imx219_1_ep>, "remote-endpoint:0=",<&mux_in1>,
-+			      <&mux_in1>, "clock-noncontinuous?",
-+			      <&imx219_1>, "status=okay";
-+		cam1-imx477 = <&mux_in1>, "remote-endpoint:0=",<&imx477_1_ep>,
-+			      <&imx477_1_ep>, "remote-endpoint:0=",<&mux_in1>,
-+			      <&mux_in1>, "clock-noncontinuous?",
-+			      <&imx477_1>, "status=okay";
-+		cam1-ov5647 = <&mux_in1>, "remote-endpoint:0=",<&ov5647_1_ep>,
-+			      <&ov5647_1_ep>, "remote-endpoint:0=",<&mux_in1>,
-+			      <&ov5647_1>, "status=okay";
-+		cam1-ov7251 = <&mux_in1>, "remote-endpoint:0=",<&ov7251_1_ep>,
-+			      <&ov7251_1_ep>, "remote-endpoint:0=",<&mux_in1>,
-+			      <&ov7251_1>, "status=okay",
-+			      <0>,"+102-103";
-+		cam1-ov9281 = <&mux_in1>, "remote-endpoint:0=",<&ov9281_1_ep>,
-+			      <&ov9281_1_ep>, "remote-endpoint:0=",<&mux_in1>,
-+			      <&ov9281_1>, "status=okay";
-+		cam1-imx258 = <&mux_in1>, "remote-endpoint:0=",<&imx258_1_ep>,
-+			      <&imx258_1_ep>, "remote-endpoint:0=",<&mux_in1>,
-+			      <&imx258_1>, "status=okay";
-+		cam1-imx290 = <&mux_in1>, "remote-endpoint:0=",<&imx290_1_ep>,
-+			      <&imx290_1_ep>, "remote-endpoint:0=",<&mux_in1>,
-+			      <&imx290_1>, "status=okay";
-+		cam1-ov2311 = <&mux_in1>, "remote-endpoint:0=",<&ov2311_1_ep>,
-+			      <&ov2311_1_ep>, "remote-endpoint:0=",<&mux_in1>,
-+			      <&ov2311_1>, "status=okay";
-+
-+		cam2-imx219 = <&mux_in2>, "remote-endpoint:0=",<&imx219_2_ep>,
-+			      <&imx219_2_ep>, "remote-endpoint:0=",<&mux_in2>,
-+			      <&mux_in2>, "clock-noncontinuous?",
-+			      <&imx219_2>, "status=okay";
-+		cam2-imx477 = <&mux_in2>, "remote-endpoint:0=",<&imx477_2_ep>,
-+			      <&imx477_2_ep>, "remote-endpoint:0=",<&mux_in2>,
-+			      <&mux_in2>, "clock-noncontinuous?",
-+			      <&imx477_2>, "status=okay";
-+		cam2-ov5647 = <&mux_in2>, "remote-endpoint:0=",<&ov5647_2_ep>,
-+			      <&ov5647_2_ep>, "remote-endpoint:0=",<&mux_in2>,
-+			      <&ov5647_2>, "status=okay";
-+		cam2-ov7251 = <&mux_in2>, "remote-endpoint:0=",<&ov7251_2_ep>,
-+			      <&ov7251_2_ep>, "remote-endpoint:0=",<&mux_in2>,
-+			      <&ov7251_2>, "status=okay",
-+			      <0>,"+104-105";
-+		cam2-ov9281 = <&mux_in2>, "remote-endpoint:0=",<&ov9281_2_ep>,
-+			      <&ov9281_2_ep>, "remote-endpoint:0=",<&mux_in2>,
-+			      <&ov9281_2>, "status=okay";
-+		cam2-imx258 = <&mux_in2>, "remote-endpoint:0=",<&imx258_2_ep>,
-+			      <&imx258_2>, "status=okay",
-+			      <&imx258_2>, "remote-endpoint:0=",<&mux_in2>;
-+		cam2-imx290 = <&mux_in2>, "remote-endpoint:0=",<&imx290_2_ep>,
-+			      <&imx290_2_ep>, "remote-endpoint:0=",<&mux_in2>,
-+			      <&imx290_2>, "status=okay";
-+		cam2-ov2311 = <&mux_in2>, "remote-endpoint:0=",<&ov2311_2_ep>,
-+			      <&ov2311_2_ep>, "remote-endpoint:0=",<&mux_in2>,
-+			      <&ov2311_2>, "status=okay";
-+
-+		cam3-imx219 = <&mux_in3>, "remote-endpoint:0=",<&imx219_3_ep>,
-+			      <&imx219_3_ep>, "remote-endpoint:0=",<&mux_in3>,
-+			      <&mux_in3>, "clock-noncontinuous?",
-+			      <&imx219_3>, "status=okay";
-+		cam3-imx477 = <&mux_in3>, "remote-endpoint:0=",<&imx477_3_ep>,
-+			      <&imx477_3_ep>, "remote-endpoint:0=",<&mux_in3>,
-+			      <&mux_in3>, "clock-noncontinuous?",
-+			      <&imx477_3>, "status=okay";
-+		cam3-ov5647 = <&mux_in3>, "remote-endpoint:0=",<&ov5647_3_ep>,
-+			      <&ov5647_3_ep>, "remote-endpoint:0=",<&mux_in3>,
-+			      <&ov5647_3>, "status=okay";
-+		cam3-ov7251 = <&mux_in3>, "remote-endpoint:0=",<&ov7251_3_ep>,
-+			      <&ov7251_3_ep>, "remote-endpoint:0=",<&mux_in3>,
-+			      <&ov7251_3>, "status=okay",
-+			      <0>,"+106-107";
-+		cam3-ov9281 = <&mux_in3>, "remote-endpoint:0=",<&ov9281_3_ep>,
-+			      <&ov9281_3_ep>, "remote-endpoint:0=",<&mux_in3>,
-+			      <&ov9281_3>, "status=okay";
-+		cam3-imx258 = <&mux_in3>, "remote-endpoint:0=",<&imx258_3_ep>,
-+			      <&imx258_3_ep>, "remote-endpoint:0=",<&mux_in3>,
-+			      <&imx258_3>, "status=okay";
-+		cam3-imx290 = <&mux_in3>, "remote-endpoint:0=",<&imx290_3_ep>,
-+			      <&imx290_3_ep>, "remote-endpoint:0=",<&mux_in3>,
-+			      <&imx290_3>, "status=okay";
-+		cam3-ov2311 = <&mux_in3>, "remote-endpoint:0=",<&ov2311_3_ep>,
-+			      <&ov2311_3_ep>, "remote-endpoint:0=",<&mux_in3>,
-+			      <&ov2311_3>, "status=okay";
-+
-+		cam0-imx290-clk-freq = <&clk_imx290>,"clock-frequency:0",
-+				       <&imx290_0>,"clock-frequency:0";
-+		cam1-imx290-clk-freq = <&clk_imx290>,"clock-frequency:0",
-+				       <&imx290_1>,"clock-frequency:0";
-+		cam2-imx290-clk-freq = <&clk_imx290>,"clock-frequency:0",
-+				       <&imx290_2>,"clock-frequency:0";
-+		cam3-imx290-clk-freq = <&clk_imx290>,"clock-frequency:0",
-+				       <&imx290_3>,"clock-frequency:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/cap1106-overlay.dts b/arch/arm/boot/dts/overlays/cap1106-overlay.dts
-new file mode 100644
-index 000000000000..0a585e725f84
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/cap1106-overlay.dts
-@@ -0,0 +1,52 @@
-+// Overlay for cap1106 from  Microchip Semiconductor
-+// add CONFIG_KEYBOARD_CAP11XX=y
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+        compatible = "brcm,bcm2835";
-+        fragment@0 {
-+                target = <&i2c1>;
-+                __overlay__{
-+                        status = "okay";
-+                        cap1106: cap1106@28 {
-+                                compatible = "microchip,cap1106";
-+                                pinctrl-0 = <&cap1106_pins>;
-+                                pinctrl-names = "default";
-+                                interrupt-parent = <&gpio>;
-+                                interrupts = <4 2>;
-+                                reg = <0x28>;
-+                                autorepeat;
-+                                microchip,sensor-gain = <2>;
-+
-+                                linux,keycodes = <2>,           /* KEY_1 */
-+                                                <3>,            /* KEY_2 */
-+                                                <4>,            /* KEY_3 */
-+                                                <5>,            /* KEY_4 */
-+                                                <6>,            /* KEY_5 */
-+                                                <7>;            /* KEY_6 */
-+
-+                                #address-cells = <1>;
-+                                #size-cells = <0>;
-+                                status = "okay";
-+
-+                        };
-+                };
-+        };
-+        fragment@1 {
-+                target = <&gpio>;
-+                __overlay__ {
-+                        cap1106_pins: cap1106_pins {
-+                                brcm,pins = <4>;
-+                                brcm,function = <0>; /* in */
-+                                brcm,pull = <0>; /* none */
-+                        };
-+                };
-+        };
-+
-+        __overrides__ {
-+                int_pin = <&cap1106>, "interrupts:0",
-+                          <&cap1106_pins>, "brcm,pins:0";
-+        };
-+};
-diff --git a/arch/arm/boot/dts/overlays/chipdip-dac-overlay.dts b/arch/arm/boot/dts/overlays/chipdip-dac-overlay.dts
-new file mode 100644
-index 000000000000..09c7417b4707
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/chipdip-dac-overlay.dts
-@@ -0,0 +1,46 @@
-+/*
-+ * Device Tree overlay for ChipDip DAC
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target-path = "/";
-+		__overlay__ {
-+			spdif-transmitter {
-+				#address-cells = <0>;
-+				#size-cells = <0>;
-+				#sound-dai-cells = <0>;
-+				compatible = "linux,spdif-dit";
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "chipdip,chipdip-dac";
-+			i2s-controller = <&i2s>;
-+			sr0-gpios = <&gpio 5 0>;
-+			sr1-gpios = <&gpio 6 0>;
-+			sr2-gpios = <&gpio 12 0>;
-+			res0-gpios = <&gpio 24 0>;
-+			res1-gpios = <&gpio 27 0>;
-+			mute-gpios = <&gpio 4 0>;
-+			sdwn-gpios = <&gpio 13 0>;
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/cirrus-wm5102-overlay.dts b/arch/arm/boot/dts/overlays/cirrus-wm5102-overlay.dts
-new file mode 100644
-index 000000000000..ed0c2745399f
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/cirrus-wm5102-overlay.dts
-@@ -0,0 +1,172 @@
-+// Definitions for the Cirrus Logic Audio Card
-+/dts-v1/;
-+/plugin/;
-+#include <dt-bindings/pinctrl/bcm2835.h>
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/mfd/arizona.h>
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			wlf_5102_pins: wlf_5102_pins {
-+				brcm,pins = <17 22 27>;
-+				brcm,function = <
-+					BCM2835_FSEL_GPIO_OUT
-+					BCM2835_FSEL_GPIO_OUT
-+					BCM2835_FSEL_GPIO_IN
-+				>;
-+			};
-+			wlf_8804_pins: wlf_8804_pins {
-+				brcm,pins = <8>;
-+				brcm,function = <BCM2835_FSEL_GPIO_OUT>;
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&spi0_cs_pins>;
-+		__overlay__ {
-+			brcm,pins = <7>;
-+			brcm,function = <BCM2835_FSEL_GPIO_OUT>;
-+		};
-+	};
-+
-+
-+	fragment@3 {
-+		target-path = "/";
-+		__overlay__ {
-+			rpi_cirrus_reg_1v8: rpi_cirrus_reg_1v8 {
-+				compatible = "regulator-fixed";
-+				regulator-name = "RPi-Cirrus 1v8";
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+				regulator-always-on;
-+			};
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@5 {
-+		target = <&spidev1>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@6 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+			cs-gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
-+
-+			wm5102@0{
-+				compatible = "wlf,wm5102";
-+				reg = <0>;
-+
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&wlf_5102_pins>;
-+
-+				spi-max-frequency = <500000>;
-+
-+				interrupt-parent = <&gpio>;
-+				interrupts = <27 8>;
-+				interrupt-controller;
-+				#interrupt-cells = <2>;
-+
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+
-+				LDOVDD-supply = <&rpi_cirrus_reg_1v8>;
-+				AVDD-supply = <&rpi_cirrus_reg_1v8>;
-+				DBVDD1-supply = <&rpi_cirrus_reg_1v8>;
-+				DBVDD2-supply = <&vdd_3v3_reg>;
-+				DBVDD3-supply = <&vdd_3v3_reg>;
-+				CPVDD-supply = <&rpi_cirrus_reg_1v8>;
-+				SPKVDDL-supply = <&vdd_5v0_reg>;
-+				SPKVDDR-supply = <&vdd_5v0_reg>;
-+				DCVDD-supply = <&arizona_ldo1>;
-+
-+				reset-gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
-+				wlf,ldoena = <&gpio 22 GPIO_ACTIVE_HIGH>;
-+				wlf,gpio-defaults = <
-+					ARIZONA_GP_DEFAULT
-+					ARIZONA_GP_DEFAULT
-+					ARIZONA_GP_DEFAULT
-+					ARIZONA_GP_DEFAULT
-+					ARIZONA_GP_DEFAULT
-+				>;
-+				wlf,micd-configs = <0 1 0>;
-+				wlf,dmic-ref = <
-+					ARIZONA_DMIC_MICVDD
-+					ARIZONA_DMIC_MICBIAS2
-+					ARIZONA_DMIC_MICVDD
-+					ARIZONA_DMIC_MICVDD
-+				>;
-+				wlf,inmode = <
-+					ARIZONA_INMODE_DIFF
-+					ARIZONA_INMODE_DMIC
-+					ARIZONA_INMODE_SE
-+					ARIZONA_INMODE_DIFF
-+				>;
-+				status = "okay";
-+
-+				arizona_ldo1: ldo1 {
-+					regulator-name = "LDO1";
-+					// default constraints as in
-+					// arizona-ldo1.c
-+					regulator-min-microvolt = <1200000>;
-+					regulator-max-microvolt = <1800000>;
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@7 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			wm8804@3b {
-+				compatible = "wlf,wm8804";
-+				reg = <0x3b>;
-+				status = "okay";
-+
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&wlf_8804_pins>;
-+
-+				PVDD-supply = <&vdd_3v3_reg>;
-+				DVDD-supply = <&vdd_3v3_reg>;
-+				wlf,reset-gpio = <&gpio 8 GPIO_ACTIVE_HIGH>;
-+			};
-+		};
-+	};
-+
-+	fragment@8 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "wlf,rpi-cirrus";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/cma-overlay.dts b/arch/arm/boot/dts/overlays/cma-overlay.dts
-new file mode 100644
-index 000000000000..1d87c599f909
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/cma-overlay.dts
-@@ -0,0 +1,36 @@
-+/*
-+ * cma.dts
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&cma>;
-+		frag0: __overlay__ {
-+			/*
-+			 * The default size when using this overlay is 256 MB
-+			 * and should be kept as is for backwards
-+			 * compatibility.
-+			 */
-+			size = <0x10000000>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		cma-512 = <&frag0>,"size:0=",<0x20000000>;
-+		cma-448 = <&frag0>,"size:0=",<0x1c000000>;
-+		cma-384 = <&frag0>,"size:0=",<0x18000000>;
-+		cma-320 = <&frag0>,"size:0=",<0x14000000>;
-+		cma-256 = <&frag0>,"size:0=",<0x10000000>;
-+		cma-192 = <&frag0>,"size:0=",<0xC000000>;
-+		cma-128 = <&frag0>,"size:0=",<0x8000000>;
-+		cma-96  = <&frag0>,"size:0=",<0x6000000>;
-+		cma-64  = <&frag0>,"size:0=",<0x4000000>;
-+		cma-size = <&frag0>,"size:0"; /* in bytes, 4MB aligned */
-+		cma-default = <0>,"-0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/cutiepi-panel-overlay.dts b/arch/arm/boot/dts/overlays/cutiepi-panel-overlay.dts
-new file mode 100644
-index 000000000000..6f9694e81d6a
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/cutiepi-panel-overlay.dts
-@@ -0,0 +1,117 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+    compatible = "brcm,bcm2711";
-+
-+    fragment@0 {
-+        target=<&dsi1>;
-+
-+        __overlay__ {
-+            status = "okay";
-+
-+            #address-cells = <1>;
-+            #size-cells = <0>;
-+
-+            port {
-+                dsi1_out_port: endpoint {
-+                    remote-endpoint = <&panel_dsi_in1>;
-+                };
-+            };
-+
-+            display1: panel@0 {
-+                compatible = "nwe,nwe080";
-+                reg=<0>;
-+                backlight = <&rpi_backlight>;
-+                reset-gpios = <&gpio 20 0>;
-+                port {
-+                    panel_dsi_in1: endpoint {
-+                        remote-endpoint = <&dsi1_out_port>;
-+                    };
-+                };
-+            };
-+        };
-+    };
-+
-+    fragment@1 {
-+        target = <&gpio>;
-+        __overlay__ {
-+            pwm_pins: pwm_pins {
-+                brcm,pins = <12>;
-+                brcm,function = <4>; // ALT0
-+            };
-+        };
-+    };
-+
-+    fragment@2 {
-+        target = <&pwm>;
-+        frag1: __overlay__ {
-+            pinctrl-names = "default";
-+            pinctrl-0 = <&pwm_pins>;
-+            assigned-clock-rates = <1000000>;
-+            status = "okay";
-+        };
-+    };
-+
-+    fragment@3 {
-+        target-path = "/";
-+        __overlay__ {
-+            rpi_backlight: rpi_backlight {
-+                compatible = "pwm-backlight";
-+                brightness-levels = <0 6 8 12 16 24 32 40 48 64 96 128 160 192 224 255>;
-+                default-brightness-level = <6>;
-+                pwms = <&pwm 0 200000>;
-+                power-supply = <&vdd_3v3_reg>;
-+                status = "okay";
-+            };
-+        };
-+    };
-+
-+    fragment@4 {
-+        target = <&i2c6>;
-+        frag0: __overlay__ {
-+            status = "okay";
-+            pinctrl-names = "default";
-+            pinctrl-0 = <&i2c6_pins>;
-+            clock-frequency = <100000>;
-+        };
-+    };
-+
-+    fragment@5 {
-+        target = <&i2c6_pins>;
-+        __overlay__ {
-+            brcm,pins = <22 23>;
-+        };
-+    };
-+
-+    fragment@6 {
-+            target = <&gpio>;
-+            __overlay__ {
-+                goodix_pins: goodix_pins {
-+                    brcm,pins = <21 26>; // interrupt and reset
-+                    brcm,function = <0 0>; // in
-+                    brcm,pull = <2 2>; // pull-up
-+                };
-+            };
-+    };
-+
-+    fragment@7 {
-+        target = <&i2c6>;
-+        __overlay__ {
-+            #address-cells = <1>;
-+            #size-cells = <0>;
-+            status = "okay";
-+
-+            gt9xx: gt9xx@5d {
-+                compatible = "goodix,gt9271"; 
-+                reg = <0x5D>;
-+                pinctrl-names = "default";
-+                pinctrl-0 = <&goodix_pins>;
-+                interrupt-parent = <&gpio>;
-+                interrupts = <21 2>; // high-to-low edge triggered
-+                irq-gpios = <&gpio 21 0>; 
-+                reset-gpios = <&gpio 26 0>;
-+            };
-+        };
-+    };
-+};
-diff --git a/arch/arm/boot/dts/overlays/dacberry400-overlay.dts b/arch/arm/boot/dts/overlays/dacberry400-overlay.dts
-new file mode 100644
-index 000000000000..4e03baadbd71
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/dacberry400-overlay.dts
-@@ -0,0 +1,71 @@
-+// Definitions for DACberry400
-+/dts-v1/;
-+/plugin/;
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target-path = "/";
-+		__overlay__ {
-+			codec_1v8_reg: codec-1v8-reg {
-+			compatible = "regulator-fixed";
-+			regulator-name = "tlv320aic3104_1v8";
-+			regulator-min-microvolt = <1800000>;
-+			regulator-max-microvolt = <1800000>;
-+			regulator-always-on;
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			codec_rst: codec-rst {
-+				brcm,pins = <26>;
-+				brcm,function = <1>;
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			tlv320aic3104@18 {
-+				#sound-dai-cells = <0>;
-+				reg = <0x18>;
-+
-+				compatible = "ti,tlv320aic3x";
-+				AVDD-supply = <&vdd_3v3_reg>;
-+				DRVDD-supply = <&vdd_3v3_reg>;
-+				DVDD-supply = <&codec_1v8_reg>;
-+				IOVDD-supply = <&codec_1v8_reg>;
-+
-+				gpio-controller;
-+				reset-gpios = <&gpio 26 1>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "osaelectronics,dacberry400";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+		};
-+	};
-+};
-+
-+
-diff --git a/arch/arm/boot/dts/overlays/dht11-overlay.dts b/arch/arm/boot/dts/overlays/dht11-overlay.dts
-new file mode 100644
-index 000000000000..8b0fc6b7a3cb
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/dht11-overlay.dts
-@@ -0,0 +1,48 @@
-+/*
-+ * Overlay for the DHT11/21/22 humidity/temperature sensor modules.
-+ */
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target-path = "/";
-+		__overlay__ {
-+			dht11: dht11@4 {
-+				compatible = "dht11";
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&dht11_pins>;
-+				gpios = <&gpio 4 0>;
-+				status = "okay";
-+				#io-channel-cells = <1>;
-+			};
-+
-+			iio: iio-hwmon@4 {
-+				compatible = "iio-hwmon";
-+				status = "okay";
-+				io-channels = <&dht11 0>, <&dht11 1>;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			dht11_pins: dht11_pins@4 {
-+				brcm,pins = <4>;
-+				brcm,function = <0>; // in
-+				brcm,pull = <0>; // off
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		gpiopin = <&dht11_pins>,"brcm,pins:0",
-+			<&dht11_pins>, "reg:0",
-+			<&dht11>,"gpios:4",
-+			<&dht11>,"reg:0",
-+			<&iio>,"reg:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/dionaudio-kiwi-overlay.dts b/arch/arm/boot/dts/overlays/dionaudio-kiwi-overlay.dts
-new file mode 100644
-index 000000000000..128ef54eb89f
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/dionaudio-kiwi-overlay.dts
-@@ -0,0 +1,39 @@
-+// Definitions for Dion Audio KIWI streamer
-+
-+/*
-+ * PCM1794 DAC (in hardware mode).
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target-path = "/";
-+		__overlay__ {
-+			pcm1794a-codec {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,pcm1794a";
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "dionaudio,dionaudio-kiwi";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/dionaudio-loco-overlay.dts b/arch/arm/boot/dts/overlays/dionaudio-loco-overlay.dts
-new file mode 100644
-index 000000000000..d863e5c167cc
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/dionaudio-loco-overlay.dts
-@@ -0,0 +1,39 @@
-+// Definitions for Dion Audio LOCO DAC-AMP
-+
-+/*
-+ * PCM5242 DAC (in hardware mode) and TPA3118 AMP.
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target-path = "/";
-+		__overlay__ {
-+			pcm5102a-codec {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,pcm5102a";
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "dionaudio,loco-pcm5242-tpa3118";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/dionaudio-loco-v2-overlay.dts b/arch/arm/boot/dts/overlays/dionaudio-loco-v2-overlay.dts
-new file mode 100644
-index 000000000000..dfb8922a654b
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/dionaudio-loco-v2-overlay.dts
-@@ -0,0 +1,49 @@
-+/*
-+ * Definitions for Dion Audio LOCO-V2 DAC-AMP
-+ *  eg. dtoverlay=dionaudio-loco-v2
-+ *
-+ * PCM5242 DAC (in software mode) and TPA3255 AMP.
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&sound>;
-+		frag0: __overlay__ {
-+			compatible = "dionaudio,dionaudio-loco-v2";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			pcm5122@4c {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,pcm5122";
-+				reg = <0x4d>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		24db_digital_gain = <&frag0>,"dionaudio,24db_digital_gain?";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/disable-bt-overlay.dts b/arch/arm/boot/dts/overlays/disable-bt-overlay.dts
-new file mode 100644
-index 000000000000..d5a66e5d76a9
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/disable-bt-overlay.dts
-@@ -0,0 +1,64 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/* Disable Bluetooth and restore UART0/ttyAMA0 over GPIOs 14 & 15.
-+   To disable the systemd service that initialises the modem so it doesn't use
-+   the UART:
-+
-+       sudo systemctl disable hciuart
-+*/
-+
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&uart1>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&uart0>;
-+		__overlay__ {
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&uart0_pins>;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&bt>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&uart0_pins>;
-+		__overlay__ {
-+			brcm,pins;
-+			brcm,function;
-+			brcm,pull;
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&bt_pins>;
-+		__overlay__ {
-+			brcm,pins;
-+			brcm,function;
-+			brcm,pull;
-+		};
-+	};
-+
-+	fragment@5 {
-+		target-path = "/aliases";
-+		__overlay__ {
-+			serial0 = "/soc/serial@7e201000";
-+			serial1 = "/soc/serial@7e215040";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/disable-wifi-overlay.dts b/arch/arm/boot/dts/overlays/disable-wifi-overlay.dts
-new file mode 100644
-index 000000000000..75e046463900
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/disable-wifi-overlay.dts
-@@ -0,0 +1,20 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&mmc>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&mmcnr>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/dpi18-overlay.dts b/arch/arm/boot/dts/overlays/dpi18-overlay.dts
-new file mode 100644
-index 000000000000..4abe5be744db
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/dpi18-overlay.dts
-@@ -0,0 +1,39 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	// There is no DPI driver module, but we need a platform device
-+	// node (that doesn't already use pinctrl) to hang the pinctrl
-+	// reference on - leds will do
-+
-+	fragment@0 {
-+		target = <&fb>;
-+		__overlay__ {
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&dpi18_pins>;
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&vc4>;
-+		__overlay__ {
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&dpi18_pins>;
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			dpi18_pins: dpi18_pins {
-+				brcm,pins = <0 1 2 3 4 5 6 7 8 9 10 11
-+					     12 13 14 15 16 17 18 19 20
-+					     21>;
-+				brcm,function = <6>; /* alt2 */
-+				brcm,pull = <0>; /* no pull */
-+			};
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/dpi18cpadhi-overlay.dts b/arch/arm/boot/dts/overlays/dpi18cpadhi-overlay.dts
-new file mode 100644
-index 000000000000..50c88a1ed299
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/dpi18cpadhi-overlay.dts
-@@ -0,0 +1,26 @@
-+/*
-+ * dpi18cpadhi-overlay.dts
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&fb>;
-+		__overlay__ {
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&dpi_18bit_cpadhi_gpio0>;
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&vc4>;
-+		__overlay__ {
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&dpi_18bit_cpadhi_gpio0>;
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/dpi24-overlay.dts b/arch/arm/boot/dts/overlays/dpi24-overlay.dts
-new file mode 100644
-index 000000000000..44335cc81277
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/dpi24-overlay.dts
-@@ -0,0 +1,39 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	// There is no DPI driver module, but we need a platform device
-+	// node (that doesn't already use pinctrl) to hang the pinctrl
-+	// reference on - leds will do
-+
-+	fragment@0 {
-+		target = <&fb>;
-+		__overlay__ {
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&dpi24_pins>;
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&vc4>;
-+		__overlay__ {
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&dpi24_pins>;
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			dpi24_pins: dpi24_pins {
-+				brcm,pins = <0 1 2 3 4 5 6 7 8 9 10 11
-+					     12 13 14 15 16 17 18 19 20
-+					     21 22 23 24 25 26 27>;
-+				brcm,function = <6>; /* alt2 */
-+				brcm,pull = <0>; /* no pull */
-+			};
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/draws-overlay.dts b/arch/arm/boot/dts/overlays/draws-overlay.dts
-new file mode 100644
-index 000000000000..d18187d7f343
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/draws-overlay.dts
-@@ -0,0 +1,208 @@
-+#include <dt-bindings/clock/bcm2835.h>
-+/*
-+ * Device tree overlay for the DRAWS Hardware
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+    compatible = "brcm,bcm2835";
-+    fragment@0 {
-+        target = <&i2s>;
-+        __overlay__ {
-+            status = "okay";
-+        };
-+    };
-+
-+    fragment@1 {
-+        target-path = "/";
-+        __overlay__ {
-+            regulators {
-+                compatible = "simple-bus";
-+                #address-cells = <1>;
-+                #size-cells = <0>;
-+
-+                udrc0_ldoin: udrc0_ldoin {
-+                    compatible = "regulator-fixed";
-+                    regulator-name = "ldoin";
-+                    regulator-min-microvolt = <3300000>;
-+                    regulator-max-microvolt = <3300000>;
-+                    regulator-always-on;
-+                };
-+
-+                sc16is752_clk: sc16is752_draws_clk {
-+                    compatible = "fixed-clock";
-+                    #clock-cells = <0>;
-+                    clock-frequency = <1843200>;
-+                };
-+            };
-+
-+            pps: pps {
-+                compatible = "pps-gpio";
-+                pinctrl-names = "default";
-+                pinctrl-0 = <&pps_pins>;
-+                gpios = <&gpio 7 0>;
-+                status = "okay";
-+            };
-+
-+            iio-hwmon {
-+                compatible = "iio-hwmon";
-+                status = "okay";
-+                io-channels = <&tla2024 4>, <&tla2024 5>, <&tla2024 6>,
-+                              <&tla2024 7>;
-+            };
-+        };
-+    };
-+
-+    fragment@2 {
-+        target = <&i2c_arm>;
-+        __overlay__ {
-+            #address-cells = <1>;
-+            #size-cells = <0>;
-+            status = "okay";
-+
-+            tlv320aic32x4: tlv320aic32x4@18 {
-+                compatible = "ti,tlv320aic32x4";
-+                reg = <0x18>;
-+                #sound-dai-cells = <0>;
-+                status = "okay";
-+
-+                clocks = <&clocks BCM2835_CLOCK_GP0>;
-+                clock-names = "mclk";
-+                assigned-clocks = <&clocks BCM2835_CLOCK_GP0>;
-+                assigned-clock-rates = <25000000>;
-+
-+                pinctrl-names = "default";
-+                pinctrl-0 = <&gpclk0_pin &aic3204_reset>;
-+
-+                reset-gpios = <&gpio 13 0>;
-+
-+                iov-supply = <&udrc0_ldoin>;
-+                ldoin-supply = <&udrc0_ldoin>;
-+            };
-+
-+            sc16is752: sc16is752@50 {
-+                compatible = "nxp,sc16is752";
-+                reg = <0x50>;
-+                clocks = <&sc16is752_clk>;
-+                interrupt-parent = <&gpio>;
-+                interrupts = <17 2>; /* IRQ_TYPE_EDGE_FALLING */
-+
-+                pinctrl-names = "default";
-+                pinctrl-0 = <&sc16is752_irq>;
-+            };
-+
-+            tla2024: tla2024@48 {
-+                compatible = "ti,ads1015";
-+                reg = <0x48>;
-+                #address-cells = <1>;
-+                #size-cells = <0>;
-+                #io-channel-cells = <1>;
-+
-+                adc_ch4: channel@4 {
-+                    reg = <4>;
-+                    ti,gain = <1>;
-+                    ti,datarate = <4>;
-+                };
-+
-+                adc_ch5: channel@5 {
-+                    reg = <5>;
-+                    ti,gain = <1>;
-+                    ti,datarate = <4>;
-+                };
-+
-+                adc_ch6: channel@6 {
-+                    reg = <6>;
-+                    ti,gain = <2>;
-+                    ti,datarate = <4>;
-+                };
-+
-+                adc_ch7: channel@7 {
-+                    reg = <7>;
-+                    ti,gain = <2>;
-+                    ti,datarate = <4>;
-+                };
-+            };
-+        };
-+    };
-+
-+    fragment@3 {
-+        target = <&sound>;
-+        snd: __overlay__ {
-+            compatible = "simple-audio-card";
-+            i2s-controller = <&i2s>;
-+            status = "okay";
-+
-+            simple-audio-card,name = "draws";
-+            simple-audio-card,format = "i2s";
-+
-+            simple-audio-card,bitclock-master = <&dailink0_master>;
-+            simple-audio-card,frame-master = <&dailink0_master>;
-+
-+            simple-audio-card,widgets =
-+                "Line", "Line In",
-+                "Line", "Line Out";
-+
-+            simple-audio-card,routing =
-+                "IN1_R", "Line In",
-+                "IN1_L", "Line In",
-+                "CM_L", "Line In",
-+                "CM_R", "Line In",
-+                "Line Out", "LOR",
-+                "Line Out", "LOL";
-+
-+            dailink0_master: simple-audio-card,cpu {
-+                sound-dai = <&i2s>;
-+            };
-+
-+            simple-audio-card,codec {
-+                sound-dai = <&tlv320aic32x4>;
-+            };
-+        };
-+    };
-+
-+    fragment@4 {
-+        target = <&gpio>;
-+        __overlay__ {
-+            gpclk0_pin: gpclk0_pin {
-+                brcm,pins = <4>;
-+                brcm,function = <4>;
-+            };
-+
-+            aic3204_reset: aic3204_reset {
-+                brcm,pins = <13>;
-+                brcm,function = <1>;
-+                brcm,pull = <1>;
-+            };
-+
-+            aic3204_gpio: aic3204_gpio {
-+                brcm,pins = <26>;
-+            };
-+
-+            sc16is752_irq: sc16is752_irq {
-+                brcm,pins = <17>;
-+                brcm,function = <0>;
-+                brcm,pull = <2>;
-+            };
-+
-+            pps_pins: pps_pins {
-+                brcm,pins = <7>;
-+                brcm,function = <0>;
-+                brcm,pull = <0>;
-+            };
-+        };
-+    };
-+
-+    __overrides__ {
-+        draws_adc_ch4_gain = <&adc_ch4>,"ti,gain:0";
-+        draws_adc_ch4_datarate = <&adc_ch4>,"ti,datarate:0";
-+        draws_adc_ch5_gain = <&adc_ch5>,"ti,gain:0";
-+        draws_adc_ch5_datarate = <&adc_ch5>,"ti,datarate:0";
-+        draws_adc_ch6_gain = <&adc_ch6>,"ti,gain:0";
-+        draws_adc_ch6_datarate = <&adc_ch6>,"ti,datarate:0";
-+        draws_adc_ch7_gain = <&adc_ch7>,"ti,gain:0";
-+        draws_adc_ch7_datarate = <&adc_ch7>,"ti,datarate:0";
-+        alsaname = <&snd>, "simple-audio-card,name";
-+    };
-+};
-diff --git a/arch/arm/boot/dts/overlays/dwc-otg-overlay.dts b/arch/arm/boot/dts/overlays/dwc-otg-overlay.dts
-new file mode 100644
-index 000000000000..78c5e9f85048
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/dwc-otg-overlay.dts
-@@ -0,0 +1,14 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&usb>;
-+		__overlay__ {
-+			compatible = "brcm,bcm2708-usb";
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/dwc2-overlay.dts b/arch/arm/boot/dts/overlays/dwc2-overlay.dts
-new file mode 100644
-index 000000000000..0d83e344ad97
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/dwc2-overlay.dts
-@@ -0,0 +1,26 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&usb>;
-+		#address-cells = <1>;
-+		#size-cells = <1>;
-+		dwc2_usb: __overlay__ {
-+			compatible = "brcm,bcm2835-usb";
-+			dr_mode = "otg";
-+			g-np-tx-fifo-size = <32>;
-+			g-rx-fifo-size = <558>;
-+			g-tx-fifo-size = <512 512 512 512 512 256 256>;
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		dr_mode = <&dwc2_usb>, "dr_mode";
-+		g-np-tx-fifo-size = <&dwc2_usb>,"g-np-tx-fifo-size:0";
-+		g-rx-fifo-size = <&dwc2_usb>,"g-rx-fifo-size:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/edt-ft5406-overlay.dts b/arch/arm/boot/dts/overlays/edt-ft5406-overlay.dts
-new file mode 100644
-index 000000000000..1210e4b8e6dc
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/edt-ft5406-overlay.dts
-@@ -0,0 +1,26 @@
-+/*
-+ * Device Tree overlay for EDT 5406 touchscreen controller, as used on the
-+ * Raspberry Pi 7" panel
-+ *
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include "edt-ft5406.dtsi"
-+
-+/ {
-+	fragment@0 {
-+		target = <&i2c0if>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c0mux>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/edt-ft5406.dtsi b/arch/arm/boot/dts/overlays/edt-ft5406.dtsi
-new file mode 100644
-index 000000000000..2d0ff0e8b24e
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/edt-ft5406.dtsi
-@@ -0,0 +1,47 @@
-+/*
-+ * Device Tree overlay for an EDT FT5406 touchscreen
-+ *
-+ * Note that this is included from vc4-kms-dsi-7inch, hence the
-+ * fragment numbers not starting at 0.
-+ */
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@10 {
-+		target = <&ft5406>;
-+		__overlay__ {
-+			touchscreen-inverted-x;
-+		};
-+	};
-+
-+	fragment@11 {
-+		target = <&ft5406>;
-+		__overlay__ {
-+			touchscreen-inverted-y;
-+		};
-+	};
-+
-+	fragment@12 {
-+		target = <&i2c_csi_dsi>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			ft5406: ts@38 {
-+				compatible = "edt,edt-ft5506";
-+				reg = <0x38>;
-+
-+				touchscreen-size-x = < 800 >;
-+				touchscreen-size-y = < 480 >;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		sizex = <&ft5406>,"touchscreen-size-x:0";
-+		sizey = <&ft5406>,"touchscreen-size-y:0";
-+		invx = <0>, "-10";
-+		invy = <0>, "-11";
-+		swapxy = <&ft5406>,"touchscreen-swapped-x-y?";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/enc28j60-overlay.dts b/arch/arm/boot/dts/overlays/enc28j60-overlay.dts
-new file mode 100644
-index 000000000000..7af5c2e607ea
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/enc28j60-overlay.dts
-@@ -0,0 +1,53 @@
-+// Overlay for the Microchip ENC28J60 Ethernet Controller
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			status = "okay";
-+
-+			eth1: enc28j60@0{
-+				compatible = "microchip,enc28j60";
-+				reg = <0>; /* CE0 */
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&eth1_pins>;
-+				interrupt-parent = <&gpio>;
-+				interrupts = <25 0x2>; /* falling edge */
-+				spi-max-frequency = <12000000>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			eth1_pins: eth1_pins {
-+				brcm,pins = <25>;
-+				brcm,function = <0>; /* in */
-+				brcm,pull = <0>; /* none */
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		int_pin = <&eth1>, "interrupts:0",
-+		          <&eth1_pins>, "brcm,pins:0";
-+		speed   = <&eth1>, "spi-max-frequency:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/enc28j60-spi2-overlay.dts b/arch/arm/boot/dts/overlays/enc28j60-spi2-overlay.dts
-new file mode 100644
-index 000000000000..17cb5b8fa485
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/enc28j60-spi2-overlay.dts
-@@ -0,0 +1,47 @@
-+// Overlay for the Microchip ENC28J60 Ethernet Controller - SPI2 Compute Module
-+// Interrupt pin: 39
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spi2>;
-+		__overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			status = "okay";
-+
-+			eth1: enc28j60@0{
-+				compatible = "microchip,enc28j60";
-+				reg = <0>; /* CE0 */
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&eth1_pins>;
-+				interrupt-parent = <&gpio>;
-+				interrupts = <39 0x2>; /* falling edge */
-+				spi-max-frequency = <12000000>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			eth1_pins: eth1_pins {
-+				brcm,pins = <39>;
-+				brcm,function = <0>; /* in */
-+				brcm,pull = <0>; /* none */
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		int_pin = <&eth1>, "interrupts:0",
-+		          <&eth1_pins>, "brcm,pins:0";
-+		speed   = <&eth1>, "spi-max-frequency:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/exc3000-overlay.dts b/arch/arm/boot/dts/overlays/exc3000-overlay.dts
-new file mode 100644
-index 000000000000..6f087fb20661
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/exc3000-overlay.dts
-@@ -0,0 +1,48 @@
-+// Device tree overlay for I2C connected EETI EXC3000 multiple touch controller
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			exc3000_pins: exc3000_pins {
-+				brcm,pins = <4>; // interrupt
-+				brcm,function = <0>; // in
-+				brcm,pull = <2>; // pull-up
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			exc3000: exc3000@2a {
-+				compatible = "eeti,exc3000";
-+				reg = <0x2a>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&exc3000_pins>;
-+				interrupt-parent = <&gpio>;
-+				interrupts = <4 8>; // active low level-sensitive
-+				touchscreen-size-x = <4096>;
-+				touchscreen-size-y = <4096>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		interrupt = <&exc3000_pins>,"brcm,pins:0",
-+			<&exc3000>,"interrupts:0";
-+		sizex = <&exc3000>,"touchscreen-size-x:0";
-+		sizey = <&exc3000>,"touchscreen-size-y:0";
-+		invx = <&exc3000>,"touchscreen-inverted-x?";
-+		invy = <&exc3000>,"touchscreen-inverted-y?";
-+		swapxy = <&exc3000>,"touchscreen-swapped-x-y?";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/fbtft-overlay.dts b/arch/arm/boot/dts/overlays/fbtft-overlay.dts
-new file mode 100644
-index 000000000000..db45f8c53bcc
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/fbtft-overlay.dts
-@@ -0,0 +1,611 @@
-+/*
-+ * Device Tree overlay for fbtft drivers
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	/* adafruit18 */
-+	fragment@0 {
-+		target = <&display>;
-+		__dormant__ {
-+			compatible = "sitronix,st7735r";
-+			spi-max-frequency = <32000000>;
-+			gamma = "02 1c 07 12 37 32 29 2d 29 25 2B 39 00 01 03 10\n03 1d 07 06 2E 2C 29 2D 2E 2E 37 3F 00 00 02 10";
-+		};
-+	};
-+
-+	/* adafruit22 */
-+	fragment@1 {
-+		target = <&display>;
-+		__dormant__ {
-+			compatible = "himax,hx8340bn";
-+			spi-max-frequency = <32000000>;
-+			buswidth = <9>;
-+			bgr;
-+		};
-+	};
-+
-+	/* adafruit22a */
-+	fragment@2 {
-+		target = <&display>;
-+		__dormant__ {
-+			compatible = "ilitek,ili9340";
-+			spi-max-frequency = <32000000>;
-+			bgr;
-+		};
-+	};
-+
-+	/* adafruit28 */
-+	fragment@3 {
-+		target = <&display>;
-+		__dormant__ {
-+			compatible = "ilitek,ili9341";
-+			spi-max-frequency = <32000000>;
-+			bgr;
-+		};
-+	};
-+
-+	/* adafruit13m */
-+	fragment@4 {
-+		target = <&display>;
-+		__dormant__ {
-+			compatible = "solomon,ssd1306";
-+			spi-max-frequency = <16000000>;
-+		};
-+	};
-+
-+	/* admatec_c-berry28 */
-+	fragment@5 {
-+		target = <&display>;
-+		__dormant__ {
-+			compatible = "sitronix,st7789v";
-+			spi-max-frequency = <48000000>;
-+			init = <0x01000011
-+				0x02000078
-+				0x0100003A 0x05
-+				0x010000B2 0x0C 0x0C 0x00 0x33 0x33
-+				0x010000B7 0x35
-+				0x010000C2 0x01 0xFF
-+				0x010000C3 0x17
-+				0x010000C4 0x20
-+				0x010000BB 0x17
-+				0x010000C5 0x20
-+				0x010000D0 0xA4 0xA1
-+				0x01000029>;
-+			gamma = "D0 00 14 15 13 2C 42 43 4E 09 16 14 18 21\nD0 00 14 15 13 0B 43 55 53 0C 17 14 23 20";
-+		};
-+	};
-+
-+	/* dogs102 */
-+	fragment@6 {
-+		target = <&display>;
-+		__dormant__ {
-+			compatible = "UltraChip,uc1701";
-+			spi-max-frequency = <8000000>;
-+			bgr;
-+		};
-+	};
-+
-+	/* er_tftm050_2 */
-+	fragment@7 {
-+		target = <&display>;
-+		__dormant__ {
-+			compatible = "raio,ra8875";
-+			spi-max-frequency = <5000000>;
-+			spi-cpha;
-+			spi-cpol;
-+			width = <480>;
-+			height = <272>;
-+			bgr;
-+		};
-+	};
-+
-+	/* er_tftm070_5 */
-+	fragment@8 {
-+		target = <&display>;
-+		__dormant__ {
-+			compatible = "raio,ra8875";
-+			spi-max-frequency = <5000000>;
-+			spi-cpha;
-+			spi-cpol;
-+			width = <800>;
-+			height = <480>;
-+			bgr;
-+		};
-+	};
-+
-+	/* ew24ha0 */
-+	fragment@9 {
-+		target = <&display>;
-+		__dormant__ {
-+			compatible = "ultrachip,uc1611";
-+			spi-max-frequency = <32000000>;
-+			spi-cpha;
-+			spi-cpol;
-+		};
-+	};
-+
-+	/* ew24ha0_9bit */
-+	fragment@10 {
-+		target = <&display>;
-+		__dormant__ {
-+			compatible = "ultrachip,uc1611";
-+			spi-max-frequency = <32000000>;
-+			spi-cpha;
-+			spi-cpol;
-+			buswidth = <9>;
-+		};
-+	};
-+
-+	/* freetronicsoled128 */
-+	fragment@11 {
-+		target = <&display>;
-+		__dormant__ {
-+			compatible = "solomon,ssd1351";
-+			spi-max-frequency = <20000000>;
-+			backlight = <2>; /* FBTFT_ONBOARD_BACKLIGHT */
-+			bgr;
-+		};
-+	};
-+
-+	/* hy28a */
-+	fragment@12 {
-+		target = <&display>;
-+		__dormant__ {
-+			compatible = "ilitek,ili9320";
-+			spi-max-frequency = <32000000>;
-+			spi-cpha;
-+			spi-cpol;
-+			startbyte = <0x70>;
-+			bgr;
-+		};
-+	};
-+
-+	/* hy28b */
-+	fragment@13 {
-+		target = <&display>;
-+		__dormant__ {
-+			compatible = "ilitek,ili9325";
-+			spi-max-frequency = <48000000>;
-+			spi-cpha;
-+			spi-cpol;
-+			init = <0x010000e7 0x0010
-+				0x01000000 0x0001
-+				0x01000001 0x0100
-+				0x01000002 0x0700
-+				0x01000003 0x1030
-+				0x01000004 0x0000
-+				0x01000008 0x0207
-+				0x01000009 0x0000
-+				0x0100000a 0x0000
-+				0x0100000c 0x0001
-+				0x0100000d 0x0000
-+				0x0100000f 0x0000
-+				0x01000010 0x0000
-+				0x01000011 0x0007
-+				0x01000012 0x0000
-+				0x01000013 0x0000
-+				0x02000032
-+				0x01000010 0x1590
-+				0x01000011 0x0227
-+				0x02000032
-+				0x01000012 0x009c
-+				0x02000032
-+				0x01000013 0x1900
-+				0x01000029 0x0023
-+				0x0100002b 0x000e
-+				0x02000032
-+				0x01000020 0x0000
-+				0x01000021 0x0000
-+				0x02000032
-+				0x01000050 0x0000
-+				0x01000051 0x00ef
-+				0x01000052 0x0000
-+				0x01000053 0x013f
-+				0x01000060 0xa700
-+				0x01000061 0x0001
-+				0x0100006a 0x0000
-+				0x01000080 0x0000
-+				0x01000081 0x0000
-+				0x01000082 0x0000
-+				0x01000083 0x0000
-+				0x01000084 0x0000
-+				0x01000085 0x0000
-+				0x01000090 0x0010
-+				0x01000092 0x0000
-+				0x01000093 0x0003
-+				0x01000095 0x0110
-+				0x01000097 0x0000
-+				0x01000098 0x0000
-+				0x01000007 0x0133
-+				0x01000020 0x0000
-+				0x01000021 0x0000
-+				0x02000064>;
-+			startbyte = <0x70>;
-+			bgr;
-+			fps = <50>;
-+			gamma = "04 1F 4 7 7 0 7 7 6 0\n0F 00 1 7 4 0 0 0 6 7";
-+		};
-+	};
-+
-+	/* itdb28_spi */
-+	fragment@14 {
-+		target = <&display>;
-+		__dormant__ {
-+			compatible = "ilitek,ili9325";
-+			spi-max-frequency = <32000000>;
-+			bgr;
-+		};
-+	};
-+
-+	/* mi0283qt-2 */
-+	fragment@15 {
-+		target = <&display>;
-+		__dormant__ {
-+			compatible = "himax,hx8347d";
-+			spi-max-frequency = <32000000>;
-+			startbyte = <0x70>;
-+			bgr;
-+		};
-+	};
-+
-+	/* mi0283qt-9a */
-+	fragment@16 {
-+		target = <&display>;
-+		__dormant__ {
-+			compatible = "ilitek,ili9341";
-+			spi-max-frequency = <32000000>;
-+			buswidth = <9>;
-+			bgr;
-+		};
-+	};
-+
-+	/* nokia3310 */
-+	fragment@17 {
-+		target = <&display>;
-+		__dormant__ {
-+			compatible = "philips,pcd8544";
-+			spi-max-frequency = <400000>;
-+		};
-+	};
-+
-+	/* nokia3310a */
-+	fragment@18 {
-+		target = <&display>;
-+		__dormant__ {
-+			compatible = "teralane,tls8204";
-+			spi-max-frequency = <1000000>;
-+		};
-+	};
-+
-+	/* nokia5110 */
-+	fragment@19 {
-+		target = <&display>;
-+		__dormant__ {
-+			compatible = "ilitek,ili9163";
-+			spi-max-frequency = <12000000>;
-+			bgr;
-+		};
-+	};
-+
-+	/* piscreen */
-+	fragment@20 {
-+		target = <&display>;
-+		__dormant__ {
-+			compatible = "ilitek,ili9486";
-+			spi-max-frequency = <32000000>;
-+			regwidth = <16>;
-+			bgr;
-+		};
-+	};
-+
-+	/* pitft */
-+	fragment@21 {
-+		target = <&display>;
-+		__dormant__ {
-+			compatible = "ilitek,ili9340";
-+			spi-max-frequency = <32000000>;
-+			init = <0x01000001
-+				0x02000005
-+				0x01000028
-+				0x010000EF 0x03 0x80 0x02
-+				0x010000CF 0x00 0xC1 0x30
-+				0x010000ED 0x64 0x03 0x12 0x81
-+				0x010000E8 0x85 0x00 0x78
-+				0x010000CB 0x39 0x2C 0x00 0x34 0x02
-+				0x010000F7 0x20
-+				0x010000EA 0x00 0x00
-+				0x010000C0 0x23
-+				0x010000C1 0x10
-+				0x010000C5 0x3E 0x28
-+				0x010000C7 0x86
-+				0x0100003A 0x55
-+				0x010000B1 0x00 0x18
-+				0x010000B6 0x08 0x82 0x27
-+				0x010000F2 0x00
-+				0x01000026 0x01
-+				0x010000E0 0x0F 0x31 0x2B 0x0C 0x0E 0x08 0x4E 0xF1 0x37 0x07 0x10 0x03 0x0E 0x09 0x00
-+				0x010000E1 0x00 0x0E 0x14 0x03 0x11 0x07 0x31 0xC1 0x48 0x08 0x0F 0x0C 0x31 0x36 0x0F
-+				0x01000011
-+				0x02000064
-+				0x01000029
-+				0x02000014>;
-+			bgr;
-+		};
-+	};
-+
-+	/* pioled */
-+	fragment@22 {
-+		target = <&display>;
-+		__dormant__ {
-+			compatible = "solomon,ssd1351";
-+			spi-max-frequency = <20000000>;
-+			bgr;
-+			gamma = "0 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4";
-+		};
-+	};
-+
-+	/* rpi-display */
-+	fragment@23 {
-+		target = <&display>;
-+		__dormant__ {
-+			compatible = "ilitek,ili9341";
-+			spi-max-frequency = <32000000>;
-+			bgr;
-+		};
-+	};
-+
-+	/* sainsmart18 */
-+	fragment@24 {
-+		target = <&display>;
-+		__dormant__ {
-+			compatible = "sitronix,st7735r";
-+			spi-max-frequency = <32000000>;
-+		};
-+	};
-+
-+	/* sainsmart32_spi */
-+	fragment@25 {
-+		target = <&display>;
-+		__dormant__ {
-+			compatible = "solomon,ssd1289";
-+			spi-max-frequency = <16000000>;
-+			bgr;
-+		};
-+	};
-+
-+	/* tinylcd35 */
-+	fragment@26 {
-+		target = <&display>;
-+		__dormant__ {
-+			compatible = "neosec,tinylcd";
-+			spi-max-frequency = <32000000>;
-+			bgr;
-+		};
-+	};
-+
-+	/* tm022hdh26 */
-+	fragment@27 {
-+		target = <&display>;
-+		__dormant__ {
-+			compatible = "ilitek,ili9341";
-+			spi-max-frequency = <32000000>;
-+			bgr;
-+		};
-+	};
-+
-+	/* tontec35_9481 - boards before 02 July 2014 */
-+	fragment@28 {
-+		target = <&display>;
-+		__dormant__ {
-+			compatible = "ilitek,ili9481";
-+			spi-max-frequency = <128000000>;
-+			spi-cpha;
-+			spi-cpol;
-+			bgr;
-+		};
-+	};
-+
-+	/* tontec35_9486 - boards after 02 July 2014 */
-+	fragment@29 {
-+		target = <&display>;
-+		__dormant__ {
-+			compatible = "ilitek,ili9486";
-+			spi-max-frequency = <128000000>;
-+			spi-cpha;
-+			spi-cpol;
-+			bgr;
-+		};
-+	};
-+
-+	/* waveshare32b */
-+	fragment@30 {
-+		target = <&display>;
-+		__dormant__ {
-+			compatible = "ilitek,ili9340";
-+			spi-max-frequency = <48000000>;
-+			init = <0x010000CB 0x39 0x2C 0x00 0x34 0x02
-+				0x010000CF 0x00 0xC1 0x30
-+				0x010000E8 0x85 0x00 0x78
-+				0x010000EA 0x00 0x00
-+				0x010000ED 0x64 0x03 0x12 0x81
-+				0x010000F7 0x20
-+				0x010000C0 0x23
-+				0x010000C1 0x10
-+				0x010000C5 0x3E 0x28
-+				0x010000C7 0x86
-+				0x01000036 0x28
-+				0x0100003A 0x55
-+				0x010000B1 0x00 0x18
-+				0x010000B6 0x08 0x82 0x27
-+				0x010000F2 0x00
-+				0x01000026 0x01
-+				0x010000E0 0x0F 0x31 0x2B 0x0C 0x0E 0x08 0x4E 0xF1 0x37 0x07 0x10 0x03 0x0E 0x09 0x00
-+				0x010000E1 0x00 0x0E 0x14 0x03 0x11 0x07 0x31 0xC1 0x48 0x08 0x0F 0x0C 0x31 0x36 0x0F
-+				0x01000011
-+				0x02000078
-+				0x01000029
-+				0x0100002C>;
-+			bgr;
-+		};
-+	};
-+
-+	/* waveshare22 */
-+	fragment@31 {
-+		target = <&display>;
-+		__dormant__ {
-+			compatible = "hitachi,bd663474";
-+			spi-max-frequency = <32000000>;
-+			spi-cpha;
-+			spi-cpol;
-+		};
-+	};
-+
-+	spidev_fragment: fragment@100 {
-+		target-path = "spi0/spidev@0";
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	display_fragment: fragment@101 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			status = "okay";
-+
-+			display: display@0{
-+				reg = <0>;
-+				spi-max-frequency = <32000000>;
-+				fps = <30>;
-+				buswidth = <8>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		spi0-0        = <&display_fragment>, "target:0=",<&spi0>,
-+				<&spidev_fragment>, "target-path=spi0/spidev@0",
-+				<&display>, "reg:0=0";
-+		spi0-1        = <&display_fragment>, "target:0=",<&spi0>,
-+				<&spidev_fragment>, "target-path=spi0/spidev@1",
-+				<&display>, "reg:0=1";
-+		spi1-0        = <&display_fragment>, "target:0=",<&spi1>,
-+				<&spidev_fragment>, "target-path=spi1/spidev@0",
-+				<&display>, "reg:0=0";
-+		spi1-1        = <&display_fragment>, "target:0=",<&spi1>,
-+				<&spidev_fragment>, "target-path=spi1/spidev@1",
-+				<&display>, "reg:0=1";
-+		spi1-2        = <&display_fragment>, "target:0=",<&spi1>,
-+				<&spidev_fragment>, "target-path=spi1/spidev@2",
-+				<&display>, "reg:0=2";
-+		spi2-0        = <&display_fragment>, "target:0=",<&spi2>,
-+				<&spidev_fragment>, "target-path=spi2/spidev@0",
-+				<&display>, "reg:0=0";
-+		spi2-1        = <&display_fragment>, "target:0=",<&spi2>,
-+				<&spidev_fragment>, "target-path=spi2/spidev@1",
-+				<&display>, "reg:0=1";
-+		spi2-2        = <&display_fragment>, "target:0=",<&spi2>,
-+				<&spidev_fragment>, "target-path=spi2/spidev@2",
-+				<&display>, "reg:0=2";
-+
-+		speed         = <&display>, "spi-max-frequency:0";
-+		cpha          = <&display>, "spi-cpha?";
-+		cpol          = <&display>, "spi-cpol?";
-+
-+		/* Displays */
-+		adafruit18    = <0>, "+0";
-+		adafruit22    = <0>, "+1";
-+		adafruit22a   = <0>, "+2";
-+		adafruit28    = <0>, "+3";
-+		adafruit13m   = <0>, "+4";
-+		admatec_c-berry28 = <0>, "+5";
-+		dogs102       = <0>, "+6";
-+		er_tftm050_2  = <0>, "+7";
-+		er_tftm070_5  = <0>, "+8";
-+		ew24ha0       = <0>, "+9";
-+		ew24ha0_9bit  = <0>, "+10";
-+		freetronicsoled128 = <0>, "+11";
-+		hy28a         = <0>, "+12";
-+		hy28b         = <0>, "+13";
-+		itdb28_spi    = <0>, "+14";
-+		mi0283qt-2    = <0>, "+15";
-+		mi0283qt-9a   = <0>, "+16";
-+		nokia3310     = <0>, "+17";
-+		nokia3310a    = <0>, "+18";
-+		nokia5110     = <0>, "+19";
-+		piscreen      = <0>, "+20";
-+		pitft         = <0>, "+21";
-+		pioled        = <0>, "+22";
-+		rpi-display   = <0>, "+23";
-+		sainsmart18   = <0>, "+24";
-+		sainsmart32_spi = <0>, "+25";
-+		tinylcd35     = <0>, "+26";
-+		tm022hdh26    = <0>, "+27";
-+		tontec35_9481 = <0>, "+28";
-+		tontec35_9486 = <0>, "+29";
-+		waveshare32b  = <0>, "+30";
-+		waveshare22   = <0>, "+31";
-+
-+		/* Controllers */
-+		bd663474      = <&display>, "compatible=hitachi,bd663474";
-+		hx8340bn      = <&display>, "compatible=himax,hx8340bn";
-+		hx8347d       = <&display>, "compatible=himax,hx8347d";
-+		hx8353d       = <&display>, "compatible=himax,hx8353d";
-+		hx8357d       = <&display>, "compatible=himax,hx8357d";
-+		ili9163       = <&display>, "compatible=ilitek,ili9163";
-+		ili9320       = <&display>, "compatible=ilitek,ili9320";
-+		ili9325       = <&display>, "compatible=ilitek,ili9325";
-+		ili9340       = <&display>, "compatible=ilitek,ili9340";
-+		ili9341       = <&display>, "compatible=ilitek,ili9341";
-+		ili9481       = <&display>, "compatible=ilitek,ili9481";
-+		ili9486       = <&display>, "compatible=ilitek,ili9486";
-+		pcd8544       = <&display>, "compatible=philips,pcd8544";
-+		ra8875        = <&display>, "compatible=raio,ra8875";
-+		s6d02a1       = <&display>, "compatible=samsung,s6d02a1";
-+		s6d1121       = <&display>, "compatible=samsung,s6d1121";
-+		seps525       = <&display>, "compatible=syncoam,seps525";
-+		sh1106        = <&display>, "compatible=sinowealth,sh1106";
-+		ssd1289       = <&display>, "compatible=solomon,ssd1289";
-+		ssd1305       = <&display>, "compatible=solomon,ssd1305";
-+		ssd1306       = <&display>, "compatible=solomon,ssd1306";
-+		ssd1325       = <&display>, "compatible=solomon,ssd1325";
-+		ssd1331       = <&display>, "compatible=solomon,ssd1331";
-+		ssd1351       = <&display>, "compatible=solomon,ssd1351";
-+		st7735r       = <&display>, "compatible=sitronix,st7735r";
-+		st7789v       = <&display>, "compatible=sitronix,st7789v";
-+		tls8204       = <&display>, "compatible=teralane,tls8204";
-+		uc1611        = <&display>, "compatible=ultrachip,uc1611";
-+		uc1701        = <&display>, "compatible=UltraChip,uc1701";
-+		upd161704     = <&display>, "compatible=nec,upd161704";
-+
-+		width         = <&display>, "width:0";
-+		height        = <&display>, "height:0";
-+		regwidth      = <&display>, "regwidth:0";
-+		buswidth      = <&display>, "buswidth:0";
-+		debug         = <&display>, "debug:0";
-+		rotate        = <&display>, "rotate:0";
-+		bgr           = <&display>, "bgr?";
-+		fps           = <&display>, "fps:0";
-+		txbuflen      = <&display>, "txbuflen:0";
-+		startbyte     = <&display>, "startbyte:0";
-+		gamma         = <&display>, "gamma";
-+
-+		reset_pin     = <&display>, "reset-gpios:0=", <&gpio>,
-+				<&display>, "reset-gpios:4",
-+				<&display>, "reset-gpios:8=1"; /* GPIO_ACTIVE_LOW */
-+		dc_pin        = <&display>, "dc-gpios:0=", <&gpio>,
-+				<&display>, "dc-gpios:4",
-+				<&display>, "dc-gpios:8=0"; /* GPIO_ACTIVE_HIGH */
-+		led_pin       = <&display>, "led-gpios:0=", <&gpio>,
-+				<&display>, "led-gpios:4",
-+				<&display>, "led-gpios:8=0"; /* GPIO_ACTIVE_HIGH */
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/fe-pi-audio-overlay.dts b/arch/arm/boot/dts/overlays/fe-pi-audio-overlay.dts
-new file mode 100644
-index 000000000000..1ab71e653e20
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/fe-pi-audio-overlay.dts
-@@ -0,0 +1,70 @@
-+// Definitions for Fe-Pi Audio
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target-path = "/";
-+		__overlay__ {
-+			sgtl5000_mclk: sgtl5000_mclk {
-+				compatible = "fixed-clock";
-+				#clock-cells = <0>;
-+				clock-frequency = <12288000>;
-+				clock-output-names = "sgtl5000-mclk";
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&soc>;
-+		__overlay__ {
-+			reg_1v8: reg_1v8@0 {
-+				compatible = "regulator-fixed";
-+				regulator-name = "1V8";
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+				regulator-always-on;
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			sgtl5000@a {
-+				#sound-dai-cells = <0>;
-+				compatible = "fsl,sgtl5000";
-+				reg = <0x0a>;
-+				clocks = <&sgtl5000_mclk>;
-+				micbias-resistor-k-ohms = <2>;
-+				micbias-voltage-m-volts = <3000>;
-+				VDDA-supply = <&vdd_3v3_reg>;
-+				VDDIO-supply = <&vdd_3v3_reg>;
-+				VDDD-supply = <&reg_1v8>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "fe-pi,fe-pi-audio";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/fsm-demo-overlay.dts b/arch/arm/boot/dts/overlays/fsm-demo-overlay.dts
-new file mode 100644
-index 000000000000..e9944f5cd258
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/fsm-demo-overlay.dts
-@@ -0,0 +1,104 @@
-+// Demo overlay for the gpio-fsm driver
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/gpio/gpio-fsm.h>
-+
-+#define BUTTON1 GF_IP(0)
-+#define BUTTON2 GF_SW(0)
-+#define RED   GF_OP(0) // GPIO7
-+#define AMBER GF_OP(1) // GPIO8
-+#define GREEN GF_OP(2) // GPIO25
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target-path = "/";
-+		__overlay__ {
-+			fsm_demo: fsm-demo {
-+				compatible = "rpi,gpio-fsm";
-+
-+				debug = <0>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				num-swgpios = <1>;
-+				gpio-line-names = "button2";
-+				input-gpios  = <&gpio 6 1>;  // BUTTON1 (active-low)
-+				output-gpios = <&gpio 7 0>,  // RED
-+					       <&gpio 8 0>,  // AMBER
-+					       <&gpio 25 0>; // GREEN
-+				shutdown-timeout-ms = <2000>;
-+
-+				start {
-+					start_state;
-+					set = <RED 1>, <AMBER 0>, <GREEN 0>;
-+					start2 = <GF_DELAY 250>;
-+				};
-+
-+				start2 {
-+					set = <RED 0>, <AMBER 1>;
-+					go = <GF_DELAY 250>;
-+				};
-+
-+				go {
-+					set = <RED 0>, <AMBER 0>, <GREEN 1>;
-+					ready_wait = <BUTTON1 0>;
-+					shutdown1 = <GF_SHUTDOWN 0>;
-+				};
-+
-+				ready_wait {
-+					// Clear the soft GPIO
-+					set = <BUTTON2 0>;
-+					ready = <GF_DELAY 1000>;
-+					shutdown1 = <GF_SHUTDOWN 0>;
-+				};
-+
-+				ready {
-+					stopping = <BUTTON1 1>, <BUTTON2 1>;
-+					shutdown1 = <GF_SHUTDOWN 0>;
-+				};
-+
-+				stopping {
-+					set = <GREEN 0>, <AMBER 1>;
-+					stopped = <GF_DELAY 1000>;
-+				};
-+
-+				stopped {
-+					set = <AMBER 0>, <RED 1>;
-+					get_set = <GF_DELAY 3000>;
-+					shutdown1 = <GF_SHUTDOWN 0>;
-+				};
-+
-+				get_set {
-+					set = <AMBER 1>;
-+					go = <GF_DELAY 1000>;
-+				};
-+
-+				shutdown1 {
-+					set = <RED 0>, <AMBER 0>, <GREEN 1>;
-+					shutdown2 = <GF_SHUTDOWN 250>;
-+				};
-+
-+				shutdown2 {
-+					set = <AMBER 1>, <GREEN 0>;
-+					shutdown3 = <GF_SHUTDOWN 250>;
-+				};
-+
-+				shutdown3 {
-+					set = <RED 1>, <AMBER 0>;
-+					shutdown4 = <GF_SHUTDOWN 250>;
-+				};
-+
-+				shutdown4 {
-+					shutdown_state;
-+					set = <RED 0>, <AMBER 0>, <GREEN 0>;
-+				};
-+			};
-+	       };
-+        };
-+
-+	__overrides__ {
-+		fsm_debug = <&fsm_demo>,"debug:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/gc9a01-overlay.dts b/arch/arm/boot/dts/overlays/gc9a01-overlay.dts
-new file mode 100644
-index 000000000000..3d31030c5564
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/gc9a01-overlay.dts
-@@ -0,0 +1,151 @@
-+/*
-+    Device Tree overlay for Galaxycore GC9A01A single chip driver
-+    for use on SPI TFT LCD, 240x240 65K RGB
-+    Based on Galaxycore's GC9A01A datasheet Rev.1.0 (2019/07/02)
-+    Copyright (C) 2022, Julianno F. C. Silva (@juliannojungle)
-+
-+    This program is free software: you can redistribute it and/or modify
-+    it under the terms of the GNU Affero General Public License as published
-+    by the Free Software Foundation, either version 3 of the License, or
-+    (at your option) any later version.
-+
-+    This program is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+    GNU Affero General Public License for more details.
-+
-+    You should have received a copy of the GNU Affero General Public License
-+    along with this program.  If not, see <https://www.gnu.org/licenses/agpl-3.0.html>.
-+
-+    Init sequence partially based on Waveshare team's Arduino LCD_Driver V1.0 (2020/12/09).
-+
-+    Permission is hereby granted, free of UBYTEge, to any person obtaining a copy
-+    of this software and associated documnetation files (the "Software"), to deal
-+    in the Software without restriction, including without limitation the rights
-+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+    copies of the Software, and to permit persons to whom the Software is
-+    furished to do so, subject to the following conditions:
-+
-+    The above copyright notice and this permission notice shall be included in
-+    all copies or substantial portions of the Software.
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+    compatible = "brcm,bcm2835";
-+
-+    fragment@0 {
-+        target = <&spidev0>;
-+        __overlay__ {
-+            status = "disabled";
-+        };
-+    };
-+
-+    fragment@1 {
-+        target = <&gpio>;
-+        __overlay__ {
-+            gc9a01_pins: gc9a01_pins {
-+                brcm,pins = <25 27>;
-+                brcm,function = <1 1>; /* out */
-+                brcm,pull = <0 0>; /* none */
-+            };
-+        };
-+    };
-+
-+    fragment@2 {
-+        target = <&spi0>;
-+        __overlay__ {
-+            /* needed to avoid dtc warning */
-+            #address-cells = <1>;
-+            #size-cells = <0>;
-+            status = "okay";
-+
-+            gc9a01: gc9a01@0 {
-+                compatible = "ilitek,ili9340";
-+                reg = <0>;
-+                pinctrl-names = "default";
-+                pinctrl-0 = <&gc9a01_pins>;
-+                reset-gpios = <&gpio 27 1>;
-+                dc-gpios = <&gpio 25 0>;
-+                led-gpios = <&gpio 18 0>;
-+                spi-max-frequency = <40000000>;
-+                buswidth = <8>;
-+                width = <240>;
-+                height = <240>;
-+                rotate = <0>;
-+                fps = <50>;
-+                bgr;
-+                debug = <0>;
-+                init = <
-+                    0x01000011 /* Sleep mode OFF */
-+                    0x02000078 /* Delay 120ms */
-+                    0x010000EF /* Inter register enable 2 */
-+                    0x010000EB 0x14
-+                    /* BEGIN set inter_command HIGH */
-+                    0x010000FE /* Inter register enable 1 */
-+                    0x010000EF /* Inter register enable 2 */
-+                    /* END set inter_command HIGH */
-+                    0x010000EB 0x14
-+                    0x01000084 0x40
-+                    0x01000085 0xFF
-+                    0x01000086 0xFF
-+                    0x01000087 0xFF
-+                    0x01000088 0x0A
-+                    0x01000089 0x21
-+                    0x0100008A 0x00
-+                    0x0100008B 0x80
-+                    0x0100008C 0x01
-+                    0x0100008D 0x01
-+                    0x0100008E 0xFF
-+                    0x0100008F 0xFF
-+                    0x010000B6 0x00 0x00 /* Display function control */
-+                    0x01000036 0x08 /* Memory access control */
-+                    0x0100003A 0x05 /* Pixel format */
-+                    0x01000090 0x08 0x08 0x08 0x08
-+                    0x010000BD 0x06
-+                    0x010000BC 0x00
-+                    0x010000FF 0x60 0x01 0x04
-+                    0x010000C3 0x13 /* Voltage regulator 1a */
-+                    0x010000C4 0x13 /* Voltage regulator 1b */
-+                    0x010000C9 0x22 /* Voltage regulator 2a */
-+                    0x010000BE 0x11
-+                    0x010000E1 0x10 0x0E
-+                    0x010000DF 0x21 0x0c 0x02
-+                    0x010000F0 0x45 0x09 0x08 0x08 0x26 0x2A /* Set gamma1 */
-+                    0x010000F1 0x43 0x70 0x72 0x36 0x37 0x6F /* Set gamma2 */
-+                    0x010000F2 0x45 0x09 0x08 0x08 0x26 0x2A /* Set gamma3 */
-+                    0x010000F3 0x43 0x70 0x72 0x36 0x37 0x6F /* Set gamma4 */
-+                    0x010000ED 0x1B 0x0B
-+                    0x010000AE 0x77
-+                    0x010000CD 0x63
-+                    0x01000070 0x07 0x07 0x04 0x0E 0x0F 0x09 0x07 0x08 0x03
-+                    0x010000E8 0x34 /* Frame rate */
-+                    0x01000062 0x18 0x0D 0x71 0xED 0x70 0x70 0x18 0x0F 0x71 0xEF 0x70 0x70
-+                    0x01000063 0x18 0x11 0x71 0xF1 0x70 0x70 0x18 0x13 0x71 0xF3 0x70 0x70
-+                    0x01000064 0x28 0x29 0xF1 0x01 0xF1 0x00 0x07
-+                    0x01000066 0x3C 0x00 0xCD 0x67 0x45 0x45 0x10 0x00 0x00 0x00
-+                    0x01000067 0x00 0x3C 0x00 0x00 0x00 0x01 0x54 0x10 0x32 0x98
-+                    0x01000074 0x10 0x85 0x80 0x00 0x00 0x4E 0x00
-+                    0x01000098 0x3e 0x07
-+                    0x01000035 /* Tearing effect ON */
-+                    0x01000021 /* Display inversion ON */
-+                    0x01000011 /* Sleep mode OFF */
-+                    0x0200000C /* Delay 12ms */
-+                    0x01000029 /* Display ON */
-+                    0x02000014 /* Delay 20ms */
-+                    >;
-+            };
-+        };
-+    };
-+
-+    __overrides__ {
-+        speed = <&gc9a01>,"spi-max-frequency:0";
-+        rotate = <&gc9a01>,"rotate:0";
-+        width = <&gc9a01>,"width:0";
-+        height = <&gc9a01>,"height:0";
-+        fps = <&gc9a01>,"fps:0";
-+        debug = <&gc9a01>,"debug:0";
-+    };
-+};
-diff --git a/arch/arm/boot/dts/overlays/ghost-amp-overlay.dts b/arch/arm/boot/dts/overlays/ghost-amp-overlay.dts
-new file mode 100644
-index 000000000000..7509e00679c8
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/ghost-amp-overlay.dts
-@@ -0,0 +1,145 @@
-+// Overlay for the PCM5122-based Ghost amplifier using gpio-fsm
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/gpio/gpio-fsm.h>
-+
-+#define ENABLE   GF_SW(0)
-+#define FAULT    GF_IP(0) // GPIO5
-+#define RELAY1   GF_OP(0) // GPIO22
-+#define RELAY2   GF_OP(1) // GPIO23
-+#define RELAYSSR GF_OP(2) // GPIO24
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			pcm5122@4c {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,pcm5122";
-+				reg = <0x4c>;
-+				AVDD-supply = <&vdd_3v3_reg>;
-+				DVDD-supply = <&vdd_3v3_reg>;
-+				CPVDD-supply = <&vdd_3v3_reg>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		iqaudio_dac: __overlay__ {
-+			compatible = "iqaudio,iqaudio-dac";
-+			i2s-controller = <&i2s>;
-+			mute-gpios = <&amp 0 0>;
-+			iqaudio-dac,auto-mute-amp;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target-path = "/";
-+		__overlay__ {
-+			amp: ghost-amp {
-+				compatible = "rpi,gpio-fsm";
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&ghost_amp_pins>;
-+
-+				debug = <0>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				num-swgpios = <1>;
-+				gpio-line-names = "enable";
-+				input-gpios  = <&gpio 5 1>;  // FAULT (active low)
-+				output-gpios = <&gpio 22 0>, // RELAY1
-+					       <&gpio 23 0>, // RELAY2
-+					       <&gpio 24 0>; // RELAYSSR
-+				shutdown-timeout-ms = <1000>;
-+
-+				amp_off {
-+					start_state;
-+					shutdown_state;
-+
-+					set = <RELAYSSR 0>,
-+					      <RELAY2 0>,
-+					      <RELAY1 0>;
-+					amp_on_1 = <ENABLE 1>;
-+					fault = <FAULT 1>;
-+				};
-+
-+				amp_on_1 {
-+					set = <RELAY1 1>;
-+					amp_on_2 = <GF_DELAY 1000>;
-+					amp_off = <GF_SHUTDOWN 0>;
-+					fault = <FAULT 1>;
-+				};
-+
-+				amp_on_2 {
-+					set = <RELAY2 1>;
-+					amp_on_wait = <ENABLE 0>;
-+					amp_on = <GF_DELAY 1>;
-+					fault = <FAULT 1>;
-+				};
-+
-+				amp_on {
-+					set = <RELAYSSR 1>;
-+					amp_on_wait = <ENABLE 0>;
-+					fault = <FAULT 1>;
-+				};
-+
-+				amp_on_wait {
-+					set = <RELAYSSR 0>;
-+					amp_off_1 = <GF_DELAY (30*60*1000)>,
-+						    <GF_SHUTDOWN 0>;
-+					amp_on = <ENABLE 1>;
-+					fault = <FAULT 1>;
-+				};
-+
-+				amp_off_1 {
-+					set = <RELAY2 0>;
-+					amp_on = <ENABLE 1>;
-+					amp_off = <GF_DELAY 100>;
-+					fault = <FAULT 1>;
-+				};
-+
-+				// Keep this a distinct state to prevent
-+				// changes and for the diagnostic output
-+				fault {
-+					set = <RELAYSSR 0>,
-+					      <RELAY2 0>,
-+					      <RELAY1 0>;
-+					amp_off = <FAULT 0>;
-+					shutdown_state;
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			ghost_amp_pins: ghost_amp_pins {
-+				brcm,pins = <5 22 23 24>;
-+				brcm,function = <0 1 1 1>; /* in out out out */
-+				brcm,pull = <2 0 0 0>; /* up none none none */
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		fsm_debug = <&amp>,"debug:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/goodix-overlay.dts b/arch/arm/boot/dts/overlays/goodix-overlay.dts
-new file mode 100644
-index 000000000000..8571527de49a
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/goodix-overlay.dts
-@@ -0,0 +1,46 @@
-+// Device tree overlay for I2C connected Goodix gt9271 multiple touch controller
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			goodix_pins: goodix_pins {
-+				brcm,pins = <4 17>; // interrupt and reset
-+				brcm,function = <0 0>; // in
-+				brcm,pull = <2 2>; // pull-up
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			gt9271: gt9271@14 {
-+				compatible = "goodix,gt9271";
-+				reg = <0x14>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&goodix_pins>;
-+				interrupt-parent = <&gpio>;
-+				interrupts = <4 2>; // high-to-low edge triggered
-+				irq-gpios = <&gpio 4 0>; // Pin7 on GPIO header
-+				reset-gpios = <&gpio 17 0>; // Pin11 on GPIO header
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		interrupt = <&goodix_pins>,"brcm,pins:0",
-+			<&gt9271>,"interrupts:0",
-+			<&gt9271>,"irq-gpios:4";
-+		reset = <&goodix_pins>,"brcm,pins:4",
-+			<&gt9271>,"reset-gpios:4";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/googlevoicehat-soundcard-overlay.dts b/arch/arm/boot/dts/overlays/googlevoicehat-soundcard-overlay.dts
-new file mode 100644
-index 000000000000..e443be1f9a0e
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/googlevoicehat-soundcard-overlay.dts
-@@ -0,0 +1,49 @@
-+// Definitions for Google voiceHAT v1 soundcard overlay
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			googlevoicehat_pins: googlevoicehat_pins {
-+				brcm,pins = <16>;
-+				brcm,function = <1>; /* out */
-+				brcm,pull = <0>; /* up */
-+			};
-+		};
-+	};
-+
-+
-+	fragment@2 {
-+		target-path = "/";
-+		__overlay__ {
-+			voicehat-codec {
-+				#sound-dai-cells = <0>;
-+				compatible = "google,voicehat";
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&googlevoicehat_pins>;
-+				sdmode-gpios= <&gpio 16 0>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "googlevoicehat,googlevoicehat-soundcard";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/gpio-fan-overlay.dts b/arch/arm/boot/dts/overlays/gpio-fan-overlay.dts
-new file mode 100644
-index 000000000000..17b77bb27931
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/gpio-fan-overlay.dts
-@@ -0,0 +1,89 @@
-+/*
-+ * Overlay for the Raspberry Pi GPIO Fan @ BCM GPIO12.
-+ * References: 
-+ *	- https://www.raspberrypi.org/forums/viewtopic.php?f=107&p=1367135#p1365084
-+ *
-+ * Optional parameters:
-+ *	- "gpiopin"	- BCM number of the pin driving the fan, default 12 (GPIO12);
-+ * 	- "temp"	- CPU temperature at which fan is started in millicelsius, default 55000;
-+ *
-+ * Requires:
-+ *	- kernel configurations: CONFIG_SENSORS_GPIO_FAN=m;
-+ *	- kernel rebuild;
-+ *	- N-MOSFET connected to gpiopin, 2N7002-[https://en.wikipedia.org/wiki/2N7000];
-+ *	- DC Fan connected to N-MOSFET Drain terminal, a 12V fan is working fine and quite silently;
-+ *	  [https://www.tme.eu/en/details/ee40101s1-999-a/dc12v-fans/sunon/ee40101s1-1000u-999/]
-+ *
-+ *                   ┌─────────────────────┐
-+ *                   │Fan negative terminal│
-+ *                   └┬────────────────────┘
-+ *                    │D
-+ *             G   │──┘
-+ * [GPIO12]──────┤ │<─┐  2N7002
-+ *                 │──┤
-+ *                    │S
-+ *                   ─┴─
-+ *                   GND
-+ *
-+ * Build:
-+ * 	- `sudo dtc -W no-unit_address_vs_reg -@ -I dts -O dtb -o /boot/overlays/gpio-fan.dtbo gpio-fan-overlay.dts`
-+ * Activate:
-+ *	- sudo nano /boot/config.txt add "dtoverlay=gpio-fan" or "dtoverlay=gpio-fan,gpiopin=12,temp=45000"
-+ *	 or
-+ *	- sudo sh -c 'printf "\n# Enable PI GPIO-Fan Default\ndtoverlay=gpio-fan\n" >> /boot/config.txt'
-+ *	- sudo sh -c 'printf "\n# Enable PI GPIO-Fan Custom\ndtoverlay=gpio-fan,gpiopin=12,temp=45000\n" >> /boot/config.txt'
-+ *
-+ */
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target-path = "/";
-+		__overlay__ {
-+			fan0: gpio-fan@0 {
-+				compatible = "gpio-fan";
-+				gpios = <&gpio 12 0>;
-+				gpio-fan,speed-map = <0    0>,
-+									 <5000 1>;
-+				#cooling-cells = <2>;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&cpu_thermal>;
-+		__overlay__ {
-+			polling-delay = <2000>;	/* milliseconds */
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&thermal_trips>;
-+		__overlay__ {
-+			cpu_hot: trip-point@0 {
-+				temperature = <55000>;	/* (millicelsius) Fan started at 55°C */
-+				hysteresis = <10000>;	/* (millicelsius) Fan stopped at 45°C */
-+				type = "active";
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&cooling_maps>;
-+		__overlay__ {
-+			map0 {
-+				trip = <&cpu_hot>;
-+				cooling-device = <&fan0 1 1>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		gpiopin = <&fan0>,"gpios:4", <&fan0>,"brcm,pins:0";
-+		temp = <&cpu_hot>,"temperature:0";
-+		hyst = <&cpu_hot>,"hysteresis:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/gpio-hog-overlay.dts b/arch/arm/boot/dts/overlays/gpio-hog-overlay.dts
-new file mode 100644
-index 000000000000..c9e39046fed9
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/gpio-hog-overlay.dts
-@@ -0,0 +1,27 @@
-+// Configure a "hog" on the specified GPIO
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			hog: hog@1a {
-+			     gpio-hog;
-+			     gpios = <26 GPIO_ACTIVE_HIGH>;
-+			     output-high;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		gpio =       <&hog>,"reg:0",
-+		             <&hog>,"gpios:0";
-+		active_low = <&hog>,"output-high!",
-+			     <&hog>,"output-low?";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts b/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts
-new file mode 100644
-index 000000000000..162b6ce07dc9
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts
-@@ -0,0 +1,49 @@
-+// Definitions for ir-gpio module
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+        compatible = "brcm,bcm2835";
-+
-+        fragment@0 {
-+                target-path = "/";
-+                __overlay__ {
-+                        gpio_ir: ir-receiver@12 {
-+                                compatible = "gpio-ir-receiver";
-+                                pinctrl-names = "default";
-+                                pinctrl-0 = <&gpio_ir_pins>;
-+
-+                                // pin number, high or low
-+                                gpios = <&gpio 18 1>;
-+
-+                                // parameter for keymap name
-+                                linux,rc-map-name = "rc-rc6-mce";
-+
-+                                status = "okay";
-+                        };
-+                };
-+        };
-+
-+        fragment@1 {
-+                target = <&gpio>;
-+                __overlay__ {
-+                        gpio_ir_pins: gpio_ir_pins@12 {
-+                                brcm,pins = <18>;                       // pin 18
-+                                brcm,function = <0>;                    // in
-+                                brcm,pull = <2>;                        // up
-+                        };
-+                };
-+        };
-+
-+        __overrides__ {
-+                // parameters
-+                gpio_pin =      <&gpio_ir>,"gpios:4",           // pin number
-+                                <&gpio_ir>,"reg:0",
-+                                <&gpio_ir_pins>,"brcm,pins:0",
-+                                <&gpio_ir_pins>,"reg:0";
-+                gpio_pull = <&gpio_ir_pins>,"brcm,pull:0";              // pull-up/down state
-+                invert = <&gpio_ir>,"gpios:8";                          // 0 = active high input
-+
-+                rc-map-name = <&gpio_ir>,"linux,rc-map-name";           // default rc map
-+        };
-+};
-diff --git a/arch/arm/boot/dts/overlays/gpio-ir-tx-overlay.dts b/arch/arm/boot/dts/overlays/gpio-ir-tx-overlay.dts
-new file mode 100644
-index 000000000000..3625431b7560
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/gpio-ir-tx-overlay.dts
-@@ -0,0 +1,36 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			gpio_ir_tx_pins: gpio_ir_tx_pins@12 {
-+				brcm,pins = <18>;
-+				brcm,function = <1>;	// out
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target-path = "/";
-+		__overlay__ {
-+			gpio_ir_tx: gpio-ir-transmitter@12 {
-+				compatible = "gpio-ir-tx";
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&gpio_ir_tx_pins>;
-+				gpios = <&gpio 18 0>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		gpio_pin = <&gpio_ir_tx>, "gpios:4",           	// pin number
-+			   <&gpio_ir_tx>, "reg:0",
-+			   <&gpio_ir_tx_pins>, "brcm,pins:0",
-+			   <&gpio_ir_tx_pins>, "reg:0";
-+		invert = <&gpio_ir_tx>, "gpios:8";		// 1 = active low
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/gpio-key-overlay.dts b/arch/arm/boot/dts/overlays/gpio-key-overlay.dts
-new file mode 100644
-index 000000000000..2e7253d1d0ab
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/gpio-key-overlay.dts
-@@ -0,0 +1,48 @@
-+// Definitions for gpio-key module
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		// Configure the gpio pin controller
-+		target = <&gpio>;
-+		__overlay__ {
-+			pin_state: button_pins@0 {
-+				brcm,pins = <3>; // gpio number
-+				brcm,function = <0>; // 0 = input, 1 = output
-+				brcm,pull = <2>; // 0 = none, 1 = pull down, 2 = pull up
-+			};
-+		};
-+	};
-+	fragment@1 {
-+		target-path = "/";
-+		__overlay__ {
-+			button: button@0 {
-+				compatible = "gpio-keys";
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&pin_state>;
-+				status = "okay";
-+
-+				key: key {
-+					linux,code = <116>;
-+					gpios = <&gpio 3 1>;
-+					label = "KEY_POWER";
-+				};
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		gpio =       <&key>,"gpios:4",
-+		             <&button>,"reg:0",
-+		             <&pin_state>,"brcm,pins:0",
-+		             <&pin_state>,"reg:0";
-+		label =      <&key>,"label";
-+		keycode =    <&key>,"linux,code:0";
-+		gpio_pull =  <&pin_state>,"brcm,pull:0";
-+		active_low = <&key>,"gpios:8";
-+	};
-+
-+};
-diff --git a/arch/arm/boot/dts/overlays/gpio-led-overlay.dts b/arch/arm/boot/dts/overlays/gpio-led-overlay.dts
-new file mode 100755
-index 000000000000..d8e9d53f1b61
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/gpio-led-overlay.dts
-@@ -0,0 +1,97 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later
-+/*
-+ * gpio-led - generic connection of kernel's LED framework to the RPI's GPIO.
-+ * Copyright (C) 2021 House Gordon Software Company Ltd. <assafgordon@gmail.com>
-+ *
-+ * Based on information from:
-+ *   https://mjoldfield.com/atelier/2017/03/rpi-devicetree.html
-+ *   https://www.raspberrypi.org/documentation/configuration/device-tree.md
-+ *   https://www.kernel.org/doc/html/latest/leds/index.html
-+ *
-+ * compile with:
-+ *   dtc -@ -Hepapr -I dts -O dtb -o gpio-led.dtbo gpio-led-overlay.dts
-+ *
-+ * There will be some warnings (can be ignored):
-+ *  Warning (label_is_string): /__overrides__:label: property is not a string
-+ *  Warning (unit_address_vs_reg): /fragment@0/__overlay__/led_pins@0:
-+ *                                 node has a unit name, but no reg property
-+ *  Warning (unit_address_vs_reg): /fragment@1/__overlay__/leds@0:
-+ *                                 node has a unit name, but no reg property
-+ *  Warning (gpios_property): /__overrides__: Missing property
-+ *                 '#gpio-cells' in node /fragment@1/__overlay__/leds@0/led
-+ *                  or bad phandle (referred from gpio[0])
-+ *
-+ * Typical electrical connection is:
-+ *    RPI-GPIO.19  ->  LED  -> 300ohm resister  -> RPI-GND
-+ *    The GPIO pin number can be changed with the 'gpio=' parameter.
-+ *
-+ * Test from user-space with:
-+ *   # if nothing is shown, the overlay file isn't found in /boot/overlays
-+ *   dtoverlay -a | grep gpio-led
-+ *
-+ *   # Load the overlay
-+ *   dtoverlay gpio-led label=moo gpio=19
-+ *
-+ *   # if nothing is shown, the overlay wasn't loaded successfully
-+ *   dtoverlay -l | grep gpio-led
-+ *
-+ *   echo 1 > /sys/class/leds/moo/brightness
-+ *   echo 0 > /sys/class/leds/moo/brightness
-+ *   echo cpu > /sys/class/leds/moo/trigger
-+ *   echo heartbeat > /sys/class/leds/moo/trigger
-+ *
-+ *   # unload the overlay
-+ *   dtoverlay -r gpio-led
-+ *
-+ * To load in /boot/config.txt add lines such as:
-+ *   dtoverlay=gpio-led,gpio=19,label=heart,trigger=heartbeat
-+ *   dtoverlay=gpio-led,gpio=26,label=brain,trigger=cpu
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		// Configure the gpio pin controller
-+		target = <&gpio>;
-+		__overlay__ {
-+			led_pin: led_pins@19 {
-+				brcm,pins = <19>; // gpio number
-+				brcm,function = <1>; // 0 = input, 1 = output
-+				brcm,pull = <0>; // 0 = none, 1 = pull down, 2 = pull up
-+			};
-+		};
-+	};
-+	fragment@1 {
-+		target-path = "/";
-+		__overlay__ {
-+			leds: leds@0 {
-+				compatible = "gpio-leds";
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&led_pin>;
-+				status = "okay";
-+
-+				led: led {
-+			                label = "myled1";
-+					gpios = <&gpio 19 0>;
-+			                linux,default-trigger = "none";
-+				};
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		gpio =       <&led>,"gpios:4",
-+		             <&leds>,"reg:0",
-+		             <&led_pin>,"brcm,pins:0",
-+		             <&led_pin>,"reg:0";
-+		label =      <&led>,"label";
-+		active_low = <&led>,"gpios:8";
-+		trigger =    <&led>,"linux,default-trigger";
-+	};
-+
-+};
-+
-diff --git a/arch/arm/boot/dts/overlays/gpio-no-bank0-irq-overlay.dts b/arch/arm/boot/dts/overlays/gpio-no-bank0-irq-overlay.dts
-new file mode 100755
-index 000000000000..96cbe80820b7
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/gpio-no-bank0-irq-overlay.dts
-@@ -0,0 +1,14 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		// Configure the gpio pin controller
-+		target = <&gpio>;
-+		__overlay__ {
-+			    interrupts = <255 255>, <2 18>;
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/gpio-no-irq-overlay.dts b/arch/arm/boot/dts/overlays/gpio-no-irq-overlay.dts
-new file mode 100644
-index 000000000000..55f9bff3a8f6
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/gpio-no-irq-overlay.dts
-@@ -0,0 +1,14 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		// Configure the gpio pin controller
-+		target = <&gpio>;
-+		__overlay__ {
-+			    interrupts;
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts b/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts
-new file mode 100644
-index 000000000000..8153f83f0427
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts
-@@ -0,0 +1,39 @@
-+// Definitions for gpio-poweroff module
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target-path = "/";
-+		__overlay__ {
-+			power_ctrl: power_ctrl {
-+				compatible = "gpio-poweroff";
-+				gpios = <&gpio 26 0>;
-+				force;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			power_ctrl_pins: power_ctrl_pins {
-+				brcm,pins = <26>;
-+				brcm,function = <1>; // out
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		gpiopin =       <&power_ctrl>,"gpios:4",
-+				<&power_ctrl_pins>,"brcm,pins:0";
-+		active_low =    <&power_ctrl>,"gpios:8";
-+		input =         <&power_ctrl>,"input?";
-+		export =        <&power_ctrl>,"export?";
-+		timeout_ms =    <&power_ctrl>,"timeout-ms:0";
-+		active_delay_ms = <&power_ctrl>,"active-delay-ms:0";
-+		inactive_delay_ms = <&power_ctrl>,"inactive-delay-ms:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/gpio-shutdown-overlay.dts b/arch/arm/boot/dts/overlays/gpio-shutdown-overlay.dts
-new file mode 100644
-index 000000000000..da148064aedd
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/gpio-shutdown-overlay.dts
-@@ -0,0 +1,86 @@
-+// Definitions for gpio-poweroff module
-+/dts-v1/;
-+/plugin/;
-+
-+// This overlay sets up an input device that generates KEY_POWER events
-+// when a given GPIO pin changes. It defaults to using GPIO3, which can
-+// also be used to wake up (start) the Rpi again after shutdown.
-+// Raspberry Pi 1 Model B rev 1 can be wake up only by GPIO1 pin, so for
-+// these boards change default GPIO pin to 1 via gpio_pin parameter. Since
-+// wakeup is active-low, this defaults to active-low with a pullup
-+// enabled, but all of this can be changed using overlay parameters (but
-+// note that GPIO3 has an external pullup on at least some boards).
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		// Configure the gpio pin controller
-+		target = <&gpio>;
-+		__overlay__ {
-+			// Define a pinctrl state, that sets up the gpio
-+			// as an input with a pullup enabled. This does
-+			// not take effect by itself, only when referenced
-+			// by a "pinctrl client", as is done below. See:
-+			//   https://www.kernel.org/doc/Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
-+			//   https://www.kernel.org/doc/Documentation/devicetree/bindings/pinctrl/brcm,bcm2835-gpio.txt
-+			pin_state: shutdown_button_pins@3 {
-+				brcm,pins = <3>; // gpio number
-+				brcm,function = <0>; // 0 = input, 1 = output
-+				brcm,pull = <2>; // 0 = none, 1 = pull down, 2 = pull up
-+			};
-+		};
-+	};
-+	fragment@1 {
-+		// Add a new device to the /soc devicetree node
-+		target-path = "/soc";
-+		__overlay__ {
-+			shutdown_button: shutdown_button@3 {
-+				// Let the gpio-keys driver handle this device. See:
-+				// https://www.kernel.org/doc/Documentation/devicetree/bindings/input/gpio-keys.txt
-+				compatible = "gpio-keys";
-+
-+				// Declare a single pinctrl state (referencing the one declared above) and name it
-+				// default, so it is activated automatically.
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&pin_state>;
-+
-+				// Enable this device
-+				status = "okay";
-+
-+				// Define a single key, called "shutdown" that monitors the gpio and sends KEY_POWER
-+				// (keycode 116, see
-+				// https://github.com/torvalds/linux/blob/v4.12/include/uapi/linux/input-event-codes.h#L190)
-+				button: shutdown {
-+					label = "shutdown";
-+					linux,code = <116>; // KEY_POWER
-+					gpios = <&gpio 3 1>;
-+					debounce-interval = <100>; // ms
-+				};
-+			};
-+		};
-+	};
-+
-+	// This defines parameters that can be specified when loading
-+	// the overlay. Each foo = line specifies one parameter, named
-+	// foo. The rest of the specification gives properties where the
-+	// parameter value is inserted into (changing the values above
-+	// or adding new ones).
-+	__overrides__ {
-+		// Allow overriding the GPIO number.
-+		gpio_pin = <&button>,"gpios:4",
-+			   <&shutdown_button>,"reg:0",
-+			   <&pin_state>,"reg:0",
-+		           <&pin_state>,"brcm,pins:0";
-+
-+		// Allow changing the internal pullup/down state. 0 = none, 1 = pulldown, 2 = pullup
-+		// Note that GPIO3 and GPIO2 are the I2c pins and have an external pullup (at least
-+		// on some boards). Same applies for GPIO1 on Raspberry Pi 1 Model B rev 1.
-+		gpio_pull = <&pin_state>,"brcm,pull:0";
-+
-+		// Allow setting the active_low flag. 0 = active high, 1 = active low
-+		active_low = <&button>,"gpios:8";
-+		debounce = <&button>,"debounce-interval:0";
-+	};
-+
-+};
-diff --git a/arch/arm/boot/dts/overlays/hd44780-lcd-overlay.dts b/arch/arm/boot/dts/overlays/hd44780-lcd-overlay.dts
-new file mode 100644
-index 000000000000..ee726669ff51
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/hd44780-lcd-overlay.dts
-@@ -0,0 +1,46 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+    compatible = "brcm,bcm2835";
-+
-+    fragment@0 {
-+        target-path = "/";
-+        __overlay__ {
-+            lcd_screen: auxdisplay {
-+                compatible = "hit,hd44780";
-+
-+                data-gpios = <&gpio 6 0>,
-+                             <&gpio 13 0>,
-+                             <&gpio 19 0>,
-+                             <&gpio 26 0>;
-+                enable-gpios = <&gpio 21 0>;
-+                rs-gpios = <&gpio 20 0>;
-+
-+                display-height-chars = <2>;
-+                display-width-chars = <16>;
-+            };
-+
-+        };
-+    };
-+
-+    fragment@1 {
-+       target = <&lcd_screen>;
-+        __dormant__ {
-+            backlight-gpios = <&gpio 12 0>;
-+        };
-+    };
-+
-+    __overrides__ {
-+        pin_d4 = <&lcd_screen>,"data-gpios:4";
-+        pin_d5 = <&lcd_screen>,"data-gpios:16";
-+        pin_d6 = <&lcd_screen>,"data-gpios:28";
-+        pin_d7 = <&lcd_screen>,"data-gpios:40";
-+        pin_en = <&lcd_screen>,"enable-gpios:4";
-+        pin_rs = <&lcd_screen>,"rs-gpios:4";
-+        pin_bl = <0>,"+1", <&lcd_screen>,"backlight-gpios:4";
-+        display_height = <&lcd_screen>,"display-height-chars:0";
-+        display_width = <&lcd_screen>,"display-width-chars:0";
-+    };
-+
-+};
-diff --git a/arch/arm/boot/dts/overlays/hdmi-backlight-hwhack-gpio-overlay.dts b/arch/arm/boot/dts/overlays/hdmi-backlight-hwhack-gpio-overlay.dts
-new file mode 100644
-index 000000000000..50b9a2665c80
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/hdmi-backlight-hwhack-gpio-overlay.dts
-@@ -0,0 +1,47 @@
-+/*
-+ * Devicetree overlay for GPIO based backlight on/off capability.
-+ *
-+ * Use this if you have one of those HDMI displays whose backlight cannot be
-+ * controlled via DPMS over HDMI and plan to do a little soldering to use an
-+ * RPi gpio pin for on/off switching.
-+ *
-+ * See: https://www.waveshare.com/wiki/7inch_HDMI_LCD_(C)#Backlight_Control
-+ *
-+ */
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@1 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			hdmi_backlight_hwhack_gpio_pins: hdmi_backlight_hwhack_gpio_pins {
-+				brcm,pins = <17>;
-+				brcm,function = <1>; /* out */
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target-path = "/";
-+		__overlay__ {
-+			hdmi_backlight_hwhack_gpio: hdmi_backlight_hwhack_gpio {
-+				compatible = "gpio-backlight";
-+
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&hdmi_backlight_hwhack_gpio_pins>;
-+
-+				gpios = <&gpio 17 0>;
-+				default-on;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		gpio_pin   = <&hdmi_backlight_hwhack_gpio>,"gpios:4",
-+		             <&hdmi_backlight_hwhack_gpio_pins>,"brcm,pins:0";
-+		active_low = <&hdmi_backlight_hwhack_gpio>,"gpios:8";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/hifiberry-amp-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-amp-overlay.dts
-new file mode 100644
-index 000000000000..142518ab348b
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/hifiberry-amp-overlay.dts
-@@ -0,0 +1,39 @@
-+// Definitions for HiFiBerry Amp/Amp+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			tas5713@1b {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,tas5713";
-+				reg = <0x1b>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "hifiberry,hifiberry-amp";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/hifiberry-amp100-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-amp100-overlay.dts
-new file mode 100644
-index 000000000000..ebdef55d6110
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/hifiberry-amp100-overlay.dts
-@@ -0,0 +1,64 @@
-+// Definitions for HiFiBerry AMP100
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target-path = "/";
-+		__overlay__ {
-+			dacpro_osc: dacpro_osc {
-+				compatible = "hifiberry,dacpro-clk";
-+				#clock-cells = <0>;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			pcm5122@4d {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,pcm5122";
-+				reg = <0x4d>;
-+				clocks = <&dacpro_osc>;
-+				AVDD-supply = <&vdd_3v3_reg>;
-+				DVDD-supply = <&vdd_3v3_reg>;
-+				CPVDD-supply = <&vdd_3v3_reg>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&sound>;
-+		hifiberry_dacplus: __overlay__ {
-+			compatible = "hifiberry,hifiberry-dacplus";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+			mute-gpio = <&gpio 4 0>;
-+			reset-gpio = <&gpio 17 0x11>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		24db_digital_gain =
-+			<&hifiberry_dacplus>,"hifiberry,24db_digital_gain?";
-+		slave = <&hifiberry_dacplus>,"hifiberry-dacplus,slave?";
-+		leds_off = <&hifiberry_dacplus>,"hifiberry-dacplus,leds_off?";
-+		mute_ext_ctl = <&hifiberry_dacplus>,"hifiberry-dacplus,mute_ext_ctl:0";
-+		auto_mute = <&hifiberry_dacplus>,"hifiberry-dacplus,auto_mute?";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/hifiberry-amp3-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-amp3-overlay.dts
-new file mode 100644
-index 000000000000..a01e263a133b
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/hifiberry-amp3-overlay.dts
-@@ -0,0 +1,57 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+// Definitions for HiFiBerry's Amp3
-+/dts-v1/;
-+/plugin/;
-+#include <dt-bindings/pinctrl/bcm2835.h>
-+#include <dt-bindings/gpio/gpio.h>
-+
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			hifiberry_amp3_pins: hifiberry_amp3_pins {
-+				brcm,pins = <23 17>;
-+				brcm,function = <0 1>;
-+				brcm,pull = <2 1>;
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			hifiberry_amp2: ma120x0p@20 {
-+				#sound-dai-cells = <0>;
-+				compatible = "ma,ma120x0p";
-+				reg = <0x20>;
-+				status = "okay";
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&hifiberry_amp3_pins>;
-+				error_gp-gpios = <&gpio 23 GPIO_ACTIVE_HIGH>;
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "hifiberry,hifiberry-amp3";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/hifiberry-dac-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dac-overlay.dts
-new file mode 100644
-index 000000000000..ea8a6c8f36c0
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/hifiberry-dac-overlay.dts
-@@ -0,0 +1,34 @@
-+// Definitions for HiFiBerry DAC
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target-path = "/";
-+		__overlay__ {
-+			pcm5102a-codec {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,pcm5102a";
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "hifiberry,hifiberry-dac";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts
-new file mode 100644
-index 000000000000..ff19015ba656
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts
-@@ -0,0 +1,65 @@
-+// Definitions for HiFiBerry DAC+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target-path = "/";
-+		__overlay__ {
-+			dacpro_osc: dacpro_osc {
-+				compatible = "hifiberry,dacpro-clk";
-+				#clock-cells = <0>;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			pcm5122@4d {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,pcm5122";
-+				reg = <0x4d>;
-+				clocks = <&dacpro_osc>;
-+				AVDD-supply = <&vdd_3v3_reg>;
-+				DVDD-supply = <&vdd_3v3_reg>;
-+				CPVDD-supply = <&vdd_3v3_reg>;
-+				status = "okay";
-+			};
-+			hpamp: hpamp@60 {
-+				compatible = "ti,tpa6130a2";
-+				reg = <0x60>;
-+				status = "disabled";
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&sound>;
-+		hifiberry_dacplus: __overlay__ {
-+			compatible = "hifiberry,hifiberry-dacplus";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		24db_digital_gain =
-+			<&hifiberry_dacplus>,"hifiberry,24db_digital_gain?";
-+		slave = <&hifiberry_dacplus>,"hifiberry-dacplus,slave?";
-+		leds_off = <&hifiberry_dacplus>,"hifiberry-dacplus,leds_off?";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts
-new file mode 100644
-index 000000000000..540563dec10f
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts
-@@ -0,0 +1,72 @@
-+// Definitions for HiFiBerry DAC+ADC
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target-path = "/";
-+		__overlay__ {
-+			dacpro_osc: dacpro_osc {
-+				compatible = "hifiberry,dacpro-clk";
-+				#clock-cells = <0>;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			pcm_codec: pcm5122@4d {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,pcm5122";
-+				reg = <0x4d>;
-+				clocks = <&dacpro_osc>;
-+				AVDD-supply = <&vdd_3v3_reg>;
-+				DVDD-supply = <&vdd_3v3_reg>;
-+				CPVDD-supply = <&vdd_3v3_reg>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target-path = "/";
-+		__overlay__ {
-+			dmic {
-+				#sound-dai-cells = <0>;
-+				compatible = "dmic-codec";
-+				num-channels = <2>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&sound>;
-+		hifiberry_dacplusadc: __overlay__ {
-+			compatible = "hifiberry,hifiberry-dacplusadc";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		24db_digital_gain =
-+			<&hifiberry_dacplusadc>,"hifiberry,24db_digital_gain?";
-+		slave = <&hifiberry_dacplusadc>,"hifiberry-dacplusadc,slave?";
-+		leds_off = <&hifiberry_dacplusadc>,"hifiberry-dacplusadc,leds_off?";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts
-new file mode 100644
-index 000000000000..561cd84bbb79
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts
-@@ -0,0 +1,70 @@
-+// Definitions for HiFiBerry DAC+ADC PRO
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target-path = "/";
-+		__overlay__ {
-+			dacpro_osc: dacpro_osc {
-+				compatible = "hifiberry,dacpro-clk";
-+				#clock-cells = <0>;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			hb_dac: pcm5122@4d {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,pcm5122";
-+				reg = <0x4d>;
-+				clocks = <&dacpro_osc>;
-+				status = "okay";
-+			};
-+			hb_adc: pcm186x@4a {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,pcm1863";
-+				reg = <0x4a>;
-+				clocks = <&dacpro_osc>;
-+				status = "okay";
-+			};
-+			hpamp: hpamp@60 {
-+				compatible = "ti,tpa6130a2";
-+				reg = <0x60>;
-+				status = "disabled";
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&sound>;
-+		hifiberry_dacplusadcpro: __overlay__ {
-+			compatible = "hifiberry,hifiberry-dacplusadcpro";
-+			audio-codec = <&hb_dac &hb_adc>;
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		24db_digital_gain =
-+			<&hifiberry_dacplusadcpro>,"hifiberry-dacplusadcpro,24db_digital_gain?";
-+		slave = <&hifiberry_dacplusadcpro>,"hifiberry-dacplusadcpro,slave?";
-+		leds_off = <&hifiberry_dacplusadcpro>,"hifiberry-dacplusadcpro,leds_off?";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplusdsp-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplusdsp-overlay.dts
-new file mode 100644
-index 000000000000..63432e8b983f
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusdsp-overlay.dts
-@@ -0,0 +1,34 @@
-+// Definitions for hifiberry DAC+DSP soundcard overlay
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target-path = "/";
-+		__overlay__ {
-+			dacplusdsp-codec {
-+				#sound-dai-cells = <0>;
-+				compatible = "hifiberry,dacplusdsp";
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "hifiberrydacplusdsp,hifiberrydacplusdsp-soundcard";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplushd-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplushd-overlay.dts
-new file mode 100644
-index 000000000000..b9165138c7ad
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/hifiberry-dacplushd-overlay.dts
-@@ -0,0 +1,94 @@
-+// Definitions for HiFiBerry DAC+ HD
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			pcm1792a@4c {
-+				compatible = "ti,pcm1792a";
-+				#sound-dai-cells = <0>;
-+				#clock-cells = <0>;
-+				reg = <0x4c>;
-+				status = "okay";
-+			};
-+			pll: pll@62 {
-+				compatible = "hifiberry,dachd-clk";
-+				#clock-cells = <0>;
-+				reg = <0x62>;
-+				status = "okay";
-+				common_pll_regs = [
-+					02 53 03 00 07 20 0F 00
-+					10 0D 11 1D 12 0D 13 8C
-+					14 8C 15 8C 16 8C 17 8C
-+					18 2A 1C 00 1D 0F 1F 00
-+					2A 00 2C 00 2F 00 30 00
-+					31 00 32 00 34 00 37 00
-+					38 00 39 00 3A 00 3B 01
-+					3E 00 3F 00 40 00 41 00
-+					5A 00 5B 00 95 00 96 00
-+					97 00 98 00 99 00 9A 00
-+					9B 00 A2 00 A3 00 A4 00
-+					B7 92 ];
-+				192k_pll_regs = [
-+					1A 0C 1B 35 1E F0 20 09
-+					21 50 2B 02 2D 10 2E 40
-+					33 01 35 22 36 80 3C 22
-+					3D 46 ];
-+				96k_pll_regs = [
-+					1A 0C 1B 35 1E F0 20 09
-+					21 50 2B 02 2D 10 2E 40
-+					33 01 35 47 36 00 3C 32
-+					3D 46 ];
-+				48k_pll_regs = [
-+					1A 0C 1B 35 1E F0 20 09
-+					21 50 2B 02 2D 10 2E 40
-+					33 01 35 90 36 00 3C 42
-+					3D 46 ];
-+				176k4_pll_regs = [
-+					1A 3D 1B 09 1E F3 20 13
-+					21 75 2B 04 2D 11 2E E0
-+					33 02 35 25 36 C0 3C 22
-+					3D 7A ];
-+				88k2_pll_regs = [
-+					1A 3D 1B 09 1E F3 20 13
-+					21 75 2B 04 2D 11 2E E0
-+					33 01 35 4D 36 80 3C 32
-+					3D 7A ];
-+				44k1_pll_regs = [
-+					1A 3D 1B 09 1E F3 20 13
-+					21 75 2B 04 2D 11 2E E0
-+					33 01 35 9D 36 00 3C 42
-+					3D 7A ];
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "hifiberry,hifiberry-dacplushd";
-+			i2s-controller = <&i2s>;
-+			clocks = <&pll 0>;
-+			reset-gpio = <&gpio 16 GPIO_ACTIVE_LOW>;
-+			status = "okay";
-+		};
-+	};
-+
-+};
-diff --git a/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts
-new file mode 100644
-index 000000000000..a2309a50e8d8
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts
-@@ -0,0 +1,41 @@
-+// Definitions for HiFiBerry Digi
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			wm8804@3b {
-+				#sound-dai-cells = <0>;
-+				compatible = "wlf,wm8804";
-+				reg = <0x3b>;
-+				PVDD-supply = <&vdd_3v3_reg>;
-+				DVDD-supply = <&vdd_3v3_reg>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "hifiberry,hifiberry-digi";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/hifiberry-digi-pro-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-digi-pro-overlay.dts
-new file mode 100644
-index 000000000000..83de602e76ba
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/hifiberry-digi-pro-overlay.dts
-@@ -0,0 +1,43 @@
-+// Definitions for HiFiBerry Digi Pro
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			wm8804@3b {
-+				#sound-dai-cells = <0>;
-+				compatible = "wlf,wm8804";
-+				reg = <0x3b>;
-+				PVDD-supply = <&vdd_3v3_reg>;
-+				DVDD-supply = <&vdd_3v3_reg>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "hifiberry,hifiberry-digi";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+			clock44-gpio = <&gpio 5 0>;
-+			clock48-gpio = <&gpio 6 0>;
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/highperi-overlay.dts b/arch/arm/boot/dts/overlays/highperi-overlay.dts
-new file mode 100644
-index 000000000000..46cb76c2d34f
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/highperi-overlay.dts
-@@ -0,0 +1,63 @@
-+/*
-+ * highperi.dts
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2711";
-+
-+	fragment@0 {
-+		target = <&soc>;
-+		#address-cells = <2>;
-+		#size-cells = <1>;
-+
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+			ranges = <0x7c000000  0x4 0x7c000000  0x04000000>,
-+				 <0x40000000  0x4 0xc0000000  0x00800000>;
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&scb>;
-+		#address-cells = <2>;
-+		#size-cells = <1>;
-+
-+		__overlay__ {
-+			#address-cells = <2>;
-+			#size-cells = <2>;
-+			ranges = <0x0 0x7c000000  0x4 0x7c000000  0x0 0x04000000>,
-+				 <0x0 0x40000000  0x4 0xc0000000  0x0 0x00800000>,
-+				 <0x6 0x00000000  0x6 0x00000000  0x0 0x40000000>;
-+			dma-ranges = <0x0 0x00000000  0x0 0x00000000  0x2 0x00000000>;
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&v3dbus>;
-+		#address-cells = <2>;
-+		#size-cells = <1>;
-+
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <2>;
-+			ranges = <0x7c500000  0x4 0x7c500000  0x0 0x03300000>,
-+				 <0x40000000  0x4 0xc0000000  0x0 0x00800000>;
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&emmc2bus>;
-+		#address-cells = <2>;
-+		#size-cells = <1>;
-+
-+		__overlay__ {
-+			#address-cells = <2>;
-+			#size-cells = <1>;
-+			ranges = <0x0 0x7e000000  0x4 0x7e000000  0x01800000>;
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/hy28a-overlay.dts b/arch/arm/boot/dts/overlays/hy28a-overlay.dts
-new file mode 100644
-index 000000000000..5843a5e9c86a
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/hy28a-overlay.dts
-@@ -0,0 +1,93 @@
-+/*
-+ * Device Tree overlay for HY28A display
-+ *
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&spidev1>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			hy28a_pins: hy28a_pins {
-+				brcm,pins = <17 25 18>;
-+				brcm,function = <0 1 1>; /* in out out */
-+			};
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			hy28a: hy28a@0{
-+				compatible = "ilitek,ili9320";
-+				reg = <0>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&hy28a_pins>;
-+
-+				spi-max-frequency = <32000000>;
-+				spi-cpol;
-+				spi-cpha;
-+				rotate = <270>;
-+				bgr;
-+				fps = <50>;
-+				buswidth = <8>;
-+				startbyte = <0x70>;
-+				reset-gpios = <&gpio 25 1>;
-+				led-gpios = <&gpio 18 1>;
-+				debug = <0>;
-+			};
-+
-+			hy28a_ts: hy28a-ts@1 {
-+				compatible = "ti,ads7846";
-+				reg = <1>;
-+
-+				spi-max-frequency = <2000000>;
-+				interrupts = <17 2>; /* high-to-low edge triggered */
-+				interrupt-parent = <&gpio>;
-+				pendown-gpio = <&gpio 17 0>;
-+				ti,x-plate-ohms = /bits/ 16 <100>;
-+				ti,pressure-max = /bits/ 16 <255>;
-+			};
-+		};
-+	};
-+	__overrides__ {
-+		speed =		<&hy28a>,"spi-max-frequency:0";
-+		rotate =	<&hy28a>,"rotate:0";
-+		fps =		<&hy28a>,"fps:0";
-+		debug =		<&hy28a>,"debug:0";
-+		xohms =		<&hy28a_ts>,"ti,x-plate-ohms;0";
-+		resetgpio =	<&hy28a>,"reset-gpios:4",
-+				<&hy28a_pins>, "brcm,pins:4";
-+		ledgpio =	<&hy28a>,"led-gpios:4",
-+				<&hy28a_pins>, "brcm,pins:8";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/hy28b-2017-overlay.dts b/arch/arm/boot/dts/overlays/hy28b-2017-overlay.dts
-new file mode 100644
-index 000000000000..95bfb1eadc20
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/hy28b-2017-overlay.dts
-@@ -0,0 +1,152 @@
-+/*
-+ * Device Tree overlay for HY28b display shield by Texy.
-+ * Modified for 2017 version with ILI9325 D chip
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&spidev1>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			hy28b_pins: hy28b_pins {
-+				brcm,pins = <17 25 18>;
-+				brcm,function = <0 1 1>; /* in out out */
-+			};
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			hy28b: hy28b@0{
-+				compatible = "ilitek,ili9325";
-+				reg = <0>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&hy28b_pins>;
-+
-+				spi-max-frequency = <48000000>;
-+				spi-cpol;
-+				spi-cpha;
-+				rotate = <270>;
-+				bgr;
-+				fps = <50>;
-+				buswidth = <8>;
-+				startbyte = <0x70>;
-+				reset-gpios = <&gpio 25 1>;
-+				led-gpios = <&gpio 18 1>;
-+
-+				init = <0x10000e5 0x78F0
-+					0x1000001 0x0100
-+					0x1000002 0x0700
-+				        0x1000003 0x1030
-+					0x1000004 0x0000
-+					0x1000008 0x0207
-+					0x1000009 0x0000
-+				        0x100000a 0x0000
-+					0x100000c 0x0000
-+					0x100000d 0x0000
-+					0x100000f 0x0000
-+				        0x1000010 0x0000
-+					0x1000011 0x0007
-+					0x1000012 0x0000
-+					0x1000013 0x0000
-+					0x1000007 0x0001
-+				        0x2000032
-+				        0x2000032
-+				        0x2000032
-+				        0x2000032
-+					0x1000010 0x1090
-+					0x1000011 0x0227
-+				        0x2000032
-+					0x1000012 0x001f
-+				        0x2000032
-+				        0x1000013 0x1500
-+					0x1000029 0x0027
-+					0x100002b 0x000d
-+				        0x2000032
-+				        0x1000020 0x0000
-+					0x1000021 0x0000
-+				        0x2000032
-+					0x1000030 0x0000
-+					0x1000031 0x0707
-+					0x1000032 0x0307
-+					0x1000035 0x0200
-+					0x1000036 0x0008
-+					0x1000037 0x0004
-+					0x1000038 0x0000
-+					0x1000039 0x0707
-+					0x100003c 0x0002
-+					0x100003d 0x1d04
-+					0x1000050 0x0000
-+				        0x1000051 0x00ef
-+					0x1000052 0x0000
-+					0x1000053 0x013f
-+					0x1000060 0xa700
-+				        0x1000061 0x0001
-+					0x100006a 0x0000
-+					0x1000080 0x0000
-+					0x1000081 0x0000
-+				        0x1000082 0x0000
-+					0x1000083 0x0000
-+					0x1000084 0x0000
-+					0x1000085 0x0000
-+				        0x1000090 0x0010
-+					0x1000092 0x0600
-+					0x1000007 0x0133>;
-+				debug = <0>;
-+			};
-+
-+			hy28b_ts: hy28b-ts@1 {
-+				compatible = "ti,ads7846";
-+				reg = <1>;
-+
-+				spi-max-frequency = <2000000>;
-+				interrupts = <17 2>; /* high-to-low edge triggered */
-+				interrupt-parent = <&gpio>;
-+				pendown-gpio = <&gpio 17 0>;
-+				ti,x-plate-ohms = /bits/ 16 <100>;
-+				ti,pressure-max = /bits/ 16 <255>;
-+			};
-+		};
-+	};
-+	__overrides__ {
-+		speed = 	<&hy28b>,"spi-max-frequency:0";
-+		rotate = 	<&hy28b>,"rotate:0";
-+		fps = 		<&hy28b>,"fps:0";
-+		debug = 	<&hy28b>,"debug:0";
-+		xohms =		<&hy28b_ts>,"ti,x-plate-ohms;0";
-+		resetgpio =	<&hy28b>,"reset-gpios:4",
-+				<&hy28b_pins>, "brcm,pins:4";
-+		ledgpio =	<&hy28b>,"led-gpios:4",
-+				<&hy28b_pins>, "brcm,pins:8";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/hy28b-overlay.dts b/arch/arm/boot/dts/overlays/hy28b-overlay.dts
-new file mode 100644
-index 000000000000..9edd0848d555
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/hy28b-overlay.dts
-@@ -0,0 +1,148 @@
-+/*
-+ * Device Tree overlay for HY28b display shield by Texy
-+ *
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&spidev1>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			hy28b_pins: hy28b_pins {
-+				brcm,pins = <17 25 18>;
-+				brcm,function = <0 1 1>; /* in out out */
-+			};
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			hy28b: hy28b@0{
-+				compatible = "ilitek,ili9325";
-+				reg = <0>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&hy28b_pins>;
-+
-+				spi-max-frequency = <48000000>;
-+				spi-cpol;
-+				spi-cpha;
-+				rotate = <270>;
-+				bgr;
-+				fps = <50>;
-+				buswidth = <8>;
-+				startbyte = <0x70>;
-+				reset-gpios = <&gpio 25 1>;
-+				led-gpios = <&gpio 18 1>;
-+
-+				gamma = "04 1F 4 7 7 0 7 7 6 0\n0F 00 1 7 4 0 0 0 6 7";
-+
-+				init = <0x10000e7 0x0010
-+					0x1000000 0x0001
-+					0x1000001 0x0100
-+					0x1000002 0x0700
-+				        0x1000003 0x1030
-+					0x1000004 0x0000
-+					0x1000008 0x0207
-+					0x1000009 0x0000
-+				        0x100000a 0x0000
-+					0x100000c 0x0001
-+					0x100000d 0x0000
-+					0x100000f 0x0000
-+				        0x1000010 0x0000
-+					0x1000011 0x0007
-+					0x1000012 0x0000
-+					0x1000013 0x0000
-+				        0x2000032
-+					0x1000010 0x1590
-+					0x1000011 0x0227
-+				        0x2000032
-+					0x1000012 0x009c
-+				        0x2000032
-+				        0x1000013 0x1900
-+					0x1000029 0x0023
-+					0x100002b 0x000e
-+				        0x2000032
-+				        0x1000020 0x0000
-+					0x1000021 0x0000
-+				        0x2000032
-+					0x1000050 0x0000
-+				        0x1000051 0x00ef
-+					0x1000052 0x0000
-+					0x1000053 0x013f
-+					0x1000060 0xa700
-+				        0x1000061 0x0001
-+					0x100006a 0x0000
-+					0x1000080 0x0000
-+					0x1000081 0x0000
-+				        0x1000082 0x0000
-+					0x1000083 0x0000
-+					0x1000084 0x0000
-+					0x1000085 0x0000
-+				        0x1000090 0x0010
-+					0x1000092 0x0000
-+					0x1000093 0x0003
-+					0x1000095 0x0110
-+				        0x1000097 0x0000
-+					0x1000098 0x0000
-+					0x1000007 0x0133
-+					0x1000020 0x0000
-+				        0x1000021 0x0000
-+				        0x2000064>;
-+				debug = <0>;
-+			};
-+
-+			hy28b_ts: hy28b-ts@1 {
-+				compatible = "ti,ads7846";
-+				reg = <1>;
-+
-+				spi-max-frequency = <2000000>;
-+				interrupts = <17 2>; /* high-to-low edge triggered */
-+				interrupt-parent = <&gpio>;
-+				pendown-gpio = <&gpio 17 0>;
-+				ti,x-plate-ohms = /bits/ 16 <100>;
-+				ti,pressure-max = /bits/ 16 <255>;
-+			};
-+		};
-+	};
-+	__overrides__ {
-+		speed = 	<&hy28b>,"spi-max-frequency:0";
-+		rotate = 	<&hy28b>,"rotate:0";
-+		fps = 		<&hy28b>,"fps:0";
-+		debug = 	<&hy28b>,"debug:0";
-+		xohms =		<&hy28b_ts>,"ti,x-plate-ohms;0";
-+		resetgpio =	<&hy28b>,"reset-gpios:4",
-+				<&hy28b_pins>, "brcm,pins:4";
-+		ledgpio =	<&hy28b>,"led-gpios:4",
-+				<&hy28b_pins>, "brcm,pins:8";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/i-sabre-q2m-overlay.dts b/arch/arm/boot/dts/overlays/i-sabre-q2m-overlay.dts
-new file mode 100644
-index 000000000000..0c4cff354674
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/i-sabre-q2m-overlay.dts
-@@ -0,0 +1,39 @@
-+// Definitions for I-Sabre Q2M
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&sound>;
-+		frag0: __overlay__ {
-+			compatible = "audiophonics,i-sabre-q2m";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			i-sabre-codec@48 {
-+				#sound-dai-cells = <0>;
-+				compatible = "audiophonics,i-sabre-codec";
-+				reg = <0x48>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/i2c-bcm2708-overlay.dts b/arch/arm/boot/dts/overlays/i2c-bcm2708-overlay.dts
-new file mode 100644
-index 000000000000..8204b6b3aef8
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/i2c-bcm2708-overlay.dts
-@@ -0,0 +1,13 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2c_arm>;
-+		__overlay__ {
-+			compatible = "brcm,bcm2708-i2c";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/i2c-fan-overlay.dts b/arch/arm/boot/dts/overlays/i2c-fan-overlay.dts
-new file mode 100644
-index 000000000000..ee25780a2810
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/i2c-fan-overlay.dts
-@@ -0,0 +1,108 @@
-+// Definitions for I2C based sensors using the Industrial IO or HWMON interface.
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/thermal/thermal.h>
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			emc2301: emc2301@2f {
-+				compatible = "microchip,emc2301";
-+				reg = <0x2f>;
-+				status = "okay";
-+				#cooling-cells = <0x02>;
-+			};
-+		};
-+	};
-+
-+	frag100: fragment@100 {
-+		target = <&i2c_arm>;
-+		i2cbus: __overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@101 {
-+		target = <&i2c0if>;
-+		__dormant__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@102 {
-+		target = <&i2c0mux>;
-+		__dormant__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@103 {
-+		target = <&cpu_thermal>;
-+		__overlay__ {
-+			polling-delay = <2000>; /* milliseconds */
-+		};
-+	};
-+
-+	fragment@104 {
-+		target = <&thermal_trips>;
-+		__overlay__ {
-+			fanmid0: fanmid0 {
-+				temperature = <50000>;
-+				hysteresis = <2000>;
-+				type = "active";
-+			};
-+			fanmax0: fanmax0 {
-+				temperature = <75000>;
-+				hysteresis = <2000>;
-+				type = "active";
-+			};
-+		};
-+	};
-+
-+	fragment@105 {
-+		target = <&cooling_maps>;
-+		__overlay__ {
-+			map0: map0 {
-+				trip = <&fanmid0>;
-+				cooling-device = <&emc2301 2 6>;
-+			};
-+			map1: map1 {
-+				trip = <&fanmax0>;
-+				cooling-device = <&emc2301 7 THERMAL_NO_LIMIT>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		i2c0 =		<&frag100>,"target:0=",<&i2c0>;
-+		i2c_csi_dsi =	<&frag100>,"target:0=",<&i2c_csi_dsi>,
-+				<0>,"+101+102";
-+		i2c3 = <&frag100>, "target?=0",
-+		       <&frag100>, "target-path=i2c3";
-+		i2c4 = <&frag100>, "target?=0",
-+		       <&frag100>, "target-path=i2c4";
-+		i2c5 = <&frag100>, "target?=0",
-+		       <&frag100>, "target-path=i2c5";
-+		i2c6 = <&frag100>, "target?=0",
-+		       <&frag100>, "target-path=i2c6";
-+		addr =		<&emc2301>,"reg:0";
-+		minpwm =	<&emc2301>,"emc2305,pwm-min;0";
-+		maxpwm =	<&emc2301>,"emc2305,pwm-max;0";
-+		midtemp =	<&fanmid0>,"temperature:0";
-+		midtemp_hyst =	<&fanmid0>,"hysteresis:0";
-+		maxtemp =	<&fanmax0>,"temperature:0";
-+		maxtemp_hyst =	<&fanmax0>,"hysteresis:0";
-+
-+		emc2301 =	<0>,"+0",
-+				<&map0>,"cooling-device:0=",<&emc2301>,
-+				<&map1>,"cooling-device:0=",<&emc2301>;
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts b/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts
-new file mode 100644
-index 000000000000..63231b5d7c0c
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts
-@@ -0,0 +1,47 @@
-+// Overlay for i2c_gpio bitbanging host bus.
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target-path = "/";
-+
-+		__overlay__ {
-+			i2c_gpio: i2c@0 {
-+				reg = <0xffffffff>;
-+				compatible = "i2c-gpio";
-+				gpios = <&gpio 23 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN) /* sda */
-+					 &gpio 24 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN) /* scl */
-+					>;
-+				i2c-gpio,delay-us = <2>;        /* ~100 kHz */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target-path = "/aliases";
-+		__overlay__ {
-+			i2c_gpio = "/i2c@0";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target-path = "/__symbols__";
-+		__overlay__ {
-+			i2c_gpio = "/i2c@0";
-+		};
-+	};
-+
-+	__overrides__ {
-+		i2c_gpio_sda = <&i2c_gpio>,"gpios:4";
-+		i2c_gpio_scl = <&i2c_gpio>,"gpios:16";
-+		i2c_gpio_delay_us = <&i2c_gpio>,"i2c-gpio,delay-us:0";
-+		bus = <&i2c_gpio>, "reg:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/i2c-mux-overlay.dts b/arch/arm/boot/dts/overlays/i2c-mux-overlay.dts
-new file mode 100644
-index 000000000000..112aed91ecb2
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/i2c-mux-overlay.dts
-@@ -0,0 +1,139 @@
-+// Umbrella I2C Mux overlay
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2c_arm>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			pca9542: mux@70 {
-+				compatible = "nxp,pca9542";
-+				reg = <0x70>;
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+
-+				i2c@0 {
-+					#address-cells = <1>;
-+					#size-cells = <0>;
-+					reg = <0>;
-+				};
-+				i2c@1 {
-+					#address-cells = <1>;
-+					#size-cells = <0>;
-+					reg = <1>;
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c_arm>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			pca9545: mux@70 {
-+				compatible = "nxp,pca9545";
-+				reg = <0x70>;
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+
-+				i2c@0 {
-+					#address-cells = <1>;
-+					#size-cells = <0>;
-+					reg = <0>;
-+				};
-+				i2c@1 {
-+					#address-cells = <1>;
-+					#size-cells = <0>;
-+					reg = <1>;
-+				};
-+				i2c@2 {
-+					#address-cells = <1>;
-+					#size-cells = <0>;
-+					reg = <2>;
-+				};
-+				i2c@3 {
-+					#address-cells = <1>;
-+					#size-cells = <0>;
-+					reg = <3>;
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c_arm>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			pca9548: mux@70 {
-+				compatible = "nxp,pca9548";
-+				reg = <0x70>;
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+
-+				i2c@0 {
-+					#address-cells = <1>;
-+					#size-cells = <0>;
-+					reg = <0>;
-+				};
-+				i2c@1 {
-+					#address-cells = <1>;
-+					#size-cells = <0>;
-+					reg = <1>;
-+				};
-+				i2c@2 {
-+					#address-cells = <1>;
-+					#size-cells = <0>;
-+					reg = <2>;
-+				};
-+				i2c@3 {
-+					#address-cells = <1>;
-+					#size-cells = <0>;
-+					reg = <3>;
-+				};
-+				i2c@4 {
-+					#address-cells = <1>;
-+					#size-cells = <0>;
-+					reg = <4>;
-+				};
-+				i2c@5 {
-+					#address-cells = <1>;
-+					#size-cells = <0>;
-+					reg = <5>;
-+				};
-+				i2c@6 {
-+					#address-cells = <1>;
-+					#size-cells = <0>;
-+					reg = <6>;
-+				};
-+				i2c@7 {
-+					#address-cells = <1>;
-+					#size-cells = <0>;
-+					reg = <7>;
-+				};
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		pca9542 = <0>, "+0";
-+		pca9545 = <0>, "+1";
-+		pca9548 = <0>, "+2";
-+
-+		addr =  <&pca9542>,"reg:0",
-+			<&pca9545>,"reg:0",
-+			<&pca9548>,"reg:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/i2c-pwm-pca9685a-overlay.dts b/arch/arm/boot/dts/overlays/i2c-pwm-pca9685a-overlay.dts
-new file mode 100644
-index 000000000000..9bb16465a50e
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/i2c-pwm-pca9685a-overlay.dts
-@@ -0,0 +1,26 @@
-+// Definitions for NXP PCA9685A I2C PWM controller on ARM I2C bus.
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2c_arm>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			pca: pca@40 {
-+				compatible = "nxp,pca9685-pwm";
-+				#pwm-cells = <2>;
-+				reg = <0x40>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+	__overrides__ {
-+		addr = <&pca>,"reg:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/i2c-rtc-common.dtsi b/arch/arm/boot/dts/overlays/i2c-rtc-common.dtsi
-new file mode 100644
-index 000000000000..94b0243bc328
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/i2c-rtc-common.dtsi
-@@ -0,0 +1,351 @@
-+// Definitions for several I2C based Real Time Clocks
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			abx80x: abx80x@69 {
-+				compatible = "abracon,abx80x";
-+				reg = <0x69>;
-+				abracon,tc-diode = "standard";
-+				abracon,tc-resistor = <0>;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			ds1307: ds1307@68 {
-+				compatible = "dallas,ds1307";
-+				reg = <0x68>;
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			ds1339: ds1339@68 {
-+				compatible = "dallas,ds1339";
-+				trickle-resistor-ohms = <0>;
-+				reg = <0x68>;
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			ds3231: ds3231@68 {
-+				compatible = "maxim,ds3231";
-+				reg = <0x68>;
-+			};
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			mcp7940x: mcp7940x@6f {
-+				compatible = "microchip,mcp7940x";
-+				reg = <0x6f>;
-+			};
-+		};
-+	};
-+
-+	fragment@5 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			mcp7941x: mcp7941x@6f {
-+				compatible = "microchip,mcp7941x";
-+				reg = <0x6f>;
-+			};
-+		};
-+	};
-+
-+	fragment@6 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			pcf2127@51 {
-+				compatible = "nxp,pcf2127";
-+				reg = <0x51>;
-+			};
-+		};
-+	};
-+
-+	fragment@7 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			pcf8523: pcf8523@68 {
-+				compatible = "nxp,pcf8523";
-+				reg = <0x68>;
-+			};
-+		};
-+	};
-+
-+	fragment@8 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			pcf8563: pcf8563@51 {
-+				compatible = "nxp,pcf8563";
-+				reg = <0x51>;
-+			};
-+		};
-+	};
-+
-+	fragment@9 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			m41t62: m41t62@68 {
-+				compatible = "st,m41t62";
-+				reg = <0x68>;
-+			};
-+		};
-+	};
-+
-+	fragment@10 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			rv3028: rv3028@52 {
-+				compatible = "microcrystal,rv3028";
-+				reg = <0x52>;
-+			};
-+		};
-+	};
-+
-+	fragment@11 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			pcf2129@51 {
-+				compatible = "nxp,pcf2129";
-+				reg = <0x51>;
-+			};
-+		};
-+	};
-+
-+	fragment@12 {
-+		target = <&i2cbus>;
-+	       __dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			pcf85363@51 {
-+				compatible = "nxp,pcf85363";
-+				reg = <0x51>;
-+			};
-+		};
-+	};
-+
-+	fragment@13 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			rv1805: rv1805@69 {
-+				compatible = "microcrystal,rv1805";
-+				reg = <0x69>;
-+				abracon,tc-diode = "standard";
-+				abracon,tc-resistor = <0>;
-+			};
-+		};
-+	};
-+
-+	fragment@14 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sd3078: sd3078@32 {
-+				compatible = "whwave,sd3078";
-+				reg = <0x32>;
-+			};
-+		};
-+	};
-+
-+	fragment@15 {
-+		target = <&i2cbus>;
-+	       __dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			pcf85063@51 {
-+				compatible = "nxp,pcf85063";
-+				reg = <0x51>;
-+			};
-+		};
-+	};
-+
-+	fragment@16 {
-+		target = <&i2cbus>;
-+	       __dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			pcf85063a@51 {
-+				compatible = "nxp,pcf85063a";
-+				reg = <0x51>;
-+			};
-+		};
-+	};
-+
-+	fragment@17 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			ds1340: ds1340@68 {
-+				compatible = "dallas,ds1340";
-+				trickle-resistor-ohms = <0>;
-+				reg = <0x68>;
-+			};
-+		};
-+	};
-+
-+	fragment@18 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			s35390a: s35390a@30 {
-+				compatible = "ablic,s35390a";
-+				reg = <0x30>;
-+			};
-+		};
-+	};
-+
-+	fragment@19 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			bq32000: bq32000@68 {
-+				compatible = "ti,bq32000";
-+				trickle-resistor-ohms = <0>;
-+				reg = <0x68>;
-+			};
-+		};
-+	};
-+
-+	fragment@20 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			rv8803: rv8803@32 {
-+				compatible = "microcrystal,rv8803";
-+				reg = <0x32>;
-+			};
-+		};
-+	};
-+
-+	fragment@21 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			rv3032: rv3032@51 {
-+				compatible = "microcrystal,rv3032";
-+				reg = <0x51>;
-+			};
-+		};
-+	};
-+
-+
-+	__overrides__ {
-+		abx80x = <0>,"+0";
-+		ds1307 = <0>,"+1";
-+		ds1339 = <0>,"+2";
-+		ds1340 = <0>,"+17";
-+		ds3231 = <0>,"+3";
-+		mcp7940x = <0>,"+4";
-+		mcp7941x = <0>,"+5";
-+		pcf2127 = <0>,"+6";
-+		pcf8523 = <0>,"+7";
-+		pcf8563 = <0>,"+8";
-+		m41t62 = <0>,"+9";
-+		rv3028 = <0>,"+10";
-+		pcf2129 = <0>,"+11";
-+		pcf85363 = <0>,"+12";
-+		rv1805 = <0>,"+13";
-+		sd3078 = <0>,"+14";
-+		pcf85063 = <0>,"+15";
-+		pcf85063a = <0>,"+16";
-+		s35390a = <0>,"+18";
-+		bq32000 = <0>,"+19";
-+		rv8803 = <0>,"+20";
-+		rv3032 = <0>,"+21";
-+
-+		addr = <&abx80x>, "reg:0",
-+		       <&ds1307>, "reg:0",
-+		       <&ds1339>, "reg:0",
-+		       <&ds3231>, "reg:0",
-+		       <&mcp7940x>, "reg:0",
-+		       <&mcp7941x>, "reg:0",
-+		       <&pcf8523>, "reg:0",
-+		       <&pcf8563>, "reg:0",
-+		       <&m41t62>, "reg:0",
-+		       <&rv1805>, "reg:0",
-+		       <&s35390a>, "reg:0";
-+		trickle-diode-disable = <&bq32000>,"trickle-diode-disable?";
-+		trickle-diode-type = <&abx80x>,"abracon,tc-diode",
-+				     <&rv1805>,"abracon,tc-diode";
-+		trickle-resistor-ohms = <&ds1339>,"trickle-resistor-ohms:0",
-+					<&ds1340>,"trickle-resistor-ohms:0",
-+					<&abx80x>,"abracon,tc-resistor:0",
-+					<&rv3028>,"trickle-resistor-ohms:0",
-+					<&rv1805>,"abracon,tc-resistor:0",
-+					<&bq32000>,"abracon,tc-resistor:0";
-+		backup-switchover-mode = <&rv3028>,"backup-switchover-mode:0";
-+		wakeup-source = <&ds1339>,"wakeup-source?",
-+				<&ds3231>,"wakeup-source?",
-+				<&mcp7940x>,"wakeup-source?",
-+				<&mcp7941x>,"wakeup-source?",
-+				<&m41t62>,"wakeup-source?";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts b/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts
-new file mode 100644
-index 000000000000..c83480c1c327
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts
-@@ -0,0 +1,31 @@
-+// Definitions for several I2C based Real Time Clocks
-+// Available through i2c-gpio
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+
-+#include "i2c-rtc-common.dtsi"
-+
-+/ {
-+	fragment@100 {
-+		target-path = "/";
-+		__overlay__ {
-+			i2cbus: i2c-gpio-rtc@0 {
-+				compatible = "i2c-gpio";
-+				gpios = <&gpio 23 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN) /* sda */
-+					 &gpio 24 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN) /* scl */
-+					>;
-+				i2c-gpio,delay-us = <2>;        /* ~100 kHz */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		i2c_gpio_sda = <&i2cbus>,"gpios:4";
-+		i2c_gpio_scl = <&i2cbus>,"gpios:16";
-+		i2c_gpio_delay_us = <&i2cbus>,"i2c-gpio,delay-us:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts b/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts
-new file mode 100644
-index 000000000000..cd31eac7e333
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts
-@@ -0,0 +1,42 @@
-+// Definitions for several I2C based Real Time Clocks
-+/dts-v1/;
-+/plugin/;
-+
-+#include "i2c-rtc-common.dtsi"
-+
-+/ {
-+	frag100: fragment@100 {
-+		target = <&i2c_arm>;
-+		i2cbus: __overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@101 {
-+		target = <&i2c0if>;
-+		__dormant__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@102 {
-+		target = <&i2c0mux>;
-+		__dormant__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		i2c0 = <&frag100>, "target:0=",<&i2c0>;
-+		i2c_csi_dsi = <&frag100>, "target:0=",<&i2c_csi_dsi>,
-+			      <0>,"+101+102";
-+		i2c3 = <&frag100>, "target?=0",
-+		       <&frag100>, "target-path=i2c3";
-+		i2c4 = <&frag100>, "target?=0",
-+		       <&frag100>, "target-path=i2c4";
-+		i2c5 = <&frag100>, "target?=0",
-+		       <&frag100>, "target-path=i2c5";
-+		i2c6 = <&frag100>, "target?=0",
-+		       <&frag100>, "target-path=i2c6";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi b/arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi
-new file mode 100755
-index 000000000000..2716898e24a4
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi
-@@ -0,0 +1,341 @@
-+// Definitions for I2C based sensors using the Industrial IO or HWMON interface.
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			bme280: bme280@76 {
-+				compatible = "bosch,bme280";
-+				reg = <0x76>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			bmp085: bmp085@77 {
-+				compatible = "bosch,bmp085";
-+				reg = <0x77>;
-+				default-oversampling = <3>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			bmp180: bmp180@77 {
-+				compatible = "bosch,bmp180";
-+				reg = <0x77>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			bmp280: bmp280@76 {
-+				compatible = "bosch,bmp280";
-+				reg = <0x76>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			htu21: htu21@40 {
-+				compatible = "htu21";
-+				reg = <0x40>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@5 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			lm75: lm75@4f {
-+				compatible = "lm75";
-+				reg = <0x4f>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@6 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			si7020: si7020@40 {
-+				compatible = "si7020";
-+				reg = <0x40>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@7 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			tmp102: tmp102@48 {
-+				compatible = "ti,tmp102";
-+				reg = <0x48>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@8 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			hdc100x: hdc100x@40 {
-+				compatible = "hdc100x";
-+				reg = <0x40>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@9 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			tsl4531: tsl4531@29 {
-+				compatible = "tsl4531";
-+				reg = <0x29>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@10 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			veml6070: veml6070@38 {
-+				compatible = "veml6070";
-+				reg = <0x38>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@11 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			sht3x: sht3x@44 {
-+				compatible = "sht3x";
-+				reg = <0x44>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@12 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			ds1621: ds1621@48 {
-+				compatible = "ds1621";
-+				reg = <0x48>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@13 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			max17040: max17040@36 {
-+				compatible = "maxim,max17040";
-+				reg = <0x36>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@14 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			bme680: bme680@76 {
-+				compatible = "bosch,bme680";
-+				reg = <0x76>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@15 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			sps30: sps30@69 {
-+				compatible = "sensirion,sps30";
-+				reg = <0x69>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@16 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			sgp30: sgp30@58 {
-+				compatible = "sensirion,sgp30";
-+				reg = <0x58>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@17 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			ccs811: ccs811@5b {
-+				compatible = "ccs811";
-+				reg = <0x5b>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@18 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			bh1750: bh1750@23 {
-+				compatible = "bh1750";
-+				reg = <0x23>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@19 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			max30102: max30102@57 {
-+				compatible = "maxim,max30102";
-+				reg = <0x57>;
-+				maxim,red-led-current-microamp = <7000>;
-+				maxim,ir-led-current-microamp  = <7000>;
-+				interrupt-parent = <&gpio>;
-+				interrupts = <4 2>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		bme280 = <0>,"+0";
-+		bmp085 = <0>,"+1";
-+		bmp180 = <0>,"+2";
-+		bmp280 = <0>,"+3";
-+		htu21 = <0>,"+4";
-+		lm75 = <0>,"+5";
-+		lm75addr = <&lm75>,"reg:0";
-+		si7020 = <0>,"+6";
-+		tmp102 = <0>,"+7";
-+		hdc100x = <0>,"+8";
-+		tsl4531 = <0>,"+9";
-+		veml6070 = <0>,"+10";
-+		sht3x = <0>,"+11";
-+		ds1621 = <0>,"+12";
-+		max17040 = <0>,"+13";
-+		bme680 = <0>,"+14";
-+		sps30 = <0>,"+15";
-+		sgp30 = <0>,"+16";
-+		ccs811 = <0>, "+17";
-+		bh1750 = <0>, "+18";
-+		max30102 = <0>,"+19";
-+
-+		addr =  <&bme280>,"reg:0", <&bmp280>,"reg:0", <&tmp102>,"reg:0",
-+			<&lm75>,"reg:0", <&hdc100x>,"reg:0", <&sht3x>,"reg:0",
-+			<&ds1621>,"reg:0", <&bme680>,"reg:0", <&ccs811>,"reg:0",
-+			<&bh1750>,"reg:0";
-+		int_pin = <&max30102>, "interrupts:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts b/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts
-new file mode 100755
-index 000000000000..f8a39659d83e
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts
-@@ -0,0 +1,42 @@
-+// Definitions for I2C based sensors using the Industrial IO or HWMON interface.
-+/dts-v1/;
-+/plugin/;
-+
-+#include "i2c-sensor-common.dtsi"
-+
-+/ {
-+	frag100: fragment@100 {
-+		target = <&i2c_arm>;
-+		i2cbus: __overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@101 {
-+		target = <&i2c0if>;
-+		__dormant__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@102 {
-+		target = <&i2c0mux>;
-+		__dormant__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		i2c0 = <&frag100>, "target:0=",<&i2c0>;
-+		i2c_csi_dsi = <&frag100>, "target:0=",<&i2c_csi_dsi>,
-+			      <0>,"+101+102";
-+		i2c3 = <&frag100>, "target?=0",
-+		       <&frag100>, "target-path=i2c3";
-+		i2c4 = <&frag100>, "target?=0",
-+		       <&frag100>, "target-path=i2c4";
-+		i2c5 = <&frag100>, "target?=0",
-+		       <&frag100>, "target-path=i2c5";
-+		i2c6 = <&frag100>, "target?=0",
-+		       <&frag100>, "target-path=i2c6";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/i2c0-overlay.dts b/arch/arm/boot/dts/overlays/i2c0-overlay.dts
-new file mode 100644
-index 000000000000..46bf1bf2dc5c
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/i2c0-overlay.dts
-@@ -0,0 +1,83 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2c0if>;
-+		__overlay__ {
-+			status = "okay";
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&i2c0_pins>;
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c0_pins>;
-+		pins1: __overlay__ {
-+			brcm,pins = <0 1>;
-+			brcm,function = <4>; /* alt0 */
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c0_pins>;
-+		pins2: __dormant__ {
-+			brcm,pins = <28 29>;
-+			brcm,function = <4>; /* alt0 */
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&i2c0_pins>;
-+		pins3: __dormant__ {
-+			brcm,pins = <44 45>;
-+			brcm,function = <5>; /* alt1 */
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&i2c0_pins>;
-+		pins4: __dormant__ {
-+			brcm,pins = <46 47>;
-+			brcm,function = <4>; /* alt0 */
-+		};
-+	};
-+
-+	fragment@5 {
-+		target = <&i2c0>;
-+		__dormant__ {
-+			compatible = "brcm,bcm2708-i2c";
-+		};
-+	};
-+
-+	fragment@6 {
-+		target = <&i2c0mux>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@7 {
-+		target-path = "/aliases";
-+		__overlay__ {
-+			i2c0 = "/soc/i2c@7e205000";
-+		};
-+	};
-+
-+	fragment@8 {
-+		target-path = "/__symbols__";
-+		__overlay__ {
-+			i2c0 = "/soc/i2c@7e205000";
-+		};
-+	};
-+
-+	__overrides__ {
-+		pins_0_1   = <0>,"+1-2-3-4";
-+		pins_28_29 = <0>,"-1+2-3-4";
-+		pins_44_45 = <0>,"-1-2+3-4";
-+		pins_46_47 = <0>,"-1-2-3+4";
-+		combine = <0>, "!5";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/i2c1-overlay.dts b/arch/arm/boot/dts/overlays/i2c1-overlay.dts
-new file mode 100644
-index 000000000000..addaed73e665
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/i2c1-overlay.dts
-@@ -0,0 +1,44 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			status = "okay";
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&i2c1_pins>;
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c1_pins>;
-+		pins1: __overlay__ {
-+			brcm,pins = <2 3>;
-+			brcm,function = <4>; /* alt 0 */
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c1_pins>;
-+		pins2: __dormant__ {
-+			brcm,pins = <44 45>;
-+			brcm,function = <6>; /* alt 2 */
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			compatible = "brcm,bcm2708-i2c";
-+		};
-+	};
-+
-+	__overrides__ {
-+		pins_2_3   = <0>,"=1!2";
-+		pins_44_45 = <0>,"!1=2";
-+		combine = <0>, "!3";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/i2c3-overlay.dts b/arch/arm/boot/dts/overlays/i2c3-overlay.dts
-new file mode 100644
-index 000000000000..e24a1df21f99
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/i2c3-overlay.dts
-@@ -0,0 +1,36 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2711";
-+
-+	fragment@0 {
-+		target = <&i2c3>;
-+		frag0: __overlay__ {
-+			status = "okay";
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&i2c3_pins>;
-+			clock-frequency = <100000>;
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c3_pins>;
-+		__dormant__ {
-+			brcm,pins = <2 3>;
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c3_pins>;
-+		__overlay__ {
-+			brcm,pins = <4 5>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		pins_2_3 = <0>,"=1!2";
-+		pins_4_5 = <0>,"!1=2";
-+		baudrate = <&frag0>, "clock-frequency:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/i2c4-overlay.dts b/arch/arm/boot/dts/overlays/i2c4-overlay.dts
-new file mode 100644
-index 000000000000..14c7f4d1da4c
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/i2c4-overlay.dts
-@@ -0,0 +1,36 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2711";
-+
-+	fragment@0 {
-+		target = <&i2c4>;
-+		frag0: __overlay__ {
-+			status = "okay";
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&i2c4_pins>;
-+			clock-frequency = <100000>;
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c4_pins>;
-+		__dormant__ {
-+			brcm,pins = <6 7>;
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c4_pins>;
-+		__overlay__ {
-+			brcm,pins = <8 9>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		pins_6_7 = <0>,"=1!2";
-+		pins_8_9 = <0>,"!1=2";
-+		baudrate = <&frag0>, "clock-frequency:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/i2c5-overlay.dts b/arch/arm/boot/dts/overlays/i2c5-overlay.dts
-new file mode 100644
-index 000000000000..7953621112de
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/i2c5-overlay.dts
-@@ -0,0 +1,36 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2711";
-+
-+	fragment@0 {
-+		target = <&i2c5>;
-+		frag0: __overlay__ {
-+			status = "okay";
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&i2c5_pins>;
-+			clock-frequency = <100000>;
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c5_pins>;
-+		__dormant__ {
-+			brcm,pins = <10 11>;
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c5_pins>;
-+		__overlay__ {
-+			brcm,pins = <12 13>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		pins_10_11 = <0>,"=1!2";
-+		pins_12_13 = <0>,"!1=2";
-+		baudrate = <&frag0>, "clock-frequency:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/i2c6-overlay.dts b/arch/arm/boot/dts/overlays/i2c6-overlay.dts
-new file mode 100644
-index 000000000000..555305a7ee1f
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/i2c6-overlay.dts
-@@ -0,0 +1,36 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2711";
-+
-+	fragment@0 {
-+		target = <&i2c6>;
-+		frag0: __overlay__ {
-+			status = "okay";
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&i2c6_pins>;
-+			clock-frequency = <100000>;
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c6_pins>;
-+		__dormant__ {
-+			brcm,pins = <0 1>;
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c6_pins>;
-+		__overlay__ {
-+			brcm,pins = <22 23>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		pins_0_1 = <0>,"=1!2";
-+		pins_22_23 = <0>,"!1=2";
-+		baudrate = <&frag0>, "clock-frequency:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/i2s-dac-overlay.dts b/arch/arm/boot/dts/overlays/i2s-dac-overlay.dts
-new file mode 100644
-index 000000000000..07a915342702
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/i2s-dac-overlay.dts
-@@ -0,0 +1,34 @@
-+// Definitions for RPi DAC
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target-path = "/";
-+		__overlay__ {
-+			pcm1794a-codec {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,pcm1794a";
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "rpi,rpi-dac";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/i2s-gpio28-31-overlay.dts b/arch/arm/boot/dts/overlays/i2s-gpio28-31-overlay.dts
-new file mode 100644
-index 000000000000..cf43094c6ff4
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/i2s-gpio28-31-overlay.dts
-@@ -0,0 +1,18 @@
-+/*
-+ * Device tree overlay to move i2s to gpio 28 to 31 on CM
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s_pins>;
-+		__overlay__ {
-+			brcm,pins = <28 29 30 31>;
-+			brcm,function = <6>; /* alt2 */
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/ilitek251x-overlay.dts b/arch/arm/boot/dts/overlays/ilitek251x-overlay.dts
-new file mode 100644
-index 000000000000..551aba591d26
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/ilitek251x-overlay.dts
-@@ -0,0 +1,45 @@
-+// Device tree overlay for I2C connected Ilitek multiple touch controller
-+/dts-v1/;
-+/plugin/;
-+
-+ / {
-+	compatible = "brcm,bcm2835";
-+
-+ 	fragment@0 {
-+		target = <&gpio>;
-+		__overlay__ {		
-+			ili251x_pins: ili251x_pins {
-+				brcm,pins = <4>; // interrupt
-+				brcm,function = <0>; // in
-+				brcm,pull = <2>; // pull-up //
-+			};
-+		};
-+	};
-+
-+ 	fragment@1 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+ 			ili251x: ili251x@41 {
-+				compatible = "ilitek,ili251x";
-+				reg = <0x41>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&ili251x_pins>;
-+				interrupt-parent = <&gpio>;
-+				interrupts = <4 8>; // high-to-low edge triggered
-+				touchscreen-size-x = <16384>;
-+				touchscreen-size-y = <9600>;
-+			};
-+		};
-+	};
-+
-+ 	__overrides__ {
-+		interrupt = <&ili251x_pins>,"brcm,pins:0",
-+			<&ili251x>,"interrupts:0";
-+		sizex = <&ili251x>,"touchscreen-size-x:0";
-+		sizey = <&ili251x>,"touchscreen-size-y:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/imx219-overlay.dts b/arch/arm/boot/dts/overlays/imx219-overlay.dts
-new file mode 100644
-index 000000000000..aa97450ac994
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/imx219-overlay.dts
-@@ -0,0 +1,89 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+// Definitions for IMX219 camera module on VC I2C bus
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2c0if>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	clk_frag: fragment@1 {
-+		target = <&cam1_clk>;
-+		__overlay__ {
-+			status = "okay";
-+			clock-frequency = <24000000>;
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c0mux>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	i2c_frag: fragment@100 {
-+		target = <&i2c_csi_dsi>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			#include "imx219.dtsi"
-+
-+			vcm: ad5398@c {
-+				compatible = "adi,ad5398";
-+				reg = <0x0c>;
-+				status = "disabled";
-+				VANA-supply = <&cam1_reg>;
-+			};
-+		};
-+	};
-+
-+	csi_frag: fragment@101 {
-+		target = <&csi1>;
-+		csi: __overlay__ {
-+			status = "okay";
-+			brcm,media-controller;
-+
-+			port {
-+				csi_ep: endpoint {
-+					remote-endpoint = <&cam_endpoint>;
-+					clock-lanes = <0>;
-+					data-lanes = <1 2>;
-+					clock-noncontinuous;
-+				};
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		rotation = <&cam_node>,"rotation:0";
-+		orientation = <&cam_node>,"orientation:0";
-+		media-controller = <&csi>,"brcm,media-controller?";
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
-+		       <&csi_frag>, "target:0=",<&csi0>,
-+		       <&clk_frag>, "target:0=",<&cam0_clk>,
-+		       <&cam_node>, "clocks:0=",<&cam0_clk>,
-+		       <&cam_node>, "VANA-supply:0=",<&cam0_reg>,
-+		       <&vcm>, "VANA-supply:0=", <&cam0_reg>;
-+		vcm = <&vcm>, "status=okay",
-+		      <&cam_node>,"lens-focus:0=", <&vcm>;
-+	};
-+};
-+
-+&cam_node {
-+	status = "okay";
-+};
-+
-+&cam_endpoint {
-+	remote-endpoint = <&csi_ep>;
-+};
-diff --git a/arch/arm/boot/dts/overlays/imx219.dtsi b/arch/arm/boot/dts/overlays/imx219.dtsi
-new file mode 100644
-index 000000000000..fa870f77ef07
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/imx219.dtsi
-@@ -0,0 +1,27 @@
-+// Fragment that configures an imx219
-+
-+cam_node: imx219@10 {
-+	compatible = "sony,imx219";
-+	reg = <0x10>;
-+	status = "disabled";
-+
-+	clocks = <&cam1_clk>;
-+	clock-names = "xclk";
-+
-+	VANA-supply = <&cam1_reg>;	/* 2.8v */
-+	VDIG-supply = <&cam_dummy_reg>;	/* 1.8v */
-+	VDDL-supply = <&cam_dummy_reg>;	/* 1.2v */
-+
-+	rotation = <180>;
-+	orientation = <2>;
-+
-+	port {
-+		cam_endpoint: endpoint {
-+			clock-lanes = <0>;
-+			data-lanes = <1 2>;
-+			clock-noncontinuous;
-+			link-frequencies =
-+				/bits/ 64 <456000000>;
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/imx258-overlay.dts b/arch/arm/boot/dts/overlays/imx258-overlay.dts
-new file mode 100644
-index 000000000000..7117682ab095
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/imx258-overlay.dts
-@@ -0,0 +1,131 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+// Definitions for IMX258 camera module on VC I2C bus
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2c0if>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	clk_frag: fragment@1 {
-+		target = <&cam1_clk>;
-+		cam_clk: __overlay__ {
-+			clock-frequency = <24000000>;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c0mux>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@11 {
-+		target = <&cam_endpoint>;
-+		__overlay__ {
-+			data-lanes = <1 2>;
-+			link-frequencies = /bits/ 64 <633600000
-+						      320000000>;
-+		};
-+	};
-+
-+	fragment@12 {
-+		target = <&cam_endpoint>;
-+		__dormant__ {
-+			data-lanes = <1 2 3 4>;
-+			link-frequencies =
-+				/bits/ 64 <633600000 320000000>;
-+		};
-+	};
-+
-+	fragment@13 {
-+		target = <&csi_ep>;
-+		__overlay__ {
-+			data-lanes = <1 2>;
-+		};
-+	};
-+
-+	fragment@14 {
-+		target = <&csi_ep>;
-+		__dormant__ {
-+			data-lanes = <1 2 3 4>;
-+		};
-+	};
-+
-+	csi_frag: fragment@101 {
-+		target = <&csi1>;
-+		csi: __overlay__ {
-+			status = "okay";
-+			brcm,media-controller;
-+
-+			port {
-+				csi_ep: endpoint {
-+					remote-endpoint = <&cam_endpoint>;
-+					clock-lanes = <0>;
-+					clock-noncontinuous;
-+				};
-+			};
-+		};
-+	};
-+
-+	reg_frag: fragment@5 {
-+		target = <&cam1_reg>;
-+		cam_reg: __overlay__ {
-+			regulator-name = "imx258_vana";
-+			startup-delay-us = <300000>;
-+			regulator-min-microvolt = <2700000>;
-+			regulator-max-microvolt = <2700000>;
-+		};
-+	};
-+
-+	i2c_frag: fragment@100 {
-+		target = <&i2c_csi_dsi>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			#include "imx258.dtsi"
-+
-+			vcm: ad5398@c {
-+				compatible = "adi,ad5398";
-+				reg = <0x0c>;
-+				status = "disabled";
-+				VANA-supply = <&cam1_reg>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		rotation = <&cam_node>,"rotation:0";
-+		orientation = <&cam_node>,"orientation:0";
-+		media-controller = <&csi>,"brcm,media-controller?";
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
-+		       <&csi_frag>, "target:0=",<&csi0>,
-+		       <&clk_frag>, "target:0=",<&cam0_clk>,
-+		       <&reg_frag>, "target:0=",<&cam0_reg>,
-+		       <&cam_node>, "clocks:0=",<&cam0_clk>,
-+		       <&cam_node>, "vana-supply:0=",<&cam0_reg>;
-+		vcm = <&vcm>, "status=okay",
-+		      <&cam_node>,"lens-focus:0=", <&vcm>;
-+		4lane = <0>, "-11+12-13+14";
-+	};
-+};
-+
-+&cam_node {
-+	status = "okay";
-+};
-+
-+&cam_endpoint {
-+	remote-endpoint = <&csi_ep>;
-+};
-diff --git a/arch/arm/boot/dts/overlays/imx258.dtsi b/arch/arm/boot/dts/overlays/imx258.dtsi
-new file mode 100644
-index 000000000000..cca81e1aa8b3
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/imx258.dtsi
-@@ -0,0 +1,27 @@
-+// Fragment that configures a Sony IMX258
-+
-+cam_node: imx258@10 {
-+	compatible = "sony,imx258";
-+	reg = <0x10>;
-+	status = "disabled";
-+
-+	clocks = <&cam1_clk>;
-+	clock-names = "xclk";
-+
-+	vana-supply = <&cam1_reg>;	/* 2.8v */
-+	vdig-supply = <&cam_dummy_reg>;	/* 1.05v */
-+	vif-supply = <&cam_dummy_reg>;	/* 1.8v */
-+
-+	rotation = <180>;
-+	orientation = <2>;
-+
-+	port {
-+		cam_endpoint: endpoint {
-+			clock-lanes = <0>;
-+			clock-noncontinuous;
-+			link-frequencies =
-+				/bits/ 64 <633600000
-+					320000000>;
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/imx290-overlay.dts b/arch/arm/boot/dts/overlays/imx290-overlay.dts
-new file mode 100644
-index 000000000000..2e70e17ed29b
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/imx290-overlay.dts
-@@ -0,0 +1,32 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+// Definitions for IMX290 camera module on VC I2C bus
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+#include "imx290_327-overlay.dtsi"
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	// Fragment numbers deliberately high to avoid conflicts with the
-+	// included imx290_327 overlay file.
-+
-+	fragment@101 {
-+		target = <&cam_node>;
-+		__overlay__ {
-+			compatible = "sony,imx290";
-+		};
-+	};
-+
-+	fragment@102 {
-+		target = <&cam_node>;
-+		__dormant__ {
-+			compatible = "sony,imx290-mono";
-+		};
-+	};
-+
-+	__overrides__ {
-+		mono = <0>, "-101+102";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi b/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi
-new file mode 100644
-index 000000000000..d8141de672e2
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi
-@@ -0,0 +1,112 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+// Partial definitions for IMX290 or IMX327 camera module on VC I2C bus
-+// The compatible string should be set in an overlay that then includes this one
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	i2c_frag: fragment@0 {
-+		target = <&i2c_csi_dsi>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			#include "imx290_327.dtsi"
-+		};
-+	};
-+
-+	csi_frag: fragment@1 {
-+		target = <&csi1>;
-+		csi: __overlay__ {
-+			status = "okay";
-+			brcm,media-controller;
-+
-+			port {
-+				csi_ep: endpoint {
-+					remote-endpoint = <&cam_endpoint>;
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c0if>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	clk_frag: fragment@3 {
-+		target = <&cam1_clk>;
-+		cam_clk: __overlay__ {
-+			status = "okay";
-+			clock-frequency = <37125000>;
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&i2c0mux>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@6 {
-+		target = <&cam_endpoint>;
-+		__overlay__ {
-+			data-lanes = <1 2>;
-+			link-frequencies =
-+				/bits/ 64 <445500000 297000000>;
-+		};
-+	};
-+
-+	fragment@7 {
-+		target = <&cam_endpoint>;
-+		__dormant__ {
-+			data-lanes = <1 2 3 4>;
-+			link-frequencies =
-+				/bits/ 64 <222750000 148500000>;
-+		};
-+	};
-+
-+	fragment@8 {
-+		target = <&csi_ep>;
-+		__overlay__ {
-+			data-lanes = <1 2>;
-+		};
-+	};
-+
-+	fragment@9 {
-+		target = <&csi_ep>;
-+		__dormant__ {
-+			data-lanes = <1 2 3 4>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		4lane = <0>, "-6+7-8+9";
-+		clock-frequency = <&cam_clk>,"clock-frequency:0",
-+				  <&cam_node>,"clock-frequency:0";
-+		rotation = <&cam_node>,"rotation:0";
-+		orientation = <&cam_node>,"orientation:0";
-+		media-controller = <&csi>,"brcm,media-controller?";
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
-+		       <&csi_frag>, "target:0=",<&csi0>,
-+		       <&clk_frag>, "target:0=",<&cam0_clk>,
-+		       <&cam_node>, "clocks:0=",<&cam0_clk>,
-+		       <&cam_node>, "vdda-supply:0=",<&cam0_reg>;
-+	};
-+};
-+
-+&cam_node {
-+	status = "okay";
-+};
-+
-+&cam_endpoint {
-+	remote-endpoint = <&csi_ep>;
-+};
-diff --git a/arch/arm/boot/dts/overlays/imx290_327.dtsi b/arch/arm/boot/dts/overlays/imx290_327.dtsi
-new file mode 100644
-index 000000000000..9afe7e9f470c
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/imx290_327.dtsi
-@@ -0,0 +1,24 @@
-+// Fragment to configure and IMX290 / IMX327 / IMX462 image sensor
-+
-+cam_node: imx290@1a {
-+	compatible = "sony,imx290";
-+	reg = <0x1a>;
-+	status = "disabled";
-+
-+	clocks = <&cam1_clk>;
-+	clock-names = "xclk";
-+	clock-frequency = <37125000>;
-+
-+	rotation = <0>;
-+	orientation = <2>;
-+
-+	vdda-supply = <&cam1_reg>;	/* 2.8v */
-+	vdddo-supply = <&cam_dummy_reg>;	/* 1.8v */
-+	vddd-supply = <&cam_dummy_reg>;	/* 1.5v */
-+
-+	port {
-+		cam_endpoint: endpoint {
-+			clock-lanes = <0>;
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/imx296-overlay.dts b/arch/arm/boot/dts/overlays/imx296-overlay.dts
-new file mode 100644
-index 000000000000..85b6f7e7fca1
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/imx296-overlay.dts
-@@ -0,0 +1,103 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+// Definitions for IMX296 camera module on VC I2C bus
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2c0if>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	clk_frag: fragment@1 {
-+		target = <&cam1_clk>;
-+		__overlay__ {
-+			status = "okay";
-+			clock-frequency = <37125000>;
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c0mux>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	reg_frag: fragment@5 {
-+		target = <&cam1_reg>;
-+		cam_reg: __overlay__ {
-+			startup-delay-us = <500000>;
-+		};
-+	};
-+
-+	i2c_frag: fragment@100 {
-+		target = <&i2c_csi_dsi>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			imx296: imx296@1a {
-+				compatible = "sony,imx296";
-+				reg = <0x1a>;
-+				status = "okay";
-+
-+				clocks = <&cam1_clk>;
-+				clock-names = "inck";
-+
-+				avdd-supply = <&cam1_reg>;	/* 3.3v */
-+				dvdd-supply = <&cam_dummy_reg>;	/* 1.8v */
-+				ovdd-supply = <&cam_dummy_reg>;	/* 1.2v */
-+
-+				rotation = <180>;
-+				orientation = <2>;
-+
-+				port {
-+					imx296_0: endpoint {
-+						remote-endpoint = <&csi_ep>;
-+						clock-lanes = <0>;
-+						data-lanes = <1>;
-+						clock-noncontinuous;
-+						link-frequencies =
-+							/bits/ 64 <594000000>;
-+					};
-+				};
-+			};
-+		};
-+	};
-+
-+	csi_frag: fragment@101 {
-+		target = <&csi1>;
-+		csi: __overlay__ {
-+			status = "okay";
-+			brcm,media-controller;
-+
-+			port {
-+				csi_ep: endpoint {
-+					remote-endpoint = <&imx296_0>;
-+					clock-lanes = <0>;
-+					data-lanes = <1>;
-+					clock-noncontinuous;
-+				};
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		rotation = <&imx296>,"rotation:0";
-+		orientation = <&imx296>,"orientation:0";
-+		media-controller = <&csi>,"brcm,media-controller?";
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
-+		       <&csi_frag>, "target:0=",<&csi0>,
-+		       <&clk_frag>, "target:0=",<&cam0_clk>,
-+		       <&imx296>, "clocks:0=",<&cam0_clk>,
-+		       <&imx296>, "VANA-supply:0=",<&cam0_reg>;
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/imx327-overlay.dts b/arch/arm/boot/dts/overlays/imx327-overlay.dts
-new file mode 100644
-index 000000000000..d01a67c5df09
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/imx327-overlay.dts
-@@ -0,0 +1,32 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+// Definitions for IMX327 camera module on VC I2C bus
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+#include "imx290_327-overlay.dtsi"
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	// Fragment numbers deliberately high to avoid conflicts with the
-+	// included imx290_327 overlay file.
-+
-+	fragment@101 {
-+		target = <&cam_node>;
-+		__overlay__ {
-+			compatible = "sony,imx327";
-+		};
-+	};
-+
-+	fragment@102 {
-+		target = <&cam_node>;
-+		__dormant__ {
-+			compatible = "sony,imx327-mono";
-+		};
-+	};
-+
-+	__overrides__ {
-+		mono = <0>, "-101+102";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/imx378-overlay.dts b/arch/arm/boot/dts/overlays/imx378-overlay.dts
-new file mode 100644
-index 000000000000..6a999914056a
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/imx378-overlay.dts
-@@ -0,0 +1,10 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+// Definitions for IMX378 camera module on VC I2C bus
-+/dts-v1/;
-+/plugin/;
-+
-+#include "imx477_378-overlay.dtsi"
-+
-+&cam_node {
-+	compatible = "sony,imx378";
-+};
-diff --git a/arch/arm/boot/dts/overlays/imx462-overlay.dts b/arch/arm/boot/dts/overlays/imx462-overlay.dts
-new file mode 100644
-index 000000000000..e2b54a7a9f98
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/imx462-overlay.dts
-@@ -0,0 +1,32 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+// Definitions for IMX462 camera module on VC I2C bus
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+#include "imx290_327-overlay.dtsi"
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	// Fragment numbers deliberately high to avoid conflicts with the
-+	// included imx290_327 overlay file.
-+
-+	fragment@101 {
-+		target = <&cam_node>;
-+		__overlay__ {
-+			compatible = "sony,imx462";
-+		};
-+	};
-+
-+	fragment@102 {
-+		target = <&cam_node>;
-+		__dormant__ {
-+			compatible = "sony,imx462-mono";
-+		};
-+	};
-+
-+	__overrides__ {
-+		mono = <0>, "-101+102";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/imx477-overlay.dts b/arch/arm/boot/dts/overlays/imx477-overlay.dts
-new file mode 100644
-index 000000000000..f6482a990cfc
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/imx477-overlay.dts
-@@ -0,0 +1,10 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+// Definitions for IMX477 camera module on VC I2C bus
-+/dts-v1/;
-+/plugin/;
-+
-+#include "imx477_378-overlay.dtsi"
-+
-+&cam_node {
-+	compatible = "sony,imx477";
-+};
-diff --git a/arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi b/arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi
-new file mode 100644
-index 000000000000..7afc0a248569
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi
-@@ -0,0 +1,83 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+// Definitions for IMX477 camera module on VC I2C bus
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2c0if>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	clk_frag: fragment@1 {
-+		target = <&cam1_clk>;
-+		cam_clk: __overlay__ {
-+			clock-frequency = <24000000>;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c0mux>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	reg_frag: fragment@3 {
-+		target = <&cam1_reg>;
-+		cam_reg: __overlay__ {
-+			startup-delay-us = <300000>;
-+		};
-+	};
-+
-+	i2c_frag: fragment@100 {
-+		target = <&i2c_csi_dsi>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			#include "imx477_378.dtsi"
-+		};
-+	};
-+
-+	csi_frag: fragment@101 {
-+		target = <&csi1>;
-+		csi: __overlay__ {
-+			status = "okay";
-+			brcm,media-controller;
-+
-+			port {
-+				csi_ep: endpoint {
-+					remote-endpoint = <&cam_endpoint>;
-+					clock-lanes = <0>;
-+					data-lanes = <1 2>;
-+					clock-noncontinuous;
-+				};
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		rotation = <&cam_node>,"rotation:0";
-+		orientation = <&cam_node>,"orientation:0";
-+		media-controller = <&csi>,"brcm,media-controller?";
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
-+		       <&csi_frag>, "target:0=",<&csi0>,
-+		       <&clk_frag>, "target:0=",<&cam0_clk>,
-+		       <&reg_frag>, "target:0=",<&cam0_reg>,
-+		       <&cam_node>, "clocks:0=",<&cam0_clk>,
-+		       <&cam_node>, "VANA-supply:0=",<&cam0_reg>;
-+	};
-+};
-+
-+&cam_node {
-+	status = "okay";
-+};
-+
-+&cam_endpoint {
-+	remote-endpoint = <&csi_ep>;
-+};
-diff --git a/arch/arm/boot/dts/overlays/imx477_378.dtsi b/arch/arm/boot/dts/overlays/imx477_378.dtsi
-new file mode 100644
-index 000000000000..a0c154c2a11f
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/imx477_378.dtsi
-@@ -0,0 +1,24 @@
-+cam_node: imx477@1a {
-+	reg = <0x1a>;
-+	status = "disabled";
-+
-+	clocks = <&cam1_clk>;
-+	clock-names = "xclk";
-+
-+	VANA-supply = <&cam1_reg>;	/* 2.8v */
-+	VDIG-supply = <&cam_dummy_reg>;	/* 1.05v */
-+	VDDL-supply = <&cam_dummy_reg>;	/* 1.8v */
-+
-+	rotation = <180>;
-+	orientation = <2>;
-+
-+	port {
-+		cam_endpoint: endpoint {
-+			clock-lanes = <0>;
-+			data-lanes = <1 2>;
-+			clock-noncontinuous;
-+			link-frequencies =
-+				/bits/ 64 <450000000>;
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/imx519-overlay.dts b/arch/arm/boot/dts/overlays/imx519-overlay.dts
-new file mode 100644
-index 000000000000..ada1224dd19b
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/imx519-overlay.dts
-@@ -0,0 +1,96 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+// Definitions for imx519 camera module on VC I2C bus
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	i2c_frag: fragment@0 {
-+		target = <&i2c_csi_dsi>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			imx519: imx519@1a {
-+				compatible = "sony,imx519";
-+				reg = <0x1a>;
-+				status = "okay";
-+
-+				clocks = <&cam1_clk>;
-+				clock-names = "xclk";
-+
-+				VANA-supply = <&cam1_reg>;	/* 2.8v */
-+				VDIG-supply = <&cam_dummy_reg>;	/* 1.8v */
-+				VDDL-supply = <&cam_dummy_reg>;	/* 1.2v */
-+
-+				rotation = <0>;
-+				orientation = <2>;
-+
-+				port {
-+					imx519_0: endpoint {
-+						remote-endpoint = <&csi1_ep>;
-+						clock-lanes = <0>;
-+						data-lanes = <1 2>;
-+						clock-noncontinuous;
-+						link-frequencies =
-+							/bits/ 64 <493500000>;
-+					};
-+				};
-+			};
-+		};
-+	};
-+
-+	csi_frag: fragment@1 {
-+		target = <&csi1>;
-+		csi: __overlay__ {
-+			status = "okay";
-+			brcm,media-controller;
-+
-+			port{
-+				csi1_ep: endpoint{
-+					remote-endpoint = <&imx519_0>;
-+					clock-lanes = <0>;
-+					data-lanes = <1 2>;
-+					clock-noncontinuous;
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c0if>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	clk_frag: fragment@3 {
-+		target = <&cam1_clk>;
-+		__overlay__ {
-+			clock-frequency = <24000000>;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&i2c0mux>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		rotation = <&imx519>,"rotation:0";
-+		orientation = <&imx519>,"orientation:0";
-+		media-controller = <&csi>,"brcm,media-controller?";
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
-+		       <&csi_frag>, "target:0=",<&csi0>,
-+		       <&clk_frag>, "target:0=",<&cam0_clk>,
-+		       <&imx519>, "clocks:0=",<&cam0_clk>,
-+		       <&imx519>, "VANA-supply:0=",<&cam0_reg>;
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/iqaudio-codec-overlay.dts b/arch/arm/boot/dts/overlays/iqaudio-codec-overlay.dts
-new file mode 100644
-index 000000000000..9110f5d34298
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/iqaudio-codec-overlay.dts
-@@ -0,0 +1,42 @@
-+// Definitions for IQaudIO CODEC
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			da2713@1a {
-+				#sound-dai-cells = <0>;
-+				compatible = "dlg,da7213";
-+				reg = <0x1a>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		iqaudio_dac: __overlay__ {
-+			compatible = "iqaudio,iqaudio-codec";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts b/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts
-new file mode 100644
-index 000000000000..24073cadd0ef
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts
-@@ -0,0 +1,46 @@
-+// Definitions for IQaudIO DAC
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			pcm5122@4c {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,pcm5122";
-+				reg = <0x4c>;
-+				AVDD-supply = <&vdd_3v3_reg>;
-+				DVDD-supply = <&vdd_3v3_reg>;
-+				CPVDD-supply = <&vdd_3v3_reg>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		frag2: __overlay__ {
-+			compatible = "iqaudio,iqaudio-dac";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		24db_digital_gain = <&frag2>,"iqaudio,24db_digital_gain?";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts b/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts
-new file mode 100644
-index 000000000000..7c70b25e58d7
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts
-@@ -0,0 +1,49 @@
-+// Definitions for IQaudIO DAC+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			pcm5122@4c {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,pcm5122";
-+				reg = <0x4c>;
-+				AVDD-supply = <&vdd_3v3_reg>;
-+				DVDD-supply = <&vdd_3v3_reg>;
-+				CPVDD-supply = <&vdd_3v3_reg>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		iqaudio_dac: __overlay__ {
-+			compatible = "iqaudio,iqaudio-dac";
-+			i2s-controller = <&i2s>;
-+			mute-gpios = <&gpio 22 0>;
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		24db_digital_gain = <&iqaudio_dac>,"iqaudio,24db_digital_gain?";
-+		auto_mute_amp = <&iqaudio_dac>,"iqaudio-dac,auto-mute-amp?";
-+		unmute_amp = <&iqaudio_dac>,"iqaudio-dac,unmute-amp?";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/iqaudio-digi-wm8804-audio-overlay.dts b/arch/arm/boot/dts/overlays/iqaudio-digi-wm8804-audio-overlay.dts
-new file mode 100644
-index 000000000000..ee54095c869b
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/iqaudio-digi-wm8804-audio-overlay.dts
-@@ -0,0 +1,47 @@
-+// Definitions for IQAudIO Digi WM8804 audio board
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			wm8804@3b {
-+				#sound-dai-cells = <0>;
-+				compatible = "wlf,wm8804";
-+				reg = <0x3b>;
-+				status = "okay";
-+				DVDD-supply = <&vdd_3v3_reg>;
-+				PVDD-supply = <&vdd_3v3_reg>;
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		wm8804_digi: __overlay__ {
-+			compatible = "iqaudio,wm8804-digi";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		card_name = <&wm8804_digi>,"wm8804-digi,card-name";
-+		dai_name = <&wm8804_digi>,"wm8804-digi,dai-name";
-+		dai_stream_name = <&wm8804_digi>,"wm8804-digi,dai-stream-name";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/iqs550-overlay.dts b/arch/arm/boot/dts/overlays/iqs550-overlay.dts
-new file mode 100644
-index 000000000000..c3956937055f
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/iqs550-overlay.dts
-@@ -0,0 +1,59 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later
-+// Definitions for Azoteq IQS550 trackpad/touchscreen controller
-+/dts-v1/;
-+/plugin/;
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/interrupt-controller/irq.h>
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			iqs550: iqs550@74 {
-+				compatible = "azoteq,iqs550";
-+				reg = <0x74>;
-+				interrupt-parent = <&gpio>;
-+				interrupts = <4 IRQ_TYPE_LEVEL_HIGH>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&iqs550_pins>;
-+				touchscreen-size-x = <800>;
-+				touchscreen-size-y = <480>;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&iqs550>;
-+		iqs550_reset: __dormant__ {
-+			reset-gpios = <&gpio 255 (GPIO_ACTIVE_LOW |
-+						  GPIO_PUSH_PULL)>;
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			iqs550_pins: iqs550_pins {
-+				brcm,pins = <4>;
-+				brcm,pull = <1>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		interrupt = <&iqs550>,"interrupts:0",
-+			    <&iqs550_pins>,"brcm,pins:0";
-+		reset = <0>,"+1", <&iqs550_reset>,"reset-gpios:4";
-+		sizex = <&iqs550>,"touchscreen-size-x:0";
-+		sizey = <&iqs550>,"touchscreen-size-y:0";
-+		invx = <&iqs550>,"touchscreen-inverted-x?";
-+		invy = <&iqs550>,"touchscreen-inverted-y?";
-+		swapxy = <&iqs550>,"touchscreen-swapped-x-y?";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/irs1125-overlay.dts b/arch/arm/boot/dts/overlays/irs1125-overlay.dts
-new file mode 100644
-index 000000000000..8f8432c07a89
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/irs1125-overlay.dts
-@@ -0,0 +1,90 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+// Definitions for IRS1125 camera module on VC I2C bus
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	i2c_frag: fragment@0 {
-+		target = <&i2c_csi_dsi>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			irs1125: irs1125@3d {
-+				compatible = "infineon,irs1125";
-+				reg = <0x3d>;
-+				status = "okay";
-+
-+				pwdn-gpios = <&gpio 5 0>;
-+				clocks = <&cam1_clk>;
-+
-+				port {
-+					irs1125_0: endpoint {
-+						remote-endpoint = <&csi1_ep>;
-+						clock-lanes = <0>;
-+						data-lanes = <1 2>;
-+						clock-noncontinuous;
-+						link-frequencies =
-+							/bits/ 64 <297000000>;
-+					};
-+				};
-+			};
-+		};
-+	};
-+
-+	csi_frag: fragment@1 {
-+		target = <&csi1>;
-+		csi: __overlay__ {
-+			status = "okay";
-+
-+			port {
-+				csi1_ep: endpoint {
-+					remote-endpoint = <&irs1125_0>;
-+					data-lanes = <1 2>;
-+					clock-noncontinuous;
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c0if>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&i2c0mux>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@4 {
-+		target-path="/__overrides__";
-+		__overlay__ {
-+			cam0-pwdn-ctrl = <&irs1125>,"pwdn-gpios:0";
-+			cam0-pwdn      = <&irs1125>,"pwdn-gpios:4";
-+		};
-+	};
-+
-+	clk_frag: fragment@5 {
-+		target = <&cam1_clk>;
-+		__overlay__ {
-+			status = "okay";
-+			clock-frequency = <26000000>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		media-controller = <&csi>,"brcm,media-controller?";
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
-+		       <&csi_frag>, "target:0=",<&csi0>,
-+		       <&clk_frag>, "target:0=",<&cam0_clk>,
-+		       <&irs1125>, "clocks:0=",<&cam0_clk>;
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/jedec-spi-nor-overlay.dts b/arch/arm/boot/dts/overlays/jedec-spi-nor-overlay.dts
-new file mode 100644
-index 000000000000..585c7dbcdf7f
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/jedec-spi-nor-overlay.dts
-@@ -0,0 +1,309 @@
-+// Overlay for JEDEC SPI-NOR Flash Devices (aka m25p80)
-+
-+// dtparams:
-+//     flash-spi<n>-<m>        - Enables flash device on SPI<n>, CS#<m>.
-+//     flash-fastr-spi<n>-<m>  - Enables flash device with fast read capability on SPI<n>, CS#<m>.
-+//
-+// If devices are present on SPI1 or SPI2, those interfaces must be enabled with one of the spi1-1/2/3cs and/or spi2-1/2/3cs overlays.
-+//
-+// Example: A single flash device with fast read capability on SPI0, CS#0:
-+// dtoverlay=jedec-spi-nor:flash-fastr-spi0-0
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	// disable spi-dev on spi0.0
-+	fragment@0 {
-+		target = <&spidev0>;
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	// disable spi-dev on spi0.1
-+	fragment@1 {
-+		target = <&spidev1>;
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	// disable spi-dev on spi1.0
-+	fragment@2 {
-+		target-path = "spi1/spidev@0";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	// disable spi-dev on spi1.1
-+	fragment@3 {
-+		target-path = "spi1/spidev@1";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	// disable spi-dev on spi1.2
-+	fragment@4 {
-+		target-path = "spi1/spidev@2";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	// disable spi-dev on spi2.0
-+	fragment@5 {
-+		target-path = "spi2/spidev@0";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	// disable spi-dev on spi2.1
-+	fragment@6 {
-+		target-path = "spi2/spidev@1";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	// disable spi-dev on spi2.2
-+	fragment@7 {
-+		target-path = "spi2/spidev@2";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	// enable flash on spi0.0
-+	fragment@8 {
-+		target = <&spi0>;
-+		__dormant__ {
-+			status = "okay";
-+                        #address-cells = <1>;
-+                        #size-cells = <0>;
-+			spi_nor_00: spi_nor@0 {
-+				#address-cells = <1>;
-+				#size-cells = <1>;
-+				compatible = "jedec,spi-nor";
-+				reg = <0>;
-+				spi-max-frequency = <500000>;
-+			};
-+		};
-+	};
-+
-+	// enable flash on spi0.1
-+	fragment@9 {
-+		target = <&spi0>;
-+		__dormant__ {
-+			status = "okay";
-+                        #address-cells = <1>;
-+                        #size-cells = <0>;
-+			spi_nor_01: spi_nor@1 {
-+				#address-cells = <1>;
-+				#size-cells = <1>;
-+				compatible = "jedec,spi-nor";
-+				reg = <1>;
-+				spi-max-frequency = <500000>;
-+			};
-+		};
-+	};
-+
-+	// enable flash on spi1.0
-+	fragment@10 {
-+		target = <&spi1>;
-+		__dormant__ {
-+			status = "okay";
-+                        #address-cells = <1>;
-+                        #size-cells = <0>;
-+			spi_nor_10: spi_nor@0 {
-+				#address-cells = <1>;
-+				#size-cells = <1>;
-+				compatible = "jedec,spi-nor";
-+				reg = <0>;
-+				spi-max-frequency = <500000>;
-+			};
-+		};
-+	};
-+
-+	// enable flash on spi1.1
-+	fragment@11 {
-+		target = <&spi1>;
-+		__dormant__ {
-+			status = "okay";
-+                        #address-cells = <1>;
-+                        #size-cells = <0>;
-+			spi_nor_11: spi_nor@1 {
-+				#address-cells = <1>;
-+				#size-cells = <1>;
-+				compatible = "jedec,spi-nor";
-+				reg = <1>;
-+				spi-max-frequency = <500000>;
-+			};
-+		};
-+	};
-+
-+	// enable flash on spi1.2
-+	fragment@12 {
-+		target = <&spi1>;
-+		__dormant__ {
-+			status = "okay";
-+                        #address-cells = <1>;
-+                        #size-cells = <0>;
-+			spi_nor_12: spi_nor@2 {
-+				#address-cells = <1>;
-+				#size-cells = <1>;
-+				compatible = "jedec,spi-nor";
-+				reg = <2>;
-+				spi-max-frequency = <500000>;
-+			};
-+		};
-+	};
-+
-+	// enable flash on spi2.0
-+	fragment@13 {
-+		target = <&spi2>;
-+		__dormant__ {
-+			status = "okay";
-+                        #address-cells = <1>;
-+                        #size-cells = <0>;
-+			spi_nor_20: spi_nor@0 {
-+				#address-cells = <1>;
-+				#size-cells = <1>;
-+				compatible = "jedec,spi-nor";
-+				reg = <0>;
-+				spi-max-frequency = <500000>;
-+			};
-+		};
-+	};
-+
-+	// enable flash on spi2.1
-+	fragment@14 {
-+		target = <&spi2>;
-+		__dormant__ {
-+			status = "okay";
-+                        #address-cells = <1>;
-+                        #size-cells = <0>;
-+			spi_nor_21: spi_nor@1 {
-+				#address-cells = <1>;
-+				#size-cells = <1>;
-+				compatible = "jedec,spi-nor";
-+				reg = <1>;
-+				spi-max-frequency = <500000>;
-+			};
-+		};
-+	};
-+
-+	// enable flash on spi2.2
-+	fragment@15 {
-+		target = <&spi2>;
-+		__dormant__ {
-+			status = "okay";
-+                        #address-cells = <1>;
-+                        #size-cells = <0>;
-+			spi_nor_22: spi_nor@2 {
-+				#address-cells = <1>;
-+				#size-cells = <1>;
-+				compatible = "jedec,spi-nor";
-+				reg = <2>;
-+				spi-max-frequency = <500000>;
-+			};
-+		};
-+	};
-+
-+	// Enable fast read for device on spi0.0.
-+	// Use default active low interrupt signalling.
-+	fragment@16 {
-+		target = <&spi_nor_00>;
-+		__dormant__ {
-+			m25p,fast-read;
-+		};
-+	};
-+
-+	// Enable fast read for device on spi0.1.
-+	// Use default active low interrupt signalling.
-+	fragment@17 {
-+		target = <&spi_nor_01>;
-+		__dormant__ {
-+			m25p,fast-read;
-+		};
-+	};
-+
-+	// Enable fast read for device on spi1.0.
-+	// Use default active low interrupt signalling.
-+	fragment@18 {
-+		target = <&spi_nor_10>;
-+		__dormant__ {
-+			m25p,fast-read;
-+		};
-+	};
-+
-+	// Enable fast read for device on spi1.1.
-+	// Use default active low interrupt signalling.
-+	fragment@19 {
-+		target = <&spi_nor_11>;
-+		__dormant__ {
-+			m25p,fast-read;
-+		};
-+	};
-+
-+	// Enable fast read for device on spi1.2.
-+	// Use default active low interrupt signalling.
-+	fragment@20 {
-+		target = <&spi_nor_12>;
-+		__dormant__ {
-+			m25p,fast-read;
-+		};
-+	};
-+
-+	// Enable fast read for device on spi2.0.
-+	// Use default active low interrupt signalling.
-+	fragment@21 {
-+		target = <&spi_nor_20>;
-+		__dormant__ {
-+			m25p,fast-read;
-+		};
-+	};
-+
-+	// Enable fast read for device on spi2.1.
-+	// Use default active low interrupt signalling.
-+	fragment@22 {
-+		target = <&spi_nor_21>;
-+		__dormant__ {
-+			m25p,fast-read;
-+		};
-+	};
-+
-+	// Enable fast read for device on spi2.2.
-+	// Use default active low interrupt signalling.
-+	fragment@23 {
-+		target = <&spi_nor_22>;
-+		__dormant__ {
-+			m25p,fast-read;
-+		};
-+	};
-+
-+	__overrides__ {
-+		flash-spi0-0       = <0>,"+0+8";
-+		flash-spi0-1       = <0>,"+1+9";
-+		flash-spi1-0       = <0>,"+2+10";
-+		flash-spi1-1       = <0>,"+3+11";
-+		flash-spi1-2       = <0>,"+4+12";
-+		flash-spi2-0       = <0>,"+5+13";
-+		flash-spi2-1       = <0>,"+6+14";
-+		flash-spi2-2       = <0>,"+7+15";
-+		flash-fastr-spi0-0 = <0>,"+0+8+16";
-+		flash-fastr-spi0-1 = <0>,"+1+9+17";
-+		flash-fastr-spi1-0 = <0>,"+2+10+18";
-+		flash-fastr-spi1-1 = <0>,"+3+11+19";
-+		flash-fastr-spi1-2 = <0>,"+4+12+20";
-+		flash-fastr-spi2-0 = <0>,"+5+13+21";
-+		flash-fastr-spi2-1 = <0>,"+6+14+22";
-+		flash-fastr-spi2-2 = <0>,"+7+15+23";
-+	};
-+};
-+
-diff --git a/arch/arm/boot/dts/overlays/justboom-both-overlay.dts b/arch/arm/boot/dts/overlays/justboom-both-overlay.dts
-new file mode 100644
-index 000000000000..9c42670631c0
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/justboom-both-overlay.dts
-@@ -0,0 +1,65 @@
-+// SPDX-License-Identifier: GPL-2.0
-+// Definitions for JustBoom Both (Digi+DAC)
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			wm8804@3b {
-+				#sound-dai-cells = <0>;
-+				compatible = "wlf,wm8804";
-+				reg = <0x3b>;
-+				PVDD-supply = <&vdd_3v3_reg>;
-+				DVDD-supply = <&vdd_3v3_reg>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			pcm5122@4d {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,pcm5122";
-+				reg = <0x4d>;
-+				AVDD-supply = <&vdd_3v3_reg>;
-+				DVDD-supply = <&vdd_3v3_reg>;
-+				CPVDD-supply = <&vdd_3v3_reg>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&sound>;
-+		frag3: __overlay__ {
-+			compatible = "justboom,justboom-both";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		24db_digital_gain = <&frag3>,"justboom,24db_digital_gain?";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/justboom-dac-overlay.dts b/arch/arm/boot/dts/overlays/justboom-dac-overlay.dts
-new file mode 100644
-index 000000000000..d00515dca419
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/justboom-dac-overlay.dts
-@@ -0,0 +1,46 @@
-+// Definitions for JustBoom DAC
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			pcm5122@4d {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,pcm5122";
-+				reg = <0x4d>;
-+				AVDD-supply = <&vdd_3v3_reg>;
-+				DVDD-supply = <&vdd_3v3_reg>;
-+				CPVDD-supply = <&vdd_3v3_reg>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		frag2: __overlay__ {
-+			compatible = "justboom,justboom-dac";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		24db_digital_gain = <&frag2>,"justboom,24db_digital_gain?";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/justboom-digi-overlay.dts b/arch/arm/boot/dts/overlays/justboom-digi-overlay.dts
-new file mode 100644
-index 000000000000..e73336029c54
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/justboom-digi-overlay.dts
-@@ -0,0 +1,41 @@
-+// Definitions for JustBoom Digi
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			wm8804@3b {
-+				#sound-dai-cells = <0>;
-+				compatible = "wlf,wm8804";
-+				reg = <0x3b>;
-+				PVDD-supply = <&vdd_3v3_reg>;
-+				DVDD-supply = <&vdd_3v3_reg>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "justboom,justboom-digi";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/ltc294x-overlay.dts b/arch/arm/boot/dts/overlays/ltc294x-overlay.dts
-new file mode 100644
-index 000000000000..6d971f3649ca
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/ltc294x-overlay.dts
-@@ -0,0 +1,86 @@
-+/dts-v1/;
-+/plugin/;
-+
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2c_arm>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			ltc2941: ltc2941@64 {
-+				compatible = "lltc,ltc2941";
-+				reg = <0x64>;
-+				lltc,resistor-sense = <50>;
-+				lltc,prescaler-exponent = <7>; 
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c_arm>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			ltc2942: ltc2942@64 {
-+				compatible = "lltc,ltc2942";
-+				reg = <0x64>;
-+				lltc,resistor-sense = <50>;
-+				lltc,prescaler-exponent = <7>; 
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c_arm>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			ltc2943: ltc2943@64 {
-+				compatible = "lltc,ltc2943";
-+				reg = <0x64>;
-+				lltc,resistor-sense = <50>;
-+				lltc,prescaler-exponent = <7>; 
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&i2c_arm>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			ltc2944: ltc2944@64 {
-+				compatible = "lltc,ltc2944";
-+				reg = <0x64>;
-+				lltc,resistor-sense = <50>;
-+				lltc,prescaler-exponent = <7>; 
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		ltc2941 = <0>,"+0";
-+		ltc2942 = <0>,"+1";
-+		ltc2943 = <0>,"+2";
-+		ltc2944 = <0>,"+3";
-+		resistor-sense = <&ltc2941>, "lltc,resistor-sense:0",
-+			         <&ltc2942>, "lltc,resistor-sense:0",
-+				 <&ltc2943>, "lltc,resistor-sense:0",
-+				 <&ltc2944>, "lltc,resistor-sense:0";
-+		prescaler-exponent = <&ltc2941>, "lltc,prescaler-exponent:0",
-+			         <&ltc2942>, "lltc,prescaler-exponent:0",
-+				 <&ltc2943>, "lltc,prescaler-exponent:0",
-+				 <&ltc2944>, "lltc,prescaler-exponent:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/max98357a-overlay.dts b/arch/arm/boot/dts/overlays/max98357a-overlay.dts
-new file mode 100644
-index 000000000000..9e2afb05b7cb
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/max98357a-overlay.dts
-@@ -0,0 +1,84 @@
-+// Overlay for Maxim MAX98357A audio DAC
-+
-+// dtparams:
-+//     no-sdmode  - SD_MODE pin not managed by driver.
-+//     sdmode-pin - Specify GPIO pin to which SD_MODE is connected (default 4).
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	/* Enable I2S */
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	/* DAC whose SD_MODE pin is managed by driver (via GPIO pin) */
-+	fragment@1 {
-+		target-path = "/";
-+		__overlay__ {
-+			max98357a_dac: max98357a {
-+				compatible = "maxim,max98357a";
-+				#sound-dai-cells = <0>;
-+				sdmode-gpios = <&gpio 4 0>;   /* 2nd word overwritten by sdmode-pin parameter */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	/* DAC whose SD_MODE pin is not managed by driver */
-+	fragment@2 {
-+		target-path = "/";
-+		__dormant__ {
-+			max98357a_nsd: max98357a {
-+				compatible = "maxim,max98357a";
-+				#sound-dai-cells = <0>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	/* Soundcard connecting I2S to DAC with SD_MODE */
-+	fragment@3 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "simple-audio-card";
-+			simple-audio-card,format = "i2s";
-+			simple-audio-card,name = "MAX98357A";
-+			status = "okay";
-+			simple-audio-card,cpu {
-+				sound-dai = <&i2s>;
-+			};
-+			simple-audio-card,codec {
-+				sound-dai = <&max98357a_dac>;
-+			};
-+		};
-+	};
-+
-+	/* Soundcard connecting I2S to DAC without SD_MODE */
-+	fragment@4 {
-+		target = <&sound>;
-+		__dormant__ {
-+			compatible = "simple-audio-card";
-+			simple-audio-card,format = "i2s";
-+			simple-audio-card,name = "MAX98357A";
-+			status = "okay";
-+			simple-audio-card,cpu {
-+				sound-dai = <&i2s>;
-+			};
-+			simple-audio-card,codec {
-+				sound-dai = <&max98357a_nsd>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		no-sdmode  = <0>,"-1+2-3+4";
-+		sdmode-pin = <&max98357a_dac>,"sdmode-gpios:4";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/maxtherm-overlay.dts b/arch/arm/boot/dts/overlays/maxtherm-overlay.dts
-new file mode 100644
-index 000000000000..9964e246c14f
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/maxtherm-overlay.dts
-@@ -0,0 +1,186 @@
-+/*
-+ * Universal device tree overlay for SPI devices
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/iio/temperature/thermocouple.h>
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spidev0>;
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spidev1>;
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target-path = "spi1/spidev@0";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target-path = "spi1/spidev@1";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@4 {
-+		target-path = "spi1/spidev@2";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@5 {
-+		target-path = "spi2/spidev@0";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@6 {
-+		target-path = "spi2/spidev@1";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@7 {
-+		target-path = "spi2/spidev@2";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	maxfrag: fragment@8 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			max: maxtherm@0 {
-+				compatible = "maxim,max6675";
-+				reg = <0>;
-+				spi-max-frequency = <500000>;
-+			};
-+		};
-+	};
-+
-+	fragment@9 {
-+		target = <&max>;
-+		__dormant__ {
-+			compatible = "maxim,max31855e", "maxim,max31855";
-+		};
-+	};
-+
-+	fragment@10 {
-+		target = <&max>;
-+		__dormant__ {
-+			compatible = "maxim,max31855j", "maxim,max31855";
-+		};
-+	};
-+
-+	fragment@11 {
-+		target = <&max>;
-+		__dormant__ {
-+			compatible = "maxim,max31855k", "maxim,max31855";
-+		};
-+	};
-+
-+	fragment@12 {
-+		target = <&max>;
-+		__dormant__ {
-+			compatible = "maxim,max31855n", "maxim,max31855";
-+		};
-+	};
-+
-+	fragment@13 {
-+		target = <&max>;
-+		__dormant__ {
-+			compatible = "maxim,max31855r", "maxim,max31855";
-+		};
-+	};
-+
-+	fragment@14 {
-+		target = <&max>;
-+		__dormant__ {
-+			compatible = "maxim,max31855s", "maxim,max31855";
-+		};
-+	};
-+
-+	fragment@15 {
-+		target = <&max>;
-+		__dormant__ {
-+			compatible = "maxim,max31855t", "maxim,max31855";
-+		};
-+	};
-+
-+	fragment@16 {
-+		target = <&max>;
-+		__dormant__ {
-+			compatible = "maxim,max31856";
-+			spi-cpha;
-+			thermocouple-type = <THERMOCOUPLE_TYPE_K>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		spi0-0 = <0>, "+0",
-+			 <&maxfrag>,"target:0=",<&spi0>,
-+			 <&max>,"reg:0=0";
-+		spi0-1 = <0>, "+1",
-+			 <&maxfrag>,"target:0=",<&spi0>,
-+			 <&max>,"reg:0=1";
-+		spi1-0 = <0>, "+2",
-+			 <&maxfrag>,"target:0=",<&spi1>,
-+			 <&max>,"reg:0=0";
-+		spi1-1 = <0>, "+3",
-+			 <&maxfrag>,"target:0=",<&spi1>,
-+			 <&max>,"reg:0=1";
-+		spi1-2 = <0>, "+4",
-+			 <&maxfrag>,"target:0=",<&spi1>,
-+			 <&max>,"reg:0=2";
-+		spi2-0 = <0>, "+5",
-+			 <&maxfrag>,"target:0=",<&spi2>,
-+			 <&max>,"reg:0=0";
-+		spi2-1 = <0>, "+6",
-+			 <&maxfrag>,"target:0=",<&spi2>,
-+			 <&max>,"reg:0=1";
-+		spi2-2 = <0>, "+7",
-+			 <&maxfrag>,"target:0=",<&spi2>,
-+			 <&max>,"reg:0=2";
-+		max6675 = <&max>,"compatible=maxim,max6675";
-+		max31855 = <&max>,"compatible=maxim,max31855";
-+		max31855e = <0>,"+9";
-+		max31855j = <0>,"+10";
-+		max31855k = <0>,"+11";
-+		max31855n = <0>,"+12";
-+		max31855r = <0>,"+13";
-+		max31855s = <0>,"+14";
-+		max31855t = <0>,"+15";
-+		max31856  = <0>,"+16";
-+		type_b    = <&max>,"thermocouple-type:0=",<THERMOCOUPLE_TYPE_B>;
-+		type_e    = <&max>,"thermocouple-type:0=",<THERMOCOUPLE_TYPE_E>;
-+		type_j    = <&max>,"thermocouple-type:0=",<THERMOCOUPLE_TYPE_J>;
-+		type_k    = <&max>,"thermocouple-type:0=",<THERMOCOUPLE_TYPE_K>;
-+		type_n    = <&max>,"thermocouple-type:0=",<THERMOCOUPLE_TYPE_N>;
-+		type_r    = <&max>,"thermocouple-type:0=",<THERMOCOUPLE_TYPE_R>;
-+		type_s    = <&max>,"thermocouple-type:0=",<THERMOCOUPLE_TYPE_S>;
-+		type_t    = <&max>,"thermocouple-type:0=",<THERMOCOUPLE_TYPE_T>;
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/mbed-dac-overlay.dts b/arch/arm/boot/dts/overlays/mbed-dac-overlay.dts
-new file mode 100644
-index 000000000000..840dd9b31db4
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/mbed-dac-overlay.dts
-@@ -0,0 +1,64 @@
-+// Definitions for mbed DAC
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+                        #size-cells = <0>;
-+			status = "okay";
-+
-+			tlv320aic23: codec@1a {
-+				#sound-dai-cells = <0>;
-+				reg = <0x1a>;
-+				compatible = "ti,tlv320aic23";
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "simple-audio-card";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+
-+			simple-audio-card,name = "mbed-DAC";
-+
-+			simple-audio-card,widgets =
-+				"Microphone", "Mic Jack",
-+				"Line", "Line In",
-+				"Headphone", "Headphone Jack";
-+
-+			simple-audio-card,routing =
-+				"Headphone Jack", "LHPOUT",
-+				"Headphone Jack", "RHPOUT",
-+				"LLINEIN", "Line In",
-+				"RLINEIN", "Line In",
-+				"MICIN", "Mic Jack";
-+
-+			simple-audio-card,format = "i2s";
-+
-+			simple-audio-card,cpu {
-+				sound-dai = <&i2s>;
-+			};
-+
-+			sound_master: simple-audio-card,codec {
-+				sound-dai = <&tlv320aic23>;
-+				system-clock-frequency = <12288000>;
-+			};
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/mcp23017-overlay.dts b/arch/arm/boot/dts/overlays/mcp23017-overlay.dts
-new file mode 100644
-index 000000000000..c546d8ba7e6d
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/mcp23017-overlay.dts
-@@ -0,0 +1,69 @@
-+// Definitions for MCP23017 Gpio Extender from Microchip Semiconductor
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			mcp23017_pins: mcp23017_pins@20 {
-+				brcm,pins = <4>;
-+				brcm,function = <0>;
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			mcp23017: mcp@20 {
-+				compatible = "microchip,mcp23017";
-+				reg = <0x20>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&mcp23017>;
-+		__dormant__ {
-+			compatible = "microchip,mcp23008";
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&mcp23017>;
-+		mcp23017_irq: __overlay__ {
-+			#interrupt-cells=<2>;
-+			interrupt-parent = <&gpio>;
-+			interrupts = <4 2>;
-+			interrupt-controller;
-+			microchip,irq-mirror;
-+		};
-+	};
-+
-+	__overrides__ {
-+		gpiopin = <&mcp23017_pins>,"brcm,pins:0",
-+				<&mcp23017_irq>,"interrupts:0";
-+		addr = <&mcp23017>,"reg:0", <&mcp23017_pins>,"reg:0";
-+		mcp23008 = <0>,"=3";
-+		noints = <0>,"!1!4";
-+	};
-+};
-+
-diff --git a/arch/arm/boot/dts/overlays/mcp23s17-overlay.dts b/arch/arm/boot/dts/overlays/mcp23s17-overlay.dts
-new file mode 100644
-index 000000000000..484d64b225fb
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/mcp23s17-overlay.dts
-@@ -0,0 +1,732 @@
-+// Overlay for MCP23S08/17 GPIO Extenders from Microchip Semiconductor
-+
-+// dtparams:
-+//     s08-spi<n>-<m>-present  - 4-bit integer, bitmap indicating MCP23S08 devices present on SPI<n>, CS#<m>.
-+//     s17-spi<n>-<m>-present  - 8-bit integer, bitmap indicating MCP23S17 devices present on SPI<n>, CS#<m>.
-+//     s08-spi<n>-<m>-int-gpio - integer, enables interrupts on a single MCP23S08 device on SPI<n>, CS#<m>, specifies the GPIO pin to which INT output is connected.
-+//     s17-spi<n>-<m>-int-gpio - integer, enables mirrored interrupts on a single MCP23S17 device on SPI<n>, CS#<m>, specifies the GPIO pin to which either INTA or INTB output is connected.
-+//
-+// If devices are present on SPI1 or SPI2, those interfaces must be enabled with one of the spi1-1/2/3cs and/or spi2-1/2/3cs overlays.
-+// If interrupts are enabled for a device on a given CS# on a SPI bus, that device must be the only one present on that SPI bus/CS#.
-+//
-+// Example 1: A single MCP23S17 device on SPI0, CS#0 with its SPI addr set to 0 and INTA output connected to GPIO25:
-+// dtoverlay=mcp23s17:s17-spi0-0-present=1,s17-spi0-0-int-gpio=25
-+//
-+// Example 2: Two MCP23S08 devices on SPI1, CS#0 with their addrs set to 2 and 3. Three MCP23S17 devices on SPI1, CS#1 with their addrs set to 0, 1 and 7:
-+// dtoverlay=spi1-2cs
-+// dtoverlay=mcp23s17:s08-spi1-0-present=12,s17-spi1-1-present=131
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	// disable spi-dev on spi0.0
-+	fragment@0 {
-+		target = <&spidev0>;
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	// disable spi-dev on spi0.1
-+	fragment@1 {
-+		target = <&spidev1>;
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	// disable spi-dev on spi1.0
-+	fragment@2 {
-+		target-path = "spi1/spidev@0";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	// disable spi-dev on spi1.1
-+	fragment@3 {
-+		target-path = "spi1/spidev@1";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	// disable spi-dev on spi1.2
-+	fragment@4 {
-+		target-path = "spi1/spidev@2";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	// disable spi-dev on spi2.0
-+	fragment@5 {
-+		target-path = "spi2/spidev@0";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	// disable spi-dev on spi2.1
-+	fragment@6 {
-+		target-path = "spi2/spidev@1";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	// disable spi-dev on spi2.2
-+	fragment@7 {
-+		target-path = "spi2/spidev@2";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	// enable one or more mcp23s08s on spi0.0
-+	fragment@8 {
-+		target = <&spi0>;
-+		__dormant__ {
-+			status = "okay";
-+                        #address-cells = <1>;
-+                        #size-cells = <0>;
-+			mcp23s08_00: mcp23s08@0 {
-+				compatible = "microchip,mcp23s08";
-+  				gpio-controller;
-+  				#gpio-cells = <2>;
-+    				microchip,spi-present-mask = <0x00>;  /* overwritten by mcp23s08-spi0-0-present parameter */
-+     				reg = <0>;
-+    				spi-max-frequency = <500000>;
-+				status = "okay";
-+				#interrupt-cells=<2>;
-+				interrupts = <0 2>;  /* 1st word overwritten by mcp23s08-spi0-0-int-gpio parameter */
-+			};
-+		};
-+	};
-+
-+	// enable one or more mcp23s08s on spi0.1
-+	fragment@9 {
-+		target = <&spi0>;
-+		__dormant__ {
-+			status = "okay";
-+                        #address-cells = <1>;
-+                        #size-cells = <0>;
-+			mcp23s08_01: mcp23s08@1 {
-+				compatible = "microchip,mcp23s08";
-+  				gpio-controller;
-+  				#gpio-cells = <2>;
-+    				microchip,spi-present-mask = <0x00>;  /* overwritten by mcp23s08-spi0-1-present parameter */
-+     				reg = <1>;
-+    				spi-max-frequency = <500000>;
-+				status = "okay";
-+				#interrupt-cells=<2>;
-+				interrupts = <0 2>;  /* 1st word overwritten by mcp23s08-spi0-1-int-gpio parameter */
-+			};
-+		};
-+	};
-+
-+	// enable one or more mcp23s08s on spi1.0
-+	fragment@10 {
-+		target = <&spi1>;
-+		__dormant__ {
-+			status = "okay";
-+                        #address-cells = <1>;
-+                        #size-cells = <0>;
-+			mcp23s08_10: mcp23s08@0 {
-+				compatible = "microchip,mcp23s08";
-+  				gpio-controller;
-+  				#gpio-cells = <2>;
-+    				microchip,spi-present-mask = <0x00>;  /* overwritten by mcp23s08-spi1-0-present parameter */
-+     				reg = <0>;
-+    				spi-max-frequency = <500000>;
-+				status = "okay";
-+				#interrupt-cells=<2>;
-+				interrupts = <0 2>;  /* 1st word overwritten by mcp23s08-spi1-0-int-gpio parameter */
-+			};
-+		};
-+	};
-+
-+	// enable one or more mcp23s08s on spi1.1
-+	fragment@11 {
-+		target = <&spi1>;
-+		__dormant__ {
-+			status = "okay";
-+                        #address-cells = <1>;
-+                        #size-cells = <0>;
-+			mcp23s08_11: mcp23s08@1 {
-+				compatible = "microchip,mcp23s08";
-+  				gpio-controller;
-+  				#gpio-cells = <2>;
-+    				microchip,spi-present-mask = <0x00>;  /* overwritten by mcp23s08-spi1-1-present parameter */
-+     				reg = <1>;
-+    				spi-max-frequency = <500000>;
-+				status = "okay";
-+				#interrupt-cells=<2>;
-+				interrupts = <0 2>;  /* 1st word overwritten by mcp23s08-spi1-1-int-gpio parameter */
-+			};
-+		};
-+	};
-+
-+	// enable one or more mcp23s08s on spi1.2
-+	fragment@12 {
-+		target = <&spi1>;
-+		__dormant__ {
-+			status = "okay";
-+                        #address-cells = <1>;
-+                        #size-cells = <0>;
-+			mcp23s08_12: mcp23s08@2 {
-+				compatible = "microchip,mcp23s08";
-+  				gpio-controller;
-+  				#gpio-cells = <2>;
-+    				microchip,spi-present-mask = <0x00>;  /* overwritten by mcp23s08-spi1-2-present parameter */
-+     				reg = <2>;
-+    				spi-max-frequency = <500000>;
-+				status = "okay";
-+				#interrupt-cells=<2>;
-+				interrupts = <0 2>;  /* 1st word overwritten by mcp23s08-spi1-2-int-gpio parameter */
-+			};
-+		};
-+	};
-+
-+	// enable one or more mcp23s08s on spi2.0
-+	fragment@13 {
-+		target = <&spi2>;
-+		__dormant__ {
-+			status = "okay";
-+                        #address-cells = <1>;
-+                        #size-cells = <0>;
-+			mcp23s08_20: mcp23s08@0 {
-+				compatible = "microchip,mcp23s08";
-+  				gpio-controller;
-+  				#gpio-cells = <2>;
-+    				microchip,spi-present-mask = <0x00>;  /* overwritten by mcp23s08-spi2-0-present parameter */
-+     				reg = <0>;
-+    				spi-max-frequency = <500000>;
-+				status = "okay";
-+				#interrupt-cells=<2>;
-+				interrupts = <0 2>;  /* 1st word overwritten by mcp23s08-spi2-0-int-gpio parameter */
-+			};
-+		};
-+	};
-+
-+	// enable one or more mcp23s08s on spi2.1
-+	fragment@14 {
-+		target = <&spi2>;
-+		__dormant__ {
-+			status = "okay";
-+                        #address-cells = <1>;
-+                        #size-cells = <0>;
-+			mcp23s08_21: mcp23s08@1 {
-+				compatible = "microchip,mcp23s08";
-+  				gpio-controller;
-+  				#gpio-cells = <2>;
-+    				microchip,spi-present-mask = <0x00>;  /* overwritten by mcp23s08-spi2-1-present parameter */
-+     				reg = <1>;
-+    				spi-max-frequency = <500000>;
-+				status = "okay";
-+				#interrupt-cells=<2>;
-+				interrupts = <0 2>;  /* 1st word overwritten by mcp23s08-spi2-1-int-gpio parameter */
-+			};
-+		};
-+	};
-+
-+	// enable one or more mcp23s08s on spi2.2
-+	fragment@15 {
-+		target = <&spi2>;
-+		__dormant__ {
-+			status = "okay";
-+                        #address-cells = <1>;
-+                        #size-cells = <0>;
-+			mcp23s08_22: mcp23s08@2 {
-+				compatible = "microchip,mcp23s08";
-+  				gpio-controller;
-+  				#gpio-cells = <2>;
-+    				microchip,spi-present-mask = <0x00>;  /* overwritten by mcp23s08-spi2-2-present parameter */
-+     				reg = <2>;
-+    				spi-max-frequency = <500000>;
-+				status = "okay";
-+				#interrupt-cells=<2>;
-+				interrupts = <0 2>;  /* 1st word overwritten by mcp23s08-spi2-2-int-gpio parameter */
-+			};
-+		};
-+	};
-+
-+	// enable one or more mcp23s17s on spi0.0
-+	fragment@16 {
-+		target = <&spi0>;
-+		__dormant__ {
-+			status = "okay";
-+                        #address-cells = <1>;
-+                        #size-cells = <0>;
-+			mcp23s17_00: mcp23s17@0 {
-+				compatible = "microchip,mcp23s17";
-+  				gpio-controller;
-+  				#gpio-cells = <2>;
-+    				microchip,spi-present-mask = <0x00>;  /* overwritten by mcp23s17-spi0-0-present parameter */
-+     				reg = <0>;
-+    				spi-max-frequency = <500000>;
-+				status = "okay";
-+				#interrupt-cells=<2>;
-+				interrupts = <0 2>;  /* 1st word overwritten by mcp23s17-spi0-0-int-gpio parameter */
-+			};
-+		};
-+	};
-+
-+	// enable one or more mcp23s17s on spi0.1
-+	fragment@17 {
-+		target = <&spi0>;
-+		__dormant__ {
-+			status = "okay";
-+                        #address-cells = <1>;
-+                        #size-cells = <0>;
-+			mcp23s17_01: mcp23s17@1 {
-+				compatible = "microchip,mcp23s17";
-+  				gpio-controller;
-+  				#gpio-cells = <2>;
-+    				microchip,spi-present-mask = <0x00>;  /* overwritten by mcp23s17-spi0-1-present parameter */
-+     				reg = <1>;
-+    				spi-max-frequency = <500000>;
-+				status = "okay";
-+				#interrupt-cells=<2>;
-+				interrupts = <0 2>;  /* 1st word overwritten by mcp23s17-spi0-1-int-gpio parameter */
-+			};
-+		};
-+	};
-+
-+	// enable one or more mcp23s17s on spi1.0
-+	fragment@18 {
-+		target = <&spi1>;
-+		__dormant__ {
-+			status = "okay";
-+                        #address-cells = <1>;
-+                        #size-cells = <0>;
-+			mcp23s17_10: mcp23s17@0 {
-+				compatible = "microchip,mcp23s17";
-+  				gpio-controller;
-+  				#gpio-cells = <2>;
-+    				microchip,spi-present-mask = <0x00>;  /* overwritten by mcp23s17-spi1-0-present parameter */
-+     				reg = <0>;
-+    				spi-max-frequency = <500000>;
-+				status = "okay";
-+				#interrupt-cells=<2>;
-+				interrupts = <0 2>;  /* 1st word overwritten by mcp23s17-spi1-0-int-gpio parameter */
-+			};
-+		};
-+	};
-+
-+	// enable one or more mcp23s17s on spi1.1
-+	fragment@19 {
-+		target = <&spi1>;
-+		__dormant__ {
-+			status = "okay";
-+                        #address-cells = <1>;
-+                        #size-cells = <0>;
-+			mcp23s17_11: mcp23s17@1 {
-+				compatible = "microchip,mcp23s17";
-+  				gpio-controller;
-+  				#gpio-cells = <2>;
-+    				microchip,spi-present-mask = <0x00>;  /* overwritten by mcp23s17-spi1-1-present parameter */
-+     				reg = <1>;
-+    				spi-max-frequency = <500000>;
-+				status = "okay";
-+				#interrupt-cells=<2>;
-+				interrupts = <0 2>;  /* 1st word overwritten by mcp23s17-spi1-1-int-gpio parameter */
-+			};
-+		};
-+	};
-+
-+	// enable one or more mcp23s17s on spi1.2
-+	fragment@20 {
-+		target = <&spi1>;
-+		__dormant__ {
-+			status = "okay";
-+                        #address-cells = <1>;
-+                        #size-cells = <0>;
-+			mcp23s17_12: mcp23s17@2 {
-+				compatible = "microchip,mcp23s17";
-+  				gpio-controller;
-+  				#gpio-cells = <2>;
-+    				microchip,spi-present-mask = <0x00>;  /* overwritten by mcp23s17-spi1-2-present parameter */
-+     				reg = <2>;
-+    				spi-max-frequency = <500000>;
-+				status = "okay";
-+				#interrupt-cells=<2>;
-+				interrupts = <0 2>;  /* 1st word overwritten by mcp23s17-spi1-2-int-gpio parameter */
-+			};
-+		};
-+	};
-+
-+	// enable one or more mcp23s17s on spi2.0
-+	fragment@21 {
-+		target = <&spi2>;
-+		__dormant__ {
-+			status = "okay";
-+                        #address-cells = <1>;
-+                        #size-cells = <0>;
-+			mcp23s17_20: mcp23s17@0 {
-+				compatible = "microchip,mcp23s17";
-+  				gpio-controller;
-+  				#gpio-cells = <2>;
-+    				microchip,spi-present-mask = <0x00>;  /* overwritten by mcp23s17-spi2-0-present parameter */
-+     				reg = <0>;
-+    				spi-max-frequency = <500000>;
-+				status = "okay";
-+				#interrupt-cells=<2>;
-+				interrupts = <0 2>;  /* 1st word overwritten by mcp23s17-spi2-0-int-gpio parameter */
-+			};
-+		};
-+	};
-+
-+	// enable one or more mcp23s17s on spi2.1
-+	fragment@22 {
-+		target = <&spi2>;
-+		__dormant__ {
-+			status = "okay";
-+                        #address-cells = <1>;
-+                        #size-cells = <0>;
-+			mcp23s17_21: mcp23s17@1 {
-+				compatible = "microchip,mcp23s17";
-+  				gpio-controller;
-+  				#gpio-cells = <2>;
-+    				microchip,spi-present-mask = <0x00>;  /* overwritten by mcp23s17-spi2-1-present parameter */
-+     				reg = <1>;
-+    				spi-max-frequency = <500000>;
-+				status = "okay";
-+				#interrupt-cells=<2>;
-+				interrupts = <0 2>;  /* 1st word overwritten by mcp23s17-spi2-1-int-gpio parameter */
-+			};
-+		};
-+	};
-+
-+	// enable one or more mcp23s17s on spi2.2
-+	fragment@23 {
-+		target = <&spi2>;
-+		__dormant__ {
-+			status = "okay";
-+                        #address-cells = <1>;
-+                        #size-cells = <0>;
-+			mcp23s17_22: mcp23s17@2 {
-+				compatible = "microchip,mcp23s17";
-+  				gpio-controller;
-+  				#gpio-cells = <2>;
-+    				microchip,spi-present-mask = <0x00>;  /* overwritten by mcp23s17-spi2-2-present parameter */
-+     				reg = <2>;
-+    				spi-max-frequency = <500000>;
-+				status = "okay";
-+				#interrupt-cells=<2>;
-+				interrupts = <0 2>;  /* 1st word overwritten by mcp23s17-spi2-2-int-gpio parameter */
-+			};
-+		};
-+	};
-+
-+	// Configure GPIO pin connected to INT(A/B) output of mcp23s08/17 on spi0.0 as a input with no pull-up/down
-+	fragment@24 {
-+		target = <&gpio>;
-+		__dormant__ {
-+			spi0_0_int_pins: spi0_0_int_pins {
-+				brcm,pins = <0>;  /* overwritten by mcp23s08/17-spi0-0-int-gpio parameter */
-+				brcm,function = <0>;
-+				brcm,pull = <0>;
-+			};
-+		};
-+	};
-+
-+	// Configure GPIO pin connected to INT(A/B) output of mcp23s08/17 on spi0.1 as a input with no pull-up/down
-+	fragment@25 {
-+		target = <&gpio>;
-+		__dormant__ {
-+			spi0_1_int_pins: spi0_1_int_pins {
-+				brcm,pins = <0>;  /* overwritten by mcp23s08/17-spi0-1-int-gpio parameter */
-+				brcm,function = <0>;
-+				brcm,pull = <0>;
-+			};
-+		};
-+	};
-+
-+	// Configure GPIO pin connected to INT(A/B) output of mcp23s08/17 on spi1.0 as a input with no pull-up/down
-+	fragment@26 {
-+		target = <&gpio>;
-+		__dormant__ {
-+			spi1_0_int_pins: spi1_0_int_pins {
-+				brcm,pins = <0>;  /* overwritten by mcp23s08/17-spi1-0-int-gpio parameter */
-+				brcm,function = <0>;
-+				brcm,pull = <0>;
-+			};
-+		};
-+	};
-+
-+	// Configure GPIO pin connected to INT(A/B) output of mcp23s08/17 on spi1.1 as a input with no pull-up/down
-+	fragment@27 {
-+		target = <&gpio>;
-+		__dormant__ {
-+			spi1_1_int_pins: spi1_1_int_pins {
-+				brcm,pins = <0>;  /* overwritten by mcp23s08/17-spi1-1-int-gpio parameter */
-+				brcm,function = <0>;
-+				brcm,pull = <0>;
-+			};
-+		};
-+	};
-+
-+	// Configure GPIO pin connected to INT(A/B) output of mcp23s08/17 on spi1.2 as a input with no pull-up/down
-+	fragment@28 {
-+		target = <&gpio>;
-+		__dormant__ {
-+			spi1_2_int_pins: spi1_2_int_pins {
-+				brcm,pins = <0>;  /* overwritten by mcp23s08/17-spi1-2-int-gpio parameter */
-+				brcm,function = <0>;
-+				brcm,pull = <0>;
-+			};
-+		};
-+	};
-+
-+	// Configure GPIO pin connected to INT(A/B) output of mcp23s08/17 on spi2.0 as a input with no pull-up/down
-+	fragment@29 {
-+		target = <&gpio>;
-+		__dormant__ {
-+			spi2_0_int_pins: spi2_0_int_pins {
-+				brcm,pins = <0>;  /* overwritten by mcp23s08/17-spi2-0-int-gpio parameter */
-+				brcm,function = <0>;
-+				brcm,pull = <0>;
-+			};
-+		};
-+	};
-+
-+	// Configure GPIO pin connected to INT(A/B) output of mcp23s08/17 on spi2.1 as a input with no pull-up/down
-+	fragment@30 {
-+		target = <&gpio>;
-+		__dormant__ {
-+			spi2_1_int_pins: spi2_1_int_pins {
-+				brcm,pins = <0>;  /* overwritten by mcp23s08/17-spi2-1-int-gpio parameter */
-+				brcm,function = <0>;
-+				brcm,pull = <0>;
-+			};
-+		};
-+	};
-+
-+	// Configure GPIO pin connected to INT(A/B) output of mcp23s08/17 on spi2.2 as a input with no pull-up/down
-+	fragment@31 {
-+		target = <&gpio>;
-+		__dormant__ {
-+			spi2_2_int_pins: spi2_2_int_pins {
-+				brcm,pins = <0>;  /* overwritten by mcp23s08/17-spi2-2-int-gpio parameter */
-+				brcm,function = <0>;
-+				brcm,pull = <0>;
-+			};
-+		};
-+	};
-+
-+	// Enable interrupts for a mcp23s08 on spi0.0.
-+	// Use default active low interrupt signalling.
-+	fragment@32 {
-+		target = <&mcp23s08_00>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+		};
-+	};
-+
-+	// Enable interrupts for a mcp23s08 on spi0.1.
-+	// Use default active low interrupt signalling.
-+	fragment@33 {
-+		target = <&mcp23s08_01>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+		};
-+	};
-+
-+	// Enable interrupts for a mcp23s08 on spi1.0.
-+	// Use default active low interrupt signalling.
-+	fragment@34 {
-+		target = <&mcp23s08_10>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+		};
-+	};
-+
-+	// Enable interrupts for a mcp23s08 on spi1.1.
-+	// Use default active low interrupt signalling.
-+	fragment@35 {
-+		target = <&mcp23s08_11>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+		};
-+	};
-+
-+	// Enable interrupts for a mcp23s08 on spi1.2.
-+	// Use default active low interrupt signalling.
-+	fragment@36 {
-+		target = <&mcp23s08_12>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+		};
-+	};
-+
-+	// Enable interrupts for a mcp23s08 on spi2.0.
-+	// Use default active low interrupt signalling.
-+	fragment@37 {
-+		target = <&mcp23s08_20>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+		};
-+	};
-+
-+	// Enable interrupts for a mcp23s08 on spi2.1.
-+	// Use default active low interrupt signalling.
-+	fragment@38 {
-+		target = <&mcp23s08_21>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+		};
-+	};
-+
-+	// Enable interrupts for a mcp23s08 on spi2.2.
-+	// Use default active low interrupt signalling.
-+	fragment@39 {
-+		target = <&mcp23s08_22>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+		};
-+	};
-+
-+	// Enable interrupts for a mcp23s17 on spi0.0.
-+	// Enable mirroring so that either INTA or INTB output of mcp23s17 can be connected to the GPIO pin.
-+	// Use default active low interrupt signalling.
-+	fragment@40 {
-+		target = <&mcp23s17_00>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			microchip,irq-mirror;
-+		};
-+	};
-+
-+	// Enable interrupts for a mcp23s17 on spi0.1.
-+	// Enable mirroring so that either INTA or INTB output of mcp23s17 can be connected to the GPIO pin.
-+	// Configure INTA/B outputs of mcp23s08/17 as active low.
-+	fragment@41 {
-+		target = <&mcp23s17_01>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			microchip,irq-mirror;
-+		};
-+	};
-+
-+	// Enable interrupts for a mcp23s17 on spi1.0.
-+	// Enable mirroring so that either INTA or INTB output of mcp23s17 can be connected to the GPIO pin.
-+	// Configure INTA/B outputs of mcp23s08/17 as active low.
-+	fragment@42 {
-+		target = <&mcp23s17_10>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			microchip,irq-mirror;
-+		};
-+	};
-+
-+	// Enable interrupts for a mcp23s17 on spi1.1.
-+	// Enable mirroring so that either INTA or INTB output of mcp23s17 can be connected to the GPIO pin.
-+	// Configure INTA/B outputs of mcp23s08/17 as active low.
-+	fragment@43 {
-+		target = <&mcp23s17_11>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			microchip,irq-mirror;
-+		};
-+	};
-+
-+	// Enable interrupts for a mcp23s17 on spi1.2.
-+	// Enable mirroring so that either INTA or INTB output of mcp23s17 can be connected to the GPIO pin.
-+	// Configure INTA/B outputs of mcp23s08/17 as active low.
-+	fragment@44 {
-+		target = <&mcp23s17_12>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			microchip,irq-mirror;
-+		};
-+	};
-+
-+	// Enable interrupts for a mcp23s17 on spi2.0.
-+	// Enable mirroring so that either INTA or INTB output of mcp23s17 can be connected to the GPIO pin.
-+	// Configure INTA/B outputs of mcp23s08/17 as active low.
-+	fragment@45 {
-+		target = <&mcp23s17_20>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			microchip,irq-mirror;
-+		};
-+	};
-+
-+	// Enable interrupts for a mcp23s17 on spi2.1.
-+	// Enable mirroring so that either INTA or INTB output of mcp23s17 can be connected to the GPIO pin.
-+	// Configure INTA/B outputs of mcp23s08/17 as active low.
-+	fragment@46 {
-+		target = <&mcp23s17_21>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			microchip,irq-mirror;
-+		};
-+	};
-+
-+	// Enable interrupts for a mcp23s17 on spi2.2.
-+	// Enable mirroring so that either INTA or INTB output of mcp23s17 can be connected to the GPIO pin.
-+	// Configure INTA/B outputs of mcp23s08/17 as active low.
-+	fragment@47 {
-+		target = <&mcp23s17_22>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			microchip,irq-mirror;
-+		};
-+	};
-+
-+	__overrides__ {
-+		s08-spi0-0-present = <0>,"+0+8",  <&mcp23s08_00>,"microchip,spi-present-mask:0";
-+		s08-spi0-1-present = <0>,"+1+9",  <&mcp23s08_01>,"microchip,spi-present-mask:0";
-+		s08-spi1-0-present = <0>,"+2+10", <&mcp23s08_10>,"microchip,spi-present-mask:0";
-+		s08-spi1-1-present = <0>,"+3+11", <&mcp23s08_11>,"microchip,spi-present-mask:0";
-+		s08-spi1-2-present = <0>,"+4+12", <&mcp23s08_12>,"microchip,spi-present-mask:0";
-+		s08-spi2-0-present = <0>,"+5+13", <&mcp23s08_20>,"microchip,spi-present-mask:0";
-+		s08-spi2-1-present = <0>,"+6+14", <&mcp23s08_21>,"microchip,spi-present-mask:0";
-+		s08-spi2-2-present = <0>,"+7+15", <&mcp23s08_22>,"microchip,spi-present-mask:0";
-+		s17-spi0-0-present = <0>,"+0+16", <&mcp23s17_00>,"microchip,spi-present-mask:0";
-+		s17-spi0-1-present = <0>,"+1+17", <&mcp23s17_01>,"microchip,spi-present-mask:0";
-+		s17-spi1-0-present = <0>,"+2+18", <&mcp23s17_10>,"microchip,spi-present-mask:0";
-+		s17-spi1-1-present = <0>,"+3+19", <&mcp23s17_11>,"microchip,spi-present-mask:0";
-+		s17-spi1-2-present = <0>,"+4+20", <&mcp23s17_12>,"microchip,spi-present-mask:0";
-+		s17-spi2-0-present = <0>,"+5+21", <&mcp23s17_20>,"microchip,spi-present-mask:0";
-+		s17-spi2-1-present = <0>,"+6+22", <&mcp23s17_21>,"microchip,spi-present-mask:0";
-+		s17-spi2-2-present = <0>,"+7+23", <&mcp23s17_22>,"microchip,spi-present-mask:0";
-+		s08-spi0-0-int-gpio = <0>,"+24+32", <&spi0_0_int_pins>,"brcm,pins:0", <&mcp23s08_00>,"interrupts:0";
-+		s08-spi0-1-int-gpio = <0>,"+25+33", <&spi0_1_int_pins>,"brcm,pins:0", <&mcp23s08_01>,"interrupts:0";
-+		s08-spi1-0-int-gpio = <0>,"+26+34", <&spi1_0_int_pins>,"brcm,pins:0", <&mcp23s08_10>,"interrupts:0";
-+		s08-spi1-1-int-gpio = <0>,"+27+35", <&spi1_1_int_pins>,"brcm,pins:0", <&mcp23s08_11>,"interrupts:0";
-+		s08-spi1-2-int-gpio = <0>,"+28+36", <&spi1_2_int_pins>,"brcm,pins:0", <&mcp23s08_12>,"interrupts:0";
-+		s08-spi2-0-int-gpio = <0>,"+29+37", <&spi2_0_int_pins>,"brcm,pins:0", <&mcp23s08_20>,"interrupts:0";
-+		s08-spi2-1-int-gpio = <0>,"+30+38", <&spi2_1_int_pins>,"brcm,pins:0", <&mcp23s08_21>,"interrupts:0";
-+		s08-spi2-2-int-gpio = <0>,"+31+39", <&spi2_2_int_pins>,"brcm,pins:0", <&mcp23s08_22>,"interrupts:0";
-+		s17-spi0-0-int-gpio = <0>,"+24+40", <&spi0_0_int_pins>,"brcm,pins:0", <&mcp23s17_00>,"interrupts:0";
-+		s17-spi0-1-int-gpio = <0>,"+25+41", <&spi0_1_int_pins>,"brcm,pins:0", <&mcp23s17_01>,"interrupts:0";
-+		s17-spi1-0-int-gpio = <0>,"+26+42", <&spi1_0_int_pins>,"brcm,pins:0", <&mcp23s17_10>,"interrupts:0";
-+		s17-spi1-1-int-gpio = <0>,"+27+43", <&spi1_1_int_pins>,"brcm,pins:0", <&mcp23s17_11>,"interrupts:0";
-+		s17-spi1-2-int-gpio = <0>,"+28+44", <&spi1_2_int_pins>,"brcm,pins:0", <&mcp23s17_12>,"interrupts:0";
-+		s17-spi2-0-int-gpio = <0>,"+29+45", <&spi2_0_int_pins>,"brcm,pins:0", <&mcp23s17_20>,"interrupts:0";
-+		s17-spi2-1-int-gpio = <0>,"+30+46", <&spi2_1_int_pins>,"brcm,pins:0", <&mcp23s17_21>,"interrupts:0";
-+		s17-spi2-2-int-gpio = <0>,"+31+47", <&spi2_2_int_pins>,"brcm,pins:0", <&mcp23s17_22>,"interrupts:0";
-+	};
-+};
-+
-diff --git a/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts b/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts
-new file mode 100755
-index 000000000000..46f143d809cc
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts
-@@ -0,0 +1,73 @@
-+/*
-+ * Device tree overlay for mcp251x/can0 on spi0.0
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+    compatible = "brcm,bcm2835";
-+    /* disable spi-dev for spi0.0 */
-+    fragment@0 {
-+        target = <&spi0>;
-+        __overlay__ {
-+            status = "okay";
-+        };
-+    };
-+
-+    fragment@1 {
-+	target = <&spidev0>;
-+	__overlay__ {
-+	    status = "disabled";
-+	};
-+    };
-+
-+    /* the interrupt pin of the can-controller */
-+    fragment@2 {
-+        target = <&gpio>;
-+        __overlay__ {
-+            can0_pins: can0_pins {
-+                brcm,pins = <25>;
-+                brcm,function = <0>; /* input */
-+            };
-+        };
-+    };
-+
-+    /* the clock/oscillator of the can-controller */
-+    fragment@3 {
-+        target-path = "/";
-+        __overlay__ {
-+            /* external oscillator of mcp2515 on SPI0.0 */
-+            can0_osc: can0_osc {
-+                compatible = "fixed-clock";
-+                #clock-cells = <0>;
-+                clock-frequency  = <16000000>;
-+            };
-+        };
-+    };
-+
-+    /* the spi config of the can-controller itself binding everything together */
-+    fragment@4 {
-+        target = <&spi0>;
-+        __overlay__ {
-+            /* needed to avoid dtc warning */
-+            #address-cells = <1>;
-+            #size-cells = <0>;
-+            can0: mcp2515@0 {
-+                reg = <0>;
-+                compatible = "microchip,mcp2515";
-+                pinctrl-names = "default";
-+                pinctrl-0 = <&can0_pins>;
-+                spi-max-frequency = <10000000>;
-+                interrupt-parent = <&gpio>;
-+                interrupts = <25 8>; /* IRQ_TYPE_LEVEL_LOW */
-+                clocks = <&can0_osc>;
-+            };
-+        };
-+    };
-+    __overrides__ {
-+        oscillator = <&can0_osc>,"clock-frequency:0";
-+        spimaxfrequency = <&can0>,"spi-max-frequency:0";
-+        interrupt = <&can0_pins>,"brcm,pins:0",<&can0>,"interrupts:0";
-+    };
-+};
-diff --git a/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts b/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts
-new file mode 100644
-index 000000000000..0a8dd576818e
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts
-@@ -0,0 +1,73 @@
-+/*
-+ * Device tree overlay for mcp251x/can1 on spi0.1 edited by petit_miner
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+    compatible = "brcm,bcm2835";
-+    /* disable spi-dev for spi0.1 */
-+    fragment@0 {
-+        target = <&spi0>;
-+        __overlay__ {
-+            status = "okay";
-+        };
-+    };
-+
-+    fragment@1 {
-+	target = <&spidev1>;
-+	__overlay__ {
-+	    status = "disabled";
-+	};
-+    };
-+
-+    /* the interrupt pin of the can-controller */
-+    fragment@2 {
-+        target = <&gpio>;
-+        __overlay__ {
-+            can1_pins: can1_pins {
-+                brcm,pins = <25>;
-+                brcm,function = <0>; /* input */
-+            };
-+        };
-+    };
-+
-+    /* the clock/oscillator of the can-controller */
-+    fragment@3 {
-+        target-path = "/";
-+        __overlay__ {
-+            /* external oscillator of mcp2515 on spi0.1 */
-+            can1_osc: can1_osc {
-+                compatible = "fixed-clock";
-+                #clock-cells = <0>;
-+                clock-frequency  = <16000000>;
-+            };
-+        };
-+    };
-+
-+    /* the spi config of the can-controller itself binding everything together */
-+    fragment@4 {
-+        target = <&spi0>;
-+        __overlay__ {
-+            /* needed to avoid dtc warning */
-+            #address-cells = <1>;
-+            #size-cells = <0>;
-+            can1: mcp2515@1 {
-+                reg = <1>;
-+                compatible = "microchip,mcp2515";
-+                pinctrl-names = "default";
-+                pinctrl-0 = <&can1_pins>;
-+                spi-max-frequency = <10000000>;
-+                interrupt-parent = <&gpio>;
-+                interrupts = <25 8>; /* IRQ_TYPE_LEVEL_LOW */
-+                clocks = <&can1_osc>;
-+            };
-+        };
-+    };
-+    __overrides__ {
-+        oscillator = <&can1_osc>,"clock-frequency:0";
-+        spimaxfrequency = <&can1>,"spi-max-frequency:0";
-+        interrupt = <&can1_pins>,"brcm,pins:0",<&can1>,"interrupts:0";
-+    };
-+};
-diff --git a/arch/arm/boot/dts/overlays/mcp2515-overlay.dts b/arch/arm/boot/dts/overlays/mcp2515-overlay.dts
-new file mode 100644
-index 000000000000..cda1fb0b1199
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/mcp2515-overlay.dts
-@@ -0,0 +1,156 @@
-+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/interrupt-controller/irq.h>
-+#include <dt-bindings/pinctrl/bcm2835.h>
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spidev0>;
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spidev1>;
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target-path = "spi1/spidev@0";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target-path = "spi1/spidev@1";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@4 {
-+		target-path = "spi1/spidev@2";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@5 {
-+		target-path = "spi2/spidev@0";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@6 {
-+		target-path = "spi2/spidev@1";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@7 {
-+		target-path = "spi2/spidev@2";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@8 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			mcp2515_pins: mcp2515_pins {
-+				brcm,pins = <25>;
-+				brcm,function = <BCM2835_FSEL_GPIO_IN>;
-+			};
-+		};
-+	};
-+
-+	fragment@9 {
-+		target-path = "/clocks";
-+		__overlay__ {
-+			clk_mcp2515_osc: mcp2515-osc {
-+				#clock-cells = <0>;
-+				compatible = "fixed-clock";
-+				clock-frequency = <16000000>;
-+			};
-+		};
-+	};
-+
-+	mcp2515_frag: fragment@10 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			mcp2515: mcp2515@0 {
-+				compatible = "microchip,mcp2515";
-+				reg = <0>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&mcp2515_pins>;
-+				spi-max-frequency = <10000000>;
-+				interrupt-parent = <&gpio>;
-+				interrupts = <25 IRQ_TYPE_LEVEL_LOW>;
-+				clocks = <&clk_mcp2515_osc>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		spi0-0 = <0>, "+0",
-+			<&mcp2515_frag>, "target:0=", <&spi0>,
-+			<&mcp2515>, "reg:0=0",
-+			<&mcp2515_pins>, "name=mcp2515_spi0_0_pins",
-+			<&clk_mcp2515_osc>, "name=mcp2515-spi0-0-osc";
-+		spi0-1 = <0>, "+1",
-+			<&mcp2515_frag>, "target:0=", <&spi0>,
-+			<&mcp2515>, "reg:0=1",
-+			<&mcp2515_pins>, "name=mcp2515_spi0_1_pins",
-+			<&clk_mcp2515_osc>, "name=mcp2515-spi0-1-osc";
-+		spi1-0 = <0>, "+2",
-+			<&mcp2515_frag>, "target:0=", <&spi1>,
-+			<&mcp2515>, "reg:0=0",
-+			<&mcp2515_pins>, "name=mcp2515_spi1_0_pins",
-+			<&clk_mcp2515_osc>, "name=mcp2515-spi1-0-osc";
-+		spi1-1 = <0>, "+3",
-+			<&mcp2515_frag>, "target:0=", <&spi1>,
-+			<&mcp2515>, "reg:0=1",
-+			<&mcp2515_pins>, "name=mcp2515_spi1_1_pins",
-+			<&clk_mcp2515_osc>, "name=mcp2515-spi1-1-osc";
-+		spi1-2 = <0>, "+4",
-+			<&mcp2515_frag>, "target:0=", <&spi1>,
-+			<&mcp2515>, "reg:0=2",
-+			<&mcp2515_pins>, "name=mcp2515_spi1_2_pins",
-+			<&clk_mcp2515_osc>, "name=mcp2515-spi1-2-osc";
-+		spi2-0 = <0>, "+5",
-+			<&mcp2515_frag>, "target:0=", <&spi2>,
-+			<&mcp2515>, "reg:0=0",
-+			<&mcp2515_pins>, "name=mcp2515_spi2_0_pins",
-+			<&clk_mcp2515_osc>, "name=mcp2515-spi2-0-osc";
-+		spi2-1 = <0>, "+6",
-+			<&mcp2515_frag>, "target:0=", <&spi2>,
-+			<&mcp2515>, "reg:0=1",
-+			<&mcp2515_pins>, "name=mcp2515_spi2_1_pins",
-+			<&clk_mcp2515_osc>, "name=mcp2515-spi2-1-osc";
-+		spi2-2 = <0>, "+7",
-+			<&mcp2515_frag>, "target:0=", <&spi2>,
-+			<&mcp2515>, "reg:0=2",
-+			<&mcp2515_pins>, "name=mcp2515_spi2_2_pins",
-+			<&clk_mcp2515_osc>, "name=mcp2515-spi2-2-osc";
-+		oscillator = <&clk_mcp2515_osc>, "clock-frequency:0";
-+		speed = <&mcp2515>, "spi-max-frequency:0";
-+		interrupt = <&mcp2515_pins>, "brcm,pins:0",
-+			<&mcp2515>, "interrupts:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/mcp251xfd-overlay.dts b/arch/arm/boot/dts/overlays/mcp251xfd-overlay.dts
-new file mode 100644
-index 000000000000..65c861bbd340
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/mcp251xfd-overlay.dts
-@@ -0,0 +1,226 @@
-+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/interrupt-controller/irq.h>
-+#include <dt-bindings/pinctrl/bcm2835.h>
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spidev0>;
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spidev1>;
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target-path = "spi1/spidev@0";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target-path = "spi1/spidev@1";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@4 {
-+		target-path = "spi1/spidev@2";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@5 {
-+		target-path = "spi2/spidev@0";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@6 {
-+		target-path = "spi2/spidev@1";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@7 {
-+		target-path = "spi2/spidev@2";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@8 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			mcp251xfd_pins: mcp251xfd_pins {
-+				brcm,pins = <25>;
-+				brcm,function = <BCM2835_FSEL_GPIO_IN>;
-+			};
-+		};
-+	};
-+
-+	fragment@9 {
-+		target-path = "/clocks";
-+		__overlay__ {
-+			clk_mcp251xfd_osc: mcp251xfd-osc {
-+				#clock-cells = <0>;
-+				compatible = "fixed-clock";
-+				clock-frequency = <40000000>;
-+			};
-+		};
-+	};
-+
-+	mcp251xfd_frag: fragment@10 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			mcp251xfd: mcp251xfd@0 {
-+				compatible = "microchip,mcp251xfd";
-+				reg = <0>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&mcp251xfd_pins>;
-+				spi-max-frequency = <20000000>;
-+				interrupt-parent = <&gpio>;
-+				interrupts = <25 IRQ_TYPE_LEVEL_LOW>;
-+				clocks = <&clk_mcp251xfd_osc>;
-+			};
-+		};
-+	};
-+
-+	fragment@11 {
-+		target = <&mcp251xfd>;
-+		mcp251xfd_rx_int_gpios: __dormant__ {
-+			microchip,rx-int-gpios = <&gpio 255 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+
-+	fragment@12 {
-+		target = <&gpio>;
-+		__dormant__ {
-+			mcp251xfd_xceiver_pins: mcp251xfd_xceiver_pins {
-+				brcm,pins = <255>;
-+				brcm,function = <BCM2835_FSEL_GPIO_OUT>;
-+			};
-+		};
-+	};
-+
-+	fragment@13 {
-+		target-path = "/";
-+		__dormant__ {
-+			reg_mcp251xfd_xceiver: reg_mcp251xfd_xceiver {
-+				compatible = "regulator-fixed";
-+				regulator-name = "mcp251xfd_xceiver";
-+				regulator-min-microvolt = <3300000>;
-+				regulator-max-microvolt = <3300000>;
-+				gpio = <&gpio 4 GPIO_ACTIVE_HIGH>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&mcp251xfd_xceiver_pins>;
-+			};
-+		};
-+	};
-+
-+	fragment@14 {
-+		target = <&mcp251xfd>;
-+		__dormant__ {
-+			xceiver-supply = <&reg_mcp251xfd_xceiver>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		spi0-0 = <0>, "+0",
-+			<&mcp251xfd_frag>, "target:0=", <&spi0>,
-+			<&mcp251xfd>, "reg:0=0",
-+			<&mcp251xfd_pins>, "name=mcp251xfd_spi0_0_pins",
-+			<&clk_mcp251xfd_osc>, "name=mcp251xfd-spi0-0-osc",
-+			<&mcp251xfd_xceiver_pins>, "name=mcp251xfd_spi0_0_xceiver_pins",
-+			<&reg_mcp251xfd_xceiver>, "name=reg-mcp251xfd-spi0-0-xceiver",
-+			<&reg_mcp251xfd_xceiver>, "regulator-name=mcp251xfd-spi0-0-xceiver";
-+		spi0-1 = <0>, "+1",
-+			<&mcp251xfd_frag>, "target:0=", <&spi0>,
-+			<&mcp251xfd>, "reg:0=1",
-+			<&mcp251xfd_pins>, "name=mcp251xfd_spi0_1_pins",
-+			<&clk_mcp251xfd_osc>, "name=mcp251xfd-spi0-1-osc",
-+			<&mcp251xfd_xceiver_pins>, "name=mcp251xfd_spi0_1_xceiver_pins",
-+			<&reg_mcp251xfd_xceiver>, "name=reg-mcp251xfd-spi0-1-xceiver",
-+			<&reg_mcp251xfd_xceiver>, "regulator-name=mcp251xfd-spi0-1-xceiver";
-+		spi1-0 = <0>, "+2",
-+			<&mcp251xfd_frag>, "target:0=", <&spi1>,
-+			<&mcp251xfd>, "reg:0=0",
-+			<&mcp251xfd_pins>, "name=mcp251xfd_spi1_0_pins",
-+			<&clk_mcp251xfd_osc>, "name=mcp251xfd-spi1-0-osc",
-+			<&mcp251xfd_xceiver_pins>, "name=mcp251xfd_spi1_0_xceiver_pins",
-+			<&reg_mcp251xfd_xceiver>, "name=reg-mcp251xfd-spi1-0-xceiver",
-+			<&reg_mcp251xfd_xceiver>, "regulator-name=mcp251xfd-spi1-0-xceiver";
-+		spi1-1 = <0>, "+3",
-+			<&mcp251xfd_frag>, "target:0=", <&spi1>,
-+			<&mcp251xfd>, "reg:0=1",
-+			<&mcp251xfd_pins>, "name=mcp251xfd_spi1_1_pins",
-+			<&clk_mcp251xfd_osc>, "name=mcp251xfd-spi1-1-osc",
-+			<&mcp251xfd_xceiver_pins>, "name=mcp251xfd_spi1_1_xceiver_pins",
-+			<&reg_mcp251xfd_xceiver>, "name=reg-mcp251xfd-spi1-1-xceiver",
-+			<&reg_mcp251xfd_xceiver>, "regulator-name=mcp251xfd-spi1-1-xceiver";
-+		spi1-2 = <0>, "+4",
-+			<&mcp251xfd_frag>, "target:0=", <&spi1>,
-+			<&mcp251xfd>, "reg:0=2",
-+			<&mcp251xfd_pins>, "name=mcp251xfd_spi1_2_pins",
-+			<&clk_mcp251xfd_osc>, "name=mcp251xfd-spi1-2-osc",
-+			<&mcp251xfd_xceiver_pins>, "name=mcp251xfd_spi1_2_xceiver_pins",
-+			<&reg_mcp251xfd_xceiver>, "name=reg-mcp251xfd-spi1-2-xceiver",
-+			<&reg_mcp251xfd_xceiver>, "regulator-name=mcp251xfd-spi1-2-xceiver";
-+		spi2-0 = <0>, "+5",
-+			<&mcp251xfd_frag>, "target:0=", <&spi2>,
-+			<&mcp251xfd>, "reg:0=0",
-+			<&mcp251xfd_pins>, "name=mcp251xfd_spi2_0_pins",
-+			<&clk_mcp251xfd_osc>, "name=mcp251xfd-spi2-0-osc",
-+			<&mcp251xfd_xceiver_pins>, "name=mcp251xfd_spi2_0_xceiver_pins",
-+			<&reg_mcp251xfd_xceiver>, "name=reg-mcp251xfd-spi2-0-xceiver",
-+			<&reg_mcp251xfd_xceiver>, "regulator-name=mcp251xfd-spi2-0-xceiver";
-+		spi2-1 = <0>, "+6",
-+			<&mcp251xfd_frag>, "target:0=", <&spi2>,
-+			<&mcp251xfd>, "reg:0=1",
-+			<&mcp251xfd_pins>, "name=mcp251xfd_spi2_1_pins",
-+			<&clk_mcp251xfd_osc>, "name=mcp251xfd-spi2-1-osc",
-+			<&mcp251xfd_xceiver_pins>, "name=mcp251xfd_spi2_1_xceiver_pins",
-+			<&reg_mcp251xfd_xceiver>, "name=reg-mcp251xfd-spi2-1-xceiver",
-+			<&reg_mcp251xfd_xceiver>, "regulator-name=mcp251xfd-spi2-1-xceiver";
-+		spi2-2 = <0>, "+7",
-+			<&mcp251xfd_frag>, "target:0=", <&spi2>,
-+			<&mcp251xfd>, "reg:0=2",
-+			<&mcp251xfd_pins>, "name=mcp251xfd_spi2_2_pins",
-+			<&clk_mcp251xfd_osc>, "name=mcp251xfd-spi2-2-osc",
-+			<&mcp251xfd_xceiver_pins>, "name=mcp251xfd_spi2_2_xceiver_pins",
-+			<&reg_mcp251xfd_xceiver>, "name=reg-mcp251xfd-spi2-2-xceiver",
-+			<&reg_mcp251xfd_xceiver>, "regulator-name=mcp251xfd-spi2-2-xceiver";
-+		oscillator = <&clk_mcp251xfd_osc>, "clock-frequency:0";
-+		speed = <&mcp251xfd>, "spi-max-frequency:0";
-+		interrupt = <&mcp251xfd_pins>, "brcm,pins:0",
-+			<&mcp251xfd>, "interrupts:0";
-+		rx_interrupt = <0>, "+11",
-+			<&mcp251xfd_pins>, "brcm,pins:4",
-+			<&mcp251xfd_rx_int_gpios>, "microchip,rx-int-gpios:4";
-+		xceiver_enable = <0>, "+12+13+14",
-+			<&mcp251xfd_xceiver_pins>, "brcm,pins:0",
-+			<&reg_mcp251xfd_xceiver>, "gpio:4";
-+		xceiver_active_high = <&reg_mcp251xfd_xceiver>, "enable-active-high?";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/mcp3008-overlay.dts b/arch/arm/boot/dts/overlays/mcp3008-overlay.dts
-new file mode 100755
-index 000000000000..957fdb9310af
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/mcp3008-overlay.dts
-@@ -0,0 +1,205 @@
-+/*
-+ * Device tree overlay for Microchip mcp3008 10-Bit A/D Converters
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spidev0>;
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spidev1>;
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target-path = "spi1/spidev@0";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target-path = "spi1/spidev@1";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@4 {
-+		target-path = "spi1/spidev@2";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@5 {
-+		target-path = "spi2/spidev@0";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@6 {
-+		target-path = "spi2/spidev@1";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@7 {
-+		target-path = "spi2/spidev@2";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@8 {
-+		target = <&spi0>;
-+		__dormant__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			mcp3008_00: mcp3008@0 {
-+				compatible = "microchip,mcp3008";
-+				reg = <0>;
-+				spi-max-frequency = <1600000>;
-+			};
-+		};
-+	};
-+
-+	fragment@9 {
-+		target = <&spi0>;
-+		__dormant__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			mcp3008_01: mcp3008@1 {
-+				compatible = "microchip,mcp3008";
-+				reg = <1>;
-+				spi-max-frequency = <1600000>;
-+			};
-+		};
-+	};
-+
-+	fragment@10 {
-+		target = <&spi1>;
-+		__dormant__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			mcp3008_10: mcp3008@0 {
-+				compatible = "microchip,mcp3008";
-+				reg = <0>;
-+				spi-max-frequency = <1600000>;
-+			};
-+		};
-+	};
-+
-+	fragment@11 {
-+		target = <&spi1>;
-+		__dormant__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			mcp3008_11: mcp3008@1 {
-+				compatible = "microchip,mcp3008";
-+				reg = <1>;
-+				spi-max-frequency = <1600000>;
-+			};
-+		};
-+	};
-+
-+	fragment@12 {
-+		target = <&spi1>;
-+		__dormant__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			mcp3008_12: mcp3008@2 {
-+				compatible = "microchip,mcp3008";
-+				reg = <2>;
-+				spi-max-frequency = <1600000>;
-+			};
-+		};
-+	};
-+
-+	fragment@13 {
-+		target = <&spi2>;
-+		__dormant__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			mcp3008_20: mcp3008@0 {
-+				compatible = "microchip,mcp3008";
-+				reg = <0>;
-+				spi-max-frequency = <1600000>;
-+			};
-+		};
-+	};
-+
-+	fragment@14 {
-+		target = <&spi2>;
-+		__dormant__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			mcp3008_21: mcp3008@1 {
-+				compatible = "microchip,mcp3008";
-+				reg = <1>;
-+				spi-max-frequency = <1600000>;
-+			};
-+		};
-+	};
-+
-+	fragment@15 {
-+		target = <&spi2>;
-+		__dormant__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			mcp3008_22: mcp3008@2 {
-+				compatible = "microchip,mcp3008";
-+				reg = <2>;
-+				spi-max-frequency = <1600000>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		spi0-0-present = <0>, "+0+8";
-+		spi0-1-present = <0>, "+1+9";
-+		spi1-0-present = <0>, "+2+10";
-+		spi1-1-present = <0>, "+3+11";
-+		spi1-2-present = <0>, "+4+12";
-+		spi2-0-present = <0>, "+5+13";
-+		spi2-1-present = <0>, "+6+14";
-+		spi2-2-present = <0>, "+7+15";
-+		spi0-0-speed = <&mcp3008_00>, "spi-max-frequency:0";
-+		spi0-1-speed = <&mcp3008_01>, "spi-max-frequency:0";
-+		spi1-0-speed = <&mcp3008_10>, "spi-max-frequency:0";
-+		spi1-1-speed = <&mcp3008_11>, "spi-max-frequency:0";
-+		spi1-2-speed = <&mcp3008_12>, "spi-max-frequency:0";
-+		spi2-0-speed = <&mcp3008_20>, "spi-max-frequency:0";
-+		spi2-1-speed = <&mcp3008_21>, "spi-max-frequency:0";
-+		spi2-2-speed = <&mcp3008_22>, "spi-max-frequency:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/mcp3202-overlay.dts b/arch/arm/boot/dts/overlays/mcp3202-overlay.dts
-new file mode 100755
-index 000000000000..8e4e9f60f285
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/mcp3202-overlay.dts
-@@ -0,0 +1,205 @@
-+/*
-+ * Device tree overlay for Microchip mcp3202 12-Bit A/D Converters
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spidev0>;
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spidev1>;
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target-path = "spi1/spidev@0";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target-path = "spi1/spidev@1";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@4 {
-+		target-path = "spi1/spidev@2";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@5 {
-+		target-path = "spi2/spidev@0";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@6 {
-+		target-path = "spi2/spidev@1";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@7 {
-+		target-path = "spi2/spidev@2";
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@8 {
-+		target = <&spi0>;
-+		__dormant__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			mcp3202_00: mcp3202@0 {
-+				compatible = "mcp3202";
-+				reg = <0>;
-+				spi-max-frequency = <1600000>;
-+			};
-+		};
-+	};
-+
-+	fragment@9 {
-+		target = <&spi0>;
-+		__dormant__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			mcp3202_01: mcp3202@1 {
-+				compatible = "mcp3202";
-+				reg = <1>;
-+				spi-max-frequency = <1600000>;
-+			};
-+		};
-+	};
-+
-+	fragment@10 {
-+		target = <&spi1>;
-+		__dormant__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			mcp3202_10: mcp3202@0 {
-+				compatible = "mcp3202";
-+				reg = <0>;
-+				spi-max-frequency = <1600000>;
-+			};
-+		};
-+	};
-+
-+	fragment@11 {
-+		target = <&spi1>;
-+		__dormant__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			mcp3202_11: mcp3202@1 {
-+				compatible = "mcp3202";
-+				reg = <1>;
-+				spi-max-frequency = <1600000>;
-+			};
-+		};
-+	};
-+
-+	fragment@12 {
-+		target = <&spi1>;
-+		__dormant__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			mcp3202_12: mcp3202@2 {
-+				compatible = "mcp3202";
-+				reg = <2>;
-+				spi-max-frequency = <1600000>;
-+			};
-+		};
-+	};
-+
-+	fragment@13 {
-+		target = <&spi2>;
-+		__dormant__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			mcp3202_20: mcp3202@0 {
-+				compatible = "mcp3202";
-+				reg = <0>;
-+				spi-max-frequency = <1600000>;
-+			};
-+		};
-+	};
-+
-+	fragment@14 {
-+		target = <&spi2>;
-+		__dormant__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			mcp3202_21: mcp3202@1 {
-+				compatible = "mcp3202";
-+				reg = <1>;
-+				spi-max-frequency = <1600000>;
-+			};
-+		};
-+	};
-+
-+	fragment@15 {
-+		target = <&spi2>;
-+		__dormant__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			mcp3202_22: mcp3202@2 {
-+				compatible = "mcp3202";
-+				reg = <2>;
-+				spi-max-frequency = <1600000>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		spi0-0-present = <0>, "+0+8";
-+		spi0-1-present = <0>, "+1+9";
-+		spi1-0-present = <0>, "+2+10";
-+		spi1-1-present = <0>, "+3+11";
-+		spi1-2-present = <0>, "+4+12";
-+		spi2-0-present = <0>, "+5+13";
-+		spi2-1-present = <0>, "+6+14";
-+		spi2-2-present = <0>, "+7+15";
-+		spi0-0-speed = <&mcp3202_00>, "spi-max-frequency:0";
-+		spi0-1-speed = <&mcp3202_01>, "spi-max-frequency:0";
-+		spi1-0-speed = <&mcp3202_10>, "spi-max-frequency:0";
-+		spi1-1-speed = <&mcp3202_11>, "spi-max-frequency:0";
-+		spi1-2-speed = <&mcp3202_12>, "spi-max-frequency:0";
-+		spi2-0-speed = <&mcp3202_20>, "spi-max-frequency:0";
-+		spi2-1-speed = <&mcp3202_21>, "spi-max-frequency:0";
-+		spi2-2-speed = <&mcp3202_22>, "spi-max-frequency:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/mcp342x-overlay.dts b/arch/arm/boot/dts/overlays/mcp342x-overlay.dts
-new file mode 100644
-index 000000000000..714eca5a4b5e
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/mcp342x-overlay.dts
-@@ -0,0 +1,164 @@
-+// Overlay for MCP3421-8 ADCs from Microchip Semiconductor
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			status = "okay";
-+
-+			mcp3421: mcp@68 {
-+				reg = <0x68>;
-+				compatible = "microchip,mcp3421";
-+
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			status = "okay";
-+
-+			mcp3422: mcp@68 {
-+				reg = <0x68>;
-+				compatible = "microchip,mcp3422";
-+
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			status = "okay";
-+
-+			mcp3423: mcp@68 {
-+				reg = <0x68>;
-+				compatible = "microchip,mcp3423";
-+
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			status = "okay";
-+
-+			mcp3424: mcp@68 {
-+				reg = <0x68>;
-+				compatible = "microchip,mcp3424";
-+
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			status = "okay";
-+
-+			mcp3425: mcp@68 {
-+				reg = <0x68>;
-+				compatible = "microchip,mcp3425","mcp3425";
-+
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@5 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			status = "okay";
-+
-+			mcp3426: mcp@68 {
-+				reg = <0x68>;
-+				compatible = "microchip,mcp3426";
-+
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@6 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			status = "okay";
-+
-+			mcp3427: mcp@68 {
-+				reg = <0x68>;
-+				compatible = "microchip,mcp3427";
-+
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@7 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			status = "okay";
-+
-+			mcp3428: mcp@68 {
-+				reg = <0x68>;
-+				compatible = "microchip,mcp3428";
-+
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		addr = <&mcp3421>,"reg:0",
-+		       <&mcp3422>,"reg:0",
-+		       <&mcp3423>,"reg:0",
-+		       <&mcp3424>,"reg:0",
-+		       <&mcp3425>,"reg:0",
-+		       <&mcp3426>,"reg:0",
-+		       <&mcp3427>,"reg:0",
-+		       <&mcp3428>,"reg:0";
-+		mcp3421 = <0>,"=0";
-+		mcp3422 = <0>,"=1";
-+		mcp3423 = <0>,"=2";
-+		mcp3424 = <0>,"=3";
-+		mcp3425 = <0>,"=4";
-+		mcp3426 = <0>,"=5";
-+		mcp3427 = <0>,"=6";
-+		mcp3428 = <0>,"=7";
-+	};
-+};
-+
-diff --git a/arch/arm/boot/dts/overlays/media-center-overlay.dts b/arch/arm/boot/dts/overlays/media-center-overlay.dts
-new file mode 100644
-index 000000000000..9fab935d89d3
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/media-center-overlay.dts
-@@ -0,0 +1,134 @@
-+/*
-+ * Device Tree overlay for Media Center HAT by Pi Supply
-+ *
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spidev1>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			rpi_display_pins: rpi_display_pins {
-+				brcm,pins = <12 23 24 25>;
-+				brcm,function = <1 1 1 0>; /* out out out in */
-+				brcm,pull = <0 0 0 2>; /* - - - up */
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			rpidisplay: rpi-display@0{
-+				compatible = "ilitek,ili9341";
-+				reg = <0>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&rpi_display_pins>;
-+
-+				spi-max-frequency = <32000000>;
-+				rotate = <90>;
-+				bgr;
-+				fps = <30>;
-+				buswidth = <8>;
-+				reset-gpios = <&gpio 23 1>;
-+				dc-gpios = <&gpio 24 0>;
-+				led-gpios = <&gpio 12 0>;
-+				debug = <0>;
-+			};
-+
-+			rpidisplay_ts: rpi-display-ts@1 {
-+				compatible = "ti,ads7846";
-+				reg = <1>;
-+
-+				spi-max-frequency = <2000000>;
-+				interrupts = <25 2>; /* high-to-low edge triggered */
-+				interrupt-parent = <&gpio>;
-+				pendown-gpio = <&gpio 25 1>;
-+				ti,x-plate-ohms = /bits/ 16 <60>;
-+				ti,pressure-max = /bits/ 16 <255>;
-+			};
-+		};
-+	};
-+
-+	fragment@4 {
-+		target-path = "/";
-+		__overlay__ {
-+			lirc_rpi: lirc_rpi {
-+				compatible = "rpi,lirc-rpi";
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&lirc_pins>;
-+				status = "okay";
-+
-+				// Override autodetection of IR receiver circuit
-+				// (0 = active high, 1 = active low, -1 = no override )
-+				rpi,sense = <0xffffffff>;
-+
-+				// Software carrier
-+				// (0 = off, 1 = on)
-+				rpi,softcarrier = <1>;
-+
-+				// Invert output
-+				// (0 = off, 1 = on)
-+				rpi,invert = <0>;
-+
-+				// Enable debugging messages
-+				// (0 = off, 1 = on)
-+				rpi,debug = <0>;
-+			};
-+		};
-+	};
-+
-+	fragment@5 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			lirc_pins: lirc_pins {
-+				brcm,pins = <6 5>;
-+				brcm,function = <1 0>; // out in
-+				brcm,pull = <0 1>; // off down
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		speed =     <&rpidisplay>,"spi-max-frequency:0";
-+		rotate =    <&rpidisplay>,"rotate:0";
-+		fps =       <&rpidisplay>,"fps:0";
-+		debug =     <&rpidisplay>,"debug:0", 
-+		            <&lirc_rpi>,"rpi,debug:0";
-+		xohms =     <&rpidisplay_ts>,"ti,x-plate-ohms;0";
-+		swapxy =    <&rpidisplay_ts>,"ti,swap-xy?";
-+		backlight = <&rpidisplay>,"led-gpios:4",
-+		            <&rpi_display_pins>,"brcm,pins:0";
-+
-+		gpio_out_pin =  <&lirc_pins>,"brcm,pins:0";
-+		gpio_in_pin =   <&lirc_pins>,"brcm,pins:4";
-+		gpio_in_pull =  <&lirc_pins>,"brcm,pull:4";
-+
-+		sense =         <&lirc_rpi>,"rpi,sense:0";
-+		softcarrier =   <&lirc_rpi>,"rpi,softcarrier:0";
-+		invert =        <&lirc_rpi>,"rpi,invert:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/merus-amp-overlay.dts b/arch/arm/boot/dts/overlays/merus-amp-overlay.dts
-new file mode 100644
-index 000000000000..ec5c7c28f728
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/merus-amp-overlay.dts
-@@ -0,0 +1,59 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+// Definitions for Infineon Merus-Amp
-+/dts-v1/;
-+/plugin/;
-+#include <dt-bindings/pinctrl/bcm2835.h>
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			merus_amp_pins: merus_amp_pins {
-+				brcm,pins = <23 8>;
-+				brcm,function = <0 0>;
-+				brcm,pull = <2 0>;
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			merus_amp: ma120x0p@20 {
-+				#sound-dai-cells = <0>;
-+				compatible = "ma,ma120x0p";
-+				reg = <0x20>;
-+				status = "okay";
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&merus_amp_pins>;
-+				enable_gp-gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
-+				mute_gp-gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
-+				booster_gp-gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
-+				error_gp-gpios = <&gpio 23 GPIO_ACTIVE_HIGH>;
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "merus,merus-amp";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/midi-uart0-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart0-overlay.dts
-new file mode 100644
-index 000000000000..f7e44d29e101
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/midi-uart0-overlay.dts
-@@ -0,0 +1,36 @@
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/clock/bcm2835.h>
-+
-+/*
-+ * Fake a higher clock rate to get a larger divisor, and thereby a lower
-+ * baudrate. The real clock is 48MHz, which we scale so that requesting
-+ * 38.4kHz results in an actual 31.25kHz.
-+ *
-+ *   48000000*38400/31250 = 58982400
-+ */
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target-path = "/";
-+		__overlay__ {
-+			midi_clk: midi_clk {
-+				compatible = "fixed-clock";
-+				#clock-cells = <0>;
-+				clock-output-names = "uart0_pclk";
-+				clock-frequency = <58982400>;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&uart0>;
-+		__overlay__ {
-+			clocks = <&midi_clk>,
-+			         <&clocks BCM2835_CLOCK_VPU>;
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/midi-uart1-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart1-overlay.dts
-new file mode 100644
-index 000000000000..e0bc410acbff
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/midi-uart1-overlay.dts
-@@ -0,0 +1,43 @@
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/clock/bcm2835-aux.h>
-+
-+/*
-+ * Fake a higher clock rate to get a larger divisor, and thereby a lower
-+ * baudrate. The real clock is 48MHz, which we scale so that requesting
-+ * 38.4kHz results in an actual 31.25kHz.
-+ *
-+ *   48000000*38400/31250 = 58982400
-+ */
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target-path = "/clocks";
-+		__overlay__ {
-+			midi_clk: clock@5 {
-+				compatible = "fixed-factor-clock";
-+				#clock-cells = <0>;
-+				clocks = <&aux BCM2835_AUX_CLOCK_UART>;
-+				clock-mult = <38400>;
-+				clock-div  = <31250>;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&uart1>;
-+		__overlay__ {
-+			clocks = <&midi_clk>;
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&aux>;
-+		__overlay__ {
-+			clock-output-names = "aux_uart", "aux_spi1", "aux_spi2";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/midi-uart2-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart2-overlay.dts
-new file mode 100644
-index 000000000000..66f3092e9a74
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/midi-uart2-overlay.dts
-@@ -0,0 +1,37 @@
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/clock/bcm2835.h>
-+
-+/*
-+ * Fake a higher clock rate to get a larger divisor, and thereby a lower
-+ * baudrate. The real clock is 48MHz, which we scale so that requesting
-+ * 38.4kHz results in an actual 31.25kHz.
-+ *
-+ *   48000000*38400/31250 = 58982400
-+ */
-+
-+/{
-+        compatible = "brcm,bcm2835";
-+
-+        fragment@0 {
-+                target-path = "/";
-+                __overlay__ {
-+                        midi_clk: midi_clk2 {
-+                                compatible = "fixed-clock";
-+                                #clock-cells = <0>;
-+                                clock-output-names = "uart2_pclk";
-+                                clock-frequency = <58982400>;
-+                        };
-+                };
-+        };
-+
-+        fragment@1 {
-+                target = <&uart2>;
-+                __overlay__ {
-+                        clocks = <&midi_clk>,
-+                                 <&clocks BCM2835_CLOCK_VPU>;
-+                };
-+        };
-+};
-+
-diff --git a/arch/arm/boot/dts/overlays/midi-uart3-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart3-overlay.dts
-new file mode 100644
-index 000000000000..55c6cb94f963
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/midi-uart3-overlay.dts
-@@ -0,0 +1,38 @@
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/clock/bcm2835.h>
-+
-+/*
-+ * Fake a higher clock rate to get a larger divisor, and thereby a lower
-+ * baudrate. The real clock is 48MHz, which we scale so that requesting
-+ * 38.4kHz results in an actual 31.25kHz.
-+ *
-+ *   48000000*38400/31250 = 58982400
-+ */
-+
-+/{
-+        compatible = "brcm,bcm2835";
-+
-+        fragment@0 {
-+                target-path = "/";
-+                __overlay__ {
-+                        midi_clk: midi_clk3 {
-+                                compatible = "fixed-clock";
-+                                #clock-cells = <0>;
-+                                clock-output-names = "uart3_pclk";
-+                                clock-frequency = <58982400>;
-+                        };
-+                };
-+        };
-+
-+        fragment@1 {
-+                target = <&uart3>;
-+                __overlay__ {
-+                        clocks = <&midi_clk>,
-+                                 <&clocks BCM2835_CLOCK_VPU>;
-+                };
-+        };
-+};
-+
-+
-diff --git a/arch/arm/boot/dts/overlays/midi-uart4-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart4-overlay.dts
-new file mode 100644
-index 000000000000..5819df1a6b2e
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/midi-uart4-overlay.dts
-@@ -0,0 +1,38 @@
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/clock/bcm2835.h>
-+
-+/*
-+ * Fake a higher clock rate to get a larger divisor, and thereby a lower
-+ * baudrate. The real clock is 48MHz, which we scale so that requesting
-+ * 38.4kHz results in an actual 31.25kHz.
-+ *
-+ *   48000000*38400/31250 = 58982400
-+ */
-+
-+/{
-+        compatible = "brcm,bcm2835";
-+
-+        fragment@0 {
-+                target-path = "/";
-+                __overlay__ {
-+                        midi_clk: midi_clk4 {
-+                                compatible = "fixed-clock";
-+                                #clock-cells = <0>;
-+                                clock-output-names = "uart4_pclk";
-+                                clock-frequency = <58982400>;
-+                        };
-+                };
-+        };
-+
-+        fragment@1 {
-+                target = <&uart4>;
-+                __overlay__ {
-+                        clocks = <&midi_clk>,
-+                                 <&clocks BCM2835_CLOCK_VPU>;
-+                };
-+        };
-+};
-+
-+
-diff --git a/arch/arm/boot/dts/overlays/midi-uart5-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart5-overlay.dts
-new file mode 100644
-index 000000000000..a1d37f7103ff
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/midi-uart5-overlay.dts
-@@ -0,0 +1,38 @@
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/clock/bcm2835.h>
-+
-+/*
-+ * Fake a higher clock rate to get a larger divisor, and thereby a lower
-+ * baudrate. The real clock is 48MHz, which we scale so that requesting
-+ * 38.4kHz results in an actual 31.25kHz.
-+ *
-+ *   48000000*38400/31250 = 58982400
-+ */
-+
-+/{
-+        compatible = "brcm,bcm2835";
-+
-+        fragment@0 {
-+                target-path = "/";
-+                __overlay__ {
-+                        midi_clk: midi_clk5 {
-+                                compatible = "fixed-clock";
-+                                #clock-cells = <0>;
-+                                clock-output-names = "uart5_pclk";
-+                                clock-frequency = <58982400>;
-+                        };
-+                };
-+        };
-+
-+        fragment@1 {
-+                target = <&uart5>;
-+                __overlay__ {
-+                        clocks = <&midi_clk>,
-+                                 <&clocks BCM2835_CLOCK_VPU>;
-+                };
-+        };
-+};
-+
-+
-diff --git a/arch/arm/boot/dts/overlays/minipitft13-overlay.dts b/arch/arm/boot/dts/overlays/minipitft13-overlay.dts
-new file mode 100644
-index 000000000000..5e0941e8ba54
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/minipitft13-overlay.dts
-@@ -0,0 +1,70 @@
-+/*
-+ * Device Tree overlay for Adafruit Mini PiTFT 1.3" and 1.5" 240x240 Display
-+ *
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+        compatible = "brcm,bcm2835";
-+
-+        fragment@0 {
-+                target = <&spidev0>;
-+                __overlay__ {
-+                        status = "disabled";
-+                };
-+        };
-+
-+        fragment@1 {
-+                target = <&spidev1>;
-+                __overlay__ {
-+                        status = "disabled";
-+                };
-+        };
-+
-+        fragment@2 {
-+                target = <&gpio>;
-+                __overlay__ {
-+                        pitft_pins: pitft_pins {
-+                                brcm,pins = <25>;
-+                                brcm,function = <1>; /* out */
-+                                brcm,pull = <0>; /* none */
-+                        };
-+                };
-+        };
-+
-+        fragment@3 {
-+                target = <&spi0>;
-+                __overlay__ {
-+                        /* needed to avoid dtc warning */
-+                        #address-cells = <1>;
-+                        #size-cells = <0>;
-+                        status = "okay";
-+
-+                        pitft: pitft@0 {
-+                                compatible = "fbtft,minipitft13";
-+                                reg = <0>;
-+                                pinctrl-names = "default";
-+                                pinctrl-0 = <&pitft_pins>;
-+                                spi-max-frequency = <32000000>;
-+                                rotate = <0>;
-+                                width = <240>;
-+                                height = <240>;
-+                                buswidth = <8>;
-+                                dc-gpios = <&gpio 25 0>;
-+                                led-gpios = <&gpio 26 0>;
-+                                debug = <0>;
-+                        };
-+                };
-+        };
-+
-+        __overrides__ {
-+                speed =   <&pitft>,"spi-max-frequency:0";
-+                rotate =  <&pitft>,"rotate:0";
-+                width =   <&pitft>,"width:0";
-+                height =  <&pitft>,"height:0";
-+                fps =     <&pitft>,"fps:0";
-+                debug =   <&pitft>,"debug:0";
-+        };
-+};
-diff --git a/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts b/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts
-new file mode 100644
-index 000000000000..da49f14a0940
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts
-@@ -0,0 +1,93 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/* Switch Pi3 Bluetooth function to use the mini-UART (ttyS0) and restore
-+   UART0/ttyAMA0 over GPIOs 14 & 15. Note that this may reduce the maximum
-+   usable baudrate.
-+
-+   It is also necessary to edit /lib/systemd/system/hciuart.service and
-+   replace ttyAMA0 with ttyS0, unless you have a system with udev rules
-+   that create /dev/serial0 and /dev/serial1, in which case use /dev/serial1
-+   instead because it will always be correct.
-+
-+   If cmdline.txt uses the alias serial0 to refer to the user-accessable port
-+   then the firmware will replace with the appropriate port whether or not
-+   this overlay is used.
-+*/
-+
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&uart0>;
-+		__overlay__ {
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&uart0_pins>;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&bt>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&uart1>;
-+		__overlay__ {
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&uart1_pins &bt_pins &fake_bt_cts>;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&uart0_pins>;
-+		__overlay__ {
-+			brcm,pins;
-+			brcm,function;
-+			brcm,pull;
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&uart1_pins>;
-+		__overlay__ {
-+			brcm,pins = <32 33>;
-+			brcm,function = <2>; /* alt5=UART1 */
-+			brcm,pull = <0 2>;
-+		};
-+	};
-+
-+	fragment@5 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			fake_bt_cts: fake_bt_cts {
-+				brcm,pins = <31>;
-+				brcm,function = <1>; /* output */
-+			};
-+		};
-+	};
-+
-+	fragment@6 {
-+		target-path = "/aliases";
-+		__overlay__ {
-+			serial0 = "/soc/serial@7e201000";
-+			serial1 = "/soc/serial@7e215040";
-+		};
-+	};
-+
-+	fragment@7 {
-+		target = <&minibt>;
-+		minibt_frag: __overlay__ {
-+		};
-+	};
-+
-+	__overrides__ {
-+		krnbt = <&minibt_frag>,"status";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/mipi-dbi-spi-overlay.dts b/arch/arm/boot/dts/overlays/mipi-dbi-spi-overlay.dts
-new file mode 100644
-index 000000000000..9b9c654402c6
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/mipi-dbi-spi-overlay.dts
-@@ -0,0 +1,175 @@
-+/*
-+ * mipi-dbi-spi-overlay.dts
-+ */
-+
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	spidev_fragment: fragment@0 {
-+		target-path = "spi0/spidev@0";
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	panel_fragment: fragment@1 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			status = "okay";
-+
-+			panel: panel@0 {
-+				compatible = "panel", "panel-mipi-dbi-spi";
-+				reg = <0>;
-+				spi-max-frequency = <32000000>;
-+
-+				width-mm = <0>;
-+				height-mm = <0>;
-+
-+				timing: panel-timing {
-+					hactive = <320>;
-+					vactive = <240>;
-+					hback-porch = <0>;
-+					vback-porch = <0>;
-+
-+					clock-frequency = <0>;
-+					hfront-porch = <0>;
-+					hsync-len = <0>;
-+					vfront-porch = <0>;
-+					vsync-len = <0>;
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@10 {
-+		target = <&panel>;
-+		__dormant__  {
-+			backlight = <&backlight_gpio>;
-+		};
-+	};
-+
-+	fragment@11 {
-+		target-path = "/";
-+		__dormant__  {
-+			backlight_gpio: backlight_gpio {
-+				compatible = "gpio-backlight";
-+				gpios = <&gpio 255 GPIO_ACTIVE_HIGH>;
-+			};
-+		};
-+	};
-+
-+	fragment@20 {
-+		target = <&panel>;
-+		__dormant__  {
-+			backlight = <&backlight_pwm>;
-+		};
-+	};
-+
-+	fragment@21 {
-+		target-path = "/";
-+		__dormant__  {
-+			backlight_pwm: backlight_pwm {
-+				compatible = "pwm-backlight";
-+				brightness-levels = <0 6 8 12 16 24 32 40 48 64 96 128 160 192 224 255>;
-+				default-brightness-level = <16>;
-+				pwms = <&pwm 0 200000>;
-+			};
-+		};
-+	};
-+
-+	fragment@22 {
-+		target = <&pwm>;
-+		__dormant__ {
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&pwm_pins>;
-+			assigned-clock-rates = <1000000>;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@23 {
-+		target = <&gpio>;
-+		__dormant__ {
-+			pwm_pins: pwm_pins {
-+				brcm,pins = <18>;
-+				brcm,function = <2>; /* Alt5 */
-+			};
-+		};
-+	};
-+
-+	fragment@24 {
-+		target = <&chosen>;
-+		__dormant__  {
-+			bootargs = "snd_bcm2835.enable_headphones=0";
-+		};
-+	};
-+
-+	__overrides__ {
-+		compatible    = <&panel>, "compatible";
-+
-+		spi0-0        = <&panel_fragment>, "target:0=",<&spi0>,
-+				<&spidev_fragment>, "target-path=spi0/spidev@0",
-+				<&panel>, "reg:0=0";
-+		spi0-1        = <&panel_fragment>, "target:0=",<&spi0>,
-+				<&spidev_fragment>, "target-path=spi0/spidev@1",
-+				<&panel>, "reg:0=1";
-+		spi1-0        = <&panel_fragment>, "target:0=",<&spi1>,
-+				<&spidev_fragment>, "target-path=spi1/spidev@0",
-+				<&panel>, "reg:0=0";
-+		spi1-1        = <&panel_fragment>, "target:0=",<&spi1>,
-+				<&spidev_fragment>, "target-path=spi1/spidev@1",
-+				<&panel>, "reg:0=1";
-+		spi1-2        = <&panel_fragment>, "target:0=",<&spi1>,
-+				<&spidev_fragment>, "target-path=spi1/spidev@2",
-+				<&panel>, "reg:0=2";
-+		spi2-0        = <&panel_fragment>, "target:0=",<&spi2>,
-+				<&spidev_fragment>, "target-path=spi2/spidev@0",
-+				<&panel>, "reg:0=0";
-+		spi2-1        = <&panel_fragment>, "target:0=",<&spi2>,
-+				<&spidev_fragment>, "target-path=spi2/spidev@1",
-+				<&panel>, "reg:0=1";
-+		spi2-2        = <&panel_fragment>, "target:0=",<&spi2>,
-+				<&spidev_fragment>, "target-path=spi2/spidev@2",
-+				<&panel>, "reg:0=2";
-+
-+		speed         = <&panel>, "spi-max-frequency:0";
-+		cpha          = <&panel>, "spi-cpha?";
-+		cpol          = <&panel>, "spi-cpol?";
-+
-+		write-only    = <&panel>, "write-only?";
-+
-+		width         = <&timing>, "hactive:0";
-+		height        = <&timing>, "vactive:0";
-+		x-offset      = <&timing>, "hback-porch:0";
-+		y-offset      = <&timing>, "vback-porch:0";
-+		clock-frequency = <&timing>, "clock-frequency:0";
-+
-+		width-mm      = <&panel>, "width-mm:0";
-+		height-mm     = <&panel>, "height-mm:0";
-+
-+		/* optional gpios */
-+		reset-gpio    = <&panel>, "reset-gpios:0=", <&gpio>,
-+				<&panel>, "reset-gpios:4",
-+				<&panel>, "reset-gpios:8=0"; /* GPIO_ACTIVE_HIGH */
-+		dc-gpio       = <&panel>, "dc-gpios:0=", <&gpio>,
-+				<&panel>, "dc-gpios:4",
-+				<&panel>, "dc-gpios:8=0"; /* GPIO_ACTIVE_HIGH */
-+
-+		backlight-gpio        = <0>, "+10+11",
-+					<&backlight_gpio>, "gpios:4";
-+		backlight-pwm         = <0>, "+20+21+22+23+24";
-+		backlight-pwm-chan    = <&backlight_pwm>, "pwms:4";
-+		backlight-pwm-gpio    = <&pwm_pins>, "brcm,pins:0";
-+		backlight-pwm-func    = <&pwm_pins>, "brcm,function:0";
-+		backlight-def-brightness = <&backlight_pwm>, "default-brightness-level:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/mlx90640-overlay.dts b/arch/arm/boot/dts/overlays/mlx90640-overlay.dts
-new file mode 100644
-index 000000000000..a2655ed82585
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/mlx90640-overlay.dts
-@@ -0,0 +1,22 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2c_arm>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+			clock-frequency = <400000>;
-+
-+			mlx90640: mlx90640@33 {
-+				compatible = "melexis,mlx90640";
-+				reg = <0x33>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/mmc-overlay.dts b/arch/arm/boot/dts/overlays/mmc-overlay.dts
-new file mode 100644
-index 000000000000..c1a2f691aa1e
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/mmc-overlay.dts
-@@ -0,0 +1,46 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&mmc>;
-+		frag0: __overlay__ {
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&mmc_pins>;
-+			bus-width = <4>;
-+			brcm,overclock-50 = <0>;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			mmc_pins: mmc_pins {
-+				brcm,pins = <48 49 50 51 52 53>;
-+				brcm,function = <7>; /* alt3 */
-+				brcm,pull = <0 2 2 2 2 2>;
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sdhost>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&mmcnr>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	__overrides__ {
-+		overclock_50     = <&frag0>,"brcm,overclock-50:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/mpu6050-overlay.dts b/arch/arm/boot/dts/overlays/mpu6050-overlay.dts
-new file mode 100644
-index 000000000000..1b4c06535687
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/mpu6050-overlay.dts
-@@ -0,0 +1,29 @@
-+// Definitions for MPU6050
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+        compatible = "brcm,bcm2835";
-+
-+        fragment@0 {
-+                target = <&i2c1>;
-+                __overlay__ {
-+                        #address-cells = <1>;
-+                        #size-cells = <0>;
-+                        status = "okay";
-+                        clock-frequency = <400000>;
-+
-+                        mpu6050: mpu6050@68 {
-+                                compatible = "invensense,mpu6050";
-+                                reg = <0x68>;
-+                                interrupt-parent = <&gpio>;
-+                                interrupts = <4 1>;
-+                        };
-+                };
-+        };
-+
-+        __overrides__ {
-+                interrupt = <&mpu6050>,"interrupts:0";
-+                addr = <&mpu6050>,"reg:0";
-+        };
-+};
-diff --git a/arch/arm/boot/dts/overlays/mz61581-overlay.dts b/arch/arm/boot/dts/overlays/mz61581-overlay.dts
-new file mode 100644
-index 000000000000..6e00e8b2ddf2
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/mz61581-overlay.dts
-@@ -0,0 +1,117 @@
-+/*
-+ * Device Tree overlay for MZ61581-PI-EXT 2014.12.28 by Tontec
-+ *
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&spidev1>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			mz61581_pins: mz61581_pins {
-+				brcm,pins = <4 15 18 25>;
-+				brcm,function = <0 1 1 1>; /* in out out out */
-+			};
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			mz61581: mz61581@0{
-+				compatible = "samsung,s6d02a1";
-+				reg = <0>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&mz61581_pins>;
-+
-+				spi-max-frequency = <128000000>;
-+				spi-cpol;
-+				spi-cpha;
-+
-+				width = <320>;
-+				height = <480>;
-+				rotate = <270>;
-+				bgr;
-+				fps = <30>;
-+				buswidth = <8>;
-+				txbuflen = <32768>;
-+
-+				reset-gpios = <&gpio 15 1>;
-+				dc-gpios = <&gpio 25 0>;
-+				led-gpios = <&gpio 18 0>;
-+
-+				init = <0x10000b0 00
-+					0x1000011
-+					0x20000ff
-+					0x10000b3 0x02 0x00 0x00 0x00
-+					0x10000c0 0x13 0x3b 0x00 0x02 0x00 0x01 0x00 0x43
-+					0x10000c1 0x08 0x16 0x08 0x08
-+					0x10000c4 0x11 0x07 0x03 0x03
-+					0x10000c6 0x00
-+					0x10000c8 0x03 0x03 0x13 0x5c 0x03 0x07 0x14 0x08 0x00 0x21 0x08 0x14 0x07 0x53 0x0c 0x13 0x03 0x03 0x21 0x00
-+					0x1000035 0x00
-+					0x1000036 0xa0
-+					0x100003a 0x55
-+					0x1000044 0x00 0x01
-+					0x10000d0 0x07 0x07 0x1d 0x03
-+					0x10000d1 0x03 0x30 0x10
-+					0x10000d2 0x03 0x14 0x04
-+					0x1000029
-+					0x100002c>;
-+
-+				/* This is a workaround to make sure the init sequence slows down and doesn't fail */
-+				debug = <3>;
-+			};
-+
-+			mz61581_ts: mz61581_ts@1 {
-+				compatible = "ti,ads7846";
-+				reg = <1>;
-+
-+				spi-max-frequency = <2000000>;
-+				interrupts = <4 2>; /* high-to-low edge triggered */
-+				interrupt-parent = <&gpio>;
-+				pendown-gpio = <&gpio 4 0>;
-+
-+				ti,x-plate-ohms = /bits/ 16 <60>;
-+				ti,pressure-max = /bits/ 16 <255>;
-+			};
-+		};
-+	};
-+	__overrides__ {
-+		speed =   <&mz61581>, "spi-max-frequency:0";
-+		rotate =  <&mz61581>, "rotate:0";
-+		fps =     <&mz61581>, "fps:0";
-+		txbuflen = <&mz61581>, "txbuflen:0";
-+		debug =   <&mz61581>, "debug:0";
-+		xohms =   <&mz61581_ts>,"ti,x-plate-ohms;0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/ov2311-overlay.dts b/arch/arm/boot/dts/overlays/ov2311-overlay.dts
-new file mode 100644
-index 000000000000..aeefca50e8a2
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/ov2311-overlay.dts
-@@ -0,0 +1,77 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+// Definitions for OV2311 camera module on VC I2C bus
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	i2c_frag: fragment@0 {
-+		target = <&i2c_csi_dsi>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			#include "ov2311.dtsi"
-+		};
-+	};
-+
-+	csi_frag: fragment@1 {
-+		target = <&csi1>;
-+		csi: __overlay__ {
-+			status = "okay";
-+			brcm,media-controller;
-+
-+			port {
-+				csi_ep: endpoint {
-+					remote-endpoint = <&cam_endpoint>;
-+					data-lanes = <1 2>;
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c0if>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&i2c0mux>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	clk_frag: fragment@4{
-+		target = <&cam1_clk>;
-+		__overlay__ {
-+			status = "okay";
-+			clock-frequency = <24000000>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		rotation = <&cam_node>,"rotation:0";
-+		orientation = <&cam_node>,"orientation:0";
-+		media-controller = <&csi>,"brcm,media-controller?";
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
-+		       <&csi_frag>, "target:0=",<&csi0>,
-+		       <&clk_frag>, "target:0=",<&cam0_clk>,
-+		       <&cam_node>, "clocks:0=",<&cam0_clk>,
-+		       <&cam_node>, "avdd-supply:0=",<&cam0_reg>;
-+	};
-+};
-+
-+&cam_node {
-+	status = "okay";
-+};
-+
-+&cam_endpoint {
-+	remote-endpoint = <&csi_ep>;
-+};
-diff --git a/arch/arm/boot/dts/overlays/ov2311.dtsi b/arch/arm/boot/dts/overlays/ov2311.dtsi
-new file mode 100644
-index 000000000000..a1714d6941c3
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/ov2311.dtsi
-@@ -0,0 +1,26 @@
-+// Fragment that configures an ov2311
-+
-+cam_node: ov2311@60 {
-+	compatible = "ovti,ov2311";
-+	reg = <0x60>;
-+	status = "disabled";
-+
-+	clocks = <&cam1_clk>;
-+	clock-names = "xvclk";
-+
-+	avdd-supply = <&cam1_reg>;
-+	dovdd-supply = <&cam_dummy_reg>;
-+	dvdd-supply = <&cam_dummy_reg>;
-+
-+	rotation = <0>;
-+	orientation = <2>;
-+
-+	port {
-+		cam_endpoint: endpoint {
-+			clock-lanes = <0>;
-+			data-lanes = <1 2>;
-+			link-frequencies =
-+				/bits/ 64 <400000000>;
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/ov5647-overlay.dts b/arch/arm/boot/dts/overlays/ov5647-overlay.dts
-new file mode 100644
-index 000000000000..3fcb0b8d9952
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/ov5647-overlay.dts
-@@ -0,0 +1,92 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+// Definitions for OV5647 camera module on VC I2C bus
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	i2c_frag: fragment@0 {
-+		target = <&i2c_csi_dsi>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			#include "ov5647.dtsi"
-+
-+			vcm: ad5398@c {
-+				compatible = "adi,ad5398";
-+				reg = <0x0c>;
-+				status = "disabled";
-+				VANA-supply = <&cam1_reg>;
-+			};
-+		};
-+	};
-+
-+	csi_frag: fragment@1 {
-+		target = <&csi1>;
-+		csi: __overlay__ {
-+			status = "okay";
-+			brcm,media-controller;
-+
-+			port {
-+				csi_ep: endpoint {
-+					remote-endpoint = <&cam_endpoint>;
-+					data-lanes = <1 2>;
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c0if>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&i2c0mux>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	reg_frag: fragment@4 {
-+		target = <&cam1_reg>;
-+		__overlay__ {
-+			startup-delay-us = <20000>;
-+		};
-+	};
-+
-+	clk_frag: fragment@5 {
-+		target = <&cam1_clk>;
-+		__overlay__ {
-+			status = "okay";
-+			clock-frequency = <25000000>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		rotation = <&cam_node>,"rotation:0";
-+		orientation = <&cam_node>,"orientation:0";
-+		media-controller = <&csi>,"brcm,media-controller?";
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
-+		       <&csi_frag>, "target:0=",<&csi0>,
-+		       <&reg_frag>, "target:0=",<&cam0_reg>,
-+		       <&clk_frag>, "target:0=",<&cam0_clk>,
-+		       <&cam_node>, "clocks:0=",<&cam0_clk>,
-+		       <&cam_node>, "avdd-supply:0=",<&cam0_reg>;
-+		vcm = <&vcm>, "status=okay",
-+		      <&cam_node>,"lens-focus:0=", <&vcm>;
-+	};
-+};
-+
-+&cam_node {
-+	status = "okay";
-+};
-+
-+&cam_endpoint {
-+	remote-endpoint = <&csi_ep>;
-+};
-diff --git a/arch/arm/boot/dts/overlays/ov5647.dtsi b/arch/arm/boot/dts/overlays/ov5647.dtsi
-new file mode 100644
-index 000000000000..6455a191a394
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/ov5647.dtsi
-@@ -0,0 +1,25 @@
-+cam_node: ov5647@36 {
-+	compatible = "ovti,ov5647";
-+	reg = <0x36>;
-+	status = "disabled";
-+
-+	clocks = <&cam1_clk>;
-+
-+	avdd-supply = <&cam1_reg>;
-+	dovdd-supply = <&cam_dummy_reg>;
-+	dvdd-supply = <&cam_dummy_reg>;
-+
-+	rotation = <0>;
-+	orientation = <2>;
-+
-+	port {
-+		cam_endpoint: endpoint {
-+			clock-lanes = <0>;
-+			data-lanes = <1 2>;
-+			clock-noncontinuous;
-+			link-frequencies =
-+				/bits/ 64 <297000000>;
-+		};
-+	};
-+};
-+
-diff --git a/arch/arm/boot/dts/overlays/ov7251-overlay.dts b/arch/arm/boot/dts/overlays/ov7251-overlay.dts
-new file mode 100644
-index 000000000000..9e490aa90fa0
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/ov7251-overlay.dts
-@@ -0,0 +1,77 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+// Definitions for OV7251 camera module on VC I2C bus
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	i2c_frag: fragment@0 {
-+		target = <&i2c_csi_dsi>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			#include "ov7251.dtsi"
-+		};
-+	};
-+
-+	csi_frag: fragment@1 {
-+		target = <&csi1>;
-+		csi: __overlay__ {
-+			status = "okay";
-+			brcm,media-controller;
-+
-+			port {
-+				csi_ep: endpoint {
-+					remote-endpoint = <&cam_endpoint>;
-+					data-lanes = <1>;
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c0if>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&i2c0mux>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	clk_frag: fragment@4 {
-+		target = <&cam1_clk>;
-+		__overlay__ {
-+			status = "okay";
-+			clock-frequency = <24000000>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		rotation = <&cam_node>,"rotation:0";
-+		orientation = <&cam_node>,"orientation:0";
-+		media-controller = <&csi>,"brcm,media-controller?";
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
-+		       <&csi_frag>, "target:0=",<&csi0>,
-+		       <&clk_frag>, "target:0=",<&cam0_clk>,
-+		       <&cam_node>, "clocks:0=",<&cam0_clk>,
-+		       <&cam_node>, "vdda-supply:0=",<&cam0_reg>;
-+	};
-+};
-+
-+&cam_node {
-+	status = "okay";
-+};
-+
-+&cam_endpoint {
-+	remote-endpoint = <&csi_ep>;
-+};
-diff --git a/arch/arm/boot/dts/overlays/ov7251.dtsi b/arch/arm/boot/dts/overlays/ov7251.dtsi
-new file mode 100644
-index 000000000000..561fed1db837
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/ov7251.dtsi
-@@ -0,0 +1,28 @@
-+// Fragment that configures an ov7251
-+
-+cam_node: ov7251@60 {
-+	compatible = "ovti,ov7251";
-+	reg = <0x60>;
-+	status = "disabled";
-+
-+	clocks = <&cam1_clk>;
-+	clock-names = "xclk";
-+	clock-frequency = <24000000>;
-+
-+	vdddo-supply = <&cam_dummy_reg>;
-+	vdda-supply = <&cam1_reg>;
-+	vddd-supply = <&cam_dummy_reg>;
-+
-+	rotation = <0>;
-+	orientation = <2>;
-+
-+	port {
-+		cam_endpoint: endpoint {
-+			clock-lanes = <0>;
-+			data-lanes = <1>;
-+			clock-noncontinuous;
-+			link-frequencies =
-+				/bits/ 64 <240000000>;
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/ov9281-overlay.dts b/arch/arm/boot/dts/overlays/ov9281-overlay.dts
-new file mode 100644
-index 000000000000..8a678d420c38
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/ov9281-overlay.dts
-@@ -0,0 +1,78 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+// Definitions for OV9281 camera module on VC I2C bus
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	i2c_frag: fragment@0 {
-+		target = <&i2c_csi_dsi>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			#include "ov9281.dtsi"
-+		};
-+	};
-+
-+	csi_frag: fragment@1 {
-+		target = <&csi1>;
-+		csi: __overlay__ {
-+			status = "okay";
-+			brcm,media-controller;
-+
-+			port {
-+				csi_ep: endpoint {
-+					remote-endpoint = <&cam_endpoint>;
-+					data-lanes = <1 2>;
-+					clock-noncontinuous;
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c0if>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&i2c0mux>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	clk_frag: fragment@4 {
-+		target = <&cam1_clk>;
-+		__overlay__ {
-+			status = "okay";
-+			clock-frequency = <24000000>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		rotation = <&cam_node>,"rotation:0";
-+		orientation = <&cam_node>,"orientation:0";
-+		media-controller = <&csi>,"brcm,media-controller?";
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
-+		       <&csi_frag>, "target:0=",<&csi0>,
-+		       <&clk_frag>, "target:0=",<&cam0_clk>,
-+		       <&cam_node>, "clocks:0=",<&cam0_clk>,
-+		       <&cam_node>, "avdd-supply:0=",<&cam0_reg>;
-+	};
-+};
-+
-+&cam_node {
-+	status = "okay";
-+};
-+
-+&cam_endpoint {
-+	remote-endpoint = <&csi_ep>;
-+};
-diff --git a/arch/arm/boot/dts/overlays/ov9281.dtsi b/arch/arm/boot/dts/overlays/ov9281.dtsi
-new file mode 100644
-index 000000000000..7df43bc6ef39
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/ov9281.dtsi
-@@ -0,0 +1,27 @@
-+// Fragment that configures an ov9281
-+
-+cam_node: ov9281@60 {
-+	compatible = "ovti,ov9281";
-+	reg = <0x60>;
-+	status = "disabled";
-+
-+	clocks = <&cam1_clk>;
-+	clock-names = "xvclk";
-+
-+	avdd-supply = <&cam1_reg>;
-+	dovdd-supply = <&cam_dummy_reg>;
-+	dvdd-supply = <&cam_dummy_reg>;
-+
-+	rotation = <0>;
-+	orientation = <2>;
-+
-+	port {
-+		cam_endpoint: endpoint {
-+			clock-lanes = <0>;
-+			data-lanes = <1 2>;
-+			clock-noncontinuous;
-+			link-frequencies =
-+				/bits/ 64 <400000000>;
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/overlay_map.dts b/arch/arm/boot/dts/overlays/overlay_map.dts
-new file mode 100644
-index 000000000000..18d888109019
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/overlay_map.dts
-@@ -0,0 +1,211 @@
-+/dts-v1/;
-+
-+/ {
-+	bmp085_i2c-sensor {
-+		deprecated = "use i2c-sensor,bmp085";
-+	};
-+
-+	cutiepi-panel {
-+		bcm2711;
-+	};
-+
-+	highperi {
-+		bcm2711;
-+	};
-+
-+	i2c0-bcm2708 {
-+		deprecated = "use i2c0";
-+	};
-+
-+	i2c1-bcm2708 {
-+		deprecated = "use i2c1";
-+	};
-+
-+	i2c3 {
-+		bcm2711;
-+	};
-+
-+	i2c4 {
-+		bcm2711;
-+	};
-+
-+	i2c5 {
-+		bcm2711;
-+	};
-+
-+	i2c6 {
-+		bcm2711;
-+	};
-+
-+	lirc-rpi {
-+		deprecated = "use gpio-ir";
-+	};
-+
-+	midi-uart2 {
-+		bcm2711;
-+	};
-+
-+	midi-uart3 {
-+		bcm2711;
-+	};
-+
-+	midi-uart4 {
-+		bcm2711;
-+	};
-+
-+	midi-uart5 {
-+		bcm2711;
-+	};
-+
-+	pcie-32bit-dma {
-+		bcm2711;
-+	};
-+
-+	pi3-act-led {
-+		renamed = "act-led";
-+	};
-+
-+	pi3-disable-bt {
-+		renamed = "disable-bt";
-+	};
-+
-+	pi3-disable-wifi {
-+		renamed = "disable-wifi";
-+	};
-+
-+	pi3-miniuart-bt {
-+		renamed = "miniuart-bt";
-+	};
-+
-+	ramoops {
-+		bcm2835;
-+		bcm2711 = "ramoops-pi4";
-+	};
-+
-+	ramoops-pi4 {
-+		bcm2711;
-+	};
-+
-+	rpi-cirrus-wm5102 {
-+		renamed = "cirrus-wm5102";
-+	};
-+
-+	rpi-dac {
-+		renamed = "i2s-dac";
-+	};
-+
-+	rpi-display {
-+		renamed = "watterott-display";
-+	};
-+
-+	rpi-proto {
-+		renamed = "proto-codec";
-+	};
-+
-+	rpivid-v4l2 {
-+		deprecated = "no longer necessary";
-+	};
-+
-+	sdio-1bit {
-+		deprecated = "use sdio,bus_width=1,gpios_22_25";
-+	};
-+
-+	sdtweak {
-+		deprecated = "use 'dtparam=sd_poll_once' etc.";
-+	};
-+
-+	spi0-cs {
-+		renamed = "spi0-2cs";
-+	};
-+
-+	spi0-hw-cs {
-+		deprecated = "no longer necessary";
-+	};
-+
-+	spi3-1cs {
-+		bcm2711;
-+	};
-+
-+	spi3-2cs {
-+		bcm2711;
-+	};
-+
-+	spi4-1cs {
-+		bcm2711;
-+	};
-+
-+	spi4-2cs {
-+		bcm2711;
-+	};
-+
-+	spi5-1cs {
-+		bcm2711;
-+	};
-+
-+	spi5-2cs {
-+		bcm2711;
-+	};
-+
-+	spi6-1cs {
-+		bcm2711;
-+	};
-+
-+	spi6-2cs {
-+		bcm2711;
-+	};
-+
-+	uart2 {
-+		bcm2711;
-+	};
-+
-+	uart3 {
-+		bcm2711;
-+	};
-+
-+	uart4 {
-+		bcm2711;
-+	};
-+
-+	uart5 {
-+		bcm2711;
-+	};
-+
-+	upstream {
-+		bcm2835;
-+		bcm2711 = "upstream-pi4";
-+	};
-+
-+	upstream-aux-interrupt {
-+		deprecated = "no longer necessary";
-+	};
-+
-+	upstream-pi4 {
-+		bcm2711;
-+	};
-+
-+	vc4-fkms-v3d {
-+		bcm2835;
-+		bcm2711 = "vc4-fkms-v3d-pi4";
-+	};
-+
-+	vc4-fkms-v3d-pi4 {
-+		bcm2711;
-+	};
-+
-+	vc4-kms-dpi-at056tn53v1 {
-+		deprecated = "use vc4-kms-dpi-panel,at056tn53v1";
-+	};
-+
-+	vc4-kms-v3d {
-+		bcm2835;
-+		bcm2711 = "vc4-kms-v3d-pi4";
-+	};
-+
-+	vc4-kms-v3d-pi4 {
-+		bcm2711;
-+	};
-+
-+	vl805 {
-+		bcm2711;
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/papirus-overlay.dts b/arch/arm/boot/dts/overlays/papirus-overlay.dts
-new file mode 100644
-index 000000000000..d3e819c0578d
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/papirus-overlay.dts
-@@ -0,0 +1,84 @@
-+/* PaPiRus ePaper Screen by Pi Supply */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2c_arm>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			display_temp: lm75@48 {
-+				compatible = "lm75b";
-+				reg = <0x48>;
-+				status = "okay";
-+				#thermal-sensor-cells = <0>;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target-path = "/thermal-zones";
-+		__overlay__ {
-+			display {
-+				polling-delay-passive = <0>;
-+				polling-delay = <0>;
-+				thermal-sensors = <&display_temp>;
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			repaper_pins: repaper_pins {
-+				brcm,pins = <14 15 23 24 25>;
-+				brcm,function = <1 1 1 1 0>; /* out out out out in */
-+			};
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			repaper: repaper@0{
-+				compatible = "not_set";
-+				reg = <0>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&repaper_pins>;
-+
-+				spi-max-frequency = <8000000>;
-+
-+				panel-on-gpios = <&gpio 23 0>;
-+				border-gpios = <&gpio 14 0>;
-+				discharge-gpios = <&gpio 15 0>;
-+				reset-gpios = <&gpio 24 0>;
-+				busy-gpios = <&gpio 25 0>;
-+
-+				repaper-thermal-zone = "display";
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		panel = <&repaper>, "compatible";
-+		speed = <&repaper>, "spi-max-frequency:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/pca953x-overlay.dts b/arch/arm/boot/dts/overlays/pca953x-overlay.dts
-new file mode 100644
-index 000000000000..8b6ee44665ce
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/pca953x-overlay.dts
-@@ -0,0 +1,240 @@
-+// Definitions for NXP PCA953x family of I2C GPIO controllers on ARM I2C bus.
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2c_arm>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			pca: pca@20 {
-+				compatible = "nxp,pca9534";
-+				reg = <0x20>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&pca>;
-+		__dormant__ {
-+			compatible = "nxp,pca6416";
-+		};
-+	};
-+	fragment@2 {
-+		target = <&pca>;
-+		__dormant__ {
-+			compatible = "nxp,pca9505";
-+		};
-+	};
-+	fragment@3 {
-+		target = <&pca>;
-+		__dormant__ {
-+			compatible = "nxp,pca9535";
-+		};
-+	};
-+	fragment@4 {
-+		target = <&pca>;
-+		__dormant__ {
-+			compatible = "nxp,pca9536";
-+		};
-+	};
-+	fragment@5 {
-+		target = <&pca>;
-+		__dormant__ {
-+			compatible = "nxp,pca9537";
-+		};
-+	};
-+	fragment@6 {
-+		target = <&pca>;
-+		__dormant__ {
-+			compatible = "nxp,pca9538";
-+		};
-+	};
-+	fragment@7 {
-+		target = <&pca>;
-+		__dormant__ {
-+			compatible = "nxp,pca9539";
-+		};
-+	};
-+	fragment@8 {
-+		target = <&pca>;
-+		__dormant__ {
-+			compatible = "nxp,pca9554";
-+		};
-+	};
-+	fragment@9 {
-+		target = <&pca>;
-+		__dormant__ {
-+			compatible = "nxp,pca9555";
-+		};
-+	};
-+	fragment@10 {
-+		target = <&pca>;
-+		__dormant__ {
-+			compatible = "nxp,pca9556";
-+		};
-+	};
-+	fragment@11 {
-+		target = <&pca>;
-+		__dormant__ {
-+			compatible = "nxp,pca9557";
-+		};
-+	};
-+	fragment@12 {
-+		target = <&pca>;
-+		__dormant__ {
-+			compatible = "nxp,pca9574";
-+		};
-+	};
-+	fragment@13 {
-+		target = <&pca>;
-+		__dormant__ {
-+			compatible = "nxp,pca9575";
-+		};
-+	};
-+	fragment@14 {
-+		target = <&pca>;
-+		__dormant__ {
-+			compatible = "nxp,pca9698";
-+		};
-+	};
-+	fragment@15 {
-+		target = <&pca>;
-+		__dormant__ {
-+			compatible = "nxp,pca16416";
-+		};
-+	};
-+	fragment@16 {
-+		target = <&pca>;
-+		__dormant__ {
-+			compatible = "nxp,pca16524";
-+		};
-+	};
-+	fragment@17 {
-+		target = <&pca>;
-+		__dormant__ {
-+			compatible = "nxp,pca19555a";
-+		};
-+	};
-+	fragment@18 {
-+		target = <&pca>;
-+		__dormant__ {
-+			compatible = "maxim,max7310";
-+		};
-+	};
-+	fragment@19 {
-+		target = <&pca>;
-+		__dormant__ {
-+			compatible = "maxim,max7312";
-+		};
-+	};
-+	fragment@20 {
-+		target = <&pca>;
-+		__dormant__ {
-+			compatible = "maxim,max7313";
-+		};
-+	};
-+	fragment@21 {
-+		target = <&pca>;
-+		__dormant__ {
-+			compatible = "maxim,max7315";
-+		};
-+	};
-+	fragment@22 {
-+		target = <&pca>;
-+		__dormant__ {
-+			compatible = "ti,pca6107";
-+		};
-+	};
-+	fragment@23 {
-+		target = <&pca>;
-+		__dormant__ {
-+			compatible = "ti,tca6408";
-+		};
-+	};
-+	fragment@24 {
-+		target = <&pca>;
-+		__dormant__ {
-+			compatible = "ti,tca6416";
-+		};
-+	};
-+	fragment@25 {
-+		target = <&pca>;
-+		__dormant__ {
-+			compatible = "ti,tca6424";
-+		};
-+	};
-+	fragment@26 {
-+		target = <&pca>;
-+		__dormant__ {
-+			compatible = "ti,tca9539";
-+		};
-+	};
-+	fragment@27 {
-+		target = <&pca>;
-+		__dormant__ {
-+			compatible = "ti,tca9554";
-+		};
-+	};
-+	fragment@28 {
-+		target = <&pca>;
-+		__dormant__ {
-+			compatible = "onnn,cat9554";
-+		};
-+	};
-+	fragment@29 {
-+		target = <&pca>;
-+		__dormant__ {
-+			compatible = "onnn,pca9654";
-+		};
-+	};
-+	fragment@30 {
-+		target = <&pca>;
-+		__dormant__ {
-+			compatible = "exar,xra1202";
-+		};
-+	};
-+
-+	__overrides__ {
-+		addr = <&pca>,"reg:0";
-+		pca6416 = <0>, "+1";
-+		pca9505 = <0>, "+2";
-+		pca9535 = <0>, "+3";
-+		pca9536 = <0>, "+4";
-+		pca9537 = <0>, "+5";
-+		pca9538 = <0>, "+6";
-+		pca9539 = <0>, "+7";
-+		pca9554 = <0>, "+8";
-+		pca9555 = <0>, "+9";
-+		pca9556 = <0>, "+10";
-+		pca9557 = <0>, "+11";
-+		pca9574 = <0>, "+12";
-+		pca9575 = <0>, "+13";
-+		pca9698 = <0>, "+14";
-+		pca16416 = <0>, "+15";
-+		pca16524 = <0>, "+16";
-+		pca19555a = <0>, "+17";
-+		max7310 = <0>, "+18";
-+		max7312 = <0>, "+19";
-+		max7313 = <0>, "+20";
-+		max7315 = <0>, "+21";
-+		pca6107 = <0>, "+22";
-+		tca6408 = <0>, "+23";
-+		tca6416 = <0>, "+24";
-+		tca6424 = <0>, "+25";
-+		tca9539 = <0>, "+26";
-+		tca9554 = <0>, "+27";
-+		cat9554 = <0>, "+28";
-+		pca9654 = <0>, "+29";
-+		xra1202 = <0>, "+30";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/pcie-32bit-dma-overlay.dts b/arch/arm/boot/dts/overlays/pcie-32bit-dma-overlay.dts
-new file mode 100644
-index 000000000000..955703563df7
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/pcie-32bit-dma-overlay.dts
-@@ -0,0 +1,38 @@
-+/*
-+ * pcie-32bit-dma-overlay.dts
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2711";
-+
-+	fragment@0 {
-+		target-path = "/aliases";
-+		__overlay__ {
-+			/*
-+			 * Removing this alias stops the firmware patching the
-+			 * PCIE DT dma-ranges based on the detected chip
-+			 * revision.
-+			 */
-+			pcie0 = "";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&pcie0>;
-+		__overlay__ {
-+			/*
-+			 * The size of the range is rounded up to a power of 2,
-+			 * so the range ends up being 0-4GB, and the MSI vector
-+			 * gets pushed beyond 4GB.
-+			 */
-+			#address-cells = <3>;
-+			#size-cells = <2>;
-+			dma-ranges = <0x02000000 0x0 0x00000000 0x0 0x00000000
-+				      0x0 0x80000000>;
-+		};
-+	};
-+
-+};
-diff --git a/arch/arm/boot/dts/overlays/pibell-overlay.dts b/arch/arm/boot/dts/overlays/pibell-overlay.dts
-new file mode 100644
-index 000000000000..9333a9b09772
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/pibell-overlay.dts
-@@ -0,0 +1,81 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+    compatible = "brcm,bcm2835";
-+
-+    fragment@0 {
-+        target-path = "/";
-+        __overlay__ {
-+            codec_out: spdif-transmitter {
-+                #address-cells = <0>;
-+                #size-cells = <0>;
-+                #sound-dai-cells = <0>;
-+                compatible = "linux,spdif-dit";
-+                status = "okay";
-+            };
-+
-+            codec_in: card-codec {
-+                #sound-dai-cells = <0>;
-+                compatible = "invensense,ics43432";
-+                status = "okay";
-+            };
-+        };
-+    };
-+
-+    fragment@1 {
-+        target = <&i2s>;
-+        __overlay__ {
-+            #sound-dai-cells = <0>;
-+            status = "okay";
-+        };
-+    };
-+
-+    fragment@2 {
-+        target = <&sound>;
-+        snd: __overlay__ {
-+            compatible = "simple-audio-card";
-+            simple-audio-card,name = "PiBell";
-+
-+            status="okay";
-+
-+            capture_link: simple-audio-card,dai-link@0 {
-+                format = "i2s";
-+
-+                r_cpu_dai: cpu {
-+                    sound-dai = <&i2s>;
-+
-+/* example TDM slot configuration
-+                    dai-tdm-slot-num = <2>;
-+                    dai-tdm-slot-width = <32>;
-+*/
-+                };
-+
-+                r_codec_dai: codec {
-+                    sound-dai = <&codec_in>;
-+                };
-+            };
-+
-+            playback_link: simple-audio-card,dai-link@1 {
-+                format = "i2s";
-+
-+                p_cpu_dai: cpu {
-+                    sound-dai = <&i2s>;
-+
-+/* example TDM slot configuration
-+                    dai-tdm-slot-num = <2>;
-+                    dai-tdm-slot-width = <32>;
-+*/
-+                };
-+
-+                p_codec_dai: codec {
-+                    sound-dai = <&codec_out>;
-+                };
-+            };
-+        };
-+    };
-+
-+    __overrides__ {
-+        alsaname = <&snd>, "simple-audio-card,name";
-+    };
-+};
-diff --git a/arch/arm/boot/dts/overlays/pifacedigital-overlay.dts b/arch/arm/boot/dts/overlays/pifacedigital-overlay.dts
-new file mode 100644
-index 000000000000..532a858683d6
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/pifacedigital-overlay.dts
-@@ -0,0 +1,144 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+/*
-+ * PiFace Digital, Device Tree Overlay.
-+ * Copyright (C) 2020 Thomas Preston <thomas.preston@codethink.co.uk>
-+ *
-+ * The PiFace Digital is a convenient breakout board for the Microchip mcp23s17
-+ * SPI GPIO port expander.
-+ *
-+ * The first eight GPIOs 0..7 (bank A) are connected to eight output terminals
-+ * and LEDs, plus two relays on the first two outputs. These output loads are
-+ * active-high.
-+ *
-+ * The next eight GPIOs 8..15 (bank B) are connected to eight input terminals
-+ * with four on-board switches connecting them to ground. Inputs devices are
-+ * therefore expected to bridge terminals to ground, so the mcp23s17 pullups are
-+ * activated for GPIO bank B.
-+ *
-+ * On PiFace Digital, the mcp23s17 is connected to the Raspberry Pi's SPI0 CS0
-+ * bus. Each SPI bus supports up to eight addressable child devices. The PiFace
-+ * Digital only supports addresses 0-4, which can be configured by jumpers JP1
-+ * and JP2.
-+ *
-+ * You can tell the driver about these jumper configurations with the
-+ * spi-present-mask bitmask:
-+ *
-+ *     | JP1 | JP2 | dtoverlay line in /boot/config.txt         |
-+ *     | --- | --- | ------------------------------------------ |
-+ *     |  0  |  0  | dtoverlay=pifacedigital                    |
-+ *     |  0  |  0  | dtoverlay=pifacedigital:spi-present-mask=1 |
-+ *     |  0  |  1  | dtoverlay=pifacedigital:spi-present-mask=2 |
-+ *     |  1  |  0  | dtoverlay=pifacedigital:spi-present-mask=4 |
-+ *     |  1  |  1  | dtoverlay=pifacedigital:spi-present-mask=8 |
-+ *
-+ * # Example
-+ * Set the dtoverlay config in /boot/config.txt and power off the Raspberry Pi:
-+ *
-+ *     $ grep pifacedigital /boot/config.txt
-+ *     dtoverlay=pifacedigital
-+ *     $ sudo systemctl poweroff
-+ *
-+ * Attach the PiFace Digital and power on the Raspberry Pi.
-+ * Then use the libgpiod tools to query the device:
-+ *
-+ *     $ sudo apt install gpiod
-+ *     $ gpiodetect | grep mcp23s17
-+ *     gpiochip2 [mcp23s17.0] (16 lines)
-+ *
-+ * Set GPIO outputs 0, 2 and 5:
-+ *
-+ *     $ gpioset gpiochip2 0=1 2=1 5=1
-+ *
-+ * Get GPIO status (input GPIO 8..15 are high, because they are active-low):
-+ *
-+ *     $ gpioget gpiochip2 {8..15}
-+ *     1 1 1 1 1 1 1 1
-+ *
-+ * And even monitor interrupts:
-+ *
-+ *     $ gpiomon gpiochip2 {8..15}
-+ *     event: FALLING EDGE offset: 11 timestamp: [1597361662.926741667]
-+ *     event:  RISING EDGE offset: 11 timestamp: [1597361663.062555051]
-+ *
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	/* Disable exposing /dev/spidev0.0 */
-+	fragment@0 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	/* Add the PiFace Digital device node to the spi0.0 device. */
-+	fragment@1 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			pfdigital: pifacedigital@0 {
-+				compatible = "microchip,mcp23s17";
-+				reg = <0>;
-+
-+				/* Set devices present with 8-bit mask. */
-+				microchip,spi-present-mask = <0x01>;
-+				spi-max-frequency = <500000>;
-+
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+
-+				/* This device can pass through interrupts. */
-+				interrupt-controller;
-+				#interrupt-cells = <2>;
-+
-+				/* INTB is connected to GPIO 25.
-+				 * 0x8 active-low level-sensitive
-+				 */
-+				interrupts = <25 0x8>;
-+				interrupt-parent = <&gpio>;
-+
-+				/* Configure pull-ups on bank B GPIOs */
-+				pinctrl-0 = <&pfdigital_irq &pfdigital_pullups>;
-+				pinctrl-names = "default";
-+				pfdigital_pullups: pinmux {
-+					pins =
-+						"gpio8",
-+						"gpio9",
-+						"gpio10",
-+						"gpio11",
-+						"gpio12",
-+						"gpio13",
-+						"gpio14",
-+						"gpio15";
-+					bias-pull-up;
-+				};
-+			};
-+		};
-+	};
-+
-+	/* PiFace Digital mcp23s17 INTB pin is connected to GPIO 25. The INTB
-+	 * pin is configured active-low (0 on interrupt), so expect to see
-+	 * FALLING_EDGE when inputs are bridged to ground (switch is pressed).
-+	 */
-+	fragment@3 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			pfdigital_irq: pifacedigital_irq {
-+				brcm,pins = <25>;
-+				brcm,function = <0>; /* input */
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		spi-present-mask = <&pfdigital>, "microchip,spi-present-mask:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/pifi-40-overlay.dts b/arch/arm/boot/dts/overlays/pifi-40-overlay.dts
-new file mode 100644
-index 000000000000..51a20e54977f
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/pifi-40-overlay.dts
-@@ -0,0 +1,50 @@
-+// Definitions for PiFi-40 Amp
-+/dts-v1/;
-+/plugin/;
-+#include <dt-bindings/gpio/gpio.h>
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			tas5711l: audio-codec@1a {
-+				compatible = "ti,tas5711";
-+				reg = <0x1a>;
-+				#sound-dai-cells = <0>;
-+				sound-name-prefix = "Left";
-+				status = "okay";
-+			};
-+
-+			tas5711r: audio-codec@1b {
-+				compatible = "ti,tas5711";
-+				reg = <0x1b>;
-+				#sound-dai-cells = <0>;
-+				sound-name-prefix = "Right";
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		pifi_40: __overlay__ {
-+			compatible = "pifi,pifi-40";
-+			audio-codec = <&tas5711l &tas5711r>;
-+			i2s-controller = <&i2s>;
-+			pdn-gpios = <&gpio 23 1>;
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/pifi-dac-hd-overlay.dts b/arch/arm/boot/dts/overlays/pifi-dac-hd-overlay.dts
-new file mode 100644
-index 000000000000..67f50db7861a
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/pifi-dac-hd-overlay.dts
-@@ -0,0 +1,49 @@
-+// Overlay for PiFi-DAC-HD
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells =<0>;
-+
-+			pcm5142: pcm5142@4c {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,pcm5142";
-+				reg = <0x4c>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "simple-audio-card";
-+			simple-audio-card,name = "PiFi-DAC-HD";
-+			status = "okay";
-+
-+			simple-audio-card,dai-link@1 {
-+				format = "i2s";
-+				cpu {
-+					sound-dai = <&i2s>;
-+				};
-+				codec {
-+					sound-dai = <&pcm5142>;
-+				};
-+			};
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/pifi-dac-zero-overlay.dts b/arch/arm/boot/dts/overlays/pifi-dac-zero-overlay.dts
-new file mode 100644
-index 000000000000..645ea74cb435
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/pifi-dac-zero-overlay.dts
-@@ -0,0 +1,49 @@
-+// Overlay for PiFi-DAC-Zero
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "simple-audio-card";
-+			simple-audio-card,name = "PiFi-DAC-Zero";
-+			status = "okay";
-+
-+			simple-audio-card,dai-link@1 {
-+				format = "i2s";
-+
-+				cpu {
-+					sound-dai = <&i2s>;
-+					dai-tdm-slot-num = <2>;
-+					dai-tdm-slot-width = <32>;
-+				};
-+
-+				codec {
-+					sound-dai = <&codec_out>;
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target-path = "/";
-+		__overlay__ {
-+			codec_out: pcm5102a-codec {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,pcm5102a";
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			#sound-dai-cells = <0>;
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/pifi-mini-210-overlay.dts b/arch/arm/boot/dts/overlays/pifi-mini-210-overlay.dts
-new file mode 100644
-index 000000000000..963597d611b5
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/pifi-mini-210-overlay.dts
-@@ -0,0 +1,42 @@
-+// Definitions for PiFi Mini 210
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			tas5711@1a {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,tas5711";
-+				reg = <0x1a>;
-+				status = "okay";
-+				pdn-gpios = <&gpio 23 1>;
-+				reset-gpios = <&gpio 24 1>;
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "pifi,pifi-mini-210";
-+			i2s-controller = <&i2s>;
-+
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/piglow-overlay.dts b/arch/arm/boot/dts/overlays/piglow-overlay.dts
-new file mode 100644
-index 000000000000..075bceef158c
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/piglow-overlay.dts
-@@ -0,0 +1,97 @@
-+// Definitions for SN3218 LED driver from Si-En Technology on PiGlow
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2c_arm>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			sn3218@54 {
-+				compatible = "si-en,sn3218";
-+				reg = <0x54>;
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				status = "okay";
-+
-+				led@1 {
-+					reg = <1>;
-+					label = "piglow:red:led1";
-+				};
-+				led@2 {
-+					reg = <2>;
-+					label = "piglow:orange:led2";
-+				};
-+				led@3 {
-+					reg = <3>;
-+					label = "piglow:yellow:led3";
-+				};
-+				led@4 {
-+					reg = <4>;
-+					label = "piglow:green:led4";
-+				};
-+				led@5 {
-+					reg = <5>;
-+					label = "piglow:blue:led5";
-+				};
-+				led@6 {
-+					reg = <6>;
-+					label = "piglow:green:led6";
-+				};
-+				led@7 {
-+					reg = <7>;
-+					label = "piglow:red:led7";
-+				};
-+				led@8 {
-+					reg = <8>;
-+					label = "piglow:orange:led8";
-+				};
-+				led@9 {
-+					reg = <9>;
-+					label = "piglow:yellow:led9";
-+				};
-+				led@10 {
-+					reg = <10>;
-+					label = "piglow:white:led10";
-+				};
-+				led@11 {
-+					reg = <11>;
-+					label = "piglow:white:led11";
-+				};
-+				led@12 {
-+					reg = <12>;
-+					label = "piglow:blue:led12";
-+				};
-+				led@13 {
-+					reg = <13>;
-+					label = "piglow:white:led13";
-+				};
-+				led@14 {
-+					reg = <14>;
-+					label = "piglow:green:led14";
-+				};
-+				led@15 {
-+					reg = <15>;
-+					label = "piglow:blue:led15";
-+				};
-+				led@16 {
-+					reg = <16>;
-+					label = "piglow:yellow:led16";
-+				};
-+				led@17 {
-+					reg = <17>;
-+					label = "piglow:orange:led17";
-+				};
-+				led@18 {
-+					reg = <18>;
-+					label = "piglow:red:led18";
-+				};
-+			};
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/piscreen-overlay.dts b/arch/arm/boot/dts/overlays/piscreen-overlay.dts
-new file mode 100644
-index 000000000000..1ac75a248fab
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/piscreen-overlay.dts
-@@ -0,0 +1,102 @@
-+/*
-+ * Device Tree overlay for PiScreen 3.5" display shield by Ozzmaker
-+ *
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&spidev1>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			piscreen_pins: piscreen_pins {
-+				brcm,pins = <17 25 24 22>;
-+				brcm,function = <0 1 1 1>; /* in out out out */
-+			};
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			piscreen: piscreen@0{
-+				compatible = "ilitek,ili9486";
-+				reg = <0>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&piscreen_pins>;
-+
-+				spi-max-frequency = <24000000>;
-+				rotate = <270>;
-+				bgr;
-+				fps = <30>;
-+				buswidth = <8>;
-+				regwidth = <16>;
-+				reset-gpios = <&gpio 25 1>;
-+				dc-gpios = <&gpio 24 0>;
-+				led-gpios = <&gpio 22 0>;
-+				debug = <0>;
-+
-+				init = <0x10000b0 0x00
-+				        0x1000011
-+					0x20000ff
-+					0x100003a 0x55
-+					0x1000036 0x28
-+					0x10000c2 0x44
-+					0x10000c5 0x00 0x00 0x00 0x00
-+					0x10000e0 0x0f 0x1f 0x1c 0x0c 0x0f 0x08 0x48 0x98 0x37 0x0a 0x13 0x04 0x11 0x0d 0x00
-+					0x10000e1 0x0f 0x32 0x2e 0x0b 0x0d 0x05 0x47 0x75 0x37 0x06 0x10 0x03 0x24 0x20 0x00
-+					0x10000e2 0x0f 0x32 0x2e 0x0b 0x0d 0x05 0x47 0x75 0x37 0x06 0x10 0x03 0x24 0x20 0x00
-+					0x1000011
-+					0x1000029>;
-+			};
-+
-+			piscreen_ts: piscreen-ts@1 {
-+				compatible = "ti,ads7846";
-+				reg = <1>;
-+
-+				spi-max-frequency = <2000000>;
-+				interrupts = <17 2>; /* high-to-low edge triggered */
-+				interrupt-parent = <&gpio>;
-+				pendown-gpio = <&gpio 17 0>;
-+				ti,swap-xy;
-+				ti,x-plate-ohms = /bits/ 16 <100>;
-+				ti,pressure-max = /bits/ 16 <255>;
-+			};
-+		};
-+	};
-+	__overrides__ {
-+		speed =		<&piscreen>,"spi-max-frequency:0";
-+		rotate =	<&piscreen>,"rotate:0";
-+		fps =		<&piscreen>,"fps:0";
-+		debug =		<&piscreen>,"debug:0";
-+		xohms =		<&piscreen_ts>,"ti,x-plate-ohms;0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts b/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts
-new file mode 100644
-index 000000000000..9d2b51101969
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts
-@@ -0,0 +1,106 @@
-+ /*
-+ * Device Tree overlay for PiScreen2 3.5" TFT with resistive touch  by Ozzmaker.com
-+ *
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&spidev1>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			piscreen2_pins: piscreen2_pins {
-+				brcm,pins = <17 25 24 22>;
-+				brcm,function = <0 1 1 1>; /* in out out out */
-+			};
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			piscreen2: piscreen2@0{
-+				compatible = "ilitek,ili9486";
-+				reg = <0>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&piscreen2_pins>;
-+				bgr;
-+				spi-max-frequency = <64000000>;
-+				rotate = <90>;
-+				fps = <30>;
-+				buswidth = <8>;
-+				regwidth = <16>;
-+				txbuflen = <32768>;
-+				reset-gpios = <&gpio 25 1>;
-+				dc-gpios = <&gpio 24 0>;
-+				led-gpios = <&gpio 22 0>;
-+				debug = <0>;
-+
-+                                init = <0x10000b0 0x00
-+                                        0x1000011
-+                                        0x20000ff
-+                                        0x100003a 0x55
-+                                        0x1000036 0x28
-+                                        0x10000c0 0x11 0x09
-+                                        0x10000c1 0x41
-+                                        0x10000c5 0x00 0x00 0x00 0x00
-+                                        0x10000b6 0x00 0x02
-+                                        0x10000f7 0xa9 0x51 0x2c 0x2
-+                                        0x10000be 0x00 0x04
-+                                        0x10000e9 0x00
-+                                        0x1000011
-+                                        0x1000029>;
-+
-+			};
-+
-+			piscreen2_ts: piscreen2-ts@1 {
-+				compatible = "ti,ads7846";
-+				reg = <1>;
-+
-+				spi-max-frequency = <2000000>;
-+				interrupts = <17 2>; /* high-to-low edge triggered */
-+				interrupt-parent = <&gpio>;
-+				pendown-gpio = <&gpio 17 0>;
-+				ti,swap-xy;
-+				ti,x-plate-ohms = /bits/ 16 <100>;
-+				ti,pressure-max = /bits/ 16 <255>;
-+			};
-+		};
-+	};
-+	__overrides__ {
-+		speed =		<&piscreen2>,"spi-max-frequency:0";
-+		rotate =	<&piscreen2>,"rotate:0";
-+		fps =		<&piscreen2>,"fps:0";
-+		debug =		<&piscreen2>,"debug:0";
-+		xohms =		<&piscreen2_ts>,"ti,x-plate-ohms;0";
-+	};
-+};
-+
-diff --git a/arch/arm/boot/dts/overlays/pisound-overlay.dts b/arch/arm/boot/dts/overlays/pisound-overlay.dts
-new file mode 100644
-index 000000000000..49efb2b768fb
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/pisound-overlay.dts
-@@ -0,0 +1,120 @@
-+/*
-+ * Pisound Linux kernel module.
-+ * Copyright (C) 2016-2017  Vilniaus Blokas UAB, https://blokas.io/pisound
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; version 2 of the
-+ * License.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&spidev1>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			pisound_spi: pisound_spi@0{
-+				compatible = "blokaslabs,pisound-spi";
-+				reg = <0>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&spi0_pins>;
-+				spi-max-frequency = <1000000>;
-+			};
-+		};
-+	};
-+
-+	fragment@4 {
-+		target-path = "/";
-+		__overlay__ {
-+			pcm5102a-codec {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,pcm5102a";
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@5 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "blokaslabs,pisound";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+
-+			pinctrl-0 = <&pisound_button_pins>;
-+
-+			osr-gpios =
-+				<&gpio 13 GPIO_ACTIVE_HIGH>,
-+				<&gpio 26 GPIO_ACTIVE_HIGH>,
-+				<&gpio 16 GPIO_ACTIVE_HIGH>;
-+
-+			reset-gpios =
-+				<&gpio 12 GPIO_ACTIVE_HIGH>,
-+				<&gpio 24 GPIO_ACTIVE_HIGH>;
-+
-+			data_available-gpios = <&gpio 25 GPIO_ACTIVE_HIGH>;
-+
-+			button-gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+
-+	fragment@6 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&pisound_button_pins>;
-+
-+			pisound_button_pins: pisound_button_pins {
-+				brcm,pins = <17>;
-+				brcm,function = <0>; // Input
-+				brcm,pull = <2>; // Pull-Up
-+			};
-+		};
-+	};
-+
-+	fragment@7 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/pitft22-overlay.dts b/arch/arm/boot/dts/overlays/pitft22-overlay.dts
-new file mode 100644
-index 000000000000..4c44ab66bc1c
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/pitft22-overlay.dts
-@@ -0,0 +1,69 @@
-+/*
-+ * Device Tree overlay for pitft by Adafruit
-+ *
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+        compatible = "brcm,bcm2835";
-+
-+        fragment@0 {
-+                target = <&spidev0>;
-+                __overlay__ {
-+                        status = "disabled";
-+                };
-+        };
-+
-+        fragment@1 {
-+                target = <&spidev1>;
-+                __overlay__ {
-+                        status = "disabled";
-+                };
-+        };
-+
-+        fragment@2 {
-+                target = <&gpio>;
-+                __overlay__ {
-+                        pitft_pins: pitft_pins {
-+                                brcm,pins = <25>;
-+                                brcm,function = <1>; /* out */
-+                                brcm,pull = <0>; /* none */
-+                        };
-+                };
-+        };
-+
-+        fragment@3 {
-+                target = <&spi0>;
-+                __overlay__ {
-+                        /* needed to avoid dtc warning */
-+                        #address-cells = <1>;
-+                        #size-cells = <0>;
-+                        status = "okay";
-+
-+                        pitft: pitft@0{
-+                                compatible = "ilitek,ili9340";
-+                                reg = <0>;
-+                                pinctrl-names = "default";
-+                                pinctrl-0 = <&pitft_pins>;
-+
-+                                spi-max-frequency = <32000000>;
-+                                rotate = <90>;
-+                                fps = <25>;
-+                                bgr;
-+                                buswidth = <8>;
-+                                dc-gpios = <&gpio 25 0>;
-+                                debug = <0>;
-+                        };
-+
-+                };
-+        };
-+
-+        __overrides__ {
-+                speed =   <&pitft>,"spi-max-frequency:0";
-+                rotate =  <&pitft>,"rotate:0";
-+                fps =     <&pitft>,"fps:0";
-+                debug =   <&pitft>,"debug:0";
-+        };
-+};
-diff --git a/arch/arm/boot/dts/overlays/pitft28-capacitive-overlay.dts b/arch/arm/boot/dts/overlays/pitft28-capacitive-overlay.dts
-new file mode 100644
-index 000000000000..33901ee1db7a
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/pitft28-capacitive-overlay.dts
-@@ -0,0 +1,91 @@
-+/*
-+ * Device Tree overlay for Adafruit PiTFT 2.8" capacitive touch screen
-+ *
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+        compatible = "brcm,bcm2835";
-+
-+        fragment@0 {
-+                target = <&spi0>;
-+                __overlay__ {
-+                        status = "okay";
-+                };
-+        };
-+
-+	fragment@1 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+        fragment@2 {
-+                target = <&gpio>;
-+                __overlay__ {
-+                        pitft_pins: pitft_pins {
-+                                brcm,pins = <24 25>;
-+                                brcm,function = <0 1>; /* in out */
-+                                brcm,pull = <2 0>; /* pullup none */
-+                        };
-+                };
-+        };
-+
-+        fragment@3 {
-+                target = <&spi0>;
-+                __overlay__ {
-+                        /* needed to avoid dtc warning */
-+                        #address-cells = <1>;
-+                        #size-cells = <0>;
-+
-+                        pitft: pitft@0{
-+                                compatible = "ilitek,ili9340";
-+                                reg = <0>;
-+                                pinctrl-names = "default";
-+                                pinctrl-0 = <&pitft_pins>;
-+
-+                                spi-max-frequency = <32000000>;
-+                                rotate = <90>;
-+                                fps = <25>;
-+                                bgr;
-+                                buswidth = <8>;
-+                                dc-gpios = <&gpio 25 0>;
-+                                debug = <0>;
-+                        };
-+                };
-+        };
-+
-+        fragment@4 {
-+                target = <&i2c1>;
-+                __overlay__ {
-+                        /* needed to avoid dtc warning */
-+                        #address-cells = <1>;
-+                        #size-cells = <0>;
-+
-+                        ft6236: ft6236@38 {
-+                                compatible = "focaltech,ft6236";
-+                                reg = <0x38>;
-+
-+                                interrupt-parent = <&gpio>;
-+                                interrupts = <24 2>;
-+                                touchscreen-size-x = <240>;
-+                                touchscreen-size-y = <320>;
-+                        };
-+                };
-+        };
-+
-+        __overrides__ {
-+                speed =   <&pitft>,"spi-max-frequency:0";
-+                rotate =  <&pitft>,"rotate:0";
-+                fps =     <&pitft>,"fps:0";
-+                debug =   <&pitft>,"debug:0";
-+                touch-sizex = <&ft6236>,"touchscreen-size-x?";
-+                touch-sizey = <&ft6236>,"touchscreen-size-y?";
-+                touch-invx  = <&ft6236>,"touchscreen-inverted-x?";
-+                touch-invy  = <&ft6236>,"touchscreen-inverted-y?";
-+                touch-swapxy = <&ft6236>,"touchscreen-swapped-x-y?";
-+        };
-+};
-diff --git a/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts b/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts
-new file mode 100644
-index 000000000000..cfe7d2f39732
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts
-@@ -0,0 +1,121 @@
-+/*
-+ * Device Tree overlay for Adafruit PiTFT 2.8" resistive touch screen
-+ *
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&spidev1>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			pitft_pins: pitft_pins {
-+				brcm,pins = <24 25>;
-+				brcm,function = <0 1>; /* in out */
-+				brcm,pull = <2 0>; /* pullup none */
-+			};
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			pitft: pitft@0{
-+				compatible = "ilitek,ili9340", "multi-inno,mi0283qt";
-+				reg = <0>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&pitft_pins>;
-+
-+				spi-max-frequency = <32000000>;
-+				rotate = <90>;
-+				fps = <25>;
-+				bgr;
-+				buswidth = <8>;
-+				dc-gpios = <&gpio 25 0>;
-+				debug = <0>;
-+			};
-+
-+			pitft_ts@1 {
-+				compatible = "st,stmpe610";
-+				reg = <1>;
-+
-+				spi-max-frequency = <500000>;
-+				irq-gpio = <&gpio 24 0x2>; /* IRQF_TRIGGER_FALLING */
-+				interrupts = <24 2>; /* high-to-low edge triggered */
-+				interrupt-parent = <&gpio>;
-+				interrupt-controller;
-+
-+				stmpe_touchscreen {
-+					compatible = "st,stmpe-ts";
-+					st,sample-time = <4>;
-+					st,mod-12b = <1>;
-+					st,ref-sel = <0>;
-+					st,adc-freq = <2>;
-+					st,ave-ctrl = <3>;
-+					st,touch-det-delay = <4>;
-+					st,settling = <2>;
-+					st,fraction-z = <7>;
-+					st,i-drive = <0>;
-+				};
-+
-+				stmpe_gpio: stmpe_gpio {
-+					#gpio-cells = <2>;
-+					compatible = "st,stmpe-gpio";
-+					/*
-+					 * only GPIO2 is wired/available
-+					 * and it is wired to the backlight
-+					 */
-+					st,norequest-mask = <0x7b>;
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@5 {
-+		target-path = "/soc";
-+		__overlay__ {
-+			backlight {
-+				compatible = "gpio-backlight";
-+				gpios = <&stmpe_gpio 2 0>;
-+				default-on;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		speed =   <&pitft>,"spi-max-frequency:0";
-+		rotate =  <&pitft>,"rotate:0", /* fbtft */
-+			  <&pitft>,"rotation:0"; /* drm */
-+		fps =     <&pitft>,"fps:0";
-+		debug =   <&pitft>,"debug:0";
-+		drm =     <&pitft>,"compatible=multi-inno,mi0283qt";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts b/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts
-new file mode 100644
-index 000000000000..fc0f5e5446ee
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts
-@@ -0,0 +1,122 @@
-+/*
-+ * Device Tree overlay for Adafruit PiTFT 3.5" resistive touch screen
-+ *
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&spidev1>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			pitft_pins: pitft_pins {
-+				brcm,pins = <24 25>;
-+				brcm,function = <0 1>; /* in out */
-+				brcm,pull = <2 0>; /* pullup none */
-+			};
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			pitft: pitft@0{
-+				compatible = "himax,hx8357d", "adafruit,yx350hv15";
-+				reg = <0>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&pitft_pins>;
-+
-+				spi-max-frequency = <32000000>;
-+				rotate = <90>;
-+				fps = <25>;
-+				bgr;
-+				buswidth = <8>;
-+				dc-gpios = <&gpio 25 0>;
-+				debug = <0>;
-+			};
-+
-+			pitft_ts@1 {
-+				compatible = "st,stmpe610";
-+				reg = <1>;
-+
-+				spi-max-frequency = <500000>;
-+				irq-gpio = <&gpio 24 0x2>; /* IRQF_TRIGGER_FALLING */
-+				interrupts = <24 2>; /* high-to-low edge triggered */
-+				interrupt-parent = <&gpio>;
-+				interrupt-controller;
-+
-+				stmpe_touchscreen {
-+					compatible = "st,stmpe-ts";
-+					st,sample-time = <4>;
-+					st,mod-12b = <1>;
-+					st,ref-sel = <0>;
-+					st,adc-freq = <2>;
-+					st,ave-ctrl = <3>;
-+					st,touch-det-delay = <4>;
-+					st,settling = <2>;
-+					st,fraction-z = <7>;
-+					st,i-drive = <0>;
-+				};
-+
-+				stmpe_gpio: stmpe_gpio {
-+					#gpio-cells = <2>;
-+					compatible = "st,stmpe-gpio";
-+					/*
-+					 * only GPIO2 is wired/available
-+					 * and it is wired to the backlight
-+					 */
-+					st,norequest-mask = <0x7b>;
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@5 {
-+		target-path = "/soc";
-+		__overlay__ {
-+			backlight: backlight {
-+				compatible = "gpio-backlight";
-+				gpios = <&stmpe_gpio 2 0>;
-+				default-on;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		speed =   <&pitft>,"spi-max-frequency:0";
-+		rotate =  <&pitft>,"rotate:0", /* fbtft */
-+			  <&pitft>,"rotation:0"; /* drm */
-+		fps =     <&pitft>,"fps:0";
-+		debug =   <&pitft>,"debug:0";
-+		drm =     <&pitft>,"compatible=adafruit,yx350hv15",
-+			  <&pitft>,"backlight:0=",<&backlight>;
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/pps-gpio-overlay.dts b/arch/arm/boot/dts/overlays/pps-gpio-overlay.dts
-new file mode 100644
-index 000000000000..a4f6b868aad8
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/pps-gpio-overlay.dts
-@@ -0,0 +1,39 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+	fragment@0 {
-+		target-path = "/";
-+		__overlay__ {
-+			pps: pps@12 {
-+				compatible = "pps-gpio";
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&pps_pins>;
-+				gpios = <&gpio 18 0>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			pps_pins: pps_pins@12 {
-+				brcm,pins =     <18>;
-+				brcm,function = <0>;    // in
-+				brcm,pull =     <0>;    // off
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		gpiopin = <&pps>,"gpios:4",
-+			  <&pps>,"reg:0",
-+			  <&pps_pins>,"brcm,pins:0",
-+			  <&pps_pins>,"reg:0";
-+		assert_falling_edge = <&pps>,"assert-falling-edge?";
-+		capture_clear = <&pps>,"capture-clear?";
-+		pull = <&pps_pins>,"brcm,pull:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/proto-codec-overlay.dts b/arch/arm/boot/dts/overlays/proto-codec-overlay.dts
-new file mode 100644
-index 000000000000..9cda044a0f62
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/proto-codec-overlay.dts
-@@ -0,0 +1,39 @@
-+// Definitions for Rpi-Proto
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			wm8731@1a {
-+				#sound-dai-cells = <0>;
-+				compatible = "wlf,wm8731";
-+				reg = <0x1a>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "rpi,rpi-proto";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts b/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts
-new file mode 100644
-index 000000000000..4ddbbfa04065
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts
-@@ -0,0 +1,49 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/*
-+This is the 2-channel overlay - only use it if you need both channels.
-+
-+Legal pin,function combinations for each channel:
-+  PWM0: 12,4(Alt0) 18,2(Alt5) 40,4(Alt0)            52,5(Alt1)
-+  PWM1: 13,4(Alt0) 19,2(Alt5) 41,4(Alt0) 45,4(Alt0) 53,5(Alt1)
-+
-+N.B.:
-+  1) Pin 18 is the only one available on all platforms, and
-+     it is the one used by the I2S audio interface.
-+     Pins 12 and 13 might be better choices on an A+, B+ or Pi2.
-+  2) The onboard analogue audio output uses both PWM channels.
-+  3) So be careful mixing audio and PWM.
-+*/
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			pwm_pins: pwm_pins {
-+				brcm,pins = <18 19>;
-+				brcm,function = <2 2>; /* Alt5 */
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&pwm>;
-+		frag1: __overlay__ {
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&pwm_pins>;
-+			assigned-clock-rates = <100000000>;
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		pin   = <&pwm_pins>,"brcm,pins:0";
-+		pin2  = <&pwm_pins>,"brcm,pins:4";
-+		func  = <&pwm_pins>,"brcm,function:0";
-+		func2 = <&pwm_pins>,"brcm,function:4";
-+		clock = <&frag1>,"assigned-clock-rates:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/pwm-ir-tx-overlay.dts b/arch/arm/boot/dts/overlays/pwm-ir-tx-overlay.dts
-new file mode 100644
-index 000000000000..119caf746b3b
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/pwm-ir-tx-overlay.dts
-@@ -0,0 +1,40 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			pwm0_pins: pwm0_pins {
-+				brcm,pins = <18>;
-+				brcm,function = <2>; /* Alt5 */
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&pwm>;
-+		__overlay__ {
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&pwm0_pins>;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target-path = "/";
-+		__overlay__ {
-+			pwm-ir-transmitter {
-+				compatible = "pwm-ir-tx";
-+				pwms = <&pwm 0 100>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		gpio_pin = <&pwm0_pins>, "brcm,pins:0";
-+		func = <&pwm0_pins>,"brcm,function:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/pwm-overlay.dts b/arch/arm/boot/dts/overlays/pwm-overlay.dts
-new file mode 100644
-index 000000000000..92876ab3bc8c
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/pwm-overlay.dts
-@@ -0,0 +1,45 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/*
-+Legal pin,function combinations for each channel:
-+  PWM0: 12,4(Alt0) 18,2(Alt5) 40,4(Alt0)            52,5(Alt1)
-+  PWM1: 13,4(Alt0) 19,2(Alt5) 41,4(Alt0) 45,4(Alt0) 53,5(Alt1)
-+
-+N.B.:
-+  1) Pin 18 is the only one available on all platforms, and
-+     it is the one used by the I2S audio interface.
-+     Pins 12 and 13 might be better choices on an A+, B+ or Pi2.
-+  2) The onboard analogue audio output uses both PWM channels.
-+  3) So be careful mixing audio and PWM.
-+*/
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			pwm_pins: pwm_pins {
-+				brcm,pins = <18>;
-+				brcm,function = <2>; /* Alt5 */
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&pwm>;
-+		frag1: __overlay__ {
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&pwm_pins>;
-+			assigned-clock-rates = <100000000>;
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		pin   = <&pwm_pins>,"brcm,pins:0";
-+		func  = <&pwm_pins>,"brcm,function:0";
-+		clock = <&frag1>,"assigned-clock-rates:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/qca7000-overlay.dts b/arch/arm/boot/dts/overlays/qca7000-overlay.dts
-new file mode 100644
-index 000000000000..f695f36024fa
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/qca7000-overlay.dts
-@@ -0,0 +1,55 @@
-+// Overlay for the Qualcomm Atheros QCA7000 on PLC Stamp micro EVK
-+// Visit: https://in-tech-smartcharging.com/products/evaluation-tools/plc-stamp-micro-2-evaluation-board for details
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			status = "okay";
-+
-+			eth1: qca7000@0 {
-+				compatible = "qca,qca7000";
-+				reg = <0>; /* CE0 */
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&eth1_pins>;
-+				interrupt-parent = <&gpio>;
-+				interrupts = <23 0x1>; /* rising edge */
-+				spi-max-frequency = <12000000>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			eth1_pins: eth1_pins {
-+				brcm,pins = <23>;
-+				brcm,function = <0>; /* in */
-+				brcm,pull = <0>; /* none */
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		int_pin = <&eth1>, "interrupts:0",
-+		          <&eth1_pins>, "brcm,pins:0";
-+		speed   = <&eth1>, "spi-max-frequency:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/qca7000-uart0-overlay.dts b/arch/arm/boot/dts/overlays/qca7000-uart0-overlay.dts
-new file mode 100644
-index 000000000000..f103916c9e1c
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/qca7000-uart0-overlay.dts
-@@ -0,0 +1,46 @@
-+// Overlay for the Qualcomm Atheros QCA7000 on PLC Stamp micro EVK
-+// Visit: https://in-tech-smartcharging.com/products/evaluation-tools/plc-stamp-micro-2-evaluation-board for details
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&uart0>;
-+		__overlay__ {
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&uart0_pins>;
-+			status = "okay";
-+
-+			eth2: qca7000 {
-+				compatible = "qca,qca7000";
-+				current-speed = <115200>;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			uart0_pins: uart0_ovl_pins {
-+				brcm,pins = <14 15>;
-+				brcm,function = <4>; /* alt0 */
-+				brcm,pull = <0 2>;
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target-path = "/aliases";
-+		__overlay__ {
-+			serial0 = "/soc/serial@7e201000";
-+			serial1 = "/soc/serial@7e215040";
-+		};
-+	};
-+
-+	__overrides__ {
-+		baudrate = <&eth2>, "current-speed:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/ramoops-overlay.dts b/arch/arm/boot/dts/overlays/ramoops-overlay.dts
-new file mode 100644
-index 000000000000..e5038658138d
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/ramoops-overlay.dts
-@@ -0,0 +1,25 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&rmem>;
-+		__overlay__ {
-+			ramoops: ramoops@b000000 {
-+				compatible = "ramoops";
-+				reg = <0x0b000000 0x10000>; /* 64kB */
-+				record-size = <0x4000>; /* 16kB */
-+				console-size = <0>; /* disabled by default */
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		base-addr = <&ramoops>,"reg:0";
-+		total-size = <&ramoops>,"reg:4";
-+		record-size = <&ramoops>,"record-size:0";
-+		console-size = <&ramoops>,"console-size:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/ramoops-pi4-overlay.dts b/arch/arm/boot/dts/overlays/ramoops-pi4-overlay.dts
-new file mode 100644
-index 000000000000..4f3d30ef069a
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/ramoops-pi4-overlay.dts
-@@ -0,0 +1,25 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&rmem>;
-+		__overlay__ {
-+			ramoops: ramoops@b000000 {
-+				compatible = "ramoops";
-+				reg = <0x0 0x0b000000 0x10000>; /* 64kB */
-+				record-size = <0x4000>; /* 16kB */
-+				console-size = <0>; /* disabled by default */
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		base-addr = <&ramoops>,"reg#0";
-+		total-size = <&ramoops>,"reg:8";
-+		record-size = <&ramoops>,"record-size:0";
-+		console-size = <&ramoops>,"console-size:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/rotary-encoder-overlay.dts b/arch/arm/boot/dts/overlays/rotary-encoder-overlay.dts
-new file mode 100644
-index 000000000000..ea1d952734e9
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/rotary-encoder-overlay.dts
-@@ -0,0 +1,59 @@
-+// Device tree overlay for GPIO connected rotary encoder.
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			rotary_pins: rotary_pins@4 {
-+				brcm,pins = <4 17>; /* gpio 4 17 */
-+				brcm,function = <0 0>; /* input */
-+				brcm,pull = <2 2>; /* pull-up */
-+			};
-+
-+		};
-+	};
-+
-+	fragment@1 {
-+		target-path = "/";
-+		__overlay__ {
-+			rotary: rotary@4 {
-+				compatible = "rotary-encoder";
-+				status = "okay";
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&rotary_pins>;
-+				gpios = <&gpio 4 0>, <&gpio 17 0>;
-+				linux,axis = <0>; /* REL_X */
-+				rotary-encoder,encoding = "gray";
-+				rotary-encoder,steps = <24>; /* 24 default */
-+				rotary-encoder,steps-per-period = <1>; /* corresponds to full period mode. See README */
-+			};
-+		};
-+
-+	};  
-+
-+	__overrides__ {
-+		pin_a =		    <&rotary>,"gpios:4",
-+				    <&rotary_pins>,"brcm,pins:0",
-+				    /* modify reg values to allow multiple instantiation */
-+				    <&rotary>,"reg:0",
-+				    <&rotary_pins>,"reg:0";
-+		pin_b =		    <&rotary>,"gpios:16",
-+				    <&rotary_pins>,"brcm,pins:4";
-+		relative_axis =     <&rotary>,"rotary-encoder,relative-axis?";
-+		linux_axis =        <&rotary>,"linux,axis:0";
-+		rollover =          <&rotary>,"rotary-encoder,rollover?";
-+		steps-per-period =  <&rotary>,"rotary-encoder,steps-per-period:0";
-+		steps =             <&rotary>,"rotary-encoder,steps:0";
-+		wakeup =            <&rotary>,"wakeup-source?";
-+		encoding =          <&rotary>,"rotary-encoder,encoding";
-+                /* legacy parameters*/
-+		rotary0_pin_a =     <&rotary>,"gpios:4",
-+		                    <&rotary_pins>,"brcm,pins:0";
-+		rotary0_pin_b =     <&rotary>,"gpios:16",
-+		                    <&rotary_pins>,"brcm,pins:4";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/rpi-backlight-overlay.dts b/arch/arm/boot/dts/overlays/rpi-backlight-overlay.dts
-new file mode 100644
-index 000000000000..cac5e44c6ec5
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/rpi-backlight-overlay.dts
-@@ -0,0 +1,21 @@
-+/*
-+ * Devicetree overlay for mailbox-driven Raspberry Pi DSI Display
-+ * backlight controller
-+ */
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target-path = "/";
-+		__overlay__ {
-+			rpi_backlight: rpi_backlight {
-+				compatible = "raspberrypi,rpi-backlight";
-+				firmware = <&firmware>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/rpi-codeczero-overlay.dts b/arch/arm/boot/dts/overlays/rpi-codeczero-overlay.dts
-new file mode 100644
-index 000000000000..c3b0564b2fb2
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/rpi-codeczero-overlay.dts
-@@ -0,0 +1,9 @@
-+// Overlay for the Raspberry Pi Codec Zero soundcard
-+
-+#include "iqaudio-codec-overlay.dts"
-+
-+&iqaudio_dac {
-+	card_name = "RPi Codec Zero";
-+	dai_name = "Raspberry Pi Codec Zero";
-+	dai_stream_name = "Raspberry Pi Codec Zero HiFi";
-+};
-diff --git a/arch/arm/boot/dts/overlays/rpi-dacplus-overlay.dts b/arch/arm/boot/dts/overlays/rpi-dacplus-overlay.dts
-new file mode 100644
-index 000000000000..47557aa17f19
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/rpi-dacplus-overlay.dts
-@@ -0,0 +1,17 @@
-+// Overlay for the Raspberry Pi DAC Plus soundcard
-+
-+#include "iqaudio-dacplus-overlay.dts"
-+
-+&iqaudio_dac {
-+	card_name = "RPi DAC+";
-+	dai_name = "Raspberry Pi DAC+";
-+	dai_stream_name = "Raspberry Pi DAC+ HiFi";
-+	/delete-property/ mute-gpios;
-+};
-+
-+/ {
-+	__overrides__ {
-+		/delete-property/ auto_mute_amp;
-+		/delete-property/ unmute_amp;
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/rpi-dacpro-overlay.dts b/arch/arm/boot/dts/overlays/rpi-dacpro-overlay.dts
-new file mode 100644
-index 000000000000..412260c64edf
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/rpi-dacpro-overlay.dts
-@@ -0,0 +1,17 @@
-+// Overlay for the Raspberry Pi DAC Pro soundcard
-+
-+#include "iqaudio-dacplus-overlay.dts"
-+
-+&iqaudio_dac {
-+	card_name = "RPi DAC Pro";
-+	dai_name = "Raspberry Pi DAC Pro";
-+	dai_stream_name = "Raspberry Pi DAC Pro HiFi";
-+	/delete-property/ mute-gpios;
-+};
-+
-+/ {
-+	__overrides__ {
-+		/delete-property/ auto_mute_amp;
-+		/delete-property/ unmute_amp;
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/rpi-digiampplus-overlay.dts b/arch/arm/boot/dts/overlays/rpi-digiampplus-overlay.dts
-new file mode 100644
-index 000000000000..5e73d6c1bf42
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/rpi-digiampplus-overlay.dts
-@@ -0,0 +1,17 @@
-+// Overlay for the Raspberry Pi DAC Plus soundcard
-+
-+#include "iqaudio-dacplus-overlay.dts"
-+
-+&iqaudio_dac {
-+	card_name = "RPi DigiAMP+";
-+	dai_name = "Raspberry Pi DigiAMP+";
-+	dai_stream_name = "Raspberry Pi DigiAMP+ HiFi";
-+	iqaudio-dac,auto-mute-amp;
-+};
-+
-+/ {
-+	__overrides__ {
-+		unmute_amp = <&iqaudio_dac>,"iqaudio-dac,unmute-amp?",
-+			     <&iqaudio_dac>,"iqaudio-dac,auto-mute-amp!";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts b/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts
-new file mode 100644
-index 000000000000..8483c4f4b2eb
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts
-@@ -0,0 +1,25 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target-path = "/soc/firmware";
-+		__overlay__ {
-+			ts: touchscreen {
-+				compatible = "raspberrypi,firmware-ts";
-+				touchscreen-size-x = <800>;
-+				touchscreen-size-y = <480>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		touchscreen-size-x = <&ts>,"touchscreen-size-x:0";
-+		touchscreen-size-y = <&ts>,"touchscreen-size-y:0";
-+		touchscreen-inverted-x = <&ts>,"touchscreen-inverted-x?";
-+		touchscreen-inverted-y = <&ts>,"touchscreen-inverted-y?";
-+		touchscreen-swapped-x-y = <&ts>,"touchscreen-swapped-x-y?";
-+        };
-+};
-diff --git a/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts b/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts
-new file mode 100644
-index 000000000000..a4530c10dd42
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts
-@@ -0,0 +1,154 @@
-+/*
-+ * Overlay for the Raspberry Pi POE HAT.
-+ */
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target-path = "/";
-+		__overlay__ {
-+			fan: pwm-fan {
-+				compatible = "pwm-fan";
-+				cooling-levels = <0 1 10 100 255>;
-+				#cooling-cells = <2>;
-+				pwms = <&fwpwm 0 80000>;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&cpu_thermal>;
-+		__overlay__ {
-+			polling-delay = <2000>; /* milliseconds */
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&thermal_trips>;
-+		__overlay__ {
-+			trip0: trip0 {
-+				temperature = <40000>;
-+				hysteresis = <2000>;
-+				type = "active";
-+			};
-+			trip1: trip1 {
-+				temperature = <45000>;
-+				hysteresis = <2000>;
-+				type = "active";
-+			};
-+			trip2: trip2 {
-+				temperature = <50000>;
-+				hysteresis = <2000>;
-+				type = "active";
-+			};
-+			trip3: trip3 {
-+				temperature = <55000>;
-+				hysteresis = <5000>;
-+				type = "active";
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&cooling_maps>;
-+		__overlay__ {
-+			map0 {
-+				trip = <&trip0>;
-+				cooling-device = <&fan 0 1>;
-+			};
-+			map1 {
-+				trip = <&trip1>;
-+				cooling-device = <&fan 1 2>;
-+			};
-+			map2 {
-+				trip = <&trip2>;
-+				cooling-device = <&fan 2 3>;
-+			};
-+			map3 {
-+				trip = <&trip3>;
-+				cooling-device = <&fan 3 4>;
-+			};
-+		};
-+	};
-+
-+	fragment@4 {
-+		target-path = "/__overrides__";
-+		params: __overlay__ {
-+			poe_fan_temp0 =		<&trip0>,"temperature:0";
-+			poe_fan_temp0_hyst =	<&trip0>,"hysteresis:0";
-+			poe_fan_temp1 =		<&trip1>,"temperature:0";
-+			poe_fan_temp1_hyst =	<&trip1>,"hysteresis:0";
-+			poe_fan_temp2 =		<&trip2>,"temperature:0";
-+			poe_fan_temp2_hyst =	<&trip2>,"hysteresis:0";
-+			poe_fan_temp3 =		<&trip3>,"temperature:0";
-+			poe_fan_temp3_hyst =	<&trip3>,"hysteresis:0";
-+			poe_fan_i2c =		<&fwpwm>,"status=disabled",
-+						<&poe_mfd>,"status=okay",
-+						<&fan>,"pwms:0=",<&poe_mfd_pwm>;
-+		};
-+	};
-+
-+	fragment@5 {
-+		target = <&firmware>;
-+		__overlay__ {
-+			fwpwm: pwm {
-+				compatible = "raspberrypi,firmware-poe-pwm";
-+				#pwm-cells = <2>;
-+			};
-+		};
-+	};
-+
-+	fragment@6 {
-+		target = <&i2c0>;
-+		i2c_bus: __overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			poe_mfd: poe@51 {
-+				compatible = "raspberrypi,poe-core";
-+				reg = <0x51>;
-+				status = "disabled";
-+
-+				poe_mfd_pwm: poe_pwm@f0 {
-+					compatible = "raspberrypi,poe-pwm";
-+					reg = <0xf0>;
-+					status = "okay";
-+					#pwm-cells = <2>;
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@7 {
-+		target = <&i2c0if>;
-+		__dormant__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@8 {
-+		target = <&i2c0mux>;
-+		__dormant__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		poe_fan_temp0 =		<&trip0>,"temperature:0";
-+		poe_fan_temp0_hyst =	<&trip0>,"hysteresis:0";
-+		poe_fan_temp1 =		<&trip1>,"temperature:0";
-+		poe_fan_temp1_hyst =	<&trip1>,"hysteresis:0";
-+		poe_fan_temp2 =		<&trip2>,"temperature:0";
-+		poe_fan_temp2_hyst =	<&trip2>,"hysteresis:0";
-+		poe_fan_temp3 =		<&trip3>,"temperature:0";
-+		poe_fan_temp3_hyst =	<&trip3>,"hysteresis:0";
-+		i2c =			<0>, "+5+6",
-+					<&fwpwm>,"status=disabled",
-+					<&i2c_bus>,"status=okay",
-+					<&poe_mfd>,"status=okay",
-+					<&fan>,"pwms:0=",<&poe_mfd_pwm>;
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/rpi-poe-plus-overlay.dts b/arch/arm/boot/dts/overlays/rpi-poe-plus-overlay.dts
-new file mode 100644
-index 000000000000..54deda2f18c3
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/rpi-poe-plus-overlay.dts
-@@ -0,0 +1,49 @@
-+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
-+// Overlay for the Raspberry Pi PoE+ HAT.
-+
-+#include "rpi-poe-overlay.dts"
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@10 {
-+		target-path = "/";
-+		__overlay__ {
-+			rpi_poe_power_supply: rpi-poe-power-supply {
-+				compatible = "raspberrypi,rpi-poe-power-supply";
-+				firmware = <&firmware>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+	fragment@11 {
-+		target = <&poe_mfd>;
-+		__overlay__ {
-+			rpi-poe-power-supply@f2 {
-+				compatible = "raspberrypi,rpi-poe-power-supply";
-+				reg = <0xf2>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		i2c =	<0>, "+5+6",
-+			<&fwpwm>,"status=disabled",
-+			<&rpi_poe_power_supply>,"status=disabled",
-+			<&i2c_bus>,"status=okay",
-+			<&poe_mfd>,"status=okay",
-+			<&fan>,"pwms:0=",<&poe_mfd_pwm>;
-+	};
-+};
-+
-+&fan {
-+	cooling-levels = <0 32 64 128 255>;
-+};
-+
-+&params {
-+	poe_fan_i2c = <&fwpwm>,"status=disabled",
-+		      <&rpi_poe_power_supply>,"status=disabled",
-+		      <&poe_mfd>,"status=okay",
-+		      <&fan>,"pwms:0=",<&poe_mfd_pwm>;
-+};
-diff --git a/arch/arm/boot/dts/overlays/rpi-sense-overlay.dts b/arch/arm/boot/dts/overlays/rpi-sense-overlay.dts
-new file mode 100644
-index 000000000000..89d8d2ea6b2e
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/rpi-sense-overlay.dts
-@@ -0,0 +1,47 @@
-+// rpi-sense HAT
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			rpi-sense@46 {
-+				compatible = "rpi,rpi-sense";
-+				reg = <0x46>;
-+				keys-int-gpios = <&gpio 23 1>;
-+				status = "okay";
-+			};
-+
-+			lsm9ds1-magn@1c {
-+				compatible = "st,lsm9ds1-magn";
-+				reg = <0x1c>;
-+				status = "okay";
-+			};
-+
-+			lsm9ds1-accel6a {
-+				compatible = "st,lsm9ds1-accel";
-+				reg = <0x6a>;
-+				status = "okay";
-+			};
-+
-+			lps25h-press@5c {
-+				compatible = "st,lps25h-press";
-+				reg = <0x5c>;
-+				status = "okay";
-+			};
-+
-+			hts221-humid@5f {
-+				compatible = "st,hts221-humid", "st,hts221";
-+				reg = <0x5f>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/rpi-sense-v2-overlay.dts b/arch/arm/boot/dts/overlays/rpi-sense-v2-overlay.dts
-new file mode 100644
-index 000000000000..1b86c032259b
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/rpi-sense-v2-overlay.dts
-@@ -0,0 +1,47 @@
-+// rpi-sense HAT
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			rpi-sense@46 {
-+				compatible = "rpi,rpi-sense";
-+				reg = <0x46>;
-+				keys-int-gpios = <&gpio 23 1>;
-+				status = "okay";
-+			};
-+
-+			lsm9ds1-magn@1c {
-+				compatible = "st,lsm9ds1-magn";
-+				reg = <0x1c>;
-+				status = "okay";
-+			};
-+
-+			lps25h-press@5c {
-+				compatible = "st,lps25h-press";
-+				reg = <0x5c>;
-+				status = "okay";
-+			};
-+
-+			hts221-humid@5f {
-+				compatible = "st,hts221-humid", "st,hts221";
-+				reg = <0x5f>;
-+				status = "okay";
-+			};
-+
-+			lsm9ds1-accel@6a {
-+				compatible = "st,lsm9ds1-accel";
-+				reg = <0x6a>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/rpi-tv-overlay.dts b/arch/arm/boot/dts/overlays/rpi-tv-overlay.dts
-new file mode 100644
-index 000000000000..3c97a545d820
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/rpi-tv-overlay.dts
-@@ -0,0 +1,34 @@
-+// rpi-tv HAT
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			status = "okay";
-+
-+			cxd2880@0 {
-+				compatible = "sony,cxd2880";
-+				reg = <0>; /* CE0 */
-+				spi-max-frequency = <50000000>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+};
-diff --git a/arch/arm/boot/dts/overlays/rra-digidac1-wm8741-audio-overlay.dts b/arch/arm/boot/dts/overlays/rra-digidac1-wm8741-audio-overlay.dts
-new file mode 100644
-index 000000000000..87e9a326eff1
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/rra-digidac1-wm8741-audio-overlay.dts
-@@ -0,0 +1,49 @@
-+// Definitions for RRA DigiDAC1 Audio card
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			wm8804@3b {
-+				#sound-dai-cells = <0>;
-+				compatible = "wlf,wm8804";
-+				reg = <0x3b>;
-+				status = "okay";
-+				PVDD-supply = <&vdd_3v3_reg>;
-+				DVDD-supply = <&vdd_3v3_reg>;
-+			};
-+
-+			wm8742: wm8741@1a {
-+				compatible = "wlf,wm8741";
-+				reg = <0x1a>;
-+				status = "okay";
-+				AVDD-supply = <&vdd_5v0_reg>;
-+				DVDD-supply = <&vdd_3v3_reg>;
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "rra,digidac1-soundcard";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts b/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts
-new file mode 100644
-index 000000000000..c51f1c030a55
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts
-@@ -0,0 +1,52 @@
-+/*
-+ * Device Tree overlay for the Sainsmart 1.8" TFT LCD with ST7735R chip 160x128
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			ss18: sainsmart18@0 {
-+				compatible = "fbtft,sainsmart18";
-+				reg = <0>;
-+				pinctrl-names = "default";
-+				spi-max-frequency = <40000000>;
-+				rotate = <90>;
-+				buswidth = <8>;
-+				fps = <50>;
-+				height = <160>;
-+				width = <128>;
-+				reset-gpios = <&gpio 25 1>;
-+				dc-gpios = <&gpio 24 0>;
-+				debug = <0>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		speed     = <&ss18>,"spi-max-frequency:0";
-+		rotate    = <&ss18>,"rotate:0";
-+		fps       = <&ss18>,"fps:0";
-+		bgr       = <&ss18>,"bgr?";
-+		debug     = <&ss18>,"debug:0";
-+		dc_pin    = <&ss18>,"dc-gpios:4";
-+		reset_pin = <&ss18>,"reset-gpios:4";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts b/arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts
-new file mode 100644
-index 000000000000..04d74d62897b
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts
-@@ -0,0 +1,43 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2c_arm>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			sc16is750: sc16is750@48 {
-+				compatible = "nxp,sc16is750";
-+				reg = <0x48>; /* i2c address */
-+				clocks = <&sc16is750_clk>;
-+				interrupt-parent = <&gpio>;
-+				interrupts = <24 2>; /* IRQ_TYPE_EDGE_FALLING */
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				i2c-max-frequency = <400000>;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target-path = "/";
-+		__overlay__ {
-+			sc16is750_clk: sc16is750_i2c_clk@48 {
-+				compatible = "fixed-clock";
-+				#clock-cells = <0>;
-+				clock-frequency = <14745600>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		int_pin = <&sc16is750>,"interrupts:0";
-+		addr = <&sc16is750>,"reg:0", <&sc16is750_clk>,"name";
-+		xtal = <&sc16is750_clk>,"clock-frequency:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/sc16is752-i2c-overlay.dts b/arch/arm/boot/dts/overlays/sc16is752-i2c-overlay.dts
-new file mode 100644
-index 000000000000..da05e981314c
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/sc16is752-i2c-overlay.dts
-@@ -0,0 +1,43 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2c_arm>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			sc16is752: sc16is752@48 {
-+				compatible = "nxp,sc16is752";
-+				reg = <0x48>; /* i2c address */
-+				clocks = <&sc16is752_clk>;
-+				interrupt-parent = <&gpio>;
-+				interrupts = <24 2>; /* IRQ_TYPE_EDGE_FALLING */
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				i2c-max-frequency = <400000>;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target-path = "/";
-+		__overlay__ {
-+			sc16is752_clk: sc16is752_i2c_clk@48 {
-+				compatible = "fixed-clock";
-+				#clock-cells = <0>;
-+				clock-frequency = <14745600>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		int_pin = <&sc16is752>,"interrupts:0";
-+		addr = <&sc16is752>,"reg:0",<&sc16is752_clk>,"name";
-+		xtal = <&sc16is752_clk>,"clock-frequency:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/sc16is752-spi0-overlay.dts b/arch/arm/boot/dts/overlays/sc16is752-spi0-overlay.dts
-new file mode 100644
-index 000000000000..a49a04722b99
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/sc16is752-spi0-overlay.dts
-@@ -0,0 +1,49 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			sc16is752: sc16is752@0 {
-+				compatible = "nxp,sc16is752";
-+				reg = <0>; /* CE0 */
-+				clocks = <&sc16is752_clk>;
-+				interrupt-parent = <&gpio>;
-+				interrupts = <24 2>; /* IRQ_TYPE_EDGE_FALLING */
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				spi-max-frequency = <4000000>;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target-path = "/";
-+		__overlay__ {
-+			sc16is752_clk: sc16is752_spi0_0_clk {
-+				compatible = "fixed-clock";
-+				#clock-cells = <0>;
-+				clock-frequency = <14745600>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		int_pin = <&sc16is752>,"interrupts:0";
-+		xtal = <&sc16is752_clk>,"clock-frequency:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts b/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts
-new file mode 100644
-index 000000000000..730c6e8cd614
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts
-@@ -0,0 +1,67 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			spi1_pins: spi1_pins {
-+				brcm,pins = <19 20 21>;
-+				brcm,function = <3>; /* alt4 */
-+			};
-+
-+			spi1_cs_pins: spi1_cs_pins {
-+				brcm,pins = <18>;
-+				brcm,function = <1>; /* output */
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spi1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&spi1_pins &spi1_cs_pins>;
-+			cs-gpios = <&gpio 18 1>;
-+			status = "okay";
-+
-+			sc16is752: sc16is752@0 {
-+				compatible = "nxp,sc16is752";
-+				reg = <0>; /* CE0 */
-+				clocks = <&sc16is752_clk>;
-+				interrupt-parent = <&gpio>;
-+				interrupts = <24 2>; /* IRQ_TYPE_EDGE_FALLING */
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				spi-max-frequency = <4000000>;
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&aux>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target-path = "/";
-+		__overlay__ {
-+			sc16is752_clk: sc16is752_spi1_0_clk {
-+				compatible = "fixed-clock";
-+				#clock-cells = <0>;
-+				clock-frequency = <14745600>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		int_pin = <&sc16is752>,"interrupts:0";
-+		xtal = <&sc16is752_clk>,"clock-frequency:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/sdhost-overlay.dts b/arch/arm/boot/dts/overlays/sdhost-overlay.dts
-new file mode 100644
-index 000000000000..0b72b4eeac88
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/sdhost-overlay.dts
-@@ -0,0 +1,38 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/* Provide backwards compatible aliases for the old sdhost dtparams. */
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&sdhost>;
-+		frag0: __overlay__ {
-+			brcm,overclock-50 = <0>;
-+			brcm,pio-limit = <1>;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&mmc>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&mmcnr>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	__overrides__ {
-+		overclock_50     = <&frag0>,"brcm,overclock-50:0";
-+		force_pio        = <&frag0>,"brcm,force-pio?";
-+		pio_limit        = <&frag0>,"brcm,pio-limit:0";
-+		debug            = <&frag0>,"brcm,debug?";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/sdio-overlay.dts b/arch/arm/boot/dts/overlays/sdio-overlay.dts
-new file mode 100644
-index 000000000000..873e49056379
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/sdio-overlay.dts
-@@ -0,0 +1,77 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/* Enable SDIO from MMC interface via various GPIO groups */
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&mmcnr>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&mmc>;
-+		sdio_ovl: __overlay__ {
-+			pinctrl-0 = <&sdio_ovl_pins>;
-+			pinctrl-names = "default";
-+			non-removable;
-+			bus-width = <4>;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			sdio_ovl_pins: sdio_ovl_pins {
-+				brcm,pins = <22 23 24 25 26 27>;
-+				brcm,function = <7>; /* ALT3 = SD1 */
-+				brcm,pull = <0 2 2 2 2 2>;
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&sdio_ovl_pins>;
-+		__dormant__ {
-+			brcm,pins = <22 23 24 25>;
-+			brcm,pull = <0 2 2 2>;
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&sdio_ovl_pins>;
-+		__dormant__ {
-+			brcm,pins = <34 35 36 37>;
-+			brcm,pull = <0 2 2 2>;
-+		};
-+	};
-+
-+	fragment@5 {
-+		target = <&sdio_ovl_pins>;
-+		__dormant__ {
-+			brcm,pins = <34 35 36 37 38 39>;
-+			brcm,pull = <0 2 2 2 2 2>;
-+		};
-+	};
-+
-+	fragment@6 {
-+		target-path = "/aliases";
-+		__overlay__ {
-+			mmc1 = "/soc/mmc@7e300000";
-+		};
-+	};
-+
-+	__overrides__ {
-+		poll_once = <&sdio_ovl>,"non-removable?";
-+		bus_width = <&sdio_ovl>,"bus-width:0";
-+		sdio_overclock = <&sdio_ovl>,"brcm,overclock-50:0";
-+		gpios_22_25 = <0>,"=3";
-+		gpios_34_37 = <0>,"=4";
-+		gpios_34_39 = <0>,"=5";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/seeed-can-fd-hat-v1-overlay.dts b/arch/arm/boot/dts/overlays/seeed-can-fd-hat-v1-overlay.dts
-new file mode 100644
-index 000000000000..210d027a073e
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/seeed-can-fd-hat-v1-overlay.dts
-@@ -0,0 +1,138 @@
-+// redo: ovmerge -c spi1-1cs-overlay.dts,cs0_pin=18,cs0_spidev=false mcp251xfd-overlay.dts,spi0-0,interrupt=25 mcp251xfd-overlay.dts,spi1-0,interrupt=24
-+
-+// Device tree overlay for https://www.seeedstudio.com/2-Channel-CAN-BUS-FD-Shield-for-Raspberry-Pi-p-4072.html
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/interrupt-controller/irq.h>
-+#include <dt-bindings/pinctrl/bcm2835.h>
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+	fragment@0 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			spi1_pins: spi1_pins {
-+				brcm,pins = <19 20 21>;
-+				brcm,function = <3>;
-+			};
-+			spi1_cs_pins: spi1_cs_pins {
-+				brcm,pins = <18>;
-+				brcm,function = <1>;
-+			};
-+		};
-+	};
-+	fragment@1 {
-+		target = <&spi1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&spi1_pins &spi1_cs_pins>;
-+			cs-gpios = <&gpio 18 1>;
-+			status = "okay";
-+			spidev@0 {
-+				compatible = "spidev";
-+				reg = <0>;
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "disabled";
-+			};
-+		};
-+	};
-+	fragment@2 {
-+		target = <&aux>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+	fragment@3 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+	fragment@4 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			mcp251xfd_pins: mcp251xfd_spi0_0_pins {
-+				brcm,pins = <25>;
-+				brcm,function = <BCM2835_FSEL_GPIO_IN>;
-+			};
-+		};
-+	};
-+	fragment@5 {
-+		target-path = "/clocks";
-+		__overlay__ {
-+			clk_mcp251xfd_osc: mcp251xfd-spi0-0-osc {
-+				#clock-cells = <0>;
-+				compatible = "fixed-clock";
-+				clock-frequency = <40000000>;
-+			};
-+		};
-+	};
-+	fragment@6 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			mcp251xfd@0 {
-+				compatible = "microchip,mcp251xfd";
-+				reg = <0>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&mcp251xfd_pins>;
-+				spi-max-frequency = <20000000>;
-+				interrupt-parent = <&gpio>;
-+				interrupts = <25 IRQ_TYPE_LEVEL_LOW>;
-+				clocks = <&clk_mcp251xfd_osc>;
-+			};
-+		};
-+	};
-+	fragment@7 {
-+		target-path = "spi1/spidev@0";
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+	fragment@8 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			mcp251xfd_pins_1: mcp251xfd_spi1_0_pins {
-+				brcm,pins = <24>;
-+				brcm,function = <BCM2835_FSEL_GPIO_IN>;
-+			};
-+		};
-+	};
-+	fragment@9 {
-+		target-path = "/clocks";
-+		__overlay__ {
-+			clk_mcp251xfd_osc_1: mcp251xfd-spi1-0-osc {
-+				#clock-cells = <0>;
-+				compatible = "fixed-clock";
-+				clock-frequency = <40000000>;
-+			};
-+		};
-+	};
-+	fragment@10 {
-+		target = <&spi1>;
-+		__overlay__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			mcp251xfd@0 {
-+				compatible = "microchip,mcp251xfd";
-+				reg = <0>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&mcp251xfd_pins_1>;
-+				spi-max-frequency = <20000000>;
-+				interrupt-parent = <&gpio>;
-+				interrupts = <24 IRQ_TYPE_LEVEL_LOW>;
-+				clocks = <&clk_mcp251xfd_osc_1>;
-+			};
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/seeed-can-fd-hat-v2-overlay.dts b/arch/arm/boot/dts/overlays/seeed-can-fd-hat-v2-overlay.dts
-new file mode 100644
-index 000000000000..e843d0b19745
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/seeed-can-fd-hat-v2-overlay.dts
-@@ -0,0 +1,117 @@
-+// redo: ovmerge -c mcp251xfd-overlay.dts,spi0-0,interrupt=25 mcp251xfd-overlay.dts,spi0-1,interrupt=24 i2c-rtc-overlay.dts,pcf85063
-+
-+// Device tree overlay for https://www.seeedstudio.com/CAN-BUS-FD-HAT-for-Raspberry-Pi-p-4742.html 
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/interrupt-controller/irq.h>
-+#include <dt-bindings/pinctrl/bcm2835.h>
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+	fragment@0 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+	fragment@1 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			mcp251xfd_pins: mcp251xfd_spi0_0_pins {
-+				brcm,pins = <25>;
-+				brcm,function = <BCM2835_FSEL_GPIO_IN>;
-+			};
-+		};
-+	};
-+	fragment@2 {
-+		target-path = "/clocks";
-+		__overlay__ {
-+			clk_mcp251xfd_osc: mcp251xfd-spi0-0-osc {
-+				#clock-cells = <0>;
-+				compatible = "fixed-clock";
-+				clock-frequency = <40000000>;
-+			};
-+		};
-+	};
-+	fragment@3 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			mcp251xfd@0 {
-+				compatible = "microchip,mcp251xfd";
-+				reg = <0>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&mcp251xfd_pins>;
-+				spi-max-frequency = <20000000>;
-+				interrupt-parent = <&gpio>;
-+				interrupts = <25 IRQ_TYPE_LEVEL_LOW>;
-+				clocks = <&clk_mcp251xfd_osc>;
-+			};
-+		};
-+	};
-+	fragment@4 {
-+		target = <&spidev1>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+	fragment@5 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			mcp251xfd_pins_1: mcp251xfd_spi0_1_pins {
-+				brcm,pins = <24>;
-+				brcm,function = <BCM2835_FSEL_GPIO_IN>;
-+			};
-+		};
-+	};
-+	fragment@6 {
-+		target-path = "/clocks";
-+		__overlay__ {
-+			clk_mcp251xfd_osc_1: mcp251xfd-spi0-1-osc {
-+				#clock-cells = <0>;
-+				compatible = "fixed-clock";
-+				clock-frequency = <40000000>;
-+			};
-+		};
-+	};
-+	fragment@7 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			mcp251xfd@1 {
-+				compatible = "microchip,mcp251xfd";
-+				reg = <1>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&mcp251xfd_pins_1>;
-+				spi-max-frequency = <20000000>;
-+				interrupt-parent = <&gpio>;
-+				interrupts = <24 IRQ_TYPE_LEVEL_LOW>;
-+				clocks = <&clk_mcp251xfd_osc_1>;
-+			};
-+		};
-+	};
-+	fragment@8 {
-+		target = <&i2cbus>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			pcf85063@51 {
-+				compatible = "nxp,pcf85063";
-+				reg = <0x51>;
-+			};
-+		};
-+	};
-+	fragment@9 {
-+		target = <&i2c_arm>;
-+		i2cbus: __overlay__ {
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/sh1106-spi-overlay.dts b/arch/arm/boot/dts/overlays/sh1106-spi-overlay.dts
-new file mode 100644
-index 000000000000..57a0cc9b1741
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/sh1106-spi-overlay.dts
-@@ -0,0 +1,84 @@
-+/*
-+ * Device Tree overlay for SH1106 based SPI OLED display
-+ *
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&spidev1>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			sh1106_pins: sh1106_pins {
-+                                brcm,pins = <25 24>;
-+                                brcm,function = <1 1>; /* out out */
-+			};
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sh1106: sh1106@0{
-+				compatible = "sinowealth,sh1106";
-+				reg = <0>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&sh1106_pins>;
-+
-+				spi-max-frequency = <4000000>;
-+				bgr = <0>;
-+				bpp = <1>;
-+				rotate = <0>;
-+				fps = <25>;
-+				buswidth = <8>;
-+				reset-gpios = <&gpio 25 1>;
-+				dc-gpios = <&gpio 24 0>;
-+				debug = <0>;
-+
-+				sinowealth,height = <64>;
-+				sinowealth,width = <128>;
-+				sinowealth,page-offset = <0>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		speed     = <&sh1106>,"spi-max-frequency:0";
-+		rotate    = <&sh1106>,"rotate:0";
-+		fps       = <&sh1106>,"fps:0";
-+		debug     = <&sh1106>,"debug:0";
-+		dc_pin    = <&sh1106>,"dc-gpios:4",
-+		            <&sh1106_pins>,"brcm,pins:4";
-+		reset_pin = <&sh1106>,"reset-gpios:4",
-+		            <&sh1106_pins>,"brcm,pins:0";
-+		height    = <&sh1106>,"sinowealth,height:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/si446x-spi0-overlay.dts b/arch/arm/boot/dts/overlays/si446x-spi0-overlay.dts
-new file mode 100644
-index 000000000000..90495f0941fb
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/si446x-spi0-overlay.dts
-@@ -0,0 +1,53 @@
-+// Overlay for the SiLabs Si446X Controller - SPI0
-+// Default Interrupt Pin: 17
-+// Default SDN Pin: 27
-+/dts-v1/;
-+/plugin/;
-+
-+   / {
-+    compatible = "brcm,bcm2835";
-+
-+    fragment@0 {
-+        target = <&spi0>;
-+        __overlay__ {
-+            // needed to avoid dtc warning
-+            #address-cells = <1>;
-+            #size-cells = <0>;
-+
-+            status = "okay";
-+
-+            uhf0: si446x@0{
-+                compatible = "silabs,si446x";
-+                reg = <0>; // CE0
-+                pinctrl-names = "default";
-+                pinctrl-0 = <&uhf0_pins>;
-+                interrupt-parent = <&gpio>;
-+                interrupts = <17 0x2>; // falling edge
-+                spi-max-frequency = <4000000>;
-+                sdn_pin = <27>;
-+                irq_pin = <17>;
-+                status = "okay";
-+            };
-+        };
-+    };
-+
-+    fragment@1 {
-+        target = <&gpio>;
-+        __overlay__ {
-+            uhf0_pins: uhf0_pins {
-+                brcm,pins = <17 27>;
-+                brcm,function = <0 1>; // in, out
-+                brcm,pull = <2 0>; // high, none
-+            };
-+        };
-+    };
-+
-+    __overrides__ {
-+        int_pin = <&uhf0>, "interrupts:0",
-+                  <&uhf0>, "irq_pin:0",
-+                  <&uhf0_pins>, "brcm,pins:0";
-+        reset_pin = <&uhf0>, "sdn_pin:0",
-+                    <&uhf0_pins>, "brcm,pins:4";
-+        speed   = <&uhf0>, "spi-max-frequency:0";
-+    };
-+};
-diff --git a/arch/arm/boot/dts/overlays/smi-dev-overlay.dts b/arch/arm/boot/dts/overlays/smi-dev-overlay.dts
-new file mode 100644
-index 000000000000..bafab6c92506
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/smi-dev-overlay.dts
-@@ -0,0 +1,20 @@
-+// Description: Overlay to enable character device interface for SMI.
-+// Author:	Luke Wren <luke@raspberrypi.org>
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&soc>;
-+		__overlay__ {
-+			smi_dev {
-+				compatible = "brcm,bcm2835-smi-dev";
-+				smi_handle = <&smi>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/smi-nand-overlay.dts b/arch/arm/boot/dts/overlays/smi-nand-overlay.dts
-new file mode 100644
-index 000000000000..ae1e50329d66
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/smi-nand-overlay.dts
-@@ -0,0 +1,66 @@
-+// Description: Overlay to enable NAND flash through
-+// the secondary memory interface
-+// Author:	Luke Wren
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&smi>;
-+		__overlay__ {
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&smi_pins>;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&soc>;
-+		__overlay__ {
-+			nand: flash@0 {
-+				compatible = "brcm,bcm2835-smi-nand";
-+				smi_handle = <&smi>;
-+				#address-cells = <1>;
-+				#size-cells = <1>;
-+				status = "okay";
-+
-+				partition@0 {
-+					label = "stage2";
-+					// 128k
-+					reg = <0 0x20000>;
-+					read-only;
-+				};
-+				partition@1 {
-+					label = "firmware";
-+					// 16M
-+					reg = <0x20000 0x1000000>;
-+					read-only;
-+				};
-+				partition@2 {
-+					label = "root";
-+					// 2G (will need to use 64 bit for >=4G)
-+					reg = <0x1020000 0x80000000>;
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			smi_pins: smi_pins {
-+				brcm,pins = <0 1 2 3 4 5 6 7 8 9 10 11
-+					12 13 14 15>;
-+				/* Alt 1: SMI */
-+				brcm,function = <5 5 5 5 5 5 5 5 5 5 5
-+					5 5 5 5 5>;
-+				/* /CS, /WE and /OE are pulled high, as they are
-+				   generally active low signals */
-+				brcm,pull = <2 2 2 2 2 2 2 2 0 0 0 0 0 0 0 0>;
-+			};
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/smi-overlay.dts b/arch/arm/boot/dts/overlays/smi-overlay.dts
-new file mode 100644
-index 000000000000..bb8c7830df23
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/smi-overlay.dts
-@@ -0,0 +1,37 @@
-+// Description:	Overlay to enable the secondary memory interface peripheral
-+// Author:	Luke Wren
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&smi>;
-+		__overlay__ {
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&smi_pins>;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			smi_pins: smi_pins {
-+				/* Don't configure the top two address bits, as
-+				   these are already used as ID_SD and ID_SC */
-+				brcm,pins = <2 3 4 5 6 7 8 9 10 11 12 13 14 15
-+					     16 17 18 19 20 21 22 23 24 25>;
-+				/* Alt 1: SMI */
-+				brcm,function = <5 5 5 5 5 5 5 5 5 5 5 5 5 5 5
-+						 5 5 5 5 5 5 5 5 5>;
-+				/* /CS, /WE and /OE are pulled high, as they are
-+				   generally active low signals */
-+				brcm,pull = <2 2 2 2 2 2 0 0 0 0 0 0 0 0 0 0 0
-+					     0 0 0 0 0 0 0>;
-+			};
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/spi-gpio35-39-overlay.dts b/arch/arm/boot/dts/overlays/spi-gpio35-39-overlay.dts
-new file mode 100644
-index 000000000000..a132b8637c31
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/spi-gpio35-39-overlay.dts
-@@ -0,0 +1,31 @@
-+/*
-+ * Device tree overlay to move spi0 to gpio 35 to 39 on CM
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			cs-gpios = <&gpio 36 1>, <&gpio 35 1>;
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spi0_cs_pins>;
-+		__overlay__ {
-+			brcm,pins = <36 35>;
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&spi0_pins>;
-+		__overlay__ {
-+			brcm,pins = <37 38 39>;
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/spi-gpio40-45-overlay.dts b/arch/arm/boot/dts/overlays/spi-gpio40-45-overlay.dts
-new file mode 100644
-index 000000000000..9ebcaf1b5ea0
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/spi-gpio40-45-overlay.dts
-@@ -0,0 +1,36 @@
-+/*
-+ * Boot EEPROM overlay
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			cs-gpios = <&gpio 43 1>, <&gpio 44 1>, <&gpio 45 1>;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spi0_cs_pins>;
-+		__overlay__ {
-+			brcm,pins = <45 44 43>;
-+			brcm,function = <1>; /* output */
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&spi0_pins>;
-+		__overlay__ {
-+			brcm,pins = <40 41 42>;
-+			brcm,function = <3>; /* alt4 */
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/spi-rtc-overlay.dts b/arch/arm/boot/dts/overlays/spi-rtc-overlay.dts
-new file mode 100644
-index 000000000000..51b7fec281c0
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/spi-rtc-overlay.dts
-@@ -0,0 +1,75 @@
-+// Definitions for several SPI-based Real Time Clocks
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&rtc>;
-+		__dormant__ {
-+			compatible = "maxim,ds3232";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&rtc>;
-+		__dormant__ {
-+			compatible = "maxim,ds3234";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&rtc>;
-+		__dormant__ {
-+			compatible = "nxp,rtc-pcf2123";
-+		};
-+	};
-+
-+	spidev: fragment@100 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	frag101: fragment@101 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			rtc: rtc@0 {
-+				reg = <0>;
-+				spi-max-frequency = <5000000>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		spi0_0 = <&spidev>, "target:0=",<&spidev0>,
-+		         <&frag101>, "target:0=",<&spi0>,
-+		         <&rtc>, "reg:0=0";
-+		spi0_1 = <&spidev>, "target:0=",<&spidev1>,
-+		         <&frag101>, "target:0=",<&spi0>,
-+		         <&rtc>, "reg:0=1";
-+		spi1_0 = <0>,"-100",
-+		         <&frag101>, "target:0=",<&spi1>,
-+		         <&rtc>, "reg:0=0";
-+		spi1_1 = <0>,"-100",
-+		         <&frag101>, "target:0=",<&spi1>,
-+		         <&rtc>, "reg:0=1";
-+		spi2_0 = <0>,"-100",
-+		         <&frag101>, "target:0=",<&spi2>,
-+		         <&rtc>, "reg:0=0";
-+		spi2_1 = <0>,"-100",
-+		         <&frag101>, "target:0=",<&spi2>,
-+		         <&rtc>, "reg:0=1";
-+		cs_high = <&rtc>, "spi-cs-high?";
-+
-+		ds3232 = <0>,"+0";
-+		ds3234 = <0>,"+1";
-+		pcf2123 = <0>,"+2";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/spi0-0cs-overlay.dts b/arch/arm/boot/dts/overlays/spi0-0cs-overlay.dts
-new file mode 100644
-index 000000000000..0d2acabf56a4
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/spi0-0cs-overlay.dts
-@@ -0,0 +1,39 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spi0_cs_pins>;
-+		frag0: __overlay__ {
-+			brcm,pins;
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			cs-gpios;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&spidev1>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&spi0_pins>;
-+		__dormant__ {
-+			brcm,pins = <10 11>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		no_miso = <0>,"=3";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/spi0-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi0-1cs-overlay.dts
-new file mode 100644
-index 000000000000..e6eb66e2076a
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/spi0-1cs-overlay.dts
-@@ -0,0 +1,42 @@
-+/dts-v1/;
-+/plugin/;
-+
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spi0_cs_pins>;
-+		frag0: __overlay__ {
-+			brcm,pins = <8>;
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spi0>;
-+		frag1: __overlay__ {
-+			cs-gpios = <&gpio 8 1>;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&spidev1>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&spi0_pins>;
-+		__dormant__ {
-+			brcm,pins = <10 11>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		cs0_pin  = <&frag0>,"brcm,pins:0",
-+			   <&frag1>,"cs-gpios:4";
-+		no_miso = <0>,"=3";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/spi0-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi0-2cs-overlay.dts
-new file mode 100644
-index 000000000000..df6519537c3a
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/spi0-2cs-overlay.dts
-@@ -0,0 +1,37 @@
-+/dts-v1/;
-+/plugin/;
-+
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spi0_cs_pins>;
-+		frag0: __overlay__ {
-+			brcm,pins = <8 7>;
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spi0>;
-+		frag1: __overlay__ {
-+			cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&spi0_pins>;
-+		__dormant__ {
-+			brcm,pins = <10 11>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		cs0_pin  = <&frag0>,"brcm,pins:0",
-+			   <&frag1>,"cs-gpios:4";
-+		cs1_pin  = <&frag0>,"brcm,pins:4",
-+			   <&frag1>,"cs-gpios:16";
-+		no_miso = <0>,"=2";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/spi1-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi1-1cs-overlay.dts
-new file mode 100644
-index 000000000000..ea2794bc5fd5
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/spi1-1cs-overlay.dts
-@@ -0,0 +1,57 @@
-+/dts-v1/;
-+/plugin/;
-+
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			spi1_pins: spi1_pins {
-+				brcm,pins = <19 20 21>;
-+				brcm,function = <3>; /* alt4 */
-+			};
-+
-+			spi1_cs_pins: spi1_cs_pins {
-+				brcm,pins = <18>;
-+				brcm,function = <1>; /* output */
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spi1>;
-+		frag1: __overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&spi1_pins &spi1_cs_pins>;
-+			cs-gpios = <&gpio 18 1>;
-+			status = "okay";
-+
-+			spidev1_0: spidev@0 {
-+				compatible = "spidev";
-+				reg = <0>;      /* CE0 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&aux>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		cs0_pin  = <&spi1_cs_pins>,"brcm,pins:0",
-+			   <&frag1>,"cs-gpios:4";
-+		cs0_spidev = <&spidev1_0>,"status";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/spi1-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi1-2cs-overlay.dts
-new file mode 100644
-index 000000000000..dab34ee79ae2
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/spi1-2cs-overlay.dts
-@@ -0,0 +1,69 @@
-+/dts-v1/;
-+/plugin/;
-+
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			spi1_pins: spi1_pins {
-+				brcm,pins = <19 20 21>;
-+				brcm,function = <3>; /* alt4 */
-+			};
-+
-+			spi1_cs_pins: spi1_cs_pins {
-+				brcm,pins = <18 17>;
-+				brcm,function = <1>; /* output */
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spi1>;
-+		frag1: __overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&spi1_pins &spi1_cs_pins>;
-+			cs-gpios = <&gpio 18 1>, <&gpio 17 1>;
-+			status = "okay";
-+
-+			spidev1_0: spidev@0 {
-+				compatible = "spidev";
-+				reg = <0>;      /* CE0 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+
-+			spidev1_1: spidev@1 {
-+				compatible = "spidev";
-+				reg = <1>;      /* CE1 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&aux>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		cs0_pin  = <&spi1_cs_pins>,"brcm,pins:0",
-+			   <&frag1>,"cs-gpios:4";
-+		cs1_pin  = <&spi1_cs_pins>,"brcm,pins:4",
-+			   <&frag1>,"cs-gpios:16";
-+		cs0_spidev = <&spidev1_0>,"status";
-+		cs1_spidev = <&spidev1_1>,"status";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/spi1-3cs-overlay.dts b/arch/arm/boot/dts/overlays/spi1-3cs-overlay.dts
-new file mode 100644
-index 000000000000..bc7e7d04324b
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/spi1-3cs-overlay.dts
-@@ -0,0 +1,81 @@
-+/dts-v1/;
-+/plugin/;
-+
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			spi1_pins: spi1_pins {
-+				brcm,pins = <19 20 21>;
-+				brcm,function = <3>; /* alt4 */
-+			};
-+
-+			spi1_cs_pins: spi1_cs_pins {
-+				brcm,pins = <18 17 16>;
-+				brcm,function = <1>; /* output */
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spi1>;
-+		frag1: __overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&spi1_pins &spi1_cs_pins>;
-+			cs-gpios = <&gpio 18 1>, <&gpio 17 1>, <&gpio 16 1>;
-+			status = "okay";
-+
-+			spidev1_0: spidev@0 {
-+				compatible = "spidev";
-+				reg = <0>;      /* CE0 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+
-+			spidev1_1: spidev@1 {
-+				compatible = "spidev";
-+				reg = <1>;      /* CE1 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+
-+			spidev1_2: spidev@2 {
-+				compatible = "spidev";
-+				reg = <2>;      /* CE2 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&aux>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		cs0_pin  = <&spi1_cs_pins>,"brcm,pins:0",
-+			   <&frag1>,"cs-gpios:4";
-+		cs1_pin  = <&spi1_cs_pins>,"brcm,pins:4",
-+			   <&frag1>,"cs-gpios:16";
-+		cs2_pin  = <&spi1_cs_pins>,"brcm,pins:8",
-+			   <&frag1>,"cs-gpios:28";
-+		cs0_spidev = <&spidev1_0>,"status";
-+		cs1_spidev = <&spidev1_1>,"status";
-+		cs2_spidev = <&spidev1_2>,"status";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/spi2-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi2-1cs-overlay.dts
-new file mode 100644
-index 000000000000..2a29750462af
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/spi2-1cs-overlay.dts
-@@ -0,0 +1,57 @@
-+/dts-v1/;
-+/plugin/;
-+
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			spi2_pins: spi2_pins {
-+				brcm,pins = <40 41 42>;
-+				brcm,function = <3>; /* alt4 */
-+			};
-+
-+			spi2_cs_pins: spi2_cs_pins {
-+				brcm,pins = <43>;
-+				brcm,function = <1>; /* output */
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spi2>;
-+		frag1: __overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&spi2_pins &spi2_cs_pins>;
-+			cs-gpios = <&gpio 43 1>;
-+			status = "okay";
-+
-+			spidev2_0: spidev@0 {
-+				compatible = "spidev";
-+				reg = <0>;      /* CE0 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&aux>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		cs0_pin  = <&spi2_cs_pins>,"brcm,pins:0",
-+			   <&frag1>,"cs-gpios:4";
-+		cs0_spidev = <&spidev2_0>,"status";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/spi2-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi2-2cs-overlay.dts
-new file mode 100644
-index 000000000000..642678fc9ddd
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/spi2-2cs-overlay.dts
-@@ -0,0 +1,69 @@
-+/dts-v1/;
-+/plugin/;
-+
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			spi2_pins: spi2_pins {
-+				brcm,pins = <40 41 42>;
-+				brcm,function = <3>; /* alt4 */
-+			};
-+
-+			spi2_cs_pins: spi2_cs_pins {
-+				brcm,pins = <43 44>;
-+				brcm,function = <1>; /* output */
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spi2>;
-+		frag1: __overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&spi2_pins &spi2_cs_pins>;
-+			cs-gpios = <&gpio 43 1>, <&gpio 44 1>;
-+			status = "okay";
-+
-+			spidev2_0: spidev@0 {
-+				compatible = "spidev";
-+				reg = <0>;      /* CE0 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+
-+			spidev2_1: spidev@1 {
-+				compatible = "spidev";
-+				reg = <1>;      /* CE1 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&aux>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		cs0_pin  = <&spi2_cs_pins>,"brcm,pins:0",
-+			   <&frag1>,"cs-gpios:4";
-+		cs1_pin  = <&spi2_cs_pins>,"brcm,pins:4",
-+			   <&frag1>,"cs-gpios:16";
-+		cs0_spidev = <&spidev2_0>,"status";
-+		cs1_spidev = <&spidev2_1>,"status";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/spi2-3cs-overlay.dts b/arch/arm/boot/dts/overlays/spi2-3cs-overlay.dts
-new file mode 100644
-index 000000000000..28d40c6c3c37
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/spi2-3cs-overlay.dts
-@@ -0,0 +1,81 @@
-+/dts-v1/;
-+/plugin/;
-+
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			spi2_pins: spi2_pins {
-+				brcm,pins = <40 41 42>;
-+				brcm,function = <3>; /* alt4 */
-+			};
-+
-+			spi2_cs_pins: spi2_cs_pins {
-+				brcm,pins = <43 44 45>;
-+				brcm,function = <1>; /* output */
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spi2>;
-+		frag1: __overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&spi2_pins &spi2_cs_pins>;
-+			cs-gpios = <&gpio 43 1>, <&gpio 44 1>, <&gpio 45 1>;
-+			status = "okay";
-+
-+			spidev2_0: spidev@0 {
-+				compatible = "spidev";
-+				reg = <0>;      /* CE0 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+
-+			spidev2_1: spidev@1 {
-+				compatible = "spidev";
-+				reg = <1>;      /* CE1 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+
-+			spidev2_2: spidev@2 {
-+				compatible = "spidev";
-+				reg = <2>;      /* CE2 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&aux>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		cs0_pin  = <&spi2_cs_pins>,"brcm,pins:0",
-+			   <&frag1>,"cs-gpios:4";
-+		cs1_pin  = <&spi2_cs_pins>,"brcm,pins:4",
-+			   <&frag1>,"cs-gpios:16";
-+		cs2_pin  = <&spi2_cs_pins>,"brcm,pins:8",
-+			   <&frag1>,"cs-gpios:28";
-+		cs0_spidev = <&spidev2_0>,"status";
-+		cs1_spidev = <&spidev2_1>,"status";
-+		cs2_spidev = <&spidev2_2>,"status";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/spi3-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi3-1cs-overlay.dts
-new file mode 100644
-index 000000000000..335af8637051
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/spi3-1cs-overlay.dts
-@@ -0,0 +1,44 @@
-+/dts-v1/;
-+/plugin/;
-+
-+
-+/ {
-+	compatible = "brcm,bcm2711";
-+
-+	fragment@0 {
-+		target = <&spi3_cs_pins>;
-+		frag0: __overlay__ {
-+			brcm,pins = <0>;
-+			brcm,function = <1>; /* output */
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spi3>;
-+		frag1: __overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			pinctrl-names = "default";
-+		        pinctrl-0 = <&spi3_pins &spi3_cs_pins>;
-+			cs-gpios = <&gpio 0 1>;
-+			status = "okay";
-+
-+			spidev3_0: spidev@0 {
-+				compatible = "spidev";
-+				reg = <0>;      /* CE0 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		cs0_pin  = <&frag0>,"brcm,pins:0",
-+			   <&frag1>,"cs-gpios:4";
-+		cs0_spidev = <&spidev3_0>,"status";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/spi3-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi3-2cs-overlay.dts
-new file mode 100644
-index 000000000000..ce65da27f767
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/spi3-2cs-overlay.dts
-@@ -0,0 +1,56 @@
-+/dts-v1/;
-+/plugin/;
-+
-+
-+/ {
-+	compatible = "brcm,bcm2711";
-+
-+	fragment@0 {
-+		target = <&spi3_cs_pins>;
-+		frag0: __overlay__ {
-+			brcm,pins = <0 24>;
-+			brcm,function = <1>; /* output */
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spi3>;
-+		frag1: __overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			pinctrl-names = "default";
-+		        pinctrl-0 = <&spi3_pins &spi3_cs_pins>;
-+			cs-gpios = <&gpio 0 1>, <&gpio 24 1>;
-+			status = "okay";
-+
-+			spidev3_0: spidev@0 {
-+				compatible = "spidev";
-+				reg = <0>;      /* CE0 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+
-+			spidev3_1: spidev@1 {
-+				compatible = "spidev";
-+				reg = <1>;      /* CE1 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		cs0_pin  = <&frag0>,"brcm,pins:0",
-+			   <&frag1>,"cs-gpios:4";
-+		cs1_pin  = <&frag0>,"brcm,pins:4",
-+			   <&frag1>,"cs-gpios:16";
-+		cs0_spidev = <&spidev3_0>,"status";
-+		cs1_spidev = <&spidev3_1>,"status";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/spi4-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi4-1cs-overlay.dts
-new file mode 100644
-index 000000000000..85d70b40352b
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/spi4-1cs-overlay.dts
-@@ -0,0 +1,44 @@
-+/dts-v1/;
-+/plugin/;
-+
-+
-+/ {
-+	compatible = "brcm,bcm2711";
-+
-+	fragment@0 {
-+		target = <&spi4_cs_pins>;
-+		frag0: __overlay__ {
-+			brcm,pins = <4>;
-+			brcm,function = <1>; /* output */
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spi4>;
-+		frag1: __overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			pinctrl-names = "default";
-+		        pinctrl-0 = <&spi4_pins &spi4_cs_pins>;
-+			cs-gpios = <&gpio 4 1>;
-+			status = "okay";
-+
-+			spidev4_0: spidev@0 {
-+				compatible = "spidev";
-+				reg = <0>;      /* CE0 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		cs0_pin  = <&frag0>,"brcm,pins:0",
-+			   <&frag1>,"cs-gpios:4";
-+		cs0_spidev = <&spidev4_0>,"status";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/spi4-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi4-2cs-overlay.dts
-new file mode 100644
-index 000000000000..8bc2215a6a7e
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/spi4-2cs-overlay.dts
-@@ -0,0 +1,56 @@
-+/dts-v1/;
-+/plugin/;
-+
-+
-+/ {
-+	compatible = "brcm,bcm2711";
-+
-+	fragment@0 {
-+		target = <&spi4_cs_pins>;
-+		frag0: __overlay__ {
-+			brcm,pins = <4 25>;
-+			brcm,function = <1>; /* output */
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spi4>;
-+		frag1: __overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			pinctrl-names = "default";
-+		        pinctrl-0 = <&spi4_pins &spi4_cs_pins>;
-+			cs-gpios = <&gpio 4 1>, <&gpio 25 1>;
-+			status = "okay";
-+
-+			spidev4_0: spidev@0 {
-+				compatible = "spidev";
-+				reg = <0>;      /* CE0 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+
-+			spidev4_1: spidev@1 {
-+				compatible = "spidev";
-+				reg = <1>;      /* CE1 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		cs0_pin  = <&frag0>,"brcm,pins:0",
-+			   <&frag1>,"cs-gpios:4";
-+		cs1_pin  = <&frag0>,"brcm,pins:4",
-+			   <&frag1>,"cs-gpios:16";
-+		cs0_spidev = <&spidev4_0>,"status";
-+		cs1_spidev = <&spidev4_1>,"status";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/spi5-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi5-1cs-overlay.dts
-new file mode 100644
-index 000000000000..c0f8cb8510ee
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/spi5-1cs-overlay.dts
-@@ -0,0 +1,44 @@
-+/dts-v1/;
-+/plugin/;
-+
-+
-+/ {
-+	compatible = "brcm,bcm2711";
-+
-+	fragment@0 {
-+		target = <&spi5_cs_pins>;
-+		frag0: __overlay__ {
-+			brcm,pins = <12>;
-+			brcm,function = <1>; /* output */
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spi5>;
-+		frag1: __overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			pinctrl-names = "default";
-+		        pinctrl-0 = <&spi5_pins &spi5_cs_pins>;
-+			cs-gpios = <&gpio 12 1>;
-+			status = "okay";
-+
-+			spidev5_0: spidev@0 {
-+				compatible = "spidev";
-+				reg = <0>;      /* CE0 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		cs0_pin  = <&frag0>,"brcm,pins:0",
-+			   <&frag1>,"cs-gpios:4";
-+		cs0_spidev = <&spidev5_0>,"status";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/spi5-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi5-2cs-overlay.dts
-new file mode 100644
-index 000000000000..7758b9c00b4e
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/spi5-2cs-overlay.dts
-@@ -0,0 +1,56 @@
-+/dts-v1/;
-+/plugin/;
-+
-+
-+/ {
-+	compatible = "brcm,bcm2711";
-+
-+	fragment@0 {
-+		target = <&spi5_cs_pins>;
-+		frag0: __overlay__ {
-+			brcm,pins = <12 26>;
-+			brcm,function = <1>; /* output */
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spi5>;
-+		frag1: __overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			pinctrl-names = "default";
-+		        pinctrl-0 = <&spi5_pins &spi5_cs_pins>;
-+			cs-gpios = <&gpio 12 1>, <&gpio 26 1>;
-+			status = "okay";
-+
-+			spidev5_0: spidev@0 {
-+				compatible = "spidev";
-+				reg = <0>;      /* CE0 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+
-+			spidev5_1: spidev@1 {
-+				compatible = "spidev";
-+				reg = <1>;      /* CE1 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		cs0_pin  = <&frag0>,"brcm,pins:0",
-+			   <&frag1>,"cs-gpios:4";
-+		cs1_pin  = <&frag0>,"brcm,pins:4",
-+			   <&frag1>,"cs-gpios:16";
-+		cs0_spidev = <&spidev5_0>,"status";
-+		cs1_spidev = <&spidev5_1>,"status";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/spi6-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi6-1cs-overlay.dts
-new file mode 100644
-index 000000000000..8c8a953eca01
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/spi6-1cs-overlay.dts
-@@ -0,0 +1,44 @@
-+/dts-v1/;
-+/plugin/;
-+
-+
-+/ {
-+	compatible = "brcm,bcm2711";
-+
-+	fragment@0 {
-+		target = <&spi6_cs_pins>;
-+		frag0: __overlay__ {
-+			brcm,pins = <18>;
-+			brcm,function = <1>; /* output */
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spi6>;
-+		frag1: __overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			pinctrl-names = "default";
-+		        pinctrl-0 = <&spi6_pins &spi6_cs_pins>;
-+			cs-gpios = <&gpio 18 1>;
-+			status = "okay";
-+
-+			spidev6_0: spidev@0 {
-+				compatible = "spidev";
-+				reg = <0>;      /* CE0 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		cs0_pin  = <&frag0>,"brcm,pins:0",
-+			   <&frag1>,"cs-gpios:4";
-+		cs0_spidev = <&spidev6_0>,"status";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/spi6-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi6-2cs-overlay.dts
-new file mode 100644
-index 000000000000..2ff897f21aed
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/spi6-2cs-overlay.dts
-@@ -0,0 +1,56 @@
-+/dts-v1/;
-+/plugin/;
-+
-+
-+/ {
-+	compatible = "brcm,bcm2711";
-+
-+	fragment@0 {
-+		target = <&spi6_cs_pins>;
-+		frag0: __overlay__ {
-+			brcm,pins = <18 27>;
-+			brcm,function = <1>; /* output */
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spi6>;
-+		frag1: __overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			pinctrl-names = "default";
-+		        pinctrl-0 = <&spi6_pins &spi6_cs_pins>;
-+			cs-gpios = <&gpio 18 1>, <&gpio 27 1>;
-+			status = "okay";
-+
-+			spidev6_0: spidev@0 {
-+				compatible = "spidev";
-+				reg = <0>;      /* CE0 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+
-+			spidev6_1: spidev@1 {
-+				compatible = "spidev";
-+				reg = <1>;      /* CE1 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		cs0_pin  = <&frag0>,"brcm,pins:0",
-+			   <&frag1>,"cs-gpios:4";
-+		cs1_pin  = <&frag0>,"brcm,pins:4",
-+			   <&frag1>,"cs-gpios:16";
-+		cs0_spidev = <&spidev6_0>,"status";
-+		cs1_spidev = <&spidev6_1>,"status";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/ssd1306-overlay.dts b/arch/arm/boot/dts/overlays/ssd1306-overlay.dts
-new file mode 100644
-index 000000000000..84cf10e489d3
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/ssd1306-overlay.dts
-@@ -0,0 +1,36 @@
-+// Overlay for SSD1306 128x64 and 128x32 OLED displays
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+    compatible = "brcm,bcm2835";
-+
-+    fragment@0 {
-+	target = <&i2c1>;
-+	__overlay__ {
-+	    status = "okay";
-+
-+	    #address-cells = <1>;
-+	    #size-cells = <0>;
-+
-+	    ssd1306: oled@3c{
-+		compatible = "solomon,ssd1306fb-i2c";
-+		reg = <0x3c>;
-+		solomon,width = <128>;
-+		solomon,height = <64>;
-+		solomon,page-offset = <0>;
-+	    };
-+	};
-+    };
-+
-+    __overrides__ {
-+	address = <&ssd1306>,"reg:0";
-+	width = <&ssd1306>,"solomon,width:0";
-+	height = <&ssd1306>,"solomon,height:0";
-+	offset = <&ssd1306>,"solomon,page-offset:0";
-+	normal = <&ssd1306>,"solomon,segment-no-remap?";
-+	sequential = <&ssd1306>,"solomon,com-seq?";
-+	remapped = <&ssd1306>,"solomon,com-lrremap?";
-+	inverted = <&ssd1306>,"solomon,com-invdir?";
-+    };
-+};
-diff --git a/arch/arm/boot/dts/overlays/ssd1306-spi-overlay.dts b/arch/arm/boot/dts/overlays/ssd1306-spi-overlay.dts
-new file mode 100644
-index 000000000000..ffc90c7cecf6
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/ssd1306-spi-overlay.dts
-@@ -0,0 +1,84 @@
-+/*
-+ * Device Tree overlay for SSD1306 based SPI OLED display
-+ *
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&spidev1>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			ssd1306_pins: ssd1306_pins {
-+                                brcm,pins = <25 24>;
-+                                brcm,function = <1 1>; /* out out */
-+			};
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			ssd1306: ssd1306@0{
-+				compatible = "solomon,ssd1306";
-+				reg = <0>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&ssd1306_pins>;
-+
-+				spi-max-frequency = <10000000>;
-+				bgr = <0>;
-+				bpp = <1>;
-+				rotate = <0>;
-+				fps = <25>;
-+				buswidth = <8>;
-+				reset-gpios = <&gpio 25 1>;
-+				dc-gpios = <&gpio 24 0>;
-+				debug = <0>;
-+
-+				solomon,height = <64>;
-+				solomon,width = <128>;
-+				solomon,page-offset = <0>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		speed     = <&ssd1306>,"spi-max-frequency:0";
-+		rotate    = <&ssd1306>,"rotate:0";
-+		fps       = <&ssd1306>,"fps:0";
-+		debug     = <&ssd1306>,"debug:0";
-+		dc_pin    = <&ssd1306>,"dc-gpios:4",
-+		            <&ssd1306_pins>,"brcm,pins:4";
-+		reset_pin = <&ssd1306>,"reset-gpios:4",
-+		            <&ssd1306_pins>,"brcm,pins:0";
-+		height    = <&ssd1306>,"solomon,height:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/ssd1331-spi-overlay.dts b/arch/arm/boot/dts/overlays/ssd1331-spi-overlay.dts
-new file mode 100644
-index 000000000000..9fd5ebf2feda
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/ssd1331-spi-overlay.dts
-@@ -0,0 +1,83 @@
-+/*
-+ * Device Tree overlay for SSD1331 based SPI OLED display
-+ *
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+        compatible = "brcm,bcm2835";
-+
-+        fragment@0 {
-+                target = <&spi0>;
-+                __overlay__ {
-+                        status = "okay";
-+                };
-+        };
-+
-+        fragment@1 {
-+                target = <&spidev0>;
-+                __overlay__ {
-+                        status = "disabled";
-+                };
-+        };
-+
-+        fragment@2 {
-+                target = <&spidev1>;
-+                __overlay__ {
-+                        status = "disabled";
-+                };
-+        };
-+
-+        fragment@3 {
-+                target = <&gpio>;
-+                __overlay__ {
-+                        ssd1331_pins: ssd1331_pins {
-+                                brcm,pins = <25 24>;
-+                                brcm,function = <1 1>; /* out out */
-+                        };
-+                };
-+        };
-+
-+        fragment@4 {
-+                target = <&spi0>;
-+                __overlay__ {
-+                        /* needed to avoid dtc warning */
-+                        #address-cells = <1>;
-+                        #size-cells = <0>;
-+
-+                        ssd1331: ssd1331@0{
-+                                compatible = "solomon,ssd1331";
-+                                reg = <0>;
-+                                pinctrl-names = "default";
-+                                pinctrl-0 = <&ssd1331_pins>;
-+
-+                                spi-max-frequency = <4500000>;
-+                                bgr = <0>;
-+                                bpp = <16>;
-+                                rotate = <0>;
-+                                fps = <25>;
-+                                buswidth = <8>;
-+                                reset-gpios = <&gpio 25 1>;
-+                                dc-gpios = <&gpio 24 0>;
-+                                debug = <0>;
-+
-+                                solomon,height = <64>;
-+                                solomon,width = <96>;
-+                                solomon,page-offset = <0>;
-+                        };
-+                };
-+        };
-+
-+        __overrides__ {
-+                speed     = <&ssd1331>,"spi-max-frequency:0";
-+                rotate    = <&ssd1331>,"rotate:0";
-+                fps       = <&ssd1331>,"fps:0";
-+                debug     = <&ssd1331>,"debug:0";
-+                dc_pin    = <&ssd1331>,"dc-gpios:4",
-+                            <&ssd1331_pins>,"brcm,pins:4";
-+                reset_pin = <&ssd1331>,"reset-gpios:4",
-+                            <&ssd1331_pins>,"brcm,pins:0";
-+        };
-+};
-diff --git a/arch/arm/boot/dts/overlays/ssd1351-spi-overlay.dts b/arch/arm/boot/dts/overlays/ssd1351-spi-overlay.dts
-new file mode 100644
-index 000000000000..ffc872c60648
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/ssd1351-spi-overlay.dts
-@@ -0,0 +1,83 @@
-+/*
-+ * Device Tree overlay for SSD1351 based SPI OLED display
-+ *
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&spidev1>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			ssd1351_pins: ssd1351_pins {
-+                                brcm,pins = <25 24>;
-+                                brcm,function = <1 1>; /* out out */
-+			};
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			ssd1351: ssd1351@0{
-+				compatible = "solomon,ssd1351";
-+				reg = <0>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&ssd1351_pins>;
-+
-+				spi-max-frequency = <4500000>;
-+				bgr = <0>;
-+				bpp = <16>;
-+				rotate = <0>;
-+				fps = <25>;
-+				buswidth = <8>;
-+				reset-gpios = <&gpio 25 1>;
-+				dc-gpios = <&gpio 24 0>;
-+				debug = <0>;
-+
-+				solomon,height = <128>;
-+				solomon,width = <128>;
-+				solomon,page-offset = <0>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		speed     = <&ssd1351>,"spi-max-frequency:0";
-+		rotate    = <&ssd1351>,"rotate:0";
-+		fps       = <&ssd1351>,"fps:0";
-+		debug     = <&ssd1351>,"debug:0";
-+		dc_pin    = <&ssd1351>,"dc-gpios:4",
-+		            <&ssd1351_pins>,"brcm,pins:4";
-+		reset_pin = <&ssd1351>,"reset-gpios:4",
-+		            <&ssd1351_pins>,"brcm,pins:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/superaudioboard-overlay.dts b/arch/arm/boot/dts/overlays/superaudioboard-overlay.dts
-new file mode 100755
-index 000000000000..bad61535981e
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/superaudioboard-overlay.dts
-@@ -0,0 +1,73 @@
-+// Definitions for SuperAudioBoard
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "simple-audio-card";
-+			i2s-controller = <&i2s>;
-+			status = "okay";
-+
-+			simple-audio-card,name = "SuperAudioBoard";
-+
-+			simple-audio-card,widgets =
-+				"Line", "Line In",
-+				"Line", "Line Out";
-+
-+			simple-audio-card,routing =
-+				"Line Out","AOUTA+",
-+				"Line Out","AOUTA-",
-+				"Line Out","AOUTB+",
-+				"Line Out","AOUTB-",
-+				"AINA","Line In",
-+				"AINB","Line In";
-+
-+			simple-audio-card,format = "i2s";
-+
-+			simple-audio-card,bitclock-master = <&sound_master>;
-+			simple-audio-card,frame-master = <&sound_master>;
-+
-+			simple-audio-card,cpu {
-+				sound-dai = <&i2s>;
-+				dai-tdm-slot-num = <2>;
-+				dai-tdm-slot-width = <32>;
-+			};
-+
-+			sound_master: simple-audio-card,codec {
-+				sound-dai = <&cs4271>;
-+				system-clock-frequency = <24576000>;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+    
-+	fragment@2 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			cs4271: cs4271@10 {
-+				#sound-dai-cells = <0>;
-+				compatible = "cirrus,cs4271";
-+				reg = <0x10>;
-+				status = "okay";
-+				reset-gpio = <&gpio 26 0>; /* Pin 26, active high */
-+			};
-+		};
-+	};
-+	__overrides__ {
-+		gpiopin = <&cs4271>,"reset-gpio:4";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/sx150x-overlay.dts b/arch/arm/boot/dts/overlays/sx150x-overlay.dts
-new file mode 100644
-index 000000000000..1d1069345da2
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/sx150x-overlay.dts
-@@ -0,0 +1,1706 @@
-+// Definitions for SX150x I2C GPIO Expanders from Semtech
-+
-+// dtparams:
-+//     sx150<x>-<n>-<m>          - Enables SX150X device on I2C#<n> with slave address <m>. <x> may be 1-9.
-+//                                 <n> may be 0 or 1.  Permissible values of <m> (which is denoted in hex)
-+//                                 depend on the device variant.
-+//                                 For SX1501, SX1502, SX1504 and SX1505, <m> may be 20 or 21.
-+//                                 For SX1503 and SX1506, <m> may be 20.
-+//                                 For SX1507 and SX1509, <m> may be 3E, 3F, 70 or 71.
-+//                                 For SX1508, <m> may be 20, 21, 22 or 23.
-+//     sx150<x>-<n>-<m>-int-gpio - Integer, enables interrupts on SX150X device on I2C#<n> with slave address <m>,
-+//                                 specifies the GPIO pin to which NINT output of SX150X is connected.
-+//
-+//
-+// Example 1: A single SX1505 device on I2C#1 with its slave address set to 0x20 and NINT output connected to GPIO25:
-+// dtoverlay=sx150x:sx1505-1-20,sx1505-1-20-int-gpio=25
-+//
-+// Example 2: Two SX1507 devices on I2C#0 with their slave addresses set to 0x3E and 0x70 (interrupts not used):
-+// dtoverlay=sx150x:sx1507-0-3E,sx1507-0-70
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	// Enable I2C#0 interface
-+	fragment@0 {
-+		target = <&i2c0>;
-+		__dormant__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	// Enable I2C#1 interface
-+	fragment@1 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	// Enable a SX1501 on I2C#0 at slave addr 0x20
-+	fragment@2 {
-+		target = <&i2c0>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1501_0_20: sx150x@20 {
-+				compatible = "semtech,sx1501q";
-+				reg = <0x20>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1501-0-20-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1501 on I2C#1 at slave addr 0x20
-+	fragment@3 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1501_1_20: sx150x@20 {
-+				compatible = "semtech,sx1501q";
-+				reg = <0x20>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1501-1-20-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1501 on I2C#0 at slave addr 0x21
-+	fragment@4 {
-+		target = <&i2c0>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1501_0_21: sx150x@21 {
-+				compatible = "semtech,sx1501q";
-+				reg = <0x21>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1501-0-21-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1501 on I2C#1 at slave addr 0x21
-+	fragment@5 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1501_1_21: sx150x@21 {
-+				compatible = "semtech,sx1501q";
-+				reg = <0x21>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1501-1-21-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1502 on I2C#0 at slave addr 0x20
-+	fragment@6 {
-+		target = <&i2c0>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1502_0_20: sx150x@20 {
-+				compatible = "semtech,sx1502q";
-+				reg = <0x20>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1502-0-20-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1502 on I2C#1 at slave addr 0x20
-+	fragment@7 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1502_1_20: sx150x@20 {
-+				compatible = "semtech,sx1502q";
-+				reg = <0x20>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1502-1-20-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1502 on I2C#0 at slave addr 0x21
-+	fragment@8 {
-+		target = <&i2c0>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1502_0_21: sx150x@21 {
-+				compatible = "semtech,sx1502q";
-+				reg = <0x21>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1502-0-21-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1502 on I2C#1 at slave addr 0x21
-+	fragment@9 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1502_1_21: sx150x@21 {
-+				compatible = "semtech,sx1502q";
-+				reg = <0x21>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1501-1-21-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1503 on I2C#0 at slave addr 0x20
-+	fragment@10 {
-+		target = <&i2c0>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1503_0_20: sx150x@20 {
-+				compatible = "semtech,sx1503q";
-+				reg = <0x20>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1503-0-20-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1503 on I2C#1 at slave addr 0x20
-+	fragment@11 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1503_1_20: sx150x@20 {
-+				compatible = "semtech,sx1503q";
-+				reg = <0x20>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1503-1-20-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1504 on I2C#0 at slave addr 0x20
-+	fragment@12 {
-+		target = <&i2c0>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1504_0_20: sx150x@20 {
-+				compatible = "semtech,sx1504q";
-+				reg = <0x20>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1504-0-20-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1504 on I2C#1 at slave addr 0x20
-+	fragment@13 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1504_1_20: sx150x@20 {
-+				compatible = "semtech,sx1504q";
-+				reg = <0x20>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1504-1-20-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1504 on I2C#0 at slave addr 0x21
-+	fragment@14 {
-+		target = <&i2c0>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1504_0_21: sx150x@21 {
-+				compatible = "semtech,sx1504q";
-+				reg = <0x21>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1504-0-21-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1504 on I2C#1 at slave addr 0x21
-+	fragment@15 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1504_1_21: sx150x@21 {
-+				compatible = "semtech,sx1504q";
-+				reg = <0x21>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1504-1-20-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1505 on I2C#0 at slave addr 0x20
-+	fragment@16 {
-+		target = <&i2c0>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1505_0_20: sx150x@20 {
-+				compatible = "semtech,sx1505q";
-+				reg = <0x20>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1505-0-20-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1505 on I2C#1 at slave addr 0x20
-+	fragment@17 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1505_1_20: sx150x@20 {
-+				compatible = "semtech,sx1505q";
-+				reg = <0x20>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1505-1-20-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1505 on I2C#0 at slave addr 0x21
-+	fragment@18 {
-+		target = <&i2c0>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1505_0_21: sx150x@21 {
-+				compatible = "semtech,sx1505q";
-+				reg = <0x21>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1505-0-21-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1505 on I2C#1 at slave addr 0x21
-+	fragment@19 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1505_1_21: sx150x@21 {
-+				compatible = "semtech,sx1505q";
-+				reg = <0x21>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1505-1-21-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1506 on I2C#0 at slave addr 0x20
-+	fragment@20 {
-+		target = <&i2c0>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1506_0_20: sx150x@20 {
-+				compatible = "semtech,sx1506q";
-+				reg = <0x20>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1506-0-20-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1506 on I2C#1 at slave addr 0x20
-+	fragment@21 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1506_1_20: sx150x@20 {
-+				compatible = "semtech,sx1506q";
-+				reg = <0x20>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1506-1-20-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1507 on I2C#0 at slave addr 0x3E
-+	fragment@22 {
-+		target = <&i2c0>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1507_0_3E: sx150x@3E {
-+				compatible = "semtech,sx1507q";
-+				reg = <0x3E>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1507_0_3E-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1507 on I2C#1 at slave addr 0x3E
-+	fragment@23 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1507_1_3E: sx150x@3E {
-+				compatible = "semtech,sx1507q";
-+				reg = <0x3E>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1507_1_3E-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1507 on I2C#0 at slave addr 0x3F
-+	fragment@24 {
-+		target = <&i2c0>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1507_0_3F: sx150x@3F {
-+				compatible = "semtech,sx1507q";
-+				reg = <0x3F>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1507_0_3F-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1507 on I2C#1 at slave addr 0x3F
-+	fragment@25 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1507_1_3F: sx150x@3F {
-+				compatible = "semtech,sx1507q";
-+				reg = <0x3F>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1507_1_3F-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1507 on I2C#0 at slave addr 0x70
-+	fragment@26 {
-+		target = <&i2c0>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1507_0_70: sx150x@70 {
-+				compatible = "semtech,sx1507q";
-+				reg = <0x70>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1507-0-70-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1507 on I2C#1 at slave addr 0x70
-+	fragment@27 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1507_1_70: sx150x@70 {
-+				compatible = "semtech,sx1507q";
-+				reg = <0x70>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1507-1-70-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1507 on I2C#0 at slave addr 0x71
-+	fragment@28 {
-+		target = <&i2c0>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1507_0_71: sx150x@71 {
-+				compatible = "semtech,sx1507q";
-+				reg = <0x71>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1507-0-71-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1507 on I2C#1 at slave addr 0x71
-+	fragment@29 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1507_1_71: sx150x@71 {
-+				compatible = "semtech,sx1507q";
-+				reg = <0x71>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1507-1-71-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1508 on I2C#0 at slave addr 0x20
-+	fragment@30 {
-+		target = <&i2c0>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1508_0_20: sx150x@20 {
-+				compatible = "semtech,sx1508q";
-+				reg = <0x20>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1508-0-20-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1508 on I2C#1 at slave addr 0x20
-+	fragment@31 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1508_1_20: sx150x@20 {
-+				compatible = "semtech,sx1508q";
-+				reg = <0x20>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1508-1-20-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1508 on I2C#0 at slave addr 0x21
-+	fragment@32 {
-+		target = <&i2c0>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1508_0_21: sx150x@21 {
-+				compatible = "semtech,sx1508q";
-+				reg = <0x21>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1508-0-21-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1508 on I2C#1 at slave addr 0x21
-+	fragment@33 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1508_1_21: sx150x@21 {
-+				compatible = "semtech,sx1508q";
-+				reg = <0x21>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1508-1-21-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1508 on I2C#0 at slave addr 0x22
-+	fragment@34 {
-+		target = <&i2c0>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1508_0_22: sx150x@22 {
-+				compatible = "semtech,sx1508q";
-+				reg = <0x22>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1508-0-22-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1508 on I2C#1 at slave addr 0x22
-+	fragment@35 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1508_1_22: sx150x@22 {
-+				compatible = "semtech,sx1508q";
-+				reg = <0x22>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1508-1-22-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1508 on I2C#0 at slave addr 0x23
-+	fragment@36 {
-+		target = <&i2c0>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1508_0_23: sx150x@23 {
-+				compatible = "semtech,sx1508q";
-+				reg = <0x23>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1508-0-23-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1508 on I2C#1 at slave addr 0x23
-+	fragment@37 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1508_1_23: sx150x@23 {
-+				compatible = "semtech,sx1508q";
-+				reg = <0x23>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1508-1-23-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1509 on I2C#0 at slave addr 0x3E
-+	fragment@38 {
-+		target = <&i2c0>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1509_0_3E: sx150x@3E {
-+				compatible = "semtech,sx1509q";
-+				reg = <0x3E>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1509_0_3E-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1509 on I2C#1 at slave addr 0x3E
-+	fragment@39 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1509_1_3E: sx150x@3E {
-+				compatible = "semtech,sx1509q";
-+				reg = <0x3E>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1509_1_3E-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1509 on I2C#0 at slave addr 0x3F
-+	fragment@40 {
-+		target = <&i2c0>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1509_0_3F: sx150x@3F {
-+				compatible = "semtech,sx1509q";
-+				reg = <0x3F>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1509_0_3F-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1509 on I2C#1 at slave addr 0x3F
-+	fragment@41 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1509_1_3F: sx150x@3F {
-+				compatible = "semtech,sx1509q";
-+				reg = <0x3F>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1509_1_3F-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1509 on I2C#0 at slave addr 0x70
-+	fragment@42 {
-+		target = <&i2c0>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1509_0_70: sx150x@70 {
-+				compatible = "semtech,sx1509q";
-+				reg = <0x70>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1509-0-70-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1509 on I2C#1 at slave addr 0x70
-+	fragment@43 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1509_1_70: sx150x@70 {
-+				compatible = "semtech,sx1509q";
-+				reg = <0x70>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1509-1-70-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1509 on I2C#0 at slave addr 0x71
-+	fragment@44 {
-+		target = <&i2c0>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1509_0_71: sx150x@71 {
-+				compatible = "semtech,sx1509q";
-+				reg = <0x71>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1509-0-71-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable a SX1509 on I2C#1 at slave addr 0x71
-+	fragment@45 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			sx1509_1_71: sx150x@71 {
-+				compatible = "semtech,sx1509q";
-+				reg = <0x71>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				interrupts = <25 2>; /* 1st word overwritten by sx1509-1-71-int-gpio parameter
-+				                        2nd word is 2 for falling-edge triggered */
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1501 on I2C#0 at slave addr 0x20
-+	fragment@46 {
-+		target = <&sx1501_0_20>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_0_20_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1501 on I2C#1 at slave addr 0x20
-+	fragment@47 {
-+		target = <&sx1501_1_20>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_1_20_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1501 on I2C#0 at slave addr 0x21
-+	fragment@48 {
-+		target = <&sx1501_0_21>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_0_21_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1501 on I2C#1 at slave addr 0x21
-+	fragment@49 {
-+		target = <&sx1501_1_21>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_1_21_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1502 on I2C#0 at slave addr 0x20
-+	fragment@50 {
-+		target = <&sx1502_0_20>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_0_20_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1502 on I2C#1 at slave addr 0x20
-+	fragment@51 {
-+		target = <&sx1502_1_20>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_1_20_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1502 on I2C#0 at slave addr 0x21
-+	fragment@52 {
-+		target = <&sx1502_0_21>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_0_21_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1502 on I2C#1 at slave addr 0x21
-+	fragment@53 {
-+		target = <&sx1502_1_21>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_1_21_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1503 on I2C#0 at slave addr 0x20
-+	fragment@54 {
-+		target = <&sx1503_0_20>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_0_20_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1503 on I2C#1 at slave addr 0x20
-+	fragment@55 {
-+		target = <&sx1503_1_20>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_1_20_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1504 on I2C#0 at slave addr 0x20
-+	fragment@56 {
-+		target = <&sx1504_0_20>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_0_20_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1504 on I2C#1 at slave addr 0x20
-+	fragment@57 {
-+		target = <&sx1504_1_20>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_1_20_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1504 on I2C#0 at slave addr 0x21
-+	fragment@58 {
-+		target = <&sx1504_0_21>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_0_21_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1504 on I2C#1 at slave addr 0x21
-+	fragment@59 {
-+		target = <&sx1504_1_21>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_1_21_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1505 on I2C#0 at slave addr 0x20
-+	fragment@60 {
-+		target = <&sx1505_0_20>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_0_20_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1505 on I2C#1 at slave addr 0x20
-+	fragment@61 {
-+		target = <&sx1505_1_20>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_1_20_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1505 on I2C#0 at slave addr 0x21
-+	fragment@62 {
-+		target = <&sx1505_0_21>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_0_21_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1505 on I2C#1 at slave addr 0x21
-+	fragment@63 {
-+		target = <&sx1505_1_21>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_1_21_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1506 on I2C#0 at slave addr 0x20
-+	fragment@64 {
-+		target = <&sx1506_0_20>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_0_20_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1506 on I2C#1 at slave addr 0x20
-+	fragment@65 {
-+		target = <&sx1506_1_20>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_1_20_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1507 on I2C#0 at slave addr 0x3E
-+	fragment@66 {
-+		target = <&sx1507_0_3E>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_0_3E_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1507 on I2C#1 at slave addr 0x3E
-+	fragment@67 {
-+		target = <&sx1507_1_3E>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_1_3E_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1507 on I2C#0 at slave addr 0x3F
-+	fragment@68 {
-+		target = <&sx1507_0_3F>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_0_3F_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1507 on I2C#1 at slave addr 0x3F
-+	fragment@69 {
-+		target = <&sx1507_1_3F>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_1_3F_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1507 on I2C#0 at slave addr 0x70
-+	fragment@70 {
-+		target = <&sx1507_0_70>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_1_70_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1507 on I2C#1 at slave addr 0x70
-+	fragment@71 {
-+		target = <&sx1507_1_70>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_1_70_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1507 on I2C#0 at slave addr 0x71
-+	fragment@72 {
-+		target = <&sx1507_0_71>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_0_71_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1507 on I2C#1 at slave addr 0x71
-+	fragment@73 {
-+		target = <&sx1507_1_71>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_1_71_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1508 on I2C#0 at slave addr 0x20
-+	fragment@74 {
-+		target = <&sx1508_0_20>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_0_20_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1508 on I2C#1 at slave addr 0x20
-+	fragment@75 {
-+		target = <&sx1508_1_20>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_1_20_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1508 on I2C#0 at slave addr 0x21
-+	fragment@76 {
-+		target = <&sx1508_0_21>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_0_21_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1508 on I2C#1 at slave addr 0x21
-+	fragment@77 {
-+		target = <&sx1508_1_21>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_1_21_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1508 on I2C#0 at slave addr 0x22
-+	fragment@78 {
-+		target = <&sx1508_0_22>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_0_22_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1508 on I2C#1 at slave addr 0x22
-+	fragment@79 {
-+		target = <&sx1508_1_22>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_1_22_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1508 on I2C#0 at slave addr 0x23
-+	fragment@80 {
-+		target = <&sx1508_0_23>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_0_23_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1508 on I2C#1 at slave addr 0x23
-+	fragment@81 {
-+		target = <&sx1508_1_23>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_1_23_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1509 on I2C#0 at slave addr 0x3E
-+	fragment@82 {
-+		target = <&sx1509_0_3E>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_0_3E_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1509 on I2C#1 at slave addr 0x3E
-+	fragment@83 {
-+		target = <&sx1509_1_3E>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_1_3E_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1509 on I2C#0 at slave addr 0x3F
-+	fragment@84 {
-+		target = <&sx1509_0_3F>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_0_3F_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1509 on I2C#1 at slave addr 0x3F
-+	fragment@85 {
-+		target = <&sx1509_1_3F>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_1_3F_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1509 on I2C#0 at slave addr 0x70
-+	fragment@86 {
-+		target = <&sx1509_0_70>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_0_70_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1509 on I2C#1 at slave addr 0x70
-+	fragment@87 {
-+		target = <&sx1509_1_70>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_1_70_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1509 on I2C#0 at slave addr 0x71
-+	fragment@88 {
-+		target = <&sx1509_0_71>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_0_71_pins>;
-+		};
-+	};
-+
-+	// Enable interrupts for a SX1509 on I2C#1 at slave addr 0x71
-+	fragment@89 {
-+		target = <&sx1509_1_71>;
-+		__dormant__ {
-+			interrupt-parent = <&gpio>;
-+			interrupt-controller;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&sx150x_1_71_pins>;
-+		};
-+	};
-+
-+	// Configure GPIO pin connected to NINT output of a SX150x on I2C#0 interface at slave addr 0x20
-+        // Configure as a input with no pull-up/down
-+	fragment@90 {
-+		target = <&gpio>;
-+		__dormant__ {
-+			sx150x_0_20_pins: sx150x_0_20_pins {
-+				brcm,pins = <0>;  /* overwritten by sx150x-0-20-int-gpio parameter */
-+				brcm,function = <0>;
-+				brcm,pull = <0>;
-+			};
-+		};
-+	};
-+
-+	// Configure GPIO pin connected to NINT output of a SX150x on I2C#1 interface at slave addr 0x20
-+        // Configure as a input with no pull-up/down
-+	fragment@91 {
-+		target = <&gpio>;
-+		__dormant__ {
-+			sx150x_1_20_pins: sx150x_1_20_pins {
-+				brcm,pins = <0>;  /* overwritten by sx150x-1-20-int-gpio parameter */
-+				brcm,function = <0>;
-+				brcm,pull = <0>;
-+			};
-+		};
-+	};
-+
-+	// Configure GPIO pin connected to NINT output of a SX150x on I2C#0 interface at slave addr 0x21
-+        // Configure as a input with no pull-up/down
-+	fragment@92 {
-+		target = <&gpio>;
-+		__dormant__ {
-+			sx150x_0_21_pins: sx150x_0_21_pins {
-+				brcm,pins = <0>;  /* overwritten by sx150x-0-21-int-gpio parameter */
-+				brcm,function = <0>;
-+				brcm,pull = <0>;
-+			};
-+		};
-+	};
-+
-+	// Configure GPIO pin connected to NINT output of a SX150x on I2C#1 interface at slave addr 0x21
-+        // Configure as a input with no pull-up/down
-+	fragment@93 {
-+		target = <&gpio>;
-+		__dormant__ {
-+			sx150x_1_21_pins: sx150x_1_21_pins {
-+				brcm,pins = <0>;  /* overwritten by sx150x-1-21-int-gpio parameter */
-+				brcm,function = <0>;
-+				brcm,pull = <0>;
-+			};
-+		};
-+	};
-+
-+	// Configure GPIO pin connected to NINT output of a SX150x on I2C#0 interface at slave addr 0x22
-+        // Configure as a input with no pull-up/down
-+	fragment@94 {
-+		target = <&gpio>;
-+		__dormant__ {
-+			sx150x_0_22_pins: sx150x_0_22_pins {
-+				brcm,pins = <0>;  /* overwritten by sx150x-0-22-int-gpio parameter */
-+				brcm,function = <0>;
-+				brcm,pull = <0>;
-+			};
-+		};
-+	};
-+
-+	// Configure GPIO pin connected to NINT output of a SX150x on I2C#1 interface at slave addr 0x22
-+        // Configure as a input with no pull-up/down
-+	fragment@95 {
-+		target = <&gpio>;
-+		__dormant__ {
-+			sx150x_1_22_pins: sx150x_1_22_pins {
-+				brcm,pins = <0>;  /* overwritten by sx150x-1-22-int-gpio parameter */
-+				brcm,function = <0>;
-+				brcm,pull = <0>;
-+			};
-+		};
-+	};
-+
-+	// Configure GPIO pin connected to NINT output of a SX150x on I2C#0 interface at slave addr 0x23
-+        // Configure as a input with no pull-up/down
-+	fragment@96 {
-+		target = <&gpio>;
-+		__dormant__ {
-+			sx150x_0_23_pins: sx150x_0_23_pins {
-+				brcm,pins = <0>;  /* overwritten by sx150x-0-23-int-gpio parameter */
-+				brcm,function = <0>;
-+				brcm,pull = <0>;
-+			};
-+		};
-+	};
-+
-+	// Configure GPIO pin connected to NINT output of a SX150x on I2C#1 interface at slave addr 0x23
-+        // Configure as a input with no pull-up/down
-+	fragment@97 {
-+		target = <&gpio>;
-+		__dormant__ {
-+			sx150x_1_23_pins: sx150x_1_23_pins {
-+				brcm,pins = <0>;  /* overwritten by sx150x-1-23-int-gpio parameter */
-+				brcm,function = <0>;
-+				brcm,pull = <0>;
-+			};
-+		};
-+	};
-+
-+	// Configure GPIO pin connected to NINT output of a SX150x on I2C#0 interface at slave addr 0x3E
-+        // Configure as a input with no pull-up/down
-+	fragment@98 {
-+		target = <&gpio>;
-+		__dormant__ {
-+			sx150x_0_3E_pins: sx150x_0_3E_pins {
-+				brcm,pins = <0>;  /* overwritten by sx150x-0-3E-int-gpio parameter */
-+				brcm,function = <0>;
-+				brcm,pull = <0>;
-+			};
-+		};
-+	};
-+
-+	// Configure GPIO pin connected to NINT output of a SX150x on I2C#1 interface at slave addr 0x3E
-+        // Configure as a input with no pull-up/down
-+	fragment@99 {
-+		target = <&gpio>;
-+		__dormant__ {
-+			sx150x_1_3E_pins: sx150x_1_3E_pins {
-+				brcm,pins = <0>;  /* overwritten by sx150x-1-3E-int-gpio parameter */
-+				brcm,function = <0>;
-+				brcm,pull = <0>;
-+			};
-+		};
-+	};
-+
-+	// Configure GPIO pin connected to NINT output of a SX150x on I2C#0 interface at slave addr 0x3F
-+        // Configure as a input with no pull-up/down
-+	fragment@100 {
-+		target = <&gpio>;
-+		__dormant__ {
-+			sx150x_0_3F_pins: sx150x_0_3F_pins {
-+				brcm,pins = <0>;  /* overwritten by sx150x-0-3F-int-gpio parameter */
-+				brcm,function = <0>;
-+				brcm,pull = <0>;
-+			};
-+		};
-+	};
-+
-+	// Configure GPIO pin connected to NINT output of a SX150x on I2C#1 interface at slave addr 0x3F
-+        // Configure as a input with no pull-up/down
-+	fragment@101 {
-+		target = <&gpio>;
-+		__dormant__ {
-+			sx150x_1_3F_pins: sx150x_1_3F_pins {
-+				brcm,pins = <0>;  /* overwritten by sx150x-1-3F-int-gpio parameter */
-+				brcm,function = <0>;
-+				brcm,pull = <0>;
-+			};
-+		};
-+	};
-+
-+	// Configure GPIO pin connected to NINT output of a SX150x on I2C#0 interface at slave addr 0x70
-+        // Configure as a input with no pull-up/down
-+	fragment@102 {
-+		target = <&gpio>;
-+		__dormant__ {
-+			sx150x_0_70_pins: sx150x_0_70_pins {
-+				brcm,pins = <0>;  /* overwritten by sx150x-0-70-int-gpio parameter */
-+				brcm,function = <0>;
-+				brcm,pull = <0>;
-+			};
-+		};
-+	};
-+
-+	// Configure GPIO pin connected to NINT output of a SX150x on I2C#1 interface at slave addr 0x70
-+        // Configure as a input with no pull-up/down
-+	fragment@103 {
-+		target = <&gpio>;
-+		__dormant__ {
-+			sx150x_1_70_pins: sx150x_1_70_pins {
-+				brcm,pins = <0>;  /* overwritten by sx150x-1-70-int-gpio parameter */
-+				brcm,function = <0>;
-+				brcm,pull = <0>;
-+			};
-+		};
-+	};
-+
-+	// Configure GPIO pin connected to NINT output of a SX150x on I2C#0 interface at slave addr 0x71
-+        // Configure as a input with no pull-up/down
-+	fragment@104 {
-+		target = <&gpio>;
-+		__dormant__ {
-+			sx150x_0_71_pins: sx150x_0_71_pins {
-+				brcm,pins = <0>;  /* overwritten by sx150x-0-71-int-gpio parameter */
-+				brcm,function = <0>;
-+				brcm,pull = <0>;
-+			};
-+		};
-+	};
-+
-+	// Configure GPIO pin connected to NINT output of a SX150x on I2C#1 interface at slave addr 0x71
-+        // Configure as a input with no pull-up/down
-+	fragment@105 {
-+		target = <&gpio>;
-+		__dormant__ {
-+			sx150x_1_71_pins: sx150x_1_71_pins {
-+				brcm,pins = <0>;  /* overwritten by sx150x-1-71-int-gpio parameter */
-+				brcm,function = <0>;
-+				brcm,pull = <0>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		sx1501-0-20          = <0>,"+0+2";
-+		sx1501-1-20          = <0>,"+1+3";
-+		sx1501-0-21          = <0>,"+0+4";
-+		sx1501-1-21          = <0>,"+1+5";
-+		sx1502-0-20          = <0>,"+0+6";
-+		sx1502-1-20          = <0>,"+1+7";
-+		sx1502-0-21          = <0>,"+0+8";
-+		sx1502-1-21          = <0>,"+1+9";
-+		sx1503-0-20          = <0>,"+0+10";
-+		sx1503-1-20          = <0>,"+1+11";
-+		sx1504-0-20          = <0>,"+0+12";
-+		sx1504-1-20          = <0>,"+1+13";
-+		sx1504-0-21          = <0>,"+0+14";
-+		sx1504-1-21          = <0>,"+1+15";
-+		sx1505-0-20          = <0>,"+0+16";
-+		sx1505-1-20          = <0>,"+1+17";
-+		sx1505-0-21          = <0>,"+0+18";
-+		sx1505-1-21          = <0>,"+1+19";
-+		sx1506-0-20          = <0>,"+0+20";
-+		sx1506-1-20          = <0>,"+1+21";
-+		sx1507-0-3E          = <0>,"+0+22";
-+		sx1507-1-3E          = <0>,"+1+23";
-+		sx1507-0-3F          = <0>,"+0+24";
-+		sx1507-1-3F          = <0>,"+1+25";
-+		sx1507-0-70          = <0>,"+0+26";
-+		sx1507-1-70          = <0>,"+1+27";
-+		sx1507-0-71          = <0>,"+0+28";
-+		sx1507-1-71          = <0>,"+1+29";
-+		sx1508-0-20          = <0>,"+0+30";
-+		sx1508-1-20          = <0>,"+1+31";
-+		sx1508-0-21          = <0>,"+0+32";
-+		sx1508-1-21          = <0>,"+1+33";
-+		sx1508-0-22          = <0>,"+0+34";
-+		sx1508-1-22          = <0>,"+1+35";
-+		sx1508-0-23          = <0>,"+0+36";
-+		sx1508-1-23          = <0>,"+1+37";
-+		sx1509-0-3E          = <0>,"+0+38";
-+		sx1509-1-3E          = <0>,"+1+39";
-+		sx1509-0-3F          = <0>,"+0+40";
-+		sx1509-1-3F          = <0>,"+1+41";
-+		sx1509-0-70          = <0>,"+0+42";
-+		sx1509-1-70          = <0>,"+1+43";
-+		sx1509-0-71          = <0>,"+0+44";
-+		sx1509-1-71          = <0>,"+1+45";
-+		sx1501-0-20-int-gpio = <0>,"+46+90",  <&sx150x_0_20_pins>,"brcm,pins:0", <&sx1501_0_20>,"interrupts:0";
-+		sx1501-1-20-int-gpio = <0>,"+47+91",  <&sx150x_1_20_pins>,"brcm,pins:0", <&sx1501_1_20>,"interrupts:0";
-+		sx1501-0-21-int-gpio = <0>,"+48+92",  <&sx150x_0_21_pins>,"brcm,pins:0", <&sx1501_0_21>,"interrupts:0";
-+		sx1501-1-21-int-gpio = <0>,"+49+93",  <&sx150x_1_21_pins>,"brcm,pins:0", <&sx1501_1_21>,"interrupts:0";
-+		sx1502-0-20-int-gpio = <0>,"+50+90",  <&sx150x_0_20_pins>,"brcm,pins:0", <&sx1502_0_20>,"interrupts:0";
-+		sx1502-1-20-int-gpio = <0>,"+51+91",  <&sx150x_1_20_pins>,"brcm,pins:0", <&sx1502_1_20>,"interrupts:0";
-+		sx1502-0-21-int-gpio = <0>,"+52+92",  <&sx150x_0_21_pins>,"brcm,pins:0", <&sx1502_0_21>,"interrupts:0";
-+		sx1502-1-21-int-gpio = <0>,"+53+93",  <&sx150x_1_21_pins>,"brcm,pins:0", <&sx1502_1_21>,"interrupts:0";
-+		sx1503-0-20-int-gpio = <0>,"+54+90",  <&sx150x_0_20_pins>,"brcm,pins:0", <&sx1503_0_20>,"interrupts:0";
-+		sx1503-1-20-int-gpio = <0>,"+55+91",  <&sx150x_1_20_pins>,"brcm,pins:0", <&sx1503_1_20>,"interrupts:0";
-+		sx1504-0-20-int-gpio = <0>,"+56+90",  <&sx150x_0_20_pins>,"brcm,pins:0", <&sx1504_0_20>,"interrupts:0";
-+		sx1504-1-20-int-gpio = <0>,"+57+91",  <&sx150x_1_20_pins>,"brcm,pins:0", <&sx1504_1_20>,"interrupts:0";
-+		sx1504-0-21-int-gpio = <0>,"+58+92",  <&sx150x_0_21_pins>,"brcm,pins:0", <&sx1504_0_21>,"interrupts:0";
-+		sx1504-1-21-int-gpio = <0>,"+59+93",  <&sx150x_1_21_pins>,"brcm,pins:0", <&sx1504_1_21>,"interrupts:0";
-+		sx1505-0-20-int-gpio = <0>,"+60+90",  <&sx150x_0_20_pins>,"brcm,pins:0", <&sx1505_0_20>,"interrupts:0";
-+		sx1505-1-20-int-gpio = <0>,"+61+91",  <&sx150x_1_20_pins>,"brcm,pins:0", <&sx1505_1_20>,"interrupts:0";
-+		sx1505-0-21-int-gpio = <0>,"+62+92",  <&sx150x_0_21_pins>,"brcm,pins:0", <&sx1505_0_21>,"interrupts:0";
-+		sx1505-1-21-int-gpio = <0>,"+63+93",  <&sx150x_1_21_pins>,"brcm,pins:0", <&sx1505_1_21>,"interrupts:0";
-+		sx1506-0-20-int-gpio = <0>,"+64+90",  <&sx150x_0_20_pins>,"brcm,pins:0", <&sx1506_0_20>,"interrupts:0";
-+		sx1506-1-20-int-gpio = <0>,"+65+91",  <&sx150x_1_20_pins>,"brcm,pins:0", <&sx1506_1_20>,"interrupts:0";
-+		sx1507-0-3E-int-gpio = <0>,"+66+98",  <&sx150x_0_3E_pins>,"brcm,pins:0", <&sx1507_0_3E>,"interrupts:0";
-+		sx1507-1-3E-int-gpio = <0>,"+67+99",  <&sx150x_1_3E_pins>,"brcm,pins:0", <&sx1507_1_3E>,"interrupts:0";
-+		sx1507-0-3F-int-gpio = <0>,"+68+100", <&sx150x_0_3F_pins>,"brcm,pins:0", <&sx1507_0_3F>,"interrupts:0";
-+		sx1507-1-3F-int-gpio = <0>,"+69+101", <&sx150x_1_3F_pins>,"brcm,pins:0", <&sx1507_1_3F>,"interrupts:0";
-+		sx1507-0-70-int-gpio = <0>,"+60+102", <&sx150x_0_70_pins>,"brcm,pins:0", <&sx1507_0_70>,"interrupts:0";
-+		sx1507-1-70-int-gpio = <0>,"+71+103", <&sx150x_1_70_pins>,"brcm,pins:0", <&sx1507_1_70>,"interrupts:0";
-+		sx1507-0-71-int-gpio = <0>,"+72+104", <&sx150x_0_71_pins>,"brcm,pins:0", <&sx1507_0_71>,"interrupts:0";
-+		sx1507-1-71-int-gpio = <0>,"+73+105", <&sx150x_1_71_pins>,"brcm,pins:0", <&sx1507_1_71>,"interrupts:0";
-+		sx1508-0-20-int-gpio = <0>,"+74+90",  <&sx150x_0_20_pins>,"brcm,pins:0", <&sx1508_0_20>,"interrupts:0";
-+		sx1508-1-20-int-gpio = <0>,"+75+91",  <&sx150x_1_20_pins>,"brcm,pins:0", <&sx1508_1_20>,"interrupts:0";
-+		sx1508-0-21-int-gpio = <0>,"+76+92",  <&sx150x_0_21_pins>,"brcm,pins:0", <&sx1508_0_21>,"interrupts:0";
-+		sx1508-1-21-int-gpio = <0>,"+77+93",  <&sx150x_1_21_pins>,"brcm,pins:0", <&sx1508_1_21>,"interrupts:0";
-+		sx1508-0-22-int-gpio = <0>,"+78+94",  <&sx150x_0_22_pins>,"brcm,pins:0", <&sx1508_0_22>,"interrupts:0";
-+		sx1508-1-22-int-gpio = <0>,"+79+95",  <&sx150x_1_22_pins>,"brcm,pins:0", <&sx1508_1_22>,"interrupts:0";
-+		sx1508-0-23-int-gpio = <0>,"+80+96",  <&sx150x_0_23_pins>,"brcm,pins:0", <&sx1508_0_23>,"interrupts:0";
-+		sx1508-1-23-int-gpio = <0>,"+81+97",  <&sx150x_1_23_pins>,"brcm,pins:0", <&sx1508_1_23>,"interrupts:0";
-+		sx1509-0-3E-int-gpio = <0>,"+82+98",  <&sx150x_0_3E_pins>,"brcm,pins:0", <&sx1509_0_3E>,"interrupts:0";
-+		sx1509-1-3E-int-gpio = <0>,"+83+99",  <&sx150x_1_3E_pins>,"brcm,pins:0", <&sx1509_1_3E>,"interrupts:0";
-+		sx1509-0-3F-int-gpio = <0>,"+84+100", <&sx150x_0_3F_pins>,"brcm,pins:0", <&sx1509_0_3F>,"interrupts:0";
-+		sx1509-1-3F-int-gpio = <0>,"+85+101", <&sx150x_1_3F_pins>,"brcm,pins:0", <&sx1509_1_3F>,"interrupts:0";
-+		sx1509-0-70-int-gpio = <0>,"+86+102", <&sx150x_0_70_pins>,"brcm,pins:0", <&sx1509_0_70>,"interrupts:0";
-+		sx1509-1-70-int-gpio = <0>,"+87+103", <&sx150x_1_70_pins>,"brcm,pins:0", <&sx1509_1_70>,"interrupts:0";
-+		sx1509-0-71-int-gpio = <0>,"+88+104", <&sx150x_0_71_pins>,"brcm,pins:0", <&sx1509_0_71>,"interrupts:0";
-+		sx1509-1-71-int-gpio = <0>,"+89+105", <&sx150x_1_71_pins>,"brcm,pins:0", <&sx1509_1_71>,"interrupts:0";
-+	};
-+};
-+
-diff --git a/arch/arm/boot/dts/overlays/tc358743-audio-overlay.dts b/arch/arm/boot/dts/overlays/tc358743-audio-overlay.dts
-new file mode 100644
-index 000000000000..047695bb0c71
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/tc358743-audio-overlay.dts
-@@ -0,0 +1,52 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+// Definitions to add I2S audio from the Toshiba TC358743 HDMI to CSI2 bridge.
-+// Requires tc358743 overlay to have been loaded to actually function.
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target-path = "/";
-+		__overlay__ {
-+			tc358743_codec: tc358743-codec {
-+				#sound-dai-cells = <0>;
-+				compatible = "linux,spdif-dir";
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		sound_overlay: __overlay__ {
-+			compatible = "simple-audio-card";
-+			simple-audio-card,format = "i2s";
-+			simple-audio-card,name = "tc358743";
-+			simple-audio-card,bitclock-master = <&dailink0_slave>;
-+			simple-audio-card,frame-master = <&dailink0_slave>;
-+			status = "okay";
-+
-+			simple-audio-card,cpu {
-+				sound-dai = <&i2s>;
-+				dai-tdm-slot-num = <2>;
-+				dai-tdm-slot-width = <32>;
-+			};
-+			dailink0_slave: simple-audio-card,codec {
-+				sound-dai = <&tc358743_codec>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		card-name = <&sound_overlay>,"simple-audio-card,name";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/tc358743-overlay.dts b/arch/arm/boot/dts/overlays/tc358743-overlay.dts
-new file mode 100644
-index 000000000000..c3eebfd1f6ee
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/tc358743-overlay.dts
-@@ -0,0 +1,109 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+// Definitions for Toshiba TC358743 HDMI to CSI2 bridge on VC I2C bus
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	i2c_frag: fragment@0 {
-+		target = <&i2c_csi_dsi>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			tc358743: tc358743@f {
-+				compatible = "toshiba,tc358743";
-+				reg = <0x0f>;
-+				status = "okay";
-+
-+				clocks = <&cam1_clk>;
-+				clock-names = "refclk";
-+
-+				port {
-+					tc358743_0: endpoint {
-+						remote-endpoint = <&csi1_ep>;
-+						clock-lanes = <0>;
-+						clock-noncontinuous;
-+						link-frequencies =
-+							/bits/ 64 <486000000>;
-+					};
-+				};
-+			};
-+		};
-+	};
-+
-+	csi_frag: fragment@1 {
-+		target = <&csi1>;
-+		csi: __overlay__ {
-+			status = "okay";
-+
-+			port {
-+				csi1_ep: endpoint {
-+					remote-endpoint = <&tc358743_0>;
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&tc358743_0>;
-+		__overlay__ {
-+			data-lanes = <1 2>;
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&tc358743_0>;
-+		__dormant__ {
-+			data-lanes = <1 2 3 4>;
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&i2c0if>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@5 {
-+		target = <&i2c0mux>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	clk_frag: fragment@6 {
-+		target = <&cam1_clk>;
-+		__overlay__ {
-+			status = "okay";
-+			clock-frequency = <27000000>;
-+		};
-+	};
-+
-+	fragment@7 {
-+		target = <&csi1_ep>;
-+		__overlay__ {
-+			data-lanes = <1 2>;
-+		};
-+	};
-+
-+	fragment@8 {
-+		target = <&csi1_ep>;
-+		__dormant__ {
-+			data-lanes = <1 2 3 4>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		4lane = <0>, "-2+3-7+8";
-+		link-frequency = <&tc358743_0>,"link-frequencies#0";
-+		media-controller = <&csi>,"brcm,media-controller?";
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
-+		       <&csi_frag>, "target:0=",<&csi0>,
-+		       <&clk_frag>, "target:0=",<&cam0_clk>,
-+		       <&tc358743>, "clocks:0=",<&cam0_clk>;
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts b/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts
-new file mode 100644
-index 000000000000..a102b09e3ab5
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts
-@@ -0,0 +1,222 @@
-+/*
-+ * tinylcd35-overlay.dts
-+ *
-+ * -------------------------------------------------
-+ * www.tinlylcd.com
-+ * -------------------------------------------------
-+ * Device---Driver-----BUS       GPIO's
-+ * display  tinylcd35  spi0.0    25 24 18
-+ * touch    ads7846    spi0.1    5
-+ * rtc      ds1307     i2c1-0068
-+ * rtc      pcf8563    i2c1-0051
-+ * keypad   gpio-keys  --------- 17 22 27 23 28
-+ *
-+ *
-+ * TinyLCD.com 3.5 inch TFT
-+ *
-+ *  Version 001
-+ *  5/3/2015  -- Noralf Trønnes     Initial Device tree framework
-+ *  10/3/2015 -- tinylcd@gmail.com  added ds1307 support.
-+ *
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&spidev1>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			tinylcd35_pins: tinylcd35_pins {
-+				brcm,pins = <25 24 18>;
-+				brcm,function = <1>; /* out */
-+			};
-+			tinylcd35_ts_pins: tinylcd35_ts_pins {
-+				brcm,pins = <5>;
-+				brcm,function = <0>; /* in */
-+			};
-+			keypad_pins: keypad_pins {
-+				brcm,pins = <4 17 22 23 27>;
-+				brcm,function = <0>; /* in */
-+				brcm,pull = <1>; /* down */
-+			};
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			tinylcd35: tinylcd35@0{
-+				compatible = "neosec,tinylcd";
-+				reg = <0>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&tinylcd35_pins>,
-+					    <&tinylcd35_ts_pins>;
-+
-+				spi-max-frequency = <48000000>;
-+				rotate = <270>;
-+				fps = <20>;
-+				bgr;
-+				buswidth = <8>;
-+				reset-gpios = <&gpio 25 1>;
-+				dc-gpios = <&gpio 24 0>;
-+				led-gpios = <&gpio 18 0>;
-+				debug = <0>;
-+
-+				init = <0x10000B0 0x80
-+					0x10000C0 0x0A 0x0A
-+					0x10000C1 0x01 0x01
-+					0x10000C2 0x33
-+					0x10000C5 0x00 0x42 0x80
-+					0x10000B1 0xD0 0x11
-+					0x10000B4 0x02
-+					0x10000B6 0x00 0x22 0x3B
-+					0x10000B7 0x07
-+					0x1000036 0x58
-+					0x10000F0 0x36 0xA5 0xD3
-+					0x10000E5 0x80
-+					0x10000E5 0x01
-+					0x10000B3 0x00
-+					0x10000E5 0x00
-+					0x10000F0 0x36 0xA5 0x53
-+					0x10000E0 0x00 0x35 0x33 0x00 0x00 0x00 0x00 0x35 0x33 0x00 0x00 0x00
-+					0x100003A 0x55
-+					0x1000011
-+					0x2000001
-+					0x1000029>;
-+			};
-+
-+			tinylcd35_ts: tinylcd35_ts@1 {
-+				compatible = "ti,ads7846";
-+				reg = <1>;
-+				status = "disabled";
-+
-+				spi-max-frequency = <2000000>;
-+				interrupts = <5 2>; /* high-to-low edge triggered */
-+				interrupt-parent = <&gpio>;
-+				pendown-gpio = <&gpio 5 0>;
-+				ti,x-plate-ohms = /bits/ 16 <100>;
-+				ti,pressure-max = /bits/ 16 <255>;
-+			};
-+		};
-+	};
-+
-+	/*  RTC    */
-+
-+	fragment@5 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			status = "okay";
-+
-+			pcf8563: pcf8563@51 {
-+				compatible = "nxp,pcf8563";
-+				reg = <0x51>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@6 {
-+		target = <&i2c1>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			status = "okay";
-+
-+			ds1307: ds1307@68 {
-+				compatible = "dallas,ds1307";
-+				reg = <0x68>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	/*
-+	 * Values for input event code is found under the
-+	 * 'Keys and buttons' heading in include/uapi/linux/input.h
-+	 */
-+	fragment@7 {
-+		target-path = "/soc";
-+		__overlay__ {
-+			keypad: keypad {
-+				compatible = "gpio-keys";
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&keypad_pins>;
-+				status = "disabled";
-+				autorepeat;
-+
-+				button@17 {
-+					label = "GPIO KEY_UP";
-+					linux,code = <103>;
-+					gpios = <&gpio 17 0>;
-+				};
-+				button@22 {
-+					label = "GPIO KEY_DOWN";
-+					linux,code = <108>;
-+					gpios = <&gpio 22 0>;
-+				};
-+				button@27 {
-+					label = "GPIO KEY_LEFT";
-+					linux,code = <105>;
-+					gpios = <&gpio 27 0>;
-+				};
-+				button@23 {
-+					label = "GPIO KEY_RIGHT";
-+					linux,code = <106>;
-+					gpios = <&gpio 23 0>;
-+				};
-+				button@4 {
-+					label = "GPIO KEY_ENTER";
-+					linux,code = <28>;
-+					gpios = <&gpio 4 0>;
-+				};
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		speed =      <&tinylcd35>,"spi-max-frequency:0";
-+		rotate =     <&tinylcd35>,"rotate:0";
-+		fps =        <&tinylcd35>,"fps:0";
-+		debug =      <&tinylcd35>,"debug:0";
-+		touch =      <&tinylcd35_ts>,"status";
-+		touchgpio =  <&tinylcd35_ts_pins>,"brcm,pins:0",
-+			     <&tinylcd35_ts>,"interrupts:0",
-+			     <&tinylcd35_ts>,"pendown-gpio:4";
-+		xohms =      <&tinylcd35_ts>,"ti,x-plate-ohms;0";
-+		rtc-pcf =    <0>,"=5";
-+		rtc-ds =     <0>,"=6";
-+		keypad =     <&keypad>,"status";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/tpm-slb9670-overlay.dts b/arch/arm/boot/dts/overlays/tpm-slb9670-overlay.dts
-new file mode 100644
-index 000000000000..e69188503ca3
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/tpm-slb9670-overlay.dts
-@@ -0,0 +1,44 @@
-+/*
-+ * Device Tree overlay for the Infineon SLB9670 Trusted Platform Module add-on
-+ * boards, which can be used as a secure key storage and hwrng.
-+ * available as "Iridium SLB9670" by Infineon and "LetsTrust TPM" by pi3g.
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spidev1>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			slb9670: slb9670@1 {
-+				compatible = "infineon,slb9670";
-+				reg = <1>;	/* CE1 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <32000000>;
-+				status = "okay";
-+			};
-+
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/tpm-slb9673-overlay.dts b/arch/arm/boot/dts/overlays/tpm-slb9673-overlay.dts
-new file mode 100644
-index 000000000000..cba8c25c30e5
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/tpm-slb9673-overlay.dts
-@@ -0,0 +1,50 @@
-+/*
-+ * Device Tree overlay for the Infineon SLB9673 Trusted Platform Module add-on
-+ * boards, which can be used as a secure key storage and hwrng.
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	/* Due to issue https://github.com/raspberrypi/linux/issues/4884 the
-+	   hardware I2C needs to be disabled and software I2C enabled */
-+	fragment@0 {
-+		target = <&i2c_arm>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target-path = "/";
-+		__overlay__ {
-+			i2c1: i2c-gpio@1 {
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				compatible = "i2c-gpio";
-+				gpios = <&gpio 2 6>, /* SDA GPIO_OPEN_DRAIN */
-+				     	<&gpio 3 6>; /* CLK GPIO_OPEN_DRAIN */
-+				clock-frequency = <400000>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	/* Add the TPM */
-+	fragment@2 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			slb9673: slb9673@2e {
-+				compatible = "infineon,slb9673", "tcg,tpm-tis-i2c";
-+				reg = <0x2e>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/uart0-overlay.dts b/arch/arm/boot/dts/overlays/uart0-overlay.dts
-new file mode 100755
-index 000000000000..6bf2e0fd5c61
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/uart0-overlay.dts
-@@ -0,0 +1,32 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&uart0>;
-+		__overlay__ {
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&uart0_pins>;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			uart0_pins: uart0_ovl_pins {
-+				brcm,pins = <14 15>;
-+				brcm,function = <4>; /* alt0 */
-+				brcm,pull = <0 2>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		txd0_pin = <&uart0_pins>,"brcm,pins:0";
-+		rxd0_pin = <&uart0_pins>,"brcm,pins:4";
-+		pin_func = <&uart0_pins>,"brcm,function:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/uart1-overlay.dts b/arch/arm/boot/dts/overlays/uart1-overlay.dts
-new file mode 100644
-index 000000000000..64163bf932b7
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/uart1-overlay.dts
-@@ -0,0 +1,38 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&uart1>;
-+		__overlay__ {
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&uart1_pins>;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			uart1_pins: uart1_ovl_pins {
-+				brcm,pins = <14 15>;
-+				brcm,function = <2>; /* alt5 */
-+				brcm,pull = <0 2>;
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target-path = "/chosen";
-+		__overlay__ {
-+			bootargs = "8250.nr_uarts=1";
-+		};
-+	};
-+
-+	__overrides__ {
-+		txd1_pin = <&uart1_pins>,"brcm,pins:0";
-+		rxd1_pin = <&uart1_pins>,"brcm,pins:4";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/uart2-overlay.dts b/arch/arm/boot/dts/overlays/uart2-overlay.dts
-new file mode 100644
-index 000000000000..9face240aca1
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/uart2-overlay.dts
-@@ -0,0 +1,27 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2711";
-+
-+	fragment@0 {
-+		target = <&uart2>;
-+		__overlay__ {
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&uart2_pins>;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&uart2_pins>;
-+		__dormant__ {
-+			brcm,pins = <0 1 2 3>;
-+			brcm,pull = <0 2 2 0>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		ctsrts = <0>,"=1";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/uart3-overlay.dts b/arch/arm/boot/dts/overlays/uart3-overlay.dts
-new file mode 100644
-index 000000000000..ae9f9fe5ea1d
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/uart3-overlay.dts
-@@ -0,0 +1,27 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2711";
-+
-+	fragment@0 {
-+		target = <&uart3>;
-+		__overlay__ {
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&uart3_pins>;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&uart3_pins>;
-+		__dormant__ {
-+			brcm,pins = <4 5 6 7>;
-+			brcm,pull = <0 2 2 0>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		ctsrts = <0>,"=1";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/uart4-overlay.dts b/arch/arm/boot/dts/overlays/uart4-overlay.dts
-new file mode 100644
-index 000000000000..ac004ffbadbf
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/uart4-overlay.dts
-@@ -0,0 +1,27 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2711";
-+
-+	fragment@0 {
-+		target = <&uart4>;
-+		__overlay__ {
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&uart4_pins>;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&uart4_pins>;
-+		__dormant__ {
-+			brcm,pins = <8 9 10 11>;
-+			brcm,pull = <0 2 2 0>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		ctsrts = <0>,"=1";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/uart5-overlay.dts b/arch/arm/boot/dts/overlays/uart5-overlay.dts
-new file mode 100644
-index 000000000000..04eaf376effe
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/uart5-overlay.dts
-@@ -0,0 +1,27 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2711";
-+
-+	fragment@0 {
-+		target = <&uart5>;
-+		__overlay__ {
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&uart5_pins>;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&uart5_pins>;
-+		__dormant__ {
-+			brcm,pins = <12 13 14 15>;
-+			brcm,pull = <0 2 2 0>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		ctsrts = <0>,"=1";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/udrc-overlay.dts b/arch/arm/boot/dts/overlays/udrc-overlay.dts
-new file mode 100644
-index 000000000000..ae7c37996894
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/udrc-overlay.dts
-@@ -0,0 +1,128 @@
-+#include <dt-bindings/clock/bcm2835.h>
-+/*
-+ * Device tree overlay for the Universal Digital Radio Controller
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+    compatible = "brcm,bcm2835";
-+    fragment@0 {
-+        target = <&i2s>;
-+        __overlay__ {
-+            clocks = <&clocks BCM2835_CLOCK_PCM>;
-+            clock-names = "pcm";
-+            status = "okay";
-+        };
-+    };
-+
-+    fragment@1 {
-+        target-path = "/";
-+        __overlay__ {
-+            regulators {
-+                compatible = "simple-bus";
-+                #address-cells = <1>;
-+                #size-cells = <0>;
-+
-+                udrc0_ldoin: udrc0_ldoin {
-+                    compatible = "regulator-fixed";
-+                    regulator-name = "ldoin";
-+                    regulator-min-microvolt = <3300000>;
-+                    regulator-max-microvolt = <3300000>;
-+                    regulator-always-on;
-+                };
-+            };
-+        };
-+    };
-+
-+    fragment@2 {
-+        target = <&i2c1>;
-+        __overlay__ {
-+            #address-cells = <1>;
-+            #size-cells = <0>;
-+            status = "okay";
-+            clocks = <&clocks BCM2835_CLOCK_VPU>;
-+            clock-frequency = <400000>;
-+
-+            tlv320aic32x4: tlv320aic32x4@18 {
-+                compatible = "ti,tlv320aic32x4";
-+                #sound-dai-cells = <0>;
-+                reg = <0x18>;
-+                status = "okay";
-+
-+                clocks = <&clocks BCM2835_CLOCK_GP0>;
-+                clock-names = "mclk";
-+                assigned-clocks = <&clocks BCM2835_CLOCK_GP0>;
-+                assigned-clock-rates = <25000000>;
-+
-+                pinctrl-names = "default";
-+                pinctrl-0 = <&gpclk0_pin &aic3204_reset>;
-+
-+                reset-gpios = <&gpio 13 0>;
-+
-+                iov-supply = <&udrc0_ldoin>;
-+                ldoin-supply = <&udrc0_ldoin>;
-+            };
-+        };
-+    };
-+
-+    fragment@3 {
-+        target = <&sound>;
-+        snd: __overlay__ {
-+            compatible = "simple-audio-card";
-+            i2s-controller = <&i2s>;
-+            status = "okay";
-+
-+            simple-audio-card,name = "udrc";
-+            simple-audio-card,format = "i2s";
-+
-+            simple-audio-card,bitclock-master = <&dailink0_master>;
-+            simple-audio-card,frame-master = <&dailink0_master>;
-+
-+            simple-audio-card,widgets =
-+                "Line", "Line In",
-+                "Line", "Line Out";
-+
-+            simple-audio-card,routing =
-+                "IN1_R", "Line In",
-+                "IN1_L", "Line In",
-+                "CM_L", "Line In",
-+                "CM_R", "Line In",
-+                "Line Out", "LOR",
-+                "Line Out", "LOL";
-+
-+            dailink0_master: simple-audio-card,cpu {
-+                sound-dai = <&i2s>;
-+            };
-+
-+            simple-audio-card,codec {
-+                sound-dai = <&tlv320aic32x4>;
-+            };
-+        };
-+    };
-+
-+    fragment@4 {
-+        target = <&gpio>;
-+        __overlay__ {
-+            gpclk0_pin: gpclk0_pin {
-+                brcm,pins = <4>;
-+                brcm,function = <4>;
-+            };
-+
-+            aic3204_reset: aic3204_reset {
-+                brcm,pins = <13>;
-+                brcm,function = <1>;
-+                brcm,pull = <1>;
-+            };
-+
-+            aic3204_gpio: aic3204_gpio {
-+                brcm,pins = <26>;
-+            };
-+        };
-+    };
-+
-+    __overrides__ {
-+        alsaname = <&snd>, "simple-audio-card,name";
-+    };
-+};
-diff --git a/arch/arm/boot/dts/overlays/ugreen-dabboard-overlay.dts b/arch/arm/boot/dts/overlays/ugreen-dabboard-overlay.dts
-new file mode 100644
-index 000000000000..fc8d9b118068
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/ugreen-dabboard-overlay.dts
-@@ -0,0 +1,49 @@
-+// Definitions for the ugreen dabboard I2S
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target-path = "/";
-+		__overlay__ {
-+			dmic_codec: dmic-codec {
-+				#sound-dai-cells = <0>;
-+				compatible = "dmic-codec";
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		sound_overlay: __overlay__ {
-+			compatible = "simple-audio-card";
-+			simple-audio-card,format = "i2s";
-+			simple-audio-card,name = "dabboard";
-+			simple-audio-card,bitclock-master = <&dailink0_slave>;
-+			simple-audio-card,frame-master = <&dailink0_slave>;
-+			simple-audio-card,widgets = "Microphone", "Microphone Jack";
-+			status = "okay";
-+			simple-audio-card,cpu {
-+				sound-dai = <&i2s>;
-+			};
-+			dailink0_slave: simple-audio-card,codec {
-+				#sound-dai-cells = <0>;
-+				sound-dai = <&dmic_codec>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		card-name = <&sound_overlay>,"simple-audio-card,name";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/upstream-overlay.dts b/arch/arm/boot/dts/overlays/upstream-overlay.dts
-new file mode 100644
-index 000000000000..55a99736a33b
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/upstream-overlay.dts
-@@ -0,0 +1,101 @@
-+// redo: ovmerge -c vc4-kms-v3d-overlay.dts,cma-default,composite dwc2-overlay.dts,dr_mode=otg
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/clock/bcm2835.h>
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+	fragment@0 {
-+		target = <&i2c2>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+	fragment@1 {
-+		target = <&fb>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+	fragment@2 {
-+		target = <&pixelvalve0>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+	fragment@3 {
-+		target = <&pixelvalve1>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+	fragment@4 {
-+		target = <&pixelvalve2>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+	fragment@5 {
-+		target = <&hvs>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+	fragment@6 {
-+		target = <&hdmi>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+	fragment@7 {
-+		target = <&v3d>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+	fragment@8 {
-+		target = <&vc4>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+	fragment@9 {
-+		target = <&clocks>;
-+		__overlay__ {
-+			claim-clocks = <BCM2835_PLLD_DSI0 BCM2835_PLLD_DSI1 BCM2835_PLLH_AUX BCM2835_PLLH_PIX>;
-+		};
-+	};
-+	fragment@10 {
-+		target = <&vec>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+	fragment@11 {
-+		target = <&txp>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+	fragment@12 {
-+		target = <&chosen>;
-+		__overlay__ {
-+			bootargs = "snd_bcm2835.enable_hdmi=0";
-+		};
-+	};
-+	fragment@13 {
-+		target = <&usb>;
-+		#address-cells = <1>;
-+		#size-cells = <1>;
-+		__overlay__ {
-+			compatible = "brcm,bcm2835-usb";
-+			dr_mode = "otg";
-+			g-np-tx-fifo-size = <32>;
-+			g-rx-fifo-size = <558>;
-+			g-tx-fifo-size = <512 512 512 512 512 256 256>;
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts
-new file mode 100644
-index 000000000000..1dc60ae6d967
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts
-@@ -0,0 +1,137 @@
-+// redo: ovmerge -c vc4-kms-v3d-pi4-overlay.dts,cma-default dwc2-overlay.dts,dr_mode=otg
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/clock/bcm2835.h>
-+
-+/ {
-+	compatible = "brcm,bcm2711";
-+	fragment@0 {
-+		target = <&ddc0>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+	fragment@1 {
-+		target = <&ddc1>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+	fragment@2 {
-+		target = <&hdmi0>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+	fragment@3 {
-+		target = <&hdmi1>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+	fragment@4 {
-+		target = <&hvs>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+	fragment@5 {
-+		target = <&pixelvalve0>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+	fragment@6 {
-+		target = <&pixelvalve1>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+	fragment@7 {
-+		target = <&pixelvalve2>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+	fragment@8 {
-+		target = <&pixelvalve3>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+	fragment@9 {
-+		target = <&pixelvalve4>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+	fragment@10 {
-+		target = <&v3d>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+	fragment@11 {
-+		target = <&vc4>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+	fragment@12 {
-+		target = <&txp>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+	fragment@13 {
-+		target = <&fb>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+	fragment@14 {
-+		target = <&firmwarekms>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+	fragment@15 {
-+		target = <&vec>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+	fragment@16 {
-+		target-path = "/chosen";
-+		__overlay__ {
-+			bootargs = "snd_bcm2835.enable_hdmi=0";
-+		};
-+	};
-+	fragment@17 {
-+		target = <&dvp>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+	fragment@18 {
-+		target = <&aon_intr>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+	fragment@19 {
-+		target = <&usb>;
-+		#address-cells = <1>;
-+		#size-cells = <1>;
-+		__overlay__ {
-+			compatible = "brcm,bcm2835-usb";
-+			dr_mode = "otg";
-+			g-np-tx-fifo-size = <32>;
-+			g-rx-fifo-size = <558>;
-+			g-tx-fifo-size = <512 512 512 512 512 256 256>;
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts
-new file mode 100644
-index 000000000000..ca344492bed8
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts
-@@ -0,0 +1,40 @@
-+/*
-+ * vc4-fkms-v3d-overlay.dts
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include "cma-overlay.dts"
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@1 {
-+		target = <&fb>;
-+		__overlay__  {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&firmwarekms>;
-+		__overlay__  {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&v3d>;
-+		__overlay__  {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&vc4>;
-+		__overlay__  {
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/vc4-fkms-v3d-pi4-overlay.dts b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-pi4-overlay.dts
-new file mode 100644
-index 000000000000..7792ead0cbb3
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-pi4-overlay.dts
-@@ -0,0 +1,44 @@
-+/*
-+ * vc4-fkms-v3d-overlay.dts
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include "cma-overlay.dts"
-+
-+&frag0 {
-+	size = <((320-4)*1024*1024)>;
-+};
-+
-+/ {
-+	compatible = "brcm,bcm2711";
-+
-+	fragment@1 {
-+		target = <&fb>;
-+		__overlay__  {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&firmwarekms>;
-+		__overlay__  {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&v3d>;
-+		__overlay__  {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&vc4>;
-+		__overlay__  {
-+			status = "okay";
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts
-new file mode 100644
-index 000000000000..85875c266296
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts
-@@ -0,0 +1,81 @@
-+/*
-+ * vc4-kms-dpi-generic-overlay.dts
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include "vc4-kms-dpi.dtsi"
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&panel>;
-+		panel_generic: __overlay__  {
-+			compatible = "panel-dpi";
-+
-+			width-mm = <154>;
-+			height-mm = <83>;
-+			bus-format = <0x1009>;
-+
-+			timing: panel-timing {
-+				clock-frequency = <29500000>;
-+				hactive = <800>;
-+				hfront-porch = <24>;
-+				hsync-len = <72>;
-+				hback-porch = <96>;
-+				hsync-active = <1>;
-+				vactive = <480>;
-+				vfront-porch = <3>;
-+				vsync-len = <10>;
-+				vback-porch = <7>;
-+				vsync-active = <1>;
-+
-+				de-active = <1>;
-+				pixelclk-active = <1>;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&dpi>;
-+		dpi_node_generic: __overlay__  {
-+			pinctrl-0 = <&dpi_18bit_gpio0>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		clock-frequency = <&timing>, "clock-frequency:0";
-+		hactive = <&timing>, "hactive:0";
-+		hfp = <&timing>, "hfront-porch:0";
-+		hsync = <&timing>, "hsync-len:0";
-+		hbp = <&timing>, "hback-porch:0";
-+		vactive = <&timing>, "vactive:0";
-+		vfp = <&timing>, "vfront-porch:0";
-+		vsync = <&timing>, "vsync-len:0";
-+		vbp = <&timing>, "vback-porch:0";
-+		hsync-invert = <&timing>, "hsync-active:0=0";
-+		vsync-invert = <&timing>, "vsync-active:0=0";
-+		de-invert = <&timing>, "de-active:0=0";
-+		pixclk-invert = <&timing>, "pixelclk-active:0=0";
-+
-+		width-mm = <&panel>, "width-mm:0";
-+		height-mm = <&panel>, "height-mm:0";
-+
-+		rgb565 = <&panel_generic>, "bus-format:0=0x1017",
-+			<&dpi_node_generic>, "pinctrl-0:0=",<&dpi_16bit_gpio0>;
-+		rgb565-padhi = <&panel_generic>, "bus-format:0=0x1020",
-+			<&dpi_node_generic>, "pinctrl-0:0=",<&dpi_16bit_cpadhi_gpio0>;
-+		bgr666 = <&panel_generic>, "bus-format:0=0x101f";
-+		bgr666-padhi = <&panel_generic>, "bus-format:0=0x101e",
-+			<&dpi_node_generic>, "pinctrl-0:0=",<&dpi_18bit_cpadhi_gpio0>;
-+		rgb666-padhi = <&panel_generic>, "bus-format:0=0x1015",
-+			<&dpi_node_generic>, "pinctrl-0:0=",<&dpi_18bit_cpadhi_gpio0>;
-+		bgr888 = <&panel_generic>, "bus-format:0=0x1013",
-+			<&dpi_node_generic>, "pinctrl-0:0=",<&dpi_gpio0>;
-+		rgb888 = <&panel_generic>, "bus-format:0=0x100a",
-+			<&dpi_node_generic>, "pinctrl-0:0=",<&dpi_gpio0>;
-+		bus-format = <&panel_generic>, "bus-format:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel.dtsi b/arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel.dtsi
-new file mode 100644
-index 000000000000..585402a3b9b4
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel.dtsi
-@@ -0,0 +1,94 @@
-+/*
-+ * vc4-kms-dpi-hyperpixel4.dtsi
-+ * Commmon initialisation for HyperPixel DPI displays
-+ */
-+
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/pinctrl/bcm2835.h>
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target-path = "/";
-+		__overlay__ {
-+			spi {
-+				compatible = "spi-gpio";
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				pinctrl-0 = <&spi_pins>;
-+				pinctrl-names = "default";
-+
-+				sck-gpios = <&gpio 27 GPIO_ACTIVE_HIGH>;
-+				mosi-gpios = <&gpio 26 GPIO_ACTIVE_HIGH>;
-+				cs-gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
-+				num-chipselects = <1>;
-+				sck-idle-input;
-+
-+				panel: display@0 {
-+					reg = <0>;
-+					/* 100 kHz */
-+					spi-max-frequency = <100000>;
-+					backlight = <&backlight>;
-+					rotation = <0>;
-+
-+					port {
-+						panel_in: endpoint {
-+							remote-endpoint = <&dpi_out>;
-+						};
-+					};
-+				};
-+			};
-+
-+			backlight: backlight {
-+				compatible = "gpio-backlight";
-+				gpios = <&gpio 19 0>;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&dpi>;
-+		__overlay__  {
-+			status = "okay";
-+
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&dpi_18bit_cpadhi_gpio0>;
-+
-+			port {
-+				dpi_out: endpoint {
-+					remote-endpoint = <&panel_in>;
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			spi_pins: hyperpixel4_spi_pins {
-+				brcm,pins = <27 18 26>;
-+				brcm,pull = <BCM2835_PUD_UP BCM2835_PUD_UP BCM2835_PUD_OFF>;
-+				brcm,function = <0>;
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target-path = "/";
-+		__overlay__ {
-+			i2c_gpio: i2c@0 {
-+				compatible = "i2c-gpio";
-+				gpios = <&gpio 10 0 /* sda */
-+					 &gpio 11 0>; /* scl */
-+				i2c-gpio,delay-us = <4>;        /* ~100 kHz */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		rotate = <&panel>, "rotation:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel2r-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel2r-overlay.dts
-new file mode 100644
-index 000000000000..4cd9d6a55c48
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel2r-overlay.dts
-@@ -0,0 +1,114 @@
-+/*
-+ * vc4-kms-dpi-hyperpixel2r-overlay.dts
-+ */
-+
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/pinctrl/bcm2835.h>
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target-path = "/";
-+		__overlay__ {
-+			spi {
-+				compatible = "spi-gpio";
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				pinctrl-0 = <&spi_pins>;
-+				pinctrl-names = "default";
-+
-+				sck-gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
-+				mosi-gpios = <&gpio 10 GPIO_ACTIVE_HIGH>;
-+				cs-gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
-+				num-chipselects = <1>;
-+
-+				panel: display@0 {
-+					compatible = "pimoroni,hyperpixel2round";
-+					reg = <0>;
-+					/* 100 kHz */
-+					spi-max-frequency = <100000>;
-+					backlight = <&backlight>;
-+					rotation = <0>;
-+
-+					port {
-+						panel_in: endpoint {
-+							remote-endpoint = <&dpi_out>;
-+						};
-+					};
-+				};
-+			};
-+
-+			backlight: backlight {
-+				compatible = "gpio-backlight";
-+				gpios = <&gpio 19 0>;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&dpi>;
-+		__overlay__  {
-+			status = "okay";
-+
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&dpi_18bit_cpadhi_gpio0>;
-+
-+			port {
-+				dpi_out: endpoint {
-+					remote-endpoint = <&panel_in>;
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			spi_pins: hyperpixel4_spi_pins {
-+				brcm,pins = <27 18 26>;
-+				brcm,pull = <BCM2835_PUD_UP BCM2835_PUD_UP BCM2835_PUD_OFF>;
-+				brcm,function = <0>;
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target-path = "/";
-+		__overlay__ {
-+			i2c_gpio: i2c@0 {
-+				compatible = "i2c-gpio";
-+				status = "disabled";
-+
-+				gpios = <&gpio 10 GPIO_ACTIVE_HIGH /* sda */
-+					 &gpio 11 GPIO_ACTIVE_HIGH>; /* scl */
-+				i2c-gpio,delay-us = <4>;        /* ~100 kHz */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+
-+				polytouch: edt-ft5x06@15 {
-+					#address-cells = <1>;
-+					#size-cells = <0>;
-+					compatible = "edt,edt-ft5406";
-+					reg = <0x15>;
-+					interrupt-parent = <&gpio>;
-+					interrupts = <27 0x02>;
-+					touchscreen-size-x = <240>;
-+					touchscreen-size-y = <240>;
-+				};
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		disable-touch = <0>,"-3";
-+		touchscreen-inverted-x = <&polytouch>,"touchscreen-inverted-x?";
-+		touchscreen-inverted-y = <&polytouch>,"touchscreen-inverted-y!";
-+		touchscreen-swapped-x-y = <&polytouch>,"touchscreen-swapped-x-y!";
-+		rotate = <&panel>, "rotation:0";
-+	};
-+
-+};
-diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel4-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel4-overlay.dts
-new file mode 100644
-index 000000000000..eafc25ad79ff
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel4-overlay.dts
-@@ -0,0 +1,57 @@
-+/*
-+ * vc4-kms-dpi-hyperpixel4sq-overlay.dts
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include "vc4-kms-dpi-hyperpixel.dtsi"
-+
-+&panel {
-+	compatible = "pimoroni,hyperpixel4";
-+};
-+
-+/ {
-+	fragment@11 {
-+		target = <&i2c_gpio>;
-+		__overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			ft6236_14: ft6236@14 {
-+				compatible = "goodix,gt911";
-+				reg = <0x14>;
-+				interrupt-parent = <&gpio>;
-+				interrupts = <27 2>;
-+				touchscreen-size-x = <480>;
-+				touchscreen-size-y = <800>;
-+				touchscreen-x-mm = <51>;
-+				touchscreen-y-mm = <85>;
-+				touchscreen-inverted-y;
-+				touchscreen-swapped-x-y;
-+			};
-+			ft6236_5d: ft6236@5d {
-+				compatible = "goodix,gt911";
-+				reg = <0x5d>;
-+				interrupt-parent = <&gpio>;
-+				interrupts = <27 2>;
-+				touchscreen-size-x = <480>;
-+				touchscreen-size-y = <800>;
-+				touchscreen-x-mm = <51>;
-+				touchscreen-y-mm = <85>;
-+				touchscreen-inverted-y;
-+				touchscreen-swapped-x-y;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		disable-touch = <0>,"-3-11";
-+		touchscreen-inverted-x = <&ft6236_14>,"touchscreen-inverted-x?",
-+					 <&ft6236_5d>,"touchscreen-inverted-x?";
-+		touchscreen-inverted-y = <&ft6236_14>,"touchscreen-inverted-y!",
-+					 <&ft6236_5d>,"touchscreen-inverted-y!";
-+		touchscreen-swapped-x-y = <&ft6236_14>,"touchscreen-swapped-x-y!",
-+					  <&ft6236_5d>,"touchscreen-swapped-x-y!";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel4sq-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel4sq-overlay.dts
-new file mode 100644
-index 000000000000..700046348ecf
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-hyperpixel4sq-overlay.dts
-@@ -0,0 +1,36 @@
-+/*
-+ * vc4-kms-dpi-hyperpixel4-overlay.dts
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include "vc4-kms-dpi-hyperpixel.dtsi"
-+
-+&panel {
-+	compatible = "pimoroni,hyperpixel4square";
-+};
-+
-+/ {
-+	fragment@11 {
-+		target = <&i2c_gpio>;
-+		__overlay__ {
-+			polytouch: edt-ft5x06@48 {
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				compatible = "edt,edt-ft5406";
-+				reg = <0x48>;
-+				interrupt-parent = <&gpio>;
-+				interrupts = <27 0x02>;
-+				touchscreen-size-x = <720>;
-+				touchscreen-size-y = <720>;
-+			};
-+		};
-+	};
-+	__overrides__ {
-+		disable-touch = <0>,"-3-11";
-+		touchscreen-inverted-x = <&polytouch>,"touchscreen-inverted-x?";
-+		touchscreen-inverted-y = <&polytouch>,"touchscreen-inverted-y!";
-+		touchscreen-swapped-x-y = <&polytouch>,"touchscreen-swapped-x-y!";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dpi-panel-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dpi-panel-overlay.dts
-new file mode 100644
-index 000000000000..ee9e2e8fd246
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-panel-overlay.dts
-@@ -0,0 +1,69 @@
-+/*
-+ * vc4-kms-dpi-panel-overlay.dts
-+ * Support for any predefined DPI panel.
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include "vc4-kms-dpi.dtsi"
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&panel>;
-+		__dormant__  {
-+			compatible = "innolux,at056tn53v1", "simple-panel";
-+		};
-+	};
-+	fragment@1 {
-+		target = <&panel>;
-+		__dormant__  {
-+			compatible = "ontat,yx700wv03", "simple-panel";
-+		};
-+	};
-+	fragment@2 {
-+		target = <&panel>;
-+		__dormant__  {
-+			compatible = "geekworm,mzp280", "simple-panel";
-+		};
-+	};
-+
-+	fragment@90 {
-+		target = <&dpi>;
-+		__dormant__  {
-+			pinctrl-0 = <&dpi_18bit_cpadhi_gpio0>;
-+		};
-+	};
-+	fragment@91 {
-+		target = <&dpi>;
-+		__dormant__  {
-+			pinctrl-0 = <&dpi_18bit_gpio0>;
-+		};
-+	};
-+	fragment@92 {
-+		target = <&dpi>;
-+		__dormant__  {
-+			pinctrl-0 = <&dpi_gpio0>;
-+		};
-+	};
-+	fragment@93 {
-+		target = <&dpi>;
-+		__dormant__  {
-+			pinctrl-0 = <&dpi_16bit_cpadhi_gpio0>;
-+		};
-+	};
-+	fragment@94 {
-+		target = <&dpi>;
-+		__dormant__  {
-+			pinctrl-0 = <&dpi_16bit_gpio0>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		at056tn53v1 = <0>, "+0+90";
-+		kippah-7inch = <0>, "+1+91";
-+		mzp280 = <0>, "+2+93";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dpi.dtsi b/arch/arm/boot/dts/overlays/vc4-kms-dpi.dtsi
-new file mode 100644
-index 000000000000..27bb76598701
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi.dtsi
-@@ -0,0 +1,111 @@
-+/*
-+ * vc4-kms-dpi.dtsi
-+ */
-+
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/pinctrl/bcm2835.h>
-+
-+/ {
-+	fragment@100 {
-+		target-path = "/";
-+		__overlay__ {
-+			panel: panel {
-+				rotation = <0>;
-+				port {
-+					panel_in: endpoint {
-+						remote-endpoint = <&dpi_out>;
-+					};
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@101 {
-+		target = <&dpi>;
-+		dpi_node: __overlay__  {
-+			status = "okay";
-+
-+			pinctrl-names = "default";
-+
-+			port {
-+				dpi_out: endpoint {
-+					remote-endpoint = <&panel_in>;
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@102 {
-+		target = <&panel>;
-+		__dormant__  {
-+			backlight = <&backlight>;
-+		};
-+	};
-+
-+	fragment@103 {
-+		target-path = "/";
-+		__dormant__  {
-+			backlight: backlight {
-+				compatible = "gpio-backlight";
-+				gpios = <&gpio 255 GPIO_ACTIVE_HIGH>;
-+			};
-+		};
-+	};
-+
-+	fragment@104 {
-+		target = <&panel>;
-+		__dormant__  {
-+			backlight = <&backlight_pwm>;
-+		};
-+	};
-+
-+	fragment@105 {
-+		target-path = "/";
-+		__dormant__  {
-+			backlight_pwm: backlight_pwm {
-+				compatible = "pwm-backlight";
-+				brightness-levels = <0 6 8 12 16 24 32 40 48 64 96 128 160 192 224 255>;
-+				default-brightness-level = <16>;
-+				pwms = <&pwm 0 200000>;
-+			};
-+		};
-+	};
-+
-+	fragment@106 {
-+		target = <&pwm>;
-+		__dormant__ {
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&pwm_pins>;
-+			assigned-clock-rates = <1000000>;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@107 {
-+		target = <&gpio>;
-+		__dormant__ {
-+			pwm_pins: pwm_pins {
-+				brcm,pins = <18>;
-+				brcm,function = <2>; /* Alt5 */
-+			};
-+		};
-+	};
-+
-+	fragment@108 {
-+		target = <&chosen>;
-+		__dormant__  {
-+			bootargs = "snd_bcm2835.enable_headphones=0";
-+		};
-+	};
-+
-+	__overrides__ {
-+		backlight-gpio = <0>, "+102+103",
-+			<&backlight>, "gpios:4";
-+		backlight-pwm = <0>, "+104+105+106+107+108";
-+		backlight-pwm-chan = <&backlight_pwm>, "pwms:4";
-+		backlight-pwm-gpio = <&pwm_pins>, "brcm,pins:0";
-+		backlight-pwm-func = <&pwm_pins>, "brcm,function:0";
-+		backlight-def-brightness = <&backlight_pwm>, "default-brightness-level:0";
-+		rotate = <&panel>, "rotation:0";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dsi-7inch-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dsi-7inch-overlay.dts
-new file mode 100644
-index 000000000000..5e1700d0367a
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/vc4-kms-dsi-7inch-overlay.dts
-@@ -0,0 +1,118 @@
-+/*
-+ * Device Tree overlay for RaspberryPi 7" Touchscreen panel
-+ *
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include "edt-ft5406.dtsi"
-+
-+/ {
-+	/* No compatible as it will have come from edt-ft5406.dtsi */
-+
-+	fragment@0 {
-+		target = <&dsi1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+			port {
-+				dsi_out: endpoint {
-+					remote-endpoint = <&bridge_in>;
-+				};
-+			};
-+			bridge@0 {
-+				reg = <0>;
-+				compatible = "toshiba,tc358762";
-+				vddc-supply = <&reg_bridge>;
-+				ports {
-+					#address-cells = <1>;
-+					#size-cells = <0>;
-+
-+					port@0 {
-+						reg = <0>;
-+						bridge_in: endpoint {
-+							remote-endpoint = <&dsi_out>;
-+						};
-+					};
-+
-+					port@1 {
-+						reg = <1>;
-+						bridge_out: endpoint {
-+							remote-endpoint = <&panel_in>;
-+						};
-+					};
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target-path = "/";
-+		__overlay__ {
-+			panel_disp1: panel_disp1@0 {
-+				reg = <0>;
-+				compatible = "raspberrypi,7inch-dsi", "simple-panel";
-+				backlight = <&reg_display>;
-+				power-supply = <&reg_display>;
-+
-+				port {
-+					panel_in: endpoint {
-+						remote-endpoint = <&bridge_out>;
-+					};
-+				};
-+			};
-+
-+			reg_bridge: reg_bridge@0 {
-+				reg = <0>;
-+				compatible = "regulator-fixed";
-+				regulator-name = "bridge_reg";
-+				gpio = <&reg_display 0 0>;
-+				vin-supply = <&reg_display>;
-+				enable-active-high;
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c_csi_dsi>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			reg_display: reg_display@45 {
-+				compatible = "raspberrypi,7inch-touchscreen-panel-regulator";
-+				reg = <0x45>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&i2c0if>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&i2c0mux>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+	fragment@5 {
-+		target = <&ft5406>;
-+		__overlay__ {
-+			vcc-supply = <&reg_display>;
-+			reset-gpio = <&reg_display 1 1>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		disable_touch = <0>, "-10-11-12";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dsi-lt070me05000-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dsi-lt070me05000-overlay.dts
-new file mode 100644
-index 000000000000..d7b8f6713804
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/vc4-kms-dsi-lt070me05000-overlay.dts
-@@ -0,0 +1,69 @@
-+/*
-+ * Device Tree overlay to connect a JDI LT070ME05000 DSI panel to DSI1.
-+ * This uses 4 DSI data lanes, so can only be used with a Compute Module.
-+ *
-+ * Credit to forum user gizmomouse on
-+ * https://www.raspberrypi.org/forums/viewtopic.php?f=98&t=253912 and
-+ * Andrey Vostrukhin of Harlab for the overlay.
-+ *
-+ * Refer to https://github.com/harlab/CM4_LCD_LT070ME05000 for schematics and
-+ * other documentation.
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&dsi1>;
-+		__overlay__{
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			port {
-+				dsi_out_port:endpoint {
-+					remote-endpoint = <&panel_dsi_port>;
-+				};
-+			};
-+
-+			lt070me05000:lt070me05000@0 {
-+				compatible    = "jdi,lt070me05000";
-+				status        = "okay";
-+				reg           = <0>;
-+				reset-gpios   = <&gpio 17 1>;   // LCD RST
-+				enable-gpios  = <&gpio 4 0>;    // LCD Enable
-+				dcdc-en-gpios = <&gpio 5 0>;    // LCD DC-DC Enable
-+				port {
-+					panel_dsi_port: endpoint {
-+						remote-endpoint = <&dsi_out_port>;
-+					};
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			lt070me05000_pins: lt070me05000_pins {
-+				brcm,pins = <4 5 17>;
-+				brcm,function = <1 1 1>; // out
-+				brcm,pull = <0 0 0>; // off
-+			};
-+		};
-+
-+	};
-+
-+	__overrides__ {
-+		reset = <&lt070me05000_pins>,"brcm,pins:8",
-+			<&lt070me05000>,"reset-gpios:4";
-+
-+		enable = <&lt070me05000_pins>,"brcm,pins:0",
-+			<&lt070me05000>,"enable-gpios:4";
-+
-+		dcdc-en = <&lt070me05000_pins>,"brcm,pins:4",
-+			<&lt070me05000>,"dcdc-en-gpios:4";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dsi-lt070me05000-v2-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dsi-lt070me05000-v2-overlay.dts
-new file mode 100644
-index 000000000000..5dcd0f2243e2
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/vc4-kms-dsi-lt070me05000-v2-overlay.dts
-@@ -0,0 +1,64 @@
-+/*
-+ * Device Tree overlay to connect a JDI LT070ME05000 DSI panel to DSI1.
-+ * This uses 4 DSI data lanes, so can only be used with a Compute Module.
-+ *
-+ * The overlay is for V2 of Harlab's interface board that uses a PCA9536 to
-+ * handle the panel's control GPIOs instead of wiring it back to Pi GPIOs.
-+ *
-+ * Credit to Andrey Vostrukhin of Harlab for the overlay.
-+ *
-+ * Refer to https://github.com/harlab/CM4_LCD_LT070ME05000 for schematics and
-+ * other documentation.
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2c_csi_dsi>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			pca: pca@41 {
-+				compatible = "nxp,pca9536";
-+				reg = <0x41>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&dsi1>;
-+		__overlay__{
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			port {
-+				dsi_out_port:endpoint {
-+					remote-endpoint = <&panel_dsi_port>;
-+				};
-+			};
-+
-+			lt070me05000:lt070me05000@0 {
-+				compatible    = "jdi,lt070me05000";
-+				status        = "okay";
-+				reg           = <0>;
-+				reset-gpios   = <&pca 0 1>;
-+				enable-gpios  = <&pca 2 0>;
-+				dcdc-en-gpios = <&pca 1 0>;
-+				port {
-+					panel_dsi_port: endpoint {
-+						remote-endpoint = <&dsi_out_port>;
-+					};
-+				};
-+			};
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/vc4-kms-kippah-7inch-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-kippah-7inch-overlay.dts
-new file mode 100644
-index 000000000000..4c1aa1c70158
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/vc4-kms-kippah-7inch-overlay.dts
-@@ -0,0 +1,26 @@
-+/*
-+ * vc4-kms-kippah-7inch-overlay.dts
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include "vc4-kms-dpi.dtsi"
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&panel>;
-+		__overlay__  {
-+			compatible = "ontat,yx700wv03", "simple-panel";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&dpi>;
-+		__overlay__  {
-+			pinctrl-0 = <&dpi_18bit_gpio0>;
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
-new file mode 100644
-index 000000000000..26a5bd71945d
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
-@@ -0,0 +1,124 @@
-+/*
-+ * vc4-kms-v3d-overlay.dts
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/clock/bcm2835.h>
-+
-+#include "cma-overlay.dts"
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@1 {
-+		target = <&i2c2>;
-+		__overlay__  {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&fb>;
-+		__overlay__  {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&pixelvalve0>;
-+		__overlay__  {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&pixelvalve1>;
-+		__overlay__  {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@5 {
-+		target = <&pixelvalve2>;
-+		__overlay__  {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@6 {
-+		target = <&hvs>;
-+		__overlay__  {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@7 {
-+		target = <&hdmi>;
-+		__overlay__  {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@8 {
-+		target = <&v3d>;
-+		__overlay__  {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@9 {
-+		target = <&vc4>;
-+		__overlay__  {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@10 {
-+		target = <&clocks>;
-+		__overlay__  {
-+			claim-clocks = <
-+				BCM2835_PLLD_DSI0
-+				BCM2835_PLLD_DSI1
-+				BCM2835_PLLH_AUX
-+				BCM2835_PLLH_PIX
-+			>;
-+		};
-+	};
-+
-+	fragment@11 {
-+		target = <&vec>;
-+		__dormant__  {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@12 {
-+		target = <&txp>;
-+		__overlay__  {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@13 {
-+		target = <&hdmi>;
-+		__dormant__  {
-+			dmas;
-+		};
-+	};
-+
-+	fragment@14 {
-+		target = <&chosen>;
-+		__overlay__  {
-+			bootargs = "snd_bcm2835.enable_hdmi=0";
-+		};
-+	};
-+
-+	__overrides__ {
-+		audio   = <0>,"!13";
-+		noaudio = <0>,"=13";
-+		composite = <0>, "=11";
-+		nohdmi = <0>, "-1-7";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts
-new file mode 100644
-index 000000000000..1cf4ec5c8637
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts
-@@ -0,0 +1,200 @@
-+/*
-+ * vc4-kms-v3d-pi4-overlay.dts
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/clock/bcm2835.h>
-+
-+#include "cma-overlay.dts"
-+
-+&frag0 {
-+	size = <((320-4)*1024*1024)>;
-+};
-+
-+/ {
-+	compatible = "brcm,bcm2711";
-+
-+	fragment@1 {
-+		target = <&ddc0>;
-+		__overlay__  {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&ddc1>;
-+		__overlay__  {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&hdmi0>;
-+		__overlay__  {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&hdmi1>;
-+		__overlay__  {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@5 {
-+		target = <&hvs>;
-+		__overlay__  {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@6 {
-+		target = <&pixelvalve0>;
-+		__overlay__  {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@7 {
-+		target = <&pixelvalve1>;
-+		__overlay__  {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@8 {
-+		target = <&pixelvalve2>;
-+		__overlay__  {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@9 {
-+		target = <&pixelvalve3>;
-+		__overlay__  {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@10 {
-+		target = <&pixelvalve4>;
-+		__overlay__  {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@11 {
-+		target = <&v3d>;
-+		__overlay__  {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@12 {
-+		target = <&vc4>;
-+		__overlay__  {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@13 {
-+		target = <&txp>;
-+		__overlay__  {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@14 {
-+		target = <&fb>;
-+		__overlay__  {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@15 {
-+		target = <&firmwarekms>;
-+		__overlay__  {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@16 {
-+		target = <&vec>;
-+		__overlay__  {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@17 {
-+		target = <&hdmi0>;
-+		__dormant__  {
-+			dmas;
-+		};
-+	};
-+
-+	fragment@18 {
-+		target = <&hdmi1>;
-+		__dormant__  {
-+			dmas;
-+		};
-+	};
-+
-+	fragment@19 {
-+		target-path = "/chosen";
-+		__overlay__  {
-+			bootargs = "snd_bcm2835.enable_hdmi=0";
-+		};
-+	};
-+
-+	fragment@20 {
-+		target = <&dvp>;
-+		__overlay__  {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@21 {
-+		target = <&pixelvalve3>;
-+		__dormant__  {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@22 {
-+		target = <&vec>;
-+		__dormant__  {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@23 {
-+		target = <&aon_intr>;
-+		__overlay__  {
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		audio   = <0>,"!17";
-+		audio1   = <0>,"!18";
-+		noaudio = <0>,"=17", <0>,"=18";
-+		composite = <0>, "!1",
-+			    <0>, "!2",
-+			    <0>, "!3",
-+			    <0>, "!4",
-+			    <0>, "!6",
-+			    <0>, "!7",
-+			    <0>, "!8",
-+			    <0>, "!9",
-+			    <0>, "!10",
-+			    <0>, "!16",
-+			    <0>, "=21",
-+			    <0>, "=22";
-+		nohdmi0 =   <0>, "-1-3-8";
-+		nohdmi1 =   <0>, "-2-4-10";
-+		nohdmi =    <0>, "-1-2-3-4-8-10";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/vc4-kms-vga666-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-vga666-overlay.dts
-new file mode 100644
-index 000000000000..6e787099e861
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/vc4-kms-vga666-overlay.dts
-@@ -0,0 +1,100 @@
-+/*
-+ * vc4-kms-vga666-overlay.dts
-+ * Configures a FenLogic or similar VGA666 DPI adapter when using the
-+ * vc4-kms-v3d driver.
-+ * If a suitable I2C level shifter is connected to GPIOs 0&1 and the VGA
-+ * ID1/SDA (pin 12) and ID3/SCL (pin 15) lines, then there is the option to
-+ * enable reading the EDID from the display.
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/pinctrl/bcm2835.h>
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target-path = "/";
-+		__overlay__ {
-+			vga_connector: vga_connector {
-+				compatible = "vga-connector";
-+				label = "vga";
-+
-+				port {
-+					vga_con_in: endpoint {
-+						remote-endpoint = <&vga666_out>;
-+					};
-+				};
-+			};
-+
-+			vga_dac {
-+				compatible = "dumb-vga-dac";
-+
-+				ports {
-+					#address-cells = <1>;
-+					#size-cells = <0>;
-+
-+					port@0 {
-+						reg = <0>;
-+
-+						vga666_in: endpoint {
-+							remote-endpoint = <&dpi_out>;
-+						};
-+					};
-+
-+					port@1 {
-+						reg = <1>;
-+
-+						vga666_out: endpoint {
-+							remote-endpoint = <&vga_con_in>;
-+						};
-+					};
-+				};
-+			};
-+
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&dpi>;
-+		__overlay__  {
-+			status = "okay";
-+
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&dpi_18bit_gpio2>;
-+
-+			port {
-+				dpi_out: endpoint@0 {
-+					remote-endpoint = <&vga666_in>;
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&vga_connector>;
-+		__dormant__  {
-+			ddc-i2c-bus = <&i2c_vc>;
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&i2c0if>;
-+		__dormant__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&i2c0mux>;
-+		__dormant__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		ddc = <0>,"=2", <0>,"=3", <0>,"=4";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/vga666-overlay.dts b/arch/arm/boot/dts/overlays/vga666-overlay.dts
-new file mode 100644
-index 000000000000..a4968d180a5d
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/vga666-overlay.dts
-@@ -0,0 +1,30 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	// There is no VGA driver module, but we need a platform device
-+	// node (that doesn't already use pinctrl) to hang the pinctrl
-+	// reference on - leds will do
-+
-+	fragment@0 {
-+		target = <&leds>;
-+		__overlay__ {
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&vga666_pins>;
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			vga666_pins: vga666_pins {
-+				brcm,pins = <2 3 4 5 6 7 8 9 10 11 12
-+					     13 14 15 16 17 18 19 20 21>;
-+				brcm,function = <6>; /* alt2 */
-+				brcm,pull = <0>; /* no pull */
-+			};
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/vl805-overlay.dts b/arch/arm/boot/dts/overlays/vl805-overlay.dts
-new file mode 100644
-index 000000000000..81adf34b29f2
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/vl805-overlay.dts
-@@ -0,0 +1,18 @@
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/reset/raspberrypi,firmware-reset.h>
-+
-+/ {
-+	compatible = "brcm,bcm2711";
-+
-+	fragment@0 {
-+		target-path = "pcie0/pci@0,0";
-+		__overlay__ {
-+			usb@0,0 {
-+				reg = <0 0 0 0 0>;
-+				resets = <&reset RASPBERRYPI_FIRMWARE_RESET_ID_USB>;
-+			};
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/w1-gpio-overlay.dts b/arch/arm/boot/dts/overlays/w1-gpio-overlay.dts
-new file mode 100644
-index 000000000000..f44e325bc1f2
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/w1-gpio-overlay.dts
-@@ -0,0 +1,40 @@
-+// Definitions for w1-gpio module (without external pullup)
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target-path = "/";
-+		__overlay__ {
-+
-+			w1: onewire@0 {
-+				compatible = "w1-gpio";
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&w1_pins>;
-+				gpios = <&gpio 4 0>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			w1_pins: w1_pins@0 {
-+				brcm,pins = <4>;
-+				brcm,function = <0>; // in (initially)
-+				brcm,pull = <0>; // off
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		gpiopin =       <&w1>,"gpios:4",
-+				<&w1>,"reg:0",
-+				<&w1_pins>,"brcm,pins:0",
-+				<&w1_pins>,"reg:0";
-+		pullup;		// Silently ignore unneeded parameter
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/w1-gpio-pullup-overlay.dts b/arch/arm/boot/dts/overlays/w1-gpio-pullup-overlay.dts
-new file mode 100644
-index 000000000000..953c6a1aeab9
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/w1-gpio-pullup-overlay.dts
-@@ -0,0 +1,42 @@
-+// Definitions for w1-gpio module (with external pullup)
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target-path = "/";
-+		__overlay__ {
-+
-+			w1: onewire@0 {
-+				compatible = "w1-gpio";
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&w1_pins>;
-+				gpios = <&gpio 4 0>, <&gpio 5 1>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			w1_pins: w1_pins@0 {
-+				brcm,pins = <4 5>;
-+				brcm,function = <0 1>; // in out
-+				brcm,pull = <0 0>; // off off
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		gpiopin =       <&w1>,"gpios:4",
-+				<&w1>,"reg:0",
-+				<&w1_pins>,"brcm,pins:0",
-+				<&w1_pins>,"reg:0";
-+		extpullup =     <&w1>,"gpios:16",
-+				<&w1_pins>,"brcm,pins:4";
-+		pullup;		// Silently ignore unneeded parameter
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/w5500-overlay.dts b/arch/arm/boot/dts/overlays/w5500-overlay.dts
-new file mode 100644
-index 000000000000..4d3e66296753
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/w5500-overlay.dts
-@@ -0,0 +1,63 @@
-+// Overlay for the Wiznet w5500 Ethernet Controller
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spidev1>;
-+		__dormant__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			status = "okay";
-+
-+			eth1: w5500@0{
-+				compatible = "wiznet,w5500";
-+				reg = <0>; /* CE0 */
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&eth1_pins>;
-+				interrupt-parent = <&gpio>;
-+				interrupts = <25 0x8>;
-+				spi-max-frequency = <30000000>;
-+//				local-mac-address = [aa bb cc dd ee ff];
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			eth1_pins: eth1_pins {
-+				brcm,pins = <25>;
-+				brcm,function = <0>; /* in */
-+				brcm,pull = <0>; /* none */
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		int_pin = <&eth1>, "interrupts:0",
-+		          <&eth1_pins>, "brcm,pins:0";
-+		speed   = <&eth1>, "spi-max-frequency:0";
-+		cs      = <&eth1>, "reg:0",
-+			  <0>, "!0=1";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/watterott-display-overlay.dts b/arch/arm/boot/dts/overlays/watterott-display-overlay.dts
-new file mode 100644
-index 000000000000..c0e20afa3bf0
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/watterott-display-overlay.dts
-@@ -0,0 +1,150 @@
-+/*
-+ * Device Tree overlay for rpi-display by Watterott
-+ *
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&spidev1>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			rpi_display_pins: rpi_display_pins {
-+				brcm,pins = <18 23 24 25>;
-+				brcm,function = <1 1 1 0>; /* out out out in */
-+				brcm,pull = <0 0 0 2>; /* - - - up */
-+			};
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			rpidisplay: rpi-display@0{
-+				compatible = "ilitek,ili9341";
-+				reg = <0>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&rpi_display_pins>;
-+
-+				spi-max-frequency = <32000000>;
-+				rotate = <270>;
-+				bgr;
-+				fps = <30>;
-+				buswidth = <8>;
-+				reset-gpios = <&gpio 23 1>;
-+				dc-gpios = <&gpio 24 0>;
-+				led-gpios = <&gpio 18 0>;
-+				debug = <0>;
-+			};
-+
-+			rpidisplay_ts: rpi-display-ts@1 {
-+				compatible = "ti,ads7846";
-+				reg = <1>;
-+
-+				spi-max-frequency = <2000000>;
-+				interrupts = <25 2>; /* high-to-low edge triggered */
-+				interrupt-parent = <&gpio>;
-+				pendown-gpio = <&gpio 25 1>;
-+				ti,x-plate-ohms = /bits/ 16 <60>;
-+				ti,pressure-max = /bits/ 16 <255>;
-+			};
-+		};
-+	};
-+
-+	fragment@10 {
-+		target = <&rpidisplay>;
-+		__dormant__  {
-+			backlight = <&backlight_gpio>;
-+		};
-+	};
-+
-+	fragment@11 {
-+		target-path = "/";
-+		__dormant__  {
-+			backlight_gpio: backlight_gpio {
-+				compatible = "gpio-backlight";
-+				gpios = <&gpio 18 0>; /* GPIO_ACTIVE_HIGH */
-+			};
-+		};
-+	};
-+
-+	fragment@20 {
-+		target = <&rpidisplay>;
-+		__dormant__  {
-+			backlight = <&backlight_pwm>;
-+		};
-+	};
-+
-+	fragment@21 {
-+		target-path = "/";
-+		__dormant__  {
-+			backlight_pwm: backlight_pwm {
-+				compatible = "pwm-backlight";
-+				brightness-levels = <0 6 8 12 16 24 32 40 48 64 96 128 160 192 224 255>;
-+				default-brightness-level = <16>;
-+				pwms = <&pwm 0 200000>;
-+			};
-+		};
-+	};
-+
-+	fragment@22 {
-+		target = <&pwm>;
-+		__dormant__ {
-+			assigned-clock-rates = <1000000>;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@23 {
-+		target = <&chosen>;
-+		__dormant__  {
-+			bootargs = "snd_bcm2835.enable_headphones=0";
-+		};
-+	};
-+
-+	__overrides__ {
-+		speed =     <&rpidisplay>,"spi-max-frequency:0";
-+		rotate =    <&rpidisplay>,"rotate:0", /* fbtft */
-+			    <&rpidisplay>,"rotation:0"; /* drm */
-+		fps =       <&rpidisplay>,"fps:0";
-+		debug =     <&rpidisplay>,"debug:0";
-+		xohms =     <&rpidisplay_ts>,"ti,x-plate-ohms;0";
-+		swapxy =    <&rpidisplay_ts>,"ti,swap-xy?";
-+		backlight = <&rpidisplay>,"led-gpios:4",
-+		            <&rpi_display_pins>,"brcm,pins:0";
-+		drm =       <&rpidisplay>, "compatible=multi-inno,mi0283qt",
-+			    <&rpidisplay>, "spi-max-frequency:0=70000000",
-+			    <&rpidisplay>, "reset-gpios:8=0", /* GPIO_ACTIVE_HIGH */
-+			    <0>, "+10+11";
-+		backlight-pwm = <0>, "-10-11+20+21+22+23",
-+				<&rpi_display_pins>, "brcm,function:0=2"; /* Alt5 */
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/waveshare-can-fd-hat-mode-a-overlay.dts b/arch/arm/boot/dts/overlays/waveshare-can-fd-hat-mode-a-overlay.dts
-new file mode 100644
-index 000000000000..59388cc3b0b9
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/waveshare-can-fd-hat-mode-a-overlay.dts
-@@ -0,0 +1,140 @@
-+// redo: ovmerge -c spi1-1cs-overlay.dts,cs0_pin=26,cs0_spidev=false mcp251xfd-overlay.dts,spi0-0,interrupt=25 mcp251xfd-overlay.dts,spi1-0,interrupt=16
-+
-+// Device tree overlay for https://www.waveshare.com/2-ch-can-fd-hat.htm
-+// in "Mode A" (default) configuration
-+// for details see https://www.waveshare.com/wiki/2-CH_CAN_FD_HAT
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/interrupt-controller/irq.h>
-+#include <dt-bindings/pinctrl/bcm2835.h>
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+	fragment@0 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			spi1_pins: spi1_pins {
-+				brcm,pins = <19 20 21>;
-+				brcm,function = <3>;
-+			};
-+			spi1_cs_pins: spi1_cs_pins {
-+				brcm,pins = <26>;
-+				brcm,function = <1>;
-+			};
-+		};
-+	};
-+	fragment@1 {
-+		target = <&spi1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&spi1_pins &spi1_cs_pins>;
-+			cs-gpios = <&gpio 26 1>;
-+			status = "okay";
-+			spidev@0 {
-+				compatible = "spidev";
-+				reg = <0>;
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "disabled";
-+			};
-+		};
-+	};
-+	fragment@2 {
-+		target = <&aux>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+	fragment@3 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+	fragment@4 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			mcp251xfd_pins: mcp251xfd_spi0_0_pins {
-+				brcm,pins = <25>;
-+				brcm,function = <BCM2835_FSEL_GPIO_IN>;
-+			};
-+		};
-+	};
-+	fragment@5 {
-+		target-path = "/clocks";
-+		__overlay__ {
-+			clk_mcp251xfd_osc: mcp251xfd-spi0-0-osc {
-+				#clock-cells = <0>;
-+				compatible = "fixed-clock";
-+				clock-frequency = <40000000>;
-+			};
-+		};
-+	};
-+	fragment@6 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			mcp251xfd@0 {
-+				compatible = "microchip,mcp251xfd";
-+				reg = <0>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&mcp251xfd_pins>;
-+				spi-max-frequency = <20000000>;
-+				interrupt-parent = <&gpio>;
-+				interrupts = <25 IRQ_TYPE_LEVEL_LOW>;
-+				clocks = <&clk_mcp251xfd_osc>;
-+			};
-+		};
-+	};
-+	fragment@7 {
-+		target-path = "spi1/spidev@0";
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+	fragment@8 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			mcp251xfd_pins_1: mcp251xfd_spi1_0_pins {
-+				brcm,pins = <16>;
-+				brcm,function = <BCM2835_FSEL_GPIO_IN>;
-+			};
-+		};
-+	};
-+	fragment@9 {
-+		target-path = "/clocks";
-+		__overlay__ {
-+			clk_mcp251xfd_osc_1: mcp251xfd-spi1-0-osc {
-+				#clock-cells = <0>;
-+				compatible = "fixed-clock";
-+				clock-frequency = <40000000>;
-+			};
-+		};
-+	};
-+	fragment@10 {
-+		target = <&spi1>;
-+		__overlay__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			mcp251xfd@0 {
-+				compatible = "microchip,mcp251xfd";
-+				reg = <0>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&mcp251xfd_pins_1>;
-+				spi-max-frequency = <20000000>;
-+				interrupt-parent = <&gpio>;
-+				interrupts = <16 IRQ_TYPE_LEVEL_LOW>;
-+				clocks = <&clk_mcp251xfd_osc_1>;
-+			};
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/waveshare-can-fd-hat-mode-b-overlay.dts b/arch/arm/boot/dts/overlays/waveshare-can-fd-hat-mode-b-overlay.dts
-new file mode 100644
-index 000000000000..b2504922c8de
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/waveshare-can-fd-hat-mode-b-overlay.dts
-@@ -0,0 +1,103 @@
-+// redo: ovmerge -c mcp251xfd-overlay.dts,spi0-0,interrupt=25 mcp251xfd-overlay.dts,spi0-1,interrupt=16
-+
-+// Device tree overlay for https://www.waveshare.com/2-ch-can-fd-hat.htm
-+// in "Mode B" (requried hardware modification) configuration
-+// for details see https://www.waveshare.com/wiki/2-CH_CAN_FD_HAT
-+
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/interrupt-controller/irq.h>
-+#include <dt-bindings/pinctrl/bcm2835.h>
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+	fragment@0 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+	fragment@1 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			mcp251xfd_pins: mcp251xfd_spi0_0_pins {
-+				brcm,pins = <25>;
-+				brcm,function = <BCM2835_FSEL_GPIO_IN>;
-+			};
-+		};
-+	};
-+	fragment@2 {
-+		target-path = "/clocks";
-+		__overlay__ {
-+			clk_mcp251xfd_osc: mcp251xfd-spi0-0-osc {
-+				#clock-cells = <0>;
-+				compatible = "fixed-clock";
-+				clock-frequency = <40000000>;
-+			};
-+		};
-+	};
-+	fragment@3 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			mcp251xfd@0 {
-+				compatible = "microchip,mcp251xfd";
-+				reg = <0>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&mcp251xfd_pins>;
-+				spi-max-frequency = <20000000>;
-+				interrupt-parent = <&gpio>;
-+				interrupts = <25 IRQ_TYPE_LEVEL_LOW>;
-+				clocks = <&clk_mcp251xfd_osc>;
-+			};
-+		};
-+	};
-+	fragment@4 {
-+		target = <&spidev1>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+	fragment@5 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			mcp251xfd_pins_1: mcp251xfd_spi0_1_pins {
-+				brcm,pins = <16>;
-+				brcm,function = <BCM2835_FSEL_GPIO_IN>;
-+			};
-+		};
-+	};
-+	fragment@6 {
-+		target-path = "/clocks";
-+		__overlay__ {
-+			clk_mcp251xfd_osc_1: mcp251xfd-spi0-1-osc {
-+				#clock-cells = <0>;
-+				compatible = "fixed-clock";
-+				clock-frequency = <40000000>;
-+			};
-+		};
-+	};
-+	fragment@7 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			mcp251xfd@1 {
-+				compatible = "microchip,mcp251xfd";
-+				reg = <1>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&mcp251xfd_pins_1>;
-+				spi-max-frequency = <20000000>;
-+				interrupt-parent = <&gpio>;
-+				interrupts = <16 IRQ_TYPE_LEVEL_LOW>;
-+				clocks = <&clk_mcp251xfd_osc_1>;
-+			};
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/overlays/wittypi-overlay.dts b/arch/arm/boot/dts/overlays/wittypi-overlay.dts
-new file mode 100644
-index 000000000000..71ce806186de
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/wittypi-overlay.dts
-@@ -0,0 +1,44 @@
-+/*
-+ * Device Tree overlay for Witty Pi extension board by UUGear
-+ *
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&leds>;
-+		__overlay__ {
-+			compatible = "gpio-leds";
-+			wittypi_led: wittypi_led {
-+				label = "wittypi_led";
-+				linux,default-trigger = "default-on";
-+				gpios = <&gpio 17 0>;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			rtc: ds1337@68 {
-+				compatible = "dallas,ds1337";
-+				reg = <0x68>;
-+				wakeup-source;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		led_gpio =	<&wittypi_led>,"gpios:4";
-+		led_trigger =	<&wittypi_led>,"linux,default-trigger";
-+	};
-+
-+};
-diff --git a/arch/arm/boot/dts/overlays/wm8960-soundcard-overlay.dts b/arch/arm/boot/dts/overlays/wm8960-soundcard-overlay.dts
-new file mode 100644
-index 000000000000..289fa4dacdf1
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/wm8960-soundcard-overlay.dts
-@@ -0,0 +1,82 @@
-+// Definitions for Waveshare WM8960 https://github.com/waveshare/WM8960-Audio-HAT
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target-path="/";
-+		__overlay__ {
-+			wm8960_mclk: wm8960_mclk {
-+				compatible = "fixed-clock";
-+				#clock-cells = <0>;
-+				clock-frequency = <12288000>;
-+			};
-+		};
-+	};
-+	fragment@2 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			wm8960: wm8960 {
-+				compatible = "wlf,wm8960";
-+				reg = <0x1a>;
-+				#sound-dai-cells = <0>;
-+				AVDD-supply = <&vdd_5v0_reg>;
-+				DVDD-supply = <&vdd_3v3_reg>;
-+			};
-+		};
-+	};
-+
-+
-+	fragment@3 {
-+		target = <&sound>;
-+		slave_overlay: __overlay__ {
-+			compatible = "simple-audio-card";
-+			simple-audio-card,format = "i2s";
-+			simple-audio-card,name = "wm8960-soundcard"; 
-+			status = "okay";
-+
-+			simple-audio-card,widgets =
-+				"Microphone", "Mic Jack",
-+				"Line", "Line In",
-+				"Line", "Line Out",
-+				"Speaker", "Speaker",
-+				"Headphone", "Headphone Jack";
-+			simple-audio-card,routing =
-+				"Headphone Jack", "HP_L",
-+				"Headphone Jack", "HP_R",
-+				"Speaker", "SPK_LP",
-+				"Speaker", "SPK_LN",
-+				"LINPUT1", "Mic Jack",
-+				"LINPUT3", "Mic Jack",
-+				"RINPUT1", "Mic Jack",
-+				"RINPUT2", "Mic Jack";
-+
-+			simple-audio-card,cpu {
-+				sound-dai = <&i2s>;
-+			};
-+			dailink0_slave: simple-audio-card,codec {
-+				sound-dai = <&wm8960>;
-+				clocks = <&wm8960_mclk>;
-+				clock-names = "mclk";
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		alsaname = <&slave_overlay>,"simple-audio-card,name";
-+		compatible = <&wm8960>,"compatible";
-+	};
-+};
-diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile
-index 7b107fa7414b..12e6e2876ea6 100644
---- a/arch/arm64/boot/dts/Makefile
-+++ b/arch/arm64/boot/dts/Makefile
-@@ -32,3 +32,5 @@ subdir-y += tesla
- subdir-y += ti
- subdir-y += toshiba
- subdir-y += xilinx
-+
-+subdir-y += overlays
-diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile
-index 05d8c5ecf3b0..9b678d144085 100644
---- a/arch/arm64/boot/dts/broadcom/Makefile
-+++ b/arch/arm64/boot/dts/broadcom/Makefile
-@@ -8,6 +8,20 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-400.dtb \
- 			      bcm2837-rpi-cm3-io3.dtb \
- 			      bcm2837-rpi-zero-2-w.dtb
- 
-+dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-zero-2.dtb
-+dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-zero-2-w.dtb
-+dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-2-b.dtb
-+dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-3-b.dtb
-+dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-3-b-plus.dtb
-+dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-cm3.dtb
-+dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-cm4.dtb
-+dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-cm4s.dtb
-+
- subdir-y	+= bcmbca
- subdir-y	+= northstar2
- subdir-y	+= stingray
-+
-+# Enable fixups to support overlays on BCM2835 platforms
-+ifeq ($(CONFIG_ARCH_BCM2835),y)
-+	DTC_FLAGS += -@
-+endif
-diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts
-new file mode 100644
-index 000000000000..36ecea71f0ef
---- /dev/null
-+++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts
-@@ -0,0 +1 @@
-+#include "../../../../arm/boot/dts/bcm2710-rpi-2-b.dts"
-diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts
-new file mode 100644
-index 000000000000..22fc6a82f2a9
---- /dev/null
-+++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts
-@@ -0,0 +1 @@
-+#include "../../../../arm/boot/dts/bcm2710-rpi-3-b-plus.dts"
-diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts
-new file mode 100644
-index 000000000000..4cacc5b72ae3
---- /dev/null
-+++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts
-@@ -0,0 +1 @@
-+#include "../../../../arm/boot/dts/bcm2710-rpi-3-b.dts"
-diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm3.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm3.dts
-new file mode 100644
-index 000000000000..e1e13784cff6
---- /dev/null
-+++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm3.dts
-@@ -0,0 +1 @@
-+#include "../../../../arm/boot/dts/bcm2710-rpi-cm3.dts"
-diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-zero-2-w.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-zero-2-w.dts
-new file mode 100644
-index 000000000000..4d34e0afd4cd
---- /dev/null
-+++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-zero-2-w.dts
-@@ -0,0 +1 @@
-+#include "../../../../arm/boot/dts/bcm2710-rpi-zero-2-w.dts"
-diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-zero-2.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-zero-2.dts
-new file mode 100644
-index 000000000000..4d34e0afd4cd
---- /dev/null
-+++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-zero-2.dts
-@@ -0,0 +1 @@
-+#include "../../../../arm/boot/dts/bcm2710-rpi-zero-2-w.dts"
-diff --git a/arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts
-index d24c53682e44..bf69a4b0b172 100644
---- a/arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts
-+++ b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts
-@@ -1,2 +1 @@
--// SPDX-License-Identifier: GPL-2.0
--#include "arm/bcm2711-rpi-4-b.dts"
-+#include "../../../../arm/boot/dts/bcm2711-rpi-4-b.dts"
-diff --git a/arch/arm64/boot/dts/broadcom/bcm2711-rpi-400.dts b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-400.dts
-index b9000f58beb5..90c2b5a195d4 100644
---- a/arch/arm64/boot/dts/broadcom/bcm2711-rpi-400.dts
-+++ b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-400.dts
-@@ -1,2 +1 @@
--// SPDX-License-Identifier: GPL-2.0
--#include "arm/bcm2711-rpi-400.dts"
-+#include "../../../../arm/boot/dts/bcm2711-rpi-400.dts"
-diff --git a/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4.dts b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4.dts
-new file mode 100644
-index 000000000000..8064a58155f1
---- /dev/null
-+++ b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4.dts
-@@ -0,0 +1 @@
-+#include "../../../../arm/boot/dts/bcm2711-rpi-cm4.dts"
-diff --git a/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4s.dts b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4s.dts
-new file mode 100644
-index 000000000000..28e0980a374b
---- /dev/null
-+++ b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4s.dts
-@@ -0,0 +1 @@
-+#include "../../../../arm/boot/dts/bcm2711-rpi-cm4s.dts"
-diff --git a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi
-new file mode 120000
-index 000000000000..e5c400284467
---- /dev/null
-+++ b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi
-@@ -0,0 +1 @@
-+../../../../arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi
-\ No newline at end of file
-diff --git a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-lan7515.dtsi b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-lan7515.dtsi
-new file mode 120000
-index 000000000000..fc4c05bbe7fd
---- /dev/null
-+++ b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-lan7515.dtsi
-@@ -0,0 +1 @@
-+../../../../arm/boot/dts/bcm283x-rpi-lan7515.dtsi
-\ No newline at end of file
-diff --git a/arch/arm64/boot/dts/overlays b/arch/arm64/boot/dts/overlays
-new file mode 120000
-index 000000000000..ded08646b6f6
---- /dev/null
-+++ b/arch/arm64/boot/dts/overlays
-@@ -0,0 +1 @@
-+../../../arm/boot/dts/overlays
-\ No newline at end of file
-diff --git a/include/dt-bindings/gpio/gpio-fsm.h b/include/dt-bindings/gpio/gpio-fsm.h
-new file mode 100644
-index 000000000000..eb40cfdc71df
---- /dev/null
-+++ b/include/dt-bindings/gpio/gpio-fsm.h
-@@ -0,0 +1,21 @@
-+/* SPDX-License-Identifier: GPL-2.0+ */
-+/*
-+ * This header provides constants for binding rpi,gpio-fsm.
-+ */
-+
-+#ifndef _DT_BINDINGS_GPIO_FSM_H
-+#define _DT_BINDINGS_GPIO_FSM_H
-+
-+#define GF_IN       0
-+#define GF_OUT      1
-+#define GF_SOFT     2
-+#define GF_DELAY    3
-+#define GF_SHUTDOWN 4
-+
-+#define GF_IO(t, v) (((v) << 16) | ((t) & 0xffff))
-+
-+#define GF_IP(x)    GF_IO(GF_IN, (x))
-+#define GF_OP(x)    GF_IO(GF_OUT, (x))
-+#define GF_SW(x)    GF_IO(GF_SOFT, (x))
-+
-+#endif
-diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
-index 190d781e84f4..84c46c081218 100644
---- a/scripts/Makefile.dtbinst
-+++ b/scripts/Makefile.dtbinst
-@@ -18,9 +18,10 @@ include $(srctree)/scripts/Kbuild.include
- include $(src)/Makefile
- 
- dtbs    := $(addprefix $(dst)/, $(dtb-y) $(if $(CONFIG_OF_ALL_DTBS),$(dtb-)))
-+dtbos   := $(addprefix $(dst)/, $(dtbo-y) $(if $(CONFIG_OF_ALL_DTBS),$(dtb-)))
- subdirs := $(addprefix $(obj)/, $(subdir-y) $(subdir-m))
- 
--__dtbs_install: $(dtbs) $(subdirs)
-+__dtbs_install: $(dtbs) $(dtbos) $(subdirs)
- 	@:
- 
- quiet_cmd_dtb_install = INSTALL $@
-diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
-index 3aa384cec76b..ed87353646bf 100644
---- a/scripts/Makefile.lib
-+++ b/scripts/Makefile.lib
-@@ -339,6 +339,7 @@ DTC_FLAGS += -Wno-interrupt_provider
- # Disable noisy checks by default
- ifeq ($(findstring 1,$(KBUILD_EXTRA_WARN)),)
- DTC_FLAGS += -Wno-unit_address_vs_reg \
-+	-Wno-gpios_property \
- 	-Wno-avoid_unnecessary_addr_size \
- 	-Wno-alias_paths \
- 	-Wno-graph_child_address \
-@@ -408,6 +409,18 @@ $(obj)/%.dtb: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE
- $(obj)/%.dtbo: $(src)/%.dts $(DTC) FORCE
- 	$(call if_changed_dep,dtc)
- 
-+quiet_cmd_dtco = DTCO    $@
-+cmd_dtco = mkdir -p $(dir ${dtc-tmp}) ; \
-+	$(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
-+	$(DTC) -@ -H epapr -O dtb -o $@ -b 0 \
-+		-i $(dir $<) $(DTC_FLAGS) \
-+		-Wno-interrupts_property \
-+		-d $(depfile).dtc.tmp $(dtc-tmp) ; \
-+	cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile)
-+
-+$(obj)/%.dtbo: $(src)/%-overlay.dts FORCE
-+	$(call if_changed_dep,dtco)
-+
- dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
- 
- # Bzip2
--- 
-2.30.2
-
diff --git a/target/linux/bcm27xx/patches-6.1/950-0062-clk-raspberrypi-Add-ISP-to-exported-clocks.patch b/target/linux/bcm27xx/patches-6.1/950-0062-clk-raspberrypi-Add-ISP-to-exported-clocks.patch
deleted file mode 100644
index 462c222015..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0062-clk-raspberrypi-Add-ISP-to-exported-clocks.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From d4ebd5479019e939b14452f104f6cead150a59e7 Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Tue, 12 Apr 2022 20:07:20 +0100
-Subject: [PATCH] clk-raspberrypi: Add ISP to exported clocks
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/clk/bcm/clk-raspberrypi.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/clk/bcm/clk-raspberrypi.c
-+++ b/drivers/clk/bcm/clk-raspberrypi.c
-@@ -143,6 +143,9 @@ raspberrypi_clk_variants[RPI_FIRMWARE_NU
- 	[RPI_FIRMWARE_HEVC_CLK_ID] = {
- 		.export = true,
- 	},
-+	[RPI_FIRMWARE_ISP_CLK_ID] = {
-+		.export = true,
-+	},
- 	[RPI_FIRMWARE_PIXEL_BVB_CLK_ID] = {
- 		.export = true,
- 	},
diff --git a/target/linux/bcm27xx/patches-6.1/950-0063-Register-the-clocks-early-during-the-boot-process-so.patch b/target/linux/bcm27xx/patches-6.1/950-0063-Register-the-clocks-early-during-the-boot-process-so.patch
deleted file mode 100644
index 6d7c3a9db7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0063-Register-the-clocks-early-during-the-boot-process-so.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 1cfa0076e0673ed3c40bcd641c775394113107c1 Mon Sep 17 00:00:00 2001
-From: Martin Sperl <kernel@martin.sperl.org>
-Date: Fri, 2 Sep 2016 16:45:27 +0100
-Subject: [PATCH] Register the clocks early during the boot process, so
- that special/critical clocks can get enabled early on in the boot process
- avoiding the risk of disabling a clock, pll_divider or pll when a claiming
- driver fails to install propperly - maybe it needs to defer.
-
-Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
----
- drivers/clk/bcm/clk-bcm2835.c | 15 +++++++++++++--
- 1 file changed, 13 insertions(+), 2 deletions(-)
-
---- a/drivers/clk/bcm/clk-bcm2835.c
-+++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -2319,8 +2319,15 @@ static int bcm2835_clk_probe(struct plat
- 	if (ret)
- 		return ret;
- 
--	return of_clk_add_hw_provider(dev->of_node, of_clk_hw_onecell_get,
-+	ret = of_clk_add_hw_provider(dev->of_node, of_clk_hw_onecell_get,
- 				      &cprman->onecell);
-+	if (ret)
-+		return ret;
-+
-+	/* note that we have registered all the clocks */
-+	dev_dbg(dev, "registered %d clocks\n", asize);
-+
-+	return 0;
- }
- 
- static const struct cprman_plat_data cprman_bcm2835_plat_data = {
-@@ -2346,7 +2353,11 @@ static struct platform_driver bcm2835_cl
- 	.probe          = bcm2835_clk_probe,
- };
- 
--builtin_platform_driver(bcm2835_clk_driver);
-+static int __init __bcm2835_clk_driver_init(void)
-+{
-+	return platform_driver_register(&bcm2835_clk_driver);
-+}
-+core_initcall(__bcm2835_clk_driver_init);
- 
- MODULE_AUTHOR("Eric Anholt <eric@anholt.net>");
- MODULE_DESCRIPTION("BCM2835 clock driver");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0064-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch b/target/linux/bcm27xx/patches-6.1/950-0064-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch
deleted file mode 100644
index a79b6f012d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0064-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bb935818eb9d7a8ba76f184f9355c9e71c4f0f7f Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Mon, 13 Feb 2017 17:20:08 +0000
-Subject: [PATCH] clk-bcm2835: Mark used PLLs and dividers CRITICAL
-
-The VPU configures and relies on several PLLs and dividers. Mark all
-enabled dividers and their PLLs as CRITICAL to prevent the kernel from
-switching them off.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- drivers/clk/bcm/clk-bcm2835.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/drivers/clk/bcm/clk-bcm2835.c
-+++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -1407,6 +1407,11 @@ bcm2835_register_pll_divider(struct bcm2
- 	divider->div.hw.init = &init;
- 	divider->div.table = NULL;
- 
-+	if (!(cprman_read(cprman, divider_data->cm_reg) & divider_data->hold_mask)) {
-+		init.flags |= CLK_IS_CRITICAL;
-+		divider->div.flags |= CLK_IS_CRITICAL;
-+	}
-+
- 	divider->cprman = cprman;
- 	divider->data = divider_data;
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0065-clk-bcm2835-Add-claim-clocks-property.patch b/target/linux/bcm27xx/patches-6.1/950-0065-clk-bcm2835-Add-claim-clocks-property.patch
deleted file mode 100644
index 7889d29b6f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0065-clk-bcm2835-Add-claim-clocks-property.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From d3fa68cc641f6a64a15f73203f1bf48f11de91a0 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Mon, 13 Feb 2017 17:20:08 +0000
-Subject: [PATCH] clk-bcm2835: Add claim-clocks property
-
-The claim-clocks property can be used to prevent PLLs and dividers
-from being marked as critical. It contains a vector of clock IDs,
-as defined by dt-bindings/clock/bcm2835.h.
-
-Use this mechanism to claim PLLD_DSI0, PLLD_DSI1, PLLH_AUX and
-PLLH_PIX for the vc4_kms_v3d driver.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- drivers/clk/bcm/clk-bcm2835.c | 43 +++++++++++++++++++++++++++++++++--
- 1 file changed, 41 insertions(+), 2 deletions(-)
-
---- a/drivers/clk/bcm/clk-bcm2835.c
-+++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -1335,6 +1335,8 @@ static const struct clk_ops bcm2835_vpu_
- 	.debug_init = bcm2835_clock_debug_init,
- };
- 
-+static bool bcm2835_clk_is_claimed(const char *name);
-+
- static struct clk_hw *bcm2835_register_pll(struct bcm2835_cprman *cprman,
- 					   const void *data)
- {
-@@ -1352,6 +1354,9 @@ static struct clk_hw *bcm2835_register_p
- 	init.ops = &bcm2835_pll_clk_ops;
- 	init.flags = pll_data->flags | CLK_IGNORE_UNUSED;
- 
-+	if (!bcm2835_clk_is_claimed(pll_data->name))
-+		init.flags |= CLK_IS_CRITICAL;
-+
- 	pll = kzalloc(sizeof(*pll), GFP_KERNEL);
- 	if (!pll)
- 		return NULL;
-@@ -1408,8 +1413,10 @@ bcm2835_register_pll_divider(struct bcm2
- 	divider->div.table = NULL;
- 
- 	if (!(cprman_read(cprman, divider_data->cm_reg) & divider_data->hold_mask)) {
--		init.flags |= CLK_IS_CRITICAL;
--		divider->div.flags |= CLK_IS_CRITICAL;
-+		if (!bcm2835_clk_is_claimed(divider_data->source_pll))
-+			init.flags |= CLK_IS_CRITICAL;
-+		if (!bcm2835_clk_is_claimed(divider_data->name))
-+			divider->div.flags |= CLK_IS_CRITICAL;
- 	}
- 
- 	divider->cprman = cprman;
-@@ -1466,6 +1473,15 @@ static struct clk_hw *bcm2835_register_c
- 	init.flags = clock_data->flags | CLK_IGNORE_UNUSED;
- 
- 	/*
-+	 * Some GPIO clocks for ethernet/wifi PLLs are marked as
-+	 * critical (since some platforms use them), but if the
-+	 * firmware didn't have them turned on then they clearly
-+	 * aren't actually critical.
-+	 */
-+	if ((cprman_read(cprman, clock_data->ctl_reg) & CM_ENABLE) == 0)
-+		init.flags &= ~CLK_IS_CRITICAL;
-+
-+	/*
- 	 * Pass the CLK_SET_RATE_PARENT flag if we are allowed to propagate
- 	 * rate changes on at least of the parents.
- 	 */
-@@ -2245,6 +2261,8 @@ static const struct bcm2835_clk_desc clk
- 		.ctl_reg = CM_PERIICTL),
- };
- 
-+static bool bcm2835_clk_claimed[ARRAY_SIZE(clk_desc_array)];
-+
- /*
-  * Permanently take a reference on the parent of the SDRAM clock.
-  *
-@@ -2264,6 +2282,19 @@ static int bcm2835_mark_sdc_parent_criti
- 	return clk_prepare_enable(parent);
- }
- 
-+static bool bcm2835_clk_is_claimed(const char *name)
-+{
-+	int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(clk_desc_array); i++) {
-+		const char *clk_name = *(const char **)(clk_desc_array[i].data);
-+		if (!strcmp(name, clk_name))
-+		    return bcm2835_clk_claimed[i];
-+	}
-+
-+	return false;
-+}
-+
- static int bcm2835_clk_probe(struct platform_device *pdev)
- {
- 	struct device *dev = &pdev->dev;
-@@ -2273,6 +2304,7 @@ static int bcm2835_clk_probe(struct plat
- 	const size_t asize = ARRAY_SIZE(clk_desc_array);
- 	const struct cprman_plat_data *pdata;
- 	size_t i;
-+	u32 clk_id;
- 	int ret;
- 
- 	pdata = of_device_get_match_data(&pdev->dev);
-@@ -2291,6 +2323,13 @@ static int bcm2835_clk_probe(struct plat
- 	if (IS_ERR(cprman->regs))
- 		return PTR_ERR(cprman->regs);
- 
-+	memset(bcm2835_clk_claimed, 0, sizeof(bcm2835_clk_claimed));
-+	for (i = 0;
-+	     !of_property_read_u32_index(pdev->dev.of_node, "claim-clocks",
-+					 i, &clk_id);
-+	     i++)
-+		bcm2835_clk_claimed[clk_id]= true;
-+
- 	memcpy(cprman->real_parent_names, cprman_parent_names,
- 	       sizeof(cprman_parent_names));
- 	of_clk_parent_fill(dev->of_node, cprman->real_parent_names,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0066-clk-bcm2835-Read-max-core-clock-from-firmware.patch b/target/linux/bcm27xx/patches-6.1/950-0066-clk-bcm2835-Read-max-core-clock-from-firmware.patch
deleted file mode 100644
index 58842651a4..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0066-clk-bcm2835-Read-max-core-clock-from-firmware.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From a57b5bb7e16f524f39ce6a68f9d0dc9b64b075ed Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Mon, 6 Mar 2017 09:06:18 +0000
-Subject: [PATCH] clk-bcm2835: Read max core clock from firmware
-
-The VPU is responsible for managing the core clock, usually under
-direction from the bcm2835-cpufreq driver but not via the clk-bcm2835
-driver. Since the core frequency can change without warning, it is
-safer to report the maximum clock rate to users of the core clock -
-I2C, SPI and the mini UART - to err on the safe side when calculating
-clock divisors.
-
-If the DT node for the clock driver includes a reference to the
-firmware node, use the firmware API to query the maximum core clock
-instead of reading the divider registers.
-
-Prior to this patch, a "100KHz" I2C bus was sometimes clocked at about
-160KHz. In particular, switching to the 4.9 kernel was likely to break
-SenseHAT usage on a Pi3.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- drivers/clk/bcm/clk-bcm2835.c | 39 ++++++++++++++++++++++++++++++++++-
- 1 file changed, 38 insertions(+), 1 deletion(-)
-
---- a/drivers/clk/bcm/clk-bcm2835.c
-+++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -36,6 +36,7 @@
- #include <linux/platform_device.h>
- #include <linux/slab.h>
- #include <dt-bindings/clock/bcm2835.h>
-+#include <soc/bcm2835/raspberrypi-firmware.h>
- 
- #define CM_PASSWORD		0x5a000000
- 
-@@ -296,6 +297,8 @@
- #define SOC_BCM2711		BIT(1)
- #define SOC_ALL			(SOC_BCM2835 | SOC_BCM2711)
- 
-+#define VCMSG_ID_CORE_CLOCK     4
-+
- /*
-  * Names of clocks used within the driver that need to be replaced
-  * with an external parent's name.  This array is in the order that
-@@ -314,6 +317,7 @@ static const char *const cprman_parent_n
- struct bcm2835_cprman {
- 	struct device *dev;
- 	void __iomem *regs;
-+	struct rpi_firmware *fw;
- 	spinlock_t regs_lock; /* spinlock for all clocks */
- 	unsigned int soc;
- 
-@@ -1039,6 +1043,30 @@ static unsigned long bcm2835_clock_get_r
- 	return rate;
- }
- 
-+static unsigned long bcm2835_clock_get_rate_vpu(struct clk_hw *hw,
-+						unsigned long parent_rate)
-+{
-+	struct bcm2835_clock *clock = bcm2835_clock_from_hw(hw);
-+	struct bcm2835_cprman *cprman = clock->cprman;
-+
-+	if (cprman->fw) {
-+		struct {
-+			u32 id;
-+			u32 val;
-+		} packet;
-+
-+		packet.id = VCMSG_ID_CORE_CLOCK;
-+		packet.val = 0;
-+
-+		if (!rpi_firmware_property(cprman->fw,
-+					   RPI_FIRMWARE_GET_MAX_CLOCK_RATE,
-+					   &packet, sizeof(packet)))
-+			return packet.val;
-+	}
-+
-+	return bcm2835_clock_get_rate(hw, parent_rate);
-+}
-+
- static void bcm2835_clock_wait_busy(struct bcm2835_clock *clock)
- {
- 	struct bcm2835_cprman *cprman = clock->cprman;
-@@ -1327,7 +1355,7 @@ static int bcm2835_vpu_clock_is_on(struc
-  */
- static const struct clk_ops bcm2835_vpu_clock_clk_ops = {
- 	.is_prepared = bcm2835_vpu_clock_is_on,
--	.recalc_rate = bcm2835_clock_get_rate,
-+	.recalc_rate = bcm2835_clock_get_rate_vpu,
- 	.set_rate = bcm2835_clock_set_rate,
- 	.determine_rate = bcm2835_clock_determine_rate,
- 	.set_parent = bcm2835_clock_set_parent,
-@@ -2303,6 +2331,7 @@ static int bcm2835_clk_probe(struct plat
- 	const struct bcm2835_clk_desc *desc;
- 	const size_t asize = ARRAY_SIZE(clk_desc_array);
- 	const struct cprman_plat_data *pdata;
-+	struct device_node *fw_node;
- 	size_t i;
- 	u32 clk_id;
- 	int ret;
-@@ -2323,6 +2352,14 @@ static int bcm2835_clk_probe(struct plat
- 	if (IS_ERR(cprman->regs))
- 		return PTR_ERR(cprman->regs);
- 
-+	fw_node = of_parse_phandle(dev->of_node, "firmware", 0);
-+	if (fw_node) {
-+		struct rpi_firmware *fw = rpi_firmware_get(NULL);
-+		if (!fw)
-+			return -EPROBE_DEFER;
-+		cprman->fw = fw;
-+	}
-+
- 	memset(bcm2835_clk_claimed, 0, sizeof(bcm2835_clk_claimed));
- 	for (i = 0;
- 	     !of_property_read_u32_index(pdev->dev.of_node, "claim-clocks",
diff --git a/target/linux/bcm27xx/patches-6.1/950-0067-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch b/target/linux/bcm27xx/patches-6.1/950-0067-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch
deleted file mode 100644
index 21bfb62c44..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0067-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 9a6be4f7454aea16db1289664cf4dc5c31fe3a58 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Thu, 24 Jan 2019 15:09:28 +0000
-Subject: [PATCH] clk: clk-bcm2835: Use %zd when printing size_t
-
-The debug text for how many clocks have been registered
-uses "%d" with a size_t. Correct it to "%zd".
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- drivers/clk/bcm/clk-bcm2835.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/clk/bcm/clk-bcm2835.c
-+++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -2406,7 +2406,7 @@ static int bcm2835_clk_probe(struct plat
- 		return ret;
- 
- 	/* note that we have registered all the clocks */
--	dev_dbg(dev, "registered %d clocks\n", asize);
-+	dev_dbg(dev, "registered %zd clocks\n", asize);
- 
- 	return 0;
- }
diff --git a/target/linux/bcm27xx/patches-6.1/950-0068-clk-bcm2835-Don-t-wait-for-pllh-lock.patch b/target/linux/bcm27xx/patches-6.1/950-0068-clk-bcm2835-Don-t-wait-for-pllh-lock.patch
deleted file mode 100644
index 1096f128a6..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0068-clk-bcm2835-Don-t-wait-for-pllh-lock.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From da8b166a070e74a575d376c951f863ff069b7db4 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Wed, 23 Jan 2019 16:11:50 +0000
-Subject: [PATCH] clk-bcm2835: Don't wait for pllh lock
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- drivers/clk/bcm/clk-bcm2835.c | 18 ++++++++++--------
- 1 file changed, 10 insertions(+), 8 deletions(-)
-
---- a/drivers/clk/bcm/clk-bcm2835.c
-+++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -647,15 +647,17 @@ static int bcm2835_pll_on(struct clk_hw
- 	spin_unlock(&cprman->regs_lock);
- 
- 	/* Wait for the PLL to lock. */
--	timeout = ktime_add_ns(ktime_get(), LOCK_TIMEOUT_NS);
--	while (!(cprman_read(cprman, CM_LOCK) & data->lock_mask)) {
--		if (ktime_after(ktime_get(), timeout)) {
--			dev_err(cprman->dev, "%s: couldn't lock PLL\n",
--				clk_hw_get_name(hw));
--			return -ETIMEDOUT;
--		}
-+	if (strcmp(data->name, "pllh")) {
-+		timeout = ktime_add_ns(ktime_get(), LOCK_TIMEOUT_NS);
-+		while (!(cprman_read(cprman, CM_LOCK) & data->lock_mask)) {
-+			if (ktime_after(ktime_get(), timeout)) {
-+				dev_err(cprman->dev, "%s: couldn't lock PLL\n",
-+					clk_hw_get_name(hw));
-+				return -ETIMEDOUT;
-+			}
- 
--		cpu_relax();
-+			cpu_relax();
-+		}
- 	}
- 
- 	cprman_write(cprman, data->a2w_ctrl_reg,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0069-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch b/target/linux/bcm27xx/patches-6.1/950-0069-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch
deleted file mode 100644
index a2fc5b0066..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0069-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 704690d968a5f1cde04d15ad6c2b8410d7933461 Mon Sep 17 00:00:00 2001
-From: Eric Anholt <eric@anholt.net>
-Date: Thu, 2 May 2019 15:11:05 -0700
-Subject: [PATCH] clk: bcm2835: Add support for setting leaf clock
- rates while running.
-
-As long as you wait for !BUSY, you can do glitch-free updates of clock
-rate while the clock is running.
-
-Signed-off-by: Eric Anholt <eric@anholt.net>
----
- drivers/clk/bcm/clk-bcm2835.c | 22 +++++++++++++---------
- 1 file changed, 13 insertions(+), 9 deletions(-)
-
---- a/drivers/clk/bcm/clk-bcm2835.c
-+++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -1138,15 +1138,19 @@ static int bcm2835_clock_set_rate(struct
- 
- 	spin_lock(&cprman->regs_lock);
- 
--	/*
--	 * Setting up frac support
--	 *
--	 * In principle it is recommended to stop/start the clock first,
--	 * but as we set CLK_SET_RATE_GATE during registration of the
--	 * clock this requirement should be take care of by the
--	 * clk-framework.
-+	ctl = cprman_read(cprman, data->ctl_reg);
-+
-+	/* If the clock is running, we have to pause clock generation while
-+	 * updating the control and div regs.  This is glitchless (no clock
-+	 * signals generated faster than the rate) but each reg access is two
-+	 * OSC cycles so the clock will slow down for a moment.
- 	 */
--	ctl = cprman_read(cprman, data->ctl_reg) & ~CM_FRAC;
-+	if (ctl & CM_ENABLE) {
-+		cprman_write(cprman, data->ctl_reg, ctl & ~CM_ENABLE);
-+		bcm2835_clock_wait_busy(clock);
-+	}
-+
-+	ctl &= ~CM_FRAC;
- 	ctl |= (div & CM_DIV_FRAC_MASK) ? CM_FRAC : 0;
- 	cprman_write(cprman, data->ctl_reg, ctl);
- 
-@@ -1522,7 +1526,7 @@ static struct clk_hw *bcm2835_register_c
- 		init.ops = &bcm2835_vpu_clock_clk_ops;
- 	} else {
- 		init.ops = &bcm2835_clock_clk_ops;
--		init.flags |= CLK_SET_RATE_GATE | CLK_SET_PARENT_GATE;
-+		init.flags |= CLK_SET_PARENT_GATE;
- 
- 		/* If the clock wasn't actually enabled at boot, it's not
- 		 * critical.
diff --git a/target/linux/bcm27xx/patches-6.1/950-0070-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch b/target/linux/bcm27xx/patches-6.1/950-0070-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch
deleted file mode 100644
index 711d3d5fa4..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0070-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From da04f315a9aad8344c363e08939dfb7fda22df2e Mon Sep 17 00:00:00 2001
-From: Eric Anholt <eric@anholt.net>
-Date: Thu, 2 May 2019 15:24:04 -0700
-Subject: [PATCH] clk: bcm2835: Allow reparenting leaf clocks while
- they're running.
-
-This falls under the same "we can reprogram glitch-free as long as we
-pause generation" rule as updating the div/frac fields.  This can be
-used for runtime reclocking of V3D to manage power leakage.
-
-Signed-off-by: Eric Anholt <eric@anholt.net>
----
- drivers/clk/bcm/clk-bcm2835.c | 19 ++++++++++++++++---
- 1 file changed, 16 insertions(+), 3 deletions(-)
-
---- a/drivers/clk/bcm/clk-bcm2835.c
-+++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -1127,8 +1127,10 @@ static int bcm2835_clock_on(struct clk_h
- 	return 0;
- }
- 
--static int bcm2835_clock_set_rate(struct clk_hw *hw,
--				  unsigned long rate, unsigned long parent_rate)
-+static int bcm2835_clock_set_rate_and_parent(struct clk_hw *hw,
-+					     unsigned long rate,
-+					     unsigned long parent_rate,
-+					     u8 parent)
- {
- 	struct bcm2835_clock *clock = bcm2835_clock_from_hw(hw);
- 	struct bcm2835_cprman *cprman = clock->cprman;
-@@ -1150,6 +1152,11 @@ static int bcm2835_clock_set_rate(struct
- 		bcm2835_clock_wait_busy(clock);
- 	}
- 
-+	if (parent != 0xff) {
-+		ctl &= ~(CM_SRC_MASK << CM_SRC_SHIFT);
-+		ctl |= parent << CM_SRC_SHIFT;
-+	}
-+
- 	ctl &= ~CM_FRAC;
- 	ctl |= (div & CM_DIV_FRAC_MASK) ? CM_FRAC : 0;
- 	cprman_write(cprman, data->ctl_reg, ctl);
-@@ -1161,6 +1168,12 @@ static int bcm2835_clock_set_rate(struct
- 	return 0;
- }
- 
-+static int bcm2835_clock_set_rate(struct clk_hw *hw,
-+				  unsigned long rate, unsigned long parent_rate)
-+{
-+	return bcm2835_clock_set_rate_and_parent(hw, rate, parent_rate, 0xff);
-+}
-+
- static bool
- bcm2835_clk_is_pllc(struct clk_hw *hw)
- {
-@@ -1344,6 +1357,7 @@ static const struct clk_ops bcm2835_cloc
- 	.unprepare = bcm2835_clock_off,
- 	.recalc_rate = bcm2835_clock_get_rate,
- 	.set_rate = bcm2835_clock_set_rate,
-+	.set_rate_and_parent = bcm2835_clock_set_rate_and_parent,
- 	.determine_rate = bcm2835_clock_determine_rate,
- 	.set_parent = bcm2835_clock_set_parent,
- 	.get_parent = bcm2835_clock_get_parent,
-@@ -1526,7 +1540,6 @@ static struct clk_hw *bcm2835_register_c
- 		init.ops = &bcm2835_vpu_clock_clk_ops;
- 	} else {
- 		init.ops = &bcm2835_clock_clk_ops;
--		init.flags |= CLK_SET_PARENT_GATE;
- 
- 		/* If the clock wasn't actually enabled at boot, it's not
- 		 * critical.
diff --git a/target/linux/bcm27xx/patches-6.1/950-0071-clk-bcm2835-Avoid-null-pointer-exception.patch b/target/linux/bcm27xx/patches-6.1/950-0071-clk-bcm2835-Avoid-null-pointer-exception.patch
deleted file mode 100644
index a88362bcf1..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0071-clk-bcm2835-Avoid-null-pointer-exception.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e2f6af2a6fb09163318ce8cdb3a49af3c9df9b20 Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Tue, 6 Aug 2019 15:23:14 +0100
-Subject: [PATCH] clk-bcm2835: Avoid null pointer exception
-
-clk_desc_array[BCM2835_PLLB] doesn't exist so we dereference null when iterating
-
-Signed-off-by: popcornmix <popcornmix@gmail.com>
----
- drivers/clk/bcm/clk-bcm2835.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
---- a/drivers/clk/bcm/clk-bcm2835.c
-+++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -2334,9 +2334,11 @@ static bool bcm2835_clk_is_claimed(const
- 	int i;
- 
- 	for (i = 0; i < ARRAY_SIZE(clk_desc_array); i++) {
--		const char *clk_name = *(const char **)(clk_desc_array[i].data);
--		if (!strcmp(name, clk_name))
--		    return bcm2835_clk_claimed[i];
-+		if (clk_desc_array[i].data) {
-+			const char *clk_name = *(const char **)(clk_desc_array[i].data);
-+			if (!strcmp(name, clk_name))
-+				return bcm2835_clk_claimed[i];
-+		}
- 	}
- 
- 	return false;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0072-clk-bcm2835-Disable-v3d-clock.patch b/target/linux/bcm27xx/patches-6.1/950-0072-clk-bcm2835-Disable-v3d-clock.patch
deleted file mode 100644
index 15a8e67bb7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0072-clk-bcm2835-Disable-v3d-clock.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 59d8d02b527bd16a03f1abf9669dae0e2ea94a02 Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Tue, 3 Sep 2019 20:28:00 +0100
-Subject: [PATCH] clk-bcm2835: Disable v3d clock
-
-This is controlled by firmware, see clk-raspberrypi.c
-
-Signed-off-by: popcornmix <popcornmix@gmail.com>
----
- drivers/clk/bcm/clk-bcm2835.c | 30 ++++++++++++------------------
- 1 file changed, 12 insertions(+), 18 deletions(-)
-
---- a/drivers/clk/bcm/clk-bcm2835.c
-+++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -1764,16 +1764,12 @@ static const struct bcm2835_clk_desc clk
- 		.hold_mask = CM_PLLA_HOLDCORE,
- 		.fixed_divider = 1,
- 		.flags = CLK_SET_RATE_PARENT),
--	[BCM2835_PLLA_PER]	= REGISTER_PLL_DIV(
--		SOC_ALL,
--		.name = "plla_per",
--		.source_pll = "plla",
--		.cm_reg = CM_PLLA,
--		.a2w_reg = A2W_PLLA_PER,
--		.load_mask = CM_PLLA_LOADPER,
--		.hold_mask = CM_PLLA_HOLDPER,
--		.fixed_divider = 1,
--		.flags = CLK_SET_RATE_PARENT),
-+
-+	/*
-+	 * PLLA_PER is used for gpu clocks. Controlled by firmware, see
-+	 * clk-raspberrypi.c.
-+	 */
-+
- 	[BCM2835_PLLA_DSI0]	= REGISTER_PLL_DIV(
- 		SOC_ALL,
- 		.name = "plla_dsi0",
-@@ -2074,14 +2070,12 @@ static const struct bcm2835_clk_desc clk
- 		.int_bits = 6,
- 		.frac_bits = 0,
- 		.tcnt_mux = 3),
--	[BCM2835_CLOCK_V3D]	= REGISTER_VPU_CLK(
--		SOC_ALL,
--		.name = "v3d",
--		.ctl_reg = CM_V3DCTL,
--		.div_reg = CM_V3DDIV,
--		.int_bits = 4,
--		.frac_bits = 8,
--		.tcnt_mux = 4),
-+
-+	/*
-+	 * CLOCK_V3D is used for v3d clock. Controlled by firmware, see
-+	 * clk-raspberrypi.c.
-+	 */
-+
- 	/*
- 	 * VPU clock.  This doesn't have an enable bit, since it drives
- 	 * the bus for everything else, and is special so it doesn't need
diff --git a/target/linux/bcm27xx/patches-6.1/950-0073-clk-bcm2835-Pass-DT-node-to-rpi_firmware_get.patch b/target/linux/bcm27xx/patches-6.1/950-0073-clk-bcm2835-Pass-DT-node-to-rpi_firmware_get.patch
deleted file mode 100644
index 4221a4bfd7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0073-clk-bcm2835-Pass-DT-node-to-rpi_firmware_get.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0bd540c587577c9f585b163f4b44842f83bebbf9 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 8 Jul 2021 09:37:10 +0100
-Subject: [PATCH] clk: bcm2835: Pass DT node to rpi_firmware_get
-
-The fw_node pointer has already been retrieved, and using it allows
-us to remove a downstream patch to the firmware driver.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/clk/bcm/clk-bcm2835.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/clk/bcm/clk-bcm2835.c
-+++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -2369,7 +2369,7 @@ static int bcm2835_clk_probe(struct plat
- 
- 	fw_node = of_parse_phandle(dev->of_node, "firmware", 0);
- 	if (fw_node) {
--		struct rpi_firmware *fw = rpi_firmware_get(NULL);
-+		struct rpi_firmware *fw = rpi_firmware_get(fw_node);
- 		if (!fw)
- 			return -EPROBE_DEFER;
- 		cprman->fw = fw;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0074-clk-bcm2835-Remove-VEC-clock-support.patch b/target/linux/bcm27xx/patches-6.1/950-0074-clk-bcm2835-Remove-VEC-clock-support.patch
deleted file mode 100644
index 6271a815eb..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0074-clk-bcm2835-Remove-VEC-clock-support.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From abd81cbef43375bdca1414bb97960161e7a8fe49 Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Tue, 19 Oct 2021 14:14:55 +0100
-Subject: [PATCH] clk-bcm2835: Remove VEC clock support
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/clk/bcm/clk-bcm2835.c | 15 ---------------
- 1 file changed, 15 deletions(-)
-
---- a/drivers/clk/bcm/clk-bcm2835.c
-+++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -2238,21 +2238,6 @@ static const struct bcm2835_clk_desc clk
- 		.tcnt_mux = 28,
- 		.round_up = true),
- 
--	/* TV encoder clock.  Only operating frequency is 108Mhz.  */
--	[BCM2835_CLOCK_VEC]	= REGISTER_PER_CLK(
--		SOC_ALL,
--		.name = "vec",
--		.ctl_reg = CM_VECCTL,
--		.div_reg = CM_VECDIV,
--		.int_bits = 4,
--		.frac_bits = 0,
--		/*
--		 * Allow rate change propagation only on PLLH_AUX which is
--		 * assigned index 7 in the parent array.
--		 */
--		.set_rate_parent = BIT(7),
--		.tcnt_mux = 29),
--
- 	/* dsi clocks */
- 	[BCM2835_CLOCK_DSI0E]	= REGISTER_PER_CLK(
- 		SOC_ALL,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0075-arm-partially-revert-702b94bff3c50542a6e4ab9a4f4cef0.patch b/target/linux/bcm27xx/patches-6.1/950-0075-arm-partially-revert-702b94bff3c50542a6e4ab9a4f4cef0.patch
deleted file mode 100644
index eb1903ee3c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0075-arm-partially-revert-702b94bff3c50542a6e4ab9a4f4cef0.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From b426d39ea63f239cc7778c9e0c4ff703c10cb65a Mon Sep 17 00:00:00 2001
-From: Dan Pasanen <dan.pasanen@gmail.com>
-Date: Thu, 21 Sep 2017 09:55:42 -0500
-Subject: [PATCH] arm: partially revert
- 702b94bff3c50542a6e4ab9a4f4cef093262fe65
-
-* Re-expose some dmi APIs for use in VCSM
----
- arch/arm/include/asm/cacheflush.h | 21 +++++++++++++++++++++
- arch/arm/include/asm/glue-cache.h |  2 ++
- arch/arm/mm/proc-macros.S         |  2 ++
- arch/arm/mm/proc-syms.c           |  3 +++
- 4 files changed, 28 insertions(+)
-
---- a/arch/arm/include/asm/cacheflush.h
-+++ b/arch/arm/include/asm/cacheflush.h
-@@ -91,6 +91,21 @@
-  *	DMA Cache Coherency
-  *	===================
-  *
-+ *	dma_inv_range(start, end)
-+ *
-+ *		Invalidate (discard) the specified virtual address range.
-+ *		May not write back any entries.  If 'start' or 'end'
-+ *		are not cache line aligned, those lines must be written
-+ *		back.
-+ *		- start  - virtual start address
-+ *		- end    - virtual end address
-+ *
-+ *	dma_clean_range(start, end)
-+ *
-+ *		Clean (write back) the specified virtual address range.
-+ *		- start  - virtual start address
-+ *		- end    - virtual end address
-+ *
-  *	dma_flush_range(start, end)
-  *
-  *		Clean and invalidate the specified virtual address range.
-@@ -112,6 +127,8 @@ struct cpu_cache_fns {
- 	void (*dma_map_area)(const void *, size_t, int);
- 	void (*dma_unmap_area)(const void *, size_t, int);
- 
-+	void (*dma_inv_range)(const void *, const void *);
-+	void (*dma_clean_range)(const void *, const void *);
- 	void (*dma_flush_range)(const void *, const void *);
- } __no_randomize_layout;
- 
-@@ -137,6 +154,8 @@ extern struct cpu_cache_fns cpu_cache;
-  * is visible to DMA, or data written by DMA to system memory is
-  * visible to the CPU.
-  */
-+#define dmac_inv_range			cpu_cache.dma_inv_range
-+#define dmac_clean_range		cpu_cache.dma_clean_range
- #define dmac_flush_range		cpu_cache.dma_flush_range
- 
- #else
-@@ -156,6 +175,8 @@ extern void __cpuc_flush_dcache_area(voi
-  * is visible to DMA, or data written by DMA to system memory is
-  * visible to the CPU.
-  */
-+extern void dmac_inv_range(const void *, const void *);
-+extern void dmac_clean_range(const void *, const void *);
- extern void dmac_flush_range(const void *, const void *);
- 
- #endif
---- a/arch/arm/include/asm/glue-cache.h
-+++ b/arch/arm/include/asm/glue-cache.h
-@@ -155,6 +155,8 @@ static inline void nop_dma_unmap_area(co
- #define __cpuc_coherent_user_range	__glue(_CACHE,_coherent_user_range)
- #define __cpuc_flush_dcache_area	__glue(_CACHE,_flush_kern_dcache_area)
- 
-+#define dmac_inv_range			__glue(_CACHE,_dma_inv_range)
-+#define dmac_clean_range		__glue(_CACHE,_dma_clean_range)
- #define dmac_flush_range		__glue(_CACHE,_dma_flush_range)
- #endif
- 
---- a/arch/arm/mm/proc-macros.S
-+++ b/arch/arm/mm/proc-macros.S
-@@ -333,6 +333,8 @@ ENTRY(\name\()_cache_fns)
- 	.long	\name\()_flush_kern_dcache_area
- 	.long	\name\()_dma_map_area
- 	.long	\name\()_dma_unmap_area
-+	.long	\name\()_dma_inv_range
-+	.long	\name\()_dma_clean_range
- 	.long	\name\()_dma_flush_range
- 	.size	\name\()_cache_fns, . - \name\()_cache_fns
- .endm
---- a/arch/arm/mm/proc-syms.c
-+++ b/arch/arm/mm/proc-syms.c
-@@ -27,6 +27,9 @@ EXPORT_SYMBOL(__cpuc_flush_user_all);
- EXPORT_SYMBOL(__cpuc_flush_user_range);
- EXPORT_SYMBOL(__cpuc_coherent_kern_range);
- EXPORT_SYMBOL(__cpuc_flush_dcache_area);
-+EXPORT_SYMBOL(dmac_inv_range);
-+EXPORT_SYMBOL(dmac_clean_range);
-+EXPORT_SYMBOL(dmac_flush_range);
- #else
- EXPORT_SYMBOL(cpu_cache);
- #endif
diff --git a/target/linux/bcm27xx/patches-6.1/950-0076-cache-export-clean-and-invalidate.patch b/target/linux/bcm27xx/patches-6.1/950-0076-cache-export-clean-and-invalidate.patch
deleted file mode 100644
index dc77637d86..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0076-cache-export-clean-and-invalidate.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From d4d635fd535132c67f69837fa4c8bf95588de25d Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Fri, 25 Aug 2017 19:18:13 +0100
-Subject: [PATCH] cache: export clean and invalidate
-
-hack: cache: Fix linker error
----
- arch/arm/mm/cache-v6.S | 4 ++--
- arch/arm/mm/cache-v7.S | 6 ++++--
- 2 files changed, 6 insertions(+), 4 deletions(-)
-
---- a/arch/arm/mm/cache-v6.S
-+++ b/arch/arm/mm/cache-v6.S
-@@ -198,7 +198,7 @@ ENTRY(v6_flush_kern_dcache_area)
-  *	- start   - virtual start address of region
-  *	- end     - virtual end address of region
-  */
--v6_dma_inv_range:
-+ENTRY(v6_dma_inv_range)
- #ifdef CONFIG_DMA_CACHE_RWFO
- 	ldrb	r2, [r0]			@ read for ownership
- 	strb	r2, [r0]			@ write for ownership
-@@ -243,7 +243,7 @@ v6_dma_inv_range:
-  *	- start   - virtual start address of region
-  *	- end     - virtual end address of region
-  */
--v6_dma_clean_range:
-+ENTRY(v6_dma_clean_range)
- 	bic	r0, r0, #D_CACHE_LINE_SIZE - 1
- 1:
- #ifdef CONFIG_DMA_CACHE_RWFO
---- a/arch/arm/mm/cache-v7.S
-+++ b/arch/arm/mm/cache-v7.S
-@@ -359,7 +359,8 @@ ENDPROC(v7_flush_kern_dcache_area)
-  *	- start   - virtual start address of region
-  *	- end     - virtual end address of region
-  */
--v7_dma_inv_range:
-+ENTRY(b15_dma_inv_range)
-+ENTRY(v7_dma_inv_range)
- 	dcache_line_size r2, r3
- 	sub	r3, r2, #1
- 	tst	r0, r3
-@@ -389,7 +390,8 @@ ENDPROC(v7_dma_inv_range)
-  *	- start   - virtual start address of region
-  *	- end     - virtual end address of region
-  */
--v7_dma_clean_range:
-+ENTRY(b15_dma_clean_range)
-+ENTRY(v7_dma_clean_range)
- 	dcache_line_size r2, r3
- 	sub	r3, r2, #1
- 	bic	r0, r0, r3
diff --git a/target/linux/bcm27xx/patches-6.1/950-0077-Revert-spi-spidev-Fix-CS-polarity-if-GPIO-descriptor.patch b/target/linux/bcm27xx/patches-6.1/950-0077-Revert-spi-spidev-Fix-CS-polarity-if-GPIO-descriptor.patch
deleted file mode 100644
index 6bd1ca5652..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0077-Revert-spi-spidev-Fix-CS-polarity-if-GPIO-descriptor.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b8b545ec6ce98fc33f5a6f86b55914dce0b56bdb Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 20 Apr 2020 13:41:10 +0100
-Subject: [PATCH] Revert "spi: spidev: Fix CS polarity if GPIO
- descriptors are used"
-
-This reverts commit 83b2a8fe43bda0c11981ad6afa5dd0104d78be28.
----
- drivers/spi/spidev.c | 5 -----
- 1 file changed, 5 deletions(-)
-
---- a/drivers/spi/spidev.c
-+++ b/drivers/spi/spidev.c
-@@ -414,7 +414,6 @@ spidev_ioctl(struct file *filp, unsigned
- 		else
- 			retval = get_user(tmp, (u32 __user *)arg);
- 		if (retval == 0) {
--			struct spi_controller *ctlr = spi->controller;
- 			u32	save = spi->mode;
- 
- 			if (tmp & ~SPI_MODE_MASK) {
-@@ -422,10 +421,6 @@ spidev_ioctl(struct file *filp, unsigned
- 				break;
- 			}
- 
--			if (ctlr->use_gpio_descriptors && ctlr->cs_gpiods &&
--			    ctlr->cs_gpiods[spi->chip_select])
--				tmp |= SPI_CS_HIGH;
--
- 			tmp |= spi->mode & ~SPI_MODE_MASK;
- 			spi->mode = tmp & SPI_MODE_USER_MASK;
- 			retval = spi_setup(spi);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0078-Revert-Bluetooth-Always-request-for-user-confirmatio.patch b/target/linux/bcm27xx/patches-6.1/950-0078-Revert-Bluetooth-Always-request-for-user-confirmatio.patch
deleted file mode 100644
index bd2ccaa197..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0078-Revert-Bluetooth-Always-request-for-user-confirmatio.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 506255b7590382088a17f075952f8345e69a6c94 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 1 Mar 2021 09:12:44 +0000
-Subject: [PATCH] Revert "Bluetooth: Always request for user
- confirmation for Just Works (LE SC)"
-
-This reverts commit ffee202a78c2980688bc5d2f7d56480e69a5e0c9.
-
-The commit "Bluetooth: Always request for user confirmation for Just
-Works" prevents BLE devices pairing in (at least) the Raspberry Pi OS
-GUI. After reverting it, pairing works again. Although this companion
-commit ("... (LE SC)") has not been demonstrated to be problematic,
-it follows the same logic and therefore could affect some use cases.
-
-If another solution to the problem is found then this reversion will
-be removed.
-
-See: https://github.com/raspberrypi/linux/issues/4139
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- net/bluetooth/smp.c | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
---- a/net/bluetooth/smp.c
-+++ b/net/bluetooth/smp.c
-@@ -2214,7 +2214,7 @@ mackey_and_ltk:
- 	if (err)
- 		return SMP_UNSPECIFIED;
- 
--	if (smp->method == REQ_OOB) {
-+	if (smp->method == JUST_WORKS || smp->method == REQ_OOB) {
- 		if (hcon->out) {
- 			sc_dhkey_check(smp);
- 			SMP_ALLOW_CMD(smp, SMP_CMD_DHKEY_CHECK);
-@@ -2229,9 +2229,6 @@ mackey_and_ltk:
- 	confirm_hint = 0;
- 
- confirm:
--	if (smp->method == JUST_WORKS)
--		confirm_hint = 1;
--
- 	err = mgmt_user_confirm_request(hcon->hdev, &hcon->dst, hcon->type,
- 					hcon->dst_type, passkey, confirm_hint);
- 	if (err)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0079-Revert-Bluetooth-Always-request-for-user-confirmatio.patch b/target/linux/bcm27xx/patches-6.1/950-0079-Revert-Bluetooth-Always-request-for-user-confirmatio.patch
deleted file mode 100644
index 35d623ffa8..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0079-Revert-Bluetooth-Always-request-for-user-confirmatio.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From b7999d8bdd59c3551127df385d47c105ab1d9f47 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 1 Mar 2021 09:14:35 +0000
-Subject: [PATCH] Revert "Bluetooth: Always request for user
- confirmation for Just Works"
-
-This reverts commit 92516cd97fd4d8ad5b1421a0d51771044f453a5f.
-
-Thi commit "Bluetooth: Always request for user confirmation for Just
-Works" prevents BLE devices pairing in (at least) the Raspberry Pi OS
-GUI. After reverting it, pairing works again.
-
-If another solution to the problem is found then this reversion will
-be removed.
-
-See: https://github.com/raspberrypi/linux/issues/4139
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- net/bluetooth/smp.c | 11 ++---------
- 1 file changed, 2 insertions(+), 9 deletions(-)
-
---- a/net/bluetooth/smp.c
-+++ b/net/bluetooth/smp.c
-@@ -883,16 +883,9 @@ static int tk_request(struct l2cap_conn
- 	    hcon->io_capability == HCI_IO_NO_INPUT_OUTPUT)
- 		smp->method = JUST_WORKS;
- 
--	/* If Just Works, Continue with Zero TK and ask user-space for
--	 * confirmation */
-+	/* If Just Works, Continue with Zero TK */
- 	if (smp->method == JUST_WORKS) {
--		ret = mgmt_user_confirm_request(hcon->hdev, &hcon->dst,
--						hcon->type,
--						hcon->dst_type,
--						passkey, 1);
--		if (ret)
--			return ret;
--		set_bit(SMP_FLAG_WAIT_USER, &smp->flags);
-+		set_bit(SMP_FLAG_TK_VALID, &smp->flags);
- 		return 0;
- 	}
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0080-Revert-net-bcmgenet-Request-APD-DLL-disable-and-IDDQ.patch b/target/linux/bcm27xx/patches-6.1/950-0080-Revert-net-bcmgenet-Request-APD-DLL-disable-and-IDDQ.patch
deleted file mode 100644
index 57a59c1ae4..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0080-Revert-net-bcmgenet-Request-APD-DLL-disable-and-IDDQ.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From b0c1da315623496404b3a0203c51ae7fc9d3ed88 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 7 Mar 2022 16:18:55 +0000
-Subject: [PATCH] Revert "net: bcmgenet: Request APD, DLL disable and
- IDDQ-SR"
-
-This reverts commit c3a4c69360ab43560f212eed326c9d8bde35b14c, which
-broke rebooting when network booting.
-
-See: https://github.com/raspberrypi/rpi-eeprom/issues/417
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/net/ethernet/broadcom/genet/bcmmii.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
---- a/drivers/net/ethernet/broadcom/genet/bcmmii.c
-+++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c
-@@ -303,9 +303,7 @@ int bcmgenet_mii_probe(struct net_device
- 	struct device_node *dn = kdev->of_node;
- 	phy_interface_t phy_iface = priv->phy_interface;
- 	struct phy_device *phydev;
--	u32 phy_flags = PHY_BRCM_AUTO_PWRDWN_ENABLE |
--			PHY_BRCM_DIS_TXCRXC_NOENRGY |
--			PHY_BRCM_IDDQ_SUSPEND;
-+	u32 phy_flags = 0;
- 	int ret;
- 
- 	/* Communicate the integrated PHY revision */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0082-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch b/target/linux/bcm27xx/patches-6.1/950-0082-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch
deleted file mode 100644
index 593e5eb456..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0082-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From cd851377edc5c90b628f48b147d89181018ba282 Mon Sep 17 00:00:00 2001
-From: Sam Nazarko <email@samnazarko.co.uk>
-Date: Fri, 1 Apr 2016 17:27:21 +0100
-Subject: [PATCH] smsc95xx: Experimental: Enable turbo_mode and
- packetsize=2560 by default
-
-See: http://forum.kodi.tv/showthread.php?tid=285288
----
- drivers/net/usb/smsc95xx.c | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
---- a/drivers/net/usb/smsc95xx.c
-+++ b/drivers/net/usb/smsc95xx.c
-@@ -79,6 +79,10 @@ static bool turbo_mode = true;
- module_param(turbo_mode, bool, 0644);
- MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction");
- 
-+static int packetsize = 2560;
-+module_param(packetsize, int, 0644);
-+MODULE_PARM_DESC(packetsize, "Override the RX URB packet size");
-+
- static int __must_check smsc95xx_read_reg(struct usbnet *dev, u32 index,
- 					  u32 *data)
- {
-@@ -932,13 +936,13 @@ static int smsc95xx_reset(struct usbnet
- 
- 	if (!turbo_mode) {
- 		burst_cap = 0;
--		dev->rx_urb_size = MAX_SINGLE_PACKET_SIZE;
-+		dev->rx_urb_size = packetsize ? packetsize : MAX_SINGLE_PACKET_SIZE;
- 	} else if (dev->udev->speed == USB_SPEED_HIGH) {
--		burst_cap = DEFAULT_HS_BURST_CAP_SIZE / HS_USB_PKT_SIZE;
--		dev->rx_urb_size = DEFAULT_HS_BURST_CAP_SIZE;
-+		dev->rx_urb_size = packetsize ? packetsize : DEFAULT_HS_BURST_CAP_SIZE;
-+		burst_cap = dev->rx_urb_size / HS_USB_PKT_SIZE;
- 	} else {
--		burst_cap = DEFAULT_FS_BURST_CAP_SIZE / FS_USB_PKT_SIZE;
--		dev->rx_urb_size = DEFAULT_FS_BURST_CAP_SIZE;
-+		dev->rx_urb_size = packetsize ? packetsize : DEFAULT_FS_BURST_CAP_SIZE;
-+		burst_cap = dev->rx_urb_size / FS_USB_PKT_SIZE;
- 	}
- 
- 	netif_dbg(dev, ifup, dev->net, "rx_urb_size=%ld\n",
diff --git a/target/linux/bcm27xx/patches-6.1/950-0083-Allow-mac-address-to-be-set-in-smsc95xx.patch b/target/linux/bcm27xx/patches-6.1/950-0083-Allow-mac-address-to-be-set-in-smsc95xx.patch
deleted file mode 100644
index d9035fddbf..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0083-Allow-mac-address-to-be-set-in-smsc95xx.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 46f9261fd0c133038cc5adbdb91085a1791414c9 Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Tue, 26 Mar 2013 17:26:38 +0000
-Subject: [PATCH] Allow mac address to be set in smsc95xx
-
-Signed-off-by: popcornmix <popcornmix@gmail.com>
-
-SQUASH: smsc95xx: Use dev_mod_addr to set MAC addr
-
-Since adeef3e32146 ("net: constify netdev->dev_addr") it has been
-illegal to write to the dev_addr MAC address field. Later commits
-have added explicit checks that it hasn't been modified by nefarious
-means. The dev_addr_mod helper function is the accepted way to change
-the dev_addr field, so use it.
-
-Squash with 96c1def63ee1 ("Allow mac address to be set in smsc95xx").
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/net/usb/smsc95xx.c | 54 ++++++++++++++++++++++++++++++++++++++
- 1 file changed, 54 insertions(+)
-
---- a/drivers/net/usb/smsc95xx.c
-+++ b/drivers/net/usb/smsc95xx.c
-@@ -83,6 +83,10 @@ static int packetsize = 2560;
- module_param(packetsize, int, 0644);
- MODULE_PARM_DESC(packetsize, "Override the RX URB packet size");
- 
-+static char *macaddr = ":";
-+module_param(macaddr, charp, 0);
-+MODULE_PARM_DESC(macaddr, "MAC address");
-+
- static int __must_check smsc95xx_read_reg(struct usbnet *dev, u32 index,
- 					  u32 *data)
- {
-@@ -805,6 +809,52 @@ static int smsc95xx_ioctl(struct net_dev
- 	return phy_mii_ioctl(netdev->phydev, rq, cmd);
- }
- 
-+/* Check the macaddr module parameter for a MAC address */
-+static int smsc95xx_is_macaddr_param(struct usbnet *dev, struct net_device *nd)
-+{
-+       int i, j, got_num, num;
-+       u8 mtbl[ETH_ALEN];
-+
-+       if (macaddr[0] == ':')
-+               return 0;
-+
-+       i = 0;
-+       j = 0;
-+       num = 0;
-+       got_num = 0;
-+       while (j < ETH_ALEN) {
-+               if (macaddr[i] && macaddr[i] != ':') {
-+                       got_num++;
-+                       if ('0' <= macaddr[i] && macaddr[i] <= '9')
-+                               num = num * 16 + macaddr[i] - '0';
-+                       else if ('A' <= macaddr[i] && macaddr[i] <= 'F')
-+                               num = num * 16 + 10 + macaddr[i] - 'A';
-+                       else if ('a' <= macaddr[i] && macaddr[i] <= 'f')
-+                               num = num * 16 + 10 + macaddr[i] - 'a';
-+                       else
-+                               break;
-+                       i++;
-+               } else if (got_num == 2) {
-+                       mtbl[j++] = (u8) num;
-+                       num = 0;
-+                       got_num = 0;
-+                       i++;
-+               } else {
-+                       break;
-+               }
-+       }
-+
-+       if (j == ETH_ALEN) {
-+               netif_dbg(dev, ifup, dev->net, "Overriding MAC address with: "
-+               "%02x:%02x:%02x:%02x:%02x:%02x\n", mtbl[0], mtbl[1], mtbl[2],
-+                                               mtbl[3], mtbl[4], mtbl[5]);
-+	       dev_addr_mod(nd, 0, mtbl, ETH_ALEN);
-+               return 1;
-+       } else {
-+               return 0;
-+       }
-+}
-+
- static void smsc95xx_init_mac_address(struct usbnet *dev)
- {
- 	u8 addr[ETH_ALEN];
-@@ -828,6 +878,10 @@ static void smsc95xx_init_mac_address(st
- 		}
- 	}
- 
-+	/* Check module parameters */
-+	if (smsc95xx_is_macaddr_param(dev, dev->net))
-+		return;
-+
- 	/* no useful static MAC address found. generate a random one */
- 	eth_hw_addr_random(dev->net);
- 	netif_dbg(dev, ifup, dev->net, "MAC address set to eth_random_addr\n");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0084-cgroup-Disable-cgroup-memory-by-default.patch b/target/linux/bcm27xx/patches-6.1/950-0084-cgroup-Disable-cgroup-memory-by-default.patch
deleted file mode 100644
index 316c630be8..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0084-cgroup-Disable-cgroup-memory-by-default.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 9a43e3e7af1f9a4b3961402755dc49251175aaee Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Mon, 27 Nov 2017 17:14:54 +0000
-Subject: [PATCH] cgroup: Disable cgroup "memory" by default
-
-Some Raspberry Pis have limited RAM and most users won't use the
-cgroup memory support so it is disabled by default. Enable with:
-
-    cgroup_enable=memory
-
-See: https://github.com/raspberrypi/linux/issues/1950
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- kernel/cgroup/cgroup.c | 38 ++++++++++++++++++++++++++++++++++++++
- 1 file changed, 38 insertions(+)
-
---- a/kernel/cgroup/cgroup.c
-+++ b/kernel/cgroup/cgroup.c
-@@ -6061,6 +6061,9 @@ int __init cgroup_init_early(void)
- 	return 0;
- }
- 
-+static u16 cgroup_enable_mask __initdata;
-+static int __init cgroup_disable(char *str);
-+
- /**
-  * cgroup_init - cgroup initialization
-  *
-@@ -6094,6 +6097,12 @@ int __init cgroup_init(void)
- 
- 	cgroup_unlock();
- 
-+	/*
-+	 * Apply an implicit disable, knowing that an explicit enable will
-+	 * prevent if from doing anything.
-+	 */
-+	cgroup_disable("memory");
-+
- 	for_each_subsys(ss, ssid) {
- 		if (ss->early_init) {
- 			struct cgroup_subsys_state *css =
-@@ -6734,6 +6743,10 @@ static int __init cgroup_disable(char *s
- 			    strcmp(token, ss->legacy_name))
- 				continue;
- 
-+			/* An explicit cgroup_enable overrides a disable */
-+			if (cgroup_enable_mask & (1 << i))
-+				continue;
-+
- 			static_branch_disable(cgroup_subsys_enabled_key[i]);
- 			pr_info("Disabling %s control group subsystem\n",
- 				ss->name);
-@@ -6752,6 +6765,31 @@ static int __init cgroup_disable(char *s
- }
- __setup("cgroup_disable=", cgroup_disable);
- 
-+static int __init cgroup_enable(char *str)
-+{
-+	struct cgroup_subsys *ss;
-+	char *token;
-+	int i;
-+
-+	while ((token = strsep(&str, ",")) != NULL) {
-+		if (!*token)
-+			continue;
-+
-+		for_each_subsys(ss, i) {
-+			if (strcmp(token, ss->name) &&
-+			    strcmp(token, ss->legacy_name))
-+				continue;
-+
-+			cgroup_enable_mask |= 1 << i;
-+			static_branch_enable(cgroup_subsys_enabled_key[i]);
-+			pr_info("Enabling %s control group subsystem\n",
-+				ss->name);
-+		}
-+	}
-+	return 1;
-+}
-+__setup("cgroup_enable=", cgroup_enable);
-+
- void __init __weak enable_debug_cgroup(void) { }
- 
- static int __init enable_cgroup_debug(char *str)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0085-Protect-__release_resource-against-resources-without.patch b/target/linux/bcm27xx/patches-6.1/950-0085-Protect-__release_resource-against-resources-without.patch
deleted file mode 100644
index 26aabf40bb..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0085-Protect-__release_resource-against-resources-without.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 2b2d2bb2473fd1c6397f96e98b183e8cbee7c408 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Fri, 13 Mar 2015 12:43:36 +0000
-Subject: [PATCH] Protect __release_resource against resources without
- parents
-
-Without this patch, removing a device tree overlay can crash here.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- kernel/resource.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/kernel/resource.c
-+++ b/kernel/resource.c
-@@ -200,6 +200,12 @@ static int __release_resource(struct res
- {
- 	struct resource *tmp, **p, *chd;
- 
-+	if (!old->parent) {
-+		WARN(old->sibling, "sibling but no parent");
-+		if (old->sibling)
-+			return -EINVAL;
-+		return 0;
-+	}
- 	p = &old->parent->child;
- 	for (;;) {
- 		tmp = *p;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0086-irq-bcm2836-Avoid-Invalid-trigger-warning.patch b/target/linux/bcm27xx/patches-6.1/950-0086-irq-bcm2836-Avoid-Invalid-trigger-warning.patch
deleted file mode 100644
index 392f966876..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0086-irq-bcm2836-Avoid-Invalid-trigger-warning.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 340481cbc2217c5d20da30963fd75c07d29a9876 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Thu, 9 Feb 2017 14:33:30 +0000
-Subject: [PATCH] irq-bcm2836: Avoid "Invalid trigger warning"
-
-Initialise the level for each IRQ to avoid a warning from the
-arm arch timer code.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- drivers/irqchip/irq-bcm2836.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/irqchip/irq-bcm2836.c
-+++ b/drivers/irqchip/irq-bcm2836.c
-@@ -128,7 +128,7 @@ static int bcm2836_map(struct irq_domain
- 	irq_set_percpu_devid(irq);
- 	irq_domain_set_info(d, irq, hw, chip, d->host_data,
- 			    handle_percpu_devid_irq, NULL, NULL);
--	irq_set_status_flags(irq, IRQ_NOAUTOEN);
-+	irq_set_status_flags(irq, IRQ_NOAUTOEN | IRQ_TYPE_LEVEL_LOW);
- 
- 	return 0;
- }
diff --git a/target/linux/bcm27xx/patches-6.1/950-0087-irqchip-bcm2835-Add-FIQ-support.patch b/target/linux/bcm27xx/patches-6.1/950-0087-irqchip-bcm2835-Add-FIQ-support.patch
deleted file mode 100644
index a6f5e58d7f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0087-irqchip-bcm2835-Add-FIQ-support.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From be5c4814f18effda98a7c111aefce9c9c51d0926 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
-Date: Fri, 12 Jun 2015 19:01:05 +0200
-Subject: [PATCH] irqchip: bcm2835: Add FIQ support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Add a duplicate irq range with an offset on the hwirq's so the
-driver can detect that enable_fiq() is used.
-Tested with downstream dwc_otg USB controller driver.
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-Reviewed-by: Eric Anholt <eric@anholt.net>
-Acked-by: Stephen Warren <swarren@wwwdotorg.org>
----
- arch/arm/mach-bcm/Kconfig     |  1 +
- drivers/irqchip/irq-bcm2835.c | 51 +++++++++++++++++++++++++++++++----
- 2 files changed, 47 insertions(+), 5 deletions(-)
-
---- a/arch/arm/mach-bcm/Kconfig
-+++ b/arch/arm/mach-bcm/Kconfig
-@@ -159,6 +159,7 @@ config ARCH_BCM2835
- 	select ARM_TIMER_SP804
- 	select HAVE_ARM_ARCH_TIMER if ARCH_MULTI_V7
- 	select BCM2835_TIMER
-+	select FIQ
- 	select PINCTRL
- 	select PINCTRL_BCM2835
- 	select MFD_CORE
---- a/drivers/irqchip/irq-bcm2835.c
-+++ b/drivers/irqchip/irq-bcm2835.c
-@@ -45,7 +45,7 @@
- #include <asm/exception.h>
- 
- /* Put the bank and irq (32 bits) into the hwirq */
--#define MAKE_HWIRQ(b, n)	((b << 5) | (n))
-+#define MAKE_HWIRQ(b, n)	(((b) << 5) | (n))
- #define HWIRQ_BANK(i)		(i >> 5)
- #define HWIRQ_BIT(i)		BIT(i & 0x1f)
- 
-@@ -62,9 +62,13 @@
- 
- #define REG_FIQ_CONTROL		0x0c
- #define FIQ_CONTROL_ENABLE	BIT(7)
-+#define REG_FIQ_ENABLE		FIQ_CONTROL_ENABLE
-+#define REG_FIQ_DISABLE	0
- 
- #define NR_BANKS		3
- #define IRQS_PER_BANK		32
-+#define NUMBER_IRQS		MAKE_HWIRQ(NR_BANKS, 0)
-+#define FIQ_START		(NR_IRQS_BANK0 + MAKE_HWIRQ(NR_BANKS - 1, 0))
- 
- static const int reg_pending[] __initconst = { 0x00, 0x04, 0x08 };
- static const int reg_enable[] __initconst = { 0x18, 0x10, 0x14 };
-@@ -89,14 +93,38 @@ static void __exception_irq_entry bcm283
- 	struct pt_regs *regs);
- static void bcm2836_chained_handle_irq(struct irq_desc *desc);
- 
-+static inline unsigned int hwirq_to_fiq(unsigned long hwirq)
-+{
-+	hwirq -= NUMBER_IRQS;
-+	/*
-+	 * The hwirq numbering used in this driver is:
-+	 *   BASE (0-7) GPU1 (32-63) GPU2 (64-95).
-+	 * This differ from the one used in the FIQ register:
-+	 *   GPU1 (0-31) GPU2 (32-63) BASE (64-71)
-+	 */
-+	if (hwirq >= 32)
-+		return hwirq - 32;
-+
-+	return hwirq + 64;
-+}
-+
- static void armctrl_mask_irq(struct irq_data *d)
- {
--	writel_relaxed(HWIRQ_BIT(d->hwirq), intc.disable[HWIRQ_BANK(d->hwirq)]);
-+	if (d->hwirq >= NUMBER_IRQS)
-+		writel_relaxed(REG_FIQ_DISABLE, intc.base + REG_FIQ_CONTROL);
-+	else
-+		writel_relaxed(HWIRQ_BIT(d->hwirq),
-+			       intc.disable[HWIRQ_BANK(d->hwirq)]);
- }
- 
- static void armctrl_unmask_irq(struct irq_data *d)
- {
--	writel_relaxed(HWIRQ_BIT(d->hwirq), intc.enable[HWIRQ_BANK(d->hwirq)]);
-+	if (d->hwirq >= NUMBER_IRQS)
-+		writel_relaxed(REG_FIQ_ENABLE | hwirq_to_fiq(d->hwirq),
-+			       intc.base + REG_FIQ_CONTROL);
-+	else
-+		writel_relaxed(HWIRQ_BIT(d->hwirq),
-+			       intc.enable[HWIRQ_BANK(d->hwirq)]);
- }
- 
- static struct irq_chip armctrl_chip = {
-@@ -142,8 +170,9 @@ static int __init armctrl_of_init(struct
- 	if (!base)
- 		panic("%pOF: unable to map IC registers\n", node);
- 
--	intc.domain = irq_domain_add_linear(node, MAKE_HWIRQ(NR_BANKS, 0),
--			&armctrl_ops, NULL);
-+	intc.base = base;
-+	intc.domain = irq_domain_add_linear(node, NUMBER_IRQS * 2,
-+					    &armctrl_ops, NULL);
- 	if (!intc.domain)
- 		panic("%pOF: unable to create IRQ domain\n", node);
- 
-@@ -186,6 +215,18 @@ static int __init armctrl_of_init(struct
- 		set_handle_irq(bcm2835_handle_irq);
- 	}
- 
-+	/* Make a duplicate irq range which is used to enable FIQ */
-+	for (b = 0; b < NR_BANKS; b++) {
-+		for (i = 0; i < bank_irqs[b]; i++) {
-+			irq = irq_create_mapping(intc.domain,
-+					MAKE_HWIRQ(b, i) + NUMBER_IRQS);
-+			BUG_ON(irq <= 0);
-+			irq_set_chip(irq, &armctrl_chip);
-+			set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
-+		}
-+	}
-+	init_FIQ(FIQ_START);
-+
- 	return 0;
- }
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0088-irqchip-irq-bcm2835-Add-2836-FIQ-support.patch b/target/linux/bcm27xx/patches-6.1/950-0088-irqchip-irq-bcm2835-Add-2836-FIQ-support.patch
deleted file mode 100644
index 5a584cdbaa..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0088-irqchip-irq-bcm2835-Add-2836-FIQ-support.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From c20eb523fd40e08e5495cd5c615c99c25296ded3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
-Date: Fri, 23 Oct 2015 16:26:55 +0200
-Subject: [PATCH] irqchip: irq-bcm2835: Add 2836 FIQ support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
----
- drivers/irqchip/irq-bcm2835.c | 43 +++++++++++++++++++++++++++++++++--
- 1 file changed, 41 insertions(+), 2 deletions(-)
-
---- a/drivers/irqchip/irq-bcm2835.c
-+++ b/drivers/irqchip/irq-bcm2835.c
-@@ -41,8 +41,11 @@
- #include <linux/of_irq.h>
- #include <linux/irqchip.h>
- #include <linux/irqdomain.h>
-+#include <linux/mfd/syscon.h>
-+#include <linux/regmap.h>
- 
- #include <asm/exception.h>
-+#include <asm/mach/irq.h>
- 
- /* Put the bank and irq (32 bits) into the hwirq */
- #define MAKE_HWIRQ(b, n)	(((b) << 5) | (n))
-@@ -60,6 +63,9 @@
- #define BANK0_VALID_MASK	(BANK0_HWIRQ_MASK | BANK1_HWIRQ | BANK2_HWIRQ \
- 					| SHORTCUT1_MASK | SHORTCUT2_MASK)
- 
-+#undef ARM_LOCAL_GPU_INT_ROUTING
-+#define ARM_LOCAL_GPU_INT_ROUTING 0x0c
-+
- #define REG_FIQ_CONTROL		0x0c
- #define FIQ_CONTROL_ENABLE	BIT(7)
- #define REG_FIQ_ENABLE		FIQ_CONTROL_ENABLE
-@@ -86,6 +92,7 @@ struct armctrl_ic {
- 	void __iomem *enable[NR_BANKS];
- 	void __iomem *disable[NR_BANKS];
- 	struct irq_domain *domain;
-+	struct regmap *local_regmap;
- };
- 
- static struct armctrl_ic intc __read_mostly;
-@@ -119,12 +126,35 @@ static void armctrl_mask_irq(struct irq_
- 
- static void armctrl_unmask_irq(struct irq_data *d)
- {
--	if (d->hwirq >= NUMBER_IRQS)
-+	if (d->hwirq >= NUMBER_IRQS) {
-+		if (num_online_cpus() > 1) {
-+			unsigned int data;
-+			int ret;
-+
-+			if (!intc.local_regmap) {
-+				pr_err("FIQ is disabled due to missing regmap\n");
-+				return;
-+			}
-+
-+			ret = regmap_read(intc.local_regmap,
-+					  ARM_LOCAL_GPU_INT_ROUTING, &data);
-+			if (ret) {
-+				pr_err("Failed to read int routing %d\n", ret);
-+				return;
-+			}
-+
-+			data &= ~0xc;
-+			data |= (1 << 2);
-+			regmap_write(intc.local_regmap,
-+				     ARM_LOCAL_GPU_INT_ROUTING, data);
-+		}
-+
- 		writel_relaxed(REG_FIQ_ENABLE | hwirq_to_fiq(d->hwirq),
- 			       intc.base + REG_FIQ_CONTROL);
--	else
-+	} else {
- 		writel_relaxed(HWIRQ_BIT(d->hwirq),
- 			       intc.enable[HWIRQ_BANK(d->hwirq)]);
-+	}
- }
- 
- static struct irq_chip armctrl_chip = {
-@@ -215,6 +245,15 @@ static int __init armctrl_of_init(struct
- 		set_handle_irq(bcm2835_handle_irq);
- 	}
- 
-+	if (is_2836) {
-+		intc.local_regmap =
-+			syscon_regmap_lookup_by_compatible("brcm,bcm2836-arm-local");
-+		if (IS_ERR(intc.local_regmap)) {
-+			pr_err("Failed to get local register map. FIQ is disabled for cpus > 1\n");
-+			intc.local_regmap = NULL;
-+		}
-+	}
-+
- 	/* Make a duplicate irq range which is used to enable FIQ */
- 	for (b = 0; b < NR_BANKS; b++) {
- 		for (i = 0; i < bank_irqs[b]; i++) {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0089-spi-spidev-Completely-disable-the-spidev-warning.patch b/target/linux/bcm27xx/patches-6.1/950-0089-spi-spidev-Completely-disable-the-spidev-warning.patch
deleted file mode 100644
index e7323ccfb8..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0089-spi-spidev-Completely-disable-the-spidev-warning.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 5e7a21ade0c4a28de3a8ef19b0563b6dfef4980c Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Mon, 24 Jan 2022 13:41:16 +0000
-Subject: [PATCH] spi: spidev: Completely disable the spidev warning
-
-An alternative strategy would be to use "rpi,spidev" instead, but that
-would require many Raspberry Pi Device Tree changes.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- drivers/spi/spidev.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/spi/spidev.c
-+++ b/drivers/spi/spidev.c
-@@ -707,7 +707,7 @@ MODULE_DEVICE_TABLE(spi, spidev_spi_ids)
-  */
- static int spidev_of_check(struct device *dev)
- {
--	if (device_property_match_string(dev, "compatible", "spidev") < 0)
-+	if (1 || device_property_match_string(dev, "compatible", "spidev") < 0)
- 		return 0;
- 
- 	dev_err(dev, "spidev listed directly in DT is not supported\n");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0090-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch b/target/linux/bcm27xx/patches-6.1/950-0090-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch
deleted file mode 100644
index 3a534018a7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0090-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 427f7b2d3185aab815c3388a3c60b9e047ce9232 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
-Date: Sat, 3 Oct 2015 22:22:55 +0200
-Subject: [PATCH] dmaengine: bcm2835: Load driver early and support
- legacy API
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Load driver early since at least bcm2708_fb doesn't support deferred
-probing and even if it did, we don't want the video driver deferred.
-Support the legacy DMA API which is needed by bcm2708_fb.
-Don't mask out channel 2.
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
----
- drivers/dma/Kconfig       |  2 +-
- drivers/dma/bcm2835-dma.c | 26 +++++++++++++++++++++++++-
- 2 files changed, 26 insertions(+), 2 deletions(-)
-
---- a/drivers/dma/Kconfig
-+++ b/drivers/dma/Kconfig
-@@ -135,7 +135,7 @@ config BCM_SBA_RAID
- 
- config DMA_BCM2835
- 	tristate "BCM2835 DMA engine support"
--	depends on ARCH_BCM2835
-+	depends on ARCH_BCM2835 || ARCH_BCM2708 || ARCH_BCM2709
- 	select DMA_ENGINE
- 	select DMA_VIRTUAL_CHANNELS
- 
---- a/drivers/dma/bcm2835-dma.c
-+++ b/drivers/dma/bcm2835-dma.c
-@@ -25,6 +25,7 @@
- #include <linux/interrupt.h>
- #include <linux/list.h>
- #include <linux/module.h>
-+#include <linux/platform_data/dma-bcm2708.h>
- #include <linux/platform_device.h>
- #include <linux/slab.h>
- #include <linux/io.h>
-@@ -36,6 +37,7 @@
- 
- #define BCM2835_DMA_MAX_DMA_CHAN_SUPPORTED 14
- #define BCM2835_DMA_CHAN_NAME_SIZE 8
-+#define BCM2835_DMA_BULK_MASK  BIT(0)
- 
- /**
-  * struct bcm2835_dmadev - BCM2835 DMA controller
-@@ -906,6 +908,9 @@ static int bcm2835_dma_probe(struct plat
- 	base = devm_ioremap_resource(&pdev->dev, res);
- 	if (IS_ERR(base))
- 		return PTR_ERR(base);
-+	rc = bcm_dmaman_probe(pdev, base, BCM2835_DMA_BULK_MASK);
-+	if (rc)
-+		dev_err(&pdev->dev, "Failed to initialize the legacy API\n");
- 
- 	od->base = base;
- 
-@@ -951,6 +956,9 @@ static int bcm2835_dma_probe(struct plat
- 		goto err_no_dma;
- 	}
- 
-+	/* Channel 0 is used by the legacy API */
-+	chans_available &= ~BCM2835_DMA_BULK_MASK;
-+
- 	/* get irqs for each channel that we support */
- 	for (i = 0; i <= BCM2835_DMA_MAX_DMA_CHAN_SUPPORTED; i++) {
- 		/* skip masked out channels */
-@@ -1025,6 +1033,7 @@ static int bcm2835_dma_remove(struct pla
- {
- 	struct bcm2835_dmadev *od = platform_get_drvdata(pdev);
- 
-+	bcm_dmaman_remove(pdev);
- 	dma_async_device_unregister(&od->ddev);
- 	bcm2835_dma_free(od);
- 
-@@ -1040,7 +1049,22 @@ static struct platform_driver bcm2835_dm
- 	},
- };
- 
--module_platform_driver(bcm2835_dma_driver);
-+static int bcm2835_dma_init(void)
-+{
-+	return platform_driver_register(&bcm2835_dma_driver);
-+}
-+
-+static void bcm2835_dma_exit(void)
-+{
-+	platform_driver_unregister(&bcm2835_dma_driver);
-+}
-+
-+/*
-+ * Load after serial driver (arch_initcall) so we see the messages if it fails,
-+ * but before drivers (module_init) that need a DMA channel.
-+ */
-+subsys_initcall(bcm2835_dma_init);
-+module_exit(bcm2835_dma_exit);
- 
- MODULE_ALIAS("platform:bcm2835-dma");
- MODULE_DESCRIPTION("BCM2835 DMA engine driver");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0091-rtc-Add-SPI-alias-for-pcf2123-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0091-rtc-Add-SPI-alias-for-pcf2123-driver.patch
deleted file mode 100644
index 3a427005ce..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0091-rtc-Add-SPI-alias-for-pcf2123-driver.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From e4b3776e69f480246c1eaa448fbd13db3568e08d Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Wed, 15 Jun 2016 16:48:41 +0100
-Subject: [PATCH] rtc: Add SPI alias for pcf2123 driver
-
-Without this alias, Device Tree won't cause the driver
-to be loaded.
-
-See: https://github.com/raspberrypi/linux/pull/1510
----
- drivers/rtc/rtc-pcf2123.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/rtc/rtc-pcf2123.c
-+++ b/drivers/rtc/rtc-pcf2123.c
-@@ -474,3 +474,4 @@ module_spi_driver(pcf2123_driver);
- MODULE_AUTHOR("Chris Verges <chrisv@cyberswitching.com>");
- MODULE_DESCRIPTION("NXP PCF2123 RTC driver");
- MODULE_LICENSE("GPL");
-+MODULE_ALIAS("spi:rtc-pcf2123");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0092-watchdog-bcm2835-Support-setting-reboot-partition.patch b/target/linux/bcm27xx/patches-6.1/950-0092-watchdog-bcm2835-Support-setting-reboot-partition.patch
deleted file mode 100644
index 1fa6d6d75a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0092-watchdog-bcm2835-Support-setting-reboot-partition.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 94119ec772b375c3b94d83b2ff61a9d447d8083a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
-Date: Fri, 7 Oct 2016 16:50:59 +0200
-Subject: [PATCH] watchdog: bcm2835: Support setting reboot partition
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The Raspberry Pi firmware looks at the RSTS register to know which
-partition to boot from. The reboot syscall command
-LINUX_REBOOT_CMD_RESTART2 supports passing in a string argument.
-
-Add support for passing in a partition number 0..63 to boot from.
-Partition 63 is a special partiton indicating halt.
-If the partition doesn't exist, the firmware falls back to partition 0.
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
----
- drivers/watchdog/bcm2835_wdt.c | 49 +++++++++++++++++++---------------
- 1 file changed, 27 insertions(+), 22 deletions(-)
-
---- a/drivers/watchdog/bcm2835_wdt.c
-+++ b/drivers/watchdog/bcm2835_wdt.c
-@@ -32,13 +32,7 @@
- #define PM_RSTC_WRCFG_SET		0x00000030
- #define PM_RSTC_WRCFG_FULL_RESET	0x00000020
- #define PM_RSTC_RESET			0x00000102
--
--/*
-- * The Raspberry Pi firmware uses the RSTS register to know which partition
-- * to boot from. The partition value is spread into bits 0, 2, 4, 6, 8, 10.
-- * Partition 63 is a special partition used by the firmware to indicate halt.
-- */
--#define PM_RSTS_RASPBERRYPI_HALT	0x555
-+#define PM_RSTS_PARTITION_CLR          0xfffffaaa
- 
- #define SECS_TO_WDOG_TICKS(x) ((x) << 16)
- #define WDOG_TICKS_TO_SECS(x) ((x) >> 16)
-@@ -98,9 +92,24 @@ static unsigned int bcm2835_wdt_get_time
- 	return WDOG_TICKS_TO_SECS(ret & PM_WDOG_TIME_SET);
- }
- 
--static void __bcm2835_restart(struct bcm2835_wdt *wdt)
-+/*
-+ * The Raspberry Pi firmware uses the RSTS register to know which partiton
-+ * to boot from. The partiton value is spread into bits 0, 2, 4, 6, 8, 10.
-+ * Partiton 63 is a special partition used by the firmware to indicate halt.
-+ */
-+
-+static void __bcm2835_restart(struct bcm2835_wdt *wdt, u8 partition)
- {
--	u32 val;
-+	u32 val, rsts;
-+
-+	rsts = (partition & BIT(0)) | ((partition & BIT(1)) << 1) |
-+	       ((partition & BIT(2)) << 2) | ((partition & BIT(3)) << 3) |
-+	       ((partition & BIT(4)) << 4) | ((partition & BIT(5)) << 5);
-+
-+	val = readl_relaxed(wdt->base + PM_RSTS);
-+	val &= PM_RSTS_PARTITION_CLR;
-+	val |= PM_PASSWORD | rsts;
-+	writel_relaxed(val, wdt->base + PM_RSTS);
- 
- 	/* use a timeout of 10 ticks (~150us) */
- 	writel_relaxed(10 | PM_PASSWORD, wdt->base + PM_WDOG);
-@@ -118,7 +127,13 @@ static int bcm2835_restart(struct watchd
- {
- 	struct bcm2835_wdt *wdt = watchdog_get_drvdata(wdog);
- 
--	__bcm2835_restart(wdt);
-+	unsigned long long val;
-+	u8 partition = 0;
-+
-+	if (data && !kstrtoull(data, 0, &val) && val <= 63)
-+		partition = val;
-+
-+	__bcm2835_restart(wdt, partition);
- 
- 	return 0;
- }
-@@ -153,19 +168,9 @@ static struct watchdog_device bcm2835_wd
- static void bcm2835_power_off(void)
- {
- 	struct bcm2835_wdt *wdt = bcm2835_power_off_wdt;
--	u32 val;
--
--	/*
--	 * We set the watchdog hard reset bit here to distinguish this reset
--	 * from the normal (full) reset. bootcode.bin will not reboot after a
--	 * hard reset.
--	 */
--	val = readl_relaxed(wdt->base + PM_RSTS);
--	val |= PM_PASSWORD | PM_RSTS_RASPBERRYPI_HALT;
--	writel_relaxed(val, wdt->base + PM_RSTS);
- 
--	/* Continue with normal reset mechanism */
--	__bcm2835_restart(wdt);
-+	/* Partition 63 tells the firmware that this is a halt */
-+	__bcm2835_restart(wdt, 63);
- }
- 
- static int bcm2835_wdt_probe(struct platform_device *pdev)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0093-reboot-Use-power-off-rather-than-busy-spinning-when-.patch b/target/linux/bcm27xx/patches-6.1/950-0093-reboot-Use-power-off-rather-than-busy-spinning-when-.patch
deleted file mode 100644
index d29fffbfe0..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0093-reboot-Use-power-off-rather-than-busy-spinning-when-.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 999eb8d0a8bc72e067a6abccec7db6dd72c9c531 Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Tue, 5 Apr 2016 19:40:12 +0100
-Subject: [PATCH] reboot: Use power off rather than busy spinning when
- halt is requested
-
----
- arch/arm/kernel/reboot.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
---- a/arch/arm/kernel/reboot.c
-+++ b/arch/arm/kernel/reboot.c
-@@ -102,9 +102,7 @@ void machine_shutdown(void)
-  */
- void machine_halt(void)
- {
--	local_irq_disable();
--	smp_send_stop();
--	while (1);
-+	machine_power_off();
- }
- 
- /*
diff --git a/target/linux/bcm27xx/patches-6.1/950-0094-bcm-Make-RASPBERRYPI_POWER-depend-on-PM.patch b/target/linux/bcm27xx/patches-6.1/950-0094-bcm-Make-RASPBERRYPI_POWER-depend-on-PM.patch
deleted file mode 100644
index 2c7dfa44de..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0094-bcm-Make-RASPBERRYPI_POWER-depend-on-PM.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0ae6d14764389f409facd3a7493d70c4de63a82c Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Wed, 9 Nov 2016 13:02:52 +0000
-Subject: [PATCH] bcm: Make RASPBERRYPI_POWER depend on PM
-
----
- drivers/soc/bcm/Kconfig | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/soc/bcm/Kconfig
-+++ b/drivers/soc/bcm/Kconfig
-@@ -17,6 +17,7 @@ config RASPBERRYPI_POWER
- 	bool "Raspberry Pi power domain driver"
- 	depends on ARCH_BCM2835 || (COMPILE_TEST && OF)
- 	depends on RASPBERRYPI_FIRMWARE=y
-+	depends on PM
- 	select PM_GENERIC_DOMAINS if PM
- 	help
- 	  This enables support for the RPi power domains which can be enabled
diff --git a/target/linux/bcm27xx/patches-6.1/950-0095-bcm2835-rng-Avoid-initialising-if-already-enabled.patch b/target/linux/bcm27xx/patches-6.1/950-0095-bcm2835-rng-Avoid-initialising-if-already-enabled.patch
deleted file mode 100644
index e0f7d9a366..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0095-bcm2835-rng-Avoid-initialising-if-already-enabled.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5d37f1ed8bf4654f48c9e4b76021ee3813d18ac1 Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Tue, 6 Dec 2016 17:05:39 +0000
-Subject: [PATCH] bcm2835-rng: Avoid initialising if already enabled
-
-Avoids the 0x40000 cycles of warmup again if firmware has already used it
----
- drivers/char/hw_random/bcm2835-rng.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/drivers/char/hw_random/bcm2835-rng.c
-+++ b/drivers/char/hw_random/bcm2835-rng.c
-@@ -106,8 +106,10 @@ static int bcm2835_rng_init(struct hwrng
- 	}
- 
- 	/* set warm-up count & enable */
--	rng_writel(priv, RNG_WARMUP_COUNT, RNG_STATUS);
--	rng_writel(priv, RNG_RBGEN, RNG_CTRL);
-+	if (!(rng_readl(priv, RNG_CTRL) & RNG_RBGEN)) {
-+		rng_writel(priv, RNG_WARMUP_COUNT, RNG_STATUS);
-+		rng_writel(priv, RNG_RBGEN, RNG_CTRL);
-+	}
- 
- 	return ret;
- }
diff --git a/target/linux/bcm27xx/patches-6.1/950-0096-sound-Demote-deferral-errors-to-INFO-level.patch b/target/linux/bcm27xx/patches-6.1/950-0096-sound-Demote-deferral-errors-to-INFO-level.patch
deleted file mode 100644
index ce0c167b80..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0096-sound-Demote-deferral-errors-to-INFO-level.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b43bf8ecf329669ce3ae032c0332bc5f6e3a4701 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Thu, 9 Feb 2017 14:36:44 +0000
-Subject: [PATCH] sound: Demote deferral errors to INFO level
-
-At present there is no mechanism to specify driver load order,
-which can lead to deferrals and repeated retries until successful.
-Since this situation is expected, reduce the dmesg level to
-INFO and mention that the operation will be retried.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- sound/soc/soc-core.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/sound/soc/soc-core.c
-+++ b/sound/soc/soc-core.c
-@@ -995,7 +995,7 @@ int snd_soc_add_pcm_runtime(struct snd_s
- 	for_each_link_cpus(dai_link, i, cpu) {
- 		asoc_rtd_to_cpu(rtd, i) = snd_soc_find_dai(cpu);
- 		if (!asoc_rtd_to_cpu(rtd, i)) {
--			dev_info(card->dev, "ASoC: CPU DAI %s not registered\n",
-+			dev_info(card->dev, "ASoC: CPU DAI %s not registered - will retry\n",
- 				 cpu->dai_name);
- 			goto _err_defer;
- 		}
-@@ -1006,7 +1006,7 @@ int snd_soc_add_pcm_runtime(struct snd_s
- 	for_each_link_codecs(dai_link, i, codec) {
- 		asoc_rtd_to_codec(rtd, i) = snd_soc_find_dai(codec);
- 		if (!asoc_rtd_to_codec(rtd, i)) {
--			dev_info(card->dev, "ASoC: CODEC DAI %s not registered\n",
-+			dev_info(card->dev, "ASoC: CODEC DAI %s not registered- will retry\n",
- 				 codec->dai_name);
- 			goto _err_defer;
- 		}
diff --git a/target/linux/bcm27xx/patches-6.1/950-0097-Update-vfpmodule.c.patch b/target/linux/bcm27xx/patches-6.1/950-0097-Update-vfpmodule.c.patch
deleted file mode 100644
index 1976747280..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0097-Update-vfpmodule.c.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From aada9a494eef7ff6913d37db3bd9fb3ff82828db Mon Sep 17 00:00:00 2001
-From: Claggy3 <stephen.maclagan@hotmail.com>
-Date: Sat, 11 Feb 2017 14:00:30 +0000
-Subject: [PATCH] Update vfpmodule.c
-
-Christopher Alexander Tobias Schulze - May 2, 2015, 11:57 a.m.
-This patch fixes a problem with VFP state save and restore related
-to exception handling (panic with message "BUG: unsupported FP
-instruction in kernel mode") present on VFP11 floating point units
-(as used with ARM1176JZF-S CPUs, e.g. on first generation Raspberry
-Pi boards). This patch was developed and discussed on
-
-   https://github.com/raspberrypi/linux/issues/859
-
-A precondition to see the crashes is that floating point exception
-traps are enabled. In this case, the VFP11 might determine that a FPU
-operation needs to trap at a point in time when it is not possible to
-signal this to the ARM11 core any more. The VFP11 will then set the
-FPEXC.EX bit and store the trapped opcode in FPINST. (In some cases,
-a second opcode might have been accepted by the VFP11 before the
-exception was detected and could be reported to the ARM11 - in this
-case, the VFP11 also sets FPEXC.FP2V and stores the second opcode in
-FPINST2.)
-
-If FPEXC.EX is set, the VFP11 will "bounce" the next FPU opcode issued
-by the ARM11 CPU, which will be seen by the ARM11 as an undefined opcode
-trap. The VFP support code examines the FPEXC.EX and FPEXC.FP2V bits
-to decide what actions to take, i.e., whether to emulate the opcodes
-found in FPINST and FPINST2, and whether to retry the bounced instruction.
-
-If a user space application has left the VFP11 in this "pending trap"
-state, the next FPU opcode issued to the VFP11 might actually be the
-VSTMIA operation vfp_save_state() uses to store the FPU registers
-to memory (in our test cases, when building the signal stack frame).
-In this case, the kernel crashes as described above.
-
-This patch fixes the problem by making sure that vfp_save_state() is
-always entered with FPEXC.EX cleared. (The current value of FPEXC has
-already been saved, so this does not corrupt the context. Clearing
-FPEXC.EX has no effects on FPINST or FPINST2. Also note that many
-callers already modify FPEXC by setting FPEXC.EN before invoking
-vfp_save_state().)
-
-This patch also addresses a second problem related to FPEXC.EX: After
-returning from signal handling, the kernel reloads the VFP context
-from the user mode stack. However, the current code explicitly clears
-both FPEXC.EX and FPEXC.FP2V during reload. As VFP11 requires these
-bits to be preserved, this patch disables clearing them for VFP
-implementations belonging to architecture 1. There should be no
-negative side effects: the user can set both bits by executing FPU
-opcodes anyway, and while user code may now place arbitrary values
-into FPINST and FPINST2 (e.g., non-VFP ARM opcodes) the VFP support
-code knows which instructions can be emulated, and rejects other
-opcodes with "unhandled bounce" messages, so there should be no
-security impact from allowing reloading FPEXC.EX and FPEXC.FP2V.
-
-Signed-off-by: Christopher Alexander Tobias Schulze <cat.schulze@alice-dsl.net>
----
- arch/arm/vfp/vfpmodule.c | 25 +++++++++++++++++++------
- 1 file changed, 19 insertions(+), 6 deletions(-)
-
---- a/arch/arm/vfp/vfpmodule.c
-+++ b/arch/arm/vfp/vfpmodule.c
-@@ -176,8 +176,11 @@ static int vfp_notifier(struct notifier_
- 		 * case the thread migrates to a different CPU. The
- 		 * restoring is done lazily.
- 		 */
--		if ((fpexc & FPEXC_EN) && vfp_current_hw_state[cpu])
-+		if ((fpexc & FPEXC_EN) && vfp_current_hw_state[cpu]) {
-+			/* vfp_save_state oopses on VFP11 if EX bit set */
-+			fmxr(FPEXC, fpexc & ~FPEXC_EX);
- 			vfp_save_state(vfp_current_hw_state[cpu], fpexc);
-+		}
- #endif
- 
- 		/*
-@@ -454,13 +457,16 @@ static int vfp_pm_suspend(void)
- 	/* if vfp is on, then save state for resumption */
- 	if (fpexc & FPEXC_EN) {
- 		pr_debug("%s: saving vfp state\n", __func__);
-+		/* vfp_save_state oopses on VFP11 if EX bit set */
-+		fmxr(FPEXC, fpexc & ~FPEXC_EX);
- 		vfp_save_state(&ti->vfpstate, fpexc);
- 
- 		/* disable, just in case */
- 		fmxr(FPEXC, fmrx(FPEXC) & ~FPEXC_EN);
- 	} else if (vfp_current_hw_state[ti->cpu]) {
- #ifndef CONFIG_SMP
--		fmxr(FPEXC, fpexc | FPEXC_EN);
-+		/* vfp_save_state oopses on VFP11 if EX bit set */
-+		fmxr(FPEXC, (fpexc & ~FPEXC_EX) | FPEXC_EN);
- 		vfp_save_state(vfp_current_hw_state[ti->cpu], fpexc);
- 		fmxr(FPEXC, fpexc);
- #endif
-@@ -523,7 +529,8 @@ void vfp_sync_hwstate(struct thread_info
- 		/*
- 		 * Save the last VFP state on this CPU.
- 		 */
--		fmxr(FPEXC, fpexc | FPEXC_EN);
-+		/* vfp_save_state oopses on VFP11 if EX bit set */
-+		fmxr(FPEXC, (fpexc & ~FPEXC_EX) | FPEXC_EN);
- 		vfp_save_state(&thread->vfpstate, fpexc | FPEXC_EN);
- 		fmxr(FPEXC, fpexc);
- 	}
-@@ -589,6 +596,7 @@ int vfp_restore_user_hwstate(struct user
- 	struct thread_info *thread = current_thread_info();
- 	struct vfp_hard_struct *hwstate = &thread->vfpstate.hard;
- 	unsigned long fpexc;
-+	u32 fpsid = fmrx(FPSID);
- 
- 	/* Disable VFP to avoid corrupting the new thread state. */
- 	vfp_flush_hwstate(thread);
-@@ -611,8 +619,12 @@ int vfp_restore_user_hwstate(struct user
- 	/* Ensure the VFP is enabled. */
- 	fpexc |= FPEXC_EN;
- 
--	/* Ensure FPINST2 is invalid and the exception flag is cleared. */
--	fpexc &= ~(FPEXC_EX | FPEXC_FP2V);
-+	/* Mask FPXEC_EX and FPEXC_FP2V if not required by VFP arch */
-+	if ((fpsid & FPSID_ARCH_MASK) != (1 << FPSID_ARCH_BIT)) {
-+		/* Ensure FPINST2 is invalid and the exception flag is cleared. */
-+		fpexc &= ~(FPEXC_EX | FPEXC_FP2V);
-+	}
-+
- 	hwstate->fpexc = fpexc;
- 
- 	hwstate->fpinst = ufp_exc->fpinst;
-@@ -726,7 +738,8 @@ void kernel_neon_begin(void)
- 	cpu = get_cpu();
- 
- 	fpexc = fmrx(FPEXC) | FPEXC_EN;
--	fmxr(FPEXC, fpexc);
-+	/* vfp_save_state oopses on VFP11 if EX bit set */
-+	fmxr(FPEXC, fpexc & ~FPEXC_EX);
- 
- 	/*
- 	 * Save the userland NEON/VFP state. Under UP,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0098-i2c-bcm2835-Add-debug-support.patch b/target/linux/bcm27xx/patches-6.1/950-0098-i2c-bcm2835-Add-debug-support.patch
deleted file mode 100644
index 79ea24b421..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0098-i2c-bcm2835-Add-debug-support.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-From 1e5524c80d2ff685951224ba3989b38dc4c80fa1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
-Date: Tue, 1 Nov 2016 15:15:41 +0100
-Subject: [PATCH] i2c: bcm2835: Add debug support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This adds a debug module parameter to aid in debugging transfer issues
-by printing info to the kernel log. When enabled, status values are
-collected in the interrupt routine and msg info in
-bcm2835_i2c_start_transfer(). This is done in a way that tries to avoid
-affecting timing. Having printk in the isr can mask issues.
-
-debug values (additive):
-1: Print info on error
-2: Print info on all transfers
-3: Print messages before transfer is started
-
-The value can be changed at runtime:
-/sys/module/i2c_bcm2835/parameters/debug
-
-Example output, debug=3:
-[  747.114448] bcm2835_i2c_xfer: msg(1/2) write addr=0x54, len=2 flags= [i2c1]
-[  747.114463] bcm2835_i2c_xfer: msg(2/2) read addr=0x54, len=32 flags= [i2c1]
-[  747.117809] start_transfer: msg(1/2) write addr=0x54, len=2 flags= [i2c1]
-[  747.117825] isr: remain=2, status=0x30000055 : TA TXW TXD TXE  [i2c1]
-[  747.117839] start_transfer: msg(2/2) read addr=0x54, len=32 flags= [i2c1]
-[  747.117849] isr: remain=32, status=0xd0000039 : TA RXR TXD RXD  [i2c1]
-[  747.117861] isr: remain=20, status=0xd0000039 : TA RXR TXD RXD  [i2c1]
-[  747.117870] isr: remain=8, status=0x32 : DONE TXD RXD  [i2c1]
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
----
- drivers/i2c/busses/i2c-bcm2835.c | 99 +++++++++++++++++++++++++++++++-
- 1 file changed, 98 insertions(+), 1 deletion(-)
-
---- a/drivers/i2c/busses/i2c-bcm2835.c
-+++ b/drivers/i2c/busses/i2c-bcm2835.c
-@@ -56,6 +56,18 @@
- #define BCM2835_I2C_CDIV_MIN	0x0002
- #define BCM2835_I2C_CDIV_MAX	0xFFFE
- 
-+static unsigned int debug;
-+module_param(debug, uint, 0644);
-+MODULE_PARM_DESC(debug, "1=err, 2=isr, 3=xfer");
-+
-+#define BCM2835_DEBUG_MAX	512
-+struct bcm2835_debug {
-+	struct i2c_msg *msg;
-+	int msg_idx;
-+	size_t remain;
-+	u32 status;
-+};
-+
- struct bcm2835_i2c_dev {
- 	struct device *dev;
- 	void __iomem *regs;
-@@ -68,8 +80,78 @@ struct bcm2835_i2c_dev {
- 	u32 msg_err;
- 	u8 *msg_buf;
- 	size_t msg_buf_remaining;
-+	struct bcm2835_debug debug[BCM2835_DEBUG_MAX];
-+	unsigned int debug_num;
-+	unsigned int debug_num_msgs;
- };
- 
-+static inline void bcm2835_debug_add(struct bcm2835_i2c_dev *i2c_dev, u32 s)
-+{
-+	if (!i2c_dev->debug_num_msgs || i2c_dev->debug_num >= BCM2835_DEBUG_MAX)
-+		return;
-+
-+	i2c_dev->debug[i2c_dev->debug_num].msg = i2c_dev->curr_msg;
-+	i2c_dev->debug[i2c_dev->debug_num].msg_idx =
-+				i2c_dev->debug_num_msgs - i2c_dev->num_msgs;
-+	i2c_dev->debug[i2c_dev->debug_num].remain = i2c_dev->msg_buf_remaining;
-+	i2c_dev->debug[i2c_dev->debug_num].status = s;
-+	i2c_dev->debug_num++;
-+}
-+
-+static void bcm2835_debug_print_status(struct bcm2835_i2c_dev *i2c_dev,
-+				       struct bcm2835_debug *d)
-+{
-+	u32 s = d->status;
-+
-+	pr_info("isr: remain=%zu, status=0x%x : %s%s%s%s%s%s%s%s%s%s [i2c%d]\n",
-+		d->remain, s,
-+		s & BCM2835_I2C_S_TA ? "TA " : "",
-+		s & BCM2835_I2C_S_DONE ? "DONE " : "",
-+		s & BCM2835_I2C_S_TXW ? "TXW " : "",
-+		s & BCM2835_I2C_S_RXR ? "RXR " : "",
-+		s & BCM2835_I2C_S_TXD ? "TXD " : "",
-+		s & BCM2835_I2C_S_RXD ? "RXD " : "",
-+		s & BCM2835_I2C_S_TXE ? "TXE " : "",
-+		s & BCM2835_I2C_S_RXF ? "RXF " : "",
-+		s & BCM2835_I2C_S_ERR ? "ERR " : "",
-+		s & BCM2835_I2C_S_CLKT ? "CLKT " : "",
-+		i2c_dev->adapter.nr);
-+}
-+
-+static void bcm2835_debug_print_msg(struct bcm2835_i2c_dev *i2c_dev,
-+				    struct i2c_msg *msg, int i, int total,
-+				    const char *fname)
-+{
-+	pr_info("%s: msg(%d/%d) %s addr=0x%02x, len=%u flags=%s%s%s%s%s%s%s [i2c%d]\n",
-+		fname, i, total,
-+		msg->flags & I2C_M_RD ? "read" : "write", msg->addr, msg->len,
-+		msg->flags & I2C_M_TEN ? "TEN" : "",
-+		msg->flags & I2C_M_RECV_LEN ? "RECV_LEN" : "",
-+		msg->flags & I2C_M_NO_RD_ACK ? "NO_RD_ACK" : "",
-+		msg->flags & I2C_M_IGNORE_NAK ? "IGNORE_NAK" : "",
-+		msg->flags & I2C_M_REV_DIR_ADDR ? "REV_DIR_ADDR" : "",
-+		msg->flags & I2C_M_NOSTART ? "NOSTART" : "",
-+		msg->flags & I2C_M_STOP ? "STOP" : "",
-+		i2c_dev->adapter.nr);
-+}
-+
-+static void bcm2835_debug_print(struct bcm2835_i2c_dev *i2c_dev)
-+{
-+	struct bcm2835_debug *d;
-+	unsigned int i;
-+
-+	for (i = 0; i < i2c_dev->debug_num; i++) {
-+		d = &i2c_dev->debug[i];
-+		if (d->status == ~0)
-+			bcm2835_debug_print_msg(i2c_dev, d->msg, d->msg_idx,
-+				i2c_dev->debug_num_msgs, "start_transfer");
-+		else
-+			bcm2835_debug_print_status(i2c_dev, d);
-+	}
-+	if (i2c_dev->debug_num >= BCM2835_DEBUG_MAX)
-+		pr_info("BCM2835_DEBUG_MAX reached\n");
-+}
-+
- static inline void bcm2835_i2c_writel(struct bcm2835_i2c_dev *i2c_dev,
- 				      u32 reg, u32 val)
- {
-@@ -257,6 +339,7 @@ static void bcm2835_i2c_start_transfer(s
- 	bcm2835_i2c_writel(i2c_dev, BCM2835_I2C_A, msg->addr);
- 	bcm2835_i2c_writel(i2c_dev, BCM2835_I2C_DLEN, msg->len);
- 	bcm2835_i2c_writel(i2c_dev, BCM2835_I2C_C, c);
-+	bcm2835_debug_add(i2c_dev, ~0);
- }
- 
- static void bcm2835_i2c_finish_transfer(struct bcm2835_i2c_dev *i2c_dev)
-@@ -283,6 +366,7 @@ static irqreturn_t bcm2835_i2c_isr(int t
- 	u32 val, err;
- 
- 	val = bcm2835_i2c_readl(i2c_dev, BCM2835_I2C_S);
-+	bcm2835_debug_add(i2c_dev, val);
- 
- 	err = val & (BCM2835_I2C_S_CLKT | BCM2835_I2C_S_ERR);
- 	if (err) {
-@@ -349,6 +433,13 @@ static int bcm2835_i2c_xfer(struct i2c_a
- 	unsigned long time_left;
- 	int i;
- 
-+	if (debug)
-+		i2c_dev->debug_num_msgs = num;
-+
-+	if (debug > 2)
-+		for (i = 0; i < num; i++)
-+			bcm2835_debug_print_msg(i2c_dev, &msgs[i], i + 1, num, __func__);
-+
- 	for (i = 0; i < (num - 1); i++)
- 		if (msgs[i].flags & I2C_M_RD) {
- 			dev_warn_once(i2c_dev->dev,
-@@ -367,6 +458,10 @@ static int bcm2835_i2c_xfer(struct i2c_a
- 
- 	bcm2835_i2c_finish_transfer(i2c_dev);
- 
-+	if (debug > 1 || (debug && (!time_left || i2c_dev->msg_err)))
-+		bcm2835_debug_print(i2c_dev);
-+	i2c_dev->debug_num_msgs = 0;
-+	i2c_dev->debug_num = 0;
- 	if (!time_left) {
- 		bcm2835_i2c_writel(i2c_dev, BCM2835_I2C_C,
- 				   BCM2835_I2C_C_CLEAR);
-@@ -377,7 +472,9 @@ static int bcm2835_i2c_xfer(struct i2c_a
- 	if (!i2c_dev->msg_err)
- 		return num;
- 
--	dev_dbg(i2c_dev->dev, "i2c transfer failed: %x\n", i2c_dev->msg_err);
-+	if (debug)
-+		dev_err(i2c_dev->dev, "i2c transfer failed: %x\n",
-+			i2c_dev->msg_err);
- 
- 	if (i2c_dev->msg_err & BCM2835_I2C_S_ERR)
- 		return -EREMOTEIO;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0099-irqchip-irq-bcm2836-Remove-regmap-and-syscon-use.patch b/target/linux/bcm27xx/patches-6.1/950-0099-irqchip-irq-bcm2836-Remove-regmap-and-syscon-use.patch
deleted file mode 100644
index ea63aafffb..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0099-irqchip-irq-bcm2836-Remove-regmap-and-syscon-use.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 179240b8f8d928abe71dbff54e4f88ef76fc5684 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Tue, 23 Jan 2018 16:52:45 +0000
-Subject: [PATCH] irqchip: irq-bcm2836: Remove regmap and syscon use
-
-The syscon node defines a register range that duplicates that used by
-the local_intc node on bcm2836/7. Since irq-bcm2835 and irq-bcm2836 are
-built in and always present together (both drivers are enabled by
-CONFIG_ARCH_BCM2835), it is possible to replace the syscon usage with a
-global variable that simplifies the code. Doing so does lose the
-locking provided by regmap, but as only one side is using the regmap
-interface (irq-bcm2835 uses readl and write) there is no loss of
-atomicity.
-
-See: https://github.com/raspberrypi/firmware/issues/926
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- drivers/irqchip/irq-bcm2835.c | 32 ++++++++++++--------------------
- drivers/irqchip/irq-bcm2836.c |  5 +++++
- 2 files changed, 17 insertions(+), 20 deletions(-)
-
---- a/drivers/irqchip/irq-bcm2835.c
-+++ b/drivers/irqchip/irq-bcm2835.c
-@@ -41,8 +41,6 @@
- #include <linux/of_irq.h>
- #include <linux/irqchip.h>
- #include <linux/irqdomain.h>
--#include <linux/mfd/syscon.h>
--#include <linux/regmap.h>
- 
- #include <asm/exception.h>
- #include <asm/mach/irq.h>
-@@ -92,7 +90,7 @@ struct armctrl_ic {
- 	void __iomem *enable[NR_BANKS];
- 	void __iomem *disable[NR_BANKS];
- 	struct irq_domain *domain;
--	struct regmap *local_regmap;
-+	void __iomem *local_base;
- };
- 
- static struct armctrl_ic intc __read_mostly;
-@@ -129,24 +127,20 @@ static void armctrl_unmask_irq(struct ir
- 	if (d->hwirq >= NUMBER_IRQS) {
- 		if (num_online_cpus() > 1) {
- 			unsigned int data;
--			int ret;
- 
--			if (!intc.local_regmap) {
--				pr_err("FIQ is disabled due to missing regmap\n");
-+			if (!intc.local_base) {
-+				pr_err("FIQ is disabled due to missing arm_local_intc\n");
- 				return;
- 			}
- 
--			ret = regmap_read(intc.local_regmap,
--					  ARM_LOCAL_GPU_INT_ROUTING, &data);
--			if (ret) {
--				pr_err("Failed to read int routing %d\n", ret);
--				return;
--			}
-+			data = readl_relaxed(intc.local_base +
-+					     ARM_LOCAL_GPU_INT_ROUTING);
- 
- 			data &= ~0xc;
- 			data |= (1 << 2);
--			regmap_write(intc.local_regmap,
--				     ARM_LOCAL_GPU_INT_ROUTING, data);
-+			writel_relaxed(data,
-+				       intc.local_base +
-+				       ARM_LOCAL_GPU_INT_ROUTING);
- 		}
- 
- 		writel_relaxed(REG_FIQ_ENABLE | hwirq_to_fiq(d->hwirq),
-@@ -246,12 +240,10 @@ static int __init armctrl_of_init(struct
- 	}
- 
- 	if (is_2836) {
--		intc.local_regmap =
--			syscon_regmap_lookup_by_compatible("brcm,bcm2836-arm-local");
--		if (IS_ERR(intc.local_regmap)) {
--			pr_err("Failed to get local register map. FIQ is disabled for cpus > 1\n");
--			intc.local_regmap = NULL;
--		}
-+		extern void __iomem * __attribute__((weak)) arm_local_intc;
-+		intc.local_base = arm_local_intc;
-+		if (!intc.local_base)
-+			pr_err("Failed to get local intc base. FIQ is disabled for cpus > 1\n");
- 	}
- 
- 	/* Make a duplicate irq range which is used to enable FIQ */
---- a/drivers/irqchip/irq-bcm2836.c
-+++ b/drivers/irqchip/irq-bcm2836.c
-@@ -22,6 +22,9 @@ struct bcm2836_arm_irqchip_intc {
- 
- static struct bcm2836_arm_irqchip_intc intc  __read_mostly;
- 
-+void __iomem *arm_local_intc;
-+EXPORT_SYMBOL_GPL(arm_local_intc);
-+
- static void bcm2836_arm_irqchip_mask_per_cpu_irq(unsigned int reg_offset,
- 						 unsigned int bit,
- 						 int cpu)
-@@ -323,6 +326,8 @@ static int __init bcm2836_arm_irqchip_l1
- 		panic("%pOF: unable to map local interrupt registers\n", node);
- 	}
- 
-+	arm_local_intc = intc.base;
-+
- 	bcm2835_init_local_timer_frequency();
- 
- 	intc.domain = irq_domain_add_linear(node, LAST_IRQ + 1,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0100-lan78xx-Enable-LEDs-and-auto-negotiation.patch b/target/linux/bcm27xx/patches-6.1/950-0100-lan78xx-Enable-LEDs-and-auto-negotiation.patch
deleted file mode 100644
index b0c577587a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0100-lan78xx-Enable-LEDs-and-auto-negotiation.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 06d4e2950cc7dd561975ec6888af14aefc7332d4 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Tue, 17 Oct 2017 15:04:29 +0100
-Subject: [PATCH] lan78xx: Enable LEDs and auto-negotiation
-
-For applications of the LAN78xx that don't have valid programmed
-EEPROMs or OTPs, enabling both LEDs and auto-negotiation by default
-seems reasonable.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- drivers/net/usb/lan78xx.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
---- a/drivers/net/usb/lan78xx.c
-+++ b/drivers/net/usb/lan78xx.c
-@@ -2883,6 +2883,11 @@ static int lan78xx_reset(struct lan78xx_
- 	int ret;
- 	u32 buf;
- 	u8 sig;
-+	bool has_eeprom;
-+	bool has_otp;
-+
-+	has_eeprom = !lan78xx_read_eeprom(dev, 0, 0, NULL);
-+	has_otp = !lan78xx_read_otp(dev, 0, 0, NULL);
- 
- 	ret = lan78xx_read_reg(dev, HW_CFG, &buf);
- 	if (ret < 0)
-@@ -2947,6 +2952,10 @@ static int lan78xx_reset(struct lan78xx_
- 
- 	buf |= HW_CFG_MEF_;
- 
-+	/* If no valid EEPROM and no valid OTP, enable the LEDs by default */
-+	if (!has_eeprom && !has_otp)
-+	    buf |= HW_CFG_LED0_EN_ | HW_CFG_LED1_EN_;
-+
- 	ret = lan78xx_write_reg(dev, HW_CFG, buf);
- 	if (ret < 0)
- 		return ret;
-@@ -3046,6 +3055,9 @@ static int lan78xx_reset(struct lan78xx_
- 			buf |= MAC_CR_AUTO_DUPLEX_ | MAC_CR_AUTO_SPEED_;
- 		}
- 	}
-+	/* If no valid EEPROM and no valid OTP, enable AUTO negotiation */
-+	if (!has_eeprom && !has_otp)
-+	    buf |= MAC_CR_AUTO_DUPLEX_ | MAC_CR_AUTO_SPEED_;
- 	ret = lan78xx_write_reg(dev, MAC_CR, buf);
- 	if (ret < 0)
- 		return ret;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0101-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch b/target/linux/bcm27xx/patches-6.1/950-0101-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch
deleted file mode 100644
index 8a351aebe3..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0101-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 29a82b892694e27f1537a84a0d1dfa163dd51af8 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Fri, 29 Sep 2017 10:32:19 +0100
-Subject: [PATCH] amba_pl011: Insert mb() for correct FIFO handling
-
-The pl011 register accessor functions use the _relaxed versions of the
-standard readl() and writel() functions, meaning that there are no
-automatic memory barriers. When polling a FIFO status register to check
-for fullness, it is necessary to ensure that any outstanding writes have
-completed; otherwise the flags are effectively stale, making it possible
-that the next write is to a full FIFO.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- drivers/tty/serial/amba-pl011.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/tty/serial/amba-pl011.c
-+++ b/drivers/tty/serial/amba-pl011.c
-@@ -1456,6 +1456,7 @@ static bool pl011_tx_char(struct uart_am
- 		return false; /* unable to transmit character */
- 
- 	pl011_write(c, uap, REG_DR);
-+	mb();
- 	uap->port.icount.tx++;
- 
- 	return true;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0102-amba_pl011-Add-cts-event-workaround-DT-property.patch b/target/linux/bcm27xx/patches-6.1/950-0102-amba_pl011-Add-cts-event-workaround-DT-property.patch
deleted file mode 100644
index 25386a174c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0102-amba_pl011-Add-cts-event-workaround-DT-property.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 4864acae00c88dc62956bf4a0bb369cf1989314c Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Fri, 29 Sep 2017 10:32:19 +0100
-Subject: [PATCH] amba_pl011: Add cts-event-workaround DT property
-
-The BCM2835 PL011 implementation seems to have a bug that can lead to a
-transmission lockup if CTS changes frequently. A workaround was added to
-the driver with a vendor-specific flag to enable it, but this flag is
-currently not set for ARM implementations.
-
-Add a "cts-event-workaround" property to Pi DTBs and use the presence
-of that property to force the flag to be enabled in the driver.
-
-See: https://github.com/raspberrypi/linux/issues/1280
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- Documentation/devicetree/bindings/serial/pl011.yaml | 6 ++++++
- drivers/tty/serial/amba-pl011.c                     | 5 +++++
- 2 files changed, 11 insertions(+)
-
---- a/Documentation/devicetree/bindings/serial/pl011.yaml
-+++ b/Documentation/devicetree/bindings/serial/pl011.yaml
-@@ -100,6 +100,12 @@ properties:
-       on the device.
-     enum: [1, 4]
- 
-+  cts-event-workaround:
-+    description:
-+      Enables the (otherwise vendor-specific) workaround for the
-+      CTS-induced TX lockup.
-+    type: boolean
-+
- required:
-   - compatible
-   - reg
---- a/drivers/tty/serial/amba-pl011.c
-+++ b/drivers/tty/serial/amba-pl011.c
-@@ -2801,6 +2801,11 @@ static int pl011_probe(struct amba_devic
- 	if (IS_ERR(uap->clk))
- 		return PTR_ERR(uap->clk);
- 
-+	if (of_property_read_bool(dev->dev.of_node, "cts-event-workaround")) {
-+	    vendor->cts_event_workaround = true;
-+	    dev_info(&dev->dev, "cts_event_workaround enabled\n");
-+	}
-+
- 	uap->reg_offset = vendor->reg_offset;
- 	uap->vendor = vendor;
- 	uap->fifosize = vendor->get_fifosize(dev);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0103-tty-amba-pl011-Avoid-rare-write-when-full-error.patch b/target/linux/bcm27xx/patches-6.1/950-0103-tty-amba-pl011-Avoid-rare-write-when-full-error.patch
deleted file mode 100644
index 8a0a835d27..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0103-tty-amba-pl011-Avoid-rare-write-when-full-error.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From d3a78e76b3ff06c53fb85f47be90fdd0b8314134 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Wed, 29 Jan 2020 09:35:19 +0000
-Subject: [PATCH] tty: amba-pl011: Avoid rare write-when-full error
-
-Under some circumstances on BCM283x processors data loss can be
-observed - a single byte missing from the TX output stream. These bytes
-are always the last byte of a batch of 8 written from pl011_tx_chars
-when from_irq is true, meaning that the FIFO full flag is not checked
-before writing.
-
-The transmit optimisation relies on the FIFO being half-empty when the
-TX interrupt is raised. Instrumenting the driver further showed that
-the failure case correlated with the TX FIFO full flag being set at the
-point where the last byte was written to the data register, which
-explains the data loss but not how the FIFO appeared to be prematurely
-full. A possible explanation is that a FIFO write was in flight at the
-time the interrupt was raised, but as yet there is no hypothesis as to
-how this might occur.
-
-In the absence of a clear understanding of the failure mechanism, avoid
-the problem by checking the FIFO levels before writing the last byte of
-the group, which will have minimal performance impact.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- drivers/tty/serial/amba-pl011.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/tty/serial/amba-pl011.c
-+++ b/drivers/tty/serial/amba-pl011.c
-@@ -1487,6 +1487,10 @@ static bool pl011_tx_chars(struct uart_a
- 		if (likely(from_irq) && count-- == 0)
- 			break;
- 
-+		if (likely(from_irq) && count == 0 &&
-+		    pl011_read(uap, REG_FR) & UART01x_FR_TXFF)
-+			break;
-+
- 		if (!pl011_tx_char(uap, xmit->buf[xmit->tail], from_irq))
- 			break;
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0104-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch b/target/linux/bcm27xx/patches-6.1/950-0104-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch
deleted file mode 100644
index 5ef7bf624b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0104-pinctrl-bcm2835-Set-base-to-0-give-expected-gpio-num.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 6a7b06ce653de770fc66d34399e57a32b7734bac Mon Sep 17 00:00:00 2001
-From: notro <notro@tronnes.org>
-Date: Thu, 10 Jul 2014 13:59:47 +0200
-Subject: [PATCH] pinctrl-bcm2835: Set base to 0 give expected gpio
- numbering
-
-Signed-off-by: Noralf Tronnes <notro@tronnes.org>
-
-SQUASH: pinctrl: bcm2835: Set base for bcm2711 GPIO to 0
-
-Without this patch GPIOs don't seem to work properly, primarily
-noticeable as broken LEDs.
-
-Squash with "pinctrl-bcm2835: Set base to 0 give expected gpio numbering"
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/pinctrl/bcm/pinctrl-bcm2835.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
-+++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
-@@ -391,7 +391,7 @@ static const struct gpio_chip bcm2835_gp
- 	.get = bcm2835_gpio_get,
- 	.set = bcm2835_gpio_set,
- 	.set_config = gpiochip_generic_config,
--	.base = -1,
-+	.base = 0,
- 	.ngpio = BCM2835_NUM_GPIOS,
- 	.can_sleep = false,
- 	.of_gpio_ranges_fallback = bcm2835_of_gpio_ranges_fallback,
-@@ -408,7 +408,7 @@ static const struct gpio_chip bcm2711_gp
- 	.get = bcm2835_gpio_get,
- 	.set = bcm2835_gpio_set,
- 	.set_config = gpiochip_generic_config,
--	.base = -1,
-+	.base = 0,
- 	.ngpio = BCM2711_NUM_GPIOS,
- 	.can_sleep = false,
- 	.of_gpio_ranges_fallback = bcm2835_of_gpio_ranges_fallback,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0105-Main-bcm2708-bcm2709-linux-port.patch b/target/linux/bcm27xx/patches-6.1/950-0105-Main-bcm2708-bcm2709-linux-port.patch
deleted file mode 100644
index 352325ed6f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0105-Main-bcm2708-bcm2709-linux-port.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From 923325f400f9fc6d22ddfe17cdb197a8fcfeb35a Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Sun, 12 May 2013 12:24:19 +0100
-Subject: [PATCH] Main bcm2708/bcm2709 linux port
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: popcornmix <popcornmix@gmail.com>
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-
-bcm2709: Drop platform smp and timer init code
-
-irq-bcm2836 handles this through these functions:
-bcm2835_init_local_timer_frequency()
-bcm2836_arm_irqchip_smp_init()
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-
-bcm270x: Use watchdog for reboot/poweroff
-
-The watchdog driver already has support for reboot/poweroff.
-Make use of this and remove the code from the platform files.
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-
-board_bcm2835: Remove coherent dma pool increase - API has gone
----
- arch/arm/mach-bcm/Kconfig         |  1 +
- arch/arm/mm/proc-v6.S             | 15 ++++++++++++---
- drivers/irqchip/irq-bcm2835.c     |  7 ++++++-
- drivers/mailbox/bcm2835-mailbox.c | 18 ++++++++++++++++--
- 4 files changed, 35 insertions(+), 6 deletions(-)
-
---- a/arch/arm/mach-bcm/Kconfig
-+++ b/arch/arm/mach-bcm/Kconfig
-@@ -163,6 +163,7 @@ config ARCH_BCM2835
- 	select PINCTRL
- 	select PINCTRL_BCM2835
- 	select MFD_CORE
-+	select MFD_SYSCON if ARCH_MULTI_V7
- 	help
- 	  This enables support for the Broadcom BCM2711 and BCM283x SoCs.
- 	  This SoC is used in the Raspberry Pi and Roku 2 devices.
---- a/arch/arm/mm/proc-v6.S
-+++ b/arch/arm/mm/proc-v6.S
-@@ -70,10 +70,19 @@ ENDPROC(cpu_v6_reset)
-  *
-  *	IRQs are already disabled.
-  */
-+
-+/* See jira SW-5991 for details of this workaround */
- ENTRY(cpu_v6_do_idle)
--	mov	r1, #0
--	mcr	p15, 0, r1, c7, c10, 4		@ DWB - WFI may enter a low-power mode
--	mcr	p15, 0, r1, c7, c0, 4		@ wait for interrupt
-+	.align 5
-+	mov     r1, #2
-+1:	subs	r1, #1
-+	nop
-+	mcreq	p15, 0, r1, c7, c10, 4		@ DWB - WFI may enter a low-power mode
-+	mcreq	p15, 0, r1, c7, c0, 4		@ wait for interrupt
-+	nop
-+	nop
-+	nop
-+	bne 1b
- 	ret	lr
- 
- ENTRY(cpu_v6_dcache_clean_area)
---- a/drivers/irqchip/irq-bcm2835.c
-+++ b/drivers/irqchip/irq-bcm2835.c
-@@ -43,7 +43,9 @@
- #include <linux/irqdomain.h>
- 
- #include <asm/exception.h>
-+#ifndef CONFIG_ARM64
- #include <asm/mach/irq.h>
-+#endif
- 
- /* Put the bank and irq (32 bits) into the hwirq */
- #define MAKE_HWIRQ(b, n)	(((b) << 5) | (n))
-@@ -72,6 +74,7 @@
- #define NR_BANKS		3
- #define IRQS_PER_BANK		32
- #define NUMBER_IRQS		MAKE_HWIRQ(NR_BANKS, 0)
-+#undef FIQ_START
- #define FIQ_START		(NR_IRQS_BANK0 + MAKE_HWIRQ(NR_BANKS - 1, 0))
- 
- static const int reg_pending[] __initconst = { 0x00, 0x04, 0x08 };
-@@ -253,10 +256,12 @@ static int __init armctrl_of_init(struct
- 					MAKE_HWIRQ(b, i) + NUMBER_IRQS);
- 			BUG_ON(irq <= 0);
- 			irq_set_chip(irq, &armctrl_chip);
--			set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
-+			irq_set_probe(irq);
- 		}
- 	}
-+#ifndef CONFIG_ARM64
- 	init_FIQ(FIQ_START);
-+#endif
- 
- 	return 0;
- }
---- a/drivers/mailbox/bcm2835-mailbox.c
-+++ b/drivers/mailbox/bcm2835-mailbox.c
-@@ -45,12 +45,15 @@
- #define MAIL1_WRT	(ARM_0_MAIL1 + 0x00)
- #define MAIL1_STA	(ARM_0_MAIL1 + 0x18)
- 
-+/* On ARCH_BCM270x these come through <linux/interrupt.h> (arm_control.h ) */
-+#ifndef ARM_MS_FULL
- /* Status register: FIFO state. */
- #define ARM_MS_FULL		BIT(31)
- #define ARM_MS_EMPTY		BIT(30)
- 
- /* Configuration register: Enable interrupts. */
- #define ARM_MC_IHAVEDATAIRQEN	BIT(0)
-+#endif
- 
- struct bcm2835_mbox {
- 	void __iomem *regs;
-@@ -144,7 +147,7 @@ static int bcm2835_mbox_probe(struct pla
- 		return -ENOMEM;
- 	spin_lock_init(&mbox->lock);
- 
--	ret = devm_request_irq(dev, irq_of_parse_and_map(dev->of_node, 0),
-+	ret = devm_request_irq(dev, platform_get_irq(pdev, 0),
- 			       bcm2835_mbox_irq, 0, dev_name(dev), mbox);
- 	if (ret) {
- 		dev_err(dev, "Failed to register a mailbox IRQ handler: %d\n",
-@@ -192,7 +195,18 @@ static struct platform_driver bcm2835_mb
- 	},
- 	.probe		= bcm2835_mbox_probe,
- };
--module_platform_driver(bcm2835_mbox_driver);
-+
-+static int __init bcm2835_mbox_init(void)
-+{
-+	return platform_driver_register(&bcm2835_mbox_driver);
-+}
-+arch_initcall(bcm2835_mbox_init);
-+
-+static void __init bcm2835_mbox_exit(void)
-+{
-+	platform_driver_unregister(&bcm2835_mbox_driver);
-+}
-+module_exit(bcm2835_mbox_exit);
- 
- MODULE_AUTHOR("Lubomir Rintel <lkundrak@v3.sk>");
- MODULE_DESCRIPTION("BCM2835 mailbox IPC driver");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0106-Add-dwc_otg-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0106-Add-dwc_otg-driver.patch
deleted file mode 100644
index 89ed666567..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0106-Add-dwc_otg-driver.patch
+++ /dev/null
@@ -1,61022 +0,0 @@
-From fe24a2249a07c6c70767d6030b4b467a5dc6717f Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Wed, 1 May 2013 19:46:17 +0100
-Subject: [PATCH] Add dwc_otg driver
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: popcornmix <popcornmix@gmail.com>
-
-usb: dwc: fix lockdep false positive
-
-Signed-off-by: Kari Suvanto <karis79@gmail.com>
-
-usb: dwc: fix inconsistent lock state
-
-Signed-off-by: Kari Suvanto <karis79@gmail.com>
-
-Add FIQ patch to dwc_otg driver. Enable with dwc_otg.fiq_fix_enable=1. Should give about 10% more ARM performance.
-Thanks to Gordon and Costas
-
-Avoid dynamic memory allocation for channel lock in USB driver. Thanks ddv2005.
-
-Add NAK holdoff scheme. Enabled by default, disable with dwc_otg.nak_holdoff_enable=0. Thanks gsh
-
-Make sure we wait for the reset to finish
-
-dwc_otg: fix bug in dwc_otg_hcd.c resulting in silent kernel
-	 memory corruption, escalating to OOPS under high USB load.
-
-dwc_otg: Fix unsafe access of QTD during URB enqueue
-
-In dwc_otg_hcd_urb_enqueue during qtd creation, it was possible that the
-transaction could complete almost immediately after the qtd was assigned
-to a host channel during URB enqueue, which meant the qtd pointer was no
-longer valid having been completed and removed. Usually, this resulted in
-an OOPS during URB submission. By predetermining whether transactions
-need to be queued or not, this unsafe pointer access is avoided.
-
-This bug was only evident on the Pi model A where a device was attached
-that had no periodic endpoints (e.g. USB pendrive or some wlan devices).
-
-dwc_otg: Fix incorrect URB allocation error handling
-
-If the memory allocation for a dwc_otg_urb failed, the kernel would OOPS
-because for some reason a member of the *unallocated* struct was set to
-zero. Error handling changed to fail correctly.
-
-dwc_otg: fix potential use-after-free case in interrupt handler
-
-If a transaction had previously aborted, certain interrupts are
-enabled to track error counts and reset where necessary. On IN
-endpoints the host generates an ACK interrupt near-simultaneously
-with completion of transfer. In the case where this transfer had
-previously had an error, this results in a use-after-free on
-the QTD memory space with a 1-byte length being overwritten to
-0x00.
-
-dwc_otg: add handling of SPLIT transaction data toggle errors
-
-Previously a data toggle error on packets from a USB1.1 device behind
-a TT would result in the Pi locking up as the driver never handled
-the associated interrupt. Patch adds basic retry mechanism and
-interrupt acknowledgement to cater for either a chance toggle error or
-for devices that have a broken initial toggle state (FT8U232/FT232BM).
-
-dwc_otg: implement tasklet for returning URBs to usbcore hcd layer
-
-The dwc_otg driver interrupt handler for transfer completion will spend
-a very long time with interrupts disabled when a URB is completed -
-this is because usb_hcd_giveback_urb is called from within the handler
-which for a USB device driver with complicated processing (e.g. webcam)
-will take an exorbitant amount of time to complete. This results in
-missed completion interrupts for other USB packets which lead to them
-being dropped due to microframe overruns.
-
-This patch splits returning the URB to the usb hcd layer into a
-high-priority tasklet. This will have most benefit for isochronous IN
-transfers but will also have incidental benefit where multiple periodic
-devices are active at once.
-
-dwc_otg: fix NAK holdoff and allow on split transactions only
-
-This corrects a bug where if a single active non-periodic endpoint
-had at least one transaction in its qh, on frnum == MAX_FRNUM the qh
-would get skipped and never get queued again. This would result in
-a silent device until error detection (automatic or otherwise) would
-either reset the device or flush and requeue the URBs.
-
-Additionally the NAK holdoff was enabled for all transactions - this
-would potentially stall a HS endpoint for 1ms if a previous error state
-enabled this interrupt and the next response was a NAK. Fix so that
-only split transactions get held off.
-
-dwc_otg: Call usb_hcd_unlink_urb_from_ep with lock held in completion handler
-
-usb_hcd_unlink_urb_from_ep must be called with the HCD lock held.  Calling it
-asynchronously in the tasklet was not safe (regression in
-c4564d4a1a0a9b10d4419e48239f5d99e88d2667).
-
-This change unlinks it from the endpoint prior to queueing it for handling in
-the tasklet, and also adds a check to ensure the urb is OK to be unlinked
-before doing so.
-
-NULL pointer dereference kernel oopses had been observed in usb_hcd_giveback_urb
-when a USB device was unplugged/replugged during data transfer.  This effect
-was reproduced using automated USB port power control, hundreds of replug
-events were performed during active transfers to confirm that the problem was
-eliminated.
-
-USB fix using a FIQ to implement split transactions
-
-This commit adds a FIQ implementaion that schedules
-the split transactions using a FIQ so we don't get
-held off by the interrupt latency of Linux
-
-dwc_otg: fix device attributes and avoid kernel warnings on boot
-
-dcw_otg: avoid logging function that can cause panics
-
-See: https://github.com/raspberrypi/firmware/issues/21
-Thanks to cleverca22 for fix
-
-dwc_otg: mask correct interrupts after transaction error recovery
-
-The dwc_otg driver will unmask certain interrupts on a transaction
-that previously halted in the error state in order to reset the
-QTD error count. The various fine-grained interrupt handlers do not
-consider that other interrupts besides themselves were unmasked.
-
-By disabling the two other interrupts only ever enabled in DMA mode
-for this purpose, we can avoid unnecessary function calls in the
-IRQ handler. This will also prevent an unneccesary FIQ interrupt
-from being generated if the FIQ is enabled.
-
-dwc_otg: fiq: prevent FIQ thrash and incorrect state passing to IRQ
-
-In the case of a transaction to a device that had previously aborted
-due to an error, several interrupts are enabled to reset the error
-count when a device responds. This has the side-effect of making the
-FIQ thrash because the hardware will generate multiple instances of
-a NAK on an IN bulk/interrupt endpoint and multiple instances of ACK
-on an OUT bulk/interrupt endpoint. Make the FIQ mask and clear the
-associated interrupts.
-
-Additionally, on non-split transactions make sure that only unmasked
-interrupts are cleared. This caused a hard-to-trigger but serious
-race condition when you had the combination of an endpoint awaiting
-error recovery and a transaction completed on an endpoint - due to
-the sequencing and timing of interrupts generated by the dwc_otg core,
-it was possible to confuse the IRQ handler.
-
-Fix function tracing
-
-dwc_otg: whitespace cleanup in dwc_otg_urb_enqueue
-
-dwc_otg: prevent OOPSes during device disconnects
-
-The dwc_otg_urb_enqueue function is thread-unsafe. In particular the
-access of urb->hcpriv, usb_hcd_link_urb_to_ep, dwc_otg_urb->qtd and
-friends does not occur within a critical section and so if a device
-was unplugged during activity there was a high chance that the
-usbcore hub_thread would try to disable the endpoint with partially-
-formed entries in the URB queue. This would result in BUG() or null
-pointer dereferences.
-
-Fix so that access of urb->hcpriv, enqueuing to the hardware and
-adding to usbcore endpoint URB lists is contained within a single
-critical section.
-
-dwc_otg: prevent BUG() in TT allocation if hub address is > 16
-
-A fixed-size array is used to track TT allocation. This was
-previously set to 16 which caused a crash because
-dwc_otg_hcd_allocate_port would read past the end of the array.
-
-This was hit if a hub was plugged in which enumerated as addr > 16,
-due to previous device resets or unplugs.
-
-Also add #ifdef FIQ_DEBUG around hcd->hub_port_alloc[], which grows
-to a large size if 128 hub addresses are supported. This field is
-for debug only for tracking which frame an allocate happened in.
-
-dwc_otg: make channel halts with unknown state less damaging
-
-If the IRQ received a channel halt interrupt through the FIQ
-with no other bits set, the IRQ would not release the host
-channel and never complete the URB.
-
-Add catchall handling to treat as a transaction error and retry.
-
-dwc_otg: fiq_split: use TTs with more granularity
-
-This fixes certain issues with split transaction scheduling.
-
-- Isochronous multi-packet OUT transactions now hog the TT until
-  they are completed - this prevents hubs aborting transactions
-  if they get a periodic start-split out-of-order
-- Don't perform TT allocation on non-periodic endpoints - this
-  allows simultaneous use of the TT's bulk/control and periodic
-  transaction buffers
-
-This commit will mainly affect USB audio playback.
-
-dwc_otg: fix potential sleep while atomic during urb enqueue
-
-Fixes a regression introduced with eb1b482a. Kmalloc called from
-dwc_otg_hcd_qtd_add / dwc_otg_hcd_qtd_create did not always have
-the GPF_ATOMIC flag set. Force this flag when inside the larger
-critical section.
-
-dwc_otg: make fiq_split_enable imply fiq_fix_enable
-
-Failing to set up the FIQ correctly would result in
-"IRQ 32: nobody cared" errors in dmesg.
-
-dwc_otg: prevent crashes on host port disconnects
-
-Fix several issues resulting in crashes or inconsistent state
-if a Model A root port was disconnected.
-
-- Clean up queue heads properly in kill_urbs_in_qh_list by
-  removing the empty QHs from the schedule lists
-- Set the halt status properly to prevent IRQ handlers from
-  using freed memory
-- Add fiq_split related cleanup for saved registers
-- Make microframe scheduling reclaim host channels if
-  active during a disconnect
-- Abort URBs with -ESHUTDOWN status response, informing
-  device drivers so they respond in a more correct fashion
-  and don't try to resubmit URBs
-- Prevent IRQ handlers from attempting to handle channel
-  interrupts if the associated URB was dequeued (and the
-  driver state was cleared)
-
-dwc_otg: prevent leaking URBs during enqueue
-
-A dwc_otg_urb would get leaked if the HCD enqueue function
-failed for any reason. Free the URB at the appropriate points.
-
-dwc_otg: Enable NAK holdoff for control split transactions
-
-Certain low-speed devices take a very long time to complete a
-data or status stage of a control transaction, producing NAK
-responses until they complete internal processing - the USB2.0
-spec limit is up to 500mS. This causes the same type of interrupt
-storm as seen with USB-serial dongles prior to c8edb238.
-
-In certain circumstances, usually while booting, this interrupt
-storm could cause SD card timeouts.
-
-dwc_otg: Fix for occasional lockup on boot when doing a USB reset
-
-dwc_otg: Don't issue traffic to LS devices in FS mode
-
-Issuing low-speed packets when the root port is in full-speed mode
-causes the root port to stop responding. Explicitly fail when
-enqueuing URBs to a LS endpoint on a FS bus.
-
-Fix ARM architecture issue with local_irq_restore()
-
-If local_fiq_enable() is called before a local_irq_restore(flags) where
-the flags variable has the F bit set, the FIQ will be erroneously disabled.
-
-Fixup arch_local_irq_restore to avoid trampling the F bit in CPSR.
-
-Also fix some of the hacks previously implemented for previous dwc_otg
-incarnations.
-
-dwc_otg: fiq_fsm: Base commit for driver rewrite
-
-This commit removes the previous FIQ fixes entirely and adds fiq_fsm.
-
-This rewrite features much more complete support for split transactions
-and takes into account several OTG hardware bugs. High-speed
-isochronous transactions are also capable of being performed by fiq_fsm.
-
-All driver options have been removed and replaced with:
-  - dwc_otg.fiq_enable (bool)
-  - dwc_otg.fiq_fsm_enable (bool)
-  - dwc_otg.fiq_fsm_mask (bitmask)
-  - dwc_otg.nak_holdoff (unsigned int)
-
-Defaults are specified such that fiq_fsm behaves similarly to the
-previously implemented FIQ fixes.
-
-fiq_fsm: Push error recovery into the FIQ when fiq_fsm is used
-
-If the transfer associated with a QTD failed due to a bus error, the HCD
-would retry the transfer up to 3 times (implementing the USB2.0
-three-strikes retry in software).
-
-Due to the masking mechanism used by fiq_fsm, it is only possible to pass
-a single interrupt through to the HCD per-transfer.
-
-In this instance host channels would fall off the radar because the error
-reset would function, but the subsequent channel halt would be lost.
-
-Push the error count reset into the FIQ handler.
-
-fiq_fsm: Implement timeout mechanism
-
-For full-speed endpoints with a large packet size, interrupt latency
-runs the risk of the FIQ starting a transaction too late in a full-speed
-frame. If the device is still transmitting data when EOF2 for the
-downstream frame occurs, the hub will disable the port. This change is
-not reflected in the hub status endpoint and the device becomes
-unresponsive.
-
-Prevent high-bandwidth transactions from being started too late in a
-frame. The mechanism is not guaranteed: a combination of bit stuffing
-and hub latency may still result in a device overrunning.
-
-fiq_fsm: fix bounce buffer utilisation for Isochronous OUT
-
-Multi-packet isochronous OUT transactions were subject to a few bounday
-bugs. Fix them.
-
-Audio playback is now much more robust: however, an issue stands with
-devices that have adaptive sinks - ALSA plays samples too fast.
-
-dwc_otg: Return full-speed frame numbers in HS mode
-
-The frame counter increments on every *microframe* in high-speed mode.
-Most device drivers expect this number to be in full-speed frames - this
-caused considerable confusion to e.g. snd_usb_audio which uses the
-frame counter to estimate the number of samples played.
-
-fiq_fsm: save PID on completion of interrupt OUT transfers
-
-Also add edge case handling for interrupt transports.
-
-Note that for periodic split IN, data toggles are unimplemented in the
-OTG host hardware - it unconditionally accepts any PID.
-
-fiq_fsm: add missing case for fiq_fsm_tt_in_use()
-
-Certain combinations of bitrate and endpoint activity could
-result in a periodic transaction erroneously getting started
-while the previous Isochronous OUT was still active.
-
-fiq_fsm: clear hcintmsk for aborted transactions
-
-Prevents the FIQ from erroneously handling interrupts
-on a timed out channel.
-
-fiq_fsm: enable by default
-
-fiq_fsm: fix dequeues for non-periodic split transactions
-
-If a dequeue happened between the SSPLIT and CSPLIT phases of the
-transaction, the HCD would never receive an interrupt.
-
-fiq_fsm: Disable by default
-
-fiq_fsm: Handle HC babble errors
-
-The HCTSIZ transfer size field raises a babble interrupt if
-the counter wraps. Handle the resulting interrupt in this case.
-
-dwc_otg: fix interrupt registration for fiq_enable=0
-
-Additionally make the module parameter conditional for wherever
-hcd->fiq_state is touched.
-
-fiq_fsm: Enable by default
-
-dwc_otg: Fix various issues with root port and transaction errors
-
-Process the host port interrupts correctly (and don't trample them).
-Root port hotplug now functional again.
-
-Fix a few thinkos with the transaction error passthrough for fiq_fsm.
-
-fiq_fsm: Implement hack for Split Interrupt transactions
-
-Hubs aren't too picky about which endpoint we send Control type split
-transactions to. By treating Interrupt transfers as Control, it is
-possible to use the non-periodic queue in the OTG core as well as the
-non-periodic FIFOs in the hub itself. This massively reduces the
-microframe exclusivity/contention that periodic split transactions
-otherwise have to enforce.
-
-It goes without saying that this is a fairly egregious USB specification
-violation, but it works.
-
-Original idea by Hans Petter Selasky @ FreeBSD.org.
-
-dwc_otg: FIQ support on SMP. Set up FIQ stack and handler on Core 0 only.
-
-dwc_otg: introduce fiq_fsm_spin(un|)lock()
-
-SMP safety for the FIQ relies on register read-modify write cycles being
-completed in the correct order. Several places in the DWC code modify
-registers also touched by the FIQ. Protect these by a bare-bones lock
-mechanism.
-
-This also makes it possible to run the FIQ and IRQ handlers on different
-cores.
-
-fiq_fsm: fix build on bcm2708 and bcm2709 platforms
-
-dwc_otg: put some barriers back where they should be for UP
-
-bcm2709/dwc_otg: Setup FIQ on core 1 if >1 core active
-
-dwc_otg: fixup read-modify-write in critical paths
-
-Be more careful about read-modify-write on registers that the FIQ
-also touches.
-
-Guard fiq_fsm_spin_lock with fiq_enable check
-
-fiq_fsm: Falling out of the state machine isn't fatal
-
-This edge case can be hit if the port is disabled while the FIQ is
-in the middle of a transaction. Make the effects less severe.
-
-Also get rid of the useless return value.
-
-squash: dwc_otg: Allow to build without SMP
-
-usb: core: make overcurrent messages more prominent
-
-Hub overcurrent messages are more serious than "debug". Increase loglevel.
-
-usb: dwc_otg: Don't use dma_to_virt()
-
-Commit 6ce0d20 changes dma_to_virt() which breaks this driver.
-Open code the old dma_to_virt() implementation to work around this.
-
-Limit the use of __bus_to_virt() to cases where transfer_buffer_length
-is set and transfer_buffer is not set. This is done to increase the
-chance that this driver will also work on ARCH_BCM2835.
-
-transfer_buffer should not be NULL if the length is set, but the
-comment in the code indicates that there are situations where this
-might happen. drivers/usb/isp1760/isp1760-hcd.c also has a similar
-comment pointing to a possible: 'usb storage / SCSI bug'.
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-
-dwc_otg: Fix crash when fiq_enable=0
-
-dwc_otg: fiq_fsm: Make high-speed isochronous strided transfers work properly
-
-Certain low-bandwidth high-speed USB devices (specialist audio devices,
-compressed-frame webcams) have packet intervals > 1 microframe.
-
-Stride these transfers in the FIQ by using the start-of-frame interrupt
-to restart the channel at the right time.
-
-dwc_otg: Force host mode to fix incorrect compute module boards
-
-dwc_otg: Add ARCH_BCM2835 support
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-
-dwc_otg: Simplify FIQ irq number code
-
-Dropping ATAGS means we can simplify the FIQ irq number code.
-Also add error checking on the returned irq number.
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-
-dwc_otg: Remove duplicate gadget probe/unregister function
-
-dwc_otg: Properly set the HFIR
-
-Douglas Anderson reported:
-
-According to the most up to date version of the dwc2 databook, the FRINT
-field of the HFIR register should be programmed to:
-* 125 us * (PHY clock freq for HS) - 1
-* 1000 us * (PHY clock freq for FS/LS) - 1
-
-This is opposed to older versions of the doc that claimed it should be:
-* 125 us * (PHY clock freq for HS)
-* 1000 us * (PHY clock freq for FS/LS)
-
-and reported lower timing jitter on a USB analyser
-
-dcw_otg: trim xfer length when buffer larger than allocated size is received
-
-dwc_otg: Don't free qh align buffers in atomic context
-
-dwc_otg: Enable the hack for Split Interrupt transactions by default
-
-dwc_otg.fiq_fsm_mask=0xF has long been a suggestion for users with audio stutters or other USB bandwidth issues.
-So far we are aware of many success stories but no failure caused by this setting.
-Make it a default to learn more.
-
-See: https://www.raspberrypi.org/forums/viewtopic.php?f=28&t=70437
-
-Signed-off-by: popcornmix <popcornmix@gmail.com>
-
-dwc_otg: Use kzalloc when suitable
-
-dwc_otg: Pass struct device to dma_alloc*()
-
-This makes it possible to get the bus address from Device Tree.
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-
-dwc_otg: fix summarize urb->actual_length for isochronous transfers
-
-Kernel does not copy input data of ISO transfers to userspace
-if actual_length is set only in ISO transfers and not summarized
-in urb->actual_length. Fixes raspberrypi/linux#903
-
-fiq_fsm: Use correct states when starting isoc OUT transfers
-
-In fiq_fsm_start_next_periodic() if an isochronous OUT transfer
-was selected, no regard was given as to whether this was a single-packet
-transfer or a multi-packet staged transfer.
-
-For single-packet transfers, this had the effect of repeatedly sending
-OUT packets with bogus data and lengths.
-
-Eventually if the channel was repeatedly enabled enough times, this
-would lock up the OTG core and no further bus transfers would happen.
-
-Set the FSM state up properly if we select a single-packet transfer.
-
-Fixes https://github.com/raspberrypi/linux/issues/1842
-
-dwc_otg: make nak_holdoff work as intended with empty queues
-
-If URBs reading from non-periodic split endpoints were dequeued and
-the last transfer from the endpoint was a NAK handshake, the resulting
-qh->nak_frame value was stale which would result in unnecessarily long
-polling intervals for the first subsequent transfer with a fresh URB.
-
-Fixup qh->nak_frame in dwc_otg_hcd_urb_dequeue and also guard against
-a case where a single URB is submitted to the endpoint, a NAK was
-received on the transfer immediately prior to receiving data and the
-device subsequently resubmits another URB past the qh->nak_frame interval.
-
-Fixes https://github.com/raspberrypi/linux/issues/1709
-
-dwc_otg: fix split transaction data toggle handling around dequeues
-
-See https://github.com/raspberrypi/linux/issues/1709
-
-Fix several issues regarding endpoint state when URBs are dequeued
-- If the HCD is disconnected, flush FIQ-enabled channels properly
-- Save the data toggle state for bulk endpoints if the last transfer
-  from an endpoint where URBs were dequeued returned a data packet
-- Reset hc->start_pkt_count properly in assign_and_init_hc()
-
-dwc_otg: fix several potential crash sources
-
-On root port disconnect events, the host driver state is cleared and
-in-progress host channels are forcibly stopped. This doesn't play
-well with the FIQ running in the background, so:
-- Guard the disconnect callback with both the host spinlock and FIQ
-  spinlock
-- Move qtd dereference in dwc_otg_handle_hc_fsm() after the early-out
-  so we don't dereference a qtd that has gone away
-- Turn catch-all BUG()s in dwc_otg_handle_hc_fsm() into warnings.
-
-dwc_otg: delete hcd->channel_lock
-
-The lock serves no purpose as it is only held while the HCD spinlock
-is already being held.
-
-dwc_otg: remove unnecessary dma-mode channel halts on disconnect interrupt
-
-Host channels are already halted in kill_urbs_in_qh_list() with the
-subsequent interrupt processing behaving as if the URB was dequeued
-via HCD callback.
-
-There's no need to clobber the host channel registers a second time
-as this exposes races between the driver and host channel resulting
-in hcd->free_hc_list becoming corrupted.
-
-dwcotg: Allow to build without FIQ on ARM64
-
-Signed-off-by: popcornmix <popcornmix@gmail.com>
-
-dwc_otg: make periodic scheduling behave properly for FS buses
-
-If the root port is in full-speed mode, transfer times at 12mbit/s
-would be calculated but matched against high-speed quotas.
-
-Reinitialise hcd->frame_usecs[i] on each port enable event so that
-full-speed bandwidth can be tracked sensibly.
-
-Also, don't bother using the FIQ for transfers when in full-speed
-mode - at the slower bus speed, interrupt frequency is reduced by
-an order of magnitude.
-
-Related issue: https://github.com/raspberrypi/linux/issues/2020
-
-dwc_otg: fiq_fsm: Make isochronous compatibility checks work properly
-
-Get rid of the spammy printk and local pointer mangling.
-Also, there is a nominal benefit for using fiq_fsm for isochronous
-transfers in FS mode (~1.1k IRQs per second vs 2.1k IRQs per second)
-so remove the root port speed check.
-
-dwc_otg: add module parameter int_ep_interval_min
-
-Add a module parameter (defaulting to ignored) that clamps the polling rate
-of high-speed Interrupt endpoints to a minimum microframe interval.
-
-The parameter is modifiable at runtime as it is used when activating new
-endpoints (such as on device connect).
-
-dwc_otg: fiq_fsm: Add non-periodic TT exclusivity constraints
-
-Certain hub types do not discriminate between pipe direction (IN or OUT)
-when considering non-periodic transfers. Therefore these hubs get confused
-if multiple transfers are issued in different directions with the same
-device address and endpoint number.
-
-Constrain queuing non-periodic split transactions so they are performed
-serially in such cases.
-
-Related: https://github.com/raspberrypi/linux/issues/2024
-
-dwc_otg: Fixup change to DRIVER_ATTR interface
-
-dwc_otg: Fix compilation warnings
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-USB_DWCOTG: Disable building dwc_otg as a module (#2265)
-
-When dwc_otg is built as a module, build will fail with the following
-error:
-
-ERROR: "DWC_TASK_HI_SCHEDULE" [drivers/usb/host/dwc_otg/dwc_otg.ko] undefined!
-scripts/Makefile.modpost:91: recipe for target '__modpost' failed
-make[1]: *** [__modpost] Error 1
-Makefile:1199: recipe for target 'modules' failed
-make: *** [modules] Error 2
-
-Even if the error is solved by including the missing
-DWC_TASK_HI_SCHEDULE function, the kernel will panic when loading
-dwc_otg.
-
-As a workaround, simply prevent user from building dwc_otg as a module
-as the current kernel does not support it.
-
-See: https://github.com/raspberrypi/linux/issues/2258
-
-Signed-off-by: Malik Olivier Boussejra <malik@boussejra.com>
-
-dwc_otg: New timer API
-
-dwc_otg: Fix removed ACCESS_ONCE->READ_ONCE
-
-dwc_otg: don't unconditionally force host mode in dwc_otg_cil_init()
-
-Add the ability to disable force_host_mode for those that want to use
-dwc_otg in both device and host modes.
-
-dwc_otg: Fix a regression when dequeueing isochronous transfers
-
-In 282bed95 (dwc_otg: make nak_holdoff work as intended with empty queues)
-the dequeue mechanism was changed to leave FIQ-enabled transfers to run
-to completion - to avoid leaving hub TT buffers with stale packets lying
-around.
-
-This broke FIQ-accelerated isochronous transfers, as this then meant that
-dozens of transfers were performed after the dequeue function returned.
-
-Restore the state machine fence for isochronous transfers.
-
-fiq_fsm: rewind DMA pointer for OUT transactions that fail (#2288)
-
-See: https://github.com/raspberrypi/linux/issues/2140
-
-dwc_otg: add smp_mb() to prevent driver state corruption on boot
-
-Occasional crashes have been seen where the FIQ code dereferences
-invalid/random pointers immediately after being set up, leading to
-panic on boot.
-
-The crash occurs as the FIQ code races against hcd_init_fiq() and
-the hcd_init_fiq() code races against the outstanding memory stores
-from dwc_otg_hcd_init(). Use explicit barriers after touching
-driver state.
-
-usb: dwc_otg: fix memory corruption in dwc_otg driver
-
-[Upstream commit 51b1b6491752ac066ee8d32cc66042fcc955fef6]
-
-The move from the staging tree to the main tree exposed a
-longstanding memory corruption bug in the dwc2 driver. The
-reordering of the driver initialization caused the dwc2 driver
-to corrupt the initialization data of the sdhci driver on the
-Raspberry Pi platform, which made the bug show up.
-
-The error is in calling to_usb_device(hsotg->dev), since ->dev
-is not a member of struct usb_device. The easiest fix is to
-just remove the offending code, since it is not really needed.
-
-Thanks to Stephen Warren for tracking down the cause of this.
-
-Reported-by: Andre Heider <a.heider@gmail.com>
-Tested-by: Stephen Warren <swarren@wwwdotorg.org>
-Signed-off-by: Paul Zimmerman <paulz@synopsys.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-[lukas: port from upstream dwc2 to out-of-tree dwc_otg driver]
-Signed-off-by: Lukas Wunner <lukas@wunner.de>
-
-usb: dwb_otg: Fix unreachable switch statement warning
-
-This warning appears with GCC 7.3.0 from toolchains.bootlin.com:
-
-../drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c: In function ‘fiq_fsm_update_hs_isoc’:
-../drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c:595:61: warning: statement will never be executed [-Wswitch-unreachable]
-   st->hctsiz_copy.b.xfersize = nrpackets * st->hcchar_copy.b.mps;
-                                            ~~~~~~~~~~~~~~~~~^~~~
-
-Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
-
-dwc_otg: fiq_fsm: fix incorrect DMA register offset calculation
-
-Rationalise the offset and update all call sites.
-
-Fixes https://github.com/raspberrypi/linux/issues/2408
-
-dwc_otg: fix bug with port_addr assignment for single-TT hubs
-
-See https://github.com/raspberrypi/linux/issues/2734
-
-The "Hub Port" field in the split transaction packet was always set
-to 1 for single-TT hubs. The majority of single-TT hub products
-apparently ignore this field and broadcast to all downstream enabled
-ports, which masked the issue. A subset of hub devices apparently
-need the port number to be exact or split transactions will fail.
-
-usb: dwc_otg: Clean up build warnings on 64bit kernels
-
-No functional changes. Almost all are changes to logging lines.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
-
-usb: dwc_otg: Use dma allocation for mphi dummy_send buffer
-
-The FIQ driver used a kzalloc'ed buffer for dummy_send,
-passing a kernel virtual address to the hardware block.
-The buffer is only ever used for a dummy read, so it
-should be harmless, but there is the chance that it will
-cause exceptions.
-
-Use a dma allocation so that we have a genuine bus address,
-and read from that.
-Free the allocation when done for good measure.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
-
-dwc_otg: only do_split when we actually need to do a split
-
-The previous test would fail if the root port was in fullspeed mode
-and there was a hub between the FS device and the root port. While
-the transfer worked, the schedule mangling performed for high-speed
-split transfers would break leading to an 8ms polling interval.
-
-dwc_otg: fix locking around dequeueing and killing URBs
-
-kill_urbs_in_qh_list() is practically only ever called with the fiq lock
-already held, so don't spinlock twice in the case where we need to cancel
-an isochronous transfer.
-
-Also fix up a case where the global interrupt register could be read with
-the fiq lock not held.
-
-Fixes the deadlock seen in https://github.com/raspberrypi/linux/issues/2907
-
-ARM64/DWC_OTG: Port dwc_otg driver to ARM64
-
-In ARM64, the FIQ mechanism used by this driver is not current
-implemented.   As a workaround, reqular IRQ is used instead
-of FIQ.
-
-In a separate change, the IRQ-CPU mapping is round robined
-on ARM64 to increase concurrency and allow multiple interrupts
-to be serviced at a time.  This reduces the need for FIQ.
-
-Tests Run:
-
-This mechanism is most likely to break when multiple USB devices
-are attached at the same time.  So the system was tested under
-stress.
-
-Devices:
-
-1. USB Speakers playing back a FLAC audio through VLC
-   at 96KHz.(Higher then typically, but supported on my speakers).
-
-2. sftp transferring large files through the buildin ethernet
-   connection which is connected through USB.
-
-3. Keyboard and mouse attached and being used.
-
-Although I do occasionally hear some glitches, the music seems to
-play quite well.
-
-Signed-off-by: Michael Zoran <mzoran@crowfest.net>
-
-usb: dwc_otg: Clean up interrupt claiming code
-
-The FIQ/IRQ interrupt number identification code is scattered through
-the dwc_otg driver. Rationalise it, simplifying the code and solving
-an existing issue.
-
-See: https://github.com/raspberrypi/linux/issues/2612
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-dwc_otg: Choose appropriate IRQ handover strategy
-
-2711 has no MPHI peripheral, but the ARM Control block can fake
-interrupts. Use the size of the DTB "mphi" reg block to determine
-which is required.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-usb: host: dwc_otg: fix compiling in separate directory
-
-The dwc_otg Makefile does not respect the O=path argument correctly:
-include paths in CFLAGS are given relatively to object path, not source
-path. Compiling in a separate directory yields #include errors.
-
-Signed-off-by: Marek Behún <marek.behun@nic.cz>
-
-dwc_otg: use align_buf for small IN control transfers (#3150)
-
-The hardware will do a 4-byte write to memory on any IN packet received
-that is between 1 and 3 bytes long. This tramples memory in the uvcvideo
-driver, as it uses a sequence of 1- and 2-byte control transfers to
-query the min/max/range/step of each individual camera control and
-gives us buffers that are offsets into a struct.
-
-Catch small control transfers in the data phase and use the align_buf
-to bounce the correct number of bytes into the URB's buffer.
-
-In general, short packets on non-control endpoints should be OK as URBs
-should have enough buffer space for a wMaxPacket size transfer.
-
-See: https://github.com/raspberrypi/linux/issues/3148
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
-
-dwc_otg: Declare DMA capability with HCD_DMA flag
-
-Following [1], USB controllers have to declare DMA capabilities in
-order for them to be used by adding the HCD_DMA flag to their hc_driver
-struct.
-
-[1] 7b81cb6bddd2 ("usb: add a HCD_DMA flag instead of guestimating DMA capabilities")
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-dwc_otg: checking the urb->transfer_buffer too early (#3332)
-
-After enable the HIGHMEM and VMSPLIT_3G, the dwc_otg driver doesn't
-work well on Pi2/3 boards with 1G physical ram. Users experience
-the failure when copying a file of 600M size to the USB stick. And
-at the same time, the dmesg shows:
-usb 1-1.1.2: reset high-speed USB device number 8 using dwc_otg
-sd 0:0:0:0: [sda] tag#0 FAILED Result: hostbyte=DID_ERROR driverbyte=DRIVER_OK
-blk_update_request: I/O error, dev sda, sector 3024048 op 0x1:(WRITE) flags 0x4000 phys_seg 15 prio class 0
-
-When this happens, the sg_buf sent to the driver is located in the
-highmem region, the usb_sg_init() in the core/message.c will leave
-transfer_buffer to NULL if the sg_buf is in highmem, but in the
-dwc_otg driver, it returns -EINVAL unconditionally if transfer_buffer
-is NULL.
-
-The driver can handle the situation of buffer to be NULL, if it is in
-DMA mode, it will convert an address from transfer_dma.
-
-But if the conversion fails or it is in the PIO mode, we should check
-buffer and return -EINVAL if it is NULL.
-
-BugLink: https://bugs.launchpad.net/bugs/1852510
-Signed-off-by: Hui Wang <hui.wang@canonical.com>
-
-dwc_otg: constrain endpoint max packet and transfer size on split IN
-
-The hcd would unconditionally set the transfer length to the endpoint
-packet size for non-isoc IN transfers. If the remaining buffer length
-was less than the length of returned data, random memory would get
-scribbled over, with bad effects if it crossed a page boundary.
-
-Force a babble error if this happens by limiting the max transfer size
-to the available buffer space. DMA will stop writing to memory on a
-babble condition.
-
-The hardware expects xfersize to be an integer multiple of maxpacket
-size, so override hcchar.b.mps as well.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
-
-dwc_otg: fiq_fsm: pause when cancelling split transactions
-
-Non-periodic splits will DMA to/from the driver-provided transfer_buffer,
-which may be freed immediately after the dequeue call returns. Block until
-we know the transfer is complete.
-
-A similar delay is needed when cleaning up disconnects, as the FIQ could
-have started a periodic transfer in the previous microframe to the one
-that triggered a disconnect.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
-
-dwc_otg: fiq_fsm: add a barrier on entry into FIQ handler(s)
-
-On BCM2835, there is no hardware guarantee that multiple outstanding
-reads to different peripherals will complete in-order. The FIQ code
-uses peripheral reads without barriers for performance, so in the case
-where a read to a slow peripheral was issued immediately prior to FIQ
-entry, the first peripheral read that the FIQ did could end up with
-wrong read data returned.
-
-Add dsb(sy) on entry so that all outstanding reads are retired.
-
-The FIQ only issues reads to the dwc_otg core, so per-read barriers
-in the handler itself are not required.
-
-On BCM2836 and BCM2837 the barrier is not strictly required due to
-differences in how the peripheral bus is implemented, but having
-arch-specific handlers that introduce different latencies is risky.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
-
-dwc_otg: whitelist_table is now productlist_table
-
-dwc_otg: initialise sched_frame for periodic QHs that were parked
-
-If a periodic QH has no remaining QTDs, then it is removed from all
-periodic schedules. When re-adding, initialise the sched_frame and
-start_split_frame from the current value of the frame counter.
-
-See https://bugs.launchpad.net/raspbian/+bug/1819560
-and
- https://github.com/raspberrypi/linux/issues/3883
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
-
-dwc_otg: Minimise header and fix build warnings
-
-Delete a large amount of unused declaration from "usb.h", some of which
-were causing build warnings, and get the module building cleanly.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-dwc-otg: fix clang -Wignored-attributes warning
-
-warning: attribute declaration must precede definition
-
-dwc-otg: fix clang -Wsometimes-uninitialized warning
-
-warning: variable 'retval' is used uninitialized whenever 'if' condition is false
-
-dwc-otg: fix clang -Wpointer-bool-conversion warning
-
-warning: address of array 'desc->wMaxPacketSize' will always evaluate to 'true'
-
-The wMaxPacketSize field is actually a two element array which content should
-be accessed via the UGETW macro.
-
-dwc_otg: fix an undeclared variable
-Replace an undeclared variable used by DWC_DEBUGPL with the real endpoint address. DWC_DEBUGPL does nothing with DEBUG undefined so it did not go wrong before.
-Signed-off-by: Zixuan Wang <wangzixuan@sjtu.edu.cn>
-
-dwc_otg: Update NetBSD usb.h header licence
-
-NetBSD have changed their licensing requirements such that the 2-clause
-licence is preferred. Update usb.h in the downstream dwc_otg code
-accordingly.
-
-See https://www.netbsd.org/about/redistribution.html for more
-information.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-dwc_otg: pay attention to qh->interval when rescheduling periodic queues
-
-A regression introduced in https://github.com/raspberrypi/linux/pull/3887
-meant that if the newly scheduled transfer immediately returned data, and
-the driver resubmitted a single URB after every transfer, then the effective
-polling interval would end up being approx 1ms.
-
-Use the larger of SCHEDULE_SLOP or the configured endpoint interval.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- arch/arm/include/asm/irqflags.h               |   16 +-
- arch/arm/kernel/fiqasm.S                      |    4 +
- drivers/usb/Makefile                          |    1 +
- drivers/usb/core/generic.c                    |    1 +
- drivers/usb/core/hub.c                        |    2 +-
- drivers/usb/core/message.c                    |   79 +
- drivers/usb/core/otg_productlist.h            |  114 +-
- drivers/usb/gadget/file_storage.c             | 3676 +++++++++
- drivers/usb/host/Kconfig                      |   10 +
- drivers/usb/host/Makefile                     |    1 +
- drivers/usb/host/dwc_common_port/Makefile     |   58 +
- .../usb/host/dwc_common_port/Makefile.fbsd    |   17 +
- .../usb/host/dwc_common_port/Makefile.linux   |   49 +
- drivers/usb/host/dwc_common_port/changes.txt  |  174 +
- .../usb/host/dwc_common_port/doc/doxygen.cfg  |  270 +
- drivers/usb/host/dwc_common_port/dwc_cc.c     |  532 ++
- drivers/usb/host/dwc_common_port/dwc_cc.h     |  224 +
- .../host/dwc_common_port/dwc_common_fbsd.c    | 1308 +++
- .../host/dwc_common_port/dwc_common_linux.c   | 1409 ++++
- .../host/dwc_common_port/dwc_common_nbsd.c    | 1275 +++
- drivers/usb/host/dwc_common_port/dwc_crypto.c |  308 +
- drivers/usb/host/dwc_common_port/dwc_crypto.h |  111 +
- drivers/usb/host/dwc_common_port/dwc_dh.c     |  291 +
- drivers/usb/host/dwc_common_port/dwc_dh.h     |  106 +
- drivers/usb/host/dwc_common_port/dwc_list.h   |  594 ++
- drivers/usb/host/dwc_common_port/dwc_mem.c    |  245 +
- drivers/usb/host/dwc_common_port/dwc_modpow.c |  636 ++
- drivers/usb/host/dwc_common_port/dwc_modpow.h |   34 +
- .../usb/host/dwc_common_port/dwc_notifier.c   |  319 +
- .../usb/host/dwc_common_port/dwc_notifier.h   |  122 +
- drivers/usb/host/dwc_common_port/dwc_os.h     | 1275 +++
- drivers/usb/host/dwc_common_port/usb.h        |  275 +
- drivers/usb/host/dwc_otg/Makefile             |   85 +
- drivers/usb/host/dwc_otg/doc/doxygen.cfg      |  224 +
- drivers/usb/host/dwc_otg/dummy_audio.c        | 1574 ++++
- drivers/usb/host/dwc_otg/dwc_cfi_common.h     |  142 +
- drivers/usb/host/dwc_otg/dwc_otg_adp.c        |  854 ++
- drivers/usb/host/dwc_otg/dwc_otg_adp.h        |   80 +
- drivers/usb/host/dwc_otg/dwc_otg_attr.c       | 1212 +++
- drivers/usb/host/dwc_otg/dwc_otg_attr.h       |   89 +
- drivers/usb/host/dwc_otg/dwc_otg_cfi.c        | 1876 +++++
- drivers/usb/host/dwc_otg/dwc_otg_cfi.h        |  320 +
- drivers/usb/host/dwc_otg/dwc_otg_cil.c        | 7146 +++++++++++++++++
- drivers/usb/host/dwc_otg/dwc_otg_cil.h        | 1464 ++++
- drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c   | 1601 ++++
- drivers/usb/host/dwc_otg/dwc_otg_core_if.h    |  705 ++
- drivers/usb/host/dwc_otg/dwc_otg_dbg.h        |  117 +
- drivers/usb/host/dwc_otg/dwc_otg_driver.c     | 1772 ++++
- drivers/usb/host/dwc_otg/dwc_otg_driver.h     |   86 +
- drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c    | 1433 ++++
- drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h    |  399 +
- drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S   |   80 +
- drivers/usb/host/dwc_otg/dwc_otg_hcd.c        | 4363 ++++++++++
- drivers/usb/host/dwc_otg/dwc_otg_hcd.h        |  870 ++
- drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c   | 1135 +++
- drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h     |  421 +
- drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c   | 2757 +++++++
- drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c  | 1086 +++
- drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c  |  974 +++
- drivers/usb/host/dwc_otg/dwc_otg_os_dep.h     |  200 +
- drivers/usb/host/dwc_otg/dwc_otg_pcd.c        | 2725 +++++++
- drivers/usb/host/dwc_otg/dwc_otg_pcd.h        |  273 +
- drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h     |  361 +
- drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c   | 5148 ++++++++++++
- drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c  | 1262 +++
- drivers/usb/host/dwc_otg/dwc_otg_regs.h       | 2550 ++++++
- drivers/usb/host/dwc_otg/test/Makefile        |   16 +
- drivers/usb/host/dwc_otg/test/dwc_otg_test.pm |  337 +
- .../usb/host/dwc_otg/test/test_mod_param.pl   |  133 +
- drivers/usb/host/dwc_otg/test/test_sysfs.pl   |  193 +
- 70 files changed, 59583 insertions(+), 16 deletions(-)
- create mode 100644 drivers/usb/gadget/file_storage.c
- create mode 100644 drivers/usb/host/dwc_common_port/Makefile
- create mode 100644 drivers/usb/host/dwc_common_port/Makefile.fbsd
- create mode 100644 drivers/usb/host/dwc_common_port/Makefile.linux
- create mode 100644 drivers/usb/host/dwc_common_port/changes.txt
- create mode 100644 drivers/usb/host/dwc_common_port/doc/doxygen.cfg
- create mode 100644 drivers/usb/host/dwc_common_port/dwc_cc.c
- create mode 100644 drivers/usb/host/dwc_common_port/dwc_cc.h
- create mode 100644 drivers/usb/host/dwc_common_port/dwc_common_fbsd.c
- create mode 100644 drivers/usb/host/dwc_common_port/dwc_common_linux.c
- create mode 100644 drivers/usb/host/dwc_common_port/dwc_common_nbsd.c
- create mode 100644 drivers/usb/host/dwc_common_port/dwc_crypto.c
- create mode 100644 drivers/usb/host/dwc_common_port/dwc_crypto.h
- create mode 100644 drivers/usb/host/dwc_common_port/dwc_dh.c
- create mode 100644 drivers/usb/host/dwc_common_port/dwc_dh.h
- create mode 100644 drivers/usb/host/dwc_common_port/dwc_list.h
- create mode 100644 drivers/usb/host/dwc_common_port/dwc_mem.c
- create mode 100644 drivers/usb/host/dwc_common_port/dwc_modpow.c
- create mode 100644 drivers/usb/host/dwc_common_port/dwc_modpow.h
- create mode 100644 drivers/usb/host/dwc_common_port/dwc_notifier.c
- create mode 100644 drivers/usb/host/dwc_common_port/dwc_notifier.h
- create mode 100644 drivers/usb/host/dwc_common_port/dwc_os.h
- create mode 100644 drivers/usb/host/dwc_common_port/usb.h
- create mode 100644 drivers/usb/host/dwc_otg/Makefile
- create mode 100644 drivers/usb/host/dwc_otg/doc/doxygen.cfg
- create mode 100644 drivers/usb/host/dwc_otg/dummy_audio.c
- create mode 100644 drivers/usb/host/dwc_otg/dwc_cfi_common.h
- create mode 100644 drivers/usb/host/dwc_otg/dwc_otg_adp.c
- create mode 100644 drivers/usb/host/dwc_otg/dwc_otg_adp.h
- create mode 100644 drivers/usb/host/dwc_otg/dwc_otg_attr.c
- create mode 100644 drivers/usb/host/dwc_otg/dwc_otg_attr.h
- create mode 100644 drivers/usb/host/dwc_otg/dwc_otg_cfi.c
- create mode 100644 drivers/usb/host/dwc_otg/dwc_otg_cfi.h
- create mode 100644 drivers/usb/host/dwc_otg/dwc_otg_cil.c
- create mode 100644 drivers/usb/host/dwc_otg/dwc_otg_cil.h
- create mode 100644 drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c
- create mode 100644 drivers/usb/host/dwc_otg/dwc_otg_core_if.h
- create mode 100644 drivers/usb/host/dwc_otg/dwc_otg_dbg.h
- create mode 100644 drivers/usb/host/dwc_otg/dwc_otg_driver.c
- create mode 100644 drivers/usb/host/dwc_otg/dwc_otg_driver.h
- create mode 100644 drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c
- create mode 100644 drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h
- create mode 100644 drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S
- create mode 100644 drivers/usb/host/dwc_otg/dwc_otg_hcd.c
- create mode 100644 drivers/usb/host/dwc_otg/dwc_otg_hcd.h
- create mode 100644 drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c
- create mode 100644 drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h
- create mode 100644 drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c
- create mode 100644 drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
- create mode 100644 drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c
- create mode 100644 drivers/usb/host/dwc_otg/dwc_otg_os_dep.h
- create mode 100644 drivers/usb/host/dwc_otg/dwc_otg_pcd.c
- create mode 100644 drivers/usb/host/dwc_otg/dwc_otg_pcd.h
- create mode 100644 drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h
- create mode 100644 drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c
- create mode 100644 drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c
- create mode 100644 drivers/usb/host/dwc_otg/dwc_otg_regs.h
- create mode 100644 drivers/usb/host/dwc_otg/test/Makefile
- create mode 100644 drivers/usb/host/dwc_otg/test/dwc_otg_test.pm
- create mode 100644 drivers/usb/host/dwc_otg/test/test_mod_param.pl
- create mode 100644 drivers/usb/host/dwc_otg/test/test_sysfs.pl
-
---- a/arch/arm/include/asm/irqflags.h
-+++ b/arch/arm/include/asm/irqflags.h
-@@ -163,13 +163,23 @@ static inline unsigned long arch_local_s
- }
- 
- /*
-- * restore saved IRQ & FIQ state
-+ * restore saved IRQ state
-  */
- #define arch_local_irq_restore arch_local_irq_restore
- static inline void arch_local_irq_restore(unsigned long flags)
- {
--	asm volatile(
--		"	msr	" IRQMASK_REG_NAME_W ", %0	@ local_irq_restore"
-+	unsigned long temp = 0;
-+	flags &= ~(1 << 6);
-+	asm volatile (
-+		" mrs %0, cpsr"
-+		: "=r" (temp)
-+		:
-+		: "memory", "cc");
-+		/* Preserve FIQ bit */
-+		temp &= (1 << 6);
-+		flags = flags | temp;
-+	asm volatile (
-+		"    msr    cpsr_c, %0    @ local_irq_restore"
- 		:
- 		: "r" (flags)
- 		: "memory", "cc");
---- a/arch/arm/kernel/fiqasm.S
-+++ b/arch/arm/kernel/fiqasm.S
-@@ -47,3 +47,7 @@ ENTRY(__get_fiq_regs)
- 	mov	r0, r0		@ avoid hazard prior to ARMv4
- 	ret	lr
- ENDPROC(__get_fiq_regs)
-+
-+ENTRY(__FIQ_Branch)
-+	mov pc, r8
-+ENDPROC(__FIQ_Branch)
---- a/drivers/usb/Makefile
-+++ b/drivers/usb/Makefile
-@@ -9,6 +9,7 @@ obj-$(CONFIG_USB_COMMON)	+= common/
- obj-$(CONFIG_USB)		+= core/
- obj-$(CONFIG_USB_SUPPORT)	+= phy/
- 
-+obj-$(CONFIG_USB_DWCOTG)	+= host/
- obj-$(CONFIG_USB_DWC3)		+= dwc3/
- obj-$(CONFIG_USB_DWC2)		+= dwc2/
- obj-$(CONFIG_USB_ISP1760)	+= isp1760/
---- a/drivers/usb/core/generic.c
-+++ b/drivers/usb/core/generic.c
-@@ -190,6 +190,7 @@ int usb_choose_configuration(struct usb_
- 		dev_warn(&udev->dev,
- 			"no configuration chosen from %d choice%s\n",
- 			num_configs, plural(num_configs));
-+		dev_warn(&udev->dev, "No support over %dmA\n", udev->bus_mA);
- 	}
- 	return i;
- }
---- a/drivers/usb/core/hub.c
-+++ b/drivers/usb/core/hub.c
-@@ -5698,7 +5698,7 @@ static void port_event(struct usb_hub *h
- 		port_dev->over_current_count++;
- 		port_over_current_notify(port_dev);
- 
--		dev_dbg(&port_dev->dev, "over-current change #%u\n",
-+		dev_notice(&port_dev->dev, "over-current change #%u\n",
- 			port_dev->over_current_count);
- 		usb_clear_port_feature(hdev, port1,
- 				USB_PORT_FEAT_C_OVER_CURRENT);
---- a/drivers/usb/core/message.c
-+++ b/drivers/usb/core/message.c
-@@ -2135,6 +2135,85 @@ free_interfaces:
- 	if (cp->string == NULL &&
- 			!(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS))
- 		cp->string = usb_cache_string(dev, cp->desc.iConfiguration);
-+/* Uncomment this define to enable the HS Electrical Test support */
-+#define DWC_HS_ELECT_TST 1
-+#ifdef DWC_HS_ELECT_TST
-+		/* Here we implement the HS Electrical Test support. The
-+		 * tester uses a vendor ID of 0x1A0A to indicate we should
-+		 * run a special test sequence. The product ID tells us
-+		 * which sequence to run. We invoke the test sequence by
-+		 * sending a non-standard SetFeature command to our root
-+		 * hub port. Our dwc_otg_hcd_hub_control() routine will
-+		 * recognize the command and perform the desired test
-+		 * sequence.
-+		 */
-+		if (dev->descriptor.idVendor == 0x1A0A) {
-+			/* HSOTG Electrical Test */
-+			dev_warn(&dev->dev, "VID from HSOTG Electrical Test Fixture\n");
-+
-+			if (dev->bus && dev->bus->root_hub) {
-+				struct usb_device *hdev = dev->bus->root_hub;
-+				dev_warn(&dev->dev, "Got PID 0x%x\n", dev->descriptor.idProduct);
-+
-+				switch (dev->descriptor.idProduct) {
-+				case 0x0101:	/* TEST_SE0_NAK */
-+					dev_warn(&dev->dev, "TEST_SE0_NAK\n");
-+					usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
-+							USB_REQ_SET_FEATURE, USB_RT_PORT,
-+							USB_PORT_FEAT_TEST, 0x300, NULL, 0, HZ);
-+					break;
-+
-+				case 0x0102:	/* TEST_J */
-+					dev_warn(&dev->dev, "TEST_J\n");
-+					usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
-+							USB_REQ_SET_FEATURE, USB_RT_PORT,
-+							USB_PORT_FEAT_TEST, 0x100, NULL, 0, HZ);
-+					break;
-+
-+				case 0x0103:	/* TEST_K */
-+					dev_warn(&dev->dev, "TEST_K\n");
-+					usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
-+							USB_REQ_SET_FEATURE, USB_RT_PORT,
-+							USB_PORT_FEAT_TEST, 0x200, NULL, 0, HZ);
-+					break;
-+
-+				case 0x0104:	/* TEST_PACKET */
-+					dev_warn(&dev->dev, "TEST_PACKET\n");
-+					usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
-+							USB_REQ_SET_FEATURE, USB_RT_PORT,
-+							USB_PORT_FEAT_TEST, 0x400, NULL, 0, HZ);
-+					break;
-+
-+				case 0x0105:	/* TEST_FORCE_ENABLE */
-+					dev_warn(&dev->dev, "TEST_FORCE_ENABLE\n");
-+					usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
-+							USB_REQ_SET_FEATURE, USB_RT_PORT,
-+							USB_PORT_FEAT_TEST, 0x500, NULL, 0, HZ);
-+					break;
-+
-+				case 0x0106:	/* HS_HOST_PORT_SUSPEND_RESUME */
-+					dev_warn(&dev->dev, "HS_HOST_PORT_SUSPEND_RESUME\n");
-+					usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
-+							USB_REQ_SET_FEATURE, USB_RT_PORT,
-+							USB_PORT_FEAT_TEST, 0x600, NULL, 0, 40 * HZ);
-+					break;
-+
-+				case 0x0107:	/* SINGLE_STEP_GET_DEVICE_DESCRIPTOR setup */
-+					dev_warn(&dev->dev, "SINGLE_STEP_GET_DEVICE_DESCRIPTOR setup\n");
-+					usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
-+							USB_REQ_SET_FEATURE, USB_RT_PORT,
-+							USB_PORT_FEAT_TEST, 0x700, NULL, 0, 40 * HZ);
-+					break;
-+
-+				case 0x0108:	/* SINGLE_STEP_GET_DEVICE_DESCRIPTOR execute */
-+					dev_warn(&dev->dev, "SINGLE_STEP_GET_DEVICE_DESCRIPTOR execute\n");
-+					usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
-+							USB_REQ_SET_FEATURE, USB_RT_PORT,
-+							USB_PORT_FEAT_TEST, 0x800, NULL, 0, 40 * HZ);
-+				}
-+			}
-+		}
-+#endif /* DWC_HS_ELECT_TST */
- 
- 	/* Now that the interfaces are installed, re-enable LPM. */
- 	usb_unlocked_enable_lpm(dev);
---- a/drivers/usb/core/otg_productlist.h
-+++ b/drivers/usb/core/otg_productlist.h
-@@ -11,33 +11,82 @@
- static struct usb_device_id productlist_table[] = {
- 
- /* hubs are optional in OTG, but very handy ... */
-+#define CERT_WITHOUT_HUBS
-+#if defined(CERT_WITHOUT_HUBS)
-+{ USB_DEVICE( 0x0000, 0x0000 ), }, /* Root HUB Only*/
-+#else
- { USB_DEVICE_INFO(USB_CLASS_HUB, 0, 0), },
- { USB_DEVICE_INFO(USB_CLASS_HUB, 0, 1), },
-+{ USB_DEVICE_INFO(USB_CLASS_HUB, 0, 2), },
-+#endif
- 
- #ifdef	CONFIG_USB_PRINTER		/* ignoring nonstatic linkage! */
- /* FIXME actually, printers are NOT supposed to use device classes;
-  * they're supposed to use interface classes...
-  */
--{ USB_DEVICE_INFO(7, 1, 1) },
--{ USB_DEVICE_INFO(7, 1, 2) },
--{ USB_DEVICE_INFO(7, 1, 3) },
-+//{ USB_DEVICE_INFO(7, 1, 1) },
-+//{ USB_DEVICE_INFO(7, 1, 2) },
-+//{ USB_DEVICE_INFO(7, 1, 3) },
- #endif
- 
- #ifdef	CONFIG_USB_NET_CDCETHER
- /* Linux-USB CDC Ethernet gadget */
--{ USB_DEVICE(0x0525, 0xa4a1), },
-+//{ USB_DEVICE(0x0525, 0xa4a1), },
- /* Linux-USB CDC Ethernet + RNDIS gadget */
--{ USB_DEVICE(0x0525, 0xa4a2), },
-+//{ USB_DEVICE(0x0525, 0xa4a2), },
- #endif
- 
- #if	IS_ENABLED(CONFIG_USB_TEST)
- /* gadget zero, for testing */
--{ USB_DEVICE(0x0525, 0xa4a0), },
-+//{ USB_DEVICE(0x0525, 0xa4a0), },
- #endif
- 
-+/* OPT Tester */
-+{ USB_DEVICE( 0x1a0a, 0x0101 ), }, /* TEST_SE0_NAK */
-+{ USB_DEVICE( 0x1a0a, 0x0102 ), }, /* Test_J */
-+{ USB_DEVICE( 0x1a0a, 0x0103 ), }, /* Test_K */
-+{ USB_DEVICE( 0x1a0a, 0x0104 ), }, /* Test_PACKET */
-+{ USB_DEVICE( 0x1a0a, 0x0105 ), }, /* Test_FORCE_ENABLE */
-+{ USB_DEVICE( 0x1a0a, 0x0106 ), }, /* HS_PORT_SUSPEND_RESUME  */
-+{ USB_DEVICE( 0x1a0a, 0x0107 ), }, /* SINGLE_STEP_GET_DESCRIPTOR setup */
-+{ USB_DEVICE( 0x1a0a, 0x0108 ), }, /* SINGLE_STEP_GET_DESCRIPTOR execute */
-+
-+/* Sony cameras */
-+{ USB_DEVICE_VER(0x054c,0x0010,0x0410, 0x0500), },
-+
-+/* Memory Devices */
-+//{ USB_DEVICE( 0x0781, 0x5150 ), }, /* SanDisk */
-+//{ USB_DEVICE( 0x05DC, 0x0080 ), }, /* Lexar */
-+//{ USB_DEVICE( 0x4146, 0x9281 ), }, /* IOMEGA */
-+//{ USB_DEVICE( 0x067b, 0x2507 ), }, /* Hammer 20GB External HD  */
-+{ USB_DEVICE( 0x0EA0, 0x2168 ), }, /* Ours Technology Inc. (BUFFALO ClipDrive)*/
-+//{ USB_DEVICE( 0x0457, 0x0150 ), }, /* Silicon Integrated Systems Corp. */
-+
-+/* HP Printers */
-+//{ USB_DEVICE( 0x03F0, 0x1102 ), }, /* HP Photosmart 245 */
-+//{ USB_DEVICE( 0x03F0, 0x1302 ), }, /* HP Photosmart 370 Series */
-+
-+/* Speakers */
-+//{ USB_DEVICE( 0x0499, 0x3002 ), }, /* YAMAHA YST-MS35D USB Speakers */
-+//{ USB_DEVICE( 0x0672, 0x1041 ), }, /* Labtec USB Headset */
-+
- { }	/* Terminating entry */
- };
- 
-+static inline void report_errors(struct usb_device *dev)
-+{
-+	/* OTG MESSAGE: report errors here, customize to match your product */
-+	dev_info(&dev->dev, "device Vendor:%04x Product:%04x is not supported\n",
-+		 le16_to_cpu(dev->descriptor.idVendor),
-+		 le16_to_cpu(dev->descriptor.idProduct));
-+        if (USB_CLASS_HUB == dev->descriptor.bDeviceClass){
-+                dev_printk(KERN_CRIT, &dev->dev, "Unsupported Hub Topology\n");
-+        } else {
-+                dev_printk(KERN_CRIT, &dev->dev, "Attached Device is not Supported\n");
-+        }
-+}
-+
-+
- static int is_targeted(struct usb_device *dev)
- {
- 	struct usb_device_id	*id = productlist_table;
-@@ -87,16 +136,57 @@ static int is_targeted(struct usb_device
- 			continue;
- 
- 		return 1;
--	}
-+		/* NOTE: can't use usb_match_id() since interface caches
-+		 * aren't set up yet. this is cut/paste from that code.
-+		 */
-+		for (id = productlist_table; id->match_flags; id++) {
-+#ifdef DEBUG
-+			dev_dbg(&dev->dev,
-+				"ID: V:%04x P:%04x DC:%04x SC:%04x PR:%04x \n",
-+				id->idVendor,
-+				id->idProduct,
-+				id->bDeviceClass,
-+				id->bDeviceSubClass,
-+				id->bDeviceProtocol);
-+#endif
- 
--	/* add other match criteria here ... */
-+			if ((id->match_flags & USB_DEVICE_ID_MATCH_VENDOR) &&
-+			    id->idVendor != le16_to_cpu(dev->descriptor.idVendor))
-+				continue;
-+
-+			if ((id->match_flags & USB_DEVICE_ID_MATCH_PRODUCT) &&
-+			    id->idProduct != le16_to_cpu(dev->descriptor.idProduct))
-+				continue;
-+
-+			/* No need to test id->bcdDevice_lo != 0, since 0 is never
-+			   greater than any unsigned number. */
-+			if ((id->match_flags & USB_DEVICE_ID_MATCH_DEV_LO) &&
-+			    (id->bcdDevice_lo > le16_to_cpu(dev->descriptor.bcdDevice)))
-+				continue;
-+
-+			if ((id->match_flags & USB_DEVICE_ID_MATCH_DEV_HI) &&
-+			    (id->bcdDevice_hi < le16_to_cpu(dev->descriptor.bcdDevice)))
-+				continue;
-+
-+			if ((id->match_flags & USB_DEVICE_ID_MATCH_DEV_CLASS) &&
-+			    (id->bDeviceClass != dev->descriptor.bDeviceClass))
-+				continue;
-+
-+			if ((id->match_flags & USB_DEVICE_ID_MATCH_DEV_SUBCLASS) &&
-+			    (id->bDeviceSubClass != dev->descriptor.bDeviceSubClass))
-+				continue;
-+
-+			if ((id->match_flags & USB_DEVICE_ID_MATCH_DEV_PROTOCOL) &&
-+			    (id->bDeviceProtocol != dev->descriptor.bDeviceProtocol))
-+				continue;
- 
-+			return 1;
-+		}
-+	}
- 
--	/* OTG MESSAGE: report errors here, customize to match your product */
--	dev_err(&dev->dev, "device v%04x p%04x is not supported\n",
--		le16_to_cpu(dev->descriptor.idVendor),
--		le16_to_cpu(dev->descriptor.idProduct));
-+	/* add other match criteria here ... */
- 
-+	report_errors(dev);
- 	return 0;
- }
- 
---- /dev/null
-+++ b/drivers/usb/gadget/file_storage.c
-@@ -0,0 +1,3676 @@
-+/*
-+ * file_storage.c -- File-backed USB Storage Gadget, for USB development
-+ *
-+ * Copyright (C) 2003-2008 Alan Stern
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions, and the following disclaimer,
-+ *    without modification.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. The names of the above-listed copyright holders may not be used
-+ *    to endorse or promote products derived from this software without
-+ *    specific prior written permission.
-+ *
-+ * ALTERNATIVELY, this software may be distributed under the terms of the
-+ * GNU General Public License ("GPL") as published by the Free Software
-+ * Foundation, either version 2 of that License or (at your option) any
-+ * later version.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+
-+/*
-+ * The File-backed Storage Gadget acts as a USB Mass Storage device,
-+ * appearing to the host as a disk drive or as a CD-ROM drive.  In addition
-+ * to providing an example of a genuinely useful gadget driver for a USB
-+ * device, it also illustrates a technique of double-buffering for increased
-+ * throughput.  Last but not least, it gives an easy way to probe the
-+ * behavior of the Mass Storage drivers in a USB host.
-+ *
-+ * Backing storage is provided by a regular file or a block device, specified
-+ * by the "file" module parameter.  Access can be limited to read-only by
-+ * setting the optional "ro" module parameter.  (For CD-ROM emulation,
-+ * access is always read-only.)  The gadget will indicate that it has
-+ * removable media if the optional "removable" module parameter is set.
-+ *
-+ * The gadget supports the Control-Bulk (CB), Control-Bulk-Interrupt (CBI),
-+ * and Bulk-Only (also known as Bulk-Bulk-Bulk or BBB) transports, selected
-+ * by the optional "transport" module parameter.  It also supports the
-+ * following protocols: RBC (0x01), ATAPI or SFF-8020i (0x02), QIC-157 (0c03),
-+ * UFI (0x04), SFF-8070i (0x05), and transparent SCSI (0x06), selected by
-+ * the optional "protocol" module parameter.  In addition, the default
-+ * Vendor ID, Product ID, release number and serial number can be overridden.
-+ *
-+ * There is support for multiple logical units (LUNs), each of which has
-+ * its own backing file.  The number of LUNs can be set using the optional
-+ * "luns" module parameter (anywhere from 1 to 8), and the corresponding
-+ * files are specified using comma-separated lists for "file" and "ro".
-+ * The default number of LUNs is taken from the number of "file" elements;
-+ * it is 1 if "file" is not given.  If "removable" is not set then a backing
-+ * file must be specified for each LUN.  If it is set, then an unspecified
-+ * or empty backing filename means the LUN's medium is not loaded.  Ideally
-+ * each LUN would be settable independently as a disk drive or a CD-ROM
-+ * drive, but currently all LUNs have to be the same type.  The CD-ROM
-+ * emulation includes a single data track and no audio tracks; hence there
-+ * need be only one backing file per LUN.
-+ *
-+ * Requirements are modest; only a bulk-in and a bulk-out endpoint are
-+ * needed (an interrupt-out endpoint is also needed for CBI).  The memory
-+ * requirement amounts to two 16K buffers, size configurable by a parameter.
-+ * Support is included for both full-speed and high-speed operation.
-+ *
-+ * Note that the driver is slightly non-portable in that it assumes a
-+ * single memory/DMA buffer will be useable for bulk-in, bulk-out, and
-+ * interrupt-in endpoints.  With most device controllers this isn't an
-+ * issue, but there may be some with hardware restrictions that prevent
-+ * a buffer from being used by more than one endpoint.
-+ *
-+ * Module options:
-+ *
-+ *	file=filename[,filename...]
-+ *				Required if "removable" is not set, names of
-+ *					the files or block devices used for
-+ *					backing storage
-+ *	serial=HHHH...		Required serial number (string of hex chars)
-+ *	ro=b[,b...]		Default false, booleans for read-only access
-+ *	removable		Default false, boolean for removable media
-+ *	luns=N			Default N = number of filenames, number of
-+ *					LUNs to support
-+ *	nofua=b[,b...]		Default false, booleans for ignore FUA flag
-+ *					in SCSI WRITE(10,12) commands
-+ *	stall			Default determined according to the type of
-+ *					USB device controller (usually true),
-+ *					boolean to permit the driver to halt
-+ *					bulk endpoints
-+ *	cdrom			Default false, boolean for whether to emulate
-+ *					a CD-ROM drive
-+ *	transport=XXX		Default BBB, transport name (CB, CBI, or BBB)
-+ *	protocol=YYY		Default SCSI, protocol name (RBC, 8020 or
-+ *					ATAPI, QIC, UFI, 8070, or SCSI;
-+ *					also 1 - 6)
-+ *	vendor=0xVVVV		Default 0x0525 (NetChip), USB Vendor ID
-+ *	product=0xPPPP		Default 0xa4a5 (FSG), USB Product ID
-+ *	release=0xRRRR		Override the USB release number (bcdDevice)
-+ *	buflen=N		Default N=16384, buffer size used (will be
-+ *					rounded down to a multiple of
-+ *					PAGE_CACHE_SIZE)
-+ *
-+ * If CONFIG_USB_FILE_STORAGE_TEST is not set, only the "file", "serial", "ro",
-+ * "removable", "luns", "nofua", "stall", and "cdrom" options are available;
-+ * default values are used for everything else.
-+ *
-+ * The pathnames of the backing files and the ro settings are available in
-+ * the attribute files "file", "nofua", and "ro" in the lun<n> subdirectory of
-+ * the gadget's sysfs directory.  If the "removable" option is set, writing to
-+ * these files will simulate ejecting/loading the medium (writing an empty
-+ * line means eject) and adjusting a write-enable tab.  Changes to the ro
-+ * setting are not allowed when the medium is loaded or if CD-ROM emulation
-+ * is being used.
-+ *
-+ * This gadget driver is heavily based on "Gadget Zero" by David Brownell.
-+ * The driver's SCSI command interface was based on the "Information
-+ * technology - Small Computer System Interface - 2" document from
-+ * X3T9.2 Project 375D, Revision 10L, 7-SEP-93, available at
-+ * <http://www.t10.org/ftp/t10/drafts/s2/s2-r10l.pdf>.  The single exception
-+ * is opcode 0x23 (READ FORMAT CAPACITIES), which was based on the
-+ * "Universal Serial Bus Mass Storage Class UFI Command Specification"
-+ * document, Revision 1.0, December 14, 1998, available at
-+ * <http://www.usb.org/developers/devclass_docs/usbmass-ufi10.pdf>.
-+ */
-+
-+
-+/*
-+ *				Driver Design
-+ *
-+ * The FSG driver is fairly straightforward.  There is a main kernel
-+ * thread that handles most of the work.  Interrupt routines field
-+ * callbacks from the controller driver: bulk- and interrupt-request
-+ * completion notifications, endpoint-0 events, and disconnect events.
-+ * Completion events are passed to the main thread by wakeup calls.  Many
-+ * ep0 requests are handled at interrupt time, but SetInterface,
-+ * SetConfiguration, and device reset requests are forwarded to the
-+ * thread in the form of "exceptions" using SIGUSR1 signals (since they
-+ * should interrupt any ongoing file I/O operations).
-+ *
-+ * The thread's main routine implements the standard command/data/status
-+ * parts of a SCSI interaction.  It and its subroutines are full of tests
-+ * for pending signals/exceptions -- all this polling is necessary since
-+ * the kernel has no setjmp/longjmp equivalents.  (Maybe this is an
-+ * indication that the driver really wants to be running in userspace.)
-+ * An important point is that so long as the thread is alive it keeps an
-+ * open reference to the backing file.  This will prevent unmounting
-+ * the backing file's underlying filesystem and could cause problems
-+ * during system shutdown, for example.  To prevent such problems, the
-+ * thread catches INT, TERM, and KILL signals and converts them into
-+ * an EXIT exception.
-+ *
-+ * In normal operation the main thread is started during the gadget's
-+ * fsg_bind() callback and stopped during fsg_unbind().  But it can also
-+ * exit when it receives a signal, and there's no point leaving the
-+ * gadget running when the thread is dead.  So just before the thread
-+ * exits, it deregisters the gadget driver.  This makes things a little
-+ * tricky: The driver is deregistered at two places, and the exiting
-+ * thread can indirectly call fsg_unbind() which in turn can tell the
-+ * thread to exit.  The first problem is resolved through the use of the
-+ * REGISTERED atomic bitflag; the driver will only be deregistered once.
-+ * The second problem is resolved by having fsg_unbind() check
-+ * fsg->state; it won't try to stop the thread if the state is already
-+ * FSG_STATE_TERMINATED.
-+ *
-+ * To provide maximum throughput, the driver uses a circular pipeline of
-+ * buffer heads (struct fsg_buffhd).  In principle the pipeline can be
-+ * arbitrarily long; in practice the benefits don't justify having more
-+ * than 2 stages (i.e., double buffering).  But it helps to think of the
-+ * pipeline as being a long one.  Each buffer head contains a bulk-in and
-+ * a bulk-out request pointer (since the buffer can be used for both
-+ * output and input -- directions always are given from the host's
-+ * point of view) as well as a pointer to the buffer and various state
-+ * variables.
-+ *
-+ * Use of the pipeline follows a simple protocol.  There is a variable
-+ * (fsg->next_buffhd_to_fill) that points to the next buffer head to use.
-+ * At any time that buffer head may still be in use from an earlier
-+ * request, so each buffer head has a state variable indicating whether
-+ * it is EMPTY, FULL, or BUSY.  Typical use involves waiting for the
-+ * buffer head to be EMPTY, filling the buffer either by file I/O or by
-+ * USB I/O (during which the buffer head is BUSY), and marking the buffer
-+ * head FULL when the I/O is complete.  Then the buffer will be emptied
-+ * (again possibly by USB I/O, during which it is marked BUSY) and
-+ * finally marked EMPTY again (possibly by a completion routine).
-+ *
-+ * A module parameter tells the driver to avoid stalling the bulk
-+ * endpoints wherever the transport specification allows.  This is
-+ * necessary for some UDCs like the SuperH, which cannot reliably clear a
-+ * halt on a bulk endpoint.  However, under certain circumstances the
-+ * Bulk-only specification requires a stall.  In such cases the driver
-+ * will halt the endpoint and set a flag indicating that it should clear
-+ * the halt in software during the next device reset.  Hopefully this
-+ * will permit everything to work correctly.  Furthermore, although the
-+ * specification allows the bulk-out endpoint to halt when the host sends
-+ * too much data, implementing this would cause an unavoidable race.
-+ * The driver will always use the "no-stall" approach for OUT transfers.
-+ *
-+ * One subtle point concerns sending status-stage responses for ep0
-+ * requests.  Some of these requests, such as device reset, can involve
-+ * interrupting an ongoing file I/O operation, which might take an
-+ * arbitrarily long time.  During that delay the host might give up on
-+ * the original ep0 request and issue a new one.  When that happens the
-+ * driver should not notify the host about completion of the original
-+ * request, as the host will no longer be waiting for it.  So the driver
-+ * assigns to each ep0 request a unique tag, and it keeps track of the
-+ * tag value of the request associated with a long-running exception
-+ * (device-reset, interface-change, or configuration-change).  When the
-+ * exception handler is finished, the status-stage response is submitted
-+ * only if the current ep0 request tag is equal to the exception request
-+ * tag.  Thus only the most recently received ep0 request will get a
-+ * status-stage response.
-+ *
-+ * Warning: This driver source file is too long.  It ought to be split up
-+ * into a header file plus about 3 separate .c files, to handle the details
-+ * of the Gadget, USB Mass Storage, and SCSI protocols.
-+ */
-+
-+
-+/* #define VERBOSE_DEBUG */
-+/* #define DUMP_MSGS */
-+
-+
-+#include <linux/blkdev.h>
-+#include <linux/completion.h>
-+#include <linux/dcache.h>
-+#include <linux/delay.h>
-+#include <linux/device.h>
-+#include <linux/fcntl.h>
-+#include <linux/file.h>
-+#include <linux/fs.h>
-+#include <linux/kref.h>
-+#include <linux/kthread.h>
-+#include <linux/limits.h>
-+#include <linux/module.h>
-+#include <linux/rwsem.h>
-+#include <linux/slab.h>
-+#include <linux/spinlock.h>
-+#include <linux/string.h>
-+#include <linux/freezer.h>
-+#include <linux/utsname.h>
-+
-+#include <linux/usb/ch9.h>
-+#include <linux/usb/gadget.h>
-+
-+#include "gadget_chips.h"
-+
-+
-+
-+/*
-+ * Kbuild is not very cooperative with respect to linking separately
-+ * compiled library objects into one module.  So for now we won't use
-+ * separate compilation ... ensuring init/exit sections work to shrink
-+ * the runtime footprint, and giving us at least some parts of what
-+ * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
-+ */
-+#include "usbstring.c"
-+#include "config.c"
-+#include "epautoconf.c"
-+
-+/*-------------------------------------------------------------------------*/
-+
-+#define DRIVER_DESC		"File-backed Storage Gadget"
-+#define DRIVER_NAME		"g_file_storage"
-+#define DRIVER_VERSION		"1 September 2010"
-+
-+static       char fsg_string_manufacturer[64];
-+static const char fsg_string_product[] = DRIVER_DESC;
-+static const char fsg_string_config[] = "Self-powered";
-+static const char fsg_string_interface[] = "Mass Storage";
-+
-+
-+#include "storage_common.c"
-+
-+
-+MODULE_DESCRIPTION(DRIVER_DESC);
-+MODULE_AUTHOR("Alan Stern");
-+MODULE_LICENSE("Dual BSD/GPL");
-+
-+/*
-+ * This driver assumes self-powered hardware and has no way for users to
-+ * trigger remote wakeup.  It uses autoconfiguration to select endpoints
-+ * and endpoint addresses.
-+ */
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+
-+/* Encapsulate the module parameter settings */
-+
-+static struct {
-+	char		*file[FSG_MAX_LUNS];
-+	char		*serial;
-+	bool		ro[FSG_MAX_LUNS];
-+	bool		nofua[FSG_MAX_LUNS];
-+	unsigned int	num_filenames;
-+	unsigned int	num_ros;
-+	unsigned int	num_nofuas;
-+	unsigned int	nluns;
-+
-+	bool		removable;
-+	bool		can_stall;
-+	bool		cdrom;
-+
-+	char		*transport_parm;
-+	char		*protocol_parm;
-+	unsigned short	vendor;
-+	unsigned short	product;
-+	unsigned short	release;
-+	unsigned int	buflen;
-+
-+	int		transport_type;
-+	char		*transport_name;
-+	int		protocol_type;
-+	char		*protocol_name;
-+
-+} mod_data = {					// Default values
-+	.transport_parm		= "BBB",
-+	.protocol_parm		= "SCSI",
-+	.removable		= 0,
-+	.can_stall		= 1,
-+	.cdrom			= 0,
-+	.vendor			= FSG_VENDOR_ID,
-+	.product		= FSG_PRODUCT_ID,
-+	.release		= 0xffff,	// Use controller chip type
-+	.buflen			= 16384,
-+	};
-+
-+
-+module_param_array_named(file, mod_data.file, charp, &mod_data.num_filenames,
-+		S_IRUGO);
-+MODULE_PARM_DESC(file, "names of backing files or devices");
-+
-+module_param_named(serial, mod_data.serial, charp, S_IRUGO);
-+MODULE_PARM_DESC(serial, "USB serial number");
-+
-+module_param_array_named(ro, mod_data.ro, bool, &mod_data.num_ros, S_IRUGO);
-+MODULE_PARM_DESC(ro, "true to force read-only");
-+
-+module_param_array_named(nofua, mod_data.nofua, bool, &mod_data.num_nofuas,
-+		S_IRUGO);
-+MODULE_PARM_DESC(nofua, "true to ignore SCSI WRITE(10,12) FUA bit");
-+
-+module_param_named(luns, mod_data.nluns, uint, S_IRUGO);
-+MODULE_PARM_DESC(luns, "number of LUNs");
-+
-+module_param_named(removable, mod_data.removable, bool, S_IRUGO);
-+MODULE_PARM_DESC(removable, "true to simulate removable media");
-+
-+module_param_named(stall, mod_data.can_stall, bool, S_IRUGO);
-+MODULE_PARM_DESC(stall, "false to prevent bulk stalls");
-+
-+module_param_named(cdrom, mod_data.cdrom, bool, S_IRUGO);
-+MODULE_PARM_DESC(cdrom, "true to emulate cdrom instead of disk");
-+
-+/* In the non-TEST version, only the module parameters listed above
-+ * are available. */
-+#ifdef CONFIG_USB_FILE_STORAGE_TEST
-+
-+module_param_named(transport, mod_data.transport_parm, charp, S_IRUGO);
-+MODULE_PARM_DESC(transport, "type of transport (BBB, CBI, or CB)");
-+
-+module_param_named(protocol, mod_data.protocol_parm, charp, S_IRUGO);
-+MODULE_PARM_DESC(protocol, "type of protocol (RBC, 8020, QIC, UFI, "
-+		"8070, or SCSI)");
-+
-+module_param_named(vendor, mod_data.vendor, ushort, S_IRUGO);
-+MODULE_PARM_DESC(vendor, "USB Vendor ID");
-+
-+module_param_named(product, mod_data.product, ushort, S_IRUGO);
-+MODULE_PARM_DESC(product, "USB Product ID");
-+
-+module_param_named(release, mod_data.release, ushort, S_IRUGO);
-+MODULE_PARM_DESC(release, "USB release number");
-+
-+module_param_named(buflen, mod_data.buflen, uint, S_IRUGO);
-+MODULE_PARM_DESC(buflen, "I/O buffer size");
-+
-+#endif /* CONFIG_USB_FILE_STORAGE_TEST */
-+
-+
-+/*
-+ * These definitions will permit the compiler to avoid generating code for
-+ * parts of the driver that aren't used in the non-TEST version.  Even gcc
-+ * can recognize when a test of a constant expression yields a dead code
-+ * path.
-+ */
-+
-+#ifdef CONFIG_USB_FILE_STORAGE_TEST
-+
-+#define transport_is_bbb()	(mod_data.transport_type == USB_PR_BULK)
-+#define transport_is_cbi()	(mod_data.transport_type == USB_PR_CBI)
-+#define protocol_is_scsi()	(mod_data.protocol_type == USB_SC_SCSI)
-+
-+#else
-+
-+#define transport_is_bbb()	1
-+#define transport_is_cbi()	0
-+#define protocol_is_scsi()	1
-+
-+#endif /* CONFIG_USB_FILE_STORAGE_TEST */
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+
-+struct fsg_dev {
-+	/* lock protects: state, all the req_busy's, and cbbuf_cmnd */
-+	spinlock_t		lock;
-+	struct usb_gadget	*gadget;
-+
-+	/* filesem protects: backing files in use */
-+	struct rw_semaphore	filesem;
-+
-+	/* reference counting: wait until all LUNs are released */
-+	struct kref		ref;
-+
-+	struct usb_ep		*ep0;		// Handy copy of gadget->ep0
-+	struct usb_request	*ep0req;	// For control responses
-+	unsigned int		ep0_req_tag;
-+	const char		*ep0req_name;
-+
-+	struct usb_request	*intreq;	// For interrupt responses
-+	int			intreq_busy;
-+	struct fsg_buffhd	*intr_buffhd;
-+
-+	unsigned int		bulk_out_maxpacket;
-+	enum fsg_state		state;		// For exception handling
-+	unsigned int		exception_req_tag;
-+
-+	u8			config, new_config;
-+
-+	unsigned int		running : 1;
-+	unsigned int		bulk_in_enabled : 1;
-+	unsigned int		bulk_out_enabled : 1;
-+	unsigned int		intr_in_enabled : 1;
-+	unsigned int		phase_error : 1;
-+	unsigned int		short_packet_received : 1;
-+	unsigned int		bad_lun_okay : 1;
-+
-+	unsigned long		atomic_bitflags;
-+#define REGISTERED		0
-+#define IGNORE_BULK_OUT		1
-+#define SUSPENDED		2
-+
-+	struct usb_ep		*bulk_in;
-+	struct usb_ep		*bulk_out;
-+	struct usb_ep		*intr_in;
-+
-+	struct fsg_buffhd	*next_buffhd_to_fill;
-+	struct fsg_buffhd	*next_buffhd_to_drain;
-+
-+	int			thread_wakeup_needed;
-+	struct completion	thread_notifier;
-+	struct task_struct	*thread_task;
-+
-+	int			cmnd_size;
-+	u8			cmnd[MAX_COMMAND_SIZE];
-+	enum data_direction	data_dir;
-+	u32			data_size;
-+	u32			data_size_from_cmnd;
-+	u32			tag;
-+	unsigned int		lun;
-+	u32			residue;
-+	u32			usb_amount_left;
-+
-+	/* The CB protocol offers no way for a host to know when a command
-+	 * has completed.  As a result the next command may arrive early,
-+	 * and we will still have to handle it.  For that reason we need
-+	 * a buffer to store new commands when using CB (or CBI, which
-+	 * does not oblige a host to wait for command completion either). */
-+	int			cbbuf_cmnd_size;
-+	u8			cbbuf_cmnd[MAX_COMMAND_SIZE];
-+
-+	unsigned int		nluns;
-+	struct fsg_lun		*luns;
-+	struct fsg_lun		*curlun;
-+	/* Must be the last entry */
-+	struct fsg_buffhd	buffhds[];
-+};
-+
-+typedef void (*fsg_routine_t)(struct fsg_dev *);
-+
-+static int exception_in_progress(struct fsg_dev *fsg)
-+{
-+	return (fsg->state > FSG_STATE_IDLE);
-+}
-+
-+/* Make bulk-out requests be divisible by the maxpacket size */
-+static void set_bulk_out_req_length(struct fsg_dev *fsg,
-+		struct fsg_buffhd *bh, unsigned int length)
-+{
-+	unsigned int	rem;
-+
-+	bh->bulk_out_intended_length = length;
-+	rem = length % fsg->bulk_out_maxpacket;
-+	if (rem > 0)
-+		length += fsg->bulk_out_maxpacket - rem;
-+	bh->outreq->length = length;
-+}
-+
-+static struct fsg_dev			*the_fsg;
-+static struct usb_gadget_driver		fsg_driver;
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static int fsg_set_halt(struct fsg_dev *fsg, struct usb_ep *ep)
-+{
-+	const char	*name;
-+
-+	if (ep == fsg->bulk_in)
-+		name = "bulk-in";
-+	else if (ep == fsg->bulk_out)
-+		name = "bulk-out";
-+	else
-+		name = ep->name;
-+	DBG(fsg, "%s set halt\n", name);
-+	return usb_ep_set_halt(ep);
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/*
-+ * DESCRIPTORS ... most are static, but strings and (full) configuration
-+ * descriptors are built on demand.  Also the (static) config and interface
-+ * descriptors are adjusted during fsg_bind().
-+ */
-+
-+/* There is only one configuration. */
-+#define	CONFIG_VALUE		1
-+
-+static struct usb_device_descriptor
-+device_desc = {
-+	.bLength =		sizeof device_desc,
-+	.bDescriptorType =	USB_DT_DEVICE,
-+
-+	.bcdUSB =		cpu_to_le16(0x0200),
-+	.bDeviceClass =		USB_CLASS_PER_INTERFACE,
-+
-+	/* The next three values can be overridden by module parameters */
-+	.idVendor =		cpu_to_le16(FSG_VENDOR_ID),
-+	.idProduct =		cpu_to_le16(FSG_PRODUCT_ID),
-+	.bcdDevice =		cpu_to_le16(0xffff),
-+
-+	.iManufacturer =	FSG_STRING_MANUFACTURER,
-+	.iProduct =		FSG_STRING_PRODUCT,
-+	.iSerialNumber =	FSG_STRING_SERIAL,
-+	.bNumConfigurations =	1,
-+};
-+
-+static struct usb_config_descriptor
-+config_desc = {
-+	.bLength =		sizeof config_desc,
-+	.bDescriptorType =	USB_DT_CONFIG,
-+
-+	/* wTotalLength computed by usb_gadget_config_buf() */
-+	.bNumInterfaces =	1,
-+	.bConfigurationValue =	CONFIG_VALUE,
-+	.iConfiguration =	FSG_STRING_CONFIG,
-+	.bmAttributes =		USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER,
-+	.bMaxPower =		CONFIG_USB_GADGET_VBUS_DRAW / 2,
-+};
-+
-+
-+static struct usb_qualifier_descriptor
-+dev_qualifier = {
-+	.bLength =		sizeof dev_qualifier,
-+	.bDescriptorType =	USB_DT_DEVICE_QUALIFIER,
-+
-+	.bcdUSB =		cpu_to_le16(0x0200),
-+	.bDeviceClass =		USB_CLASS_PER_INTERFACE,
-+
-+	.bNumConfigurations =	1,
-+};
-+
-+static int populate_bos(struct fsg_dev *fsg, u8 *buf)
-+{
-+	memcpy(buf, &fsg_bos_desc, USB_DT_BOS_SIZE);
-+	buf += USB_DT_BOS_SIZE;
-+
-+	memcpy(buf, &fsg_ext_cap_desc, USB_DT_USB_EXT_CAP_SIZE);
-+	buf += USB_DT_USB_EXT_CAP_SIZE;
-+
-+	memcpy(buf, &fsg_ss_cap_desc, USB_DT_USB_SS_CAP_SIZE);
-+
-+	return USB_DT_BOS_SIZE + USB_DT_USB_SS_CAP_SIZE
-+		+ USB_DT_USB_EXT_CAP_SIZE;
-+}
-+
-+/*
-+ * Config descriptors must agree with the code that sets configurations
-+ * and with code managing interfaces and their altsettings.  They must
-+ * also handle different speeds and other-speed requests.
-+ */
-+static int populate_config_buf(struct usb_gadget *gadget,
-+		u8 *buf, u8 type, unsigned index)
-+{
-+	enum usb_device_speed			speed = gadget->speed;
-+	int					len;
-+	const struct usb_descriptor_header	**function;
-+
-+	if (index > 0)
-+		return -EINVAL;
-+
-+	if (gadget_is_dualspeed(gadget) && type == USB_DT_OTHER_SPEED_CONFIG)
-+		speed = (USB_SPEED_FULL + USB_SPEED_HIGH) - speed;
-+	function = gadget_is_dualspeed(gadget) && speed == USB_SPEED_HIGH
-+		? (const struct usb_descriptor_header **)fsg_hs_function
-+		: (const struct usb_descriptor_header **)fsg_fs_function;
-+
-+	/* for now, don't advertise srp-only devices */
-+	if (!gadget_is_otg(gadget))
-+		function++;
-+
-+	len = usb_gadget_config_buf(&config_desc, buf, EP0_BUFSIZE, function);
-+	((struct usb_config_descriptor *) buf)->bDescriptorType = type;
-+	return len;
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/* These routines may be called in process context or in_irq */
-+
-+/* Caller must hold fsg->lock */
-+static void wakeup_thread(struct fsg_dev *fsg)
-+{
-+	/* Tell the main thread that something has happened */
-+	fsg->thread_wakeup_needed = 1;
-+	if (fsg->thread_task)
-+		wake_up_process(fsg->thread_task);
-+}
-+
-+
-+static void raise_exception(struct fsg_dev *fsg, enum fsg_state new_state)
-+{
-+	unsigned long		flags;
-+
-+	/* Do nothing if a higher-priority exception is already in progress.
-+	 * If a lower-or-equal priority exception is in progress, preempt it
-+	 * and notify the main thread by sending it a signal. */
-+	spin_lock_irqsave(&fsg->lock, flags);
-+	if (fsg->state <= new_state) {
-+		fsg->exception_req_tag = fsg->ep0_req_tag;
-+		fsg->state = new_state;
-+		if (fsg->thread_task)
-+			send_sig_info(SIGUSR1, SEND_SIG_FORCED,
-+					fsg->thread_task);
-+	}
-+	spin_unlock_irqrestore(&fsg->lock, flags);
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/* The disconnect callback and ep0 routines.  These always run in_irq,
-+ * except that ep0_queue() is called in the main thread to acknowledge
-+ * completion of various requests: set config, set interface, and
-+ * Bulk-only device reset. */
-+
-+static void fsg_disconnect(struct usb_gadget *gadget)
-+{
-+	struct fsg_dev		*fsg = get_gadget_data(gadget);
-+
-+	DBG(fsg, "disconnect or port reset\n");
-+	raise_exception(fsg, FSG_STATE_DISCONNECT);
-+}
-+
-+
-+static int ep0_queue(struct fsg_dev *fsg)
-+{
-+	int	rc;
-+
-+	rc = usb_ep_queue(fsg->ep0, fsg->ep0req, GFP_ATOMIC);
-+	if (rc != 0 && rc != -ESHUTDOWN) {
-+
-+		/* We can't do much more than wait for a reset */
-+		WARNING(fsg, "error in submission: %s --> %d\n",
-+				fsg->ep0->name, rc);
-+	}
-+	return rc;
-+}
-+
-+static void ep0_complete(struct usb_ep *ep, struct usb_request *req)
-+{
-+	struct fsg_dev		*fsg = ep->driver_data;
-+
-+	if (req->actual > 0)
-+		dump_msg(fsg, fsg->ep0req_name, req->buf, req->actual);
-+	if (req->status || req->actual != req->length)
-+		DBG(fsg, "%s --> %d, %u/%u\n", __func__,
-+				req->status, req->actual, req->length);
-+	if (req->status == -ECONNRESET)		// Request was cancelled
-+		usb_ep_fifo_flush(ep);
-+
-+	if (req->status == 0 && req->context)
-+		((fsg_routine_t) (req->context))(fsg);
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/* Bulk and interrupt endpoint completion handlers.
-+ * These always run in_irq. */
-+
-+static void bulk_in_complete(struct usb_ep *ep, struct usb_request *req)
-+{
-+	struct fsg_dev		*fsg = ep->driver_data;
-+	struct fsg_buffhd	*bh = req->context;
-+
-+	if (req->status || req->actual != req->length)
-+		DBG(fsg, "%s --> %d, %u/%u\n", __func__,
-+				req->status, req->actual, req->length);
-+	if (req->status == -ECONNRESET)		// Request was cancelled
-+		usb_ep_fifo_flush(ep);
-+
-+	/* Hold the lock while we update the request and buffer states */
-+	smp_wmb();
-+	spin_lock(&fsg->lock);
-+	bh->inreq_busy = 0;
-+	bh->state = BUF_STATE_EMPTY;
-+	wakeup_thread(fsg);
-+	spin_unlock(&fsg->lock);
-+}
-+
-+static void bulk_out_complete(struct usb_ep *ep, struct usb_request *req)
-+{
-+	struct fsg_dev		*fsg = ep->driver_data;
-+	struct fsg_buffhd	*bh = req->context;
-+
-+	dump_msg(fsg, "bulk-out", req->buf, req->actual);
-+	if (req->status || req->actual != bh->bulk_out_intended_length)
-+		DBG(fsg, "%s --> %d, %u/%u\n", __func__,
-+				req->status, req->actual,
-+				bh->bulk_out_intended_length);
-+	if (req->status == -ECONNRESET)		// Request was cancelled
-+		usb_ep_fifo_flush(ep);
-+
-+	/* Hold the lock while we update the request and buffer states */
-+	smp_wmb();
-+	spin_lock(&fsg->lock);
-+	bh->outreq_busy = 0;
-+	bh->state = BUF_STATE_FULL;
-+	wakeup_thread(fsg);
-+	spin_unlock(&fsg->lock);
-+}
-+
-+
-+#ifdef CONFIG_USB_FILE_STORAGE_TEST
-+static void intr_in_complete(struct usb_ep *ep, struct usb_request *req)
-+{
-+	struct fsg_dev		*fsg = ep->driver_data;
-+	struct fsg_buffhd	*bh = req->context;
-+
-+	if (req->status || req->actual != req->length)
-+		DBG(fsg, "%s --> %d, %u/%u\n", __func__,
-+				req->status, req->actual, req->length);
-+	if (req->status == -ECONNRESET)		// Request was cancelled
-+		usb_ep_fifo_flush(ep);
-+
-+	/* Hold the lock while we update the request and buffer states */
-+	smp_wmb();
-+	spin_lock(&fsg->lock);
-+	fsg->intreq_busy = 0;
-+	bh->state = BUF_STATE_EMPTY;
-+	wakeup_thread(fsg);
-+	spin_unlock(&fsg->lock);
-+}
-+
-+#else
-+static void intr_in_complete(struct usb_ep *ep, struct usb_request *req)
-+{}
-+#endif /* CONFIG_USB_FILE_STORAGE_TEST */
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/* Ep0 class-specific handlers.  These always run in_irq. */
-+
-+#ifdef CONFIG_USB_FILE_STORAGE_TEST
-+static void received_cbi_adsc(struct fsg_dev *fsg, struct fsg_buffhd *bh)
-+{
-+	struct usb_request	*req = fsg->ep0req;
-+	static u8		cbi_reset_cmnd[6] = {
-+			SEND_DIAGNOSTIC, 4, 0xff, 0xff, 0xff, 0xff};
-+
-+	/* Error in command transfer? */
-+	if (req->status || req->length != req->actual ||
-+			req->actual < 6 || req->actual > MAX_COMMAND_SIZE) {
-+
-+		/* Not all controllers allow a protocol stall after
-+		 * receiving control-out data, but we'll try anyway. */
-+		fsg_set_halt(fsg, fsg->ep0);
-+		return;			// Wait for reset
-+	}
-+
-+	/* Is it the special reset command? */
-+	if (req->actual >= sizeof cbi_reset_cmnd &&
-+			memcmp(req->buf, cbi_reset_cmnd,
-+				sizeof cbi_reset_cmnd) == 0) {
-+
-+		/* Raise an exception to stop the current operation
-+		 * and reinitialize our state. */
-+		DBG(fsg, "cbi reset request\n");
-+		raise_exception(fsg, FSG_STATE_RESET);
-+		return;
-+	}
-+
-+	VDBG(fsg, "CB[I] accept device-specific command\n");
-+	spin_lock(&fsg->lock);
-+
-+	/* Save the command for later */
-+	if (fsg->cbbuf_cmnd_size)
-+		WARNING(fsg, "CB[I] overwriting previous command\n");
-+	fsg->cbbuf_cmnd_size = req->actual;
-+	memcpy(fsg->cbbuf_cmnd, req->buf, fsg->cbbuf_cmnd_size);
-+
-+	wakeup_thread(fsg);
-+	spin_unlock(&fsg->lock);
-+}
-+
-+#else
-+static void received_cbi_adsc(struct fsg_dev *fsg, struct fsg_buffhd *bh)
-+{}
-+#endif /* CONFIG_USB_FILE_STORAGE_TEST */
-+
-+
-+static int class_setup_req(struct fsg_dev *fsg,
-+		const struct usb_ctrlrequest *ctrl)
-+{
-+	struct usb_request	*req = fsg->ep0req;
-+	int			value = -EOPNOTSUPP;
-+	u16			w_index = le16_to_cpu(ctrl->wIndex);
-+	u16                     w_value = le16_to_cpu(ctrl->wValue);
-+	u16			w_length = le16_to_cpu(ctrl->wLength);
-+
-+	if (!fsg->config)
-+		return value;
-+
-+	/* Handle Bulk-only class-specific requests */
-+	if (transport_is_bbb()) {
-+		switch (ctrl->bRequest) {
-+
-+		case US_BULK_RESET_REQUEST:
-+			if (ctrl->bRequestType != (USB_DIR_OUT |
-+					USB_TYPE_CLASS | USB_RECIP_INTERFACE))
-+				break;
-+			if (w_index != 0 || w_value != 0 || w_length != 0) {
-+				value = -EDOM;
-+				break;
-+			}
-+
-+			/* Raise an exception to stop the current operation
-+			 * and reinitialize our state. */
-+			DBG(fsg, "bulk reset request\n");
-+			raise_exception(fsg, FSG_STATE_RESET);
-+			value = DELAYED_STATUS;
-+			break;
-+
-+		case US_BULK_GET_MAX_LUN:
-+			if (ctrl->bRequestType != (USB_DIR_IN |
-+					USB_TYPE_CLASS | USB_RECIP_INTERFACE))
-+				break;
-+			if (w_index != 0 || w_value != 0 || w_length != 1) {
-+				value = -EDOM;
-+				break;
-+			}
-+			VDBG(fsg, "get max LUN\n");
-+			*(u8 *) req->buf = fsg->nluns - 1;
-+			value = 1;
-+			break;
-+		}
-+	}
-+
-+	/* Handle CBI class-specific requests */
-+	else {
-+		switch (ctrl->bRequest) {
-+
-+		case USB_CBI_ADSC_REQUEST:
-+			if (ctrl->bRequestType != (USB_DIR_OUT |
-+					USB_TYPE_CLASS | USB_RECIP_INTERFACE))
-+				break;
-+			if (w_index != 0 || w_value != 0) {
-+				value = -EDOM;
-+				break;
-+			}
-+			if (w_length > MAX_COMMAND_SIZE) {
-+				value = -EOVERFLOW;
-+				break;
-+			}
-+			value = w_length;
-+			fsg->ep0req->context = received_cbi_adsc;
-+			break;
-+		}
-+	}
-+
-+	if (value == -EOPNOTSUPP)
-+		VDBG(fsg,
-+			"unknown class-specific control req "
-+			"%02x.%02x v%04x i%04x l%u\n",
-+			ctrl->bRequestType, ctrl->bRequest,
-+			le16_to_cpu(ctrl->wValue), w_index, w_length);
-+	return value;
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/* Ep0 standard request handlers.  These always run in_irq. */
-+
-+static int standard_setup_req(struct fsg_dev *fsg,
-+		const struct usb_ctrlrequest *ctrl)
-+{
-+	struct usb_request	*req = fsg->ep0req;
-+	int			value = -EOPNOTSUPP;
-+	u16			w_index = le16_to_cpu(ctrl->wIndex);
-+	u16			w_value = le16_to_cpu(ctrl->wValue);
-+
-+	/* Usually this just stores reply data in the pre-allocated ep0 buffer,
-+	 * but config change events will also reconfigure hardware. */
-+	switch (ctrl->bRequest) {
-+
-+	case USB_REQ_GET_DESCRIPTOR:
-+		if (ctrl->bRequestType != (USB_DIR_IN | USB_TYPE_STANDARD |
-+				USB_RECIP_DEVICE))
-+			break;
-+		switch (w_value >> 8) {
-+
-+		case USB_DT_DEVICE:
-+			VDBG(fsg, "get device descriptor\n");
-+			device_desc.bMaxPacketSize0 = fsg->ep0->maxpacket;
-+			value = sizeof device_desc;
-+			memcpy(req->buf, &device_desc, value);
-+			break;
-+		case USB_DT_DEVICE_QUALIFIER:
-+			VDBG(fsg, "get device qualifier\n");
-+			if (!gadget_is_dualspeed(fsg->gadget) ||
-+					fsg->gadget->speed == USB_SPEED_SUPER)
-+				break;
-+			/*
-+			 * Assume ep0 uses the same maxpacket value for both
-+			 * speeds
-+			 */
-+			dev_qualifier.bMaxPacketSize0 = fsg->ep0->maxpacket;
-+			value = sizeof dev_qualifier;
-+			memcpy(req->buf, &dev_qualifier, value);
-+			break;
-+
-+		case USB_DT_OTHER_SPEED_CONFIG:
-+			VDBG(fsg, "get other-speed config descriptor\n");
-+			if (!gadget_is_dualspeed(fsg->gadget) ||
-+					fsg->gadget->speed == USB_SPEED_SUPER)
-+				break;
-+			goto get_config;
-+		case USB_DT_CONFIG:
-+			VDBG(fsg, "get configuration descriptor\n");
-+get_config:
-+			value = populate_config_buf(fsg->gadget,
-+					req->buf,
-+					w_value >> 8,
-+					w_value & 0xff);
-+			break;
-+
-+		case USB_DT_STRING:
-+			VDBG(fsg, "get string descriptor\n");
-+
-+			/* wIndex == language code */
-+			value = usb_gadget_get_string(&fsg_stringtab,
-+					w_value & 0xff, req->buf);
-+			break;
-+
-+		case USB_DT_BOS:
-+			VDBG(fsg, "get bos descriptor\n");
-+
-+			if (gadget_is_superspeed(fsg->gadget))
-+				value = populate_bos(fsg, req->buf);
-+			break;
-+		}
-+
-+		break;
-+
-+	/* One config, two speeds */
-+	case USB_REQ_SET_CONFIGURATION:
-+		if (ctrl->bRequestType != (USB_DIR_OUT | USB_TYPE_STANDARD |
-+				USB_RECIP_DEVICE))
-+			break;
-+		VDBG(fsg, "set configuration\n");
-+		if (w_value == CONFIG_VALUE || w_value == 0) {
-+			fsg->new_config = w_value;
-+
-+			/* Raise an exception to wipe out previous transaction
-+			 * state (queued bufs, etc) and set the new config. */
-+			raise_exception(fsg, FSG_STATE_CONFIG_CHANGE);
-+			value = DELAYED_STATUS;
-+		}
-+		break;
-+	case USB_REQ_GET_CONFIGURATION:
-+		if (ctrl->bRequestType != (USB_DIR_IN | USB_TYPE_STANDARD |
-+				USB_RECIP_DEVICE))
-+			break;
-+		VDBG(fsg, "get configuration\n");
-+		*(u8 *) req->buf = fsg->config;
-+		value = 1;
-+		break;
-+
-+	case USB_REQ_SET_INTERFACE:
-+		if (ctrl->bRequestType != (USB_DIR_OUT| USB_TYPE_STANDARD |
-+				USB_RECIP_INTERFACE))
-+			break;
-+		if (fsg->config && w_index == 0) {
-+
-+			/* Raise an exception to wipe out previous transaction
-+			 * state (queued bufs, etc) and install the new
-+			 * interface altsetting. */
-+			raise_exception(fsg, FSG_STATE_INTERFACE_CHANGE);
-+			value = DELAYED_STATUS;
-+		}
-+		break;
-+	case USB_REQ_GET_INTERFACE:
-+		if (ctrl->bRequestType != (USB_DIR_IN | USB_TYPE_STANDARD |
-+				USB_RECIP_INTERFACE))
-+			break;
-+		if (!fsg->config)
-+			break;
-+		if (w_index != 0) {
-+			value = -EDOM;
-+			break;
-+		}
-+		VDBG(fsg, "get interface\n");
-+		*(u8 *) req->buf = 0;
-+		value = 1;
-+		break;
-+
-+	default:
-+		VDBG(fsg,
-+			"unknown control req %02x.%02x v%04x i%04x l%u\n",
-+			ctrl->bRequestType, ctrl->bRequest,
-+			w_value, w_index, le16_to_cpu(ctrl->wLength));
-+	}
-+
-+	return value;
-+}
-+
-+
-+static int fsg_setup(struct usb_gadget *gadget,
-+		const struct usb_ctrlrequest *ctrl)
-+{
-+	struct fsg_dev		*fsg = get_gadget_data(gadget);
-+	int			rc;
-+	int			w_length = le16_to_cpu(ctrl->wLength);
-+
-+	++fsg->ep0_req_tag;		// Record arrival of a new request
-+	fsg->ep0req->context = NULL;
-+	fsg->ep0req->length = 0;
-+	dump_msg(fsg, "ep0-setup", (u8 *) ctrl, sizeof(*ctrl));
-+
-+	if ((ctrl->bRequestType & USB_TYPE_MASK) == USB_TYPE_CLASS)
-+		rc = class_setup_req(fsg, ctrl);
-+	else
-+		rc = standard_setup_req(fsg, ctrl);
-+
-+	/* Respond with data/status or defer until later? */
-+	if (rc >= 0 && rc != DELAYED_STATUS) {
-+		rc = min(rc, w_length);
-+		fsg->ep0req->length = rc;
-+		fsg->ep0req->zero = rc < w_length;
-+		fsg->ep0req_name = (ctrl->bRequestType & USB_DIR_IN ?
-+				"ep0-in" : "ep0-out");
-+		rc = ep0_queue(fsg);
-+	}
-+
-+	/* Device either stalls (rc < 0) or reports success */
-+	return rc;
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/* All the following routines run in process context */
-+
-+
-+/* Use this for bulk or interrupt transfers, not ep0 */
-+static void start_transfer(struct fsg_dev *fsg, struct usb_ep *ep,
-+		struct usb_request *req, int *pbusy,
-+		enum fsg_buffer_state *state)
-+{
-+	int	rc;
-+
-+	if (ep == fsg->bulk_in)
-+		dump_msg(fsg, "bulk-in", req->buf, req->length);
-+	else if (ep == fsg->intr_in)
-+		dump_msg(fsg, "intr-in", req->buf, req->length);
-+
-+	spin_lock_irq(&fsg->lock);
-+	*pbusy = 1;
-+	*state = BUF_STATE_BUSY;
-+	spin_unlock_irq(&fsg->lock);
-+	rc = usb_ep_queue(ep, req, GFP_KERNEL);
-+	if (rc != 0) {
-+		*pbusy = 0;
-+		*state = BUF_STATE_EMPTY;
-+
-+		/* We can't do much more than wait for a reset */
-+
-+		/* Note: currently the net2280 driver fails zero-length
-+		 * submissions if DMA is enabled. */
-+		if (rc != -ESHUTDOWN && !(rc == -EOPNOTSUPP &&
-+						req->length == 0))
-+			WARNING(fsg, "error in submission: %s --> %d\n",
-+					ep->name, rc);
-+	}
-+}
-+
-+
-+static int sleep_thread(struct fsg_dev *fsg)
-+{
-+	int	rc = 0;
-+
-+	/* Wait until a signal arrives or we are woken up */
-+	for (;;) {
-+		try_to_freeze();
-+		set_current_state(TASK_INTERRUPTIBLE);
-+		if (signal_pending(current)) {
-+			rc = -EINTR;
-+			break;
-+		}
-+		if (fsg->thread_wakeup_needed)
-+			break;
-+		schedule();
-+	}
-+	__set_current_state(TASK_RUNNING);
-+	fsg->thread_wakeup_needed = 0;
-+	return rc;
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static int do_read(struct fsg_dev *fsg)
-+{
-+	struct fsg_lun		*curlun = fsg->curlun;
-+	u32			lba;
-+	struct fsg_buffhd	*bh;
-+	int			rc;
-+	u32			amount_left;
-+	loff_t			file_offset, file_offset_tmp;
-+	unsigned int		amount;
-+	ssize_t			nread;
-+
-+	/* Get the starting Logical Block Address and check that it's
-+	 * not too big */
-+	if (fsg->cmnd[0] == READ_6)
-+		lba = get_unaligned_be24(&fsg->cmnd[1]);
-+	else {
-+		lba = get_unaligned_be32(&fsg->cmnd[2]);
-+
-+		/* We allow DPO (Disable Page Out = don't save data in the
-+		 * cache) and FUA (Force Unit Access = don't read from the
-+		 * cache), but we don't implement them. */
-+		if ((fsg->cmnd[1] & ~0x18) != 0) {
-+			curlun->sense_data = SS_INVALID_FIELD_IN_CDB;
-+			return -EINVAL;
-+		}
-+	}
-+	if (lba >= curlun->num_sectors) {
-+		curlun->sense_data = SS_LOGICAL_BLOCK_ADDRESS_OUT_OF_RANGE;
-+		return -EINVAL;
-+	}
-+	file_offset = ((loff_t) lba) << curlun->blkbits;
-+
-+	/* Carry out the file reads */
-+	amount_left = fsg->data_size_from_cmnd;
-+	if (unlikely(amount_left == 0))
-+		return -EIO;		// No default reply
-+
-+	for (;;) {
-+
-+		/* Figure out how much we need to read:
-+		 * Try to read the remaining amount.
-+		 * But don't read more than the buffer size.
-+		 * And don't try to read past the end of the file.
-+		 */
-+		amount = min((unsigned int) amount_left, mod_data.buflen);
-+		amount = min((loff_t) amount,
-+				curlun->file_length - file_offset);
-+
-+		/* Wait for the next buffer to become available */
-+		bh = fsg->next_buffhd_to_fill;
-+		while (bh->state != BUF_STATE_EMPTY) {
-+			rc = sleep_thread(fsg);
-+			if (rc)
-+				return rc;
-+		}
-+
-+		/* If we were asked to read past the end of file,
-+		 * end with an empty buffer. */
-+		if (amount == 0) {
-+			curlun->sense_data =
-+					SS_LOGICAL_BLOCK_ADDRESS_OUT_OF_RANGE;
-+			curlun->sense_data_info = file_offset >> curlun->blkbits;
-+			curlun->info_valid = 1;
-+			bh->inreq->length = 0;
-+			bh->state = BUF_STATE_FULL;
-+			break;
-+		}
-+
-+		/* Perform the read */
-+		file_offset_tmp = file_offset;
-+		nread = vfs_read(curlun->filp,
-+				(char __user *) bh->buf,
-+				amount, &file_offset_tmp);
-+		VLDBG(curlun, "file read %u @ %llu -> %d\n", amount,
-+				(unsigned long long) file_offset,
-+				(int) nread);
-+		if (signal_pending(current))
-+			return -EINTR;
-+
-+		if (nread < 0) {
-+			LDBG(curlun, "error in file read: %d\n",
-+					(int) nread);
-+			nread = 0;
-+		} else if (nread < amount) {
-+			LDBG(curlun, "partial file read: %d/%u\n",
-+					(int) nread, amount);
-+			nread = round_down(nread, curlun->blksize);
-+		}
-+		file_offset  += nread;
-+		amount_left  -= nread;
-+		fsg->residue -= nread;
-+
-+		/* Except at the end of the transfer, nread will be
-+		 * equal to the buffer size, which is divisible by the
-+		 * bulk-in maxpacket size.
-+		 */
-+		bh->inreq->length = nread;
-+		bh->state = BUF_STATE_FULL;
-+
-+		/* If an error occurred, report it and its position */
-+		if (nread < amount) {
-+			curlun->sense_data = SS_UNRECOVERED_READ_ERROR;
-+			curlun->sense_data_info = file_offset >> curlun->blkbits;
-+			curlun->info_valid = 1;
-+			break;
-+		}
-+
-+		if (amount_left == 0)
-+			break;		// No more left to read
-+
-+		/* Send this buffer and go read some more */
-+		bh->inreq->zero = 0;
-+		start_transfer(fsg, fsg->bulk_in, bh->inreq,
-+				&bh->inreq_busy, &bh->state);
-+		fsg->next_buffhd_to_fill = bh->next;
-+	}
-+
-+	return -EIO;		// No default reply
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static int do_write(struct fsg_dev *fsg)
-+{
-+	struct fsg_lun		*curlun = fsg->curlun;
-+	u32			lba;
-+	struct fsg_buffhd	*bh;
-+	int			get_some_more;
-+	u32			amount_left_to_req, amount_left_to_write;
-+	loff_t			usb_offset, file_offset, file_offset_tmp;
-+	unsigned int		amount;
-+	ssize_t			nwritten;
-+	int			rc;
-+
-+	if (curlun->ro) {
-+		curlun->sense_data = SS_WRITE_PROTECTED;
-+		return -EINVAL;
-+	}
-+	spin_lock(&curlun->filp->f_lock);
-+	curlun->filp->f_flags &= ~O_SYNC;	// Default is not to wait
-+	spin_unlock(&curlun->filp->f_lock);
-+
-+	/* Get the starting Logical Block Address and check that it's
-+	 * not too big */
-+	if (fsg->cmnd[0] == WRITE_6)
-+		lba = get_unaligned_be24(&fsg->cmnd[1]);
-+	else {
-+		lba = get_unaligned_be32(&fsg->cmnd[2]);
-+
-+		/* We allow DPO (Disable Page Out = don't save data in the
-+		 * cache) and FUA (Force Unit Access = write directly to the
-+		 * medium).  We don't implement DPO; we implement FUA by
-+		 * performing synchronous output. */
-+		if ((fsg->cmnd[1] & ~0x18) != 0) {
-+			curlun->sense_data = SS_INVALID_FIELD_IN_CDB;
-+			return -EINVAL;
-+		}
-+		/* FUA */
-+		if (!curlun->nofua && (fsg->cmnd[1] & 0x08)) {
-+			spin_lock(&curlun->filp->f_lock);
-+			curlun->filp->f_flags |= O_DSYNC;
-+			spin_unlock(&curlun->filp->f_lock);
-+		}
-+	}
-+	if (lba >= curlun->num_sectors) {
-+		curlun->sense_data = SS_LOGICAL_BLOCK_ADDRESS_OUT_OF_RANGE;
-+		return -EINVAL;
-+	}
-+
-+	/* Carry out the file writes */
-+	get_some_more = 1;
-+	file_offset = usb_offset = ((loff_t) lba) << curlun->blkbits;
-+	amount_left_to_req = amount_left_to_write = fsg->data_size_from_cmnd;
-+
-+	while (amount_left_to_write > 0) {
-+
-+		/* Queue a request for more data from the host */
-+		bh = fsg->next_buffhd_to_fill;
-+		if (bh->state == BUF_STATE_EMPTY && get_some_more) {
-+
-+			/* Figure out how much we want to get:
-+			 * Try to get the remaining amount,
-+			 * but not more than the buffer size.
-+			 */
-+			amount = min(amount_left_to_req, mod_data.buflen);
-+
-+			/* Beyond the end of the backing file? */
-+			if (usb_offset >= curlun->file_length) {
-+				get_some_more = 0;
-+				curlun->sense_data =
-+					SS_LOGICAL_BLOCK_ADDRESS_OUT_OF_RANGE;
-+				curlun->sense_data_info = usb_offset >> curlun->blkbits;
-+				curlun->info_valid = 1;
-+				continue;
-+			}
-+
-+			/* Get the next buffer */
-+			usb_offset += amount;
-+			fsg->usb_amount_left -= amount;
-+			amount_left_to_req -= amount;
-+			if (amount_left_to_req == 0)
-+				get_some_more = 0;
-+
-+			/* Except at the end of the transfer, amount will be
-+			 * equal to the buffer size, which is divisible by
-+			 * the bulk-out maxpacket size.
-+			 */
-+			set_bulk_out_req_length(fsg, bh, amount);
-+			start_transfer(fsg, fsg->bulk_out, bh->outreq,
-+					&bh->outreq_busy, &bh->state);
-+			fsg->next_buffhd_to_fill = bh->next;
-+			continue;
-+		}
-+
-+		/* Write the received data to the backing file */
-+		bh = fsg->next_buffhd_to_drain;
-+		if (bh->state == BUF_STATE_EMPTY && !get_some_more)
-+			break;			// We stopped early
-+		if (bh->state == BUF_STATE_FULL) {
-+			smp_rmb();
-+			fsg->next_buffhd_to_drain = bh->next;
-+			bh->state = BUF_STATE_EMPTY;
-+
-+			/* Did something go wrong with the transfer? */
-+			if (bh->outreq->status != 0) {
-+				curlun->sense_data = SS_COMMUNICATION_FAILURE;
-+				curlun->sense_data_info = file_offset >> curlun->blkbits;
-+				curlun->info_valid = 1;
-+				break;
-+			}
-+
-+			amount = bh->outreq->actual;
-+			if (curlun->file_length - file_offset < amount) {
-+				LERROR(curlun,
-+	"write %u @ %llu beyond end %llu\n",
-+	amount, (unsigned long long) file_offset,
-+	(unsigned long long) curlun->file_length);
-+				amount = curlun->file_length - file_offset;
-+			}
-+
-+			/* Don't accept excess data.  The spec doesn't say
-+			 * what to do in this case.  We'll ignore the error.
-+			 */
-+			amount = min(amount, bh->bulk_out_intended_length);
-+
-+			/* Don't write a partial block */
-+			amount = round_down(amount, curlun->blksize);
-+			if (amount == 0)
-+				goto empty_write;
-+
-+			/* Perform the write */
-+			file_offset_tmp = file_offset;
-+			nwritten = vfs_write(curlun->filp,
-+					(char __user *) bh->buf,
-+					amount, &file_offset_tmp);
-+			VLDBG(curlun, "file write %u @ %llu -> %d\n", amount,
-+					(unsigned long long) file_offset,
-+					(int) nwritten);
-+			if (signal_pending(current))
-+				return -EINTR;		// Interrupted!
-+
-+			if (nwritten < 0) {
-+				LDBG(curlun, "error in file write: %d\n",
-+						(int) nwritten);
-+				nwritten = 0;
-+			} else if (nwritten < amount) {
-+				LDBG(curlun, "partial file write: %d/%u\n",
-+						(int) nwritten, amount);
-+				nwritten = round_down(nwritten, curlun->blksize);
-+			}
-+			file_offset += nwritten;
-+			amount_left_to_write -= nwritten;
-+			fsg->residue -= nwritten;
-+
-+			/* If an error occurred, report it and its position */
-+			if (nwritten < amount) {
-+				curlun->sense_data = SS_WRITE_ERROR;
-+				curlun->sense_data_info = file_offset >> curlun->blkbits;
-+				curlun->info_valid = 1;
-+				break;
-+			}
-+
-+ empty_write:
-+			/* Did the host decide to stop early? */
-+			if (bh->outreq->actual < bh->bulk_out_intended_length) {
-+				fsg->short_packet_received = 1;
-+				break;
-+			}
-+			continue;
-+		}
-+
-+		/* Wait for something to happen */
-+		rc = sleep_thread(fsg);
-+		if (rc)
-+			return rc;
-+	}
-+
-+	return -EIO;		// No default reply
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static int do_synchronize_cache(struct fsg_dev *fsg)
-+{
-+	struct fsg_lun	*curlun = fsg->curlun;
-+	int		rc;
-+
-+	/* We ignore the requested LBA and write out all file's
-+	 * dirty data buffers. */
-+	rc = fsg_lun_fsync_sub(curlun);
-+	if (rc)
-+		curlun->sense_data = SS_WRITE_ERROR;
-+	return 0;
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static void invalidate_sub(struct fsg_lun *curlun)
-+{
-+	struct file	*filp = curlun->filp;
-+	struct inode	*inode = filp->f_path.dentry->d_inode;
-+	unsigned long	rc;
-+
-+	rc = invalidate_mapping_pages(inode->i_mapping, 0, -1);
-+	VLDBG(curlun, "invalidate_mapping_pages -> %ld\n", rc);
-+}
-+
-+static int do_verify(struct fsg_dev *fsg)
-+{
-+	struct fsg_lun		*curlun = fsg->curlun;
-+	u32			lba;
-+	u32			verification_length;
-+	struct fsg_buffhd	*bh = fsg->next_buffhd_to_fill;
-+	loff_t			file_offset, file_offset_tmp;
-+	u32			amount_left;
-+	unsigned int		amount;
-+	ssize_t			nread;
-+
-+	/* Get the starting Logical Block Address and check that it's
-+	 * not too big */
-+	lba = get_unaligned_be32(&fsg->cmnd[2]);
-+	if (lba >= curlun->num_sectors) {
-+		curlun->sense_data = SS_LOGICAL_BLOCK_ADDRESS_OUT_OF_RANGE;
-+		return -EINVAL;
-+	}
-+
-+	/* We allow DPO (Disable Page Out = don't save data in the
-+	 * cache) but we don't implement it. */
-+	if ((fsg->cmnd[1] & ~0x10) != 0) {
-+		curlun->sense_data = SS_INVALID_FIELD_IN_CDB;
-+		return -EINVAL;
-+	}
-+
-+	verification_length = get_unaligned_be16(&fsg->cmnd[7]);
-+	if (unlikely(verification_length == 0))
-+		return -EIO;		// No default reply
-+
-+	/* Prepare to carry out the file verify */
-+	amount_left = verification_length << curlun->blkbits;
-+	file_offset = ((loff_t) lba) << curlun->blkbits;
-+
-+	/* Write out all the dirty buffers before invalidating them */
-+	fsg_lun_fsync_sub(curlun);
-+	if (signal_pending(current))
-+		return -EINTR;
-+
-+	invalidate_sub(curlun);
-+	if (signal_pending(current))
-+		return -EINTR;
-+
-+	/* Just try to read the requested blocks */
-+	while (amount_left > 0) {
-+
-+		/* Figure out how much we need to read:
-+		 * Try to read the remaining amount, but not more than
-+		 * the buffer size.
-+		 * And don't try to read past the end of the file.
-+		 */
-+		amount = min((unsigned int) amount_left, mod_data.buflen);
-+		amount = min((loff_t) amount,
-+				curlun->file_length - file_offset);
-+		if (amount == 0) {
-+			curlun->sense_data =
-+					SS_LOGICAL_BLOCK_ADDRESS_OUT_OF_RANGE;
-+			curlun->sense_data_info = file_offset >> curlun->blkbits;
-+			curlun->info_valid = 1;
-+			break;
-+		}
-+
-+		/* Perform the read */
-+		file_offset_tmp = file_offset;
-+		nread = vfs_read(curlun->filp,
-+				(char __user *) bh->buf,
-+				amount, &file_offset_tmp);
-+		VLDBG(curlun, "file read %u @ %llu -> %d\n", amount,
-+				(unsigned long long) file_offset,
-+				(int) nread);
-+		if (signal_pending(current))
-+			return -EINTR;
-+
-+		if (nread < 0) {
-+			LDBG(curlun, "error in file verify: %d\n",
-+					(int) nread);
-+			nread = 0;
-+		} else if (nread < amount) {
-+			LDBG(curlun, "partial file verify: %d/%u\n",
-+					(int) nread, amount);
-+			nread = round_down(nread, curlun->blksize);
-+		}
-+		if (nread == 0) {
-+			curlun->sense_data = SS_UNRECOVERED_READ_ERROR;
-+			curlun->sense_data_info = file_offset >> curlun->blkbits;
-+			curlun->info_valid = 1;
-+			break;
-+		}
-+		file_offset += nread;
-+		amount_left -= nread;
-+	}
-+	return 0;
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static int do_inquiry(struct fsg_dev *fsg, struct fsg_buffhd *bh)
-+{
-+	u8	*buf = (u8 *) bh->buf;
-+
-+	static char vendor_id[] = "Linux   ";
-+	static char product_disk_id[] = "File-Stor Gadget";
-+	static char product_cdrom_id[] = "File-CD Gadget  ";
-+
-+	if (!fsg->curlun) {		// Unsupported LUNs are okay
-+		fsg->bad_lun_okay = 1;
-+		memset(buf, 0, 36);
-+		buf[0] = 0x7f;		// Unsupported, no device-type
-+		buf[4] = 31;		// Additional length
-+		return 36;
-+	}
-+
-+	memset(buf, 0, 8);
-+	buf[0] = (mod_data.cdrom ? TYPE_ROM : TYPE_DISK);
-+	if (mod_data.removable)
-+		buf[1] = 0x80;
-+	buf[2] = 2;		// ANSI SCSI level 2
-+	buf[3] = 2;		// SCSI-2 INQUIRY data format
-+	buf[4] = 31;		// Additional length
-+				// No special options
-+	sprintf(buf + 8, "%-8s%-16s%04x", vendor_id,
-+			(mod_data.cdrom ? product_cdrom_id :
-+				product_disk_id),
-+			mod_data.release);
-+	return 36;
-+}
-+
-+
-+static int do_request_sense(struct fsg_dev *fsg, struct fsg_buffhd *bh)
-+{
-+	struct fsg_lun	*curlun = fsg->curlun;
-+	u8		*buf = (u8 *) bh->buf;
-+	u32		sd, sdinfo;
-+	int		valid;
-+
-+	/*
-+	 * From the SCSI-2 spec., section 7.9 (Unit attention condition):
-+	 *
-+	 * If a REQUEST SENSE command is received from an initiator
-+	 * with a pending unit attention condition (before the target
-+	 * generates the contingent allegiance condition), then the
-+	 * target shall either:
-+	 *   a) report any pending sense data and preserve the unit
-+	 *	attention condition on the logical unit, or,
-+	 *   b) report the unit attention condition, may discard any
-+	 *	pending sense data, and clear the unit attention
-+	 *	condition on the logical unit for that initiator.
-+	 *
-+	 * FSG normally uses option a); enable this code to use option b).
-+	 */
-+#if 0
-+	if (curlun && curlun->unit_attention_data != SS_NO_SENSE) {
-+		curlun->sense_data = curlun->unit_attention_data;
-+		curlun->unit_attention_data = SS_NO_SENSE;
-+	}
-+#endif
-+
-+	if (!curlun) {		// Unsupported LUNs are okay
-+		fsg->bad_lun_okay = 1;
-+		sd = SS_LOGICAL_UNIT_NOT_SUPPORTED;
-+		sdinfo = 0;
-+		valid = 0;
-+	} else {
-+		sd = curlun->sense_data;
-+		sdinfo = curlun->sense_data_info;
-+		valid = curlun->info_valid << 7;
-+		curlun->sense_data = SS_NO_SENSE;
-+		curlun->sense_data_info = 0;
-+		curlun->info_valid = 0;
-+	}
-+
-+	memset(buf, 0, 18);
-+	buf[0] = valid | 0x70;			// Valid, current error
-+	buf[2] = SK(sd);
-+	put_unaligned_be32(sdinfo, &buf[3]);	/* Sense information */
-+	buf[7] = 18 - 8;			// Additional sense length
-+	buf[12] = ASC(sd);
-+	buf[13] = ASCQ(sd);
-+	return 18;
-+}
-+
-+
-+static int do_read_capacity(struct fsg_dev *fsg, struct fsg_buffhd *bh)
-+{
-+	struct fsg_lun	*curlun = fsg->curlun;
-+	u32		lba = get_unaligned_be32(&fsg->cmnd[2]);
-+	int		pmi = fsg->cmnd[8];
-+	u8		*buf = (u8 *) bh->buf;
-+
-+	/* Check the PMI and LBA fields */
-+	if (pmi > 1 || (pmi == 0 && lba != 0)) {
-+		curlun->sense_data = SS_INVALID_FIELD_IN_CDB;
-+		return -EINVAL;
-+	}
-+
-+	put_unaligned_be32(curlun->num_sectors - 1, &buf[0]);
-+						/* Max logical block */
-+	put_unaligned_be32(curlun->blksize, &buf[4]);	/* Block length */
-+	return 8;
-+}
-+
-+
-+static int do_read_header(struct fsg_dev *fsg, struct fsg_buffhd *bh)
-+{
-+	struct fsg_lun	*curlun = fsg->curlun;
-+	int		msf = fsg->cmnd[1] & 0x02;
-+	u32		lba = get_unaligned_be32(&fsg->cmnd[2]);
-+	u8		*buf = (u8 *) bh->buf;
-+
-+	if ((fsg->cmnd[1] & ~0x02) != 0) {		/* Mask away MSF */
-+		curlun->sense_data = SS_INVALID_FIELD_IN_CDB;
-+		return -EINVAL;
-+	}
-+	if (lba >= curlun->num_sectors) {
-+		curlun->sense_data = SS_LOGICAL_BLOCK_ADDRESS_OUT_OF_RANGE;
-+		return -EINVAL;
-+	}
-+
-+	memset(buf, 0, 8);
-+	buf[0] = 0x01;		/* 2048 bytes of user data, rest is EC */
-+	store_cdrom_address(&buf[4], msf, lba);
-+	return 8;
-+}
-+
-+
-+static int do_read_toc(struct fsg_dev *fsg, struct fsg_buffhd *bh)
-+{
-+	struct fsg_lun	*curlun = fsg->curlun;
-+	int		msf = fsg->cmnd[1] & 0x02;
-+	int		start_track = fsg->cmnd[6];
-+	u8		*buf = (u8 *) bh->buf;
-+
-+	if ((fsg->cmnd[1] & ~0x02) != 0 ||		/* Mask away MSF */
-+			start_track > 1) {
-+		curlun->sense_data = SS_INVALID_FIELD_IN_CDB;
-+		return -EINVAL;
-+	}
-+
-+	memset(buf, 0, 20);
-+	buf[1] = (20-2);		/* TOC data length */
-+	buf[2] = 1;			/* First track number */
-+	buf[3] = 1;			/* Last track number */
-+	buf[5] = 0x16;			/* Data track, copying allowed */
-+	buf[6] = 0x01;			/* Only track is number 1 */
-+	store_cdrom_address(&buf[8], msf, 0);
-+
-+	buf[13] = 0x16;			/* Lead-out track is data */
-+	buf[14] = 0xAA;			/* Lead-out track number */
-+	store_cdrom_address(&buf[16], msf, curlun->num_sectors);
-+	return 20;
-+}
-+
-+
-+static int do_mode_sense(struct fsg_dev *fsg, struct fsg_buffhd *bh)
-+{
-+	struct fsg_lun	*curlun = fsg->curlun;
-+	int		mscmnd = fsg->cmnd[0];
-+	u8		*buf = (u8 *) bh->buf;
-+	u8		*buf0 = buf;
-+	int		pc, page_code;
-+	int		changeable_values, all_pages;
-+	int		valid_page = 0;
-+	int		len, limit;
-+
-+	if ((fsg->cmnd[1] & ~0x08) != 0) {		// Mask away DBD
-+		curlun->sense_data = SS_INVALID_FIELD_IN_CDB;
-+		return -EINVAL;
-+	}
-+	pc = fsg->cmnd[2] >> 6;
-+	page_code = fsg->cmnd[2] & 0x3f;
-+	if (pc == 3) {
-+		curlun->sense_data = SS_SAVING_PARAMETERS_NOT_SUPPORTED;
-+		return -EINVAL;
-+	}
-+	changeable_values = (pc == 1);
-+	all_pages = (page_code == 0x3f);
-+
-+	/* Write the mode parameter header.  Fixed values are: default
-+	 * medium type, no cache control (DPOFUA), and no block descriptors.
-+	 * The only variable value is the WriteProtect bit.  We will fill in
-+	 * the mode data length later. */
-+	memset(buf, 0, 8);
-+	if (mscmnd == MODE_SENSE) {
-+		buf[2] = (curlun->ro ? 0x80 : 0x00);		// WP, DPOFUA
-+		buf += 4;
-+		limit = 255;
-+	} else {			// MODE_SENSE_10
-+		buf[3] = (curlun->ro ? 0x80 : 0x00);		// WP, DPOFUA
-+		buf += 8;
-+		limit = 65535;		// Should really be mod_data.buflen
-+	}
-+
-+	/* No block descriptors */
-+
-+	/* The mode pages, in numerical order.  The only page we support
-+	 * is the Caching page. */
-+	if (page_code == 0x08 || all_pages) {
-+		valid_page = 1;
-+		buf[0] = 0x08;		// Page code
-+		buf[1] = 10;		// Page length
-+		memset(buf+2, 0, 10);	// None of the fields are changeable
-+
-+		if (!changeable_values) {
-+			buf[2] = 0x04;	// Write cache enable,
-+					// Read cache not disabled
-+					// No cache retention priorities
-+			put_unaligned_be16(0xffff, &buf[4]);
-+					/* Don't disable prefetch */
-+					/* Minimum prefetch = 0 */
-+			put_unaligned_be16(0xffff, &buf[8]);
-+					/* Maximum prefetch */
-+			put_unaligned_be16(0xffff, &buf[10]);
-+					/* Maximum prefetch ceiling */
-+		}
-+		buf += 12;
-+	}
-+
-+	/* Check that a valid page was requested and the mode data length
-+	 * isn't too long. */
-+	len = buf - buf0;
-+	if (!valid_page || len > limit) {
-+		curlun->sense_data = SS_INVALID_FIELD_IN_CDB;
-+		return -EINVAL;
-+	}
-+
-+	/*  Store the mode data length */
-+	if (mscmnd == MODE_SENSE)
-+		buf0[0] = len - 1;
-+	else
-+		put_unaligned_be16(len - 2, buf0);
-+	return len;
-+}
-+
-+
-+static int do_start_stop(struct fsg_dev *fsg)
-+{
-+	struct fsg_lun	*curlun = fsg->curlun;
-+	int		loej, start;
-+
-+	if (!mod_data.removable) {
-+		curlun->sense_data = SS_INVALID_COMMAND;
-+		return -EINVAL;
-+	}
-+
-+	// int immed = fsg->cmnd[1] & 0x01;
-+	loej = fsg->cmnd[4] & 0x02;
-+	start = fsg->cmnd[4] & 0x01;
-+
-+#ifdef CONFIG_USB_FILE_STORAGE_TEST
-+	if ((fsg->cmnd[1] & ~0x01) != 0 ||		// Mask away Immed
-+			(fsg->cmnd[4] & ~0x03) != 0) {	// Mask LoEj, Start
-+		curlun->sense_data = SS_INVALID_FIELD_IN_CDB;
-+		return -EINVAL;
-+	}
-+
-+	if (!start) {
-+
-+		/* Are we allowed to unload the media? */
-+		if (curlun->prevent_medium_removal) {
-+			LDBG(curlun, "unload attempt prevented\n");
-+			curlun->sense_data = SS_MEDIUM_REMOVAL_PREVENTED;
-+			return -EINVAL;
-+		}
-+		if (loej) {		// Simulate an unload/eject
-+			up_read(&fsg->filesem);
-+			down_write(&fsg->filesem);
-+			fsg_lun_close(curlun);
-+			up_write(&fsg->filesem);
-+			down_read(&fsg->filesem);
-+		}
-+	} else {
-+
-+		/* Our emulation doesn't support mounting; the medium is
-+		 * available for use as soon as it is loaded. */
-+		if (!fsg_lun_is_open(curlun)) {
-+			curlun->sense_data = SS_MEDIUM_NOT_PRESENT;
-+			return -EINVAL;
-+		}
-+	}
-+#endif
-+	return 0;
-+}
-+
-+
-+static int do_prevent_allow(struct fsg_dev *fsg)
-+{
-+	struct fsg_lun	*curlun = fsg->curlun;
-+	int		prevent;
-+
-+	if (!mod_data.removable) {
-+		curlun->sense_data = SS_INVALID_COMMAND;
-+		return -EINVAL;
-+	}
-+
-+	prevent = fsg->cmnd[4] & 0x01;
-+	if ((fsg->cmnd[4] & ~0x01) != 0) {		// Mask away Prevent
-+		curlun->sense_data = SS_INVALID_FIELD_IN_CDB;
-+		return -EINVAL;
-+	}
-+
-+	if (curlun->prevent_medium_removal && !prevent)
-+		fsg_lun_fsync_sub(curlun);
-+	curlun->prevent_medium_removal = prevent;
-+	return 0;
-+}
-+
-+
-+static int do_read_format_capacities(struct fsg_dev *fsg,
-+			struct fsg_buffhd *bh)
-+{
-+	struct fsg_lun	*curlun = fsg->curlun;
-+	u8		*buf = (u8 *) bh->buf;
-+
-+	buf[0] = buf[1] = buf[2] = 0;
-+	buf[3] = 8;		// Only the Current/Maximum Capacity Descriptor
-+	buf += 4;
-+
-+	put_unaligned_be32(curlun->num_sectors, &buf[0]);
-+						/* Number of blocks */
-+	put_unaligned_be32(curlun->blksize, &buf[4]);	/* Block length */
-+	buf[4] = 0x02;				/* Current capacity */
-+	return 12;
-+}
-+
-+
-+static int do_mode_select(struct fsg_dev *fsg, struct fsg_buffhd *bh)
-+{
-+	struct fsg_lun	*curlun = fsg->curlun;
-+
-+	/* We don't support MODE SELECT */
-+	curlun->sense_data = SS_INVALID_COMMAND;
-+	return -EINVAL;
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static int halt_bulk_in_endpoint(struct fsg_dev *fsg)
-+{
-+	int	rc;
-+
-+	rc = fsg_set_halt(fsg, fsg->bulk_in);
-+	if (rc == -EAGAIN)
-+		VDBG(fsg, "delayed bulk-in endpoint halt\n");
-+	while (rc != 0) {
-+		if (rc != -EAGAIN) {
-+			WARNING(fsg, "usb_ep_set_halt -> %d\n", rc);
-+			rc = 0;
-+			break;
-+		}
-+
-+		/* Wait for a short time and then try again */
-+		if (msleep_interruptible(100) != 0)
-+			return -EINTR;
-+		rc = usb_ep_set_halt(fsg->bulk_in);
-+	}
-+	return rc;
-+}
-+
-+static int wedge_bulk_in_endpoint(struct fsg_dev *fsg)
-+{
-+	int	rc;
-+
-+	DBG(fsg, "bulk-in set wedge\n");
-+	rc = usb_ep_set_wedge(fsg->bulk_in);
-+	if (rc == -EAGAIN)
-+		VDBG(fsg, "delayed bulk-in endpoint wedge\n");
-+	while (rc != 0) {
-+		if (rc != -EAGAIN) {
-+			WARNING(fsg, "usb_ep_set_wedge -> %d\n", rc);
-+			rc = 0;
-+			break;
-+		}
-+
-+		/* Wait for a short time and then try again */
-+		if (msleep_interruptible(100) != 0)
-+			return -EINTR;
-+		rc = usb_ep_set_wedge(fsg->bulk_in);
-+	}
-+	return rc;
-+}
-+
-+static int throw_away_data(struct fsg_dev *fsg)
-+{
-+	struct fsg_buffhd	*bh;
-+	u32			amount;
-+	int			rc;
-+
-+	while ((bh = fsg->next_buffhd_to_drain)->state != BUF_STATE_EMPTY ||
-+			fsg->usb_amount_left > 0) {
-+
-+		/* Throw away the data in a filled buffer */
-+		if (bh->state == BUF_STATE_FULL) {
-+			smp_rmb();
-+			bh->state = BUF_STATE_EMPTY;
-+			fsg->next_buffhd_to_drain = bh->next;
-+
-+			/* A short packet or an error ends everything */
-+			if (bh->outreq->actual < bh->bulk_out_intended_length ||
-+					bh->outreq->status != 0) {
-+				raise_exception(fsg, FSG_STATE_ABORT_BULK_OUT);
-+				return -EINTR;
-+			}
-+			continue;
-+		}
-+
-+		/* Try to submit another request if we need one */
-+		bh = fsg->next_buffhd_to_fill;
-+		if (bh->state == BUF_STATE_EMPTY && fsg->usb_amount_left > 0) {
-+			amount = min(fsg->usb_amount_left,
-+					(u32) mod_data.buflen);
-+
-+			/* Except at the end of the transfer, amount will be
-+			 * equal to the buffer size, which is divisible by
-+			 * the bulk-out maxpacket size.
-+			 */
-+			set_bulk_out_req_length(fsg, bh, amount);
-+			start_transfer(fsg, fsg->bulk_out, bh->outreq,
-+					&bh->outreq_busy, &bh->state);
-+			fsg->next_buffhd_to_fill = bh->next;
-+			fsg->usb_amount_left -= amount;
-+			continue;
-+		}
-+
-+		/* Otherwise wait for something to happen */
-+		rc = sleep_thread(fsg);
-+		if (rc)
-+			return rc;
-+	}
-+	return 0;
-+}
-+
-+
-+static int finish_reply(struct fsg_dev *fsg)
-+{
-+	struct fsg_buffhd	*bh = fsg->next_buffhd_to_fill;
-+	int			rc = 0;
-+
-+	switch (fsg->data_dir) {
-+	case DATA_DIR_NONE:
-+		break;			// Nothing to send
-+
-+	/* If we don't know whether the host wants to read or write,
-+	 * this must be CB or CBI with an unknown command.  We mustn't
-+	 * try to send or receive any data.  So stall both bulk pipes
-+	 * if we can and wait for a reset. */
-+	case DATA_DIR_UNKNOWN:
-+		if (mod_data.can_stall) {
-+			fsg_set_halt(fsg, fsg->bulk_out);
-+			rc = halt_bulk_in_endpoint(fsg);
-+		}
-+		break;
-+
-+	/* All but the last buffer of data must have already been sent */
-+	case DATA_DIR_TO_HOST:
-+		if (fsg->data_size == 0)
-+			;		// Nothing to send
-+
-+		/* If there's no residue, simply send the last buffer */
-+		else if (fsg->residue == 0) {
-+			bh->inreq->zero = 0;
-+			start_transfer(fsg, fsg->bulk_in, bh->inreq,
-+					&bh->inreq_busy, &bh->state);
-+			fsg->next_buffhd_to_fill = bh->next;
-+		}
-+
-+		/* There is a residue.  For CB and CBI, simply mark the end
-+		 * of the data with a short packet.  However, if we are
-+		 * allowed to stall, there was no data at all (residue ==
-+		 * data_size), and the command failed (invalid LUN or
-+		 * sense data is set), then halt the bulk-in endpoint
-+		 * instead. */
-+		else if (!transport_is_bbb()) {
-+			if (mod_data.can_stall &&
-+					fsg->residue == fsg->data_size &&
-+	(!fsg->curlun || fsg->curlun->sense_data != SS_NO_SENSE)) {
-+				bh->state = BUF_STATE_EMPTY;
-+				rc = halt_bulk_in_endpoint(fsg);
-+			} else {
-+				bh->inreq->zero = 1;
-+				start_transfer(fsg, fsg->bulk_in, bh->inreq,
-+						&bh->inreq_busy, &bh->state);
-+				fsg->next_buffhd_to_fill = bh->next;
-+			}
-+		}
-+
-+		/*
-+		 * For Bulk-only, mark the end of the data with a short
-+		 * packet.  If we are allowed to stall, halt the bulk-in
-+		 * endpoint.  (Note: This violates the Bulk-Only Transport
-+		 * specification, which requires us to pad the data if we
-+		 * don't halt the endpoint.  Presumably nobody will mind.)
-+		 */
-+		else {
-+			bh->inreq->zero = 1;
-+			start_transfer(fsg, fsg->bulk_in, bh->inreq,
-+					&bh->inreq_busy, &bh->state);
-+			fsg->next_buffhd_to_fill = bh->next;
-+			if (mod_data.can_stall)
-+				rc = halt_bulk_in_endpoint(fsg);
-+		}
-+		break;
-+
-+	/* We have processed all we want from the data the host has sent.
-+	 * There may still be outstanding bulk-out requests. */
-+	case DATA_DIR_FROM_HOST:
-+		if (fsg->residue == 0)
-+			;		// Nothing to receive
-+
-+		/* Did the host stop sending unexpectedly early? */
-+		else if (fsg->short_packet_received) {
-+			raise_exception(fsg, FSG_STATE_ABORT_BULK_OUT);
-+			rc = -EINTR;
-+		}
-+
-+		/* We haven't processed all the incoming data.  Even though
-+		 * we may be allowed to stall, doing so would cause a race.
-+		 * The controller may already have ACK'ed all the remaining
-+		 * bulk-out packets, in which case the host wouldn't see a
-+		 * STALL.  Not realizing the endpoint was halted, it wouldn't
-+		 * clear the halt -- leading to problems later on. */
-+#if 0
-+		else if (mod_data.can_stall) {
-+			fsg_set_halt(fsg, fsg->bulk_out);
-+			raise_exception(fsg, FSG_STATE_ABORT_BULK_OUT);
-+			rc = -EINTR;
-+		}
-+#endif
-+
-+		/* We can't stall.  Read in the excess data and throw it
-+		 * all away. */
-+		else
-+			rc = throw_away_data(fsg);
-+		break;
-+	}
-+	return rc;
-+}
-+
-+
-+static int send_status(struct fsg_dev *fsg)
-+{
-+	struct fsg_lun		*curlun = fsg->curlun;
-+	struct fsg_buffhd	*bh;
-+	int			rc;
-+	u8			status = US_BULK_STAT_OK;
-+	u32			sd, sdinfo = 0;
-+
-+	/* Wait for the next buffer to become available */
-+	bh = fsg->next_buffhd_to_fill;
-+	while (bh->state != BUF_STATE_EMPTY) {
-+		rc = sleep_thread(fsg);
-+		if (rc)
-+			return rc;
-+	}
-+
-+	if (curlun) {
-+		sd = curlun->sense_data;
-+		sdinfo = curlun->sense_data_info;
-+	} else if (fsg->bad_lun_okay)
-+		sd = SS_NO_SENSE;
-+	else
-+		sd = SS_LOGICAL_UNIT_NOT_SUPPORTED;
-+
-+	if (fsg->phase_error) {
-+		DBG(fsg, "sending phase-error status\n");
-+		status = US_BULK_STAT_PHASE;
-+		sd = SS_INVALID_COMMAND;
-+	} else if (sd != SS_NO_SENSE) {
-+		DBG(fsg, "sending command-failure status\n");
-+		status = US_BULK_STAT_FAIL;
-+		VDBG(fsg, "  sense data: SK x%02x, ASC x%02x, ASCQ x%02x;"
-+				"  info x%x\n",
-+				SK(sd), ASC(sd), ASCQ(sd), sdinfo);
-+	}
-+
-+	if (transport_is_bbb()) {
-+		struct bulk_cs_wrap	*csw = bh->buf;
-+
-+		/* Store and send the Bulk-only CSW */
-+		csw->Signature = cpu_to_le32(US_BULK_CS_SIGN);
-+		csw->Tag = fsg->tag;
-+		csw->Residue = cpu_to_le32(fsg->residue);
-+		csw->Status = status;
-+
-+		bh->inreq->length = US_BULK_CS_WRAP_LEN;
-+		bh->inreq->zero = 0;
-+		start_transfer(fsg, fsg->bulk_in, bh->inreq,
-+				&bh->inreq_busy, &bh->state);
-+
-+	} else if (mod_data.transport_type == USB_PR_CB) {
-+
-+		/* Control-Bulk transport has no status phase! */
-+		return 0;
-+
-+	} else {			// USB_PR_CBI
-+		struct interrupt_data	*buf = bh->buf;
-+
-+		/* Store and send the Interrupt data.  UFI sends the ASC
-+		 * and ASCQ bytes.  Everything else sends a Type (which
-+		 * is always 0) and the status Value. */
-+		if (mod_data.protocol_type == USB_SC_UFI) {
-+			buf->bType = ASC(sd);
-+			buf->bValue = ASCQ(sd);
-+		} else {
-+			buf->bType = 0;
-+			buf->bValue = status;
-+		}
-+		fsg->intreq->length = CBI_INTERRUPT_DATA_LEN;
-+
-+		fsg->intr_buffhd = bh;		// Point to the right buffhd
-+		fsg->intreq->buf = bh->inreq->buf;
-+		fsg->intreq->context = bh;
-+		start_transfer(fsg, fsg->intr_in, fsg->intreq,
-+				&fsg->intreq_busy, &bh->state);
-+	}
-+
-+	fsg->next_buffhd_to_fill = bh->next;
-+	return 0;
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/* Check whether the command is properly formed and whether its data size
-+ * and direction agree with the values we already have. */
-+static int check_command(struct fsg_dev *fsg, int cmnd_size,
-+		enum data_direction data_dir, unsigned int mask,
-+		int needs_medium, const char *name)
-+{
-+	int			i;
-+	int			lun = fsg->cmnd[1] >> 5;
-+	static const char	dirletter[4] = {'u', 'o', 'i', 'n'};
-+	char			hdlen[20];
-+	struct fsg_lun		*curlun;
-+
-+	/* Adjust the expected cmnd_size for protocol encapsulation padding.
-+	 * Transparent SCSI doesn't pad. */
-+	if (protocol_is_scsi())
-+		;
-+
-+	/* There's some disagreement as to whether RBC pads commands or not.
-+	 * We'll play it safe and accept either form. */
-+	else if (mod_data.protocol_type == USB_SC_RBC) {
-+		if (fsg->cmnd_size == 12)
-+			cmnd_size = 12;
-+
-+	/* All the other protocols pad to 12 bytes */
-+	} else
-+		cmnd_size = 12;
-+
-+	hdlen[0] = 0;
-+	if (fsg->data_dir != DATA_DIR_UNKNOWN)
-+		sprintf(hdlen, ", H%c=%u", dirletter[(int) fsg->data_dir],
-+				fsg->data_size);
-+	VDBG(fsg, "SCSI command: %s;  Dc=%d, D%c=%u;  Hc=%d%s\n",
-+			name, cmnd_size, dirletter[(int) data_dir],
-+			fsg->data_size_from_cmnd, fsg->cmnd_size, hdlen);
-+
-+	/* We can't reply at all until we know the correct data direction
-+	 * and size. */
-+	if (fsg->data_size_from_cmnd == 0)
-+		data_dir = DATA_DIR_NONE;
-+	if (fsg->data_dir == DATA_DIR_UNKNOWN) {	// CB or CBI
-+		fsg->data_dir = data_dir;
-+		fsg->data_size = fsg->data_size_from_cmnd;
-+
-+	} else {					// Bulk-only
-+		if (fsg->data_size < fsg->data_size_from_cmnd) {
-+
-+			/* Host data size < Device data size is a phase error.
-+			 * Carry out the command, but only transfer as much
-+			 * as we are allowed. */
-+			fsg->data_size_from_cmnd = fsg->data_size;
-+			fsg->phase_error = 1;
-+		}
-+	}
-+	fsg->residue = fsg->usb_amount_left = fsg->data_size;
-+
-+	/* Conflicting data directions is a phase error */
-+	if (fsg->data_dir != data_dir && fsg->data_size_from_cmnd > 0) {
-+		fsg->phase_error = 1;
-+		return -EINVAL;
-+	}
-+
-+	/* Verify the length of the command itself */
-+	if (cmnd_size != fsg->cmnd_size) {
-+
-+		/* Special case workaround: There are plenty of buggy SCSI
-+		 * implementations. Many have issues with cbw->Length
-+		 * field passing a wrong command size. For those cases we
-+		 * always try to work around the problem by using the length
-+		 * sent by the host side provided it is at least as large
-+		 * as the correct command length.
-+		 * Examples of such cases would be MS-Windows, which issues
-+		 * REQUEST SENSE with cbw->Length == 12 where it should
-+		 * be 6, and xbox360 issuing INQUIRY, TEST UNIT READY and
-+		 * REQUEST SENSE with cbw->Length == 10 where it should
-+		 * be 6 as well.
-+		 */
-+		if (cmnd_size <= fsg->cmnd_size) {
-+			DBG(fsg, "%s is buggy! Expected length %d "
-+					"but we got %d\n", name,
-+					cmnd_size, fsg->cmnd_size);
-+			cmnd_size = fsg->cmnd_size;
-+		} else {
-+			fsg->phase_error = 1;
-+			return -EINVAL;
-+		}
-+	}
-+
-+	/* Check that the LUN values are consistent */
-+	if (transport_is_bbb()) {
-+		if (fsg->lun != lun)
-+			DBG(fsg, "using LUN %d from CBW, "
-+					"not LUN %d from CDB\n",
-+					fsg->lun, lun);
-+	}
-+
-+	/* Check the LUN */
-+	curlun = fsg->curlun;
-+	if (curlun) {
-+		if (fsg->cmnd[0] != REQUEST_SENSE) {
-+			curlun->sense_data = SS_NO_SENSE;
-+			curlun->sense_data_info = 0;
-+			curlun->info_valid = 0;
-+		}
-+	} else {
-+		fsg->bad_lun_okay = 0;
-+
-+		/* INQUIRY and REQUEST SENSE commands are explicitly allowed
-+		 * to use unsupported LUNs; all others may not. */
-+		if (fsg->cmnd[0] != INQUIRY &&
-+				fsg->cmnd[0] != REQUEST_SENSE) {
-+			DBG(fsg, "unsupported LUN %d\n", fsg->lun);
-+			return -EINVAL;
-+		}
-+	}
-+
-+	/* If a unit attention condition exists, only INQUIRY and
-+	 * REQUEST SENSE commands are allowed; anything else must fail. */
-+	if (curlun && curlun->unit_attention_data != SS_NO_SENSE &&
-+			fsg->cmnd[0] != INQUIRY &&
-+			fsg->cmnd[0] != REQUEST_SENSE) {
-+		curlun->sense_data = curlun->unit_attention_data;
-+		curlun->unit_attention_data = SS_NO_SENSE;
-+		return -EINVAL;
-+	}
-+
-+	/* Check that only command bytes listed in the mask are non-zero */
-+	fsg->cmnd[1] &= 0x1f;			// Mask away the LUN
-+	for (i = 1; i < cmnd_size; ++i) {
-+		if (fsg->cmnd[i] && !(mask & (1 << i))) {
-+			if (curlun)
-+				curlun->sense_data = SS_INVALID_FIELD_IN_CDB;
-+			return -EINVAL;
-+		}
-+	}
-+
-+	/* If the medium isn't mounted and the command needs to access
-+	 * it, return an error. */
-+	if (curlun && !fsg_lun_is_open(curlun) && needs_medium) {
-+		curlun->sense_data = SS_MEDIUM_NOT_PRESENT;
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
-+
-+/* wrapper of check_command for data size in blocks handling */
-+static int check_command_size_in_blocks(struct fsg_dev *fsg, int cmnd_size,
-+		enum data_direction data_dir, unsigned int mask,
-+		int needs_medium, const char *name)
-+{
-+	if (fsg->curlun)
-+		fsg->data_size_from_cmnd <<= fsg->curlun->blkbits;
-+	return check_command(fsg, cmnd_size, data_dir,
-+			mask, needs_medium, name);
-+}
-+
-+static int do_scsi_command(struct fsg_dev *fsg)
-+{
-+	struct fsg_buffhd	*bh;
-+	int			rc;
-+	int			reply = -EINVAL;
-+	int			i;
-+	static char		unknown[16];
-+
-+	dump_cdb(fsg);
-+
-+	/* Wait for the next buffer to become available for data or status */
-+	bh = fsg->next_buffhd_to_drain = fsg->next_buffhd_to_fill;
-+	while (bh->state != BUF_STATE_EMPTY) {
-+		rc = sleep_thread(fsg);
-+		if (rc)
-+			return rc;
-+	}
-+	fsg->phase_error = 0;
-+	fsg->short_packet_received = 0;
-+
-+	down_read(&fsg->filesem);	// We're using the backing file
-+	switch (fsg->cmnd[0]) {
-+
-+	case INQUIRY:
-+		fsg->data_size_from_cmnd = fsg->cmnd[4];
-+		if ((reply = check_command(fsg, 6, DATA_DIR_TO_HOST,
-+				(1<<4), 0,
-+				"INQUIRY")) == 0)
-+			reply = do_inquiry(fsg, bh);
-+		break;
-+
-+	case MODE_SELECT:
-+		fsg->data_size_from_cmnd = fsg->cmnd[4];
-+		if ((reply = check_command(fsg, 6, DATA_DIR_FROM_HOST,
-+				(1<<1) | (1<<4), 0,
-+				"MODE SELECT(6)")) == 0)
-+			reply = do_mode_select(fsg, bh);
-+		break;
-+
-+	case MODE_SELECT_10:
-+		fsg->data_size_from_cmnd = get_unaligned_be16(&fsg->cmnd[7]);
-+		if ((reply = check_command(fsg, 10, DATA_DIR_FROM_HOST,
-+				(1<<1) | (3<<7), 0,
-+				"MODE SELECT(10)")) == 0)
-+			reply = do_mode_select(fsg, bh);
-+		break;
-+
-+	case MODE_SENSE:
-+		fsg->data_size_from_cmnd = fsg->cmnd[4];
-+		if ((reply = check_command(fsg, 6, DATA_DIR_TO_HOST,
-+				(1<<1) | (1<<2) | (1<<4), 0,
-+				"MODE SENSE(6)")) == 0)
-+			reply = do_mode_sense(fsg, bh);
-+		break;
-+
-+	case MODE_SENSE_10:
-+		fsg->data_size_from_cmnd = get_unaligned_be16(&fsg->cmnd[7]);
-+		if ((reply = check_command(fsg, 10, DATA_DIR_TO_HOST,
-+				(1<<1) | (1<<2) | (3<<7), 0,
-+				"MODE SENSE(10)")) == 0)
-+			reply = do_mode_sense(fsg, bh);
-+		break;
-+
-+	case ALLOW_MEDIUM_REMOVAL:
-+		fsg->data_size_from_cmnd = 0;
-+		if ((reply = check_command(fsg, 6, DATA_DIR_NONE,
-+				(1<<4), 0,
-+				"PREVENT-ALLOW MEDIUM REMOVAL")) == 0)
-+			reply = do_prevent_allow(fsg);
-+		break;
-+
-+	case READ_6:
-+		i = fsg->cmnd[4];
-+		fsg->data_size_from_cmnd = (i == 0) ? 256 : i;
-+		if ((reply = check_command_size_in_blocks(fsg, 6,
-+				DATA_DIR_TO_HOST,
-+				(7<<1) | (1<<4), 1,
-+				"READ(6)")) == 0)
-+			reply = do_read(fsg);
-+		break;
-+
-+	case READ_10:
-+		fsg->data_size_from_cmnd = get_unaligned_be16(&fsg->cmnd[7]);
-+		if ((reply = check_command_size_in_blocks(fsg, 10,
-+				DATA_DIR_TO_HOST,
-+				(1<<1) | (0xf<<2) | (3<<7), 1,
-+				"READ(10)")) == 0)
-+			reply = do_read(fsg);
-+		break;
-+
-+	case READ_12:
-+		fsg->data_size_from_cmnd = get_unaligned_be32(&fsg->cmnd[6]);
-+		if ((reply = check_command_size_in_blocks(fsg, 12,
-+				DATA_DIR_TO_HOST,
-+				(1<<1) | (0xf<<2) | (0xf<<6), 1,
-+				"READ(12)")) == 0)
-+			reply = do_read(fsg);
-+		break;
-+
-+	case READ_CAPACITY:
-+		fsg->data_size_from_cmnd = 8;
-+		if ((reply = check_command(fsg, 10, DATA_DIR_TO_HOST,
-+				(0xf<<2) | (1<<8), 1,
-+				"READ CAPACITY")) == 0)
-+			reply = do_read_capacity(fsg, bh);
-+		break;
-+
-+	case READ_HEADER:
-+		if (!mod_data.cdrom)
-+			goto unknown_cmnd;
-+		fsg->data_size_from_cmnd = get_unaligned_be16(&fsg->cmnd[7]);
-+		if ((reply = check_command(fsg, 10, DATA_DIR_TO_HOST,
-+				(3<<7) | (0x1f<<1), 1,
-+				"READ HEADER")) == 0)
-+			reply = do_read_header(fsg, bh);
-+		break;
-+
-+	case READ_TOC:
-+		if (!mod_data.cdrom)
-+			goto unknown_cmnd;
-+		fsg->data_size_from_cmnd = get_unaligned_be16(&fsg->cmnd[7]);
-+		if ((reply = check_command(fsg, 10, DATA_DIR_TO_HOST,
-+				(7<<6) | (1<<1), 1,
-+				"READ TOC")) == 0)
-+			reply = do_read_toc(fsg, bh);
-+		break;
-+
-+	case READ_FORMAT_CAPACITIES:
-+		fsg->data_size_from_cmnd = get_unaligned_be16(&fsg->cmnd[7]);
-+		if ((reply = check_command(fsg, 10, DATA_DIR_TO_HOST,
-+				(3<<7), 1,
-+				"READ FORMAT CAPACITIES")) == 0)
-+			reply = do_read_format_capacities(fsg, bh);
-+		break;
-+
-+	case REQUEST_SENSE:
-+		fsg->data_size_from_cmnd = fsg->cmnd[4];
-+		if ((reply = check_command(fsg, 6, DATA_DIR_TO_HOST,
-+				(1<<4), 0,
-+				"REQUEST SENSE")) == 0)
-+			reply = do_request_sense(fsg, bh);
-+		break;
-+
-+	case START_STOP:
-+		fsg->data_size_from_cmnd = 0;
-+		if ((reply = check_command(fsg, 6, DATA_DIR_NONE,
-+				(1<<1) | (1<<4), 0,
-+				"START-STOP UNIT")) == 0)
-+			reply = do_start_stop(fsg);
-+		break;
-+
-+	case SYNCHRONIZE_CACHE:
-+		fsg->data_size_from_cmnd = 0;
-+		if ((reply = check_command(fsg, 10, DATA_DIR_NONE,
-+				(0xf<<2) | (3<<7), 1,
-+				"SYNCHRONIZE CACHE")) == 0)
-+			reply = do_synchronize_cache(fsg);
-+		break;
-+
-+	case TEST_UNIT_READY:
-+		fsg->data_size_from_cmnd = 0;
-+		reply = check_command(fsg, 6, DATA_DIR_NONE,
-+				0, 1,
-+				"TEST UNIT READY");
-+		break;
-+
-+	/* Although optional, this command is used by MS-Windows.  We
-+	 * support a minimal version: BytChk must be 0. */
-+	case VERIFY:
-+		fsg->data_size_from_cmnd = 0;
-+		if ((reply = check_command(fsg, 10, DATA_DIR_NONE,
-+				(1<<1) | (0xf<<2) | (3<<7), 1,
-+				"VERIFY")) == 0)
-+			reply = do_verify(fsg);
-+		break;
-+
-+	case WRITE_6:
-+		i = fsg->cmnd[4];
-+		fsg->data_size_from_cmnd = (i == 0) ? 256 : i;
-+		if ((reply = check_command_size_in_blocks(fsg, 6,
-+				DATA_DIR_FROM_HOST,
-+				(7<<1) | (1<<4), 1,
-+				"WRITE(6)")) == 0)
-+			reply = do_write(fsg);
-+		break;
-+
-+	case WRITE_10:
-+		fsg->data_size_from_cmnd = get_unaligned_be16(&fsg->cmnd[7]);
-+		if ((reply = check_command_size_in_blocks(fsg, 10,
-+				DATA_DIR_FROM_HOST,
-+				(1<<1) | (0xf<<2) | (3<<7), 1,
-+				"WRITE(10)")) == 0)
-+			reply = do_write(fsg);
-+		break;
-+
-+	case WRITE_12:
-+		fsg->data_size_from_cmnd = get_unaligned_be32(&fsg->cmnd[6]);
-+		if ((reply = check_command_size_in_blocks(fsg, 12,
-+				DATA_DIR_FROM_HOST,
-+				(1<<1) | (0xf<<2) | (0xf<<6), 1,
-+				"WRITE(12)")) == 0)
-+			reply = do_write(fsg);
-+		break;
-+
-+	/* Some mandatory commands that we recognize but don't implement.
-+	 * They don't mean much in this setting.  It's left as an exercise
-+	 * for anyone interested to implement RESERVE and RELEASE in terms
-+	 * of Posix locks. */
-+	case FORMAT_UNIT:
-+	case RELEASE:
-+	case RESERVE:
-+	case SEND_DIAGNOSTIC:
-+		// Fall through
-+
-+	default:
-+ unknown_cmnd:
-+		fsg->data_size_from_cmnd = 0;
-+		sprintf(unknown, "Unknown x%02x", fsg->cmnd[0]);
-+		if ((reply = check_command(fsg, fsg->cmnd_size,
-+				DATA_DIR_UNKNOWN, ~0, 0, unknown)) == 0) {
-+			fsg->curlun->sense_data = SS_INVALID_COMMAND;
-+			reply = -EINVAL;
-+		}
-+		break;
-+	}
-+	up_read(&fsg->filesem);
-+
-+	if (reply == -EINTR || signal_pending(current))
-+		return -EINTR;
-+
-+	/* Set up the single reply buffer for finish_reply() */
-+	if (reply == -EINVAL)
-+		reply = 0;		// Error reply length
-+	if (reply >= 0 && fsg->data_dir == DATA_DIR_TO_HOST) {
-+		reply = min((u32) reply, fsg->data_size_from_cmnd);
-+		bh->inreq->length = reply;
-+		bh->state = BUF_STATE_FULL;
-+		fsg->residue -= reply;
-+	}				// Otherwise it's already set
-+
-+	return 0;
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static int received_cbw(struct fsg_dev *fsg, struct fsg_buffhd *bh)
-+{
-+	struct usb_request		*req = bh->outreq;
-+	struct bulk_cb_wrap	*cbw = req->buf;
-+
-+	/* Was this a real packet?  Should it be ignored? */
-+	if (req->status || test_bit(IGNORE_BULK_OUT, &fsg->atomic_bitflags))
-+		return -EINVAL;
-+
-+	/* Is the CBW valid? */
-+	if (req->actual != US_BULK_CB_WRAP_LEN ||
-+			cbw->Signature != cpu_to_le32(
-+				US_BULK_CB_SIGN)) {
-+		DBG(fsg, "invalid CBW: len %u sig 0x%x\n",
-+				req->actual,
-+				le32_to_cpu(cbw->Signature));
-+
-+		/* The Bulk-only spec says we MUST stall the IN endpoint
-+		 * (6.6.1), so it's unavoidable.  It also says we must
-+		 * retain this state until the next reset, but there's
-+		 * no way to tell the controller driver it should ignore
-+		 * Clear-Feature(HALT) requests.
-+		 *
-+		 * We aren't required to halt the OUT endpoint; instead
-+		 * we can simply accept and discard any data received
-+		 * until the next reset. */
-+		wedge_bulk_in_endpoint(fsg);
-+		set_bit(IGNORE_BULK_OUT, &fsg->atomic_bitflags);
-+		return -EINVAL;
-+	}
-+
-+	/* Is the CBW meaningful? */
-+	if (cbw->Lun >= FSG_MAX_LUNS || cbw->Flags & ~US_BULK_FLAG_IN ||
-+			cbw->Length <= 0 || cbw->Length > MAX_COMMAND_SIZE) {
-+		DBG(fsg, "non-meaningful CBW: lun = %u, flags = 0x%x, "
-+				"cmdlen %u\n",
-+				cbw->Lun, cbw->Flags, cbw->Length);
-+
-+		/* We can do anything we want here, so let's stall the
-+		 * bulk pipes if we are allowed to. */
-+		if (mod_data.can_stall) {
-+			fsg_set_halt(fsg, fsg->bulk_out);
-+			halt_bulk_in_endpoint(fsg);
-+		}
-+		return -EINVAL;
-+	}
-+
-+	/* Save the command for later */
-+	fsg->cmnd_size = cbw->Length;
-+	memcpy(fsg->cmnd, cbw->CDB, fsg->cmnd_size);
-+	if (cbw->Flags & US_BULK_FLAG_IN)
-+		fsg->data_dir = DATA_DIR_TO_HOST;
-+	else
-+		fsg->data_dir = DATA_DIR_FROM_HOST;
-+	fsg->data_size = le32_to_cpu(cbw->DataTransferLength);
-+	if (fsg->data_size == 0)
-+		fsg->data_dir = DATA_DIR_NONE;
-+	fsg->lun = cbw->Lun;
-+	fsg->tag = cbw->Tag;
-+	return 0;
-+}
-+
-+
-+static int get_next_command(struct fsg_dev *fsg)
-+{
-+	struct fsg_buffhd	*bh;
-+	int			rc = 0;
-+
-+	if (transport_is_bbb()) {
-+
-+		/* Wait for the next buffer to become available */
-+		bh = fsg->next_buffhd_to_fill;
-+		while (bh->state != BUF_STATE_EMPTY) {
-+			rc = sleep_thread(fsg);
-+			if (rc)
-+				return rc;
-+		}
-+
-+		/* Queue a request to read a Bulk-only CBW */
-+		set_bulk_out_req_length(fsg, bh, US_BULK_CB_WRAP_LEN);
-+		start_transfer(fsg, fsg->bulk_out, bh->outreq,
-+				&bh->outreq_busy, &bh->state);
-+
-+		/* We will drain the buffer in software, which means we
-+		 * can reuse it for the next filling.  No need to advance
-+		 * next_buffhd_to_fill. */
-+
-+		/* Wait for the CBW to arrive */
-+		while (bh->state != BUF_STATE_FULL) {
-+			rc = sleep_thread(fsg);
-+			if (rc)
-+				return rc;
-+		}
-+		smp_rmb();
-+		rc = received_cbw(fsg, bh);
-+		bh->state = BUF_STATE_EMPTY;
-+
-+	} else {		// USB_PR_CB or USB_PR_CBI
-+
-+		/* Wait for the next command to arrive */
-+		while (fsg->cbbuf_cmnd_size == 0) {
-+			rc = sleep_thread(fsg);
-+			if (rc)
-+				return rc;
-+		}
-+
-+		/* Is the previous status interrupt request still busy?
-+		 * The host is allowed to skip reading the status,
-+		 * so we must cancel it. */
-+		if (fsg->intreq_busy)
-+			usb_ep_dequeue(fsg->intr_in, fsg->intreq);
-+
-+		/* Copy the command and mark the buffer empty */
-+		fsg->data_dir = DATA_DIR_UNKNOWN;
-+		spin_lock_irq(&fsg->lock);
-+		fsg->cmnd_size = fsg->cbbuf_cmnd_size;
-+		memcpy(fsg->cmnd, fsg->cbbuf_cmnd, fsg->cmnd_size);
-+		fsg->cbbuf_cmnd_size = 0;
-+		spin_unlock_irq(&fsg->lock);
-+
-+		/* Use LUN from the command */
-+		fsg->lun = fsg->cmnd[1] >> 5;
-+	}
-+
-+	/* Update current lun */
-+	if (fsg->lun >= 0 && fsg->lun < fsg->nluns)
-+		fsg->curlun = &fsg->luns[fsg->lun];
-+	else
-+		fsg->curlun = NULL;
-+
-+	return rc;
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static int enable_endpoint(struct fsg_dev *fsg, struct usb_ep *ep,
-+		const struct usb_endpoint_descriptor *d)
-+{
-+	int	rc;
-+
-+	ep->driver_data = fsg;
-+	ep->desc = d;
-+	rc = usb_ep_enable(ep);
-+	if (rc)
-+		ERROR(fsg, "can't enable %s, result %d\n", ep->name, rc);
-+	return rc;
-+}
-+
-+static int alloc_request(struct fsg_dev *fsg, struct usb_ep *ep,
-+		struct usb_request **preq)
-+{
-+	*preq = usb_ep_alloc_request(ep, GFP_ATOMIC);
-+	if (*preq)
-+		return 0;
-+	ERROR(fsg, "can't allocate request for %s\n", ep->name);
-+	return -ENOMEM;
-+}
-+
-+/*
-+ * Reset interface setting and re-init endpoint state (toggle etc).
-+ * Call with altsetting < 0 to disable the interface.  The only other
-+ * available altsetting is 0, which enables the interface.
-+ */
-+static int do_set_interface(struct fsg_dev *fsg, int altsetting)
-+{
-+	int	rc = 0;
-+	int	i;
-+	const struct usb_endpoint_descriptor	*d;
-+
-+	if (fsg->running)
-+		DBG(fsg, "reset interface\n");
-+
-+reset:
-+	/* Deallocate the requests */
-+	for (i = 0; i < fsg_num_buffers; ++i) {
-+		struct fsg_buffhd *bh = &fsg->buffhds[i];
-+
-+		if (bh->inreq) {
-+			usb_ep_free_request(fsg->bulk_in, bh->inreq);
-+			bh->inreq = NULL;
-+		}
-+		if (bh->outreq) {
-+			usb_ep_free_request(fsg->bulk_out, bh->outreq);
-+			bh->outreq = NULL;
-+		}
-+	}
-+	if (fsg->intreq) {
-+		usb_ep_free_request(fsg->intr_in, fsg->intreq);
-+		fsg->intreq = NULL;
-+	}
-+
-+	/* Disable the endpoints */
-+	if (fsg->bulk_in_enabled) {
-+		usb_ep_disable(fsg->bulk_in);
-+		fsg->bulk_in_enabled = 0;
-+	}
-+	if (fsg->bulk_out_enabled) {
-+		usb_ep_disable(fsg->bulk_out);
-+		fsg->bulk_out_enabled = 0;
-+	}
-+	if (fsg->intr_in_enabled) {
-+		usb_ep_disable(fsg->intr_in);
-+		fsg->intr_in_enabled = 0;
-+	}
-+
-+	fsg->running = 0;
-+	if (altsetting < 0 || rc != 0)
-+		return rc;
-+
-+	DBG(fsg, "set interface %d\n", altsetting);
-+
-+	/* Enable the endpoints */
-+	d = fsg_ep_desc(fsg->gadget,
-+			&fsg_fs_bulk_in_desc, &fsg_hs_bulk_in_desc,
-+			&fsg_ss_bulk_in_desc);
-+	if ((rc = enable_endpoint(fsg, fsg->bulk_in, d)) != 0)
-+		goto reset;
-+	fsg->bulk_in_enabled = 1;
-+
-+	d = fsg_ep_desc(fsg->gadget,
-+			&fsg_fs_bulk_out_desc, &fsg_hs_bulk_out_desc,
-+			&fsg_ss_bulk_out_desc);
-+	if ((rc = enable_endpoint(fsg, fsg->bulk_out, d)) != 0)
-+		goto reset;
-+	fsg->bulk_out_enabled = 1;
-+	fsg->bulk_out_maxpacket = usb_endpoint_maxp(d);
-+	clear_bit(IGNORE_BULK_OUT, &fsg->atomic_bitflags);
-+
-+	if (transport_is_cbi()) {
-+		d = fsg_ep_desc(fsg->gadget,
-+				&fsg_fs_intr_in_desc, &fsg_hs_intr_in_desc,
-+				&fsg_ss_intr_in_desc);
-+		if ((rc = enable_endpoint(fsg, fsg->intr_in, d)) != 0)
-+			goto reset;
-+		fsg->intr_in_enabled = 1;
-+	}
-+
-+	/* Allocate the requests */
-+	for (i = 0; i < fsg_num_buffers; ++i) {
-+		struct fsg_buffhd	*bh = &fsg->buffhds[i];
-+
-+		if ((rc = alloc_request(fsg, fsg->bulk_in, &bh->inreq)) != 0)
-+			goto reset;
-+		if ((rc = alloc_request(fsg, fsg->bulk_out, &bh->outreq)) != 0)
-+			goto reset;
-+		bh->inreq->buf = bh->outreq->buf = bh->buf;
-+		bh->inreq->context = bh->outreq->context = bh;
-+		bh->inreq->complete = bulk_in_complete;
-+		bh->outreq->complete = bulk_out_complete;
-+	}
-+	if (transport_is_cbi()) {
-+		if ((rc = alloc_request(fsg, fsg->intr_in, &fsg->intreq)) != 0)
-+			goto reset;
-+		fsg->intreq->complete = intr_in_complete;
-+	}
-+
-+	fsg->running = 1;
-+	for (i = 0; i < fsg->nluns; ++i)
-+		fsg->luns[i].unit_attention_data = SS_RESET_OCCURRED;
-+	return rc;
-+}
-+
-+
-+/*
-+ * Change our operational configuration.  This code must agree with the code
-+ * that returns config descriptors, and with interface altsetting code.
-+ *
-+ * It's also responsible for power management interactions.  Some
-+ * configurations might not work with our current power sources.
-+ * For now we just assume the gadget is always self-powered.
-+ */
-+static int do_set_config(struct fsg_dev *fsg, u8 new_config)
-+{
-+	int	rc = 0;
-+
-+	/* Disable the single interface */
-+	if (fsg->config != 0) {
-+		DBG(fsg, "reset config\n");
-+		fsg->config = 0;
-+		rc = do_set_interface(fsg, -1);
-+	}
-+
-+	/* Enable the interface */
-+	if (new_config != 0) {
-+		fsg->config = new_config;
-+		if ((rc = do_set_interface(fsg, 0)) != 0)
-+			fsg->config = 0;	// Reset on errors
-+		else
-+			INFO(fsg, "%s config #%d\n",
-+			     usb_speed_string(fsg->gadget->speed),
-+			     fsg->config);
-+	}
-+	return rc;
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static void handle_exception(struct fsg_dev *fsg)
-+{
-+	siginfo_t		info;
-+	int			sig;
-+	int			i;
-+	int			num_active;
-+	struct fsg_buffhd	*bh;
-+	enum fsg_state		old_state;
-+	u8			new_config;
-+	struct fsg_lun		*curlun;
-+	unsigned int		exception_req_tag;
-+	int			rc;
-+
-+	/* Clear the existing signals.  Anything but SIGUSR1 is converted
-+	 * into a high-priority EXIT exception. */
-+	for (;;) {
-+		sig = dequeue_signal_lock(current, &current->blocked, &info);
-+		if (!sig)
-+			break;
-+		if (sig != SIGUSR1) {
-+			if (fsg->state < FSG_STATE_EXIT)
-+				DBG(fsg, "Main thread exiting on signal\n");
-+			raise_exception(fsg, FSG_STATE_EXIT);
-+		}
-+	}
-+
-+	/* Cancel all the pending transfers */
-+	if (fsg->intreq_busy)
-+		usb_ep_dequeue(fsg->intr_in, fsg->intreq);
-+	for (i = 0; i < fsg_num_buffers; ++i) {
-+		bh = &fsg->buffhds[i];
-+		if (bh->inreq_busy)
-+			usb_ep_dequeue(fsg->bulk_in, bh->inreq);
-+		if (bh->outreq_busy)
-+			usb_ep_dequeue(fsg->bulk_out, bh->outreq);
-+	}
-+
-+	/* Wait until everything is idle */
-+	for (;;) {
-+		num_active = fsg->intreq_busy;
-+		for (i = 0; i < fsg_num_buffers; ++i) {
-+			bh = &fsg->buffhds[i];
-+			num_active += bh->inreq_busy + bh->outreq_busy;
-+		}
-+		if (num_active == 0)
-+			break;
-+		if (sleep_thread(fsg))
-+			return;
-+	}
-+
-+	/* Clear out the controller's fifos */
-+	if (fsg->bulk_in_enabled)
-+		usb_ep_fifo_flush(fsg->bulk_in);
-+	if (fsg->bulk_out_enabled)
-+		usb_ep_fifo_flush(fsg->bulk_out);
-+	if (fsg->intr_in_enabled)
-+		usb_ep_fifo_flush(fsg->intr_in);
-+
-+	/* Reset the I/O buffer states and pointers, the SCSI
-+	 * state, and the exception.  Then invoke the handler. */
-+	spin_lock_irq(&fsg->lock);
-+
-+	for (i = 0; i < fsg_num_buffers; ++i) {
-+		bh = &fsg->buffhds[i];
-+		bh->state = BUF_STATE_EMPTY;
-+	}
-+	fsg->next_buffhd_to_fill = fsg->next_buffhd_to_drain =
-+			&fsg->buffhds[0];
-+
-+	exception_req_tag = fsg->exception_req_tag;
-+	new_config = fsg->new_config;
-+	old_state = fsg->state;
-+
-+	if (old_state == FSG_STATE_ABORT_BULK_OUT)
-+		fsg->state = FSG_STATE_STATUS_PHASE;
-+	else {
-+		for (i = 0; i < fsg->nluns; ++i) {
-+			curlun = &fsg->luns[i];
-+			curlun->prevent_medium_removal = 0;
-+			curlun->sense_data = curlun->unit_attention_data =
-+					SS_NO_SENSE;
-+			curlun->sense_data_info = 0;
-+			curlun->info_valid = 0;
-+		}
-+		fsg->state = FSG_STATE_IDLE;
-+	}
-+	spin_unlock_irq(&fsg->lock);
-+
-+	/* Carry out any extra actions required for the exception */
-+	switch (old_state) {
-+	default:
-+		break;
-+
-+	case FSG_STATE_ABORT_BULK_OUT:
-+		send_status(fsg);
-+		spin_lock_irq(&fsg->lock);
-+		if (fsg->state == FSG_STATE_STATUS_PHASE)
-+			fsg->state = FSG_STATE_IDLE;
-+		spin_unlock_irq(&fsg->lock);
-+		break;
-+
-+	case FSG_STATE_RESET:
-+		/* In case we were forced against our will to halt a
-+		 * bulk endpoint, clear the halt now.  (The SuperH UDC
-+		 * requires this.) */
-+		if (test_and_clear_bit(IGNORE_BULK_OUT, &fsg->atomic_bitflags))
-+			usb_ep_clear_halt(fsg->bulk_in);
-+
-+		if (transport_is_bbb()) {
-+			if (fsg->ep0_req_tag == exception_req_tag)
-+				ep0_queue(fsg);	// Complete the status stage
-+
-+		} else if (transport_is_cbi())
-+			send_status(fsg);	// Status by interrupt pipe
-+
-+		/* Technically this should go here, but it would only be
-+		 * a waste of time.  Ditto for the INTERFACE_CHANGE and
-+		 * CONFIG_CHANGE cases. */
-+		// for (i = 0; i < fsg->nluns; ++i)
-+		//	fsg->luns[i].unit_attention_data = SS_RESET_OCCURRED;
-+		break;
-+
-+	case FSG_STATE_INTERFACE_CHANGE:
-+		rc = do_set_interface(fsg, 0);
-+		if (fsg->ep0_req_tag != exception_req_tag)
-+			break;
-+		if (rc != 0)			// STALL on errors
-+			fsg_set_halt(fsg, fsg->ep0);
-+		else				// Complete the status stage
-+			ep0_queue(fsg);
-+		break;
-+
-+	case FSG_STATE_CONFIG_CHANGE:
-+		rc = do_set_config(fsg, new_config);
-+		if (fsg->ep0_req_tag != exception_req_tag)
-+			break;
-+		if (rc != 0)			// STALL on errors
-+			fsg_set_halt(fsg, fsg->ep0);
-+		else				// Complete the status stage
-+			ep0_queue(fsg);
-+		break;
-+
-+	case FSG_STATE_DISCONNECT:
-+		for (i = 0; i < fsg->nluns; ++i)
-+			fsg_lun_fsync_sub(fsg->luns + i);
-+		do_set_config(fsg, 0);		// Unconfigured state
-+		break;
-+
-+	case FSG_STATE_EXIT:
-+	case FSG_STATE_TERMINATED:
-+		do_set_config(fsg, 0);			// Free resources
-+		spin_lock_irq(&fsg->lock);
-+		fsg->state = FSG_STATE_TERMINATED;	// Stop the thread
-+		spin_unlock_irq(&fsg->lock);
-+		break;
-+	}
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static int fsg_main_thread(void *fsg_)
-+{
-+	struct fsg_dev		*fsg = fsg_;
-+
-+	/* Allow the thread to be killed by a signal, but set the signal mask
-+	 * to block everything but INT, TERM, KILL, and USR1. */
-+	allow_signal(SIGINT);
-+	allow_signal(SIGTERM);
-+	allow_signal(SIGKILL);
-+	allow_signal(SIGUSR1);
-+
-+	/* Allow the thread to be frozen */
-+	set_freezable();
-+
-+	/* Arrange for userspace references to be interpreted as kernel
-+	 * pointers.  That way we can pass a kernel pointer to a routine
-+	 * that expects a __user pointer and it will work okay. */
-+	set_fs(get_ds());
-+
-+	/* The main loop */
-+	while (fsg->state != FSG_STATE_TERMINATED) {
-+		if (exception_in_progress(fsg) || signal_pending(current)) {
-+			handle_exception(fsg);
-+			continue;
-+		}
-+
-+		if (!fsg->running) {
-+			sleep_thread(fsg);
-+			continue;
-+		}
-+
-+		if (get_next_command(fsg))
-+			continue;
-+
-+		spin_lock_irq(&fsg->lock);
-+		if (!exception_in_progress(fsg))
-+			fsg->state = FSG_STATE_DATA_PHASE;
-+		spin_unlock_irq(&fsg->lock);
-+
-+		if (do_scsi_command(fsg) || finish_reply(fsg))
-+			continue;
-+
-+		spin_lock_irq(&fsg->lock);
-+		if (!exception_in_progress(fsg))
-+			fsg->state = FSG_STATE_STATUS_PHASE;
-+		spin_unlock_irq(&fsg->lock);
-+
-+		if (send_status(fsg))
-+			continue;
-+
-+		spin_lock_irq(&fsg->lock);
-+		if (!exception_in_progress(fsg))
-+			fsg->state = FSG_STATE_IDLE;
-+		spin_unlock_irq(&fsg->lock);
-+		}
-+
-+	spin_lock_irq(&fsg->lock);
-+	fsg->thread_task = NULL;
-+	spin_unlock_irq(&fsg->lock);
-+
-+	/* If we are exiting because of a signal, unregister the
-+	 * gadget driver. */
-+	if (test_and_clear_bit(REGISTERED, &fsg->atomic_bitflags))
-+		usb_gadget_unregister_driver(&fsg_driver);
-+
-+	/* Let the unbind and cleanup routines know the thread has exited */
-+	kthread_complete_and_exit(&fsg->thread_notifier, 0);
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+
-+/* The write permissions and store_xxx pointers are set in fsg_bind() */
-+static DEVICE_ATTR(ro, 0444, fsg_show_ro, NULL);
-+static DEVICE_ATTR(nofua, 0644, fsg_show_nofua, NULL);
-+static DEVICE_ATTR(file, 0444, fsg_show_file, NULL);
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static void fsg_release(struct kref *ref)
-+{
-+	struct fsg_dev	*fsg = container_of(ref, struct fsg_dev, ref);
-+
-+	kfree(fsg->luns);
-+	kfree(fsg);
-+}
-+
-+static void lun_release(struct device *dev)
-+{
-+	struct rw_semaphore	*filesem = dev_get_drvdata(dev);
-+	struct fsg_dev		*fsg =
-+		container_of(filesem, struct fsg_dev, filesem);
-+
-+	kref_put(&fsg->ref, fsg_release);
-+}
-+
-+static void /* __init_or_exit */ fsg_unbind(struct usb_gadget *gadget)
-+{
-+	struct fsg_dev		*fsg = get_gadget_data(gadget);
-+	int			i;
-+	struct fsg_lun		*curlun;
-+	struct usb_request	*req = fsg->ep0req;
-+
-+	DBG(fsg, "unbind\n");
-+	clear_bit(REGISTERED, &fsg->atomic_bitflags);
-+
-+	/* If the thread isn't already dead, tell it to exit now */
-+	if (fsg->state != FSG_STATE_TERMINATED) {
-+		raise_exception(fsg, FSG_STATE_EXIT);
-+		wait_for_completion(&fsg->thread_notifier);
-+
-+		/* The cleanup routine waits for this completion also */
-+		complete(&fsg->thread_notifier);
-+	}
-+
-+	/* Unregister the sysfs attribute files and the LUNs */
-+	for (i = 0; i < fsg->nluns; ++i) {
-+		curlun = &fsg->luns[i];
-+		if (curlun->registered) {
-+			device_remove_file(&curlun->dev, &dev_attr_nofua);
-+			device_remove_file(&curlun->dev, &dev_attr_ro);
-+			device_remove_file(&curlun->dev, &dev_attr_file);
-+			fsg_lun_close(curlun);
-+			device_unregister(&curlun->dev);
-+			curlun->registered = 0;
-+		}
-+	}
-+
-+	/* Free the data buffers */
-+	for (i = 0; i < fsg_num_buffers; ++i)
-+		kfree(fsg->buffhds[i].buf);
-+
-+	/* Free the request and buffer for endpoint 0 */
-+	if (req) {
-+		kfree(req->buf);
-+		usb_ep_free_request(fsg->ep0, req);
-+	}
-+
-+	set_gadget_data(gadget, NULL);
-+}
-+
-+
-+static int __init check_parameters(struct fsg_dev *fsg)
-+{
-+	int	prot;
-+	int	gcnum;
-+
-+	/* Store the default values */
-+	mod_data.transport_type = USB_PR_BULK;
-+	mod_data.transport_name = "Bulk-only";
-+	mod_data.protocol_type = USB_SC_SCSI;
-+	mod_data.protocol_name = "Transparent SCSI";
-+
-+	/* Some peripheral controllers are known not to be able to
-+	 * halt bulk endpoints correctly.  If one of them is present,
-+	 * disable stalls.
-+	 */
-+	if (gadget_is_at91(fsg->gadget))
-+		mod_data.can_stall = 0;
-+
-+	if (mod_data.release == 0xffff) {	// Parameter wasn't set
-+		gcnum = usb_gadget_controller_number(fsg->gadget);
-+		if (gcnum >= 0)
-+			mod_data.release = 0x0300 + gcnum;
-+		else {
-+			WARNING(fsg, "controller '%s' not recognized\n",
-+				fsg->gadget->name);
-+			mod_data.release = 0x0399;
-+		}
-+	}
-+
-+	prot = simple_strtol(mod_data.protocol_parm, NULL, 0);
-+
-+#ifdef CONFIG_USB_FILE_STORAGE_TEST
-+	if (strnicmp(mod_data.transport_parm, "BBB", 10) == 0) {
-+		;		// Use default setting
-+	} else if (strnicmp(mod_data.transport_parm, "CB", 10) == 0) {
-+		mod_data.transport_type = USB_PR_CB;
-+		mod_data.transport_name = "Control-Bulk";
-+	} else if (strnicmp(mod_data.transport_parm, "CBI", 10) == 0) {
-+		mod_data.transport_type = USB_PR_CBI;
-+		mod_data.transport_name = "Control-Bulk-Interrupt";
-+	} else {
-+		ERROR(fsg, "invalid transport: %s\n", mod_data.transport_parm);
-+		return -EINVAL;
-+	}
-+
-+	if (strnicmp(mod_data.protocol_parm, "SCSI", 10) == 0 ||
-+			prot == USB_SC_SCSI) {
-+		;		// Use default setting
-+	} else if (strnicmp(mod_data.protocol_parm, "RBC", 10) == 0 ||
-+			prot == USB_SC_RBC) {
-+		mod_data.protocol_type = USB_SC_RBC;
-+		mod_data.protocol_name = "RBC";
-+	} else if (strnicmp(mod_data.protocol_parm, "8020", 4) == 0 ||
-+			strnicmp(mod_data.protocol_parm, "ATAPI", 10) == 0 ||
-+			prot == USB_SC_8020) {
-+		mod_data.protocol_type = USB_SC_8020;
-+		mod_data.protocol_name = "8020i (ATAPI)";
-+	} else if (strnicmp(mod_data.protocol_parm, "QIC", 3) == 0 ||
-+			prot == USB_SC_QIC) {
-+		mod_data.protocol_type = USB_SC_QIC;
-+		mod_data.protocol_name = "QIC-157";
-+	} else if (strnicmp(mod_data.protocol_parm, "UFI", 10) == 0 ||
-+			prot == USB_SC_UFI) {
-+		mod_data.protocol_type = USB_SC_UFI;
-+		mod_data.protocol_name = "UFI";
-+	} else if (strnicmp(mod_data.protocol_parm, "8070", 4) == 0 ||
-+			prot == USB_SC_8070) {
-+		mod_data.protocol_type = USB_SC_8070;
-+		mod_data.protocol_name = "8070i";
-+	} else {
-+		ERROR(fsg, "invalid protocol: %s\n", mod_data.protocol_parm);
-+		return -EINVAL;
-+	}
-+
-+	mod_data.buflen &= PAGE_CACHE_MASK;
-+	if (mod_data.buflen <= 0) {
-+		ERROR(fsg, "invalid buflen\n");
-+		return -ETOOSMALL;
-+	}
-+
-+#endif /* CONFIG_USB_FILE_STORAGE_TEST */
-+
-+	/* Serial string handling.
-+	 * On a real device, the serial string would be loaded
-+	 * from permanent storage. */
-+	if (mod_data.serial) {
-+		const char *ch;
-+		unsigned len = 0;
-+
-+		/* Sanity check :
-+		 * The CB[I] specification limits the serial string to
-+		 * 12 uppercase hexadecimal characters.
-+		 * BBB need at least 12 uppercase hexadecimal characters,
-+		 * with a maximum of 126. */
-+		for (ch = mod_data.serial; *ch; ++ch) {
-+			++len;
-+			if ((*ch < '0' || *ch > '9') &&
-+			    (*ch < 'A' || *ch > 'F')) { /* not uppercase hex */
-+				WARNING(fsg,
-+					"Invalid serial string character: %c\n",
-+					*ch);
-+				goto no_serial;
-+			}
-+		}
-+		if (len > 126 ||
-+		    (mod_data.transport_type == USB_PR_BULK && len < 12) ||
-+		    (mod_data.transport_type != USB_PR_BULK && len > 12)) {
-+			WARNING(fsg, "Invalid serial string length!\n");
-+			goto no_serial;
-+		}
-+		fsg_strings[FSG_STRING_SERIAL - 1].s = mod_data.serial;
-+	} else {
-+		WARNING(fsg, "No serial-number string provided!\n");
-+ no_serial:
-+		device_desc.iSerialNumber = 0;
-+	}
-+
-+	return 0;
-+}
-+
-+
-+static int __init fsg_bind(struct usb_gadget *gadget)
-+{
-+	struct fsg_dev		*fsg = the_fsg;
-+	int			rc;
-+	int			i;
-+	struct fsg_lun		*curlun;
-+	struct usb_ep		*ep;
-+	struct usb_request	*req;
-+	char			*pathbuf, *p;
-+
-+	fsg->gadget = gadget;
-+	set_gadget_data(gadget, fsg);
-+	fsg->ep0 = gadget->ep0;
-+	fsg->ep0->driver_data = fsg;
-+
-+	if ((rc = check_parameters(fsg)) != 0)
-+		goto out;
-+
-+	if (mod_data.removable) {	// Enable the store_xxx attributes
-+		dev_attr_file.attr.mode = 0644;
-+		dev_attr_file.store = fsg_store_file;
-+		if (!mod_data.cdrom) {
-+			dev_attr_ro.attr.mode = 0644;
-+			dev_attr_ro.store = fsg_store_ro;
-+		}
-+	}
-+
-+	/* Only for removable media? */
-+	dev_attr_nofua.attr.mode = 0644;
-+	dev_attr_nofua.store = fsg_store_nofua;
-+
-+	/* Find out how many LUNs there should be */
-+	i = mod_data.nluns;
-+	if (i == 0)
-+		i = max(mod_data.num_filenames, 1u);
-+	if (i > FSG_MAX_LUNS) {
-+		ERROR(fsg, "invalid number of LUNs: %d\n", i);
-+		rc = -EINVAL;
-+		goto out;
-+	}
-+
-+	/* Create the LUNs, open their backing files, and register the
-+	 * LUN devices in sysfs. */
-+	fsg->luns = kzalloc(i * sizeof(struct fsg_lun), GFP_KERNEL);
-+	if (!fsg->luns) {
-+		rc = -ENOMEM;
-+		goto out;
-+	}
-+	fsg->nluns = i;
-+
-+	for (i = 0; i < fsg->nluns; ++i) {
-+		curlun = &fsg->luns[i];
-+		curlun->cdrom = !!mod_data.cdrom;
-+		curlun->ro = mod_data.cdrom || mod_data.ro[i];
-+		curlun->initially_ro = curlun->ro;
-+		curlun->removable = mod_data.removable;
-+		curlun->nofua = mod_data.nofua[i];
-+		curlun->dev.release = lun_release;
-+		curlun->dev.parent = &gadget->dev;
-+		curlun->dev.driver = &fsg_driver.driver;
-+		dev_set_drvdata(&curlun->dev, &fsg->filesem);
-+		dev_set_name(&curlun->dev,"%s-lun%d",
-+			     dev_name(&gadget->dev), i);
-+
-+		kref_get(&fsg->ref);
-+		rc = device_register(&curlun->dev);
-+		if (rc) {
-+			INFO(fsg, "failed to register LUN%d: %d\n", i, rc);
-+			put_device(&curlun->dev);
-+			goto out;
-+		}
-+		curlun->registered = 1;
-+
-+		rc = device_create_file(&curlun->dev, &dev_attr_ro);
-+		if (rc)
-+			goto out;
-+		rc = device_create_file(&curlun->dev, &dev_attr_nofua);
-+		if (rc)
-+			goto out;
-+		rc = device_create_file(&curlun->dev, &dev_attr_file);
-+		if (rc)
-+			goto out;
-+
-+		if (mod_data.file[i] && *mod_data.file[i]) {
-+			rc = fsg_lun_open(curlun, mod_data.file[i]);
-+			if (rc)
-+				goto out;
-+		} else if (!mod_data.removable) {
-+			ERROR(fsg, "no file given for LUN%d\n", i);
-+			rc = -EINVAL;
-+			goto out;
-+		}
-+	}
-+
-+	/* Find all the endpoints we will use */
-+	usb_ep_autoconfig_reset(gadget);
-+	ep = usb_ep_autoconfig(gadget, &fsg_fs_bulk_in_desc);
-+	if (!ep)
-+		goto autoconf_fail;
-+	ep->driver_data = fsg;		// claim the endpoint
-+	fsg->bulk_in = ep;
-+
-+	ep = usb_ep_autoconfig(gadget, &fsg_fs_bulk_out_desc);
-+	if (!ep)
-+		goto autoconf_fail;
-+	ep->driver_data = fsg;		// claim the endpoint
-+	fsg->bulk_out = ep;
-+
-+	if (transport_is_cbi()) {
-+		ep = usb_ep_autoconfig(gadget, &fsg_fs_intr_in_desc);
-+		if (!ep)
-+			goto autoconf_fail;
-+		ep->driver_data = fsg;		// claim the endpoint
-+		fsg->intr_in = ep;
-+	}
-+
-+	/* Fix up the descriptors */
-+	device_desc.idVendor = cpu_to_le16(mod_data.vendor);
-+	device_desc.idProduct = cpu_to_le16(mod_data.product);
-+	device_desc.bcdDevice = cpu_to_le16(mod_data.release);
-+
-+	i = (transport_is_cbi() ? 3 : 2);	// Number of endpoints
-+	fsg_intf_desc.bNumEndpoints = i;
-+	fsg_intf_desc.bInterfaceSubClass = mod_data.protocol_type;
-+	fsg_intf_desc.bInterfaceProtocol = mod_data.transport_type;
-+	fsg_fs_function[i + FSG_FS_FUNCTION_PRE_EP_ENTRIES] = NULL;
-+
-+	if (gadget_is_dualspeed(gadget)) {
-+		fsg_hs_function[i + FSG_HS_FUNCTION_PRE_EP_ENTRIES] = NULL;
-+
-+		/* Assume endpoint addresses are the same for both speeds */
-+		fsg_hs_bulk_in_desc.bEndpointAddress =
-+			fsg_fs_bulk_in_desc.bEndpointAddress;
-+		fsg_hs_bulk_out_desc.bEndpointAddress =
-+			fsg_fs_bulk_out_desc.bEndpointAddress;
-+		fsg_hs_intr_in_desc.bEndpointAddress =
-+			fsg_fs_intr_in_desc.bEndpointAddress;
-+	}
-+
-+	if (gadget_is_superspeed(gadget)) {
-+		unsigned		max_burst;
-+
-+		fsg_ss_function[i + FSG_SS_FUNCTION_PRE_EP_ENTRIES] = NULL;
-+
-+		/* Calculate bMaxBurst, we know packet size is 1024 */
-+		max_burst = min_t(unsigned, mod_data.buflen / 1024, 15);
-+
-+		/* Assume endpoint addresses are the same for both speeds */
-+		fsg_ss_bulk_in_desc.bEndpointAddress =
-+			fsg_fs_bulk_in_desc.bEndpointAddress;
-+		fsg_ss_bulk_in_comp_desc.bMaxBurst = max_burst;
-+
-+		fsg_ss_bulk_out_desc.bEndpointAddress =
-+			fsg_fs_bulk_out_desc.bEndpointAddress;
-+		fsg_ss_bulk_out_comp_desc.bMaxBurst = max_burst;
-+	}
-+
-+	if (gadget_is_otg(gadget))
-+		fsg_otg_desc.bmAttributes |= USB_OTG_HNP;
-+
-+	rc = -ENOMEM;
-+
-+	/* Allocate the request and buffer for endpoint 0 */
-+	fsg->ep0req = req = usb_ep_alloc_request(fsg->ep0, GFP_KERNEL);
-+	if (!req)
-+		goto out;
-+	req->buf = kmalloc(EP0_BUFSIZE, GFP_KERNEL);
-+	if (!req->buf)
-+		goto out;
-+	req->complete = ep0_complete;
-+
-+	/* Allocate the data buffers */
-+	for (i = 0; i < fsg_num_buffers; ++i) {
-+		struct fsg_buffhd	*bh = &fsg->buffhds[i];
-+
-+		/* Allocate for the bulk-in endpoint.  We assume that
-+		 * the buffer will also work with the bulk-out (and
-+		 * interrupt-in) endpoint. */
-+		bh->buf = kmalloc(mod_data.buflen, GFP_KERNEL);
-+		if (!bh->buf)
-+			goto out;
-+		bh->next = bh + 1;
-+	}
-+	fsg->buffhds[fsg_num_buffers - 1].next = &fsg->buffhds[0];
-+
-+	/* This should reflect the actual gadget power source */
-+	usb_gadget_set_selfpowered(gadget);
-+
-+	snprintf(fsg_string_manufacturer, sizeof fsg_string_manufacturer,
-+			"%s %s with %s",
-+			init_utsname()->sysname, init_utsname()->release,
-+			gadget->name);
-+
-+	fsg->thread_task = kthread_create(fsg_main_thread, fsg,
-+			"file-storage-gadget");
-+	if (IS_ERR(fsg->thread_task)) {
-+		rc = PTR_ERR(fsg->thread_task);
-+		goto out;
-+	}
-+
-+	INFO(fsg, DRIVER_DESC ", version: " DRIVER_VERSION "\n");
-+	INFO(fsg, "NOTE: This driver is deprecated.  "
-+			"Consider using g_mass_storage instead.\n");
-+	INFO(fsg, "Number of LUNs=%d\n", fsg->nluns);
-+
-+	pathbuf = kmalloc(PATH_MAX, GFP_KERNEL);
-+	for (i = 0; i < fsg->nluns; ++i) {
-+		curlun = &fsg->luns[i];
-+		if (fsg_lun_is_open(curlun)) {
-+			p = NULL;
-+			if (pathbuf) {
-+				p = d_path(&curlun->filp->f_path,
-+					   pathbuf, PATH_MAX);
-+				if (IS_ERR(p))
-+					p = NULL;
-+			}
-+			LINFO(curlun, "ro=%d, nofua=%d, file: %s\n",
-+			      curlun->ro, curlun->nofua, (p ? p : "(error)"));
-+		}
-+	}
-+	kfree(pathbuf);
-+
-+	DBG(fsg, "transport=%s (x%02x)\n",
-+			mod_data.transport_name, mod_data.transport_type);
-+	DBG(fsg, "protocol=%s (x%02x)\n",
-+			mod_data.protocol_name, mod_data.protocol_type);
-+	DBG(fsg, "VendorID=x%04x, ProductID=x%04x, Release=x%04x\n",
-+			mod_data.vendor, mod_data.product, mod_data.release);
-+	DBG(fsg, "removable=%d, stall=%d, cdrom=%d, buflen=%u\n",
-+			mod_data.removable, mod_data.can_stall,
-+			mod_data.cdrom, mod_data.buflen);
-+	DBG(fsg, "I/O thread pid: %d\n", task_pid_nr(fsg->thread_task));
-+
-+	set_bit(REGISTERED, &fsg->atomic_bitflags);
-+
-+	/* Tell the thread to start working */
-+	wake_up_process(fsg->thread_task);
-+	return 0;
-+
-+autoconf_fail:
-+	ERROR(fsg, "unable to autoconfigure all endpoints\n");
-+	rc = -ENOTSUPP;
-+
-+out:
-+	fsg->state = FSG_STATE_TERMINATED;	// The thread is dead
-+	fsg_unbind(gadget);
-+	complete(&fsg->thread_notifier);
-+	return rc;
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static void fsg_suspend(struct usb_gadget *gadget)
-+{
-+	struct fsg_dev		*fsg = get_gadget_data(gadget);
-+
-+	DBG(fsg, "suspend\n");
-+	set_bit(SUSPENDED, &fsg->atomic_bitflags);
-+}
-+
-+static void fsg_resume(struct usb_gadget *gadget)
-+{
-+	struct fsg_dev		*fsg = get_gadget_data(gadget);
-+
-+	DBG(fsg, "resume\n");
-+	clear_bit(SUSPENDED, &fsg->atomic_bitflags);
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static struct usb_gadget_driver		fsg_driver = {
-+	.max_speed	= USB_SPEED_SUPER,
-+	.function	= (char *) fsg_string_product,
-+	.unbind		= fsg_unbind,
-+	.disconnect	= fsg_disconnect,
-+	.setup		= fsg_setup,
-+	.suspend	= fsg_suspend,
-+	.resume		= fsg_resume,
-+
-+	.driver		= {
-+		.name		= DRIVER_NAME,
-+		.owner		= THIS_MODULE,
-+		// .release = ...
-+		// .suspend = ...
-+		// .resume = ...
-+	},
-+};
-+
-+
-+static int __init fsg_alloc(void)
-+{
-+	struct fsg_dev		*fsg;
-+
-+	fsg = kzalloc(sizeof *fsg +
-+		      fsg_num_buffers * sizeof *(fsg->buffhds), GFP_KERNEL);
-+
-+	if (!fsg)
-+		return -ENOMEM;
-+	spin_lock_init(&fsg->lock);
-+	init_rwsem(&fsg->filesem);
-+	kref_init(&fsg->ref);
-+	init_completion(&fsg->thread_notifier);
-+
-+	the_fsg = fsg;
-+	return 0;
-+}
-+
-+
-+static int __init fsg_init(void)
-+{
-+	int		rc;
-+	struct fsg_dev	*fsg;
-+
-+	rc = fsg_num_buffers_validate();
-+	if (rc != 0)
-+		return rc;
-+
-+	if ((rc = fsg_alloc()) != 0)
-+		return rc;
-+	fsg = the_fsg;
-+	if ((rc = usb_gadget_probe_driver(&fsg_driver, fsg_bind)) != 0)
-+		kref_put(&fsg->ref, fsg_release);
-+	return rc;
-+}
-+module_init(fsg_init);
-+
-+
-+static void __exit fsg_cleanup(void)
-+{
-+	struct fsg_dev	*fsg = the_fsg;
-+
-+	/* Unregister the driver iff the thread hasn't already done so */
-+	if (test_and_clear_bit(REGISTERED, &fsg->atomic_bitflags))
-+		usb_gadget_unregister_driver(&fsg_driver);
-+
-+	/* Wait for the thread to finish up */
-+	wait_for_completion(&fsg->thread_notifier);
-+
-+	kref_put(&fsg->ref, fsg_release);
-+}
-+module_exit(fsg_cleanup);
---- a/drivers/usb/host/Kconfig
-+++ b/drivers/usb/host/Kconfig
-@@ -742,6 +742,16 @@ config USB_RENESAS_USBHS_HCD
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called renesas-usbhs.
- 
-+config USB_DWCOTG
-+	bool "Synopsis DWC host support"
-+	depends on USB && (FIQ || ARM64)
-+	help
-+	  The Synopsis DWC controller is a dual-role
-+	  host/peripheral/OTG ("On The Go") USB controllers.
-+
-+	  Enable this option to support this IP in host controller mode.
-+	  If unsure, say N.
-+
- config USB_HCD_BCMA
- 	tristate "BCMA usb host driver"
- 	depends on BCMA
---- a/drivers/usb/host/Makefile
-+++ b/drivers/usb/host/Makefile
-@@ -78,6 +78,7 @@ obj-$(CONFIG_USB_SL811_HCD)	+= sl811-hcd
- obj-$(CONFIG_USB_SL811_CS)	+= sl811_cs.o
- obj-$(CONFIG_USB_U132_HCD)	+= u132-hcd.o
- obj-$(CONFIG_USB_R8A66597_HCD)	+= r8a66597-hcd.o
-+obj-$(CONFIG_USB_DWCOTG)        += dwc_otg/ dwc_common_port/
- obj-$(CONFIG_USB_FSL_USB2)	+= fsl-mph-dr-of.o
- obj-$(CONFIG_USB_EHCI_FSL)	+= fsl-mph-dr-of.o
- obj-$(CONFIG_USB_EHCI_FSL)	+= ehci-fsl.o
---- /dev/null
-+++ b/drivers/usb/host/dwc_common_port/Makefile
-@@ -0,0 +1,58 @@
-+#
-+# Makefile for DWC_common library
-+#
-+
-+ifneq ($(KERNELRELEASE),)
-+
-+ccflags-y	+= -DDWC_LINUX
-+#ccflags-y	+= -DDEBUG
-+#ccflags-y	+= -DDWC_DEBUG_REGS
-+#ccflags-y	+= -DDWC_DEBUG_MEMORY
-+
-+ccflags-y	+= -DDWC_LIBMODULE
-+ccflags-y	+= -DDWC_CCLIB
-+#ccflags-y	+= -DDWC_CRYPTOLIB
-+ccflags-y	+= -DDWC_NOTIFYLIB
-+ccflags-y	+= -DDWC_UTFLIB
-+
-+obj-$(CONFIG_USB_DWCOTG)	+= dwc_common_port_lib.o
-+dwc_common_port_lib-objs := dwc_cc.o dwc_modpow.o dwc_dh.o \
-+			    dwc_crypto.o dwc_notifier.o \
-+			    dwc_common_linux.o dwc_mem.o
-+
-+kernrelwd := $(subst ., ,$(KERNELRELEASE))
-+kernrel3 := $(word 1,$(kernrelwd)).$(word 2,$(kernrelwd)).$(word 3,$(kernrelwd))
-+
-+ifneq ($(kernrel3),2.6.20)
-+# grayg - I only know that we use ccflags-y in 2.6.31 actually
-+ccflags-y += $(CPPFLAGS)
-+endif
-+
-+else
-+
-+#ifeq ($(KDIR),)
-+#$(error Must give "KDIR=/path/to/kernel/source" on command line or in environment)
-+#endif
-+
-+ifeq ($(ARCH),)
-+$(error Must give "ARCH=<arch>" on command line or in environment. Also, if \
-+ cross-compiling, must give "CROSS_COMPILE=/path/to/compiler/plus/tool-prefix-")
-+endif
-+
-+ifeq ($(DOXYGEN),)
-+DOXYGEN		:= doxygen
-+endif
-+
-+default:
-+	$(MAKE) -C$(KDIR) M=$(PWD) ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
-+
-+docs:	$(wildcard *.[hc]) doc/doxygen.cfg
-+	$(DOXYGEN) doc/doxygen.cfg
-+
-+tags:	$(wildcard *.[hc])
-+	$(CTAGS) -e $(wildcard *.[hc]) $(wildcard linux/*.[hc]) $(wildcard $(KDIR)/include/linux/usb*.h)
-+
-+endif
-+
-+clean:
-+	rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/
---- /dev/null
-+++ b/drivers/usb/host/dwc_common_port/Makefile.fbsd
-@@ -0,0 +1,17 @@
-+CFLAGS	+= -I/sys/i386/compile/GENERIC -I/sys/i386/include -I/usr/include
-+CFLAGS	+= -DDWC_FREEBSD
-+CFLAGS	+= -DDEBUG
-+#CFLAGS	+= -DDWC_DEBUG_REGS
-+#CFLAGS	+= -DDWC_DEBUG_MEMORY
-+
-+#CFLAGS	+= -DDWC_LIBMODULE
-+#CFLAGS	+= -DDWC_CCLIB
-+#CFLAGS	+= -DDWC_CRYPTOLIB
-+#CFLAGS	+= -DDWC_NOTIFYLIB
-+#CFLAGS	+= -DDWC_UTFLIB
-+
-+KMOD = dwc_common_port_lib
-+SRCS = dwc_cc.c dwc_modpow.c dwc_dh.c dwc_crypto.c dwc_notifier.c \
-+       dwc_common_fbsd.c dwc_mem.c
-+
-+.include <bsd.kmod.mk>
---- /dev/null
-+++ b/drivers/usb/host/dwc_common_port/Makefile.linux
-@@ -0,0 +1,49 @@
-+#
-+# Makefile for DWC_common library
-+#
-+ifneq ($(KERNELRELEASE),)
-+
-+ccflags-y	+= -DDWC_LINUX
-+#ccflags-y	+= -DDEBUG
-+#ccflags-y	+= -DDWC_DEBUG_REGS
-+#ccflags-y	+= -DDWC_DEBUG_MEMORY
-+
-+ccflags-y	+= -DDWC_LIBMODULE
-+ccflags-y	+= -DDWC_CCLIB
-+ccflags-y	+= -DDWC_CRYPTOLIB
-+ccflags-y	+= -DDWC_NOTIFYLIB
-+ccflags-y	+= -DDWC_UTFLIB
-+
-+obj-m			 := dwc_common_port_lib.o
-+dwc_common_port_lib-objs := dwc_cc.o dwc_modpow.o dwc_dh.o \
-+			    dwc_crypto.o dwc_notifier.o \
-+			    dwc_common_linux.o dwc_mem.o
-+
-+else
-+
-+ifeq ($(KDIR),)
-+$(error Must give "KDIR=/path/to/kernel/source" on command line or in environment)
-+endif
-+
-+ifeq ($(ARCH),)
-+$(error Must give "ARCH=<arch>" on command line or in environment. Also, if \
-+ cross-compiling, must give "CROSS_COMPILE=/path/to/compiler/plus/tool-prefix-")
-+endif
-+
-+ifeq ($(DOXYGEN),)
-+DOXYGEN		:= doxygen
-+endif
-+
-+default:
-+	$(MAKE) -C$(KDIR) M=$(PWD) ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
-+
-+docs:	$(wildcard *.[hc]) doc/doxygen.cfg
-+	$(DOXYGEN) doc/doxygen.cfg
-+
-+tags:	$(wildcard *.[hc])
-+	$(CTAGS) -e $(wildcard *.[hc]) $(wildcard linux/*.[hc]) $(wildcard $(KDIR)/include/linux/usb*.h)
-+
-+endif
-+
-+clean:
-+	rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/
---- /dev/null
-+++ b/drivers/usb/host/dwc_common_port/changes.txt
-@@ -0,0 +1,174 @@
-+
-+dwc_read_reg32() and friends now take an additional parameter, a pointer to an
-+IO context struct. The IO context struct should live in an os-dependent struct
-+in your driver. As an example, the dwc_usb3 driver has an os-dependent struct
-+named 'os_dep' embedded in the main device struct. So there these calls look
-+like this:
-+
-+	dwc_read_reg32(&usb3_dev->os_dep.ioctx, &pcd->dev_global_regs->dcfg);
-+
-+	dwc_write_reg32(&usb3_dev->os_dep.ioctx,
-+			&pcd->dev_global_regs->dcfg, 0);
-+
-+Note that for the existing Linux driver ports, it is not necessary to actually
-+define the 'ioctx' member in the os-dependent struct. Since Linux does not
-+require an IO context, its macros for dwc_read_reg32() and friends do not
-+use the context pointer, so it is optimized away by the compiler. But it is
-+necessary to add the pointer parameter to all of the call sites, to be ready
-+for any future ports (such as FreeBSD) which do require an IO context.
-+
-+
-+Similarly, dwc_alloc(), dwc_alloc_atomic(), dwc_strdup(), and dwc_free() now
-+take an additional parameter, a pointer to a memory context. Examples:
-+
-+	addr = dwc_alloc(&usb3_dev->os_dep.memctx, size);
-+
-+	dwc_free(&usb3_dev->os_dep.memctx, addr);
-+
-+Again, for the Linux ports, it is not necessary to actually define the memctx
-+member, but it is necessary to add the pointer parameter to all of the call
-+sites.
-+
-+
-+Same for dwc_dma_alloc() and dwc_dma_free(). Examples:
-+
-+	virt_addr = dwc_dma_alloc(&usb3_dev->os_dep.dmactx, size, &phys_addr);
-+
-+	dwc_dma_free(&usb3_dev->os_dep.dmactx, size, virt_addr, phys_addr);
-+
-+
-+Same for dwc_mutex_alloc() and dwc_mutex_free(). Examples:
-+
-+	mutex = dwc_mutex_alloc(&usb3_dev->os_dep.mtxctx);
-+
-+	dwc_mutex_free(&usb3_dev->os_dep.mtxctx, mutex);
-+
-+
-+Same for dwc_spinlock_alloc() and dwc_spinlock_free(). Examples:
-+
-+	lock = dwc_spinlock_alloc(&usb3_dev->osdep.splctx);
-+
-+	dwc_spinlock_free(&usb3_dev->osdep.splctx, lock);
-+
-+
-+Same for dwc_timer_alloc(). Example:
-+
-+	timer = dwc_timer_alloc(&usb3_dev->os_dep.tmrctx, "dwc_usb3_tmr1",
-+				cb_func, cb_data);
-+
-+
-+Same for dwc_waitq_alloc(). Example:
-+
-+	waitq = dwc_waitq_alloc(&usb3_dev->os_dep.wtqctx);
-+
-+
-+Same for dwc_thread_run(). Example:
-+
-+	thread = dwc_thread_run(&usb3_dev->os_dep.thdctx, func,
-+				"dwc_usb3_thd1", data);
-+
-+
-+Same for dwc_workq_alloc(). Example:
-+
-+	workq = dwc_workq_alloc(&usb3_dev->osdep.wkqctx, "dwc_usb3_wkq1");
-+
-+
-+Same for dwc_task_alloc(). Example:
-+
-+	task = dwc_task_alloc(&usb3_dev->os_dep.tskctx, "dwc_usb3_tsk1",
-+			      cb_func, cb_data);
-+
-+
-+In addition to the context pointer additions, a few core functions have had
-+other changes made to their parameters:
-+
-+The 'flags' parameter to dwc_spinlock_irqsave() and dwc_spinunlock_irqrestore()
-+has been changed from a uint64_t to a dwc_irqflags_t.
-+
-+dwc_thread_should_stop() now takes a 'dwc_thread_t *' parameter, because the
-+FreeBSD equivalent of that function requires it.
-+
-+And, in addition to the context pointer, dwc_task_alloc() also adds a
-+'char *name' parameter, to be consistent with dwc_thread_run() and
-+dwc_workq_alloc(), and because the FreeBSD equivalent of that function
-+requires a unique name.
-+
-+
-+Here is a complete list of the core functions that now take a pointer to a
-+context as their first parameter:
-+
-+	dwc_read_reg32
-+	dwc_read_reg64
-+	dwc_write_reg32
-+	dwc_write_reg64
-+	dwc_modify_reg32
-+	dwc_modify_reg64
-+	dwc_alloc
-+	dwc_alloc_atomic
-+	dwc_strdup
-+	dwc_free
-+	dwc_dma_alloc
-+	dwc_dma_free
-+	dwc_mutex_alloc
-+	dwc_mutex_free
-+	dwc_spinlock_alloc
-+	dwc_spinlock_free
-+	dwc_timer_alloc
-+	dwc_waitq_alloc
-+	dwc_thread_run
-+	dwc_workq_alloc
-+	dwc_task_alloc     Also adds a 'char *name' as its 2nd parameter
-+
-+And here are the core functions that have other changes to their parameters:
-+
-+	dwc_spinlock_irqsave      'flags' param is now a 'dwc_irqflags_t *'
-+	dwc_spinunlock_irqrestore 'flags' param is now a 'dwc_irqflags_t'
-+	dwc_thread_should_stop    Adds a 'dwc_thread_t *' parameter
-+
-+
-+
-+The changes to the core functions also require some of the other library
-+functions to change:
-+
-+	dwc_cc_if_alloc() and dwc_cc_if_free() now take a 'void *memctx'
-+	(for memory allocation) as the 1st param and a 'void *mtxctx'
-+	(for mutex allocation) as the 2nd param.
-+
-+	dwc_cc_clear(), dwc_cc_add(), dwc_cc_change(), dwc_cc_remove(),
-+	dwc_cc_data_for_save(), and dwc_cc_restore_from_data() now take a
-+	'void *memctx' as the 1st param.
-+
-+	dwc_dh_modpow(), dwc_dh_pk(), and dwc_dh_derive_keys() now take a
-+	'void *memctx' as the 1st param.
-+
-+	dwc_modpow() now takes a 'void *memctx' as the 1st param.
-+
-+	dwc_alloc_notification_manager() now takes a 'void *memctx' as the
-+	1st param and a 'void *wkqctx' (for work queue allocation) as the 2nd
-+	param, and also now returns an integer value that is non-zero if
-+	allocation of its data structures or work queue fails.
-+
-+	dwc_register_notifier() now takes a 'void *memctx' as the 1st param.
-+
-+	dwc_memory_debug_start() now takes a 'void *mem_ctx' as the first
-+	param, and also now returns an integer value that is non-zero if
-+	allocation of its data structures fails.
-+
-+
-+
-+Other miscellaneous changes:
-+
-+The DEBUG_MEMORY and DEBUG_REGS #define's have been renamed to
-+DWC_DEBUG_MEMORY and DWC_DEBUG_REGS.
-+
-+The following #define's have been added to allow selectively compiling library
-+features:
-+
-+	DWC_CCLIB
-+	DWC_CRYPTOLIB
-+	DWC_NOTIFYLIB
-+	DWC_UTFLIB
-+
-+A DWC_LIBMODULE #define has also been added. If this is not defined, then the
-+module code in dwc_common_linux.c is not compiled in. This allows linking the
-+library code directly into a driver module, instead of as a standalone module.
---- /dev/null
-+++ b/drivers/usb/host/dwc_common_port/doc/doxygen.cfg
-@@ -0,0 +1,270 @@
-+# Doxyfile 1.4.5
-+
-+#---------------------------------------------------------------------------
-+# Project related configuration options
-+#---------------------------------------------------------------------------
-+PROJECT_NAME           = "Synopsys DWC Portability and Common Library for UWB"
-+PROJECT_NUMBER         =
-+OUTPUT_DIRECTORY       = doc
-+CREATE_SUBDIRS         = NO
-+OUTPUT_LANGUAGE        = English
-+BRIEF_MEMBER_DESC      = YES
-+REPEAT_BRIEF           = YES
-+ABBREVIATE_BRIEF       = "The $name class" \
-+                         "The $name widget" \
-+                         "The $name file" \
-+                         is \
-+                         provides \
-+                         specifies \
-+                         contains \
-+                         represents \
-+                         a \
-+                         an \
-+                         the
-+ALWAYS_DETAILED_SEC    = YES
-+INLINE_INHERITED_MEMB  = NO
-+FULL_PATH_NAMES        = NO
-+STRIP_FROM_PATH        = ..
-+STRIP_FROM_INC_PATH    =
-+SHORT_NAMES            = NO
-+JAVADOC_AUTOBRIEF      = YES
-+MULTILINE_CPP_IS_BRIEF = NO
-+DETAILS_AT_TOP         = YES
-+INHERIT_DOCS           = YES
-+SEPARATE_MEMBER_PAGES  = NO
-+TAB_SIZE               = 8
-+ALIASES                =
-+OPTIMIZE_OUTPUT_FOR_C  = YES
-+OPTIMIZE_OUTPUT_JAVA   = NO
-+BUILTIN_STL_SUPPORT    = NO
-+DISTRIBUTE_GROUP_DOC   = NO
-+SUBGROUPING            = NO
-+#---------------------------------------------------------------------------
-+# Build related configuration options
-+#---------------------------------------------------------------------------
-+EXTRACT_ALL            = NO
-+EXTRACT_PRIVATE        = NO
-+EXTRACT_STATIC         = YES
-+EXTRACT_LOCAL_CLASSES  = NO
-+EXTRACT_LOCAL_METHODS  = NO
-+HIDE_UNDOC_MEMBERS     = NO
-+HIDE_UNDOC_CLASSES     = NO
-+HIDE_FRIEND_COMPOUNDS  = NO
-+HIDE_IN_BODY_DOCS      = NO
-+INTERNAL_DOCS          = NO
-+CASE_SENSE_NAMES       = YES
-+HIDE_SCOPE_NAMES       = NO
-+SHOW_INCLUDE_FILES     = NO
-+INLINE_INFO            = YES
-+SORT_MEMBER_DOCS       = NO
-+SORT_BRIEF_DOCS        = NO
-+SORT_BY_SCOPE_NAME     = NO
-+GENERATE_TODOLIST      = YES
-+GENERATE_TESTLIST      = YES
-+GENERATE_BUGLIST       = YES
-+GENERATE_DEPRECATEDLIST= YES
-+ENABLED_SECTIONS       =
-+MAX_INITIALIZER_LINES  = 30
-+SHOW_USED_FILES        = YES
-+SHOW_DIRECTORIES       = YES
-+FILE_VERSION_FILTER    =
-+#---------------------------------------------------------------------------
-+# configuration options related to warning and progress messages
-+#---------------------------------------------------------------------------
-+QUIET                  = YES
-+WARNINGS               = YES
-+WARN_IF_UNDOCUMENTED   = NO
-+WARN_IF_DOC_ERROR      = YES
-+WARN_NO_PARAMDOC       = YES
-+WARN_FORMAT            = "$file:$line: $text"
-+WARN_LOGFILE           =
-+#---------------------------------------------------------------------------
-+# configuration options related to the input files
-+#---------------------------------------------------------------------------
-+INPUT                  = .
-+FILE_PATTERNS          = *.c \
-+                         *.cc \
-+                         *.cxx \
-+                         *.cpp \
-+                         *.c++ \
-+                         *.d \
-+                         *.java \
-+                         *.ii \
-+                         *.ixx \
-+                         *.ipp \
-+                         *.i++ \
-+                         *.inl \
-+                         *.h \
-+                         *.hh \
-+                         *.hxx \
-+                         *.hpp \
-+                         *.h++ \
-+                         *.idl \
-+                         *.odl \
-+                         *.cs \
-+                         *.php \
-+                         *.php3 \
-+                         *.inc \
-+                         *.m \
-+                         *.mm \
-+                         *.dox \
-+                         *.py \
-+                         *.C \
-+                         *.CC \
-+                         *.C++ \
-+                         *.II \
-+                         *.I++ \
-+                         *.H \
-+                         *.HH \
-+                         *.H++ \
-+                         *.CS \
-+                         *.PHP \
-+                         *.PHP3 \
-+                         *.M \
-+                         *.MM \
-+                         *.PY
-+RECURSIVE              = NO
-+EXCLUDE                =
-+EXCLUDE_SYMLINKS       = NO
-+EXCLUDE_PATTERNS       =
-+EXAMPLE_PATH           =
-+EXAMPLE_PATTERNS       = *
-+EXAMPLE_RECURSIVE      = NO
-+IMAGE_PATH             =
-+INPUT_FILTER           =
-+FILTER_PATTERNS        =
-+FILTER_SOURCE_FILES    = NO
-+#---------------------------------------------------------------------------
-+# configuration options related to source browsing
-+#---------------------------------------------------------------------------
-+SOURCE_BROWSER         = NO
-+INLINE_SOURCES         = NO
-+STRIP_CODE_COMMENTS    = YES
-+REFERENCED_BY_RELATION = YES
-+REFERENCES_RELATION    = YES
-+USE_HTAGS              = NO
-+VERBATIM_HEADERS       = NO
-+#---------------------------------------------------------------------------
-+# configuration options related to the alphabetical class index
-+#---------------------------------------------------------------------------
-+ALPHABETICAL_INDEX     = NO
-+COLS_IN_ALPHA_INDEX    = 5
-+IGNORE_PREFIX          =
-+#---------------------------------------------------------------------------
-+# configuration options related to the HTML output
-+#---------------------------------------------------------------------------
-+GENERATE_HTML          = YES
-+HTML_OUTPUT            = html
-+HTML_FILE_EXTENSION    = .html
-+HTML_HEADER            =
-+HTML_FOOTER            =
-+HTML_STYLESHEET        =
-+HTML_ALIGN_MEMBERS     = YES
-+GENERATE_HTMLHELP      = NO
-+CHM_FILE               =
-+HHC_LOCATION           =
-+GENERATE_CHI           = NO
-+BINARY_TOC             = NO
-+TOC_EXPAND             = NO
-+DISABLE_INDEX          = NO
-+ENUM_VALUES_PER_LINE   = 4
-+GENERATE_TREEVIEW      = YES
-+TREEVIEW_WIDTH         = 250
-+#---------------------------------------------------------------------------
-+# configuration options related to the LaTeX output
-+#---------------------------------------------------------------------------
-+GENERATE_LATEX         = NO
-+LATEX_OUTPUT           = latex
-+LATEX_CMD_NAME         = latex
-+MAKEINDEX_CMD_NAME     = makeindex
-+COMPACT_LATEX          = NO
-+PAPER_TYPE             = a4wide
-+EXTRA_PACKAGES         =
-+LATEX_HEADER           =
-+PDF_HYPERLINKS         = NO
-+USE_PDFLATEX           = NO
-+LATEX_BATCHMODE        = NO
-+LATEX_HIDE_INDICES     = NO
-+#---------------------------------------------------------------------------
-+# configuration options related to the RTF output
-+#---------------------------------------------------------------------------
-+GENERATE_RTF           = NO
-+RTF_OUTPUT             = rtf
-+COMPACT_RTF            = NO
-+RTF_HYPERLINKS         = NO
-+RTF_STYLESHEET_FILE    =
-+RTF_EXTENSIONS_FILE    =
-+#---------------------------------------------------------------------------
-+# configuration options related to the man page output
-+#---------------------------------------------------------------------------
-+GENERATE_MAN           = NO
-+MAN_OUTPUT             = man
-+MAN_EXTENSION          = .3
-+MAN_LINKS              = NO
-+#---------------------------------------------------------------------------
-+# configuration options related to the XML output
-+#---------------------------------------------------------------------------
-+GENERATE_XML           = NO
-+XML_OUTPUT             = xml
-+XML_SCHEMA             =
-+XML_DTD                =
-+XML_PROGRAMLISTING     = YES
-+#---------------------------------------------------------------------------
-+# configuration options for the AutoGen Definitions output
-+#---------------------------------------------------------------------------
-+GENERATE_AUTOGEN_DEF   = NO
-+#---------------------------------------------------------------------------
-+# configuration options related to the Perl module output
-+#---------------------------------------------------------------------------
-+GENERATE_PERLMOD       = NO
-+PERLMOD_LATEX          = NO
-+PERLMOD_PRETTY         = YES
-+PERLMOD_MAKEVAR_PREFIX =
-+#---------------------------------------------------------------------------
-+# Configuration options related to the preprocessor
-+#---------------------------------------------------------------------------
-+ENABLE_PREPROCESSING   = YES
-+MACRO_EXPANSION        = NO
-+EXPAND_ONLY_PREDEF     = NO
-+SEARCH_INCLUDES        = YES
-+INCLUDE_PATH           =
-+INCLUDE_FILE_PATTERNS  =
-+PREDEFINED             = DEBUG DEBUG_MEMORY
-+EXPAND_AS_DEFINED      =
-+SKIP_FUNCTION_MACROS   = YES
-+#---------------------------------------------------------------------------
-+# Configuration::additions related to external references
-+#---------------------------------------------------------------------------
-+TAGFILES               =
-+GENERATE_TAGFILE       =
-+ALLEXTERNALS           = NO
-+EXTERNAL_GROUPS        = YES
-+PERL_PATH              = /usr/bin/perl
-+#---------------------------------------------------------------------------
-+# Configuration options related to the dot tool
-+#---------------------------------------------------------------------------
-+CLASS_DIAGRAMS         = YES
-+HIDE_UNDOC_RELATIONS   = YES
-+HAVE_DOT               = NO
-+CLASS_GRAPH            = YES
-+COLLABORATION_GRAPH    = YES
-+GROUP_GRAPHS           = YES
-+UML_LOOK               = NO
-+TEMPLATE_RELATIONS     = NO
-+INCLUDE_GRAPH          = NO
-+INCLUDED_BY_GRAPH      = YES
-+CALL_GRAPH             = NO
-+GRAPHICAL_HIERARCHY    = YES
-+DIRECTORY_GRAPH        = YES
-+DOT_IMAGE_FORMAT       = png
-+DOT_PATH               =
-+DOTFILE_DIRS           =
-+MAX_DOT_GRAPH_DEPTH    = 1000
-+DOT_TRANSPARENT        = NO
-+DOT_MULTI_TARGETS      = NO
-+GENERATE_LEGEND        = YES
-+DOT_CLEANUP            = YES
-+#---------------------------------------------------------------------------
-+# Configuration::additions related to the search engine
-+#---------------------------------------------------------------------------
-+SEARCHENGINE           = NO
---- /dev/null
-+++ b/drivers/usb/host/dwc_common_port/dwc_cc.c
-@@ -0,0 +1,532 @@
-+/* =========================================================================
-+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.c $
-+ * $Revision: #4 $
-+ * $Date: 2010/11/04 $
-+ * $Change: 1621692 $
-+ *
-+ * Synopsys Portability Library Software and documentation
-+ * (hereinafter, "Software") is an Unsupported proprietary work of
-+ * Synopsys, Inc. unless otherwise expressly agreed to in writing
-+ * between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product
-+ * under any End User Software License Agreement or Agreement for
-+ * Licensed Product with Synopsys or any supplement thereto. You are
-+ * permitted to use and redistribute this Software in source and binary
-+ * forms, with or without modification, provided that redistributions
-+ * of source code must retain this notice. You may not view, use,
-+ * disclose, copy or distribute this file or any information contained
-+ * herein except pursuant to this license grant from Synopsys. If you
-+ * do not agree with this notice, including the disclaimer below, then
-+ * you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"
-+ * BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ * FOR A PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL
-+ * SYNOPSYS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================= */
-+#ifdef DWC_CCLIB
-+
-+#include "dwc_cc.h"
-+
-+typedef struct dwc_cc
-+{
-+	uint32_t uid;
-+	uint8_t chid[16];
-+	uint8_t cdid[16];
-+	uint8_t ck[16];
-+	uint8_t *name;
-+	uint8_t length;
-+        DWC_CIRCLEQ_ENTRY(dwc_cc) list_entry;
-+} dwc_cc_t;
-+
-+DWC_CIRCLEQ_HEAD(context_list, dwc_cc);
-+
-+/** The main structure for CC management.  */
-+struct dwc_cc_if
-+{
-+	dwc_mutex_t *mutex;
-+	char *filename;
-+
-+	unsigned is_host:1;
-+
-+	dwc_notifier_t *notifier;
-+
-+	struct context_list list;
-+};
-+
-+#ifdef DEBUG
-+static inline void dump_bytes(char *name, uint8_t *bytes, int len)
-+{
-+	int i;
-+	DWC_PRINTF("%s: ", name);
-+	for (i=0; i<len; i++) {
-+		DWC_PRINTF("%02x ", bytes[i]);
-+	}
-+	DWC_PRINTF("\n");
-+}
-+#else
-+#define dump_bytes(x...)
-+#endif
-+
-+static dwc_cc_t *alloc_cc(void *mem_ctx, uint8_t *name, uint32_t length)
-+{
-+	dwc_cc_t *cc = dwc_alloc(mem_ctx, sizeof(dwc_cc_t));
-+	if (!cc) {
-+		return NULL;
-+	}
-+	DWC_MEMSET(cc, 0, sizeof(dwc_cc_t));
-+
-+	if (name) {
-+		cc->length = length;
-+		cc->name = dwc_alloc(mem_ctx, length);
-+		if (!cc->name) {
-+			dwc_free(mem_ctx, cc);
-+			return NULL;
-+		}
-+
-+		DWC_MEMCPY(cc->name, name, length);
-+	}
-+
-+	return cc;
-+}
-+
-+static void free_cc(void *mem_ctx, dwc_cc_t *cc)
-+{
-+	if (cc->name) {
-+		dwc_free(mem_ctx, cc->name);
-+	}
-+	dwc_free(mem_ctx, cc);
-+}
-+
-+static uint32_t next_uid(dwc_cc_if_t *cc_if)
-+{
-+	uint32_t uid = 0;
-+	dwc_cc_t *cc;
-+	DWC_CIRCLEQ_FOREACH(cc, &cc_if->list, list_entry) {
-+		if (cc->uid > uid) {
-+			uid = cc->uid;
-+		}
-+	}
-+
-+	if (uid == 0) {
-+		uid = 255;
-+	}
-+
-+	return uid + 1;
-+}
-+
-+static dwc_cc_t *cc_find(dwc_cc_if_t *cc_if, uint32_t uid)
-+{
-+	dwc_cc_t *cc;
-+	DWC_CIRCLEQ_FOREACH(cc, &cc_if->list, list_entry) {
-+		if (cc->uid == uid) {
-+			return cc;
-+		}
-+	}
-+	return NULL;
-+}
-+
-+static unsigned int cc_data_size(dwc_cc_if_t *cc_if)
-+{
-+	unsigned int size = 0;
-+	dwc_cc_t *cc;
-+	DWC_CIRCLEQ_FOREACH(cc, &cc_if->list, list_entry) {
-+		size += (48 + 1);
-+		if (cc->name) {
-+			size += cc->length;
-+		}
-+	}
-+	return size;
-+}
-+
-+static uint32_t cc_match_chid(dwc_cc_if_t *cc_if, uint8_t *chid)
-+{
-+	uint32_t uid = 0;
-+	dwc_cc_t *cc;
-+
-+	DWC_CIRCLEQ_FOREACH(cc, &cc_if->list, list_entry) {
-+		if (DWC_MEMCMP(cc->chid, chid, 16) == 0) {
-+			uid = cc->uid;
-+			break;
-+		}
-+	}
-+	return uid;
-+}
-+static uint32_t cc_match_cdid(dwc_cc_if_t *cc_if, uint8_t *cdid)
-+{
-+	uint32_t uid = 0;
-+	dwc_cc_t *cc;
-+
-+	DWC_CIRCLEQ_FOREACH(cc, &cc_if->list, list_entry) {
-+		if (DWC_MEMCMP(cc->cdid, cdid, 16) == 0) {
-+			uid = cc->uid;
-+			break;
-+		}
-+	}
-+	return uid;
-+}
-+
-+/* Internal cc_add */
-+static int32_t cc_add(void *mem_ctx, dwc_cc_if_t *cc_if, uint8_t *chid,
-+		      uint8_t *cdid, uint8_t *ck, uint8_t *name, uint8_t length)
-+{
-+	dwc_cc_t *cc;
-+	uint32_t uid;
-+
-+	if (cc_if->is_host) {
-+		uid = cc_match_cdid(cc_if, cdid);
-+	}
-+	else {
-+		uid = cc_match_chid(cc_if, chid);
-+	}
-+
-+	if (uid) {
-+		DWC_DEBUGC("Replacing previous connection context id=%d name=%p name_len=%d", uid, name, length);
-+		cc = cc_find(cc_if, uid);
-+	}
-+	else {
-+		cc = alloc_cc(mem_ctx, name, length);
-+		cc->uid = next_uid(cc_if);
-+		DWC_CIRCLEQ_INSERT_TAIL(&cc_if->list, cc, list_entry);
-+	}
-+
-+	DWC_MEMCPY(&(cc->chid[0]), chid, 16);
-+	DWC_MEMCPY(&(cc->cdid[0]), cdid, 16);
-+	DWC_MEMCPY(&(cc->ck[0]), ck, 16);
-+
-+	DWC_DEBUGC("Added connection context id=%d name=%p name_len=%d", cc->uid, name, length);
-+	dump_bytes("CHID", cc->chid, 16);
-+	dump_bytes("CDID", cc->cdid, 16);
-+	dump_bytes("CK", cc->ck, 16);
-+	return cc->uid;
-+}
-+
-+/* Internal cc_clear */
-+static void cc_clear(void *mem_ctx, dwc_cc_if_t *cc_if)
-+{
-+	while (!DWC_CIRCLEQ_EMPTY(&cc_if->list)) {
-+		dwc_cc_t *cc = DWC_CIRCLEQ_FIRST(&cc_if->list);
-+		DWC_CIRCLEQ_REMOVE_INIT(&cc_if->list, cc, list_entry);
-+		free_cc(mem_ctx, cc);
-+	}
-+}
-+
-+dwc_cc_if_t *dwc_cc_if_alloc(void *mem_ctx, void *mtx_ctx,
-+			     dwc_notifier_t *notifier, unsigned is_host)
-+{
-+	dwc_cc_if_t *cc_if = NULL;
-+
-+	/* Allocate a common_cc_if structure */
-+	cc_if = dwc_alloc(mem_ctx, sizeof(dwc_cc_if_t));
-+
-+	if (!cc_if)
-+		return NULL;
-+
-+#if (defined(DWC_LINUX) && defined(CONFIG_DEBUG_MUTEXES))
-+	DWC_MUTEX_ALLOC_LINUX_DEBUG(cc_if->mutex);
-+#else
-+	cc_if->mutex = dwc_mutex_alloc(mtx_ctx);
-+#endif
-+	if (!cc_if->mutex) {
-+		dwc_free(mem_ctx, cc_if);
-+		return NULL;
-+	}
-+
-+	DWC_CIRCLEQ_INIT(&cc_if->list);
-+	cc_if->is_host = is_host;
-+	cc_if->notifier = notifier;
-+	return cc_if;
-+}
-+
-+void dwc_cc_if_free(void *mem_ctx, void *mtx_ctx, dwc_cc_if_t *cc_if)
-+{
-+#if (defined(DWC_LINUX) && defined(CONFIG_DEBUG_MUTEXES))
-+	DWC_MUTEX_FREE(cc_if->mutex);
-+#else
-+	dwc_mutex_free(mtx_ctx, cc_if->mutex);
-+#endif
-+	cc_clear(mem_ctx, cc_if);
-+	dwc_free(mem_ctx, cc_if);
-+}
-+
-+static void cc_changed(dwc_cc_if_t *cc_if)
-+{
-+	if (cc_if->notifier) {
-+		dwc_notify(cc_if->notifier, DWC_CC_LIST_CHANGED_NOTIFICATION, cc_if);
-+	}
-+}
-+
-+void dwc_cc_clear(void *mem_ctx, dwc_cc_if_t *cc_if)
-+{
-+	DWC_MUTEX_LOCK(cc_if->mutex);
-+	cc_clear(mem_ctx, cc_if);
-+	DWC_MUTEX_UNLOCK(cc_if->mutex);
-+	cc_changed(cc_if);
-+}
-+
-+int32_t dwc_cc_add(void *mem_ctx, dwc_cc_if_t *cc_if, uint8_t *chid,
-+		   uint8_t *cdid, uint8_t *ck, uint8_t *name, uint8_t length)
-+{
-+	uint32_t uid;
-+
-+	DWC_MUTEX_LOCK(cc_if->mutex);
-+	uid = cc_add(mem_ctx, cc_if, chid, cdid, ck, name, length);
-+	DWC_MUTEX_UNLOCK(cc_if->mutex);
-+	cc_changed(cc_if);
-+
-+	return uid;
-+}
-+
-+void dwc_cc_change(void *mem_ctx, dwc_cc_if_t *cc_if, int32_t id, uint8_t *chid,
-+		   uint8_t *cdid, uint8_t *ck, uint8_t *name, uint8_t length)
-+{
-+	dwc_cc_t* cc;
-+
-+	DWC_DEBUGC("Change connection context %d", id);
-+
-+	DWC_MUTEX_LOCK(cc_if->mutex);
-+	cc = cc_find(cc_if, id);
-+	if (!cc) {
-+		DWC_ERROR("Uid %d not found in cc list\n", id);
-+		DWC_MUTEX_UNLOCK(cc_if->mutex);
-+		return;
-+	}
-+
-+	if (chid) {
-+		DWC_MEMCPY(&(cc->chid[0]), chid, 16);
-+	}
-+	if (cdid) {
-+		DWC_MEMCPY(&(cc->cdid[0]), cdid, 16);
-+	}
-+	if (ck) {
-+		DWC_MEMCPY(&(cc->ck[0]), ck, 16);
-+	}
-+
-+	if (name) {
-+		if (cc->name) {
-+			dwc_free(mem_ctx, cc->name);
-+		}
-+		cc->name = dwc_alloc(mem_ctx, length);
-+		if (!cc->name) {
-+			DWC_ERROR("Out of memory in dwc_cc_change()\n");
-+			DWC_MUTEX_UNLOCK(cc_if->mutex);
-+			return;
-+		}
-+		cc->length = length;
-+		DWC_MEMCPY(cc->name, name, length);
-+	}
-+
-+	DWC_MUTEX_UNLOCK(cc_if->mutex);
-+
-+	cc_changed(cc_if);
-+
-+	DWC_DEBUGC("Changed connection context id=%d\n", id);
-+	dump_bytes("New CHID", cc->chid, 16);
-+	dump_bytes("New CDID", cc->cdid, 16);
-+	dump_bytes("New CK", cc->ck, 16);
-+}
-+
-+void dwc_cc_remove(void *mem_ctx, dwc_cc_if_t *cc_if, int32_t id)
-+{
-+	dwc_cc_t *cc;
-+
-+	DWC_DEBUGC("Removing connection context %d", id);
-+
-+	DWC_MUTEX_LOCK(cc_if->mutex);
-+	cc = cc_find(cc_if, id);
-+	if (!cc) {
-+		DWC_ERROR("Uid %d not found in cc list\n", id);
-+		DWC_MUTEX_UNLOCK(cc_if->mutex);
-+		return;
-+	}
-+
-+	DWC_CIRCLEQ_REMOVE_INIT(&cc_if->list, cc, list_entry);
-+	DWC_MUTEX_UNLOCK(cc_if->mutex);
-+	free_cc(mem_ctx, cc);
-+
-+	cc_changed(cc_if);
-+}
-+
-+uint8_t *dwc_cc_data_for_save(void *mem_ctx, dwc_cc_if_t *cc_if, unsigned int *length)
-+{
-+	uint8_t *buf, *x;
-+	uint8_t zero = 0;
-+	dwc_cc_t *cc;
-+
-+	DWC_MUTEX_LOCK(cc_if->mutex);
-+	*length = cc_data_size(cc_if);
-+	if (!(*length)) {
-+		DWC_MUTEX_UNLOCK(cc_if->mutex);
-+		return NULL;
-+	}
-+
-+	DWC_DEBUGC("Creating data for saving (length=%d)", *length);
-+
-+	buf = dwc_alloc(mem_ctx, *length);
-+	if (!buf) {
-+		*length = 0;
-+		DWC_MUTEX_UNLOCK(cc_if->mutex);
-+		return NULL;
-+	}
-+
-+	x = buf;
-+	DWC_CIRCLEQ_FOREACH(cc, &cc_if->list, list_entry) {
-+		DWC_MEMCPY(x, cc->chid, 16);
-+		x += 16;
-+		DWC_MEMCPY(x, cc->cdid, 16);
-+		x += 16;
-+		DWC_MEMCPY(x, cc->ck, 16);
-+		x += 16;
-+		if (cc->name) {
-+			DWC_MEMCPY(x, &cc->length, 1);
-+			x += 1;
-+			DWC_MEMCPY(x, cc->name, cc->length);
-+			x += cc->length;
-+		}
-+		else {
-+			DWC_MEMCPY(x, &zero, 1);
-+			x += 1;
-+		}
-+	}
-+	DWC_MUTEX_UNLOCK(cc_if->mutex);
-+
-+	return buf;
-+}
-+
-+void dwc_cc_restore_from_data(void *mem_ctx, dwc_cc_if_t *cc_if, uint8_t *data, uint32_t length)
-+{
-+	uint8_t name_length;
-+	uint8_t *name;
-+	uint8_t *chid;
-+	uint8_t *cdid;
-+	uint8_t *ck;
-+	uint32_t i = 0;
-+
-+	DWC_MUTEX_LOCK(cc_if->mutex);
-+	cc_clear(mem_ctx, cc_if);
-+
-+	while (i < length) {
-+		chid = &data[i];
-+		i += 16;
-+		cdid = &data[i];
-+		i += 16;
-+		ck = &data[i];
-+		i += 16;
-+
-+		name_length = data[i];
-+		i ++;
-+
-+		if (name_length) {
-+			name = &data[i];
-+			i += name_length;
-+		}
-+		else {
-+			name = NULL;
-+		}
-+
-+		/* check to see if we haven't overflown the buffer */
-+		if (i > length) {
-+			DWC_ERROR("Data format error while attempting to load CCs "
-+				  "(nlen=%d, iter=%d, buflen=%d).\n", name_length, i, length);
-+			break;
-+		}
-+
-+		cc_add(mem_ctx, cc_if, chid, cdid, ck, name, name_length);
-+	}
-+	DWC_MUTEX_UNLOCK(cc_if->mutex);
-+
-+	cc_changed(cc_if);
-+}
-+
-+uint32_t dwc_cc_match_chid(dwc_cc_if_t *cc_if, uint8_t *chid)
-+{
-+	uint32_t uid = 0;
-+
-+	DWC_MUTEX_LOCK(cc_if->mutex);
-+	uid = cc_match_chid(cc_if, chid);
-+	DWC_MUTEX_UNLOCK(cc_if->mutex);
-+	return uid;
-+}
-+uint32_t dwc_cc_match_cdid(dwc_cc_if_t *cc_if, uint8_t *cdid)
-+{
-+	uint32_t uid = 0;
-+
-+	DWC_MUTEX_LOCK(cc_if->mutex);
-+	uid = cc_match_cdid(cc_if, cdid);
-+	DWC_MUTEX_UNLOCK(cc_if->mutex);
-+	return uid;
-+}
-+
-+uint8_t *dwc_cc_ck(dwc_cc_if_t *cc_if, int32_t id)
-+{
-+	uint8_t *ck = NULL;
-+	dwc_cc_t *cc;
-+
-+	DWC_MUTEX_LOCK(cc_if->mutex);
-+	cc = cc_find(cc_if, id);
-+	if (cc) {
-+		ck = cc->ck;
-+	}
-+	DWC_MUTEX_UNLOCK(cc_if->mutex);
-+
-+	return ck;
-+
-+}
-+
-+uint8_t *dwc_cc_chid(dwc_cc_if_t *cc_if, int32_t id)
-+{
-+	uint8_t *retval = NULL;
-+	dwc_cc_t *cc;
-+
-+	DWC_MUTEX_LOCK(cc_if->mutex);
-+	cc = cc_find(cc_if, id);
-+	if (cc) {
-+		retval = cc->chid;
-+	}
-+	DWC_MUTEX_UNLOCK(cc_if->mutex);
-+
-+	return retval;
-+}
-+
-+uint8_t *dwc_cc_cdid(dwc_cc_if_t *cc_if, int32_t id)
-+{
-+	uint8_t *retval = NULL;
-+	dwc_cc_t *cc;
-+
-+	DWC_MUTEX_LOCK(cc_if->mutex);
-+	cc = cc_find(cc_if, id);
-+	if (cc) {
-+		retval = cc->cdid;
-+	}
-+	DWC_MUTEX_UNLOCK(cc_if->mutex);
-+
-+	return retval;
-+}
-+
-+uint8_t *dwc_cc_name(dwc_cc_if_t *cc_if, int32_t id, uint8_t *length)
-+{
-+	uint8_t *retval = NULL;
-+	dwc_cc_t *cc;
-+
-+	DWC_MUTEX_LOCK(cc_if->mutex);
-+	*length = 0;
-+	cc = cc_find(cc_if, id);
-+	if (cc) {
-+		*length = cc->length;
-+		retval = cc->name;
-+	}
-+	DWC_MUTEX_UNLOCK(cc_if->mutex);
-+
-+	return retval;
-+}
-+
-+#endif	/* DWC_CCLIB */
---- /dev/null
-+++ b/drivers/usb/host/dwc_common_port/dwc_cc.h
-@@ -0,0 +1,224 @@
-+/* =========================================================================
-+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.h $
-+ * $Revision: #4 $
-+ * $Date: 2010/09/28 $
-+ * $Change: 1596182 $
-+ *
-+ * Synopsys Portability Library Software and documentation
-+ * (hereinafter, "Software") is an Unsupported proprietary work of
-+ * Synopsys, Inc. unless otherwise expressly agreed to in writing
-+ * between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product
-+ * under any End User Software License Agreement or Agreement for
-+ * Licensed Product with Synopsys or any supplement thereto. You are
-+ * permitted to use and redistribute this Software in source and binary
-+ * forms, with or without modification, provided that redistributions
-+ * of source code must retain this notice. You may not view, use,
-+ * disclose, copy or distribute this file or any information contained
-+ * herein except pursuant to this license grant from Synopsys. If you
-+ * do not agree with this notice, including the disclaimer below, then
-+ * you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"
-+ * BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ * FOR A PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL
-+ * SYNOPSYS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================= */
-+#ifndef _DWC_CC_H_
-+#define _DWC_CC_H_
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/** @file
-+ *
-+ * This file defines the Context Context library.
-+ *
-+ * The main data structure is dwc_cc_if_t which is returned by either the
-+ * dwc_cc_if_alloc function or returned by the module to the user via a provided
-+ * function. The data structure is opaque and should only be manipulated via the
-+ * functions provied in this API.
-+ *
-+ * It manages a list of connection contexts and operations can be performed to
-+ * add, remove, query, search, and change, those contexts.  Additionally,
-+ * a dwc_notifier_t object can be requested from the manager so that
-+ * the user can be notified whenever the context list has changed.
-+ */
-+
-+#include "dwc_os.h"
-+#include "dwc_list.h"
-+#include "dwc_notifier.h"
-+
-+
-+/* Notifications */
-+#define DWC_CC_LIST_CHANGED_NOTIFICATION "DWC_CC_LIST_CHANGED_NOTIFICATION"
-+
-+struct dwc_cc_if;
-+typedef struct dwc_cc_if dwc_cc_if_t;
-+
-+
-+/** @name Connection Context Operations */
-+/** @{ */
-+
-+/** This function allocates memory for a dwc_cc_if_t structure, initializes
-+ * fields to default values, and returns a pointer to the structure or NULL on
-+ * error. */
-+extern dwc_cc_if_t *dwc_cc_if_alloc(void *mem_ctx, void *mtx_ctx,
-+				    dwc_notifier_t *notifier, unsigned is_host);
-+
-+/** Frees the memory for the specified CC structure allocated from
-+ * dwc_cc_if_alloc(). */
-+extern void dwc_cc_if_free(void *mem_ctx, void *mtx_ctx, dwc_cc_if_t *cc_if);
-+
-+/** Removes all contexts from the connection context list */
-+extern void dwc_cc_clear(void *mem_ctx, dwc_cc_if_t *cc_if);
-+
-+/** Adds a connection context (CHID, CK, CDID, Name) to the connection context list.
-+ * If a CHID already exists, the CK and name are overwritten.  Statistics are
-+ * not overwritten.
-+ *
-+ * @param cc_if The cc_if structure.
-+ * @param chid A pointer to the 16-byte CHID.  This value will be copied.
-+ * @param ck A pointer to the 16-byte CK.  This value will be copied.
-+ * @param cdid A pointer to the 16-byte CDID.  This value will be copied.
-+ * @param name An optional host friendly name as defined in the association model
-+ * spec.  Must be a UTF16-LE unicode string.  Can be NULL to indicated no name.
-+ * @param length The length othe unicode string.
-+ * @return A unique identifier used to refer to this context that is valid for
-+ * as long as this context is still in the list. */
-+extern int32_t dwc_cc_add(void *mem_ctx, dwc_cc_if_t *cc_if, uint8_t *chid,
-+			  uint8_t *cdid, uint8_t *ck, uint8_t *name,
-+			  uint8_t length);
-+
-+/** Changes the CHID, CK, CDID, or Name values of a connection context in the
-+ * list, preserving any accumulated statistics.  This would typically be called
-+ * if the host decideds to change the context with a SET_CONNECTION request.
-+ *
-+ * @param cc_if The cc_if structure.
-+ * @param id The identifier of the connection context.
-+ * @param chid A pointer to the 16-byte CHID.  This value will be copied.  NULL
-+ * indicates no change.
-+ * @param cdid A pointer to the 16-byte CDID.  This value will be copied.  NULL
-+ * indicates no change.
-+ * @param ck A pointer to the 16-byte CK.  This value will be copied.  NULL
-+ * indicates no change.
-+ * @param name Host friendly name UTF16-LE.  NULL indicates no change.
-+ * @param length Length of name. */
-+extern void dwc_cc_change(void *mem_ctx, dwc_cc_if_t *cc_if, int32_t id,
-+			  uint8_t *chid, uint8_t *cdid, uint8_t *ck,
-+			  uint8_t *name, uint8_t length);
-+
-+/** Remove the specified connection context.
-+ * @param cc_if The cc_if structure.
-+ * @param id The identifier of the connection context to remove. */
-+extern void dwc_cc_remove(void *mem_ctx, dwc_cc_if_t *cc_if, int32_t id);
-+
-+/** Get a binary block of data for the connection context list and attributes.
-+ * This data can be used by the OS specific driver to save the connection
-+ * context list into non-volatile memory.
-+ *
-+ * @param cc_if The cc_if structure.
-+ * @param length Return the length of the data buffer.
-+ * @return A pointer to the data buffer.  The memory for this buffer should be
-+ * freed with DWC_FREE() after use. */
-+extern uint8_t *dwc_cc_data_for_save(void *mem_ctx, dwc_cc_if_t *cc_if,
-+				     unsigned int *length);
-+
-+/** Restore the connection context list from the binary data that was previously
-+ * returned from a call to dwc_cc_data_for_save.  This can be used by the OS specific
-+ * driver to load a connection context list from non-volatile memory.
-+ *
-+ * @param cc_if The cc_if structure.
-+ * @param data The data bytes as returned from dwc_cc_data_for_save.
-+ * @param length The length of the data. */
-+extern void dwc_cc_restore_from_data(void *mem_ctx, dwc_cc_if_t *cc_if,
-+				     uint8_t *data, unsigned int length);
-+
-+/** Find the connection context from the specified CHID.
-+ *
-+ * @param cc_if The cc_if structure.
-+ * @param chid A pointer to the CHID data.
-+ * @return A non-zero identifier of the connection context if the CHID matches.
-+ * Otherwise returns 0. */
-+extern uint32_t dwc_cc_match_chid(dwc_cc_if_t *cc_if, uint8_t *chid);
-+
-+/** Find the connection context from the specified CDID.
-+ *
-+ * @param cc_if The cc_if structure.
-+ * @param cdid A pointer to the CDID data.
-+ * @return A non-zero identifier of the connection context if the CHID matches.
-+ * Otherwise returns 0. */
-+extern uint32_t dwc_cc_match_cdid(dwc_cc_if_t *cc_if, uint8_t *cdid);
-+
-+/** Retrieve the CK from the specified connection context.
-+ *
-+ * @param cc_if The cc_if structure.
-+ * @param id The identifier of the connection context.
-+ * @return A pointer to the CK data.  The memory does not need to be freed. */
-+extern uint8_t *dwc_cc_ck(dwc_cc_if_t *cc_if, int32_t id);
-+
-+/** Retrieve the CHID from the specified connection context.
-+ *
-+ * @param cc_if The cc_if structure.
-+ * @param id The identifier of the connection context.
-+ * @return A pointer to the CHID data.  The memory does not need to be freed. */
-+extern uint8_t *dwc_cc_chid(dwc_cc_if_t *cc_if, int32_t id);
-+
-+/** Retrieve the CDID from the specified connection context.
-+ *
-+ * @param cc_if The cc_if structure.
-+ * @param id The identifier of the connection context.
-+ * @return A pointer to the CDID data.  The memory does not need to be freed. */
-+extern uint8_t *dwc_cc_cdid(dwc_cc_if_t *cc_if, int32_t id);
-+
-+extern uint8_t *dwc_cc_name(dwc_cc_if_t *cc_if, int32_t id, uint8_t *length);
-+
-+/** Checks a buffer for non-zero.
-+ * @param id A pointer to a 16 byte buffer.
-+ * @return true if the 16 byte value is non-zero. */
-+static inline unsigned dwc_assoc_is_not_zero_id(uint8_t *id) {
-+	int i;
-+	for (i=0; i<16; i++) {
-+		if (id[i]) return 1;
-+	}
-+	return 0;
-+}
-+
-+/** Checks a buffer for zero.
-+ * @param id A pointer to a 16 byte buffer.
-+ * @return true if the 16 byte value is zero. */
-+static inline unsigned dwc_assoc_is_zero_id(uint8_t *id) {
-+	return !dwc_assoc_is_not_zero_id(id);
-+}
-+
-+/** Prints an ASCII representation for the 16-byte chid, cdid, or ck, into
-+ * buffer. */
-+static inline int dwc_print_id_string(char *buffer, uint8_t *id) {
-+	char *ptr = buffer;
-+	int i;
-+	for (i=0; i<16; i++) {
-+		ptr += DWC_SPRINTF(ptr, "%02x", id[i]);
-+		if (i < 15) {
-+			ptr += DWC_SPRINTF(ptr, " ");
-+		}
-+	}
-+	return ptr - buffer;
-+}
-+
-+/** @} */
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _DWC_CC_H_ */
---- /dev/null
-+++ b/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c
-@@ -0,0 +1,1308 @@
-+#include "dwc_os.h"
-+#include "dwc_list.h"
-+
-+#ifdef DWC_CCLIB
-+# include "dwc_cc.h"
-+#endif
-+
-+#ifdef DWC_CRYPTOLIB
-+# include "dwc_modpow.h"
-+# include "dwc_dh.h"
-+# include "dwc_crypto.h"
-+#endif
-+
-+#ifdef DWC_NOTIFYLIB
-+# include "dwc_notifier.h"
-+#endif
-+
-+/* OS-Level Implementations */
-+
-+/* This is the FreeBSD 7.0 kernel implementation of the DWC platform library. */
-+
-+
-+/* MISC */
-+
-+void *DWC_MEMSET(void *dest, uint8_t byte, uint32_t size)
-+{
-+	return memset(dest, byte, size);
-+}
-+
-+void *DWC_MEMCPY(void *dest, void const *src, uint32_t size)
-+{
-+	return memcpy(dest, src, size);
-+}
-+
-+void *DWC_MEMMOVE(void *dest, void *src, uint32_t size)
-+{
-+	bcopy(src, dest, size);
-+	return dest;
-+}
-+
-+int DWC_MEMCMP(void *m1, void *m2, uint32_t size)
-+{
-+	return memcmp(m1, m2, size);
-+}
-+
-+int DWC_STRNCMP(void *s1, void *s2, uint32_t size)
-+{
-+	return strncmp(s1, s2, size);
-+}
-+
-+int DWC_STRCMP(void *s1, void *s2)
-+{
-+	return strcmp(s1, s2);
-+}
-+
-+int DWC_STRLEN(char const *str)
-+{
-+	return strlen(str);
-+}
-+
-+char *DWC_STRCPY(char *to, char const *from)
-+{
-+	return strcpy(to, from);
-+}
-+
-+char *DWC_STRDUP(char const *str)
-+{
-+	int len = DWC_STRLEN(str) + 1;
-+	char *new = DWC_ALLOC_ATOMIC(len);
-+
-+	if (!new) {
-+		return NULL;
-+	}
-+
-+	DWC_MEMCPY(new, str, len);
-+	return new;
-+}
-+
-+int DWC_ATOI(char *str, int32_t *value)
-+{
-+	char *end = NULL;
-+
-+	*value = strtol(str, &end, 0);
-+	if (*end == '\0') {
-+		return 0;
-+	}
-+
-+	return -1;
-+}
-+
-+int DWC_ATOUI(char *str, uint32_t *value)
-+{
-+	char *end = NULL;
-+
-+	*value = strtoul(str, &end, 0);
-+	if (*end == '\0') {
-+		return 0;
-+	}
-+
-+	return -1;
-+}
-+
-+
-+#ifdef DWC_UTFLIB
-+/* From usbstring.c */
-+
-+int DWC_UTF8_TO_UTF16LE(uint8_t const *s, uint16_t *cp, unsigned len)
-+{
-+	int	count = 0;
-+	u8	c;
-+	u16	uchar;
-+
-+	/* this insists on correct encodings, though not minimal ones.
-+	 * BUT it currently rejects legit 4-byte UTF-8 code points,
-+	 * which need surrogate pairs.  (Unicode 3.1 can use them.)
-+	 */
-+	while (len != 0 && (c = (u8) *s++) != 0) {
-+		if (unlikely(c & 0x80)) {
-+			// 2-byte sequence:
-+			// 00000yyyyyxxxxxx = 110yyyyy 10xxxxxx
-+			if ((c & 0xe0) == 0xc0) {
-+				uchar = (c & 0x1f) << 6;
-+
-+				c = (u8) *s++;
-+				if ((c & 0xc0) != 0xc0)
-+					goto fail;
-+				c &= 0x3f;
-+				uchar |= c;
-+
-+			// 3-byte sequence (most CJKV characters):
-+			// zzzzyyyyyyxxxxxx = 1110zzzz 10yyyyyy 10xxxxxx
-+			} else if ((c & 0xf0) == 0xe0) {
-+				uchar = (c & 0x0f) << 12;
-+
-+				c = (u8) *s++;
-+				if ((c & 0xc0) != 0xc0)
-+					goto fail;
-+				c &= 0x3f;
-+				uchar |= c << 6;
-+
-+				c = (u8) *s++;
-+				if ((c & 0xc0) != 0xc0)
-+					goto fail;
-+				c &= 0x3f;
-+				uchar |= c;
-+
-+				/* no bogus surrogates */
-+				if (0xd800 <= uchar && uchar <= 0xdfff)
-+					goto fail;
-+
-+			// 4-byte sequence (surrogate pairs, currently rare):
-+			// 11101110wwwwzzzzyy + 110111yyyyxxxxxx
-+			//     = 11110uuu 10uuzzzz 10yyyyyy 10xxxxxx
-+			// (uuuuu = wwww + 1)
-+			// FIXME accept the surrogate code points (only)
-+			} else
-+				goto fail;
-+		} else
-+			uchar = c;
-+		put_unaligned (cpu_to_le16 (uchar), cp++);
-+		count++;
-+		len--;
-+	}
-+	return count;
-+fail:
-+	return -1;
-+}
-+
-+#endif	/* DWC_UTFLIB */
-+
-+
-+/* dwc_debug.h */
-+
-+dwc_bool_t DWC_IN_IRQ(void)
-+{
-+//	return in_irq();
-+	return 0;
-+}
-+
-+dwc_bool_t DWC_IN_BH(void)
-+{
-+//	return in_softirq();
-+	return 0;
-+}
-+
-+void DWC_VPRINTF(char *format, va_list args)
-+{
-+	vprintf(format, args);
-+}
-+
-+int DWC_VSNPRINTF(char *str, int size, char *format, va_list args)
-+{
-+	return vsnprintf(str, size, format, args);
-+}
-+
-+void DWC_PRINTF(char *format, ...)
-+{
-+	va_list args;
-+
-+	va_start(args, format);
-+	DWC_VPRINTF(format, args);
-+	va_end(args);
-+}
-+
-+int DWC_SPRINTF(char *buffer, char *format, ...)
-+{
-+	int retval;
-+	va_list args;
-+
-+	va_start(args, format);
-+	retval = vsprintf(buffer, format, args);
-+	va_end(args);
-+	return retval;
-+}
-+
-+int DWC_SNPRINTF(char *buffer, int size, char *format, ...)
-+{
-+	int retval;
-+	va_list args;
-+
-+	va_start(args, format);
-+	retval = vsnprintf(buffer, size, format, args);
-+	va_end(args);
-+	return retval;
-+}
-+
-+void __DWC_WARN(char *format, ...)
-+{
-+	va_list args;
-+
-+	va_start(args, format);
-+	DWC_VPRINTF(format, args);
-+	va_end(args);
-+}
-+
-+void __DWC_ERROR(char *format, ...)
-+{
-+	va_list args;
-+
-+	va_start(args, format);
-+	DWC_VPRINTF(format, args);
-+	va_end(args);
-+}
-+
-+void DWC_EXCEPTION(char *format, ...)
-+{
-+	va_list args;
-+
-+	va_start(args, format);
-+	DWC_VPRINTF(format, args);
-+	va_end(args);
-+//	BUG_ON(1);	???
-+}
-+
-+#ifdef DEBUG
-+void __DWC_DEBUG(char *format, ...)
-+{
-+	va_list args;
-+
-+	va_start(args, format);
-+	DWC_VPRINTF(format, args);
-+	va_end(args);
-+}
-+#endif
-+
-+
-+/* dwc_mem.h */
-+
-+#if 0
-+dwc_pool_t *DWC_DMA_POOL_CREATE(uint32_t size,
-+				uint32_t align,
-+				uint32_t alloc)
-+{
-+	struct dma_pool *pool = dma_pool_create("Pool", NULL,
-+						size, align, alloc);
-+	return (dwc_pool_t *)pool;
-+}
-+
-+void DWC_DMA_POOL_DESTROY(dwc_pool_t *pool)
-+{
-+	dma_pool_destroy((struct dma_pool *)pool);
-+}
-+
-+void *DWC_DMA_POOL_ALLOC(dwc_pool_t *pool, uint64_t *dma_addr)
-+{
-+//	return dma_pool_alloc((struct dma_pool *)pool, GFP_KERNEL, dma_addr);
-+	return dma_pool_alloc((struct dma_pool *)pool, M_WAITOK, dma_addr);
-+}
-+
-+void *DWC_DMA_POOL_ZALLOC(dwc_pool_t *pool, uint64_t *dma_addr)
-+{
-+	void *vaddr = DWC_DMA_POOL_ALLOC(pool, dma_addr);
-+	memset(..);
-+}
-+
-+void DWC_DMA_POOL_FREE(dwc_pool_t *pool, void *vaddr, void *daddr)
-+{
-+	dma_pool_free(pool, vaddr, daddr);
-+}
-+#endif
-+
-+static void dmamap_cb(void *arg, bus_dma_segment_t *segs, int nseg, int error)
-+{
-+	if (error)
-+		return;
-+	*(bus_addr_t *)arg = segs[0].ds_addr;
-+}
-+
-+void *__DWC_DMA_ALLOC(void *dma_ctx, uint32_t size, dwc_dma_t *dma_addr)
-+{
-+	dwc_dmactx_t *dma = (dwc_dmactx_t *)dma_ctx;
-+	int error;
-+
-+	error = bus_dma_tag_create(
-+#if __FreeBSD_version >= 700000
-+			bus_get_dma_tag(dma->dev),	/* parent */
-+#else
-+			NULL,				/* parent */
-+#endif
-+			4, 0,				/* alignment, bounds */
-+			BUS_SPACE_MAXADDR_32BIT,	/* lowaddr */
-+			BUS_SPACE_MAXADDR,		/* highaddr */
-+			NULL, NULL,			/* filter, filterarg */
-+			size,				/* maxsize */
-+			1,				/* nsegments */
-+			size,				/* maxsegsize */
-+			0,				/* flags */
-+			NULL,				/* lockfunc */
-+			NULL,				/* lockarg */
-+			&dma->dma_tag);
-+	if (error) {
-+		device_printf(dma->dev, "%s: bus_dma_tag_create failed: %d\n",
-+			      __func__, error);
-+		goto fail_0;
-+	}
-+
-+	error = bus_dmamem_alloc(dma->dma_tag, &dma->dma_vaddr,
-+				 BUS_DMA_NOWAIT | BUS_DMA_COHERENT, &dma->dma_map);
-+	if (error) {
-+		device_printf(dma->dev, "%s: bus_dmamem_alloc(%ju) failed: %d\n",
-+			      __func__, (uintmax_t)size, error);
-+		goto fail_1;
-+	}
-+
-+	dma->dma_paddr = 0;
-+	error = bus_dmamap_load(dma->dma_tag, dma->dma_map, dma->dma_vaddr, size,
-+				dmamap_cb, &dma->dma_paddr, BUS_DMA_NOWAIT);
-+	if (error || dma->dma_paddr == 0) {
-+		device_printf(dma->dev, "%s: bus_dmamap_load failed: %d\n",
-+			      __func__, error);
-+		goto fail_2;
-+	}
-+
-+	*dma_addr = dma->dma_paddr;
-+	return dma->dma_vaddr;
-+
-+fail_2:
-+	bus_dmamap_unload(dma->dma_tag, dma->dma_map);
-+fail_1:
-+	bus_dmamem_free(dma->dma_tag, dma->dma_vaddr, dma->dma_map);
-+	bus_dma_tag_destroy(dma->dma_tag);
-+fail_0:
-+	dma->dma_map = NULL;
-+	dma->dma_tag = NULL;
-+
-+	return NULL;
-+}
-+
-+void __DWC_DMA_FREE(void *dma_ctx, uint32_t size, void *virt_addr, dwc_dma_t dma_addr)
-+{
-+	dwc_dmactx_t *dma = (dwc_dmactx_t *)dma_ctx;
-+
-+	if (dma->dma_tag == NULL)
-+		return;
-+	if (dma->dma_map != NULL) {
-+		bus_dmamap_sync(dma->dma_tag, dma->dma_map,
-+				BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
-+		bus_dmamap_unload(dma->dma_tag, dma->dma_map);
-+		bus_dmamem_free(dma->dma_tag, dma->dma_vaddr, dma->dma_map);
-+		dma->dma_map = NULL;
-+	}
-+
-+	bus_dma_tag_destroy(dma->dma_tag);
-+	dma->dma_tag = NULL;
-+}
-+
-+void *__DWC_ALLOC(void *mem_ctx, uint32_t size)
-+{
-+	return malloc(size, M_DEVBUF, M_WAITOK | M_ZERO);
-+}
-+
-+void *__DWC_ALLOC_ATOMIC(void *mem_ctx, uint32_t size)
-+{
-+	return malloc(size, M_DEVBUF, M_NOWAIT | M_ZERO);
-+}
-+
-+void __DWC_FREE(void *mem_ctx, void *addr)
-+{
-+	free(addr, M_DEVBUF);
-+}
-+
-+
-+#ifdef DWC_CRYPTOLIB
-+/* dwc_crypto.h */
-+
-+void DWC_RANDOM_BYTES(uint8_t *buffer, uint32_t length)
-+{
-+	get_random_bytes(buffer, length);
-+}
-+
-+int DWC_AES_CBC(uint8_t *message, uint32_t messagelen, uint8_t *key, uint32_t keylen, uint8_t iv[16], uint8_t *out)
-+{
-+	struct crypto_blkcipher *tfm;
-+	struct blkcipher_desc desc;
-+	struct scatterlist sgd;
-+	struct scatterlist sgs;
-+
-+	tfm = crypto_alloc_blkcipher("cbc(aes)", 0, CRYPTO_ALG_ASYNC);
-+	if (tfm == NULL) {
-+		printk("failed to load transform for aes CBC\n");
-+		return -1;
-+	}
-+
-+	crypto_blkcipher_setkey(tfm, key, keylen);
-+	crypto_blkcipher_set_iv(tfm, iv, 16);
-+
-+	sg_init_one(&sgd, out, messagelen);
-+	sg_init_one(&sgs, message, messagelen);
-+
-+	desc.tfm = tfm;
-+	desc.flags = 0;
-+
-+	if (crypto_blkcipher_encrypt(&desc, &sgd, &sgs, messagelen)) {
-+		crypto_free_blkcipher(tfm);
-+		DWC_ERROR("AES CBC encryption failed");
-+		return -1;
-+	}
-+
-+	crypto_free_blkcipher(tfm);
-+	return 0;
-+}
-+
-+int DWC_SHA256(uint8_t *message, uint32_t len, uint8_t *out)
-+{
-+	struct crypto_hash *tfm;
-+	struct hash_desc desc;
-+	struct scatterlist sg;
-+
-+	tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
-+	if (IS_ERR(tfm)) {
-+		DWC_ERROR("Failed to load transform for sha256: %ld", PTR_ERR(tfm));
-+		return 0;
-+	}
-+	desc.tfm = tfm;
-+	desc.flags = 0;
-+
-+	sg_init_one(&sg, message, len);
-+	crypto_hash_digest(&desc, &sg, len, out);
-+	crypto_free_hash(tfm);
-+
-+	return 1;
-+}
-+
-+int DWC_HMAC_SHA256(uint8_t *message, uint32_t messagelen,
-+		    uint8_t *key, uint32_t keylen, uint8_t *out)
-+{
-+	struct crypto_hash *tfm;
-+	struct hash_desc desc;
-+	struct scatterlist sg;
-+
-+	tfm = crypto_alloc_hash("hmac(sha256)", 0, CRYPTO_ALG_ASYNC);
-+	if (IS_ERR(tfm)) {
-+		DWC_ERROR("Failed to load transform for hmac(sha256): %ld", PTR_ERR(tfm));
-+		return 0;
-+	}
-+	desc.tfm = tfm;
-+	desc.flags = 0;
-+
-+	sg_init_one(&sg, message, messagelen);
-+	crypto_hash_setkey(tfm, key, keylen);
-+	crypto_hash_digest(&desc, &sg, messagelen, out);
-+	crypto_free_hash(tfm);
-+
-+	return 1;
-+}
-+
-+#endif	/* DWC_CRYPTOLIB */
-+
-+
-+/* Byte Ordering Conversions */
-+
-+uint32_t DWC_CPU_TO_LE32(uint32_t *p)
-+{
-+#ifdef __LITTLE_ENDIAN
-+	return *p;
-+#else
-+	uint8_t *u_p = (uint8_t *)p;
-+
-+	return (u_p[3] | (u_p[2] << 8) | (u_p[1] << 16) | (u_p[0] << 24));
-+#endif
-+}
-+
-+uint32_t DWC_CPU_TO_BE32(uint32_t *p)
-+{
-+#ifdef __BIG_ENDIAN
-+	return *p;
-+#else
-+	uint8_t *u_p = (uint8_t *)p;
-+
-+	return (u_p[3] | (u_p[2] << 8) | (u_p[1] << 16) | (u_p[0] << 24));
-+#endif
-+}
-+
-+uint32_t DWC_LE32_TO_CPU(uint32_t *p)
-+{
-+#ifdef __LITTLE_ENDIAN
-+	return *p;
-+#else
-+	uint8_t *u_p = (uint8_t *)p;
-+
-+	return (u_p[3] | (u_p[2] << 8) | (u_p[1] << 16) | (u_p[0] << 24));
-+#endif
-+}
-+
-+uint32_t DWC_BE32_TO_CPU(uint32_t *p)
-+{
-+#ifdef __BIG_ENDIAN
-+	return *p;
-+#else
-+	uint8_t *u_p = (uint8_t *)p;
-+
-+	return (u_p[3] | (u_p[2] << 8) | (u_p[1] << 16) | (u_p[0] << 24));
-+#endif
-+}
-+
-+uint16_t DWC_CPU_TO_LE16(uint16_t *p)
-+{
-+#ifdef __LITTLE_ENDIAN
-+	return *p;
-+#else
-+	uint8_t *u_p = (uint8_t *)p;
-+	return (u_p[1] | (u_p[0] << 8));
-+#endif
-+}
-+
-+uint16_t DWC_CPU_TO_BE16(uint16_t *p)
-+{
-+#ifdef __BIG_ENDIAN
-+	return *p;
-+#else
-+	uint8_t *u_p = (uint8_t *)p;
-+	return (u_p[1] | (u_p[0] << 8));
-+#endif
-+}
-+
-+uint16_t DWC_LE16_TO_CPU(uint16_t *p)
-+{
-+#ifdef __LITTLE_ENDIAN
-+	return *p;
-+#else
-+	uint8_t *u_p = (uint8_t *)p;
-+	return (u_p[1] | (u_p[0] << 8));
-+#endif
-+}
-+
-+uint16_t DWC_BE16_TO_CPU(uint16_t *p)
-+{
-+#ifdef __BIG_ENDIAN
-+	return *p;
-+#else
-+	uint8_t *u_p = (uint8_t *)p;
-+	return (u_p[1] | (u_p[0] << 8));
-+#endif
-+}
-+
-+
-+/* Registers */
-+
-+uint32_t DWC_READ_REG32(void *io_ctx, uint32_t volatile *reg)
-+{
-+	dwc_ioctx_t *io = (dwc_ioctx_t *)io_ctx;
-+	bus_size_t ior = (bus_size_t)reg;
-+
-+	return bus_space_read_4(io->iot, io->ioh, ior);
-+}
-+
-+#if 0
-+uint64_t DWC_READ_REG64(void *io_ctx, uint64_t volatile *reg)
-+{
-+	dwc_ioctx_t *io = (dwc_ioctx_t *)io_ctx;
-+	bus_size_t ior = (bus_size_t)reg;
-+
-+	return bus_space_read_8(io->iot, io->ioh, ior);
-+}
-+#endif
-+
-+void DWC_WRITE_REG32(void *io_ctx, uint32_t volatile *reg, uint32_t value)
-+{
-+	dwc_ioctx_t *io = (dwc_ioctx_t *)io_ctx;
-+	bus_size_t ior = (bus_size_t)reg;
-+
-+	bus_space_write_4(io->iot, io->ioh, ior, value);
-+}
-+
-+#if 0
-+void DWC_WRITE_REG64(void *io_ctx, uint64_t volatile *reg, uint64_t value)
-+{
-+	dwc_ioctx_t *io = (dwc_ioctx_t *)io_ctx;
-+	bus_size_t ior = (bus_size_t)reg;
-+
-+	bus_space_write_8(io->iot, io->ioh, ior, value);
-+}
-+#endif
-+
-+void DWC_MODIFY_REG32(void *io_ctx, uint32_t volatile *reg, uint32_t clear_mask,
-+		      uint32_t set_mask)
-+{
-+	dwc_ioctx_t *io = (dwc_ioctx_t *)io_ctx;
-+	bus_size_t ior = (bus_size_t)reg;
-+
-+	bus_space_write_4(io->iot, io->ioh, ior,
-+			  (bus_space_read_4(io->iot, io->ioh, ior) &
-+			   ~clear_mask) | set_mask);
-+}
-+
-+#if 0
-+void DWC_MODIFY_REG64(void *io_ctx, uint64_t volatile *reg, uint64_t clear_mask,
-+		      uint64_t set_mask)
-+{
-+	dwc_ioctx_t *io = (dwc_ioctx_t *)io_ctx;
-+	bus_size_t ior = (bus_size_t)reg;
-+
-+	bus_space_write_8(io->iot, io->ioh, ior,
-+			  (bus_space_read_8(io->iot, io->ioh, ior) &
-+			   ~clear_mask) | set_mask);
-+}
-+#endif
-+
-+
-+/* Locking */
-+
-+dwc_spinlock_t *DWC_SPINLOCK_ALLOC(void)
-+{
-+	struct mtx *sl = DWC_ALLOC(sizeof(*sl));
-+
-+	if (!sl) {
-+		DWC_ERROR("Cannot allocate memory for spinlock");
-+		return NULL;
-+	}
-+
-+	mtx_init(sl, "dw3spn", NULL, MTX_SPIN);
-+	return (dwc_spinlock_t *)sl;
-+}
-+
-+void DWC_SPINLOCK_FREE(dwc_spinlock_t *lock)
-+{
-+	struct mtx *sl = (struct mtx *)lock;
-+
-+	mtx_destroy(sl);
-+	DWC_FREE(sl);
-+}
-+
-+void DWC_SPINLOCK(dwc_spinlock_t *lock)
-+{
-+	mtx_lock_spin((struct mtx *)lock);	// ???
-+}
-+
-+void DWC_SPINUNLOCK(dwc_spinlock_t *lock)
-+{
-+	mtx_unlock_spin((struct mtx *)lock);	// ???
-+}
-+
-+void DWC_SPINLOCK_IRQSAVE(dwc_spinlock_t *lock, dwc_irqflags_t *flags)
-+{
-+	mtx_lock_spin((struct mtx *)lock);
-+}
-+
-+void DWC_SPINUNLOCK_IRQRESTORE(dwc_spinlock_t *lock, dwc_irqflags_t flags)
-+{
-+	mtx_unlock_spin((struct mtx *)lock);
-+}
-+
-+dwc_mutex_t *DWC_MUTEX_ALLOC(void)
-+{
-+	struct mtx *m;
-+	dwc_mutex_t *mutex = (dwc_mutex_t *)DWC_ALLOC(sizeof(struct mtx));
-+
-+	if (!mutex) {
-+		DWC_ERROR("Cannot allocate memory for mutex");
-+		return NULL;
-+	}
-+
-+	m = (struct mtx *)mutex;
-+	mtx_init(m, "dw3mtx", NULL, MTX_DEF);
-+	return mutex;
-+}
-+
-+#if (defined(DWC_LINUX) && defined(CONFIG_DEBUG_MUTEXES))
-+#else
-+void DWC_MUTEX_FREE(dwc_mutex_t *mutex)
-+{
-+	mtx_destroy((struct mtx *)mutex);
-+	DWC_FREE(mutex);
-+}
-+#endif
-+
-+void DWC_MUTEX_LOCK(dwc_mutex_t *mutex)
-+{
-+	struct mtx *m = (struct mtx *)mutex;
-+
-+	mtx_lock(m);
-+}
-+
-+int DWC_MUTEX_TRYLOCK(dwc_mutex_t *mutex)
-+{
-+	struct mtx *m = (struct mtx *)mutex;
-+
-+	return mtx_trylock(m);
-+}
-+
-+void DWC_MUTEX_UNLOCK(dwc_mutex_t *mutex)
-+{
-+	struct mtx *m = (struct mtx *)mutex;
-+
-+	mtx_unlock(m);
-+}
-+
-+
-+/* Timing */
-+
-+void DWC_UDELAY(uint32_t usecs)
-+{
-+	DELAY(usecs);
-+}
-+
-+void DWC_MDELAY(uint32_t msecs)
-+{
-+	do {
-+		DELAY(1000);
-+	} while (--msecs);
-+}
-+
-+void DWC_MSLEEP(uint32_t msecs)
-+{
-+	struct timeval tv;
-+
-+	tv.tv_sec = msecs / 1000;
-+	tv.tv_usec = (msecs - tv.tv_sec * 1000) * 1000;
-+	pause("dw3slp", tvtohz(&tv));
-+}
-+
-+uint32_t DWC_TIME(void)
-+{
-+	struct timeval tv;
-+
-+	microuptime(&tv);	// or getmicrouptime? (less precise, but faster)
-+	return tv.tv_sec * 1000 + tv.tv_usec / 1000;
-+}
-+
-+
-+/* Timers */
-+
-+struct dwc_timer {
-+	struct callout t;
-+	char *name;
-+	dwc_spinlock_t *lock;
-+	dwc_timer_callback_t cb;
-+	void *data;
-+};
-+
-+dwc_timer_t *DWC_TIMER_ALLOC(char *name, dwc_timer_callback_t cb, void *data)
-+{
-+	dwc_timer_t *t = DWC_ALLOC(sizeof(*t));
-+
-+	if (!t) {
-+		DWC_ERROR("Cannot allocate memory for timer");
-+		return NULL;
-+	}
-+
-+	callout_init(&t->t, 1);
-+
-+	t->name = DWC_STRDUP(name);
-+	if (!t->name) {
-+		DWC_ERROR("Cannot allocate memory for timer->name");
-+		goto no_name;
-+	}
-+
-+	t->lock = DWC_SPINLOCK_ALLOC();
-+	if (!t->lock) {
-+		DWC_ERROR("Cannot allocate memory for lock");
-+		goto no_lock;
-+	}
-+
-+	t->cb = cb;
-+	t->data = data;
-+
-+	return t;
-+
-+ no_lock:
-+	DWC_FREE(t->name);
-+ no_name:
-+	DWC_FREE(t);
-+
-+	return NULL;
-+}
-+
-+void DWC_TIMER_FREE(dwc_timer_t *timer)
-+{
-+	callout_stop(&timer->t);
-+	DWC_SPINLOCK_FREE(timer->lock);
-+	DWC_FREE(timer->name);
-+	DWC_FREE(timer);
-+}
-+
-+void DWC_TIMER_SCHEDULE(dwc_timer_t *timer, uint32_t time)
-+{
-+	struct timeval tv;
-+
-+	tv.tv_sec = time / 1000;
-+	tv.tv_usec = (time - tv.tv_sec * 1000) * 1000;
-+	callout_reset(&timer->t, tvtohz(&tv), timer->cb, timer->data);
-+}
-+
-+void DWC_TIMER_CANCEL(dwc_timer_t *timer)
-+{
-+	callout_stop(&timer->t);
-+}
-+
-+
-+/* Wait Queues */
-+
-+struct dwc_waitq {
-+	struct mtx lock;
-+	int abort;
-+};
-+
-+dwc_waitq_t *DWC_WAITQ_ALLOC(void)
-+{
-+	dwc_waitq_t *wq = DWC_ALLOC(sizeof(*wq));
-+
-+	if (!wq) {
-+		DWC_ERROR("Cannot allocate memory for waitqueue");
-+		return NULL;
-+	}
-+
-+	mtx_init(&wq->lock, "dw3wtq", NULL, MTX_DEF);
-+	wq->abort = 0;
-+
-+	return wq;
-+}
-+
-+void DWC_WAITQ_FREE(dwc_waitq_t *wq)
-+{
-+	mtx_destroy(&wq->lock);
-+	DWC_FREE(wq);
-+}
-+
-+int32_t DWC_WAITQ_WAIT(dwc_waitq_t *wq, dwc_waitq_condition_t cond, void *data)
-+{
-+//	intrmask_t ipl;
-+	int result = 0;
-+
-+	mtx_lock(&wq->lock);
-+//	ipl = splbio();
-+
-+	/* Skip the sleep if already aborted or triggered */
-+	if (!wq->abort && !cond(data)) {
-+//		splx(ipl);
-+		result = msleep(wq, &wq->lock, PCATCH, "dw3wat", 0); // infinite timeout
-+//		ipl = splbio();
-+	}
-+
-+	if (result == ERESTART) {	// signaled - restart
-+		result = -DWC_E_RESTART;
-+
-+	} else if (result == EINTR) {	// signaled - interrupt
-+		result = -DWC_E_ABORT;
-+
-+	} else if (wq->abort) {
-+		result = -DWC_E_ABORT;
-+
-+	} else {
-+		result = 0;
-+	}
-+
-+	wq->abort = 0;
-+//	splx(ipl);
-+	mtx_unlock(&wq->lock);
-+	return result;
-+}
-+
-+int32_t DWC_WAITQ_WAIT_TIMEOUT(dwc_waitq_t *wq, dwc_waitq_condition_t cond,
-+			       void *data, int32_t msecs)
-+{
-+	struct timeval tv, tv1, tv2;
-+//	intrmask_t ipl;
-+	int result = 0;
-+
-+	tv.tv_sec = msecs / 1000;
-+	tv.tv_usec = (msecs - tv.tv_sec * 1000) * 1000;
-+
-+	mtx_lock(&wq->lock);
-+//	ipl = splbio();
-+
-+	/* Skip the sleep if already aborted or triggered */
-+	if (!wq->abort && !cond(data)) {
-+//		splx(ipl);
-+		getmicrouptime(&tv1);
-+		result = msleep(wq, &wq->lock, PCATCH, "dw3wto", tvtohz(&tv));
-+		getmicrouptime(&tv2);
-+//		ipl = splbio();
-+	}
-+
-+	if (result == 0) {			// awoken
-+		if (wq->abort) {
-+			result = -DWC_E_ABORT;
-+		} else {
-+			tv2.tv_usec -= tv1.tv_usec;
-+			if (tv2.tv_usec < 0) {
-+				tv2.tv_usec += 1000000;
-+				tv2.tv_sec--;
-+			}
-+
-+			tv2.tv_sec -= tv1.tv_sec;
-+			result = tv2.tv_sec * 1000 + tv2.tv_usec / 1000;
-+			result = msecs - result;
-+			if (result <= 0)
-+				result = 1;
-+		}
-+	} else if (result == ERESTART) {	// signaled - restart
-+		result = -DWC_E_RESTART;
-+
-+	} else if (result == EINTR) {		// signaled - interrupt
-+		result = -DWC_E_ABORT;
-+
-+	} else {				// timed out
-+		result = -DWC_E_TIMEOUT;
-+	}
-+
-+	wq->abort = 0;
-+//	splx(ipl);
-+	mtx_unlock(&wq->lock);
-+	return result;
-+}
-+
-+void DWC_WAITQ_TRIGGER(dwc_waitq_t *wq)
-+{
-+	wakeup(wq);
-+}
-+
-+void DWC_WAITQ_ABORT(dwc_waitq_t *wq)
-+{
-+//	intrmask_t ipl;
-+
-+	mtx_lock(&wq->lock);
-+//	ipl = splbio();
-+	wq->abort = 1;
-+	wakeup(wq);
-+//	splx(ipl);
-+	mtx_unlock(&wq->lock);
-+}
-+
-+
-+/* Threading */
-+
-+struct dwc_thread {
-+	struct proc *proc;
-+	int abort;
-+};
-+
-+dwc_thread_t *DWC_THREAD_RUN(dwc_thread_function_t func, char *name, void *data)
-+{
-+	int retval;
-+	dwc_thread_t *thread = DWC_ALLOC(sizeof(*thread));
-+
-+	if (!thread) {
-+		return NULL;
-+	}
-+
-+	thread->abort = 0;
-+	retval = kthread_create((void (*)(void *))func, data, &thread->proc,
-+				RFPROC | RFNOWAIT, 0, "%s", name);
-+	if (retval) {
-+		DWC_FREE(thread);
-+		return NULL;
-+	}
-+
-+	return thread;
-+}
-+
-+int DWC_THREAD_STOP(dwc_thread_t *thread)
-+{
-+	int retval;
-+
-+	thread->abort = 1;
-+	retval = tsleep(&thread->abort, 0, "dw3stp", 60 * hz);
-+
-+	if (retval == 0) {
-+		/* DWC_THREAD_EXIT() will free the thread struct */
-+		return 0;
-+	}
-+
-+	/* NOTE: We leak the thread struct if thread doesn't die */
-+
-+	if (retval == EWOULDBLOCK) {
-+		return -DWC_E_TIMEOUT;
-+	}
-+
-+	return -DWC_E_UNKNOWN;
-+}
-+
-+dwc_bool_t DWC_THREAD_SHOULD_STOP(dwc_thread_t *thread)
-+{
-+	return thread->abort;
-+}
-+
-+void DWC_THREAD_EXIT(dwc_thread_t *thread)
-+{
-+	wakeup(&thread->abort);
-+	DWC_FREE(thread);
-+	kthread_exit(0);
-+}
-+
-+
-+/* tasklets
-+ - Runs in interrupt context (cannot sleep)
-+ - Each tasklet runs on a single CPU [ How can we ensure this on FreeBSD? Does it matter? ]
-+ - Different tasklets can be running simultaneously on different CPUs [ shouldn't matter ]
-+ */
-+struct dwc_tasklet {
-+	struct task t;
-+	dwc_tasklet_callback_t cb;
-+	void *data;
-+};
-+
-+static void tasklet_callback(void *data, int pending)	// what to do with pending ???
-+{
-+	dwc_tasklet_t *task = (dwc_tasklet_t *)data;
-+
-+	task->cb(task->data);
-+}
-+
-+dwc_tasklet_t *DWC_TASK_ALLOC(char *name, dwc_tasklet_callback_t cb, void *data)
-+{
-+	dwc_tasklet_t *task = DWC_ALLOC(sizeof(*task));
-+
-+	if (task) {
-+		task->cb = cb;
-+		task->data = data;
-+		TASK_INIT(&task->t, 0, tasklet_callback, task);
-+	} else {
-+		DWC_ERROR("Cannot allocate memory for tasklet");
-+	}
-+
-+	return task;
-+}
-+
-+void DWC_TASK_FREE(dwc_tasklet_t *task)
-+{
-+	taskqueue_drain(taskqueue_fast, &task->t);	// ???
-+	DWC_FREE(task);
-+}
-+
-+void DWC_TASK_SCHEDULE(dwc_tasklet_t *task)
-+{
-+	/* Uses predefined system queue */
-+	taskqueue_enqueue_fast(taskqueue_fast, &task->t);
-+}
-+
-+
-+/* workqueues
-+ - Runs in process context (can sleep)
-+ */
-+typedef struct work_container {
-+	dwc_work_callback_t cb;
-+	void *data;
-+	dwc_workq_t *wq;
-+	char *name;
-+	int hz;
-+
-+#ifdef DEBUG
-+	DWC_CIRCLEQ_ENTRY(work_container) entry;
-+#endif
-+	struct task task;
-+} work_container_t;
-+
-+#ifdef DEBUG
-+DWC_CIRCLEQ_HEAD(work_container_queue, work_container);
-+#endif
-+
-+struct dwc_workq {
-+	struct taskqueue *taskq;
-+	dwc_spinlock_t *lock;
-+	dwc_waitq_t *waitq;
-+	int pending;
-+
-+#ifdef DEBUG
-+	struct work_container_queue entries;
-+#endif
-+};
-+
-+static void do_work(void *data, int pending)	// what to do with pending ???
-+{
-+	work_container_t *container = (work_container_t *)data;
-+	dwc_workq_t *wq = container->wq;
-+	dwc_irqflags_t flags;
-+
-+	if (container->hz) {
-+		pause("dw3wrk", container->hz);
-+	}
-+
-+	container->cb(container->data);
-+	DWC_DEBUG("Work done: %s, container=%p", container->name, container);
-+
-+	DWC_SPINLOCK_IRQSAVE(wq->lock, &flags);
-+
-+#ifdef DEBUG
-+	DWC_CIRCLEQ_REMOVE(&wq->entries, container, entry);
-+#endif
-+	if (container->name)
-+		DWC_FREE(container->name);
-+	DWC_FREE(container);
-+	wq->pending--;
-+	DWC_SPINUNLOCK_IRQRESTORE(wq->lock, flags);
-+	DWC_WAITQ_TRIGGER(wq->waitq);
-+}
-+
-+static int work_done(void *data)
-+{
-+	dwc_workq_t *workq = (dwc_workq_t *)data;
-+
-+	return workq->pending == 0;
-+}
-+
-+int DWC_WORKQ_WAIT_WORK_DONE(dwc_workq_t *workq, int timeout)
-+{
-+	return DWC_WAITQ_WAIT_TIMEOUT(workq->waitq, work_done, workq, timeout);
-+}
-+
-+dwc_workq_t *DWC_WORKQ_ALLOC(char *name)
-+{
-+	dwc_workq_t *wq = DWC_ALLOC(sizeof(*wq));
-+
-+	if (!wq) {
-+		DWC_ERROR("Cannot allocate memory for workqueue");
-+		return NULL;
-+	}
-+
-+	wq->taskq = taskqueue_create(name, M_NOWAIT, taskqueue_thread_enqueue, &wq->taskq);
-+	if (!wq->taskq) {
-+		DWC_ERROR("Cannot allocate memory for taskqueue");
-+		goto no_taskq;
-+	}
-+
-+	wq->pending = 0;
-+
-+	wq->lock = DWC_SPINLOCK_ALLOC();
-+	if (!wq->lock) {
-+		DWC_ERROR("Cannot allocate memory for spinlock");
-+		goto no_lock;
-+	}
-+
-+	wq->waitq = DWC_WAITQ_ALLOC();
-+	if (!wq->waitq) {
-+		DWC_ERROR("Cannot allocate memory for waitqueue");
-+		goto no_waitq;
-+	}
-+
-+	taskqueue_start_threads(&wq->taskq, 1, PWAIT, "%s taskq", "dw3tsk");
-+
-+#ifdef DEBUG
-+	DWC_CIRCLEQ_INIT(&wq->entries);
-+#endif
-+	return wq;
-+
-+ no_waitq:
-+	DWC_SPINLOCK_FREE(wq->lock);
-+ no_lock:
-+	taskqueue_free(wq->taskq);
-+ no_taskq:
-+	DWC_FREE(wq);
-+
-+	return NULL;
-+}
-+
-+void DWC_WORKQ_FREE(dwc_workq_t *wq)
-+{
-+#ifdef DEBUG
-+	dwc_irqflags_t flags;
-+
-+	DWC_SPINLOCK_IRQSAVE(wq->lock, &flags);
-+
-+	if (wq->pending != 0) {
-+		struct work_container *container;
-+
-+		DWC_ERROR("Destroying work queue with pending work");
-+
-+		DWC_CIRCLEQ_FOREACH(container, &wq->entries, entry) {
-+			DWC_ERROR("Work %s still pending", container->name);
-+		}
-+	}
-+
-+	DWC_SPINUNLOCK_IRQRESTORE(wq->lock, flags);
-+#endif
-+	DWC_WAITQ_FREE(wq->waitq);
-+	DWC_SPINLOCK_FREE(wq->lock);
-+	taskqueue_free(wq->taskq);
-+	DWC_FREE(wq);
-+}
-+
-+void DWC_WORKQ_SCHEDULE(dwc_workq_t *wq, dwc_work_callback_t cb, void *data,
-+			char *format, ...)
-+{
-+	dwc_irqflags_t flags;
-+	work_container_t *container;
-+	static char name[128];
-+	va_list args;
-+
-+	va_start(args, format);
-+	DWC_VSNPRINTF(name, 128, format, args);
-+	va_end(args);
-+
-+	DWC_SPINLOCK_IRQSAVE(wq->lock, &flags);
-+	wq->pending++;
-+	DWC_SPINUNLOCK_IRQRESTORE(wq->lock, flags);
-+	DWC_WAITQ_TRIGGER(wq->waitq);
-+
-+	container = DWC_ALLOC_ATOMIC(sizeof(*container));
-+	if (!container) {
-+		DWC_ERROR("Cannot allocate memory for container");
-+		return;
-+	}
-+
-+	container->name = DWC_STRDUP(name);
-+	if (!container->name) {
-+		DWC_ERROR("Cannot allocate memory for container->name");
-+		DWC_FREE(container);
-+		return;
-+	}
-+
-+	container->cb = cb;
-+	container->data = data;
-+	container->wq = wq;
-+	container->hz = 0;
-+
-+	DWC_DEBUG("Queueing work: %s, container=%p", container->name, container);
-+
-+	TASK_INIT(&container->task, 0, do_work, container);
-+
-+#ifdef DEBUG
-+	DWC_CIRCLEQ_INSERT_TAIL(&wq->entries, container, entry);
-+#endif
-+	taskqueue_enqueue_fast(wq->taskq, &container->task);
-+}
-+
-+void DWC_WORKQ_SCHEDULE_DELAYED(dwc_workq_t *wq, dwc_work_callback_t cb,
-+				void *data, uint32_t time, char *format, ...)
-+{
-+	dwc_irqflags_t flags;
-+	work_container_t *container;
-+	static char name[128];
-+	struct timeval tv;
-+	va_list args;
-+
-+	va_start(args, format);
-+	DWC_VSNPRINTF(name, 128, format, args);
-+	va_end(args);
-+
-+	DWC_SPINLOCK_IRQSAVE(wq->lock, &flags);
-+	wq->pending++;
-+	DWC_SPINUNLOCK_IRQRESTORE(wq->lock, flags);
-+	DWC_WAITQ_TRIGGER(wq->waitq);
-+
-+	container = DWC_ALLOC_ATOMIC(sizeof(*container));
-+	if (!container) {
-+		DWC_ERROR("Cannot allocate memory for container");
-+		return;
-+	}
-+
-+	container->name = DWC_STRDUP(name);
-+	if (!container->name) {
-+		DWC_ERROR("Cannot allocate memory for container->name");
-+		DWC_FREE(container);
-+		return;
-+	}
-+
-+	container->cb = cb;
-+	container->data = data;
-+	container->wq = wq;
-+
-+	tv.tv_sec = time / 1000;
-+	tv.tv_usec = (time - tv.tv_sec * 1000) * 1000;
-+	container->hz = tvtohz(&tv);
-+
-+	DWC_DEBUG("Queueing work: %s, container=%p", container->name, container);
-+
-+	TASK_INIT(&container->task, 0, do_work, container);
-+
-+#ifdef DEBUG
-+	DWC_CIRCLEQ_INSERT_TAIL(&wq->entries, container, entry);
-+#endif
-+	taskqueue_enqueue_fast(wq->taskq, &container->task);
-+}
-+
-+int DWC_WORKQ_PENDING(dwc_workq_t *wq)
-+{
-+	return wq->pending;
-+}
---- /dev/null
-+++ b/drivers/usb/host/dwc_common_port/dwc_common_linux.c
-@@ -0,0 +1,1409 @@
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/module.h>
-+#include <linux/kthread.h>
-+
-+#ifdef DWC_CCLIB
-+# include "dwc_cc.h"
-+#endif
-+
-+#ifdef DWC_CRYPTOLIB
-+# include "dwc_modpow.h"
-+# include "dwc_dh.h"
-+# include "dwc_crypto.h"
-+#endif
-+
-+#ifdef DWC_NOTIFYLIB
-+# include "dwc_notifier.h"
-+#endif
-+
-+/* OS-Level Implementations */
-+
-+/* This is the Linux kernel implementation of the DWC platform library. */
-+#include <linux/moduleparam.h>
-+#include <linux/ctype.h>
-+#include <linux/crypto.h>
-+#include <linux/delay.h>
-+#include <linux/device.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/cdev.h>
-+#include <linux/errno.h>
-+#include <linux/interrupt.h>
-+#include <linux/jiffies.h>
-+#include <linux/list.h>
-+#include <linux/pci.h>
-+#include <linux/random.h>
-+#include <linux/scatterlist.h>
-+#include <linux/slab.h>
-+#include <linux/stat.h>
-+#include <linux/string.h>
-+#include <linux/timer.h>
-+#include <linux/usb.h>
-+
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
-+# include <linux/usb/gadget.h>
-+#else
-+# include <linux/usb_gadget.h>
-+#endif
-+
-+#include <asm/io.h>
-+#include <asm/page.h>
-+#include <asm/uaccess.h>
-+#include <asm/unaligned.h>
-+
-+#include "dwc_os.h"
-+#include "dwc_list.h"
-+
-+
-+/* MISC */
-+
-+void *DWC_MEMSET(void *dest, uint8_t byte, uint32_t size)
-+{
-+	return memset(dest, byte, size);
-+}
-+
-+void *DWC_MEMCPY(void *dest, void const *src, uint32_t size)
-+{
-+	return memcpy(dest, src, size);
-+}
-+
-+void *DWC_MEMMOVE(void *dest, void *src, uint32_t size)
-+{
-+	return memmove(dest, src, size);
-+}
-+
-+int DWC_MEMCMP(void *m1, void *m2, uint32_t size)
-+{
-+	return memcmp(m1, m2, size);
-+}
-+
-+int DWC_STRNCMP(void *s1, void *s2, uint32_t size)
-+{
-+	return strncmp(s1, s2, size);
-+}
-+
-+int DWC_STRCMP(void *s1, void *s2)
-+{
-+	return strcmp(s1, s2);
-+}
-+
-+int DWC_STRLEN(char const *str)
-+{
-+	return strlen(str);
-+}
-+
-+char *DWC_STRCPY(char *to, char const *from)
-+{
-+	return strcpy(to, from);
-+}
-+
-+char *DWC_STRDUP(char const *str)
-+{
-+	int len = DWC_STRLEN(str) + 1;
-+	char *new = DWC_ALLOC_ATOMIC(len);
-+
-+	if (!new) {
-+		return NULL;
-+	}
-+
-+	DWC_MEMCPY(new, str, len);
-+	return new;
-+}
-+
-+int DWC_ATOI(const char *str, int32_t *value)
-+{
-+	char *end = NULL;
-+
-+	*value = simple_strtol(str, &end, 0);
-+	if (*end == '\0') {
-+		return 0;
-+	}
-+
-+	return -1;
-+}
-+
-+int DWC_ATOUI(const char *str, uint32_t *value)
-+{
-+	char *end = NULL;
-+
-+	*value = simple_strtoul(str, &end, 0);
-+	if (*end == '\0') {
-+		return 0;
-+	}
-+
-+	return -1;
-+}
-+
-+
-+#ifdef DWC_UTFLIB
-+/* From usbstring.c */
-+
-+int DWC_UTF8_TO_UTF16LE(uint8_t const *s, uint16_t *cp, unsigned len)
-+{
-+	int	count = 0;
-+	u8	c;
-+	u16	uchar;
-+
-+	/* this insists on correct encodings, though not minimal ones.
-+	 * BUT it currently rejects legit 4-byte UTF-8 code points,
-+	 * which need surrogate pairs.  (Unicode 3.1 can use them.)
-+	 */
-+	while (len != 0 && (c = (u8) *s++) != 0) {
-+		if (unlikely(c & 0x80)) {
-+			// 2-byte sequence:
-+			// 00000yyyyyxxxxxx = 110yyyyy 10xxxxxx
-+			if ((c & 0xe0) == 0xc0) {
-+				uchar = (c & 0x1f) << 6;
-+
-+				c = (u8) *s++;
-+				if ((c & 0xc0) != 0xc0)
-+					goto fail;
-+				c &= 0x3f;
-+				uchar |= c;
-+
-+			// 3-byte sequence (most CJKV characters):
-+			// zzzzyyyyyyxxxxxx = 1110zzzz 10yyyyyy 10xxxxxx
-+			} else if ((c & 0xf0) == 0xe0) {
-+				uchar = (c & 0x0f) << 12;
-+
-+				c = (u8) *s++;
-+				if ((c & 0xc0) != 0xc0)
-+					goto fail;
-+				c &= 0x3f;
-+				uchar |= c << 6;
-+
-+				c = (u8) *s++;
-+				if ((c & 0xc0) != 0xc0)
-+					goto fail;
-+				c &= 0x3f;
-+				uchar |= c;
-+
-+				/* no bogus surrogates */
-+				if (0xd800 <= uchar && uchar <= 0xdfff)
-+					goto fail;
-+
-+			// 4-byte sequence (surrogate pairs, currently rare):
-+			// 11101110wwwwzzzzyy + 110111yyyyxxxxxx
-+			//     = 11110uuu 10uuzzzz 10yyyyyy 10xxxxxx
-+			// (uuuuu = wwww + 1)
-+			// FIXME accept the surrogate code points (only)
-+			} else
-+				goto fail;
-+		} else
-+			uchar = c;
-+		put_unaligned (cpu_to_le16 (uchar), cp++);
-+		count++;
-+		len--;
-+	}
-+	return count;
-+fail:
-+	return -1;
-+}
-+#endif	/* DWC_UTFLIB */
-+
-+
-+/* dwc_debug.h */
-+
-+dwc_bool_t DWC_IN_IRQ(void)
-+{
-+	return in_irq();
-+}
-+
-+dwc_bool_t DWC_IN_BH(void)
-+{
-+	return in_softirq();
-+}
-+
-+void DWC_VPRINTF(char *format, va_list args)
-+{
-+	vprintk(format, args);
-+}
-+
-+int DWC_VSNPRINTF(char *str, int size, char *format, va_list args)
-+{
-+	return vsnprintf(str, size, format, args);
-+}
-+
-+void DWC_PRINTF(char *format, ...)
-+{
-+	va_list args;
-+
-+	va_start(args, format);
-+	DWC_VPRINTF(format, args);
-+	va_end(args);
-+}
-+
-+int DWC_SPRINTF(char *buffer, char *format, ...)
-+{
-+	int retval;
-+	va_list args;
-+
-+	va_start(args, format);
-+	retval = vsprintf(buffer, format, args);
-+	va_end(args);
-+	return retval;
-+}
-+
-+int DWC_SNPRINTF(char *buffer, int size, char *format, ...)
-+{
-+	int retval;
-+	va_list args;
-+
-+	va_start(args, format);
-+	retval = vsnprintf(buffer, size, format, args);
-+	va_end(args);
-+	return retval;
-+}
-+
-+void __DWC_WARN(char *format, ...)
-+{
-+	va_list args;
-+
-+	va_start(args, format);
-+	DWC_PRINTF(KERN_WARNING);
-+	DWC_VPRINTF(format, args);
-+	va_end(args);
-+}
-+
-+void __DWC_ERROR(char *format, ...)
-+{
-+	va_list args;
-+
-+	va_start(args, format);
-+	DWC_PRINTF(KERN_ERR);
-+	DWC_VPRINTF(format, args);
-+	va_end(args);
-+}
-+
-+void DWC_EXCEPTION(char *format, ...)
-+{
-+	va_list args;
-+
-+	va_start(args, format);
-+	DWC_PRINTF(KERN_ERR);
-+	DWC_VPRINTF(format, args);
-+	va_end(args);
-+	BUG_ON(1);
-+}
-+
-+#ifdef DEBUG
-+void __DWC_DEBUG(char *format, ...)
-+{
-+	va_list args;
-+
-+	va_start(args, format);
-+	DWC_PRINTF(KERN_DEBUG);
-+	DWC_VPRINTF(format, args);
-+	va_end(args);
-+}
-+#endif
-+
-+
-+/* dwc_mem.h */
-+
-+#if 0
-+dwc_pool_t *DWC_DMA_POOL_CREATE(uint32_t size,
-+				uint32_t align,
-+				uint32_t alloc)
-+{
-+	struct dma_pool *pool = dma_pool_create("Pool", NULL,
-+						size, align, alloc);
-+	return (dwc_pool_t *)pool;
-+}
-+
-+void DWC_DMA_POOL_DESTROY(dwc_pool_t *pool)
-+{
-+	dma_pool_destroy((struct dma_pool *)pool);
-+}
-+
-+void *DWC_DMA_POOL_ALLOC(dwc_pool_t *pool, uint64_t *dma_addr)
-+{
-+	return dma_pool_alloc((struct dma_pool *)pool, GFP_KERNEL, dma_addr);
-+}
-+
-+void *DWC_DMA_POOL_ZALLOC(dwc_pool_t *pool, uint64_t *dma_addr)
-+{
-+	void *vaddr = DWC_DMA_POOL_ALLOC(pool, dma_addr);
-+	memset(..);
-+}
-+
-+void DWC_DMA_POOL_FREE(dwc_pool_t *pool, void *vaddr, void *daddr)
-+{
-+	dma_pool_free(pool, vaddr, daddr);
-+}
-+#endif
-+
-+void *__DWC_DMA_ALLOC(void *dma_ctx, uint32_t size, dwc_dma_t *dma_addr)
-+{
-+	return dma_alloc_coherent(dma_ctx, size, dma_addr, GFP_KERNEL | GFP_DMA32);
-+}
-+
-+void *__DWC_DMA_ALLOC_ATOMIC(void *dma_ctx, uint32_t size, dwc_dma_t *dma_addr)
-+{
-+	return dma_alloc_coherent(dma_ctx, size, dma_addr, GFP_ATOMIC);
-+}
-+
-+void __DWC_DMA_FREE(void *dma_ctx, uint32_t size, void *virt_addr, dwc_dma_t dma_addr)
-+{
-+	dma_free_coherent(dma_ctx, size, virt_addr, dma_addr);
-+}
-+
-+void *__DWC_ALLOC(void *mem_ctx, uint32_t size)
-+{
-+	return kzalloc(size, GFP_KERNEL);
-+}
-+
-+void *__DWC_ALLOC_ATOMIC(void *mem_ctx, uint32_t size)
-+{
-+	return kzalloc(size, GFP_ATOMIC);
-+}
-+
-+void __DWC_FREE(void *mem_ctx, void *addr)
-+{
-+	kfree(addr);
-+}
-+
-+
-+#ifdef DWC_CRYPTOLIB
-+/* dwc_crypto.h */
-+
-+void DWC_RANDOM_BYTES(uint8_t *buffer, uint32_t length)
-+{
-+	get_random_bytes(buffer, length);
-+}
-+
-+int DWC_AES_CBC(uint8_t *message, uint32_t messagelen, uint8_t *key, uint32_t keylen, uint8_t iv[16], uint8_t *out)
-+{
-+	struct crypto_blkcipher *tfm;
-+	struct blkcipher_desc desc;
-+	struct scatterlist sgd;
-+	struct scatterlist sgs;
-+
-+	tfm = crypto_alloc_blkcipher("cbc(aes)", 0, CRYPTO_ALG_ASYNC);
-+	if (tfm == NULL) {
-+		printk("failed to load transform for aes CBC\n");
-+		return -1;
-+	}
-+
-+	crypto_blkcipher_setkey(tfm, key, keylen);
-+	crypto_blkcipher_set_iv(tfm, iv, 16);
-+
-+	sg_init_one(&sgd, out, messagelen);
-+	sg_init_one(&sgs, message, messagelen);
-+
-+	desc.tfm = tfm;
-+	desc.flags = 0;
-+
-+	if (crypto_blkcipher_encrypt(&desc, &sgd, &sgs, messagelen)) {
-+		crypto_free_blkcipher(tfm);
-+		DWC_ERROR("AES CBC encryption failed");
-+		return -1;
-+	}
-+
-+	crypto_free_blkcipher(tfm);
-+	return 0;
-+}
-+
-+int DWC_SHA256(uint8_t *message, uint32_t len, uint8_t *out)
-+{
-+	struct crypto_hash *tfm;
-+	struct hash_desc desc;
-+	struct scatterlist sg;
-+
-+	tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
-+	if (IS_ERR(tfm)) {
-+		DWC_ERROR("Failed to load transform for sha256: %ld\n", PTR_ERR(tfm));
-+		return 0;
-+	}
-+	desc.tfm = tfm;
-+	desc.flags = 0;
-+
-+	sg_init_one(&sg, message, len);
-+	crypto_hash_digest(&desc, &sg, len, out);
-+	crypto_free_hash(tfm);
-+
-+	return 1;
-+}
-+
-+int DWC_HMAC_SHA256(uint8_t *message, uint32_t messagelen,
-+		    uint8_t *key, uint32_t keylen, uint8_t *out)
-+{
-+	struct crypto_hash *tfm;
-+	struct hash_desc desc;
-+	struct scatterlist sg;
-+
-+	tfm = crypto_alloc_hash("hmac(sha256)", 0, CRYPTO_ALG_ASYNC);
-+	if (IS_ERR(tfm)) {
-+		DWC_ERROR("Failed to load transform for hmac(sha256): %ld\n", PTR_ERR(tfm));
-+		return 0;
-+	}
-+	desc.tfm = tfm;
-+	desc.flags = 0;
-+
-+	sg_init_one(&sg, message, messagelen);
-+	crypto_hash_setkey(tfm, key, keylen);
-+	crypto_hash_digest(&desc, &sg, messagelen, out);
-+	crypto_free_hash(tfm);
-+
-+	return 1;
-+}
-+#endif	/* DWC_CRYPTOLIB */
-+
-+
-+/* Byte Ordering Conversions */
-+
-+uint32_t DWC_CPU_TO_LE32(uint32_t *p)
-+{
-+#ifdef __LITTLE_ENDIAN
-+	return *p;
-+#else
-+	uint8_t *u_p = (uint8_t *)p;
-+
-+	return (u_p[3] | (u_p[2] << 8) | (u_p[1] << 16) | (u_p[0] << 24));
-+#endif
-+}
-+
-+uint32_t DWC_CPU_TO_BE32(uint32_t *p)
-+{
-+#ifdef __BIG_ENDIAN
-+	return *p;
-+#else
-+	uint8_t *u_p = (uint8_t *)p;
-+
-+	return (u_p[3] | (u_p[2] << 8) | (u_p[1] << 16) | (u_p[0] << 24));
-+#endif
-+}
-+
-+uint32_t DWC_LE32_TO_CPU(uint32_t *p)
-+{
-+#ifdef __LITTLE_ENDIAN
-+	return *p;
-+#else
-+	uint8_t *u_p = (uint8_t *)p;
-+
-+	return (u_p[3] | (u_p[2] << 8) | (u_p[1] << 16) | (u_p[0] << 24));
-+#endif
-+}
-+
-+uint32_t DWC_BE32_TO_CPU(uint32_t *p)
-+{
-+#ifdef __BIG_ENDIAN
-+	return *p;
-+#else
-+	uint8_t *u_p = (uint8_t *)p;
-+
-+	return (u_p[3] | (u_p[2] << 8) | (u_p[1] << 16) | (u_p[0] << 24));
-+#endif
-+}
-+
-+uint16_t DWC_CPU_TO_LE16(uint16_t *p)
-+{
-+#ifdef __LITTLE_ENDIAN
-+	return *p;
-+#else
-+	uint8_t *u_p = (uint8_t *)p;
-+	return (u_p[1] | (u_p[0] << 8));
-+#endif
-+}
-+
-+uint16_t DWC_CPU_TO_BE16(uint16_t *p)
-+{
-+#ifdef __BIG_ENDIAN
-+	return *p;
-+#else
-+	uint8_t *u_p = (uint8_t *)p;
-+	return (u_p[1] | (u_p[0] << 8));
-+#endif
-+}
-+
-+uint16_t DWC_LE16_TO_CPU(uint16_t *p)
-+{
-+#ifdef __LITTLE_ENDIAN
-+	return *p;
-+#else
-+	uint8_t *u_p = (uint8_t *)p;
-+	return (u_p[1] | (u_p[0] << 8));
-+#endif
-+}
-+
-+uint16_t DWC_BE16_TO_CPU(uint16_t *p)
-+{
-+#ifdef __BIG_ENDIAN
-+	return *p;
-+#else
-+	uint8_t *u_p = (uint8_t *)p;
-+	return (u_p[1] | (u_p[0] << 8));
-+#endif
-+}
-+
-+
-+/* Registers */
-+
-+uint32_t DWC_READ_REG32(uint32_t volatile *reg)
-+{
-+	return readl(reg);
-+}
-+
-+#if 0
-+uint64_t DWC_READ_REG64(uint64_t volatile *reg)
-+{
-+}
-+#endif
-+
-+void DWC_WRITE_REG32(uint32_t volatile *reg, uint32_t value)
-+{
-+	writel(value, reg);
-+}
-+
-+#if 0
-+void DWC_WRITE_REG64(uint64_t volatile *reg, uint64_t value)
-+{
-+}
-+#endif
-+
-+void DWC_MODIFY_REG32(uint32_t volatile *reg, uint32_t clear_mask, uint32_t set_mask)
-+{
-+	writel((readl(reg) & ~clear_mask) | set_mask, reg);
-+}
-+
-+#if 0
-+void DWC_MODIFY_REG64(uint64_t volatile *reg, uint64_t clear_mask, uint64_t set_mask)
-+{
-+}
-+#endif
-+
-+
-+/* Locking */
-+
-+dwc_spinlock_t *DWC_SPINLOCK_ALLOC(void)
-+{
-+	spinlock_t *sl = (spinlock_t *)1;
-+
-+#if defined(CONFIG_PREEMPT) || defined(CONFIG_SMP)
-+	sl = DWC_ALLOC(sizeof(*sl));
-+	if (!sl) {
-+		DWC_ERROR("Cannot allocate memory for spinlock\n");
-+		return NULL;
-+	}
-+
-+	spin_lock_init(sl);
-+#endif
-+	return (dwc_spinlock_t *)sl;
-+}
-+
-+void DWC_SPINLOCK_FREE(dwc_spinlock_t *lock)
-+{
-+#if defined(CONFIG_PREEMPT) || defined(CONFIG_SMP)
-+	DWC_FREE(lock);
-+#endif
-+}
-+
-+void DWC_SPINLOCK(dwc_spinlock_t *lock)
-+{
-+#if defined(CONFIG_PREEMPT) || defined(CONFIG_SMP)
-+	spin_lock((spinlock_t *)lock);
-+#endif
-+}
-+
-+void DWC_SPINUNLOCK(dwc_spinlock_t *lock)
-+{
-+#if defined(CONFIG_PREEMPT) || defined(CONFIG_SMP)
-+	spin_unlock((spinlock_t *)lock);
-+#endif
-+}
-+
-+void DWC_SPINLOCK_IRQSAVE(dwc_spinlock_t *lock, dwc_irqflags_t *flags)
-+{
-+	dwc_irqflags_t f;
-+
-+#if defined(CONFIG_PREEMPT) || defined(CONFIG_SMP)
-+	spin_lock_irqsave((spinlock_t *)lock, f);
-+#else
-+	local_irq_save(f);
-+#endif
-+	*flags = f;
-+}
-+
-+void DWC_SPINUNLOCK_IRQRESTORE(dwc_spinlock_t *lock, dwc_irqflags_t flags)
-+{
-+#if defined(CONFIG_PREEMPT) || defined(CONFIG_SMP)
-+	spin_unlock_irqrestore((spinlock_t *)lock, flags);
-+#else
-+	local_irq_restore(flags);
-+#endif
-+}
-+
-+dwc_mutex_t *DWC_MUTEX_ALLOC(void)
-+{
-+	struct mutex *m;
-+	dwc_mutex_t *mutex = (dwc_mutex_t *)DWC_ALLOC(sizeof(struct mutex));
-+
-+	if (!mutex) {
-+		DWC_ERROR("Cannot allocate memory for mutex\n");
-+		return NULL;
-+	}
-+
-+	m = (struct mutex *)mutex;
-+	mutex_init(m);
-+	return mutex;
-+}
-+
-+#if (defined(DWC_LINUX) && defined(CONFIG_DEBUG_MUTEXES))
-+#else
-+void DWC_MUTEX_FREE(dwc_mutex_t *mutex)
-+{
-+	mutex_destroy((struct mutex *)mutex);
-+	DWC_FREE(mutex);
-+}
-+#endif
-+
-+void DWC_MUTEX_LOCK(dwc_mutex_t *mutex)
-+{
-+	struct mutex *m = (struct mutex *)mutex;
-+	mutex_lock(m);
-+}
-+
-+int DWC_MUTEX_TRYLOCK(dwc_mutex_t *mutex)
-+{
-+	struct mutex *m = (struct mutex *)mutex;
-+	return mutex_trylock(m);
-+}
-+
-+void DWC_MUTEX_UNLOCK(dwc_mutex_t *mutex)
-+{
-+	struct mutex *m = (struct mutex *)mutex;
-+	mutex_unlock(m);
-+}
-+
-+
-+/* Timing */
-+
-+void DWC_UDELAY(uint32_t usecs)
-+{
-+	udelay(usecs);
-+}
-+
-+void DWC_MDELAY(uint32_t msecs)
-+{
-+	mdelay(msecs);
-+}
-+
-+void DWC_MSLEEP(uint32_t msecs)
-+{
-+	msleep(msecs);
-+}
-+
-+uint32_t DWC_TIME(void)
-+{
-+	return jiffies_to_msecs(jiffies);
-+}
-+
-+
-+/* Timers */
-+
-+struct dwc_timer {
-+	struct timer_list t;
-+	char *name;
-+	dwc_timer_callback_t cb;
-+	void *data;
-+	uint8_t scheduled;
-+	dwc_spinlock_t *lock;
-+};
-+
-+static void timer_callback(struct timer_list *tt)
-+{
-+	dwc_timer_t *timer = from_timer(timer, tt, t);
-+	dwc_irqflags_t flags;
-+
-+	DWC_SPINLOCK_IRQSAVE(timer->lock, &flags);
-+	timer->scheduled = 0;
-+	DWC_SPINUNLOCK_IRQRESTORE(timer->lock, flags);
-+	DWC_DEBUGC("Timer %s callback", timer->name);
-+	timer->cb(timer->data);
-+}
-+
-+dwc_timer_t *DWC_TIMER_ALLOC(char *name, dwc_timer_callback_t cb, void *data)
-+{
-+	dwc_timer_t *t = DWC_ALLOC(sizeof(*t));
-+
-+	if (!t) {
-+		DWC_ERROR("Cannot allocate memory for timer");
-+		return NULL;
-+	}
-+
-+	t->name = DWC_STRDUP(name);
-+	if (!t->name) {
-+		DWC_ERROR("Cannot allocate memory for timer->name");
-+		goto no_name;
-+	}
-+
-+#if (defined(DWC_LINUX) && defined(CONFIG_DEBUG_SPINLOCK))
-+	DWC_SPINLOCK_ALLOC_LINUX_DEBUG(t->lock);
-+#else
-+	t->lock = DWC_SPINLOCK_ALLOC();
-+#endif
-+	if (!t->lock) {
-+		DWC_ERROR("Cannot allocate memory for lock");
-+		goto no_lock;
-+	}
-+
-+	t->scheduled = 0;
-+	t->t.expires = jiffies;
-+	timer_setup(&t->t, timer_callback, 0);
-+
-+	t->cb = cb;
-+	t->data = data;
-+
-+	return t;
-+
-+ no_lock:
-+	DWC_FREE(t->name);
-+ no_name:
-+	DWC_FREE(t);
-+	return NULL;
-+}
-+
-+void DWC_TIMER_FREE(dwc_timer_t *timer)
-+{
-+	dwc_irqflags_t flags;
-+
-+	DWC_SPINLOCK_IRQSAVE(timer->lock, &flags);
-+
-+	if (timer->scheduled) {
-+		del_timer(&timer->t);
-+		timer->scheduled = 0;
-+	}
-+
-+	DWC_SPINUNLOCK_IRQRESTORE(timer->lock, flags);
-+	DWC_SPINLOCK_FREE(timer->lock);
-+	DWC_FREE(timer->name);
-+	DWC_FREE(timer);
-+}
-+
-+void DWC_TIMER_SCHEDULE(dwc_timer_t *timer, uint32_t time)
-+{
-+	dwc_irqflags_t flags;
-+
-+	DWC_SPINLOCK_IRQSAVE(timer->lock, &flags);
-+
-+	if (!timer->scheduled) {
-+		timer->scheduled = 1;
-+		DWC_DEBUGC("Scheduling timer %s to expire in +%d msec", timer->name, time);
-+		timer->t.expires = jiffies + msecs_to_jiffies(time);
-+		add_timer(&timer->t);
-+	} else {
-+		DWC_DEBUGC("Modifying timer %s to expire in +%d msec", timer->name, time);
-+		mod_timer(&timer->t, jiffies + msecs_to_jiffies(time));
-+	}
-+
-+	DWC_SPINUNLOCK_IRQRESTORE(timer->lock, flags);
-+}
-+
-+void DWC_TIMER_CANCEL(dwc_timer_t *timer)
-+{
-+	del_timer(&timer->t);
-+}
-+
-+
-+/* Wait Queues */
-+
-+struct dwc_waitq {
-+	wait_queue_head_t queue;
-+	int abort;
-+};
-+
-+dwc_waitq_t *DWC_WAITQ_ALLOC(void)
-+{
-+	dwc_waitq_t *wq = DWC_ALLOC(sizeof(*wq));
-+
-+	if (!wq) {
-+		DWC_ERROR("Cannot allocate memory for waitqueue\n");
-+		return NULL;
-+	}
-+
-+	init_waitqueue_head(&wq->queue);
-+	wq->abort = 0;
-+	return wq;
-+}
-+
-+void DWC_WAITQ_FREE(dwc_waitq_t *wq)
-+{
-+	DWC_FREE(wq);
-+}
-+
-+int32_t DWC_WAITQ_WAIT(dwc_waitq_t *wq, dwc_waitq_condition_t cond, void *data)
-+{
-+	int result = wait_event_interruptible(wq->queue,
-+					      cond(data) || wq->abort);
-+	if (result == -ERESTARTSYS) {
-+		wq->abort = 0;
-+		return -DWC_E_RESTART;
-+	}
-+
-+	if (wq->abort == 1) {
-+		wq->abort = 0;
-+		return -DWC_E_ABORT;
-+	}
-+
-+	wq->abort = 0;
-+
-+	if (result == 0) {
-+		return 0;
-+	}
-+
-+	return -DWC_E_UNKNOWN;
-+}
-+
-+int32_t DWC_WAITQ_WAIT_TIMEOUT(dwc_waitq_t *wq, dwc_waitq_condition_t cond,
-+			       void *data, int32_t msecs)
-+{
-+	int32_t tmsecs;
-+	int result = wait_event_interruptible_timeout(wq->queue,
-+						      cond(data) || wq->abort,
-+						      msecs_to_jiffies(msecs));
-+	if (result == -ERESTARTSYS) {
-+		wq->abort = 0;
-+		return -DWC_E_RESTART;
-+	}
-+
-+	if (wq->abort == 1) {
-+		wq->abort = 0;
-+		return -DWC_E_ABORT;
-+	}
-+
-+	wq->abort = 0;
-+
-+	if (result > 0) {
-+		tmsecs = jiffies_to_msecs(result);
-+		if (!tmsecs) {
-+			return 1;
-+		}
-+
-+		return tmsecs;
-+	}
-+
-+	if (result == 0) {
-+		return -DWC_E_TIMEOUT;
-+	}
-+
-+	return -DWC_E_UNKNOWN;
-+}
-+
-+void DWC_WAITQ_TRIGGER(dwc_waitq_t *wq)
-+{
-+	wq->abort = 0;
-+	wake_up_interruptible(&wq->queue);
-+}
-+
-+void DWC_WAITQ_ABORT(dwc_waitq_t *wq)
-+{
-+	wq->abort = 1;
-+	wake_up_interruptible(&wq->queue);
-+}
-+
-+
-+/* Threading */
-+
-+dwc_thread_t *DWC_THREAD_RUN(dwc_thread_function_t func, char *name, void *data)
-+{
-+	struct task_struct *thread = kthread_run(func, data, name);
-+
-+	if (thread == ERR_PTR(-ENOMEM)) {
-+		return NULL;
-+	}
-+
-+	return (dwc_thread_t *)thread;
-+}
-+
-+int DWC_THREAD_STOP(dwc_thread_t *thread)
-+{
-+	return kthread_stop((struct task_struct *)thread);
-+}
-+
-+dwc_bool_t DWC_THREAD_SHOULD_STOP(void)
-+{
-+	return kthread_should_stop();
-+}
-+
-+
-+/* tasklets
-+ - run in interrupt context (cannot sleep)
-+ - each tasklet runs on a single CPU
-+ - different tasklets can be running simultaneously on different CPUs
-+ */
-+struct dwc_tasklet {
-+	struct tasklet_struct t;
-+	dwc_tasklet_callback_t cb;
-+	void *data;
-+};
-+
-+static void tasklet_callback(unsigned long data)
-+{
-+	dwc_tasklet_t *t = (dwc_tasklet_t *)data;
-+	t->cb(t->data);
-+}
-+
-+dwc_tasklet_t *DWC_TASK_ALLOC(char *name, dwc_tasklet_callback_t cb, void *data)
-+{
-+	dwc_tasklet_t *t = DWC_ALLOC(sizeof(*t));
-+
-+	if (t) {
-+		t->cb = cb;
-+		t->data = data;
-+		tasklet_init(&t->t, tasklet_callback, (unsigned long)t);
-+	} else {
-+		DWC_ERROR("Cannot allocate memory for tasklet\n");
-+	}
-+
-+	return t;
-+}
-+
-+void DWC_TASK_FREE(dwc_tasklet_t *task)
-+{
-+	DWC_FREE(task);
-+}
-+
-+void DWC_TASK_SCHEDULE(dwc_tasklet_t *task)
-+{
-+	tasklet_schedule(&task->t);
-+}
-+
-+void DWC_TASK_HI_SCHEDULE(dwc_tasklet_t *task)
-+{
-+	tasklet_hi_schedule(&task->t);
-+}
-+
-+
-+/* workqueues
-+ - run in process context (can sleep)
-+ */
-+typedef struct work_container {
-+	dwc_work_callback_t cb;
-+	void *data;
-+	dwc_workq_t *wq;
-+	char *name;
-+
-+#ifdef DEBUG
-+	DWC_CIRCLEQ_ENTRY(work_container) entry;
-+#endif
-+	struct delayed_work work;
-+} work_container_t;
-+
-+#ifdef DEBUG
-+DWC_CIRCLEQ_HEAD(work_container_queue, work_container);
-+#endif
-+
-+struct dwc_workq {
-+	struct workqueue_struct *wq;
-+	dwc_spinlock_t *lock;
-+	dwc_waitq_t *waitq;
-+	int pending;
-+
-+#ifdef DEBUG
-+	struct work_container_queue entries;
-+#endif
-+};
-+
-+static void do_work(struct work_struct *work)
-+{
-+	dwc_irqflags_t flags;
-+	struct delayed_work *dw = container_of(work, struct delayed_work, work);
-+	work_container_t *container = container_of(dw, struct work_container, work);
-+	dwc_workq_t *wq = container->wq;
-+
-+	container->cb(container->data);
-+
-+#ifdef DEBUG
-+	DWC_CIRCLEQ_REMOVE(&wq->entries, container, entry);
-+#endif
-+	DWC_DEBUGC("Work done: %s, container=%p", container->name, container);
-+	if (container->name) {
-+		DWC_FREE(container->name);
-+	}
-+	DWC_FREE(container);
-+
-+	DWC_SPINLOCK_IRQSAVE(wq->lock, &flags);
-+	wq->pending--;
-+	DWC_SPINUNLOCK_IRQRESTORE(wq->lock, flags);
-+	DWC_WAITQ_TRIGGER(wq->waitq);
-+}
-+
-+static int work_done(void *data)
-+{
-+	dwc_workq_t *workq = (dwc_workq_t *)data;
-+	return workq->pending == 0;
-+}
-+
-+int DWC_WORKQ_WAIT_WORK_DONE(dwc_workq_t *workq, int timeout)
-+{
-+	return DWC_WAITQ_WAIT_TIMEOUT(workq->waitq, work_done, workq, timeout);
-+}
-+
-+dwc_workq_t *DWC_WORKQ_ALLOC(char *name)
-+{
-+	dwc_workq_t *wq = DWC_ALLOC(sizeof(*wq));
-+
-+	if (!wq) {
-+		return NULL;
-+	}
-+
-+	wq->wq = create_singlethread_workqueue(name);
-+	if (!wq->wq) {
-+		goto no_wq;
-+	}
-+
-+	wq->pending = 0;
-+
-+#if (defined(DWC_LINUX) && defined(CONFIG_DEBUG_SPINLOCK))
-+	DWC_SPINLOCK_ALLOC_LINUX_DEBUG(wq->lock);
-+#else
-+	wq->lock = DWC_SPINLOCK_ALLOC();
-+#endif
-+	if (!wq->lock) {
-+		goto no_lock;
-+	}
-+
-+	wq->waitq = DWC_WAITQ_ALLOC();
-+	if (!wq->waitq) {
-+		goto no_waitq;
-+	}
-+
-+#ifdef DEBUG
-+	DWC_CIRCLEQ_INIT(&wq->entries);
-+#endif
-+	return wq;
-+
-+ no_waitq:
-+	DWC_SPINLOCK_FREE(wq->lock);
-+ no_lock:
-+	destroy_workqueue(wq->wq);
-+ no_wq:
-+	DWC_FREE(wq);
-+
-+	return NULL;
-+}
-+
-+void DWC_WORKQ_FREE(dwc_workq_t *wq)
-+{
-+#ifdef DEBUG
-+	if (wq->pending != 0) {
-+		struct work_container *wc;
-+		DWC_ERROR("Destroying work queue with pending work");
-+		DWC_CIRCLEQ_FOREACH(wc, &wq->entries, entry) {
-+			DWC_ERROR("Work %s still pending", wc->name);
-+		}
-+	}
-+#endif
-+	destroy_workqueue(wq->wq);
-+	DWC_SPINLOCK_FREE(wq->lock);
-+	DWC_WAITQ_FREE(wq->waitq);
-+	DWC_FREE(wq);
-+}
-+
-+void DWC_WORKQ_SCHEDULE(dwc_workq_t *wq, dwc_work_callback_t cb, void *data,
-+			char *format, ...)
-+{
-+	dwc_irqflags_t flags;
-+	work_container_t *container;
-+	static char name[128];
-+	va_list args;
-+
-+	va_start(args, format);
-+	DWC_VSNPRINTF(name, 128, format, args);
-+	va_end(args);
-+
-+	DWC_SPINLOCK_IRQSAVE(wq->lock, &flags);
-+	wq->pending++;
-+	DWC_SPINUNLOCK_IRQRESTORE(wq->lock, flags);
-+	DWC_WAITQ_TRIGGER(wq->waitq);
-+
-+	container = DWC_ALLOC_ATOMIC(sizeof(*container));
-+	if (!container) {
-+		DWC_ERROR("Cannot allocate memory for container\n");
-+		return;
-+	}
-+
-+	container->name = DWC_STRDUP(name);
-+	if (!container->name) {
-+		DWC_ERROR("Cannot allocate memory for container->name\n");
-+		DWC_FREE(container);
-+		return;
-+	}
-+
-+	container->cb = cb;
-+	container->data = data;
-+	container->wq = wq;
-+	DWC_DEBUGC("Queueing work: %s, container=%p", container->name, container);
-+	INIT_WORK(&container->work.work, do_work);
-+
-+#ifdef DEBUG
-+	DWC_CIRCLEQ_INSERT_TAIL(&wq->entries, container, entry);
-+#endif
-+	queue_work(wq->wq, &container->work.work);
-+}
-+
-+void DWC_WORKQ_SCHEDULE_DELAYED(dwc_workq_t *wq, dwc_work_callback_t cb,
-+				void *data, uint32_t time, char *format, ...)
-+{
-+	dwc_irqflags_t flags;
-+	work_container_t *container;
-+	static char name[128];
-+	va_list args;
-+
-+	va_start(args, format);
-+	DWC_VSNPRINTF(name, 128, format, args);
-+	va_end(args);
-+
-+	DWC_SPINLOCK_IRQSAVE(wq->lock, &flags);
-+	wq->pending++;
-+	DWC_SPINUNLOCK_IRQRESTORE(wq->lock, flags);
-+	DWC_WAITQ_TRIGGER(wq->waitq);
-+
-+	container = DWC_ALLOC_ATOMIC(sizeof(*container));
-+	if (!container) {
-+		DWC_ERROR("Cannot allocate memory for container\n");
-+		return;
-+	}
-+
-+	container->name = DWC_STRDUP(name);
-+	if (!container->name) {
-+		DWC_ERROR("Cannot allocate memory for container->name\n");
-+		DWC_FREE(container);
-+		return;
-+	}
-+
-+	container->cb = cb;
-+	container->data = data;
-+	container->wq = wq;
-+	DWC_DEBUGC("Queueing work: %s, container=%p", container->name, container);
-+	INIT_DELAYED_WORK(&container->work, do_work);
-+
-+#ifdef DEBUG
-+	DWC_CIRCLEQ_INSERT_TAIL(&wq->entries, container, entry);
-+#endif
-+	queue_delayed_work(wq->wq, &container->work, msecs_to_jiffies(time));
-+}
-+
-+int DWC_WORKQ_PENDING(dwc_workq_t *wq)
-+{
-+	return wq->pending;
-+}
-+
-+
-+#ifdef DWC_LIBMODULE
-+
-+#ifdef DWC_CCLIB
-+/* CC */
-+EXPORT_SYMBOL(dwc_cc_if_alloc);
-+EXPORT_SYMBOL(dwc_cc_if_free);
-+EXPORT_SYMBOL(dwc_cc_clear);
-+EXPORT_SYMBOL(dwc_cc_add);
-+EXPORT_SYMBOL(dwc_cc_remove);
-+EXPORT_SYMBOL(dwc_cc_change);
-+EXPORT_SYMBOL(dwc_cc_data_for_save);
-+EXPORT_SYMBOL(dwc_cc_restore_from_data);
-+EXPORT_SYMBOL(dwc_cc_match_chid);
-+EXPORT_SYMBOL(dwc_cc_match_cdid);
-+EXPORT_SYMBOL(dwc_cc_ck);
-+EXPORT_SYMBOL(dwc_cc_chid);
-+EXPORT_SYMBOL(dwc_cc_cdid);
-+EXPORT_SYMBOL(dwc_cc_name);
-+#endif	/* DWC_CCLIB */
-+
-+#ifdef DWC_CRYPTOLIB
-+# ifndef CONFIG_MACH_IPMATE
-+/* Modpow */
-+EXPORT_SYMBOL(dwc_modpow);
-+
-+/* DH */
-+EXPORT_SYMBOL(dwc_dh_modpow);
-+EXPORT_SYMBOL(dwc_dh_derive_keys);
-+EXPORT_SYMBOL(dwc_dh_pk);
-+# endif	/* CONFIG_MACH_IPMATE */
-+
-+/* Crypto */
-+EXPORT_SYMBOL(dwc_wusb_aes_encrypt);
-+EXPORT_SYMBOL(dwc_wusb_cmf);
-+EXPORT_SYMBOL(dwc_wusb_prf);
-+EXPORT_SYMBOL(dwc_wusb_fill_ccm_nonce);
-+EXPORT_SYMBOL(dwc_wusb_gen_nonce);
-+EXPORT_SYMBOL(dwc_wusb_gen_key);
-+EXPORT_SYMBOL(dwc_wusb_gen_mic);
-+#endif	/* DWC_CRYPTOLIB */
-+
-+/* Notification */
-+#ifdef DWC_NOTIFYLIB
-+EXPORT_SYMBOL(dwc_alloc_notification_manager);
-+EXPORT_SYMBOL(dwc_free_notification_manager);
-+EXPORT_SYMBOL(dwc_register_notifier);
-+EXPORT_SYMBOL(dwc_unregister_notifier);
-+EXPORT_SYMBOL(dwc_add_observer);
-+EXPORT_SYMBOL(dwc_remove_observer);
-+EXPORT_SYMBOL(dwc_notify);
-+#endif
-+
-+/* Memory Debugging Routines */
-+#ifdef DWC_DEBUG_MEMORY
-+EXPORT_SYMBOL(dwc_alloc_debug);
-+EXPORT_SYMBOL(dwc_alloc_atomic_debug);
-+EXPORT_SYMBOL(dwc_free_debug);
-+EXPORT_SYMBOL(dwc_dma_alloc_debug);
-+EXPORT_SYMBOL(dwc_dma_free_debug);
-+#endif
-+
-+EXPORT_SYMBOL(DWC_MEMSET);
-+EXPORT_SYMBOL(DWC_MEMCPY);
-+EXPORT_SYMBOL(DWC_MEMMOVE);
-+EXPORT_SYMBOL(DWC_MEMCMP);
-+EXPORT_SYMBOL(DWC_STRNCMP);
-+EXPORT_SYMBOL(DWC_STRCMP);
-+EXPORT_SYMBOL(DWC_STRLEN);
-+EXPORT_SYMBOL(DWC_STRCPY);
-+EXPORT_SYMBOL(DWC_STRDUP);
-+EXPORT_SYMBOL(DWC_ATOI);
-+EXPORT_SYMBOL(DWC_ATOUI);
-+
-+#ifdef DWC_UTFLIB
-+EXPORT_SYMBOL(DWC_UTF8_TO_UTF16LE);
-+#endif	/* DWC_UTFLIB */
-+
-+EXPORT_SYMBOL(DWC_IN_IRQ);
-+EXPORT_SYMBOL(DWC_IN_BH);
-+EXPORT_SYMBOL(DWC_VPRINTF);
-+EXPORT_SYMBOL(DWC_VSNPRINTF);
-+EXPORT_SYMBOL(DWC_PRINTF);
-+EXPORT_SYMBOL(DWC_SPRINTF);
-+EXPORT_SYMBOL(DWC_SNPRINTF);
-+EXPORT_SYMBOL(__DWC_WARN);
-+EXPORT_SYMBOL(__DWC_ERROR);
-+EXPORT_SYMBOL(DWC_EXCEPTION);
-+
-+#ifdef DEBUG
-+EXPORT_SYMBOL(__DWC_DEBUG);
-+#endif
-+
-+EXPORT_SYMBOL(__DWC_DMA_ALLOC);
-+EXPORT_SYMBOL(__DWC_DMA_ALLOC_ATOMIC);
-+EXPORT_SYMBOL(__DWC_DMA_FREE);
-+EXPORT_SYMBOL(__DWC_ALLOC);
-+EXPORT_SYMBOL(__DWC_ALLOC_ATOMIC);
-+EXPORT_SYMBOL(__DWC_FREE);
-+
-+#ifdef DWC_CRYPTOLIB
-+EXPORT_SYMBOL(DWC_RANDOM_BYTES);
-+EXPORT_SYMBOL(DWC_AES_CBC);
-+EXPORT_SYMBOL(DWC_SHA256);
-+EXPORT_SYMBOL(DWC_HMAC_SHA256);
-+#endif
-+
-+EXPORT_SYMBOL(DWC_CPU_TO_LE32);
-+EXPORT_SYMBOL(DWC_CPU_TO_BE32);
-+EXPORT_SYMBOL(DWC_LE32_TO_CPU);
-+EXPORT_SYMBOL(DWC_BE32_TO_CPU);
-+EXPORT_SYMBOL(DWC_CPU_TO_LE16);
-+EXPORT_SYMBOL(DWC_CPU_TO_BE16);
-+EXPORT_SYMBOL(DWC_LE16_TO_CPU);
-+EXPORT_SYMBOL(DWC_BE16_TO_CPU);
-+EXPORT_SYMBOL(DWC_READ_REG32);
-+EXPORT_SYMBOL(DWC_WRITE_REG32);
-+EXPORT_SYMBOL(DWC_MODIFY_REG32);
-+
-+#if 0
-+EXPORT_SYMBOL(DWC_READ_REG64);
-+EXPORT_SYMBOL(DWC_WRITE_REG64);
-+EXPORT_SYMBOL(DWC_MODIFY_REG64);
-+#endif
-+
-+EXPORT_SYMBOL(DWC_SPINLOCK_ALLOC);
-+EXPORT_SYMBOL(DWC_SPINLOCK_FREE);
-+EXPORT_SYMBOL(DWC_SPINLOCK);
-+EXPORT_SYMBOL(DWC_SPINUNLOCK);
-+EXPORT_SYMBOL(DWC_SPINLOCK_IRQSAVE);
-+EXPORT_SYMBOL(DWC_SPINUNLOCK_IRQRESTORE);
-+EXPORT_SYMBOL(DWC_MUTEX_ALLOC);
-+
-+#if (!defined(DWC_LINUX) || !defined(CONFIG_DEBUG_MUTEXES))
-+EXPORT_SYMBOL(DWC_MUTEX_FREE);
-+#endif
-+
-+EXPORT_SYMBOL(DWC_MUTEX_LOCK);
-+EXPORT_SYMBOL(DWC_MUTEX_TRYLOCK);
-+EXPORT_SYMBOL(DWC_MUTEX_UNLOCK);
-+EXPORT_SYMBOL(DWC_UDELAY);
-+EXPORT_SYMBOL(DWC_MDELAY);
-+EXPORT_SYMBOL(DWC_MSLEEP);
-+EXPORT_SYMBOL(DWC_TIME);
-+EXPORT_SYMBOL(DWC_TIMER_ALLOC);
-+EXPORT_SYMBOL(DWC_TIMER_FREE);
-+EXPORT_SYMBOL(DWC_TIMER_SCHEDULE);
-+EXPORT_SYMBOL(DWC_TIMER_CANCEL);
-+EXPORT_SYMBOL(DWC_WAITQ_ALLOC);
-+EXPORT_SYMBOL(DWC_WAITQ_FREE);
-+EXPORT_SYMBOL(DWC_WAITQ_WAIT);
-+EXPORT_SYMBOL(DWC_WAITQ_WAIT_TIMEOUT);
-+EXPORT_SYMBOL(DWC_WAITQ_TRIGGER);
-+EXPORT_SYMBOL(DWC_WAITQ_ABORT);
-+EXPORT_SYMBOL(DWC_THREAD_RUN);
-+EXPORT_SYMBOL(DWC_THREAD_STOP);
-+EXPORT_SYMBOL(DWC_THREAD_SHOULD_STOP);
-+EXPORT_SYMBOL(DWC_TASK_ALLOC);
-+EXPORT_SYMBOL(DWC_TASK_FREE);
-+EXPORT_SYMBOL(DWC_TASK_SCHEDULE);
-+EXPORT_SYMBOL(DWC_WORKQ_WAIT_WORK_DONE);
-+EXPORT_SYMBOL(DWC_WORKQ_ALLOC);
-+EXPORT_SYMBOL(DWC_WORKQ_FREE);
-+EXPORT_SYMBOL(DWC_WORKQ_SCHEDULE);
-+EXPORT_SYMBOL(DWC_WORKQ_SCHEDULE_DELAYED);
-+EXPORT_SYMBOL(DWC_WORKQ_PENDING);
-+
-+static int dwc_common_port_init_module(void)
-+{
-+	int result = 0;
-+
-+	printk(KERN_DEBUG "Module dwc_common_port init\n" );
-+
-+#ifdef DWC_DEBUG_MEMORY
-+	result = dwc_memory_debug_start(NULL);
-+	if (result) {
-+		printk(KERN_ERR
-+		       "dwc_memory_debug_start() failed with error %d\n",
-+		       result);
-+		return result;
-+	}
-+#endif
-+
-+#ifdef DWC_NOTIFYLIB
-+	result = dwc_alloc_notification_manager(NULL, NULL);
-+	if (result) {
-+		printk(KERN_ERR
-+		       "dwc_alloc_notification_manager() failed with error %d\n",
-+		       result);
-+		return result;
-+	}
-+#endif
-+	return result;
-+}
-+
-+static void dwc_common_port_exit_module(void)
-+{
-+	printk(KERN_DEBUG "Module dwc_common_port exit\n" );
-+
-+#ifdef DWC_NOTIFYLIB
-+	dwc_free_notification_manager();
-+#endif
-+
-+#ifdef DWC_DEBUG_MEMORY
-+	dwc_memory_debug_stop();
-+#endif
-+}
-+
-+module_init(dwc_common_port_init_module);
-+module_exit(dwc_common_port_exit_module);
-+
-+MODULE_DESCRIPTION("DWC Common Library - Portable version");
-+MODULE_AUTHOR("Synopsys Inc.");
-+MODULE_LICENSE ("GPL");
-+
-+#endif	/* DWC_LIBMODULE */
---- /dev/null
-+++ b/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c
-@@ -0,0 +1,1275 @@
-+#include "dwc_os.h"
-+#include "dwc_list.h"
-+
-+#ifdef DWC_CCLIB
-+# include "dwc_cc.h"
-+#endif
-+
-+#ifdef DWC_CRYPTOLIB
-+# include "dwc_modpow.h"
-+# include "dwc_dh.h"
-+# include "dwc_crypto.h"
-+#endif
-+
-+#ifdef DWC_NOTIFYLIB
-+# include "dwc_notifier.h"
-+#endif
-+
-+/* OS-Level Implementations */
-+
-+/* This is the NetBSD 4.0.1 kernel implementation of the DWC platform library. */
-+
-+
-+/* MISC */
-+
-+void *DWC_MEMSET(void *dest, uint8_t byte, uint32_t size)
-+{
-+	return memset(dest, byte, size);
-+}
-+
-+void *DWC_MEMCPY(void *dest, void const *src, uint32_t size)
-+{
-+	return memcpy(dest, src, size);
-+}
-+
-+void *DWC_MEMMOVE(void *dest, void *src, uint32_t size)
-+{
-+	bcopy(src, dest, size);
-+	return dest;
-+}
-+
-+int DWC_MEMCMP(void *m1, void *m2, uint32_t size)
-+{
-+	return memcmp(m1, m2, size);
-+}
-+
-+int DWC_STRNCMP(void *s1, void *s2, uint32_t size)
-+{
-+	return strncmp(s1, s2, size);
-+}
-+
-+int DWC_STRCMP(void *s1, void *s2)
-+{
-+	return strcmp(s1, s2);
-+}
-+
-+int DWC_STRLEN(char const *str)
-+{
-+	return strlen(str);
-+}
-+
-+char *DWC_STRCPY(char *to, char const *from)
-+{
-+	return strcpy(to, from);
-+}
-+
-+char *DWC_STRDUP(char const *str)
-+{
-+	int len = DWC_STRLEN(str) + 1;
-+	char *new = DWC_ALLOC_ATOMIC(len);
-+
-+	if (!new) {
-+		return NULL;
-+	}
-+
-+	DWC_MEMCPY(new, str, len);
-+	return new;
-+}
-+
-+int DWC_ATOI(char *str, int32_t *value)
-+{
-+	char *end = NULL;
-+
-+	/* NetBSD doesn't have 'strtol' in the kernel, but 'strtoul'
-+	 * should be equivalent on 2's complement machines
-+	 */
-+	*value = strtoul(str, &end, 0);
-+	if (*end == '\0') {
-+		return 0;
-+	}
-+
-+	return -1;
-+}
-+
-+int DWC_ATOUI(char *str, uint32_t *value)
-+{
-+	char *end = NULL;
-+
-+	*value = strtoul(str, &end, 0);
-+	if (*end == '\0') {
-+		return 0;
-+	}
-+
-+	return -1;
-+}
-+
-+
-+#ifdef DWC_UTFLIB
-+/* From usbstring.c */
-+
-+int DWC_UTF8_TO_UTF16LE(uint8_t const *s, uint16_t *cp, unsigned len)
-+{
-+	int	count = 0;
-+	u8	c;
-+	u16	uchar;
-+
-+	/* this insists on correct encodings, though not minimal ones.
-+	 * BUT it currently rejects legit 4-byte UTF-8 code points,
-+	 * which need surrogate pairs.  (Unicode 3.1 can use them.)
-+	 */
-+	while (len != 0 && (c = (u8) *s++) != 0) {
-+		if (unlikely(c & 0x80)) {
-+			// 2-byte sequence:
-+			// 00000yyyyyxxxxxx = 110yyyyy 10xxxxxx
-+			if ((c & 0xe0) == 0xc0) {
-+				uchar = (c & 0x1f) << 6;
-+
-+				c = (u8) *s++;
-+				if ((c & 0xc0) != 0xc0)
-+					goto fail;
-+				c &= 0x3f;
-+				uchar |= c;
-+
-+			// 3-byte sequence (most CJKV characters):
-+			// zzzzyyyyyyxxxxxx = 1110zzzz 10yyyyyy 10xxxxxx
-+			} else if ((c & 0xf0) == 0xe0) {
-+				uchar = (c & 0x0f) << 12;
-+
-+				c = (u8) *s++;
-+				if ((c & 0xc0) != 0xc0)
-+					goto fail;
-+				c &= 0x3f;
-+				uchar |= c << 6;
-+
-+				c = (u8) *s++;
-+				if ((c & 0xc0) != 0xc0)
-+					goto fail;
-+				c &= 0x3f;
-+				uchar |= c;
-+
-+				/* no bogus surrogates */
-+				if (0xd800 <= uchar && uchar <= 0xdfff)
-+					goto fail;
-+
-+			// 4-byte sequence (surrogate pairs, currently rare):
-+			// 11101110wwwwzzzzyy + 110111yyyyxxxxxx
-+			//     = 11110uuu 10uuzzzz 10yyyyyy 10xxxxxx
-+			// (uuuuu = wwww + 1)
-+			// FIXME accept the surrogate code points (only)
-+			} else
-+				goto fail;
-+		} else
-+			uchar = c;
-+		put_unaligned (cpu_to_le16 (uchar), cp++);
-+		count++;
-+		len--;
-+	}
-+	return count;
-+fail:
-+	return -1;
-+}
-+
-+#endif	/* DWC_UTFLIB */
-+
-+
-+/* dwc_debug.h */
-+
-+dwc_bool_t DWC_IN_IRQ(void)
-+{
-+//	return in_irq();
-+	return 0;
-+}
-+
-+dwc_bool_t DWC_IN_BH(void)
-+{
-+//	return in_softirq();
-+	return 0;
-+}
-+
-+void DWC_VPRINTF(char *format, va_list args)
-+{
-+	vprintf(format, args);
-+}
-+
-+int DWC_VSNPRINTF(char *str, int size, char *format, va_list args)
-+{
-+	return vsnprintf(str, size, format, args);
-+}
-+
-+void DWC_PRINTF(char *format, ...)
-+{
-+	va_list args;
-+
-+	va_start(args, format);
-+	DWC_VPRINTF(format, args);
-+	va_end(args);
-+}
-+
-+int DWC_SPRINTF(char *buffer, char *format, ...)
-+{
-+	int retval;
-+	va_list args;
-+
-+	va_start(args, format);
-+	retval = vsprintf(buffer, format, args);
-+	va_end(args);
-+	return retval;
-+}
-+
-+int DWC_SNPRINTF(char *buffer, int size, char *format, ...)
-+{
-+	int retval;
-+	va_list args;
-+
-+	va_start(args, format);
-+	retval = vsnprintf(buffer, size, format, args);
-+	va_end(args);
-+	return retval;
-+}
-+
-+void __DWC_WARN(char *format, ...)
-+{
-+	va_list args;
-+
-+	va_start(args, format);
-+	DWC_VPRINTF(format, args);
-+	va_end(args);
-+}
-+
-+void __DWC_ERROR(char *format, ...)
-+{
-+	va_list args;
-+
-+	va_start(args, format);
-+	DWC_VPRINTF(format, args);
-+	va_end(args);
-+}
-+
-+void DWC_EXCEPTION(char *format, ...)
-+{
-+	va_list args;
-+
-+	va_start(args, format);
-+	DWC_VPRINTF(format, args);
-+	va_end(args);
-+//	BUG_ON(1);	???
-+}
-+
-+#ifdef DEBUG
-+void __DWC_DEBUG(char *format, ...)
-+{
-+	va_list args;
-+
-+	va_start(args, format);
-+	DWC_VPRINTF(format, args);
-+	va_end(args);
-+}
-+#endif
-+
-+
-+/* dwc_mem.h */
-+
-+#if 0
-+dwc_pool_t *DWC_DMA_POOL_CREATE(uint32_t size,
-+				uint32_t align,
-+				uint32_t alloc)
-+{
-+	struct dma_pool *pool = dma_pool_create("Pool", NULL,
-+						size, align, alloc);
-+	return (dwc_pool_t *)pool;
-+}
-+
-+void DWC_DMA_POOL_DESTROY(dwc_pool_t *pool)
-+{
-+	dma_pool_destroy((struct dma_pool *)pool);
-+}
-+
-+void *DWC_DMA_POOL_ALLOC(dwc_pool_t *pool, uint64_t *dma_addr)
-+{
-+//	return dma_pool_alloc((struct dma_pool *)pool, GFP_KERNEL, dma_addr);
-+	return dma_pool_alloc((struct dma_pool *)pool, M_WAITOK, dma_addr);
-+}
-+
-+void *DWC_DMA_POOL_ZALLOC(dwc_pool_t *pool, uint64_t *dma_addr)
-+{
-+	void *vaddr = DWC_DMA_POOL_ALLOC(pool, dma_addr);
-+	memset(..);
-+}
-+
-+void DWC_DMA_POOL_FREE(dwc_pool_t *pool, void *vaddr, void *daddr)
-+{
-+	dma_pool_free(pool, vaddr, daddr);
-+}
-+#endif
-+
-+void *__DWC_DMA_ALLOC(void *dma_ctx, uint32_t size, dwc_dma_t *dma_addr)
-+{
-+	dwc_dmactx_t *dma = (dwc_dmactx_t *)dma_ctx;
-+	int error;
-+
-+	error = bus_dmamem_alloc(dma->dma_tag, size, 1, size, dma->segs,
-+				 sizeof(dma->segs) / sizeof(dma->segs[0]),
-+				 &dma->nsegs, BUS_DMA_NOWAIT);
-+	if (error) {
-+		printf("%s: bus_dmamem_alloc(%ju) failed: %d\n", __func__,
-+		       (uintmax_t)size, error);
-+		goto fail_0;
-+	}
-+
-+	error = bus_dmamem_map(dma->dma_tag, dma->segs, dma->nsegs, size,
-+			       (caddr_t *)&dma->dma_vaddr,
-+			       BUS_DMA_NOWAIT | BUS_DMA_COHERENT);
-+	if (error) {
-+		printf("%s: bus_dmamem_map failed: %d\n", __func__, error);
-+		goto fail_1;
-+	}
-+
-+	error = bus_dmamap_create(dma->dma_tag, size, 1, size, 0,
-+				  BUS_DMA_NOWAIT, &dma->dma_map);
-+	if (error) {
-+		printf("%s: bus_dmamap_create failed: %d\n", __func__, error);
-+		goto fail_2;
-+	}
-+
-+	error = bus_dmamap_load(dma->dma_tag, dma->dma_map, dma->dma_vaddr,
-+				size, NULL, BUS_DMA_NOWAIT);
-+	if (error) {
-+		printf("%s: bus_dmamap_load failed: %d\n", __func__, error);
-+		goto fail_3;
-+	}
-+
-+	dma->dma_paddr = (bus_addr_t)dma->segs[0].ds_addr;
-+	*dma_addr = dma->dma_paddr;
-+	return dma->dma_vaddr;
-+
-+fail_3:
-+	bus_dmamap_destroy(dma->dma_tag, dma->dma_map);
-+fail_2:
-+	bus_dmamem_unmap(dma->dma_tag, dma->dma_vaddr, size);
-+fail_1:
-+	bus_dmamem_free(dma->dma_tag, dma->segs, dma->nsegs);
-+fail_0:
-+	dma->dma_map = NULL;
-+	dma->dma_vaddr = NULL;
-+	dma->nsegs = 0;
-+
-+	return NULL;
-+}
-+
-+void __DWC_DMA_FREE(void *dma_ctx, uint32_t size, void *virt_addr, dwc_dma_t dma_addr)
-+{
-+	dwc_dmactx_t *dma = (dwc_dmactx_t *)dma_ctx;
-+
-+	if (dma->dma_map != NULL) {
-+		bus_dmamap_sync(dma->dma_tag, dma->dma_map, 0, size,
-+				BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
-+		bus_dmamap_unload(dma->dma_tag, dma->dma_map);
-+		bus_dmamap_destroy(dma->dma_tag, dma->dma_map);
-+		bus_dmamem_unmap(dma->dma_tag, dma->dma_vaddr, size);
-+		bus_dmamem_free(dma->dma_tag, dma->segs, dma->nsegs);
-+		dma->dma_paddr = 0;
-+		dma->dma_map = NULL;
-+		dma->dma_vaddr = NULL;
-+		dma->nsegs = 0;
-+	}
-+}
-+
-+void *__DWC_ALLOC(void *mem_ctx, uint32_t size)
-+{
-+	return malloc(size, M_DEVBUF, M_WAITOK | M_ZERO);
-+}
-+
-+void *__DWC_ALLOC_ATOMIC(void *mem_ctx, uint32_t size)
-+{
-+	return malloc(size, M_DEVBUF, M_NOWAIT | M_ZERO);
-+}
-+
-+void __DWC_FREE(void *mem_ctx, void *addr)
-+{
-+	free(addr, M_DEVBUF);
-+}
-+
-+
-+#ifdef DWC_CRYPTOLIB
-+/* dwc_crypto.h */
-+
-+void DWC_RANDOM_BYTES(uint8_t *buffer, uint32_t length)
-+{
-+	get_random_bytes(buffer, length);
-+}
-+
-+int DWC_AES_CBC(uint8_t *message, uint32_t messagelen, uint8_t *key, uint32_t keylen, uint8_t iv[16], uint8_t *out)
-+{
-+	struct crypto_blkcipher *tfm;
-+	struct blkcipher_desc desc;
-+	struct scatterlist sgd;
-+	struct scatterlist sgs;
-+
-+	tfm = crypto_alloc_blkcipher("cbc(aes)", 0, CRYPTO_ALG_ASYNC);
-+	if (tfm == NULL) {
-+		printk("failed to load transform for aes CBC\n");
-+		return -1;
-+	}
-+
-+	crypto_blkcipher_setkey(tfm, key, keylen);
-+	crypto_blkcipher_set_iv(tfm, iv, 16);
-+
-+	sg_init_one(&sgd, out, messagelen);
-+	sg_init_one(&sgs, message, messagelen);
-+
-+	desc.tfm = tfm;
-+	desc.flags = 0;
-+
-+	if (crypto_blkcipher_encrypt(&desc, &sgd, &sgs, messagelen)) {
-+		crypto_free_blkcipher(tfm);
-+		DWC_ERROR("AES CBC encryption failed");
-+		return -1;
-+	}
-+
-+	crypto_free_blkcipher(tfm);
-+	return 0;
-+}
-+
-+int DWC_SHA256(uint8_t *message, uint32_t len, uint8_t *out)
-+{
-+	struct crypto_hash *tfm;
-+	struct hash_desc desc;
-+	struct scatterlist sg;
-+
-+	tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
-+	if (IS_ERR(tfm)) {
-+		DWC_ERROR("Failed to load transform for sha256: %ld", PTR_ERR(tfm));
-+		return 0;
-+	}
-+	desc.tfm = tfm;
-+	desc.flags = 0;
-+
-+	sg_init_one(&sg, message, len);
-+	crypto_hash_digest(&desc, &sg, len, out);
-+	crypto_free_hash(tfm);
-+
-+	return 1;
-+}
-+
-+int DWC_HMAC_SHA256(uint8_t *message, uint32_t messagelen,
-+		    uint8_t *key, uint32_t keylen, uint8_t *out)
-+{
-+	struct crypto_hash *tfm;
-+	struct hash_desc desc;
-+	struct scatterlist sg;
-+
-+	tfm = crypto_alloc_hash("hmac(sha256)", 0, CRYPTO_ALG_ASYNC);
-+	if (IS_ERR(tfm)) {
-+		DWC_ERROR("Failed to load transform for hmac(sha256): %ld", PTR_ERR(tfm));
-+		return 0;
-+	}
-+	desc.tfm = tfm;
-+	desc.flags = 0;
-+
-+	sg_init_one(&sg, message, messagelen);
-+	crypto_hash_setkey(tfm, key, keylen);
-+	crypto_hash_digest(&desc, &sg, messagelen, out);
-+	crypto_free_hash(tfm);
-+
-+	return 1;
-+}
-+
-+#endif	/* DWC_CRYPTOLIB */
-+
-+
-+/* Byte Ordering Conversions */
-+
-+uint32_t DWC_CPU_TO_LE32(uint32_t *p)
-+{
-+#ifdef __LITTLE_ENDIAN
-+	return *p;
-+#else
-+	uint8_t *u_p = (uint8_t *)p;
-+
-+	return (u_p[3] | (u_p[2] << 8) | (u_p[1] << 16) | (u_p[0] << 24));
-+#endif
-+}
-+
-+uint32_t DWC_CPU_TO_BE32(uint32_t *p)
-+{
-+#ifdef __BIG_ENDIAN
-+	return *p;
-+#else
-+	uint8_t *u_p = (uint8_t *)p;
-+
-+	return (u_p[3] | (u_p[2] << 8) | (u_p[1] << 16) | (u_p[0] << 24));
-+#endif
-+}
-+
-+uint32_t DWC_LE32_TO_CPU(uint32_t *p)
-+{
-+#ifdef __LITTLE_ENDIAN
-+	return *p;
-+#else
-+	uint8_t *u_p = (uint8_t *)p;
-+
-+	return (u_p[3] | (u_p[2] << 8) | (u_p[1] << 16) | (u_p[0] << 24));
-+#endif
-+}
-+
-+uint32_t DWC_BE32_TO_CPU(uint32_t *p)
-+{
-+#ifdef __BIG_ENDIAN
-+	return *p;
-+#else
-+	uint8_t *u_p = (uint8_t *)p;
-+
-+	return (u_p[3] | (u_p[2] << 8) | (u_p[1] << 16) | (u_p[0] << 24));
-+#endif
-+}
-+
-+uint16_t DWC_CPU_TO_LE16(uint16_t *p)
-+{
-+#ifdef __LITTLE_ENDIAN
-+	return *p;
-+#else
-+	uint8_t *u_p = (uint8_t *)p;
-+	return (u_p[1] | (u_p[0] << 8));
-+#endif
-+}
-+
-+uint16_t DWC_CPU_TO_BE16(uint16_t *p)
-+{
-+#ifdef __BIG_ENDIAN
-+	return *p;
-+#else
-+	uint8_t *u_p = (uint8_t *)p;
-+	return (u_p[1] | (u_p[0] << 8));
-+#endif
-+}
-+
-+uint16_t DWC_LE16_TO_CPU(uint16_t *p)
-+{
-+#ifdef __LITTLE_ENDIAN
-+	return *p;
-+#else
-+	uint8_t *u_p = (uint8_t *)p;
-+	return (u_p[1] | (u_p[0] << 8));
-+#endif
-+}
-+
-+uint16_t DWC_BE16_TO_CPU(uint16_t *p)
-+{
-+#ifdef __BIG_ENDIAN
-+	return *p;
-+#else
-+	uint8_t *u_p = (uint8_t *)p;
-+	return (u_p[1] | (u_p[0] << 8));
-+#endif
-+}
-+
-+
-+/* Registers */
-+
-+uint32_t DWC_READ_REG32(void *io_ctx, uint32_t volatile *reg)
-+{
-+	dwc_ioctx_t *io = (dwc_ioctx_t *)io_ctx;
-+	bus_size_t ior = (bus_size_t)reg;
-+
-+	return bus_space_read_4(io->iot, io->ioh, ior);
-+}
-+
-+#if 0
-+uint64_t DWC_READ_REG64(void *io_ctx, uint64_t volatile *reg)
-+{
-+	dwc_ioctx_t *io = (dwc_ioctx_t *)io_ctx;
-+	bus_size_t ior = (bus_size_t)reg;
-+
-+	return bus_space_read_8(io->iot, io->ioh, ior);
-+}
-+#endif
-+
-+void DWC_WRITE_REG32(void *io_ctx, uint32_t volatile *reg, uint32_t value)
-+{
-+	dwc_ioctx_t *io = (dwc_ioctx_t *)io_ctx;
-+	bus_size_t ior = (bus_size_t)reg;
-+
-+	bus_space_write_4(io->iot, io->ioh, ior, value);
-+}
-+
-+#if 0
-+void DWC_WRITE_REG64(void *io_ctx, uint64_t volatile *reg, uint64_t value)
-+{
-+	dwc_ioctx_t *io = (dwc_ioctx_t *)io_ctx;
-+	bus_size_t ior = (bus_size_t)reg;
-+
-+	bus_space_write_8(io->iot, io->ioh, ior, value);
-+}
-+#endif
-+
-+void DWC_MODIFY_REG32(void *io_ctx, uint32_t volatile *reg, uint32_t clear_mask,
-+		      uint32_t set_mask)
-+{
-+	dwc_ioctx_t *io = (dwc_ioctx_t *)io_ctx;
-+	bus_size_t ior = (bus_size_t)reg;
-+
-+	bus_space_write_4(io->iot, io->ioh, ior,
-+			  (bus_space_read_4(io->iot, io->ioh, ior) &
-+			   ~clear_mask) | set_mask);
-+}
-+
-+#if 0
-+void DWC_MODIFY_REG64(void *io_ctx, uint64_t volatile *reg, uint64_t clear_mask,
-+		      uint64_t set_mask)
-+{
-+	dwc_ioctx_t *io = (dwc_ioctx_t *)io_ctx;
-+	bus_size_t ior = (bus_size_t)reg;
-+
-+	bus_space_write_8(io->iot, io->ioh, ior,
-+			  (bus_space_read_8(io->iot, io->ioh, ior) &
-+			   ~clear_mask) | set_mask);
-+}
-+#endif
-+
-+
-+/* Locking */
-+
-+dwc_spinlock_t *DWC_SPINLOCK_ALLOC(void)
-+{
-+	struct simplelock *sl = DWC_ALLOC(sizeof(*sl));
-+
-+	if (!sl) {
-+		DWC_ERROR("Cannot allocate memory for spinlock");
-+		return NULL;
-+	}
-+
-+	simple_lock_init(sl);
-+	return (dwc_spinlock_t *)sl;
-+}
-+
-+void DWC_SPINLOCK_FREE(dwc_spinlock_t *lock)
-+{
-+	struct simplelock *sl = (struct simplelock *)lock;
-+
-+	DWC_FREE(sl);
-+}
-+
-+void DWC_SPINLOCK(dwc_spinlock_t *lock)
-+{
-+	simple_lock((struct simplelock *)lock);
-+}
-+
-+void DWC_SPINUNLOCK(dwc_spinlock_t *lock)
-+{
-+	simple_unlock((struct simplelock *)lock);
-+}
-+
-+void DWC_SPINLOCK_IRQSAVE(dwc_spinlock_t *lock, dwc_irqflags_t *flags)
-+{
-+	simple_lock((struct simplelock *)lock);
-+	*flags = splbio();
-+}
-+
-+void DWC_SPINUNLOCK_IRQRESTORE(dwc_spinlock_t *lock, dwc_irqflags_t flags)
-+{
-+	splx(flags);
-+	simple_unlock((struct simplelock *)lock);
-+}
-+
-+dwc_mutex_t *DWC_MUTEX_ALLOC(void)
-+{
-+	dwc_mutex_t *mutex = DWC_ALLOC(sizeof(struct lock));
-+
-+	if (!mutex) {
-+		DWC_ERROR("Cannot allocate memory for mutex");
-+		return NULL;
-+	}
-+
-+	lockinit((struct lock *)mutex, 0, "dw3mtx", 0, 0);
-+	return mutex;
-+}
-+
-+#if (defined(DWC_LINUX) && defined(CONFIG_DEBUG_MUTEXES))
-+#else
-+void DWC_MUTEX_FREE(dwc_mutex_t *mutex)
-+{
-+	DWC_FREE(mutex);
-+}
-+#endif
-+
-+void DWC_MUTEX_LOCK(dwc_mutex_t *mutex)
-+{
-+	lockmgr((struct lock *)mutex, LK_EXCLUSIVE, NULL);
-+}
-+
-+int DWC_MUTEX_TRYLOCK(dwc_mutex_t *mutex)
-+{
-+	int status;
-+
-+	status = lockmgr((struct lock *)mutex, LK_EXCLUSIVE | LK_NOWAIT, NULL);
-+	return status == 0;
-+}
-+
-+void DWC_MUTEX_UNLOCK(dwc_mutex_t *mutex)
-+{
-+	lockmgr((struct lock *)mutex, LK_RELEASE, NULL);
-+}
-+
-+
-+/* Timing */
-+
-+void DWC_UDELAY(uint32_t usecs)
-+{
-+	DELAY(usecs);
-+}
-+
-+void DWC_MDELAY(uint32_t msecs)
-+{
-+	do {
-+		DELAY(1000);
-+	} while (--msecs);
-+}
-+
-+void DWC_MSLEEP(uint32_t msecs)
-+{
-+	struct timeval tv;
-+
-+	tv.tv_sec = msecs / 1000;
-+	tv.tv_usec = (msecs - tv.tv_sec * 1000) * 1000;
-+	tsleep(&tv, 0, "dw3slp", tvtohz(&tv));
-+}
-+
-+uint32_t DWC_TIME(void)
-+{
-+	struct timeval tv;
-+
-+	microuptime(&tv);	// or getmicrouptime? (less precise, but faster)
-+	return tv.tv_sec * 1000 + tv.tv_usec / 1000;
-+}
-+
-+
-+/* Timers */
-+
-+struct dwc_timer {
-+	struct callout t;
-+	char *name;
-+	dwc_spinlock_t *lock;
-+	dwc_timer_callback_t cb;
-+	void *data;
-+};
-+
-+dwc_timer_t *DWC_TIMER_ALLOC(char *name, dwc_timer_callback_t cb, void *data)
-+{
-+	dwc_timer_t *t = DWC_ALLOC(sizeof(*t));
-+
-+	if (!t) {
-+		DWC_ERROR("Cannot allocate memory for timer");
-+		return NULL;
-+	}
-+
-+	callout_init(&t->t);
-+
-+	t->name = DWC_STRDUP(name);
-+	if (!t->name) {
-+		DWC_ERROR("Cannot allocate memory for timer->name");
-+		goto no_name;
-+	}
-+
-+	t->lock = DWC_SPINLOCK_ALLOC();
-+	if (!t->lock) {
-+		DWC_ERROR("Cannot allocate memory for timer->lock");
-+		goto no_lock;
-+	}
-+
-+	t->cb = cb;
-+	t->data = data;
-+
-+	return t;
-+
-+ no_lock:
-+	DWC_FREE(t->name);
-+ no_name:
-+	DWC_FREE(t);
-+
-+	return NULL;
-+}
-+
-+void DWC_TIMER_FREE(dwc_timer_t *timer)
-+{
-+	callout_stop(&timer->t);
-+	DWC_SPINLOCK_FREE(timer->lock);
-+	DWC_FREE(timer->name);
-+	DWC_FREE(timer);
-+}
-+
-+void DWC_TIMER_SCHEDULE(dwc_timer_t *timer, uint32_t time)
-+{
-+	struct timeval tv;
-+
-+	tv.tv_sec = time / 1000;
-+	tv.tv_usec = (time - tv.tv_sec * 1000) * 1000;
-+	callout_reset(&timer->t, tvtohz(&tv), timer->cb, timer->data);
-+}
-+
-+void DWC_TIMER_CANCEL(dwc_timer_t *timer)
-+{
-+	callout_stop(&timer->t);
-+}
-+
-+
-+/* Wait Queues */
-+
-+struct dwc_waitq {
-+	struct simplelock lock;
-+	int abort;
-+};
-+
-+dwc_waitq_t *DWC_WAITQ_ALLOC(void)
-+{
-+	dwc_waitq_t *wq = DWC_ALLOC(sizeof(*wq));
-+
-+	if (!wq) {
-+		DWC_ERROR("Cannot allocate memory for waitqueue");
-+		return NULL;
-+	}
-+
-+	simple_lock_init(&wq->lock);
-+	wq->abort = 0;
-+
-+	return wq;
-+}
-+
-+void DWC_WAITQ_FREE(dwc_waitq_t *wq)
-+{
-+	DWC_FREE(wq);
-+}
-+
-+int32_t DWC_WAITQ_WAIT(dwc_waitq_t *wq, dwc_waitq_condition_t cond, void *data)
-+{
-+	int ipl;
-+	int result = 0;
-+
-+	simple_lock(&wq->lock);
-+	ipl = splbio();
-+
-+	/* Skip the sleep if already aborted or triggered */
-+	if (!wq->abort && !cond(data)) {
-+		splx(ipl);
-+		result = ltsleep(wq, PCATCH, "dw3wat", 0, &wq->lock); // infinite timeout
-+		ipl = splbio();
-+	}
-+
-+	if (result == 0) {			// awoken
-+		if (wq->abort) {
-+			wq->abort = 0;
-+			result = -DWC_E_ABORT;
-+		} else {
-+			result = 0;
-+		}
-+
-+		splx(ipl);
-+		simple_unlock(&wq->lock);
-+	} else {
-+		wq->abort = 0;
-+		splx(ipl);
-+		simple_unlock(&wq->lock);
-+
-+		if (result == ERESTART) {	// signaled - restart
-+			result = -DWC_E_RESTART;
-+		} else {			// signaled - must be EINTR
-+			result = -DWC_E_ABORT;
-+		}
-+	}
-+
-+	return result;
-+}
-+
-+int32_t DWC_WAITQ_WAIT_TIMEOUT(dwc_waitq_t *wq, dwc_waitq_condition_t cond,
-+			       void *data, int32_t msecs)
-+{
-+	struct timeval tv, tv1, tv2;
-+	int ipl;
-+	int result = 0;
-+
-+	tv.tv_sec = msecs / 1000;
-+	tv.tv_usec = (msecs - tv.tv_sec * 1000) * 1000;
-+
-+	simple_lock(&wq->lock);
-+	ipl = splbio();
-+
-+	/* Skip the sleep if already aborted or triggered */
-+	if (!wq->abort && !cond(data)) {
-+		splx(ipl);
-+		getmicrouptime(&tv1);
-+		result = ltsleep(wq, PCATCH, "dw3wto", tvtohz(&tv), &wq->lock);
-+		getmicrouptime(&tv2);
-+		ipl = splbio();
-+	}
-+
-+	if (result == 0) {			// awoken
-+		if (wq->abort) {
-+			wq->abort = 0;
-+			splx(ipl);
-+			simple_unlock(&wq->lock);
-+			result = -DWC_E_ABORT;
-+		} else {
-+			splx(ipl);
-+			simple_unlock(&wq->lock);
-+
-+			tv2.tv_usec -= tv1.tv_usec;
-+			if (tv2.tv_usec < 0) {
-+				tv2.tv_usec += 1000000;
-+				tv2.tv_sec--;
-+			}
-+
-+			tv2.tv_sec -= tv1.tv_sec;
-+			result = tv2.tv_sec * 1000 + tv2.tv_usec / 1000;
-+			result = msecs - result;
-+			if (result <= 0)
-+				result = 1;
-+		}
-+	} else {
-+		wq->abort = 0;
-+		splx(ipl);
-+		simple_unlock(&wq->lock);
-+
-+		if (result == ERESTART) {	// signaled - restart
-+			result = -DWC_E_RESTART;
-+
-+		} else if (result == EINTR) {		// signaled - interrupt
-+			result = -DWC_E_ABORT;
-+
-+		} else {				// timed out
-+			result = -DWC_E_TIMEOUT;
-+		}
-+	}
-+
-+	return result;
-+}
-+
-+void DWC_WAITQ_TRIGGER(dwc_waitq_t *wq)
-+{
-+	wakeup(wq);
-+}
-+
-+void DWC_WAITQ_ABORT(dwc_waitq_t *wq)
-+{
-+	int ipl;
-+
-+	simple_lock(&wq->lock);
-+	ipl = splbio();
-+	wq->abort = 1;
-+	wakeup(wq);
-+	splx(ipl);
-+	simple_unlock(&wq->lock);
-+}
-+
-+
-+/* Threading */
-+
-+struct dwc_thread {
-+	struct proc *proc;
-+	int abort;
-+};
-+
-+dwc_thread_t *DWC_THREAD_RUN(dwc_thread_function_t func, char *name, void *data)
-+{
-+	int retval;
-+	dwc_thread_t *thread = DWC_ALLOC(sizeof(*thread));
-+
-+	if (!thread) {
-+		return NULL;
-+	}
-+
-+	thread->abort = 0;
-+	retval = kthread_create1((void (*)(void *))func, data, &thread->proc,
-+				 "%s", name);
-+	if (retval) {
-+		DWC_FREE(thread);
-+		return NULL;
-+	}
-+
-+	return thread;
-+}
-+
-+int DWC_THREAD_STOP(dwc_thread_t *thread)
-+{
-+	int retval;
-+
-+	thread->abort = 1;
-+	retval = tsleep(&thread->abort, 0, "dw3stp", 60 * hz);
-+
-+	if (retval == 0) {
-+		/* DWC_THREAD_EXIT() will free the thread struct */
-+		return 0;
-+	}
-+
-+	/* NOTE: We leak the thread struct if thread doesn't die */
-+
-+	if (retval == EWOULDBLOCK) {
-+		return -DWC_E_TIMEOUT;
-+	}
-+
-+	return -DWC_E_UNKNOWN;
-+}
-+
-+dwc_bool_t DWC_THREAD_SHOULD_STOP(dwc_thread_t *thread)
-+{
-+	return thread->abort;
-+}
-+
-+void DWC_THREAD_EXIT(dwc_thread_t *thread)
-+{
-+	wakeup(&thread->abort);
-+	DWC_FREE(thread);
-+	kthread_exit(0);
-+}
-+
-+/* tasklets
-+ - Runs in interrupt context (cannot sleep)
-+ - Each tasklet runs on a single CPU
-+ - Different tasklets can be running simultaneously on different CPUs
-+ [ On NetBSD there is no corresponding mechanism, drivers don't have bottom-
-+   halves. So we just call the callback directly from DWC_TASK_SCHEDULE() ]
-+ */
-+struct dwc_tasklet {
-+	dwc_tasklet_callback_t cb;
-+	void *data;
-+};
-+
-+static void tasklet_callback(void *data)
-+{
-+	dwc_tasklet_t *task = (dwc_tasklet_t *)data;
-+
-+	task->cb(task->data);
-+}
-+
-+dwc_tasklet_t *DWC_TASK_ALLOC(char *name, dwc_tasklet_callback_t cb, void *data)
-+{
-+	dwc_tasklet_t *task = DWC_ALLOC(sizeof(*task));
-+
-+	if (task) {
-+		task->cb = cb;
-+		task->data = data;
-+	} else {
-+		DWC_ERROR("Cannot allocate memory for tasklet");
-+	}
-+
-+	return task;
-+}
-+
-+void DWC_TASK_FREE(dwc_tasklet_t *task)
-+{
-+	DWC_FREE(task);
-+}
-+
-+void DWC_TASK_SCHEDULE(dwc_tasklet_t *task)
-+{
-+	tasklet_callback(task);
-+}
-+
-+
-+/* workqueues
-+ - Runs in process context (can sleep)
-+ */
-+typedef struct work_container {
-+	dwc_work_callback_t cb;
-+	void *data;
-+	dwc_workq_t *wq;
-+	char *name;
-+	int hz;
-+	struct work task;
-+} work_container_t;
-+
-+struct dwc_workq {
-+	struct workqueue *taskq;
-+	dwc_spinlock_t *lock;
-+	dwc_waitq_t *waitq;
-+	int pending;
-+	struct work_container *container;
-+};
-+
-+static void do_work(struct work *task, void *data)
-+{
-+	dwc_workq_t *wq = (dwc_workq_t *)data;
-+	work_container_t *container = wq->container;
-+	dwc_irqflags_t flags;
-+
-+	if (container->hz) {
-+		tsleep(container, 0, "dw3wrk", container->hz);
-+	}
-+
-+	container->cb(container->data);
-+	DWC_DEBUG("Work done: %s, container=%p", container->name, container);
-+
-+	DWC_SPINLOCK_IRQSAVE(wq->lock, &flags);
-+	if (container->name)
-+		DWC_FREE(container->name);
-+	DWC_FREE(container);
-+	wq->pending--;
-+	DWC_SPINUNLOCK_IRQRESTORE(wq->lock, flags);
-+	DWC_WAITQ_TRIGGER(wq->waitq);
-+}
-+
-+static int work_done(void *data)
-+{
-+	dwc_workq_t *workq = (dwc_workq_t *)data;
-+
-+	return workq->pending == 0;
-+}
-+
-+int DWC_WORKQ_WAIT_WORK_DONE(dwc_workq_t *workq, int timeout)
-+{
-+	return DWC_WAITQ_WAIT_TIMEOUT(workq->waitq, work_done, workq, timeout);
-+}
-+
-+dwc_workq_t *DWC_WORKQ_ALLOC(char *name)
-+{
-+	int result;
-+	dwc_workq_t *wq = DWC_ALLOC(sizeof(*wq));
-+
-+	if (!wq) {
-+		DWC_ERROR("Cannot allocate memory for workqueue");
-+		return NULL;
-+	}
-+
-+	result = workqueue_create(&wq->taskq, name, do_work, wq, 0 /*PWAIT*/,
-+				  IPL_BIO, 0);
-+	if (result) {
-+		DWC_ERROR("Cannot create workqueue");
-+		goto no_taskq;
-+	}
-+
-+	wq->pending = 0;
-+
-+	wq->lock = DWC_SPINLOCK_ALLOC();
-+	if (!wq->lock) {
-+		DWC_ERROR("Cannot allocate memory for spinlock");
-+		goto no_lock;
-+	}
-+
-+	wq->waitq = DWC_WAITQ_ALLOC();
-+	if (!wq->waitq) {
-+		DWC_ERROR("Cannot allocate memory for waitqueue");
-+		goto no_waitq;
-+	}
-+
-+	return wq;
-+
-+ no_waitq:
-+	DWC_SPINLOCK_FREE(wq->lock);
-+ no_lock:
-+	workqueue_destroy(wq->taskq);
-+ no_taskq:
-+	DWC_FREE(wq);
-+
-+	return NULL;
-+}
-+
-+void DWC_WORKQ_FREE(dwc_workq_t *wq)
-+{
-+#ifdef DEBUG
-+	dwc_irqflags_t flags;
-+
-+	DWC_SPINLOCK_IRQSAVE(wq->lock, &flags);
-+
-+	if (wq->pending != 0) {
-+		struct work_container *container = wq->container;
-+
-+		DWC_ERROR("Destroying work queue with pending work");
-+
-+		if (container && container->name) {
-+			DWC_ERROR("Work %s still pending", container->name);
-+		}
-+	}
-+
-+	DWC_SPINUNLOCK_IRQRESTORE(wq->lock, flags);
-+#endif
-+	DWC_WAITQ_FREE(wq->waitq);
-+	DWC_SPINLOCK_FREE(wq->lock);
-+	workqueue_destroy(wq->taskq);
-+	DWC_FREE(wq);
-+}
-+
-+void DWC_WORKQ_SCHEDULE(dwc_workq_t *wq, dwc_work_callback_t cb, void *data,
-+			char *format, ...)
-+{
-+	dwc_irqflags_t flags;
-+	work_container_t *container;
-+	static char name[128];
-+	va_list args;
-+
-+	va_start(args, format);
-+	DWC_VSNPRINTF(name, 128, format, args);
-+	va_end(args);
-+
-+	DWC_SPINLOCK_IRQSAVE(wq->lock, &flags);
-+	wq->pending++;
-+	DWC_SPINUNLOCK_IRQRESTORE(wq->lock, flags);
-+	DWC_WAITQ_TRIGGER(wq->waitq);
-+
-+	container = DWC_ALLOC_ATOMIC(sizeof(*container));
-+	if (!container) {
-+		DWC_ERROR("Cannot allocate memory for container");
-+		return;
-+	}
-+
-+	container->name = DWC_STRDUP(name);
-+	if (!container->name) {
-+		DWC_ERROR("Cannot allocate memory for container->name");
-+		DWC_FREE(container);
-+		return;
-+	}
-+
-+	container->cb = cb;
-+	container->data = data;
-+	container->wq = wq;
-+	container->hz = 0;
-+	wq->container = container;
-+
-+	DWC_DEBUG("Queueing work: %s, container=%p", container->name, container);
-+	workqueue_enqueue(wq->taskq, &container->task);
-+}
-+
-+void DWC_WORKQ_SCHEDULE_DELAYED(dwc_workq_t *wq, dwc_work_callback_t cb,
-+				void *data, uint32_t time, char *format, ...)
-+{
-+	dwc_irqflags_t flags;
-+	work_container_t *container;
-+	static char name[128];
-+	struct timeval tv;
-+	va_list args;
-+
-+	va_start(args, format);
-+	DWC_VSNPRINTF(name, 128, format, args);
-+	va_end(args);
-+
-+	DWC_SPINLOCK_IRQSAVE(wq->lock, &flags);
-+	wq->pending++;
-+	DWC_SPINUNLOCK_IRQRESTORE(wq->lock, flags);
-+	DWC_WAITQ_TRIGGER(wq->waitq);
-+
-+	container = DWC_ALLOC_ATOMIC(sizeof(*container));
-+	if (!container) {
-+		DWC_ERROR("Cannot allocate memory for container");
-+		return;
-+	}
-+
-+	container->name = DWC_STRDUP(name);
-+	if (!container->name) {
-+		DWC_ERROR("Cannot allocate memory for container->name");
-+		DWC_FREE(container);
-+		return;
-+	}
-+
-+	container->cb = cb;
-+	container->data = data;
-+	container->wq = wq;
-+	tv.tv_sec = time / 1000;
-+	tv.tv_usec = (time - tv.tv_sec * 1000) * 1000;
-+	container->hz = tvtohz(&tv);
-+	wq->container = container;
-+
-+	DWC_DEBUG("Queueing work: %s, container=%p", container->name, container);
-+	workqueue_enqueue(wq->taskq, &container->task);
-+}
-+
-+int DWC_WORKQ_PENDING(dwc_workq_t *wq)
-+{
-+	return wq->pending;
-+}
---- /dev/null
-+++ b/drivers/usb/host/dwc_common_port/dwc_crypto.c
-@@ -0,0 +1,308 @@
-+/* =========================================================================
-+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.c $
-+ * $Revision: #5 $
-+ * $Date: 2010/09/28 $
-+ * $Change: 1596182 $
-+ *
-+ * Synopsys Portability Library Software and documentation
-+ * (hereinafter, "Software") is an Unsupported proprietary work of
-+ * Synopsys, Inc. unless otherwise expressly agreed to in writing
-+ * between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product
-+ * under any End User Software License Agreement or Agreement for
-+ * Licensed Product with Synopsys or any supplement thereto. You are
-+ * permitted to use and redistribute this Software in source and binary
-+ * forms, with or without modification, provided that redistributions
-+ * of source code must retain this notice. You may not view, use,
-+ * disclose, copy or distribute this file or any information contained
-+ * herein except pursuant to this license grant from Synopsys. If you
-+ * do not agree with this notice, including the disclaimer below, then
-+ * you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"
-+ * BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ * FOR A PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL
-+ * SYNOPSYS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================= */
-+
-+/** @file
-+ * This file contains the WUSB cryptographic routines.
-+ */
-+
-+#ifdef DWC_CRYPTOLIB
-+
-+#include "dwc_crypto.h"
-+#include "usb.h"
-+
-+#ifdef DEBUG
-+static inline void dump_bytes(char *name, uint8_t *bytes, int len)
-+{
-+	int i;
-+	DWC_PRINTF("%s: ", name);
-+	for (i=0; i<len; i++) {
-+		DWC_PRINTF("%02x ", bytes[i]);
-+	}
-+	DWC_PRINTF("\n");
-+}
-+#else
-+#define dump_bytes(x...)
-+#endif
-+
-+/* Display a block */
-+void show_block(const u8 *blk, const char *prefix, const char *suffix, int a)
-+{
-+#ifdef DWC_DEBUG_CRYPTO
-+	int i, blksize = 16;
-+
-+	DWC_DEBUG("%s", prefix);
-+
-+	if (suffix == NULL) {
-+		suffix = "\n";
-+		blksize = a;
-+	}
-+
-+	for (i = 0; i < blksize; i++)
-+		DWC_PRINT("%02x%s", *blk++, ((i & 3) == 3) ? "  " : " ");
-+	DWC_PRINT(suffix);
-+#endif
-+}
-+
-+/**
-+ * Encrypts an array of bytes using the AES encryption engine.
-+ * If <code>dst</code> == <code>src</code>, then the bytes will be encrypted
-+ * in-place.
-+ *
-+ * @return  0 on success, negative error code on error.
-+ */
-+int dwc_wusb_aes_encrypt(u8 *src, u8 *key, u8 *dst)
-+{
-+	u8 block_t[16];
-+	DWC_MEMSET(block_t, 0, 16);
-+
-+	return DWC_AES_CBC(src, 16, key, 16, block_t, dst);
-+}
-+
-+/**
-+ * The CCM-MAC-FUNCTION described in section 6.5 of the WUSB spec.
-+ * This function takes a data string and returns the encrypted CBC
-+ * Counter-mode MIC.
-+ *
-+ * @param key     The 128-bit symmetric key.
-+ * @param nonce   The CCM nonce.
-+ * @param label   The unique 14-byte ASCII text label.
-+ * @param bytes   The byte array to be encrypted.
-+ * @param len     Length of the byte array.
-+ * @param result  Byte array to receive the 8-byte encrypted MIC.
-+ */
-+void dwc_wusb_cmf(u8 *key, u8 *nonce,
-+		  char *label, u8 *bytes, int len, u8 *result)
-+{
-+	u8 block_m[16];
-+	u8 block_x[16];
-+	u8 block_t[8];
-+	int idx, blkNum;
-+	u16 la = (u16)(len + 14);
-+
-+	/* Set the AES-128 key */
-+	//dwc_aes_setkey(tfm, key, 16);
-+
-+	/* Fill block B0 from flags = 0x59, N, and l(m) = 0 */
-+	block_m[0] = 0x59;
-+	for (idx = 0; idx < 13; idx++)
-+		block_m[idx + 1] = nonce[idx];
-+	block_m[14] = 0;
-+	block_m[15] = 0;
-+
-+	/* Produce the CBC IV */
-+	dwc_wusb_aes_encrypt(block_m, key, block_x);
-+	show_block(block_m, "CBC IV in: ", "\n", 0);
-+	show_block(block_x, "CBC IV out:", "\n", 0);
-+
-+	/* Fill block B1 from l(a) = Blen + 14, and A */
-+	block_x[0] ^= (u8)(la >> 8);
-+	block_x[1] ^= (u8)la;
-+	for (idx = 0; idx < 14; idx++)
-+		block_x[idx + 2] ^= label[idx];
-+	show_block(block_x, "After xor: ", "b1\n", 16);
-+
-+	dwc_wusb_aes_encrypt(block_x, key, block_x);
-+	show_block(block_x, "After AES: ", "b1\n", 16);
-+
-+	idx = 0;
-+	blkNum = 0;
-+
-+	/* Fill remaining blocks with B */
-+	while (len-- > 0) {
-+		block_x[idx] ^= *bytes++;
-+		if (++idx >= 16) {
-+			idx = 0;
-+			show_block(block_x, "After xor: ", "\n", blkNum);
-+			dwc_wusb_aes_encrypt(block_x, key, block_x);
-+			show_block(block_x, "After AES: ", "\n", blkNum);
-+			blkNum++;
-+		}
-+	}
-+
-+	/* Handle partial last block */
-+	if (idx > 0) {
-+		show_block(block_x, "After xor: ", "\n", blkNum);
-+		dwc_wusb_aes_encrypt(block_x, key, block_x);
-+		show_block(block_x, "After AES: ", "\n", blkNum);
-+	}
-+
-+	/* Save the MIC tag */
-+	DWC_MEMCPY(block_t, block_x, 8);
-+	show_block(block_t, "MIC tag  : ", NULL, 8);
-+
-+	/* Fill block A0 from flags = 0x01, N, and counter = 0 */
-+	block_m[0] = 0x01;
-+	block_m[14] = 0;
-+	block_m[15] = 0;
-+
-+	/* Encrypt the counter */
-+	dwc_wusb_aes_encrypt(block_m, key, block_x);
-+	show_block(block_x, "CTR[MIC] : ", NULL, 8);
-+
-+	/* XOR with MIC tag */
-+	for (idx = 0; idx < 8; idx++) {
-+		block_t[idx] ^= block_x[idx];
-+	}
-+
-+	/* Return result to caller */
-+	DWC_MEMCPY(result, block_t, 8);
-+	show_block(result, "CCM-MIC  : ", NULL, 8);
-+
-+}
-+
-+/**
-+ * The PRF function described in section 6.5 of the WUSB spec. This function
-+ * concatenates MIC values returned from dwc_cmf() to create a value of
-+ * the requested length.
-+ *
-+ * @param prf_len  Length of the PRF function in bits (64, 128, or 256).
-+ * @param key, nonce, label, bytes, len  Same as for dwc_cmf().
-+ * @param result   Byte array to receive the result.
-+ */
-+void dwc_wusb_prf(int prf_len, u8 *key,
-+		  u8 *nonce, char *label, u8 *bytes, int len, u8 *result)
-+{
-+	int i;
-+
-+	nonce[0] = 0;
-+	for (i = 0; i < prf_len >> 6; i++, nonce[0]++) {
-+		dwc_wusb_cmf(key, nonce, label, bytes, len, result);
-+		result += 8;
-+	}
-+}
-+
-+/**
-+ * Fills in CCM Nonce per the WUSB spec.
-+ *
-+ * @param[in] haddr Host address.
-+ * @param[in] daddr Device address.
-+ * @param[in] tkid Session Key(PTK) identifier.
-+ * @param[out] nonce Pointer to where the CCM Nonce output is to be written.
-+ */
-+void dwc_wusb_fill_ccm_nonce(uint16_t haddr, uint16_t daddr, uint8_t *tkid,
-+			     uint8_t *nonce)
-+{
-+
-+	DWC_DEBUG("%s %x %x\n", __func__, daddr, haddr);
-+
-+	DWC_MEMSET(&nonce[0], 0, 16);
-+
-+	DWC_MEMCPY(&nonce[6], tkid, 3);
-+	nonce[9] = daddr & 0xFF;
-+	nonce[10] = (daddr >> 8) & 0xFF;
-+	nonce[11] = haddr & 0xFF;
-+	nonce[12] = (haddr >> 8) & 0xFF;
-+
-+	dump_bytes("CCM nonce", nonce, 16);
-+}
-+
-+/**
-+ * Generates a 16-byte cryptographic-grade random number for the Host/Device
-+ * Nonce.
-+ */
-+void dwc_wusb_gen_nonce(uint16_t addr, uint8_t *nonce)
-+{
-+	uint8_t inonce[16];
-+	uint32_t temp[4];
-+
-+	/* Fill in the Nonce */
-+	DWC_MEMSET(&inonce[0], 0, sizeof(inonce));
-+	inonce[9] = addr & 0xFF;
-+	inonce[10] = (addr >> 8) & 0xFF;
-+	inonce[11] = inonce[9];
-+	inonce[12] = inonce[10];
-+
-+	/* Collect "randomness samples" */
-+	DWC_RANDOM_BYTES((uint8_t *)temp, 16);
-+
-+	dwc_wusb_prf_128((uint8_t *)temp, nonce,
-+			 "Random Numbers", (uint8_t *)temp, sizeof(temp),
-+			 nonce);
-+}
-+
-+/**
-+ * Generates the Session Key (PTK) and Key Confirmation Key (KCK) per the
-+ * WUSB spec.
-+ *
-+ * @param[in] ccm_nonce Pointer to CCM Nonce.
-+ * @param[in] mk Master Key to derive the session from
-+ * @param[in] hnonce Pointer to Host Nonce.
-+ * @param[in] dnonce Pointer to Device Nonce.
-+ * @param[out] kck Pointer to where the KCK output is to be written.
-+ * @param[out] ptk Pointer to where the PTK output is to be written.
-+ */
-+void dwc_wusb_gen_key(uint8_t *ccm_nonce, uint8_t *mk, uint8_t *hnonce,
-+		      uint8_t *dnonce, uint8_t *kck, uint8_t *ptk)
-+{
-+	uint8_t idata[32];
-+	uint8_t odata[32];
-+
-+	dump_bytes("ck", mk, 16);
-+	dump_bytes("hnonce", hnonce, 16);
-+	dump_bytes("dnonce", dnonce, 16);
-+
-+	/* The data is the HNonce and DNonce concatenated */
-+	DWC_MEMCPY(&idata[0], hnonce, 16);
-+	DWC_MEMCPY(&idata[16], dnonce, 16);
-+
-+	dwc_wusb_prf_256(mk, ccm_nonce, "Pair-wise keys", idata, 32, odata);
-+
-+	/* Low 16 bytes of the result is the KCK, high 16 is the PTK */
-+	DWC_MEMCPY(kck, &odata[0], 16);
-+	DWC_MEMCPY(ptk, &odata[16], 16);
-+
-+	dump_bytes("kck", kck, 16);
-+	dump_bytes("ptk", ptk, 16);
-+}
-+
-+/**
-+ * Generates the Message Integrity Code over the Handshake data per the
-+ * WUSB spec.
-+ *
-+ * @param ccm_nonce Pointer to CCM Nonce.
-+ * @param kck   Pointer to Key Confirmation Key.
-+ * @param data  Pointer to Handshake data to be checked.
-+ * @param mic   Pointer to where the MIC output is to be written.
-+ */
-+void dwc_wusb_gen_mic(uint8_t *ccm_nonce, uint8_t *kck,
-+		      uint8_t *data, uint8_t *mic)
-+{
-+
-+	dwc_wusb_prf_64(kck, ccm_nonce, "out-of-bandMIC",
-+			data, WUSB_HANDSHAKE_LEN_FOR_MIC, mic);
-+}
-+
-+#endif	/* DWC_CRYPTOLIB */
---- /dev/null
-+++ b/drivers/usb/host/dwc_common_port/dwc_crypto.h
-@@ -0,0 +1,111 @@
-+/* =========================================================================
-+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.h $
-+ * $Revision: #3 $
-+ * $Date: 2010/09/28 $
-+ * $Change: 1596182 $
-+ *
-+ * Synopsys Portability Library Software and documentation
-+ * (hereinafter, "Software") is an Unsupported proprietary work of
-+ * Synopsys, Inc. unless otherwise expressly agreed to in writing
-+ * between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product
-+ * under any End User Software License Agreement or Agreement for
-+ * Licensed Product with Synopsys or any supplement thereto. You are
-+ * permitted to use and redistribute this Software in source and binary
-+ * forms, with or without modification, provided that redistributions
-+ * of source code must retain this notice. You may not view, use,
-+ * disclose, copy or distribute this file or any information contained
-+ * herein except pursuant to this license grant from Synopsys. If you
-+ * do not agree with this notice, including the disclaimer below, then
-+ * you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"
-+ * BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ * FOR A PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL
-+ * SYNOPSYS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================= */
-+
-+#ifndef _DWC_CRYPTO_H_
-+#define _DWC_CRYPTO_H_
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/** @file
-+ *
-+ * This file contains declarations for the WUSB Cryptographic routines as
-+ * defined in the WUSB spec.  They are only to be used internally by the DWC UWB
-+ * modules.
-+ */
-+
-+#include "dwc_os.h"
-+
-+int dwc_wusb_aes_encrypt(u8 *src, u8 *key, u8 *dst);
-+
-+void dwc_wusb_cmf(u8 *key, u8 *nonce,
-+		  char *label, u8 *bytes, int len, u8 *result);
-+void dwc_wusb_prf(int prf_len, u8 *key,
-+		  u8 *nonce, char *label, u8 *bytes, int len, u8 *result);
-+
-+/**
-+ * The PRF-64 function described in section 6.5 of the WUSB spec.
-+ *
-+ * @param key, nonce, label, bytes, len, result  Same as for dwc_prf().
-+ */
-+static inline void dwc_wusb_prf_64(u8 *key, u8 *nonce,
-+				   char *label, u8 *bytes, int len, u8 *result)
-+{
-+	dwc_wusb_prf(64, key, nonce, label, bytes, len, result);
-+}
-+
-+/**
-+ * The PRF-128 function described in section 6.5 of the WUSB spec.
-+ *
-+ * @param key, nonce, label, bytes, len, result  Same as for dwc_prf().
-+ */
-+static inline void dwc_wusb_prf_128(u8 *key, u8 *nonce,
-+				    char *label, u8 *bytes, int len, u8 *result)
-+{
-+	dwc_wusb_prf(128, key, nonce, label, bytes, len, result);
-+}
-+
-+/**
-+ * The PRF-256 function described in section 6.5 of the WUSB spec.
-+ *
-+ * @param key, nonce, label, bytes, len, result  Same as for dwc_prf().
-+ */
-+static inline void dwc_wusb_prf_256(u8 *key, u8 *nonce,
-+				    char *label, u8 *bytes, int len, u8 *result)
-+{
-+	dwc_wusb_prf(256, key, nonce, label, bytes, len, result);
-+}
-+
-+
-+void dwc_wusb_fill_ccm_nonce(uint16_t haddr, uint16_t daddr, uint8_t *tkid,
-+			       uint8_t *nonce);
-+void dwc_wusb_gen_nonce(uint16_t addr,
-+			  uint8_t *nonce);
-+
-+void dwc_wusb_gen_key(uint8_t *ccm_nonce, uint8_t *mk,
-+			uint8_t *hnonce, uint8_t *dnonce,
-+			uint8_t *kck, uint8_t *ptk);
-+
-+
-+void dwc_wusb_gen_mic(uint8_t *ccm_nonce, uint8_t
-+			*kck, uint8_t *data, uint8_t *mic);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _DWC_CRYPTO_H_ */
---- /dev/null
-+++ b/drivers/usb/host/dwc_common_port/dwc_dh.c
-@@ -0,0 +1,291 @@
-+/* =========================================================================
-+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.c $
-+ * $Revision: #3 $
-+ * $Date: 2010/09/28 $
-+ * $Change: 1596182 $
-+ *
-+ * Synopsys Portability Library Software and documentation
-+ * (hereinafter, "Software") is an Unsupported proprietary work of
-+ * Synopsys, Inc. unless otherwise expressly agreed to in writing
-+ * between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product
-+ * under any End User Software License Agreement or Agreement for
-+ * Licensed Product with Synopsys or any supplement thereto. You are
-+ * permitted to use and redistribute this Software in source and binary
-+ * forms, with or without modification, provided that redistributions
-+ * of source code must retain this notice. You may not view, use,
-+ * disclose, copy or distribute this file or any information contained
-+ * herein except pursuant to this license grant from Synopsys. If you
-+ * do not agree with this notice, including the disclaimer below, then
-+ * you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"
-+ * BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ * FOR A PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL
-+ * SYNOPSYS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================= */
-+#ifdef DWC_CRYPTOLIB
-+
-+#ifndef CONFIG_MACH_IPMATE
-+
-+#include "dwc_dh.h"
-+#include "dwc_modpow.h"
-+
-+#ifdef DEBUG
-+/* This function prints out a buffer in the format described in the Association
-+ * Model specification. */
-+static void dh_dump(char *str, void *_num, int len)
-+{
-+	uint8_t *num = _num;
-+	int i;
-+	DWC_PRINTF("%s\n", str);
-+	for (i = 0; i < len; i ++) {
-+		DWC_PRINTF("%02x", num[i]);
-+		if (((i + 1) % 2) == 0) DWC_PRINTF(" ");
-+		if (((i + 1) % 26) == 0) DWC_PRINTF("\n");
-+	}
-+
-+	DWC_PRINTF("\n");
-+}
-+#else
-+#define dh_dump(_x...) do {; } while(0)
-+#endif
-+
-+/* Constant g value */
-+static __u32 dh_g[] = {
-+	0x02000000,
-+};
-+
-+/* Constant p value */
-+static __u32 dh_p[] = {
-+	0xFFFFFFFF, 0xFFFFFFFF, 0xA2DA0FC9, 0x34C26821, 0x8B62C6C4, 0xD11CDC80, 0x084E0229, 0x74CC678A,
-+	0xA6BE0B02, 0x229B133B, 0x79084A51, 0xDD04348E, 0xB31995EF, 0x1B433ACD, 0x6D0A2B30, 0x37145FF2,
-+	0x6D35E14F, 0x45C2516D, 0x76B585E4, 0xC67E5E62, 0xE9424CF4, 0x6BED37A6, 0xB65CFF0B, 0xEDB706F4,
-+	0xFB6B38EE, 0xA59F895A, 0x11249FAE, 0xE61F4B7C, 0x51662849, 0x3D5BE4EC, 0xB87C00C2, 0x05BF63A1,
-+	0x3648DA98, 0x9AD3551C, 0xA83F1669, 0x5FCF24FD, 0x235D6583, 0x96ADA3DC, 0x56F3621C, 0xBB528520,
-+	0x0729D59E, 0x6D969670, 0x4E350C67, 0x0498BC4A, 0x086C74F1, 0x7C2118CA, 0x465E9032, 0x3BCE362E,
-+	0x2C779EE3, 0x03860E18, 0xA283279B, 0x8FA207EC, 0xF05DC5B5, 0xC9524C6F, 0xF6CB2BDE, 0x18175895,
-+	0x7C499539, 0xE56A95EA, 0x1826D215, 0x1005FA98, 0x5A8E7215, 0x2DC4AA8A, 0x0D1733AD, 0x337A5004,
-+	0xAB2155A8, 0x64BA1CDF, 0x0485FBEC, 0x0AEFDB58, 0x5771EA8A, 0x7D0C065D, 0x850F97B3, 0xC7E4E1A6,
-+	0x8CAEF5AB, 0xD73309DB, 0xE0948C1E, 0x9D61254A, 0x26D2E3CE, 0x6BEED21A, 0x06FA2FF1, 0x64088AD9,
-+	0x730276D8, 0x646AC83E, 0x182B1F52, 0x0C207B17, 0x5717E1BB, 0x6C5D617A, 0xC0880977, 0xE246D9BA,
-+	0xA04FE208, 0x31ABE574, 0xFC5BDB43, 0x8E10FDE0, 0x20D1824B, 0xCAD23AA9, 0xFFFFFFFF, 0xFFFFFFFF,
-+};
-+
-+static void dh_swap_bytes(void *_in, void *_out, uint32_t len)
-+{
-+	uint8_t *in = _in;
-+	uint8_t *out = _out;
-+	int i;
-+	for (i=0; i<len; i++) {
-+		out[i] = in[len-1-i];
-+	}
-+}
-+
-+/* Computes the modular exponentiation (num^exp % mod).  num, exp, and mod are
-+ * big endian numbers of size len, in bytes.  Each len value must be a multiple
-+ * of 4. */
-+int dwc_dh_modpow(void *mem_ctx, void *num, uint32_t num_len,
-+		  void *exp, uint32_t exp_len,
-+		  void *mod, uint32_t mod_len,
-+		  void *out)
-+{
-+	/* modpow() takes little endian numbers.  AM uses big-endian.  This
-+	 * function swaps bytes of numbers before passing onto modpow. */
-+
-+	int retval = 0;
-+	uint32_t *result;
-+
-+	uint32_t *bignum_num = dwc_alloc(mem_ctx, num_len + 4);
-+	uint32_t *bignum_exp = dwc_alloc(mem_ctx, exp_len + 4);
-+	uint32_t *bignum_mod = dwc_alloc(mem_ctx, mod_len + 4);
-+
-+	dh_swap_bytes(num, &bignum_num[1], num_len);
-+	bignum_num[0] = num_len / 4;
-+
-+	dh_swap_bytes(exp, &bignum_exp[1], exp_len);
-+	bignum_exp[0] = exp_len / 4;
-+
-+	dh_swap_bytes(mod, &bignum_mod[1], mod_len);
-+	bignum_mod[0] = mod_len / 4;
-+
-+	result = dwc_modpow(mem_ctx, bignum_num, bignum_exp, bignum_mod);
-+	if (!result) {
-+		retval = -1;
-+		goto dh_modpow_nomem;
-+	}
-+
-+	dh_swap_bytes(&result[1], out, result[0] * 4);
-+	dwc_free(mem_ctx, result);
-+
-+ dh_modpow_nomem:
-+	dwc_free(mem_ctx, bignum_num);
-+	dwc_free(mem_ctx, bignum_exp);
-+	dwc_free(mem_ctx, bignum_mod);
-+	return retval;
-+}
-+
-+
-+int dwc_dh_pk(void *mem_ctx, uint8_t nd, uint8_t *exp, uint8_t *pk, uint8_t *hash)
-+{
-+	int retval;
-+	uint8_t m3[385];
-+
-+#ifndef DH_TEST_VECTORS
-+	DWC_RANDOM_BYTES(exp, 32);
-+#endif
-+
-+	/* Compute the pkd */
-+	if ((retval = dwc_dh_modpow(mem_ctx, dh_g, 4,
-+				    exp, 32,
-+				    dh_p, 384, pk))) {
-+		return retval;
-+	}
-+
-+	m3[384] = nd;
-+	DWC_MEMCPY(&m3[0], pk, 384);
-+	DWC_SHA256(m3, 385, hash);
-+
-+	dh_dump("PK", pk, 384);
-+	dh_dump("SHA-256(M3)", hash, 32);
-+	return 0;
-+}
-+
-+int dwc_dh_derive_keys(void *mem_ctx, uint8_t nd, uint8_t *pkh, uint8_t *pkd,
-+		       uint8_t *exp, int is_host,
-+		       char *dd, uint8_t *ck, uint8_t *kdk)
-+{
-+	int retval;
-+	uint8_t mv[784];
-+	uint8_t sha_result[32];
-+	uint8_t dhkey[384];
-+	uint8_t shared_secret[384];
-+	char *message;
-+	uint32_t vd;
-+
-+	uint8_t *pk;
-+
-+	if (is_host) {
-+		pk = pkd;
-+	}
-+	else {
-+		pk = pkh;
-+	}
-+
-+	if ((retval = dwc_dh_modpow(mem_ctx, pk, 384,
-+				    exp, 32,
-+				    dh_p, 384, shared_secret))) {
-+		return retval;
-+	}
-+	dh_dump("Shared Secret", shared_secret, 384);
-+
-+	DWC_SHA256(shared_secret, 384, dhkey);
-+	dh_dump("DHKEY", dhkey, 384);
-+
-+	DWC_MEMCPY(&mv[0], pkd, 384);
-+	DWC_MEMCPY(&mv[384], pkh, 384);
-+	DWC_MEMCPY(&mv[768], "displayed digest", 16);
-+	dh_dump("MV", mv, 784);
-+
-+	DWC_SHA256(mv, 784, sha_result);
-+	dh_dump("SHA-256(MV)", sha_result, 32);
-+	dh_dump("First 32-bits of SHA-256(MV)", sha_result, 4);
-+
-+	dh_swap_bytes(sha_result, &vd, 4);
-+#ifdef DEBUG
-+	DWC_PRINTF("Vd (decimal) = %d\n", vd);
-+#endif
-+
-+	switch (nd) {
-+	case 2:
-+		vd = vd % 100;
-+		DWC_SPRINTF(dd, "%02d", vd);
-+		break;
-+	case 3:
-+		vd = vd % 1000;
-+		DWC_SPRINTF(dd, "%03d", vd);
-+		break;
-+	case 4:
-+		vd = vd % 10000;
-+		DWC_SPRINTF(dd, "%04d", vd);
-+		break;
-+	}
-+#ifdef DEBUG
-+	DWC_PRINTF("Display Digits: %s\n", dd);
-+#endif
-+
-+	message = "connection key";
-+	DWC_HMAC_SHA256(message, DWC_STRLEN(message), dhkey, 32, sha_result);
-+	dh_dump("HMAC(SHA-256, DHKey, connection key)", sha_result, 32);
-+	DWC_MEMCPY(ck, sha_result, 16);
-+
-+	message = "key derivation key";
-+	DWC_HMAC_SHA256(message, DWC_STRLEN(message), dhkey, 32, sha_result);
-+	dh_dump("HMAC(SHA-256, DHKey, key derivation key)", sha_result, 32);
-+	DWC_MEMCPY(kdk, sha_result, 32);
-+
-+	return 0;
-+}
-+
-+
-+#ifdef DH_TEST_VECTORS
-+
-+static __u8 dh_a[] = {
-+	0x44, 0x00, 0x51, 0xd6,
-+	0xf0, 0xb5, 0x5e, 0xa9,
-+	0x67, 0xab, 0x31, 0xc6,
-+	0x8a, 0x8b, 0x5e, 0x37,
-+	0xd9, 0x10, 0xda, 0xe0,
-+	0xe2, 0xd4, 0x59, 0xa4,
-+	0x86, 0x45, 0x9c, 0xaa,
-+	0xdf, 0x36, 0x75, 0x16,
-+};
-+
-+static __u8 dh_b[] = {
-+	0x5d, 0xae, 0xc7, 0x86,
-+	0x79, 0x80, 0xa3, 0x24,
-+	0x8c, 0xe3, 0x57, 0x8f,
-+	0xc7, 0x5f, 0x1b, 0x0f,
-+	0x2d, 0xf8, 0x9d, 0x30,
-+	0x6f, 0xa4, 0x52, 0xcd,
-+	0xe0, 0x7a, 0x04, 0x8a,
-+	0xde, 0xd9, 0x26, 0x56,
-+};
-+
-+void dwc_run_dh_test_vectors(void *mem_ctx)
-+{
-+	uint8_t pkd[384];
-+	uint8_t pkh[384];
-+	uint8_t hashd[32];
-+	uint8_t hashh[32];
-+	uint8_t ck[16];
-+	uint8_t kdk[32];
-+	char dd[5];
-+
-+	DWC_PRINTF("\n\n\nDH_TEST_VECTORS\n\n");
-+
-+	/* compute the PKd and SHA-256(PKd || Nd) */
-+	DWC_PRINTF("Computing PKd\n");
-+	dwc_dh_pk(mem_ctx, 2, dh_a, pkd, hashd);
-+
-+	/* compute the PKd and SHA-256(PKh || Nd) */
-+	DWC_PRINTF("Computing PKh\n");
-+	dwc_dh_pk(mem_ctx, 2, dh_b, pkh, hashh);
-+
-+	/* compute the dhkey */
-+	dwc_dh_derive_keys(mem_ctx, 2, pkh, pkd, dh_a, 0, dd, ck, kdk);
-+}
-+#endif /* DH_TEST_VECTORS */
-+
-+#endif /* !CONFIG_MACH_IPMATE */
-+
-+#endif /* DWC_CRYPTOLIB */
---- /dev/null
-+++ b/drivers/usb/host/dwc_common_port/dwc_dh.h
-@@ -0,0 +1,106 @@
-+/* =========================================================================
-+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.h $
-+ * $Revision: #4 $
-+ * $Date: 2010/09/28 $
-+ * $Change: 1596182 $
-+ *
-+ * Synopsys Portability Library Software and documentation
-+ * (hereinafter, "Software") is an Unsupported proprietary work of
-+ * Synopsys, Inc. unless otherwise expressly agreed to in writing
-+ * between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product
-+ * under any End User Software License Agreement or Agreement for
-+ * Licensed Product with Synopsys or any supplement thereto. You are
-+ * permitted to use and redistribute this Software in source and binary
-+ * forms, with or without modification, provided that redistributions
-+ * of source code must retain this notice. You may not view, use,
-+ * disclose, copy or distribute this file or any information contained
-+ * herein except pursuant to this license grant from Synopsys. If you
-+ * do not agree with this notice, including the disclaimer below, then
-+ * you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"
-+ * BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ * FOR A PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL
-+ * SYNOPSYS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================= */
-+#ifndef _DWC_DH_H_
-+#define _DWC_DH_H_
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include "dwc_os.h"
-+
-+/** @file
-+ *
-+ * This file defines the common functions on device and host for performing
-+ * numeric association as defined in the WUSB spec.  They are only to be
-+ * used internally by the DWC UWB modules. */
-+
-+extern int dwc_dh_sha256(uint8_t *message, uint32_t len, uint8_t *out);
-+extern int dwc_dh_hmac_sha256(uint8_t *message, uint32_t messagelen,
-+			      uint8_t *key, uint32_t keylen,
-+			      uint8_t *out);
-+extern int dwc_dh_modpow(void *mem_ctx, void *num, uint32_t num_len,
-+			 void *exp, uint32_t exp_len,
-+			 void *mod, uint32_t mod_len,
-+			 void *out);
-+
-+/** Computes PKD or PKH, and SHA-256(PKd || Nd)
-+ *
-+ * PK = g^exp mod p.
-+ *
-+ * Input:
-+ * Nd = Number of digits on the device.
-+ *
-+ * Output:
-+ * exp = A 32-byte buffer to be filled with a randomly generated number.
-+ *       used as either A or B.
-+ * pk = A 384-byte buffer to be filled with the PKH or PKD.
-+ * hash = A 32-byte buffer to be filled with SHA-256(PK || ND).
-+ */
-+extern int dwc_dh_pk(void *mem_ctx, uint8_t nd, uint8_t *exp, uint8_t *pkd, uint8_t *hash);
-+
-+/** Computes the DHKEY, and VD.
-+ *
-+ * If called from host, then it will comput DHKEY=PKD^exp % p.
-+ * If called from device, then it will comput DHKEY=PKH^exp % p.
-+ *
-+ * Input:
-+ * pkd = The PKD value.
-+ * pkh = The PKH value.
-+ * exp = The A value (if device) or B value (if host) generated in dwc_wudev_dh_pk.
-+ * is_host = Set to non zero if a WUSB host is calling this function.
-+ *
-+ * Output:
-+
-+ * dd = A pointer to an buffer to be set to the displayed digits string to be shown
-+ *      to the user.  This buffer should be at 5 bytes long to hold 4 digits plus a
-+ *      null termination character.  This buffer can be used directly for display.
-+ * ck = A 16-byte buffer to be filled with the CK.
-+ * kdk = A 32-byte buffer to be filled with the KDK.
-+ */
-+extern int dwc_dh_derive_keys(void *mem_ctx, uint8_t nd, uint8_t *pkh, uint8_t *pkd,
-+			      uint8_t *exp, int is_host,
-+			      char *dd, uint8_t *ck, uint8_t *kdk);
-+
-+#ifdef DH_TEST_VECTORS
-+extern void dwc_run_dh_test_vectors(void);
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _DWC_DH_H_ */
---- /dev/null
-+++ b/drivers/usb/host/dwc_common_port/dwc_list.h
-@@ -0,0 +1,594 @@
-+/*	$OpenBSD: queue.h,v 1.26 2004/05/04 16:59:32 grange Exp $	*/
-+/*	$NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $	*/
-+
-+/*
-+ * Copyright (c) 1991, 1993
-+ *	The Regents of the University of California.  All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ *
-+ *	@(#)queue.h	8.5 (Berkeley) 8/20/94
-+ */
-+
-+#ifndef _DWC_LIST_H_
-+#define _DWC_LIST_H_
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/** @file
-+ *
-+ * This file defines linked list operations.  It is derived from BSD with
-+ * only the MACRO names being prefixed with DWC_.  This is because a few of
-+ * these names conflict with those on Linux.  For documentation on use, see the
-+ * inline comments in the source code.  The original license for this source
-+ * code applies and is preserved in the dwc_list.h source file.
-+ */
-+
-+/*
-+ * This file defines five types of data structures: singly-linked lists,
-+ * lists, simple queues, tail queues, and circular queues.
-+ *
-+ *
-+ * A singly-linked list is headed by a single forward pointer. The elements
-+ * are singly linked for minimum space and pointer manipulation overhead at
-+ * the expense of O(n) removal for arbitrary elements. New elements can be
-+ * added to the list after an existing element or at the head of the list.
-+ * Elements being removed from the head of the list should use the explicit
-+ * macro for this purpose for optimum efficiency. A singly-linked list may
-+ * only be traversed in the forward direction.  Singly-linked lists are ideal
-+ * for applications with large datasets and few or no removals or for
-+ * implementing a LIFO queue.
-+ *
-+ * A list is headed by a single forward pointer (or an array of forward
-+ * pointers for a hash table header). The elements are doubly linked
-+ * so that an arbitrary element can be removed without a need to
-+ * traverse the list. New elements can be added to the list before
-+ * or after an existing element or at the head of the list. A list
-+ * may only be traversed in the forward direction.
-+ *
-+ * A simple queue is headed by a pair of pointers, one the head of the
-+ * list and the other to the tail of the list. The elements are singly
-+ * linked to save space, so elements can only be removed from the
-+ * head of the list. New elements can be added to the list before or after
-+ * an existing element, at the head of the list, or at the end of the
-+ * list. A simple queue may only be traversed in the forward direction.
-+ *
-+ * A tail queue is headed by a pair of pointers, one to the head of the
-+ * list and the other to the tail of the list. The elements are doubly
-+ * linked so that an arbitrary element can be removed without a need to
-+ * traverse the list. New elements can be added to the list before or
-+ * after an existing element, at the head of the list, or at the end of
-+ * the list. A tail queue may be traversed in either direction.
-+ *
-+ * A circle queue is headed by a pair of pointers, one to the head of the
-+ * list and the other to the tail of the list. The elements are doubly
-+ * linked so that an arbitrary element can be removed without a need to
-+ * traverse the list. New elements can be added to the list before or after
-+ * an existing element, at the head of the list, or at the end of the list.
-+ * A circle queue may be traversed in either direction, but has a more
-+ * complex end of list detection.
-+ *
-+ * For details on the use of these macros, see the queue(3) manual page.
-+ */
-+
-+/*
-+ * Double-linked List.
-+ */
-+
-+typedef struct dwc_list_link {
-+	struct dwc_list_link *next;
-+	struct dwc_list_link *prev;
-+} dwc_list_link_t;
-+
-+#define DWC_LIST_INIT(link) do {	\
-+	(link)->next = (link);		\
-+	(link)->prev = (link);		\
-+} while (0)
-+
-+#define DWC_LIST_FIRST(link)	((link)->next)
-+#define DWC_LIST_LAST(link)	((link)->prev)
-+#define DWC_LIST_END(link)	(link)
-+#define DWC_LIST_NEXT(link)	((link)->next)
-+#define DWC_LIST_PREV(link)	((link)->prev)
-+#define DWC_LIST_EMPTY(link)	\
-+	(DWC_LIST_FIRST(link) == DWC_LIST_END(link))
-+#define DWC_LIST_ENTRY(link, type, field)			\
-+	(type *)((uint8_t *)(link) - (size_t)(&((type *)0)->field))
-+
-+#if 0
-+#define DWC_LIST_INSERT_HEAD(list, link) do {			\
-+	(link)->next = (list)->next;				\
-+	(link)->prev = (list);					\
-+	(list)->next->prev = (link);				\
-+	(list)->next = (link);					\
-+} while (0)
-+
-+#define DWC_LIST_INSERT_TAIL(list, link) do {			\
-+	(link)->next = (list);					\
-+	(link)->prev = (list)->prev;				\
-+	(list)->prev->next = (link);				\
-+	(list)->prev = (link);					\
-+} while (0)
-+#else
-+#define DWC_LIST_INSERT_HEAD(list, link) do {			\
-+	dwc_list_link_t *__next__ = (list)->next;		\
-+	__next__->prev = (link);				\
-+	(link)->next = __next__;				\
-+	(link)->prev = (list);					\
-+	(list)->next = (link);					\
-+} while (0)
-+
-+#define DWC_LIST_INSERT_TAIL(list, link) do {			\
-+	dwc_list_link_t *__prev__ = (list)->prev;		\
-+	(list)->prev = (link);					\
-+	(link)->next = (list);					\
-+	(link)->prev = __prev__;				\
-+	__prev__->next = (link);				\
-+} while (0)
-+#endif
-+
-+#if 0
-+static inline void __list_add(struct list_head *new,
-+                              struct list_head *prev,
-+                              struct list_head *next)
-+{
-+        next->prev = new;
-+        new->next = next;
-+        new->prev = prev;
-+        prev->next = new;
-+}
-+
-+static inline void list_add(struct list_head *new, struct list_head *head)
-+{
-+        __list_add(new, head, head->next);
-+}
-+
-+static inline void list_add_tail(struct list_head *new, struct list_head *head)
-+{
-+        __list_add(new, head->prev, head);
-+}
-+
-+static inline void __list_del(struct list_head * prev, struct list_head * next)
-+{
-+        next->prev = prev;
-+        prev->next = next;
-+}
-+
-+static inline void list_del(struct list_head *entry)
-+{
-+        __list_del(entry->prev, entry->next);
-+        entry->next = LIST_POISON1;
-+        entry->prev = LIST_POISON2;
-+}
-+#endif
-+
-+#define DWC_LIST_REMOVE(link) do {				\
-+	(link)->next->prev = (link)->prev;			\
-+	(link)->prev->next = (link)->next;			\
-+} while (0)
-+
-+#define DWC_LIST_REMOVE_INIT(link) do {				\
-+	DWC_LIST_REMOVE(link);					\
-+	DWC_LIST_INIT(link);					\
-+} while (0)
-+
-+#define DWC_LIST_MOVE_HEAD(list, link) do {			\
-+	DWC_LIST_REMOVE(link);					\
-+	DWC_LIST_INSERT_HEAD(list, link);			\
-+} while (0)
-+
-+#define DWC_LIST_MOVE_TAIL(list, link) do {			\
-+	DWC_LIST_REMOVE(link);					\
-+	DWC_LIST_INSERT_TAIL(list, link);			\
-+} while (0)
-+
-+#define DWC_LIST_FOREACH(var, list)				\
-+	for((var) = DWC_LIST_FIRST(list);			\
-+	    (var) != DWC_LIST_END(list);			\
-+	    (var) = DWC_LIST_NEXT(var))
-+
-+#define DWC_LIST_FOREACH_SAFE(var, var2, list)			\
-+	for((var) = DWC_LIST_FIRST(list), (var2) = DWC_LIST_NEXT(var);	\
-+	    (var) != DWC_LIST_END(list);			\
-+	    (var) = (var2), (var2) = DWC_LIST_NEXT(var2))
-+
-+#define DWC_LIST_FOREACH_REVERSE(var, list)			\
-+	for((var) = DWC_LIST_LAST(list);			\
-+	    (var) != DWC_LIST_END(list);			\
-+	    (var) = DWC_LIST_PREV(var))
-+
-+/*
-+ * Singly-linked List definitions.
-+ */
-+#define DWC_SLIST_HEAD(name, type)					\
-+struct name {								\
-+	struct type *slh_first;	/* first element */			\
-+}
-+
-+#define DWC_SLIST_HEAD_INITIALIZER(head)				\
-+	{ NULL }
-+
-+#define DWC_SLIST_ENTRY(type)						\
-+struct {								\
-+	struct type *sle_next;	/* next element */			\
-+}
-+
-+/*
-+ * Singly-linked List access methods.
-+ */
-+#define DWC_SLIST_FIRST(head)	((head)->slh_first)
-+#define DWC_SLIST_END(head)		NULL
-+#define DWC_SLIST_EMPTY(head)	(SLIST_FIRST(head) == SLIST_END(head))
-+#define DWC_SLIST_NEXT(elm, field)	((elm)->field.sle_next)
-+
-+#define DWC_SLIST_FOREACH(var, head, field)				\
-+	for((var) = SLIST_FIRST(head);					\
-+	    (var) != SLIST_END(head);					\
-+	    (var) = SLIST_NEXT(var, field))
-+
-+#define DWC_SLIST_FOREACH_PREVPTR(var, varp, head, field)		\
-+	for((varp) = &SLIST_FIRST((head));				\
-+	    ((var) = *(varp)) != SLIST_END(head);			\
-+	    (varp) = &SLIST_NEXT((var), field))
-+
-+/*
-+ * Singly-linked List functions.
-+ */
-+#define DWC_SLIST_INIT(head) {						\
-+	SLIST_FIRST(head) = SLIST_END(head);				\
-+}
-+
-+#define DWC_SLIST_INSERT_AFTER(slistelm, elm, field) do {		\
-+	(elm)->field.sle_next = (slistelm)->field.sle_next;		\
-+	(slistelm)->field.sle_next = (elm);				\
-+} while (0)
-+
-+#define DWC_SLIST_INSERT_HEAD(head, elm, field) do {			\
-+	(elm)->field.sle_next = (head)->slh_first;			\
-+	(head)->slh_first = (elm);					\
-+} while (0)
-+
-+#define DWC_SLIST_REMOVE_NEXT(head, elm, field) do {			\
-+	(elm)->field.sle_next = (elm)->field.sle_next->field.sle_next;	\
-+} while (0)
-+
-+#define DWC_SLIST_REMOVE_HEAD(head, field) do {				\
-+	(head)->slh_first = (head)->slh_first->field.sle_next;		\
-+} while (0)
-+
-+#define DWC_SLIST_REMOVE(head, elm, type, field) do {			\
-+	if ((head)->slh_first == (elm)) {				\
-+		SLIST_REMOVE_HEAD((head), field);			\
-+	}								\
-+	else {								\
-+		struct type *curelm = (head)->slh_first;		\
-+		while( curelm->field.sle_next != (elm) )		\
-+			curelm = curelm->field.sle_next;		\
-+		curelm->field.sle_next =				\
-+		    curelm->field.sle_next->field.sle_next;		\
-+	}								\
-+} while (0)
-+
-+/*
-+ * Simple queue definitions.
-+ */
-+#define DWC_SIMPLEQ_HEAD(name, type)					\
-+struct name {								\
-+	struct type *sqh_first;	/* first element */			\
-+	struct type **sqh_last;	/* addr of last next element */		\
-+}
-+
-+#define DWC_SIMPLEQ_HEAD_INITIALIZER(head)				\
-+	{ NULL, &(head).sqh_first }
-+
-+#define DWC_SIMPLEQ_ENTRY(type)						\
-+struct {								\
-+	struct type *sqe_next;	/* next element */			\
-+}
-+
-+/*
-+ * Simple queue access methods.
-+ */
-+#define DWC_SIMPLEQ_FIRST(head)	    ((head)->sqh_first)
-+#define DWC_SIMPLEQ_END(head)	    NULL
-+#define DWC_SIMPLEQ_EMPTY(head)	    (SIMPLEQ_FIRST(head) == SIMPLEQ_END(head))
-+#define DWC_SIMPLEQ_NEXT(elm, field)    ((elm)->field.sqe_next)
-+
-+#define DWC_SIMPLEQ_FOREACH(var, head, field)				\
-+	for((var) = SIMPLEQ_FIRST(head);				\
-+	    (var) != SIMPLEQ_END(head);					\
-+	    (var) = SIMPLEQ_NEXT(var, field))
-+
-+/*
-+ * Simple queue functions.
-+ */
-+#define DWC_SIMPLEQ_INIT(head) do {					\
-+	(head)->sqh_first = NULL;					\
-+	(head)->sqh_last = &(head)->sqh_first;				\
-+} while (0)
-+
-+#define DWC_SIMPLEQ_INSERT_HEAD(head, elm, field) do {			\
-+	if (((elm)->field.sqe_next = (head)->sqh_first) == NULL)	\
-+		(head)->sqh_last = &(elm)->field.sqe_next;		\
-+	(head)->sqh_first = (elm);					\
-+} while (0)
-+
-+#define DWC_SIMPLEQ_INSERT_TAIL(head, elm, field) do {			\
-+	(elm)->field.sqe_next = NULL;					\
-+	*(head)->sqh_last = (elm);					\
-+	(head)->sqh_last = &(elm)->field.sqe_next;			\
-+} while (0)
-+
-+#define DWC_SIMPLEQ_INSERT_AFTER(head, listelm, elm, field) do {	\
-+	if (((elm)->field.sqe_next = (listelm)->field.sqe_next) == NULL)\
-+		(head)->sqh_last = &(elm)->field.sqe_next;		\
-+	(listelm)->field.sqe_next = (elm);				\
-+} while (0)
-+
-+#define DWC_SIMPLEQ_REMOVE_HEAD(head, field) do {			\
-+	if (((head)->sqh_first = (head)->sqh_first->field.sqe_next) == NULL) \
-+		(head)->sqh_last = &(head)->sqh_first;			\
-+} while (0)
-+
-+/*
-+ * Tail queue definitions.
-+ */
-+#define DWC_TAILQ_HEAD(name, type)					\
-+struct name {								\
-+	struct type *tqh_first;	/* first element */			\
-+	struct type **tqh_last;	/* addr of last next element */		\
-+}
-+
-+#define DWC_TAILQ_HEAD_INITIALIZER(head)				\
-+	{ NULL, &(head).tqh_first }
-+
-+#define DWC_TAILQ_ENTRY(type)						\
-+struct {								\
-+	struct type *tqe_next;	/* next element */			\
-+	struct type **tqe_prev;	/* address of previous next element */	\
-+}
-+
-+/*
-+ * tail queue access methods
-+ */
-+#define DWC_TAILQ_FIRST(head)		((head)->tqh_first)
-+#define DWC_TAILQ_END(head)		NULL
-+#define DWC_TAILQ_NEXT(elm, field)	((elm)->field.tqe_next)
-+#define DWC_TAILQ_LAST(head, headname)					\
-+	(*(((struct headname *)((head)->tqh_last))->tqh_last))
-+/* XXX */
-+#define DWC_TAILQ_PREV(elm, headname, field)				\
-+	(*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
-+#define DWC_TAILQ_EMPTY(head)						\
-+	(DWC_TAILQ_FIRST(head) == DWC_TAILQ_END(head))
-+
-+#define DWC_TAILQ_FOREACH(var, head, field)				\
-+	for ((var) = DWC_TAILQ_FIRST(head);				\
-+	    (var) != DWC_TAILQ_END(head);				\
-+	    (var) = DWC_TAILQ_NEXT(var, field))
-+
-+#define DWC_TAILQ_FOREACH_REVERSE(var, head, headname, field)		\
-+	for ((var) = DWC_TAILQ_LAST(head, headname);			\
-+	    (var) != DWC_TAILQ_END(head);				\
-+	    (var) = DWC_TAILQ_PREV(var, headname, field))
-+
-+/*
-+ * Tail queue functions.
-+ */
-+#define DWC_TAILQ_INIT(head) do {					\
-+	(head)->tqh_first = NULL;					\
-+	(head)->tqh_last = &(head)->tqh_first;				\
-+} while (0)
-+
-+#define DWC_TAILQ_INSERT_HEAD(head, elm, field) do {			\
-+	if (((elm)->field.tqe_next = (head)->tqh_first) != NULL)	\
-+		(head)->tqh_first->field.tqe_prev =			\
-+		    &(elm)->field.tqe_next;				\
-+	else								\
-+		(head)->tqh_last = &(elm)->field.tqe_next;		\
-+	(head)->tqh_first = (elm);					\
-+	(elm)->field.tqe_prev = &(head)->tqh_first;			\
-+} while (0)
-+
-+#define DWC_TAILQ_INSERT_TAIL(head, elm, field) do {			\
-+	(elm)->field.tqe_next = NULL;					\
-+	(elm)->field.tqe_prev = (head)->tqh_last;			\
-+	*(head)->tqh_last = (elm);					\
-+	(head)->tqh_last = &(elm)->field.tqe_next;			\
-+} while (0)
-+
-+#define DWC_TAILQ_INSERT_AFTER(head, listelm, elm, field) do {		\
-+	if (((elm)->field.tqe_next = (listelm)->field.tqe_next) != NULL)\
-+		(elm)->field.tqe_next->field.tqe_prev =			\
-+		    &(elm)->field.tqe_next;				\
-+	else								\
-+		(head)->tqh_last = &(elm)->field.tqe_next;		\
-+	(listelm)->field.tqe_next = (elm);				\
-+	(elm)->field.tqe_prev = &(listelm)->field.tqe_next;		\
-+} while (0)
-+
-+#define DWC_TAILQ_INSERT_BEFORE(listelm, elm, field) do {		\
-+	(elm)->field.tqe_prev = (listelm)->field.tqe_prev;		\
-+	(elm)->field.tqe_next = (listelm);				\
-+	*(listelm)->field.tqe_prev = (elm);				\
-+	(listelm)->field.tqe_prev = &(elm)->field.tqe_next;		\
-+} while (0)
-+
-+#define DWC_TAILQ_REMOVE(head, elm, field) do {				\
-+	if (((elm)->field.tqe_next) != NULL)				\
-+		(elm)->field.tqe_next->field.tqe_prev =			\
-+		    (elm)->field.tqe_prev;				\
-+	else								\
-+		(head)->tqh_last = (elm)->field.tqe_prev;		\
-+	*(elm)->field.tqe_prev = (elm)->field.tqe_next;			\
-+} while (0)
-+
-+#define DWC_TAILQ_REPLACE(head, elm, elm2, field) do {			\
-+	if (((elm2)->field.tqe_next = (elm)->field.tqe_next) != NULL)	\
-+		(elm2)->field.tqe_next->field.tqe_prev =		\
-+		    &(elm2)->field.tqe_next;				\
-+	else								\
-+		(head)->tqh_last = &(elm2)->field.tqe_next;		\
-+	(elm2)->field.tqe_prev = (elm)->field.tqe_prev;			\
-+	*(elm2)->field.tqe_prev = (elm2);				\
-+} while (0)
-+
-+/*
-+ * Circular queue definitions.
-+ */
-+#define DWC_CIRCLEQ_HEAD(name, type)					\
-+struct name {								\
-+	struct type *cqh_first;		/* first element */		\
-+	struct type *cqh_last;		/* last element */		\
-+}
-+
-+#define DWC_CIRCLEQ_HEAD_INITIALIZER(head)				\
-+	{ DWC_CIRCLEQ_END(&head), DWC_CIRCLEQ_END(&head) }
-+
-+#define DWC_CIRCLEQ_ENTRY(type)						\
-+struct {								\
-+	struct type *cqe_next;		/* next element */		\
-+	struct type *cqe_prev;		/* previous element */		\
-+}
-+
-+/*
-+ * Circular queue access methods
-+ */
-+#define DWC_CIRCLEQ_FIRST(head)		((head)->cqh_first)
-+#define DWC_CIRCLEQ_LAST(head)		((head)->cqh_last)
-+#define DWC_CIRCLEQ_END(head)		((void *)(head))
-+#define DWC_CIRCLEQ_NEXT(elm, field)	((elm)->field.cqe_next)
-+#define DWC_CIRCLEQ_PREV(elm, field)	((elm)->field.cqe_prev)
-+#define DWC_CIRCLEQ_EMPTY(head)						\
-+	(DWC_CIRCLEQ_FIRST(head) == DWC_CIRCLEQ_END(head))
-+
-+#define DWC_CIRCLEQ_EMPTY_ENTRY(elm, field) (((elm)->field.cqe_next == NULL) && ((elm)->field.cqe_prev == NULL))
-+
-+#define DWC_CIRCLEQ_FOREACH(var, head, field)				\
-+	for((var) = DWC_CIRCLEQ_FIRST(head);				\
-+	    (var) != DWC_CIRCLEQ_END(head);				\
-+	    (var) = DWC_CIRCLEQ_NEXT(var, field))
-+
-+#define DWC_CIRCLEQ_FOREACH_SAFE(var, var2, head, field)			\
-+	for((var) = DWC_CIRCLEQ_FIRST(head), var2 = DWC_CIRCLEQ_NEXT(var, field); \
-+	    (var) != DWC_CIRCLEQ_END(head);					\
-+	    (var) = var2, var2 = DWC_CIRCLEQ_NEXT(var, field))
-+
-+#define DWC_CIRCLEQ_FOREACH_REVERSE(var, head, field)			\
-+	for((var) = DWC_CIRCLEQ_LAST(head);				\
-+	    (var) != DWC_CIRCLEQ_END(head);				\
-+	    (var) = DWC_CIRCLEQ_PREV(var, field))
-+
-+/*
-+ * Circular queue functions.
-+ */
-+#define DWC_CIRCLEQ_INIT(head) do {					\
-+	(head)->cqh_first = DWC_CIRCLEQ_END(head);			\
-+	(head)->cqh_last = DWC_CIRCLEQ_END(head);			\
-+} while (0)
-+
-+#define DWC_CIRCLEQ_INIT_ENTRY(elm, field) do {				\
-+	(elm)->field.cqe_next = NULL;					\
-+	(elm)->field.cqe_prev = NULL;					\
-+} while (0)
-+
-+#define DWC_CIRCLEQ_INSERT_AFTER(head, listelm, elm, field) do {	\
-+	(elm)->field.cqe_next = (listelm)->field.cqe_next;		\
-+	(elm)->field.cqe_prev = (listelm);				\
-+	if ((listelm)->field.cqe_next == DWC_CIRCLEQ_END(head))		\
-+		(head)->cqh_last = (elm);				\
-+	else								\
-+		(listelm)->field.cqe_next->field.cqe_prev = (elm);	\
-+	(listelm)->field.cqe_next = (elm);				\
-+} while (0)
-+
-+#define DWC_CIRCLEQ_INSERT_BEFORE(head, listelm, elm, field) do {	\
-+	(elm)->field.cqe_next = (listelm);				\
-+	(elm)->field.cqe_prev = (listelm)->field.cqe_prev;		\
-+	if ((listelm)->field.cqe_prev == DWC_CIRCLEQ_END(head))		\
-+		(head)->cqh_first = (elm);				\
-+	else								\
-+		(listelm)->field.cqe_prev->field.cqe_next = (elm);	\
-+	(listelm)->field.cqe_prev = (elm);				\
-+} while (0)
-+
-+#define DWC_CIRCLEQ_INSERT_HEAD(head, elm, field) do {			\
-+	(elm)->field.cqe_next = (head)->cqh_first;			\
-+	(elm)->field.cqe_prev = DWC_CIRCLEQ_END(head);			\
-+	if ((head)->cqh_last == DWC_CIRCLEQ_END(head))			\
-+		(head)->cqh_last = (elm);				\
-+	else								\
-+		(head)->cqh_first->field.cqe_prev = (elm);		\
-+	(head)->cqh_first = (elm);					\
-+} while (0)
-+
-+#define DWC_CIRCLEQ_INSERT_TAIL(head, elm, field) do {			\
-+	(elm)->field.cqe_next = DWC_CIRCLEQ_END(head);			\
-+	(elm)->field.cqe_prev = (head)->cqh_last;			\
-+	if ((head)->cqh_first == DWC_CIRCLEQ_END(head))			\
-+		(head)->cqh_first = (elm);				\
-+	else								\
-+		(head)->cqh_last->field.cqe_next = (elm);		\
-+	(head)->cqh_last = (elm);					\
-+} while (0)
-+
-+#define DWC_CIRCLEQ_REMOVE(head, elm, field) do {			\
-+	if ((elm)->field.cqe_next == DWC_CIRCLEQ_END(head))		\
-+		(head)->cqh_last = (elm)->field.cqe_prev;		\
-+	else								\
-+		(elm)->field.cqe_next->field.cqe_prev =			\
-+		    (elm)->field.cqe_prev;				\
-+	if ((elm)->field.cqe_prev == DWC_CIRCLEQ_END(head))		\
-+		(head)->cqh_first = (elm)->field.cqe_next;		\
-+	else								\
-+		(elm)->field.cqe_prev->field.cqe_next =			\
-+		    (elm)->field.cqe_next;				\
-+} while (0)
-+
-+#define DWC_CIRCLEQ_REMOVE_INIT(head, elm, field) do {			\
-+	DWC_CIRCLEQ_REMOVE(head, elm, field);				\
-+	DWC_CIRCLEQ_INIT_ENTRY(elm, field);				\
-+} while (0)
-+
-+#define DWC_CIRCLEQ_REPLACE(head, elm, elm2, field) do {		\
-+	if (((elm2)->field.cqe_next = (elm)->field.cqe_next) ==		\
-+	    DWC_CIRCLEQ_END(head))					\
-+		(head).cqh_last = (elm2);				\
-+	else								\
-+		(elm2)->field.cqe_next->field.cqe_prev = (elm2);	\
-+	if (((elm2)->field.cqe_prev = (elm)->field.cqe_prev) ==		\
-+	    DWC_CIRCLEQ_END(head))					\
-+		(head).cqh_first = (elm2);				\
-+	else								\
-+		(elm2)->field.cqe_prev->field.cqe_next = (elm2);	\
-+} while (0)
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _DWC_LIST_H_ */
---- /dev/null
-+++ b/drivers/usb/host/dwc_common_port/dwc_mem.c
-@@ -0,0 +1,245 @@
-+/* Memory Debugging */
-+#ifdef DWC_DEBUG_MEMORY
-+
-+#include "dwc_os.h"
-+#include "dwc_list.h"
-+
-+struct allocation {
-+	void *addr;
-+	void *ctx;
-+	char *func;
-+	int line;
-+	uint32_t size;
-+	int dma;
-+	DWC_CIRCLEQ_ENTRY(allocation) entry;
-+};
-+
-+DWC_CIRCLEQ_HEAD(allocation_queue, allocation);
-+
-+struct allocation_manager {
-+	void *mem_ctx;
-+	struct allocation_queue allocations;
-+
-+	/* statistics */
-+	int num;
-+	int num_freed;
-+	int num_active;
-+	uint32_t total;
-+	uint32_t cur;
-+	uint32_t max;
-+};
-+
-+static struct allocation_manager *manager = NULL;
-+
-+static int add_allocation(void *ctx, uint32_t size, char const *func, int line, void *addr,
-+			  int dma)
-+{
-+	struct allocation *a;
-+
-+	DWC_ASSERT(manager != NULL, "manager not allocated");
-+
-+	a = __DWC_ALLOC_ATOMIC(manager->mem_ctx, sizeof(*a));
-+	if (!a) {
-+		return -DWC_E_NO_MEMORY;
-+	}
-+
-+	a->func = __DWC_ALLOC_ATOMIC(manager->mem_ctx, DWC_STRLEN(func) + 1);
-+	if (!a->func) {
-+		__DWC_FREE(manager->mem_ctx, a);
-+		return -DWC_E_NO_MEMORY;
-+	}
-+
-+	DWC_MEMCPY(a->func, func, DWC_STRLEN(func) + 1);
-+	a->addr = addr;
-+	a->ctx = ctx;
-+	a->line = line;
-+	a->size = size;
-+	a->dma = dma;
-+	DWC_CIRCLEQ_INSERT_TAIL(&manager->allocations, a, entry);
-+
-+	/* Update stats */
-+	manager->num++;
-+	manager->num_active++;
-+	manager->total += size;
-+	manager->cur += size;
-+
-+	if (manager->max < manager->cur) {
-+		manager->max = manager->cur;
-+	}
-+
-+	return 0;
-+}
-+
-+static struct allocation *find_allocation(void *ctx, void *addr)
-+{
-+	struct allocation *a;
-+
-+	DWC_CIRCLEQ_FOREACH(a, &manager->allocations, entry) {
-+		if (a->ctx == ctx && a->addr == addr) {
-+			return a;
-+		}
-+	}
-+
-+	return NULL;
-+}
-+
-+static void free_allocation(void *ctx, void *addr, char const *func, int line)
-+{
-+	struct allocation *a = find_allocation(ctx, addr);
-+
-+	if (!a) {
-+		DWC_ASSERT(0,
-+			   "Free of address %p that was never allocated or already freed %s:%d",
-+			   addr, func, line);
-+		return;
-+	}
-+
-+	DWC_CIRCLEQ_REMOVE(&manager->allocations, a, entry);
-+
-+	manager->num_active--;
-+	manager->num_freed++;
-+	manager->cur -= a->size;
-+	__DWC_FREE(manager->mem_ctx, a->func);
-+	__DWC_FREE(manager->mem_ctx, a);
-+}
-+
-+int dwc_memory_debug_start(void *mem_ctx)
-+{
-+	DWC_ASSERT(manager == NULL, "Memory debugging has already started\n");
-+
-+	if (manager) {
-+		return -DWC_E_BUSY;
-+	}
-+
-+	manager = __DWC_ALLOC(mem_ctx, sizeof(*manager));
-+	if (!manager) {
-+		return -DWC_E_NO_MEMORY;
-+	}
-+
-+	DWC_CIRCLEQ_INIT(&manager->allocations);
-+	manager->mem_ctx = mem_ctx;
-+	manager->num = 0;
-+	manager->num_freed = 0;
-+	manager->num_active = 0;
-+	manager->total = 0;
-+	manager->cur = 0;
-+	manager->max = 0;
-+
-+	return 0;
-+}
-+
-+void dwc_memory_debug_stop(void)
-+{
-+	struct allocation *a;
-+
-+	dwc_memory_debug_report();
-+
-+	DWC_CIRCLEQ_FOREACH(a, &manager->allocations, entry) {
-+		DWC_ERROR("Memory leaked from %s:%d\n", a->func, a->line);
-+		free_allocation(a->ctx, a->addr, NULL, -1);
-+	}
-+
-+	__DWC_FREE(manager->mem_ctx, manager);
-+}
-+
-+void dwc_memory_debug_report(void)
-+{
-+	struct allocation *a;
-+
-+	DWC_PRINTF("\n\n\n----------------- Memory Debugging Report -----------------\n\n");
-+	DWC_PRINTF("Num Allocations = %d\n", manager->num);
-+	DWC_PRINTF("Freed = %d\n", manager->num_freed);
-+	DWC_PRINTF("Active = %d\n", manager->num_active);
-+	DWC_PRINTF("Current Memory Used = %d\n", manager->cur);
-+	DWC_PRINTF("Total Memory Used = %d\n", manager->total);
-+	DWC_PRINTF("Maximum Memory Used at Once = %d\n", manager->max);
-+	DWC_PRINTF("Unfreed allocations:\n");
-+
-+	DWC_CIRCLEQ_FOREACH(a, &manager->allocations, entry) {
-+		DWC_PRINTF("    addr=%p, size=%d from %s:%d, DMA=%d\n",
-+			   a->addr, a->size, a->func, a->line, a->dma);
-+	}
-+}
-+
-+/* The replacement functions */
-+void *dwc_alloc_debug(void *mem_ctx, uint32_t size, char const *func, int line)
-+{
-+	void *addr = __DWC_ALLOC(mem_ctx, size);
-+
-+	if (!addr) {
-+		return NULL;
-+	}
-+
-+	if (add_allocation(mem_ctx, size, func, line, addr, 0)) {
-+		__DWC_FREE(mem_ctx, addr);
-+		return NULL;
-+	}
-+
-+	return addr;
-+}
-+
-+void *dwc_alloc_atomic_debug(void *mem_ctx, uint32_t size, char const *func,
-+			     int line)
-+{
-+	void *addr = __DWC_ALLOC_ATOMIC(mem_ctx, size);
-+
-+	if (!addr) {
-+		return NULL;
-+	}
-+
-+	if (add_allocation(mem_ctx, size, func, line, addr, 0)) {
-+		__DWC_FREE(mem_ctx, addr);
-+		return NULL;
-+	}
-+
-+	return addr;
-+}
-+
-+void dwc_free_debug(void *mem_ctx, void *addr, char const *func, int line)
-+{
-+	free_allocation(mem_ctx, addr, func, line);
-+	__DWC_FREE(mem_ctx, addr);
-+}
-+
-+void *dwc_dma_alloc_debug(void *dma_ctx, uint32_t size, dwc_dma_t *dma_addr,
-+			  char const *func, int line)
-+{
-+	void *addr = __DWC_DMA_ALLOC(dma_ctx, size, dma_addr);
-+
-+	if (!addr) {
-+		return NULL;
-+	}
-+
-+	if (add_allocation(dma_ctx, size, func, line, addr, 1)) {
-+		__DWC_DMA_FREE(dma_ctx, size, addr, *dma_addr);
-+		return NULL;
-+	}
-+
-+	return addr;
-+}
-+
-+void *dwc_dma_alloc_atomic_debug(void *dma_ctx, uint32_t size,
-+				 dwc_dma_t *dma_addr, char const *func, int line)
-+{
-+	void *addr = __DWC_DMA_ALLOC_ATOMIC(dma_ctx, size, dma_addr);
-+
-+	if (!addr) {
-+		return NULL;
-+	}
-+
-+	if (add_allocation(dma_ctx, size, func, line, addr, 1)) {
-+		__DWC_DMA_FREE(dma_ctx, size, addr, *dma_addr);
-+		return NULL;
-+	}
-+
-+	return addr;
-+}
-+
-+void dwc_dma_free_debug(void *dma_ctx, uint32_t size, void *virt_addr,
-+			dwc_dma_t dma_addr, char const *func, int line)
-+{
-+	free_allocation(dma_ctx, virt_addr, func, line);
-+	__DWC_DMA_FREE(dma_ctx, size, virt_addr, dma_addr);
-+}
-+
-+#endif /* DWC_DEBUG_MEMORY */
---- /dev/null
-+++ b/drivers/usb/host/dwc_common_port/dwc_modpow.c
-@@ -0,0 +1,636 @@
-+/* Bignum routines adapted from PUTTY sources.  PuTTY copyright notice follows.
-+ *
-+ * PuTTY is copyright 1997-2007 Simon Tatham.
-+ *
-+ * Portions copyright Robert de Bath, Joris van Rantwijk, Delian
-+ * Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,
-+ * Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus
-+ * Kuhn, and CORE SDI S.A.
-+ *
-+ * Permission is hereby granted, free of charge, to any person
-+ * obtaining a copy of this software and associated documentation files
-+ * (the "Software"), to deal in the Software without restriction,
-+ * including without limitation the rights to use, copy, modify, merge,
-+ * publish, distribute, sublicense, and/or sell copies of the Software,
-+ * and to permit persons to whom the Software is furnished to do so,
-+ * subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be
-+ * included in all copies or substantial portions of the Software.
-+
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ * NONINFRINGEMENT.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE
-+ * FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ *
-+ */
-+#ifdef DWC_CRYPTOLIB
-+
-+#ifndef CONFIG_MACH_IPMATE
-+
-+#include "dwc_modpow.h"
-+
-+#define BIGNUM_INT_MASK  0xFFFFFFFFUL
-+#define BIGNUM_TOP_BIT   0x80000000UL
-+#define BIGNUM_INT_BITS  32
-+
-+
-+static void *snmalloc(void *mem_ctx, size_t n, size_t size)
-+{
-+    void *p;
-+    size *= n;
-+    if (size == 0) size = 1;
-+    p = dwc_alloc(mem_ctx, size);
-+    return p;
-+}
-+
-+#define snewn(ctx, n, type) ((type *)snmalloc((ctx), (n), sizeof(type)))
-+#define sfree dwc_free
-+
-+/*
-+ * Usage notes:
-+ *  * Do not call the DIVMOD_WORD macro with expressions such as array
-+ *    subscripts, as some implementations object to this (see below).
-+ *  * Note that none of the division methods below will cope if the
-+ *    quotient won't fit into BIGNUM_INT_BITS. Callers should be careful
-+ *    to avoid this case.
-+ *    If this condition occurs, in the case of the x86 DIV instruction,
-+ *    an overflow exception will occur, which (according to a correspondent)
-+ *    will manifest on Windows as something like
-+ *      0xC0000095: Integer overflow
-+ *    The C variant won't give the right answer, either.
-+ */
-+
-+#define MUL_WORD(w1, w2) ((BignumDblInt)w1 * w2)
-+
-+#if defined __GNUC__ && defined __i386__
-+#define DIVMOD_WORD(q, r, hi, lo, w) \
-+    __asm__("div %2" : \
-+	    "=d" (r), "=a" (q) : \
-+	    "r" (w), "d" (hi), "a" (lo))
-+#else
-+#define DIVMOD_WORD(q, r, hi, lo, w) do { \
-+    BignumDblInt n = (((BignumDblInt)hi) << BIGNUM_INT_BITS) | lo; \
-+    q = n / w; \
-+    r = n % w; \
-+} while (0)
-+#endif
-+
-+//    q = n / w;
-+//    r = n % w;
-+
-+#define BIGNUM_INT_BYTES (BIGNUM_INT_BITS / 8)
-+
-+#define BIGNUM_INTERNAL
-+
-+static Bignum newbn(void *mem_ctx, int length)
-+{
-+    Bignum b = snewn(mem_ctx, length + 1, BignumInt);
-+    //if (!b)
-+    //abort();		       /* FIXME */
-+    DWC_MEMSET(b, 0, (length + 1) * sizeof(*b));
-+    b[0] = length;
-+    return b;
-+}
-+
-+void freebn(void *mem_ctx, Bignum b)
-+{
-+    /*
-+     * Burn the evidence, just in case.
-+     */
-+    DWC_MEMSET(b, 0, sizeof(b[0]) * (b[0] + 1));
-+    sfree(mem_ctx, b);
-+}
-+
-+/*
-+ * Compute c = a * b.
-+ * Input is in the first len words of a and b.
-+ * Result is returned in the first 2*len words of c.
-+ */
-+static void internal_mul(BignumInt *a, BignumInt *b,
-+			 BignumInt *c, int len)
-+{
-+    int i, j;
-+    BignumDblInt t;
-+
-+    for (j = 0; j < 2 * len; j++)
-+	c[j] = 0;
-+
-+    for (i = len - 1; i >= 0; i--) {
-+	t = 0;
-+	for (j = len - 1; j >= 0; j--) {
-+	    t += MUL_WORD(a[i], (BignumDblInt) b[j]);
-+	    t += (BignumDblInt) c[i + j + 1];
-+	    c[i + j + 1] = (BignumInt) t;
-+	    t = t >> BIGNUM_INT_BITS;
-+	}
-+	c[i] = (BignumInt) t;
-+    }
-+}
-+
-+static void internal_add_shifted(BignumInt *number,
-+				 unsigned n, int shift)
-+{
-+    int word = 1 + (shift / BIGNUM_INT_BITS);
-+    int bshift = shift % BIGNUM_INT_BITS;
-+    BignumDblInt addend;
-+
-+    addend = (BignumDblInt)n << bshift;
-+
-+    while (addend) {
-+	addend += number[word];
-+	number[word] = (BignumInt) addend & BIGNUM_INT_MASK;
-+	addend >>= BIGNUM_INT_BITS;
-+	word++;
-+    }
-+}
-+
-+/*
-+ * Compute a = a % m.
-+ * Input in first alen words of a and first mlen words of m.
-+ * Output in first alen words of a
-+ * (of which first alen-mlen words will be zero).
-+ * The MSW of m MUST have its high bit set.
-+ * Quotient is accumulated in the `quotient' array, which is a Bignum
-+ * rather than the internal bigendian format. Quotient parts are shifted
-+ * left by `qshift' before adding into quot.
-+ */
-+static void internal_mod(BignumInt *a, int alen,
-+			 BignumInt *m, int mlen,
-+			 BignumInt *quot, int qshift)
-+{
-+    BignumInt m0, m1;
-+    unsigned int h;
-+    int i, k;
-+
-+    m0 = m[0];
-+    if (mlen > 1)
-+	m1 = m[1];
-+    else
-+	m1 = 0;
-+
-+    for (i = 0; i <= alen - mlen; i++) {
-+	BignumDblInt t;
-+	unsigned int q, r, c, ai1;
-+
-+	if (i == 0) {
-+	    h = 0;
-+	} else {
-+	    h = a[i - 1];
-+	    a[i - 1] = 0;
-+	}
-+
-+	if (i == alen - 1)
-+	    ai1 = 0;
-+	else
-+	    ai1 = a[i + 1];
-+
-+	/* Find q = h:a[i] / m0 */
-+	if (h >= m0) {
-+	    /*
-+	     * Special case.
-+	     *
-+	     * To illustrate it, suppose a BignumInt is 8 bits, and
-+	     * we are dividing (say) A1:23:45:67 by A1:B2:C3. Then
-+	     * our initial division will be 0xA123 / 0xA1, which
-+	     * will give a quotient of 0x100 and a divide overflow.
-+	     * However, the invariants in this division algorithm
-+	     * are not violated, since the full number A1:23:... is
-+	     * _less_ than the quotient prefix A1:B2:... and so the
-+	     * following correction loop would have sorted it out.
-+	     *
-+	     * In this situation we set q to be the largest
-+	     * quotient we _can_ stomach (0xFF, of course).
-+	     */
-+	    q = BIGNUM_INT_MASK;
-+	} else {
-+	    /* Macro doesn't want an array subscript expression passed
-+	     * into it (see definition), so use a temporary. */
-+	    BignumInt tmplo = a[i];
-+	    DIVMOD_WORD(q, r, h, tmplo, m0);
-+
-+	    /* Refine our estimate of q by looking at
-+	     h:a[i]:a[i+1] / m0:m1 */
-+	    t = MUL_WORD(m1, q);
-+	    if (t > ((BignumDblInt) r << BIGNUM_INT_BITS) + ai1) {
-+		q--;
-+		t -= m1;
-+		r = (r + m0) & BIGNUM_INT_MASK;     /* overflow? */
-+		if (r >= (BignumDblInt) m0 &&
-+		    t > ((BignumDblInt) r << BIGNUM_INT_BITS) + ai1) q--;
-+	    }
-+	}
-+
-+	/* Subtract q * m from a[i...] */
-+	c = 0;
-+	for (k = mlen - 1; k >= 0; k--) {
-+	    t = MUL_WORD(q, m[k]);
-+	    t += c;
-+	    c = (unsigned)(t >> BIGNUM_INT_BITS);
-+	    if ((BignumInt) t > a[i + k])
-+		c++;
-+	    a[i + k] -= (BignumInt) t;
-+	}
-+
-+	/* Add back m in case of borrow */
-+	if (c != h) {
-+	    t = 0;
-+	    for (k = mlen - 1; k >= 0; k--) {
-+		t += m[k];
-+		t += a[i + k];
-+		a[i + k] = (BignumInt) t;
-+		t = t >> BIGNUM_INT_BITS;
-+	    }
-+	    q--;
-+	}
-+	if (quot)
-+	    internal_add_shifted(quot, q, qshift + BIGNUM_INT_BITS * (alen - mlen - i));
-+    }
-+}
-+
-+/*
-+ * Compute p % mod.
-+ * The most significant word of mod MUST be non-zero.
-+ * We assume that the result array is the same size as the mod array.
-+ * We optionally write out a quotient if `quotient' is non-NULL.
-+ * We can avoid writing out the result if `result' is NULL.
-+ */
-+void bigdivmod(void *mem_ctx, Bignum p, Bignum mod, Bignum result, Bignum quotient)
-+{
-+    BignumInt *n, *m;
-+    int mshift;
-+    int plen, mlen, i, j;
-+
-+    /* Allocate m of size mlen, copy mod to m */
-+    /* We use big endian internally */
-+    mlen = mod[0];
-+    m = snewn(mem_ctx, mlen, BignumInt);
-+    //if (!m)
-+    //abort();		       /* FIXME */
-+    for (j = 0; j < mlen; j++)
-+	m[j] = mod[mod[0] - j];
-+
-+    /* Shift m left to make msb bit set */
-+    for (mshift = 0; mshift < BIGNUM_INT_BITS-1; mshift++)
-+	if ((m[0] << mshift) & BIGNUM_TOP_BIT)
-+	    break;
-+    if (mshift) {
-+	for (i = 0; i < mlen - 1; i++)
-+	    m[i] = (m[i] << mshift) | (m[i + 1] >> (BIGNUM_INT_BITS - mshift));
-+	m[mlen - 1] = m[mlen - 1] << mshift;
-+    }
-+
-+    plen = p[0];
-+    /* Ensure plen > mlen */
-+    if (plen <= mlen)
-+	plen = mlen + 1;
-+
-+    /* Allocate n of size plen, copy p to n */
-+    n = snewn(mem_ctx, plen, BignumInt);
-+    //if (!n)
-+    //abort();		       /* FIXME */
-+    for (j = 0; j < plen; j++)
-+	n[j] = 0;
-+    for (j = 1; j <= (int)p[0]; j++)
-+	n[plen - j] = p[j];
-+
-+    /* Main computation */
-+    internal_mod(n, plen, m, mlen, quotient, mshift);
-+
-+    /* Fixup result in case the modulus was shifted */
-+    if (mshift) {
-+	for (i = plen - mlen - 1; i < plen - 1; i++)
-+	    n[i] = (n[i] << mshift) | (n[i + 1] >> (BIGNUM_INT_BITS - mshift));
-+	n[plen - 1] = n[plen - 1] << mshift;
-+	internal_mod(n, plen, m, mlen, quotient, 0);
-+	for (i = plen - 1; i >= plen - mlen; i--)
-+	    n[i] = (n[i] >> mshift) | (n[i - 1] << (BIGNUM_INT_BITS - mshift));
-+    }
-+
-+    /* Copy result to buffer */
-+    if (result) {
-+	for (i = 1; i <= (int)result[0]; i++) {
-+	    int j = plen - i;
-+	    result[i] = j >= 0 ? n[j] : 0;
-+	}
-+    }
-+
-+    /* Free temporary arrays */
-+    for (i = 0; i < mlen; i++)
-+	m[i] = 0;
-+    sfree(mem_ctx, m);
-+    for (i = 0; i < plen; i++)
-+	n[i] = 0;
-+    sfree(mem_ctx, n);
-+}
-+
-+/*
-+ * Simple remainder.
-+ */
-+Bignum bigmod(void *mem_ctx, Bignum a, Bignum b)
-+{
-+    Bignum r = newbn(mem_ctx, b[0]);
-+    bigdivmod(mem_ctx, a, b, r, NULL);
-+    return r;
-+}
-+
-+/*
-+ * Compute (base ^ exp) % mod.
-+ */
-+Bignum dwc_modpow(void *mem_ctx, Bignum base_in, Bignum exp, Bignum mod)
-+{
-+    BignumInt *a, *b, *n, *m;
-+    int mshift;
-+    int mlen, i, j;
-+    Bignum base, result;
-+
-+    /*
-+     * The most significant word of mod needs to be non-zero. It
-+     * should already be, but let's make sure.
-+     */
-+    //assert(mod[mod[0]] != 0);
-+
-+    /*
-+     * Make sure the base is smaller than the modulus, by reducing
-+     * it modulo the modulus if not.
-+     */
-+    base = bigmod(mem_ctx, base_in, mod);
-+
-+    /* Allocate m of size mlen, copy mod to m */
-+    /* We use big endian internally */
-+    mlen = mod[0];
-+    m = snewn(mem_ctx, mlen, BignumInt);
-+    //if (!m)
-+    //abort();		       /* FIXME */
-+    for (j = 0; j < mlen; j++)
-+	m[j] = mod[mod[0] - j];
-+
-+    /* Shift m left to make msb bit set */
-+    for (mshift = 0; mshift < BIGNUM_INT_BITS - 1; mshift++)
-+	if ((m[0] << mshift) & BIGNUM_TOP_BIT)
-+	    break;
-+    if (mshift) {
-+	for (i = 0; i < mlen - 1; i++)
-+	    m[i] =
-+		(m[i] << mshift) | (m[i + 1] >>
-+				    (BIGNUM_INT_BITS - mshift));
-+	m[mlen - 1] = m[mlen - 1] << mshift;
-+    }
-+
-+    /* Allocate n of size mlen, copy base to n */
-+    n = snewn(mem_ctx, mlen, BignumInt);
-+    //if (!n)
-+    //abort();		       /* FIXME */
-+    i = mlen - base[0];
-+    for (j = 0; j < i; j++)
-+	n[j] = 0;
-+    for (j = 0; j < base[0]; j++)
-+	n[i + j] = base[base[0] - j];
-+
-+    /* Allocate a and b of size 2*mlen. Set a = 1 */
-+    a = snewn(mem_ctx, 2 * mlen, BignumInt);
-+    //if (!a)
-+    //abort();		       /* FIXME */
-+    b = snewn(mem_ctx, 2 * mlen, BignumInt);
-+    //if (!b)
-+    //abort();		       /* FIXME */
-+    for (i = 0; i < 2 * mlen; i++)
-+	a[i] = 0;
-+    a[2 * mlen - 1] = 1;
-+
-+    /* Skip leading zero bits of exp. */
-+    i = 0;
-+    j = BIGNUM_INT_BITS - 1;
-+    while (i < exp[0] && (exp[exp[0] - i] & (1 << j)) == 0) {
-+	j--;
-+	if (j < 0) {
-+	    i++;
-+	    j = BIGNUM_INT_BITS - 1;
-+	}
-+    }
-+
-+    /* Main computation */
-+    while (i < exp[0]) {
-+	while (j >= 0) {
-+	    internal_mul(a + mlen, a + mlen, b, mlen);
-+	    internal_mod(b, mlen * 2, m, mlen, NULL, 0);
-+	    if ((exp[exp[0] - i] & (1 << j)) != 0) {
-+		internal_mul(b + mlen, n, a, mlen);
-+		internal_mod(a, mlen * 2, m, mlen, NULL, 0);
-+	    } else {
-+		BignumInt *t;
-+		t = a;
-+		a = b;
-+		b = t;
-+	    }
-+	    j--;
-+	}
-+	i++;
-+	j = BIGNUM_INT_BITS - 1;
-+    }
-+
-+    /* Fixup result in case the modulus was shifted */
-+    if (mshift) {
-+	for (i = mlen - 1; i < 2 * mlen - 1; i++)
-+	    a[i] =
-+		(a[i] << mshift) | (a[i + 1] >>
-+				    (BIGNUM_INT_BITS - mshift));
-+	a[2 * mlen - 1] = a[2 * mlen - 1] << mshift;
-+	internal_mod(a, mlen * 2, m, mlen, NULL, 0);
-+	for (i = 2 * mlen - 1; i >= mlen; i--)
-+	    a[i] =
-+		(a[i] >> mshift) | (a[i - 1] <<
-+				    (BIGNUM_INT_BITS - mshift));
-+    }
-+
-+    /* Copy result to buffer */
-+    result = newbn(mem_ctx, mod[0]);
-+    for (i = 0; i < mlen; i++)
-+	result[result[0] - i] = a[i + mlen];
-+    while (result[0] > 1 && result[result[0]] == 0)
-+	result[0]--;
-+
-+    /* Free temporary arrays */
-+    for (i = 0; i < 2 * mlen; i++)
-+	a[i] = 0;
-+    sfree(mem_ctx, a);
-+    for (i = 0; i < 2 * mlen; i++)
-+	b[i] = 0;
-+    sfree(mem_ctx, b);
-+    for (i = 0; i < mlen; i++)
-+	m[i] = 0;
-+    sfree(mem_ctx, m);
-+    for (i = 0; i < mlen; i++)
-+	n[i] = 0;
-+    sfree(mem_ctx, n);
-+
-+    freebn(mem_ctx, base);
-+
-+    return result;
-+}
-+
-+
-+#ifdef UNITTEST
-+
-+static __u32 dh_p[] = {
-+	96,
-+	0xFFFFFFFF,
-+	0xFFFFFFFF,
-+	0xA93AD2CA,
-+	0x4B82D120,
-+	0xE0FD108E,
-+	0x43DB5BFC,
-+	0x74E5AB31,
-+	0x08E24FA0,
-+	0xBAD946E2,
-+	0x770988C0,
-+	0x7A615D6C,
-+	0xBBE11757,
-+	0x177B200C,
-+	0x521F2B18,
-+	0x3EC86A64,
-+	0xD8760273,
-+	0xD98A0864,
-+	0xF12FFA06,
-+	0x1AD2EE6B,
-+	0xCEE3D226,
-+	0x4A25619D,
-+	0x1E8C94E0,
-+	0xDB0933D7,
-+	0xABF5AE8C,
-+	0xA6E1E4C7,
-+	0xB3970F85,
-+	0x5D060C7D,
-+	0x8AEA7157,
-+	0x58DBEF0A,
-+	0xECFB8504,
-+	0xDF1CBA64,
-+	0xA85521AB,
-+	0x04507A33,
-+	0xAD33170D,
-+	0x8AAAC42D,
-+	0x15728E5A,
-+	0x98FA0510,
-+	0x15D22618,
-+	0xEA956AE5,
-+	0x3995497C,
-+	0x95581718,
-+	0xDE2BCBF6,
-+	0x6F4C52C9,
-+	0xB5C55DF0,
-+	0xEC07A28F,
-+	0x9B2783A2,
-+	0x180E8603,
-+	0xE39E772C,
-+	0x2E36CE3B,
-+	0x32905E46,
-+	0xCA18217C,
-+	0xF1746C08,
-+	0x4ABC9804,
-+	0x670C354E,
-+	0x7096966D,
-+	0x9ED52907,
-+	0x208552BB,
-+	0x1C62F356,
-+	0xDCA3AD96,
-+	0x83655D23,
-+	0xFD24CF5F,
-+	0x69163FA8,
-+	0x1C55D39A,
-+	0x98DA4836,
-+	0xA163BF05,
-+	0xC2007CB8,
-+	0xECE45B3D,
-+	0x49286651,
-+	0x7C4B1FE6,
-+	0xAE9F2411,
-+	0x5A899FA5,
-+	0xEE386BFB,
-+	0xF406B7ED,
-+	0x0BFF5CB6,
-+	0xA637ED6B,
-+	0xF44C42E9,
-+	0x625E7EC6,
-+	0xE485B576,
-+	0x6D51C245,
-+	0x4FE1356D,
-+	0xF25F1437,
-+	0x302B0A6D,
-+	0xCD3A431B,
-+	0xEF9519B3,
-+	0x8E3404DD,
-+	0x514A0879,
-+	0x3B139B22,
-+	0x020BBEA6,
-+	0x8A67CC74,
-+	0x29024E08,
-+	0x80DC1CD1,
-+	0xC4C6628B,
-+	0x2168C234,
-+	0xC90FDAA2,
-+	0xFFFFFFFF,
-+	0xFFFFFFFF,
-+};
-+
-+static __u32 dh_a[] = {
-+	8,
-+	0xdf367516,
-+	0x86459caa,
-+	0xe2d459a4,
-+	0xd910dae0,
-+	0x8a8b5e37,
-+	0x67ab31c6,
-+	0xf0b55ea9,
-+	0x440051d6,
-+};
-+
-+static __u32 dh_b[] = {
-+	8,
-+	0xded92656,
-+	0xe07a048a,
-+	0x6fa452cd,
-+	0x2df89d30,
-+	0xc75f1b0f,
-+	0x8ce3578f,
-+	0x7980a324,
-+	0x5daec786,
-+};
-+
-+static __u32 dh_g[] = {
-+	1,
-+	2,
-+};
-+
-+int main(void)
-+{
-+	int i;
-+	__u32 *k;
-+	k = dwc_modpow(NULL, dh_g, dh_a, dh_p);
-+
-+	printf("\n\n");
-+	for (i=0; i<k[0]; i++) {
-+		__u32 word32 = k[k[0] - i];
-+		__u16 l = word32 & 0xffff;
-+		__u16 m = (word32 & 0xffff0000) >> 16;
-+		printf("%04x %04x ", m, l);
-+		if (!((i + 1)%13)) printf("\n");
-+	}
-+	printf("\n\n");
-+
-+	if ((k[0] == 0x60) && (k[1] == 0x28e490e5) && (k[0x60] == 0x5a0d3d4e)) {
-+		printf("PASS\n\n");
-+	}
-+	else {
-+		printf("FAIL\n\n");
-+	}
-+
-+}
-+
-+#endif /* UNITTEST */
-+
-+#endif /* CONFIG_MACH_IPMATE */
-+
-+#endif /*DWC_CRYPTOLIB */
---- /dev/null
-+++ b/drivers/usb/host/dwc_common_port/dwc_modpow.h
-@@ -0,0 +1,34 @@
-+/*
-+ * dwc_modpow.h
-+ * See dwc_modpow.c for license and changes
-+ */
-+#ifndef _DWC_MODPOW_H
-+#define _DWC_MODPOW_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include "dwc_os.h"
-+
-+/** @file
-+ *
-+ * This file defines the module exponentiation function which is only used
-+ * internally by the DWC UWB modules for calculation of PKs during numeric
-+ * association.  The routine is taken from the PUTTY, an open source terminal
-+ * emulator.  The PUTTY License is preserved in the dwc_modpow.c file.
-+ *
-+ */
-+
-+typedef uint32_t BignumInt;
-+typedef uint64_t BignumDblInt;
-+typedef BignumInt *Bignum;
-+
-+/* Compute modular exponentiaion */
-+extern Bignum dwc_modpow(void *mem_ctx, Bignum base_in, Bignum exp, Bignum mod);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _LINUX_BIGNUM_H */
---- /dev/null
-+++ b/drivers/usb/host/dwc_common_port/dwc_notifier.c
-@@ -0,0 +1,319 @@
-+#ifdef DWC_NOTIFYLIB
-+
-+#include "dwc_notifier.h"
-+#include "dwc_list.h"
-+
-+typedef struct dwc_observer {
-+	void *observer;
-+	dwc_notifier_callback_t callback;
-+	void *data;
-+	char *notification;
-+	DWC_CIRCLEQ_ENTRY(dwc_observer) list_entry;
-+} observer_t;
-+
-+DWC_CIRCLEQ_HEAD(observer_queue, dwc_observer);
-+
-+typedef struct dwc_notifier {
-+	void *mem_ctx;
-+	void *object;
-+	struct observer_queue observers;
-+	DWC_CIRCLEQ_ENTRY(dwc_notifier) list_entry;
-+} notifier_t;
-+
-+DWC_CIRCLEQ_HEAD(notifier_queue, dwc_notifier);
-+
-+typedef struct manager {
-+	void *mem_ctx;
-+	void *wkq_ctx;
-+	dwc_workq_t *wq;
-+//	dwc_mutex_t *mutex;
-+	struct notifier_queue notifiers;
-+} manager_t;
-+
-+static manager_t *manager = NULL;
-+
-+static int create_manager(void *mem_ctx, void *wkq_ctx)
-+{
-+	manager = dwc_alloc(mem_ctx, sizeof(manager_t));
-+	if (!manager) {
-+		return -DWC_E_NO_MEMORY;
-+	}
-+
-+	DWC_CIRCLEQ_INIT(&manager->notifiers);
-+
-+	manager->wq = dwc_workq_alloc(wkq_ctx, "DWC Notification WorkQ");
-+	if (!manager->wq) {
-+		return -DWC_E_NO_MEMORY;
-+	}
-+
-+	return 0;
-+}
-+
-+static void free_manager(void)
-+{
-+	dwc_workq_free(manager->wq);
-+
-+	/* All notifiers must have unregistered themselves before this module
-+	 * can be removed.  Hitting this assertion indicates a programmer
-+	 * error. */
-+	DWC_ASSERT(DWC_CIRCLEQ_EMPTY(&manager->notifiers),
-+		   "Notification manager being freed before all notifiers have been removed");
-+	dwc_free(manager->mem_ctx, manager);
-+}
-+
-+#ifdef DEBUG
-+static void dump_manager(void)
-+{
-+	notifier_t *n;
-+	observer_t *o;
-+
-+	DWC_ASSERT(manager, "Notification manager not found");
-+
-+	DWC_DEBUG("List of all notifiers and observers:\n");
-+	DWC_CIRCLEQ_FOREACH(n, &manager->notifiers, list_entry) {
-+		DWC_DEBUG("Notifier %p has observers:\n", n->object);
-+		DWC_CIRCLEQ_FOREACH(o, &n->observers, list_entry) {
-+			DWC_DEBUG("    %p watching %s\n", o->observer, o->notification);
-+		}
-+	}
-+}
-+#else
-+#define dump_manager(...)
-+#endif
-+
-+static observer_t *alloc_observer(void *mem_ctx, void *observer, char *notification,
-+				  dwc_notifier_callback_t callback, void *data)
-+{
-+	observer_t *new_observer = dwc_alloc(mem_ctx, sizeof(observer_t));
-+
-+	if (!new_observer) {
-+		return NULL;
-+	}
-+
-+	DWC_CIRCLEQ_INIT_ENTRY(new_observer, list_entry);
-+	new_observer->observer = observer;
-+	new_observer->notification = notification;
-+	new_observer->callback = callback;
-+	new_observer->data = data;
-+	return new_observer;
-+}
-+
-+static void free_observer(void *mem_ctx, observer_t *observer)
-+{
-+	dwc_free(mem_ctx, observer);
-+}
-+
-+static notifier_t *alloc_notifier(void *mem_ctx, void *object)
-+{
-+	notifier_t *notifier;
-+
-+	if (!object) {
-+		return NULL;
-+	}
-+
-+	notifier = dwc_alloc(mem_ctx, sizeof(notifier_t));
-+	if (!notifier) {
-+		return NULL;
-+	}
-+
-+	DWC_CIRCLEQ_INIT(&notifier->observers);
-+	DWC_CIRCLEQ_INIT_ENTRY(notifier, list_entry);
-+
-+	notifier->mem_ctx = mem_ctx;
-+	notifier->object = object;
-+	return notifier;
-+}
-+
-+static void free_notifier(notifier_t *notifier)
-+{
-+	observer_t *observer;
-+
-+	DWC_CIRCLEQ_FOREACH(observer, &notifier->observers, list_entry) {
-+		free_observer(notifier->mem_ctx, observer);
-+	}
-+
-+	dwc_free(notifier->mem_ctx, notifier);
-+}
-+
-+static notifier_t *find_notifier(void *object)
-+{
-+	notifier_t *notifier;
-+
-+	DWC_ASSERT(manager, "Notification manager not found");
-+
-+	if (!object) {
-+		return NULL;
-+	}
-+
-+	DWC_CIRCLEQ_FOREACH(notifier, &manager->notifiers, list_entry) {
-+		if (notifier->object == object) {
-+			return notifier;
-+		}
-+	}
-+
-+	return NULL;
-+}
-+
-+int dwc_alloc_notification_manager(void *mem_ctx, void *wkq_ctx)
-+{
-+	return create_manager(mem_ctx, wkq_ctx);
-+}
-+
-+void dwc_free_notification_manager(void)
-+{
-+	free_manager();
-+}
-+
-+dwc_notifier_t *dwc_register_notifier(void *mem_ctx, void *object)
-+{
-+	notifier_t *notifier;
-+
-+	DWC_ASSERT(manager, "Notification manager not found");
-+
-+	notifier = find_notifier(object);
-+	if (notifier) {
-+		DWC_ERROR("Notifier %p is already registered\n", object);
-+		return NULL;
-+	}
-+
-+	notifier = alloc_notifier(mem_ctx, object);
-+	if (!notifier) {
-+		return NULL;
-+	}
-+
-+	DWC_CIRCLEQ_INSERT_TAIL(&manager->notifiers, notifier, list_entry);
-+
-+	DWC_INFO("Notifier %p registered", object);
-+	dump_manager();
-+
-+	return notifier;
-+}
-+
-+void dwc_unregister_notifier(dwc_notifier_t *notifier)
-+{
-+	DWC_ASSERT(manager, "Notification manager not found");
-+
-+	if (!DWC_CIRCLEQ_EMPTY(&notifier->observers)) {
-+		observer_t *o;
-+
-+		DWC_ERROR("Notifier %p has active observers when removing\n", notifier->object);
-+		DWC_CIRCLEQ_FOREACH(o, &notifier->observers, list_entry) {
-+			DWC_DEBUGC("    %p watching %s\n", o->observer, o->notification);
-+		}
-+
-+		DWC_ASSERT(DWC_CIRCLEQ_EMPTY(&notifier->observers),
-+			   "Notifier %p has active observers when removing", notifier);
-+	}
-+
-+	DWC_CIRCLEQ_REMOVE_INIT(&manager->notifiers, notifier, list_entry);
-+	free_notifier(notifier);
-+
-+	DWC_INFO("Notifier unregistered");
-+	dump_manager();
-+}
-+
-+/* Add an observer to observe the notifier for a particular state, event, or notification. */
-+int dwc_add_observer(void *observer, void *object, char *notification,
-+		     dwc_notifier_callback_t callback, void *data)
-+{
-+	notifier_t *notifier = find_notifier(object);
-+	observer_t *new_observer;
-+
-+	if (!notifier) {
-+		DWC_ERROR("Notifier %p is not found when adding observer\n", object);
-+		return -DWC_E_INVALID;
-+	}
-+
-+	new_observer = alloc_observer(notifier->mem_ctx, observer, notification, callback, data);
-+	if (!new_observer) {
-+		return -DWC_E_NO_MEMORY;
-+	}
-+
-+	DWC_CIRCLEQ_INSERT_TAIL(&notifier->observers, new_observer, list_entry);
-+
-+	DWC_INFO("Added observer %p to notifier %p observing notification %s, callback=%p, data=%p",
-+		 observer, object, notification, callback, data);
-+
-+	dump_manager();
-+	return 0;
-+}
-+
-+int dwc_remove_observer(void *observer)
-+{
-+	notifier_t *n;
-+
-+	DWC_ASSERT(manager, "Notification manager not found");
-+
-+	DWC_CIRCLEQ_FOREACH(n, &manager->notifiers, list_entry) {
-+		observer_t *o;
-+		observer_t *o2;
-+
-+		DWC_CIRCLEQ_FOREACH_SAFE(o, o2, &n->observers, list_entry) {
-+			if (o->observer == observer) {
-+				DWC_CIRCLEQ_REMOVE_INIT(&n->observers, o, list_entry);
-+				DWC_INFO("Removing observer %p from notifier %p watching notification %s:",
-+					 o->observer, n->object, o->notification);
-+				free_observer(n->mem_ctx, o);
-+			}
-+		}
-+	}
-+
-+	dump_manager();
-+	return 0;
-+}
-+
-+typedef struct callback_data {
-+	void *mem_ctx;
-+	dwc_notifier_callback_t cb;
-+	void *observer;
-+	void *data;
-+	void *object;
-+	char *notification;
-+	void *notification_data;
-+} cb_data_t;
-+
-+static void cb_task(void *data)
-+{
-+	cb_data_t *cb = (cb_data_t *)data;
-+
-+	cb->cb(cb->object, cb->notification, cb->observer, cb->notification_data, cb->data);
-+	dwc_free(cb->mem_ctx, cb);
-+}
-+
-+void dwc_notify(dwc_notifier_t *notifier, char *notification, void *notification_data)
-+{
-+	observer_t *o;
-+
-+	DWC_ASSERT(manager, "Notification manager not found");
-+
-+	DWC_CIRCLEQ_FOREACH(o, &notifier->observers, list_entry) {
-+		int len = DWC_STRLEN(notification);
-+
-+		if (DWC_STRLEN(o->notification) != len) {
-+			continue;
-+		}
-+
-+		if (DWC_STRNCMP(o->notification, notification, len) == 0) {
-+			cb_data_t *cb_data = dwc_alloc(notifier->mem_ctx, sizeof(cb_data_t));
-+
-+			if (!cb_data) {
-+				DWC_ERROR("Failed to allocate callback data\n");
-+				return;
-+			}
-+
-+			cb_data->mem_ctx = notifier->mem_ctx;
-+			cb_data->cb = o->callback;
-+			cb_data->observer = o->observer;
-+			cb_data->data = o->data;
-+			cb_data->object = notifier->object;
-+			cb_data->notification = notification;
-+			cb_data->notification_data = notification_data;
-+			DWC_DEBUGC("Observer found %p for notification %s\n", o->observer, notification);
-+			DWC_WORKQ_SCHEDULE(manager->wq, cb_task, cb_data,
-+					   "Notify callback from %p for Notification %s, to observer %p",
-+					   cb_data->object, notification, cb_data->observer);
-+		}
-+	}
-+}
-+
-+#endif	/* DWC_NOTIFYLIB */
---- /dev/null
-+++ b/drivers/usb/host/dwc_common_port/dwc_notifier.h
-@@ -0,0 +1,122 @@
-+
-+#ifndef __DWC_NOTIFIER_H__
-+#define __DWC_NOTIFIER_H__
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include "dwc_os.h"
-+
-+/** @file
-+ *
-+ * A simple implementation of the Observer pattern.  Any "module" can
-+ * register as an observer or notifier.  The notion of "module" is abstract and
-+ * can mean anything used to identify either an observer or notifier.  Usually
-+ * it will be a pointer to a data structure which contains some state, ie an
-+ * object.
-+ *
-+ * Before any notifiers can be added, the global notification manager must be
-+ * brought up with dwc_alloc_notification_manager().
-+ * dwc_free_notification_manager() will bring it down and free all resources.
-+ * These would typically be called upon module load and unload.  The
-+ * notification manager is a single global instance that handles all registered
-+ * observable modules and observers so this should be done only once.
-+ *
-+ * A module can be observable by using Notifications to publicize some general
-+ * information about it's state or operation.  It does not care who listens, or
-+ * even if anyone listens, or what they do with the information.  The observable
-+ * modules do not need to know any information about it's observers or their
-+ * interface, or their state or data.
-+ *
-+ * Any module can register to emit Notifications.  It should publish a list of
-+ * notifications that it can emit and their behavior, such as when they will get
-+ * triggered, and what information will be provided to the observer.  Then it
-+ * should register itself as an observable module. See dwc_register_notifier().
-+ *
-+ * Any module can observe any observable, registered module, provided it has a
-+ * handle to the other module and knows what notifications to observe.  See
-+ * dwc_add_observer().
-+ *
-+ * A function of type dwc_notifier_callback_t is called whenever a notification
-+ * is triggered with one or more observers observing it.  This function is
-+ * called in it's own process so it may sleep or block if needed.  It is
-+ * guaranteed to be called sometime after the notification has occurred and will
-+ * be called once per each time the notification is triggered.  It will NOT be
-+ * called in the same process context used to trigger the notification.
-+ *
-+ * @section Limitiations
-+ *
-+ * Keep in mind that Notifications that can be triggered in rapid sucession may
-+ * schedule too many processes too handle.  Be aware of this limitation when
-+ * designing to use notifications, and only add notifications for appropriate
-+ * observable information.
-+ *
-+ * Also Notification callbacks are not synchronous.  If you need to synchronize
-+ * the behavior between module/observer you must use other means.  And perhaps
-+ * that will mean Notifications are not the proper solution.
-+ */
-+
-+struct dwc_notifier;
-+typedef struct dwc_notifier dwc_notifier_t;
-+
-+/** The callback function must be of this type.
-+ *
-+ * @param object This is the object that is being observed.
-+ * @param notification This is the notification that was triggered.
-+ * @param observer This is the observer
-+ * @param notification_data This is notification-specific data that the notifier
-+ * has included in this notification.  The value of this should be published in
-+ * the documentation of the observable module with the notifications.
-+ * @param user_data This is any custom data that the observer provided when
-+ * adding itself as an observer to the notification. */
-+typedef void (*dwc_notifier_callback_t)(void *object, char *notification, void *observer,
-+					void *notification_data, void *user_data);
-+
-+/** Brings up the notification manager. */
-+extern int dwc_alloc_notification_manager(void *mem_ctx, void *wkq_ctx);
-+/** Brings down the notification manager. */
-+extern void dwc_free_notification_manager(void);
-+
-+/** This function registers an observable module.  A dwc_notifier_t object is
-+ * returned to the observable module.  This is an opaque object that is used by
-+ * the observable module to trigger notifications.  This object should only be
-+ * accessible to functions that are authorized to trigger notifications for this
-+ * module.  Observers do not need this object. */
-+extern dwc_notifier_t *dwc_register_notifier(void *mem_ctx, void *object);
-+
-+/** This function unregisters an observable module.  All observers have to be
-+ * removed prior to unregistration. */
-+extern void dwc_unregister_notifier(dwc_notifier_t *notifier);
-+
-+/** Add a module as an observer to the observable module.  The observable module
-+ * needs to have previously registered with the notification manager.
-+ *
-+ * @param observer The observer module
-+ * @param object The module to observe
-+ * @param notification The notification to observe
-+ * @param callback The callback function to call
-+ * @param user_data Any additional user data to pass into the callback function */
-+extern int dwc_add_observer(void *observer, void *object, char *notification,
-+			    dwc_notifier_callback_t callback, void *user_data);
-+
-+/** Removes the specified observer from all notifications that it is currently
-+ * observing. */
-+extern int dwc_remove_observer(void *observer);
-+
-+/** This function triggers a Notification.  It should be called by the
-+ * observable module, or any module or library which the observable module
-+ * allows to trigger notification on it's behalf.  Such as the dwc_cc_t.
-+ *
-+ * dwc_notify is a non-blocking function.  Callbacks are scheduled called in
-+ * their own process context for each trigger.  Callbacks can be blocking.
-+ * dwc_notify can be called from interrupt context if needed.
-+ *
-+ */
-+void dwc_notify(dwc_notifier_t *notifier, char *notification, void *notification_data);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* __DWC_NOTIFIER_H__ */
---- /dev/null
-+++ b/drivers/usb/host/dwc_common_port/dwc_os.h
-@@ -0,0 +1,1275 @@
-+/* =========================================================================
-+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_os.h $
-+ * $Revision: #14 $
-+ * $Date: 2010/11/04 $
-+ * $Change: 1621695 $
-+ *
-+ * Synopsys Portability Library Software and documentation
-+ * (hereinafter, "Software") is an Unsupported proprietary work of
-+ * Synopsys, Inc. unless otherwise expressly agreed to in writing
-+ * between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product
-+ * under any End User Software License Agreement or Agreement for
-+ * Licensed Product with Synopsys or any supplement thereto. You are
-+ * permitted to use and redistribute this Software in source and binary
-+ * forms, with or without modification, provided that redistributions
-+ * of source code must retain this notice. You may not view, use,
-+ * disclose, copy or distribute this file or any information contained
-+ * herein except pursuant to this license grant from Synopsys. If you
-+ * do not agree with this notice, including the disclaimer below, then
-+ * you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS"
-+ * BASIS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ * FOR A PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. IN NO EVENT SHALL
-+ * SYNOPSYS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================= */
-+#ifndef _DWC_OS_H_
-+#define _DWC_OS_H_
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/** @file
-+ *
-+ * DWC portability library, low level os-wrapper functions
-+ *
-+ */
-+
-+/* These basic types need to be defined by some OS header file or custom header
-+ * file for your specific target architecture.
-+ *
-+ * uint8_t, int8_t, uint16_t, int16_t, uint32_t, int32_t, uint64_t, int64_t
-+ *
-+ * Any custom or alternate header file must be added and enabled here.
-+ */
-+
-+#ifdef DWC_LINUX
-+# include <linux/types.h>
-+# ifdef CONFIG_DEBUG_MUTEXES
-+#  include <linux/mutex.h>
-+# endif
-+# include <linux/spinlock.h>
-+# include <linux/errno.h>
-+#endif
-+
-+#if defined(DWC_FREEBSD) || defined(DWC_NETBSD)
-+# include <os_dep.h>
-+#endif
-+
-+
-+/** @name Primitive Types and Values */
-+
-+/** We define a boolean type for consistency.  Can be either YES or NO */
-+typedef uint8_t dwc_bool_t;
-+#define YES  1
-+#define NO   0
-+
-+#ifdef DWC_LINUX
-+
-+/** @name Error Codes */
-+#define DWC_E_INVALID		EINVAL
-+#define DWC_E_NO_MEMORY		ENOMEM
-+#define DWC_E_NO_DEVICE		ENODEV
-+#define DWC_E_NOT_SUPPORTED	EOPNOTSUPP
-+#define DWC_E_TIMEOUT		ETIMEDOUT
-+#define DWC_E_BUSY		EBUSY
-+#define DWC_E_AGAIN		EAGAIN
-+#define DWC_E_RESTART		ERESTART
-+#define DWC_E_ABORT		ECONNABORTED
-+#define DWC_E_SHUTDOWN		ESHUTDOWN
-+#define DWC_E_NO_DATA		ENODATA
-+#define DWC_E_DISCONNECT	ECONNRESET
-+#define DWC_E_UNKNOWN		EINVAL
-+#define DWC_E_NO_STREAM_RES	ENOSR
-+#define DWC_E_COMMUNICATION	ECOMM
-+#define DWC_E_OVERFLOW		EOVERFLOW
-+#define DWC_E_PROTOCOL		EPROTO
-+#define DWC_E_IN_PROGRESS	EINPROGRESS
-+#define DWC_E_PIPE		EPIPE
-+#define DWC_E_IO		EIO
-+#define DWC_E_NO_SPACE		ENOSPC
-+
-+#else
-+
-+/** @name Error Codes */
-+#define DWC_E_INVALID		1001
-+#define DWC_E_NO_MEMORY		1002
-+#define DWC_E_NO_DEVICE		1003
-+#define DWC_E_NOT_SUPPORTED	1004
-+#define DWC_E_TIMEOUT		1005
-+#define DWC_E_BUSY		1006
-+#define DWC_E_AGAIN		1007
-+#define DWC_E_RESTART		1008
-+#define DWC_E_ABORT		1009
-+#define DWC_E_SHUTDOWN		1010
-+#define DWC_E_NO_DATA		1011
-+#define DWC_E_DISCONNECT	2000
-+#define DWC_E_UNKNOWN		3000
-+#define DWC_E_NO_STREAM_RES	4001
-+#define DWC_E_COMMUNICATION	4002
-+#define DWC_E_OVERFLOW		4003
-+#define DWC_E_PROTOCOL		4004
-+#define DWC_E_IN_PROGRESS	4005
-+#define DWC_E_PIPE		4006
-+#define DWC_E_IO		4007
-+#define DWC_E_NO_SPACE		4008
-+
-+#endif
-+
-+
-+/** @name Tracing/Logging Functions
-+ *
-+ * These function provide the capability to add tracing, debugging, and error
-+ * messages, as well exceptions as assertions.  The WUDEV uses these
-+ * extensively.  These could be logged to the main console, the serial port, an
-+ * internal buffer, etc.  These functions could also be no-op if they are too
-+ * expensive on your system.  By default undefining the DEBUG macro already
-+ * no-ops some of these functions. */
-+
-+/** Returns non-zero if in interrupt context. */
-+extern dwc_bool_t DWC_IN_IRQ(void);
-+#define dwc_in_irq DWC_IN_IRQ
-+
-+/** Returns "IRQ" if DWC_IN_IRQ is true. */
-+static inline char *dwc_irq(void) {
-+	return DWC_IN_IRQ() ? "IRQ" : "";
-+}
-+
-+/** Returns non-zero if in bottom-half context. */
-+extern dwc_bool_t DWC_IN_BH(void);
-+#define dwc_in_bh DWC_IN_BH
-+
-+/** Returns "BH" if DWC_IN_BH is true. */
-+static inline char *dwc_bh(void) {
-+	return DWC_IN_BH() ? "BH" : "";
-+}
-+
-+/**
-+ * A vprintf() clone.  Just call vprintf if you've got it.
-+ */
-+extern void DWC_VPRINTF(char *format, va_list args);
-+#define dwc_vprintf DWC_VPRINTF
-+
-+/**
-+ * A vsnprintf() clone.  Just call vprintf if you've got it.
-+ */
-+extern int DWC_VSNPRINTF(char *str, int size, char *format, va_list args);
-+#define dwc_vsnprintf DWC_VSNPRINTF
-+
-+/**
-+ * printf() clone.  Just call printf if you've go it.
-+ */
-+extern void DWC_PRINTF(char *format, ...)
-+/* This provides compiler level static checking of the parameters if you're
-+ * using GCC. */
-+#ifdef __GNUC__
-+	__attribute__ ((format(printf, 1, 2)));
-+#else
-+	;
-+#endif
-+#define dwc_printf DWC_PRINTF
-+
-+/**
-+ * sprintf() clone.  Just call sprintf if you've got it.
-+ */
-+extern int DWC_SPRINTF(char *string, char *format, ...)
-+#ifdef __GNUC__
-+	__attribute__ ((format(printf, 2, 3)));
-+#else
-+	;
-+#endif
-+#define dwc_sprintf DWC_SPRINTF
-+
-+/**
-+ * snprintf() clone.  Just call snprintf if you've got it.
-+ */
-+extern int DWC_SNPRINTF(char *string, int size, char *format, ...)
-+#ifdef __GNUC__
-+	__attribute__ ((format(printf, 3, 4)));
-+#else
-+	;
-+#endif
-+#define dwc_snprintf DWC_SNPRINTF
-+
-+/**
-+ * Prints a WARNING message.  On systems that don't differentiate between
-+ * warnings and regular log messages, just print it.  Indicates that something
-+ * may be wrong with the driver.  Works like printf().
-+ *
-+ * Use the DWC_WARN macro to call this function.
-+ */
-+extern void __DWC_WARN(char *format, ...)
-+#ifdef __GNUC__
-+	__attribute__ ((format(printf, 1, 2)));
-+#else
-+	;
-+#endif
-+
-+/**
-+ * Prints an error message.  On systems that don't differentiate between errors
-+ * and regular log messages, just print it.  Indicates that something went wrong
-+ * with the driver.  Works like printf().
-+ *
-+ * Use the DWC_ERROR macro to call this function.
-+ */
-+extern void __DWC_ERROR(char *format, ...)
-+#ifdef __GNUC__
-+	__attribute__ ((format(printf, 1, 2)));
-+#else
-+	;
-+#endif
-+
-+/**
-+ * Prints an exception error message and takes some user-defined action such as
-+ * print out a backtrace or trigger a breakpoint.  Indicates that something went
-+ * abnormally wrong with the driver such as programmer error, or other
-+ * exceptional condition.  It should not be ignored so even on systems without
-+ * printing capability, some action should be taken to notify the developer of
-+ * it.  Works like printf().
-+ */
-+extern void DWC_EXCEPTION(char *format, ...)
-+#ifdef __GNUC__
-+	__attribute__ ((format(printf, 1, 2)));
-+#else
-+	;
-+#endif
-+#define dwc_exception DWC_EXCEPTION
-+
-+#ifndef DWC_OTG_DEBUG_LEV
-+#define DWC_OTG_DEBUG_LEV 0
-+#endif
-+
-+#ifdef DEBUG
-+/**
-+ * Prints out a debug message.  Used for logging/trace messages.
-+ *
-+ * Use the DWC_DEBUG macro to call this function
-+ */
-+extern void __DWC_DEBUG(char *format, ...)
-+#ifdef __GNUC__
-+	__attribute__ ((format(printf, 1, 2)));
-+#else
-+	;
-+#endif
-+#else
-+#define __DWC_DEBUG printk
-+#endif
-+
-+/**
-+ * Prints out a Debug message.
-+ */
-+#define DWC_DEBUG(_format, _args...) __DWC_DEBUG("DEBUG:%s:%s: " _format "\n", \
-+						 __func__, dwc_irq(), ## _args)
-+#define dwc_debug DWC_DEBUG
-+/**
-+ * Prints out a Debug message if enabled at compile time.
-+ */
-+#if DWC_OTG_DEBUG_LEV > 0
-+#define DWC_DEBUGC(_format, _args...) DWC_DEBUG(_format, ##_args )
-+#else
-+#define DWC_DEBUGC(_format, _args...)
-+#endif
-+#define dwc_debugc DWC_DEBUGC
-+/**
-+ * Prints out an informative message.
-+ */
-+#define DWC_INFO(_format, _args...) DWC_PRINTF("INFO:%s: " _format "\n", \
-+					       dwc_irq(), ## _args)
-+#define dwc_info DWC_INFO
-+/**
-+ * Prints out an informative message if enabled at compile time.
-+ */
-+#if DWC_OTG_DEBUG_LEV > 1
-+#define DWC_INFOC(_format, _args...) DWC_INFO(_format, ##_args )
-+#else
-+#define DWC_INFOC(_format, _args...)
-+#endif
-+#define dwc_infoc DWC_INFOC
-+/**
-+ * Prints out a warning message.
-+ */
-+#define DWC_WARN(_format, _args...) __DWC_WARN("WARN:%s:%s:%d: " _format "\n", \
-+					dwc_irq(), __func__, __LINE__, ## _args)
-+#define dwc_warn DWC_WARN
-+/**
-+ * Prints out an error message.
-+ */
-+#define DWC_ERROR(_format, _args...) __DWC_ERROR("ERROR:%s:%s:%d: " _format "\n", \
-+					dwc_irq(), __func__, __LINE__, ## _args)
-+#define dwc_error DWC_ERROR
-+
-+#define DWC_PROTO_ERROR(_format, _args...) __DWC_WARN("ERROR:%s:%s:%d: " _format "\n", \
-+						dwc_irq(), __func__, __LINE__, ## _args)
-+#define dwc_proto_error DWC_PROTO_ERROR
-+
-+#ifdef DEBUG
-+/** Prints out a exception error message if the _expr expression fails.  Disabled
-+ * if DEBUG is not enabled. */
-+#define DWC_ASSERT(_expr, _format, _args...) do { \
-+	if (!(_expr)) { DWC_EXCEPTION("%s:%s:%d: " _format "\n", dwc_irq(), \
-+				      __FILE__, __LINE__, ## _args); } \
-+	} while (0)
-+#else
-+#define DWC_ASSERT(_x...)
-+#endif
-+#define dwc_assert DWC_ASSERT
-+
-+
-+/** @name Byte Ordering
-+ * The following functions are for conversions between processor's byte ordering
-+ * and specific ordering you want.
-+ */
-+
-+/** Converts 32 bit data in CPU byte ordering to little endian. */
-+extern uint32_t DWC_CPU_TO_LE32(uint32_t *p);
-+#define dwc_cpu_to_le32 DWC_CPU_TO_LE32
-+
-+/** Converts 32 bit data in CPU byte orderint to big endian. */
-+extern uint32_t DWC_CPU_TO_BE32(uint32_t *p);
-+#define dwc_cpu_to_be32 DWC_CPU_TO_BE32
-+
-+/** Converts 32 bit little endian data to CPU byte ordering. */
-+extern uint32_t DWC_LE32_TO_CPU(uint32_t *p);
-+#define dwc_le32_to_cpu DWC_LE32_TO_CPU
-+
-+/** Converts 32 bit big endian data to CPU byte ordering. */
-+extern uint32_t DWC_BE32_TO_CPU(uint32_t *p);
-+#define dwc_be32_to_cpu DWC_BE32_TO_CPU
-+
-+/** Converts 16 bit data in CPU byte ordering to little endian. */
-+extern uint16_t DWC_CPU_TO_LE16(uint16_t *p);
-+#define dwc_cpu_to_le16 DWC_CPU_TO_LE16
-+
-+/** Converts 16 bit data in CPU byte orderint to big endian. */
-+extern uint16_t DWC_CPU_TO_BE16(uint16_t *p);
-+#define dwc_cpu_to_be16 DWC_CPU_TO_BE16
-+
-+/** Converts 16 bit little endian data to CPU byte ordering. */
-+extern uint16_t DWC_LE16_TO_CPU(uint16_t *p);
-+#define dwc_le16_to_cpu DWC_LE16_TO_CPU
-+
-+/** Converts 16 bit bi endian data to CPU byte ordering. */
-+extern uint16_t DWC_BE16_TO_CPU(uint16_t *p);
-+#define dwc_be16_to_cpu DWC_BE16_TO_CPU
-+
-+
-+/** @name Register Read/Write
-+ *
-+ * The following six functions should be implemented to read/write registers of
-+ * 32-bit and 64-bit sizes.  All modules use this to read/write register values.
-+ * The reg value is a pointer to the register calculated from the void *base
-+ * variable passed into the driver when it is started.  */
-+
-+#ifdef DWC_LINUX
-+/* Linux doesn't need any extra parameters for register read/write, so we
-+ * just throw away the IO context parameter.
-+ */
-+/** Reads the content of a 32-bit register. */
-+extern uint32_t DWC_READ_REG32(uint32_t volatile *reg);
-+#define dwc_read_reg32(_ctx_,_reg_) DWC_READ_REG32(_reg_)
-+
-+/** Reads the content of a 64-bit register. */
-+extern uint64_t DWC_READ_REG64(uint64_t volatile *reg);
-+#define dwc_read_reg64(_ctx_,_reg_) DWC_READ_REG64(_reg_)
-+
-+/** Writes to a 32-bit register. */
-+extern void DWC_WRITE_REG32(uint32_t volatile *reg, uint32_t value);
-+#define dwc_write_reg32(_ctx_,_reg_,_val_) DWC_WRITE_REG32(_reg_, _val_)
-+
-+/** Writes to a 64-bit register. */
-+extern void DWC_WRITE_REG64(uint64_t volatile *reg, uint64_t value);
-+#define dwc_write_reg64(_ctx_,_reg_,_val_) DWC_WRITE_REG64(_reg_, _val_)
-+
-+/**
-+ * Modify bit values in a register.  Using the
-+ * algorithm: (reg_contents & ~clear_mask) | set_mask.
-+ */
-+extern void DWC_MODIFY_REG32(uint32_t volatile *reg, uint32_t clear_mask, uint32_t set_mask);
-+#define dwc_modify_reg32(_ctx_,_reg_,_cmsk_,_smsk_) DWC_MODIFY_REG32(_reg_,_cmsk_,_smsk_)
-+extern void DWC_MODIFY_REG64(uint64_t volatile *reg, uint64_t clear_mask, uint64_t set_mask);
-+#define dwc_modify_reg64(_ctx_,_reg_,_cmsk_,_smsk_) DWC_MODIFY_REG64(_reg_,_cmsk_,_smsk_)
-+
-+#endif	/* DWC_LINUX */
-+
-+#if defined(DWC_FREEBSD) || defined(DWC_NETBSD)
-+typedef struct dwc_ioctx {
-+	struct device *dev;
-+	bus_space_tag_t iot;
-+	bus_space_handle_t ioh;
-+} dwc_ioctx_t;
-+
-+/** BSD needs two extra parameters for register read/write, so we pass
-+ * them in using the IO context parameter.
-+ */
-+/** Reads the content of a 32-bit register. */
-+extern uint32_t DWC_READ_REG32(void *io_ctx, uint32_t volatile *reg);
-+#define dwc_read_reg32 DWC_READ_REG32
-+
-+/** Reads the content of a 64-bit register. */
-+extern uint64_t DWC_READ_REG64(void *io_ctx, uint64_t volatile *reg);
-+#define dwc_read_reg64 DWC_READ_REG64
-+
-+/** Writes to a 32-bit register. */
-+extern void DWC_WRITE_REG32(void *io_ctx, uint32_t volatile *reg, uint32_t value);
-+#define dwc_write_reg32 DWC_WRITE_REG32
-+
-+/** Writes to a 64-bit register. */
-+extern void DWC_WRITE_REG64(void *io_ctx, uint64_t volatile *reg, uint64_t value);
-+#define dwc_write_reg64 DWC_WRITE_REG64
-+
-+/**
-+ * Modify bit values in a register.  Using the
-+ * algorithm: (reg_contents & ~clear_mask) | set_mask.
-+ */
-+extern void DWC_MODIFY_REG32(void *io_ctx, uint32_t volatile *reg, uint32_t clear_mask, uint32_t set_mask);
-+#define dwc_modify_reg32 DWC_MODIFY_REG32
-+extern void DWC_MODIFY_REG64(void *io_ctx, uint64_t volatile *reg, uint64_t clear_mask, uint64_t set_mask);
-+#define dwc_modify_reg64 DWC_MODIFY_REG64
-+
-+#endif	/* DWC_FREEBSD || DWC_NETBSD */
-+
-+/** @cond */
-+
-+/** @name Some convenience MACROS used internally.  Define DWC_DEBUG_REGS to log the
-+ * register writes. */
-+
-+#ifdef DWC_LINUX
-+
-+# ifdef DWC_DEBUG_REGS
-+
-+#define dwc_define_read_write_reg_n(_reg,_container_type) \
-+static inline uint32_t dwc_read_##_reg##_n(_container_type *container, int num) { \
-+	return DWC_READ_REG32(&container->regs->_reg[num]); \
-+} \
-+static inline void dwc_write_##_reg##_n(_container_type *container, int num, uint32_t data) { \
-+	DWC_DEBUG("WRITING %8s[%d]: %p: %08x", #_reg, num, \
-+		  &(((uint32_t*)container->regs->_reg)[num]), data); \
-+	DWC_WRITE_REG32(&(((uint32_t*)container->regs->_reg)[num]), data); \
-+}
-+
-+#define dwc_define_read_write_reg(_reg,_container_type) \
-+static inline uint32_t dwc_read_##_reg(_container_type *container) { \
-+	return DWC_READ_REG32(&container->regs->_reg); \
-+} \
-+static inline void dwc_write_##_reg(_container_type *container, uint32_t data) { \
-+	DWC_DEBUG("WRITING %11s: %p: %08x", #_reg, &container->regs->_reg, data); \
-+	DWC_WRITE_REG32(&container->regs->_reg, data); \
-+}
-+
-+# else	/* DWC_DEBUG_REGS */
-+
-+#define dwc_define_read_write_reg_n(_reg,_container_type) \
-+static inline uint32_t dwc_read_##_reg##_n(_container_type *container, int num) { \
-+	return DWC_READ_REG32(&container->regs->_reg[num]); \
-+} \
-+static inline void dwc_write_##_reg##_n(_container_type *container, int num, uint32_t data) { \
-+	DWC_WRITE_REG32(&(((uint32_t*)container->regs->_reg)[num]), data); \
-+}
-+
-+#define dwc_define_read_write_reg(_reg,_container_type) \
-+static inline uint32_t dwc_read_##_reg(_container_type *container) { \
-+	return DWC_READ_REG32(&container->regs->_reg); \
-+} \
-+static inline void dwc_write_##_reg(_container_type *container, uint32_t data) { \
-+	DWC_WRITE_REG32(&container->regs->_reg, data); \
-+}
-+
-+# endif	/* DWC_DEBUG_REGS */
-+
-+#endif	/* DWC_LINUX */
-+
-+#if defined(DWC_FREEBSD) || defined(DWC_NETBSD)
-+
-+# ifdef DWC_DEBUG_REGS
-+
-+#define dwc_define_read_write_reg_n(_reg,_container_type) \
-+static inline uint32_t dwc_read_##_reg##_n(void *io_ctx, _container_type *container, int num) { \
-+	return DWC_READ_REG32(io_ctx, &container->regs->_reg[num]); \
-+} \
-+static inline void dwc_write_##_reg##_n(void *io_ctx, _container_type *container, int num, uint32_t data) { \
-+	DWC_DEBUG("WRITING %8s[%d]: %p: %08x", #_reg, num, \
-+		  &(((uint32_t*)container->regs->_reg)[num]), data); \
-+	DWC_WRITE_REG32(io_ctx, &(((uint32_t*)container->regs->_reg)[num]), data); \
-+}
-+
-+#define dwc_define_read_write_reg(_reg,_container_type) \
-+static inline uint32_t dwc_read_##_reg(void *io_ctx, _container_type *container) { \
-+	return DWC_READ_REG32(io_ctx, &container->regs->_reg); \
-+} \
-+static inline void dwc_write_##_reg(void *io_ctx, _container_type *container, uint32_t data) { \
-+	DWC_DEBUG("WRITING %11s: %p: %08x", #_reg, &container->regs->_reg, data); \
-+	DWC_WRITE_REG32(io_ctx, &container->regs->_reg, data); \
-+}
-+
-+# else	/* DWC_DEBUG_REGS */
-+
-+#define dwc_define_read_write_reg_n(_reg,_container_type) \
-+static inline uint32_t dwc_read_##_reg##_n(void *io_ctx, _container_type *container, int num) { \
-+	return DWC_READ_REG32(io_ctx, &container->regs->_reg[num]); \
-+} \
-+static inline void dwc_write_##_reg##_n(void *io_ctx, _container_type *container, int num, uint32_t data) { \
-+	DWC_WRITE_REG32(io_ctx, &(((uint32_t*)container->regs->_reg)[num]), data); \
-+}
-+
-+#define dwc_define_read_write_reg(_reg,_container_type) \
-+static inline uint32_t dwc_read_##_reg(void *io_ctx, _container_type *container) { \
-+	return DWC_READ_REG32(io_ctx, &container->regs->_reg); \
-+} \
-+static inline void dwc_write_##_reg(void *io_ctx, _container_type *container, uint32_t data) { \
-+	DWC_WRITE_REG32(io_ctx, &container->regs->_reg, data); \
-+}
-+
-+# endif	/* DWC_DEBUG_REGS */
-+
-+#endif	/* DWC_FREEBSD || DWC_NETBSD */
-+
-+/** @endcond */
-+
-+
-+#ifdef DWC_CRYPTOLIB
-+/** @name Crypto Functions
-+ *
-+ * These are the low-level cryptographic functions used by the driver. */
-+
-+/** Perform AES CBC */
-+extern int DWC_AES_CBC(uint8_t *message, uint32_t messagelen, uint8_t *key, uint32_t keylen, uint8_t iv[16], uint8_t *out);
-+#define dwc_aes_cbc DWC_AES_CBC
-+
-+/** Fill the provided buffer with random bytes.  These should be cryptographic grade random numbers. */
-+extern void DWC_RANDOM_BYTES(uint8_t *buffer, uint32_t length);
-+#define dwc_random_bytes DWC_RANDOM_BYTES
-+
-+/** Perform the SHA-256 hash function */
-+extern int DWC_SHA256(uint8_t *message, uint32_t len, uint8_t *out);
-+#define dwc_sha256 DWC_SHA256
-+
-+/** Calculated the HMAC-SHA256 */
-+extern int DWC_HMAC_SHA256(uint8_t *message, uint32_t messagelen, uint8_t *key, uint32_t keylen, uint8_t *out);
-+#define dwc_hmac_sha256 DWC_HMAC_SHA256
-+
-+#endif	/* DWC_CRYPTOLIB */
-+
-+
-+/** @name Memory Allocation
-+ *
-+ * These function provide access to memory allocation.  There are only 2 DMA
-+ * functions and 3 Regular memory functions that need to be implemented.  None
-+ * of the memory debugging routines need to be implemented.  The allocation
-+ * routines all ZERO the contents of the memory.
-+ *
-+ * Defining DWC_DEBUG_MEMORY turns on memory debugging and statistic gathering.
-+ * This checks for memory leaks, keeping track of alloc/free pairs.  It also
-+ * keeps track of how much memory the driver is using at any given time. */
-+
-+#define DWC_PAGE_SIZE 4096
-+#define DWC_PAGE_OFFSET(addr) (((uint32_t)addr) & 0xfff)
-+#define DWC_PAGE_ALIGNED(addr) ((((uint32_t)addr) & 0xfff) == 0)
-+
-+#define DWC_INVALID_DMA_ADDR 0x0
-+
-+#ifdef DWC_LINUX
-+/** Type for a DMA address */
-+typedef dma_addr_t dwc_dma_t;
-+#endif
-+
-+#if defined(DWC_FREEBSD) || defined(DWC_NETBSD)
-+typedef bus_addr_t dwc_dma_t;
-+#endif
-+
-+#ifdef DWC_FREEBSD
-+typedef struct dwc_dmactx {
-+	struct device *dev;
-+	bus_dma_tag_t dma_tag;
-+	bus_dmamap_t dma_map;
-+	bus_addr_t dma_paddr;
-+	void *dma_vaddr;
-+} dwc_dmactx_t;
-+#endif
-+
-+#ifdef DWC_NETBSD
-+typedef struct dwc_dmactx {
-+	struct device *dev;
-+	bus_dma_tag_t dma_tag;
-+	bus_dmamap_t dma_map;
-+	bus_dma_segment_t segs[1];
-+	int nsegs;
-+	bus_addr_t dma_paddr;
-+	void *dma_vaddr;
-+} dwc_dmactx_t;
-+#endif
-+
-+/* @todo these functions will be added in the future */
-+#if 0
-+/**
-+ * Creates a DMA pool from which you can allocate DMA buffers.  Buffers
-+ * allocated from this pool will be guaranteed to meet the size, alignment, and
-+ * boundary requirements specified.
-+ *
-+ * @param[in] size Specifies the size of the buffers that will be allocated from
-+ * this pool.
-+ * @param[in] align Specifies the byte alignment requirements of the buffers
-+ * allocated from this pool.  Must be a power of 2.
-+ * @param[in] boundary Specifies the N-byte boundary that buffers allocated from
-+ * this pool must not cross.
-+ *
-+ * @returns A pointer to an internal opaque structure which is not to be
-+ * accessed outside of these library functions.  Use this handle to specify
-+ * which pools to allocate/free DMA buffers from and also to destroy the pool,
-+ * when you are done with it.
-+ */
-+extern dwc_pool_t *DWC_DMA_POOL_CREATE(uint32_t size, uint32_t align, uint32_t boundary);
-+
-+/**
-+ * Destroy a DMA pool.  All buffers allocated from that pool must be freed first.
-+ */
-+extern void DWC_DMA_POOL_DESTROY(dwc_pool_t *pool);
-+
-+/**
-+ * Allocate a buffer from the specified DMA pool and zeros its contents.
-+ */
-+extern void *DWC_DMA_POOL_ALLOC(dwc_pool_t *pool, uint64_t *dma_addr);
-+
-+/**
-+ * Free a previously allocated buffer from the DMA pool.
-+ */
-+extern void DWC_DMA_POOL_FREE(dwc_pool_t *pool, void *vaddr, void *daddr);
-+#endif
-+
-+/** Allocates a DMA capable buffer and zeroes its contents. */
-+extern void *__DWC_DMA_ALLOC(void *dma_ctx, uint32_t size, dwc_dma_t *dma_addr);
-+
-+/** Allocates a DMA capable buffer and zeroes its contents in atomic contest */
-+extern void *__DWC_DMA_ALLOC_ATOMIC(void *dma_ctx, uint32_t size, dwc_dma_t *dma_addr);
-+
-+/** Frees a previously allocated buffer. */
-+extern void __DWC_DMA_FREE(void *dma_ctx, uint32_t size, void *virt_addr, dwc_dma_t dma_addr);
-+
-+/** Allocates a block of memory and zeroes its contents. */
-+extern void *__DWC_ALLOC(void *mem_ctx, uint32_t size);
-+
-+/** Allocates a block of memory and zeroes its contents, in an atomic manner
-+ * which can be used inside interrupt context.  The size should be sufficiently
-+ * small, a few KB at most, such that failures are not likely to occur.  Can just call
-+ * __DWC_ALLOC if it is atomic. */
-+extern void *__DWC_ALLOC_ATOMIC(void *mem_ctx, uint32_t size);
-+
-+/** Frees a previously allocated buffer. */
-+extern void __DWC_FREE(void *mem_ctx, void *addr);
-+
-+#ifndef DWC_DEBUG_MEMORY
-+
-+#define DWC_ALLOC(_size_) __DWC_ALLOC(NULL, _size_)
-+#define DWC_ALLOC_ATOMIC(_size_) __DWC_ALLOC_ATOMIC(NULL, _size_)
-+#define DWC_FREE(_addr_) __DWC_FREE(NULL, _addr_)
-+
-+# ifdef DWC_LINUX
-+#define DWC_DMA_ALLOC(_dev, _size_, _dma_) __DWC_DMA_ALLOC(_dev, _size_, _dma_)
-+#define DWC_DMA_ALLOC_ATOMIC(_dev, _size_, _dma_) __DWC_DMA_ALLOC_ATOMIC(_dev, _size_, _dma_)
-+#define DWC_DMA_FREE(_dev, _size_,_virt_, _dma_) __DWC_DMA_FREE(_dev, _size_, _virt_, _dma_)
-+# endif
-+
-+# if defined(DWC_FREEBSD) || defined(DWC_NETBSD)
-+#define DWC_DMA_ALLOC __DWC_DMA_ALLOC
-+#define DWC_DMA_FREE __DWC_DMA_FREE
-+# endif
-+extern void *dwc_dma_alloc_atomic_debug(uint32_t size, dwc_dma_t *dma_addr, char const *func, int line);
-+
-+#else	/* DWC_DEBUG_MEMORY */
-+
-+extern void *dwc_alloc_debug(void *mem_ctx, uint32_t size, char const *func, int line);
-+extern void *dwc_alloc_atomic_debug(void *mem_ctx, uint32_t size, char const *func, int line);
-+extern void dwc_free_debug(void *mem_ctx, void *addr, char const *func, int line);
-+extern void *dwc_dma_alloc_debug(void *dma_ctx, uint32_t size, dwc_dma_t *dma_addr,
-+				 char const *func, int line);
-+extern void *dwc_dma_alloc_atomic_debug(void *dma_ctx, uint32_t size, dwc_dma_t *dma_addr,
-+				char const *func, int line);
-+extern void dwc_dma_free_debug(void *dma_ctx, uint32_t size, void *virt_addr,
-+			       dwc_dma_t dma_addr, char const *func, int line);
-+
-+extern int dwc_memory_debug_start(void *mem_ctx);
-+extern void dwc_memory_debug_stop(void);
-+extern void dwc_memory_debug_report(void);
-+
-+#define DWC_ALLOC(_size_) dwc_alloc_debug(NULL, _size_, __func__, __LINE__)
-+#define DWC_ALLOC_ATOMIC(_size_) dwc_alloc_atomic_debug(NULL, _size_, \
-+							__func__, __LINE__)
-+#define DWC_FREE(_addr_) dwc_free_debug(NULL, _addr_, __func__, __LINE__)
-+
-+# ifdef DWC_LINUX
-+#define DWC_DMA_ALLOC(_dev, _size_, _dma_) \
-+	dwc_dma_alloc_debug(_dev, _size_, _dma_, __func__, __LINE__)
-+#define DWC_DMA_ALLOC_ATOMIC(_dev, _size_, _dma_) \
-+	dwc_dma_alloc_atomic_debug(_dev, _size_, _dma_, __func__, __LINE__)
-+#define DWC_DMA_FREE(_dev, _size_, _virt_, _dma_) \
-+	dwc_dma_free_debug(_dev, _size_, _virt_, _dma_, __func__, __LINE__)
-+# endif
-+
-+# if defined(DWC_FREEBSD) || defined(DWC_NETBSD)
-+#define DWC_DMA_ALLOC(_ctx_,_size_,_dma_) dwc_dma_alloc_debug(_ctx_, _size_, \
-+						_dma_, __func__, __LINE__)
-+#define DWC_DMA_FREE(_ctx_,_size_,_virt_,_dma_) dwc_dma_free_debug(_ctx_, _size_, \
-+						 _virt_, _dma_, __func__, __LINE__)
-+# endif
-+
-+#endif /* DWC_DEBUG_MEMORY */
-+
-+#define dwc_alloc(_ctx_,_size_) DWC_ALLOC(_size_)
-+#define dwc_alloc_atomic(_ctx_,_size_) DWC_ALLOC_ATOMIC(_size_)
-+#define dwc_free(_ctx_,_addr_) DWC_FREE(_addr_)
-+
-+#ifdef DWC_LINUX
-+/* Linux doesn't need any extra parameters for DMA buffer allocation, so we
-+ * just throw away the DMA context parameter.
-+ */
-+#define dwc_dma_alloc(_ctx_,_size_,_dma_) DWC_DMA_ALLOC(_size_, _dma_)
-+#define dwc_dma_alloc_atomic(_ctx_,_size_,_dma_) DWC_DMA_ALLOC_ATOMIC(_size_, _dma_)
-+#define dwc_dma_free(_ctx_,_size_,_virt_,_dma_) DWC_DMA_FREE(_size_, _virt_, _dma_)
-+#endif
-+
-+#if defined(DWC_FREEBSD) || defined(DWC_NETBSD)
-+/** BSD needs several extra parameters for DMA buffer allocation, so we pass
-+ * them in using the DMA context parameter.
-+ */
-+#define dwc_dma_alloc DWC_DMA_ALLOC
-+#define dwc_dma_free DWC_DMA_FREE
-+#endif
-+
-+
-+/** @name Memory and String Processing */
-+
-+/** memset() clone */
-+extern void *DWC_MEMSET(void *dest, uint8_t byte, uint32_t size);
-+#define dwc_memset DWC_MEMSET
-+
-+/** memcpy() clone */
-+extern void *DWC_MEMCPY(void *dest, void const *src, uint32_t size);
-+#define dwc_memcpy DWC_MEMCPY
-+
-+/** memmove() clone */
-+extern void *DWC_MEMMOVE(void *dest, void *src, uint32_t size);
-+#define dwc_memmove DWC_MEMMOVE
-+
-+/** memcmp() clone */
-+extern int DWC_MEMCMP(void *m1, void *m2, uint32_t size);
-+#define dwc_memcmp DWC_MEMCMP
-+
-+/** strcmp() clone */
-+extern int DWC_STRCMP(void *s1, void *s2);
-+#define dwc_strcmp DWC_STRCMP
-+
-+/** strncmp() clone */
-+extern int DWC_STRNCMP(void *s1, void *s2, uint32_t size);
-+#define dwc_strncmp DWC_STRNCMP
-+
-+/** strlen() clone, for NULL terminated ASCII strings */
-+extern int DWC_STRLEN(char const *str);
-+#define dwc_strlen DWC_STRLEN
-+
-+/** strcpy() clone, for NULL terminated ASCII strings */
-+extern char *DWC_STRCPY(char *to, const char *from);
-+#define dwc_strcpy DWC_STRCPY
-+
-+/** strdup() clone.  If you wish to use memory allocation debugging, this
-+ * implementation of strdup should use the DWC_* memory routines instead of
-+ * calling a predefined strdup.  Otherwise the memory allocated by this routine
-+ * will not be seen by the debugging routines. */
-+extern char *DWC_STRDUP(char const *str);
-+#define dwc_strdup(_ctx_,_str_) DWC_STRDUP(_str_)
-+
-+/** NOT an atoi() clone.  Read the description carefully.  Returns an integer
-+ * converted from the string str in base 10 unless the string begins with a "0x"
-+ * in which case it is base 16.  String must be a NULL terminated sequence of
-+ * ASCII characters and may optionally begin with whitespace, a + or -, and a
-+ * "0x" prefix if base 16.  The remaining characters must be valid digits for
-+ * the number and end with a NULL character.  If any invalid characters are
-+ * encountered or it returns with a negative error code and the results of the
-+ * conversion are undefined.  On sucess it returns 0.  Overflow conditions are
-+ * undefined.  An example implementation using atoi() can be referenced from the
-+ * Linux implementation. */
-+extern int DWC_ATOI(const char *str, int32_t *value);
-+#define dwc_atoi DWC_ATOI
-+
-+/** Same as above but for unsigned. */
-+extern int DWC_ATOUI(const char *str, uint32_t *value);
-+#define dwc_atoui DWC_ATOUI
-+
-+#ifdef DWC_UTFLIB
-+/** This routine returns a UTF16LE unicode encoded string from a UTF8 string. */
-+extern int DWC_UTF8_TO_UTF16LE(uint8_t const *utf8string, uint16_t *utf16string, unsigned len);
-+#define dwc_utf8_to_utf16le DWC_UTF8_TO_UTF16LE
-+#endif
-+
-+
-+/** @name Wait queues
-+ *
-+ * Wait queues provide a means of synchronizing between threads or processes.  A
-+ * process can block on a waitq if some condition is not true, waiting for it to
-+ * become true.  When the waitq is triggered all waiting process will get
-+ * unblocked and the condition will be check again.  Waitqs should be triggered
-+ * every time a condition can potentially change.*/
-+struct dwc_waitq;
-+
-+/** Type for a waitq */
-+typedef struct dwc_waitq dwc_waitq_t;
-+
-+/** The type of waitq condition callback function.  This is called every time
-+ * condition is evaluated. */
-+typedef int (*dwc_waitq_condition_t)(void *data);
-+
-+/** Allocate a waitq */
-+extern dwc_waitq_t *DWC_WAITQ_ALLOC(void);
-+#define dwc_waitq_alloc(_ctx_) DWC_WAITQ_ALLOC()
-+
-+/** Free a waitq */
-+extern void DWC_WAITQ_FREE(dwc_waitq_t *wq);
-+#define dwc_waitq_free DWC_WAITQ_FREE
-+
-+/** Check the condition and if it is false, block on the waitq.  When unblocked, check the
-+ * condition again.  The function returns when the condition becomes true.  The return value
-+ * is 0 on condition true, DWC_WAITQ_ABORTED on abort or killed, or DWC_WAITQ_UNKNOWN on error. */
-+extern int32_t DWC_WAITQ_WAIT(dwc_waitq_t *wq, dwc_waitq_condition_t cond, void *data);
-+#define dwc_waitq_wait DWC_WAITQ_WAIT
-+
-+/** Check the condition and if it is false, block on the waitq.  When unblocked,
-+ * check the condition again.  The function returns when the condition become
-+ * true or the timeout has passed.  The return value is 0 on condition true or
-+ * DWC_TIMED_OUT on timeout, or DWC_WAITQ_ABORTED, or DWC_WAITQ_UNKNOWN on
-+ * error. */
-+extern int32_t DWC_WAITQ_WAIT_TIMEOUT(dwc_waitq_t *wq, dwc_waitq_condition_t cond,
-+				      void *data, int32_t msecs);
-+#define dwc_waitq_wait_timeout DWC_WAITQ_WAIT_TIMEOUT
-+
-+/** Trigger a waitq, unblocking all processes.  This should be called whenever a condition
-+ * has potentially changed. */
-+extern void DWC_WAITQ_TRIGGER(dwc_waitq_t *wq);
-+#define dwc_waitq_trigger DWC_WAITQ_TRIGGER
-+
-+/** Unblock all processes waiting on the waitq with an ABORTED result. */
-+extern void DWC_WAITQ_ABORT(dwc_waitq_t *wq);
-+#define dwc_waitq_abort DWC_WAITQ_ABORT
-+
-+
-+/** @name Threads
-+ *
-+ * A thread must be explicitly stopped.  It must check DWC_THREAD_SHOULD_STOP
-+ * whenever it is woken up, and then return.  The DWC_THREAD_STOP function
-+ * returns the value from the thread.
-+ */
-+
-+struct dwc_thread;
-+
-+/** Type for a thread */
-+typedef struct dwc_thread dwc_thread_t;
-+
-+/** The thread function */
-+typedef int (*dwc_thread_function_t)(void *data);
-+
-+/** Create a thread and start it running the thread_function.  Returns a handle
-+ * to the thread */
-+extern dwc_thread_t *DWC_THREAD_RUN(dwc_thread_function_t func, char *name, void *data);
-+#define dwc_thread_run(_ctx_,_func_,_name_,_data_) DWC_THREAD_RUN(_func_, _name_, _data_)
-+
-+/** Stops a thread.  Return the value returned by the thread.  Or will return
-+ * DWC_ABORT if the thread never started. */
-+extern int DWC_THREAD_STOP(dwc_thread_t *thread);
-+#define dwc_thread_stop DWC_THREAD_STOP
-+
-+/** Signifies to the thread that it must stop. */
-+#ifdef DWC_LINUX
-+/* Linux doesn't need any parameters for kthread_should_stop() */
-+extern dwc_bool_t DWC_THREAD_SHOULD_STOP(void);
-+#define dwc_thread_should_stop(_thrd_) DWC_THREAD_SHOULD_STOP()
-+
-+/* No thread_exit function in Linux */
-+#define dwc_thread_exit(_thrd_)
-+#endif
-+
-+#if defined(DWC_FREEBSD) || defined(DWC_NETBSD)
-+/** BSD needs the thread pointer for kthread_suspend_check() */
-+extern dwc_bool_t DWC_THREAD_SHOULD_STOP(dwc_thread_t *thread);
-+#define dwc_thread_should_stop DWC_THREAD_SHOULD_STOP
-+
-+/** The thread must call this to exit. */
-+extern void DWC_THREAD_EXIT(dwc_thread_t *thread);
-+#define dwc_thread_exit DWC_THREAD_EXIT
-+#endif
-+
-+
-+/** @name Work queues
-+ *
-+ * Workqs are used to queue a callback function to be called at some later time,
-+ * in another thread. */
-+struct dwc_workq;
-+
-+/** Type for a workq */
-+typedef struct dwc_workq dwc_workq_t;
-+
-+/** The type of the callback function to be called. */
-+typedef void (*dwc_work_callback_t)(void *data);
-+
-+/** Allocate a workq */
-+extern dwc_workq_t *DWC_WORKQ_ALLOC(char *name);
-+#define dwc_workq_alloc(_ctx_,_name_) DWC_WORKQ_ALLOC(_name_)
-+
-+/** Free a workq.  All work must be completed before being freed. */
-+extern void DWC_WORKQ_FREE(dwc_workq_t *workq);
-+#define dwc_workq_free DWC_WORKQ_FREE
-+
-+/** Schedule a callback on the workq, passing in data.  The function will be
-+ * scheduled at some later time. */
-+extern void DWC_WORKQ_SCHEDULE(dwc_workq_t *workq, dwc_work_callback_t cb,
-+			       void *data, char *format, ...)
-+#ifdef __GNUC__
-+	__attribute__ ((format(printf, 4, 5)));
-+#else
-+	;
-+#endif
-+#define dwc_workq_schedule DWC_WORKQ_SCHEDULE
-+
-+/** Schedule a callback on the workq, that will be called until at least
-+ * given number miliseconds have passed. */
-+extern void DWC_WORKQ_SCHEDULE_DELAYED(dwc_workq_t *workq, dwc_work_callback_t cb,
-+				       void *data, uint32_t time, char *format, ...)
-+#ifdef __GNUC__
-+	__attribute__ ((format(printf, 5, 6)));
-+#else
-+	;
-+#endif
-+#define dwc_workq_schedule_delayed DWC_WORKQ_SCHEDULE_DELAYED
-+
-+/** The number of processes in the workq */
-+extern int DWC_WORKQ_PENDING(dwc_workq_t *workq);
-+#define dwc_workq_pending DWC_WORKQ_PENDING
-+
-+/** Blocks until all the work in the workq is complete or timed out.  Returns <
-+ * 0 on timeout. */
-+extern int DWC_WORKQ_WAIT_WORK_DONE(dwc_workq_t *workq, int timeout);
-+#define dwc_workq_wait_work_done DWC_WORKQ_WAIT_WORK_DONE
-+
-+
-+/** @name Tasklets
-+ *
-+ */
-+struct dwc_tasklet;
-+
-+/** Type for a tasklet */
-+typedef struct dwc_tasklet dwc_tasklet_t;
-+
-+/** The type of the callback function to be called */
-+typedef void (*dwc_tasklet_callback_t)(void *data);
-+
-+/** Allocates a tasklet */
-+extern dwc_tasklet_t *DWC_TASK_ALLOC(char *name, dwc_tasklet_callback_t cb, void *data);
-+#define dwc_task_alloc(_ctx_,_name_,_cb_,_data_) DWC_TASK_ALLOC(_name_, _cb_, _data_)
-+
-+/** Frees a tasklet */
-+extern void DWC_TASK_FREE(dwc_tasklet_t *task);
-+#define dwc_task_free DWC_TASK_FREE
-+
-+/** Schedules a tasklet to run */
-+extern void DWC_TASK_SCHEDULE(dwc_tasklet_t *task);
-+#define dwc_task_schedule DWC_TASK_SCHEDULE
-+
-+extern void DWC_TASK_HI_SCHEDULE(dwc_tasklet_t *task);
-+#define dwc_task_hi_schedule DWC_TASK_HI_SCHEDULE
-+
-+/** @name Timer
-+ *
-+ * Callbacks must be small and atomic.
-+ */
-+struct dwc_timer;
-+
-+/** Type for a timer */
-+typedef struct dwc_timer dwc_timer_t;
-+
-+/** The type of the callback function to be called */
-+typedef void (*dwc_timer_callback_t)(void *data);
-+
-+/** Allocates a timer */
-+extern dwc_timer_t *DWC_TIMER_ALLOC(char *name, dwc_timer_callback_t cb, void *data);
-+#define dwc_timer_alloc(_ctx_,_name_,_cb_,_data_) DWC_TIMER_ALLOC(_name_,_cb_,_data_)
-+
-+/** Frees a timer */
-+extern void DWC_TIMER_FREE(dwc_timer_t *timer);
-+#define dwc_timer_free DWC_TIMER_FREE
-+
-+/** Schedules the timer to run at time ms from now.  And will repeat at every
-+ * repeat_interval msec therafter
-+ *
-+ * Modifies a timer that is still awaiting execution to a new expiration time.
-+ * The mod_time is added to the old time.  */
-+extern void DWC_TIMER_SCHEDULE(dwc_timer_t *timer, uint32_t time);
-+#define dwc_timer_schedule DWC_TIMER_SCHEDULE
-+
-+/** Disables the timer from execution. */
-+extern void DWC_TIMER_CANCEL(dwc_timer_t *timer);
-+#define dwc_timer_cancel DWC_TIMER_CANCEL
-+
-+
-+/** @name Spinlocks
-+ *
-+ * These locks are used when the work between the lock/unlock is atomic and
-+ * short.  Interrupts are also disabled during the lock/unlock and thus they are
-+ * suitable to lock between interrupt/non-interrupt context.  They also lock
-+ * between processes if you have multiple CPUs or Preemption.  If you don't have
-+ * multiple CPUS or Preemption, then the you can simply implement the
-+ * DWC_SPINLOCK and DWC_SPINUNLOCK to disable and enable interrupts.  Because
-+ * the work between the lock/unlock is atomic, the process context will never
-+ * change, and so you never have to lock between processes.  */
-+
-+struct dwc_spinlock;
-+
-+/** Type for a spinlock */
-+typedef struct dwc_spinlock dwc_spinlock_t;
-+
-+/** Type for the 'flags' argument to spinlock funtions */
-+typedef unsigned long dwc_irqflags_t;
-+
-+/** Returns an initialized lock variable.  This function should allocate and
-+ * initialize the OS-specific data structure used for locking.  This data
-+ * structure is to be used for the DWC_LOCK and DWC_UNLOCK functions and should
-+ * be freed by the DWC_FREE_LOCK when it is no longer used.
-+ *
-+ * For Linux Spinlock Debugging make it macro because the debugging routines use
-+ * the symbol name to determine recursive locking. Using a wrapper function
-+ * makes it falsely think recursive locking occurs. */
-+#if defined(DWC_LINUX) && defined(CONFIG_DEBUG_SPINLOCK)
-+#define DWC_SPINLOCK_ALLOC_LINUX_DEBUG(lock) ({ \
-+	lock = DWC_ALLOC(sizeof(spinlock_t)); \
-+	if (lock) { \
-+		spin_lock_init((spinlock_t *)lock); \
-+	} \
-+})
-+#else
-+extern dwc_spinlock_t *DWC_SPINLOCK_ALLOC(void);
-+#define dwc_spinlock_alloc(_ctx_) DWC_SPINLOCK_ALLOC()
-+#endif
-+
-+/** Frees an initialized lock variable. */
-+extern void DWC_SPINLOCK_FREE(dwc_spinlock_t *lock);
-+#define dwc_spinlock_free(_ctx_,_lock_) DWC_SPINLOCK_FREE(_lock_)
-+
-+/** Disables interrupts and blocks until it acquires the lock.
-+ *
-+ * @param lock Pointer to the spinlock.
-+ * @param flags Unsigned long for irq flags storage.
-+ */
-+extern void DWC_SPINLOCK_IRQSAVE(dwc_spinlock_t *lock, dwc_irqflags_t *flags);
-+#define dwc_spinlock_irqsave DWC_SPINLOCK_IRQSAVE
-+
-+/** Re-enables the interrupt and releases the lock.
-+ *
-+ * @param lock Pointer to the spinlock.
-+ * @param flags Unsigned long for irq flags storage.  Must be the same as was
-+ * passed into DWC_LOCK.
-+ */
-+extern void DWC_SPINUNLOCK_IRQRESTORE(dwc_spinlock_t *lock, dwc_irqflags_t flags);
-+#define dwc_spinunlock_irqrestore DWC_SPINUNLOCK_IRQRESTORE
-+
-+/** Blocks until it acquires the lock.
-+ *
-+ * @param lock Pointer to the spinlock.
-+ */
-+extern void DWC_SPINLOCK(dwc_spinlock_t *lock);
-+#define dwc_spinlock DWC_SPINLOCK
-+
-+/** Releases the lock.
-+ *
-+ * @param lock Pointer to the spinlock.
-+ */
-+extern void DWC_SPINUNLOCK(dwc_spinlock_t *lock);
-+#define dwc_spinunlock DWC_SPINUNLOCK
-+
-+
-+/** @name Mutexes
-+ *
-+ * Unlike spinlocks Mutexes lock only between processes and the work between the
-+ * lock/unlock CAN block, therefore it CANNOT be called from interrupt context.
-+ */
-+
-+struct dwc_mutex;
-+
-+/** Type for a mutex */
-+typedef struct dwc_mutex dwc_mutex_t;
-+
-+/* For Linux Mutex Debugging make it inline because the debugging routines use
-+ * the symbol to determine recursive locking.  This makes it falsely think
-+ * recursive locking occurs. */
-+#if defined(DWC_LINUX) && defined(CONFIG_DEBUG_MUTEXES)
-+#define DWC_MUTEX_ALLOC_LINUX_DEBUG(__mutexp) ({ \
-+	__mutexp = (dwc_mutex_t *)DWC_ALLOC(sizeof(struct mutex)); \
-+	mutex_init((struct mutex *)__mutexp); \
-+})
-+#endif
-+
-+/** Allocate a mutex */
-+extern dwc_mutex_t *DWC_MUTEX_ALLOC(void);
-+#define dwc_mutex_alloc(_ctx_) DWC_MUTEX_ALLOC()
-+
-+/* For memory leak debugging when using Linux Mutex Debugging */
-+#if defined(DWC_LINUX) && defined(CONFIG_DEBUG_MUTEXES)
-+#define DWC_MUTEX_FREE(__mutexp) do { \
-+	mutex_destroy((struct mutex *)__mutexp); \
-+	DWC_FREE(__mutexp); \
-+} while(0)
-+#else
-+/** Free a mutex */
-+extern void DWC_MUTEX_FREE(dwc_mutex_t *mutex);
-+#define dwc_mutex_free(_ctx_,_mutex_) DWC_MUTEX_FREE(_mutex_)
-+#endif
-+
-+/** Lock a mutex */
-+extern void DWC_MUTEX_LOCK(dwc_mutex_t *mutex);
-+#define dwc_mutex_lock DWC_MUTEX_LOCK
-+
-+/** Non-blocking lock returns 1 on successful lock. */
-+extern int DWC_MUTEX_TRYLOCK(dwc_mutex_t *mutex);
-+#define dwc_mutex_trylock DWC_MUTEX_TRYLOCK
-+
-+/** Unlock a mutex */
-+extern void DWC_MUTEX_UNLOCK(dwc_mutex_t *mutex);
-+#define dwc_mutex_unlock DWC_MUTEX_UNLOCK
-+
-+
-+/** @name Time */
-+
-+/** Microsecond delay.
-+ *
-+ * @param usecs  Microseconds to delay.
-+ */
-+extern void DWC_UDELAY(uint32_t usecs);
-+#define dwc_udelay DWC_UDELAY
-+
-+/** Millisecond delay.
-+ *
-+ * @param msecs  Milliseconds to delay.
-+ */
-+extern void DWC_MDELAY(uint32_t msecs);
-+#define dwc_mdelay DWC_MDELAY
-+
-+/** Non-busy waiting.
-+ * Sleeps for specified number of milliseconds.
-+ *
-+ * @param msecs Milliseconds to sleep.
-+ */
-+extern void DWC_MSLEEP(uint32_t msecs);
-+#define dwc_msleep DWC_MSLEEP
-+
-+/**
-+ * Returns number of milliseconds since boot.
-+ */
-+extern uint32_t DWC_TIME(void);
-+#define dwc_time DWC_TIME
-+
-+
-+
-+
-+/* @mainpage DWC Portability and Common Library
-+ *
-+ * This is the documentation for the DWC Portability and Common Library.
-+ *
-+ * @section intro Introduction
-+ *
-+ * The DWC Portability library consists of wrapper calls and data structures to
-+ * all low-level functions which are typically provided by the OS.  The WUDEV
-+ * driver uses only these functions.  In order to port the WUDEV driver, only
-+ * the functions in this library need to be re-implemented, with the same
-+ * behavior as documented here.
-+ *
-+ * The Common library consists of higher level functions, which rely only on
-+ * calling the functions from the DWC Portability library.  These common
-+ * routines are shared across modules.  Some of the common libraries need to be
-+ * used directly by the driver programmer when porting WUDEV.  Such as the
-+ * parameter and notification libraries.
-+ *
-+ * @section low Portability Library OS Wrapper Functions
-+ *
-+ * Any function starting with DWC and in all CAPS is a low-level OS-wrapper that
-+ * needs to be implemented when porting, for example DWC_MUTEX_ALLOC().  All of
-+ * these functions are included in the dwc_os.h file.
-+ *
-+ * There are many functions here covering a wide array of OS services.  Please
-+ * see dwc_os.h for details, and implementation notes for each function.
-+ *
-+ * @section common Common Library Functions
-+ *
-+ * Any function starting with dwc and in all lowercase is a common library
-+ * routine.  These functions have a portable implementation and do not need to
-+ * be reimplemented when porting.  The common routines can be used by any
-+ * driver, and some must be used by the end user to control the drivers.  For
-+ * example, you must use the Parameter common library in order to set the
-+ * parameters in the WUDEV module.
-+ *
-+ * The common libraries consist of the following:
-+ *
-+ * - Connection Contexts - Used internally and can be used by end-user.  See dwc_cc.h
-+ * - Parameters - Used internally and can be used by end-user.  See dwc_params.h
-+ * - Notifications - Used internally and can be used by end-user.  See dwc_notifier.h
-+ * - Lists - Used internally and can be used by end-user.  See dwc_list.h
-+ * - Memory Debugging - Used internally and can be used by end-user.  See dwc_os.h
-+ * - Modpow - Used internally only.  See dwc_modpow.h
-+ * - DH - Used internally only.  See dwc_dh.h
-+ * - Crypto - Used internally only.  See dwc_crypto.h
-+ *
-+ *
-+ * @section prereq Prerequistes For dwc_os.h
-+ * @subsection types Data Types
-+ *
-+ * The dwc_os.h file assumes that several low-level data types are pre defined for the
-+ * compilation environment.  These data types are:
-+ *
-+ * - uint8_t - unsigned 8-bit data type
-+ * - int8_t - signed 8-bit data type
-+ * - uint16_t - unsigned 16-bit data type
-+ * - int16_t - signed 16-bit data type
-+ * - uint32_t - unsigned 32-bit data type
-+ * - int32_t - signed 32-bit data type
-+ * - uint64_t - unsigned 64-bit data type
-+ * - int64_t - signed 64-bit data type
-+ *
-+ * Ensure that these are defined before using dwc_os.h.  The easiest way to do
-+ * that is to modify the top of the file to include the appropriate header.
-+ * This is already done for the Linux environment.  If the DWC_LINUX macro is
-+ * defined, the correct header will be added.  A standard header <stdint.h> is
-+ * also used for environments where standard C headers are available.
-+ *
-+ * @subsection stdarg Variable Arguments
-+ *
-+ * Variable arguments are provided by a standard C header <stdarg.h>.  it is
-+ * available in Both the Linux and ANSI C enviornment.  An equivalent must be
-+ * provided in your enviornment in order to use dwc_os.h with the debug and
-+ * tracing message functionality.
-+ *
-+ * @subsection thread Threading
-+ *
-+ * WUDEV Core must be run on an operating system that provides for multiple
-+ * threads/processes.  Threading can be implemented in many ways, even in
-+ * embedded systems without an operating system.  At the bare minimum, the
-+ * system should be able to start any number of processes at any time to handle
-+ * special work.  It need not be a pre-emptive system.  Process context can
-+ * change upon a call to a blocking function.  The hardware interrupt context
-+ * that calls the module's ISR() function must be differentiable from process
-+ * context, even if your processes are impemented via a hardware interrupt.
-+ * Further locking mechanism between process must exist (or be implemented), and
-+ * process context must have a way to disable interrupts for a period of time to
-+ * lock them out.  If all of this exists, the functions in dwc_os.h related to
-+ * threading should be able to be implemented with the defined behavior.
-+ *
-+ */
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _DWC_OS_H_ */
---- /dev/null
-+++ b/drivers/usb/host/dwc_common_port/usb.h
-@@ -0,0 +1,275 @@
-+/*
-+ * Copyright (c) 1998 The NetBSD Foundation, Inc.
-+ * All rights reserved.
-+ *
-+ * This code is derived from software contributed to The NetBSD Foundation
-+ * by Lennart Augustsson (lennart@augustsson.net) at
-+ * Carlstedt Research & Technology.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+/* Modified by Synopsys, Inc, 12/12/2007 */
-+
-+
-+#ifndef _USB_H_
-+#define _USB_H_
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/*
-+ * The USB records contain some unaligned little-endian word
-+ * components.  The U[SG]ETW macros take care of both the alignment
-+ * and endian problem and should always be used to access non-byte
-+ * values.
-+ */
-+typedef u_int8_t uByte;
-+typedef u_int8_t uWord[2];
-+typedef u_int8_t uDWord[4];
-+
-+#define UGETW(w) ((w)[0] | ((w)[1] << 8))
-+#define USETW(w,v) ((w)[0] = (u_int8_t)(v), (w)[1] = (u_int8_t)((v) >> 8))
-+#define UGETDW(w) ((w)[0] | ((w)[1] << 8) | ((w)[2] << 16) | ((w)[3] << 24))
-+#define USETDW(w,v) ((w)[0] = (u_int8_t)(v), \
-+		     (w)[1] = (u_int8_t)((v) >> 8), \
-+		     (w)[2] = (u_int8_t)((v) >> 16), \
-+		     (w)[3] = (u_int8_t)((v) >> 24))
-+
-+#define UPACKED __attribute__((__packed__))
-+
-+typedef struct {
-+	uByte		bmRequestType;
-+	uByte		bRequest;
-+	uWord		wValue;
-+	uWord		wIndex;
-+	uWord		wLength;
-+} UPACKED usb_device_request_t;
-+
-+#define UT_GET_DIR(a) ((a) & 0x80)
-+#define UT_WRITE		0x00
-+#define UT_READ			0x80
-+
-+#define UT_GET_TYPE(a) ((a) & 0x60)
-+#define UT_STANDARD		0x00
-+#define UT_CLASS		0x20
-+#define UT_VENDOR		0x40
-+
-+#define UT_GET_RECIPIENT(a) ((a) & 0x1f)
-+#define UT_DEVICE		0x00
-+#define UT_INTERFACE		0x01
-+#define UT_ENDPOINT		0x02
-+#define UT_OTHER		0x03
-+
-+/* Requests */
-+#define UR_GET_STATUS		0x00
-+#define  USTAT_STANDARD_STATUS  0x00
-+#define  WUSTAT_WUSB_FEATURE    0x01
-+#define  WUSTAT_CHANNEL_INFO    0x02
-+#define  WUSTAT_RECEIVED_DATA   0x03
-+#define  WUSTAT_MAS_AVAILABILITY 0x04
-+#define  WUSTAT_CURRENT_TRANSMIT_POWER 0x05
-+#define UR_CLEAR_FEATURE	0x01
-+#define UR_SET_FEATURE		0x03
-+#define UR_SET_AND_TEST_FEATURE 0x0c
-+#define UR_SET_ADDRESS		0x05
-+#define UR_GET_DESCRIPTOR	0x06
-+#define  UDESC_DEVICE		0x01
-+#define  UDESC_CONFIG		0x02
-+#define  UDESC_STRING		0x03
-+#define  UDESC_INTERFACE	0x04
-+#define  UDESC_ENDPOINT		0x05
-+#define  UDESC_SS_USB_COMPANION	0x30
-+#define  UDESC_DEVICE_QUALIFIER	0x06
-+#define  UDESC_OTHER_SPEED_CONFIGURATION 0x07
-+#define  UDESC_INTERFACE_POWER	0x08
-+#define  UDESC_OTG		0x09
-+#define  WUDESC_SECURITY	0x0c
-+#define  WUDESC_KEY		0x0d
-+#define   WUD_GET_KEY_INDEX(_wValue_) ((_wValue_) & 0xf)
-+#define   WUD_GET_KEY_TYPE(_wValue_) (((_wValue_) & 0x30) >> 4)
-+#define    WUD_KEY_TYPE_ASSOC    0x01
-+#define    WUD_KEY_TYPE_GTK      0x02
-+#define   WUD_GET_KEY_ORIGIN(_wValue_) (((_wValue_) & 0x40) >> 6)
-+#define    WUD_KEY_ORIGIN_HOST   0x00
-+#define    WUD_KEY_ORIGIN_DEVICE 0x01
-+#define  WUDESC_ENCRYPTION_TYPE	0x0e
-+#define  WUDESC_BOS		0x0f
-+#define  WUDESC_DEVICE_CAPABILITY 0x10
-+#define  WUDESC_WIRELESS_ENDPOINT_COMPANION 0x11
-+#define  UDESC_BOS		0x0f
-+#define  UDESC_DEVICE_CAPABILITY 0x10
-+#define  UDESC_CS_DEVICE	0x21	/* class specific */
-+#define  UDESC_CS_CONFIG	0x22
-+#define  UDESC_CS_STRING	0x23
-+#define  UDESC_CS_INTERFACE	0x24
-+#define  UDESC_CS_ENDPOINT	0x25
-+#define  UDESC_HUB		0x29
-+#define UR_SET_DESCRIPTOR	0x07
-+#define UR_GET_CONFIG		0x08
-+#define UR_SET_CONFIG		0x09
-+#define UR_GET_INTERFACE	0x0a
-+#define UR_SET_INTERFACE	0x0b
-+#define UR_SYNCH_FRAME		0x0c
-+#define WUR_SET_ENCRYPTION      0x0d
-+#define WUR_GET_ENCRYPTION	0x0e
-+#define WUR_SET_HANDSHAKE	0x0f
-+#define WUR_GET_HANDSHAKE	0x10
-+#define WUR_SET_CONNECTION	0x11
-+#define WUR_SET_SECURITY_DATA	0x12
-+#define WUR_GET_SECURITY_DATA	0x13
-+#define WUR_SET_WUSB_DATA	0x14
-+#define  WUDATA_DRPIE_INFO	0x01
-+#define  WUDATA_TRANSMIT_DATA	0x02
-+#define  WUDATA_TRANSMIT_PARAMS	0x03
-+#define  WUDATA_RECEIVE_PARAMS	0x04
-+#define  WUDATA_TRANSMIT_POWER	0x05
-+#define WUR_LOOPBACK_DATA_WRITE	0x15
-+#define WUR_LOOPBACK_DATA_READ	0x16
-+#define WUR_SET_INTERFACE_DS	0x17
-+
-+/* Feature numbers */
-+#define UF_ENDPOINT_HALT	0
-+#define UF_DEVICE_REMOTE_WAKEUP	1
-+#define UF_TEST_MODE		2
-+#define UF_DEVICE_B_HNP_ENABLE	3
-+#define UF_DEVICE_A_HNP_SUPPORT	4
-+#define UF_DEVICE_A_ALT_HNP_SUPPORT 5
-+#define WUF_WUSB		3
-+#define  WUF_TX_DRPIE		0x0
-+#define  WUF_DEV_XMIT_PACKET	0x1
-+#define  WUF_COUNT_PACKETS	0x2
-+#define  WUF_CAPTURE_PACKETS	0x3
-+#define UF_FUNCTION_SUSPEND	0
-+#define UF_U1_ENABLE		48
-+#define UF_U2_ENABLE		49
-+#define UF_LTM_ENABLE		50
-+
-+/* Class requests from the USB 2.0 hub spec, table 11-15 */
-+#define UCR_CLEAR_HUB_FEATURE		(0x2000 | UR_CLEAR_FEATURE)
-+#define UCR_CLEAR_PORT_FEATURE		(0x2300 | UR_CLEAR_FEATURE)
-+#define UCR_GET_HUB_DESCRIPTOR		(0xa000 | UR_GET_DESCRIPTOR)
-+#define UCR_GET_HUB_STATUS		(0xa000 | UR_GET_STATUS)
-+#define UCR_GET_PORT_STATUS		(0xa300 | UR_GET_STATUS)
-+#define UCR_SET_HUB_FEATURE		(0x2000 | UR_SET_FEATURE)
-+#define UCR_SET_PORT_FEATURE		(0x2300 | UR_SET_FEATURE)
-+#define UCR_SET_AND_TEST_PORT_FEATURE	(0xa300 | UR_SET_AND_TEST_FEATURE)
-+
-+#ifdef _MSC_VER
-+#include <pshpack1.h>
-+#endif
-+
-+typedef struct {
-+	uByte		bLength;
-+	uByte		bDescriptorType;
-+	uByte		bEndpointAddress;
-+#define UE_GET_DIR(a)	((a) & 0x80)
-+#define UE_SET_DIR(a,d)	((a) | (((d)&1) << 7))
-+#define UE_DIR_IN	0x80
-+#define UE_DIR_OUT	0x00
-+#define UE_ADDR		0x0f
-+#define UE_GET_ADDR(a)	((a) & UE_ADDR)
-+	uByte		bmAttributes;
-+#define UE_XFERTYPE	0x03
-+#define  UE_CONTROL	0x00
-+#define  UE_ISOCHRONOUS	0x01
-+#define  UE_BULK	0x02
-+#define  UE_INTERRUPT	0x03
-+#define UE_GET_XFERTYPE(a)	((a) & UE_XFERTYPE)
-+#define UE_ISO_TYPE	0x0c
-+#define  UE_ISO_ASYNC	0x04
-+#define  UE_ISO_ADAPT	0x08
-+#define  UE_ISO_SYNC	0x0c
-+#define UE_GET_ISO_TYPE(a)	((a) & UE_ISO_TYPE)
-+	uWord		wMaxPacketSize;
-+	uByte		bInterval;
-+} UPACKED usb_endpoint_descriptor_t;
-+#define USB_ENDPOINT_DESCRIPTOR_SIZE 7
-+
-+/* Hub specific request */
-+#define UR_GET_BUS_STATE	0x02
-+#define UR_CLEAR_TT_BUFFER	0x08
-+#define UR_RESET_TT		0x09
-+#define UR_GET_TT_STATE		0x0a
-+#define UR_STOP_TT		0x0b
-+
-+/* Hub features */
-+#define UHF_C_HUB_LOCAL_POWER	0
-+#define UHF_C_HUB_OVER_CURRENT	1
-+#define UHF_PORT_CONNECTION	0
-+#define UHF_PORT_ENABLE		1
-+#define UHF_PORT_SUSPEND	2
-+#define UHF_PORT_OVER_CURRENT	3
-+#define UHF_PORT_RESET		4
-+#define UHF_PORT_L1		5
-+#define UHF_PORT_POWER		8
-+#define UHF_PORT_LOW_SPEED	9
-+#define UHF_PORT_HIGH_SPEED	10
-+#define UHF_C_PORT_CONNECTION	16
-+#define UHF_C_PORT_ENABLE	17
-+#define UHF_C_PORT_SUSPEND	18
-+#define UHF_C_PORT_OVER_CURRENT	19
-+#define UHF_C_PORT_RESET	20
-+#define UHF_C_PORT_L1		23
-+#define UHF_PORT_TEST		21
-+#define UHF_PORT_INDICATOR	22
-+
-+typedef struct {
-+	uByte		bDescLength;
-+	uByte		bDescriptorType;
-+	uByte		bNbrPorts;
-+	uWord		wHubCharacteristics;
-+#define UHD_PWR			0x0003
-+#define  UHD_PWR_GANGED		0x0000
-+#define  UHD_PWR_INDIVIDUAL	0x0001
-+#define  UHD_PWR_NO_SWITCH	0x0002
-+#define UHD_COMPOUND		0x0004
-+#define UHD_OC			0x0018
-+#define  UHD_OC_GLOBAL		0x0000
-+#define  UHD_OC_INDIVIDUAL	0x0008
-+#define  UHD_OC_NONE		0x0010
-+#define UHD_TT_THINK		0x0060
-+#define  UHD_TT_THINK_8		0x0000
-+#define  UHD_TT_THINK_16	0x0020
-+#define  UHD_TT_THINK_24	0x0040
-+#define  UHD_TT_THINK_32	0x0060
-+#define UHD_PORT_IND		0x0080
-+	uByte		bPwrOn2PwrGood;	/* delay in 2 ms units */
-+#define UHD_PWRON_FACTOR 2
-+	uByte		bHubContrCurrent;
-+	uByte		DeviceRemovable[32]; /* max 255 ports */
-+#define UHD_NOT_REMOV(desc, i) \
-+    (((desc)->DeviceRemovable[(i)/8] >> ((i) % 8)) & 1)
-+	/* deprecated */ uByte		PortPowerCtrlMask[1];
-+} UPACKED usb_hub_descriptor_t;
-+#define USB_HUB_DESCRIPTOR_SIZE 9 /* includes deprecated PortPowerCtrlMask */
-+
-+#ifdef _MSC_VER
-+#include <poppack.h>
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _USB_H_ */
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/Makefile
-@@ -0,0 +1,85 @@
-+#
-+# Makefile for DWC_otg Highspeed USB controller driver
-+#
-+
-+ifneq ($(KERNELRELEASE),)
-+
-+# Use the BUS_INTERFACE variable to compile the software for either
-+# PCI(PCI_INTERFACE) or LM(LM_INTERFACE) bus.
-+ifeq ($(BUS_INTERFACE),)
-+#	BUS_INTERFACE = -DPCI_INTERFACE
-+#	BUS_INTERFACE = -DLM_INTERFACE
-+        BUS_INTERFACE = -DPLATFORM_INTERFACE
-+endif
-+
-+#ccflags-y	+= -DDEBUG
-+#ccflags-y	+= -DDWC_OTG_DEBUGLEV=1 # reduce common debug msgs
-+
-+# Use one of the following flags to compile the software in host-only or
-+# device-only mode.
-+#ccflags-y        += -DDWC_HOST_ONLY
-+#ccflags-y        += -DDWC_DEVICE_ONLY
-+
-+ccflags-y	+= -Dlinux -DDWC_HS_ELECT_TST
-+#ccflags-y	+= -DDWC_EN_ISOC
-+ccflags-y   	+= -I$(srctree)/drivers/usb/host/dwc_common_port
-+#ccflags-y   	+= -I$(PORTLIB)
-+ccflags-y   	+= -DDWC_LINUX
-+ccflags-y   	+= $(CFI)
-+ccflags-y	+= $(BUS_INTERFACE)
-+#ccflags-y	+= -DDWC_DEV_SRPCAP
-+
-+obj-$(CONFIG_USB_DWCOTG) += dwc_otg.o
-+
-+dwc_otg-objs	:= dwc_otg_driver.o dwc_otg_attr.o
-+dwc_otg-objs	+= dwc_otg_cil.o dwc_otg_cil_intr.o
-+dwc_otg-objs	+= dwc_otg_pcd_linux.o dwc_otg_pcd.o dwc_otg_pcd_intr.o
-+dwc_otg-objs	+= dwc_otg_hcd.o dwc_otg_hcd_linux.o dwc_otg_hcd_intr.o dwc_otg_hcd_queue.o dwc_otg_hcd_ddma.o
-+dwc_otg-objs	+= dwc_otg_adp.o
-+dwc_otg-objs	+= dwc_otg_fiq_fsm.o
-+ifneq ($(CONFIG_ARM64),y)
-+dwc_otg-objs	+= dwc_otg_fiq_stub.o
-+endif
-+
-+ifneq ($(CFI),)
-+dwc_otg-objs	+= dwc_otg_cfi.o
-+endif
-+
-+kernrelwd := $(subst ., ,$(KERNELRELEASE))
-+kernrel3 := $(word 1,$(kernrelwd)).$(word 2,$(kernrelwd)).$(word 3,$(kernrelwd))
-+
-+ifneq ($(kernrel3),2.6.20)
-+ccflags-y += $(CPPFLAGS)
-+endif
-+
-+else
-+
-+PWD		:= $(shell pwd)
-+PORTLIB		:= $(PWD)/../dwc_common_port
-+
-+# Command paths
-+CTAGS		:= $(CTAGS)
-+DOXYGEN		:= $(DOXYGEN)
-+
-+default: portlib
-+	$(MAKE) -C$(KDIR) M=$(PWD) ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
-+
-+install: default
-+	$(MAKE) -C$(KDIR) M=$(PORTLIB) modules_install
-+	$(MAKE) -C$(KDIR) M=$(PWD) modules_install
-+
-+portlib:
-+	$(MAKE) -C$(KDIR) M=$(PORTLIB) ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
-+	cp $(PORTLIB)/Module.symvers $(PWD)/
-+
-+docs:	$(wildcard *.[hc]) doc/doxygen.cfg
-+	$(DOXYGEN) doc/doxygen.cfg
-+
-+tags:	$(wildcard *.[hc])
-+	$(CTAGS) -e $(wildcard *.[hc]) $(wildcard linux/*.[hc]) $(wildcard $(KDIR)/include/linux/usb*.h)
-+
-+
-+clean:
-+	rm -rf   *.o *.ko .*cmd *.mod.c .tmp_versions Module.symvers
-+
-+endif
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/doc/doxygen.cfg
-@@ -0,0 +1,224 @@
-+# Doxyfile 1.3.9.1
-+
-+#---------------------------------------------------------------------------
-+# Project related configuration options
-+#---------------------------------------------------------------------------
-+PROJECT_NAME           = "DesignWare USB 2.0 OTG Controller (DWC_otg) Device Driver"
-+PROJECT_NUMBER         = v3.00a
-+OUTPUT_DIRECTORY       = ./doc/
-+CREATE_SUBDIRS         = NO
-+OUTPUT_LANGUAGE        = English
-+BRIEF_MEMBER_DESC      = YES
-+REPEAT_BRIEF           = YES
-+ABBREVIATE_BRIEF       = "The $name class" \
-+                         "The $name widget" \
-+                         "The $name file" \
-+                         is \
-+                         provides \
-+                         specifies \
-+                         contains \
-+                         represents \
-+                         a \
-+                         an \
-+                         the
-+ALWAYS_DETAILED_SEC    = NO
-+INLINE_INHERITED_MEMB  = NO
-+FULL_PATH_NAMES        = NO
-+STRIP_FROM_PATH        =
-+STRIP_FROM_INC_PATH    =
-+SHORT_NAMES            = NO
-+JAVADOC_AUTOBRIEF      = YES
-+MULTILINE_CPP_IS_BRIEF = NO
-+INHERIT_DOCS           = YES
-+DISTRIBUTE_GROUP_DOC   = NO
-+TAB_SIZE               = 8
-+ALIASES                =
-+OPTIMIZE_OUTPUT_FOR_C  = YES
-+OPTIMIZE_OUTPUT_JAVA   = NO
-+SUBGROUPING            = YES
-+#---------------------------------------------------------------------------
-+# Build related configuration options
-+#---------------------------------------------------------------------------
-+EXTRACT_ALL            = NO
-+EXTRACT_PRIVATE        = YES
-+EXTRACT_STATIC         = YES
-+EXTRACT_LOCAL_CLASSES  = YES
-+EXTRACT_LOCAL_METHODS  = NO
-+HIDE_UNDOC_MEMBERS     = NO
-+HIDE_UNDOC_CLASSES     = NO
-+HIDE_FRIEND_COMPOUNDS  = NO
-+HIDE_IN_BODY_DOCS      = NO
-+INTERNAL_DOCS          = NO
-+CASE_SENSE_NAMES       = NO
-+HIDE_SCOPE_NAMES       = NO
-+SHOW_INCLUDE_FILES     = YES
-+INLINE_INFO            = YES
-+SORT_MEMBER_DOCS       = NO
-+SORT_BRIEF_DOCS        = NO
-+SORT_BY_SCOPE_NAME     = NO
-+GENERATE_TODOLIST      = YES
-+GENERATE_TESTLIST      = YES
-+GENERATE_BUGLIST       = YES
-+GENERATE_DEPRECATEDLIST= YES
-+ENABLED_SECTIONS       =
-+MAX_INITIALIZER_LINES  = 30
-+SHOW_USED_FILES        = YES
-+SHOW_DIRECTORIES       = YES
-+#---------------------------------------------------------------------------
-+# configuration options related to warning and progress messages
-+#---------------------------------------------------------------------------
-+QUIET                  = YES
-+WARNINGS               = YES
-+WARN_IF_UNDOCUMENTED   = NO
-+WARN_IF_DOC_ERROR      = YES
-+WARN_FORMAT            = "$file:$line: $text"
-+WARN_LOGFILE           =
-+#---------------------------------------------------------------------------
-+# configuration options related to the input files
-+#---------------------------------------------------------------------------
-+INPUT                  = .
-+FILE_PATTERNS          = *.c \
-+                         *.h \
-+                         ./linux/*.c \
-+                         ./linux/*.h
-+RECURSIVE              = NO
-+EXCLUDE                = ./test/ \
-+                         ./dwc_otg/.AppleDouble/
-+EXCLUDE_SYMLINKS       = YES
-+EXCLUDE_PATTERNS       = *.mod.*
-+EXAMPLE_PATH           =
-+EXAMPLE_PATTERNS       = *
-+EXAMPLE_RECURSIVE      = NO
-+IMAGE_PATH             =
-+INPUT_FILTER           =
-+FILTER_PATTERNS        =
-+FILTER_SOURCE_FILES    = NO
-+#---------------------------------------------------------------------------
-+# configuration options related to source browsing
-+#---------------------------------------------------------------------------
-+SOURCE_BROWSER         = YES
-+INLINE_SOURCES         = NO
-+STRIP_CODE_COMMENTS    = YES
-+REFERENCED_BY_RELATION = NO
-+REFERENCES_RELATION    = NO
-+VERBATIM_HEADERS       = NO
-+#---------------------------------------------------------------------------
-+# configuration options related to the alphabetical class index
-+#---------------------------------------------------------------------------
-+ALPHABETICAL_INDEX     = NO
-+COLS_IN_ALPHA_INDEX    = 5
-+IGNORE_PREFIX          =
-+#---------------------------------------------------------------------------
-+# configuration options related to the HTML output
-+#---------------------------------------------------------------------------
-+GENERATE_HTML          = YES
-+HTML_OUTPUT            = html
-+HTML_FILE_EXTENSION    = .html
-+HTML_HEADER            =
-+HTML_FOOTER            =
-+HTML_STYLESHEET        =
-+HTML_ALIGN_MEMBERS     = YES
-+GENERATE_HTMLHELP      = NO
-+CHM_FILE               =
-+HHC_LOCATION           =
-+GENERATE_CHI           = NO
-+BINARY_TOC             = NO
-+TOC_EXPAND             = NO
-+DISABLE_INDEX          = NO
-+ENUM_VALUES_PER_LINE   = 4
-+GENERATE_TREEVIEW      = YES
-+TREEVIEW_WIDTH         = 250
-+#---------------------------------------------------------------------------
-+# configuration options related to the LaTeX output
-+#---------------------------------------------------------------------------
-+GENERATE_LATEX         = NO
-+LATEX_OUTPUT           = latex
-+LATEX_CMD_NAME         = latex
-+MAKEINDEX_CMD_NAME     = makeindex
-+COMPACT_LATEX          = NO
-+PAPER_TYPE             = a4wide
-+EXTRA_PACKAGES         =
-+LATEX_HEADER           =
-+PDF_HYPERLINKS         = NO
-+USE_PDFLATEX           = NO
-+LATEX_BATCHMODE        = NO
-+LATEX_HIDE_INDICES     = NO
-+#---------------------------------------------------------------------------
-+# configuration options related to the RTF output
-+#---------------------------------------------------------------------------
-+GENERATE_RTF           = NO
-+RTF_OUTPUT             = rtf
-+COMPACT_RTF            = NO
-+RTF_HYPERLINKS         = NO
-+RTF_STYLESHEET_FILE    =
-+RTF_EXTENSIONS_FILE    =
-+#---------------------------------------------------------------------------
-+# configuration options related to the man page output
-+#---------------------------------------------------------------------------
-+GENERATE_MAN           = NO
-+MAN_OUTPUT             = man
-+MAN_EXTENSION          = .3
-+MAN_LINKS              = NO
-+#---------------------------------------------------------------------------
-+# configuration options related to the XML output
-+#---------------------------------------------------------------------------
-+GENERATE_XML           = NO
-+XML_OUTPUT             = xml
-+XML_SCHEMA             =
-+XML_DTD                =
-+XML_PROGRAMLISTING     = YES
-+#---------------------------------------------------------------------------
-+# configuration options for the AutoGen Definitions output
-+#---------------------------------------------------------------------------
-+GENERATE_AUTOGEN_DEF   = NO
-+#---------------------------------------------------------------------------
-+# configuration options related to the Perl module output
-+#---------------------------------------------------------------------------
-+GENERATE_PERLMOD       = NO
-+PERLMOD_LATEX          = NO
-+PERLMOD_PRETTY         = YES
-+PERLMOD_MAKEVAR_PREFIX =
-+#---------------------------------------------------------------------------
-+# Configuration options related to the preprocessor
-+#---------------------------------------------------------------------------
-+ENABLE_PREPROCESSING   = YES
-+MACRO_EXPANSION        = YES
-+EXPAND_ONLY_PREDEF     = YES
-+SEARCH_INCLUDES        = YES
-+INCLUDE_PATH           =
-+INCLUDE_FILE_PATTERNS  =
-+PREDEFINED             = DEVICE_ATTR DWC_EN_ISOC
-+EXPAND_AS_DEFINED      = DWC_OTG_DEVICE_ATTR_BITFIELD_SHOW DWC_OTG_DEVICE_ATTR_BITFIELD_STORE DWC_OTG_DEVICE_ATTR_BITFIELD_RW DWC_OTG_DEVICE_ATTR_BITFIELD_RO DWC_OTG_DEVICE_ATTR_REG_SHOW DWC_OTG_DEVICE_ATTR_REG_STORE DWC_OTG_DEVICE_ATTR_REG32_RW DWC_OTG_DEVICE_ATTR_REG32_RO DWC_EN_ISOC
-+SKIP_FUNCTION_MACROS   = NO
-+#---------------------------------------------------------------------------
-+# Configuration::additions related to external references
-+#---------------------------------------------------------------------------
-+TAGFILES               =
-+GENERATE_TAGFILE       =
-+ALLEXTERNALS           = NO
-+EXTERNAL_GROUPS        = YES
-+PERL_PATH              = /usr/bin/perl
-+#---------------------------------------------------------------------------
-+# Configuration options related to the dot tool
-+#---------------------------------------------------------------------------
-+CLASS_DIAGRAMS         = YES
-+HIDE_UNDOC_RELATIONS   = YES
-+HAVE_DOT               = NO
-+CLASS_GRAPH            = YES
-+COLLABORATION_GRAPH    = YES
-+UML_LOOK               = NO
-+TEMPLATE_RELATIONS     = NO
-+INCLUDE_GRAPH          = YES
-+INCLUDED_BY_GRAPH      = YES
-+CALL_GRAPH             = NO
-+GRAPHICAL_HIERARCHY    = YES
-+DOT_IMAGE_FORMAT       = png
-+DOT_PATH               =
-+DOTFILE_DIRS           =
-+MAX_DOT_GRAPH_DEPTH    = 1000
-+GENERATE_LEGEND        = YES
-+DOT_CLEANUP            = YES
-+#---------------------------------------------------------------------------
-+# Configuration::additions related to the search engine
-+#---------------------------------------------------------------------------
-+SEARCHENGINE           = NO
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/dummy_audio.c
-@@ -0,0 +1,1574 @@
-+/*
-+ * zero.c -- Gadget Zero, for USB development
-+ *
-+ * Copyright (C) 2003-2004 David Brownell
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions, and the following disclaimer,
-+ *    without modification.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. The names of the above-listed copyright holders may not be used
-+ *    to endorse or promote products derived from this software without
-+ *    specific prior written permission.
-+ *
-+ * ALTERNATIVELY, this software may be distributed under the terms of the
-+ * GNU General Public License ("GPL") as published by the Free Software
-+ * Foundation, either version 2 of that License or (at your option) any
-+ * later version.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+
-+/*
-+ * Gadget Zero only needs two bulk endpoints, and is an example of how you
-+ * can write a hardware-agnostic gadget driver running inside a USB device.
-+ *
-+ * Hardware details are visible (see CONFIG_USB_ZERO_* below) but don't
-+ * affect most of the driver.
-+ *
-+ * Use it with the Linux host/master side "usbtest" driver to get a basic
-+ * functional test of your device-side usb stack, or with "usb-skeleton".
-+ *
-+ * It supports two similar configurations.  One sinks whatever the usb host
-+ * writes, and in return sources zeroes.  The other loops whatever the host
-+ * writes back, so the host can read it.  Module options include:
-+ *
-+ *   buflen=N		default N=4096, buffer size used
-+ *   qlen=N		default N=32, how many buffers in the loopback queue
-+ *   loopdefault	default false, list loopback config first
-+ *
-+ * Many drivers will only have one configuration, letting them be much
-+ * simpler if they also don't support high speed operation (like this
-+ * driver does).
-+ */
-+
-+#include <linux/config.h>
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/delay.h>
-+#include <linux/ioport.h>
-+#include <linux/sched.h>
-+#include <linux/slab.h>
-+#include <linux/smp_lock.h>
-+#include <linux/errno.h>
-+#include <linux/init.h>
-+#include <linux/timer.h>
-+#include <linux/list.h>
-+#include <linux/interrupt.h>
-+#include <linux/uts.h>
-+#include <linux/version.h>
-+#include <linux/device.h>
-+#include <linux/moduleparam.h>
-+#include <linux/proc_fs.h>
-+
-+#include <asm/byteorder.h>
-+#include <asm/io.h>
-+#include <asm/irq.h>
-+#include <asm/system.h>
-+#include <asm/unaligned.h>
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
-+# include <linux/usb/ch9.h>
-+#else
-+# include <linux/usb_ch9.h>
-+#endif
-+
-+#include <linux/usb_gadget.h>
-+
-+
-+/*-------------------------------------------------------------------------*/
-+/*-------------------------------------------------------------------------*/
-+
-+
-+static int utf8_to_utf16le(const char *s, u16 *cp, unsigned len)
-+{
-+	int	count = 0;
-+	u8	c;
-+	u16	uchar;
-+
-+	/* this insists on correct encodings, though not minimal ones.
-+	 * BUT it currently rejects legit 4-byte UTF-8 code points,
-+	 * which need surrogate pairs.  (Unicode 3.1 can use them.)
-+	 */
-+	while (len != 0 && (c = (u8) *s++) != 0) {
-+		if (unlikely(c & 0x80)) {
-+			// 2-byte sequence:
-+			// 00000yyyyyxxxxxx = 110yyyyy 10xxxxxx
-+			if ((c & 0xe0) == 0xc0) {
-+				uchar = (c & 0x1f) << 6;
-+
-+				c = (u8) *s++;
-+				if ((c & 0xc0) != 0xc0)
-+					goto fail;
-+				c &= 0x3f;
-+				uchar |= c;
-+
-+			// 3-byte sequence (most CJKV characters):
-+			// zzzzyyyyyyxxxxxx = 1110zzzz 10yyyyyy 10xxxxxx
-+			} else if ((c & 0xf0) == 0xe0) {
-+				uchar = (c & 0x0f) << 12;
-+
-+				c = (u8) *s++;
-+				if ((c & 0xc0) != 0xc0)
-+					goto fail;
-+				c &= 0x3f;
-+				uchar |= c << 6;
-+
-+				c = (u8) *s++;
-+				if ((c & 0xc0) != 0xc0)
-+					goto fail;
-+				c &= 0x3f;
-+				uchar |= c;
-+
-+				/* no bogus surrogates */
-+				if (0xd800 <= uchar && uchar <= 0xdfff)
-+					goto fail;
-+
-+			// 4-byte sequence (surrogate pairs, currently rare):
-+			// 11101110wwwwzzzzyy + 110111yyyyxxxxxx
-+			//     = 11110uuu 10uuzzzz 10yyyyyy 10xxxxxx
-+			// (uuuuu = wwww + 1)
-+			// FIXME accept the surrogate code points (only)
-+
-+			} else
-+				goto fail;
-+		} else
-+			uchar = c;
-+		put_unaligned (cpu_to_le16 (uchar), cp++);
-+		count++;
-+		len--;
-+	}
-+	return count;
-+fail:
-+	return -1;
-+}
-+
-+
-+/**
-+ * usb_gadget_get_string - fill out a string descriptor
-+ * @table: of c strings encoded using UTF-8
-+ * @id: string id, from low byte of wValue in get string descriptor
-+ * @buf: at least 256 bytes
-+ *
-+ * Finds the UTF-8 string matching the ID, and converts it into a
-+ * string descriptor in utf16-le.
-+ * Returns length of descriptor (always even) or negative errno
-+ *
-+ * If your driver needs stings in multiple languages, you'll probably
-+ * "switch (wIndex) { ... }"  in your ep0 string descriptor logic,
-+ * using this routine after choosing which set of UTF-8 strings to use.
-+ * Note that US-ASCII is a strict subset of UTF-8; any string bytes with
-+ * the eighth bit set will be multibyte UTF-8 characters, not ISO-8859/1
-+ * characters (which are also widely used in C strings).
-+ */
-+int
-+usb_gadget_get_string (struct usb_gadget_strings *table, int id, u8 *buf)
-+{
-+	struct usb_string	*s;
-+	int			len;
-+
-+	/* descriptor 0 has the language id */
-+	if (id == 0) {
-+		buf [0] = 4;
-+		buf [1] = USB_DT_STRING;
-+		buf [2] = (u8) table->language;
-+		buf [3] = (u8) (table->language >> 8);
-+		return 4;
-+	}
-+	for (s = table->strings; s && s->s; s++)
-+		if (s->id == id)
-+			break;
-+
-+	/* unrecognized: stall. */
-+	if (!s || !s->s)
-+		return -EINVAL;
-+
-+	/* string descriptors have length, tag, then UTF16-LE text */
-+	len = min ((size_t) 126, strlen (s->s));
-+	memset (buf + 2, 0, 2 * len);	/* zero all the bytes */
-+	len = utf8_to_utf16le(s->s, (u16 *)&buf[2], len);
-+	if (len < 0)
-+		return -EINVAL;
-+	buf [0] = (len + 1) * 2;
-+	buf [1] = USB_DT_STRING;
-+	return buf [0];
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+/*-------------------------------------------------------------------------*/
-+
-+
-+/**
-+ * usb_descriptor_fillbuf - fill buffer with descriptors
-+ * @buf: Buffer to be filled
-+ * @buflen: Size of buf
-+ * @src: Array of descriptor pointers, terminated by null pointer.
-+ *
-+ * Copies descriptors into the buffer, returning the length or a
-+ * negative error code if they can't all be copied.  Useful when
-+ * assembling descriptors for an associated set of interfaces used
-+ * as part of configuring a composite device; or in other cases where
-+ * sets of descriptors need to be marshaled.
-+ */
-+int
-+usb_descriptor_fillbuf(void *buf, unsigned buflen,
-+		const struct usb_descriptor_header **src)
-+{
-+	u8	*dest = buf;
-+
-+	if (!src)
-+		return -EINVAL;
-+
-+	/* fill buffer from src[] until null descriptor ptr */
-+	for (; 0 != *src; src++) {
-+		unsigned		len = (*src)->bLength;
-+
-+		if (len > buflen)
-+			return -EINVAL;
-+		memcpy(dest, *src, len);
-+		buflen -= len;
-+		dest += len;
-+	}
-+	return dest - (u8 *)buf;
-+}
-+
-+
-+/**
-+ * usb_gadget_config_buf - builts a complete configuration descriptor
-+ * @config: Header for the descriptor, including characteristics such
-+ *	as power requirements and number of interfaces.
-+ * @desc: Null-terminated vector of pointers to the descriptors (interface,
-+ *	endpoint, etc) defining all functions in this device configuration.
-+ * @buf: Buffer for the resulting configuration descriptor.
-+ * @length: Length of buffer.  If this is not big enough to hold the
-+ *	entire configuration descriptor, an error code will be returned.
-+ *
-+ * This copies descriptors into the response buffer, building a descriptor
-+ * for that configuration.  It returns the buffer length or a negative
-+ * status code.  The config.wTotalLength field is set to match the length
-+ * of the result, but other descriptor fields (including power usage and
-+ * interface count) must be set by the caller.
-+ *
-+ * Gadget drivers could use this when constructing a config descriptor
-+ * in response to USB_REQ_GET_DESCRIPTOR.  They will need to patch the
-+ * resulting bDescriptorType value if USB_DT_OTHER_SPEED_CONFIG is needed.
-+ */
-+int usb_gadget_config_buf(
-+	const struct usb_config_descriptor	*config,
-+	void					*buf,
-+	unsigned				length,
-+	const struct usb_descriptor_header	**desc
-+)
-+{
-+	struct usb_config_descriptor		*cp = buf;
-+	int					len;
-+
-+	/* config descriptor first */
-+	if (length < USB_DT_CONFIG_SIZE || !desc)
-+		return -EINVAL;
-+	*cp = *config;
-+
-+	/* then interface/endpoint/class/vendor/... */
-+	len = usb_descriptor_fillbuf(USB_DT_CONFIG_SIZE + (u8*)buf,
-+			length - USB_DT_CONFIG_SIZE, desc);
-+	if (len < 0)
-+		return len;
-+	len += USB_DT_CONFIG_SIZE;
-+	if (len > 0xffff)
-+		return -EINVAL;
-+
-+	/* patch up the config descriptor */
-+	cp->bLength = USB_DT_CONFIG_SIZE;
-+	cp->bDescriptorType = USB_DT_CONFIG;
-+	cp->wTotalLength = cpu_to_le16(len);
-+	cp->bmAttributes |= USB_CONFIG_ATT_ONE;
-+	return len;
-+}
-+
-+/*-------------------------------------------------------------------------*/
-+/*-------------------------------------------------------------------------*/
-+
-+
-+#define RBUF_LEN (1024*1024)
-+static int rbuf_start;
-+static int rbuf_len;
-+static __u8 rbuf[RBUF_LEN];
-+
-+/*-------------------------------------------------------------------------*/
-+
-+#define DRIVER_VERSION		"St Patrick's Day 2004"
-+
-+static const char shortname [] = "zero";
-+static const char longname [] = "YAMAHA YST-MS35D USB Speaker  ";
-+
-+static const char source_sink [] = "source and sink data";
-+static const char loopback [] = "loop input to output";
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/*
-+ * driver assumes self-powered hardware, and
-+ * has no way for users to trigger remote wakeup.
-+ *
-+ * this version autoconfigures as much as possible,
-+ * which is reasonable for most "bulk-only" drivers.
-+ */
-+static const char *EP_IN_NAME;		/* source */
-+static const char *EP_OUT_NAME;		/* sink */
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/* big enough to hold our biggest descriptor */
-+#define USB_BUFSIZ	512
-+
-+struct zero_dev {
-+	spinlock_t		lock;
-+	struct usb_gadget	*gadget;
-+	struct usb_request	*req;		/* for control responses */
-+
-+	/* when configured, we have one of two configs:
-+	 * - source data (in to host) and sink it (out from host)
-+	 * - or loop it back (out from host back in to host)
-+	 */
-+	u8			config;
-+	struct usb_ep		*in_ep, *out_ep;
-+
-+	/* autoresume timer */
-+	struct timer_list	resume;
-+};
-+
-+#define xprintk(d,level,fmt,args...) \
-+	dev_printk(level , &(d)->gadget->dev , fmt , ## args)
-+
-+#ifdef DEBUG
-+#define DBG(dev,fmt,args...) \
-+	xprintk(dev , KERN_DEBUG , fmt , ## args)
-+#else
-+#define DBG(dev,fmt,args...) \
-+	do { } while (0)
-+#endif /* DEBUG */
-+
-+#ifdef VERBOSE
-+#define VDBG	DBG
-+#else
-+#define VDBG(dev,fmt,args...) \
-+	do { } while (0)
-+#endif /* VERBOSE */
-+
-+#define ERROR(dev,fmt,args...) \
-+	xprintk(dev , KERN_ERR , fmt , ## args)
-+#define WARN(dev,fmt,args...) \
-+	xprintk(dev , KERN_WARNING , fmt , ## args)
-+#define INFO(dev,fmt,args...) \
-+	xprintk(dev , KERN_INFO , fmt , ## args)
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static unsigned buflen = 4096;
-+static unsigned qlen = 32;
-+static unsigned pattern = 0;
-+
-+module_param (buflen, uint, S_IRUGO|S_IWUSR);
-+module_param (qlen, uint, S_IRUGO|S_IWUSR);
-+module_param (pattern, uint, S_IRUGO|S_IWUSR);
-+
-+/*
-+ * if it's nonzero, autoresume says how many seconds to wait
-+ * before trying to wake up the host after suspend.
-+ */
-+static unsigned autoresume = 0;
-+module_param (autoresume, uint, 0);
-+
-+/*
-+ * Normally the "loopback" configuration is second (index 1) so
-+ * it's not the default.  Here's where to change that order, to
-+ * work better with hosts where config changes are problematic.
-+ * Or controllers (like superh) that only support one config.
-+ */
-+static int loopdefault = 0;
-+
-+module_param (loopdefault, bool, S_IRUGO|S_IWUSR);
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/* Thanks to NetChip Technologies for donating this product ID.
-+ *
-+ * DO NOT REUSE THESE IDs with a protocol-incompatible driver!!  Ever!!
-+ * Instead:  allocate your own, using normal USB-IF procedures.
-+ */
-+#ifndef	CONFIG_USB_ZERO_HNPTEST
-+#define DRIVER_VENDOR_NUM	0x0525		/* NetChip */
-+#define DRIVER_PRODUCT_NUM	0xa4a0		/* Linux-USB "Gadget Zero" */
-+#else
-+#define DRIVER_VENDOR_NUM	0x1a0a		/* OTG test device IDs */
-+#define DRIVER_PRODUCT_NUM	0xbadd
-+#endif
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/*
-+ * DESCRIPTORS ... most are static, but strings and (full)
-+ * configuration descriptors are built on demand.
-+ */
-+
-+/*
-+#define STRING_MANUFACTURER		25
-+#define STRING_PRODUCT			42
-+#define STRING_SERIAL			101
-+*/
-+#define STRING_MANUFACTURER		1
-+#define STRING_PRODUCT			2
-+#define STRING_SERIAL			3
-+
-+#define STRING_SOURCE_SINK		250
-+#define STRING_LOOPBACK			251
-+
-+/*
-+ * This device advertises two configurations; these numbers work
-+ * on a pxa250 as well as more flexible hardware.
-+ */
-+#define	CONFIG_SOURCE_SINK	3
-+#define	CONFIG_LOOPBACK		2
-+
-+/*
-+static struct usb_device_descriptor
-+device_desc = {
-+	.bLength =		sizeof device_desc,
-+	.bDescriptorType =	USB_DT_DEVICE,
-+
-+	.bcdUSB =		__constant_cpu_to_le16 (0x0200),
-+	.bDeviceClass =		USB_CLASS_VENDOR_SPEC,
-+
-+	.idVendor =		__constant_cpu_to_le16 (DRIVER_VENDOR_NUM),
-+	.idProduct =		__constant_cpu_to_le16 (DRIVER_PRODUCT_NUM),
-+	.iManufacturer =	STRING_MANUFACTURER,
-+	.iProduct =		STRING_PRODUCT,
-+	.iSerialNumber =	STRING_SERIAL,
-+	.bNumConfigurations =	2,
-+};
-+*/
-+static struct usb_device_descriptor
-+device_desc = {
-+	.bLength =		sizeof device_desc,
-+	.bDescriptorType =	USB_DT_DEVICE,
-+	.bcdUSB =		__constant_cpu_to_le16 (0x0100),
-+	.bDeviceClass =		USB_CLASS_PER_INTERFACE,
-+	.bDeviceSubClass =      0,
-+	.bDeviceProtocol =      0,
-+	.bMaxPacketSize0 =      64,
-+	.bcdDevice =            __constant_cpu_to_le16 (0x0100),
-+	.idVendor =		__constant_cpu_to_le16 (0x0499),
-+	.idProduct =		__constant_cpu_to_le16 (0x3002),
-+	.iManufacturer =	STRING_MANUFACTURER,
-+	.iProduct =		STRING_PRODUCT,
-+	.iSerialNumber =	STRING_SERIAL,
-+	.bNumConfigurations =	1,
-+};
-+
-+static struct usb_config_descriptor
-+z_config = {
-+	.bLength =		sizeof z_config,
-+	.bDescriptorType =	USB_DT_CONFIG,
-+
-+	/* compute wTotalLength on the fly */
-+	.bNumInterfaces =	2,
-+	.bConfigurationValue =	1,
-+	.iConfiguration =	0,
-+	.bmAttributes =		0x40,
-+	.bMaxPower =		0,	/* self-powered */
-+};
-+
-+
-+static struct usb_otg_descriptor
-+otg_descriptor = {
-+	.bLength =		sizeof otg_descriptor,
-+	.bDescriptorType =	USB_DT_OTG,
-+
-+	.bmAttributes =		USB_OTG_SRP,
-+};
-+
-+/* one interface in each configuration */
-+#ifdef	CONFIG_USB_GADGET_DUALSPEED
-+
-+/*
-+ * usb 2.0 devices need to expose both high speed and full speed
-+ * descriptors, unless they only run at full speed.
-+ *
-+ * that means alternate endpoint descriptors (bigger packets)
-+ * and a "device qualifier" ... plus more construction options
-+ * for the config descriptor.
-+ */
-+
-+static struct usb_qualifier_descriptor
-+dev_qualifier = {
-+	.bLength =		sizeof dev_qualifier,
-+	.bDescriptorType =	USB_DT_DEVICE_QUALIFIER,
-+
-+	.bcdUSB =		__constant_cpu_to_le16 (0x0200),
-+	.bDeviceClass =		USB_CLASS_VENDOR_SPEC,
-+
-+	.bNumConfigurations =	2,
-+};
-+
-+
-+struct usb_cs_as_general_descriptor {
-+	__u8  bLength;
-+	__u8  bDescriptorType;
-+
-+	__u8  bDescriptorSubType;
-+	__u8  bTerminalLink;
-+	__u8  bDelay;
-+	__u16  wFormatTag;
-+} __attribute__ ((packed));
-+
-+struct usb_cs_as_format_descriptor {
-+	__u8  bLength;
-+	__u8  bDescriptorType;
-+
-+	__u8  bDescriptorSubType;
-+	__u8  bFormatType;
-+	__u8  bNrChannels;
-+	__u8  bSubframeSize;
-+	__u8  bBitResolution;
-+	__u8  bSamfreqType;
-+	__u8  tLowerSamFreq[3];
-+	__u8  tUpperSamFreq[3];
-+} __attribute__ ((packed));
-+
-+static const struct usb_interface_descriptor
-+z_audio_control_if_desc = {
-+	.bLength =		sizeof z_audio_control_if_desc,
-+	.bDescriptorType =	USB_DT_INTERFACE,
-+	.bInterfaceNumber = 0,
-+	.bAlternateSetting = 0,
-+	.bNumEndpoints = 0,
-+	.bInterfaceClass = USB_CLASS_AUDIO,
-+	.bInterfaceSubClass = 0x1,
-+	.bInterfaceProtocol = 0,
-+	.iInterface = 0,
-+};
-+
-+static const struct usb_interface_descriptor
-+z_audio_if_desc = {
-+	.bLength =		sizeof z_audio_if_desc,
-+	.bDescriptorType =	USB_DT_INTERFACE,
-+	.bInterfaceNumber = 1,
-+	.bAlternateSetting = 0,
-+	.bNumEndpoints = 0,
-+	.bInterfaceClass = USB_CLASS_AUDIO,
-+	.bInterfaceSubClass = 0x2,
-+	.bInterfaceProtocol = 0,
-+	.iInterface = 0,
-+};
-+
-+static const struct usb_interface_descriptor
-+z_audio_if_desc2 = {
-+	.bLength =		sizeof z_audio_if_desc,
-+	.bDescriptorType =	USB_DT_INTERFACE,
-+	.bInterfaceNumber = 1,
-+	.bAlternateSetting = 1,
-+	.bNumEndpoints = 1,
-+	.bInterfaceClass = USB_CLASS_AUDIO,
-+	.bInterfaceSubClass = 0x2,
-+	.bInterfaceProtocol = 0,
-+	.iInterface = 0,
-+};
-+
-+static const struct usb_cs_as_general_descriptor
-+z_audio_cs_as_if_desc = {
-+	.bLength = 7,
-+	.bDescriptorType = 0x24,
-+
-+	.bDescriptorSubType = 0x01,
-+	.bTerminalLink = 0x01,
-+	.bDelay = 0x0,
-+	.wFormatTag = __constant_cpu_to_le16 (0x0001)
-+};
-+
-+
-+static const struct usb_cs_as_format_descriptor
-+z_audio_cs_as_format_desc = {
-+	.bLength = 0xe,
-+	.bDescriptorType = 0x24,
-+
-+	.bDescriptorSubType = 2,
-+	.bFormatType = 1,
-+	.bNrChannels = 1,
-+	.bSubframeSize = 1,
-+	.bBitResolution = 8,
-+	.bSamfreqType = 0,
-+	.tLowerSamFreq = {0x7e, 0x13, 0x00},
-+	.tUpperSamFreq = {0xe2, 0xd6, 0x00},
-+};
-+
-+static const struct usb_endpoint_descriptor
-+z_iso_ep = {
-+	.bLength = 0x09,
-+	.bDescriptorType = 0x05,
-+	.bEndpointAddress = 0x04,
-+	.bmAttributes = 0x09,
-+	.wMaxPacketSize = 0x0038,
-+	.bInterval = 0x01,
-+	.bRefresh = 0x00,
-+	.bSynchAddress = 0x00,
-+};
-+
-+static char z_iso_ep2[] = {0x07, 0x25, 0x01, 0x00, 0x02, 0x00, 0x02};
-+
-+// 9 bytes
-+static char z_ac_interface_header_desc[] =
-+{ 0x09, 0x24, 0x01, 0x00, 0x01, 0x2b, 0x00, 0x01, 0x01 };
-+
-+// 12 bytes
-+static char z_0[] = {0x0c, 0x24, 0x02, 0x01, 0x01, 0x01, 0x00, 0x02,
-+		     0x03, 0x00, 0x00, 0x00};
-+// 13 bytes
-+static char z_1[] = {0x0d, 0x24, 0x06, 0x02, 0x01, 0x02, 0x15, 0x00,
-+		     0x02, 0x00, 0x02, 0x00, 0x00};
-+// 9 bytes
-+static char z_2[] = {0x09, 0x24, 0x03, 0x03, 0x01, 0x03, 0x00, 0x02,
-+		     0x00};
-+
-+static char za_0[] = {0x09, 0x04, 0x01, 0x02, 0x01, 0x01, 0x02, 0x00,
-+		      0x00};
-+
-+static char za_1[] = {0x07, 0x24, 0x01, 0x01, 0x00, 0x01, 0x00};
-+
-+static char za_2[] = {0x0e, 0x24, 0x02, 0x01, 0x02, 0x01, 0x08, 0x00,
-+		      0x7e, 0x13, 0x00, 0xe2, 0xd6, 0x00};
-+
-+static char za_3[] = {0x09, 0x05, 0x04, 0x09, 0x70, 0x00, 0x01, 0x00,
-+		      0x00};
-+
-+static char za_4[] = {0x07, 0x25, 0x01, 0x00, 0x02, 0x00, 0x02};
-+
-+static char za_5[] = {0x09, 0x04, 0x01, 0x03, 0x01, 0x01, 0x02, 0x00,
-+		      0x00};
-+
-+static char za_6[] = {0x07, 0x24, 0x01, 0x01, 0x00, 0x01, 0x00};
-+
-+static char za_7[] = {0x0e, 0x24, 0x02, 0x01, 0x01, 0x02, 0x10, 0x00,
-+		      0x7e, 0x13, 0x00, 0xe2, 0xd6, 0x00};
-+
-+static char za_8[] = {0x09, 0x05, 0x04, 0x09, 0x70, 0x00, 0x01, 0x00,
-+		      0x00};
-+
-+static char za_9[] = {0x07, 0x25, 0x01, 0x00, 0x02, 0x00, 0x02};
-+
-+static char za_10[] = {0x09, 0x04, 0x01, 0x04, 0x01, 0x01, 0x02, 0x00,
-+		       0x00};
-+
-+static char za_11[] = {0x07, 0x24, 0x01, 0x01, 0x00, 0x01, 0x00};
-+
-+static char za_12[] = {0x0e, 0x24, 0x02, 0x01, 0x02, 0x02, 0x10, 0x00,
-+		       0x73, 0x13, 0x00, 0xe2, 0xd6, 0x00};
-+
-+static char za_13[] = {0x09, 0x05, 0x04, 0x09, 0xe0, 0x00, 0x01, 0x00,
-+		       0x00};
-+
-+static char za_14[] = {0x07, 0x25, 0x01, 0x00, 0x02, 0x00, 0x02};
-+
-+static char za_15[] = {0x09, 0x04, 0x01, 0x05, 0x01, 0x01, 0x02, 0x00,
-+		       0x00};
-+
-+static char za_16[] = {0x07, 0x24, 0x01, 0x01, 0x00, 0x01, 0x00};
-+
-+static char za_17[] = {0x0e, 0x24, 0x02, 0x01, 0x01, 0x03, 0x14, 0x00,
-+		       0x7e, 0x13, 0x00, 0xe2, 0xd6, 0x00};
-+
-+static char za_18[] = {0x09, 0x05, 0x04, 0x09, 0xa8, 0x00, 0x01, 0x00,
-+		       0x00};
-+
-+static char za_19[] = {0x07, 0x25, 0x01, 0x00, 0x02, 0x00, 0x02};
-+
-+static char za_20[] = {0x09, 0x04, 0x01, 0x06, 0x01, 0x01, 0x02, 0x00,
-+		       0x00};
-+
-+static char za_21[] = {0x07, 0x24, 0x01, 0x01, 0x00, 0x01, 0x00};
-+
-+static char za_22[] = {0x0e, 0x24, 0x02, 0x01, 0x02, 0x03, 0x14, 0x00,
-+		       0x7e, 0x13, 0x00, 0xe2, 0xd6, 0x00};
-+
-+static char za_23[] = {0x09, 0x05, 0x04, 0x09, 0x50, 0x01, 0x01, 0x00,
-+		       0x00};
-+
-+static char za_24[] = {0x07, 0x25, 0x01, 0x00, 0x02, 0x00, 0x02};
-+
-+
-+
-+static const struct usb_descriptor_header *z_function [] = {
-+	(struct usb_descriptor_header *) &z_audio_control_if_desc,
-+	(struct usb_descriptor_header *) &z_ac_interface_header_desc,
-+	(struct usb_descriptor_header *) &z_0,
-+	(struct usb_descriptor_header *) &z_1,
-+	(struct usb_descriptor_header *) &z_2,
-+	(struct usb_descriptor_header *) &z_audio_if_desc,
-+	(struct usb_descriptor_header *) &z_audio_if_desc2,
-+	(struct usb_descriptor_header *) &z_audio_cs_as_if_desc,
-+	(struct usb_descriptor_header *) &z_audio_cs_as_format_desc,
-+	(struct usb_descriptor_header *) &z_iso_ep,
-+	(struct usb_descriptor_header *) &z_iso_ep2,
-+	(struct usb_descriptor_header *) &za_0,
-+	(struct usb_descriptor_header *) &za_1,
-+	(struct usb_descriptor_header *) &za_2,
-+	(struct usb_descriptor_header *) &za_3,
-+	(struct usb_descriptor_header *) &za_4,
-+	(struct usb_descriptor_header *) &za_5,
-+	(struct usb_descriptor_header *) &za_6,
-+	(struct usb_descriptor_header *) &za_7,
-+	(struct usb_descriptor_header *) &za_8,
-+	(struct usb_descriptor_header *) &za_9,
-+	(struct usb_descriptor_header *) &za_10,
-+	(struct usb_descriptor_header *) &za_11,
-+	(struct usb_descriptor_header *) &za_12,
-+	(struct usb_descriptor_header *) &za_13,
-+	(struct usb_descriptor_header *) &za_14,
-+	(struct usb_descriptor_header *) &za_15,
-+	(struct usb_descriptor_header *) &za_16,
-+	(struct usb_descriptor_header *) &za_17,
-+	(struct usb_descriptor_header *) &za_18,
-+	(struct usb_descriptor_header *) &za_19,
-+	(struct usb_descriptor_header *) &za_20,
-+	(struct usb_descriptor_header *) &za_21,
-+	(struct usb_descriptor_header *) &za_22,
-+	(struct usb_descriptor_header *) &za_23,
-+	(struct usb_descriptor_header *) &za_24,
-+	NULL,
-+};
-+
-+/* maxpacket and other transfer characteristics vary by speed. */
-+#define ep_desc(g,hs,fs) (((g)->speed==USB_SPEED_HIGH)?(hs):(fs))
-+
-+#else
-+
-+/* if there's no high speed support, maxpacket doesn't change. */
-+#define ep_desc(g,hs,fs) fs
-+
-+#endif	/* !CONFIG_USB_GADGET_DUALSPEED */
-+
-+static char				manufacturer [40];
-+//static char				serial [40];
-+static char				serial [] = "Ser 00 em";
-+
-+/* static strings, in UTF-8 */
-+static struct usb_string		strings [] = {
-+	{ STRING_MANUFACTURER, manufacturer, },
-+	{ STRING_PRODUCT, longname, },
-+	{ STRING_SERIAL, serial, },
-+	{ STRING_LOOPBACK, loopback, },
-+	{ STRING_SOURCE_SINK, source_sink, },
-+	{  }			/* end of list */
-+};
-+
-+static struct usb_gadget_strings	stringtab = {
-+	.language	= 0x0409,	/* en-us */
-+	.strings	= strings,
-+};
-+
-+/*
-+ * config descriptors are also handcrafted.  these must agree with code
-+ * that sets configurations, and with code managing interfaces and their
-+ * altsettings.  other complexity may come from:
-+ *
-+ *  - high speed support, including "other speed config" rules
-+ *  - multiple configurations
-+ *  - interfaces with alternate settings
-+ *  - embedded class or vendor-specific descriptors
-+ *
-+ * this handles high speed, and has a second config that could as easily
-+ * have been an alternate interface setting (on most hardware).
-+ *
-+ * NOTE:  to demonstrate (and test) more USB capabilities, this driver
-+ * should include an altsetting to test interrupt transfers, including
-+ * high bandwidth modes at high speed.  (Maybe work like Intel's test
-+ * device?)
-+ */
-+static int
-+config_buf (struct usb_gadget *gadget, u8 *buf, u8 type, unsigned index)
-+{
-+	int len;
-+	const struct usb_descriptor_header **function;
-+
-+	function = z_function;
-+	len = usb_gadget_config_buf (&z_config, buf, USB_BUFSIZ, function);
-+	if (len < 0)
-+		return len;
-+	((struct usb_config_descriptor *) buf)->bDescriptorType = type;
-+	return len;
-+}
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static struct usb_request *
-+alloc_ep_req (struct usb_ep *ep, unsigned length)
-+{
-+	struct usb_request	*req;
-+
-+	req = usb_ep_alloc_request (ep, GFP_ATOMIC);
-+	if (req) {
-+		req->length = length;
-+		req->buf = usb_ep_alloc_buffer (ep, length,
-+				&req->dma, GFP_ATOMIC);
-+		if (!req->buf) {
-+			usb_ep_free_request (ep, req);
-+			req = NULL;
-+		}
-+	}
-+	return req;
-+}
-+
-+static void free_ep_req (struct usb_ep *ep, struct usb_request *req)
-+{
-+	if (req->buf)
-+		usb_ep_free_buffer (ep, req->buf, req->dma, req->length);
-+	usb_ep_free_request (ep, req);
-+}
-+
-+/*-------------------------------------------------------------------------*/
-+
-+/* optionally require specific source/sink data patterns  */
-+
-+static int
-+check_read_data (
-+	struct zero_dev		*dev,
-+	struct usb_ep		*ep,
-+	struct usb_request	*req
-+)
-+{
-+	unsigned	i;
-+	u8		*buf = req->buf;
-+
-+	for (i = 0; i < req->actual; i++, buf++) {
-+		switch (pattern) {
-+		/* all-zeroes has no synchronization issues */
-+		case 0:
-+			if (*buf == 0)
-+				continue;
-+			break;
-+		/* mod63 stays in sync with short-terminated transfers,
-+		 * or otherwise when host and gadget agree on how large
-+		 * each usb transfer request should be.  resync is done
-+		 * with set_interface or set_config.
-+		 */
-+		case 1:
-+			if (*buf == (u8)(i % 63))
-+				continue;
-+			break;
-+		}
-+		ERROR (dev, "bad OUT byte, buf [%d] = %d\n", i, *buf);
-+		usb_ep_set_halt (ep);
-+		return -EINVAL;
-+	}
-+	return 0;
-+}
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static void zero_reset_config (struct zero_dev *dev)
-+{
-+	if (dev->config == 0)
-+		return;
-+
-+	DBG (dev, "reset config\n");
-+
-+	/* just disable endpoints, forcing completion of pending i/o.
-+	 * all our completion handlers free their requests in this case.
-+	 */
-+	if (dev->in_ep) {
-+		usb_ep_disable (dev->in_ep);
-+		dev->in_ep = NULL;
-+	}
-+	if (dev->out_ep) {
-+		usb_ep_disable (dev->out_ep);
-+		dev->out_ep = NULL;
-+	}
-+	dev->config = 0;
-+	del_timer (&dev->resume);
-+}
-+
-+#define _write(f, buf, sz) (f->f_op->write(f, buf, sz, &f->f_pos))
-+
-+static void
-+zero_isoc_complete (struct usb_ep *ep, struct usb_request *req)
-+{
-+	struct zero_dev	*dev = ep->driver_data;
-+	int		status = req->status;
-+	int i, j;
-+
-+	switch (status) {
-+
-+	case 0: 			/* normal completion? */
-+		//printk ("\nzero ---------------> isoc normal completion %d bytes\n", req->actual);
-+		for (i=0, j=rbuf_start; i<req->actual; i++) {
-+			//printk ("%02x ", ((__u8*)req->buf)[i]);
-+			rbuf[j] = ((__u8*)req->buf)[i];
-+			j++;
-+			if (j >= RBUF_LEN) j=0;
-+		}
-+		rbuf_start = j;
-+		//printk ("\n\n");
-+
-+		if (rbuf_len < RBUF_LEN) {
-+			rbuf_len += req->actual;
-+			if (rbuf_len > RBUF_LEN) {
-+				rbuf_len = RBUF_LEN;
-+			}
-+		}
-+
-+		break;
-+
-+	/* this endpoint is normally active while we're configured */
-+	case -ECONNABORTED: 		/* hardware forced ep reset */
-+	case -ECONNRESET:		/* request dequeued */
-+	case -ESHUTDOWN:		/* disconnect from host */
-+		VDBG (dev, "%s gone (%d), %d/%d\n", ep->name, status,
-+				req->actual, req->length);
-+		if (ep == dev->out_ep)
-+			check_read_data (dev, ep, req);
-+		free_ep_req (ep, req);
-+		return;
-+
-+	case -EOVERFLOW:		/* buffer overrun on read means that
-+					 * we didn't provide a big enough
-+					 * buffer.
-+					 */
-+	default:
-+#if 1
-+		DBG (dev, "%s complete --> %d, %d/%d\n", ep->name,
-+				status, req->actual, req->length);
-+#endif
-+	case -EREMOTEIO:		/* short read */
-+		break;
-+	}
-+
-+	status = usb_ep_queue (ep, req, GFP_ATOMIC);
-+	if (status) {
-+		ERROR (dev, "kill %s:  resubmit %d bytes --> %d\n",
-+				ep->name, req->length, status);
-+		usb_ep_set_halt (ep);
-+		/* FIXME recover later ... somehow */
-+	}
-+}
-+
-+static struct usb_request *
-+zero_start_isoc_ep (struct usb_ep *ep, int gfp_flags)
-+{
-+	struct usb_request	*req;
-+	int			status;
-+
-+	req = alloc_ep_req (ep, 512);
-+	if (!req)
-+		return NULL;
-+
-+	req->complete = zero_isoc_complete;
-+
-+	status = usb_ep_queue (ep, req, gfp_flags);
-+	if (status) {
-+		struct zero_dev	*dev = ep->driver_data;
-+
-+		ERROR (dev, "start %s --> %d\n", ep->name, status);
-+		free_ep_req (ep, req);
-+		req = NULL;
-+	}
-+
-+	return req;
-+}
-+
-+/* change our operational config.  this code must agree with the code
-+ * that returns config descriptors, and altsetting code.
-+ *
-+ * it's also responsible for power management interactions. some
-+ * configurations might not work with our current power sources.
-+ *
-+ * note that some device controller hardware will constrain what this
-+ * code can do, perhaps by disallowing more than one configuration or
-+ * by limiting configuration choices (like the pxa2xx).
-+ */
-+static int
-+zero_set_config (struct zero_dev *dev, unsigned number, int gfp_flags)
-+{
-+	int			result = 0;
-+	struct usb_gadget	*gadget = dev->gadget;
-+	const struct usb_endpoint_descriptor	*d;
-+	struct usb_ep		*ep;
-+
-+	if (number == dev->config)
-+		return 0;
-+
-+	zero_reset_config (dev);
-+
-+	gadget_for_each_ep (ep, gadget) {
-+
-+		if (strcmp (ep->name, "ep4") == 0) {
-+
-+			d = (struct usb_endpoint_descripter *)&za_23; // isoc ep desc for audio i/f alt setting 6
-+			result = usb_ep_enable (ep, d);
-+
-+			if (result == 0) {
-+				ep->driver_data = dev;
-+				dev->in_ep = ep;
-+
-+				if (zero_start_isoc_ep (ep, gfp_flags) != 0) {
-+
-+					dev->in_ep = ep;
-+					continue;
-+				}
-+
-+				usb_ep_disable (ep);
-+				result = -EIO;
-+			}
-+		}
-+
-+	}
-+
-+	dev->config = number;
-+	return result;
-+}
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static void zero_setup_complete (struct usb_ep *ep, struct usb_request *req)
-+{
-+	if (req->status || req->actual != req->length)
-+		DBG ((struct zero_dev *) ep->driver_data,
-+				"setup complete --> %d, %d/%d\n",
-+				req->status, req->actual, req->length);
-+}
-+
-+/*
-+ * The setup() callback implements all the ep0 functionality that's
-+ * not handled lower down, in hardware or the hardware driver (like
-+ * device and endpoint feature flags, and their status).  It's all
-+ * housekeeping for the gadget function we're implementing.  Most of
-+ * the work is in config-specific setup.
-+ */
-+static int
-+zero_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
-+{
-+	struct zero_dev		*dev = get_gadget_data (gadget);
-+	struct usb_request	*req = dev->req;
-+	int			value = -EOPNOTSUPP;
-+
-+	/* usually this stores reply data in the pre-allocated ep0 buffer,
-+	 * but config change events will reconfigure hardware.
-+	 */
-+	req->zero = 0;
-+	switch (ctrl->bRequest) {
-+
-+	case USB_REQ_GET_DESCRIPTOR:
-+
-+		switch (ctrl->wValue >> 8) {
-+
-+		case USB_DT_DEVICE:
-+			value = min (ctrl->wLength, (u16) sizeof device_desc);
-+			memcpy (req->buf, &device_desc, value);
-+			break;
-+#ifdef CONFIG_USB_GADGET_DUALSPEED
-+		case USB_DT_DEVICE_QUALIFIER:
-+			if (!gadget->is_dualspeed)
-+				break;
-+			value = min (ctrl->wLength, (u16) sizeof dev_qualifier);
-+			memcpy (req->buf, &dev_qualifier, value);
-+			break;
-+
-+		case USB_DT_OTHER_SPEED_CONFIG:
-+			if (!gadget->is_dualspeed)
-+				break;
-+			// FALLTHROUGH
-+#endif /* CONFIG_USB_GADGET_DUALSPEED */
-+		case USB_DT_CONFIG:
-+			value = config_buf (gadget, req->buf,
-+					ctrl->wValue >> 8,
-+					ctrl->wValue & 0xff);
-+			if (value >= 0)
-+				value = min (ctrl->wLength, (u16) value);
-+			break;
-+
-+		case USB_DT_STRING:
-+			/* wIndex == language code.
-+			 * this driver only handles one language, you can
-+			 * add string tables for other languages, using
-+			 * any UTF-8 characters
-+			 */
-+			value = usb_gadget_get_string (&stringtab,
-+					ctrl->wValue & 0xff, req->buf);
-+			if (value >= 0) {
-+				value = min (ctrl->wLength, (u16) value);
-+			}
-+			break;
-+		}
-+		break;
-+
-+	/* currently two configs, two speeds */
-+	case USB_REQ_SET_CONFIGURATION:
-+		if (ctrl->bRequestType != 0)
-+			goto unknown;
-+
-+		spin_lock (&dev->lock);
-+		value = zero_set_config (dev, ctrl->wValue, GFP_ATOMIC);
-+		spin_unlock (&dev->lock);
-+		break;
-+	case USB_REQ_GET_CONFIGURATION:
-+		if (ctrl->bRequestType != USB_DIR_IN)
-+			goto unknown;
-+		*(u8 *)req->buf = dev->config;
-+		value = min (ctrl->wLength, (u16) 1);
-+		break;
-+
-+	/* until we add altsetting support, or other interfaces,
-+	 * only 0/0 are possible.  pxa2xx only supports 0/0 (poorly)
-+	 * and already killed pending endpoint I/O.
-+	 */
-+	case USB_REQ_SET_INTERFACE:
-+
-+		if (ctrl->bRequestType != USB_RECIP_INTERFACE)
-+			goto unknown;
-+		spin_lock (&dev->lock);
-+		if (dev->config) {
-+			u8		config = dev->config;
-+
-+			/* resets interface configuration, forgets about
-+			 * previous transaction state (queued bufs, etc)
-+			 * and re-inits endpoint state (toggle etc)
-+			 * no response queued, just zero status == success.
-+			 * if we had more than one interface we couldn't
-+			 * use this "reset the config" shortcut.
-+			 */
-+			zero_reset_config (dev);
-+			zero_set_config (dev, config, GFP_ATOMIC);
-+			value = 0;
-+		}
-+		spin_unlock (&dev->lock);
-+		break;
-+	case USB_REQ_GET_INTERFACE:
-+		if ((ctrl->bRequestType == 0x21) && (ctrl->wIndex == 0x02)) {
-+			value = ctrl->wLength;
-+			break;
-+		}
-+		else {
-+			if (ctrl->bRequestType != (USB_DIR_IN|USB_RECIP_INTERFACE))
-+				goto unknown;
-+			if (!dev->config)
-+				break;
-+			if (ctrl->wIndex != 0) {
-+				value = -EDOM;
-+				break;
-+			}
-+			*(u8 *)req->buf = 0;
-+			value = min (ctrl->wLength, (u16) 1);
-+		}
-+		break;
-+
-+	/*
-+	 * These are the same vendor-specific requests supported by
-+	 * Intel's USB 2.0 compliance test devices.  We exceed that
-+	 * device spec by allowing multiple-packet requests.
-+	 */
-+	case 0x5b:	/* control WRITE test -- fill the buffer */
-+		if (ctrl->bRequestType != (USB_DIR_OUT|USB_TYPE_VENDOR))
-+			goto unknown;
-+		if (ctrl->wValue || ctrl->wIndex)
-+			break;
-+		/* just read that many bytes into the buffer */
-+		if (ctrl->wLength > USB_BUFSIZ)
-+			break;
-+		value = ctrl->wLength;
-+		break;
-+	case 0x5c:	/* control READ test -- return the buffer */
-+		if (ctrl->bRequestType != (USB_DIR_IN|USB_TYPE_VENDOR))
-+			goto unknown;
-+		if (ctrl->wValue || ctrl->wIndex)
-+			break;
-+		/* expect those bytes are still in the buffer; send back */
-+		if (ctrl->wLength > USB_BUFSIZ
-+				|| ctrl->wLength != req->length)
-+			break;
-+		value = ctrl->wLength;
-+		break;
-+
-+	case 0x01: // SET_CUR
-+	case 0x02:
-+	case 0x03:
-+	case 0x04:
-+	case 0x05:
-+		value = ctrl->wLength;
-+		break;
-+	case 0x81:
-+		switch (ctrl->wValue) {
-+		case 0x0201:
-+		case 0x0202:
-+			((u8*)req->buf)[0] = 0x00;
-+			((u8*)req->buf)[1] = 0xe3;
-+			break;
-+		case 0x0300:
-+		case 0x0500:
-+			((u8*)req->buf)[0] = 0x00;
-+			break;
-+		}
-+		//((u8*)req->buf)[0] = 0x81;
-+		//((u8*)req->buf)[1] = 0x81;
-+		value = ctrl->wLength;
-+		break;
-+	case 0x82:
-+		switch (ctrl->wValue) {
-+		case 0x0201:
-+		case 0x0202:
-+			((u8*)req->buf)[0] = 0x00;
-+			((u8*)req->buf)[1] = 0xc3;
-+			break;
-+		case 0x0300:
-+		case 0x0500:
-+			((u8*)req->buf)[0] = 0x00;
-+			break;
-+		}
-+		//((u8*)req->buf)[0] = 0x82;
-+		//((u8*)req->buf)[1] = 0x82;
-+		value = ctrl->wLength;
-+		break;
-+	case 0x83:
-+		switch (ctrl->wValue) {
-+		case 0x0201:
-+		case 0x0202:
-+			((u8*)req->buf)[0] = 0x00;
-+			((u8*)req->buf)[1] = 0x00;
-+			break;
-+		case 0x0300:
-+			((u8*)req->buf)[0] = 0x60;
-+			break;
-+		case 0x0500:
-+			((u8*)req->buf)[0] = 0x18;
-+			break;
-+		}
-+		//((u8*)req->buf)[0] = 0x83;
-+		//((u8*)req->buf)[1] = 0x83;
-+		value = ctrl->wLength;
-+		break;
-+	case 0x84:
-+		switch (ctrl->wValue) {
-+		case 0x0201:
-+		case 0x0202:
-+			((u8*)req->buf)[0] = 0x00;
-+			((u8*)req->buf)[1] = 0x01;
-+			break;
-+		case 0x0300:
-+		case 0x0500:
-+			((u8*)req->buf)[0] = 0x08;
-+			break;
-+		}
-+		//((u8*)req->buf)[0] = 0x84;
-+		//((u8*)req->buf)[1] = 0x84;
-+		value = ctrl->wLength;
-+		break;
-+	case 0x85:
-+		((u8*)req->buf)[0] = 0x85;
-+		((u8*)req->buf)[1] = 0x85;
-+		value = ctrl->wLength;
-+		break;
-+
-+
-+	default:
-+unknown:
-+		printk("unknown control req%02x.%02x v%04x i%04x l%d\n",
-+			ctrl->bRequestType, ctrl->bRequest,
-+			ctrl->wValue, ctrl->wIndex, ctrl->wLength);
-+	}
-+
-+	/* respond with data transfer before status phase? */
-+	if (value >= 0) {
-+		req->length = value;
-+		req->zero = value < ctrl->wLength
-+				&& (value % gadget->ep0->maxpacket) == 0;
-+		value = usb_ep_queue (gadget->ep0, req, GFP_ATOMIC);
-+		if (value < 0) {
-+			DBG (dev, "ep_queue < 0 --> %d\n", value);
-+			req->status = 0;
-+			zero_setup_complete (gadget->ep0, req);
-+		}
-+	}
-+
-+	/* device either stalls (value < 0) or reports success */
-+	return value;
-+}
-+
-+static void
-+zero_disconnect (struct usb_gadget *gadget)
-+{
-+	struct zero_dev		*dev = get_gadget_data (gadget);
-+	unsigned long		flags;
-+
-+	spin_lock_irqsave (&dev->lock, flags);
-+	zero_reset_config (dev);
-+
-+	/* a more significant application might have some non-usb
-+	 * activities to quiesce here, saving resources like power
-+	 * or pushing the notification up a network stack.
-+	 */
-+	spin_unlock_irqrestore (&dev->lock, flags);
-+
-+	/* next we may get setup() calls to enumerate new connections;
-+	 * or an unbind() during shutdown (including removing module).
-+	 */
-+}
-+
-+static void
-+zero_autoresume (unsigned long _dev)
-+{
-+	struct zero_dev	*dev = (struct zero_dev *) _dev;
-+	int		status;
-+
-+	/* normally the host would be woken up for something
-+	 * more significant than just a timer firing...
-+	 */
-+	if (dev->gadget->speed != USB_SPEED_UNKNOWN) {
-+		status = usb_gadget_wakeup (dev->gadget);
-+		DBG (dev, "wakeup --> %d\n", status);
-+	}
-+}
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static void
-+zero_unbind (struct usb_gadget *gadget)
-+{
-+	struct zero_dev		*dev = get_gadget_data (gadget);
-+
-+	DBG (dev, "unbind\n");
-+
-+	/* we've already been disconnected ... no i/o is active */
-+	if (dev->req)
-+		free_ep_req (gadget->ep0, dev->req);
-+	del_timer_sync (&dev->resume);
-+	kfree (dev);
-+	set_gadget_data (gadget, NULL);
-+}
-+
-+static int
-+zero_bind (struct usb_gadget *gadget)
-+{
-+	struct zero_dev		*dev;
-+	//struct usb_ep		*ep;
-+
-+	printk("binding\n");
-+	/*
-+	 * DRIVER POLICY CHOICE:  you may want to do this differently.
-+	 * One thing to avoid is reusing a bcdDevice revision code
-+	 * with different host-visible configurations or behavior
-+	 * restrictions -- using ep1in/ep2out vs ep1out/ep3in, etc
-+	 */
-+	//device_desc.bcdDevice = __constant_cpu_to_le16 (0x0201);
-+
-+
-+	/* ok, we made sense of the hardware ... */
-+	dev = kzalloc (sizeof *dev, SLAB_KERNEL);
-+	if (!dev)
-+		return -ENOMEM;
-+	spin_lock_init (&dev->lock);
-+	dev->gadget = gadget;
-+	set_gadget_data (gadget, dev);
-+
-+	/* preallocate control response and buffer */
-+	dev->req = usb_ep_alloc_request (gadget->ep0, GFP_KERNEL);
-+	if (!dev->req)
-+		goto enomem;
-+	dev->req->buf = usb_ep_alloc_buffer (gadget->ep0, USB_BUFSIZ,
-+				&dev->req->dma, GFP_KERNEL);
-+	if (!dev->req->buf)
-+		goto enomem;
-+
-+	dev->req->complete = zero_setup_complete;
-+
-+	device_desc.bMaxPacketSize0 = gadget->ep0->maxpacket;
-+
-+#ifdef CONFIG_USB_GADGET_DUALSPEED
-+	/* assume ep0 uses the same value for both speeds ... */
-+	dev_qualifier.bMaxPacketSize0 = device_desc.bMaxPacketSize0;
-+
-+	/* and that all endpoints are dual-speed */
-+	//hs_source_desc.bEndpointAddress = fs_source_desc.bEndpointAddress;
-+	//hs_sink_desc.bEndpointAddress = fs_sink_desc.bEndpointAddress;
-+#endif
-+
-+	usb_gadget_set_selfpowered (gadget);
-+
-+	init_timer (&dev->resume);
-+	dev->resume.function = zero_autoresume;
-+	dev->resume.data = (unsigned long) dev;
-+
-+	gadget->ep0->driver_data = dev;
-+
-+	INFO (dev, "%s, version: " DRIVER_VERSION "\n", longname);
-+	INFO (dev, "using %s, OUT %s IN %s\n", gadget->name,
-+		EP_OUT_NAME, EP_IN_NAME);
-+
-+	snprintf (manufacturer, sizeof manufacturer,
-+		UTS_SYSNAME " " UTS_RELEASE " with %s",
-+		gadget->name);
-+
-+	return 0;
-+
-+enomem:
-+	zero_unbind (gadget);
-+	return -ENOMEM;
-+}
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static void
-+zero_suspend (struct usb_gadget *gadget)
-+{
-+	struct zero_dev		*dev = get_gadget_data (gadget);
-+
-+	if (gadget->speed == USB_SPEED_UNKNOWN)
-+		return;
-+
-+	if (autoresume) {
-+		mod_timer (&dev->resume, jiffies + (HZ * autoresume));
-+		DBG (dev, "suspend, wakeup in %d seconds\n", autoresume);
-+	} else
-+		DBG (dev, "suspend\n");
-+}
-+
-+static void
-+zero_resume (struct usb_gadget *gadget)
-+{
-+	struct zero_dev		*dev = get_gadget_data (gadget);
-+
-+	DBG (dev, "resume\n");
-+	del_timer (&dev->resume);
-+}
-+
-+
-+/*-------------------------------------------------------------------------*/
-+
-+static struct usb_gadget_driver zero_driver = {
-+#ifdef CONFIG_USB_GADGET_DUALSPEED
-+	.speed		= USB_SPEED_HIGH,
-+#else
-+	.speed		= USB_SPEED_FULL,
-+#endif
-+	.function	= (char *) longname,
-+	.bind		= zero_bind,
-+	.unbind		= zero_unbind,
-+
-+	.setup		= zero_setup,
-+	.disconnect	= zero_disconnect,
-+
-+	.suspend	= zero_suspend,
-+	.resume		= zero_resume,
-+
-+	.driver 	= {
-+		.name		= (char *) shortname,
-+		// .shutdown = ...
-+		// .suspend = ...
-+		// .resume = ...
-+	},
-+};
-+
-+MODULE_AUTHOR ("David Brownell");
-+MODULE_LICENSE ("Dual BSD/GPL");
-+
-+static struct proc_dir_entry *pdir, *pfile;
-+
-+static int isoc_read_data (char *page, char **start,
-+			   off_t off, int count,
-+			   int *eof, void *data)
-+{
-+	int i;
-+	static int c = 0;
-+	static int done = 0;
-+	static int s = 0;
-+
-+/*
-+	printk ("\ncount: %d\n", count);
-+	printk ("rbuf_start: %d\n", rbuf_start);
-+	printk ("rbuf_len: %d\n", rbuf_len);
-+	printk ("off: %d\n", off);
-+	printk ("start: %p\n\n", *start);
-+*/
-+	if (done) {
-+		c = 0;
-+		done = 0;
-+		*eof = 1;
-+		return 0;
-+	}
-+
-+	if (c == 0) {
-+		if (rbuf_len == RBUF_LEN)
-+			s = rbuf_start;
-+		else s = 0;
-+	}
-+
-+	for (i=0; i<count && c<rbuf_len; i++, c++) {
-+		page[i] = rbuf[(c+s) % RBUF_LEN];
-+	}
-+	*start = page;
-+
-+	if (c >= rbuf_len) {
-+		*eof = 1;
-+		done = 1;
-+	}
-+
-+
-+	return i;
-+}
-+
-+static int __init init (void)
-+{
-+
-+	int retval = 0;
-+
-+	pdir = proc_mkdir("isoc_test", NULL);
-+	if(pdir == NULL) {
-+		retval = -ENOMEM;
-+		printk("Error creating dir\n");
-+		goto done;
-+	}
-+	pdir->owner = THIS_MODULE;
-+
-+	pfile = create_proc_read_entry("isoc_data",
-+				       0444, pdir,
-+				       isoc_read_data,
-+				       NULL);
-+	if (pfile == NULL) {
-+		retval = -ENOMEM;
-+		printk("Error creating file\n");
-+		goto no_file;
-+	}
-+	pfile->owner = THIS_MODULE;
-+
-+	return usb_gadget_register_driver (&zero_driver);
-+
-+ no_file:
-+	remove_proc_entry("isoc_data", NULL);
-+ done:
-+	return retval;
-+}
-+module_init (init);
-+
-+static void __exit cleanup (void)
-+{
-+
-+	usb_gadget_unregister_driver (&zero_driver);
-+
-+	remove_proc_entry("isoc_data", pdir);
-+	remove_proc_entry("isoc_test", NULL);
-+}
-+module_exit (cleanup);
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/dwc_cfi_common.h
-@@ -0,0 +1,142 @@
-+/* ==========================================================================
-+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
-+ * "Software") is an Unsupported proprietary work of Synopsys, Inc. unless
-+ * otherwise expressly agreed to in writing between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product under
-+ * any End User Software License Agreement or Agreement for Licensed Product
-+ * with Synopsys or any supplement thereto. You are permitted to use and
-+ * redistribute this Software in source and binary forms, with or without
-+ * modification, provided that redistributions of source code must retain this
-+ * notice. You may not view, use, disclose, copy or distribute this file or
-+ * any information contained herein except pursuant to this license grant from
-+ * Synopsys. If you do not agree with this notice, including the disclaimer
-+ * below, then you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" BASIS
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS BE LIABLE FOR ANY DIRECT,
-+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================== */
-+
-+#if !defined(__DWC_CFI_COMMON_H__)
-+#define __DWC_CFI_COMMON_H__
-+
-+//#include <linux/types.h>
-+
-+/**
-+ * @file
-+ *
-+ * This file contains the CFI specific common constants, interfaces
-+ * (functions and macros) and structures for Linux. No PCD specific
-+ * data structure or definition is to be included in this file.
-+ *
-+ */
-+
-+/** This is a request for all Core Features */
-+#define VEN_CORE_GET_FEATURES		0xB1
-+
-+/** This is a request to get the value of a specific Core Feature */
-+#define VEN_CORE_GET_FEATURE		0xB2
-+
-+/** This command allows the host to set the value of a specific Core Feature */
-+#define VEN_CORE_SET_FEATURE		0xB3
-+
-+/** This command allows the host to set the default values of
-+ * either all or any specific Core Feature
-+ */
-+#define VEN_CORE_RESET_FEATURES		0xB4
-+
-+/** This command forces the PCD to write the deferred values of a Core Features */
-+#define VEN_CORE_ACTIVATE_FEATURES	0xB5
-+
-+/** This request reads a DWORD value from a register at the specified offset */
-+#define VEN_CORE_READ_REGISTER		0xB6
-+
-+/** This request writes a DWORD value into a register at the specified offset */
-+#define VEN_CORE_WRITE_REGISTER		0xB7
-+
-+/** This structure is the header of the Core Features dataset returned to
-+ *  the Host
-+ */
-+struct cfi_all_features_header {
-+/** The features header structure length is */
-+#define CFI_ALL_FEATURES_HDR_LEN		8
-+	/**
-+	 * The total length of the features dataset returned to the Host
-+	 */
-+	uint16_t wTotalLen;
-+
-+	/**
-+	 * CFI version number inBinary-Coded Decimal (i.e., 1.00 is 100H).
-+	 * This field identifies the version of the CFI Specification with which
-+	 * the device is compliant.
-+	 */
-+	uint16_t wVersion;
-+
-+	/** The ID of the Core */
-+	uint16_t wCoreID;
-+#define CFI_CORE_ID_UDC		1
-+#define CFI_CORE_ID_OTG		2
-+#define CFI_CORE_ID_WUDEV	3
-+
-+	/** Number of features returned by VEN_CORE_GET_FEATURES request */
-+	uint16_t wNumFeatures;
-+} UPACKED;
-+
-+typedef struct cfi_all_features_header cfi_all_features_header_t;
-+
-+/** This structure is a header of the Core Feature descriptor dataset returned to
-+ *  the Host after the VEN_CORE_GET_FEATURES request
-+ */
-+struct cfi_feature_desc_header {
-+#define CFI_FEATURE_DESC_HDR_LEN	8
-+
-+	/** The feature ID */
-+	uint16_t wFeatureID;
-+
-+	/** Length of this feature descriptor in bytes - including the
-+	 * length of the feature name string
-+	 */
-+	uint16_t wLength;
-+
-+	/** The data length of this feature in bytes */
-+	uint16_t wDataLength;
-+
-+	/**
-+	 * Attributes of this features
-+	 * D0: Access rights
-+	 * 0 - Read/Write
-+	 * 1 - Read only
-+	 */
-+	uint8_t bmAttributes;
-+#define CFI_FEATURE_ATTR_RO		1
-+#define CFI_FEATURE_ATTR_RW		0
-+
-+	/** Length of the feature name in bytes */
-+	uint8_t bNameLen;
-+
-+	/** The feature name buffer */
-+	//uint8_t *name;
-+} UPACKED;
-+
-+typedef struct cfi_feature_desc_header cfi_feature_desc_header_t;
-+
-+/**
-+ * This structure describes a NULL terminated string referenced by its id field.
-+ * It is very similar to usb_string structure but has the id field type set to 16-bit.
-+ */
-+struct cfi_string {
-+	uint16_t id;
-+	const uint8_t *s;
-+};
-+typedef struct cfi_string cfi_string_t;
-+
-+#endif
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_adp.c
-@@ -0,0 +1,854 @@
-+/* ==========================================================================
-+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.c $
-+ * $Revision: #12 $
-+ * $Date: 2011/10/26 $
-+ * $Change: 1873028 $
-+ *
-+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
-+ * "Software") is an Unsupported proprietary work of Synopsys, Inc. unless
-+ * otherwise expressly agreed to in writing between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product under
-+ * any End User Software License Agreement or Agreement for Licensed Product
-+ * with Synopsys or any supplement thereto. You are permitted to use and
-+ * redistribute this Software in source and binary forms, with or without
-+ * modification, provided that redistributions of source code must retain this
-+ * notice. You may not view, use, disclose, copy or distribute this file or
-+ * any information contained herein except pursuant to this license grant from
-+ * Synopsys. If you do not agree with this notice, including the disclaimer
-+ * below, then you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" BASIS
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS BE LIABLE FOR ANY DIRECT,
-+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================== */
-+
-+#include "dwc_os.h"
-+#include "dwc_otg_regs.h"
-+#include "dwc_otg_cil.h"
-+#include "dwc_otg_adp.h"
-+
-+/** @file
-+ *
-+ * This file contains the most of the Attach Detect Protocol implementation for
-+ * the driver to support OTG Rev2.0.
-+ *
-+ */
-+
-+void dwc_otg_adp_write_reg(dwc_otg_core_if_t * core_if, uint32_t value)
-+{
-+	adpctl_data_t adpctl;
-+
-+	adpctl.d32 = value;
-+	adpctl.b.ar = 0x2;
-+
-+	DWC_WRITE_REG32(&core_if->core_global_regs->adpctl, adpctl.d32);
-+
-+	while (adpctl.b.ar) {
-+		adpctl.d32 = DWC_READ_REG32(&core_if->core_global_regs->adpctl);
-+	}
-+
-+}
-+
-+/**
-+ * Function is called to read ADP registers
-+ */
-+uint32_t dwc_otg_adp_read_reg(dwc_otg_core_if_t * core_if)
-+{
-+	adpctl_data_t adpctl;
-+
-+	adpctl.d32 = 0;
-+	adpctl.b.ar = 0x1;
-+
-+	DWC_WRITE_REG32(&core_if->core_global_regs->adpctl, adpctl.d32);
-+
-+	while (adpctl.b.ar) {
-+		adpctl.d32 = DWC_READ_REG32(&core_if->core_global_regs->adpctl);
-+	}
-+
-+	return adpctl.d32;
-+}
-+
-+/**
-+ * Function is called to read ADPCTL register and filter Write-clear bits
-+ */
-+uint32_t dwc_otg_adp_read_reg_filter(dwc_otg_core_if_t * core_if)
-+{
-+	adpctl_data_t adpctl;
-+
-+	adpctl.d32 = dwc_otg_adp_read_reg(core_if);
-+	adpctl.b.adp_tmout_int = 0;
-+	adpctl.b.adp_prb_int = 0;
-+	adpctl.b.adp_tmout_int = 0;
-+
-+	return adpctl.d32;
-+}
-+
-+/**
-+ * Function is called to write ADP registers
-+ */
-+void dwc_otg_adp_modify_reg(dwc_otg_core_if_t * core_if, uint32_t clr,
-+			    uint32_t set)
-+{
-+	dwc_otg_adp_write_reg(core_if,
-+			      (dwc_otg_adp_read_reg(core_if) & (~clr)) | set);
-+}
-+
-+static void adp_sense_timeout(void *ptr)
-+{
-+	dwc_otg_core_if_t *core_if = (dwc_otg_core_if_t *) ptr;
-+	core_if->adp.sense_timer_started = 0;
-+	DWC_PRINTF("ADP SENSE TIMEOUT\n");
-+	if (core_if->adp_enable) {
-+		dwc_otg_adp_sense_stop(core_if);
-+		dwc_otg_adp_probe_start(core_if);
-+	}
-+}
-+
-+/**
-+ * This function is called when the ADP vbus timer expires. Timeout is 1.1s.
-+ */
-+static void adp_vbuson_timeout(void *ptr)
-+{
-+	gpwrdn_data_t gpwrdn;
-+	dwc_otg_core_if_t *core_if = (dwc_otg_core_if_t *) ptr;
-+	hprt0_data_t hprt0 = {.d32 = 0 };
-+	pcgcctl_data_t pcgcctl = {.d32 = 0 };
-+	DWC_PRINTF("%s: 1.1 seconds expire after turning on VBUS\n",__FUNCTION__);
-+	if (core_if) {
-+		core_if->adp.vbuson_timer_started = 0;
-+		/* Turn off vbus */
-+		hprt0.b.prtpwr = 1;
-+		DWC_MODIFY_REG32(core_if->host_if->hprt0, hprt0.d32, 0);
-+		gpwrdn.d32 = 0;
-+
-+		/* Power off the core */
-+		if (core_if->power_down == 2) {
-+			/* Enable Wakeup Logic */
-+//                      gpwrdn.b.wkupactiv = 1;
-+			gpwrdn.b.pmuactv = 0;
-+			gpwrdn.b.pwrdnrstn = 1;
-+			gpwrdn.b.pwrdnclmp = 1;
-+			DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, 0,
-+					 gpwrdn.d32);
-+
-+			/* Suspend the Phy Clock */
-+			pcgcctl.b.stoppclk = 1;
-+			DWC_MODIFY_REG32(core_if->pcgcctl, 0, pcgcctl.d32);
-+
-+			/* Switch on VDD */
-+//                      gpwrdn.b.wkupactiv = 1;
-+			gpwrdn.b.pmuactv = 1;
-+			gpwrdn.b.pwrdnrstn = 1;
-+			gpwrdn.b.pwrdnclmp = 1;
-+			DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, 0,
-+					 gpwrdn.d32);
-+		} else {
-+			/* Enable Power Down Logic */
-+			gpwrdn.b.pmuintsel = 1;
-+			gpwrdn.b.pmuactv = 1;
-+			DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, 0, gpwrdn.d32);
-+		}
-+
-+		/* Power off the core */
-+		if (core_if->power_down == 2) {
-+			gpwrdn.d32 = 0;
-+			gpwrdn.b.pwrdnswtch = 1;
-+			DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn,
-+					 gpwrdn.d32, 0);
-+		}
-+
-+		/* Unmask SRP detected interrupt from Power Down Logic */
-+		gpwrdn.d32 = 0;
-+		gpwrdn.b.srp_det_msk = 1;
-+		DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, 0, gpwrdn.d32);
-+
-+		dwc_otg_adp_probe_start(core_if);
-+		dwc_otg_dump_global_registers(core_if);
-+		dwc_otg_dump_host_registers(core_if);
-+	}
-+
-+}
-+
-+/**
-+ * Start the ADP Initial Probe timer to detect if Port Connected interrupt is
-+ * not asserted within 1.1 seconds.
-+ *
-+ * @param core_if the pointer to core_if strucure.
-+ */
-+void dwc_otg_adp_vbuson_timer_start(dwc_otg_core_if_t * core_if)
-+{
-+	core_if->adp.vbuson_timer_started = 1;
-+	if (core_if->adp.vbuson_timer)
-+	{
-+		DWC_PRINTF("SCHEDULING VBUSON TIMER\n");
-+		/* 1.1 secs + 60ms necessary for cil_hcd_start*/
-+		DWC_TIMER_SCHEDULE(core_if->adp.vbuson_timer, 1160);
-+	} else {
-+		DWC_WARN("VBUSON_TIMER = %p\n",core_if->adp.vbuson_timer);
-+	}
-+}
-+
-+#if 0
-+/**
-+ * Masks all DWC OTG core interrupts
-+ *
-+ */
-+static void mask_all_interrupts(dwc_otg_core_if_t * core_if)
-+{
-+	int i;
-+	gahbcfg_data_t ahbcfg = {.d32 = 0 };
-+
-+	/* Mask Host Interrupts */
-+
-+	/* Clear and disable HCINTs */
-+	for (i = 0; i < core_if->core_params->host_channels; i++) {
-+		DWC_WRITE_REG32(&core_if->host_if->hc_regs[i]->hcintmsk, 0);
-+		DWC_WRITE_REG32(&core_if->host_if->hc_regs[i]->hcint, 0xFFFFFFFF);
-+
-+	}
-+
-+	/* Clear and disable HAINT */
-+	DWC_WRITE_REG32(&core_if->host_if->host_global_regs->haintmsk, 0x0000);
-+	DWC_WRITE_REG32(&core_if->host_if->host_global_regs->haint, 0xFFFFFFFF);
-+
-+	/* Mask Device Interrupts */
-+	if (!core_if->multiproc_int_enable) {
-+		/* Clear and disable IN Endpoint interrupts */
-+		DWC_WRITE_REG32(&core_if->dev_if->dev_global_regs->diepmsk, 0);
-+		for (i = 0; i <= core_if->dev_if->num_in_eps; i++) {
-+			DWC_WRITE_REG32(&core_if->dev_if->in_ep_regs[i]->
-+					diepint, 0xFFFFFFFF);
-+		}
-+
-+		/* Clear and disable OUT Endpoint interrupts */
-+		DWC_WRITE_REG32(&core_if->dev_if->dev_global_regs->doepmsk, 0);
-+		for (i = 0; i <= core_if->dev_if->num_out_eps; i++) {
-+			DWC_WRITE_REG32(&core_if->dev_if->out_ep_regs[i]->
-+					doepint, 0xFFFFFFFF);
-+		}
-+
-+		/* Clear and disable DAINT */
-+		DWC_WRITE_REG32(&core_if->dev_if->dev_global_regs->daint,
-+				0xFFFFFFFF);
-+		DWC_WRITE_REG32(&core_if->dev_if->dev_global_regs->daintmsk, 0);
-+	} else {
-+		for (i = 0; i < core_if->dev_if->num_in_eps; ++i) {
-+			DWC_WRITE_REG32(&core_if->dev_if->dev_global_regs->
-+					diepeachintmsk[i], 0);
-+			DWC_WRITE_REG32(&core_if->dev_if->in_ep_regs[i]->
-+					diepint, 0xFFFFFFFF);
-+		}
-+
-+		for (i = 0; i < core_if->dev_if->num_out_eps; ++i) {
-+			DWC_WRITE_REG32(&core_if->dev_if->dev_global_regs->
-+					doepeachintmsk[i], 0);
-+			DWC_WRITE_REG32(&core_if->dev_if->out_ep_regs[i]->
-+					doepint, 0xFFFFFFFF);
-+		}
-+
-+		DWC_WRITE_REG32(&core_if->dev_if->dev_global_regs->deachintmsk,
-+				0);
-+		DWC_WRITE_REG32(&core_if->dev_if->dev_global_regs->deachint,
-+				0xFFFFFFFF);
-+
-+	}
-+
-+	/* Disable interrupts */
-+	ahbcfg.b.glblintrmsk = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gahbcfg, ahbcfg.d32, 0);
-+
-+	/* Disable all interrupts. */
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gintmsk, 0);
-+
-+	/* Clear any pending interrupts */
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gintsts, 0xFFFFFFFF);
-+
-+	/* Clear any pending OTG Interrupts */
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gotgint, 0xFFFFFFFF);
-+}
-+
-+/**
-+ * Unmask Port Connection Detected interrupt
-+ *
-+ */
-+static void unmask_conn_det_intr(dwc_otg_core_if_t * core_if)
-+{
-+	gintmsk_data_t gintmsk = {.d32 = 0,.b.portintr = 1 };
-+
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gintmsk, gintmsk.d32);
-+}
-+#endif
-+
-+/**
-+ * Starts the ADP Probing
-+ *
-+ * @param core_if the pointer to core_if structure.
-+ */
-+uint32_t dwc_otg_adp_probe_start(dwc_otg_core_if_t * core_if)
-+{
-+
-+	adpctl_data_t adpctl = {.d32 = 0};
-+	gpwrdn_data_t gpwrdn;
-+#if 0
-+	adpctl_data_t adpctl_int = {.d32 = 0, .b.adp_prb_int = 1,
-+								.b.adp_sns_int = 1, b.adp_tmout_int};
-+#endif
-+	dwc_otg_disable_global_interrupts(core_if);
-+	DWC_PRINTF("ADP Probe Start\n");
-+	core_if->adp.probe_enabled = 1;
-+
-+	adpctl.b.adpres = 1;
-+	dwc_otg_adp_write_reg(core_if, adpctl.d32);
-+
-+	while (adpctl.b.adpres) {
-+		adpctl.d32 = dwc_otg_adp_read_reg(core_if);
-+	}
-+
-+	adpctl.d32 = 0;
-+	gpwrdn.d32 = DWC_READ_REG32(&core_if->core_global_regs->gpwrdn);
-+
-+	/* In Host mode unmask SRP detected interrupt */
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.sts_chngint_msk = 1;
-+	if (!gpwrdn.b.idsts) {
-+		gpwrdn.b.srp_det_msk = 1;
-+	}
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, 0, gpwrdn.d32);
-+
-+	adpctl.b.adp_tmout_int_msk = 1;
-+	adpctl.b.adp_prb_int_msk = 1;
-+	adpctl.b.prb_dschg = 1;
-+	adpctl.b.prb_delta = 1;
-+	adpctl.b.prb_per = 1;
-+	adpctl.b.adpen = 1;
-+	adpctl.b.enaprb = 1;
-+
-+	dwc_otg_adp_write_reg(core_if, adpctl.d32);
-+	DWC_PRINTF("ADP Probe Finish\n");
-+	return 0;
-+}
-+
-+/**
-+ * Starts the ADP Sense timer to detect if ADP Sense interrupt is not asserted
-+ * within 3 seconds.
-+ *
-+ * @param core_if the pointer to core_if strucure.
-+ */
-+void dwc_otg_adp_sense_timer_start(dwc_otg_core_if_t * core_if)
-+{
-+	core_if->adp.sense_timer_started = 1;
-+	DWC_TIMER_SCHEDULE(core_if->adp.sense_timer, 3000 /* 3 secs */ );
-+}
-+
-+/**
-+ * Starts the ADP Sense
-+ *
-+ * @param core_if the pointer to core_if strucure.
-+ */
-+uint32_t dwc_otg_adp_sense_start(dwc_otg_core_if_t * core_if)
-+{
-+	adpctl_data_t adpctl;
-+
-+	DWC_PRINTF("ADP Sense Start\n");
-+
-+	/* Unmask ADP sense interrupt and mask all other from the core */
-+	adpctl.d32 = dwc_otg_adp_read_reg_filter(core_if);
-+	adpctl.b.adp_sns_int_msk = 1;
-+	dwc_otg_adp_write_reg(core_if, adpctl.d32);
-+	dwc_otg_disable_global_interrupts(core_if); // vahrama
-+
-+	/* Set ADP reset bit*/
-+	adpctl.d32 = dwc_otg_adp_read_reg_filter(core_if);
-+	adpctl.b.adpres = 1;
-+	dwc_otg_adp_write_reg(core_if, adpctl.d32);
-+
-+	while (adpctl.b.adpres) {
-+		adpctl.d32 = dwc_otg_adp_read_reg(core_if);
-+	}
-+
-+	adpctl.b.adpres = 0;
-+	adpctl.b.adpen = 1;
-+	adpctl.b.enasns = 1;
-+	dwc_otg_adp_write_reg(core_if, adpctl.d32);
-+
-+	dwc_otg_adp_sense_timer_start(core_if);
-+
-+	return 0;
-+}
-+
-+/**
-+ * Stops the ADP Probing
-+ *
-+ * @param core_if the pointer to core_if strucure.
-+ */
-+uint32_t dwc_otg_adp_probe_stop(dwc_otg_core_if_t * core_if)
-+{
-+
-+	adpctl_data_t adpctl;
-+	DWC_PRINTF("Stop ADP probe\n");
-+	core_if->adp.probe_enabled = 0;
-+	core_if->adp.probe_counter = 0;
-+	adpctl.d32 = dwc_otg_adp_read_reg(core_if);
-+
-+	adpctl.b.adpen = 0;
-+	adpctl.b.adp_prb_int = 1;
-+	adpctl.b.adp_tmout_int = 1;
-+	adpctl.b.adp_sns_int = 1;
-+	dwc_otg_adp_write_reg(core_if, adpctl.d32);
-+
-+	return 0;
-+}
-+
-+/**
-+ * Stops the ADP Sensing
-+ *
-+ * @param core_if the pointer to core_if strucure.
-+ */
-+uint32_t dwc_otg_adp_sense_stop(dwc_otg_core_if_t * core_if)
-+{
-+	adpctl_data_t adpctl;
-+
-+	core_if->adp.sense_enabled = 0;
-+
-+	adpctl.d32 = dwc_otg_adp_read_reg_filter(core_if);
-+	adpctl.b.enasns = 0;
-+	adpctl.b.adp_sns_int = 1;
-+	dwc_otg_adp_write_reg(core_if, adpctl.d32);
-+
-+	return 0;
-+}
-+
-+/**
-+ * Called to turn on the VBUS after initial ADP probe in host mode.
-+ * If port power was already enabled in cil_hcd_start function then
-+ * only schedule a timer.
-+ *
-+ * @param core_if the pointer to core_if structure.
-+ */
-+void dwc_otg_adp_turnon_vbus(dwc_otg_core_if_t * core_if)
-+{
-+	hprt0_data_t hprt0 = {.d32 = 0 };
-+	hprt0.d32 = dwc_otg_read_hprt0(core_if);
-+	DWC_PRINTF("Turn on VBUS for 1.1s, port power is %d\n", hprt0.b.prtpwr);
-+
-+	if (hprt0.b.prtpwr == 0) {
-+		hprt0.b.prtpwr = 1;
-+		//DWC_WRITE_REG32(core_if->host_if->hprt0, hprt0.d32);
-+	}
-+
-+	dwc_otg_adp_vbuson_timer_start(core_if);
-+}
-+
-+/**
-+ * Called right after driver is loaded
-+ * to perform initial actions for ADP
-+ *
-+ * @param core_if the pointer to core_if structure.
-+ * @param is_host - flag for current mode of operation either from GINTSTS or GPWRDN
-+ */
-+void dwc_otg_adp_start(dwc_otg_core_if_t * core_if, uint8_t is_host)
-+{
-+	gpwrdn_data_t gpwrdn;
-+
-+	DWC_PRINTF("ADP Initial Start\n");
-+	core_if->adp.adp_started = 1;
-+
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gintsts, 0xFFFFFFFF);
-+	dwc_otg_disable_global_interrupts(core_if);
-+	if (is_host) {
-+		DWC_PRINTF("HOST MODE\n");
-+		/* Enable Power Down Logic Interrupt*/
-+		gpwrdn.d32 = 0;
-+		gpwrdn.b.pmuintsel = 1;
-+		gpwrdn.b.pmuactv = 1;
-+		DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, 0, gpwrdn.d32);
-+		/* Initialize first ADP probe to obtain Ramp Time value */
-+		core_if->adp.initial_probe = 1;
-+		dwc_otg_adp_probe_start(core_if);
-+	} else {
-+		gotgctl_data_t gotgctl;
-+		gotgctl.d32 = DWC_READ_REG32(&core_if->core_global_regs->gotgctl);
-+		DWC_PRINTF("DEVICE MODE\n");
-+		if (gotgctl.b.bsesvld == 0) {
-+			/* Enable Power Down Logic Interrupt*/
-+			gpwrdn.d32 = 0;
-+			DWC_PRINTF("VBUS is not valid - start ADP probe\n");
-+			gpwrdn.b.pmuintsel = 1;
-+			gpwrdn.b.pmuactv = 1;
-+			DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, 0, gpwrdn.d32);
-+			core_if->adp.initial_probe = 1;
-+			dwc_otg_adp_probe_start(core_if);
-+		} else {
-+			DWC_PRINTF("VBUS is valid - initialize core as a Device\n");
-+			core_if->op_state = B_PERIPHERAL;
-+			dwc_otg_core_init(core_if);
-+			dwc_otg_enable_global_interrupts(core_if);
-+			cil_pcd_start(core_if);
-+			dwc_otg_dump_global_registers(core_if);
-+			dwc_otg_dump_dev_registers(core_if);
-+		}
-+	}
-+}
-+
-+void dwc_otg_adp_init(dwc_otg_core_if_t * core_if)
-+{
-+	core_if->adp.adp_started = 0;
-+	core_if->adp.initial_probe = 0;
-+	core_if->adp.probe_timer_values[0] = -1;
-+	core_if->adp.probe_timer_values[1] = -1;
-+	core_if->adp.probe_enabled = 0;
-+	core_if->adp.sense_enabled = 0;
-+	core_if->adp.sense_timer_started = 0;
-+	core_if->adp.vbuson_timer_started = 0;
-+	core_if->adp.probe_counter = 0;
-+	core_if->adp.gpwrdn = 0;
-+	core_if->adp.attached = DWC_OTG_ADP_UNKOWN;
-+	/* Initialize timers */
-+	core_if->adp.sense_timer =
-+	    DWC_TIMER_ALLOC("ADP SENSE TIMER", adp_sense_timeout, core_if);
-+	core_if->adp.vbuson_timer =
-+	    DWC_TIMER_ALLOC("ADP VBUS ON TIMER", adp_vbuson_timeout, core_if);
-+	if (!core_if->adp.sense_timer || !core_if->adp.vbuson_timer)
-+	{
-+		DWC_ERROR("Could not allocate memory for ADP timers\n");
-+	}
-+}
-+
-+void dwc_otg_adp_remove(dwc_otg_core_if_t * core_if)
-+{
-+	gpwrdn_data_t gpwrdn = { .d32 = 0 };
-+	gpwrdn.b.pmuintsel = 1;
-+	gpwrdn.b.pmuactv = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+
-+	if (core_if->adp.probe_enabled)
-+		dwc_otg_adp_probe_stop(core_if);
-+	if (core_if->adp.sense_enabled)
-+		dwc_otg_adp_sense_stop(core_if);
-+	if (core_if->adp.sense_timer_started)
-+		DWC_TIMER_CANCEL(core_if->adp.sense_timer);
-+	if (core_if->adp.vbuson_timer_started)
-+		DWC_TIMER_CANCEL(core_if->adp.vbuson_timer);
-+	DWC_TIMER_FREE(core_if->adp.sense_timer);
-+	DWC_TIMER_FREE(core_if->adp.vbuson_timer);
-+}
-+
-+/////////////////////////////////////////////////////////////////////
-+////////////// ADP Interrupt Handlers ///////////////////////////////
-+/////////////////////////////////////////////////////////////////////
-+/**
-+ * This function sets Ramp Timer values
-+ */
-+static uint32_t set_timer_value(dwc_otg_core_if_t * core_if, uint32_t val)
-+{
-+	if (core_if->adp.probe_timer_values[0] == -1) {
-+		core_if->adp.probe_timer_values[0] = val;
-+		core_if->adp.probe_timer_values[1] = -1;
-+		return 1;
-+	} else {
-+		core_if->adp.probe_timer_values[1] =
-+		    core_if->adp.probe_timer_values[0];
-+		core_if->adp.probe_timer_values[0] = val;
-+		return 0;
-+	}
-+}
-+
-+/**
-+ * This function compares Ramp Timer values
-+ */
-+static uint32_t compare_timer_values(dwc_otg_core_if_t * core_if)
-+{
-+	uint32_t diff;
-+	if (core_if->adp.probe_timer_values[0]>=core_if->adp.probe_timer_values[1])
-+			diff = core_if->adp.probe_timer_values[0]-core_if->adp.probe_timer_values[1];
-+	else
-+			diff = core_if->adp.probe_timer_values[1]-core_if->adp.probe_timer_values[0];
-+	if(diff < 2) {
-+		return 0;
-+	} else {
-+		return 1;
-+	}
-+}
-+
-+/**
-+ * This function handles ADP Probe Interrupts
-+ */
-+static int32_t dwc_otg_adp_handle_prb_intr(dwc_otg_core_if_t * core_if,
-+						 uint32_t val)
-+{
-+	adpctl_data_t adpctl = {.d32 = 0 };
-+	gpwrdn_data_t gpwrdn, temp;
-+	adpctl.d32 = val;
-+
-+	temp.d32 = DWC_READ_REG32(&core_if->core_global_regs->gpwrdn);
-+	core_if->adp.probe_counter++;
-+	core_if->adp.gpwrdn = DWC_READ_REG32(&core_if->core_global_regs->gpwrdn);
-+	if (adpctl.b.rtim == 0 && !temp.b.idsts){
-+		DWC_PRINTF("RTIM value is 0\n");
-+		goto exit;
-+	}
-+	if (set_timer_value(core_if, adpctl.b.rtim) &&
-+	    core_if->adp.initial_probe) {
-+		core_if->adp.initial_probe = 0;
-+		dwc_otg_adp_probe_stop(core_if);
-+		gpwrdn.d32 = 0;
-+		gpwrdn.b.pmuactv = 1;
-+		gpwrdn.b.pmuintsel = 1;
-+		DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+		DWC_WRITE_REG32(&core_if->core_global_regs->gintsts, 0xFFFFFFFF);
-+
-+		/* check which value is for device mode and which for Host mode */
-+		if (!temp.b.idsts) {	/* considered host mode value is 0 */
-+			/*
-+			 * Turn on VBUS after initial ADP probe.
-+			 */
-+			core_if->op_state = A_HOST;
-+			dwc_otg_enable_global_interrupts(core_if);
-+			DWC_SPINUNLOCK(core_if->lock);
-+			cil_hcd_start(core_if);
-+			dwc_otg_adp_turnon_vbus(core_if);
-+			DWC_SPINLOCK(core_if->lock);
-+		} else {
-+			/*
-+			 * Initiate SRP after initial ADP probe.
-+			 */
-+			dwc_otg_enable_global_interrupts(core_if);
-+			dwc_otg_initiate_srp(core_if);
-+		}
-+	} else if (core_if->adp.probe_counter > 2){
-+		gpwrdn.d32 = DWC_READ_REG32(&core_if->core_global_regs->gpwrdn);
-+		if (compare_timer_values(core_if)) {
-+			DWC_PRINTF("Difference in timer values !!! \n");
-+//                      core_if->adp.attached = DWC_OTG_ADP_ATTACHED;
-+			dwc_otg_adp_probe_stop(core_if);
-+
-+			/* Power on the core */
-+			if (core_if->power_down == 2) {
-+				gpwrdn.b.pwrdnswtch = 1;
-+				DWC_MODIFY_REG32(&core_if->core_global_regs->
-+						 gpwrdn, 0, gpwrdn.d32);
-+			}
-+
-+			/* check which value is for device mode and which for Host mode */
-+			if (!temp.b.idsts) {	/* considered host mode value is 0 */
-+				/* Disable Interrupt from Power Down Logic */
-+				gpwrdn.d32 = 0;
-+				gpwrdn.b.pmuintsel = 1;
-+				gpwrdn.b.pmuactv = 1;
-+				DWC_MODIFY_REG32(&core_if->core_global_regs->
-+						 gpwrdn, gpwrdn.d32, 0);
-+
-+				/*
-+				 * Initialize the Core for Host mode.
-+				 */
-+				core_if->op_state = A_HOST;
-+				dwc_otg_core_init(core_if);
-+				dwc_otg_enable_global_interrupts(core_if);
-+				cil_hcd_start(core_if);
-+			} else {
-+				gotgctl_data_t gotgctl;
-+				/* Mask SRP detected interrupt from Power Down Logic */
-+				gpwrdn.d32 = 0;
-+				gpwrdn.b.srp_det_msk = 1;
-+				DWC_MODIFY_REG32(&core_if->core_global_regs->
-+						 gpwrdn, gpwrdn.d32, 0);
-+
-+				/* Disable Power Down Logic */
-+				gpwrdn.d32 = 0;
-+				gpwrdn.b.pmuintsel = 1;
-+				gpwrdn.b.pmuactv = 1;
-+				DWC_MODIFY_REG32(&core_if->core_global_regs->
-+						 gpwrdn, gpwrdn.d32, 0);
-+
-+				/*
-+				 * Initialize the Core for Device mode.
-+				 */
-+				core_if->op_state = B_PERIPHERAL;
-+				dwc_otg_core_init(core_if);
-+				dwc_otg_enable_global_interrupts(core_if);
-+				cil_pcd_start(core_if);
-+
-+				gotgctl.d32 = DWC_READ_REG32(&core_if->core_global_regs->gotgctl);
-+				if (!gotgctl.b.bsesvld) {
-+					dwc_otg_initiate_srp(core_if);
-+				}
-+			}
-+		}
-+		if (core_if->power_down == 2) {
-+			if (gpwrdn.b.bsessvld) {
-+				/* Mask SRP detected interrupt from Power Down Logic */
-+				gpwrdn.d32 = 0;
-+				gpwrdn.b.srp_det_msk = 1;
-+				DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+
-+				/* Disable Power Down Logic */
-+				gpwrdn.d32 = 0;
-+				gpwrdn.b.pmuactv = 1;
-+				DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+
-+				/*
-+				 * Initialize the Core for Device mode.
-+				 */
-+				core_if->op_state = B_PERIPHERAL;
-+				dwc_otg_core_init(core_if);
-+				dwc_otg_enable_global_interrupts(core_if);
-+				cil_pcd_start(core_if);
-+			}
-+		}
-+	}
-+exit:
-+	/* Clear interrupt */
-+	adpctl.d32 = dwc_otg_adp_read_reg(core_if);
-+	adpctl.b.adp_prb_int = 1;
-+	dwc_otg_adp_write_reg(core_if, adpctl.d32);
-+
-+	return 0;
-+}
-+
-+/**
-+ * This function hadles ADP Sense Interrupt
-+ */
-+static int32_t dwc_otg_adp_handle_sns_intr(dwc_otg_core_if_t * core_if)
-+{
-+	adpctl_data_t adpctl;
-+	/* Stop ADP Sense timer */
-+	DWC_TIMER_CANCEL(core_if->adp.sense_timer);
-+
-+	/* Restart ADP Sense timer */
-+	dwc_otg_adp_sense_timer_start(core_if);
-+
-+	/* Clear interrupt */
-+	adpctl.d32 = dwc_otg_adp_read_reg(core_if);
-+	adpctl.b.adp_sns_int = 1;
-+	dwc_otg_adp_write_reg(core_if, adpctl.d32);
-+
-+	return 0;
-+}
-+
-+/**
-+ * This function handles ADP Probe Interrupts
-+ */
-+static int32_t dwc_otg_adp_handle_prb_tmout_intr(dwc_otg_core_if_t * core_if,
-+						 uint32_t val)
-+{
-+	adpctl_data_t adpctl = {.d32 = 0 };
-+	adpctl.d32 = val;
-+	set_timer_value(core_if, adpctl.b.rtim);
-+
-+	/* Clear interrupt */
-+	adpctl.d32 = dwc_otg_adp_read_reg(core_if);
-+	adpctl.b.adp_tmout_int = 1;
-+	dwc_otg_adp_write_reg(core_if, adpctl.d32);
-+
-+	return 0;
-+}
-+
-+/**
-+ * ADP Interrupt handler.
-+ *
-+ */
-+int32_t dwc_otg_adp_handle_intr(dwc_otg_core_if_t * core_if)
-+{
-+	int retval = 0;
-+	adpctl_data_t adpctl = {.d32 = 0};
-+
-+	adpctl.d32 = dwc_otg_adp_read_reg(core_if);
-+	DWC_PRINTF("ADPCTL = %08x\n",adpctl.d32);
-+
-+	if (adpctl.b.adp_sns_int & adpctl.b.adp_sns_int_msk) {
-+		DWC_PRINTF("ADP Sense interrupt\n");
-+		retval |= dwc_otg_adp_handle_sns_intr(core_if);
-+	}
-+	if (adpctl.b.adp_tmout_int & adpctl.b.adp_tmout_int_msk) {
-+		DWC_PRINTF("ADP timeout interrupt\n");
-+		retval |= dwc_otg_adp_handle_prb_tmout_intr(core_if, adpctl.d32);
-+	}
-+	if (adpctl.b.adp_prb_int & adpctl.b.adp_prb_int_msk) {
-+		DWC_PRINTF("ADP Probe interrupt\n");
-+		adpctl.b.adp_prb_int = 1;
-+		retval |= dwc_otg_adp_handle_prb_intr(core_if, adpctl.d32);
-+	}
-+
-+//	dwc_otg_adp_modify_reg(core_if, adpctl.d32, 0);
-+	//dwc_otg_adp_write_reg(core_if, adpctl.d32);
-+	DWC_PRINTF("RETURN FROM ADP ISR\n");
-+
-+	return retval;
-+}
-+
-+/**
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ */
-+int32_t dwc_otg_adp_handle_srp_intr(dwc_otg_core_if_t * core_if)
-+{
-+
-+#ifndef DWC_HOST_ONLY
-+	hprt0_data_t hprt0;
-+	gpwrdn_data_t gpwrdn;
-+	DWC_DEBUGPL(DBG_ANY, "++ Power Down Logic Session Request Interrupt++\n");
-+
-+	gpwrdn.d32 = DWC_READ_REG32(&core_if->core_global_regs->gpwrdn);
-+	/* check which value is for device mode and which for Host mode */
-+	if (!gpwrdn.b.idsts) {	/* considered host mode value is 0 */
-+		DWC_PRINTF("SRP: Host mode\n");
-+
-+		if (core_if->adp_enable) {
-+			dwc_otg_adp_probe_stop(core_if);
-+
-+			/* Power on the core */
-+			if (core_if->power_down == 2) {
-+				gpwrdn.b.pwrdnswtch = 1;
-+				DWC_MODIFY_REG32(&core_if->core_global_regs->
-+						 gpwrdn, 0, gpwrdn.d32);
-+			}
-+
-+			core_if->op_state = A_HOST;
-+			dwc_otg_core_init(core_if);
-+			dwc_otg_enable_global_interrupts(core_if);
-+			cil_hcd_start(core_if);
-+		}
-+
-+		/* Turn on the port power bit. */
-+		hprt0.d32 = dwc_otg_read_hprt0(core_if);
-+		hprt0.b.prtpwr = 1;
-+		DWC_WRITE_REG32(core_if->host_if->hprt0, hprt0.d32);
-+
-+		/* Start the Connection timer. So a message can be displayed
-+		 * if connect does not occur within 10 seconds. */
-+		cil_hcd_session_start(core_if);
-+	} else {
-+		DWC_PRINTF("SRP: Device mode %s\n", __FUNCTION__);
-+		if (core_if->adp_enable) {
-+			dwc_otg_adp_probe_stop(core_if);
-+
-+			/* Power on the core */
-+			if (core_if->power_down == 2) {
-+				gpwrdn.b.pwrdnswtch = 1;
-+				DWC_MODIFY_REG32(&core_if->core_global_regs->
-+						 gpwrdn, 0, gpwrdn.d32);
-+			}
-+
-+			gpwrdn.d32 = 0;
-+			gpwrdn.b.pmuactv = 0;
-+			DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, 0,
-+					 gpwrdn.d32);
-+
-+			core_if->op_state = B_PERIPHERAL;
-+			dwc_otg_core_init(core_if);
-+			dwc_otg_enable_global_interrupts(core_if);
-+			cil_pcd_start(core_if);
-+		}
-+	}
-+#endif
-+	return 1;
-+}
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_adp.h
-@@ -0,0 +1,80 @@
-+/* ==========================================================================
-+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.h $
-+ * $Revision: #7 $
-+ * $Date: 2011/10/24 $
-+ * $Change: 1871159 $
-+ *
-+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
-+ * "Software") is an Unsupported proprietary work of Synopsys, Inc. unless
-+ * otherwise expressly agreed to in writing between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product under
-+ * any End User Software License Agreement or Agreement for Licensed Product
-+ * with Synopsys or any supplement thereto. You are permitted to use and
-+ * redistribute this Software in source and binary forms, with or without
-+ * modification, provided that redistributions of source code must retain this
-+ * notice. You may not view, use, disclose, copy or distribute this file or
-+ * any information contained herein except pursuant to this license grant from
-+ * Synopsys. If you do not agree with this notice, including the disclaimer
-+ * below, then you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" BASIS
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS BE LIABLE FOR ANY DIRECT,
-+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================== */
-+
-+#ifndef __DWC_OTG_ADP_H__
-+#define __DWC_OTG_ADP_H__
-+
-+/**
-+ * @file
-+ *
-+ * This file contains the Attach Detect Protocol interfaces and defines
-+ * (functions) and structures for Linux.
-+ *
-+ */
-+
-+#define DWC_OTG_ADP_UNATTACHED	0
-+#define DWC_OTG_ADP_ATTACHED	1
-+#define DWC_OTG_ADP_UNKOWN	2
-+
-+typedef struct dwc_otg_adp {
-+	uint32_t adp_started;
-+	uint32_t initial_probe;
-+	int32_t probe_timer_values[2];
-+	uint32_t probe_enabled;
-+	uint32_t sense_enabled;
-+	dwc_timer_t *sense_timer;
-+	uint32_t sense_timer_started;
-+	dwc_timer_t *vbuson_timer;
-+	uint32_t vbuson_timer_started;
-+	uint32_t attached;
-+	uint32_t probe_counter;
-+	uint32_t gpwrdn;
-+} dwc_otg_adp_t;
-+
-+/**
-+ * Attach Detect Protocol functions
-+ */
-+
-+extern void dwc_otg_adp_write_reg(dwc_otg_core_if_t * core_if, uint32_t value);
-+extern uint32_t dwc_otg_adp_read_reg(dwc_otg_core_if_t * core_if);
-+extern uint32_t dwc_otg_adp_probe_start(dwc_otg_core_if_t * core_if);
-+extern uint32_t dwc_otg_adp_sense_start(dwc_otg_core_if_t * core_if);
-+extern uint32_t dwc_otg_adp_probe_stop(dwc_otg_core_if_t * core_if);
-+extern uint32_t dwc_otg_adp_sense_stop(dwc_otg_core_if_t * core_if);
-+extern void dwc_otg_adp_start(dwc_otg_core_if_t * core_if, uint8_t is_host);
-+extern void dwc_otg_adp_init(dwc_otg_core_if_t * core_if);
-+extern void dwc_otg_adp_remove(dwc_otg_core_if_t * core_if);
-+extern int32_t dwc_otg_adp_handle_intr(dwc_otg_core_if_t * core_if);
-+extern int32_t dwc_otg_adp_handle_srp_intr(dwc_otg_core_if_t * core_if);
-+
-+#endif //__DWC_OTG_ADP_H__
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_attr.c
-@@ -0,0 +1,1212 @@
-+/* ==========================================================================
-+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.c $
-+ * $Revision: #44 $
-+ * $Date: 2010/11/29 $
-+ * $Change: 1636033 $
-+ *
-+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
-+ * "Software") is an Unsupported proprietary work of Synopsys, Inc. unless
-+ * otherwise expressly agreed to in writing between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product under
-+ * any End User Software License Agreement or Agreement for Licensed Product
-+ * with Synopsys or any supplement thereto. You are permitted to use and
-+ * redistribute this Software in source and binary forms, with or without
-+ * modification, provided that redistributions of source code must retain this
-+ * notice. You may not view, use, disclose, copy or distribute this file or
-+ * any information contained herein except pursuant to this license grant from
-+ * Synopsys. If you do not agree with this notice, including the disclaimer
-+ * below, then you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" BASIS
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS BE LIABLE FOR ANY DIRECT,
-+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================== */
-+
-+/** @file
-+ *
-+ * The diagnostic interface will provide access to the controller for
-+ * bringing up the hardware and testing.  The Linux driver attributes
-+ * feature will be used to provide the Linux Diagnostic
-+ * Interface. These attributes are accessed through sysfs.
-+ */
-+
-+/** @page "Linux Module Attributes"
-+ *
-+ * The Linux module attributes feature is used to provide the Linux
-+ * Diagnostic Interface.  These attributes are accessed through sysfs.
-+ * The diagnostic interface will provide access to the controller for
-+ * bringing up the hardware and testing.
-+
-+ The following table shows the attributes.
-+ <table>
-+ <tr>
-+ <td><b> Name</b></td>
-+ <td><b> Description</b></td>
-+ <td><b> Access</b></td>
-+ </tr>
-+
-+ <tr>
-+ <td> mode </td>
-+ <td> Returns the current mode: 0 for device mode, 1 for host mode</td>
-+ <td> Read</td>
-+ </tr>
-+
-+ <tr>
-+ <td> hnpcapable </td>
-+ <td> Gets or sets the "HNP-capable" bit in the Core USB Configuraton Register.
-+ Read returns the current value.</td>
-+ <td> Read/Write</td>
-+ </tr>
-+
-+ <tr>
-+ <td> srpcapable </td>
-+ <td> Gets or sets the "SRP-capable" bit in the Core USB Configuraton Register.
-+ Read returns the current value.</td>
-+ <td> Read/Write</td>
-+ </tr>
-+
-+ <tr>
-+ <td> hsic_connect </td>
-+ <td> Gets or sets the "HSIC-Connect" bit in the GLPMCFG Register.
-+ Read returns the current value.</td>
-+ <td> Read/Write</td>
-+ </tr>
-+
-+ <tr>
-+ <td> inv_sel_hsic </td>
-+ <td> Gets or sets the "Invert Select HSIC" bit in the GLPMFG Register.
-+ Read returns the current value.</td>
-+ <td> Read/Write</td>
-+ </tr>
-+
-+ <tr>
-+ <td> hnp </td>
-+ <td> Initiates the Host Negotiation Protocol.  Read returns the status.</td>
-+ <td> Read/Write</td>
-+ </tr>
-+
-+ <tr>
-+ <td> srp </td>
-+ <td> Initiates the Session Request Protocol.  Read returns the status.</td>
-+ <td> Read/Write</td>
-+ </tr>
-+
-+ <tr>
-+ <td> buspower </td>
-+ <td> Gets or sets the Power State of the bus (0 - Off or 1 - On)</td>
-+ <td> Read/Write</td>
-+ </tr>
-+
-+ <tr>
-+ <td> bussuspend </td>
-+ <td> Suspends the USB bus.</td>
-+ <td> Read/Write</td>
-+ </tr>
-+
-+ <tr>
-+ <td> busconnected </td>
-+ <td> Gets the connection status of the bus</td>
-+ <td> Read</td>
-+ </tr>
-+
-+ <tr>
-+ <td> gotgctl </td>
-+ <td> Gets or sets the Core Control Status Register.</td>
-+ <td> Read/Write</td>
-+ </tr>
-+
-+ <tr>
-+ <td> gusbcfg </td>
-+ <td> Gets or sets the Core USB Configuration Register</td>
-+ <td> Read/Write</td>
-+ </tr>
-+
-+ <tr>
-+ <td> grxfsiz </td>
-+ <td> Gets or sets the Receive FIFO Size Register</td>
-+ <td> Read/Write</td>
-+ </tr>
-+
-+ <tr>
-+ <td> gnptxfsiz </td>
-+ <td> Gets or sets the non-periodic Transmit Size Register</td>
-+ <td> Read/Write</td>
-+ </tr>
-+
-+ <tr>
-+ <td> gpvndctl </td>
-+ <td> Gets or sets the PHY Vendor Control Register</td>
-+ <td> Read/Write</td>
-+ </tr>
-+
-+ <tr>
-+ <td> ggpio </td>
-+ <td> Gets the value in the lower 16-bits of the General Purpose IO Register
-+ or sets the upper 16 bits.</td>
-+ <td> Read/Write</td>
-+ </tr>
-+
-+ <tr>
-+ <td> guid </td>
-+ <td> Gets or sets the value of the User ID Register</td>
-+ <td> Read/Write</td>
-+ </tr>
-+
-+ <tr>
-+ <td> gsnpsid </td>
-+ <td> Gets the value of the Synopsys ID Regester</td>
-+ <td> Read</td>
-+ </tr>
-+
-+ <tr>
-+ <td> devspeed </td>
-+ <td> Gets or sets the device speed setting in the DCFG register</td>
-+ <td> Read/Write</td>
-+ </tr>
-+
-+ <tr>
-+ <td> enumspeed </td>
-+ <td> Gets the device enumeration Speed.</td>
-+ <td> Read</td>
-+ </tr>
-+
-+ <tr>
-+ <td> hptxfsiz </td>
-+ <td> Gets the value of the Host Periodic Transmit FIFO</td>
-+ <td> Read</td>
-+ </tr>
-+
-+ <tr>
-+ <td> hprt0 </td>
-+ <td> Gets or sets the value in the Host Port Control and Status Register</td>
-+ <td> Read/Write</td>
-+ </tr>
-+
-+ <tr>
-+ <td> regoffset </td>
-+ <td> Sets the register offset for the next Register Access</td>
-+ <td> Read/Write</td>
-+ </tr>
-+
-+ <tr>
-+ <td> regvalue </td>
-+ <td> Gets or sets the value of the register at the offset in the regoffset attribute.</td>
-+ <td> Read/Write</td>
-+ </tr>
-+
-+ <tr>
-+ <td> remote_wakeup </td>
-+ <td> On read, shows the status of Remote Wakeup. On write, initiates a remote
-+ wakeup of the host. When bit 0 is 1 and Remote Wakeup is enabled, the Remote
-+ Wakeup signalling bit in the Device Control Register is set for 1
-+ milli-second.</td>
-+ <td> Read/Write</td>
-+ </tr>
-+
-+ <tr>
-+ <td> rem_wakeup_pwrdn </td>
-+ <td> On read, shows the status core - hibernated or not. On write, initiates
-+ a remote wakeup of the device from Hibernation. </td>
-+ <td> Read/Write</td>
-+ </tr>
-+
-+ <tr>
-+ <td> mode_ch_tim_en </td>
-+ <td> This bit is used to enable or disable the host core to wait for 200 PHY
-+ clock cycles at the end of Resume to change the opmode signal to the PHY to 00
-+ after Suspend or LPM. </td>
-+ <td> Read/Write</td>
-+ </tr>
-+
-+ <tr>
-+ <td> fr_interval </td>
-+ <td> On read, shows the value of HFIR Frame Interval. On write, dynamically
-+ reload HFIR register during runtime. The application can write a value to this
-+ register only after the Port Enable bit of the Host Port Control and Status
-+ register (HPRT.PrtEnaPort) has been set </td>
-+ <td> Read/Write</td>
-+ </tr>
-+
-+ <tr>
-+ <td> disconnect_us </td>
-+ <td> On read, shows the status of disconnect_device_us. On write, sets disconnect_us
-+ which causes soft disconnect for 100us. Applicable only for device mode of operation.</td>
-+ <td> Read/Write</td>
-+ </tr>
-+
-+ <tr>
-+ <td> regdump </td>
-+ <td> Dumps the contents of core registers.</td>
-+ <td> Read</td>
-+ </tr>
-+
-+ <tr>
-+ <td> spramdump </td>
-+ <td> Dumps the contents of core registers.</td>
-+ <td> Read</td>
-+ </tr>
-+
-+ <tr>
-+ <td> hcddump </td>
-+ <td> Dumps the current HCD state.</td>
-+ <td> Read</td>
-+ </tr>
-+
-+ <tr>
-+ <td> hcd_frrem </td>
-+ <td> Shows the average value of the Frame Remaining
-+ field in the Host Frame Number/Frame Remaining register when an SOF interrupt
-+ occurs. This can be used to determine the average interrupt latency. Also
-+ shows the average Frame Remaining value for start_transfer and the "a" and
-+ "b" sample points. The "a" and "b" sample points may be used during debugging
-+ bto determine how long it takes to execute a section of the HCD code.</td>
-+ <td> Read</td>
-+ </tr>
-+
-+ <tr>
-+ <td> rd_reg_test </td>
-+ <td> Displays the time required to read the GNPTXFSIZ register many times
-+ (the output shows the number of times the register is read).
-+ <td> Read</td>
-+ </tr>
-+
-+ <tr>
-+ <td> wr_reg_test </td>
-+ <td> Displays the time required to write the GNPTXFSIZ register many times
-+ (the output shows the number of times the register is written).
-+ <td> Read</td>
-+ </tr>
-+
-+ <tr>
-+ <td> lpm_response </td>
-+ <td> Gets or sets lpm_response mode. Applicable only in device mode.
-+ <td> Write</td>
-+ </tr>
-+
-+ <tr>
-+ <td> sleep_status </td>
-+ <td> Shows sleep status of device.
-+ <td> Read</td>
-+ </tr>
-+
-+ </table>
-+
-+ Example usage:
-+ To get the current mode:
-+ cat /sys/devices/lm0/mode
-+
-+ To power down the USB:
-+ echo 0 > /sys/devices/lm0/buspower
-+ */
-+
-+#include "dwc_otg_os_dep.h"
-+#include "dwc_os.h"
-+#include "dwc_otg_driver.h"
-+#include "dwc_otg_attr.h"
-+#include "dwc_otg_core_if.h"
-+#include "dwc_otg_pcd_if.h"
-+#include "dwc_otg_hcd_if.h"
-+
-+/*
-+ * MACROs for defining sysfs attribute
-+ */
-+#ifdef LM_INTERFACE
-+
-+#define DWC_OTG_DEVICE_ATTR_BITFIELD_SHOW(_otg_attr_name_,_string_) \
-+static ssize_t _otg_attr_name_##_show (struct device *_dev, struct device_attribute *attr, char *buf) \
-+{ \
-+	struct lm_device *lm_dev = container_of(_dev, struct lm_device, dev); \
-+	dwc_otg_device_t *otg_dev = lm_get_drvdata(lm_dev);		\
-+	uint32_t val; \
-+	val = dwc_otg_get_##_otg_attr_name_ (otg_dev->core_if); \
-+	return sprintf (buf, "%s = 0x%x\n", _string_, val); \
-+}
-+#define DWC_OTG_DEVICE_ATTR_BITFIELD_STORE(_otg_attr_name_,_string_) \
-+static ssize_t _otg_attr_name_##_store (struct device *_dev, struct device_attribute *attr, \
-+					const char *buf, size_t count) \
-+{ \
-+	struct lm_device *lm_dev = container_of(_dev, struct lm_device, dev); \
-+	dwc_otg_device_t *otg_dev = lm_get_drvdata(lm_dev); \
-+	uint32_t set = simple_strtoul(buf, NULL, 16); \
-+	dwc_otg_set_##_otg_attr_name_(otg_dev->core_if, set);\
-+	return count; \
-+}
-+
-+#elif defined(PCI_INTERFACE)
-+
-+#define DWC_OTG_DEVICE_ATTR_BITFIELD_SHOW(_otg_attr_name_,_string_) \
-+static ssize_t _otg_attr_name_##_show (struct device *_dev, struct device_attribute *attr, char *buf) \
-+{ \
-+	dwc_otg_device_t *otg_dev = dev_get_drvdata(_dev);	\
-+	uint32_t val; \
-+	val = dwc_otg_get_##_otg_attr_name_ (otg_dev->core_if); \
-+	return sprintf (buf, "%s = 0x%x\n", _string_, val); \
-+}
-+#define DWC_OTG_DEVICE_ATTR_BITFIELD_STORE(_otg_attr_name_,_string_) \
-+static ssize_t _otg_attr_name_##_store (struct device *_dev, struct device_attribute *attr, \
-+					const char *buf, size_t count) \
-+{ \
-+	dwc_otg_device_t *otg_dev = dev_get_drvdata(_dev);  \
-+	uint32_t set = simple_strtoul(buf, NULL, 16); \
-+	dwc_otg_set_##_otg_attr_name_(otg_dev->core_if, set);\
-+	return count; \
-+}
-+
-+#elif defined(PLATFORM_INTERFACE)
-+
-+#define DWC_OTG_DEVICE_ATTR_BITFIELD_SHOW(_otg_attr_name_,_string_) \
-+static ssize_t _otg_attr_name_##_show (struct device *_dev, struct device_attribute *attr, char *buf) \
-+{ \
-+        struct platform_device *platform_dev = \
-+                container_of(_dev, struct platform_device, dev); \
-+        dwc_otg_device_t *otg_dev = platform_get_drvdata(platform_dev);  \
-+	uint32_t val; \
-+	DWC_PRINTF("%s(%p) -> platform_dev %p, otg_dev %p\n", \
-+                    __func__, _dev, platform_dev, otg_dev); \
-+	val = dwc_otg_get_##_otg_attr_name_ (otg_dev->core_if); \
-+	return sprintf (buf, "%s = 0x%x\n", _string_, val); \
-+}
-+#define DWC_OTG_DEVICE_ATTR_BITFIELD_STORE(_otg_attr_name_,_string_) \
-+static ssize_t _otg_attr_name_##_store (struct device *_dev, struct device_attribute *attr, \
-+					const char *buf, size_t count) \
-+{ \
-+        struct platform_device *platform_dev = container_of(_dev, struct platform_device, dev); \
-+        dwc_otg_device_t *otg_dev = platform_get_drvdata(platform_dev); \
-+	uint32_t set = simple_strtoul(buf, NULL, 16); \
-+	dwc_otg_set_##_otg_attr_name_(otg_dev->core_if, set);\
-+	return count; \
-+}
-+#endif
-+
-+/*
-+ * MACROs for defining sysfs attribute for 32-bit registers
-+ */
-+#ifdef LM_INTERFACE
-+#define DWC_OTG_DEVICE_ATTR_REG_SHOW(_otg_attr_name_,_string_) \
-+static ssize_t _otg_attr_name_##_show (struct device *_dev, struct device_attribute *attr, char *buf) \
-+{ \
-+	struct lm_device *lm_dev = container_of(_dev, struct lm_device, dev); \
-+	dwc_otg_device_t *otg_dev = lm_get_drvdata(lm_dev); \
-+	uint32_t val; \
-+	val = dwc_otg_get_##_otg_attr_name_ (otg_dev->core_if); \
-+	return sprintf (buf, "%s = 0x%08x\n", _string_, val); \
-+}
-+#define DWC_OTG_DEVICE_ATTR_REG_STORE(_otg_attr_name_,_string_) \
-+static ssize_t _otg_attr_name_##_store (struct device *_dev, struct device_attribute *attr, \
-+					const char *buf, size_t count) \
-+{ \
-+	struct lm_device *lm_dev = container_of(_dev, struct lm_device, dev); \
-+	dwc_otg_device_t *otg_dev = lm_get_drvdata(lm_dev); \
-+	uint32_t val = simple_strtoul(buf, NULL, 16); \
-+	dwc_otg_set_##_otg_attr_name_ (otg_dev->core_if, val); \
-+	return count; \
-+}
-+#elif defined(PCI_INTERFACE)
-+#define DWC_OTG_DEVICE_ATTR_REG_SHOW(_otg_attr_name_,_string_) \
-+static ssize_t _otg_attr_name_##_show (struct device *_dev, struct device_attribute *attr, char *buf) \
-+{ \
-+	dwc_otg_device_t *otg_dev = dev_get_drvdata(_dev);  \
-+	uint32_t val; \
-+	val = dwc_otg_get_##_otg_attr_name_ (otg_dev->core_if); \
-+	return sprintf (buf, "%s = 0x%08x\n", _string_, val); \
-+}
-+#define DWC_OTG_DEVICE_ATTR_REG_STORE(_otg_attr_name_,_string_) \
-+static ssize_t _otg_attr_name_##_store (struct device *_dev, struct device_attribute *attr, \
-+					const char *buf, size_t count) \
-+{ \
-+	dwc_otg_device_t *otg_dev = dev_get_drvdata(_dev);  \
-+	uint32_t val = simple_strtoul(buf, NULL, 16); \
-+	dwc_otg_set_##_otg_attr_name_ (otg_dev->core_if, val); \
-+	return count; \
-+}
-+
-+#elif defined(PLATFORM_INTERFACE)
-+#include "dwc_otg_dbg.h"
-+#define DWC_OTG_DEVICE_ATTR_REG_SHOW(_otg_attr_name_,_string_) \
-+static ssize_t _otg_attr_name_##_show (struct device *_dev, struct device_attribute *attr, char *buf) \
-+{ \
-+	struct platform_device *platform_dev = container_of(_dev, struct platform_device, dev); \
-+	dwc_otg_device_t *otg_dev = platform_get_drvdata(platform_dev); \
-+	uint32_t val; \
-+	DWC_PRINTF("%s(%p) -> platform_dev %p, otg_dev %p\n", \
-+                    __func__, _dev, platform_dev, otg_dev); \
-+	val = dwc_otg_get_##_otg_attr_name_ (otg_dev->core_if); \
-+	return sprintf (buf, "%s = 0x%08x\n", _string_, val); \
-+}
-+#define DWC_OTG_DEVICE_ATTR_REG_STORE(_otg_attr_name_,_string_) \
-+static ssize_t _otg_attr_name_##_store (struct device *_dev, struct device_attribute *attr, \
-+					const char *buf, size_t count) \
-+{ \
-+	struct platform_device *platform_dev = container_of(_dev, struct platform_device, dev); \
-+	dwc_otg_device_t *otg_dev = platform_get_drvdata(platform_dev); \
-+	uint32_t val = simple_strtoul(buf, NULL, 16); \
-+	dwc_otg_set_##_otg_attr_name_ (otg_dev->core_if, val); \
-+	return count; \
-+}
-+
-+#endif
-+
-+#define DWC_OTG_DEVICE_ATTR_BITFIELD_RW(_otg_attr_name_,_string_) \
-+DWC_OTG_DEVICE_ATTR_BITFIELD_SHOW(_otg_attr_name_,_string_) \
-+DWC_OTG_DEVICE_ATTR_BITFIELD_STORE(_otg_attr_name_,_string_) \
-+DEVICE_ATTR(_otg_attr_name_,0644,_otg_attr_name_##_show,_otg_attr_name_##_store);
-+
-+#define DWC_OTG_DEVICE_ATTR_BITFIELD_RO(_otg_attr_name_,_string_) \
-+DWC_OTG_DEVICE_ATTR_BITFIELD_SHOW(_otg_attr_name_,_string_) \
-+DEVICE_ATTR(_otg_attr_name_,0444,_otg_attr_name_##_show,NULL);
-+
-+#define DWC_OTG_DEVICE_ATTR_REG32_RW(_otg_attr_name_,_addr_,_string_) \
-+DWC_OTG_DEVICE_ATTR_REG_SHOW(_otg_attr_name_,_string_) \
-+DWC_OTG_DEVICE_ATTR_REG_STORE(_otg_attr_name_,_string_) \
-+DEVICE_ATTR(_otg_attr_name_,0644,_otg_attr_name_##_show,_otg_attr_name_##_store);
-+
-+#define DWC_OTG_DEVICE_ATTR_REG32_RO(_otg_attr_name_,_addr_,_string_) \
-+DWC_OTG_DEVICE_ATTR_REG_SHOW(_otg_attr_name_,_string_) \
-+DEVICE_ATTR(_otg_attr_name_,0444,_otg_attr_name_##_show,NULL);
-+
-+/** @name Functions for Show/Store of Attributes */
-+/**@{*/
-+
-+/**
-+ * Helper function returning the otg_device structure of the given device
-+ */
-+static dwc_otg_device_t *dwc_otg_drvdev(struct device *_dev)
-+{
-+        dwc_otg_device_t *otg_dev;
-+        DWC_OTG_GETDRVDEV(otg_dev, _dev);
-+        return otg_dev;
-+}
-+
-+/**
-+ * Show the register offset of the Register Access.
-+ */
-+static ssize_t regoffset_show(struct device *_dev,
-+			      struct device_attribute *attr, char *buf)
-+{
-+        dwc_otg_device_t *otg_dev = dwc_otg_drvdev(_dev);
-+	return snprintf(buf, sizeof("0xFFFFFFFF\n") + 1, "0x%08x\n",
-+			otg_dev->os_dep.reg_offset);
-+}
-+
-+/**
-+ * Set the register offset for the next Register Access 	Read/Write
-+ */
-+static ssize_t regoffset_store(struct device *_dev,
-+			       struct device_attribute *attr,
-+			       const char *buf, size_t count)
-+{
-+        dwc_otg_device_t *otg_dev = dwc_otg_drvdev(_dev);
-+	uint32_t offset = simple_strtoul(buf, NULL, 16);
-+#if defined(LM_INTERFACE) || defined(PLATFORM_INTERFACE)
-+	if (offset < SZ_256K) {
-+#elif  defined(PCI_INTERFACE)
-+	if (offset < 0x00040000) {
-+#endif
-+		otg_dev->os_dep.reg_offset = offset;
-+	} else {
-+		dev_err(_dev, "invalid offset\n");
-+	}
-+
-+	return count;
-+}
-+
-+DEVICE_ATTR(regoffset, S_IRUGO | S_IWUSR, regoffset_show, regoffset_store);
-+
-+/**
-+ * Show the value of the register at the offset in the reg_offset
-+ * attribute.
-+ */
-+static ssize_t regvalue_show(struct device *_dev,
-+			     struct device_attribute *attr, char *buf)
-+{
-+        dwc_otg_device_t *otg_dev = dwc_otg_drvdev(_dev);
-+	uint32_t val;
-+	volatile uint32_t *addr;
-+
-+	if (otg_dev->os_dep.reg_offset != 0xFFFFFFFF && 0 != otg_dev->os_dep.base) {
-+		/* Calculate the address */
-+		addr = (uint32_t *) (otg_dev->os_dep.reg_offset +
-+				     (uint8_t *) otg_dev->os_dep.base);
-+		val = DWC_READ_REG32(addr);
-+		return snprintf(buf,
-+				sizeof("Reg@0xFFFFFFFF = 0xFFFFFFFF\n") + 1,
-+				"Reg@0x%06x = 0x%08x\n", otg_dev->os_dep.reg_offset,
-+				val);
-+	} else {
-+		dev_err(_dev, "Invalid offset (0x%0x)\n", otg_dev->os_dep.reg_offset);
-+		return sprintf(buf, "invalid offset\n");
-+	}
-+}
-+
-+/**
-+ * Store the value in the register at the offset in the reg_offset
-+ * attribute.
-+ *
-+ */
-+static ssize_t regvalue_store(struct device *_dev,
-+			      struct device_attribute *attr,
-+			      const char *buf, size_t count)
-+{
-+        dwc_otg_device_t *otg_dev = dwc_otg_drvdev(_dev);
-+	volatile uint32_t *addr;
-+	uint32_t val = simple_strtoul(buf, NULL, 16);
-+	//dev_dbg(_dev, "Offset=0x%08x Val=0x%08x\n", otg_dev->reg_offset, val);
-+	if (otg_dev->os_dep.reg_offset != 0xFFFFFFFF && 0 != otg_dev->os_dep.base) {
-+		/* Calculate the address */
-+		addr = (uint32_t *) (otg_dev->os_dep.reg_offset +
-+				     (uint8_t *) otg_dev->os_dep.base);
-+		DWC_WRITE_REG32(addr, val);
-+	} else {
-+		dev_err(_dev, "Invalid Register Offset (0x%08x)\n",
-+			otg_dev->os_dep.reg_offset);
-+	}
-+	return count;
-+}
-+
-+DEVICE_ATTR(regvalue, S_IRUGO | S_IWUSR, regvalue_show, regvalue_store);
-+
-+/*
-+ * Attributes
-+ */
-+DWC_OTG_DEVICE_ATTR_BITFIELD_RO(mode, "Mode");
-+DWC_OTG_DEVICE_ATTR_BITFIELD_RW(hnpcapable, "HNPCapable");
-+DWC_OTG_DEVICE_ATTR_BITFIELD_RW(srpcapable, "SRPCapable");
-+DWC_OTG_DEVICE_ATTR_BITFIELD_RW(hsic_connect, "HSIC Connect");
-+DWC_OTG_DEVICE_ATTR_BITFIELD_RW(inv_sel_hsic, "Invert Select HSIC");
-+
-+//DWC_OTG_DEVICE_ATTR_BITFIELD_RW(buspower,&(otg_dev->core_if->core_global_regs->gotgctl),(1<<8),8,"Mode");
-+//DWC_OTG_DEVICE_ATTR_BITFIELD_RW(bussuspend,&(otg_dev->core_if->core_global_regs->gotgctl),(1<<8),8,"Mode");
-+DWC_OTG_DEVICE_ATTR_BITFIELD_RO(busconnected, "Bus Connected");
-+
-+DWC_OTG_DEVICE_ATTR_REG32_RW(gotgctl, 0, "GOTGCTL");
-+DWC_OTG_DEVICE_ATTR_REG32_RW(gusbcfg,
-+			     &(otg_dev->core_if->core_global_regs->gusbcfg),
-+			     "GUSBCFG");
-+DWC_OTG_DEVICE_ATTR_REG32_RW(grxfsiz,
-+			     &(otg_dev->core_if->core_global_regs->grxfsiz),
-+			     "GRXFSIZ");
-+DWC_OTG_DEVICE_ATTR_REG32_RW(gnptxfsiz,
-+			     &(otg_dev->core_if->core_global_regs->gnptxfsiz),
-+			     "GNPTXFSIZ");
-+DWC_OTG_DEVICE_ATTR_REG32_RW(gpvndctl,
-+			     &(otg_dev->core_if->core_global_regs->gpvndctl),
-+			     "GPVNDCTL");
-+DWC_OTG_DEVICE_ATTR_REG32_RW(ggpio,
-+			     &(otg_dev->core_if->core_global_regs->ggpio),
-+			     "GGPIO");
-+DWC_OTG_DEVICE_ATTR_REG32_RW(guid, &(otg_dev->core_if->core_global_regs->guid),
-+			     "GUID");
-+DWC_OTG_DEVICE_ATTR_REG32_RO(gsnpsid,
-+			     &(otg_dev->core_if->core_global_regs->gsnpsid),
-+			     "GSNPSID");
-+DWC_OTG_DEVICE_ATTR_BITFIELD_RW(devspeed, "Device Speed");
-+DWC_OTG_DEVICE_ATTR_BITFIELD_RO(enumspeed, "Device Enumeration Speed");
-+
-+DWC_OTG_DEVICE_ATTR_REG32_RO(hptxfsiz,
-+			     &(otg_dev->core_if->core_global_regs->hptxfsiz),
-+			     "HPTXFSIZ");
-+DWC_OTG_DEVICE_ATTR_REG32_RW(hprt0, otg_dev->core_if->host_if->hprt0, "HPRT0");
-+
-+/**
-+ * @todo Add code to initiate the HNP.
-+ */
-+/**
-+ * Show the HNP status bit
-+ */
-+static ssize_t hnp_show(struct device *_dev,
-+			struct device_attribute *attr, char *buf)
-+{
-+        dwc_otg_device_t *otg_dev = dwc_otg_drvdev(_dev);
-+	return sprintf(buf, "HstNegScs = 0x%x\n",
-+		       dwc_otg_get_hnpstatus(otg_dev->core_if));
-+}
-+
-+/**
-+ * Set the HNP Request bit
-+ */
-+static ssize_t hnp_store(struct device *_dev,
-+			 struct device_attribute *attr,
-+			 const char *buf, size_t count)
-+{
-+        dwc_otg_device_t *otg_dev = dwc_otg_drvdev(_dev);
-+	uint32_t in = simple_strtoul(buf, NULL, 16);
-+	dwc_otg_set_hnpreq(otg_dev->core_if, in);
-+	return count;
-+}
-+
-+DEVICE_ATTR(hnp, 0644, hnp_show, hnp_store);
-+
-+/**
-+ * @todo Add code to initiate the SRP.
-+ */
-+/**
-+ * Show the SRP status bit
-+ */
-+static ssize_t srp_show(struct device *_dev,
-+			struct device_attribute *attr, char *buf)
-+{
-+#ifndef DWC_HOST_ONLY
-+        dwc_otg_device_t *otg_dev = dwc_otg_drvdev(_dev);
-+	return sprintf(buf, "SesReqScs = 0x%x\n",
-+		       dwc_otg_get_srpstatus(otg_dev->core_if));
-+#else
-+	return sprintf(buf, "Host Only Mode!\n");
-+#endif
-+}
-+
-+/**
-+ * Set the SRP Request bit
-+ */
-+static ssize_t srp_store(struct device *_dev,
-+			 struct device_attribute *attr,
-+			 const char *buf, size_t count)
-+{
-+#ifndef DWC_HOST_ONLY
-+        dwc_otg_device_t *otg_dev = dwc_otg_drvdev(_dev);
-+	dwc_otg_pcd_initiate_srp(otg_dev->pcd);
-+#endif
-+	return count;
-+}
-+
-+DEVICE_ATTR(srp, 0644, srp_show, srp_store);
-+
-+/**
-+ * @todo Need to do more for power on/off?
-+ */
-+/**
-+ * Show the Bus Power status
-+ */
-+static ssize_t buspower_show(struct device *_dev,
-+			     struct device_attribute *attr, char *buf)
-+{
-+        dwc_otg_device_t *otg_dev = dwc_otg_drvdev(_dev);
-+	return sprintf(buf, "Bus Power = 0x%x\n",
-+		       dwc_otg_get_prtpower(otg_dev->core_if));
-+}
-+
-+/**
-+ * Set the Bus Power status
-+ */
-+static ssize_t buspower_store(struct device *_dev,
-+			      struct device_attribute *attr,
-+			      const char *buf, size_t count)
-+{
-+        dwc_otg_device_t *otg_dev = dwc_otg_drvdev(_dev);
-+	uint32_t on = simple_strtoul(buf, NULL, 16);
-+	dwc_otg_set_prtpower(otg_dev->core_if, on);
-+	return count;
-+}
-+
-+DEVICE_ATTR(buspower, 0644, buspower_show, buspower_store);
-+
-+/**
-+ * @todo Need to do more for suspend?
-+ */
-+/**
-+ * Show the Bus Suspend status
-+ */
-+static ssize_t bussuspend_show(struct device *_dev,
-+			       struct device_attribute *attr, char *buf)
-+{
-+        dwc_otg_device_t *otg_dev = dwc_otg_drvdev(_dev);
-+	return sprintf(buf, "Bus Suspend = 0x%x\n",
-+		       dwc_otg_get_prtsuspend(otg_dev->core_if));
-+}
-+
-+/**
-+ * Set the Bus Suspend status
-+ */
-+static ssize_t bussuspend_store(struct device *_dev,
-+				struct device_attribute *attr,
-+				const char *buf, size_t count)
-+{
-+        dwc_otg_device_t *otg_dev = dwc_otg_drvdev(_dev);
-+	uint32_t in = simple_strtoul(buf, NULL, 16);
-+	dwc_otg_set_prtsuspend(otg_dev->core_if, in);
-+	return count;
-+}
-+
-+DEVICE_ATTR(bussuspend, 0644, bussuspend_show, bussuspend_store);
-+
-+/**
-+ * Show the Mode Change Ready Timer status
-+ */
-+static ssize_t mode_ch_tim_en_show(struct device *_dev,
-+				   struct device_attribute *attr, char *buf)
-+{
-+        dwc_otg_device_t *otg_dev = dwc_otg_drvdev(_dev);
-+	return sprintf(buf, "Mode Change Ready Timer Enable = 0x%x\n",
-+		       dwc_otg_get_mode_ch_tim(otg_dev->core_if));
-+}
-+
-+/**
-+ * Set the Mode Change Ready Timer status
-+ */
-+static ssize_t mode_ch_tim_en_store(struct device *_dev,
-+				    struct device_attribute *attr,
-+				    const char *buf, size_t count)
-+{
-+        dwc_otg_device_t *otg_dev = dwc_otg_drvdev(_dev);
-+	uint32_t in = simple_strtoul(buf, NULL, 16);
-+	dwc_otg_set_mode_ch_tim(otg_dev->core_if, in);
-+	return count;
-+}
-+
-+DEVICE_ATTR(mode_ch_tim_en, 0644, mode_ch_tim_en_show, mode_ch_tim_en_store);
-+
-+/**
-+ * Show the value of HFIR Frame Interval bitfield
-+ */
-+static ssize_t fr_interval_show(struct device *_dev,
-+				struct device_attribute *attr, char *buf)
-+{
-+        dwc_otg_device_t *otg_dev = dwc_otg_drvdev(_dev);
-+	return sprintf(buf, "Frame Interval = 0x%x\n",
-+		       dwc_otg_get_fr_interval(otg_dev->core_if));
-+}
-+
-+/**
-+ * Set the HFIR Frame Interval value
-+ */
-+static ssize_t fr_interval_store(struct device *_dev,
-+				 struct device_attribute *attr,
-+				 const char *buf, size_t count)
-+{
-+        dwc_otg_device_t *otg_dev = dwc_otg_drvdev(_dev);
-+	uint32_t in = simple_strtoul(buf, NULL, 10);
-+	dwc_otg_set_fr_interval(otg_dev->core_if, in);
-+	return count;
-+}
-+
-+DEVICE_ATTR(fr_interval, 0644, fr_interval_show, fr_interval_store);
-+
-+/**
-+ * Show the status of Remote Wakeup.
-+ */
-+static ssize_t remote_wakeup_show(struct device *_dev,
-+				  struct device_attribute *attr, char *buf)
-+{
-+#ifndef DWC_HOST_ONLY
-+        dwc_otg_device_t *otg_dev = dwc_otg_drvdev(_dev);
-+
-+	return sprintf(buf,
-+		       "Remote Wakeup Sig = %d Enabled = %d LPM Remote Wakeup = %d\n",
-+		       dwc_otg_get_remotewakesig(otg_dev->core_if),
-+		       dwc_otg_pcd_get_rmwkup_enable(otg_dev->pcd),
-+		       dwc_otg_get_lpm_remotewakeenabled(otg_dev->core_if));
-+#else
-+	return sprintf(buf, "Host Only Mode!\n");
-+#endif /* DWC_HOST_ONLY */
-+}
-+
-+/**
-+ * Initiate a remote wakeup of the host.  The Device control register
-+ * Remote Wakeup Signal bit is written if the PCD Remote wakeup enable
-+ * flag is set.
-+ *
-+ */
-+static ssize_t remote_wakeup_store(struct device *_dev,
-+				   struct device_attribute *attr,
-+				   const char *buf, size_t count)
-+{
-+#ifndef DWC_HOST_ONLY
-+        dwc_otg_device_t *otg_dev = dwc_otg_drvdev(_dev);
-+	uint32_t val = simple_strtoul(buf, NULL, 16);
-+
-+	if (val & 1) {
-+		dwc_otg_pcd_remote_wakeup(otg_dev->pcd, 1);
-+	} else {
-+		dwc_otg_pcd_remote_wakeup(otg_dev->pcd, 0);
-+	}
-+#endif /* DWC_HOST_ONLY */
-+	return count;
-+}
-+
-+DEVICE_ATTR(remote_wakeup, S_IRUGO | S_IWUSR, remote_wakeup_show,
-+	    remote_wakeup_store);
-+
-+/**
-+ * Show the whether core is hibernated or not.
-+ */
-+static ssize_t rem_wakeup_pwrdn_show(struct device *_dev,
-+				     struct device_attribute *attr, char *buf)
-+{
-+#ifndef DWC_HOST_ONLY
-+        dwc_otg_device_t *otg_dev = dwc_otg_drvdev(_dev);
-+
-+	if (dwc_otg_get_core_state(otg_dev->core_if)) {
-+		DWC_PRINTF("Core is in hibernation\n");
-+	} else {
-+		DWC_PRINTF("Core is not in hibernation\n");
-+	}
-+#endif /* DWC_HOST_ONLY */
-+	return 0;
-+}
-+
-+extern int dwc_otg_device_hibernation_restore(dwc_otg_core_if_t * core_if,
-+					      int rem_wakeup, int reset);
-+
-+/**
-+ * Initiate a remote wakeup of the device to exit from hibernation.
-+ */
-+static ssize_t rem_wakeup_pwrdn_store(struct device *_dev,
-+				      struct device_attribute *attr,
-+				      const char *buf, size_t count)
-+{
-+#ifndef DWC_HOST_ONLY
-+        dwc_otg_device_t *otg_dev = dwc_otg_drvdev(_dev);
-+	dwc_otg_device_hibernation_restore(otg_dev->core_if, 1, 0);
-+#endif
-+	return count;
-+}
-+
-+DEVICE_ATTR(rem_wakeup_pwrdn, S_IRUGO | S_IWUSR, rem_wakeup_pwrdn_show,
-+	    rem_wakeup_pwrdn_store);
-+
-+static ssize_t disconnect_us(struct device *_dev,
-+			     struct device_attribute *attr,
-+			     const char *buf, size_t count)
-+{
-+
-+#ifndef DWC_HOST_ONLY
-+        dwc_otg_device_t *otg_dev = dwc_otg_drvdev(_dev);
-+	uint32_t val = simple_strtoul(buf, NULL, 16);
-+	DWC_PRINTF("The Passed value is %04x\n", val);
-+
-+	dwc_otg_pcd_disconnect_us(otg_dev->pcd, 50);
-+
-+#endif /* DWC_HOST_ONLY */
-+	return count;
-+}
-+
-+DEVICE_ATTR(disconnect_us, S_IWUSR, 0, disconnect_us);
-+
-+/**
-+ * Dump global registers and either host or device registers (depending on the
-+ * current mode of the core).
-+ */
-+static ssize_t regdump_show(struct device *_dev,
-+			    struct device_attribute *attr, char *buf)
-+{
-+        dwc_otg_device_t *otg_dev = dwc_otg_drvdev(_dev);
-+
-+	dwc_otg_dump_global_registers(otg_dev->core_if);
-+	if (dwc_otg_is_host_mode(otg_dev->core_if)) {
-+		dwc_otg_dump_host_registers(otg_dev->core_if);
-+	} else {
-+		dwc_otg_dump_dev_registers(otg_dev->core_if);
-+
-+	}
-+	return sprintf(buf, "Register Dump\n");
-+}
-+
-+DEVICE_ATTR(regdump, S_IRUGO, regdump_show, 0);
-+
-+/**
-+ * Dump global registers and either host or device registers (depending on the
-+ * current mode of the core).
-+ */
-+static ssize_t spramdump_show(struct device *_dev,
-+			      struct device_attribute *attr, char *buf)
-+{
-+#if 0
-+	dwc_otg_device_t *otg_dev = dwc_otg_drvdev(_dev);
-+
-+	dwc_otg_dump_spram(otg_dev->core_if);
-+#endif
-+
-+	return sprintf(buf, "SPRAM Dump\n");
-+}
-+
-+DEVICE_ATTR(spramdump, S_IRUGO, spramdump_show, 0);
-+
-+/**
-+ * Dump the current hcd state.
-+ */
-+static ssize_t hcddump_show(struct device *_dev,
-+			    struct device_attribute *attr, char *buf)
-+{
-+#ifndef DWC_DEVICE_ONLY
-+        dwc_otg_device_t *otg_dev = dwc_otg_drvdev(_dev);
-+	dwc_otg_hcd_dump_state(otg_dev->hcd);
-+#endif /* DWC_DEVICE_ONLY */
-+	return sprintf(buf, "HCD Dump\n");
-+}
-+
-+DEVICE_ATTR(hcddump, S_IRUGO, hcddump_show, 0);
-+
-+/**
-+ * Dump the average frame remaining at SOF. This can be used to
-+ * determine average interrupt latency. Frame remaining is also shown for
-+ * start transfer and two additional sample points.
-+ */
-+static ssize_t hcd_frrem_show(struct device *_dev,
-+			      struct device_attribute *attr, char *buf)
-+{
-+#ifndef DWC_DEVICE_ONLY
-+        dwc_otg_device_t *otg_dev = dwc_otg_drvdev(_dev);
-+
-+	dwc_otg_hcd_dump_frrem(otg_dev->hcd);
-+#endif /* DWC_DEVICE_ONLY */
-+	return sprintf(buf, "HCD Dump Frame Remaining\n");
-+}
-+
-+DEVICE_ATTR(hcd_frrem, S_IRUGO, hcd_frrem_show, 0);
-+
-+/**
-+ * Displays the time required to read the GNPTXFSIZ register many times (the
-+ * output shows the number of times the register is read).
-+ */
-+#define RW_REG_COUNT 10000000
-+#define MSEC_PER_JIFFIE 1000/HZ
-+static ssize_t rd_reg_test_show(struct device *_dev,
-+				struct device_attribute *attr, char *buf)
-+{
-+        dwc_otg_device_t *otg_dev = dwc_otg_drvdev(_dev);
-+	int i;
-+	int time;
-+	int start_jiffies;
-+
-+	printk("HZ %d, MSEC_PER_JIFFIE %d, loops_per_jiffy %lu\n",
-+	       HZ, MSEC_PER_JIFFIE, loops_per_jiffy);
-+	start_jiffies = jiffies;
-+	for (i = 0; i < RW_REG_COUNT; i++) {
-+		dwc_otg_get_gnptxfsiz(otg_dev->core_if);
-+	}
-+	time = jiffies - start_jiffies;
-+	return sprintf(buf,
-+		       "Time to read GNPTXFSIZ reg %d times: %d msecs (%d jiffies)\n",
-+		       RW_REG_COUNT, time * MSEC_PER_JIFFIE, time);
-+}
-+
-+DEVICE_ATTR(rd_reg_test, S_IRUGO, rd_reg_test_show, 0);
-+
-+/**
-+ * Displays the time required to write the GNPTXFSIZ register many times (the
-+ * output shows the number of times the register is written).
-+ */
-+static ssize_t wr_reg_test_show(struct device *_dev,
-+				struct device_attribute *attr, char *buf)
-+{
-+        dwc_otg_device_t *otg_dev = dwc_otg_drvdev(_dev);
-+	uint32_t reg_val;
-+	int i;
-+	int time;
-+	int start_jiffies;
-+
-+	printk("HZ %d, MSEC_PER_JIFFIE %d, loops_per_jiffy %lu\n",
-+	       HZ, MSEC_PER_JIFFIE, loops_per_jiffy);
-+	reg_val = dwc_otg_get_gnptxfsiz(otg_dev->core_if);
-+	start_jiffies = jiffies;
-+	for (i = 0; i < RW_REG_COUNT; i++) {
-+		dwc_otg_set_gnptxfsiz(otg_dev->core_if, reg_val);
-+	}
-+	time = jiffies - start_jiffies;
-+	return sprintf(buf,
-+		       "Time to write GNPTXFSIZ reg %d times: %d msecs (%d jiffies)\n",
-+		       RW_REG_COUNT, time * MSEC_PER_JIFFIE, time);
-+}
-+
-+DEVICE_ATTR(wr_reg_test, S_IRUGO, wr_reg_test_show, 0);
-+
-+#ifdef CONFIG_USB_DWC_OTG_LPM
-+
-+/**
-+* Show the lpm_response attribute.
-+*/
-+static ssize_t lpmresp_show(struct device *_dev,
-+			    struct device_attribute *attr, char *buf)
-+{
-+        dwc_otg_device_t *otg_dev = dwc_otg_drvdev(_dev);
-+
-+	if (!dwc_otg_get_param_lpm_enable(otg_dev->core_if))
-+		return sprintf(buf, "** LPM is DISABLED **\n");
-+
-+	if (!dwc_otg_is_device_mode(otg_dev->core_if)) {
-+		return sprintf(buf, "** Current mode is not device mode\n");
-+	}
-+	return sprintf(buf, "lpm_response = %d\n",
-+		       dwc_otg_get_lpmresponse(otg_dev->core_if));
-+}
-+
-+/**
-+* Store the lpm_response attribute.
-+*/
-+static ssize_t lpmresp_store(struct device *_dev,
-+			     struct device_attribute *attr,
-+			     const char *buf, size_t count)
-+{
-+        dwc_otg_device_t *otg_dev = dwc_otg_drvdev(_dev);
-+	uint32_t val = simple_strtoul(buf, NULL, 16);
-+
-+	if (!dwc_otg_get_param_lpm_enable(otg_dev->core_if)) {
-+		return 0;
-+	}
-+
-+	if (!dwc_otg_is_device_mode(otg_dev->core_if)) {
-+		return 0;
-+	}
-+
-+	dwc_otg_set_lpmresponse(otg_dev->core_if, val);
-+	return count;
-+}
-+
-+DEVICE_ATTR(lpm_response, S_IRUGO | S_IWUSR, lpmresp_show, lpmresp_store);
-+
-+/**
-+* Show the sleep_status attribute.
-+*/
-+static ssize_t sleepstatus_show(struct device *_dev,
-+				struct device_attribute *attr, char *buf)
-+{
-+        dwc_otg_device_t *otg_dev = dwc_otg_drvdev(_dev);
-+	return sprintf(buf, "Sleep Status = %d\n",
-+		       dwc_otg_get_lpm_portsleepstatus(otg_dev->core_if));
-+}
-+
-+/**
-+ * Store the sleep_status attribure.
-+ */
-+static ssize_t sleepstatus_store(struct device *_dev,
-+				 struct device_attribute *attr,
-+				 const char *buf, size_t count)
-+{
-+        dwc_otg_device_t *otg_dev = dwc_otg_drvdev(_dev);
-+	dwc_otg_core_if_t *core_if = otg_dev->core_if;
-+
-+	if (dwc_otg_get_lpm_portsleepstatus(otg_dev->core_if)) {
-+		if (dwc_otg_is_host_mode(core_if)) {
-+
-+			DWC_PRINTF("Host initiated resume\n");
-+			dwc_otg_set_prtresume(otg_dev->core_if, 1);
-+		}
-+	}
-+
-+	return count;
-+}
-+
-+DEVICE_ATTR(sleep_status, S_IRUGO | S_IWUSR, sleepstatus_show,
-+	    sleepstatus_store);
-+
-+#endif /* CONFIG_USB_DWC_OTG_LPM_ENABLE */
-+
-+/**@}*/
-+
-+/**
-+ * Create the device files
-+ */
-+void dwc_otg_attr_create(
-+#ifdef LM_INTERFACE
-+	struct lm_device *dev
-+#elif  defined(PCI_INTERFACE)
-+	struct pci_dev *dev
-+#elif  defined(PLATFORM_INTERFACE)
-+        struct platform_device *dev
-+#endif
-+    )
-+{
-+	int error;
-+
-+	error = device_create_file(&dev->dev, &dev_attr_regoffset);
-+	error = device_create_file(&dev->dev, &dev_attr_regvalue);
-+	error = device_create_file(&dev->dev, &dev_attr_mode);
-+	error = device_create_file(&dev->dev, &dev_attr_hnpcapable);
-+	error = device_create_file(&dev->dev, &dev_attr_srpcapable);
-+	error = device_create_file(&dev->dev, &dev_attr_hsic_connect);
-+	error = device_create_file(&dev->dev, &dev_attr_inv_sel_hsic);
-+	error = device_create_file(&dev->dev, &dev_attr_hnp);
-+	error = device_create_file(&dev->dev, &dev_attr_srp);
-+	error = device_create_file(&dev->dev, &dev_attr_buspower);
-+	error = device_create_file(&dev->dev, &dev_attr_bussuspend);
-+	error = device_create_file(&dev->dev, &dev_attr_mode_ch_tim_en);
-+	error = device_create_file(&dev->dev, &dev_attr_fr_interval);
-+	error = device_create_file(&dev->dev, &dev_attr_busconnected);
-+	error = device_create_file(&dev->dev, &dev_attr_gotgctl);
-+	error = device_create_file(&dev->dev, &dev_attr_gusbcfg);
-+	error = device_create_file(&dev->dev, &dev_attr_grxfsiz);
-+	error = device_create_file(&dev->dev, &dev_attr_gnptxfsiz);
-+	error = device_create_file(&dev->dev, &dev_attr_gpvndctl);
-+	error = device_create_file(&dev->dev, &dev_attr_ggpio);
-+	error = device_create_file(&dev->dev, &dev_attr_guid);
-+	error = device_create_file(&dev->dev, &dev_attr_gsnpsid);
-+	error = device_create_file(&dev->dev, &dev_attr_devspeed);
-+	error = device_create_file(&dev->dev, &dev_attr_enumspeed);
-+	error = device_create_file(&dev->dev, &dev_attr_hptxfsiz);
-+	error = device_create_file(&dev->dev, &dev_attr_hprt0);
-+	error = device_create_file(&dev->dev, &dev_attr_remote_wakeup);
-+	error = device_create_file(&dev->dev, &dev_attr_rem_wakeup_pwrdn);
-+	error = device_create_file(&dev->dev, &dev_attr_disconnect_us);
-+	error = device_create_file(&dev->dev, &dev_attr_regdump);
-+	error = device_create_file(&dev->dev, &dev_attr_spramdump);
-+	error = device_create_file(&dev->dev, &dev_attr_hcddump);
-+	error = device_create_file(&dev->dev, &dev_attr_hcd_frrem);
-+	error = device_create_file(&dev->dev, &dev_attr_rd_reg_test);
-+	error = device_create_file(&dev->dev, &dev_attr_wr_reg_test);
-+#ifdef CONFIG_USB_DWC_OTG_LPM
-+	error = device_create_file(&dev->dev, &dev_attr_lpm_response);
-+	error = device_create_file(&dev->dev, &dev_attr_sleep_status);
-+#endif
-+}
-+
-+/**
-+ * Remove the device files
-+ */
-+void dwc_otg_attr_remove(
-+#ifdef LM_INTERFACE
-+	struct lm_device *dev
-+#elif  defined(PCI_INTERFACE)
-+	struct pci_dev *dev
-+#elif  defined(PLATFORM_INTERFACE)
-+	struct platform_device *dev
-+#endif
-+    )
-+{
-+	device_remove_file(&dev->dev, &dev_attr_regoffset);
-+	device_remove_file(&dev->dev, &dev_attr_regvalue);
-+	device_remove_file(&dev->dev, &dev_attr_mode);
-+	device_remove_file(&dev->dev, &dev_attr_hnpcapable);
-+	device_remove_file(&dev->dev, &dev_attr_srpcapable);
-+	device_remove_file(&dev->dev, &dev_attr_hsic_connect);
-+	device_remove_file(&dev->dev, &dev_attr_inv_sel_hsic);
-+	device_remove_file(&dev->dev, &dev_attr_hnp);
-+	device_remove_file(&dev->dev, &dev_attr_srp);
-+	device_remove_file(&dev->dev, &dev_attr_buspower);
-+	device_remove_file(&dev->dev, &dev_attr_bussuspend);
-+	device_remove_file(&dev->dev, &dev_attr_mode_ch_tim_en);
-+	device_remove_file(&dev->dev, &dev_attr_fr_interval);
-+	device_remove_file(&dev->dev, &dev_attr_busconnected);
-+	device_remove_file(&dev->dev, &dev_attr_gotgctl);
-+	device_remove_file(&dev->dev, &dev_attr_gusbcfg);
-+	device_remove_file(&dev->dev, &dev_attr_grxfsiz);
-+	device_remove_file(&dev->dev, &dev_attr_gnptxfsiz);
-+	device_remove_file(&dev->dev, &dev_attr_gpvndctl);
-+	device_remove_file(&dev->dev, &dev_attr_ggpio);
-+	device_remove_file(&dev->dev, &dev_attr_guid);
-+	device_remove_file(&dev->dev, &dev_attr_gsnpsid);
-+	device_remove_file(&dev->dev, &dev_attr_devspeed);
-+	device_remove_file(&dev->dev, &dev_attr_enumspeed);
-+	device_remove_file(&dev->dev, &dev_attr_hptxfsiz);
-+	device_remove_file(&dev->dev, &dev_attr_hprt0);
-+	device_remove_file(&dev->dev, &dev_attr_remote_wakeup);
-+	device_remove_file(&dev->dev, &dev_attr_rem_wakeup_pwrdn);
-+	device_remove_file(&dev->dev, &dev_attr_disconnect_us);
-+	device_remove_file(&dev->dev, &dev_attr_regdump);
-+	device_remove_file(&dev->dev, &dev_attr_spramdump);
-+	device_remove_file(&dev->dev, &dev_attr_hcddump);
-+	device_remove_file(&dev->dev, &dev_attr_hcd_frrem);
-+	device_remove_file(&dev->dev, &dev_attr_rd_reg_test);
-+	device_remove_file(&dev->dev, &dev_attr_wr_reg_test);
-+#ifdef CONFIG_USB_DWC_OTG_LPM
-+	device_remove_file(&dev->dev, &dev_attr_lpm_response);
-+	device_remove_file(&dev->dev, &dev_attr_sleep_status);
-+#endif
-+}
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_attr.h
-@@ -0,0 +1,89 @@
-+/* ==========================================================================
-+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.h $
-+ * $Revision: #13 $
-+ * $Date: 2010/06/21 $
-+ * $Change: 1532021 $
-+ *
-+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
-+ * "Software") is an Unsupported proprietary work of Synopsys, Inc. unless
-+ * otherwise expressly agreed to in writing between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product under
-+ * any End User Software License Agreement or Agreement for Licensed Product
-+ * with Synopsys or any supplement thereto. You are permitted to use and
-+ * redistribute this Software in source and binary forms, with or without
-+ * modification, provided that redistributions of source code must retain this
-+ * notice. You may not view, use, disclose, copy or distribute this file or
-+ * any information contained herein except pursuant to this license grant from
-+ * Synopsys. If you do not agree with this notice, including the disclaimer
-+ * below, then you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" BASIS
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS BE LIABLE FOR ANY DIRECT,
-+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================== */
-+
-+#if !defined(__DWC_OTG_ATTR_H__)
-+#define __DWC_OTG_ATTR_H__
-+
-+/** @file
-+ * This file contains the interface to the Linux device attributes.
-+ */
-+extern struct device_attribute dev_attr_regoffset;
-+extern struct device_attribute dev_attr_regvalue;
-+
-+extern struct device_attribute dev_attr_mode;
-+extern struct device_attribute dev_attr_hnpcapable;
-+extern struct device_attribute dev_attr_srpcapable;
-+extern struct device_attribute dev_attr_hnp;
-+extern struct device_attribute dev_attr_srp;
-+extern struct device_attribute dev_attr_buspower;
-+extern struct device_attribute dev_attr_bussuspend;
-+extern struct device_attribute dev_attr_mode_ch_tim_en;
-+extern struct device_attribute dev_attr_fr_interval;
-+extern struct device_attribute dev_attr_busconnected;
-+extern struct device_attribute dev_attr_gotgctl;
-+extern struct device_attribute dev_attr_gusbcfg;
-+extern struct device_attribute dev_attr_grxfsiz;
-+extern struct device_attribute dev_attr_gnptxfsiz;
-+extern struct device_attribute dev_attr_gpvndctl;
-+extern struct device_attribute dev_attr_ggpio;
-+extern struct device_attribute dev_attr_guid;
-+extern struct device_attribute dev_attr_gsnpsid;
-+extern struct device_attribute dev_attr_devspeed;
-+extern struct device_attribute dev_attr_enumspeed;
-+extern struct device_attribute dev_attr_hptxfsiz;
-+extern struct device_attribute dev_attr_hprt0;
-+#ifdef CONFIG_USB_DWC_OTG_LPM
-+extern struct device_attribute dev_attr_lpm_response;
-+extern struct device_attribute devi_attr_sleep_status;
-+#endif
-+
-+void dwc_otg_attr_create(
-+#ifdef LM_INTERFACE
-+				struct lm_device *dev
-+#elif  defined(PCI_INTERFACE)
-+				struct pci_dev *dev
-+#elif  defined(PLATFORM_INTERFACE)
-+	struct platform_device *dev
-+#endif
-+    );
-+
-+void dwc_otg_attr_remove(
-+#ifdef LM_INTERFACE
-+				struct lm_device *dev
-+#elif  defined(PCI_INTERFACE)
-+				struct pci_dev *dev
-+#elif  defined(PLATFORM_INTERFACE)
-+	struct platform_device *dev
-+#endif
-+    );
-+#endif
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_cfi.c
-@@ -0,0 +1,1876 @@
-+/* ==========================================================================
-+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
-+ * "Software") is an Unsupported proprietary work of Synopsys, Inc. unless
-+ * otherwise expressly agreed to in writing between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product under
-+ * any End User Software License Agreement or Agreement for Licensed Product
-+ * with Synopsys or any supplement thereto. You are permitted to use and
-+ * redistribute this Software in source and binary forms, with or without
-+ * modification, provided that redistributions of source code must retain this
-+ * notice. You may not view, use, disclose, copy or distribute this file or
-+ * any information contained herein except pursuant to this license grant from
-+ * Synopsys. If you do not agree with this notice, including the disclaimer
-+ * below, then you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" BASIS
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS BE LIABLE FOR ANY DIRECT,
-+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================== */
-+
-+/** @file
-+ *
-+ * This file contains the most of the CFI(Core Feature Interface)
-+ * implementation for the OTG.
-+ */
-+
-+#ifdef DWC_UTE_CFI
-+
-+#include "dwc_otg_pcd.h"
-+#include "dwc_otg_cfi.h"
-+
-+/** This definition should actually migrate to the Portability Library */
-+#define DWC_CONSTANT_CPU_TO_LE16(x) (x)
-+
-+extern dwc_otg_pcd_ep_t *get_ep_by_addr(dwc_otg_pcd_t * pcd, u16 wIndex);
-+
-+static int cfi_core_features_buf(uint8_t * buf, uint16_t buflen);
-+static int cfi_get_feature_value(uint8_t * buf, uint16_t buflen,
-+				 struct dwc_otg_pcd *pcd,
-+				 struct cfi_usb_ctrlrequest *ctrl_req);
-+static int cfi_set_feature_value(struct dwc_otg_pcd *pcd);
-+static int cfi_ep_get_sg_val(uint8_t * buf, struct dwc_otg_pcd *pcd,
-+			     struct cfi_usb_ctrlrequest *req);
-+static int cfi_ep_get_concat_val(uint8_t * buf, struct dwc_otg_pcd *pcd,
-+				 struct cfi_usb_ctrlrequest *req);
-+static int cfi_ep_get_align_val(uint8_t * buf, struct dwc_otg_pcd *pcd,
-+				struct cfi_usb_ctrlrequest *req);
-+static int cfi_preproc_reset(struct dwc_otg_pcd *pcd,
-+			     struct cfi_usb_ctrlrequest *req);
-+static void cfi_free_ep_bs_dyn_data(cfi_ep_t * cfiep);
-+
-+static uint16_t get_dfifo_size(dwc_otg_core_if_t * core_if);
-+static int32_t get_rxfifo_size(dwc_otg_core_if_t * core_if, uint16_t wValue);
-+static int32_t get_txfifo_size(struct dwc_otg_pcd *pcd, uint16_t wValue);
-+
-+static uint8_t resize_fifos(dwc_otg_core_if_t * core_if);
-+
-+/** This is the header of the all features descriptor */
-+static cfi_all_features_header_t all_props_desc_header = {
-+	.wVersion = DWC_CONSTANT_CPU_TO_LE16(0x100),
-+	.wCoreID = DWC_CONSTANT_CPU_TO_LE16(CFI_CORE_ID_OTG),
-+	.wNumFeatures = DWC_CONSTANT_CPU_TO_LE16(9),
-+};
-+
-+/** This is an array of statically allocated feature descriptors */
-+static cfi_feature_desc_header_t prop_descs[] = {
-+
-+	/* FT_ID_DMA_MODE */
-+	{
-+	 .wFeatureID = DWC_CONSTANT_CPU_TO_LE16(FT_ID_DMA_MODE),
-+	 .bmAttributes = CFI_FEATURE_ATTR_RW,
-+	 .wDataLength = DWC_CONSTANT_CPU_TO_LE16(1),
-+	 },
-+
-+	/* FT_ID_DMA_BUFFER_SETUP */
-+	{
-+	 .wFeatureID = DWC_CONSTANT_CPU_TO_LE16(FT_ID_DMA_BUFFER_SETUP),
-+	 .bmAttributes = CFI_FEATURE_ATTR_RW,
-+	 .wDataLength = DWC_CONSTANT_CPU_TO_LE16(6),
-+	 },
-+
-+	/* FT_ID_DMA_BUFF_ALIGN */
-+	{
-+	 .wFeatureID = DWC_CONSTANT_CPU_TO_LE16(FT_ID_DMA_BUFF_ALIGN),
-+	 .bmAttributes = CFI_FEATURE_ATTR_RW,
-+	 .wDataLength = DWC_CONSTANT_CPU_TO_LE16(2),
-+	 },
-+
-+	/* FT_ID_DMA_CONCAT_SETUP */
-+	{
-+	 .wFeatureID = DWC_CONSTANT_CPU_TO_LE16(FT_ID_DMA_CONCAT_SETUP),
-+	 .bmAttributes = CFI_FEATURE_ATTR_RW,
-+	 //.wDataLength  = DWC_CONSTANT_CPU_TO_LE16(6),
-+	 },
-+
-+	/* FT_ID_DMA_CIRCULAR */
-+	{
-+	 .wFeatureID = DWC_CONSTANT_CPU_TO_LE16(FT_ID_DMA_CIRCULAR),
-+	 .bmAttributes = CFI_FEATURE_ATTR_RW,
-+	 .wDataLength = DWC_CONSTANT_CPU_TO_LE16(6),
-+	 },
-+
-+	/* FT_ID_THRESHOLD_SETUP */
-+	{
-+	 .wFeatureID = DWC_CONSTANT_CPU_TO_LE16(FT_ID_THRESHOLD_SETUP),
-+	 .bmAttributes = CFI_FEATURE_ATTR_RW,
-+	 .wDataLength = DWC_CONSTANT_CPU_TO_LE16(6),
-+	 },
-+
-+	/* FT_ID_DFIFO_DEPTH */
-+	{
-+	 .wFeatureID = DWC_CONSTANT_CPU_TO_LE16(FT_ID_DFIFO_DEPTH),
-+	 .bmAttributes = CFI_FEATURE_ATTR_RO,
-+	 .wDataLength = DWC_CONSTANT_CPU_TO_LE16(2),
-+	 },
-+
-+	/* FT_ID_TX_FIFO_DEPTH */
-+	{
-+	 .wFeatureID = DWC_CONSTANT_CPU_TO_LE16(FT_ID_TX_FIFO_DEPTH),
-+	 .bmAttributes = CFI_FEATURE_ATTR_RW,
-+	 .wDataLength = DWC_CONSTANT_CPU_TO_LE16(2),
-+	 },
-+
-+	/* FT_ID_RX_FIFO_DEPTH */
-+	{
-+	 .wFeatureID = DWC_CONSTANT_CPU_TO_LE16(FT_ID_RX_FIFO_DEPTH),
-+	 .bmAttributes = CFI_FEATURE_ATTR_RW,
-+	 .wDataLength = DWC_CONSTANT_CPU_TO_LE16(2),
-+	 }
-+};
-+
-+/** The table of feature names */
-+cfi_string_t prop_name_table[] = {
-+	{FT_ID_DMA_MODE, "dma_mode"},
-+	{FT_ID_DMA_BUFFER_SETUP, "buffer_setup"},
-+	{FT_ID_DMA_BUFF_ALIGN, "buffer_align"},
-+	{FT_ID_DMA_CONCAT_SETUP, "concat_setup"},
-+	{FT_ID_DMA_CIRCULAR, "buffer_circular"},
-+	{FT_ID_THRESHOLD_SETUP, "threshold_setup"},
-+	{FT_ID_DFIFO_DEPTH, "dfifo_depth"},
-+	{FT_ID_TX_FIFO_DEPTH, "txfifo_depth"},
-+	{FT_ID_RX_FIFO_DEPTH, "rxfifo_depth"},
-+	{}
-+};
-+
-+/************************************************************************/
-+
-+/**
-+ * Returns the name of the feature by its ID
-+ * or NULL if no featute ID matches.
-+ *
-+ */
-+const uint8_t *get_prop_name(uint16_t prop_id, int *len)
-+{
-+	cfi_string_t *pstr;
-+	*len = 0;
-+
-+	for (pstr = prop_name_table; pstr && pstr->s; pstr++) {
-+		if (pstr->id == prop_id) {
-+			*len = DWC_STRLEN(pstr->s);
-+			return pstr->s;
-+		}
-+	}
-+	return NULL;
-+}
-+
-+/**
-+ * This function handles all CFI specific control requests.
-+ *
-+ * Return a negative value to stall the DCE.
-+ */
-+int cfi_setup(struct dwc_otg_pcd *pcd, struct cfi_usb_ctrlrequest *ctrl)
-+{
-+	int retval = 0;
-+	dwc_otg_pcd_ep_t *ep = NULL;
-+	cfiobject_t *cfi = pcd->cfi;
-+	struct dwc_otg_core_if *coreif = GET_CORE_IF(pcd);
-+	uint16_t wLen = DWC_LE16_TO_CPU(&ctrl->wLength);
-+	uint16_t wValue = DWC_LE16_TO_CPU(&ctrl->wValue);
-+	uint16_t wIndex = DWC_LE16_TO_CPU(&ctrl->wIndex);
-+	uint32_t regaddr = 0;
-+	uint32_t regval = 0;
-+
-+	/* Save this Control Request in the CFI object.
-+	 * The data field will be assigned in the data stage completion CB function.
-+	 */
-+	cfi->ctrl_req = *ctrl;
-+	cfi->ctrl_req.data = NULL;
-+
-+	cfi->need_gadget_att = 0;
-+	cfi->need_status_in_complete = 0;
-+
-+	switch (ctrl->bRequest) {
-+	case VEN_CORE_GET_FEATURES:
-+		retval = cfi_core_features_buf(cfi->buf_in.buf, CFI_IN_BUF_LEN);
-+		if (retval >= 0) {
-+			//dump_msg(cfi->buf_in.buf, retval);
-+			ep = &pcd->ep0;
-+
-+			retval = min((uint16_t) retval, wLen);
-+			/* Transfer this buffer to the host through the EP0-IN EP */
-+			ep->dwc_ep.dma_addr = cfi->buf_in.addr;
-+			ep->dwc_ep.start_xfer_buff = cfi->buf_in.buf;
-+			ep->dwc_ep.xfer_buff = cfi->buf_in.buf;
-+			ep->dwc_ep.xfer_len = retval;
-+			ep->dwc_ep.xfer_count = 0;
-+			ep->dwc_ep.sent_zlp = 0;
-+			ep->dwc_ep.total_len = ep->dwc_ep.xfer_len;
-+
-+			pcd->ep0_pending = 1;
-+			dwc_otg_ep0_start_transfer(coreif, &ep->dwc_ep);
-+		}
-+		retval = 0;
-+		break;
-+
-+	case VEN_CORE_GET_FEATURE:
-+		CFI_INFO("VEN_CORE_GET_FEATURE\n");
-+		retval = cfi_get_feature_value(cfi->buf_in.buf, CFI_IN_BUF_LEN,
-+					       pcd, ctrl);
-+		if (retval >= 0) {
-+			ep = &pcd->ep0;
-+
-+			retval = min((uint16_t) retval, wLen);
-+			/* Transfer this buffer to the host through the EP0-IN EP */
-+			ep->dwc_ep.dma_addr = cfi->buf_in.addr;
-+			ep->dwc_ep.start_xfer_buff = cfi->buf_in.buf;
-+			ep->dwc_ep.xfer_buff = cfi->buf_in.buf;
-+			ep->dwc_ep.xfer_len = retval;
-+			ep->dwc_ep.xfer_count = 0;
-+			ep->dwc_ep.sent_zlp = 0;
-+			ep->dwc_ep.total_len = ep->dwc_ep.xfer_len;
-+
-+			pcd->ep0_pending = 1;
-+			dwc_otg_ep0_start_transfer(coreif, &ep->dwc_ep);
-+		}
-+		CFI_INFO("VEN_CORE_GET_FEATURE=%d\n", retval);
-+		dump_msg(cfi->buf_in.buf, retval);
-+		break;
-+
-+	case VEN_CORE_SET_FEATURE:
-+		CFI_INFO("VEN_CORE_SET_FEATURE\n");
-+		/* Set up an XFER to get the data stage of the control request,
-+		 * which is the new value of the feature to be modified.
-+		 */
-+		ep = &pcd->ep0;
-+		ep->dwc_ep.is_in = 0;
-+		ep->dwc_ep.dma_addr = cfi->buf_out.addr;
-+		ep->dwc_ep.start_xfer_buff = cfi->buf_out.buf;
-+		ep->dwc_ep.xfer_buff = cfi->buf_out.buf;
-+		ep->dwc_ep.xfer_len = wLen;
-+		ep->dwc_ep.xfer_count = 0;
-+		ep->dwc_ep.sent_zlp = 0;
-+		ep->dwc_ep.total_len = ep->dwc_ep.xfer_len;
-+
-+		pcd->ep0_pending = 1;
-+		/* Read the control write's data stage */
-+		dwc_otg_ep0_start_transfer(coreif, &ep->dwc_ep);
-+		retval = 0;
-+		break;
-+
-+	case VEN_CORE_RESET_FEATURES:
-+		CFI_INFO("VEN_CORE_RESET_FEATURES\n");
-+		cfi->need_gadget_att = 1;
-+		cfi->need_status_in_complete = 1;
-+		retval = cfi_preproc_reset(pcd, ctrl);
-+		CFI_INFO("VEN_CORE_RESET_FEATURES = (%d)\n", retval);
-+		break;
-+
-+	case VEN_CORE_ACTIVATE_FEATURES:
-+		CFI_INFO("VEN_CORE_ACTIVATE_FEATURES\n");
-+		break;
-+
-+	case VEN_CORE_READ_REGISTER:
-+		CFI_INFO("VEN_CORE_READ_REGISTER\n");
-+		/* wValue optionally contains the HI WORD of the register offset and
-+		 * wIndex contains the LOW WORD of the register offset
-+		 */
-+		if (wValue == 0) {
-+			/* @TODO - MAS - fix the access to the base field */
-+			regaddr = 0;
-+			//regaddr = (uint32_t) pcd->otg_dev->os_dep.base;
-+			//GET_CORE_IF(pcd)->co
-+			regaddr |= wIndex;
-+		} else {
-+			regaddr = (wValue << 16) | wIndex;
-+		}
-+
-+		/* Read a 32-bit value of the memory at the regaddr */
-+		regval = DWC_READ_REG32((uint32_t *) regaddr);
-+
-+		ep = &pcd->ep0;
-+		dwc_memcpy(cfi->buf_in.buf, &regval, sizeof(uint32_t));
-+		ep->dwc_ep.is_in = 1;
-+		ep->dwc_ep.dma_addr = cfi->buf_in.addr;
-+		ep->dwc_ep.start_xfer_buff = cfi->buf_in.buf;
-+		ep->dwc_ep.xfer_buff = cfi->buf_in.buf;
-+		ep->dwc_ep.xfer_len = wLen;
-+		ep->dwc_ep.xfer_count = 0;
-+		ep->dwc_ep.sent_zlp = 0;
-+		ep->dwc_ep.total_len = ep->dwc_ep.xfer_len;
-+
-+		pcd->ep0_pending = 1;
-+		dwc_otg_ep0_start_transfer(coreif, &ep->dwc_ep);
-+		cfi->need_gadget_att = 0;
-+		retval = 0;
-+		break;
-+
-+	case VEN_CORE_WRITE_REGISTER:
-+		CFI_INFO("VEN_CORE_WRITE_REGISTER\n");
-+		/* Set up an XFER to get the data stage of the control request,
-+		 * which is the new value of the register to be modified.
-+		 */
-+		ep = &pcd->ep0;
-+		ep->dwc_ep.is_in = 0;
-+		ep->dwc_ep.dma_addr = cfi->buf_out.addr;
-+		ep->dwc_ep.start_xfer_buff = cfi->buf_out.buf;
-+		ep->dwc_ep.xfer_buff = cfi->buf_out.buf;
-+		ep->dwc_ep.xfer_len = wLen;
-+		ep->dwc_ep.xfer_count = 0;
-+		ep->dwc_ep.sent_zlp = 0;
-+		ep->dwc_ep.total_len = ep->dwc_ep.xfer_len;
-+
-+		pcd->ep0_pending = 1;
-+		/* Read the control write's data stage */
-+		dwc_otg_ep0_start_transfer(coreif, &ep->dwc_ep);
-+		retval = 0;
-+		break;
-+
-+	default:
-+		retval = -DWC_E_NOT_SUPPORTED;
-+		break;
-+	}
-+
-+	return retval;
-+}
-+
-+/**
-+ * This function prepares the core features descriptors and copies its
-+ * raw representation into the buffer <buf>.
-+ *
-+ * The buffer structure is as follows:
-+ *	all_features_header (8 bytes)
-+ *	features_#1 (8 bytes + feature name string length)
-+ *	features_#2 (8 bytes + feature name string length)
-+ *	.....
-+ *	features_#n - where n=the total count of feature descriptors
-+ */
-+static int cfi_core_features_buf(uint8_t * buf, uint16_t buflen)
-+{
-+	cfi_feature_desc_header_t *prop_hdr = prop_descs;
-+	cfi_feature_desc_header_t *prop;
-+	cfi_all_features_header_t *all_props_hdr = &all_props_desc_header;
-+	cfi_all_features_header_t *tmp;
-+	uint8_t *tmpbuf = buf;
-+	const uint8_t *pname = NULL;
-+	int i, j, namelen = 0, totlen;
-+
-+	/* Prepare and copy the core features into the buffer */
-+	CFI_INFO("%s:\n", __func__);
-+
-+	tmp = (cfi_all_features_header_t *) tmpbuf;
-+	*tmp = *all_props_hdr;
-+	tmpbuf += CFI_ALL_FEATURES_HDR_LEN;
-+
-+	j = sizeof(prop_descs) / sizeof(cfi_all_features_header_t);
-+	for (i = 0; i < j; i++, prop_hdr++) {
-+		pname = get_prop_name(prop_hdr->wFeatureID, &namelen);
-+		prop = (cfi_feature_desc_header_t *) tmpbuf;
-+		*prop = *prop_hdr;
-+
-+		prop->bNameLen = namelen;
-+		prop->wLength =
-+		    DWC_CONSTANT_CPU_TO_LE16(CFI_FEATURE_DESC_HDR_LEN +
-+					     namelen);
-+
-+		tmpbuf += CFI_FEATURE_DESC_HDR_LEN;
-+		dwc_memcpy(tmpbuf, pname, namelen);
-+		tmpbuf += namelen;
-+	}
-+
-+	totlen = tmpbuf - buf;
-+
-+	if (totlen > 0) {
-+		tmp = (cfi_all_features_header_t *) buf;
-+		tmp->wTotalLen = DWC_CONSTANT_CPU_TO_LE16(totlen);
-+	}
-+
-+	return totlen;
-+}
-+
-+/**
-+ * This function releases all the dynamic memory in the CFI object.
-+ */
-+static void cfi_release(cfiobject_t * cfiobj)
-+{
-+	cfi_ep_t *cfiep;
-+	dwc_list_link_t *tmp;
-+
-+	CFI_INFO("%s\n", __func__);
-+
-+	if (cfiobj->buf_in.buf) {
-+		DWC_DMA_FREE(CFI_IN_BUF_LEN, cfiobj->buf_in.buf,
-+			     cfiobj->buf_in.addr);
-+		cfiobj->buf_in.buf = NULL;
-+	}
-+
-+	if (cfiobj->buf_out.buf) {
-+		DWC_DMA_FREE(CFI_OUT_BUF_LEN, cfiobj->buf_out.buf,
-+			     cfiobj->buf_out.addr);
-+		cfiobj->buf_out.buf = NULL;
-+	}
-+
-+	/* Free the Buffer Setup values for each EP */
-+	//list_for_each_entry(cfiep, &cfiobj->active_eps, lh) {
-+	DWC_LIST_FOREACH(tmp, &cfiobj->active_eps) {
-+		cfiep = DWC_LIST_ENTRY(tmp, struct cfi_ep, lh);
-+		cfi_free_ep_bs_dyn_data(cfiep);
-+	}
-+}
-+
-+/**
-+ * This function frees the dynamically allocated EP buffer setup data.
-+ */
-+static void cfi_free_ep_bs_dyn_data(cfi_ep_t * cfiep)
-+{
-+	if (cfiep->bm_sg) {
-+		DWC_FREE(cfiep->bm_sg);
-+		cfiep->bm_sg = NULL;
-+	}
-+
-+	if (cfiep->bm_align) {
-+		DWC_FREE(cfiep->bm_align);
-+		cfiep->bm_align = NULL;
-+	}
-+
-+	if (cfiep->bm_concat) {
-+		if (NULL != cfiep->bm_concat->wTxBytes) {
-+			DWC_FREE(cfiep->bm_concat->wTxBytes);
-+			cfiep->bm_concat->wTxBytes = NULL;
-+		}
-+		DWC_FREE(cfiep->bm_concat);
-+		cfiep->bm_concat = NULL;
-+	}
-+}
-+
-+/**
-+ * This function initializes the default values of the features
-+ * for a specific endpoint and should be called only once when
-+ * the EP is enabled first time.
-+ */
-+static int cfi_ep_init_defaults(struct dwc_otg_pcd *pcd, cfi_ep_t * cfiep)
-+{
-+	int retval = 0;
-+
-+	cfiep->bm_sg = DWC_ALLOC(sizeof(ddma_sg_buffer_setup_t));
-+	if (NULL == cfiep->bm_sg) {
-+		CFI_INFO("Failed to allocate memory for SG feature value\n");
-+		return -DWC_E_NO_MEMORY;
-+	}
-+	dwc_memset(cfiep->bm_sg, 0, sizeof(ddma_sg_buffer_setup_t));
-+
-+	/* For the Concatenation feature's default value we do not allocate
-+	 * memory for the wTxBytes field - it will be done in the set_feature_value
-+	 * request handler.
-+	 */
-+	cfiep->bm_concat = DWC_ALLOC(sizeof(ddma_concat_buffer_setup_t));
-+	if (NULL == cfiep->bm_concat) {
-+		CFI_INFO
-+		    ("Failed to allocate memory for CONCATENATION feature value\n");
-+		DWC_FREE(cfiep->bm_sg);
-+		return -DWC_E_NO_MEMORY;
-+	}
-+	dwc_memset(cfiep->bm_concat, 0, sizeof(ddma_concat_buffer_setup_t));
-+
-+	cfiep->bm_align = DWC_ALLOC(sizeof(ddma_align_buffer_setup_t));
-+	if (NULL == cfiep->bm_align) {
-+		CFI_INFO
-+		    ("Failed to allocate memory for Alignment feature value\n");
-+		DWC_FREE(cfiep->bm_sg);
-+		DWC_FREE(cfiep->bm_concat);
-+		return -DWC_E_NO_MEMORY;
-+	}
-+	dwc_memset(cfiep->bm_align, 0, sizeof(ddma_align_buffer_setup_t));
-+
-+	return retval;
-+}
-+
-+/**
-+ * The callback function that notifies the CFI on the activation of
-+ * an endpoint in the PCD. The following steps are done in this function:
-+ *
-+ *	Create a dynamically allocated cfi_ep_t object (a CFI wrapper to the PCD's
-+ *		active endpoint)
-+ *	Create MAX_DMA_DESCS_PER_EP count DMA Descriptors for the EP
-+ *	Set the Buffer Mode to standard
-+ *	Initialize the default values for all EP modes (SG, Circular, Concat, Align)
-+ *	Add the cfi_ep_t object to the list of active endpoints in the CFI object
-+ */
-+static int cfi_ep_enable(struct cfiobject *cfi, struct dwc_otg_pcd *pcd,
-+			 struct dwc_otg_pcd_ep *ep)
-+{
-+	cfi_ep_t *cfiep;
-+	int retval = -DWC_E_NOT_SUPPORTED;
-+
-+	CFI_INFO("%s: epname=%s; epnum=0x%02x\n", __func__,
-+		 "EP_" /*ep->ep.name */ , ep->desc->bEndpointAddress);
-+	/* MAS - Check whether this endpoint already is in the list */
-+	cfiep = get_cfi_ep_by_pcd_ep(cfi, ep);
-+
-+	if (NULL == cfiep) {
-+		/* Allocate a cfi_ep_t object */
-+		cfiep = DWC_ALLOC(sizeof(cfi_ep_t));
-+		if (NULL == cfiep) {
-+			CFI_INFO
-+			    ("Unable to allocate memory for <cfiep> in function %s\n",
-+			     __func__);
-+			return -DWC_E_NO_MEMORY;
-+		}
-+		dwc_memset(cfiep, 0, sizeof(cfi_ep_t));
-+
-+		/* Save the dwc_otg_pcd_ep pointer in the cfiep object */
-+		cfiep->ep = ep;
-+
-+		/* Allocate the DMA Descriptors chain of MAX_DMA_DESCS_PER_EP count */
-+		ep->dwc_ep.descs =
-+		    DWC_DMA_ALLOC(MAX_DMA_DESCS_PER_EP *
-+				  sizeof(dwc_otg_dma_desc_t),
-+				  &ep->dwc_ep.descs_dma_addr);
-+
-+		if (NULL == ep->dwc_ep.descs) {
-+			DWC_FREE(cfiep);
-+			return -DWC_E_NO_MEMORY;
-+		}
-+
-+		DWC_LIST_INIT(&cfiep->lh);
-+
-+		/* Set the buffer mode to BM_STANDARD. It will be modified
-+		 * when building descriptors for a specific buffer mode */
-+		ep->dwc_ep.buff_mode = BM_STANDARD;
-+
-+		/* Create and initialize the default values for this EP's Buffer modes */
-+		if ((retval = cfi_ep_init_defaults(pcd, cfiep)) < 0)
-+			return retval;
-+
-+		/* Add the cfi_ep_t object to the CFI object's list of active endpoints */
-+		DWC_LIST_INSERT_TAIL(&cfi->active_eps, &cfiep->lh);
-+		retval = 0;
-+	} else {		/* The sought EP already is in the list */
-+		CFI_INFO("%s: The sought EP already is in the list\n",
-+			 __func__);
-+	}
-+
-+	return retval;
-+}
-+
-+/**
-+ * This function is called when the data stage of a 3-stage Control Write request
-+ * is complete.
-+ *
-+ */
-+static int cfi_ctrl_write_complete(struct cfiobject *cfi,
-+				   struct dwc_otg_pcd *pcd)
-+{
-+	uint32_t addr, reg_value;
-+	uint16_t wIndex, wValue;
-+	uint8_t bRequest;
-+	uint8_t *buf = cfi->buf_out.buf;
-+	//struct usb_ctrlrequest *ctrl_req = &cfi->ctrl_req_saved;
-+	struct cfi_usb_ctrlrequest *ctrl_req = &cfi->ctrl_req;
-+	int retval = -DWC_E_NOT_SUPPORTED;
-+
-+	CFI_INFO("%s\n", __func__);
-+
-+	bRequest = ctrl_req->bRequest;
-+	wIndex = DWC_CONSTANT_CPU_TO_LE16(ctrl_req->wIndex);
-+	wValue = DWC_CONSTANT_CPU_TO_LE16(ctrl_req->wValue);
-+
-+	/*
-+	 * Save the pointer to the data stage in the ctrl_req's <data> field.
-+	 * The request should be already saved in the command stage by now.
-+	 */
-+	ctrl_req->data = cfi->buf_out.buf;
-+	cfi->need_status_in_complete = 0;
-+	cfi->need_gadget_att = 0;
-+
-+	switch (bRequest) {
-+	case VEN_CORE_WRITE_REGISTER:
-+		/* The buffer contains raw data of the new value for the register */
-+		reg_value = *((uint32_t *) buf);
-+		if (wValue == 0) {
-+			addr = 0;
-+			//addr = (uint32_t) pcd->otg_dev->os_dep.base;
-+			addr += wIndex;
-+		} else {
-+			addr = (wValue << 16) | wIndex;
-+		}
-+
-+		//writel(reg_value, addr);
-+
-+		retval = 0;
-+		cfi->need_status_in_complete = 1;
-+		break;
-+
-+	case VEN_CORE_SET_FEATURE:
-+		/* The buffer contains raw data of the new value of the feature */
-+		retval = cfi_set_feature_value(pcd);
-+		if (retval < 0)
-+			return retval;
-+
-+		cfi->need_status_in_complete = 1;
-+		break;
-+
-+	default:
-+		break;
-+	}
-+
-+	return retval;
-+}
-+
-+/**
-+ * This function builds the DMA descriptors for the SG buffer mode.
-+ */
-+static void cfi_build_sg_descs(struct cfiobject *cfi, cfi_ep_t * cfiep,
-+			       dwc_otg_pcd_request_t * req)
-+{
-+	struct dwc_otg_pcd_ep *ep = cfiep->ep;
-+	ddma_sg_buffer_setup_t *sgval = cfiep->bm_sg;
-+	struct dwc_otg_dma_desc *desc = cfiep->ep->dwc_ep.descs;
-+	struct dwc_otg_dma_desc *desc_last = cfiep->ep->dwc_ep.descs;
-+	dma_addr_t buff_addr = req->dma;
-+	int i;
-+	uint32_t txsize, off;
-+
-+	txsize = sgval->wSize;
-+	off = sgval->bOffset;
-+
-+//      CFI_INFO("%s: %s TXSIZE=0x%08x; OFFSET=0x%08x\n",
-+//              __func__, cfiep->ep->ep.name, txsize, off);
-+
-+	for (i = 0; i < sgval->bCount; i++) {
-+		desc->status.b.bs = BS_HOST_BUSY;
-+		desc->buf = buff_addr;
-+		desc->status.b.l = 0;
-+		desc->status.b.ioc = 0;
-+		desc->status.b.sp = 0;
-+		desc->status.b.bytes = txsize;
-+		desc->status.b.bs = BS_HOST_READY;
-+
-+		/* Set the next address of the buffer */
-+		buff_addr += txsize + off;
-+		desc_last = desc;
-+		desc++;
-+	}
-+
-+	/* Set the last, ioc and sp bits on the Last DMA Descriptor */
-+	desc_last->status.b.l = 1;
-+	desc_last->status.b.ioc = 1;
-+	desc_last->status.b.sp = ep->dwc_ep.sent_zlp;
-+	/* Save the last DMA descriptor pointer */
-+	cfiep->dma_desc_last = desc_last;
-+	cfiep->desc_count = sgval->bCount;
-+}
-+
-+/**
-+ * This function builds the DMA descriptors for the Concatenation buffer mode.
-+ */
-+static void cfi_build_concat_descs(struct cfiobject *cfi, cfi_ep_t * cfiep,
-+				   dwc_otg_pcd_request_t * req)
-+{
-+	struct dwc_otg_pcd_ep *ep = cfiep->ep;
-+	ddma_concat_buffer_setup_t *concatval = cfiep->bm_concat;
-+	struct dwc_otg_dma_desc *desc = cfiep->ep->dwc_ep.descs;
-+	struct dwc_otg_dma_desc *desc_last = cfiep->ep->dwc_ep.descs;
-+	dma_addr_t buff_addr = req->dma;
-+	int i;
-+	uint16_t *txsize;
-+
-+	txsize = concatval->wTxBytes;
-+
-+	for (i = 0; i < concatval->hdr.bDescCount; i++) {
-+		desc->buf = buff_addr;
-+		desc->status.b.bs = BS_HOST_BUSY;
-+		desc->status.b.l = 0;
-+		desc->status.b.ioc = 0;
-+		desc->status.b.sp = 0;
-+		desc->status.b.bytes = *txsize;
-+		desc->status.b.bs = BS_HOST_READY;
-+
-+		txsize++;
-+		/* Set the next address of the buffer */
-+		buff_addr += UGETW(ep->desc->wMaxPacketSize);
-+		desc_last = desc;
-+		desc++;
-+	}
-+
-+	/* Set the last, ioc and sp bits on the Last DMA Descriptor */
-+	desc_last->status.b.l = 1;
-+	desc_last->status.b.ioc = 1;
-+	desc_last->status.b.sp = ep->dwc_ep.sent_zlp;
-+	cfiep->dma_desc_last = desc_last;
-+	cfiep->desc_count = concatval->hdr.bDescCount;
-+}
-+
-+/**
-+ * This function builds the DMA descriptors for the Circular buffer mode
-+ */
-+static void cfi_build_circ_descs(struct cfiobject *cfi, cfi_ep_t * cfiep,
-+				 dwc_otg_pcd_request_t * req)
-+{
-+	/* @todo: MAS - add implementation when this feature needs to be tested */
-+}
-+
-+/**
-+ * This function builds the DMA descriptors for the Alignment buffer mode
-+ */
-+static void cfi_build_align_descs(struct cfiobject *cfi, cfi_ep_t * cfiep,
-+				  dwc_otg_pcd_request_t * req)
-+{
-+	struct dwc_otg_pcd_ep *ep = cfiep->ep;
-+	ddma_align_buffer_setup_t *alignval = cfiep->bm_align;
-+	struct dwc_otg_dma_desc *desc = cfiep->ep->dwc_ep.descs;
-+	dma_addr_t buff_addr = req->dma;
-+
-+	desc->status.b.bs = BS_HOST_BUSY;
-+	desc->status.b.l = 1;
-+	desc->status.b.ioc = 1;
-+	desc->status.b.sp = ep->dwc_ep.sent_zlp;
-+	desc->status.b.bytes = req->length;
-+	/* Adjust the buffer alignment */
-+	desc->buf = (buff_addr + alignval->bAlign);
-+	desc->status.b.bs = BS_HOST_READY;
-+	cfiep->dma_desc_last = desc;
-+	cfiep->desc_count = 1;
-+}
-+
-+/**
-+ * This function builds the DMA descriptors chain for different modes of the
-+ * buffer setup of an endpoint.
-+ */
-+static void cfi_build_descriptors(struct cfiobject *cfi,
-+				  struct dwc_otg_pcd *pcd,
-+				  struct dwc_otg_pcd_ep *ep,
-+				  dwc_otg_pcd_request_t * req)
-+{
-+	cfi_ep_t *cfiep;
-+
-+	/* Get the cfiep by the dwc_otg_pcd_ep */
-+	cfiep = get_cfi_ep_by_pcd_ep(cfi, ep);
-+	if (NULL == cfiep) {
-+		CFI_INFO("%s: Unable to find a matching active endpoint\n",
-+			 __func__);
-+		return;
-+	}
-+
-+	cfiep->xfer_len = req->length;
-+
-+	/* Iterate through all the DMA descriptors */
-+	switch (cfiep->ep->dwc_ep.buff_mode) {
-+	case BM_SG:
-+		cfi_build_sg_descs(cfi, cfiep, req);
-+		break;
-+
-+	case BM_CONCAT:
-+		cfi_build_concat_descs(cfi, cfiep, req);
-+		break;
-+
-+	case BM_CIRCULAR:
-+		cfi_build_circ_descs(cfi, cfiep, req);
-+		break;
-+
-+	case BM_ALIGN:
-+		cfi_build_align_descs(cfi, cfiep, req);
-+		break;
-+
-+	default:
-+		break;
-+	}
-+}
-+
-+/**
-+ * Allocate DMA buffer for different Buffer modes.
-+ */
-+static void *cfi_ep_alloc_buf(struct cfiobject *cfi, struct dwc_otg_pcd *pcd,
-+			      struct dwc_otg_pcd_ep *ep, dma_addr_t * dma,
-+			      unsigned size, gfp_t flags)
-+{
-+	return DWC_DMA_ALLOC(size, dma);
-+}
-+
-+/**
-+ * This function initializes the CFI object.
-+ */
-+int init_cfi(cfiobject_t * cfiobj)
-+{
-+	CFI_INFO("%s\n", __func__);
-+
-+	/* Allocate a buffer for IN XFERs */
-+	cfiobj->buf_in.buf =
-+	    DWC_DMA_ALLOC(CFI_IN_BUF_LEN, &cfiobj->buf_in.addr);
-+	if (NULL == cfiobj->buf_in.buf) {
-+		CFI_INFO("Unable to allocate buffer for INs\n");
-+		return -DWC_E_NO_MEMORY;
-+	}
-+
-+	/* Allocate a buffer for OUT XFERs */
-+	cfiobj->buf_out.buf =
-+	    DWC_DMA_ALLOC(CFI_OUT_BUF_LEN, &cfiobj->buf_out.addr);
-+	if (NULL == cfiobj->buf_out.buf) {
-+		CFI_INFO("Unable to allocate buffer for OUT\n");
-+		return -DWC_E_NO_MEMORY;
-+	}
-+
-+	/* Initialize the callback function pointers */
-+	cfiobj->ops.release = cfi_release;
-+	cfiobj->ops.ep_enable = cfi_ep_enable;
-+	cfiobj->ops.ctrl_write_complete = cfi_ctrl_write_complete;
-+	cfiobj->ops.build_descriptors = cfi_build_descriptors;
-+	cfiobj->ops.ep_alloc_buf = cfi_ep_alloc_buf;
-+
-+	/* Initialize the list of active endpoints in the CFI object */
-+	DWC_LIST_INIT(&cfiobj->active_eps);
-+
-+	return 0;
-+}
-+
-+/**
-+ * This function reads the required feature's current value into the buffer
-+ *
-+ * @retval: Returns negative as error, or the data length of the feature
-+ */
-+static int cfi_get_feature_value(uint8_t * buf, uint16_t buflen,
-+				 struct dwc_otg_pcd *pcd,
-+				 struct cfi_usb_ctrlrequest *ctrl_req)
-+{
-+	int retval = -DWC_E_NOT_SUPPORTED;
-+	struct dwc_otg_core_if *coreif = GET_CORE_IF(pcd);
-+	uint16_t dfifo, rxfifo, txfifo;
-+
-+	switch (ctrl_req->wIndex) {
-+		/* Whether the DDMA is enabled or not */
-+	case FT_ID_DMA_MODE:
-+		*buf = (coreif->dma_enable && coreif->dma_desc_enable) ? 1 : 0;
-+		retval = 1;
-+		break;
-+
-+	case FT_ID_DMA_BUFFER_SETUP:
-+		retval = cfi_ep_get_sg_val(buf, pcd, ctrl_req);
-+		break;
-+
-+	case FT_ID_DMA_BUFF_ALIGN:
-+		retval = cfi_ep_get_align_val(buf, pcd, ctrl_req);
-+		break;
-+
-+	case FT_ID_DMA_CONCAT_SETUP:
-+		retval = cfi_ep_get_concat_val(buf, pcd, ctrl_req);
-+		break;
-+
-+	case FT_ID_DMA_CIRCULAR:
-+		CFI_INFO("GetFeature value (FT_ID_DMA_CIRCULAR)\n");
-+		break;
-+
-+	case FT_ID_THRESHOLD_SETUP:
-+		CFI_INFO("GetFeature value (FT_ID_THRESHOLD_SETUP)\n");
-+		break;
-+
-+	case FT_ID_DFIFO_DEPTH:
-+		dfifo = get_dfifo_size(coreif);
-+		*((uint16_t *) buf) = dfifo;
-+		retval = sizeof(uint16_t);
-+		break;
-+
-+	case FT_ID_TX_FIFO_DEPTH:
-+		retval = get_txfifo_size(pcd, ctrl_req->wValue);
-+		if (retval >= 0) {
-+			txfifo = retval;
-+			*((uint16_t *) buf) = txfifo;
-+			retval = sizeof(uint16_t);
-+		}
-+		break;
-+
-+	case FT_ID_RX_FIFO_DEPTH:
-+		retval = get_rxfifo_size(coreif, ctrl_req->wValue);
-+		if (retval >= 0) {
-+			rxfifo = retval;
-+			*((uint16_t *) buf) = rxfifo;
-+			retval = sizeof(uint16_t);
-+		}
-+		break;
-+	}
-+
-+	return retval;
-+}
-+
-+/**
-+ * This function resets the SG for the specified EP to its default value
-+ */
-+static int cfi_reset_sg_val(cfi_ep_t * cfiep)
-+{
-+	dwc_memset(cfiep->bm_sg, 0, sizeof(ddma_sg_buffer_setup_t));
-+	return 0;
-+}
-+
-+/**
-+ * This function resets the Alignment for the specified EP to its default value
-+ */
-+static int cfi_reset_align_val(cfi_ep_t * cfiep)
-+{
-+	dwc_memset(cfiep->bm_sg, 0, sizeof(ddma_sg_buffer_setup_t));
-+	return 0;
-+}
-+
-+/**
-+ * This function resets the Concatenation for the specified EP to its default value
-+ * This function will also set the value of the wTxBytes field to NULL after
-+ * freeing the memory previously allocated for this field.
-+ */
-+static int cfi_reset_concat_val(cfi_ep_t * cfiep)
-+{
-+	/* First we need to free the wTxBytes field */
-+	if (cfiep->bm_concat->wTxBytes) {
-+		DWC_FREE(cfiep->bm_concat->wTxBytes);
-+		cfiep->bm_concat->wTxBytes = NULL;
-+	}
-+
-+	dwc_memset(cfiep->bm_concat, 0, sizeof(ddma_concat_buffer_setup_t));
-+	return 0;
-+}
-+
-+/**
-+ * This function resets all the buffer setups of the specified endpoint
-+ */
-+static int cfi_ep_reset_all_setup_vals(cfi_ep_t * cfiep)
-+{
-+	cfi_reset_sg_val(cfiep);
-+	cfi_reset_align_val(cfiep);
-+	cfi_reset_concat_val(cfiep);
-+	return 0;
-+}
-+
-+static int cfi_handle_reset_fifo_val(struct dwc_otg_pcd *pcd, uint8_t ep_addr,
-+				     uint8_t rx_rst, uint8_t tx_rst)
-+{
-+	int retval = -DWC_E_INVALID;
-+	uint16_t tx_siz[15];
-+	uint16_t rx_siz = 0;
-+	dwc_otg_pcd_ep_t *ep = NULL;
-+	dwc_otg_core_if_t *core_if = GET_CORE_IF(pcd);
-+	dwc_otg_core_params_t *params = GET_CORE_IF(pcd)->core_params;
-+
-+	if (rx_rst) {
-+		rx_siz = params->dev_rx_fifo_size;
-+		params->dev_rx_fifo_size = GET_CORE_IF(pcd)->init_rxfsiz;
-+	}
-+
-+	if (tx_rst) {
-+		if (ep_addr == 0) {
-+			int i;
-+
-+			for (i = 0; i < core_if->hwcfg4.b.num_in_eps; i++) {
-+				tx_siz[i] =
-+				    core_if->core_params->dev_tx_fifo_size[i];
-+				core_if->core_params->dev_tx_fifo_size[i] =
-+				    core_if->init_txfsiz[i];
-+			}
-+		} else {
-+
-+			ep = get_ep_by_addr(pcd, ep_addr);
-+
-+			if (NULL == ep) {
-+				CFI_INFO
-+				    ("%s: Unable to get the endpoint addr=0x%02x\n",
-+				     __func__, ep_addr);
-+				return -DWC_E_INVALID;
-+			}
-+
-+			tx_siz[0] =
-+			    params->dev_tx_fifo_size[ep->dwc_ep.tx_fifo_num -
-+						     1];
-+			params->dev_tx_fifo_size[ep->dwc_ep.tx_fifo_num - 1] =
-+			    GET_CORE_IF(pcd)->init_txfsiz[ep->
-+							  dwc_ep.tx_fifo_num -
-+							  1];
-+		}
-+	}
-+
-+	if (resize_fifos(GET_CORE_IF(pcd))) {
-+		retval = 0;
-+	} else {
-+		CFI_INFO
-+		    ("%s: Error resetting the feature Reset All(FIFO size)\n",
-+		     __func__);
-+		if (rx_rst) {
-+			params->dev_rx_fifo_size = rx_siz;
-+		}
-+
-+		if (tx_rst) {
-+			if (ep_addr == 0) {
-+				int i;
-+				for (i = 0; i < core_if->hwcfg4.b.num_in_eps;
-+				     i++) {
-+					core_if->
-+					    core_params->dev_tx_fifo_size[i] =
-+					    tx_siz[i];
-+				}
-+			} else {
-+				params->dev_tx_fifo_size[ep->
-+							 dwc_ep.tx_fifo_num -
-+							 1] = tx_siz[0];
-+			}
-+		}
-+		retval = -DWC_E_INVALID;
-+	}
-+	return retval;
-+}
-+
-+static int cfi_handle_reset_all(struct dwc_otg_pcd *pcd, uint8_t addr)
-+{
-+	int retval = 0;
-+	cfi_ep_t *cfiep;
-+	cfiobject_t *cfi = pcd->cfi;
-+	dwc_list_link_t *tmp;
-+
-+	retval = cfi_handle_reset_fifo_val(pcd, addr, 1, 1);
-+	if (retval < 0) {
-+		return retval;
-+	}
-+
-+	/* If the EP address is known then reset the features for only that EP */
-+	if (addr) {
-+		cfiep = get_cfi_ep_by_addr(pcd->cfi, addr);
-+		if (NULL == cfiep) {
-+			CFI_INFO("%s: Error getting the EP address 0x%02x\n",
-+				 __func__, addr);
-+			return -DWC_E_INVALID;
-+		}
-+		retval = cfi_ep_reset_all_setup_vals(cfiep);
-+		cfiep->ep->dwc_ep.buff_mode = BM_STANDARD;
-+	}
-+	/* Otherwise (wValue == 0), reset all features of all EP's */
-+	else {
-+		/* Traverse all the active EP's and reset the feature(s) value(s) */
-+		//list_for_each_entry(cfiep, &cfi->active_eps, lh) {
-+		DWC_LIST_FOREACH(tmp, &cfi->active_eps) {
-+			cfiep = DWC_LIST_ENTRY(tmp, struct cfi_ep, lh);
-+			retval = cfi_ep_reset_all_setup_vals(cfiep);
-+			cfiep->ep->dwc_ep.buff_mode = BM_STANDARD;
-+			if (retval < 0) {
-+				CFI_INFO
-+				    ("%s: Error resetting the feature Reset All\n",
-+				     __func__);
-+				return retval;
-+			}
-+		}
-+	}
-+	return retval;
-+}
-+
-+static int cfi_handle_reset_dma_buff_setup(struct dwc_otg_pcd *pcd,
-+					   uint8_t addr)
-+{
-+	int retval = 0;
-+	cfi_ep_t *cfiep;
-+	cfiobject_t *cfi = pcd->cfi;
-+	dwc_list_link_t *tmp;
-+
-+	/* If the EP address is known then reset the features for only that EP */
-+	if (addr) {
-+		cfiep = get_cfi_ep_by_addr(pcd->cfi, addr);
-+		if (NULL == cfiep) {
-+			CFI_INFO("%s: Error getting the EP address 0x%02x\n",
-+				 __func__, addr);
-+			return -DWC_E_INVALID;
-+		}
-+		retval = cfi_reset_sg_val(cfiep);
-+	}
-+	/* Otherwise (wValue == 0), reset all features of all EP's */
-+	else {
-+		/* Traverse all the active EP's and reset the feature(s) value(s) */
-+		//list_for_each_entry(cfiep, &cfi->active_eps, lh) {
-+		DWC_LIST_FOREACH(tmp, &cfi->active_eps) {
-+			cfiep = DWC_LIST_ENTRY(tmp, struct cfi_ep, lh);
-+			retval = cfi_reset_sg_val(cfiep);
-+			if (retval < 0) {
-+				CFI_INFO
-+				    ("%s: Error resetting the feature Buffer Setup\n",
-+				     __func__);
-+				return retval;
-+			}
-+		}
-+	}
-+	return retval;
-+}
-+
-+static int cfi_handle_reset_concat_val(struct dwc_otg_pcd *pcd, uint8_t addr)
-+{
-+	int retval = 0;
-+	cfi_ep_t *cfiep;
-+	cfiobject_t *cfi = pcd->cfi;
-+	dwc_list_link_t *tmp;
-+
-+	/* If the EP address is known then reset the features for only that EP */
-+	if (addr) {
-+		cfiep = get_cfi_ep_by_addr(pcd->cfi, addr);
-+		if (NULL == cfiep) {
-+			CFI_INFO("%s: Error getting the EP address 0x%02x\n",
-+				 __func__, addr);
-+			return -DWC_E_INVALID;
-+		}
-+		retval = cfi_reset_concat_val(cfiep);
-+	}
-+	/* Otherwise (wValue == 0), reset all features of all EP's */
-+	else {
-+		/* Traverse all the active EP's and reset the feature(s) value(s) */
-+		//list_for_each_entry(cfiep, &cfi->active_eps, lh) {
-+		DWC_LIST_FOREACH(tmp, &cfi->active_eps) {
-+			cfiep = DWC_LIST_ENTRY(tmp, struct cfi_ep, lh);
-+			retval = cfi_reset_concat_val(cfiep);
-+			if (retval < 0) {
-+				CFI_INFO
-+				    ("%s: Error resetting the feature Concatenation Value\n",
-+				     __func__);
-+				return retval;
-+			}
-+		}
-+	}
-+	return retval;
-+}
-+
-+static int cfi_handle_reset_align_val(struct dwc_otg_pcd *pcd, uint8_t addr)
-+{
-+	int retval = 0;
-+	cfi_ep_t *cfiep;
-+	cfiobject_t *cfi = pcd->cfi;
-+	dwc_list_link_t *tmp;
-+
-+	/* If the EP address is known then reset the features for only that EP */
-+	if (addr) {
-+		cfiep = get_cfi_ep_by_addr(pcd->cfi, addr);
-+		if (NULL == cfiep) {
-+			CFI_INFO("%s: Error getting the EP address 0x%02x\n",
-+				 __func__, addr);
-+			return -DWC_E_INVALID;
-+		}
-+		retval = cfi_reset_align_val(cfiep);
-+	}
-+	/* Otherwise (wValue == 0), reset all features of all EP's */
-+	else {
-+		/* Traverse all the active EP's and reset the feature(s) value(s) */
-+		//list_for_each_entry(cfiep, &cfi->active_eps, lh) {
-+		DWC_LIST_FOREACH(tmp, &cfi->active_eps) {
-+			cfiep = DWC_LIST_ENTRY(tmp, struct cfi_ep, lh);
-+			retval = cfi_reset_align_val(cfiep);
-+			if (retval < 0) {
-+				CFI_INFO
-+				    ("%s: Error resetting the feature Aliignment Value\n",
-+				     __func__);
-+				return retval;
-+			}
-+		}
-+	}
-+	return retval;
-+
-+}
-+
-+static int cfi_preproc_reset(struct dwc_otg_pcd *pcd,
-+			     struct cfi_usb_ctrlrequest *req)
-+{
-+	int retval = 0;
-+
-+	switch (req->wIndex) {
-+	case 0:
-+		/* Reset all features */
-+		retval = cfi_handle_reset_all(pcd, req->wValue & 0xff);
-+		break;
-+
-+	case FT_ID_DMA_BUFFER_SETUP:
-+		/* Reset the SG buffer setup */
-+		retval =
-+		    cfi_handle_reset_dma_buff_setup(pcd, req->wValue & 0xff);
-+		break;
-+
-+	case FT_ID_DMA_CONCAT_SETUP:
-+		/* Reset the Concatenation buffer setup */
-+		retval = cfi_handle_reset_concat_val(pcd, req->wValue & 0xff);
-+		break;
-+
-+	case FT_ID_DMA_BUFF_ALIGN:
-+		/* Reset the Alignment buffer setup */
-+		retval = cfi_handle_reset_align_val(pcd, req->wValue & 0xff);
-+		break;
-+
-+	case FT_ID_TX_FIFO_DEPTH:
-+		retval =
-+		    cfi_handle_reset_fifo_val(pcd, req->wValue & 0xff, 0, 1);
-+		pcd->cfi->need_gadget_att = 0;
-+		break;
-+
-+	case FT_ID_RX_FIFO_DEPTH:
-+		retval = cfi_handle_reset_fifo_val(pcd, 0, 1, 0);
-+		pcd->cfi->need_gadget_att = 0;
-+		break;
-+	default:
-+		break;
-+	}
-+	return retval;
-+}
-+
-+/**
-+ * This function sets a new value for the SG buffer setup.
-+ */
-+static int cfi_ep_set_sg_val(uint8_t * buf, struct dwc_otg_pcd *pcd)
-+{
-+	uint8_t inaddr, outaddr;
-+	cfi_ep_t *epin, *epout;
-+	ddma_sg_buffer_setup_t *psgval;
-+	uint32_t desccount, size;
-+
-+	CFI_INFO("%s\n", __func__);
-+
-+	psgval = (ddma_sg_buffer_setup_t *) buf;
-+	desccount = (uint32_t) psgval->bCount;
-+	size = (uint32_t) psgval->wSize;
-+
-+	/* Check the DMA descriptor count */
-+	if ((desccount > MAX_DMA_DESCS_PER_EP) || (desccount == 0)) {
-+		CFI_INFO
-+		    ("%s: The count of DMA Descriptors should be between 1 and %d\n",
-+		     __func__, MAX_DMA_DESCS_PER_EP);
-+		return -DWC_E_INVALID;
-+	}
-+
-+	/* Check the DMA descriptor count */
-+
-+	if (size == 0) {
-+
-+		CFI_INFO("%s: The transfer size should be at least 1 byte\n",
-+			 __func__);
-+
-+		return -DWC_E_INVALID;
-+
-+	}
-+
-+	inaddr = psgval->bInEndpointAddress;
-+	outaddr = psgval->bOutEndpointAddress;
-+
-+	epin = get_cfi_ep_by_addr(pcd->cfi, inaddr);
-+	epout = get_cfi_ep_by_addr(pcd->cfi, outaddr);
-+
-+	if (NULL == epin || NULL == epout) {
-+		CFI_INFO
-+		    ("%s: Unable to get the endpoints inaddr=0x%02x outaddr=0x%02x\n",
-+		     __func__, inaddr, outaddr);
-+		return -DWC_E_INVALID;
-+	}
-+
-+	epin->ep->dwc_ep.buff_mode = BM_SG;
-+	dwc_memcpy(epin->bm_sg, psgval, sizeof(ddma_sg_buffer_setup_t));
-+
-+	epout->ep->dwc_ep.buff_mode = BM_SG;
-+	dwc_memcpy(epout->bm_sg, psgval, sizeof(ddma_sg_buffer_setup_t));
-+
-+	return 0;
-+}
-+
-+/**
-+ * This function sets a new value for the buffer Alignment setup.
-+ */
-+static int cfi_ep_set_alignment_val(uint8_t * buf, struct dwc_otg_pcd *pcd)
-+{
-+	cfi_ep_t *ep;
-+	uint8_t addr;
-+	ddma_align_buffer_setup_t *palignval;
-+
-+	palignval = (ddma_align_buffer_setup_t *) buf;
-+	addr = palignval->bEndpointAddress;
-+
-+	ep = get_cfi_ep_by_addr(pcd->cfi, addr);
-+
-+	if (NULL == ep) {
-+		CFI_INFO("%s: Unable to get the endpoint addr=0x%02x\n",
-+			 __func__, addr);
-+		return -DWC_E_INVALID;
-+	}
-+
-+	ep->ep->dwc_ep.buff_mode = BM_ALIGN;
-+	dwc_memcpy(ep->bm_align, palignval, sizeof(ddma_align_buffer_setup_t));
-+
-+	return 0;
-+}
-+
-+/**
-+ * This function sets a new value for the Concatenation buffer setup.
-+ */
-+static int cfi_ep_set_concat_val(uint8_t * buf, struct dwc_otg_pcd *pcd)
-+{
-+	uint8_t addr;
-+	cfi_ep_t *ep;
-+	struct _ddma_concat_buffer_setup_hdr *pConcatValHdr;
-+	uint16_t *pVals;
-+	uint32_t desccount;
-+	int i;
-+	uint16_t mps;
-+
-+	pConcatValHdr = (struct _ddma_concat_buffer_setup_hdr *)buf;
-+	desccount = (uint32_t) pConcatValHdr->bDescCount;
-+	pVals = (uint16_t *) (buf + BS_CONCAT_VAL_HDR_LEN);
-+
-+	/* Check the DMA descriptor count */
-+	if (desccount > MAX_DMA_DESCS_PER_EP) {
-+		CFI_INFO("%s: Maximum DMA Descriptor count should be %d\n",
-+			 __func__, MAX_DMA_DESCS_PER_EP);
-+		return -DWC_E_INVALID;
-+	}
-+
-+	addr = pConcatValHdr->bEndpointAddress;
-+	ep = get_cfi_ep_by_addr(pcd->cfi, addr);
-+	if (NULL == ep) {
-+		CFI_INFO("%s: Unable to get the endpoint addr=0x%02x\n",
-+			 __func__, addr);
-+		return -DWC_E_INVALID;
-+	}
-+
-+	mps = UGETW(ep->ep->desc->wMaxPacketSize);
-+
-+#if 0
-+	for (i = 0; i < desccount; i++) {
-+		CFI_INFO("%s: wTxSize[%d]=0x%04x\n", __func__, i, pVals[i]);
-+	}
-+	CFI_INFO("%s: epname=%s; mps=%d\n", __func__, ep->ep->ep.name, mps);
-+#endif
-+
-+	/* Check the wTxSizes to be less than or equal to the mps */
-+	for (i = 0; i < desccount; i++) {
-+		if (pVals[i] > mps) {
-+			CFI_INFO
-+			    ("%s: ERROR - the wTxSize[%d] should be <= MPS (wTxSize=%d)\n",
-+			     __func__, i, pVals[i]);
-+			return -DWC_E_INVALID;
-+		}
-+	}
-+
-+	ep->ep->dwc_ep.buff_mode = BM_CONCAT;
-+	dwc_memcpy(ep->bm_concat, pConcatValHdr, BS_CONCAT_VAL_HDR_LEN);
-+
-+	/* Free the previously allocated storage for the wTxBytes */
-+	if (ep->bm_concat->wTxBytes) {
-+		DWC_FREE(ep->bm_concat->wTxBytes);
-+	}
-+
-+	/* Allocate a new storage for the wTxBytes field */
-+	ep->bm_concat->wTxBytes =
-+	    DWC_ALLOC(sizeof(uint16_t) * pConcatValHdr->bDescCount);
-+	if (NULL == ep->bm_concat->wTxBytes) {
-+		CFI_INFO("%s: Unable to allocate memory\n", __func__);
-+		return -DWC_E_NO_MEMORY;
-+	}
-+
-+	/* Copy the new values into the wTxBytes filed */
-+	dwc_memcpy(ep->bm_concat->wTxBytes, buf + BS_CONCAT_VAL_HDR_LEN,
-+		   sizeof(uint16_t) * pConcatValHdr->bDescCount);
-+
-+	return 0;
-+}
-+
-+/**
-+ * This function calculates the total of all FIFO sizes
-+ *
-+ * @param core_if Programming view of DWC_otg controller
-+ *
-+ * @return The total of data FIFO sizes.
-+ *
-+ */
-+static uint16_t get_dfifo_size(dwc_otg_core_if_t * core_if)
-+{
-+	dwc_otg_core_params_t *params = core_if->core_params;
-+	uint16_t dfifo_total = 0;
-+	int i;
-+
-+	/* The shared RxFIFO size */
-+	dfifo_total =
-+	    params->dev_rx_fifo_size + params->dev_nperio_tx_fifo_size;
-+
-+	/* Add up each TxFIFO size to the total */
-+	for (i = 0; i < core_if->hwcfg4.b.num_in_eps; i++) {
-+		dfifo_total += params->dev_tx_fifo_size[i];
-+	}
-+
-+	return dfifo_total;
-+}
-+
-+/**
-+ * This function returns Rx FIFO size
-+ *
-+ * @param core_if Programming view of DWC_otg controller
-+ *
-+ * @return The total of data FIFO sizes.
-+ *
-+ */
-+static int32_t get_rxfifo_size(dwc_otg_core_if_t * core_if, uint16_t wValue)
-+{
-+	switch (wValue >> 8) {
-+	case 0:
-+		return (core_if->pwron_rxfsiz <
-+			32768) ? core_if->pwron_rxfsiz : 32768;
-+		break;
-+	case 1:
-+		return core_if->core_params->dev_rx_fifo_size;
-+		break;
-+	default:
-+		return -DWC_E_INVALID;
-+		break;
-+	}
-+}
-+
-+/**
-+ * This function returns Tx FIFO size for IN EP
-+ *
-+ * @param core_if Programming view of DWC_otg controller
-+ *
-+ * @return The total of data FIFO sizes.
-+ *
-+ */
-+static int32_t get_txfifo_size(struct dwc_otg_pcd *pcd, uint16_t wValue)
-+{
-+	dwc_otg_pcd_ep_t *ep;
-+
-+	ep = get_ep_by_addr(pcd, wValue & 0xff);
-+
-+	if (NULL == ep) {
-+		CFI_INFO("%s: Unable to get the endpoint addr=0x%02x\n",
-+			 __func__, wValue & 0xff);
-+		return -DWC_E_INVALID;
-+	}
-+
-+	if (!ep->dwc_ep.is_in) {
-+		CFI_INFO
-+		    ("%s: No Tx FIFO assingned to the Out endpoint addr=0x%02x\n",
-+		     __func__, wValue & 0xff);
-+		return -DWC_E_INVALID;
-+	}
-+
-+	switch (wValue >> 8) {
-+	case 0:
-+		return (GET_CORE_IF(pcd)->pwron_txfsiz
-+			[ep->dwc_ep.tx_fifo_num - 1] <
-+			768) ? GET_CORE_IF(pcd)->pwron_txfsiz[ep->
-+							      dwc_ep.tx_fifo_num
-+							      - 1] : 32768;
-+		break;
-+	case 1:
-+		return GET_CORE_IF(pcd)->core_params->
-+		    dev_tx_fifo_size[ep->dwc_ep.num - 1];
-+		break;
-+	default:
-+		return -DWC_E_INVALID;
-+		break;
-+	}
-+}
-+
-+/**
-+ * This function checks if the submitted combination of
-+ * device mode FIFO sizes is possible or not.
-+ *
-+ * @param core_if Programming view of DWC_otg controller
-+ *
-+ * @return 1 if possible, 0 otherwise.
-+ *
-+ */
-+static uint8_t check_fifo_sizes(dwc_otg_core_if_t * core_if)
-+{
-+	uint16_t dfifo_actual = 0;
-+	dwc_otg_core_params_t *params = core_if->core_params;
-+	uint16_t start_addr = 0;
-+	int i;
-+
-+	dfifo_actual =
-+	    params->dev_rx_fifo_size + params->dev_nperio_tx_fifo_size;
-+
-+	for (i = 0; i < core_if->hwcfg4.b.num_in_eps; i++) {
-+		dfifo_actual += params->dev_tx_fifo_size[i];
-+	}
-+
-+	if (dfifo_actual > core_if->total_fifo_size) {
-+		return 0;
-+	}
-+
-+	if (params->dev_rx_fifo_size > 32768 || params->dev_rx_fifo_size < 16)
-+		return 0;
-+
-+	if (params->dev_nperio_tx_fifo_size > 32768
-+	    || params->dev_nperio_tx_fifo_size < 16)
-+		return 0;
-+
-+	for (i = 0; i < core_if->hwcfg4.b.num_in_eps; i++) {
-+
-+		if (params->dev_tx_fifo_size[i] > 768
-+		    || params->dev_tx_fifo_size[i] < 4)
-+			return 0;
-+	}
-+
-+	if (params->dev_rx_fifo_size > core_if->pwron_rxfsiz)
-+		return 0;
-+	start_addr = params->dev_rx_fifo_size;
-+
-+	if (params->dev_nperio_tx_fifo_size > core_if->pwron_gnptxfsiz)
-+		return 0;
-+	start_addr += params->dev_nperio_tx_fifo_size;
-+
-+	for (i = 0; i < core_if->hwcfg4.b.num_in_eps; i++) {
-+
-+		if (params->dev_tx_fifo_size[i] > core_if->pwron_txfsiz[i])
-+			return 0;
-+		start_addr += params->dev_tx_fifo_size[i];
-+	}
-+
-+	return 1;
-+}
-+
-+/**
-+ * This function resizes Device mode FIFOs
-+ *
-+ * @param core_if Programming view of DWC_otg controller
-+ *
-+ * @return 1 if successful, 0 otherwise
-+ *
-+ */
-+static uint8_t resize_fifos(dwc_otg_core_if_t * core_if)
-+{
-+	int i = 0;
-+	dwc_otg_core_global_regs_t *global_regs = core_if->core_global_regs;
-+	dwc_otg_core_params_t *params = core_if->core_params;
-+	uint32_t rx_fifo_size;
-+	fifosize_data_t nptxfifosize;
-+	fifosize_data_t txfifosize[15];
-+
-+	uint32_t rx_fsz_bak;
-+	uint32_t nptxfsz_bak;
-+	uint32_t txfsz_bak[15];
-+
-+	uint16_t start_address;
-+	uint8_t retval = 1;
-+
-+	if (!check_fifo_sizes(core_if)) {
-+		return 0;
-+	}
-+
-+	/* Configure data FIFO sizes */
-+	if (core_if->hwcfg2.b.dynamic_fifo && params->enable_dynamic_fifo) {
-+		rx_fsz_bak = DWC_READ_REG32(&global_regs->grxfsiz);
-+		rx_fifo_size = params->dev_rx_fifo_size;
-+		DWC_WRITE_REG32(&global_regs->grxfsiz, rx_fifo_size);
-+
-+		/*
-+		 * Tx FIFOs These FIFOs are numbered from 1 to 15.
-+		 * Indexes of the FIFO size module parameters in the
-+		 * dev_tx_fifo_size array and the FIFO size registers in
-+		 * the dtxfsiz array run from 0 to 14.
-+		 */
-+
-+		/* Non-periodic Tx FIFO */
-+		nptxfsz_bak = DWC_READ_REG32(&global_regs->gnptxfsiz);
-+		nptxfifosize.b.depth = params->dev_nperio_tx_fifo_size;
-+		start_address = params->dev_rx_fifo_size;
-+		nptxfifosize.b.startaddr = start_address;
-+
-+		DWC_WRITE_REG32(&global_regs->gnptxfsiz, nptxfifosize.d32);
-+
-+		start_address += nptxfifosize.b.depth;
-+
-+		for (i = 0; i < core_if->hwcfg4.b.num_in_eps; i++) {
-+			txfsz_bak[i] = DWC_READ_REG32(&global_regs->dtxfsiz[i]);
-+
-+			txfifosize[i].b.depth = params->dev_tx_fifo_size[i];
-+			txfifosize[i].b.startaddr = start_address;
-+			DWC_WRITE_REG32(&global_regs->dtxfsiz[i],
-+					txfifosize[i].d32);
-+
-+			start_address += txfifosize[i].b.depth;
-+		}
-+
-+		/** Check if register values are set correctly */
-+		if (rx_fifo_size != DWC_READ_REG32(&global_regs->grxfsiz)) {
-+			retval = 0;
-+		}
-+
-+		if (nptxfifosize.d32 != DWC_READ_REG32(&global_regs->gnptxfsiz)) {
-+			retval = 0;
-+		}
-+
-+		for (i = 0; i < core_if->hwcfg4.b.num_in_eps; i++) {
-+			if (txfifosize[i].d32 !=
-+			    DWC_READ_REG32(&global_regs->dtxfsiz[i])) {
-+				retval = 0;
-+			}
-+		}
-+
-+		/** If register values are not set correctly, reset old values */
-+		if (retval == 0) {
-+			DWC_WRITE_REG32(&global_regs->grxfsiz, rx_fsz_bak);
-+
-+			/* Non-periodic Tx FIFO */
-+			DWC_WRITE_REG32(&global_regs->gnptxfsiz, nptxfsz_bak);
-+
-+			for (i = 0; i < core_if->hwcfg4.b.num_in_eps; i++) {
-+				DWC_WRITE_REG32(&global_regs->dtxfsiz[i],
-+						txfsz_bak[i]);
-+			}
-+		}
-+	} else {
-+		return 0;
-+	}
-+
-+	/* Flush the FIFOs */
-+	dwc_otg_flush_tx_fifo(core_if, 0x10);	/* all Tx FIFOs */
-+	dwc_otg_flush_rx_fifo(core_if);
-+
-+	return retval;
-+}
-+
-+/**
-+ * This function sets a new value for the buffer Alignment setup.
-+ */
-+static int cfi_ep_set_tx_fifo_val(uint8_t * buf, dwc_otg_pcd_t * pcd)
-+{
-+	int retval;
-+	uint32_t fsiz;
-+	uint16_t size;
-+	uint16_t ep_addr;
-+	dwc_otg_pcd_ep_t *ep;
-+	dwc_otg_core_params_t *params = GET_CORE_IF(pcd)->core_params;
-+	tx_fifo_size_setup_t *ptxfifoval;
-+
-+	ptxfifoval = (tx_fifo_size_setup_t *) buf;
-+	ep_addr = ptxfifoval->bEndpointAddress;
-+	size = ptxfifoval->wDepth;
-+
-+	ep = get_ep_by_addr(pcd, ep_addr);
-+
-+	CFI_INFO
-+	    ("%s: Set Tx FIFO size: endpoint addr=0x%02x, depth=%d, FIFO Num=%d\n",
-+	     __func__, ep_addr, size, ep->dwc_ep.tx_fifo_num);
-+
-+	if (NULL == ep) {
-+		CFI_INFO("%s: Unable to get the endpoint addr=0x%02x\n",
-+			 __func__, ep_addr);
-+		return -DWC_E_INVALID;
-+	}
-+
-+	fsiz = params->dev_tx_fifo_size[ep->dwc_ep.tx_fifo_num - 1];
-+	params->dev_tx_fifo_size[ep->dwc_ep.tx_fifo_num - 1] = size;
-+
-+	if (resize_fifos(GET_CORE_IF(pcd))) {
-+		retval = 0;
-+	} else {
-+		CFI_INFO
-+		    ("%s: Error setting the feature Tx FIFO Size for EP%d\n",
-+		     __func__, ep_addr);
-+		params->dev_tx_fifo_size[ep->dwc_ep.tx_fifo_num - 1] = fsiz;
-+		retval = -DWC_E_INVALID;
-+	}
-+
-+	return retval;
-+}
-+
-+/**
-+ * This function sets a new value for the buffer Alignment setup.
-+ */
-+static int cfi_set_rx_fifo_val(uint8_t * buf, dwc_otg_pcd_t * pcd)
-+{
-+	int retval;
-+	uint32_t fsiz;
-+	uint16_t size;
-+	dwc_otg_core_params_t *params = GET_CORE_IF(pcd)->core_params;
-+	rx_fifo_size_setup_t *prxfifoval;
-+
-+	prxfifoval = (rx_fifo_size_setup_t *) buf;
-+	size = prxfifoval->wDepth;
-+
-+	fsiz = params->dev_rx_fifo_size;
-+	params->dev_rx_fifo_size = size;
-+
-+	if (resize_fifos(GET_CORE_IF(pcd))) {
-+		retval = 0;
-+	} else {
-+		CFI_INFO("%s: Error setting the feature Rx FIFO Size\n",
-+			 __func__);
-+		params->dev_rx_fifo_size = fsiz;
-+		retval = -DWC_E_INVALID;
-+	}
-+
-+	return retval;
-+}
-+
-+/**
-+ * This function reads the SG of an EP's buffer setup into the buffer buf
-+ */
-+static int cfi_ep_get_sg_val(uint8_t * buf, struct dwc_otg_pcd *pcd,
-+			     struct cfi_usb_ctrlrequest *req)
-+{
-+	int retval = -DWC_E_INVALID;
-+	uint8_t addr;
-+	cfi_ep_t *ep;
-+
-+	/* The Low Byte of the wValue contains a non-zero address of the endpoint */
-+	addr = req->wValue & 0xFF;
-+	if (addr == 0)		/* The address should be non-zero */
-+		return retval;
-+
-+	ep = get_cfi_ep_by_addr(pcd->cfi, addr);
-+	if (NULL == ep) {
-+		CFI_INFO("%s: Unable to get the endpoint address(0x%02x)\n",
-+			 __func__, addr);
-+		return retval;
-+	}
-+
-+	dwc_memcpy(buf, ep->bm_sg, BS_SG_VAL_DESC_LEN);
-+	retval = BS_SG_VAL_DESC_LEN;
-+	return retval;
-+}
-+
-+/**
-+ * This function reads the Concatenation value of an EP's buffer mode into
-+ * the buffer buf
-+ */
-+static int cfi_ep_get_concat_val(uint8_t * buf, struct dwc_otg_pcd *pcd,
-+				 struct cfi_usb_ctrlrequest *req)
-+{
-+	int retval = -DWC_E_INVALID;
-+	uint8_t addr;
-+	cfi_ep_t *ep;
-+	uint8_t desc_count;
-+
-+	/* The Low Byte of the wValue contains a non-zero address of the endpoint */
-+	addr = req->wValue & 0xFF;
-+	if (addr == 0)		/* The address should be non-zero */
-+		return retval;
-+
-+	ep = get_cfi_ep_by_addr(pcd->cfi, addr);
-+	if (NULL == ep) {
-+		CFI_INFO("%s: Unable to get the endpoint address(0x%02x)\n",
-+			 __func__, addr);
-+		return retval;
-+	}
-+
-+	/* Copy the header to the buffer */
-+	dwc_memcpy(buf, ep->bm_concat, BS_CONCAT_VAL_HDR_LEN);
-+	/* Advance the buffer pointer by the header size */
-+	buf += BS_CONCAT_VAL_HDR_LEN;
-+
-+	desc_count = ep->bm_concat->hdr.bDescCount;
-+	/* Copy alll the wTxBytes to the buffer */
-+	dwc_memcpy(buf, ep->bm_concat->wTxBytes, sizeof(uid16_t) * desc_count);
-+
-+	retval = BS_CONCAT_VAL_HDR_LEN + sizeof(uid16_t) * desc_count;
-+	return retval;
-+}
-+
-+/**
-+ * This function reads the buffer Alignment value of an EP's buffer mode into
-+ * the buffer buf
-+ *
-+ * @return The total number of bytes copied to the buffer or negative error code.
-+ */
-+static int cfi_ep_get_align_val(uint8_t * buf, struct dwc_otg_pcd *pcd,
-+				struct cfi_usb_ctrlrequest *req)
-+{
-+	int retval = -DWC_E_INVALID;
-+	uint8_t addr;
-+	cfi_ep_t *ep;
-+
-+	/* The Low Byte of the wValue contains a non-zero address of the endpoint */
-+	addr = req->wValue & 0xFF;
-+	if (addr == 0)		/* The address should be non-zero */
-+		return retval;
-+
-+	ep = get_cfi_ep_by_addr(pcd->cfi, addr);
-+	if (NULL == ep) {
-+		CFI_INFO("%s: Unable to get the endpoint address(0x%02x)\n",
-+			 __func__, addr);
-+		return retval;
-+	}
-+
-+	dwc_memcpy(buf, ep->bm_align, BS_ALIGN_VAL_HDR_LEN);
-+	retval = BS_ALIGN_VAL_HDR_LEN;
-+
-+	return retval;
-+}
-+
-+/**
-+ * This function sets a new value for the specified feature
-+ *
-+ * @param	pcd	A pointer to the PCD object
-+ *
-+ * @return 0 if successful, negative error code otherwise to stall the DCE.
-+ */
-+static int cfi_set_feature_value(struct dwc_otg_pcd *pcd)
-+{
-+	int retval = -DWC_E_NOT_SUPPORTED;
-+	uint16_t wIndex, wValue;
-+	uint8_t bRequest;
-+	struct dwc_otg_core_if *coreif;
-+	cfiobject_t *cfi = pcd->cfi;
-+	struct cfi_usb_ctrlrequest *ctrl_req;
-+	uint8_t *buf;
-+	ctrl_req = &cfi->ctrl_req;
-+
-+	buf = pcd->cfi->ctrl_req.data;
-+
-+	coreif = GET_CORE_IF(pcd);
-+	bRequest = ctrl_req->bRequest;
-+	wIndex = DWC_CONSTANT_CPU_TO_LE16(ctrl_req->wIndex);
-+	wValue = DWC_CONSTANT_CPU_TO_LE16(ctrl_req->wValue);
-+
-+	/* See which feature is to be modified */
-+	switch (wIndex) {
-+	case FT_ID_DMA_BUFFER_SETUP:
-+		/* Modify the feature */
-+		if ((retval = cfi_ep_set_sg_val(buf, pcd)) < 0)
-+			return retval;
-+
-+		/* And send this request to the gadget */
-+		cfi->need_gadget_att = 1;
-+		break;
-+
-+	case FT_ID_DMA_BUFF_ALIGN:
-+		if ((retval = cfi_ep_set_alignment_val(buf, pcd)) < 0)
-+			return retval;
-+		cfi->need_gadget_att = 1;
-+		break;
-+
-+	case FT_ID_DMA_CONCAT_SETUP:
-+		/* Modify the feature */
-+		if ((retval = cfi_ep_set_concat_val(buf, pcd)) < 0)
-+			return retval;
-+		cfi->need_gadget_att = 1;
-+		break;
-+
-+	case FT_ID_DMA_CIRCULAR:
-+		CFI_INFO("FT_ID_DMA_CIRCULAR\n");
-+		break;
-+
-+	case FT_ID_THRESHOLD_SETUP:
-+		CFI_INFO("FT_ID_THRESHOLD_SETUP\n");
-+		break;
-+
-+	case FT_ID_DFIFO_DEPTH:
-+		CFI_INFO("FT_ID_DFIFO_DEPTH\n");
-+		break;
-+
-+	case FT_ID_TX_FIFO_DEPTH:
-+		CFI_INFO("FT_ID_TX_FIFO_DEPTH\n");
-+		if ((retval = cfi_ep_set_tx_fifo_val(buf, pcd)) < 0)
-+			return retval;
-+		cfi->need_gadget_att = 0;
-+		break;
-+
-+	case FT_ID_RX_FIFO_DEPTH:
-+		CFI_INFO("FT_ID_RX_FIFO_DEPTH\n");
-+		if ((retval = cfi_set_rx_fifo_val(buf, pcd)) < 0)
-+			return retval;
-+		cfi->need_gadget_att = 0;
-+		break;
-+	}
-+
-+	return retval;
-+}
-+
-+#endif //DWC_UTE_CFI
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_cfi.h
-@@ -0,0 +1,320 @@
-+/* ==========================================================================
-+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
-+ * "Software") is an Unsupported proprietary work of Synopsys, Inc. unless
-+ * otherwise expressly agreed to in writing between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product under
-+ * any End User Software License Agreement or Agreement for Licensed Product
-+ * with Synopsys or any supplement thereto. You are permitted to use and
-+ * redistribute this Software in source and binary forms, with or without
-+ * modification, provided that redistributions of source code must retain this
-+ * notice. You may not view, use, disclose, copy or distribute this file or
-+ * any information contained herein except pursuant to this license grant from
-+ * Synopsys. If you do not agree with this notice, including the disclaimer
-+ * below, then you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" BASIS
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS BE LIABLE FOR ANY DIRECT,
-+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================== */
-+
-+#if !defined(__DWC_OTG_CFI_H__)
-+#define __DWC_OTG_CFI_H__
-+
-+#include "dwc_otg_pcd.h"
-+#include "dwc_cfi_common.h"
-+
-+/**
-+ * @file
-+ * This file contains the CFI related OTG PCD specific common constants,
-+ * interfaces(functions and macros) and data structures.The CFI Protocol is an
-+ * optional interface for internal testing purposes that a DUT may implement to
-+ * support testing of configurable features.
-+ *
-+ */
-+
-+struct dwc_otg_pcd;
-+struct dwc_otg_pcd_ep;
-+
-+/** OTG CFI Features (properties) ID constants */
-+/** This is a request for all Core Features */
-+#define FT_ID_DMA_MODE					0x0001
-+#define FT_ID_DMA_BUFFER_SETUP			0x0002
-+#define FT_ID_DMA_BUFF_ALIGN			0x0003
-+#define FT_ID_DMA_CONCAT_SETUP			0x0004
-+#define FT_ID_DMA_CIRCULAR				0x0005
-+#define FT_ID_THRESHOLD_SETUP			0x0006
-+#define FT_ID_DFIFO_DEPTH				0x0007
-+#define FT_ID_TX_FIFO_DEPTH				0x0008
-+#define FT_ID_RX_FIFO_DEPTH				0x0009
-+
-+/**********************************************************/
-+#define CFI_INFO_DEF
-+
-+#ifdef CFI_INFO_DEF
-+#define CFI_INFO(fmt...)	DWC_PRINTF("CFI: " fmt);
-+#else
-+#define CFI_INFO(fmt...)
-+#endif
-+
-+#define min(x,y) ({ \
-+	x < y ? x : y; })
-+
-+#define max(x,y) ({ \
-+	x > y ? x : y; })
-+
-+/**
-+ * Descriptor DMA SG Buffer setup structure (SG buffer). This structure is
-+ * also used for setting up a buffer for Circular DDMA.
-+ */
-+struct _ddma_sg_buffer_setup {
-+#define BS_SG_VAL_DESC_LEN	6
-+	/* The OUT EP address */
-+	uint8_t bOutEndpointAddress;
-+	/* The IN EP address */
-+	uint8_t bInEndpointAddress;
-+	/* Number of bytes to put between transfer segments (must be DWORD boundaries) */
-+	uint8_t bOffset;
-+	/* The number of transfer segments (a DMA descriptors per each segment) */
-+	uint8_t bCount;
-+	/* Size (in byte) of each transfer segment */
-+	uint16_t wSize;
-+} __attribute__ ((packed));
-+typedef struct _ddma_sg_buffer_setup ddma_sg_buffer_setup_t;
-+
-+/** Descriptor DMA Concatenation Buffer setup structure */
-+struct _ddma_concat_buffer_setup_hdr {
-+#define BS_CONCAT_VAL_HDR_LEN	4
-+	/* The endpoint for which the buffer is to be set up */
-+	uint8_t bEndpointAddress;
-+	/* The count of descriptors to be used */
-+	uint8_t bDescCount;
-+	/* The total size of the transfer */
-+	uint16_t wSize;
-+} __attribute__ ((packed));
-+typedef struct _ddma_concat_buffer_setup_hdr ddma_concat_buffer_setup_hdr_t;
-+
-+/** Descriptor DMA Concatenation Buffer setup structure */
-+struct _ddma_concat_buffer_setup {
-+	/* The SG header */
-+	ddma_concat_buffer_setup_hdr_t hdr;
-+
-+	/* The XFER sizes pointer (allocated dynamically) */
-+	uint16_t *wTxBytes;
-+} __attribute__ ((packed));
-+typedef struct _ddma_concat_buffer_setup ddma_concat_buffer_setup_t;
-+
-+/** Descriptor DMA Alignment Buffer setup structure */
-+struct _ddma_align_buffer_setup {
-+#define BS_ALIGN_VAL_HDR_LEN	2
-+	uint8_t bEndpointAddress;
-+	uint8_t bAlign;
-+} __attribute__ ((packed));
-+typedef struct _ddma_align_buffer_setup ddma_align_buffer_setup_t;
-+
-+/** Transmit FIFO Size setup structure */
-+struct _tx_fifo_size_setup {
-+	uint8_t bEndpointAddress;
-+	uint16_t wDepth;
-+} __attribute__ ((packed));
-+typedef struct _tx_fifo_size_setup tx_fifo_size_setup_t;
-+
-+/** Transmit FIFO Size setup structure */
-+struct _rx_fifo_size_setup {
-+	uint16_t wDepth;
-+} __attribute__ ((packed));
-+typedef struct _rx_fifo_size_setup rx_fifo_size_setup_t;
-+
-+/**
-+ * struct cfi_usb_ctrlrequest - the CFI implementation of the struct usb_ctrlrequest
-+ * This structure encapsulates the standard usb_ctrlrequest and adds a pointer
-+ * to the data returned in the data stage of a 3-stage Control Write requests.
-+ */
-+struct cfi_usb_ctrlrequest {
-+	uint8_t bRequestType;
-+	uint8_t bRequest;
-+	uint16_t wValue;
-+	uint16_t wIndex;
-+	uint16_t wLength;
-+	uint8_t *data;
-+} UPACKED;
-+
-+/*---------------------------------------------------------------------------*/
-+
-+/**
-+ * The CFI wrapper of the enabled and activated dwc_otg_pcd_ep structures.
-+ * This structure is used to store the buffer setup data for any
-+ * enabled endpoint in the PCD.
-+ */
-+struct cfi_ep {
-+	/* Entry for the list container */
-+	dwc_list_link_t lh;
-+	/* Pointer to the active PCD endpoint structure */
-+	struct dwc_otg_pcd_ep *ep;
-+	/* The last descriptor in the chain of DMA descriptors of the endpoint */
-+	struct dwc_otg_dma_desc *dma_desc_last;
-+	/* The SG feature value */
-+	ddma_sg_buffer_setup_t *bm_sg;
-+	/* The Circular feature value */
-+	ddma_sg_buffer_setup_t *bm_circ;
-+	/* The Concatenation feature value */
-+	ddma_concat_buffer_setup_t *bm_concat;
-+	/* The Alignment feature value */
-+	ddma_align_buffer_setup_t *bm_align;
-+	/* XFER length */
-+	uint32_t xfer_len;
-+	/*
-+	 * Count of DMA descriptors currently used.
-+	 * The total should not exceed the MAX_DMA_DESCS_PER_EP value
-+	 * defined in the dwc_otg_cil.h
-+	 */
-+	uint32_t desc_count;
-+};
-+typedef struct cfi_ep cfi_ep_t;
-+
-+typedef struct cfi_dma_buff {
-+#define CFI_IN_BUF_LEN	1024
-+#define CFI_OUT_BUF_LEN	1024
-+	dma_addr_t addr;
-+	uint8_t *buf;
-+} cfi_dma_buff_t;
-+
-+struct cfiobject;
-+
-+/**
-+ * This is the interface for the CFI operations.
-+ *
-+ * @param	ep_enable			Called when any endpoint is enabled and activated.
-+ * @param	release				Called when the CFI object is released and it needs to correctly
-+ *								deallocate the dynamic memory
-+ * @param	ctrl_write_complete	Called when the data stage of the request is complete
-+ */
-+typedef struct cfi_ops {
-+	int (*ep_enable) (struct cfiobject * cfi, struct dwc_otg_pcd * pcd,
-+			  struct dwc_otg_pcd_ep * ep);
-+	void *(*ep_alloc_buf) (struct cfiobject * cfi, struct dwc_otg_pcd * pcd,
-+			       struct dwc_otg_pcd_ep * ep, dma_addr_t * dma,
-+			       unsigned size, gfp_t flags);
-+	void (*release) (struct cfiobject * cfi);
-+	int (*ctrl_write_complete) (struct cfiobject * cfi,
-+				    struct dwc_otg_pcd * pcd);
-+	void (*build_descriptors) (struct cfiobject * cfi,
-+				   struct dwc_otg_pcd * pcd,
-+				   struct dwc_otg_pcd_ep * ep,
-+				   dwc_otg_pcd_request_t * req);
-+} cfi_ops_t;
-+
-+struct cfiobject {
-+	cfi_ops_t ops;
-+	struct dwc_otg_pcd *pcd;
-+	struct usb_gadget *gadget;
-+
-+	/* Buffers used to send/receive CFI-related request data */
-+	cfi_dma_buff_t buf_in;
-+	cfi_dma_buff_t buf_out;
-+
-+	/* CFI specific Control request wrapper */
-+	struct cfi_usb_ctrlrequest ctrl_req;
-+
-+	/* The list of active EP's in the PCD of type cfi_ep_t */
-+	dwc_list_link_t active_eps;
-+
-+	/* This flag shall control the propagation of a specific request
-+	 * to the gadget's processing routines.
-+	 * 0 - no gadget handling
-+	 * 1 - the gadget needs to know about this request (w/o completing a status
-+	 * phase - just return a 0 to the _setup callback)
-+	 */
-+	uint8_t need_gadget_att;
-+
-+	/* Flag indicating whether the status IN phase needs to be
-+	 * completed by the PCD
-+	 */
-+	uint8_t need_status_in_complete;
-+};
-+typedef struct cfiobject cfiobject_t;
-+
-+#define DUMP_MSG
-+
-+#if defined(DUMP_MSG)
-+static inline void dump_msg(const u8 * buf, unsigned int length)
-+{
-+	unsigned int start, num, i;
-+	char line[52], *p;
-+
-+	if (length >= 512)
-+		return;
-+
-+	start = 0;
-+	while (length > 0) {
-+		num = min(length, 16u);
-+		p = line;
-+		for (i = 0; i < num; ++i) {
-+			if (i == 8)
-+				*p++ = ' ';
-+			DWC_SPRINTF(p, " %02x", buf[i]);
-+			p += 3;
-+		}
-+		*p = 0;
-+		DWC_DEBUG("%6x: %s\n", start, line);
-+		buf += num;
-+		start += num;
-+		length -= num;
-+	}
-+}
-+#else
-+static inline void dump_msg(const u8 * buf, unsigned int length)
-+{
-+}
-+#endif
-+
-+/**
-+ * This function returns a pointer to cfi_ep_t object with the addr address.
-+ */
-+static inline struct cfi_ep *get_cfi_ep_by_addr(struct cfiobject *cfi,
-+						uint8_t addr)
-+{
-+	struct cfi_ep *pcfiep;
-+	dwc_list_link_t *tmp;
-+
-+	DWC_LIST_FOREACH(tmp, &cfi->active_eps) {
-+		pcfiep = DWC_LIST_ENTRY(tmp, struct cfi_ep, lh);
-+
-+		if (pcfiep->ep->desc->bEndpointAddress == addr) {
-+			return pcfiep;
-+		}
-+	}
-+
-+	return NULL;
-+}
-+
-+/**
-+ * This function returns a pointer to cfi_ep_t object that matches
-+ * the dwc_otg_pcd_ep object.
-+ */
-+static inline struct cfi_ep *get_cfi_ep_by_pcd_ep(struct cfiobject *cfi,
-+						  struct dwc_otg_pcd_ep *ep)
-+{
-+	struct cfi_ep *pcfiep = NULL;
-+	dwc_list_link_t *tmp;
-+
-+	DWC_LIST_FOREACH(tmp, &cfi->active_eps) {
-+		pcfiep = DWC_LIST_ENTRY(tmp, struct cfi_ep, lh);
-+		if (pcfiep->ep == ep) {
-+			return pcfiep;
-+		}
-+	}
-+	return NULL;
-+}
-+
-+int cfi_setup(struct dwc_otg_pcd *pcd, struct cfi_usb_ctrlrequest *ctrl);
-+
-+#endif /* (__DWC_OTG_CFI_H__) */
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_cil.c
-@@ -0,0 +1,7146 @@
-+/* ==========================================================================
-+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.c $
-+ * $Revision: #191 $
-+ * $Date: 2012/08/10 $
-+ * $Change: 2047372 $
-+ *
-+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
-+ * "Software") is an Unsupported proprietary work of Synopsys, Inc. unless
-+ * otherwise expressly agreed to in writing between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product under
-+ * any End User Software License Agreement or Agreement for Licensed Product
-+ * with Synopsys or any supplement thereto. You are permitted to use and
-+ * redistribute this Software in source and binary forms, with or without
-+ * modification, provided that redistributions of source code must retain this
-+ * notice. You may not view, use, disclose, copy or distribute this file or
-+ * any information contained herein except pursuant to this license grant from
-+ * Synopsys. If you do not agree with this notice, including the disclaimer
-+ * below, then you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" BASIS
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS BE LIABLE FOR ANY DIRECT,
-+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================== */
-+
-+/** @file
-+ *
-+ * The Core Interface Layer provides basic services for accessing and
-+ * managing the DWC_otg hardware. These services are used by both the
-+ * Host Controller Driver and the Peripheral Controller Driver.
-+ *
-+ * The CIL manages the memory map for the core so that the HCD and PCD
-+ * don't have to do this separately. It also handles basic tasks like
-+ * reading/writing the registers and data FIFOs in the controller.
-+ * Some of the data access functions provide encapsulation of several
-+ * operations required to perform a task, such as writing multiple
-+ * registers to start a transfer. Finally, the CIL performs basic
-+ * services that are not specific to either the host or device modes
-+ * of operation. These services include management of the OTG Host
-+ * Negotiation Protocol (HNP) and Session Request Protocol (SRP). A
-+ * Diagnostic API is also provided to allow testing of the controller
-+ * hardware.
-+ *
-+ * The Core Interface Layer has the following requirements:
-+ * - Provides basic controller operations.
-+ * - Minimal use of OS services.
-+ * - The OS services used will be abstracted by using inline functions
-+ *	 or macros.
-+ *
-+ */
-+
-+#include "dwc_os.h"
-+#include "dwc_otg_regs.h"
-+#include "dwc_otg_cil.h"
-+
-+extern bool cil_force_host;
-+
-+static int dwc_otg_setup_params(dwc_otg_core_if_t * core_if);
-+
-+/**
-+ * This function is called to initialize the DWC_otg CSR data
-+ * structures. The register addresses in the device and host
-+ * structures are initialized from the base address supplied by the
-+ * caller. The calling function must make the OS calls to get the
-+ * base address of the DWC_otg controller registers. The core_params
-+ * argument holds the parameters that specify how the core should be
-+ * configured.
-+ *
-+ * @param reg_base_addr Base address of DWC_otg core registers
-+ *
-+ */
-+dwc_otg_core_if_t *dwc_otg_cil_init(const uint32_t * reg_base_addr)
-+{
-+	dwc_otg_core_if_t *core_if = 0;
-+	dwc_otg_dev_if_t *dev_if = 0;
-+	dwc_otg_host_if_t *host_if = 0;
-+	uint8_t *reg_base = (uint8_t *) reg_base_addr;
-+	int i = 0;
-+
-+	DWC_DEBUGPL(DBG_CILV, "%s(%p)\n", __func__, reg_base_addr);
-+
-+	core_if = DWC_ALLOC(sizeof(dwc_otg_core_if_t));
-+
-+	if (core_if == NULL) {
-+		DWC_DEBUGPL(DBG_CIL,
-+			    "Allocation of dwc_otg_core_if_t failed\n");
-+		return 0;
-+	}
-+	core_if->core_global_regs = (dwc_otg_core_global_regs_t *) reg_base;
-+
-+	/*
-+	 * Allocate the Device Mode structures.
-+	 */
-+	dev_if = DWC_ALLOC(sizeof(dwc_otg_dev_if_t));
-+
-+	if (dev_if == NULL) {
-+		DWC_DEBUGPL(DBG_CIL, "Allocation of dwc_otg_dev_if_t failed\n");
-+		DWC_FREE(core_if);
-+		return 0;
-+	}
-+
-+	dev_if->dev_global_regs =
-+	    (dwc_otg_device_global_regs_t *) (reg_base +
-+					      DWC_DEV_GLOBAL_REG_OFFSET);
-+
-+	for (i = 0; i < MAX_EPS_CHANNELS; i++) {
-+		dev_if->in_ep_regs[i] = (dwc_otg_dev_in_ep_regs_t *)
-+		    (reg_base + DWC_DEV_IN_EP_REG_OFFSET +
-+		     (i * DWC_EP_REG_OFFSET));
-+
-+		dev_if->out_ep_regs[i] = (dwc_otg_dev_out_ep_regs_t *)
-+		    (reg_base + DWC_DEV_OUT_EP_REG_OFFSET +
-+		     (i * DWC_EP_REG_OFFSET));
-+		DWC_DEBUGPL(DBG_CILV, "in_ep_regs[%d]->diepctl=%p\n",
-+			    i, &dev_if->in_ep_regs[i]->diepctl);
-+		DWC_DEBUGPL(DBG_CILV, "out_ep_regs[%d]->doepctl=%p\n",
-+			    i, &dev_if->out_ep_regs[i]->doepctl);
-+	}
-+
-+	dev_if->speed = 0;	// unknown
-+
-+	core_if->dev_if = dev_if;
-+
-+	/*
-+	 * Allocate the Host Mode structures.
-+	 */
-+	host_if = DWC_ALLOC(sizeof(dwc_otg_host_if_t));
-+
-+	if (host_if == NULL) {
-+		DWC_DEBUGPL(DBG_CIL,
-+			    "Allocation of dwc_otg_host_if_t failed\n");
-+		DWC_FREE(dev_if);
-+		DWC_FREE(core_if);
-+		return 0;
-+	}
-+
-+	host_if->host_global_regs = (dwc_otg_host_global_regs_t *)
-+	    (reg_base + DWC_OTG_HOST_GLOBAL_REG_OFFSET);
-+
-+	host_if->hprt0 =
-+	    (uint32_t *) (reg_base + DWC_OTG_HOST_PORT_REGS_OFFSET);
-+
-+	for (i = 0; i < MAX_EPS_CHANNELS; i++) {
-+		host_if->hc_regs[i] = (dwc_otg_hc_regs_t *)
-+		    (reg_base + DWC_OTG_HOST_CHAN_REGS_OFFSET +
-+		     (i * DWC_OTG_CHAN_REGS_OFFSET));
-+		DWC_DEBUGPL(DBG_CILV, "hc_reg[%d]->hcchar=%p\n",
-+			    i, &host_if->hc_regs[i]->hcchar);
-+	}
-+
-+	host_if->num_host_channels = MAX_EPS_CHANNELS;
-+	core_if->host_if = host_if;
-+
-+	for (i = 0; i < MAX_EPS_CHANNELS; i++) {
-+		core_if->data_fifo[i] =
-+		    (uint32_t *) (reg_base + DWC_OTG_DATA_FIFO_OFFSET +
-+				  (i * DWC_OTG_DATA_FIFO_SIZE));
-+		DWC_DEBUGPL(DBG_CILV, "data_fifo[%d]=0x%08lx\n",
-+			    i, (unsigned long)core_if->data_fifo[i]);
-+	}
-+
-+	core_if->pcgcctl = (uint32_t *) (reg_base + DWC_OTG_PCGCCTL_OFFSET);
-+
-+	/* Initiate lx_state to L3 disconnected state */
-+	core_if->lx_state = DWC_OTG_L3;
-+	/*
-+	 * Store the contents of the hardware configuration registers here for
-+	 * easy access later.
-+	 */
-+	core_if->hwcfg1.d32 =
-+	    DWC_READ_REG32(&core_if->core_global_regs->ghwcfg1);
-+	core_if->hwcfg2.d32 =
-+	    DWC_READ_REG32(&core_if->core_global_regs->ghwcfg2);
-+	core_if->hwcfg3.d32 =
-+	    DWC_READ_REG32(&core_if->core_global_regs->ghwcfg3);
-+	core_if->hwcfg4.d32 =
-+	    DWC_READ_REG32(&core_if->core_global_regs->ghwcfg4);
-+
-+	/* Force host mode to get HPTXFSIZ exact power on value */
-+	{
-+		gusbcfg_data_t gusbcfg = {.d32 = 0 };
-+		gusbcfg.d32 =  DWC_READ_REG32(&core_if->core_global_regs->gusbcfg);
-+		gusbcfg.b.force_host_mode = 1;
-+		DWC_WRITE_REG32(&core_if->core_global_regs->gusbcfg, gusbcfg.d32);
-+		dwc_mdelay(100);
-+		core_if->hptxfsiz.d32 =
-+		DWC_READ_REG32(&core_if->core_global_regs->hptxfsiz);
-+		gusbcfg.d32 =  DWC_READ_REG32(&core_if->core_global_regs->gusbcfg);
-+		if (cil_force_host)
-+			gusbcfg.b.force_host_mode = 1;
-+		else
-+			gusbcfg.b.force_host_mode = 0;
-+		DWC_WRITE_REG32(&core_if->core_global_regs->gusbcfg, gusbcfg.d32);
-+		dwc_mdelay(100);
-+	}
-+
-+	DWC_DEBUGPL(DBG_CILV, "hwcfg1=%08x\n", core_if->hwcfg1.d32);
-+	DWC_DEBUGPL(DBG_CILV, "hwcfg2=%08x\n", core_if->hwcfg2.d32);
-+	DWC_DEBUGPL(DBG_CILV, "hwcfg3=%08x\n", core_if->hwcfg3.d32);
-+	DWC_DEBUGPL(DBG_CILV, "hwcfg4=%08x\n", core_if->hwcfg4.d32);
-+
-+	core_if->hcfg.d32 =
-+	    DWC_READ_REG32(&core_if->host_if->host_global_regs->hcfg);
-+	core_if->dcfg.d32 =
-+	    DWC_READ_REG32(&core_if->dev_if->dev_global_regs->dcfg);
-+
-+	DWC_DEBUGPL(DBG_CILV, "hcfg=%08x\n", core_if->hcfg.d32);
-+	DWC_DEBUGPL(DBG_CILV, "dcfg=%08x\n", core_if->dcfg.d32);
-+
-+	DWC_DEBUGPL(DBG_CILV, "op_mode=%0x\n", core_if->hwcfg2.b.op_mode);
-+	DWC_DEBUGPL(DBG_CILV, "arch=%0x\n", core_if->hwcfg2.b.architecture);
-+	DWC_DEBUGPL(DBG_CILV, "num_dev_ep=%d\n", core_if->hwcfg2.b.num_dev_ep);
-+	DWC_DEBUGPL(DBG_CILV, "num_host_chan=%d\n",
-+		    core_if->hwcfg2.b.num_host_chan);
-+	DWC_DEBUGPL(DBG_CILV, "nonperio_tx_q_depth=0x%0x\n",
-+		    core_if->hwcfg2.b.nonperio_tx_q_depth);
-+	DWC_DEBUGPL(DBG_CILV, "host_perio_tx_q_depth=0x%0x\n",
-+		    core_if->hwcfg2.b.host_perio_tx_q_depth);
-+	DWC_DEBUGPL(DBG_CILV, "dev_token_q_depth=0x%0x\n",
-+		    core_if->hwcfg2.b.dev_token_q_depth);
-+
-+	DWC_DEBUGPL(DBG_CILV, "Total FIFO SZ=%d\n",
-+		    core_if->hwcfg3.b.dfifo_depth);
-+	DWC_DEBUGPL(DBG_CILV, "xfer_size_cntr_width=%0x\n",
-+		    core_if->hwcfg3.b.xfer_size_cntr_width);
-+
-+	/*
-+	 * Set the SRP sucess bit for FS-I2c
-+	 */
-+	core_if->srp_success = 0;
-+	core_if->srp_timer_started = 0;
-+
-+	/*
-+	 * Create new workqueue and init works
-+	 */
-+	core_if->wq_otg = DWC_WORKQ_ALLOC("dwc_otg");
-+	if (core_if->wq_otg == 0) {
-+		DWC_WARN("DWC_WORKQ_ALLOC failed\n");
-+		DWC_FREE(host_if);
-+		DWC_FREE(dev_if);
-+		DWC_FREE(core_if);
-+		return 0;
-+	}
-+
-+	core_if->snpsid = DWC_READ_REG32(&core_if->core_global_regs->gsnpsid);
-+
-+	DWC_PRINTF("Core Release: %x.%x%x%x\n",
-+		   (core_if->snpsid >> 12 & 0xF),
-+		   (core_if->snpsid >> 8 & 0xF),
-+		   (core_if->snpsid >> 4 & 0xF), (core_if->snpsid & 0xF));
-+
-+	core_if->wkp_timer = DWC_TIMER_ALLOC("Wake Up Timer",
-+					     w_wakeup_detected, core_if);
-+	if (core_if->wkp_timer == 0) {
-+		DWC_WARN("DWC_TIMER_ALLOC failed\n");
-+		DWC_FREE(host_if);
-+		DWC_FREE(dev_if);
-+		DWC_WORKQ_FREE(core_if->wq_otg);
-+		DWC_FREE(core_if);
-+		return 0;
-+	}
-+
-+	if (dwc_otg_setup_params(core_if)) {
-+		DWC_WARN("Error while setting core params\n");
-+	}
-+
-+	core_if->hibernation_suspend = 0;
-+
-+	/** ADP initialization */
-+	dwc_otg_adp_init(core_if);
-+
-+	return core_if;
-+}
-+
-+/**
-+ * This function frees the structures allocated by dwc_otg_cil_init().
-+ *
-+ * @param core_if The core interface pointer returned from
-+ * 		  dwc_otg_cil_init().
-+ *
-+ */
-+void dwc_otg_cil_remove(dwc_otg_core_if_t * core_if)
-+{
-+	dctl_data_t dctl = {.d32 = 0 };
-+	DWC_DEBUGPL(DBG_CILV, "%s(%p)\n", __func__, core_if);
-+
-+	/* Disable all interrupts */
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gahbcfg, 1, 0);
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gintmsk, 0);
-+
-+	dctl.b.sftdiscon = 1;
-+	if (core_if->snpsid >= OTG_CORE_REV_3_00a) {
-+		DWC_MODIFY_REG32(&core_if->dev_if->dev_global_regs->dctl, 0,
-+				 dctl.d32);
-+	}
-+
-+	if (core_if->wq_otg) {
-+		DWC_WORKQ_WAIT_WORK_DONE(core_if->wq_otg, 500);
-+		DWC_WORKQ_FREE(core_if->wq_otg);
-+	}
-+	if (core_if->dev_if) {
-+		DWC_FREE(core_if->dev_if);
-+	}
-+	if (core_if->host_if) {
-+		DWC_FREE(core_if->host_if);
-+	}
-+
-+	/** Remove ADP Stuff  */
-+	dwc_otg_adp_remove(core_if);
-+	if (core_if->core_params) {
-+		DWC_FREE(core_if->core_params);
-+	}
-+	if (core_if->wkp_timer) {
-+		DWC_TIMER_FREE(core_if->wkp_timer);
-+	}
-+	if (core_if->srp_timer) {
-+		DWC_TIMER_FREE(core_if->srp_timer);
-+	}
-+	DWC_FREE(core_if);
-+}
-+
-+/**
-+ * This function enables the controller's Global Interrupt in the AHB Config
-+ * register.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ */
-+void dwc_otg_enable_global_interrupts(dwc_otg_core_if_t * core_if)
-+{
-+	gahbcfg_data_t ahbcfg = {.d32 = 0 };
-+	ahbcfg.b.glblintrmsk = 1;	/* Enable interrupts */
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gahbcfg, 0, ahbcfg.d32);
-+}
-+
-+/**
-+ * This function disables the controller's Global Interrupt in the AHB Config
-+ * register.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ */
-+void dwc_otg_disable_global_interrupts(dwc_otg_core_if_t * core_if)
-+{
-+	gahbcfg_data_t ahbcfg = {.d32 = 0 };
-+	ahbcfg.b.glblintrmsk = 1;	/* Disable interrupts */
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gahbcfg, ahbcfg.d32, 0);
-+}
-+
-+/**
-+ * This function initializes the commmon interrupts, used in both
-+ * device and host modes.
-+ *
-+ * @param core_if Programming view of the DWC_otg controller
-+ *
-+ */
-+static void dwc_otg_enable_common_interrupts(dwc_otg_core_if_t * core_if)
-+{
-+	dwc_otg_core_global_regs_t *global_regs = core_if->core_global_regs;
-+	gintmsk_data_t intr_mask = {.d32 = 0 };
-+
-+	/* Clear any pending OTG Interrupts */
-+	DWC_WRITE_REG32(&global_regs->gotgint, 0xFFFFFFFF);
-+
-+	/* Clear any pending interrupts */
-+	DWC_WRITE_REG32(&global_regs->gintsts, 0xFFFFFFFF);
-+
-+	/*
-+	 * Enable the interrupts in the GINTMSK.
-+	 */
-+	intr_mask.b.modemismatch = 1;
-+	intr_mask.b.otgintr = 1;
-+
-+	if (!core_if->dma_enable) {
-+		intr_mask.b.rxstsqlvl = 1;
-+	}
-+
-+	intr_mask.b.conidstschng = 1;
-+	intr_mask.b.wkupintr = 1;
-+	intr_mask.b.disconnect = 0;
-+	intr_mask.b.usbsuspend = 1;
-+	intr_mask.b.sessreqintr = 1;
-+#ifdef CONFIG_USB_DWC_OTG_LPM
-+	if (core_if->core_params->lpm_enable) {
-+		intr_mask.b.lpmtranrcvd = 1;
-+	}
-+#endif
-+	DWC_WRITE_REG32(&global_regs->gintmsk, intr_mask.d32);
-+}
-+
-+/*
-+ * The restore operation is modified to support Synopsys Emulated Powerdown and
-+ * Hibernation. This function is for exiting from Device mode hibernation by
-+ * Host Initiated Resume/Reset and Device Initiated Remote-Wakeup.
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param rem_wakeup - indicates whether resume is initiated by Device or Host.
-+ * @param reset - indicates whether resume is initiated by Reset.
-+ */
-+int dwc_otg_device_hibernation_restore(dwc_otg_core_if_t * core_if,
-+				       int rem_wakeup, int reset)
-+{
-+	gpwrdn_data_t gpwrdn = {.d32 = 0 };
-+	pcgcctl_data_t pcgcctl = {.d32 = 0 };
-+	dctl_data_t dctl = {.d32 = 0 };
-+
-+	int timeout = 2000;
-+
-+	if (!core_if->hibernation_suspend) {
-+		DWC_PRINTF("Already exited from Hibernation\n");
-+		return 1;
-+	}
-+
-+	DWC_DEBUGPL(DBG_PCD, "%s called\n", __FUNCTION__);
-+	/* Switch-on voltage to the core */
-+	gpwrdn.b.pwrdnswtch = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+	dwc_udelay(10);
-+
-+	/* Reset core */
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.pwrdnrstn = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+	dwc_udelay(10);
-+
-+	/* Assert Restore signal */
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.restore = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, 0, gpwrdn.d32);
-+	dwc_udelay(10);
-+
-+	/* Disable power clamps */
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.pwrdnclmp = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+
-+	if (rem_wakeup) {
-+		dwc_udelay(70);
-+	}
-+
-+	/* Deassert Reset core */
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.pwrdnrstn = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, 0, gpwrdn.d32);
-+	dwc_udelay(10);
-+
-+	/* Disable PMU interrupt */
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.pmuintsel = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+
-+	/* Mask interrupts from gpwrdn */
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.connect_det_msk = 1;
-+	gpwrdn.b.srp_det_msk = 1;
-+	gpwrdn.b.disconn_det_msk = 1;
-+	gpwrdn.b.rst_det_msk = 1;
-+	gpwrdn.b.lnstchng_msk = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+
-+	/* Indicates that we are going out from hibernation */
-+	core_if->hibernation_suspend = 0;
-+
-+	/*
-+	 * Set Restore Essential Regs bit in PCGCCTL register, restore_mode = 1
-+	 * indicates restore from remote_wakeup
-+	 */
-+	restore_essential_regs(core_if, rem_wakeup, 0);
-+
-+	/*
-+	 * Wait a little for seeing new value of variable hibernation_suspend if
-+	 * Restore done interrupt received before polling
-+	 */
-+	dwc_udelay(10);
-+
-+	if (core_if->hibernation_suspend == 0) {
-+		/*
-+		 * Wait For Restore_done Interrupt. This mechanism of polling the
-+		 * interrupt is introduced to avoid any possible race conditions
-+		 */
-+		do {
-+			gintsts_data_t gintsts;
-+			gintsts.d32 =
-+			    DWC_READ_REG32(&core_if->core_global_regs->gintsts);
-+			if (gintsts.b.restoredone) {
-+				gintsts.d32 = 0;
-+				gintsts.b.restoredone = 1;
-+				DWC_WRITE_REG32(&core_if->core_global_regs->
-+						gintsts, gintsts.d32);
-+				DWC_PRINTF("Restore Done Interrupt seen\n");
-+				break;
-+			}
-+			dwc_udelay(10);
-+		} while (--timeout);
-+		if (!timeout) {
-+			DWC_PRINTF("Restore Done interrupt wasn't generated here\n");
-+		}
-+	}
-+	/* Clear all pending interupts */
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gintsts, 0xFFFFFFFF);
-+
-+	/* De-assert Restore */
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.restore = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+	dwc_udelay(10);
-+
-+	if (!rem_wakeup) {
-+		pcgcctl.d32 = 0;
-+		pcgcctl.b.rstpdwnmodule = 1;
-+		DWC_MODIFY_REG32(core_if->pcgcctl, pcgcctl.d32, 0);
-+	}
-+
-+	/* Restore GUSBCFG and DCFG */
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gusbcfg,
-+			core_if->gr_backup->gusbcfg_local);
-+	DWC_WRITE_REG32(&core_if->dev_if->dev_global_regs->dcfg,
-+			core_if->dr_backup->dcfg);
-+
-+	/* De-assert Wakeup Logic */
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.pmuactv = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+	dwc_udelay(10);
-+
-+	if (!rem_wakeup) {
-+		/* Set Device programming done bit */
-+		dctl.b.pwronprgdone = 1;
-+		DWC_MODIFY_REG32(&core_if->dev_if->dev_global_regs->dctl, 0, dctl.d32);
-+	} else {
-+		/* Start Remote Wakeup Signaling */
-+		dctl.d32 = core_if->dr_backup->dctl;
-+		dctl.b.rmtwkupsig = 1;
-+		DWC_WRITE_REG32(&core_if->dev_if->dev_global_regs->dctl, dctl.d32);
-+	}
-+
-+	dwc_mdelay(2);
-+	/* Clear all pending interupts */
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gintsts, 0xFFFFFFFF);
-+
-+	/* Restore global registers */
-+	dwc_otg_restore_global_regs(core_if);
-+	/* Restore device global registers */
-+	dwc_otg_restore_dev_regs(core_if, rem_wakeup);
-+
-+	if (rem_wakeup) {
-+		dwc_mdelay(7);
-+		dctl.d32 = 0;
-+		dctl.b.rmtwkupsig = 1;
-+		DWC_MODIFY_REG32(&core_if->dev_if->dev_global_regs->dctl, dctl.d32, 0);
-+	}
-+
-+	core_if->hibernation_suspend = 0;
-+	/* The core will be in ON STATE */
-+	core_if->lx_state = DWC_OTG_L0;
-+	DWC_PRINTF("Hibernation recovery completes here\n");
-+
-+	return 1;
-+}
-+
-+/*
-+ * The restore operation is modified to support Synopsys Emulated Powerdown and
-+ * Hibernation. This function is for exiting from Host mode hibernation by
-+ * Host Initiated Resume/Reset and Device Initiated Remote-Wakeup.
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param rem_wakeup - indicates whether resume is initiated by Device or Host.
-+ * @param reset - indicates whether resume is initiated by Reset.
-+ */
-+int dwc_otg_host_hibernation_restore(dwc_otg_core_if_t * core_if,
-+				     int rem_wakeup, int reset)
-+{
-+	gpwrdn_data_t gpwrdn = {.d32 = 0 };
-+	hprt0_data_t hprt0 = {.d32 = 0 };
-+
-+	int timeout = 2000;
-+
-+	DWC_DEBUGPL(DBG_HCD, "%s called\n", __FUNCTION__);
-+	/* Switch-on voltage to the core */
-+	gpwrdn.b.pwrdnswtch = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+	dwc_udelay(10);
-+
-+	/* Reset core */
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.pwrdnrstn = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+	dwc_udelay(10);
-+
-+	/* Assert Restore signal */
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.restore = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, 0, gpwrdn.d32);
-+	dwc_udelay(10);
-+
-+	/* Disable power clamps */
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.pwrdnclmp = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+
-+	if (!rem_wakeup) {
-+		dwc_udelay(50);
-+	}
-+
-+	/* Deassert Reset core */
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.pwrdnrstn = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, 0, gpwrdn.d32);
-+	dwc_udelay(10);
-+
-+	/* Disable PMU interrupt */
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.pmuintsel = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.connect_det_msk = 1;
-+	gpwrdn.b.srp_det_msk = 1;
-+	gpwrdn.b.disconn_det_msk = 1;
-+	gpwrdn.b.rst_det_msk = 1;
-+	gpwrdn.b.lnstchng_msk = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+
-+	/* Indicates that we are going out from hibernation */
-+	core_if->hibernation_suspend = 0;
-+
-+	/* Set Restore Essential Regs bit in PCGCCTL register */
-+	restore_essential_regs(core_if, rem_wakeup, 1);
-+
-+	/* Wait a little for seeing new value of variable hibernation_suspend if
-+	 * Restore done interrupt received before polling */
-+	dwc_udelay(10);
-+
-+	if (core_if->hibernation_suspend == 0) {
-+		/* Wait For Restore_done Interrupt. This mechanism of polling the
-+		 * interrupt is introduced to avoid any possible race conditions
-+		 */
-+		do {
-+			gintsts_data_t gintsts;
-+			gintsts.d32 = DWC_READ_REG32(&core_if->core_global_regs->gintsts);
-+			if (gintsts.b.restoredone) {
-+				gintsts.d32 = 0;
-+				gintsts.b.restoredone = 1;
-+			DWC_WRITE_REG32(&core_if->core_global_regs->gintsts, gintsts.d32);
-+				DWC_DEBUGPL(DBG_HCD,"Restore Done Interrupt seen\n");
-+				break;
-+			}
-+			dwc_udelay(10);
-+		} while (--timeout);
-+		if (!timeout) {
-+			DWC_WARN("Restore Done interrupt wasn't generated\n");
-+		}
-+	}
-+
-+	/* Set the flag's value to 0 again after receiving restore done interrupt */
-+	core_if->hibernation_suspend = 0;
-+
-+	/* This step is not described in functional spec but if not wait for this
-+	 * delay, mismatch interrupts occurred because just after restore core is
-+	 * in Device mode(gintsts.curmode == 0) */
-+	dwc_mdelay(100);
-+
-+	/* Clear all pending interrupts */
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gintsts, 0xFFFFFFFF);
-+
-+	/* De-assert Restore */
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.restore = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+	dwc_udelay(10);
-+
-+	/* Restore GUSBCFG and HCFG */
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gusbcfg,
-+			core_if->gr_backup->gusbcfg_local);
-+	DWC_WRITE_REG32(&core_if->host_if->host_global_regs->hcfg,
-+			core_if->hr_backup->hcfg_local);
-+
-+	/* De-assert Wakeup Logic */
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.pmuactv = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+	dwc_udelay(10);
-+
-+	/* Start the Resume operation by programming HPRT0 */
-+	hprt0.d32 = core_if->hr_backup->hprt0_local;
-+	hprt0.b.prtpwr = 1;
-+	hprt0.b.prtena = 0;
-+	hprt0.b.prtsusp = 0;
-+	DWC_WRITE_REG32(core_if->host_if->hprt0, hprt0.d32);
-+
-+	DWC_PRINTF("Resume Starts Now\n");
-+	if (!reset) {		// Indicates it is Resume Operation
-+		hprt0.d32 = core_if->hr_backup->hprt0_local;
-+		hprt0.b.prtres = 1;
-+		hprt0.b.prtpwr = 1;
-+		hprt0.b.prtena = 0;
-+		hprt0.b.prtsusp = 0;
-+		DWC_WRITE_REG32(core_if->host_if->hprt0, hprt0.d32);
-+
-+		if (!rem_wakeup)
-+			hprt0.b.prtres = 0;
-+		/* Wait for Resume time and then program HPRT again */
-+		dwc_mdelay(100);
-+		DWC_WRITE_REG32(core_if->host_if->hprt0, hprt0.d32);
-+
-+	} else {		// Indicates it is Reset Operation
-+		hprt0.d32 = core_if->hr_backup->hprt0_local;
-+		hprt0.b.prtrst = 1;
-+		hprt0.b.prtpwr = 1;
-+		hprt0.b.prtena = 0;
-+		hprt0.b.prtsusp = 0;
-+		DWC_WRITE_REG32(core_if->host_if->hprt0, hprt0.d32);
-+		/* Wait for Reset time and then program HPRT again */
-+		dwc_mdelay(60);
-+		hprt0.b.prtrst = 0;
-+		DWC_WRITE_REG32(core_if->host_if->hprt0, hprt0.d32);
-+	}
-+	/* Clear all interrupt status */
-+	hprt0.d32 = dwc_otg_read_hprt0(core_if);
-+	hprt0.b.prtconndet = 1;
-+	hprt0.b.prtenchng = 1;
-+	DWC_WRITE_REG32(core_if->host_if->hprt0, hprt0.d32);
-+
-+	/* Clear all pending interupts */
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gintsts, 0xFFFFFFFF);
-+
-+	/* Restore global registers */
-+	dwc_otg_restore_global_regs(core_if);
-+	/* Restore host global registers */
-+	dwc_otg_restore_host_regs(core_if, reset);
-+
-+	/* The core will be in ON STATE */
-+	core_if->lx_state = DWC_OTG_L0;
-+	DWC_PRINTF("Hibernation recovery is complete here\n");
-+	return 0;
-+}
-+
-+/** Saves some register values into system memory. */
-+int dwc_otg_save_global_regs(dwc_otg_core_if_t * core_if)
-+{
-+	struct dwc_otg_global_regs_backup *gr;
-+	int i;
-+
-+	gr = core_if->gr_backup;
-+	if (!gr) {
-+		gr = DWC_ALLOC(sizeof(*gr));
-+		if (!gr) {
-+			return -DWC_E_NO_MEMORY;
-+		}
-+		core_if->gr_backup = gr;
-+	}
-+
-+	gr->gotgctl_local = DWC_READ_REG32(&core_if->core_global_regs->gotgctl);
-+	gr->gintmsk_local = DWC_READ_REG32(&core_if->core_global_regs->gintmsk);
-+	gr->gahbcfg_local = DWC_READ_REG32(&core_if->core_global_regs->gahbcfg);
-+	gr->gusbcfg_local = DWC_READ_REG32(&core_if->core_global_regs->gusbcfg);
-+	gr->grxfsiz_local = DWC_READ_REG32(&core_if->core_global_regs->grxfsiz);
-+	gr->gnptxfsiz_local = DWC_READ_REG32(&core_if->core_global_regs->gnptxfsiz);
-+	gr->hptxfsiz_local = DWC_READ_REG32(&core_if->core_global_regs->hptxfsiz);
-+#ifdef CONFIG_USB_DWC_OTG_LPM
-+	gr->glpmcfg_local = DWC_READ_REG32(&core_if->core_global_regs->glpmcfg);
-+#endif
-+	gr->gi2cctl_local = DWC_READ_REG32(&core_if->core_global_regs->gi2cctl);
-+	gr->pcgcctl_local = DWC_READ_REG32(core_if->pcgcctl);
-+	gr->gdfifocfg_local =
-+	    DWC_READ_REG32(&core_if->core_global_regs->gdfifocfg);
-+	for (i = 0; i < MAX_EPS_CHANNELS; i++) {
-+		gr->dtxfsiz_local[i] =
-+		    DWC_READ_REG32(&(core_if->core_global_regs->dtxfsiz[i]));
-+	}
-+
-+	DWC_DEBUGPL(DBG_ANY, "===========Backing Global registers==========\n");
-+	DWC_DEBUGPL(DBG_ANY, "Backed up gotgctl   = %08x\n", gr->gotgctl_local);
-+	DWC_DEBUGPL(DBG_ANY, "Backed up gintmsk   = %08x\n", gr->gintmsk_local);
-+	DWC_DEBUGPL(DBG_ANY, "Backed up gahbcfg   = %08x\n", gr->gahbcfg_local);
-+	DWC_DEBUGPL(DBG_ANY, "Backed up gusbcfg   = %08x\n", gr->gusbcfg_local);
-+	DWC_DEBUGPL(DBG_ANY, "Backed up grxfsiz   = %08x\n", gr->grxfsiz_local);
-+	DWC_DEBUGPL(DBG_ANY, "Backed up gnptxfsiz = %08x\n",
-+		    gr->gnptxfsiz_local);
-+	DWC_DEBUGPL(DBG_ANY, "Backed up hptxfsiz  = %08x\n",
-+		    gr->hptxfsiz_local);
-+#ifdef CONFIG_USB_DWC_OTG_LPM
-+	DWC_DEBUGPL(DBG_ANY, "Backed up glpmcfg   = %08x\n", gr->glpmcfg_local);
-+#endif
-+	DWC_DEBUGPL(DBG_ANY, "Backed up gi2cctl   = %08x\n", gr->gi2cctl_local);
-+	DWC_DEBUGPL(DBG_ANY, "Backed up pcgcctl   = %08x\n", gr->pcgcctl_local);
-+	DWC_DEBUGPL(DBG_ANY,"Backed up gdfifocfg   = %08x\n",gr->gdfifocfg_local);
-+
-+	return 0;
-+}
-+
-+/** Saves GINTMSK register before setting the msk bits. */
-+int dwc_otg_save_gintmsk_reg(dwc_otg_core_if_t * core_if)
-+{
-+	struct dwc_otg_global_regs_backup *gr;
-+
-+	gr = core_if->gr_backup;
-+	if (!gr) {
-+		gr = DWC_ALLOC(sizeof(*gr));
-+		if (!gr) {
-+			return -DWC_E_NO_MEMORY;
-+		}
-+		core_if->gr_backup = gr;
-+	}
-+
-+	gr->gintmsk_local = DWC_READ_REG32(&core_if->core_global_regs->gintmsk);
-+
-+	DWC_DEBUGPL(DBG_ANY,"=============Backing GINTMSK registers============\n");
-+	DWC_DEBUGPL(DBG_ANY, "Backed up gintmsk   = %08x\n", gr->gintmsk_local);
-+
-+	return 0;
-+}
-+
-+int dwc_otg_save_dev_regs(dwc_otg_core_if_t * core_if)
-+{
-+	struct dwc_otg_dev_regs_backup *dr;
-+	int i;
-+
-+	dr = core_if->dr_backup;
-+	if (!dr) {
-+		dr = DWC_ALLOC(sizeof(*dr));
-+		if (!dr) {
-+			return -DWC_E_NO_MEMORY;
-+		}
-+		core_if->dr_backup = dr;
-+	}
-+
-+	dr->dcfg = DWC_READ_REG32(&core_if->dev_if->dev_global_regs->dcfg);
-+	dr->dctl = DWC_READ_REG32(&core_if->dev_if->dev_global_regs->dctl);
-+	dr->daintmsk =
-+	    DWC_READ_REG32(&core_if->dev_if->dev_global_regs->daintmsk);
-+	dr->diepmsk =
-+	    DWC_READ_REG32(&core_if->dev_if->dev_global_regs->diepmsk);
-+	dr->doepmsk =
-+	    DWC_READ_REG32(&core_if->dev_if->dev_global_regs->doepmsk);
-+
-+	for (i = 0; i < core_if->dev_if->num_in_eps; ++i) {
-+		dr->diepctl[i] =
-+		    DWC_READ_REG32(&core_if->dev_if->in_ep_regs[i]->diepctl);
-+		dr->dieptsiz[i] =
-+		    DWC_READ_REG32(&core_if->dev_if->in_ep_regs[i]->dieptsiz);
-+		dr->diepdma[i] =
-+		    DWC_READ_REG32(&core_if->dev_if->in_ep_regs[i]->diepdma);
-+	}
-+
-+	DWC_DEBUGPL(DBG_ANY,
-+		    "=============Backing Host registers==============\n");
-+	DWC_DEBUGPL(DBG_ANY, "Backed up dcfg            = %08x\n", dr->dcfg);
-+	DWC_DEBUGPL(DBG_ANY, "Backed up dctl        = %08x\n", dr->dctl);
-+	DWC_DEBUGPL(DBG_ANY, "Backed up daintmsk            = %08x\n",
-+		    dr->daintmsk);
-+	DWC_DEBUGPL(DBG_ANY, "Backed up diepmsk        = %08x\n", dr->diepmsk);
-+	DWC_DEBUGPL(DBG_ANY, "Backed up doepmsk        = %08x\n", dr->doepmsk);
-+	for (i = 0; i < core_if->dev_if->num_in_eps; ++i) {
-+		DWC_DEBUGPL(DBG_ANY, "Backed up diepctl[%d]        = %08x\n", i,
-+			    dr->diepctl[i]);
-+		DWC_DEBUGPL(DBG_ANY, "Backed up dieptsiz[%d]        = %08x\n",
-+			    i, dr->dieptsiz[i]);
-+		DWC_DEBUGPL(DBG_ANY, "Backed up diepdma[%d]        = %08x\n", i,
-+			    dr->diepdma[i]);
-+	}
-+
-+	return 0;
-+}
-+
-+int dwc_otg_save_host_regs(dwc_otg_core_if_t * core_if)
-+{
-+	struct dwc_otg_host_regs_backup *hr;
-+	int i;
-+
-+	hr = core_if->hr_backup;
-+	if (!hr) {
-+		hr = DWC_ALLOC(sizeof(*hr));
-+		if (!hr) {
-+			return -DWC_E_NO_MEMORY;
-+		}
-+		core_if->hr_backup = hr;
-+	}
-+
-+	hr->hcfg_local =
-+	    DWC_READ_REG32(&core_if->host_if->host_global_regs->hcfg);
-+	hr->haintmsk_local =
-+	    DWC_READ_REG32(&core_if->host_if->host_global_regs->haintmsk);
-+	for (i = 0; i < dwc_otg_get_param_host_channels(core_if); ++i) {
-+		hr->hcintmsk_local[i] =
-+		    DWC_READ_REG32(&core_if->host_if->hc_regs[i]->hcintmsk);
-+	}
-+	hr->hprt0_local = DWC_READ_REG32(core_if->host_if->hprt0);
-+	hr->hfir_local =
-+	    DWC_READ_REG32(&core_if->host_if->host_global_regs->hfir);
-+
-+	DWC_DEBUGPL(DBG_ANY,
-+		    "=============Backing Host registers===============\n");
-+	DWC_DEBUGPL(DBG_ANY, "Backed up hcfg		= %08x\n",
-+		    hr->hcfg_local);
-+	DWC_DEBUGPL(DBG_ANY, "Backed up haintmsk = %08x\n", hr->haintmsk_local);
-+	for (i = 0; i < dwc_otg_get_param_host_channels(core_if); ++i) {
-+		DWC_DEBUGPL(DBG_ANY, "Backed up hcintmsk[%02d]=%08x\n", i,
-+			    hr->hcintmsk_local[i]);
-+	}
-+	DWC_DEBUGPL(DBG_ANY, "Backed up hprt0           = %08x\n",
-+		    hr->hprt0_local);
-+	DWC_DEBUGPL(DBG_ANY, "Backed up hfir           = %08x\n",
-+		    hr->hfir_local);
-+
-+	return 0;
-+}
-+
-+int dwc_otg_restore_global_regs(dwc_otg_core_if_t *core_if)
-+{
-+	struct dwc_otg_global_regs_backup *gr;
-+	int i;
-+
-+	gr = core_if->gr_backup;
-+	if (!gr) {
-+		return -DWC_E_INVALID;
-+	}
-+
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gotgctl, gr->gotgctl_local);
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gintmsk, gr->gintmsk_local);
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gusbcfg, gr->gusbcfg_local);
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gahbcfg, gr->gahbcfg_local);
-+	DWC_WRITE_REG32(&core_if->core_global_regs->grxfsiz, gr->grxfsiz_local);
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gnptxfsiz,
-+			gr->gnptxfsiz_local);
-+	DWC_WRITE_REG32(&core_if->core_global_regs->hptxfsiz,
-+			gr->hptxfsiz_local);
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gdfifocfg,
-+			gr->gdfifocfg_local);
-+	for (i = 0; i < MAX_EPS_CHANNELS; i++) {
-+		DWC_WRITE_REG32(&core_if->core_global_regs->dtxfsiz[i],
-+				gr->dtxfsiz_local[i]);
-+	}
-+
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gintsts, 0xFFFFFFFF);
-+	DWC_WRITE_REG32(core_if->host_if->hprt0, 0x0000100A);
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gahbcfg,
-+			(gr->gahbcfg_local));
-+	return 0;
-+}
-+
-+int dwc_otg_restore_dev_regs(dwc_otg_core_if_t * core_if, int rem_wakeup)
-+{
-+	struct dwc_otg_dev_regs_backup *dr;
-+	int i;
-+
-+	dr = core_if->dr_backup;
-+
-+	if (!dr) {
-+		return -DWC_E_INVALID;
-+	}
-+
-+	if (!rem_wakeup) {
-+		DWC_WRITE_REG32(&core_if->dev_if->dev_global_regs->dctl,
-+				dr->dctl);
-+	}
-+
-+	DWC_WRITE_REG32(&core_if->dev_if->dev_global_regs->daintmsk, dr->daintmsk);
-+	DWC_WRITE_REG32(&core_if->dev_if->dev_global_regs->diepmsk, dr->diepmsk);
-+	DWC_WRITE_REG32(&core_if->dev_if->dev_global_regs->doepmsk, dr->doepmsk);
-+
-+	for (i = 0; i < core_if->dev_if->num_in_eps; ++i) {
-+		DWC_WRITE_REG32(&core_if->dev_if->in_ep_regs[i]->dieptsiz, dr->dieptsiz[i]);
-+		DWC_WRITE_REG32(&core_if->dev_if->in_ep_regs[i]->diepdma, dr->diepdma[i]);
-+		DWC_WRITE_REG32(&core_if->dev_if->in_ep_regs[i]->diepctl, dr->diepctl[i]);
-+	}
-+
-+	return 0;
-+}
-+
-+int dwc_otg_restore_host_regs(dwc_otg_core_if_t * core_if, int reset)
-+{
-+	struct dwc_otg_host_regs_backup *hr;
-+	int i;
-+	hr = core_if->hr_backup;
-+
-+	if (!hr) {
-+		return -DWC_E_INVALID;
-+	}
-+
-+	DWC_WRITE_REG32(&core_if->host_if->host_global_regs->hcfg, hr->hcfg_local);
-+	//if (!reset)
-+	//{
-+	//      DWC_WRITE_REG32(&core_if->host_if->host_global_regs->hfir, hr->hfir_local);
-+	//}
-+
-+	DWC_WRITE_REG32(&core_if->host_if->host_global_regs->haintmsk,
-+			hr->haintmsk_local);
-+	for (i = 0; i < dwc_otg_get_param_host_channels(core_if); ++i) {
-+		DWC_WRITE_REG32(&core_if->host_if->hc_regs[i]->hcintmsk,
-+				hr->hcintmsk_local[i]);
-+	}
-+
-+	return 0;
-+}
-+
-+int restore_lpm_i2c_regs(dwc_otg_core_if_t * core_if)
-+{
-+	struct dwc_otg_global_regs_backup *gr;
-+
-+	gr = core_if->gr_backup;
-+
-+	/* Restore values for LPM and I2C */
-+#ifdef CONFIG_USB_DWC_OTG_LPM
-+	DWC_WRITE_REG32(&core_if->core_global_regs->glpmcfg, gr->glpmcfg_local);
-+#endif
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gi2cctl, gr->gi2cctl_local);
-+
-+	return 0;
-+}
-+
-+int restore_essential_regs(dwc_otg_core_if_t * core_if, int rmode, int is_host)
-+{
-+	struct dwc_otg_global_regs_backup *gr;
-+	pcgcctl_data_t pcgcctl = {.d32 = 0 };
-+	gahbcfg_data_t gahbcfg = {.d32 = 0 };
-+	gusbcfg_data_t gusbcfg = {.d32 = 0 };
-+	gintmsk_data_t gintmsk = {.d32 = 0 };
-+
-+	/* Restore LPM and I2C registers */
-+	restore_lpm_i2c_regs(core_if);
-+
-+	/* Set PCGCCTL to 0 */
-+	DWC_WRITE_REG32(core_if->pcgcctl, 0x00000000);
-+
-+	gr = core_if->gr_backup;
-+	/* Load restore values for [31:14] bits */
-+	DWC_WRITE_REG32(core_if->pcgcctl,
-+			((gr->pcgcctl_local & 0xffffc000) | 0x00020000));
-+
-+	/* Umnask global Interrupt in GAHBCFG and restore it */
-+	gahbcfg.d32 = gr->gahbcfg_local;
-+	gahbcfg.b.glblintrmsk = 1;
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gahbcfg, gahbcfg.d32);
-+
-+	/* Clear all pending interupts */
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gintsts, 0xFFFFFFFF);
-+
-+	/* Unmask restore done interrupt */
-+	gintmsk.b.restoredone = 1;
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gintmsk, gintmsk.d32);
-+
-+	/* Restore GUSBCFG and HCFG/DCFG */
-+	gusbcfg.d32 = core_if->gr_backup->gusbcfg_local;
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gusbcfg, gusbcfg.d32);
-+
-+	if (is_host) {
-+		hcfg_data_t hcfg = {.d32 = 0 };
-+		hcfg.d32 = core_if->hr_backup->hcfg_local;
-+		DWC_WRITE_REG32(&core_if->host_if->host_global_regs->hcfg,
-+				hcfg.d32);
-+
-+		/* Load restore values for [31:14] bits */
-+		pcgcctl.d32 = gr->pcgcctl_local & 0xffffc000;
-+		pcgcctl.d32 = gr->pcgcctl_local | 0x00020000;
-+
-+		if (rmode)
-+			pcgcctl.b.restoremode = 1;
-+		DWC_WRITE_REG32(core_if->pcgcctl, pcgcctl.d32);
-+		dwc_udelay(10);
-+
-+		/* Load restore values for [31:14] bits and set EssRegRestored bit */
-+		pcgcctl.d32 = gr->pcgcctl_local | 0xffffc000;
-+		pcgcctl.d32 = gr->pcgcctl_local & 0xffffc000;
-+		pcgcctl.b.ess_reg_restored = 1;
-+		if (rmode)
-+			pcgcctl.b.restoremode = 1;
-+		DWC_WRITE_REG32(core_if->pcgcctl, pcgcctl.d32);
-+	} else {
-+		dcfg_data_t dcfg = {.d32 = 0 };
-+		dcfg.d32 = core_if->dr_backup->dcfg;
-+		DWC_WRITE_REG32(&core_if->dev_if->dev_global_regs->dcfg, dcfg.d32);
-+
-+		/* Load restore values for [31:14] bits */
-+		pcgcctl.d32 = gr->pcgcctl_local & 0xffffc000;
-+		pcgcctl.d32 = gr->pcgcctl_local | 0x00020000;
-+		if (!rmode) {
-+			pcgcctl.d32 |= 0x208;
-+		}
-+		DWC_WRITE_REG32(core_if->pcgcctl, pcgcctl.d32);
-+		dwc_udelay(10);
-+
-+		/* Load restore values for [31:14] bits */
-+		pcgcctl.d32 = gr->pcgcctl_local & 0xffffc000;
-+		pcgcctl.d32 = gr->pcgcctl_local | 0x00020000;
-+		pcgcctl.b.ess_reg_restored = 1;
-+		if (!rmode)
-+			pcgcctl.d32 |= 0x208;
-+		DWC_WRITE_REG32(core_if->pcgcctl, pcgcctl.d32);
-+	}
-+
-+	return 0;
-+}
-+
-+/**
-+ * Initializes the FSLSPClkSel field of the HCFG register depending on the PHY
-+ * type.
-+ */
-+static void init_fslspclksel(dwc_otg_core_if_t * core_if)
-+{
-+	uint32_t val;
-+	hcfg_data_t hcfg;
-+
-+	if (((core_if->hwcfg2.b.hs_phy_type == 2) &&
-+	     (core_if->hwcfg2.b.fs_phy_type == 1) &&
-+	     (core_if->core_params->ulpi_fs_ls)) ||
-+	    (core_if->core_params->phy_type == DWC_PHY_TYPE_PARAM_FS)) {
-+		/* Full speed PHY */
-+		val = DWC_HCFG_48_MHZ;
-+	} else {
-+		/* High speed PHY running at full speed or high speed */
-+		val = DWC_HCFG_30_60_MHZ;
-+	}
-+
-+	DWC_DEBUGPL(DBG_CIL, "Initializing HCFG.FSLSPClkSel to 0x%1x\n", val);
-+	hcfg.d32 = DWC_READ_REG32(&core_if->host_if->host_global_regs->hcfg);
-+	hcfg.b.fslspclksel = val;
-+	DWC_WRITE_REG32(&core_if->host_if->host_global_regs->hcfg, hcfg.d32);
-+}
-+
-+/**
-+ * Initializes the DevSpd field of the DCFG register depending on the PHY type
-+ * and the enumeration speed of the device.
-+ */
-+static void init_devspd(dwc_otg_core_if_t * core_if)
-+{
-+	uint32_t val;
-+	dcfg_data_t dcfg;
-+
-+	if (((core_if->hwcfg2.b.hs_phy_type == 2) &&
-+	     (core_if->hwcfg2.b.fs_phy_type == 1) &&
-+	     (core_if->core_params->ulpi_fs_ls)) ||
-+	    (core_if->core_params->phy_type == DWC_PHY_TYPE_PARAM_FS)) {
-+		/* Full speed PHY */
-+		val = 0x3;
-+	} else if (core_if->core_params->speed == DWC_SPEED_PARAM_FULL) {
-+		/* High speed PHY running at full speed */
-+		val = 0x1;
-+	} else {
-+		/* High speed PHY running at high speed */
-+		val = 0x0;
-+	}
-+
-+	DWC_DEBUGPL(DBG_CIL, "Initializing DCFG.DevSpd to 0x%1x\n", val);
-+
-+	dcfg.d32 = DWC_READ_REG32(&core_if->dev_if->dev_global_regs->dcfg);
-+	dcfg.b.devspd = val;
-+	DWC_WRITE_REG32(&core_if->dev_if->dev_global_regs->dcfg, dcfg.d32);
-+}
-+
-+/**
-+ * This function calculates the number of IN EPS
-+ * using GHWCFG1 and GHWCFG2 registers values
-+ *
-+ * @param core_if Programming view of the DWC_otg controller
-+ */
-+static uint32_t calc_num_in_eps(dwc_otg_core_if_t * core_if)
-+{
-+	uint32_t num_in_eps = 0;
-+	uint32_t num_eps = core_if->hwcfg2.b.num_dev_ep;
-+	uint32_t hwcfg1 = core_if->hwcfg1.d32 >> 3;
-+	uint32_t num_tx_fifos = core_if->hwcfg4.b.num_in_eps;
-+	int i;
-+
-+	for (i = 0; i < num_eps; ++i) {
-+		if (!(hwcfg1 & 0x1))
-+			num_in_eps++;
-+
-+		hwcfg1 >>= 2;
-+	}
-+
-+	if (core_if->hwcfg4.b.ded_fifo_en) {
-+		num_in_eps =
-+		    (num_in_eps > num_tx_fifos) ? num_tx_fifos : num_in_eps;
-+	}
-+
-+	return num_in_eps;
-+}
-+
-+/**
-+ * This function calculates the number of OUT EPS
-+ * using GHWCFG1 and GHWCFG2 registers values
-+ *
-+ * @param core_if Programming view of the DWC_otg controller
-+ */
-+static uint32_t calc_num_out_eps(dwc_otg_core_if_t * core_if)
-+{
-+	uint32_t num_out_eps = 0;
-+	uint32_t num_eps = core_if->hwcfg2.b.num_dev_ep;
-+	uint32_t hwcfg1 = core_if->hwcfg1.d32 >> 2;
-+	int i;
-+
-+	for (i = 0; i < num_eps; ++i) {
-+		if (!(hwcfg1 & 0x1))
-+			num_out_eps++;
-+
-+		hwcfg1 >>= 2;
-+	}
-+	return num_out_eps;
-+}
-+
-+/**
-+ * This function initializes the DWC_otg controller registers and
-+ * prepares the core for device mode or host mode operation.
-+ *
-+ * @param core_if Programming view of the DWC_otg controller
-+ *
-+ */
-+void dwc_otg_core_init(dwc_otg_core_if_t * core_if)
-+{
-+	int i = 0;
-+	dwc_otg_core_global_regs_t *global_regs = core_if->core_global_regs;
-+	dwc_otg_dev_if_t *dev_if = core_if->dev_if;
-+	gahbcfg_data_t ahbcfg = {.d32 = 0 };
-+	gusbcfg_data_t usbcfg = {.d32 = 0 };
-+	gi2cctl_data_t i2cctl = {.d32 = 0 };
-+
-+	DWC_DEBUGPL(DBG_CILV, "dwc_otg_core_init(%p) regs at %p\n",
-+                    core_if, global_regs);
-+
-+	/* Common Initialization */
-+	usbcfg.d32 = DWC_READ_REG32(&global_regs->gusbcfg);
-+
-+	/* Program the ULPI External VBUS bit if needed */
-+	usbcfg.b.ulpi_ext_vbus_drv =
-+	    (core_if->core_params->phy_ulpi_ext_vbus ==
-+	     DWC_PHY_ULPI_EXTERNAL_VBUS) ? 1 : 0;
-+
-+	/* Set external TS Dline pulsing */
-+	usbcfg.b.term_sel_dl_pulse =
-+	    (core_if->core_params->ts_dline == 1) ? 1 : 0;
-+	DWC_WRITE_REG32(&global_regs->gusbcfg, usbcfg.d32);
-+
-+	/* Reset the Controller */
-+	dwc_otg_core_reset(core_if);
-+
-+	core_if->adp_enable = core_if->core_params->adp_supp_enable;
-+	core_if->power_down = core_if->core_params->power_down;
-+	core_if->otg_sts = 0;
-+
-+	/* Initialize parameters from Hardware configuration registers. */
-+	dev_if->num_in_eps = calc_num_in_eps(core_if);
-+	dev_if->num_out_eps = calc_num_out_eps(core_if);
-+
-+	DWC_DEBUGPL(DBG_CIL, "num_dev_perio_in_ep=%d\n",
-+		    core_if->hwcfg4.b.num_dev_perio_in_ep);
-+
-+	for (i = 0; i < core_if->hwcfg4.b.num_dev_perio_in_ep; i++) {
-+		dev_if->perio_tx_fifo_size[i] =
-+		    DWC_READ_REG32(&global_regs->dtxfsiz[i]) >> 16;
-+		DWC_DEBUGPL(DBG_CIL, "Periodic Tx FIFO SZ #%d=0x%0x\n",
-+			    i, dev_if->perio_tx_fifo_size[i]);
-+	}
-+
-+	for (i = 0; i < core_if->hwcfg4.b.num_in_eps; i++) {
-+		dev_if->tx_fifo_size[i] =
-+		    DWC_READ_REG32(&global_regs->dtxfsiz[i]) >> 16;
-+		DWC_DEBUGPL(DBG_CIL, "Tx FIFO SZ #%d=0x%0x\n",
-+			    i, dev_if->tx_fifo_size[i]);
-+	}
-+
-+	core_if->total_fifo_size = core_if->hwcfg3.b.dfifo_depth;
-+	core_if->rx_fifo_size = DWC_READ_REG32(&global_regs->grxfsiz);
-+	core_if->nperio_tx_fifo_size =
-+	    DWC_READ_REG32(&global_regs->gnptxfsiz) >> 16;
-+
-+	DWC_DEBUGPL(DBG_CIL, "Total FIFO SZ=%d\n", core_if->total_fifo_size);
-+	DWC_DEBUGPL(DBG_CIL, "Rx FIFO SZ=%d\n", core_if->rx_fifo_size);
-+	DWC_DEBUGPL(DBG_CIL, "NP Tx FIFO SZ=%d\n",
-+		    core_if->nperio_tx_fifo_size);
-+
-+	/* This programming sequence needs to happen in FS mode before any other
-+	 * programming occurs */
-+	if ((core_if->core_params->speed == DWC_SPEED_PARAM_FULL) &&
-+	    (core_if->core_params->phy_type == DWC_PHY_TYPE_PARAM_FS)) {
-+		/* If FS mode with FS PHY */
-+
-+		/* core_init() is now called on every switch so only call the
-+		 * following for the first time through. */
-+		if (!core_if->phy_init_done) {
-+			core_if->phy_init_done = 1;
-+			DWC_DEBUGPL(DBG_CIL, "FS_PHY detected\n");
-+			usbcfg.d32 = DWC_READ_REG32(&global_regs->gusbcfg);
-+			usbcfg.b.physel = 1;
-+			DWC_WRITE_REG32(&global_regs->gusbcfg, usbcfg.d32);
-+
-+			/* Reset after a PHY select */
-+			dwc_otg_core_reset(core_if);
-+		}
-+
-+		/* Program DCFG.DevSpd or HCFG.FSLSPclkSel to 48Mhz in FS.      Also
-+		 * do this on HNP Dev/Host mode switches (done in dev_init and
-+		 * host_init). */
-+		if (dwc_otg_is_host_mode(core_if)) {
-+			init_fslspclksel(core_if);
-+		} else {
-+			init_devspd(core_if);
-+		}
-+
-+		if (core_if->core_params->i2c_enable) {
-+			DWC_DEBUGPL(DBG_CIL, "FS_PHY Enabling I2c\n");
-+			/* Program GUSBCFG.OtgUtmifsSel to I2C */
-+			usbcfg.d32 = DWC_READ_REG32(&global_regs->gusbcfg);
-+			usbcfg.b.otgutmifssel = 1;
-+			DWC_WRITE_REG32(&global_regs->gusbcfg, usbcfg.d32);
-+
-+			/* Program GI2CCTL.I2CEn */
-+			i2cctl.d32 = DWC_READ_REG32(&global_regs->gi2cctl);
-+			i2cctl.b.i2cdevaddr = 1;
-+			i2cctl.b.i2cen = 0;
-+			DWC_WRITE_REG32(&global_regs->gi2cctl, i2cctl.d32);
-+			i2cctl.b.i2cen = 1;
-+			DWC_WRITE_REG32(&global_regs->gi2cctl, i2cctl.d32);
-+		}
-+
-+	} /* endif speed == DWC_SPEED_PARAM_FULL */
-+	else {
-+		/* High speed PHY. */
-+		if (!core_if->phy_init_done) {
-+			core_if->phy_init_done = 1;
-+			/* HS PHY parameters.  These parameters are preserved
-+			 * during soft reset so only program the first time.  Do
-+			 * a soft reset immediately after setting phyif.  */
-+
-+			if (core_if->core_params->phy_type == 2) {
-+				/* ULPI interface */
-+				usbcfg.b.ulpi_utmi_sel = 1;
-+				usbcfg.b.phyif = 0;
-+				usbcfg.b.ddrsel =
-+				    core_if->core_params->phy_ulpi_ddr;
-+			} else if (core_if->core_params->phy_type == 1) {
-+				/* UTMI+ interface */
-+				usbcfg.b.ulpi_utmi_sel = 0;
-+				if (core_if->core_params->phy_utmi_width == 16) {
-+					usbcfg.b.phyif = 1;
-+
-+				} else {
-+					usbcfg.b.phyif = 0;
-+				}
-+			} else {
-+				DWC_ERROR("FS PHY TYPE\n");
-+			}
-+			DWC_WRITE_REG32(&global_regs->gusbcfg, usbcfg.d32);
-+			/* Reset after setting the PHY parameters */
-+			dwc_otg_core_reset(core_if);
-+		}
-+	}
-+
-+	if ((core_if->hwcfg2.b.hs_phy_type == 2) &&
-+	    (core_if->hwcfg2.b.fs_phy_type == 1) &&
-+	    (core_if->core_params->ulpi_fs_ls)) {
-+		DWC_DEBUGPL(DBG_CIL, "Setting ULPI FSLS\n");
-+		usbcfg.d32 = DWC_READ_REG32(&global_regs->gusbcfg);
-+		usbcfg.b.ulpi_fsls = 1;
-+		usbcfg.b.ulpi_clk_sus_m = 1;
-+		DWC_WRITE_REG32(&global_regs->gusbcfg, usbcfg.d32);
-+	} else {
-+		usbcfg.d32 = DWC_READ_REG32(&global_regs->gusbcfg);
-+		usbcfg.b.ulpi_fsls = 0;
-+		usbcfg.b.ulpi_clk_sus_m = 0;
-+		DWC_WRITE_REG32(&global_regs->gusbcfg, usbcfg.d32);
-+	}
-+
-+	/* Program the GAHBCFG Register. */
-+	switch (core_if->hwcfg2.b.architecture) {
-+
-+	case DWC_SLAVE_ONLY_ARCH:
-+		DWC_DEBUGPL(DBG_CIL, "Slave Only Mode\n");
-+		ahbcfg.b.nptxfemplvl_txfemplvl =
-+		    DWC_GAHBCFG_TXFEMPTYLVL_HALFEMPTY;
-+		ahbcfg.b.ptxfemplvl = DWC_GAHBCFG_TXFEMPTYLVL_HALFEMPTY;
-+		core_if->dma_enable = 0;
-+		core_if->dma_desc_enable = 0;
-+		break;
-+
-+	case DWC_EXT_DMA_ARCH:
-+		DWC_DEBUGPL(DBG_CIL, "External DMA Mode\n");
-+		{
-+			uint8_t brst_sz = core_if->core_params->dma_burst_size;
-+			ahbcfg.b.hburstlen = 0;
-+			while (brst_sz > 1) {
-+				ahbcfg.b.hburstlen++;
-+				brst_sz >>= 1;
-+			}
-+		}
-+		core_if->dma_enable = (core_if->core_params->dma_enable != 0);
-+		core_if->dma_desc_enable =
-+		    (core_if->core_params->dma_desc_enable != 0);
-+		break;
-+
-+	case DWC_INT_DMA_ARCH:
-+		DWC_DEBUGPL(DBG_CIL, "Internal DMA Mode\n");
-+		/* Old value was DWC_GAHBCFG_INT_DMA_BURST_INCR - done for
-+		  Host mode ISOC in issue fix - vahrama */
-+		/* Broadcom had altered to (1<<3)|(0<<0) - WRESP=1, max 4 beats */
-+		ahbcfg.b.hburstlen = (1<<3)|(0<<0);//DWC_GAHBCFG_INT_DMA_BURST_INCR4;
-+		core_if->dma_enable = (core_if->core_params->dma_enable != 0);
-+		core_if->dma_desc_enable =
-+		    (core_if->core_params->dma_desc_enable != 0);
-+		break;
-+
-+	}
-+	if (core_if->dma_enable) {
-+		if (core_if->dma_desc_enable) {
-+			DWC_PRINTF("Using Descriptor DMA mode\n");
-+		} else {
-+			DWC_PRINTF("Using Buffer DMA mode\n");
-+
-+		}
-+	} else {
-+		DWC_PRINTF("Using Slave mode\n");
-+		core_if->dma_desc_enable = 0;
-+	}
-+
-+	if (core_if->core_params->ahb_single) {
-+		ahbcfg.b.ahbsingle = 1;
-+	}
-+
-+	ahbcfg.b.dmaenable = core_if->dma_enable;
-+	DWC_WRITE_REG32(&global_regs->gahbcfg, ahbcfg.d32);
-+
-+	core_if->en_multiple_tx_fifo = core_if->hwcfg4.b.ded_fifo_en;
-+
-+	core_if->pti_enh_enable = core_if->core_params->pti_enable != 0;
-+	core_if->multiproc_int_enable = core_if->core_params->mpi_enable;
-+	DWC_PRINTF("Periodic Transfer Interrupt Enhancement - %s\n",
-+		   ((core_if->pti_enh_enable) ? "enabled" : "disabled"));
-+	DWC_PRINTF("Multiprocessor Interrupt Enhancement - %s\n",
-+		   ((core_if->multiproc_int_enable) ? "enabled" : "disabled"));
-+
-+	/*
-+	 * Program the GUSBCFG register.
-+	 */
-+	usbcfg.d32 = DWC_READ_REG32(&global_regs->gusbcfg);
-+
-+	switch (core_if->hwcfg2.b.op_mode) {
-+	case DWC_MODE_HNP_SRP_CAPABLE:
-+		usbcfg.b.hnpcap = (core_if->core_params->otg_cap ==
-+				   DWC_OTG_CAP_PARAM_HNP_SRP_CAPABLE);
-+		usbcfg.b.srpcap = (core_if->core_params->otg_cap !=
-+				   DWC_OTG_CAP_PARAM_NO_HNP_SRP_CAPABLE);
-+		break;
-+
-+	case DWC_MODE_SRP_ONLY_CAPABLE:
-+		usbcfg.b.hnpcap = 0;
-+		usbcfg.b.srpcap = (core_if->core_params->otg_cap !=
-+				   DWC_OTG_CAP_PARAM_NO_HNP_SRP_CAPABLE);
-+		break;
-+
-+	case DWC_MODE_NO_HNP_SRP_CAPABLE:
-+		usbcfg.b.hnpcap = 0;
-+		usbcfg.b.srpcap = 0;
-+		break;
-+
-+	case DWC_MODE_SRP_CAPABLE_DEVICE:
-+		usbcfg.b.hnpcap = 0;
-+		usbcfg.b.srpcap = (core_if->core_params->otg_cap !=
-+				   DWC_OTG_CAP_PARAM_NO_HNP_SRP_CAPABLE);
-+		break;
-+
-+	case DWC_MODE_NO_SRP_CAPABLE_DEVICE:
-+		usbcfg.b.hnpcap = 0;
-+		usbcfg.b.srpcap = 0;
-+		break;
-+
-+	case DWC_MODE_SRP_CAPABLE_HOST:
-+		usbcfg.b.hnpcap = 0;
-+		usbcfg.b.srpcap = (core_if->core_params->otg_cap !=
-+				   DWC_OTG_CAP_PARAM_NO_HNP_SRP_CAPABLE);
-+		break;
-+
-+	case DWC_MODE_NO_SRP_CAPABLE_HOST:
-+		usbcfg.b.hnpcap = 0;
-+		usbcfg.b.srpcap = 0;
-+		break;
-+	}
-+
-+	DWC_WRITE_REG32(&global_regs->gusbcfg, usbcfg.d32);
-+
-+#ifdef CONFIG_USB_DWC_OTG_LPM
-+	if (core_if->core_params->lpm_enable) {
-+		glpmcfg_data_t lpmcfg = {.d32 = 0 };
-+
-+		/* To enable LPM support set lpm_cap_en bit */
-+		lpmcfg.b.lpm_cap_en = 1;
-+
-+		/* Make AppL1Res ACK */
-+		lpmcfg.b.appl_resp = 1;
-+
-+		/* Retry 3 times */
-+		lpmcfg.b.retry_count = 3;
-+
-+		DWC_MODIFY_REG32(&core_if->core_global_regs->glpmcfg,
-+				 0, lpmcfg.d32);
-+
-+	}
-+#endif
-+	if (core_if->core_params->ic_usb_cap) {
-+		gusbcfg_data_t gusbcfg = {.d32 = 0 };
-+		gusbcfg.b.ic_usb_cap = 1;
-+		DWC_MODIFY_REG32(&core_if->core_global_regs->gusbcfg,
-+				 0, gusbcfg.d32);
-+	}
-+	{
-+		gotgctl_data_t gotgctl = {.d32 = 0 };
-+		gotgctl.b.otgver = core_if->core_params->otg_ver;
-+		DWC_MODIFY_REG32(&core_if->core_global_regs->gotgctl, 0,
-+				 gotgctl.d32);
-+		/* Set OTG version supported */
-+		core_if->otg_ver = core_if->core_params->otg_ver;
-+		DWC_PRINTF("OTG VER PARAM: %d, OTG VER FLAG: %d\n",
-+			   core_if->core_params->otg_ver, core_if->otg_ver);
-+	}
-+
-+
-+	/* Enable common interrupts */
-+	dwc_otg_enable_common_interrupts(core_if);
-+
-+	/* Do device or host intialization based on mode during PCD
-+	 * and HCD initialization  */
-+	if (dwc_otg_is_host_mode(core_if)) {
-+		DWC_DEBUGPL(DBG_ANY, "Host Mode\n");
-+		core_if->op_state = A_HOST;
-+	} else {
-+		DWC_DEBUGPL(DBG_ANY, "Device Mode\n");
-+		core_if->op_state = B_PERIPHERAL;
-+#ifdef DWC_DEVICE_ONLY
-+		dwc_otg_core_dev_init(core_if);
-+#endif
-+	}
-+}
-+
-+/**
-+ * This function enables the Device mode interrupts.
-+ *
-+ * @param core_if Programming view of DWC_otg controller
-+ */
-+void dwc_otg_enable_device_interrupts(dwc_otg_core_if_t * core_if)
-+{
-+	gintmsk_data_t intr_mask = {.d32 = 0 };
-+	dwc_otg_core_global_regs_t *global_regs = core_if->core_global_regs;
-+
-+	DWC_DEBUGPL(DBG_CIL, "%s()\n", __func__);
-+
-+	/* Disable all interrupts. */
-+	DWC_WRITE_REG32(&global_regs->gintmsk, 0);
-+
-+	/* Clear any pending interrupts */
-+	DWC_WRITE_REG32(&global_regs->gintsts, 0xFFFFFFFF);
-+
-+	/* Enable the common interrupts */
-+	dwc_otg_enable_common_interrupts(core_if);
-+
-+	/* Enable interrupts */
-+	intr_mask.b.usbreset = 1;
-+	intr_mask.b.enumdone = 1;
-+	/* Disable Disconnect interrupt in Device mode */
-+	intr_mask.b.disconnect = 0;
-+
-+	if (!core_if->multiproc_int_enable) {
-+		intr_mask.b.inepintr = 1;
-+		intr_mask.b.outepintr = 1;
-+	}
-+
-+	intr_mask.b.erlysuspend = 1;
-+
-+	if (core_if->en_multiple_tx_fifo == 0) {
-+		intr_mask.b.epmismatch = 1;
-+	}
-+
-+	//intr_mask.b.incomplisoout = 1;
-+	intr_mask.b.incomplisoin = 1;
-+
-+/* Enable the ignore frame number for ISOC xfers - MAS */
-+/* Disable to support high bandwith ISOC transfers - manukz */
-+#if 0
-+#ifdef DWC_UTE_PER_IO
-+	if (core_if->dma_enable) {
-+		if (core_if->dma_desc_enable) {
-+			dctl_data_t dctl1 = {.d32 = 0 };
-+			dctl1.b.ifrmnum = 1;
-+			DWC_MODIFY_REG32(&core_if->dev_if->dev_global_regs->
-+					 dctl, 0, dctl1.d32);
-+			DWC_DEBUG("----Enabled Ignore frame number (0x%08x)",
-+				  DWC_READ_REG32(&core_if->dev_if->
-+						 dev_global_regs->dctl));
-+		}
-+	}
-+#endif
-+#endif
-+#ifdef DWC_EN_ISOC
-+	if (core_if->dma_enable) {
-+		if (core_if->dma_desc_enable == 0) {
-+			if (core_if->pti_enh_enable) {
-+				dctl_data_t dctl = {.d32 = 0 };
-+				dctl.b.ifrmnum = 1;
-+				DWC_MODIFY_REG32(&core_if->
-+						 dev_if->dev_global_regs->dctl,
-+						 0, dctl.d32);
-+			} else {
-+				intr_mask.b.incomplisoin = 1;
-+				intr_mask.b.incomplisoout = 1;
-+			}
-+		}
-+	} else {
-+		intr_mask.b.incomplisoin = 1;
-+		intr_mask.b.incomplisoout = 1;
-+	}
-+#endif /* DWC_EN_ISOC */
-+
-+	/** @todo NGS: Should this be a module parameter? */
-+#ifdef USE_PERIODIC_EP
-+	intr_mask.b.isooutdrop = 1;
-+	intr_mask.b.eopframe = 1;
-+	intr_mask.b.incomplisoin = 1;
-+	intr_mask.b.incomplisoout = 1;
-+#endif
-+
-+	DWC_MODIFY_REG32(&global_regs->gintmsk, intr_mask.d32, intr_mask.d32);
-+
-+	DWC_DEBUGPL(DBG_CIL, "%s() gintmsk=%0x\n", __func__,
-+		    DWC_READ_REG32(&global_regs->gintmsk));
-+}
-+
-+/**
-+ * This function initializes the DWC_otg controller registers for
-+ * device mode.
-+ *
-+ * @param core_if Programming view of DWC_otg controller
-+ *
-+ */
-+void dwc_otg_core_dev_init(dwc_otg_core_if_t * core_if)
-+{
-+	int i;
-+	dwc_otg_core_global_regs_t *global_regs = core_if->core_global_regs;
-+	dwc_otg_dev_if_t *dev_if = core_if->dev_if;
-+	dwc_otg_core_params_t *params = core_if->core_params;
-+	dcfg_data_t dcfg = {.d32 = 0 };
-+	depctl_data_t diepctl = {.d32 = 0 };
-+	grstctl_t resetctl = {.d32 = 0 };
-+	uint32_t rx_fifo_size;
-+	fifosize_data_t nptxfifosize;
-+	fifosize_data_t txfifosize;
-+	dthrctl_data_t dthrctl;
-+	fifosize_data_t ptxfifosize;
-+	uint16_t rxfsiz, nptxfsiz;
-+	gdfifocfg_data_t gdfifocfg = {.d32 = 0 };
-+	hwcfg3_data_t hwcfg3 = {.d32 = 0 };
-+
-+	/* Restart the Phy Clock */
-+	DWC_WRITE_REG32(core_if->pcgcctl, 0);
-+
-+	/* Device configuration register */
-+	init_devspd(core_if);
-+	dcfg.d32 = DWC_READ_REG32(&dev_if->dev_global_regs->dcfg);
-+	dcfg.b.descdma = (core_if->dma_desc_enable) ? 1 : 0;
-+	dcfg.b.perfrint = DWC_DCFG_FRAME_INTERVAL_80;
-+	/* Enable Device OUT NAK in case of DDMA mode*/
-+	if (core_if->core_params->dev_out_nak) {
-+		dcfg.b.endevoutnak = 1;
-+	}
-+
-+	if (core_if->core_params->cont_on_bna) {
-+		dctl_data_t dctl = {.d32 = 0 };
-+		dctl.b.encontonbna = 1;
-+		DWC_MODIFY_REG32(&dev_if->dev_global_regs->dctl, 0, dctl.d32);
-+	}
-+
-+
-+	DWC_WRITE_REG32(&dev_if->dev_global_regs->dcfg, dcfg.d32);
-+
-+	/* Configure data FIFO sizes */
-+	if (core_if->hwcfg2.b.dynamic_fifo && params->enable_dynamic_fifo) {
-+		DWC_DEBUGPL(DBG_CIL, "Total FIFO Size=%d\n",
-+			    core_if->total_fifo_size);
-+		DWC_DEBUGPL(DBG_CIL, "Rx FIFO Size=%d\n",
-+			    params->dev_rx_fifo_size);
-+		DWC_DEBUGPL(DBG_CIL, "NP Tx FIFO Size=%d\n",
-+			    params->dev_nperio_tx_fifo_size);
-+
-+		/* Rx FIFO */
-+		DWC_DEBUGPL(DBG_CIL, "initial grxfsiz=%08x\n",
-+			    DWC_READ_REG32(&global_regs->grxfsiz));
-+
-+#ifdef DWC_UTE_CFI
-+		core_if->pwron_rxfsiz = DWC_READ_REG32(&global_regs->grxfsiz);
-+		core_if->init_rxfsiz = params->dev_rx_fifo_size;
-+#endif
-+		rx_fifo_size = params->dev_rx_fifo_size;
-+		DWC_WRITE_REG32(&global_regs->grxfsiz, rx_fifo_size);
-+
-+		DWC_DEBUGPL(DBG_CIL, "new grxfsiz=%08x\n",
-+			    DWC_READ_REG32(&global_regs->grxfsiz));
-+
-+		/** Set Periodic Tx FIFO Mask all bits 0 */
-+		core_if->p_tx_msk = 0;
-+
-+		/** Set Tx FIFO Mask all bits 0 */
-+		core_if->tx_msk = 0;
-+
-+		if (core_if->en_multiple_tx_fifo == 0) {
-+			/* Non-periodic Tx FIFO */
-+			DWC_DEBUGPL(DBG_CIL, "initial gnptxfsiz=%08x\n",
-+				    DWC_READ_REG32(&global_regs->gnptxfsiz));
-+
-+			nptxfifosize.b.depth = params->dev_nperio_tx_fifo_size;
-+			nptxfifosize.b.startaddr = params->dev_rx_fifo_size;
-+
-+			DWC_WRITE_REG32(&global_regs->gnptxfsiz,
-+					nptxfifosize.d32);
-+
-+			DWC_DEBUGPL(DBG_CIL, "new gnptxfsiz=%08x\n",
-+				    DWC_READ_REG32(&global_regs->gnptxfsiz));
-+
-+			/**@todo NGS: Fix Periodic FIFO Sizing! */
-+			/*
-+			 * Periodic Tx FIFOs These FIFOs are numbered from 1 to 15.
-+			 * Indexes of the FIFO size module parameters in the
-+			 * dev_perio_tx_fifo_size array and the FIFO size registers in
-+			 * the dptxfsiz array run from 0 to 14.
-+			 */
-+			/** @todo Finish debug of this */
-+			ptxfifosize.b.startaddr =
-+			    nptxfifosize.b.startaddr + nptxfifosize.b.depth;
-+			for (i = 0; i < core_if->hwcfg4.b.num_dev_perio_in_ep; i++) {
-+				ptxfifosize.b.depth =
-+				    params->dev_perio_tx_fifo_size[i];
-+				DWC_DEBUGPL(DBG_CIL,
-+					    "initial dtxfsiz[%d]=%08x\n", i,
-+					    DWC_READ_REG32(&global_regs->dtxfsiz
-+							   [i]));
-+				DWC_WRITE_REG32(&global_regs->dtxfsiz[i],
-+						ptxfifosize.d32);
-+				DWC_DEBUGPL(DBG_CIL, "new dtxfsiz[%d]=%08x\n",
-+					    i,
-+					    DWC_READ_REG32(&global_regs->dtxfsiz
-+							   [i]));
-+				ptxfifosize.b.startaddr += ptxfifosize.b.depth;
-+			}
-+		} else {
-+			/*
-+			 * Tx FIFOs These FIFOs are numbered from 1 to 15.
-+			 * Indexes of the FIFO size module parameters in the
-+			 * dev_tx_fifo_size array and the FIFO size registers in
-+			 * the dtxfsiz array run from 0 to 14.
-+			 */
-+
-+			/* Non-periodic Tx FIFO */
-+			DWC_DEBUGPL(DBG_CIL, "initial gnptxfsiz=%08x\n",
-+				    DWC_READ_REG32(&global_regs->gnptxfsiz));
-+
-+#ifdef DWC_UTE_CFI
-+			core_if->pwron_gnptxfsiz =
-+			    (DWC_READ_REG32(&global_regs->gnptxfsiz) >> 16);
-+			core_if->init_gnptxfsiz =
-+			    params->dev_nperio_tx_fifo_size;
-+#endif
-+			nptxfifosize.b.depth = params->dev_nperio_tx_fifo_size;
-+			nptxfifosize.b.startaddr = params->dev_rx_fifo_size;
-+
-+			DWC_WRITE_REG32(&global_regs->gnptxfsiz,
-+					nptxfifosize.d32);
-+
-+			DWC_DEBUGPL(DBG_CIL, "new gnptxfsiz=%08x\n",
-+				    DWC_READ_REG32(&global_regs->gnptxfsiz));
-+
-+			txfifosize.b.startaddr =
-+			    nptxfifosize.b.startaddr + nptxfifosize.b.depth;
-+
-+			for (i = 0; i < core_if->hwcfg4.b.num_in_eps; i++) {
-+
-+				txfifosize.b.depth =
-+				    params->dev_tx_fifo_size[i];
-+
-+				DWC_DEBUGPL(DBG_CIL,
-+					    "initial dtxfsiz[%d]=%08x\n",
-+					    i,
-+					    DWC_READ_REG32(&global_regs->dtxfsiz
-+							   [i]));
-+
-+#ifdef DWC_UTE_CFI
-+				core_if->pwron_txfsiz[i] =
-+				    (DWC_READ_REG32
-+				     (&global_regs->dtxfsiz[i]) >> 16);
-+				core_if->init_txfsiz[i] =
-+				    params->dev_tx_fifo_size[i];
-+#endif
-+				DWC_WRITE_REG32(&global_regs->dtxfsiz[i],
-+						txfifosize.d32);
-+
-+				DWC_DEBUGPL(DBG_CIL,
-+					    "new dtxfsiz[%d]=%08x\n",
-+					    i,
-+					    DWC_READ_REG32(&global_regs->dtxfsiz
-+							   [i]));
-+
-+				txfifosize.b.startaddr += txfifosize.b.depth;
-+			}
-+			if (core_if->snpsid <= OTG_CORE_REV_2_94a) {
-+				/* Calculating DFIFOCFG for Device mode to include RxFIFO and NPTXFIFO */
-+				gdfifocfg.d32 = DWC_READ_REG32(&global_regs->gdfifocfg);
-+				hwcfg3.d32 = DWC_READ_REG32(&global_regs->ghwcfg3);
-+				gdfifocfg.b.gdfifocfg = (DWC_READ_REG32(&global_regs->ghwcfg3) >> 16);
-+				DWC_WRITE_REG32(&global_regs->gdfifocfg, gdfifocfg.d32);
-+				rxfsiz = (DWC_READ_REG32(&global_regs->grxfsiz) & 0x0000ffff);
-+				nptxfsiz = (DWC_READ_REG32(&global_regs->gnptxfsiz) >> 16);
-+				gdfifocfg.b.epinfobase = rxfsiz + nptxfsiz;
-+				DWC_WRITE_REG32(&global_regs->gdfifocfg, gdfifocfg.d32);
-+			}
-+		}
-+
-+		/* Flush the FIFOs */
-+		dwc_otg_flush_tx_fifo(core_if, 0x10);	/* all Tx FIFOs */
-+		dwc_otg_flush_rx_fifo(core_if);
-+
-+		/* Flush the Learning Queue. */
-+		resetctl.b.intknqflsh = 1;
-+		DWC_WRITE_REG32(&core_if->core_global_regs->grstctl, resetctl.d32);
-+
-+		if (!core_if->core_params->en_multiple_tx_fifo && core_if->dma_enable) {
-+			core_if->start_predict = 0;
-+			for (i = 0; i<= core_if->dev_if->num_in_eps; ++i) {
-+				core_if->nextep_seq[i] = 0xff;	// 0xff - EP not active
-+			}
-+			core_if->nextep_seq[0] = 0;
-+			core_if->first_in_nextep_seq = 0;
-+			diepctl.d32 = DWC_READ_REG32(&dev_if->in_ep_regs[0]->diepctl);
-+			diepctl.b.nextep = 0;
-+			DWC_WRITE_REG32(&dev_if->in_ep_regs[0]->diepctl, diepctl.d32);
-+
-+			/* Update IN Endpoint Mismatch Count by active IN NP EP count + 1 */
-+			dcfg.d32 = DWC_READ_REG32(&dev_if->dev_global_regs->dcfg);
-+			dcfg.b.epmscnt = 2;
-+			DWC_WRITE_REG32(&dev_if->dev_global_regs->dcfg, dcfg.d32);
-+
-+			DWC_DEBUGPL(DBG_CILV,"%s first_in_nextep_seq= %2d; nextep_seq[]:\n",
-+				__func__, core_if->first_in_nextep_seq);
-+			for (i=0; i <= core_if->dev_if->num_in_eps; i++) {
-+				DWC_DEBUGPL(DBG_CILV, "%2d ", core_if->nextep_seq[i]);
-+			}
-+			DWC_DEBUGPL(DBG_CILV,"\n");
-+		}
-+
-+		/* Clear all pending Device Interrupts */
-+		/** @todo - if the condition needed to be checked
-+		 *  or in any case all pending interrutps should be cleared?
-+	     */
-+		if (core_if->multiproc_int_enable) {
-+			for (i = 0; i < core_if->dev_if->num_in_eps; ++i) {
-+				DWC_WRITE_REG32(&dev_if->
-+						dev_global_regs->diepeachintmsk[i], 0);
-+			}
-+		}
-+
-+		for (i = 0; i < core_if->dev_if->num_out_eps; ++i) {
-+			DWC_WRITE_REG32(&dev_if->
-+					dev_global_regs->doepeachintmsk[i], 0);
-+		}
-+
-+		DWC_WRITE_REG32(&dev_if->dev_global_regs->deachint, 0xFFFFFFFF);
-+		DWC_WRITE_REG32(&dev_if->dev_global_regs->deachintmsk, 0);
-+	} else {
-+		DWC_WRITE_REG32(&dev_if->dev_global_regs->diepmsk, 0);
-+		DWC_WRITE_REG32(&dev_if->dev_global_regs->doepmsk, 0);
-+		DWC_WRITE_REG32(&dev_if->dev_global_regs->daint, 0xFFFFFFFF);
-+		DWC_WRITE_REG32(&dev_if->dev_global_regs->daintmsk, 0);
-+	}
-+
-+	for (i = 0; i <= dev_if->num_in_eps; i++) {
-+		depctl_data_t depctl;
-+		depctl.d32 = DWC_READ_REG32(&dev_if->in_ep_regs[i]->diepctl);
-+		if (depctl.b.epena) {
-+			depctl.d32 = 0;
-+			depctl.b.epdis = 1;
-+			depctl.b.snak = 1;
-+		} else {
-+			depctl.d32 = 0;
-+		}
-+
-+		DWC_WRITE_REG32(&dev_if->in_ep_regs[i]->diepctl, depctl.d32);
-+
-+		DWC_WRITE_REG32(&dev_if->in_ep_regs[i]->dieptsiz, 0);
-+		DWC_WRITE_REG32(&dev_if->in_ep_regs[i]->diepdma, 0);
-+		DWC_WRITE_REG32(&dev_if->in_ep_regs[i]->diepint, 0xFF);
-+	}
-+
-+	for (i = 0; i <= dev_if->num_out_eps; i++) {
-+		depctl_data_t depctl;
-+		depctl.d32 = DWC_READ_REG32(&dev_if->out_ep_regs[i]->doepctl);
-+		if (depctl.b.epena) {
-+			dctl_data_t dctl = {.d32 = 0 };
-+			gintmsk_data_t gintsts = {.d32 = 0 };
-+			doepint_data_t doepint = {.d32 = 0 };
-+			dctl.b.sgoutnak = 1;
-+			DWC_MODIFY_REG32(&core_if->dev_if->dev_global_regs->dctl, 0, dctl.d32);
-+			do {
-+				dwc_udelay(10);
-+				gintsts.d32 = DWC_READ_REG32(&core_if->core_global_regs->gintsts);
-+			} while (!gintsts.b.goutnakeff);
-+			gintsts.d32 = 0;
-+			gintsts.b.goutnakeff = 1;
-+			DWC_WRITE_REG32(&core_if->core_global_regs->gintsts, gintsts.d32);
-+
-+			depctl.d32 = 0;
-+			depctl.b.epdis = 1;
-+			depctl.b.snak = 1;
-+			DWC_WRITE_REG32(&core_if->dev_if->out_ep_regs[i]->doepctl, depctl.d32);
-+			do {
-+				dwc_udelay(10);
-+				doepint.d32 = DWC_READ_REG32(&core_if->dev_if->
-+					out_ep_regs[i]->doepint);
-+			} while (!doepint.b.epdisabled);
-+
-+			doepint.b.epdisabled = 1;
-+			DWC_WRITE_REG32(&core_if->dev_if->out_ep_regs[i]->doepint, doepint.d32);
-+
-+			dctl.d32 = 0;
-+			dctl.b.cgoutnak = 1;
-+			DWC_MODIFY_REG32(&core_if->dev_if->dev_global_regs->dctl, 0, dctl.d32);
-+		} else {
-+			depctl.d32 = 0;
-+		}
-+
-+		DWC_WRITE_REG32(&dev_if->out_ep_regs[i]->doepctl, depctl.d32);
-+
-+		DWC_WRITE_REG32(&dev_if->out_ep_regs[i]->doeptsiz, 0);
-+		DWC_WRITE_REG32(&dev_if->out_ep_regs[i]->doepdma, 0);
-+		DWC_WRITE_REG32(&dev_if->out_ep_regs[i]->doepint, 0xFF);
-+	}
-+
-+	if (core_if->en_multiple_tx_fifo && core_if->dma_enable) {
-+		dev_if->non_iso_tx_thr_en = params->thr_ctl & 0x1;
-+		dev_if->iso_tx_thr_en = (params->thr_ctl >> 1) & 0x1;
-+		dev_if->rx_thr_en = (params->thr_ctl >> 2) & 0x1;
-+
-+		dev_if->rx_thr_length = params->rx_thr_length;
-+		dev_if->tx_thr_length = params->tx_thr_length;
-+
-+		dev_if->setup_desc_index = 0;
-+
-+		dthrctl.d32 = 0;
-+		dthrctl.b.non_iso_thr_en = dev_if->non_iso_tx_thr_en;
-+		dthrctl.b.iso_thr_en = dev_if->iso_tx_thr_en;
-+		dthrctl.b.tx_thr_len = dev_if->tx_thr_length;
-+		dthrctl.b.rx_thr_en = dev_if->rx_thr_en;
-+		dthrctl.b.rx_thr_len = dev_if->rx_thr_length;
-+		dthrctl.b.ahb_thr_ratio = params->ahb_thr_ratio;
-+
-+		DWC_WRITE_REG32(&dev_if->dev_global_regs->dtknqr3_dthrctl,
-+				dthrctl.d32);
-+
-+		DWC_DEBUGPL(DBG_CIL,
-+			    "Non ISO Tx Thr - %d\nISO Tx Thr - %d\nRx Thr - %d\nTx Thr Len - %d\nRx Thr Len - %d\n",
-+			    dthrctl.b.non_iso_thr_en, dthrctl.b.iso_thr_en,
-+			    dthrctl.b.rx_thr_en, dthrctl.b.tx_thr_len,
-+			    dthrctl.b.rx_thr_len);
-+
-+	}
-+
-+	dwc_otg_enable_device_interrupts(core_if);
-+
-+	{
-+		diepmsk_data_t msk = {.d32 = 0 };
-+		msk.b.txfifoundrn = 1;
-+		if (core_if->multiproc_int_enable) {
-+			DWC_MODIFY_REG32(&dev_if->dev_global_regs->
-+					 diepeachintmsk[0], msk.d32, msk.d32);
-+		} else {
-+			DWC_MODIFY_REG32(&dev_if->dev_global_regs->diepmsk,
-+					 msk.d32, msk.d32);
-+		}
-+	}
-+
-+	if (core_if->multiproc_int_enable) {
-+		/* Set NAK on Babble */
-+		dctl_data_t dctl = {.d32 = 0 };
-+		dctl.b.nakonbble = 1;
-+		DWC_MODIFY_REG32(&dev_if->dev_global_regs->dctl, 0, dctl.d32);
-+	}
-+
-+	if (core_if->snpsid >= OTG_CORE_REV_2_94a) {
-+		dctl_data_t dctl = {.d32 = 0 };
-+		dctl.d32 = DWC_READ_REG32(&dev_if->dev_global_regs->dctl);
-+		dctl.b.sftdiscon = 0;
-+		DWC_WRITE_REG32(&dev_if->dev_global_regs->dctl, dctl.d32);
-+	}
-+}
-+
-+/**
-+ * This function enables the Host mode interrupts.
-+ *
-+ * @param core_if Programming view of DWC_otg controller
-+ */
-+void dwc_otg_enable_host_interrupts(dwc_otg_core_if_t * core_if)
-+{
-+	dwc_otg_core_global_regs_t *global_regs = core_if->core_global_regs;
-+	gintmsk_data_t intr_mask = {.d32 = 0 };
-+
-+	DWC_DEBUGPL(DBG_CIL, "%s(%p)\n", __func__, core_if);
-+
-+	/* Disable all interrupts. */
-+	DWC_WRITE_REG32(&global_regs->gintmsk, 0);
-+
-+	/* Clear any pending interrupts. */
-+	DWC_WRITE_REG32(&global_regs->gintsts, 0xFFFFFFFF);
-+
-+	/* Enable the common interrupts */
-+	dwc_otg_enable_common_interrupts(core_if);
-+
-+	/*
-+	 * Enable host mode interrupts without disturbing common
-+	 * interrupts.
-+	 */
-+
-+	intr_mask.b.disconnect = 1;
-+	intr_mask.b.portintr = 1;
-+	intr_mask.b.hcintr = 1;
-+
-+	DWC_MODIFY_REG32(&global_regs->gintmsk, intr_mask.d32, intr_mask.d32);
-+}
-+
-+/**
-+ * This function disables the Host Mode interrupts.
-+ *
-+ * @param core_if Programming view of DWC_otg controller
-+ */
-+void dwc_otg_disable_host_interrupts(dwc_otg_core_if_t * core_if)
-+{
-+	dwc_otg_core_global_regs_t *global_regs = core_if->core_global_regs;
-+	gintmsk_data_t intr_mask = {.d32 = 0 };
-+
-+	DWC_DEBUGPL(DBG_CILV, "%s()\n", __func__);
-+
-+	/*
-+	 * Disable host mode interrupts without disturbing common
-+	 * interrupts.
-+	 */
-+	intr_mask.b.sofintr = 1;
-+	intr_mask.b.portintr = 1;
-+	intr_mask.b.hcintr = 1;
-+	intr_mask.b.ptxfempty = 1;
-+	intr_mask.b.nptxfempty = 1;
-+
-+	DWC_MODIFY_REG32(&global_regs->gintmsk, intr_mask.d32, 0);
-+}
-+
-+/**
-+ * This function initializes the DWC_otg controller registers for
-+ * host mode.
-+ *
-+ * This function flushes the Tx and Rx FIFOs and it flushes any entries in the
-+ * request queues. Host channels are reset to ensure that they are ready for
-+ * performing transfers.
-+ *
-+ * @param core_if Programming view of DWC_otg controller
-+ *
-+ */
-+void dwc_otg_core_host_init(dwc_otg_core_if_t * core_if)
-+{
-+	dwc_otg_core_global_regs_t *global_regs = core_if->core_global_regs;
-+	dwc_otg_host_if_t *host_if = core_if->host_if;
-+	dwc_otg_core_params_t *params = core_if->core_params;
-+	hprt0_data_t hprt0 = {.d32 = 0 };
-+	fifosize_data_t nptxfifosize;
-+	fifosize_data_t ptxfifosize;
-+	uint16_t rxfsiz, nptxfsiz, hptxfsiz;
-+	gdfifocfg_data_t gdfifocfg = {.d32 = 0 };
-+	int i;
-+	hcchar_data_t hcchar;
-+	hcfg_data_t hcfg;
-+	hfir_data_t hfir;
-+	dwc_otg_hc_regs_t *hc_regs;
-+	int num_channels;
-+	gotgctl_data_t gotgctl = {.d32 = 0 };
-+
-+	DWC_DEBUGPL(DBG_CILV, "%s(%p)\n", __func__, core_if);
-+
-+	/* Restart the Phy Clock */
-+	DWC_WRITE_REG32(core_if->pcgcctl, 0);
-+
-+	/* Initialize Host Configuration Register */
-+	init_fslspclksel(core_if);
-+	if (core_if->core_params->speed == DWC_SPEED_PARAM_FULL) {
-+		hcfg.d32 = DWC_READ_REG32(&host_if->host_global_regs->hcfg);
-+		hcfg.b.fslssupp = 1;
-+		DWC_WRITE_REG32(&host_if->host_global_regs->hcfg, hcfg.d32);
-+
-+	}
-+
-+	/* This bit allows dynamic reloading of the HFIR register
-+	 * during runtime. This bit needs to be programmed during
-+	 * initial configuration and its value must not be changed
-+	 * during runtime.*/
-+	if (core_if->core_params->reload_ctl == 1) {
-+		hfir.d32 = DWC_READ_REG32(&host_if->host_global_regs->hfir);
-+		hfir.b.hfirrldctrl = 1;
-+		DWC_WRITE_REG32(&host_if->host_global_regs->hfir, hfir.d32);
-+	}
-+
-+	if (core_if->core_params->dma_desc_enable) {
-+		uint8_t op_mode = core_if->hwcfg2.b.op_mode;
-+		if (!
-+		    (core_if->hwcfg4.b.desc_dma
-+		     && (core_if->snpsid >= OTG_CORE_REV_2_90a)
-+		     && ((op_mode == DWC_HWCFG2_OP_MODE_HNP_SRP_CAPABLE_OTG)
-+			 || (op_mode == DWC_HWCFG2_OP_MODE_SRP_ONLY_CAPABLE_OTG)
-+			 || (op_mode ==
-+			     DWC_HWCFG2_OP_MODE_NO_HNP_SRP_CAPABLE_OTG)
-+			 || (op_mode == DWC_HWCFG2_OP_MODE_SRP_CAPABLE_HOST)
-+			 || (op_mode ==
-+			     DWC_HWCFG2_OP_MODE_NO_SRP_CAPABLE_HOST)))) {
-+
-+			DWC_ERROR("Host can't operate in Descriptor DMA mode.\n"
-+				  "Either core version is below 2.90a or "
-+				  "GHWCFG2, GHWCFG4 registers' values do not allow Descriptor DMA in host mode.\n"
-+				  "To run the driver in Buffer DMA host mode set dma_desc_enable "
-+				  "module parameter to 0.\n");
-+			return;
-+		}
-+		hcfg.d32 = DWC_READ_REG32(&host_if->host_global_regs->hcfg);
-+		hcfg.b.descdma = 1;
-+		DWC_WRITE_REG32(&host_if->host_global_regs->hcfg, hcfg.d32);
-+	}
-+
-+	/* Configure data FIFO sizes */
-+	if (core_if->hwcfg2.b.dynamic_fifo && params->enable_dynamic_fifo) {
-+		DWC_DEBUGPL(DBG_CIL, "Total FIFO Size=%d\n",
-+			    core_if->total_fifo_size);
-+		DWC_DEBUGPL(DBG_CIL, "Rx FIFO Size=%d\n",
-+			    params->host_rx_fifo_size);
-+		DWC_DEBUGPL(DBG_CIL, "NP Tx FIFO Size=%d\n",
-+			    params->host_nperio_tx_fifo_size);
-+		DWC_DEBUGPL(DBG_CIL, "P Tx FIFO Size=%d\n",
-+			    params->host_perio_tx_fifo_size);
-+
-+		/* Rx FIFO */
-+		DWC_DEBUGPL(DBG_CIL, "initial grxfsiz=%08x\n",
-+			    DWC_READ_REG32(&global_regs->grxfsiz));
-+		DWC_WRITE_REG32(&global_regs->grxfsiz,
-+				params->host_rx_fifo_size);
-+		DWC_DEBUGPL(DBG_CIL, "new grxfsiz=%08x\n",
-+			    DWC_READ_REG32(&global_regs->grxfsiz));
-+
-+		/* Non-periodic Tx FIFO */
-+		DWC_DEBUGPL(DBG_CIL, "initial gnptxfsiz=%08x\n",
-+			    DWC_READ_REG32(&global_regs->gnptxfsiz));
-+		nptxfifosize.b.depth = params->host_nperio_tx_fifo_size;
-+		nptxfifosize.b.startaddr = params->host_rx_fifo_size;
-+		DWC_WRITE_REG32(&global_regs->gnptxfsiz, nptxfifosize.d32);
-+		DWC_DEBUGPL(DBG_CIL, "new gnptxfsiz=%08x\n",
-+			    DWC_READ_REG32(&global_regs->gnptxfsiz));
-+
-+		/* Periodic Tx FIFO */
-+		DWC_DEBUGPL(DBG_CIL, "initial hptxfsiz=%08x\n",
-+			    DWC_READ_REG32(&global_regs->hptxfsiz));
-+		ptxfifosize.b.depth = params->host_perio_tx_fifo_size;
-+		ptxfifosize.b.startaddr =
-+		    nptxfifosize.b.startaddr + nptxfifosize.b.depth;
-+		DWC_WRITE_REG32(&global_regs->hptxfsiz, ptxfifosize.d32);
-+		DWC_DEBUGPL(DBG_CIL, "new hptxfsiz=%08x\n",
-+			    DWC_READ_REG32(&global_regs->hptxfsiz));
-+
-+		if (core_if->en_multiple_tx_fifo
-+		    && core_if->snpsid <= OTG_CORE_REV_2_94a) {
-+			/* Global DFIFOCFG calculation for Host mode - include RxFIFO, NPTXFIFO and HPTXFIFO */
-+			gdfifocfg.d32 = DWC_READ_REG32(&global_regs->gdfifocfg);
-+			rxfsiz = (DWC_READ_REG32(&global_regs->grxfsiz) & 0x0000ffff);
-+			nptxfsiz = (DWC_READ_REG32(&global_regs->gnptxfsiz) >> 16);
-+			hptxfsiz = (DWC_READ_REG32(&global_regs->hptxfsiz) >> 16);
-+			gdfifocfg.b.epinfobase = rxfsiz + nptxfsiz + hptxfsiz;
-+			DWC_WRITE_REG32(&global_regs->gdfifocfg, gdfifocfg.d32);
-+		}
-+	}
-+
-+	/* TODO - check this */
-+	/* Clear Host Set HNP Enable in the OTG Control Register */
-+	gotgctl.b.hstsethnpen = 1;
-+	DWC_MODIFY_REG32(&global_regs->gotgctl, gotgctl.d32, 0);
-+	/* Make sure the FIFOs are flushed. */
-+	dwc_otg_flush_tx_fifo(core_if, 0x10 /* all TX FIFOs */ );
-+	dwc_otg_flush_rx_fifo(core_if);
-+
-+	/* Clear Host Set HNP Enable in the OTG Control Register */
-+	gotgctl.b.hstsethnpen = 1;
-+	DWC_MODIFY_REG32(&global_regs->gotgctl, gotgctl.d32, 0);
-+
-+	if (!core_if->core_params->dma_desc_enable) {
-+		/* Flush out any leftover queued requests. */
-+		num_channels = core_if->core_params->host_channels;
-+
-+		for (i = 0; i < num_channels; i++) {
-+			hc_regs = core_if->host_if->hc_regs[i];
-+			hcchar.d32 = DWC_READ_REG32(&hc_regs->hcchar);
-+			hcchar.b.chen = 0;
-+			hcchar.b.chdis = 1;
-+			hcchar.b.epdir = 0;
-+			DWC_WRITE_REG32(&hc_regs->hcchar, hcchar.d32);
-+		}
-+
-+		/* Halt all channels to put them into a known state. */
-+		for (i = 0; i < num_channels; i++) {
-+			int count = 0;
-+			hc_regs = core_if->host_if->hc_regs[i];
-+			hcchar.d32 = DWC_READ_REG32(&hc_regs->hcchar);
-+			hcchar.b.chen = 1;
-+			hcchar.b.chdis = 1;
-+			hcchar.b.epdir = 0;
-+			DWC_WRITE_REG32(&hc_regs->hcchar, hcchar.d32);
-+			DWC_DEBUGPL(DBG_HCDV, "%s: Halt channel %d regs %p\n", __func__, i, hc_regs);
-+			do {
-+				hcchar.d32 = DWC_READ_REG32(&hc_regs->hcchar);
-+				if (++count > 1000) {
-+					DWC_ERROR
-+					    ("%s: Unable to clear halt on channel %d (timeout HCCHAR 0x%X @%p)\n",
-+					     __func__, i, hcchar.d32, &hc_regs->hcchar);
-+					break;
-+				}
-+				dwc_udelay(1);
-+			} while (hcchar.b.chen);
-+		}
-+	}
-+
-+	/* Turn on the vbus power. */
-+	DWC_PRINTF("Init: Port Power? op_state=%d\n", core_if->op_state);
-+	if (core_if->op_state == A_HOST) {
-+		hprt0.d32 = dwc_otg_read_hprt0(core_if);
-+		DWC_PRINTF("Init: Power Port (%d)\n", hprt0.b.prtpwr);
-+		if (hprt0.b.prtpwr == 0) {
-+			hprt0.b.prtpwr = 1;
-+			DWC_WRITE_REG32(host_if->hprt0, hprt0.d32);
-+		}
-+	}
-+
-+	dwc_otg_enable_host_interrupts(core_if);
-+}
-+
-+/**
-+ * Prepares a host channel for transferring packets to/from a specific
-+ * endpoint. The HCCHARn register is set up with the characteristics specified
-+ * in _hc. Host channel interrupts that may need to be serviced while this
-+ * transfer is in progress are enabled.
-+ *
-+ * @param core_if Programming view of DWC_otg controller
-+ * @param hc Information needed to initialize the host channel
-+ */
-+void dwc_otg_hc_init(dwc_otg_core_if_t * core_if, dwc_hc_t * hc)
-+{
-+	hcintmsk_data_t hc_intr_mask;
-+	hcchar_data_t hcchar;
-+	hcsplt_data_t hcsplt;
-+
-+	uint8_t hc_num = hc->hc_num;
-+	dwc_otg_host_if_t *host_if = core_if->host_if;
-+	dwc_otg_hc_regs_t *hc_regs = host_if->hc_regs[hc_num];
-+
-+	/* Clear old interrupt conditions for this host channel. */
-+	hc_intr_mask.d32 = 0xFFFFFFFF;
-+	hc_intr_mask.b.reserved14_31 = 0;
-+	DWC_WRITE_REG32(&hc_regs->hcint, hc_intr_mask.d32);
-+
-+	/* Enable channel interrupts required for this transfer. */
-+	hc_intr_mask.d32 = 0;
-+	hc_intr_mask.b.chhltd = 1;
-+	if (core_if->dma_enable) {
-+		/* For Descriptor DMA mode core halts the channel on AHB error. Interrupt is not required */
-+		if (!core_if->dma_desc_enable)
-+			hc_intr_mask.b.ahberr = 1;
-+		else {
-+			if (hc->ep_type == DWC_OTG_EP_TYPE_ISOC)
-+				hc_intr_mask.b.xfercompl = 1;
-+		}
-+
-+		if (hc->error_state && !hc->do_split &&
-+		    hc->ep_type != DWC_OTG_EP_TYPE_ISOC) {
-+			hc_intr_mask.b.ack = 1;
-+			if (hc->ep_is_in) {
-+				hc_intr_mask.b.datatglerr = 1;
-+				if (hc->ep_type != DWC_OTG_EP_TYPE_INTR) {
-+					hc_intr_mask.b.nak = 1;
-+				}
-+			}
-+		}
-+	} else {
-+		switch (hc->ep_type) {
-+		case DWC_OTG_EP_TYPE_CONTROL:
-+		case DWC_OTG_EP_TYPE_BULK:
-+			hc_intr_mask.b.xfercompl = 1;
-+			hc_intr_mask.b.stall = 1;
-+			hc_intr_mask.b.xacterr = 1;
-+			hc_intr_mask.b.datatglerr = 1;
-+			if (hc->ep_is_in) {
-+				hc_intr_mask.b.bblerr = 1;
-+			} else {
-+				hc_intr_mask.b.nak = 1;
-+				hc_intr_mask.b.nyet = 1;
-+				if (hc->do_ping) {
-+					hc_intr_mask.b.ack = 1;
-+				}
-+			}
-+
-+			if (hc->do_split) {
-+				hc_intr_mask.b.nak = 1;
-+				if (hc->complete_split) {
-+					hc_intr_mask.b.nyet = 1;
-+				} else {
-+					hc_intr_mask.b.ack = 1;
-+				}
-+			}
-+
-+			if (hc->error_state) {
-+				hc_intr_mask.b.ack = 1;
-+			}
-+			break;
-+		case DWC_OTG_EP_TYPE_INTR:
-+			hc_intr_mask.b.xfercompl = 1;
-+			hc_intr_mask.b.nak = 1;
-+			hc_intr_mask.b.stall = 1;
-+			hc_intr_mask.b.xacterr = 1;
-+			hc_intr_mask.b.datatglerr = 1;
-+			hc_intr_mask.b.frmovrun = 1;
-+
-+			if (hc->ep_is_in) {
-+				hc_intr_mask.b.bblerr = 1;
-+			}
-+			if (hc->error_state) {
-+				hc_intr_mask.b.ack = 1;
-+			}
-+			if (hc->do_split) {
-+				if (hc->complete_split) {
-+					hc_intr_mask.b.nyet = 1;
-+				} else {
-+					hc_intr_mask.b.ack = 1;
-+				}
-+			}
-+			break;
-+		case DWC_OTG_EP_TYPE_ISOC:
-+			hc_intr_mask.b.xfercompl = 1;
-+			hc_intr_mask.b.frmovrun = 1;
-+			hc_intr_mask.b.ack = 1;
-+
-+			if (hc->ep_is_in) {
-+				hc_intr_mask.b.xacterr = 1;
-+				hc_intr_mask.b.bblerr = 1;
-+			}
-+			break;
-+		}
-+	}
-+	DWC_WRITE_REG32(&hc_regs->hcintmsk, hc_intr_mask.d32);
-+
-+	/*
-+	 * Program the HCCHARn register with the endpoint characteristics for
-+	 * the current transfer.
-+	 */
-+	hcchar.d32 = 0;
-+	hcchar.b.devaddr = hc->dev_addr;
-+	hcchar.b.epnum = hc->ep_num;
-+	hcchar.b.epdir = hc->ep_is_in;
-+	hcchar.b.lspddev = (hc->speed == DWC_OTG_EP_SPEED_LOW);
-+	hcchar.b.eptype = hc->ep_type;
-+	hcchar.b.mps = hc->max_packet;
-+
-+	DWC_WRITE_REG32(&host_if->hc_regs[hc_num]->hcchar, hcchar.d32);
-+
-+	DWC_DEBUGPL(DBG_HCDV, "%s: Channel %d, Dev Addr %d, EP #%d\n",
-+                    __func__, hc->hc_num, hcchar.b.devaddr, hcchar.b.epnum);
-+	DWC_DEBUGPL(DBG_HCDV, "	 Is In %d, Is Low Speed %d, EP Type %d, "
-+                                "Max Pkt %d, Multi Cnt %d\n",
-+                    hcchar.b.epdir, hcchar.b.lspddev, hcchar.b.eptype,
-+                    hcchar.b.mps, hcchar.b.multicnt);
-+
-+	/*
-+	 * Program the HCSPLIT register for SPLITs
-+	 */
-+	hcsplt.d32 = 0;
-+	if (hc->do_split) {
-+		DWC_DEBUGPL(DBG_HCDV, "Programming HC %d with split --> %s\n",
-+			    hc->hc_num,
-+			    hc->complete_split ? "CSPLIT" : "SSPLIT");
-+		hcsplt.b.compsplt = hc->complete_split;
-+		hcsplt.b.xactpos = hc->xact_pos;
-+		hcsplt.b.hubaddr = hc->hub_addr;
-+		hcsplt.b.prtaddr = hc->port_addr;
-+		DWC_DEBUGPL(DBG_HCDV, "\t  comp split %d\n", hc->complete_split);
-+		DWC_DEBUGPL(DBG_HCDV, "\t  xact pos %d\n", hc->xact_pos);
-+		DWC_DEBUGPL(DBG_HCDV, "\t  hub addr %d\n", hc->hub_addr);
-+		DWC_DEBUGPL(DBG_HCDV, "\t  port addr %d\n", hc->port_addr);
-+		DWC_DEBUGPL(DBG_HCDV, "\t  is_in %d\n", hc->ep_is_in);
-+		DWC_DEBUGPL(DBG_HCDV, "\t  Max Pkt: %d\n", hcchar.b.mps);
-+		DWC_DEBUGPL(DBG_HCDV, "\t  xferlen: %d\n", hc->xfer_len);
-+	}
-+	DWC_WRITE_REG32(&host_if->hc_regs[hc_num]->hcsplt, hcsplt.d32);
-+
-+}
-+
-+/**
-+ * Attempts to halt a host channel. This function should only be called in
-+ * Slave mode or to abort a transfer in either Slave mode or DMA mode. Under
-+ * normal circumstances in DMA mode, the controller halts the channel when the
-+ * transfer is complete or a condition occurs that requires application
-+ * intervention.
-+ *
-+ * In slave mode, checks for a free request queue entry, then sets the Channel
-+ * Enable and Channel Disable bits of the Host Channel Characteristics
-+ * register of the specified channel to intiate the halt. If there is no free
-+ * request queue entry, sets only the Channel Disable bit of the HCCHARn
-+ * register to flush requests for this channel. In the latter case, sets a
-+ * flag to indicate that the host channel needs to be halted when a request
-+ * queue slot is open.
-+ *
-+ * In DMA mode, always sets the Channel Enable and Channel Disable bits of the
-+ * HCCHARn register. The controller ensures there is space in the request
-+ * queue before submitting the halt request.
-+ *
-+ * Some time may elapse before the core flushes any posted requests for this
-+ * host channel and halts. The Channel Halted interrupt handler completes the
-+ * deactivation of the host channel.
-+ *
-+ * @param core_if Controller register interface.
-+ * @param hc Host channel to halt.
-+ * @param halt_status Reason for halting the channel.
-+ */
-+void dwc_otg_hc_halt(dwc_otg_core_if_t * core_if,
-+		     dwc_hc_t * hc, dwc_otg_halt_status_e halt_status)
-+{
-+	gnptxsts_data_t nptxsts;
-+	hptxsts_data_t hptxsts;
-+	hcchar_data_t hcchar;
-+	dwc_otg_hc_regs_t *hc_regs;
-+	dwc_otg_core_global_regs_t *global_regs;
-+	dwc_otg_host_global_regs_t *host_global_regs;
-+
-+	hc_regs = core_if->host_if->hc_regs[hc->hc_num];
-+	global_regs = core_if->core_global_regs;
-+	host_global_regs = core_if->host_if->host_global_regs;
-+
-+	DWC_ASSERT(!(halt_status == DWC_OTG_HC_XFER_NO_HALT_STATUS),
-+		   "halt_status = %d\n", halt_status);
-+
-+	if (halt_status == DWC_OTG_HC_XFER_URB_DEQUEUE ||
-+	    halt_status == DWC_OTG_HC_XFER_AHB_ERR) {
-+		/*
-+		 * Disable all channel interrupts except Ch Halted. The QTD
-+		 * and QH state associated with this transfer has been cleared
-+		 * (in the case of URB_DEQUEUE), so the channel needs to be
-+		 * shut down carefully to prevent crashes.
-+		 */
-+		hcintmsk_data_t hcintmsk;
-+		hcintmsk.d32 = 0;
-+		hcintmsk.b.chhltd = 1;
-+		DWC_WRITE_REG32(&hc_regs->hcintmsk, hcintmsk.d32);
-+
-+		/*
-+		 * Make sure no other interrupts besides halt are currently
-+		 * pending. Handling another interrupt could cause a crash due
-+		 * to the QTD and QH state.
-+		 */
-+		DWC_WRITE_REG32(&hc_regs->hcint, ~hcintmsk.d32);
-+
-+		/*
-+		 * Make sure the halt status is set to URB_DEQUEUE or AHB_ERR
-+		 * even if the channel was already halted for some other
-+		 * reason.
-+		 */
-+		hc->halt_status = halt_status;
-+
-+		hcchar.d32 = DWC_READ_REG32(&hc_regs->hcchar);
-+		if (hcchar.b.chen == 0) {
-+			/*
-+			 * The channel is either already halted or it hasn't
-+			 * started yet. In DMA mode, the transfer may halt if
-+			 * it finishes normally or a condition occurs that
-+			 * requires driver intervention. Don't want to halt
-+			 * the channel again. In either Slave or DMA mode,
-+			 * it's possible that the transfer has been assigned
-+			 * to a channel, but not started yet when an URB is
-+			 * dequeued. Don't want to halt a channel that hasn't
-+			 * started yet.
-+			 */
-+			return;
-+		}
-+	}
-+	if (hc->halt_pending) {
-+		/*
-+		 * A halt has already been issued for this channel. This might
-+		 * happen when a transfer is aborted by a higher level in
-+		 * the stack.
-+		 */
-+#ifdef DEBUG
-+		DWC_PRINTF
-+		    ("*** %s: Channel %d, _hc->halt_pending already set ***\n",
-+		     __func__, hc->hc_num);
-+
-+#endif
-+		return;
-+	}
-+
-+	hcchar.d32 = DWC_READ_REG32(&hc_regs->hcchar);
-+
-+	/* No need to set the bit in DDMA for disabling the channel */
-+	//TODO check it everywhere channel is disabled
-+	if (!core_if->core_params->dma_desc_enable)
-+		hcchar.b.chen = 1;
-+	hcchar.b.chdis = 1;
-+
-+	if (!core_if->dma_enable) {
-+		/* Check for space in the request queue to issue the halt. */
-+		if (hc->ep_type == DWC_OTG_EP_TYPE_CONTROL ||
-+		    hc->ep_type == DWC_OTG_EP_TYPE_BULK) {
-+			nptxsts.d32 = DWC_READ_REG32(&global_regs->gnptxsts);
-+			if (nptxsts.b.nptxqspcavail == 0) {
-+				hcchar.b.chen = 0;
-+			}
-+		} else {
-+			hptxsts.d32 =
-+			    DWC_READ_REG32(&host_global_regs->hptxsts);
-+			if ((hptxsts.b.ptxqspcavail == 0)
-+			    || (core_if->queuing_high_bandwidth)) {
-+				hcchar.b.chen = 0;
-+			}
-+		}
-+	}
-+	DWC_WRITE_REG32(&hc_regs->hcchar, hcchar.d32);
-+
-+	hc->halt_status = halt_status;
-+
-+	if (hcchar.b.chen) {
-+		hc->halt_pending = 1;
-+		hc->halt_on_queue = 0;
-+	} else {
-+		hc->halt_on_queue = 1;
-+	}
-+
-+	DWC_DEBUGPL(DBG_HCDV, "%s: Channel %d\n", __func__, hc->hc_num);
-+	DWC_DEBUGPL(DBG_HCDV, "	 hcchar: 0x%08x\n", hcchar.d32);
-+	DWC_DEBUGPL(DBG_HCDV, "	 halt_pending: %d\n", hc->halt_pending);
-+	DWC_DEBUGPL(DBG_HCDV, "	 halt_on_queue: %d\n", hc->halt_on_queue);
-+	DWC_DEBUGPL(DBG_HCDV, "	 halt_status: %d\n", hc->halt_status);
-+
-+	return;
-+}
-+
-+/**
-+ * Clears the transfer state for a host channel. This function is normally
-+ * called after a transfer is done and the host channel is being released.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param hc Identifies the host channel to clean up.
-+ */
-+void dwc_otg_hc_cleanup(dwc_otg_core_if_t * core_if, dwc_hc_t * hc)
-+{
-+	dwc_otg_hc_regs_t *hc_regs;
-+
-+	hc->xfer_started = 0;
-+
-+	/*
-+	 * Clear channel interrupt enables and any unhandled channel interrupt
-+	 * conditions.
-+	 */
-+	hc_regs = core_if->host_if->hc_regs[hc->hc_num];
-+	DWC_WRITE_REG32(&hc_regs->hcintmsk, 0);
-+	DWC_WRITE_REG32(&hc_regs->hcint, 0xFFFFFFFF);
-+#ifdef DEBUG
-+	DWC_TIMER_CANCEL(core_if->hc_xfer_timer[hc->hc_num]);
-+#endif
-+}
-+
-+/**
-+ * Sets the channel property that indicates in which frame a periodic transfer
-+ * should occur. This is always set to the _next_ frame. This function has no
-+ * effect on non-periodic transfers.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param hc Identifies the host channel to set up and its properties.
-+ * @param hcchar Current value of the HCCHAR register for the specified host
-+ * channel.
-+ */
-+static inline void hc_set_even_odd_frame(dwc_otg_core_if_t * core_if,
-+					 dwc_hc_t * hc, hcchar_data_t * hcchar)
-+{
-+	if (hc->ep_type == DWC_OTG_EP_TYPE_INTR ||
-+	    hc->ep_type == DWC_OTG_EP_TYPE_ISOC) {
-+		hfnum_data_t hfnum;
-+		hfnum.d32 =
-+		    DWC_READ_REG32(&core_if->host_if->host_global_regs->hfnum);
-+
-+		/* 1 if _next_ frame is odd, 0 if it's even */
-+		hcchar->b.oddfrm = (hfnum.b.frnum & 0x1) ? 0 : 1;
-+#ifdef DEBUG
-+		if (hc->ep_type == DWC_OTG_EP_TYPE_INTR && hc->do_split
-+		    && !hc->complete_split) {
-+			switch (hfnum.b.frnum & 0x7) {
-+			case 7:
-+				core_if->hfnum_7_samples++;
-+				core_if->hfnum_7_frrem_accum += hfnum.b.frrem;
-+				break;
-+			case 0:
-+				core_if->hfnum_0_samples++;
-+				core_if->hfnum_0_frrem_accum += hfnum.b.frrem;
-+				break;
-+			default:
-+				core_if->hfnum_other_samples++;
-+				core_if->hfnum_other_frrem_accum +=
-+				    hfnum.b.frrem;
-+				break;
-+			}
-+		}
-+#endif
-+	}
-+}
-+
-+#ifdef DEBUG
-+void hc_xfer_timeout(void *ptr)
-+{
-+	hc_xfer_info_t *xfer_info = NULL;
-+	int hc_num = 0;
-+
-+	if (ptr)
-+		xfer_info = (hc_xfer_info_t *) ptr;
-+
-+	if (!xfer_info->hc) {
-+		DWC_ERROR("xfer_info->hc = %p\n", xfer_info->hc);
-+		return;
-+	}
-+
-+	hc_num = xfer_info->hc->hc_num;
-+	DWC_WARN("%s: timeout on channel %d\n", __func__, hc_num);
-+	DWC_WARN("	start_hcchar_val 0x%08x\n",
-+		 xfer_info->core_if->start_hcchar_val[hc_num]);
-+}
-+#endif
-+
-+void ep_xfer_timeout(void *ptr)
-+{
-+	ep_xfer_info_t *xfer_info = NULL;
-+	int ep_num = 0;
-+	dctl_data_t dctl = {.d32 = 0 };
-+	gintsts_data_t gintsts = {.d32 = 0 };
-+	gintmsk_data_t gintmsk = {.d32 = 0 };
-+
-+	if (ptr)
-+		xfer_info = (ep_xfer_info_t *) ptr;
-+
-+	if (!xfer_info->ep) {
-+		DWC_ERROR("xfer_info->ep = %p\n", xfer_info->ep);
-+		return;
-+	}
-+
-+	ep_num = xfer_info->ep->num;
-+	DWC_WARN("%s: timeout on endpoit %d\n", __func__, ep_num);
-+	/* Put the sate to 2 as it was time outed */
-+	xfer_info->state = 2;
-+
-+	dctl.d32 =
-+	    DWC_READ_REG32(&xfer_info->core_if->dev_if->dev_global_regs->dctl);
-+	gintsts.d32 =
-+	    DWC_READ_REG32(&xfer_info->core_if->core_global_regs->gintsts);
-+	gintmsk.d32 =
-+	    DWC_READ_REG32(&xfer_info->core_if->core_global_regs->gintmsk);
-+
-+	if (!gintmsk.b.goutnakeff) {
-+		/* Unmask it */
-+		gintmsk.b.goutnakeff = 1;
-+		DWC_WRITE_REG32(&xfer_info->core_if->core_global_regs->gintmsk,
-+				gintmsk.d32);
-+
-+	}
-+
-+	if (!gintsts.b.goutnakeff) {
-+		dctl.b.sgoutnak = 1;
-+	}
-+	DWC_WRITE_REG32(&xfer_info->core_if->dev_if->dev_global_regs->dctl,
-+			dctl.d32);
-+
-+}
-+
-+void set_pid_isoc(dwc_hc_t * hc)
-+{
-+	/* Set up the initial PID for the transfer. */
-+	if (hc->speed == DWC_OTG_EP_SPEED_HIGH) {
-+		if (hc->ep_is_in) {
-+			if (hc->multi_count == 1) {
-+				hc->data_pid_start = DWC_OTG_HC_PID_DATA0;
-+			} else if (hc->multi_count == 2) {
-+				hc->data_pid_start = DWC_OTG_HC_PID_DATA1;
-+			} else {
-+				hc->data_pid_start = DWC_OTG_HC_PID_DATA2;
-+			}
-+		} else {
-+			if (hc->multi_count == 1) {
-+				hc->data_pid_start = DWC_OTG_HC_PID_DATA0;
-+			} else {
-+				hc->data_pid_start = DWC_OTG_HC_PID_MDATA;
-+			}
-+		}
-+	} else {
-+		hc->data_pid_start = DWC_OTG_HC_PID_DATA0;
-+	}
-+}
-+
-+/**
-+ * This function does the setup for a data transfer for a host channel and
-+ * starts the transfer. May be called in either Slave mode or DMA mode. In
-+ * Slave mode, the caller must ensure that there is sufficient space in the
-+ * request queue and Tx Data FIFO.
-+ *
-+ * For an OUT transfer in Slave mode, it loads a data packet into the
-+ * appropriate FIFO. If necessary, additional data packets will be loaded in
-+ * the Host ISR.
-+ *
-+ * For an IN transfer in Slave mode, a data packet is requested. The data
-+ * packets are unloaded from the Rx FIFO in the Host ISR. If necessary,
-+ * additional data packets are requested in the Host ISR.
-+ *
-+ * For a PING transfer in Slave mode, the Do Ping bit is set in the HCTSIZ
-+ * register along with a packet count of 1 and the channel is enabled. This
-+ * causes a single PING transaction to occur. Other fields in HCTSIZ are
-+ * simply set to 0 since no data transfer occurs in this case.
-+ *
-+ * For a PING transfer in DMA mode, the HCTSIZ register is initialized with
-+ * all the information required to perform the subsequent data transfer. In
-+ * addition, the Do Ping bit is set in the HCTSIZ register. In this case, the
-+ * controller performs the entire PING protocol, then starts the data
-+ * transfer.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param hc Information needed to initialize the host channel. The xfer_len
-+ * value may be reduced to accommodate the max widths of the XferSize and
-+ * PktCnt fields in the HCTSIZn register. The multi_count value may be changed
-+ * to reflect the final xfer_len value.
-+ */
-+void dwc_otg_hc_start_transfer(dwc_otg_core_if_t * core_if, dwc_hc_t * hc)
-+{
-+	hcchar_data_t hcchar;
-+	hctsiz_data_t hctsiz;
-+	uint16_t num_packets;
-+	uint32_t max_hc_xfer_size = core_if->core_params->max_transfer_size;
-+	uint16_t max_hc_pkt_count = core_if->core_params->max_packet_count;
-+	dwc_otg_hc_regs_t *hc_regs = core_if->host_if->hc_regs[hc->hc_num];
-+
-+	hctsiz.d32 = 0;
-+
-+	if (hc->do_ping) {
-+		if (!core_if->dma_enable) {
-+			dwc_otg_hc_do_ping(core_if, hc);
-+			hc->xfer_started = 1;
-+			return;
-+		} else {
-+			hctsiz.b.dopng = 1;
-+		}
-+	}
-+
-+	if (hc->do_split) {
-+		num_packets = 1;
-+
-+		if (hc->complete_split && !hc->ep_is_in) {
-+			/* For CSPLIT OUT Transfer, set the size to 0 so the
-+			 * core doesn't expect any data written to the FIFO */
-+			hc->xfer_len = 0;
-+		} else if (hc->ep_is_in || (hc->xfer_len > hc->max_packet)) {
-+			hc->xfer_len = hc->max_packet;
-+		} else if (!hc->ep_is_in && (hc->xfer_len > 188)) {
-+			hc->xfer_len = 188;
-+		}
-+
-+		hctsiz.b.xfersize = hc->xfer_len;
-+	} else {
-+		/*
-+		 * Ensure that the transfer length and packet count will fit
-+		 * in the widths allocated for them in the HCTSIZn register.
-+		 */
-+		if (hc->ep_type == DWC_OTG_EP_TYPE_INTR ||
-+		    hc->ep_type == DWC_OTG_EP_TYPE_ISOC) {
-+			/*
-+			 * Make sure the transfer size is no larger than one
-+			 * (micro)frame's worth of data. (A check was done
-+			 * when the periodic transfer was accepted to ensure
-+			 * that a (micro)frame's worth of data can be
-+			 * programmed into a channel.)
-+			 */
-+			uint32_t max_periodic_len =
-+			    hc->multi_count * hc->max_packet;
-+			if (hc->xfer_len > max_periodic_len) {
-+				hc->xfer_len = max_periodic_len;
-+			} else {
-+			}
-+		} else if (hc->xfer_len > max_hc_xfer_size) {
-+			/* Make sure that xfer_len is a multiple of max packet size. */
-+			hc->xfer_len = max_hc_xfer_size - hc->max_packet + 1;
-+		}
-+
-+		if (hc->xfer_len > 0) {
-+			num_packets =
-+			    (hc->xfer_len + hc->max_packet -
-+			     1) / hc->max_packet;
-+			if (num_packets > max_hc_pkt_count) {
-+				num_packets = max_hc_pkt_count;
-+				hc->xfer_len = num_packets * hc->max_packet;
-+			}
-+		} else {
-+			/* Need 1 packet for transfer length of 0. */
-+			num_packets = 1;
-+		}
-+
-+		if (hc->ep_is_in) {
-+			/* Always program an integral # of max packets for IN transfers. */
-+			hc->xfer_len = num_packets * hc->max_packet;
-+		}
-+
-+		if (hc->ep_type == DWC_OTG_EP_TYPE_INTR ||
-+		    hc->ep_type == DWC_OTG_EP_TYPE_ISOC) {
-+			/*
-+			 * Make sure that the multi_count field matches the
-+			 * actual transfer length.
-+			 */
-+			hc->multi_count = num_packets;
-+		}
-+
-+		if (hc->ep_type == DWC_OTG_EP_TYPE_ISOC)
-+			set_pid_isoc(hc);
-+
-+		hctsiz.b.xfersize = hc->xfer_len;
-+	}
-+
-+	hc->start_pkt_count = num_packets;
-+	hctsiz.b.pktcnt = num_packets;
-+	hctsiz.b.pid = hc->data_pid_start;
-+	DWC_WRITE_REG32(&hc_regs->hctsiz, hctsiz.d32);
-+
-+	DWC_DEBUGPL(DBG_HCDV, "%s: Channel %d\n", __func__, hc->hc_num);
-+	DWC_DEBUGPL(DBG_HCDV, "	 Xfer Size: %d\n", hctsiz.b.xfersize);
-+	DWC_DEBUGPL(DBG_HCDV, "	 Num Pkts: %d\n", hctsiz.b.pktcnt);
-+	DWC_DEBUGPL(DBG_HCDV, "	 Start PID: %d\n", hctsiz.b.pid);
-+
-+	if (core_if->dma_enable) {
-+		dwc_dma_t dma_addr;
-+		if (hc->align_buff) {
-+			dma_addr = hc->align_buff;
-+		} else {
-+			dma_addr = ((unsigned long)hc->xfer_buff & 0xffffffff);
-+		}
-+		DWC_WRITE_REG32(&hc_regs->hcdma, dma_addr);
-+	}
-+
-+	/* Start the split */
-+	if (hc->do_split) {
-+		hcsplt_data_t hcsplt;
-+		hcsplt.d32 = DWC_READ_REG32(&hc_regs->hcsplt);
-+		hcsplt.b.spltena = 1;
-+		DWC_WRITE_REG32(&hc_regs->hcsplt, hcsplt.d32);
-+	}
-+
-+	hcchar.d32 = DWC_READ_REG32(&hc_regs->hcchar);
-+	hcchar.b.multicnt = hc->multi_count;
-+	hc_set_even_odd_frame(core_if, hc, &hcchar);
-+#ifdef DEBUG
-+	core_if->start_hcchar_val[hc->hc_num] = hcchar.d32;
-+	if (hcchar.b.chdis) {
-+		DWC_WARN("%s: chdis set, channel %d, hcchar 0x%08x\n",
-+			 __func__, hc->hc_num, hcchar.d32);
-+	}
-+#endif
-+
-+	/* Set host channel enable after all other setup is complete. */
-+	hcchar.b.chen = 1;
-+	hcchar.b.chdis = 0;
-+	DWC_WRITE_REG32(&hc_regs->hcchar, hcchar.d32);
-+
-+	hc->xfer_started = 1;
-+	hc->requests++;
-+
-+	if (!core_if->dma_enable && !hc->ep_is_in && hc->xfer_len > 0) {
-+		/* Load OUT packet into the appropriate Tx FIFO. */
-+		dwc_otg_hc_write_packet(core_if, hc);
-+	}
-+#ifdef DEBUG
-+	if (hc->ep_type != DWC_OTG_EP_TYPE_INTR) {
-+                DWC_DEBUGPL(DBG_HCDV, "transfer %d from core_if %p\n",
-+                            hc->hc_num, core_if);//GRAYG
-+		core_if->hc_xfer_info[hc->hc_num].core_if = core_if;
-+		core_if->hc_xfer_info[hc->hc_num].hc = hc;
-+
-+		/* Start a timer for this transfer. */
-+		DWC_TIMER_SCHEDULE(core_if->hc_xfer_timer[hc->hc_num], 10000);
-+	}
-+#endif
-+}
-+
-+/**
-+ * This function does the setup for a data transfer for a host channel
-+ * and starts the transfer in Descriptor DMA mode.
-+ *
-+ * Initializes HCTSIZ register. For a PING transfer the Do Ping bit is set.
-+ * Sets PID and NTD values. For periodic transfers
-+ * initializes SCHED_INFO field with micro-frame bitmap.
-+ *
-+ * Initializes HCDMA register with descriptor list address and CTD value
-+ * then starts the transfer via enabling the channel.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param hc Information needed to initialize the host channel.
-+ */
-+void dwc_otg_hc_start_transfer_ddma(dwc_otg_core_if_t * core_if, dwc_hc_t * hc)
-+{
-+	dwc_otg_hc_regs_t *hc_regs = core_if->host_if->hc_regs[hc->hc_num];
-+	hcchar_data_t hcchar;
-+	hctsiz_data_t hctsiz;
-+	hcdma_data_t hcdma;
-+
-+	hctsiz.d32 = 0;
-+
-+	if (hc->do_ping)
-+		hctsiz.b_ddma.dopng = 1;
-+
-+	if (hc->ep_type == DWC_OTG_EP_TYPE_ISOC)
-+		set_pid_isoc(hc);
-+
-+	/* Packet Count and Xfer Size are not used in Descriptor DMA mode */
-+	hctsiz.b_ddma.pid = hc->data_pid_start;
-+	hctsiz.b_ddma.ntd = hc->ntd - 1;	/* 0 - 1 descriptor, 1 - 2 descriptors, etc. */
-+	hctsiz.b_ddma.schinfo = hc->schinfo;	/* Non-zero only for high-speed interrupt endpoints */
-+
-+	DWC_DEBUGPL(DBG_HCDV, "%s: Channel %d\n", __func__, hc->hc_num);
-+	DWC_DEBUGPL(DBG_HCDV, "	 Start PID: %d\n", hctsiz.b.pid);
-+	DWC_DEBUGPL(DBG_HCDV, "	 NTD: %d\n", hctsiz.b_ddma.ntd);
-+
-+	DWC_WRITE_REG32(&hc_regs->hctsiz, hctsiz.d32);
-+
-+	hcdma.d32 = 0;
-+	hcdma.b.dma_addr = ((uint32_t) hc->desc_list_addr) >> 11;
-+
-+	/* Always start from first descriptor. */
-+	hcdma.b.ctd = 0;
-+	DWC_WRITE_REG32(&hc_regs->hcdma, hcdma.d32);
-+
-+	hcchar.d32 = DWC_READ_REG32(&hc_regs->hcchar);
-+	hcchar.b.multicnt = hc->multi_count;
-+
-+#ifdef DEBUG
-+	core_if->start_hcchar_val[hc->hc_num] = hcchar.d32;
-+	if (hcchar.b.chdis) {
-+		DWC_WARN("%s: chdis set, channel %d, hcchar 0x%08x\n",
-+			 __func__, hc->hc_num, hcchar.d32);
-+	}
-+#endif
-+
-+	/* Set host channel enable after all other setup is complete. */
-+	hcchar.b.chen = 1;
-+	hcchar.b.chdis = 0;
-+
-+	DWC_WRITE_REG32(&hc_regs->hcchar, hcchar.d32);
-+
-+	hc->xfer_started = 1;
-+	hc->requests++;
-+
-+#ifdef DEBUG
-+	if ((hc->ep_type != DWC_OTG_EP_TYPE_INTR)
-+	    && (hc->ep_type != DWC_OTG_EP_TYPE_ISOC)) {
-+                DWC_DEBUGPL(DBG_HCDV, "DMA transfer %d from core_if %p\n",
-+                            hc->hc_num, core_if);//GRAYG
-+		core_if->hc_xfer_info[hc->hc_num].core_if = core_if;
-+		core_if->hc_xfer_info[hc->hc_num].hc = hc;
-+		/* Start a timer for this transfer. */
-+		DWC_TIMER_SCHEDULE(core_if->hc_xfer_timer[hc->hc_num], 10000);
-+	}
-+#endif
-+
-+}
-+
-+/**
-+ * This function continues a data transfer that was started by previous call
-+ * to <code>dwc_otg_hc_start_transfer</code>. The caller must ensure there is
-+ * sufficient space in the request queue and Tx Data FIFO. This function
-+ * should only be called in Slave mode. In DMA mode, the controller acts
-+ * autonomously to complete transfers programmed to a host channel.
-+ *
-+ * For an OUT transfer, a new data packet is loaded into the appropriate FIFO
-+ * if there is any data remaining to be queued. For an IN transfer, another
-+ * data packet is always requested. For the SETUP phase of a control transfer,
-+ * this function does nothing.
-+ *
-+ * @return 1 if a new request is queued, 0 if no more requests are required
-+ * for this transfer.
-+ */
-+int dwc_otg_hc_continue_transfer(dwc_otg_core_if_t * core_if, dwc_hc_t * hc)
-+{
-+	DWC_DEBUGPL(DBG_HCDV, "%s: Channel %d\n", __func__, hc->hc_num);
-+
-+	if (hc->do_split) {
-+		/* SPLITs always queue just once per channel */
-+		return 0;
-+	} else if (hc->data_pid_start == DWC_OTG_HC_PID_SETUP) {
-+		/* SETUPs are queued only once since they can't be NAKed. */
-+		return 0;
-+	} else if (hc->ep_is_in) {
-+		/*
-+		 * Always queue another request for other IN transfers. If
-+		 * back-to-back INs are issued and NAKs are received for both,
-+		 * the driver may still be processing the first NAK when the
-+		 * second NAK is received. When the interrupt handler clears
-+		 * the NAK interrupt for the first NAK, the second NAK will
-+		 * not be seen. So we can't depend on the NAK interrupt
-+		 * handler to requeue a NAKed request. Instead, IN requests
-+		 * are issued each time this function is called. When the
-+		 * transfer completes, the extra requests for the channel will
-+		 * be flushed.
-+		 */
-+		hcchar_data_t hcchar;
-+		dwc_otg_hc_regs_t *hc_regs =
-+		    core_if->host_if->hc_regs[hc->hc_num];
-+
-+		hcchar.d32 = DWC_READ_REG32(&hc_regs->hcchar);
-+		hc_set_even_odd_frame(core_if, hc, &hcchar);
-+		hcchar.b.chen = 1;
-+		hcchar.b.chdis = 0;
-+		DWC_DEBUGPL(DBG_HCDV, "	 IN xfer: hcchar = 0x%08x\n",
-+			    hcchar.d32);
-+		DWC_WRITE_REG32(&hc_regs->hcchar, hcchar.d32);
-+		hc->requests++;
-+		return 1;
-+	} else {
-+		/* OUT transfers. */
-+		if (hc->xfer_count < hc->xfer_len) {
-+			if (hc->ep_type == DWC_OTG_EP_TYPE_INTR ||
-+			    hc->ep_type == DWC_OTG_EP_TYPE_ISOC) {
-+				hcchar_data_t hcchar;
-+				dwc_otg_hc_regs_t *hc_regs;
-+				hc_regs = core_if->host_if->hc_regs[hc->hc_num];
-+				hcchar.d32 = DWC_READ_REG32(&hc_regs->hcchar);
-+				hc_set_even_odd_frame(core_if, hc, &hcchar);
-+			}
-+
-+			/* Load OUT packet into the appropriate Tx FIFO. */
-+			dwc_otg_hc_write_packet(core_if, hc);
-+			hc->requests++;
-+			return 1;
-+		} else {
-+			return 0;
-+		}
-+	}
-+}
-+
-+/**
-+ * Starts a PING transfer. This function should only be called in Slave mode.
-+ * The Do Ping bit is set in the HCTSIZ register, then the channel is enabled.
-+ */
-+void dwc_otg_hc_do_ping(dwc_otg_core_if_t * core_if, dwc_hc_t * hc)
-+{
-+	hcchar_data_t hcchar;
-+	hctsiz_data_t hctsiz;
-+	dwc_otg_hc_regs_t *hc_regs = core_if->host_if->hc_regs[hc->hc_num];
-+
-+	DWC_DEBUGPL(DBG_HCDV, "%s: Channel %d\n", __func__, hc->hc_num);
-+
-+	hctsiz.d32 = 0;
-+	hctsiz.b.dopng = 1;
-+	hctsiz.b.pktcnt = 1;
-+	DWC_WRITE_REG32(&hc_regs->hctsiz, hctsiz.d32);
-+
-+	hcchar.d32 = DWC_READ_REG32(&hc_regs->hcchar);
-+	hcchar.b.chen = 1;
-+	hcchar.b.chdis = 0;
-+	DWC_WRITE_REG32(&hc_regs->hcchar, hcchar.d32);
-+}
-+
-+/*
-+ * This function writes a packet into the Tx FIFO associated with the Host
-+ * Channel. For a channel associated with a non-periodic EP, the non-periodic
-+ * Tx FIFO is written. For a channel associated with a periodic EP, the
-+ * periodic Tx FIFO is written. This function should only be called in Slave
-+ * mode.
-+ *
-+ * Upon return the xfer_buff and xfer_count fields in _hc are incremented by
-+ * then number of bytes written to the Tx FIFO.
-+ */
-+void dwc_otg_hc_write_packet(dwc_otg_core_if_t * core_if, dwc_hc_t * hc)
-+{
-+	uint32_t i;
-+	uint32_t remaining_count;
-+	uint32_t byte_count;
-+	uint32_t dword_count;
-+
-+	uint32_t *data_buff = (uint32_t *) (hc->xfer_buff);
-+	uint32_t *data_fifo = core_if->data_fifo[hc->hc_num];
-+
-+	remaining_count = hc->xfer_len - hc->xfer_count;
-+	if (remaining_count > hc->max_packet) {
-+		byte_count = hc->max_packet;
-+	} else {
-+		byte_count = remaining_count;
-+	}
-+
-+	dword_count = (byte_count + 3) / 4;
-+
-+	if ((((unsigned long)data_buff) & 0x3) == 0) {
-+		/* xfer_buff is DWORD aligned. */
-+		for (i = 0; i < dword_count; i++, data_buff++) {
-+			DWC_WRITE_REG32(data_fifo, *data_buff);
-+		}
-+	} else {
-+		/* xfer_buff is not DWORD aligned. */
-+		for (i = 0; i < dword_count; i++, data_buff++) {
-+			uint32_t data;
-+			data =
-+			    (data_buff[0] | data_buff[1] << 8 | data_buff[2] <<
-+			     16 | data_buff[3] << 24);
-+			DWC_WRITE_REG32(data_fifo, data);
-+		}
-+	}
-+
-+	hc->xfer_count += byte_count;
-+	hc->xfer_buff += byte_count;
-+}
-+
-+/**
-+ * Gets the current USB frame number. This is the frame number from the last
-+ * SOF packet.
-+ */
-+uint32_t dwc_otg_get_frame_number(dwc_otg_core_if_t * core_if)
-+{
-+	dsts_data_t dsts;
-+	dsts.d32 = DWC_READ_REG32(&core_if->dev_if->dev_global_regs->dsts);
-+
-+	/* read current frame/microframe number from DSTS register */
-+	return dsts.b.soffn;
-+}
-+
-+/**
-+ * Calculates and gets the frame Interval value of HFIR register according PHY
-+ * type and speed.The application can modify a value of HFIR register only after
-+ * the Port Enable bit of the Host Port Control and Status register
-+ * (HPRT.PrtEnaPort) has been set.
-+*/
-+
-+uint32_t calc_frame_interval(dwc_otg_core_if_t * core_if)
-+{
-+	gusbcfg_data_t usbcfg;
-+	hwcfg2_data_t hwcfg2;
-+	hprt0_data_t hprt0;
-+	int clock = 60;		// default value
-+	usbcfg.d32 = DWC_READ_REG32(&core_if->core_global_regs->gusbcfg);
-+	hwcfg2.d32 = DWC_READ_REG32(&core_if->core_global_regs->ghwcfg2);
-+	hprt0.d32 = DWC_READ_REG32(core_if->host_if->hprt0);
-+	if (!usbcfg.b.physel && usbcfg.b.ulpi_utmi_sel && !usbcfg.b.phyif)
-+		clock = 60;
-+	if (usbcfg.b.physel && hwcfg2.b.fs_phy_type == 3)
-+		clock = 48;
-+	if (!usbcfg.b.phylpwrclksel && !usbcfg.b.physel &&
-+	    !usbcfg.b.ulpi_utmi_sel && usbcfg.b.phyif)
-+		clock = 30;
-+	if (!usbcfg.b.phylpwrclksel && !usbcfg.b.physel &&
-+	    !usbcfg.b.ulpi_utmi_sel && !usbcfg.b.phyif)
-+		clock = 60;
-+	if (usbcfg.b.phylpwrclksel && !usbcfg.b.physel &&
-+	    !usbcfg.b.ulpi_utmi_sel && usbcfg.b.phyif)
-+		clock = 48;
-+	if (usbcfg.b.physel && !usbcfg.b.phyif && hwcfg2.b.fs_phy_type == 2)
-+		clock = 48;
-+	if (usbcfg.b.physel && hwcfg2.b.fs_phy_type == 1)
-+		clock = 48;
-+	if (hprt0.b.prtspd == 0)
-+		/* High speed case */
-+		return 125 * clock - 1;
-+	else
-+		/* FS/LS case */
-+		return 1000 * clock - 1;
-+}
-+
-+/**
-+ * This function reads a setup packet from the Rx FIFO into the destination
-+ * buffer. This function is called from the Rx Status Queue Level (RxStsQLvl)
-+ * Interrupt routine when a SETUP packet has been received in Slave mode.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param dest Destination buffer for packet data.
-+ */
-+void dwc_otg_read_setup_packet(dwc_otg_core_if_t * core_if, uint32_t * dest)
-+{
-+	device_grxsts_data_t status;
-+	/* Get the 8 bytes of a setup transaction data */
-+
-+	/* Pop 2 DWORDS off the receive data FIFO into memory */
-+	dest[0] = DWC_READ_REG32(core_if->data_fifo[0]);
-+	dest[1] = DWC_READ_REG32(core_if->data_fifo[0]);
-+	if (core_if->snpsid >= OTG_CORE_REV_3_00a) {
-+		status.d32 =
-+		    DWC_READ_REG32(&core_if->core_global_regs->grxstsp);
-+		DWC_DEBUGPL(DBG_ANY,
-+			    "EP:%d BCnt:%d " "pktsts:%x Frame:%d(0x%0x)\n",
-+			    status.b.epnum, status.b.bcnt, status.b.pktsts,
-+			    status.b.fn, status.b.fn);
-+	}
-+}
-+
-+/**
-+ * This function enables EP0 OUT to receive SETUP packets and configures EP0
-+ * IN for transmitting packets. It is normally called when the
-+ * "Enumeration Done" interrupt occurs.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param ep The EP0 data.
-+ */
-+void dwc_otg_ep0_activate(dwc_otg_core_if_t * core_if, dwc_ep_t * ep)
-+{
-+	dwc_otg_dev_if_t *dev_if = core_if->dev_if;
-+	dsts_data_t dsts;
-+	depctl_data_t diepctl;
-+	depctl_data_t doepctl;
-+	dctl_data_t dctl = {.d32 = 0 };
-+
-+	ep->stp_rollover = 0;
-+	/* Read the Device Status and Endpoint 0 Control registers */
-+	dsts.d32 = DWC_READ_REG32(&dev_if->dev_global_regs->dsts);
-+	diepctl.d32 = DWC_READ_REG32(&dev_if->in_ep_regs[0]->diepctl);
-+	doepctl.d32 = DWC_READ_REG32(&dev_if->out_ep_regs[0]->doepctl);
-+
-+	/* Set the MPS of the IN EP based on the enumeration speed */
-+	switch (dsts.b.enumspd) {
-+	case DWC_DSTS_ENUMSPD_HS_PHY_30MHZ_OR_60MHZ:
-+	case DWC_DSTS_ENUMSPD_FS_PHY_30MHZ_OR_60MHZ:
-+	case DWC_DSTS_ENUMSPD_FS_PHY_48MHZ:
-+		diepctl.b.mps = DWC_DEP0CTL_MPS_64;
-+		break;
-+	case DWC_DSTS_ENUMSPD_LS_PHY_6MHZ:
-+		diepctl.b.mps = DWC_DEP0CTL_MPS_8;
-+		break;
-+	}
-+
-+	DWC_WRITE_REG32(&dev_if->in_ep_regs[0]->diepctl, diepctl.d32);
-+
-+	/* Enable OUT EP for receive */
-+	if (core_if->snpsid <= OTG_CORE_REV_2_94a) {
-+	doepctl.b.epena = 1;
-+	DWC_WRITE_REG32(&dev_if->out_ep_regs[0]->doepctl, doepctl.d32);
-+	}
-+#ifdef VERBOSE
-+	DWC_DEBUGPL(DBG_PCDV, "doepctl0=%0x\n",
-+		    DWC_READ_REG32(&dev_if->out_ep_regs[0]->doepctl));
-+	DWC_DEBUGPL(DBG_PCDV, "diepctl0=%0x\n",
-+		    DWC_READ_REG32(&dev_if->in_ep_regs[0]->diepctl));
-+#endif
-+	dctl.b.cgnpinnak = 1;
-+
-+	DWC_MODIFY_REG32(&dev_if->dev_global_regs->dctl, dctl.d32, dctl.d32);
-+	DWC_DEBUGPL(DBG_PCDV, "dctl=%0x\n",
-+		    DWC_READ_REG32(&dev_if->dev_global_regs->dctl));
-+
-+}
-+
-+/**
-+ * This function activates an EP.  The Device EP control register for
-+ * the EP is configured as defined in the ep structure. Note: This
-+ * function is not used for EP0.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param ep The EP to activate.
-+ */
-+void dwc_otg_ep_activate(dwc_otg_core_if_t * core_if, dwc_ep_t * ep)
-+{
-+	dwc_otg_dev_if_t *dev_if = core_if->dev_if;
-+	depctl_data_t depctl;
-+	volatile uint32_t *addr;
-+	daint_data_t daintmsk = {.d32 = 0 };
-+	dcfg_data_t dcfg;
-+	uint8_t i;
-+
-+	DWC_DEBUGPL(DBG_PCDV, "%s() EP%d-%s\n", __func__, ep->num,
-+		    (ep->is_in ? "IN" : "OUT"));
-+
-+#ifdef DWC_UTE_PER_IO
-+	ep->xiso_frame_num = 0xFFFFFFFF;
-+	ep->xiso_active_xfers = 0;
-+	ep->xiso_queued_xfers = 0;
-+#endif
-+	/* Read DEPCTLn register */
-+	if (ep->is_in == 1) {
-+		addr = &dev_if->in_ep_regs[ep->num]->diepctl;
-+		daintmsk.ep.in = 1 << ep->num;
-+	} else {
-+		addr = &dev_if->out_ep_regs[ep->num]->doepctl;
-+		daintmsk.ep.out = 1 << ep->num;
-+	}
-+
-+	/* If the EP is already active don't change the EP Control
-+	 * register. */
-+	depctl.d32 = DWC_READ_REG32(addr);
-+	if (!depctl.b.usbactep) {
-+		depctl.b.mps = ep->maxpacket;
-+		depctl.b.eptype = ep->type;
-+		depctl.b.txfnum = ep->tx_fifo_num;
-+
-+		if (ep->type == DWC_OTG_EP_TYPE_ISOC) {
-+			depctl.b.setd0pid = 1;	// ???
-+		} else {
-+			depctl.b.setd0pid = 1;
-+		}
-+		depctl.b.usbactep = 1;
-+
-+		/* Update nextep_seq array and EPMSCNT in DCFG*/
-+		if (!(depctl.b.eptype & 1) && (ep->is_in == 1)) {	// NP IN EP
-+			for (i = 0; i <= core_if->dev_if->num_in_eps; i++) {
-+				if (core_if->nextep_seq[i] == core_if->first_in_nextep_seq)
-+				break;
-+			}
-+			core_if->nextep_seq[i] = ep->num;
-+			core_if->nextep_seq[ep->num] = core_if->first_in_nextep_seq;
-+			depctl.b.nextep = core_if->nextep_seq[ep->num];
-+			dcfg.d32 = DWC_READ_REG32(&dev_if->dev_global_regs->dcfg);
-+			dcfg.b.epmscnt++;
-+			DWC_WRITE_REG32(&dev_if->dev_global_regs->dcfg, dcfg.d32);
-+
-+			DWC_DEBUGPL(DBG_PCDV,
-+				    "%s first_in_nextep_seq= %2d; nextep_seq[]:\n",
-+				__func__, core_if->first_in_nextep_seq);
-+			for (i=0; i <= core_if->dev_if->num_in_eps; i++) {
-+				DWC_DEBUGPL(DBG_PCDV, "%2d\n",
-+					    core_if->nextep_seq[i]);
-+			}
-+
-+		}
-+
-+
-+		DWC_WRITE_REG32(addr, depctl.d32);
-+		DWC_DEBUGPL(DBG_PCDV, "DEPCTL=%08x\n", DWC_READ_REG32(addr));
-+	}
-+
-+	/* Enable the Interrupt for this EP */
-+	if (core_if->multiproc_int_enable) {
-+		if (ep->is_in == 1) {
-+			diepmsk_data_t diepmsk = {.d32 = 0 };
-+			diepmsk.b.xfercompl = 1;
-+			diepmsk.b.timeout = 1;
-+			diepmsk.b.epdisabled = 1;
-+			diepmsk.b.ahberr = 1;
-+			diepmsk.b.intknepmis = 1;
-+			if (!core_if->en_multiple_tx_fifo && core_if->dma_enable)
-+				diepmsk.b.intknepmis = 0;
-+			diepmsk.b.txfifoundrn = 1;	//?????
-+			if (ep->type == DWC_OTG_EP_TYPE_ISOC) {
-+				diepmsk.b.nak = 1;
-+			}
-+
-+
-+
-+/*
-+			if (core_if->dma_desc_enable) {
-+				diepmsk.b.bna = 1;
-+			}
-+*/
-+/*
-+			if (core_if->dma_enable) {
-+				doepmsk.b.nak = 1;
-+			}
-+*/
-+			DWC_WRITE_REG32(&dev_if->dev_global_regs->
-+					diepeachintmsk[ep->num], diepmsk.d32);
-+
-+		} else {
-+			doepmsk_data_t doepmsk = {.d32 = 0 };
-+			doepmsk.b.xfercompl = 1;
-+			doepmsk.b.ahberr = 1;
-+			doepmsk.b.epdisabled = 1;
-+			if (ep->type == DWC_OTG_EP_TYPE_ISOC)
-+				doepmsk.b.outtknepdis = 1;
-+
-+/*
-+
-+			if (core_if->dma_desc_enable) {
-+				doepmsk.b.bna = 1;
-+			}
-+*/
-+/*
-+			doepmsk.b.babble = 1;
-+			doepmsk.b.nyet = 1;
-+			doepmsk.b.nak = 1;
-+*/
-+			DWC_WRITE_REG32(&dev_if->dev_global_regs->
-+					doepeachintmsk[ep->num], doepmsk.d32);
-+		}
-+		DWC_MODIFY_REG32(&dev_if->dev_global_regs->deachintmsk,
-+				 0, daintmsk.d32);
-+	} else {
-+		if (ep->type == DWC_OTG_EP_TYPE_ISOC) {
-+			if (ep->is_in) {
-+				diepmsk_data_t diepmsk = {.d32 = 0 };
-+				diepmsk.b.nak = 1;
-+				DWC_MODIFY_REG32(&dev_if->dev_global_regs->diepmsk, 0, diepmsk.d32);
-+			} else {
-+				doepmsk_data_t doepmsk = {.d32 = 0 };
-+				doepmsk.b.outtknepdis = 1;
-+				DWC_MODIFY_REG32(&dev_if->dev_global_regs->doepmsk, 0, doepmsk.d32);
-+			}
-+		}
-+		DWC_MODIFY_REG32(&dev_if->dev_global_regs->daintmsk,
-+				 0, daintmsk.d32);
-+	}
-+
-+	DWC_DEBUGPL(DBG_PCDV, "DAINTMSK=%0x\n",
-+		    DWC_READ_REG32(&dev_if->dev_global_regs->daintmsk));
-+
-+	ep->stall_clear_flag = 0;
-+
-+	return;
-+}
-+
-+/**
-+ * This function deactivates an EP. This is done by clearing the USB Active
-+ * EP bit in the Device EP control register. Note: This function is not used
-+ * for EP0. EP0 cannot be deactivated.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param ep The EP to deactivate.
-+ */
-+void dwc_otg_ep_deactivate(dwc_otg_core_if_t * core_if, dwc_ep_t * ep)
-+{
-+	depctl_data_t depctl = {.d32 = 0 };
-+	volatile uint32_t *addr;
-+	daint_data_t daintmsk = {.d32 = 0 };
-+	dcfg_data_t dcfg;
-+	uint8_t i = 0;
-+
-+#ifdef DWC_UTE_PER_IO
-+	ep->xiso_frame_num = 0xFFFFFFFF;
-+	ep->xiso_active_xfers = 0;
-+	ep->xiso_queued_xfers = 0;
-+#endif
-+
-+	/* Read DEPCTLn register */
-+	if (ep->is_in == 1) {
-+		addr = &core_if->dev_if->in_ep_regs[ep->num]->diepctl;
-+		daintmsk.ep.in = 1 << ep->num;
-+	} else {
-+		addr = &core_if->dev_if->out_ep_regs[ep->num]->doepctl;
-+		daintmsk.ep.out = 1 << ep->num;
-+	}
-+
-+	depctl.d32 = DWC_READ_REG32(addr);
-+
-+	depctl.b.usbactep = 0;
-+
-+	/* Update nextep_seq array and EPMSCNT in DCFG*/
-+	if (!(depctl.b.eptype & 1) && ep->is_in == 1) {	// NP EP IN
-+		for (i = 0; i <= core_if->dev_if->num_in_eps; i++) {
-+			if (core_if->nextep_seq[i] == ep->num)
-+			break;
-+		}
-+		core_if->nextep_seq[i] = core_if->nextep_seq[ep->num];
-+		if (core_if->first_in_nextep_seq == ep->num)
-+			core_if->first_in_nextep_seq = i;
-+		core_if->nextep_seq[ep->num] = 0xff;
-+		depctl.b.nextep = 0;
-+		dcfg.d32 =
-+		    DWC_READ_REG32(&core_if->dev_if->dev_global_regs->dcfg);
-+		dcfg.b.epmscnt--;
-+		DWC_WRITE_REG32(&core_if->dev_if->dev_global_regs->dcfg,
-+				dcfg.d32);
-+
-+		DWC_DEBUGPL(DBG_PCDV,
-+			    "%s first_in_nextep_seq= %2d; nextep_seq[]:\n",
-+				__func__, core_if->first_in_nextep_seq);
-+			for (i=0; i <= core_if->dev_if->num_in_eps; i++) {
-+				DWC_DEBUGPL(DBG_PCDV, "%2d\n", core_if->nextep_seq[i]);
-+			}
-+	}
-+
-+	if (ep->is_in == 1)
-+		depctl.b.txfnum = 0;
-+
-+	if (core_if->dma_desc_enable)
-+		depctl.b.epdis = 1;
-+
-+	DWC_WRITE_REG32(addr, depctl.d32);
-+	depctl.d32 = DWC_READ_REG32(addr);
-+	if (core_if->dma_enable && ep->type == DWC_OTG_EP_TYPE_ISOC
-+	    && depctl.b.epena) {
-+		depctl_data_t depctl = {.d32 = 0};
-+		if (ep->is_in) {
-+			diepint_data_t diepint = {.d32 = 0};
-+
-+			depctl.b.snak = 1;
-+			DWC_WRITE_REG32(&core_if->dev_if->in_ep_regs[ep->num]->
-+					diepctl, depctl.d32);
-+			do {
-+				dwc_udelay(10);
-+				diepint.d32 =
-+				    DWC_READ_REG32(&core_if->
-+						   dev_if->in_ep_regs[ep->num]->
-+						   diepint);
-+			} while (!diepint.b.inepnakeff);
-+			diepint.b.inepnakeff = 1;
-+			DWC_WRITE_REG32(&core_if->dev_if->in_ep_regs[ep->num]->
-+					diepint, diepint.d32);
-+			depctl.d32 = 0;
-+			depctl.b.epdis = 1;
-+			DWC_WRITE_REG32(&core_if->dev_if->in_ep_regs[ep->num]->
-+					diepctl, depctl.d32);
-+			do {
-+				dwc_udelay(10);
-+				diepint.d32 =
-+				    DWC_READ_REG32(&core_if->
-+						   dev_if->in_ep_regs[ep->num]->
-+						   diepint);
-+			} while (!diepint.b.epdisabled);
-+			diepint.b.epdisabled = 1;
-+			DWC_WRITE_REG32(&core_if->dev_if->in_ep_regs[ep->num]->
-+					diepint, diepint.d32);
-+		} else {
-+			dctl_data_t dctl = {.d32 = 0};
-+			gintmsk_data_t gintsts = {.d32 = 0};
-+			doepint_data_t doepint = {.d32 = 0};
-+			dctl.b.sgoutnak = 1;
-+			DWC_MODIFY_REG32(&core_if->dev_if->dev_global_regs->
-+					 dctl, 0, dctl.d32);
-+			do {
-+				dwc_udelay(10);
-+				gintsts.d32 = DWC_READ_REG32(&core_if->core_global_regs->gintsts);
-+			} while (!gintsts.b.goutnakeff);
-+			gintsts.d32 = 0;
-+			gintsts.b.goutnakeff = 1;
-+			DWC_WRITE_REG32(&core_if->core_global_regs->gintsts, gintsts.d32);
-+
-+			depctl.d32 = 0;
-+			depctl.b.epdis = 1;
-+			depctl.b.snak = 1;
-+			DWC_WRITE_REG32(&core_if->dev_if->out_ep_regs[ep->num]->doepctl, depctl.d32);
-+			do
-+			{
-+				dwc_udelay(10);
-+				doepint.d32 = DWC_READ_REG32(&core_if->dev_if->
-+											out_ep_regs[ep->num]->doepint);
-+			} while (!doepint.b.epdisabled);
-+
-+			doepint.b.epdisabled = 1;
-+			DWC_WRITE_REG32(&core_if->dev_if->out_ep_regs[ep->num]->doepint, doepint.d32);
-+
-+			dctl.d32 = 0;
-+			dctl.b.cgoutnak = 1;
-+			DWC_MODIFY_REG32(&core_if->dev_if->dev_global_regs->dctl, 0, dctl.d32);
-+		}
-+	}
-+
-+	/* Disable the Interrupt for this EP */
-+	if (core_if->multiproc_int_enable) {
-+		DWC_MODIFY_REG32(&core_if->dev_if->dev_global_regs->deachintmsk,
-+				 daintmsk.d32, 0);
-+
-+		if (ep->is_in == 1) {
-+			DWC_WRITE_REG32(&core_if->dev_if->dev_global_regs->
-+					diepeachintmsk[ep->num], 0);
-+		} else {
-+			DWC_WRITE_REG32(&core_if->dev_if->dev_global_regs->
-+					doepeachintmsk[ep->num], 0);
-+		}
-+	} else {
-+		DWC_MODIFY_REG32(&core_if->dev_if->dev_global_regs->daintmsk,
-+				 daintmsk.d32, 0);
-+	}
-+
-+}
-+
-+/**
-+ * This function initializes dma descriptor chain.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param ep The EP to start the transfer on.
-+ */
-+static void init_dma_desc_chain(dwc_otg_core_if_t * core_if, dwc_ep_t * ep)
-+{
-+	dwc_otg_dev_dma_desc_t *dma_desc;
-+	uint32_t offset;
-+	uint32_t xfer_est;
-+	int i;
-+	unsigned maxxfer_local, total_len;
-+
-+	if (!ep->is_in && ep->type == DWC_OTG_EP_TYPE_INTR &&
-+					(ep->maxpacket%4)) {
-+		maxxfer_local = ep->maxpacket;
-+		total_len = ep->xfer_len;
-+	} else {
-+		maxxfer_local = ep->maxxfer;
-+		total_len = ep->total_len;
-+	}
-+
-+	ep->desc_cnt = (total_len / maxxfer_local) +
-+            ((total_len % maxxfer_local) ? 1 : 0);
-+
-+	if (!ep->desc_cnt)
-+		ep->desc_cnt = 1;
-+
-+	if (ep->desc_cnt > MAX_DMA_DESC_CNT)
-+		ep->desc_cnt = MAX_DMA_DESC_CNT;
-+
-+	dma_desc = ep->desc_addr;
-+	if (maxxfer_local == ep->maxpacket) {
-+		if ((total_len % maxxfer_local) &&
-+				(total_len/maxxfer_local < MAX_DMA_DESC_CNT)) {
-+			xfer_est = (ep->desc_cnt - 1) * maxxfer_local +
-+					(total_len % maxxfer_local);
-+		} else
-+			xfer_est = ep->desc_cnt * maxxfer_local;
-+	} else
-+		xfer_est = total_len;
-+	offset = 0;
-+	for (i = 0; i < ep->desc_cnt; ++i) {
-+		/** DMA Descriptor Setup */
-+		if (xfer_est > maxxfer_local) {
-+			dma_desc->status.b.bs = BS_HOST_BUSY;
-+			dma_desc->status.b.l = 0;
-+			dma_desc->status.b.ioc = 0;
-+			dma_desc->status.b.sp = 0;
-+			dma_desc->status.b.bytes = maxxfer_local;
-+			dma_desc->buf = ep->dma_addr + offset;
-+			dma_desc->status.b.sts = 0;
-+			dma_desc->status.b.bs = BS_HOST_READY;
-+
-+			xfer_est -= maxxfer_local;
-+			offset += maxxfer_local;
-+		} else {
-+			dma_desc->status.b.bs = BS_HOST_BUSY;
-+			dma_desc->status.b.l = 1;
-+			dma_desc->status.b.ioc = 1;
-+			if (ep->is_in) {
-+				dma_desc->status.b.sp =
-+				    (xfer_est %
-+				     ep->maxpacket) ? 1 : ((ep->
-+							    sent_zlp) ? 1 : 0);
-+				dma_desc->status.b.bytes = xfer_est;
-+			} else {
-+				if (maxxfer_local == ep->maxpacket)
-+					dma_desc->status.b.bytes = xfer_est;
-+				else
-+					dma_desc->status.b.bytes =
-+						xfer_est + ((4 - (xfer_est & 0x3)) & 0x3);
-+			}
-+
-+			dma_desc->buf = ep->dma_addr + offset;
-+			dma_desc->status.b.sts = 0;
-+			dma_desc->status.b.bs = BS_HOST_READY;
-+		}
-+		dma_desc++;
-+	}
-+}
-+/**
-+ * This function is called when to write ISOC data into appropriate dedicated
-+ * periodic FIFO.
-+ */
-+static int32_t write_isoc_tx_fifo(dwc_otg_core_if_t * core_if, dwc_ep_t * dwc_ep)
-+{
-+	dwc_otg_dev_if_t *dev_if = core_if->dev_if;
-+	dwc_otg_dev_in_ep_regs_t *ep_regs;
-+	dtxfsts_data_t txstatus = {.d32 = 0 };
-+	uint32_t len = 0;
-+	int epnum = dwc_ep->num;
-+	int dwords;
-+
-+	DWC_DEBUGPL(DBG_PCD, "Dedicated TxFifo Empty: %d \n", epnum);
-+
-+	ep_regs = core_if->dev_if->in_ep_regs[epnum];
-+
-+	len = dwc_ep->xfer_len - dwc_ep->xfer_count;
-+
-+	if (len > dwc_ep->maxpacket) {
-+		len = dwc_ep->maxpacket;
-+	}
-+
-+	dwords = (len + 3) / 4;
-+
-+	/* While there is space in the queue and space in the FIFO and
-+	 * More data to tranfer, Write packets to the Tx FIFO */
-+	txstatus.d32 = DWC_READ_REG32(&dev_if->in_ep_regs[epnum]->dtxfsts);
-+	DWC_DEBUGPL(DBG_PCDV, "b4 dtxfsts[%d]=0x%08x\n", epnum, txstatus.d32);
-+
-+	while (txstatus.b.txfspcavail > dwords &&
-+	       dwc_ep->xfer_count < dwc_ep->xfer_len && dwc_ep->xfer_len != 0) {
-+		/* Write the FIFO */
-+		dwc_otg_ep_write_packet(core_if, dwc_ep, 0);
-+
-+		len = dwc_ep->xfer_len - dwc_ep->xfer_count;
-+		if (len > dwc_ep->maxpacket) {
-+			len = dwc_ep->maxpacket;
-+		}
-+
-+		dwords = (len + 3) / 4;
-+		txstatus.d32 =
-+		    DWC_READ_REG32(&dev_if->in_ep_regs[epnum]->dtxfsts);
-+		DWC_DEBUGPL(DBG_PCDV, "dtxfsts[%d]=0x%08x\n", epnum,
-+			    txstatus.d32);
-+	}
-+
-+	DWC_DEBUGPL(DBG_PCDV, "b4 dtxfsts[%d]=0x%08x\n", epnum,
-+		    DWC_READ_REG32(&dev_if->in_ep_regs[epnum]->dtxfsts));
-+
-+	return 1;
-+}
-+/**
-+ * This function does the setup for a data transfer for an EP and
-+ * starts the transfer. For an IN transfer, the packets will be
-+ * loaded into the appropriate Tx FIFO in the ISR. For OUT transfers,
-+ * the packets are unloaded from the Rx FIFO in the ISR.  the ISR.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param ep The EP to start the transfer on.
-+ */
-+
-+void dwc_otg_ep_start_transfer(dwc_otg_core_if_t * core_if, dwc_ep_t * ep)
-+{
-+	depctl_data_t depctl;
-+	deptsiz_data_t deptsiz;
-+	gintmsk_data_t intr_mask = {.d32 = 0 };
-+
-+	DWC_DEBUGPL((DBG_PCDV | DBG_CILV), "%s()\n", __func__);
-+	DWC_DEBUGPL(DBG_PCD, "ep%d-%s xfer_len=%d xfer_cnt=%d "
-+		    "xfer_buff=%p start_xfer_buff=%p, total_len = %d\n",
-+		    ep->num, (ep->is_in ? "IN" : "OUT"), ep->xfer_len,
-+		    ep->xfer_count, ep->xfer_buff, ep->start_xfer_buff,
-+		    ep->total_len);
-+	/* IN endpoint */
-+	if (ep->is_in == 1) {
-+		dwc_otg_dev_in_ep_regs_t *in_regs =
-+		    core_if->dev_if->in_ep_regs[ep->num];
-+
-+		gnptxsts_data_t gtxstatus;
-+
-+		gtxstatus.d32 =
-+		    DWC_READ_REG32(&core_if->core_global_regs->gnptxsts);
-+
-+		if (core_if->en_multiple_tx_fifo == 0
-+		    && gtxstatus.b.nptxqspcavail == 0 && !core_if->dma_enable) {
-+#ifdef DEBUG
-+			DWC_PRINTF("TX Queue Full (0x%0x)\n", gtxstatus.d32);
-+#endif
-+			return;
-+		}
-+
-+		depctl.d32 = DWC_READ_REG32(&(in_regs->diepctl));
-+		deptsiz.d32 = DWC_READ_REG32(&(in_regs->dieptsiz));
-+
-+		if (ep->maxpacket > ep->maxxfer / MAX_PKT_CNT)
-+			ep->xfer_len += (ep->maxxfer < (ep->total_len - ep->xfer_len)) ?
-+				ep->maxxfer : (ep->total_len - ep->xfer_len);
-+		else
-+			ep->xfer_len += (MAX_PKT_CNT * ep->maxpacket < (ep->total_len - ep->xfer_len)) ?
-+				 MAX_PKT_CNT * ep->maxpacket : (ep->total_len - ep->xfer_len);
-+
-+
-+		/* Zero Length Packet? */
-+		if ((ep->xfer_len - ep->xfer_count) == 0) {
-+			deptsiz.b.xfersize = 0;
-+			deptsiz.b.pktcnt = 1;
-+		} else {
-+			/* Program the transfer size and packet count
-+			 *      as follows: xfersize = N * maxpacket +
-+			 *      short_packet pktcnt = N + (short_packet
-+			 *      exist ? 1 : 0)
-+			 */
-+			deptsiz.b.xfersize = ep->xfer_len - ep->xfer_count;
-+			deptsiz.b.pktcnt =
-+			    (ep->xfer_len - ep->xfer_count - 1 +
-+			     ep->maxpacket) / ep->maxpacket;
-+			if (deptsiz.b.pktcnt > MAX_PKT_CNT) {
-+				deptsiz.b.pktcnt = MAX_PKT_CNT;
-+				deptsiz.b.xfersize = deptsiz.b.pktcnt * ep->maxpacket;
-+			}
-+			if (ep->type == DWC_OTG_EP_TYPE_ISOC)
-+				deptsiz.b.mc = deptsiz.b.pktcnt;
-+		}
-+
-+		/* Write the DMA register */
-+		if (core_if->dma_enable) {
-+			if (core_if->dma_desc_enable == 0) {
-+				if (ep->type != DWC_OTG_EP_TYPE_ISOC)
-+					deptsiz.b.mc = 1;
-+				DWC_WRITE_REG32(&in_regs->dieptsiz,
-+						deptsiz.d32);
-+				DWC_WRITE_REG32(&(in_regs->diepdma),
-+						(uint32_t) ep->dma_addr);
-+			} else {
-+#ifdef DWC_UTE_CFI
-+				/* The descriptor chain should be already initialized by now */
-+				if (ep->buff_mode != BM_STANDARD) {
-+					DWC_WRITE_REG32(&in_regs->diepdma,
-+							ep->descs_dma_addr);
-+				} else {
-+#endif
-+					init_dma_desc_chain(core_if, ep);
-+				/** DIEPDMAn Register write */
-+					DWC_WRITE_REG32(&in_regs->diepdma,
-+							ep->dma_desc_addr);
-+#ifdef DWC_UTE_CFI
-+				}
-+#endif
-+			}
-+		} else {
-+			DWC_WRITE_REG32(&in_regs->dieptsiz, deptsiz.d32);
-+			if (ep->type != DWC_OTG_EP_TYPE_ISOC) {
-+				/**
-+				 * Enable the Non-Periodic Tx FIFO empty interrupt,
-+				 * or the Tx FIFO epmty interrupt in dedicated Tx FIFO mode,
-+				 * the data will be written into the fifo by the ISR.
-+				 */
-+				if (core_if->en_multiple_tx_fifo == 0) {
-+					intr_mask.b.nptxfempty = 1;
-+					DWC_MODIFY_REG32
-+					    (&core_if->core_global_regs->gintmsk,
-+					     intr_mask.d32, intr_mask.d32);
-+				} else {
-+					/* Enable the Tx FIFO Empty Interrupt for this EP */
-+					if (ep->xfer_len > 0) {
-+						uint32_t fifoemptymsk = 0;
-+						fifoemptymsk = 1 << ep->num;
-+						DWC_MODIFY_REG32
-+						    (&core_if->dev_if->dev_global_regs->dtknqr4_fifoemptymsk,
-+						     0, fifoemptymsk);
-+
-+					}
-+				}
-+			}  else {
-+					 write_isoc_tx_fifo(core_if, ep);
-+			}
-+		}
-+		if (!core_if->core_params->en_multiple_tx_fifo && core_if->dma_enable)
-+			depctl.b.nextep = core_if->nextep_seq[ep->num];
-+
-+		if (ep->type == DWC_OTG_EP_TYPE_ISOC) {
-+			dsts_data_t dsts = {.d32 = 0};
-+			if (ep->bInterval == 1) {
-+				dsts.d32 =
-+				    DWC_READ_REG32(&core_if->dev_if->
-+						   dev_global_regs->dsts);
-+				ep->frame_num = dsts.b.soffn + ep->bInterval;
-+				if (ep->frame_num > 0x3FFF) {
-+					ep->frm_overrun = 1;
-+					ep->frame_num &= 0x3FFF;
-+				} else
-+					ep->frm_overrun = 0;
-+				if (ep->frame_num & 0x1) {
-+					depctl.b.setd1pid = 1;
-+				} else {
-+					depctl.b.setd0pid = 1;
-+				}
-+			}
-+		}
-+		/* EP enable, IN data in FIFO */
-+		depctl.b.cnak = 1;
-+		depctl.b.epena = 1;
-+		DWC_WRITE_REG32(&in_regs->diepctl, depctl.d32);
-+
-+	} else {
-+		/* OUT endpoint */
-+		dwc_otg_dev_out_ep_regs_t *out_regs =
-+		    core_if->dev_if->out_ep_regs[ep->num];
-+
-+		depctl.d32 = DWC_READ_REG32(&(out_regs->doepctl));
-+		deptsiz.d32 = DWC_READ_REG32(&(out_regs->doeptsiz));
-+
-+		if (!core_if->dma_desc_enable) {
-+			if (ep->maxpacket > ep->maxxfer / MAX_PKT_CNT)
-+				ep->xfer_len += (ep->maxxfer < (ep->total_len - ep->xfer_len)) ?
-+				ep->maxxfer : (ep->total_len - ep->xfer_len);
-+                else
-+					ep->xfer_len += (MAX_PKT_CNT * ep->maxpacket < (ep->total_len
-+					- ep->xfer_len)) ? MAX_PKT_CNT * ep->maxpacket : (ep->total_len - ep->xfer_len);
-+		}
-+
-+		/* Program the transfer size and packet count as follows:
-+		 *
-+		 *      pktcnt = N
-+		 *      xfersize = N * maxpacket
-+		 */
-+		if ((ep->xfer_len - ep->xfer_count) == 0) {
-+			/* Zero Length Packet */
-+			deptsiz.b.xfersize = ep->maxpacket;
-+			deptsiz.b.pktcnt = 1;
-+		} else {
-+			deptsiz.b.pktcnt =
-+			    (ep->xfer_len - ep->xfer_count +
-+			     (ep->maxpacket - 1)) / ep->maxpacket;
-+			if (deptsiz.b.pktcnt > MAX_PKT_CNT) {
-+				deptsiz.b.pktcnt = MAX_PKT_CNT;
-+			}
-+			if (!core_if->dma_desc_enable) {
-+				ep->xfer_len =
-+					deptsiz.b.pktcnt * ep->maxpacket + ep->xfer_count;
-+			}
-+			deptsiz.b.xfersize = ep->xfer_len - ep->xfer_count;
-+		}
-+
-+		DWC_DEBUGPL(DBG_PCDV, "ep%d xfersize=%d pktcnt=%d\n",
-+			    ep->num, deptsiz.b.xfersize, deptsiz.b.pktcnt);
-+
-+		if (core_if->dma_enable) {
-+			if (!core_if->dma_desc_enable) {
-+				DWC_WRITE_REG32(&out_regs->doeptsiz,
-+						deptsiz.d32);
-+
-+				DWC_WRITE_REG32(&(out_regs->doepdma),
-+						(uint32_t) ep->dma_addr);
-+			} else {
-+#ifdef DWC_UTE_CFI
-+				/* The descriptor chain should be already initialized by now */
-+				if (ep->buff_mode != BM_STANDARD) {
-+					DWC_WRITE_REG32(&out_regs->doepdma,
-+							ep->descs_dma_addr);
-+				} else {
-+#endif
-+					/** This is used for interrupt out transfers*/
-+					if (!ep->xfer_len)
-+						ep->xfer_len = ep->total_len;
-+					init_dma_desc_chain(core_if, ep);
-+
-+					if (core_if->core_params->dev_out_nak) {
-+						if (ep->type == DWC_OTG_EP_TYPE_BULK) {
-+							deptsiz.b.pktcnt = (ep->total_len +
-+								(ep->maxpacket - 1)) / ep->maxpacket;
-+							deptsiz.b.xfersize = ep->total_len;
-+							/* Remember initial value of doeptsiz */
-+							core_if->start_doeptsiz_val[ep->num] = deptsiz.d32;
-+							DWC_WRITE_REG32(&out_regs->doeptsiz,
-+								deptsiz.d32);
-+						}
-+					}
-+				/** DOEPDMAn Register write */
-+					DWC_WRITE_REG32(&out_regs->doepdma,
-+							ep->dma_desc_addr);
-+#ifdef DWC_UTE_CFI
-+				}
-+#endif
-+			}
-+		} else {
-+			DWC_WRITE_REG32(&out_regs->doeptsiz, deptsiz.d32);
-+		}
-+
-+		if (ep->type == DWC_OTG_EP_TYPE_ISOC) {
-+			dsts_data_t dsts = {.d32 = 0};
-+			if (ep->bInterval == 1) {
-+				dsts.d32 =
-+				    DWC_READ_REG32(&core_if->dev_if->
-+						   dev_global_regs->dsts);
-+				ep->frame_num = dsts.b.soffn + ep->bInterval;
-+				if (ep->frame_num > 0x3FFF) {
-+					ep->frm_overrun = 1;
-+					ep->frame_num &= 0x3FFF;
-+				} else
-+					ep->frm_overrun = 0;
-+
-+				if (ep->frame_num & 0x1) {
-+					depctl.b.setd1pid = 1;
-+				} else {
-+					depctl.b.setd0pid = 1;
-+				}
-+			}
-+		}
-+
-+		/* EP enable */
-+		depctl.b.cnak = 1;
-+		depctl.b.epena = 1;
-+
-+		DWC_WRITE_REG32(&out_regs->doepctl, depctl.d32);
-+
-+		DWC_DEBUGPL(DBG_PCD, "DOEPCTL=%08x DOEPTSIZ=%08x\n",
-+			    DWC_READ_REG32(&out_regs->doepctl),
-+			    DWC_READ_REG32(&out_regs->doeptsiz));
-+		DWC_DEBUGPL(DBG_PCD, "DAINTMSK=%08x GINTMSK=%08x\n",
-+			    DWC_READ_REG32(&core_if->dev_if->dev_global_regs->
-+					   daintmsk),
-+			    DWC_READ_REG32(&core_if->core_global_regs->
-+					   gintmsk));
-+
-+		/* Timer is scheduling only for out bulk transfers for
-+		 * "Device DDMA OUT NAK Enhancement" feature to inform user
-+		 * about received data payload in case of timeout
-+		 */
-+		if (core_if->core_params->dev_out_nak) {
-+			if (ep->type == DWC_OTG_EP_TYPE_BULK) {
-+				core_if->ep_xfer_info[ep->num].core_if = core_if;
-+				core_if->ep_xfer_info[ep->num].ep = ep;
-+				core_if->ep_xfer_info[ep->num].state = 1;
-+
-+				/* Start a timer for this transfer. */
-+				DWC_TIMER_SCHEDULE(core_if->ep_xfer_timer[ep->num], 10000);
-+			}
-+		}
-+	}
-+}
-+
-+/**
-+ * This function setup a zero length transfer in Buffer DMA and
-+ * Slave modes for usb requests with zero field set
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param ep The EP to start the transfer on.
-+ *
-+ */
-+void dwc_otg_ep_start_zl_transfer(dwc_otg_core_if_t * core_if, dwc_ep_t * ep)
-+{
-+
-+	depctl_data_t depctl;
-+	deptsiz_data_t deptsiz;
-+	gintmsk_data_t intr_mask = {.d32 = 0 };
-+
-+	DWC_DEBUGPL((DBG_PCDV | DBG_CILV), "%s()\n", __func__);
-+	DWC_PRINTF("zero length transfer is called\n");
-+
-+	/* IN endpoint */
-+	if (ep->is_in == 1) {
-+		dwc_otg_dev_in_ep_regs_t *in_regs =
-+		    core_if->dev_if->in_ep_regs[ep->num];
-+
-+		depctl.d32 = DWC_READ_REG32(&(in_regs->diepctl));
-+		deptsiz.d32 = DWC_READ_REG32(&(in_regs->dieptsiz));
-+
-+		deptsiz.b.xfersize = 0;
-+		deptsiz.b.pktcnt = 1;
-+
-+		/* Write the DMA register */
-+		if (core_if->dma_enable) {
-+			if (core_if->dma_desc_enable == 0) {
-+				deptsiz.b.mc = 1;
-+				DWC_WRITE_REG32(&in_regs->dieptsiz,
-+						deptsiz.d32);
-+				DWC_WRITE_REG32(&(in_regs->diepdma),
-+						(uint32_t) ep->dma_addr);
-+			}
-+		} else {
-+			DWC_WRITE_REG32(&in_regs->dieptsiz, deptsiz.d32);
-+			/**
-+			 * Enable the Non-Periodic Tx FIFO empty interrupt,
-+			 * or the Tx FIFO epmty interrupt in dedicated Tx FIFO mode,
-+			 * the data will be written into the fifo by the ISR.
-+			 */
-+			if (core_if->en_multiple_tx_fifo == 0) {
-+				intr_mask.b.nptxfempty = 1;
-+				DWC_MODIFY_REG32(&core_if->
-+						 core_global_regs->gintmsk,
-+						 intr_mask.d32, intr_mask.d32);
-+			} else {
-+				/* Enable the Tx FIFO Empty Interrupt for this EP */
-+				if (ep->xfer_len > 0) {
-+					uint32_t fifoemptymsk = 0;
-+					fifoemptymsk = 1 << ep->num;
-+					DWC_MODIFY_REG32(&core_if->
-+							 dev_if->dev_global_regs->dtknqr4_fifoemptymsk,
-+							 0, fifoemptymsk);
-+				}
-+			}
-+		}
-+
-+		if (!core_if->core_params->en_multiple_tx_fifo && core_if->dma_enable)
-+			depctl.b.nextep = core_if->nextep_seq[ep->num];
-+		/* EP enable, IN data in FIFO */
-+		depctl.b.cnak = 1;
-+		depctl.b.epena = 1;
-+		DWC_WRITE_REG32(&in_regs->diepctl, depctl.d32);
-+
-+	} else {
-+		/* OUT endpoint */
-+		dwc_otg_dev_out_ep_regs_t *out_regs =
-+		    core_if->dev_if->out_ep_regs[ep->num];
-+
-+		depctl.d32 = DWC_READ_REG32(&(out_regs->doepctl));
-+		deptsiz.d32 = DWC_READ_REG32(&(out_regs->doeptsiz));
-+
-+		/* Zero Length Packet */
-+		deptsiz.b.xfersize = ep->maxpacket;
-+		deptsiz.b.pktcnt = 1;
-+
-+		if (core_if->dma_enable) {
-+			if (!core_if->dma_desc_enable) {
-+				DWC_WRITE_REG32(&out_regs->doeptsiz,
-+						deptsiz.d32);
-+
-+				DWC_WRITE_REG32(&(out_regs->doepdma),
-+						(uint32_t) ep->dma_addr);
-+			}
-+		} else {
-+			DWC_WRITE_REG32(&out_regs->doeptsiz, deptsiz.d32);
-+		}
-+
-+		/* EP enable */
-+		depctl.b.cnak = 1;
-+		depctl.b.epena = 1;
-+
-+		DWC_WRITE_REG32(&out_regs->doepctl, depctl.d32);
-+
-+	}
-+}
-+
-+/**
-+ * This function does the setup for a data transfer for EP0 and starts
-+ * the transfer.  For an IN transfer, the packets will be loaded into
-+ * the appropriate Tx FIFO in the ISR. For OUT transfers, the packets are
-+ * unloaded from the Rx FIFO in the ISR.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param ep The EP0 data.
-+ */
-+void dwc_otg_ep0_start_transfer(dwc_otg_core_if_t * core_if, dwc_ep_t * ep)
-+{
-+	depctl_data_t depctl;
-+	deptsiz0_data_t deptsiz;
-+	gintmsk_data_t intr_mask = {.d32 = 0 };
-+	dwc_otg_dev_dma_desc_t *dma_desc;
-+
-+	DWC_DEBUGPL(DBG_PCD, "ep%d-%s xfer_len=%d xfer_cnt=%d "
-+		    "xfer_buff=%p start_xfer_buff=%p \n",
-+		    ep->num, (ep->is_in ? "IN" : "OUT"), ep->xfer_len,
-+		    ep->xfer_count, ep->xfer_buff, ep->start_xfer_buff);
-+
-+	ep->total_len = ep->xfer_len;
-+
-+	/* IN endpoint */
-+	if (ep->is_in == 1) {
-+		dwc_otg_dev_in_ep_regs_t *in_regs =
-+		    core_if->dev_if->in_ep_regs[0];
-+
-+		gnptxsts_data_t gtxstatus;
-+
-+		if (core_if->snpsid >= OTG_CORE_REV_3_00a) {
-+			depctl.d32 = DWC_READ_REG32(&in_regs->diepctl);
-+			if (depctl.b.epena)
-+				return;
-+		}
-+
-+		gtxstatus.d32 =
-+		    DWC_READ_REG32(&core_if->core_global_regs->gnptxsts);
-+
-+		/* If dedicated FIFO every time flush fifo before enable ep*/
-+		if (core_if->en_multiple_tx_fifo && core_if->snpsid >= OTG_CORE_REV_3_00a)
-+			dwc_otg_flush_tx_fifo(core_if, ep->tx_fifo_num);
-+
-+		if (core_if->en_multiple_tx_fifo == 0
-+		    && gtxstatus.b.nptxqspcavail == 0
-+		    && !core_if->dma_enable) {
-+#ifdef DEBUG
-+			deptsiz.d32 = DWC_READ_REG32(&in_regs->dieptsiz);
-+			DWC_DEBUGPL(DBG_PCD, "DIEPCTL0=%0x\n",
-+				    DWC_READ_REG32(&in_regs->diepctl));
-+			DWC_DEBUGPL(DBG_PCD, "DIEPTSIZ0=%0x (sz=%d, pcnt=%d)\n",
-+				    deptsiz.d32,
-+				    deptsiz.b.xfersize, deptsiz.b.pktcnt);
-+			DWC_PRINTF("TX Queue or FIFO Full (0x%0x)\n",
-+				   gtxstatus.d32);
-+#endif
-+			return;
-+		}
-+
-+		depctl.d32 = DWC_READ_REG32(&in_regs->diepctl);
-+		deptsiz.d32 = DWC_READ_REG32(&in_regs->dieptsiz);
-+
-+		/* Zero Length Packet? */
-+		if (ep->xfer_len == 0) {
-+			deptsiz.b.xfersize = 0;
-+			deptsiz.b.pktcnt = 1;
-+		} else {
-+			/* Program the transfer size and packet count
-+			 *      as follows: xfersize = N * maxpacket +
-+			 *      short_packet pktcnt = N + (short_packet
-+			 *      exist ? 1 : 0)
-+			 */
-+			if (ep->xfer_len > ep->maxpacket) {
-+				ep->xfer_len = ep->maxpacket;
-+				deptsiz.b.xfersize = ep->maxpacket;
-+			} else {
-+				deptsiz.b.xfersize = ep->xfer_len;
-+			}
-+			deptsiz.b.pktcnt = 1;
-+
-+		}
-+		DWC_DEBUGPL(DBG_PCDV,
-+			    "IN len=%d  xfersize=%d pktcnt=%d [%08x]\n",
-+			    ep->xfer_len, deptsiz.b.xfersize, deptsiz.b.pktcnt,
-+			    deptsiz.d32);
-+
-+		/* Write the DMA register */
-+		if (core_if->dma_enable) {
-+			if (core_if->dma_desc_enable == 0) {
-+				DWC_WRITE_REG32(&in_regs->dieptsiz,
-+						deptsiz.d32);
-+
-+				DWC_WRITE_REG32(&(in_regs->diepdma),
-+						(uint32_t) ep->dma_addr);
-+			} else {
-+				dma_desc = core_if->dev_if->in_desc_addr;
-+
-+				/** DMA Descriptor Setup */
-+				dma_desc->status.b.bs = BS_HOST_BUSY;
-+				dma_desc->status.b.l = 1;
-+				dma_desc->status.b.ioc = 1;
-+				dma_desc->status.b.sp =
-+				    (ep->xfer_len == ep->maxpacket) ? 0 : 1;
-+				dma_desc->status.b.bytes = ep->xfer_len;
-+				dma_desc->buf = ep->dma_addr;
-+				dma_desc->status.b.sts = 0;
-+				dma_desc->status.b.bs = BS_HOST_READY;
-+
-+				/** DIEPDMA0 Register write */
-+				DWC_WRITE_REG32(&in_regs->diepdma,
-+						core_if->
-+						dev_if->dma_in_desc_addr);
-+			}
-+		} else {
-+			DWC_WRITE_REG32(&in_regs->dieptsiz, deptsiz.d32);
-+		}
-+
-+		if (!core_if->core_params->en_multiple_tx_fifo && core_if->dma_enable)
-+			depctl.b.nextep = core_if->nextep_seq[ep->num];
-+		/* EP enable, IN data in FIFO */
-+		depctl.b.cnak = 1;
-+		depctl.b.epena = 1;
-+		DWC_WRITE_REG32(&in_regs->diepctl, depctl.d32);
-+
-+		/**
-+		 * Enable the Non-Periodic Tx FIFO empty interrupt, the
-+		 * data will be written into the fifo by the ISR.
-+		 */
-+		if (!core_if->dma_enable) {
-+			if (core_if->en_multiple_tx_fifo == 0) {
-+				intr_mask.b.nptxfempty = 1;
-+				DWC_MODIFY_REG32(&core_if->
-+						 core_global_regs->gintmsk,
-+						 intr_mask.d32, intr_mask.d32);
-+			} else {
-+				/* Enable the Tx FIFO Empty Interrupt for this EP */
-+				if (ep->xfer_len > 0) {
-+					uint32_t fifoemptymsk = 0;
-+					fifoemptymsk |= 1 << ep->num;
-+					DWC_MODIFY_REG32(&core_if->
-+							 dev_if->dev_global_regs->dtknqr4_fifoemptymsk,
-+							 0, fifoemptymsk);
-+				}
-+			}
-+		}
-+	} else {
-+		/* OUT endpoint */
-+		dwc_otg_dev_out_ep_regs_t *out_regs =
-+		    core_if->dev_if->out_ep_regs[0];
-+
-+		depctl.d32 = DWC_READ_REG32(&out_regs->doepctl);
-+		deptsiz.d32 = DWC_READ_REG32(&out_regs->doeptsiz);
-+
-+		/* Program the transfer size and packet count as follows:
-+		 *      xfersize = N * (maxpacket + 4 - (maxpacket % 4))
-+		 *      pktcnt = N                                                                                      */
-+		/* Zero Length Packet */
-+		deptsiz.b.xfersize = ep->maxpacket;
-+		deptsiz.b.pktcnt = 1;
-+		if (core_if->snpsid >= OTG_CORE_REV_3_00a)
-+			deptsiz.b.supcnt = 3;
-+
-+		DWC_DEBUGPL(DBG_PCDV, "len=%d  xfersize=%d pktcnt=%d\n",
-+			    ep->xfer_len, deptsiz.b.xfersize, deptsiz.b.pktcnt);
-+
-+		if (core_if->dma_enable) {
-+			if (!core_if->dma_desc_enable) {
-+				DWC_WRITE_REG32(&out_regs->doeptsiz,
-+						deptsiz.d32);
-+
-+				DWC_WRITE_REG32(&(out_regs->doepdma),
-+						(uint32_t) ep->dma_addr);
-+			} else {
-+				dma_desc = core_if->dev_if->out_desc_addr;
-+
-+				/** DMA Descriptor Setup */
-+				dma_desc->status.b.bs = BS_HOST_BUSY;
-+				if (core_if->snpsid >= OTG_CORE_REV_3_00a) {
-+					dma_desc->status.b.mtrf = 0;
-+					dma_desc->status.b.sr = 0;
-+				}
-+				dma_desc->status.b.l = 1;
-+				dma_desc->status.b.ioc = 1;
-+				dma_desc->status.b.bytes = ep->maxpacket;
-+				dma_desc->buf = ep->dma_addr;
-+				dma_desc->status.b.sts = 0;
-+				dma_desc->status.b.bs = BS_HOST_READY;
-+
-+				/** DOEPDMA0 Register write */
-+				DWC_WRITE_REG32(&out_regs->doepdma,
-+						core_if->dev_if->
-+						dma_out_desc_addr);
-+			}
-+		} else {
-+			DWC_WRITE_REG32(&out_regs->doeptsiz, deptsiz.d32);
-+		}
-+
-+		/* EP enable */
-+		depctl.b.cnak = 1;
-+		depctl.b.epena = 1;
-+		DWC_WRITE_REG32(&(out_regs->doepctl), depctl.d32);
-+	}
-+}
-+
-+/**
-+ * This function continues control IN transfers started by
-+ * dwc_otg_ep0_start_transfer, when the transfer does not fit in a
-+ * single packet.  NOTE: The DIEPCTL0/DOEPCTL0 registers only have one
-+ * bit for the packet count.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param ep The EP0 data.
-+ */
-+void dwc_otg_ep0_continue_transfer(dwc_otg_core_if_t * core_if, dwc_ep_t * ep)
-+{
-+	depctl_data_t depctl;
-+	deptsiz0_data_t deptsiz;
-+	gintmsk_data_t intr_mask = {.d32 = 0 };
-+	dwc_otg_dev_dma_desc_t *dma_desc;
-+
-+	if (ep->is_in == 1) {
-+		dwc_otg_dev_in_ep_regs_t *in_regs =
-+		    core_if->dev_if->in_ep_regs[0];
-+		gnptxsts_data_t tx_status = {.d32 = 0 };
-+
-+		tx_status.d32 =
-+		    DWC_READ_REG32(&core_if->core_global_regs->gnptxsts);
-+		/** @todo Should there be check for room in the Tx
-+		 * Status Queue.  If not remove the code above this comment. */
-+
-+		depctl.d32 = DWC_READ_REG32(&in_regs->diepctl);
-+		deptsiz.d32 = DWC_READ_REG32(&in_regs->dieptsiz);
-+
-+		/* Program the transfer size and packet count
-+		 *      as follows: xfersize = N * maxpacket +
-+		 *      short_packet pktcnt = N + (short_packet
-+		 *      exist ? 1 : 0)
-+		 */
-+
-+		if (core_if->dma_desc_enable == 0) {
-+			deptsiz.b.xfersize =
-+			    (ep->total_len - ep->xfer_count) >
-+			    ep->maxpacket ? ep->maxpacket : (ep->total_len -
-+							     ep->xfer_count);
-+			deptsiz.b.pktcnt = 1;
-+			if (core_if->dma_enable == 0) {
-+				ep->xfer_len += deptsiz.b.xfersize;
-+			} else {
-+				ep->xfer_len = deptsiz.b.xfersize;
-+			}
-+			DWC_WRITE_REG32(&in_regs->dieptsiz, deptsiz.d32);
-+		} else {
-+			ep->xfer_len =
-+			    (ep->total_len - ep->xfer_count) >
-+			    ep->maxpacket ? ep->maxpacket : (ep->total_len -
-+							     ep->xfer_count);
-+
-+			dma_desc = core_if->dev_if->in_desc_addr;
-+
-+			/** DMA Descriptor Setup */
-+			dma_desc->status.b.bs = BS_HOST_BUSY;
-+			dma_desc->status.b.l = 1;
-+			dma_desc->status.b.ioc = 1;
-+			dma_desc->status.b.sp =
-+			    (ep->xfer_len == ep->maxpacket) ? 0 : 1;
-+			dma_desc->status.b.bytes = ep->xfer_len;
-+			dma_desc->buf = ep->dma_addr;
-+			dma_desc->status.b.sts = 0;
-+			dma_desc->status.b.bs = BS_HOST_READY;
-+
-+			/** DIEPDMA0 Register write */
-+			DWC_WRITE_REG32(&in_regs->diepdma,
-+					core_if->dev_if->dma_in_desc_addr);
-+		}
-+
-+		DWC_DEBUGPL(DBG_PCDV,
-+			    "IN len=%d  xfersize=%d pktcnt=%d [%08x]\n",
-+			    ep->xfer_len, deptsiz.b.xfersize, deptsiz.b.pktcnt,
-+			    deptsiz.d32);
-+
-+		/* Write the DMA register */
-+		if (core_if->hwcfg2.b.architecture == DWC_INT_DMA_ARCH) {
-+			if (core_if->dma_desc_enable == 0)
-+				DWC_WRITE_REG32(&(in_regs->diepdma),
-+						(uint32_t) ep->dma_addr);
-+		}
-+		if (!core_if->core_params->en_multiple_tx_fifo && core_if->dma_enable)
-+			depctl.b.nextep = core_if->nextep_seq[ep->num];
-+		/* EP enable, IN data in FIFO */
-+		depctl.b.cnak = 1;
-+		depctl.b.epena = 1;
-+		DWC_WRITE_REG32(&in_regs->diepctl, depctl.d32);
-+
-+		/**
-+		 * Enable the Non-Periodic Tx FIFO empty interrupt, the
-+		 * data will be written into the fifo by the ISR.
-+		 */
-+		if (!core_if->dma_enable) {
-+			if (core_if->en_multiple_tx_fifo == 0) {
-+				/* First clear it from GINTSTS */
-+				intr_mask.b.nptxfempty = 1;
-+				DWC_MODIFY_REG32(&core_if->
-+						 core_global_regs->gintmsk,
-+						 intr_mask.d32, intr_mask.d32);
-+
-+			} else {
-+				/* Enable the Tx FIFO Empty Interrupt for this EP */
-+				if (ep->xfer_len > 0) {
-+					uint32_t fifoemptymsk = 0;
-+					fifoemptymsk |= 1 << ep->num;
-+					DWC_MODIFY_REG32(&core_if->
-+							 dev_if->dev_global_regs->dtknqr4_fifoemptymsk,
-+							 0, fifoemptymsk);
-+				}
-+			}
-+		}
-+	} else {
-+		dwc_otg_dev_out_ep_regs_t *out_regs =
-+		    core_if->dev_if->out_ep_regs[0];
-+
-+		depctl.d32 = DWC_READ_REG32(&out_regs->doepctl);
-+		deptsiz.d32 = DWC_READ_REG32(&out_regs->doeptsiz);
-+
-+		/* Program the transfer size and packet count
-+		 *      as follows: xfersize = N * maxpacket +
-+		 *      short_packet pktcnt = N + (short_packet
-+		 *      exist ? 1 : 0)
-+		 */
-+		deptsiz.b.xfersize = ep->maxpacket;
-+		deptsiz.b.pktcnt = 1;
-+
-+		if (core_if->dma_desc_enable == 0) {
-+			DWC_WRITE_REG32(&out_regs->doeptsiz, deptsiz.d32);
-+		} else {
-+			dma_desc = core_if->dev_if->out_desc_addr;
-+
-+			/** DMA Descriptor Setup */
-+			dma_desc->status.b.bs = BS_HOST_BUSY;
-+			dma_desc->status.b.l = 1;
-+			dma_desc->status.b.ioc = 1;
-+			dma_desc->status.b.bytes = ep->maxpacket;
-+			dma_desc->buf = ep->dma_addr;
-+			dma_desc->status.b.sts = 0;
-+			dma_desc->status.b.bs = BS_HOST_READY;
-+
-+			/** DOEPDMA0 Register write */
-+			DWC_WRITE_REG32(&out_regs->doepdma,
-+					core_if->dev_if->dma_out_desc_addr);
-+		}
-+
-+		DWC_DEBUGPL(DBG_PCDV,
-+			    "IN len=%d  xfersize=%d pktcnt=%d [%08x]\n",
-+			    ep->xfer_len, deptsiz.b.xfersize, deptsiz.b.pktcnt,
-+			    deptsiz.d32);
-+
-+		/* Write the DMA register */
-+		if (core_if->hwcfg2.b.architecture == DWC_INT_DMA_ARCH) {
-+			if (core_if->dma_desc_enable == 0)
-+				DWC_WRITE_REG32(&(out_regs->doepdma),
-+						(uint32_t) ep->dma_addr);
-+
-+		}
-+
-+		/* EP enable, IN data in FIFO */
-+		depctl.b.cnak = 1;
-+		depctl.b.epena = 1;
-+		DWC_WRITE_REG32(&out_regs->doepctl, depctl.d32);
-+
-+	}
-+}
-+
-+#ifdef DEBUG
-+void dump_msg(const u8 * buf, unsigned int length)
-+{
-+	unsigned int start, num, i;
-+	char line[52], *p;
-+
-+	if (length >= 512)
-+		return;
-+	start = 0;
-+	while (length > 0) {
-+		num = length < 16u ? length : 16u;
-+		p = line;
-+		for (i = 0; i < num; ++i) {
-+			if (i == 8)
-+				*p++ = ' ';
-+			DWC_SPRINTF(p, " %02x", buf[i]);
-+			p += 3;
-+		}
-+		*p = 0;
-+		DWC_PRINTF("%6x: %s\n", start, line);
-+		buf += num;
-+		start += num;
-+		length -= num;
-+	}
-+}
-+#else
-+static inline void dump_msg(const u8 * buf, unsigned int length)
-+{
-+}
-+#endif
-+
-+/**
-+ * This function writes a packet into the Tx FIFO associated with the
-+ * EP. For non-periodic EPs the non-periodic Tx FIFO is written.  For
-+ * periodic EPs the periodic Tx FIFO associated with the EP is written
-+ * with all packets for the next micro-frame.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param ep The EP to write packet for.
-+ * @param dma Indicates if DMA is being used.
-+ */
-+void dwc_otg_ep_write_packet(dwc_otg_core_if_t * core_if, dwc_ep_t * ep,
-+			     int dma)
-+{
-+	/**
-+	 * The buffer is padded to DWORD on a per packet basis in
-+	 * slave/dma mode if the MPS is not DWORD aligned. The last
-+	 * packet, if short, is also padded to a multiple of DWORD.
-+	 *
-+	 * ep->xfer_buff always starts DWORD aligned in memory and is a
-+	 * multiple of DWORD in length
-+	 *
-+	 * ep->xfer_len can be any number of bytes
-+	 *
-+	 * ep->xfer_count is a multiple of ep->maxpacket until the last
-+	 *	packet
-+	 *
-+	 * FIFO access is DWORD */
-+
-+	uint32_t i;
-+	uint32_t byte_count;
-+	uint32_t dword_count;
-+	uint32_t *fifo;
-+	uint32_t *data_buff = (uint32_t *) ep->xfer_buff;
-+
-+	DWC_DEBUGPL((DBG_PCDV | DBG_CILV), "%s(%p,%p)\n", __func__, core_if,
-+		    ep);
-+	if (ep->xfer_count >= ep->xfer_len) {
-+		DWC_WARN("%s() No data for EP%d!!!\n", __func__, ep->num);
-+		return;
-+	}
-+
-+	/* Find the byte length of the packet either short packet or MPS */
-+	if ((ep->xfer_len - ep->xfer_count) < ep->maxpacket) {
-+		byte_count = ep->xfer_len - ep->xfer_count;
-+	} else {
-+		byte_count = ep->maxpacket;
-+	}
-+
-+	/* Find the DWORD length, padded by extra bytes as neccessary if MPS
-+	 * is not a multiple of DWORD */
-+	dword_count = (byte_count + 3) / 4;
-+
-+#ifdef VERBOSE
-+	dump_msg(ep->xfer_buff, byte_count);
-+#endif
-+
-+	/**@todo NGS Where are the Periodic Tx FIFO addresses
-+	 * intialized?	What should this be? */
-+
-+	fifo = core_if->data_fifo[ep->num];
-+
-+	DWC_DEBUGPL((DBG_PCDV | DBG_CILV), "fifo=%p buff=%p *p=%08x bc=%d\n",
-+		    fifo, data_buff, *data_buff, byte_count);
-+
-+	if (!dma) {
-+		for (i = 0; i < dword_count; i++, data_buff++) {
-+			DWC_WRITE_REG32(fifo, *data_buff);
-+		}
-+	}
-+
-+	ep->xfer_count += byte_count;
-+	ep->xfer_buff += byte_count;
-+	ep->dma_addr += byte_count;
-+}
-+
-+/**
-+ * Set the EP STALL.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param ep The EP to set the stall on.
-+ */
-+void dwc_otg_ep_set_stall(dwc_otg_core_if_t * core_if, dwc_ep_t * ep)
-+{
-+	depctl_data_t depctl;
-+	volatile uint32_t *depctl_addr;
-+
-+	DWC_DEBUGPL(DBG_PCD, "%s ep%d-%s\n", __func__, ep->num,
-+		    (ep->is_in ? "IN" : "OUT"));
-+
-+	if (ep->is_in == 1) {
-+		depctl_addr = &(core_if->dev_if->in_ep_regs[ep->num]->diepctl);
-+		depctl.d32 = DWC_READ_REG32(depctl_addr);
-+
-+		/* set the disable and stall bits */
-+		if (depctl.b.epena) {
-+			depctl.b.epdis = 1;
-+		}
-+		depctl.b.stall = 1;
-+		DWC_WRITE_REG32(depctl_addr, depctl.d32);
-+	} else {
-+		depctl_addr = &(core_if->dev_if->out_ep_regs[ep->num]->doepctl);
-+		depctl.d32 = DWC_READ_REG32(depctl_addr);
-+
-+		/* set the stall bit */
-+		depctl.b.stall = 1;
-+		DWC_WRITE_REG32(depctl_addr, depctl.d32);
-+	}
-+
-+	DWC_DEBUGPL(DBG_PCD, "DEPCTL=%0x\n", DWC_READ_REG32(depctl_addr));
-+
-+	return;
-+}
-+
-+/**
-+ * Clear the EP STALL.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param ep The EP to clear stall from.
-+ */
-+void dwc_otg_ep_clear_stall(dwc_otg_core_if_t * core_if, dwc_ep_t * ep)
-+{
-+	depctl_data_t depctl;
-+	volatile uint32_t *depctl_addr;
-+
-+	DWC_DEBUGPL(DBG_PCD, "%s ep%d-%s\n", __func__, ep->num,
-+		    (ep->is_in ? "IN" : "OUT"));
-+
-+	if (ep->is_in == 1) {
-+		depctl_addr = &(core_if->dev_if->in_ep_regs[ep->num]->diepctl);
-+	} else {
-+		depctl_addr = &(core_if->dev_if->out_ep_regs[ep->num]->doepctl);
-+	}
-+
-+	depctl.d32 = DWC_READ_REG32(depctl_addr);
-+
-+	/* clear the stall bits */
-+	depctl.b.stall = 0;
-+
-+	/*
-+	 * USB Spec 9.4.5: For endpoints using data toggle, regardless
-+	 * of whether an endpoint has the Halt feature set, a
-+	 * ClearFeature(ENDPOINT_HALT) request always results in the
-+	 * data toggle being reinitialized to DATA0.
-+	 */
-+	if (ep->type == DWC_OTG_EP_TYPE_INTR ||
-+	    ep->type == DWC_OTG_EP_TYPE_BULK) {
-+		depctl.b.setd0pid = 1;	/* DATA0 */
-+	}
-+
-+	DWC_WRITE_REG32(depctl_addr, depctl.d32);
-+	DWC_DEBUGPL(DBG_PCD, "DEPCTL=%0x\n", DWC_READ_REG32(depctl_addr));
-+	return;
-+}
-+
-+/**
-+ * This function reads a packet from the Rx FIFO into the destination
-+ * buffer. To read SETUP data use dwc_otg_read_setup_packet.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param dest	  Destination buffer for the packet.
-+ * @param bytes  Number of bytes to copy to the destination.
-+ */
-+void dwc_otg_read_packet(dwc_otg_core_if_t * core_if,
-+			 uint8_t * dest, uint16_t bytes)
-+{
-+	int i;
-+	int word_count = (bytes + 3) / 4;
-+
-+	volatile uint32_t *fifo = core_if->data_fifo[0];
-+	uint32_t *data_buff = (uint32_t *) dest;
-+
-+	/**
-+	 * @todo Account for the case where _dest is not dword aligned. This
-+	 * requires reading data from the FIFO into a uint32_t temp buffer,
-+	 * then moving it into the data buffer.
-+	 */
-+
-+	DWC_DEBUGPL((DBG_PCDV | DBG_CILV), "%s(%p,%p,%d)\n", __func__,
-+		    core_if, dest, bytes);
-+
-+	for (i = 0; i < word_count; i++, data_buff++) {
-+		*data_buff = DWC_READ_REG32(fifo);
-+	}
-+
-+	return;
-+}
-+
-+/**
-+ * This functions reads the device registers and prints them
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ */
-+void dwc_otg_dump_dev_registers(dwc_otg_core_if_t * core_if)
-+{
-+	int i;
-+	volatile uint32_t *addr;
-+
-+	DWC_PRINTF("Device Global Registers\n");
-+	addr = &core_if->dev_if->dev_global_regs->dcfg;
-+	DWC_PRINTF("DCFG		 @0x%08lX : 0x%08X\n",
-+		   (unsigned long)addr, DWC_READ_REG32(addr));
-+	addr = &core_if->dev_if->dev_global_regs->dctl;
-+	DWC_PRINTF("DCTL		 @0x%08lX : 0x%08X\n",
-+		   (unsigned long)addr, DWC_READ_REG32(addr));
-+	addr = &core_if->dev_if->dev_global_regs->dsts;
-+	DWC_PRINTF("DSTS		 @0x%08lX : 0x%08X\n",
-+		   (unsigned long)addr, DWC_READ_REG32(addr));
-+	addr = &core_if->dev_if->dev_global_regs->diepmsk;
-+	DWC_PRINTF("DIEPMSK	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+	addr = &core_if->dev_if->dev_global_regs->doepmsk;
-+	DWC_PRINTF("DOEPMSK	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+	addr = &core_if->dev_if->dev_global_regs->daint;
-+	DWC_PRINTF("DAINT	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+	addr = &core_if->dev_if->dev_global_regs->daintmsk;
-+	DWC_PRINTF("DAINTMSK	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+	addr = &core_if->dev_if->dev_global_regs->dtknqr1;
-+	DWC_PRINTF("DTKNQR1	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+	if (core_if->hwcfg2.b.dev_token_q_depth > 6) {
-+		addr = &core_if->dev_if->dev_global_regs->dtknqr2;
-+		DWC_PRINTF("DTKNQR2	 @0x%08lX : 0x%08X\n",
-+			   (unsigned long)addr, DWC_READ_REG32(addr));
-+	}
-+
-+	addr = &core_if->dev_if->dev_global_regs->dvbusdis;
-+	DWC_PRINTF("DVBUSID	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+
-+	addr = &core_if->dev_if->dev_global_regs->dvbuspulse;
-+	DWC_PRINTF("DVBUSPULSE	@0x%08lX : 0x%08X\n",
-+		   (unsigned long)addr, DWC_READ_REG32(addr));
-+
-+	addr = &core_if->dev_if->dev_global_regs->dtknqr3_dthrctl;
-+	DWC_PRINTF("DTKNQR3_DTHRCTL	 @0x%08lX : 0x%08X\n",
-+		   (unsigned long)addr, DWC_READ_REG32(addr));
-+
-+	if (core_if->hwcfg2.b.dev_token_q_depth > 22) {
-+		addr = &core_if->dev_if->dev_global_regs->dtknqr4_fifoemptymsk;
-+		DWC_PRINTF("DTKNQR4	 @0x%08lX : 0x%08X\n",
-+			   (unsigned long)addr, DWC_READ_REG32(addr));
-+	}
-+
-+	addr = &core_if->dev_if->dev_global_regs->dtknqr4_fifoemptymsk;
-+	DWC_PRINTF("FIFOEMPMSK	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+
-+	if (core_if->hwcfg2.b.multi_proc_int) {
-+
-+		addr = &core_if->dev_if->dev_global_regs->deachint;
-+		DWC_PRINTF("DEACHINT	 @0x%08lX : 0x%08X\n",
-+			   (unsigned long)addr, DWC_READ_REG32(addr));
-+		addr = &core_if->dev_if->dev_global_regs->deachintmsk;
-+		DWC_PRINTF("DEACHINTMSK	 @0x%08lX : 0x%08X\n",
-+			   (unsigned long)addr, DWC_READ_REG32(addr));
-+
-+		for (i = 0; i <= core_if->dev_if->num_in_eps; i++) {
-+			addr =
-+			    &core_if->dev_if->
-+			    dev_global_regs->diepeachintmsk[i];
-+			DWC_PRINTF("DIEPEACHINTMSK[%d]	 @0x%08lX : 0x%08X\n",
-+				   i, (unsigned long)addr,
-+				   DWC_READ_REG32(addr));
-+		}
-+
-+		for (i = 0; i <= core_if->dev_if->num_out_eps; i++) {
-+			addr =
-+			    &core_if->dev_if->
-+			    dev_global_regs->doepeachintmsk[i];
-+			DWC_PRINTF("DOEPEACHINTMSK[%d]	 @0x%08lX : 0x%08X\n",
-+				   i, (unsigned long)addr,
-+				   DWC_READ_REG32(addr));
-+		}
-+	}
-+
-+	for (i = 0; i <= core_if->dev_if->num_in_eps; i++) {
-+		DWC_PRINTF("Device IN EP %d Registers\n", i);
-+		addr = &core_if->dev_if->in_ep_regs[i]->diepctl;
-+		DWC_PRINTF("DIEPCTL	 @0x%08lX : 0x%08X\n",
-+			   (unsigned long)addr, DWC_READ_REG32(addr));
-+		addr = &core_if->dev_if->in_ep_regs[i]->diepint;
-+		DWC_PRINTF("DIEPINT	 @0x%08lX : 0x%08X\n",
-+			   (unsigned long)addr, DWC_READ_REG32(addr));
-+		addr = &core_if->dev_if->in_ep_regs[i]->dieptsiz;
-+		DWC_PRINTF("DIETSIZ	 @0x%08lX : 0x%08X\n",
-+			   (unsigned long)addr, DWC_READ_REG32(addr));
-+		addr = &core_if->dev_if->in_ep_regs[i]->diepdma;
-+		DWC_PRINTF("DIEPDMA	 @0x%08lX : 0x%08X\n",
-+			   (unsigned long)addr, DWC_READ_REG32(addr));
-+		addr = &core_if->dev_if->in_ep_regs[i]->dtxfsts;
-+		DWC_PRINTF("DTXFSTS	 @0x%08lX : 0x%08X\n",
-+			   (unsigned long)addr, DWC_READ_REG32(addr));
-+		addr = &core_if->dev_if->in_ep_regs[i]->diepdmab;
-+		DWC_PRINTF("DIEPDMAB	 @0x%08lX : 0x%08X\n",
-+			   (unsigned long)addr, 0 /*DWC_READ_REG32(addr) */ );
-+	}
-+
-+	for (i = 0; i <= core_if->dev_if->num_out_eps; i++) {
-+		DWC_PRINTF("Device OUT EP %d Registers\n", i);
-+		addr = &core_if->dev_if->out_ep_regs[i]->doepctl;
-+		DWC_PRINTF("DOEPCTL	 @0x%08lX : 0x%08X\n",
-+			   (unsigned long)addr, DWC_READ_REG32(addr));
-+		addr = &core_if->dev_if->out_ep_regs[i]->doepint;
-+		DWC_PRINTF("DOEPINT	 @0x%08lX : 0x%08X\n",
-+			   (unsigned long)addr, DWC_READ_REG32(addr));
-+		addr = &core_if->dev_if->out_ep_regs[i]->doeptsiz;
-+		DWC_PRINTF("DOETSIZ	 @0x%08lX : 0x%08X\n",
-+			   (unsigned long)addr, DWC_READ_REG32(addr));
-+		addr = &core_if->dev_if->out_ep_regs[i]->doepdma;
-+		DWC_PRINTF("DOEPDMA	 @0x%08lX : 0x%08X\n",
-+			   (unsigned long)addr, DWC_READ_REG32(addr));
-+		if (core_if->dma_enable) {	/* Don't access this register in SLAVE mode */
-+			addr = &core_if->dev_if->out_ep_regs[i]->doepdmab;
-+			DWC_PRINTF("DOEPDMAB	 @0x%08lX : 0x%08X\n",
-+				   (unsigned long)addr, DWC_READ_REG32(addr));
-+		}
-+
-+	}
-+}
-+
-+/**
-+ * This functions reads the SPRAM and prints its content
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ */
-+void dwc_otg_dump_spram(dwc_otg_core_if_t * core_if)
-+{
-+	volatile uint8_t *addr, *start_addr, *end_addr;
-+
-+	DWC_PRINTF("SPRAM Data:\n");
-+	start_addr = (void *)core_if->core_global_regs;
-+	DWC_PRINTF("Base Address: 0x%8lX\n", (unsigned long)start_addr);
-+	start_addr += 0x00028000;
-+	end_addr = (void *)core_if->core_global_regs;
-+	end_addr += 0x000280e0;
-+
-+	for (addr = start_addr; addr < end_addr; addr += 16) {
-+		DWC_PRINTF
-+		    ("0x%8lX:\t%2X %2X %2X %2X %2X %2X %2X %2X %2X %2X %2X %2X %2X %2X %2X %2X\n",
-+		     (unsigned long)addr, addr[0], addr[1], addr[2], addr[3],
-+		     addr[4], addr[5], addr[6], addr[7], addr[8], addr[9],
-+		     addr[10], addr[11], addr[12], addr[13], addr[14], addr[15]
-+		    );
-+	}
-+
-+	return;
-+}
-+
-+/**
-+ * This function reads the host registers and prints them
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ */
-+void dwc_otg_dump_host_registers(dwc_otg_core_if_t * core_if)
-+{
-+	int i;
-+	volatile uint32_t *addr;
-+
-+	DWC_PRINTF("Host Global Registers\n");
-+	addr = &core_if->host_if->host_global_regs->hcfg;
-+	DWC_PRINTF("HCFG		 @0x%08lX : 0x%08X\n",
-+		   (unsigned long)addr, DWC_READ_REG32(addr));
-+	addr = &core_if->host_if->host_global_regs->hfir;
-+	DWC_PRINTF("HFIR		 @0x%08lX : 0x%08X\n",
-+		   (unsigned long)addr, DWC_READ_REG32(addr));
-+	addr = &core_if->host_if->host_global_regs->hfnum;
-+	DWC_PRINTF("HFNUM	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+	addr = &core_if->host_if->host_global_regs->hptxsts;
-+	DWC_PRINTF("HPTXSTS	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+	addr = &core_if->host_if->host_global_regs->haint;
-+	DWC_PRINTF("HAINT	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+	addr = &core_if->host_if->host_global_regs->haintmsk;
-+	DWC_PRINTF("HAINTMSK	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+	if (core_if->dma_desc_enable) {
-+		addr = &core_if->host_if->host_global_regs->hflbaddr;
-+		DWC_PRINTF("HFLBADDR	 @0x%08lX : 0x%08X\n",
-+			   (unsigned long)addr, DWC_READ_REG32(addr));
-+	}
-+
-+	addr = core_if->host_if->hprt0;
-+	DWC_PRINTF("HPRT0	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+
-+	for (i = 0; i < core_if->core_params->host_channels; i++) {
-+		DWC_PRINTF("Host Channel %d Specific Registers\n", i);
-+		addr = &core_if->host_if->hc_regs[i]->hcchar;
-+		DWC_PRINTF("HCCHAR	 @0x%08lX : 0x%08X\n",
-+			   (unsigned long)addr, DWC_READ_REG32(addr));
-+		addr = &core_if->host_if->hc_regs[i]->hcsplt;
-+		DWC_PRINTF("HCSPLT	 @0x%08lX : 0x%08X\n",
-+			   (unsigned long)addr, DWC_READ_REG32(addr));
-+		addr = &core_if->host_if->hc_regs[i]->hcint;
-+		DWC_PRINTF("HCINT	 @0x%08lX : 0x%08X\n",
-+			   (unsigned long)addr, DWC_READ_REG32(addr));
-+		addr = &core_if->host_if->hc_regs[i]->hcintmsk;
-+		DWC_PRINTF("HCINTMSK	 @0x%08lX : 0x%08X\n",
-+			   (unsigned long)addr, DWC_READ_REG32(addr));
-+		addr = &core_if->host_if->hc_regs[i]->hctsiz;
-+		DWC_PRINTF("HCTSIZ	 @0x%08lX : 0x%08X\n",
-+			   (unsigned long)addr, DWC_READ_REG32(addr));
-+		addr = &core_if->host_if->hc_regs[i]->hcdma;
-+		DWC_PRINTF("HCDMA	 @0x%08lX : 0x%08X\n",
-+			   (unsigned long)addr, DWC_READ_REG32(addr));
-+		if (core_if->dma_desc_enable) {
-+			addr = &core_if->host_if->hc_regs[i]->hcdmab;
-+			DWC_PRINTF("HCDMAB	 @0x%08lX : 0x%08X\n",
-+				   (unsigned long)addr, DWC_READ_REG32(addr));
-+		}
-+
-+	}
-+	return;
-+}
-+
-+/**
-+ * This function reads the core global registers and prints them
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ */
-+void dwc_otg_dump_global_registers(dwc_otg_core_if_t * core_if)
-+{
-+	int i, ep_num;
-+	volatile uint32_t *addr;
-+	char *txfsiz;
-+
-+	DWC_PRINTF("Core Global Registers\n");
-+	addr = &core_if->core_global_regs->gotgctl;
-+	DWC_PRINTF("GOTGCTL	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+	addr = &core_if->core_global_regs->gotgint;
-+	DWC_PRINTF("GOTGINT	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+	addr = &core_if->core_global_regs->gahbcfg;
-+	DWC_PRINTF("GAHBCFG	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+	addr = &core_if->core_global_regs->gusbcfg;
-+	DWC_PRINTF("GUSBCFG	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+	addr = &core_if->core_global_regs->grstctl;
-+	DWC_PRINTF("GRSTCTL	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+	addr = &core_if->core_global_regs->gintsts;
-+	DWC_PRINTF("GINTSTS	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+	addr = &core_if->core_global_regs->gintmsk;
-+	DWC_PRINTF("GINTMSK	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+	addr = &core_if->core_global_regs->grxstsr;
-+	DWC_PRINTF("GRXSTSR	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+	addr = &core_if->core_global_regs->grxfsiz;
-+	DWC_PRINTF("GRXFSIZ	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+	addr = &core_if->core_global_regs->gnptxfsiz;
-+	DWC_PRINTF("GNPTXFSIZ @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+	addr = &core_if->core_global_regs->gnptxsts;
-+	DWC_PRINTF("GNPTXSTS	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+	addr = &core_if->core_global_regs->gi2cctl;
-+	DWC_PRINTF("GI2CCTL	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+	addr = &core_if->core_global_regs->gpvndctl;
-+	DWC_PRINTF("GPVNDCTL	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+	addr = &core_if->core_global_regs->ggpio;
-+	DWC_PRINTF("GGPIO	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+	addr = &core_if->core_global_regs->guid;
-+	DWC_PRINTF("GUID		 @0x%08lX : 0x%08X\n",
-+		   (unsigned long)addr, DWC_READ_REG32(addr));
-+	addr = &core_if->core_global_regs->gsnpsid;
-+	DWC_PRINTF("GSNPSID	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+	addr = &core_if->core_global_regs->ghwcfg1;
-+	DWC_PRINTF("GHWCFG1	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+	addr = &core_if->core_global_regs->ghwcfg2;
-+	DWC_PRINTF("GHWCFG2	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+	addr = &core_if->core_global_regs->ghwcfg3;
-+	DWC_PRINTF("GHWCFG3	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+	addr = &core_if->core_global_regs->ghwcfg4;
-+	DWC_PRINTF("GHWCFG4	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+	addr = &core_if->core_global_regs->glpmcfg;
-+	DWC_PRINTF("GLPMCFG	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+	addr = &core_if->core_global_regs->gpwrdn;
-+	DWC_PRINTF("GPWRDN	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+	addr = &core_if->core_global_regs->gdfifocfg;
-+	DWC_PRINTF("GDFIFOCFG	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+	addr = &core_if->core_global_regs->adpctl;
-+	DWC_PRINTF("ADPCTL	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   dwc_otg_adp_read_reg(core_if));
-+	addr = &core_if->core_global_regs->hptxfsiz;
-+	DWC_PRINTF("HPTXFSIZ	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+
-+	if (core_if->en_multiple_tx_fifo == 0) {
-+		ep_num = core_if->hwcfg4.b.num_dev_perio_in_ep;
-+		txfsiz = "DPTXFSIZ";
-+	} else {
-+		ep_num = core_if->hwcfg4.b.num_in_eps;
-+		txfsiz = "DIENPTXF";
-+	}
-+	for (i = 0; i < ep_num; i++) {
-+		addr = &core_if->core_global_regs->dtxfsiz[i];
-+		DWC_PRINTF("%s[%d] @0x%08lX : 0x%08X\n", txfsiz, i + 1,
-+			   (unsigned long)addr, DWC_READ_REG32(addr));
-+	}
-+	addr = core_if->pcgcctl;
-+	DWC_PRINTF("PCGCCTL	 @0x%08lX : 0x%08X\n", (unsigned long)addr,
-+		   DWC_READ_REG32(addr));
-+}
-+
-+/**
-+ * Flush a Tx FIFO.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param num Tx FIFO to flush.
-+ */
-+void dwc_otg_flush_tx_fifo(dwc_otg_core_if_t * core_if, const int num)
-+{
-+	dwc_otg_core_global_regs_t *global_regs = core_if->core_global_regs;
-+	volatile grstctl_t greset = {.d32 = 0 };
-+	int count = 0;
-+
-+	DWC_DEBUGPL((DBG_CIL | DBG_PCDV), "Flush Tx FIFO %d\n", num);
-+
-+	greset.b.txfflsh = 1;
-+	greset.b.txfnum = num;
-+	DWC_WRITE_REG32(&global_regs->grstctl, greset.d32);
-+
-+	do {
-+		greset.d32 = DWC_READ_REG32(&global_regs->grstctl);
-+		if (++count > 10000) {
-+			DWC_WARN("%s() HANG! GRSTCTL=%0x GNPTXSTS=0x%08x\n",
-+				 __func__, greset.d32,
-+				 DWC_READ_REG32(&global_regs->gnptxsts));
-+			break;
-+		}
-+		dwc_udelay(1);
-+	} while (greset.b.txfflsh == 1);
-+
-+	/* Wait for 3 PHY Clocks */
-+	dwc_udelay(1);
-+}
-+
-+/**
-+ * Flush Rx FIFO.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ */
-+void dwc_otg_flush_rx_fifo(dwc_otg_core_if_t * core_if)
-+{
-+	dwc_otg_core_global_regs_t *global_regs = core_if->core_global_regs;
-+	volatile grstctl_t greset = {.d32 = 0 };
-+	int count = 0;
-+
-+	DWC_DEBUGPL((DBG_CIL | DBG_PCDV), "%s\n", __func__);
-+	/*
-+	 *
-+	 */
-+	greset.b.rxfflsh = 1;
-+	DWC_WRITE_REG32(&global_regs->grstctl, greset.d32);
-+
-+	do {
-+		greset.d32 = DWC_READ_REG32(&global_regs->grstctl);
-+		if (++count > 10000) {
-+			DWC_WARN("%s() HANG! GRSTCTL=%0x\n", __func__,
-+				 greset.d32);
-+			break;
-+		}
-+		dwc_udelay(1);
-+	} while (greset.b.rxfflsh == 1);
-+
-+	/* Wait for 3 PHY Clocks */
-+	dwc_udelay(1);
-+}
-+
-+/**
-+ * Do core a soft reset of the core.  Be careful with this because it
-+ * resets all the internal state machines of the core.
-+ */
-+void dwc_otg_core_reset(dwc_otg_core_if_t * core_if)
-+{
-+	dwc_otg_core_global_regs_t *global_regs = core_if->core_global_regs;
-+	volatile grstctl_t greset = {.d32 = 0 };
-+	int count = 0;
-+
-+	DWC_DEBUGPL(DBG_CILV, "%s\n", __func__);
-+	/* Wait for AHB master IDLE state. */
-+	do {
-+		dwc_udelay(10);
-+		greset.d32 = DWC_READ_REG32(&global_regs->grstctl);
-+		if (++count > 100000) {
-+			DWC_WARN("%s() HANG! AHB Idle GRSTCTL=%0x\n", __func__,
-+				 greset.d32);
-+			return;
-+		}
-+	}
-+	while (greset.b.ahbidle == 0);
-+
-+	/* Core Soft Reset */
-+	count = 0;
-+	greset.b.csftrst = 1;
-+	DWC_WRITE_REG32(&global_regs->grstctl, greset.d32);
-+	do {
-+		greset.d32 = DWC_READ_REG32(&global_regs->grstctl);
-+		if (++count > 10000) {
-+			DWC_WARN("%s() HANG! Soft Reset GRSTCTL=%0x\n",
-+				 __func__, greset.d32);
-+			break;
-+		}
-+		dwc_udelay(1);
-+	}
-+	while (greset.b.csftrst == 1);
-+
-+	/* Wait for 3 PHY Clocks */
-+	dwc_mdelay(100);
-+}
-+
-+uint8_t dwc_otg_is_device_mode(dwc_otg_core_if_t * _core_if)
-+{
-+	return (dwc_otg_mode(_core_if) != DWC_HOST_MODE);
-+}
-+
-+uint8_t dwc_otg_is_host_mode(dwc_otg_core_if_t * _core_if)
-+{
-+	return (dwc_otg_mode(_core_if) == DWC_HOST_MODE);
-+}
-+
-+/**
-+ * Register HCD callbacks. The callbacks are used to start and stop
-+ * the HCD for interrupt processing.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param cb the HCD callback structure.
-+ * @param p pointer to be passed to callback function (usb_hcd*).
-+ */
-+void dwc_otg_cil_register_hcd_callbacks(dwc_otg_core_if_t * core_if,
-+					dwc_otg_cil_callbacks_t * cb, void *p)
-+{
-+	core_if->hcd_cb = cb;
-+	cb->p = p;
-+}
-+
-+/**
-+ * Register PCD callbacks. The callbacks are used to start and stop
-+ * the PCD for interrupt processing.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param cb the PCD callback structure.
-+ * @param p pointer to be passed to callback function (pcd*).
-+ */
-+void dwc_otg_cil_register_pcd_callbacks(dwc_otg_core_if_t * core_if,
-+					dwc_otg_cil_callbacks_t * cb, void *p)
-+{
-+	core_if->pcd_cb = cb;
-+	cb->p = p;
-+}
-+
-+#ifdef DWC_EN_ISOC
-+
-+/**
-+ * This function writes isoc data per 1 (micro)frame into tx fifo
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param ep The EP to start the transfer on.
-+ *
-+ */
-+void write_isoc_frame_data(dwc_otg_core_if_t * core_if, dwc_ep_t * ep)
-+{
-+	dwc_otg_dev_in_ep_regs_t *ep_regs;
-+	dtxfsts_data_t txstatus = {.d32 = 0 };
-+	uint32_t len = 0;
-+	uint32_t dwords;
-+
-+	ep->xfer_len = ep->data_per_frame;
-+	ep->xfer_count = 0;
-+
-+	ep_regs = core_if->dev_if->in_ep_regs[ep->num];
-+
-+	len = ep->xfer_len - ep->xfer_count;
-+
-+	if (len > ep->maxpacket) {
-+		len = ep->maxpacket;
-+	}
-+
-+	dwords = (len + 3) / 4;
-+
-+	/* While there is space in the queue and space in the FIFO and
-+	 * More data to tranfer, Write packets to the Tx FIFO */
-+	txstatus.d32 =
-+	    DWC_READ_REG32(&core_if->dev_if->in_ep_regs[ep->num]->dtxfsts);
-+	DWC_DEBUGPL(DBG_PCDV, "b4 dtxfsts[%d]=0x%08x\n", ep->num, txstatus.d32);
-+
-+	while (txstatus.b.txfspcavail > dwords &&
-+	       ep->xfer_count < ep->xfer_len && ep->xfer_len != 0) {
-+		/* Write the FIFO */
-+		dwc_otg_ep_write_packet(core_if, ep, 0);
-+
-+		len = ep->xfer_len - ep->xfer_count;
-+		if (len > ep->maxpacket) {
-+			len = ep->maxpacket;
-+		}
-+
-+		dwords = (len + 3) / 4;
-+		txstatus.d32 =
-+		    DWC_READ_REG32(&core_if->dev_if->in_ep_regs[ep->num]->
-+				   dtxfsts);
-+		DWC_DEBUGPL(DBG_PCDV, "dtxfsts[%d]=0x%08x\n", ep->num,
-+			    txstatus.d32);
-+	}
-+}
-+
-+/**
-+ * This function initializes a descriptor chain for Isochronous transfer
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param ep The EP to start the transfer on.
-+ *
-+ */
-+void dwc_otg_iso_ep_start_frm_transfer(dwc_otg_core_if_t * core_if,
-+				       dwc_ep_t * ep)
-+{
-+	deptsiz_data_t deptsiz = {.d32 = 0 };
-+	depctl_data_t depctl = {.d32 = 0 };
-+	dsts_data_t dsts = {.d32 = 0 };
-+	volatile uint32_t *addr;
-+
-+	if (ep->is_in) {
-+		addr = &core_if->dev_if->in_ep_regs[ep->num]->diepctl;
-+	} else {
-+		addr = &core_if->dev_if->out_ep_regs[ep->num]->doepctl;
-+	}
-+
-+	ep->xfer_len = ep->data_per_frame;
-+	ep->xfer_count = 0;
-+	ep->xfer_buff = ep->cur_pkt_addr;
-+	ep->dma_addr = ep->cur_pkt_dma_addr;
-+
-+	if (ep->is_in) {
-+		/* Program the transfer size and packet count
-+		 *      as follows: xfersize = N * maxpacket +
-+		 *      short_packet pktcnt = N + (short_packet
-+		 *      exist ? 1 : 0)
-+		 */
-+		deptsiz.b.xfersize = ep->xfer_len;
-+		deptsiz.b.pktcnt =
-+		    (ep->xfer_len - 1 + ep->maxpacket) / ep->maxpacket;
-+		deptsiz.b.mc = deptsiz.b.pktcnt;
-+		DWC_WRITE_REG32(&core_if->dev_if->in_ep_regs[ep->num]->dieptsiz,
-+				deptsiz.d32);
-+
-+		/* Write the DMA register */
-+		if (core_if->dma_enable) {
-+			DWC_WRITE_REG32(&
-+					(core_if->dev_if->in_ep_regs[ep->num]->
-+					 diepdma), (uint32_t) ep->dma_addr);
-+		}
-+	} else {
-+		deptsiz.b.pktcnt =
-+		    (ep->xfer_len + (ep->maxpacket - 1)) / ep->maxpacket;
-+		deptsiz.b.xfersize = deptsiz.b.pktcnt * ep->maxpacket;
-+
-+		DWC_WRITE_REG32(&core_if->dev_if->
-+				out_ep_regs[ep->num]->doeptsiz, deptsiz.d32);
-+
-+		if (core_if->dma_enable) {
-+			DWC_WRITE_REG32(&
-+					(core_if->dev_if->
-+					 out_ep_regs[ep->num]->doepdma),
-+					(uint32_t) ep->dma_addr);
-+		}
-+	}
-+
-+	/** Enable endpoint, clear nak  */
-+
-+	depctl.d32 = 0;
-+	if (ep->bInterval == 1) {
-+		dsts.d32 =
-+		    DWC_READ_REG32(&core_if->dev_if->dev_global_regs->dsts);
-+		ep->next_frame = dsts.b.soffn + ep->bInterval;
-+
-+		if (ep->next_frame & 0x1) {
-+			depctl.b.setd1pid = 1;
-+		} else {
-+			depctl.b.setd0pid = 1;
-+		}
-+	} else {
-+		ep->next_frame += ep->bInterval;
-+
-+		if (ep->next_frame & 0x1) {
-+			depctl.b.setd1pid = 1;
-+		} else {
-+			depctl.b.setd0pid = 1;
-+		}
-+	}
-+	depctl.b.epena = 1;
-+	depctl.b.cnak = 1;
-+
-+	DWC_MODIFY_REG32(addr, 0, depctl.d32);
-+	depctl.d32 = DWC_READ_REG32(addr);
-+
-+	if (ep->is_in && core_if->dma_enable == 0) {
-+		write_isoc_frame_data(core_if, ep);
-+	}
-+
-+}
-+#endif /* DWC_EN_ISOC */
-+
-+static void dwc_otg_set_uninitialized(int32_t * p, int size)
-+{
-+	int i;
-+	for (i = 0; i < size; i++) {
-+		p[i] = -1;
-+	}
-+}
-+
-+static int dwc_otg_param_initialized(int32_t val)
-+{
-+	return val != -1;
-+}
-+
-+static int dwc_otg_setup_params(dwc_otg_core_if_t * core_if)
-+{
-+	int i;
-+	core_if->core_params = DWC_ALLOC(sizeof(*core_if->core_params));
-+	if (!core_if->core_params) {
-+		return -DWC_E_NO_MEMORY;
-+	}
-+	dwc_otg_set_uninitialized((int32_t *) core_if->core_params,
-+				  sizeof(*core_if->core_params) /
-+				  sizeof(int32_t));
-+	DWC_PRINTF("Setting default values for core params\n");
-+	dwc_otg_set_param_otg_cap(core_if, dwc_param_otg_cap_default);
-+	dwc_otg_set_param_dma_enable(core_if, dwc_param_dma_enable_default);
-+	dwc_otg_set_param_dma_desc_enable(core_if,
-+					  dwc_param_dma_desc_enable_default);
-+	dwc_otg_set_param_opt(core_if, dwc_param_opt_default);
-+	dwc_otg_set_param_dma_burst_size(core_if,
-+					 dwc_param_dma_burst_size_default);
-+	dwc_otg_set_param_host_support_fs_ls_low_power(core_if,
-+						       dwc_param_host_support_fs_ls_low_power_default);
-+	dwc_otg_set_param_enable_dynamic_fifo(core_if,
-+					      dwc_param_enable_dynamic_fifo_default);
-+	dwc_otg_set_param_data_fifo_size(core_if,
-+					 dwc_param_data_fifo_size_default);
-+	dwc_otg_set_param_dev_rx_fifo_size(core_if,
-+					   dwc_param_dev_rx_fifo_size_default);
-+	dwc_otg_set_param_dev_nperio_tx_fifo_size(core_if,
-+						  dwc_param_dev_nperio_tx_fifo_size_default);
-+	dwc_otg_set_param_host_rx_fifo_size(core_if,
-+					    dwc_param_host_rx_fifo_size_default);
-+	dwc_otg_set_param_host_nperio_tx_fifo_size(core_if,
-+						   dwc_param_host_nperio_tx_fifo_size_default);
-+	dwc_otg_set_param_host_perio_tx_fifo_size(core_if,
-+						  dwc_param_host_perio_tx_fifo_size_default);
-+	dwc_otg_set_param_max_transfer_size(core_if,
-+					    dwc_param_max_transfer_size_default);
-+	dwc_otg_set_param_max_packet_count(core_if,
-+					   dwc_param_max_packet_count_default);
-+	dwc_otg_set_param_host_channels(core_if,
-+					dwc_param_host_channels_default);
-+	dwc_otg_set_param_dev_endpoints(core_if,
-+					dwc_param_dev_endpoints_default);
-+	dwc_otg_set_param_phy_type(core_if, dwc_param_phy_type_default);
-+	dwc_otg_set_param_speed(core_if, dwc_param_speed_default);
-+	dwc_otg_set_param_host_ls_low_power_phy_clk(core_if,
-+						    dwc_param_host_ls_low_power_phy_clk_default);
-+	dwc_otg_set_param_phy_ulpi_ddr(core_if, dwc_param_phy_ulpi_ddr_default);
-+	dwc_otg_set_param_phy_ulpi_ext_vbus(core_if,
-+					    dwc_param_phy_ulpi_ext_vbus_default);
-+	dwc_otg_set_param_phy_utmi_width(core_if,
-+					 dwc_param_phy_utmi_width_default);
-+	dwc_otg_set_param_ts_dline(core_if, dwc_param_ts_dline_default);
-+	dwc_otg_set_param_i2c_enable(core_if, dwc_param_i2c_enable_default);
-+	dwc_otg_set_param_ulpi_fs_ls(core_if, dwc_param_ulpi_fs_ls_default);
-+	dwc_otg_set_param_en_multiple_tx_fifo(core_if,
-+					      dwc_param_en_multiple_tx_fifo_default);
-+	for (i = 0; i < 15; i++) {
-+		dwc_otg_set_param_dev_perio_tx_fifo_size(core_if,
-+							 dwc_param_dev_perio_tx_fifo_size_default,
-+							 i);
-+	}
-+
-+	for (i = 0; i < 15; i++) {
-+		dwc_otg_set_param_dev_tx_fifo_size(core_if,
-+						   dwc_param_dev_tx_fifo_size_default,
-+						   i);
-+	}
-+	dwc_otg_set_param_thr_ctl(core_if, dwc_param_thr_ctl_default);
-+	dwc_otg_set_param_mpi_enable(core_if, dwc_param_mpi_enable_default);
-+	dwc_otg_set_param_pti_enable(core_if, dwc_param_pti_enable_default);
-+	dwc_otg_set_param_lpm_enable(core_if, dwc_param_lpm_enable_default);
-+	dwc_otg_set_param_ic_usb_cap(core_if, dwc_param_ic_usb_cap_default);
-+	dwc_otg_set_param_tx_thr_length(core_if,
-+					dwc_param_tx_thr_length_default);
-+	dwc_otg_set_param_rx_thr_length(core_if,
-+					dwc_param_rx_thr_length_default);
-+	dwc_otg_set_param_ahb_thr_ratio(core_if,
-+					dwc_param_ahb_thr_ratio_default);
-+	dwc_otg_set_param_power_down(core_if, dwc_param_power_down_default);
-+	dwc_otg_set_param_reload_ctl(core_if, dwc_param_reload_ctl_default);
-+	dwc_otg_set_param_dev_out_nak(core_if, dwc_param_dev_out_nak_default);
-+	dwc_otg_set_param_cont_on_bna(core_if, dwc_param_cont_on_bna_default);
-+	dwc_otg_set_param_ahb_single(core_if, dwc_param_ahb_single_default);
-+	dwc_otg_set_param_otg_ver(core_if, dwc_param_otg_ver_default);
-+	dwc_otg_set_param_adp_enable(core_if, dwc_param_adp_enable_default);
-+	DWC_PRINTF("Finished setting default values for core params\n");
-+
-+	return 0;
-+}
-+
-+uint8_t dwc_otg_is_dma_enable(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->dma_enable;
-+}
-+
-+/* Checks if the parameter is outside of its valid range of values */
-+#define DWC_OTG_PARAM_TEST(_param_, _low_, _high_) \
-+		(((_param_) < (_low_)) || \
-+		((_param_) > (_high_)))
-+
-+/* Parameter access functions */
-+int dwc_otg_set_param_otg_cap(dwc_otg_core_if_t * core_if, int32_t val)
-+{
-+	int valid;
-+	int retval = 0;
-+	if (DWC_OTG_PARAM_TEST(val, 0, 2)) {
-+		DWC_WARN("Wrong value for otg_cap parameter\n");
-+		DWC_WARN("otg_cap parameter must be 0,1 or 2\n");
-+		retval = -DWC_E_INVALID;
-+		goto out;
-+	}
-+
-+	valid = 1;
-+	switch (val) {
-+	case DWC_OTG_CAP_PARAM_HNP_SRP_CAPABLE:
-+		if (core_if->hwcfg2.b.op_mode !=
-+		    DWC_HWCFG2_OP_MODE_HNP_SRP_CAPABLE_OTG)
-+			valid = 0;
-+		break;
-+	case DWC_OTG_CAP_PARAM_SRP_ONLY_CAPABLE:
-+		if ((core_if->hwcfg2.b.op_mode !=
-+		     DWC_HWCFG2_OP_MODE_HNP_SRP_CAPABLE_OTG)
-+		    && (core_if->hwcfg2.b.op_mode !=
-+			DWC_HWCFG2_OP_MODE_SRP_ONLY_CAPABLE_OTG)
-+		    && (core_if->hwcfg2.b.op_mode !=
-+			DWC_HWCFG2_OP_MODE_SRP_CAPABLE_DEVICE)
-+		    && (core_if->hwcfg2.b.op_mode !=
-+			DWC_HWCFG2_OP_MODE_SRP_CAPABLE_HOST)) {
-+			valid = 0;
-+		}
-+		break;
-+	case DWC_OTG_CAP_PARAM_NO_HNP_SRP_CAPABLE:
-+		/* always valid */
-+		break;
-+	}
-+	if (!valid) {
-+		if (dwc_otg_param_initialized(core_if->core_params->otg_cap)) {
-+			DWC_ERROR
-+			    ("%d invalid for otg_cap paremter. Check HW configuration.\n",
-+			     val);
-+		}
-+		val =
-+		    (((core_if->hwcfg2.b.op_mode ==
-+		       DWC_HWCFG2_OP_MODE_HNP_SRP_CAPABLE_OTG)
-+		      || (core_if->hwcfg2.b.op_mode ==
-+			  DWC_HWCFG2_OP_MODE_SRP_ONLY_CAPABLE_OTG)
-+		      || (core_if->hwcfg2.b.op_mode ==
-+			  DWC_HWCFG2_OP_MODE_SRP_CAPABLE_DEVICE)
-+		      || (core_if->hwcfg2.b.op_mode ==
-+			  DWC_HWCFG2_OP_MODE_SRP_CAPABLE_HOST)) ?
-+		     DWC_OTG_CAP_PARAM_SRP_ONLY_CAPABLE :
-+		     DWC_OTG_CAP_PARAM_NO_HNP_SRP_CAPABLE);
-+		retval = -DWC_E_INVALID;
-+	}
-+
-+	core_if->core_params->otg_cap = val;
-+out:
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_otg_cap(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->otg_cap;
-+}
-+
-+int dwc_otg_set_param_opt(dwc_otg_core_if_t * core_if, int32_t val)
-+{
-+	if (DWC_OTG_PARAM_TEST(val, 0, 1)) {
-+		DWC_WARN("Wrong value for opt parameter\n");
-+		return -DWC_E_INVALID;
-+	}
-+	core_if->core_params->opt = val;
-+	return 0;
-+}
-+
-+int32_t dwc_otg_get_param_opt(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->opt;
-+}
-+
-+int dwc_otg_set_param_dma_enable(dwc_otg_core_if_t * core_if, int32_t val)
-+{
-+	int retval = 0;
-+	if (DWC_OTG_PARAM_TEST(val, 0, 1)) {
-+		DWC_WARN("Wrong value for dma enable\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	if ((val == 1) && (core_if->hwcfg2.b.architecture == 0)) {
-+		if (dwc_otg_param_initialized(core_if->core_params->dma_enable)) {
-+			DWC_ERROR
-+			    ("%d invalid for dma_enable paremter. Check HW configuration.\n",
-+			     val);
-+		}
-+		val = 0;
-+		retval = -DWC_E_INVALID;
-+	}
-+
-+	core_if->core_params->dma_enable = val;
-+	if (val == 0) {
-+		dwc_otg_set_param_dma_desc_enable(core_if, 0);
-+	}
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_dma_enable(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->dma_enable;
-+}
-+
-+int dwc_otg_set_param_dma_desc_enable(dwc_otg_core_if_t * core_if, int32_t val)
-+{
-+	int retval = 0;
-+	if (DWC_OTG_PARAM_TEST(val, 0, 1)) {
-+		DWC_WARN("Wrong value for dma_enable\n");
-+		DWC_WARN("dma_desc_enable must be 0 or 1\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	if ((val == 1)
-+	    && ((dwc_otg_get_param_dma_enable(core_if) == 0)
-+		|| (core_if->hwcfg4.b.desc_dma == 0))) {
-+		if (dwc_otg_param_initialized
-+		    (core_if->core_params->dma_desc_enable)) {
-+			DWC_ERROR
-+			    ("%d invalid for dma_desc_enable paremter. Check HW configuration.\n",
-+			     val);
-+		}
-+		val = 0;
-+		retval = -DWC_E_INVALID;
-+	}
-+	core_if->core_params->dma_desc_enable = val;
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_dma_desc_enable(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->dma_desc_enable;
-+}
-+
-+int dwc_otg_set_param_host_support_fs_ls_low_power(dwc_otg_core_if_t * core_if,
-+						   int32_t val)
-+{
-+	if (DWC_OTG_PARAM_TEST(val, 0, 1)) {
-+		DWC_WARN("Wrong value for host_support_fs_low_power\n");
-+		DWC_WARN("host_support_fs_low_power must be 0 or 1\n");
-+		return -DWC_E_INVALID;
-+	}
-+	core_if->core_params->host_support_fs_ls_low_power = val;
-+	return 0;
-+}
-+
-+int32_t dwc_otg_get_param_host_support_fs_ls_low_power(dwc_otg_core_if_t *
-+						       core_if)
-+{
-+	return core_if->core_params->host_support_fs_ls_low_power;
-+}
-+
-+int dwc_otg_set_param_enable_dynamic_fifo(dwc_otg_core_if_t * core_if,
-+					  int32_t val)
-+{
-+	int retval = 0;
-+	if (DWC_OTG_PARAM_TEST(val, 0, 1)) {
-+		DWC_WARN("Wrong value for enable_dynamic_fifo\n");
-+		DWC_WARN("enable_dynamic_fifo must be 0 or 1\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	if ((val == 1) && (core_if->hwcfg2.b.dynamic_fifo == 0)) {
-+		if (dwc_otg_param_initialized
-+		    (core_if->core_params->enable_dynamic_fifo)) {
-+			DWC_ERROR
-+			    ("%d invalid for enable_dynamic_fifo paremter. Check HW configuration.\n",
-+			     val);
-+		}
-+		val = 0;
-+		retval = -DWC_E_INVALID;
-+	}
-+	core_if->core_params->enable_dynamic_fifo = val;
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_enable_dynamic_fifo(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->enable_dynamic_fifo;
-+}
-+
-+int dwc_otg_set_param_data_fifo_size(dwc_otg_core_if_t * core_if, int32_t val)
-+{
-+	int retval = 0;
-+	if (DWC_OTG_PARAM_TEST(val, 32, 32768)) {
-+		DWC_WARN("Wrong value for data_fifo_size\n");
-+		DWC_WARN("data_fifo_size must be 32-32768\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	if (val > core_if->hwcfg3.b.dfifo_depth) {
-+		if (dwc_otg_param_initialized
-+		    (core_if->core_params->data_fifo_size)) {
-+			DWC_ERROR
-+			    ("%d invalid for data_fifo_size parameter. Check HW configuration.\n",
-+			     val);
-+		}
-+		val = core_if->hwcfg3.b.dfifo_depth;
-+		retval = -DWC_E_INVALID;
-+	}
-+
-+	core_if->core_params->data_fifo_size = val;
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_data_fifo_size(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->data_fifo_size;
-+}
-+
-+int dwc_otg_set_param_dev_rx_fifo_size(dwc_otg_core_if_t * core_if, int32_t val)
-+{
-+	int retval = 0;
-+	if (DWC_OTG_PARAM_TEST(val, 16, 32768)) {
-+		DWC_WARN("Wrong value for dev_rx_fifo_size\n");
-+		DWC_WARN("dev_rx_fifo_size must be 16-32768\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	if (val > DWC_READ_REG32(&core_if->core_global_regs->grxfsiz)) {
-+		if (dwc_otg_param_initialized(core_if->core_params->dev_rx_fifo_size)) {
-+		DWC_WARN("%d invalid for dev_rx_fifo_size parameter\n", val);
-+		}
-+		val = DWC_READ_REG32(&core_if->core_global_regs->grxfsiz);
-+		retval = -DWC_E_INVALID;
-+	}
-+
-+	core_if->core_params->dev_rx_fifo_size = val;
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_dev_rx_fifo_size(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->dev_rx_fifo_size;
-+}
-+
-+int dwc_otg_set_param_dev_nperio_tx_fifo_size(dwc_otg_core_if_t * core_if,
-+					      int32_t val)
-+{
-+	int retval = 0;
-+
-+	if (DWC_OTG_PARAM_TEST(val, 16, 32768)) {
-+		DWC_WARN("Wrong value for dev_nperio_tx_fifo\n");
-+		DWC_WARN("dev_nperio_tx_fifo must be 16-32768\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	if (val > (DWC_READ_REG32(&core_if->core_global_regs->gnptxfsiz) >> 16)) {
-+		if (dwc_otg_param_initialized
-+		    (core_if->core_params->dev_nperio_tx_fifo_size)) {
-+			DWC_ERROR
-+			    ("%d invalid for dev_nperio_tx_fifo_size. Check HW configuration.\n",
-+			     val);
-+		}
-+		val =
-+		    (DWC_READ_REG32(&core_if->core_global_regs->gnptxfsiz) >>
-+		     16);
-+		retval = -DWC_E_INVALID;
-+	}
-+
-+	core_if->core_params->dev_nperio_tx_fifo_size = val;
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_dev_nperio_tx_fifo_size(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->dev_nperio_tx_fifo_size;
-+}
-+
-+int dwc_otg_set_param_host_rx_fifo_size(dwc_otg_core_if_t * core_if,
-+					int32_t val)
-+{
-+	int retval = 0;
-+
-+	if (DWC_OTG_PARAM_TEST(val, 16, 32768)) {
-+		DWC_WARN("Wrong value for host_rx_fifo_size\n");
-+		DWC_WARN("host_rx_fifo_size must be 16-32768\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	if (val > DWC_READ_REG32(&core_if->core_global_regs->grxfsiz)) {
-+		if (dwc_otg_param_initialized
-+		    (core_if->core_params->host_rx_fifo_size)) {
-+			DWC_ERROR
-+			    ("%d invalid for host_rx_fifo_size. Check HW configuration.\n",
-+			     val);
-+		}
-+		val = DWC_READ_REG32(&core_if->core_global_regs->grxfsiz);
-+		retval = -DWC_E_INVALID;
-+	}
-+
-+	core_if->core_params->host_rx_fifo_size = val;
-+	return retval;
-+
-+}
-+
-+int32_t dwc_otg_get_param_host_rx_fifo_size(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->host_rx_fifo_size;
-+}
-+
-+int dwc_otg_set_param_host_nperio_tx_fifo_size(dwc_otg_core_if_t * core_if,
-+					       int32_t val)
-+{
-+	int retval = 0;
-+
-+	if (DWC_OTG_PARAM_TEST(val, 16, 32768)) {
-+		DWC_WARN("Wrong value for host_nperio_tx_fifo_size\n");
-+		DWC_WARN("host_nperio_tx_fifo_size must be 16-32768\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	if (val > (DWC_READ_REG32(&core_if->core_global_regs->gnptxfsiz) >> 16)) {
-+		if (dwc_otg_param_initialized
-+		    (core_if->core_params->host_nperio_tx_fifo_size)) {
-+			DWC_ERROR
-+			    ("%d invalid for host_nperio_tx_fifo_size. Check HW configuration.\n",
-+			     val);
-+		}
-+		val =
-+		    (DWC_READ_REG32(&core_if->core_global_regs->gnptxfsiz) >>
-+		     16);
-+		retval = -DWC_E_INVALID;
-+	}
-+
-+	core_if->core_params->host_nperio_tx_fifo_size = val;
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_host_nperio_tx_fifo_size(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->host_nperio_tx_fifo_size;
-+}
-+
-+int dwc_otg_set_param_host_perio_tx_fifo_size(dwc_otg_core_if_t * core_if,
-+					      int32_t val)
-+{
-+	int retval = 0;
-+	if (DWC_OTG_PARAM_TEST(val, 16, 32768)) {
-+		DWC_WARN("Wrong value for host_perio_tx_fifo_size\n");
-+		DWC_WARN("host_perio_tx_fifo_size must be 16-32768\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	if (val > ((core_if->hptxfsiz.d32) >> 16)) {
-+		if (dwc_otg_param_initialized
-+		    (core_if->core_params->host_perio_tx_fifo_size)) {
-+			DWC_ERROR
-+			    ("%d invalid for host_perio_tx_fifo_size. Check HW configuration.\n",
-+			     val);
-+		}
-+		val = (core_if->hptxfsiz.d32) >> 16;
-+		retval = -DWC_E_INVALID;
-+	}
-+
-+	core_if->core_params->host_perio_tx_fifo_size = val;
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_host_perio_tx_fifo_size(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->host_perio_tx_fifo_size;
-+}
-+
-+int dwc_otg_set_param_max_transfer_size(dwc_otg_core_if_t * core_if,
-+					int32_t val)
-+{
-+	int retval = 0;
-+
-+	if (DWC_OTG_PARAM_TEST(val, 2047, 524288)) {
-+		DWC_WARN("Wrong value for max_transfer_size\n");
-+		DWC_WARN("max_transfer_size must be 2047-524288\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	if (val >= (1 << (core_if->hwcfg3.b.xfer_size_cntr_width + 11))) {
-+		if (dwc_otg_param_initialized
-+		    (core_if->core_params->max_transfer_size)) {
-+			DWC_ERROR
-+			    ("%d invalid for max_transfer_size. Check HW configuration.\n",
-+			     val);
-+		}
-+		val =
-+		    ((1 << (core_if->hwcfg3.b.packet_size_cntr_width + 11)) -
-+		     1);
-+		retval = -DWC_E_INVALID;
-+	}
-+
-+	core_if->core_params->max_transfer_size = val;
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_max_transfer_size(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->max_transfer_size;
-+}
-+
-+int dwc_otg_set_param_max_packet_count(dwc_otg_core_if_t * core_if, int32_t val)
-+{
-+	int retval = 0;
-+
-+	if (DWC_OTG_PARAM_TEST(val, 15, 511)) {
-+		DWC_WARN("Wrong value for max_packet_count\n");
-+		DWC_WARN("max_packet_count must be 15-511\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	if (val > (1 << (core_if->hwcfg3.b.packet_size_cntr_width + 4))) {
-+		if (dwc_otg_param_initialized
-+		    (core_if->core_params->max_packet_count)) {
-+			DWC_ERROR
-+			    ("%d invalid for max_packet_count. Check HW configuration.\n",
-+			     val);
-+		}
-+		val =
-+		    ((1 << (core_if->hwcfg3.b.packet_size_cntr_width + 4)) - 1);
-+		retval = -DWC_E_INVALID;
-+	}
-+
-+	core_if->core_params->max_packet_count = val;
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_max_packet_count(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->max_packet_count;
-+}
-+
-+int dwc_otg_set_param_host_channels(dwc_otg_core_if_t * core_if, int32_t val)
-+{
-+	int retval = 0;
-+
-+	if (DWC_OTG_PARAM_TEST(val, 1, 16)) {
-+		DWC_WARN("Wrong value for host_channels\n");
-+		DWC_WARN("host_channels must be 1-16\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	if (val > (core_if->hwcfg2.b.num_host_chan + 1)) {
-+		if (dwc_otg_param_initialized
-+		    (core_if->core_params->host_channels)) {
-+			DWC_ERROR
-+			    ("%d invalid for host_channels. Check HW configurations.\n",
-+			     val);
-+		}
-+		val = (core_if->hwcfg2.b.num_host_chan + 1);
-+		retval = -DWC_E_INVALID;
-+	}
-+
-+	core_if->core_params->host_channels = val;
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_host_channels(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->host_channels;
-+}
-+
-+int dwc_otg_set_param_dev_endpoints(dwc_otg_core_if_t * core_if, int32_t val)
-+{
-+	int retval = 0;
-+
-+	if (DWC_OTG_PARAM_TEST(val, 1, 15)) {
-+		DWC_WARN("Wrong value for dev_endpoints\n");
-+		DWC_WARN("dev_endpoints must be 1-15\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	if (val > (core_if->hwcfg2.b.num_dev_ep)) {
-+		if (dwc_otg_param_initialized
-+		    (core_if->core_params->dev_endpoints)) {
-+			DWC_ERROR
-+			    ("%d invalid for dev_endpoints. Check HW configurations.\n",
-+			     val);
-+		}
-+		val = core_if->hwcfg2.b.num_dev_ep;
-+		retval = -DWC_E_INVALID;
-+	}
-+
-+	core_if->core_params->dev_endpoints = val;
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_dev_endpoints(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->dev_endpoints;
-+}
-+
-+int dwc_otg_set_param_phy_type(dwc_otg_core_if_t * core_if, int32_t val)
-+{
-+	int retval = 0;
-+	int valid = 0;
-+
-+	if (DWC_OTG_PARAM_TEST(val, 0, 2)) {
-+		DWC_WARN("Wrong value for phy_type\n");
-+		DWC_WARN("phy_type must be 0,1 or 2\n");
-+		return -DWC_E_INVALID;
-+	}
-+#ifndef NO_FS_PHY_HW_CHECKS
-+	if ((val == DWC_PHY_TYPE_PARAM_UTMI) &&
-+	    ((core_if->hwcfg2.b.hs_phy_type == 1) ||
-+	     (core_if->hwcfg2.b.hs_phy_type == 3))) {
-+		valid = 1;
-+	} else if ((val == DWC_PHY_TYPE_PARAM_ULPI) &&
-+		   ((core_if->hwcfg2.b.hs_phy_type == 2) ||
-+		    (core_if->hwcfg2.b.hs_phy_type == 3))) {
-+		valid = 1;
-+	} else if ((val == DWC_PHY_TYPE_PARAM_FS) &&
-+		   (core_if->hwcfg2.b.fs_phy_type == 1)) {
-+		valid = 1;
-+	}
-+	if (!valid) {
-+		if (dwc_otg_param_initialized(core_if->core_params->phy_type)) {
-+			DWC_ERROR
-+			    ("%d invalid for phy_type. Check HW configurations.\n",
-+			     val);
-+		}
-+		if (core_if->hwcfg2.b.hs_phy_type) {
-+			if ((core_if->hwcfg2.b.hs_phy_type == 3) ||
-+			    (core_if->hwcfg2.b.hs_phy_type == 1)) {
-+				val = DWC_PHY_TYPE_PARAM_UTMI;
-+			} else {
-+				val = DWC_PHY_TYPE_PARAM_ULPI;
-+			}
-+		}
-+		retval = -DWC_E_INVALID;
-+	}
-+#endif
-+	core_if->core_params->phy_type = val;
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_phy_type(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->phy_type;
-+}
-+
-+int dwc_otg_set_param_speed(dwc_otg_core_if_t * core_if, int32_t val)
-+{
-+	int retval = 0;
-+	if (DWC_OTG_PARAM_TEST(val, 0, 1)) {
-+		DWC_WARN("Wrong value for speed parameter\n");
-+		DWC_WARN("max_speed parameter must be 0 or 1\n");
-+		return -DWC_E_INVALID;
-+	}
-+	if ((val == 0)
-+	    && dwc_otg_get_param_phy_type(core_if) == DWC_PHY_TYPE_PARAM_FS) {
-+		if (dwc_otg_param_initialized(core_if->core_params->speed)) {
-+			DWC_ERROR
-+			    ("%d invalid for speed paremter. Check HW configuration.\n",
-+			     val);
-+		}
-+		val =
-+		    (dwc_otg_get_param_phy_type(core_if) ==
-+		     DWC_PHY_TYPE_PARAM_FS ? 1 : 0);
-+		retval = -DWC_E_INVALID;
-+	}
-+	core_if->core_params->speed = val;
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_speed(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->speed;
-+}
-+
-+int dwc_otg_set_param_host_ls_low_power_phy_clk(dwc_otg_core_if_t * core_if,
-+						int32_t val)
-+{
-+	int retval = 0;
-+
-+	if (DWC_OTG_PARAM_TEST(val, 0, 1)) {
-+		DWC_WARN
-+		    ("Wrong value for host_ls_low_power_phy_clk parameter\n");
-+		DWC_WARN("host_ls_low_power_phy_clk must be 0 or 1\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	if ((val == DWC_HOST_LS_LOW_POWER_PHY_CLK_PARAM_48MHZ)
-+	    && (dwc_otg_get_param_phy_type(core_if) == DWC_PHY_TYPE_PARAM_FS)) {
-+		if (dwc_otg_param_initialized
-+		    (core_if->core_params->host_ls_low_power_phy_clk)) {
-+			DWC_ERROR
-+			    ("%d invalid for host_ls_low_power_phy_clk. Check HW configuration.\n",
-+			     val);
-+		}
-+		val =
-+		    (dwc_otg_get_param_phy_type(core_if) ==
-+		     DWC_PHY_TYPE_PARAM_FS) ?
-+		    DWC_HOST_LS_LOW_POWER_PHY_CLK_PARAM_6MHZ :
-+		    DWC_HOST_LS_LOW_POWER_PHY_CLK_PARAM_48MHZ;
-+		retval = -DWC_E_INVALID;
-+	}
-+
-+	core_if->core_params->host_ls_low_power_phy_clk = val;
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_host_ls_low_power_phy_clk(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->host_ls_low_power_phy_clk;
-+}
-+
-+int dwc_otg_set_param_phy_ulpi_ddr(dwc_otg_core_if_t * core_if, int32_t val)
-+{
-+	if (DWC_OTG_PARAM_TEST(val, 0, 1)) {
-+		DWC_WARN("Wrong value for phy_ulpi_ddr\n");
-+		DWC_WARN("phy_upli_ddr must be 0 or 1\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	core_if->core_params->phy_ulpi_ddr = val;
-+	return 0;
-+}
-+
-+int32_t dwc_otg_get_param_phy_ulpi_ddr(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->phy_ulpi_ddr;
-+}
-+
-+int dwc_otg_set_param_phy_ulpi_ext_vbus(dwc_otg_core_if_t * core_if,
-+					int32_t val)
-+{
-+	if (DWC_OTG_PARAM_TEST(val, 0, 1)) {
-+		DWC_WARN("Wrong valaue for phy_ulpi_ext_vbus\n");
-+		DWC_WARN("phy_ulpi_ext_vbus must be 0 or 1\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	core_if->core_params->phy_ulpi_ext_vbus = val;
-+	return 0;
-+}
-+
-+int32_t dwc_otg_get_param_phy_ulpi_ext_vbus(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->phy_ulpi_ext_vbus;
-+}
-+
-+int dwc_otg_set_param_phy_utmi_width(dwc_otg_core_if_t * core_if, int32_t val)
-+{
-+	if (DWC_OTG_PARAM_TEST(val, 8, 8) && DWC_OTG_PARAM_TEST(val, 16, 16)) {
-+		DWC_WARN("Wrong valaue for phy_utmi_width\n");
-+		DWC_WARN("phy_utmi_width must be 8 or 16\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	core_if->core_params->phy_utmi_width = val;
-+	return 0;
-+}
-+
-+int32_t dwc_otg_get_param_phy_utmi_width(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->phy_utmi_width;
-+}
-+
-+int dwc_otg_set_param_ulpi_fs_ls(dwc_otg_core_if_t * core_if, int32_t val)
-+{
-+	if (DWC_OTG_PARAM_TEST(val, 0, 1)) {
-+		DWC_WARN("Wrong valaue for ulpi_fs_ls\n");
-+		DWC_WARN("ulpi_fs_ls must be 0 or 1\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	core_if->core_params->ulpi_fs_ls = val;
-+	return 0;
-+}
-+
-+int32_t dwc_otg_get_param_ulpi_fs_ls(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->ulpi_fs_ls;
-+}
-+
-+int dwc_otg_set_param_ts_dline(dwc_otg_core_if_t * core_if, int32_t val)
-+{
-+	if (DWC_OTG_PARAM_TEST(val, 0, 1)) {
-+		DWC_WARN("Wrong valaue for ts_dline\n");
-+		DWC_WARN("ts_dline must be 0 or 1\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	core_if->core_params->ts_dline = val;
-+	return 0;
-+}
-+
-+int32_t dwc_otg_get_param_ts_dline(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->ts_dline;
-+}
-+
-+int dwc_otg_set_param_i2c_enable(dwc_otg_core_if_t * core_if, int32_t val)
-+{
-+	int retval = 0;
-+	if (DWC_OTG_PARAM_TEST(val, 0, 1)) {
-+		DWC_WARN("Wrong valaue for i2c_enable\n");
-+		DWC_WARN("i2c_enable must be 0 or 1\n");
-+		return -DWC_E_INVALID;
-+	}
-+#ifndef NO_FS_PHY_HW_CHECK
-+	if (val == 1 && core_if->hwcfg3.b.i2c == 0) {
-+		if (dwc_otg_param_initialized(core_if->core_params->i2c_enable)) {
-+			DWC_ERROR
-+			    ("%d invalid for i2c_enable. Check HW configuration.\n",
-+			     val);
-+		}
-+		val = 0;
-+		retval = -DWC_E_INVALID;
-+	}
-+#endif
-+
-+	core_if->core_params->i2c_enable = val;
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_i2c_enable(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->i2c_enable;
-+}
-+
-+int dwc_otg_set_param_dev_perio_tx_fifo_size(dwc_otg_core_if_t * core_if,
-+					     int32_t val, int fifo_num)
-+{
-+	int retval = 0;
-+
-+	if (DWC_OTG_PARAM_TEST(val, 4, 768)) {
-+		DWC_WARN("Wrong value for dev_perio_tx_fifo_size\n");
-+		DWC_WARN("dev_perio_tx_fifo_size must be 4-768\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	if (val >
-+	    (DWC_READ_REG32(&core_if->core_global_regs->dtxfsiz[fifo_num]))) {
-+		if (dwc_otg_param_initialized
-+		    (core_if->core_params->dev_perio_tx_fifo_size[fifo_num])) {
-+			DWC_ERROR
-+			    ("`%d' invalid for parameter `dev_perio_fifo_size_%d'. Check HW configuration.\n",
-+			     val, fifo_num);
-+		}
-+		val = (DWC_READ_REG32(&core_if->core_global_regs->dtxfsiz[fifo_num]));
-+		retval = -DWC_E_INVALID;
-+	}
-+
-+	core_if->core_params->dev_perio_tx_fifo_size[fifo_num] = val;
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_dev_perio_tx_fifo_size(dwc_otg_core_if_t * core_if,
-+						 int fifo_num)
-+{
-+	return core_if->core_params->dev_perio_tx_fifo_size[fifo_num];
-+}
-+
-+int dwc_otg_set_param_en_multiple_tx_fifo(dwc_otg_core_if_t * core_if,
-+					  int32_t val)
-+{
-+	int retval = 0;
-+	if (DWC_OTG_PARAM_TEST(val, 0, 1)) {
-+		DWC_WARN("Wrong valaue for en_multiple_tx_fifo,\n");
-+		DWC_WARN("en_multiple_tx_fifo must be 0 or 1\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	if (val == 1 && core_if->hwcfg4.b.ded_fifo_en == 0) {
-+		if (dwc_otg_param_initialized
-+		    (core_if->core_params->en_multiple_tx_fifo)) {
-+			DWC_ERROR
-+			    ("%d invalid for parameter en_multiple_tx_fifo. Check HW configuration.\n",
-+			     val);
-+		}
-+		val = 0;
-+		retval = -DWC_E_INVALID;
-+	}
-+
-+	core_if->core_params->en_multiple_tx_fifo = val;
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_en_multiple_tx_fifo(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->en_multiple_tx_fifo;
-+}
-+
-+int dwc_otg_set_param_dev_tx_fifo_size(dwc_otg_core_if_t * core_if, int32_t val,
-+				       int fifo_num)
-+{
-+	int retval = 0;
-+
-+	if (DWC_OTG_PARAM_TEST(val, 4, 768)) {
-+		DWC_WARN("Wrong value for dev_tx_fifo_size\n");
-+		DWC_WARN("dev_tx_fifo_size must be 4-768\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	if (val >
-+	    (DWC_READ_REG32(&core_if->core_global_regs->dtxfsiz[fifo_num]))) {
-+		if (dwc_otg_param_initialized
-+		    (core_if->core_params->dev_tx_fifo_size[fifo_num])) {
-+			DWC_ERROR
-+			    ("`%d' invalid for parameter `dev_tx_fifo_size_%d'. Check HW configuration.\n",
-+			     val, fifo_num);
-+		}
-+		val = (DWC_READ_REG32(&core_if->core_global_regs->dtxfsiz[fifo_num]));
-+		retval = -DWC_E_INVALID;
-+	}
-+
-+	core_if->core_params->dev_tx_fifo_size[fifo_num] = val;
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_dev_tx_fifo_size(dwc_otg_core_if_t * core_if,
-+					   int fifo_num)
-+{
-+	return core_if->core_params->dev_tx_fifo_size[fifo_num];
-+}
-+
-+int dwc_otg_set_param_thr_ctl(dwc_otg_core_if_t * core_if, int32_t val)
-+{
-+	int retval = 0;
-+
-+	if (DWC_OTG_PARAM_TEST(val, 0, 7)) {
-+		DWC_WARN("Wrong value for thr_ctl\n");
-+		DWC_WARN("thr_ctl must be 0-7\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	if ((val != 0) &&
-+	    (!dwc_otg_get_param_dma_enable(core_if) ||
-+	     !core_if->hwcfg4.b.ded_fifo_en)) {
-+		if (dwc_otg_param_initialized(core_if->core_params->thr_ctl)) {
-+			DWC_ERROR
-+			    ("%d invalid for parameter thr_ctl. Check HW configuration.\n",
-+			     val);
-+		}
-+		val = 0;
-+		retval = -DWC_E_INVALID;
-+	}
-+
-+	core_if->core_params->thr_ctl = val;
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_thr_ctl(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->thr_ctl;
-+}
-+
-+int dwc_otg_set_param_lpm_enable(dwc_otg_core_if_t * core_if, int32_t val)
-+{
-+	int retval = 0;
-+
-+	if (DWC_OTG_PARAM_TEST(val, 0, 1)) {
-+		DWC_WARN("Wrong value for lpm_enable\n");
-+		DWC_WARN("lpm_enable must be 0 or 1\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	if (val && !core_if->hwcfg3.b.otg_lpm_en) {
-+		if (dwc_otg_param_initialized(core_if->core_params->lpm_enable)) {
-+			DWC_ERROR
-+			    ("%d invalid for parameter lpm_enable. Check HW configuration.\n",
-+			     val);
-+		}
-+		val = 0;
-+		retval = -DWC_E_INVALID;
-+	}
-+
-+	core_if->core_params->lpm_enable = val;
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_lpm_enable(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->lpm_enable;
-+}
-+
-+int dwc_otg_set_param_tx_thr_length(dwc_otg_core_if_t * core_if, int32_t val)
-+{
-+	if (DWC_OTG_PARAM_TEST(val, 8, 128)) {
-+		DWC_WARN("Wrong valaue for tx_thr_length\n");
-+		DWC_WARN("tx_thr_length must be 8 - 128\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	core_if->core_params->tx_thr_length = val;
-+	return 0;
-+}
-+
-+int32_t dwc_otg_get_param_tx_thr_length(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->tx_thr_length;
-+}
-+
-+int dwc_otg_set_param_rx_thr_length(dwc_otg_core_if_t * core_if, int32_t val)
-+{
-+	if (DWC_OTG_PARAM_TEST(val, 8, 128)) {
-+		DWC_WARN("Wrong valaue for rx_thr_length\n");
-+		DWC_WARN("rx_thr_length must be 8 - 128\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	core_if->core_params->rx_thr_length = val;
-+	return 0;
-+}
-+
-+int32_t dwc_otg_get_param_rx_thr_length(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->rx_thr_length;
-+}
-+
-+int dwc_otg_set_param_dma_burst_size(dwc_otg_core_if_t * core_if, int32_t val)
-+{
-+	if (DWC_OTG_PARAM_TEST(val, 1, 1) &&
-+	    DWC_OTG_PARAM_TEST(val, 4, 4) &&
-+	    DWC_OTG_PARAM_TEST(val, 8, 8) &&
-+	    DWC_OTG_PARAM_TEST(val, 16, 16) &&
-+	    DWC_OTG_PARAM_TEST(val, 32, 32) &&
-+	    DWC_OTG_PARAM_TEST(val, 64, 64) &&
-+	    DWC_OTG_PARAM_TEST(val, 128, 128) &&
-+	    DWC_OTG_PARAM_TEST(val, 256, 256)) {
-+		DWC_WARN("`%d' invalid for parameter `dma_burst_size'\n", val);
-+		return -DWC_E_INVALID;
-+	}
-+	core_if->core_params->dma_burst_size = val;
-+	return 0;
-+}
-+
-+int32_t dwc_otg_get_param_dma_burst_size(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->dma_burst_size;
-+}
-+
-+int dwc_otg_set_param_pti_enable(dwc_otg_core_if_t * core_if, int32_t val)
-+{
-+	int retval = 0;
-+	if (DWC_OTG_PARAM_TEST(val, 0, 1)) {
-+		DWC_WARN("`%d' invalid for parameter `pti_enable'\n", val);
-+		return -DWC_E_INVALID;
-+	}
-+	if (val && (core_if->snpsid < OTG_CORE_REV_2_72a)) {
-+		if (dwc_otg_param_initialized(core_if->core_params->pti_enable)) {
-+			DWC_ERROR
-+			    ("%d invalid for parameter pti_enable. Check HW configuration.\n",
-+			     val);
-+		}
-+		retval = -DWC_E_INVALID;
-+		val = 0;
-+	}
-+	core_if->core_params->pti_enable = val;
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_pti_enable(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->pti_enable;
-+}
-+
-+int dwc_otg_set_param_mpi_enable(dwc_otg_core_if_t * core_if, int32_t val)
-+{
-+	int retval = 0;
-+	if (DWC_OTG_PARAM_TEST(val, 0, 1)) {
-+		DWC_WARN("`%d' invalid for parameter `mpi_enable'\n", val);
-+		return -DWC_E_INVALID;
-+	}
-+	if (val && (core_if->hwcfg2.b.multi_proc_int == 0)) {
-+		if (dwc_otg_param_initialized(core_if->core_params->mpi_enable)) {
-+			DWC_ERROR
-+			    ("%d invalid for parameter mpi_enable. Check HW configuration.\n",
-+			     val);
-+		}
-+		retval = -DWC_E_INVALID;
-+		val = 0;
-+	}
-+	core_if->core_params->mpi_enable = val;
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_mpi_enable(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->mpi_enable;
-+}
-+
-+int dwc_otg_set_param_adp_enable(dwc_otg_core_if_t * core_if, int32_t val)
-+{
-+	int retval = 0;
-+	if (DWC_OTG_PARAM_TEST(val, 0, 1)) {
-+		DWC_WARN("`%d' invalid for parameter `adp_enable'\n", val);
-+		return -DWC_E_INVALID;
-+	}
-+	if (val && (core_if->hwcfg3.b.adp_supp == 0)) {
-+		if (dwc_otg_param_initialized
-+		    (core_if->core_params->adp_supp_enable)) {
-+			DWC_ERROR
-+			    ("%d invalid for parameter adp_enable. Check HW configuration.\n",
-+			     val);
-+		}
-+		retval = -DWC_E_INVALID;
-+		val = 0;
-+	}
-+	core_if->core_params->adp_supp_enable = val;
-+	/*Set OTG version 2.0 in case of enabling ADP*/
-+	if (val)
-+		dwc_otg_set_param_otg_ver(core_if, 1);
-+
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_adp_enable(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->adp_supp_enable;
-+}
-+
-+int dwc_otg_set_param_ic_usb_cap(dwc_otg_core_if_t * core_if, int32_t val)
-+{
-+	int retval = 0;
-+	if (DWC_OTG_PARAM_TEST(val, 0, 1)) {
-+		DWC_WARN("`%d' invalid for parameter `ic_usb_cap'\n", val);
-+		DWC_WARN("ic_usb_cap must be 0 or 1\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	if (val && (core_if->hwcfg2.b.otg_enable_ic_usb == 0)) {
-+		if (dwc_otg_param_initialized(core_if->core_params->ic_usb_cap)) {
-+			DWC_ERROR
-+			    ("%d invalid for parameter ic_usb_cap. Check HW configuration.\n",
-+			     val);
-+		}
-+		retval = -DWC_E_INVALID;
-+		val = 0;
-+	}
-+	core_if->core_params->ic_usb_cap = val;
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_ic_usb_cap(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->ic_usb_cap;
-+}
-+
-+int dwc_otg_set_param_ahb_thr_ratio(dwc_otg_core_if_t * core_if, int32_t val)
-+{
-+	int retval = 0;
-+	int valid = 1;
-+
-+	if (DWC_OTG_PARAM_TEST(val, 0, 3)) {
-+		DWC_WARN("`%d' invalid for parameter `ahb_thr_ratio'\n", val);
-+		DWC_WARN("ahb_thr_ratio must be 0 - 3\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	if (val
-+	    && (core_if->snpsid < OTG_CORE_REV_2_81a
-+		|| !dwc_otg_get_param_thr_ctl(core_if))) {
-+		valid = 0;
-+	} else if (val
-+		   && ((dwc_otg_get_param_tx_thr_length(core_if) / (1 << val)) <
-+		       4)) {
-+		valid = 0;
-+	}
-+	if (valid == 0) {
-+		if (dwc_otg_param_initialized
-+		    (core_if->core_params->ahb_thr_ratio)) {
-+			DWC_ERROR
-+			    ("%d invalid for parameter ahb_thr_ratio. Check HW configuration.\n",
-+			     val);
-+		}
-+		retval = -DWC_E_INVALID;
-+		val = 0;
-+	}
-+
-+	core_if->core_params->ahb_thr_ratio = val;
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_ahb_thr_ratio(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->ahb_thr_ratio;
-+}
-+
-+int dwc_otg_set_param_power_down(dwc_otg_core_if_t * core_if, int32_t val)
-+{
-+	int retval = 0;
-+	int valid = 1;
-+	hwcfg4_data_t hwcfg4 = {.d32 = 0 };
-+	hwcfg4.d32 = DWC_READ_REG32(&core_if->core_global_regs->ghwcfg4);
-+
-+	if (DWC_OTG_PARAM_TEST(val, 0, 3)) {
-+		DWC_WARN("`%d' invalid for parameter `power_down'\n", val);
-+		DWC_WARN("power_down must be 0 - 2\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	if ((val == 2) && (core_if->snpsid < OTG_CORE_REV_2_91a)) {
-+		valid = 0;
-+	}
-+	if ((val == 3)
-+	    && ((core_if->snpsid < OTG_CORE_REV_3_00a)
-+		|| (hwcfg4.b.xhiber == 0))) {
-+		valid = 0;
-+	}
-+	if (valid == 0) {
-+		if (dwc_otg_param_initialized(core_if->core_params->power_down)) {
-+			DWC_ERROR
-+			    ("%d invalid for parameter power_down. Check HW configuration.\n",
-+			     val);
-+		}
-+		retval = -DWC_E_INVALID;
-+		val = 0;
-+	}
-+	core_if->core_params->power_down = val;
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_power_down(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->power_down;
-+}
-+
-+int dwc_otg_set_param_reload_ctl(dwc_otg_core_if_t * core_if, int32_t val)
-+{
-+	int retval = 0;
-+	int valid = 1;
-+
-+	if (DWC_OTG_PARAM_TEST(val, 0, 1)) {
-+		DWC_WARN("`%d' invalid for parameter `reload_ctl'\n", val);
-+		DWC_WARN("reload_ctl must be 0 or 1\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	if ((val == 1) && (core_if->snpsid < OTG_CORE_REV_2_92a)) {
-+		valid = 0;
-+	}
-+	if (valid == 0) {
-+		if (dwc_otg_param_initialized(core_if->core_params->reload_ctl)) {
-+			DWC_ERROR("%d invalid for parameter reload_ctl."
-+				  "Check HW configuration.\n", val);
-+		}
-+		retval = -DWC_E_INVALID;
-+		val = 0;
-+	}
-+	core_if->core_params->reload_ctl = val;
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_reload_ctl(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->reload_ctl;
-+}
-+
-+int dwc_otg_set_param_dev_out_nak(dwc_otg_core_if_t * core_if, int32_t val)
-+{
-+	int retval = 0;
-+	int valid = 1;
-+
-+	if (DWC_OTG_PARAM_TEST(val, 0, 1)) {
-+		DWC_WARN("`%d' invalid for parameter `dev_out_nak'\n", val);
-+		DWC_WARN("dev_out_nak must be 0 or 1\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	if ((val == 1) && ((core_if->snpsid < OTG_CORE_REV_2_93a) ||
-+		!(core_if->core_params->dma_desc_enable))) {
-+		valid = 0;
-+	}
-+	if (valid == 0) {
-+		if (dwc_otg_param_initialized(core_if->core_params->dev_out_nak)) {
-+			DWC_ERROR("%d invalid for parameter dev_out_nak."
-+				"Check HW configuration.\n", val);
-+		}
-+		retval = -DWC_E_INVALID;
-+		val = 0;
-+	}
-+	core_if->core_params->dev_out_nak = val;
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_dev_out_nak(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->dev_out_nak;
-+}
-+
-+int dwc_otg_set_param_cont_on_bna(dwc_otg_core_if_t * core_if, int32_t val)
-+{
-+	int retval = 0;
-+	int valid = 1;
-+
-+	if (DWC_OTG_PARAM_TEST(val, 0, 1)) {
-+		DWC_WARN("`%d' invalid for parameter `cont_on_bna'\n", val);
-+		DWC_WARN("cont_on_bna must be 0 or 1\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	if ((val == 1) && ((core_if->snpsid < OTG_CORE_REV_2_94a) ||
-+		!(core_if->core_params->dma_desc_enable))) {
-+			valid = 0;
-+	}
-+	if (valid == 0) {
-+		if (dwc_otg_param_initialized(core_if->core_params->cont_on_bna)) {
-+			DWC_ERROR("%d invalid for parameter cont_on_bna."
-+				"Check HW configuration.\n", val);
-+		}
-+		retval = -DWC_E_INVALID;
-+		val = 0;
-+	}
-+	core_if->core_params->cont_on_bna = val;
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_cont_on_bna(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->cont_on_bna;
-+}
-+
-+int dwc_otg_set_param_ahb_single(dwc_otg_core_if_t * core_if, int32_t val)
-+{
-+	int retval = 0;
-+	int valid = 1;
-+
-+	if (DWC_OTG_PARAM_TEST(val, 0, 1)) {
-+		DWC_WARN("`%d' invalid for parameter `ahb_single'\n", val);
-+		DWC_WARN("ahb_single must be 0 or 1\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	if ((val == 1) && (core_if->snpsid < OTG_CORE_REV_2_94a)) {
-+			valid = 0;
-+	}
-+	if (valid == 0) {
-+		if (dwc_otg_param_initialized(core_if->core_params->ahb_single)) {
-+			DWC_ERROR("%d invalid for parameter ahb_single."
-+				"Check HW configuration.\n", val);
-+		}
-+		retval = -DWC_E_INVALID;
-+		val = 0;
-+	}
-+	core_if->core_params->ahb_single = val;
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_ahb_single(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->ahb_single;
-+}
-+
-+int dwc_otg_set_param_otg_ver(dwc_otg_core_if_t * core_if, int32_t val)
-+{
-+	int retval = 0;
-+
-+	if (DWC_OTG_PARAM_TEST(val, 0, 1)) {
-+		DWC_WARN("`%d' invalid for parameter `otg_ver'\n", val);
-+		DWC_WARN
-+		    ("otg_ver must be 0(for OTG 1.3 support) or 1(for OTG 2.0 support)\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	core_if->core_params->otg_ver = val;
-+	return retval;
-+}
-+
-+int32_t dwc_otg_get_param_otg_ver(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->core_params->otg_ver;
-+}
-+
-+uint32_t dwc_otg_get_hnpstatus(dwc_otg_core_if_t * core_if)
-+{
-+	gotgctl_data_t otgctl;
-+	otgctl.d32 = DWC_READ_REG32(&core_if->core_global_regs->gotgctl);
-+	return otgctl.b.hstnegscs;
-+}
-+
-+uint32_t dwc_otg_get_srpstatus(dwc_otg_core_if_t * core_if)
-+{
-+	gotgctl_data_t otgctl;
-+	otgctl.d32 = DWC_READ_REG32(&core_if->core_global_regs->gotgctl);
-+	return otgctl.b.sesreqscs;
-+}
-+
-+void dwc_otg_set_hnpreq(dwc_otg_core_if_t * core_if, uint32_t val)
-+{
-+	if(core_if->otg_ver == 0) {
-+		gotgctl_data_t otgctl;
-+		otgctl.d32 = DWC_READ_REG32(&core_if->core_global_regs->gotgctl);
-+		otgctl.b.hnpreq = val;
-+		DWC_WRITE_REG32(&core_if->core_global_regs->gotgctl, otgctl.d32);
-+	} else {
-+		core_if->otg_sts = val;
-+	}
-+}
-+
-+uint32_t dwc_otg_get_gsnpsid(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->snpsid;
-+}
-+
-+uint32_t dwc_otg_get_mode(dwc_otg_core_if_t * core_if)
-+{
-+	gintsts_data_t gintsts;
-+	gintsts.d32 = DWC_READ_REG32(&core_if->core_global_regs->gintsts);
-+	return gintsts.b.curmode;
-+}
-+
-+uint32_t dwc_otg_get_hnpcapable(dwc_otg_core_if_t * core_if)
-+{
-+	gusbcfg_data_t usbcfg;
-+	usbcfg.d32 = DWC_READ_REG32(&core_if->core_global_regs->gusbcfg);
-+	return usbcfg.b.hnpcap;
-+}
-+
-+void dwc_otg_set_hnpcapable(dwc_otg_core_if_t * core_if, uint32_t val)
-+{
-+	gusbcfg_data_t usbcfg;
-+	usbcfg.d32 = DWC_READ_REG32(&core_if->core_global_regs->gusbcfg);
-+	usbcfg.b.hnpcap = val;
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gusbcfg, usbcfg.d32);
-+}
-+
-+uint32_t dwc_otg_get_srpcapable(dwc_otg_core_if_t * core_if)
-+{
-+	gusbcfg_data_t usbcfg;
-+	usbcfg.d32 = DWC_READ_REG32(&core_if->core_global_regs->gusbcfg);
-+	return usbcfg.b.srpcap;
-+}
-+
-+void dwc_otg_set_srpcapable(dwc_otg_core_if_t * core_if, uint32_t val)
-+{
-+	gusbcfg_data_t usbcfg;
-+	usbcfg.d32 = DWC_READ_REG32(&core_if->core_global_regs->gusbcfg);
-+	usbcfg.b.srpcap = val;
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gusbcfg, usbcfg.d32);
-+}
-+
-+uint32_t dwc_otg_get_devspeed(dwc_otg_core_if_t * core_if)
-+{
-+	dcfg_data_t dcfg;
-+	/* originally: dcfg.d32 = DWC_READ_REG32(&core_if->dev_if->dev_global_regs->dcfg); */
-+
-+        dcfg.d32 = -1; //GRAYG
-+        DWC_DEBUGPL(DBG_CILV, "%s - core_if(%p)\n", __func__, core_if);
-+        if (NULL == core_if)
-+                DWC_ERROR("reg request with NULL core_if\n");
-+        DWC_DEBUGPL(DBG_CILV, "%s - core_if(%p)->dev_if(%p)\n", __func__,
-+                    core_if, core_if->dev_if);
-+        if (NULL == core_if->dev_if)
-+                DWC_ERROR("reg request with NULL dev_if\n");
-+        DWC_DEBUGPL(DBG_CILV, "%s - core_if(%p)->dev_if(%p)->"
-+                    "dev_global_regs(%p)\n", __func__,
-+                    core_if, core_if->dev_if,
-+                    core_if->dev_if->dev_global_regs);
-+        if (NULL == core_if->dev_if->dev_global_regs)
-+                DWC_ERROR("reg request with NULL dev_global_regs\n");
-+        else {
-+                DWC_DEBUGPL(DBG_CILV, "%s - &core_if(%p)->dev_if(%p)->"
-+                            "dev_global_regs(%p)->dcfg = %p\n", __func__,
-+                            core_if, core_if->dev_if,
-+                            core_if->dev_if->dev_global_regs,
-+                            &core_if->dev_if->dev_global_regs->dcfg);
-+		dcfg.d32 = DWC_READ_REG32(&core_if->dev_if->dev_global_regs->dcfg);
-+        }
-+	return dcfg.b.devspd;
-+}
-+
-+void dwc_otg_set_devspeed(dwc_otg_core_if_t * core_if, uint32_t val)
-+{
-+	dcfg_data_t dcfg;
-+	dcfg.d32 = DWC_READ_REG32(&core_if->dev_if->dev_global_regs->dcfg);
-+	dcfg.b.devspd = val;
-+	DWC_WRITE_REG32(&core_if->dev_if->dev_global_regs->dcfg, dcfg.d32);
-+}
-+
-+uint32_t dwc_otg_get_busconnected(dwc_otg_core_if_t * core_if)
-+{
-+	hprt0_data_t hprt0;
-+	hprt0.d32 = DWC_READ_REG32(core_if->host_if->hprt0);
-+	return hprt0.b.prtconnsts;
-+}
-+
-+uint32_t dwc_otg_get_enumspeed(dwc_otg_core_if_t * core_if)
-+{
-+	dsts_data_t dsts;
-+	dsts.d32 = DWC_READ_REG32(&core_if->dev_if->dev_global_regs->dsts);
-+	return dsts.b.enumspd;
-+}
-+
-+uint32_t dwc_otg_get_prtpower(dwc_otg_core_if_t * core_if)
-+{
-+	hprt0_data_t hprt0;
-+	hprt0.d32 = DWC_READ_REG32(core_if->host_if->hprt0);
-+	return hprt0.b.prtpwr;
-+
-+}
-+
-+uint32_t dwc_otg_get_core_state(dwc_otg_core_if_t * core_if)
-+{
-+	return core_if->hibernation_suspend;
-+}
-+
-+void dwc_otg_set_prtpower(dwc_otg_core_if_t * core_if, uint32_t val)
-+{
-+	hprt0_data_t hprt0;
-+	hprt0.d32 = dwc_otg_read_hprt0(core_if);
-+	hprt0.b.prtpwr = val;
-+	DWC_WRITE_REG32(core_if->host_if->hprt0, hprt0.d32);
-+}
-+
-+uint32_t dwc_otg_get_prtsuspend(dwc_otg_core_if_t * core_if)
-+{
-+	hprt0_data_t hprt0;
-+	hprt0.d32 = DWC_READ_REG32(core_if->host_if->hprt0);
-+	return hprt0.b.prtsusp;
-+
-+}
-+
-+void dwc_otg_set_prtsuspend(dwc_otg_core_if_t * core_if, uint32_t val)
-+{
-+	hprt0_data_t hprt0;
-+	hprt0.d32 = dwc_otg_read_hprt0(core_if);
-+	hprt0.b.prtsusp = val;
-+	DWC_WRITE_REG32(core_if->host_if->hprt0, hprt0.d32);
-+}
-+
-+uint32_t dwc_otg_get_fr_interval(dwc_otg_core_if_t * core_if)
-+{
-+	hfir_data_t hfir;
-+	hfir.d32 = DWC_READ_REG32(&core_if->host_if->host_global_regs->hfir);
-+	return hfir.b.frint;
-+
-+}
-+
-+void dwc_otg_set_fr_interval(dwc_otg_core_if_t * core_if, uint32_t val)
-+{
-+	hfir_data_t hfir;
-+	uint32_t fram_int;
-+	fram_int = calc_frame_interval(core_if);
-+	hfir.d32 = DWC_READ_REG32(&core_if->host_if->host_global_regs->hfir);
-+	if (!core_if->core_params->reload_ctl) {
-+		DWC_WARN("\nCannot reload HFIR register.HFIR.HFIRRldCtrl bit is"
-+			 "not set to 1.\nShould load driver with reload_ctl=1"
-+			 " module parameter\n");
-+		return;
-+	}
-+	switch (fram_int) {
-+	case 3750:
-+		if ((val < 3350) || (val > 4150)) {
-+			DWC_WARN("HFIR interval for HS core and 30 MHz"
-+				 "clock freq should be from 3350 to 4150\n");
-+			return;
-+		}
-+		break;
-+	case 30000:
-+		if ((val < 26820) || (val > 33180)) {
-+			DWC_WARN("HFIR interval for FS/LS core and 30 MHz"
-+				 "clock freq should be from 26820 to 33180\n");
-+			return;
-+		}
-+		break;
-+	case 6000:
-+		if ((val < 5360) || (val > 6640)) {
-+			DWC_WARN("HFIR interval for HS core and 48 MHz"
-+				 "clock freq should be from 5360 to 6640\n");
-+			return;
-+		}
-+		break;
-+	case 48000:
-+		if ((val < 42912) || (val > 53088)) {
-+			DWC_WARN("HFIR interval for FS/LS core and 48 MHz"
-+				 "clock freq should be from 42912 to 53088\n");
-+			return;
-+		}
-+		break;
-+	case 7500:
-+		if ((val < 6700) || (val > 8300)) {
-+			DWC_WARN("HFIR interval for HS core and 60 MHz"
-+				 "clock freq should be from 6700 to 8300\n");
-+			return;
-+		}
-+		break;
-+	case 60000:
-+		if ((val < 53640) || (val > 65536)) {
-+			DWC_WARN("HFIR interval for FS/LS core and 60 MHz"
-+				 "clock freq should be from 53640 to 65536\n");
-+			return;
-+		}
-+		break;
-+	default:
-+		DWC_WARN("Unknown frame interval\n");
-+		return;
-+		break;
-+
-+	}
-+	hfir.b.frint = val;
-+	DWC_WRITE_REG32(&core_if->host_if->host_global_regs->hfir, hfir.d32);
-+}
-+
-+uint32_t dwc_otg_get_mode_ch_tim(dwc_otg_core_if_t * core_if)
-+{
-+	hcfg_data_t hcfg;
-+	hcfg.d32 = DWC_READ_REG32(&core_if->host_if->host_global_regs->hcfg);
-+	return hcfg.b.modechtimen;
-+
-+}
-+
-+void dwc_otg_set_mode_ch_tim(dwc_otg_core_if_t * core_if, uint32_t val)
-+{
-+	hcfg_data_t hcfg;
-+	hcfg.d32 = DWC_READ_REG32(&core_if->host_if->host_global_regs->hcfg);
-+	hcfg.b.modechtimen = val;
-+	DWC_WRITE_REG32(&core_if->host_if->host_global_regs->hcfg, hcfg.d32);
-+}
-+
-+void dwc_otg_set_prtresume(dwc_otg_core_if_t * core_if, uint32_t val)
-+{
-+	hprt0_data_t hprt0;
-+	hprt0.d32 = dwc_otg_read_hprt0(core_if);
-+	hprt0.b.prtres = val;
-+	DWC_WRITE_REG32(core_if->host_if->hprt0, hprt0.d32);
-+}
-+
-+uint32_t dwc_otg_get_remotewakesig(dwc_otg_core_if_t * core_if)
-+{
-+	dctl_data_t dctl;
-+	dctl.d32 = DWC_READ_REG32(&core_if->dev_if->dev_global_regs->dctl);
-+	return dctl.b.rmtwkupsig;
-+}
-+
-+uint32_t dwc_otg_get_lpm_portsleepstatus(dwc_otg_core_if_t * core_if)
-+{
-+	glpmcfg_data_t lpmcfg;
-+	lpmcfg.d32 = DWC_READ_REG32(&core_if->core_global_regs->glpmcfg);
-+
-+	DWC_ASSERT(!
-+		   ((core_if->lx_state == DWC_OTG_L1) ^ lpmcfg.b.prt_sleep_sts),
-+		   "lx_state = %d, lmpcfg.prt_sleep_sts = %d\n",
-+		   core_if->lx_state, lpmcfg.b.prt_sleep_sts);
-+
-+	return lpmcfg.b.prt_sleep_sts;
-+}
-+
-+uint32_t dwc_otg_get_lpm_remotewakeenabled(dwc_otg_core_if_t * core_if)
-+{
-+	glpmcfg_data_t lpmcfg;
-+	lpmcfg.d32 = DWC_READ_REG32(&core_if->core_global_regs->glpmcfg);
-+	return lpmcfg.b.rem_wkup_en;
-+}
-+
-+uint32_t dwc_otg_get_lpmresponse(dwc_otg_core_if_t * core_if)
-+{
-+	glpmcfg_data_t lpmcfg;
-+	lpmcfg.d32 = DWC_READ_REG32(&core_if->core_global_regs->glpmcfg);
-+	return lpmcfg.b.appl_resp;
-+}
-+
-+void dwc_otg_set_lpmresponse(dwc_otg_core_if_t * core_if, uint32_t val)
-+{
-+	glpmcfg_data_t lpmcfg;
-+	lpmcfg.d32 = DWC_READ_REG32(&core_if->core_global_regs->glpmcfg);
-+	lpmcfg.b.appl_resp = val;
-+	DWC_WRITE_REG32(&core_if->core_global_regs->glpmcfg, lpmcfg.d32);
-+}
-+
-+uint32_t dwc_otg_get_hsic_connect(dwc_otg_core_if_t * core_if)
-+{
-+	glpmcfg_data_t lpmcfg;
-+	lpmcfg.d32 = DWC_READ_REG32(&core_if->core_global_regs->glpmcfg);
-+	return lpmcfg.b.hsic_connect;
-+}
-+
-+void dwc_otg_set_hsic_connect(dwc_otg_core_if_t * core_if, uint32_t val)
-+{
-+	glpmcfg_data_t lpmcfg;
-+	lpmcfg.d32 = DWC_READ_REG32(&core_if->core_global_regs->glpmcfg);
-+	lpmcfg.b.hsic_connect = val;
-+	DWC_WRITE_REG32(&core_if->core_global_regs->glpmcfg, lpmcfg.d32);
-+}
-+
-+uint32_t dwc_otg_get_inv_sel_hsic(dwc_otg_core_if_t * core_if)
-+{
-+	glpmcfg_data_t lpmcfg;
-+	lpmcfg.d32 = DWC_READ_REG32(&core_if->core_global_regs->glpmcfg);
-+	return lpmcfg.b.inv_sel_hsic;
-+
-+}
-+
-+void dwc_otg_set_inv_sel_hsic(dwc_otg_core_if_t * core_if, uint32_t val)
-+{
-+	glpmcfg_data_t lpmcfg;
-+	lpmcfg.d32 = DWC_READ_REG32(&core_if->core_global_regs->glpmcfg);
-+	lpmcfg.b.inv_sel_hsic = val;
-+	DWC_WRITE_REG32(&core_if->core_global_regs->glpmcfg, lpmcfg.d32);
-+}
-+
-+uint32_t dwc_otg_get_gotgctl(dwc_otg_core_if_t * core_if)
-+{
-+	return DWC_READ_REG32(&core_if->core_global_regs->gotgctl);
-+}
-+
-+void dwc_otg_set_gotgctl(dwc_otg_core_if_t * core_if, uint32_t val)
-+{
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gotgctl, val);
-+}
-+
-+uint32_t dwc_otg_get_gusbcfg(dwc_otg_core_if_t * core_if)
-+{
-+	return DWC_READ_REG32(&core_if->core_global_regs->gusbcfg);
-+}
-+
-+void dwc_otg_set_gusbcfg(dwc_otg_core_if_t * core_if, uint32_t val)
-+{
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gusbcfg, val);
-+}
-+
-+uint32_t dwc_otg_get_grxfsiz(dwc_otg_core_if_t * core_if)
-+{
-+	return DWC_READ_REG32(&core_if->core_global_regs->grxfsiz);
-+}
-+
-+void dwc_otg_set_grxfsiz(dwc_otg_core_if_t * core_if, uint32_t val)
-+{
-+	DWC_WRITE_REG32(&core_if->core_global_regs->grxfsiz, val);
-+}
-+
-+uint32_t dwc_otg_get_gnptxfsiz(dwc_otg_core_if_t * core_if)
-+{
-+	return DWC_READ_REG32(&core_if->core_global_regs->gnptxfsiz);
-+}
-+
-+void dwc_otg_set_gnptxfsiz(dwc_otg_core_if_t * core_if, uint32_t val)
-+{
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gnptxfsiz, val);
-+}
-+
-+uint32_t dwc_otg_get_gpvndctl(dwc_otg_core_if_t * core_if)
-+{
-+	return DWC_READ_REG32(&core_if->core_global_regs->gpvndctl);
-+}
-+
-+void dwc_otg_set_gpvndctl(dwc_otg_core_if_t * core_if, uint32_t val)
-+{
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gpvndctl, val);
-+}
-+
-+uint32_t dwc_otg_get_ggpio(dwc_otg_core_if_t * core_if)
-+{
-+	return DWC_READ_REG32(&core_if->core_global_regs->ggpio);
-+}
-+
-+void dwc_otg_set_ggpio(dwc_otg_core_if_t * core_if, uint32_t val)
-+{
-+	DWC_WRITE_REG32(&core_if->core_global_regs->ggpio, val);
-+}
-+
-+uint32_t dwc_otg_get_hprt0(dwc_otg_core_if_t * core_if)
-+{
-+	return DWC_READ_REG32(core_if->host_if->hprt0);
-+
-+}
-+
-+void dwc_otg_set_hprt0(dwc_otg_core_if_t * core_if, uint32_t val)
-+{
-+	DWC_WRITE_REG32(core_if->host_if->hprt0, val);
-+}
-+
-+uint32_t dwc_otg_get_guid(dwc_otg_core_if_t * core_if)
-+{
-+	return DWC_READ_REG32(&core_if->core_global_regs->guid);
-+}
-+
-+void dwc_otg_set_guid(dwc_otg_core_if_t * core_if, uint32_t val)
-+{
-+	DWC_WRITE_REG32(&core_if->core_global_regs->guid, val);
-+}
-+
-+uint32_t dwc_otg_get_hptxfsiz(dwc_otg_core_if_t * core_if)
-+{
-+	return DWC_READ_REG32(&core_if->core_global_regs->hptxfsiz);
-+}
-+
-+uint16_t dwc_otg_get_otg_version(dwc_otg_core_if_t * core_if)
-+{
-+	return ((core_if->otg_ver == 1) ? (uint16_t)0x0200 : (uint16_t)0x0103);
-+}
-+
-+/**
-+ * Start the SRP timer to detect when the SRP does not complete within
-+ * 6 seconds.
-+ *
-+ * @param core_if the pointer to core_if strucure.
-+ */
-+void dwc_otg_pcd_start_srp_timer(dwc_otg_core_if_t * core_if)
-+{
-+	core_if->srp_timer_started = 1;
-+	DWC_TIMER_SCHEDULE(core_if->srp_timer, 6000 /* 6 secs */ );
-+}
-+
-+void dwc_otg_initiate_srp(dwc_otg_core_if_t * core_if)
-+{
-+	uint32_t *addr = (uint32_t *) & (core_if->core_global_regs->gotgctl);
-+	gotgctl_data_t mem;
-+	gotgctl_data_t val;
-+
-+	val.d32 = DWC_READ_REG32(addr);
-+	if (val.b.sesreq) {
-+		DWC_ERROR("Session Request Already active!\n");
-+		return;
-+	}
-+
-+	DWC_INFO("Session Request Initated\n");	//NOTICE
-+	mem.d32 = DWC_READ_REG32(addr);
-+	mem.b.sesreq = 1;
-+	DWC_WRITE_REG32(addr, mem.d32);
-+
-+	/* Start the SRP timer */
-+	dwc_otg_pcd_start_srp_timer(core_if);
-+	return;
-+}
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_cil.h
-@@ -0,0 +1,1464 @@
-+/* ==========================================================================
-+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.h $
-+ * $Revision: #123 $
-+ * $Date: 2012/08/10 $
-+ * $Change: 2047372 $
-+ *
-+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
-+ * "Software") is an Unsupported proprietary work of Synopsys, Inc. unless
-+ * otherwise expressly agreed to in writing between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product under
-+ * any End User Software License Agreement or Agreement for Licensed Product
-+ * with Synopsys or any supplement thereto. You are permitted to use and
-+ * redistribute this Software in source and binary forms, with or without
-+ * modification, provided that redistributions of source code must retain this
-+ * notice. You may not view, use, disclose, copy or distribute this file or
-+ * any information contained herein except pursuant to this license grant from
-+ * Synopsys. If you do not agree with this notice, including the disclaimer
-+ * below, then you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" BASIS
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS BE LIABLE FOR ANY DIRECT,
-+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================== */
-+
-+#if !defined(__DWC_CIL_H__)
-+#define __DWC_CIL_H__
-+
-+#include "dwc_list.h"
-+#include "dwc_otg_dbg.h"
-+#include "dwc_otg_regs.h"
-+
-+#include "dwc_otg_core_if.h"
-+#include "dwc_otg_adp.h"
-+
-+/**
-+ * @file
-+ * This file contains the interface to the Core Interface Layer.
-+ */
-+
-+#ifdef DWC_UTE_CFI
-+
-+#define MAX_DMA_DESCS_PER_EP	256
-+
-+/**
-+ * Enumeration for the data buffer mode
-+ */
-+typedef enum _data_buffer_mode {
-+	BM_STANDARD = 0,	/* data buffer is in normal mode */
-+	BM_SG = 1,		/* data buffer uses the scatter/gather mode */
-+	BM_CONCAT = 2,		/* data buffer uses the concatenation mode */
-+	BM_CIRCULAR = 3,	/* data buffer uses the circular DMA mode */
-+	BM_ALIGN = 4		/* data buffer is in buffer alignment mode */
-+} data_buffer_mode_e;
-+#endif //DWC_UTE_CFI
-+
-+/** Macros defined for DWC OTG HW Release version */
-+
-+#define OTG_CORE_REV_2_60a	0x4F54260A
-+#define OTG_CORE_REV_2_71a	0x4F54271A
-+#define OTG_CORE_REV_2_72a	0x4F54272A
-+#define OTG_CORE_REV_2_80a	0x4F54280A
-+#define OTG_CORE_REV_2_81a	0x4F54281A
-+#define OTG_CORE_REV_2_90a	0x4F54290A
-+#define OTG_CORE_REV_2_91a	0x4F54291A
-+#define OTG_CORE_REV_2_92a	0x4F54292A
-+#define OTG_CORE_REV_2_93a	0x4F54293A
-+#define OTG_CORE_REV_2_94a	0x4F54294A
-+#define OTG_CORE_REV_3_00a	0x4F54300A
-+
-+/**
-+ * Information for each ISOC packet.
-+ */
-+typedef struct iso_pkt_info {
-+	uint32_t offset;
-+	uint32_t length;
-+	int32_t status;
-+} iso_pkt_info_t;
-+
-+/**
-+ * The <code>dwc_ep</code> structure represents the state of a single
-+ * endpoint when acting in device mode. It contains the data items
-+ * needed for an endpoint to be activated and transfer packets.
-+ */
-+typedef struct dwc_ep {
-+	/** EP number used for register address lookup */
-+	uint8_t num;
-+	/** EP direction 0 = OUT */
-+	unsigned is_in:1;
-+	/** EP active. */
-+	unsigned active:1;
-+
-+	/**
-+	 * Periodic Tx FIFO # for IN EPs For INTR EP set to 0 to use non-periodic
-+	 * Tx FIFO. If dedicated Tx FIFOs are enabled Tx FIFO # FOR IN EPs*/
-+	unsigned tx_fifo_num:4;
-+	/** EP type: 0 - Control, 1 - ISOC,	 2 - BULK,	3 - INTR */
-+	unsigned type:2;
-+#define DWC_OTG_EP_TYPE_CONTROL	   0
-+#define DWC_OTG_EP_TYPE_ISOC	   1
-+#define DWC_OTG_EP_TYPE_BULK	   2
-+#define DWC_OTG_EP_TYPE_INTR	   3
-+
-+	/** DATA start PID for INTR and BULK EP */
-+	unsigned data_pid_start:1;
-+	/** Frame (even/odd) for ISOC EP */
-+	unsigned even_odd_frame:1;
-+	/** Max Packet bytes */
-+	unsigned maxpacket:11;
-+
-+	/** Max Transfer size */
-+	uint32_t maxxfer;
-+
-+	/** @name Transfer state */
-+	/** @{ */
-+
-+	/**
-+	 * Pointer to the beginning of the transfer buffer -- do not modify
-+	 * during transfer.
-+	 */
-+
-+	dwc_dma_t dma_addr;
-+
-+	dwc_dma_t dma_desc_addr;
-+	dwc_otg_dev_dma_desc_t *desc_addr;
-+
-+	uint8_t *start_xfer_buff;
-+	/** pointer to the transfer buffer */
-+	uint8_t *xfer_buff;
-+	/** Number of bytes to transfer */
-+	unsigned xfer_len:19;
-+	/** Number of bytes transferred. */
-+	unsigned xfer_count:19;
-+	/** Sent ZLP */
-+	unsigned sent_zlp:1;
-+	/** Total len for control transfer */
-+	unsigned total_len:19;
-+
-+	/** stall clear flag */
-+	unsigned stall_clear_flag:1;
-+
-+	/** SETUP pkt cnt rollover flag for EP0 out*/
-+	unsigned stp_rollover;
-+
-+#ifdef DWC_UTE_CFI
-+	/* The buffer mode */
-+	data_buffer_mode_e buff_mode;
-+
-+	/* The chain of DMA descriptors.
-+	 * MAX_DMA_DESCS_PER_EP will be allocated for each active EP.
-+	 */
-+	dwc_otg_dma_desc_t *descs;
-+
-+	/* The DMA address of the descriptors chain start */
-+	dma_addr_t descs_dma_addr;
-+	/** This variable stores the length of the last enqueued request */
-+	uint32_t cfi_req_len;
-+#endif				//DWC_UTE_CFI
-+
-+/** Max DMA Descriptor count for any EP */
-+#define MAX_DMA_DESC_CNT 256
-+	/** Allocated DMA Desc count */
-+	uint32_t desc_cnt;
-+
-+	/** bInterval */
-+	uint32_t bInterval;
-+	/** Next frame num to setup next ISOC transfer */
-+	uint32_t frame_num;
-+	/** Indicates SOF number overrun in DSTS */
-+	uint8_t frm_overrun;
-+
-+#ifdef DWC_UTE_PER_IO
-+	/** Next frame num for which will be setup DMA Desc */
-+	uint32_t xiso_frame_num;
-+	/** bInterval */
-+	uint32_t xiso_bInterval;
-+	/** Count of currently active transfers - shall be either 0 or 1 */
-+	int xiso_active_xfers;
-+	int xiso_queued_xfers;
-+#endif
-+#ifdef DWC_EN_ISOC
-+	/**
-+	 * Variables specific for ISOC EPs
-+	 *
-+	 */
-+	/** DMA addresses of ISOC buffers */
-+	dwc_dma_t dma_addr0;
-+	dwc_dma_t dma_addr1;
-+
-+	dwc_dma_t iso_dma_desc_addr;
-+	dwc_otg_dev_dma_desc_t *iso_desc_addr;
-+
-+	/** pointer to the transfer buffers */
-+	uint8_t *xfer_buff0;
-+	uint8_t *xfer_buff1;
-+
-+	/** number of ISOC Buffer is processing */
-+	uint32_t proc_buf_num;
-+	/** Interval of ISOC Buffer processing */
-+	uint32_t buf_proc_intrvl;
-+	/** Data size for regular frame */
-+	uint32_t data_per_frame;
-+
-+	/* todo - pattern data support is to be implemented in the future */
-+	/** Data size for pattern frame */
-+	uint32_t data_pattern_frame;
-+	/** Frame number of pattern data */
-+	uint32_t sync_frame;
-+
-+	/** bInterval */
-+	uint32_t bInterval;
-+	/** ISO Packet number per frame */
-+	uint32_t pkt_per_frm;
-+	/** Next frame num for which will be setup DMA Desc */
-+	uint32_t next_frame;
-+	/** Number of packets per buffer processing */
-+	uint32_t pkt_cnt;
-+	/** Info for all isoc packets */
-+	iso_pkt_info_t *pkt_info;
-+	/** current pkt number */
-+	uint32_t cur_pkt;
-+	/** current pkt number */
-+	uint8_t *cur_pkt_addr;
-+	/** current pkt number */
-+	uint32_t cur_pkt_dma_addr;
-+#endif				/* DWC_EN_ISOC */
-+
-+/** @} */
-+} dwc_ep_t;
-+
-+/*
-+ * Reasons for halting a host channel.
-+ */
-+typedef enum dwc_otg_halt_status {
-+	DWC_OTG_HC_XFER_NO_HALT_STATUS,
-+	DWC_OTG_HC_XFER_COMPLETE,
-+	DWC_OTG_HC_XFER_URB_COMPLETE,
-+	DWC_OTG_HC_XFER_ACK,
-+	DWC_OTG_HC_XFER_NAK,
-+	DWC_OTG_HC_XFER_NYET,
-+	DWC_OTG_HC_XFER_STALL,
-+	DWC_OTG_HC_XFER_XACT_ERR,
-+	DWC_OTG_HC_XFER_FRAME_OVERRUN,
-+	DWC_OTG_HC_XFER_BABBLE_ERR,
-+	DWC_OTG_HC_XFER_DATA_TOGGLE_ERR,
-+	DWC_OTG_HC_XFER_AHB_ERR,
-+	DWC_OTG_HC_XFER_PERIODIC_INCOMPLETE,
-+	DWC_OTG_HC_XFER_URB_DEQUEUE
-+} dwc_otg_halt_status_e;
-+
-+/**
-+ * Host channel descriptor. This structure represents the state of a single
-+ * host channel when acting in host mode. It contains the data items needed to
-+ * transfer packets to an endpoint via a host channel.
-+ */
-+typedef struct dwc_hc {
-+	/** Host channel number used for register address lookup */
-+	uint8_t hc_num;
-+
-+	/** Device to access */
-+	unsigned dev_addr:7;
-+
-+	/** EP to access */
-+	unsigned ep_num:4;
-+
-+	/** EP direction. 0: OUT, 1: IN */
-+	unsigned ep_is_in:1;
-+
-+	/**
-+	 * EP speed.
-+	 * One of the following values:
-+	 *	- DWC_OTG_EP_SPEED_LOW
-+	 *	- DWC_OTG_EP_SPEED_FULL
-+	 *	- DWC_OTG_EP_SPEED_HIGH
-+	 */
-+	unsigned speed:2;
-+#define DWC_OTG_EP_SPEED_LOW	0
-+#define DWC_OTG_EP_SPEED_FULL	1
-+#define DWC_OTG_EP_SPEED_HIGH	2
-+
-+	/**
-+	 * Endpoint type.
-+	 * One of the following values:
-+	 *	- DWC_OTG_EP_TYPE_CONTROL: 0
-+	 *	- DWC_OTG_EP_TYPE_ISOC: 1
-+	 *	- DWC_OTG_EP_TYPE_BULK: 2
-+	 *	- DWC_OTG_EP_TYPE_INTR: 3
-+	 */
-+	unsigned ep_type:2;
-+
-+	/** Max packet size in bytes */
-+	unsigned max_packet:11;
-+
-+	/**
-+	 * PID for initial transaction.
-+	 * 0: DATA0,<br>
-+	 * 1: DATA2,<br>
-+	 * 2: DATA1,<br>
-+	 * 3: MDATA (non-Control EP),
-+	 *	  SETUP (Control EP)
-+	 */
-+	unsigned data_pid_start:2;
-+#define DWC_OTG_HC_PID_DATA0 0
-+#define DWC_OTG_HC_PID_DATA2 1
-+#define DWC_OTG_HC_PID_DATA1 2
-+#define DWC_OTG_HC_PID_MDATA 3
-+#define DWC_OTG_HC_PID_SETUP 3
-+
-+	/** Number of periodic transactions per (micro)frame */
-+	unsigned multi_count:2;
-+
-+	/** @name Transfer State */
-+	/** @{ */
-+
-+	/** Pointer to the current transfer buffer position. */
-+	uint8_t *xfer_buff;
-+	/**
-+	 * In Buffer DMA mode this buffer will be used
-+	 * if xfer_buff is not DWORD aligned.
-+	 */
-+	dwc_dma_t align_buff;
-+	/** Total number of bytes to transfer. */
-+	uint32_t xfer_len;
-+	/** Number of bytes transferred so far. */
-+	uint32_t xfer_count;
-+	/** Packet count at start of transfer.*/
-+	uint16_t start_pkt_count;
-+
-+	/**
-+	 * Flag to indicate whether the transfer has been started. Set to 1 if
-+	 * it has been started, 0 otherwise.
-+	 */
-+	uint8_t xfer_started;
-+
-+	/**
-+	 * Set to 1 to indicate that a PING request should be issued on this
-+	 * channel. If 0, process normally.
-+	 */
-+	uint8_t do_ping;
-+
-+	/**
-+	 * Set to 1 to indicate that the error count for this transaction is
-+	 * non-zero. Set to 0 if the error count is 0.
-+	 */
-+	uint8_t error_state;
-+
-+	/**
-+	 * Set to 1 to indicate that this channel should be halted the next
-+	 * time a request is queued for the channel. This is necessary in
-+	 * slave mode if no request queue space is available when an attempt
-+	 * is made to halt the channel.
-+	 */
-+	uint8_t halt_on_queue;
-+
-+	/**
-+	 * Set to 1 if the host channel has been halted, but the core is not
-+	 * finished flushing queued requests. Otherwise 0.
-+	 */
-+	uint8_t halt_pending;
-+
-+	/**
-+	 * Reason for halting the host channel.
-+	 */
-+	dwc_otg_halt_status_e halt_status;
-+
-+	/*
-+	 * Split settings for the host channel
-+	 */
-+	uint8_t do_split;		   /**< Enable split for the channel */
-+	uint8_t complete_split;	   /**< Enable complete split */
-+	uint8_t hub_addr;		   /**< Address of high speed hub */
-+
-+	uint8_t port_addr;		   /**< Port of the low/full speed device */
-+	/** Split transaction position
-+	 * One of the following values:
-+	 *	  - DWC_HCSPLIT_XACTPOS_MID
-+	 *	  - DWC_HCSPLIT_XACTPOS_BEGIN
-+	 *	  - DWC_HCSPLIT_XACTPOS_END
-+	 *	  - DWC_HCSPLIT_XACTPOS_ALL */
-+	uint8_t xact_pos;
-+
-+	/** Set when the host channel does a short read. */
-+	uint8_t short_read;
-+
-+	/**
-+	 * Number of requests issued for this channel since it was assigned to
-+	 * the current transfer (not counting PINGs).
-+	 */
-+	uint8_t requests;
-+
-+	/**
-+	 * Queue Head for the transfer being processed by this channel.
-+	 */
-+	struct dwc_otg_qh *qh;
-+
-+	/** @} */
-+
-+	/** Entry in list of host channels. */
-+	 DWC_CIRCLEQ_ENTRY(dwc_hc) hc_list_entry;
-+
-+	/** @name Descriptor DMA support */
-+	/** @{ */
-+
-+	/** Number of Transfer Descriptors */
-+	uint16_t ntd;
-+
-+	/** Descriptor List DMA address */
-+	dwc_dma_t desc_list_addr;
-+
-+	/** Scheduling micro-frame bitmap. */
-+	uint8_t schinfo;
-+
-+	/** @} */
-+} dwc_hc_t;
-+
-+/**
-+ * The following parameters may be specified when starting the module. These
-+ * parameters define how the DWC_otg controller should be configured.
-+ */
-+typedef struct dwc_otg_core_params {
-+	int32_t opt;
-+
-+	/**
-+	 * Specifies the OTG capabilities. The driver will automatically
-+	 * detect the value for this parameter if none is specified.
-+	 * 0 - HNP and SRP capable (default)
-+	 * 1 - SRP Only capable
-+	 * 2 - No HNP/SRP capable
-+	 */
-+	int32_t otg_cap;
-+
-+	/**
-+	 * Specifies whether to use slave or DMA mode for accessing the data
-+	 * FIFOs. The driver will automatically detect the value for this
-+	 * parameter if none is specified.
-+	 * 0 - Slave
-+	 * 1 - DMA (default, if available)
-+	 */
-+	int32_t dma_enable;
-+
-+	/**
-+	 * When DMA mode is enabled specifies whether to use address DMA or DMA
-+	 * Descriptor mode for accessing the data FIFOs in device mode. The driver
-+	 * will automatically detect the value for this if none is specified.
-+	 * 0 - address DMA
-+	 * 1 - DMA Descriptor(default, if available)
-+	 */
-+	int32_t dma_desc_enable;
-+	/** The DMA Burst size (applicable only for External DMA
-+	 * Mode). 1, 4, 8 16, 32, 64, 128, 256 (default 32)
-+	 */
-+	int32_t dma_burst_size;	/* Translate this to GAHBCFG values */
-+
-+	/**
-+	 * Specifies the maximum speed of operation in host and device mode.
-+	 * The actual speed depends on the speed of the attached device and
-+	 * the value of phy_type. The actual speed depends on the speed of the
-+	 * attached device.
-+	 * 0 - High Speed (default)
-+	 * 1 - Full Speed
-+	 */
-+	int32_t speed;
-+	/** Specifies whether low power mode is supported when attached
-+	 *	to a Full Speed or Low Speed device in host mode.
-+	 * 0 - Don't support low power mode (default)
-+	 * 1 - Support low power mode
-+	 */
-+	int32_t host_support_fs_ls_low_power;
-+
-+	/** Specifies the PHY clock rate in low power mode when connected to a
-+	 * Low Speed device in host mode. This parameter is applicable only if
-+	 * HOST_SUPPORT_FS_LS_LOW_POWER is enabled. If PHY_TYPE is set to FS
-+	 * then defaults to 6 MHZ otherwise 48 MHZ.
-+	 *
-+	 * 0 - 48 MHz
-+	 * 1 - 6 MHz
-+	 */
-+	int32_t host_ls_low_power_phy_clk;
-+
-+	/**
-+	 * 0 - Use cC FIFO size parameters
-+	 * 1 - Allow dynamic FIFO sizing (default)
-+	 */
-+	int32_t enable_dynamic_fifo;
-+
-+	/** Total number of 4-byte words in the data FIFO memory. This
-+	 * memory includes the Rx FIFO, non-periodic Tx FIFO, and periodic
-+	 * Tx FIFOs.
-+	 * 32 to 32768 (default 8192)
-+	 * Note: The total FIFO memory depth in the FPGA configuration is 8192.
-+	 */
-+	int32_t data_fifo_size;
-+
-+	/** Number of 4-byte words in the Rx FIFO in device mode when dynamic
-+	 * FIFO sizing is enabled.
-+	 * 16 to 32768 (default 1064)
-+	 */
-+	int32_t dev_rx_fifo_size;
-+
-+	/** Number of 4-byte words in the non-periodic Tx FIFO in device mode
-+	 * when dynamic FIFO sizing is enabled.
-+	 * 16 to 32768 (default 1024)
-+	 */
-+	int32_t dev_nperio_tx_fifo_size;
-+
-+	/** Number of 4-byte words in each of the periodic Tx FIFOs in device
-+	 * mode when dynamic FIFO sizing is enabled.
-+	 * 4 to 768 (default 256)
-+	 */
-+	uint32_t dev_perio_tx_fifo_size[MAX_PERIO_FIFOS];
-+
-+	/** Number of 4-byte words in the Rx FIFO in host mode when dynamic
-+	 * FIFO sizing is enabled.
-+	 * 16 to 32768 (default 1024)
-+	 */
-+	int32_t host_rx_fifo_size;
-+
-+	/** Number of 4-byte words in the non-periodic Tx FIFO in host mode
-+	 * when Dynamic FIFO sizing is enabled in the core.
-+	 * 16 to 32768 (default 1024)
-+	 */
-+	int32_t host_nperio_tx_fifo_size;
-+
-+	/** Number of 4-byte words in the host periodic Tx FIFO when dynamic
-+	 * FIFO sizing is enabled.
-+	 * 16 to 32768 (default 1024)
-+	 */
-+	int32_t host_perio_tx_fifo_size;
-+
-+	/** The maximum transfer size supported in bytes.
-+	 * 2047 to 65,535  (default 65,535)
-+	 */
-+	int32_t max_transfer_size;
-+
-+	/** The maximum number of packets in a transfer.
-+	 * 15 to 511  (default 511)
-+	 */
-+	int32_t max_packet_count;
-+
-+	/** The number of host channel registers to use.
-+	 * 1 to 16 (default 12)
-+	 * Note: The FPGA configuration supports a maximum of 12 host channels.
-+	 */
-+	int32_t host_channels;
-+
-+	/** The number of endpoints in addition to EP0 available for device
-+	 * mode operations.
-+	 * 1 to 15 (default 6 IN and OUT)
-+	 * Note: The FPGA configuration supports a maximum of 6 IN and OUT
-+	 * endpoints in addition to EP0.
-+	 */
-+	int32_t dev_endpoints;
-+
-+		/**
-+		 * Specifies the type of PHY interface to use. By default, the driver
-+		 * will automatically detect the phy_type.
-+		 *
-+		 * 0 - Full Speed PHY
-+		 * 1 - UTMI+ (default)
-+		 * 2 - ULPI
-+		 */
-+	int32_t phy_type;
-+
-+	/**
-+	 * Specifies the UTMI+ Data Width. This parameter is
-+	 * applicable for a PHY_TYPE of UTMI+ or ULPI. (For a ULPI
-+	 * PHY_TYPE, this parameter indicates the data width between
-+	 * the MAC and the ULPI Wrapper.) Also, this parameter is
-+	 * applicable only if the OTG_HSPHY_WIDTH cC parameter was set
-+	 * to "8 and 16 bits", meaning that the core has been
-+	 * configured to work at either data path width.
-+	 *
-+	 * 8 or 16 bits (default 16)
-+	 */
-+	int32_t phy_utmi_width;
-+
-+	/**
-+	 * Specifies whether the ULPI operates at double or single
-+	 * data rate. This parameter is only applicable if PHY_TYPE is
-+	 * ULPI.
-+	 *
-+	 * 0 - single data rate ULPI interface with 8 bit wide data
-+	 * bus (default)
-+	 * 1 - double data rate ULPI interface with 4 bit wide data
-+	 * bus
-+	 */
-+	int32_t phy_ulpi_ddr;
-+
-+	/**
-+	 * Specifies whether to use the internal or external supply to
-+	 * drive the vbus with a ULPI phy.
-+	 */
-+	int32_t phy_ulpi_ext_vbus;
-+
-+	/**
-+	 * Specifies whether to use the I2Cinterface for full speed PHY. This
-+	 * parameter is only applicable if PHY_TYPE is FS.
-+	 * 0 - No (default)
-+	 * 1 - Yes
-+	 */
-+	int32_t i2c_enable;
-+
-+	int32_t ulpi_fs_ls;
-+
-+	int32_t ts_dline;
-+
-+	/**
-+	 * Specifies whether dedicated transmit FIFOs are
-+	 * enabled for non periodic IN endpoints in device mode
-+	 * 0 - No
-+	 * 1 - Yes
-+	 */
-+	int32_t en_multiple_tx_fifo;
-+
-+	/** Number of 4-byte words in each of the Tx FIFOs in device
-+	 * mode when dynamic FIFO sizing is enabled.
-+	 * 4 to 768 (default 256)
-+	 */
-+	uint32_t dev_tx_fifo_size[MAX_TX_FIFOS];
-+
-+	/** Thresholding enable flag-
-+	 * bit 0 - enable non-ISO Tx thresholding
-+	 * bit 1 - enable ISO Tx thresholding
-+	 * bit 2 - enable Rx thresholding
-+	 */
-+	uint32_t thr_ctl;
-+
-+	/** Thresholding length for Tx
-+	 *	FIFOs in 32 bit DWORDs
-+	 */
-+	uint32_t tx_thr_length;
-+
-+	/** Thresholding length for Rx
-+	 *	FIFOs in 32 bit DWORDs
-+	 */
-+	uint32_t rx_thr_length;
-+
-+	/**
-+	 * Specifies whether LPM (Link Power Management) support is enabled
-+	 */
-+	int32_t lpm_enable;
-+
-+	/** Per Transfer Interrupt
-+	 *	mode enable flag
-+	 * 1 - Enabled
-+	 * 0 - Disabled
-+	 */
-+	int32_t pti_enable;
-+
-+	/** Multi Processor Interrupt
-+	 *	mode enable flag
-+	 * 1 - Enabled
-+	 * 0 - Disabled
-+	 */
-+	int32_t mpi_enable;
-+
-+	/** IS_USB Capability
-+	 * 1 - Enabled
-+	 * 0 - Disabled
-+	 */
-+	int32_t ic_usb_cap;
-+
-+	/** AHB Threshold Ratio
-+	 * 2'b00 AHB Threshold = 	MAC Threshold
-+	 * 2'b01 AHB Threshold = 1/2 	MAC Threshold
-+	 * 2'b10 AHB Threshold = 1/4	MAC Threshold
-+	 * 2'b11 AHB Threshold = 1/8	MAC Threshold
-+	 */
-+	int32_t ahb_thr_ratio;
-+
-+	/** ADP Support
-+	 * 1 - Enabled
-+	 * 0 - Disabled
-+	 */
-+	int32_t adp_supp_enable;
-+
-+	/** HFIR Reload Control
-+	 * 0 - The HFIR cannot be reloaded dynamically.
-+	 * 1 - Allow dynamic reloading of the HFIR register during runtime.
-+	 */
-+	int32_t reload_ctl;
-+
-+	/** DCFG: Enable device Out NAK
-+	 * 0 - The core does not set NAK after Bulk Out transfer complete.
-+	 * 1 - The core sets NAK after Bulk OUT transfer complete.
-+	 */
-+	int32_t dev_out_nak;
-+
-+	/** DCFG: Enable Continue on BNA
-+	 * After receiving BNA interrupt the core disables the endpoint,when the
-+	 * endpoint is re-enabled by the application the core starts processing
-+	 * 0 - from the DOEPDMA descriptor
-+	 * 1 - from the descriptor which received the BNA.
-+	 */
-+	int32_t cont_on_bna;
-+
-+	/** GAHBCFG: AHB Single Support
-+	 * This bit when programmed supports SINGLE transfers for remainder
-+	 * data in a transfer for DMA mode of operation.
-+	 * 0 - in this case the remainder data will be sent using INCR burst size.
-+	 * 1 - in this case the remainder data will be sent using SINGLE burst size.
-+	 */
-+	int32_t ahb_single;
-+
-+	/** Core Power down mode
-+	 * 0 - No Power Down is enabled
-+	 * 1 - Reserved
-+	 * 2 - Complete Power Down (Hibernation)
-+	 */
-+	int32_t power_down;
-+
-+	/** OTG revision supported
-+	 * 0 - OTG 1.3 revision
-+	 * 1 - OTG 2.0 revision
-+	 */
-+	int32_t otg_ver;
-+
-+} dwc_otg_core_params_t;
-+
-+#ifdef DEBUG
-+struct dwc_otg_core_if;
-+typedef struct hc_xfer_info {
-+	struct dwc_otg_core_if *core_if;
-+	dwc_hc_t *hc;
-+} hc_xfer_info_t;
-+#endif
-+
-+typedef struct ep_xfer_info {
-+	struct dwc_otg_core_if *core_if;
-+	dwc_ep_t *ep;
-+	uint8_t state;
-+} ep_xfer_info_t;
-+/*
-+ * Device States
-+ */
-+typedef enum dwc_otg_lx_state {
-+	/** On state */
-+	DWC_OTG_L0,
-+	/** LPM sleep state*/
-+	DWC_OTG_L1,
-+	/** USB suspend state*/
-+	DWC_OTG_L2,
-+	/** Off state*/
-+	DWC_OTG_L3
-+} dwc_otg_lx_state_e;
-+
-+struct dwc_otg_global_regs_backup {
-+	uint32_t gotgctl_local;
-+	uint32_t gintmsk_local;
-+	uint32_t gahbcfg_local;
-+	uint32_t gusbcfg_local;
-+	uint32_t grxfsiz_local;
-+	uint32_t gnptxfsiz_local;
-+#ifdef CONFIG_USB_DWC_OTG_LPM
-+	uint32_t glpmcfg_local;
-+#endif
-+	uint32_t gi2cctl_local;
-+	uint32_t hptxfsiz_local;
-+	uint32_t pcgcctl_local;
-+	uint32_t gdfifocfg_local;
-+	uint32_t dtxfsiz_local[MAX_EPS_CHANNELS];
-+	uint32_t gpwrdn_local;
-+	uint32_t xhib_pcgcctl;
-+	uint32_t xhib_gpwrdn;
-+};
-+
-+struct dwc_otg_host_regs_backup {
-+	uint32_t hcfg_local;
-+	uint32_t haintmsk_local;
-+	uint32_t hcintmsk_local[MAX_EPS_CHANNELS];
-+	uint32_t hprt0_local;
-+	uint32_t hfir_local;
-+};
-+
-+struct dwc_otg_dev_regs_backup {
-+	uint32_t dcfg;
-+	uint32_t dctl;
-+	uint32_t daintmsk;
-+	uint32_t diepmsk;
-+	uint32_t doepmsk;
-+	uint32_t diepctl[MAX_EPS_CHANNELS];
-+	uint32_t dieptsiz[MAX_EPS_CHANNELS];
-+	uint32_t diepdma[MAX_EPS_CHANNELS];
-+};
-+/**
-+ * The <code>dwc_otg_core_if</code> structure contains information needed to manage
-+ * the DWC_otg controller acting in either host or device mode. It
-+ * represents the programming view of the controller as a whole.
-+ */
-+struct dwc_otg_core_if {
-+	/** Parameters that define how the core should be configured.*/
-+	dwc_otg_core_params_t *core_params;
-+
-+	/** Core Global registers starting at offset 000h. */
-+	dwc_otg_core_global_regs_t *core_global_regs;
-+
-+	/** Device-specific information */
-+	dwc_otg_dev_if_t *dev_if;
-+	/** Host-specific information */
-+	dwc_otg_host_if_t *host_if;
-+
-+	/** Value from SNPSID register */
-+	uint32_t snpsid;
-+
-+	/*
-+	 * Set to 1 if the core PHY interface bits in USBCFG have been
-+	 * initialized.
-+	 */
-+	uint8_t phy_init_done;
-+
-+	/*
-+	 * SRP Success flag, set by srp success interrupt in FS I2C mode
-+	 */
-+	uint8_t srp_success;
-+	uint8_t srp_timer_started;
-+	/** Timer for SRP. If it expires before SRP is successful
-+	 * clear the SRP. */
-+	dwc_timer_t *srp_timer;
-+
-+#ifdef DWC_DEV_SRPCAP
-+	/* This timer is needed to power on the hibernated host core if SRP is not
-+	 * initiated on connected SRP capable device for limited period of time
-+	 */
-+	uint8_t pwron_timer_started;
-+	dwc_timer_t *pwron_timer;
-+#endif
-+	/* Common configuration information */
-+	/** Power and Clock Gating Control Register */
-+	volatile uint32_t *pcgcctl;
-+#define DWC_OTG_PCGCCTL_OFFSET 0xE00
-+
-+	/** Push/pop addresses for endpoints or host channels.*/
-+	uint32_t *data_fifo[MAX_EPS_CHANNELS];
-+#define DWC_OTG_DATA_FIFO_OFFSET 0x1000
-+#define DWC_OTG_DATA_FIFO_SIZE 0x1000
-+
-+	/** Total RAM for FIFOs (Bytes) */
-+	uint16_t total_fifo_size;
-+	/** Size of Rx FIFO (Bytes) */
-+	uint16_t rx_fifo_size;
-+	/** Size of Non-periodic Tx FIFO (Bytes) */
-+	uint16_t nperio_tx_fifo_size;
-+
-+	/** 1 if DMA is enabled, 0 otherwise. */
-+	uint8_t dma_enable;
-+
-+	/** 1 if DMA descriptor is enabled, 0 otherwise. */
-+	uint8_t dma_desc_enable;
-+
-+	/** 1 if PTI Enhancement mode is enabled, 0 otherwise. */
-+	uint8_t pti_enh_enable;
-+
-+	/** 1 if MPI Enhancement mode is enabled, 0 otherwise. */
-+	uint8_t multiproc_int_enable;
-+
-+	/** 1 if dedicated Tx FIFOs are enabled, 0 otherwise. */
-+	uint8_t en_multiple_tx_fifo;
-+
-+	/** Set to 1 if multiple packets of a high-bandwidth transfer is in
-+	 * process of being queued */
-+	uint8_t queuing_high_bandwidth;
-+
-+	/** Hardware Configuration -- stored here for convenience.*/
-+	hwcfg1_data_t hwcfg1;
-+	hwcfg2_data_t hwcfg2;
-+	hwcfg3_data_t hwcfg3;
-+	hwcfg4_data_t hwcfg4;
-+	fifosize_data_t hptxfsiz;
-+
-+	/** Host and Device Configuration -- stored here for convenience.*/
-+	hcfg_data_t hcfg;
-+	dcfg_data_t dcfg;
-+
-+	/** The operational State, during transations
-+	 * (a_host>>a_peripherial and b_device=>b_host) this may not
-+	 * match the core but allows the software to determine
-+	 * transitions.
-+	 */
-+	uint8_t op_state;
-+
-+	/**
-+	 * Set to 1 if the HCD needs to be restarted on a session request
-+	 * interrupt. This is required if no connector ID status change has
-+	 * occurred since the HCD was last disconnected.
-+	 */
-+	uint8_t restart_hcd_on_session_req;
-+
-+	/** HCD callbacks */
-+	/** A-Device is a_host */
-+#define A_HOST		(1)
-+	/** A-Device is a_suspend */
-+#define A_SUSPEND	(2)
-+	/** A-Device is a_peripherial */
-+#define A_PERIPHERAL	(3)
-+	/** B-Device is operating as a Peripheral. */
-+#define B_PERIPHERAL	(4)
-+	/** B-Device is operating as a Host. */
-+#define B_HOST		(5)
-+
-+	/** HCD callbacks */
-+	struct dwc_otg_cil_callbacks *hcd_cb;
-+	/** PCD callbacks */
-+	struct dwc_otg_cil_callbacks *pcd_cb;
-+
-+	/** Device mode Periodic Tx FIFO Mask */
-+	uint32_t p_tx_msk;
-+	/** Device mode Periodic Tx FIFO Mask */
-+	uint32_t tx_msk;
-+
-+	/** Workqueue object used for handling several interrupts */
-+	dwc_workq_t *wq_otg;
-+
-+	/** Timer object used for handling "Wakeup Detected" Interrupt */
-+	dwc_timer_t *wkp_timer;
-+	/** This arrays used for debug purposes for DEV OUT NAK enhancement */
-+	uint32_t start_doeptsiz_val[MAX_EPS_CHANNELS];
-+	ep_xfer_info_t ep_xfer_info[MAX_EPS_CHANNELS];
-+	dwc_timer_t *ep_xfer_timer[MAX_EPS_CHANNELS];
-+#ifdef DEBUG
-+	uint32_t start_hcchar_val[MAX_EPS_CHANNELS];
-+
-+	hc_xfer_info_t hc_xfer_info[MAX_EPS_CHANNELS];
-+	dwc_timer_t *hc_xfer_timer[MAX_EPS_CHANNELS];
-+
-+	uint32_t hfnum_7_samples;
-+	uint64_t hfnum_7_frrem_accum;
-+	uint32_t hfnum_0_samples;
-+	uint64_t hfnum_0_frrem_accum;
-+	uint32_t hfnum_other_samples;
-+	uint64_t hfnum_other_frrem_accum;
-+#endif
-+
-+#ifdef DWC_UTE_CFI
-+	uint16_t pwron_rxfsiz;
-+	uint16_t pwron_gnptxfsiz;
-+	uint16_t pwron_txfsiz[15];
-+
-+	uint16_t init_rxfsiz;
-+	uint16_t init_gnptxfsiz;
-+	uint16_t init_txfsiz[15];
-+#endif
-+
-+	/** Lx state of device */
-+	dwc_otg_lx_state_e lx_state;
-+
-+	/** Saved Core Global registers */
-+	struct dwc_otg_global_regs_backup *gr_backup;
-+	/** Saved Host registers */
-+	struct dwc_otg_host_regs_backup *hr_backup;
-+	/** Saved Device registers */
-+	struct dwc_otg_dev_regs_backup *dr_backup;
-+
-+	/** Power Down Enable */
-+	uint32_t power_down;
-+
-+	/** ADP support Enable */
-+	uint32_t adp_enable;
-+
-+	/** ADP structure object */
-+	dwc_otg_adp_t adp;
-+
-+	/** hibernation/suspend flag */
-+	int hibernation_suspend;
-+
-+	/** Device mode extended hibernation flag */
-+	int xhib;
-+
-+	/** OTG revision supported */
-+	uint32_t otg_ver;
-+
-+	/** OTG status flag used for HNP polling */
-+	uint8_t otg_sts;
-+
-+	/** Pointer to either hcd->lock or pcd->lock */
-+	dwc_spinlock_t *lock;
-+
-+	/** Start predict NextEP based on Learning Queue if equal 1,
-+	 * also used as counter of disabled NP IN EP's */
-+	uint8_t start_predict;
-+
-+	/** NextEp sequence, including EP0: nextep_seq[] = EP if non-periodic and
-+	 * active, 0xff otherwise */
-+	uint8_t nextep_seq[MAX_EPS_CHANNELS];
-+
-+	/** Index of fisrt EP in nextep_seq array which should be re-enabled **/
-+	uint8_t first_in_nextep_seq;
-+
-+	/** Frame number while entering to ISR - needed for ISOCs **/
-+	uint32_t frame_num;
-+
-+};
-+
-+#ifdef DEBUG
-+/*
-+ * This function is called when transfer is timed out.
-+ */
-+extern void hc_xfer_timeout(void *ptr);
-+#endif
-+
-+/*
-+ * This function is called when transfer is timed out on endpoint.
-+ */
-+extern void ep_xfer_timeout(void *ptr);
-+
-+/*
-+ * The following functions are functions for works
-+ * using during handling some interrupts
-+ */
-+extern void w_conn_id_status_change(void *p);
-+
-+extern void w_wakeup_detected(void *p);
-+
-+/** Saves global register values into system memory. */
-+extern int dwc_otg_save_global_regs(dwc_otg_core_if_t * core_if);
-+/** Saves device register values into system memory. */
-+extern int dwc_otg_save_dev_regs(dwc_otg_core_if_t * core_if);
-+/** Saves host register values into system memory. */
-+extern int dwc_otg_save_host_regs(dwc_otg_core_if_t * core_if);
-+/** Restore global register values. */
-+extern int dwc_otg_restore_global_regs(dwc_otg_core_if_t * core_if);
-+/** Restore host register values. */
-+extern int dwc_otg_restore_host_regs(dwc_otg_core_if_t * core_if, int reset);
-+/** Restore device register values. */
-+extern int dwc_otg_restore_dev_regs(dwc_otg_core_if_t * core_if,
-+				    int rem_wakeup);
-+extern int restore_lpm_i2c_regs(dwc_otg_core_if_t * core_if);
-+extern int restore_essential_regs(dwc_otg_core_if_t * core_if, int rmode,
-+				  int is_host);
-+
-+extern int dwc_otg_host_hibernation_restore(dwc_otg_core_if_t * core_if,
-+					    int restore_mode, int reset);
-+extern int dwc_otg_device_hibernation_restore(dwc_otg_core_if_t * core_if,
-+					      int rem_wakeup, int reset);
-+
-+/*
-+ * The following functions support initialization of the CIL driver component
-+ * and the DWC_otg controller.
-+ */
-+extern void dwc_otg_core_host_init(dwc_otg_core_if_t * _core_if);
-+extern void dwc_otg_core_dev_init(dwc_otg_core_if_t * _core_if);
-+
-+/** @name Device CIL Functions
-+ * The following functions support managing the DWC_otg controller in device
-+ * mode.
-+ */
-+/**@{*/
-+extern void dwc_otg_wakeup(dwc_otg_core_if_t * _core_if);
-+extern void dwc_otg_read_setup_packet(dwc_otg_core_if_t * _core_if,
-+				      uint32_t * _dest);
-+extern uint32_t dwc_otg_get_frame_number(dwc_otg_core_if_t * _core_if);
-+extern void dwc_otg_ep0_activate(dwc_otg_core_if_t * _core_if, dwc_ep_t * _ep);
-+extern void dwc_otg_ep_activate(dwc_otg_core_if_t * _core_if, dwc_ep_t * _ep);
-+extern void dwc_otg_ep_deactivate(dwc_otg_core_if_t * _core_if, dwc_ep_t * _ep);
-+extern void dwc_otg_ep_start_transfer(dwc_otg_core_if_t * _core_if,
-+				      dwc_ep_t * _ep);
-+extern void dwc_otg_ep_start_zl_transfer(dwc_otg_core_if_t * _core_if,
-+					 dwc_ep_t * _ep);
-+extern void dwc_otg_ep0_start_transfer(dwc_otg_core_if_t * _core_if,
-+				       dwc_ep_t * _ep);
-+extern void dwc_otg_ep0_continue_transfer(dwc_otg_core_if_t * _core_if,
-+					  dwc_ep_t * _ep);
-+extern void dwc_otg_ep_write_packet(dwc_otg_core_if_t * _core_if,
-+				    dwc_ep_t * _ep, int _dma);
-+extern void dwc_otg_ep_set_stall(dwc_otg_core_if_t * _core_if, dwc_ep_t * _ep);
-+extern void dwc_otg_ep_clear_stall(dwc_otg_core_if_t * _core_if,
-+				   dwc_ep_t * _ep);
-+extern void dwc_otg_enable_device_interrupts(dwc_otg_core_if_t * _core_if);
-+
-+#ifdef DWC_EN_ISOC
-+extern void dwc_otg_iso_ep_start_frm_transfer(dwc_otg_core_if_t * core_if,
-+					      dwc_ep_t * ep);
-+extern void dwc_otg_iso_ep_start_buf_transfer(dwc_otg_core_if_t * core_if,
-+					      dwc_ep_t * ep);
-+#endif /* DWC_EN_ISOC */
-+/**@}*/
-+
-+/** @name Host CIL Functions
-+ * The following functions support managing the DWC_otg controller in host
-+ * mode.
-+ */
-+/**@{*/
-+extern void dwc_otg_hc_init(dwc_otg_core_if_t * _core_if, dwc_hc_t * _hc);
-+extern void dwc_otg_hc_halt(dwc_otg_core_if_t * _core_if,
-+			    dwc_hc_t * _hc, dwc_otg_halt_status_e _halt_status);
-+extern void dwc_otg_hc_cleanup(dwc_otg_core_if_t * _core_if, dwc_hc_t * _hc);
-+extern void dwc_otg_hc_start_transfer(dwc_otg_core_if_t * _core_if,
-+				      dwc_hc_t * _hc);
-+extern int dwc_otg_hc_continue_transfer(dwc_otg_core_if_t * _core_if,
-+					dwc_hc_t * _hc);
-+extern void dwc_otg_hc_do_ping(dwc_otg_core_if_t * _core_if, dwc_hc_t * _hc);
-+extern void dwc_otg_hc_write_packet(dwc_otg_core_if_t * _core_if,
-+				    dwc_hc_t * _hc);
-+extern void dwc_otg_enable_host_interrupts(dwc_otg_core_if_t * _core_if);
-+extern void dwc_otg_disable_host_interrupts(dwc_otg_core_if_t * _core_if);
-+
-+extern void dwc_otg_hc_start_transfer_ddma(dwc_otg_core_if_t * core_if,
-+					   dwc_hc_t * hc);
-+
-+extern uint32_t calc_frame_interval(dwc_otg_core_if_t * core_if);
-+
-+/* Macro used to clear one channel interrupt */
-+#define clear_hc_int(_hc_regs_, _intr_) \
-+do { \
-+	hcint_data_t hcint_clear = {.d32 = 0}; \
-+	hcint_clear.b._intr_ = 1; \
-+	DWC_WRITE_REG32(&(_hc_regs_)->hcint, hcint_clear.d32); \
-+} while (0)
-+
-+/*
-+ * Macro used to disable one channel interrupt. Channel interrupts are
-+ * disabled when the channel is halted or released by the interrupt handler.
-+ * There is no need to handle further interrupts of that type until the
-+ * channel is re-assigned. In fact, subsequent handling may cause crashes
-+ * because the channel structures are cleaned up when the channel is released.
-+ */
-+#define disable_hc_int(_hc_regs_, _intr_) \
-+do { \
-+	hcintmsk_data_t hcintmsk = {.d32 = 0}; \
-+	hcintmsk.b._intr_ = 1; \
-+	DWC_MODIFY_REG32(&(_hc_regs_)->hcintmsk, hcintmsk.d32, 0); \
-+} while (0)
-+
-+/**
-+ * This function Reads HPRT0 in preparation to modify. It keeps the
-+ * WC bits 0 so that if they are read as 1, they won't clear when you
-+ * write it back
-+ */
-+static inline uint32_t dwc_otg_read_hprt0(dwc_otg_core_if_t * _core_if)
-+{
-+	hprt0_data_t hprt0;
-+	hprt0.d32 = DWC_READ_REG32(_core_if->host_if->hprt0);
-+	hprt0.b.prtena = 0;
-+	hprt0.b.prtconndet = 0;
-+	hprt0.b.prtenchng = 0;
-+	hprt0.b.prtovrcurrchng = 0;
-+	return hprt0.d32;
-+}
-+
-+/**@}*/
-+
-+/** @name Common CIL Functions
-+ * The following functions support managing the DWC_otg controller in either
-+ * device or host mode.
-+ */
-+/**@{*/
-+
-+extern void dwc_otg_read_packet(dwc_otg_core_if_t * core_if,
-+				uint8_t * dest, uint16_t bytes);
-+
-+extern void dwc_otg_flush_tx_fifo(dwc_otg_core_if_t * _core_if, const int _num);
-+extern void dwc_otg_flush_rx_fifo(dwc_otg_core_if_t * _core_if);
-+extern void dwc_otg_core_reset(dwc_otg_core_if_t * _core_if);
-+
-+/**
-+ * This function returns the Core Interrupt register.
-+ */
-+static inline uint32_t dwc_otg_read_core_intr(dwc_otg_core_if_t * core_if)
-+{
-+	return (DWC_READ_REG32(&core_if->core_global_regs->gintsts) &
-+		DWC_READ_REG32(&core_if->core_global_regs->gintmsk));
-+}
-+
-+/**
-+ * This function returns the OTG Interrupt register.
-+ */
-+static inline uint32_t dwc_otg_read_otg_intr(dwc_otg_core_if_t * core_if)
-+{
-+	return (DWC_READ_REG32(&core_if->core_global_regs->gotgint));
-+}
-+
-+/**
-+ * This function reads the Device All Endpoints Interrupt register and
-+ * returns the IN endpoint interrupt bits.
-+ */
-+static inline uint32_t dwc_otg_read_dev_all_in_ep_intr(dwc_otg_core_if_t *
-+						       core_if)
-+{
-+
-+	uint32_t v;
-+
-+	if (core_if->multiproc_int_enable) {
-+		v = DWC_READ_REG32(&core_if->dev_if->
-+				   dev_global_regs->deachint) &
-+		    DWC_READ_REG32(&core_if->
-+				   dev_if->dev_global_regs->deachintmsk);
-+	} else {
-+		v = DWC_READ_REG32(&core_if->dev_if->dev_global_regs->daint) &
-+		    DWC_READ_REG32(&core_if->dev_if->dev_global_regs->daintmsk);
-+	}
-+	return (v & 0xffff);
-+}
-+
-+/**
-+ * This function reads the Device All Endpoints Interrupt register and
-+ * returns the OUT endpoint interrupt bits.
-+ */
-+static inline uint32_t dwc_otg_read_dev_all_out_ep_intr(dwc_otg_core_if_t *
-+							core_if)
-+{
-+	uint32_t v;
-+
-+	if (core_if->multiproc_int_enable) {
-+		v = DWC_READ_REG32(&core_if->dev_if->
-+				   dev_global_regs->deachint) &
-+		    DWC_READ_REG32(&core_if->
-+				   dev_if->dev_global_regs->deachintmsk);
-+	} else {
-+		v = DWC_READ_REG32(&core_if->dev_if->dev_global_regs->daint) &
-+		    DWC_READ_REG32(&core_if->dev_if->dev_global_regs->daintmsk);
-+	}
-+
-+	return ((v & 0xffff0000) >> 16);
-+}
-+
-+/**
-+ * This function returns the Device IN EP Interrupt register
-+ */
-+static inline uint32_t dwc_otg_read_dev_in_ep_intr(dwc_otg_core_if_t * core_if,
-+						   dwc_ep_t * ep)
-+{
-+	dwc_otg_dev_if_t *dev_if = core_if->dev_if;
-+	uint32_t v, msk, emp;
-+
-+	if (core_if->multiproc_int_enable) {
-+		msk =
-+		    DWC_READ_REG32(&dev_if->
-+				   dev_global_regs->diepeachintmsk[ep->num]);
-+		emp =
-+		    DWC_READ_REG32(&dev_if->
-+				   dev_global_regs->dtknqr4_fifoemptymsk);
-+		msk |= ((emp >> ep->num) & 0x1) << 7;
-+		v = DWC_READ_REG32(&dev_if->in_ep_regs[ep->num]->diepint) & msk;
-+	} else {
-+		msk = DWC_READ_REG32(&dev_if->dev_global_regs->diepmsk);
-+		emp =
-+		    DWC_READ_REG32(&dev_if->
-+				   dev_global_regs->dtknqr4_fifoemptymsk);
-+		msk |= ((emp >> ep->num) & 0x1) << 7;
-+		v = DWC_READ_REG32(&dev_if->in_ep_regs[ep->num]->diepint) & msk;
-+	}
-+
-+	return v;
-+}
-+
-+/**
-+ * This function returns the Device OUT EP Interrupt register
-+ */
-+static inline uint32_t dwc_otg_read_dev_out_ep_intr(dwc_otg_core_if_t *
-+						    _core_if, dwc_ep_t * _ep)
-+{
-+	dwc_otg_dev_if_t *dev_if = _core_if->dev_if;
-+	uint32_t v;
-+	doepmsk_data_t msk = {.d32 = 0 };
-+
-+	if (_core_if->multiproc_int_enable) {
-+		msk.d32 =
-+		    DWC_READ_REG32(&dev_if->
-+				   dev_global_regs->doepeachintmsk[_ep->num]);
-+		if (_core_if->pti_enh_enable) {
-+			msk.b.pktdrpsts = 1;
-+		}
-+		v = DWC_READ_REG32(&dev_if->
-+				   out_ep_regs[_ep->num]->doepint) & msk.d32;
-+	} else {
-+		msk.d32 = DWC_READ_REG32(&dev_if->dev_global_regs->doepmsk);
-+		if (_core_if->pti_enh_enable) {
-+			msk.b.pktdrpsts = 1;
-+		}
-+		v = DWC_READ_REG32(&dev_if->
-+				   out_ep_regs[_ep->num]->doepint) & msk.d32;
-+	}
-+	return v;
-+}
-+
-+/**
-+ * This function returns the Host All Channel Interrupt register
-+ */
-+static inline uint32_t dwc_otg_read_host_all_channels_intr(dwc_otg_core_if_t *
-+							   _core_if)
-+{
-+	return (DWC_READ_REG32(&_core_if->host_if->host_global_regs->haint));
-+}
-+
-+static inline uint32_t dwc_otg_read_host_channel_intr(dwc_otg_core_if_t *
-+						      _core_if, dwc_hc_t * _hc)
-+{
-+	return (DWC_READ_REG32
-+		(&_core_if->host_if->hc_regs[_hc->hc_num]->hcint));
-+}
-+
-+/**
-+ * This function returns the mode of the operation, host or device.
-+ *
-+ * @return 0 - Device Mode, 1 - Host Mode
-+ */
-+static inline uint32_t dwc_otg_mode(dwc_otg_core_if_t * _core_if)
-+{
-+	return (DWC_READ_REG32(&_core_if->core_global_regs->gintsts) & 0x1);
-+}
-+
-+/**@}*/
-+
-+/**
-+ * DWC_otg CIL callback structure. This structure allows the HCD and
-+ * PCD to register functions used for starting and stopping the PCD
-+ * and HCD for role change on for a DRD.
-+ */
-+typedef struct dwc_otg_cil_callbacks {
-+	/** Start function for role change */
-+	int (*start) (void *_p);
-+	/** Stop Function for role change */
-+	int (*stop) (void *_p);
-+	/** Disconnect Function for role change */
-+	int (*disconnect) (void *_p);
-+	/** Resume/Remote wakeup Function */
-+	int (*resume_wakeup) (void *_p);
-+	/** Suspend function */
-+	int (*suspend) (void *_p);
-+	/** Session Start (SRP) */
-+	int (*session_start) (void *_p);
-+#ifdef CONFIG_USB_DWC_OTG_LPM
-+	/** Sleep (switch to L0 state) */
-+	int (*sleep) (void *_p);
-+#endif
-+	/** Pointer passed to start() and stop() */
-+	void *p;
-+} dwc_otg_cil_callbacks_t;
-+
-+extern void dwc_otg_cil_register_pcd_callbacks(dwc_otg_core_if_t * _core_if,
-+					       dwc_otg_cil_callbacks_t * _cb,
-+					       void *_p);
-+extern void dwc_otg_cil_register_hcd_callbacks(dwc_otg_core_if_t * _core_if,
-+					       dwc_otg_cil_callbacks_t * _cb,
-+					       void *_p);
-+
-+void dwc_otg_initiate_srp(dwc_otg_core_if_t * core_if);
-+
-+//////////////////////////////////////////////////////////////////////
-+/** Start the HCD.  Helper function for using the HCD callbacks.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ */
-+static inline void cil_hcd_start(dwc_otg_core_if_t * core_if)
-+{
-+	if (core_if->hcd_cb && core_if->hcd_cb->start) {
-+		core_if->hcd_cb->start(core_if->hcd_cb->p);
-+	}
-+}
-+
-+/** Stop the HCD.  Helper function for using the HCD callbacks.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ */
-+static inline void cil_hcd_stop(dwc_otg_core_if_t * core_if)
-+{
-+	if (core_if->hcd_cb && core_if->hcd_cb->stop) {
-+		core_if->hcd_cb->stop(core_if->hcd_cb->p);
-+	}
-+}
-+
-+/** Disconnect the HCD.  Helper function for using the HCD callbacks.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ */
-+static inline void cil_hcd_disconnect(dwc_otg_core_if_t * core_if)
-+{
-+	if (core_if->hcd_cb && core_if->hcd_cb->disconnect) {
-+		core_if->hcd_cb->disconnect(core_if->hcd_cb->p);
-+	}
-+}
-+
-+/** Inform the HCD the a New Session has begun.  Helper function for
-+ * using the HCD callbacks.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ */
-+static inline void cil_hcd_session_start(dwc_otg_core_if_t * core_if)
-+{
-+	if (core_if->hcd_cb && core_if->hcd_cb->session_start) {
-+		core_if->hcd_cb->session_start(core_if->hcd_cb->p);
-+	}
-+}
-+
-+#ifdef CONFIG_USB_DWC_OTG_LPM
-+/**
-+ * Inform the HCD about LPM sleep.
-+ * Helper function for using the HCD callbacks.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ */
-+static inline void cil_hcd_sleep(dwc_otg_core_if_t * core_if)
-+{
-+	if (core_if->hcd_cb && core_if->hcd_cb->sleep) {
-+		core_if->hcd_cb->sleep(core_if->hcd_cb->p);
-+	}
-+}
-+#endif
-+
-+/** Resume the HCD.  Helper function for using the HCD callbacks.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ */
-+static inline void cil_hcd_resume(dwc_otg_core_if_t * core_if)
-+{
-+	if (core_if->hcd_cb && core_if->hcd_cb->resume_wakeup) {
-+		core_if->hcd_cb->resume_wakeup(core_if->hcd_cb->p);
-+	}
-+}
-+
-+/** Start the PCD.  Helper function for using the PCD callbacks.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ */
-+static inline void cil_pcd_start(dwc_otg_core_if_t * core_if)
-+{
-+	if (core_if->pcd_cb && core_if->pcd_cb->start) {
-+		core_if->pcd_cb->start(core_if->pcd_cb->p);
-+	}
-+}
-+
-+/** Stop the PCD.  Helper function for using the PCD callbacks.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ */
-+static inline void cil_pcd_stop(dwc_otg_core_if_t * core_if)
-+{
-+	if (core_if->pcd_cb && core_if->pcd_cb->stop) {
-+		core_if->pcd_cb->stop(core_if->pcd_cb->p);
-+	}
-+}
-+
-+/** Suspend the PCD.  Helper function for using the PCD callbacks.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ */
-+static inline void cil_pcd_suspend(dwc_otg_core_if_t * core_if)
-+{
-+	if (core_if->pcd_cb && core_if->pcd_cb->suspend) {
-+		core_if->pcd_cb->suspend(core_if->pcd_cb->p);
-+	}
-+}
-+
-+/** Resume the PCD.  Helper function for using the PCD callbacks.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ */
-+static inline void cil_pcd_resume(dwc_otg_core_if_t * core_if)
-+{
-+	if (core_if->pcd_cb && core_if->pcd_cb->resume_wakeup) {
-+		core_if->pcd_cb->resume_wakeup(core_if->pcd_cb->p);
-+	}
-+}
-+
-+//////////////////////////////////////////////////////////////////////
-+
-+#endif
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c
-@@ -0,0 +1,1601 @@
-+/* ==========================================================================
-+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil_intr.c $
-+ * $Revision: #32 $
-+ * $Date: 2012/08/10 $
-+ * $Change: 2047372 $
-+ *
-+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
-+ * "Software") is an Unsupported proprietary work of Synopsys, Inc. unless
-+ * otherwise expressly agreed to in writing between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product under
-+ * any End User Software License Agreement or Agreement for Licensed Product
-+ * with Synopsys or any supplement thereto. You are permitted to use and
-+ * redistribute this Software in source and binary forms, with or without
-+ * modification, provided that redistributions of source code must retain this
-+ * notice. You may not view, use, disclose, copy or distribute this file or
-+ * any information contained herein except pursuant to this license grant from
-+ * Synopsys. If you do not agree with this notice, including the disclaimer
-+ * below, then you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" BASIS
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS BE LIABLE FOR ANY DIRECT,
-+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================== */
-+
-+/** @file
-+ *
-+ * The Core Interface Layer provides basic services for accessing and
-+ * managing the DWC_otg hardware. These services are used by both the
-+ * Host Controller Driver and the Peripheral Controller Driver.
-+ *
-+ * This file contains the Common Interrupt handlers.
-+ */
-+#include "dwc_os.h"
-+#include "dwc_otg_regs.h"
-+#include "dwc_otg_cil.h"
-+#include "dwc_otg_driver.h"
-+#include "dwc_otg_pcd.h"
-+#include "dwc_otg_hcd.h"
-+
-+#ifdef DEBUG
-+inline const char *op_state_str(dwc_otg_core_if_t * core_if)
-+{
-+	return (core_if->op_state == A_HOST ? "a_host" :
-+		(core_if->op_state == A_SUSPEND ? "a_suspend" :
-+		 (core_if->op_state == A_PERIPHERAL ? "a_peripheral" :
-+		  (core_if->op_state == B_PERIPHERAL ? "b_peripheral" :
-+		   (core_if->op_state == B_HOST ? "b_host" : "unknown")))));
-+}
-+#endif
-+
-+/** This function will log a debug message
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ */
-+int32_t dwc_otg_handle_mode_mismatch_intr(dwc_otg_core_if_t * core_if)
-+{
-+	gintsts_data_t gintsts;
-+	DWC_WARN("Mode Mismatch Interrupt: currently in %s mode\n",
-+		 dwc_otg_mode(core_if) ? "Host" : "Device");
-+
-+	/* Clear interrupt */
-+	gintsts.d32 = 0;
-+	gintsts.b.modemismatch = 1;
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gintsts, gintsts.d32);
-+	return 1;
-+}
-+
-+/**
-+ * This function handles the OTG Interrupts. It reads the OTG
-+ * Interrupt Register (GOTGINT) to determine what interrupt has
-+ * occurred.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ */
-+int32_t dwc_otg_handle_otg_intr(dwc_otg_core_if_t * core_if)
-+{
-+	dwc_otg_core_global_regs_t *global_regs = core_if->core_global_regs;
-+	gotgint_data_t gotgint;
-+	gotgctl_data_t gotgctl;
-+	gintmsk_data_t gintmsk;
-+	gpwrdn_data_t gpwrdn;
-+
-+	gotgint.d32 = DWC_READ_REG32(&global_regs->gotgint);
-+	gotgctl.d32 = DWC_READ_REG32(&global_regs->gotgctl);
-+	DWC_DEBUGPL(DBG_CIL, "++OTG Interrupt gotgint=%0x [%s]\n", gotgint.d32,
-+		    op_state_str(core_if));
-+
-+	if (gotgint.b.sesenddet) {
-+		DWC_DEBUGPL(DBG_ANY, " ++OTG Interrupt: "
-+			    "Session End Detected++ (%s)\n",
-+			    op_state_str(core_if));
-+		gotgctl.d32 = DWC_READ_REG32(&global_regs->gotgctl);
-+
-+		if (core_if->op_state == B_HOST) {
-+			cil_pcd_start(core_if);
-+			core_if->op_state = B_PERIPHERAL;
-+		} else {
-+			/* If not B_HOST and Device HNP still set. HNP
-+			 * Did not succeed!*/
-+			if (gotgctl.b.devhnpen) {
-+				DWC_DEBUGPL(DBG_ANY, "Session End Detected\n");
-+				__DWC_ERROR("Device Not Connected/Responding!\n");
-+			}
-+
-+			/* If Session End Detected the B-Cable has
-+			 * been disconnected. */
-+			/* Reset PCD and Gadget driver to a
-+			 * clean state. */
-+			core_if->lx_state = DWC_OTG_L0;
-+			DWC_SPINUNLOCK(core_if->lock);
-+			cil_pcd_stop(core_if);
-+			DWC_SPINLOCK(core_if->lock);
-+
-+			if (core_if->adp_enable) {
-+				if (core_if->power_down == 2) {
-+					gpwrdn.d32 = 0;
-+					gpwrdn.b.pwrdnswtch = 1;
-+					DWC_MODIFY_REG32(&core_if->
-+							 core_global_regs->
-+							 gpwrdn, gpwrdn.d32, 0);
-+				}
-+
-+				gpwrdn.d32 = 0;
-+				gpwrdn.b.pmuintsel = 1;
-+				gpwrdn.b.pmuactv = 1;
-+				DWC_MODIFY_REG32(&core_if->core_global_regs->
-+						 gpwrdn, 0, gpwrdn.d32);
-+
-+				dwc_otg_adp_sense_start(core_if);
-+			}
-+		}
-+
-+		gotgctl.d32 = 0;
-+		gotgctl.b.devhnpen = 1;
-+		DWC_MODIFY_REG32(&global_regs->gotgctl, gotgctl.d32, 0);
-+	}
-+	if (gotgint.b.sesreqsucstschng) {
-+		DWC_DEBUGPL(DBG_ANY, " ++OTG Interrupt: "
-+			    "Session Reqeust Success Status Change++\n");
-+		gotgctl.d32 = DWC_READ_REG32(&global_regs->gotgctl);
-+		if (gotgctl.b.sesreqscs) {
-+
-+			if ((core_if->core_params->phy_type ==
-+			     DWC_PHY_TYPE_PARAM_FS) && (core_if->core_params->i2c_enable)) {
-+				core_if->srp_success = 1;
-+			} else {
-+				DWC_SPINUNLOCK(core_if->lock);
-+				cil_pcd_resume(core_if);
-+				DWC_SPINLOCK(core_if->lock);
-+				/* Clear Session Request */
-+				gotgctl.d32 = 0;
-+				gotgctl.b.sesreq = 1;
-+				DWC_MODIFY_REG32(&global_regs->gotgctl,
-+						 gotgctl.d32, 0);
-+			}
-+		}
-+	}
-+	if (gotgint.b.hstnegsucstschng) {
-+		/* Print statements during the HNP interrupt handling
-+		 * can cause it to fail.*/
-+		gotgctl.d32 = DWC_READ_REG32(&global_regs->gotgctl);
-+		/* WA for 3.00a- HW is not setting cur_mode, even sometimes
-+		 * this does not help*/
-+		if (core_if->snpsid >= OTG_CORE_REV_3_00a)
-+			dwc_udelay(100);
-+		if (gotgctl.b.hstnegscs) {
-+			if (dwc_otg_is_host_mode(core_if)) {
-+				core_if->op_state = B_HOST;
-+				/*
-+				 * Need to disable SOF interrupt immediately.
-+				 * When switching from device to host, the PCD
-+				 * interrupt handler won't handle the
-+				 * interrupt if host mode is already set. The
-+				 * HCD interrupt handler won't get called if
-+				 * the HCD state is HALT. This means that the
-+				 * interrupt does not get handled and Linux
-+				 * complains loudly.
-+				 */
-+				gintmsk.d32 = 0;
-+				gintmsk.b.sofintr = 1;
-+				DWC_MODIFY_REG32(&global_regs->gintmsk,
-+						 gintmsk.d32, 0);
-+				/* Call callback function with spin lock released */
-+				DWC_SPINUNLOCK(core_if->lock);
-+				cil_pcd_stop(core_if);
-+				/*
-+				 * Initialize the Core for Host mode.
-+				 */
-+				cil_hcd_start(core_if);
-+				DWC_SPINLOCK(core_if->lock);
-+				core_if->op_state = B_HOST;
-+			}
-+		} else {
-+			gotgctl.d32 = 0;
-+			gotgctl.b.hnpreq = 1;
-+			gotgctl.b.devhnpen = 1;
-+			DWC_MODIFY_REG32(&global_regs->gotgctl, gotgctl.d32, 0);
-+			DWC_DEBUGPL(DBG_ANY, "HNP Failed\n");
-+			__DWC_ERROR("Device Not Connected/Responding\n");
-+		}
-+	}
-+	if (gotgint.b.hstnegdet) {
-+		/* The disconnect interrupt is set at the same time as
-+		 * Host Negotiation Detected.  During the mode
-+		 * switch all interrupts are cleared so the disconnect
-+		 * interrupt handler will not get executed.
-+		 */
-+		DWC_DEBUGPL(DBG_ANY, " ++OTG Interrupt: "
-+			    "Host Negotiation Detected++ (%s)\n",
-+			    (dwc_otg_is_host_mode(core_if) ? "Host" :
-+			     "Device"));
-+		if (dwc_otg_is_device_mode(core_if)) {
-+			DWC_DEBUGPL(DBG_ANY, "a_suspend->a_peripheral (%d)\n",
-+				    core_if->op_state);
-+			DWC_SPINUNLOCK(core_if->lock);
-+			cil_hcd_disconnect(core_if);
-+			cil_pcd_start(core_if);
-+			DWC_SPINLOCK(core_if->lock);
-+			core_if->op_state = A_PERIPHERAL;
-+		} else {
-+			/*
-+			 * Need to disable SOF interrupt immediately. When
-+			 * switching from device to host, the PCD interrupt
-+			 * handler won't handle the interrupt if host mode is
-+			 * already set. The HCD interrupt handler won't get
-+			 * called if the HCD state is HALT. This means that
-+			 * the interrupt does not get handled and Linux
-+			 * complains loudly.
-+			 */
-+			gintmsk.d32 = 0;
-+			gintmsk.b.sofintr = 1;
-+			DWC_MODIFY_REG32(&global_regs->gintmsk, gintmsk.d32, 0);
-+			DWC_SPINUNLOCK(core_if->lock);
-+			cil_pcd_stop(core_if);
-+			cil_hcd_start(core_if);
-+			DWC_SPINLOCK(core_if->lock);
-+			core_if->op_state = A_HOST;
-+		}
-+	}
-+	if (gotgint.b.adevtoutchng) {
-+		DWC_DEBUGPL(DBG_ANY, " ++OTG Interrupt: "
-+			    "A-Device Timeout Change++\n");
-+	}
-+	if (gotgint.b.debdone) {
-+		DWC_DEBUGPL(DBG_ANY, " ++OTG Interrupt: " "Debounce Done++\n");
-+	}
-+
-+	/* Clear GOTGINT */
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gotgint, gotgint.d32);
-+
-+	return 1;
-+}
-+
-+void w_conn_id_status_change(void *p)
-+{
-+	dwc_otg_core_if_t *core_if = p;
-+	uint32_t count = 0;
-+	gotgctl_data_t gotgctl = {.d32 = 0 };
-+
-+	gotgctl.d32 = DWC_READ_REG32(&core_if->core_global_regs->gotgctl);
-+	DWC_DEBUGPL(DBG_CIL, "gotgctl=%0x\n", gotgctl.d32);
-+	DWC_DEBUGPL(DBG_CIL, "gotgctl.b.conidsts=%d\n", gotgctl.b.conidsts);
-+
-+	/* B-Device connector (Device Mode) */
-+	if (gotgctl.b.conidsts) {
-+		/* Wait for switch to device mode. */
-+		while (!dwc_otg_is_device_mode(core_if)) {
-+			DWC_PRINTF("Waiting for Peripheral Mode, Mode=%s\n",
-+				   (dwc_otg_is_host_mode(core_if) ? "Host" :
-+				    "Peripheral"));
-+			dwc_mdelay(100);
-+			if (++count > 10000)
-+				break;
-+		}
-+		DWC_ASSERT(++count < 10000,
-+			   "Connection id status change timed out");
-+		core_if->op_state = B_PERIPHERAL;
-+		dwc_otg_core_init(core_if);
-+		dwc_otg_enable_global_interrupts(core_if);
-+		cil_pcd_start(core_if);
-+	} else {
-+		/* A-Device connector (Host Mode) */
-+		while (!dwc_otg_is_host_mode(core_if)) {
-+			DWC_PRINTF("Waiting for Host Mode, Mode=%s\n",
-+				   (dwc_otg_is_host_mode(core_if) ? "Host" :
-+				    "Peripheral"));
-+			dwc_mdelay(100);
-+			if (++count > 10000)
-+				break;
-+		}
-+		DWC_ASSERT(++count < 10000,
-+			   "Connection id status change timed out");
-+		core_if->op_state = A_HOST;
-+		/*
-+		 * Initialize the Core for Host mode.
-+		 */
-+		dwc_otg_core_init(core_if);
-+		dwc_otg_enable_global_interrupts(core_if);
-+		cil_hcd_start(core_if);
-+	}
-+}
-+
-+/**
-+ * This function handles the Connector ID Status Change Interrupt.  It
-+ * reads the OTG Interrupt Register (GOTCTL) to determine whether this
-+ * is a Device to Host Mode transition or a Host Mode to Device
-+ * Transition.
-+ *
-+ * This only occurs when the cable is connected/removed from the PHY
-+ * connector.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ */
-+int32_t dwc_otg_handle_conn_id_status_change_intr(dwc_otg_core_if_t * core_if)
-+{
-+
-+	/*
-+	 * Need to disable SOF interrupt immediately. If switching from device
-+	 * to host, the PCD interrupt handler won't handle the interrupt if
-+	 * host mode is already set. The HCD interrupt handler won't get
-+	 * called if the HCD state is HALT. This means that the interrupt does
-+	 * not get handled and Linux complains loudly.
-+	 */
-+	gintmsk_data_t gintmsk = {.d32 = 0 };
-+	gintsts_data_t gintsts = {.d32 = 0 };
-+
-+	gintmsk.b.sofintr = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gintmsk, gintmsk.d32, 0);
-+
-+	DWC_DEBUGPL(DBG_CIL,
-+		    " ++Connector ID Status Change Interrupt++  (%s)\n",
-+		    (dwc_otg_is_host_mode(core_if) ? "Host" : "Device"));
-+
-+	DWC_SPINUNLOCK(core_if->lock);
-+
-+	/*
-+	 * Need to schedule a work, as there are possible DELAY function calls
-+	 * Release lock before scheduling workq as it holds spinlock during scheduling
-+	 */
-+
-+	DWC_WORKQ_SCHEDULE(core_if->wq_otg, w_conn_id_status_change,
-+			   core_if, "connection id status change");
-+	DWC_SPINLOCK(core_if->lock);
-+
-+	/* Set flag and clear interrupt */
-+	gintsts.b.conidstschng = 1;
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gintsts, gintsts.d32);
-+
-+	return 1;
-+}
-+
-+/**
-+ * This interrupt indicates that a device is initiating the Session
-+ * Request Protocol to request the host to turn on bus power so a new
-+ * session can begin. The handler responds by turning on bus power. If
-+ * the DWC_otg controller is in low power mode, the handler brings the
-+ * controller out of low power mode before turning on bus power.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ */
-+int32_t dwc_otg_handle_session_req_intr(dwc_otg_core_if_t * core_if)
-+{
-+	gintsts_data_t gintsts;
-+
-+#ifndef DWC_HOST_ONLY
-+	DWC_DEBUGPL(DBG_ANY, "++Session Request Interrupt++\n");
-+
-+	if (dwc_otg_is_device_mode(core_if)) {
-+		DWC_PRINTF("SRP: Device mode\n");
-+	} else {
-+		hprt0_data_t hprt0;
-+		DWC_PRINTF("SRP: Host mode\n");
-+
-+		/* Turn on the port power bit. */
-+		hprt0.d32 = dwc_otg_read_hprt0(core_if);
-+		hprt0.b.prtpwr = 1;
-+		DWC_WRITE_REG32(core_if->host_if->hprt0, hprt0.d32);
-+
-+		/* Start the Connection timer. So a message can be displayed
-+		 * if connect does not occur within 10 seconds. */
-+		cil_hcd_session_start(core_if);
-+	}
-+#endif
-+
-+	/* Clear interrupt */
-+	gintsts.d32 = 0;
-+	gintsts.b.sessreqintr = 1;
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gintsts, gintsts.d32);
-+
-+	return 1;
-+}
-+
-+void w_wakeup_detected(void *p)
-+{
-+	dwc_otg_core_if_t *core_if = (dwc_otg_core_if_t *) p;
-+	/*
-+	 * Clear the Resume after 70ms. (Need 20 ms minimum. Use 70 ms
-+	 * so that OPT tests pass with all PHYs).
-+	 */
-+	hprt0_data_t hprt0 = {.d32 = 0 };
-+#if 0
-+	pcgcctl_data_t pcgcctl = {.d32 = 0 };
-+	/* Restart the Phy Clock */
-+	pcgcctl.b.stoppclk = 1;
-+	DWC_MODIFY_REG32(core_if->pcgcctl, pcgcctl.d32, 0);
-+	dwc_udelay(10);
-+#endif //0
-+	hprt0.d32 = dwc_otg_read_hprt0(core_if);
-+	DWC_DEBUGPL(DBG_ANY, "Resume: HPRT0=%0x\n", hprt0.d32);
-+//      dwc_mdelay(70);
-+	hprt0.b.prtres = 0;	/* Resume */
-+	DWC_WRITE_REG32(core_if->host_if->hprt0, hprt0.d32);
-+	DWC_DEBUGPL(DBG_ANY, "Clear Resume: HPRT0=%0x\n",
-+		    DWC_READ_REG32(core_if->host_if->hprt0));
-+
-+	cil_hcd_resume(core_if);
-+
-+	/** Change to L0 state*/
-+	core_if->lx_state = DWC_OTG_L0;
-+}
-+
-+/**
-+ * This interrupt indicates that the DWC_otg controller has detected a
-+ * resume or remote wakeup sequence. If the DWC_otg controller is in
-+ * low power mode, the handler must brings the controller out of low
-+ * power mode. The controller automatically begins resume
-+ * signaling. The handler schedules a time to stop resume signaling.
-+ */
-+int32_t dwc_otg_handle_wakeup_detected_intr(dwc_otg_core_if_t * core_if)
-+{
-+	gintsts_data_t gintsts;
-+
-+	DWC_DEBUGPL(DBG_ANY,
-+		    "++Resume and Remote Wakeup Detected Interrupt++\n");
-+
-+	DWC_PRINTF("%s lxstate = %d\n", __func__, core_if->lx_state);
-+
-+	if (dwc_otg_is_device_mode(core_if)) {
-+		dctl_data_t dctl = {.d32 = 0 };
-+		DWC_DEBUGPL(DBG_PCD, "DSTS=0x%0x\n",
-+			    DWC_READ_REG32(&core_if->dev_if->dev_global_regs->
-+					   dsts));
-+		if (core_if->lx_state == DWC_OTG_L2) {
-+#ifdef PARTIAL_POWER_DOWN
-+			if (core_if->hwcfg4.b.power_optimiz) {
-+				pcgcctl_data_t power = {.d32 = 0 };
-+
-+				power.d32 = DWC_READ_REG32(core_if->pcgcctl);
-+				DWC_DEBUGPL(DBG_CIL, "PCGCCTL=%0x\n",
-+					    power.d32);
-+
-+				power.b.stoppclk = 0;
-+				DWC_WRITE_REG32(core_if->pcgcctl, power.d32);
-+
-+				power.b.pwrclmp = 0;
-+				DWC_WRITE_REG32(core_if->pcgcctl, power.d32);
-+
-+				power.b.rstpdwnmodule = 0;
-+				DWC_WRITE_REG32(core_if->pcgcctl, power.d32);
-+			}
-+#endif
-+			/* Clear the Remote Wakeup Signaling */
-+			dctl.b.rmtwkupsig = 1;
-+			DWC_MODIFY_REG32(&core_if->dev_if->dev_global_regs->
-+					 dctl, dctl.d32, 0);
-+
-+			DWC_SPINUNLOCK(core_if->lock);
-+			if (core_if->pcd_cb && core_if->pcd_cb->resume_wakeup) {
-+				core_if->pcd_cb->resume_wakeup(core_if->pcd_cb->p);
-+			}
-+			DWC_SPINLOCK(core_if->lock);
-+		} else {
-+			glpmcfg_data_t lpmcfg;
-+			lpmcfg.d32 =
-+			    DWC_READ_REG32(&core_if->core_global_regs->glpmcfg);
-+			lpmcfg.b.hird_thres &= (~(1 << 4));
-+			DWC_WRITE_REG32(&core_if->core_global_regs->glpmcfg,
-+					lpmcfg.d32);
-+		}
-+		/** Change to L0 state*/
-+		core_if->lx_state = DWC_OTG_L0;
-+	} else {
-+		if (core_if->lx_state != DWC_OTG_L1) {
-+			pcgcctl_data_t pcgcctl = {.d32 = 0 };
-+
-+			/* Restart the Phy Clock */
-+			pcgcctl.b.stoppclk = 1;
-+			DWC_MODIFY_REG32(core_if->pcgcctl, pcgcctl.d32, 0);
-+			DWC_TIMER_SCHEDULE(core_if->wkp_timer, 71);
-+		} else {
-+			/** Change to L0 state*/
-+			core_if->lx_state = DWC_OTG_L0;
-+		}
-+	}
-+
-+	/* Clear interrupt */
-+	gintsts.d32 = 0;
-+	gintsts.b.wkupintr = 1;
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gintsts, gintsts.d32);
-+
-+	return 1;
-+}
-+
-+/**
-+ * This interrupt indicates that the Wakeup Logic has detected a
-+ * Device disconnect.
-+ */
-+static int32_t dwc_otg_handle_pwrdn_disconnect_intr(dwc_otg_core_if_t *core_if)
-+{
-+	gpwrdn_data_t gpwrdn = { .d32 = 0 };
-+	gpwrdn_data_t gpwrdn_temp = { .d32 = 0 };
-+	gpwrdn_temp.d32 = DWC_READ_REG32(&core_if->core_global_regs->gpwrdn);
-+
-+	DWC_PRINTF("%s called\n", __FUNCTION__);
-+
-+	if (!core_if->hibernation_suspend) {
-+		DWC_PRINTF("Already exited from Hibernation\n");
-+		return 1;
-+	}
-+
-+	/* Switch on the voltage to the core */
-+	gpwrdn.b.pwrdnswtch = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+	dwc_udelay(10);
-+
-+	/* Reset the core */
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.pwrdnrstn = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+	dwc_udelay(10);
-+
-+	/* Disable power clamps*/
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.pwrdnclmp = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+
-+	/* Remove reset the core signal */
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.pwrdnrstn = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, 0, gpwrdn.d32);
-+	dwc_udelay(10);
-+
-+	/* Disable PMU interrupt */
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.pmuintsel = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+
-+	core_if->hibernation_suspend = 0;
-+
-+	/* Disable PMU */
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.pmuactv = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+	dwc_udelay(10);
-+
-+	if (gpwrdn_temp.b.idsts) {
-+		core_if->op_state = B_PERIPHERAL;
-+		dwc_otg_core_init(core_if);
-+		dwc_otg_enable_global_interrupts(core_if);
-+		cil_pcd_start(core_if);
-+	} else {
-+		core_if->op_state = A_HOST;
-+		dwc_otg_core_init(core_if);
-+		dwc_otg_enable_global_interrupts(core_if);
-+		cil_hcd_start(core_if);
-+	}
-+
-+	return 1;
-+}
-+
-+/**
-+ * This interrupt indicates that the Wakeup Logic has detected a
-+ * remote wakeup sequence.
-+ */
-+static int32_t dwc_otg_handle_pwrdn_wakeup_detected_intr(dwc_otg_core_if_t * core_if)
-+{
-+	gpwrdn_data_t gpwrdn = {.d32 = 0 };
-+	DWC_DEBUGPL(DBG_ANY,
-+		    "++Powerdown Remote Wakeup Detected Interrupt++\n");
-+
-+	if (!core_if->hibernation_suspend) {
-+		DWC_PRINTF("Already exited from Hibernation\n");
-+		return 1;
-+	}
-+
-+	gpwrdn.d32 = DWC_READ_REG32(&core_if->core_global_regs->gpwrdn);
-+	if (gpwrdn.b.idsts) {	// Device Mode
-+		if ((core_if->power_down == 2)
-+		    && (core_if->hibernation_suspend == 1)) {
-+			dwc_otg_device_hibernation_restore(core_if, 0, 0);
-+		}
-+	} else {
-+		if ((core_if->power_down == 2)
-+		    && (core_if->hibernation_suspend == 1)) {
-+			dwc_otg_host_hibernation_restore(core_if, 1, 0);
-+		}
-+	}
-+	return 1;
-+}
-+
-+static int32_t dwc_otg_handle_pwrdn_idsts_change(dwc_otg_device_t *otg_dev)
-+{
-+	gpwrdn_data_t gpwrdn = {.d32 = 0 };
-+	gpwrdn_data_t gpwrdn_temp = {.d32 = 0 };
-+	dwc_otg_core_if_t *core_if = otg_dev->core_if;
-+
-+	DWC_DEBUGPL(DBG_ANY, "%s called\n", __FUNCTION__);
-+	gpwrdn_temp.d32 = DWC_READ_REG32(&core_if->core_global_regs->gpwrdn);
-+	if (core_if->power_down == 2) {
-+		if (!core_if->hibernation_suspend) {
-+			DWC_PRINTF("Already exited from Hibernation\n");
-+			return 1;
-+		}
-+		DWC_DEBUGPL(DBG_ANY, "Exit from hibernation on ID sts change\n");
-+		/* Switch on the voltage to the core */
-+		gpwrdn.b.pwrdnswtch = 1;
-+		DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+		dwc_udelay(10);
-+
-+		/* Reset the core */
-+		gpwrdn.d32 = 0;
-+		gpwrdn.b.pwrdnrstn = 1;
-+		DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+		dwc_udelay(10);
-+
-+		/* Disable power clamps */
-+		gpwrdn.d32 = 0;
-+		gpwrdn.b.pwrdnclmp = 1;
-+		DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+
-+		/* Remove reset the core signal */
-+		gpwrdn.d32 = 0;
-+		gpwrdn.b.pwrdnrstn = 1;
-+		DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, 0, gpwrdn.d32);
-+		dwc_udelay(10);
-+
-+		/* Disable PMU interrupt */
-+		gpwrdn.d32 = 0;
-+		gpwrdn.b.pmuintsel = 1;
-+		DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+
-+		/*Indicates that we are exiting from hibernation */
-+		core_if->hibernation_suspend = 0;
-+
-+		/* Disable PMU */
-+		gpwrdn.d32 = 0;
-+		gpwrdn.b.pmuactv = 1;
-+		DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+		dwc_udelay(10);
-+
-+		gpwrdn.d32 = core_if->gr_backup->gpwrdn_local;
-+		if (gpwrdn.b.dis_vbus == 1) {
-+			gpwrdn.d32 = 0;
-+			gpwrdn.b.dis_vbus = 1;
-+			DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+		}
-+
-+		if (gpwrdn_temp.b.idsts) {
-+			core_if->op_state = B_PERIPHERAL;
-+			dwc_otg_core_init(core_if);
-+			dwc_otg_enable_global_interrupts(core_if);
-+			cil_pcd_start(core_if);
-+		} else {
-+			core_if->op_state = A_HOST;
-+			dwc_otg_core_init(core_if);
-+			dwc_otg_enable_global_interrupts(core_if);
-+			cil_hcd_start(core_if);
-+		}
-+	}
-+
-+	if (core_if->adp_enable) {
-+		uint8_t is_host = 0;
-+		DWC_SPINUNLOCK(core_if->lock);
-+		/* Change the core_if's lock to hcd/pcd lock depend on mode? */
-+#ifndef DWC_HOST_ONLY
-+		if (gpwrdn_temp.b.idsts)
-+			core_if->lock = otg_dev->pcd->lock;
-+#endif
-+#ifndef DWC_DEVICE_ONLY
-+		if (!gpwrdn_temp.b.idsts) {
-+				core_if->lock = otg_dev->hcd->lock;
-+				is_host = 1;
-+		}
-+#endif
-+		DWC_PRINTF("RESTART ADP\n");
-+		if (core_if->adp.probe_enabled)
-+			dwc_otg_adp_probe_stop(core_if);
-+		if (core_if->adp.sense_enabled)
-+			dwc_otg_adp_sense_stop(core_if);
-+		if (core_if->adp.sense_timer_started)
-+			DWC_TIMER_CANCEL(core_if->adp.sense_timer);
-+		if (core_if->adp.vbuson_timer_started)
-+			DWC_TIMER_CANCEL(core_if->adp.vbuson_timer);
-+		core_if->adp.probe_timer_values[0] = -1;
-+		core_if->adp.probe_timer_values[1] = -1;
-+		core_if->adp.sense_timer_started = 0;
-+		core_if->adp.vbuson_timer_started = 0;
-+		core_if->adp.probe_counter = 0;
-+		core_if->adp.gpwrdn = 0;
-+
-+		/* Disable PMU and restart ADP */
-+		gpwrdn_temp.d32 = 0;
-+		gpwrdn_temp.b.pmuactv = 1;
-+		gpwrdn_temp.b.pmuintsel = 1;
-+		DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+		DWC_PRINTF("Check point 1\n");
-+		dwc_mdelay(110);
-+		dwc_otg_adp_start(core_if, is_host);
-+		DWC_SPINLOCK(core_if->lock);
-+	}
-+
-+
-+	return 1;
-+}
-+
-+static int32_t dwc_otg_handle_pwrdn_session_change(dwc_otg_core_if_t * core_if)
-+{
-+	gpwrdn_data_t gpwrdn = {.d32 = 0 };
-+	int32_t otg_cap_param = core_if->core_params->otg_cap;
-+	DWC_DEBUGPL(DBG_ANY, "%s called\n", __FUNCTION__);
-+
-+	gpwrdn.d32 = DWC_READ_REG32(&core_if->core_global_regs->gpwrdn);
-+	if (core_if->power_down == 2) {
-+		if (!core_if->hibernation_suspend) {
-+			DWC_PRINTF("Already exited from Hibernation\n");
-+			return 1;
-+		}
-+
-+		if ((otg_cap_param != DWC_OTG_CAP_PARAM_HNP_SRP_CAPABLE ||
-+			 otg_cap_param != DWC_OTG_CAP_PARAM_SRP_ONLY_CAPABLE) &&
-+			gpwrdn.b.bsessvld == 0) {
-+			/* Save gpwrdn register for further usage if stschng interrupt */
-+			core_if->gr_backup->gpwrdn_local =
-+				DWC_READ_REG32(&core_if->core_global_regs->gpwrdn);
-+			/*Exit from ISR and wait for stschng interrupt with bsessvld = 1 */
-+			return 1;
-+		}
-+
-+		/* Switch on the voltage to the core */
-+		gpwrdn.d32 = 0;
-+		gpwrdn.b.pwrdnswtch = 1;
-+		DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+		dwc_udelay(10);
-+
-+		/* Reset the core */
-+		gpwrdn.d32 = 0;
-+		gpwrdn.b.pwrdnrstn = 1;
-+		DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+		dwc_udelay(10);
-+
-+		/* Disable power clamps */
-+		gpwrdn.d32 = 0;
-+		gpwrdn.b.pwrdnclmp = 1;
-+		DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+
-+		/* Remove reset the core signal */
-+		gpwrdn.d32 = 0;
-+		gpwrdn.b.pwrdnrstn = 1;
-+		DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, 0, gpwrdn.d32);
-+		dwc_udelay(10);
-+
-+		/* Disable PMU interrupt */
-+		gpwrdn.d32 = 0;
-+		gpwrdn.b.pmuintsel = 1;
-+		DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+		dwc_udelay(10);
-+
-+		/*Indicates that we are exiting from hibernation */
-+		core_if->hibernation_suspend = 0;
-+
-+		/* Disable PMU */
-+		gpwrdn.d32 = 0;
-+		gpwrdn.b.pmuactv = 1;
-+		DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+		dwc_udelay(10);
-+
-+		core_if->op_state = B_PERIPHERAL;
-+		dwc_otg_core_init(core_if);
-+		dwc_otg_enable_global_interrupts(core_if);
-+		cil_pcd_start(core_if);
-+
-+		if (otg_cap_param == DWC_OTG_CAP_PARAM_HNP_SRP_CAPABLE ||
-+			otg_cap_param == DWC_OTG_CAP_PARAM_SRP_ONLY_CAPABLE) {
-+			/*
-+			 * Initiate SRP after initial ADP probe.
-+			 */
-+			dwc_otg_initiate_srp(core_if);
-+		}
-+	}
-+
-+	return 1;
-+}
-+/**
-+ * This interrupt indicates that the Wakeup Logic has detected a
-+ * status change either on IDDIG or BSessVld.
-+ */
-+static uint32_t dwc_otg_handle_pwrdn_stschng_intr(dwc_otg_device_t *otg_dev)
-+{
-+	uint32_t retval = 0;
-+	gpwrdn_data_t gpwrdn = {.d32 = 0 };
-+	gpwrdn_data_t gpwrdn_temp = {.d32 = 0 };
-+	dwc_otg_core_if_t *core_if = otg_dev->core_if;
-+
-+	DWC_PRINTF("%s called\n", __FUNCTION__);
-+
-+	if (core_if->power_down == 2) {
-+		if (core_if->hibernation_suspend <= 0) {
-+			DWC_PRINTF("Already exited from Hibernation\n");
-+			return 1;
-+		} else
-+			gpwrdn_temp.d32 = core_if->gr_backup->gpwrdn_local;
-+
-+	} else {
-+		gpwrdn_temp.d32 = core_if->adp.gpwrdn;
-+	}
-+
-+	gpwrdn.d32 = DWC_READ_REG32(&core_if->core_global_regs->gpwrdn);
-+
-+	if (gpwrdn.b.idsts ^ gpwrdn_temp.b.idsts) {
-+		retval = dwc_otg_handle_pwrdn_idsts_change(otg_dev);
-+	} else if (gpwrdn.b.bsessvld ^ gpwrdn_temp.b.bsessvld) {
-+		retval = dwc_otg_handle_pwrdn_session_change(core_if);
-+	}
-+
-+	return retval;
-+}
-+
-+/**
-+ * This interrupt indicates that the Wakeup Logic has detected a
-+ * SRP.
-+ */
-+static int32_t dwc_otg_handle_pwrdn_srp_intr(dwc_otg_core_if_t * core_if)
-+{
-+	gpwrdn_data_t gpwrdn = {.d32 = 0 };
-+
-+	DWC_PRINTF("%s called\n", __FUNCTION__);
-+
-+	if (!core_if->hibernation_suspend) {
-+		DWC_PRINTF("Already exited from Hibernation\n");
-+		return 1;
-+	}
-+#ifdef DWC_DEV_SRPCAP
-+	if (core_if->pwron_timer_started) {
-+		core_if->pwron_timer_started = 0;
-+		DWC_TIMER_CANCEL(core_if->pwron_timer);
-+	}
-+#endif
-+
-+	/* Switch on the voltage to the core */
-+	gpwrdn.b.pwrdnswtch = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+	dwc_udelay(10);
-+
-+	/* Reset the core */
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.pwrdnrstn = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+	dwc_udelay(10);
-+
-+	/* Disable power clamps */
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.pwrdnclmp = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+
-+	/* Remove reset the core signal */
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.pwrdnrstn = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, 0, gpwrdn.d32);
-+	dwc_udelay(10);
-+
-+	/* Disable PMU interrupt */
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.pmuintsel = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+
-+	/* Indicates that we are exiting from hibernation */
-+	core_if->hibernation_suspend = 0;
-+
-+	/* Disable PMU */
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.pmuactv = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+	dwc_udelay(10);
-+
-+	/* Programm Disable VBUS to 0 */
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.dis_vbus = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+
-+	/*Initialize the core as Host */
-+	core_if->op_state = A_HOST;
-+	dwc_otg_core_init(core_if);
-+	dwc_otg_enable_global_interrupts(core_if);
-+	cil_hcd_start(core_if);
-+
-+	return 1;
-+}
-+
-+/** This interrupt indicates that restore command after Hibernation
-+ * was completed by the core. */
-+int32_t dwc_otg_handle_restore_done_intr(dwc_otg_core_if_t * core_if)
-+{
-+	pcgcctl_data_t pcgcctl;
-+	DWC_DEBUGPL(DBG_ANY, "++Restore Done Interrupt++\n");
-+
-+	//TODO De-assert restore signal. 8.a
-+	pcgcctl.d32 = DWC_READ_REG32(core_if->pcgcctl);
-+	if (pcgcctl.b.restoremode == 1) {
-+		gintmsk_data_t gintmsk = {.d32 = 0 };
-+		/*
-+		 * If restore mode is Remote Wakeup,
-+		 * unmask Remote Wakeup interrupt.
-+		 */
-+		gintmsk.b.wkupintr = 1;
-+		DWC_MODIFY_REG32(&core_if->core_global_regs->gintmsk,
-+				 0, gintmsk.d32);
-+	}
-+
-+	return 1;
-+}
-+
-+/**
-+ * This interrupt indicates that a device has been disconnected from
-+ * the root port.
-+ */
-+int32_t dwc_otg_handle_disconnect_intr(dwc_otg_core_if_t * core_if)
-+{
-+	gintsts_data_t gintsts;
-+
-+	DWC_DEBUGPL(DBG_ANY, "++Disconnect Detected Interrupt++ (%s) %s\n",
-+		    (dwc_otg_is_host_mode(core_if) ? "Host" : "Device"),
-+		    op_state_str(core_if));
-+
-+/** @todo Consolidate this if statement. */
-+#ifndef DWC_HOST_ONLY
-+	if (core_if->op_state == B_HOST) {
-+		/* If in device mode Disconnect and stop the HCD, then
-+		 * start the PCD. */
-+		DWC_SPINUNLOCK(core_if->lock);
-+		cil_hcd_disconnect(core_if);
-+		cil_pcd_start(core_if);
-+		DWC_SPINLOCK(core_if->lock);
-+		core_if->op_state = B_PERIPHERAL;
-+	} else if (dwc_otg_is_device_mode(core_if)) {
-+		gotgctl_data_t gotgctl = {.d32 = 0 };
-+		gotgctl.d32 =
-+		    DWC_READ_REG32(&core_if->core_global_regs->gotgctl);
-+		if (gotgctl.b.hstsethnpen == 1) {
-+			/* Do nothing, if HNP in process the OTG
-+			 * interrupt "Host Negotiation Detected"
-+			 * interrupt will do the mode switch.
-+			 */
-+		} else if (gotgctl.b.devhnpen == 0) {
-+			/* If in device mode Disconnect and stop the HCD, then
-+			 * start the PCD. */
-+			DWC_SPINUNLOCK(core_if->lock);
-+			cil_hcd_disconnect(core_if);
-+			cil_pcd_start(core_if);
-+			DWC_SPINLOCK(core_if->lock);
-+			core_if->op_state = B_PERIPHERAL;
-+		} else {
-+			DWC_DEBUGPL(DBG_ANY, "!a_peripheral && !devhnpen\n");
-+		}
-+	} else {
-+		if (core_if->op_state == A_HOST) {
-+			/* A-Cable still connected but device disconnected. */
-+			DWC_SPINUNLOCK(core_if->lock);
-+			cil_hcd_disconnect(core_if);
-+			DWC_SPINLOCK(core_if->lock);
-+			if (core_if->adp_enable) {
-+				gpwrdn_data_t gpwrdn = { .d32 = 0 };
-+				cil_hcd_stop(core_if);
-+				/* Enable Power Down Logic */
-+				gpwrdn.b.pmuintsel = 1;
-+				gpwrdn.b.pmuactv = 1;
-+				DWC_MODIFY_REG32(&core_if->core_global_regs->
-+						 gpwrdn, 0, gpwrdn.d32);
-+				dwc_otg_adp_probe_start(core_if);
-+
-+				/* Power off the core */
-+				if (core_if->power_down == 2) {
-+					gpwrdn.d32 = 0;
-+					gpwrdn.b.pwrdnswtch = 1;
-+					DWC_MODIFY_REG32
-+					    (&core_if->core_global_regs->gpwrdn,
-+					     gpwrdn.d32, 0);
-+				}
-+			}
-+		}
-+	}
-+#endif
-+	/* Change to L3(OFF) state */
-+	core_if->lx_state = DWC_OTG_L3;
-+
-+	gintsts.d32 = 0;
-+	gintsts.b.disconnect = 1;
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gintsts, gintsts.d32);
-+	return 1;
-+}
-+
-+/**
-+ * This interrupt indicates that SUSPEND state has been detected on
-+ * the USB.
-+ *
-+ * For HNP the USB Suspend interrupt signals the change from
-+ * "a_peripheral" to "a_host".
-+ *
-+ * When power management is enabled the core will be put in low power
-+ * mode.
-+ */
-+int32_t dwc_otg_handle_usb_suspend_intr(dwc_otg_core_if_t * core_if)
-+{
-+	dsts_data_t dsts;
-+	gintsts_data_t gintsts;
-+	dcfg_data_t dcfg;
-+
-+	DWC_DEBUGPL(DBG_ANY, "USB SUSPEND\n");
-+
-+	if (dwc_otg_is_device_mode(core_if)) {
-+		/* Check the Device status register to determine if the Suspend
-+		 * state is active. */
-+		dsts.d32 =
-+		    DWC_READ_REG32(&core_if->dev_if->dev_global_regs->dsts);
-+		DWC_DEBUGPL(DBG_PCD, "DSTS=0x%0x\n", dsts.d32);
-+		DWC_DEBUGPL(DBG_PCD, "DSTS.Suspend Status=%d "
-+			    "HWCFG4.power Optimize=%d\n",
-+			    dsts.b.suspsts, core_if->hwcfg4.b.power_optimiz);
-+
-+#ifdef PARTIAL_POWER_DOWN
-+/** @todo Add a module parameter for power management. */
-+
-+		if (dsts.b.suspsts && core_if->hwcfg4.b.power_optimiz) {
-+			pcgcctl_data_t power = {.d32 = 0 };
-+			DWC_DEBUGPL(DBG_CIL, "suspend\n");
-+
-+			power.b.pwrclmp = 1;
-+			DWC_WRITE_REG32(core_if->pcgcctl, power.d32);
-+
-+			power.b.rstpdwnmodule = 1;
-+			DWC_MODIFY_REG32(core_if->pcgcctl, 0, power.d32);
-+
-+			power.b.stoppclk = 1;
-+			DWC_MODIFY_REG32(core_if->pcgcctl, 0, power.d32);
-+
-+		} else {
-+			DWC_DEBUGPL(DBG_ANY, "disconnect?\n");
-+		}
-+#endif
-+		/* PCD callback for suspend. Release the lock inside of callback function */
-+		cil_pcd_suspend(core_if);
-+		if (core_if->power_down == 2)
-+		{
-+			dcfg.d32 = DWC_READ_REG32(&core_if->dev_if->dev_global_regs->dcfg);
-+			DWC_DEBUGPL(DBG_ANY,"lx_state = %08x\n",core_if->lx_state);
-+			DWC_DEBUGPL(DBG_ANY," device address = %08d\n",dcfg.b.devaddr);
-+
-+			if (core_if->lx_state != DWC_OTG_L3 && dcfg.b.devaddr) {
-+				pcgcctl_data_t pcgcctl = {.d32 = 0 };
-+				gpwrdn_data_t gpwrdn = {.d32 = 0 };
-+				gusbcfg_data_t gusbcfg = {.d32 = 0 };
-+
-+				/* Change to L2(suspend) state */
-+				core_if->lx_state = DWC_OTG_L2;
-+
-+				/* Clear interrupt in gintsts */
-+				gintsts.d32 = 0;
-+				gintsts.b.usbsuspend = 1;
-+				DWC_WRITE_REG32(&core_if->core_global_regs->
-+						gintsts, gintsts.d32);
-+				DWC_PRINTF("Start of hibernation completed\n");
-+				dwc_otg_save_global_regs(core_if);
-+				dwc_otg_save_dev_regs(core_if);
-+
-+				gusbcfg.d32 =
-+				    DWC_READ_REG32(&core_if->core_global_regs->
-+						   gusbcfg);
-+				if (gusbcfg.b.ulpi_utmi_sel == 1) {
-+					/* ULPI interface */
-+					/* Suspend the Phy Clock */
-+					pcgcctl.d32 = 0;
-+					pcgcctl.b.stoppclk = 1;
-+					DWC_MODIFY_REG32(core_if->pcgcctl, 0,
-+							 pcgcctl.d32);
-+					dwc_udelay(10);
-+					gpwrdn.b.pmuactv = 1;
-+					DWC_MODIFY_REG32(&core_if->
-+							 core_global_regs->
-+							 gpwrdn, 0, gpwrdn.d32);
-+				} else {
-+					/* UTMI+ Interface */
-+					gpwrdn.b.pmuactv = 1;
-+					DWC_MODIFY_REG32(&core_if->
-+							 core_global_regs->
-+							 gpwrdn, 0, gpwrdn.d32);
-+					dwc_udelay(10);
-+					pcgcctl.b.stoppclk = 1;
-+					DWC_MODIFY_REG32(core_if->pcgcctl, 0,
-+							 pcgcctl.d32);
-+					dwc_udelay(10);
-+				}
-+
-+				/* Set flag to indicate that we are in hibernation */
-+				core_if->hibernation_suspend = 1;
-+				/* Enable interrupts from wake up logic */
-+				gpwrdn.d32 = 0;
-+				gpwrdn.b.pmuintsel = 1;
-+				DWC_MODIFY_REG32(&core_if->core_global_regs->
-+						 gpwrdn, 0, gpwrdn.d32);
-+				dwc_udelay(10);
-+
-+				/* Unmask device mode interrupts in GPWRDN */
-+				gpwrdn.d32 = 0;
-+				gpwrdn.b.rst_det_msk = 1;
-+				gpwrdn.b.lnstchng_msk = 1;
-+				gpwrdn.b.sts_chngint_msk = 1;
-+				DWC_MODIFY_REG32(&core_if->core_global_regs->
-+						 gpwrdn, 0, gpwrdn.d32);
-+				dwc_udelay(10);
-+
-+				/* Enable Power Down Clamp */
-+				gpwrdn.d32 = 0;
-+				gpwrdn.b.pwrdnclmp = 1;
-+				DWC_MODIFY_REG32(&core_if->core_global_regs->
-+						 gpwrdn, 0, gpwrdn.d32);
-+				dwc_udelay(10);
-+
-+				/* Switch off VDD */
-+				gpwrdn.d32 = 0;
-+				gpwrdn.b.pwrdnswtch = 1;
-+				DWC_MODIFY_REG32(&core_if->core_global_regs->
-+						 gpwrdn, 0, gpwrdn.d32);
-+
-+				/* Save gpwrdn register for further usage if stschng interrupt */
-+				core_if->gr_backup->gpwrdn_local =
-+							DWC_READ_REG32(&core_if->core_global_regs->gpwrdn);
-+				DWC_PRINTF("Hibernation completed\n");
-+
-+				return 1;
-+			}
-+		} else if (core_if->power_down == 3) {
-+			pcgcctl_data_t pcgcctl = {.d32 = 0 };
-+			dcfg.d32 = DWC_READ_REG32(&core_if->dev_if->dev_global_regs->dcfg);
-+			DWC_DEBUGPL(DBG_ANY, "lx_state = %08x\n",core_if->lx_state);
-+			DWC_DEBUGPL(DBG_ANY, " device address = %08d\n",dcfg.b.devaddr);
-+
-+			if (core_if->lx_state != DWC_OTG_L3 && dcfg.b.devaddr) {
-+				DWC_DEBUGPL(DBG_ANY, "Start entering to extended hibernation\n");
-+				core_if->xhib = 1;
-+
-+				/* Clear interrupt in gintsts */
-+				gintsts.d32 = 0;
-+				gintsts.b.usbsuspend = 1;
-+				DWC_WRITE_REG32(&core_if->core_global_regs->
-+					gintsts, gintsts.d32);
-+
-+				dwc_otg_save_global_regs(core_if);
-+				dwc_otg_save_dev_regs(core_if);
-+
-+				/* Wait for 10 PHY clocks */
-+				dwc_udelay(10);
-+
-+				/* Program GPIO register while entering to xHib */
-+				DWC_WRITE_REG32(&core_if->core_global_regs->ggpio, 0x1);
-+
-+				pcgcctl.b.enbl_extnd_hiber = 1;
-+				DWC_MODIFY_REG32(core_if->pcgcctl, 0, pcgcctl.d32);
-+				DWC_MODIFY_REG32(core_if->pcgcctl, 0, pcgcctl.d32);
-+
-+				pcgcctl.d32 = 0;
-+				pcgcctl.b.extnd_hiber_pwrclmp = 1;
-+				DWC_MODIFY_REG32(core_if->pcgcctl, 0, pcgcctl.d32);
-+
-+				pcgcctl.d32 = 0;
-+				pcgcctl.b.extnd_hiber_switch = 1;
-+				core_if->gr_backup->xhib_gpwrdn = DWC_READ_REG32(&core_if->core_global_regs->gpwrdn);
-+				core_if->gr_backup->xhib_pcgcctl = DWC_READ_REG32(core_if->pcgcctl) | pcgcctl.d32;
-+				DWC_MODIFY_REG32(core_if->pcgcctl, 0, pcgcctl.d32);
-+
-+				DWC_DEBUGPL(DBG_ANY, "Finished entering to extended hibernation\n");
-+
-+				return 1;
-+			}
-+		}
-+	} else {
-+		if (core_if->op_state == A_PERIPHERAL) {
-+			DWC_DEBUGPL(DBG_ANY, "a_peripheral->a_host\n");
-+			/* Clear the a_peripheral flag, back to a_host. */
-+			DWC_SPINUNLOCK(core_if->lock);
-+			cil_pcd_stop(core_if);
-+			cil_hcd_start(core_if);
-+			DWC_SPINLOCK(core_if->lock);
-+			core_if->op_state = A_HOST;
-+		}
-+	}
-+
-+	/* Change to L2(suspend) state */
-+	core_if->lx_state = DWC_OTG_L2;
-+
-+	/* Clear interrupt */
-+	gintsts.d32 = 0;
-+	gintsts.b.usbsuspend = 1;
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gintsts, gintsts.d32);
-+
-+	return 1;
-+}
-+
-+static int32_t dwc_otg_handle_xhib_exit_intr(dwc_otg_core_if_t * core_if)
-+{
-+	gpwrdn_data_t gpwrdn = {.d32 = 0 };
-+	pcgcctl_data_t pcgcctl = {.d32 = 0 };
-+	gahbcfg_data_t gahbcfg = {.d32 = 0 };
-+
-+	dwc_udelay(10);
-+
-+	/* Program GPIO register while entering to xHib */
-+	DWC_WRITE_REG32(&core_if->core_global_regs->ggpio, 0x0);
-+
-+	pcgcctl.d32 = core_if->gr_backup->xhib_pcgcctl;
-+	pcgcctl.b.extnd_hiber_pwrclmp = 0;
-+	DWC_WRITE_REG32(core_if->pcgcctl, pcgcctl.d32);
-+	dwc_udelay(10);
-+
-+	gpwrdn.d32 = core_if->gr_backup->xhib_gpwrdn;
-+	gpwrdn.b.restore = 1;
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32);
-+	dwc_udelay(10);
-+
-+	restore_lpm_i2c_regs(core_if);
-+
-+	pcgcctl.d32 = core_if->gr_backup->pcgcctl_local & (0x3FFFF << 14);
-+	pcgcctl.b.max_xcvrselect = 1;
-+	pcgcctl.b.ess_reg_restored = 0;
-+	pcgcctl.b.extnd_hiber_switch = 0;
-+	pcgcctl.b.extnd_hiber_pwrclmp = 0;
-+	pcgcctl.b.enbl_extnd_hiber = 1;
-+	DWC_WRITE_REG32(core_if->pcgcctl, pcgcctl.d32);
-+
-+	gahbcfg.d32 = core_if->gr_backup->gahbcfg_local;
-+	gahbcfg.b.glblintrmsk = 1;
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gahbcfg, gahbcfg.d32);
-+
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gintsts, 0xFFFFFFFF);
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gintmsk, 0x1 << 16);
-+
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gusbcfg,
-+			core_if->gr_backup->gusbcfg_local);
-+	DWC_WRITE_REG32(&core_if->dev_if->dev_global_regs->dcfg,
-+			core_if->dr_backup->dcfg);
-+
-+	pcgcctl.d32 = 0;
-+	pcgcctl.d32 = core_if->gr_backup->pcgcctl_local & (0x3FFFF << 14);
-+	pcgcctl.b.max_xcvrselect = 1;
-+	pcgcctl.d32 |= 0x608;
-+	DWC_WRITE_REG32(core_if->pcgcctl, pcgcctl.d32);
-+	dwc_udelay(10);
-+
-+	pcgcctl.d32 = 0;
-+	pcgcctl.d32 = core_if->gr_backup->pcgcctl_local & (0x3FFFF << 14);
-+	pcgcctl.b.max_xcvrselect = 1;
-+	pcgcctl.b.ess_reg_restored = 1;
-+	pcgcctl.b.enbl_extnd_hiber = 1;
-+	pcgcctl.b.rstpdwnmodule = 1;
-+	pcgcctl.b.restoremode = 1;
-+	DWC_WRITE_REG32(core_if->pcgcctl, pcgcctl.d32);
-+
-+	DWC_DEBUGPL(DBG_ANY, "%s called\n", __FUNCTION__);
-+
-+	return 1;
-+}
-+
-+#ifdef CONFIG_USB_DWC_OTG_LPM
-+/**
-+ * This function hadles LPM transaction received interrupt.
-+ */
-+static int32_t dwc_otg_handle_lpm_intr(dwc_otg_core_if_t * core_if)
-+{
-+	glpmcfg_data_t lpmcfg;
-+	gintsts_data_t gintsts;
-+
-+	if (!core_if->core_params->lpm_enable) {
-+		DWC_PRINTF("Unexpected LPM interrupt\n");
-+	}
-+
-+	lpmcfg.d32 = DWC_READ_REG32(&core_if->core_global_regs->glpmcfg);
-+	DWC_PRINTF("LPM config register = 0x%08x\n", lpmcfg.d32);
-+
-+	if (dwc_otg_is_host_mode(core_if)) {
-+		cil_hcd_sleep(core_if);
-+	} else {
-+		lpmcfg.b.hird_thres |= (1 << 4);
-+		DWC_WRITE_REG32(&core_if->core_global_regs->glpmcfg,
-+				lpmcfg.d32);
-+	}
-+
-+	/* Examine prt_sleep_sts after TL1TokenTetry period max (10 us) */
-+	dwc_udelay(10);
-+	lpmcfg.d32 = DWC_READ_REG32(&core_if->core_global_regs->glpmcfg);
-+	if (lpmcfg.b.prt_sleep_sts) {
-+		/* Save the current state */
-+		core_if->lx_state = DWC_OTG_L1;
-+	}
-+
-+	/* Clear interrupt  */
-+	gintsts.d32 = 0;
-+	gintsts.b.lpmtranrcvd = 1;
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gintsts, gintsts.d32);
-+	return 1;
-+}
-+#endif /* CONFIG_USB_DWC_OTG_LPM */
-+
-+/**
-+ * This function returns the Core Interrupt register.
-+ */
-+static inline uint32_t dwc_otg_read_common_intr(dwc_otg_core_if_t * core_if, gintmsk_data_t *reenable_gintmsk, dwc_otg_hcd_t *hcd)
-+{
-+	gahbcfg_data_t gahbcfg = {.d32 = 0 };
-+	gintsts_data_t gintsts;
-+	gintmsk_data_t gintmsk;
-+	gintmsk_data_t gintmsk_common = {.d32 = 0 };
-+	gintmsk_common.b.wkupintr = 1;
-+	gintmsk_common.b.sessreqintr = 1;
-+	gintmsk_common.b.conidstschng = 1;
-+	gintmsk_common.b.otgintr = 1;
-+	gintmsk_common.b.modemismatch = 1;
-+	gintmsk_common.b.disconnect = 1;
-+	gintmsk_common.b.usbsuspend = 1;
-+#ifdef CONFIG_USB_DWC_OTG_LPM
-+	gintmsk_common.b.lpmtranrcvd = 1;
-+#endif
-+	gintmsk_common.b.restoredone = 1;
-+	if(dwc_otg_is_device_mode(core_if))
-+	{
-+		/** @todo: The port interrupt occurs while in device
-+		 * mode. Added code to CIL to clear the interrupt for now!
-+		 */
-+		gintmsk_common.b.portintr = 1;
-+	}
-+	if(fiq_enable) {
-+		local_fiq_disable();
-+		fiq_fsm_spin_lock(&hcd->fiq_state->lock);
-+		gintsts.d32 = DWC_READ_REG32(&core_if->core_global_regs->gintsts);
-+		gintmsk.d32 = DWC_READ_REG32(&core_if->core_global_regs->gintmsk);
-+		/* Pull in the interrupts that the FIQ has masked */
-+		gintmsk.d32 |= ~(hcd->fiq_state->gintmsk_saved.d32);
-+		gintmsk.d32 |= gintmsk_common.d32;
-+		/* for the upstairs function to reenable - have to read it here in case FIQ triggers again */
-+		reenable_gintmsk->d32 = gintmsk.d32;
-+		fiq_fsm_spin_unlock(&hcd->fiq_state->lock);
-+		local_fiq_enable();
-+	} else {
-+		gintsts.d32 = DWC_READ_REG32(&core_if->core_global_regs->gintsts);
-+		gintmsk.d32 = DWC_READ_REG32(&core_if->core_global_regs->gintmsk);
-+	}
-+
-+	gahbcfg.d32 = DWC_READ_REG32(&core_if->core_global_regs->gahbcfg);
-+
-+#ifdef DEBUG
-+	/* if any common interrupts set */
-+	if (gintsts.d32 & gintmsk_common.d32) {
-+		DWC_DEBUGPL(DBG_ANY, "common_intr: gintsts=%08x  gintmsk=%08x\n",
-+			    gintsts.d32, gintmsk.d32);
-+	}
-+#endif
-+	if (!fiq_enable){
-+		if (gahbcfg.b.glblintrmsk)
-+			return ((gintsts.d32 & gintmsk.d32) & gintmsk_common.d32);
-+		else
-+			return 0;
-+	} else {
-+		/* Our IRQ kicker is no longer the USB hardware, it's the MPHI interface.
-+		 * Can't trust the global interrupt mask bit in this case.
-+		 */
-+		return ((gintsts.d32 & gintmsk.d32) & gintmsk_common.d32);
-+	}
-+
-+}
-+
-+/* MACRO for clearing interupt bits in GPWRDN register */
-+#define CLEAR_GPWRDN_INTR(__core_if,__intr) \
-+do { \
-+		gpwrdn_data_t gpwrdn = {.d32=0}; \
-+		gpwrdn.b.__intr = 1; \
-+		DWC_MODIFY_REG32(&__core_if->core_global_regs->gpwrdn, \
-+		0, gpwrdn.d32); \
-+} while (0)
-+
-+/**
-+ * Common interrupt handler.
-+ *
-+ * The common interrupts are those that occur in both Host and Device mode.
-+ * This handler handles the following interrupts:
-+ * - Mode Mismatch Interrupt
-+ * - Disconnect Interrupt
-+ * - OTG Interrupt
-+ * - Connector ID Status Change Interrupt
-+ * - Session Request Interrupt.
-+ * - Resume / Remote Wakeup Detected Interrupt.
-+ * - LPM Transaction Received Interrupt
-+ * - ADP Transaction Received Interrupt
-+ *
-+ */
-+int32_t dwc_otg_handle_common_intr(void *dev)
-+{
-+	int retval = 0;
-+	gintsts_data_t gintsts;
-+	gintmsk_data_t gintmsk_reenable = { .d32 = 0 };
-+	gpwrdn_data_t gpwrdn = {.d32 = 0 };
-+	dwc_otg_device_t *otg_dev = dev;
-+	dwc_otg_core_if_t *core_if = otg_dev->core_if;
-+	gpwrdn.d32 = DWC_READ_REG32(&core_if->core_global_regs->gpwrdn);
-+	if (dwc_otg_is_device_mode(core_if))
-+		core_if->frame_num = dwc_otg_get_frame_number(core_if);
-+
-+	if (core_if->lock)
-+		DWC_SPINLOCK(core_if->lock);
-+
-+	if (core_if->power_down == 3 && core_if->xhib == 1) {
-+		DWC_DEBUGPL(DBG_ANY, "Exiting from xHIB state\n");
-+		retval |= dwc_otg_handle_xhib_exit_intr(core_if);
-+		core_if->xhib = 2;
-+		if (core_if->lock)
-+			DWC_SPINUNLOCK(core_if->lock);
-+
-+		return retval;
-+	}
-+
-+	if (core_if->hibernation_suspend <= 0) {
-+		/* read_common will have to poke the FIQ's saved mask. We must then clear this mask at the end
-+		 * of this handler - god only knows why it's done like this
-+		 */
-+		gintsts.d32 = dwc_otg_read_common_intr(core_if, &gintmsk_reenable, otg_dev->hcd);
-+
-+		if (gintsts.b.modemismatch) {
-+			retval |= dwc_otg_handle_mode_mismatch_intr(core_if);
-+		}
-+		if (gintsts.b.otgintr) {
-+			retval |= dwc_otg_handle_otg_intr(core_if);
-+		}
-+		if (gintsts.b.conidstschng) {
-+			retval |=
-+			    dwc_otg_handle_conn_id_status_change_intr(core_if);
-+		}
-+		if (gintsts.b.disconnect) {
-+			retval |= dwc_otg_handle_disconnect_intr(core_if);
-+		}
-+		if (gintsts.b.sessreqintr) {
-+			retval |= dwc_otg_handle_session_req_intr(core_if);
-+		}
-+		if (gintsts.b.wkupintr) {
-+			retval |= dwc_otg_handle_wakeup_detected_intr(core_if);
-+		}
-+		if (gintsts.b.usbsuspend) {
-+			retval |= dwc_otg_handle_usb_suspend_intr(core_if);
-+		}
-+#ifdef CONFIG_USB_DWC_OTG_LPM
-+		if (gintsts.b.lpmtranrcvd) {
-+			retval |= dwc_otg_handle_lpm_intr(core_if);
-+		}
-+#endif
-+		if (gintsts.b.restoredone) {
-+			gintsts.d32 = 0;
-+	                if (core_if->power_down == 2)
-+				core_if->hibernation_suspend = -1;
-+			else if (core_if->power_down == 3 && core_if->xhib == 2) {
-+				gpwrdn_data_t gpwrdn = {.d32 = 0 };
-+				pcgcctl_data_t pcgcctl = {.d32 = 0 };
-+				dctl_data_t dctl = {.d32 = 0 };
-+
-+				DWC_WRITE_REG32(&core_if->core_global_regs->
-+						gintsts, 0xFFFFFFFF);
-+
-+				DWC_DEBUGPL(DBG_ANY,
-+					    "RESTORE DONE generated\n");
-+
-+				gpwrdn.b.restore = 1;
-+				DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+				dwc_udelay(10);
-+
-+				pcgcctl.b.rstpdwnmodule = 1;
-+				DWC_MODIFY_REG32(core_if->pcgcctl, pcgcctl.d32, 0);
-+
-+				DWC_WRITE_REG32(&core_if->core_global_regs->gusbcfg, core_if->gr_backup->gusbcfg_local);
-+				DWC_WRITE_REG32(&core_if->dev_if->dev_global_regs->dcfg, core_if->dr_backup->dcfg);
-+				DWC_WRITE_REG32(&core_if->dev_if->dev_global_regs->dctl, core_if->dr_backup->dctl);
-+				dwc_udelay(50);
-+
-+				dctl.b.pwronprgdone = 1;
-+				DWC_MODIFY_REG32(&core_if->dev_if->dev_global_regs->dctl, 0, dctl.d32);
-+				dwc_udelay(10);
-+
-+				dwc_otg_restore_global_regs(core_if);
-+				dwc_otg_restore_dev_regs(core_if, 0);
-+
-+				dctl.d32 = 0;
-+				dctl.b.pwronprgdone = 1;
-+				DWC_MODIFY_REG32(&core_if->dev_if->dev_global_regs->dctl, dctl.d32, 0);
-+				dwc_udelay(10);
-+
-+				pcgcctl.d32 = 0;
-+				pcgcctl.b.enbl_extnd_hiber = 1;
-+				DWC_MODIFY_REG32(core_if->pcgcctl, pcgcctl.d32, 0);
-+
-+				/* The core will be in ON STATE */
-+				core_if->lx_state = DWC_OTG_L0;
-+				core_if->xhib = 0;
-+
-+				DWC_SPINUNLOCK(core_if->lock);
-+				if (core_if->pcd_cb && core_if->pcd_cb->resume_wakeup) {
-+					core_if->pcd_cb->resume_wakeup(core_if->pcd_cb->p);
-+				}
-+				DWC_SPINLOCK(core_if->lock);
-+
-+			}
-+
-+			gintsts.b.restoredone = 1;
-+			DWC_WRITE_REG32(&core_if->core_global_regs->gintsts,gintsts.d32);
-+			DWC_PRINTF(" --Restore done interrupt received-- \n");
-+			retval |= 1;
-+		}
-+		if (gintsts.b.portintr && dwc_otg_is_device_mode(core_if)) {
-+			/* The port interrupt occurs while in device mode with HPRT0
-+			 * Port Enable/Disable.
-+			 */
-+			gintsts.d32 = 0;
-+			gintsts.b.portintr = 1;
-+			DWC_WRITE_REG32(&core_if->core_global_regs->gintsts,gintsts.d32);
-+			retval |= 1;
-+			gintmsk_reenable.b.portintr = 1;
-+
-+		}
-+		/* Did we actually handle anything? if so, unmask the interrupt */
-+//		fiq_print(FIQDBG_INT, otg_dev->hcd->fiq_state, "CILOUT %1d", retval);
-+//		fiq_print(FIQDBG_INT, otg_dev->hcd->fiq_state, "%08x", gintsts.d32);
-+//		fiq_print(FIQDBG_INT, otg_dev->hcd->fiq_state, "%08x", gintmsk_reenable.d32);
-+		if (retval && fiq_enable) {
-+			DWC_WRITE_REG32(&core_if->core_global_regs->gintmsk, gintmsk_reenable.d32);
-+		}
-+
-+	} else {
-+		DWC_DEBUGPL(DBG_ANY, "gpwrdn=%08x\n", gpwrdn.d32);
-+
-+		if (gpwrdn.b.disconn_det && gpwrdn.b.disconn_det_msk) {
-+			CLEAR_GPWRDN_INTR(core_if, disconn_det);
-+			if (gpwrdn.b.linestate == 0) {
-+				dwc_otg_handle_pwrdn_disconnect_intr(core_if);
-+			} else {
-+				DWC_PRINTF("Disconnect detected while linestate is not 0\n");
-+			}
-+
-+			retval |= 1;
-+		}
-+		if (gpwrdn.b.lnstschng && gpwrdn.b.lnstchng_msk) {
-+			CLEAR_GPWRDN_INTR(core_if, lnstschng);
-+			/* remote wakeup from hibernation */
-+			if (gpwrdn.b.linestate == 2 || gpwrdn.b.linestate == 1) {
-+				dwc_otg_handle_pwrdn_wakeup_detected_intr(core_if);
-+			} else {
-+				DWC_PRINTF("gpwrdn.linestate = %d\n", gpwrdn.b.linestate);
-+			}
-+			retval |= 1;
-+		}
-+		if (gpwrdn.b.rst_det && gpwrdn.b.rst_det_msk) {
-+			CLEAR_GPWRDN_INTR(core_if, rst_det);
-+			if (gpwrdn.b.linestate == 0) {
-+				DWC_PRINTF("Reset detected\n");
-+				retval |= dwc_otg_device_hibernation_restore(core_if, 0, 1);
-+			}
-+		}
-+		if (gpwrdn.b.srp_det && gpwrdn.b.srp_det_msk) {
-+			CLEAR_GPWRDN_INTR(core_if, srp_det);
-+			dwc_otg_handle_pwrdn_srp_intr(core_if);
-+			retval |= 1;
-+		}
-+	}
-+	/* Handle ADP interrupt here */
-+	if (gpwrdn.b.adp_int) {
-+		DWC_PRINTF("ADP interrupt\n");
-+		CLEAR_GPWRDN_INTR(core_if, adp_int);
-+		dwc_otg_adp_handle_intr(core_if);
-+		retval |= 1;
-+	}
-+	if (gpwrdn.b.sts_chngint && gpwrdn.b.sts_chngint_msk) {
-+		DWC_PRINTF("STS CHNG interrupt asserted\n");
-+		CLEAR_GPWRDN_INTR(core_if, sts_chngint);
-+		dwc_otg_handle_pwrdn_stschng_intr(otg_dev);
-+
-+		retval |= 1;
-+	}
-+	if (core_if->lock)
-+		DWC_SPINUNLOCK(core_if->lock);
-+	return retval;
-+}
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_core_if.h
-@@ -0,0 +1,705 @@
-+/* ==========================================================================
-+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_core_if.h $
-+ * $Revision: #13 $
-+ * $Date: 2012/08/10 $
-+ * $Change: 2047372 $
-+ *
-+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
-+ * "Software") is an Unsupported proprietary work of Synopsys, Inc. unless
-+ * otherwise expressly agreed to in writing between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product under
-+ * any End User Software License Agreement or Agreement for Licensed Product
-+ * with Synopsys or any supplement thereto. You are permitted to use and
-+ * redistribute this Software in source and binary forms, with or without
-+ * modification, provided that redistributions of source code must retain this
-+ * notice. You may not view, use, disclose, copy or distribute this file or
-+ * any information contained herein except pursuant to this license grant from
-+ * Synopsys. If you do not agree with this notice, including the disclaimer
-+ * below, then you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" BASIS
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS BE LIABLE FOR ANY DIRECT,
-+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================== */
-+#if !defined(__DWC_CORE_IF_H__)
-+#define __DWC_CORE_IF_H__
-+
-+#include "dwc_os.h"
-+
-+/** @file
-+ * This file defines DWC_OTG Core API
-+ */
-+
-+struct dwc_otg_core_if;
-+typedef struct dwc_otg_core_if dwc_otg_core_if_t;
-+
-+/** Maximum number of Periodic FIFOs */
-+#define MAX_PERIO_FIFOS 15
-+/** Maximum number of Periodic FIFOs */
-+#define MAX_TX_FIFOS 15
-+
-+/** Maximum number of Endpoints/HostChannels */
-+#define MAX_EPS_CHANNELS 16
-+
-+extern dwc_otg_core_if_t *dwc_otg_cil_init(const uint32_t * _reg_base_addr);
-+extern void dwc_otg_core_init(dwc_otg_core_if_t * _core_if);
-+extern void dwc_otg_cil_remove(dwc_otg_core_if_t * _core_if);
-+
-+extern void dwc_otg_enable_global_interrupts(dwc_otg_core_if_t * _core_if);
-+extern void dwc_otg_disable_global_interrupts(dwc_otg_core_if_t * _core_if);
-+
-+extern uint8_t dwc_otg_is_device_mode(dwc_otg_core_if_t * _core_if);
-+extern uint8_t dwc_otg_is_host_mode(dwc_otg_core_if_t * _core_if);
-+
-+extern uint8_t dwc_otg_is_dma_enable(dwc_otg_core_if_t * core_if);
-+
-+/** This function should be called on every hardware interrupt. */
-+extern int32_t dwc_otg_handle_common_intr(void *otg_dev);
-+
-+/** @name OTG Core Parameters */
-+/** @{ */
-+
-+/**
-+ * Specifies the OTG capabilities. The driver will automatically
-+ * detect the value for this parameter if none is specified.
-+ * 0 - HNP and SRP capable (default)
-+ * 1 - SRP Only capable
-+ * 2 - No HNP/SRP capable
-+ */
-+extern int dwc_otg_set_param_otg_cap(dwc_otg_core_if_t * core_if, int32_t val);
-+extern int32_t dwc_otg_get_param_otg_cap(dwc_otg_core_if_t * core_if);
-+#define DWC_OTG_CAP_PARAM_HNP_SRP_CAPABLE 0
-+#define DWC_OTG_CAP_PARAM_SRP_ONLY_CAPABLE 1
-+#define DWC_OTG_CAP_PARAM_NO_HNP_SRP_CAPABLE 2
-+#define dwc_param_otg_cap_default DWC_OTG_CAP_PARAM_HNP_SRP_CAPABLE
-+
-+extern int dwc_otg_set_param_opt(dwc_otg_core_if_t * core_if, int32_t val);
-+extern int32_t dwc_otg_get_param_opt(dwc_otg_core_if_t * core_if);
-+#define dwc_param_opt_default 1
-+
-+/**
-+ * Specifies whether to use slave or DMA mode for accessing the data
-+ * FIFOs. The driver will automatically detect the value for this
-+ * parameter if none is specified.
-+ * 0 - Slave
-+ * 1 - DMA (default, if available)
-+ */
-+extern int dwc_otg_set_param_dma_enable(dwc_otg_core_if_t * core_if,
-+					int32_t val);
-+extern int32_t dwc_otg_get_param_dma_enable(dwc_otg_core_if_t * core_if);
-+#define dwc_param_dma_enable_default 1
-+
-+/**
-+ * When DMA mode is enabled specifies whether to use
-+ * address DMA or DMA Descritor mode for accessing the data
-+ * FIFOs in device mode. The driver will automatically detect
-+ * the value for this parameter if none is specified.
-+ * 0 - address DMA
-+ * 1 - DMA Descriptor(default, if available)
-+ */
-+extern int dwc_otg_set_param_dma_desc_enable(dwc_otg_core_if_t * core_if,
-+					     int32_t val);
-+extern int32_t dwc_otg_get_param_dma_desc_enable(dwc_otg_core_if_t * core_if);
-+//#define dwc_param_dma_desc_enable_default 1
-+#define dwc_param_dma_desc_enable_default 0 // Broadcom BCM2708
-+
-+/** The DMA Burst size (applicable only for External DMA
-+ * Mode). 1, 4, 8 16, 32, 64, 128, 256 (default 32)
-+ */
-+extern int dwc_otg_set_param_dma_burst_size(dwc_otg_core_if_t * core_if,
-+					    int32_t val);
-+extern int32_t dwc_otg_get_param_dma_burst_size(dwc_otg_core_if_t * core_if);
-+#define dwc_param_dma_burst_size_default 32
-+
-+/**
-+ * Specifies the maximum speed of operation in host and device mode.
-+ * The actual speed depends on the speed of the attached device and
-+ * the value of phy_type. The actual speed depends on the speed of the
-+ * attached device.
-+ * 0 - High Speed (default)
-+ * 1 - Full Speed
-+ */
-+extern int dwc_otg_set_param_speed(dwc_otg_core_if_t * core_if, int32_t val);
-+extern int32_t dwc_otg_get_param_speed(dwc_otg_core_if_t * core_if);
-+#define dwc_param_speed_default 0
-+#define DWC_SPEED_PARAM_HIGH 0
-+#define DWC_SPEED_PARAM_FULL 1
-+
-+/** Specifies whether low power mode is supported when attached
-+ *	to a Full Speed or Low Speed device in host mode.
-+ * 0 - Don't support low power mode (default)
-+ * 1 - Support low power mode
-+ */
-+extern int dwc_otg_set_param_host_support_fs_ls_low_power(dwc_otg_core_if_t *
-+							  core_if, int32_t val);
-+extern int32_t dwc_otg_get_param_host_support_fs_ls_low_power(dwc_otg_core_if_t
-+							      * core_if);
-+#define dwc_param_host_support_fs_ls_low_power_default 0
-+
-+/** Specifies the PHY clock rate in low power mode when connected to a
-+ * Low Speed device in host mode. This parameter is applicable only if
-+ * HOST_SUPPORT_FS_LS_LOW_POWER is enabled. If PHY_TYPE is set to FS
-+ * then defaults to 6 MHZ otherwise 48 MHZ.
-+ *
-+ * 0 - 48 MHz
-+ * 1 - 6 MHz
-+ */
-+extern int dwc_otg_set_param_host_ls_low_power_phy_clk(dwc_otg_core_if_t *
-+						       core_if, int32_t val);
-+extern int32_t dwc_otg_get_param_host_ls_low_power_phy_clk(dwc_otg_core_if_t *
-+							   core_if);
-+#define dwc_param_host_ls_low_power_phy_clk_default 0
-+#define DWC_HOST_LS_LOW_POWER_PHY_CLK_PARAM_48MHZ 0
-+#define DWC_HOST_LS_LOW_POWER_PHY_CLK_PARAM_6MHZ 1
-+
-+/**
-+ * 0 - Use cC FIFO size parameters
-+ * 1 - Allow dynamic FIFO sizing (default)
-+ */
-+extern int dwc_otg_set_param_enable_dynamic_fifo(dwc_otg_core_if_t * core_if,
-+						 int32_t val);
-+extern int32_t dwc_otg_get_param_enable_dynamic_fifo(dwc_otg_core_if_t *
-+						     core_if);
-+#define dwc_param_enable_dynamic_fifo_default 1
-+
-+/** Total number of 4-byte words in the data FIFO memory. This
-+ * memory includes the Rx FIFO, non-periodic Tx FIFO, and periodic
-+ * Tx FIFOs.
-+ * 32 to 32768 (default 8192)
-+ * Note: The total FIFO memory depth in the FPGA configuration is 8192.
-+ */
-+extern int dwc_otg_set_param_data_fifo_size(dwc_otg_core_if_t * core_if,
-+					    int32_t val);
-+extern int32_t dwc_otg_get_param_data_fifo_size(dwc_otg_core_if_t * core_if);
-+//#define dwc_param_data_fifo_size_default 8192
-+#define dwc_param_data_fifo_size_default 0xFF0 // Broadcom BCM2708
-+
-+/** Number of 4-byte words in the Rx FIFO in device mode when dynamic
-+ * FIFO sizing is enabled.
-+ * 16 to 32768 (default 1064)
-+ */
-+extern int dwc_otg_set_param_dev_rx_fifo_size(dwc_otg_core_if_t * core_if,
-+					      int32_t val);
-+extern int32_t dwc_otg_get_param_dev_rx_fifo_size(dwc_otg_core_if_t * core_if);
-+#define dwc_param_dev_rx_fifo_size_default 1064
-+
-+/** Number of 4-byte words in the non-periodic Tx FIFO in device mode
-+ * when dynamic FIFO sizing is enabled.
-+ * 16 to 32768 (default 1024)
-+ */
-+extern int dwc_otg_set_param_dev_nperio_tx_fifo_size(dwc_otg_core_if_t *
-+						     core_if, int32_t val);
-+extern int32_t dwc_otg_get_param_dev_nperio_tx_fifo_size(dwc_otg_core_if_t *
-+							 core_if);
-+#define dwc_param_dev_nperio_tx_fifo_size_default 1024
-+
-+/** Number of 4-byte words in each of the periodic Tx FIFOs in device
-+ * mode when dynamic FIFO sizing is enabled.
-+ * 4 to 768 (default 256)
-+ */
-+extern int dwc_otg_set_param_dev_perio_tx_fifo_size(dwc_otg_core_if_t * core_if,
-+						    int32_t val, int fifo_num);
-+extern int32_t dwc_otg_get_param_dev_perio_tx_fifo_size(dwc_otg_core_if_t *
-+							core_if, int fifo_num);
-+#define dwc_param_dev_perio_tx_fifo_size_default 256
-+
-+/** Number of 4-byte words in the Rx FIFO in host mode when dynamic
-+ * FIFO sizing is enabled.
-+ * 16 to 32768 (default 1024)
-+ */
-+extern int dwc_otg_set_param_host_rx_fifo_size(dwc_otg_core_if_t * core_if,
-+					       int32_t val);
-+extern int32_t dwc_otg_get_param_host_rx_fifo_size(dwc_otg_core_if_t * core_if);
-+//#define dwc_param_host_rx_fifo_size_default 1024
-+#define dwc_param_host_rx_fifo_size_default 774 // Broadcom BCM2708
-+
-+/** Number of 4-byte words in the non-periodic Tx FIFO in host mode
-+ * when Dynamic FIFO sizing is enabled in the core.
-+ * 16 to 32768 (default 1024)
-+ */
-+extern int dwc_otg_set_param_host_nperio_tx_fifo_size(dwc_otg_core_if_t *
-+						      core_if, int32_t val);
-+extern int32_t dwc_otg_get_param_host_nperio_tx_fifo_size(dwc_otg_core_if_t *
-+							  core_if);
-+//#define dwc_param_host_nperio_tx_fifo_size_default 1024
-+#define dwc_param_host_nperio_tx_fifo_size_default 0x100 // Broadcom BCM2708
-+
-+/** Number of 4-byte words in the host periodic Tx FIFO when dynamic
-+ * FIFO sizing is enabled.
-+ * 16 to 32768 (default 1024)
-+ */
-+extern int dwc_otg_set_param_host_perio_tx_fifo_size(dwc_otg_core_if_t *
-+						     core_if, int32_t val);
-+extern int32_t dwc_otg_get_param_host_perio_tx_fifo_size(dwc_otg_core_if_t *
-+							 core_if);
-+//#define dwc_param_host_perio_tx_fifo_size_default 1024
-+#define dwc_param_host_perio_tx_fifo_size_default 0x200 // Broadcom BCM2708
-+
-+/** The maximum transfer size supported in bytes.
-+ * 2047 to 65,535  (default 65,535)
-+ */
-+extern int dwc_otg_set_param_max_transfer_size(dwc_otg_core_if_t * core_if,
-+					       int32_t val);
-+extern int32_t dwc_otg_get_param_max_transfer_size(dwc_otg_core_if_t * core_if);
-+#define dwc_param_max_transfer_size_default 65535
-+
-+/** The maximum number of packets in a transfer.
-+ * 15 to 511  (default 511)
-+ */
-+extern int dwc_otg_set_param_max_packet_count(dwc_otg_core_if_t * core_if,
-+					      int32_t val);
-+extern int32_t dwc_otg_get_param_max_packet_count(dwc_otg_core_if_t * core_if);
-+#define dwc_param_max_packet_count_default 511
-+
-+/** The number of host channel registers to use.
-+ * 1 to 16 (default 12)
-+ * Note: The FPGA configuration supports a maximum of 12 host channels.
-+ */
-+extern int dwc_otg_set_param_host_channels(dwc_otg_core_if_t * core_if,
-+					   int32_t val);
-+extern int32_t dwc_otg_get_param_host_channels(dwc_otg_core_if_t * core_if);
-+//#define dwc_param_host_channels_default 12
-+#define dwc_param_host_channels_default 8 // Broadcom BCM2708
-+
-+/** The number of endpoints in addition to EP0 available for device
-+ * mode operations.
-+ * 1 to 15 (default 6 IN and OUT)
-+ * Note: The FPGA configuration supports a maximum of 6 IN and OUT
-+ * endpoints in addition to EP0.
-+ */
-+extern int dwc_otg_set_param_dev_endpoints(dwc_otg_core_if_t * core_if,
-+					   int32_t val);
-+extern int32_t dwc_otg_get_param_dev_endpoints(dwc_otg_core_if_t * core_if);
-+#define dwc_param_dev_endpoints_default 6
-+
-+/**
-+ * Specifies the type of PHY interface to use. By default, the driver
-+ * will automatically detect the phy_type.
-+ *
-+ * 0 - Full Speed PHY
-+ * 1 - UTMI+ (default)
-+ * 2 - ULPI
-+ */
-+extern int dwc_otg_set_param_phy_type(dwc_otg_core_if_t * core_if, int32_t val);
-+extern int32_t dwc_otg_get_param_phy_type(dwc_otg_core_if_t * core_if);
-+#define DWC_PHY_TYPE_PARAM_FS 0
-+#define DWC_PHY_TYPE_PARAM_UTMI 1
-+#define DWC_PHY_TYPE_PARAM_ULPI 2
-+#define dwc_param_phy_type_default DWC_PHY_TYPE_PARAM_UTMI
-+
-+/**
-+ * Specifies the UTMI+ Data Width. This parameter is
-+ * applicable for a PHY_TYPE of UTMI+ or ULPI. (For a ULPI
-+ * PHY_TYPE, this parameter indicates the data width between
-+ * the MAC and the ULPI Wrapper.) Also, this parameter is
-+ * applicable only if the OTG_HSPHY_WIDTH cC parameter was set
-+ * to "8 and 16 bits", meaning that the core has been
-+ * configured to work at either data path width.
-+ *
-+ * 8 or 16 bits (default 16)
-+ */
-+extern int dwc_otg_set_param_phy_utmi_width(dwc_otg_core_if_t * core_if,
-+					    int32_t val);
-+extern int32_t dwc_otg_get_param_phy_utmi_width(dwc_otg_core_if_t * core_if);
-+//#define dwc_param_phy_utmi_width_default 16
-+#define dwc_param_phy_utmi_width_default 8 // Broadcom BCM2708
-+
-+/**
-+ * Specifies whether the ULPI operates at double or single
-+ * data rate. This parameter is only applicable if PHY_TYPE is
-+ * ULPI.
-+ *
-+ * 0 - single data rate ULPI interface with 8 bit wide data
-+ * bus (default)
-+ * 1 - double data rate ULPI interface with 4 bit wide data
-+ * bus
-+ */
-+extern int dwc_otg_set_param_phy_ulpi_ddr(dwc_otg_core_if_t * core_if,
-+					  int32_t val);
-+extern int32_t dwc_otg_get_param_phy_ulpi_ddr(dwc_otg_core_if_t * core_if);
-+#define dwc_param_phy_ulpi_ddr_default 0
-+
-+/**
-+ * Specifies whether to use the internal or external supply to
-+ * drive the vbus with a ULPI phy.
-+ */
-+extern int dwc_otg_set_param_phy_ulpi_ext_vbus(dwc_otg_core_if_t * core_if,
-+					       int32_t val);
-+extern int32_t dwc_otg_get_param_phy_ulpi_ext_vbus(dwc_otg_core_if_t * core_if);
-+#define DWC_PHY_ULPI_INTERNAL_VBUS 0
-+#define DWC_PHY_ULPI_EXTERNAL_VBUS 1
-+#define dwc_param_phy_ulpi_ext_vbus_default DWC_PHY_ULPI_INTERNAL_VBUS
-+
-+/**
-+ * Specifies whether to use the I2Cinterface for full speed PHY. This
-+ * parameter is only applicable if PHY_TYPE is FS.
-+ * 0 - No (default)
-+ * 1 - Yes
-+ */
-+extern int dwc_otg_set_param_i2c_enable(dwc_otg_core_if_t * core_if,
-+					int32_t val);
-+extern int32_t dwc_otg_get_param_i2c_enable(dwc_otg_core_if_t * core_if);
-+#define dwc_param_i2c_enable_default 0
-+
-+extern int dwc_otg_set_param_ulpi_fs_ls(dwc_otg_core_if_t * core_if,
-+					int32_t val);
-+extern int32_t dwc_otg_get_param_ulpi_fs_ls(dwc_otg_core_if_t * core_if);
-+#define dwc_param_ulpi_fs_ls_default 0
-+
-+extern int dwc_otg_set_param_ts_dline(dwc_otg_core_if_t * core_if, int32_t val);
-+extern int32_t dwc_otg_get_param_ts_dline(dwc_otg_core_if_t * core_if);
-+#define dwc_param_ts_dline_default 0
-+
-+/**
-+ * Specifies whether dedicated transmit FIFOs are
-+ * enabled for non periodic IN endpoints in device mode
-+ * 0 - No
-+ * 1 - Yes
-+ */
-+extern int dwc_otg_set_param_en_multiple_tx_fifo(dwc_otg_core_if_t * core_if,
-+						 int32_t val);
-+extern int32_t dwc_otg_get_param_en_multiple_tx_fifo(dwc_otg_core_if_t *
-+						     core_if);
-+#define dwc_param_en_multiple_tx_fifo_default 1
-+
-+/** Number of 4-byte words in each of the Tx FIFOs in device
-+ * mode when dynamic FIFO sizing is enabled.
-+ * 4 to 768 (default 256)
-+ */
-+extern int dwc_otg_set_param_dev_tx_fifo_size(dwc_otg_core_if_t * core_if,
-+					      int fifo_num, int32_t val);
-+extern int32_t dwc_otg_get_param_dev_tx_fifo_size(dwc_otg_core_if_t * core_if,
-+						  int fifo_num);
-+#define dwc_param_dev_tx_fifo_size_default 768
-+
-+/** Thresholding enable flag-
-+ * bit 0 - enable non-ISO Tx thresholding
-+ * bit 1 - enable ISO Tx thresholding
-+ * bit 2 - enable Rx thresholding
-+ */
-+extern int dwc_otg_set_param_thr_ctl(dwc_otg_core_if_t * core_if, int32_t val);
-+extern int32_t dwc_otg_get_thr_ctl(dwc_otg_core_if_t * core_if, int fifo_num);
-+#define dwc_param_thr_ctl_default 0
-+
-+/** Thresholding length for Tx
-+ * FIFOs in 32 bit DWORDs
-+ */
-+extern int dwc_otg_set_param_tx_thr_length(dwc_otg_core_if_t * core_if,
-+					   int32_t val);
-+extern int32_t dwc_otg_get_tx_thr_length(dwc_otg_core_if_t * core_if);
-+#define dwc_param_tx_thr_length_default 64
-+
-+/** Thresholding length for Rx
-+ *	FIFOs in 32 bit DWORDs
-+ */
-+extern int dwc_otg_set_param_rx_thr_length(dwc_otg_core_if_t * core_if,
-+					   int32_t val);
-+extern int32_t dwc_otg_get_rx_thr_length(dwc_otg_core_if_t * core_if);
-+#define dwc_param_rx_thr_length_default 64
-+
-+/**
-+ * Specifies whether LPM (Link Power Management) support is enabled
-+ */
-+extern int dwc_otg_set_param_lpm_enable(dwc_otg_core_if_t * core_if,
-+					int32_t val);
-+extern int32_t dwc_otg_get_param_lpm_enable(dwc_otg_core_if_t * core_if);
-+#define dwc_param_lpm_enable_default 1
-+
-+/**
-+ * Specifies whether PTI enhancement is enabled
-+ */
-+extern int dwc_otg_set_param_pti_enable(dwc_otg_core_if_t * core_if,
-+					int32_t val);
-+extern int32_t dwc_otg_get_param_pti_enable(dwc_otg_core_if_t * core_if);
-+#define dwc_param_pti_enable_default 0
-+
-+/**
-+ * Specifies whether MPI enhancement is enabled
-+ */
-+extern int dwc_otg_set_param_mpi_enable(dwc_otg_core_if_t * core_if,
-+					int32_t val);
-+extern int32_t dwc_otg_get_param_mpi_enable(dwc_otg_core_if_t * core_if);
-+#define dwc_param_mpi_enable_default 0
-+
-+/**
-+ * Specifies whether ADP capability is enabled
-+ */
-+extern int dwc_otg_set_param_adp_enable(dwc_otg_core_if_t * core_if,
-+					int32_t val);
-+extern int32_t dwc_otg_get_param_adp_enable(dwc_otg_core_if_t * core_if);
-+#define dwc_param_adp_enable_default 0
-+
-+/**
-+ * Specifies whether IC_USB capability is enabled
-+ */
-+
-+extern int dwc_otg_set_param_ic_usb_cap(dwc_otg_core_if_t * core_if,
-+					int32_t val);
-+extern int32_t dwc_otg_get_param_ic_usb_cap(dwc_otg_core_if_t * core_if);
-+#define dwc_param_ic_usb_cap_default 0
-+
-+extern int dwc_otg_set_param_ahb_thr_ratio(dwc_otg_core_if_t * core_if,
-+					   int32_t val);
-+extern int32_t dwc_otg_get_param_ahb_thr_ratio(dwc_otg_core_if_t * core_if);
-+#define dwc_param_ahb_thr_ratio_default 0
-+
-+extern int dwc_otg_set_param_power_down(dwc_otg_core_if_t * core_if,
-+					int32_t val);
-+extern int32_t dwc_otg_get_param_power_down(dwc_otg_core_if_t * core_if);
-+#define dwc_param_power_down_default 0
-+
-+extern int dwc_otg_set_param_reload_ctl(dwc_otg_core_if_t * core_if,
-+					int32_t val);
-+extern int32_t dwc_otg_get_param_reload_ctl(dwc_otg_core_if_t * core_if);
-+#define dwc_param_reload_ctl_default 0
-+
-+extern int dwc_otg_set_param_dev_out_nak(dwc_otg_core_if_t * core_if,
-+										int32_t val);
-+extern int32_t dwc_otg_get_param_dev_out_nak(dwc_otg_core_if_t * core_if);
-+#define dwc_param_dev_out_nak_default 0
-+
-+extern int dwc_otg_set_param_cont_on_bna(dwc_otg_core_if_t * core_if,
-+										 int32_t val);
-+extern int32_t dwc_otg_get_param_cont_on_bna(dwc_otg_core_if_t * core_if);
-+#define dwc_param_cont_on_bna_default 0
-+
-+extern int dwc_otg_set_param_ahb_single(dwc_otg_core_if_t * core_if,
-+										 int32_t val);
-+extern int32_t dwc_otg_get_param_ahb_single(dwc_otg_core_if_t * core_if);
-+#define dwc_param_ahb_single_default 0
-+
-+extern int dwc_otg_set_param_otg_ver(dwc_otg_core_if_t * core_if, int32_t val);
-+extern int32_t dwc_otg_get_param_otg_ver(dwc_otg_core_if_t * core_if);
-+#define dwc_param_otg_ver_default 0
-+
-+/** @} */
-+
-+/** @name Access to registers and bit-fields */
-+
-+/**
-+ * Dump core registers and SPRAM
-+ */
-+extern void dwc_otg_dump_dev_registers(dwc_otg_core_if_t * _core_if);
-+extern void dwc_otg_dump_spram(dwc_otg_core_if_t * _core_if);
-+extern void dwc_otg_dump_host_registers(dwc_otg_core_if_t * _core_if);
-+extern void dwc_otg_dump_global_registers(dwc_otg_core_if_t * _core_if);
-+
-+/**
-+ * Get host negotiation status.
-+ */
-+extern uint32_t dwc_otg_get_hnpstatus(dwc_otg_core_if_t * core_if);
-+
-+/**
-+ * Get srp status
-+ */
-+extern uint32_t dwc_otg_get_srpstatus(dwc_otg_core_if_t * core_if);
-+
-+/**
-+ * Set hnpreq bit in the GOTGCTL register.
-+ */
-+extern void dwc_otg_set_hnpreq(dwc_otg_core_if_t * core_if, uint32_t val);
-+
-+/**
-+ * Get Content of SNPSID register.
-+ */
-+extern uint32_t dwc_otg_get_gsnpsid(dwc_otg_core_if_t * core_if);
-+
-+/**
-+ * Get current mode.
-+ * Returns 0 if in device mode, and 1 if in host mode.
-+ */
-+extern uint32_t dwc_otg_get_mode(dwc_otg_core_if_t * core_if);
-+
-+/**
-+ * Get value of hnpcapable field in the GUSBCFG register
-+ */
-+extern uint32_t dwc_otg_get_hnpcapable(dwc_otg_core_if_t * core_if);
-+/**
-+ * Set value of hnpcapable field in the GUSBCFG register
-+ */
-+extern void dwc_otg_set_hnpcapable(dwc_otg_core_if_t * core_if, uint32_t val);
-+
-+/**
-+ * Get value of srpcapable field in the GUSBCFG register
-+ */
-+extern uint32_t dwc_otg_get_srpcapable(dwc_otg_core_if_t * core_if);
-+/**
-+ * Set value of srpcapable field in the GUSBCFG register
-+ */
-+extern void dwc_otg_set_srpcapable(dwc_otg_core_if_t * core_if, uint32_t val);
-+
-+/**
-+ * Get value of devspeed field in the DCFG register
-+ */
-+extern uint32_t dwc_otg_get_devspeed(dwc_otg_core_if_t * core_if);
-+/**
-+ * Set value of devspeed field in the DCFG register
-+ */
-+extern void dwc_otg_set_devspeed(dwc_otg_core_if_t * core_if, uint32_t val);
-+
-+/**
-+ * Get the value of busconnected field from the HPRT0 register
-+ */
-+extern uint32_t dwc_otg_get_busconnected(dwc_otg_core_if_t * core_if);
-+
-+/**
-+ * Gets the device enumeration Speed.
-+ */
-+extern uint32_t dwc_otg_get_enumspeed(dwc_otg_core_if_t * core_if);
-+
-+/**
-+ * Get value of prtpwr field from the HPRT0 register
-+ */
-+extern uint32_t dwc_otg_get_prtpower(dwc_otg_core_if_t * core_if);
-+
-+/**
-+ * Get value of flag indicating core state - hibernated or not
-+ */
-+extern uint32_t dwc_otg_get_core_state(dwc_otg_core_if_t * core_if);
-+
-+/**
-+ * Set value of prtpwr field from the HPRT0 register
-+ */
-+extern void dwc_otg_set_prtpower(dwc_otg_core_if_t * core_if, uint32_t val);
-+
-+/**
-+ * Get value of prtsusp field from the HPRT0 regsiter
-+ */
-+extern uint32_t dwc_otg_get_prtsuspend(dwc_otg_core_if_t * core_if);
-+/**
-+ * Set value of prtpwr field from the HPRT0 register
-+ */
-+extern void dwc_otg_set_prtsuspend(dwc_otg_core_if_t * core_if, uint32_t val);
-+
-+/**
-+ * Get value of ModeChTimEn field from the HCFG regsiter
-+ */
-+extern uint32_t dwc_otg_get_mode_ch_tim(dwc_otg_core_if_t * core_if);
-+/**
-+ * Set value of ModeChTimEn field from the HCFG regsiter
-+ */
-+extern void dwc_otg_set_mode_ch_tim(dwc_otg_core_if_t * core_if, uint32_t val);
-+
-+/**
-+ * Get value of Fram Interval field from the HFIR regsiter
-+ */
-+extern uint32_t dwc_otg_get_fr_interval(dwc_otg_core_if_t * core_if);
-+/**
-+ * Set value of Frame Interval field from the HFIR regsiter
-+ */
-+extern void dwc_otg_set_fr_interval(dwc_otg_core_if_t * core_if, uint32_t val);
-+
-+/**
-+ * Set value of prtres field from the HPRT0 register
-+ *FIXME Remove?
-+ */
-+extern void dwc_otg_set_prtresume(dwc_otg_core_if_t * core_if, uint32_t val);
-+
-+/**
-+ * Get value of rmtwkupsig bit in DCTL register
-+ */
-+extern uint32_t dwc_otg_get_remotewakesig(dwc_otg_core_if_t * core_if);
-+
-+/**
-+ * Get value of prt_sleep_sts field from the GLPMCFG register
-+ */
-+extern uint32_t dwc_otg_get_lpm_portsleepstatus(dwc_otg_core_if_t * core_if);
-+
-+/**
-+ * Get value of rem_wkup_en field from the GLPMCFG register
-+ */
-+extern uint32_t dwc_otg_get_lpm_remotewakeenabled(dwc_otg_core_if_t * core_if);
-+
-+/**
-+ * Get value of appl_resp field from the GLPMCFG register
-+ */
-+extern uint32_t dwc_otg_get_lpmresponse(dwc_otg_core_if_t * core_if);
-+/**
-+ * Set value of appl_resp field from the GLPMCFG register
-+ */
-+extern void dwc_otg_set_lpmresponse(dwc_otg_core_if_t * core_if, uint32_t val);
-+
-+/**
-+ * Get value of hsic_connect field from the GLPMCFG register
-+ */
-+extern uint32_t dwc_otg_get_hsic_connect(dwc_otg_core_if_t * core_if);
-+/**
-+ * Set value of hsic_connect field from the GLPMCFG register
-+ */
-+extern void dwc_otg_set_hsic_connect(dwc_otg_core_if_t * core_if, uint32_t val);
-+
-+/**
-+ * Get value of inv_sel_hsic field from the GLPMCFG register.
-+ */
-+extern uint32_t dwc_otg_get_inv_sel_hsic(dwc_otg_core_if_t * core_if);
-+/**
-+ * Set value of inv_sel_hsic field from the GLPMFG register.
-+ */
-+extern void dwc_otg_set_inv_sel_hsic(dwc_otg_core_if_t * core_if, uint32_t val);
-+
-+/*
-+ * Some functions for accessing registers
-+ */
-+
-+/**
-+ *  GOTGCTL register
-+ */
-+extern uint32_t dwc_otg_get_gotgctl(dwc_otg_core_if_t * core_if);
-+extern void dwc_otg_set_gotgctl(dwc_otg_core_if_t * core_if, uint32_t val);
-+
-+/**
-+ * GUSBCFG register
-+ */
-+extern uint32_t dwc_otg_get_gusbcfg(dwc_otg_core_if_t * core_if);
-+extern void dwc_otg_set_gusbcfg(dwc_otg_core_if_t * core_if, uint32_t val);
-+
-+/**
-+ * GRXFSIZ register
-+ */
-+extern uint32_t dwc_otg_get_grxfsiz(dwc_otg_core_if_t * core_if);
-+extern void dwc_otg_set_grxfsiz(dwc_otg_core_if_t * core_if, uint32_t val);
-+
-+/**
-+ * GNPTXFSIZ register
-+ */
-+extern uint32_t dwc_otg_get_gnptxfsiz(dwc_otg_core_if_t * core_if);
-+extern void dwc_otg_set_gnptxfsiz(dwc_otg_core_if_t * core_if, uint32_t val);
-+
-+extern uint32_t dwc_otg_get_gpvndctl(dwc_otg_core_if_t * core_if);
-+extern void dwc_otg_set_gpvndctl(dwc_otg_core_if_t * core_if, uint32_t val);
-+
-+/**
-+ * GGPIO register
-+ */
-+extern uint32_t dwc_otg_get_ggpio(dwc_otg_core_if_t * core_if);
-+extern void dwc_otg_set_ggpio(dwc_otg_core_if_t * core_if, uint32_t val);
-+
-+/**
-+ * GUID register
-+ */
-+extern uint32_t dwc_otg_get_guid(dwc_otg_core_if_t * core_if);
-+extern void dwc_otg_set_guid(dwc_otg_core_if_t * core_if, uint32_t val);
-+
-+/**
-+ * HPRT0 register
-+ */
-+extern uint32_t dwc_otg_get_hprt0(dwc_otg_core_if_t * core_if);
-+extern void dwc_otg_set_hprt0(dwc_otg_core_if_t * core_if, uint32_t val);
-+
-+/**
-+ * GHPTXFSIZE
-+ */
-+extern uint32_t dwc_otg_get_hptxfsiz(dwc_otg_core_if_t * core_if);
-+
-+/** @} */
-+
-+#endif				/* __DWC_CORE_IF_H__ */
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_dbg.h
-@@ -0,0 +1,117 @@
-+/* ==========================================================================
-+ *
-+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
-+ * "Software") is an Unsupported proprietary work of Synopsys, Inc. unless
-+ * otherwise expressly agreed to in writing between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product under
-+ * any End User Software License Agreement or Agreement for Licensed Product
-+ * with Synopsys or any supplement thereto. You are permitted to use and
-+ * redistribute this Software in source and binary forms, with or without
-+ * modification, provided that redistributions of source code must retain this
-+ * notice. You may not view, use, disclose, copy or distribute this file or
-+ * any information contained herein except pursuant to this license grant from
-+ * Synopsys. If you do not agree with this notice, including the disclaimer
-+ * below, then you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" BASIS
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS BE LIABLE FOR ANY DIRECT,
-+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================== */
-+
-+#ifndef __DWC_OTG_DBG_H__
-+#define __DWC_OTG_DBG_H__
-+
-+/** @file
-+ * This file defines debug levels.
-+ * Debugging support vanishes in non-debug builds.
-+ */
-+
-+/**
-+ * The Debug Level bit-mask variable.
-+ */
-+extern uint32_t g_dbg_lvl;
-+/**
-+ * Set the Debug Level variable.
-+ */
-+static inline uint32_t SET_DEBUG_LEVEL(const uint32_t new)
-+{
-+	uint32_t old = g_dbg_lvl;
-+	g_dbg_lvl = new;
-+	return old;
-+}
-+
-+#define DBG_USER	(0x1)
-+/** When debug level has the DBG_CIL bit set, display CIL Debug messages. */
-+#define DBG_CIL		(0x2)
-+/** When debug level has the DBG_CILV bit set, display CIL Verbose debug
-+ * messages */
-+#define DBG_CILV	(0x20)
-+/**  When debug level has the DBG_PCD bit set, display PCD (Device) debug
-+ *  messages */
-+#define DBG_PCD		(0x4)
-+/** When debug level has the DBG_PCDV set, display PCD (Device) Verbose debug
-+ * messages */
-+#define DBG_PCDV	(0x40)
-+/** When debug level has the DBG_HCD bit set, display Host debug messages */
-+#define DBG_HCD		(0x8)
-+/** When debug level has the DBG_HCDV bit set, display Verbose Host debug
-+ * messages */
-+#define DBG_HCDV	(0x80)
-+/** When debug level has the DBG_HCD_URB bit set, display enqueued URBs in host
-+ *  mode. */
-+#define DBG_HCD_URB	(0x800)
-+/** When debug level has the DBG_HCDI bit set, display host interrupt
-+ *  messages. */
-+#define DBG_HCDI	(0x1000)
-+
-+/** When debug level has any bit set, display debug messages */
-+#define DBG_ANY		(0xFF)
-+
-+/** All debug messages off */
-+#define DBG_OFF		0
-+
-+/** Prefix string for DWC_DEBUG print macros. */
-+#define USB_DWC "DWC_otg: "
-+
-+/**
-+ * Print a debug message when the Global debug level variable contains
-+ * the bit defined in <code>lvl</code>.
-+ *
-+ * @param[in] lvl - Debug level, use one of the DBG_ constants above.
-+ * @param[in] x - like printf
-+ *
-+ *    Example:<p>
-+ * <code>
-+ *      DWC_DEBUGPL( DBG_ANY, "%s(%p)\n", __func__, _reg_base_addr);
-+ * </code>
-+ * <br>
-+ * results in:<br>
-+ * <code>
-+ * usb-DWC_otg: dwc_otg_cil_init(ca867000)
-+ * </code>
-+ */
-+#ifdef DEBUG
-+
-+# define DWC_DEBUGPL(lvl, x...) do{ if ((lvl)&g_dbg_lvl)__DWC_DEBUG(USB_DWC x ); }while(0)
-+# define DWC_DEBUGP(x...)	DWC_DEBUGPL(DBG_ANY, x )
-+
-+# define CHK_DEBUG_LEVEL(level) ((level) & g_dbg_lvl)
-+
-+#else
-+
-+# define DWC_DEBUGPL(lvl, x...) do{}while(0)
-+# define DWC_DEBUGP(x...)
-+
-+# define CHK_DEBUG_LEVEL(level) (0)
-+
-+#endif /*DEBUG*/
-+#endif
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_driver.c
-@@ -0,0 +1,1772 @@
-+/* ==========================================================================
-+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.c $
-+ * $Revision: #92 $
-+ * $Date: 2012/08/10 $
-+ * $Change: 2047372 $
-+ *
-+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
-+ * "Software") is an Unsupported proprietary work of Synopsys, Inc. unless
-+ * otherwise expressly agreed to in writing between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product under
-+ * any End User Software License Agreement or Agreement for Licensed Product
-+ * with Synopsys or any supplement thereto. You are permitted to use and
-+ * redistribute this Software in source and binary forms, with or without
-+ * modification, provided that redistributions of source code must retain this
-+ * notice. You may not view, use, disclose, copy or distribute this file or
-+ * any information contained herein except pursuant to this license grant from
-+ * Synopsys. If you do not agree with this notice, including the disclaimer
-+ * below, then you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" BASIS
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS BE LIABLE FOR ANY DIRECT,
-+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================== */
-+
-+/** @file
-+ * The dwc_otg_driver module provides the initialization and cleanup entry
-+ * points for the DWC_otg driver. This module will be dynamically installed
-+ * after Linux is booted using the insmod command. When the module is
-+ * installed, the dwc_otg_driver_init function is called. When the module is
-+ * removed (using rmmod), the dwc_otg_driver_cleanup function is called.
-+ *
-+ * This module also defines a data structure for the dwc_otg_driver, which is
-+ * used in conjunction with the standard ARM lm_device structure. These
-+ * structures allow the OTG driver to comply with the standard Linux driver
-+ * model in which devices and drivers are registered with a bus driver. This
-+ * has the benefit that Linux can expose attributes of the driver and device
-+ * in its special sysfs file system. Users can then read or write files in
-+ * this file system to perform diagnostics on the driver components or the
-+ * device.
-+ */
-+
-+#include "dwc_otg_os_dep.h"
-+#include "dwc_os.h"
-+#include "dwc_otg_dbg.h"
-+#include "dwc_otg_driver.h"
-+#include "dwc_otg_attr.h"
-+#include "dwc_otg_core_if.h"
-+#include "dwc_otg_pcd_if.h"
-+#include "dwc_otg_hcd_if.h"
-+#include "dwc_otg_fiq_fsm.h"
-+
-+#define DWC_DRIVER_VERSION	"3.00a 10-AUG-2012"
-+#define DWC_DRIVER_DESC		"HS OTG USB Controller driver"
-+
-+bool microframe_schedule=true;
-+
-+static const char dwc_driver_name[] = "dwc_otg";
-+
-+
-+extern int pcd_init(
-+#ifdef LM_INTERFACE
-+			   struct lm_device *_dev
-+#elif  defined(PCI_INTERFACE)
-+			   struct pci_dev *_dev
-+#elif  defined(PLATFORM_INTERFACE)
-+	struct platform_device *dev
-+#endif
-+    );
-+extern int hcd_init(
-+#ifdef LM_INTERFACE
-+			   struct lm_device *_dev
-+#elif  defined(PCI_INTERFACE)
-+			   struct pci_dev *_dev
-+#elif  defined(PLATFORM_INTERFACE)
-+	struct platform_device *dev
-+#endif
-+    );
-+
-+extern int pcd_remove(
-+#ifdef LM_INTERFACE
-+			     struct lm_device *_dev
-+#elif  defined(PCI_INTERFACE)
-+			     struct pci_dev *_dev
-+#elif  defined(PLATFORM_INTERFACE)
-+	struct platform_device *_dev
-+#endif
-+    );
-+
-+extern void hcd_remove(
-+#ifdef LM_INTERFACE
-+			      struct lm_device *_dev
-+#elif  defined(PCI_INTERFACE)
-+			      struct pci_dev *_dev
-+#elif  defined(PLATFORM_INTERFACE)
-+	struct platform_device *_dev
-+#endif
-+    );
-+
-+extern void dwc_otg_adp_start(dwc_otg_core_if_t * core_if, uint8_t is_host);
-+
-+/*-------------------------------------------------------------------------*/
-+/* Encapsulate the module parameter settings */
-+
-+struct dwc_otg_driver_module_params {
-+	int32_t opt;
-+	int32_t otg_cap;
-+	int32_t dma_enable;
-+	int32_t dma_desc_enable;
-+	int32_t dma_burst_size;
-+	int32_t speed;
-+	int32_t host_support_fs_ls_low_power;
-+	int32_t host_ls_low_power_phy_clk;
-+	int32_t enable_dynamic_fifo;
-+	int32_t data_fifo_size;
-+	int32_t dev_rx_fifo_size;
-+	int32_t dev_nperio_tx_fifo_size;
-+	uint32_t dev_perio_tx_fifo_size[MAX_PERIO_FIFOS];
-+	int32_t host_rx_fifo_size;
-+	int32_t host_nperio_tx_fifo_size;
-+	int32_t host_perio_tx_fifo_size;
-+	int32_t max_transfer_size;
-+	int32_t max_packet_count;
-+	int32_t host_channels;
-+	int32_t dev_endpoints;
-+	int32_t phy_type;
-+	int32_t phy_utmi_width;
-+	int32_t phy_ulpi_ddr;
-+	int32_t phy_ulpi_ext_vbus;
-+	int32_t i2c_enable;
-+	int32_t ulpi_fs_ls;
-+	int32_t ts_dline;
-+	int32_t en_multiple_tx_fifo;
-+	uint32_t dev_tx_fifo_size[MAX_TX_FIFOS];
-+	uint32_t thr_ctl;
-+	uint32_t tx_thr_length;
-+	uint32_t rx_thr_length;
-+	int32_t pti_enable;
-+	int32_t mpi_enable;
-+	int32_t lpm_enable;
-+	int32_t ic_usb_cap;
-+	int32_t ahb_thr_ratio;
-+	int32_t power_down;
-+	int32_t reload_ctl;
-+	int32_t dev_out_nak;
-+	int32_t cont_on_bna;
-+	int32_t ahb_single;
-+	int32_t otg_ver;
-+	int32_t adp_enable;
-+};
-+
-+static struct dwc_otg_driver_module_params dwc_otg_module_params = {
-+	.opt = -1,
-+	.otg_cap = -1,
-+	.dma_enable = -1,
-+	.dma_desc_enable = -1,
-+	.dma_burst_size = -1,
-+	.speed = -1,
-+	.host_support_fs_ls_low_power = -1,
-+	.host_ls_low_power_phy_clk = -1,
-+	.enable_dynamic_fifo = -1,
-+	.data_fifo_size = -1,
-+	.dev_rx_fifo_size = -1,
-+	.dev_nperio_tx_fifo_size = -1,
-+	.dev_perio_tx_fifo_size = {
-+				   /* dev_perio_tx_fifo_size_1 */
-+				   -1,
-+				   -1,
-+				   -1,
-+				   -1,
-+				   -1,
-+				   -1,
-+				   -1,
-+				   -1,
-+				   -1,
-+				   -1,
-+				   -1,
-+				   -1,
-+				   -1,
-+				   -1,
-+				   -1
-+				   /* 15 */
-+				   },
-+	.host_rx_fifo_size = -1,
-+	.host_nperio_tx_fifo_size = -1,
-+	.host_perio_tx_fifo_size = -1,
-+	.max_transfer_size = -1,
-+	.max_packet_count = -1,
-+	.host_channels = -1,
-+	.dev_endpoints = -1,
-+	.phy_type = -1,
-+	.phy_utmi_width = -1,
-+	.phy_ulpi_ddr = -1,
-+	.phy_ulpi_ext_vbus = -1,
-+	.i2c_enable = -1,
-+	.ulpi_fs_ls = -1,
-+	.ts_dline = -1,
-+	.en_multiple_tx_fifo = -1,
-+	.dev_tx_fifo_size = {
-+			     /* dev_tx_fifo_size */
-+			     -1,
-+			     -1,
-+			     -1,
-+			     -1,
-+			     -1,
-+			     -1,
-+			     -1,
-+			     -1,
-+			     -1,
-+			     -1,
-+			     -1,
-+			     -1,
-+			     -1,
-+			     -1,
-+			     -1
-+			     /* 15 */
-+			     },
-+	.thr_ctl = -1,
-+	.tx_thr_length = -1,
-+	.rx_thr_length = -1,
-+	.pti_enable = -1,
-+	.mpi_enable = -1,
-+	.lpm_enable = 0,
-+	.ic_usb_cap = -1,
-+	.ahb_thr_ratio = -1,
-+	.power_down = -1,
-+	.reload_ctl = -1,
-+	.dev_out_nak = -1,
-+	.cont_on_bna = -1,
-+	.ahb_single = -1,
-+	.otg_ver = -1,
-+	.adp_enable = -1,
-+};
-+
-+//Global variable to switch the fiq fix on or off
-+bool fiq_enable = 1;
-+// Global variable to enable the split transaction fix
-+bool fiq_fsm_enable = true;
-+//Bulk split-transaction NAK holdoff in microframes
-+uint16_t nak_holdoff = 8;
-+
-+//Force host mode during CIL re-init
-+bool cil_force_host = true;
-+
-+unsigned short fiq_fsm_mask = 0x0F;
-+
-+unsigned short int_ep_interval_min = 0;
-+/**
-+ * This function shows the Driver Version.
-+ */
-+static ssize_t version_show(struct device_driver *dev, char *buf)
-+{
-+	return snprintf(buf, sizeof(DWC_DRIVER_VERSION) + 2, "%s\n",
-+			DWC_DRIVER_VERSION);
-+}
-+
-+static DRIVER_ATTR_RO(version);
-+
-+/**
-+ * Global Debug Level Mask.
-+ */
-+uint32_t g_dbg_lvl = 0;		/* OFF */
-+
-+/**
-+ * This function shows the driver Debug Level.
-+ */
-+static ssize_t debuglevel_show(struct device_driver *drv, char *buf)
-+{
-+	return sprintf(buf, "0x%0x\n", g_dbg_lvl);
-+}
-+
-+/**
-+ * This function stores the driver Debug Level.
-+ */
-+static ssize_t debuglevel_store(struct device_driver *drv, const char *buf,
-+			       size_t count)
-+{
-+	g_dbg_lvl = simple_strtoul(buf, NULL, 16);
-+	return count;
-+}
-+
-+static DRIVER_ATTR_RW(debuglevel);
-+
-+/**
-+ * This function is called during module intialization
-+ * to pass module parameters to the DWC_OTG CORE.
-+ */
-+static int set_parameters(dwc_otg_core_if_t * core_if)
-+{
-+	int retval = 0;
-+	int i;
-+
-+	if (dwc_otg_module_params.otg_cap != -1) {
-+		retval +=
-+		    dwc_otg_set_param_otg_cap(core_if,
-+					      dwc_otg_module_params.otg_cap);
-+	}
-+	if (dwc_otg_module_params.dma_enable != -1) {
-+		retval +=
-+		    dwc_otg_set_param_dma_enable(core_if,
-+						 dwc_otg_module_params.
-+						 dma_enable);
-+	}
-+	if (dwc_otg_module_params.dma_desc_enable != -1) {
-+		retval +=
-+		    dwc_otg_set_param_dma_desc_enable(core_if,
-+						      dwc_otg_module_params.
-+						      dma_desc_enable);
-+	}
-+	if (dwc_otg_module_params.opt != -1) {
-+		retval +=
-+		    dwc_otg_set_param_opt(core_if, dwc_otg_module_params.opt);
-+	}
-+	if (dwc_otg_module_params.dma_burst_size != -1) {
-+		retval +=
-+		    dwc_otg_set_param_dma_burst_size(core_if,
-+						     dwc_otg_module_params.
-+						     dma_burst_size);
-+	}
-+	if (dwc_otg_module_params.host_support_fs_ls_low_power != -1) {
-+		retval +=
-+		    dwc_otg_set_param_host_support_fs_ls_low_power(core_if,
-+								   dwc_otg_module_params.
-+								   host_support_fs_ls_low_power);
-+	}
-+	if (dwc_otg_module_params.enable_dynamic_fifo != -1) {
-+		retval +=
-+		    dwc_otg_set_param_enable_dynamic_fifo(core_if,
-+							  dwc_otg_module_params.
-+							  enable_dynamic_fifo);
-+	}
-+	if (dwc_otg_module_params.data_fifo_size != -1) {
-+		retval +=
-+		    dwc_otg_set_param_data_fifo_size(core_if,
-+						     dwc_otg_module_params.
-+						     data_fifo_size);
-+	}
-+	if (dwc_otg_module_params.dev_rx_fifo_size != -1) {
-+		retval +=
-+		    dwc_otg_set_param_dev_rx_fifo_size(core_if,
-+						       dwc_otg_module_params.
-+						       dev_rx_fifo_size);
-+	}
-+	if (dwc_otg_module_params.dev_nperio_tx_fifo_size != -1) {
-+		retval +=
-+		    dwc_otg_set_param_dev_nperio_tx_fifo_size(core_if,
-+							      dwc_otg_module_params.
-+							      dev_nperio_tx_fifo_size);
-+	}
-+	if (dwc_otg_module_params.host_rx_fifo_size != -1) {
-+		retval +=
-+		    dwc_otg_set_param_host_rx_fifo_size(core_if,
-+							dwc_otg_module_params.host_rx_fifo_size);
-+	}
-+	if (dwc_otg_module_params.host_nperio_tx_fifo_size != -1) {
-+		retval +=
-+		    dwc_otg_set_param_host_nperio_tx_fifo_size(core_if,
-+							       dwc_otg_module_params.
-+							       host_nperio_tx_fifo_size);
-+	}
-+	if (dwc_otg_module_params.host_perio_tx_fifo_size != -1) {
-+		retval +=
-+		    dwc_otg_set_param_host_perio_tx_fifo_size(core_if,
-+							      dwc_otg_module_params.
-+							      host_perio_tx_fifo_size);
-+	}
-+	if (dwc_otg_module_params.max_transfer_size != -1) {
-+		retval +=
-+		    dwc_otg_set_param_max_transfer_size(core_if,
-+							dwc_otg_module_params.
-+							max_transfer_size);
-+	}
-+	if (dwc_otg_module_params.max_packet_count != -1) {
-+		retval +=
-+		    dwc_otg_set_param_max_packet_count(core_if,
-+						       dwc_otg_module_params.
-+						       max_packet_count);
-+	}
-+	if (dwc_otg_module_params.host_channels != -1) {
-+		retval +=
-+		    dwc_otg_set_param_host_channels(core_if,
-+						    dwc_otg_module_params.
-+						    host_channels);
-+	}
-+	if (dwc_otg_module_params.dev_endpoints != -1) {
-+		retval +=
-+		    dwc_otg_set_param_dev_endpoints(core_if,
-+						    dwc_otg_module_params.
-+						    dev_endpoints);
-+	}
-+	if (dwc_otg_module_params.phy_type != -1) {
-+		retval +=
-+		    dwc_otg_set_param_phy_type(core_if,
-+					       dwc_otg_module_params.phy_type);
-+	}
-+	if (dwc_otg_module_params.speed != -1) {
-+		retval +=
-+		    dwc_otg_set_param_speed(core_if,
-+					    dwc_otg_module_params.speed);
-+	}
-+	if (dwc_otg_module_params.host_ls_low_power_phy_clk != -1) {
-+		retval +=
-+		    dwc_otg_set_param_host_ls_low_power_phy_clk(core_if,
-+								dwc_otg_module_params.
-+								host_ls_low_power_phy_clk);
-+	}
-+	if (dwc_otg_module_params.phy_ulpi_ddr != -1) {
-+		retval +=
-+		    dwc_otg_set_param_phy_ulpi_ddr(core_if,
-+						   dwc_otg_module_params.
-+						   phy_ulpi_ddr);
-+	}
-+	if (dwc_otg_module_params.phy_ulpi_ext_vbus != -1) {
-+		retval +=
-+		    dwc_otg_set_param_phy_ulpi_ext_vbus(core_if,
-+							dwc_otg_module_params.
-+							phy_ulpi_ext_vbus);
-+	}
-+	if (dwc_otg_module_params.phy_utmi_width != -1) {
-+		retval +=
-+		    dwc_otg_set_param_phy_utmi_width(core_if,
-+						     dwc_otg_module_params.
-+						     phy_utmi_width);
-+	}
-+	if (dwc_otg_module_params.ulpi_fs_ls != -1) {
-+		retval +=
-+		    dwc_otg_set_param_ulpi_fs_ls(core_if,
-+						 dwc_otg_module_params.ulpi_fs_ls);
-+	}
-+	if (dwc_otg_module_params.ts_dline != -1) {
-+		retval +=
-+		    dwc_otg_set_param_ts_dline(core_if,
-+					       dwc_otg_module_params.ts_dline);
-+	}
-+	if (dwc_otg_module_params.i2c_enable != -1) {
-+		retval +=
-+		    dwc_otg_set_param_i2c_enable(core_if,
-+						 dwc_otg_module_params.
-+						 i2c_enable);
-+	}
-+	if (dwc_otg_module_params.en_multiple_tx_fifo != -1) {
-+		retval +=
-+		    dwc_otg_set_param_en_multiple_tx_fifo(core_if,
-+							  dwc_otg_module_params.
-+							  en_multiple_tx_fifo);
-+	}
-+	for (i = 0; i < 15; i++) {
-+		if (dwc_otg_module_params.dev_perio_tx_fifo_size[i] != -1) {
-+			retval +=
-+			    dwc_otg_set_param_dev_perio_tx_fifo_size(core_if,
-+								     dwc_otg_module_params.
-+								     dev_perio_tx_fifo_size
-+								     [i], i);
-+		}
-+	}
-+
-+	for (i = 0; i < 15; i++) {
-+		if (dwc_otg_module_params.dev_tx_fifo_size[i] != -1) {
-+			retval += dwc_otg_set_param_dev_tx_fifo_size(core_if,
-+								     dwc_otg_module_params.
-+								     dev_tx_fifo_size
-+								     [i], i);
-+		}
-+	}
-+	if (dwc_otg_module_params.thr_ctl != -1) {
-+		retval +=
-+		    dwc_otg_set_param_thr_ctl(core_if,
-+					      dwc_otg_module_params.thr_ctl);
-+	}
-+	if (dwc_otg_module_params.mpi_enable != -1) {
-+		retval +=
-+		    dwc_otg_set_param_mpi_enable(core_if,
-+						 dwc_otg_module_params.
-+						 mpi_enable);
-+	}
-+	if (dwc_otg_module_params.pti_enable != -1) {
-+		retval +=
-+		    dwc_otg_set_param_pti_enable(core_if,
-+						 dwc_otg_module_params.
-+						 pti_enable);
-+	}
-+	if (dwc_otg_module_params.lpm_enable != -1) {
-+		retval +=
-+		    dwc_otg_set_param_lpm_enable(core_if,
-+						 dwc_otg_module_params.
-+						 lpm_enable);
-+	}
-+	if (dwc_otg_module_params.ic_usb_cap != -1) {
-+		retval +=
-+		    dwc_otg_set_param_ic_usb_cap(core_if,
-+						 dwc_otg_module_params.
-+						 ic_usb_cap);
-+	}
-+	if (dwc_otg_module_params.tx_thr_length != -1) {
-+		retval +=
-+		    dwc_otg_set_param_tx_thr_length(core_if,
-+						    dwc_otg_module_params.tx_thr_length);
-+	}
-+	if (dwc_otg_module_params.rx_thr_length != -1) {
-+		retval +=
-+		    dwc_otg_set_param_rx_thr_length(core_if,
-+						    dwc_otg_module_params.
-+						    rx_thr_length);
-+	}
-+	if (dwc_otg_module_params.ahb_thr_ratio != -1) {
-+		retval +=
-+		    dwc_otg_set_param_ahb_thr_ratio(core_if,
-+						    dwc_otg_module_params.ahb_thr_ratio);
-+	}
-+	if (dwc_otg_module_params.power_down != -1) {
-+		retval +=
-+		    dwc_otg_set_param_power_down(core_if,
-+						 dwc_otg_module_params.power_down);
-+	}
-+	if (dwc_otg_module_params.reload_ctl != -1) {
-+		retval +=
-+		    dwc_otg_set_param_reload_ctl(core_if,
-+						 dwc_otg_module_params.reload_ctl);
-+	}
-+
-+	if (dwc_otg_module_params.dev_out_nak != -1) {
-+		retval +=
-+			dwc_otg_set_param_dev_out_nak(core_if,
-+			dwc_otg_module_params.dev_out_nak);
-+	}
-+
-+	if (dwc_otg_module_params.cont_on_bna != -1) {
-+		retval +=
-+			dwc_otg_set_param_cont_on_bna(core_if,
-+			dwc_otg_module_params.cont_on_bna);
-+	}
-+
-+	if (dwc_otg_module_params.ahb_single != -1) {
-+		retval +=
-+			dwc_otg_set_param_ahb_single(core_if,
-+			dwc_otg_module_params.ahb_single);
-+	}
-+
-+	if (dwc_otg_module_params.otg_ver != -1) {
-+		retval +=
-+		    dwc_otg_set_param_otg_ver(core_if,
-+					      dwc_otg_module_params.otg_ver);
-+	}
-+	if (dwc_otg_module_params.adp_enable != -1) {
-+		retval +=
-+		    dwc_otg_set_param_adp_enable(core_if,
-+						 dwc_otg_module_params.
-+						 adp_enable);
-+	}
-+	return retval;
-+}
-+
-+/**
-+ * This function is the top level interrupt handler for the Common
-+ * (Device and host modes) interrupts.
-+ */
-+static irqreturn_t dwc_otg_common_irq(int irq, void *dev)
-+{
-+	int32_t retval = IRQ_NONE;
-+
-+	retval = dwc_otg_handle_common_intr(dev);
-+	if (retval != 0) {
-+		S3C2410X_CLEAR_EINTPEND();
-+	}
-+	return IRQ_RETVAL(retval);
-+}
-+
-+/**
-+ * This function is called when a lm_device is unregistered with the
-+ * dwc_otg_driver. This happens, for example, when the rmmod command is
-+ * executed. The device may or may not be electrically present. If it is
-+ * present, the driver stops device processing. Any resources used on behalf
-+ * of this device are freed.
-+ *
-+ * @param _dev
-+ */
-+#ifdef LM_INTERFACE
-+#define REM_RETVAL(n)
-+static void dwc_otg_driver_remove(	 struct lm_device *_dev )
-+{       dwc_otg_device_t *otg_dev = lm_get_drvdata(_dev);
-+#elif  defined(PCI_INTERFACE)
-+#define REM_RETVAL(n)
-+static void dwc_otg_driver_remove(	 struct pci_dev *_dev )
-+{	dwc_otg_device_t *otg_dev = pci_get_drvdata(_dev);
-+#elif  defined(PLATFORM_INTERFACE)
-+#define REM_RETVAL(n) n
-+static int dwc_otg_driver_remove(        struct platform_device *_dev )
-+{       dwc_otg_device_t *otg_dev = platform_get_drvdata(_dev);
-+#endif
-+
-+	DWC_DEBUGPL(DBG_ANY, "%s(%p) otg_dev %p\n", __func__, _dev, otg_dev);
-+
-+	if (!otg_dev) {
-+		/* Memory allocation for the dwc_otg_device failed. */
-+		DWC_DEBUGPL(DBG_ANY, "%s: otg_dev NULL!\n", __func__);
-+                return REM_RETVAL(-ENOMEM);
-+	}
-+#ifndef DWC_DEVICE_ONLY
-+	if (otg_dev->hcd) {
-+		hcd_remove(_dev);
-+	} else {
-+		DWC_DEBUGPL(DBG_ANY, "%s: otg_dev->hcd NULL!\n", __func__);
-+                return REM_RETVAL(-EINVAL);
-+	}
-+#endif
-+
-+#ifndef DWC_HOST_ONLY
-+	if (otg_dev->pcd) {
-+		pcd_remove(_dev);
-+	} else {
-+		DWC_DEBUGPL(DBG_ANY, "%s: otg_dev->pcd NULL!\n", __func__);
-+                return REM_RETVAL(-EINVAL);
-+	}
-+#endif
-+	/*
-+	 * Free the IRQ
-+	 */
-+	if (otg_dev->common_irq_installed) {
-+		free_irq(otg_dev->os_dep.irq_num, otg_dev);
-+        } else {
-+		DWC_DEBUGPL(DBG_ANY, "%s: There is no installed irq!\n", __func__);
-+		return REM_RETVAL(-ENXIO);
-+	}
-+
-+	if (otg_dev->core_if) {
-+		dwc_otg_cil_remove(otg_dev->core_if);
-+	} else {
-+		DWC_DEBUGPL(DBG_ANY, "%s: otg_dev->core_if NULL!\n", __func__);
-+		return REM_RETVAL(-ENXIO);
-+	}
-+
-+	/*
-+	 * Remove the device attributes
-+	 */
-+	dwc_otg_attr_remove(_dev);
-+
-+	/*
-+	 * Return the memory.
-+	 */
-+	if (otg_dev->os_dep.base) {
-+		iounmap(otg_dev->os_dep.base);
-+	}
-+	DWC_FREE(otg_dev);
-+
-+	/*
-+	 * Clear the drvdata pointer.
-+	 */
-+#ifdef LM_INTERFACE
-+	lm_set_drvdata(_dev, 0);
-+#elif defined(PCI_INTERFACE)
-+        release_mem_region(otg_dev->os_dep.rsrc_start,
-+                           otg_dev->os_dep.rsrc_len);
-+	pci_set_drvdata(_dev, 0);
-+#elif  defined(PLATFORM_INTERFACE)
-+        platform_set_drvdata(_dev, 0);
-+#endif
-+        return REM_RETVAL(0);
-+}
-+
-+/**
-+ * This function is called when an lm_device is bound to a
-+ * dwc_otg_driver. It creates the driver components required to
-+ * control the device (CIL, HCD, and PCD) and it initializes the
-+ * device. The driver components are stored in a dwc_otg_device
-+ * structure. A reference to the dwc_otg_device is saved in the
-+ * lm_device. This allows the driver to access the dwc_otg_device
-+ * structure on subsequent calls to driver methods for this device.
-+ *
-+ * @param _dev Bus device
-+ */
-+static int dwc_otg_driver_probe(
-+#ifdef LM_INTERFACE
-+				       struct lm_device *_dev
-+#elif defined(PCI_INTERFACE)
-+				       struct pci_dev *_dev,
-+				       const struct pci_device_id *id
-+#elif  defined(PLATFORM_INTERFACE)
-+                                       struct platform_device *_dev
-+#endif
-+    )
-+{
-+	int retval = 0;
-+	dwc_otg_device_t *dwc_otg_device;
-+        int devirq;
-+
-+	dev_dbg(&_dev->dev, "dwc_otg_driver_probe(%p)\n", _dev);
-+#ifdef LM_INTERFACE
-+	dev_dbg(&_dev->dev, "start=0x%08x\n", (unsigned)_dev->resource.start);
-+#elif defined(PCI_INTERFACE)
-+	if (!id) {
-+		DWC_ERROR("Invalid pci_device_id %p", id);
-+		return -EINVAL;
-+	}
-+
-+	if (!_dev || (pci_enable_device(_dev) < 0)) {
-+		DWC_ERROR("Invalid pci_device %p", _dev);
-+		return -ENODEV;
-+	}
-+	dev_dbg(&_dev->dev, "start=0x%08x\n", (unsigned)pci_resource_start(_dev,0));
-+	/* other stuff needed as well? */
-+
-+#elif  defined(PLATFORM_INTERFACE)
-+	dev_dbg(&_dev->dev, "start=0x%08x (len 0x%x)\n",
-+                (unsigned)_dev->resource->start,
-+                (unsigned)(_dev->resource->end - _dev->resource->start));
-+#endif
-+
-+	dwc_otg_device = DWC_ALLOC(sizeof(dwc_otg_device_t));
-+
-+	if (!dwc_otg_device) {
-+		dev_err(&_dev->dev, "kmalloc of dwc_otg_device failed\n");
-+		return -ENOMEM;
-+	}
-+
-+	memset(dwc_otg_device, 0, sizeof(*dwc_otg_device));
-+	dwc_otg_device->os_dep.reg_offset = 0xFFFFFFFF;
-+	dwc_otg_device->os_dep.platformdev = _dev;
-+
-+	/*
-+	 * Map the DWC_otg Core memory into virtual address space.
-+	 */
-+#ifdef LM_INTERFACE
-+	dwc_otg_device->os_dep.base = ioremap(_dev->resource.start, SZ_256K);
-+
-+	if (!dwc_otg_device->os_dep.base) {
-+		dev_err(&_dev->dev, "ioremap() failed\n");
-+		DWC_FREE(dwc_otg_device);
-+		return -ENOMEM;
-+	}
-+	dev_dbg(&_dev->dev, "base=0x%08x\n",
-+		(unsigned)dwc_otg_device->os_dep.base);
-+#elif defined(PCI_INTERFACE)
-+	_dev->current_state = PCI_D0;
-+	_dev->dev.power.power_state = PMSG_ON;
-+
-+	if (!_dev->irq) {
-+		DWC_ERROR("Found HC with no IRQ. Check BIOS/PCI %s setup!",
-+			  pci_name(_dev));
-+		iounmap(dwc_otg_device->os_dep.base);
-+		DWC_FREE(dwc_otg_device);
-+		return -ENODEV;
-+	}
-+
-+	dwc_otg_device->os_dep.rsrc_start = pci_resource_start(_dev, 0);
-+	dwc_otg_device->os_dep.rsrc_len = pci_resource_len(_dev, 0);
-+	DWC_DEBUGPL(DBG_ANY, "PCI resource: start=%08x, len=%08x\n",
-+		    (unsigned)dwc_otg_device->os_dep.rsrc_start,
-+		    (unsigned)dwc_otg_device->os_dep.rsrc_len);
-+	if (!request_mem_region
-+	    (dwc_otg_device->os_dep.rsrc_start, dwc_otg_device->os_dep.rsrc_len,
-+	     "dwc_otg")) {
-+		dev_dbg(&_dev->dev, "error requesting memory\n");
-+		iounmap(dwc_otg_device->os_dep.base);
-+		DWC_FREE(dwc_otg_device);
-+		return -EFAULT;
-+	}
-+
-+	dwc_otg_device->os_dep.base =
-+	    ioremap(dwc_otg_device->os_dep.rsrc_start,
-+			    dwc_otg_device->os_dep.rsrc_len);
-+	if (dwc_otg_device->os_dep.base == NULL) {
-+		dev_dbg(&_dev->dev, "error mapping memory\n");
-+		release_mem_region(dwc_otg_device->os_dep.rsrc_start,
-+				   dwc_otg_device->os_dep.rsrc_len);
-+		iounmap(dwc_otg_device->os_dep.base);
-+		DWC_FREE(dwc_otg_device);
-+		return -EFAULT;
-+	}
-+	dev_dbg(&_dev->dev, "base=0x%p (before adjust) \n",
-+		dwc_otg_device->os_dep.base);
-+	dwc_otg_device->os_dep.base = (char *)dwc_otg_device->os_dep.base;
-+	dev_dbg(&_dev->dev, "base=0x%p (after adjust) \n",
-+		dwc_otg_device->os_dep.base);
-+	dev_dbg(&_dev->dev, "%s: mapped PA 0x%x to VA 0x%p\n", __func__,
-+		(unsigned)dwc_otg_device->os_dep.rsrc_start,
-+		dwc_otg_device->os_dep.base);
-+
-+	pci_set_master(_dev);
-+	pci_set_drvdata(_dev, dwc_otg_device);
-+#elif defined(PLATFORM_INTERFACE)
-+        DWC_DEBUGPL(DBG_ANY,"Platform resource: start=%08x, len=%08x\n",
-+                    _dev->resource->start,
-+                    _dev->resource->end - _dev->resource->start + 1);
-+#if 1
-+        if (!request_mem_region(_dev->resource[0].start,
-+                                _dev->resource[0].end - _dev->resource[0].start + 1,
-+                                "dwc_otg")) {
-+          dev_dbg(&_dev->dev, "error reserving mapped memory\n");
-+          retval = -EFAULT;
-+          goto fail;
-+        }
-+
-+	dwc_otg_device->os_dep.base = ioremap(_dev->resource[0].start,
-+                                                      _dev->resource[0].end -
-+                                                      _dev->resource[0].start+1);
-+	if (fiq_enable)
-+	{
-+		if (!request_mem_region(_dev->resource[1].start,
-+	                                _dev->resource[1].end - _dev->resource[1].start + 1,
-+	                                "dwc_otg")) {
-+			dev_dbg(&_dev->dev, "error reserving mapped memory\n");
-+			retval = -EFAULT;
-+			goto fail;
-+		}
-+
-+		dwc_otg_device->os_dep.mphi_base = ioremap(_dev->resource[1].start,
-+							    _dev->resource[1].end -
-+							    _dev->resource[1].start + 1);
-+		dwc_otg_device->os_dep.use_swirq = (_dev->resource[1].end - _dev->resource[1].start) == 0x200;
-+	}
-+
-+#else
-+        {
-+                struct map_desc desc = {
-+                    .virtual = IO_ADDRESS((unsigned)_dev->resource->start),
-+                    .pfn     = __phys_to_pfn((unsigned)_dev->resource->start),
-+                    .length  = SZ_128K,
-+                    .type    = MT_DEVICE
-+                };
-+                iotable_init(&desc, 1);
-+                dwc_otg_device->os_dep.base = (void *)desc.virtual;
-+        }
-+#endif
-+	if (!dwc_otg_device->os_dep.base) {
-+		dev_err(&_dev->dev, "ioremap() failed\n");
-+		retval = -ENOMEM;
-+		goto fail;
-+	}
-+#endif
-+
-+	/*
-+	 * Initialize driver data to point to the global DWC_otg
-+	 * Device structure.
-+	 */
-+#ifdef LM_INTERFACE
-+	lm_set_drvdata(_dev, dwc_otg_device);
-+#elif defined(PLATFORM_INTERFACE)
-+	platform_set_drvdata(_dev, dwc_otg_device);
-+#endif
-+	dev_dbg(&_dev->dev, "dwc_otg_device=0x%p\n", dwc_otg_device);
-+
-+	dwc_otg_device->core_if = dwc_otg_cil_init(dwc_otg_device->os_dep.base);
-+        DWC_DEBUGPL(DBG_HCDV, "probe of device %p given core_if %p\n",
-+                    dwc_otg_device, dwc_otg_device->core_if);//GRAYG
-+
-+	if (!dwc_otg_device->core_if) {
-+		dev_err(&_dev->dev, "CIL initialization failed!\n");
-+		retval = -ENOMEM;
-+		goto fail;
-+	}
-+
-+	dev_dbg(&_dev->dev, "Calling get_gsnpsid\n");
-+	/*
-+	 * Attempt to ensure this device is really a DWC_otg Controller.
-+	 * Read and verify the SNPSID register contents. The value should be
-+	 * 0x45F42XXX or 0x45F42XXX, which corresponds to either "OT2" or "OTG3",
-+	 * as in "OTG version 2.XX" or "OTG version 3.XX".
-+	 */
-+
-+	if (((dwc_otg_get_gsnpsid(dwc_otg_device->core_if) & 0xFFFFF000) !=	0x4F542000) &&
-+		((dwc_otg_get_gsnpsid(dwc_otg_device->core_if) & 0xFFFFF000) != 0x4F543000)) {
-+		dev_err(&_dev->dev, "Bad value for SNPSID: 0x%08x\n",
-+			dwc_otg_get_gsnpsid(dwc_otg_device->core_if));
-+		retval = -EINVAL;
-+		goto fail;
-+	}
-+
-+	/*
-+	 * Validate parameter values.
-+	 */
-+	dev_dbg(&_dev->dev, "Calling set_parameters\n");
-+	if (set_parameters(dwc_otg_device->core_if)) {
-+		retval = -EINVAL;
-+		goto fail;
-+	}
-+
-+	/*
-+	 * Create Device Attributes in sysfs
-+	 */
-+	dev_dbg(&_dev->dev, "Calling attr_create\n");
-+	dwc_otg_attr_create(_dev);
-+
-+	/*
-+	 * Disable the global interrupt until all the interrupt
-+	 * handlers are installed.
-+	 */
-+	dev_dbg(&_dev->dev, "Calling disable_global_interrupts\n");
-+	dwc_otg_disable_global_interrupts(dwc_otg_device->core_if);
-+
-+	/*
-+	 * Install the interrupt handler for the common interrupts before
-+	 * enabling common interrupts in core_init below.
-+	 */
-+
-+#if defined(PLATFORM_INTERFACE)
-+	devirq = platform_get_irq_byname(_dev, fiq_enable ? "soft" : "usb");
-+	if (devirq < 0)
-+	    devirq = platform_get_irq(_dev, fiq_enable ? 0 : 1);
-+#else
-+	devirq = _dev->irq;
-+#endif
-+	DWC_DEBUGPL(DBG_CIL, "registering (common) handler for irq%d\n",
-+		    devirq);
-+	dev_dbg(&_dev->dev, "Calling request_irq(%d)\n", devirq);
-+	retval = request_irq(devirq, dwc_otg_common_irq,
-+                             IRQF_SHARED,
-+                             "dwc_otg", dwc_otg_device);
-+	if (retval) {
-+		DWC_ERROR("request of irq%d failed\n", devirq);
-+		retval = -EBUSY;
-+		goto fail;
-+	} else {
-+		dwc_otg_device->common_irq_installed = 1;
-+	}
-+	dwc_otg_device->os_dep.irq_num = devirq;
-+	dwc_otg_device->os_dep.fiq_num = -EINVAL;
-+	if (fiq_enable) {
-+		int devfiq = platform_get_irq_byname(_dev, "usb");
-+		if (devfiq < 0)
-+			devfiq = platform_get_irq(_dev, 1);
-+		dwc_otg_device->os_dep.fiq_num = devfiq;
-+	}
-+
-+#ifndef IRQF_TRIGGER_LOW
-+#if defined(LM_INTERFACE) || defined(PLATFORM_INTERFACE)
-+	dev_dbg(&_dev->dev, "Calling set_irq_type\n");
-+	set_irq_type(devirq,
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30))
-+                     IRQT_LOW
-+#else
-+                     IRQ_TYPE_LEVEL_LOW
-+#endif
-+                    );
-+#endif
-+#endif /*IRQF_TRIGGER_LOW*/
-+
-+	/*
-+	 * Initialize the DWC_otg core.
-+	 */
-+	dev_dbg(&_dev->dev, "Calling dwc_otg_core_init\n");
-+	dwc_otg_core_init(dwc_otg_device->core_if);
-+
-+#ifndef DWC_HOST_ONLY
-+	/*
-+	 * Initialize the PCD
-+	 */
-+	dev_dbg(&_dev->dev, "Calling pcd_init\n");
-+	retval = pcd_init(_dev);
-+	if (retval != 0) {
-+		DWC_ERROR("pcd_init failed\n");
-+		dwc_otg_device->pcd = NULL;
-+		goto fail;
-+	}
-+#endif
-+#ifndef DWC_DEVICE_ONLY
-+	/*
-+	 * Initialize the HCD
-+	 */
-+	dev_dbg(&_dev->dev, "Calling hcd_init\n");
-+	retval = hcd_init(_dev);
-+	if (retval != 0) {
-+		DWC_ERROR("hcd_init failed\n");
-+		dwc_otg_device->hcd = NULL;
-+		goto fail;
-+	}
-+#endif
-+        /* Recover from drvdata having been overwritten by hcd_init() */
-+#ifdef LM_INTERFACE
-+	lm_set_drvdata(_dev, dwc_otg_device);
-+#elif defined(PLATFORM_INTERFACE)
-+	platform_set_drvdata(_dev, dwc_otg_device);
-+#elif defined(PCI_INTERFACE)
-+	pci_set_drvdata(_dev, dwc_otg_device);
-+	dwc_otg_device->os_dep.pcidev = _dev;
-+#endif
-+
-+	/*
-+	 * Enable the global interrupt after all the interrupt
-+	 * handlers are installed if there is no ADP support else
-+	 * perform initial actions required for Internal ADP logic.
-+	 */
-+	if (!dwc_otg_get_param_adp_enable(dwc_otg_device->core_if)) {
-+	        dev_dbg(&_dev->dev, "Calling enable_global_interrupts\n");
-+		dwc_otg_enable_global_interrupts(dwc_otg_device->core_if);
-+	        dev_dbg(&_dev->dev, "Done\n");
-+	} else
-+		dwc_otg_adp_start(dwc_otg_device->core_if,
-+							dwc_otg_is_host_mode(dwc_otg_device->core_if));
-+
-+	return 0;
-+
-+fail:
-+	dwc_otg_driver_remove(_dev);
-+	return retval;
-+}
-+
-+/**
-+ * This structure defines the methods to be called by a bus driver
-+ * during the lifecycle of a device on that bus. Both drivers and
-+ * devices are registered with a bus driver. The bus driver matches
-+ * devices to drivers based on information in the device and driver
-+ * structures.
-+ *
-+ * The probe function is called when the bus driver matches a device
-+ * to this driver. The remove function is called when a device is
-+ * unregistered with the bus driver.
-+ */
-+#ifdef LM_INTERFACE
-+static struct lm_driver dwc_otg_driver = {
-+	.drv = {.name = (char *)dwc_driver_name,},
-+	.probe = dwc_otg_driver_probe,
-+	.remove = dwc_otg_driver_remove,
-+        // 'suspend' and 'resume' absent
-+};
-+#elif defined(PCI_INTERFACE)
-+static const struct pci_device_id pci_ids[] = { {
-+						 PCI_DEVICE(0x16c3, 0xabcd),
-+						 .driver_data =
-+						 (unsigned long)0xdeadbeef,
-+						 }, { /* end: all zeroes */ }
-+};
-+
-+MODULE_DEVICE_TABLE(pci, pci_ids);
-+
-+/* pci driver glue; this is a "new style" PCI driver module */
-+static struct pci_driver dwc_otg_driver = {
-+	.name = "dwc_otg",
-+	.id_table = pci_ids,
-+
-+	.probe = dwc_otg_driver_probe,
-+	.remove = dwc_otg_driver_remove,
-+
-+	.driver = {
-+		   .name = (char *)dwc_driver_name,
-+		   },
-+};
-+#elif defined(PLATFORM_INTERFACE)
-+static struct platform_device_id platform_ids[] = {
-+        {
-+              .name = "bcm2708_usb",
-+              .driver_data = (kernel_ulong_t) 0xdeadbeef,
-+        },
-+        { /* end: all zeroes */ }
-+};
-+MODULE_DEVICE_TABLE(platform, platform_ids);
-+
-+static const struct of_device_id dwc_otg_of_match_table[] = {
-+	{ .compatible = "brcm,bcm2708-usb", },
-+	{},
-+};
-+MODULE_DEVICE_TABLE(of, dwc_otg_of_match_table);
-+
-+static struct platform_driver dwc_otg_driver = {
-+	.driver = {
-+		.name = (char *)dwc_driver_name,
-+		.of_match_table = dwc_otg_of_match_table,
-+		},
-+        .id_table = platform_ids,
-+
-+	.probe = dwc_otg_driver_probe,
-+	.remove = dwc_otg_driver_remove,
-+        // no 'shutdown', 'suspend', 'resume', 'suspend_late' or 'resume_early'
-+};
-+#endif
-+
-+/**
-+ * This function is called when the dwc_otg_driver is installed with the
-+ * insmod command. It registers the dwc_otg_driver structure with the
-+ * appropriate bus driver. This will cause the dwc_otg_driver_probe function
-+ * to be called. In addition, the bus driver will automatically expose
-+ * attributes defined for the device and driver in the special sysfs file
-+ * system.
-+ *
-+ * @return
-+ */
-+static int __init dwc_otg_driver_init(void)
-+{
-+	int retval = 0;
-+	int error;
-+        struct device_driver *drv;
-+
-+	if(fiq_fsm_enable && !fiq_enable) {
-+		printk(KERN_WARNING "dwc_otg: fiq_fsm_enable was set without fiq_enable! Correcting.\n");
-+		fiq_enable = 1;
-+	}
-+
-+	printk(KERN_INFO "%s: version %s (%s bus)\n", dwc_driver_name,
-+	       DWC_DRIVER_VERSION,
-+#ifdef LM_INTERFACE
-+               "logicmodule");
-+	retval = lm_driver_register(&dwc_otg_driver);
-+        drv = &dwc_otg_driver.drv;
-+#elif defined(PCI_INTERFACE)
-+               "pci");
-+	retval = pci_register_driver(&dwc_otg_driver);
-+        drv = &dwc_otg_driver.driver;
-+#elif defined(PLATFORM_INTERFACE)
-+               "platform");
-+	retval = platform_driver_register(&dwc_otg_driver);
-+        drv = &dwc_otg_driver.driver;
-+#endif
-+	if (retval < 0) {
-+		printk(KERN_ERR "%s retval=%d\n", __func__, retval);
-+		return retval;
-+	}
-+	printk(KERN_DEBUG "dwc_otg: FIQ %s\n", fiq_enable ? "enabled":"disabled");
-+	printk(KERN_DEBUG "dwc_otg: NAK holdoff %s\n", nak_holdoff ? "enabled":"disabled");
-+	printk(KERN_DEBUG "dwc_otg: FIQ split-transaction FSM %s\n", fiq_fsm_enable ? "enabled":"disabled");
-+
-+	error = driver_create_file(drv, &driver_attr_version);
-+#ifdef DEBUG
-+	error = driver_create_file(drv, &driver_attr_debuglevel);
-+#endif
-+	return retval;
-+}
-+
-+module_init(dwc_otg_driver_init);
-+
-+/**
-+ * This function is called when the driver is removed from the kernel
-+ * with the rmmod command. The driver unregisters itself with its bus
-+ * driver.
-+ *
-+ */
-+static void __exit dwc_otg_driver_cleanup(void)
-+{
-+	printk(KERN_DEBUG "dwc_otg_driver_cleanup()\n");
-+
-+#ifdef LM_INTERFACE
-+	driver_remove_file(&dwc_otg_driver.drv, &driver_attr_debuglevel);
-+	driver_remove_file(&dwc_otg_driver.drv, &driver_attr_version);
-+	lm_driver_unregister(&dwc_otg_driver);
-+#elif defined(PCI_INTERFACE)
-+	driver_remove_file(&dwc_otg_driver.driver, &driver_attr_debuglevel);
-+	driver_remove_file(&dwc_otg_driver.driver, &driver_attr_version);
-+	pci_unregister_driver(&dwc_otg_driver);
-+#elif defined(PLATFORM_INTERFACE)
-+	driver_remove_file(&dwc_otg_driver.driver, &driver_attr_debuglevel);
-+	driver_remove_file(&dwc_otg_driver.driver, &driver_attr_version);
-+	platform_driver_unregister(&dwc_otg_driver);
-+#endif
-+
-+	printk(KERN_INFO "%s module removed\n", dwc_driver_name);
-+}
-+
-+module_exit(dwc_otg_driver_cleanup);
-+
-+MODULE_DESCRIPTION(DWC_DRIVER_DESC);
-+MODULE_AUTHOR("Synopsys Inc.");
-+MODULE_LICENSE("GPL");
-+
-+module_param_named(otg_cap, dwc_otg_module_params.otg_cap, int, 0444);
-+MODULE_PARM_DESC(otg_cap, "OTG Capabilities 0=HNP&SRP 1=SRP Only 2=None");
-+module_param_named(opt, dwc_otg_module_params.opt, int, 0444);
-+MODULE_PARM_DESC(opt, "OPT Mode");
-+module_param_named(dma_enable, dwc_otg_module_params.dma_enable, int, 0444);
-+MODULE_PARM_DESC(dma_enable, "DMA Mode 0=Slave 1=DMA enabled");
-+
-+module_param_named(dma_desc_enable, dwc_otg_module_params.dma_desc_enable, int,
-+		   0444);
-+MODULE_PARM_DESC(dma_desc_enable,
-+		 "DMA Desc Mode 0=Address DMA 1=DMA Descriptor enabled");
-+
-+module_param_named(dma_burst_size, dwc_otg_module_params.dma_burst_size, int,
-+		   0444);
-+MODULE_PARM_DESC(dma_burst_size,
-+		 "DMA Burst Size 1, 4, 8, 16, 32, 64, 128, 256");
-+module_param_named(speed, dwc_otg_module_params.speed, int, 0444);
-+MODULE_PARM_DESC(speed, "Speed 0=High Speed 1=Full Speed");
-+module_param_named(host_support_fs_ls_low_power,
-+		   dwc_otg_module_params.host_support_fs_ls_low_power, int,
-+		   0444);
-+MODULE_PARM_DESC(host_support_fs_ls_low_power,
-+		 "Support Low Power w/FS or LS 0=Support 1=Don't Support");
-+module_param_named(host_ls_low_power_phy_clk,
-+		   dwc_otg_module_params.host_ls_low_power_phy_clk, int, 0444);
-+MODULE_PARM_DESC(host_ls_low_power_phy_clk,
-+		 "Low Speed Low Power Clock 0=48Mhz 1=6Mhz");
-+module_param_named(enable_dynamic_fifo,
-+		   dwc_otg_module_params.enable_dynamic_fifo, int, 0444);
-+MODULE_PARM_DESC(enable_dynamic_fifo, "0=cC Setting 1=Allow Dynamic Sizing");
-+module_param_named(data_fifo_size, dwc_otg_module_params.data_fifo_size, int,
-+		   0444);
-+MODULE_PARM_DESC(data_fifo_size,
-+		 "Total number of words in the data FIFO memory 32-32768");
-+module_param_named(dev_rx_fifo_size, dwc_otg_module_params.dev_rx_fifo_size,
-+		   int, 0444);
-+MODULE_PARM_DESC(dev_rx_fifo_size, "Number of words in the Rx FIFO 16-32768");
-+module_param_named(dev_nperio_tx_fifo_size,
-+		   dwc_otg_module_params.dev_nperio_tx_fifo_size, int, 0444);
-+MODULE_PARM_DESC(dev_nperio_tx_fifo_size,
-+		 "Number of words in the non-periodic Tx FIFO 16-32768");
-+module_param_named(dev_perio_tx_fifo_size_1,
-+		   dwc_otg_module_params.dev_perio_tx_fifo_size[0], int, 0444);
-+MODULE_PARM_DESC(dev_perio_tx_fifo_size_1,
-+		 "Number of words in the periodic Tx FIFO 4-768");
-+module_param_named(dev_perio_tx_fifo_size_2,
-+		   dwc_otg_module_params.dev_perio_tx_fifo_size[1], int, 0444);
-+MODULE_PARM_DESC(dev_perio_tx_fifo_size_2,
-+		 "Number of words in the periodic Tx FIFO 4-768");
-+module_param_named(dev_perio_tx_fifo_size_3,
-+		   dwc_otg_module_params.dev_perio_tx_fifo_size[2], int, 0444);
-+MODULE_PARM_DESC(dev_perio_tx_fifo_size_3,
-+		 "Number of words in the periodic Tx FIFO 4-768");
-+module_param_named(dev_perio_tx_fifo_size_4,
-+		   dwc_otg_module_params.dev_perio_tx_fifo_size[3], int, 0444);
-+MODULE_PARM_DESC(dev_perio_tx_fifo_size_4,
-+		 "Number of words in the periodic Tx FIFO 4-768");
-+module_param_named(dev_perio_tx_fifo_size_5,
-+		   dwc_otg_module_params.dev_perio_tx_fifo_size[4], int, 0444);
-+MODULE_PARM_DESC(dev_perio_tx_fifo_size_5,
-+		 "Number of words in the periodic Tx FIFO 4-768");
-+module_param_named(dev_perio_tx_fifo_size_6,
-+		   dwc_otg_module_params.dev_perio_tx_fifo_size[5], int, 0444);
-+MODULE_PARM_DESC(dev_perio_tx_fifo_size_6,
-+		 "Number of words in the periodic Tx FIFO 4-768");
-+module_param_named(dev_perio_tx_fifo_size_7,
-+		   dwc_otg_module_params.dev_perio_tx_fifo_size[6], int, 0444);
-+MODULE_PARM_DESC(dev_perio_tx_fifo_size_7,
-+		 "Number of words in the periodic Tx FIFO 4-768");
-+module_param_named(dev_perio_tx_fifo_size_8,
-+		   dwc_otg_module_params.dev_perio_tx_fifo_size[7], int, 0444);
-+MODULE_PARM_DESC(dev_perio_tx_fifo_size_8,
-+		 "Number of words in the periodic Tx FIFO 4-768");
-+module_param_named(dev_perio_tx_fifo_size_9,
-+		   dwc_otg_module_params.dev_perio_tx_fifo_size[8], int, 0444);
-+MODULE_PARM_DESC(dev_perio_tx_fifo_size_9,
-+		 "Number of words in the periodic Tx FIFO 4-768");
-+module_param_named(dev_perio_tx_fifo_size_10,
-+		   dwc_otg_module_params.dev_perio_tx_fifo_size[9], int, 0444);
-+MODULE_PARM_DESC(dev_perio_tx_fifo_size_10,
-+		 "Number of words in the periodic Tx FIFO 4-768");
-+module_param_named(dev_perio_tx_fifo_size_11,
-+		   dwc_otg_module_params.dev_perio_tx_fifo_size[10], int, 0444);
-+MODULE_PARM_DESC(dev_perio_tx_fifo_size_11,
-+		 "Number of words in the periodic Tx FIFO 4-768");
-+module_param_named(dev_perio_tx_fifo_size_12,
-+		   dwc_otg_module_params.dev_perio_tx_fifo_size[11], int, 0444);
-+MODULE_PARM_DESC(dev_perio_tx_fifo_size_12,
-+		 "Number of words in the periodic Tx FIFO 4-768");
-+module_param_named(dev_perio_tx_fifo_size_13,
-+		   dwc_otg_module_params.dev_perio_tx_fifo_size[12], int, 0444);
-+MODULE_PARM_DESC(dev_perio_tx_fifo_size_13,
-+		 "Number of words in the periodic Tx FIFO 4-768");
-+module_param_named(dev_perio_tx_fifo_size_14,
-+		   dwc_otg_module_params.dev_perio_tx_fifo_size[13], int, 0444);
-+MODULE_PARM_DESC(dev_perio_tx_fifo_size_14,
-+		 "Number of words in the periodic Tx FIFO 4-768");
-+module_param_named(dev_perio_tx_fifo_size_15,
-+		   dwc_otg_module_params.dev_perio_tx_fifo_size[14], int, 0444);
-+MODULE_PARM_DESC(dev_perio_tx_fifo_size_15,
-+		 "Number of words in the periodic Tx FIFO 4-768");
-+module_param_named(host_rx_fifo_size, dwc_otg_module_params.host_rx_fifo_size,
-+		   int, 0444);
-+MODULE_PARM_DESC(host_rx_fifo_size, "Number of words in the Rx FIFO 16-32768");
-+module_param_named(host_nperio_tx_fifo_size,
-+		   dwc_otg_module_params.host_nperio_tx_fifo_size, int, 0444);
-+MODULE_PARM_DESC(host_nperio_tx_fifo_size,
-+		 "Number of words in the non-periodic Tx FIFO 16-32768");
-+module_param_named(host_perio_tx_fifo_size,
-+		   dwc_otg_module_params.host_perio_tx_fifo_size, int, 0444);
-+MODULE_PARM_DESC(host_perio_tx_fifo_size,
-+		 "Number of words in the host periodic Tx FIFO 16-32768");
-+module_param_named(max_transfer_size, dwc_otg_module_params.max_transfer_size,
-+		   int, 0444);
-+/** @todo Set the max to 512K, modify checks */
-+MODULE_PARM_DESC(max_transfer_size,
-+		 "The maximum transfer size supported in bytes 2047-65535");
-+module_param_named(max_packet_count, dwc_otg_module_params.max_packet_count,
-+		   int, 0444);
-+MODULE_PARM_DESC(max_packet_count,
-+		 "The maximum number of packets in a transfer 15-511");
-+module_param_named(host_channels, dwc_otg_module_params.host_channels, int,
-+		   0444);
-+MODULE_PARM_DESC(host_channels,
-+		 "The number of host channel registers to use 1-16");
-+module_param_named(dev_endpoints, dwc_otg_module_params.dev_endpoints, int,
-+		   0444);
-+MODULE_PARM_DESC(dev_endpoints,
-+		 "The number of endpoints in addition to EP0 available for device mode 1-15");
-+module_param_named(phy_type, dwc_otg_module_params.phy_type, int, 0444);
-+MODULE_PARM_DESC(phy_type, "0=Reserved 1=UTMI+ 2=ULPI");
-+module_param_named(phy_utmi_width, dwc_otg_module_params.phy_utmi_width, int,
-+		   0444);
-+MODULE_PARM_DESC(phy_utmi_width, "Specifies the UTMI+ Data Width 8 or 16 bits");
-+module_param_named(phy_ulpi_ddr, dwc_otg_module_params.phy_ulpi_ddr, int, 0444);
-+MODULE_PARM_DESC(phy_ulpi_ddr,
-+		 "ULPI at double or single data rate 0=Single 1=Double");
-+module_param_named(phy_ulpi_ext_vbus, dwc_otg_module_params.phy_ulpi_ext_vbus,
-+		   int, 0444);
-+MODULE_PARM_DESC(phy_ulpi_ext_vbus,
-+		 "ULPI PHY using internal or external vbus 0=Internal");
-+module_param_named(i2c_enable, dwc_otg_module_params.i2c_enable, int, 0444);
-+MODULE_PARM_DESC(i2c_enable, "FS PHY Interface");
-+module_param_named(ulpi_fs_ls, dwc_otg_module_params.ulpi_fs_ls, int, 0444);
-+MODULE_PARM_DESC(ulpi_fs_ls, "ULPI PHY FS/LS mode only");
-+module_param_named(ts_dline, dwc_otg_module_params.ts_dline, int, 0444);
-+MODULE_PARM_DESC(ts_dline, "Term select Dline pulsing for all PHYs");
-+module_param_named(debug, g_dbg_lvl, int, 0444);
-+MODULE_PARM_DESC(debug, "");
-+
-+module_param_named(en_multiple_tx_fifo,
-+		   dwc_otg_module_params.en_multiple_tx_fifo, int, 0444);
-+MODULE_PARM_DESC(en_multiple_tx_fifo,
-+		 "Dedicated Non Periodic Tx FIFOs 0=disabled 1=enabled");
-+module_param_named(dev_tx_fifo_size_1,
-+		   dwc_otg_module_params.dev_tx_fifo_size[0], int, 0444);
-+MODULE_PARM_DESC(dev_tx_fifo_size_1, "Number of words in the Tx FIFO 4-768");
-+module_param_named(dev_tx_fifo_size_2,
-+		   dwc_otg_module_params.dev_tx_fifo_size[1], int, 0444);
-+MODULE_PARM_DESC(dev_tx_fifo_size_2, "Number of words in the Tx FIFO 4-768");
-+module_param_named(dev_tx_fifo_size_3,
-+		   dwc_otg_module_params.dev_tx_fifo_size[2], int, 0444);
-+MODULE_PARM_DESC(dev_tx_fifo_size_3, "Number of words in the Tx FIFO 4-768");
-+module_param_named(dev_tx_fifo_size_4,
-+		   dwc_otg_module_params.dev_tx_fifo_size[3], int, 0444);
-+MODULE_PARM_DESC(dev_tx_fifo_size_4, "Number of words in the Tx FIFO 4-768");
-+module_param_named(dev_tx_fifo_size_5,
-+		   dwc_otg_module_params.dev_tx_fifo_size[4], int, 0444);
-+MODULE_PARM_DESC(dev_tx_fifo_size_5, "Number of words in the Tx FIFO 4-768");
-+module_param_named(dev_tx_fifo_size_6,
-+		   dwc_otg_module_params.dev_tx_fifo_size[5], int, 0444);
-+MODULE_PARM_DESC(dev_tx_fifo_size_6, "Number of words in the Tx FIFO 4-768");
-+module_param_named(dev_tx_fifo_size_7,
-+		   dwc_otg_module_params.dev_tx_fifo_size[6], int, 0444);
-+MODULE_PARM_DESC(dev_tx_fifo_size_7, "Number of words in the Tx FIFO 4-768");
-+module_param_named(dev_tx_fifo_size_8,
-+		   dwc_otg_module_params.dev_tx_fifo_size[7], int, 0444);
-+MODULE_PARM_DESC(dev_tx_fifo_size_8, "Number of words in the Tx FIFO 4-768");
-+module_param_named(dev_tx_fifo_size_9,
-+		   dwc_otg_module_params.dev_tx_fifo_size[8], int, 0444);
-+MODULE_PARM_DESC(dev_tx_fifo_size_9, "Number of words in the Tx FIFO 4-768");
-+module_param_named(dev_tx_fifo_size_10,
-+		   dwc_otg_module_params.dev_tx_fifo_size[9], int, 0444);
-+MODULE_PARM_DESC(dev_tx_fifo_size_10, "Number of words in the Tx FIFO 4-768");
-+module_param_named(dev_tx_fifo_size_11,
-+		   dwc_otg_module_params.dev_tx_fifo_size[10], int, 0444);
-+MODULE_PARM_DESC(dev_tx_fifo_size_11, "Number of words in the Tx FIFO 4-768");
-+module_param_named(dev_tx_fifo_size_12,
-+		   dwc_otg_module_params.dev_tx_fifo_size[11], int, 0444);
-+MODULE_PARM_DESC(dev_tx_fifo_size_12, "Number of words in the Tx FIFO 4-768");
-+module_param_named(dev_tx_fifo_size_13,
-+		   dwc_otg_module_params.dev_tx_fifo_size[12], int, 0444);
-+MODULE_PARM_DESC(dev_tx_fifo_size_13, "Number of words in the Tx FIFO 4-768");
-+module_param_named(dev_tx_fifo_size_14,
-+		   dwc_otg_module_params.dev_tx_fifo_size[13], int, 0444);
-+MODULE_PARM_DESC(dev_tx_fifo_size_14, "Number of words in the Tx FIFO 4-768");
-+module_param_named(dev_tx_fifo_size_15,
-+		   dwc_otg_module_params.dev_tx_fifo_size[14], int, 0444);
-+MODULE_PARM_DESC(dev_tx_fifo_size_15, "Number of words in the Tx FIFO 4-768");
-+
-+module_param_named(thr_ctl, dwc_otg_module_params.thr_ctl, int, 0444);
-+MODULE_PARM_DESC(thr_ctl,
-+		 "Thresholding enable flag bit 0 - non ISO Tx thr., 1 - ISO Tx thr., 2 - Rx thr.- bit 0=disabled 1=enabled");
-+module_param_named(tx_thr_length, dwc_otg_module_params.tx_thr_length, int,
-+		   0444);
-+MODULE_PARM_DESC(tx_thr_length, "Tx Threshold length in 32 bit DWORDs");
-+module_param_named(rx_thr_length, dwc_otg_module_params.rx_thr_length, int,
-+		   0444);
-+MODULE_PARM_DESC(rx_thr_length, "Rx Threshold length in 32 bit DWORDs");
-+
-+module_param_named(pti_enable, dwc_otg_module_params.pti_enable, int, 0444);
-+module_param_named(mpi_enable, dwc_otg_module_params.mpi_enable, int, 0444);
-+module_param_named(lpm_enable, dwc_otg_module_params.lpm_enable, int, 0444);
-+MODULE_PARM_DESC(lpm_enable, "LPM Enable 0=LPM Disabled 1=LPM Enabled");
-+module_param_named(ic_usb_cap, dwc_otg_module_params.ic_usb_cap, int, 0444);
-+MODULE_PARM_DESC(ic_usb_cap,
-+		 "IC_USB Capability 0=IC_USB Disabled 1=IC_USB Enabled");
-+module_param_named(ahb_thr_ratio, dwc_otg_module_params.ahb_thr_ratio, int,
-+		   0444);
-+MODULE_PARM_DESC(ahb_thr_ratio, "AHB Threshold Ratio");
-+module_param_named(power_down, dwc_otg_module_params.power_down, int, 0444);
-+MODULE_PARM_DESC(power_down, "Power Down Mode");
-+module_param_named(reload_ctl, dwc_otg_module_params.reload_ctl, int, 0444);
-+MODULE_PARM_DESC(reload_ctl, "HFIR Reload Control");
-+module_param_named(dev_out_nak, dwc_otg_module_params.dev_out_nak, int, 0444);
-+MODULE_PARM_DESC(dev_out_nak, "Enable Device OUT NAK");
-+module_param_named(cont_on_bna, dwc_otg_module_params.cont_on_bna, int, 0444);
-+MODULE_PARM_DESC(cont_on_bna, "Enable Enable Continue on BNA");
-+module_param_named(ahb_single, dwc_otg_module_params.ahb_single, int, 0444);
-+MODULE_PARM_DESC(ahb_single, "Enable AHB Single Support");
-+module_param_named(adp_enable, dwc_otg_module_params.adp_enable, int, 0444);
-+MODULE_PARM_DESC(adp_enable, "ADP Enable 0=ADP Disabled 1=ADP Enabled");
-+module_param_named(otg_ver, dwc_otg_module_params.otg_ver, int, 0444);
-+MODULE_PARM_DESC(otg_ver, "OTG revision supported 0=OTG 1.3 1=OTG 2.0");
-+module_param(microframe_schedule, bool, 0444);
-+MODULE_PARM_DESC(microframe_schedule, "Enable the microframe scheduler");
-+
-+module_param(fiq_enable, bool, 0444);
-+MODULE_PARM_DESC(fiq_enable, "Enable the FIQ");
-+module_param(nak_holdoff, ushort, 0644);
-+MODULE_PARM_DESC(nak_holdoff, "Throttle duration for bulk split-transaction endpoints on a NAK. Default 8");
-+module_param(fiq_fsm_enable, bool, 0444);
-+MODULE_PARM_DESC(fiq_fsm_enable, "Enable the FIQ to perform split transactions as defined by fiq_fsm_mask");
-+module_param(fiq_fsm_mask, ushort, 0444);
-+MODULE_PARM_DESC(fiq_fsm_mask, "Bitmask of transactions to perform in the FIQ.\n"
-+					"Bit 0 : Non-periodic split transactions\n"
-+					"Bit 1 : Periodic split transactions\n"
-+					"Bit 2 : High-speed multi-transfer isochronous\n"
-+					"All other bits should be set 0.");
-+module_param(int_ep_interval_min, ushort, 0644);
-+MODULE_PARM_DESC(int_ep_interval_min, "Clamp high-speed Interrupt endpoints to a minimum polling interval.\n"
-+					"0..1 = Use endpoint default\n"
-+					"2..n = Minimum interval n microframes. Use powers of 2.\n");
-+
-+module_param(cil_force_host, bool, 0644);
-+MODULE_PARM_DESC(cil_force_host, "On a connector-ID status change, "
-+					"force Host Mode regardless of OTG state.");
-+
-+/** @page "Module Parameters"
-+ *
-+ * The following parameters may be specified when starting the module.
-+ * These parameters define how the DWC_otg controller should be
-+ * configured. Parameter values are passed to the CIL initialization
-+ * function dwc_otg_cil_init
-+ *
-+ * Example: <code>modprobe dwc_otg speed=1 otg_cap=1</code>
-+ *
-+
-+ <table>
-+ <tr><td>Parameter Name</td><td>Meaning</td></tr>
-+
-+ <tr>
-+ <td>otg_cap</td>
-+ <td>Specifies the OTG capabilities. The driver will automatically detect the
-+ value for this parameter if none is specified.
-+ - 0: HNP and SRP capable (default, if available)
-+ - 1: SRP Only capable
-+ - 2: No HNP/SRP capable
-+ </td></tr>
-+
-+ <tr>
-+ <td>dma_enable</td>
-+ <td>Specifies whether to use slave or DMA mode for accessing the data FIFOs.
-+ The driver will automatically detect the value for this parameter if none is
-+ specified.
-+ - 0: Slave
-+ - 1: DMA (default, if available)
-+ </td></tr>
-+
-+ <tr>
-+ <td>dma_burst_size</td>
-+ <td>The DMA Burst size (applicable only for External DMA Mode).
-+ - Values: 1, 4, 8 16, 32, 64, 128, 256 (default 32)
-+ </td></tr>
-+
-+ <tr>
-+ <td>speed</td>
-+ <td>Specifies the maximum speed of operation in host and device mode. The
-+ actual speed depends on the speed of the attached device and the value of
-+ phy_type.
-+ - 0: High Speed (default)
-+ - 1: Full Speed
-+ </td></tr>
-+
-+ <tr>
-+ <td>host_support_fs_ls_low_power</td>
-+ <td>Specifies whether low power mode is supported when attached to a Full
-+ Speed or Low Speed device in host mode.
-+ - 0: Don't support low power mode (default)
-+ - 1: Support low power mode
-+ </td></tr>
-+
-+ <tr>
-+ <td>host_ls_low_power_phy_clk</td>
-+ <td>Specifies the PHY clock rate in low power mode when connected to a Low
-+ Speed device in host mode. This parameter is applicable only if
-+ HOST_SUPPORT_FS_LS_LOW_POWER is enabled.
-+ - 0: 48 MHz (default)
-+ - 1: 6 MHz
-+ </td></tr>
-+
-+ <tr>
-+ <td>enable_dynamic_fifo</td>
-+ <td> Specifies whether FIFOs may be resized by the driver software.
-+ - 0: Use cC FIFO size parameters
-+ - 1: Allow dynamic FIFO sizing (default)
-+ </td></tr>
-+
-+ <tr>
-+ <td>data_fifo_size</td>
-+ <td>Total number of 4-byte words in the data FIFO memory. This memory
-+ includes the Rx FIFO, non-periodic Tx FIFO, and periodic Tx FIFOs.
-+ - Values: 32 to 32768 (default 8192)
-+
-+ Note: The total FIFO memory depth in the FPGA configuration is 8192.
-+ </td></tr>
-+
-+ <tr>
-+ <td>dev_rx_fifo_size</td>
-+ <td>Number of 4-byte words in the Rx FIFO in device mode when dynamic
-+ FIFO sizing is enabled.
-+ - Values: 16 to 32768 (default 1064)
-+ </td></tr>
-+
-+ <tr>
-+ <td>dev_nperio_tx_fifo_size</td>
-+ <td>Number of 4-byte words in the non-periodic Tx FIFO in device mode when
-+ dynamic FIFO sizing is enabled.
-+ - Values: 16 to 32768 (default 1024)
-+ </td></tr>
-+
-+ <tr>
-+ <td>dev_perio_tx_fifo_size_n (n = 1 to 15)</td>
-+ <td>Number of 4-byte words in each of the periodic Tx FIFOs in device mode
-+ when dynamic FIFO sizing is enabled.
-+ - Values: 4 to 768 (default 256)
-+ </td></tr>
-+
-+ <tr>
-+ <td>host_rx_fifo_size</td>
-+ <td>Number of 4-byte words in the Rx FIFO in host mode when dynamic FIFO
-+ sizing is enabled.
-+ - Values: 16 to 32768 (default 1024)
-+ </td></tr>
-+
-+ <tr>
-+ <td>host_nperio_tx_fifo_size</td>
-+ <td>Number of 4-byte words in the non-periodic Tx FIFO in host mode when
-+ dynamic FIFO sizing is enabled in the core.
-+ - Values: 16 to 32768 (default 1024)
-+ </td></tr>
-+
-+ <tr>
-+ <td>host_perio_tx_fifo_size</td>
-+ <td>Number of 4-byte words in the host periodic Tx FIFO when dynamic FIFO
-+ sizing is enabled.
-+ - Values: 16 to 32768 (default 1024)
-+ </td></tr>
-+
-+ <tr>
-+ <td>max_transfer_size</td>
-+ <td>The maximum transfer size supported in bytes.
-+ - Values: 2047 to 65,535 (default 65,535)
-+ </td></tr>
-+
-+ <tr>
-+ <td>max_packet_count</td>
-+ <td>The maximum number of packets in a transfer.
-+ - Values: 15 to 511 (default 511)
-+ </td></tr>
-+
-+ <tr>
-+ <td>host_channels</td>
-+ <td>The number of host channel registers to use.
-+ - Values: 1 to 16 (default 12)
-+
-+ Note: The FPGA configuration supports a maximum of 12 host channels.
-+ </td></tr>
-+
-+ <tr>
-+ <td>dev_endpoints</td>
-+ <td>The number of endpoints in addition to EP0 available for device mode
-+ operations.
-+ - Values: 1 to 15 (default 6 IN and OUT)
-+
-+ Note: The FPGA configuration supports a maximum of 6 IN and OUT endpoints in
-+ addition to EP0.
-+ </td></tr>
-+
-+ <tr>
-+ <td>phy_type</td>
-+ <td>Specifies the type of PHY interface to use. By default, the driver will
-+ automatically detect the phy_type.
-+ - 0: Full Speed
-+ - 1: UTMI+ (default, if available)
-+ - 2: ULPI
-+ </td></tr>
-+
-+ <tr>
-+ <td>phy_utmi_width</td>
-+ <td>Specifies the UTMI+ Data Width. This parameter is applicable for a
-+ phy_type of UTMI+. Also, this parameter is applicable only if the
-+ OTG_HSPHY_WIDTH cC parameter was set to "8 and 16 bits", meaning that the
-+ core has been configured to work at either data path width.
-+ - Values: 8 or 16 bits (default 16)
-+ </td></tr>
-+
-+ <tr>
-+ <td>phy_ulpi_ddr</td>
-+ <td>Specifies whether the ULPI operates at double or single data rate. This
-+ parameter is only applicable if phy_type is ULPI.
-+ - 0: single data rate ULPI interface with 8 bit wide data bus (default)
-+ - 1: double data rate ULPI interface with 4 bit wide data bus
-+ </td></tr>
-+
-+ <tr>
-+ <td>i2c_enable</td>
-+ <td>Specifies whether to use the I2C interface for full speed PHY. This
-+ parameter is only applicable if PHY_TYPE is FS.
-+ - 0: Disabled (default)
-+ - 1: Enabled
-+ </td></tr>
-+
-+ <tr>
-+ <td>ulpi_fs_ls</td>
-+ <td>Specifies whether to use ULPI FS/LS mode only.
-+ - 0: Disabled (default)
-+ - 1: Enabled
-+ </td></tr>
-+
-+ <tr>
-+ <td>ts_dline</td>
-+ <td>Specifies whether term select D-Line pulsing for all PHYs is enabled.
-+ - 0: Disabled (default)
-+ - 1: Enabled
-+ </td></tr>
-+
-+ <tr>
-+ <td>en_multiple_tx_fifo</td>
-+ <td>Specifies whether dedicatedto tx fifos are enabled for non periodic IN EPs.
-+ The driver will automatically detect the value for this parameter if none is
-+ specified.
-+ - 0: Disabled
-+ - 1: Enabled (default, if available)
-+ </td></tr>
-+
-+ <tr>
-+ <td>dev_tx_fifo_size_n (n = 1 to 15)</td>
-+ <td>Number of 4-byte words in each of the Tx FIFOs in device mode
-+ when dynamic FIFO sizing is enabled.
-+ - Values: 4 to 768 (default 256)
-+ </td></tr>
-+
-+ <tr>
-+ <td>tx_thr_length</td>
-+ <td>Transmit Threshold length in 32 bit double words
-+ - Values: 8 to 128 (default 64)
-+ </td></tr>
-+
-+ <tr>
-+ <td>rx_thr_length</td>
-+ <td>Receive Threshold length in 32 bit double words
-+ - Values: 8 to 128 (default 64)
-+ </td></tr>
-+
-+<tr>
-+ <td>thr_ctl</td>
-+ <td>Specifies whether to enable Thresholding for Device mode. Bits 0, 1, 2 of
-+ this parmater specifies if thresholding is enabled for non-Iso Tx, Iso Tx and
-+ Rx transfers accordingly.
-+ The driver will automatically detect the value for this parameter if none is
-+ specified.
-+ - Values: 0 to 7 (default 0)
-+ Bit values indicate:
-+ - 0: Thresholding disabled
-+ - 1: Thresholding enabled
-+ </td></tr>
-+
-+<tr>
-+ <td>dma_desc_enable</td>
-+ <td>Specifies whether to enable Descriptor DMA mode.
-+ The driver will automatically detect the value for this parameter if none is
-+ specified.
-+ - 0: Descriptor DMA disabled
-+ - 1: Descriptor DMA (default, if available)
-+ </td></tr>
-+
-+<tr>
-+ <td>mpi_enable</td>
-+ <td>Specifies whether to enable MPI enhancement mode.
-+ The driver will automatically detect the value for this parameter if none is
-+ specified.
-+ - 0: MPI disabled (default)
-+ - 1: MPI enable
-+ </td></tr>
-+
-+<tr>
-+ <td>pti_enable</td>
-+ <td>Specifies whether to enable PTI enhancement support.
-+ The driver will automatically detect the value for this parameter if none is
-+ specified.
-+ - 0: PTI disabled (default)
-+ - 1: PTI enable
-+ </td></tr>
-+
-+<tr>
-+ <td>lpm_enable</td>
-+ <td>Specifies whether to enable LPM support.
-+ The driver will automatically detect the value for this parameter if none is
-+ specified.
-+ - 0: LPM disabled
-+ - 1: LPM enable (default, if available)
-+ </td></tr>
-+
-+<tr>
-+ <td>ic_usb_cap</td>
-+ <td>Specifies whether to enable IC_USB capability.
-+ The driver will automatically detect the value for this parameter if none is
-+ specified.
-+ - 0: IC_USB disabled (default, if available)
-+ - 1: IC_USB enable
-+ </td></tr>
-+
-+<tr>
-+ <td>ahb_thr_ratio</td>
-+ <td>Specifies AHB Threshold ratio.
-+ - Values: 0 to 3 (default 0)
-+ </td></tr>
-+
-+<tr>
-+ <td>power_down</td>
-+ <td>Specifies Power Down(Hibernation) Mode.
-+ The driver will automatically detect the value for this parameter if none is
-+ specified.
-+ - 0: Power Down disabled (default)
-+ - 2: Power Down enabled
-+ </td></tr>
-+
-+ <tr>
-+ <td>reload_ctl</td>
-+ <td>Specifies whether dynamic reloading of the HFIR register is allowed during
-+ run time. The driver will automatically detect the value for this parameter if
-+ none is specified. In case the HFIR value is reloaded when HFIR.RldCtrl == 1'b0
-+ the core might misbehave.
-+ - 0: Reload Control disabled (default)
-+ - 1: Reload Control enabled
-+ </td></tr>
-+
-+ <tr>
-+ <td>dev_out_nak</td>
-+ <td>Specifies whether  Device OUT NAK enhancement enabled or no.
-+ The driver will automatically detect the value for this parameter if
-+ none is specified. This parameter is valid only when OTG_EN_DESC_DMA == 1b1.
-+ - 0: The core does not set NAK after Bulk OUT transfer complete (default)
-+ - 1: The core sets NAK after Bulk OUT transfer complete
-+ </td></tr>
-+
-+ <tr>
-+ <td>cont_on_bna</td>
-+ <td>Specifies whether Enable Continue on BNA enabled or no.
-+ After receiving BNA interrupt the core disables the endpoint,when the
-+ endpoint is re-enabled by the application the
-+ - 0: Core starts processing from the DOEPDMA descriptor (default)
-+ - 1: Core starts processing from the descriptor which received the BNA.
-+ This parameter is valid only when OTG_EN_DESC_DMA == 1b1.
-+ </td></tr>
-+
-+ <tr>
-+ <td>ahb_single</td>
-+ <td>This bit when programmed supports SINGLE transfers for remainder data
-+ in a transfer for DMA mode of operation.
-+ - 0: The remainder data will be sent using INCR burst size (default)
-+ - 1: The remainder data will be sent using SINGLE burst size.
-+ </td></tr>
-+
-+<tr>
-+ <td>adp_enable</td>
-+ <td>Specifies whether ADP feature is enabled.
-+ The driver will automatically detect the value for this parameter if none is
-+ specified.
-+ - 0: ADP feature disabled (default)
-+ - 1: ADP feature enabled
-+ </td></tr>
-+
-+  <tr>
-+ <td>otg_ver</td>
-+ <td>Specifies whether OTG is performing as USB OTG Revision 2.0 or Revision 1.3
-+ USB OTG device.
-+ - 0: OTG 2.0 support disabled (default)
-+ - 1: OTG 2.0 support enabled
-+ </td></tr>
-+
-+*/
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_driver.h
-@@ -0,0 +1,86 @@
-+/* ==========================================================================
-+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.h $
-+ * $Revision: #19 $
-+ * $Date: 2010/11/15 $
-+ * $Change: 1627671 $
-+ *
-+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
-+ * "Software") is an Unsupported proprietary work of Synopsys, Inc. unless
-+ * otherwise expressly agreed to in writing between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product under
-+ * any End User Software License Agreement or Agreement for Licensed Product
-+ * with Synopsys or any supplement thereto. You are permitted to use and
-+ * redistribute this Software in source and binary forms, with or without
-+ * modification, provided that redistributions of source code must retain this
-+ * notice. You may not view, use, disclose, copy or distribute this file or
-+ * any information contained herein except pursuant to this license grant from
-+ * Synopsys. If you do not agree with this notice, including the disclaimer
-+ * below, then you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" BASIS
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS BE LIABLE FOR ANY DIRECT,
-+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================== */
-+
-+#ifndef __DWC_OTG_DRIVER_H__
-+#define __DWC_OTG_DRIVER_H__
-+
-+/** @file
-+ * This file contains the interface to the Linux driver.
-+ */
-+#include "dwc_otg_os_dep.h"
-+#include "dwc_otg_core_if.h"
-+
-+/* Type declarations */
-+struct dwc_otg_pcd;
-+struct dwc_otg_hcd;
-+
-+/**
-+ * This structure is a wrapper that encapsulates the driver components used to
-+ * manage a single DWC_otg controller.
-+ */
-+typedef struct dwc_otg_device {
-+	/** Structure containing OS-dependent stuff. KEEP THIS STRUCT AT THE
-+	 * VERY BEGINNING OF THE DEVICE STRUCT. OSes such as FreeBSD and NetBSD
-+	 * require this. */
-+	struct os_dependent os_dep;
-+
-+	/** Pointer to the core interface structure. */
-+	dwc_otg_core_if_t *core_if;
-+
-+	/** Pointer to the PCD structure. */
-+	struct dwc_otg_pcd *pcd;
-+
-+	/** Pointer to the HCD structure. */
-+	struct dwc_otg_hcd *hcd;
-+
-+	/** Flag to indicate whether the common IRQ handler is installed. */
-+	uint8_t common_irq_installed;
-+
-+} dwc_otg_device_t;
-+
-+/*We must clear S3C24XX_EINTPEND external interrupt register
-+ * because after clearing in this register trigerred IRQ from
-+ * H/W core in kernel interrupt can be occured again before OTG
-+ * handlers clear all IRQ sources of Core registers because of
-+ * timing latencies and Low Level IRQ Type.
-+ */
-+#ifdef CONFIG_MACH_IPMATE
-+#define  S3C2410X_CLEAR_EINTPEND()   \
-+do { \
-+	__raw_writel(1UL << 11,S3C24XX_EINTPEND); \
-+} while (0)
-+#else
-+#define  S3C2410X_CLEAR_EINTPEND()   do { } while (0)
-+#endif
-+
-+#endif
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c
-@@ -0,0 +1,1433 @@
-+/*
-+ * dwc_otg_fiq_fsm.c - The finite state machine FIQ
-+ *
-+ * Copyright (c) 2013 Raspberry Pi Foundation
-+ *
-+ * Author: Jonathan Bell <jonathan@raspberrypi.org>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ *	* Redistributions of source code must retain the above copyright
-+ *	  notice, this list of conditions and the following disclaimer.
-+ *	* Redistributions in binary form must reproduce the above copyright
-+ *	  notice, this list of conditions and the following disclaimer in the
-+ *	  documentation and/or other materials provided with the distribution.
-+ *	* Neither the name of Raspberry Pi nor the
-+ *	  names of its contributors may be used to endorse or promote products
-+ *	  derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ * This FIQ implements functionality that performs split transactions on
-+ * the dwc_otg hardware without any outside intervention. A split transaction
-+ * is "queued" by nominating a specific host channel to perform the entirety
-+ * of a split transaction. This FIQ will then perform the microframe-precise
-+ * scheduling required in each phase of the transaction until completion.
-+ *
-+ * The FIQ functionality is glued into the Synopsys driver via the entry point
-+ * in the FSM enqueue function, and at the exit point in handling a HC interrupt
-+ * for a FSM-enabled channel.
-+ *
-+ * NB: Large parts of this implementation have architecture-specific code.
-+ * For porting this functionality to other ARM machines, the minimum is required:
-+ * - An interrupt controller allowing the top-level dwc USB interrupt to be routed
-+ *   to the FIQ
-+ * - A method of forcing a software generated interrupt from FIQ mode that then
-+ *   triggers an IRQ entry (with the dwc USB handler called by this IRQ number)
-+ * - Guaranteed interrupt routing such that both the FIQ and SGI occur on the same
-+ *   processor core - there is no locking between the FIQ and IRQ (aside from
-+ *   local_fiq_disable)
-+ *
-+ */
-+
-+#include "dwc_otg_fiq_fsm.h"
-+
-+
-+char buffer[1000*16];
-+int wptr;
-+void notrace _fiq_print(enum fiq_debug_level dbg_lvl, volatile struct fiq_state *state, char *fmt, ...)
-+{
-+	enum fiq_debug_level dbg_lvl_req = FIQDBG_ERR;
-+	va_list args;
-+	char text[17];
-+	hfnum_data_t hfnum = { .d32 = FIQ_READ(state->dwc_regs_base + 0x408) };
-+
-+	if((dbg_lvl & dbg_lvl_req) || dbg_lvl == FIQDBG_ERR)
-+	{
-+		snprintf(text, 9, " %4d:%1u  ", hfnum.b.frnum/8, hfnum.b.frnum & 7);
-+		va_start(args, fmt);
-+		vsnprintf(text+8, 9, fmt, args);
-+		va_end(args);
-+
-+		memcpy(buffer + wptr, text, 16);
-+		wptr = (wptr + 16) % sizeof(buffer);
-+	}
-+}
-+
-+
-+#ifdef CONFIG_ARM64
-+
-+inline void fiq_fsm_spin_lock(fiq_lock_t *lock)
-+{
-+	spin_lock((spinlock_t *)lock);
-+}
-+
-+inline void fiq_fsm_spin_unlock(fiq_lock_t *lock)
-+{
-+	spin_unlock((spinlock_t *)lock);
-+}
-+
-+#else
-+
-+/**
-+ * fiq_fsm_spin_lock() - ARMv6+ bare bones spinlock
-+ * Must be called with local interrupts and FIQ disabled.
-+ */
-+#if defined(CONFIG_ARCH_BCM2835) && defined(CONFIG_SMP)
-+inline void fiq_fsm_spin_lock(fiq_lock_t *lock)
-+{
-+	unsigned long tmp;
-+	uint32_t newval;
-+	fiq_lock_t lockval;
-+	/* Nested locking, yay. If we are on the same CPU as the fiq, then the disable
-+	 * will be sufficient. If we are on a different CPU, then the lock protects us. */
-+	prefetchw(&lock->slock);
-+	asm volatile (
-+	"1:     ldrex   %0, [%3]\n"
-+	"       add     %1, %0, %4\n"
-+	"       strex   %2, %1, [%3]\n"
-+	"       teq     %2, #0\n"
-+	"       bne     1b"
-+	: "=&r" (lockval), "=&r" (newval), "=&r" (tmp)
-+	: "r" (&lock->slock), "I" (1 << 16)
-+	: "cc");
-+
-+	while (lockval.tickets.next != lockval.tickets.owner) {
-+		wfe();
-+		lockval.tickets.owner = READ_ONCE(lock->tickets.owner);
-+	}
-+	smp_mb();
-+}
-+#else
-+inline void fiq_fsm_spin_lock(fiq_lock_t *lock) { }
-+#endif
-+
-+/**
-+ * fiq_fsm_spin_unlock() - ARMv6+ bare bones spinunlock
-+ */
-+#if defined(CONFIG_ARCH_BCM2835) && defined(CONFIG_SMP)
-+inline void fiq_fsm_spin_unlock(fiq_lock_t *lock)
-+{
-+	smp_mb();
-+	lock->tickets.owner++;
-+	dsb_sev();
-+}
-+#else
-+inline void fiq_fsm_spin_unlock(fiq_lock_t *lock) { }
-+#endif
-+
-+#endif
-+
-+/**
-+ * fiq_fsm_restart_channel() - Poke channel enable bit for a split transaction
-+ * @channel: channel to re-enable
-+ */
-+static void fiq_fsm_restart_channel(struct fiq_state *st, int n, int force)
-+{
-+	hcchar_data_t hcchar = { .d32 = FIQ_READ(st->dwc_regs_base + HC_START + (HC_OFFSET * n) + HCCHAR) };
-+
-+	hcchar.b.chen = 0;
-+	if (st->channel[n].hcchar_copy.b.eptype & 0x1) {
-+		hfnum_data_t hfnum = { .d32 = FIQ_READ(st->dwc_regs_base + HFNUM) };
-+		/* Hardware bug workaround: update the ssplit index */
-+		if (st->channel[n].hcsplt_copy.b.spltena)
-+			st->channel[n].expected_uframe = (hfnum.b.frnum + 1) & 0x3FFF;
-+
-+		hcchar.b.oddfrm = (hfnum.b.frnum & 0x1) ? 0	: 1;
-+	}
-+
-+	FIQ_WRITE(st->dwc_regs_base + HC_START + (HC_OFFSET * n) + HCCHAR, hcchar.d32);
-+	hcchar.d32 = FIQ_READ(st->dwc_regs_base + HC_START + (HC_OFFSET * n) + HCCHAR);
-+	hcchar.b.chen = 1;
-+
-+	FIQ_WRITE(st->dwc_regs_base + HC_START + (HC_OFFSET * n) + HCCHAR, hcchar.d32);
-+	fiq_print(FIQDBG_INT, st, "HCGO %01d %01d", n, force);
-+}
-+
-+/**
-+ * fiq_fsm_setup_csplit() - Prepare a host channel for a CSplit transaction stage
-+ * @st: Pointer to the channel's state
-+ * @n : channel number
-+ *
-+ * Change host channel registers to perform a complete-split transaction. Being mindful of the
-+ * endpoint direction, set control regs up correctly.
-+ */
-+static void notrace fiq_fsm_setup_csplit(struct fiq_state *st, int n)
-+{
-+	hcsplt_data_t hcsplt = { .d32 = FIQ_READ(st->dwc_regs_base + HC_START + (HC_OFFSET * n) + HCSPLT) };
-+	hctsiz_data_t hctsiz = { .d32 = FIQ_READ(st->dwc_regs_base + HC_START + (HC_OFFSET * n) + HCTSIZ) };
-+
-+	hcsplt.b.compsplt = 1;
-+	if (st->channel[n].hcchar_copy.b.epdir == 1) {
-+		// If IN, the CSPLIT result contains the data or a hub handshake. hctsiz = maxpacket.
-+		hctsiz.b.xfersize = st->channel[n].hctsiz_copy.b.xfersize;
-+	} else {
-+		// If OUT, the CSPLIT result contains handshake only.
-+		hctsiz.b.xfersize = 0;
-+	}
-+	FIQ_WRITE(st->dwc_regs_base + HC_START + (HC_OFFSET * n) + HCSPLT, hcsplt.d32);
-+	FIQ_WRITE(st->dwc_regs_base + HC_START + (HC_OFFSET * n) + HCTSIZ, hctsiz.d32);
-+	mb();
-+}
-+
-+/**
-+ * fiq_fsm_restart_np_pending() - Restart a single non-periodic contended transfer
-+ * @st: Pointer to the channel's state
-+ * @num_channels: Total number of host channels
-+ * @orig_channel: Channel index of completed transfer
-+ *
-+ * In the case where an IN and OUT transfer are simultaneously scheduled to the
-+ * same device/EP, inadequate hub implementations will misbehave. Once the first
-+ * transfer is complete, a pending non-periodic split can then be issued.
-+ */
-+static void notrace fiq_fsm_restart_np_pending(struct fiq_state *st, int num_channels, int orig_channel)
-+{
-+	int i;
-+	int dev_addr = st->channel[orig_channel].hcchar_copy.b.devaddr;
-+	int ep_num = st->channel[orig_channel].hcchar_copy.b.epnum;
-+	for (i = 0; i < num_channels; i++) {
-+		if (st->channel[i].fsm == FIQ_NP_SSPLIT_PENDING &&
-+			st->channel[i].hcchar_copy.b.devaddr == dev_addr &&
-+			st->channel[i].hcchar_copy.b.epnum == ep_num) {
-+			st->channel[i].fsm = FIQ_NP_SSPLIT_STARTED;
-+			fiq_fsm_restart_channel(st, i, 0);
-+			break;
-+		}
-+	}
-+}
-+
-+static inline int notrace fiq_get_xfer_len(struct fiq_state *st, int n)
-+{
-+	/* The xfersize register is a bit wonky. For IN transfers, it decrements by the packet size. */
-+	hctsiz_data_t hctsiz = { .d32 = FIQ_READ(st->dwc_regs_base + HC_START + (HC_OFFSET * n) + HCTSIZ) };
-+
-+	if (st->channel[n].hcchar_copy.b.epdir == 0) {
-+		return st->channel[n].hctsiz_copy.b.xfersize;
-+	} else {
-+		return st->channel[n].hctsiz_copy.b.xfersize - hctsiz.b.xfersize;
-+	}
-+
-+}
-+
-+
-+/**
-+ * fiq_increment_dma_buf() - update DMA address for bounce buffers after a CSPLIT
-+ *
-+ * Of use only for IN periodic transfers.
-+ */
-+static int notrace fiq_increment_dma_buf(struct fiq_state *st, int num_channels, int n)
-+{
-+	hcdma_data_t hcdma;
-+	int i = st->channel[n].dma_info.index;
-+	int len;
-+	struct fiq_dma_blob *blob =
-+		(struct fiq_dma_blob *)(uintptr_t)st->dma_base;
-+
-+	len = fiq_get_xfer_len(st, n);
-+	fiq_print(FIQDBG_INT, st, "LEN: %03d", len);
-+	st->channel[n].dma_info.slot_len[i] = len;
-+	i++;
-+	if (i > 6)
-+		BUG();
-+
-+	hcdma.d32 = (u32)(uintptr_t)&blob->channel[n].index[i].buf[0];
-+	FIQ_WRITE(st->dwc_regs_base + HC_START + (HC_OFFSET * n) + HC_DMA, hcdma.d32);
-+	st->channel[n].dma_info.index = i;
-+	return 0;
-+}
-+
-+/**
-+ * fiq_reload_hctsiz() - for IN transactions, reset HCTSIZ
-+ */
-+static void notrace fiq_fsm_reload_hctsiz(struct fiq_state *st, int n)
-+{
-+	hctsiz_data_t hctsiz = { .d32 = FIQ_READ(st->dwc_regs_base + HC_START + (HC_OFFSET * n) + HCTSIZ) };
-+	hctsiz.b.xfersize = st->channel[n].hctsiz_copy.b.xfersize;
-+	hctsiz.b.pktcnt = 1;
-+	FIQ_WRITE(st->dwc_regs_base + HC_START + (HC_OFFSET * n) + HCTSIZ, hctsiz.d32);
-+}
-+
-+/**
-+ * fiq_fsm_reload_hcdma() - for OUT transactions, rewind DMA pointer
-+ */
-+static void notrace fiq_fsm_reload_hcdma(struct fiq_state *st, int n)
-+{
-+	hcdma_data_t hcdma = st->channel[n].hcdma_copy;
-+	FIQ_WRITE(st->dwc_regs_base + HC_START + (HC_OFFSET * n) + HC_DMA, hcdma.d32);
-+}
-+
-+/**
-+ * fiq_iso_out_advance() - update DMA address and split position bits
-+ * for isochronous OUT transactions.
-+ *
-+ * Returns 1 if this is the last packet queued, 0 otherwise. Split-ALL and
-+ * Split-BEGIN states are not handled - this is done when the transaction was queued.
-+ *
-+ * This function must only be called from the FIQ_ISO_OUT_ACTIVE state.
-+ */
-+static int notrace fiq_iso_out_advance(struct fiq_state *st, int num_channels, int n)
-+{
-+	hcsplt_data_t hcsplt;
-+	hctsiz_data_t hctsiz;
-+	hcdma_data_t hcdma;
-+	struct fiq_dma_blob *blob =
-+		(struct fiq_dma_blob *)(uintptr_t)st->dma_base;
-+	int last = 0;
-+	int i = st->channel[n].dma_info.index;
-+
-+	fiq_print(FIQDBG_INT, st, "ADV %01d %01d ", n, i);
-+	i++;
-+	if (i == 4)
-+		last = 1;
-+	if (st->channel[n].dma_info.slot_len[i+1] == 255)
-+		last = 1;
-+
-+	/* New DMA address - address of bounce buffer referred to in index */
-+	hcdma.d32 = (u32)(uintptr_t)blob->channel[n].index[i].buf;
-+	//hcdma.d32 = FIQ_READ(st->dwc_regs_base + HC_START + (HC_OFFSET * n) + HC_DMA);
-+	//hcdma.d32 += st->channel[n].dma_info.slot_len[i];
-+	fiq_print(FIQDBG_INT, st, "LAST: %01d ", last);
-+	fiq_print(FIQDBG_INT, st, "LEN: %03d", st->channel[n].dma_info.slot_len[i]);
-+	hcsplt.d32 = FIQ_READ(st->dwc_regs_base + HC_START + (HC_OFFSET * n) + HCSPLT);
-+	hctsiz.d32 = FIQ_READ(st->dwc_regs_base + HC_START + (HC_OFFSET * n) + HCTSIZ);
-+	hcsplt.b.xactpos = (last) ? ISOC_XACTPOS_END : ISOC_XACTPOS_MID;
-+	/* Set up new packet length */
-+	hctsiz.b.pktcnt = 1;
-+	hctsiz.b.xfersize = st->channel[n].dma_info.slot_len[i];
-+	fiq_print(FIQDBG_INT, st, "%08x", hctsiz.d32);
-+
-+	st->channel[n].dma_info.index++;
-+	FIQ_WRITE(st->dwc_regs_base + HC_START + (HC_OFFSET * n) + HCSPLT, hcsplt.d32);
-+	FIQ_WRITE(st->dwc_regs_base + HC_START + (HC_OFFSET * n) + HCTSIZ, hctsiz.d32);
-+	FIQ_WRITE(st->dwc_regs_base + HC_START + (HC_OFFSET * n) + HC_DMA, hcdma.d32);
-+	return last;
-+}
-+
-+/**
-+ * fiq_fsm_tt_next_isoc() - queue next pending isochronous out start-split on a TT
-+ *
-+ * Despite the limitations of the DWC core, we can force a microframe pipeline of
-+ * isochronous OUT start-split transactions while waiting for a corresponding other-type
-+ * of endpoint to finish its CSPLITs. TTs have big periodic buffers therefore it
-+ * is very unlikely that filling the start-split FIFO will cause data loss.
-+ * This allows much better interleaving of transactions in an order-independent way-
-+ * there is no requirement to prioritise isochronous, just a state-space search has
-+ * to be performed on each periodic start-split complete interrupt.
-+ */
-+static int notrace fiq_fsm_tt_next_isoc(struct fiq_state *st, int num_channels, int n)
-+{
-+	int hub_addr = st->channel[n].hub_addr;
-+	int port_addr = st->channel[n].port_addr;
-+	int i, poked = 0;
-+	for (i = 0; i < num_channels; i++) {
-+		if (i == n || st->channel[i].fsm == FIQ_PASSTHROUGH)
-+			continue;
-+		if (st->channel[i].hub_addr == hub_addr &&
-+			st->channel[i].port_addr == port_addr) {
-+			switch (st->channel[i].fsm) {
-+			case FIQ_PER_ISO_OUT_PENDING:
-+				if (st->channel[i].nrpackets == 1) {
-+					st->channel[i].fsm = FIQ_PER_ISO_OUT_LAST;
-+				} else {
-+					st->channel[i].fsm = FIQ_PER_ISO_OUT_ACTIVE;
-+				}
-+				fiq_fsm_restart_channel(st, i, 0);
-+				poked = 1;
-+				break;
-+
-+			default:
-+				break;
-+			}
-+		}
-+		if (poked)
-+			break;
-+	}
-+	return poked;
-+}
-+
-+/**
-+ * fiq_fsm_tt_in_use() - search for host channels using this TT
-+ * @n: Channel to use as reference
-+ *
-+ */
-+int notrace noinline fiq_fsm_tt_in_use(struct fiq_state *st, int num_channels, int n)
-+{
-+	int hub_addr = st->channel[n].hub_addr;
-+	int port_addr = st->channel[n].port_addr;
-+	int i, in_use = 0;
-+	for (i = 0; i < num_channels; i++) {
-+		if (i == n || st->channel[i].fsm == FIQ_PASSTHROUGH)
-+			continue;
-+		switch (st->channel[i].fsm) {
-+		/* TT is reserved for channels that are in the middle of a periodic
-+		 * split transaction.
-+		 */
-+		case FIQ_PER_SSPLIT_STARTED:
-+		case FIQ_PER_CSPLIT_WAIT:
-+		case FIQ_PER_CSPLIT_NYET1:
-+		//case FIQ_PER_CSPLIT_POLL:
-+		case FIQ_PER_ISO_OUT_ACTIVE:
-+		case FIQ_PER_ISO_OUT_LAST:
-+			if (st->channel[i].hub_addr == hub_addr &&
-+				st->channel[i].port_addr == port_addr) {
-+				in_use = 1;
-+			}
-+			break;
-+		default:
-+			break;
-+		}
-+		if (in_use)
-+			break;
-+	}
-+	return in_use;
-+}
-+
-+/**
-+ * fiq_fsm_more_csplits() - determine whether additional CSPLITs need
-+ * 			to be issued for this IN transaction.
-+ *
-+ * We cannot tell the inbound PID of a data packet due to hardware limitations.
-+ * we need to make an educated guess as to whether we need to queue another CSPLIT
-+ * or not. A no-brainer is when we have received enough data to fill the endpoint
-+ * size, but for endpoints that give variable-length data then we have to resort
-+ * to heuristics.
-+ *
-+ * We also return whether this is the last CSPLIT to be queued, again based on
-+ * heuristics. This is to allow a 1-uframe overlap of periodic split transactions.
-+ * Note: requires at least 1 CSPLIT to have been performed prior to being called.
-+ */
-+
-+/*
-+ * We need some way of guaranteeing if a returned periodic packet of size X
-+ * has a DATA0 PID.
-+ * The heuristic value of 144 bytes assumes that the received data has maximal
-+ * bit-stuffing and the clock frequency of the transmitting device is at the lowest
-+ * permissible limit. If the transfer length results in a final packet size
-+ * 144 < p <= 188, then an erroneous CSPLIT will be issued.
-+ * Also used to ensure that an endpoint will nominally only return a single
-+ * complete-split worth of data.
-+ */
-+#define DATA0_PID_HEURISTIC 144
-+
-+static int notrace noinline fiq_fsm_more_csplits(struct fiq_state *state, int n, int *probably_last)
-+{
-+
-+	int i;
-+	int total_len = 0;
-+	int more_needed = 1;
-+	struct fiq_channel_state *st = &state->channel[n];
-+
-+	for (i = 0; i < st->dma_info.index; i++) {
-+			total_len += st->dma_info.slot_len[i];
-+	}
-+
-+	*probably_last = 0;
-+
-+	if (st->hcchar_copy.b.eptype == 0x3) {
-+		/*
-+		 * An interrupt endpoint will take max 2 CSPLITs. if we are receiving data
-+		 * then this is definitely the last CSPLIT.
-+		 */
-+		*probably_last = 1;
-+	} else {
-+		/* Isoc IN. This is a bit risky if we are the first transaction:
-+		 * we may have been held off slightly. */
-+		if (i > 1 && st->dma_info.slot_len[st->dma_info.index-1] <= DATA0_PID_HEURISTIC) {
-+			more_needed = 0;
-+		}
-+		/* If in the next uframe we will receive enough data to fill the endpoint,
-+		 * then only issue 1 more csplit.
-+		 */
-+		if (st->hctsiz_copy.b.xfersize - total_len <= DATA0_PID_HEURISTIC)
-+			*probably_last = 1;
-+	}
-+
-+	if (total_len >= st->hctsiz_copy.b.xfersize ||
-+		i == 6 || total_len == 0)
-+		/* Note: due to bit stuffing it is possible to have > 6 CSPLITs for
-+		 * a single endpoint. Accepting more would completely break our scheduling mechanism though
-+		 * - in these extreme cases we will pass through a truncated packet.
-+		 */
-+		more_needed = 0;
-+
-+	return more_needed;
-+}
-+
-+/**
-+ * fiq_fsm_too_late() - Test transaction for lateness
-+ *
-+ * If a SSPLIT for a large IN transaction is issued too late in a frame,
-+ * the hub will disable the port to the device and respond with ERR handshakes.
-+ * The hub status endpoint will not reflect this change.
-+ * Returns 1 if we will issue a SSPLIT that will result in a device babble.
-+ */
-+int notrace fiq_fsm_too_late(struct fiq_state *st, int n)
-+{
-+	int uframe;
-+	hfnum_data_t hfnum = { .d32 = FIQ_READ(st->dwc_regs_base + HFNUM) };
-+	uframe = hfnum.b.frnum & 0x7;
-+	if ((uframe < 6) && (st->channel[n].nrpackets + 1 + uframe > 7)) {
-+		return 1;
-+	} else {
-+		return 0;
-+	}
-+}
-+
-+
-+/**
-+ * fiq_fsm_start_next_periodic() - A half-arsed attempt at a microframe pipeline
-+ *
-+ * Search pending transactions in the start-split pending state and queue them.
-+ * Don't queue packets in uframe .5 (comes out in .6) (USB2.0 11.18.4).
-+ * Note: we specifically don't do isochronous OUT transactions first because better
-+ * use of the TT's start-split fifo can be achieved by pipelining an IN before an OUT.
-+ */
-+static void notrace noinline fiq_fsm_start_next_periodic(struct fiq_state *st, int num_channels)
-+{
-+	int n;
-+	hfnum_data_t hfnum = { .d32 = FIQ_READ(st->dwc_regs_base + HFNUM) };
-+	if ((hfnum.b.frnum & 0x7) == 5)
-+		return;
-+	for (n = 0; n < num_channels; n++) {
-+		if (st->channel[n].fsm == FIQ_PER_SSPLIT_QUEUED) {
-+			/* Check to see if any other transactions are using this TT */
-+			if(!fiq_fsm_tt_in_use(st, num_channels, n)) {
-+				if (!fiq_fsm_too_late(st, n)) {
-+					st->channel[n].fsm = FIQ_PER_SSPLIT_STARTED;
-+					fiq_print(FIQDBG_INT, st, "NEXTPER ");
-+					fiq_fsm_restart_channel(st, n, 0);
-+				} else {
-+					st->channel[n].fsm = FIQ_PER_SPLIT_TIMEOUT;
-+				}
-+				break;
-+			}
-+		}
-+	}
-+	for (n = 0; n < num_channels; n++) {
-+		if (st->channel[n].fsm == FIQ_PER_ISO_OUT_PENDING) {
-+			if (!fiq_fsm_tt_in_use(st, num_channels, n)) {
-+				fiq_print(FIQDBG_INT, st, "NEXTISO ");
-+				if (st->channel[n].nrpackets == 1)
-+					st->channel[n].fsm = FIQ_PER_ISO_OUT_LAST;
-+				else
-+					st->channel[n].fsm = FIQ_PER_ISO_OUT_ACTIVE;
-+				fiq_fsm_restart_channel(st, n, 0);
-+				break;
-+			}
-+		}
-+	}
-+}
-+
-+/**
-+ * fiq_fsm_update_hs_isoc() - update isochronous frame and transfer data
-+ * @state:	Pointer to fiq_state
-+ * @n:		Channel transaction is active on
-+ * @hcint:	Copy of host channel interrupt register
-+ *
-+ * Returns 0 if there are no more transactions for this HC to do, 1
-+ * otherwise.
-+ */
-+static int notrace noinline fiq_fsm_update_hs_isoc(struct fiq_state *state, int n, hcint_data_t hcint)
-+{
-+	struct fiq_channel_state *st = &state->channel[n];
-+	int xfer_len = 0, nrpackets = 0;
-+	hcdma_data_t hcdma;
-+	fiq_print(FIQDBG_INT, state, "HSISO %02d", n);
-+
-+	xfer_len = fiq_get_xfer_len(state, n);
-+	st->hs_isoc_info.iso_desc[st->hs_isoc_info.index].actual_length = xfer_len;
-+
-+	st->hs_isoc_info.iso_desc[st->hs_isoc_info.index].status = hcint.d32;
-+
-+	st->hs_isoc_info.index++;
-+	if (st->hs_isoc_info.index == st->hs_isoc_info.nrframes) {
-+		return 0;
-+	}
-+
-+	/* grab the next DMA address offset from the array */
-+	hcdma.d32 = st->hcdma_copy.d32 + st->hs_isoc_info.iso_desc[st->hs_isoc_info.index].offset;
-+	FIQ_WRITE(state->dwc_regs_base + HC_START + (HC_OFFSET * n) + HC_DMA, hcdma.d32);
-+
-+	/* We need to set multi_count. This is a bit tricky - has to be set per-transaction as
-+	 * the core needs to be told to send the correct number. Caution: for IN transfers,
-+	 * this is always set to the maximum size of the endpoint. */
-+	xfer_len = st->hs_isoc_info.iso_desc[st->hs_isoc_info.index].length;
-+	/* Integer divide in a FIQ: fun. FIXME: make this not suck */
-+	nrpackets = (xfer_len + st->hcchar_copy.b.mps - 1) / st->hcchar_copy.b.mps;
-+	if (nrpackets == 0)
-+		nrpackets = 1;
-+	st->hcchar_copy.b.multicnt = nrpackets;
-+	st->hctsiz_copy.b.pktcnt = nrpackets;
-+
-+	/* Initial PID also needs to be set */
-+	if (st->hcchar_copy.b.epdir == 0) {
-+		st->hctsiz_copy.b.xfersize = xfer_len;
-+		switch (st->hcchar_copy.b.multicnt) {
-+		case 1:
-+			st->hctsiz_copy.b.pid = DWC_PID_DATA0;
-+			break;
-+		case 2:
-+		case 3:
-+			st->hctsiz_copy.b.pid = DWC_PID_MDATA;
-+			break;
-+		}
-+
-+	} else {
-+		st->hctsiz_copy.b.xfersize = nrpackets * st->hcchar_copy.b.mps;
-+		switch (st->hcchar_copy.b.multicnt) {
-+		case 1:
-+			st->hctsiz_copy.b.pid = DWC_PID_DATA0;
-+			break;
-+		case 2:
-+			st->hctsiz_copy.b.pid = DWC_PID_DATA1;
-+			break;
-+		case 3:
-+			st->hctsiz_copy.b.pid = DWC_PID_DATA2;
-+			break;
-+		}
-+	}
-+	FIQ_WRITE(state->dwc_regs_base + HC_START + (HC_OFFSET * n) + HCTSIZ, st->hctsiz_copy.d32);
-+	FIQ_WRITE(state->dwc_regs_base + HC_START + (HC_OFFSET * n) + HCCHAR, st->hcchar_copy.d32);
-+	/* Channel is enabled on hcint handler exit */
-+	fiq_print(FIQDBG_INT, state, "HSISOOUT");
-+	return 1;
-+}
-+
-+
-+/**
-+ * fiq_fsm_do_sof() - FSM start-of-frame interrupt handler
-+ * @state:	Pointer to the state struct passed from banked FIQ mode registers.
-+ * @num_channels:	set according to the DWC hardware configuration
-+ *
-+ * The SOF handler in FSM mode has two functions
-+ * 1. Hold off SOF from causing schedule advancement in IRQ context if there's
-+ *    nothing to do
-+ * 2. Advance certain FSM states that require either a microframe delay, or a microframe
-+ *    of holdoff.
-+ *
-+ * The second part is architecture-specific to mach-bcm2835 -
-+ * a sane interrupt controller would have a mask register for ARM interrupt sources
-+ * to be promoted to the nFIQ line, but it doesn't. Instead a single interrupt
-+ * number (USB) can be enabled. This means that certain parts of the USB specification
-+ * that require "wait a little while, then issue another packet" cannot be fulfilled with
-+ * the timing granularity required to achieve optimal throughout. The workaround is to use
-+ * the SOF "timer" (125uS) to perform this task.
-+ */
-+static int notrace noinline fiq_fsm_do_sof(struct fiq_state *state, int num_channels)
-+{
-+	hfnum_data_t hfnum = { .d32 = FIQ_READ(state->dwc_regs_base + HFNUM) };
-+	int n;
-+	int kick_irq = 0;
-+
-+	if ((hfnum.b.frnum & 0x7) == 1) {
-+		/* We cannot issue csplits for transactions in the last frame past (n+1).1
-+		 * Check to see if there are any transactions that are stale.
-+		 * Boot them out.
-+		 */
-+		for (n = 0; n < num_channels; n++) {
-+			switch (state->channel[n].fsm) {
-+			case FIQ_PER_CSPLIT_WAIT:
-+			case FIQ_PER_CSPLIT_NYET1:
-+			case FIQ_PER_CSPLIT_POLL:
-+			case FIQ_PER_CSPLIT_LAST:
-+				/* Check if we are no longer in the same full-speed frame. */
-+				if (((state->channel[n].expected_uframe & 0x3FFF) & ~0x7) <
-+						(hfnum.b.frnum & ~0x7))
-+					state->channel[n].fsm = FIQ_PER_SPLIT_TIMEOUT;
-+				break;
-+			default:
-+				break;
-+			}
-+		}
-+	}
-+
-+	for (n = 0; n < num_channels; n++) {
-+		switch (state->channel[n].fsm) {
-+
-+		case FIQ_NP_SSPLIT_RETRY:
-+		case FIQ_NP_IN_CSPLIT_RETRY:
-+		case FIQ_NP_OUT_CSPLIT_RETRY:
-+			fiq_fsm_restart_channel(state, n, 0);
-+			break;
-+
-+		case FIQ_HS_ISOC_SLEEPING:
-+			/* Is it time to wake this channel yet? */
-+			if (--state->channel[n].uframe_sleeps == 0) {
-+				state->channel[n].fsm = FIQ_HS_ISOC_TURBO;
-+				fiq_fsm_restart_channel(state, n, 0);
-+			}
-+			break;
-+
-+		case FIQ_PER_SSPLIT_QUEUED:
-+			if ((hfnum.b.frnum & 0x7) == 5)
-+				break;
-+			if(!fiq_fsm_tt_in_use(state, num_channels, n)) {
-+				if (!fiq_fsm_too_late(state, n)) {
-+					fiq_print(FIQDBG_INT, state, "SOF GO %01d", n);
-+					fiq_fsm_restart_channel(state, n, 0);
-+					state->channel[n].fsm = FIQ_PER_SSPLIT_STARTED;
-+				} else {
-+					/* Transaction cannot be started without risking a device babble error */
-+					state->channel[n].fsm = FIQ_PER_SPLIT_TIMEOUT;
-+					state->haintmsk_saved.b2.chint &= ~(1 << n);
-+					FIQ_WRITE(state->dwc_regs_base + HC_START + (HC_OFFSET * n) + HCINTMSK, 0);
-+					kick_irq |= 1;
-+				}
-+			}
-+			break;
-+
-+		case FIQ_PER_ISO_OUT_PENDING:
-+			/* Ordinarily, this should be poked after the SSPLIT
-+			 * complete interrupt for a competing transfer on the same
-+			 * TT. Doesn't happen for aborted transactions though.
-+			 */
-+			if ((hfnum.b.frnum & 0x7) >= 5)
-+				break;
-+			if (!fiq_fsm_tt_in_use(state, num_channels, n)) {
-+				/* Hardware bug. SOF can sometimes occur after the channel halt interrupt
-+				 * that caused this.
-+				 */
-+					fiq_fsm_restart_channel(state, n, 0);
-+					fiq_print(FIQDBG_INT, state, "SOF ISOC");
-+					if (state->channel[n].nrpackets == 1) {
-+						state->channel[n].fsm = FIQ_PER_ISO_OUT_LAST;
-+					} else {
-+						state->channel[n].fsm = FIQ_PER_ISO_OUT_ACTIVE;
-+					}
-+			}
-+			break;
-+
-+		case FIQ_PER_CSPLIT_WAIT:
-+			/* we are guaranteed to be in this state if and only if the SSPLIT interrupt
-+			 * occurred when the bus transaction occurred. The SOF interrupt reversal bug
-+			 * will utterly bugger this up though.
-+			 */
-+			if (hfnum.b.frnum != state->channel[n].expected_uframe) {
-+				fiq_print(FIQDBG_INT, state, "SOFCS %d ", n);
-+				state->channel[n].fsm = FIQ_PER_CSPLIT_POLL;
-+				fiq_fsm_restart_channel(state, n, 0);
-+				fiq_fsm_start_next_periodic(state, num_channels);
-+
-+			}
-+			break;
-+
-+		case FIQ_PER_SPLIT_TIMEOUT:
-+		case FIQ_DEQUEUE_ISSUED:
-+			/* Ugly: we have to force a HCD interrupt.
-+			 * Poke the mask for the channel in question.
-+			 * We will take a fake SOF because of this, but
-+			 * that's OK.
-+			 */
-+			state->haintmsk_saved.b2.chint &= ~(1 << n);
-+			FIQ_WRITE(state->dwc_regs_base + HC_START + (HC_OFFSET * n) + HCINTMSK, 0);
-+			kick_irq |= 1;
-+			break;
-+
-+		default:
-+			break;
-+		}
-+	}
-+
-+	if (state->kick_np_queues ||
-+			dwc_frame_num_le(state->next_sched_frame, hfnum.b.frnum))
-+		kick_irq |= 1;
-+
-+	return !kick_irq;
-+}
-+
-+
-+/**
-+ * fiq_fsm_do_hcintr() - FSM host channel interrupt handler
-+ * @state: Pointer to the FIQ state struct
-+ * @num_channels: Number of channels as per hardware config
-+ * @n: channel for which HAINT(i) was raised
-+ *
-+ * An important property is that only the CHHLT interrupt is unmasked. Unfortunately, AHBerr is as well.
-+ */
-+static int notrace noinline fiq_fsm_do_hcintr(struct fiq_state *state, int num_channels, int n)
-+{
-+	hcint_data_t hcint;
-+	hcintmsk_data_t hcintmsk;
-+	hcint_data_t hcint_probe;
-+	hcchar_data_t hcchar;
-+	int handled = 0;
-+	int restart = 0;
-+	int last_csplit = 0;
-+	int start_next_periodic = 0;
-+	struct fiq_channel_state *st = &state->channel[n];
-+	hfnum_data_t hfnum;
-+
-+	hcint.d32 = FIQ_READ(state->dwc_regs_base + HC_START + (HC_OFFSET * n) + HCINT);
-+	hcintmsk.d32 = FIQ_READ(state->dwc_regs_base + HC_START + (HC_OFFSET * n) + HCINTMSK);
-+	hcint_probe.d32 = hcint.d32 & hcintmsk.d32;
-+
-+	if (st->fsm != FIQ_PASSTHROUGH) {
-+		fiq_print(FIQDBG_INT, state, "HC%01d ST%02d", n, st->fsm);
-+		fiq_print(FIQDBG_INT, state, "%08x", hcint.d32);
-+	}
-+
-+	switch (st->fsm) {
-+
-+	case FIQ_PASSTHROUGH:
-+	case FIQ_DEQUEUE_ISSUED:
-+		/* doesn't belong to us, kick it upstairs */
-+		break;
-+
-+	case FIQ_PASSTHROUGH_ERRORSTATE:
-+		/* We are here to emulate the error recovery mechanism of the dwc HCD.
-+		 * Several interrupts are unmasked if a previous transaction failed - it's
-+		 * death for the FIQ to attempt to handle them as the channel isn't halted.
-+		 * Emulate what the HCD does in this situation: mask and continue.
-+		 * The FSM has no other state setup so this has to be handled out-of-band.
-+		 */
-+		fiq_print(FIQDBG_ERR, state, "ERRST %02d", n);
-+		if (hcint_probe.b.nak || hcint_probe.b.ack || hcint_probe.b.datatglerr) {
-+			fiq_print(FIQDBG_ERR, state, "RESET %02d", n);
-+			/* In some random cases we can get a NAK interrupt coincident with a Xacterr
-+			 * interrupt, after the device has disappeared.
-+			 */
-+			if (!hcint.b.xacterr)
-+				st->nr_errors = 0;
-+			hcintmsk.b.nak = 0;
-+			hcintmsk.b.ack = 0;
-+			hcintmsk.b.datatglerr = 0;
-+			FIQ_WRITE(state->dwc_regs_base + HC_START + (HC_OFFSET * n) + HCINTMSK, hcintmsk.d32);
-+			return 1;
-+		}
-+		if (hcint_probe.b.chhltd) {
-+			fiq_print(FIQDBG_ERR, state, "CHHLT %02d", n);
-+			fiq_print(FIQDBG_ERR, state, "%08x", hcint.d32);
-+			return 0;
-+		}
-+		break;
-+
-+	/* Non-periodic state groups */
-+	case FIQ_NP_SSPLIT_STARTED:
-+	case FIQ_NP_SSPLIT_RETRY:
-+		/* Got a HCINT for a NP SSPLIT. Expected ACK / NAK / fail */
-+		if (hcint.b.ack) {
-+			/* SSPLIT complete. For OUT, the data has been sent. For IN, the LS transaction
-+			 * will start shortly. SOF needs to kick the transaction to prevent a NYET flood.
-+			 */
-+			if(st->hcchar_copy.b.epdir == 1)
-+				st->fsm = FIQ_NP_IN_CSPLIT_RETRY;
-+			else
-+				st->fsm = FIQ_NP_OUT_CSPLIT_RETRY;
-+			st->nr_errors = 0;
-+			handled = 1;
-+			fiq_fsm_setup_csplit(state, n);
-+		} else if (hcint.b.nak) {
-+			// No buffer space in TT. Retry on a uframe boundary.
-+			fiq_fsm_reload_hcdma(state, n);
-+			st->fsm = FIQ_NP_SSPLIT_RETRY;
-+			handled = 1;
-+		} else if (hcint.b.xacterr) {
-+			// The only other one we care about is xacterr. This implies HS bus error - retry.
-+			st->nr_errors++;
-+			if(st->hcchar_copy.b.epdir == 0)
-+				fiq_fsm_reload_hcdma(state, n);
-+			st->fsm = FIQ_NP_SSPLIT_RETRY;
-+			if (st->nr_errors >= 3) {
-+				st->fsm = FIQ_NP_SPLIT_HS_ABORTED;
-+			} else {
-+				handled = 1;
-+				restart = 1;
-+			}
-+		} else {
-+			st->fsm = FIQ_NP_SPLIT_LS_ABORTED;
-+			handled = 0;
-+			restart = 0;
-+		}
-+		break;
-+
-+	case FIQ_NP_IN_CSPLIT_RETRY:
-+		/* Received a CSPLIT done interrupt.
-+		 * Expected Data/NAK/STALL/NYET for IN.
-+		 */
-+		if (hcint.b.xfercomp) {
-+			/* For IN, data is present. */
-+			st->fsm = FIQ_NP_SPLIT_DONE;
-+		} else if (hcint.b.nak) {
-+			/* no endpoint data. Punt it upstairs */
-+			st->fsm = FIQ_NP_SPLIT_DONE;
-+		} else if (hcint.b.nyet) {
-+			/* CSPLIT NYET - retry on a uframe boundary. */
-+			handled = 1;
-+			st->nr_errors = 0;
-+		} else if (hcint.b.datatglerr) {
-+			/* data toggle errors do not set the xfercomp bit. */
-+			st->fsm = FIQ_NP_SPLIT_LS_ABORTED;
-+		} else if (hcint.b.xacterr) {
-+			/* HS error. Retry immediate */
-+			st->fsm = FIQ_NP_IN_CSPLIT_RETRY;
-+			st->nr_errors++;
-+			if (st->nr_errors >= 3) {
-+				st->fsm = FIQ_NP_SPLIT_HS_ABORTED;
-+			} else {
-+				handled = 1;
-+				restart = 1;
-+			}
-+		} else if (hcint.b.stall || hcint.b.bblerr) {
-+			/* A STALL implies either a LS bus error or a genuine STALL. */
-+			st->fsm = FIQ_NP_SPLIT_LS_ABORTED;
-+		} else {
-+			/*  Hardware bug. It's possible in some cases to
-+			 *  get a channel halt with nothing else set when
-+			 *  the response was a NYET. Treat as local 3-strikes retry.
-+			 */
-+			hcint_data_t hcint_test = hcint;
-+			hcint_test.b.chhltd = 0;
-+			if (!hcint_test.d32) {
-+				st->nr_errors++;
-+				if (st->nr_errors >= 3) {
-+					st->fsm = FIQ_NP_SPLIT_HS_ABORTED;
-+				} else {
-+					handled = 1;
-+				}
-+			} else {
-+				/* Bail out if something unexpected happened */
-+				st->fsm = FIQ_NP_SPLIT_HS_ABORTED;
-+			}
-+		}
-+		if (st->fsm != FIQ_NP_IN_CSPLIT_RETRY) {
-+			fiq_fsm_restart_np_pending(state, num_channels, n);
-+		}
-+		break;
-+
-+	case FIQ_NP_OUT_CSPLIT_RETRY:
-+		/* Received a CSPLIT done interrupt.
-+		 * Expected ACK/NAK/STALL/NYET/XFERCOMP for OUT.*/
-+		if (hcint.b.xfercomp) {
-+			st->fsm = FIQ_NP_SPLIT_DONE;
-+		} else if (hcint.b.nak) {
-+			// The HCD will implement the holdoff on frame boundaries.
-+			st->fsm = FIQ_NP_SPLIT_DONE;
-+		} else if (hcint.b.nyet) {
-+			// Hub still processing.
-+			st->fsm = FIQ_NP_OUT_CSPLIT_RETRY;
-+			handled = 1;
-+			st->nr_errors = 0;
-+			//restart = 1;
-+		} else if (hcint.b.xacterr) {
-+			/* HS error. retry immediate */
-+			st->fsm = FIQ_NP_OUT_CSPLIT_RETRY;
-+			st->nr_errors++;
-+			if (st->nr_errors >= 3) {
-+				st->fsm = FIQ_NP_SPLIT_HS_ABORTED;
-+			} else {
-+				handled = 1;
-+				restart = 1;
-+			}
-+		} else if (hcint.b.stall) {
-+			/* LS bus error or genuine stall */
-+			st->fsm = FIQ_NP_SPLIT_LS_ABORTED;
-+		} else {
-+			/*
-+			 * Hardware bug. It's possible in some cases to get a
-+			 * channel halt with nothing else set when the response was a NYET.
-+			 * Treat as local 3-strikes retry.
-+			 */
-+			hcint_data_t hcint_test = hcint;
-+			hcint_test.b.chhltd = 0;
-+			if (!hcint_test.d32) {
-+				st->nr_errors++;
-+				if (st->nr_errors >= 3) {
-+					st->fsm = FIQ_NP_SPLIT_HS_ABORTED;
-+				} else {
-+					handled = 1;
-+				}
-+			} else {
-+				// Something unexpected happened. AHBerror or babble perhaps. Let the IRQ deal with it.
-+				st->fsm = FIQ_NP_SPLIT_HS_ABORTED;
-+			}
-+		}
-+		if (st->fsm != FIQ_NP_OUT_CSPLIT_RETRY) {
-+			fiq_fsm_restart_np_pending(state, num_channels, n);
-+		}
-+		break;
-+
-+	/* Periodic split states (except isoc out) */
-+	case FIQ_PER_SSPLIT_STARTED:
-+		/* Expect an ACK or failure for SSPLIT */
-+		if (hcint.b.ack) {
-+			/*
-+			 * SSPLIT transfer complete interrupt - the generation of this interrupt is fraught with bugs.
-+			 * For a packet queued in microframe n-3 to appear in n-2, if the channel is enabled near the EOF1
-+			 * point for microframe n-3, the packet will not appear on the bus until microframe n.
-+			 * Additionally, the generation of the actual interrupt is dodgy. For a packet appearing on the bus
-+			 * in microframe n, sometimes the interrupt is generated immediately. Sometimes, it appears in n+1
-+			 * coincident with SOF for n+1.
-+			 * SOF is also buggy. It can sometimes be raised AFTER the first bus transaction has taken place.
-+			 * These appear to be caused by timing/clock crossing bugs within the core itself.
-+			 * State machine workaround.
-+			 */
-+			hfnum.d32 = FIQ_READ(state->dwc_regs_base + HFNUM);
-+			hcchar.d32 = FIQ_READ(state->dwc_regs_base + HC_START + (HC_OFFSET * n) + HCCHAR);
-+			fiq_fsm_setup_csplit(state, n);
-+			/* Poke the oddfrm bit. If we are equivalent, we received the interrupt at the correct
-+			 * time. If not, then we're in the next SOF.
-+			 */
-+			if ((hfnum.b.frnum & 0x1) == hcchar.b.oddfrm) {
-+				fiq_print(FIQDBG_INT, state, "CSWAIT %01d", n);
-+				st->expected_uframe = hfnum.b.frnum;
-+				st->fsm = FIQ_PER_CSPLIT_WAIT;
-+			} else {
-+				fiq_print(FIQDBG_INT, state, "CSPOL  %01d", n);
-+				/* For isochronous IN endpoints,
-+				 * we need to hold off if we are expecting a lot of data */
-+				if (st->hcchar_copy.b.mps < DATA0_PID_HEURISTIC) {
-+					start_next_periodic = 1;
-+				}
-+				/* Danger will robinson: we are in a broken state. If our first interrupt after
-+				 * this is a NYET, it will be delayed by 1 uframe and result in an unrecoverable
-+				 * lag. Unmask the NYET interrupt.
-+				 */
-+				st->expected_uframe = (hfnum.b.frnum + 1) & 0x3FFF;
-+				st->fsm = FIQ_PER_CSPLIT_BROKEN_NYET1;
-+				restart = 1;
-+			}
-+			handled = 1;
-+		} else if (hcint.b.xacterr) {
-+			/* 3-strikes retry is enabled, we have hit our max nr_errors */
-+			st->fsm = FIQ_PER_SPLIT_HS_ABORTED;
-+			start_next_periodic = 1;
-+		} else {
-+			st->fsm = FIQ_PER_SPLIT_HS_ABORTED;
-+			start_next_periodic = 1;
-+		}
-+		/* We can now queue the next isochronous OUT transaction, if one is pending. */
-+		if(fiq_fsm_tt_next_isoc(state, num_channels, n)) {
-+			fiq_print(FIQDBG_INT, state, "NEXTISO ");
-+		}
-+		break;
-+
-+	case FIQ_PER_CSPLIT_NYET1:
-+		/* First CSPLIT attempt was a NYET. If we get a subsequent NYET,
-+		 * we are too late and the TT has dropped its CSPLIT fifo.
-+		 */
-+		hfnum.d32 = FIQ_READ(state->dwc_regs_base + HFNUM);
-+		hcchar.d32 = FIQ_READ(state->dwc_regs_base + HC_START + (HC_OFFSET * n) + HCCHAR);
-+		start_next_periodic = 1;
-+		if (hcint.b.nak) {
-+			st->fsm = FIQ_PER_SPLIT_DONE;
-+		} else if (hcint.b.xfercomp) {
-+			fiq_increment_dma_buf(state, num_channels, n);
-+			st->fsm = FIQ_PER_CSPLIT_POLL;
-+			st->nr_errors = 0;
-+			if (fiq_fsm_more_csplits(state, n, &last_csplit)) {
-+				handled = 1;
-+				restart = 1;
-+				if (!last_csplit)
-+					start_next_periodic = 0;
-+			} else {
-+				st->fsm = FIQ_PER_SPLIT_DONE;
-+			}
-+		} else if (hcint.b.nyet) {
-+			/* Doh. Data lost. */
-+			st->fsm = FIQ_PER_SPLIT_NYET_ABORTED;
-+		} else if (hcint.b.xacterr || hcint.b.stall || hcint.b.bblerr) {
-+			st->fsm = FIQ_PER_SPLIT_LS_ABORTED;
-+		} else {
-+			st->fsm = FIQ_PER_SPLIT_HS_ABORTED;
-+		}
-+		break;
-+
-+	case FIQ_PER_CSPLIT_BROKEN_NYET1:
-+		/*
-+		 * we got here because our host channel is in the delayed-interrupt
-+		 * state and we cannot take a NYET interrupt any later than when it
-+		 * occurred. Disable then re-enable the channel if this happens to force
-+		 * CSPLITs to occur at the right time.
-+		 */
-+		hfnum.d32 = FIQ_READ(state->dwc_regs_base + HFNUM);
-+		hcchar.d32 = FIQ_READ(state->dwc_regs_base + HC_START + (HC_OFFSET * n) + HCCHAR);
-+		fiq_print(FIQDBG_INT, state, "BROK: %01d ", n);
-+		if (hcint.b.nak) {
-+			st->fsm = FIQ_PER_SPLIT_DONE;
-+			start_next_periodic = 1;
-+		} else if (hcint.b.xfercomp) {
-+			fiq_increment_dma_buf(state, num_channels, n);
-+			if (fiq_fsm_more_csplits(state, n, &last_csplit)) {
-+				st->fsm = FIQ_PER_CSPLIT_POLL;
-+				handled = 1;
-+				restart = 1;
-+				start_next_periodic = 1;
-+				/* Reload HCTSIZ for the next transfer */
-+				fiq_fsm_reload_hctsiz(state, n);
-+				if (!last_csplit)
-+					start_next_periodic = 0;
-+			} else {
-+				st->fsm = FIQ_PER_SPLIT_DONE;
-+			}
-+		} else if (hcint.b.nyet) {
-+			st->fsm = FIQ_PER_SPLIT_NYET_ABORTED;
-+			start_next_periodic = 1;
-+		} else if (hcint.b.xacterr || hcint.b.stall || hcint.b.bblerr) {
-+			/* Local 3-strikes retry is handled by the core. This is a ERR response.*/
-+			st->fsm = FIQ_PER_SPLIT_LS_ABORTED;
-+		} else {
-+			st->fsm = FIQ_PER_SPLIT_HS_ABORTED;
-+		}
-+		break;
-+
-+	case FIQ_PER_CSPLIT_POLL:
-+		hfnum.d32 = FIQ_READ(state->dwc_regs_base + HFNUM);
-+		hcchar.d32 = FIQ_READ(state->dwc_regs_base + HC_START + (HC_OFFSET * n) + HCCHAR);
-+		start_next_periodic = 1;
-+		if (hcint.b.nak) {
-+			st->fsm = FIQ_PER_SPLIT_DONE;
-+		} else if (hcint.b.xfercomp) {
-+			fiq_increment_dma_buf(state, num_channels, n);
-+			if (fiq_fsm_more_csplits(state, n, &last_csplit)) {
-+				handled = 1;
-+				restart = 1;
-+				/* Reload HCTSIZ for the next transfer */
-+				fiq_fsm_reload_hctsiz(state, n);
-+				if (!last_csplit)
-+					start_next_periodic = 0;
-+			} else {
-+				st->fsm = FIQ_PER_SPLIT_DONE;
-+			}
-+		} else if (hcint.b.nyet) {
-+			/* Are we a NYET after the first data packet? */
-+			if (st->nrpackets == 0) {
-+				st->fsm = FIQ_PER_CSPLIT_NYET1;
-+				handled = 1;
-+				restart = 1;
-+			} else {
-+				/* We got a NYET when polling CSPLITs. Can happen
-+				 * if our heuristic fails, or if someone disables us
-+				 * for any significant length of time.
-+				 */
-+				if (st->nr_errors >= 3) {
-+					st->fsm = FIQ_PER_SPLIT_NYET_ABORTED;
-+				} else {
-+					st->fsm = FIQ_PER_SPLIT_DONE;
-+				}
-+			}
-+		} else if (hcint.b.xacterr || hcint.b.stall || hcint.b.bblerr) {
-+			/* For xacterr, Local 3-strikes retry is handled by the core. This is a ERR response.*/
-+			st->fsm = FIQ_PER_SPLIT_LS_ABORTED;
-+		} else {
-+			st->fsm = FIQ_PER_SPLIT_HS_ABORTED;
-+		}
-+		break;
-+
-+	case FIQ_HS_ISOC_TURBO:
-+		if (fiq_fsm_update_hs_isoc(state, n, hcint)) {
-+			/* more transactions to come */
-+			handled = 1;
-+			fiq_print(FIQDBG_INT, state, "HSISO M ");
-+			/* For strided transfers, put ourselves to sleep */
-+			if (st->hs_isoc_info.stride > 1) {
-+				st->uframe_sleeps = st->hs_isoc_info.stride - 1;
-+				st->fsm = FIQ_HS_ISOC_SLEEPING;
-+			} else {
-+				restart = 1;
-+			}
-+		} else {
-+			st->fsm = FIQ_HS_ISOC_DONE;
-+			fiq_print(FIQDBG_INT, state, "HSISO F ");
-+		}
-+		break;
-+
-+	case FIQ_HS_ISOC_ABORTED:
-+		/* This abort is called by the driver rewriting the state mid-transaction
-+		 * which allows the dequeue mechanism to work more effectively.
-+		 */
-+		break;
-+
-+	case FIQ_PER_ISO_OUT_ACTIVE:
-+		if (hcint.b.ack) {
-+			if(fiq_iso_out_advance(state, num_channels, n)) {
-+				/* last OUT transfer */
-+				st->fsm = FIQ_PER_ISO_OUT_LAST;
-+				/*
-+				 * Assuming the periodic FIFO in the dwc core
-+				 * actually does its job properly, we can queue
-+				 * the next ssplit now and in theory, the wire
-+				 * transactions will be in-order.
-+				 */
-+				// No it doesn't. It appears to process requests in host channel order.
-+				//start_next_periodic = 1;
-+			}
-+			handled = 1;
-+			restart = 1;
-+		} else {
-+			/*
-+			 * Isochronous transactions carry on regardless. Log the error
-+			 * and continue.
-+			 */
-+			//explode += 1;
-+			st->nr_errors++;
-+			if(fiq_iso_out_advance(state, num_channels, n)) {
-+				st->fsm = FIQ_PER_ISO_OUT_LAST;
-+				//start_next_periodic = 1;
-+			}
-+			handled = 1;
-+			restart = 1;
-+		}
-+		break;
-+
-+	case FIQ_PER_ISO_OUT_LAST:
-+		if (hcint.b.ack) {
-+			/* All done here */
-+			st->fsm = FIQ_PER_ISO_OUT_DONE;
-+		} else {
-+			st->fsm = FIQ_PER_ISO_OUT_DONE;
-+			st->nr_errors++;
-+		}
-+		start_next_periodic = 1;
-+		break;
-+
-+	case FIQ_PER_SPLIT_TIMEOUT:
-+		/* SOF kicked us because we overran. */
-+		start_next_periodic = 1;
-+		break;
-+
-+	default:
-+		break;
-+	}
-+
-+	if (handled) {
-+		FIQ_WRITE(state->dwc_regs_base + HC_START + (HC_OFFSET * n) + HCINT, hcint.d32);
-+	} else {
-+		/* Copy the regs into the state so the IRQ knows what to do */
-+		st->hcint_copy.d32 = hcint.d32;
-+	}
-+
-+	if (restart) {
-+		/* Restart always implies handled. */
-+		if (restart == 2) {
-+			/* For complete-split INs, the show must go on.
-+			 * Force a channel restart */
-+			fiq_fsm_restart_channel(state, n, 1);
-+		} else {
-+			fiq_fsm_restart_channel(state, n, 0);
-+		}
-+	}
-+	if (start_next_periodic) {
-+		fiq_fsm_start_next_periodic(state, num_channels);
-+	}
-+	if (st->fsm != FIQ_PASSTHROUGH)
-+		fiq_print(FIQDBG_INT, state, "FSMOUT%02d", st->fsm);
-+
-+	return handled;
-+}
-+
-+
-+/**
-+ * dwc_otg_fiq_fsm() - Flying State Machine (monster) FIQ
-+ * @state:		pointer to state struct passed from the banked FIQ mode registers.
-+ * @num_channels:	set according to the DWC hardware configuration
-+ * @dma:		pointer to DMA bounce buffers for split transaction slots
-+ *
-+ * The FSM FIQ performs the low-level tasks that normally would be performed by the microcode
-+ * inside an EHCI or similar host controller regarding split transactions. The DWC core
-+ * interrupts each and every time a split transaction packet is received or sent successfully.
-+ * This results in either an interrupt storm when everything is working "properly", or
-+ * the interrupt latency of the system in general breaks time-sensitive periodic split
-+ * transactions. Pushing the low-level, but relatively easy state machine work into the FIQ
-+ * solves these problems.
-+ *
-+ * Return: void
-+ */
-+void notrace dwc_otg_fiq_fsm(struct fiq_state *state, int num_channels)
-+{
-+	gintsts_data_t gintsts, gintsts_handled;
-+	gintmsk_data_t gintmsk;
-+	//hfnum_data_t hfnum;
-+	haint_data_t haint, haint_handled;
-+	haintmsk_data_t haintmsk;
-+	int kick_irq = 0;
-+
-+	/* Ensure peripheral reads issued prior to FIQ entry are complete */
-+	dsb(sy);
-+
-+	gintsts_handled.d32 = 0;
-+	haint_handled.d32 = 0;
-+
-+	fiq_fsm_spin_lock(&state->lock);
-+	gintsts.d32 = FIQ_READ(state->dwc_regs_base + GINTSTS);
-+	gintmsk.d32 = FIQ_READ(state->dwc_regs_base + GINTMSK);
-+	gintsts.d32 &= gintmsk.d32;
-+
-+	if (gintsts.b.sofintr) {
-+		/* For FSM mode, SOF is required to keep the state machine advance for
-+		 * certain stages of the periodic pipeline. It's death to mask this
-+		 * interrupt in that case.
-+		 */
-+
-+		if (!fiq_fsm_do_sof(state, num_channels)) {
-+			/* Kick IRQ once. Queue advancement means that all pending transactions
-+			 * will get serviced when the IRQ finally executes.
-+			 */
-+			if (state->gintmsk_saved.b.sofintr == 1)
-+				kick_irq |= 1;
-+			state->gintmsk_saved.b.sofintr = 0;
-+		}
-+		gintsts_handled.b.sofintr = 1;
-+	}
-+
-+	if (gintsts.b.hcintr) {
-+		int i;
-+		haint.d32 = FIQ_READ(state->dwc_regs_base + HAINT);
-+		haintmsk.d32 = FIQ_READ(state->dwc_regs_base + HAINTMSK);
-+		haint.d32 &= haintmsk.d32;
-+		haint_handled.d32 = 0;
-+		for (i=0; i<num_channels; i++) {
-+			if (haint.b2.chint & (1 << i)) {
-+				if(!fiq_fsm_do_hcintr(state, num_channels, i)) {
-+					/* HCINT was not handled in FIQ
-+					 * HAINT is level-sensitive, leading to level-sensitive ginststs.b.hcint bit.
-+					 * Mask HAINT(i) but keep top-level hcint unmasked.
-+					 */
-+					state->haintmsk_saved.b2.chint &= ~(1 << i);
-+				} else {
-+					/* do_hcintr cleaned up after itself, but clear haint */
-+					haint_handled.b2.chint |= (1 << i);
-+				}
-+			}
-+		}
-+
-+		if (haint_handled.b2.chint) {
-+			FIQ_WRITE(state->dwc_regs_base + HAINT, haint_handled.d32);
-+		}
-+
-+		if (haintmsk.d32 != (haintmsk.d32 & state->haintmsk_saved.d32)) {
-+			/*
-+			 * This is necessary to avoid multiple retriggers of the MPHI in the case
-+			 * where interrupts are held off and HCINTs start to pile up.
-+			 * Only wake up the IRQ if a new interrupt came in, was not handled and was
-+			 * masked.
-+			 */
-+			haintmsk.d32 &= state->haintmsk_saved.d32;
-+			FIQ_WRITE(state->dwc_regs_base + HAINTMSK, haintmsk.d32);
-+			kick_irq |= 1;
-+		}
-+		/* Top-Level interrupt - always handled because it's level-sensitive */
-+		gintsts_handled.b.hcintr = 1;
-+	}
-+
-+
-+	/* Clear the bits in the saved register that were not handled but were triggered. */
-+	state->gintmsk_saved.d32 &= ~(gintsts.d32 & ~gintsts_handled.d32);
-+
-+	/* FIQ didn't handle something - mask has changed - write new mask */
-+	if (gintmsk.d32 != (gintmsk.d32 & state->gintmsk_saved.d32)) {
-+		gintmsk.d32 &= state->gintmsk_saved.d32;
-+		gintmsk.b.sofintr = 1;
-+		FIQ_WRITE(state->dwc_regs_base + GINTMSK, gintmsk.d32);
-+//		fiq_print(FIQDBG_INT, state, "KICKGINT");
-+//		fiq_print(FIQDBG_INT, state, "%08x", gintmsk.d32);
-+//		fiq_print(FIQDBG_INT, state, "%08x", state->gintmsk_saved.d32);
-+		kick_irq |= 1;
-+	}
-+
-+	if (gintsts_handled.d32) {
-+		/* Only applies to edge-sensitive bits in GINTSTS */
-+		FIQ_WRITE(state->dwc_regs_base + GINTSTS, gintsts_handled.d32);
-+	}
-+
-+	/* We got an interrupt, didn't handle it. */
-+	if (kick_irq) {
-+		state->mphi_int_count++;
-+		if (state->mphi_regs.swirq_set) {
-+			FIQ_WRITE(state->mphi_regs.swirq_set, 1);
-+		} else {
-+			FIQ_WRITE(state->mphi_regs.outdda, state->dummy_send_dma);
-+			FIQ_WRITE(state->mphi_regs.outddb, (1<<29));
-+		}
-+
-+	}
-+	state->fiq_done++;
-+	mb();
-+	fiq_fsm_spin_unlock(&state->lock);
-+}
-+
-+
-+/**
-+ * dwc_otg_fiq_nop() - FIQ "lite"
-+ * @state:	pointer to state struct passed from the banked FIQ mode registers.
-+ *
-+ * The "nop" handler does not intervene on any interrupts other than SOF.
-+ * It is limited in scope to deciding at each SOF if the IRQ SOF handler (which deals
-+ * with non-periodic/periodic queues) needs to be kicked.
-+ *
-+ * This is done to hold off the SOF interrupt, which occurs at a rate of 8000 per second.
-+ *
-+ * Return: void
-+ */
-+void notrace dwc_otg_fiq_nop(struct fiq_state *state)
-+{
-+	gintsts_data_t gintsts, gintsts_handled;
-+	gintmsk_data_t gintmsk;
-+	hfnum_data_t hfnum;
-+
-+	/* Ensure peripheral reads issued prior to FIQ entry are complete */
-+	dsb(sy);
-+
-+	fiq_fsm_spin_lock(&state->lock);
-+	hfnum.d32 = FIQ_READ(state->dwc_regs_base + HFNUM);
-+	gintsts.d32 = FIQ_READ(state->dwc_regs_base + GINTSTS);
-+	gintmsk.d32 = FIQ_READ(state->dwc_regs_base + GINTMSK);
-+	gintsts.d32 &= gintmsk.d32;
-+	gintsts_handled.d32 = 0;
-+
-+	if (gintsts.b.sofintr) {
-+		if (!state->kick_np_queues &&
-+				dwc_frame_num_gt(state->next_sched_frame, hfnum.b.frnum)) {
-+			/* SOF handled, no work to do, just ACK interrupt */
-+			gintsts_handled.b.sofintr = 1;
-+		} else {
-+			/* Kick IRQ */
-+			state->gintmsk_saved.b.sofintr = 0;
-+		}
-+	}
-+
-+	/* Reset handled interrupts */
-+	if(gintsts_handled.d32) {
-+		FIQ_WRITE(state->dwc_regs_base + GINTSTS, gintsts_handled.d32);
-+	}
-+
-+	/* Clear the bits in the saved register that were not handled but were triggered. */
-+	state->gintmsk_saved.d32 &= ~(gintsts.d32 & ~gintsts_handled.d32);
-+
-+	/* We got an interrupt, didn't handle it and want to mask it */
-+	if (~(state->gintmsk_saved.d32)) {
-+		state->mphi_int_count++;
-+		gintmsk.d32 &= state->gintmsk_saved.d32;
-+		FIQ_WRITE(state->dwc_regs_base + GINTMSK, gintmsk.d32);
-+		if (state->mphi_regs.swirq_set) {
-+			FIQ_WRITE(state->mphi_regs.swirq_set, 1);
-+		} else {
-+			/* Force a clear before another dummy send */
-+			FIQ_WRITE(state->mphi_regs.intstat, (1<<29));
-+			FIQ_WRITE(state->mphi_regs.outdda, state->dummy_send_dma);
-+			FIQ_WRITE(state->mphi_regs.outddb, (1<<29));
-+		}
-+	}
-+	state->fiq_done++;
-+	mb();
-+	fiq_fsm_spin_unlock(&state->lock);
-+}
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h
-@@ -0,0 +1,399 @@
-+/*
-+ * dwc_otg_fiq_fsm.h - Finite state machine FIQ header definitions
-+ *
-+ * Copyright (c) 2013 Raspberry Pi Foundation
-+ *
-+ * Author: Jonathan Bell <jonathan@raspberrypi.org>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ *	* Redistributions of source code must retain the above copyright
-+ *	  notice, this list of conditions and the following disclaimer.
-+ *	* Redistributions in binary form must reproduce the above copyright
-+ *	  notice, this list of conditions and the following disclaimer in the
-+ *	  documentation and/or other materials provided with the distribution.
-+ *	* Neither the name of Raspberry Pi nor the
-+ *	  names of its contributors may be used to endorse or promote products
-+ *	  derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ * This FIQ implements functionality that performs split transactions on
-+ * the dwc_otg hardware without any outside intervention. A split transaction
-+ * is "queued" by nominating a specific host channel to perform the entirety
-+ * of a split transaction. This FIQ will then perform the microframe-precise
-+ * scheduling required in each phase of the transaction until completion.
-+ *
-+ * The FIQ functionality has been surgically implanted into the Synopsys
-+ * vendor-provided driver.
-+ *
-+ */
-+
-+#ifndef DWC_OTG_FIQ_FSM_H_
-+#define DWC_OTG_FIQ_FSM_H_
-+
-+#include "dwc_otg_regs.h"
-+#include "dwc_otg_cil.h"
-+#include "dwc_otg_hcd.h"
-+#include <linux/kernel.h>
-+#include <linux/irqflags.h>
-+#include <linux/string.h>
-+#include <asm/barrier.h>
-+
-+#if 0
-+#define FLAME_ON(x)					\
-+do {							\
-+	int gpioreg;                                    \
-+							\
-+	gpioreg = readl(__io_address(0x20200000+0x8));	\
-+	gpioreg &= ~(7 << (x-20)*3);			\
-+	gpioreg |= 0x1 << (x-20)*3;			\
-+	writel(gpioreg, __io_address(0x20200000+0x8));	\
-+							\
-+	writel(1<<x, __io_address(0x20200000+(0x1C)));	\
-+} while (0)
-+
-+#define FLAME_OFF(x)					\
-+do {							\
-+	writel(1<<x, __io_address(0x20200000+(0x28)));	\
-+} while (0)
-+#else
-+#define FLAME_ON(x) do { } while (0)
-+#define FLAME_OFF(X) do { } while (0)
-+#endif
-+
-+/* This is a quick-and-dirty arch-specific register read/write. We know that
-+ * writes to a peripheral on BCM2835 will always arrive in-order, also that
-+ * reads and writes are executed in-order therefore the need for memory barriers
-+ * is obviated if we're only talking to USB.
-+ */
-+#define FIQ_WRITE(_addr_,_data_) (*(volatile unsigned int *) (_addr_) = (_data_))
-+#define FIQ_READ(_addr_) (*(volatile unsigned int *) (_addr_))
-+
-+/* FIQ-ified register definitions. Offsets are from dwc_regs_base. */
-+#define GINTSTS		0x014
-+#define GINTMSK		0x018
-+/* Debug register. Poll the top of the received packets FIFO. */
-+#define GRXSTSR		0x01C
-+#define HFNUM		0x408
-+#define HAINT		0x414
-+#define HAINTMSK	0x418
-+#define HPRT0		0x440
-+
-+/* HC_regs start from an offset of 0x500 */
-+#define HC_START	0x500
-+#define HC_OFFSET	0x020
-+
-+#define HC_DMA		0x14
-+
-+#define HCCHAR		0x00
-+#define HCSPLT		0x04
-+#define HCINT		0x08
-+#define HCINTMSK	0x0C
-+#define HCTSIZ		0x10
-+
-+#define ISOC_XACTPOS_ALL 	0b11
-+#define ISOC_XACTPOS_BEGIN	0b10
-+#define ISOC_XACTPOS_MID	0b00
-+#define ISOC_XACTPOS_END	0b01
-+
-+#define DWC_PID_DATA2	0b01
-+#define DWC_PID_MDATA	0b11
-+#define DWC_PID_DATA1	0b10
-+#define DWC_PID_DATA0	0b00
-+
-+typedef struct {
-+	volatile void* base;
-+	volatile void* ctrl;
-+	volatile void* outdda;
-+	volatile void* outddb;
-+	volatile void* intstat;
-+	volatile void* swirq_set;
-+	volatile void* swirq_clr;
-+} mphi_regs_t;
-+
-+enum fiq_debug_level {
-+	FIQDBG_SCHED = (1 << 0),
-+	FIQDBG_INT   = (1 << 1),
-+	FIQDBG_ERR   = (1 << 2),
-+	FIQDBG_PORTHUB = (1 << 3),
-+};
-+
-+#ifdef CONFIG_ARM64
-+
-+typedef spinlock_t fiq_lock_t;
-+
-+#else
-+
-+typedef struct {
-+	union {
-+		uint32_t slock;
-+		struct _tickets {
-+			uint16_t owner;
-+			uint16_t next;
-+		} tickets;
-+	};
-+} fiq_lock_t;
-+
-+#endif
-+
-+struct fiq_state;
-+
-+extern void _fiq_print (enum fiq_debug_level dbg_lvl, volatile struct fiq_state *state, char *fmt, ...);
-+#if 0
-+#define fiq_print _fiq_print
-+#else
-+#define fiq_print(x, y, ...)
-+#endif
-+
-+extern bool fiq_enable, fiq_fsm_enable;
-+extern ushort nak_holdoff;
-+
-+/**
-+ * enum fiq_fsm_state - The FIQ FSM states.
-+ *
-+ * This is the "core" of the FIQ FSM. Broadly, the FSM states follow the
-+ * USB2.0 specification for host responses to various transaction states.
-+ * There are modifications to this host state machine because of a variety of
-+ * quirks and limitations in the dwc_otg hardware.
-+ *
-+ * The fsm state is also used to communicate back to the driver on completion of
-+ * a split transaction. The end states are used in conjunction with the interrupts
-+ * raised by the final transaction.
-+ */
-+enum fiq_fsm_state {
-+	/* FIQ isn't enabled for this host channel */
-+	FIQ_PASSTHROUGH = 0,
-+	/* For the first interrupt received for this channel,
-+	 * the FIQ has to ack any interrupts indicating success. */
-+	FIQ_PASSTHROUGH_ERRORSTATE = 31,
-+	/* Nonperiodic state groups */
-+	FIQ_NP_SSPLIT_STARTED = 1,
-+	FIQ_NP_SSPLIT_RETRY = 2,
-+	/* TT contention - working around hub bugs */
-+	FIQ_NP_SSPLIT_PENDING = 33,
-+	FIQ_NP_OUT_CSPLIT_RETRY = 3,
-+	FIQ_NP_IN_CSPLIT_RETRY = 4,
-+	FIQ_NP_SPLIT_DONE = 5,
-+	FIQ_NP_SPLIT_LS_ABORTED = 6,
-+	/* This differentiates a HS transaction error from a LS one
-+	 * (handling the hub state is different) */
-+	FIQ_NP_SPLIT_HS_ABORTED = 7,
-+
-+	/* Periodic state groups */
-+	/* Periodic transactions are either started directly by the IRQ handler
-+	 * or deferred if the TT is already in use.
-+	 */
-+	FIQ_PER_SSPLIT_QUEUED = 8,
-+	FIQ_PER_SSPLIT_STARTED = 9,
-+	FIQ_PER_SSPLIT_LAST = 10,
-+
-+
-+	FIQ_PER_ISO_OUT_PENDING = 11,
-+	FIQ_PER_ISO_OUT_ACTIVE = 12,
-+	FIQ_PER_ISO_OUT_LAST = 13,
-+	FIQ_PER_ISO_OUT_DONE = 27,
-+
-+	FIQ_PER_CSPLIT_WAIT = 14,
-+	FIQ_PER_CSPLIT_NYET1 = 15,
-+	FIQ_PER_CSPLIT_BROKEN_NYET1 = 28,
-+	FIQ_PER_CSPLIT_NYET_FAFF = 29,
-+	/* For multiple CSPLITs (large isoc IN, or delayed interrupt) */
-+	FIQ_PER_CSPLIT_POLL = 16,
-+	/* The last CSPLIT for a transaction has been issued, differentiates
-+	 * for the state machine to queue the next packet.
-+	 */
-+	FIQ_PER_CSPLIT_LAST = 17,
-+
-+	FIQ_PER_SPLIT_DONE = 18,
-+	FIQ_PER_SPLIT_LS_ABORTED = 19,
-+	FIQ_PER_SPLIT_HS_ABORTED = 20,
-+	FIQ_PER_SPLIT_NYET_ABORTED = 21,
-+	/* Frame rollover has occurred without the transaction finishing. */
-+	FIQ_PER_SPLIT_TIMEOUT = 22,
-+
-+	/* FIQ-accelerated HS Isochronous state groups */
-+	FIQ_HS_ISOC_TURBO = 23,
-+	/* For interval > 1, SOF wakes up the isochronous FSM */
-+	FIQ_HS_ISOC_SLEEPING = 24,
-+	FIQ_HS_ISOC_DONE = 25,
-+	FIQ_HS_ISOC_ABORTED = 26,
-+	FIQ_DEQUEUE_ISSUED = 30,
-+	FIQ_TEST = 32,
-+};
-+
-+struct fiq_stack {
-+	int magic1;
-+	uint8_t stack[2048];
-+	int magic2;
-+};
-+
-+
-+/**
-+ * struct fiq_dma_info - DMA bounce buffer utilisation information (per-channel)
-+ * @index:	Number of slots reported used for IN transactions / number of slots
-+ *			transmitted for an OUT transaction
-+ * @slot_len[6]: Number of actual transfer bytes in each slot (255 if unused)
-+ *
-+ * Split transaction transfers can have variable length depending on other bus
-+ * traffic. The OTG core DMA engine requires 4-byte aligned addresses therefore
-+ * each transaction needs a guaranteed aligned address. A maximum of 6 split transfers
-+ * can happen per-frame.
-+ */
-+struct fiq_dma_info {
-+	u8 index;
-+	u8 slot_len[6];
-+};
-+
-+struct fiq_split_dma_slot {
-+	u8 buf[188];
-+} __attribute__((packed));
-+
-+struct fiq_dma_channel {
-+	struct fiq_split_dma_slot index[6];
-+} __attribute__((packed));
-+
-+struct fiq_dma_blob {
-+	struct fiq_dma_channel channel[0];
-+} __attribute__((packed));
-+
-+/**
-+ * struct fiq_hs_isoc_info - USB2.0 isochronous data
-+ * @iso_frame:	Pointer to the array of OTG URB iso_frame_descs.
-+ * @nrframes:	Total length of iso_frame_desc array
-+ * @index:	Current index (FIQ-maintained)
-+ * @stride:	Interval in uframes between HS isoc transactions
-+ */
-+struct fiq_hs_isoc_info {
-+	struct dwc_otg_hcd_iso_packet_desc *iso_desc;
-+	unsigned int nrframes;
-+	unsigned int index;
-+	unsigned int stride;
-+};
-+
-+/**
-+ * struct fiq_channel_state - FIQ state machine storage
-+ * @fsm:	Current state of the channel as understood by the FIQ
-+ * @nr_errors:	Number of transaction errors on this split-transaction
-+ * @hub_addr:   SSPLIT/CSPLIT destination hub
-+ * @port_addr:  SSPLIT/CSPLIT destination port - always 1 if single TT hub
-+ * @nrpackets:  For isoc OUT, the number of split-OUT packets to transmit. For
-+ * 		split-IN, number of CSPLIT data packets that were received.
-+ * @hcchar_copy:
-+ * @hcsplt_copy:
-+ * @hcintmsk_copy:
-+ * @hctsiz_copy:	Copies of the host channel registers.
-+ * 			For use as scratch, or for returning state.
-+ *
-+ * The fiq_channel_state is state storage between interrupts for a host channel. The
-+ * FSM state is stored here. Members of this structure must only be set up by the
-+ * driver prior to enabling the FIQ for this host channel, and not touched until the FIQ
-+ * has updated the state to either a COMPLETE state group or ABORT state group.
-+ */
-+
-+struct fiq_channel_state {
-+	enum fiq_fsm_state fsm;
-+	unsigned int nr_errors;
-+	unsigned int hub_addr;
-+	unsigned int port_addr;
-+	/* Hardware bug workaround: sometimes channel halt interrupts are
-+	 * delayed until the next SOF. Keep track of when we expected to get interrupted. */
-+	unsigned int expected_uframe;
-+	/* number of uframes remaining (for interval > 1 HS isoc transfers) before next transfer */
-+	unsigned int uframe_sleeps;
-+	/* in/out for communicating number of dma buffers used, or number of ISOC to do */
-+	unsigned int nrpackets;
-+	struct fiq_dma_info dma_info;
-+	struct fiq_hs_isoc_info hs_isoc_info;
-+	/* Copies of HC registers - in/out communication from/to IRQ handler
-+	 * and for ease of channel setup. A bit of mungeing is performed - for
-+	 * example the hctsiz.b.maxp is _always_ the max packet size of the endpoint.
-+	 */
-+	hcchar_data_t hcchar_copy;
-+	hcsplt_data_t hcsplt_copy;
-+	hcint_data_t hcint_copy;
-+	hcintmsk_data_t hcintmsk_copy;
-+	hctsiz_data_t hctsiz_copy;
-+	hcdma_data_t hcdma_copy;
-+};
-+
-+/**
-+ * struct fiq_state - top-level FIQ state machine storage
-+ * @mphi_regs:		virtual address of the MPHI peripheral register file
-+ * @dwc_regs_base:	virtual address of the base of the DWC core register file
-+ * @dma_base:		physical address for the base of the DMA bounce buffers
-+ * @dummy_send:		Scratch area for sending a fake message to the MPHI peripheral
-+ * @gintmsk_saved:	Top-level mask of interrupts that the FIQ has not handled.
-+ * 			Used for determining which interrupts fired to set off the IRQ handler.
-+ * @haintmsk_saved:	Mask of interrupts from host channels that the FIQ did not handle internally.
-+ * @np_count:		Non-periodic transactions in the active queue
-+ * @np_sent:		Count of non-periodic transactions that have completed
-+ * @next_sched_frame:	For periodic transactions handled by the driver's SOF-driven queuing mechanism,
-+ * 			this is the next frame on which a SOF interrupt is required. Used to hold off
-+ * 			passing SOF through to the driver until necessary.
-+ * @channel[n]:		Per-channel FIQ state. Allocated during init depending on the number of host
-+ * 			channels configured into the core logic.
-+ *
-+ * This is passed as the first argument to the dwc_otg_fiq_fsm top-level FIQ handler from the asm stub.
-+ * It contains top-level state information.
-+ */
-+struct fiq_state {
-+	fiq_lock_t lock;
-+	mphi_regs_t mphi_regs;
-+	void *dwc_regs_base;
-+	dma_addr_t dma_base;
-+	struct fiq_dma_blob *fiq_dmab;
-+	void *dummy_send;
-+	dma_addr_t dummy_send_dma;
-+	gintmsk_data_t gintmsk_saved;
-+	haintmsk_data_t haintmsk_saved;
-+	int mphi_int_count;
-+	unsigned int fiq_done;
-+	unsigned int kick_np_queues;
-+	unsigned int next_sched_frame;
-+#ifdef FIQ_DEBUG
-+	char * buffer;
-+	unsigned int bufsiz;
-+#endif
-+	struct fiq_channel_state channel[0];
-+};
-+
-+#ifdef CONFIG_ARM64
-+
-+#ifdef local_fiq_enable
-+#undef local_fiq_enable
-+#endif
-+
-+#ifdef local_fiq_disable
-+#undef local_fiq_disable
-+#endif
-+
-+extern void local_fiq_enable(void);
-+
-+extern void local_fiq_disable(void);
-+
-+#endif
-+
-+extern void fiq_fsm_spin_lock(fiq_lock_t *lock);
-+
-+extern void fiq_fsm_spin_unlock(fiq_lock_t *lock);
-+
-+extern int fiq_fsm_too_late(struct fiq_state *st, int n);
-+
-+extern int fiq_fsm_tt_in_use(struct fiq_state *st, int num_channels, int n);
-+
-+extern void dwc_otg_fiq_fsm(struct fiq_state *state, int num_channels);
-+
-+extern void dwc_otg_fiq_nop(struct fiq_state *state);
-+
-+#endif /* DWC_OTG_FIQ_FSM_H_ */
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S
-@@ -0,0 +1,80 @@
-+/*
-+ * dwc_otg_fiq_fsm.S - assembly stub for the FSM FIQ
-+ *
-+ * Copyright (c) 2013 Raspberry Pi Foundation
-+ *
-+ * Author: Jonathan Bell <jonathan@raspberrypi.org>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ *	* Redistributions of source code must retain the above copyright
-+ *	  notice, this list of conditions and the following disclaimer.
-+ *	* Redistributions in binary form must reproduce the above copyright
-+ *	  notice, this list of conditions and the following disclaimer in the
-+ *	  documentation and/or other materials provided with the distribution.
-+ *	* Neither the name of Raspberry Pi nor the
-+ *	  names of its contributors may be used to endorse or promote products
-+ *	  derived from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+
-+#include <asm/assembler.h>
-+#include <linux/linkage.h>
-+
-+
-+.text
-+
-+.global _dwc_otg_fiq_stub_end;
-+
-+/**
-+  * _dwc_otg_fiq_stub() - entry copied to the FIQ vector page to allow
-+  * a C-style function call with arguments from the FIQ banked registers.
-+  * r0 = &hcd->fiq_state
-+  * r1 = &hcd->num_channels
-+  * r2 = &hcd->dma_buffers
-+  * Tramples: r0, r1, r2, r4, fp, ip
-+  */
-+
-+ENTRY(_dwc_otg_fiq_stub)
-+	/* Stash unbanked regs - SP will have been set up for us */
-+	mov ip, sp;
-+	stmdb sp!, {r0-r12, lr};
-+#ifdef FIQ_DEBUG
-+	// Cycle profiling - read cycle counter at start
-+	mrc p15, 0, r5, c15, c12, 1;
-+#endif
-+	/* r11 = fp, don't trample it */
-+	mov r4, fp;
-+	/* set EABI frame size */
-+	sub fp, ip, #512;
-+
-+	/* for fiq NOP mode - just need state */
-+	mov r0, r8;
-+	/* r9 = num_channels */
-+	mov r1, r9;
-+	/* r10 = struct *dma_bufs */
-+//	mov r2, r10;
-+
-+	/* r4 = &fiq_c_function */
-+	blx r4;
-+#ifdef FIQ_DEBUG
-+	mrc p15, 0, r4, c15, c12, 1;
-+	subs r5, r5, r4;
-+	// r5 is now the cycle count time for executing the FIQ. Store it somewhere?
-+#endif
-+	ldmia sp!, {r0-r12, lr};
-+	subs pc, lr, #4;
-+_dwc_otg_fiq_stub_end:
-+END(_dwc_otg_fiq_stub)
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
-@@ -0,0 +1,4363 @@
-+
-+/* ==========================================================================
-+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd.c $
-+ * $Revision: #104 $
-+ * $Date: 2011/10/24 $
-+ * $Change: 1871159 $
-+ *
-+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
-+ * "Software") is an Unsupported proprietary work of Synopsys, Inc. unless
-+ * otherwise expressly agreed to in writing between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product under
-+ * any End User Software License Agreement or Agreement for Licensed Product
-+ * with Synopsys or any supplement thereto. You are permitted to use and
-+ * redistribute this Software in source and binary forms, with or without
-+ * modification, provided that redistributions of source code must retain this
-+ * notice. You may not view, use, disclose, copy or distribute this file or
-+ * any information contained herein except pursuant to this license grant from
-+ * Synopsys. If you do not agree with this notice, including the disclaimer
-+ * below, then you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" BASIS
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS BE LIABLE FOR ANY DIRECT,
-+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================== */
-+#ifndef DWC_DEVICE_ONLY
-+
-+/** @file
-+ * This file implements HCD Core. All code in this file is portable and doesn't
-+ * use any OS specific functions.
-+ * Interface provided by HCD Core is defined in <code><hcd_if.h></code>
-+ * header file.
-+ */
-+
-+#include <linux/usb.h>
-+#include <linux/usb/hcd.h>
-+
-+#include "dwc_otg_hcd.h"
-+#include "dwc_otg_regs.h"
-+#include "dwc_otg_fiq_fsm.h"
-+
-+extern bool microframe_schedule;
-+extern uint16_t fiq_fsm_mask, nak_holdoff;
-+
-+//#define DEBUG_HOST_CHANNELS
-+#ifdef DEBUG_HOST_CHANNELS
-+static int last_sel_trans_num_per_scheduled = 0;
-+static int last_sel_trans_num_nonper_scheduled = 0;
-+static int last_sel_trans_num_avail_hc_at_start = 0;
-+static int last_sel_trans_num_avail_hc_at_end = 0;
-+#endif /* DEBUG_HOST_CHANNELS */
-+
-+
-+dwc_otg_hcd_t *dwc_otg_hcd_alloc_hcd(void)
-+{
-+	return DWC_ALLOC(sizeof(dwc_otg_hcd_t));
-+}
-+
-+/**
-+ * Connection timeout function.  An OTG host is required to display a
-+ * message if the device does not connect within 10 seconds.
-+ */
-+void dwc_otg_hcd_connect_timeout(void *ptr)
-+{
-+	DWC_DEBUGPL(DBG_HCDV, "%s(%p)\n", __func__, ptr);
-+	DWC_PRINTF("Connect Timeout\n");
-+	__DWC_ERROR("Device Not Connected/Responding\n");
-+}
-+
-+#if defined(DEBUG)
-+static void dump_channel_info(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh)
-+{
-+	if (qh->channel != NULL) {
-+		dwc_hc_t *hc = qh->channel;
-+		dwc_list_link_t *item;
-+		dwc_otg_qh_t *qh_item;
-+		int num_channels = hcd->core_if->core_params->host_channels;
-+		int i;
-+
-+		dwc_otg_hc_regs_t *hc_regs;
-+		hcchar_data_t hcchar;
-+		hcsplt_data_t hcsplt;
-+		hctsiz_data_t hctsiz;
-+		uint32_t hcdma;
-+
-+		hc_regs = hcd->core_if->host_if->hc_regs[hc->hc_num];
-+		hcchar.d32 = DWC_READ_REG32(&hc_regs->hcchar);
-+		hcsplt.d32 = DWC_READ_REG32(&hc_regs->hcsplt);
-+		hctsiz.d32 = DWC_READ_REG32(&hc_regs->hctsiz);
-+		hcdma = DWC_READ_REG32(&hc_regs->hcdma);
-+
-+		DWC_PRINTF("  Assigned to channel %p:\n", hc);
-+		DWC_PRINTF("    hcchar 0x%08x, hcsplt 0x%08x\n", hcchar.d32,
-+			   hcsplt.d32);
-+		DWC_PRINTF("    hctsiz 0x%08x, hcdma 0x%08x\n", hctsiz.d32,
-+			   hcdma);
-+		DWC_PRINTF("    dev_addr: %d, ep_num: %d, ep_is_in: %d\n",
-+			   hc->dev_addr, hc->ep_num, hc->ep_is_in);
-+		DWC_PRINTF("    ep_type: %d\n", hc->ep_type);
-+		DWC_PRINTF("    max_packet: %d\n", hc->max_packet);
-+		DWC_PRINTF("    data_pid_start: %d\n", hc->data_pid_start);
-+		DWC_PRINTF("    xfer_started: %d\n", hc->xfer_started);
-+		DWC_PRINTF("    halt_status: %d\n", hc->halt_status);
-+		DWC_PRINTF("    xfer_buff: %p\n", hc->xfer_buff);
-+		DWC_PRINTF("    xfer_len: %d\n", hc->xfer_len);
-+		DWC_PRINTF("    qh: %p\n", hc->qh);
-+		DWC_PRINTF("  NP inactive sched:\n");
-+		DWC_LIST_FOREACH(item, &hcd->non_periodic_sched_inactive) {
-+			qh_item =
-+			    DWC_LIST_ENTRY(item, dwc_otg_qh_t, qh_list_entry);
-+			DWC_PRINTF("    %p\n", qh_item);
-+		}
-+		DWC_PRINTF("  NP active sched:\n");
-+		DWC_LIST_FOREACH(item, &hcd->non_periodic_sched_active) {
-+			qh_item =
-+			    DWC_LIST_ENTRY(item, dwc_otg_qh_t, qh_list_entry);
-+			DWC_PRINTF("    %p\n", qh_item);
-+		}
-+		DWC_PRINTF("  Channels: \n");
-+		for (i = 0; i < num_channels; i++) {
-+			dwc_hc_t *hc = hcd->hc_ptr_array[i];
-+			DWC_PRINTF("    %2d: %p\n", i, hc);
-+		}
-+	}
-+}
-+#else
-+#define dump_channel_info(hcd, qh)
-+#endif /* DEBUG */
-+
-+/**
-+ * Work queue function for starting the HCD when A-Cable is connected.
-+ * The hcd_start() must be called in a process context.
-+ */
-+static void hcd_start_func(void *_vp)
-+{
-+	dwc_otg_hcd_t *hcd = (dwc_otg_hcd_t *) _vp;
-+
-+	DWC_DEBUGPL(DBG_HCDV, "%s() %p\n", __func__, hcd);
-+	if (hcd) {
-+		hcd->fops->start(hcd);
-+	}
-+}
-+
-+static void del_xfer_timers(dwc_otg_hcd_t * hcd)
-+{
-+#ifdef DEBUG
-+	int i;
-+	int num_channels = hcd->core_if->core_params->host_channels;
-+	for (i = 0; i < num_channels; i++) {
-+		DWC_TIMER_CANCEL(hcd->core_if->hc_xfer_timer[i]);
-+	}
-+#endif
-+}
-+
-+static void del_timers(dwc_otg_hcd_t * hcd)
-+{
-+	del_xfer_timers(hcd);
-+	DWC_TIMER_CANCEL(hcd->conn_timer);
-+}
-+
-+/**
-+ * Processes all the URBs in a single list of QHs. Completes them with
-+ * -ESHUTDOWN and frees the QTD.
-+ */
-+static void kill_urbs_in_qh_list(dwc_otg_hcd_t * hcd, dwc_list_link_t * qh_list)
-+{
-+	dwc_list_link_t *qh_item, *qh_tmp;
-+	dwc_otg_qh_t *qh;
-+	dwc_otg_qtd_t *qtd, *qtd_tmp;
-+	int quiesced = 0;
-+
-+	DWC_LIST_FOREACH_SAFE(qh_item, qh_tmp, qh_list) {
-+		qh = DWC_LIST_ENTRY(qh_item, dwc_otg_qh_t, qh_list_entry);
-+		DWC_CIRCLEQ_FOREACH_SAFE(qtd, qtd_tmp,
-+					 &qh->qtd_list, qtd_list_entry) {
-+			qtd = DWC_CIRCLEQ_FIRST(&qh->qtd_list);
-+			if (qtd->urb != NULL) {
-+				hcd->fops->complete(hcd, qtd->urb->priv,
-+						    qtd->urb, -DWC_E_SHUTDOWN);
-+				dwc_otg_hcd_qtd_remove_and_free(hcd, qtd, qh);
-+			}
-+
-+		}
-+		if(qh->channel) {
-+			int n = qh->channel->hc_num;
-+			/* Using hcchar.chen == 1 is not a reliable test.
-+			 * It is possible that the channel has already halted
-+			 * but not yet been through the IRQ handler.
-+			 */
-+			if (fiq_fsm_enable && (hcd->fiq_state->channel[qh->channel->hc_num].fsm != FIQ_PASSTHROUGH)) {
-+				qh->channel->halt_status = DWC_OTG_HC_XFER_URB_DEQUEUE;
-+				qh->channel->halt_pending = 1;
-+				if (hcd->fiq_state->channel[n].fsm == FIQ_HS_ISOC_TURBO ||
-+				    hcd->fiq_state->channel[n].fsm == FIQ_HS_ISOC_SLEEPING)
-+					hcd->fiq_state->channel[n].fsm = FIQ_HS_ISOC_ABORTED;
-+				/* We're called from disconnect callback or in the middle of freeing the HCD here,
-+				 * so FIQ is disabled, top-level interrupts masked and we're holding the spinlock.
-+				 * No further URBs will be submitted, but wait 1 microframe for any previously
-+				 * submitted periodic DMA to finish.
-+				 */
-+				if (!quiesced) {
-+					udelay(125);
-+					quiesced = 1;
-+				}
-+			} else {
-+				dwc_otg_hc_halt(hcd->core_if, qh->channel,
-+						DWC_OTG_HC_XFER_URB_DEQUEUE);
-+			}
-+			qh->channel = NULL;
-+		}
-+		dwc_otg_hcd_qh_remove(hcd, qh);
-+	}
-+}
-+
-+/**
-+ * Responds with an error status of ESHUTDOWN to all URBs in the non-periodic
-+ * and periodic schedules. The QTD associated with each URB is removed from
-+ * the schedule and freed. This function may be called when a disconnect is
-+ * detected or when the HCD is being stopped.
-+ */
-+static void kill_all_urbs(dwc_otg_hcd_t * hcd)
-+{
-+	kill_urbs_in_qh_list(hcd, &hcd->non_periodic_sched_inactive);
-+	kill_urbs_in_qh_list(hcd, &hcd->non_periodic_sched_active);
-+	kill_urbs_in_qh_list(hcd, &hcd->periodic_sched_inactive);
-+	kill_urbs_in_qh_list(hcd, &hcd->periodic_sched_ready);
-+	kill_urbs_in_qh_list(hcd, &hcd->periodic_sched_assigned);
-+	kill_urbs_in_qh_list(hcd, &hcd->periodic_sched_queued);
-+}
-+
-+/**
-+ * Start the connection timer.  An OTG host is required to display a
-+ * message if the device does not connect within 10 seconds.  The
-+ * timer is deleted if a port connect interrupt occurs before the
-+ * timer expires.
-+ */
-+static void dwc_otg_hcd_start_connect_timer(dwc_otg_hcd_t * hcd)
-+{
-+	DWC_TIMER_SCHEDULE(hcd->conn_timer, 10000 /* 10 secs */ );
-+}
-+
-+/**
-+ * HCD Callback function for disconnect of the HCD.
-+ *
-+ * @param p void pointer to the <code>struct usb_hcd</code>
-+ */
-+static int32_t dwc_otg_hcd_session_start_cb(void *p)
-+{
-+	dwc_otg_hcd_t *dwc_otg_hcd;
-+	DWC_DEBUGPL(DBG_HCDV, "%s(%p)\n", __func__, p);
-+	dwc_otg_hcd = p;
-+	dwc_otg_hcd_start_connect_timer(dwc_otg_hcd);
-+	return 1;
-+}
-+
-+/**
-+ * HCD Callback function for starting the HCD when A-Cable is
-+ * connected.
-+ *
-+ * @param p void pointer to the <code>struct usb_hcd</code>
-+ */
-+static int32_t dwc_otg_hcd_start_cb(void *p)
-+{
-+	dwc_otg_hcd_t *dwc_otg_hcd = p;
-+	dwc_otg_core_if_t *core_if;
-+	hprt0_data_t hprt0;
-+
-+	core_if = dwc_otg_hcd->core_if;
-+
-+	if (core_if->op_state == B_HOST) {
-+		/*
-+		 * Reset the port.  During a HNP mode switch the reset
-+		 * needs to occur within 1ms and have a duration of at
-+		 * least 50ms.
-+		 */
-+		hprt0.d32 = dwc_otg_read_hprt0(core_if);
-+		hprt0.b.prtrst = 1;
-+		DWC_WRITE_REG32(core_if->host_if->hprt0, hprt0.d32);
-+	}
-+	DWC_WORKQ_SCHEDULE_DELAYED(core_if->wq_otg,
-+				   hcd_start_func, dwc_otg_hcd, 50,
-+				   "start hcd");
-+
-+	return 1;
-+}
-+
-+/**
-+ * HCD Callback function for disconnect of the HCD.
-+ *
-+ * @param p void pointer to the <code>struct usb_hcd</code>
-+ */
-+static int32_t dwc_otg_hcd_disconnect_cb(void *p)
-+{
-+	gintsts_data_t intr;
-+	dwc_otg_hcd_t *dwc_otg_hcd = p;
-+
-+	DWC_SPINLOCK(dwc_otg_hcd->lock);
-+	/*
-+	 * Set status flags for the hub driver.
-+	 */
-+	dwc_otg_hcd->flags.b.port_connect_status_change = 1;
-+	dwc_otg_hcd->flags.b.port_connect_status = 0;
-+	if(fiq_enable) {
-+		local_fiq_disable();
-+		fiq_fsm_spin_lock(&dwc_otg_hcd->fiq_state->lock);
-+	}
-+	/*
-+	 * Shutdown any transfers in process by clearing the Tx FIFO Empty
-+	 * interrupt mask and status bits and disabling subsequent host
-+	 * channel interrupts.
-+	 */
-+	intr.d32 = 0;
-+	intr.b.nptxfempty = 1;
-+	intr.b.ptxfempty = 1;
-+	intr.b.hcintr = 1;
-+	DWC_MODIFY_REG32(&dwc_otg_hcd->core_if->core_global_regs->gintmsk,
-+			 intr.d32, 0);
-+	DWC_MODIFY_REG32(&dwc_otg_hcd->core_if->core_global_regs->gintsts,
-+			 intr.d32, 0);
-+
-+	del_timers(dwc_otg_hcd);
-+
-+	/*
-+	 * Turn off the vbus power only if the core has transitioned to device
-+	 * mode. If still in host mode, need to keep power on to detect a
-+	 * reconnection.
-+	 */
-+	if (dwc_otg_is_device_mode(dwc_otg_hcd->core_if)) {
-+		if (dwc_otg_hcd->core_if->op_state != A_SUSPEND) {
-+			hprt0_data_t hprt0 = {.d32 = 0 };
-+			DWC_PRINTF("Disconnect: PortPower off\n");
-+			hprt0.b.prtpwr = 0;
-+			DWC_WRITE_REG32(dwc_otg_hcd->core_if->host_if->hprt0,
-+					hprt0.d32);
-+		}
-+
-+		dwc_otg_disable_host_interrupts(dwc_otg_hcd->core_if);
-+	}
-+
-+	/* Respond with an error status to all URBs in the schedule. */
-+	kill_all_urbs(dwc_otg_hcd);
-+
-+	if (dwc_otg_is_host_mode(dwc_otg_hcd->core_if)) {
-+		/* Clean up any host channels that were in use. */
-+		int num_channels;
-+		int i;
-+		dwc_hc_t *channel;
-+		dwc_otg_hc_regs_t *hc_regs;
-+		hcchar_data_t hcchar;
-+
-+		num_channels = dwc_otg_hcd->core_if->core_params->host_channels;
-+
-+		if (!dwc_otg_hcd->core_if->dma_enable) {
-+			/* Flush out any channel requests in slave mode. */
-+			for (i = 0; i < num_channels; i++) {
-+				channel = dwc_otg_hcd->hc_ptr_array[i];
-+				if (DWC_CIRCLEQ_EMPTY_ENTRY
-+				    (channel, hc_list_entry)) {
-+					hc_regs =
-+					    dwc_otg_hcd->core_if->
-+					    host_if->hc_regs[i];
-+					hcchar.d32 =
-+					    DWC_READ_REG32(&hc_regs->hcchar);
-+					if (hcchar.b.chen) {
-+						hcchar.b.chen = 0;
-+						hcchar.b.chdis = 1;
-+						hcchar.b.epdir = 0;
-+						DWC_WRITE_REG32
-+						    (&hc_regs->hcchar,
-+						     hcchar.d32);
-+					}
-+				}
-+			}
-+		}
-+
-+		if(fiq_fsm_enable) {
-+			for(i=0; i < 128; i++) {
-+				dwc_otg_hcd->hub_port[i] = 0;
-+			}
-+		}
-+	}
-+
-+	if(fiq_enable) {
-+		fiq_fsm_spin_unlock(&dwc_otg_hcd->fiq_state->lock);
-+		local_fiq_enable();
-+	}
-+
-+	if (dwc_otg_hcd->fops->disconnect) {
-+		dwc_otg_hcd->fops->disconnect(dwc_otg_hcd);
-+	}
-+
-+	DWC_SPINUNLOCK(dwc_otg_hcd->lock);
-+	return 1;
-+}
-+
-+/**
-+ * HCD Callback function for stopping the HCD.
-+ *
-+ * @param p void pointer to the <code>struct usb_hcd</code>
-+ */
-+static int32_t dwc_otg_hcd_stop_cb(void *p)
-+{
-+	dwc_otg_hcd_t *dwc_otg_hcd = p;
-+
-+	DWC_DEBUGPL(DBG_HCDV, "%s(%p)\n", __func__, p);
-+	dwc_otg_hcd_stop(dwc_otg_hcd);
-+	return 1;
-+}
-+
-+#ifdef CONFIG_USB_DWC_OTG_LPM
-+/**
-+ * HCD Callback function for sleep of HCD.
-+ *
-+ * @param p void pointer to the <code>struct usb_hcd</code>
-+ */
-+static int dwc_otg_hcd_sleep_cb(void *p)
-+{
-+	dwc_otg_hcd_t *hcd = p;
-+
-+	dwc_otg_hcd_free_hc_from_lpm(hcd);
-+
-+	return 0;
-+}
-+#endif
-+
-+
-+/**
-+ * HCD Callback function for Remote Wakeup.
-+ *
-+ * @param p void pointer to the <code>struct usb_hcd</code>
-+ */
-+static int dwc_otg_hcd_rem_wakeup_cb(void *p)
-+{
-+	dwc_otg_hcd_t *hcd = p;
-+
-+	if (hcd->core_if->lx_state == DWC_OTG_L2) {
-+		hcd->flags.b.port_suspend_change = 1;
-+	}
-+#ifdef CONFIG_USB_DWC_OTG_LPM
-+	else {
-+		hcd->flags.b.port_l1_change = 1;
-+	}
-+#endif
-+	return 0;
-+}
-+
-+/**
-+ * Halts the DWC_otg host mode operations in a clean manner. USB transfers are
-+ * stopped.
-+ */
-+void dwc_otg_hcd_stop(dwc_otg_hcd_t * hcd)
-+{
-+	hprt0_data_t hprt0 = {.d32 = 0 };
-+
-+	DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD STOP\n");
-+
-+	/*
-+	 * The root hub should be disconnected before this function is called.
-+	 * The disconnect will clear the QTD lists (via ..._hcd_urb_dequeue)
-+	 * and the QH lists (via ..._hcd_endpoint_disable).
-+	 */
-+
-+	/* Turn off all host-specific interrupts. */
-+	dwc_otg_disable_host_interrupts(hcd->core_if);
-+
-+	/* Turn off the vbus power */
-+	DWC_PRINTF("PortPower off\n");
-+	hprt0.b.prtpwr = 0;
-+	DWC_WRITE_REG32(hcd->core_if->host_if->hprt0, hprt0.d32);
-+	dwc_mdelay(1);
-+}
-+
-+int dwc_otg_hcd_urb_enqueue(dwc_otg_hcd_t * hcd,
-+			    dwc_otg_hcd_urb_t * dwc_otg_urb, void **ep_handle,
-+			    int atomic_alloc)
-+{
-+	int retval = 0;
-+	uint8_t needs_scheduling = 0;
-+	dwc_otg_transaction_type_e tr_type;
-+	dwc_otg_qtd_t *qtd;
-+	gintmsk_data_t intr_mask = {.d32 = 0 };
-+	hprt0_data_t hprt0 = { .d32 = 0 };
-+
-+#ifdef DEBUG /* integrity checks (Broadcom) */
-+	if (NULL == hcd->core_if) {
-+		DWC_ERROR("**** DWC OTG HCD URB Enqueue - HCD has NULL core_if\n");
-+		/* No longer connected. */
-+		return -DWC_E_INVALID;
-+	}
-+#endif
-+	if (!hcd->flags.b.port_connect_status) {
-+		/* No longer connected. */
-+		DWC_ERROR("Not connected\n");
-+		return -DWC_E_NO_DEVICE;
-+	}
-+
-+	/* Some core configurations cannot support LS traffic on a FS root port */
-+	if ((hcd->fops->speed(hcd, dwc_otg_urb->priv) == USB_SPEED_LOW) &&
-+		(hcd->core_if->hwcfg2.b.fs_phy_type == 1) &&
-+		(hcd->core_if->hwcfg2.b.hs_phy_type == 1)) {
-+			hprt0.d32 = DWC_READ_REG32(hcd->core_if->host_if->hprt0);
-+			if (hprt0.b.prtspd == DWC_HPRT0_PRTSPD_FULL_SPEED) {
-+				return -DWC_E_NO_DEVICE;
-+			}
-+	}
-+
-+	qtd = dwc_otg_hcd_qtd_create(dwc_otg_urb, atomic_alloc);
-+	if (qtd == NULL) {
-+		DWC_ERROR("DWC OTG HCD URB Enqueue failed creating QTD\n");
-+		return -DWC_E_NO_MEMORY;
-+	}
-+#ifdef DEBUG /* integrity checks (Broadcom) */
-+	if (qtd->urb == NULL) {
-+		DWC_ERROR("**** DWC OTG HCD URB Enqueue created QTD with no URBs\n");
-+		return -DWC_E_NO_MEMORY;
-+	}
-+	if (qtd->urb->priv == NULL) {
-+		DWC_ERROR("**** DWC OTG HCD URB Enqueue created QTD URB with no URB handle\n");
-+		return -DWC_E_NO_MEMORY;
-+	}
-+#endif
-+	intr_mask.d32 = DWC_READ_REG32(&hcd->core_if->core_global_regs->gintmsk);
-+	if(!intr_mask.b.sofintr || fiq_enable) needs_scheduling = 1;
-+	if((((dwc_otg_qh_t *)ep_handle)->ep_type == UE_BULK) && !(qtd->urb->flags & URB_GIVEBACK_ASAP))
-+		/* Do not schedule SG transactions until qtd has URB_GIVEBACK_ASAP set */
-+		needs_scheduling = 0;
-+
-+	retval = dwc_otg_hcd_qtd_add(qtd, hcd, (dwc_otg_qh_t **) ep_handle, atomic_alloc);
-+            // creates a new queue in ep_handle if it doesn't exist already
-+	if (retval < 0) {
-+		DWC_ERROR("DWC OTG HCD URB Enqueue failed adding QTD. "
-+			  "Error status %d\n", retval);
-+		dwc_otg_hcd_qtd_free(qtd);
-+		return retval;
-+	}
-+
-+	if(needs_scheduling) {
-+		tr_type = dwc_otg_hcd_select_transactions(hcd);
-+		if (tr_type != DWC_OTG_TRANSACTION_NONE) {
-+			dwc_otg_hcd_queue_transactions(hcd, tr_type);
-+		}
-+	}
-+	return retval;
-+}
-+
-+int dwc_otg_hcd_urb_dequeue(dwc_otg_hcd_t * hcd,
-+			    dwc_otg_hcd_urb_t * dwc_otg_urb)
-+{
-+	dwc_otg_qh_t *qh;
-+	dwc_otg_qtd_t *urb_qtd;
-+	BUG_ON(!hcd);
-+	BUG_ON(!dwc_otg_urb);
-+
-+#ifdef DEBUG /* integrity checks (Broadcom) */
-+
-+	if (hcd == NULL) {
-+		DWC_ERROR("**** DWC OTG HCD URB Dequeue has NULL HCD\n");
-+		return -DWC_E_INVALID;
-+	}
-+	if (dwc_otg_urb == NULL) {
-+		DWC_ERROR("**** DWC OTG HCD URB Dequeue has NULL URB\n");
-+		return -DWC_E_INVALID;
-+	}
-+	if (dwc_otg_urb->qtd == NULL) {
-+		DWC_ERROR("**** DWC OTG HCD URB Dequeue with NULL QTD\n");
-+		return -DWC_E_INVALID;
-+	}
-+	urb_qtd = dwc_otg_urb->qtd;
-+	BUG_ON(!urb_qtd);
-+	if (urb_qtd->qh == NULL) {
-+		DWC_ERROR("**** DWC OTG HCD URB Dequeue with QTD with NULL Q handler\n");
-+		return -DWC_E_INVALID;
-+	}
-+#else
-+	urb_qtd = dwc_otg_urb->qtd;
-+	BUG_ON(!urb_qtd);
-+#endif
-+	qh = urb_qtd->qh;
-+	BUG_ON(!qh);
-+	if (CHK_DEBUG_LEVEL(DBG_HCDV | DBG_HCD_URB)) {
-+		if (urb_qtd->in_process) {
-+			dump_channel_info(hcd, qh);
-+		}
-+	}
-+#ifdef DEBUG /* integrity checks (Broadcom) */
-+	if (hcd->core_if == NULL) {
-+		DWC_ERROR("**** DWC OTG HCD URB Dequeue HCD has NULL core_if\n");
-+		return -DWC_E_INVALID;
-+	}
-+#endif
-+	if (urb_qtd->in_process && qh->channel) {
-+		/* The QTD is in process (it has been assigned to a channel). */
-+		if (hcd->flags.b.port_connect_status) {
-+			int n = qh->channel->hc_num;
-+			/*
-+			 * If still connected (i.e. in host mode), halt the
-+			 * channel so it can be used for other transfers. If
-+			 * no longer connected, the host registers can't be
-+			 * written to halt the channel since the core is in
-+			 * device mode.
-+			 */
-+			/* In FIQ FSM mode, we need to shut down carefully.
-+			 * The FIQ may attempt to restart a disabled channel */
-+			if (fiq_fsm_enable && (hcd->fiq_state->channel[n].fsm != FIQ_PASSTHROUGH)) {
-+				int retries = 3;
-+				int running = 0;
-+				enum fiq_fsm_state state;
-+
-+				local_fiq_disable();
-+				fiq_fsm_spin_lock(&hcd->fiq_state->lock);
-+				qh->channel->halt_status = DWC_OTG_HC_XFER_URB_DEQUEUE;
-+				qh->channel->halt_pending = 1;
-+				if (hcd->fiq_state->channel[n].fsm == FIQ_HS_ISOC_TURBO ||
-+				    hcd->fiq_state->channel[n].fsm == FIQ_HS_ISOC_SLEEPING)
-+					hcd->fiq_state->channel[n].fsm = FIQ_HS_ISOC_ABORTED;
-+				fiq_fsm_spin_unlock(&hcd->fiq_state->lock);
-+				local_fiq_enable();
-+
-+				if (dwc_qh_is_non_per(qh)) {
-+					do {
-+						state = READ_ONCE(hcd->fiq_state->channel[n].fsm);
-+						running = (state != FIQ_NP_SPLIT_DONE) &&
-+							  (state != FIQ_NP_SPLIT_LS_ABORTED) &&
-+							  (state != FIQ_NP_SPLIT_HS_ABORTED);
-+						if (!running)
-+							break;
-+						udelay(125);
-+					} while(--retries);
-+					if (!retries)
-+						DWC_WARN("Timed out waiting for FSM NP transfer to complete on %d",
-+							 qh->channel->hc_num);
-+				}
-+			} else {
-+				dwc_otg_hc_halt(hcd->core_if, qh->channel,
-+						DWC_OTG_HC_XFER_URB_DEQUEUE);
-+			}
-+		}
-+	}
-+
-+	/*
-+	 * Free the QTD and clean up the associated QH. Leave the QH in the
-+	 * schedule if it has any remaining QTDs.
-+	 */
-+
-+	DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD URB Dequeue - "
-+                    "delete %sQueue handler\n",
-+                    hcd->core_if->dma_desc_enable?"DMA ":"");
-+	if (!hcd->core_if->dma_desc_enable) {
-+		uint8_t b = urb_qtd->in_process;
-+		if (nak_holdoff && qh->do_split && dwc_qh_is_non_per(qh))
-+			qh->nak_frame = 0xFFFF;
-+		dwc_otg_hcd_qtd_remove_and_free(hcd, urb_qtd, qh);
-+		if (b) {
-+			dwc_otg_hcd_qh_deactivate(hcd, qh, 0);
-+			qh->channel = NULL;
-+		} else if (DWC_CIRCLEQ_EMPTY(&qh->qtd_list)) {
-+			dwc_otg_hcd_qh_remove(hcd, qh);
-+		}
-+	} else {
-+		dwc_otg_hcd_qtd_remove_and_free(hcd, urb_qtd, qh);
-+	}
-+	return 0;
-+}
-+
-+int dwc_otg_hcd_endpoint_disable(dwc_otg_hcd_t * hcd, void *ep_handle,
-+				 int retry)
-+{
-+	dwc_otg_qh_t *qh = (dwc_otg_qh_t *) ep_handle;
-+	int retval = 0;
-+	dwc_irqflags_t flags;
-+
-+	if (retry < 0) {
-+		retval = -DWC_E_INVALID;
-+		goto done;
-+	}
-+
-+	if (!qh) {
-+		retval = -DWC_E_INVALID;
-+		goto done;
-+	}
-+
-+	DWC_SPINLOCK_IRQSAVE(hcd->lock, &flags);
-+
-+	while (!DWC_CIRCLEQ_EMPTY(&qh->qtd_list) && retry) {
-+		DWC_SPINUNLOCK_IRQRESTORE(hcd->lock, flags);
-+		retry--;
-+		dwc_msleep(5);
-+		DWC_SPINLOCK_IRQSAVE(hcd->lock, &flags);
-+	}
-+
-+	dwc_otg_hcd_qh_remove(hcd, qh);
-+
-+	DWC_SPINUNLOCK_IRQRESTORE(hcd->lock, flags);
-+	/*
-+	 * Split dwc_otg_hcd_qh_remove_and_free() into qh_remove
-+	 * and qh_free to prevent stack dump on DWC_DMA_FREE() with
-+	 * irq_disabled (spinlock_irqsave) in dwc_otg_hcd_desc_list_free()
-+	 * and dwc_otg_hcd_frame_list_alloc().
-+	 */
-+	dwc_otg_hcd_qh_free(hcd, qh);
-+
-+done:
-+	return retval;
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
-+int dwc_otg_hcd_endpoint_reset(dwc_otg_hcd_t * hcd, void *ep_handle)
-+{
-+	int retval = 0;
-+	dwc_otg_qh_t *qh = (dwc_otg_qh_t *) ep_handle;
-+	if (!qh)
-+		return -DWC_E_INVALID;
-+
-+	qh->data_toggle = DWC_OTG_HC_PID_DATA0;
-+	return retval;
-+}
-+#endif
-+
-+/**
-+ * HCD Callback structure for handling mode switching.
-+ */
-+static dwc_otg_cil_callbacks_t hcd_cil_callbacks = {
-+	.start = dwc_otg_hcd_start_cb,
-+	.stop = dwc_otg_hcd_stop_cb,
-+	.disconnect = dwc_otg_hcd_disconnect_cb,
-+	.session_start = dwc_otg_hcd_session_start_cb,
-+	.resume_wakeup = dwc_otg_hcd_rem_wakeup_cb,
-+#ifdef CONFIG_USB_DWC_OTG_LPM
-+	.sleep = dwc_otg_hcd_sleep_cb,
-+#endif
-+	.p = 0,
-+};
-+
-+/**
-+ * Reset tasklet function
-+ */
-+static void reset_tasklet_func(void *data)
-+{
-+	dwc_otg_hcd_t *dwc_otg_hcd = (dwc_otg_hcd_t *) data;
-+	dwc_otg_core_if_t *core_if = dwc_otg_hcd->core_if;
-+	hprt0_data_t hprt0;
-+
-+	DWC_DEBUGPL(DBG_HCDV, "USB RESET tasklet called\n");
-+
-+	hprt0.d32 = dwc_otg_read_hprt0(core_if);
-+	hprt0.b.prtrst = 1;
-+	DWC_WRITE_REG32(core_if->host_if->hprt0, hprt0.d32);
-+	dwc_mdelay(60);
-+
-+	hprt0.b.prtrst = 0;
-+	DWC_WRITE_REG32(core_if->host_if->hprt0, hprt0.d32);
-+	dwc_otg_hcd->flags.b.port_reset_change = 1;
-+}
-+
-+static void completion_tasklet_func(void *ptr)
-+{
-+	dwc_otg_hcd_t *hcd = (dwc_otg_hcd_t *) ptr;
-+	struct urb *urb;
-+	urb_tq_entry_t *item;
-+	dwc_irqflags_t flags;
-+
-+	/* This could just be spin_lock_irq */
-+	DWC_SPINLOCK_IRQSAVE(hcd->lock, &flags);
-+	while (!DWC_TAILQ_EMPTY(&hcd->completed_urb_list)) {
-+		item = DWC_TAILQ_FIRST(&hcd->completed_urb_list);
-+		urb = item->urb;
-+		DWC_TAILQ_REMOVE(&hcd->completed_urb_list, item,
-+				urb_tq_entries);
-+		DWC_SPINUNLOCK_IRQRESTORE(hcd->lock, flags);
-+		DWC_FREE(item);
-+
-+		usb_hcd_giveback_urb(hcd->priv, urb, urb->status);
-+
-+
-+		DWC_SPINLOCK_IRQSAVE(hcd->lock, &flags);
-+	}
-+	DWC_SPINUNLOCK_IRQRESTORE(hcd->lock, flags);
-+	return;
-+}
-+
-+static void qh_list_free(dwc_otg_hcd_t * hcd, dwc_list_link_t * qh_list)
-+{
-+	dwc_list_link_t *item;
-+	dwc_otg_qh_t *qh;
-+	dwc_irqflags_t flags;
-+
-+	if (!qh_list->next) {
-+		/* The list hasn't been initialized yet. */
-+		return;
-+	}
-+	/*
-+	 * Hold spinlock here. Not needed in that case if bellow
-+	 * function is being called from ISR
-+	 */
-+	DWC_SPINLOCK_IRQSAVE(hcd->lock, &flags);
-+	/* Ensure there are no QTDs or URBs left. */
-+	kill_urbs_in_qh_list(hcd, qh_list);
-+	DWC_SPINUNLOCK_IRQRESTORE(hcd->lock, flags);
-+
-+	DWC_LIST_FOREACH(item, qh_list) {
-+		qh = DWC_LIST_ENTRY(item, dwc_otg_qh_t, qh_list_entry);
-+		dwc_otg_hcd_qh_remove_and_free(hcd, qh);
-+	}
-+}
-+
-+/**
-+ * Exit from Hibernation if Host did not detect SRP from connected SRP capable
-+ * Device during SRP time by host power up.
-+ */
-+void dwc_otg_hcd_power_up(void *ptr)
-+{
-+	gpwrdn_data_t gpwrdn = {.d32 = 0 };
-+	dwc_otg_core_if_t *core_if = (dwc_otg_core_if_t *) ptr;
-+
-+	DWC_PRINTF("%s called\n", __FUNCTION__);
-+
-+	if (!core_if->hibernation_suspend) {
-+		DWC_PRINTF("Already exited from Hibernation\n");
-+		return;
-+	}
-+
-+	/* Switch on the voltage to the core */
-+	gpwrdn.b.pwrdnswtch = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+	dwc_udelay(10);
-+
-+	/* Reset the core */
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.pwrdnrstn = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+	dwc_udelay(10);
-+
-+	/* Disable power clamps */
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.pwrdnclmp = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+
-+	/* Remove reset the core signal */
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.pwrdnrstn = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, 0, gpwrdn.d32);
-+	dwc_udelay(10);
-+
-+	/* Disable PMU interrupt */
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.pmuintsel = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+
-+	core_if->hibernation_suspend = 0;
-+
-+	/* Disable PMU */
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.pmuactv = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+	dwc_udelay(10);
-+
-+	/* Enable VBUS */
-+	gpwrdn.d32 = 0;
-+	gpwrdn.b.dis_vbus = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, gpwrdn.d32, 0);
-+
-+	core_if->op_state = A_HOST;
-+	dwc_otg_core_init(core_if);
-+	dwc_otg_enable_global_interrupts(core_if);
-+	cil_hcd_start(core_if);
-+}
-+
-+void dwc_otg_cleanup_fiq_channel(dwc_otg_hcd_t *hcd, uint32_t num)
-+{
-+	struct fiq_channel_state *st = &hcd->fiq_state->channel[num];
-+	struct fiq_dma_blob *blob = hcd->fiq_dmab;
-+	int i;
-+
-+	st->fsm = FIQ_PASSTHROUGH;
-+	st->hcchar_copy.d32 = 0;
-+	st->hcsplt_copy.d32 = 0;
-+	st->hcint_copy.d32 = 0;
-+	st->hcintmsk_copy.d32 = 0;
-+	st->hctsiz_copy.d32 = 0;
-+	st->hcdma_copy.d32 = 0;
-+	st->nr_errors = 0;
-+	st->hub_addr = 0;
-+	st->port_addr = 0;
-+	st->expected_uframe = 0;
-+	st->nrpackets = 0;
-+	st->dma_info.index = 0;
-+	for (i = 0; i < 6; i++)
-+		st->dma_info.slot_len[i] = 255;
-+	st->hs_isoc_info.index = 0;
-+	st->hs_isoc_info.iso_desc = NULL;
-+	st->hs_isoc_info.nrframes = 0;
-+
-+	DWC_MEMSET(&blob->channel[num].index[0], 0x6b, 1128);
-+}
-+
-+/**
-+ * Frees secondary storage associated with the dwc_otg_hcd structure contained
-+ * in the struct usb_hcd field.
-+ */
-+static void dwc_otg_hcd_free(dwc_otg_hcd_t * dwc_otg_hcd)
-+{
-+	struct device *dev = dwc_otg_hcd_to_dev(dwc_otg_hcd);
-+	int i;
-+
-+	DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD FREE\n");
-+
-+	del_timers(dwc_otg_hcd);
-+
-+	/* Free memory for QH/QTD lists */
-+	qh_list_free(dwc_otg_hcd, &dwc_otg_hcd->non_periodic_sched_inactive);
-+	qh_list_free(dwc_otg_hcd, &dwc_otg_hcd->non_periodic_sched_active);
-+	qh_list_free(dwc_otg_hcd, &dwc_otg_hcd->periodic_sched_inactive);
-+	qh_list_free(dwc_otg_hcd, &dwc_otg_hcd->periodic_sched_ready);
-+	qh_list_free(dwc_otg_hcd, &dwc_otg_hcd->periodic_sched_assigned);
-+	qh_list_free(dwc_otg_hcd, &dwc_otg_hcd->periodic_sched_queued);
-+
-+	/* Free memory for the host channels. */
-+	for (i = 0; i < MAX_EPS_CHANNELS; i++) {
-+		dwc_hc_t *hc = dwc_otg_hcd->hc_ptr_array[i];
-+
-+#ifdef DEBUG
-+		if (dwc_otg_hcd->core_if->hc_xfer_timer[i]) {
-+			DWC_TIMER_FREE(dwc_otg_hcd->core_if->hc_xfer_timer[i]);
-+		}
-+#endif
-+		if (hc != NULL) {
-+			DWC_DEBUGPL(DBG_HCDV, "HCD Free channel #%i, hc=%p\n",
-+				    i, hc);
-+			DWC_FREE(hc);
-+		}
-+	}
-+
-+	if (dwc_otg_hcd->core_if->dma_enable) {
-+		if (dwc_otg_hcd->status_buf_dma) {
-+			DWC_DMA_FREE(dev, DWC_OTG_HCD_STATUS_BUF_SIZE,
-+				     dwc_otg_hcd->status_buf,
-+				     dwc_otg_hcd->status_buf_dma);
-+		}
-+	} else if (dwc_otg_hcd->status_buf != NULL) {
-+		DWC_FREE(dwc_otg_hcd->status_buf);
-+	}
-+	DWC_SPINLOCK_FREE(dwc_otg_hcd->lock);
-+	/* Set core_if's lock pointer to NULL */
-+	dwc_otg_hcd->core_if->lock = NULL;
-+
-+	DWC_TIMER_FREE(dwc_otg_hcd->conn_timer);
-+	DWC_TASK_FREE(dwc_otg_hcd->reset_tasklet);
-+	DWC_TASK_FREE(dwc_otg_hcd->completion_tasklet);
-+	DWC_DMA_FREE(dev, 16, dwc_otg_hcd->fiq_state->dummy_send,
-+		     dwc_otg_hcd->fiq_state->dummy_send_dma);
-+	DWC_FREE(dwc_otg_hcd->fiq_state);
-+
-+#ifdef DWC_DEV_SRPCAP
-+	if (dwc_otg_hcd->core_if->power_down == 2 &&
-+	    dwc_otg_hcd->core_if->pwron_timer) {
-+		DWC_TIMER_FREE(dwc_otg_hcd->core_if->pwron_timer);
-+	}
-+#endif
-+	DWC_FREE(dwc_otg_hcd);
-+}
-+
-+int dwc_otg_hcd_init(dwc_otg_hcd_t * hcd, dwc_otg_core_if_t * core_if)
-+{
-+	struct device *dev = dwc_otg_hcd_to_dev(hcd);
-+	int retval = 0;
-+	int num_channels;
-+	int i;
-+	dwc_hc_t *channel;
-+
-+#if (defined(DWC_LINUX) && defined(CONFIG_DEBUG_SPINLOCK))
-+	DWC_SPINLOCK_ALLOC_LINUX_DEBUG(hcd->lock);
-+#else
-+	hcd->lock = DWC_SPINLOCK_ALLOC();
-+#endif
-+        DWC_DEBUGPL(DBG_HCDV, "init of HCD %p given core_if %p\n",
-+                    hcd, core_if);
-+	if (!hcd->lock) {
-+		DWC_ERROR("Could not allocate lock for pcd");
-+		DWC_FREE(hcd);
-+		retval = -DWC_E_NO_MEMORY;
-+		goto out;
-+	}
-+	hcd->core_if = core_if;
-+
-+	/* Register the HCD CIL Callbacks */
-+	dwc_otg_cil_register_hcd_callbacks(hcd->core_if,
-+					   &hcd_cil_callbacks, hcd);
-+
-+	/* Initialize the non-periodic schedule. */
-+	DWC_LIST_INIT(&hcd->non_periodic_sched_inactive);
-+	DWC_LIST_INIT(&hcd->non_periodic_sched_active);
-+
-+	/* Initialize the periodic schedule. */
-+	DWC_LIST_INIT(&hcd->periodic_sched_inactive);
-+	DWC_LIST_INIT(&hcd->periodic_sched_ready);
-+	DWC_LIST_INIT(&hcd->periodic_sched_assigned);
-+	DWC_LIST_INIT(&hcd->periodic_sched_queued);
-+	DWC_TAILQ_INIT(&hcd->completed_urb_list);
-+	/*
-+	 * Create a host channel descriptor for each host channel implemented
-+	 * in the controller. Initialize the channel descriptor array.
-+	 */
-+	DWC_CIRCLEQ_INIT(&hcd->free_hc_list);
-+	num_channels = hcd->core_if->core_params->host_channels;
-+	DWC_MEMSET(hcd->hc_ptr_array, 0, sizeof(hcd->hc_ptr_array));
-+	for (i = 0; i < num_channels; i++) {
-+		channel = DWC_ALLOC(sizeof(dwc_hc_t));
-+		if (channel == NULL) {
-+			retval = -DWC_E_NO_MEMORY;
-+			DWC_ERROR("%s: host channel allocation failed\n",
-+				  __func__);
-+			dwc_otg_hcd_free(hcd);
-+			goto out;
-+		}
-+		channel->hc_num = i;
-+		hcd->hc_ptr_array[i] = channel;
-+#ifdef DEBUG
-+		hcd->core_if->hc_xfer_timer[i] =
-+		    DWC_TIMER_ALLOC("hc timer", hc_xfer_timeout,
-+				    &hcd->core_if->hc_xfer_info[i]);
-+#endif
-+		DWC_DEBUGPL(DBG_HCDV, "HCD Added channel #%d, hc=%p\n", i,
-+			    channel);
-+	}
-+
-+	if (fiq_enable) {
-+		hcd->fiq_state = DWC_ALLOC(sizeof(struct fiq_state) + (sizeof(struct fiq_channel_state) * num_channels));
-+		if (!hcd->fiq_state) {
-+			retval = -DWC_E_NO_MEMORY;
-+			DWC_ERROR("%s: cannot allocate fiq_state structure\n", __func__);
-+			dwc_otg_hcd_free(hcd);
-+			goto out;
-+		}
-+		DWC_MEMSET(hcd->fiq_state, 0, (sizeof(struct fiq_state) + (sizeof(struct fiq_channel_state) * num_channels)));
-+
-+#ifdef CONFIG_ARM64
-+		spin_lock_init(&hcd->fiq_state->lock);
-+#endif
-+
-+		for (i = 0; i < num_channels; i++) {
-+			hcd->fiq_state->channel[i].fsm = FIQ_PASSTHROUGH;
-+		}
-+		hcd->fiq_state->dummy_send = DWC_DMA_ALLOC_ATOMIC(dev, 16,
-+							 &hcd->fiq_state->dummy_send_dma);
-+
-+		hcd->fiq_stack = DWC_ALLOC(sizeof(struct fiq_stack));
-+		if (!hcd->fiq_stack) {
-+			retval = -DWC_E_NO_MEMORY;
-+			DWC_ERROR("%s: cannot allocate fiq_stack structure\n", __func__);
-+			dwc_otg_hcd_free(hcd);
-+			goto out;
-+		}
-+		hcd->fiq_stack->magic1 = 0xDEADBEEF;
-+		hcd->fiq_stack->magic2 = 0xD00DFEED;
-+		hcd->fiq_state->gintmsk_saved.d32 = ~0;
-+		hcd->fiq_state->haintmsk_saved.b2.chint = ~0;
-+
-+		/* This bit is terrible and uses no API, but necessary. The FIQ has no concept of DMA pools
-+		 * (and if it did, would be a lot slower). This allocates a chunk of memory (~9kiB for 8 host channels)
-+		 * for use as transaction bounce buffers in a 2-D array. Our access into this chunk is done by some
-+		 * moderately readable array casts.
-+		 */
-+		hcd->fiq_dmab = DWC_DMA_ALLOC(dev, (sizeof(struct fiq_dma_channel) * num_channels), &hcd->fiq_state->dma_base);
-+		DWC_WARN("FIQ DMA bounce buffers: virt = %px dma = %pad len=%zu",
-+				hcd->fiq_dmab, &hcd->fiq_state->dma_base,
-+				sizeof(struct fiq_dma_channel) * num_channels);
-+
-+		DWC_MEMSET(hcd->fiq_dmab, 0x6b, 9024);
-+
-+		/* pointer for debug in fiq_print */
-+		hcd->fiq_state->fiq_dmab = hcd->fiq_dmab;
-+		if (fiq_fsm_enable) {
-+			int i;
-+			for (i=0; i < hcd->core_if->core_params->host_channels; i++) {
-+				dwc_otg_cleanup_fiq_channel(hcd, i);
-+			}
-+			DWC_PRINTF("FIQ FSM acceleration enabled for :\n%s%s%s%s",
-+				(fiq_fsm_mask & 0x1) ? "Non-periodic Split Transactions\n" : "",
-+				(fiq_fsm_mask & 0x2) ? "Periodic Split Transactions\n" : "",
-+				(fiq_fsm_mask & 0x4) ? "High-Speed Isochronous Endpoints\n" : "",
-+				(fiq_fsm_mask & 0x8) ? "Interrupt/Control Split Transaction hack enabled\n" : "");
-+		}
-+	}
-+
-+	/* Initialize the Connection timeout timer. */
-+	hcd->conn_timer = DWC_TIMER_ALLOC("Connection timer",
-+					  dwc_otg_hcd_connect_timeout, 0);
-+
-+	printk(KERN_DEBUG "dwc_otg: Microframe scheduler %s\n", microframe_schedule ? "enabled":"disabled");
-+	if (microframe_schedule)
-+		init_hcd_usecs(hcd);
-+
-+	/* Initialize reset tasklet. */
-+	hcd->reset_tasklet = DWC_TASK_ALLOC("reset_tasklet", reset_tasklet_func, hcd);
-+
-+	hcd->completion_tasklet = DWC_TASK_ALLOC("completion_tasklet",
-+						completion_tasklet_func, hcd);
-+#ifdef DWC_DEV_SRPCAP
-+	if (hcd->core_if->power_down == 2) {
-+		/* Initialize Power on timer for Host power up in case hibernation */
-+		hcd->core_if->pwron_timer = DWC_TIMER_ALLOC("PWRON TIMER",
-+									dwc_otg_hcd_power_up, core_if);
-+	}
-+#endif
-+
-+	/*
-+	 * Allocate space for storing data on status transactions. Normally no
-+	 * data is sent, but this space acts as a bit bucket. This must be
-+	 * done after usb_add_hcd since that function allocates the DMA buffer
-+	 * pool.
-+	 */
-+	if (hcd->core_if->dma_enable) {
-+		hcd->status_buf =
-+		    DWC_DMA_ALLOC(dev, DWC_OTG_HCD_STATUS_BUF_SIZE,
-+				  &hcd->status_buf_dma);
-+	} else {
-+		hcd->status_buf = DWC_ALLOC(DWC_OTG_HCD_STATUS_BUF_SIZE);
-+	}
-+	if (!hcd->status_buf) {
-+		retval = -DWC_E_NO_MEMORY;
-+		DWC_ERROR("%s: status_buf allocation failed\n", __func__);
-+		dwc_otg_hcd_free(hcd);
-+		goto out;
-+	}
-+
-+	hcd->otg_port = 1;
-+	hcd->frame_list = NULL;
-+	hcd->frame_list_dma = 0;
-+	hcd->periodic_qh_count = 0;
-+
-+	DWC_MEMSET(hcd->hub_port, 0, sizeof(hcd->hub_port));
-+#ifdef FIQ_DEBUG
-+	DWC_MEMSET(hcd->hub_port_alloc, -1, sizeof(hcd->hub_port_alloc));
-+#endif
-+
-+out:
-+	return retval;
-+}
-+
-+void dwc_otg_hcd_remove(dwc_otg_hcd_t * hcd)
-+{
-+	/* Turn off all host-specific interrupts. */
-+	dwc_otg_disable_host_interrupts(hcd->core_if);
-+
-+	dwc_otg_hcd_free(hcd);
-+}
-+
-+/**
-+ * Initializes dynamic portions of the DWC_otg HCD state.
-+ */
-+static void dwc_otg_hcd_reinit(dwc_otg_hcd_t * hcd)
-+{
-+	int num_channels;
-+	int i;
-+	dwc_hc_t *channel;
-+	dwc_hc_t *channel_tmp;
-+
-+	hcd->flags.d32 = 0;
-+
-+	hcd->non_periodic_qh_ptr = &hcd->non_periodic_sched_active;
-+	if (!microframe_schedule) {
-+		hcd->non_periodic_channels = 0;
-+		hcd->periodic_channels = 0;
-+	} else {
-+		hcd->available_host_channels = hcd->core_if->core_params->host_channels;
-+	}
-+	/*
-+	 * Put all channels in the free channel list and clean up channel
-+	 * states.
-+	 */
-+	DWC_CIRCLEQ_FOREACH_SAFE(channel, channel_tmp,
-+				 &hcd->free_hc_list, hc_list_entry) {
-+		DWC_CIRCLEQ_REMOVE(&hcd->free_hc_list, channel, hc_list_entry);
-+	}
-+
-+	num_channels = hcd->core_if->core_params->host_channels;
-+	for (i = 0; i < num_channels; i++) {
-+		channel = hcd->hc_ptr_array[i];
-+		DWC_CIRCLEQ_INSERT_TAIL(&hcd->free_hc_list, channel,
-+					hc_list_entry);
-+		dwc_otg_hc_cleanup(hcd->core_if, channel);
-+	}
-+
-+	/* Initialize the DWC core for host mode operation. */
-+	dwc_otg_core_host_init(hcd->core_if);
-+
-+	/* Set core_if's lock pointer to the hcd->lock */
-+	hcd->core_if->lock = hcd->lock;
-+}
-+
-+/**
-+ * Assigns transactions from a QTD to a free host channel and initializes the
-+ * host channel to perform the transactions. The host channel is removed from
-+ * the free list.
-+ *
-+ * @param hcd The HCD state structure.
-+ * @param qh Transactions from the first QTD for this QH are selected and
-+ * assigned to a free host channel.
-+ */
-+static void assign_and_init_hc(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh)
-+{
-+	dwc_hc_t *hc;
-+	dwc_otg_qtd_t *qtd;
-+	dwc_otg_hcd_urb_t *urb;
-+	void* ptr = NULL;
-+	uint16_t wLength;
-+	uint32_t intr_enable;
-+	unsigned long flags;
-+	gintmsk_data_t gintmsk = { .d32 = 0, };
-+	struct device *dev = dwc_otg_hcd_to_dev(hcd);
-+
-+	qtd = DWC_CIRCLEQ_FIRST(&qh->qtd_list);
-+
-+	urb = qtd->urb;
-+
-+	DWC_DEBUGPL(DBG_HCDV, "%s(%p,%p) - urb %x, actual_length %d\n", __func__, hcd, qh, (unsigned int)urb, urb->actual_length);
-+
-+	if (((urb->actual_length < 0) || (urb->actual_length > urb->length)) && !dwc_otg_hcd_is_pipe_in(&urb->pipe_info))
-+		urb->actual_length = urb->length;
-+
-+
-+	hc = DWC_CIRCLEQ_FIRST(&hcd->free_hc_list);
-+
-+	/* Remove the host channel from the free list. */
-+	DWC_CIRCLEQ_REMOVE_INIT(&hcd->free_hc_list, hc, hc_list_entry);
-+
-+	qh->channel = hc;
-+
-+	qtd->in_process = 1;
-+
-+	/*
-+	 * Use usb_pipedevice to determine device address. This address is
-+	 * 0 before the SET_ADDRESS command and the correct address afterward.
-+	 */
-+	hc->dev_addr = dwc_otg_hcd_get_dev_addr(&urb->pipe_info);
-+	hc->ep_num = dwc_otg_hcd_get_ep_num(&urb->pipe_info);
-+	hc->speed = qh->dev_speed;
-+	hc->max_packet = dwc_max_packet(qh->maxp);
-+
-+	hc->xfer_started = 0;
-+	hc->halt_status = DWC_OTG_HC_XFER_NO_HALT_STATUS;
-+	hc->error_state = (qtd->error_count > 0);
-+	hc->halt_on_queue = 0;
-+	hc->halt_pending = 0;
-+	hc->requests = 0;
-+
-+	/*
-+	 * The following values may be modified in the transfer type section
-+	 * below. The xfer_len value may be reduced when the transfer is
-+	 * started to accommodate the max widths of the XferSize and PktCnt
-+	 * fields in the HCTSIZn register.
-+	 */
-+
-+	hc->ep_is_in = (dwc_otg_hcd_is_pipe_in(&urb->pipe_info) != 0);
-+	if (hc->ep_is_in) {
-+		hc->do_ping = 0;
-+	} else {
-+		hc->do_ping = qh->ping_state;
-+	}
-+
-+	hc->data_pid_start = qh->data_toggle;
-+	hc->multi_count = 1;
-+
-+	if (hcd->core_if->dma_enable) {
-+		hc->xfer_buff =
-+		    (uint8_t *)(uintptr_t)urb->dma + urb->actual_length;
-+
-+		/* For non-dword aligned case */
-+		if (((unsigned long)hc->xfer_buff & 0x3)
-+		    && !hcd->core_if->dma_desc_enable) {
-+			ptr = (uint8_t *) urb->buf + urb->actual_length;
-+		}
-+	} else {
-+		hc->xfer_buff = (uint8_t *) urb->buf + urb->actual_length;
-+	}
-+	hc->xfer_len = urb->length - urb->actual_length;
-+	hc->xfer_count = 0;
-+
-+	/*
-+	 * Set the split attributes
-+	 */
-+	hc->do_split = 0;
-+	if (qh->do_split) {
-+		uint32_t hub_addr, port_addr;
-+		hc->do_split = 1;
-+		hc->start_pkt_count = 1;
-+		hc->xact_pos = qtd->isoc_split_pos;
-+		/* We don't need to do complete splits anymore */
-+//		if(fiq_fsm_enable)
-+		if (0)
-+			hc->complete_split = qtd->complete_split = 0;
-+		else
-+			hc->complete_split = qtd->complete_split;
-+
-+		hcd->fops->hub_info(hcd, urb->priv, &hub_addr, &port_addr);
-+		hc->hub_addr = (uint8_t) hub_addr;
-+		hc->port_addr = (uint8_t) port_addr;
-+	}
-+
-+	switch (dwc_otg_hcd_get_pipe_type(&urb->pipe_info)) {
-+	case UE_CONTROL:
-+		hc->ep_type = DWC_OTG_EP_TYPE_CONTROL;
-+		switch (qtd->control_phase) {
-+		case DWC_OTG_CONTROL_SETUP:
-+			DWC_DEBUGPL(DBG_HCDV, "  Control setup transaction\n");
-+			hc->do_ping = 0;
-+			hc->ep_is_in = 0;
-+			hc->data_pid_start = DWC_OTG_HC_PID_SETUP;
-+			if (hcd->core_if->dma_enable) {
-+				hc->xfer_buff =
-+					(uint8_t *)(uintptr_t)urb->setup_dma;
-+			} else {
-+				hc->xfer_buff = (uint8_t *) urb->setup_packet;
-+			}
-+			hc->xfer_len = 8;
-+			ptr = NULL;
-+			break;
-+		case DWC_OTG_CONTROL_DATA:
-+			DWC_DEBUGPL(DBG_HCDV, "  Control data transaction\n");
-+			/*
-+			 * Hardware bug: small IN packets with length < 4
-+			 * cause a 4-byte write to memory. We can only catch
-+			 * the case where we know a short packet is going to be
-+			 * returned in a control transfer, as the length is
-+			 * specified in the setup packet. This is only an issue
-+			 * for drivers that insist on packing a device's various
-+			 * properties into a struct and querying them one at a
-+			 * time (uvcvideo).
-+			 * Force the use of align_buf so that the subsequent
-+			 * memcpy puts the right number of bytes in the URB's
-+			 * buffer.
-+			 */
-+			wLength = ((uint16_t *)urb->setup_packet)[3];
-+			if (hc->ep_is_in && wLength < 4)
-+				ptr = hc->xfer_buff;
-+
-+			hc->data_pid_start = qtd->data_toggle;
-+			break;
-+		case DWC_OTG_CONTROL_STATUS:
-+			/*
-+			 * Direction is opposite of data direction or IN if no
-+			 * data.
-+			 */
-+			DWC_DEBUGPL(DBG_HCDV, "  Control status transaction\n");
-+			if (urb->length == 0) {
-+				hc->ep_is_in = 1;
-+			} else {
-+				hc->ep_is_in =
-+				    dwc_otg_hcd_is_pipe_out(&urb->pipe_info);
-+			}
-+			if (hc->ep_is_in) {
-+				hc->do_ping = 0;
-+			}
-+
-+			hc->data_pid_start = DWC_OTG_HC_PID_DATA1;
-+
-+			hc->xfer_len = 0;
-+			if (hcd->core_if->dma_enable) {
-+				hc->xfer_buff = (uint8_t *)
-+					(uintptr_t)hcd->status_buf_dma;
-+			} else {
-+				hc->xfer_buff = (uint8_t *) hcd->status_buf;
-+			}
-+			ptr = NULL;
-+			break;
-+		}
-+		break;
-+	case UE_BULK:
-+		hc->ep_type = DWC_OTG_EP_TYPE_BULK;
-+		break;
-+	case UE_INTERRUPT:
-+		hc->ep_type = DWC_OTG_EP_TYPE_INTR;
-+		break;
-+	case UE_ISOCHRONOUS:
-+		{
-+			struct dwc_otg_hcd_iso_packet_desc *frame_desc;
-+
-+			hc->ep_type = DWC_OTG_EP_TYPE_ISOC;
-+
-+			if (hcd->core_if->dma_desc_enable)
-+				break;
-+
-+			frame_desc = &urb->iso_descs[qtd->isoc_frame_index];
-+
-+			frame_desc->status = 0;
-+
-+			if (hcd->core_if->dma_enable) {
-+				hc->xfer_buff = (uint8_t *)(uintptr_t)urb->dma;
-+			} else {
-+				hc->xfer_buff = (uint8_t *) urb->buf;
-+			}
-+			hc->xfer_buff +=
-+			    frame_desc->offset + qtd->isoc_split_offset;
-+			hc->xfer_len =
-+			    frame_desc->length - qtd->isoc_split_offset;
-+
-+			/* For non-dword aligned buffers */
-+			if (((unsigned long)hc->xfer_buff & 0x3)
-+			    && hcd->core_if->dma_enable) {
-+				ptr =
-+				    (uint8_t *) urb->buf + frame_desc->offset +
-+				    qtd->isoc_split_offset;
-+			} else
-+				ptr = NULL;
-+
-+			if (hc->xact_pos == DWC_HCSPLIT_XACTPOS_ALL) {
-+				if (hc->xfer_len <= 188) {
-+					hc->xact_pos = DWC_HCSPLIT_XACTPOS_ALL;
-+				} else {
-+					hc->xact_pos =
-+					    DWC_HCSPLIT_XACTPOS_BEGIN;
-+				}
-+			}
-+		}
-+		break;
-+	}
-+	/* non DWORD-aligned buffer case */
-+	if (ptr) {
-+		uint32_t buf_size;
-+		if (hc->ep_type != DWC_OTG_EP_TYPE_ISOC) {
-+			buf_size = hcd->core_if->core_params->max_transfer_size;
-+		} else {
-+			buf_size = 4096;
-+		}
-+		if (!qh->dw_align_buf) {
-+			qh->dw_align_buf = DWC_DMA_ALLOC_ATOMIC(dev, buf_size,
-+							 &qh->dw_align_buf_dma);
-+			if (!qh->dw_align_buf) {
-+				DWC_ERROR
-+				    ("%s: Failed to allocate memory to handle "
-+				     "non-dword aligned buffer case\n",
-+				     __func__);
-+				return;
-+			}
-+		}
-+		if (!hc->ep_is_in) {
-+			dwc_memcpy(qh->dw_align_buf, ptr, hc->xfer_len);
-+		}
-+		hc->align_buff = qh->dw_align_buf_dma;
-+	} else {
-+		hc->align_buff = 0;
-+	}
-+
-+	if (hc->ep_type == DWC_OTG_EP_TYPE_INTR ||
-+	    hc->ep_type == DWC_OTG_EP_TYPE_ISOC) {
-+		/*
-+		 * This value may be modified when the transfer is started to
-+		 * reflect the actual transfer length.
-+		 */
-+		hc->multi_count = dwc_hb_mult(qh->maxp);
-+	}
-+
-+	if (hcd->core_if->dma_desc_enable)
-+		hc->desc_list_addr = qh->desc_list_dma;
-+
-+	dwc_otg_hc_init(hcd->core_if, hc);
-+
-+	local_irq_save(flags);
-+
-+	if (fiq_enable) {
-+		local_fiq_disable();
-+		fiq_fsm_spin_lock(&hcd->fiq_state->lock);
-+	}
-+
-+	/* Enable the top level host channel interrupt. */
-+	intr_enable = (1 << hc->hc_num);
-+	DWC_MODIFY_REG32(&hcd->core_if->host_if->host_global_regs->haintmsk, 0, intr_enable);
-+
-+	/* Make sure host channel interrupts are enabled. */
-+	gintmsk.b.hcintr = 1;
-+	DWC_MODIFY_REG32(&hcd->core_if->core_global_regs->gintmsk, 0, gintmsk.d32);
-+
-+	if (fiq_enable) {
-+		fiq_fsm_spin_unlock(&hcd->fiq_state->lock);
-+		local_fiq_enable();
-+	}
-+
-+	local_irq_restore(flags);
-+	hc->qh = qh;
-+}
-+
-+
-+/**
-+ * fiq_fsm_transaction_suitable() - Test a QH for compatibility with the FIQ
-+ * @hcd:	Pointer to the dwc_otg_hcd struct
-+ * @qh:	pointer to the endpoint's queue head
-+ *
-+ * Transaction start/end control flow is grafted onto the existing dwc_otg
-+ * mechanisms, to avoid spaghettifying the functions more than they already are.
-+ * This function's eligibility check is altered by debug parameter.
-+ *
-+ * Returns: 0 for unsuitable, 1 implies the FIQ can be enabled for this transaction.
-+ */
-+
-+int fiq_fsm_transaction_suitable(dwc_otg_hcd_t *hcd, dwc_otg_qh_t *qh)
-+{
-+	if (qh->do_split) {
-+		switch (qh->ep_type) {
-+		case UE_CONTROL:
-+		case UE_BULK:
-+			if (fiq_fsm_mask & (1 << 0))
-+				return 1;
-+			break;
-+		case UE_INTERRUPT:
-+		case UE_ISOCHRONOUS:
-+			if (fiq_fsm_mask & (1 << 1))
-+				return 1;
-+			break;
-+		default:
-+			break;
-+		}
-+	} else if (qh->ep_type == UE_ISOCHRONOUS) {
-+		if (fiq_fsm_mask & (1 << 2)) {
-+			/* ISOCH support. We test for compatibility:
-+			 * - DWORD aligned buffers
-+			 * - Must be at least 2 transfers (otherwise pointless to use the FIQ)
-+			 * If yes, then the fsm enqueue function will handle the state machine setup.
-+			 */
-+			dwc_otg_qtd_t *qtd = DWC_CIRCLEQ_FIRST(&qh->qtd_list);
-+			dwc_otg_hcd_urb_t *urb = qtd->urb;
-+			dwc_dma_t ptr;
-+			int i;
-+
-+			if (urb->packet_count < 2)
-+				return 0;
-+			for (i = 0; i < urb->packet_count; i++) {
-+				ptr = urb->dma + urb->iso_descs[i].offset;
-+				if (ptr & 0x3)
-+					return 0;
-+			}
-+			return 1;
-+		}
-+	}
-+	return 0;
-+}
-+
-+/**
-+ * fiq_fsm_setup_periodic_dma() - Set up DMA bounce buffers
-+ * @hcd: Pointer to the dwc_otg_hcd struct
-+ * @qh: Pointer to the endpoint's queue head
-+ *
-+ * Periodic split transactions are transmitted modulo 188 bytes.
-+ * This necessitates slicing data up into buckets for isochronous out
-+ * and fixing up the DMA address for all IN transfers.
-+ *
-+ * Returns 1 if the DMA bounce buffers have been used, 0 if the default
-+ * HC buffer has been used.
-+ */
-+int fiq_fsm_setup_periodic_dma(dwc_otg_hcd_t *hcd, struct fiq_channel_state *st, dwc_otg_qh_t *qh)
-+ {
-+	int frame_length, i = 0;
-+	uint8_t *ptr = NULL;
-+	dwc_hc_t *hc = qh->channel;
-+	struct fiq_dma_blob *blob;
-+	struct dwc_otg_hcd_iso_packet_desc *frame_desc;
-+
-+	for (i = 0; i < 6; i++) {
-+		st->dma_info.slot_len[i] = 255;
-+	}
-+	st->dma_info.index = 0;
-+	i = 0;
-+	if (hc->ep_is_in) {
-+		/*
-+		 * Set dma_regs to bounce buffer. FIQ will update the
-+		 * state depending on transaction progress.
-+		 * Pointer arithmetic on hcd->fiq_state->dma_base (a dma_addr_t)
-+		 * to point it to the correct offset in the allocated buffers.
-+		 */
-+		blob = (struct fiq_dma_blob *)
-+			(uintptr_t)hcd->fiq_state->dma_base;
-+		st->hcdma_copy.d32 =(u32)(uintptr_t)
-+			blob->channel[hc->hc_num].index[0].buf;
-+
-+		/* Calculate the max number of CSPLITS such that the FIQ can time out
-+		 * a transaction if it fails.
-+		 */
-+		frame_length = st->hcchar_copy.b.mps;
-+		do {
-+			i++;
-+			frame_length -= 188;
-+		} while (frame_length >= 0);
-+		st->nrpackets = i;
-+		return 1;
-+	} else {
-+		if (qh->ep_type == UE_ISOCHRONOUS) {
-+
-+			dwc_otg_qtd_t *qtd = DWC_CIRCLEQ_FIRST(&qh->qtd_list);
-+
-+			frame_desc = &qtd->urb->iso_descs[qtd->isoc_frame_index];
-+			frame_length = frame_desc->length;
-+
-+			/* Virtual address for bounce buffers */
-+			blob = hcd->fiq_dmab;
-+
-+			ptr = qtd->urb->buf + frame_desc->offset;
-+			if (frame_length == 0) {
-+				/*
-+				 * for isochronous transactions, we must still transmit a packet
-+				 * even if the length is zero.
-+				 */
-+				st->dma_info.slot_len[0] = 0;
-+				st->nrpackets = 1;
-+			} else {
-+				do {
-+					if (frame_length <= 188) {
-+						dwc_memcpy(&blob->channel[hc->hc_num].index[i].buf[0], ptr, frame_length);
-+						st->dma_info.slot_len[i] = frame_length;
-+						ptr += frame_length;
-+					} else {
-+						dwc_memcpy(&blob->channel[hc->hc_num].index[i].buf[0], ptr, 188);
-+						st->dma_info.slot_len[i] = 188;
-+						ptr += 188;
-+					}
-+					i++;
-+					frame_length -= 188;
-+				} while (frame_length > 0);
-+				st->nrpackets = i;
-+			}
-+			ptr = qtd->urb->buf + frame_desc->offset;
-+			/*
-+			 * Point the HC at the DMA address of the bounce buffers
-+			 *
-+			 * Pointer arithmetic on hcd->fiq_state->dma_base (a
-+			 * dma_addr_t) to point it to the correct offset in the
-+			 * allocated buffers.
-+			 */
-+			blob = (struct fiq_dma_blob *)
-+				(uintptr_t)hcd->fiq_state->dma_base;
-+			st->hcdma_copy.d32 = (u32)(uintptr_t)
-+				blob->channel[hc->hc_num].index[0].buf;
-+
-+			/* fixup xfersize to the actual packet size */
-+			st->hctsiz_copy.b.pid = 0;
-+			st->hctsiz_copy.b.xfersize = st->dma_info.slot_len[0];
-+			return 1;
-+		} else {
-+			/* For interrupt, single OUT packet required, goes in the SSPLIT from hc_buff. */
-+			return 0;
-+		}
-+	}
-+}
-+
-+/**
-+ * fiq_fsm_np_tt_contended() - Avoid performing contended non-periodic transfers
-+ * @hcd: Pointer to the dwc_otg_hcd struct
-+ * @qh: Pointer to the endpoint's queue head
-+ *
-+ * Certain hub chips don't differentiate between IN and OUT non-periodic pipes
-+ * with the same endpoint number. If transfers get completed out of order
-+ * (disregarding the direction token) then the hub can lock up
-+ * or return erroneous responses.
-+ *
-+ * Returns 1 if initiating the transfer would cause contention, 0 otherwise.
-+ */
-+int fiq_fsm_np_tt_contended(dwc_otg_hcd_t *hcd, dwc_otg_qh_t *qh)
-+{
-+	int i;
-+	struct fiq_channel_state *st;
-+	int dev_addr = qh->channel->dev_addr;
-+	int ep_num = qh->channel->ep_num;
-+	for (i = 0; i < hcd->core_if->core_params->host_channels; i++) {
-+		if (i == qh->channel->hc_num)
-+			continue;
-+		st = &hcd->fiq_state->channel[i];
-+		switch (st->fsm) {
-+		case FIQ_NP_SSPLIT_STARTED:
-+		case FIQ_NP_SSPLIT_RETRY:
-+		case FIQ_NP_SSPLIT_PENDING:
-+		case FIQ_NP_OUT_CSPLIT_RETRY:
-+		case FIQ_NP_IN_CSPLIT_RETRY:
-+			if (st->hcchar_copy.b.devaddr == dev_addr &&
-+				st->hcchar_copy.b.epnum == ep_num)
-+				return 1;
-+			break;
-+		default:
-+			break;
-+		}
-+	}
-+	return 0;
-+}
-+
-+/*
-+ * Pushing a periodic request into the queue near the EOF1 point
-+ * in a microframe causes erroneous behaviour (frmovrun) interrupt.
-+ * Usually, the request goes out on the bus causing a transfer but
-+ * the core does not transfer the data to memory.
-+ * This guard interval (in number of 60MHz clocks) is required which
-+ * must cater for CPU latency between reading the value and enabling
-+ * the channel.
-+ */
-+#define PERIODIC_FRREM_BACKOFF 1000
-+
-+int fiq_fsm_queue_isoc_transaction(dwc_otg_hcd_t *hcd, dwc_otg_qh_t *qh)
-+{
-+	dwc_hc_t *hc = qh->channel;
-+	dwc_otg_hc_regs_t *hc_regs = hcd->core_if->host_if->hc_regs[hc->hc_num];
-+	dwc_otg_qtd_t *qtd = DWC_CIRCLEQ_FIRST(&qh->qtd_list);
-+	int frame;
-+	struct fiq_channel_state *st = &hcd->fiq_state->channel[hc->hc_num];
-+	int xfer_len, nrpackets;
-+	hcdma_data_t hcdma;
-+	hfnum_data_t hfnum;
-+
-+	if (st->fsm != FIQ_PASSTHROUGH)
-+		return 0;
-+
-+	st->nr_errors = 0;
-+
-+	st->hcchar_copy.d32 = 0;
-+	st->hcchar_copy.b.mps = hc->max_packet;
-+	st->hcchar_copy.b.epdir = hc->ep_is_in;
-+	st->hcchar_copy.b.devaddr = hc->dev_addr;
-+	st->hcchar_copy.b.epnum = hc->ep_num;
-+	st->hcchar_copy.b.eptype = hc->ep_type;
-+
-+	st->hcintmsk_copy.b.chhltd = 1;
-+
-+	frame = dwc_otg_hcd_get_frame_number(hcd);
-+	st->hcchar_copy.b.oddfrm = (frame & 0x1) ? 0 : 1;
-+
-+	st->hcchar_copy.b.lspddev = 0;
-+	/* Enable the channel later as a final register write. */
-+
-+	st->hcsplt_copy.d32 = 0;
-+
-+	st->hs_isoc_info.iso_desc = (struct dwc_otg_hcd_iso_packet_desc *) &qtd->urb->iso_descs;
-+	st->hs_isoc_info.nrframes = qtd->urb->packet_count;
-+	/* grab the next DMA address offset from the array */
-+	st->hcdma_copy.d32 = qtd->urb->dma;
-+	hcdma.d32 = st->hcdma_copy.d32 + st->hs_isoc_info.iso_desc[0].offset;
-+
-+	/* We need to set multi_count. This is a bit tricky - has to be set per-transaction as
-+	 * the core needs to be told to send the correct number. Caution: for IN transfers,
-+	 * this is always set to the maximum size of the endpoint. */
-+	xfer_len = st->hs_isoc_info.iso_desc[0].length;
-+	nrpackets = (xfer_len + st->hcchar_copy.b.mps - 1) / st->hcchar_copy.b.mps;
-+	if (nrpackets == 0)
-+		nrpackets = 1;
-+	st->hcchar_copy.b.multicnt = nrpackets;
-+	st->hctsiz_copy.b.pktcnt = nrpackets;
-+
-+	/* Initial PID also needs to be set */
-+	if (st->hcchar_copy.b.epdir == 0) {
-+		st->hctsiz_copy.b.xfersize = xfer_len;
-+		switch (st->hcchar_copy.b.multicnt) {
-+		case 1:
-+			st->hctsiz_copy.b.pid = DWC_PID_DATA0;
-+			break;
-+		case 2:
-+		case 3:
-+			st->hctsiz_copy.b.pid = DWC_PID_MDATA;
-+			break;
-+		}
-+
-+	} else {
-+		st->hctsiz_copy.b.xfersize = nrpackets * st->hcchar_copy.b.mps;
-+		switch (st->hcchar_copy.b.multicnt) {
-+		case 1:
-+			st->hctsiz_copy.b.pid = DWC_PID_DATA0;
-+			break;
-+		case 2:
-+			st->hctsiz_copy.b.pid = DWC_PID_DATA1;
-+			break;
-+		case 3:
-+			st->hctsiz_copy.b.pid = DWC_PID_DATA2;
-+			break;
-+		}
-+	}
-+
-+	st->hs_isoc_info.stride = qh->interval;
-+	st->uframe_sleeps = 0;
-+
-+	fiq_print(FIQDBG_INT, hcd->fiq_state, "FSMQ  %01d ", hc->hc_num);
-+	fiq_print(FIQDBG_INT, hcd->fiq_state, "%08x", st->hcchar_copy.d32);
-+	fiq_print(FIQDBG_INT, hcd->fiq_state, "%08x", st->hctsiz_copy.d32);
-+	fiq_print(FIQDBG_INT, hcd->fiq_state, "%08x", st->hcdma_copy.d32);
-+	hfnum.d32 = DWC_READ_REG32(&hcd->core_if->host_if->host_global_regs->hfnum);
-+	local_fiq_disable();
-+	fiq_fsm_spin_lock(&hcd->fiq_state->lock);
-+	DWC_WRITE_REG32(&hc_regs->hctsiz, st->hctsiz_copy.d32);
-+	DWC_WRITE_REG32(&hc_regs->hcsplt, st->hcsplt_copy.d32);
-+	DWC_WRITE_REG32(&hc_regs->hcdma, st->hcdma_copy.d32);
-+	DWC_WRITE_REG32(&hc_regs->hcchar, st->hcchar_copy.d32);
-+	DWC_WRITE_REG32(&hc_regs->hcintmsk, st->hcintmsk_copy.d32);
-+	if (hfnum.b.frrem < PERIODIC_FRREM_BACKOFF) {
-+		/* Prevent queueing near EOF1. Bad things happen if a periodic
-+		 * split transaction is queued very close to EOF. SOF interrupt handler
-+		 * will wake this channel at the next interrupt.
-+		 */
-+		st->fsm = FIQ_HS_ISOC_SLEEPING;
-+		st->uframe_sleeps = 1;
-+	} else {
-+		st->fsm = FIQ_HS_ISOC_TURBO;
-+		st->hcchar_copy.b.chen = 1;
-+		DWC_WRITE_REG32(&hc_regs->hcchar, st->hcchar_copy.d32);
-+	}
-+	mb();
-+	st->hcchar_copy.b.chen = 0;
-+	fiq_fsm_spin_unlock(&hcd->fiq_state->lock);
-+	local_fiq_enable();
-+	return 0;
-+}
-+
-+
-+/**
-+ * fiq_fsm_queue_split_transaction() - Set up a host channel and FIQ state
-+ * @hcd: Pointer to the dwc_otg_hcd struct
-+ * @qh: Pointer to the endpoint's queue head
-+ *
-+ * This overrides the dwc_otg driver's normal method of queueing a transaction.
-+ * Called from dwc_otg_hcd_queue_transactions(), this performs specific setup
-+ * for the nominated host channel.
-+ *
-+ * For periodic transfers, it also peeks at the FIQ state to see if an immediate
-+ * start is possible. If not, then the FIQ is left to start the transfer.
-+ */
-+int fiq_fsm_queue_split_transaction(dwc_otg_hcd_t *hcd, dwc_otg_qh_t *qh)
-+{
-+	int start_immediate = 1, i;
-+	hfnum_data_t hfnum;
-+	dwc_hc_t *hc = qh->channel;
-+	dwc_otg_hc_regs_t *hc_regs = hcd->core_if->host_if->hc_regs[hc->hc_num];
-+	/* Program HC registers, setup FIQ_state, examine FIQ if periodic, start transfer (not if uframe 5) */
-+	int hub_addr, port_addr, frame, uframe;
-+	struct fiq_channel_state *st = &hcd->fiq_state->channel[hc->hc_num];
-+
-+	/*
-+	 * Non-periodic channel assignments stay in the non_periodic_active queue.
-+	 * Therefore we get repeatedly called until the FIQ's done processing this channel.
-+	 */
-+	if (qh->channel->xfer_started == 1)
-+		return 0;
-+
-+	if (st->fsm != FIQ_PASSTHROUGH) {
-+		pr_warn_ratelimited("%s:%d: Queue called for an active channel\n", __func__, __LINE__);
-+		return 0;
-+	}
-+
-+	qh->channel->xfer_started = 1;
-+
-+	st->nr_errors = 0;
-+
-+	st->hcchar_copy.d32 = 0;
-+	st->hcchar_copy.b.mps = min_t(uint32_t, hc->xfer_len, hc->max_packet);
-+	st->hcchar_copy.b.epdir = hc->ep_is_in;
-+	st->hcchar_copy.b.devaddr = hc->dev_addr;
-+	st->hcchar_copy.b.epnum = hc->ep_num;
-+	st->hcchar_copy.b.eptype = hc->ep_type;
-+	if (hc->ep_type & 0x1) {
-+		if (hc->ep_is_in)
-+			st->hcchar_copy.b.multicnt = 3;
-+		else
-+			/* Docs say set this to 1, but driver sets to 0! */
-+			st->hcchar_copy.b.multicnt = 0;
-+	} else {
-+		st->hcchar_copy.b.multicnt = 1;
-+		st->hcchar_copy.b.oddfrm = 0;
-+	}
-+	st->hcchar_copy.b.lspddev = (hc->speed == DWC_OTG_EP_SPEED_LOW) ? 1 : 0;
-+	/* Enable the channel later as a final register write. */
-+
-+	st->hcsplt_copy.d32 = 0;
-+	if(qh->do_split) {
-+		hcd->fops->hub_info(hcd, DWC_CIRCLEQ_FIRST(&qh->qtd_list)->urb->priv, &hub_addr, &port_addr);
-+		st->hcsplt_copy.b.compsplt = 0;
-+		st->hcsplt_copy.b.spltena = 1;
-+		// XACTPOS is for isoc-out only but needs initialising anyway.
-+		st->hcsplt_copy.b.xactpos = ISOC_XACTPOS_ALL;
-+		if((qh->ep_type == DWC_OTG_EP_TYPE_ISOC) && (!qh->ep_is_in)) {
-+			/* For packetsize 0 < L < 188, ISOC_XACTPOS_ALL.
-+			 * for longer than this, ISOC_XACTPOS_BEGIN and the FIQ
-+			 * will update as necessary.
-+			 */
-+			if (hc->xfer_len > 188) {
-+				st->hcsplt_copy.b.xactpos = ISOC_XACTPOS_BEGIN;
-+			}
-+		}
-+		st->hcsplt_copy.b.hubaddr = (uint8_t) hub_addr;
-+		st->hcsplt_copy.b.prtaddr = (uint8_t) port_addr;
-+		st->hub_addr = hub_addr;
-+		st->port_addr = port_addr;
-+	}
-+
-+	st->hctsiz_copy.d32 = 0;
-+	st->hctsiz_copy.b.dopng = 0;
-+	st->hctsiz_copy.b.pid = hc->data_pid_start;
-+
-+	if (hc->ep_is_in || (hc->xfer_len > hc->max_packet)) {
-+		hc->xfer_len = min_t(uint32_t, hc->xfer_len, hc->max_packet);
-+	} else if (!hc->ep_is_in && (hc->xfer_len > 188)) {
-+		hc->xfer_len = 188;
-+	}
-+	st->hctsiz_copy.b.xfersize = hc->xfer_len;
-+
-+	st->hctsiz_copy.b.pktcnt = 1;
-+
-+	if (hc->ep_type & 0x1) {
-+		/*
-+		 * For potentially multi-packet transfers, must use the DMA bounce buffers. For IN transfers,
-+		 * the DMA address is the address of the first 188byte slot buffer in the bounce buffer array.
-+		 * For multi-packet OUT transfers, we need to copy the data into the bounce buffer array so the FIQ can punt
-+		 * the right address out as necessary. hc->xfer_buff and hc->xfer_len have already been set
-+		 * in assign_and_init_hc(), but this is for the eventual transaction completion only. The FIQ
-+		 * must not touch internal driver state.
-+		 */
-+		if(!fiq_fsm_setup_periodic_dma(hcd, st, qh)) {
-+			if (hc->align_buff) {
-+				st->hcdma_copy.d32 = hc->align_buff;
-+			} else {
-+				st->hcdma_copy.d32 = ((unsigned long) hc->xfer_buff & 0xFFFFFFFF);
-+			}
-+		}
-+	} else {
-+		if (hc->align_buff) {
-+			st->hcdma_copy.d32 = hc->align_buff;
-+		} else {
-+			st->hcdma_copy.d32 = ((unsigned long) hc->xfer_buff & 0xFFFFFFFF);
-+		}
-+	}
-+	/* The FIQ depends upon no other interrupts being enabled except channel halt.
-+	 * Fixup channel interrupt mask. */
-+	st->hcintmsk_copy.d32 = 0;
-+	st->hcintmsk_copy.b.chhltd = 1;
-+	st->hcintmsk_copy.b.ahberr = 1;
-+
-+	/* Hack courtesy of FreeBSD: apparently forcing Interrupt Split transactions
-+	 * as Control puts the transfer into the non-periodic request queue and the
-+	 * non-periodic handler in the hub. Makes things lots easier.
-+	 */
-+	if ((fiq_fsm_mask & 0x8) && hc->ep_type == UE_INTERRUPT) {
-+		st->hcchar_copy.b.multicnt = 0;
-+		st->hcchar_copy.b.oddfrm = 0;
-+		st->hcchar_copy.b.eptype = UE_CONTROL;
-+		if (hc->align_buff) {
-+			st->hcdma_copy.d32 = hc->align_buff;
-+		} else {
-+			st->hcdma_copy.d32 = ((unsigned long) hc->xfer_buff & 0xFFFFFFFF);
-+		}
-+	}
-+	DWC_WRITE_REG32(&hc_regs->hcdma, st->hcdma_copy.d32);
-+	DWC_WRITE_REG32(&hc_regs->hctsiz, st->hctsiz_copy.d32);
-+	DWC_WRITE_REG32(&hc_regs->hcsplt, st->hcsplt_copy.d32);
-+	DWC_WRITE_REG32(&hc_regs->hcchar, st->hcchar_copy.d32);
-+	DWC_WRITE_REG32(&hc_regs->hcintmsk, st->hcintmsk_copy.d32);
-+
-+	local_fiq_disable();
-+	fiq_fsm_spin_lock(&hcd->fiq_state->lock);
-+
-+	if (hc->ep_type & 0x1) {
-+		hfnum.d32 = DWC_READ_REG32(&hcd->core_if->host_if->host_global_regs->hfnum);
-+		frame = (hfnum.b.frnum & ~0x7) >> 3;
-+		uframe = hfnum.b.frnum & 0x7;
-+		if (hfnum.b.frrem < PERIODIC_FRREM_BACKOFF) {
-+			/* Prevent queueing near EOF1. Bad things happen if a periodic
-+			 * split transaction is queued very close to EOF.
-+			 */
-+			start_immediate = 0;
-+		} else if (uframe == 5) {
-+			start_immediate = 0;
-+		} else if (hc->ep_type == UE_ISOCHRONOUS && !hc->ep_is_in) {
-+			start_immediate = 0;
-+		} else if (hc->ep_is_in && fiq_fsm_too_late(hcd->fiq_state, hc->hc_num)) {
-+			start_immediate = 0;
-+		} else {
-+			/* Search through all host channels to determine if a transaction
-+			 * is currently in progress */
-+			for (i = 0; i < hcd->core_if->core_params->host_channels; i++) {
-+				if (i == hc->hc_num || hcd->fiq_state->channel[i].fsm == FIQ_PASSTHROUGH)
-+					continue;
-+				switch (hcd->fiq_state->channel[i].fsm) {
-+				/* TT is reserved for channels that are in the middle of a periodic
-+				 * split transaction.
-+				 */
-+				case FIQ_PER_SSPLIT_STARTED:
-+				case FIQ_PER_CSPLIT_WAIT:
-+				case FIQ_PER_CSPLIT_NYET1:
-+				case FIQ_PER_CSPLIT_POLL:
-+				case FIQ_PER_ISO_OUT_ACTIVE:
-+				case FIQ_PER_ISO_OUT_LAST:
-+					if (hcd->fiq_state->channel[i].hub_addr == hub_addr &&
-+							hcd->fiq_state->channel[i].port_addr == port_addr) {
-+						start_immediate = 0;
-+					}
-+					break;
-+				default:
-+					break;
-+				}
-+				if (!start_immediate)
-+					break;
-+			}
-+		}
-+	}
-+	if ((fiq_fsm_mask & 0x8) && hc->ep_type == UE_INTERRUPT)
-+		start_immediate = 1;
-+
-+	fiq_print(FIQDBG_INT, hcd->fiq_state, "FSMQ %01d %01d", hc->hc_num, start_immediate);
-+	fiq_print(FIQDBG_INT, hcd->fiq_state, "%08d", hfnum.b.frrem);
-+	//fiq_print(FIQDBG_INT, hcd->fiq_state, "H:%02dP:%02d", hub_addr, port_addr);
-+	//fiq_print(FIQDBG_INT, hcd->fiq_state, "%08x", st->hctsiz_copy.d32);
-+	//fiq_print(FIQDBG_INT, hcd->fiq_state, "%08x", st->hcdma_copy.d32);
-+	switch (hc->ep_type) {
-+		case UE_CONTROL:
-+		case UE_BULK:
-+			if (fiq_fsm_np_tt_contended(hcd, qh)) {
-+				st->fsm = FIQ_NP_SSPLIT_PENDING;
-+				start_immediate = 0;
-+			} else {
-+				st->fsm = FIQ_NP_SSPLIT_STARTED;
-+			}
-+			break;
-+		case UE_ISOCHRONOUS:
-+			if (hc->ep_is_in) {
-+				if (start_immediate) {
-+					st->fsm = FIQ_PER_SSPLIT_STARTED;
-+				} else {
-+					st->fsm = FIQ_PER_SSPLIT_QUEUED;
-+				}
-+			} else {
-+				if (start_immediate) {
-+					/* Single-isoc OUT packets don't require FIQ involvement */
-+					if (st->nrpackets == 1) {
-+						st->fsm = FIQ_PER_ISO_OUT_LAST;
-+					} else {
-+						st->fsm = FIQ_PER_ISO_OUT_ACTIVE;
-+					}
-+				} else {
-+					st->fsm = FIQ_PER_ISO_OUT_PENDING;
-+				}
-+			}
-+			break;
-+		case UE_INTERRUPT:
-+			if (fiq_fsm_mask & 0x8) {
-+				if (fiq_fsm_np_tt_contended(hcd, qh)) {
-+					st->fsm = FIQ_NP_SSPLIT_PENDING;
-+					start_immediate = 0;
-+				} else {
-+					st->fsm = FIQ_NP_SSPLIT_STARTED;
-+				}
-+			} else if (start_immediate) {
-+					st->fsm = FIQ_PER_SSPLIT_STARTED;
-+			} else {
-+				st->fsm = FIQ_PER_SSPLIT_QUEUED;
-+			}
-+		default:
-+			break;
-+	}
-+	if (start_immediate) {
-+		/* Set the oddfrm bit as close as possible to actual queueing */
-+		frame = dwc_otg_hcd_get_frame_number(hcd);
-+		st->expected_uframe = (frame + 1) & 0x3FFF;
-+		st->hcchar_copy.b.oddfrm = (frame & 0x1) ? 0 : 1;
-+		st->hcchar_copy.b.chen = 1;
-+		DWC_WRITE_REG32(&hc_regs->hcchar, st->hcchar_copy.d32);
-+	}
-+	mb();
-+	fiq_fsm_spin_unlock(&hcd->fiq_state->lock);
-+	local_fiq_enable();
-+	return 0;
-+}
-+
-+
-+/**
-+ * This function selects transactions from the HCD transfer schedule and
-+ * assigns them to available host channels. It is called from HCD interrupt
-+ * handler functions.
-+ *
-+ * @param hcd The HCD state structure.
-+ *
-+ * @return The types of new transactions that were assigned to host channels.
-+ */
-+dwc_otg_transaction_type_e dwc_otg_hcd_select_transactions(dwc_otg_hcd_t * hcd)
-+{
-+	dwc_list_link_t *qh_ptr;
-+	dwc_otg_qh_t *qh;
-+	int num_channels;
-+	dwc_otg_transaction_type_e ret_val = DWC_OTG_TRANSACTION_NONE;
-+
-+#ifdef DEBUG_HOST_CHANNELS
-+	last_sel_trans_num_per_scheduled = 0;
-+	last_sel_trans_num_nonper_scheduled = 0;
-+	last_sel_trans_num_avail_hc_at_start = hcd->available_host_channels;
-+#endif /* DEBUG_HOST_CHANNELS */
-+
-+	/* Process entries in the periodic ready list. */
-+	qh_ptr = DWC_LIST_FIRST(&hcd->periodic_sched_ready);
-+
-+	while (qh_ptr != &hcd->periodic_sched_ready &&
-+	       !DWC_CIRCLEQ_EMPTY(&hcd->free_hc_list)) {
-+
-+		qh = DWC_LIST_ENTRY(qh_ptr, dwc_otg_qh_t, qh_list_entry);
-+
-+		if (microframe_schedule) {
-+			// Make sure we leave one channel for non periodic transactions.
-+			if (hcd->available_host_channels <= 1) {
-+				break;
-+			}
-+			hcd->available_host_channels--;
-+#ifdef DEBUG_HOST_CHANNELS
-+			last_sel_trans_num_per_scheduled++;
-+#endif /* DEBUG_HOST_CHANNELS */
-+		}
-+		qh = DWC_LIST_ENTRY(qh_ptr, dwc_otg_qh_t, qh_list_entry);
-+		assign_and_init_hc(hcd, qh);
-+
-+		/*
-+		 * Move the QH from the periodic ready schedule to the
-+		 * periodic assigned schedule.
-+		 */
-+		qh_ptr = DWC_LIST_NEXT(qh_ptr);
-+		DWC_LIST_MOVE_HEAD(&hcd->periodic_sched_assigned,
-+				   &qh->qh_list_entry);
-+	}
-+
-+	/*
-+	 * Process entries in the inactive portion of the non-periodic
-+	 * schedule. Some free host channels may not be used if they are
-+	 * reserved for periodic transfers.
-+	 */
-+	qh_ptr = hcd->non_periodic_sched_inactive.next;
-+	num_channels = hcd->core_if->core_params->host_channels;
-+	while (qh_ptr != &hcd->non_periodic_sched_inactive &&
-+	       (microframe_schedule || hcd->non_periodic_channels <
-+		num_channels - hcd->periodic_channels) &&
-+	       !DWC_CIRCLEQ_EMPTY(&hcd->free_hc_list)) {
-+
-+		qh = DWC_LIST_ENTRY(qh_ptr, dwc_otg_qh_t, qh_list_entry);
-+		/*
-+		 * Check to see if this is a NAK'd retransmit, in which case ignore for retransmission
-+		 * we hold off on bulk retransmissions to reduce NAK interrupt overhead for full-speed
-+		 * cheeky devices that just hold off using NAKs
-+		 */
-+		if (fiq_enable && nak_holdoff && qh->do_split) {
-+			if (qh->nak_frame != 0xffff) {
-+				uint16_t next_frame = dwc_frame_num_inc(qh->nak_frame, (qh->ep_type == UE_BULK) ? nak_holdoff : 8);
-+				uint16_t frame = dwc_otg_hcd_get_frame_number(hcd);
-+				if (dwc_frame_num_le(frame, next_frame)) {
-+					if(dwc_frame_num_le(next_frame, hcd->fiq_state->next_sched_frame)) {
-+						hcd->fiq_state->next_sched_frame = next_frame;
-+					}
-+					qh_ptr = DWC_LIST_NEXT(qh_ptr);
-+					continue;
-+				} else {
-+					qh->nak_frame = 0xFFFF;
-+				}
-+			}
-+		}
-+
-+		if (microframe_schedule) {
-+				if (hcd->available_host_channels < 1) {
-+					break;
-+				}
-+				hcd->available_host_channels--;
-+#ifdef DEBUG_HOST_CHANNELS
-+				last_sel_trans_num_nonper_scheduled++;
-+#endif /* DEBUG_HOST_CHANNELS */
-+		}
-+
-+		assign_and_init_hc(hcd, qh);
-+
-+		/*
-+		 * Move the QH from the non-periodic inactive schedule to the
-+		 * non-periodic active schedule.
-+		 */
-+		qh_ptr = DWC_LIST_NEXT(qh_ptr);
-+		DWC_LIST_MOVE_HEAD(&hcd->non_periodic_sched_active,
-+				   &qh->qh_list_entry);
-+
-+		if (!microframe_schedule)
-+			hcd->non_periodic_channels++;
-+	}
-+	/* we moved a non-periodic QH to the active schedule. If the inactive queue is empty,
-+	 * stop the FIQ from kicking us. We could potentially still have elements here if we
-+	 * ran out of host channels.
-+	 */
-+	if (fiq_enable) {
-+		if (DWC_LIST_EMPTY(&hcd->non_periodic_sched_inactive)) {
-+			hcd->fiq_state->kick_np_queues = 0;
-+		} else {
-+			/* For each entry remaining in the NP inactive queue,
-+			* if this a NAK'd retransmit then don't set the kick flag.
-+			*/
-+			if(nak_holdoff) {
-+				DWC_LIST_FOREACH(qh_ptr, &hcd->non_periodic_sched_inactive) {
-+					qh = DWC_LIST_ENTRY(qh_ptr, dwc_otg_qh_t, qh_list_entry);
-+					if (qh->nak_frame == 0xFFFF) {
-+						hcd->fiq_state->kick_np_queues = 1;
-+					}
-+				}
-+			}
-+		}
-+	}
-+	if(!DWC_LIST_EMPTY(&hcd->periodic_sched_assigned))
-+		ret_val |= DWC_OTG_TRANSACTION_PERIODIC;
-+
-+	if(!DWC_LIST_EMPTY(&hcd->non_periodic_sched_active))
-+		ret_val |= DWC_OTG_TRANSACTION_NON_PERIODIC;
-+
-+
-+#ifdef DEBUG_HOST_CHANNELS
-+	last_sel_trans_num_avail_hc_at_end = hcd->available_host_channels;
-+#endif /* DEBUG_HOST_CHANNELS */
-+	return ret_val;
-+}
-+
-+/**
-+ * Attempts to queue a single transaction request for a host channel
-+ * associated with either a periodic or non-periodic transfer. This function
-+ * assumes that there is space available in the appropriate request queue. For
-+ * an OUT transfer or SETUP transaction in Slave mode, it checks whether space
-+ * is available in the appropriate Tx FIFO.
-+ *
-+ * @param hcd The HCD state structure.
-+ * @param hc Host channel descriptor associated with either a periodic or
-+ * non-periodic transfer.
-+ * @param fifo_dwords_avail Number of DWORDs available in the periodic Tx
-+ * FIFO for periodic transfers or the non-periodic Tx FIFO for non-periodic
-+ * transfers.
-+ *
-+ * @return 1 if a request is queued and more requests may be needed to
-+ * complete the transfer, 0 if no more requests are required for this
-+ * transfer, -1 if there is insufficient space in the Tx FIFO.
-+ */
-+static int queue_transaction(dwc_otg_hcd_t * hcd,
-+			     dwc_hc_t * hc, uint16_t fifo_dwords_avail)
-+{
-+	int retval;
-+
-+	if (hcd->core_if->dma_enable) {
-+		if (hcd->core_if->dma_desc_enable) {
-+			if (!hc->xfer_started
-+			    || (hc->ep_type == DWC_OTG_EP_TYPE_ISOC)) {
-+				dwc_otg_hcd_start_xfer_ddma(hcd, hc->qh);
-+				hc->qh->ping_state = 0;
-+			}
-+		} else if (!hc->xfer_started) {
-+			if (fiq_fsm_enable && hc->error_state) {
-+				hcd->fiq_state->channel[hc->hc_num].nr_errors =
-+					DWC_CIRCLEQ_FIRST(&hc->qh->qtd_list)->error_count;
-+				hcd->fiq_state->channel[hc->hc_num].fsm =
-+					FIQ_PASSTHROUGH_ERRORSTATE;
-+			}
-+			dwc_otg_hc_start_transfer(hcd->core_if, hc);
-+			hc->qh->ping_state = 0;
-+		}
-+		retval = 0;
-+	} else if (hc->halt_pending) {
-+		/* Don't queue a request if the channel has been halted. */
-+		retval = 0;
-+	} else if (hc->halt_on_queue) {
-+		dwc_otg_hc_halt(hcd->core_if, hc, hc->halt_status);
-+		retval = 0;
-+	} else if (hc->do_ping) {
-+		if (!hc->xfer_started) {
-+			dwc_otg_hc_start_transfer(hcd->core_if, hc);
-+		}
-+		retval = 0;
-+	} else if (!hc->ep_is_in || hc->data_pid_start == DWC_OTG_HC_PID_SETUP) {
-+		if ((fifo_dwords_avail * 4) >= hc->max_packet) {
-+			if (!hc->xfer_started) {
-+				dwc_otg_hc_start_transfer(hcd->core_if, hc);
-+				retval = 1;
-+			} else {
-+				retval =
-+				    dwc_otg_hc_continue_transfer(hcd->core_if,
-+								 hc);
-+			}
-+		} else {
-+			retval = -1;
-+		}
-+	} else {
-+		if (!hc->xfer_started) {
-+			dwc_otg_hc_start_transfer(hcd->core_if, hc);
-+			retval = 1;
-+		} else {
-+			retval = dwc_otg_hc_continue_transfer(hcd->core_if, hc);
-+		}
-+	}
-+
-+	return retval;
-+}
-+
-+/**
-+ * Processes periodic channels for the next frame and queues transactions for
-+ * these channels to the DWC_otg controller. After queueing transactions, the
-+ * Periodic Tx FIFO Empty interrupt is enabled if there are more transactions
-+ * to queue as Periodic Tx FIFO or request queue space becomes available.
-+ * Otherwise, the Periodic Tx FIFO Empty interrupt is disabled.
-+ */
-+static void process_periodic_channels(dwc_otg_hcd_t * hcd)
-+{
-+	hptxsts_data_t tx_status;
-+	dwc_list_link_t *qh_ptr;
-+	dwc_otg_qh_t *qh;
-+	int status = 0;
-+	int no_queue_space = 0;
-+	int no_fifo_space = 0;
-+
-+	dwc_otg_host_global_regs_t *host_regs;
-+	host_regs = hcd->core_if->host_if->host_global_regs;
-+
-+	DWC_DEBUGPL(DBG_HCDV, "Queue periodic transactions\n");
-+#ifdef DEBUG
-+	tx_status.d32 = DWC_READ_REG32(&host_regs->hptxsts);
-+	DWC_DEBUGPL(DBG_HCDV,
-+		    "  P Tx Req Queue Space Avail (before queue): %d\n",
-+		    tx_status.b.ptxqspcavail);
-+	DWC_DEBUGPL(DBG_HCDV, "  P Tx FIFO Space Avail (before queue): %d\n",
-+		    tx_status.b.ptxfspcavail);
-+#endif
-+
-+	qh_ptr = hcd->periodic_sched_assigned.next;
-+	while (qh_ptr != &hcd->periodic_sched_assigned) {
-+		tx_status.d32 = DWC_READ_REG32(&host_regs->hptxsts);
-+		if (tx_status.b.ptxqspcavail == 0) {
-+			no_queue_space = 1;
-+			break;
-+		}
-+
-+		qh = DWC_LIST_ENTRY(qh_ptr, dwc_otg_qh_t, qh_list_entry);
-+
-+		// Do not send a split start transaction any later than frame .6
-+		// Note, we have to schedule a periodic in .5 to make it go in .6
-+		if(fiq_fsm_enable && qh->do_split && ((dwc_otg_hcd_get_frame_number(hcd) + 1) & 7) > 6)
-+		{
-+			qh_ptr = qh_ptr->next;
-+			hcd->fiq_state->next_sched_frame = dwc_otg_hcd_get_frame_number(hcd) | 7;
-+			continue;
-+		}
-+
-+		if (fiq_fsm_enable && fiq_fsm_transaction_suitable(hcd, qh)) {
-+			if (qh->do_split)
-+				fiq_fsm_queue_split_transaction(hcd, qh);
-+			else
-+				fiq_fsm_queue_isoc_transaction(hcd, qh);
-+		} else {
-+
-+			/*
-+			 * Set a flag if we're queueing high-bandwidth in slave mode.
-+			 * The flag prevents any halts to get into the request queue in
-+			 * the middle of multiple high-bandwidth packets getting queued.
-+			 */
-+			if (!hcd->core_if->dma_enable && qh->channel->multi_count > 1) {
-+				hcd->core_if->queuing_high_bandwidth = 1;
-+			}
-+			status = queue_transaction(hcd, qh->channel,
-+							tx_status.b.ptxfspcavail);
-+			if (status < 0) {
-+				no_fifo_space = 1;
-+				break;
-+			}
-+		}
-+
-+		/*
-+		 * In Slave mode, stay on the current transfer until there is
-+		 * nothing more to do or the high-bandwidth request count is
-+		 * reached. In DMA mode, only need to queue one request. The
-+		 * controller automatically handles multiple packets for
-+		 * high-bandwidth transfers.
-+		 */
-+		if (hcd->core_if->dma_enable || status == 0 ||
-+		    qh->channel->requests == qh->channel->multi_count) {
-+			qh_ptr = qh_ptr->next;
-+			/*
-+			 * Move the QH from the periodic assigned schedule to
-+			 * the periodic queued schedule.
-+			 */
-+			DWC_LIST_MOVE_HEAD(&hcd->periodic_sched_queued,
-+					   &qh->qh_list_entry);
-+
-+			/* done queuing high bandwidth */
-+			hcd->core_if->queuing_high_bandwidth = 0;
-+		}
-+	}
-+
-+	if (!hcd->core_if->dma_enable) {
-+		dwc_otg_core_global_regs_t *global_regs;
-+		gintmsk_data_t intr_mask = {.d32 = 0 };
-+
-+		global_regs = hcd->core_if->core_global_regs;
-+		intr_mask.b.ptxfempty = 1;
-+#ifdef DEBUG
-+		tx_status.d32 = DWC_READ_REG32(&host_regs->hptxsts);
-+		DWC_DEBUGPL(DBG_HCDV,
-+			    "  P Tx Req Queue Space Avail (after queue): %d\n",
-+			    tx_status.b.ptxqspcavail);
-+		DWC_DEBUGPL(DBG_HCDV,
-+			    "  P Tx FIFO Space Avail (after queue): %d\n",
-+			    tx_status.b.ptxfspcavail);
-+#endif
-+		if (!DWC_LIST_EMPTY(&hcd->periodic_sched_assigned) ||
-+		    no_queue_space || no_fifo_space) {
-+			/*
-+			 * May need to queue more transactions as the request
-+			 * queue or Tx FIFO empties. Enable the periodic Tx
-+			 * FIFO empty interrupt. (Always use the half-empty
-+			 * level to ensure that new requests are loaded as
-+			 * soon as possible.)
-+			 */
-+			DWC_MODIFY_REG32(&global_regs->gintmsk, 0,
-+					 intr_mask.d32);
-+		} else {
-+			/*
-+			 * Disable the Tx FIFO empty interrupt since there are
-+			 * no more transactions that need to be queued right
-+			 * now. This function is called from interrupt
-+			 * handlers to queue more transactions as transfer
-+			 * states change.
-+			 */
-+			DWC_MODIFY_REG32(&global_regs->gintmsk, intr_mask.d32,
-+					 0);
-+		}
-+	}
-+}
-+
-+/**
-+ * Processes active non-periodic channels and queues transactions for these
-+ * channels to the DWC_otg controller. After queueing transactions, the NP Tx
-+ * FIFO Empty interrupt is enabled if there are more transactions to queue as
-+ * NP Tx FIFO or request queue space becomes available. Otherwise, the NP Tx
-+ * FIFO Empty interrupt is disabled.
-+ */
-+static void process_non_periodic_channels(dwc_otg_hcd_t * hcd)
-+{
-+	gnptxsts_data_t tx_status;
-+	dwc_list_link_t *orig_qh_ptr;
-+	dwc_otg_qh_t *qh;
-+	int status;
-+	int no_queue_space = 0;
-+	int no_fifo_space = 0;
-+	int more_to_do = 0;
-+
-+	dwc_otg_core_global_regs_t *global_regs =
-+	    hcd->core_if->core_global_regs;
-+
-+	DWC_DEBUGPL(DBG_HCDV, "Queue non-periodic transactions\n");
-+#ifdef DEBUG
-+	tx_status.d32 = DWC_READ_REG32(&global_regs->gnptxsts);
-+	DWC_DEBUGPL(DBG_HCDV,
-+		    "  NP Tx Req Queue Space Avail (before queue): %d\n",
-+		    tx_status.b.nptxqspcavail);
-+	DWC_DEBUGPL(DBG_HCDV, "  NP Tx FIFO Space Avail (before queue): %d\n",
-+		    tx_status.b.nptxfspcavail);
-+#endif
-+	/*
-+	 * Keep track of the starting point. Skip over the start-of-list
-+	 * entry.
-+	 */
-+	if (hcd->non_periodic_qh_ptr == &hcd->non_periodic_sched_active) {
-+		hcd->non_periodic_qh_ptr = hcd->non_periodic_qh_ptr->next;
-+	}
-+	orig_qh_ptr = hcd->non_periodic_qh_ptr;
-+
-+	/*
-+	 * Process once through the active list or until no more space is
-+	 * available in the request queue or the Tx FIFO.
-+	 */
-+	do {
-+		tx_status.d32 = DWC_READ_REG32(&global_regs->gnptxsts);
-+		if (!hcd->core_if->dma_enable && tx_status.b.nptxqspcavail == 0) {
-+			no_queue_space = 1;
-+			break;
-+		}
-+
-+		qh = DWC_LIST_ENTRY(hcd->non_periodic_qh_ptr, dwc_otg_qh_t,
-+				    qh_list_entry);
-+
-+		if(fiq_fsm_enable && fiq_fsm_transaction_suitable(hcd, qh)) {
-+			fiq_fsm_queue_split_transaction(hcd, qh);
-+		} else {
-+			status = queue_transaction(hcd, qh->channel,
-+						tx_status.b.nptxfspcavail);
-+
-+			if (status > 0) {
-+				more_to_do = 1;
-+			} else if (status < 0) {
-+				no_fifo_space = 1;
-+				break;
-+			}
-+		}
-+		/* Advance to next QH, skipping start-of-list entry. */
-+		hcd->non_periodic_qh_ptr = hcd->non_periodic_qh_ptr->next;
-+		if (hcd->non_periodic_qh_ptr == &hcd->non_periodic_sched_active) {
-+			hcd->non_periodic_qh_ptr =
-+			    hcd->non_periodic_qh_ptr->next;
-+		}
-+
-+	} while (hcd->non_periodic_qh_ptr != orig_qh_ptr);
-+
-+	if (!hcd->core_if->dma_enable) {
-+		gintmsk_data_t intr_mask = {.d32 = 0 };
-+		intr_mask.b.nptxfempty = 1;
-+
-+#ifdef DEBUG
-+		tx_status.d32 = DWC_READ_REG32(&global_regs->gnptxsts);
-+		DWC_DEBUGPL(DBG_HCDV,
-+			    "  NP Tx Req Queue Space Avail (after queue): %d\n",
-+			    tx_status.b.nptxqspcavail);
-+		DWC_DEBUGPL(DBG_HCDV,
-+			    "  NP Tx FIFO Space Avail (after queue): %d\n",
-+			    tx_status.b.nptxfspcavail);
-+#endif
-+		if (more_to_do || no_queue_space || no_fifo_space) {
-+			/*
-+			 * May need to queue more transactions as the request
-+			 * queue or Tx FIFO empties. Enable the non-periodic
-+			 * Tx FIFO empty interrupt. (Always use the half-empty
-+			 * level to ensure that new requests are loaded as
-+			 * soon as possible.)
-+			 */
-+			DWC_MODIFY_REG32(&global_regs->gintmsk, 0,
-+					 intr_mask.d32);
-+		} else {
-+			/*
-+			 * Disable the Tx FIFO empty interrupt since there are
-+			 * no more transactions that need to be queued right
-+			 * now. This function is called from interrupt
-+			 * handlers to queue more transactions as transfer
-+			 * states change.
-+			 */
-+			DWC_MODIFY_REG32(&global_regs->gintmsk, intr_mask.d32,
-+					 0);
-+		}
-+	}
-+}
-+
-+/**
-+ * This function processes the currently active host channels and queues
-+ * transactions for these channels to the DWC_otg controller. It is called
-+ * from HCD interrupt handler functions.
-+ *
-+ * @param hcd The HCD state structure.
-+ * @param tr_type The type(s) of transactions to queue (non-periodic,
-+ * periodic, or both).
-+ */
-+void dwc_otg_hcd_queue_transactions(dwc_otg_hcd_t * hcd,
-+				    dwc_otg_transaction_type_e tr_type)
-+{
-+#ifdef DEBUG_SOF
-+	DWC_DEBUGPL(DBG_HCD, "Queue Transactions\n");
-+#endif
-+	/* Process host channels associated with periodic transfers. */
-+	if ((tr_type == DWC_OTG_TRANSACTION_PERIODIC ||
-+	     tr_type == DWC_OTG_TRANSACTION_ALL) &&
-+	    !DWC_LIST_EMPTY(&hcd->periodic_sched_assigned)) {
-+
-+		process_periodic_channels(hcd);
-+	}
-+
-+	/* Process host channels associated with non-periodic transfers. */
-+	if (tr_type == DWC_OTG_TRANSACTION_NON_PERIODIC ||
-+	    tr_type == DWC_OTG_TRANSACTION_ALL) {
-+		if (!DWC_LIST_EMPTY(&hcd->non_periodic_sched_active)) {
-+			process_non_periodic_channels(hcd);
-+		} else {
-+			/*
-+			 * Ensure NP Tx FIFO empty interrupt is disabled when
-+			 * there are no non-periodic transfers to process.
-+			 */
-+			gintmsk_data_t gintmsk = {.d32 = 0 };
-+			gintmsk.b.nptxfempty = 1;
-+
-+			if (fiq_enable) {
-+				local_fiq_disable();
-+				fiq_fsm_spin_lock(&hcd->fiq_state->lock);
-+				DWC_MODIFY_REG32(&hcd->core_if->core_global_regs->gintmsk, gintmsk.d32, 0);
-+				fiq_fsm_spin_unlock(&hcd->fiq_state->lock);
-+				local_fiq_enable();
-+			} else {
-+				DWC_MODIFY_REG32(&hcd->core_if->core_global_regs->gintmsk, gintmsk.d32, 0);
-+			}
-+		}
-+	}
-+}
-+
-+#ifdef DWC_HS_ELECT_TST
-+/*
-+ * Quick and dirty hack to implement the HS Electrical Test
-+ * SINGLE_STEP_GET_DEVICE_DESCRIPTOR feature.
-+ *
-+ * This code was copied from our userspace app "hset". It sends a
-+ * Get Device Descriptor control sequence in two parts, first the
-+ * Setup packet by itself, followed some time later by the In and
-+ * Ack packets. Rather than trying to figure out how to add this
-+ * functionality to the normal driver code, we just hijack the
-+ * hardware, using these two function to drive the hardware
-+ * directly.
-+ */
-+
-+static dwc_otg_core_global_regs_t *global_regs;
-+static dwc_otg_host_global_regs_t *hc_global_regs;
-+static dwc_otg_hc_regs_t *hc_regs;
-+static uint32_t *data_fifo;
-+
-+static void do_setup(void)
-+{
-+	gintsts_data_t gintsts;
-+	hctsiz_data_t hctsiz;
-+	hcchar_data_t hcchar;
-+	haint_data_t haint;
-+	hcint_data_t hcint;
-+
-+	/* Enable HAINTs */
-+	DWC_WRITE_REG32(&hc_global_regs->haintmsk, 0x0001);
-+
-+	/* Enable HCINTs */
-+	DWC_WRITE_REG32(&hc_regs->hcintmsk, 0x04a3);
-+
-+	/* Read GINTSTS */
-+	gintsts.d32 = DWC_READ_REG32(&global_regs->gintsts);
-+
-+	/* Read HAINT */
-+	haint.d32 = DWC_READ_REG32(&hc_global_regs->haint);
-+
-+	/* Read HCINT */
-+	hcint.d32 = DWC_READ_REG32(&hc_regs->hcint);
-+
-+	/* Read HCCHAR */
-+	hcchar.d32 = DWC_READ_REG32(&hc_regs->hcchar);
-+
-+	/* Clear HCINT */
-+	DWC_WRITE_REG32(&hc_regs->hcint, hcint.d32);
-+
-+	/* Clear HAINT */
-+	DWC_WRITE_REG32(&hc_global_regs->haint, haint.d32);
-+
-+	/* Clear GINTSTS */
-+	DWC_WRITE_REG32(&global_regs->gintsts, gintsts.d32);
-+
-+	/* Read GINTSTS */
-+	gintsts.d32 = DWC_READ_REG32(&global_regs->gintsts);
-+
-+	/*
-+	 * Send Setup packet (Get Device Descriptor)
-+	 */
-+
-+	/* Make sure channel is disabled */
-+	hcchar.d32 = DWC_READ_REG32(&hc_regs->hcchar);
-+	if (hcchar.b.chen) {
-+		hcchar.b.chdis = 1;
-+//              hcchar.b.chen = 1;
-+		DWC_WRITE_REG32(&hc_regs->hcchar, hcchar.d32);
-+		//sleep(1);
-+		dwc_mdelay(1000);
-+
-+		/* Read GINTSTS */
-+		gintsts.d32 = DWC_READ_REG32(&global_regs->gintsts);
-+
-+		/* Read HAINT */
-+		haint.d32 = DWC_READ_REG32(&hc_global_regs->haint);
-+
-+		/* Read HCINT */
-+		hcint.d32 = DWC_READ_REG32(&hc_regs->hcint);
-+
-+		/* Read HCCHAR */
-+		hcchar.d32 = DWC_READ_REG32(&hc_regs->hcchar);
-+
-+		/* Clear HCINT */
-+		DWC_WRITE_REG32(&hc_regs->hcint, hcint.d32);
-+
-+		/* Clear HAINT */
-+		DWC_WRITE_REG32(&hc_global_regs->haint, haint.d32);
-+
-+		/* Clear GINTSTS */
-+		DWC_WRITE_REG32(&global_regs->gintsts, gintsts.d32);
-+
-+		hcchar.d32 = DWC_READ_REG32(&hc_regs->hcchar);
-+	}
-+
-+	/* Set HCTSIZ */
-+	hctsiz.d32 = 0;
-+	hctsiz.b.xfersize = 8;
-+	hctsiz.b.pktcnt = 1;
-+	hctsiz.b.pid = DWC_OTG_HC_PID_SETUP;
-+	DWC_WRITE_REG32(&hc_regs->hctsiz, hctsiz.d32);
-+
-+	/* Set HCCHAR */
-+	hcchar.d32 = DWC_READ_REG32(&hc_regs->hcchar);
-+	hcchar.b.eptype = DWC_OTG_EP_TYPE_CONTROL;
-+	hcchar.b.epdir = 0;
-+	hcchar.b.epnum = 0;
-+	hcchar.b.mps = 8;
-+	hcchar.b.chen = 1;
-+	DWC_WRITE_REG32(&hc_regs->hcchar, hcchar.d32);
-+
-+	/* Fill FIFO with Setup data for Get Device Descriptor */
-+	data_fifo = (uint32_t *) ((char *)global_regs + 0x1000);
-+	DWC_WRITE_REG32(data_fifo++, 0x01000680);
-+	DWC_WRITE_REG32(data_fifo++, 0x00080000);
-+
-+	gintsts.d32 = DWC_READ_REG32(&global_regs->gintsts);
-+
-+	/* Wait for host channel interrupt */
-+	do {
-+		gintsts.d32 = DWC_READ_REG32(&global_regs->gintsts);
-+	} while (gintsts.b.hcintr == 0);
-+
-+	/* Disable HCINTs */
-+	DWC_WRITE_REG32(&hc_regs->hcintmsk, 0x0000);
-+
-+	/* Disable HAINTs */
-+	DWC_WRITE_REG32(&hc_global_regs->haintmsk, 0x0000);
-+
-+	/* Read HAINT */
-+	haint.d32 = DWC_READ_REG32(&hc_global_regs->haint);
-+
-+	/* Read HCINT */
-+	hcint.d32 = DWC_READ_REG32(&hc_regs->hcint);
-+
-+	/* Read HCCHAR */
-+	hcchar.d32 = DWC_READ_REG32(&hc_regs->hcchar);
-+
-+	/* Clear HCINT */
-+	DWC_WRITE_REG32(&hc_regs->hcint, hcint.d32);
-+
-+	/* Clear HAINT */
-+	DWC_WRITE_REG32(&hc_global_regs->haint, haint.d32);
-+
-+	/* Clear GINTSTS */
-+	DWC_WRITE_REG32(&global_regs->gintsts, gintsts.d32);
-+
-+	/* Read GINTSTS */
-+	gintsts.d32 = DWC_READ_REG32(&global_regs->gintsts);
-+}
-+
-+static void do_in_ack(void)
-+{
-+	gintsts_data_t gintsts;
-+	hctsiz_data_t hctsiz;
-+	hcchar_data_t hcchar;
-+	haint_data_t haint;
-+	hcint_data_t hcint;
-+	host_grxsts_data_t grxsts;
-+
-+	/* Enable HAINTs */
-+	DWC_WRITE_REG32(&hc_global_regs->haintmsk, 0x0001);
-+
-+	/* Enable HCINTs */
-+	DWC_WRITE_REG32(&hc_regs->hcintmsk, 0x04a3);
-+
-+	/* Read GINTSTS */
-+	gintsts.d32 = DWC_READ_REG32(&global_regs->gintsts);
-+
-+	/* Read HAINT */
-+	haint.d32 = DWC_READ_REG32(&hc_global_regs->haint);
-+
-+	/* Read HCINT */
-+	hcint.d32 = DWC_READ_REG32(&hc_regs->hcint);
-+
-+	/* Read HCCHAR */
-+	hcchar.d32 = DWC_READ_REG32(&hc_regs->hcchar);
-+
-+	/* Clear HCINT */
-+	DWC_WRITE_REG32(&hc_regs->hcint, hcint.d32);
-+
-+	/* Clear HAINT */
-+	DWC_WRITE_REG32(&hc_global_regs->haint, haint.d32);
-+
-+	/* Clear GINTSTS */
-+	DWC_WRITE_REG32(&global_regs->gintsts, gintsts.d32);
-+
-+	/* Read GINTSTS */
-+	gintsts.d32 = DWC_READ_REG32(&global_regs->gintsts);
-+
-+	/*
-+	 * Receive Control In packet
-+	 */
-+
-+	/* Make sure channel is disabled */
-+	hcchar.d32 = DWC_READ_REG32(&hc_regs->hcchar);
-+	if (hcchar.b.chen) {
-+		hcchar.b.chdis = 1;
-+		hcchar.b.chen = 1;
-+		DWC_WRITE_REG32(&hc_regs->hcchar, hcchar.d32);
-+		//sleep(1);
-+		dwc_mdelay(1000);
-+
-+		/* Read GINTSTS */
-+		gintsts.d32 = DWC_READ_REG32(&global_regs->gintsts);
-+
-+		/* Read HAINT */
-+		haint.d32 = DWC_READ_REG32(&hc_global_regs->haint);
-+
-+		/* Read HCINT */
-+		hcint.d32 = DWC_READ_REG32(&hc_regs->hcint);
-+
-+		/* Read HCCHAR */
-+		hcchar.d32 = DWC_READ_REG32(&hc_regs->hcchar);
-+
-+		/* Clear HCINT */
-+		DWC_WRITE_REG32(&hc_regs->hcint, hcint.d32);
-+
-+		/* Clear HAINT */
-+		DWC_WRITE_REG32(&hc_global_regs->haint, haint.d32);
-+
-+		/* Clear GINTSTS */
-+		DWC_WRITE_REG32(&global_regs->gintsts, gintsts.d32);
-+
-+		hcchar.d32 = DWC_READ_REG32(&hc_regs->hcchar);
-+	}
-+
-+	/* Set HCTSIZ */
-+	hctsiz.d32 = 0;
-+	hctsiz.b.xfersize = 8;
-+	hctsiz.b.pktcnt = 1;
-+	hctsiz.b.pid = DWC_OTG_HC_PID_DATA1;
-+	DWC_WRITE_REG32(&hc_regs->hctsiz, hctsiz.d32);
-+
-+	/* Set HCCHAR */
-+	hcchar.d32 = DWC_READ_REG32(&hc_regs->hcchar);
-+	hcchar.b.eptype = DWC_OTG_EP_TYPE_CONTROL;
-+	hcchar.b.epdir = 1;
-+	hcchar.b.epnum = 0;
-+	hcchar.b.mps = 8;
-+	hcchar.b.chen = 1;
-+	DWC_WRITE_REG32(&hc_regs->hcchar, hcchar.d32);
-+
-+	gintsts.d32 = DWC_READ_REG32(&global_regs->gintsts);
-+
-+	/* Wait for receive status queue interrupt */
-+	do {
-+		gintsts.d32 = DWC_READ_REG32(&global_regs->gintsts);
-+	} while (gintsts.b.rxstsqlvl == 0);
-+
-+	/* Read RXSTS */
-+	grxsts.d32 = DWC_READ_REG32(&global_regs->grxstsp);
-+
-+	/* Clear RXSTSQLVL in GINTSTS */
-+	gintsts.d32 = 0;
-+	gintsts.b.rxstsqlvl = 1;
-+	DWC_WRITE_REG32(&global_regs->gintsts, gintsts.d32);
-+
-+	switch (grxsts.b.pktsts) {
-+	case DWC_GRXSTS_PKTSTS_IN:
-+		/* Read the data into the host buffer */
-+		if (grxsts.b.bcnt > 0) {
-+			int i;
-+			int word_count = (grxsts.b.bcnt + 3) / 4;
-+
-+			data_fifo = (uint32_t *) ((char *)global_regs + 0x1000);
-+
-+			for (i = 0; i < word_count; i++) {
-+				(void)DWC_READ_REG32(data_fifo++);
-+			}
-+		}
-+		break;
-+
-+	default:
-+		break;
-+	}
-+
-+	gintsts.d32 = DWC_READ_REG32(&global_regs->gintsts);
-+
-+	/* Wait for receive status queue interrupt */
-+	do {
-+		gintsts.d32 = DWC_READ_REG32(&global_regs->gintsts);
-+	} while (gintsts.b.rxstsqlvl == 0);
-+
-+	/* Read RXSTS */
-+	grxsts.d32 = DWC_READ_REG32(&global_regs->grxstsp);
-+
-+	/* Clear RXSTSQLVL in GINTSTS */
-+	gintsts.d32 = 0;
-+	gintsts.b.rxstsqlvl = 1;
-+	DWC_WRITE_REG32(&global_regs->gintsts, gintsts.d32);
-+
-+	switch (grxsts.b.pktsts) {
-+	case DWC_GRXSTS_PKTSTS_IN_XFER_COMP:
-+		break;
-+
-+	default:
-+		break;
-+	}
-+
-+	gintsts.d32 = DWC_READ_REG32(&global_regs->gintsts);
-+
-+	/* Wait for host channel interrupt */
-+	do {
-+		gintsts.d32 = DWC_READ_REG32(&global_regs->gintsts);
-+	} while (gintsts.b.hcintr == 0);
-+
-+	/* Read HAINT */
-+	haint.d32 = DWC_READ_REG32(&hc_global_regs->haint);
-+
-+	/* Read HCINT */
-+	hcint.d32 = DWC_READ_REG32(&hc_regs->hcint);
-+
-+	/* Read HCCHAR */
-+	hcchar.d32 = DWC_READ_REG32(&hc_regs->hcchar);
-+
-+	/* Clear HCINT */
-+	DWC_WRITE_REG32(&hc_regs->hcint, hcint.d32);
-+
-+	/* Clear HAINT */
-+	DWC_WRITE_REG32(&hc_global_regs->haint, haint.d32);
-+
-+	/* Clear GINTSTS */
-+	DWC_WRITE_REG32(&global_regs->gintsts, gintsts.d32);
-+
-+	/* Read GINTSTS */
-+	gintsts.d32 = DWC_READ_REG32(&global_regs->gintsts);
-+
-+//      usleep(100000);
-+//      mdelay(100);
-+	dwc_mdelay(1);
-+
-+	/*
-+	 * Send handshake packet
-+	 */
-+
-+	/* Read HAINT */
-+	haint.d32 = DWC_READ_REG32(&hc_global_regs->haint);
-+
-+	/* Read HCINT */
-+	hcint.d32 = DWC_READ_REG32(&hc_regs->hcint);
-+
-+	/* Read HCCHAR */
-+	hcchar.d32 = DWC_READ_REG32(&hc_regs->hcchar);
-+
-+	/* Clear HCINT */
-+	DWC_WRITE_REG32(&hc_regs->hcint, hcint.d32);
-+
-+	/* Clear HAINT */
-+	DWC_WRITE_REG32(&hc_global_regs->haint, haint.d32);
-+
-+	/* Clear GINTSTS */
-+	DWC_WRITE_REG32(&global_regs->gintsts, gintsts.d32);
-+
-+	/* Read GINTSTS */
-+	gintsts.d32 = DWC_READ_REG32(&global_regs->gintsts);
-+
-+	/* Make sure channel is disabled */
-+	hcchar.d32 = DWC_READ_REG32(&hc_regs->hcchar);
-+	if (hcchar.b.chen) {
-+		hcchar.b.chdis = 1;
-+		hcchar.b.chen = 1;
-+		DWC_WRITE_REG32(&hc_regs->hcchar, hcchar.d32);
-+		//sleep(1);
-+		dwc_mdelay(1000);
-+
-+		/* Read GINTSTS */
-+		gintsts.d32 = DWC_READ_REG32(&global_regs->gintsts);
-+
-+		/* Read HAINT */
-+		haint.d32 = DWC_READ_REG32(&hc_global_regs->haint);
-+
-+		/* Read HCINT */
-+		hcint.d32 = DWC_READ_REG32(&hc_regs->hcint);
-+
-+		/* Read HCCHAR */
-+		hcchar.d32 = DWC_READ_REG32(&hc_regs->hcchar);
-+
-+		/* Clear HCINT */
-+		DWC_WRITE_REG32(&hc_regs->hcint, hcint.d32);
-+
-+		/* Clear HAINT */
-+		DWC_WRITE_REG32(&hc_global_regs->haint, haint.d32);
-+
-+		/* Clear GINTSTS */
-+		DWC_WRITE_REG32(&global_regs->gintsts, gintsts.d32);
-+
-+		hcchar.d32 = DWC_READ_REG32(&hc_regs->hcchar);
-+	}
-+
-+	/* Set HCTSIZ */
-+	hctsiz.d32 = 0;
-+	hctsiz.b.xfersize = 0;
-+	hctsiz.b.pktcnt = 1;
-+	hctsiz.b.pid = DWC_OTG_HC_PID_DATA1;
-+	DWC_WRITE_REG32(&hc_regs->hctsiz, hctsiz.d32);
-+
-+	/* Set HCCHAR */
-+	hcchar.d32 = DWC_READ_REG32(&hc_regs->hcchar);
-+	hcchar.b.eptype = DWC_OTG_EP_TYPE_CONTROL;
-+	hcchar.b.epdir = 0;
-+	hcchar.b.epnum = 0;
-+	hcchar.b.mps = 8;
-+	hcchar.b.chen = 1;
-+	DWC_WRITE_REG32(&hc_regs->hcchar, hcchar.d32);
-+
-+	gintsts.d32 = DWC_READ_REG32(&global_regs->gintsts);
-+
-+	/* Wait for host channel interrupt */
-+	do {
-+		gintsts.d32 = DWC_READ_REG32(&global_regs->gintsts);
-+	} while (gintsts.b.hcintr == 0);
-+
-+	/* Disable HCINTs */
-+	DWC_WRITE_REG32(&hc_regs->hcintmsk, 0x0000);
-+
-+	/* Disable HAINTs */
-+	DWC_WRITE_REG32(&hc_global_regs->haintmsk, 0x0000);
-+
-+	/* Read HAINT */
-+	haint.d32 = DWC_READ_REG32(&hc_global_regs->haint);
-+
-+	/* Read HCINT */
-+	hcint.d32 = DWC_READ_REG32(&hc_regs->hcint);
-+
-+	/* Read HCCHAR */
-+	hcchar.d32 = DWC_READ_REG32(&hc_regs->hcchar);
-+
-+	/* Clear HCINT */
-+	DWC_WRITE_REG32(&hc_regs->hcint, hcint.d32);
-+
-+	/* Clear HAINT */
-+	DWC_WRITE_REG32(&hc_global_regs->haint, haint.d32);
-+
-+	/* Clear GINTSTS */
-+	DWC_WRITE_REG32(&global_regs->gintsts, gintsts.d32);
-+
-+	/* Read GINTSTS */
-+	gintsts.d32 = DWC_READ_REG32(&global_regs->gintsts);
-+}
-+#endif
-+
-+/** Handles hub class-specific requests. */
-+int dwc_otg_hcd_hub_control(dwc_otg_hcd_t * dwc_otg_hcd,
-+			    uint16_t typeReq,
-+			    uint16_t wValue,
-+			    uint16_t wIndex, uint8_t * buf, uint16_t wLength)
-+{
-+	int retval = 0;
-+
-+	dwc_otg_core_if_t *core_if = dwc_otg_hcd->core_if;
-+	usb_hub_descriptor_t *hub_desc;
-+	hprt0_data_t hprt0 = {.d32 = 0 };
-+
-+	uint32_t port_status;
-+
-+	switch (typeReq) {
-+	case UCR_CLEAR_HUB_FEATURE:
-+		DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD HUB CONTROL - "
-+			    "ClearHubFeature 0x%x\n", wValue);
-+		switch (wValue) {
-+		case UHF_C_HUB_LOCAL_POWER:
-+		case UHF_C_HUB_OVER_CURRENT:
-+			/* Nothing required here */
-+			break;
-+		default:
-+			retval = -DWC_E_INVALID;
-+			DWC_ERROR("DWC OTG HCD - "
-+				  "ClearHubFeature request %xh unknown\n",
-+				  wValue);
-+		}
-+		break;
-+	case UCR_CLEAR_PORT_FEATURE:
-+#ifdef CONFIG_USB_DWC_OTG_LPM
-+		if (wValue != UHF_PORT_L1)
-+#endif
-+			if (!wIndex || wIndex > 1)
-+				goto error;
-+
-+		switch (wValue) {
-+		case UHF_PORT_ENABLE:
-+			DWC_DEBUGPL(DBG_ANY, "DWC OTG HCD HUB CONTROL - "
-+				    "ClearPortFeature USB_PORT_FEAT_ENABLE\n");
-+			hprt0.d32 = dwc_otg_read_hprt0(core_if);
-+			hprt0.b.prtena = 1;
-+			DWC_WRITE_REG32(core_if->host_if->hprt0, hprt0.d32);
-+			break;
-+		case UHF_PORT_SUSPEND:
-+			DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD HUB CONTROL - "
-+				    "ClearPortFeature USB_PORT_FEAT_SUSPEND\n");
-+
-+			if (core_if->power_down == 2) {
-+				dwc_otg_host_hibernation_restore(core_if, 0, 0);
-+			} else {
-+				DWC_WRITE_REG32(core_if->pcgcctl, 0);
-+				dwc_mdelay(5);
-+
-+				hprt0.d32 = dwc_otg_read_hprt0(core_if);
-+				hprt0.b.prtres = 1;
-+				DWC_WRITE_REG32(core_if->host_if->hprt0, hprt0.d32);
-+				hprt0.b.prtsusp = 0;
-+				/* Clear Resume bit */
-+				dwc_mdelay(100);
-+				hprt0.b.prtres = 0;
-+				DWC_WRITE_REG32(core_if->host_if->hprt0, hprt0.d32);
-+			}
-+			break;
-+#ifdef CONFIG_USB_DWC_OTG_LPM
-+		case UHF_PORT_L1:
-+			{
-+				pcgcctl_data_t pcgcctl = {.d32 = 0 };
-+				glpmcfg_data_t lpmcfg = {.d32 = 0 };
-+
-+				lpmcfg.d32 =
-+				    DWC_READ_REG32(&core_if->
-+						   core_global_regs->glpmcfg);
-+				lpmcfg.b.en_utmi_sleep = 0;
-+				lpmcfg.b.hird_thres &= (~(1 << 4));
-+				lpmcfg.b.prt_sleep_sts = 1;
-+				DWC_WRITE_REG32(&core_if->
-+						core_global_regs->glpmcfg,
-+						lpmcfg.d32);
-+
-+				/* Clear Enbl_L1Gating bit. */
-+				pcgcctl.b.enbl_sleep_gating = 1;
-+				DWC_MODIFY_REG32(core_if->pcgcctl, pcgcctl.d32,
-+						 0);
-+
-+				dwc_mdelay(5);
-+
-+				hprt0.d32 = dwc_otg_read_hprt0(core_if);
-+				hprt0.b.prtres = 1;
-+				DWC_WRITE_REG32(core_if->host_if->hprt0,
-+						hprt0.d32);
-+				/* This bit will be cleared in wakeup interrupt handle */
-+				break;
-+			}
-+#endif
-+		case UHF_PORT_POWER:
-+			DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD HUB CONTROL - "
-+				    "ClearPortFeature USB_PORT_FEAT_POWER\n");
-+			hprt0.d32 = dwc_otg_read_hprt0(core_if);
-+			hprt0.b.prtpwr = 0;
-+			DWC_WRITE_REG32(core_if->host_if->hprt0, hprt0.d32);
-+			break;
-+		case UHF_PORT_INDICATOR:
-+			DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD HUB CONTROL - "
-+				    "ClearPortFeature USB_PORT_FEAT_INDICATOR\n");
-+			/* Port inidicator not supported */
-+			break;
-+		case UHF_C_PORT_CONNECTION:
-+			/* Clears drivers internal connect status change
-+			 * flag */
-+			DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD HUB CONTROL - "
-+				    "ClearPortFeature USB_PORT_FEAT_C_CONNECTION\n");
-+			dwc_otg_hcd->flags.b.port_connect_status_change = 0;
-+			break;
-+		case UHF_C_PORT_RESET:
-+			/* Clears the driver's internal Port Reset Change
-+			 * flag */
-+			DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD HUB CONTROL - "
-+				    "ClearPortFeature USB_PORT_FEAT_C_RESET\n");
-+			dwc_otg_hcd->flags.b.port_reset_change = 0;
-+			break;
-+		case UHF_C_PORT_ENABLE:
-+			/* Clears the driver's internal Port
-+			 * Enable/Disable Change flag */
-+			DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD HUB CONTROL - "
-+				    "ClearPortFeature USB_PORT_FEAT_C_ENABLE\n");
-+			dwc_otg_hcd->flags.b.port_enable_change = 0;
-+			break;
-+		case UHF_C_PORT_SUSPEND:
-+			/* Clears the driver's internal Port Suspend
-+			 * Change flag, which is set when resume signaling on
-+			 * the host port is complete */
-+			DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD HUB CONTROL - "
-+				    "ClearPortFeature USB_PORT_FEAT_C_SUSPEND\n");
-+			dwc_otg_hcd->flags.b.port_suspend_change = 0;
-+			break;
-+#ifdef CONFIG_USB_DWC_OTG_LPM
-+		case UHF_C_PORT_L1:
-+			dwc_otg_hcd->flags.b.port_l1_change = 0;
-+			break;
-+#endif
-+		case UHF_C_PORT_OVER_CURRENT:
-+			DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD HUB CONTROL - "
-+				    "ClearPortFeature USB_PORT_FEAT_C_OVER_CURRENT\n");
-+			dwc_otg_hcd->flags.b.port_over_current_change = 0;
-+			break;
-+		default:
-+			retval = -DWC_E_INVALID;
-+			DWC_ERROR("DWC OTG HCD - "
-+				  "ClearPortFeature request %xh "
-+				  "unknown or unsupported\n", wValue);
-+		}
-+		break;
-+	case UCR_GET_HUB_DESCRIPTOR:
-+		DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD HUB CONTROL - "
-+			    "GetHubDescriptor\n");
-+		hub_desc = (usb_hub_descriptor_t *) buf;
-+		hub_desc->bDescLength = 9;
-+		hub_desc->bDescriptorType = 0x29;
-+		hub_desc->bNbrPorts = 1;
-+		USETW(hub_desc->wHubCharacteristics, 0x08);
-+		hub_desc->bPwrOn2PwrGood = 1;
-+		hub_desc->bHubContrCurrent = 0;
-+		hub_desc->DeviceRemovable[0] = 0;
-+		hub_desc->DeviceRemovable[1] = 0xff;
-+		break;
-+	case UCR_GET_HUB_STATUS:
-+		DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD HUB CONTROL - "
-+			    "GetHubStatus\n");
-+		DWC_MEMSET(buf, 0, 4);
-+		break;
-+	case UCR_GET_PORT_STATUS:
-+		DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD HUB CONTROL - "
-+			    "GetPortStatus wIndex = 0x%04x FLAGS=0x%08x\n",
-+			    wIndex, dwc_otg_hcd->flags.d32);
-+		if (!wIndex || wIndex > 1)
-+			goto error;
-+
-+		port_status = 0;
-+
-+		if (dwc_otg_hcd->flags.b.port_connect_status_change)
-+			port_status |= (1 << UHF_C_PORT_CONNECTION);
-+
-+		if (dwc_otg_hcd->flags.b.port_enable_change)
-+			port_status |= (1 << UHF_C_PORT_ENABLE);
-+
-+		if (dwc_otg_hcd->flags.b.port_suspend_change)
-+			port_status |= (1 << UHF_C_PORT_SUSPEND);
-+
-+		if (dwc_otg_hcd->flags.b.port_l1_change)
-+			port_status |= (1 << UHF_C_PORT_L1);
-+
-+		if (dwc_otg_hcd->flags.b.port_reset_change) {
-+			port_status |= (1 << UHF_C_PORT_RESET);
-+		}
-+
-+		if (dwc_otg_hcd->flags.b.port_over_current_change) {
-+			DWC_WARN("Overcurrent change detected\n");
-+			port_status |= (1 << UHF_C_PORT_OVER_CURRENT);
-+		}
-+
-+		if (!dwc_otg_hcd->flags.b.port_connect_status) {
-+			/*
-+			 * The port is disconnected, which means the core is
-+			 * either in device mode or it soon will be. Just
-+			 * return 0's for the remainder of the port status
-+			 * since the port register can't be read if the core
-+			 * is in device mode.
-+			 */
-+			*((__le32 *) buf) = dwc_cpu_to_le32(&port_status);
-+			break;
-+		}
-+
-+		hprt0.d32 = DWC_READ_REG32(core_if->host_if->hprt0);
-+		DWC_DEBUGPL(DBG_HCDV, "  HPRT0: 0x%08x\n", hprt0.d32);
-+
-+		if (hprt0.b.prtconnsts)
-+			port_status |= (1 << UHF_PORT_CONNECTION);
-+
-+		if (hprt0.b.prtena)
-+			port_status |= (1 << UHF_PORT_ENABLE);
-+
-+		if (hprt0.b.prtsusp)
-+			port_status |= (1 << UHF_PORT_SUSPEND);
-+
-+		if (hprt0.b.prtovrcurract)
-+			port_status |= (1 << UHF_PORT_OVER_CURRENT);
-+
-+		if (hprt0.b.prtrst)
-+			port_status |= (1 << UHF_PORT_RESET);
-+
-+		if (hprt0.b.prtpwr)
-+			port_status |= (1 << UHF_PORT_POWER);
-+
-+		if (hprt0.b.prtspd == DWC_HPRT0_PRTSPD_HIGH_SPEED)
-+			port_status |= (1 << UHF_PORT_HIGH_SPEED);
-+		else if (hprt0.b.prtspd == DWC_HPRT0_PRTSPD_LOW_SPEED)
-+			port_status |= (1 << UHF_PORT_LOW_SPEED);
-+
-+		if (hprt0.b.prttstctl)
-+			port_status |= (1 << UHF_PORT_TEST);
-+		if (dwc_otg_get_lpm_portsleepstatus(dwc_otg_hcd->core_if)) {
-+			port_status |= (1 << UHF_PORT_L1);
-+		}
-+		/*
-+		   For Synopsys HW emulation of Power down wkup_control asserts the
-+		   hreset_n and prst_n on suspned. This causes the HPRT0 to be zero.
-+		   We intentionally tell the software that port is in L2Suspend state.
-+		   Only for STE.
-+		*/
-+		if ((core_if->power_down == 2)
-+		    && (core_if->hibernation_suspend == 1)) {
-+			port_status |= (1 << UHF_PORT_SUSPEND);
-+		}
-+		/* USB_PORT_FEAT_INDICATOR unsupported always 0 */
-+
-+		*((__le32 *) buf) = dwc_cpu_to_le32(&port_status);
-+
-+		break;
-+	case UCR_SET_HUB_FEATURE:
-+		DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD HUB CONTROL - "
-+			    "SetHubFeature\n");
-+		/* No HUB features supported */
-+		break;
-+	case UCR_SET_PORT_FEATURE:
-+		if (wValue != UHF_PORT_TEST && (!wIndex || wIndex > 1))
-+			goto error;
-+
-+		if (!dwc_otg_hcd->flags.b.port_connect_status) {
-+			/*
-+			 * The port is disconnected, which means the core is
-+			 * either in device mode or it soon will be. Just
-+			 * return without doing anything since the port
-+			 * register can't be written if the core is in device
-+			 * mode.
-+			 */
-+			break;
-+		}
-+
-+		switch (wValue) {
-+		case UHF_PORT_SUSPEND:
-+			DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD HUB CONTROL - "
-+				    "SetPortFeature - USB_PORT_FEAT_SUSPEND\n");
-+			if (dwc_otg_hcd_otg_port(dwc_otg_hcd) != wIndex) {
-+				goto error;
-+			}
-+			if (core_if->power_down == 2) {
-+				int timeout = 300;
-+				dwc_irqflags_t flags;
-+				pcgcctl_data_t pcgcctl = {.d32 = 0 };
-+				gpwrdn_data_t gpwrdn = {.d32 = 0 };
-+				gusbcfg_data_t gusbcfg = {.d32 = 0 };
-+#ifdef DWC_DEV_SRPCAP
-+				int32_t otg_cap_param = core_if->core_params->otg_cap;
-+#endif
-+				DWC_PRINTF("Preparing for complete power-off\n");
-+
-+				/* Save registers before hibernation */
-+				dwc_otg_save_global_regs(core_if);
-+				dwc_otg_save_host_regs(core_if);
-+
-+				hprt0.d32 = dwc_otg_read_hprt0(core_if);
-+				hprt0.b.prtsusp = 1;
-+				hprt0.b.prtena = 0;
-+				DWC_WRITE_REG32(core_if->host_if->hprt0, hprt0.d32);
-+				/* Spin hprt0.b.prtsusp to became 1 */
-+				do {
-+					hprt0.d32 = dwc_otg_read_hprt0(core_if);
-+					if (hprt0.b.prtsusp) {
-+						break;
-+					}
-+					dwc_mdelay(1);
-+				} while (--timeout);
-+				if (!timeout) {
-+					DWC_WARN("Suspend wasn't genereted\n");
-+				}
-+				dwc_udelay(10);
-+
-+				/*
-+				 * We need to disable interrupts to prevent servicing of any IRQ
-+				 * during going to hibernation
-+				 */
-+				DWC_SPINLOCK_IRQSAVE(dwc_otg_hcd->lock, &flags);
-+				core_if->lx_state = DWC_OTG_L2;
-+#ifdef DWC_DEV_SRPCAP
-+				hprt0.d32 = dwc_otg_read_hprt0(core_if);
-+				hprt0.b.prtpwr = 0;
-+				hprt0.b.prtena = 0;
-+				DWC_WRITE_REG32(core_if->host_if->hprt0,
-+						hprt0.d32);
-+#endif
-+				gusbcfg.d32 =
-+				    DWC_READ_REG32(&core_if->core_global_regs->
-+						   gusbcfg);
-+				if (gusbcfg.b.ulpi_utmi_sel == 1) {
-+					/* ULPI interface */
-+					/* Suspend the Phy Clock */
-+					pcgcctl.d32 = 0;
-+					pcgcctl.b.stoppclk = 1;
-+					DWC_MODIFY_REG32(core_if->pcgcctl, 0,
-+							 pcgcctl.d32);
-+					dwc_udelay(10);
-+					gpwrdn.b.pmuactv = 1;
-+					DWC_MODIFY_REG32(&core_if->
-+							 core_global_regs->
-+							 gpwrdn, 0, gpwrdn.d32);
-+				} else {
-+					/* UTMI+ Interface */
-+					gpwrdn.b.pmuactv = 1;
-+					DWC_MODIFY_REG32(&core_if->
-+							 core_global_regs->
-+							 gpwrdn, 0, gpwrdn.d32);
-+					dwc_udelay(10);
-+					pcgcctl.b.stoppclk = 1;
-+					DWC_MODIFY_REG32(core_if->pcgcctl, 0, pcgcctl.d32);
-+					dwc_udelay(10);
-+				}
-+#ifdef DWC_DEV_SRPCAP
-+				gpwrdn.d32 = 0;
-+				gpwrdn.b.dis_vbus = 1;
-+				DWC_MODIFY_REG32(&core_if->core_global_regs->
-+						 gpwrdn, 0, gpwrdn.d32);
-+#endif
-+				gpwrdn.d32 = 0;
-+				gpwrdn.b.pmuintsel = 1;
-+				DWC_MODIFY_REG32(&core_if->core_global_regs->
-+						 gpwrdn, 0, gpwrdn.d32);
-+				dwc_udelay(10);
-+
-+				gpwrdn.d32 = 0;
-+#ifdef DWC_DEV_SRPCAP
-+				gpwrdn.b.srp_det_msk = 1;
-+#endif
-+				gpwrdn.b.disconn_det_msk = 1;
-+				gpwrdn.b.lnstchng_msk = 1;
-+				gpwrdn.b.sts_chngint_msk = 1;
-+				DWC_MODIFY_REG32(&core_if->core_global_regs->
-+						 gpwrdn, 0, gpwrdn.d32);
-+				dwc_udelay(10);
-+
-+				/* Enable Power Down Clamp and all interrupts in GPWRDN */
-+				gpwrdn.d32 = 0;
-+				gpwrdn.b.pwrdnclmp = 1;
-+				DWC_MODIFY_REG32(&core_if->core_global_regs->
-+						 gpwrdn, 0, gpwrdn.d32);
-+				dwc_udelay(10);
-+
-+				/* Switch off VDD */
-+				gpwrdn.d32 = 0;
-+				gpwrdn.b.pwrdnswtch = 1;
-+				DWC_MODIFY_REG32(&core_if->core_global_regs->
-+						 gpwrdn, 0, gpwrdn.d32);
-+
-+#ifdef DWC_DEV_SRPCAP
-+				if (otg_cap_param == DWC_OTG_CAP_PARAM_HNP_SRP_CAPABLE)
-+				{
-+					core_if->pwron_timer_started = 1;
-+					DWC_TIMER_SCHEDULE(core_if->pwron_timer, 6000 /* 6 secs */ );
-+				}
-+#endif
-+				/* Save gpwrdn register for further usage if stschng interrupt */
-+				core_if->gr_backup->gpwrdn_local =
-+						DWC_READ_REG32(&core_if->core_global_regs->gpwrdn);
-+
-+				/* Set flag to indicate that we are in hibernation */
-+				core_if->hibernation_suspend = 1;
-+				DWC_SPINUNLOCK_IRQRESTORE(dwc_otg_hcd->lock,flags);
-+
-+				DWC_PRINTF("Host hibernation completed\n");
-+				// Exit from case statement
-+				break;
-+
-+			}
-+			if (dwc_otg_hcd_otg_port(dwc_otg_hcd) == wIndex &&
-+			    dwc_otg_hcd->fops->get_b_hnp_enable(dwc_otg_hcd)) {
-+				gotgctl_data_t gotgctl = {.d32 = 0 };
-+				gotgctl.b.hstsethnpen = 1;
-+				DWC_MODIFY_REG32(&core_if->core_global_regs->
-+						 gotgctl, 0, gotgctl.d32);
-+				core_if->op_state = A_SUSPEND;
-+			}
-+			hprt0.d32 = dwc_otg_read_hprt0(core_if);
-+			hprt0.b.prtsusp = 1;
-+			DWC_WRITE_REG32(core_if->host_if->hprt0, hprt0.d32);
-+			{
-+				dwc_irqflags_t flags;
-+				/* Update lx_state */
-+				DWC_SPINLOCK_IRQSAVE(dwc_otg_hcd->lock, &flags);
-+				core_if->lx_state = DWC_OTG_L2;
-+				DWC_SPINUNLOCK_IRQRESTORE(dwc_otg_hcd->lock, flags);
-+			}
-+			/* Suspend the Phy Clock */
-+			{
-+				pcgcctl_data_t pcgcctl = {.d32 = 0 };
-+				pcgcctl.b.stoppclk = 1;
-+				DWC_MODIFY_REG32(core_if->pcgcctl, 0,
-+						 pcgcctl.d32);
-+				dwc_udelay(10);
-+			}
-+
-+			/* For HNP the bus must be suspended for at least 200ms. */
-+			if (dwc_otg_hcd->fops->get_b_hnp_enable(dwc_otg_hcd)) {
-+				pcgcctl_data_t pcgcctl = {.d32 = 0 };
-+				pcgcctl.b.stoppclk = 1;
-+                DWC_MODIFY_REG32(core_if->pcgcctl, pcgcctl.d32, 0);
-+				dwc_mdelay(200);
-+			}
-+
-+			/** @todo - check how sw can wait for 1 sec to check asesvld??? */
-+#if 0 //vahrama !!!!!!!!!!!!!!!!!!
-+			if (core_if->adp_enable) {
-+				gotgctl_data_t gotgctl = {.d32 = 0 };
-+				gpwrdn_data_t gpwrdn;
-+
-+				while (gotgctl.b.asesvld == 1) {
-+					gotgctl.d32 =
-+					    DWC_READ_REG32(&core_if->
-+							   core_global_regs->
-+							   gotgctl);
-+					dwc_mdelay(100);
-+				}
-+
-+				/* Enable Power Down Logic */
-+				gpwrdn.d32 = 0;
-+				gpwrdn.b.pmuactv = 1;
-+				DWC_MODIFY_REG32(&core_if->core_global_regs->
-+						 gpwrdn, 0, gpwrdn.d32);
-+
-+				/* Unmask SRP detected interrupt from Power Down Logic */
-+				gpwrdn.d32 = 0;
-+				gpwrdn.b.srp_det_msk = 1;
-+				DWC_MODIFY_REG32(&core_if->core_global_regs->
-+						 gpwrdn, 0, gpwrdn.d32);
-+
-+				dwc_otg_adp_probe_start(core_if);
-+			}
-+#endif
-+			break;
-+		case UHF_PORT_POWER:
-+			DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD HUB CONTROL - "
-+				    "SetPortFeature - USB_PORT_FEAT_POWER\n");
-+			hprt0.d32 = dwc_otg_read_hprt0(core_if);
-+			hprt0.b.prtpwr = 1;
-+			DWC_WRITE_REG32(core_if->host_if->hprt0, hprt0.d32);
-+			break;
-+		case UHF_PORT_RESET:
-+			if ((core_if->power_down == 2)
-+			    && (core_if->hibernation_suspend == 1)) {
-+				/* If we are going to exit from Hibernated
-+				 * state via USB RESET.
-+				 */
-+				dwc_otg_host_hibernation_restore(core_if, 0, 1);
-+			} else {
-+				hprt0.d32 = dwc_otg_read_hprt0(core_if);
-+
-+				DWC_DEBUGPL(DBG_HCD,
-+					    "DWC OTG HCD HUB CONTROL - "
-+					    "SetPortFeature - USB_PORT_FEAT_RESET\n");
-+				{
-+					pcgcctl_data_t pcgcctl = {.d32 = 0 };
-+					pcgcctl.b.enbl_sleep_gating = 1;
-+					pcgcctl.b.stoppclk = 1;
-+					DWC_MODIFY_REG32(core_if->pcgcctl, pcgcctl.d32, 0);
-+					DWC_WRITE_REG32(core_if->pcgcctl, 0);
-+				}
-+#ifdef CONFIG_USB_DWC_OTG_LPM
-+				{
-+					glpmcfg_data_t lpmcfg;
-+					lpmcfg.d32 =
-+						DWC_READ_REG32(&core_if->core_global_regs->glpmcfg);
-+					if (lpmcfg.b.prt_sleep_sts) {
-+						lpmcfg.b.en_utmi_sleep = 0;
-+						lpmcfg.b.hird_thres &= (~(1 << 4));
-+						DWC_WRITE_REG32
-+						    (&core_if->core_global_regs->glpmcfg,
-+						     lpmcfg.d32);
-+						dwc_mdelay(1);
-+					}
-+				}
-+#endif
-+				hprt0.d32 = dwc_otg_read_hprt0(core_if);
-+				/* Clear suspend bit if resetting from suspended state. */
-+				hprt0.b.prtsusp = 0;
-+				/* When B-Host the Port reset bit is set in
-+				 * the Start HCD Callback function, so that
-+				 * the reset is started within 1ms of the HNP
-+				 * success interrupt. */
-+				if (!dwc_otg_hcd_is_b_host(dwc_otg_hcd)) {
-+					hprt0.b.prtpwr = 1;
-+					hprt0.b.prtrst = 1;
-+					DWC_PRINTF("Indeed it is in host mode hprt0 = %08x\n",hprt0.d32);
-+					DWC_WRITE_REG32(core_if->host_if->hprt0,
-+							hprt0.d32);
-+				}
-+				/* Clear reset bit in 10ms (FS/LS) or 50ms (HS) */
-+				dwc_mdelay(60);
-+				hprt0.b.prtrst = 0;
-+				DWC_WRITE_REG32(core_if->host_if->hprt0, hprt0.d32);
-+				core_if->lx_state = DWC_OTG_L0;	/* Now back to the on state */
-+			}
-+			break;
-+#ifdef DWC_HS_ELECT_TST
-+		case UHF_PORT_TEST:
-+			{
-+				uint32_t t;
-+				gintmsk_data_t gintmsk;
-+
-+				t = (wIndex >> 8);	/* MSB wIndex USB */
-+				DWC_DEBUGPL(DBG_HCD,
-+					    "DWC OTG HCD HUB CONTROL - "
-+					    "SetPortFeature - USB_PORT_FEAT_TEST %d\n",
-+					    t);
-+				DWC_WARN("USB_PORT_FEAT_TEST %d\n", t);
-+				if (t < 6) {
-+					hprt0.d32 = dwc_otg_read_hprt0(core_if);
-+					hprt0.b.prttstctl = t;
-+					DWC_WRITE_REG32(core_if->host_if->hprt0,
-+							hprt0.d32);
-+				} else {
-+					/* Setup global vars with reg addresses (quick and
-+					 * dirty hack, should be cleaned up)
-+					 */
-+					global_regs = core_if->core_global_regs;
-+					hc_global_regs =
-+					    core_if->host_if->host_global_regs;
-+					hc_regs =
-+					    (dwc_otg_hc_regs_t *) ((char *)
-+								   global_regs +
-+								   0x500);
-+					data_fifo =
-+					    (uint32_t *) ((char *)global_regs +
-+							  0x1000);
-+
-+					if (t == 6) {	/* HS_HOST_PORT_SUSPEND_RESUME */
-+						/* Save current interrupt mask */
-+						gintmsk.d32 =
-+						    DWC_READ_REG32
-+						    (&global_regs->gintmsk);
-+
-+						/* Disable all interrupts while we muck with
-+						 * the hardware directly
-+						 */
-+						DWC_WRITE_REG32(&global_regs->gintmsk, 0);
-+
-+						/* 15 second delay per the test spec */
-+						dwc_mdelay(15000);
-+
-+						/* Drive suspend on the root port */
-+						hprt0.d32 =
-+						    dwc_otg_read_hprt0(core_if);
-+						hprt0.b.prtsusp = 1;
-+						hprt0.b.prtres = 0;
-+						DWC_WRITE_REG32(core_if->host_if->hprt0, hprt0.d32);
-+
-+						/* 15 second delay per the test spec */
-+						dwc_mdelay(15000);
-+
-+						/* Drive resume on the root port */
-+						hprt0.d32 =
-+						    dwc_otg_read_hprt0(core_if);
-+						hprt0.b.prtsusp = 0;
-+						hprt0.b.prtres = 1;
-+						DWC_WRITE_REG32(core_if->host_if->hprt0, hprt0.d32);
-+						dwc_mdelay(100);
-+
-+						/* Clear the resume bit */
-+						hprt0.b.prtres = 0;
-+						DWC_WRITE_REG32(core_if->host_if->hprt0, hprt0.d32);
-+
-+						/* Restore interrupts */
-+						DWC_WRITE_REG32(&global_regs->gintmsk, gintmsk.d32);
-+					} else if (t == 7) {	/* SINGLE_STEP_GET_DEVICE_DESCRIPTOR setup */
-+						/* Save current interrupt mask */
-+						gintmsk.d32 =
-+						    DWC_READ_REG32
-+						    (&global_regs->gintmsk);
-+
-+						/* Disable all interrupts while we muck with
-+						 * the hardware directly
-+						 */
-+						DWC_WRITE_REG32(&global_regs->gintmsk, 0);
-+
-+						/* 15 second delay per the test spec */
-+						dwc_mdelay(15000);
-+
-+						/* Send the Setup packet */
-+						do_setup();
-+
-+						/* 15 second delay so nothing else happens for awhile */
-+						dwc_mdelay(15000);
-+
-+						/* Restore interrupts */
-+						DWC_WRITE_REG32(&global_regs->gintmsk, gintmsk.d32);
-+					} else if (t == 8) {	/* SINGLE_STEP_GET_DEVICE_DESCRIPTOR execute */
-+						/* Save current interrupt mask */
-+						gintmsk.d32 =
-+						    DWC_READ_REG32
-+						    (&global_regs->gintmsk);
-+
-+						/* Disable all interrupts while we muck with
-+						 * the hardware directly
-+						 */
-+						DWC_WRITE_REG32(&global_regs->gintmsk, 0);
-+
-+						/* Send the Setup packet */
-+						do_setup();
-+
-+						/* 15 second delay so nothing else happens for awhile */
-+						dwc_mdelay(15000);
-+
-+						/* Send the In and Ack packets */
-+						do_in_ack();
-+
-+						/* 15 second delay so nothing else happens for awhile */
-+						dwc_mdelay(15000);
-+
-+						/* Restore interrupts */
-+						DWC_WRITE_REG32(&global_regs->gintmsk, gintmsk.d32);
-+					}
-+				}
-+				break;
-+			}
-+#endif /* DWC_HS_ELECT_TST */
-+
-+		case UHF_PORT_INDICATOR:
-+			DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD HUB CONTROL - "
-+				    "SetPortFeature - USB_PORT_FEAT_INDICATOR\n");
-+			/* Not supported */
-+			break;
-+		default:
-+			retval = -DWC_E_INVALID;
-+			DWC_ERROR("DWC OTG HCD - "
-+				  "SetPortFeature request %xh "
-+				  "unknown or unsupported\n", wValue);
-+			break;
-+		}
-+		break;
-+#ifdef CONFIG_USB_DWC_OTG_LPM
-+	case UCR_SET_AND_TEST_PORT_FEATURE:
-+		if (wValue != UHF_PORT_L1) {
-+			goto error;
-+		}
-+		{
-+			int portnum, hird, devaddr, remwake;
-+			glpmcfg_data_t lpmcfg;
-+			uint32_t time_usecs;
-+			gintsts_data_t gintsts;
-+			gintmsk_data_t gintmsk;
-+
-+			if (!dwc_otg_get_param_lpm_enable(core_if)) {
-+				goto error;
-+			}
-+			if (wValue != UHF_PORT_L1 || wLength != 1) {
-+				goto error;
-+			}
-+			/* Check if the port currently is in SLEEP state */
-+			lpmcfg.d32 =
-+			    DWC_READ_REG32(&core_if->core_global_regs->glpmcfg);
-+			if (lpmcfg.b.prt_sleep_sts) {
-+				DWC_INFO("Port is already in sleep mode\n");
-+				buf[0] = 0;	/* Return success */
-+				break;
-+			}
-+
-+			portnum = wIndex & 0xf;
-+			hird = (wIndex >> 4) & 0xf;
-+			devaddr = (wIndex >> 8) & 0x7f;
-+			remwake = (wIndex >> 15);
-+
-+			if (portnum != 1) {
-+				retval = -DWC_E_INVALID;
-+				DWC_WARN
-+				    ("Wrong port number(%d) in SetandTestPortFeature request\n",
-+				     portnum);
-+				break;
-+			}
-+
-+			DWC_PRINTF
-+			    ("SetandTestPortFeature request: portnum = %d, hird = %d, devaddr = %d, rewake = %d\n",
-+			     portnum, hird, devaddr, remwake);
-+			/* Disable LPM interrupt */
-+			gintmsk.d32 = 0;
-+			gintmsk.b.lpmtranrcvd = 1;
-+			DWC_MODIFY_REG32(&core_if->core_global_regs->gintmsk,
-+					 gintmsk.d32, 0);
-+
-+			if (dwc_otg_hcd_send_lpm
-+			    (dwc_otg_hcd, devaddr, hird, remwake)) {
-+				retval = -DWC_E_INVALID;
-+				break;
-+			}
-+
-+			time_usecs = 10 * (lpmcfg.b.retry_count + 1);
-+			/* We will consider timeout if time_usecs microseconds pass,
-+			 * and we don't receive LPM transaction status.
-+			 * After receiving non-error responce(ACK/NYET/STALL) from device,
-+			 *  core will set lpmtranrcvd bit.
-+			 */
-+			do {
-+				gintsts.d32 =
-+				    DWC_READ_REG32(&core_if->core_global_regs->gintsts);
-+				if (gintsts.b.lpmtranrcvd) {
-+					break;
-+				}
-+				dwc_udelay(1);
-+			} while (--time_usecs);
-+			/* lpm_int bit will be cleared in LPM interrupt handler */
-+
-+			/* Now fill status
-+			 * 0x00 - Success
-+			 * 0x10 - NYET
-+			 * 0x11 - Timeout
-+			 */
-+			if (!gintsts.b.lpmtranrcvd) {
-+				buf[0] = 0x3;	/* Completion code is Timeout */
-+				dwc_otg_hcd_free_hc_from_lpm(dwc_otg_hcd);
-+			} else {
-+				lpmcfg.d32 =
-+				    DWC_READ_REG32(&core_if->core_global_regs->glpmcfg);
-+				if (lpmcfg.b.lpm_resp == 0x3) {
-+					/* ACK responce from the device */
-+					buf[0] = 0x00;	/* Success */
-+				} else if (lpmcfg.b.lpm_resp == 0x2) {
-+					/* NYET responce from the device */
-+					buf[0] = 0x2;
-+				} else {
-+					/* Otherwise responce with Timeout */
-+					buf[0] = 0x3;
-+				}
-+			}
-+			DWC_PRINTF("Device responce to LPM trans is %x\n",
-+				   lpmcfg.b.lpm_resp);
-+			DWC_MODIFY_REG32(&core_if->core_global_regs->gintmsk, 0,
-+					 gintmsk.d32);
-+
-+			break;
-+		}
-+#endif /* CONFIG_USB_DWC_OTG_LPM */
-+	default:
-+error:
-+		retval = -DWC_E_INVALID;
-+		DWC_WARN("DWC OTG HCD - "
-+			 "Unknown hub control request type or invalid typeReq: %xh wIndex: %xh wValue: %xh\n",
-+			 typeReq, wIndex, wValue);
-+		break;
-+	}
-+
-+	return retval;
-+}
-+
-+#ifdef CONFIG_USB_DWC_OTG_LPM
-+/** Returns index of host channel to perform LPM transaction. */
-+int dwc_otg_hcd_get_hc_for_lpm_tran(dwc_otg_hcd_t * hcd, uint8_t devaddr)
-+{
-+	dwc_otg_core_if_t *core_if = hcd->core_if;
-+	dwc_hc_t *hc;
-+	hcchar_data_t hcchar;
-+	gintmsk_data_t gintmsk = {.d32 = 0 };
-+
-+	if (DWC_CIRCLEQ_EMPTY(&hcd->free_hc_list)) {
-+		DWC_PRINTF("No free channel to select for LPM transaction\n");
-+		return -1;
-+	}
-+
-+	hc = DWC_CIRCLEQ_FIRST(&hcd->free_hc_list);
-+
-+	/* Mask host channel interrupts. */
-+	gintmsk.b.hcintr = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gintmsk, gintmsk.d32, 0);
-+
-+	/* Fill fields that core needs for LPM transaction */
-+	hcchar.b.devaddr = devaddr;
-+	hcchar.b.epnum = 0;
-+	hcchar.b.eptype = DWC_OTG_EP_TYPE_CONTROL;
-+	hcchar.b.mps = 64;
-+	hcchar.b.lspddev = (hc->speed == DWC_OTG_EP_SPEED_LOW);
-+	hcchar.b.epdir = 0;	/* OUT */
-+	DWC_WRITE_REG32(&core_if->host_if->hc_regs[hc->hc_num]->hcchar,
-+			hcchar.d32);
-+
-+	/* Remove the host channel from the free list. */
-+	DWC_CIRCLEQ_REMOVE_INIT(&hcd->free_hc_list, hc, hc_list_entry);
-+
-+	DWC_PRINTF("hcnum = %d devaddr = %d\n", hc->hc_num, devaddr);
-+
-+	return hc->hc_num;
-+}
-+
-+/** Release hc after performing LPM transaction */
-+void dwc_otg_hcd_free_hc_from_lpm(dwc_otg_hcd_t * hcd)
-+{
-+	dwc_hc_t *hc;
-+	glpmcfg_data_t lpmcfg;
-+	uint8_t hc_num;
-+
-+	lpmcfg.d32 = DWC_READ_REG32(&hcd->core_if->core_global_regs->glpmcfg);
-+	hc_num = lpmcfg.b.lpm_chan_index;
-+
-+	hc = hcd->hc_ptr_array[hc_num];
-+
-+	DWC_PRINTF("Freeing channel %d after LPM\n", hc_num);
-+	/* Return host channel to free list */
-+	DWC_CIRCLEQ_INSERT_TAIL(&hcd->free_hc_list, hc, hc_list_entry);
-+}
-+
-+int dwc_otg_hcd_send_lpm(dwc_otg_hcd_t * hcd, uint8_t devaddr, uint8_t hird,
-+			 uint8_t bRemoteWake)
-+{
-+	glpmcfg_data_t lpmcfg;
-+	pcgcctl_data_t pcgcctl = {.d32 = 0 };
-+	int channel;
-+
-+	channel = dwc_otg_hcd_get_hc_for_lpm_tran(hcd, devaddr);
-+	if (channel < 0) {
-+		return channel;
-+	}
-+
-+	pcgcctl.b.enbl_sleep_gating = 1;
-+	DWC_MODIFY_REG32(hcd->core_if->pcgcctl, 0, pcgcctl.d32);
-+
-+	/* Read LPM config register */
-+	lpmcfg.d32 = DWC_READ_REG32(&hcd->core_if->core_global_regs->glpmcfg);
-+
-+	/* Program LPM transaction fields */
-+	lpmcfg.b.rem_wkup_en = bRemoteWake;
-+	lpmcfg.b.hird = hird;
-+	lpmcfg.b.hird_thres = 0x1c;
-+	lpmcfg.b.lpm_chan_index = channel;
-+	lpmcfg.b.en_utmi_sleep = 1;
-+	/* Program LPM config register */
-+	DWC_WRITE_REG32(&hcd->core_if->core_global_regs->glpmcfg, lpmcfg.d32);
-+
-+	/* Send LPM transaction */
-+	lpmcfg.b.send_lpm = 1;
-+	DWC_WRITE_REG32(&hcd->core_if->core_global_regs->glpmcfg, lpmcfg.d32);
-+
-+	return 0;
-+}
-+
-+#endif /* CONFIG_USB_DWC_OTG_LPM */
-+
-+int dwc_otg_hcd_is_status_changed(dwc_otg_hcd_t * hcd, int port)
-+{
-+	int retval;
-+
-+	if (port != 1) {
-+		return -DWC_E_INVALID;
-+	}
-+
-+	retval = (hcd->flags.b.port_connect_status_change ||
-+		  hcd->flags.b.port_reset_change ||
-+		  hcd->flags.b.port_enable_change ||
-+		  hcd->flags.b.port_suspend_change ||
-+		  hcd->flags.b.port_over_current_change);
-+#ifdef DEBUG
-+	if (retval) {
-+		DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD HUB STATUS DATA:"
-+			    " Root port status changed\n");
-+		DWC_DEBUGPL(DBG_HCDV, "  port_connect_status_change: %d\n",
-+			    hcd->flags.b.port_connect_status_change);
-+		DWC_DEBUGPL(DBG_HCDV, "  port_reset_change: %d\n",
-+			    hcd->flags.b.port_reset_change);
-+		DWC_DEBUGPL(DBG_HCDV, "  port_enable_change: %d\n",
-+			    hcd->flags.b.port_enable_change);
-+		DWC_DEBUGPL(DBG_HCDV, "  port_suspend_change: %d\n",
-+			    hcd->flags.b.port_suspend_change);
-+		DWC_DEBUGPL(DBG_HCDV, "  port_over_current_change: %d\n",
-+			    hcd->flags.b.port_over_current_change);
-+	}
-+#endif
-+	return retval;
-+}
-+
-+int dwc_otg_hcd_get_frame_number(dwc_otg_hcd_t * dwc_otg_hcd)
-+{
-+	hfnum_data_t hfnum;
-+	hfnum.d32 =
-+	    DWC_READ_REG32(&dwc_otg_hcd->core_if->host_if->host_global_regs->
-+			   hfnum);
-+
-+#ifdef DEBUG_SOF
-+	DWC_DEBUGPL(DBG_HCDV, "DWC OTG HCD GET FRAME NUMBER %d\n",
-+		    hfnum.b.frnum);
-+#endif
-+	return hfnum.b.frnum;
-+}
-+
-+int dwc_otg_hcd_start(dwc_otg_hcd_t * hcd,
-+		      struct dwc_otg_hcd_function_ops *fops)
-+{
-+	int retval = 0;
-+
-+	hcd->fops = fops;
-+	if (!dwc_otg_is_device_mode(hcd->core_if) &&
-+		(!hcd->core_if->adp_enable || hcd->core_if->adp.adp_started)) {
-+		dwc_otg_hcd_reinit(hcd);
-+	} else {
-+		retval = -DWC_E_NO_DEVICE;
-+	}
-+
-+	return retval;
-+}
-+
-+void *dwc_otg_hcd_get_priv_data(dwc_otg_hcd_t * hcd)
-+{
-+	return hcd->priv;
-+}
-+
-+void dwc_otg_hcd_set_priv_data(dwc_otg_hcd_t * hcd, void *priv_data)
-+{
-+	hcd->priv = priv_data;
-+}
-+
-+uint32_t dwc_otg_hcd_otg_port(dwc_otg_hcd_t * hcd)
-+{
-+	return hcd->otg_port;
-+}
-+
-+uint32_t dwc_otg_hcd_is_b_host(dwc_otg_hcd_t * hcd)
-+{
-+	uint32_t is_b_host;
-+	if (hcd->core_if->op_state == B_HOST) {
-+		is_b_host = 1;
-+	} else {
-+		is_b_host = 0;
-+	}
-+
-+	return is_b_host;
-+}
-+
-+dwc_otg_hcd_urb_t *dwc_otg_hcd_urb_alloc(dwc_otg_hcd_t * hcd,
-+					 int iso_desc_count, int atomic_alloc)
-+{
-+	dwc_otg_hcd_urb_t *dwc_otg_urb;
-+	uint32_t size;
-+
-+	size =
-+	    sizeof(*dwc_otg_urb) +
-+	    iso_desc_count * sizeof(struct dwc_otg_hcd_iso_packet_desc);
-+	if (atomic_alloc)
-+		dwc_otg_urb = DWC_ALLOC_ATOMIC(size);
-+	else
-+		dwc_otg_urb = DWC_ALLOC(size);
-+
-+        if (dwc_otg_urb)
-+		dwc_otg_urb->packet_count = iso_desc_count;
-+        else {
-+		DWC_ERROR("**** DWC OTG HCD URB alloc - "
-+			"%salloc of %db failed\n",
-+			atomic_alloc?"atomic ":"", size);
-+	}
-+	return dwc_otg_urb;
-+}
-+
-+void dwc_otg_hcd_urb_set_pipeinfo(dwc_otg_hcd_urb_t * dwc_otg_urb,
-+				  uint8_t dev_addr, uint8_t ep_num,
-+				  uint8_t ep_type, uint8_t ep_dir, uint16_t mps)
-+{
-+	dwc_otg_hcd_fill_pipe(&dwc_otg_urb->pipe_info, dev_addr, ep_num,
-+			      ep_type, ep_dir, mps);
-+#if 0
-+	DWC_PRINTF
-+	    ("addr = %d, ep_num = %d, ep_dir = 0x%x, ep_type = 0x%x, mps = %d\n",
-+	     dev_addr, ep_num, ep_dir, ep_type, mps);
-+#endif
-+}
-+
-+void dwc_otg_hcd_urb_set_params(dwc_otg_hcd_urb_t * dwc_otg_urb,
-+				void *urb_handle, void *buf, dwc_dma_t dma,
-+				uint32_t buflen, void *setup_packet,
-+				dwc_dma_t setup_dma, uint32_t flags,
-+				uint16_t interval)
-+{
-+	dwc_otg_urb->priv = urb_handle;
-+	dwc_otg_urb->buf = buf;
-+	dwc_otg_urb->dma = dma;
-+	dwc_otg_urb->length = buflen;
-+	dwc_otg_urb->setup_packet = setup_packet;
-+	dwc_otg_urb->setup_dma = setup_dma;
-+	dwc_otg_urb->flags = flags;
-+	dwc_otg_urb->interval = interval;
-+	dwc_otg_urb->status = -DWC_E_IN_PROGRESS;
-+}
-+
-+uint32_t dwc_otg_hcd_urb_get_status(dwc_otg_hcd_urb_t * dwc_otg_urb)
-+{
-+	return dwc_otg_urb->status;
-+}
-+
-+uint32_t dwc_otg_hcd_urb_get_actual_length(dwc_otg_hcd_urb_t * dwc_otg_urb)
-+{
-+	return dwc_otg_urb->actual_length;
-+}
-+
-+uint32_t dwc_otg_hcd_urb_get_error_count(dwc_otg_hcd_urb_t * dwc_otg_urb)
-+{
-+	return dwc_otg_urb->error_count;
-+}
-+
-+void dwc_otg_hcd_urb_set_iso_desc_params(dwc_otg_hcd_urb_t * dwc_otg_urb,
-+					 int desc_num, uint32_t offset,
-+					 uint32_t length)
-+{
-+	dwc_otg_urb->iso_descs[desc_num].offset = offset;
-+	dwc_otg_urb->iso_descs[desc_num].length = length;
-+}
-+
-+uint32_t dwc_otg_hcd_urb_get_iso_desc_status(dwc_otg_hcd_urb_t * dwc_otg_urb,
-+					     int desc_num)
-+{
-+	return dwc_otg_urb->iso_descs[desc_num].status;
-+}
-+
-+uint32_t dwc_otg_hcd_urb_get_iso_desc_actual_length(dwc_otg_hcd_urb_t *
-+						    dwc_otg_urb, int desc_num)
-+{
-+	return dwc_otg_urb->iso_descs[desc_num].actual_length;
-+}
-+
-+int dwc_otg_hcd_is_bandwidth_allocated(dwc_otg_hcd_t * hcd, void *ep_handle)
-+{
-+	int allocated = 0;
-+	dwc_otg_qh_t *qh = (dwc_otg_qh_t *) ep_handle;
-+
-+	if (qh) {
-+		if (!DWC_LIST_EMPTY(&qh->qh_list_entry)) {
-+			allocated = 1;
-+		}
-+	}
-+	return allocated;
-+}
-+
-+int dwc_otg_hcd_is_bandwidth_freed(dwc_otg_hcd_t * hcd, void *ep_handle)
-+{
-+	dwc_otg_qh_t *qh = (dwc_otg_qh_t *) ep_handle;
-+	int freed = 0;
-+	DWC_ASSERT(qh, "qh is not allocated\n");
-+
-+	if (DWC_LIST_EMPTY(&qh->qh_list_entry)) {
-+		freed = 1;
-+	}
-+
-+	return freed;
-+}
-+
-+uint8_t dwc_otg_hcd_get_ep_bandwidth(dwc_otg_hcd_t * hcd, void *ep_handle)
-+{
-+	dwc_otg_qh_t *qh = (dwc_otg_qh_t *) ep_handle;
-+	DWC_ASSERT(qh, "qh is not allocated\n");
-+	return qh->usecs;
-+}
-+
-+void dwc_otg_hcd_dump_state(dwc_otg_hcd_t * hcd)
-+{
-+#ifdef DEBUG
-+	int num_channels;
-+	int i;
-+	gnptxsts_data_t np_tx_status;
-+	hptxsts_data_t p_tx_status;
-+
-+	num_channels = hcd->core_if->core_params->host_channels;
-+	DWC_PRINTF("\n");
-+	DWC_PRINTF
-+	    ("************************************************************\n");
-+	DWC_PRINTF("HCD State:\n");
-+	DWC_PRINTF("  Num channels: %d\n", num_channels);
-+	for (i = 0; i < num_channels; i++) {
-+		dwc_hc_t *hc = hcd->hc_ptr_array[i];
-+		DWC_PRINTF("  Channel %d:\n", i);
-+		DWC_PRINTF("    dev_addr: %d, ep_num: %d, ep_is_in: %d\n",
-+			   hc->dev_addr, hc->ep_num, hc->ep_is_in);
-+		DWC_PRINTF("    speed: %d\n", hc->speed);
-+		DWC_PRINTF("    ep_type: %d\n", hc->ep_type);
-+		DWC_PRINTF("    max_packet: %d\n", hc->max_packet);
-+		DWC_PRINTF("    data_pid_start: %d\n", hc->data_pid_start);
-+		DWC_PRINTF("    multi_count: %d\n", hc->multi_count);
-+		DWC_PRINTF("    xfer_started: %d\n", hc->xfer_started);
-+		DWC_PRINTF("    xfer_buff: %p\n", hc->xfer_buff);
-+		DWC_PRINTF("    xfer_len: %d\n", hc->xfer_len);
-+		DWC_PRINTF("    xfer_count: %d\n", hc->xfer_count);
-+		DWC_PRINTF("    halt_on_queue: %d\n", hc->halt_on_queue);
-+		DWC_PRINTF("    halt_pending: %d\n", hc->halt_pending);
-+		DWC_PRINTF("    halt_status: %d\n", hc->halt_status);
-+		DWC_PRINTF("    do_split: %d\n", hc->do_split);
-+		DWC_PRINTF("    complete_split: %d\n", hc->complete_split);
-+		DWC_PRINTF("    hub_addr: %d\n", hc->hub_addr);
-+		DWC_PRINTF("    port_addr: %d\n", hc->port_addr);
-+		DWC_PRINTF("    xact_pos: %d\n", hc->xact_pos);
-+		DWC_PRINTF("    requests: %d\n", hc->requests);
-+		DWC_PRINTF("    qh: %p\n", hc->qh);
-+		if (hc->xfer_started) {
-+			hfnum_data_t hfnum;
-+			hcchar_data_t hcchar;
-+			hctsiz_data_t hctsiz;
-+			hcint_data_t hcint;
-+			hcintmsk_data_t hcintmsk;
-+			hfnum.d32 =
-+			    DWC_READ_REG32(&hcd->core_if->
-+					   host_if->host_global_regs->hfnum);
-+			hcchar.d32 =
-+			    DWC_READ_REG32(&hcd->core_if->host_if->
-+					   hc_regs[i]->hcchar);
-+			hctsiz.d32 =
-+			    DWC_READ_REG32(&hcd->core_if->host_if->
-+					   hc_regs[i]->hctsiz);
-+			hcint.d32 =
-+			    DWC_READ_REG32(&hcd->core_if->host_if->
-+					   hc_regs[i]->hcint);
-+			hcintmsk.d32 =
-+			    DWC_READ_REG32(&hcd->core_if->host_if->
-+					   hc_regs[i]->hcintmsk);
-+			DWC_PRINTF("    hfnum: 0x%08x\n", hfnum.d32);
-+			DWC_PRINTF("    hcchar: 0x%08x\n", hcchar.d32);
-+			DWC_PRINTF("    hctsiz: 0x%08x\n", hctsiz.d32);
-+			DWC_PRINTF("    hcint: 0x%08x\n", hcint.d32);
-+			DWC_PRINTF("    hcintmsk: 0x%08x\n", hcintmsk.d32);
-+		}
-+		if (hc->xfer_started && hc->qh) {
-+			dwc_otg_qtd_t *qtd;
-+			dwc_otg_hcd_urb_t *urb;
-+
-+			DWC_CIRCLEQ_FOREACH(qtd, &hc->qh->qtd_list, qtd_list_entry) {
-+				if (!qtd->in_process)
-+					break;
-+
-+				urb = qtd->urb;
-+			DWC_PRINTF("    URB Info:\n");
-+			DWC_PRINTF("      qtd: %p, urb: %p\n", qtd, urb);
-+			if (urb) {
-+				DWC_PRINTF("      Dev: %d, EP: %d %s\n",
-+					   dwc_otg_hcd_get_dev_addr(&urb->
-+								    pipe_info),
-+					   dwc_otg_hcd_get_ep_num(&urb->
-+								  pipe_info),
-+					   dwc_otg_hcd_is_pipe_in(&urb->
-+								  pipe_info) ?
-+					   "IN" : "OUT");
-+				DWC_PRINTF("      Max packet size: %d\n",
-+					   dwc_otg_hcd_get_mps(&urb->
-+							       pipe_info));
-+				DWC_PRINTF("      transfer_buffer: %p\n",
-+					   urb->buf);
-+				DWC_PRINTF("      transfer_dma: %p\n",
-+					   (void *)urb->dma);
-+				DWC_PRINTF("      transfer_buffer_length: %d\n",
-+					   urb->length);
-+					DWC_PRINTF("      actual_length: %d\n",
-+						   urb->actual_length);
-+				}
-+			}
-+		}
-+	}
-+	DWC_PRINTF("  non_periodic_channels: %d\n", hcd->non_periodic_channels);
-+	DWC_PRINTF("  periodic_channels: %d\n", hcd->periodic_channels);
-+	DWC_PRINTF("  periodic_usecs: %d\n", hcd->periodic_usecs);
-+	np_tx_status.d32 =
-+	    DWC_READ_REG32(&hcd->core_if->core_global_regs->gnptxsts);
-+	DWC_PRINTF("  NP Tx Req Queue Space Avail: %d\n",
-+		   np_tx_status.b.nptxqspcavail);
-+	DWC_PRINTF("  NP Tx FIFO Space Avail: %d\n",
-+		   np_tx_status.b.nptxfspcavail);
-+	p_tx_status.d32 =
-+	    DWC_READ_REG32(&hcd->core_if->host_if->host_global_regs->hptxsts);
-+	DWC_PRINTF("  P Tx Req Queue Space Avail: %d\n",
-+		   p_tx_status.b.ptxqspcavail);
-+	DWC_PRINTF("  P Tx FIFO Space Avail: %d\n", p_tx_status.b.ptxfspcavail);
-+	dwc_otg_hcd_dump_frrem(hcd);
-+	dwc_otg_dump_global_registers(hcd->core_if);
-+	dwc_otg_dump_host_registers(hcd->core_if);
-+	DWC_PRINTF
-+	    ("************************************************************\n");
-+	DWC_PRINTF("\n");
-+#endif
-+}
-+
-+#ifdef DEBUG
-+void dwc_print_setup_data(uint8_t * setup)
-+{
-+	int i;
-+	if (CHK_DEBUG_LEVEL(DBG_HCD)) {
-+		DWC_PRINTF("Setup Data = MSB ");
-+		for (i = 7; i >= 0; i--)
-+			DWC_PRINTF("%02x ", setup[i]);
-+		DWC_PRINTF("\n");
-+		DWC_PRINTF("  bmRequestType Tranfer = %s\n",
-+			   (setup[0] & 0x80) ? "Device-to-Host" :
-+			   "Host-to-Device");
-+		DWC_PRINTF("  bmRequestType Type = ");
-+		switch ((setup[0] & 0x60) >> 5) {
-+		case 0:
-+			DWC_PRINTF("Standard\n");
-+			break;
-+		case 1:
-+			DWC_PRINTF("Class\n");
-+			break;
-+		case 2:
-+			DWC_PRINTF("Vendor\n");
-+			break;
-+		case 3:
-+			DWC_PRINTF("Reserved\n");
-+			break;
-+		}
-+		DWC_PRINTF("  bmRequestType Recipient = ");
-+		switch (setup[0] & 0x1f) {
-+		case 0:
-+			DWC_PRINTF("Device\n");
-+			break;
-+		case 1:
-+			DWC_PRINTF("Interface\n");
-+			break;
-+		case 2:
-+			DWC_PRINTF("Endpoint\n");
-+			break;
-+		case 3:
-+			DWC_PRINTF("Other\n");
-+			break;
-+		default:
-+			DWC_PRINTF("Reserved\n");
-+			break;
-+		}
-+		DWC_PRINTF("  bRequest = 0x%0x\n", setup[1]);
-+		DWC_PRINTF("  wValue = 0x%0x\n", *((uint16_t *) & setup[2]));
-+		DWC_PRINTF("  wIndex = 0x%0x\n", *((uint16_t *) & setup[4]));
-+		DWC_PRINTF("  wLength = 0x%0x\n\n", *((uint16_t *) & setup[6]));
-+	}
-+}
-+#endif
-+
-+void dwc_otg_hcd_dump_frrem(dwc_otg_hcd_t * hcd)
-+{
-+#if 0
-+	DWC_PRINTF("Frame remaining at SOF:\n");
-+	DWC_PRINTF("  samples %u, accum %llu, avg %llu\n",
-+		   hcd->frrem_samples, hcd->frrem_accum,
-+		   (hcd->frrem_samples > 0) ?
-+		   hcd->frrem_accum / hcd->frrem_samples : 0);
-+
-+	DWC_PRINTF("\n");
-+	DWC_PRINTF("Frame remaining at start_transfer (uframe 7):\n");
-+	DWC_PRINTF("  samples %u, accum %llu, avg %llu\n",
-+		   hcd->core_if->hfnum_7_samples,
-+		   hcd->core_if->hfnum_7_frrem_accum,
-+		   (hcd->core_if->hfnum_7_samples >
-+		    0) ? hcd->core_if->hfnum_7_frrem_accum /
-+		   hcd->core_if->hfnum_7_samples : 0);
-+	DWC_PRINTF("Frame remaining at start_transfer (uframe 0):\n");
-+	DWC_PRINTF("  samples %u, accum %llu, avg %llu\n",
-+		   hcd->core_if->hfnum_0_samples,
-+		   hcd->core_if->hfnum_0_frrem_accum,
-+		   (hcd->core_if->hfnum_0_samples >
-+		    0) ? hcd->core_if->hfnum_0_frrem_accum /
-+		   hcd->core_if->hfnum_0_samples : 0);
-+	DWC_PRINTF("Frame remaining at start_transfer (uframe 1-6):\n");
-+	DWC_PRINTF("  samples %u, accum %llu, avg %llu\n",
-+		   hcd->core_if->hfnum_other_samples,
-+		   hcd->core_if->hfnum_other_frrem_accum,
-+		   (hcd->core_if->hfnum_other_samples >
-+		    0) ? hcd->core_if->hfnum_other_frrem_accum /
-+		   hcd->core_if->hfnum_other_samples : 0);
-+
-+	DWC_PRINTF("\n");
-+	DWC_PRINTF("Frame remaining at sample point A (uframe 7):\n");
-+	DWC_PRINTF("  samples %u, accum %llu, avg %llu\n",
-+		   hcd->hfnum_7_samples_a, hcd->hfnum_7_frrem_accum_a,
-+		   (hcd->hfnum_7_samples_a > 0) ?
-+		   hcd->hfnum_7_frrem_accum_a / hcd->hfnum_7_samples_a : 0);
-+	DWC_PRINTF("Frame remaining at sample point A (uframe 0):\n");
-+	DWC_PRINTF("  samples %u, accum %llu, avg %llu\n",
-+		   hcd->hfnum_0_samples_a, hcd->hfnum_0_frrem_accum_a,
-+		   (hcd->hfnum_0_samples_a > 0) ?
-+		   hcd->hfnum_0_frrem_accum_a / hcd->hfnum_0_samples_a : 0);
-+	DWC_PRINTF("Frame remaining at sample point A (uframe 1-6):\n");
-+	DWC_PRINTF("  samples %u, accum %llu, avg %llu\n",
-+		   hcd->hfnum_other_samples_a, hcd->hfnum_other_frrem_accum_a,
-+		   (hcd->hfnum_other_samples_a > 0) ?
-+		   hcd->hfnum_other_frrem_accum_a /
-+		   hcd->hfnum_other_samples_a : 0);
-+
-+	DWC_PRINTF("\n");
-+	DWC_PRINTF("Frame remaining at sample point B (uframe 7):\n");
-+	DWC_PRINTF("  samples %u, accum %llu, avg %llu\n",
-+		   hcd->hfnum_7_samples_b, hcd->hfnum_7_frrem_accum_b,
-+		   (hcd->hfnum_7_samples_b > 0) ?
-+		   hcd->hfnum_7_frrem_accum_b / hcd->hfnum_7_samples_b : 0);
-+	DWC_PRINTF("Frame remaining at sample point B (uframe 0):\n");
-+	DWC_PRINTF("  samples %u, accum %llu, avg %llu\n",
-+		   hcd->hfnum_0_samples_b, hcd->hfnum_0_frrem_accum_b,
-+		   (hcd->hfnum_0_samples_b > 0) ?
-+		   hcd->hfnum_0_frrem_accum_b / hcd->hfnum_0_samples_b : 0);
-+	DWC_PRINTF("Frame remaining at sample point B (uframe 1-6):\n");
-+	DWC_PRINTF("  samples %u, accum %llu, avg %llu\n",
-+		   hcd->hfnum_other_samples_b, hcd->hfnum_other_frrem_accum_b,
-+		   (hcd->hfnum_other_samples_b > 0) ?
-+		   hcd->hfnum_other_frrem_accum_b /
-+		   hcd->hfnum_other_samples_b : 0);
-+#endif
-+}
-+
-+#endif /* DWC_DEVICE_ONLY */
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd.h
-@@ -0,0 +1,870 @@
-+/* ==========================================================================
-+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd.h $
-+ * $Revision: #58 $
-+ * $Date: 2011/09/15 $
-+ * $Change: 1846647 $
-+ *
-+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
-+ * "Software") is an Unsupported proprietary work of Synopsys, Inc. unless
-+ * otherwise expressly agreed to in writing between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product under
-+ * any End User Software License Agreement or Agreement for Licensed Product
-+ * with Synopsys or any supplement thereto. You are permitted to use and
-+ * redistribute this Software in source and binary forms, with or without
-+ * modification, provided that redistributions of source code must retain this
-+ * notice. You may not view, use, disclose, copy or distribute this file or
-+ * any information contained herein except pursuant to this license grant from
-+ * Synopsys. If you do not agree with this notice, including the disclaimer
-+ * below, then you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" BASIS
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS BE LIABLE FOR ANY DIRECT,
-+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================== */
-+#ifndef DWC_DEVICE_ONLY
-+#ifndef __DWC_HCD_H__
-+#define __DWC_HCD_H__
-+
-+#include "dwc_otg_os_dep.h"
-+#include "usb.h"
-+#include "dwc_otg_hcd_if.h"
-+#include "dwc_otg_core_if.h"
-+#include "dwc_list.h"
-+#include "dwc_otg_cil.h"
-+#include "dwc_otg_fiq_fsm.h"
-+#include "dwc_otg_driver.h"
-+
-+
-+/**
-+ * @file
-+ *
-+ * This file contains the structures, constants, and interfaces for
-+ * the Host Contoller Driver (HCD).
-+ *
-+ * The Host Controller Driver (HCD) is responsible for translating requests
-+ * from the USB Driver into the appropriate actions on the DWC_otg controller.
-+ * It isolates the USBD from the specifics of the controller by providing an
-+ * API to the USBD.
-+ */
-+
-+struct dwc_otg_hcd_pipe_info {
-+	uint8_t dev_addr;
-+	uint8_t ep_num;
-+	uint8_t pipe_type;
-+	uint8_t pipe_dir;
-+	uint16_t mps;
-+};
-+
-+struct dwc_otg_hcd_iso_packet_desc {
-+	uint32_t offset;
-+	uint32_t length;
-+	uint32_t actual_length;
-+	uint32_t status;
-+};
-+
-+struct dwc_otg_qtd;
-+
-+struct dwc_otg_hcd_urb {
-+	void *priv;
-+	struct dwc_otg_qtd *qtd;
-+	void *buf;
-+	dwc_dma_t dma;
-+	void *setup_packet;
-+	dwc_dma_t setup_dma;
-+	uint32_t length;
-+	uint32_t actual_length;
-+	uint32_t status;
-+	uint32_t error_count;
-+	uint32_t packet_count;
-+	uint32_t flags;
-+	uint16_t interval;
-+	struct dwc_otg_hcd_pipe_info pipe_info;
-+	struct dwc_otg_hcd_iso_packet_desc iso_descs[0];
-+};
-+
-+static inline uint8_t dwc_otg_hcd_get_ep_num(struct dwc_otg_hcd_pipe_info *pipe)
-+{
-+	return pipe->ep_num;
-+}
-+
-+static inline uint8_t dwc_otg_hcd_get_pipe_type(struct dwc_otg_hcd_pipe_info
-+						*pipe)
-+{
-+	return pipe->pipe_type;
-+}
-+
-+static inline uint16_t dwc_otg_hcd_get_mps(struct dwc_otg_hcd_pipe_info *pipe)
-+{
-+	return pipe->mps;
-+}
-+
-+static inline uint8_t dwc_otg_hcd_get_dev_addr(struct dwc_otg_hcd_pipe_info
-+					       *pipe)
-+{
-+	return pipe->dev_addr;
-+}
-+
-+static inline uint8_t dwc_otg_hcd_is_pipe_isoc(struct dwc_otg_hcd_pipe_info
-+					       *pipe)
-+{
-+	return (pipe->pipe_type == UE_ISOCHRONOUS);
-+}
-+
-+static inline uint8_t dwc_otg_hcd_is_pipe_int(struct dwc_otg_hcd_pipe_info
-+					      *pipe)
-+{
-+	return (pipe->pipe_type == UE_INTERRUPT);
-+}
-+
-+static inline uint8_t dwc_otg_hcd_is_pipe_bulk(struct dwc_otg_hcd_pipe_info
-+					       *pipe)
-+{
-+	return (pipe->pipe_type == UE_BULK);
-+}
-+
-+static inline uint8_t dwc_otg_hcd_is_pipe_control(struct dwc_otg_hcd_pipe_info
-+						  *pipe)
-+{
-+	return (pipe->pipe_type == UE_CONTROL);
-+}
-+
-+static inline uint8_t dwc_otg_hcd_is_pipe_in(struct dwc_otg_hcd_pipe_info *pipe)
-+{
-+	return (pipe->pipe_dir == UE_DIR_IN);
-+}
-+
-+static inline uint8_t dwc_otg_hcd_is_pipe_out(struct dwc_otg_hcd_pipe_info
-+					      *pipe)
-+{
-+	return (!dwc_otg_hcd_is_pipe_in(pipe));
-+}
-+
-+static inline void dwc_otg_hcd_fill_pipe(struct dwc_otg_hcd_pipe_info *pipe,
-+					 uint8_t devaddr, uint8_t ep_num,
-+					 uint8_t pipe_type, uint8_t pipe_dir,
-+					 uint16_t mps)
-+{
-+	pipe->dev_addr = devaddr;
-+	pipe->ep_num = ep_num;
-+	pipe->pipe_type = pipe_type;
-+	pipe->pipe_dir = pipe_dir;
-+	pipe->mps = mps;
-+}
-+
-+/**
-+ * Phases for control transfers.
-+ */
-+typedef enum dwc_otg_control_phase {
-+	DWC_OTG_CONTROL_SETUP,
-+	DWC_OTG_CONTROL_DATA,
-+	DWC_OTG_CONTROL_STATUS
-+} dwc_otg_control_phase_e;
-+
-+/** Transaction types. */
-+typedef enum dwc_otg_transaction_type {
-+	DWC_OTG_TRANSACTION_NONE          = 0,
-+	DWC_OTG_TRANSACTION_PERIODIC      = 1,
-+	DWC_OTG_TRANSACTION_NON_PERIODIC  = 2,
-+	DWC_OTG_TRANSACTION_ALL           = DWC_OTG_TRANSACTION_PERIODIC + DWC_OTG_TRANSACTION_NON_PERIODIC
-+} dwc_otg_transaction_type_e;
-+
-+struct dwc_otg_qh;
-+
-+/**
-+ * A Queue Transfer Descriptor (QTD) holds the state of a bulk, control,
-+ * interrupt, or isochronous transfer. A single QTD is created for each URB
-+ * (of one of these types) submitted to the HCD. The transfer associated with
-+ * a QTD may require one or multiple transactions.
-+ *
-+ * A QTD is linked to a Queue Head, which is entered in either the
-+ * non-periodic or periodic schedule for execution. When a QTD is chosen for
-+ * execution, some or all of its transactions may be executed. After
-+ * execution, the state of the QTD is updated. The QTD may be retired if all
-+ * its transactions are complete or if an error occurred. Otherwise, it
-+ * remains in the schedule so more transactions can be executed later.
-+ */
-+typedef struct dwc_otg_qtd {
-+	/**
-+	 * Determines the PID of the next data packet for the data phase of
-+	 * control transfers. Ignored for other transfer types.<br>
-+	 * One of the following values:
-+	 *	- DWC_OTG_HC_PID_DATA0
-+	 *	- DWC_OTG_HC_PID_DATA1
-+	 */
-+	uint8_t data_toggle;
-+
-+	/** Current phase for control transfers (Setup, Data, or Status). */
-+	dwc_otg_control_phase_e control_phase;
-+
-+	/** Keep track of the current split type
-+	 * for FS/LS endpoints on a HS Hub */
-+	uint8_t complete_split;
-+
-+	/** How many bytes transferred during SSPLIT OUT */
-+	uint32_t ssplit_out_xfer_count;
-+
-+	/**
-+	 * Holds the number of bus errors that have occurred for a transaction
-+	 * within this transfer.
-+	 */
-+	uint8_t error_count;
-+
-+	/**
-+	 * Index of the next frame descriptor for an isochronous transfer. A
-+	 * frame descriptor describes the buffer position and length of the
-+	 * data to be transferred in the next scheduled (micro)frame of an
-+	 * isochronous transfer. It also holds status for that transaction.
-+	 * The frame index starts at 0.
-+	 */
-+	uint16_t isoc_frame_index;
-+
-+	/** Position of the ISOC split on full/low speed */
-+	uint8_t isoc_split_pos;
-+
-+	/** Position of the ISOC split in the buffer for the current frame */
-+	uint16_t isoc_split_offset;
-+
-+	/** URB for this transfer */
-+	struct dwc_otg_hcd_urb *urb;
-+
-+	struct dwc_otg_qh *qh;
-+
-+	/** This list of QTDs */
-+	 DWC_CIRCLEQ_ENTRY(dwc_otg_qtd) qtd_list_entry;
-+
-+	/** Indicates if this QTD is currently processed by HW. */
-+	uint8_t in_process;
-+
-+	/** Number of DMA descriptors for this QTD */
-+	uint8_t n_desc;
-+
-+	/**
-+	 * Last activated frame(packet) index.
-+	 * Used in Descriptor DMA mode only.
-+	 */
-+	uint16_t isoc_frame_index_last;
-+
-+} dwc_otg_qtd_t;
-+
-+DWC_CIRCLEQ_HEAD(dwc_otg_qtd_list, dwc_otg_qtd);
-+
-+/**
-+ * A Queue Head (QH) holds the static characteristics of an endpoint and
-+ * maintains a list of transfers (QTDs) for that endpoint. A QH structure may
-+ * be entered in either the non-periodic or periodic schedule.
-+ */
-+typedef struct dwc_otg_qh {
-+	/**
-+	 * Endpoint type.
-+	 * One of the following values:
-+	 *	- UE_CONTROL
-+	 *	- UE_BULK
-+	 *	- UE_INTERRUPT
-+	 *	- UE_ISOCHRONOUS
-+	 */
-+	uint8_t ep_type;
-+	uint8_t ep_is_in;
-+
-+	/** wMaxPacketSize Field of Endpoint Descriptor. */
-+	uint16_t maxp;
-+
-+	/**
-+	 * Device speed.
-+	 * One of the following values:
-+	 *	- DWC_OTG_EP_SPEED_LOW
-+	 *	- DWC_OTG_EP_SPEED_FULL
-+	 *	- DWC_OTG_EP_SPEED_HIGH
-+	 */
-+	uint8_t dev_speed;
-+
-+	/**
-+	 * Determines the PID of the next data packet for non-control
-+	 * transfers. Ignored for control transfers.<br>
-+	 * One of the following values:
-+	 *	- DWC_OTG_HC_PID_DATA0
-+	 *	- DWC_OTG_HC_PID_DATA1
-+	 */
-+	uint8_t data_toggle;
-+
-+	/** Ping state if 1. */
-+	uint8_t ping_state;
-+
-+	/**
-+	 * List of QTDs for this QH.
-+	 */
-+	struct dwc_otg_qtd_list qtd_list;
-+
-+	/** Host channel currently processing transfers for this QH. */
-+	struct dwc_hc *channel;
-+
-+	/** Full/low speed endpoint on high-speed hub requires split. */
-+	uint8_t do_split;
-+
-+	/** @name Periodic schedule information */
-+	/** @{ */
-+
-+	/** Bandwidth in microseconds per (micro)frame. */
-+	uint16_t usecs;
-+
-+	/** Interval between transfers in (micro)frames. */
-+	uint16_t interval;
-+
-+	/**
-+	 * (micro)frame to initialize a periodic transfer. The transfer
-+	 * executes in the following (micro)frame.
-+	 */
-+	uint16_t sched_frame;
-+
-+	/*
-+	** Frame a NAK was received on this queue head, used to minimise NAK retransmission
-+	*/
-+	uint16_t nak_frame;
-+
-+	/** (micro)frame at which last start split was initialized. */
-+	uint16_t start_split_frame;
-+
-+	/** @} */
-+
-+	/**
-+	 * Used instead of original buffer if
-+	 * it(physical address) is not dword-aligned.
-+	 */
-+	uint8_t *dw_align_buf;
-+	dwc_dma_t dw_align_buf_dma;
-+
-+	/** Entry for QH in either the periodic or non-periodic schedule. */
-+	dwc_list_link_t qh_list_entry;
-+
-+	/** @name Descriptor DMA support */
-+	/** @{ */
-+
-+	/** Descriptor List. */
-+	dwc_otg_host_dma_desc_t *desc_list;
-+
-+	/** Descriptor List physical address. */
-+	dwc_dma_t desc_list_dma;
-+
-+	/**
-+	 * Xfer Bytes array.
-+	 * Each element corresponds to a descriptor and indicates
-+	 * original XferSize size value for the descriptor.
-+	 */
-+	uint32_t *n_bytes;
-+
-+	/** Actual number of transfer descriptors in a list. */
-+	uint16_t ntd;
-+
-+	/** First activated isochronous transfer descriptor index. */
-+	uint8_t td_first;
-+	/** Last activated isochronous transfer descriptor index. */
-+	uint8_t td_last;
-+
-+	/** @} */
-+
-+
-+	uint16_t speed;
-+	uint16_t frame_usecs[8];
-+
-+	uint32_t skip_count;
-+} dwc_otg_qh_t;
-+
-+DWC_CIRCLEQ_HEAD(hc_list, dwc_hc);
-+
-+typedef struct urb_tq_entry {
-+	struct urb *urb;
-+	DWC_TAILQ_ENTRY(urb_tq_entry) urb_tq_entries;
-+} urb_tq_entry_t;
-+
-+DWC_TAILQ_HEAD(urb_list, urb_tq_entry);
-+
-+/**
-+ * This structure holds the state of the HCD, including the non-periodic and
-+ * periodic schedules.
-+ */
-+struct dwc_otg_hcd {
-+	/** The DWC otg device pointer */
-+	struct dwc_otg_device *otg_dev;
-+	/** DWC OTG Core Interface Layer */
-+	dwc_otg_core_if_t *core_if;
-+
-+	/** Function HCD driver callbacks */
-+	struct dwc_otg_hcd_function_ops *fops;
-+
-+	/** Internal DWC HCD Flags */
-+	volatile union dwc_otg_hcd_internal_flags {
-+		uint32_t d32;
-+		struct {
-+			unsigned port_connect_status_change:1;
-+			unsigned port_connect_status:1;
-+			unsigned port_reset_change:1;
-+			unsigned port_enable_change:1;
-+			unsigned port_suspend_change:1;
-+			unsigned port_over_current_change:1;
-+			unsigned port_l1_change:1;
-+			unsigned port_speed:2;
-+			unsigned reserved:24;
-+		} b;
-+	} flags;
-+
-+	/**
-+	 * Inactive items in the non-periodic schedule. This is a list of
-+	 * Queue Heads. Transfers associated with these Queue Heads are not
-+	 * currently assigned to a host channel.
-+	 */
-+	dwc_list_link_t non_periodic_sched_inactive;
-+
-+	/**
-+	 * Active items in the non-periodic schedule. This is a list of
-+	 * Queue Heads. Transfers associated with these Queue Heads are
-+	 * currently assigned to a host channel.
-+	 */
-+	dwc_list_link_t non_periodic_sched_active;
-+
-+	/**
-+	 * Pointer to the next Queue Head to process in the active
-+	 * non-periodic schedule.
-+	 */
-+	dwc_list_link_t *non_periodic_qh_ptr;
-+
-+	/**
-+	 * Inactive items in the periodic schedule. This is a list of QHs for
-+	 * periodic transfers that are _not_ scheduled for the next frame.
-+	 * Each QH in the list has an interval counter that determines when it
-+	 * needs to be scheduled for execution. This scheduling mechanism
-+	 * allows only a simple calculation for periodic bandwidth used (i.e.
-+	 * must assume that all periodic transfers may need to execute in the
-+	 * same frame). However, it greatly simplifies scheduling and should
-+	 * be sufficient for the vast majority of OTG hosts, which need to
-+	 * connect to a small number of peripherals at one time.
-+	 *
-+	 * Items move from this list to periodic_sched_ready when the QH
-+	 * interval counter is 0 at SOF.
-+	 */
-+	dwc_list_link_t periodic_sched_inactive;
-+
-+	/**
-+	 * List of periodic QHs that are ready for execution in the next
-+	 * frame, but have not yet been assigned to host channels.
-+	 *
-+	 * Items move from this list to periodic_sched_assigned as host
-+	 * channels become available during the current frame.
-+	 */
-+	dwc_list_link_t periodic_sched_ready;
-+
-+	/**
-+	 * List of periodic QHs to be executed in the next frame that are
-+	 * assigned to host channels.
-+	 *
-+	 * Items move from this list to periodic_sched_queued as the
-+	 * transactions for the QH are queued to the DWC_otg controller.
-+	 */
-+	dwc_list_link_t periodic_sched_assigned;
-+
-+	/**
-+	 * List of periodic QHs that have been queued for execution.
-+	 *
-+	 * Items move from this list to either periodic_sched_inactive or
-+	 * periodic_sched_ready when the channel associated with the transfer
-+	 * is released. If the interval for the QH is 1, the item moves to
-+	 * periodic_sched_ready because it must be rescheduled for the next
-+	 * frame. Otherwise, the item moves to periodic_sched_inactive.
-+	 */
-+	dwc_list_link_t periodic_sched_queued;
-+
-+	/**
-+	 * Total bandwidth claimed so far for periodic transfers. This value
-+	 * is in microseconds per (micro)frame. The assumption is that all
-+	 * periodic transfers may occur in the same (micro)frame.
-+	 */
-+	uint16_t periodic_usecs;
-+
-+	/**
-+	 * Total bandwidth claimed so far for all periodic transfers
-+	 * in a frame.
-+	 * This will include a mixture of HS and FS transfers.
-+	 * Units are microseconds per (micro)frame.
-+	 * We have a budget per frame and have to schedule
-+	 * transactions accordingly.
-+	 * Watch out for the fact that things are actually scheduled for the
-+	 * "next frame".
-+	 */
-+	uint16_t                frame_usecs[8];
-+
-+
-+	/**
-+	 * Frame number read from the core at SOF. The value ranges from 0 to
-+	 * DWC_HFNUM_MAX_FRNUM.
-+	 */
-+	uint16_t frame_number;
-+
-+	/**
-+	 * Count of periodic QHs, if using several eps. For SOF enable/disable.
-+	 */
-+	uint16_t periodic_qh_count;
-+
-+	/**
-+	 * Free host channels in the controller. This is a list of
-+	 * dwc_hc_t items.
-+	 */
-+	struct hc_list free_hc_list;
-+	/**
-+	 * Number of host channels assigned to periodic transfers. Currently
-+	 * assuming that there is a dedicated host channel for each periodic
-+	 * transaction and at least one host channel available for
-+	 * non-periodic transactions.
-+	 */
-+	int periodic_channels; /* microframe_schedule==0 */
-+
-+	/**
-+	 * Number of host channels assigned to non-periodic transfers.
-+	 */
-+	int non_periodic_channels; /* microframe_schedule==0 */
-+
-+	/**
-+	 * Number of host channels assigned to non-periodic transfers.
-+	 */
-+	int available_host_channels;
-+
-+	/**
-+	 * Array of pointers to the host channel descriptors. Allows accessing
-+	 * a host channel descriptor given the host channel number. This is
-+	 * useful in interrupt handlers.
-+	 */
-+	struct dwc_hc *hc_ptr_array[MAX_EPS_CHANNELS];
-+
-+	/**
-+	 * Buffer to use for any data received during the status phase of a
-+	 * control transfer. Normally no data is transferred during the status
-+	 * phase. This buffer is used as a bit bucket.
-+	 */
-+	uint8_t *status_buf;
-+
-+	/**
-+	 * DMA address for status_buf.
-+	 */
-+	dma_addr_t status_buf_dma;
-+#define DWC_OTG_HCD_STATUS_BUF_SIZE 64
-+
-+	/**
-+	 * Connection timer. An OTG host must display a message if the device
-+	 * does not connect. Started when the VBus power is turned on via
-+	 * sysfs attribute "buspower".
-+	 */
-+	dwc_timer_t *conn_timer;
-+
-+	/* Tasket to do a reset */
-+	dwc_tasklet_t *reset_tasklet;
-+
-+	dwc_tasklet_t *completion_tasklet;
-+	struct urb_list completed_urb_list;
-+
-+	/*  */
-+	dwc_spinlock_t *lock;
-+	/**
-+	 * Private data that could be used by OS wrapper.
-+	 */
-+	void *priv;
-+
-+	uint8_t otg_port;
-+
-+	/** Frame List */
-+	uint32_t *frame_list;
-+
-+	/** Hub - Port assignment */
-+	int hub_port[128];
-+#ifdef FIQ_DEBUG
-+	int hub_port_alloc[2048];
-+#endif
-+
-+	/** Frame List DMA address */
-+	dma_addr_t frame_list_dma;
-+
-+	struct fiq_stack *fiq_stack;
-+	struct fiq_state *fiq_state;
-+
-+	/** Virtual address for split transaction DMA bounce buffers */
-+	struct fiq_dma_blob *fiq_dmab;
-+
-+#ifdef DEBUG
-+	uint32_t frrem_samples;
-+	uint64_t frrem_accum;
-+
-+	uint32_t hfnum_7_samples_a;
-+	uint64_t hfnum_7_frrem_accum_a;
-+	uint32_t hfnum_0_samples_a;
-+	uint64_t hfnum_0_frrem_accum_a;
-+	uint32_t hfnum_other_samples_a;
-+	uint64_t hfnum_other_frrem_accum_a;
-+
-+	uint32_t hfnum_7_samples_b;
-+	uint64_t hfnum_7_frrem_accum_b;
-+	uint32_t hfnum_0_samples_b;
-+	uint64_t hfnum_0_frrem_accum_b;
-+	uint32_t hfnum_other_samples_b;
-+	uint64_t hfnum_other_frrem_accum_b;
-+#endif
-+};
-+
-+static inline struct device *dwc_otg_hcd_to_dev(struct dwc_otg_hcd *hcd)
-+{
-+	return &hcd->otg_dev->os_dep.platformdev->dev;
-+}
-+
-+/** @name Transaction Execution Functions */
-+/** @{ */
-+extern dwc_otg_transaction_type_e dwc_otg_hcd_select_transactions(dwc_otg_hcd_t
-+								  * hcd);
-+extern void dwc_otg_hcd_queue_transactions(dwc_otg_hcd_t * hcd,
-+					   dwc_otg_transaction_type_e tr_type);
-+
-+int dwc_otg_hcd_allocate_port(dwc_otg_hcd_t * hcd, dwc_otg_qh_t *qh);
-+void dwc_otg_hcd_release_port(dwc_otg_hcd_t * dwc_otg_hcd, dwc_otg_qh_t *qh);
-+
-+extern int fiq_fsm_queue_transaction(dwc_otg_hcd_t *hcd, dwc_otg_qh_t *qh);
-+extern int fiq_fsm_transaction_suitable(dwc_otg_hcd_t *hcd, dwc_otg_qh_t *qh);
-+extern void dwc_otg_cleanup_fiq_channel(dwc_otg_hcd_t *hcd, uint32_t num);
-+
-+/** @} */
-+
-+/** @name Interrupt Handler Functions */
-+/** @{ */
-+extern int32_t dwc_otg_hcd_handle_intr(dwc_otg_hcd_t * dwc_otg_hcd);
-+extern int32_t dwc_otg_hcd_handle_sof_intr(dwc_otg_hcd_t * dwc_otg_hcd);
-+extern int32_t dwc_otg_hcd_handle_rx_status_q_level_intr(dwc_otg_hcd_t *
-+							 dwc_otg_hcd);
-+extern int32_t dwc_otg_hcd_handle_np_tx_fifo_empty_intr(dwc_otg_hcd_t *
-+							dwc_otg_hcd);
-+extern int32_t dwc_otg_hcd_handle_perio_tx_fifo_empty_intr(dwc_otg_hcd_t *
-+							   dwc_otg_hcd);
-+extern int32_t dwc_otg_hcd_handle_incomplete_periodic_intr(dwc_otg_hcd_t *
-+							   dwc_otg_hcd);
-+extern int32_t dwc_otg_hcd_handle_port_intr(dwc_otg_hcd_t * dwc_otg_hcd);
-+extern int32_t dwc_otg_hcd_handle_conn_id_status_change_intr(dwc_otg_hcd_t *
-+							     dwc_otg_hcd);
-+extern int32_t dwc_otg_hcd_handle_disconnect_intr(dwc_otg_hcd_t * dwc_otg_hcd);
-+extern int32_t dwc_otg_hcd_handle_hc_intr(dwc_otg_hcd_t * dwc_otg_hcd);
-+extern int32_t dwc_otg_hcd_handle_hc_n_intr(dwc_otg_hcd_t * dwc_otg_hcd,
-+					    uint32_t num);
-+extern int32_t dwc_otg_hcd_handle_session_req_intr(dwc_otg_hcd_t * dwc_otg_hcd);
-+extern int32_t dwc_otg_hcd_handle_wakeup_detected_intr(dwc_otg_hcd_t *
-+						       dwc_otg_hcd);
-+/** @} */
-+
-+/** @name Schedule Queue Functions */
-+/** @{ */
-+
-+/* Implemented in dwc_otg_hcd_queue.c */
-+extern dwc_otg_qh_t *dwc_otg_hcd_qh_create(dwc_otg_hcd_t * hcd,
-+					   dwc_otg_hcd_urb_t * urb, int atomic_alloc);
-+extern void dwc_otg_hcd_qh_free(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh);
-+extern int dwc_otg_hcd_qh_add(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh);
-+extern void dwc_otg_hcd_qh_remove(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh);
-+extern void dwc_otg_hcd_qh_deactivate(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh,
-+				      int sched_csplit);
-+
-+/** Remove and free a QH */
-+static inline void dwc_otg_hcd_qh_remove_and_free(dwc_otg_hcd_t * hcd,
-+						  dwc_otg_qh_t * qh)
-+{
-+	dwc_irqflags_t flags;
-+	DWC_SPINLOCK_IRQSAVE(hcd->lock, &flags);
-+	dwc_otg_hcd_qh_remove(hcd, qh);
-+	DWC_SPINUNLOCK_IRQRESTORE(hcd->lock, flags);
-+	dwc_otg_hcd_qh_free(hcd, qh);
-+}
-+
-+/** Allocates memory for a QH structure.
-+ * @return Returns the memory allocate or NULL on error. */
-+static inline dwc_otg_qh_t *dwc_otg_hcd_qh_alloc(int atomic_alloc)
-+{
-+	if (atomic_alloc)
-+		return (dwc_otg_qh_t *) DWC_ALLOC_ATOMIC(sizeof(dwc_otg_qh_t));
-+	else
-+		return (dwc_otg_qh_t *) DWC_ALLOC(sizeof(dwc_otg_qh_t));
-+}
-+
-+extern dwc_otg_qtd_t *dwc_otg_hcd_qtd_create(dwc_otg_hcd_urb_t * urb,
-+					     int atomic_alloc);
-+extern void dwc_otg_hcd_qtd_init(dwc_otg_qtd_t * qtd, dwc_otg_hcd_urb_t * urb);
-+extern int dwc_otg_hcd_qtd_add(dwc_otg_qtd_t * qtd, dwc_otg_hcd_t * dwc_otg_hcd,
-+			       dwc_otg_qh_t ** qh, int atomic_alloc);
-+
-+/** Allocates memory for a QTD structure.
-+ * @return Returns the memory allocate or NULL on error. */
-+static inline dwc_otg_qtd_t *dwc_otg_hcd_qtd_alloc(int atomic_alloc)
-+{
-+	if (atomic_alloc)
-+		return (dwc_otg_qtd_t *) DWC_ALLOC_ATOMIC(sizeof(dwc_otg_qtd_t));
-+	else
-+		return (dwc_otg_qtd_t *) DWC_ALLOC(sizeof(dwc_otg_qtd_t));
-+}
-+
-+/** Frees the memory for a QTD structure.  QTD should already be removed from
-+ * list.
-+ * @param qtd QTD to free.*/
-+static inline void dwc_otg_hcd_qtd_free(dwc_otg_qtd_t * qtd)
-+{
-+	DWC_FREE(qtd);
-+}
-+
-+/** Removes a QTD from list.
-+ * @param hcd HCD instance.
-+ * @param qtd QTD to remove from list.
-+ * @param qh QTD belongs to.
-+ */
-+static inline void dwc_otg_hcd_qtd_remove(dwc_otg_hcd_t * hcd,
-+					  dwc_otg_qtd_t * qtd,
-+					  dwc_otg_qh_t * qh)
-+{
-+	DWC_CIRCLEQ_REMOVE(&qh->qtd_list, qtd, qtd_list_entry);
-+}
-+
-+/** Remove and free a QTD
-+  * Need to disable IRQ and hold hcd lock while calling this function out of
-+  * interrupt servicing chain */
-+static inline void dwc_otg_hcd_qtd_remove_and_free(dwc_otg_hcd_t * hcd,
-+						   dwc_otg_qtd_t * qtd,
-+						   dwc_otg_qh_t * qh)
-+{
-+	dwc_otg_hcd_qtd_remove(hcd, qtd, qh);
-+	dwc_otg_hcd_qtd_free(qtd);
-+}
-+
-+/** @} */
-+
-+/** @name Descriptor DMA Supporting Functions */
-+/** @{ */
-+
-+extern void dwc_otg_hcd_start_xfer_ddma(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh);
-+extern void dwc_otg_hcd_complete_xfer_ddma(dwc_otg_hcd_t * hcd,
-+					   dwc_hc_t * hc,
-+					   dwc_otg_hc_regs_t * hc_regs,
-+					   dwc_otg_halt_status_e halt_status);
-+
-+extern int dwc_otg_hcd_qh_init_ddma(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh);
-+extern void dwc_otg_hcd_qh_free_ddma(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh);
-+
-+/** @} */
-+
-+/** @name Internal Functions */
-+/** @{ */
-+dwc_otg_qh_t *dwc_urb_to_qh(dwc_otg_hcd_urb_t * urb);
-+/** @} */
-+
-+#ifdef CONFIG_USB_DWC_OTG_LPM
-+extern int dwc_otg_hcd_get_hc_for_lpm_tran(dwc_otg_hcd_t * hcd,
-+					   uint8_t devaddr);
-+extern void dwc_otg_hcd_free_hc_from_lpm(dwc_otg_hcd_t * hcd);
-+#endif
-+
-+/** Gets the QH that contains the list_head */
-+#define dwc_list_to_qh(_list_head_ptr_) container_of(_list_head_ptr_, dwc_otg_qh_t, qh_list_entry)
-+
-+/** Gets the QTD that contains the list_head */
-+#define dwc_list_to_qtd(_list_head_ptr_) container_of(_list_head_ptr_, dwc_otg_qtd_t, qtd_list_entry)
-+
-+/** Check if QH is non-periodic  */
-+#define dwc_qh_is_non_per(_qh_ptr_) ((_qh_ptr_->ep_type == UE_BULK) || \
-+				     (_qh_ptr_->ep_type == UE_CONTROL))
-+
-+/** High bandwidth multiplier as encoded in highspeed endpoint descriptors */
-+#define dwc_hb_mult(wMaxPacketSize) (1 + (((wMaxPacketSize) >> 11) & 0x03))
-+
-+/** Packet size for any kind of endpoint descriptor */
-+#define dwc_max_packet(wMaxPacketSize) ((wMaxPacketSize) & 0x07ff)
-+
-+/**
-+ * Returns true if _frame1 is less than or equal to _frame2. The comparison is
-+ * done modulo DWC_HFNUM_MAX_FRNUM. This accounts for the rollover of the
-+ * frame number when the max frame number is reached.
-+ */
-+static inline int dwc_frame_num_le(uint16_t frame1, uint16_t frame2)
-+{
-+	return ((frame2 - frame1) & DWC_HFNUM_MAX_FRNUM) <=
-+	    (DWC_HFNUM_MAX_FRNUM >> 1);
-+}
-+
-+/**
-+ * Returns true if _frame1 is greater than _frame2. The comparison is done
-+ * modulo DWC_HFNUM_MAX_FRNUM. This accounts for the rollover of the frame
-+ * number when the max frame number is reached.
-+ */
-+static inline int dwc_frame_num_gt(uint16_t frame1, uint16_t frame2)
-+{
-+	return (frame1 != frame2) &&
-+	    (((frame1 - frame2) & DWC_HFNUM_MAX_FRNUM) <
-+	     (DWC_HFNUM_MAX_FRNUM >> 1));
-+}
-+
-+/**
-+ * Increments _frame by the amount specified by _inc. The addition is done
-+ * modulo DWC_HFNUM_MAX_FRNUM. Returns the incremented value.
-+ */
-+static inline uint16_t dwc_frame_num_inc(uint16_t frame, uint16_t inc)
-+{
-+	return (frame + inc) & DWC_HFNUM_MAX_FRNUM;
-+}
-+
-+static inline uint16_t dwc_full_frame_num(uint16_t frame)
-+{
-+	return (frame & DWC_HFNUM_MAX_FRNUM) >> 3;
-+}
-+
-+static inline uint16_t dwc_micro_frame_num(uint16_t frame)
-+{
-+	return frame & 0x7;
-+}
-+
-+extern void init_hcd_usecs(dwc_otg_hcd_t *_hcd);
-+
-+void dwc_otg_hcd_save_data_toggle(dwc_hc_t * hc,
-+				  dwc_otg_hc_regs_t * hc_regs,
-+				  dwc_otg_qtd_t * qtd);
-+
-+#ifdef DEBUG
-+/**
-+ * Macro to sample the remaining PHY clocks left in the current frame. This
-+ * may be used during debugging to determine the average time it takes to
-+ * execute sections of code. There are two possible sample points, "a" and
-+ * "b", so the _letter argument must be one of these values.
-+ *
-+ * To dump the average sample times, read the "hcd_frrem" sysfs attribute. For
-+ * example, "cat /sys/devices/lm0/hcd_frrem".
-+ */
-+#define dwc_sample_frrem(_hcd, _qh, _letter) \
-+{ \
-+	hfnum_data_t hfnum; \
-+	dwc_otg_qtd_t *qtd; \
-+	qtd = list_entry(_qh->qtd_list.next, dwc_otg_qtd_t, qtd_list_entry); \
-+	if (usb_pipeint(qtd->urb->pipe) && _qh->start_split_frame != 0 && !qtd->complete_split) { \
-+		hfnum.d32 = DWC_READ_REG32(&_hcd->core_if->host_if->host_global_regs->hfnum); \
-+		switch (hfnum.b.frnum & 0x7) { \
-+		case 7: \
-+			_hcd->hfnum_7_samples_##_letter++; \
-+			_hcd->hfnum_7_frrem_accum_##_letter += hfnum.b.frrem; \
-+			break; \
-+		case 0: \
-+			_hcd->hfnum_0_samples_##_letter++; \
-+			_hcd->hfnum_0_frrem_accum_##_letter += hfnum.b.frrem; \
-+			break; \
-+		default: \
-+			_hcd->hfnum_other_samples_##_letter++; \
-+			_hcd->hfnum_other_frrem_accum_##_letter += hfnum.b.frrem; \
-+			break; \
-+		} \
-+	} \
-+}
-+#else
-+#define dwc_sample_frrem(_hcd, _qh, _letter)
-+#endif
-+#endif
-+#endif /* DWC_DEVICE_ONLY */
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c
-@@ -0,0 +1,1135 @@
-+/*==========================================================================
-+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_ddma.c $
-+ * $Revision: #10 $
-+ * $Date: 2011/10/20 $
-+ * $Change: 1869464 $
-+ *
-+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
-+ * "Software") is an Unsupported proprietary work of Synopsys, Inc. unless
-+ * otherwise expressly agreed to in writing between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product under
-+ * any End User Software License Agreement or Agreement for Licensed Product
-+ * with Synopsys or any supplement thereto. You are permitted to use and
-+ * redistribute this Software in source and binary forms, with or without
-+ * modification, provided that redistributions of source code must retain this
-+ * notice. You may not view, use, disclose, copy or distribute this file or
-+ * any information contained herein except pursuant to this license grant from
-+ * Synopsys. If you do not agree with this notice, including the disclaimer
-+ * below, then you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" BASIS
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS BE LIABLE FOR ANY DIRECT,
-+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================== */
-+#ifndef DWC_DEVICE_ONLY
-+
-+/** @file
-+ * This file contains Descriptor DMA support implementation for host mode.
-+ */
-+
-+#include "dwc_otg_hcd.h"
-+#include "dwc_otg_regs.h"
-+
-+extern bool microframe_schedule;
-+
-+static inline uint8_t frame_list_idx(uint16_t frame)
-+{
-+	return (frame & (MAX_FRLIST_EN_NUM - 1));
-+}
-+
-+static inline uint16_t desclist_idx_inc(uint16_t idx, uint16_t inc, uint8_t speed)
-+{
-+	return (idx + inc) &
-+	    (((speed ==
-+	       DWC_OTG_EP_SPEED_HIGH) ? MAX_DMA_DESC_NUM_HS_ISOC :
-+	      MAX_DMA_DESC_NUM_GENERIC) - 1);
-+}
-+
-+static inline uint16_t desclist_idx_dec(uint16_t idx, uint16_t inc, uint8_t speed)
-+{
-+	return (idx - inc) &
-+	    (((speed ==
-+	       DWC_OTG_EP_SPEED_HIGH) ? MAX_DMA_DESC_NUM_HS_ISOC :
-+	      MAX_DMA_DESC_NUM_GENERIC) - 1);
-+}
-+
-+static inline uint16_t max_desc_num(dwc_otg_qh_t * qh)
-+{
-+	return (((qh->ep_type == UE_ISOCHRONOUS)
-+		 && (qh->dev_speed == DWC_OTG_EP_SPEED_HIGH))
-+		? MAX_DMA_DESC_NUM_HS_ISOC : MAX_DMA_DESC_NUM_GENERIC);
-+}
-+static inline uint16_t frame_incr_val(dwc_otg_qh_t * qh)
-+{
-+	return ((qh->dev_speed == DWC_OTG_EP_SPEED_HIGH)
-+		? ((qh->interval + 8 - 1) / 8)
-+		: qh->interval);
-+}
-+
-+static int desc_list_alloc(struct device *dev, dwc_otg_qh_t * qh)
-+{
-+	int retval = 0;
-+
-+	qh->desc_list = (dwc_otg_host_dma_desc_t *)
-+	    DWC_DMA_ALLOC(dev, sizeof(dwc_otg_host_dma_desc_t) * max_desc_num(qh),
-+			  &qh->desc_list_dma);
-+
-+	if (!qh->desc_list) {
-+		retval = -DWC_E_NO_MEMORY;
-+		DWC_ERROR("%s: DMA descriptor list allocation failed\n", __func__);
-+
-+	}
-+
-+	dwc_memset(qh->desc_list, 0x00,
-+		   sizeof(dwc_otg_host_dma_desc_t) * max_desc_num(qh));
-+
-+	qh->n_bytes =
-+	    (uint32_t *) DWC_ALLOC(sizeof(uint32_t) * max_desc_num(qh));
-+
-+	if (!qh->n_bytes) {
-+		retval = -DWC_E_NO_MEMORY;
-+		DWC_ERROR
-+		    ("%s: Failed to allocate array for descriptors' size actual values\n",
-+		     __func__);
-+
-+	}
-+	return retval;
-+
-+}
-+
-+static void desc_list_free(struct device *dev, dwc_otg_qh_t * qh)
-+{
-+	if (qh->desc_list) {
-+		DWC_DMA_FREE(dev, max_desc_num(qh), qh->desc_list,
-+			     qh->desc_list_dma);
-+		qh->desc_list = NULL;
-+	}
-+
-+	if (qh->n_bytes) {
-+		DWC_FREE(qh->n_bytes);
-+		qh->n_bytes = NULL;
-+	}
-+}
-+
-+static int frame_list_alloc(dwc_otg_hcd_t * hcd)
-+{
-+	struct device *dev = dwc_otg_hcd_to_dev(hcd);
-+	int retval = 0;
-+
-+	if (hcd->frame_list)
-+		return 0;
-+
-+	hcd->frame_list = DWC_DMA_ALLOC(dev, 4 * MAX_FRLIST_EN_NUM,
-+					&hcd->frame_list_dma);
-+	if (!hcd->frame_list) {
-+		retval = -DWC_E_NO_MEMORY;
-+		DWC_ERROR("%s: Frame List allocation failed\n", __func__);
-+	}
-+
-+	dwc_memset(hcd->frame_list, 0x00, 4 * MAX_FRLIST_EN_NUM);
-+
-+	return retval;
-+}
-+
-+static void frame_list_free(dwc_otg_hcd_t * hcd)
-+{
-+	struct device *dev = dwc_otg_hcd_to_dev(hcd);
-+
-+	if (!hcd->frame_list)
-+		return;
-+
-+	DWC_DMA_FREE(dev, 4 * MAX_FRLIST_EN_NUM, hcd->frame_list, hcd->frame_list_dma);
-+	hcd->frame_list = NULL;
-+}
-+
-+static void per_sched_enable(dwc_otg_hcd_t * hcd, uint16_t fr_list_en)
-+{
-+
-+	hcfg_data_t hcfg;
-+
-+	hcfg.d32 = DWC_READ_REG32(&hcd->core_if->host_if->host_global_regs->hcfg);
-+
-+	if (hcfg.b.perschedena) {
-+		/* already enabled */
-+		return;
-+	}
-+
-+	DWC_WRITE_REG32(&hcd->core_if->host_if->host_global_regs->hflbaddr,
-+			hcd->frame_list_dma);
-+
-+	switch (fr_list_en) {
-+	case 64:
-+		hcfg.b.frlisten = 3;
-+		break;
-+	case 32:
-+		hcfg.b.frlisten = 2;
-+		break;
-+	case 16:
-+		hcfg.b.frlisten = 1;
-+		break;
-+	case 8:
-+		hcfg.b.frlisten = 0;
-+		break;
-+	default:
-+		break;
-+	}
-+
-+	hcfg.b.perschedena = 1;
-+
-+	DWC_DEBUGPL(DBG_HCD, "Enabling Periodic schedule\n");
-+	DWC_WRITE_REG32(&hcd->core_if->host_if->host_global_regs->hcfg, hcfg.d32);
-+
-+}
-+
-+static void per_sched_disable(dwc_otg_hcd_t * hcd)
-+{
-+	hcfg_data_t hcfg;
-+
-+	hcfg.d32 = DWC_READ_REG32(&hcd->core_if->host_if->host_global_regs->hcfg);
-+
-+	if (!hcfg.b.perschedena) {
-+		/* already disabled */
-+		return;
-+	}
-+	hcfg.b.perschedena = 0;
-+
-+	DWC_DEBUGPL(DBG_HCD, "Disabling Periodic schedule\n");
-+	DWC_WRITE_REG32(&hcd->core_if->host_if->host_global_regs->hcfg, hcfg.d32);
-+}
-+
-+/*
-+ * Activates/Deactivates FrameList entries for the channel
-+ * based on endpoint servicing period.
-+ */
-+void update_frame_list(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh, uint8_t enable)
-+{
-+	uint16_t i, j, inc;
-+	dwc_hc_t *hc = NULL;
-+
-+	if (!qh->channel) {
-+		DWC_ERROR("qh->channel = %p", qh->channel);
-+		return;
-+	}
-+
-+	if (!hcd) {
-+		DWC_ERROR("------hcd = %p", hcd);
-+		return;
-+	}
-+
-+	if (!hcd->frame_list) {
-+		DWC_ERROR("-------hcd->frame_list = %p", hcd->frame_list);
-+		return;
-+	}
-+
-+	hc = qh->channel;
-+	inc = frame_incr_val(qh);
-+	if (qh->ep_type == UE_ISOCHRONOUS)
-+		i = frame_list_idx(qh->sched_frame);
-+	else
-+		i = 0;
-+
-+	j = i;
-+	do {
-+		if (enable)
-+			hcd->frame_list[j] |= (1 << hc->hc_num);
-+		else
-+			hcd->frame_list[j] &= ~(1 << hc->hc_num);
-+		j = (j + inc) & (MAX_FRLIST_EN_NUM - 1);
-+	}
-+	while (j != i);
-+	if (!enable)
-+		return;
-+	hc->schinfo = 0;
-+	if (qh->channel->speed == DWC_OTG_EP_SPEED_HIGH) {
-+		j = 1;
-+		/* TODO - check this */
-+		inc = (8 + qh->interval - 1) / qh->interval;
-+		for (i = 0; i < inc; i++) {
-+			hc->schinfo |= j;
-+			j = j << qh->interval;
-+		}
-+	} else {
-+		hc->schinfo = 0xff;
-+	}
-+}
-+
-+#if 1
-+void dump_frame_list(dwc_otg_hcd_t * hcd)
-+{
-+	int i = 0;
-+	DWC_PRINTF("--FRAME LIST (hex) --\n");
-+	for (i = 0; i < MAX_FRLIST_EN_NUM; i++) {
-+		DWC_PRINTF("%x\t", hcd->frame_list[i]);
-+		if (!(i % 8) && i)
-+			DWC_PRINTF("\n");
-+	}
-+	DWC_PRINTF("\n----\n");
-+
-+}
-+#endif
-+
-+static void release_channel_ddma(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh)
-+{
-+	dwc_hc_t *hc = qh->channel;
-+	if (dwc_qh_is_non_per(qh)) {
-+		if (!microframe_schedule)
-+			hcd->non_periodic_channels--;
-+		else
-+			hcd->available_host_channels++;
-+	} else
-+		update_frame_list(hcd, qh, 0);
-+
-+	/*
-+	 * The condition is added to prevent double cleanup try in case of device
-+	 * disconnect. See channel cleanup in dwc_otg_hcd_disconnect_cb().
-+	 */
-+	if (hc->qh) {
-+		dwc_otg_hc_cleanup(hcd->core_if, hc);
-+		DWC_CIRCLEQ_INSERT_TAIL(&hcd->free_hc_list, hc, hc_list_entry);
-+		hc->qh = NULL;
-+	}
-+
-+	qh->channel = NULL;
-+	qh->ntd = 0;
-+
-+	if (qh->desc_list) {
-+		dwc_memset(qh->desc_list, 0x00,
-+			   sizeof(dwc_otg_host_dma_desc_t) * max_desc_num(qh));
-+	}
-+}
-+
-+/**
-+ * Initializes a QH structure's Descriptor DMA related members.
-+ * Allocates memory for descriptor list.
-+ * On first periodic QH, allocates memory for FrameList
-+ * and enables periodic scheduling.
-+ *
-+ * @param hcd The HCD state structure for the DWC OTG controller.
-+ * @param qh The QH to init.
-+ *
-+ * @return 0 if successful, negative error code otherwise.
-+ */
-+int dwc_otg_hcd_qh_init_ddma(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh)
-+{
-+	struct device *dev = dwc_otg_hcd_to_dev(hcd);
-+	int retval = 0;
-+
-+	if (qh->do_split) {
-+		DWC_ERROR("SPLIT Transfers are not supported in Descriptor DMA.\n");
-+		return -1;
-+	}
-+
-+	retval = desc_list_alloc(dev, qh);
-+
-+	if ((retval == 0)
-+	    && (qh->ep_type == UE_ISOCHRONOUS || qh->ep_type == UE_INTERRUPT)) {
-+		if (!hcd->frame_list) {
-+			retval = frame_list_alloc(hcd);
-+			/* Enable periodic schedule on first periodic QH */
-+			if (retval == 0)
-+				per_sched_enable(hcd, MAX_FRLIST_EN_NUM);
-+		}
-+	}
-+
-+	qh->ntd = 0;
-+
-+	return retval;
-+}
-+
-+/**
-+ * Frees descriptor list memory associated with the QH.
-+ * If QH is periodic and the last, frees FrameList memory
-+ * and disables periodic scheduling.
-+ *
-+ * @param hcd The HCD state structure for the DWC OTG controller.
-+ * @param qh The QH to init.
-+ */
-+void dwc_otg_hcd_qh_free_ddma(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh)
-+{
-+	struct device *dev = dwc_otg_hcd_to_dev(hcd);
-+
-+	desc_list_free(dev, qh);
-+
-+	/*
-+	 * Channel still assigned due to some reasons.
-+	 * Seen on Isoc URB dequeue. Channel halted but no subsequent
-+	 * ChHalted interrupt to release the channel. Afterwards
-+	 * when it comes here from endpoint disable routine
-+	 * channel remains assigned.
-+	 */
-+	if (qh->channel)
-+		release_channel_ddma(hcd, qh);
-+
-+	if ((qh->ep_type == UE_ISOCHRONOUS || qh->ep_type == UE_INTERRUPT)
-+	    && (microframe_schedule || !hcd->periodic_channels) && hcd->frame_list) {
-+
-+		per_sched_disable(hcd);
-+		frame_list_free(hcd);
-+	}
-+}
-+
-+static uint8_t frame_to_desc_idx(dwc_otg_qh_t * qh, uint16_t frame_idx)
-+{
-+	if (qh->dev_speed == DWC_OTG_EP_SPEED_HIGH) {
-+		/*
-+		 * Descriptor set(8 descriptors) index
-+		 * which is 8-aligned.
-+		 */
-+		return (frame_idx & ((MAX_DMA_DESC_NUM_HS_ISOC / 8) - 1)) * 8;
-+	} else {
-+		return (frame_idx & (MAX_DMA_DESC_NUM_GENERIC - 1));
-+	}
-+}
-+
-+/*
-+ * Determine starting frame for Isochronous transfer.
-+ * Few frames skipped to prevent race condition with HC.
-+ */
-+static uint8_t calc_starting_frame(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh,
-+				   uint8_t * skip_frames)
-+{
-+	uint16_t frame = 0;
-+	hcd->frame_number = dwc_otg_hcd_get_frame_number(hcd);
-+
-+	/* sched_frame is always frame number(not uFrame) both in FS and HS !! */
-+
-+	/*
-+	 * skip_frames is used to limit activated descriptors number
-+	 * to avoid the situation when HC services the last activated
-+	 * descriptor firstly.
-+	 * Example for FS:
-+	 * Current frame is 1, scheduled frame is 3. Since HC always fetches the descriptor
-+	 * corresponding to curr_frame+1, the descriptor corresponding to frame 2
-+	 * will be fetched. If the number of descriptors is max=64 (or greather) the
-+	 * list will be fully programmed with Active descriptors and it is possible
-+	 * case(rare) that the latest descriptor(considering rollback) corresponding
-+	 * to frame 2 will be serviced first. HS case is more probable because, in fact,
-+	 * up to 11 uframes(16 in the code) may be skipped.
-+	 */
-+	if (qh->dev_speed == DWC_OTG_EP_SPEED_HIGH) {
-+		/*
-+		 * Consider uframe counter also, to start xfer asap.
-+		 * If half of the frame elapsed skip 2 frames otherwise
-+		 * just 1 frame.
-+		 * Starting descriptor index must be 8-aligned, so
-+		 * if the current frame is near to complete the next one
-+		 * is skipped as well.
-+		 */
-+
-+		if (dwc_micro_frame_num(hcd->frame_number) >= 5) {
-+			*skip_frames = 2 * 8;
-+			frame = dwc_frame_num_inc(hcd->frame_number, *skip_frames);
-+		} else {
-+			*skip_frames = 1 * 8;
-+			frame = dwc_frame_num_inc(hcd->frame_number, *skip_frames);
-+		}
-+
-+		frame = dwc_full_frame_num(frame);
-+	} else {
-+		/*
-+		 * Two frames are skipped for FS - the current and the next.
-+		 * But for descriptor programming, 1 frame(descriptor) is enough,
-+		 * see example above.
-+		 */
-+		*skip_frames = 1;
-+		frame = dwc_frame_num_inc(hcd->frame_number, 2);
-+	}
-+
-+	return frame;
-+}
-+
-+/*
-+ * Calculate initial descriptor index for isochronous transfer
-+ * based on scheduled frame.
-+ */
-+static uint8_t recalc_initial_desc_idx(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh)
-+{
-+	uint16_t frame = 0, fr_idx, fr_idx_tmp;
-+	uint8_t skip_frames = 0;
-+	/*
-+	 * With current ISOC processing algorithm the channel is being
-+	 * released when no more QTDs in the list(qh->ntd == 0).
-+	 * Thus this function is called only when qh->ntd == 0 and qh->channel == 0.
-+	 *
-+	 * So qh->channel != NULL branch is not used and just not removed from the
-+	 * source file. It is required for another possible approach which is,
-+	 * do not disable and release the channel when ISOC session completed,
-+	 * just move QH to inactive schedule until new QTD arrives.
-+	 * On new QTD, the QH moved back to 'ready' schedule,
-+	 * starting frame and therefore starting desc_index are recalculated.
-+	 * In this case channel is released only on ep_disable.
-+	 */
-+
-+	/* Calculate starting descriptor index. For INTERRUPT endpoint it is always 0. */
-+	if (qh->channel) {
-+		frame = calc_starting_frame(hcd, qh, &skip_frames);
-+		/*
-+		 * Calculate initial descriptor index based on FrameList current bitmap
-+		 * and servicing period.
-+		 */
-+		fr_idx_tmp = frame_list_idx(frame);
-+		fr_idx =
-+		    (MAX_FRLIST_EN_NUM + frame_list_idx(qh->sched_frame) -
-+		     fr_idx_tmp)
-+		    % frame_incr_val(qh);
-+		fr_idx = (fr_idx + fr_idx_tmp) % MAX_FRLIST_EN_NUM;
-+	} else {
-+		qh->sched_frame = calc_starting_frame(hcd, qh, &skip_frames);
-+		fr_idx = frame_list_idx(qh->sched_frame);
-+	}
-+
-+	qh->td_first = qh->td_last = frame_to_desc_idx(qh, fr_idx);
-+
-+	return skip_frames;
-+}
-+
-+#define	ISOC_URB_GIVEBACK_ASAP
-+
-+#define MAX_ISOC_XFER_SIZE_FS 1023
-+#define MAX_ISOC_XFER_SIZE_HS 3072
-+#define DESCNUM_THRESHOLD 4
-+
-+static void init_isoc_dma_desc(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh,
-+			       uint8_t skip_frames)
-+{
-+	struct dwc_otg_hcd_iso_packet_desc *frame_desc;
-+	dwc_otg_qtd_t *qtd;
-+	dwc_otg_host_dma_desc_t *dma_desc;
-+	uint16_t idx, inc, n_desc, ntd_max, max_xfer_size;
-+
-+	idx = qh->td_last;
-+	inc = qh->interval;
-+	n_desc = 0;
-+
-+	ntd_max = (max_desc_num(qh) + qh->interval - 1) / qh->interval;
-+	if (skip_frames && !qh->channel)
-+		ntd_max = ntd_max - skip_frames / qh->interval;
-+
-+	max_xfer_size =
-+	    (qh->dev_speed ==
-+	     DWC_OTG_EP_SPEED_HIGH) ? MAX_ISOC_XFER_SIZE_HS :
-+	    MAX_ISOC_XFER_SIZE_FS;
-+
-+	DWC_CIRCLEQ_FOREACH(qtd, &qh->qtd_list, qtd_list_entry) {
-+		while ((qh->ntd < ntd_max)
-+		       && (qtd->isoc_frame_index_last <
-+			   qtd->urb->packet_count)) {
-+
-+			dma_desc = &qh->desc_list[idx];
-+			dwc_memset(dma_desc, 0x00, sizeof(dwc_otg_host_dma_desc_t));
-+
-+			frame_desc = &qtd->urb->iso_descs[qtd->isoc_frame_index_last];
-+
-+			if (frame_desc->length > max_xfer_size)
-+				qh->n_bytes[idx] = max_xfer_size;
-+			else
-+				qh->n_bytes[idx] = frame_desc->length;
-+			dma_desc->status.b_isoc.n_bytes = qh->n_bytes[idx];
-+			dma_desc->status.b_isoc.a = 1;
-+			dma_desc->status.b_isoc.sts = 0;
-+
-+			dma_desc->buf = qtd->urb->dma + frame_desc->offset;
-+
-+			qh->ntd++;
-+
-+			qtd->isoc_frame_index_last++;
-+
-+#ifdef	ISOC_URB_GIVEBACK_ASAP
-+			/*
-+			 * Set IOC for each descriptor corresponding to the
-+			 * last frame of the URB.
-+			 */
-+			if (qtd->isoc_frame_index_last ==
-+			    qtd->urb->packet_count)
-+				dma_desc->status.b_isoc.ioc = 1;
-+
-+#endif
-+			idx = desclist_idx_inc(idx, inc, qh->dev_speed);
-+			n_desc++;
-+
-+		}
-+		qtd->in_process = 1;
-+	}
-+
-+	qh->td_last = idx;
-+
-+#ifdef	ISOC_URB_GIVEBACK_ASAP
-+	/* Set IOC for the last descriptor if descriptor list is full */
-+	if (qh->ntd == ntd_max) {
-+		idx = desclist_idx_dec(qh->td_last, inc, qh->dev_speed);
-+		qh->desc_list[idx].status.b_isoc.ioc = 1;
-+	}
-+#else
-+	/*
-+	 * Set IOC bit only for one descriptor.
-+	 * Always try to be ahead of HW processing,
-+	 * i.e. on IOC generation driver activates next descriptors but
-+	 * core continues to process descriptors followed the one with IOC set.
-+	 */
-+
-+	if (n_desc > DESCNUM_THRESHOLD) {
-+		/*
-+		 * Move IOC "up". Required even if there is only one QTD
-+		 * in the list, cause QTDs migth continue to be queued,
-+		 * but during the activation it was only one queued.
-+		 * Actually more than one QTD might be in the list if this function called
-+		 * from XferCompletion - QTDs was queued during HW processing of the previous
-+		 * descriptor chunk.
-+		 */
-+		idx = dwc_desclist_idx_dec(idx, inc * ((qh->ntd + 1) / 2), qh->dev_speed);
-+	} else {
-+		/*
-+		 * Set the IOC for the latest descriptor
-+		 * if either number of descriptor is not greather than threshold
-+		 * or no more new descriptors activated.
-+		 */
-+		idx = dwc_desclist_idx_dec(qh->td_last, inc, qh->dev_speed);
-+	}
-+
-+	qh->desc_list[idx].status.b_isoc.ioc = 1;
-+#endif
-+}
-+
-+static void init_non_isoc_dma_desc(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh)
-+{
-+
-+	dwc_hc_t *hc;
-+	dwc_otg_host_dma_desc_t *dma_desc;
-+	dwc_otg_qtd_t *qtd;
-+	int num_packets, len, n_desc = 0;
-+
-+	hc = qh->channel;
-+
-+	/*
-+	 * Start with hc->xfer_buff initialized in
-+	 * assign_and_init_hc(), then if SG transfer consists of multiple URBs,
-+	 * this pointer re-assigned to the buffer of the currently processed QTD.
-+	 * For non-SG request there is always one QTD active.
-+	 */
-+
-+	DWC_CIRCLEQ_FOREACH(qtd, &qh->qtd_list, qtd_list_entry) {
-+
-+		if (n_desc) {
-+			/* SG request - more than 1 QTDs */
-+			hc->xfer_buff = (uint8_t *)(uintptr_t)qtd->urb->dma +
-+					qtd->urb->actual_length;
-+			hc->xfer_len = qtd->urb->length - qtd->urb->actual_length;
-+		}
-+
-+		qtd->n_desc = 0;
-+
-+		do {
-+			dma_desc = &qh->desc_list[n_desc];
-+			len = hc->xfer_len;
-+
-+			if (len > MAX_DMA_DESC_SIZE)
-+				len = MAX_DMA_DESC_SIZE - hc->max_packet + 1;
-+
-+			if (hc->ep_is_in) {
-+				if (len > 0) {
-+					num_packets = (len + hc->max_packet - 1) / hc->max_packet;
-+				} else {
-+					/* Need 1 packet for transfer length of 0. */
-+					num_packets = 1;
-+				}
-+				/* Always program an integral # of max packets for IN transfers. */
-+				len = num_packets * hc->max_packet;
-+			}
-+
-+			dma_desc->status.b.n_bytes = len;
-+
-+			qh->n_bytes[n_desc] = len;
-+
-+			if ((qh->ep_type == UE_CONTROL)
-+			    && (qtd->control_phase == DWC_OTG_CONTROL_SETUP))
-+				dma_desc->status.b.sup = 1;	/* Setup Packet */
-+
-+			dma_desc->status.b.a = 1;	/* Active descriptor */
-+			dma_desc->status.b.sts = 0;
-+
-+			dma_desc->buf =
-+			    ((unsigned long)hc->xfer_buff & 0xffffffff);
-+
-+			/*
-+			 * Last descriptor(or single) of IN transfer
-+			 * with actual size less than MaxPacket.
-+			 */
-+			if (len > hc->xfer_len) {
-+				hc->xfer_len = 0;
-+			} else {
-+				hc->xfer_buff += len;
-+				hc->xfer_len -= len;
-+			}
-+
-+			qtd->n_desc++;
-+			n_desc++;
-+		}
-+		while ((hc->xfer_len > 0) && (n_desc != MAX_DMA_DESC_NUM_GENERIC));
-+
-+
-+		qtd->in_process = 1;
-+
-+		if (qh->ep_type == UE_CONTROL)
-+			break;
-+
-+		if (n_desc == MAX_DMA_DESC_NUM_GENERIC)
-+			break;
-+	}
-+
-+	if (n_desc) {
-+		/* Request Transfer Complete interrupt for the last descriptor */
-+		qh->desc_list[n_desc - 1].status.b.ioc = 1;
-+		/* End of List indicator */
-+		qh->desc_list[n_desc - 1].status.b.eol = 1;
-+
-+		hc->ntd = n_desc;
-+	}
-+}
-+
-+/**
-+ * For Control and Bulk endpoints initializes descriptor list
-+ * and starts the transfer.
-+ *
-+ * For Interrupt and Isochronous endpoints initializes descriptor list
-+ * then updates FrameList, marking appropriate entries as active.
-+ * In case of Isochronous, the starting descriptor index is calculated based
-+ * on the scheduled frame, but only on the first transfer descriptor within a session.
-+ * Then starts the transfer via enabling the channel.
-+ * For Isochronous endpoint the channel is not halted on XferComplete
-+ * interrupt so remains assigned to the endpoint(QH) until session is done.
-+ *
-+ * @param hcd The HCD state structure for the DWC OTG controller.
-+ * @param qh The QH to init.
-+ *
-+ * @return 0 if successful, negative error code otherwise.
-+ */
-+void dwc_otg_hcd_start_xfer_ddma(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh)
-+{
-+	/* Channel is already assigned */
-+	dwc_hc_t *hc = qh->channel;
-+	uint8_t skip_frames = 0;
-+
-+	switch (hc->ep_type) {
-+	case DWC_OTG_EP_TYPE_CONTROL:
-+	case DWC_OTG_EP_TYPE_BULK:
-+		init_non_isoc_dma_desc(hcd, qh);
-+
-+		dwc_otg_hc_start_transfer_ddma(hcd->core_if, hc);
-+		break;
-+	case DWC_OTG_EP_TYPE_INTR:
-+		init_non_isoc_dma_desc(hcd, qh);
-+
-+		update_frame_list(hcd, qh, 1);
-+
-+		dwc_otg_hc_start_transfer_ddma(hcd->core_if, hc);
-+		break;
-+	case DWC_OTG_EP_TYPE_ISOC:
-+
-+		if (!qh->ntd)
-+			skip_frames = recalc_initial_desc_idx(hcd, qh);
-+
-+		init_isoc_dma_desc(hcd, qh, skip_frames);
-+
-+		if (!hc->xfer_started) {
-+
-+			update_frame_list(hcd, qh, 1);
-+
-+			/*
-+			 * Always set to max, instead of actual size.
-+			 * Otherwise ntd will be changed with
-+			 * channel being enabled. Not recommended.
-+			 *
-+			 */
-+			hc->ntd = max_desc_num(qh);
-+			/* Enable channel only once for ISOC */
-+			dwc_otg_hc_start_transfer_ddma(hcd->core_if, hc);
-+		}
-+
-+		break;
-+	default:
-+
-+		break;
-+	}
-+}
-+
-+static void complete_isoc_xfer_ddma(dwc_otg_hcd_t * hcd,
-+				    dwc_hc_t * hc,
-+				    dwc_otg_hc_regs_t * hc_regs,
-+				    dwc_otg_halt_status_e halt_status)
-+{
-+	struct dwc_otg_hcd_iso_packet_desc *frame_desc;
-+	dwc_otg_qtd_t *qtd, *qtd_tmp;
-+	dwc_otg_qh_t *qh;
-+	dwc_otg_host_dma_desc_t *dma_desc;
-+	uint16_t idx, remain;
-+	uint8_t urb_compl;
-+
-+	qh = hc->qh;
-+	idx = qh->td_first;
-+
-+	if (hc->halt_status == DWC_OTG_HC_XFER_URB_DEQUEUE) {
-+		DWC_CIRCLEQ_FOREACH_SAFE(qtd, qtd_tmp, &hc->qh->qtd_list, qtd_list_entry)
-+		    qtd->in_process = 0;
-+		return;
-+	} else if ((halt_status == DWC_OTG_HC_XFER_AHB_ERR) ||
-+		   (halt_status == DWC_OTG_HC_XFER_BABBLE_ERR)) {
-+		/*
-+		 * Channel is halted in these error cases.
-+		 * Considered as serious issues.
-+		 * Complete all URBs marking all frames as failed,
-+		 * irrespective whether some of the descriptors(frames) succeeded or no.
-+		 * Pass error code to completion routine as well, to
-+		 * update urb->status, some of class drivers might use it to stop
-+		 * queing transfer requests.
-+		 */
-+		int err = (halt_status == DWC_OTG_HC_XFER_AHB_ERR)
-+		    ? (-DWC_E_IO)
-+		    : (-DWC_E_OVERFLOW);
-+
-+		DWC_CIRCLEQ_FOREACH_SAFE(qtd, qtd_tmp, &hc->qh->qtd_list, qtd_list_entry) {
-+			for (idx = 0; idx < qtd->urb->packet_count; idx++) {
-+				frame_desc = &qtd->urb->iso_descs[idx];
-+				frame_desc->status = err;
-+			}
-+			hcd->fops->complete(hcd, qtd->urb->priv, qtd->urb, err);
-+			dwc_otg_hcd_qtd_remove_and_free(hcd, qtd, qh);
-+		}
-+		return;
-+	}
-+
-+	DWC_CIRCLEQ_FOREACH_SAFE(qtd, qtd_tmp, &hc->qh->qtd_list, qtd_list_entry) {
-+
-+		if (!qtd->in_process)
-+			break;
-+
-+		urb_compl = 0;
-+
-+		do {
-+
-+			dma_desc = &qh->desc_list[idx];
-+
-+			frame_desc = &qtd->urb->iso_descs[qtd->isoc_frame_index];
-+			remain = hc->ep_is_in ? dma_desc->status.b_isoc.n_bytes : 0;
-+
-+			if (dma_desc->status.b_isoc.sts == DMA_DESC_STS_PKTERR) {
-+				/*
-+				 * XactError or, unable to complete all the transactions
-+				 * in the scheduled micro-frame/frame,
-+				 * both indicated by DMA_DESC_STS_PKTERR.
-+				 */
-+				qtd->urb->error_count++;
-+				frame_desc->actual_length = qh->n_bytes[idx] - remain;
-+				frame_desc->status = -DWC_E_PROTOCOL;
-+			} else {
-+				/* Success */
-+
-+				frame_desc->actual_length = qh->n_bytes[idx] - remain;
-+				frame_desc->status = 0;
-+			}
-+
-+			if (++qtd->isoc_frame_index == qtd->urb->packet_count) {
-+				/*
-+				 * urb->status is not used for isoc transfers here.
-+				 * The individual frame_desc status are used instead.
-+				 */
-+
-+				hcd->fops->complete(hcd, qtd->urb->priv, qtd->urb, 0);
-+				dwc_otg_hcd_qtd_remove_and_free(hcd, qtd, qh);
-+
-+				/*
-+				 * This check is necessary because urb_dequeue can be called
-+				 * from urb complete callback(sound driver example).
-+				 * All pending URBs are dequeued there, so no need for
-+				 * further processing.
-+				 */
-+				if (hc->halt_status == DWC_OTG_HC_XFER_URB_DEQUEUE) {
-+					return;
-+				}
-+
-+				urb_compl = 1;
-+
-+			}
-+
-+			qh->ntd--;
-+
-+			/* Stop if IOC requested descriptor reached */
-+			if (dma_desc->status.b_isoc.ioc) {
-+				idx = desclist_idx_inc(idx, qh->interval, hc->speed);
-+				goto stop_scan;
-+			}
-+
-+			idx = desclist_idx_inc(idx, qh->interval, hc->speed);
-+
-+			if (urb_compl)
-+				break;
-+		}
-+		while (idx != qh->td_first);
-+	}
-+stop_scan:
-+	qh->td_first = idx;
-+}
-+
-+uint8_t update_non_isoc_urb_state_ddma(dwc_otg_hcd_t * hcd,
-+				       dwc_hc_t * hc,
-+				       dwc_otg_qtd_t * qtd,
-+				       dwc_otg_host_dma_desc_t * dma_desc,
-+				       dwc_otg_halt_status_e halt_status,
-+				       uint32_t n_bytes, uint8_t * xfer_done)
-+{
-+
-+	uint16_t remain = hc->ep_is_in ? dma_desc->status.b.n_bytes : 0;
-+	dwc_otg_hcd_urb_t *urb = qtd->urb;
-+
-+	if (halt_status == DWC_OTG_HC_XFER_AHB_ERR) {
-+		urb->status = -DWC_E_IO;
-+		return 1;
-+	}
-+	if (dma_desc->status.b.sts == DMA_DESC_STS_PKTERR) {
-+		switch (halt_status) {
-+		case DWC_OTG_HC_XFER_STALL:
-+			urb->status = -DWC_E_PIPE;
-+			break;
-+		case DWC_OTG_HC_XFER_BABBLE_ERR:
-+			urb->status = -DWC_E_OVERFLOW;
-+			break;
-+		case DWC_OTG_HC_XFER_XACT_ERR:
-+			urb->status = -DWC_E_PROTOCOL;
-+			break;
-+		default:
-+			DWC_ERROR("%s: Unhandled descriptor error status (%d)\n", __func__,
-+				  halt_status);
-+			break;
-+		}
-+		return 1;
-+	}
-+
-+	if (dma_desc->status.b.a == 1) {
-+		DWC_DEBUGPL(DBG_HCDV,
-+			    "Active descriptor encountered on channel %d\n",
-+			    hc->hc_num);
-+		return 0;
-+	}
-+
-+	if (hc->ep_type == DWC_OTG_EP_TYPE_CONTROL) {
-+		if (qtd->control_phase == DWC_OTG_CONTROL_DATA) {
-+			urb->actual_length += n_bytes - remain;
-+			if (remain || urb->actual_length == urb->length) {
-+				/*
-+				 * For Control Data stage do not set urb->status=0 to prevent
-+				 * URB callback. Set it when Status phase done. See below.
-+				 */
-+				*xfer_done = 1;
-+			}
-+
-+		} else if (qtd->control_phase == DWC_OTG_CONTROL_STATUS) {
-+			urb->status = 0;
-+			*xfer_done = 1;
-+		}
-+		/* No handling for SETUP stage */
-+	} else {
-+		/* BULK and INTR */
-+		urb->actual_length += n_bytes - remain;
-+		if (remain || urb->actual_length == urb->length) {
-+			urb->status = 0;
-+			*xfer_done = 1;
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+static void complete_non_isoc_xfer_ddma(dwc_otg_hcd_t * hcd,
-+					dwc_hc_t * hc,
-+					dwc_otg_hc_regs_t * hc_regs,
-+					dwc_otg_halt_status_e halt_status)
-+{
-+	dwc_otg_hcd_urb_t *urb = NULL;
-+	dwc_otg_qtd_t *qtd, *qtd_tmp;
-+	dwc_otg_qh_t *qh;
-+	dwc_otg_host_dma_desc_t *dma_desc;
-+	uint32_t n_bytes, n_desc, i;
-+	uint8_t failed = 0, xfer_done;
-+
-+	n_desc = 0;
-+
-+	qh = hc->qh;
-+
-+	if (hc->halt_status == DWC_OTG_HC_XFER_URB_DEQUEUE) {
-+		DWC_CIRCLEQ_FOREACH_SAFE(qtd, qtd_tmp, &hc->qh->qtd_list, qtd_list_entry) {
-+			qtd->in_process = 0;
-+		}
-+		return;
-+	}
-+
-+	DWC_CIRCLEQ_FOREACH_SAFE(qtd, qtd_tmp, &qh->qtd_list, qtd_list_entry) {
-+
-+		urb = qtd->urb;
-+
-+		n_bytes = 0;
-+		xfer_done = 0;
-+
-+		for (i = 0; i < qtd->n_desc; i++) {
-+			dma_desc = &qh->desc_list[n_desc];
-+
-+			n_bytes = qh->n_bytes[n_desc];
-+
-+			failed =
-+			    update_non_isoc_urb_state_ddma(hcd, hc, qtd,
-+							   dma_desc,
-+							   halt_status, n_bytes,
-+							   &xfer_done);
-+
-+			if (failed
-+			    || (xfer_done
-+				&& (urb->status != -DWC_E_IN_PROGRESS))) {
-+
-+				hcd->fops->complete(hcd, urb->priv, urb,
-+						    urb->status);
-+				dwc_otg_hcd_qtd_remove_and_free(hcd, qtd, qh);
-+
-+				if (failed)
-+					goto stop_scan;
-+			} else if (qh->ep_type == UE_CONTROL) {
-+				if (qtd->control_phase == DWC_OTG_CONTROL_SETUP) {
-+					if (urb->length > 0) {
-+						qtd->control_phase = DWC_OTG_CONTROL_DATA;
-+					} else {
-+						qtd->control_phase = DWC_OTG_CONTROL_STATUS;
-+					}
-+					DWC_DEBUGPL(DBG_HCDV, "  Control setup transaction done\n");
-+				} else if (qtd->control_phase == DWC_OTG_CONTROL_DATA) {
-+					if (xfer_done) {
-+						qtd->control_phase = DWC_OTG_CONTROL_STATUS;
-+						DWC_DEBUGPL(DBG_HCDV, "  Control data transfer done\n");
-+					} else if (i + 1 == qtd->n_desc) {
-+						/*
-+						 * Last descriptor for Control data stage which is
-+						 * not completed yet.
-+						 */
-+						dwc_otg_hcd_save_data_toggle(hc, hc_regs, qtd);
-+					}
-+				}
-+			}
-+
-+			n_desc++;
-+		}
-+
-+	}
-+
-+stop_scan:
-+
-+	if (qh->ep_type != UE_CONTROL) {
-+		/*
-+		 * Resetting the data toggle for bulk
-+		 * and interrupt endpoints in case of stall. See handle_hc_stall_intr()
-+		 */
-+		if (halt_status == DWC_OTG_HC_XFER_STALL)
-+			qh->data_toggle = DWC_OTG_HC_PID_DATA0;
-+		else
-+			dwc_otg_hcd_save_data_toggle(hc, hc_regs, qtd);
-+	}
-+
-+	if (halt_status == DWC_OTG_HC_XFER_COMPLETE) {
-+		hcint_data_t hcint;
-+		hcint.d32 = DWC_READ_REG32(&hc_regs->hcint);
-+		if (hcint.b.nyet) {
-+			/*
-+			 * Got a NYET on the last transaction of the transfer. It
-+			 * means that the endpoint should be in the PING state at the
-+			 * beginning of the next transfer.
-+			 */
-+			qh->ping_state = 1;
-+			clear_hc_int(hc_regs, nyet);
-+		}
-+
-+	}
-+
-+}
-+
-+/**
-+ * This function is called from interrupt handlers.
-+ * Scans the descriptor list, updates URB's status and
-+ * calls completion routine for the URB if it's done.
-+ * Releases the channel to be used by other transfers.
-+ * In case of Isochronous endpoint the channel is not halted until
-+ * the end of the session, i.e. QTD list is empty.
-+ * If periodic channel released the FrameList is updated accordingly.
-+ *
-+ * Calls transaction selection routines to activate pending transfers.
-+ *
-+ * @param hcd The HCD state structure for the DWC OTG controller.
-+ * @param hc Host channel, the transfer is completed on.
-+ * @param hc_regs Host channel registers.
-+ * @param halt_status Reason the channel is being halted,
-+ *		      or just XferComplete for isochronous transfer
-+ */
-+void dwc_otg_hcd_complete_xfer_ddma(dwc_otg_hcd_t * hcd,
-+				    dwc_hc_t * hc,
-+				    dwc_otg_hc_regs_t * hc_regs,
-+				    dwc_otg_halt_status_e halt_status)
-+{
-+	uint8_t continue_isoc_xfer = 0;
-+	dwc_otg_transaction_type_e tr_type;
-+	dwc_otg_qh_t *qh = hc->qh;
-+
-+	if (hc->ep_type == DWC_OTG_EP_TYPE_ISOC) {
-+
-+		complete_isoc_xfer_ddma(hcd, hc, hc_regs, halt_status);
-+
-+		/* Release the channel if halted or session completed */
-+		if (halt_status != DWC_OTG_HC_XFER_COMPLETE ||
-+		    DWC_CIRCLEQ_EMPTY(&qh->qtd_list)) {
-+
-+			/* Halt the channel if session completed */
-+			if (halt_status == DWC_OTG_HC_XFER_COMPLETE) {
-+				dwc_otg_hc_halt(hcd->core_if, hc, halt_status);
-+			}
-+
-+			release_channel_ddma(hcd, qh);
-+			dwc_otg_hcd_qh_remove(hcd, qh);
-+		} else {
-+			/* Keep in assigned schedule to continue transfer */
-+			DWC_LIST_MOVE_HEAD(&hcd->periodic_sched_assigned,
-+					   &qh->qh_list_entry);
-+			continue_isoc_xfer = 1;
-+
-+		}
-+		/** @todo Consider the case when period exceeds FrameList size.
-+		 *  Frame Rollover interrupt should be used.
-+		 */
-+	} else {
-+		/* Scan descriptor list to complete the URB(s), then release the channel */
-+		complete_non_isoc_xfer_ddma(hcd, hc, hc_regs, halt_status);
-+
-+		release_channel_ddma(hcd, qh);
-+		dwc_otg_hcd_qh_remove(hcd, qh);
-+
-+		if (!DWC_CIRCLEQ_EMPTY(&qh->qtd_list)) {
-+			/* Add back to inactive non-periodic schedule on normal completion */
-+			dwc_otg_hcd_qh_add(hcd, qh);
-+		}
-+
-+	}
-+	tr_type = dwc_otg_hcd_select_transactions(hcd);
-+	if (tr_type != DWC_OTG_TRANSACTION_NONE || continue_isoc_xfer) {
-+		if (continue_isoc_xfer) {
-+			if (tr_type == DWC_OTG_TRANSACTION_NONE) {
-+				tr_type = DWC_OTG_TRANSACTION_PERIODIC;
-+			} else if (tr_type == DWC_OTG_TRANSACTION_NON_PERIODIC) {
-+				tr_type = DWC_OTG_TRANSACTION_ALL;
-+			}
-+		}
-+		dwc_otg_hcd_queue_transactions(hcd, tr_type);
-+	}
-+}
-+
-+#endif /* DWC_DEVICE_ONLY */
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h
-@@ -0,0 +1,421 @@
-+/* ==========================================================================
-+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_if.h $
-+ * $Revision: #12 $
-+ * $Date: 2011/10/26 $
-+ * $Change: 1873028 $
-+ *
-+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
-+ * "Software") is an Unsupported proprietary work of Synopsys, Inc. unless
-+ * otherwise expressly agreed to in writing between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product under
-+ * any End User Software License Agreement or Agreement for Licensed Product
-+ * with Synopsys or any supplement thereto. You are permitted to use and
-+ * redistribute this Software in source and binary forms, with or without
-+ * modification, provided that redistributions of source code must retain this
-+ * notice. You may not view, use, disclose, copy or distribute this file or
-+ * any information contained herein except pursuant to this license grant from
-+ * Synopsys. If you do not agree with this notice, including the disclaimer
-+ * below, then you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" BASIS
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS BE LIABLE FOR ANY DIRECT,
-+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================== */
-+#ifndef DWC_DEVICE_ONLY
-+#ifndef __DWC_HCD_IF_H__
-+#define __DWC_HCD_IF_H__
-+
-+#include "dwc_otg_core_if.h"
-+
-+/** @file
-+ * This file defines DWC_OTG HCD Core API.
-+ */
-+
-+struct dwc_otg_hcd;
-+typedef struct dwc_otg_hcd dwc_otg_hcd_t;
-+
-+struct dwc_otg_hcd_urb;
-+typedef struct dwc_otg_hcd_urb dwc_otg_hcd_urb_t;
-+
-+/** @name HCD Function Driver Callbacks */
-+/** @{ */
-+
-+/** This function is called whenever core switches to host mode. */
-+typedef int (*dwc_otg_hcd_start_cb_t) (dwc_otg_hcd_t * hcd);
-+
-+/** This function is called when device has been disconnected */
-+typedef int (*dwc_otg_hcd_disconnect_cb_t) (dwc_otg_hcd_t * hcd);
-+
-+/** Wrapper provides this function to HCD to core, so it can get hub information to which device is connected */
-+typedef int (*dwc_otg_hcd_hub_info_from_urb_cb_t) (dwc_otg_hcd_t * hcd,
-+						   void *urb_handle,
-+						   uint32_t * hub_addr,
-+						   uint32_t * port_addr);
-+/** Via this function HCD core gets device speed */
-+typedef int (*dwc_otg_hcd_speed_from_urb_cb_t) (dwc_otg_hcd_t * hcd,
-+						void *urb_handle);
-+
-+/** This function is called when urb is completed */
-+typedef int (*dwc_otg_hcd_complete_urb_cb_t) (dwc_otg_hcd_t * hcd,
-+					      void *urb_handle,
-+					      dwc_otg_hcd_urb_t * dwc_otg_urb,
-+					      int32_t status);
-+
-+/** Via this function HCD core gets b_hnp_enable parameter */
-+typedef int (*dwc_otg_hcd_get_b_hnp_enable) (dwc_otg_hcd_t * hcd);
-+
-+struct dwc_otg_hcd_function_ops {
-+	dwc_otg_hcd_start_cb_t start;
-+	dwc_otg_hcd_disconnect_cb_t disconnect;
-+	dwc_otg_hcd_hub_info_from_urb_cb_t hub_info;
-+	dwc_otg_hcd_speed_from_urb_cb_t speed;
-+	dwc_otg_hcd_complete_urb_cb_t complete;
-+	dwc_otg_hcd_get_b_hnp_enable get_b_hnp_enable;
-+};
-+/** @} */
-+
-+/** @name HCD Core API */
-+/** @{ */
-+/** This function allocates dwc_otg_hcd structure and returns pointer on it. */
-+extern dwc_otg_hcd_t *dwc_otg_hcd_alloc_hcd(void);
-+
-+/** This function should be called to initiate HCD Core.
-+ *
-+ * @param hcd The HCD
-+ * @param core_if The DWC_OTG Core
-+ *
-+ * Returns -DWC_E_NO_MEMORY if no enough memory.
-+ * Returns 0 on success
-+ */
-+extern int dwc_otg_hcd_init(dwc_otg_hcd_t * hcd, dwc_otg_core_if_t * core_if);
-+
-+/** Frees HCD
-+ *
-+ * @param hcd The HCD
-+ */
-+extern void dwc_otg_hcd_remove(dwc_otg_hcd_t * hcd);
-+
-+/** This function should be called on every hardware interrupt.
-+ *
-+ * @param dwc_otg_hcd The HCD
-+ *
-+ * Returns non zero if interrupt is handled
-+ * Return 0 if interrupt is not handled
-+ */
-+extern int32_t dwc_otg_hcd_handle_intr(dwc_otg_hcd_t * dwc_otg_hcd);
-+
-+/** This function is used to handle the fast interrupt
-+ *
-+ */
-+#ifdef CONFIG_ARM64
-+extern void dwc_otg_hcd_handle_fiq(void);
-+#else
-+extern void __attribute__ ((naked)) dwc_otg_hcd_handle_fiq(void);
-+#endif
-+
-+/**
-+ * Returns private data set by
-+ * dwc_otg_hcd_set_priv_data function.
-+ *
-+ * @param hcd The HCD
-+ */
-+extern void *dwc_otg_hcd_get_priv_data(dwc_otg_hcd_t * hcd);
-+
-+/**
-+ * Set private data.
-+ *
-+ * @param hcd The HCD
-+ * @param priv_data pointer to be stored in private data
-+ */
-+extern void dwc_otg_hcd_set_priv_data(dwc_otg_hcd_t * hcd, void *priv_data);
-+
-+/**
-+ * This function initializes the HCD Core.
-+ *
-+ * @param hcd The HCD
-+ * @param fops The Function Driver Operations data structure containing pointers to all callbacks.
-+ *
-+ * Returns -DWC_E_NO_DEVICE if Core is currently is in device mode.
-+ * Returns 0 on success
-+ */
-+extern int dwc_otg_hcd_start(dwc_otg_hcd_t * hcd,
-+			     struct dwc_otg_hcd_function_ops *fops);
-+
-+/**
-+ * Halts the DWC_otg host mode operations in a clean manner. USB transfers are
-+ * stopped.
-+ *
-+ * @param hcd The HCD
-+ */
-+extern void dwc_otg_hcd_stop(dwc_otg_hcd_t * hcd);
-+
-+/**
-+ * Handles hub class-specific requests.
-+ *
-+ * @param dwc_otg_hcd The HCD
-+ * @param typeReq Request Type
-+ * @param wValue wValue from control request
-+ * @param wIndex wIndex from control request
-+ * @param buf data buffer
-+ * @param wLength data buffer length
-+ *
-+ * Returns -DWC_E_INVALID if invalid argument is passed
-+ * Returns 0 on success
-+ */
-+extern int dwc_otg_hcd_hub_control(dwc_otg_hcd_t * dwc_otg_hcd,
-+				   uint16_t typeReq, uint16_t wValue,
-+				   uint16_t wIndex, uint8_t * buf,
-+				   uint16_t wLength);
-+
-+/**
-+ * Returns otg port number.
-+ *
-+ * @param hcd The HCD
-+ */
-+extern uint32_t dwc_otg_hcd_otg_port(dwc_otg_hcd_t * hcd);
-+
-+/**
-+ * Returns OTG version - either 1.3 or 2.0.
-+ *
-+ * @param core_if The core_if structure pointer
-+ */
-+extern uint16_t dwc_otg_get_otg_version(dwc_otg_core_if_t * core_if);
-+
-+/**
-+ * Returns 1 if currently core is acting as B host, and 0 otherwise.
-+ *
-+ * @param hcd The HCD
-+ */
-+extern uint32_t dwc_otg_hcd_is_b_host(dwc_otg_hcd_t * hcd);
-+
-+/**
-+ * Returns current frame number.
-+ *
-+ * @param hcd The HCD
-+ */
-+extern int dwc_otg_hcd_get_frame_number(dwc_otg_hcd_t * hcd);
-+
-+/**
-+ * Dumps hcd state.
-+ *
-+ * @param hcd The HCD
-+ */
-+extern void dwc_otg_hcd_dump_state(dwc_otg_hcd_t * hcd);
-+
-+/**
-+ * Dump the average frame remaining at SOF. This can be used to
-+ * determine average interrupt latency. Frame remaining is also shown for
-+ * start transfer and two additional sample points.
-+ * Currently this function is not implemented.
-+ *
-+ * @param hcd The HCD
-+ */
-+extern void dwc_otg_hcd_dump_frrem(dwc_otg_hcd_t * hcd);
-+
-+/**
-+ * Sends LPM transaction to the local device.
-+ *
-+ * @param hcd The HCD
-+ * @param devaddr Device Address
-+ * @param hird Host initiated resume duration
-+ * @param bRemoteWake Value of bRemoteWake field in LPM transaction
-+ *
-+ * Returns negative value if sending LPM transaction was not succeeded.
-+ * Returns 0 on success.
-+ */
-+extern int dwc_otg_hcd_send_lpm(dwc_otg_hcd_t * hcd, uint8_t devaddr,
-+				uint8_t hird, uint8_t bRemoteWake);
-+
-+/* URB interface */
-+
-+/**
-+ * Allocates memory for dwc_otg_hcd_urb structure.
-+ * Allocated memory should be freed by call of DWC_FREE.
-+ *
-+ * @param hcd The HCD
-+ * @param iso_desc_count Count of ISOC descriptors
-+ * @param atomic_alloc Specefies whether to perform atomic allocation.
-+ */
-+extern dwc_otg_hcd_urb_t *dwc_otg_hcd_urb_alloc(dwc_otg_hcd_t * hcd,
-+						int iso_desc_count,
-+						int atomic_alloc);
-+
-+/**
-+ * Set pipe information in URB.
-+ *
-+ * @param hcd_urb DWC_OTG URB
-+ * @param devaddr Device Address
-+ * @param ep_num Endpoint Number
-+ * @param ep_type Endpoint Type
-+ * @param ep_dir Endpoint Direction
-+ * @param mps Max Packet Size
-+ */
-+extern void dwc_otg_hcd_urb_set_pipeinfo(dwc_otg_hcd_urb_t * hcd_urb,
-+					 uint8_t devaddr, uint8_t ep_num,
-+					 uint8_t ep_type, uint8_t ep_dir,
-+					 uint16_t mps);
-+
-+/* Transfer flags */
-+#define URB_GIVEBACK_ASAP 0x1
-+#define URB_SEND_ZERO_PACKET 0x2
-+
-+/**
-+ * Sets dwc_otg_hcd_urb parameters.
-+ *
-+ * @param urb DWC_OTG URB allocated by dwc_otg_hcd_urb_alloc function.
-+ * @param urb_handle Unique handle for request, this will be passed back
-+ * to function driver in completion callback.
-+ * @param buf The buffer for the data
-+ * @param dma The DMA buffer for the data
-+ * @param buflen Transfer length
-+ * @param sp Buffer for setup data
-+ * @param sp_dma DMA address of setup data buffer
-+ * @param flags Transfer flags
-+ * @param interval Polling interval for interrupt or isochronous transfers.
-+ */
-+extern void dwc_otg_hcd_urb_set_params(dwc_otg_hcd_urb_t * urb,
-+				       void *urb_handle, void *buf,
-+				       dwc_dma_t dma, uint32_t buflen, void *sp,
-+				       dwc_dma_t sp_dma, uint32_t flags,
-+				       uint16_t interval);
-+
-+/** Gets status from dwc_otg_hcd_urb
-+ *
-+ * @param dwc_otg_urb DWC_OTG URB
-+ */
-+extern uint32_t dwc_otg_hcd_urb_get_status(dwc_otg_hcd_urb_t * dwc_otg_urb);
-+
-+/** Gets actual length from dwc_otg_hcd_urb
-+ *
-+ * @param dwc_otg_urb DWC_OTG URB
-+ */
-+extern uint32_t dwc_otg_hcd_urb_get_actual_length(dwc_otg_hcd_urb_t *
-+						  dwc_otg_urb);
-+
-+/** Gets error count from dwc_otg_hcd_urb. Only for ISOC URBs
-+ *
-+ * @param dwc_otg_urb DWC_OTG URB
-+ */
-+extern uint32_t dwc_otg_hcd_urb_get_error_count(dwc_otg_hcd_urb_t *
-+						dwc_otg_urb);
-+
-+/** Set ISOC descriptor offset and length
-+ *
-+ * @param dwc_otg_urb DWC_OTG URB
-+ * @param desc_num ISOC descriptor number
-+ * @param offset Offset from beginig of buffer.
-+ * @param length Transaction length
-+ */
-+extern void dwc_otg_hcd_urb_set_iso_desc_params(dwc_otg_hcd_urb_t * dwc_otg_urb,
-+						int desc_num, uint32_t offset,
-+						uint32_t length);
-+
-+/** Get status of ISOC descriptor, specified by desc_num
-+ *
-+ * @param dwc_otg_urb DWC_OTG URB
-+ * @param desc_num ISOC descriptor number
-+ */
-+extern uint32_t dwc_otg_hcd_urb_get_iso_desc_status(dwc_otg_hcd_urb_t *
-+						    dwc_otg_urb, int desc_num);
-+
-+/** Get actual length of ISOC descriptor, specified by desc_num
-+ *
-+ * @param dwc_otg_urb DWC_OTG URB
-+ * @param desc_num ISOC descriptor number
-+ */
-+extern uint32_t dwc_otg_hcd_urb_get_iso_desc_actual_length(dwc_otg_hcd_urb_t *
-+							   dwc_otg_urb,
-+							   int desc_num);
-+
-+/** Queue URB. After transfer is completes, the complete callback will be called with the URB status
-+ *
-+ * @param dwc_otg_hcd The HCD
-+ * @param dwc_otg_urb DWC_OTG URB
-+ * @param ep_handle Out parameter for returning endpoint handle
-+ * @param atomic_alloc Flag to do atomic allocation if needed
-+ *
-+ * Returns -DWC_E_NO_DEVICE if no device is connected.
-+ * Returns -DWC_E_NO_MEMORY if there is no enough memory.
-+ * Returns 0 on success.
-+ */
-+extern int dwc_otg_hcd_urb_enqueue(dwc_otg_hcd_t * dwc_otg_hcd,
-+				   dwc_otg_hcd_urb_t * dwc_otg_urb,
-+				   void **ep_handle, int atomic_alloc);
-+
-+/** De-queue the specified URB
-+ *
-+ * @param dwc_otg_hcd The HCD
-+ * @param dwc_otg_urb DWC_OTG URB
-+ */
-+extern int dwc_otg_hcd_urb_dequeue(dwc_otg_hcd_t * dwc_otg_hcd,
-+				   dwc_otg_hcd_urb_t * dwc_otg_urb);
-+
-+/** Frees resources in the DWC_otg controller related to a given endpoint.
-+ * Any URBs for the endpoint must already be dequeued.
-+ *
-+ * @param hcd The HCD
-+ * @param ep_handle Endpoint handle, returned by dwc_otg_hcd_urb_enqueue function
-+ * @param retry Number of retries if there are queued transfers.
-+ *
-+ * Returns -DWC_E_INVALID if invalid arguments are passed.
-+ * Returns 0 on success
-+ */
-+extern int dwc_otg_hcd_endpoint_disable(dwc_otg_hcd_t * hcd, void *ep_handle,
-+					int retry);
-+
-+/* Resets the data toggle in qh structure. This function can be called from
-+ * usb_clear_halt routine.
-+ *
-+ * @param hcd The HCD
-+ * @param ep_handle Endpoint handle, returned by dwc_otg_hcd_urb_enqueue function
-+ *
-+ * Returns -DWC_E_INVALID if invalid arguments are passed.
-+ * Returns 0 on success
-+ */
-+extern int dwc_otg_hcd_endpoint_reset(dwc_otg_hcd_t * hcd, void *ep_handle);
-+
-+/** Returns 1 if status of specified port is changed and 0 otherwise.
-+ *
-+ * @param hcd The HCD
-+ * @param port Port number
-+ */
-+extern int dwc_otg_hcd_is_status_changed(dwc_otg_hcd_t * hcd, int port);
-+
-+/** Call this function to check if bandwidth was allocated for specified endpoint.
-+ * Only for ISOC and INTERRUPT endpoints.
-+ *
-+ * @param hcd The HCD
-+ * @param ep_handle Endpoint handle
-+ */
-+extern int dwc_otg_hcd_is_bandwidth_allocated(dwc_otg_hcd_t * hcd,
-+					      void *ep_handle);
-+
-+/** Call this function to check if bandwidth was freed for specified endpoint.
-+ *
-+ * @param hcd The HCD
-+ * @param ep_handle Endpoint handle
-+ */
-+extern int dwc_otg_hcd_is_bandwidth_freed(dwc_otg_hcd_t * hcd, void *ep_handle);
-+
-+/** Returns bandwidth allocated for specified endpoint in microseconds.
-+ * Only for ISOC and INTERRUPT endpoints.
-+ *
-+ * @param hcd The HCD
-+ * @param ep_handle Endpoint handle
-+ */
-+extern uint8_t dwc_otg_hcd_get_ep_bandwidth(dwc_otg_hcd_t * hcd,
-+					    void *ep_handle);
-+
-+/** @} */
-+
-+#endif /* __DWC_HCD_IF_H__ */
-+#endif /* DWC_DEVICE_ONLY */
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c
-@@ -0,0 +1,2757 @@
-+/* ==========================================================================
-+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_intr.c $
-+ * $Revision: #89 $
-+ * $Date: 2011/10/20 $
-+ * $Change: 1869487 $
-+ *
-+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
-+ * "Software") is an Unsupported proprietary work of Synopsys, Inc. unless
-+ * otherwise expressly agreed to in writing between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product under
-+ * any End User Software License Agreement or Agreement for Licensed Product
-+ * with Synopsys or any supplement thereto. You are permitted to use and
-+ * redistribute this Software in source and binary forms, with or without
-+ * modification, provided that redistributions of source code must retain this
-+ * notice. You may not view, use, disclose, copy or distribute this file or
-+ * any information contained herein except pursuant to this license grant from
-+ * Synopsys. If you do not agree with this notice, including the disclaimer
-+ * below, then you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" BASIS
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS BE LIABLE FOR ANY DIRECT,
-+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================== */
-+#ifndef DWC_DEVICE_ONLY
-+
-+#include "dwc_otg_hcd.h"
-+#include "dwc_otg_regs.h"
-+
-+#include <linux/jiffies.h>
-+#ifdef CONFIG_ARM
-+#include <asm/fiq.h>
-+#endif
-+
-+extern bool microframe_schedule;
-+
-+/** @file
-+ * This file contains the implementation of the HCD Interrupt handlers.
-+ */
-+
-+int fiq_done, int_done;
-+
-+#ifdef FIQ_DEBUG
-+char buffer[1000*16];
-+int wptr;
-+void notrace _fiq_print(FIQDBG_T dbg_lvl, char *fmt, ...)
-+{
-+	FIQDBG_T dbg_lvl_req = FIQDBG_PORTHUB;
-+	va_list args;
-+	char text[17];
-+	hfnum_data_t hfnum = { .d32 = FIQ_READ(dwc_regs_base + 0x408) };
-+
-+	if(dbg_lvl & dbg_lvl_req || dbg_lvl == FIQDBG_ERR)
-+	{
-+		local_fiq_disable();
-+		snprintf(text, 9, "%4d%d:%d ", hfnum.b.frnum/8, hfnum.b.frnum%8, 8 - hfnum.b.frrem/937);
-+		va_start(args, fmt);
-+		vsnprintf(text+8, 9, fmt, args);
-+		va_end(args);
-+
-+		memcpy(buffer + wptr, text, 16);
-+		wptr = (wptr + 16) % sizeof(buffer);
-+		local_fiq_enable();
-+	}
-+}
-+#endif
-+
-+/** This function handles interrupts for the HCD. */
-+int32_t dwc_otg_hcd_handle_intr(dwc_otg_hcd_t * dwc_otg_hcd)
-+{
-+	int retval = 0;
-+	static int last_time;
-+	dwc_otg_core_if_t *core_if = dwc_otg_hcd->core_if;
-+	gintsts_data_t gintsts;
-+	gintmsk_data_t gintmsk;
-+	hfnum_data_t hfnum;
-+	haintmsk_data_t haintmsk;
-+
-+#ifdef DEBUG
-+	dwc_otg_core_global_regs_t *global_regs = core_if->core_global_regs;
-+
-+#endif
-+
-+	gintsts.d32 = DWC_READ_REG32(&core_if->core_global_regs->gintsts);
-+	gintmsk.d32 = DWC_READ_REG32(&core_if->core_global_regs->gintmsk);
-+
-+	/* Exit from ISR if core is hibernated */
-+	if (core_if->hibernation_suspend == 1) {
-+		goto exit_handler_routine;
-+	}
-+	DWC_SPINLOCK(dwc_otg_hcd->lock);
-+	/* Check if HOST Mode */
-+	if (dwc_otg_is_host_mode(core_if)) {
-+		if (fiq_enable) {
-+			local_fiq_disable();
-+			fiq_fsm_spin_lock(&dwc_otg_hcd->fiq_state->lock);
-+			/* Pull in from the FIQ's disabled mask */
-+			gintmsk.d32 = gintmsk.d32 | ~(dwc_otg_hcd->fiq_state->gintmsk_saved.d32);
-+			dwc_otg_hcd->fiq_state->gintmsk_saved.d32 = ~0;
-+		}
-+
-+		if (fiq_fsm_enable && ( 0x0000FFFF & ~(dwc_otg_hcd->fiq_state->haintmsk_saved.b2.chint))) {
-+			gintsts.b.hcintr = 1;
-+		}
-+
-+		/* Danger will robinson: fake a SOF if necessary */
-+		if (fiq_fsm_enable && (dwc_otg_hcd->fiq_state->gintmsk_saved.b.sofintr == 1)) {
-+			gintsts.b.sofintr = 1;
-+		}
-+		gintsts.d32 &= gintmsk.d32;
-+
-+		if (fiq_enable) {
-+			fiq_fsm_spin_unlock(&dwc_otg_hcd->fiq_state->lock);
-+			local_fiq_enable();
-+		}
-+
-+		if (!gintsts.d32) {
-+			goto exit_handler_routine;
-+		}
-+
-+#ifdef DEBUG
-+		// We should be OK doing this because the common interrupts should already have been serviced
-+		/* Don't print debug message in the interrupt handler on SOF */
-+#ifndef DEBUG_SOF
-+		if (gintsts.d32 != DWC_SOF_INTR_MASK)
-+#endif
-+			DWC_DEBUGPL(DBG_HCDI, "\n");
-+#endif
-+
-+#ifdef DEBUG
-+#ifndef DEBUG_SOF
-+		if (gintsts.d32 != DWC_SOF_INTR_MASK)
-+#endif
-+			DWC_DEBUGPL(DBG_HCDI,
-+				    "DWC OTG HCD Interrupt Detected gintsts&gintmsk=0x%08x core_if=%p\n",
-+				    gintsts.d32, core_if);
-+#endif
-+		hfnum.d32 = DWC_READ_REG32(&dwc_otg_hcd->core_if->host_if->host_global_regs->hfnum);
-+		if (gintsts.b.sofintr) {
-+			retval |= dwc_otg_hcd_handle_sof_intr(dwc_otg_hcd);
-+		}
-+
-+		if (gintsts.b.rxstsqlvl) {
-+			retval |=
-+			    dwc_otg_hcd_handle_rx_status_q_level_intr
-+			    (dwc_otg_hcd);
-+		}
-+		if (gintsts.b.nptxfempty) {
-+			retval |=
-+			    dwc_otg_hcd_handle_np_tx_fifo_empty_intr
-+			    (dwc_otg_hcd);
-+		}
-+		if (gintsts.b.i2cintr) {
-+			/** @todo Implement i2cintr handler. */
-+		}
-+		if (gintsts.b.portintr) {
-+
-+			gintmsk_data_t gintmsk = { .b.portintr = 1};
-+			retval |= dwc_otg_hcd_handle_port_intr(dwc_otg_hcd);
-+			if (fiq_enable) {
-+				local_fiq_disable();
-+				fiq_fsm_spin_lock(&dwc_otg_hcd->fiq_state->lock);
-+				DWC_MODIFY_REG32(&dwc_otg_hcd->core_if->core_global_regs->gintmsk, 0, gintmsk.d32);
-+				fiq_fsm_spin_unlock(&dwc_otg_hcd->fiq_state->lock);
-+				local_fiq_enable();
-+			} else {
-+				DWC_MODIFY_REG32(&dwc_otg_hcd->core_if->core_global_regs->gintmsk, 0, gintmsk.d32);
-+			}
-+		}
-+		if (gintsts.b.hcintr) {
-+			retval |= dwc_otg_hcd_handle_hc_intr(dwc_otg_hcd);
-+		}
-+		if (gintsts.b.ptxfempty) {
-+			retval |=
-+			    dwc_otg_hcd_handle_perio_tx_fifo_empty_intr
-+			    (dwc_otg_hcd);
-+		}
-+#ifdef DEBUG
-+#ifndef DEBUG_SOF
-+		if (gintsts.d32 != DWC_SOF_INTR_MASK)
-+#endif
-+		{
-+			DWC_DEBUGPL(DBG_HCDI,
-+				    "DWC OTG HCD Finished Servicing Interrupts\n");
-+			DWC_DEBUGPL(DBG_HCDV, "DWC OTG HCD gintsts=0x%08x\n",
-+				    DWC_READ_REG32(&global_regs->gintsts));
-+			DWC_DEBUGPL(DBG_HCDV, "DWC OTG HCD gintmsk=0x%08x\n",
-+				    DWC_READ_REG32(&global_regs->gintmsk));
-+		}
-+#endif
-+
-+#ifdef DEBUG
-+#ifndef DEBUG_SOF
-+		if (gintsts.d32 != DWC_SOF_INTR_MASK)
-+#endif
-+			DWC_DEBUGPL(DBG_HCDI, "\n");
-+#endif
-+
-+	}
-+
-+exit_handler_routine:
-+	if (fiq_enable)	{
-+		gintmsk_data_t gintmsk_new;
-+		haintmsk_data_t haintmsk_new;
-+		local_fiq_disable();
-+		fiq_fsm_spin_lock(&dwc_otg_hcd->fiq_state->lock);
-+		gintmsk_new.d32 = *(volatile uint32_t *)&dwc_otg_hcd->fiq_state->gintmsk_saved.d32;
-+		if(fiq_fsm_enable)
-+			haintmsk_new.d32 = *(volatile uint32_t *)&dwc_otg_hcd->fiq_state->haintmsk_saved.d32;
-+		else
-+			haintmsk_new.d32 = 0x0000FFFF;
-+
-+		/* The FIQ could have sneaked another interrupt in. If so, don't clear MPHI */
-+		if ((gintmsk_new.d32 == ~0) && (haintmsk_new.d32 == 0x0000FFFF)) {
-+			if (dwc_otg_hcd->fiq_state->mphi_regs.swirq_clr) {
-+				DWC_WRITE_REG32(dwc_otg_hcd->fiq_state->mphi_regs.swirq_clr, 1);
-+			} else {
-+				DWC_WRITE_REG32(dwc_otg_hcd->fiq_state->mphi_regs.intstat, (1<<16));
-+			}
-+			if (dwc_otg_hcd->fiq_state->mphi_int_count >= 50) {
-+				fiq_print(FIQDBG_INT, dwc_otg_hcd->fiq_state, "MPHI CLR");
-+					DWC_WRITE_REG32(dwc_otg_hcd->fiq_state->mphi_regs.ctrl, ((1<<31) + (1<<16)));
-+					while (!(DWC_READ_REG32(dwc_otg_hcd->fiq_state->mphi_regs.ctrl) & (1 << 17)))
-+						;
-+					DWC_WRITE_REG32(dwc_otg_hcd->fiq_state->mphi_regs.ctrl, (1<<31));
-+					dwc_otg_hcd->fiq_state->mphi_int_count = 0;
-+			}
-+			int_done++;
-+		}
-+		haintmsk.d32 = DWC_READ_REG32(&core_if->host_if->host_global_regs->haintmsk);
-+		/* Re-enable interrupts that the FIQ masked (first time round) */
-+		FIQ_WRITE(dwc_otg_hcd->fiq_state->dwc_regs_base + GINTMSK, gintmsk.d32);
-+		fiq_fsm_spin_unlock(&dwc_otg_hcd->fiq_state->lock);
-+		local_fiq_enable();
-+
-+		if ((jiffies / HZ) > last_time) {
-+			//dwc_otg_qh_t *qh;
-+			//dwc_list_link_t *cur;
-+			/* Once a second output the fiq and irq numbers, useful for debug */
-+			last_time = jiffies / HZ;
-+		//	 DWC_WARN("np_kick=%d AHC=%d sched_frame=%d cur_frame=%d int_done=%d fiq_done=%d",
-+		//	dwc_otg_hcd->fiq_state->kick_np_queues, dwc_otg_hcd->available_host_channels,
-+		//	dwc_otg_hcd->fiq_state->next_sched_frame, hfnum.b.frnum, int_done, dwc_otg_hcd->fiq_state->fiq_done);
-+			 //printk(KERN_WARNING "Periodic queues:\n");
-+		}
-+	}
-+
-+	DWC_SPINUNLOCK(dwc_otg_hcd->lock);
-+	return retval;
-+}
-+
-+#ifdef DWC_TRACK_MISSED_SOFS
-+
-+#warning Compiling code to track missed SOFs
-+#define FRAME_NUM_ARRAY_SIZE 1000
-+/**
-+ * This function is for debug only.
-+ */
-+static inline void track_missed_sofs(uint16_t curr_frame_number)
-+{
-+	static uint16_t frame_num_array[FRAME_NUM_ARRAY_SIZE];
-+	static uint16_t last_frame_num_array[FRAME_NUM_ARRAY_SIZE];
-+	static int frame_num_idx = 0;
-+	static uint16_t last_frame_num = DWC_HFNUM_MAX_FRNUM;
-+	static int dumped_frame_num_array = 0;
-+
-+	if (frame_num_idx < FRAME_NUM_ARRAY_SIZE) {
-+		if (((last_frame_num + 1) & DWC_HFNUM_MAX_FRNUM) !=
-+		    curr_frame_number) {
-+			frame_num_array[frame_num_idx] = curr_frame_number;
-+			last_frame_num_array[frame_num_idx++] = last_frame_num;
-+		}
-+	} else if (!dumped_frame_num_array) {
-+		int i;
-+		DWC_PRINTF("Frame     Last Frame\n");
-+		DWC_PRINTF("-----     ----------\n");
-+		for (i = 0; i < FRAME_NUM_ARRAY_SIZE; i++) {
-+			DWC_PRINTF("0x%04x    0x%04x\n",
-+				   frame_num_array[i], last_frame_num_array[i]);
-+		}
-+		dumped_frame_num_array = 1;
-+	}
-+	last_frame_num = curr_frame_number;
-+}
-+#endif
-+
-+/**
-+ * Handles the start-of-frame interrupt in host mode. Non-periodic
-+ * transactions may be queued to the DWC_otg controller for the current
-+ * (micro)frame. Periodic transactions may be queued to the controller for the
-+ * next (micro)frame.
-+ */
-+int32_t dwc_otg_hcd_handle_sof_intr(dwc_otg_hcd_t * hcd)
-+{
-+	hfnum_data_t hfnum;
-+	gintsts_data_t gintsts = { .d32 = 0 };
-+	dwc_list_link_t *qh_entry;
-+	dwc_otg_qh_t *qh;
-+	dwc_otg_transaction_type_e tr_type;
-+	int did_something = 0;
-+	int32_t next_sched_frame = -1;
-+
-+	hfnum.d32 =
-+	    DWC_READ_REG32(&hcd->core_if->host_if->host_global_regs->hfnum);
-+
-+#ifdef DEBUG_SOF
-+	DWC_DEBUGPL(DBG_HCD, "--Start of Frame Interrupt--\n");
-+#endif
-+	hcd->frame_number = hfnum.b.frnum;
-+
-+#ifdef DEBUG
-+	hcd->frrem_accum += hfnum.b.frrem;
-+	hcd->frrem_samples++;
-+#endif
-+
-+#ifdef DWC_TRACK_MISSED_SOFS
-+	track_missed_sofs(hcd->frame_number);
-+#endif
-+	/* Determine whether any periodic QHs should be executed. */
-+	qh_entry = DWC_LIST_FIRST(&hcd->periodic_sched_inactive);
-+	while (qh_entry != &hcd->periodic_sched_inactive) {
-+		qh = DWC_LIST_ENTRY(qh_entry, dwc_otg_qh_t, qh_list_entry);
-+		qh_entry = qh_entry->next;
-+		if (dwc_frame_num_le(qh->sched_frame, hcd->frame_number)) {
-+
-+			/*
-+			 * Move QH to the ready list to be executed next
-+			 * (micro)frame.
-+			 */
-+			DWC_LIST_MOVE_HEAD(&hcd->periodic_sched_ready,
-+					   &qh->qh_list_entry);
-+
-+			did_something = 1;
-+		}
-+		else
-+		{
-+			if(next_sched_frame < 0 || dwc_frame_num_le(qh->sched_frame, next_sched_frame))
-+			{
-+				next_sched_frame = qh->sched_frame;
-+			}
-+		}
-+	}
-+	if (fiq_enable)
-+		hcd->fiq_state->next_sched_frame = next_sched_frame;
-+
-+	tr_type = dwc_otg_hcd_select_transactions(hcd);
-+	if (tr_type != DWC_OTG_TRANSACTION_NONE) {
-+		dwc_otg_hcd_queue_transactions(hcd, tr_type);
-+		did_something = 1;
-+	}
-+
-+	/* Clear interrupt - but do not trample on the FIQ sof */
-+	if (!fiq_fsm_enable) {
-+		gintsts.b.sofintr = 1;
-+		DWC_WRITE_REG32(&hcd->core_if->core_global_regs->gintsts, gintsts.d32);
-+	}
-+	return 1;
-+}
-+
-+/** Handles the Rx Status Queue Level Interrupt, which indicates that there is at
-+ * least one packet in the Rx FIFO.  The packets are moved from the FIFO to
-+ * memory if the DWC_otg controller is operating in Slave mode. */
-+int32_t dwc_otg_hcd_handle_rx_status_q_level_intr(dwc_otg_hcd_t * dwc_otg_hcd)
-+{
-+	host_grxsts_data_t grxsts;
-+	dwc_hc_t *hc = NULL;
-+
-+	DWC_DEBUGPL(DBG_HCD, "--RxStsQ Level Interrupt--\n");
-+
-+	grxsts.d32 =
-+	    DWC_READ_REG32(&dwc_otg_hcd->core_if->core_global_regs->grxstsp);
-+
-+	hc = dwc_otg_hcd->hc_ptr_array[grxsts.b.chnum];
-+	if (!hc) {
-+		DWC_ERROR("Unable to get corresponding channel\n");
-+		return 0;
-+	}
-+
-+	/* Packet Status */
-+	DWC_DEBUGPL(DBG_HCDV, "    Ch num = %d\n", grxsts.b.chnum);
-+	DWC_DEBUGPL(DBG_HCDV, "    Count = %d\n", grxsts.b.bcnt);
-+	DWC_DEBUGPL(DBG_HCDV, "    DPID = %d, hc.dpid = %d\n", grxsts.b.dpid,
-+		    hc->data_pid_start);
-+	DWC_DEBUGPL(DBG_HCDV, "    PStatus = %d\n", grxsts.b.pktsts);
-+
-+	switch (grxsts.b.pktsts) {
-+	case DWC_GRXSTS_PKTSTS_IN:
-+		/* Read the data into the host buffer. */
-+		if (grxsts.b.bcnt > 0) {
-+			dwc_otg_read_packet(dwc_otg_hcd->core_if,
-+					    hc->xfer_buff, grxsts.b.bcnt);
-+
-+			/* Update the HC fields for the next packet received. */
-+			hc->xfer_count += grxsts.b.bcnt;
-+			hc->xfer_buff += grxsts.b.bcnt;
-+		}
-+
-+	case DWC_GRXSTS_PKTSTS_IN_XFER_COMP:
-+	case DWC_GRXSTS_PKTSTS_DATA_TOGGLE_ERR:
-+	case DWC_GRXSTS_PKTSTS_CH_HALTED:
-+		/* Handled in interrupt, just ignore data */
-+		break;
-+	default:
-+		DWC_ERROR("RX_STS_Q Interrupt: Unknown status %d\n",
-+			  grxsts.b.pktsts);
-+		break;
-+	}
-+
-+	return 1;
-+}
-+
-+/** This interrupt occurs when the non-periodic Tx FIFO is half-empty. More
-+ * data packets may be written to the FIFO for OUT transfers. More requests
-+ * may be written to the non-periodic request queue for IN transfers. This
-+ * interrupt is enabled only in Slave mode. */
-+int32_t dwc_otg_hcd_handle_np_tx_fifo_empty_intr(dwc_otg_hcd_t * dwc_otg_hcd)
-+{
-+	DWC_DEBUGPL(DBG_HCD, "--Non-Periodic TxFIFO Empty Interrupt--\n");
-+	dwc_otg_hcd_queue_transactions(dwc_otg_hcd,
-+				       DWC_OTG_TRANSACTION_NON_PERIODIC);
-+	return 1;
-+}
-+
-+/** This interrupt occurs when the periodic Tx FIFO is half-empty. More data
-+ * packets may be written to the FIFO for OUT transfers. More requests may be
-+ * written to the periodic request queue for IN transfers. This interrupt is
-+ * enabled only in Slave mode. */
-+int32_t dwc_otg_hcd_handle_perio_tx_fifo_empty_intr(dwc_otg_hcd_t * dwc_otg_hcd)
-+{
-+	DWC_DEBUGPL(DBG_HCD, "--Periodic TxFIFO Empty Interrupt--\n");
-+	dwc_otg_hcd_queue_transactions(dwc_otg_hcd,
-+				       DWC_OTG_TRANSACTION_PERIODIC);
-+	return 1;
-+}
-+
-+/** There are multiple conditions that can cause a port interrupt. This function
-+ * determines which interrupt conditions have occurred and handles them
-+ * appropriately. */
-+int32_t dwc_otg_hcd_handle_port_intr(dwc_otg_hcd_t * dwc_otg_hcd)
-+{
-+	int retval = 0;
-+	hprt0_data_t hprt0;
-+	hprt0_data_t hprt0_modify;
-+
-+	hprt0.d32 = DWC_READ_REG32(dwc_otg_hcd->core_if->host_if->hprt0);
-+	hprt0_modify.d32 = DWC_READ_REG32(dwc_otg_hcd->core_if->host_if->hprt0);
-+
-+	/* Clear appropriate bits in HPRT0 to clear the interrupt bit in
-+	 * GINTSTS */
-+
-+	hprt0_modify.b.prtena = 0;
-+	hprt0_modify.b.prtconndet = 0;
-+	hprt0_modify.b.prtenchng = 0;
-+	hprt0_modify.b.prtovrcurrchng = 0;
-+
-+	/* Port Connect Detected
-+	 * Set flag and clear if detected */
-+	if (dwc_otg_hcd->core_if->hibernation_suspend == 1) {
-+		// Dont modify port status if we are in hibernation state
-+		hprt0_modify.b.prtconndet = 1;
-+		hprt0_modify.b.prtenchng = 1;
-+		DWC_WRITE_REG32(dwc_otg_hcd->core_if->host_if->hprt0, hprt0_modify.d32);
-+		hprt0.d32 = DWC_READ_REG32(dwc_otg_hcd->core_if->host_if->hprt0);
-+		return retval;
-+	}
-+
-+	if (hprt0.b.prtconndet) {
-+		/** @todo - check if steps performed in 'else' block should be perfromed regardles adp */
-+		if (dwc_otg_hcd->core_if->adp_enable &&
-+				dwc_otg_hcd->core_if->adp.vbuson_timer_started == 1) {
-+			DWC_PRINTF("PORT CONNECT DETECTED ----------------\n");
-+			DWC_TIMER_CANCEL(dwc_otg_hcd->core_if->adp.vbuson_timer);
-+			dwc_otg_hcd->core_if->adp.vbuson_timer_started = 0;
-+			/* TODO - check if this is required, as
-+			 * host initialization was already performed
-+			 * after initial ADP probing
-+			 */
-+			/*dwc_otg_hcd->core_if->adp.vbuson_timer_started = 0;
-+			dwc_otg_core_init(dwc_otg_hcd->core_if);
-+			dwc_otg_enable_global_interrupts(dwc_otg_hcd->core_if);
-+			cil_hcd_start(dwc_otg_hcd->core_if);*/
-+		} else {
-+
-+			DWC_DEBUGPL(DBG_HCD, "--Port Interrupt HPRT0=0x%08x "
-+				    "Port Connect Detected--\n", hprt0.d32);
-+			dwc_otg_hcd->flags.b.port_connect_status_change = 1;
-+			dwc_otg_hcd->flags.b.port_connect_status = 1;
-+			hprt0_modify.b.prtconndet = 1;
-+
-+			/* B-Device has connected, Delete the connection timer. */
-+			DWC_TIMER_CANCEL(dwc_otg_hcd->conn_timer);
-+		}
-+		/* The Hub driver asserts a reset when it sees port connect
-+		 * status change flag */
-+		retval |= 1;
-+	}
-+
-+	/* Port Enable Changed
-+	 * Clear if detected - Set internal flag if disabled */
-+	if (hprt0.b.prtenchng) {
-+		DWC_DEBUGPL(DBG_HCD, "  --Port Interrupt HPRT0=0x%08x "
-+			    "Port Enable Changed--\n", hprt0.d32);
-+		hprt0_modify.b.prtenchng = 1;
-+		if (hprt0.b.prtena == 1) {
-+			hfir_data_t hfir;
-+			int do_reset = 0;
-+			dwc_otg_core_params_t *params =
-+			    dwc_otg_hcd->core_if->core_params;
-+			dwc_otg_core_global_regs_t *global_regs =
-+			    dwc_otg_hcd->core_if->core_global_regs;
-+			dwc_otg_host_if_t *host_if =
-+			    dwc_otg_hcd->core_if->host_if;
-+
-+			dwc_otg_hcd->flags.b.port_speed = hprt0.b.prtspd;
-+			if (microframe_schedule)
-+				init_hcd_usecs(dwc_otg_hcd);
-+
-+			/* Every time when port enables calculate
-+			 * HFIR.FrInterval
-+			 */
-+			hfir.d32 = DWC_READ_REG32(&host_if->host_global_regs->hfir);
-+			hfir.b.frint = calc_frame_interval(dwc_otg_hcd->core_if);
-+			DWC_WRITE_REG32(&host_if->host_global_regs->hfir, hfir.d32);
-+
-+			/* Check if we need to adjust the PHY clock speed for
-+			 * low power and adjust it */
-+			if (params->host_support_fs_ls_low_power) {
-+				gusbcfg_data_t usbcfg;
-+
-+				usbcfg.d32 =
-+				    DWC_READ_REG32(&global_regs->gusbcfg);
-+
-+				if (hprt0.b.prtspd == DWC_HPRT0_PRTSPD_LOW_SPEED
-+				    || hprt0.b.prtspd ==
-+				    DWC_HPRT0_PRTSPD_FULL_SPEED) {
-+					/*
-+					 * Low power
-+					 */
-+					hcfg_data_t hcfg;
-+					if (usbcfg.b.phylpwrclksel == 0) {
-+						/* Set PHY low power clock select for FS/LS devices */
-+						usbcfg.b.phylpwrclksel = 1;
-+						DWC_WRITE_REG32
-+						    (&global_regs->gusbcfg,
-+						     usbcfg.d32);
-+						do_reset = 1;
-+					}
-+
-+					hcfg.d32 =
-+					    DWC_READ_REG32
-+					    (&host_if->host_global_regs->hcfg);
-+
-+					if (hprt0.b.prtspd ==
-+					    DWC_HPRT0_PRTSPD_LOW_SPEED
-+					    && params->host_ls_low_power_phy_clk
-+					    ==
-+					    DWC_HOST_LS_LOW_POWER_PHY_CLK_PARAM_6MHZ)
-+					{
-+						/* 6 MHZ */
-+						DWC_DEBUGPL(DBG_CIL,
-+							    "FS_PHY programming HCFG to 6 MHz (Low Power)\n");
-+						if (hcfg.b.fslspclksel !=
-+						    DWC_HCFG_6_MHZ) {
-+							hcfg.b.fslspclksel =
-+							    DWC_HCFG_6_MHZ;
-+							DWC_WRITE_REG32
-+							    (&host_if->host_global_regs->hcfg,
-+							     hcfg.d32);
-+							do_reset = 1;
-+						}
-+					} else {
-+						/* 48 MHZ */
-+						DWC_DEBUGPL(DBG_CIL,
-+							    "FS_PHY programming HCFG to 48 MHz ()\n");
-+						if (hcfg.b.fslspclksel !=
-+						    DWC_HCFG_48_MHZ) {
-+							hcfg.b.fslspclksel =
-+							    DWC_HCFG_48_MHZ;
-+							DWC_WRITE_REG32
-+							    (&host_if->host_global_regs->hcfg,
-+							     hcfg.d32);
-+							do_reset = 1;
-+						}
-+					}
-+				} else {
-+					/*
-+					 * Not low power
-+					 */
-+					if (usbcfg.b.phylpwrclksel == 1) {
-+						usbcfg.b.phylpwrclksel = 0;
-+						DWC_WRITE_REG32
-+						    (&global_regs->gusbcfg,
-+						     usbcfg.d32);
-+						do_reset = 1;
-+					}
-+				}
-+
-+				if (do_reset) {
-+					DWC_TASK_SCHEDULE(dwc_otg_hcd->reset_tasklet);
-+				}
-+			}
-+
-+			if (!do_reset) {
-+				/* Port has been enabled set the reset change flag */
-+				dwc_otg_hcd->flags.b.port_reset_change = 1;
-+			}
-+		} else {
-+			dwc_otg_hcd->flags.b.port_enable_change = 1;
-+		}
-+		retval |= 1;
-+	}
-+
-+	/** Overcurrent Change Interrupt */
-+	if (hprt0.b.prtovrcurrchng) {
-+		DWC_DEBUGPL(DBG_HCD, "  --Port Interrupt HPRT0=0x%08x "
-+			    "Port Overcurrent Changed--\n", hprt0.d32);
-+		dwc_otg_hcd->flags.b.port_over_current_change = 1;
-+		hprt0_modify.b.prtovrcurrchng = 1;
-+		retval |= 1;
-+	}
-+
-+	/* Clear Port Interrupts */
-+	DWC_WRITE_REG32(dwc_otg_hcd->core_if->host_if->hprt0, hprt0_modify.d32);
-+
-+	return retval;
-+}
-+
-+/** This interrupt indicates that one or more host channels has a pending
-+ * interrupt. There are multiple conditions that can cause each host channel
-+ * interrupt. This function determines which conditions have occurred for each
-+ * host channel interrupt and handles them appropriately. */
-+int32_t dwc_otg_hcd_handle_hc_intr(dwc_otg_hcd_t * dwc_otg_hcd)
-+{
-+	int i;
-+	int retval = 0;
-+	haint_data_t haint = { .d32 = 0 } ;
-+
-+	/* Clear appropriate bits in HCINTn to clear the interrupt bit in
-+	 * GINTSTS */
-+
-+	if (!fiq_fsm_enable)
-+		haint.d32 = dwc_otg_read_host_all_channels_intr(dwc_otg_hcd->core_if);
-+
-+	// Overwrite with saved interrupts from fiq handler
-+	if(fiq_fsm_enable)
-+	{
-+		/* check the mask? */
-+		local_fiq_disable();
-+		fiq_fsm_spin_lock(&dwc_otg_hcd->fiq_state->lock);
-+		haint.b2.chint |= ~(dwc_otg_hcd->fiq_state->haintmsk_saved.b2.chint);
-+		dwc_otg_hcd->fiq_state->haintmsk_saved.b2.chint = ~0;
-+		fiq_fsm_spin_unlock(&dwc_otg_hcd->fiq_state->lock);
-+		local_fiq_enable();
-+	}
-+
-+	for (i = 0; i < dwc_otg_hcd->core_if->core_params->host_channels; i++) {
-+		if (haint.b2.chint & (1 << i)) {
-+			retval |= dwc_otg_hcd_handle_hc_n_intr(dwc_otg_hcd, i);
-+		}
-+	}
-+
-+	return retval;
-+}
-+
-+/**
-+ * Gets the actual length of a transfer after the transfer halts. _halt_status
-+ * holds the reason for the halt.
-+ *
-+ * For IN transfers where halt_status is DWC_OTG_HC_XFER_COMPLETE,
-+ * *short_read is set to 1 upon return if less than the requested
-+ * number of bytes were transferred. Otherwise, *short_read is set to 0 upon
-+ * return. short_read may also be NULL on entry, in which case it remains
-+ * unchanged.
-+ */
-+static uint32_t get_actual_xfer_length(dwc_hc_t * hc,
-+				       dwc_otg_hc_regs_t * hc_regs,
-+				       dwc_otg_qtd_t * qtd,
-+				       dwc_otg_halt_status_e halt_status,
-+				       int *short_read)
-+{
-+	hctsiz_data_t hctsiz;
-+	uint32_t length;
-+
-+	if (short_read != NULL) {
-+		*short_read = 0;
-+	}
-+	hctsiz.d32 = DWC_READ_REG32(&hc_regs->hctsiz);
-+
-+	if (halt_status == DWC_OTG_HC_XFER_COMPLETE) {
-+		if (hc->ep_is_in) {
-+			length = hc->xfer_len - hctsiz.b.xfersize;
-+			if (short_read != NULL) {
-+				*short_read = (hctsiz.b.xfersize != 0);
-+			}
-+		} else if (hc->qh->do_split) {
-+				//length = split_out_xfersize[hc->hc_num];
-+				length = qtd->ssplit_out_xfer_count;
-+		} else {
-+			length = hc->xfer_len;
-+		}
-+	} else {
-+		/*
-+		 * Must use the hctsiz.pktcnt field to determine how much data
-+		 * has been transferred. This field reflects the number of
-+		 * packets that have been transferred via the USB. This is
-+		 * always an integral number of packets if the transfer was
-+		 * halted before its normal completion. (Can't use the
-+		 * hctsiz.xfersize field because that reflects the number of
-+		 * bytes transferred via the AHB, not the USB).
-+		 */
-+		length =
-+		    (hc->start_pkt_count - hctsiz.b.pktcnt) * hc->max_packet;
-+	}
-+
-+	return length;
-+}
-+
-+/**
-+ * Updates the state of the URB after a Transfer Complete interrupt on the
-+ * host channel. Updates the actual_length field of the URB based on the
-+ * number of bytes transferred via the host channel. Sets the URB status
-+ * if the data transfer is finished.
-+ *
-+ * @return 1 if the data transfer specified by the URB is completely finished,
-+ * 0 otherwise.
-+ */
-+static int update_urb_state_xfer_comp(dwc_hc_t * hc,
-+				      dwc_otg_hc_regs_t * hc_regs,
-+				      dwc_otg_hcd_urb_t * urb,
-+				      dwc_otg_qtd_t * qtd)
-+{
-+	int xfer_done = 0;
-+	int short_read = 0;
-+
-+	int xfer_length;
-+
-+	xfer_length = get_actual_xfer_length(hc, hc_regs, qtd,
-+					     DWC_OTG_HC_XFER_COMPLETE,
-+					     &short_read);
-+
-+	if (urb->actual_length + xfer_length > urb->length) {
-+		printk_once(KERN_DEBUG "dwc_otg: DEVICE:%03d : %s:%d:trimming xfer length\n",
-+			hc->dev_addr, __func__, __LINE__);
-+		xfer_length = urb->length - urb->actual_length;
-+	}
-+
-+	/* non DWORD-aligned buffer case handling. */
-+	if (hc->align_buff && xfer_length && hc->ep_is_in) {
-+		dwc_memcpy(urb->buf + urb->actual_length, hc->qh->dw_align_buf,
-+			   xfer_length);
-+	}
-+
-+	urb->actual_length += xfer_length;
-+
-+	if (xfer_length && (hc->ep_type == DWC_OTG_EP_TYPE_BULK) &&
-+	    (urb->flags & URB_SEND_ZERO_PACKET)
-+	    && (urb->actual_length == urb->length)
-+	    && !(urb->length % hc->max_packet)) {
-+		xfer_done = 0;
-+	} else if (short_read || urb->actual_length >= urb->length) {
-+		xfer_done = 1;
-+		urb->status = 0;
-+	}
-+
-+#ifdef DEBUG
-+	{
-+		hctsiz_data_t hctsiz;
-+		hctsiz.d32 = DWC_READ_REG32(&hc_regs->hctsiz);
-+		DWC_DEBUGPL(DBG_HCDV, "DWC_otg: %s: %s, channel %d\n",
-+			    __func__, (hc->ep_is_in ? "IN" : "OUT"),
-+			    hc->hc_num);
-+		DWC_DEBUGPL(DBG_HCDV, "  hc->xfer_len %d\n", hc->xfer_len);
-+		DWC_DEBUGPL(DBG_HCDV, "  hctsiz.xfersize %d\n",
-+			    hctsiz.b.xfersize);
-+		DWC_DEBUGPL(DBG_HCDV, "  urb->transfer_buffer_length %d\n",
-+			    urb->length);
-+		DWC_DEBUGPL(DBG_HCDV, "  urb->actual_length %d\n",
-+			    urb->actual_length);
-+		DWC_DEBUGPL(DBG_HCDV, "  short_read %d, xfer_done %d\n",
-+			    short_read, xfer_done);
-+	}
-+#endif
-+
-+	return xfer_done;
-+}
-+
-+/*
-+ * Save the starting data toggle for the next transfer. The data toggle is
-+ * saved in the QH for non-control transfers and it's saved in the QTD for
-+ * control transfers.
-+ */
-+void dwc_otg_hcd_save_data_toggle(dwc_hc_t * hc,
-+			     dwc_otg_hc_regs_t * hc_regs, dwc_otg_qtd_t * qtd)
-+{
-+	hctsiz_data_t hctsiz;
-+	hctsiz.d32 = DWC_READ_REG32(&hc_regs->hctsiz);
-+
-+	if (hc->ep_type != DWC_OTG_EP_TYPE_CONTROL) {
-+		dwc_otg_qh_t *qh = hc->qh;
-+		if (hctsiz.b.pid == DWC_HCTSIZ_DATA0) {
-+			qh->data_toggle = DWC_OTG_HC_PID_DATA0;
-+		} else {
-+			qh->data_toggle = DWC_OTG_HC_PID_DATA1;
-+		}
-+	} else {
-+		if (hctsiz.b.pid == DWC_HCTSIZ_DATA0) {
-+			qtd->data_toggle = DWC_OTG_HC_PID_DATA0;
-+		} else {
-+			qtd->data_toggle = DWC_OTG_HC_PID_DATA1;
-+		}
-+	}
-+}
-+
-+/**
-+ * Updates the state of an Isochronous URB when the transfer is stopped for
-+ * any reason. The fields of the current entry in the frame descriptor array
-+ * are set based on the transfer state and the input _halt_status. Completes
-+ * the Isochronous URB if all the URB frames have been completed.
-+ *
-+ * @return DWC_OTG_HC_XFER_COMPLETE if there are more frames remaining to be
-+ * transferred in the URB. Otherwise return DWC_OTG_HC_XFER_URB_COMPLETE.
-+ */
-+static dwc_otg_halt_status_e
-+update_isoc_urb_state(dwc_otg_hcd_t * hcd,
-+		      dwc_hc_t * hc,
-+		      dwc_otg_hc_regs_t * hc_regs,
-+		      dwc_otg_qtd_t * qtd, dwc_otg_halt_status_e halt_status)
-+{
-+	dwc_otg_hcd_urb_t *urb = qtd->urb;
-+	dwc_otg_halt_status_e ret_val = halt_status;
-+	struct dwc_otg_hcd_iso_packet_desc *frame_desc;
-+
-+	frame_desc = &urb->iso_descs[qtd->isoc_frame_index];
-+	switch (halt_status) {
-+	case DWC_OTG_HC_XFER_COMPLETE:
-+		frame_desc->status = 0;
-+		frame_desc->actual_length =
-+		    get_actual_xfer_length(hc, hc_regs, qtd, halt_status, NULL);
-+
-+		/* non DWORD-aligned buffer case handling. */
-+		if (hc->align_buff && frame_desc->actual_length && hc->ep_is_in) {
-+			dwc_memcpy(urb->buf + frame_desc->offset + qtd->isoc_split_offset,
-+				   hc->qh->dw_align_buf, frame_desc->actual_length);
-+		}
-+
-+		break;
-+	case DWC_OTG_HC_XFER_FRAME_OVERRUN:
-+		urb->error_count++;
-+		if (hc->ep_is_in) {
-+			frame_desc->status = -DWC_E_NO_STREAM_RES;
-+		} else {
-+			frame_desc->status = -DWC_E_COMMUNICATION;
-+		}
-+		frame_desc->actual_length = 0;
-+		break;
-+	case DWC_OTG_HC_XFER_BABBLE_ERR:
-+		urb->error_count++;
-+		frame_desc->status = -DWC_E_OVERFLOW;
-+		/* Don't need to update actual_length in this case. */
-+		break;
-+	case DWC_OTG_HC_XFER_XACT_ERR:
-+		urb->error_count++;
-+		frame_desc->status = -DWC_E_PROTOCOL;
-+		frame_desc->actual_length =
-+		    get_actual_xfer_length(hc, hc_regs, qtd, halt_status, NULL);
-+
-+		/* non DWORD-aligned buffer case handling. */
-+		if (hc->align_buff && frame_desc->actual_length && hc->ep_is_in) {
-+			dwc_memcpy(urb->buf + frame_desc->offset + qtd->isoc_split_offset,
-+				   hc->qh->dw_align_buf, frame_desc->actual_length);
-+		}
-+		/* Skip whole frame */
-+		if (hc->qh->do_split && (hc->ep_type == DWC_OTG_EP_TYPE_ISOC) &&
-+		    hc->ep_is_in && hcd->core_if->dma_enable) {
-+			qtd->complete_split = 0;
-+			qtd->isoc_split_offset = 0;
-+		}
-+
-+		break;
-+	default:
-+		DWC_ASSERT(1, "Unhandled _halt_status (%d)\n", halt_status);
-+		break;
-+	}
-+	if (++qtd->isoc_frame_index == urb->packet_count) {
-+		/*
-+		 * urb->status is not used for isoc transfers.
-+		 * The individual frame_desc statuses are used instead.
-+		 */
-+		hcd->fops->complete(hcd, urb->priv, urb, 0);
-+		ret_val = DWC_OTG_HC_XFER_URB_COMPLETE;
-+	} else {
-+		ret_val = DWC_OTG_HC_XFER_COMPLETE;
-+	}
-+	return ret_val;
-+}
-+
-+/**
-+ * Frees the first QTD in the QH's list if free_qtd is 1. For non-periodic
-+ * QHs, removes the QH from the active non-periodic schedule. If any QTDs are
-+ * still linked to the QH, the QH is added to the end of the inactive
-+ * non-periodic schedule. For periodic QHs, removes the QH from the periodic
-+ * schedule if no more QTDs are linked to the QH.
-+ */
-+static void deactivate_qh(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh, int free_qtd)
-+{
-+	int continue_split = 0;
-+	dwc_otg_qtd_t *qtd;
-+
-+	DWC_DEBUGPL(DBG_HCDV, "  %s(%p,%p,%d)\n", __func__, hcd, qh, free_qtd);
-+
-+	qtd = DWC_CIRCLEQ_FIRST(&qh->qtd_list);
-+
-+	if (qtd->complete_split) {
-+		continue_split = 1;
-+	} else if (qtd->isoc_split_pos == DWC_HCSPLIT_XACTPOS_MID ||
-+		   qtd->isoc_split_pos == DWC_HCSPLIT_XACTPOS_END) {
-+		continue_split = 1;
-+	}
-+
-+	if (free_qtd) {
-+		dwc_otg_hcd_qtd_remove_and_free(hcd, qtd, qh);
-+		continue_split = 0;
-+	}
-+
-+	qh->channel = NULL;
-+	dwc_otg_hcd_qh_deactivate(hcd, qh, continue_split);
-+}
-+
-+/**
-+ * Releases a host channel for use by other transfers. Attempts to select and
-+ * queue more transactions since at least one host channel is available.
-+ *
-+ * @param hcd The HCD state structure.
-+ * @param hc The host channel to release.
-+ * @param qtd The QTD associated with the host channel. This QTD may be freed
-+ * if the transfer is complete or an error has occurred.
-+ * @param halt_status Reason the channel is being released. This status
-+ * determines the actions taken by this function.
-+ */
-+static void release_channel(dwc_otg_hcd_t * hcd,
-+			    dwc_hc_t * hc,
-+			    dwc_otg_qtd_t * qtd,
-+			    dwc_otg_halt_status_e halt_status)
-+{
-+	dwc_otg_transaction_type_e tr_type;
-+	int free_qtd;
-+
-+	int hog_port = 0;
-+
-+	DWC_DEBUGPL(DBG_HCDV, "  %s: channel %d, halt_status %d, xfer_len %d\n",
-+		    __func__, hc->hc_num, halt_status, hc->xfer_len);
-+
-+	if(fiq_fsm_enable && hc->do_split) {
-+		if(!hc->ep_is_in && hc->ep_type == UE_ISOCHRONOUS) {
-+			if(hc->xact_pos == DWC_HCSPLIT_XACTPOS_MID ||
-+					hc->xact_pos == DWC_HCSPLIT_XACTPOS_BEGIN) {
-+				hog_port = 0;
-+			}
-+		}
-+	}
-+
-+	switch (halt_status) {
-+	case DWC_OTG_HC_XFER_URB_COMPLETE:
-+		free_qtd = 1;
-+		break;
-+	case DWC_OTG_HC_XFER_AHB_ERR:
-+	case DWC_OTG_HC_XFER_STALL:
-+	case DWC_OTG_HC_XFER_BABBLE_ERR:
-+		free_qtd = 1;
-+		break;
-+	case DWC_OTG_HC_XFER_XACT_ERR:
-+		if (qtd->error_count >= 3) {
-+			DWC_DEBUGPL(DBG_HCDV,
-+				    "  Complete URB with transaction error\n");
-+			free_qtd = 1;
-+			qtd->urb->status = -DWC_E_PROTOCOL;
-+			hcd->fops->complete(hcd, qtd->urb->priv,
-+					    qtd->urb, -DWC_E_PROTOCOL);
-+		} else {
-+			free_qtd = 0;
-+		}
-+		break;
-+	case DWC_OTG_HC_XFER_URB_DEQUEUE:
-+		/*
-+		 * The QTD has already been removed and the QH has been
-+		 * deactivated. Don't want to do anything except release the
-+		 * host channel and try to queue more transfers.
-+		 */
-+		goto cleanup;
-+	case DWC_OTG_HC_XFER_NO_HALT_STATUS:
-+		free_qtd = 0;
-+		break;
-+	case DWC_OTG_HC_XFER_PERIODIC_INCOMPLETE:
-+		DWC_DEBUGPL(DBG_HCDV,
-+			"  Complete URB with I/O error\n");
-+		free_qtd = 1;
-+		qtd->urb->status = -DWC_E_IO;
-+		hcd->fops->complete(hcd, qtd->urb->priv,
-+			qtd->urb, -DWC_E_IO);
-+		break;
-+	default:
-+		free_qtd = 0;
-+		break;
-+	}
-+
-+	deactivate_qh(hcd, hc->qh, free_qtd);
-+
-+cleanup:
-+	/*
-+	 * Release the host channel for use by other transfers. The cleanup
-+	 * function clears the channel interrupt enables and conditions, so
-+	 * there's no need to clear the Channel Halted interrupt separately.
-+	 */
-+	if (fiq_fsm_enable && hcd->fiq_state->channel[hc->hc_num].fsm != FIQ_PASSTHROUGH)
-+		dwc_otg_cleanup_fiq_channel(hcd, hc->hc_num);
-+	dwc_otg_hc_cleanup(hcd->core_if, hc);
-+	DWC_CIRCLEQ_INSERT_TAIL(&hcd->free_hc_list, hc, hc_list_entry);
-+
-+	if (!microframe_schedule) {
-+		switch (hc->ep_type) {
-+		case DWC_OTG_EP_TYPE_CONTROL:
-+		case DWC_OTG_EP_TYPE_BULK:
-+			hcd->non_periodic_channels--;
-+			break;
-+
-+		default:
-+			/*
-+			 * Don't release reservations for periodic channels here.
-+			 * That's done when a periodic transfer is descheduled (i.e.
-+			 * when the QH is removed from the periodic schedule).
-+			 */
-+			break;
-+		}
-+	} else {
-+		hcd->available_host_channels++;
-+		fiq_print(FIQDBG_INT, hcd->fiq_state, "AHC = %d ", hcd->available_host_channels);
-+	}
-+
-+	/* Try to queue more transfers now that there's a free channel. */
-+	tr_type = dwc_otg_hcd_select_transactions(hcd);
-+	if (tr_type != DWC_OTG_TRANSACTION_NONE) {
-+		dwc_otg_hcd_queue_transactions(hcd, tr_type);
-+	}
-+}
-+
-+/**
-+ * Halts a host channel. If the channel cannot be halted immediately because
-+ * the request queue is full, this function ensures that the FIFO empty
-+ * interrupt for the appropriate queue is enabled so that the halt request can
-+ * be queued when there is space in the request queue.
-+ *
-+ * This function may also be called in DMA mode. In that case, the channel is
-+ * simply released since the core always halts the channel automatically in
-+ * DMA mode.
-+ */
-+static void halt_channel(dwc_otg_hcd_t * hcd,
-+			 dwc_hc_t * hc,
-+			 dwc_otg_qtd_t * qtd, dwc_otg_halt_status_e halt_status)
-+{
-+	if (hcd->core_if->dma_enable) {
-+		release_channel(hcd, hc, qtd, halt_status);
-+		return;
-+	}
-+
-+	/* Slave mode processing... */
-+	dwc_otg_hc_halt(hcd->core_if, hc, halt_status);
-+
-+	if (hc->halt_on_queue) {
-+		gintmsk_data_t gintmsk = {.d32 = 0 };
-+		dwc_otg_core_global_regs_t *global_regs;
-+		global_regs = hcd->core_if->core_global_regs;
-+
-+		if (hc->ep_type == DWC_OTG_EP_TYPE_CONTROL ||
-+		    hc->ep_type == DWC_OTG_EP_TYPE_BULK) {
-+			/*
-+			 * Make sure the Non-periodic Tx FIFO empty interrupt
-+			 * is enabled so that the non-periodic schedule will
-+			 * be processed.
-+			 */
-+			gintmsk.b.nptxfempty = 1;
-+			if (fiq_enable) {
-+				local_fiq_disable();
-+				fiq_fsm_spin_lock(&hcd->fiq_state->lock);
-+				DWC_MODIFY_REG32(&global_regs->gintmsk, 0, gintmsk.d32);
-+				fiq_fsm_spin_unlock(&hcd->fiq_state->lock);
-+				local_fiq_enable();
-+			} else {
-+				DWC_MODIFY_REG32(&global_regs->gintmsk, 0, gintmsk.d32);
-+			}
-+		} else {
-+			/*
-+			 * Move the QH from the periodic queued schedule to
-+			 * the periodic assigned schedule. This allows the
-+			 * halt to be queued when the periodic schedule is
-+			 * processed.
-+			 */
-+			DWC_LIST_MOVE_HEAD(&hcd->periodic_sched_assigned,
-+					   &hc->qh->qh_list_entry);
-+
-+			/*
-+			 * Make sure the Periodic Tx FIFO Empty interrupt is
-+			 * enabled so that the periodic schedule will be
-+			 * processed.
-+			 */
-+			gintmsk.b.ptxfempty = 1;
-+			if (fiq_enable) {
-+				local_fiq_disable();
-+				fiq_fsm_spin_lock(&hcd->fiq_state->lock);
-+				DWC_MODIFY_REG32(&global_regs->gintmsk, 0, gintmsk.d32);
-+				fiq_fsm_spin_unlock(&hcd->fiq_state->lock);
-+				local_fiq_enable();
-+			} else {
-+				DWC_MODIFY_REG32(&global_regs->gintmsk, 0, gintmsk.d32);
-+			}
-+		}
-+	}
-+}
-+
-+/**
-+ * Performs common cleanup for non-periodic transfers after a Transfer
-+ * Complete interrupt. This function should be called after any endpoint type
-+ * specific handling is finished to release the host channel.
-+ */
-+static void complete_non_periodic_xfer(dwc_otg_hcd_t * hcd,
-+				       dwc_hc_t * hc,
-+				       dwc_otg_hc_regs_t * hc_regs,
-+				       dwc_otg_qtd_t * qtd,
-+				       dwc_otg_halt_status_e halt_status)
-+{
-+	hcint_data_t hcint;
-+
-+	qtd->error_count = 0;
-+
-+	hcint.d32 = DWC_READ_REG32(&hc_regs->hcint);
-+	if (hcint.b.nyet) {
-+		/*
-+		 * Got a NYET on the last transaction of the transfer. This
-+		 * means that the endpoint should be in the PING state at the
-+		 * beginning of the next transfer.
-+		 */
-+		hc->qh->ping_state = 1;
-+		clear_hc_int(hc_regs, nyet);
-+	}
-+
-+	/*
-+	 * Always halt and release the host channel to make it available for
-+	 * more transfers. There may still be more phases for a control
-+	 * transfer or more data packets for a bulk transfer at this point,
-+	 * but the host channel is still halted. A channel will be reassigned
-+	 * to the transfer when the non-periodic schedule is processed after
-+	 * the channel is released. This allows transactions to be queued
-+	 * properly via dwc_otg_hcd_queue_transactions, which also enables the
-+	 * Tx FIFO Empty interrupt if necessary.
-+	 */
-+	if (hc->ep_is_in) {
-+		/*
-+		 * IN transfers in Slave mode require an explicit disable to
-+		 * halt the channel. (In DMA mode, this call simply releases
-+		 * the channel.)
-+		 */
-+		halt_channel(hcd, hc, qtd, halt_status);
-+	} else {
-+		/*
-+		 * The channel is automatically disabled by the core for OUT
-+		 * transfers in Slave mode.
-+		 */
-+		release_channel(hcd, hc, qtd, halt_status);
-+	}
-+}
-+
-+/**
-+ * Performs common cleanup for periodic transfers after a Transfer Complete
-+ * interrupt. This function should be called after any endpoint type specific
-+ * handling is finished to release the host channel.
-+ */
-+static void complete_periodic_xfer(dwc_otg_hcd_t * hcd,
-+				   dwc_hc_t * hc,
-+				   dwc_otg_hc_regs_t * hc_regs,
-+				   dwc_otg_qtd_t * qtd,
-+				   dwc_otg_halt_status_e halt_status)
-+{
-+	hctsiz_data_t hctsiz;
-+	qtd->error_count = 0;
-+
-+	hctsiz.d32 = DWC_READ_REG32(&hc_regs->hctsiz);
-+	if (!hc->ep_is_in || hctsiz.b.pktcnt == 0) {
-+		/* Core halts channel in these cases. */
-+		release_channel(hcd, hc, qtd, halt_status);
-+	} else {
-+		/* Flush any outstanding requests from the Tx queue. */
-+		halt_channel(hcd, hc, qtd, halt_status);
-+	}
-+}
-+
-+static int32_t handle_xfercomp_isoc_split_in(dwc_otg_hcd_t * hcd,
-+					     dwc_hc_t * hc,
-+					     dwc_otg_hc_regs_t * hc_regs,
-+					     dwc_otg_qtd_t * qtd)
-+{
-+	uint32_t len;
-+	struct dwc_otg_hcd_iso_packet_desc *frame_desc;
-+	frame_desc = &qtd->urb->iso_descs[qtd->isoc_frame_index];
-+
-+	len = get_actual_xfer_length(hc, hc_regs, qtd,
-+				     DWC_OTG_HC_XFER_COMPLETE, NULL);
-+
-+	if (!len) {
-+		qtd->complete_split = 0;
-+		qtd->isoc_split_offset = 0;
-+		return 0;
-+	}
-+	frame_desc->actual_length += len;
-+
-+	if (hc->align_buff && len)
-+		dwc_memcpy(qtd->urb->buf + frame_desc->offset +
-+			   qtd->isoc_split_offset, hc->qh->dw_align_buf, len);
-+	qtd->isoc_split_offset += len;
-+
-+	if (frame_desc->length == frame_desc->actual_length) {
-+		frame_desc->status = 0;
-+		qtd->isoc_frame_index++;
-+		qtd->complete_split = 0;
-+		qtd->isoc_split_offset = 0;
-+	}
-+
-+	if (qtd->isoc_frame_index == qtd->urb->packet_count) {
-+		hcd->fops->complete(hcd, qtd->urb->priv, qtd->urb, 0);
-+		release_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_URB_COMPLETE);
-+	} else {
-+		release_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_NO_HALT_STATUS);
-+	}
-+
-+	return 1;		/* Indicates that channel released */
-+}
-+
-+/**
-+ * Handles a host channel Transfer Complete interrupt. This handler may be
-+ * called in either DMA mode or Slave mode.
-+ */
-+static int32_t handle_hc_xfercomp_intr(dwc_otg_hcd_t * hcd,
-+				       dwc_hc_t * hc,
-+				       dwc_otg_hc_regs_t * hc_regs,
-+				       dwc_otg_qtd_t * qtd)
-+{
-+	int urb_xfer_done;
-+	dwc_otg_halt_status_e halt_status = DWC_OTG_HC_XFER_COMPLETE;
-+	dwc_otg_hcd_urb_t *urb = qtd->urb;
-+	int pipe_type = dwc_otg_hcd_get_pipe_type(&urb->pipe_info);
-+
-+	DWC_DEBUGPL(DBG_HCDI, "--Host Channel %d Interrupt: "
-+		    "Transfer Complete--\n", hc->hc_num);
-+
-+	if (hcd->core_if->dma_desc_enable) {
-+		dwc_otg_hcd_complete_xfer_ddma(hcd, hc, hc_regs, halt_status);
-+		if (pipe_type == UE_ISOCHRONOUS) {
-+			/* Do not disable the interrupt, just clear it */
-+			clear_hc_int(hc_regs, xfercomp);
-+			return 1;
-+		}
-+		goto handle_xfercomp_done;
-+	}
-+
-+	/*
-+	 * Handle xfer complete on CSPLIT.
-+	 */
-+
-+	if (hc->qh->do_split) {
-+		if ((hc->ep_type == DWC_OTG_EP_TYPE_ISOC) && hc->ep_is_in
-+		    && hcd->core_if->dma_enable) {
-+			if (qtd->complete_split
-+			    && handle_xfercomp_isoc_split_in(hcd, hc, hc_regs,
-+							     qtd))
-+				goto handle_xfercomp_done;
-+		} else {
-+			qtd->complete_split = 0;
-+		}
-+	}
-+
-+	/* Update the QTD and URB states. */
-+	switch (pipe_type) {
-+	case UE_CONTROL:
-+		switch (qtd->control_phase) {
-+		case DWC_OTG_CONTROL_SETUP:
-+			if (urb->length > 0) {
-+				qtd->control_phase = DWC_OTG_CONTROL_DATA;
-+			} else {
-+				qtd->control_phase = DWC_OTG_CONTROL_STATUS;
-+			}
-+			DWC_DEBUGPL(DBG_HCDV,
-+				    "  Control setup transaction done\n");
-+			halt_status = DWC_OTG_HC_XFER_COMPLETE;
-+			break;
-+		case DWC_OTG_CONTROL_DATA:{
-+				urb_xfer_done =
-+				    update_urb_state_xfer_comp(hc, hc_regs, urb,
-+							       qtd);
-+				if (urb_xfer_done) {
-+					qtd->control_phase =
-+					    DWC_OTG_CONTROL_STATUS;
-+					DWC_DEBUGPL(DBG_HCDV,
-+						    "  Control data transfer done\n");
-+				} else {
-+					dwc_otg_hcd_save_data_toggle(hc, hc_regs, qtd);
-+				}
-+				halt_status = DWC_OTG_HC_XFER_COMPLETE;
-+				break;
-+			}
-+		case DWC_OTG_CONTROL_STATUS:
-+			DWC_DEBUGPL(DBG_HCDV, "  Control transfer complete\n");
-+			if (urb->status == -DWC_E_IN_PROGRESS) {
-+				urb->status = 0;
-+			}
-+			hcd->fops->complete(hcd, urb->priv, urb, urb->status);
-+			halt_status = DWC_OTG_HC_XFER_URB_COMPLETE;
-+			break;
-+		}
-+
-+		complete_non_periodic_xfer(hcd, hc, hc_regs, qtd, halt_status);
-+		break;
-+	case UE_BULK:
-+		DWC_DEBUGPL(DBG_HCDV, "  Bulk transfer complete\n");
-+		urb_xfer_done =
-+		    update_urb_state_xfer_comp(hc, hc_regs, urb, qtd);
-+		if (urb_xfer_done) {
-+			hcd->fops->complete(hcd, urb->priv, urb, urb->status);
-+			halt_status = DWC_OTG_HC_XFER_URB_COMPLETE;
-+		} else {
-+			halt_status = DWC_OTG_HC_XFER_COMPLETE;
-+		}
-+
-+		dwc_otg_hcd_save_data_toggle(hc, hc_regs, qtd);
-+		complete_non_periodic_xfer(hcd, hc, hc_regs, qtd, halt_status);
-+		break;
-+	case UE_INTERRUPT:
-+		DWC_DEBUGPL(DBG_HCDV, "  Interrupt transfer complete\n");
-+		urb_xfer_done =
-+			update_urb_state_xfer_comp(hc, hc_regs, urb, qtd);
-+
-+		/*
-+		 * Interrupt URB is done on the first transfer complete
-+		 * interrupt.
-+		 */
-+		if (urb_xfer_done) {
-+				hcd->fops->complete(hcd, urb->priv, urb, urb->status);
-+				halt_status = DWC_OTG_HC_XFER_URB_COMPLETE;
-+		} else {
-+				halt_status = DWC_OTG_HC_XFER_COMPLETE;
-+		}
-+
-+		dwc_otg_hcd_save_data_toggle(hc, hc_regs, qtd);
-+		complete_periodic_xfer(hcd, hc, hc_regs, qtd, halt_status);
-+		break;
-+	case UE_ISOCHRONOUS:
-+		DWC_DEBUGPL(DBG_HCDV, "  Isochronous transfer complete\n");
-+		if (qtd->isoc_split_pos == DWC_HCSPLIT_XACTPOS_ALL) {
-+			halt_status =
-+			    update_isoc_urb_state(hcd, hc, hc_regs, qtd,
-+						  DWC_OTG_HC_XFER_COMPLETE);
-+		}
-+		complete_periodic_xfer(hcd, hc, hc_regs, qtd, halt_status);
-+		break;
-+	}
-+
-+handle_xfercomp_done:
-+	disable_hc_int(hc_regs, xfercompl);
-+
-+	return 1;
-+}
-+
-+/**
-+ * Handles a host channel STALL interrupt. This handler may be called in
-+ * either DMA mode or Slave mode.
-+ */
-+static int32_t handle_hc_stall_intr(dwc_otg_hcd_t * hcd,
-+				    dwc_hc_t * hc,
-+				    dwc_otg_hc_regs_t * hc_regs,
-+				    dwc_otg_qtd_t * qtd)
-+{
-+	dwc_otg_hcd_urb_t *urb = qtd->urb;
-+	int pipe_type = dwc_otg_hcd_get_pipe_type(&urb->pipe_info);
-+
-+	DWC_DEBUGPL(DBG_HCD, "--Host Channel %d Interrupt: "
-+		    "STALL Received--\n", hc->hc_num);
-+
-+	if (hcd->core_if->dma_desc_enable) {
-+		dwc_otg_hcd_complete_xfer_ddma(hcd, hc, hc_regs, DWC_OTG_HC_XFER_STALL);
-+		goto handle_stall_done;
-+	}
-+
-+	if (pipe_type == UE_CONTROL) {
-+		hcd->fops->complete(hcd, urb->priv, urb, -DWC_E_PIPE);
-+	}
-+
-+	if (pipe_type == UE_BULK || pipe_type == UE_INTERRUPT) {
-+		hcd->fops->complete(hcd, urb->priv, urb, -DWC_E_PIPE);
-+		/*
-+		 * USB protocol requires resetting the data toggle for bulk
-+		 * and interrupt endpoints when a CLEAR_FEATURE(ENDPOINT_HALT)
-+		 * setup command is issued to the endpoint. Anticipate the
-+		 * CLEAR_FEATURE command since a STALL has occurred and reset
-+		 * the data toggle now.
-+		 */
-+		hc->qh->data_toggle = 0;
-+	}
-+
-+	halt_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_STALL);
-+
-+handle_stall_done:
-+	disable_hc_int(hc_regs, stall);
-+
-+	return 1;
-+}
-+
-+/*
-+ * Updates the state of the URB when a transfer has been stopped due to an
-+ * abnormal condition before the transfer completes. Modifies the
-+ * actual_length field of the URB to reflect the number of bytes that have
-+ * actually been transferred via the host channel.
-+ */
-+static void update_urb_state_xfer_intr(dwc_hc_t * hc,
-+				       dwc_otg_hc_regs_t * hc_regs,
-+				       dwc_otg_hcd_urb_t * urb,
-+				       dwc_otg_qtd_t * qtd,
-+				       dwc_otg_halt_status_e halt_status)
-+{
-+	uint32_t bytes_transferred = get_actual_xfer_length(hc, hc_regs, qtd,
-+							    halt_status, NULL);
-+
-+	if (urb->actual_length + bytes_transferred > urb->length) {
-+		printk_once(KERN_DEBUG "dwc_otg: DEVICE:%03d : %s:%d:trimming xfer length\n",
-+			hc->dev_addr, __func__, __LINE__);
-+		bytes_transferred = urb->length - urb->actual_length;
-+	}
-+
-+	/* non DWORD-aligned buffer case handling. */
-+	if (hc->align_buff && bytes_transferred && hc->ep_is_in) {
-+		dwc_memcpy(urb->buf + urb->actual_length, hc->qh->dw_align_buf,
-+			   bytes_transferred);
-+	}
-+
-+	urb->actual_length += bytes_transferred;
-+
-+#ifdef DEBUG
-+	{
-+		hctsiz_data_t hctsiz;
-+		hctsiz.d32 = DWC_READ_REG32(&hc_regs->hctsiz);
-+		DWC_DEBUGPL(DBG_HCDV, "DWC_otg: %s: %s, channel %d\n",
-+			    __func__, (hc->ep_is_in ? "IN" : "OUT"),
-+			    hc->hc_num);
-+		DWC_DEBUGPL(DBG_HCDV, "  hc->start_pkt_count %d\n",
-+			    hc->start_pkt_count);
-+		DWC_DEBUGPL(DBG_HCDV, "  hctsiz.pktcnt %d\n", hctsiz.b.pktcnt);
-+		DWC_DEBUGPL(DBG_HCDV, "  hc->max_packet %d\n", hc->max_packet);
-+		DWC_DEBUGPL(DBG_HCDV, "  bytes_transferred %d\n",
-+			    bytes_transferred);
-+		DWC_DEBUGPL(DBG_HCDV, "  urb->actual_length %d\n",
-+			    urb->actual_length);
-+		DWC_DEBUGPL(DBG_HCDV, "  urb->transfer_buffer_length %d\n",
-+			    urb->length);
-+	}
-+#endif
-+}
-+
-+/**
-+ * Handles a host channel NAK interrupt. This handler may be called in either
-+ * DMA mode or Slave mode.
-+ */
-+static int32_t handle_hc_nak_intr(dwc_otg_hcd_t * hcd,
-+				  dwc_hc_t * hc,
-+				  dwc_otg_hc_regs_t * hc_regs,
-+				  dwc_otg_qtd_t * qtd)
-+{
-+	DWC_DEBUGPL(DBG_HCDI, "--Host Channel %d Interrupt: "
-+		    "NAK Received--\n", hc->hc_num);
-+
-+	/*
-+	 * When we get bulk NAKs then remember this so we holdoff on this qh until
-+	 * the beginning of the next frame
-+	 */
-+	switch(dwc_otg_hcd_get_pipe_type(&qtd->urb->pipe_info)) {
-+		case UE_BULK:
-+		case UE_CONTROL:
-+		if (nak_holdoff && qtd->qh->do_split)
-+			hc->qh->nak_frame = dwc_otg_hcd_get_frame_number(hcd);
-+	}
-+
-+	/*
-+	 * Handle NAK for IN/OUT SSPLIT/CSPLIT transfers, bulk, control, and
-+	 * interrupt.  Re-start the SSPLIT transfer.
-+	 */
-+	if (hc->do_split) {
-+		if (hc->complete_split) {
-+			qtd->error_count = 0;
-+		}
-+		qtd->complete_split = 0;
-+		halt_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_NAK);
-+		goto handle_nak_done;
-+	}
-+
-+	switch (dwc_otg_hcd_get_pipe_type(&qtd->urb->pipe_info)) {
-+	case UE_CONTROL:
-+	case UE_BULK:
-+		if (hcd->core_if->dma_enable && hc->ep_is_in) {
-+			/*
-+			 * NAK interrupts are enabled on bulk/control IN
-+			 * transfers in DMA mode for the sole purpose of
-+			 * resetting the error count after a transaction error
-+			 * occurs. The core will continue transferring data.
-+			 * Disable other interrupts unmasked for the same
-+			 * reason.
-+			 */
-+			disable_hc_int(hc_regs, datatglerr);
-+			disable_hc_int(hc_regs, ack);
-+			qtd->error_count = 0;
-+			goto handle_nak_done;
-+		}
-+
-+		/*
-+		 * NAK interrupts normally occur during OUT transfers in DMA
-+		 * or Slave mode. For IN transfers, more requests will be
-+		 * queued as request queue space is available.
-+		 */
-+		qtd->error_count = 0;
-+
-+		if (!hc->qh->ping_state) {
-+			update_urb_state_xfer_intr(hc, hc_regs,
-+						   qtd->urb, qtd,
-+						   DWC_OTG_HC_XFER_NAK);
-+			dwc_otg_hcd_save_data_toggle(hc, hc_regs, qtd);
-+
-+			if (hc->speed == DWC_OTG_EP_SPEED_HIGH)
-+				hc->qh->ping_state = 1;
-+		}
-+
-+		/*
-+		 * Halt the channel so the transfer can be re-started from
-+		 * the appropriate point or the PING protocol will
-+		 * start/continue.
-+		 */
-+		halt_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_NAK);
-+		break;
-+	case UE_INTERRUPT:
-+		qtd->error_count = 0;
-+		halt_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_NAK);
-+		break;
-+	case UE_ISOCHRONOUS:
-+		/* Should never get called for isochronous transfers. */
-+		DWC_ASSERT(1, "NACK interrupt for ISOC transfer\n");
-+		break;
-+	}
-+
-+handle_nak_done:
-+	disable_hc_int(hc_regs, nak);
-+
-+	return 1;
-+}
-+
-+/**
-+ * Handles a host channel ACK interrupt. This interrupt is enabled when
-+ * performing the PING protocol in Slave mode, when errors occur during
-+ * either Slave mode or DMA mode, and during Start Split transactions.
-+ */
-+static int32_t handle_hc_ack_intr(dwc_otg_hcd_t * hcd,
-+				  dwc_hc_t * hc,
-+				  dwc_otg_hc_regs_t * hc_regs,
-+				  dwc_otg_qtd_t * qtd)
-+{
-+	DWC_DEBUGPL(DBG_HCDI, "--Host Channel %d Interrupt: "
-+		    "ACK Received--\n", hc->hc_num);
-+
-+	if (hc->do_split) {
-+		/*
-+		 * Handle ACK on SSPLIT.
-+		 * ACK should not occur in CSPLIT.
-+		 */
-+		if (!hc->ep_is_in && hc->data_pid_start != DWC_OTG_HC_PID_SETUP) {
-+			qtd->ssplit_out_xfer_count = hc->xfer_len;
-+		}
-+		if (!(hc->ep_type == DWC_OTG_EP_TYPE_ISOC && !hc->ep_is_in)) {
-+			/* Don't need complete for isochronous out transfers. */
-+			qtd->complete_split = 1;
-+		}
-+
-+		/* ISOC OUT */
-+		if (hc->ep_type == DWC_OTG_EP_TYPE_ISOC && !hc->ep_is_in) {
-+			switch (hc->xact_pos) {
-+			case DWC_HCSPLIT_XACTPOS_ALL:
-+				break;
-+			case DWC_HCSPLIT_XACTPOS_END:
-+				qtd->isoc_split_pos = DWC_HCSPLIT_XACTPOS_ALL;
-+				qtd->isoc_split_offset = 0;
-+				break;
-+			case DWC_HCSPLIT_XACTPOS_BEGIN:
-+			case DWC_HCSPLIT_XACTPOS_MID:
-+				/*
-+				 * For BEGIN or MID, calculate the length for
-+				 * the next microframe to determine the correct
-+				 * SSPLIT token, either MID or END.
-+				 */
-+				{
-+					struct dwc_otg_hcd_iso_packet_desc
-+					*frame_desc;
-+
-+					frame_desc =
-+					    &qtd->urb->
-+					    iso_descs[qtd->isoc_frame_index];
-+					qtd->isoc_split_offset += 188;
-+
-+					if ((frame_desc->length -
-+					     qtd->isoc_split_offset) <= 188) {
-+						qtd->isoc_split_pos =
-+						    DWC_HCSPLIT_XACTPOS_END;
-+					} else {
-+						qtd->isoc_split_pos =
-+						    DWC_HCSPLIT_XACTPOS_MID;
-+					}
-+
-+				}
-+				break;
-+			}
-+		} else {
-+			halt_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_ACK);
-+		}
-+	} else {
-+		/*
-+		 * An unmasked ACK on a non-split DMA transaction is
-+		 * for the sole purpose of resetting error counts. Disable other
-+		 * interrupts unmasked for the same reason.
-+		 */
-+		if(hcd->core_if->dma_enable) {
-+			disable_hc_int(hc_regs, datatglerr);
-+			disable_hc_int(hc_regs, nak);
-+		}
-+		qtd->error_count = 0;
-+
-+		if (hc->qh->ping_state) {
-+			hc->qh->ping_state = 0;
-+			/*
-+			 * Halt the channel so the transfer can be re-started
-+			 * from the appropriate point. This only happens in
-+			 * Slave mode. In DMA mode, the ping_state is cleared
-+			 * when the transfer is started because the core
-+			 * automatically executes the PING, then the transfer.
-+			 */
-+			halt_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_ACK);
-+		}
-+	}
-+
-+	/*
-+	 * If the ACK occurred when _not_ in the PING state, let the channel
-+	 * continue transferring data after clearing the error count.
-+	 */
-+
-+	disable_hc_int(hc_regs, ack);
-+
-+	return 1;
-+}
-+
-+/**
-+ * Handles a host channel NYET interrupt. This interrupt should only occur on
-+ * Bulk and Control OUT endpoints and for complete split transactions. If a
-+ * NYET occurs at the same time as a Transfer Complete interrupt, it is
-+ * handled in the xfercomp interrupt handler, not here. This handler may be
-+ * called in either DMA mode or Slave mode.
-+ */
-+static int32_t handle_hc_nyet_intr(dwc_otg_hcd_t * hcd,
-+				   dwc_hc_t * hc,
-+				   dwc_otg_hc_regs_t * hc_regs,
-+				   dwc_otg_qtd_t * qtd)
-+{
-+	DWC_DEBUGPL(DBG_HCDI, "--Host Channel %d Interrupt: "
-+		    "NYET Received--\n", hc->hc_num);
-+
-+	/*
-+	 * NYET on CSPLIT
-+	 * re-do the CSPLIT immediately on non-periodic
-+	 */
-+	if (hc->do_split && hc->complete_split) {
-+		if (hc->ep_is_in && (hc->ep_type == DWC_OTG_EP_TYPE_ISOC)
-+		    && hcd->core_if->dma_enable) {
-+			qtd->complete_split = 0;
-+			qtd->isoc_split_offset = 0;
-+			if (++qtd->isoc_frame_index == qtd->urb->packet_count) {
-+				hcd->fops->complete(hcd, qtd->urb->priv, qtd->urb, 0);
-+				release_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_URB_COMPLETE);
-+			}
-+			else
-+				release_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_NO_HALT_STATUS);
-+			goto handle_nyet_done;
-+		}
-+
-+		if (hc->ep_type == DWC_OTG_EP_TYPE_INTR ||
-+		    hc->ep_type == DWC_OTG_EP_TYPE_ISOC) {
-+			int frnum = dwc_otg_hcd_get_frame_number(hcd);
-+
-+			// With the FIQ running we only ever see the failed NYET
-+			if (dwc_full_frame_num(frnum) !=
-+			    dwc_full_frame_num(hc->qh->sched_frame) ||
-+			    fiq_fsm_enable) {
-+				/*
-+				 * No longer in the same full speed frame.
-+				 * Treat this as a transaction error.
-+				 */
-+#if 0
-+				/** @todo Fix system performance so this can
-+				 * be treated as an error. Right now complete
-+				 * splits cannot be scheduled precisely enough
-+				 * due to other system activity, so this error
-+				 * occurs regularly in Slave mode.
-+				 */
-+				qtd->error_count++;
-+#endif
-+				qtd->complete_split = 0;
-+				halt_channel(hcd, hc, qtd,
-+					     DWC_OTG_HC_XFER_XACT_ERR);
-+				/** @todo add support for isoc release */
-+				goto handle_nyet_done;
-+			}
-+		}
-+
-+		halt_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_NYET);
-+		goto handle_nyet_done;
-+	}
-+
-+	hc->qh->ping_state = 1;
-+	qtd->error_count = 0;
-+
-+	update_urb_state_xfer_intr(hc, hc_regs, qtd->urb, qtd,
-+				   DWC_OTG_HC_XFER_NYET);
-+	dwc_otg_hcd_save_data_toggle(hc, hc_regs, qtd);
-+
-+	/*
-+	 * Halt the channel and re-start the transfer so the PING
-+	 * protocol will start.
-+	 */
-+	halt_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_NYET);
-+
-+handle_nyet_done:
-+	disable_hc_int(hc_regs, nyet);
-+	return 1;
-+}
-+
-+/**
-+ * Handles a host channel babble interrupt. This handler may be called in
-+ * either DMA mode or Slave mode.
-+ */
-+static int32_t handle_hc_babble_intr(dwc_otg_hcd_t * hcd,
-+				     dwc_hc_t * hc,
-+				     dwc_otg_hc_regs_t * hc_regs,
-+				     dwc_otg_qtd_t * qtd)
-+{
-+	DWC_DEBUGPL(DBG_HCDI, "--Host Channel %d Interrupt: "
-+		    "Babble Error--\n", hc->hc_num);
-+
-+	if (hcd->core_if->dma_desc_enable) {
-+		dwc_otg_hcd_complete_xfer_ddma(hcd, hc, hc_regs,
-+					       DWC_OTG_HC_XFER_BABBLE_ERR);
-+		goto handle_babble_done;
-+	}
-+
-+	if (hc->ep_type != DWC_OTG_EP_TYPE_ISOC) {
-+		hcd->fops->complete(hcd, qtd->urb->priv,
-+				    qtd->urb, -DWC_E_OVERFLOW);
-+		halt_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_BABBLE_ERR);
-+	} else {
-+		dwc_otg_halt_status_e halt_status;
-+		halt_status = update_isoc_urb_state(hcd, hc, hc_regs, qtd,
-+						    DWC_OTG_HC_XFER_BABBLE_ERR);
-+		halt_channel(hcd, hc, qtd, halt_status);
-+	}
-+
-+handle_babble_done:
-+	disable_hc_int(hc_regs, bblerr);
-+	return 1;
-+}
-+
-+/**
-+ * Handles a host channel AHB error interrupt. This handler is only called in
-+ * DMA mode.
-+ */
-+static int32_t handle_hc_ahberr_intr(dwc_otg_hcd_t * hcd,
-+				     dwc_hc_t * hc,
-+				     dwc_otg_hc_regs_t * hc_regs,
-+				     dwc_otg_qtd_t * qtd)
-+{
-+	hcchar_data_t hcchar;
-+	hcsplt_data_t hcsplt;
-+	hctsiz_data_t hctsiz;
-+	uint32_t hcdma;
-+	char *pipetype, *speed;
-+
-+	dwc_otg_hcd_urb_t *urb = qtd->urb;
-+
-+	DWC_DEBUGPL(DBG_HCDI, "--Host Channel %d Interrupt: "
-+		    "AHB Error--\n", hc->hc_num);
-+
-+	hcchar.d32 = DWC_READ_REG32(&hc_regs->hcchar);
-+	hcsplt.d32 = DWC_READ_REG32(&hc_regs->hcsplt);
-+	hctsiz.d32 = DWC_READ_REG32(&hc_regs->hctsiz);
-+	hcdma = DWC_READ_REG32(&hc_regs->hcdma);
-+
-+	DWC_ERROR("AHB ERROR, Channel %d\n", hc->hc_num);
-+	DWC_ERROR("  hcchar 0x%08x, hcsplt 0x%08x\n", hcchar.d32, hcsplt.d32);
-+	DWC_ERROR("  hctsiz 0x%08x, hcdma 0x%08x\n", hctsiz.d32, hcdma);
-+	DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD URB Enqueue\n");
-+	DWC_ERROR("  Device address: %d\n",
-+		  dwc_otg_hcd_get_dev_addr(&urb->pipe_info));
-+	DWC_ERROR("  Endpoint: %d, %s\n",
-+		  dwc_otg_hcd_get_ep_num(&urb->pipe_info),
-+		  (dwc_otg_hcd_is_pipe_in(&urb->pipe_info) ? "IN" : "OUT"));
-+
-+	switch (dwc_otg_hcd_get_pipe_type(&urb->pipe_info)) {
-+	case UE_CONTROL:
-+		pipetype = "CONTROL";
-+		break;
-+	case UE_BULK:
-+		pipetype = "BULK";
-+		break;
-+	case UE_INTERRUPT:
-+		pipetype = "INTERRUPT";
-+		break;
-+	case UE_ISOCHRONOUS:
-+		pipetype = "ISOCHRONOUS";
-+		break;
-+	default:
-+		pipetype = "UNKNOWN";
-+		break;
-+	}
-+
-+	DWC_ERROR("  Endpoint type: %s\n", pipetype);
-+
-+	switch (hc->speed) {
-+	case DWC_OTG_EP_SPEED_HIGH:
-+		speed = "HIGH";
-+		break;
-+	case DWC_OTG_EP_SPEED_FULL:
-+		speed = "FULL";
-+		break;
-+	case DWC_OTG_EP_SPEED_LOW:
-+		speed = "LOW";
-+		break;
-+	default:
-+		speed = "UNKNOWN";
-+		break;
-+	};
-+
-+	DWC_ERROR("  Speed: %s\n", speed);
-+
-+	DWC_ERROR("  Max packet size: %d\n",
-+		  dwc_otg_hcd_get_mps(&urb->pipe_info));
-+	DWC_ERROR("  Data buffer length: %d\n", urb->length);
-+	DWC_ERROR("  Transfer buffer: %p, Transfer DMA: %pad\n",
-+		  urb->buf, &urb->dma);
-+	DWC_ERROR("  Setup buffer: %p, Setup DMA: %pad\n",
-+		  urb->setup_packet, &urb->setup_dma);
-+	DWC_ERROR("  Interval: %d\n", urb->interval);
-+
-+	/* Core haltes the channel for Descriptor DMA mode */
-+	if (hcd->core_if->dma_desc_enable) {
-+		dwc_otg_hcd_complete_xfer_ddma(hcd, hc, hc_regs,
-+					       DWC_OTG_HC_XFER_AHB_ERR);
-+		goto handle_ahberr_done;
-+	}
-+
-+	hcd->fops->complete(hcd, urb->priv, urb, -DWC_E_IO);
-+
-+	/*
-+	 * Force a channel halt. Don't call halt_channel because that won't
-+	 * write to the HCCHARn register in DMA mode to force the halt.
-+	 */
-+	dwc_otg_hc_halt(hcd->core_if, hc, DWC_OTG_HC_XFER_AHB_ERR);
-+handle_ahberr_done:
-+	disable_hc_int(hc_regs, ahberr);
-+	return 1;
-+}
-+
-+/**
-+ * Handles a host channel transaction error interrupt. This handler may be
-+ * called in either DMA mode or Slave mode.
-+ */
-+static int32_t handle_hc_xacterr_intr(dwc_otg_hcd_t * hcd,
-+				      dwc_hc_t * hc,
-+				      dwc_otg_hc_regs_t * hc_regs,
-+				      dwc_otg_qtd_t * qtd)
-+{
-+	DWC_DEBUGPL(DBG_HCDI, "--Host Channel %d Interrupt: "
-+		    "Transaction Error--\n", hc->hc_num);
-+
-+	if (hcd->core_if->dma_desc_enable) {
-+		dwc_otg_hcd_complete_xfer_ddma(hcd, hc, hc_regs,
-+					       DWC_OTG_HC_XFER_XACT_ERR);
-+		goto handle_xacterr_done;
-+	}
-+
-+	switch (dwc_otg_hcd_get_pipe_type(&qtd->urb->pipe_info)) {
-+	case UE_CONTROL:
-+	case UE_BULK:
-+		qtd->error_count++;
-+		if (!hc->qh->ping_state) {
-+
-+			update_urb_state_xfer_intr(hc, hc_regs,
-+						   qtd->urb, qtd,
-+						   DWC_OTG_HC_XFER_XACT_ERR);
-+			dwc_otg_hcd_save_data_toggle(hc, hc_regs, qtd);
-+			if (!hc->ep_is_in && hc->speed == DWC_OTG_EP_SPEED_HIGH) {
-+				hc->qh->ping_state = 1;
-+			}
-+		}
-+
-+		/*
-+		 * Halt the channel so the transfer can be re-started from
-+		 * the appropriate point or the PING protocol will start.
-+		 */
-+		halt_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_XACT_ERR);
-+		break;
-+	case UE_INTERRUPT:
-+		qtd->error_count++;
-+		if (hc->do_split && hc->complete_split) {
-+			qtd->complete_split = 0;
-+		}
-+		halt_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_XACT_ERR);
-+		break;
-+	case UE_ISOCHRONOUS:
-+		{
-+			dwc_otg_halt_status_e halt_status;
-+			halt_status =
-+			    update_isoc_urb_state(hcd, hc, hc_regs, qtd,
-+						  DWC_OTG_HC_XFER_XACT_ERR);
-+
-+			halt_channel(hcd, hc, qtd, halt_status);
-+		}
-+		break;
-+	}
-+handle_xacterr_done:
-+	disable_hc_int(hc_regs, xacterr);
-+
-+	return 1;
-+}
-+
-+/**
-+ * Handles a host channel frame overrun interrupt. This handler may be called
-+ * in either DMA mode or Slave mode.
-+ */
-+static int32_t handle_hc_frmovrun_intr(dwc_otg_hcd_t * hcd,
-+				       dwc_hc_t * hc,
-+				       dwc_otg_hc_regs_t * hc_regs,
-+				       dwc_otg_qtd_t * qtd)
-+{
-+	DWC_DEBUGPL(DBG_HCDI, "--Host Channel %d Interrupt: "
-+		    "Frame Overrun--\n", hc->hc_num);
-+
-+	switch (dwc_otg_hcd_get_pipe_type(&qtd->urb->pipe_info)) {
-+	case UE_CONTROL:
-+	case UE_BULK:
-+		break;
-+	case UE_INTERRUPT:
-+		halt_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_FRAME_OVERRUN);
-+		break;
-+	case UE_ISOCHRONOUS:
-+		{
-+			dwc_otg_halt_status_e halt_status;
-+			halt_status =
-+			    update_isoc_urb_state(hcd, hc, hc_regs, qtd,
-+						  DWC_OTG_HC_XFER_FRAME_OVERRUN);
-+
-+			halt_channel(hcd, hc, qtd, halt_status);
-+		}
-+		break;
-+	}
-+
-+	disable_hc_int(hc_regs, frmovrun);
-+
-+	return 1;
-+}
-+
-+/**
-+ * Handles a host channel data toggle error interrupt. This handler may be
-+ * called in either DMA mode or Slave mode.
-+ */
-+static int32_t handle_hc_datatglerr_intr(dwc_otg_hcd_t * hcd,
-+					 dwc_hc_t * hc,
-+					 dwc_otg_hc_regs_t * hc_regs,
-+					 dwc_otg_qtd_t * qtd)
-+{
-+	DWC_DEBUGPL(DBG_HCDI, "--Host Channel %d Interrupt: "
-+		"Data Toggle Error on %s transfer--\n",
-+		hc->hc_num, (hc->ep_is_in ? "IN" : "OUT"));
-+
-+	/* Data toggles on split transactions cause the hc to halt.
-+	 * restart transfer */
-+	if(hc->qh->do_split)
-+	{
-+		qtd->error_count++;
-+		dwc_otg_hcd_save_data_toggle(hc, hc_regs, qtd);
-+		update_urb_state_xfer_intr(hc, hc_regs,
-+			qtd->urb, qtd, DWC_OTG_HC_XFER_XACT_ERR);
-+		halt_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_XACT_ERR);
-+	} else if (hc->ep_is_in) {
-+		/* An unmasked data toggle error on a non-split DMA transaction is
-+		 * for the sole purpose of resetting error counts. Disable other
-+		 * interrupts unmasked for the same reason.
-+		 */
-+		if(hcd->core_if->dma_enable) {
-+			disable_hc_int(hc_regs, ack);
-+			disable_hc_int(hc_regs, nak);
-+		}
-+		qtd->error_count = 0;
-+	}
-+
-+	disable_hc_int(hc_regs, datatglerr);
-+
-+	return 1;
-+}
-+
-+#ifdef DEBUG
-+/**
-+ * This function is for debug only. It checks that a valid halt status is set
-+ * and that HCCHARn.chdis is clear. If there's a problem, corrective action is
-+ * taken and a warning is issued.
-+ * @return 1 if halt status is ok, 0 otherwise.
-+ */
-+static inline int halt_status_ok(dwc_otg_hcd_t * hcd,
-+				 dwc_hc_t * hc,
-+				 dwc_otg_hc_regs_t * hc_regs,
-+				 dwc_otg_qtd_t * qtd)
-+{
-+	hcchar_data_t hcchar;
-+	hctsiz_data_t hctsiz;
-+	hcint_data_t hcint;
-+	hcintmsk_data_t hcintmsk;
-+	hcsplt_data_t hcsplt;
-+
-+	if (hc->halt_status == DWC_OTG_HC_XFER_NO_HALT_STATUS) {
-+		/*
-+		 * This code is here only as a check. This condition should
-+		 * never happen. Ignore the halt if it does occur.
-+		 */
-+		hcchar.d32 = DWC_READ_REG32(&hc_regs->hcchar);
-+		hctsiz.d32 = DWC_READ_REG32(&hc_regs->hctsiz);
-+		hcint.d32 = DWC_READ_REG32(&hc_regs->hcint);
-+		hcintmsk.d32 = DWC_READ_REG32(&hc_regs->hcintmsk);
-+		hcsplt.d32 = DWC_READ_REG32(&hc_regs->hcsplt);
-+		DWC_WARN
-+		    ("%s: hc->halt_status == DWC_OTG_HC_XFER_NO_HALT_STATUS, "
-+		     "channel %d, hcchar 0x%08x, hctsiz 0x%08x, "
-+		     "hcint 0x%08x, hcintmsk 0x%08x, "
-+		     "hcsplt 0x%08x, qtd->complete_split %d\n", __func__,
-+		     hc->hc_num, hcchar.d32, hctsiz.d32, hcint.d32,
-+		     hcintmsk.d32, hcsplt.d32, qtd->complete_split);
-+
-+		DWC_WARN("%s: no halt status, channel %d, ignoring interrupt\n",
-+			 __func__, hc->hc_num);
-+		DWC_WARN("\n");
-+		clear_hc_int(hc_regs, chhltd);
-+		return 0;
-+	}
-+
-+	/*
-+	 * This code is here only as a check. hcchar.chdis should
-+	 * never be set when the halt interrupt occurs. Halt the
-+	 * channel again if it does occur.
-+	 */
-+	hcchar.d32 = DWC_READ_REG32(&hc_regs->hcchar);
-+	if (hcchar.b.chdis) {
-+		DWC_WARN("%s: hcchar.chdis set unexpectedly, "
-+			 "hcchar 0x%08x, trying to halt again\n",
-+			 __func__, hcchar.d32);
-+		clear_hc_int(hc_regs, chhltd);
-+		hc->halt_pending = 0;
-+		halt_channel(hcd, hc, qtd, hc->halt_status);
-+		return 0;
-+	}
-+
-+	return 1;
-+}
-+#endif
-+
-+/**
-+ * Handles a host Channel Halted interrupt in DMA mode. This handler
-+ * determines the reason the channel halted and proceeds accordingly.
-+ */
-+static void handle_hc_chhltd_intr_dma(dwc_otg_hcd_t * hcd,
-+				      dwc_hc_t * hc,
-+				      dwc_otg_hc_regs_t * hc_regs,
-+				      dwc_otg_qtd_t * qtd)
-+{
-+	int out_nak_enh = 0;
-+	hcint_data_t hcint;
-+	hcintmsk_data_t hcintmsk;
-+	/* For core with OUT NAK enhancement, the flow for high-
-+	 * speed CONTROL/BULK OUT is handled a little differently.
-+	 */
-+	if (hcd->core_if->snpsid >= OTG_CORE_REV_2_71a) {
-+		if (hc->speed == DWC_OTG_EP_SPEED_HIGH && !hc->ep_is_in &&
-+		    (hc->ep_type == DWC_OTG_EP_TYPE_CONTROL ||
-+		     hc->ep_type == DWC_OTG_EP_TYPE_BULK)) {
-+			out_nak_enh = 1;
-+		}
-+	}
-+
-+	if (hc->halt_status == DWC_OTG_HC_XFER_URB_DEQUEUE ||
-+	    (hc->halt_status == DWC_OTG_HC_XFER_AHB_ERR
-+	     && !hcd->core_if->dma_desc_enable)) {
-+		/*
-+		 * Just release the channel. A dequeue can happen on a
-+		 * transfer timeout. In the case of an AHB Error, the channel
-+		 * was forced to halt because there's no way to gracefully
-+		 * recover.
-+		 */
-+		if (hcd->core_if->dma_desc_enable)
-+			dwc_otg_hcd_complete_xfer_ddma(hcd, hc, hc_regs,
-+						       hc->halt_status);
-+		else
-+			release_channel(hcd, hc, qtd, hc->halt_status);
-+		return;
-+	}
-+
-+	/* Read the HCINTn register to determine the cause for the halt. */
-+
-+	hcint.d32 = DWC_READ_REG32(&hc_regs->hcint);
-+	hcintmsk.d32 = DWC_READ_REG32(&hc_regs->hcintmsk);
-+
-+	if (hcint.b.xfercomp) {
-+		/** @todo This is here because of a possible hardware bug.  Spec
-+		 * says that on SPLIT-ISOC OUT transfers in DMA mode that a HALT
-+		 * interrupt w/ACK bit set should occur, but I only see the
-+		 * XFERCOMP bit, even with it masked out.  This is a workaround
-+		 * for that behavior.  Should fix this when hardware is fixed.
-+		 */
-+		if (hc->ep_type == DWC_OTG_EP_TYPE_ISOC && !hc->ep_is_in) {
-+			handle_hc_ack_intr(hcd, hc, hc_regs, qtd);
-+		}
-+		handle_hc_xfercomp_intr(hcd, hc, hc_regs, qtd);
-+	} else if (hcint.b.stall) {
-+		handle_hc_stall_intr(hcd, hc, hc_regs, qtd);
-+	} else if (hcint.b.xacterr && !hcd->core_if->dma_desc_enable) {
-+		if (out_nak_enh) {
-+			if (hcint.b.nyet || hcint.b.nak || hcint.b.ack) {
-+				DWC_DEBUGPL(DBG_HCD, "XactErr with NYET/NAK/ACK\n");
-+				qtd->error_count = 0;
-+			} else {
-+				DWC_DEBUGPL(DBG_HCD, "XactErr without NYET/NAK/ACK\n");
-+			}
-+		}
-+
-+		/*
-+		 * Must handle xacterr before nak or ack. Could get a xacterr
-+		 * at the same time as either of these on a BULK/CONTROL OUT
-+		 * that started with a PING. The xacterr takes precedence.
-+		 */
-+		handle_hc_xacterr_intr(hcd, hc, hc_regs, qtd);
-+	} else if (hcint.b.xcs_xact && hcd->core_if->dma_desc_enable) {
-+		handle_hc_xacterr_intr(hcd, hc, hc_regs, qtd);
-+	} else if (hcint.b.ahberr && hcd->core_if->dma_desc_enable) {
-+		handle_hc_ahberr_intr(hcd, hc, hc_regs, qtd);
-+	} else if (hcint.b.bblerr) {
-+		handle_hc_babble_intr(hcd, hc, hc_regs, qtd);
-+	} else if (hcint.b.frmovrun) {
-+		handle_hc_frmovrun_intr(hcd, hc, hc_regs, qtd);
-+	} else if (hcint.b.datatglerr) {
-+		handle_hc_datatglerr_intr(hcd, hc, hc_regs, qtd);
-+	} else if (!out_nak_enh) {
-+		if (hcint.b.nyet) {
-+			/*
-+			 * Must handle nyet before nak or ack. Could get a nyet at the
-+			 * same time as either of those on a BULK/CONTROL OUT that
-+			 * started with a PING. The nyet takes precedence.
-+			 */
-+			handle_hc_nyet_intr(hcd, hc, hc_regs, qtd);
-+		} else if (hcint.b.nak && !hcintmsk.b.nak) {
-+			/*
-+			 * If nak is not masked, it's because a non-split IN transfer
-+			 * is in an error state. In that case, the nak is handled by
-+			 * the nak interrupt handler, not here. Handle nak here for
-+			 * BULK/CONTROL OUT transfers, which halt on a NAK to allow
-+			 * rewinding the buffer pointer.
-+			 */
-+			handle_hc_nak_intr(hcd, hc, hc_regs, qtd);
-+		} else if (hcint.b.ack && !hcintmsk.b.ack) {
-+			/*
-+			 * If ack is not masked, it's because a non-split IN transfer
-+			 * is in an error state. In that case, the ack is handled by
-+			 * the ack interrupt handler, not here. Handle ack here for
-+			 * split transfers. Start splits halt on ACK.
-+			 */
-+			handle_hc_ack_intr(hcd, hc, hc_regs, qtd);
-+		} else {
-+			if (hc->ep_type == DWC_OTG_EP_TYPE_INTR ||
-+			    hc->ep_type == DWC_OTG_EP_TYPE_ISOC) {
-+				/*
-+				 * A periodic transfer halted with no other channel
-+				 * interrupts set. Assume it was halted by the core
-+				 * because it could not be completed in its scheduled
-+				 * (micro)frame.
-+				 */
-+#ifdef DEBUG
-+				DWC_PRINTF
-+				    ("%s: Halt channel %d (assume incomplete periodic transfer)\n",
-+				     __func__, hc->hc_num);
-+#endif
-+				halt_channel(hcd, hc, qtd,
-+					     DWC_OTG_HC_XFER_PERIODIC_INCOMPLETE);
-+			} else {
-+				DWC_ERROR
-+				    ("%s: Channel %d, DMA Mode -- ChHltd set, but reason "
-+				     "for halting is unknown, hcint 0x%08x, intsts 0x%08x\n",
-+				     __func__, hc->hc_num, hcint.d32,
-+				     DWC_READ_REG32(&hcd->
-+						    core_if->core_global_regs->
-+						    gintsts));
-+				/* Failthrough: use 3-strikes rule */
-+				qtd->error_count++;
-+				dwc_otg_hcd_save_data_toggle(hc, hc_regs, qtd);
-+				update_urb_state_xfer_intr(hc, hc_regs,
-+					   qtd->urb, qtd, DWC_OTG_HC_XFER_XACT_ERR);
-+				halt_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_XACT_ERR);
-+			}
-+
-+		}
-+	} else {
-+		DWC_PRINTF("NYET/NAK/ACK/other in non-error case, 0x%08x\n",
-+			   hcint.d32);
-+		/* Failthrough: use 3-strikes rule */
-+		qtd->error_count++;
-+		dwc_otg_hcd_save_data_toggle(hc, hc_regs, qtd);
-+		update_urb_state_xfer_intr(hc, hc_regs,
-+			   qtd->urb, qtd, DWC_OTG_HC_XFER_XACT_ERR);
-+		halt_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_XACT_ERR);
-+	}
-+}
-+
-+/**
-+ * Handles a host channel Channel Halted interrupt.
-+ *
-+ * In slave mode, this handler is called only when the driver specifically
-+ * requests a halt. This occurs during handling other host channel interrupts
-+ * (e.g. nak, xacterr, stall, nyet, etc.).
-+ *
-+ * In DMA mode, this is the interrupt that occurs when the core has finished
-+ * processing a transfer on a channel. Other host channel interrupts (except
-+ * ahberr) are disabled in DMA mode.
-+ */
-+static int32_t handle_hc_chhltd_intr(dwc_otg_hcd_t * hcd,
-+				     dwc_hc_t * hc,
-+				     dwc_otg_hc_regs_t * hc_regs,
-+				     dwc_otg_qtd_t * qtd)
-+{
-+	DWC_DEBUGPL(DBG_HCDI, "--Host Channel %d Interrupt: "
-+		    "Channel Halted--\n", hc->hc_num);
-+
-+	if (hcd->core_if->dma_enable) {
-+		handle_hc_chhltd_intr_dma(hcd, hc, hc_regs, qtd);
-+	} else {
-+#ifdef DEBUG
-+		if (!halt_status_ok(hcd, hc, hc_regs, qtd)) {
-+			return 1;
-+		}
-+#endif
-+		release_channel(hcd, hc, qtd, hc->halt_status);
-+	}
-+
-+	return 1;
-+}
-+
-+
-+/**
-+ * dwc_otg_fiq_unmangle_isoc() - Update the iso_frame_desc structure on
-+ * FIQ transfer completion
-+ * @hcd:	Pointer to dwc_otg_hcd struct
-+ * @num:	Host channel number
-+ *
-+ * 1. Un-mangle the status as recorded in each iso_frame_desc status
-+ * 2. Copy it from the dwc_otg_urb into the real URB
-+ */
-+void dwc_otg_fiq_unmangle_isoc(dwc_otg_hcd_t *hcd, dwc_otg_qh_t *qh, dwc_otg_qtd_t *qtd, uint32_t num)
-+{
-+	struct dwc_otg_hcd_urb *dwc_urb = qtd->urb;
-+	int nr_frames = dwc_urb->packet_count;
-+	int i;
-+	hcint_data_t frame_hcint;
-+
-+	for (i = 0; i < nr_frames; i++) {
-+		frame_hcint.d32 = dwc_urb->iso_descs[i].status;
-+		if (frame_hcint.b.xfercomp) {
-+			dwc_urb->iso_descs[i].status = 0;
-+			dwc_urb->actual_length += dwc_urb->iso_descs[i].actual_length;
-+		} else if (frame_hcint.b.frmovrun) {
-+			if (qh->ep_is_in)
-+				dwc_urb->iso_descs[i].status = -DWC_E_NO_STREAM_RES;
-+			else
-+				dwc_urb->iso_descs[i].status = -DWC_E_COMMUNICATION;
-+			dwc_urb->error_count++;
-+			dwc_urb->iso_descs[i].actual_length = 0;
-+		} else if (frame_hcint.b.xacterr) {
-+			dwc_urb->iso_descs[i].status = -DWC_E_PROTOCOL;
-+			dwc_urb->error_count++;
-+			dwc_urb->iso_descs[i].actual_length = 0;
-+		} else if (frame_hcint.b.bblerr) {
-+			dwc_urb->iso_descs[i].status = -DWC_E_OVERFLOW;
-+			dwc_urb->error_count++;
-+			dwc_urb->iso_descs[i].actual_length = 0;
-+		} else {
-+			/* Something went wrong */
-+			dwc_urb->iso_descs[i].status = -1;
-+			dwc_urb->iso_descs[i].actual_length = 0;
-+			dwc_urb->error_count++;
-+		}
-+	}
-+	qh->sched_frame = dwc_frame_num_inc(qh->sched_frame, qh->interval * (nr_frames - 1));
-+
-+	//printk_ratelimited(KERN_INFO "%s: HS isochronous of %d/%d frames with %d errors complete\n",
-+	//			__FUNCTION__, i, dwc_urb->packet_count, dwc_urb->error_count);
-+}
-+
-+/**
-+ * dwc_otg_fiq_unsetup_per_dma() - Remove data from bounce buffers for split transactions
-+ * @hcd:	Pointer to dwc_otg_hcd struct
-+ * @num:	Host channel number
-+ *
-+ * Copies data from the FIQ bounce buffers into the URB's transfer buffer. Does not modify URB state.
-+ * Returns total length of data or -1 if the buffers were not used.
-+ *
-+ */
-+int dwc_otg_fiq_unsetup_per_dma(dwc_otg_hcd_t *hcd, dwc_otg_qh_t *qh, dwc_otg_qtd_t *qtd, uint32_t num)
-+{
-+	dwc_hc_t *hc = qh->channel;
-+	struct fiq_dma_blob *blob = hcd->fiq_dmab;
-+	struct fiq_channel_state *st = &hcd->fiq_state->channel[num];
-+	uint8_t *ptr = NULL;
-+	int index = 0, len = 0;
-+	int i = 0;
-+	if (hc->ep_is_in) {
-+		/* Copy data out of the DMA bounce buffers to the URB's buffer.
-+		 * The align_buf is ignored as this is ignored on FSM enqueue. */
-+		ptr = qtd->urb->buf;
-+		if (qh->ep_type == UE_ISOCHRONOUS) {
-+			/* Isoc IN transactions - grab the offset of the iso_frame_desc into the URB transfer buffer */
-+			index = qtd->isoc_frame_index;
-+			ptr += qtd->urb->iso_descs[index].offset;
-+		} else {
-+			/* Need to increment by actual_length for interrupt IN */
-+			ptr += qtd->urb->actual_length;
-+		}
-+
-+		for (i = 0; i < st->dma_info.index; i++) {
-+			len += st->dma_info.slot_len[i];
-+			dwc_memcpy(ptr, &blob->channel[num].index[i].buf[0], st->dma_info.slot_len[i]);
-+			ptr += st->dma_info.slot_len[i];
-+		}
-+		return len;
-+	} else {
-+		/* OUT endpoints - nothing to do. */
-+		return -1;
-+	}
-+
-+}
-+/**
-+ * dwc_otg_hcd_handle_hc_fsm() - handle an unmasked channel interrupt
-+ * 				 from a channel handled in the FIQ
-+ * @hcd:	Pointer to dwc_otg_hcd struct
-+ * @num:	Host channel number
-+ *
-+ * If a host channel interrupt was received by the IRQ and this was a channel
-+ * used by the FIQ, the execution flow for transfer completion is substantially
-+ * different from the normal (messy) path. This function and its friends handles
-+ * channel cleanup and transaction completion from a FIQ transaction.
-+ */
-+void dwc_otg_hcd_handle_hc_fsm(dwc_otg_hcd_t *hcd, uint32_t num)
-+{
-+	struct fiq_channel_state *st = &hcd->fiq_state->channel[num];
-+	dwc_hc_t *hc = hcd->hc_ptr_array[num];
-+	dwc_otg_qtd_t *qtd;
-+	dwc_otg_hc_regs_t *hc_regs = hcd->core_if->host_if->hc_regs[num];
-+	hcint_data_t hcint = hcd->fiq_state->channel[num].hcint_copy;
-+	hctsiz_data_t hctsiz = hcd->fiq_state->channel[num].hctsiz_copy;
-+	int hostchannels  = 0;
-+	fiq_print(FIQDBG_INT, hcd->fiq_state, "OUT %01d %01d ", num , st->fsm);
-+
-+	hostchannels = hcd->available_host_channels;
-+	if (hc->halt_pending) {
-+		/* Dequeue: The FIQ was allowed to complete the transfer but state has been cleared. */
-+		if (hc->qh && st->fsm == FIQ_NP_SPLIT_DONE &&
-+				hcint.b.xfercomp && hc->qh->ep_type == UE_BULK) {
-+			if (hctsiz.b.pid == DWC_HCTSIZ_DATA0) {
-+				hc->qh->data_toggle = DWC_OTG_HC_PID_DATA1;
-+			} else {
-+				hc->qh->data_toggle = DWC_OTG_HC_PID_DATA0;
-+			}
-+		}
-+		release_channel(hcd, hc, NULL, hc->halt_status);
-+		return;
-+	}
-+
-+	qtd = DWC_CIRCLEQ_FIRST(&hc->qh->qtd_list);
-+	switch (st->fsm) {
-+	case FIQ_TEST:
-+		break;
-+
-+	case FIQ_DEQUEUE_ISSUED:
-+		/* Handled above, but keep for posterity */
-+		release_channel(hcd, hc, NULL, hc->halt_status);
-+		break;
-+
-+	case FIQ_NP_SPLIT_DONE:
-+		/* Nonperiodic transaction complete. */
-+		if (!hc->ep_is_in) {
-+			qtd->ssplit_out_xfer_count = hc->xfer_len;
-+		}
-+		if (hcint.b.xfercomp) {
-+			handle_hc_xfercomp_intr(hcd, hc, hc_regs, qtd);
-+		} else if (hcint.b.nak) {
-+			handle_hc_nak_intr(hcd, hc, hc_regs, qtd);
-+		} else {
-+			DWC_WARN("Unexpected IRQ state on FSM transaction:"
-+					"dev_addr=%d ep=%d fsm=%d, hcint=0x%08x\n",
-+				hc->dev_addr, hc->ep_num, st->fsm, hcint.d32);
-+			release_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_NO_HALT_STATUS);
-+		}
-+		break;
-+
-+	case FIQ_NP_SPLIT_HS_ABORTED:
-+		/* A HS abort is a 3-strikes on the HS bus at any point in the transaction.
-+		 * Normally a CLEAR_TT_BUFFER hub command would be required: we can't do that
-+		 * because there's no guarantee which order a non-periodic split happened in.
-+		 * We could end up clearing a perfectly good transaction out of the buffer.
-+		 */
-+		if (hcint.b.xacterr) {
-+			qtd->error_count += st->nr_errors;
-+			handle_hc_xacterr_intr(hcd, hc, hc_regs, qtd);
-+		} else if (hcint.b.ahberr) {
-+			handle_hc_ahberr_intr(hcd, hc, hc_regs, qtd);
-+		} else {
-+			DWC_WARN("Unexpected IRQ state on FSM transaction:"
-+					"dev_addr=%d ep=%d fsm=%d, hcint=0x%08x\n",
-+				hc->dev_addr, hc->ep_num, st->fsm, hcint.d32);
-+			release_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_NO_HALT_STATUS);
-+		}
-+		break;
-+
-+	case FIQ_NP_SPLIT_LS_ABORTED:
-+		/* A few cases can cause this - either an unknown state on a SSPLIT or
-+		 * STALL/data toggle error response on a CSPLIT */
-+		if (hcint.b.stall) {
-+			handle_hc_stall_intr(hcd, hc, hc_regs, qtd);
-+		} else if (hcint.b.datatglerr) {
-+			handle_hc_datatglerr_intr(hcd, hc, hc_regs, qtd);
-+		} else if (hcint.b.bblerr) {
-+			handle_hc_babble_intr(hcd, hc, hc_regs, qtd);
-+		} else if (hcint.b.ahberr) {
-+			handle_hc_ahberr_intr(hcd, hc, hc_regs, qtd);
-+		} else {
-+			DWC_WARN("Unexpected IRQ state on FSM transaction:"
-+					"dev_addr=%d ep=%d fsm=%d, hcint=0x%08x\n",
-+				hc->dev_addr, hc->ep_num, st->fsm, hcint.d32);
-+			release_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_NO_HALT_STATUS);
-+		}
-+		break;
-+
-+	case FIQ_PER_SPLIT_DONE:
-+		/* Isoc IN or Interrupt IN/OUT */
-+
-+		/* Flow control here is different from the normal execution by the driver.
-+		* We need to completely ignore most of the driver's method of handling
-+		* split transactions and do it ourselves.
-+		*/
-+		if (hc->ep_type == UE_INTERRUPT) {
-+			if (hcint.b.nak) {
-+					handle_hc_nak_intr(hcd, hc, hc_regs, qtd);
-+			} else if (hc->ep_is_in) {
-+				int len;
-+				len = dwc_otg_fiq_unsetup_per_dma(hcd, hc->qh, qtd, num);
-+				//printk(KERN_NOTICE "FIQ Transaction: hc=%d len=%d urb_len = %d\n", num, len, qtd->urb->length);
-+				qtd->urb->actual_length += len;
-+				if (qtd->urb->actual_length >= qtd->urb->length) {
-+					qtd->urb->status = 0;
-+					hcd->fops->complete(hcd, qtd->urb->priv, qtd->urb, qtd->urb->status);
-+					release_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_URB_COMPLETE);
-+				} else {
-+					/* Interrupt transfer not complete yet - is it a short read? */
-+					if (len < hc->max_packet) {
-+						/* Interrupt transaction complete */
-+						qtd->urb->status = 0;
-+						hcd->fops->complete(hcd, qtd->urb->priv, qtd->urb, qtd->urb->status);
-+						release_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_URB_COMPLETE);
-+					} else {
-+						/* Further transactions required */
-+						release_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_COMPLETE);
-+					}
-+				}
-+			} else {
-+				/* Interrupt OUT complete. */
-+				dwc_otg_hcd_save_data_toggle(hc, hc_regs, qtd);
-+				qtd->urb->actual_length += hc->xfer_len;
-+				if (qtd->urb->actual_length >= qtd->urb->length) {
-+					qtd->urb->status = 0;
-+					hcd->fops->complete(hcd, qtd->urb->priv, qtd->urb, qtd->urb->status);
-+					release_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_URB_COMPLETE);
-+				} else {
-+					release_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_COMPLETE);
-+				}
-+			}
-+		} else {
-+			/* ISOC IN complete. */
-+			struct dwc_otg_hcd_iso_packet_desc *frame_desc = &qtd->urb->iso_descs[qtd->isoc_frame_index];
-+			int len = 0;
-+			/* Record errors, update qtd. */
-+			if (st->nr_errors) {
-+				frame_desc->actual_length = 0;
-+				frame_desc->status = -DWC_E_PROTOCOL;
-+			} else {
-+				frame_desc->status = 0;
-+				/* Unswizzle dma */
-+				len = dwc_otg_fiq_unsetup_per_dma(hcd, hc->qh, qtd, num);
-+				frame_desc->actual_length = len;
-+			}
-+			qtd->isoc_frame_index++;
-+			if (qtd->isoc_frame_index == qtd->urb->packet_count) {
-+				hcd->fops->complete(hcd, qtd->urb->priv, qtd->urb, 0);
-+				release_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_URB_COMPLETE);
-+			} else {
-+				release_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_COMPLETE);
-+			}
-+		}
-+		break;
-+
-+	case FIQ_PER_ISO_OUT_DONE: {
-+			struct dwc_otg_hcd_iso_packet_desc *frame_desc = &qtd->urb->iso_descs[qtd->isoc_frame_index];
-+			/* Record errors, update qtd. */
-+			if (st->nr_errors) {
-+				frame_desc->actual_length = 0;
-+				frame_desc->status = -DWC_E_PROTOCOL;
-+			} else {
-+				frame_desc->status = 0;
-+				frame_desc->actual_length = frame_desc->length;
-+			}
-+			qtd->isoc_frame_index++;
-+			qtd->isoc_split_offset = 0;
-+			if (qtd->isoc_frame_index == qtd->urb->packet_count) {
-+				hcd->fops->complete(hcd, qtd->urb->priv, qtd->urb, 0);
-+				release_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_URB_COMPLETE);
-+			} else {
-+				release_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_COMPLETE);
-+			}
-+		}
-+		break;
-+
-+	case FIQ_PER_SPLIT_NYET_ABORTED:
-+		/* Doh. lost the data. */
-+		printk_ratelimited(KERN_INFO "Transfer to device %d endpoint 0x%x frame %d failed "
-+				"- FIQ reported NYET. Data may have been lost.\n",
-+				hc->dev_addr, hc->ep_num, dwc_otg_hcd_get_frame_number(hcd) >> 3);
-+		if (hc->ep_type == UE_ISOCHRONOUS) {
-+			struct dwc_otg_hcd_iso_packet_desc *frame_desc = &qtd->urb->iso_descs[qtd->isoc_frame_index];
-+			/* Record errors, update qtd. */
-+			frame_desc->actual_length = 0;
-+			frame_desc->status = -DWC_E_PROTOCOL;
-+			qtd->isoc_frame_index++;
-+			qtd->isoc_split_offset = 0;
-+			if (qtd->isoc_frame_index == qtd->urb->packet_count) {
-+				hcd->fops->complete(hcd, qtd->urb->priv, qtd->urb, 0);
-+				release_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_URB_COMPLETE);
-+			} else {
-+				release_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_COMPLETE);
-+			}
-+		} else {
-+			release_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_NO_HALT_STATUS);
-+		}
-+		break;
-+
-+	case FIQ_HS_ISOC_DONE:
-+		/* The FIQ has performed a whole pile of isochronous transactions.
-+		 * The status is recorded as the interrupt state should the transaction
-+		 * fail.
-+		 */
-+		dwc_otg_fiq_unmangle_isoc(hcd, hc->qh, qtd, num);
-+		hcd->fops->complete(hcd, qtd->urb->priv, qtd->urb, 0);
-+		release_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_URB_COMPLETE);
-+		break;
-+
-+	case FIQ_PER_SPLIT_LS_ABORTED:
-+		if (hcint.b.xacterr) {
-+			/* Hub has responded with an ERR packet. Device
-+			 * has been unplugged or the port has been disabled.
-+			 * TODO: need to issue a reset to the hub port. */
-+			qtd->error_count += 3;
-+			handle_hc_xacterr_intr(hcd, hc, hc_regs, qtd);
-+		} else if (hcint.b.stall) {
-+			handle_hc_stall_intr(hcd, hc, hc_regs, qtd);
-+		} else if (hcint.b.bblerr) {
-+			handle_hc_babble_intr(hcd, hc, hc_regs, qtd);
-+		} else {
-+			printk_ratelimited(KERN_INFO "Transfer to device %d endpoint 0x%x failed "
-+				"- FIQ reported FSM=%d. Data may have been lost.\n",
-+				st->fsm, hc->dev_addr, hc->ep_num);
-+			release_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_NO_HALT_STATUS);
-+		}
-+		break;
-+
-+	case FIQ_PER_SPLIT_HS_ABORTED:
-+		/* Either the SSPLIT phase suffered transaction errors or something
-+		 * unexpected happened.
-+		 */
-+		qtd->error_count += 3;
-+		handle_hc_xacterr_intr(hcd, hc, hc_regs, qtd);
-+		release_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_NO_HALT_STATUS);
-+		break;
-+
-+	case FIQ_PER_SPLIT_TIMEOUT:
-+		/* Couldn't complete in the nominated frame */
-+		printk(KERN_INFO "Transfer to device %d endpoint 0x%x frame %d failed "
-+				"- FIQ timed out. Data may have been lost.\n",
-+				hc->dev_addr, hc->ep_num, dwc_otg_hcd_get_frame_number(hcd) >> 3);
-+		if (hc->ep_type == UE_ISOCHRONOUS) {
-+			struct dwc_otg_hcd_iso_packet_desc *frame_desc = &qtd->urb->iso_descs[qtd->isoc_frame_index];
-+			/* Record errors, update qtd. */
-+			frame_desc->actual_length = 0;
-+			if (hc->ep_is_in) {
-+				frame_desc->status = -DWC_E_NO_STREAM_RES;
-+			} else {
-+				frame_desc->status = -DWC_E_COMMUNICATION;
-+			}
-+			qtd->isoc_frame_index++;
-+			if (qtd->isoc_frame_index == qtd->urb->packet_count) {
-+				hcd->fops->complete(hcd, qtd->urb->priv, qtd->urb, 0);
-+				release_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_URB_COMPLETE);
-+			} else {
-+				release_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_COMPLETE);
-+			}
-+		} else {
-+			release_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_NO_HALT_STATUS);
-+		}
-+		break;
-+
-+	default:
-+		DWC_WARN("Unexpected state received on hc=%d fsm=%d on transfer to device %d ep 0x%x", 
-+					hc->hc_num, st->fsm, hc->dev_addr, hc->ep_num);
-+		qtd->error_count++;
-+		release_channel(hcd, hc, qtd, DWC_OTG_HC_XFER_NO_HALT_STATUS);
-+	}
-+	return;
-+}
-+
-+/** Handles interrupt for a specific Host Channel */
-+int32_t dwc_otg_hcd_handle_hc_n_intr(dwc_otg_hcd_t * dwc_otg_hcd, uint32_t num)
-+{
-+	int retval = 0;
-+	hcint_data_t hcint;
-+	hcintmsk_data_t hcintmsk;
-+	dwc_hc_t *hc;
-+	dwc_otg_hc_regs_t *hc_regs;
-+	dwc_otg_qtd_t *qtd;
-+
-+	DWC_DEBUGPL(DBG_HCDV, "--Host Channel Interrupt--, Channel %d\n", num);
-+
-+	hc = dwc_otg_hcd->hc_ptr_array[num];
-+	hc_regs = dwc_otg_hcd->core_if->host_if->hc_regs[num];
-+	if(hc->halt_status == DWC_OTG_HC_XFER_URB_DEQUEUE) {
-+		/* A dequeue was issued for this transfer. Our QTD has gone away
-+		 * but in the case of a FIQ transfer, the transfer would have run
-+		 * to completion.
-+		 */
-+		if (fiq_fsm_enable && dwc_otg_hcd->fiq_state->channel[num].fsm != FIQ_PASSTHROUGH) {
-+			dwc_otg_hcd_handle_hc_fsm(dwc_otg_hcd, num);
-+		} else {
-+			release_channel(dwc_otg_hcd, hc, NULL, hc->halt_status);
-+		}
-+		return 1;
-+	}
-+	qtd = DWC_CIRCLEQ_FIRST(&hc->qh->qtd_list);
-+
-+	/*
-+	 * FSM mode: Check to see if this is a HC interrupt from a channel handled by the FIQ.
-+	 * Execution path is fundamentally different for the channels after a FIQ has completed
-+	 * a split transaction.
-+	 */
-+	if (fiq_fsm_enable) {
-+		switch (dwc_otg_hcd->fiq_state->channel[num].fsm) {
-+			case FIQ_PASSTHROUGH:
-+				break;
-+			case FIQ_PASSTHROUGH_ERRORSTATE:
-+				/* Hook into the error count */
-+				fiq_print(FIQDBG_ERR, dwc_otg_hcd->fiq_state, "HCDERR%02d", num);
-+				if (!dwc_otg_hcd->fiq_state->channel[num].nr_errors) {
-+					qtd->error_count = 0;
-+					fiq_print(FIQDBG_ERR, dwc_otg_hcd->fiq_state, "RESET   ");
-+				}
-+				break;
-+			default:
-+				dwc_otg_hcd_handle_hc_fsm(dwc_otg_hcd, num);
-+				return 1;
-+		}
-+	}
-+
-+	hcint.d32 = DWC_READ_REG32(&hc_regs->hcint);
-+	hcintmsk.d32 = DWC_READ_REG32(&hc_regs->hcintmsk);
-+	hcint.d32 = hcint.d32 & hcintmsk.d32;
-+	if (!dwc_otg_hcd->core_if->dma_enable) {
-+		if (hcint.b.chhltd && hcint.d32 != 0x2) {
-+			hcint.b.chhltd = 0;
-+		}
-+	}
-+
-+	if (hcint.b.xfercomp) {
-+		retval |=
-+		    handle_hc_xfercomp_intr(dwc_otg_hcd, hc, hc_regs, qtd);
-+		/*
-+		 * If NYET occurred at same time as Xfer Complete, the NYET is
-+		 * handled by the Xfer Complete interrupt handler. Don't want
-+		 * to call the NYET interrupt handler in this case.
-+		 */
-+		hcint.b.nyet = 0;
-+	}
-+	if (hcint.b.chhltd) {
-+		retval |= handle_hc_chhltd_intr(dwc_otg_hcd, hc, hc_regs, qtd);
-+	}
-+	if (hcint.b.ahberr) {
-+		retval |= handle_hc_ahberr_intr(dwc_otg_hcd, hc, hc_regs, qtd);
-+	}
-+	if (hcint.b.stall) {
-+		retval |= handle_hc_stall_intr(dwc_otg_hcd, hc, hc_regs, qtd);
-+	}
-+	if (hcint.b.nak) {
-+		retval |= handle_hc_nak_intr(dwc_otg_hcd, hc, hc_regs, qtd);
-+	}
-+	if (hcint.b.ack) {
-+		if(!hcint.b.chhltd)
-+			retval |= handle_hc_ack_intr(dwc_otg_hcd, hc, hc_regs, qtd);
-+	}
-+	if (hcint.b.nyet) {
-+		retval |= handle_hc_nyet_intr(dwc_otg_hcd, hc, hc_regs, qtd);
-+	}
-+	if (hcint.b.xacterr) {
-+		retval |= handle_hc_xacterr_intr(dwc_otg_hcd, hc, hc_regs, qtd);
-+	}
-+	if (hcint.b.bblerr) {
-+		retval |= handle_hc_babble_intr(dwc_otg_hcd, hc, hc_regs, qtd);
-+	}
-+	if (hcint.b.frmovrun) {
-+		retval |=
-+		    handle_hc_frmovrun_intr(dwc_otg_hcd, hc, hc_regs, qtd);
-+	}
-+	if (hcint.b.datatglerr) {
-+		retval |=
-+		    handle_hc_datatglerr_intr(dwc_otg_hcd, hc, hc_regs, qtd);
-+	}
-+
-+	return retval;
-+}
-+#endif /* DWC_DEVICE_ONLY */
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
-@@ -0,0 +1,1086 @@
-+
-+/* ==========================================================================
-+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_linux.c $
-+ * $Revision: #20 $
-+ * $Date: 2011/10/26 $
-+ * $Change: 1872981 $
-+ *
-+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
-+ * "Software") is an Unsupported proprietary work of Synopsys, Inc. unless
-+ * otherwise expressly agreed to in writing between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product under
-+ * any End User Software License Agreement or Agreement for Licensed Product
-+ * with Synopsys or any supplement thereto. You are permitted to use and
-+ * redistribute this Software in source and binary forms, with or without
-+ * modification, provided that redistributions of source code must retain this
-+ * notice. You may not view, use, disclose, copy or distribute this file or
-+ * any information contained herein except pursuant to this license grant from
-+ * Synopsys. If you do not agree with this notice, including the disclaimer
-+ * below, then you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" BASIS
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS BE LIABLE FOR ANY DIRECT,
-+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================== */
-+#ifndef DWC_DEVICE_ONLY
-+
-+/**
-+ * @file
-+ *
-+ * This file contains the implementation of the HCD. In Linux, the HCD
-+ * implements the hc_driver API.
-+ */
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/moduleparam.h>
-+#include <linux/init.h>
-+#include <linux/device.h>
-+#include <linux/errno.h>
-+#include <linux/list.h>
-+#include <linux/interrupt.h>
-+#include <linux/string.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/version.h>
-+#include <asm/io.h>
-+#ifdef CONFIG_ARM
-+#include <asm/fiq.h>
-+#endif
-+#include <linux/usb.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)
-+#include <../drivers/usb/core/hcd.h>
-+#else
-+#include <linux/usb/hcd.h>
-+#endif
-+#include <asm/bug.h>
-+
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30))
-+#define USB_URB_EP_LINKING 1
-+#else
-+#define USB_URB_EP_LINKING 0
-+#endif
-+
-+#include "dwc_otg_hcd_if.h"
-+#include "dwc_otg_dbg.h"
-+#include "dwc_otg_driver.h"
-+#include "dwc_otg_hcd.h"
-+
-+#ifndef __virt_to_bus
-+#define __virt_to_bus	__virt_to_phys
-+#define __bus_to_virt	__phys_to_virt
-+#define __pfn_to_bus(x)	__pfn_to_phys(x)
-+#define __bus_to_pfn(x)	__phys_to_pfn(x)
-+#endif
-+
-+extern unsigned char  _dwc_otg_fiq_stub, _dwc_otg_fiq_stub_end;
-+
-+/**
-+ * Gets the endpoint number from a _bEndpointAddress argument. The endpoint is
-+ * qualified with its direction (possible 32 endpoints per device).
-+ */
-+#define dwc_ep_addr_to_endpoint(_bEndpointAddress_) ((_bEndpointAddress_ & USB_ENDPOINT_NUMBER_MASK) | \
-+						     ((_bEndpointAddress_ & USB_DIR_IN) != 0) << 4)
-+
-+static const char dwc_otg_hcd_name[] = "dwc_otg_hcd";
-+
-+extern bool fiq_enable;
-+
-+/** @name Linux HC Driver API Functions */
-+/** @{ */
-+/* manage i/o requests, device state */
-+static int dwc_otg_urb_enqueue(struct usb_hcd *hcd,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
-+		       struct usb_host_endpoint *ep,
-+#endif
-+		       struct urb *urb, gfp_t mem_flags);
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
-+static int dwc_otg_urb_dequeue(struct usb_hcd *hcd, struct urb *urb);
-+#endif
-+#else /* kernels at or post 2.6.30 */
-+static int dwc_otg_urb_dequeue(struct usb_hcd *hcd,
-+                               struct urb *urb, int status);
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) */
-+
-+static void endpoint_disable(struct usb_hcd *hcd, struct usb_host_endpoint *ep);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
-+static void endpoint_reset(struct usb_hcd *hcd, struct usb_host_endpoint *ep);
-+#endif
-+static irqreturn_t dwc_otg_hcd_irq(struct usb_hcd *hcd);
-+extern int hcd_start(struct usb_hcd *hcd);
-+extern void hcd_stop(struct usb_hcd *hcd);
-+static int get_frame_number(struct usb_hcd *hcd);
-+extern int hub_status_data(struct usb_hcd *hcd, char *buf);
-+extern int hub_control(struct usb_hcd *hcd,
-+		       u16 typeReq,
-+		       u16 wValue, u16 wIndex, char *buf, u16 wLength);
-+
-+struct wrapper_priv_data {
-+	dwc_otg_hcd_t *dwc_otg_hcd;
-+};
-+
-+/** @} */
-+
-+static struct hc_driver dwc_otg_hc_driver = {
-+
-+	.description = dwc_otg_hcd_name,
-+	.product_desc = "DWC OTG Controller",
-+	.hcd_priv_size = sizeof(struct wrapper_priv_data),
-+
-+	.irq = dwc_otg_hcd_irq,
-+
-+	.flags = HCD_MEMORY | HCD_DMA | HCD_USB2,
-+
-+	//.reset =
-+	.start = hcd_start,
-+	//.suspend =
-+	//.resume =
-+	.stop = hcd_stop,
-+
-+	.urb_enqueue = dwc_otg_urb_enqueue,
-+	.urb_dequeue = dwc_otg_urb_dequeue,
-+	.endpoint_disable = endpoint_disable,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
-+	.endpoint_reset = endpoint_reset,
-+#endif
-+	.get_frame_number = get_frame_number,
-+
-+	.hub_status_data = hub_status_data,
-+	.hub_control = hub_control,
-+	//.bus_suspend =
-+	//.bus_resume =
-+};
-+
-+/** Gets the dwc_otg_hcd from a struct usb_hcd */
-+static inline dwc_otg_hcd_t *hcd_to_dwc_otg_hcd(struct usb_hcd *hcd)
-+{
-+	struct wrapper_priv_data *p;
-+	p = (struct wrapper_priv_data *)(hcd->hcd_priv);
-+	return p->dwc_otg_hcd;
-+}
-+
-+/** Gets the struct usb_hcd that contains a dwc_otg_hcd_t. */
-+static inline struct usb_hcd *dwc_otg_hcd_to_hcd(dwc_otg_hcd_t * dwc_otg_hcd)
-+{
-+	return dwc_otg_hcd_get_priv_data(dwc_otg_hcd);
-+}
-+
-+/** Gets the usb_host_endpoint associated with an URB. */
-+inline struct usb_host_endpoint *dwc_urb_to_endpoint(struct urb *urb)
-+{
-+	struct usb_device *dev = urb->dev;
-+	int ep_num = usb_pipeendpoint(urb->pipe);
-+
-+	if (usb_pipein(urb->pipe))
-+		return dev->ep_in[ep_num];
-+	else
-+		return dev->ep_out[ep_num];
-+}
-+
-+static int _disconnect(dwc_otg_hcd_t * hcd)
-+{
-+	struct usb_hcd *usb_hcd = dwc_otg_hcd_to_hcd(hcd);
-+
-+	usb_hcd->self.is_b_host = 0;
-+	return 0;
-+}
-+
-+static int _start(dwc_otg_hcd_t * hcd)
-+{
-+	struct usb_hcd *usb_hcd = dwc_otg_hcd_to_hcd(hcd);
-+
-+	usb_hcd->self.is_b_host = dwc_otg_hcd_is_b_host(hcd);
-+	hcd_start(usb_hcd);
-+
-+	return 0;
-+}
-+
-+static int _hub_info(dwc_otg_hcd_t * hcd, void *urb_handle, uint32_t * hub_addr,
-+		     uint32_t * port_addr)
-+{
-+   struct urb *urb = (struct urb *)urb_handle;
-+   struct usb_bus *bus;
-+#if 1 //GRAYG - temporary
-+   if (NULL == urb_handle)
-+      DWC_ERROR("**** %s - NULL URB handle\n", __func__);//GRAYG
-+   if (NULL == urb->dev)
-+      DWC_ERROR("**** %s - URB has no device\n", __func__);//GRAYG
-+   if (NULL == port_addr)
-+      DWC_ERROR("**** %s - NULL port_address\n", __func__);//GRAYG
-+#endif
-+   if (urb->dev->tt) {
-+        if (NULL == urb->dev->tt->hub) {
-+                DWC_ERROR("**** %s - (URB's transactor has no TT - giving no hub)\n",
-+                           __func__); //GRAYG
-+                //*hub_addr = (u8)usb_pipedevice(urb->pipe); //GRAYG
-+                *hub_addr = 0; //GRAYG
-+                // we probably shouldn't have a transaction translator if
-+                // there's no associated hub?
-+        } else {
-+		bus = hcd_to_bus(dwc_otg_hcd_to_hcd(hcd));
-+		if (urb->dev->tt->hub == bus->root_hub)
-+			*hub_addr = 0;
-+		else
-+			*hub_addr = urb->dev->tt->hub->devnum;
-+	}
-+	*port_addr = urb->dev->ttport;
-+   } else {
-+        *hub_addr = 0;
-+	*port_addr = urb->dev->ttport;
-+   }
-+   return 0;
-+}
-+
-+static int _speed(dwc_otg_hcd_t * hcd, void *urb_handle)
-+{
-+	struct urb *urb = (struct urb *)urb_handle;
-+	return urb->dev->speed;
-+}
-+
-+static int _get_b_hnp_enable(dwc_otg_hcd_t * hcd)
-+{
-+	struct usb_hcd *usb_hcd = dwc_otg_hcd_to_hcd(hcd);
-+	return usb_hcd->self.b_hnp_enable;
-+}
-+
-+static void allocate_bus_bandwidth(struct usb_hcd *hcd, uint32_t bw,
-+				   struct urb *urb)
-+{
-+	hcd_to_bus(hcd)->bandwidth_allocated += bw / urb->interval;
-+	if (usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS) {
-+		hcd_to_bus(hcd)->bandwidth_isoc_reqs++;
-+	} else {
-+		hcd_to_bus(hcd)->bandwidth_int_reqs++;
-+	}
-+}
-+
-+static void free_bus_bandwidth(struct usb_hcd *hcd, uint32_t bw,
-+			       struct urb *urb)
-+{
-+	hcd_to_bus(hcd)->bandwidth_allocated -= bw / urb->interval;
-+	if (usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS) {
-+		hcd_to_bus(hcd)->bandwidth_isoc_reqs--;
-+	} else {
-+		hcd_to_bus(hcd)->bandwidth_int_reqs--;
-+	}
-+}
-+
-+/**
-+ * Sets the final status of an URB and returns it to the device driver. Any
-+ * required cleanup of the URB is performed.  The HCD lock should be held on
-+ * entry.
-+ */
-+static int _complete(dwc_otg_hcd_t * hcd, void *urb_handle,
-+		     dwc_otg_hcd_urb_t * dwc_otg_urb, int32_t status)
-+{
-+	struct urb *urb = (struct urb *)urb_handle;
-+	urb_tq_entry_t *new_entry;
-+	int rc = 0;
-+	if (CHK_DEBUG_LEVEL(DBG_HCDV | DBG_HCD_URB)) {
-+		DWC_PRINTF("%s: urb %p, device %d, ep %d %s, status=%d\n",
-+			   __func__, urb, usb_pipedevice(urb->pipe),
-+			   usb_pipeendpoint(urb->pipe),
-+			   usb_pipein(urb->pipe) ? "IN" : "OUT", status);
-+		if (usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS) {
-+			int i;
-+			for (i = 0; i < urb->number_of_packets; i++) {
-+				DWC_PRINTF("  ISO Desc %d status: %d\n",
-+					   i, urb->iso_frame_desc[i].status);
-+			}
-+		}
-+	}
-+	new_entry = DWC_ALLOC_ATOMIC(sizeof(urb_tq_entry_t));
-+	urb->actual_length = dwc_otg_hcd_urb_get_actual_length(dwc_otg_urb);
-+	/* Convert status value. */
-+	switch (status) {
-+	case -DWC_E_PROTOCOL:
-+		status = -EPROTO;
-+		break;
-+	case -DWC_E_IN_PROGRESS:
-+		status = -EINPROGRESS;
-+		break;
-+	case -DWC_E_PIPE:
-+		status = -EPIPE;
-+		break;
-+	case -DWC_E_IO:
-+		status = -EIO;
-+		break;
-+	case -DWC_E_TIMEOUT:
-+		status = -ETIMEDOUT;
-+		break;
-+	case -DWC_E_OVERFLOW:
-+		status = -EOVERFLOW;
-+		break;
-+	case -DWC_E_SHUTDOWN:
-+		status = -ESHUTDOWN;
-+		break;
-+	default:
-+		if (status) {
-+			DWC_PRINTF("Uknown urb status %d\n", status);
-+
-+		}
-+	}
-+
-+	if (usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS) {
-+		int i;
-+
-+		urb->error_count = dwc_otg_hcd_urb_get_error_count(dwc_otg_urb);
-+		urb->actual_length = 0;
-+		for (i = 0; i < urb->number_of_packets; ++i) {
-+			urb->iso_frame_desc[i].actual_length =
-+			    dwc_otg_hcd_urb_get_iso_desc_actual_length
-+			    (dwc_otg_urb, i);
-+			urb->actual_length += urb->iso_frame_desc[i].actual_length;
-+			urb->iso_frame_desc[i].status =
-+			    dwc_otg_hcd_urb_get_iso_desc_status(dwc_otg_urb, i);
-+		}
-+	}
-+
-+	urb->status = status;
-+	urb->hcpriv = NULL;
-+	if (!status) {
-+		if ((urb->transfer_flags & URB_SHORT_NOT_OK) &&
-+		    (urb->actual_length < urb->transfer_buffer_length)) {
-+			urb->status = -EREMOTEIO;
-+		}
-+	}
-+
-+	if ((usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS) ||
-+	    (usb_pipetype(urb->pipe) == PIPE_INTERRUPT)) {
-+		struct usb_host_endpoint *ep = dwc_urb_to_endpoint(urb);
-+		if (ep) {
-+			free_bus_bandwidth(dwc_otg_hcd_to_hcd(hcd),
-+					   dwc_otg_hcd_get_ep_bandwidth(hcd,
-+									ep->hcpriv),
-+					   urb);
-+		}
-+	}
-+	DWC_FREE(dwc_otg_urb);
-+	if (!new_entry) {
-+		DWC_ERROR("dwc_otg_hcd: complete: cannot allocate URB TQ entry\n");
-+		urb->status = -EPROTO;
-+		/* don't schedule the tasklet -
-+		 * directly return the packet here with error. */
-+#if USB_URB_EP_LINKING
-+		usb_hcd_unlink_urb_from_ep(dwc_otg_hcd_to_hcd(hcd), urb);
-+#endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
-+		usb_hcd_giveback_urb(dwc_otg_hcd_to_hcd(hcd), urb);
-+#else
-+		usb_hcd_giveback_urb(dwc_otg_hcd_to_hcd(hcd), urb, urb->status);
-+#endif
-+	} else {
-+		new_entry->urb = urb;
-+#if USB_URB_EP_LINKING
-+		rc = usb_hcd_check_unlink_urb(dwc_otg_hcd_to_hcd(hcd), urb, urb->status);
-+		if(0 == rc) {
-+			usb_hcd_unlink_urb_from_ep(dwc_otg_hcd_to_hcd(hcd), urb);
-+		}
-+#endif
-+		if(0 == rc) {
-+			DWC_TAILQ_INSERT_TAIL(&hcd->completed_urb_list, new_entry,
-+						urb_tq_entries);
-+			DWC_TASK_HI_SCHEDULE(hcd->completion_tasklet);
-+		}
-+	}
-+	return 0;
-+}
-+
-+static struct dwc_otg_hcd_function_ops hcd_fops = {
-+	.start = _start,
-+	.disconnect = _disconnect,
-+	.hub_info = _hub_info,
-+	.speed = _speed,
-+	.complete = _complete,
-+	.get_b_hnp_enable = _get_b_hnp_enable,
-+};
-+
-+#ifdef CONFIG_ARM64
-+
-+static int simfiq_irq = -1;
-+
-+void local_fiq_enable(void)
-+{
-+	if (simfiq_irq >= 0)
-+		enable_irq(simfiq_irq);
-+}
-+
-+void local_fiq_disable(void)
-+{
-+	if (simfiq_irq >= 0)
-+		disable_irq(simfiq_irq);
-+}
-+
-+irqreturn_t fiq_irq_handler(int irq, void *dev_id)
-+{
-+	dwc_otg_hcd_t *dwc_otg_hcd = (dwc_otg_hcd_t *)dev_id;
-+
-+	if (fiq_fsm_enable)
-+		dwc_otg_fiq_fsm(dwc_otg_hcd->fiq_state, dwc_otg_hcd->core_if->core_params->host_channels);
-+	else
-+		dwc_otg_fiq_nop(dwc_otg_hcd->fiq_state);
-+
-+	return IRQ_HANDLED;
-+}
-+
-+#else
-+static struct fiq_handler fh = {
-+  .name = "usb_fiq",
-+};
-+
-+#endif
-+
-+static void hcd_init_fiq(void *cookie)
-+{
-+	dwc_otg_device_t *otg_dev = cookie;
-+	dwc_otg_hcd_t *dwc_otg_hcd = otg_dev->hcd;
-+#ifdef CONFIG_ARM64
-+	int retval = 0;
-+	int irq;
-+#else
-+	struct pt_regs regs;
-+	int irq;
-+
-+	if (claim_fiq(&fh)) {
-+		DWC_ERROR("Can't claim FIQ");
-+		BUG();
-+	}
-+	DWC_WARN("FIQ on core %d", smp_processor_id());
-+	DWC_WARN("FIQ ASM at %px length %d", &_dwc_otg_fiq_stub, (int)(&_dwc_otg_fiq_stub_end - &_dwc_otg_fiq_stub));
-+	set_fiq_handler((void *) &_dwc_otg_fiq_stub, &_dwc_otg_fiq_stub_end - &_dwc_otg_fiq_stub);
-+	memset(&regs,0,sizeof(regs));
-+
-+	regs.ARM_r8 = (long) dwc_otg_hcd->fiq_state;
-+	if (fiq_fsm_enable) {
-+		regs.ARM_r9 = dwc_otg_hcd->core_if->core_params->host_channels;
-+		//regs.ARM_r10 = dwc_otg_hcd->dma;
-+		regs.ARM_fp = (long) dwc_otg_fiq_fsm;
-+	} else {
-+		regs.ARM_fp = (long) dwc_otg_fiq_nop;
-+	}
-+
-+	regs.ARM_sp = (long) dwc_otg_hcd->fiq_stack + (sizeof(struct fiq_stack) - 4);
-+
-+//		__show_regs(&regs);
-+	set_fiq_regs(&regs);
-+#endif
-+
-+	dwc_otg_hcd->fiq_state->dwc_regs_base = otg_dev->os_dep.base;
-+	//Set the mphi periph to the required registers
-+	dwc_otg_hcd->fiq_state->mphi_regs.base    = otg_dev->os_dep.mphi_base;
-+	if (otg_dev->os_dep.use_swirq) {
-+		dwc_otg_hcd->fiq_state->mphi_regs.swirq_set =
-+			otg_dev->os_dep.mphi_base + 0x1f0;
-+		dwc_otg_hcd->fiq_state->mphi_regs.swirq_clr =
-+			otg_dev->os_dep.mphi_base + 0x1f4;
-+		DWC_WARN("Fake MPHI regs_base at %px",
-+			 dwc_otg_hcd->fiq_state->mphi_regs.base);
-+	} else {
-+		dwc_otg_hcd->fiq_state->mphi_regs.ctrl =
-+			otg_dev->os_dep.mphi_base + 0x4c;
-+		dwc_otg_hcd->fiq_state->mphi_regs.outdda
-+			= otg_dev->os_dep.mphi_base + 0x28;
-+		dwc_otg_hcd->fiq_state->mphi_regs.outddb
-+			= otg_dev->os_dep.mphi_base + 0x2c;
-+		dwc_otg_hcd->fiq_state->mphi_regs.intstat
-+			= otg_dev->os_dep.mphi_base + 0x50;
-+		DWC_WARN("MPHI regs_base at %px",
-+			 dwc_otg_hcd->fiq_state->mphi_regs.base);
-+
-+		//Enable mphi peripheral
-+		writel((1<<31),dwc_otg_hcd->fiq_state->mphi_regs.ctrl);
-+#ifdef DEBUG
-+		if (readl(dwc_otg_hcd->fiq_state->mphi_regs.ctrl) & 0x80000000)
-+			DWC_WARN("MPHI periph has been enabled");
-+		else
-+			DWC_WARN("MPHI periph has NOT been enabled");
-+#endif
-+	}
-+	// Enable FIQ interrupt from USB peripheral
-+#ifdef CONFIG_ARM64
-+	irq = otg_dev->os_dep.fiq_num;
-+
-+	if (irq < 0) {
-+		DWC_ERROR("Can't get SIM-FIQ irq");
-+		return;
-+	}
-+
-+	retval = request_irq(irq, fiq_irq_handler, 0, "dwc_otg_sim-fiq", dwc_otg_hcd);
-+
-+	if (retval < 0) {
-+		DWC_ERROR("Unable to request SIM-FIQ irq\n");
-+		return;
-+	}
-+
-+	simfiq_irq = irq;
-+#else
-+#ifdef CONFIG_GENERIC_IRQ_MULTI_HANDLER
-+	irq = otg_dev->os_dep.fiq_num;
-+#else
-+	irq = INTERRUPT_VC_USB;
-+#endif
-+	if (irq < 0) {
-+		DWC_ERROR("Can't get FIQ irq");
-+		return;
-+	}
-+	/*
-+	 * We could take an interrupt immediately after enabling the FIQ.
-+	 * Ensure coherency of hcd->fiq_state.
-+	 */
-+	smp_mb();
-+	enable_fiq(irq);
-+	local_fiq_enable();
-+#endif
-+
-+}
-+
-+/**
-+ * Initializes the HCD. This function allocates memory for and initializes the
-+ * static parts of the usb_hcd and dwc_otg_hcd structures. It also registers the
-+ * USB bus with the core and calls the hc_driver->start() function. It returns
-+ * a negative error on failure.
-+ */
-+int hcd_init(dwc_bus_dev_t *_dev)
-+{
-+	struct usb_hcd *hcd = NULL;
-+	dwc_otg_hcd_t *dwc_otg_hcd = NULL;
-+	dwc_otg_device_t *otg_dev = DWC_OTG_BUSDRVDATA(_dev);
-+	int retval = 0;
-+        u64 dmamask;
-+
-+	DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD INIT otg_dev=%p\n", otg_dev);
-+
-+	/* Set device flags indicating whether the HCD supports DMA. */
-+	if (dwc_otg_is_dma_enable(otg_dev->core_if))
-+                dmamask = DMA_BIT_MASK(32);
-+        else
-+                dmamask = 0;
-+
-+#if    defined(LM_INTERFACE) || defined(PLATFORM_INTERFACE)
-+        dma_set_mask(&_dev->dev, dmamask);
-+        dma_set_coherent_mask(&_dev->dev, dmamask);
-+#elif  defined(PCI_INTERFACE)
-+        pci_set_dma_mask(_dev, dmamask);
-+        pci_set_consistent_dma_mask(_dev, dmamask);
-+#endif
-+
-+	/*
-+	 * Allocate memory for the base HCD plus the DWC OTG HCD.
-+	 * Initialize the base HCD.
-+	 */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
-+	hcd = usb_create_hcd(&dwc_otg_hc_driver, &_dev->dev, _dev->dev.bus_id);
-+#else
-+	hcd = usb_create_hcd(&dwc_otg_hc_driver, &_dev->dev, dev_name(&_dev->dev));
-+	hcd->has_tt = 1;
-+//      hcd->uses_new_polling = 1;
-+//      hcd->poll_rh = 0;
-+#endif
-+	if (!hcd) {
-+		retval = -ENOMEM;
-+		goto error1;
-+	}
-+
-+	hcd->regs = otg_dev->os_dep.base;
-+
-+
-+	/* Initialize the DWC OTG HCD. */
-+	dwc_otg_hcd = dwc_otg_hcd_alloc_hcd();
-+	if (!dwc_otg_hcd) {
-+		goto error2;
-+	}
-+	((struct wrapper_priv_data *)(hcd->hcd_priv))->dwc_otg_hcd =
-+	    dwc_otg_hcd;
-+	otg_dev->hcd = dwc_otg_hcd;
-+	otg_dev->hcd->otg_dev = otg_dev;
-+
-+#ifdef CONFIG_ARM64
-+	if (dwc_otg_hcd_init(dwc_otg_hcd, otg_dev->core_if))
-+		goto error2;
-+
-+	if (fiq_enable)
-+		hcd_init_fiq(otg_dev);
-+#else
-+	if (dwc_otg_hcd_init(dwc_otg_hcd, otg_dev->core_if)) {
-+		goto error2;
-+	}
-+
-+	if (fiq_enable) {
-+		if (num_online_cpus() > 1) {
-+			/*
-+			 * bcm2709: can run the FIQ on a separate core to IRQs.
-+			 * Ensure driver state is visible to other cores before setting up the FIQ.
-+			 */
-+			smp_mb();
-+			smp_call_function_single(1, hcd_init_fiq, otg_dev, 1);
-+		} else {
-+			smp_call_function_single(0, hcd_init_fiq, otg_dev, 1);
-+		}
-+	}
-+#endif
-+
-+	hcd->self.otg_port = dwc_otg_hcd_otg_port(dwc_otg_hcd);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) //don't support for LM(with 2.6.20.1 kernel)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35) //version field absent later
-+	hcd->self.otg_version = dwc_otg_get_otg_version(otg_dev->core_if);
-+#endif
-+	/* Don't support SG list at this point */
-+	hcd->self.sg_tablesize = 0;
-+#endif
-+	/*
-+	 * Finish generic HCD initialization and start the HCD. This function
-+	 * allocates the DMA buffer pool, registers the USB bus, requests the
-+	 * IRQ line, and calls hcd_start method.
-+	 */
-+	retval = usb_add_hcd(hcd, otg_dev->os_dep.irq_num, IRQF_SHARED);
-+	if (retval < 0) {
-+		goto error2;
-+	}
-+
-+	dwc_otg_hcd_set_priv_data(dwc_otg_hcd, hcd);
-+	return 0;
-+
-+error2:
-+	usb_put_hcd(hcd);
-+error1:
-+	return retval;
-+}
-+
-+/**
-+ * Removes the HCD.
-+ * Frees memory and resources associated with the HCD and deregisters the bus.
-+ */
-+void hcd_remove(dwc_bus_dev_t *_dev)
-+{
-+	dwc_otg_device_t *otg_dev = DWC_OTG_BUSDRVDATA(_dev);
-+	dwc_otg_hcd_t *dwc_otg_hcd;
-+	struct usb_hcd *hcd;
-+
-+	DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD REMOVE otg_dev=%p\n", otg_dev);
-+
-+	if (!otg_dev) {
-+		DWC_DEBUGPL(DBG_ANY, "%s: otg_dev NULL!\n", __func__);
-+		return;
-+	}
-+
-+	dwc_otg_hcd = otg_dev->hcd;
-+
-+	if (!dwc_otg_hcd) {
-+		DWC_DEBUGPL(DBG_ANY, "%s: otg_dev->hcd NULL!\n", __func__);
-+		return;
-+	}
-+
-+	hcd = dwc_otg_hcd_to_hcd(dwc_otg_hcd);
-+
-+	if (!hcd) {
-+		DWC_DEBUGPL(DBG_ANY,
-+			    "%s: dwc_otg_hcd_to_hcd(dwc_otg_hcd) NULL!\n",
-+			    __func__);
-+		return;
-+	}
-+	usb_remove_hcd(hcd);
-+	dwc_otg_hcd_set_priv_data(dwc_otg_hcd, NULL);
-+	dwc_otg_hcd_remove(dwc_otg_hcd);
-+	usb_put_hcd(hcd);
-+}
-+
-+/* =========================================================================
-+ *  Linux HC Driver Functions
-+ * ========================================================================= */
-+
-+/** Initializes the DWC_otg controller and its root hub and prepares it for host
-+ * mode operation. Activates the root port. Returns 0 on success and a negative
-+ * error code on failure. */
-+int hcd_start(struct usb_hcd *hcd)
-+{
-+	dwc_otg_hcd_t *dwc_otg_hcd = hcd_to_dwc_otg_hcd(hcd);
-+	struct usb_bus *bus;
-+
-+	DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD START\n");
-+	bus = hcd_to_bus(hcd);
-+
-+	hcd->state = HC_STATE_RUNNING;
-+	if (dwc_otg_hcd_start(dwc_otg_hcd, &hcd_fops)) {
-+		return 0;
-+	}
-+
-+	/* Initialize and connect root hub if one is not already attached */
-+	if (bus->root_hub) {
-+		DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD Has Root Hub\n");
-+		/* Inform the HUB driver to resume. */
-+		usb_hcd_resume_root_hub(hcd);
-+	}
-+
-+	return 0;
-+}
-+
-+/**
-+ * Halts the DWC_otg host mode operations in a clean manner. USB transfers are
-+ * stopped.
-+ */
-+void hcd_stop(struct usb_hcd *hcd)
-+{
-+	dwc_otg_hcd_t *dwc_otg_hcd = hcd_to_dwc_otg_hcd(hcd);
-+
-+	dwc_otg_hcd_stop(dwc_otg_hcd);
-+}
-+
-+/** Returns the current frame number. */
-+static int get_frame_number(struct usb_hcd *hcd)
-+{
-+	hprt0_data_t hprt0;
-+	dwc_otg_hcd_t *dwc_otg_hcd = hcd_to_dwc_otg_hcd(hcd);
-+	hprt0.d32 = DWC_READ_REG32(dwc_otg_hcd->core_if->host_if->hprt0);
-+	if (hprt0.b.prtspd == DWC_HPRT0_PRTSPD_HIGH_SPEED)
-+		return dwc_otg_hcd_get_frame_number(dwc_otg_hcd) >> 3;
-+	else
-+		return dwc_otg_hcd_get_frame_number(dwc_otg_hcd);
-+}
-+
-+#ifdef DEBUG
-+static void dump_urb_info(struct urb *urb, char *fn_name)
-+{
-+	DWC_PRINTF("%s, urb %p\n", fn_name, urb);
-+	DWC_PRINTF("  Device address: %d\n", usb_pipedevice(urb->pipe));
-+	DWC_PRINTF("  Endpoint: %d, %s\n", usb_pipeendpoint(urb->pipe),
-+		   (usb_pipein(urb->pipe) ? "IN" : "OUT"));
-+	DWC_PRINTF("  Endpoint type: %s\n", ( {
-+					     char *pipetype;
-+					     switch (usb_pipetype(urb->pipe)) {
-+case PIPE_CONTROL:
-+pipetype = "CONTROL"; break; case PIPE_BULK:
-+pipetype = "BULK"; break; case PIPE_INTERRUPT:
-+pipetype = "INTERRUPT"; break; case PIPE_ISOCHRONOUS:
-+pipetype = "ISOCHRONOUS"; break; default:
-+					     pipetype = "UNKNOWN"; break;};
-+					     pipetype;}
-+		   )) ;
-+	DWC_PRINTF("  Speed: %s\n", ( {
-+				     char *speed; switch (urb->dev->speed) {
-+case USB_SPEED_HIGH:
-+speed = "HIGH"; break; case USB_SPEED_FULL:
-+speed = "FULL"; break; case USB_SPEED_LOW:
-+speed = "LOW"; break; default:
-+				     speed = "UNKNOWN"; break;};
-+				     speed;}
-+		   )) ;
-+	DWC_PRINTF("  Max packet size: %d\n",
-+		   usb_maxpacket(urb->dev, urb->pipe);
-+	DWC_PRINTF("  Data buffer length: %d\n", urb->transfer_buffer_length);
-+	DWC_PRINTF("  Transfer buffer: %p, Transfer DMA: %p\n",
-+		   urb->transfer_buffer, (void *)urb->transfer_dma);
-+	DWC_PRINTF("  Setup buffer: %p, Setup DMA: %p\n",
-+		   urb->setup_packet, (void *)urb->setup_dma);
-+	DWC_PRINTF("  Interval: %d\n", urb->interval);
-+	if (usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS) {
-+		int i;
-+		for (i = 0; i < urb->number_of_packets; i++) {
-+			DWC_PRINTF("  ISO Desc %d:\n", i);
-+			DWC_PRINTF("    offset: %d, length %d\n",
-+				   urb->iso_frame_desc[i].offset,
-+				   urb->iso_frame_desc[i].length);
-+		}
-+	}
-+}
-+#endif
-+
-+/** Starts processing a USB transfer request specified by a USB Request Block
-+ * (URB). mem_flags indicates the type of memory allocation to use while
-+ * processing this URB. */
-+static int dwc_otg_urb_enqueue(struct usb_hcd *hcd,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
-+		       struct usb_host_endpoint *ep,
-+#endif
-+		       struct urb *urb, gfp_t mem_flags)
-+{
-+	int retval = 0;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
-+	struct usb_host_endpoint *ep = urb->ep;
-+#endif
-+	dwc_irqflags_t irqflags;
-+        void **ref_ep_hcpriv = &ep->hcpriv;
-+	dwc_otg_hcd_t *dwc_otg_hcd = hcd_to_dwc_otg_hcd(hcd);
-+	dwc_otg_hcd_urb_t *dwc_otg_urb;
-+	int i;
-+	int alloc_bandwidth = 0;
-+	uint8_t ep_type = 0;
-+	uint32_t flags = 0;
-+	void *buf;
-+
-+#ifdef DEBUG
-+	if (CHK_DEBUG_LEVEL(DBG_HCDV | DBG_HCD_URB)) {
-+		dump_urb_info(urb, "dwc_otg_urb_enqueue");
-+	}
-+#endif
-+	if ((usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS)
-+	    || (usb_pipetype(urb->pipe) == PIPE_INTERRUPT)) {
-+		if (!dwc_otg_hcd_is_bandwidth_allocated
-+		    (dwc_otg_hcd, ref_ep_hcpriv)) {
-+			alloc_bandwidth = 1;
-+		}
-+	}
-+
-+	switch (usb_pipetype(urb->pipe)) {
-+	case PIPE_CONTROL:
-+		ep_type = USB_ENDPOINT_XFER_CONTROL;
-+		break;
-+	case PIPE_ISOCHRONOUS:
-+		ep_type = USB_ENDPOINT_XFER_ISOC;
-+		break;
-+	case PIPE_BULK:
-+		ep_type = USB_ENDPOINT_XFER_BULK;
-+		break;
-+	case PIPE_INTERRUPT:
-+		ep_type = USB_ENDPOINT_XFER_INT;
-+		break;
-+	default:
-+                DWC_WARN("Wrong EP type - %d\n", usb_pipetype(urb->pipe));
-+	}
-+
-+        /* # of packets is often 0 - do we really need to call this then? */
-+	dwc_otg_urb = dwc_otg_hcd_urb_alloc(dwc_otg_hcd,
-+					    urb->number_of_packets,
-+					    mem_flags == GFP_ATOMIC ? 1 : 0);
-+
-+	if(dwc_otg_urb == NULL)
-+		return -ENOMEM;
-+
-+	if (!dwc_otg_urb && urb->number_of_packets)
-+		return -ENOMEM;
-+
-+	dwc_otg_hcd_urb_set_pipeinfo(dwc_otg_urb, usb_pipedevice(urb->pipe),
-+				     usb_pipeendpoint(urb->pipe), ep_type,
-+				     usb_pipein(urb->pipe),
-+				     usb_maxpacket(urb->dev, urb->pipe));
-+
-+	buf = urb->transfer_buffer;
-+	if (hcd_uses_dma(hcd) && !buf && urb->transfer_buffer_length) {
-+		/*
-+		 * Calculate virtual address from physical address,
-+		 * because some class driver may not fill transfer_buffer.
-+		 * In Buffer DMA mode virual address is used,
-+		 * when handling non DWORD aligned buffers.
-+		 */
-+		buf = (void *)__bus_to_virt((unsigned long)urb->transfer_dma);
-+		dev_warn_once(&urb->dev->dev,
-+			      "USB transfer_buffer was NULL, will use __bus_to_virt(%pad)=%p\n",
-+			      &urb->transfer_dma, buf);
-+	}
-+
-+	if (!buf && urb->transfer_buffer_length) {
-+		DWC_FREE(dwc_otg_urb);
-+		DWC_ERROR("transfer_buffer is NULL in PIO mode or both "
-+			   "transfer_buffer and transfer_dma are NULL in DMA mode\n");
-+		return -EINVAL;
-+	}
-+
-+	if (!(urb->transfer_flags & URB_NO_INTERRUPT))
-+		flags |= URB_GIVEBACK_ASAP;
-+	if (urb->transfer_flags & URB_ZERO_PACKET)
-+		flags |= URB_SEND_ZERO_PACKET;
-+
-+	dwc_otg_hcd_urb_set_params(dwc_otg_urb, urb, buf,
-+				   urb->transfer_dma,
-+				   urb->transfer_buffer_length,
-+				   urb->setup_packet,
-+				   urb->setup_dma, flags, urb->interval);
-+
-+	for (i = 0; i < urb->number_of_packets; ++i) {
-+		dwc_otg_hcd_urb_set_iso_desc_params(dwc_otg_urb, i,
-+						    urb->
-+						    iso_frame_desc[i].offset,
-+						    urb->
-+						    iso_frame_desc[i].length);
-+	}
-+
-+	DWC_SPINLOCK_IRQSAVE(dwc_otg_hcd->lock, &irqflags);
-+	urb->hcpriv = dwc_otg_urb;
-+#if USB_URB_EP_LINKING
-+	retval = usb_hcd_link_urb_to_ep(hcd, urb);
-+	if (0 == retval)
-+#endif
-+	{
-+		retval = dwc_otg_hcd_urb_enqueue(dwc_otg_hcd, dwc_otg_urb,
-+						/*(dwc_otg_qh_t **)*/
-+						ref_ep_hcpriv, 1);
-+		if (0 == retval) {
-+			if (alloc_bandwidth) {
-+				allocate_bus_bandwidth(hcd,
-+						dwc_otg_hcd_get_ep_bandwidth(
-+							dwc_otg_hcd, *ref_ep_hcpriv),
-+						urb);
-+			}
-+		} else {
-+			DWC_DEBUGPL(DBG_HCD, "DWC OTG dwc_otg_hcd_urb_enqueue failed rc %d\n", retval);
-+#if USB_URB_EP_LINKING
-+			usb_hcd_unlink_urb_from_ep(hcd, urb);
-+#endif
-+			DWC_FREE(dwc_otg_urb);
-+			urb->hcpriv = NULL;
-+			if (retval == -DWC_E_NO_DEVICE)
-+				retval = -ENODEV;
-+		}
-+	}
-+#if USB_URB_EP_LINKING
-+	else
-+	{
-+		DWC_FREE(dwc_otg_urb);
-+		urb->hcpriv = NULL;
-+	}
-+#endif
-+	DWC_SPINUNLOCK_IRQRESTORE(dwc_otg_hcd->lock, irqflags);
-+	return retval;
-+}
-+
-+/** Aborts/cancels a USB transfer request. Always returns 0 to indicate
-+ * success.  */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
-+static int dwc_otg_urb_dequeue(struct usb_hcd *hcd, struct urb *urb)
-+#else
-+static int dwc_otg_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
-+#endif
-+{
-+	dwc_irqflags_t flags;
-+	dwc_otg_hcd_t *dwc_otg_hcd;
-+        int rc;
-+
-+	DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD URB Dequeue\n");
-+
-+	dwc_otg_hcd = hcd_to_dwc_otg_hcd(hcd);
-+
-+#ifdef DEBUG
-+	if (CHK_DEBUG_LEVEL(DBG_HCDV | DBG_HCD_URB)) {
-+		dump_urb_info(urb, "dwc_otg_urb_dequeue");
-+	}
-+#endif
-+
-+	DWC_SPINLOCK_IRQSAVE(dwc_otg_hcd->lock, &flags);
-+	rc = usb_hcd_check_unlink_urb(hcd, urb, status);
-+	if (0 == rc) {
-+		if(urb->hcpriv != NULL) {
-+	                dwc_otg_hcd_urb_dequeue(dwc_otg_hcd,
-+	                                    (dwc_otg_hcd_urb_t *)urb->hcpriv);
-+
-+		        DWC_FREE(urb->hcpriv);
-+			urb->hcpriv = NULL;
-+		}
-+        }
-+
-+        if (0 == rc) {
-+		/* Higher layer software sets URB status. */
-+#if USB_URB_EP_LINKING
-+                usb_hcd_unlink_urb_from_ep(hcd, urb);
-+#endif
-+		DWC_SPINUNLOCK_IRQRESTORE(dwc_otg_hcd->lock, flags);
-+
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
-+                usb_hcd_giveback_urb(hcd, urb);
-+#else
-+                usb_hcd_giveback_urb(hcd, urb, status);
-+#endif
-+                if (CHK_DEBUG_LEVEL(DBG_HCDV | DBG_HCD_URB)) {
-+                        DWC_PRINTF("Called usb_hcd_giveback_urb() \n");
-+                        DWC_PRINTF("  1urb->status = %d\n", urb->status);
-+                }
-+                DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD URB Dequeue OK\n");
-+        } else {
-+		DWC_SPINUNLOCK_IRQRESTORE(dwc_otg_hcd->lock, flags);
-+                DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD URB Dequeue failed - rc %d\n",
-+                            rc);
-+        }
-+
-+	return rc;
-+}
-+
-+/* Frees resources in the DWC_otg controller related to a given endpoint. Also
-+ * clears state in the HCD related to the endpoint. Any URBs for the endpoint
-+ * must already be dequeued. */
-+static void endpoint_disable(struct usb_hcd *hcd, struct usb_host_endpoint *ep)
-+{
-+	dwc_otg_hcd_t *dwc_otg_hcd = hcd_to_dwc_otg_hcd(hcd);
-+
-+	DWC_DEBUGPL(DBG_HCD,
-+		    "DWC OTG HCD EP DISABLE: _bEndpointAddress=0x%02x, "
-+		    "endpoint=%d\n", ep->desc.bEndpointAddress,
-+		    dwc_ep_addr_to_endpoint(ep->desc.bEndpointAddress));
-+	dwc_otg_hcd_endpoint_disable(dwc_otg_hcd, ep->hcpriv, 250);
-+	ep->hcpriv = NULL;
-+}
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30)
-+/* Resets endpoint specific parameter values, in current version used to reset
-+ * the data toggle(as a WA). This function can be called from usb_clear_halt routine */
-+static void endpoint_reset(struct usb_hcd *hcd, struct usb_host_endpoint *ep)
-+{
-+	dwc_irqflags_t flags;
-+	dwc_otg_hcd_t *dwc_otg_hcd = hcd_to_dwc_otg_hcd(hcd);
-+
-+	DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD EP RESET: Endpoint Num=0x%02d\n",
-+		    ep->desc.bEndpointAddress);
-+
-+	DWC_SPINLOCK_IRQSAVE(dwc_otg_hcd->lock, &flags);
-+	if (ep->hcpriv) {
-+		dwc_otg_hcd_endpoint_reset(dwc_otg_hcd, ep->hcpriv);
-+	}
-+	DWC_SPINUNLOCK_IRQRESTORE(dwc_otg_hcd->lock, flags);
-+}
-+#endif
-+
-+/** Handles host mode interrupts for the DWC_otg controller. Returns IRQ_NONE if
-+ * there was no interrupt to handle. Returns IRQ_HANDLED if there was a valid
-+ * interrupt.
-+ *
-+ * This function is called by the USB core when an interrupt occurs */
-+static irqreturn_t dwc_otg_hcd_irq(struct usb_hcd *hcd)
-+{
-+	dwc_otg_hcd_t *dwc_otg_hcd = hcd_to_dwc_otg_hcd(hcd);
-+	int32_t retval = dwc_otg_hcd_handle_intr(dwc_otg_hcd);
-+	if (retval != 0) {
-+		S3C2410X_CLEAR_EINTPEND();
-+	}
-+	return IRQ_RETVAL(retval);
-+}
-+
-+/** Creates Status Change bitmap for the root hub and root port. The bitmap is
-+ * returned in buf. Bit 0 is the status change indicator for the root hub. Bit 1
-+ * is the status change indicator for the single root port. Returns 1 if either
-+ * change indicator is 1, otherwise returns 0. */
-+int hub_status_data(struct usb_hcd *hcd, char *buf)
-+{
-+	dwc_otg_hcd_t *dwc_otg_hcd = hcd_to_dwc_otg_hcd(hcd);
-+
-+	buf[0] = 0;
-+	buf[0] |= (dwc_otg_hcd_is_status_changed(dwc_otg_hcd, 1)) << 1;
-+
-+	return (buf[0] != 0);
-+}
-+
-+/** Handles hub class-specific requests. */
-+int hub_control(struct usb_hcd *hcd,
-+		u16 typeReq, u16 wValue, u16 wIndex, char *buf, u16 wLength)
-+{
-+	int retval;
-+
-+	retval = dwc_otg_hcd_hub_control(hcd_to_dwc_otg_hcd(hcd),
-+					 typeReq, wValue, wIndex, buf, wLength);
-+
-+	switch (retval) {
-+	case -DWC_E_INVALID:
-+		retval = -EINVAL;
-+		break;
-+	}
-+
-+	return retval;
-+}
-+
-+#endif /* DWC_DEVICE_ONLY */
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c
-@@ -0,0 +1,974 @@
-+/* ==========================================================================
-+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_queue.c $
-+ * $Revision: #44 $
-+ * $Date: 2011/10/26 $
-+ * $Change: 1873028 $
-+ *
-+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
-+ * "Software") is an Unsupported proprietary work of Synopsys, Inc. unless
-+ * otherwise expressly agreed to in writing between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product under
-+ * any End User Software License Agreement or Agreement for Licensed Product
-+ * with Synopsys or any supplement thereto. You are permitted to use and
-+ * redistribute this Software in source and binary forms, with or without
-+ * modification, provided that redistributions of source code must retain this
-+ * notice. You may not view, use, disclose, copy or distribute this file or
-+ * any information contained herein except pursuant to this license grant from
-+ * Synopsys. If you do not agree with this notice, including the disclaimer
-+ * below, then you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" BASIS
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS BE LIABLE FOR ANY DIRECT,
-+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================== */
-+#ifndef DWC_DEVICE_ONLY
-+
-+/**
-+ * @file
-+ *
-+ * This file contains the functions to manage Queue Heads and Queue
-+ * Transfer Descriptors.
-+ */
-+
-+#include "dwc_otg_hcd.h"
-+#include "dwc_otg_regs.h"
-+
-+extern bool microframe_schedule;
-+extern unsigned short int_ep_interval_min;
-+
-+/**
-+ * Free each QTD in the QH's QTD-list then free the QH.  QH should already be
-+ * removed from a list.  QTD list should already be empty if called from URB
-+ * Dequeue.
-+ *
-+ * @param hcd HCD instance.
-+ * @param qh The QH to free.
-+ */
-+void dwc_otg_hcd_qh_free(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh)
-+{
-+	dwc_otg_qtd_t *qtd, *qtd_tmp;
-+	dwc_irqflags_t flags;
-+	uint32_t buf_size = 0;
-+	uint8_t *align_buf_virt = NULL;
-+	dwc_dma_t align_buf_dma;
-+	struct device *dev = dwc_otg_hcd_to_dev(hcd);
-+
-+	/* Free each QTD in the QTD list */
-+	DWC_SPINLOCK_IRQSAVE(hcd->lock, &flags);
-+	DWC_CIRCLEQ_FOREACH_SAFE(qtd, qtd_tmp, &qh->qtd_list, qtd_list_entry) {
-+		DWC_CIRCLEQ_REMOVE(&qh->qtd_list, qtd, qtd_list_entry);
-+		dwc_otg_hcd_qtd_free(qtd);
-+	}
-+
-+	if (hcd->core_if->dma_desc_enable) {
-+		dwc_otg_hcd_qh_free_ddma(hcd, qh);
-+	} else if (qh->dw_align_buf) {
-+		if (qh->ep_type == UE_ISOCHRONOUS) {
-+			buf_size = 4096;
-+		} else {
-+			buf_size = hcd->core_if->core_params->max_transfer_size;
-+		}
-+		align_buf_virt = qh->dw_align_buf;
-+		align_buf_dma = qh->dw_align_buf_dma;
-+	}
-+
-+	DWC_FREE(qh);
-+	DWC_SPINUNLOCK_IRQRESTORE(hcd->lock, flags);
-+	if (align_buf_virt)
-+		DWC_DMA_FREE(dev, buf_size, align_buf_virt, align_buf_dma);
-+	return;
-+}
-+
-+#define BitStuffTime(bytecount)  ((8 * 7* bytecount) / 6)
-+#define HS_HOST_DELAY		5	/* nanoseconds */
-+#define FS_LS_HOST_DELAY	1000	/* nanoseconds */
-+#define HUB_LS_SETUP		333	/* nanoseconds */
-+#define NS_TO_US(ns)		((ns + 500) / 1000)
-+				/* convert & round nanoseconds to microseconds */
-+
-+static uint32_t calc_bus_time(int speed, int is_in, int is_isoc, int bytecount)
-+{
-+	unsigned long retval;
-+
-+	switch (speed) {
-+	case USB_SPEED_HIGH:
-+		if (is_isoc) {
-+			retval =
-+			    ((38 * 8 * 2083) +
-+			     (2083 * (3 + BitStuffTime(bytecount)))) / 1000 +
-+			    HS_HOST_DELAY;
-+		} else {
-+			retval =
-+			    ((55 * 8 * 2083) +
-+			     (2083 * (3 + BitStuffTime(bytecount)))) / 1000 +
-+			    HS_HOST_DELAY;
-+		}
-+		break;
-+	case USB_SPEED_FULL:
-+		if (is_isoc) {
-+			retval =
-+			    (8354 * (31 + 10 * BitStuffTime(bytecount))) / 1000;
-+			if (is_in) {
-+				retval = 7268 + FS_LS_HOST_DELAY + retval;
-+			} else {
-+				retval = 6265 + FS_LS_HOST_DELAY + retval;
-+			}
-+		} else {
-+			retval =
-+			    (8354 * (31 + 10 * BitStuffTime(bytecount))) / 1000;
-+			retval = 9107 + FS_LS_HOST_DELAY + retval;
-+		}
-+		break;
-+	case USB_SPEED_LOW:
-+		if (is_in) {
-+			retval =
-+			    (67667 * (31 + 10 * BitStuffTime(bytecount))) /
-+			    1000;
-+			retval =
-+			    64060 + (2 * HUB_LS_SETUP) + FS_LS_HOST_DELAY +
-+			    retval;
-+		} else {
-+			retval =
-+			    (66700 * (31 + 10 * BitStuffTime(bytecount))) /
-+			    1000;
-+			retval =
-+			    64107 + (2 * HUB_LS_SETUP) + FS_LS_HOST_DELAY +
-+			    retval;
-+		}
-+		break;
-+	default:
-+		DWC_WARN("Unknown device speed\n");
-+		retval = -1;
-+	}
-+
-+	return NS_TO_US(retval);
-+}
-+
-+/**
-+ * Initializes a QH structure.
-+ *
-+ * @param hcd The HCD state structure for the DWC OTG controller.
-+ * @param qh  The QH to init.
-+ * @param urb Holds the information about the device/endpoint that we need
-+ * 	      to initialize the QH.
-+ */
-+#define SCHEDULE_SLOP 10
-+void qh_init(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh, dwc_otg_hcd_urb_t * urb)
-+{
-+	char *speed, *type;
-+	int dev_speed;
-+	uint32_t hub_addr, hub_port;
-+	hprt0_data_t hprt;
-+
-+	dwc_memset(qh, 0, sizeof(dwc_otg_qh_t));
-+	hprt.d32 = DWC_READ_REG32(hcd->core_if->host_if->hprt0);
-+
-+	/* Initialize QH */
-+	qh->ep_type = dwc_otg_hcd_get_pipe_type(&urb->pipe_info);
-+	qh->ep_is_in = dwc_otg_hcd_is_pipe_in(&urb->pipe_info) ? 1 : 0;
-+
-+	qh->data_toggle = DWC_OTG_HC_PID_DATA0;
-+	qh->maxp = dwc_otg_hcd_get_mps(&urb->pipe_info);
-+	DWC_CIRCLEQ_INIT(&qh->qtd_list);
-+	DWC_LIST_INIT(&qh->qh_list_entry);
-+	qh->channel = NULL;
-+
-+	/* FS/LS Enpoint on HS Hub
-+	 * NOT virtual root hub */
-+	dev_speed = hcd->fops->speed(hcd, urb->priv);
-+
-+	hcd->fops->hub_info(hcd, urb->priv, &hub_addr, &hub_port);
-+	qh->do_split = 0;
-+	if (microframe_schedule)
-+		qh->speed = dev_speed;
-+
-+	qh->nak_frame = 0xffff;
-+
-+	if (hprt.b.prtspd == DWC_HPRT0_PRTSPD_HIGH_SPEED &&
-+			dev_speed != USB_SPEED_HIGH) {
-+		DWC_DEBUGPL(DBG_HCD,
-+			    "QH init: EP %d: TT found at hub addr %d, for port %d\n",
-+			    dwc_otg_hcd_get_ep_num(&urb->pipe_info), hub_addr,
-+			    hub_port);
-+		qh->do_split = 1;
-+		qh->skip_count = 0;
-+	}
-+
-+	if (qh->ep_type == UE_INTERRUPT || qh->ep_type == UE_ISOCHRONOUS) {
-+		/* Compute scheduling parameters once and save them. */
-+
-+		/** @todo Account for split transfers in the bus time. */
-+		int bytecount =
-+		    dwc_hb_mult(qh->maxp) * dwc_max_packet(qh->maxp);
-+
-+		qh->usecs =
-+		    calc_bus_time((qh->do_split ? USB_SPEED_HIGH : dev_speed),
-+				  qh->ep_is_in, (qh->ep_type == UE_ISOCHRONOUS),
-+				  bytecount);
-+		/* Start in a slightly future (micro)frame. */
-+		qh->sched_frame = dwc_frame_num_inc(hcd->frame_number,
-+						    SCHEDULE_SLOP);
-+		qh->interval = urb->interval;
-+
-+		if (hprt.b.prtspd == DWC_HPRT0_PRTSPD_HIGH_SPEED) {
-+			if (dev_speed == USB_SPEED_LOW ||
-+					dev_speed == USB_SPEED_FULL) {
-+				qh->interval *= 8;
-+				qh->sched_frame |= 0x7;
-+				qh->start_split_frame = qh->sched_frame;
-+			} else if (int_ep_interval_min >= 2 &&
-+					qh->interval < int_ep_interval_min &&
-+					qh->ep_type == UE_INTERRUPT) {
-+				qh->interval = int_ep_interval_min;
-+			}
-+		}
-+	}
-+
-+	DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD QH Initialized\n");
-+	DWC_DEBUGPL(DBG_HCDV, "DWC OTG HCD QH  - qh = %p\n", qh);
-+	DWC_DEBUGPL(DBG_HCDV, "DWC OTG HCD QH  - Device Address = %d\n",
-+		    dwc_otg_hcd_get_dev_addr(&urb->pipe_info));
-+	DWC_DEBUGPL(DBG_HCDV, "DWC OTG HCD QH  - Endpoint %d, %s\n",
-+		    dwc_otg_hcd_get_ep_num(&urb->pipe_info),
-+		    dwc_otg_hcd_is_pipe_in(&urb->pipe_info) ? "IN" : "OUT");
-+	switch (dev_speed) {
-+	case USB_SPEED_LOW:
-+		qh->dev_speed = DWC_OTG_EP_SPEED_LOW;
-+		speed = "low";
-+		break;
-+	case USB_SPEED_FULL:
-+		qh->dev_speed = DWC_OTG_EP_SPEED_FULL;
-+		speed = "full";
-+		break;
-+	case USB_SPEED_HIGH:
-+		qh->dev_speed = DWC_OTG_EP_SPEED_HIGH;
-+		speed = "high";
-+		break;
-+	default:
-+		speed = "?";
-+		break;
-+	}
-+	DWC_DEBUGPL(DBG_HCDV, "DWC OTG HCD QH  - Speed = %s\n", speed);
-+
-+	switch (qh->ep_type) {
-+	case UE_ISOCHRONOUS:
-+		type = "isochronous";
-+		break;
-+	case UE_INTERRUPT:
-+		type = "interrupt";
-+		break;
-+	case UE_CONTROL:
-+		type = "control";
-+		break;
-+	case UE_BULK:
-+		type = "bulk";
-+		break;
-+	default:
-+		type = "?";
-+		break;
-+	}
-+
-+	DWC_DEBUGPL(DBG_HCDV, "DWC OTG HCD QH  - Type = %s\n", type);
-+
-+#ifdef DEBUG
-+	if (qh->ep_type == UE_INTERRUPT) {
-+		DWC_DEBUGPL(DBG_HCDV, "DWC OTG HCD QH - usecs = %d\n",
-+			    qh->usecs);
-+		DWC_DEBUGPL(DBG_HCDV, "DWC OTG HCD QH - interval = %d\n",
-+			    qh->interval);
-+	}
-+#endif
-+
-+}
-+
-+/**
-+ * This function allocates and initializes a QH.
-+ *
-+ * @param hcd The HCD state structure for the DWC OTG controller.
-+ * @param urb Holds the information about the device/endpoint that we need
-+ * 	      to initialize the QH.
-+ * @param atomic_alloc Flag to do atomic allocation if needed
-+ *
-+ * @return Returns pointer to the newly allocated QH, or NULL on error. */
-+dwc_otg_qh_t *dwc_otg_hcd_qh_create(dwc_otg_hcd_t * hcd,
-+				    dwc_otg_hcd_urb_t * urb, int atomic_alloc)
-+{
-+	dwc_otg_qh_t *qh;
-+
-+	/* Allocate memory */
-+	/** @todo add memflags argument */
-+	qh = dwc_otg_hcd_qh_alloc(atomic_alloc);
-+	if (qh == NULL) {
-+		DWC_ERROR("qh allocation failed");
-+		return NULL;
-+	}
-+
-+	qh_init(hcd, qh, urb);
-+
-+	if (hcd->core_if->dma_desc_enable
-+	    && (dwc_otg_hcd_qh_init_ddma(hcd, qh) < 0)) {
-+		dwc_otg_hcd_qh_free(hcd, qh);
-+		return NULL;
-+	}
-+
-+	return qh;
-+}
-+
-+/* microframe_schedule=0 start */
-+
-+/**
-+ * Checks that a channel is available for a periodic transfer.
-+ *
-+ * @return 0 if successful, negative error code otherise.
-+ */
-+static int periodic_channel_available(dwc_otg_hcd_t * hcd)
-+{
-+	/*
-+	 * Currently assuming that there is a dedicated host channnel for each
-+	 * periodic transaction plus at least one host channel for
-+	 * non-periodic transactions.
-+	 */
-+	int status;
-+	int num_channels;
-+
-+	num_channels = hcd->core_if->core_params->host_channels;
-+	if ((hcd->periodic_channels + hcd->non_periodic_channels < num_channels)
-+	    && (hcd->periodic_channels < num_channels - 1)) {
-+		status = 0;
-+	} else {
-+		DWC_INFO("%s: Total channels: %d, Periodic: %d, Non-periodic: %d\n",
-+			__func__, num_channels, hcd->periodic_channels, hcd->non_periodic_channels);	//NOTICE
-+		status = -DWC_E_NO_SPACE;
-+	}
-+
-+	return status;
-+}
-+
-+/**
-+ * Checks that there is sufficient bandwidth for the specified QH in the
-+ * periodic schedule. For simplicity, this calculation assumes that all the
-+ * transfers in the periodic schedule may occur in the same (micro)frame.
-+ *
-+ * @param hcd The HCD state structure for the DWC OTG controller.
-+ * @param qh QH containing periodic bandwidth required.
-+ *
-+ * @return 0 if successful, negative error code otherwise.
-+ */
-+static int check_periodic_bandwidth(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh)
-+{
-+	int status;
-+	int16_t max_claimed_usecs;
-+
-+	status = 0;
-+
-+	if ((qh->dev_speed == DWC_OTG_EP_SPEED_HIGH) || qh->do_split) {
-+		/*
-+		 * High speed mode.
-+		 * Max periodic usecs is 80% x 125 usec = 100 usec.
-+		 */
-+
-+		max_claimed_usecs = 100 - qh->usecs;
-+	} else {
-+		/*
-+		 * Full speed mode.
-+		 * Max periodic usecs is 90% x 1000 usec = 900 usec.
-+		 */
-+		max_claimed_usecs = 900 - qh->usecs;
-+	}
-+
-+	if (hcd->periodic_usecs > max_claimed_usecs) {
-+		DWC_INFO("%s: already claimed usecs %d, required usecs %d\n", __func__, hcd->periodic_usecs, qh->usecs);	//NOTICE
-+		status = -DWC_E_NO_SPACE;
-+	}
-+
-+	return status;
-+}
-+
-+/* microframe_schedule=0 end */
-+
-+/**
-+ * Microframe scheduler
-+ * track the total use in hcd->frame_usecs
-+ * keep each qh use in qh->frame_usecs
-+ * when surrendering the qh then donate the time back
-+ */
-+const unsigned short max_uframe_usecs[]={ 100, 100, 100, 100, 100, 100, 30, 0 };
-+
-+/*
-+ * called from dwc_otg_hcd.c:dwc_otg_hcd_init
-+ */
-+void init_hcd_usecs(dwc_otg_hcd_t *_hcd)
-+{
-+	int i;
-+	if (_hcd->flags.b.port_speed == DWC_HPRT0_PRTSPD_FULL_SPEED) {
-+		_hcd->frame_usecs[0] = 900;
-+		for (i = 1; i < 8; i++)
-+			_hcd->frame_usecs[i] = 0;
-+	} else {
-+		for (i = 0; i < 8; i++)
-+			_hcd->frame_usecs[i] = max_uframe_usecs[i];
-+	}
-+}
-+
-+static int find_single_uframe(dwc_otg_hcd_t * _hcd, dwc_otg_qh_t * _qh)
-+{
-+	int i;
-+	unsigned short utime;
-+	int t_left;
-+	int ret;
-+	int done;
-+
-+	ret = -1;
-+	utime = _qh->usecs;
-+	t_left = utime;
-+	i = 0;
-+	done = 0;
-+	while (done == 0) {
-+		/* At the start _hcd->frame_usecs[i] = max_uframe_usecs[i]; */
-+		if (utime <= _hcd->frame_usecs[i]) {
-+			_hcd->frame_usecs[i] -= utime;
-+			_qh->frame_usecs[i] += utime;
-+			t_left -= utime;
-+			ret = i;
-+			done = 1;
-+			return ret;
-+		} else {
-+			i++;
-+			if (i == 8) {
-+				done = 1;
-+				ret = -1;
-+			}
-+		}
-+	}
-+	return ret;
-+ }
-+
-+/*
-+ * use this for FS apps that can span multiple uframes
-+  */
-+static int find_multi_uframe(dwc_otg_hcd_t * _hcd, dwc_otg_qh_t * _qh)
-+{
-+	int i;
-+	int j;
-+	unsigned short utime;
-+	int t_left;
-+	int ret;
-+	int done;
-+	unsigned short xtime;
-+
-+	ret = -1;
-+	utime = _qh->usecs;
-+	t_left = utime;
-+	i = 0;
-+	done = 0;
-+loop:
-+	while (done == 0) {
-+		if(_hcd->frame_usecs[i] <= 0) {
-+			i++;
-+			if (i == 8) {
-+				done = 1;
-+				ret = -1;
-+			}
-+			goto loop;
-+		}
-+
-+		/*
-+		 * we need n consecutive slots
-+		 * so use j as a start slot j plus j+1 must be enough time (for now)
-+		 */
-+		xtime= _hcd->frame_usecs[i];
-+		for (j = i+1 ; j < 8 ; j++ ) {
-+                       /*
-+                        * if we add this frame remaining time to xtime we may
-+                        * be OK, if not we need to test j for a complete frame
-+                        */
-+                       if ((xtime+_hcd->frame_usecs[j]) < utime) {
-+                               if (_hcd->frame_usecs[j] < max_uframe_usecs[j]) {
-+                                       j = 8;
-+                                       ret = -1;
-+                                       continue;
-+                               }
-+                       }
-+                       if (xtime >= utime) {
-+                               ret = i;
-+                               j = 8;  /* stop loop with a good value ret */
-+                               continue;
-+                       }
-+                       /* add the frame time to x time */
-+                       xtime += _hcd->frame_usecs[j];
-+		       /* we must have a fully available next frame or break */
-+		       if ((xtime < utime)
-+				       && (_hcd->frame_usecs[j] == max_uframe_usecs[j])) {
-+			       ret = -1;
-+			       j = 8;  /* stop loop with a bad value ret */
-+			       continue;
-+		       }
-+		}
-+		if (ret >= 0) {
-+			t_left = utime;
-+			for (j = i; (t_left>0) && (j < 8); j++ ) {
-+				t_left -= _hcd->frame_usecs[j];
-+				if ( t_left <= 0 ) {
-+					_qh->frame_usecs[j] += _hcd->frame_usecs[j] + t_left;
-+					_hcd->frame_usecs[j]= -t_left;
-+					ret = i;
-+					done = 1;
-+				} else {
-+					_qh->frame_usecs[j] += _hcd->frame_usecs[j];
-+					_hcd->frame_usecs[j] = 0;
-+				}
-+			}
-+		} else {
-+			i++;
-+			if (i == 8) {
-+				done = 1;
-+				ret = -1;
-+			}
-+		}
-+	}
-+	return ret;
-+}
-+
-+static int find_uframe(dwc_otg_hcd_t * _hcd, dwc_otg_qh_t * _qh)
-+{
-+	int ret;
-+	ret = -1;
-+
-+	if (_qh->speed == USB_SPEED_HIGH ||
-+		_hcd->flags.b.port_speed == DWC_HPRT0_PRTSPD_FULL_SPEED) {
-+		/* if this is a hs transaction we need a full frame - or account for FS usecs */
-+		ret = find_single_uframe(_hcd, _qh);
-+	} else {
-+		/* if this is a fs transaction we may need a sequence of frames */
-+		ret = find_multi_uframe(_hcd, _qh);
-+	}
-+	return ret;
-+}
-+
-+/**
-+ * Checks that the max transfer size allowed in a host channel is large enough
-+ * to handle the maximum data transfer in a single (micro)frame for a periodic
-+ * transfer.
-+ *
-+ * @param hcd The HCD state structure for the DWC OTG controller.
-+ * @param qh QH for a periodic endpoint.
-+ *
-+ * @return 0 if successful, negative error code otherwise.
-+ */
-+static int check_max_xfer_size(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh)
-+{
-+	int status;
-+	uint32_t max_xfer_size;
-+	uint32_t max_channel_xfer_size;
-+
-+	status = 0;
-+
-+	max_xfer_size = dwc_max_packet(qh->maxp) * dwc_hb_mult(qh->maxp);
-+	max_channel_xfer_size = hcd->core_if->core_params->max_transfer_size;
-+
-+	if (max_xfer_size > max_channel_xfer_size) {
-+		DWC_INFO("%s: Periodic xfer length %d > " "max xfer length for channel %d\n",
-+				__func__, max_xfer_size, max_channel_xfer_size);	//NOTICE
-+		status = -DWC_E_NO_SPACE;
-+	}
-+
-+	return status;
-+}
-+
-+
-+
-+/**
-+ * Schedules an interrupt or isochronous transfer in the periodic schedule.
-+ *
-+ * @param hcd The HCD state structure for the DWC OTG controller.
-+ * @param qh QH for the periodic transfer. The QH should already contain the
-+ * scheduling information.
-+ *
-+ * @return 0 if successful, negative error code otherwise.
-+ */
-+static int schedule_periodic(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh)
-+{
-+	int status = 0;
-+
-+	if (microframe_schedule) {
-+		int frame;
-+		status = find_uframe(hcd, qh);
-+		frame = -1;
-+		if (status == 0) {
-+			frame = 7;
-+		} else {
-+			if (status > 0 )
-+				frame = status-1;
-+		}
-+
-+		/* Set the new frame up */
-+		if (frame > -1) {
-+			qh->sched_frame &= ~0x7;
-+			qh->sched_frame |= (frame & 7);
-+		}
-+
-+		if (status != -1)
-+			status = 0;
-+	} else {
-+		status = periodic_channel_available(hcd);
-+		if (status) {
-+			DWC_INFO("%s: No host channel available for periodic " "transfer.\n", __func__);	//NOTICE
-+			return status;
-+		}
-+
-+		status = check_periodic_bandwidth(hcd, qh);
-+	}
-+	if (status) {
-+		DWC_INFO("%s: Insufficient periodic bandwidth for "
-+			    "periodic transfer.\n", __func__);
-+		return -DWC_E_NO_SPACE;
-+	}
-+	status = check_max_xfer_size(hcd, qh);
-+	if (status) {
-+		DWC_INFO("%s: Channel max transfer size too small "
-+			    "for periodic transfer.\n", __func__);
-+		return status;
-+	}
-+
-+	if (hcd->core_if->dma_desc_enable) {
-+		/* Don't rely on SOF and start in ready schedule */
-+		DWC_LIST_INSERT_TAIL(&hcd->periodic_sched_ready, &qh->qh_list_entry);
-+	}
-+	else {
-+		if(fiq_enable && (DWC_LIST_EMPTY(&hcd->periodic_sched_inactive) || dwc_frame_num_le(qh->sched_frame, hcd->fiq_state->next_sched_frame)))
-+		{
-+			hcd->fiq_state->next_sched_frame = qh->sched_frame;
-+
-+		}
-+		/* Always start in the inactive schedule. */
-+		DWC_LIST_INSERT_TAIL(&hcd->periodic_sched_inactive, &qh->qh_list_entry);
-+	}
-+
-+	if (!microframe_schedule) {
-+		/* Reserve the periodic channel. */
-+		hcd->periodic_channels++;
-+	}
-+
-+	/* Update claimed usecs per (micro)frame. */
-+	hcd->periodic_usecs += qh->usecs;
-+
-+	return status;
-+}
-+
-+
-+/**
-+ * This function adds a QH to either the non periodic or periodic schedule if
-+ * it is not already in the schedule. If the QH is already in the schedule, no
-+ * action is taken.
-+ *
-+ * @return 0 if successful, negative error code otherwise.
-+ */
-+int dwc_otg_hcd_qh_add(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh)
-+{
-+	int status = 0;
-+	gintmsk_data_t intr_mask = {.d32 = 0 };
-+
-+	if (!DWC_LIST_EMPTY(&qh->qh_list_entry)) {
-+		/* QH already in a schedule. */
-+		return status;
-+	}
-+
-+	/* Add the new QH to the appropriate schedule */
-+	if (dwc_qh_is_non_per(qh)) {
-+		/* Always start in the inactive schedule. */
-+		DWC_LIST_INSERT_TAIL(&hcd->non_periodic_sched_inactive,
-+				     &qh->qh_list_entry);
-+		//hcd->fiq_state->kick_np_queues = 1;
-+	} else {
-+		/* If the QH wasn't in a schedule, then sched_frame is stale. */
-+		qh->sched_frame = dwc_frame_num_inc(dwc_otg_hcd_get_frame_number(hcd),
-+						    max_t(uint32_t, qh->interval, SCHEDULE_SLOP));
-+		status = schedule_periodic(hcd, qh);
-+		qh->start_split_frame = qh->sched_frame;
-+		if ( !hcd->periodic_qh_count ) {
-+			intr_mask.b.sofintr = 1;
-+			if (fiq_enable) {
-+				local_fiq_disable();
-+				fiq_fsm_spin_lock(&hcd->fiq_state->lock);
-+				DWC_MODIFY_REG32(&hcd->core_if->core_global_regs->gintmsk, intr_mask.d32, intr_mask.d32);
-+				fiq_fsm_spin_unlock(&hcd->fiq_state->lock);
-+				local_fiq_enable();
-+			} else {
-+				DWC_MODIFY_REG32(&hcd->core_if->core_global_regs->gintmsk, intr_mask.d32, intr_mask.d32);
-+			}
-+		}
-+		hcd->periodic_qh_count++;
-+	}
-+
-+	return status;
-+}
-+
-+/**
-+ * Removes an interrupt or isochronous transfer from the periodic schedule.
-+ *
-+ * @param hcd The HCD state structure for the DWC OTG controller.
-+ * @param qh QH for the periodic transfer.
-+ */
-+static void deschedule_periodic(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh)
-+{
-+	int i;
-+	DWC_LIST_REMOVE_INIT(&qh->qh_list_entry);
-+
-+	/* Update claimed usecs per (micro)frame. */
-+	hcd->periodic_usecs -= qh->usecs;
-+
-+	if (!microframe_schedule) {
-+		/* Release the periodic channel reservation. */
-+		hcd->periodic_channels--;
-+	} else {
-+		for (i = 0; i < 8; i++) {
-+			hcd->frame_usecs[i] += qh->frame_usecs[i];
-+			qh->frame_usecs[i] = 0;
-+		}
-+	}
-+}
-+
-+/**
-+ * Removes a QH from either the non-periodic or periodic schedule.  Memory is
-+ * not freed.
-+ *
-+ * @param hcd The HCD state structure.
-+ * @param qh QH to remove from schedule. */
-+void dwc_otg_hcd_qh_remove(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh)
-+{
-+	gintmsk_data_t intr_mask = {.d32 = 0 };
-+
-+	if (DWC_LIST_EMPTY(&qh->qh_list_entry)) {
-+		/* QH is not in a schedule. */
-+		return;
-+	}
-+
-+	if (dwc_qh_is_non_per(qh)) {
-+		if (hcd->non_periodic_qh_ptr == &qh->qh_list_entry) {
-+			hcd->non_periodic_qh_ptr =
-+			    hcd->non_periodic_qh_ptr->next;
-+		}
-+		DWC_LIST_REMOVE_INIT(&qh->qh_list_entry);
-+		//if (!DWC_LIST_EMPTY(&hcd->non_periodic_sched_inactive))
-+		//	hcd->fiq_state->kick_np_queues = 1;
-+	} else {
-+		deschedule_periodic(hcd, qh);
-+		hcd->periodic_qh_count--;
-+		if( !hcd->periodic_qh_count && !fiq_fsm_enable ) {
-+			intr_mask.b.sofintr = 1;
-+			if (fiq_enable) {
-+				local_fiq_disable();
-+				fiq_fsm_spin_lock(&hcd->fiq_state->lock);
-+				DWC_MODIFY_REG32(&hcd->core_if->core_global_regs->gintmsk, intr_mask.d32, 0);
-+				fiq_fsm_spin_unlock(&hcd->fiq_state->lock);
-+				local_fiq_enable();
-+			} else {
-+				DWC_MODIFY_REG32(&hcd->core_if->core_global_regs->gintmsk, intr_mask.d32, 0);
-+			}
-+		}
-+	}
-+}
-+
-+/**
-+ * Deactivates a QH. For non-periodic QHs, removes the QH from the active
-+ * non-periodic schedule. The QH is added to the inactive non-periodic
-+ * schedule if any QTDs are still attached to the QH.
-+ *
-+ * For periodic QHs, the QH is removed from the periodic queued schedule. If
-+ * there are any QTDs still attached to the QH, the QH is added to either the
-+ * periodic inactive schedule or the periodic ready schedule and its next
-+ * scheduled frame is calculated. The QH is placed in the ready schedule if
-+ * the scheduled frame has been reached already. Otherwise it's placed in the
-+ * inactive schedule. If there are no QTDs attached to the QH, the QH is
-+ * completely removed from the periodic schedule.
-+ */
-+void dwc_otg_hcd_qh_deactivate(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh,
-+			       int sched_next_periodic_split)
-+{
-+	if (dwc_qh_is_non_per(qh)) {
-+		dwc_otg_hcd_qh_remove(hcd, qh);
-+		if (!DWC_CIRCLEQ_EMPTY(&qh->qtd_list)) {
-+			/* Add back to inactive non-periodic schedule. */
-+			dwc_otg_hcd_qh_add(hcd, qh);
-+			//hcd->fiq_state->kick_np_queues = 1;
-+		} else {
-+			if(nak_holdoff && qh->do_split) {
-+				qh->nak_frame = 0xFFFF;
-+			}
-+		}
-+	} else {
-+		uint16_t frame_number = dwc_otg_hcd_get_frame_number(hcd);
-+
-+		if (qh->do_split) {
-+			/* Schedule the next continuing periodic split transfer */
-+			if (sched_next_periodic_split) {
-+
-+				qh->sched_frame = frame_number;
-+
-+				if (dwc_frame_num_le(frame_number,
-+						     dwc_frame_num_inc
-+						     (qh->start_split_frame,
-+						      1))) {
-+					/*
-+					 * Allow one frame to elapse after start
-+					 * split microframe before scheduling
-+					 * complete split, but DONT if we are
-+					 * doing the next start split in the
-+					 * same frame for an ISOC out.
-+					 */
-+					if ((qh->ep_type != UE_ISOCHRONOUS) ||
-+					    (qh->ep_is_in != 0)) {
-+						qh->sched_frame =
-+						    dwc_frame_num_inc(qh->sched_frame, 1);
-+					}
-+				}
-+			} else {
-+				qh->sched_frame =
-+				    dwc_frame_num_inc(qh->start_split_frame,
-+						      qh->interval);
-+				if (dwc_frame_num_le
-+				    (qh->sched_frame, frame_number)) {
-+					qh->sched_frame = frame_number;
-+				}
-+				qh->sched_frame |= 0x7;
-+				qh->start_split_frame = qh->sched_frame;
-+			}
-+		} else {
-+			qh->sched_frame =
-+			    dwc_frame_num_inc(qh->sched_frame, qh->interval);
-+			if (dwc_frame_num_le(qh->sched_frame, frame_number)) {
-+				qh->sched_frame = frame_number;
-+			}
-+		}
-+
-+		if (DWC_CIRCLEQ_EMPTY(&qh->qtd_list)) {
-+			dwc_otg_hcd_qh_remove(hcd, qh);
-+		} else {
-+			/*
-+			 * Remove from periodic_sched_queued and move to
-+			 * appropriate queue.
-+			 */
-+			if ((microframe_schedule && dwc_frame_num_le(qh->sched_frame, frame_number)) ||
-+			(!microframe_schedule && qh->sched_frame == frame_number)) {
-+				DWC_LIST_MOVE_HEAD(&hcd->periodic_sched_ready,
-+						   &qh->qh_list_entry);
-+			} else {
-+				if(fiq_enable && !dwc_frame_num_le(hcd->fiq_state->next_sched_frame, qh->sched_frame))
-+				{
-+					hcd->fiq_state->next_sched_frame = qh->sched_frame;
-+				}
-+
-+				DWC_LIST_MOVE_HEAD
-+				    (&hcd->periodic_sched_inactive,
-+				     &qh->qh_list_entry);
-+			}
-+		}
-+	}
-+}
-+
-+/**
-+ * This function allocates and initializes a QTD.
-+ *
-+ * @param urb The URB to create a QTD from.  Each URB-QTD pair will end up
-+ * 	      pointing to each other so each pair should have a unique correlation.
-+ * @param atomic_alloc Flag to do atomic alloc if needed
-+ *
-+ * @return Returns pointer to the newly allocated QTD, or NULL on error. */
-+dwc_otg_qtd_t *dwc_otg_hcd_qtd_create(dwc_otg_hcd_urb_t * urb, int atomic_alloc)
-+{
-+	dwc_otg_qtd_t *qtd;
-+
-+	qtd = dwc_otg_hcd_qtd_alloc(atomic_alloc);
-+	if (qtd == NULL) {
-+		return NULL;
-+	}
-+
-+	dwc_otg_hcd_qtd_init(qtd, urb);
-+	return qtd;
-+}
-+
-+/**
-+ * Initializes a QTD structure.
-+ *
-+ * @param qtd The QTD to initialize.
-+ * @param urb The URB to use for initialization.  */
-+void dwc_otg_hcd_qtd_init(dwc_otg_qtd_t * qtd, dwc_otg_hcd_urb_t * urb)
-+{
-+	dwc_memset(qtd, 0, sizeof(dwc_otg_qtd_t));
-+	qtd->urb = urb;
-+	if (dwc_otg_hcd_get_pipe_type(&urb->pipe_info) == UE_CONTROL) {
-+		/*
-+		 * The only time the QTD data toggle is used is on the data
-+		 * phase of control transfers. This phase always starts with
-+		 * DATA1.
-+		 */
-+		qtd->data_toggle = DWC_OTG_HC_PID_DATA1;
-+		qtd->control_phase = DWC_OTG_CONTROL_SETUP;
-+	}
-+
-+	/* start split */
-+	qtd->complete_split = 0;
-+	qtd->isoc_split_pos = DWC_HCSPLIT_XACTPOS_ALL;
-+	qtd->isoc_split_offset = 0;
-+	qtd->in_process = 0;
-+
-+	/* Store the qtd ptr in the urb to reference what QTD. */
-+	urb->qtd = qtd;
-+	return;
-+}
-+
-+/**
-+ * This function adds a QTD to the QTD-list of a QH.  It will find the correct
-+ * QH to place the QTD into.  If it does not find a QH, then it will create a
-+ * new QH. If the QH to which the QTD is added is not currently scheduled, it
-+ * is placed into the proper schedule based on its EP type.
-+ * HCD lock must be held and interrupts must be disabled on entry
-+ *
-+ * @param[in] qtd The QTD to add
-+ * @param[in] hcd The DWC HCD structure
-+ * @param[out] qh out parameter to return queue head
-+ * @param atomic_alloc Flag to do atomic alloc if needed
-+ *
-+ * @return 0 if successful, negative error code otherwise.
-+ */
-+int dwc_otg_hcd_qtd_add(dwc_otg_qtd_t * qtd,
-+			dwc_otg_hcd_t * hcd, dwc_otg_qh_t ** qh, int atomic_alloc)
-+{
-+	int retval = 0;
-+	dwc_otg_hcd_urb_t *urb = qtd->urb;
-+
-+	/*
-+	 * Get the QH which holds the QTD-list to insert to. Create QH if it
-+	 * doesn't exist.
-+	 */
-+	if (*qh == NULL) {
-+		*qh = dwc_otg_hcd_qh_create(hcd, urb, atomic_alloc);
-+		if (*qh == NULL) {
-+			retval = -DWC_E_NO_MEMORY;
-+			goto done;
-+		} else {
-+			if (fiq_enable)
-+				hcd->fiq_state->kick_np_queues = 1;
-+		}
-+	}
-+	retval = dwc_otg_hcd_qh_add(hcd, *qh);
-+	if (retval == 0) {
-+		DWC_CIRCLEQ_INSERT_TAIL(&((*qh)->qtd_list), qtd,
-+					qtd_list_entry);
-+		qtd->qh = *qh;
-+	}
-+done:
-+
-+	return retval;
-+}
-+
-+#endif /* DWC_DEVICE_ONLY */
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h
-@@ -0,0 +1,200 @@
-+#ifndef _DWC_OS_DEP_H_
-+#define _DWC_OS_DEP_H_
-+
-+/**
-+ * @file
-+ *
-+ * This file contains OS dependent structures.
-+ *
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/moduleparam.h>
-+#include <linux/init.h>
-+#include <linux/device.h>
-+#include <linux/errno.h>
-+#include <linux/types.h>
-+#include <linux/slab.h>
-+#include <linux/list.h>
-+#include <linux/interrupt.h>
-+#include <linux/ctype.h>
-+#include <linux/string.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/jiffies.h>
-+#include <linux/delay.h>
-+#include <linux/timer.h>
-+#include <linux/workqueue.h>
-+#include <linux/stat.h>
-+#include <linux/pci.h>
-+#include <linux/compiler.h>
-+
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
-+# include <linux/irq.h>
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
-+# include <linux/usb/ch9.h>
-+#else
-+# include <linux/usb_ch9.h>
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
-+# include <linux/usb/gadget.h>
-+#else
-+# include <linux/usb_gadget.h>
-+#endif
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-+# include <asm/irq.h>
-+#endif
-+
-+#ifdef PCI_INTERFACE
-+# include <asm/io.h>
-+#endif
-+
-+#ifdef LM_INTERFACE
-+# include <asm/unaligned.h>
-+# include <asm/sizes.h>
-+# include <asm/param.h>
-+# include <asm/io.h>
-+# if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30))
-+#  include <asm/arch/hardware.h>
-+#  include <asm/arch/lm.h>
-+#  include <asm/arch/irqs.h>
-+#  include <asm/arch/regs-irq.h>
-+# else
-+/* in 2.6.31, at least, we seem to have lost the generic LM infrastructure -
-+   here we assume that the machine architecture provides definitions
-+   in its own header
-+*/
-+#  include <mach/lm.h>
-+#  include <mach/hardware.h>
-+# endif
-+#endif
-+
-+#ifdef PLATFORM_INTERFACE
-+#include <linux/platform_device.h>
-+#ifdef CONFIG_ARM
-+#include <asm/mach/map.h>
-+#endif
-+#endif
-+
-+/** The OS page size */
-+#define DWC_OS_PAGE_SIZE	PAGE_SIZE
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
-+typedef int gfp_t;
-+#endif
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
-+# define IRQF_SHARED SA_SHIRQ
-+#endif
-+
-+typedef struct os_dependent {
-+	/** Base address returned from ioremap() */
-+	void *base;
-+
-+	/** Register offset for Diagnostic API */
-+	uint32_t reg_offset;
-+
-+	/** Base address for MPHI peripheral */
-+	void *mphi_base;
-+
-+	/** mphi_base actually points to the SWIRQ block */
-+	bool use_swirq;
-+
-+	/** IRQ number (<0 if not valid) */
-+	int irq_num;
-+
-+	/** FIQ number (<0 if not valid) */
-+	int fiq_num;
-+
-+#ifdef LM_INTERFACE
-+	struct lm_device *lmdev;
-+#elif  defined(PCI_INTERFACE)
-+	struct pci_dev *pcidev;
-+
-+	/** Start address of a PCI region */
-+	resource_size_t rsrc_start;
-+
-+	/** Length address of a PCI region */
-+	resource_size_t rsrc_len;
-+#elif  defined(PLATFORM_INTERFACE)
-+	struct platform_device *platformdev;
-+#endif
-+
-+} os_dependent_t;
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+
-+
-+/* Type for the our device on the chosen bus */
-+#if   defined(LM_INTERFACE)
-+typedef struct lm_device       dwc_bus_dev_t;
-+#elif defined(PCI_INTERFACE)
-+typedef struct pci_dev         dwc_bus_dev_t;
-+#elif defined(PLATFORM_INTERFACE)
-+typedef struct platform_device dwc_bus_dev_t;
-+#endif
-+
-+/* Helper macro to retrieve drvdata from the device on the chosen bus */
-+#if    defined(LM_INTERFACE)
-+#define DWC_OTG_BUSDRVDATA(_dev) lm_get_drvdata(_dev)
-+#elif  defined(PCI_INTERFACE)
-+#define DWC_OTG_BUSDRVDATA(_dev) pci_get_drvdata(_dev)
-+#elif  defined(PLATFORM_INTERFACE)
-+#define DWC_OTG_BUSDRVDATA(_dev) platform_get_drvdata(_dev)
-+#endif
-+
-+/**
-+ * Helper macro returning the otg_device structure of a given struct device
-+ *
-+ * c.f. static dwc_otg_device_t *dwc_otg_drvdev(struct device *_dev)
-+ */
-+#ifdef LM_INTERFACE
-+#define DWC_OTG_GETDRVDEV(_var, _dev) do { \
-+                struct lm_device *lm_dev = \
-+                        container_of(_dev, struct lm_device, dev); \
-+                _var = lm_get_drvdata(lm_dev); \
-+        } while (0)
-+
-+#elif defined(PCI_INTERFACE)
-+#define DWC_OTG_GETDRVDEV(_var, _dev) do { \
-+                _var = dev_get_drvdata(_dev); \
-+        } while (0)
-+
-+#elif defined(PLATFORM_INTERFACE)
-+#define DWC_OTG_GETDRVDEV(_var, _dev) do { \
-+                struct platform_device *platform_dev = \
-+                        container_of(_dev, struct platform_device, dev); \
-+                _var = platform_get_drvdata(platform_dev); \
-+        } while (0)
-+#endif
-+
-+
-+/**
-+ * Helper macro returning the struct dev of the given struct os_dependent
-+ *
-+ * c.f. static struct device *dwc_otg_getdev(struct os_dependent *osdep)
-+ */
-+#ifdef LM_INTERFACE
-+#define DWC_OTG_OS_GETDEV(_osdep) \
-+        ((_osdep).lmdev == NULL? NULL: &(_osdep).lmdev->dev)
-+#elif defined(PCI_INTERFACE)
-+#define DWC_OTG_OS_GETDEV(_osdep) \
-+        ((_osdep).pci_dev == NULL? NULL: &(_osdep).pci_dev->dev)
-+#elif defined(PLATFORM_INTERFACE)
-+#define DWC_OTG_OS_GETDEV(_osdep) \
-+        ((_osdep).platformdev == NULL? NULL: &(_osdep).platformdev->dev)
-+#endif
-+
-+
-+
-+
-+#endif /* _DWC_OS_DEP_H_ */
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd.c
-@@ -0,0 +1,2725 @@
-+/* ==========================================================================
-+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.c $
-+ * $Revision: #101 $
-+ * $Date: 2012/08/10 $
-+ * $Change: 2047372 $
-+ *
-+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
-+ * "Software") is an Unsupported proprietary work of Synopsys, Inc. unless
-+ * otherwise expressly agreed to in writing between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product under
-+ * any End User Software License Agreement or Agreement for Licensed Product
-+ * with Synopsys or any supplement thereto. You are permitted to use and
-+ * redistribute this Software in source and binary forms, with or without
-+ * modification, provided that redistributions of source code must retain this
-+ * notice. You may not view, use, disclose, copy or distribute this file or
-+ * any information contained herein except pursuant to this license grant from
-+ * Synopsys. If you do not agree with this notice, including the disclaimer
-+ * below, then you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" BASIS
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS BE LIABLE FOR ANY DIRECT,
-+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================== */
-+#ifndef DWC_HOST_ONLY
-+
-+/** @file
-+ * This file implements PCD Core. All code in this file is portable and doesn't
-+ * use any OS specific functions.
-+ * PCD Core provides Interface, defined in <code><dwc_otg_pcd_if.h></code>
-+ * header file, which can be used to implement OS specific PCD interface.
-+ *
-+ * An important function of the PCD is managing interrupts generated
-+ * by the DWC_otg controller. The implementation of the DWC_otg device
-+ * mode interrupt service routines is in dwc_otg_pcd_intr.c.
-+ *
-+ * @todo Add Device Mode test modes (Test J mode, Test K mode, etc).
-+ * @todo Does it work when the request size is greater than DEPTSIZ
-+ * transfer size
-+ *
-+ */
-+
-+#include "dwc_otg_pcd.h"
-+
-+#ifdef DWC_UTE_CFI
-+#include "dwc_otg_cfi.h"
-+
-+extern int init_cfi(cfiobject_t * cfiobj);
-+#endif
-+
-+/**
-+ * Choose endpoint from ep arrays using usb_ep structure.
-+ */
-+static dwc_otg_pcd_ep_t *get_ep_from_handle(dwc_otg_pcd_t * pcd, void *handle)
-+{
-+	int i;
-+	if (pcd->ep0.priv == handle) {
-+		return &pcd->ep0;
-+	}
-+	for (i = 0; i < MAX_EPS_CHANNELS - 1; i++) {
-+		if (pcd->in_ep[i].priv == handle)
-+			return &pcd->in_ep[i];
-+		if (pcd->out_ep[i].priv == handle)
-+			return &pcd->out_ep[i];
-+	}
-+
-+	return NULL;
-+}
-+
-+/**
-+ * This function completes a request.  It call's the request call back.
-+ */
-+void dwc_otg_request_done(dwc_otg_pcd_ep_t * ep, dwc_otg_pcd_request_t * req,
-+			  int32_t status)
-+{
-+	unsigned stopped = ep->stopped;
-+
-+	DWC_DEBUGPL(DBG_PCDV, "%s(ep %p req %p)\n", __func__, ep, req);
-+	DWC_CIRCLEQ_REMOVE_INIT(&ep->queue, req, queue_entry);
-+
-+	/* don't modify queue heads during completion callback */
-+	ep->stopped = 1;
-+	/* spin_unlock/spin_lock now done in fops->complete() */
-+	ep->pcd->fops->complete(ep->pcd, ep->priv, req->priv, status,
-+				req->actual);
-+
-+	if (ep->pcd->request_pending > 0) {
-+		--ep->pcd->request_pending;
-+	}
-+
-+	ep->stopped = stopped;
-+	DWC_FREE(req);
-+}
-+
-+/**
-+ * This function terminates all the requsts in the EP request queue.
-+ */
-+void dwc_otg_request_nuke(dwc_otg_pcd_ep_t * ep)
-+{
-+	dwc_otg_pcd_request_t *req;
-+
-+	ep->stopped = 1;
-+
-+	/* called with irqs blocked?? */
-+	while (!DWC_CIRCLEQ_EMPTY(&ep->queue)) {
-+		req = DWC_CIRCLEQ_FIRST(&ep->queue);
-+		dwc_otg_request_done(ep, req, -DWC_E_SHUTDOWN);
-+	}
-+}
-+
-+void dwc_otg_pcd_start(dwc_otg_pcd_t * pcd,
-+		       const struct dwc_otg_pcd_function_ops *fops)
-+{
-+	pcd->fops = fops;
-+}
-+
-+/**
-+ * PCD Callback function for initializing the PCD when switching to
-+ * device mode.
-+ *
-+ * @param p void pointer to the <code>dwc_otg_pcd_t</code>
-+ */
-+static int32_t dwc_otg_pcd_start_cb(void *p)
-+{
-+	dwc_otg_pcd_t *pcd = (dwc_otg_pcd_t *) p;
-+	dwc_otg_core_if_t *core_if = GET_CORE_IF(pcd);
-+
-+	/*
-+	 * Initialized the Core for Device mode.
-+	 */
-+	if (dwc_otg_is_device_mode(core_if)) {
-+		dwc_otg_core_dev_init(core_if);
-+		/* Set core_if's lock pointer to the pcd->lock */
-+		core_if->lock = pcd->lock;
-+	}
-+	return 1;
-+}
-+
-+/** CFI-specific buffer allocation function for EP */
-+#ifdef DWC_UTE_CFI
-+uint8_t *cfiw_ep_alloc_buffer(dwc_otg_pcd_t * pcd, void *pep, dwc_dma_t * addr,
-+			      size_t buflen, int flags)
-+{
-+	dwc_otg_pcd_ep_t *ep;
-+	ep = get_ep_from_handle(pcd, pep);
-+	if (!ep) {
-+		DWC_WARN("bad ep\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	return pcd->cfi->ops.ep_alloc_buf(pcd->cfi, pcd, ep, addr, buflen,
-+					  flags);
-+}
-+#else
-+uint8_t *cfiw_ep_alloc_buffer(dwc_otg_pcd_t * pcd, void *pep, dwc_dma_t * addr,
-+			      size_t buflen, int flags);
-+#endif
-+
-+/**
-+ * PCD Callback function for notifying the PCD when resuming from
-+ * suspend.
-+ *
-+ * @param p void pointer to the <code>dwc_otg_pcd_t</code>
-+ */
-+static int32_t dwc_otg_pcd_resume_cb(void *p)
-+{
-+	dwc_otg_pcd_t *pcd = (dwc_otg_pcd_t *) p;
-+
-+	if (pcd->fops->resume) {
-+		pcd->fops->resume(pcd);
-+	}
-+
-+	/* Stop the SRP timeout timer. */
-+	if ((GET_CORE_IF(pcd)->core_params->phy_type != DWC_PHY_TYPE_PARAM_FS)
-+	    || (!GET_CORE_IF(pcd)->core_params->i2c_enable)) {
-+		if (GET_CORE_IF(pcd)->srp_timer_started) {
-+			GET_CORE_IF(pcd)->srp_timer_started = 0;
-+			DWC_TIMER_CANCEL(GET_CORE_IF(pcd)->srp_timer);
-+		}
-+	}
-+	return 1;
-+}
-+
-+/**
-+ * PCD Callback function for notifying the PCD device is suspended.
-+ *
-+ * @param p void pointer to the <code>dwc_otg_pcd_t</code>
-+ */
-+static int32_t dwc_otg_pcd_suspend_cb(void *p)
-+{
-+	dwc_otg_pcd_t *pcd = (dwc_otg_pcd_t *) p;
-+
-+	if (pcd->fops->suspend) {
-+		DWC_SPINUNLOCK(pcd->lock);
-+		pcd->fops->suspend(pcd);
-+		DWC_SPINLOCK(pcd->lock);
-+	}
-+
-+	return 1;
-+}
-+
-+/**
-+ * PCD Callback function for stopping the PCD when switching to Host
-+ * mode.
-+ *
-+ * @param p void pointer to the <code>dwc_otg_pcd_t</code>
-+ */
-+static int32_t dwc_otg_pcd_stop_cb(void *p)
-+{
-+	dwc_otg_pcd_t *pcd = (dwc_otg_pcd_t *) p;
-+	extern void dwc_otg_pcd_stop(dwc_otg_pcd_t * _pcd);
-+
-+	dwc_otg_pcd_stop(pcd);
-+	return 1;
-+}
-+
-+/**
-+ * PCD Callback structure for handling mode switching.
-+ */
-+static dwc_otg_cil_callbacks_t pcd_callbacks = {
-+	.start = dwc_otg_pcd_start_cb,
-+	.stop = dwc_otg_pcd_stop_cb,
-+	.suspend = dwc_otg_pcd_suspend_cb,
-+	.resume_wakeup = dwc_otg_pcd_resume_cb,
-+	.p = 0,			/* Set at registration */
-+};
-+
-+/**
-+ * This function allocates a DMA Descriptor chain for the Endpoint
-+ * buffer to be used for a transfer to/from the specified endpoint.
-+ */
-+dwc_otg_dev_dma_desc_t *dwc_otg_ep_alloc_desc_chain(struct device *dev,
-+						    dwc_dma_t * dma_desc_addr,
-+						    uint32_t count)
-+{
-+	return DWC_DMA_ALLOC_ATOMIC(dev, count * sizeof(dwc_otg_dev_dma_desc_t),
-+							dma_desc_addr);
-+}
-+
-+/**
-+ * This function frees a DMA Descriptor chain that was allocated by ep_alloc_desc.
-+ */
-+void dwc_otg_ep_free_desc_chain(struct device *dev,
-+				dwc_otg_dev_dma_desc_t * desc_addr,
-+				uint32_t dma_desc_addr, uint32_t count)
-+{
-+	DWC_DMA_FREE(dev, count * sizeof(dwc_otg_dev_dma_desc_t), desc_addr,
-+		     dma_desc_addr);
-+}
-+
-+#ifdef DWC_EN_ISOC
-+
-+/**
-+ * This function initializes a descriptor chain for Isochronous transfer
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param dwc_ep The EP to start the transfer on.
-+ *
-+ */
-+void dwc_otg_iso_ep_start_ddma_transfer(dwc_otg_core_if_t * core_if,
-+					dwc_ep_t * dwc_ep)
-+{
-+
-+	dsts_data_t dsts = {.d32 = 0 };
-+	depctl_data_t depctl = {.d32 = 0 };
-+	volatile uint32_t *addr;
-+	int i, j;
-+	uint32_t len;
-+
-+	if (dwc_ep->is_in)
-+		dwc_ep->desc_cnt = dwc_ep->buf_proc_intrvl / dwc_ep->bInterval;
-+	else
-+		dwc_ep->desc_cnt =
-+		    dwc_ep->buf_proc_intrvl * dwc_ep->pkt_per_frm /
-+		    dwc_ep->bInterval;
-+
-+	/** Allocate descriptors for double buffering */
-+	dwc_ep->iso_desc_addr =
-+	    dwc_otg_ep_alloc_desc_chain(&dwc_ep->iso_dma_desc_addr,
-+					dwc_ep->desc_cnt * 2);
-+	if (dwc_ep->desc_addr) {
-+		DWC_WARN("%s, can't allocate DMA descriptor chain\n", __func__);
-+		return;
-+	}
-+
-+	dsts.d32 = DWC_READ_REG32(&core_if->dev_if->dev_global_regs->dsts);
-+
-+	/** ISO OUT EP */
-+	if (dwc_ep->is_in == 0) {
-+		dev_dma_desc_sts_t sts = {.d32 = 0 };
-+		dwc_otg_dev_dma_desc_t *dma_desc = dwc_ep->iso_desc_addr;
-+		dma_addr_t dma_ad;
-+		uint32_t data_per_desc;
-+		dwc_otg_dev_out_ep_regs_t *out_regs =
-+		    core_if->dev_if->out_ep_regs[dwc_ep->num];
-+		int offset;
-+
-+		addr = &core_if->dev_if->out_ep_regs[dwc_ep->num]->doepctl;
-+		dma_ad = (dma_addr_t) DWC_READ_REG32(&(out_regs->doepdma));
-+
-+		/** Buffer 0 descriptors setup */
-+		dma_ad = dwc_ep->dma_addr0;
-+
-+		sts.b_iso_out.bs = BS_HOST_READY;
-+		sts.b_iso_out.rxsts = 0;
-+		sts.b_iso_out.l = 0;
-+		sts.b_iso_out.sp = 0;
-+		sts.b_iso_out.ioc = 0;
-+		sts.b_iso_out.pid = 0;
-+		sts.b_iso_out.framenum = 0;
-+
-+		offset = 0;
-+		for (i = 0; i < dwc_ep->desc_cnt - dwc_ep->pkt_per_frm;
-+		     i += dwc_ep->pkt_per_frm) {
-+
-+			for (j = 0; j < dwc_ep->pkt_per_frm; ++j) {
-+				uint32_t len = (j + 1) * dwc_ep->maxpacket;
-+				if (len > dwc_ep->data_per_frame)
-+					data_per_desc =
-+					    dwc_ep->data_per_frame -
-+					    j * dwc_ep->maxpacket;
-+				else
-+					data_per_desc = dwc_ep->maxpacket;
-+				len = data_per_desc % 4;
-+				if (len)
-+					data_per_desc += 4 - len;
-+
-+				sts.b_iso_out.rxbytes = data_per_desc;
-+				dma_desc->buf = dma_ad;
-+				dma_desc->status.d32 = sts.d32;
-+
-+				offset += data_per_desc;
-+				dma_desc++;
-+				dma_ad += data_per_desc;
-+			}
-+		}
-+
-+		for (j = 0; j < dwc_ep->pkt_per_frm - 1; ++j) {
-+			uint32_t len = (j + 1) * dwc_ep->maxpacket;
-+			if (len > dwc_ep->data_per_frame)
-+				data_per_desc =
-+				    dwc_ep->data_per_frame -
-+				    j * dwc_ep->maxpacket;
-+			else
-+				data_per_desc = dwc_ep->maxpacket;
-+			len = data_per_desc % 4;
-+			if (len)
-+				data_per_desc += 4 - len;
-+			sts.b_iso_out.rxbytes = data_per_desc;
-+			dma_desc->buf = dma_ad;
-+			dma_desc->status.d32 = sts.d32;
-+
-+			offset += data_per_desc;
-+			dma_desc++;
-+			dma_ad += data_per_desc;
-+		}
-+
-+		sts.b_iso_out.ioc = 1;
-+		len = (j + 1) * dwc_ep->maxpacket;
-+		if (len > dwc_ep->data_per_frame)
-+			data_per_desc =
-+			    dwc_ep->data_per_frame - j * dwc_ep->maxpacket;
-+		else
-+			data_per_desc = dwc_ep->maxpacket;
-+		len = data_per_desc % 4;
-+		if (len)
-+			data_per_desc += 4 - len;
-+		sts.b_iso_out.rxbytes = data_per_desc;
-+
-+		dma_desc->buf = dma_ad;
-+		dma_desc->status.d32 = sts.d32;
-+		dma_desc++;
-+
-+		/** Buffer 1 descriptors setup */
-+		sts.b_iso_out.ioc = 0;
-+		dma_ad = dwc_ep->dma_addr1;
-+
-+		offset = 0;
-+		for (i = 0; i < dwc_ep->desc_cnt - dwc_ep->pkt_per_frm;
-+		     i += dwc_ep->pkt_per_frm) {
-+			for (j = 0; j < dwc_ep->pkt_per_frm; ++j) {
-+				uint32_t len = (j + 1) * dwc_ep->maxpacket;
-+				if (len > dwc_ep->data_per_frame)
-+					data_per_desc =
-+					    dwc_ep->data_per_frame -
-+					    j * dwc_ep->maxpacket;
-+				else
-+					data_per_desc = dwc_ep->maxpacket;
-+				len = data_per_desc % 4;
-+				if (len)
-+					data_per_desc += 4 - len;
-+
-+				data_per_desc =
-+				    sts.b_iso_out.rxbytes = data_per_desc;
-+				dma_desc->buf = dma_ad;
-+				dma_desc->status.d32 = sts.d32;
-+
-+				offset += data_per_desc;
-+				dma_desc++;
-+				dma_ad += data_per_desc;
-+			}
-+		}
-+		for (j = 0; j < dwc_ep->pkt_per_frm - 1; ++j) {
-+			data_per_desc =
-+			    ((j + 1) * dwc_ep->maxpacket >
-+			     dwc_ep->data_per_frame) ? dwc_ep->data_per_frame -
-+			    j * dwc_ep->maxpacket : dwc_ep->maxpacket;
-+			data_per_desc +=
-+			    (data_per_desc % 4) ? (4 - data_per_desc % 4) : 0;
-+			sts.b_iso_out.rxbytes = data_per_desc;
-+			dma_desc->buf = dma_ad;
-+			dma_desc->status.d32 = sts.d32;
-+
-+			offset += data_per_desc;
-+			dma_desc++;
-+			dma_ad += data_per_desc;
-+		}
-+
-+		sts.b_iso_out.ioc = 1;
-+		sts.b_iso_out.l = 1;
-+		data_per_desc =
-+		    ((j + 1) * dwc_ep->maxpacket >
-+		     dwc_ep->data_per_frame) ? dwc_ep->data_per_frame -
-+		    j * dwc_ep->maxpacket : dwc_ep->maxpacket;
-+		data_per_desc +=
-+		    (data_per_desc % 4) ? (4 - data_per_desc % 4) : 0;
-+		sts.b_iso_out.rxbytes = data_per_desc;
-+
-+		dma_desc->buf = dma_ad;
-+		dma_desc->status.d32 = sts.d32;
-+
-+		dwc_ep->next_frame = 0;
-+
-+		/** Write dma_ad into DOEPDMA register */
-+		DWC_WRITE_REG32(&(out_regs->doepdma),
-+				(uint32_t) dwc_ep->iso_dma_desc_addr);
-+
-+	}
-+	/** ISO IN EP */
-+	else {
-+		dev_dma_desc_sts_t sts = {.d32 = 0 };
-+		dwc_otg_dev_dma_desc_t *dma_desc = dwc_ep->iso_desc_addr;
-+		dma_addr_t dma_ad;
-+		dwc_otg_dev_in_ep_regs_t *in_regs =
-+		    core_if->dev_if->in_ep_regs[dwc_ep->num];
-+		unsigned int frmnumber;
-+		fifosize_data_t txfifosize, rxfifosize;
-+
-+		txfifosize.d32 =
-+		    DWC_READ_REG32(&core_if->dev_if->in_ep_regs[dwc_ep->num]->
-+				   dtxfsts);
-+		rxfifosize.d32 =
-+		    DWC_READ_REG32(&core_if->core_global_regs->grxfsiz);
-+
-+		addr = &core_if->dev_if->in_ep_regs[dwc_ep->num]->diepctl;
-+
-+		dma_ad = dwc_ep->dma_addr0;
-+
-+		dsts.d32 =
-+		    DWC_READ_REG32(&core_if->dev_if->dev_global_regs->dsts);
-+
-+		sts.b_iso_in.bs = BS_HOST_READY;
-+		sts.b_iso_in.txsts = 0;
-+		sts.b_iso_in.sp =
-+		    (dwc_ep->data_per_frame % dwc_ep->maxpacket) ? 1 : 0;
-+		sts.b_iso_in.ioc = 0;
-+		sts.b_iso_in.pid = dwc_ep->pkt_per_frm;
-+
-+		frmnumber = dwc_ep->next_frame;
-+
-+		sts.b_iso_in.framenum = frmnumber;
-+		sts.b_iso_in.txbytes = dwc_ep->data_per_frame;
-+		sts.b_iso_in.l = 0;
-+
-+		/** Buffer 0 descriptors setup */
-+		for (i = 0; i < dwc_ep->desc_cnt - 1; i++) {
-+			dma_desc->buf = dma_ad;
-+			dma_desc->status.d32 = sts.d32;
-+			dma_desc++;
-+
-+			dma_ad += dwc_ep->data_per_frame;
-+			sts.b_iso_in.framenum += dwc_ep->bInterval;
-+		}
-+
-+		sts.b_iso_in.ioc = 1;
-+		dma_desc->buf = dma_ad;
-+		dma_desc->status.d32 = sts.d32;
-+		++dma_desc;
-+
-+		/** Buffer 1 descriptors setup */
-+		sts.b_iso_in.ioc = 0;
-+		dma_ad = dwc_ep->dma_addr1;
-+
-+		for (i = 0; i < dwc_ep->desc_cnt - dwc_ep->pkt_per_frm;
-+		     i += dwc_ep->pkt_per_frm) {
-+			dma_desc->buf = dma_ad;
-+			dma_desc->status.d32 = sts.d32;
-+			dma_desc++;
-+
-+			dma_ad += dwc_ep->data_per_frame;
-+			sts.b_iso_in.framenum += dwc_ep->bInterval;
-+
-+			sts.b_iso_in.ioc = 0;
-+		}
-+		sts.b_iso_in.ioc = 1;
-+		sts.b_iso_in.l = 1;
-+
-+		dma_desc->buf = dma_ad;
-+		dma_desc->status.d32 = sts.d32;
-+
-+		dwc_ep->next_frame = sts.b_iso_in.framenum + dwc_ep->bInterval;
-+
-+		/** Write dma_ad into diepdma register */
-+		DWC_WRITE_REG32(&(in_regs->diepdma),
-+				(uint32_t) dwc_ep->iso_dma_desc_addr);
-+	}
-+	/** Enable endpoint, clear nak  */
-+	depctl.d32 = 0;
-+	depctl.b.epena = 1;
-+	depctl.b.usbactep = 1;
-+	depctl.b.cnak = 1;
-+
-+	DWC_MODIFY_REG32(addr, depctl.d32, depctl.d32);
-+	depctl.d32 = DWC_READ_REG32(addr);
-+}
-+
-+/**
-+ * This function initializes a descriptor chain for Isochronous transfer
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param ep The EP to start the transfer on.
-+ *
-+ */
-+void dwc_otg_iso_ep_start_buf_transfer(dwc_otg_core_if_t * core_if,
-+				       dwc_ep_t * ep)
-+{
-+	depctl_data_t depctl = {.d32 = 0 };
-+	volatile uint32_t *addr;
-+
-+	if (ep->is_in) {
-+		addr = &core_if->dev_if->in_ep_regs[ep->num]->diepctl;
-+	} else {
-+		addr = &core_if->dev_if->out_ep_regs[ep->num]->doepctl;
-+	}
-+
-+	if (core_if->dma_enable == 0 || core_if->dma_desc_enable != 0) {
-+		return;
-+	} else {
-+		deptsiz_data_t deptsiz = {.d32 = 0 };
-+
-+		ep->xfer_len =
-+		    ep->data_per_frame * ep->buf_proc_intrvl / ep->bInterval;
-+		ep->pkt_cnt =
-+		    (ep->xfer_len - 1 + ep->maxpacket) / ep->maxpacket;
-+		ep->xfer_count = 0;
-+		ep->xfer_buff =
-+		    (ep->proc_buf_num) ? ep->xfer_buff1 : ep->xfer_buff0;
-+		ep->dma_addr =
-+		    (ep->proc_buf_num) ? ep->dma_addr1 : ep->dma_addr0;
-+
-+		if (ep->is_in) {
-+			/* Program the transfer size and packet count
-+			 *      as follows: xfersize = N * maxpacket +
-+			 *      short_packet pktcnt = N + (short_packet
-+			 *      exist ? 1 : 0)
-+			 */
-+			deptsiz.b.mc = ep->pkt_per_frm;
-+			deptsiz.b.xfersize = ep->xfer_len;
-+			deptsiz.b.pktcnt =
-+			    (ep->xfer_len - 1 + ep->maxpacket) / ep->maxpacket;
-+			DWC_WRITE_REG32(&core_if->dev_if->in_ep_regs[ep->num]->
-+					dieptsiz, deptsiz.d32);
-+
-+			/* Write the DMA register */
-+			DWC_WRITE_REG32(&
-+					(core_if->dev_if->in_ep_regs[ep->num]->
-+					 diepdma), (uint32_t) ep->dma_addr);
-+
-+		} else {
-+			deptsiz.b.pktcnt =
-+			    (ep->xfer_len + (ep->maxpacket - 1)) /
-+			    ep->maxpacket;
-+			deptsiz.b.xfersize = deptsiz.b.pktcnt * ep->maxpacket;
-+
-+			DWC_WRITE_REG32(&core_if->dev_if->out_ep_regs[ep->num]->
-+					doeptsiz, deptsiz.d32);
-+
-+			/* Write the DMA register */
-+			DWC_WRITE_REG32(&
-+					(core_if->dev_if->out_ep_regs[ep->num]->
-+					 doepdma), (uint32_t) ep->dma_addr);
-+
-+		}
-+		/** Enable endpoint, clear nak  */
-+		depctl.d32 = 0;
-+		depctl.b.epena = 1;
-+		depctl.b.cnak = 1;
-+
-+		DWC_MODIFY_REG32(addr, depctl.d32, depctl.d32);
-+	}
-+}
-+
-+/**
-+ * This function does the setup for a data transfer for an EP and
-+ * starts the transfer. For an IN transfer, the packets will be
-+ * loaded into the appropriate Tx FIFO in the ISR. For OUT transfers,
-+ * the packets are unloaded from the Rx FIFO in the ISR.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param ep The EP to start the transfer on.
-+ */
-+
-+static void dwc_otg_iso_ep_start_transfer(dwc_otg_core_if_t * core_if,
-+					  dwc_ep_t * ep)
-+{
-+	if (core_if->dma_enable) {
-+		if (core_if->dma_desc_enable) {
-+			if (ep->is_in) {
-+				ep->desc_cnt = ep->pkt_cnt / ep->pkt_per_frm;
-+			} else {
-+				ep->desc_cnt = ep->pkt_cnt;
-+			}
-+			dwc_otg_iso_ep_start_ddma_transfer(core_if, ep);
-+		} else {
-+			if (core_if->pti_enh_enable) {
-+				dwc_otg_iso_ep_start_buf_transfer(core_if, ep);
-+			} else {
-+				ep->cur_pkt_addr =
-+				    (ep->proc_buf_num) ? ep->xfer_buff1 : ep->
-+				    xfer_buff0;
-+				ep->cur_pkt_dma_addr =
-+				    (ep->proc_buf_num) ? ep->dma_addr1 : ep->
-+				    dma_addr0;
-+				dwc_otg_iso_ep_start_frm_transfer(core_if, ep);
-+			}
-+		}
-+	} else {
-+		ep->cur_pkt_addr =
-+		    (ep->proc_buf_num) ? ep->xfer_buff1 : ep->xfer_buff0;
-+		ep->cur_pkt_dma_addr =
-+		    (ep->proc_buf_num) ? ep->dma_addr1 : ep->dma_addr0;
-+		dwc_otg_iso_ep_start_frm_transfer(core_if, ep);
-+	}
-+}
-+
-+/**
-+ * This function stops transfer for an EP and
-+ * resets the ep's variables.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param ep The EP to start the transfer on.
-+ */
-+
-+void dwc_otg_iso_ep_stop_transfer(dwc_otg_core_if_t * core_if, dwc_ep_t * ep)
-+{
-+	depctl_data_t depctl = {.d32 = 0 };
-+	volatile uint32_t *addr;
-+
-+	if (ep->is_in == 1) {
-+		addr = &core_if->dev_if->in_ep_regs[ep->num]->diepctl;
-+	} else {
-+		addr = &core_if->dev_if->out_ep_regs[ep->num]->doepctl;
-+	}
-+
-+	/* disable the ep */
-+	depctl.d32 = DWC_READ_REG32(addr);
-+
-+	depctl.b.epdis = 1;
-+	depctl.b.snak = 1;
-+
-+	DWC_WRITE_REG32(addr, depctl.d32);
-+
-+	if (core_if->dma_desc_enable &&
-+	    ep->iso_desc_addr && ep->iso_dma_desc_addr) {
-+		dwc_otg_ep_free_desc_chain(ep->iso_desc_addr,
-+					   ep->iso_dma_desc_addr,
-+					   ep->desc_cnt * 2);
-+	}
-+
-+	/* reset varibales */
-+	ep->dma_addr0 = 0;
-+	ep->dma_addr1 = 0;
-+	ep->xfer_buff0 = 0;
-+	ep->xfer_buff1 = 0;
-+	ep->data_per_frame = 0;
-+	ep->data_pattern_frame = 0;
-+	ep->sync_frame = 0;
-+	ep->buf_proc_intrvl = 0;
-+	ep->bInterval = 0;
-+	ep->proc_buf_num = 0;
-+	ep->pkt_per_frm = 0;
-+	ep->pkt_per_frm = 0;
-+	ep->desc_cnt = 0;
-+	ep->iso_desc_addr = 0;
-+	ep->iso_dma_desc_addr = 0;
-+}
-+
-+int dwc_otg_pcd_iso_ep_start(dwc_otg_pcd_t * pcd, void *ep_handle,
-+			     uint8_t * buf0, uint8_t * buf1, dwc_dma_t dma0,
-+			     dwc_dma_t dma1, int sync_frame, int dp_frame,
-+			     int data_per_frame, int start_frame,
-+			     int buf_proc_intrvl, void *req_handle,
-+			     int atomic_alloc)
-+{
-+	dwc_otg_pcd_ep_t *ep;
-+	dwc_irqflags_t flags = 0;
-+	dwc_ep_t *dwc_ep;
-+	int32_t frm_data;
-+	dsts_data_t dsts;
-+	dwc_otg_core_if_t *core_if;
-+
-+	ep = get_ep_from_handle(pcd, ep_handle);
-+
-+	if (!ep || !ep->desc || ep->dwc_ep.num == 0) {
-+		DWC_WARN("bad ep\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	DWC_SPINLOCK_IRQSAVE(pcd->lock, &flags);
-+	core_if = GET_CORE_IF(pcd);
-+	dwc_ep = &ep->dwc_ep;
-+
-+	if (ep->iso_req_handle) {
-+		DWC_WARN("ISO request in progress\n");
-+	}
-+
-+	dwc_ep->dma_addr0 = dma0;
-+	dwc_ep->dma_addr1 = dma1;
-+
-+	dwc_ep->xfer_buff0 = buf0;
-+	dwc_ep->xfer_buff1 = buf1;
-+
-+	dwc_ep->data_per_frame = data_per_frame;
-+
-+	/** @todo - pattern data support is to be implemented in the future */
-+	dwc_ep->data_pattern_frame = dp_frame;
-+	dwc_ep->sync_frame = sync_frame;
-+
-+	dwc_ep->buf_proc_intrvl = buf_proc_intrvl;
-+
-+	dwc_ep->bInterval = 1 << (ep->desc->bInterval - 1);
-+
-+	dwc_ep->proc_buf_num = 0;
-+
-+	dwc_ep->pkt_per_frm = 0;
-+	frm_data = ep->dwc_ep.data_per_frame;
-+	while (frm_data > 0) {
-+		dwc_ep->pkt_per_frm++;
-+		frm_data -= ep->dwc_ep.maxpacket;
-+	}
-+
-+	dsts.d32 = DWC_READ_REG32(&core_if->dev_if->dev_global_regs->dsts);
-+
-+	if (start_frame == -1) {
-+		dwc_ep->next_frame = dsts.b.soffn + 1;
-+		if (dwc_ep->bInterval != 1) {
-+			dwc_ep->next_frame =
-+			    dwc_ep->next_frame + (dwc_ep->bInterval - 1 -
-+						  dwc_ep->next_frame %
-+						  dwc_ep->bInterval);
-+		}
-+	} else {
-+		dwc_ep->next_frame = start_frame;
-+	}
-+
-+	if (!core_if->pti_enh_enable) {
-+		dwc_ep->pkt_cnt =
-+		    dwc_ep->buf_proc_intrvl * dwc_ep->pkt_per_frm /
-+		    dwc_ep->bInterval;
-+	} else {
-+		dwc_ep->pkt_cnt =
-+		    (dwc_ep->data_per_frame *
-+		     (dwc_ep->buf_proc_intrvl / dwc_ep->bInterval)
-+		     - 1 + dwc_ep->maxpacket) / dwc_ep->maxpacket;
-+	}
-+
-+	if (core_if->dma_desc_enable) {
-+		dwc_ep->desc_cnt =
-+		    dwc_ep->buf_proc_intrvl * dwc_ep->pkt_per_frm /
-+		    dwc_ep->bInterval;
-+	}
-+
-+	if (atomic_alloc) {
-+		dwc_ep->pkt_info =
-+		    DWC_ALLOC_ATOMIC(sizeof(iso_pkt_info_t) * dwc_ep->pkt_cnt);
-+	} else {
-+		dwc_ep->pkt_info =
-+		    DWC_ALLOC(sizeof(iso_pkt_info_t) * dwc_ep->pkt_cnt);
-+	}
-+	if (!dwc_ep->pkt_info) {
-+		DWC_SPINUNLOCK_IRQRESTORE(pcd->lock, flags);
-+		return -DWC_E_NO_MEMORY;
-+	}
-+	if (core_if->pti_enh_enable) {
-+		dwc_memset(dwc_ep->pkt_info, 0,
-+			   sizeof(iso_pkt_info_t) * dwc_ep->pkt_cnt);
-+	}
-+
-+	dwc_ep->cur_pkt = 0;
-+	ep->iso_req_handle = req_handle;
-+
-+	DWC_SPINUNLOCK_IRQRESTORE(pcd->lock, flags);
-+	dwc_otg_iso_ep_start_transfer(core_if, dwc_ep);
-+	return 0;
-+}
-+
-+int dwc_otg_pcd_iso_ep_stop(dwc_otg_pcd_t * pcd, void *ep_handle,
-+			    void *req_handle)
-+{
-+	dwc_irqflags_t flags = 0;
-+	dwc_otg_pcd_ep_t *ep;
-+	dwc_ep_t *dwc_ep;
-+
-+	ep = get_ep_from_handle(pcd, ep_handle);
-+	if (!ep || !ep->desc || ep->dwc_ep.num == 0) {
-+		DWC_WARN("bad ep\n");
-+		return -DWC_E_INVALID;
-+	}
-+	dwc_ep = &ep->dwc_ep;
-+
-+	dwc_otg_iso_ep_stop_transfer(GET_CORE_IF(pcd), dwc_ep);
-+
-+	DWC_FREE(dwc_ep->pkt_info);
-+	DWC_SPINLOCK_IRQSAVE(pcd->lock, &flags);
-+	if (ep->iso_req_handle != req_handle) {
-+		DWC_SPINUNLOCK_IRQRESTORE(pcd->lock, flags);
-+		return -DWC_E_INVALID;
-+	}
-+
-+	DWC_SPINUNLOCK_IRQRESTORE(pcd->lock, flags);
-+
-+	ep->iso_req_handle = 0;
-+	return 0;
-+}
-+
-+/**
-+ * This function is used for perodical data exchnage between PCD and gadget drivers.
-+ * for Isochronous EPs
-+ *
-+ *	- Every time a sync period completes this function is called to
-+ *	  perform data exchange between PCD and gadget
-+ */
-+void dwc_otg_iso_buffer_done(dwc_otg_pcd_t * pcd, dwc_otg_pcd_ep_t * ep,
-+			     void *req_handle)
-+{
-+	int i;
-+	dwc_ep_t *dwc_ep;
-+
-+	dwc_ep = &ep->dwc_ep;
-+
-+	DWC_SPINUNLOCK(ep->pcd->lock);
-+	pcd->fops->isoc_complete(pcd, ep->priv, ep->iso_req_handle,
-+				 dwc_ep->proc_buf_num ^ 0x1);
-+	DWC_SPINLOCK(ep->pcd->lock);
-+
-+	for (i = 0; i < dwc_ep->pkt_cnt; ++i) {
-+		dwc_ep->pkt_info[i].status = 0;
-+		dwc_ep->pkt_info[i].offset = 0;
-+		dwc_ep->pkt_info[i].length = 0;
-+	}
-+}
-+
-+int dwc_otg_pcd_get_iso_packet_count(dwc_otg_pcd_t * pcd, void *ep_handle,
-+				     void *iso_req_handle)
-+{
-+	dwc_otg_pcd_ep_t *ep;
-+	dwc_ep_t *dwc_ep;
-+
-+	ep = get_ep_from_handle(pcd, ep_handle);
-+	if (!ep->desc || ep->dwc_ep.num == 0) {
-+		DWC_WARN("bad ep\n");
-+		return -DWC_E_INVALID;
-+	}
-+	dwc_ep = &ep->dwc_ep;
-+
-+	return dwc_ep->pkt_cnt;
-+}
-+
-+void dwc_otg_pcd_get_iso_packet_params(dwc_otg_pcd_t * pcd, void *ep_handle,
-+				       void *iso_req_handle, int packet,
-+				       int *status, int *actual, int *offset)
-+{
-+	dwc_otg_pcd_ep_t *ep;
-+	dwc_ep_t *dwc_ep;
-+
-+	ep = get_ep_from_handle(pcd, ep_handle);
-+	if (!ep)
-+		DWC_WARN("bad ep\n");
-+
-+	dwc_ep = &ep->dwc_ep;
-+
-+	*status = dwc_ep->pkt_info[packet].status;
-+	*actual = dwc_ep->pkt_info[packet].length;
-+	*offset = dwc_ep->pkt_info[packet].offset;
-+}
-+
-+#endif /* DWC_EN_ISOC */
-+
-+static void dwc_otg_pcd_init_ep(dwc_otg_pcd_t * pcd, dwc_otg_pcd_ep_t * pcd_ep,
-+				uint32_t is_in, uint32_t ep_num)
-+{
-+	/* Init EP structure */
-+	pcd_ep->desc = 0;
-+	pcd_ep->pcd = pcd;
-+	pcd_ep->stopped = 1;
-+	pcd_ep->queue_sof = 0;
-+
-+	/* Init DWC ep structure */
-+	pcd_ep->dwc_ep.is_in = is_in;
-+	pcd_ep->dwc_ep.num = ep_num;
-+	pcd_ep->dwc_ep.active = 0;
-+	pcd_ep->dwc_ep.tx_fifo_num = 0;
-+	/* Control until ep is actvated */
-+	pcd_ep->dwc_ep.type = DWC_OTG_EP_TYPE_CONTROL;
-+	pcd_ep->dwc_ep.maxpacket = MAX_PACKET_SIZE;
-+	pcd_ep->dwc_ep.dma_addr = 0;
-+	pcd_ep->dwc_ep.start_xfer_buff = 0;
-+	pcd_ep->dwc_ep.xfer_buff = 0;
-+	pcd_ep->dwc_ep.xfer_len = 0;
-+	pcd_ep->dwc_ep.xfer_count = 0;
-+	pcd_ep->dwc_ep.sent_zlp = 0;
-+	pcd_ep->dwc_ep.total_len = 0;
-+	pcd_ep->dwc_ep.desc_addr = 0;
-+	pcd_ep->dwc_ep.dma_desc_addr = 0;
-+	DWC_CIRCLEQ_INIT(&pcd_ep->queue);
-+}
-+
-+/**
-+ * Initialize ep's
-+ */
-+static void dwc_otg_pcd_reinit(dwc_otg_pcd_t * pcd)
-+{
-+	int i;
-+	uint32_t hwcfg1;
-+	dwc_otg_pcd_ep_t *ep;
-+	int in_ep_cntr, out_ep_cntr;
-+	uint32_t num_in_eps = (GET_CORE_IF(pcd))->dev_if->num_in_eps;
-+	uint32_t num_out_eps = (GET_CORE_IF(pcd))->dev_if->num_out_eps;
-+
-+	/**
-+	 * Initialize the EP0 structure.
-+	 */
-+	ep = &pcd->ep0;
-+	dwc_otg_pcd_init_ep(pcd, ep, 0, 0);
-+
-+	in_ep_cntr = 0;
-+	hwcfg1 = (GET_CORE_IF(pcd))->hwcfg1.d32 >> 3;
-+	for (i = 1; in_ep_cntr < num_in_eps; i++) {
-+		if ((hwcfg1 & 0x1) == 0) {
-+			dwc_otg_pcd_ep_t *ep = &pcd->in_ep[in_ep_cntr];
-+			in_ep_cntr++;
-+			/**
-+			 * @todo NGS: Add direction to EP, based on contents
-+			 * of HWCFG1.  Need a copy of HWCFG1 in pcd structure?
-+			 * sprintf(";r
-+			 */
-+			dwc_otg_pcd_init_ep(pcd, ep, 1 /* IN */ , i);
-+
-+			DWC_CIRCLEQ_INIT(&ep->queue);
-+		}
-+		hwcfg1 >>= 2;
-+	}
-+
-+	out_ep_cntr = 0;
-+	hwcfg1 = (GET_CORE_IF(pcd))->hwcfg1.d32 >> 2;
-+	for (i = 1; out_ep_cntr < num_out_eps; i++) {
-+		if ((hwcfg1 & 0x1) == 0) {
-+			dwc_otg_pcd_ep_t *ep = &pcd->out_ep[out_ep_cntr];
-+			out_ep_cntr++;
-+			/**
-+			 * @todo NGS: Add direction to EP, based on contents
-+			 * of HWCFG1.  Need a copy of HWCFG1 in pcd structure?
-+			 * sprintf(";r
-+			 */
-+			dwc_otg_pcd_init_ep(pcd, ep, 0 /* OUT */ , i);
-+			DWC_CIRCLEQ_INIT(&ep->queue);
-+		}
-+		hwcfg1 >>= 2;
-+	}
-+
-+	pcd->ep0state = EP0_DISCONNECT;
-+	pcd->ep0.dwc_ep.maxpacket = MAX_EP0_SIZE;
-+	pcd->ep0.dwc_ep.type = DWC_OTG_EP_TYPE_CONTROL;
-+}
-+
-+/**
-+ * This function is called when the SRP timer expires. The SRP should
-+ * complete within 6 seconds.
-+ */
-+static void srp_timeout(void *ptr)
-+{
-+	gotgctl_data_t gotgctl;
-+	dwc_otg_core_if_t *core_if = (dwc_otg_core_if_t *) ptr;
-+	volatile uint32_t *addr = &core_if->core_global_regs->gotgctl;
-+
-+	gotgctl.d32 = DWC_READ_REG32(addr);
-+
-+	core_if->srp_timer_started = 0;
-+
-+	if (core_if->adp_enable) {
-+		if (gotgctl.b.bsesvld == 0) {
-+			gpwrdn_data_t gpwrdn = {.d32 = 0 };
-+			DWC_PRINTF("SRP Timeout BSESSVLD = 0\n");
-+			/* Power off the core */
-+			if (core_if->power_down == 2) {
-+				gpwrdn.b.pwrdnswtch = 1;
-+				DWC_MODIFY_REG32(&core_if->
-+						 core_global_regs->gpwrdn,
-+						 gpwrdn.d32, 0);
-+			}
-+
-+			gpwrdn.d32 = 0;
-+			gpwrdn.b.pmuintsel = 1;
-+			gpwrdn.b.pmuactv = 1;
-+			DWC_MODIFY_REG32(&core_if->core_global_regs->gpwrdn, 0,
-+					 gpwrdn.d32);
-+			dwc_otg_adp_probe_start(core_if);
-+		} else {
-+			DWC_PRINTF("SRP Timeout BSESSVLD = 1\n");
-+			core_if->op_state = B_PERIPHERAL;
-+			dwc_otg_core_init(core_if);
-+			dwc_otg_enable_global_interrupts(core_if);
-+			cil_pcd_start(core_if);
-+		}
-+	}
-+
-+	if ((core_if->core_params->phy_type == DWC_PHY_TYPE_PARAM_FS) &&
-+	    (core_if->core_params->i2c_enable)) {
-+		DWC_PRINTF("SRP Timeout\n");
-+
-+		if ((core_if->srp_success) && (gotgctl.b.bsesvld)) {
-+			if (core_if->pcd_cb && core_if->pcd_cb->resume_wakeup) {
-+				core_if->pcd_cb->resume_wakeup(core_if->pcd_cb->p);
-+			}
-+
-+			/* Clear Session Request */
-+			gotgctl.d32 = 0;
-+			gotgctl.b.sesreq = 1;
-+			DWC_MODIFY_REG32(&core_if->core_global_regs->gotgctl,
-+					 gotgctl.d32, 0);
-+
-+			core_if->srp_success = 0;
-+		} else {
-+			__DWC_ERROR("Device not connected/responding\n");
-+			gotgctl.b.sesreq = 0;
-+			DWC_WRITE_REG32(addr, gotgctl.d32);
-+		}
-+	} else if (gotgctl.b.sesreq) {
-+		DWC_PRINTF("SRP Timeout\n");
-+
-+		__DWC_ERROR("Device not connected/responding\n");
-+		gotgctl.b.sesreq = 0;
-+		DWC_WRITE_REG32(addr, gotgctl.d32);
-+	} else {
-+		DWC_PRINTF(" SRP GOTGCTL=%0x\n", gotgctl.d32);
-+	}
-+}
-+
-+/**
-+ * Tasklet
-+ *
-+ */
-+extern void start_next_request(dwc_otg_pcd_ep_t * ep);
-+
-+static void start_xfer_tasklet_func(void *data)
-+{
-+	dwc_otg_pcd_t *pcd = (dwc_otg_pcd_t *) data;
-+	dwc_otg_core_if_t *core_if = GET_CORE_IF(pcd);
-+
-+	int i;
-+	depctl_data_t diepctl;
-+
-+	DWC_DEBUGPL(DBG_PCDV, "Start xfer tasklet\n");
-+
-+	diepctl.d32 = DWC_READ_REG32(&core_if->dev_if->in_ep_regs[0]->diepctl);
-+
-+	if (pcd->ep0.queue_sof) {
-+		pcd->ep0.queue_sof = 0;
-+		start_next_request(&pcd->ep0);
-+		// break;
-+	}
-+
-+	for (i = 0; i < core_if->dev_if->num_in_eps; i++) {
-+		depctl_data_t diepctl;
-+		diepctl.d32 =
-+		    DWC_READ_REG32(&core_if->dev_if->in_ep_regs[i]->diepctl);
-+
-+		if (pcd->in_ep[i].queue_sof) {
-+			pcd->in_ep[i].queue_sof = 0;
-+			start_next_request(&pcd->in_ep[i]);
-+			// break;
-+		}
-+	}
-+
-+	return;
-+}
-+
-+/**
-+ * This function initialized the PCD portion of the driver.
-+ *
-+ */
-+dwc_otg_pcd_t *dwc_otg_pcd_init(dwc_otg_device_t *otg_dev)
-+{
-+	struct device *dev = &otg_dev->os_dep.platformdev->dev;
-+	dwc_otg_core_if_t *core_if = otg_dev->core_if;
-+	dwc_otg_pcd_t *pcd = NULL;
-+	dwc_otg_dev_if_t *dev_if;
-+	int i;
-+
-+	/*
-+	 * Allocate PCD structure
-+	 */
-+	pcd = DWC_ALLOC(sizeof(dwc_otg_pcd_t));
-+
-+	if (pcd == NULL) {
-+		return NULL;
-+	}
-+
-+#if (defined(DWC_LINUX) && defined(CONFIG_DEBUG_SPINLOCK))
-+	DWC_SPINLOCK_ALLOC_LINUX_DEBUG(pcd->lock);
-+#else
-+	pcd->lock = DWC_SPINLOCK_ALLOC();
-+#endif
-+        DWC_DEBUGPL(DBG_HCDV, "Init of PCD %p given core_if %p\n",
-+                    pcd, core_if);//GRAYG
-+	if (!pcd->lock) {
-+		DWC_ERROR("Could not allocate lock for pcd");
-+		DWC_FREE(pcd);
-+		return NULL;
-+	}
-+	/* Set core_if's lock pointer to hcd->lock */
-+	core_if->lock = pcd->lock;
-+	pcd->core_if = core_if;
-+
-+	dev_if = core_if->dev_if;
-+	dev_if->isoc_ep = NULL;
-+
-+	if (core_if->hwcfg4.b.ded_fifo_en) {
-+		DWC_PRINTF("Dedicated Tx FIFOs mode\n");
-+	} else {
-+		DWC_PRINTF("Shared Tx FIFO mode\n");
-+	}
-+
-+	/*
-+	 * Initialized the Core for Device mode here if there is nod ADP support.
-+	 * Otherwise it will be done later in dwc_otg_adp_start routine.
-+	 */
-+	if (dwc_otg_is_device_mode(core_if) /*&& !core_if->adp_enable*/) {
-+		dwc_otg_core_dev_init(core_if);
-+	}
-+
-+	/*
-+	 * Register the PCD Callbacks.
-+	 */
-+	dwc_otg_cil_register_pcd_callbacks(core_if, &pcd_callbacks, pcd);
-+
-+	/*
-+	 * Initialize the DMA buffer for SETUP packets
-+	 */
-+	if (GET_CORE_IF(pcd)->dma_enable) {
-+		pcd->setup_pkt =
-+		    DWC_DMA_ALLOC(dev, sizeof(*pcd->setup_pkt) * 5,
-+				  &pcd->setup_pkt_dma_handle);
-+		if (pcd->setup_pkt == NULL) {
-+			DWC_FREE(pcd);
-+			return NULL;
-+		}
-+
-+		pcd->status_buf =
-+		    DWC_DMA_ALLOC(dev, sizeof(uint16_t),
-+				  &pcd->status_buf_dma_handle);
-+		if (pcd->status_buf == NULL) {
-+			DWC_DMA_FREE(dev, sizeof(*pcd->setup_pkt) * 5,
-+				     pcd->setup_pkt, pcd->setup_pkt_dma_handle);
-+			DWC_FREE(pcd);
-+			return NULL;
-+		}
-+
-+		if (GET_CORE_IF(pcd)->dma_desc_enable) {
-+			dev_if->setup_desc_addr[0] =
-+			    dwc_otg_ep_alloc_desc_chain(dev,
-+				&dev_if->dma_setup_desc_addr[0], 1);
-+			dev_if->setup_desc_addr[1] =
-+			    dwc_otg_ep_alloc_desc_chain(dev,
-+				&dev_if->dma_setup_desc_addr[1], 1);
-+			dev_if->in_desc_addr =
-+			    dwc_otg_ep_alloc_desc_chain(dev,
-+				&dev_if->dma_in_desc_addr, 1);
-+			dev_if->out_desc_addr =
-+			    dwc_otg_ep_alloc_desc_chain(dev,
-+				&dev_if->dma_out_desc_addr, 1);
-+			pcd->data_terminated = 0;
-+
-+			if (dev_if->setup_desc_addr[0] == 0
-+			    || dev_if->setup_desc_addr[1] == 0
-+			    || dev_if->in_desc_addr == 0
-+			    || dev_if->out_desc_addr == 0) {
-+
-+				if (dev_if->out_desc_addr)
-+					dwc_otg_ep_free_desc_chain(dev,
-+					     dev_if->out_desc_addr,
-+					     dev_if->dma_out_desc_addr, 1);
-+				if (dev_if->in_desc_addr)
-+					dwc_otg_ep_free_desc_chain(dev,
-+					     dev_if->in_desc_addr,
-+					     dev_if->dma_in_desc_addr, 1);
-+				if (dev_if->setup_desc_addr[1])
-+					dwc_otg_ep_free_desc_chain(dev,
-+					     dev_if->setup_desc_addr[1],
-+					     dev_if->dma_setup_desc_addr[1], 1);
-+				if (dev_if->setup_desc_addr[0])
-+					dwc_otg_ep_free_desc_chain(dev,
-+					     dev_if->setup_desc_addr[0],
-+					     dev_if->dma_setup_desc_addr[0], 1);
-+
-+				DWC_DMA_FREE(dev, sizeof(*pcd->setup_pkt) * 5,
-+					     pcd->setup_pkt,
-+					     pcd->setup_pkt_dma_handle);
-+				DWC_DMA_FREE(dev, sizeof(*pcd->status_buf),
-+					     pcd->status_buf,
-+					     pcd->status_buf_dma_handle);
-+
-+				DWC_FREE(pcd);
-+
-+				return NULL;
-+			}
-+		}
-+	} else {
-+		pcd->setup_pkt = DWC_ALLOC(sizeof(*pcd->setup_pkt) * 5);
-+		if (pcd->setup_pkt == NULL) {
-+			DWC_FREE(pcd);
-+			return NULL;
-+		}
-+
-+		pcd->status_buf = DWC_ALLOC(sizeof(uint16_t));
-+		if (pcd->status_buf == NULL) {
-+			DWC_FREE(pcd->setup_pkt);
-+			DWC_FREE(pcd);
-+			return NULL;
-+		}
-+	}
-+
-+	dwc_otg_pcd_reinit(pcd);
-+
-+	/* Allocate the cfi object for the PCD */
-+#ifdef DWC_UTE_CFI
-+	pcd->cfi = DWC_ALLOC(sizeof(cfiobject_t));
-+	if (NULL == pcd->cfi)
-+		goto fail;
-+	if (init_cfi(pcd->cfi)) {
-+		CFI_INFO("%s: Failed to init the CFI object\n", __func__);
-+		goto fail;
-+	}
-+#endif
-+
-+	/* Initialize tasklets */
-+	pcd->start_xfer_tasklet = DWC_TASK_ALLOC("xfer_tasklet",
-+						 start_xfer_tasklet_func, pcd);
-+	pcd->test_mode_tasklet = DWC_TASK_ALLOC("test_mode_tasklet",
-+						do_test_mode, pcd);
-+
-+	/* Initialize SRP timer */
-+	core_if->srp_timer = DWC_TIMER_ALLOC("SRP TIMER", srp_timeout, core_if);
-+
-+	if (core_if->core_params->dev_out_nak) {
-+		/**
-+		* Initialize xfer timeout timer. Implemented for
-+		* 2.93a feature "Device DDMA OUT NAK Enhancement"
-+		*/
-+		for(i = 0; i < MAX_EPS_CHANNELS; i++) {
-+			pcd->core_if->ep_xfer_timer[i] =
-+				DWC_TIMER_ALLOC("ep timer", ep_xfer_timeout,
-+				&pcd->core_if->ep_xfer_info[i]);
-+		}
-+	}
-+
-+	return pcd;
-+#ifdef DWC_UTE_CFI
-+fail:
-+#endif
-+	if (pcd->setup_pkt)
-+		DWC_FREE(pcd->setup_pkt);
-+	if (pcd->status_buf)
-+		DWC_FREE(pcd->status_buf);
-+#ifdef DWC_UTE_CFI
-+	if (pcd->cfi)
-+		DWC_FREE(pcd->cfi);
-+#endif
-+	if (pcd)
-+		DWC_FREE(pcd);
-+	return NULL;
-+
-+}
-+
-+/**
-+ * Remove PCD specific data
-+ */
-+void dwc_otg_pcd_remove(dwc_otg_pcd_t * pcd)
-+{
-+	dwc_otg_dev_if_t *dev_if = GET_CORE_IF(pcd)->dev_if;
-+	struct device *dev = dwc_otg_pcd_to_dev(pcd);
-+	int i;
-+
-+	if (pcd->core_if->core_params->dev_out_nak) {
-+		for (i = 0; i < MAX_EPS_CHANNELS; i++) {
-+			DWC_TIMER_CANCEL(pcd->core_if->ep_xfer_timer[i]);
-+			pcd->core_if->ep_xfer_info[i].state = 0;
-+		}
-+	}
-+
-+	if (GET_CORE_IF(pcd)->dma_enable) {
-+		DWC_DMA_FREE(dev, sizeof(*pcd->setup_pkt) * 5, pcd->setup_pkt,
-+			     pcd->setup_pkt_dma_handle);
-+		DWC_DMA_FREE(dev, sizeof(uint16_t), pcd->status_buf,
-+			     pcd->status_buf_dma_handle);
-+		if (GET_CORE_IF(pcd)->dma_desc_enable) {
-+			dwc_otg_ep_free_desc_chain(dev,
-+						   dev_if->setup_desc_addr[0],
-+						   dev_if->dma_setup_desc_addr
-+						   [0], 1);
-+			dwc_otg_ep_free_desc_chain(dev,
-+						   dev_if->setup_desc_addr[1],
-+						   dev_if->dma_setup_desc_addr
-+						   [1], 1);
-+			dwc_otg_ep_free_desc_chain(dev,
-+						   dev_if->in_desc_addr,
-+						   dev_if->dma_in_desc_addr, 1);
-+			dwc_otg_ep_free_desc_chain(dev,
-+						   dev_if->out_desc_addr,
-+						   dev_if->dma_out_desc_addr,
-+						   1);
-+		}
-+	} else {
-+		DWC_FREE(pcd->setup_pkt);
-+		DWC_FREE(pcd->status_buf);
-+	}
-+	DWC_SPINLOCK_FREE(pcd->lock);
-+	/* Set core_if's lock pointer to NULL */
-+	pcd->core_if->lock = NULL;
-+
-+	DWC_TASK_FREE(pcd->start_xfer_tasklet);
-+	DWC_TASK_FREE(pcd->test_mode_tasklet);
-+	if (pcd->core_if->core_params->dev_out_nak) {
-+		for (i = 0; i < MAX_EPS_CHANNELS; i++) {
-+			if (pcd->core_if->ep_xfer_timer[i]) {
-+					DWC_TIMER_FREE(pcd->core_if->ep_xfer_timer[i]);
-+			}
-+		}
-+	}
-+
-+/* Release the CFI object's dynamic memory */
-+#ifdef DWC_UTE_CFI
-+	if (pcd->cfi->ops.release) {
-+		pcd->cfi->ops.release(pcd->cfi);
-+	}
-+#endif
-+
-+	DWC_FREE(pcd);
-+}
-+
-+/**
-+ * Returns whether registered pcd is dual speed or not
-+ */
-+uint32_t dwc_otg_pcd_is_dualspeed(dwc_otg_pcd_t * pcd)
-+{
-+	dwc_otg_core_if_t *core_if = GET_CORE_IF(pcd);
-+
-+	if ((core_if->core_params->speed == DWC_SPEED_PARAM_FULL) ||
-+	    ((core_if->hwcfg2.b.hs_phy_type == 2) &&
-+	     (core_if->hwcfg2.b.fs_phy_type == 1) &&
-+	     (core_if->core_params->ulpi_fs_ls))) {
-+		return 0;
-+	}
-+
-+	return 1;
-+}
-+
-+/**
-+ * Returns whether registered pcd is OTG capable or not
-+ */
-+uint32_t dwc_otg_pcd_is_otg(dwc_otg_pcd_t * pcd)
-+{
-+	dwc_otg_core_if_t *core_if = GET_CORE_IF(pcd);
-+	gusbcfg_data_t usbcfg = {.d32 = 0 };
-+
-+	usbcfg.d32 = DWC_READ_REG32(&core_if->core_global_regs->gusbcfg);
-+	if (!usbcfg.b.srpcap || !usbcfg.b.hnpcap) {
-+		return 0;
-+	}
-+
-+	return 1;
-+}
-+
-+/**
-+ * This function assigns periodic Tx FIFO to an periodic EP
-+ * in shared Tx FIFO mode
-+ */
-+static uint32_t assign_tx_fifo(dwc_otg_core_if_t * core_if)
-+{
-+	uint32_t TxMsk = 1;
-+	int i;
-+
-+	for (i = 0; i < core_if->hwcfg4.b.num_in_eps; ++i) {
-+		if ((TxMsk & core_if->tx_msk) == 0) {
-+			core_if->tx_msk |= TxMsk;
-+			return i + 1;
-+		}
-+		TxMsk <<= 1;
-+	}
-+	return 0;
-+}
-+
-+/**
-+ * This function assigns periodic Tx FIFO to an periodic EP
-+ * in shared Tx FIFO mode
-+ */
-+static uint32_t assign_perio_tx_fifo(dwc_otg_core_if_t * core_if)
-+{
-+	uint32_t PerTxMsk = 1;
-+	int i;
-+	for (i = 0; i < core_if->hwcfg4.b.num_dev_perio_in_ep; ++i) {
-+		if ((PerTxMsk & core_if->p_tx_msk) == 0) {
-+			core_if->p_tx_msk |= PerTxMsk;
-+			return i + 1;
-+		}
-+		PerTxMsk <<= 1;
-+	}
-+	return 0;
-+}
-+
-+/**
-+ * This function releases periodic Tx FIFO
-+ * in shared Tx FIFO mode
-+ */
-+static void release_perio_tx_fifo(dwc_otg_core_if_t * core_if,
-+				  uint32_t fifo_num)
-+{
-+	core_if->p_tx_msk =
-+	    (core_if->p_tx_msk & (1 << (fifo_num - 1))) ^ core_if->p_tx_msk;
-+}
-+
-+/**
-+ * This function releases periodic Tx FIFO
-+ * in shared Tx FIFO mode
-+ */
-+static void release_tx_fifo(dwc_otg_core_if_t * core_if, uint32_t fifo_num)
-+{
-+	core_if->tx_msk =
-+	    (core_if->tx_msk & (1 << (fifo_num - 1))) ^ core_if->tx_msk;
-+}
-+
-+/**
-+ * This function is being called from gadget
-+ * to enable PCD endpoint.
-+ */
-+int dwc_otg_pcd_ep_enable(dwc_otg_pcd_t * pcd,
-+			  const uint8_t * ep_desc, void *usb_ep)
-+{
-+	int num, dir;
-+	dwc_otg_pcd_ep_t *ep = NULL;
-+	const usb_endpoint_descriptor_t *desc;
-+	dwc_irqflags_t flags;
-+	fifosize_data_t dptxfsiz = {.d32 = 0 };
-+	gdfifocfg_data_t gdfifocfg = {.d32 = 0 };
-+	gdfifocfg_data_t gdfifocfgbase = {.d32 = 0 };
-+	int retval = 0;
-+	int i, epcount;
-+	struct device *dev = dwc_otg_pcd_to_dev(pcd);
-+
-+	desc = (const usb_endpoint_descriptor_t *)ep_desc;
-+
-+	if (!desc) {
-+		pcd->ep0.priv = usb_ep;
-+		ep = &pcd->ep0;
-+		retval = -DWC_E_INVALID;
-+		goto out;
-+	}
-+
-+	num = UE_GET_ADDR(desc->bEndpointAddress);
-+	dir = UE_GET_DIR(desc->bEndpointAddress);
-+
-+	if (!UGETW(desc->wMaxPacketSize)) {
-+		DWC_WARN("bad maxpacketsize\n");
-+		retval = -DWC_E_INVALID;
-+		goto out;
-+	}
-+
-+	if (dir == UE_DIR_IN) {
-+		epcount = pcd->core_if->dev_if->num_in_eps;
-+		for (i = 0; i < epcount; i++) {
-+			if (num == pcd->in_ep[i].dwc_ep.num) {
-+				ep = &pcd->in_ep[i];
-+				break;
-+			}
-+		}
-+	} else {
-+		epcount = pcd->core_if->dev_if->num_out_eps;
-+		for (i = 0; i < epcount; i++) {
-+			if (num == pcd->out_ep[i].dwc_ep.num) {
-+				ep = &pcd->out_ep[i];
-+				break;
-+			}
-+		}
-+	}
-+
-+	if (!ep) {
-+		DWC_WARN("bad address\n");
-+		retval = -DWC_E_INVALID;
-+		goto out;
-+	}
-+
-+	DWC_SPINLOCK_IRQSAVE(pcd->lock, &flags);
-+
-+	ep->desc = desc;
-+	ep->priv = usb_ep;
-+
-+	/*
-+	 * Activate the EP
-+	 */
-+	ep->stopped = 0;
-+
-+	ep->dwc_ep.is_in = (dir == UE_DIR_IN);
-+	ep->dwc_ep.maxpacket = UGETW(desc->wMaxPacketSize);
-+
-+	ep->dwc_ep.type = desc->bmAttributes & UE_XFERTYPE;
-+
-+	if (ep->dwc_ep.is_in) {
-+		if (!GET_CORE_IF(pcd)->en_multiple_tx_fifo) {
-+			ep->dwc_ep.tx_fifo_num = 0;
-+
-+			if (ep->dwc_ep.type == UE_ISOCHRONOUS) {
-+				/*
-+				 * if ISOC EP then assign a Periodic Tx FIFO.
-+				 */
-+				ep->dwc_ep.tx_fifo_num =
-+				    assign_perio_tx_fifo(GET_CORE_IF(pcd));
-+			}
-+		} else {
-+			/*
-+			 * if Dedicated FIFOs mode is on then assign a Tx FIFO.
-+			 */
-+			ep->dwc_ep.tx_fifo_num =
-+			    assign_tx_fifo(GET_CORE_IF(pcd));
-+		}
-+
-+		/* Calculating EP info controller base address */
-+		if (ep->dwc_ep.tx_fifo_num
-+		    && GET_CORE_IF(pcd)->en_multiple_tx_fifo) {
-+			gdfifocfg.d32 =
-+			    DWC_READ_REG32(&GET_CORE_IF(pcd)->
-+					   core_global_regs->gdfifocfg);
-+			gdfifocfgbase.d32 = gdfifocfg.d32 >> 16;
-+			dptxfsiz.d32 =
-+			    (DWC_READ_REG32
-+			     (&GET_CORE_IF(pcd)->core_global_regs->
-+			      dtxfsiz[ep->dwc_ep.tx_fifo_num - 1]) >> 16);
-+			gdfifocfg.b.epinfobase =
-+			    gdfifocfgbase.d32 + dptxfsiz.d32;
-+			if (GET_CORE_IF(pcd)->snpsid <= OTG_CORE_REV_2_94a) {
-+				DWC_WRITE_REG32(&GET_CORE_IF(pcd)->
-+						core_global_regs->gdfifocfg,
-+						gdfifocfg.d32);
-+			}
-+		}
-+	}
-+	/* Set initial data PID. */
-+	if (ep->dwc_ep.type == UE_BULK) {
-+		ep->dwc_ep.data_pid_start = 0;
-+	}
-+
-+	/* Alloc DMA Descriptors */
-+	if (GET_CORE_IF(pcd)->dma_desc_enable) {
-+#ifndef DWC_UTE_PER_IO
-+		if (ep->dwc_ep.type != UE_ISOCHRONOUS) {
-+#endif
-+			ep->dwc_ep.desc_addr =
-+			    dwc_otg_ep_alloc_desc_chain(dev,
-+						&ep->dwc_ep.dma_desc_addr,
-+						MAX_DMA_DESC_CNT);
-+			if (!ep->dwc_ep.desc_addr) {
-+				DWC_WARN("%s, can't allocate DMA descriptor\n",
-+					 __func__);
-+				retval = -DWC_E_SHUTDOWN;
-+				DWC_SPINUNLOCK_IRQRESTORE(pcd->lock, flags);
-+				goto out;
-+			}
-+#ifndef DWC_UTE_PER_IO
-+		}
-+#endif
-+	}
-+
-+	DWC_DEBUGPL(DBG_PCD, "Activate %s: type=%d, mps=%d desc=%p\n",
-+		    (ep->dwc_ep.is_in ? "IN" : "OUT"),
-+		    ep->dwc_ep.type, ep->dwc_ep.maxpacket, ep->desc);
-+#ifdef DWC_UTE_PER_IO
-+	ep->dwc_ep.xiso_bInterval = 1 << (ep->desc->bInterval - 1);
-+#endif
-+	if (ep->dwc_ep.type == DWC_OTG_EP_TYPE_ISOC) {
-+		ep->dwc_ep.bInterval = 1 << (ep->desc->bInterval - 1);
-+		ep->dwc_ep.frame_num = 0xFFFFFFFF;
-+	}
-+
-+	dwc_otg_ep_activate(GET_CORE_IF(pcd), &ep->dwc_ep);
-+
-+#ifdef DWC_UTE_CFI
-+	if (pcd->cfi->ops.ep_enable) {
-+		pcd->cfi->ops.ep_enable(pcd->cfi, pcd, ep);
-+	}
-+#endif
-+
-+	DWC_SPINUNLOCK_IRQRESTORE(pcd->lock, flags);
-+
-+out:
-+	return retval;
-+}
-+
-+/**
-+ * This function is being called from gadget
-+ * to disable PCD endpoint.
-+ */
-+int dwc_otg_pcd_ep_disable(dwc_otg_pcd_t * pcd, void *ep_handle)
-+{
-+	dwc_otg_pcd_ep_t *ep;
-+	dwc_irqflags_t flags;
-+	dwc_otg_dev_dma_desc_t *desc_addr;
-+	dwc_dma_t dma_desc_addr;
-+	gdfifocfg_data_t gdfifocfgbase = {.d32 = 0 };
-+	gdfifocfg_data_t gdfifocfg = {.d32 = 0 };
-+	fifosize_data_t dptxfsiz = {.d32 = 0 };
-+	struct device *dev = dwc_otg_pcd_to_dev(pcd);
-+
-+	ep = get_ep_from_handle(pcd, ep_handle);
-+
-+	if (!ep || !ep->desc) {
-+		DWC_DEBUGPL(DBG_PCD, "bad ep address\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	DWC_SPINLOCK_IRQSAVE(pcd->lock, &flags);
-+
-+	dwc_otg_request_nuke(ep);
-+
-+	dwc_otg_ep_deactivate(GET_CORE_IF(pcd), &ep->dwc_ep);
-+	if (pcd->core_if->core_params->dev_out_nak) {
-+		DWC_TIMER_CANCEL(pcd->core_if->ep_xfer_timer[ep->dwc_ep.num]);
-+		pcd->core_if->ep_xfer_info[ep->dwc_ep.num].state = 0;
-+	}
-+	ep->desc = NULL;
-+	ep->stopped = 1;
-+
-+	gdfifocfg.d32 =
-+	    DWC_READ_REG32(&GET_CORE_IF(pcd)->core_global_regs->gdfifocfg);
-+	gdfifocfgbase.d32 = gdfifocfg.d32 >> 16;
-+
-+	if (ep->dwc_ep.is_in) {
-+		if (GET_CORE_IF(pcd)->en_multiple_tx_fifo) {
-+			/* Flush the Tx FIFO */
-+			dwc_otg_flush_tx_fifo(GET_CORE_IF(pcd),
-+					      ep->dwc_ep.tx_fifo_num);
-+		}
-+		release_perio_tx_fifo(GET_CORE_IF(pcd), ep->dwc_ep.tx_fifo_num);
-+		release_tx_fifo(GET_CORE_IF(pcd), ep->dwc_ep.tx_fifo_num);
-+		if (GET_CORE_IF(pcd)->en_multiple_tx_fifo) {
-+			/* Decreasing EPinfo Base Addr */
-+			dptxfsiz.d32 =
-+			    (DWC_READ_REG32
-+			     (&GET_CORE_IF(pcd)->
-+				core_global_regs->dtxfsiz[ep->dwc_ep.tx_fifo_num-1]) >> 16);
-+			gdfifocfg.b.epinfobase = gdfifocfgbase.d32 - dptxfsiz.d32;
-+			if (GET_CORE_IF(pcd)->snpsid <= OTG_CORE_REV_2_94a) {
-+				DWC_WRITE_REG32(&GET_CORE_IF(pcd)->core_global_regs->gdfifocfg,
-+					gdfifocfg.d32);
-+			}
-+		}
-+	}
-+
-+	/* Free DMA Descriptors */
-+	if (GET_CORE_IF(pcd)->dma_desc_enable) {
-+		if (ep->dwc_ep.type != UE_ISOCHRONOUS) {
-+			desc_addr = ep->dwc_ep.desc_addr;
-+			dma_desc_addr = ep->dwc_ep.dma_desc_addr;
-+
-+			/* Cannot call dma_free_coherent() with IRQs disabled */
-+			DWC_SPINUNLOCK_IRQRESTORE(pcd->lock, flags);
-+			dwc_otg_ep_free_desc_chain(dev, desc_addr, dma_desc_addr,
-+						   MAX_DMA_DESC_CNT);
-+
-+			goto out_unlocked;
-+		}
-+	}
-+	DWC_SPINUNLOCK_IRQRESTORE(pcd->lock, flags);
-+
-+out_unlocked:
-+	DWC_DEBUGPL(DBG_PCD, "%d %s disabled\n", ep->dwc_ep.num,
-+		    ep->dwc_ep.is_in ? "IN" : "OUT");
-+	return 0;
-+
-+}
-+
-+/******************************************************************************/
-+#ifdef DWC_UTE_PER_IO
-+
-+/**
-+ * Free the request and its extended parts
-+ *
-+ */
-+void dwc_pcd_xiso_ereq_free(dwc_otg_pcd_ep_t * ep, dwc_otg_pcd_request_t * req)
-+{
-+	DWC_FREE(req->ext_req.per_io_frame_descs);
-+	DWC_FREE(req);
-+}
-+
-+/**
-+ * Start the next request in the endpoint's queue.
-+ *
-+ */
-+int dwc_otg_pcd_xiso_start_next_request(dwc_otg_pcd_t * pcd,
-+					dwc_otg_pcd_ep_t * ep)
-+{
-+	int i;
-+	dwc_otg_pcd_request_t *req = NULL;
-+	dwc_ep_t *dwcep = NULL;
-+	struct dwc_iso_xreq_port *ereq = NULL;
-+	struct dwc_iso_pkt_desc_port *ddesc_iso;
-+	uint16_t nat;
-+	depctl_data_t diepctl;
-+
-+	dwcep = &ep->dwc_ep;
-+
-+	if (dwcep->xiso_active_xfers > 0) {
-+#if 0	//Disable this to decrease s/w overhead that is crucial for Isoc transfers
-+		DWC_WARN("There are currently active transfers for EP%d \
-+				(active=%d; queued=%d)", dwcep->num, dwcep->xiso_active_xfers,
-+				dwcep->xiso_queued_xfers);
-+#endif
-+		return 0;
-+	}
-+
-+	nat = UGETW(ep->desc->wMaxPacketSize);
-+	nat = (nat >> 11) & 0x03;
-+
-+	if (!DWC_CIRCLEQ_EMPTY(&ep->queue)) {
-+		req = DWC_CIRCLEQ_FIRST(&ep->queue);
-+		ereq = &req->ext_req;
-+		ep->stopped = 0;
-+
-+		/* Get the frame number */
-+		dwcep->xiso_frame_num =
-+		    dwc_otg_get_frame_number(GET_CORE_IF(pcd));
-+		DWC_DEBUG("FRM_NUM=%d", dwcep->xiso_frame_num);
-+
-+		ddesc_iso = ereq->per_io_frame_descs;
-+
-+		if (dwcep->is_in) {
-+			/* Setup DMA Descriptor chain for IN Isoc request */
-+			for (i = 0; i < ereq->pio_pkt_count; i++) {
-+				//if ((i % (nat + 1)) == 0)
-+				if ( i > 0 )
-+					dwcep->xiso_frame_num =
-+					    (dwcep->xiso_bInterval +
-+										dwcep->xiso_frame_num) & 0x3FFF;
-+				dwcep->desc_addr[i].buf =
-+				    req->dma + ddesc_iso[i].offset;
-+				dwcep->desc_addr[i].status.b_iso_in.txbytes =
-+				    ddesc_iso[i].length;
-+				dwcep->desc_addr[i].status.b_iso_in.framenum =
-+				    dwcep->xiso_frame_num;
-+				dwcep->desc_addr[i].status.b_iso_in.bs =
-+				    BS_HOST_READY;
-+				dwcep->desc_addr[i].status.b_iso_in.txsts = 0;
-+				dwcep->desc_addr[i].status.b_iso_in.sp =
-+				    (ddesc_iso[i].length %
-+				     dwcep->maxpacket) ? 1 : 0;
-+				dwcep->desc_addr[i].status.b_iso_in.ioc = 0;
-+				dwcep->desc_addr[i].status.b_iso_in.pid = nat + 1;
-+				dwcep->desc_addr[i].status.b_iso_in.l = 0;
-+
-+				/* Process the last descriptor */
-+				if (i == ereq->pio_pkt_count - 1) {
-+					dwcep->desc_addr[i].status.b_iso_in.ioc = 1;
-+					dwcep->desc_addr[i].status.b_iso_in.l = 1;
-+				}
-+			}
-+
-+			/* Setup and start the transfer for this endpoint */
-+			dwcep->xiso_active_xfers++;
-+			DWC_WRITE_REG32(&GET_CORE_IF(pcd)->dev_if->
-+					in_ep_regs[dwcep->num]->diepdma,
-+					dwcep->dma_desc_addr);
-+			diepctl.d32 = 0;
-+			diepctl.b.epena = 1;
-+			diepctl.b.cnak = 1;
-+			DWC_MODIFY_REG32(&GET_CORE_IF(pcd)->dev_if->
-+					 in_ep_regs[dwcep->num]->diepctl, 0,
-+					 diepctl.d32);
-+		} else {
-+			/* Setup DMA Descriptor chain for OUT Isoc request */
-+			for (i = 0; i < ereq->pio_pkt_count; i++) {
-+				//if ((i % (nat + 1)) == 0)
-+				dwcep->xiso_frame_num = (dwcep->xiso_bInterval +
-+										dwcep->xiso_frame_num) & 0x3FFF;
-+				dwcep->desc_addr[i].buf =
-+				    req->dma + ddesc_iso[i].offset;
-+				dwcep->desc_addr[i].status.b_iso_out.rxbytes =
-+				    ddesc_iso[i].length;
-+				dwcep->desc_addr[i].status.b_iso_out.framenum =
-+				    dwcep->xiso_frame_num;
-+				dwcep->desc_addr[i].status.b_iso_out.bs =
-+				    BS_HOST_READY;
-+				dwcep->desc_addr[i].status.b_iso_out.rxsts = 0;
-+				dwcep->desc_addr[i].status.b_iso_out.sp =
-+				    (ddesc_iso[i].length %
-+				     dwcep->maxpacket) ? 1 : 0;
-+				dwcep->desc_addr[i].status.b_iso_out.ioc = 0;
-+				dwcep->desc_addr[i].status.b_iso_out.pid = nat + 1;
-+				dwcep->desc_addr[i].status.b_iso_out.l = 0;
-+
-+				/* Process the last descriptor */
-+				if (i == ereq->pio_pkt_count - 1) {
-+					dwcep->desc_addr[i].status.b_iso_out.ioc = 1;
-+					dwcep->desc_addr[i].status.b_iso_out.l = 1;
-+				}
-+			}
-+
-+			/* Setup and start the transfer for this endpoint */
-+			dwcep->xiso_active_xfers++;
-+			DWC_WRITE_REG32(&GET_CORE_IF(pcd)->
-+					dev_if->out_ep_regs[dwcep->num]->
-+					doepdma, dwcep->dma_desc_addr);
-+			diepctl.d32 = 0;
-+			diepctl.b.epena = 1;
-+			diepctl.b.cnak = 1;
-+			DWC_MODIFY_REG32(&GET_CORE_IF(pcd)->
-+					 dev_if->out_ep_regs[dwcep->num]->
-+					 doepctl, 0, diepctl.d32);
-+		}
-+
-+	} else {
-+		ep->stopped = 1;
-+	}
-+
-+	return 0;
-+}
-+
-+/**
-+ *	- Remove the request from the queue
-+ */
-+void complete_xiso_ep(dwc_otg_pcd_ep_t * ep)
-+{
-+	dwc_otg_pcd_request_t *req = NULL;
-+	struct dwc_iso_xreq_port *ereq = NULL;
-+	struct dwc_iso_pkt_desc_port *ddesc_iso = NULL;
-+	dwc_ep_t *dwcep = NULL;
-+	int i;
-+
-+	//DWC_DEBUG();
-+	dwcep = &ep->dwc_ep;
-+
-+	/* Get the first pending request from the queue */
-+	if (!DWC_CIRCLEQ_EMPTY(&ep->queue)) {
-+		req = DWC_CIRCLEQ_FIRST(&ep->queue);
-+		if (!req) {
-+			DWC_PRINTF("complete_ep 0x%p, req = NULL!\n", ep);
-+			return;
-+		}
-+		dwcep->xiso_active_xfers--;
-+		dwcep->xiso_queued_xfers--;
-+		/* Remove this request from the queue */
-+		DWC_CIRCLEQ_REMOVE_INIT(&ep->queue, req, queue_entry);
-+	} else {
-+		DWC_PRINTF("complete_ep 0x%p, ep->queue empty!\n", ep);
-+		return;
-+	}
-+
-+	ep->stopped = 1;
-+	ereq = &req->ext_req;
-+	ddesc_iso = ereq->per_io_frame_descs;
-+
-+	if (dwcep->xiso_active_xfers < 0) {
-+		DWC_WARN("EP#%d (xiso_active_xfers=%d)", dwcep->num,
-+			 dwcep->xiso_active_xfers);
-+	}
-+
-+	/* Fill the Isoc descs of portable extended req from dma descriptors */
-+	for (i = 0; i < ereq->pio_pkt_count; i++) {
-+		if (dwcep->is_in) {	/* IN endpoints */
-+			ddesc_iso[i].actual_length = ddesc_iso[i].length -
-+			    dwcep->desc_addr[i].status.b_iso_in.txbytes;
-+			ddesc_iso[i].status =
-+			    dwcep->desc_addr[i].status.b_iso_in.txsts;
-+		} else {	/* OUT endpoints */
-+			ddesc_iso[i].actual_length = ddesc_iso[i].length -
-+			    dwcep->desc_addr[i].status.b_iso_out.rxbytes;
-+			ddesc_iso[i].status =
-+			    dwcep->desc_addr[i].status.b_iso_out.rxsts;
-+		}
-+	}
-+
-+	DWC_SPINUNLOCK(ep->pcd->lock);
-+
-+	/* Call the completion function in the non-portable logic */
-+	ep->pcd->fops->xisoc_complete(ep->pcd, ep->priv, req->priv, 0,
-+				      &req->ext_req);
-+
-+	DWC_SPINLOCK(ep->pcd->lock);
-+
-+	/* Free the request - specific freeing needed for extended request object */
-+	dwc_pcd_xiso_ereq_free(ep, req);
-+
-+	/* Start the next request */
-+	dwc_otg_pcd_xiso_start_next_request(ep->pcd, ep);
-+
-+	return;
-+}
-+
-+/**
-+ * Create and initialize the Isoc pkt descriptors of the extended request.
-+ *
-+ */
-+static int dwc_otg_pcd_xiso_create_pkt_descs(dwc_otg_pcd_request_t * req,
-+					     void *ereq_nonport,
-+					     int atomic_alloc)
-+{
-+	struct dwc_iso_xreq_port *ereq = NULL;
-+	struct dwc_iso_xreq_port *req_mapped = NULL;
-+	struct dwc_iso_pkt_desc_port *ipds = NULL;	/* To be created in this function */
-+	uint32_t pkt_count;
-+	int i;
-+
-+	ereq = &req->ext_req;
-+	req_mapped = (struct dwc_iso_xreq_port *)ereq_nonport;
-+	pkt_count = req_mapped->pio_pkt_count;
-+
-+	/* Create the isoc descs */
-+	if (atomic_alloc) {
-+		ipds = DWC_ALLOC_ATOMIC(sizeof(*ipds) * pkt_count);
-+	} else {
-+		ipds = DWC_ALLOC(sizeof(*ipds) * pkt_count);
-+	}
-+
-+	if (!ipds) {
-+		DWC_ERROR("Failed to allocate isoc descriptors");
-+		return -DWC_E_NO_MEMORY;
-+	}
-+
-+	/* Initialize the extended request fields */
-+	ereq->per_io_frame_descs = ipds;
-+	ereq->error_count = 0;
-+	ereq->pio_alloc_pkt_count = pkt_count;
-+	ereq->pio_pkt_count = pkt_count;
-+	ereq->tr_sub_flags = req_mapped->tr_sub_flags;
-+
-+	/* Init the Isoc descriptors */
-+	for (i = 0; i < pkt_count; i++) {
-+		ipds[i].length = req_mapped->per_io_frame_descs[i].length;
-+		ipds[i].offset = req_mapped->per_io_frame_descs[i].offset;
-+		ipds[i].status = req_mapped->per_io_frame_descs[i].status;	/* 0 */
-+		ipds[i].actual_length =
-+		    req_mapped->per_io_frame_descs[i].actual_length;
-+	}
-+
-+	return 0;
-+}
-+
-+static void prn_ext_request(struct dwc_iso_xreq_port *ereq)
-+{
-+	struct dwc_iso_pkt_desc_port *xfd = NULL;
-+	int i;
-+
-+	DWC_DEBUG("per_io_frame_descs=%p", ereq->per_io_frame_descs);
-+	DWC_DEBUG("tr_sub_flags=%d", ereq->tr_sub_flags);
-+	DWC_DEBUG("error_count=%d", ereq->error_count);
-+	DWC_DEBUG("pio_alloc_pkt_count=%d", ereq->pio_alloc_pkt_count);
-+	DWC_DEBUG("pio_pkt_count=%d", ereq->pio_pkt_count);
-+	DWC_DEBUG("res=%d", ereq->res);
-+
-+	for (i = 0; i < ereq->pio_pkt_count; i++) {
-+		xfd = &ereq->per_io_frame_descs[0];
-+		DWC_DEBUG("FD #%d", i);
-+
-+		DWC_DEBUG("xfd->actual_length=%d", xfd->actual_length);
-+		DWC_DEBUG("xfd->length=%d", xfd->length);
-+		DWC_DEBUG("xfd->offset=%d", xfd->offset);
-+		DWC_DEBUG("xfd->status=%d", xfd->status);
-+	}
-+}
-+
-+/**
-+ *
-+ */
-+int dwc_otg_pcd_xiso_ep_queue(dwc_otg_pcd_t * pcd, void *ep_handle,
-+			      uint8_t * buf, dwc_dma_t dma_buf, uint32_t buflen,
-+			      int zero, void *req_handle, int atomic_alloc,
-+			      void *ereq_nonport)
-+{
-+	dwc_otg_pcd_request_t *req = NULL;
-+	dwc_otg_pcd_ep_t *ep;
-+	dwc_irqflags_t flags;
-+	int res;
-+
-+	ep = get_ep_from_handle(pcd, ep_handle);
-+	if (!ep) {
-+		DWC_WARN("bad ep\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	/* We support this extension only for DDMA mode */
-+	if (ep->dwc_ep.type == DWC_OTG_EP_TYPE_ISOC)
-+		if (!GET_CORE_IF(pcd)->dma_desc_enable)
-+			return -DWC_E_INVALID;
-+
-+	/* Create a dwc_otg_pcd_request_t object */
-+	if (atomic_alloc) {
-+		req = DWC_ALLOC_ATOMIC(sizeof(*req));
-+	} else {
-+		req = DWC_ALLOC(sizeof(*req));
-+	}
-+
-+	if (!req) {
-+		return -DWC_E_NO_MEMORY;
-+	}
-+
-+	/* Create the Isoc descs for this request which shall be the exact match
-+	 * of the structure sent to us from the non-portable logic */
-+	res =
-+	    dwc_otg_pcd_xiso_create_pkt_descs(req, ereq_nonport, atomic_alloc);
-+	if (res) {
-+		DWC_WARN("Failed to init the Isoc descriptors");
-+		DWC_FREE(req);
-+		return res;
-+	}
-+
-+	DWC_SPINLOCK_IRQSAVE(pcd->lock, &flags);
-+
-+	DWC_CIRCLEQ_INIT_ENTRY(req, queue_entry);
-+	req->buf = buf;
-+	req->dma = dma_buf;
-+	req->length = buflen;
-+	req->sent_zlp = zero;
-+	req->priv = req_handle;
-+
-+	//DWC_SPINLOCK_IRQSAVE(pcd->lock, &flags);
-+	ep->dwc_ep.dma_addr = dma_buf;
-+	ep->dwc_ep.start_xfer_buff = buf;
-+	ep->dwc_ep.xfer_buff = buf;
-+	ep->dwc_ep.xfer_len = 0;
-+	ep->dwc_ep.xfer_count = 0;
-+	ep->dwc_ep.sent_zlp = 0;
-+	ep->dwc_ep.total_len = buflen;
-+
-+	/* Add this request to the tail */
-+	DWC_CIRCLEQ_INSERT_TAIL(&ep->queue, req, queue_entry);
-+	ep->dwc_ep.xiso_queued_xfers++;
-+
-+//DWC_DEBUG("CP_0");
-+//DWC_DEBUG("req->ext_req.tr_sub_flags=%d", req->ext_req.tr_sub_flags);
-+//prn_ext_request((struct dwc_iso_xreq_port *) ereq_nonport);
-+//prn_ext_request(&req->ext_req);
-+
-+	//DWC_SPINUNLOCK_IRQRESTORE(pcd->lock, flags);
-+
-+	/* If the req->status == ASAP  then check if there is any active transfer
-+	 * for this endpoint. If no active transfers, then get the first entry
-+	 * from the queue and start that transfer
-+	 */
-+	if (req->ext_req.tr_sub_flags == DWC_EREQ_TF_ASAP) {
-+		res = dwc_otg_pcd_xiso_start_next_request(pcd, ep);
-+		if (res) {
-+			DWC_WARN("Failed to start the next Isoc transfer");
-+			DWC_SPINUNLOCK_IRQRESTORE(pcd->lock, flags);
-+			DWC_FREE(req);
-+			return res;
-+		}
-+	}
-+
-+	DWC_SPINUNLOCK_IRQRESTORE(pcd->lock, flags);
-+	return 0;
-+}
-+
-+#endif
-+/* END ifdef DWC_UTE_PER_IO ***************************************************/
-+int dwc_otg_pcd_ep_queue(dwc_otg_pcd_t * pcd, void *ep_handle,
-+			 uint8_t * buf, dwc_dma_t dma_buf, uint32_t buflen,
-+			 int zero, void *req_handle, int atomic_alloc)
-+{
-+	struct device *dev = dwc_otg_pcd_to_dev(pcd);
-+	dwc_irqflags_t flags;
-+	dwc_otg_pcd_request_t *req;
-+	dwc_otg_pcd_ep_t *ep;
-+	uint32_t max_transfer;
-+
-+	ep = get_ep_from_handle(pcd, ep_handle);
-+	if (!ep || (!ep->desc && ep->dwc_ep.num != 0)) {
-+		DWC_WARN("bad ep\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	if (atomic_alloc) {
-+		req = DWC_ALLOC_ATOMIC(sizeof(*req));
-+	} else {
-+		req = DWC_ALLOC(sizeof(*req));
-+	}
-+
-+	if (!req) {
-+		return -DWC_E_NO_MEMORY;
-+	}
-+	DWC_CIRCLEQ_INIT_ENTRY(req, queue_entry);
-+	if (!GET_CORE_IF(pcd)->core_params->opt) {
-+		if (ep->dwc_ep.num != 0) {
-+			DWC_ERROR("queue req %p, len %d buf %p\n",
-+				  req_handle, buflen, buf);
-+		}
-+	}
-+
-+	req->buf = buf;
-+	req->dma = dma_buf;
-+	req->length = buflen;
-+	req->sent_zlp = zero;
-+	req->priv = req_handle;
-+	req->dw_align_buf = NULL;
-+	if ((dma_buf & 0x3) && GET_CORE_IF(pcd)->dma_enable
-+			&& !GET_CORE_IF(pcd)->dma_desc_enable)
-+		req->dw_align_buf = DWC_DMA_ALLOC(dev, buflen,
-+				 &req->dw_align_buf_dma);
-+	DWC_SPINLOCK_IRQSAVE(pcd->lock, &flags);
-+
-+	/*
-+	 * After adding request to the queue for IN ISOC wait for In Token Received
-+	 * when TX FIFO is empty interrupt and for OUT ISOC wait for OUT Token
-+	 * Received when EP is disabled interrupt to obtain starting microframe
-+	 * (odd/even) start transfer
-+	 */
-+	if (ep->dwc_ep.type == DWC_OTG_EP_TYPE_ISOC) {
-+		if (req != 0) {
-+			depctl_data_t depctl = {.d32 =
-+				    DWC_READ_REG32(&pcd->core_if->dev_if->
-+						   in_ep_regs[ep->dwc_ep.num]->
-+						   diepctl) };
-+			++pcd->request_pending;
-+
-+			DWC_CIRCLEQ_INSERT_TAIL(&ep->queue, req, queue_entry);
-+			if (ep->dwc_ep.is_in) {
-+				depctl.b.cnak = 1;
-+				DWC_WRITE_REG32(&pcd->core_if->dev_if->
-+						in_ep_regs[ep->dwc_ep.num]->
-+						diepctl, depctl.d32);
-+			}
-+
-+			DWC_SPINUNLOCK_IRQRESTORE(pcd->lock, flags);
-+		}
-+		return 0;
-+	}
-+
-+	/*
-+	 * For EP0 IN without premature status, zlp is required?
-+	 */
-+	if (ep->dwc_ep.num == 0 && ep->dwc_ep.is_in) {
-+		DWC_DEBUGPL(DBG_PCDV, "%d-OUT ZLP\n", ep->dwc_ep.num);
-+		//_req->zero = 1;
-+	}
-+
-+	/* Start the transfer */
-+	if (DWC_CIRCLEQ_EMPTY(&ep->queue) && !ep->stopped) {
-+		/* EP0 Transfer? */
-+		if (ep->dwc_ep.num == 0) {
-+			switch (pcd->ep0state) {
-+			case EP0_IN_DATA_PHASE:
-+				DWC_DEBUGPL(DBG_PCD,
-+					    "%s ep0: EP0_IN_DATA_PHASE\n",
-+					    __func__);
-+				break;
-+
-+			case EP0_OUT_DATA_PHASE:
-+				DWC_DEBUGPL(DBG_PCD,
-+					    "%s ep0: EP0_OUT_DATA_PHASE\n",
-+					    __func__);
-+				if (pcd->request_config) {
-+					/* Complete STATUS PHASE */
-+					ep->dwc_ep.is_in = 1;
-+					pcd->ep0state = EP0_IN_STATUS_PHASE;
-+				}
-+				break;
-+
-+			case EP0_IN_STATUS_PHASE:
-+				DWC_DEBUGPL(DBG_PCD,
-+					    "%s ep0: EP0_IN_STATUS_PHASE\n",
-+					    __func__);
-+				break;
-+
-+			default:
-+				DWC_DEBUGPL(DBG_ANY, "ep0: odd state %d\n",
-+					    pcd->ep0state);
-+				DWC_SPINUNLOCK_IRQRESTORE(pcd->lock, flags);
-+				return -DWC_E_SHUTDOWN;
-+			}
-+
-+			ep->dwc_ep.dma_addr = dma_buf;
-+			ep->dwc_ep.start_xfer_buff = buf;
-+			ep->dwc_ep.xfer_buff = buf;
-+			ep->dwc_ep.xfer_len = buflen;
-+			ep->dwc_ep.xfer_count = 0;
-+			ep->dwc_ep.sent_zlp = 0;
-+			ep->dwc_ep.total_len = ep->dwc_ep.xfer_len;
-+
-+			if (zero) {
-+				if ((ep->dwc_ep.xfer_len %
-+				     ep->dwc_ep.maxpacket == 0)
-+				    && (ep->dwc_ep.xfer_len != 0)) {
-+					ep->dwc_ep.sent_zlp = 1;
-+				}
-+
-+			}
-+
-+			dwc_otg_ep0_start_transfer(GET_CORE_IF(pcd),
-+						   &ep->dwc_ep);
-+		}		// non-ep0 endpoints
-+		else {
-+#ifdef DWC_UTE_CFI
-+			if (ep->dwc_ep.buff_mode != BM_STANDARD) {
-+				/* store the request length */
-+				ep->dwc_ep.cfi_req_len = buflen;
-+				pcd->cfi->ops.build_descriptors(pcd->cfi, pcd,
-+								ep, req);
-+			} else {
-+#endif
-+				max_transfer =
-+				    GET_CORE_IF(ep->pcd)->core_params->
-+				    max_transfer_size;
-+
-+				/* Setup and start the Transfer */
-+				if (req->dw_align_buf){
-+					if (ep->dwc_ep.is_in)
-+						dwc_memcpy(req->dw_align_buf,
-+							   buf, buflen);
-+					ep->dwc_ep.dma_addr =
-+					    req->dw_align_buf_dma;
-+					ep->dwc_ep.start_xfer_buff =
-+					    req->dw_align_buf;
-+					ep->dwc_ep.xfer_buff =
-+					    req->dw_align_buf;
-+				} else {
-+					ep->dwc_ep.dma_addr = dma_buf;
-+					ep->dwc_ep.start_xfer_buff = buf;
-+                                        ep->dwc_ep.xfer_buff = buf;
-+				}
-+				ep->dwc_ep.xfer_len = 0;
-+				ep->dwc_ep.xfer_count = 0;
-+				ep->dwc_ep.sent_zlp = 0;
-+				ep->dwc_ep.total_len = buflen;
-+
-+				ep->dwc_ep.maxxfer = max_transfer;
-+				if (GET_CORE_IF(pcd)->dma_desc_enable) {
-+					uint32_t out_max_xfer =
-+					    DDMA_MAX_TRANSFER_SIZE -
-+					    (DDMA_MAX_TRANSFER_SIZE % 4);
-+					if (ep->dwc_ep.is_in) {
-+						if (ep->dwc_ep.maxxfer >
-+						    DDMA_MAX_TRANSFER_SIZE) {
-+							ep->dwc_ep.maxxfer =
-+							    DDMA_MAX_TRANSFER_SIZE;
-+						}
-+					} else {
-+						if (ep->dwc_ep.maxxfer >
-+						    out_max_xfer) {
-+							ep->dwc_ep.maxxfer =
-+							    out_max_xfer;
-+						}
-+					}
-+				}
-+				if (ep->dwc_ep.maxxfer < ep->dwc_ep.total_len) {
-+					ep->dwc_ep.maxxfer -=
-+					    (ep->dwc_ep.maxxfer %
-+					     ep->dwc_ep.maxpacket);
-+				}
-+
-+				if (zero) {
-+					if ((ep->dwc_ep.total_len %
-+					     ep->dwc_ep.maxpacket == 0)
-+					    && (ep->dwc_ep.total_len != 0)) {
-+						ep->dwc_ep.sent_zlp = 1;
-+					}
-+				}
-+#ifdef DWC_UTE_CFI
-+			}
-+#endif
-+			dwc_otg_ep_start_transfer(GET_CORE_IF(pcd),
-+						  &ep->dwc_ep);
-+		}
-+	}
-+
-+	if (req != 0) {
-+		++pcd->request_pending;
-+		DWC_CIRCLEQ_INSERT_TAIL(&ep->queue, req, queue_entry);
-+		if (ep->dwc_ep.is_in && ep->stopped
-+		    && !(GET_CORE_IF(pcd)->dma_enable)) {
-+			/** @todo NGS Create a function for this. */
-+			diepmsk_data_t diepmsk = {.d32 = 0 };
-+			diepmsk.b.intktxfemp = 1;
-+			if (GET_CORE_IF(pcd)->multiproc_int_enable) {
-+				DWC_MODIFY_REG32(&GET_CORE_IF(pcd)->
-+						 dev_if->dev_global_regs->diepeachintmsk
-+						 [ep->dwc_ep.num], 0,
-+						 diepmsk.d32);
-+			} else {
-+				DWC_MODIFY_REG32(&GET_CORE_IF(pcd)->
-+						 dev_if->dev_global_regs->
-+						 diepmsk, 0, diepmsk.d32);
-+			}
-+
-+		}
-+	}
-+	DWC_SPINUNLOCK_IRQRESTORE(pcd->lock, flags);
-+
-+	return 0;
-+}
-+
-+int dwc_otg_pcd_ep_dequeue(dwc_otg_pcd_t * pcd, void *ep_handle,
-+			   void *req_handle)
-+{
-+	dwc_irqflags_t flags;
-+	dwc_otg_pcd_request_t *req;
-+	dwc_otg_pcd_ep_t *ep;
-+
-+	ep = get_ep_from_handle(pcd, ep_handle);
-+	if (!ep || (!ep->desc && ep->dwc_ep.num != 0)) {
-+		DWC_WARN("bad argument\n");
-+		return -DWC_E_INVALID;
-+	}
-+
-+	DWC_SPINLOCK_IRQSAVE(pcd->lock, &flags);
-+
-+	/* make sure it's actually queued on this endpoint */
-+	DWC_CIRCLEQ_FOREACH(req, &ep->queue, queue_entry) {
-+		if (req->priv == (void *)req_handle) {
-+			break;
-+		}
-+	}
-+
-+	if (req->priv != (void *)req_handle) {
-+		DWC_SPINUNLOCK_IRQRESTORE(pcd->lock, flags);
-+		return -DWC_E_INVALID;
-+	}
-+
-+	if (!DWC_CIRCLEQ_EMPTY_ENTRY(req, queue_entry)) {
-+		dwc_otg_request_done(ep, req, -DWC_E_RESTART);
-+	} else {
-+		req = NULL;
-+	}
-+
-+	DWC_SPINUNLOCK_IRQRESTORE(pcd->lock, flags);
-+
-+	return req ? 0 : -DWC_E_SHUTDOWN;
-+
-+}
-+
-+/**
-+ * dwc_otg_pcd_ep_wedge - sets the halt feature and ignores clear requests
-+ *
-+ * Use this to stall an endpoint and ignore CLEAR_FEATURE(HALT_ENDPOINT)
-+ * requests. If the gadget driver clears the halt status, it will
-+ * automatically unwedge the endpoint.
-+ *
-+ * Returns zero on success, else negative DWC error code.
-+ */
-+int dwc_otg_pcd_ep_wedge(dwc_otg_pcd_t * pcd, void *ep_handle)
-+{
-+	dwc_otg_pcd_ep_t *ep;
-+	dwc_irqflags_t flags;
-+	int retval = 0;
-+
-+	ep = get_ep_from_handle(pcd, ep_handle);
-+
-+	if ((!ep->desc && ep != &pcd->ep0) ||
-+	    (ep->desc && (ep->desc->bmAttributes == UE_ISOCHRONOUS))) {
-+		DWC_WARN("%s, bad ep\n", __func__);
-+		return -DWC_E_INVALID;
-+	}
-+
-+	DWC_SPINLOCK_IRQSAVE(pcd->lock, &flags);
-+	if (!DWC_CIRCLEQ_EMPTY(&ep->queue)) {
-+		DWC_WARN("%d %s XFer In process\n", ep->dwc_ep.num,
-+			 ep->dwc_ep.is_in ? "IN" : "OUT");
-+		retval = -DWC_E_AGAIN;
-+	} else {
-+                /* This code needs to be reviewed */
-+		if (ep->dwc_ep.is_in == 1 && GET_CORE_IF(pcd)->dma_desc_enable) {
-+			dtxfsts_data_t txstatus;
-+			fifosize_data_t txfifosize;
-+
-+			txfifosize.d32 =
-+			    DWC_READ_REG32(&GET_CORE_IF(pcd)->
-+					   core_global_regs->dtxfsiz[ep->dwc_ep.
-+								     tx_fifo_num]);
-+			txstatus.d32 =
-+			    DWC_READ_REG32(&GET_CORE_IF(pcd)->
-+					   dev_if->in_ep_regs[ep->dwc_ep.num]->
-+					   dtxfsts);
-+
-+			if (txstatus.b.txfspcavail < txfifosize.b.depth) {
-+				DWC_WARN("%s() Data In Tx Fifo\n", __func__);
-+				retval = -DWC_E_AGAIN;
-+			} else {
-+				if (ep->dwc_ep.num == 0) {
-+					pcd->ep0state = EP0_STALL;
-+				}
-+
-+				ep->stopped = 1;
-+				dwc_otg_ep_set_stall(GET_CORE_IF(pcd),
-+						     &ep->dwc_ep);
-+			}
-+		} else {
-+			if (ep->dwc_ep.num == 0) {
-+				pcd->ep0state = EP0_STALL;
-+			}
-+
-+			ep->stopped = 1;
-+			dwc_otg_ep_set_stall(GET_CORE_IF(pcd), &ep->dwc_ep);
-+		}
-+	}
-+
-+	DWC_SPINUNLOCK_IRQRESTORE(pcd->lock, flags);
-+
-+	return retval;
-+}
-+
-+int dwc_otg_pcd_ep_halt(dwc_otg_pcd_t * pcd, void *ep_handle, int value)
-+{
-+	dwc_otg_pcd_ep_t *ep;
-+	dwc_irqflags_t flags;
-+	int retval = 0;
-+
-+	ep = get_ep_from_handle(pcd, ep_handle);
-+
-+	if (!ep || (!ep->desc && ep != &pcd->ep0) ||
-+	    (ep->desc && (ep->desc->bmAttributes == UE_ISOCHRONOUS))) {
-+		DWC_WARN("%s, bad ep\n", __func__);
-+		return -DWC_E_INVALID;
-+	}
-+
-+	DWC_SPINLOCK_IRQSAVE(pcd->lock, &flags);
-+	if (!DWC_CIRCLEQ_EMPTY(&ep->queue)) {
-+		DWC_WARN("%d %s XFer In process\n", ep->dwc_ep.num,
-+			 ep->dwc_ep.is_in ? "IN" : "OUT");
-+		retval = -DWC_E_AGAIN;
-+	} else if (value == 0) {
-+		dwc_otg_ep_clear_stall(GET_CORE_IF(pcd), &ep->dwc_ep);
-+	} else if (value == 1) {
-+		if (ep->dwc_ep.is_in == 1 && GET_CORE_IF(pcd)->dma_desc_enable) {
-+			dtxfsts_data_t txstatus;
-+			fifosize_data_t txfifosize;
-+
-+			txfifosize.d32 =
-+			    DWC_READ_REG32(&GET_CORE_IF(pcd)->core_global_regs->
-+					   dtxfsiz[ep->dwc_ep.tx_fifo_num]);
-+			txstatus.d32 =
-+			    DWC_READ_REG32(&GET_CORE_IF(pcd)->dev_if->
-+					   in_ep_regs[ep->dwc_ep.num]->dtxfsts);
-+
-+			if (txstatus.b.txfspcavail < txfifosize.b.depth) {
-+				DWC_WARN("%s() Data In Tx Fifo\n", __func__);
-+				retval = -DWC_E_AGAIN;
-+			} else {
-+				if (ep->dwc_ep.num == 0) {
-+					pcd->ep0state = EP0_STALL;
-+				}
-+
-+				ep->stopped = 1;
-+				dwc_otg_ep_set_stall(GET_CORE_IF(pcd),
-+						     &ep->dwc_ep);
-+			}
-+		} else {
-+			if (ep->dwc_ep.num == 0) {
-+				pcd->ep0state = EP0_STALL;
-+			}
-+
-+			ep->stopped = 1;
-+			dwc_otg_ep_set_stall(GET_CORE_IF(pcd), &ep->dwc_ep);
-+		}
-+	} else if (value == 2) {
-+		ep->dwc_ep.stall_clear_flag = 0;
-+	} else if (value == 3) {
-+		ep->dwc_ep.stall_clear_flag = 1;
-+	}
-+
-+	DWC_SPINUNLOCK_IRQRESTORE(pcd->lock, flags);
-+
-+	return retval;
-+}
-+
-+/**
-+ * This function initiates remote wakeup of the host from suspend state.
-+ */
-+void dwc_otg_pcd_rem_wkup_from_suspend(dwc_otg_pcd_t * pcd, int set)
-+{
-+	dctl_data_t dctl = { 0 };
-+	dwc_otg_core_if_t *core_if = GET_CORE_IF(pcd);
-+	dsts_data_t dsts;
-+
-+	dsts.d32 = DWC_READ_REG32(&core_if->dev_if->dev_global_regs->dsts);
-+	if (!dsts.b.suspsts) {
-+		DWC_WARN("Remote wakeup while is not in suspend state\n");
-+	}
-+	/* Check if DEVICE_REMOTE_WAKEUP feature enabled */
-+	if (pcd->remote_wakeup_enable) {
-+		if (set) {
-+
-+			if (core_if->adp_enable) {
-+				gpwrdn_data_t gpwrdn;
-+
-+				dwc_otg_adp_probe_stop(core_if);
-+
-+				/* Mask SRP detected interrupt from Power Down Logic */
-+				gpwrdn.d32 = 0;
-+				gpwrdn.b.srp_det_msk = 1;
-+				DWC_MODIFY_REG32(&core_if->
-+						 core_global_regs->gpwrdn,
-+						 gpwrdn.d32, 0);
-+
-+				/* Disable Power Down Logic */
-+				gpwrdn.d32 = 0;
-+				gpwrdn.b.pmuactv = 1;
-+				DWC_MODIFY_REG32(&core_if->
-+						 core_global_regs->gpwrdn,
-+						 gpwrdn.d32, 0);
-+
-+				/*
-+				 * Initialize the Core for Device mode.
-+				 */
-+				core_if->op_state = B_PERIPHERAL;
-+				dwc_otg_core_init(core_if);
-+				dwc_otg_enable_global_interrupts(core_if);
-+				cil_pcd_start(core_if);
-+
-+				dwc_otg_initiate_srp(core_if);
-+			}
-+
-+			dctl.b.rmtwkupsig = 1;
-+			DWC_MODIFY_REG32(&core_if->dev_if->dev_global_regs->
-+					 dctl, 0, dctl.d32);
-+			DWC_DEBUGPL(DBG_PCD, "Set Remote Wakeup\n");
-+
-+			dwc_mdelay(2);
-+			DWC_MODIFY_REG32(&core_if->dev_if->dev_global_regs->
-+					 dctl, dctl.d32, 0);
-+			DWC_DEBUGPL(DBG_PCD, "Clear Remote Wakeup\n");
-+		}
-+	} else {
-+		DWC_DEBUGPL(DBG_PCD, "Remote Wakeup is disabled\n");
-+	}
-+}
-+
-+#ifdef CONFIG_USB_DWC_OTG_LPM
-+/**
-+ * This function initiates remote wakeup of the host from L1 sleep state.
-+ */
-+void dwc_otg_pcd_rem_wkup_from_sleep(dwc_otg_pcd_t * pcd, int set)
-+{
-+	glpmcfg_data_t lpmcfg;
-+	dwc_otg_core_if_t *core_if = GET_CORE_IF(pcd);
-+
-+	lpmcfg.d32 = DWC_READ_REG32(&core_if->core_global_regs->glpmcfg);
-+
-+	/* Check if we are in L1 state */
-+	if (!lpmcfg.b.prt_sleep_sts) {
-+		DWC_DEBUGPL(DBG_PCD, "Device is not in sleep state\n");
-+		return;
-+	}
-+
-+	/* Check if host allows remote wakeup */
-+	if (!lpmcfg.b.rem_wkup_en) {
-+		DWC_DEBUGPL(DBG_PCD, "Host does not allow remote wakeup\n");
-+		return;
-+	}
-+
-+	/* Check if Resume OK */
-+	if (!lpmcfg.b.sleep_state_resumeok) {
-+		DWC_DEBUGPL(DBG_PCD, "Sleep state resume is not OK\n");
-+		return;
-+	}
-+
-+	lpmcfg.d32 = DWC_READ_REG32(&core_if->core_global_regs->glpmcfg);
-+	lpmcfg.b.en_utmi_sleep = 0;
-+	lpmcfg.b.hird_thres &= (~(1 << 4));
-+	DWC_WRITE_REG32(&core_if->core_global_regs->glpmcfg, lpmcfg.d32);
-+
-+	if (set) {
-+		dctl_data_t dctl = {.d32 = 0 };
-+		dctl.b.rmtwkupsig = 1;
-+		/* Set RmtWkUpSig bit to start remote wakup signaling.
-+		 * Hardware will automatically clear this bit.
-+		 */
-+		DWC_MODIFY_REG32(&core_if->dev_if->dev_global_regs->dctl,
-+				 0, dctl.d32);
-+		DWC_DEBUGPL(DBG_PCD, "Set Remote Wakeup\n");
-+	}
-+
-+}
-+#endif
-+
-+/**
-+ * Performs remote wakeup.
-+ */
-+void dwc_otg_pcd_remote_wakeup(dwc_otg_pcd_t * pcd, int set)
-+{
-+	dwc_otg_core_if_t *core_if = GET_CORE_IF(pcd);
-+	dwc_irqflags_t flags;
-+	if (dwc_otg_is_device_mode(core_if)) {
-+		DWC_SPINLOCK_IRQSAVE(pcd->lock, &flags);
-+#ifdef CONFIG_USB_DWC_OTG_LPM
-+		if (core_if->lx_state == DWC_OTG_L1) {
-+			dwc_otg_pcd_rem_wkup_from_sleep(pcd, set);
-+		} else {
-+#endif
-+			dwc_otg_pcd_rem_wkup_from_suspend(pcd, set);
-+#ifdef CONFIG_USB_DWC_OTG_LPM
-+		}
-+#endif
-+		DWC_SPINUNLOCK_IRQRESTORE(pcd->lock, flags);
-+	}
-+	return;
-+}
-+
-+void dwc_otg_pcd_disconnect_us(dwc_otg_pcd_t * pcd, int no_of_usecs)
-+{
-+	dwc_otg_core_if_t *core_if = GET_CORE_IF(pcd);
-+	dctl_data_t dctl = { 0 };
-+
-+	if (dwc_otg_is_device_mode(core_if)) {
-+		dctl.b.sftdiscon = 1;
-+		DWC_PRINTF("Soft disconnect for %d useconds\n",no_of_usecs);
-+		DWC_MODIFY_REG32(&core_if->dev_if->dev_global_regs->dctl, 0, dctl.d32);
-+		dwc_udelay(no_of_usecs);
-+		DWC_MODIFY_REG32(&core_if->dev_if->dev_global_regs->dctl, dctl.d32,0);
-+
-+	} else{
-+		DWC_PRINTF("NOT SUPPORTED IN HOST MODE\n");
-+	}
-+	return;
-+
-+}
-+
-+int dwc_otg_pcd_wakeup(dwc_otg_pcd_t * pcd)
-+{
-+	dsts_data_t dsts;
-+	gotgctl_data_t gotgctl;
-+
-+	/*
-+	 * This function starts the Protocol if no session is in progress. If
-+	 * a session is already in progress, but the device is suspended,
-+	 * remote wakeup signaling is started.
-+	 */
-+
-+	/* Check if valid session */
-+	gotgctl.d32 =
-+	    DWC_READ_REG32(&(GET_CORE_IF(pcd)->core_global_regs->gotgctl));
-+	if (gotgctl.b.bsesvld) {
-+		/* Check if suspend state */
-+		dsts.d32 =
-+		    DWC_READ_REG32(&
-+				   (GET_CORE_IF(pcd)->dev_if->
-+				    dev_global_regs->dsts));
-+		if (dsts.b.suspsts) {
-+			dwc_otg_pcd_remote_wakeup(pcd, 1);
-+		}
-+	} else {
-+		dwc_otg_pcd_initiate_srp(pcd);
-+	}
-+
-+	return 0;
-+
-+}
-+
-+/**
-+ * Start the SRP timer to detect when the SRP does not complete within
-+ * 6 seconds.
-+ *
-+ * @param pcd the pcd structure.
-+ */
-+void dwc_otg_pcd_initiate_srp(dwc_otg_pcd_t * pcd)
-+{
-+	dwc_irqflags_t flags;
-+	DWC_SPINLOCK_IRQSAVE(pcd->lock, &flags);
-+	dwc_otg_initiate_srp(GET_CORE_IF(pcd));
-+	DWC_SPINUNLOCK_IRQRESTORE(pcd->lock, flags);
-+}
-+
-+int dwc_otg_pcd_get_frame_number(dwc_otg_pcd_t * pcd)
-+{
-+	return dwc_otg_get_frame_number(GET_CORE_IF(pcd));
-+}
-+
-+int dwc_otg_pcd_is_lpm_enabled(dwc_otg_pcd_t * pcd)
-+{
-+	return GET_CORE_IF(pcd)->core_params->lpm_enable;
-+}
-+
-+uint32_t get_b_hnp_enable(dwc_otg_pcd_t * pcd)
-+{
-+	return pcd->b_hnp_enable;
-+}
-+
-+uint32_t get_a_hnp_support(dwc_otg_pcd_t * pcd)
-+{
-+	return pcd->a_hnp_support;
-+}
-+
-+uint32_t get_a_alt_hnp_support(dwc_otg_pcd_t * pcd)
-+{
-+	return pcd->a_alt_hnp_support;
-+}
-+
-+int dwc_otg_pcd_get_rmwkup_enable(dwc_otg_pcd_t * pcd)
-+{
-+	return pcd->remote_wakeup_enable;
-+}
-+
-+#endif /* DWC_HOST_ONLY */
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd.h
-@@ -0,0 +1,273 @@
-+/* ==========================================================================
-+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.h $
-+ * $Revision: #48 $
-+ * $Date: 2012/08/10 $
-+ * $Change: 2047372 $
-+ *
-+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
-+ * "Software") is an Unsupported proprietary work of Synopsys, Inc. unless
-+ * otherwise expressly agreed to in writing between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product under
-+ * any End User Software License Agreement or Agreement for Licensed Product
-+ * with Synopsys or any supplement thereto. You are permitted to use and
-+ * redistribute this Software in source and binary forms, with or without
-+ * modification, provided that redistributions of source code must retain this
-+ * notice. You may not view, use, disclose, copy or distribute this file or
-+ * any information contained herein except pursuant to this license grant from
-+ * Synopsys. If you do not agree with this notice, including the disclaimer
-+ * below, then you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" BASIS
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS BE LIABLE FOR ANY DIRECT,
-+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================== */
-+#ifndef DWC_HOST_ONLY
-+#if !defined(__DWC_PCD_H__)
-+#define __DWC_PCD_H__
-+
-+#include "dwc_otg_os_dep.h"
-+#include "usb.h"
-+#include "dwc_otg_cil.h"
-+#include "dwc_otg_pcd_if.h"
-+#include "dwc_otg_driver.h"
-+
-+struct cfiobject;
-+
-+/**
-+ * @file
-+ *
-+ * This file contains the structures, constants, and interfaces for
-+ * the Perpherial Contoller Driver (PCD).
-+ *
-+ * The Peripheral Controller Driver (PCD) for Linux will implement the
-+ * Gadget API, so that the existing Gadget drivers can be used. For
-+ * the Mass Storage Function driver the File-backed USB Storage Gadget
-+ * (FBS) driver will be used.  The FBS driver supports the
-+ * Control-Bulk (CB), Control-Bulk-Interrupt (CBI), and Bulk-Only
-+ * transports.
-+ *
-+ */
-+
-+/** Invalid DMA Address */
-+#define DWC_DMA_ADDR_INVALID	(~(dwc_dma_t)0)
-+
-+/** Max Transfer size for any EP */
-+#define DDMA_MAX_TRANSFER_SIZE 65535
-+
-+/**
-+ * Get the pointer to the core_if from the pcd pointer.
-+ */
-+#define GET_CORE_IF( _pcd ) (_pcd->core_if)
-+
-+/**
-+ * States of EP0.
-+ */
-+typedef enum ep0_state {
-+	EP0_DISCONNECT,		/* no host */
-+	EP0_IDLE,
-+	EP0_IN_DATA_PHASE,
-+	EP0_OUT_DATA_PHASE,
-+	EP0_IN_STATUS_PHASE,
-+	EP0_OUT_STATUS_PHASE,
-+	EP0_STALL,
-+} ep0state_e;
-+
-+/** Fordward declaration.*/
-+struct dwc_otg_pcd;
-+
-+/** DWC_otg iso request structure.
-+ *
-+ */
-+typedef struct usb_iso_request dwc_otg_pcd_iso_request_t;
-+
-+#ifdef DWC_UTE_PER_IO
-+
-+/**
-+ * This shall be the exact analogy of the same type structure defined in the
-+ * usb_gadget.h. Each descriptor contains
-+ */
-+struct dwc_iso_pkt_desc_port {
-+	uint32_t offset;
-+	uint32_t length;	/* expected length */
-+	uint32_t actual_length;
-+	uint32_t status;
-+};
-+
-+struct dwc_iso_xreq_port {
-+	/** transfer/submission flag */
-+	uint32_t tr_sub_flags;
-+	/** Start the request ASAP */
-+#define DWC_EREQ_TF_ASAP		0x00000002
-+	/** Just enqueue the request w/o initiating a transfer */
-+#define DWC_EREQ_TF_ENQUEUE		0x00000004
-+
-+	/**
-+	* count of ISO packets attached to this request - shall
-+	* not exceed the pio_alloc_pkt_count
-+	*/
-+	uint32_t pio_pkt_count;
-+	/** count of ISO packets allocated for this request */
-+	uint32_t pio_alloc_pkt_count;
-+	/** number of ISO packet errors */
-+	uint32_t error_count;
-+	/** reserved for future extension */
-+	uint32_t res;
-+	/** Will be allocated and freed in the UTE gadget and based on the CFC value */
-+	struct dwc_iso_pkt_desc_port *per_io_frame_descs;
-+};
-+#endif
-+/** DWC_otg request structure.
-+ * This structure is a list of requests.
-+ */
-+typedef struct dwc_otg_pcd_request {
-+	void *priv;
-+	void *buf;
-+	dwc_dma_t dma;
-+	uint32_t length;
-+	uint32_t actual;
-+	unsigned sent_zlp:1;
-+    /**
-+     * Used instead of original buffer if
-+     * it(physical address) is not dword-aligned.
-+     **/
-+     uint8_t *dw_align_buf;
-+     dwc_dma_t dw_align_buf_dma;
-+
-+	 DWC_CIRCLEQ_ENTRY(dwc_otg_pcd_request) queue_entry;
-+#ifdef DWC_UTE_PER_IO
-+	struct dwc_iso_xreq_port ext_req;
-+	//void *priv_ereq_nport; /*  */
-+#endif
-+} dwc_otg_pcd_request_t;
-+
-+DWC_CIRCLEQ_HEAD(req_list, dwc_otg_pcd_request);
-+
-+/**	  PCD EP structure.
-+ * This structure describes an EP, there is an array of EPs in the PCD
-+ * structure.
-+ */
-+typedef struct dwc_otg_pcd_ep {
-+	/** USB EP Descriptor */
-+	const usb_endpoint_descriptor_t *desc;
-+
-+	/** queue of dwc_otg_pcd_requests. */
-+	struct req_list queue;
-+	unsigned stopped:1;
-+	unsigned disabling:1;
-+	unsigned dma:1;
-+	unsigned queue_sof:1;
-+
-+#ifdef DWC_EN_ISOC
-+	/** ISOC req handle passed */
-+	void *iso_req_handle;
-+#endif				//_EN_ISOC_
-+
-+	/** DWC_otg ep data. */
-+	dwc_ep_t dwc_ep;
-+
-+	/** Pointer to PCD */
-+	struct dwc_otg_pcd *pcd;
-+
-+	void *priv;
-+} dwc_otg_pcd_ep_t;
-+
-+/** DWC_otg PCD Structure.
-+ * This structure encapsulates the data for the dwc_otg PCD.
-+ */
-+struct dwc_otg_pcd {
-+	const struct dwc_otg_pcd_function_ops *fops;
-+	/** The DWC otg device pointer */
-+	struct dwc_otg_device *otg_dev;
-+	/** Core Interface */
-+	dwc_otg_core_if_t *core_if;
-+	/** State of EP0 */
-+	ep0state_e ep0state;
-+	/** EP0 Request is pending */
-+	unsigned ep0_pending:1;
-+	/** Indicates when SET CONFIGURATION Request is in process */
-+	unsigned request_config:1;
-+	/** The state of the Remote Wakeup Enable. */
-+	unsigned remote_wakeup_enable:1;
-+	/** The state of the B-Device HNP Enable. */
-+	unsigned b_hnp_enable:1;
-+	/** The state of A-Device HNP Support. */
-+	unsigned a_hnp_support:1;
-+	/** The state of the A-Device Alt HNP support. */
-+	unsigned a_alt_hnp_support:1;
-+	/** Count of pending Requests */
-+	unsigned request_pending;
-+
-+	/** SETUP packet for EP0
-+	 * This structure is allocated as a DMA buffer on PCD initialization
-+	 * with enough space for up to 3 setup packets.
-+	 */
-+	union {
-+		usb_device_request_t req;
-+		uint32_t d32[2];
-+	} *setup_pkt;
-+
-+	dwc_dma_t setup_pkt_dma_handle;
-+
-+	/* Additional buffer and flag for CTRL_WR premature case */
-+	uint8_t *backup_buf;
-+	unsigned data_terminated;
-+
-+	/** 2-byte dma buffer used to return status from GET_STATUS */
-+	uint16_t *status_buf;
-+	dwc_dma_t status_buf_dma_handle;
-+
-+	/** EP0 */
-+	dwc_otg_pcd_ep_t ep0;
-+
-+	/** Array of IN EPs. */
-+	dwc_otg_pcd_ep_t in_ep[MAX_EPS_CHANNELS - 1];
-+	/** Array of OUT EPs. */
-+	dwc_otg_pcd_ep_t out_ep[MAX_EPS_CHANNELS - 1];
-+	/** number of valid EPs in the above array. */
-+//        unsigned      num_eps : 4;
-+	dwc_spinlock_t *lock;
-+
-+	/** Tasklet to defer starting of TEST mode transmissions until
-+	 *	Status Phase has been completed.
-+	 */
-+	dwc_tasklet_t *test_mode_tasklet;
-+
-+	/** Tasklet to delay starting of xfer in DMA mode */
-+	dwc_tasklet_t *start_xfer_tasklet;
-+
-+	/** The test mode to enter when the tasklet is executed. */
-+	unsigned test_mode;
-+	/** The cfi_api structure that implements most of the CFI API
-+	 * and OTG specific core configuration functionality
-+	 */
-+#ifdef DWC_UTE_CFI
-+	struct cfiobject *cfi;
-+#endif
-+
-+};
-+
-+static inline struct device *dwc_otg_pcd_to_dev(struct dwc_otg_pcd *pcd)
-+{
-+	return &pcd->otg_dev->os_dep.platformdev->dev;
-+}
-+
-+//FIXME this functions should be static, and this prototypes should be removed
-+extern void dwc_otg_request_nuke(dwc_otg_pcd_ep_t * ep);
-+extern void dwc_otg_request_done(dwc_otg_pcd_ep_t * ep,
-+				 dwc_otg_pcd_request_t * req, int32_t status);
-+
-+void dwc_otg_iso_buffer_done(dwc_otg_pcd_t * pcd, dwc_otg_pcd_ep_t * ep,
-+			     void *req_handle);
-+
-+extern void do_test_mode(void *data);
-+#endif
-+#endif /* DWC_HOST_ONLY */
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h
-@@ -0,0 +1,361 @@
-+/* ==========================================================================
-+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_if.h $
-+ * $Revision: #11 $
-+ * $Date: 2011/10/26 $
-+ * $Change: 1873028 $
-+ *
-+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
-+ * "Software") is an Unsupported proprietary work of Synopsys, Inc. unless
-+ * otherwise expressly agreed to in writing between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product under
-+ * any End User Software License Agreement or Agreement for Licensed Product
-+ * with Synopsys or any supplement thereto. You are permitted to use and
-+ * redistribute this Software in source and binary forms, with or without
-+ * modification, provided that redistributions of source code must retain this
-+ * notice. You may not view, use, disclose, copy or distribute this file or
-+ * any information contained herein except pursuant to this license grant from
-+ * Synopsys. If you do not agree with this notice, including the disclaimer
-+ * below, then you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" BASIS
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS BE LIABLE FOR ANY DIRECT,
-+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================== */
-+#ifndef DWC_HOST_ONLY
-+
-+#if !defined(__DWC_PCD_IF_H__)
-+#define __DWC_PCD_IF_H__
-+
-+//#include "dwc_os.h"
-+#include "dwc_otg_core_if.h"
-+#include "dwc_otg_driver.h"
-+
-+/** @file
-+ * This file defines DWC_OTG PCD Core API.
-+ */
-+
-+struct dwc_otg_pcd;
-+typedef struct dwc_otg_pcd dwc_otg_pcd_t;
-+
-+/** Maxpacket size for EP0 */
-+#define MAX_EP0_SIZE	64
-+/** Maxpacket size for any EP */
-+#define MAX_PACKET_SIZE 1024
-+
-+/** @name Function Driver Callbacks */
-+/** @{ */
-+
-+/** This function will be called whenever a previously queued request has
-+ * completed.  The status value will be set to -DWC_E_SHUTDOWN to indicated a
-+ * failed or aborted transfer, or -DWC_E_RESTART to indicate the device was reset,
-+ * or -DWC_E_TIMEOUT to indicate it timed out, or -DWC_E_INVALID to indicate invalid
-+ * parameters. */
-+typedef int (*dwc_completion_cb_t) (dwc_otg_pcd_t * pcd, void *ep_handle,
-+				    void *req_handle, int32_t status,
-+				    uint32_t actual);
-+/**
-+ * This function will be called whenever a previousle queued ISOC request has
-+ * completed. Count of ISOC packets could be read using dwc_otg_pcd_get_iso_packet_count
-+ * function.
-+ * The status of each ISOC packet could be read using dwc_otg_pcd_get_iso_packet_*
-+ * functions.
-+ */
-+typedef int (*dwc_isoc_completion_cb_t) (dwc_otg_pcd_t * pcd, void *ep_handle,
-+					 void *req_handle, int proc_buf_num);
-+/** This function should handle any SETUP request that cannot be handled by the
-+ * PCD Core.  This includes most GET_DESCRIPTORs, SET_CONFIGS, Any
-+ * class-specific requests, etc.  The function must non-blocking.
-+ *
-+ * Returns 0 on success.
-+ * Returns -DWC_E_NOT_SUPPORTED if the request is not supported.
-+ * Returns -DWC_E_INVALID if the setup request had invalid parameters or bytes.
-+ * Returns -DWC_E_SHUTDOWN on any other error. */
-+typedef int (*dwc_setup_cb_t) (dwc_otg_pcd_t * pcd, uint8_t * bytes);
-+/** This is called whenever the device has been disconnected.  The function
-+ * driver should take appropriate action to clean up all pending requests in the
-+ * PCD Core, remove all endpoints (except ep0), and initialize back to reset
-+ * state. */
-+typedef int (*dwc_disconnect_cb_t) (dwc_otg_pcd_t * pcd);
-+/** This function is called when device has been connected. */
-+typedef int (*dwc_connect_cb_t) (dwc_otg_pcd_t * pcd, int speed);
-+/** This function is called when device has been suspended */
-+typedef int (*dwc_suspend_cb_t) (dwc_otg_pcd_t * pcd);
-+/** This function is called when device has received LPM tokens, i.e.
-+ * device has been sent to sleep state. */
-+typedef int (*dwc_sleep_cb_t) (dwc_otg_pcd_t * pcd);
-+/** This function is called when device has been resumed
-+ * from suspend(L2) or L1 sleep state. */
-+typedef int (*dwc_resume_cb_t) (dwc_otg_pcd_t * pcd);
-+/** This function is called whenever hnp params has been changed.
-+ * User can call get_b_hnp_enable, get_a_hnp_support, get_a_alt_hnp_support functions
-+ * to get hnp parameters. */
-+typedef int (*dwc_hnp_params_changed_cb_t) (dwc_otg_pcd_t * pcd);
-+/** This function is called whenever USB RESET is detected. */
-+typedef int (*dwc_reset_cb_t) (dwc_otg_pcd_t * pcd);
-+
-+typedef int (*cfi_setup_cb_t) (dwc_otg_pcd_t * pcd, void *ctrl_req_bytes);
-+
-+/**
-+ *
-+ * @param ep_handle	Void pointer to the usb_ep structure
-+ * @param ereq_port Pointer to the extended request structure created in the
-+ *					portable part.
-+ */
-+typedef int (*xiso_completion_cb_t) (dwc_otg_pcd_t * pcd, void *ep_handle,
-+				     void *req_handle, int32_t status,
-+				     void *ereq_port);
-+/** Function Driver Ops Data Structure */
-+struct dwc_otg_pcd_function_ops {
-+	dwc_connect_cb_t connect;
-+	dwc_disconnect_cb_t disconnect;
-+	dwc_setup_cb_t setup;
-+	dwc_completion_cb_t complete;
-+	dwc_isoc_completion_cb_t isoc_complete;
-+	dwc_suspend_cb_t suspend;
-+	dwc_sleep_cb_t sleep;
-+	dwc_resume_cb_t resume;
-+	dwc_reset_cb_t reset;
-+	dwc_hnp_params_changed_cb_t hnp_changed;
-+	cfi_setup_cb_t cfi_setup;
-+#ifdef DWC_UTE_PER_IO
-+	xiso_completion_cb_t xisoc_complete;
-+#endif
-+};
-+/** @} */
-+
-+/** @name Function Driver Functions */
-+/** @{ */
-+
-+/** Call this function to get pointer on dwc_otg_pcd_t,
-+ * this pointer will be used for all PCD API functions.
-+ *
-+ * @param core_if The DWC_OTG Core
-+ */
-+extern dwc_otg_pcd_t *dwc_otg_pcd_init(dwc_otg_device_t *otg_dev);
-+
-+/** Frees PCD allocated by dwc_otg_pcd_init
-+ *
-+ * @param pcd The PCD
-+ */
-+extern void dwc_otg_pcd_remove(dwc_otg_pcd_t * pcd);
-+
-+/** Call this to bind the function driver to the PCD Core.
-+ *
-+ * @param pcd Pointer on dwc_otg_pcd_t returned by dwc_otg_pcd_init function.
-+ * @param fops The Function Driver Ops data structure containing pointers to all callbacks.
-+ */
-+extern void dwc_otg_pcd_start(dwc_otg_pcd_t * pcd,
-+			      const struct dwc_otg_pcd_function_ops *fops);
-+
-+/** Enables an endpoint for use.  This function enables an endpoint in
-+ * the PCD.  The endpoint is described by the ep_desc which has the
-+ * same format as a USB ep descriptor.  The ep_handle parameter is used to refer
-+ * to the endpoint from other API functions and in callbacks.  Normally this
-+ * should be called after a SET_CONFIGURATION/SET_INTERFACE to configure the
-+ * core for that interface.
-+ *
-+ * Returns -DWC_E_INVALID if invalid parameters were passed.
-+ * Returns -DWC_E_SHUTDOWN if any other error ocurred.
-+ * Returns 0 on success.
-+ *
-+ * @param pcd The PCD
-+ * @param ep_desc Endpoint descriptor
-+ * @param usb_ep Handle on endpoint, that will be used to identify endpoint.
-+ */
-+extern int dwc_otg_pcd_ep_enable(dwc_otg_pcd_t * pcd,
-+				 const uint8_t * ep_desc, void *usb_ep);
-+
-+/** Disable the endpoint referenced by ep_handle.
-+ *
-+ * Returns -DWC_E_INVALID if invalid parameters were passed.
-+ * Returns -DWC_E_SHUTDOWN if any other error occurred.
-+ * Returns 0 on success. */
-+extern int dwc_otg_pcd_ep_disable(dwc_otg_pcd_t * pcd, void *ep_handle);
-+
-+/** Queue a data transfer request on the endpoint referenced by ep_handle.
-+ * After the transfer is completes, the complete callback will be called with
-+ * the request status.
-+ *
-+ * @param pcd The PCD
-+ * @param ep_handle The handle of the endpoint
-+ * @param buf The buffer for the data
-+ * @param dma_buf The DMA buffer for the data
-+ * @param buflen The length of the data transfer
-+ * @param zero Specifies whether to send zero length last packet.
-+ * @param req_handle Set this handle to any value to use to reference this
-+ * request in the ep_dequeue function or from the complete callback
-+ * @param atomic_alloc If driver need to perform atomic allocations
-+ * for internal data structures.
-+ *
-+ * Returns -DWC_E_INVALID if invalid parameters were passed.
-+ * Returns -DWC_E_SHUTDOWN if any other error ocurred.
-+ * Returns 0 on success. */
-+extern int dwc_otg_pcd_ep_queue(dwc_otg_pcd_t * pcd, void *ep_handle,
-+				uint8_t * buf, dwc_dma_t dma_buf,
-+				uint32_t buflen, int zero, void *req_handle,
-+				int atomic_alloc);
-+#ifdef DWC_UTE_PER_IO
-+/**
-+ *
-+ * @param ereq_nonport	Pointer to the extended request part of the
-+ *						usb_request structure defined in usb_gadget.h file.
-+ */
-+extern int dwc_otg_pcd_xiso_ep_queue(dwc_otg_pcd_t * pcd, void *ep_handle,
-+				     uint8_t * buf, dwc_dma_t dma_buf,
-+				     uint32_t buflen, int zero,
-+				     void *req_handle, int atomic_alloc,
-+				     void *ereq_nonport);
-+
-+#endif
-+
-+/** De-queue the specified data transfer that has not yet completed.
-+ *
-+ * Returns -DWC_E_INVALID if invalid parameters were passed.
-+ * Returns -DWC_E_SHUTDOWN if any other error ocurred.
-+ * Returns 0 on success. */
-+extern int dwc_otg_pcd_ep_dequeue(dwc_otg_pcd_t * pcd, void *ep_handle,
-+				  void *req_handle);
-+
-+/** Halt (STALL) an endpoint or clear it.
-+ *
-+ * Returns -DWC_E_INVALID if invalid parameters were passed.
-+ * Returns -DWC_E_SHUTDOWN if any other error ocurred.
-+ * Returns -DWC_E_AGAIN if the STALL cannot be sent and must be tried again later
-+ * Returns 0 on success. */
-+extern int dwc_otg_pcd_ep_halt(dwc_otg_pcd_t * pcd, void *ep_handle, int value);
-+
-+/** This function */
-+extern int dwc_otg_pcd_ep_wedge(dwc_otg_pcd_t * pcd, void *ep_handle);
-+
-+/** This function should be called on every hardware interrupt */
-+extern int32_t dwc_otg_pcd_handle_intr(dwc_otg_pcd_t * pcd);
-+
-+/** This function returns current frame number */
-+extern int dwc_otg_pcd_get_frame_number(dwc_otg_pcd_t * pcd);
-+
-+/**
-+ * Start isochronous transfers on the endpoint referenced by ep_handle.
-+ * For isochronous transfers duble buffering is used.
-+ * After processing each of buffers comlete callback will be called with
-+ * status for each transaction.
-+ *
-+ * @param pcd The PCD
-+ * @param ep_handle The handle of the endpoint
-+ * @param buf0 The virtual address of first data buffer
-+ * @param buf1 The virtual address of second data buffer
-+ * @param dma0 The DMA address of first data buffer
-+ * @param dma1 The DMA address of second data buffer
-+ * @param sync_frame Data pattern frame number
-+ * @param dp_frame Data size for pattern frame
-+ * @param data_per_frame Data size for regular frame
-+ * @param start_frame Frame number to start transfers, if -1 then start transfers ASAP.
-+ * @param buf_proc_intrvl Interval of ISOC Buffer processing
-+ * @param req_handle Handle of ISOC request
-+ * @param atomic_alloc Specefies whether to perform atomic allocation for
-+ * 			internal data structures.
-+ *
-+ * Returns -DWC_E_NO_MEMORY if there is no enough memory.
-+ * Returns -DWC_E_INVALID if incorrect arguments are passed to the function.
-+ * Returns -DW_E_SHUTDOWN for any other error.
-+ * Returns 0 on success
-+ */
-+extern int dwc_otg_pcd_iso_ep_start(dwc_otg_pcd_t * pcd, void *ep_handle,
-+				    uint8_t * buf0, uint8_t * buf1,
-+				    dwc_dma_t dma0, dwc_dma_t dma1,
-+				    int sync_frame, int dp_frame,
-+				    int data_per_frame, int start_frame,
-+				    int buf_proc_intrvl, void *req_handle,
-+				    int atomic_alloc);
-+
-+/** Stop ISOC transfers on endpoint referenced by ep_handle.
-+ *
-+ * @param pcd The PCD
-+ * @param ep_handle The handle of the endpoint
-+ * @param req_handle Handle of ISOC request
-+ *
-+ * Returns -DWC_E_INVALID if incorrect arguments are passed to the function
-+ * Returns 0 on success
-+ */
-+int dwc_otg_pcd_iso_ep_stop(dwc_otg_pcd_t * pcd, void *ep_handle,
-+			    void *req_handle);
-+
-+/** Get ISOC packet status.
-+ *
-+ * @param pcd The PCD
-+ * @param ep_handle The handle of the endpoint
-+ * @param iso_req_handle Isochronoush request handle
-+ * @param packet Number of packet
-+ * @param status Out parameter for returning status
-+ * @param actual Out parameter for returning actual length
-+ * @param offset Out parameter for returning offset
-+ *
-+ */
-+extern void dwc_otg_pcd_get_iso_packet_params(dwc_otg_pcd_t * pcd,
-+					      void *ep_handle,
-+					      void *iso_req_handle, int packet,
-+					      int *status, int *actual,
-+					      int *offset);
-+
-+/** Get ISOC packet count.
-+ *
-+ * @param pcd The PCD
-+ * @param ep_handle The handle of the endpoint
-+ * @param iso_req_handle
-+ */
-+extern int dwc_otg_pcd_get_iso_packet_count(dwc_otg_pcd_t * pcd,
-+					    void *ep_handle,
-+					    void *iso_req_handle);
-+
-+/** This function starts the SRP Protocol if no session is in progress. If
-+ * a session is already in progress, but the device is suspended,
-+ * remote wakeup signaling is started.
-+ */
-+extern int dwc_otg_pcd_wakeup(dwc_otg_pcd_t * pcd);
-+
-+/** This function returns 1 if LPM support is enabled, and 0 otherwise. */
-+extern int dwc_otg_pcd_is_lpm_enabled(dwc_otg_pcd_t * pcd);
-+
-+/** This function returns 1 if remote wakeup is allowed and 0, otherwise. */
-+extern int dwc_otg_pcd_get_rmwkup_enable(dwc_otg_pcd_t * pcd);
-+
-+/** Initiate SRP */
-+extern void dwc_otg_pcd_initiate_srp(dwc_otg_pcd_t * pcd);
-+
-+/** Starts remote wakeup signaling. */
-+extern void dwc_otg_pcd_remote_wakeup(dwc_otg_pcd_t * pcd, int set);
-+
-+/** Starts micorsecond soft disconnect. */
-+extern void dwc_otg_pcd_disconnect_us(dwc_otg_pcd_t * pcd, int no_of_usecs);
-+/** This function returns whether device is dualspeed.*/
-+extern uint32_t dwc_otg_pcd_is_dualspeed(dwc_otg_pcd_t * pcd);
-+
-+/** This function returns whether device is otg. */
-+extern uint32_t dwc_otg_pcd_is_otg(dwc_otg_pcd_t * pcd);
-+
-+/** These functions allow to get hnp parameters */
-+extern uint32_t get_b_hnp_enable(dwc_otg_pcd_t * pcd);
-+extern uint32_t get_a_hnp_support(dwc_otg_pcd_t * pcd);
-+extern uint32_t get_a_alt_hnp_support(dwc_otg_pcd_t * pcd);
-+
-+/** CFI specific Interface functions */
-+/** Allocate a cfi buffer */
-+extern uint8_t *cfiw_ep_alloc_buffer(dwc_otg_pcd_t * pcd, void *pep,
-+				     dwc_dma_t * addr, size_t buflen,
-+				     int flags);
-+
-+/******************************************************************************/
-+
-+/** @} */
-+
-+#endif				/* __DWC_PCD_IF_H__ */
-+
-+#endif				/* DWC_HOST_ONLY */
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c
-@@ -0,0 +1,5148 @@
-+/* ==========================================================================
-+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_intr.c $
-+ * $Revision: #116 $
-+ * $Date: 2012/08/10 $
-+ * $Change: 2047372 $
-+ *
-+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
-+ * "Software") is an Unsupported proprietary work of Synopsys, Inc. unless
-+ * otherwise expressly agreed to in writing between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product under
-+ * any End User Software License Agreement or Agreement for Licensed Product
-+ * with Synopsys or any supplement thereto. You are permitted to use and
-+ * redistribute this Software in source and binary forms, with or without
-+ * modification, provided that redistributions of source code must retain this
-+ * notice. You may not view, use, disclose, copy or distribute this file or
-+ * any information contained herein except pursuant to this license grant from
-+ * Synopsys. If you do not agree with this notice, including the disclaimer
-+ * below, then you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" BASIS
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS BE LIABLE FOR ANY DIRECT,
-+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================== */
-+#ifndef DWC_HOST_ONLY
-+
-+#include "dwc_otg_pcd.h"
-+
-+#ifdef DWC_UTE_CFI
-+#include "dwc_otg_cfi.h"
-+#endif
-+
-+#ifdef DWC_UTE_PER_IO
-+extern void complete_xiso_ep(dwc_otg_pcd_ep_t * ep);
-+#endif
-+//#define PRINT_CFI_DMA_DESCS
-+
-+#define DEBUG_EP0
-+
-+/**
-+ * This function updates OTG.
-+ */
-+static void dwc_otg_pcd_update_otg(dwc_otg_pcd_t * pcd, const unsigned reset)
-+{
-+
-+	if (reset) {
-+		pcd->b_hnp_enable = 0;
-+		pcd->a_hnp_support = 0;
-+		pcd->a_alt_hnp_support = 0;
-+	}
-+
-+	if (pcd->fops->hnp_changed) {
-+		pcd->fops->hnp_changed(pcd);
-+	}
-+}
-+
-+/** @file
-+ * This file contains the implementation of the PCD Interrupt handlers.
-+ *
-+ * The PCD handles the device interrupts.  Many conditions can cause a
-+ * device interrupt. When an interrupt occurs, the device interrupt
-+ * service routine determines the cause of the interrupt and
-+ * dispatches handling to the appropriate function. These interrupt
-+ * handling functions are described below.
-+ * All interrupt registers are processed from LSB to MSB.
-+ */
-+
-+/**
-+ * This function prints the ep0 state for debug purposes.
-+ */
-+static inline void print_ep0_state(dwc_otg_pcd_t * pcd)
-+{
-+#ifdef DEBUG
-+	char str[40];
-+
-+	switch (pcd->ep0state) {
-+	case EP0_DISCONNECT:
-+		dwc_strcpy(str, "EP0_DISCONNECT");
-+		break;
-+	case EP0_IDLE:
-+		dwc_strcpy(str, "EP0_IDLE");
-+		break;
-+	case EP0_IN_DATA_PHASE:
-+		dwc_strcpy(str, "EP0_IN_DATA_PHASE");
-+		break;
-+	case EP0_OUT_DATA_PHASE:
-+		dwc_strcpy(str, "EP0_OUT_DATA_PHASE");
-+		break;
-+	case EP0_IN_STATUS_PHASE:
-+		dwc_strcpy(str, "EP0_IN_STATUS_PHASE");
-+		break;
-+	case EP0_OUT_STATUS_PHASE:
-+		dwc_strcpy(str, "EP0_OUT_STATUS_PHASE");
-+		break;
-+	case EP0_STALL:
-+		dwc_strcpy(str, "EP0_STALL");
-+		break;
-+	default:
-+		dwc_strcpy(str, "EP0_INVALID");
-+	}
-+
-+	DWC_DEBUGPL(DBG_ANY, "%s(%d)\n", str, pcd->ep0state);
-+#endif
-+}
-+
-+/**
-+ * This function calculate the size of the payload in the memory
-+ * for out endpoints and prints size for debug purposes(used in
-+ * 2.93a DevOutNak feature).
-+ */
-+static inline void print_memory_payload(dwc_otg_pcd_t * pcd,  dwc_ep_t * ep)
-+{
-+#ifdef DEBUG
-+	deptsiz_data_t deptsiz_init = {.d32 = 0 };
-+	deptsiz_data_t deptsiz_updt = {.d32 = 0 };
-+	int pack_num;
-+	unsigned payload;
-+
-+	deptsiz_init.d32 = pcd->core_if->start_doeptsiz_val[ep->num];
-+	deptsiz_updt.d32 =
-+		DWC_READ_REG32(&pcd->core_if->dev_if->
-+						out_ep_regs[ep->num]->doeptsiz);
-+	/* Payload will be */
-+	payload = deptsiz_init.b.xfersize - deptsiz_updt.b.xfersize;
-+	/* Packet count is decremented every time a packet
-+	 * is written to the RxFIFO not in to the external memory
-+	 * So, if payload == 0, then it means no packet was sent to ext memory*/
-+	pack_num = (!payload) ? 0 : (deptsiz_init.b.pktcnt - deptsiz_updt.b.pktcnt);
-+	DWC_DEBUGPL(DBG_PCDV,
-+		"Payload for EP%d-%s\n",
-+		ep->num, (ep->is_in ? "IN" : "OUT"));
-+	DWC_DEBUGPL(DBG_PCDV,
-+		"Number of transfered bytes = 0x%08x\n", payload);
-+	DWC_DEBUGPL(DBG_PCDV,
-+		"Number of transfered packets = %d\n", pack_num);
-+#endif
-+}
-+
-+
-+#ifdef DWC_UTE_CFI
-+static inline void print_desc(struct dwc_otg_dma_desc *ddesc,
-+			      const uint8_t * epname, int descnum)
-+{
-+	CFI_INFO
-+	    ("%s DMA_DESC(%d) buf=0x%08x bytes=0x%04x; sp=0x%x; l=0x%x; sts=0x%02x; bs=0x%02x\n",
-+	     epname, descnum, ddesc->buf, ddesc->status.b.bytes,
-+	     ddesc->status.b.sp, ddesc->status.b.l, ddesc->status.b.sts,
-+	     ddesc->status.b.bs);
-+}
-+#endif
-+
-+/**
-+ * This function returns pointer to in ep struct with number ep_num
-+ */
-+static inline dwc_otg_pcd_ep_t *get_in_ep(dwc_otg_pcd_t * pcd, uint32_t ep_num)
-+{
-+	int i;
-+	int num_in_eps = GET_CORE_IF(pcd)->dev_if->num_in_eps;
-+	if (ep_num == 0) {
-+		return &pcd->ep0;
-+	} else {
-+		for (i = 0; i < num_in_eps; ++i) {
-+			if (pcd->in_ep[i].dwc_ep.num == ep_num)
-+				return &pcd->in_ep[i];
-+		}
-+		return 0;
-+	}
-+}
-+
-+/**
-+ * This function returns pointer to out ep struct with number ep_num
-+ */
-+static inline dwc_otg_pcd_ep_t *get_out_ep(dwc_otg_pcd_t * pcd, uint32_t ep_num)
-+{
-+	int i;
-+	int num_out_eps = GET_CORE_IF(pcd)->dev_if->num_out_eps;
-+	if (ep_num == 0) {
-+		return &pcd->ep0;
-+	} else {
-+		for (i = 0; i < num_out_eps; ++i) {
-+			if (pcd->out_ep[i].dwc_ep.num == ep_num)
-+				return &pcd->out_ep[i];
-+		}
-+		return 0;
-+	}
-+}
-+
-+/**
-+ * This functions gets a pointer to an EP from the wIndex address
-+ * value of the control request.
-+ */
-+dwc_otg_pcd_ep_t *get_ep_by_addr(dwc_otg_pcd_t * pcd, u16 wIndex)
-+{
-+	dwc_otg_pcd_ep_t *ep;
-+	uint32_t ep_num = UE_GET_ADDR(wIndex);
-+
-+	if (ep_num == 0) {
-+		ep = &pcd->ep0;
-+	} else if (UE_GET_DIR(wIndex) == UE_DIR_IN) {	/* in ep */
-+		ep = &pcd->in_ep[ep_num - 1];
-+	} else {
-+		ep = &pcd->out_ep[ep_num - 1];
-+	}
-+
-+	return ep;
-+}
-+
-+/**
-+ * This function checks the EP request queue, if the queue is not
-+ * empty the next request is started.
-+ */
-+void start_next_request(dwc_otg_pcd_ep_t * ep)
-+{
-+	dwc_otg_pcd_request_t *req = 0;
-+	uint32_t max_transfer =
-+	    GET_CORE_IF(ep->pcd)->core_params->max_transfer_size;
-+
-+#ifdef DWC_UTE_CFI
-+	struct dwc_otg_pcd *pcd;
-+	pcd = ep->pcd;
-+#endif
-+
-+	if (!DWC_CIRCLEQ_EMPTY(&ep->queue)) {
-+		req = DWC_CIRCLEQ_FIRST(&ep->queue);
-+
-+#ifdef DWC_UTE_CFI
-+		if (ep->dwc_ep.buff_mode != BM_STANDARD) {
-+			ep->dwc_ep.cfi_req_len = req->length;
-+			pcd->cfi->ops.build_descriptors(pcd->cfi, pcd, ep, req);
-+		} else {
-+#endif
-+			/* Setup and start the Transfer */
-+			if (req->dw_align_buf) {
-+				ep->dwc_ep.dma_addr = req->dw_align_buf_dma;
-+				ep->dwc_ep.start_xfer_buff = req->dw_align_buf;
-+				ep->dwc_ep.xfer_buff = req->dw_align_buf;
-+			} else {
-+				ep->dwc_ep.dma_addr = req->dma;
-+				ep->dwc_ep.start_xfer_buff = req->buf;
-+				ep->dwc_ep.xfer_buff = req->buf;
-+			}
-+			ep->dwc_ep.sent_zlp = 0;
-+			ep->dwc_ep.total_len = req->length;
-+			ep->dwc_ep.xfer_len = 0;
-+			ep->dwc_ep.xfer_count = 0;
-+
-+			ep->dwc_ep.maxxfer = max_transfer;
-+			if (GET_CORE_IF(ep->pcd)->dma_desc_enable) {
-+				uint32_t out_max_xfer = DDMA_MAX_TRANSFER_SIZE
-+				    - (DDMA_MAX_TRANSFER_SIZE % 4);
-+				if (ep->dwc_ep.is_in) {
-+					if (ep->dwc_ep.maxxfer >
-+					    DDMA_MAX_TRANSFER_SIZE) {
-+						ep->dwc_ep.maxxfer =
-+						    DDMA_MAX_TRANSFER_SIZE;
-+					}
-+				} else {
-+					if (ep->dwc_ep.maxxfer > out_max_xfer) {
-+						ep->dwc_ep.maxxfer =
-+						    out_max_xfer;
-+					}
-+				}
-+			}
-+			if (ep->dwc_ep.maxxfer < ep->dwc_ep.total_len) {
-+				ep->dwc_ep.maxxfer -=
-+				    (ep->dwc_ep.maxxfer % ep->dwc_ep.maxpacket);
-+			}
-+			if (req->sent_zlp) {
-+				if ((ep->dwc_ep.total_len %
-+				     ep->dwc_ep.maxpacket == 0)
-+				    && (ep->dwc_ep.total_len != 0)) {
-+					ep->dwc_ep.sent_zlp = 1;
-+				}
-+
-+			}
-+#ifdef DWC_UTE_CFI
-+		}
-+#endif
-+		dwc_otg_ep_start_transfer(GET_CORE_IF(ep->pcd), &ep->dwc_ep);
-+	} else if (ep->dwc_ep.type == DWC_OTG_EP_TYPE_ISOC) {
-+		DWC_PRINTF("There are no more ISOC requests \n");
-+		ep->dwc_ep.frame_num = 0xFFFFFFFF;
-+	}
-+}
-+
-+/**
-+ * This function handles the SOF Interrupts. At this time the SOF
-+ * Interrupt is disabled.
-+ */
-+int32_t dwc_otg_pcd_handle_sof_intr(dwc_otg_pcd_t * pcd)
-+{
-+	dwc_otg_core_if_t *core_if = GET_CORE_IF(pcd);
-+
-+	gintsts_data_t gintsts;
-+
-+	DWC_DEBUGPL(DBG_PCD, "SOF\n");
-+
-+	/* Clear interrupt */
-+	gintsts.d32 = 0;
-+	gintsts.b.sofintr = 1;
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gintsts, gintsts.d32);
-+
-+	return 1;
-+}
-+
-+/**
-+ * This function handles the Rx Status Queue Level Interrupt, which
-+ * indicates that there is a least one packet in the Rx FIFO.  The
-+ * packets are moved from the FIFO to memory, where they will be
-+ * processed when the Endpoint Interrupt Register indicates Transfer
-+ * Complete or SETUP Phase Done.
-+ *
-+ * Repeat the following until the Rx Status Queue is empty:
-+ *	 -# Read the Receive Status Pop Register (GRXSTSP) to get Packet
-+ *		info
-+ *	 -# If Receive FIFO is empty then skip to step Clear the interrupt
-+ *		and exit
-+ *	 -# If SETUP Packet call dwc_otg_read_setup_packet to copy the
-+ *		SETUP data to the buffer
-+ *	 -# If OUT Data Packet call dwc_otg_read_packet to copy the data
-+ *		to the destination buffer
-+ */
-+int32_t dwc_otg_pcd_handle_rx_status_q_level_intr(dwc_otg_pcd_t * pcd)
-+{
-+	dwc_otg_core_if_t *core_if = GET_CORE_IF(pcd);
-+	dwc_otg_core_global_regs_t *global_regs = core_if->core_global_regs;
-+	gintmsk_data_t gintmask = {.d32 = 0 };
-+	device_grxsts_data_t status;
-+	dwc_otg_pcd_ep_t *ep;
-+	gintsts_data_t gintsts;
-+#ifdef DEBUG
-+	static char *dpid_str[] = { "D0", "D2", "D1", "MDATA" };
-+#endif
-+
-+	//DWC_DEBUGPL(DBG_PCDV, "%s(%p)\n", __func__, _pcd);
-+	/* Disable the Rx Status Queue Level interrupt */
-+	gintmask.b.rxstsqlvl = 1;
-+	DWC_MODIFY_REG32(&global_regs->gintmsk, gintmask.d32, 0);
-+
-+	/* Get the Status from the top of the FIFO */
-+	status.d32 = DWC_READ_REG32(&global_regs->grxstsp);
-+
-+	DWC_DEBUGPL(DBG_PCD, "EP:%d BCnt:%d DPID:%s "
-+		    "pktsts:%x Frame:%d(0x%0x)\n",
-+		    status.b.epnum, status.b.bcnt,
-+		    dpid_str[status.b.dpid],
-+		    status.b.pktsts, status.b.fn, status.b.fn);
-+	/* Get pointer to EP structure */
-+	ep = get_out_ep(pcd, status.b.epnum);
-+
-+	switch (status.b.pktsts) {
-+	case DWC_DSTS_GOUT_NAK:
-+		DWC_DEBUGPL(DBG_PCDV, "Global OUT NAK\n");
-+		break;
-+	case DWC_STS_DATA_UPDT:
-+		DWC_DEBUGPL(DBG_PCDV, "OUT Data Packet\n");
-+		if (status.b.bcnt && ep->dwc_ep.xfer_buff) {
-+			/** @todo NGS Check for buffer overflow? */
-+			dwc_otg_read_packet(core_if,
-+					    ep->dwc_ep.xfer_buff,
-+					    status.b.bcnt);
-+			ep->dwc_ep.xfer_count += status.b.bcnt;
-+			ep->dwc_ep.xfer_buff += status.b.bcnt;
-+		}
-+		break;
-+	case DWC_STS_XFER_COMP:
-+		DWC_DEBUGPL(DBG_PCDV, "OUT Complete\n");
-+		break;
-+	case DWC_DSTS_SETUP_COMP:
-+#ifdef DEBUG_EP0
-+		DWC_DEBUGPL(DBG_PCDV, "Setup Complete\n");
-+#endif
-+		break;
-+	case DWC_DSTS_SETUP_UPDT:
-+		dwc_otg_read_setup_packet(core_if, pcd->setup_pkt->d32);
-+#ifdef DEBUG_EP0
-+		DWC_DEBUGPL(DBG_PCD,
-+			    "SETUP PKT: %02x.%02x v%04x i%04x l%04x\n",
-+			    pcd->setup_pkt->req.bmRequestType,
-+			    pcd->setup_pkt->req.bRequest,
-+			    UGETW(pcd->setup_pkt->req.wValue),
-+			    UGETW(pcd->setup_pkt->req.wIndex),
-+			    UGETW(pcd->setup_pkt->req.wLength));
-+#endif
-+		ep->dwc_ep.xfer_count += status.b.bcnt;
-+		break;
-+	default:
-+		DWC_DEBUGPL(DBG_PCDV, "Invalid Packet Status (0x%0x)\n",
-+			    status.b.pktsts);
-+		break;
-+	}
-+
-+	/* Enable the Rx Status Queue Level interrupt */
-+	DWC_MODIFY_REG32(&global_regs->gintmsk, 0, gintmask.d32);
-+	/* Clear interrupt */
-+	gintsts.d32 = 0;
-+	gintsts.b.rxstsqlvl = 1;
-+	DWC_WRITE_REG32(&global_regs->gintsts, gintsts.d32);
-+
-+	//DWC_DEBUGPL(DBG_PCDV, "EXIT: %s\n", __func__);
-+	return 1;
-+}
-+
-+/**
-+ * This function examines the Device IN Token Learning Queue to
-+ * determine the EP number of the last IN token received.  This
-+ * implementation is for the Mass Storage device where there are only
-+ * 2 IN EPs (Control-IN and BULK-IN).
-+ *
-+ * The EP numbers for the first six IN Tokens are in DTKNQR1 and there
-+ * are 8 EP Numbers in each of the other possible DTKNQ Registers.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ *
-+ */
-+static inline int get_ep_of_last_in_token(dwc_otg_core_if_t * core_if)
-+{
-+	dwc_otg_device_global_regs_t *dev_global_regs =
-+	    core_if->dev_if->dev_global_regs;
-+	const uint32_t TOKEN_Q_DEPTH = core_if->hwcfg2.b.dev_token_q_depth;
-+	/* Number of Token Queue Registers */
-+	const int DTKNQ_REG_CNT = (TOKEN_Q_DEPTH + 7) / 8;
-+	dtknq1_data_t dtknqr1;
-+	uint32_t in_tkn_epnums[4];
-+	int ndx = 0;
-+	int i = 0;
-+	volatile uint32_t *addr = &dev_global_regs->dtknqr1;
-+	int epnum = 0;
-+
-+	//DWC_DEBUGPL(DBG_PCD,"dev_token_q_depth=%d\n",TOKEN_Q_DEPTH);
-+
-+	/* Read the DTKNQ Registers */
-+	for (i = 0; i < DTKNQ_REG_CNT; i++) {
-+		in_tkn_epnums[i] = DWC_READ_REG32(addr);
-+		DWC_DEBUGPL(DBG_PCDV, "DTKNQR%d=0x%08x\n", i + 1,
-+			    in_tkn_epnums[i]);
-+		if (addr == &dev_global_regs->dvbusdis) {
-+			addr = &dev_global_regs->dtknqr3_dthrctl;
-+		} else {
-+			++addr;
-+		}
-+
-+	}
-+
-+	/* Copy the DTKNQR1 data to the bit field. */
-+	dtknqr1.d32 = in_tkn_epnums[0];
-+	/* Get the EP numbers */
-+	in_tkn_epnums[0] = dtknqr1.b.epnums0_5;
-+	ndx = dtknqr1.b.intknwptr - 1;
-+
-+	//DWC_DEBUGPL(DBG_PCDV,"ndx=%d\n",ndx);
-+	if (ndx == -1) {
-+		/** @todo Find a simpler way to calculate the max
-+		 * queue position.*/
-+		int cnt = TOKEN_Q_DEPTH;
-+		if (TOKEN_Q_DEPTH <= 6) {
-+			cnt = TOKEN_Q_DEPTH - 1;
-+		} else if (TOKEN_Q_DEPTH <= 14) {
-+			cnt = TOKEN_Q_DEPTH - 7;
-+		} else if (TOKEN_Q_DEPTH <= 22) {
-+			cnt = TOKEN_Q_DEPTH - 15;
-+		} else {
-+			cnt = TOKEN_Q_DEPTH - 23;
-+		}
-+		epnum = (in_tkn_epnums[DTKNQ_REG_CNT - 1] >> (cnt * 4)) & 0xF;
-+	} else {
-+		if (ndx <= 5) {
-+			epnum = (in_tkn_epnums[0] >> (ndx * 4)) & 0xF;
-+		} else if (ndx <= 13) {
-+			ndx -= 6;
-+			epnum = (in_tkn_epnums[1] >> (ndx * 4)) & 0xF;
-+		} else if (ndx <= 21) {
-+			ndx -= 14;
-+			epnum = (in_tkn_epnums[2] >> (ndx * 4)) & 0xF;
-+		} else if (ndx <= 29) {
-+			ndx -= 22;
-+			epnum = (in_tkn_epnums[3] >> (ndx * 4)) & 0xF;
-+		}
-+	}
-+	//DWC_DEBUGPL(DBG_PCD,"epnum=%d\n",epnum);
-+	return epnum;
-+}
-+
-+/**
-+ * This interrupt occurs when the non-periodic Tx FIFO is half-empty.
-+ * The active request is checked for the next packet to be loaded into
-+ * the non-periodic Tx FIFO.
-+ */
-+int32_t dwc_otg_pcd_handle_np_tx_fifo_empty_intr(dwc_otg_pcd_t * pcd)
-+{
-+	dwc_otg_core_if_t *core_if = GET_CORE_IF(pcd);
-+	dwc_otg_core_global_regs_t *global_regs = core_if->core_global_regs;
-+	dwc_otg_dev_in_ep_regs_t *ep_regs;
-+	gnptxsts_data_t txstatus = {.d32 = 0 };
-+	gintsts_data_t gintsts;
-+
-+	int epnum = 0;
-+	dwc_otg_pcd_ep_t *ep = 0;
-+	uint32_t len = 0;
-+	int dwords;
-+
-+	/* Get the epnum from the IN Token Learning Queue. */
-+	epnum = get_ep_of_last_in_token(core_if);
-+	ep = get_in_ep(pcd, epnum);
-+
-+	DWC_DEBUGPL(DBG_PCD, "NP TxFifo Empty: %d \n", epnum);
-+
-+	ep_regs = core_if->dev_if->in_ep_regs[epnum];
-+
-+	len = ep->dwc_ep.xfer_len - ep->dwc_ep.xfer_count;
-+	if (len > ep->dwc_ep.maxpacket) {
-+		len = ep->dwc_ep.maxpacket;
-+	}
-+	dwords = (len + 3) / 4;
-+
-+	/* While there is space in the queue and space in the FIFO and
-+	 * More data to tranfer, Write packets to the Tx FIFO */
-+	txstatus.d32 = DWC_READ_REG32(&global_regs->gnptxsts);
-+	DWC_DEBUGPL(DBG_PCDV, "b4 GNPTXSTS=0x%08x\n", txstatus.d32);
-+
-+	while (txstatus.b.nptxqspcavail > 0 &&
-+	       txstatus.b.nptxfspcavail > dwords &&
-+	       ep->dwc_ep.xfer_count < ep->dwc_ep.xfer_len) {
-+		/* Write the FIFO */
-+		dwc_otg_ep_write_packet(core_if, &ep->dwc_ep, 0);
-+		len = ep->dwc_ep.xfer_len - ep->dwc_ep.xfer_count;
-+
-+		if (len > ep->dwc_ep.maxpacket) {
-+			len = ep->dwc_ep.maxpacket;
-+		}
-+
-+		dwords = (len + 3) / 4;
-+		txstatus.d32 = DWC_READ_REG32(&global_regs->gnptxsts);
-+		DWC_DEBUGPL(DBG_PCDV, "GNPTXSTS=0x%08x\n", txstatus.d32);
-+	}
-+
-+	DWC_DEBUGPL(DBG_PCDV, "GNPTXSTS=0x%08x\n",
-+		    DWC_READ_REG32(&global_regs->gnptxsts));
-+
-+	/* Clear interrupt */
-+	gintsts.d32 = 0;
-+	gintsts.b.nptxfempty = 1;
-+	DWC_WRITE_REG32(&global_regs->gintsts, gintsts.d32);
-+
-+	return 1;
-+}
-+
-+/**
-+ * This function is called when dedicated Tx FIFO Empty interrupt occurs.
-+ * The active request is checked for the next packet to be loaded into
-+ * apropriate Tx FIFO.
-+ */
-+static int32_t write_empty_tx_fifo(dwc_otg_pcd_t * pcd, uint32_t epnum)
-+{
-+	dwc_otg_core_if_t *core_if = GET_CORE_IF(pcd);
-+	dwc_otg_dev_if_t *dev_if = core_if->dev_if;
-+	dwc_otg_dev_in_ep_regs_t *ep_regs;
-+	dtxfsts_data_t txstatus = {.d32 = 0 };
-+	dwc_otg_pcd_ep_t *ep = 0;
-+	uint32_t len = 0;
-+	int dwords;
-+
-+	ep = get_in_ep(pcd, epnum);
-+
-+	DWC_DEBUGPL(DBG_PCD, "Dedicated TxFifo Empty: %d \n", epnum);
-+
-+	ep_regs = core_if->dev_if->in_ep_regs[epnum];
-+
-+	len = ep->dwc_ep.xfer_len - ep->dwc_ep.xfer_count;
-+
-+	if (len > ep->dwc_ep.maxpacket) {
-+		len = ep->dwc_ep.maxpacket;
-+	}
-+
-+	dwords = (len + 3) / 4;
-+
-+	/* While there is space in the queue and space in the FIFO and
-+	 * More data to tranfer, Write packets to the Tx FIFO */
-+	txstatus.d32 = DWC_READ_REG32(&dev_if->in_ep_regs[epnum]->dtxfsts);
-+	DWC_DEBUGPL(DBG_PCDV, "b4 dtxfsts[%d]=0x%08x\n", epnum, txstatus.d32);
-+
-+	while (txstatus.b.txfspcavail > dwords &&
-+	       ep->dwc_ep.xfer_count < ep->dwc_ep.xfer_len &&
-+	       ep->dwc_ep.xfer_len != 0) {
-+		/* Write the FIFO */
-+		dwc_otg_ep_write_packet(core_if, &ep->dwc_ep, 0);
-+
-+		len = ep->dwc_ep.xfer_len - ep->dwc_ep.xfer_count;
-+		if (len > ep->dwc_ep.maxpacket) {
-+			len = ep->dwc_ep.maxpacket;
-+		}
-+
-+		dwords = (len + 3) / 4;
-+		txstatus.d32 =
-+		    DWC_READ_REG32(&dev_if->in_ep_regs[epnum]->dtxfsts);
-+		DWC_DEBUGPL(DBG_PCDV, "dtxfsts[%d]=0x%08x\n", epnum,
-+			    txstatus.d32);
-+	}
-+
-+	DWC_DEBUGPL(DBG_PCDV, "b4 dtxfsts[%d]=0x%08x\n", epnum,
-+		    DWC_READ_REG32(&dev_if->in_ep_regs[epnum]->dtxfsts));
-+
-+	return 1;
-+}
-+
-+/**
-+ * This function is called when the Device is disconnected. It stops
-+ * any active requests and informs the Gadget driver of the
-+ * disconnect.
-+ */
-+void dwc_otg_pcd_stop(dwc_otg_pcd_t * pcd)
-+{
-+	int i, num_in_eps, num_out_eps;
-+	dwc_otg_pcd_ep_t *ep;
-+
-+	gintmsk_data_t intr_mask = {.d32 = 0 };
-+
-+	DWC_SPINLOCK(pcd->lock);
-+
-+	num_in_eps = GET_CORE_IF(pcd)->dev_if->num_in_eps;
-+	num_out_eps = GET_CORE_IF(pcd)->dev_if->num_out_eps;
-+
-+	DWC_DEBUGPL(DBG_PCDV, "%s() \n", __func__);
-+	/* don't disconnect drivers more than once */
-+	if (pcd->ep0state == EP0_DISCONNECT) {
-+		DWC_DEBUGPL(DBG_ANY, "%s() Already Disconnected\n", __func__);
-+		DWC_SPINUNLOCK(pcd->lock);
-+		return;
-+	}
-+	pcd->ep0state = EP0_DISCONNECT;
-+
-+	/* Reset the OTG state. */
-+	dwc_otg_pcd_update_otg(pcd, 1);
-+
-+	/* Disable the NP Tx Fifo Empty Interrupt. */
-+	intr_mask.b.nptxfempty = 1;
-+	DWC_MODIFY_REG32(&GET_CORE_IF(pcd)->core_global_regs->gintmsk,
-+			 intr_mask.d32, 0);
-+
-+	/* Flush the FIFOs */
-+	/**@todo NGS Flush Periodic FIFOs */
-+	dwc_otg_flush_tx_fifo(GET_CORE_IF(pcd), 0x10);
-+	dwc_otg_flush_rx_fifo(GET_CORE_IF(pcd));
-+
-+	/* prevent new request submissions, kill any outstanding requests  */
-+	ep = &pcd->ep0;
-+	dwc_otg_request_nuke(ep);
-+	/* prevent new request submissions, kill any outstanding requests  */
-+	for (i = 0; i < num_in_eps; i++) {
-+		dwc_otg_pcd_ep_t *ep = &pcd->in_ep[i];
-+		dwc_otg_request_nuke(ep);
-+	}
-+	/* prevent new request submissions, kill any outstanding requests  */
-+	for (i = 0; i < num_out_eps; i++) {
-+		dwc_otg_pcd_ep_t *ep = &pcd->out_ep[i];
-+		dwc_otg_request_nuke(ep);
-+	}
-+
-+	/* report disconnect; the driver is already quiesced */
-+	if (pcd->fops->disconnect) {
-+		DWC_SPINUNLOCK(pcd->lock);
-+		pcd->fops->disconnect(pcd);
-+		DWC_SPINLOCK(pcd->lock);
-+	}
-+	DWC_SPINUNLOCK(pcd->lock);
-+}
-+
-+/**
-+ * This interrupt indicates that ...
-+ */
-+int32_t dwc_otg_pcd_handle_i2c_intr(dwc_otg_pcd_t * pcd)
-+{
-+	gintmsk_data_t intr_mask = {.d32 = 0 };
-+	gintsts_data_t gintsts;
-+
-+	DWC_PRINTF("INTERRUPT Handler not implemented for %s\n", "i2cintr");
-+	intr_mask.b.i2cintr = 1;
-+	DWC_MODIFY_REG32(&GET_CORE_IF(pcd)->core_global_regs->gintmsk,
-+			 intr_mask.d32, 0);
-+
-+	/* Clear interrupt */
-+	gintsts.d32 = 0;
-+	gintsts.b.i2cintr = 1;
-+	DWC_WRITE_REG32(&GET_CORE_IF(pcd)->core_global_regs->gintsts,
-+			gintsts.d32);
-+	return 1;
-+}
-+
-+/**
-+ * This interrupt indicates that ...
-+ */
-+int32_t dwc_otg_pcd_handle_early_suspend_intr(dwc_otg_pcd_t * pcd)
-+{
-+	gintsts_data_t gintsts;
-+#if defined(VERBOSE)
-+	DWC_PRINTF("Early Suspend Detected\n");
-+#endif
-+
-+	/* Clear interrupt */
-+	gintsts.d32 = 0;
-+	gintsts.b.erlysuspend = 1;
-+	DWC_WRITE_REG32(&GET_CORE_IF(pcd)->core_global_regs->gintsts,
-+			gintsts.d32);
-+	return 1;
-+}
-+
-+/**
-+ * This function configures EPO to receive SETUP packets.
-+ *
-+ * @todo NGS: Update the comments from the HW FS.
-+ *
-+ *	-# Program the following fields in the endpoint specific registers
-+ *	for Control OUT EP 0, in order to receive a setup packet
-+ *	- DOEPTSIZ0.Packet Count = 3 (To receive up to 3 back to back
-+ *	  setup packets)
-+ *	- DOEPTSIZE0.Transfer Size = 24 Bytes (To receive up to 3 back
-+ *	  to back setup packets)
-+ *		- In DMA mode, DOEPDMA0 Register with a memory address to
-+ *		  store any setup packets received
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param pcd	  Programming view of the PCD.
-+ */
-+static inline void ep0_out_start(dwc_otg_core_if_t * core_if,
-+				 dwc_otg_pcd_t * pcd)
-+{
-+	dwc_otg_dev_if_t *dev_if = core_if->dev_if;
-+	deptsiz0_data_t doeptsize0 = {.d32 = 0 };
-+	dwc_otg_dev_dma_desc_t *dma_desc;
-+	depctl_data_t doepctl = {.d32 = 0 };
-+
-+#ifdef VERBOSE
-+	DWC_DEBUGPL(DBG_PCDV, "%s() doepctl0=%0x\n", __func__,
-+		    DWC_READ_REG32(&dev_if->out_ep_regs[0]->doepctl));
-+#endif
-+	if (core_if->snpsid >= OTG_CORE_REV_3_00a) {
-+		doepctl.d32 = DWC_READ_REG32(&dev_if->out_ep_regs[0]->doepctl);
-+		if (doepctl.b.epena) {
-+			return;
-+		}
-+	}
-+
-+	doeptsize0.b.supcnt = 3;
-+	doeptsize0.b.pktcnt = 1;
-+	doeptsize0.b.xfersize = 8 * 3;
-+
-+	if (core_if->dma_enable) {
-+		if (!core_if->dma_desc_enable) {
-+			/** put here as for Hermes mode deptisz register should not be written */
-+			DWC_WRITE_REG32(&dev_if->out_ep_regs[0]->doeptsiz,
-+					doeptsize0.d32);
-+
-+			/** @todo dma needs to handle multiple setup packets (up to 3) */
-+			DWC_WRITE_REG32(&dev_if->out_ep_regs[0]->doepdma,
-+					pcd->setup_pkt_dma_handle);
-+		} else {
-+			dev_if->setup_desc_index =
-+			    (dev_if->setup_desc_index + 1) & 1;
-+			dma_desc =
-+			    dev_if->setup_desc_addr[dev_if->setup_desc_index];
-+
-+			/** DMA Descriptor Setup */
-+			dma_desc->status.b.bs = BS_HOST_BUSY;
-+			if (core_if->snpsid >= OTG_CORE_REV_3_00a) {
-+				dma_desc->status.b.sr = 0;
-+				dma_desc->status.b.mtrf = 0;
-+			}
-+			dma_desc->status.b.l = 1;
-+			dma_desc->status.b.ioc = 1;
-+			dma_desc->status.b.bytes = pcd->ep0.dwc_ep.maxpacket;
-+			dma_desc->buf = pcd->setup_pkt_dma_handle;
-+			dma_desc->status.b.sts = 0;
-+			dma_desc->status.b.bs = BS_HOST_READY;
-+
-+			/** DOEPDMA0 Register write */
-+			DWC_WRITE_REG32(&dev_if->out_ep_regs[0]->doepdma,
-+					dev_if->dma_setup_desc_addr
-+					[dev_if->setup_desc_index]);
-+		}
-+
-+	} else {
-+		/** put here as for Hermes mode deptisz register should not be written */
-+		DWC_WRITE_REG32(&dev_if->out_ep_regs[0]->doeptsiz,
-+				doeptsize0.d32);
-+	}
-+
-+	/** DOEPCTL0 Register write cnak will be set after setup interrupt */
-+	doepctl.d32 = 0;
-+	doepctl.b.epena = 1;
-+	if (core_if->snpsid <= OTG_CORE_REV_2_94a) {
-+	doepctl.b.cnak = 1;
-+	DWC_WRITE_REG32(&dev_if->out_ep_regs[0]->doepctl, doepctl.d32);
-+	} else {
-+		DWC_MODIFY_REG32(&dev_if->out_ep_regs[0]->doepctl, 0, doepctl.d32);
-+	}
-+
-+#ifdef VERBOSE
-+	DWC_DEBUGPL(DBG_PCDV, "doepctl0=%0x\n",
-+		    DWC_READ_REG32(&dev_if->out_ep_regs[0]->doepctl));
-+	DWC_DEBUGPL(DBG_PCDV, "diepctl0=%0x\n",
-+		    DWC_READ_REG32(&dev_if->in_ep_regs[0]->diepctl));
-+#endif
-+}
-+
-+/**
-+ * This interrupt occurs when a USB Reset is detected. When the USB
-+ * Reset Interrupt occurs the device state is set to DEFAULT and the
-+ * EP0 state is set to IDLE.
-+ *	-#	Set the NAK bit for all OUT endpoints (DOEPCTLn.SNAK = 1)
-+ *	-#	Unmask the following interrupt bits
-+ *		- DAINTMSK.INEP0 = 1 (Control 0 IN endpoint)
-+ *	- DAINTMSK.OUTEP0 = 1 (Control 0 OUT endpoint)
-+ *	- DOEPMSK.SETUP = 1
-+ *	- DOEPMSK.XferCompl = 1
-+ *	- DIEPMSK.XferCompl = 1
-+ *	- DIEPMSK.TimeOut = 1
-+ *	-# Program the following fields in the endpoint specific registers
-+ *	for Control OUT EP 0, in order to receive a setup packet
-+ *	- DOEPTSIZ0.Packet Count = 3 (To receive up to 3 back to back
-+ *	  setup packets)
-+ *	- DOEPTSIZE0.Transfer Size = 24 Bytes (To receive up to 3 back
-+ *	  to back setup packets)
-+ *		- In DMA mode, DOEPDMA0 Register with a memory address to
-+ *		  store any setup packets received
-+ * At this point, all the required initialization, except for enabling
-+ * the control 0 OUT endpoint is done, for receiving SETUP packets.
-+ */
-+int32_t dwc_otg_pcd_handle_usb_reset_intr(dwc_otg_pcd_t * pcd)
-+{
-+	dwc_otg_core_if_t *core_if = GET_CORE_IF(pcd);
-+	dwc_otg_dev_if_t *dev_if = core_if->dev_if;
-+	depctl_data_t doepctl = {.d32 = 0 };
-+	depctl_data_t diepctl = {.d32 = 0 };
-+	daint_data_t daintmsk = {.d32 = 0 };
-+	doepmsk_data_t doepmsk = {.d32 = 0 };
-+	diepmsk_data_t diepmsk = {.d32 = 0 };
-+	dcfg_data_t dcfg = {.d32 = 0 };
-+	grstctl_t resetctl = {.d32 = 0 };
-+	dctl_data_t dctl = {.d32 = 0 };
-+	int i = 0;
-+	gintsts_data_t gintsts;
-+	pcgcctl_data_t power = {.d32 = 0 };
-+
-+	power.d32 = DWC_READ_REG32(core_if->pcgcctl);
-+	if (power.b.stoppclk) {
-+		power.d32 = 0;
-+		power.b.stoppclk = 1;
-+		DWC_MODIFY_REG32(core_if->pcgcctl, power.d32, 0);
-+
-+		power.b.pwrclmp = 1;
-+		DWC_MODIFY_REG32(core_if->pcgcctl, power.d32, 0);
-+
-+		power.b.rstpdwnmodule = 1;
-+		DWC_MODIFY_REG32(core_if->pcgcctl, power.d32, 0);
-+	}
-+
-+	core_if->lx_state = DWC_OTG_L0;
-+
-+	DWC_PRINTF("USB RESET\n");
-+#ifdef DWC_EN_ISOC
-+	for (i = 1; i < 16; ++i) {
-+		dwc_otg_pcd_ep_t *ep;
-+		dwc_ep_t *dwc_ep;
-+		ep = get_in_ep(pcd, i);
-+		if (ep != 0) {
-+			dwc_ep = &ep->dwc_ep;
-+			dwc_ep->next_frame = 0xffffffff;
-+		}
-+	}
-+#endif /* DWC_EN_ISOC */
-+
-+	/* reset the HNP settings */
-+	dwc_otg_pcd_update_otg(pcd, 1);
-+
-+	/* Clear the Remote Wakeup Signalling */
-+	dctl.b.rmtwkupsig = 1;
-+	DWC_MODIFY_REG32(&core_if->dev_if->dev_global_regs->dctl, dctl.d32, 0);
-+
-+	/* Set NAK for all OUT EPs */
-+	doepctl.b.snak = 1;
-+	for (i = 0; i <= dev_if->num_out_eps; i++) {
-+		DWC_WRITE_REG32(&dev_if->out_ep_regs[i]->doepctl, doepctl.d32);
-+	}
-+
-+	/* Flush the NP Tx FIFO */
-+	dwc_otg_flush_tx_fifo(core_if, 0x10);
-+	/* Flush the Learning Queue */
-+	resetctl.b.intknqflsh = 1;
-+	DWC_WRITE_REG32(&core_if->core_global_regs->grstctl, resetctl.d32);
-+
-+	if (!core_if->core_params->en_multiple_tx_fifo && core_if->dma_enable) {
-+		core_if->start_predict = 0;
-+		for (i = 0; i<= core_if->dev_if->num_in_eps; ++i) {
-+			core_if->nextep_seq[i] = 0xff;	// 0xff - EP not active
-+		}
-+		core_if->nextep_seq[0] = 0;
-+		core_if->first_in_nextep_seq = 0;
-+		diepctl.d32 = DWC_READ_REG32(&dev_if->in_ep_regs[0]->diepctl);
-+		diepctl.b.nextep = 0;
-+		DWC_WRITE_REG32(&dev_if->in_ep_regs[0]->diepctl, diepctl.d32);
-+
-+		/* Update IN Endpoint Mismatch Count by active IN NP EP count + 1 */
-+		dcfg.d32 = DWC_READ_REG32(&dev_if->dev_global_regs->dcfg);
-+		dcfg.b.epmscnt = 2;
-+		DWC_WRITE_REG32(&dev_if->dev_global_regs->dcfg, dcfg.d32);
-+
-+		DWC_DEBUGPL(DBG_PCDV,
-+			    "%s first_in_nextep_seq= %2d; nextep_seq[]:\n",
-+			__func__, core_if->first_in_nextep_seq);
-+		for (i=0; i <= core_if->dev_if->num_in_eps; i++) {
-+			DWC_DEBUGPL(DBG_PCDV, "%2d\n", core_if->nextep_seq[i]);
-+		}
-+	}
-+
-+	if (core_if->multiproc_int_enable) {
-+		daintmsk.b.inep0 = 1;
-+		daintmsk.b.outep0 = 1;
-+		DWC_WRITE_REG32(&dev_if->dev_global_regs->deachintmsk,
-+				daintmsk.d32);
-+
-+		doepmsk.b.setup = 1;
-+		doepmsk.b.xfercompl = 1;
-+		doepmsk.b.ahberr = 1;
-+		doepmsk.b.epdisabled = 1;
-+
-+		if ((core_if->dma_desc_enable) ||
-+		    (core_if->dma_enable
-+		     && core_if->snpsid >= OTG_CORE_REV_3_00a)) {
-+			doepmsk.b.stsphsercvd = 1;
-+		}
-+		if (core_if->dma_desc_enable)
-+			doepmsk.b.bna = 1;
-+/*
-+		doepmsk.b.babble = 1;
-+		doepmsk.b.nyet = 1;
-+
-+		if (core_if->dma_enable) {
-+			doepmsk.b.nak = 1;
-+		}
-+*/
-+		DWC_WRITE_REG32(&dev_if->dev_global_regs->doepeachintmsk[0],
-+				doepmsk.d32);
-+
-+		diepmsk.b.xfercompl = 1;
-+		diepmsk.b.timeout = 1;
-+		diepmsk.b.epdisabled = 1;
-+		diepmsk.b.ahberr = 1;
-+		diepmsk.b.intknepmis = 1;
-+		if (!core_if->en_multiple_tx_fifo && core_if->dma_enable)
-+			diepmsk.b.intknepmis = 0;
-+
-+/*		if (core_if->dma_desc_enable) {
-+			diepmsk.b.bna = 1;
-+		}
-+*/
-+/*
-+		if (core_if->dma_enable) {
-+			diepmsk.b.nak = 1;
-+		}
-+*/
-+		DWC_WRITE_REG32(&dev_if->dev_global_regs->diepeachintmsk[0],
-+				diepmsk.d32);
-+	} else {
-+		daintmsk.b.inep0 = 1;
-+		daintmsk.b.outep0 = 1;
-+		DWC_WRITE_REG32(&dev_if->dev_global_regs->daintmsk,
-+				daintmsk.d32);
-+
-+		doepmsk.b.setup = 1;
-+		doepmsk.b.xfercompl = 1;
-+		doepmsk.b.ahberr = 1;
-+		doepmsk.b.epdisabled = 1;
-+
-+		if ((core_if->dma_desc_enable) ||
-+		    (core_if->dma_enable
-+		     && core_if->snpsid >= OTG_CORE_REV_3_00a)) {
-+			doepmsk.b.stsphsercvd = 1;
-+		}
-+		if (core_if->dma_desc_enable)
-+			doepmsk.b.bna = 1;
-+		DWC_WRITE_REG32(&dev_if->dev_global_regs->doepmsk, doepmsk.d32);
-+
-+		diepmsk.b.xfercompl = 1;
-+		diepmsk.b.timeout = 1;
-+		diepmsk.b.epdisabled = 1;
-+		diepmsk.b.ahberr = 1;
-+		if (!core_if->en_multiple_tx_fifo && core_if->dma_enable)
-+			diepmsk.b.intknepmis = 0;
-+/*
-+		if (core_if->dma_desc_enable) {
-+			diepmsk.b.bna = 1;
-+		}
-+*/
-+
-+		DWC_WRITE_REG32(&dev_if->dev_global_regs->diepmsk, diepmsk.d32);
-+	}
-+
-+	/* Reset Device Address */
-+	dcfg.d32 = DWC_READ_REG32(&dev_if->dev_global_regs->dcfg);
-+	dcfg.b.devaddr = 0;
-+	DWC_WRITE_REG32(&dev_if->dev_global_regs->dcfg, dcfg.d32);
-+
-+	/* setup EP0 to receive SETUP packets */
-+	if (core_if->snpsid <= OTG_CORE_REV_2_94a)
-+		ep0_out_start(core_if, pcd);
-+
-+	/* Clear interrupt */
-+	gintsts.d32 = 0;
-+	gintsts.b.usbreset = 1;
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gintsts, gintsts.d32);
-+
-+	return 1;
-+}
-+
-+/**
-+ * Get the device speed from the device status register and convert it
-+ * to USB speed constant.
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ */
-+static int get_device_speed(dwc_otg_core_if_t * core_if)
-+{
-+	dsts_data_t dsts;
-+	int speed = 0;
-+	dsts.d32 = DWC_READ_REG32(&core_if->dev_if->dev_global_regs->dsts);
-+
-+	switch (dsts.b.enumspd) {
-+	case DWC_DSTS_ENUMSPD_HS_PHY_30MHZ_OR_60MHZ:
-+		speed = USB_SPEED_HIGH;
-+		break;
-+	case DWC_DSTS_ENUMSPD_FS_PHY_30MHZ_OR_60MHZ:
-+	case DWC_DSTS_ENUMSPD_FS_PHY_48MHZ:
-+		speed = USB_SPEED_FULL;
-+		break;
-+
-+	case DWC_DSTS_ENUMSPD_LS_PHY_6MHZ:
-+		speed = USB_SPEED_LOW;
-+		break;
-+	}
-+
-+	return speed;
-+}
-+
-+/**
-+ * Read the device status register and set the device speed in the
-+ * data structure.
-+ * Set up EP0 to receive SETUP packets by calling dwc_ep0_activate.
-+ */
-+int32_t dwc_otg_pcd_handle_enum_done_intr(dwc_otg_pcd_t * pcd)
-+{
-+	dwc_otg_pcd_ep_t *ep0 = &pcd->ep0;
-+	gintsts_data_t gintsts;
-+	gusbcfg_data_t gusbcfg;
-+	dwc_otg_core_global_regs_t *global_regs =
-+	    GET_CORE_IF(pcd)->core_global_regs;
-+	uint8_t utmi16b, utmi8b;
-+	int speed;
-+	DWC_DEBUGPL(DBG_PCD, "SPEED ENUM\n");
-+
-+	if (GET_CORE_IF(pcd)->snpsid >= OTG_CORE_REV_2_60a) {
-+		utmi16b = 6;	//vahrama old value was 6;
-+		utmi8b = 9;
-+	} else {
-+		utmi16b = 4;
-+		utmi8b = 8;
-+	}
-+	dwc_otg_ep0_activate(GET_CORE_IF(pcd), &ep0->dwc_ep);
-+	if (GET_CORE_IF(pcd)->snpsid >= OTG_CORE_REV_3_00a) {
-+		ep0_out_start(GET_CORE_IF(pcd), pcd);
-+	}
-+
-+#ifdef DEBUG_EP0
-+	print_ep0_state(pcd);
-+#endif
-+
-+	if (pcd->ep0state == EP0_DISCONNECT) {
-+		pcd->ep0state = EP0_IDLE;
-+	} else if (pcd->ep0state == EP0_STALL) {
-+		pcd->ep0state = EP0_IDLE;
-+	}
-+
-+	pcd->ep0state = EP0_IDLE;
-+
-+	ep0->stopped = 0;
-+
-+	speed = get_device_speed(GET_CORE_IF(pcd));
-+	pcd->fops->connect(pcd, speed);
-+
-+	/* Set USB turnaround time based on device speed and PHY interface. */
-+	gusbcfg.d32 = DWC_READ_REG32(&global_regs->gusbcfg);
-+	if (speed == USB_SPEED_HIGH) {
-+		if (GET_CORE_IF(pcd)->hwcfg2.b.hs_phy_type ==
-+		    DWC_HWCFG2_HS_PHY_TYPE_ULPI) {
-+			/* ULPI interface */
-+			gusbcfg.b.usbtrdtim = 9;
-+		}
-+		if (GET_CORE_IF(pcd)->hwcfg2.b.hs_phy_type ==
-+		    DWC_HWCFG2_HS_PHY_TYPE_UTMI) {
-+			/* UTMI+ interface */
-+			if (GET_CORE_IF(pcd)->hwcfg4.b.utmi_phy_data_width == 0) {
-+				gusbcfg.b.usbtrdtim = utmi8b;
-+			} else if (GET_CORE_IF(pcd)->hwcfg4.
-+				   b.utmi_phy_data_width == 1) {
-+				gusbcfg.b.usbtrdtim = utmi16b;
-+			} else if (GET_CORE_IF(pcd)->
-+				   core_params->phy_utmi_width == 8) {
-+				gusbcfg.b.usbtrdtim = utmi8b;
-+			} else {
-+				gusbcfg.b.usbtrdtim = utmi16b;
-+			}
-+		}
-+		if (GET_CORE_IF(pcd)->hwcfg2.b.hs_phy_type ==
-+		    DWC_HWCFG2_HS_PHY_TYPE_UTMI_ULPI) {
-+			/* UTMI+  OR  ULPI interface */
-+			if (gusbcfg.b.ulpi_utmi_sel == 1) {
-+				/* ULPI interface */
-+				gusbcfg.b.usbtrdtim = 9;
-+			} else {
-+				/* UTMI+ interface */
-+				if (GET_CORE_IF(pcd)->
-+				    core_params->phy_utmi_width == 16) {
-+					gusbcfg.b.usbtrdtim = utmi16b;
-+				} else {
-+					gusbcfg.b.usbtrdtim = utmi8b;
-+				}
-+			}
-+		}
-+	} else {
-+		/* Full or low speed */
-+		gusbcfg.b.usbtrdtim = 9;
-+	}
-+	DWC_WRITE_REG32(&global_regs->gusbcfg, gusbcfg.d32);
-+
-+	/* Clear interrupt */
-+	gintsts.d32 = 0;
-+	gintsts.b.enumdone = 1;
-+	DWC_WRITE_REG32(&GET_CORE_IF(pcd)->core_global_regs->gintsts,
-+			gintsts.d32);
-+	return 1;
-+}
-+
-+/**
-+ * This interrupt indicates that the ISO OUT Packet was dropped due to
-+ * Rx FIFO full or Rx Status Queue Full.  If this interrupt occurs
-+ * read all the data from the Rx FIFO.
-+ */
-+int32_t dwc_otg_pcd_handle_isoc_out_packet_dropped_intr(dwc_otg_pcd_t * pcd)
-+{
-+	gintmsk_data_t intr_mask = {.d32 = 0 };
-+	gintsts_data_t gintsts;
-+
-+	DWC_WARN("INTERRUPT Handler not implemented for %s\n",
-+		 "ISOC Out Dropped");
-+
-+	intr_mask.b.isooutdrop = 1;
-+	DWC_MODIFY_REG32(&GET_CORE_IF(pcd)->core_global_regs->gintmsk,
-+			 intr_mask.d32, 0);
-+
-+	/* Clear interrupt */
-+	gintsts.d32 = 0;
-+	gintsts.b.isooutdrop = 1;
-+	DWC_WRITE_REG32(&GET_CORE_IF(pcd)->core_global_regs->gintsts,
-+			gintsts.d32);
-+
-+	return 1;
-+}
-+
-+/**
-+ * This interrupt indicates the end of the portion of the micro-frame
-+ * for periodic transactions.  If there is a periodic transaction for
-+ * the next frame, load the packets into the EP periodic Tx FIFO.
-+ */
-+int32_t dwc_otg_pcd_handle_end_periodic_frame_intr(dwc_otg_pcd_t * pcd)
-+{
-+	gintmsk_data_t intr_mask = {.d32 = 0 };
-+	gintsts_data_t gintsts;
-+	DWC_PRINTF("INTERRUPT Handler not implemented for %s\n", "EOP");
-+
-+	intr_mask.b.eopframe = 1;
-+	DWC_MODIFY_REG32(&GET_CORE_IF(pcd)->core_global_regs->gintmsk,
-+			 intr_mask.d32, 0);
-+
-+	/* Clear interrupt */
-+	gintsts.d32 = 0;
-+	gintsts.b.eopframe = 1;
-+	DWC_WRITE_REG32(&GET_CORE_IF(pcd)->core_global_regs->gintsts,
-+			gintsts.d32);
-+
-+	return 1;
-+}
-+
-+/**
-+ * This interrupt indicates that EP of the packet on the top of the
-+ * non-periodic Tx FIFO does not match EP of the IN Token received.
-+ *
-+ * The "Device IN Token Queue" Registers are read to determine the
-+ * order the IN Tokens have been received. The non-periodic Tx FIFO
-+ * is flushed, so it can be reloaded in the order seen in the IN Token
-+ * Queue.
-+ */
-+int32_t dwc_otg_pcd_handle_ep_mismatch_intr(dwc_otg_pcd_t * pcd)
-+{
-+	gintsts_data_t gintsts;
-+	dwc_otg_core_if_t *core_if = GET_CORE_IF(pcd);
-+	dctl_data_t dctl;
-+	gintmsk_data_t intr_mask = {.d32 = 0 };
-+
-+	if (!core_if->en_multiple_tx_fifo && core_if->dma_enable) {
-+		core_if->start_predict = 1;
-+
-+		DWC_DEBUGPL(DBG_PCDV, "%s(%p)\n", __func__, core_if);
-+
-+		gintsts.d32 = DWC_READ_REG32(&core_if->core_global_regs->gintsts);
-+		if (!gintsts.b.ginnakeff) {
-+			/* Disable EP Mismatch interrupt */
-+			intr_mask.d32 = 0;
-+			intr_mask.b.epmismatch = 1;
-+			DWC_MODIFY_REG32(&core_if->core_global_regs->gintmsk, intr_mask.d32, 0);
-+			/* Enable the Global IN NAK Effective Interrupt */
-+			intr_mask.d32 = 0;
-+			intr_mask.b.ginnakeff = 1;
-+			DWC_MODIFY_REG32(&core_if->core_global_regs->gintmsk, 0, intr_mask.d32);
-+			/* Set the global non-periodic IN NAK handshake */
-+			dctl.d32 = DWC_READ_REG32(&core_if->dev_if->dev_global_regs->dctl);
-+			dctl.b.sgnpinnak = 1;
-+			DWC_WRITE_REG32(&core_if->dev_if->dev_global_regs->dctl, dctl.d32);
-+		} else {
-+			DWC_PRINTF("gintsts.b.ginnakeff = 1! dctl.b.sgnpinnak not set\n");
-+		}
-+		/* Disabling of all EP's will be done in dwc_otg_pcd_handle_in_nak_effective()
-+		 * handler after Global IN NAK Effective interrupt will be asserted */
-+	}
-+	/* Clear interrupt */
-+	gintsts.d32 = 0;
-+	gintsts.b.epmismatch = 1;
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gintsts, gintsts.d32);
-+
-+	return 1;
-+}
-+
-+/**
-+ * This interrupt is valid only in DMA mode. This interrupt indicates that the
-+ * core has stopped fetching data for IN endpoints due to the unavailability of
-+ * TxFIFO space or Request Queue space. This interrupt is used by the
-+ * application for an endpoint mismatch algorithm.
-+ *
-+ * @param pcd The PCD
-+ */
-+int32_t dwc_otg_pcd_handle_ep_fetsusp_intr(dwc_otg_pcd_t * pcd)
-+{
-+	gintsts_data_t gintsts;
-+	gintmsk_data_t gintmsk_data;
-+	dctl_data_t dctl;
-+	dwc_otg_core_if_t *core_if = GET_CORE_IF(pcd);
-+	DWC_DEBUGPL(DBG_PCDV, "%s(%p)\n", __func__, core_if);
-+
-+	/* Clear the global non-periodic IN NAK handshake */
-+	dctl.d32 = 0;
-+	dctl.b.cgnpinnak = 1;
-+	DWC_MODIFY_REG32(&core_if->dev_if->dev_global_regs->dctl, dctl.d32, dctl.d32);
-+
-+	/* Mask GINTSTS.FETSUSP interrupt */
-+	gintmsk_data.d32 = DWC_READ_REG32(&core_if->core_global_regs->gintmsk);
-+	gintmsk_data.b.fetsusp = 0;
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gintmsk, gintmsk_data.d32);
-+
-+	/* Clear interrupt */
-+	gintsts.d32 = 0;
-+	gintsts.b.fetsusp = 1;
-+	DWC_WRITE_REG32(&core_if->core_global_regs->gintsts, gintsts.d32);
-+
-+	return 1;
-+}
-+/**
-+ * This funcion stalls EP0.
-+ */
-+static inline void ep0_do_stall(dwc_otg_pcd_t * pcd, const int err_val)
-+{
-+	dwc_otg_pcd_ep_t *ep0 = &pcd->ep0;
-+	usb_device_request_t *ctrl = &pcd->setup_pkt->req;
-+	DWC_WARN("req %02x.%02x protocol STALL; err %d\n",
-+		 ctrl->bmRequestType, ctrl->bRequest, err_val);
-+
-+	ep0->dwc_ep.is_in = 1;
-+	dwc_otg_ep_set_stall(GET_CORE_IF(pcd), &ep0->dwc_ep);
-+	pcd->ep0.stopped = 1;
-+	pcd->ep0state = EP0_IDLE;
-+	ep0_out_start(GET_CORE_IF(pcd), pcd);
-+}
-+
-+/**
-+ * This functions delegates the setup command to the gadget driver.
-+ */
-+static inline void do_gadget_setup(dwc_otg_pcd_t * pcd,
-+				   usb_device_request_t * ctrl)
-+{
-+	int ret = 0;
-+	DWC_SPINUNLOCK(pcd->lock);
-+	ret = pcd->fops->setup(pcd, (uint8_t *) ctrl);
-+	DWC_SPINLOCK(pcd->lock);
-+	if (ret < 0) {
-+		ep0_do_stall(pcd, ret);
-+	}
-+
-+	/** @todo This is a g_file_storage gadget driver specific
-+	 * workaround: a DELAYED_STATUS result from the fsg_setup
-+	 * routine will result in the gadget queueing a EP0 IN status
-+	 * phase for a two-stage control transfer. Exactly the same as
-+	 * a SET_CONFIGURATION/SET_INTERFACE except that this is a class
-+	 * specific request.  Need a generic way to know when the gadget
-+	 * driver will queue the status phase. Can we assume when we
-+	 * call the gadget driver setup() function that it will always
-+	 * queue and require the following flag? Need to look into
-+	 * this.
-+	 */
-+
-+	if (ret == 256 + 999) {
-+		pcd->request_config = 1;
-+	}
-+}
-+
-+#ifdef DWC_UTE_CFI
-+/**
-+ * This functions delegates the CFI setup commands to the gadget driver.
-+ * This function will return a negative value to indicate a failure.
-+ */
-+static inline int cfi_gadget_setup(dwc_otg_pcd_t * pcd,
-+				   struct cfi_usb_ctrlrequest *ctrl_req)
-+{
-+	int ret = 0;
-+
-+	if (pcd->fops && pcd->fops->cfi_setup) {
-+		DWC_SPINUNLOCK(pcd->lock);
-+		ret = pcd->fops->cfi_setup(pcd, ctrl_req);
-+		DWC_SPINLOCK(pcd->lock);
-+		if (ret < 0) {
-+			ep0_do_stall(pcd, ret);
-+			return ret;
-+		}
-+	}
-+
-+	return ret;
-+}
-+#endif
-+
-+/**
-+ * This function starts the Zero-Length Packet for the IN status phase
-+ * of a 2 stage control transfer.
-+ */
-+static inline void do_setup_in_status_phase(dwc_otg_pcd_t * pcd)
-+{
-+	dwc_otg_pcd_ep_t *ep0 = &pcd->ep0;
-+	if (pcd->ep0state == EP0_STALL) {
-+		return;
-+	}
-+
-+	pcd->ep0state = EP0_IN_STATUS_PHASE;
-+
-+	/* Prepare for more SETUP Packets */
-+	DWC_DEBUGPL(DBG_PCD, "EP0 IN ZLP\n");
-+	if ((GET_CORE_IF(pcd)->snpsid >= OTG_CORE_REV_3_00a)
-+	    && (pcd->core_if->dma_desc_enable)
-+	    && (ep0->dwc_ep.xfer_count < ep0->dwc_ep.total_len)) {
-+		DWC_DEBUGPL(DBG_PCDV,
-+			    "Data terminated wait next packet in out_desc_addr\n");
-+		pcd->backup_buf = phys_to_virt(ep0->dwc_ep.dma_addr);
-+		pcd->data_terminated = 1;
-+	}
-+	ep0->dwc_ep.xfer_len = 0;
-+	ep0->dwc_ep.xfer_count = 0;
-+	ep0->dwc_ep.is_in = 1;
-+	ep0->dwc_ep.dma_addr = pcd->setup_pkt_dma_handle;
-+	dwc_otg_ep0_start_transfer(GET_CORE_IF(pcd), &ep0->dwc_ep);
-+
-+	/* Prepare for more SETUP Packets */
-+	//ep0_out_start(GET_CORE_IF(pcd), pcd);
-+}
-+
-+/**
-+ * This function starts the Zero-Length Packet for the OUT status phase
-+ * of a 2 stage control transfer.
-+ */
-+static inline void do_setup_out_status_phase(dwc_otg_pcd_t * pcd)
-+{
-+	dwc_otg_pcd_ep_t *ep0 = &pcd->ep0;
-+	if (pcd->ep0state == EP0_STALL) {
-+		DWC_DEBUGPL(DBG_PCD, "EP0 STALLED\n");
-+		return;
-+	}
-+	pcd->ep0state = EP0_OUT_STATUS_PHASE;
-+
-+	DWC_DEBUGPL(DBG_PCD, "EP0 OUT ZLP\n");
-+	ep0->dwc_ep.xfer_len = 0;
-+	ep0->dwc_ep.xfer_count = 0;
-+	ep0->dwc_ep.is_in = 0;
-+	ep0->dwc_ep.dma_addr = pcd->setup_pkt_dma_handle;
-+	dwc_otg_ep0_start_transfer(GET_CORE_IF(pcd), &ep0->dwc_ep);
-+
-+	/* Prepare for more SETUP Packets */
-+	if (GET_CORE_IF(pcd)->dma_enable == 0) {
-+		ep0_out_start(GET_CORE_IF(pcd), pcd);
-+	}
-+}
-+
-+/**
-+ * Clear the EP halt (STALL) and if pending requests start the
-+ * transfer.
-+ */
-+static inline void pcd_clear_halt(dwc_otg_pcd_t * pcd, dwc_otg_pcd_ep_t * ep)
-+{
-+	if (ep->dwc_ep.stall_clear_flag == 0)
-+		dwc_otg_ep_clear_stall(GET_CORE_IF(pcd), &ep->dwc_ep);
-+
-+	/* Reactive the EP */
-+	dwc_otg_ep_activate(GET_CORE_IF(pcd), &ep->dwc_ep);
-+	if (ep->stopped) {
-+		ep->stopped = 0;
-+		/* If there is a request in the EP queue start it */
-+
-+		/** @todo FIXME: this causes an EP mismatch in DMA mode.
-+		 * epmismatch not yet implemented. */
-+
-+		/*
-+		 * Above fixme is solved by implmenting a tasklet to call the
-+		 * start_next_request(), outside of interrupt context at some
-+		 * time after the current time, after a clear-halt setup packet.
-+		 * Still need to implement ep mismatch in the future if a gadget
-+		 * ever uses more than one endpoint at once
-+		 */
-+		ep->queue_sof = 1;
-+		DWC_TASK_SCHEDULE(pcd->start_xfer_tasklet);
-+	}
-+	/* Start Control Status Phase */
-+	do_setup_in_status_phase(pcd);
-+}
-+
-+/**
-+ * This function is called when the SET_FEATURE TEST_MODE Setup packet
-+ * is sent from the host.  The Device Control register is written with
-+ * the Test Mode bits set to the specified Test Mode.  This is done as
-+ * a tasklet so that the "Status" phase of the control transfer
-+ * completes before transmitting the TEST packets.
-+ *
-+ * @todo This has not been tested since the tasklet struct was put
-+ * into the PCD struct!
-+ *
-+ */
-+void do_test_mode(void *data)
-+{
-+	dctl_data_t dctl;
-+	dwc_otg_pcd_t *pcd = (dwc_otg_pcd_t *) data;
-+	dwc_otg_core_if_t *core_if = GET_CORE_IF(pcd);
-+	int test_mode = pcd->test_mode;
-+
-+//        DWC_WARN("%s() has not been tested since being rewritten!\n", __func__);
-+
-+	dctl.d32 = DWC_READ_REG32(&core_if->dev_if->dev_global_regs->dctl);
-+	switch (test_mode) {
-+	case 1:		// TEST_J
-+		dctl.b.tstctl = 1;
-+		break;
-+
-+	case 2:		// TEST_K
-+		dctl.b.tstctl = 2;
-+		break;
-+
-+	case 3:		// TEST_SE0_NAK
-+		dctl.b.tstctl = 3;
-+		break;
-+
-+	case 4:		// TEST_PACKET
-+		dctl.b.tstctl = 4;
-+		break;
-+
-+	case 5:		// TEST_FORCE_ENABLE
-+		dctl.b.tstctl = 5;
-+		break;
-+	}
-+	DWC_WRITE_REG32(&core_if->dev_if->dev_global_regs->dctl, dctl.d32);
-+}
-+
-+/**
-+ * This function process the GET_STATUS Setup Commands.
-+ */
-+static inline void do_get_status(dwc_otg_pcd_t * pcd)
-+{
-+	usb_device_request_t ctrl = pcd->setup_pkt->req;
-+	dwc_otg_pcd_ep_t *ep;
-+	dwc_otg_pcd_ep_t *ep0 = &pcd->ep0;
-+	uint16_t *status = pcd->status_buf;
-+	dwc_otg_core_if_t *core_if = GET_CORE_IF(pcd);
-+
-+#ifdef DEBUG_EP0
-+	DWC_DEBUGPL(DBG_PCD,
-+		    "GET_STATUS %02x.%02x v%04x i%04x l%04x\n",
-+		    ctrl.bmRequestType, ctrl.bRequest,
-+		    UGETW(ctrl.wValue), UGETW(ctrl.wIndex),
-+		    UGETW(ctrl.wLength));
-+#endif
-+
-+	switch (UT_GET_RECIPIENT(ctrl.bmRequestType)) {
-+	case UT_DEVICE:
-+		if(UGETW(ctrl.wIndex) == 0xF000) { /* OTG Status selector */
-+			DWC_PRINTF("wIndex - %d\n", UGETW(ctrl.wIndex));
-+			DWC_PRINTF("OTG VERSION - %d\n", core_if->otg_ver);
-+			DWC_PRINTF("OTG CAP - %d, %d\n",
-+				   core_if->core_params->otg_cap,
-+						DWC_OTG_CAP_PARAM_HNP_SRP_CAPABLE);
-+			if (core_if->otg_ver == 1
-+			    && core_if->core_params->otg_cap ==
-+			    DWC_OTG_CAP_PARAM_HNP_SRP_CAPABLE) {
-+				uint8_t *otgsts = (uint8_t*)pcd->status_buf;
-+				*otgsts = (core_if->otg_sts & 0x1);
-+				pcd->ep0_pending = 1;
-+				ep0->dwc_ep.start_xfer_buff =
-+				    (uint8_t *) otgsts;
-+				ep0->dwc_ep.xfer_buff = (uint8_t *) otgsts;
-+				ep0->dwc_ep.dma_addr =
-+				    pcd->status_buf_dma_handle;
-+				ep0->dwc_ep.xfer_len = 1;
-+				ep0->dwc_ep.xfer_count = 0;
-+				ep0->dwc_ep.total_len = ep0->dwc_ep.xfer_len;
-+				dwc_otg_ep0_start_transfer(GET_CORE_IF(pcd),
-+							   &ep0->dwc_ep);
-+				return;
-+			} else {
-+				ep0_do_stall(pcd, -DWC_E_NOT_SUPPORTED);
-+				return;
-+			}
-+			break;
-+		} else {
-+			*status = 0x1;	/* Self powered */
-+			*status |= pcd->remote_wakeup_enable << 1;
-+			break;
-+		}
-+	case UT_INTERFACE:
-+		*status = 0;
-+		break;
-+
-+	case UT_ENDPOINT:
-+		ep = get_ep_by_addr(pcd, UGETW(ctrl.wIndex));
-+		if (ep == 0 || UGETW(ctrl.wLength) > 2) {
-+			ep0_do_stall(pcd, -DWC_E_NOT_SUPPORTED);
-+			return;
-+		}
-+		/** @todo check for EP stall */
-+		*status = ep->stopped;
-+		break;
-+	}
-+	pcd->ep0_pending = 1;
-+	ep0->dwc_ep.start_xfer_buff = (uint8_t *) status;
-+	ep0->dwc_ep.xfer_buff = (uint8_t *) status;
-+	ep0->dwc_ep.dma_addr = pcd->status_buf_dma_handle;
-+	ep0->dwc_ep.xfer_len = 2;
-+	ep0->dwc_ep.xfer_count = 0;
-+	ep0->dwc_ep.total_len = ep0->dwc_ep.xfer_len;
-+	dwc_otg_ep0_start_transfer(GET_CORE_IF(pcd), &ep0->dwc_ep);
-+}
-+
-+/**
-+ * This function process the SET_FEATURE Setup Commands.
-+ */
-+static inline void do_set_feature(dwc_otg_pcd_t * pcd)
-+{
-+	dwc_otg_core_if_t *core_if = GET_CORE_IF(pcd);
-+	dwc_otg_core_global_regs_t *global_regs = core_if->core_global_regs;
-+	usb_device_request_t ctrl = pcd->setup_pkt->req;
-+	dwc_otg_pcd_ep_t *ep = 0;
-+	int32_t otg_cap_param = core_if->core_params->otg_cap;
-+	gotgctl_data_t gotgctl = {.d32 = 0 };
-+
-+	DWC_DEBUGPL(DBG_PCD, "SET_FEATURE:%02x.%02x v%04x i%04x l%04x\n",
-+		    ctrl.bmRequestType, ctrl.bRequest,
-+		    UGETW(ctrl.wValue), UGETW(ctrl.wIndex),
-+		    UGETW(ctrl.wLength));
-+	DWC_DEBUGPL(DBG_PCD, "otg_cap=%d\n", otg_cap_param);
-+
-+	switch (UT_GET_RECIPIENT(ctrl.bmRequestType)) {
-+	case UT_DEVICE:
-+		switch (UGETW(ctrl.wValue)) {
-+		case UF_DEVICE_REMOTE_WAKEUP:
-+			pcd->remote_wakeup_enable = 1;
-+			break;
-+
-+		case UF_TEST_MODE:
-+			/* Setup the Test Mode tasklet to do the Test
-+			 * Packet generation after the SETUP Status
-+			 * phase has completed. */
-+
-+			/** @todo This has not been tested since the
-+			 * tasklet struct was put into the PCD
-+			 * struct! */
-+			pcd->test_mode = UGETW(ctrl.wIndex) >> 8;
-+			DWC_TASK_SCHEDULE(pcd->test_mode_tasklet);
-+			break;
-+
-+		case UF_DEVICE_B_HNP_ENABLE:
-+			DWC_DEBUGPL(DBG_PCDV,
-+				    "SET_FEATURE: USB_DEVICE_B_HNP_ENABLE\n");
-+
-+			/* dev may initiate HNP */
-+			if (otg_cap_param == DWC_OTG_CAP_PARAM_HNP_SRP_CAPABLE) {
-+				pcd->b_hnp_enable = 1;
-+				dwc_otg_pcd_update_otg(pcd, 0);
-+				DWC_DEBUGPL(DBG_PCD, "Request B HNP\n");
-+				/**@todo Is the gotgctl.devhnpen cleared
-+				 * by a USB Reset? */
-+				gotgctl.b.devhnpen = 1;
-+				gotgctl.b.hnpreq = 1;
-+				DWC_WRITE_REG32(&global_regs->gotgctl,
-+						gotgctl.d32);
-+			} else {
-+				ep0_do_stall(pcd, -DWC_E_NOT_SUPPORTED);
-+				return;
-+			}
-+			break;
-+
-+		case UF_DEVICE_A_HNP_SUPPORT:
-+			/* RH port supports HNP */
-+			DWC_DEBUGPL(DBG_PCDV,
-+				    "SET_FEATURE: USB_DEVICE_A_HNP_SUPPORT\n");
-+			if (otg_cap_param == DWC_OTG_CAP_PARAM_HNP_SRP_CAPABLE) {
-+				pcd->a_hnp_support = 1;
-+				dwc_otg_pcd_update_otg(pcd, 0);
-+			} else {
-+				ep0_do_stall(pcd, -DWC_E_NOT_SUPPORTED);
-+				return;
-+			}
-+			break;
-+
-+		case UF_DEVICE_A_ALT_HNP_SUPPORT:
-+			/* other RH port does */
-+			DWC_DEBUGPL(DBG_PCDV,
-+				    "SET_FEATURE: USB_DEVICE_A_ALT_HNP_SUPPORT\n");
-+			if (otg_cap_param == DWC_OTG_CAP_PARAM_HNP_SRP_CAPABLE) {
-+				pcd->a_alt_hnp_support = 1;
-+				dwc_otg_pcd_update_otg(pcd, 0);
-+			} else {
-+				ep0_do_stall(pcd, -DWC_E_NOT_SUPPORTED);
-+				return;
-+			}
-+			break;
-+
-+		default:
-+			ep0_do_stall(pcd, -DWC_E_NOT_SUPPORTED);
-+			return;
-+
-+		}
-+		do_setup_in_status_phase(pcd);
-+		break;
-+
-+	case UT_INTERFACE:
-+		do_gadget_setup(pcd, &ctrl);
-+		break;
-+
-+	case UT_ENDPOINT:
-+		if (UGETW(ctrl.wValue) == UF_ENDPOINT_HALT) {
-+			ep = get_ep_by_addr(pcd, UGETW(ctrl.wIndex));
-+			if (ep == 0) {
-+				ep0_do_stall(pcd, -DWC_E_NOT_SUPPORTED);
-+				return;
-+			}
-+			ep->stopped = 1;
-+			dwc_otg_ep_set_stall(core_if, &ep->dwc_ep);
-+		}
-+		do_setup_in_status_phase(pcd);
-+		break;
-+	}
-+}
-+
-+/**
-+ * This function process the CLEAR_FEATURE Setup Commands.
-+ */
-+static inline void do_clear_feature(dwc_otg_pcd_t * pcd)
-+{
-+	usb_device_request_t ctrl = pcd->setup_pkt->req;
-+	dwc_otg_pcd_ep_t *ep = 0;
-+
-+	DWC_DEBUGPL(DBG_PCD,
-+		    "CLEAR_FEATURE:%02x.%02x v%04x i%04x l%04x\n",
-+		    ctrl.bmRequestType, ctrl.bRequest,
-+		    UGETW(ctrl.wValue), UGETW(ctrl.wIndex),
-+		    UGETW(ctrl.wLength));
-+
-+	switch (UT_GET_RECIPIENT(ctrl.bmRequestType)) {
-+	case UT_DEVICE:
-+		switch (UGETW(ctrl.wValue)) {
-+		case UF_DEVICE_REMOTE_WAKEUP:
-+			pcd->remote_wakeup_enable = 0;
-+			break;
-+
-+		case UF_TEST_MODE:
-+			/** @todo Add CLEAR_FEATURE for TEST modes. */
-+			break;
-+
-+		default:
-+			ep0_do_stall(pcd, -DWC_E_NOT_SUPPORTED);
-+			return;
-+		}
-+		do_setup_in_status_phase(pcd);
-+		break;
-+
-+	case UT_ENDPOINT:
-+		ep = get_ep_by_addr(pcd, UGETW(ctrl.wIndex));
-+		if (ep == 0) {
-+			ep0_do_stall(pcd, -DWC_E_NOT_SUPPORTED);
-+			return;
-+		}
-+
-+		pcd_clear_halt(pcd, ep);
-+
-+		break;
-+	}
-+}
-+
-+/**
-+ * This function process the SET_ADDRESS Setup Commands.
-+ */
-+static inline void do_set_address(dwc_otg_pcd_t * pcd)
-+{
-+	dwc_otg_dev_if_t *dev_if = GET_CORE_IF(pcd)->dev_if;
-+	usb_device_request_t ctrl = pcd->setup_pkt->req;
-+
-+	if (ctrl.bmRequestType == UT_DEVICE) {
-+		dcfg_data_t dcfg = {.d32 = 0 };
-+
-+#ifdef DEBUG_EP0
-+//                      DWC_DEBUGPL(DBG_PCDV, "SET_ADDRESS:%d\n", ctrl.wValue);
-+#endif
-+		dcfg.b.devaddr = UGETW(ctrl.wValue);
-+		DWC_MODIFY_REG32(&dev_if->dev_global_regs->dcfg, 0, dcfg.d32);
-+		do_setup_in_status_phase(pcd);
-+	}
-+}
-+
-+/**
-+ *	This function processes SETUP commands. In Linux, the USB Command
-+ *	processing is done in two places - the first being the PCD and the
-+ *	second in the Gadget Driver (for example, the File-Backed Storage
-+ *	Gadget Driver).
-+ *
-+ * <table>
-+ * <tr><td>Command	</td><td>Driver </td><td>Description</td></tr>
-+ *
-+ * <tr><td>GET_STATUS </td><td>PCD </td><td>Command is processed as
-+ * defined in chapter 9 of the USB 2.0 Specification chapter 9
-+ * </td></tr>
-+ *
-+ * <tr><td>CLEAR_FEATURE </td><td>PCD </td><td>The Device and Endpoint
-+ * requests are the ENDPOINT_HALT feature is procesed, all others the
-+ * interface requests are ignored.</td></tr>
-+ *
-+ * <tr><td>SET_FEATURE </td><td>PCD </td><td>The Device and Endpoint
-+ * requests are processed by the PCD.  Interface requests are passed
-+ * to the Gadget Driver.</td></tr>
-+ *
-+ * <tr><td>SET_ADDRESS </td><td>PCD </td><td>Program the DCFG reg,
-+ * with device address received </td></tr>
-+ *
-+ * <tr><td>GET_DESCRIPTOR </td><td>Gadget Driver </td><td>Return the
-+ * requested descriptor</td></tr>
-+ *
-+ * <tr><td>SET_DESCRIPTOR </td><td>Gadget Driver </td><td>Optional -
-+ * not implemented by any of the existing Gadget Drivers.</td></tr>
-+ *
-+ * <tr><td>SET_CONFIGURATION </td><td>Gadget Driver </td><td>Disable
-+ * all EPs and enable EPs for new configuration.</td></tr>
-+ *
-+ * <tr><td>GET_CONFIGURATION </td><td>Gadget Driver </td><td>Return
-+ * the current configuration</td></tr>
-+ *
-+ * <tr><td>SET_INTERFACE </td><td>Gadget Driver </td><td>Disable all
-+ * EPs and enable EPs for new configuration.</td></tr>
-+ *
-+ * <tr><td>GET_INTERFACE </td><td>Gadget Driver </td><td>Return the
-+ * current interface.</td></tr>
-+ *
-+ * <tr><td>SYNC_FRAME </td><td>PCD </td><td>Display debug
-+ * message.</td></tr>
-+ * </table>
-+ *
-+ * When the SETUP Phase Done interrupt occurs, the PCD SETUP commands are
-+ * processed by pcd_setup. Calling the Function Driver's setup function from
-+ * pcd_setup processes the gadget SETUP commands.
-+ */
-+static inline void pcd_setup(dwc_otg_pcd_t * pcd)
-+{
-+	dwc_otg_core_if_t *core_if = GET_CORE_IF(pcd);
-+	dwc_otg_dev_if_t *dev_if = core_if->dev_if;
-+	usb_device_request_t ctrl = pcd->setup_pkt->req;
-+	dwc_otg_pcd_ep_t *ep0 = &pcd->ep0;
-+
-+	deptsiz0_data_t doeptsize0 = {.d32 = 0 };
-+
-+#ifdef DWC_UTE_CFI
-+	int retval = 0;
-+	struct cfi_usb_ctrlrequest cfi_req;
-+#endif
-+
-+	doeptsize0.d32 = DWC_READ_REG32(&dev_if->out_ep_regs[0]->doeptsiz);
-+
-+	/** In BDMA more then 1 setup packet is not supported till 3.00a */
-+	if (core_if->dma_enable && core_if->dma_desc_enable == 0
-+	    && (doeptsize0.b.supcnt < 2)
-+	    && (core_if->snpsid < OTG_CORE_REV_2_94a)) {
-+		DWC_ERROR
-+		    ("\n\n-----------	 CANNOT handle > 1 setup packet in DMA mode\n\n");
-+	}
-+	if ((core_if->snpsid >= OTG_CORE_REV_3_00a)
-+	    && (core_if->dma_enable == 1) && (core_if->dma_desc_enable == 0)) {
-+		ctrl =
-+		    (pcd->setup_pkt +
-+		     (3 - doeptsize0.b.supcnt - 1 +
-+		      ep0->dwc_ep.stp_rollover))->req;
-+	}
-+#ifdef DEBUG_EP0
-+	DWC_DEBUGPL(DBG_PCD, "SETUP %02x.%02x v%04x i%04x l%04x\n",
-+		    ctrl.bmRequestType, ctrl.bRequest,
-+		    UGETW(ctrl.wValue), UGETW(ctrl.wIndex),
-+		    UGETW(ctrl.wLength));
-+#endif
-+
-+	/* Clean up the request queue */
-+	dwc_otg_request_nuke(ep0);
-+	ep0->stopped = 0;
-+
-+	if (ctrl.bmRequestType & UE_DIR_IN) {
-+		ep0->dwc_ep.is_in = 1;
-+		pcd->ep0state = EP0_IN_DATA_PHASE;
-+	} else {
-+		ep0->dwc_ep.is_in = 0;
-+		pcd->ep0state = EP0_OUT_DATA_PHASE;
-+	}
-+
-+	if (UGETW(ctrl.wLength) == 0) {
-+		ep0->dwc_ep.is_in = 1;
-+		pcd->ep0state = EP0_IN_STATUS_PHASE;
-+	}
-+
-+	if (UT_GET_TYPE(ctrl.bmRequestType) != UT_STANDARD) {
-+
-+#ifdef DWC_UTE_CFI
-+		DWC_MEMCPY(&cfi_req, &ctrl, sizeof(usb_device_request_t));
-+
-+		//printk(KERN_ALERT "CFI: req_type=0x%02x; req=0x%02x\n",
-+				ctrl.bRequestType, ctrl.bRequest);
-+		if (UT_GET_TYPE(cfi_req.bRequestType) == UT_VENDOR) {
-+			if (cfi_req.bRequest > 0xB0 && cfi_req.bRequest < 0xBF) {
-+				retval = cfi_setup(pcd, &cfi_req);
-+				if (retval < 0) {
-+					ep0_do_stall(pcd, retval);
-+					pcd->ep0_pending = 0;
-+					return;
-+				}
-+
-+				/* if need gadget setup then call it and check the retval */
-+				if (pcd->cfi->need_gadget_att) {
-+					retval =
-+					    cfi_gadget_setup(pcd,
-+							     &pcd->
-+							     cfi->ctrl_req);
-+					if (retval < 0) {
-+						pcd->ep0_pending = 0;
-+						return;
-+					}
-+				}
-+
-+				if (pcd->cfi->need_status_in_complete) {
-+					do_setup_in_status_phase(pcd);
-+				}
-+				return;
-+			}
-+		}
-+#endif
-+
-+		/* handle non-standard (class/vendor) requests in the gadget driver */
-+		do_gadget_setup(pcd, &ctrl);
-+		return;
-+	}
-+
-+	/** @todo NGS: Handle bad setup packet? */
-+
-+///////////////////////////////////////////
-+//// --- Standard Request handling --- ////
-+
-+	switch (ctrl.bRequest) {
-+	case UR_GET_STATUS:
-+		do_get_status(pcd);
-+		break;
-+
-+	case UR_CLEAR_FEATURE:
-+		do_clear_feature(pcd);
-+		break;
-+
-+	case UR_SET_FEATURE:
-+		do_set_feature(pcd);
-+		break;
-+
-+	case UR_SET_ADDRESS:
-+		do_set_address(pcd);
-+		break;
-+
-+	case UR_SET_INTERFACE:
-+	case UR_SET_CONFIG:
-+//              _pcd->request_config = 1;       /* Configuration changed */
-+		do_gadget_setup(pcd, &ctrl);
-+		break;
-+
-+	case UR_SYNCH_FRAME:
-+		do_gadget_setup(pcd, &ctrl);
-+		break;
-+
-+	default:
-+		/* Call the Gadget Driver's setup functions */
-+		do_gadget_setup(pcd, &ctrl);
-+		break;
-+	}
-+}
-+
-+/**
-+ * This function completes the ep0 control transfer.
-+ */
-+static int32_t ep0_complete_request(dwc_otg_pcd_ep_t * ep)
-+{
-+	dwc_otg_core_if_t *core_if = GET_CORE_IF(ep->pcd);
-+	dwc_otg_dev_if_t *dev_if = core_if->dev_if;
-+	dwc_otg_dev_in_ep_regs_t *in_ep_regs =
-+	    dev_if->in_ep_regs[ep->dwc_ep.num];
-+#ifdef DEBUG_EP0
-+	dwc_otg_dev_out_ep_regs_t *out_ep_regs =
-+	    dev_if->out_ep_regs[ep->dwc_ep.num];
-+#endif
-+	deptsiz0_data_t deptsiz;
-+	dev_dma_desc_sts_t desc_sts;
-+	dwc_otg_pcd_request_t *req;
-+	int is_last = 0;
-+	dwc_otg_pcd_t *pcd = ep->pcd;
-+
-+#ifdef DWC_UTE_CFI
-+	struct cfi_usb_ctrlrequest *ctrlreq;
-+	int retval = -DWC_E_NOT_SUPPORTED;
-+#endif
-+
-+        desc_sts.b.bytes = 0;
-+
-+	if (pcd->ep0_pending && DWC_CIRCLEQ_EMPTY(&ep->queue)) {
-+		if (ep->dwc_ep.is_in) {
-+#ifdef DEBUG_EP0
-+			DWC_DEBUGPL(DBG_PCDV, "Do setup OUT status phase\n");
-+#endif
-+			do_setup_out_status_phase(pcd);
-+		} else {
-+#ifdef DEBUG_EP0
-+			DWC_DEBUGPL(DBG_PCDV, "Do setup IN status phase\n");
-+#endif
-+
-+#ifdef DWC_UTE_CFI
-+			ctrlreq = &pcd->cfi->ctrl_req;
-+
-+			if (UT_GET_TYPE(ctrlreq->bRequestType) == UT_VENDOR) {
-+				if (ctrlreq->bRequest > 0xB0
-+				    && ctrlreq->bRequest < 0xBF) {
-+
-+					/* Return if the PCD failed to handle the request */
-+					if ((retval =
-+					     pcd->cfi->ops.
-+					     ctrl_write_complete(pcd->cfi,
-+								 pcd)) < 0) {
-+						CFI_INFO
-+						    ("ERROR setting a new value in the PCD(%d)\n",
-+						     retval);
-+						ep0_do_stall(pcd, retval);
-+						pcd->ep0_pending = 0;
-+						return 0;
-+					}
-+
-+					/* If the gadget needs to be notified on the request */
-+					if (pcd->cfi->need_gadget_att == 1) {
-+						//retval = do_gadget_setup(pcd, &pcd->cfi->ctrl_req);
-+						retval =
-+						    cfi_gadget_setup(pcd,
-+								     &pcd->cfi->
-+								     ctrl_req);
-+
-+						/* Return from the function if the gadget failed to process
-+						 * the request properly - this should never happen !!!
-+						 */
-+						if (retval < 0) {
-+							CFI_INFO
-+							    ("ERROR setting a new value in the gadget(%d)\n",
-+							     retval);
-+							pcd->ep0_pending = 0;
-+							return 0;
-+						}
-+					}
-+
-+					CFI_INFO("%s: RETVAL=%d\n", __func__,
-+						 retval);
-+					/* If we hit here then the PCD and the gadget has properly
-+					 * handled the request - so send the ZLP IN to the host.
-+					 */
-+					/* @todo: MAS - decide whether we need to start the setup
-+					 * stage based on the need_setup value of the cfi object
-+					 */
-+					do_setup_in_status_phase(pcd);
-+					pcd->ep0_pending = 0;
-+					return 1;
-+				}
-+			}
-+#endif
-+
-+			do_setup_in_status_phase(pcd);
-+		}
-+		pcd->ep0_pending = 0;
-+		return 1;
-+	}
-+
-+	if (DWC_CIRCLEQ_EMPTY(&ep->queue)) {
-+		return 0;
-+	}
-+	req = DWC_CIRCLEQ_FIRST(&ep->queue);
-+
-+	if (pcd->ep0state == EP0_OUT_STATUS_PHASE
-+	    || pcd->ep0state == EP0_IN_STATUS_PHASE) {
-+		is_last = 1;
-+	} else if (ep->dwc_ep.is_in) {
-+		deptsiz.d32 = DWC_READ_REG32(&in_ep_regs->dieptsiz);
-+		if (core_if->dma_desc_enable != 0)
-+			desc_sts = dev_if->in_desc_addr->status;
-+#ifdef DEBUG_EP0
-+		DWC_DEBUGPL(DBG_PCDV, "%d len=%d  xfersize=%d pktcnt=%d\n",
-+			    ep->dwc_ep.num, ep->dwc_ep.xfer_len,
-+			    deptsiz.b.xfersize, deptsiz.b.pktcnt);
-+#endif
-+
-+		if (((core_if->dma_desc_enable == 0)
-+		     && (deptsiz.b.xfersize == 0))
-+		    || ((core_if->dma_desc_enable != 0)
-+			&& (desc_sts.b.bytes == 0))) {
-+			req->actual = ep->dwc_ep.xfer_count;
-+			/* Is a Zero Len Packet needed? */
-+			if (req->sent_zlp) {
-+#ifdef DEBUG_EP0
-+				DWC_DEBUGPL(DBG_PCD, "Setup Rx ZLP\n");
-+#endif
-+				req->sent_zlp = 0;
-+			}
-+			do_setup_out_status_phase(pcd);
-+		}
-+	} else {
-+		/* ep0-OUT */
-+#ifdef DEBUG_EP0
-+		deptsiz.d32 = DWC_READ_REG32(&out_ep_regs->doeptsiz);
-+		DWC_DEBUGPL(DBG_PCDV, "%d len=%d xsize=%d pktcnt=%d\n",
-+			    ep->dwc_ep.num, ep->dwc_ep.xfer_len,
-+			    deptsiz.b.xfersize, deptsiz.b.pktcnt);
-+#endif
-+		req->actual = ep->dwc_ep.xfer_count;
-+
-+		/* Is a Zero Len Packet needed? */
-+		if (req->sent_zlp) {
-+#ifdef DEBUG_EP0
-+			DWC_DEBUGPL(DBG_PCDV, "Setup Tx ZLP\n");
-+#endif
-+			req->sent_zlp = 0;
-+		}
-+		/* For older cores do setup in status phase in Slave/BDMA modes,
-+		 * starting from 3.00 do that only in slave, and for DMA modes
-+		 * just re-enable ep 0 OUT here*/
-+		if (core_if->dma_enable == 0
-+		    || (core_if->dma_desc_enable == 0
-+			&& core_if->snpsid <= OTG_CORE_REV_2_94a)) {
-+			do_setup_in_status_phase(pcd);
-+		} else if (core_if->snpsid >= OTG_CORE_REV_3_00a) {
-+			DWC_DEBUGPL(DBG_PCDV,
-+				    "Enable out ep before in status phase\n");
-+			ep0_out_start(core_if, pcd);
-+		}
-+	}
-+
-+	/* Complete the request */
-+	if (is_last) {
-+		dwc_otg_request_done(ep, req, 0);
-+		ep->dwc_ep.start_xfer_buff = 0;
-+		ep->dwc_ep.xfer_buff = 0;
-+		ep->dwc_ep.xfer_len = 0;
-+		return 1;
-+	}
-+	return 0;
-+}
-+
-+#ifdef DWC_UTE_CFI
-+/**
-+ * This function calculates traverses all the CFI DMA descriptors and
-+ * and accumulates the bytes that are left to be transfered.
-+ *
-+ * @return The total bytes left to transfered, or a negative value as failure
-+ */
-+static inline int cfi_calc_desc_residue(dwc_otg_pcd_ep_t * ep)
-+{
-+	int32_t ret = 0;
-+	int i;
-+	struct dwc_otg_dma_desc *ddesc = NULL;
-+	struct cfi_ep *cfiep;
-+
-+	/* See if the pcd_ep has its respective cfi_ep mapped */
-+	cfiep = get_cfi_ep_by_pcd_ep(ep->pcd->cfi, ep);
-+	if (!cfiep) {
-+		CFI_INFO("%s: Failed to find ep\n", __func__);
-+		return -1;
-+	}
-+
-+	ddesc = ep->dwc_ep.descs;
-+
-+	for (i = 0; (i < cfiep->desc_count) && (i < MAX_DMA_DESCS_PER_EP); i++) {
-+
-+#if defined(PRINT_CFI_DMA_DESCS)
-+		print_desc(ddesc, ep->ep.name, i);
-+#endif
-+		ret += ddesc->status.b.bytes;
-+		ddesc++;
-+	}
-+
-+	if (ret)
-+		CFI_INFO("!!!!!!!!!! WARNING (%s) - residue=%d\n", __func__,
-+			 ret);
-+
-+	return ret;
-+}
-+#endif
-+
-+/**
-+ * This function completes the request for the EP. If there are
-+ * additional requests for the EP in the queue they will be started.
-+ */
-+static void complete_ep(dwc_otg_pcd_ep_t * ep)
-+{
-+	dwc_otg_core_if_t *core_if = GET_CORE_IF(ep->pcd);
-+	struct device *dev = dwc_otg_pcd_to_dev(ep->pcd);
-+	dwc_otg_dev_if_t *dev_if = core_if->dev_if;
-+	dwc_otg_dev_in_ep_regs_t *in_ep_regs =
-+	    dev_if->in_ep_regs[ep->dwc_ep.num];
-+	deptsiz_data_t deptsiz;
-+	dev_dma_desc_sts_t desc_sts;
-+	dwc_otg_pcd_request_t *req = 0;
-+	dwc_otg_dev_dma_desc_t *dma_desc;
-+	uint32_t byte_count = 0;
-+	int is_last = 0;
-+	int i;
-+
-+	DWC_DEBUGPL(DBG_PCDV, "%s() %d-%s\n", __func__, ep->dwc_ep.num,
-+		    (ep->dwc_ep.is_in ? "IN" : "OUT"));
-+
-+	/* Get any pending requests */
-+	if (!DWC_CIRCLEQ_EMPTY(&ep->queue)) {
-+		req = DWC_CIRCLEQ_FIRST(&ep->queue);
-+		if (!req) {
-+			DWC_PRINTF("complete_ep 0x%p, req = NULL!\n", ep);
-+			return;
-+		}
-+	} else {
-+		DWC_PRINTF("complete_ep 0x%p, ep->queue empty!\n", ep);
-+		return;
-+	}
-+
-+	DWC_DEBUGPL(DBG_PCD, "Requests %d\n", ep->pcd->request_pending);
-+
-+	if (ep->dwc_ep.is_in) {
-+		deptsiz.d32 = DWC_READ_REG32(&in_ep_regs->dieptsiz);
-+
-+		if (core_if->dma_enable) {
-+			if (core_if->dma_desc_enable == 0) {
-+				if (deptsiz.b.xfersize == 0
-+				    && deptsiz.b.pktcnt == 0) {
-+					byte_count =
-+					    ep->dwc_ep.xfer_len -
-+					    ep->dwc_ep.xfer_count;
-+
-+					ep->dwc_ep.xfer_buff += byte_count;
-+					ep->dwc_ep.dma_addr += byte_count;
-+					ep->dwc_ep.xfer_count += byte_count;
-+
-+					DWC_DEBUGPL(DBG_PCDV,
-+						    "%d-%s len=%d  xfersize=%d pktcnt=%d\n",
-+						    ep->dwc_ep.num,
-+						    (ep->dwc_ep.
-+						     is_in ? "IN" : "OUT"),
-+						    ep->dwc_ep.xfer_len,
-+						    deptsiz.b.xfersize,
-+						    deptsiz.b.pktcnt);
-+
-+					if (ep->dwc_ep.xfer_len <
-+					    ep->dwc_ep.total_len) {
-+						dwc_otg_ep_start_transfer
-+						    (core_if, &ep->dwc_ep);
-+					} else if (ep->dwc_ep.sent_zlp) {
-+						/*
-+						 * This fragment of code should initiate 0
-+						 * length transfer in case if it is queued
-+						 * a transfer with size divisible to EPs max
-+						 * packet size and with usb_request zero field
-+						 * is set, which means that after data is transfered,
-+						 * it is also should be transfered
-+						 * a 0 length packet at the end. For Slave and
-+						 * Buffer DMA modes in this case SW has
-+						 * to initiate 2 transfers one with transfer size,
-+						 * and the second with 0 size. For Descriptor
-+						 * DMA mode SW is able to initiate a transfer,
-+						 * which will handle all the packets including
-+						 * the last  0 length.
-+						 */
-+						ep->dwc_ep.sent_zlp = 0;
-+						dwc_otg_ep_start_zl_transfer
-+						    (core_if, &ep->dwc_ep);
-+					} else {
-+						is_last = 1;
-+					}
-+				} else {
-+					if (ep->dwc_ep.type ==
-+					    DWC_OTG_EP_TYPE_ISOC) {
-+						req->actual = 0;
-+						dwc_otg_request_done(ep, req, 0);
-+
-+						ep->dwc_ep.start_xfer_buff = 0;
-+						ep->dwc_ep.xfer_buff = 0;
-+						ep->dwc_ep.xfer_len = 0;
-+
-+						/* If there is a request in the queue start it. */
-+						start_next_request(ep);
-+					} else
-+						DWC_WARN
-+						("Incomplete transfer (%d - %s [siz=%d pkt=%d])\n",
-+						ep->dwc_ep.num,
-+						(ep->dwc_ep.is_in ? "IN" : "OUT"),
-+						deptsiz.b.xfersize,
-+						deptsiz.b.pktcnt);
-+				}
-+			} else {
-+				dma_desc = ep->dwc_ep.desc_addr;
-+				byte_count = 0;
-+				ep->dwc_ep.sent_zlp = 0;
-+
-+#ifdef DWC_UTE_CFI
-+				CFI_INFO("%s: BUFFER_MODE=%d\n", __func__,
-+					 ep->dwc_ep.buff_mode);
-+				if (ep->dwc_ep.buff_mode != BM_STANDARD) {
-+					int residue;
-+
-+					residue = cfi_calc_desc_residue(ep);
-+					if (residue < 0)
-+						return;
-+
-+					byte_count = residue;
-+				} else {
-+#endif
-+					for (i = 0; i < ep->dwc_ep.desc_cnt;
-+					     ++i) {
-+					desc_sts = dma_desc->status;
-+					byte_count += desc_sts.b.bytes;
-+					dma_desc++;
-+				}
-+#ifdef DWC_UTE_CFI
-+				}
-+#endif
-+				if (byte_count == 0) {
-+					ep->dwc_ep.xfer_count =
-+					    ep->dwc_ep.total_len;
-+					is_last = 1;
-+				} else {
-+					DWC_WARN("Incomplete transfer\n");
-+				}
-+			}
-+		} else {
-+			if (deptsiz.b.xfersize == 0 && deptsiz.b.pktcnt == 0) {
-+				DWC_DEBUGPL(DBG_PCDV,
-+					    "%d-%s len=%d  xfersize=%d pktcnt=%d\n",
-+					    ep->dwc_ep.num,
-+					    ep->dwc_ep.is_in ? "IN" : "OUT",
-+					    ep->dwc_ep.xfer_len,
-+					    deptsiz.b.xfersize,
-+					    deptsiz.b.pktcnt);
-+
-+				/*      Check if the whole transfer was completed,
-+				 *      if no, setup transfer for next portion of data
-+				 */
-+				if (ep->dwc_ep.xfer_len < ep->dwc_ep.total_len) {
-+					dwc_otg_ep_start_transfer(core_if,
-+								  &ep->dwc_ep);
-+				} else if (ep->dwc_ep.sent_zlp) {
-+					/*
-+					 * This fragment of code should initiate 0
-+					 * length trasfer in case if it is queued
-+					 * a trasfer with size divisible to EPs max
-+					 * packet size and with usb_request zero field
-+					 * is set, which means that after data is transfered,
-+					 * it is also should be transfered
-+					 * a 0 length packet at the end. For Slave and
-+					 * Buffer DMA modes in this case SW has
-+					 * to initiate 2 transfers one with transfer size,
-+					 * and the second with 0 size. For Desriptor
-+					 * DMA mode SW is able to initiate a transfer,
-+					 * which will handle all the packets including
-+					 * the last  0 legth.
-+					 */
-+					ep->dwc_ep.sent_zlp = 0;
-+					dwc_otg_ep_start_zl_transfer(core_if,
-+								     &ep->dwc_ep);
-+				} else {
-+					is_last = 1;
-+				}
-+			} else {
-+				DWC_WARN
-+				    ("Incomplete transfer (%d-%s [siz=%d pkt=%d])\n",
-+				     ep->dwc_ep.num,
-+				     (ep->dwc_ep.is_in ? "IN" : "OUT"),
-+				     deptsiz.b.xfersize, deptsiz.b.pktcnt);
-+			}
-+		}
-+	} else {
-+		dwc_otg_dev_out_ep_regs_t *out_ep_regs =
-+		    dev_if->out_ep_regs[ep->dwc_ep.num];
-+		desc_sts.d32 = 0;
-+		if (core_if->dma_enable) {
-+			if (core_if->dma_desc_enable) {
-+				dma_desc = ep->dwc_ep.desc_addr;
-+				byte_count = 0;
-+				ep->dwc_ep.sent_zlp = 0;
-+
-+#ifdef DWC_UTE_CFI
-+				CFI_INFO("%s: BUFFER_MODE=%d\n", __func__,
-+					 ep->dwc_ep.buff_mode);
-+				if (ep->dwc_ep.buff_mode != BM_STANDARD) {
-+					int residue;
-+					residue = cfi_calc_desc_residue(ep);
-+					if (residue < 0)
-+						return;
-+					byte_count = residue;
-+				} else {
-+#endif
-+
-+					for (i = 0; i < ep->dwc_ep.desc_cnt;
-+					     ++i) {
-+						desc_sts = dma_desc->status;
-+						byte_count += desc_sts.b.bytes;
-+						dma_desc++;
-+					}
-+
-+#ifdef DWC_UTE_CFI
-+				}
-+#endif
-+				/* Checking for interrupt Out transfers with not
-+				 * dword aligned mps sizes
-+				 */
-+				if (ep->dwc_ep.type == DWC_OTG_EP_TYPE_INTR &&
-+							(ep->dwc_ep.maxpacket%4)) {
-+					ep->dwc_ep.xfer_count =
-+					    ep->dwc_ep.total_len - byte_count;
-+					if ((ep->dwc_ep.xfer_len %
-+					     ep->dwc_ep.maxpacket)
-+					    && (ep->dwc_ep.xfer_len /
-+						ep->dwc_ep.maxpacket <
-+						MAX_DMA_DESC_CNT))
-+						ep->dwc_ep.xfer_len -=
-+						    (ep->dwc_ep.desc_cnt -
-+						     1) * ep->dwc_ep.maxpacket +
-+						    ep->dwc_ep.xfer_len %
-+						    ep->dwc_ep.maxpacket;
-+					else
-+						ep->dwc_ep.xfer_len -=
-+						    ep->dwc_ep.desc_cnt *
-+						    ep->dwc_ep.maxpacket;
-+					if (ep->dwc_ep.xfer_len > 0) {
-+						dwc_otg_ep_start_transfer
-+						    (core_if, &ep->dwc_ep);
-+					} else {
-+						is_last = 1;
-+					}
-+				} else {
-+					ep->dwc_ep.xfer_count =
-+					    ep->dwc_ep.total_len - byte_count +
-+					    ((4 -
-+					      (ep->dwc_ep.
-+					       total_len & 0x3)) & 0x3);
-+					is_last = 1;
-+				}
-+			} else {
-+				deptsiz.d32 = 0;
-+				deptsiz.d32 =
-+				    DWC_READ_REG32(&out_ep_regs->doeptsiz);
-+
-+				byte_count = (ep->dwc_ep.xfer_len -
-+					      ep->dwc_ep.xfer_count -
-+					      deptsiz.b.xfersize);
-+				ep->dwc_ep.xfer_buff += byte_count;
-+				ep->dwc_ep.dma_addr += byte_count;
-+				ep->dwc_ep.xfer_count += byte_count;
-+
-+				/*      Check if the whole transfer was completed,
-+				 *      if no, setup transfer for next portion of data
-+				 */
-+				if (ep->dwc_ep.xfer_len < ep->dwc_ep.total_len) {
-+					dwc_otg_ep_start_transfer(core_if,
-+								  &ep->dwc_ep);
-+				} else if (ep->dwc_ep.sent_zlp) {
-+					/*
-+					 * This fragment of code should initiate 0
-+					 * length trasfer in case if it is queued
-+					 * a trasfer with size divisible to EPs max
-+					 * packet size and with usb_request zero field
-+					 * is set, which means that after data is transfered,
-+					 * it is also should be transfered
-+					 * a 0 length packet at the end. For Slave and
-+					 * Buffer DMA modes in this case SW has
-+					 * to initiate 2 transfers one with transfer size,
-+					 * and the second with 0 size. For Desriptor
-+					 * DMA mode SW is able to initiate a transfer,
-+					 * which will handle all the packets including
-+					 * the last  0 legth.
-+					 */
-+					ep->dwc_ep.sent_zlp = 0;
-+					dwc_otg_ep_start_zl_transfer(core_if,
-+								     &ep->dwc_ep);
-+				} else {
-+					is_last = 1;
-+				}
-+			}
-+		} else {
-+			/*      Check if the whole transfer was completed,
-+			 *      if no, setup transfer for next portion of data
-+			 */
-+			if (ep->dwc_ep.xfer_len < ep->dwc_ep.total_len) {
-+				dwc_otg_ep_start_transfer(core_if, &ep->dwc_ep);
-+			} else if (ep->dwc_ep.sent_zlp) {
-+				/*
-+				 * This fragment of code should initiate 0
-+				 * length transfer in case if it is queued
-+				 * a transfer with size divisible to EPs max
-+				 * packet size and with usb_request zero field
-+				 * is set, which means that after data is transfered,
-+				 * it is also should be transfered
-+				 * a 0 length packet at the end. For Slave and
-+				 * Buffer DMA modes in this case SW has
-+				 * to initiate 2 transfers one with transfer size,
-+				 * and the second with 0 size. For Descriptor
-+				 * DMA mode SW is able to initiate a transfer,
-+				 * which will handle all the packets including
-+				 * the last  0 length.
-+				 */
-+				ep->dwc_ep.sent_zlp = 0;
-+				dwc_otg_ep_start_zl_transfer(core_if,
-+							     &ep->dwc_ep);
-+			} else {
-+				is_last = 1;
-+			}
-+		}
-+
-+		DWC_DEBUGPL(DBG_PCDV,
-+			    "addr %p,	 %d-%s len=%d cnt=%d xsize=%d pktcnt=%d\n",
-+			    &out_ep_regs->doeptsiz, ep->dwc_ep.num,
-+			    ep->dwc_ep.is_in ? "IN" : "OUT",
-+			    ep->dwc_ep.xfer_len, ep->dwc_ep.xfer_count,
-+			    deptsiz.b.xfersize, deptsiz.b.pktcnt);
-+	}
-+
-+	/* Complete the request */
-+	if (is_last) {
-+#ifdef DWC_UTE_CFI
-+		if (ep->dwc_ep.buff_mode != BM_STANDARD) {
-+			req->actual = ep->dwc_ep.cfi_req_len - byte_count;
-+		} else {
-+#endif
-+			req->actual = ep->dwc_ep.xfer_count;
-+#ifdef DWC_UTE_CFI
-+		}
-+#endif
-+		if (req->dw_align_buf) {
-+			if (!ep->dwc_ep.is_in) {
-+				dwc_memcpy(req->buf, req->dw_align_buf, req->length);
-+			}
-+			DWC_DMA_FREE(dev, req->length, req->dw_align_buf,
-+				     req->dw_align_buf_dma);
-+		}
-+
-+		dwc_otg_request_done(ep, req, 0);
-+
-+		ep->dwc_ep.start_xfer_buff = 0;
-+		ep->dwc_ep.xfer_buff = 0;
-+		ep->dwc_ep.xfer_len = 0;
-+
-+		/* If there is a request in the queue start it. */
-+		start_next_request(ep);
-+	}
-+}
-+
-+#ifdef DWC_EN_ISOC
-+
-+/**
-+ * This function BNA interrupt for Isochronous EPs
-+ *
-+ */
-+static void dwc_otg_pcd_handle_iso_bna(dwc_otg_pcd_ep_t * ep)
-+{
-+	dwc_ep_t *dwc_ep = &ep->dwc_ep;
-+	volatile uint32_t *addr;
-+	depctl_data_t depctl = {.d32 = 0 };
-+	dwc_otg_pcd_t *pcd = ep->pcd;
-+	dwc_otg_dev_dma_desc_t *dma_desc;
-+	int i;
-+
-+	dma_desc =
-+	    dwc_ep->iso_desc_addr + dwc_ep->desc_cnt * (dwc_ep->proc_buf_num);
-+
-+	if (dwc_ep->is_in) {
-+		dev_dma_desc_sts_t sts = {.d32 = 0 };
-+		for (i = 0; i < dwc_ep->desc_cnt; ++i, ++dma_desc) {
-+			sts.d32 = dma_desc->status.d32;
-+			sts.b_iso_in.bs = BS_HOST_READY;
-+			dma_desc->status.d32 = sts.d32;
-+		}
-+	} else {
-+		dev_dma_desc_sts_t sts = {.d32 = 0 };
-+		for (i = 0; i < dwc_ep->desc_cnt; ++i, ++dma_desc) {
-+			sts.d32 = dma_desc->status.d32;
-+			sts.b_iso_out.bs = BS_HOST_READY;
-+			dma_desc->status.d32 = sts.d32;
-+		}
-+	}
-+
-+	if (dwc_ep->is_in == 0) {
-+		addr =
-+		    &GET_CORE_IF(pcd)->dev_if->out_ep_regs[dwc_ep->
-+							   num]->doepctl;
-+	} else {
-+		addr =
-+		    &GET_CORE_IF(pcd)->dev_if->in_ep_regs[dwc_ep->num]->diepctl;
-+	}
-+	depctl.b.epena = 1;
-+	DWC_MODIFY_REG32(addr, depctl.d32, depctl.d32);
-+}
-+
-+/**
-+ * This function sets latest iso packet information(non-PTI mode)
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param ep The EP to start the transfer on.
-+ *
-+ */
-+void set_current_pkt_info(dwc_otg_core_if_t * core_if, dwc_ep_t * ep)
-+{
-+	deptsiz_data_t deptsiz = {.d32 = 0 };
-+	dma_addr_t dma_addr;
-+	uint32_t offset;
-+
-+	if (ep->proc_buf_num)
-+		dma_addr = ep->dma_addr1;
-+	else
-+		dma_addr = ep->dma_addr0;
-+
-+	if (ep->is_in) {
-+		deptsiz.d32 =
-+		    DWC_READ_REG32(&core_if->dev_if->
-+				   in_ep_regs[ep->num]->dieptsiz);
-+		offset = ep->data_per_frame;
-+	} else {
-+		deptsiz.d32 =
-+		    DWC_READ_REG32(&core_if->dev_if->
-+				   out_ep_regs[ep->num]->doeptsiz);
-+		offset =
-+		    ep->data_per_frame +
-+		    (0x4 & (0x4 - (ep->data_per_frame & 0x3)));
-+	}
-+
-+	if (!deptsiz.b.xfersize) {
-+		ep->pkt_info[ep->cur_pkt].length = ep->data_per_frame;
-+		ep->pkt_info[ep->cur_pkt].offset =
-+		    ep->cur_pkt_dma_addr - dma_addr;
-+		ep->pkt_info[ep->cur_pkt].status = 0;
-+	} else {
-+		ep->pkt_info[ep->cur_pkt].length = ep->data_per_frame;
-+		ep->pkt_info[ep->cur_pkt].offset =
-+		    ep->cur_pkt_dma_addr - dma_addr;
-+		ep->pkt_info[ep->cur_pkt].status = -DWC_E_NO_DATA;
-+	}
-+	ep->cur_pkt_addr += offset;
-+	ep->cur_pkt_dma_addr += offset;
-+	ep->cur_pkt++;
-+}
-+
-+/**
-+ * This function sets latest iso packet information(DDMA mode)
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param dwc_ep The EP to start the transfer on.
-+ *
-+ */
-+static void set_ddma_iso_pkts_info(dwc_otg_core_if_t * core_if,
-+				   dwc_ep_t * dwc_ep)
-+{
-+	dwc_otg_dev_dma_desc_t *dma_desc;
-+	dev_dma_desc_sts_t sts = {.d32 = 0 };
-+	iso_pkt_info_t *iso_packet;
-+	uint32_t data_per_desc;
-+	uint32_t offset;
-+	int i, j;
-+
-+	iso_packet = dwc_ep->pkt_info;
-+
-+	/** Reinit closed DMA Descriptors*/
-+	/** ISO OUT EP */
-+	if (dwc_ep->is_in == 0) {
-+		dma_desc =
-+		    dwc_ep->iso_desc_addr +
-+		    dwc_ep->desc_cnt * dwc_ep->proc_buf_num;
-+		offset = 0;
-+
-+		for (i = 0; i < dwc_ep->desc_cnt - dwc_ep->pkt_per_frm;
-+		     i += dwc_ep->pkt_per_frm) {
-+			for (j = 0; j < dwc_ep->pkt_per_frm; ++j) {
-+				data_per_desc =
-+				    ((j + 1) * dwc_ep->maxpacket >
-+				     dwc_ep->
-+				     data_per_frame) ? dwc_ep->data_per_frame -
-+				    j * dwc_ep->maxpacket : dwc_ep->maxpacket;
-+				data_per_desc +=
-+				    (data_per_desc % 4) ? (4 -
-+							   data_per_desc %
-+							   4) : 0;
-+
-+				sts.d32 = dma_desc->status.d32;
-+
-+				/* Write status in iso_packet_decsriptor  */
-+				iso_packet->status =
-+				    sts.b_iso_out.rxsts +
-+				    (sts.b_iso_out.bs ^ BS_DMA_DONE);
-+				if (iso_packet->status) {
-+					iso_packet->status = -DWC_E_NO_DATA;
-+				}
-+
-+				/* Received data length */
-+				if (!sts.b_iso_out.rxbytes) {
-+					iso_packet->length =
-+					    data_per_desc -
-+					    sts.b_iso_out.rxbytes;
-+				} else {
-+					iso_packet->length =
-+					    data_per_desc -
-+					    sts.b_iso_out.rxbytes + (4 -
-+								     dwc_ep->data_per_frame
-+								     % 4);
-+				}
-+
-+				iso_packet->offset = offset;
-+
-+				offset += data_per_desc;
-+				dma_desc++;
-+				iso_packet++;
-+			}
-+		}
-+
-+		for (j = 0; j < dwc_ep->pkt_per_frm - 1; ++j) {
-+			data_per_desc =
-+			    ((j + 1) * dwc_ep->maxpacket >
-+			     dwc_ep->data_per_frame) ? dwc_ep->data_per_frame -
-+			    j * dwc_ep->maxpacket : dwc_ep->maxpacket;
-+			data_per_desc +=
-+			    (data_per_desc % 4) ? (4 - data_per_desc % 4) : 0;
-+
-+			sts.d32 = dma_desc->status.d32;
-+
-+			/* Write status in iso_packet_decsriptor  */
-+			iso_packet->status =
-+			    sts.b_iso_out.rxsts +
-+			    (sts.b_iso_out.bs ^ BS_DMA_DONE);
-+			if (iso_packet->status) {
-+				iso_packet->status = -DWC_E_NO_DATA;
-+			}
-+
-+			/* Received data length */
-+			iso_packet->length =
-+			    dwc_ep->data_per_frame - sts.b_iso_out.rxbytes;
-+
-+			iso_packet->offset = offset;
-+
-+			offset += data_per_desc;
-+			iso_packet++;
-+			dma_desc++;
-+		}
-+
-+		sts.d32 = dma_desc->status.d32;
-+
-+		/* Write status in iso_packet_decsriptor  */
-+		iso_packet->status =
-+		    sts.b_iso_out.rxsts + (sts.b_iso_out.bs ^ BS_DMA_DONE);
-+		if (iso_packet->status) {
-+			iso_packet->status = -DWC_E_NO_DATA;
-+		}
-+		/* Received data length */
-+		if (!sts.b_iso_out.rxbytes) {
-+			iso_packet->length =
-+			    dwc_ep->data_per_frame - sts.b_iso_out.rxbytes;
-+		} else {
-+			iso_packet->length =
-+			    dwc_ep->data_per_frame - sts.b_iso_out.rxbytes +
-+			    (4 - dwc_ep->data_per_frame % 4);
-+		}
-+
-+		iso_packet->offset = offset;
-+	} else {
-+/** ISO IN EP */
-+
-+		dma_desc =
-+		    dwc_ep->iso_desc_addr +
-+		    dwc_ep->desc_cnt * dwc_ep->proc_buf_num;
-+
-+		for (i = 0; i < dwc_ep->desc_cnt - 1; i++) {
-+			sts.d32 = dma_desc->status.d32;
-+
-+			/* Write status in iso packet descriptor */
-+			iso_packet->status =
-+			    sts.b_iso_in.txsts +
-+			    (sts.b_iso_in.bs ^ BS_DMA_DONE);
-+			if (iso_packet->status != 0) {
-+				iso_packet->status = -DWC_E_NO_DATA;
-+
-+			}
-+			/* Bytes has been transfered */
-+			iso_packet->length =
-+			    dwc_ep->data_per_frame - sts.b_iso_in.txbytes;
-+
-+			dma_desc++;
-+			iso_packet++;
-+		}
-+
-+		sts.d32 = dma_desc->status.d32;
-+		while (sts.b_iso_in.bs == BS_DMA_BUSY) {
-+			sts.d32 = dma_desc->status.d32;
-+		}
-+
-+		/* Write status in iso packet descriptor ??? do be done with ERROR codes */
-+		iso_packet->status =
-+		    sts.b_iso_in.txsts + (sts.b_iso_in.bs ^ BS_DMA_DONE);
-+		if (iso_packet->status != 0) {
-+			iso_packet->status = -DWC_E_NO_DATA;
-+		}
-+
-+		/* Bytes has been transfered */
-+		iso_packet->length =
-+		    dwc_ep->data_per_frame - sts.b_iso_in.txbytes;
-+	}
-+}
-+
-+/**
-+ * This function reinitialize DMA Descriptors for Isochronous transfer
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param dwc_ep The EP to start the transfer on.
-+ *
-+ */
-+static void reinit_ddma_iso_xfer(dwc_otg_core_if_t * core_if, dwc_ep_t * dwc_ep)
-+{
-+	int i, j;
-+	dwc_otg_dev_dma_desc_t *dma_desc;
-+	dma_addr_t dma_ad;
-+	volatile uint32_t *addr;
-+	dev_dma_desc_sts_t sts = {.d32 = 0 };
-+	uint32_t data_per_desc;
-+
-+	if (dwc_ep->is_in == 0) {
-+		addr = &core_if->dev_if->out_ep_regs[dwc_ep->num]->doepctl;
-+	} else {
-+		addr = &core_if->dev_if->in_ep_regs[dwc_ep->num]->diepctl;
-+	}
-+
-+	if (dwc_ep->proc_buf_num == 0) {
-+		/** Buffer 0 descriptors setup */
-+		dma_ad = dwc_ep->dma_addr0;
-+	} else {
-+		/** Buffer 1 descriptors setup */
-+		dma_ad = dwc_ep->dma_addr1;
-+	}
-+
-+	/** Reinit closed DMA Descriptors*/
-+	/** ISO OUT EP */
-+	if (dwc_ep->is_in == 0) {
-+		dma_desc =
-+		    dwc_ep->iso_desc_addr +
-+		    dwc_ep->desc_cnt * dwc_ep->proc_buf_num;
-+
-+		sts.b_iso_out.bs = BS_HOST_READY;
-+		sts.b_iso_out.rxsts = 0;
-+		sts.b_iso_out.l = 0;
-+		sts.b_iso_out.sp = 0;
-+		sts.b_iso_out.ioc = 0;
-+		sts.b_iso_out.pid = 0;
-+		sts.b_iso_out.framenum = 0;
-+
-+		for (i = 0; i < dwc_ep->desc_cnt - dwc_ep->pkt_per_frm;
-+		     i += dwc_ep->pkt_per_frm) {
-+			for (j = 0; j < dwc_ep->pkt_per_frm; ++j) {
-+				data_per_desc =
-+				    ((j + 1) * dwc_ep->maxpacket >
-+				     dwc_ep->
-+				     data_per_frame) ? dwc_ep->data_per_frame -
-+				    j * dwc_ep->maxpacket : dwc_ep->maxpacket;
-+				data_per_desc +=
-+				    (data_per_desc % 4) ? (4 -
-+							   data_per_desc %
-+							   4) : 0;
-+				sts.b_iso_out.rxbytes = data_per_desc;
-+				dma_desc->buf = dma_ad;
-+				dma_desc->status.d32 = sts.d32;
-+
-+				dma_ad += data_per_desc;
-+				dma_desc++;
-+			}
-+		}
-+
-+		for (j = 0; j < dwc_ep->pkt_per_frm - 1; ++j) {
-+
-+			data_per_desc =
-+			    ((j + 1) * dwc_ep->maxpacket >
-+			     dwc_ep->data_per_frame) ? dwc_ep->data_per_frame -
-+			    j * dwc_ep->maxpacket : dwc_ep->maxpacket;
-+			data_per_desc +=
-+			    (data_per_desc % 4) ? (4 - data_per_desc % 4) : 0;
-+			sts.b_iso_out.rxbytes = data_per_desc;
-+
-+			dma_desc->buf = dma_ad;
-+			dma_desc->status.d32 = sts.d32;
-+
-+			dma_desc++;
-+			dma_ad += data_per_desc;
-+		}
-+
-+		sts.b_iso_out.ioc = 1;
-+		sts.b_iso_out.l = dwc_ep->proc_buf_num;
-+
-+		data_per_desc =
-+		    ((j + 1) * dwc_ep->maxpacket >
-+		     dwc_ep->data_per_frame) ? dwc_ep->data_per_frame -
-+		    j * dwc_ep->maxpacket : dwc_ep->maxpacket;
-+		data_per_desc +=
-+		    (data_per_desc % 4) ? (4 - data_per_desc % 4) : 0;
-+		sts.b_iso_out.rxbytes = data_per_desc;
-+
-+		dma_desc->buf = dma_ad;
-+		dma_desc->status.d32 = sts.d32;
-+	} else {
-+/** ISO IN EP */
-+
-+		dma_desc =
-+		    dwc_ep->iso_desc_addr +
-+		    dwc_ep->desc_cnt * dwc_ep->proc_buf_num;
-+
-+		sts.b_iso_in.bs = BS_HOST_READY;
-+		sts.b_iso_in.txsts = 0;
-+		sts.b_iso_in.sp = 0;
-+		sts.b_iso_in.ioc = 0;
-+		sts.b_iso_in.pid = dwc_ep->pkt_per_frm;
-+		sts.b_iso_in.framenum = dwc_ep->next_frame;
-+		sts.b_iso_in.txbytes = dwc_ep->data_per_frame;
-+		sts.b_iso_in.l = 0;
-+
-+		for (i = 0; i < dwc_ep->desc_cnt - 1; i++) {
-+			dma_desc->buf = dma_ad;
-+			dma_desc->status.d32 = sts.d32;
-+
-+			sts.b_iso_in.framenum += dwc_ep->bInterval;
-+			dma_ad += dwc_ep->data_per_frame;
-+			dma_desc++;
-+		}
-+
-+		sts.b_iso_in.ioc = 1;
-+		sts.b_iso_in.l = dwc_ep->proc_buf_num;
-+
-+		dma_desc->buf = dma_ad;
-+		dma_desc->status.d32 = sts.d32;
-+
-+		dwc_ep->next_frame =
-+		    sts.b_iso_in.framenum + dwc_ep->bInterval * 1;
-+	}
-+	dwc_ep->proc_buf_num = (dwc_ep->proc_buf_num ^ 1) & 0x1;
-+}
-+
-+/**
-+ * This function is to handle Iso EP transfer complete interrupt
-+ * in case Iso out packet was dropped
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param dwc_ep The EP for wihich transfer complete was asserted
-+ *
-+ */
-+static uint32_t handle_iso_out_pkt_dropped(dwc_otg_core_if_t * core_if,
-+					   dwc_ep_t * dwc_ep)
-+{
-+	uint32_t dma_addr;
-+	uint32_t drp_pkt;
-+	uint32_t drp_pkt_cnt;
-+	deptsiz_data_t deptsiz = {.d32 = 0 };
-+	depctl_data_t depctl = {.d32 = 0 };
-+	int i;
-+
-+	deptsiz.d32 =
-+	    DWC_READ_REG32(&core_if->dev_if->
-+			   out_ep_regs[dwc_ep->num]->doeptsiz);
-+
-+	drp_pkt = dwc_ep->pkt_cnt - deptsiz.b.pktcnt;
-+	drp_pkt_cnt = dwc_ep->pkt_per_frm - (drp_pkt % dwc_ep->pkt_per_frm);
-+
-+	/* Setting dropped packets status */
-+	for (i = 0; i < drp_pkt_cnt; ++i) {
-+		dwc_ep->pkt_info[drp_pkt].status = -DWC_E_NO_DATA;
-+		drp_pkt++;
-+		deptsiz.b.pktcnt--;
-+	}
-+
-+	if (deptsiz.b.pktcnt > 0) {
-+		deptsiz.b.xfersize =
-+		    dwc_ep->xfer_len - (dwc_ep->pkt_cnt -
-+					deptsiz.b.pktcnt) * dwc_ep->maxpacket;
-+	} else {
-+		deptsiz.b.xfersize = 0;
-+		deptsiz.b.pktcnt = 0;
-+	}
-+
-+	DWC_WRITE_REG32(&core_if->dev_if->out_ep_regs[dwc_ep->num]->doeptsiz,
-+			deptsiz.d32);
-+
-+	if (deptsiz.b.pktcnt > 0) {
-+		if (dwc_ep->proc_buf_num) {
-+			dma_addr =
-+			    dwc_ep->dma_addr1 + dwc_ep->xfer_len -
-+			    deptsiz.b.xfersize;
-+		} else {
-+			dma_addr =
-+			    dwc_ep->dma_addr0 + dwc_ep->xfer_len -
-+			    deptsiz.b.xfersize;;
-+		}
-+
-+		DWC_WRITE_REG32(&core_if->dev_if->
-+				out_ep_regs[dwc_ep->num]->doepdma, dma_addr);
-+
-+		/** Re-enable endpoint, clear nak  */
-+		depctl.d32 = 0;
-+		depctl.b.epena = 1;
-+		depctl.b.cnak = 1;
-+
-+		DWC_MODIFY_REG32(&core_if->dev_if->
-+				 out_ep_regs[dwc_ep->num]->doepctl, depctl.d32,
-+				 depctl.d32);
-+		return 0;
-+	} else {
-+		return 1;
-+	}
-+}
-+
-+/**
-+ * This function sets iso packets information(PTI mode)
-+ *
-+ * @param core_if Programming view of DWC_otg controller.
-+ * @param ep The EP to start the transfer on.
-+ *
-+ */
-+static uint32_t set_iso_pkts_info(dwc_otg_core_if_t * core_if, dwc_ep_t * ep)
-+{
-+	int i, j;
-+	dma_addr_t dma_ad;
-+	iso_pkt_info_t *packet_info = ep->pkt_info;
-+	uint32_t offset;
-+	uint32_t frame_data;
-+	deptsiz_data_t deptsiz;
-+
-+	if (ep->proc_buf_num == 0) {
-+		/** Buffer 0 descriptors setup */
-+		dma_ad = ep->dma_addr0;
-+	} else {
-+		/** Buffer 1 descriptors setup */
-+		dma_ad = ep->dma_addr1;
-+	}
-+
-+	if (ep->is_in) {
-+		deptsiz.d32 =
-+		    DWC_READ_REG32(&core_if->dev_if->in_ep_regs[ep->num]->
-+				   dieptsiz);
-+	} else {
-+		deptsiz.d32 =
-+		    DWC_READ_REG32(&core_if->dev_if->out_ep_regs[ep->num]->
-+				   doeptsiz);
-+	}
-+
-+	if (!deptsiz.b.xfersize) {
-+		offset = 0;
-+		for (i = 0; i < ep->pkt_cnt; i += ep->pkt_per_frm) {
-+			frame_data = ep->data_per_frame;
-+			for (j = 0; j < ep->pkt_per_frm; ++j) {
-+
-+				/* Packet status - is not set as initially
-+				 * it is set to 0 and if packet was sent
-+				 successfully, status field will remain 0*/
-+
-+				/* Bytes has been transfered */
-+				packet_info->length =
-+				    (ep->maxpacket <
-+				     frame_data) ? ep->maxpacket : frame_data;
-+
-+				/* Received packet offset */
-+				packet_info->offset = offset;
-+				offset += packet_info->length;
-+				frame_data -= packet_info->length;
-+
-+				packet_info++;
-+			}
-+		}
-+		return 1;
-+	} else {
-+		/* This is a workaround for in case of Transfer Complete with
-+		 * PktDrpSts interrupts merging - in this case Transfer complete
-+		 * interrupt for Isoc Out Endpoint is asserted without PktDrpSts
-+		 * set and with DOEPTSIZ register non zero. Investigations showed,
-+		 * that this happens when Out packet is dropped, but because of
-+		 * interrupts merging during first interrupt handling PktDrpSts
-+		 * bit is cleared and for next merged interrupts it is not reset.
-+		 * In this case SW hadles the interrupt as if PktDrpSts bit is set.
-+		 */
-+		if (ep->is_in) {
-+			return 1;
-+		} else {
-+			return handle_iso_out_pkt_dropped(core_if, ep);
-+		}
-+	}
-+}
-+
-+/**
-+ * This function is to handle Iso EP transfer complete interrupt
-+ *
-+ * @param pcd The PCD
-+ * @param ep The EP for which transfer complete was asserted
-+ *
-+ */
-+static void complete_iso_ep(dwc_otg_pcd_t * pcd, dwc_otg_pcd_ep_t * ep)
-+{
-+	dwc_otg_core_if_t *core_if = GET_CORE_IF(ep->pcd);
-+	dwc_ep_t *dwc_ep = &ep->dwc_ep;
-+	uint8_t is_last = 0;
-+
-+	if (ep->dwc_ep.next_frame == 0xffffffff) {
-+		DWC_WARN("Next frame is not set!\n");
-+		return;
-+	}
-+
-+	if (core_if->dma_enable) {
-+		if (core_if->dma_desc_enable) {
-+			set_ddma_iso_pkts_info(core_if, dwc_ep);
-+			reinit_ddma_iso_xfer(core_if, dwc_ep);
-+			is_last = 1;
-+		} else {
-+			if (core_if->pti_enh_enable) {
-+				if (set_iso_pkts_info(core_if, dwc_ep)) {
-+					dwc_ep->proc_buf_num =
-+					    (dwc_ep->proc_buf_num ^ 1) & 0x1;
-+					dwc_otg_iso_ep_start_buf_transfer
-+					    (core_if, dwc_ep);
-+					is_last = 1;
-+				}
-+			} else {
-+				set_current_pkt_info(core_if, dwc_ep);
-+				if (dwc_ep->cur_pkt >= dwc_ep->pkt_cnt) {
-+					is_last = 1;
-+					dwc_ep->cur_pkt = 0;
-+					dwc_ep->proc_buf_num =
-+					    (dwc_ep->proc_buf_num ^ 1) & 0x1;
-+					if (dwc_ep->proc_buf_num) {
-+						dwc_ep->cur_pkt_addr =
-+						    dwc_ep->xfer_buff1;
-+						dwc_ep->cur_pkt_dma_addr =
-+						    dwc_ep->dma_addr1;
-+					} else {
-+						dwc_ep->cur_pkt_addr =
-+						    dwc_ep->xfer_buff0;
-+						dwc_ep->cur_pkt_dma_addr =
-+						    dwc_ep->dma_addr0;
-+					}
-+
-+				}
-+				dwc_otg_iso_ep_start_frm_transfer(core_if,
-+								  dwc_ep);
-+			}
-+		}
-+	} else {
-+		set_current_pkt_info(core_if, dwc_ep);
-+		if (dwc_ep->cur_pkt >= dwc_ep->pkt_cnt) {
-+			is_last = 1;
-+			dwc_ep->cur_pkt = 0;
-+			dwc_ep->proc_buf_num = (dwc_ep->proc_buf_num ^ 1) & 0x1;
-+			if (dwc_ep->proc_buf_num) {
-+				dwc_ep->cur_pkt_addr = dwc_ep->xfer_buff1;
-+				dwc_ep->cur_pkt_dma_addr = dwc_ep->dma_addr1;
-+			} else {
-+				dwc_ep->cur_pkt_addr = dwc_ep->xfer_buff0;
-+				dwc_ep->cur_pkt_dma_addr = dwc_ep->dma_addr0;
-+			}
-+
-+		}
-+		dwc_otg_iso_ep_start_frm_transfer(core_if, dwc_ep);
-+	}
-+	if (is_last)
-+		dwc_otg_iso_buffer_done(pcd, ep, ep->iso_req_handle);
-+}
-+#endif /* DWC_EN_ISOC */
-+
-+/**
-+ * This function handle BNA interrupt for Non Isochronous EPs
-+ *
-+ */
-+static void dwc_otg_pcd_handle_noniso_bna(dwc_otg_pcd_ep_t * ep)
-+{
-+	dwc_ep_t *dwc_ep = &ep->dwc_ep;
-+	volatile uint32_t *addr;
-+	depctl_data_t depctl = {.d32 = 0 };
-+	dwc_otg_pcd_t *pcd = ep->pcd;
-+	dwc_otg_dev_dma_desc_t *dma_desc;
-+	dev_dma_desc_sts_t sts = {.d32 = 0 };
-+	dwc_otg_core_if_t *core_if = ep->pcd->core_if;
-+	int i, start;
-+
-+	if (!dwc_ep->desc_cnt)
-+		DWC_WARN("Ep%d %s Descriptor count = %d \n", dwc_ep->num,
-+			 (dwc_ep->is_in ? "IN" : "OUT"), dwc_ep->desc_cnt);
-+
-+	if (core_if->core_params->cont_on_bna && !dwc_ep->is_in
-+							&& dwc_ep->type != DWC_OTG_EP_TYPE_CONTROL) {
-+		uint32_t doepdma;
-+		dwc_otg_dev_out_ep_regs_t *out_regs =
-+			core_if->dev_if->out_ep_regs[dwc_ep->num];
-+		doepdma = DWC_READ_REG32(&(out_regs->doepdma));
-+		start = (doepdma - dwc_ep->dma_desc_addr)/sizeof(dwc_otg_dev_dma_desc_t);
-+		dma_desc = &(dwc_ep->desc_addr[start]);
-+	} else {
-+		start = 0;
-+		dma_desc = dwc_ep->desc_addr;
-+	}
-+
-+
-+	for (i = start; i < dwc_ep->desc_cnt; ++i, ++dma_desc) {
-+		sts.d32 = dma_desc->status.d32;
-+		sts.b.bs = BS_HOST_READY;
-+		dma_desc->status.d32 = sts.d32;
-+	}
-+
-+	if (dwc_ep->is_in == 0) {
-+		addr =
-+		    &GET_CORE_IF(pcd)->dev_if->out_ep_regs[dwc_ep->num]->
-+		    doepctl;
-+	} else {
-+		addr =
-+		    &GET_CORE_IF(pcd)->dev_if->in_ep_regs[dwc_ep->num]->diepctl;
-+	}
-+	depctl.b.epena = 1;
-+	depctl.b.cnak = 1;
-+	DWC_MODIFY_REG32(addr, 0, depctl.d32);
-+}
-+
-+/**
-+ * This function handles EP0 Control transfers.
-+ *
-+ * The state of the control transfers are tracked in
-+ * <code>ep0state</code>.
-+ */
-+static void handle_ep0(dwc_otg_pcd_t * pcd)
-+{
-+	dwc_otg_core_if_t *core_if = GET_CORE_IF(pcd);
-+	dwc_otg_pcd_ep_t *ep0 = &pcd->ep0;
-+	dev_dma_desc_sts_t desc_sts;
-+	deptsiz0_data_t deptsiz;
-+	uint32_t byte_count;
-+
-+#ifdef DEBUG_EP0
-+	DWC_DEBUGPL(DBG_PCDV, "%s()\n", __func__);
-+	print_ep0_state(pcd);
-+#endif
-+
-+//      DWC_PRINTF("HANDLE EP0\n");
-+
-+	switch (pcd->ep0state) {
-+	case EP0_DISCONNECT:
-+		break;
-+
-+	case EP0_IDLE:
-+		pcd->request_config = 0;
-+
-+		pcd_setup(pcd);
-+		break;
-+
-+	case EP0_IN_DATA_PHASE:
-+#ifdef DEBUG_EP0
-+		DWC_DEBUGPL(DBG_PCD, "DATA_IN EP%d-%s: type=%d, mps=%d\n",
-+			    ep0->dwc_ep.num, (ep0->dwc_ep.is_in ? "IN" : "OUT"),
-+			    ep0->dwc_ep.type, ep0->dwc_ep.maxpacket);
-+#endif
-+
-+		if (core_if->dma_enable != 0) {
-+			/*
-+			 * For EP0 we can only program 1 packet at a time so we
-+			 * need to do the make calculations after each complete.
-+			 * Call write_packet to make the calculations, as in
-+			 * slave mode, and use those values to determine if we
-+			 * can complete.
-+			 */
-+			if (core_if->dma_desc_enable == 0) {
-+				deptsiz.d32 =
-+				    DWC_READ_REG32(&core_if->
-+						   dev_if->in_ep_regs[0]->
-+						   dieptsiz);
-+				byte_count =
-+				    ep0->dwc_ep.xfer_len - deptsiz.b.xfersize;
-+			} else {
-+				desc_sts =
-+				    core_if->dev_if->in_desc_addr->status;
-+				byte_count =
-+				    ep0->dwc_ep.xfer_len - desc_sts.b.bytes;
-+			}
-+			ep0->dwc_ep.xfer_count += byte_count;
-+			ep0->dwc_ep.xfer_buff += byte_count;
-+			ep0->dwc_ep.dma_addr += byte_count;
-+		}
-+		if (ep0->dwc_ep.xfer_count < ep0->dwc_ep.total_len) {
-+			dwc_otg_ep0_continue_transfer(GET_CORE_IF(pcd),
-+						      &ep0->dwc_ep);
-+			DWC_DEBUGPL(DBG_PCD, "CONTINUE TRANSFER\n");
-+		} else if (ep0->dwc_ep.sent_zlp) {
-+			dwc_otg_ep0_continue_transfer(GET_CORE_IF(pcd),
-+						      &ep0->dwc_ep);
-+			ep0->dwc_ep.sent_zlp = 0;
-+			DWC_DEBUGPL(DBG_PCD, "CONTINUE TRANSFER sent zlp\n");
-+		} else {
-+			ep0_complete_request(ep0);
-+			DWC_DEBUGPL(DBG_PCD, "COMPLETE TRANSFER\n");
-+		}
-+		break;
-+	case EP0_OUT_DATA_PHASE:
-+#ifdef DEBUG_EP0
-+		DWC_DEBUGPL(DBG_PCD, "DATA_OUT EP%d-%s: type=%d, mps=%d\n",
-+			    ep0->dwc_ep.num, (ep0->dwc_ep.is_in ? "IN" : "OUT"),
-+			    ep0->dwc_ep.type, ep0->dwc_ep.maxpacket);
-+#endif
-+		if (core_if->dma_enable != 0) {
-+			if (core_if->dma_desc_enable == 0) {
-+				deptsiz.d32 =
-+				    DWC_READ_REG32(&core_if->
-+						   dev_if->out_ep_regs[0]->
-+						   doeptsiz);
-+				byte_count =
-+				    ep0->dwc_ep.maxpacket - deptsiz.b.xfersize;
-+			} else {
-+				desc_sts =
-+				    core_if->dev_if->out_desc_addr->status;
-+				byte_count =
-+				    ep0->dwc_ep.maxpacket - desc_sts.b.bytes;
-+			}
-+			ep0->dwc_ep.xfer_count += byte_count;
-+			ep0->dwc_ep.xfer_buff += byte_count;
-+			ep0->dwc_ep.dma_addr += byte_count;
-+		}
-+		if (ep0->dwc_ep.xfer_count < ep0->dwc_ep.total_len) {
-+			dwc_otg_ep0_continue_transfer(GET_CORE_IF(pcd),
-+						      &ep0->dwc_ep);
-+			DWC_DEBUGPL(DBG_PCD, "CONTINUE TRANSFER\n");
-+		} else if (ep0->dwc_ep.sent_zlp) {
-+			dwc_otg_ep0_continue_transfer(GET_CORE_IF(pcd),
-+						      &ep0->dwc_ep);
-+			ep0->dwc_ep.sent_zlp = 0;
-+			DWC_DEBUGPL(DBG_PCD, "CONTINUE TRANSFER sent zlp\n");
-+		} else {
-+			ep0_complete_request(ep0);
-+			DWC_DEBUGPL(DBG_PCD, "COMPLETE TRANSFER\n");
-+		}
-+		break;
-+
-+	case EP0_IN_STATUS_PHASE:
-+	case EP0_OUT_STATUS_PHASE:
-+		DWC_DEBUGPL(DBG_PCD, "CASE: EP0_STATUS\n");
-+		ep0_complete_request(ep0);
-+		pcd->ep0state = EP0_IDLE;
-+		ep0->stopped = 1;
-+		ep0->dwc_ep.is_in = 0;	/* OUT for next SETUP */
-+
-+		/* Prepare for more SETUP Packets */
-+		if (core_if->dma_enable) {
-+			ep0_out_start(core_if, pcd);
-+		}
-+		break;
-+
-+	case EP0_STALL:
-+		DWC_ERROR("EP0 STALLed, should not get here pcd_setup()\n");
-+		break;
-+	}
-+#ifdef DEBUG_EP0
-+	print_ep0_state(pcd);
-+#endif
-+}
-+
-+/**
-+ * Restart transfer
-+ */
-+static void restart_transfer(dwc_otg_pcd_t * pcd, const uint32_t epnum)
-+{
-+	dwc_otg_core_if_t *core_if;
-+	dwc_otg_dev_if_t *dev_if;
-+	deptsiz_data_t dieptsiz = {.d32 = 0 };
-+	dwc_otg_pcd_ep_t *ep;
-+
-+	ep = get_in_ep(pcd, epnum);
-+
-+#ifdef DWC_EN_ISOC
-+	if (ep->dwc_ep.type == DWC_OTG_EP_TYPE_ISOC) {
-+		return;
-+	}
-+#endif /* DWC_EN_ISOC  */
-+
-+	core_if = GET_CORE_IF(pcd);
-+	dev_if = core_if->dev_if;
-+
-+	dieptsiz.d32 = DWC_READ_REG32(&dev_if->in_ep_regs[epnum]->dieptsiz);
-+
-+	DWC_DEBUGPL(DBG_PCD, "xfer_buff=%p xfer_count=%0x xfer_len=%0x"
-+		    " stopped=%d\n", ep->dwc_ep.xfer_buff,
-+		    ep->dwc_ep.xfer_count, ep->dwc_ep.xfer_len, ep->stopped);
-+	/*
-+	 * If xfersize is 0 and pktcnt in not 0, resend the last packet.
-+	 */
-+	if (dieptsiz.b.pktcnt && dieptsiz.b.xfersize == 0 &&
-+	    ep->dwc_ep.start_xfer_buff != 0) {
-+		if (ep->dwc_ep.total_len <= ep->dwc_ep.maxpacket) {
-+			ep->dwc_ep.xfer_count = 0;
-+			ep->dwc_ep.xfer_buff = ep->dwc_ep.start_xfer_buff;
-+			ep->dwc_ep.xfer_len = ep->dwc_ep.xfer_count;
-+		} else {
-+			ep->dwc_ep.xfer_count -= ep->dwc_ep.maxpacket;
-+			/* convert packet size to dwords. */
-+			ep->dwc_ep.xfer_buff -= ep->dwc_ep.maxpacket;
-+			ep->dwc_ep.xfer_len = ep->dwc_ep.xfer_count;
-+		}
-+		ep->stopped = 0;
-+		DWC_DEBUGPL(DBG_PCD, "xfer_buff=%p xfer_count=%0x "
-+			    "xfer_len=%0x stopped=%d\n",
-+			    ep->dwc_ep.xfer_buff,
-+			    ep->dwc_ep.xfer_count, ep->dwc_ep.xfer_len,
-+			    ep->stopped);
-+		if (epnum == 0) {
-+			dwc_otg_ep0_start_transfer(core_if, &ep->dwc_ep);
-+		} else {
-+			dwc_otg_ep_start_transfer(core_if, &ep->dwc_ep);
-+		}
-+	}
-+}
-+
-+/*
-+ * This function create new nextep sequnce based on Learn Queue.
-+ *
-+ * @param core_if Programming view of DWC_otg controller
-+ */
-+void predict_nextep_seq( dwc_otg_core_if_t * core_if)
-+{
-+	dwc_otg_device_global_regs_t *dev_global_regs =
-+	    core_if->dev_if->dev_global_regs;
-+	const uint32_t TOKEN_Q_DEPTH = core_if->hwcfg2.b.dev_token_q_depth;
-+	/* Number of Token Queue Registers */
-+	const int DTKNQ_REG_CNT = (TOKEN_Q_DEPTH + 7) / 8;
-+	dtknq1_data_t dtknqr1;
-+	uint32_t in_tkn_epnums[4];
-+	uint8_t seqnum[MAX_EPS_CHANNELS];
-+	uint8_t intkn_seq[1 << 5];
-+	grstctl_t resetctl = {.d32 = 0 };
-+	uint8_t temp;
-+	int ndx = 0;
-+	int start = 0;
-+	int end = 0;
-+	int sort_done = 0;
-+	int i = 0;
-+	volatile uint32_t *addr = &dev_global_regs->dtknqr1;
-+
-+
-+	DWC_DEBUGPL(DBG_PCD,"dev_token_q_depth=%d\n",TOKEN_Q_DEPTH);
-+
-+	/* Read the DTKNQ Registers */
-+	for (i = 0; i < DTKNQ_REG_CNT; i++) {
-+		in_tkn_epnums[i] = DWC_READ_REG32(addr);
-+		DWC_DEBUGPL(DBG_PCDV, "DTKNQR%d=0x%08x\n", i + 1,
-+			    in_tkn_epnums[i]);
-+		if (addr == &dev_global_regs->dvbusdis) {
-+			addr = &dev_global_regs->dtknqr3_dthrctl;
-+		} else {
-+			++addr;
-+		}
-+
-+	}
-+
-+	/* Copy the DTKNQR1 data to the bit field. */
-+	dtknqr1.d32 = in_tkn_epnums[0];
-+	if (dtknqr1.b.wrap_bit) {
-+		ndx = dtknqr1.b.intknwptr;
-+		end = ndx -1;
-+		if (end < 0)
-+			end = TOKEN_Q_DEPTH -1;
-+	} else {
-+		ndx = 0;
-+		end = dtknqr1.b.intknwptr -1;
-+		if (end < 0)
-+			end = 0;
-+	}
-+	start = ndx;
-+
-+	/* Fill seqnum[] by initial values: EP number + 31 */
-+	for (i=0; i <= core_if->dev_if->num_in_eps; i++) {
-+		seqnum[i] = i +31;
-+	}
-+
-+	/* Fill intkn_seq[] from in_tkn_epnums[0] */
-+	for (i=0; i < 6; i++)
-+		intkn_seq[i] = (in_tkn_epnums[0] >> ((7-i) * 4)) & 0xf;
-+
-+	if (TOKEN_Q_DEPTH > 6) {
-+		/* Fill intkn_seq[] from in_tkn_epnums[1] */
-+		for (i=6; i < 14; i++)
-+			intkn_seq[i] =
-+			    (in_tkn_epnums[1] >> ((7 - (i - 6)) * 4)) & 0xf;
-+	}
-+
-+	if (TOKEN_Q_DEPTH > 14) {
-+		/* Fill intkn_seq[] from in_tkn_epnums[1] */
-+		for (i=14; i < 22; i++)
-+			intkn_seq[i] =
-+			    (in_tkn_epnums[2] >> ((7 - (i - 14)) * 4)) & 0xf;
-+	}
-+
-+	if (TOKEN_Q_DEPTH > 22) {
-+		/* Fill intkn_seq[] from in_tkn_epnums[1] */
-+		for (i=22; i < 30; i++)
-+			intkn_seq[i] =
-+			    (in_tkn_epnums[3] >> ((7 - (i - 22)) * 4)) & 0xf;
-+	}
-+
-+	DWC_DEBUGPL(DBG_PCDV, "%s start=%d end=%d intkn_seq[]:\n", __func__,
-+		    start, end);
-+	for (i=0; i<TOKEN_Q_DEPTH; i++)
-+		DWC_DEBUGPL(DBG_PCDV,"%d\n", intkn_seq[i]);
-+
-+	/* Update seqnum based on intkn_seq[] */
-+	i = 0;
-+	do {
-+		seqnum[intkn_seq[ndx]] = i;
-+		ndx++;
-+		i++;
-+		if (ndx == TOKEN_Q_DEPTH)
-+			ndx = 0;
-+	} while ( i < TOKEN_Q_DEPTH );
-+
-+	/* Mark non active EP's in seqnum[] by 0xff */
-+	for (i=0; i<=core_if->dev_if->num_in_eps; i++) {
-+		if (core_if->nextep_seq[i] == 0xff )
-+			seqnum[i] = 0xff;
-+	}
-+
-+	/* Sort seqnum[] */
-+	sort_done = 0;
-+	while (!sort_done) {
-+		sort_done = 1;
-+		for (i=0; i<core_if->dev_if->num_in_eps; i++) {
-+			if (seqnum[i] > seqnum[i+1]) {
-+				temp = seqnum[i];
-+				seqnum[i] = seqnum[i+1];
-+				seqnum[i+1] = temp;
-+				sort_done = 0;
-+			}
-+		}
-+	}
-+
-+	ndx = start + seqnum[0];
-+	if (ndx >= TOKEN_Q_DEPTH)
-+		ndx = ndx % TOKEN_Q_DEPTH;
-+	core_if->first_in_nextep_seq = intkn_seq[ndx];
-+
-+	/* Update seqnum[] by EP numbers  */
-+	for (i=0; i<=core_if->dev_if->num_in_eps; i++) {
-+		ndx = start + i;
-+		if (seqnum[i] < 31) {
-+			ndx = start + seqnum[i];
-+			if (ndx >= TOKEN_Q_DEPTH)
-+				ndx = ndx % TOKEN_Q_DEPTH;
-+			seqnum[i] = intkn_seq[ndx];
-+		} else {
-+			if (seqnum[i] < 0xff) {
-+				seqnum[i] = seqnum[i] - 31;
-+			} else {
-+				break;
-+			}
-+		}
-+	}
-+
-+	/* Update nextep_seq[] based on seqnum[] */
-+	for (i=0; i<core_if->dev_if->num_in_eps; i++) {
-+		if (seqnum[i] != 0xff) {
-+			if (seqnum[i+1] != 0xff) {
-+				core_if->nextep_seq[seqnum[i]] = seqnum[i+1];
-+			} else {
-+				core_if->nextep_seq[seqnum[i]] = core_if->first_in_nextep_seq;
-+				break;
-+			}
-+		} else {
-+			break;
-+		}
-+	}
-+
-+	DWC_DEBUGPL(DBG_PCDV, "%s first_in_nextep_seq= %2d; nextep_seq[]:\n",
-+		__func__, core_if->first_in_nextep_seq);
-+	for (i=0; i <= core_if->dev_if->num_in_eps; i++) {
-+		DWC_DEBUGPL(DBG_PCDV,"%2d\n", core_if->nextep_seq[i]);
-+	}
-+
-+	/* Flush the Learning Queue */
-+	resetctl.d32 = DWC_READ_REG32(&core_if->core_global_regs->grstctl);
-+	resetctl.b.intknqflsh = 1;
-+	DWC_WRITE_REG32(&core_if->core_global_regs->grstctl, resetctl.d32);
-+
-+
-+}
-+
-+/**
-+ * handle the IN EP disable interrupt.
-+ */
-+static inline void handle_in_ep_disable_intr(dwc_otg_pcd_t * pcd,
-+					     const uint32_t epnum)
-+{
-+	dwc_otg_core_if_t *core_if = GET_CORE_IF(pcd);
-+	dwc_otg_dev_if_t *dev_if = core_if->dev_if;
-+	deptsiz_data_t dieptsiz = {.d32 = 0 };
-+	dctl_data_t dctl = {.d32 = 0 };
-+	dwc_otg_pcd_ep_t *ep;
-+	dwc_ep_t *dwc_ep;
-+	gintmsk_data_t gintmsk_data;
-+	depctl_data_t depctl;
-+	uint32_t diepdma;
-+	uint32_t remain_to_transfer = 0;
-+	uint8_t i;
-+	uint32_t xfer_size;
-+
-+	ep = get_in_ep(pcd, epnum);
-+	dwc_ep = &ep->dwc_ep;
-+
-+	if (dwc_ep->type == DWC_OTG_EP_TYPE_ISOC) {
-+		dwc_otg_flush_tx_fifo(core_if, dwc_ep->tx_fifo_num);
-+		complete_ep(ep);
-+		return;
-+	}
-+
-+	DWC_DEBUGPL(DBG_PCD, "diepctl%d=%0x\n", epnum,
-+		    DWC_READ_REG32(&dev_if->in_ep_regs[epnum]->diepctl));
-+	dieptsiz.d32 = DWC_READ_REG32(&dev_if->in_ep_regs[epnum]->dieptsiz);
-+	depctl.d32 = DWC_READ_REG32(&dev_if->in_ep_regs[epnum]->diepctl);
-+
-+	DWC_DEBUGPL(DBG_ANY, "pktcnt=%d size=%d\n",
-+		    dieptsiz.b.pktcnt, dieptsiz.b.xfersize);
-+
-+	if ((core_if->start_predict == 0) || (depctl.b.eptype & 1)) {
-+		if (ep->stopped) {
-+			if (core_if->en_multiple_tx_fifo)
-+				/* Flush the Tx FIFO */
-+				dwc_otg_flush_tx_fifo(core_if, dwc_ep->tx_fifo_num);
-+			/* Clear the Global IN NP NAK */
-+			dctl.d32 = 0;
-+			dctl.b.cgnpinnak = 1;
-+			DWC_MODIFY_REG32(&dev_if->dev_global_regs->dctl, dctl.d32, dctl.d32);
-+			/* Restart the transaction */
-+			if (dieptsiz.b.pktcnt != 0 || dieptsiz.b.xfersize != 0) {
-+				restart_transfer(pcd, epnum);
-+			}
-+		} else {
-+			/* Restart the transaction */
-+			if (dieptsiz.b.pktcnt != 0 || dieptsiz.b.xfersize != 0) {
-+				restart_transfer(pcd, epnum);
-+			}
-+			DWC_DEBUGPL(DBG_ANY, "STOPPED!!!\n");
-+		}
-+		return;
-+	}
-+
-+	if (core_if->start_predict > 2) {	// NP IN EP
-+		core_if->start_predict--;
-+		return;
-+	}
-+
-+	core_if->start_predict--;
-+
-+	if (core_if->start_predict == 1) {	// All NP IN Ep's disabled now
-+
-+		predict_nextep_seq(core_if);
-+
-+		/* Update all active IN EP's NextEP field based of nextep_seq[] */
-+		for ( i = 0; i <= core_if->dev_if->num_in_eps; i++) {
-+			depctl.d32 =
-+			    DWC_READ_REG32(&dev_if->in_ep_regs[i]->diepctl);
-+			if (core_if->nextep_seq[i] != 0xff) {	// Active NP IN EP
-+				depctl.b.nextep = core_if->nextep_seq[i];
-+				DWC_WRITE_REG32(&dev_if->in_ep_regs[i]->diepctl, depctl.d32);
-+			}
-+		}
-+		/* Flush Shared NP TxFIFO */
-+		dwc_otg_flush_tx_fifo(core_if, 0);
-+		/* Rewind buffers */
-+		if (!core_if->dma_desc_enable) {
-+			i = core_if->first_in_nextep_seq;
-+			do {
-+				ep = get_in_ep(pcd, i);
-+				dieptsiz.d32 = DWC_READ_REG32(&dev_if->in_ep_regs[i]->dieptsiz);
-+				xfer_size = ep->dwc_ep.total_len - ep->dwc_ep.xfer_count;
-+				if (xfer_size > ep->dwc_ep.maxxfer)
-+					xfer_size = ep->dwc_ep.maxxfer;
-+				depctl.d32 = DWC_READ_REG32(&dev_if->in_ep_regs[i]->diepctl);
-+				if (dieptsiz.b.pktcnt != 0) {
-+					if (xfer_size == 0) {
-+						remain_to_transfer = 0;
-+					} else {
-+						if ((xfer_size % ep->dwc_ep.maxpacket) == 0) {
-+							remain_to_transfer =
-+								dieptsiz.b.pktcnt * ep->dwc_ep.maxpacket;
-+						} else {
-+							remain_to_transfer = ((dieptsiz.b.pktcnt -1) * ep->dwc_ep.maxpacket)
-+								+ (xfer_size % ep->dwc_ep.maxpacket);
-+						}
-+					}
-+					diepdma = DWC_READ_REG32(&dev_if->in_ep_regs[i]->diepdma);
-+					dieptsiz.b.xfersize = remain_to_transfer;
-+					DWC_WRITE_REG32(&dev_if->in_ep_regs[i]->dieptsiz, dieptsiz.d32);
-+					diepdma = ep->dwc_ep.dma_addr + (xfer_size - remain_to_transfer);
-+					DWC_WRITE_REG32(&dev_if->in_ep_regs[i]->diepdma, diepdma);
-+				}
-+				i = core_if->nextep_seq[i];
-+			} while (i != core_if->first_in_nextep_seq);
-+		} else { // dma_desc_enable
-+				DWC_PRINTF("%s Learning Queue not supported in DDMA\n", __func__);
-+		}
-+
-+		/* Restart transfers in predicted sequences */
-+		i = core_if->first_in_nextep_seq;
-+		do {
-+			dieptsiz.d32 = DWC_READ_REG32(&dev_if->in_ep_regs[i]->dieptsiz);
-+			depctl.d32 = DWC_READ_REG32(&dev_if->in_ep_regs[i]->diepctl);
-+			if (dieptsiz.b.pktcnt != 0) {
-+				depctl.d32 = DWC_READ_REG32(&dev_if->in_ep_regs[i]->diepctl);
-+				depctl.b.epena = 1;
-+				depctl.b.cnak = 1;
-+				DWC_WRITE_REG32(&dev_if->in_ep_regs[i]->diepctl, depctl.d32);
-+			}
-+			i = core_if->nextep_seq[i];
-+		} while (i != core_if->first_in_nextep_seq);
-+
-+		/* Clear the global non-periodic IN NAK handshake */
-+		dctl.d32 = 0;
-+		dctl.b.cgnpinnak = 1;
-+		DWC_MODIFY_REG32(&dev_if->dev_global_regs->dctl, dctl.d32, dctl.d32);
-+
-+		/* Unmask EP Mismatch interrupt */
-+		gintmsk_data.d32 = 0;
-+		gintmsk_data.b.epmismatch = 1;
-+		DWC_MODIFY_REG32(&core_if->core_global_regs->gintmsk, 0, gintmsk_data.d32);
-+
-+		core_if->start_predict = 0;
-+
-+	}
-+}
-+
-+/**
-+ * Handler for the IN EP timeout handshake interrupt.
-+ */
-+static inline void handle_in_ep_timeout_intr(dwc_otg_pcd_t * pcd,
-+					     const uint32_t epnum)
-+{
-+	dwc_otg_core_if_t *core_if = GET_CORE_IF(pcd);
-+	dwc_otg_dev_if_t *dev_if = core_if->dev_if;
-+
-+#ifdef DEBUG
-+	deptsiz_data_t dieptsiz = {.d32 = 0 };
-+	uint32_t num = 0;
-+#endif
-+	dctl_data_t dctl = {.d32 = 0 };
-+	dwc_otg_pcd_ep_t *ep;
-+
-+	gintmsk_data_t intr_mask = {.d32 = 0 };
-+
-+	ep = get_in_ep(pcd, epnum);
-+
-+	/* Disable the NP Tx Fifo Empty Interrrupt */
-+	if (!core_if->dma_enable) {
-+		intr_mask.b.nptxfempty = 1;
-+		DWC_MODIFY_REG32(&core_if->core_global_regs->gintmsk,
-+				 intr_mask.d32, 0);
-+	}
-+	/** @todo NGS Check EP type.
-+	 * Implement for Periodic EPs */
-+	/*
-+	 * Non-periodic EP
-+	 */
-+	/* Enable the Global IN NAK Effective Interrupt */
-+	intr_mask.b.ginnakeff = 1;
-+	DWC_MODIFY_REG32(&core_if->core_global_regs->gintmsk, 0, intr_mask.d32);
-+
-+	/* Set Global IN NAK */
-+	dctl.b.sgnpinnak = 1;
-+	DWC_MODIFY_REG32(&dev_if->dev_global_regs->dctl, dctl.d32, dctl.d32);
-+
-+	ep->stopped = 1;
-+
-+#ifdef DEBUG
-+	dieptsiz.d32 = DWC_READ_REG32(&dev_if->in_ep_regs[num]->dieptsiz);
-+	DWC_DEBUGPL(DBG_ANY, "pktcnt=%d size=%d\n",
-+		    dieptsiz.b.pktcnt, dieptsiz.b.xfersize);
-+#endif
-+
-+#ifdef DISABLE_PERIODIC_EP
-+	/*
-+	 * Set the NAK bit for this EP to
-+	 * start the disable process.
-+	 */
-+	diepctl.d32 = 0;
-+	diepctl.b.snak = 1;
-+	DWC_MODIFY_REG32(&dev_if->in_ep_regs[num]->diepctl, diepctl.d32,
-+			 diepctl.d32);
-+	ep->disabling = 1;
-+	ep->stopped = 1;
-+#endif
-+}
-+
-+/**
-+ * Handler for the IN EP NAK interrupt.
-+ */
-+static inline int32_t handle_in_ep_nak_intr(dwc_otg_pcd_t * pcd,
-+					    const uint32_t epnum)
-+{
-+	/** @todo implement ISR */
-+	dwc_otg_core_if_t *core_if;
-+	diepmsk_data_t intr_mask = {.d32 = 0 };
-+
-+	DWC_PRINTF("INTERRUPT Handler not implemented for %s\n", "IN EP NAK");
-+	core_if = GET_CORE_IF(pcd);
-+	intr_mask.b.nak = 1;
-+
-+	if (core_if->multiproc_int_enable) {
-+		DWC_MODIFY_REG32(&core_if->dev_if->dev_global_regs->
-+				 diepeachintmsk[epnum], intr_mask.d32, 0);
-+	} else {
-+		DWC_MODIFY_REG32(&core_if->dev_if->dev_global_regs->diepmsk,
-+				 intr_mask.d32, 0);
-+	}
-+
-+	return 1;
-+}
-+
-+/**
-+ * Handler for the OUT EP Babble interrupt.
-+ */
-+static inline int32_t handle_out_ep_babble_intr(dwc_otg_pcd_t * pcd,
-+						const uint32_t epnum)
-+{
-+	/** @todo implement ISR */
-+	dwc_otg_core_if_t *core_if;
-+	doepmsk_data_t intr_mask = {.d32 = 0 };
-+
-+	DWC_PRINTF("INTERRUPT Handler not implemented for %s\n",
-+		   "OUT EP Babble");
-+	core_if = GET_CORE_IF(pcd);
-+	intr_mask.b.babble = 1;
-+
-+	if (core_if->multiproc_int_enable) {
-+		DWC_MODIFY_REG32(&core_if->dev_if->dev_global_regs->
-+				 doepeachintmsk[epnum], intr_mask.d32, 0);
-+	} else {
-+		DWC_MODIFY_REG32(&core_if->dev_if->dev_global_regs->doepmsk,
-+				 intr_mask.d32, 0);
-+	}
-+
-+	return 1;
-+}
-+
-+/**
-+ * Handler for the OUT EP NAK interrupt.
-+ */
-+static inline int32_t handle_out_ep_nak_intr(dwc_otg_pcd_t * pcd,
-+					     const uint32_t epnum)
-+{
-+	/** @todo implement ISR */
-+	dwc_otg_core_if_t *core_if;
-+	doepmsk_data_t intr_mask = {.d32 = 0 };
-+
-+	DWC_DEBUGPL(DBG_ANY, "INTERRUPT Handler not implemented for %s\n", "OUT EP NAK");
-+	core_if = GET_CORE_IF(pcd);
-+	intr_mask.b.nak = 1;
-+
-+	if (core_if->multiproc_int_enable) {
-+		DWC_MODIFY_REG32(&core_if->dev_if->dev_global_regs->
-+				 doepeachintmsk[epnum], intr_mask.d32, 0);
-+	} else {
-+		DWC_MODIFY_REG32(&core_if->dev_if->dev_global_regs->doepmsk,
-+				 intr_mask.d32, 0);
-+	}
-+
-+	return 1;
-+}
-+
-+/**
-+ * Handler for the OUT EP NYET interrupt.
-+ */
-+static inline int32_t handle_out_ep_nyet_intr(dwc_otg_pcd_t * pcd,
-+					      const uint32_t epnum)
-+{
-+	/** @todo implement ISR */
-+	dwc_otg_core_if_t *core_if;
-+	doepmsk_data_t intr_mask = {.d32 = 0 };
-+
-+	DWC_PRINTF("INTERRUPT Handler not implemented for %s\n", "OUT EP NYET");
-+	core_if = GET_CORE_IF(pcd);
-+	intr_mask.b.nyet = 1;
-+
-+	if (core_if->multiproc_int_enable) {
-+		DWC_MODIFY_REG32(&core_if->dev_if->dev_global_regs->
-+				 doepeachintmsk[epnum], intr_mask.d32, 0);
-+	} else {
-+		DWC_MODIFY_REG32(&core_if->dev_if->dev_global_regs->doepmsk,
-+				 intr_mask.d32, 0);
-+	}
-+
-+	return 1;
-+}
-+
-+/**
-+ * This interrupt indicates that an IN EP has a pending Interrupt.
-+ * The sequence for handling the IN EP interrupt is shown below:
-+ * -#	Read the Device All Endpoint Interrupt register
-+ * -#	Repeat the following for each IN EP interrupt bit set (from
-+ *		LSB to MSB).
-+ * -#	Read the Device Endpoint Interrupt (DIEPINTn) register
-+ * -#	If "Transfer Complete" call the request complete function
-+ * -#	If "Endpoint Disabled" complete the EP disable procedure.
-+ * -#	If "AHB Error Interrupt" log error
-+ * -#	If "Time-out Handshake" log error
-+ * -#	If "IN Token Received when TxFIFO Empty" write packet to Tx
-+ *		FIFO.
-+ * -#	If "IN Token EP Mismatch" (disable, this is handled by EP
-+ *		Mismatch Interrupt)
-+ */
-+static int32_t dwc_otg_pcd_handle_in_ep_intr(dwc_otg_pcd_t * pcd)
-+{
-+#define CLEAR_IN_EP_INTR(__core_if,__epnum,__intr) \
-+do { \
-+		diepint_data_t diepint = {.d32=0}; \
-+		diepint.b.__intr = 1; \
-+		DWC_WRITE_REG32(&__core_if->dev_if->in_ep_regs[__epnum]->diepint, \
-+		diepint.d32); \
-+} while (0)
-+
-+	dwc_otg_core_if_t *core_if = GET_CORE_IF(pcd);
-+	dwc_otg_dev_if_t *dev_if = core_if->dev_if;
-+	diepint_data_t diepint = {.d32 = 0 };
-+	depctl_data_t depctl = {.d32 = 0 };
-+	uint32_t ep_intr;
-+	uint32_t epnum = 0;
-+	dwc_otg_pcd_ep_t *ep;
-+	dwc_ep_t *dwc_ep;
-+	gintmsk_data_t intr_mask = {.d32 = 0 };
-+
-+	DWC_DEBUGPL(DBG_PCDV, "%s(%p)\n", __func__, pcd);
-+
-+	/* Read in the device interrupt bits */
-+	ep_intr = dwc_otg_read_dev_all_in_ep_intr(core_if);
-+
-+	/* Service the Device IN interrupts for each endpoint */
-+	while (ep_intr) {
-+		if (ep_intr & 0x1) {
-+			uint32_t empty_msk;
-+			/* Get EP pointer */
-+			ep = get_in_ep(pcd, epnum);
-+			dwc_ep = &ep->dwc_ep;
-+
-+			depctl.d32 =
-+			    DWC_READ_REG32(&dev_if->in_ep_regs[epnum]->diepctl);
-+			empty_msk =
-+			    DWC_READ_REG32(&dev_if->
-+					   dev_global_regs->dtknqr4_fifoemptymsk);
-+
-+			DWC_DEBUGPL(DBG_PCDV,
-+				    "IN EP INTERRUPT - %d\nepmty_msk - %8x  diepctl - %8x\n",
-+				    epnum, empty_msk, depctl.d32);
-+
-+			DWC_DEBUGPL(DBG_PCD,
-+				    "EP%d-%s: type=%d, mps=%d\n",
-+				    dwc_ep->num, (dwc_ep->is_in ? "IN" : "OUT"),
-+				    dwc_ep->type, dwc_ep->maxpacket);
-+
-+			diepint.d32 =
-+			    dwc_otg_read_dev_in_ep_intr(core_if, dwc_ep);
-+
-+			DWC_DEBUGPL(DBG_PCDV,
-+				    "EP %d Interrupt Register - 0x%x\n", epnum,
-+				    diepint.d32);
-+			/* Transfer complete */
-+			if (diepint.b.xfercompl) {
-+				/* Disable the NP Tx FIFO Empty
-+				 * Interrupt */
-+				if (core_if->en_multiple_tx_fifo == 0) {
-+					intr_mask.b.nptxfempty = 1;
-+					DWC_MODIFY_REG32
-+					    (&core_if->core_global_regs->gintmsk,
-+					     intr_mask.d32, 0);
-+				} else {
-+					/* Disable the Tx FIFO Empty Interrupt for this EP */
-+					uint32_t fifoemptymsk =
-+					    0x1 << dwc_ep->num;
-+					DWC_MODIFY_REG32(&core_if->
-+							 dev_if->dev_global_regs->dtknqr4_fifoemptymsk,
-+							 fifoemptymsk, 0);
-+				}
-+				/* Clear the bit in DIEPINTn for this interrupt */
-+				CLEAR_IN_EP_INTR(core_if, epnum, xfercompl);
-+
-+				/* Complete the transfer */
-+				if (epnum == 0) {
-+					handle_ep0(pcd);
-+				}
-+#ifdef DWC_EN_ISOC
-+				else if (dwc_ep->type == DWC_OTG_EP_TYPE_ISOC) {
-+					if (!ep->stopped)
-+						complete_iso_ep(pcd, ep);
-+				}
-+#endif /* DWC_EN_ISOC */
-+#ifdef DWC_UTE_PER_IO
-+				else if (dwc_ep->type == DWC_OTG_EP_TYPE_ISOC) {
-+					if (!ep->stopped)
-+						complete_xiso_ep(ep);
-+				}
-+#endif /* DWC_UTE_PER_IO */
-+				else {
-+					if (dwc_ep->type == DWC_OTG_EP_TYPE_ISOC &&
-+							dwc_ep->bInterval > 1) {
-+						dwc_ep->frame_num += dwc_ep->bInterval;
-+						if (dwc_ep->frame_num > 0x3FFF)
-+						{
-+							dwc_ep->frm_overrun = 1;
-+							dwc_ep->frame_num &= 0x3FFF;
-+						} else
-+							dwc_ep->frm_overrun = 0;
-+					}
-+					complete_ep(ep);
-+					if(diepint.b.nak)
-+						CLEAR_IN_EP_INTR(core_if, epnum, nak);
-+				}
-+			}
-+			/* Endpoint disable      */
-+			if (diepint.b.epdisabled) {
-+				DWC_DEBUGPL(DBG_ANY, "EP%d IN disabled\n",
-+					    epnum);
-+				handle_in_ep_disable_intr(pcd, epnum);
-+
-+				/* Clear the bit in DIEPINTn for this interrupt */
-+				CLEAR_IN_EP_INTR(core_if, epnum, epdisabled);
-+			}
-+			/* AHB Error */
-+			if (diepint.b.ahberr) {
-+				DWC_ERROR("EP%d IN AHB Error\n", epnum);
-+				/* Clear the bit in DIEPINTn for this interrupt */
-+				CLEAR_IN_EP_INTR(core_if, epnum, ahberr);
-+			}
-+			/* TimeOUT Handshake (non-ISOC IN EPs) */
-+			if (diepint.b.timeout) {
-+				DWC_ERROR("EP%d IN Time-out\n", epnum);
-+				handle_in_ep_timeout_intr(pcd, epnum);
-+
-+				CLEAR_IN_EP_INTR(core_if, epnum, timeout);
-+			}
-+			/** IN Token received with TxF Empty */
-+			if (diepint.b.intktxfemp) {
-+				DWC_DEBUGPL(DBG_ANY,
-+					    "EP%d IN TKN TxFifo Empty\n",
-+					    epnum);
-+				if (!ep->stopped && epnum != 0) {
-+
-+					diepmsk_data_t diepmsk = {.d32 = 0 };
-+					diepmsk.b.intktxfemp = 1;
-+
-+					if (core_if->multiproc_int_enable) {
-+						DWC_MODIFY_REG32
-+						    (&dev_if->dev_global_regs->diepeachintmsk
-+						     [epnum], diepmsk.d32, 0);
-+					} else {
-+						DWC_MODIFY_REG32
-+						    (&dev_if->dev_global_regs->diepmsk,
-+						     diepmsk.d32, 0);
-+					}
-+				} else if (core_if->dma_desc_enable
-+					   && epnum == 0
-+					   && pcd->ep0state ==
-+					   EP0_OUT_STATUS_PHASE) {
-+					// EP0 IN set STALL
-+					depctl.d32 =
-+					    DWC_READ_REG32(&dev_if->in_ep_regs
-+							   [epnum]->diepctl);
-+
-+					/* set the disable and stall bits */
-+					if (depctl.b.epena) {
-+						depctl.b.epdis = 1;
-+					}
-+					depctl.b.stall = 1;
-+					DWC_WRITE_REG32(&dev_if->in_ep_regs
-+							[epnum]->diepctl,
-+							depctl.d32);
-+				}
-+				CLEAR_IN_EP_INTR(core_if, epnum, intktxfemp);
-+			}
-+			/** IN Token Received with EP mismatch */
-+			if (diepint.b.intknepmis) {
-+				DWC_DEBUGPL(DBG_ANY,
-+					    "EP%d IN TKN EP Mismatch\n", epnum);
-+				CLEAR_IN_EP_INTR(core_if, epnum, intknepmis);
-+			}
-+			/** IN Endpoint NAK Effective */
-+			if (diepint.b.inepnakeff) {
-+				DWC_DEBUGPL(DBG_ANY,
-+					    "EP%d IN EP NAK Effective\n",
-+					    epnum);
-+				/* Periodic EP */
-+				if (ep->disabling) {
-+					depctl.d32 = 0;
-+					depctl.b.snak = 1;
-+					depctl.b.epdis = 1;
-+					DWC_MODIFY_REG32(&dev_if->in_ep_regs
-+							 [epnum]->diepctl,
-+							 depctl.d32,
-+							 depctl.d32);
-+				}
-+				CLEAR_IN_EP_INTR(core_if, epnum, inepnakeff);
-+
-+			}
-+
-+			/** IN EP Tx FIFO Empty Intr */
-+			if (diepint.b.emptyintr) {
-+				DWC_DEBUGPL(DBG_ANY,
-+					    "EP%d Tx FIFO Empty Intr \n",
-+					    epnum);
-+				write_empty_tx_fifo(pcd, epnum);
-+
-+				CLEAR_IN_EP_INTR(core_if, epnum, emptyintr);
-+
-+			}
-+
-+			/** IN EP BNA Intr */
-+			if (diepint.b.bna) {
-+				CLEAR_IN_EP_INTR(core_if, epnum, bna);
-+				if (core_if->dma_desc_enable) {
-+#ifdef DWC_EN_ISOC
-+					if (dwc_ep->type ==
-+					    DWC_OTG_EP_TYPE_ISOC) {
-+						/*
-+						 * This checking is performed to prevent first "false" BNA
-+						 * handling occuring right after reconnect
-+						 */
-+						if (dwc_ep->next_frame !=
-+						    0xffffffff)
-+							dwc_otg_pcd_handle_iso_bna(ep);
-+					} else
-+#endif				/* DWC_EN_ISOC */
-+					{
-+						dwc_otg_pcd_handle_noniso_bna(ep);
-+					}
-+				}
-+			}
-+			/* NAK Interrutp */
-+			if (diepint.b.nak) {
-+				DWC_DEBUGPL(DBG_ANY, "EP%d IN NAK Interrupt\n",
-+					    epnum);
-+				if (ep->dwc_ep.type == DWC_OTG_EP_TYPE_ISOC) {
-+					depctl_data_t depctl;
-+					if (ep->dwc_ep.frame_num == 0xFFFFFFFF) {
-+						ep->dwc_ep.frame_num = core_if->frame_num;
-+						if (ep->dwc_ep.bInterval > 1) {
-+							depctl.d32 = 0;
-+							depctl.d32 = DWC_READ_REG32(&dev_if->in_ep_regs[epnum]->diepctl);
-+							if (ep->dwc_ep.frame_num & 0x1) {
-+								depctl.b.setd1pid = 1;
-+								depctl.b.setd0pid = 0;
-+							} else {
-+								depctl.b.setd0pid = 1;
-+								depctl.b.setd1pid = 0;
-+							}
-+							DWC_WRITE_REG32(&dev_if->in_ep_regs[epnum]->diepctl, depctl.d32);
-+						}
-+						start_next_request(ep);
-+					}
-+					ep->dwc_ep.frame_num += ep->dwc_ep.bInterval;
-+					if (dwc_ep->frame_num > 0x3FFF)	{
-+						dwc_ep->frm_overrun = 1;
-+						dwc_ep->frame_num &= 0x3FFF;
-+					} else
-+						dwc_ep->frm_overrun = 0;
-+				}
-+
-+				CLEAR_IN_EP_INTR(core_if, epnum, nak);
-+			}
-+		}
-+		epnum++;
-+		ep_intr >>= 1;
-+	}
-+
-+	return 1;
-+#undef CLEAR_IN_EP_INTR
-+}
-+
-+/**
-+ * This interrupt indicates that an OUT EP has a pending Interrupt.
-+ * The sequence for handling the OUT EP interrupt is shown below:
-+ * -#	Read the Device All Endpoint Interrupt register
-+ * -#	Repeat the following for each OUT EP interrupt bit set (from
-+ *		LSB to MSB).
-+ * -#	Read the Device Endpoint Interrupt (DOEPINTn) register
-+ * -#	If "Transfer Complete" call the request complete function
-+ * -#	If "Endpoint Disabled" complete the EP disable procedure.
-+ * -#	If "AHB Error Interrupt" log error
-+ * -#	If "Setup Phase Done" process Setup Packet (See Standard USB
-+ *		Command Processing)
-+ */
-+static int32_t dwc_otg_pcd_handle_out_ep_intr(dwc_otg_pcd_t * pcd)
-+{
-+#define CLEAR_OUT_EP_INTR(__core_if,__epnum,__intr) \
-+do { \
-+		doepint_data_t doepint = {.d32=0}; \
-+		doepint.b.__intr = 1; \
-+		DWC_WRITE_REG32(&__core_if->dev_if->out_ep_regs[__epnum]->doepint, \
-+		doepint.d32); \
-+} while (0)
-+
-+	dwc_otg_core_if_t *core_if = GET_CORE_IF(pcd);
-+	uint32_t ep_intr;
-+	doepint_data_t doepint = {.d32 = 0 };
-+	uint32_t epnum = 0;
-+	dwc_otg_pcd_ep_t *ep;
-+	dwc_ep_t *dwc_ep;
-+	dctl_data_t dctl = {.d32 = 0 };
-+	gintmsk_data_t gintmsk = {.d32 = 0 };
-+
-+
-+	DWC_DEBUGPL(DBG_PCDV, "%s()\n", __func__);
-+
-+	/* Read in the device interrupt bits */
-+	ep_intr = dwc_otg_read_dev_all_out_ep_intr(core_if);
-+
-+	while (ep_intr) {
-+		if (ep_intr & 0x1) {
-+			/* Get EP pointer */
-+			ep = get_out_ep(pcd, epnum);
-+			dwc_ep = &ep->dwc_ep;
-+
-+#ifdef VERBOSE
-+			DWC_DEBUGPL(DBG_PCDV,
-+				    "EP%d-%s: type=%d, mps=%d\n",
-+				    dwc_ep->num, (dwc_ep->is_in ? "IN" : "OUT"),
-+				    dwc_ep->type, dwc_ep->maxpacket);
-+#endif
-+			doepint.d32 =
-+			    dwc_otg_read_dev_out_ep_intr(core_if, dwc_ep);
-+			/* Moved this interrupt upper due to core deffect of asserting
-+			 * OUT EP 0 xfercompl along with stsphsrcvd in BDMA */
-+			if (doepint.b.stsphsercvd) {
-+				deptsiz0_data_t deptsiz;
-+				CLEAR_OUT_EP_INTR(core_if, epnum, stsphsercvd);
-+				deptsiz.d32 =
-+				    DWC_READ_REG32(&core_if->dev_if->
-+						   out_ep_regs[0]->doeptsiz);
-+				if (core_if->snpsid >= OTG_CORE_REV_3_00a
-+				    && core_if->dma_enable
-+				    && core_if->dma_desc_enable == 0
-+				    && doepint.b.xfercompl
-+				    && deptsiz.b.xfersize == 24) {
-+					CLEAR_OUT_EP_INTR(core_if, epnum,
-+							  xfercompl);
-+					doepint.b.xfercompl = 0;
-+					ep0_out_start(core_if, pcd);
-+				}
-+				if ((core_if->dma_desc_enable) ||
-+				    (core_if->dma_enable
-+				     && core_if->snpsid >=
-+				     OTG_CORE_REV_3_00a)) {
-+					do_setup_in_status_phase(pcd);
-+				}
-+			}
-+			/* Transfer complete */
-+			if (doepint.b.xfercompl) {
-+
-+				if (epnum == 0) {
-+					/* Clear the bit in DOEPINTn for this interrupt */
-+					CLEAR_OUT_EP_INTR(core_if, epnum, xfercompl);
-+					if (core_if->snpsid >= OTG_CORE_REV_3_00a) {
-+						DWC_DEBUGPL(DBG_PCDV, "DOEPINT=%x doepint=%x\n",
-+							DWC_READ_REG32(&core_if->dev_if->out_ep_regs[0]->doepint),
-+							doepint.d32);
-+						DWC_DEBUGPL(DBG_PCDV, "DOEPCTL=%x \n",
-+							DWC_READ_REG32(&core_if->dev_if->out_ep_regs[0]->doepctl));
-+
-+						if (core_if->snpsid >= OTG_CORE_REV_3_00a
-+							&& core_if->dma_enable == 0) {
-+							doepint_data_t doepint;
-+							doepint.d32 = DWC_READ_REG32(&core_if->dev_if->
-+														out_ep_regs[0]->doepint);
-+							if (pcd->ep0state == EP0_IDLE && doepint.b.sr) {
-+								CLEAR_OUT_EP_INTR(core_if, epnum, sr);
-+								goto exit_xfercompl;
-+							}
-+						}
-+						/* In case of DDMA  look at SR bit to go to the Data Stage */
-+						if (core_if->dma_desc_enable) {
-+							dev_dma_desc_sts_t status = {.d32 = 0};
-+							if (pcd->ep0state == EP0_IDLE) {
-+								status.d32 = core_if->dev_if->setup_desc_addr[core_if->
-+											dev_if->setup_desc_index]->status.d32;
-+								if(pcd->data_terminated) {
-+									 pcd->data_terminated = 0;
-+									 status.d32 = core_if->dev_if->out_desc_addr->status.d32;
-+									 dwc_memcpy(&pcd->setup_pkt->req, pcd->backup_buf, 8);
-+								}
-+								if (status.b.sr) {
-+									if (doepint.b.setup) {
-+										DWC_DEBUGPL(DBG_PCDV, "DMA DESC EP0_IDLE SR=1 setup=1\n");
-+										/* Already started data stage, clear setup */
-+										CLEAR_OUT_EP_INTR(core_if, epnum, setup);
-+										doepint.b.setup = 0;
-+										handle_ep0(pcd);
-+										/* Prepare for more setup packets */
-+										if (pcd->ep0state == EP0_IN_STATUS_PHASE ||
-+											pcd->ep0state == EP0_IN_DATA_PHASE) {
-+											ep0_out_start(core_if, pcd);
-+										}
-+
-+										goto exit_xfercompl;
-+									} else {
-+										/* Prepare for more setup packets */
-+										DWC_DEBUGPL(DBG_PCDV,
-+											"EP0_IDLE SR=1 setup=0 new setup comes\n");
-+										ep0_out_start(core_if, pcd);
-+									}
-+								}
-+							} else {
-+								dwc_otg_pcd_request_t *req;
-+								dev_dma_desc_sts_t status = {.d32 = 0};
-+								diepint_data_t diepint0;
-+								diepint0.d32 = DWC_READ_REG32(&core_if->dev_if->
-+															in_ep_regs[0]->diepint);
-+
-+								if (pcd->ep0state == EP0_STALL || pcd->ep0state == EP0_DISCONNECT) {
-+									DWC_ERROR("EP0 is stalled/disconnected\n");
-+								}
-+
-+								/* Clear IN xfercompl if set */
-+								if (diepint0.b.xfercompl && (pcd->ep0state == EP0_IN_STATUS_PHASE
-+									|| pcd->ep0state == EP0_IN_DATA_PHASE)) {
-+									DWC_WRITE_REG32(&core_if->dev_if->
-+										in_ep_regs[0]->diepint, diepint0.d32);
-+								}
-+
-+								status.d32 = core_if->dev_if->setup_desc_addr[core_if->
-+									dev_if->setup_desc_index]->status.d32;
-+
-+								if (ep->dwc_ep.xfer_count != ep->dwc_ep.total_len
-+									&& (pcd->ep0state == EP0_OUT_DATA_PHASE))
-+									status.d32 = core_if->dev_if->out_desc_addr->status.d32;
-+								if (pcd->ep0state == EP0_OUT_STATUS_PHASE)
-+									status.d32 = core_if->dev_if->
-+									out_desc_addr->status.d32;
-+
-+								if (status.b.sr) {
-+									if (DWC_CIRCLEQ_EMPTY(&ep->queue)) {
-+										DWC_DEBUGPL(DBG_PCDV, "Request queue empty!!\n");
-+									} else {
-+										DWC_DEBUGPL(DBG_PCDV, "complete req!!\n");
-+										req = DWC_CIRCLEQ_FIRST(&ep->queue);
-+										if (ep->dwc_ep.xfer_count != ep->dwc_ep.total_len &&
-+											pcd->ep0state == EP0_OUT_DATA_PHASE) {
-+												/* Read arrived setup packet from req->buf */
-+												dwc_memcpy(&pcd->setup_pkt->req,
-+													req->buf + ep->dwc_ep.xfer_count, 8);
-+										}
-+										req->actual = ep->dwc_ep.xfer_count;
-+										dwc_otg_request_done(ep, req, -ECONNRESET);
-+										ep->dwc_ep.start_xfer_buff = 0;
-+										ep->dwc_ep.xfer_buff = 0;
-+										ep->dwc_ep.xfer_len = 0;
-+									}
-+									pcd->ep0state = EP0_IDLE;
-+									if (doepint.b.setup) {
-+										DWC_DEBUGPL(DBG_PCDV, "EP0_IDLE SR=1 setup=1\n");
-+										/* Data stage started, clear setup */
-+										CLEAR_OUT_EP_INTR(core_if, epnum, setup);
-+										doepint.b.setup = 0;
-+										handle_ep0(pcd);
-+										/* Prepare for setup packets if ep0in was enabled*/
-+										if (pcd->ep0state == EP0_IN_STATUS_PHASE) {
-+											ep0_out_start(core_if, pcd);
-+										}
-+
-+										goto exit_xfercompl;
-+									} else {
-+										/* Prepare for more setup packets */
-+										DWC_DEBUGPL(DBG_PCDV,
-+											"EP0_IDLE SR=1 setup=0 new setup comes 2\n");
-+										ep0_out_start(core_if, pcd);
-+									}
-+								}
-+							}
-+						}
-+						if (core_if->snpsid >= OTG_CORE_REV_2_94a && core_if->dma_enable
-+							&& core_if->dma_desc_enable == 0) {
-+							doepint_data_t doepint_temp = {.d32 = 0};
-+							deptsiz0_data_t doeptsize0 = {.d32 = 0 };
-+							doepint_temp.d32 = DWC_READ_REG32(&core_if->dev_if->
-+															out_ep_regs[ep->dwc_ep.num]->doepint);
-+							doeptsize0.d32 = DWC_READ_REG32(&core_if->dev_if->
-+															out_ep_regs[ep->dwc_ep.num]->doeptsiz);
-+							if (pcd->ep0state == EP0_IDLE) {
-+								if (doepint_temp.b.sr) {
-+									CLEAR_OUT_EP_INTR(core_if, epnum, sr);
-+								}
-+									doepint.d32 = DWC_READ_REG32(&core_if->dev_if->
-+																	out_ep_regs[0]->doepint);
-+									if (doeptsize0.b.supcnt == 3) {
-+										DWC_DEBUGPL(DBG_ANY, "Rolling over!!!!!!!\n");
-+										ep->dwc_ep.stp_rollover = 1;
-+									}
-+									if (doepint.b.setup) {
-+retry:
-+										/* Already started data stage, clear setup */
-+										CLEAR_OUT_EP_INTR(core_if, epnum, setup);
-+										doepint.b.setup = 0;
-+										handle_ep0(pcd);
-+										ep->dwc_ep.stp_rollover = 0;
-+										/* Prepare for more setup packets */
-+										if (pcd->ep0state == EP0_IN_STATUS_PHASE ||
-+											pcd->ep0state == EP0_IN_DATA_PHASE) {
-+											ep0_out_start(core_if, pcd);
-+										}
-+										goto exit_xfercompl;
-+									} else {
-+										/* Prepare for more setup packets */
-+										DWC_DEBUGPL(DBG_ANY,
-+											"EP0_IDLE SR=1 setup=0 new setup comes\n");
-+										doepint.d32 = DWC_READ_REG32(&core_if->dev_if->
-+																	out_ep_regs[0]->doepint);
-+										if(doepint.b.setup)
-+											goto retry;
-+										ep0_out_start(core_if, pcd);
-+									}
-+							} else {
-+								dwc_otg_pcd_request_t *req;
-+								diepint_data_t diepint0 = {.d32 = 0};
-+								doepint_data_t doepint_temp = {.d32 = 0};
-+								depctl_data_t diepctl0;
-+								diepint0.d32 = DWC_READ_REG32(&core_if->dev_if->
-+																in_ep_regs[0]->diepint);
-+								diepctl0.d32 = DWC_READ_REG32(&core_if->dev_if->
-+																in_ep_regs[0]->diepctl);
-+
-+								if (pcd->ep0state == EP0_IN_DATA_PHASE
-+									|| pcd->ep0state == EP0_IN_STATUS_PHASE) {
-+									if (diepint0.b.xfercompl) {
-+										DWC_WRITE_REG32(&core_if->dev_if->
-+											in_ep_regs[0]->diepint, diepint0.d32);
-+									}
-+									if (diepctl0.b.epena) {
-+										diepint_data_t diepint = {.d32 = 0};
-+										diepctl0.b.snak = 1;
-+										DWC_WRITE_REG32(&core_if->dev_if->
-+														in_ep_regs[0]->diepctl, diepctl0.d32);
-+										do {
-+											dwc_udelay(10);
-+											diepint.d32 = DWC_READ_REG32(&core_if->dev_if->
-+												in_ep_regs[0]->diepint);
-+										} while (!diepint.b.inepnakeff);
-+										diepint.b.inepnakeff = 1;
-+										DWC_WRITE_REG32(&core_if->dev_if->
-+											in_ep_regs[0]->diepint, diepint.d32);
-+										diepctl0.d32 = 0;
-+										diepctl0.b.epdis = 1;
-+										DWC_WRITE_REG32(&core_if->dev_if->in_ep_regs[0]->diepctl,
-+														diepctl0.d32);
-+										do {
-+											dwc_udelay(10);
-+											diepint.d32 = DWC_READ_REG32(&core_if->dev_if->
-+												in_ep_regs[0]->diepint);
-+										} while (!diepint.b.epdisabled);
-+										diepint.b.epdisabled = 1;
-+										DWC_WRITE_REG32(&core_if->dev_if->in_ep_regs[0]->diepint,
-+															diepint.d32);
-+									}
-+								}
-+								doepint_temp.d32 = DWC_READ_REG32(&core_if->dev_if->
-+																out_ep_regs[ep->dwc_ep.num]->doepint);
-+								if (doepint_temp.b.sr) {
-+									CLEAR_OUT_EP_INTR(core_if, epnum, sr);
-+									if (DWC_CIRCLEQ_EMPTY(&ep->queue)) {
-+										DWC_DEBUGPL(DBG_PCDV, "Request queue empty!!\n");
-+									} else {
-+										DWC_DEBUGPL(DBG_PCDV, "complete req!!\n");
-+										req = DWC_CIRCLEQ_FIRST(&ep->queue);
-+										if (ep->dwc_ep.xfer_count != ep->dwc_ep.total_len &&
-+											pcd->ep0state == EP0_OUT_DATA_PHASE) {
-+												/* Read arrived setup packet from req->buf */
-+												dwc_memcpy(&pcd->setup_pkt->req,
-+													req->buf + ep->dwc_ep.xfer_count, 8);
-+										}
-+										req->actual = ep->dwc_ep.xfer_count;
-+										dwc_otg_request_done(ep, req, -ECONNRESET);
-+										ep->dwc_ep.start_xfer_buff = 0;
-+										ep->dwc_ep.xfer_buff = 0;
-+										ep->dwc_ep.xfer_len = 0;
-+									}
-+									pcd->ep0state = EP0_IDLE;
-+									if (doepint.b.setup) {
-+										DWC_DEBUGPL(DBG_PCDV, "EP0_IDLE SR=1 setup=1\n");
-+										/* Data stage started, clear setup */
-+										CLEAR_OUT_EP_INTR(core_if, epnum, setup);
-+										doepint.b.setup = 0;
-+										handle_ep0(pcd);
-+										/* Prepare for setup packets if ep0in was enabled*/
-+										if (pcd->ep0state == EP0_IN_STATUS_PHASE) {
-+											ep0_out_start(core_if, pcd);
-+										}
-+										goto exit_xfercompl;
-+									} else {
-+										/* Prepare for more setup packets */
-+										DWC_DEBUGPL(DBG_PCDV,
-+											"EP0_IDLE SR=1 setup=0 new setup comes 2\n");
-+										ep0_out_start(core_if, pcd);
-+									}
-+								}
-+							}
-+						}
-+						if (core_if->dma_enable == 0 || pcd->ep0state != EP0_IDLE)
-+							handle_ep0(pcd);
-+exit_xfercompl:
-+						DWC_DEBUGPL(DBG_PCDV, "DOEPINT=%x doepint=%x\n",
-+							dwc_otg_read_dev_out_ep_intr(core_if, dwc_ep), doepint.d32);
-+					} else {
-+					if (core_if->dma_desc_enable == 0
-+					    || pcd->ep0state != EP0_IDLE)
-+						handle_ep0(pcd);
-+					}
-+#ifdef DWC_EN_ISOC
-+				} else if (dwc_ep->type == DWC_OTG_EP_TYPE_ISOC) {
-+					if (doepint.b.pktdrpsts == 0) {
-+						/* Clear the bit in DOEPINTn for this interrupt */
-+						CLEAR_OUT_EP_INTR(core_if,
-+								  epnum,
-+								  xfercompl);
-+						complete_iso_ep(pcd, ep);
-+					} else {
-+
-+						doepint_data_t doepint = {.d32 = 0 };
-+						doepint.b.xfercompl = 1;
-+						doepint.b.pktdrpsts = 1;
-+						DWC_WRITE_REG32
-+						    (&core_if->dev_if->out_ep_regs
-+						     [epnum]->doepint,
-+						     doepint.d32);
-+						if (handle_iso_out_pkt_dropped
-+						    (core_if, dwc_ep)) {
-+							complete_iso_ep(pcd,
-+									ep);
-+						}
-+					}
-+#endif /* DWC_EN_ISOC */
-+#ifdef DWC_UTE_PER_IO
-+				} else if (dwc_ep->type == DWC_OTG_EP_TYPE_ISOC) {
-+					CLEAR_OUT_EP_INTR(core_if, epnum, xfercompl);
-+					if (!ep->stopped)
-+						complete_xiso_ep(ep);
-+#endif /* DWC_UTE_PER_IO */
-+				} else {
-+					/* Clear the bit in DOEPINTn for this interrupt */
-+					CLEAR_OUT_EP_INTR(core_if, epnum,
-+							  xfercompl);
-+
-+					if (core_if->core_params->dev_out_nak) {
-+						DWC_TIMER_CANCEL(pcd->core_if->ep_xfer_timer[epnum]);
-+						pcd->core_if->ep_xfer_info[epnum].state = 0;
-+#ifdef DEBUG
-+						print_memory_payload(pcd, dwc_ep);
-+#endif
-+					}
-+					complete_ep(ep);
-+				}
-+
-+			}
-+
-+			/* Endpoint disable      */
-+			if (doepint.b.epdisabled) {
-+
-+				/* Clear the bit in DOEPINTn for this interrupt */
-+				CLEAR_OUT_EP_INTR(core_if, epnum, epdisabled);
-+				if (core_if->core_params->dev_out_nak) {
-+#ifdef DEBUG
-+					print_memory_payload(pcd, dwc_ep);
-+#endif
-+					/* In case of timeout condition */
-+					if (core_if->ep_xfer_info[epnum].state == 2) {
-+						dctl.d32 = DWC_READ_REG32(&core_if->dev_if->
-+										dev_global_regs->dctl);
-+						dctl.b.cgoutnak = 1;
-+						DWC_WRITE_REG32(&core_if->dev_if->dev_global_regs->dctl,
-+																dctl.d32);
-+						/* Unmask goutnakeff interrupt which was masked
-+						 * during handle nak out interrupt */
-+						gintmsk.b.goutnakeff = 1;
-+						DWC_MODIFY_REG32(&core_if->core_global_regs->gintmsk,
-+																0, gintmsk.d32);
-+
-+						complete_ep(ep);
-+					}
-+				}
-+				if (ep->dwc_ep.type == DWC_OTG_EP_TYPE_ISOC)
-+				{
-+					dctl_data_t dctl;
-+					gintmsk_data_t intr_mask = {.d32 = 0};
-+					dwc_otg_pcd_request_t *req = 0;
-+
-+					dctl.d32 = DWC_READ_REG32(&core_if->dev_if->
-+						dev_global_regs->dctl);
-+					dctl.b.cgoutnak = 1;
-+					DWC_WRITE_REG32(&core_if->dev_if->dev_global_regs->dctl,
-+						dctl.d32);
-+
-+					intr_mask.d32 = 0;
-+					intr_mask.b.incomplisoout = 1;
-+
-+					/* Get any pending requests */
-+					if (!DWC_CIRCLEQ_EMPTY(&ep->queue)) {
-+						req = DWC_CIRCLEQ_FIRST(&ep->queue);
-+						if (!req) {
-+							DWC_PRINTF("complete_ep 0x%p, req = NULL!\n", ep);
-+						} else {
-+							dwc_otg_request_done(ep, req, 0);
-+							start_next_request(ep);
-+						}
-+					} else {
-+						DWC_PRINTF("complete_ep 0x%p, ep->queue empty!\n", ep);
-+					}
-+				}
-+			}
-+			/* AHB Error */
-+			if (doepint.b.ahberr) {
-+				DWC_ERROR("EP%d OUT AHB Error\n", epnum);
-+				DWC_ERROR("EP%d DEPDMA=0x%08x \n",
-+					  epnum, core_if->dev_if->out_ep_regs[epnum]->doepdma);
-+				CLEAR_OUT_EP_INTR(core_if, epnum, ahberr);
-+			}
-+			/* Setup Phase Done (contorl EPs) */
-+			if (doepint.b.setup) {
-+#ifdef DEBUG_EP0
-+				DWC_DEBUGPL(DBG_PCD, "EP%d SETUP Done\n", epnum);
-+#endif
-+				CLEAR_OUT_EP_INTR(core_if, epnum, setup);
-+
-+				handle_ep0(pcd);
-+			}
-+
-+			/** OUT EP BNA Intr */
-+			if (doepint.b.bna) {
-+				CLEAR_OUT_EP_INTR(core_if, epnum, bna);
-+				if (core_if->dma_desc_enable) {
-+#ifdef DWC_EN_ISOC
-+					if (dwc_ep->type ==
-+					    DWC_OTG_EP_TYPE_ISOC) {
-+						/*
-+						 * This checking is performed to prevent first "false" BNA
-+						 * handling occuring right after reconnect
-+						 */
-+						if (dwc_ep->next_frame !=
-+						    0xffffffff)
-+							dwc_otg_pcd_handle_iso_bna(ep);
-+					} else
-+#endif				/* DWC_EN_ISOC */
-+					{
-+						dwc_otg_pcd_handle_noniso_bna(ep);
-+					}
-+				}
-+			}
-+			/* Babble Interrupt */
-+			if (doepint.b.babble) {
-+				DWC_DEBUGPL(DBG_ANY, "EP%d OUT Babble\n",
-+					    epnum);
-+				handle_out_ep_babble_intr(pcd, epnum);
-+
-+				CLEAR_OUT_EP_INTR(core_if, epnum, babble);
-+			}
-+			if (doepint.b.outtknepdis) {
-+				DWC_DEBUGPL(DBG_ANY, "EP%d OUT Token received when EP is \
-+					disabled\n",epnum);
-+				if (ep->dwc_ep.type == DWC_OTG_EP_TYPE_ISOC) {
-+					doepmsk_data_t doepmsk = {.d32 = 0};
-+					ep->dwc_ep.frame_num = core_if->frame_num;
-+					if (ep->dwc_ep.bInterval > 1) {
-+						depctl_data_t depctl;
-+						depctl.d32 = DWC_READ_REG32(&core_if->dev_if->
-+													out_ep_regs[epnum]->doepctl);
-+						if (ep->dwc_ep.frame_num & 0x1) {
-+							depctl.b.setd1pid = 1;
-+							depctl.b.setd0pid = 0;
-+						} else {
-+							depctl.b.setd0pid = 1;
-+							depctl.b.setd1pid = 0;
-+						}
-+						DWC_WRITE_REG32(&core_if->dev_if->
-+										out_ep_regs[epnum]->doepctl, depctl.d32);
-+					}
-+					start_next_request(ep);
-+					doepmsk.b.outtknepdis = 1;
-+					DWC_MODIFY_REG32(&core_if->dev_if->dev_global_regs->doepmsk,
-+								 doepmsk.d32, 0);
-+				}
-+				CLEAR_OUT_EP_INTR(core_if, epnum, outtknepdis);
-+			}
-+
-+			/* NAK Interrutp */
-+			if (doepint.b.nak) {
-+				DWC_DEBUGPL(DBG_ANY, "EP%d OUT NAK\n", epnum);
-+				handle_out_ep_nak_intr(pcd, epnum);
-+
-+				CLEAR_OUT_EP_INTR(core_if, epnum, nak);
-+			}
-+			/* NYET Interrutp */
-+			if (doepint.b.nyet) {
-+				DWC_DEBUGPL(DBG_ANY, "EP%d OUT NYET\n", epnum);
-+				handle_out_ep_nyet_intr(pcd, epnum);
-+
-+				CLEAR_OUT_EP_INTR(core_if, epnum, nyet);
-+			}
-+		}
-+
-+		epnum++;
-+		ep_intr >>= 1;
-+	}
-+
-+	return 1;
-+
-+#undef CLEAR_OUT_EP_INTR
-+}
-+static int drop_transfer(uint32_t trgt_fr, uint32_t curr_fr, uint8_t frm_overrun)
-+{
-+	int retval = 0;
-+	if(!frm_overrun && curr_fr >= trgt_fr)
-+		retval = 1;
-+	else if (frm_overrun
-+		 && (curr_fr >= trgt_fr && ((curr_fr - trgt_fr) < 0x3FFF / 2)))
-+		retval = 1;
-+	return retval;
-+}
-+/**
-+ * Incomplete ISO IN Transfer Interrupt.
-+ * This interrupt indicates one of the following conditions occurred
-+ * while transmitting an ISOC transaction.
-+ * - Corrupted IN Token for ISOC EP.
-+ * - Packet not complete in FIFO.
-+ * The follow actions will be taken:
-+ *	-#	Determine the EP
-+ *	-#	Set incomplete flag in dwc_ep structure
-+ *	-#	Disable EP; when "Endpoint Disabled" interrupt is received
-+ *		Flush FIFO
-+ */
-+int32_t dwc_otg_pcd_handle_incomplete_isoc_in_intr(dwc_otg_pcd_t * pcd)
-+{
-+	gintsts_data_t gintsts;
-+
-+#ifdef DWC_EN_ISOC
-+	dwc_otg_dev_if_t *dev_if;
-+	deptsiz_data_t deptsiz = {.d32 = 0 };
-+	depctl_data_t depctl = {.d32 = 0 };
-+	dsts_data_t dsts = {.d32 = 0 };
-+	dwc_ep_t *dwc_ep;
-+	int i;
-+
-+	dev_if = GET_CORE_IF(pcd)->dev_if;
-+
-+	for (i = 1; i <= dev_if->num_in_eps; ++i) {
-+		dwc_ep = &pcd->in_ep[i].dwc_ep;
-+		if (dwc_ep->active && dwc_ep->type == DWC_OTG_EP_TYPE_ISOC) {
-+			deptsiz.d32 =
-+			    DWC_READ_REG32(&dev_if->in_ep_regs[i]->dieptsiz);
-+			depctl.d32 =
-+			    DWC_READ_REG32(&dev_if->in_ep_regs[i]->diepctl);
-+
-+			if (depctl.b.epdis && deptsiz.d32) {
-+				set_current_pkt_info(GET_CORE_IF(pcd), dwc_ep);
-+				if (dwc_ep->cur_pkt >= dwc_ep->pkt_cnt) {
-+					dwc_ep->cur_pkt = 0;
-+					dwc_ep->proc_buf_num =
-+					    (dwc_ep->proc_buf_num ^ 1) & 0x1;
-+
-+					if (dwc_ep->proc_buf_num) {
-+						dwc_ep->cur_pkt_addr =
-+						    dwc_ep->xfer_buff1;
-+						dwc_ep->cur_pkt_dma_addr =
-+						    dwc_ep->dma_addr1;
-+					} else {
-+						dwc_ep->cur_pkt_addr =
-+						    dwc_ep->xfer_buff0;
-+						dwc_ep->cur_pkt_dma_addr =
-+						    dwc_ep->dma_addr0;
-+					}
-+
-+				}
-+
-+				dsts.d32 =
-+				    DWC_READ_REG32(&GET_CORE_IF(pcd)->dev_if->
-+						   dev_global_regs->dsts);
-+				dwc_ep->next_frame = dsts.b.soffn;
-+
-+				dwc_otg_iso_ep_start_frm_transfer(GET_CORE_IF
-+								  (pcd),
-+								  dwc_ep);
-+			}
-+		}
-+	}
-+
-+#else
-+	depctl_data_t depctl = {.d32 = 0 };
-+	dwc_ep_t *dwc_ep;
-+	dwc_otg_dev_if_t *dev_if;
-+	int i;
-+	dev_if = GET_CORE_IF(pcd)->dev_if;
-+
-+	DWC_DEBUGPL(DBG_PCD,"Incomplete ISO IN \n");
-+
-+	for (i = 1; i <= dev_if->num_in_eps; ++i) {
-+		dwc_ep = &pcd->in_ep[i-1].dwc_ep;
-+		depctl.d32 =
-+			DWC_READ_REG32(&dev_if->in_ep_regs[i]->diepctl);
-+		if (depctl.b.epena && dwc_ep->type == DWC_OTG_EP_TYPE_ISOC) {
-+			if (drop_transfer(dwc_ep->frame_num, GET_CORE_IF(pcd)->frame_num,
-+							dwc_ep->frm_overrun))
-+			{
-+				depctl.d32 =
-+					DWC_READ_REG32(&dev_if->in_ep_regs[i]->diepctl);
-+				depctl.b.snak = 1;
-+				depctl.b.epdis = 1;
-+				DWC_MODIFY_REG32(&dev_if->in_ep_regs[i]->diepctl, depctl.d32, depctl.d32);
-+			}
-+		}
-+	}
-+
-+	/*intr_mask.b.incomplisoin = 1;
-+	DWC_MODIFY_REG32(&GET_CORE_IF(pcd)->core_global_regs->gintmsk,
-+			 intr_mask.d32, 0);	 */
-+#endif				//DWC_EN_ISOC
-+
-+	/* Clear interrupt */
-+	gintsts.d32 = 0;
-+	gintsts.b.incomplisoin = 1;
-+	DWC_WRITE_REG32(&GET_CORE_IF(pcd)->core_global_regs->gintsts,
-+			gintsts.d32);
-+
-+	return 1;
-+}
-+
-+/**
-+ * Incomplete ISO OUT Transfer Interrupt.
-+ *
-+ * This interrupt indicates that the core has dropped an ISO OUT
-+ * packet. The following conditions can be the cause:
-+ * - FIFO Full, the entire packet would not fit in the FIFO.
-+ * - CRC Error
-+ * - Corrupted Token
-+ * The follow actions will be taken:
-+ *	-#	Determine the EP
-+ *	-#	Set incomplete flag in dwc_ep structure
-+ *	-#	Read any data from the FIFO
-+ *	-#	Disable EP. When "Endpoint Disabled" interrupt is received
-+ *		re-enable EP.
-+ */
-+int32_t dwc_otg_pcd_handle_incomplete_isoc_out_intr(dwc_otg_pcd_t * pcd)
-+{
-+
-+	gintsts_data_t gintsts;
-+
-+#ifdef DWC_EN_ISOC
-+	dwc_otg_dev_if_t *dev_if;
-+	deptsiz_data_t deptsiz = {.d32 = 0 };
-+	depctl_data_t depctl = {.d32 = 0 };
-+	dsts_data_t dsts = {.d32 = 0 };
-+	dwc_ep_t *dwc_ep;
-+	int i;
-+
-+	dev_if = GET_CORE_IF(pcd)->dev_if;
-+
-+	for (i = 1; i <= dev_if->num_out_eps; ++i) {
-+		dwc_ep = &pcd->in_ep[i].dwc_ep;
-+		if (pcd->out_ep[i].dwc_ep.active &&
-+		    pcd->out_ep[i].dwc_ep.type == DWC_OTG_EP_TYPE_ISOC) {
-+			deptsiz.d32 =
-+			    DWC_READ_REG32(&dev_if->out_ep_regs[i]->doeptsiz);
-+			depctl.d32 =
-+			    DWC_READ_REG32(&dev_if->out_ep_regs[i]->doepctl);
-+
-+			if (depctl.b.epdis && deptsiz.d32) {
-+				set_current_pkt_info(GET_CORE_IF(pcd),
-+						     &pcd->out_ep[i].dwc_ep);
-+				if (dwc_ep->cur_pkt >= dwc_ep->pkt_cnt) {
-+					dwc_ep->cur_pkt = 0;
-+					dwc_ep->proc_buf_num =
-+					    (dwc_ep->proc_buf_num ^ 1) & 0x1;
-+
-+					if (dwc_ep->proc_buf_num) {
-+						dwc_ep->cur_pkt_addr =
-+						    dwc_ep->xfer_buff1;
-+						dwc_ep->cur_pkt_dma_addr =
-+						    dwc_ep->dma_addr1;
-+					} else {
-+						dwc_ep->cur_pkt_addr =
-+						    dwc_ep->xfer_buff0;
-+						dwc_ep->cur_pkt_dma_addr =
-+						    dwc_ep->dma_addr0;
-+					}
-+
-+				}
-+
-+				dsts.d32 =
-+				    DWC_READ_REG32(&GET_CORE_IF(pcd)->dev_if->
-+						   dev_global_regs->dsts);
-+				dwc_ep->next_frame = dsts.b.soffn;
-+
-+				dwc_otg_iso_ep_start_frm_transfer(GET_CORE_IF
-+								  (pcd),
-+								  dwc_ep);
-+			}
-+		}
-+	}
-+#else
-+	/** @todo implement ISR */
-+	gintmsk_data_t intr_mask = {.d32 = 0 };
-+	dwc_otg_core_if_t *core_if;
-+	deptsiz_data_t deptsiz = {.d32 = 0 };
-+	depctl_data_t depctl = {.d32 = 0 };
-+	dctl_data_t dctl = {.d32 = 0 };
-+	dwc_ep_t *dwc_ep = NULL;
-+	int i;
-+	core_if = GET_CORE_IF(pcd);
-+
-+	for (i = 0; i < core_if->dev_if->num_out_eps; ++i) {
-+		dwc_ep = &pcd->out_ep[i].dwc_ep;
-+		depctl.d32 =
-+			DWC_READ_REG32(&core_if->dev_if->out_ep_regs[dwc_ep->num]->doepctl);
-+		if (depctl.b.epena && depctl.b.dpid == (core_if->frame_num & 0x1)) {
-+			core_if->dev_if->isoc_ep = dwc_ep;
-+			deptsiz.d32 =
-+					DWC_READ_REG32(&core_if->dev_if->out_ep_regs[dwc_ep->num]->doeptsiz);
-+				break;
-+		}
-+	}
-+	dctl.d32 = DWC_READ_REG32(&core_if->dev_if->dev_global_regs->dctl);
-+	gintsts.d32 = DWC_READ_REG32(&core_if->core_global_regs->gintsts);
-+	intr_mask.d32 = DWC_READ_REG32(&core_if->core_global_regs->gintmsk);
-+
-+	if (!intr_mask.b.goutnakeff) {
-+		/* Unmask it */
-+		intr_mask.b.goutnakeff = 1;
-+		DWC_WRITE_REG32(&core_if->core_global_regs->gintmsk, intr_mask.d32);
-+	}
-+	if (!gintsts.b.goutnakeff) {
-+		dctl.b.sgoutnak = 1;
-+	}
-+	DWC_WRITE_REG32(&core_if->dev_if->dev_global_regs->dctl, dctl.d32);
-+
-+	depctl.d32 = DWC_READ_REG32(&core_if->dev_if->out_ep_regs[dwc_ep->num]->doepctl);
-+	if (depctl.b.epena) {
-+		depctl.b.epdis = 1;
-+		depctl.b.snak = 1;
-+	}
-+	DWC_WRITE_REG32(&core_if->dev_if->out_ep_regs[dwc_ep->num]->doepctl, depctl.d32);
-+
-+	intr_mask.d32 = 0;
-+	intr_mask.b.incomplisoout = 1;
-+
-+#endif /* DWC_EN_ISOC */
-+
-+	/* Clear interrupt */
-+	gintsts.d32 = 0;
-+	gintsts.b.incomplisoout = 1;
-+	DWC_WRITE_REG32(&GET_CORE_IF(pcd)->core_global_regs->gintsts,
-+			gintsts.d32);
-+
-+	return 1;
-+}
-+
-+/**
-+ * This function handles the Global IN NAK Effective interrupt.
-+ *
-+ */
-+int32_t dwc_otg_pcd_handle_in_nak_effective(dwc_otg_pcd_t * pcd)
-+{
-+	dwc_otg_dev_if_t *dev_if = GET_CORE_IF(pcd)->dev_if;
-+	depctl_data_t diepctl = {.d32 = 0 };
-+	gintmsk_data_t intr_mask = {.d32 = 0 };
-+	gintsts_data_t gintsts;
-+	dwc_otg_core_if_t *core_if = GET_CORE_IF(pcd);
-+	int i;
-+
-+	DWC_DEBUGPL(DBG_PCD, "Global IN NAK Effective\n");
-+
-+	/* Disable all active IN EPs */
-+	for (i = 0; i <= dev_if->num_in_eps; i++) {
-+		diepctl.d32 = DWC_READ_REG32(&dev_if->in_ep_regs[i]->diepctl);
-+		if (!(diepctl.b.eptype & 1) && diepctl.b.epena) {
-+			if (core_if->start_predict > 0)
-+				core_if->start_predict++;
-+			diepctl.b.epdis = 1;
-+			diepctl.b.snak = 1;
-+			DWC_WRITE_REG32(&dev_if->in_ep_regs[i]->diepctl, diepctl.d32);
-+		}
-+	}
-+
-+
-+	/* Disable the Global IN NAK Effective Interrupt */
-+	intr_mask.b.ginnakeff = 1;
-+	DWC_MODIFY_REG32(&GET_CORE_IF(pcd)->core_global_regs->gintmsk,
-+			 intr_mask.d32, 0);
-+
-+	/* Clear interrupt */
-+	gintsts.d32 = 0;
-+	gintsts.b.ginnakeff = 1;
-+	DWC_WRITE_REG32(&GET_CORE_IF(pcd)->core_global_regs->gintsts,
-+			gintsts.d32);
-+
-+	return 1;
-+}
-+
-+/**
-+ * OUT NAK Effective.
-+ *
-+ */
-+int32_t dwc_otg_pcd_handle_out_nak_effective(dwc_otg_pcd_t * pcd)
-+{
-+	dwc_otg_dev_if_t *dev_if = GET_CORE_IF(pcd)->dev_if;
-+	gintmsk_data_t intr_mask = {.d32 = 0 };
-+	gintsts_data_t gintsts;
-+	depctl_data_t doepctl;
-+	int i;
-+
-+	/* Disable the Global OUT NAK Effective Interrupt */
-+	intr_mask.b.goutnakeff = 1;
-+	DWC_MODIFY_REG32(&GET_CORE_IF(pcd)->core_global_regs->gintmsk,
-+		intr_mask.d32, 0);
-+
-+	/* If DEV OUT NAK enabled*/
-+	if (pcd->core_if->core_params->dev_out_nak) {
-+		/* Run over all out endpoints to determine the ep number on
-+		 * which the timeout has happened
-+		 */
-+		for (i = 0; i <= dev_if->num_out_eps; i++) {
-+			if ( pcd->core_if->ep_xfer_info[i].state == 2 )
-+				break;
-+		}
-+		if (i > dev_if->num_out_eps) {
-+			dctl_data_t dctl;
-+			dctl.d32 =
-+			    DWC_READ_REG32(&dev_if->dev_global_regs->dctl);
-+			dctl.b.cgoutnak = 1;
-+			DWC_WRITE_REG32(&dev_if->dev_global_regs->dctl,
-+				dctl.d32);
-+			goto out;
-+		}
-+
-+		/* Disable the endpoint */
-+		doepctl.d32 = DWC_READ_REG32(&dev_if->out_ep_regs[i]->doepctl);
-+		if (doepctl.b.epena) {
-+			doepctl.b.epdis = 1;
-+			doepctl.b.snak = 1;
-+		}
-+		DWC_WRITE_REG32(&dev_if->out_ep_regs[i]->doepctl, doepctl.d32);
-+		return 1;
-+	}
-+	/* We come here from Incomplete ISO OUT handler */
-+	if (dev_if->isoc_ep) {
-+		dwc_ep_t *dwc_ep = (dwc_ep_t *)dev_if->isoc_ep;
-+		uint32_t epnum = dwc_ep->num;
-+		doepint_data_t doepint;
-+		doepint.d32 =
-+		    DWC_READ_REG32(&dev_if->out_ep_regs[dwc_ep->num]->doepint);
-+		dev_if->isoc_ep = NULL;
-+		doepctl.d32 =
-+		    DWC_READ_REG32(&dev_if->out_ep_regs[epnum]->doepctl);
-+		DWC_PRINTF("Before disable DOEPCTL = %08x\n", doepctl.d32);
-+		if (doepctl.b.epena) {
-+			doepctl.b.epdis = 1;
-+			doepctl.b.snak = 1;
-+		}
-+		DWC_WRITE_REG32(&dev_if->out_ep_regs[epnum]->doepctl,
-+				doepctl.d32);
-+		return 1;
-+	} else
-+		DWC_PRINTF("INTERRUPT Handler not implemented for %s\n",
-+			   "Global OUT NAK Effective\n");
-+
-+out:
-+	/* Clear interrupt */
-+	gintsts.d32 = 0;
-+	gintsts.b.goutnakeff = 1;
-+	DWC_WRITE_REG32(&GET_CORE_IF(pcd)->core_global_regs->gintsts,
-+			gintsts.d32);
-+
-+	return 1;
-+}
-+
-+/**
-+ * PCD interrupt handler.
-+ *
-+ * The PCD handles the device interrupts.  Many conditions can cause a
-+ * device interrupt. When an interrupt occurs, the device interrupt
-+ * service routine determines the cause of the interrupt and
-+ * dispatches handling to the appropriate function. These interrupt
-+ * handling functions are described below.
-+ *
-+ * All interrupt registers are processed from LSB to MSB.
-+ *
-+ */
-+int32_t dwc_otg_pcd_handle_intr(dwc_otg_pcd_t * pcd)
-+{
-+	dwc_otg_core_if_t *core_if = GET_CORE_IF(pcd);
-+#ifdef VERBOSE
-+	dwc_otg_core_global_regs_t *global_regs = core_if->core_global_regs;
-+#endif
-+	gintsts_data_t gintr_status;
-+	int32_t retval = 0;
-+
-+	/* Exit from ISR if core is hibernated */
-+	if (core_if->hibernation_suspend == 1) {
-+		return retval;
-+	}
-+#ifdef VERBOSE
-+	DWC_DEBUGPL(DBG_ANY, "%s() gintsts=%08x	 gintmsk=%08x\n",
-+		    __func__,
-+		    DWC_READ_REG32(&global_regs->gintsts),
-+		    DWC_READ_REG32(&global_regs->gintmsk));
-+#endif
-+
-+	if (dwc_otg_is_device_mode(core_if)) {
-+		DWC_SPINLOCK(pcd->lock);
-+#ifdef VERBOSE
-+		DWC_DEBUGPL(DBG_PCDV, "%s() gintsts=%08x  gintmsk=%08x\n",
-+			    __func__,
-+			    DWC_READ_REG32(&global_regs->gintsts),
-+			    DWC_READ_REG32(&global_regs->gintmsk));
-+#endif
-+
-+		gintr_status.d32 = dwc_otg_read_core_intr(core_if);
-+
-+		DWC_DEBUGPL(DBG_PCDV, "%s: gintsts&gintmsk=%08x\n",
-+			    __func__, gintr_status.d32);
-+
-+		if (gintr_status.b.sofintr) {
-+			retval |= dwc_otg_pcd_handle_sof_intr(pcd);
-+		}
-+		if (gintr_status.b.rxstsqlvl) {
-+			retval |=
-+			    dwc_otg_pcd_handle_rx_status_q_level_intr(pcd);
-+		}
-+		if (gintr_status.b.nptxfempty) {
-+			retval |= dwc_otg_pcd_handle_np_tx_fifo_empty_intr(pcd);
-+		}
-+		if (gintr_status.b.goutnakeff) {
-+			retval |= dwc_otg_pcd_handle_out_nak_effective(pcd);
-+		}
-+		if (gintr_status.b.i2cintr) {
-+			retval |= dwc_otg_pcd_handle_i2c_intr(pcd);
-+		}
-+		if (gintr_status.b.erlysuspend) {
-+			retval |= dwc_otg_pcd_handle_early_suspend_intr(pcd);
-+		}
-+		if (gintr_status.b.usbreset) {
-+			retval |= dwc_otg_pcd_handle_usb_reset_intr(pcd);
-+		}
-+		if (gintr_status.b.enumdone) {
-+			retval |= dwc_otg_pcd_handle_enum_done_intr(pcd);
-+		}
-+		if (gintr_status.b.isooutdrop) {
-+			retval |=
-+			    dwc_otg_pcd_handle_isoc_out_packet_dropped_intr
-+			    (pcd);
-+		}
-+		if (gintr_status.b.eopframe) {
-+			retval |=
-+			    dwc_otg_pcd_handle_end_periodic_frame_intr(pcd);
-+		}
-+		if (gintr_status.b.inepint) {
-+			if (!core_if->multiproc_int_enable) {
-+				retval |= dwc_otg_pcd_handle_in_ep_intr(pcd);
-+			}
-+		}
-+		if (gintr_status.b.outepintr) {
-+			if (!core_if->multiproc_int_enable) {
-+				retval |= dwc_otg_pcd_handle_out_ep_intr(pcd);
-+			}
-+		}
-+		if (gintr_status.b.epmismatch) {
-+			retval |= dwc_otg_pcd_handle_ep_mismatch_intr(pcd);
-+		}
-+		if (gintr_status.b.fetsusp) {
-+			retval |= dwc_otg_pcd_handle_ep_fetsusp_intr(pcd);
-+		}
-+		if (gintr_status.b.ginnakeff) {
-+			retval |= dwc_otg_pcd_handle_in_nak_effective(pcd);
-+		}
-+		if (gintr_status.b.incomplisoin) {
-+			retval |=
-+			    dwc_otg_pcd_handle_incomplete_isoc_in_intr(pcd);
-+		}
-+		if (gintr_status.b.incomplisoout) {
-+			retval |=
-+			    dwc_otg_pcd_handle_incomplete_isoc_out_intr(pcd);
-+		}
-+
-+		/* In MPI mode Device Endpoints interrupts are asserted
-+		 * without setting outepintr and inepint bits set, so these
-+		 * Interrupt handlers are called without checking these bit-fields
-+		 */
-+		if (core_if->multiproc_int_enable) {
-+			retval |= dwc_otg_pcd_handle_in_ep_intr(pcd);
-+			retval |= dwc_otg_pcd_handle_out_ep_intr(pcd);
-+		}
-+#ifdef VERBOSE
-+		DWC_DEBUGPL(DBG_PCDV, "%s() gintsts=%0x\n", __func__,
-+			    DWC_READ_REG32(&global_regs->gintsts));
-+#endif
-+		DWC_SPINUNLOCK(pcd->lock);
-+	}
-+	return retval;
-+}
-+
-+#endif /* DWC_HOST_ONLY */
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c
-@@ -0,0 +1,1262 @@
-+ /* ==========================================================================
-+  * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_linux.c $
-+  * $Revision: #21 $
-+  * $Date: 2012/08/10 $
-+  * $Change: 2047372 $
-+  *
-+  * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
-+  * "Software") is an Unsupported proprietary work of Synopsys, Inc. unless
-+  * otherwise expressly agreed to in writing between Synopsys and you.
-+  *
-+  * The Software IS NOT an item of Licensed Software or Licensed Product under
-+  * any End User Software License Agreement or Agreement for Licensed Product
-+  * with Synopsys or any supplement thereto. You are permitted to use and
-+  * redistribute this Software in source and binary forms, with or without
-+  * modification, provided that redistributions of source code must retain this
-+  * notice. You may not view, use, disclose, copy or distribute this file or
-+  * any information contained herein except pursuant to this license grant from
-+  * Synopsys. If you do not agree with this notice, including the disclaimer
-+  * below, then you are not authorized to use the Software.
-+  *
-+  * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" BASIS
-+  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+  * ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS BE LIABLE FOR ANY DIRECT,
-+  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+  * DAMAGE.
-+  * ========================================================================== */
-+#ifndef DWC_HOST_ONLY
-+
-+/** @file
-+ * This file implements the Peripheral Controller Driver.
-+ *
-+ * The Peripheral Controller Driver (PCD) is responsible for
-+ * translating requests from the Function Driver into the appropriate
-+ * actions on the DWC_otg controller. It isolates the Function Driver
-+ * from the specifics of the controller by providing an API to the
-+ * Function Driver.
-+ *
-+ * The Peripheral Controller Driver for Linux will implement the
-+ * Gadget API, so that the existing Gadget drivers can be used.
-+ * (Gadget Driver is the Linux terminology for a Function Driver.)
-+ *
-+ * The Linux Gadget API is defined in the header file
-+ * <code><linux/usb_gadget.h></code>.  The USB EP operations API is
-+ * defined in the structure <code>usb_ep_ops</code> and the USB
-+ * Controller API is defined in the structure
-+ * <code>usb_gadget_ops</code>.
-+ *
-+ */
-+
-+#include "dwc_otg_os_dep.h"
-+#include "dwc_otg_pcd_if.h"
-+#include "dwc_otg_pcd.h"
-+#include "dwc_otg_driver.h"
-+#include "dwc_otg_dbg.h"
-+
-+extern bool fiq_enable;
-+
-+static struct gadget_wrapper {
-+	dwc_otg_pcd_t *pcd;
-+
-+	struct usb_gadget gadget;
-+	struct usb_gadget_driver *driver;
-+
-+	struct usb_ep ep0;
-+	struct usb_ep in_ep[16];
-+	struct usb_ep out_ep[16];
-+
-+} *gadget_wrapper;
-+
-+/* Display the contents of the buffer */
-+extern void dump_msg(const u8 * buf, unsigned int length);
-+/**
-+ * Get the dwc_otg_pcd_ep_t* from usb_ep* pointer - NULL in case
-+ * if the endpoint is not found
-+ */
-+static struct dwc_otg_pcd_ep *ep_from_handle(dwc_otg_pcd_t * pcd, void *handle)
-+{
-+	int i;
-+	if (pcd->ep0.priv == handle) {
-+		return &pcd->ep0;
-+	}
-+
-+	for (i = 0; i < MAX_EPS_CHANNELS - 1; i++) {
-+		if (pcd->in_ep[i].priv == handle)
-+			return &pcd->in_ep[i];
-+		if (pcd->out_ep[i].priv == handle)
-+			return &pcd->out_ep[i];
-+	}
-+
-+	return NULL;
-+}
-+
-+/* USB Endpoint Operations */
-+/*
-+ * The following sections briefly describe the behavior of the Gadget
-+ * API endpoint operations implemented in the DWC_otg driver
-+ * software. Detailed descriptions of the generic behavior of each of
-+ * these functions can be found in the Linux header file
-+ * include/linux/usb_gadget.h.
-+ *
-+ * The Gadget API provides wrapper functions for each of the function
-+ * pointers defined in usb_ep_ops. The Gadget Driver calls the wrapper
-+ * function, which then calls the underlying PCD function. The
-+ * following sections are named according to the wrapper
-+ * functions. Within each section, the corresponding DWC_otg PCD
-+ * function name is specified.
-+ *
-+ */
-+
-+/**
-+ * This function is called by the Gadget Driver for each EP to be
-+ * configured for the current configuration (SET_CONFIGURATION).
-+ *
-+ * This function initializes the dwc_otg_ep_t data structure, and then
-+ * calls dwc_otg_ep_activate.
-+ */
-+static int ep_enable(struct usb_ep *usb_ep,
-+		     const struct usb_endpoint_descriptor *ep_desc)
-+{
-+	int retval;
-+
-+	DWC_DEBUGPL(DBG_PCDV, "%s(%p,%p)\n", __func__, usb_ep, ep_desc);
-+
-+	if (!usb_ep || !ep_desc || ep_desc->bDescriptorType != USB_DT_ENDPOINT) {
-+		DWC_WARN("%s, bad ep or descriptor\n", __func__);
-+		return -EINVAL;
-+	}
-+	if (usb_ep == &gadget_wrapper->ep0) {
-+		DWC_WARN("%s, bad ep(0)\n", __func__);
-+		return -EINVAL;
-+	}
-+
-+	/* Check FIFO size? */
-+	if (!ep_desc->wMaxPacketSize) {
-+		DWC_WARN("%s, bad %s maxpacket\n", __func__, usb_ep->name);
-+		return -ERANGE;
-+	}
-+
-+	if (!gadget_wrapper->driver ||
-+	    gadget_wrapper->gadget.speed == USB_SPEED_UNKNOWN) {
-+		DWC_WARN("%s, bogus device state\n", __func__);
-+		return -ESHUTDOWN;
-+	}
-+
-+	/* Delete after check - MAS */
-+#if 0
-+	nat = (uint32_t) ep_desc->wMaxPacketSize;
-+	printk(KERN_ALERT "%s: nat (before) =%d\n", __func__, nat);
-+	nat = (nat >> 11) & 0x03;
-+	printk(KERN_ALERT "%s: nat (after) =%d\n", __func__, nat);
-+#endif
-+	retval = dwc_otg_pcd_ep_enable(gadget_wrapper->pcd,
-+				       (const uint8_t *)ep_desc,
-+				       (void *)usb_ep);
-+	if (retval) {
-+		DWC_WARN("dwc_otg_pcd_ep_enable failed\n");
-+		return -EINVAL;
-+	}
-+
-+	usb_ep->maxpacket = le16_to_cpu(ep_desc->wMaxPacketSize);
-+
-+	return 0;
-+}
-+
-+/**
-+ * This function is called when an EP is disabled due to disconnect or
-+ * change in configuration. Any pending requests will terminate with a
-+ * status of -ESHUTDOWN.
-+ *
-+ * This function modifies the dwc_otg_ep_t data structure for this EP,
-+ * and then calls dwc_otg_ep_deactivate.
-+ */
-+static int ep_disable(struct usb_ep *usb_ep)
-+{
-+	int retval;
-+
-+	DWC_DEBUGPL(DBG_PCDV, "%s(%p)\n", __func__, usb_ep);
-+	if (!usb_ep) {
-+		DWC_DEBUGPL(DBG_PCD, "%s, %s not enabled\n", __func__,
-+			    usb_ep ? usb_ep->name : NULL);
-+		return -EINVAL;
-+	}
-+
-+	retval = dwc_otg_pcd_ep_disable(gadget_wrapper->pcd, usb_ep);
-+	if (retval) {
-+		retval = -EINVAL;
-+	}
-+
-+	return retval;
-+}
-+
-+/**
-+ * This function allocates a request object to use with the specified
-+ * endpoint.
-+ *
-+ * @param ep The endpoint to be used with with the request
-+ * @param gfp_flags the GFP_* flags to use.
-+ */
-+static struct usb_request *dwc_otg_pcd_alloc_request(struct usb_ep *ep,
-+						     gfp_t gfp_flags)
-+{
-+	struct usb_request *usb_req;
-+
-+	DWC_DEBUGPL(DBG_PCDV, "%s(%p,%d)\n", __func__, ep, gfp_flags);
-+	if (0 == ep) {
-+		DWC_WARN("%s() %s\n", __func__, "Invalid EP!\n");
-+		return 0;
-+	}
-+	usb_req = kzalloc(sizeof(*usb_req), gfp_flags);
-+	if (0 == usb_req) {
-+		DWC_WARN("%s() %s\n", __func__, "request allocation failed!\n");
-+		return 0;
-+	}
-+	usb_req->dma = DWC_DMA_ADDR_INVALID;
-+
-+	return usb_req;
-+}
-+
-+/**
-+ * This function frees a request object.
-+ *
-+ * @param ep The endpoint associated with the request
-+ * @param req The request being freed
-+ */
-+static void dwc_otg_pcd_free_request(struct usb_ep *ep, struct usb_request *req)
-+{
-+	DWC_DEBUGPL(DBG_PCDV, "%s(%p,%p)\n", __func__, ep, req);
-+
-+	if (0 == ep || 0 == req) {
-+		DWC_WARN("%s() %s\n", __func__,
-+			 "Invalid ep or req argument!\n");
-+		return;
-+	}
-+
-+	kfree(req);
-+}
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
-+/**
-+ * This function allocates an I/O buffer to be used for a transfer
-+ * to/from the specified endpoint.
-+ *
-+ * @param usb_ep The endpoint to be used with with the request
-+ * @param bytes The desired number of bytes for the buffer
-+ * @param dma Pointer to the buffer's DMA address; must be valid
-+ * @param gfp_flags the GFP_* flags to use.
-+ * @return address of a new buffer or null is buffer could not be allocated.
-+ */
-+static void *dwc_otg_pcd_alloc_buffer(struct usb_ep *usb_ep, unsigned bytes,
-+				      dma_addr_t * dma, gfp_t gfp_flags)
-+{
-+	void *buf;
-+	dwc_otg_pcd_t *pcd = 0;
-+
-+	pcd = gadget_wrapper->pcd;
-+
-+	DWC_DEBUGPL(DBG_PCDV, "%s(%p,%d,%p,%0x)\n", __func__, usb_ep, bytes,
-+		    dma, gfp_flags);
-+
-+	/* Check dword alignment */
-+	if ((bytes & 0x3UL) != 0) {
-+		DWC_WARN("%s() Buffer size is not a multiple of"
-+			 "DWORD size (%d)", __func__, bytes);
-+	}
-+
-+	buf = dma_alloc_coherent(NULL, bytes, dma, gfp_flags);
-+	WARN_ON(!buf);
-+
-+	/* Check dword alignment */
-+	if (((int)buf & 0x3UL) != 0) {
-+		DWC_WARN("%s() Buffer is not DWORD aligned (%p)",
-+			 __func__, buf);
-+	}
-+
-+	return buf;
-+}
-+
-+/**
-+ * This function frees an I/O buffer that was allocated by alloc_buffer.
-+ *
-+ * @param usb_ep the endpoint associated with the buffer
-+ * @param buf address of the buffer
-+ * @param dma The buffer's DMA address
-+ * @param bytes The number of bytes of the buffer
-+ */
-+static void dwc_otg_pcd_free_buffer(struct usb_ep *usb_ep, void *buf,
-+				    dma_addr_t dma, unsigned bytes)
-+{
-+	dwc_otg_pcd_t *pcd = 0;
-+
-+	pcd = gadget_wrapper->pcd;
-+
-+	DWC_DEBUGPL(DBG_PCDV, "%s(%p,%0x,%d)\n", __func__, buf, dma, bytes);
-+
-+	dma_free_coherent(NULL, bytes, buf, dma);
-+}
-+#endif
-+
-+/**
-+ * This function is used to submit an I/O Request to an EP.
-+ *
-+ *	- When the request completes the request's completion callback
-+ *	  is called to return the request to the driver.
-+ *	- An EP, except control EPs, may have multiple requests
-+ *	  pending.
-+ *	- Once submitted the request cannot be examined or modified.
-+ *	- Each request is turned into one or more packets.
-+ *	- A BULK EP can queue any amount of data; the transfer is
-+ *	  packetized.
-+ *	- Zero length Packets are specified with the request 'zero'
-+ *	  flag.
-+ */
-+static int ep_queue(struct usb_ep *usb_ep, struct usb_request *usb_req,
-+		    gfp_t gfp_flags)
-+{
-+	dwc_otg_pcd_t *pcd;
-+	struct dwc_otg_pcd_ep *ep = NULL;
-+	int retval = 0, is_isoc_ep = 0;
-+	dma_addr_t dma_addr = DWC_DMA_ADDR_INVALID;
-+
-+	DWC_DEBUGPL(DBG_PCDV, "%s(%p,%p,%d)\n",
-+		    __func__, usb_ep, usb_req, gfp_flags);
-+
-+	if (!usb_req || !usb_req->complete || !usb_req->buf) {
-+		DWC_WARN("bad params\n");
-+		return -EINVAL;
-+	}
-+
-+	if (!usb_ep) {
-+		DWC_WARN("bad ep\n");
-+		return -EINVAL;
-+	}
-+
-+	pcd = gadget_wrapper->pcd;
-+	if (!gadget_wrapper->driver ||
-+	    gadget_wrapper->gadget.speed == USB_SPEED_UNKNOWN) {
-+		DWC_DEBUGPL(DBG_PCDV, "gadget.speed=%d\n",
-+			    gadget_wrapper->gadget.speed);
-+		DWC_WARN("bogus device state\n");
-+		return -ESHUTDOWN;
-+	}
-+
-+	DWC_DEBUGPL(DBG_PCD, "%s queue req %p, len %d buf %p\n",
-+		    usb_ep->name, usb_req, usb_req->length, usb_req->buf);
-+
-+	usb_req->status = -EINPROGRESS;
-+	usb_req->actual = 0;
-+
-+	ep = ep_from_handle(pcd, usb_ep);
-+	if (ep == NULL)
-+		is_isoc_ep = 0;
-+	else
-+		is_isoc_ep = (ep->dwc_ep.type == DWC_OTG_EP_TYPE_ISOC) ? 1 : 0;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
-+	dma_addr = usb_req->dma;
-+#else
-+	if (GET_CORE_IF(pcd)->dma_enable) {
-+                dwc_otg_device_t *otg_dev = gadget_wrapper->pcd->otg_dev;
-+                struct device *dev = NULL;
-+
-+                if (otg_dev != NULL)
-+                        dev = DWC_OTG_OS_GETDEV(otg_dev->os_dep);
-+
-+		if (usb_req->length != 0 &&
-+                    usb_req->dma == DWC_DMA_ADDR_INVALID) {
-+                        dma_addr = dma_map_single(dev, usb_req->buf,
-+                                                  usb_req->length,
-+                                                  ep->dwc_ep.is_in ?
-+                                                        DMA_TO_DEVICE:
-+                                                        DMA_FROM_DEVICE);
-+		}
-+	}
-+#endif
-+
-+#ifdef DWC_UTE_PER_IO
-+	if (is_isoc_ep == 1) {
-+		retval = dwc_otg_pcd_xiso_ep_queue(pcd, usb_ep, usb_req->buf, dma_addr,
-+			usb_req->length, usb_req->zero, usb_req,
-+			gfp_flags == GFP_ATOMIC ? 1 : 0, &usb_req->ext_req);
-+		if (retval)
-+			return -EINVAL;
-+
-+		return 0;
-+	}
-+#endif
-+	retval = dwc_otg_pcd_ep_queue(pcd, usb_ep, usb_req->buf, dma_addr,
-+				      usb_req->length, usb_req->zero, usb_req,
-+				      gfp_flags == GFP_ATOMIC ? 1 : 0);
-+	if (retval) {
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
-+
-+/**
-+ * This function cancels an I/O request from an EP.
-+ */
-+static int ep_dequeue(struct usb_ep *usb_ep, struct usb_request *usb_req)
-+{
-+	DWC_DEBUGPL(DBG_PCDV, "%s(%p,%p)\n", __func__, usb_ep, usb_req);
-+
-+	if (!usb_ep || !usb_req) {
-+		DWC_WARN("bad argument\n");
-+		return -EINVAL;
-+	}
-+	if (!gadget_wrapper->driver ||
-+	    gadget_wrapper->gadget.speed == USB_SPEED_UNKNOWN) {
-+		DWC_WARN("bogus device state\n");
-+		return -ESHUTDOWN;
-+	}
-+	if (dwc_otg_pcd_ep_dequeue(gadget_wrapper->pcd, usb_ep, usb_req)) {
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
-+
-+/**
-+ * usb_ep_set_halt stalls an endpoint.
-+ *
-+ * usb_ep_clear_halt clears an endpoint halt and resets its data
-+ * toggle.
-+ *
-+ * Both of these functions are implemented with the same underlying
-+ * function. The behavior depends on the value argument.
-+ *
-+ * @param[in] usb_ep the Endpoint to halt or clear halt.
-+ * @param[in] value
-+ *	- 0 means clear_halt.
-+ *	- 1 means set_halt,
-+ *	- 2 means clear stall lock flag.
-+ *	- 3 means set  stall lock flag.
-+ */
-+static int ep_halt(struct usb_ep *usb_ep, int value)
-+{
-+	int retval = 0;
-+
-+	DWC_DEBUGPL(DBG_PCD, "HALT %s %d\n", usb_ep->name, value);
-+
-+	if (!usb_ep) {
-+		DWC_WARN("bad ep\n");
-+		return -EINVAL;
-+	}
-+
-+	retval = dwc_otg_pcd_ep_halt(gadget_wrapper->pcd, usb_ep, value);
-+	if (retval == -DWC_E_AGAIN) {
-+		return -EAGAIN;
-+	} else if (retval) {
-+		retval = -EINVAL;
-+	}
-+
-+	return retval;
-+}
-+
-+//#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30))
-+#if 0
-+/**
-+ * ep_wedge: sets the halt feature and ignores clear requests
-+ *
-+ * @usb_ep: the endpoint being wedged
-+ *
-+ * Use this to stall an endpoint and ignore CLEAR_FEATURE(HALT_ENDPOINT)
-+ * requests. If the gadget driver clears the halt status, it will
-+ * automatically unwedge the endpoint.
-+ *
-+ * Returns zero on success, else negative errno. *
-+ * Check usb_ep_set_wedge() at "usb_gadget.h" for details
-+ */
-+static int ep_wedge(struct usb_ep *usb_ep)
-+{
-+	int retval = 0;
-+
-+	DWC_DEBUGPL(DBG_PCD, "WEDGE %s\n", usb_ep->name);
-+
-+	if (!usb_ep) {
-+		DWC_WARN("bad ep\n");
-+		return -EINVAL;
-+	}
-+
-+	retval = dwc_otg_pcd_ep_wedge(gadget_wrapper->pcd, usb_ep);
-+	if (retval == -DWC_E_AGAIN) {
-+		retval = -EAGAIN;
-+	} else if (retval) {
-+		retval = -EINVAL;
-+	}
-+
-+	return retval;
-+}
-+#endif
-+
-+#ifdef DWC_EN_ISOC
-+/**
-+ * This function is used to submit an ISOC Transfer Request to an EP.
-+ *
-+ *	- Every time a sync period completes the request's completion callback
-+ *	  is called to provide data to the gadget driver.
-+ *	- Once submitted the request cannot be modified.
-+ *	- Each request is turned into periodic data packets untill ISO
-+ *	  Transfer is stopped..
-+ */
-+static int iso_ep_start(struct usb_ep *usb_ep, struct usb_iso_request *req,
-+			gfp_t gfp_flags)
-+{
-+	int retval = 0;
-+
-+	if (!req || !req->process_buffer || !req->buf0 || !req->buf1) {
-+		DWC_WARN("bad params\n");
-+		return -EINVAL;
-+	}
-+
-+	if (!usb_ep) {
-+		DWC_PRINTF("bad params\n");
-+		return -EINVAL;
-+	}
-+
-+	req->status = -EINPROGRESS;
-+
-+	retval =
-+	    dwc_otg_pcd_iso_ep_start(gadget_wrapper->pcd, usb_ep, req->buf0,
-+				     req->buf1, req->dma0, req->dma1,
-+				     req->sync_frame, req->data_pattern_frame,
-+				     req->data_per_frame,
-+				     req->
-+				     flags & USB_REQ_ISO_ASAP ? -1 :
-+				     req->start_frame, req->buf_proc_intrvl,
-+				     req, gfp_flags == GFP_ATOMIC ? 1 : 0);
-+
-+	if (retval) {
-+		return -EINVAL;
-+	}
-+
-+	return retval;
-+}
-+
-+/**
-+ * This function stops ISO EP Periodic Data Transfer.
-+ */
-+static int iso_ep_stop(struct usb_ep *usb_ep, struct usb_iso_request *req)
-+{
-+	int retval = 0;
-+	if (!usb_ep) {
-+		DWC_WARN("bad ep\n");
-+	}
-+
-+	if (!gadget_wrapper->driver ||
-+	    gadget_wrapper->gadget.speed == USB_SPEED_UNKNOWN) {
-+		DWC_DEBUGPL(DBG_PCDV, "gadget.speed=%d\n",
-+			    gadget_wrapper->gadget.speed);
-+		DWC_WARN("bogus device state\n");
-+	}
-+
-+	dwc_otg_pcd_iso_ep_stop(gadget_wrapper->pcd, usb_ep, req);
-+	if (retval) {
-+		retval = -EINVAL;
-+	}
-+
-+	return retval;
-+}
-+
-+static struct usb_iso_request *alloc_iso_request(struct usb_ep *ep,
-+						 int packets, gfp_t gfp_flags)
-+{
-+	struct usb_iso_request *pReq = NULL;
-+	uint32_t req_size;
-+
-+	req_size = sizeof(struct usb_iso_request);
-+	req_size +=
-+	    (2 * packets * (sizeof(struct usb_gadget_iso_packet_descriptor)));
-+
-+	pReq = kmalloc(req_size, gfp_flags);
-+	if (!pReq) {
-+		DWC_WARN("Can't allocate Iso Request\n");
-+		return 0;
-+	}
-+	pReq->iso_packet_desc0 = (void *)(pReq + 1);
-+
-+	pReq->iso_packet_desc1 = pReq->iso_packet_desc0 + packets;
-+
-+	return pReq;
-+}
-+
-+static void free_iso_request(struct usb_ep *ep, struct usb_iso_request *req)
-+{
-+	kfree(req);
-+}
-+
-+static struct usb_isoc_ep_ops dwc_otg_pcd_ep_ops = {
-+	.ep_ops = {
-+		   .enable = ep_enable,
-+		   .disable = ep_disable,
-+
-+		   .alloc_request = dwc_otg_pcd_alloc_request,
-+		   .free_request = dwc_otg_pcd_free_request,
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
-+		   .alloc_buffer = dwc_otg_pcd_alloc_buffer,
-+		   .free_buffer = dwc_otg_pcd_free_buffer,
-+#endif
-+
-+		   .queue = ep_queue,
-+		   .dequeue = ep_dequeue,
-+
-+		   .set_halt = ep_halt,
-+		   .fifo_status = 0,
-+		   .fifo_flush = 0,
-+		   },
-+	.iso_ep_start = iso_ep_start,
-+	.iso_ep_stop = iso_ep_stop,
-+	.alloc_iso_request = alloc_iso_request,
-+	.free_iso_request = free_iso_request,
-+};
-+
-+#else
-+
-+	int (*enable) (struct usb_ep *ep,
-+		const struct usb_endpoint_descriptor *desc);
-+	int (*disable) (struct usb_ep *ep);
-+
-+	struct usb_request *(*alloc_request) (struct usb_ep *ep,
-+		gfp_t gfp_flags);
-+	void (*free_request) (struct usb_ep *ep, struct usb_request *req);
-+
-+	int (*queue) (struct usb_ep *ep, struct usb_request *req,
-+		gfp_t gfp_flags);
-+	int (*dequeue) (struct usb_ep *ep, struct usb_request *req);
-+
-+	int (*set_halt) (struct usb_ep *ep, int value);
-+	int (*set_wedge) (struct usb_ep *ep);
-+
-+	int (*fifo_status) (struct usb_ep *ep);
-+	void (*fifo_flush) (struct usb_ep *ep);
-+static struct usb_ep_ops dwc_otg_pcd_ep_ops = {
-+	.enable = ep_enable,
-+	.disable = ep_disable,
-+
-+	.alloc_request = dwc_otg_pcd_alloc_request,
-+	.free_request = dwc_otg_pcd_free_request,
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
-+	.alloc_buffer = dwc_otg_pcd_alloc_buffer,
-+	.free_buffer = dwc_otg_pcd_free_buffer,
-+#else
-+	/* .set_wedge = ep_wedge, */
-+        .set_wedge = NULL, /* uses set_halt instead */
-+#endif
-+
-+	.queue = ep_queue,
-+	.dequeue = ep_dequeue,
-+
-+	.set_halt = ep_halt,
-+	.fifo_status = 0,
-+	.fifo_flush = 0,
-+
-+};
-+
-+#endif /* _EN_ISOC_ */
-+/*	Gadget Operations */
-+/**
-+ * The following gadget operations will be implemented in the DWC_otg
-+ * PCD. Functions in the API that are not described below are not
-+ * implemented.
-+ *
-+ * The Gadget API provides wrapper functions for each of the function
-+ * pointers defined in usb_gadget_ops. The Gadget Driver calls the
-+ * wrapper function, which then calls the underlying PCD function. The
-+ * following sections are named according to the wrapper functions
-+ * (except for ioctl, which doesn't have a wrapper function). Within
-+ * each section, the corresponding DWC_otg PCD function name is
-+ * specified.
-+ *
-+ */
-+
-+/**
-+ *Gets the USB Frame number of the last SOF.
-+ */
-+static int get_frame_number(struct usb_gadget *gadget)
-+{
-+	struct gadget_wrapper *d;
-+
-+	DWC_DEBUGPL(DBG_PCDV, "%s(%p)\n", __func__, gadget);
-+
-+	if (gadget == 0) {
-+		return -ENODEV;
-+	}
-+
-+	d = container_of(gadget, struct gadget_wrapper, gadget);
-+	return dwc_otg_pcd_get_frame_number(d->pcd);
-+}
-+
-+#ifdef CONFIG_USB_DWC_OTG_LPM
-+static int test_lpm_enabled(struct usb_gadget *gadget)
-+{
-+	struct gadget_wrapper *d;
-+
-+	d = container_of(gadget, struct gadget_wrapper, gadget);
-+
-+	return dwc_otg_pcd_is_lpm_enabled(d->pcd);
-+}
-+#endif
-+
-+/**
-+ * Initiates Session Request Protocol (SRP) to wakeup the host if no
-+ * session is in progress. If a session is already in progress, but
-+ * the device is suspended, remote wakeup signaling is started.
-+ *
-+ */
-+static int wakeup(struct usb_gadget *gadget)
-+{
-+	struct gadget_wrapper *d;
-+
-+	DWC_DEBUGPL(DBG_PCDV, "%s(%p)\n", __func__, gadget);
-+
-+	if (gadget == 0) {
-+		return -ENODEV;
-+	} else {
-+		d = container_of(gadget, struct gadget_wrapper, gadget);
-+	}
-+	dwc_otg_pcd_wakeup(d->pcd);
-+	return 0;
-+}
-+
-+static const struct usb_gadget_ops dwc_otg_pcd_ops = {
-+	.get_frame = get_frame_number,
-+	.wakeup = wakeup,
-+#ifdef CONFIG_USB_DWC_OTG_LPM
-+	.lpm_support = test_lpm_enabled,
-+#endif
-+	// current versions must always be self-powered
-+};
-+
-+static int _setup(dwc_otg_pcd_t * pcd, uint8_t * bytes)
-+{
-+	int retval = -DWC_E_NOT_SUPPORTED;
-+	if (gadget_wrapper->driver && gadget_wrapper->driver->setup) {
-+		retval = gadget_wrapper->driver->setup(&gadget_wrapper->gadget,
-+						       (struct usb_ctrlrequest
-+							*)bytes);
-+	}
-+
-+	if (retval == -ENOTSUPP) {
-+		retval = -DWC_E_NOT_SUPPORTED;
-+	} else if (retval < 0) {
-+		retval = -DWC_E_INVALID;
-+	}
-+
-+	return retval;
-+}
-+
-+#ifdef DWC_EN_ISOC
-+static int _isoc_complete(dwc_otg_pcd_t * pcd, void *ep_handle,
-+			  void *req_handle, int proc_buf_num)
-+{
-+	int i, packet_count;
-+	struct usb_gadget_iso_packet_descriptor *iso_packet = 0;
-+	struct usb_iso_request *iso_req = req_handle;
-+
-+	if (proc_buf_num) {
-+		iso_packet = iso_req->iso_packet_desc1;
-+	} else {
-+		iso_packet = iso_req->iso_packet_desc0;
-+	}
-+	packet_count =
-+	    dwc_otg_pcd_get_iso_packet_count(pcd, ep_handle, req_handle);
-+	for (i = 0; i < packet_count; ++i) {
-+		int status;
-+		int actual;
-+		int offset;
-+		dwc_otg_pcd_get_iso_packet_params(pcd, ep_handle, req_handle,
-+						  i, &status, &actual, &offset);
-+		switch (status) {
-+		case -DWC_E_NO_DATA:
-+			status = -ENODATA;
-+			break;
-+		default:
-+			if (status) {
-+				DWC_PRINTF("unknown status in isoc packet\n");
-+			}
-+
-+		}
-+		iso_packet[i].status = status;
-+		iso_packet[i].offset = offset;
-+		iso_packet[i].actual_length = actual;
-+	}
-+
-+	iso_req->status = 0;
-+	iso_req->process_buffer(ep_handle, iso_req);
-+
-+	return 0;
-+}
-+#endif /* DWC_EN_ISOC */
-+
-+#ifdef DWC_UTE_PER_IO
-+/**
-+ * Copy the contents of the extended request to the Linux usb_request's
-+ * extended part and call the gadget's completion.
-+ *
-+ * @param pcd			Pointer to the pcd structure
-+ * @param ep_handle		Void pointer to the usb_ep structure
-+ * @param req_handle	Void pointer to the usb_request structure
-+ * @param status		Request status returned from the portable logic
-+ * @param ereq_port		Void pointer to the extended request structure
-+ *						created in the the portable part that contains the
-+ *						results of the processed iso packets.
-+ */
-+static int _xisoc_complete(dwc_otg_pcd_t * pcd, void *ep_handle,
-+			   void *req_handle, int32_t status, void *ereq_port)
-+{
-+	struct dwc_ute_iso_req_ext *ereqorg = NULL;
-+	struct dwc_iso_xreq_port *ereqport = NULL;
-+	struct dwc_ute_iso_packet_descriptor *desc_org = NULL;
-+	int i;
-+	struct usb_request *req;
-+	//struct dwc_ute_iso_packet_descriptor *
-+	//int status = 0;
-+
-+	req = (struct usb_request *)req_handle;
-+	ereqorg = &req->ext_req;
-+	ereqport = (struct dwc_iso_xreq_port *)ereq_port;
-+	desc_org = ereqorg->per_io_frame_descs;
-+
-+	if (req && req->complete) {
-+		/* Copy the request data from the portable logic to our request */
-+		for (i = 0; i < ereqport->pio_pkt_count; i++) {
-+			desc_org[i].actual_length =
-+			    ereqport->per_io_frame_descs[i].actual_length;
-+			desc_org[i].status =
-+			    ereqport->per_io_frame_descs[i].status;
-+		}
-+
-+		switch (status) {
-+		case -DWC_E_SHUTDOWN:
-+			req->status = -ESHUTDOWN;
-+			break;
-+		case -DWC_E_RESTART:
-+			req->status = -ECONNRESET;
-+			break;
-+		case -DWC_E_INVALID:
-+			req->status = -EINVAL;
-+			break;
-+		case -DWC_E_TIMEOUT:
-+			req->status = -ETIMEDOUT;
-+			break;
-+		default:
-+			req->status = status;
-+		}
-+
-+		/* And call the gadget's completion */
-+		req->complete(ep_handle, req);
-+	}
-+
-+	return 0;
-+}
-+#endif /* DWC_UTE_PER_IO */
-+
-+static int _complete(dwc_otg_pcd_t * pcd, void *ep_handle,
-+		     void *req_handle, int32_t status, uint32_t actual)
-+{
-+	struct usb_request *req = (struct usb_request *)req_handle;
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27)
-+	struct dwc_otg_pcd_ep *ep = NULL;
-+#endif
-+
-+	if (req && req->complete) {
-+		switch (status) {
-+		case -DWC_E_SHUTDOWN:
-+			req->status = -ESHUTDOWN;
-+			break;
-+		case -DWC_E_RESTART:
-+			req->status = -ECONNRESET;
-+			break;
-+		case -DWC_E_INVALID:
-+			req->status = -EINVAL;
-+			break;
-+		case -DWC_E_TIMEOUT:
-+			req->status = -ETIMEDOUT;
-+			break;
-+		default:
-+			req->status = status;
-+
-+		}
-+
-+		req->actual = actual;
-+		DWC_SPINUNLOCK(pcd->lock);
-+		req->complete(ep_handle, req);
-+		DWC_SPINLOCK(pcd->lock);
-+	}
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27)
-+	ep = ep_from_handle(pcd, ep_handle);
-+	if (GET_CORE_IF(pcd)->dma_enable) {
-+                if (req->length != 0) {
-+                        dwc_otg_device_t *otg_dev = gadget_wrapper->pcd->otg_dev;
-+                        struct device *dev = NULL;
-+
-+                        if (otg_dev != NULL)
-+                                  dev = DWC_OTG_OS_GETDEV(otg_dev->os_dep);
-+
-+			dma_unmap_single(dev, req->dma, req->length,
-+                                         ep->dwc_ep.is_in ?
-+                                                DMA_TO_DEVICE: DMA_FROM_DEVICE);
-+                }
-+	}
-+#endif
-+
-+	return 0;
-+}
-+
-+static int _connect(dwc_otg_pcd_t * pcd, int speed)
-+{
-+	gadget_wrapper->gadget.speed = speed;
-+	return 0;
-+}
-+
-+static int _disconnect(dwc_otg_pcd_t * pcd)
-+{
-+	if (gadget_wrapper->driver && gadget_wrapper->driver->disconnect) {
-+		gadget_wrapper->driver->disconnect(&gadget_wrapper->gadget);
-+	}
-+	return 0;
-+}
-+
-+static int _resume(dwc_otg_pcd_t * pcd)
-+{
-+	if (gadget_wrapper->driver && gadget_wrapper->driver->resume) {
-+		gadget_wrapper->driver->resume(&gadget_wrapper->gadget);
-+	}
-+
-+	return 0;
-+}
-+
-+static int _suspend(dwc_otg_pcd_t * pcd)
-+{
-+	if (gadget_wrapper->driver && gadget_wrapper->driver->suspend) {
-+		gadget_wrapper->driver->suspend(&gadget_wrapper->gadget);
-+	}
-+	return 0;
-+}
-+
-+/**
-+ * This function updates the otg values in the gadget structure.
-+ */
-+static int _hnp_changed(dwc_otg_pcd_t * pcd)
-+{
-+
-+	if (!gadget_wrapper->gadget.is_otg)
-+		return 0;
-+
-+	gadget_wrapper->gadget.b_hnp_enable = get_b_hnp_enable(pcd);
-+	gadget_wrapper->gadget.a_hnp_support = get_a_hnp_support(pcd);
-+	gadget_wrapper->gadget.a_alt_hnp_support = get_a_alt_hnp_support(pcd);
-+	return 0;
-+}
-+
-+static int _reset(dwc_otg_pcd_t * pcd)
-+{
-+	return 0;
-+}
-+
-+#ifdef DWC_UTE_CFI
-+static int _cfi_setup(dwc_otg_pcd_t * pcd, void *cfi_req)
-+{
-+	int retval = -DWC_E_INVALID;
-+	if (gadget_wrapper->driver->cfi_feature_setup) {
-+		retval =
-+		    gadget_wrapper->driver->
-+		    cfi_feature_setup(&gadget_wrapper->gadget,
-+				      (struct cfi_usb_ctrlrequest *)cfi_req);
-+	}
-+
-+	return retval;
-+}
-+#endif
-+
-+static const struct dwc_otg_pcd_function_ops fops = {
-+	.complete = _complete,
-+#ifdef DWC_EN_ISOC
-+	.isoc_complete = _isoc_complete,
-+#endif
-+	.setup = _setup,
-+	.disconnect = _disconnect,
-+	.connect = _connect,
-+	.resume = _resume,
-+	.suspend = _suspend,
-+	.hnp_changed = _hnp_changed,
-+	.reset = _reset,
-+#ifdef DWC_UTE_CFI
-+	.cfi_setup = _cfi_setup,
-+#endif
-+#ifdef DWC_UTE_PER_IO
-+	.xisoc_complete = _xisoc_complete,
-+#endif
-+};
-+
-+/**
-+ * This function is the top level PCD interrupt handler.
-+ */
-+static irqreturn_t dwc_otg_pcd_irq(int irq, void *dev)
-+{
-+	dwc_otg_pcd_t *pcd = dev;
-+	int32_t retval = IRQ_NONE;
-+
-+	retval = dwc_otg_pcd_handle_intr(pcd);
-+	if (retval != 0) {
-+		S3C2410X_CLEAR_EINTPEND();
-+	}
-+	return IRQ_RETVAL(retval);
-+}
-+
-+/**
-+ * This function initialized the usb_ep structures to there default
-+ * state.
-+ *
-+ * @param d Pointer on gadget_wrapper.
-+ */
-+void gadget_add_eps(struct gadget_wrapper *d)
-+{
-+	static const char *names[] = {
-+
-+		"ep0",
-+		"ep1in",
-+		"ep2in",
-+		"ep3in",
-+		"ep4in",
-+		"ep5in",
-+		"ep6in",
-+		"ep7in",
-+		"ep8in",
-+		"ep9in",
-+		"ep10in",
-+		"ep11in",
-+		"ep12in",
-+		"ep13in",
-+		"ep14in",
-+		"ep15in",
-+		"ep1out",
-+		"ep2out",
-+		"ep3out",
-+		"ep4out",
-+		"ep5out",
-+		"ep6out",
-+		"ep7out",
-+		"ep8out",
-+		"ep9out",
-+		"ep10out",
-+		"ep11out",
-+		"ep12out",
-+		"ep13out",
-+		"ep14out",
-+		"ep15out"
-+	};
-+
-+	int i;
-+	struct usb_ep *ep;
-+	int8_t dev_endpoints;
-+
-+	DWC_DEBUGPL(DBG_PCDV, "%s\n", __func__);
-+
-+	INIT_LIST_HEAD(&d->gadget.ep_list);
-+	d->gadget.ep0 = &d->ep0;
-+	d->gadget.speed = USB_SPEED_UNKNOWN;
-+
-+	INIT_LIST_HEAD(&d->gadget.ep0->ep_list);
-+
-+	/**
-+	 * Initialize the EP0 structure.
-+	 */
-+	ep = &d->ep0;
-+
-+	/* Init the usb_ep structure. */
-+	ep->name = names[0];
-+	ep->ops = (struct usb_ep_ops *)&dwc_otg_pcd_ep_ops;
-+
-+	/**
-+	 * @todo NGS: What should the max packet size be set to
-+	 * here?  Before EP type is set?
-+	 */
-+	ep->maxpacket = MAX_PACKET_SIZE;
-+	dwc_otg_pcd_ep_enable(d->pcd, NULL, ep);
-+
-+	list_add_tail(&ep->ep_list, &d->gadget.ep_list);
-+
-+	/**
-+	 * Initialize the EP structures.
-+	 */
-+	dev_endpoints = d->pcd->core_if->dev_if->num_in_eps;
-+
-+	for (i = 0; i < dev_endpoints; i++) {
-+		ep = &d->in_ep[i];
-+
-+		/* Init the usb_ep structure. */
-+		ep->name = names[d->pcd->in_ep[i].dwc_ep.num];
-+		ep->ops = (struct usb_ep_ops *)&dwc_otg_pcd_ep_ops;
-+
-+		/**
-+		 * @todo NGS: What should the max packet size be set to
-+		 * here?  Before EP type is set?
-+		 */
-+		ep->maxpacket = MAX_PACKET_SIZE;
-+		list_add_tail(&ep->ep_list, &d->gadget.ep_list);
-+	}
-+
-+	dev_endpoints = d->pcd->core_if->dev_if->num_out_eps;
-+
-+	for (i = 0; i < dev_endpoints; i++) {
-+		ep = &d->out_ep[i];
-+
-+		/* Init the usb_ep structure. */
-+		ep->name = names[15 + d->pcd->out_ep[i].dwc_ep.num];
-+		ep->ops = (struct usb_ep_ops *)&dwc_otg_pcd_ep_ops;
-+
-+		/**
-+		 * @todo NGS: What should the max packet size be set to
-+		 * here?  Before EP type is set?
-+		 */
-+		ep->maxpacket = MAX_PACKET_SIZE;
-+
-+		list_add_tail(&ep->ep_list, &d->gadget.ep_list);
-+	}
-+
-+	/* remove ep0 from the list.  There is a ep0 pointer. */
-+	list_del_init(&d->ep0.ep_list);
-+
-+	d->ep0.maxpacket = MAX_EP0_SIZE;
-+}
-+
-+/**
-+ * This function releases the Gadget device.
-+ * required by device_unregister().
-+ *
-+ * @todo Should this do something?	Should it free the PCD?
-+ */
-+static void dwc_otg_pcd_gadget_release(struct device *dev)
-+{
-+	DWC_DEBUGPL(DBG_PCDV, "%s(%p)\n", __func__, dev);
-+}
-+
-+static struct gadget_wrapper *alloc_wrapper(dwc_bus_dev_t *_dev)
-+{
-+	static char pcd_name[] = "dwc_otg_pcd";
-+	dwc_otg_device_t *otg_dev = DWC_OTG_BUSDRVDATA(_dev);
-+	struct gadget_wrapper *d;
-+	int retval;
-+
-+	d = DWC_ALLOC(sizeof(*d));
-+	if (d == NULL) {
-+		return NULL;
-+	}
-+
-+	memset(d, 0, sizeof(*d));
-+
-+	d->gadget.name = pcd_name;
-+	d->pcd = otg_dev->pcd;
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
-+	strcpy(d->gadget.dev.bus_id, "gadget");
-+#else
-+	dev_set_name(&d->gadget.dev, "%s", "gadget");
-+#endif
-+
-+	d->gadget.dev.parent = &_dev->dev;
-+	d->gadget.dev.release = dwc_otg_pcd_gadget_release;
-+	d->gadget.ops = &dwc_otg_pcd_ops;
-+	d->gadget.max_speed = dwc_otg_pcd_is_dualspeed(otg_dev->pcd) ? USB_SPEED_HIGH:USB_SPEED_FULL;
-+	d->gadget.is_otg = dwc_otg_pcd_is_otg(otg_dev->pcd);
-+
-+	d->driver = 0;
-+	/* Register the gadget device */
-+	retval = device_register(&d->gadget.dev);
-+	if (retval != 0) {
-+		DWC_ERROR("device_register failed\n");
-+		DWC_FREE(d);
-+		return NULL;
-+	}
-+
-+	return d;
-+}
-+
-+static void free_wrapper(struct gadget_wrapper *d)
-+{
-+	if (d->driver) {
-+		/* should have been done already by driver model core */
-+		DWC_WARN("driver '%s' is still registered\n",
-+			 d->driver->driver.name);
-+#ifdef CONFIG_USB_GADGET
-+		usb_gadget_unregister_driver(d->driver);
-+#endif
-+	}
-+
-+	device_unregister(&d->gadget.dev);
-+	DWC_FREE(d);
-+}
-+
-+/**
-+ * This function initialized the PCD portion of the driver.
-+ *
-+ */
-+int pcd_init(dwc_bus_dev_t *_dev)
-+{
-+	dwc_otg_device_t *otg_dev = DWC_OTG_BUSDRVDATA(_dev);
-+	int retval = 0;
-+
-+	DWC_DEBUGPL(DBG_PCDV, "%s(%p) otg_dev=%p\n", __func__, _dev, otg_dev);
-+
-+	otg_dev->pcd = dwc_otg_pcd_init(otg_dev);
-+
-+	if (!otg_dev->pcd) {
-+		DWC_ERROR("dwc_otg_pcd_init failed\n");
-+		return -ENOMEM;
-+	}
-+
-+	otg_dev->pcd->otg_dev = otg_dev;
-+	gadget_wrapper = alloc_wrapper(_dev);
-+
-+	/*
-+	 * Initialize EP structures
-+	 */
-+	gadget_add_eps(gadget_wrapper);
-+	/*
-+	 * Setup interupt handler
-+	 */
-+	DWC_DEBUGPL(DBG_ANY, "registering handler for irq%d\n",
-+                    otg_dev->os_dep.irq_num);
-+	retval = request_irq(otg_dev->os_dep.irq_num, dwc_otg_pcd_irq,
-+			     IRQF_SHARED, gadget_wrapper->gadget.name,
-+			     otg_dev->pcd);
-+	if (retval != 0) {
-+		DWC_ERROR("request of irq%d failed\n", otg_dev->os_dep.irq_num);
-+		free_wrapper(gadget_wrapper);
-+		return -EBUSY;
-+	}
-+
-+	dwc_otg_pcd_start(gadget_wrapper->pcd, &fops);
-+
-+	return retval;
-+}
-+
-+/**
-+ * Cleanup the PCD.
-+ */
-+void pcd_remove(dwc_bus_dev_t *_dev)
-+{
-+	dwc_otg_device_t *otg_dev = DWC_OTG_BUSDRVDATA(_dev);
-+	dwc_otg_pcd_t *pcd = otg_dev->pcd;
-+
-+	DWC_DEBUGPL(DBG_PCDV, "%s(%p) otg_dev %p\n", __func__, _dev, otg_dev);
-+
-+	/*
-+	 * Free the IRQ
-+	 */
-+	free_irq(otg_dev->os_dep.irq_num, pcd);
-+	dwc_otg_pcd_remove(otg_dev->pcd);
-+	free_wrapper(gadget_wrapper);
-+	otg_dev->pcd = 0;
-+}
-+
-+#endif /* DWC_HOST_ONLY */
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_regs.h
-@@ -0,0 +1,2550 @@
-+/* ==========================================================================
-+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_regs.h $
-+ * $Revision: #98 $
-+ * $Date: 2012/08/10 $
-+ * $Change: 2047372 $
-+ *
-+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
-+ * "Software") is an Unsupported proprietary work of Synopsys, Inc. unless
-+ * otherwise expressly agreed to in writing between Synopsys and you.
-+ *
-+ * The Software IS NOT an item of Licensed Software or Licensed Product under
-+ * any End User Software License Agreement or Agreement for Licensed Product
-+ * with Synopsys or any supplement thereto. You are permitted to use and
-+ * redistribute this Software in source and binary forms, with or without
-+ * modification, provided that redistributions of source code must retain this
-+ * notice. You may not view, use, disclose, copy or distribute this file or
-+ * any information contained herein except pursuant to this license grant from
-+ * Synopsys. If you do not agree with this notice, including the disclaimer
-+ * below, then you are not authorized to use the Software.
-+ *
-+ * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" BASIS
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS BE LIABLE FOR ANY DIRECT,
-+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ * ========================================================================== */
-+
-+#ifndef __DWC_OTG_REGS_H__
-+#define __DWC_OTG_REGS_H__
-+
-+#include "dwc_otg_core_if.h"
-+
-+/**
-+ * @file
-+ *
-+ * This file contains the data structures for accessing the DWC_otg core registers.
-+ *
-+ * The application interfaces with the HS OTG core by reading from and
-+ * writing to the Control and Status Register (CSR) space through the
-+ * AHB Slave interface. These registers are 32 bits wide, and the
-+ * addresses are 32-bit-block aligned.
-+ * CSRs are classified as follows:
-+ * - Core Global Registers
-+ * - Device Mode Registers
-+ * - Device Global Registers
-+ * - Device Endpoint Specific Registers
-+ * - Host Mode Registers
-+ * - Host Global Registers
-+ * - Host Port CSRs
-+ * - Host Channel Specific Registers
-+ *
-+ * Only the Core Global registers can be accessed in both Device and
-+ * Host modes. When the HS OTG core is operating in one mode, either
-+ * Device or Host, the application must not access registers from the
-+ * other mode. When the core switches from one mode to another, the
-+ * registers in the new mode of operation must be reprogrammed as they
-+ * would be after a power-on reset.
-+ */
-+
-+/****************************************************************************/
-+/** DWC_otg Core registers .
-+ * The dwc_otg_core_global_regs structure defines the size
-+ * and relative field offsets for the Core Global registers.
-+ */
-+typedef struct dwc_otg_core_global_regs {
-+	/** OTG Control and Status Register.  <i>Offset: 000h</i> */
-+	volatile uint32_t gotgctl;
-+	/** OTG Interrupt Register.	 <i>Offset: 004h</i> */
-+	volatile uint32_t gotgint;
-+	/**Core AHB Configuration Register.	 <i>Offset: 008h</i> */
-+	volatile uint32_t gahbcfg;
-+
-+#define DWC_GLBINTRMASK		0x0001
-+#define DWC_DMAENABLE		0x0020
-+#define DWC_NPTXEMPTYLVL_EMPTY	0x0080
-+#define DWC_NPTXEMPTYLVL_HALFEMPTY	0x0000
-+#define DWC_PTXEMPTYLVL_EMPTY	0x0100
-+#define DWC_PTXEMPTYLVL_HALFEMPTY	0x0000
-+
-+	/**Core USB Configuration Register.	 <i>Offset: 00Ch</i> */
-+	volatile uint32_t gusbcfg;
-+	/**Core Reset Register.	 <i>Offset: 010h</i> */
-+	volatile uint32_t grstctl;
-+	/**Core Interrupt Register.	 <i>Offset: 014h</i> */
-+	volatile uint32_t gintsts;
-+	/**Core Interrupt Mask Register.  <i>Offset: 018h</i> */
-+	volatile uint32_t gintmsk;
-+	/**Receive Status Queue Read Register (Read Only).	<i>Offset: 01Ch</i> */
-+	volatile uint32_t grxstsr;
-+	/**Receive Status Queue Read & POP Register (Read Only).  <i>Offset: 020h</i>*/
-+	volatile uint32_t grxstsp;
-+	/**Receive FIFO Size Register.	<i>Offset: 024h</i> */
-+	volatile uint32_t grxfsiz;
-+	/**Non Periodic Transmit FIFO Size Register.  <i>Offset: 028h</i> */
-+	volatile uint32_t gnptxfsiz;
-+	/**Non Periodic Transmit FIFO/Queue Status Register (Read
-+	 * Only). <i>Offset: 02Ch</i> */
-+	volatile uint32_t gnptxsts;
-+	/**I2C Access Register.	 <i>Offset: 030h</i> */
-+	volatile uint32_t gi2cctl;
-+	/**PHY Vendor Control Register.	 <i>Offset: 034h</i> */
-+	volatile uint32_t gpvndctl;
-+	/**General Purpose Input/Output Register.  <i>Offset: 038h</i> */
-+	volatile uint32_t ggpio;
-+	/**User ID Register.  <i>Offset: 03Ch</i> */
-+	volatile uint32_t guid;
-+	/**Synopsys ID Register (Read Only).  <i>Offset: 040h</i> */
-+	volatile uint32_t gsnpsid;
-+	/**User HW Config1 Register (Read Only).  <i>Offset: 044h</i> */
-+	volatile uint32_t ghwcfg1;
-+	/**User HW Config2 Register (Read Only).  <i>Offset: 048h</i> */
-+	volatile uint32_t ghwcfg2;
-+#define DWC_SLAVE_ONLY_ARCH 0
-+#define DWC_EXT_DMA_ARCH 1
-+#define DWC_INT_DMA_ARCH 2
-+
-+#define DWC_MODE_HNP_SRP_CAPABLE	0
-+#define DWC_MODE_SRP_ONLY_CAPABLE	1
-+#define DWC_MODE_NO_HNP_SRP_CAPABLE		2
-+#define DWC_MODE_SRP_CAPABLE_DEVICE		3
-+#define DWC_MODE_NO_SRP_CAPABLE_DEVICE	4
-+#define DWC_MODE_SRP_CAPABLE_HOST	5
-+#define DWC_MODE_NO_SRP_CAPABLE_HOST	6
-+
-+	/**User HW Config3 Register (Read Only).  <i>Offset: 04Ch</i> */
-+	volatile uint32_t ghwcfg3;
-+	/**User HW Config4 Register (Read Only).  <i>Offset: 050h</i>*/
-+	volatile uint32_t ghwcfg4;
-+	/** Core LPM Configuration register <i>Offset: 054h</i>*/
-+	volatile uint32_t glpmcfg;
-+	/** Global PowerDn Register <i>Offset: 058h</i> */
-+	volatile uint32_t gpwrdn;
-+	/** Global DFIFO SW Config Register  <i>Offset: 05Ch</i> */
-+	volatile uint32_t gdfifocfg;
-+	/** ADP Control Register  <i>Offset: 060h</i> */
-+	volatile uint32_t adpctl;
-+	/** Reserved  <i>Offset: 064h-0FFh</i> */
-+	volatile uint32_t reserved39[39];
-+	/** Host Periodic Transmit FIFO Size Register. <i>Offset: 100h</i> */
-+	volatile uint32_t hptxfsiz;
-+	/** Device Periodic Transmit FIFO#n Register if dedicated fifos are disabled,
-+		otherwise Device Transmit FIFO#n Register.
-+	 * <i>Offset: 104h + (FIFO_Number-1)*04h, 1 <= FIFO Number <= 15 (1<=n<=15).</i> */
-+	volatile uint32_t dtxfsiz[15];
-+} dwc_otg_core_global_regs_t;
-+
-+/**
-+ * This union represents the bit fields of the Core OTG Control
-+ * and Status Register (GOTGCTL).  Set the bits using the bit
-+ * fields then write the <i>d32</i> value to the register.
-+ */
-+typedef union gotgctl_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		unsigned sesreqscs:1;
-+		unsigned sesreq:1;
-+		unsigned vbvalidoven:1;
-+		unsigned vbvalidovval:1;
-+		unsigned avalidoven:1;
-+		unsigned avalidovval:1;
-+		unsigned bvalidoven:1;
-+		unsigned bvalidovval:1;
-+		unsigned hstnegscs:1;
-+		unsigned hnpreq:1;
-+		unsigned hstsethnpen:1;
-+		unsigned devhnpen:1;
-+		unsigned reserved12_15:4;
-+		unsigned conidsts:1;
-+		unsigned dbnctime:1;
-+		unsigned asesvld:1;
-+		unsigned bsesvld:1;
-+		unsigned otgver:1;
-+		unsigned reserved1:1;
-+		unsigned multvalidbc:5;
-+		unsigned chirpen:1;
-+		unsigned reserved28_31:4;
-+	} b;
-+} gotgctl_data_t;
-+
-+/**
-+ * This union represents the bit fields of the Core OTG Interrupt Register
-+ * (GOTGINT).  Set/clear the bits using the bit fields then write the <i>d32</i>
-+ * value to the register.
-+ */
-+typedef union gotgint_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		/** Current Mode */
-+		unsigned reserved0_1:2;
-+
-+		/** Session End Detected */
-+		unsigned sesenddet:1;
-+
-+		unsigned reserved3_7:5;
-+
-+		/** Session Request Success Status Change */
-+		unsigned sesreqsucstschng:1;
-+		/** Host Negotiation Success Status Change */
-+		unsigned hstnegsucstschng:1;
-+
-+		unsigned reserved10_16:7;
-+
-+		/** Host Negotiation Detected */
-+		unsigned hstnegdet:1;
-+		/** A-Device Timeout Change */
-+		unsigned adevtoutchng:1;
-+		/** Debounce Done */
-+		unsigned debdone:1;
-+		/** Multi-Valued input changed */
-+		unsigned mvic:1;
-+
-+		unsigned reserved31_21:11;
-+
-+	} b;
-+} gotgint_data_t;
-+
-+/**
-+ * This union represents the bit fields of the Core AHB Configuration
-+ * Register (GAHBCFG). Set/clear the bits using the bit fields then
-+ * write the <i>d32</i> value to the register.
-+ */
-+typedef union gahbcfg_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		unsigned glblintrmsk:1;
-+#define DWC_GAHBCFG_GLBINT_ENABLE		1
-+
-+		unsigned hburstlen:4;
-+#define DWC_GAHBCFG_INT_DMA_BURST_SINGLE	0
-+#define DWC_GAHBCFG_INT_DMA_BURST_INCR		1
-+#define DWC_GAHBCFG_INT_DMA_BURST_INCR4		3
-+#define DWC_GAHBCFG_INT_DMA_BURST_INCR8		5
-+#define DWC_GAHBCFG_INT_DMA_BURST_INCR16	7
-+
-+		unsigned dmaenable:1;
-+#define DWC_GAHBCFG_DMAENABLE			1
-+		unsigned reserved:1;
-+		unsigned nptxfemplvl_txfemplvl:1;
-+		unsigned ptxfemplvl:1;
-+#define DWC_GAHBCFG_TXFEMPTYLVL_EMPTY		1
-+#define DWC_GAHBCFG_TXFEMPTYLVL_HALFEMPTY	0
-+		unsigned reserved9_20:12;
-+		unsigned remmemsupp:1;
-+		unsigned notialldmawrit:1;
-+		unsigned ahbsingle:1;
-+		unsigned reserved24_31:8;
-+	} b;
-+} gahbcfg_data_t;
-+
-+/**
-+ * This union represents the bit fields of the Core USB Configuration
-+ * Register (GUSBCFG). Set the bits using the bit fields then write
-+ * the <i>d32</i> value to the register.
-+ */
-+typedef union gusbcfg_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		unsigned toutcal:3;
-+		unsigned phyif:1;
-+		unsigned ulpi_utmi_sel:1;
-+		unsigned fsintf:1;
-+		unsigned physel:1;
-+		unsigned ddrsel:1;
-+		unsigned srpcap:1;
-+		unsigned hnpcap:1;
-+		unsigned usbtrdtim:4;
-+		unsigned reserved1:1;
-+		unsigned phylpwrclksel:1;
-+		unsigned otgutmifssel:1;
-+		unsigned ulpi_fsls:1;
-+		unsigned ulpi_auto_res:1;
-+		unsigned ulpi_clk_sus_m:1;
-+		unsigned ulpi_ext_vbus_drv:1;
-+		unsigned ulpi_int_vbus_indicator:1;
-+		unsigned term_sel_dl_pulse:1;
-+		unsigned indicator_complement:1;
-+		unsigned indicator_pass_through:1;
-+		unsigned ulpi_int_prot_dis:1;
-+		unsigned ic_usb_cap:1;
-+		unsigned ic_traffic_pull_remove:1;
-+		unsigned tx_end_delay:1;
-+		unsigned force_host_mode:1;
-+		unsigned force_dev_mode:1;
-+		unsigned reserved31:1;
-+	} b;
-+} gusbcfg_data_t;
-+
-+/**
-+ * This union represents the bit fields of the Core Reset Register
-+ * (GRSTCTL).  Set/clear the bits using the bit fields then write the
-+ * <i>d32</i> value to the register.
-+ */
-+typedef union grstctl_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		/** Core Soft Reset (CSftRst) (Device and Host)
-+		 *
-+		 * The application can flush the control logic in the
-+		 * entire core using this bit. This bit resets the
-+		 * pipelines in the AHB Clock domain as well as the
-+		 * PHY Clock domain.
-+		 *
-+		 * The state machines are reset to an IDLE state, the
-+		 * control bits in the CSRs are cleared, all the
-+		 * transmit FIFOs and the receive FIFO are flushed.
-+		 *
-+		 * The status mask bits that control the generation of
-+		 * the interrupt, are cleared, to clear the
-+		 * interrupt. The interrupt status bits are not
-+		 * cleared, so the application can get the status of
-+		 * any events that occurred in the core after it has
-+		 * set this bit.
-+		 *
-+		 * Any transactions on the AHB are terminated as soon
-+		 * as possible following the protocol. Any
-+		 * transactions on the USB are terminated immediately.
-+		 *
-+		 * The configuration settings in the CSRs are
-+		 * unchanged, so the software doesn't have to
-+		 * reprogram these registers (Device
-+		 * Configuration/Host Configuration/Core System
-+		 * Configuration/Core PHY Configuration).
-+		 *
-+		 * The application can write to this bit, any time it
-+		 * wants to reset the core. This is a self clearing
-+		 * bit and the core clears this bit after all the
-+		 * necessary logic is reset in the core, which may
-+		 * take several clocks, depending on the current state
-+		 * of the core.
-+		 */
-+		unsigned csftrst:1;
-+		/** Hclk Soft Reset
-+		 *
-+		 * The application uses this bit to reset the control logic in
-+		 * the AHB clock domain. Only AHB clock domain pipelines are
-+		 * reset.
-+		 */
-+		unsigned hsftrst:1;
-+		/** Host Frame Counter Reset (Host Only)<br>
-+		 *
-+		 * The application can reset the (micro)frame number
-+		 * counter inside the core, using this bit. When the
-+		 * (micro)frame counter is reset, the subsequent SOF
-+		 * sent out by the core, will have a (micro)frame
-+		 * number of 0.
-+		 */
-+		unsigned hstfrm:1;
-+		/** In Token Sequence Learning Queue Flush
-+		 * (INTknQFlsh) (Device Only)
-+		 */
-+		unsigned intknqflsh:1;
-+		/** RxFIFO Flush (RxFFlsh) (Device and Host)
-+		 *
-+		 * The application can flush the entire Receive FIFO
-+		 * using this bit. The application must first
-+		 * ensure that the core is not in the middle of a
-+		 * transaction. The application should write into
-+		 * this bit, only after making sure that neither the
-+		 * DMA engine is reading from the RxFIFO nor the MAC
-+		 * is writing the data in to the FIFO. The
-+		 * application should wait until the bit is cleared
-+		 * before performing any other operations. This bit
-+		 * will takes 8 clocks (slowest of PHY or AHB clock)
-+		 * to clear.
-+		 */
-+		unsigned rxfflsh:1;
-+		/** TxFIFO Flush (TxFFlsh) (Device and Host).
-+		 *
-+		 * This bit is used to selectively flush a single or
-+		 * all transmit FIFOs. The application must first
-+		 * ensure that the core is not in the middle of a
-+		 * transaction. The application should write into
-+		 * this bit, only after making sure that neither the
-+		 * DMA engine is writing into the TxFIFO nor the MAC
-+		 * is reading the data out of the FIFO. The
-+		 * application should wait until the core clears this
-+		 * bit, before performing any operations. This bit
-+		 * will takes 8 clocks (slowest of PHY or AHB clock)
-+		 * to clear.
-+		 */
-+		unsigned txfflsh:1;
-+
-+		/** TxFIFO Number (TxFNum) (Device and Host).
-+		 *
-+		 * This is the FIFO number which needs to be flushed,
-+		 * using the TxFIFO Flush bit. This field should not
-+		 * be changed until the TxFIFO Flush bit is cleared by
-+		 * the core.
-+		 *	 - 0x0 : Non Periodic TxFIFO Flush
-+		 *	 - 0x1 : Periodic TxFIFO #1 Flush in device mode
-+		 *	   or Periodic TxFIFO in host mode
-+		 *	 - 0x2 : Periodic TxFIFO #2 Flush in device mode.
-+		 *	 - ...
-+		 *	 - 0xF : Periodic TxFIFO #15 Flush in device mode
-+		 *	 - 0x10: Flush all the Transmit NonPeriodic and
-+		 *	   Transmit Periodic FIFOs in the core
-+		 */
-+		unsigned txfnum:5;
-+		/** Reserved */
-+		unsigned reserved11_29:19;
-+		/** DMA Request Signal.	 Indicated DMA request is in
-+		 * probress. Used for debug purpose. */
-+		unsigned dmareq:1;
-+		/** AHB Master Idle.  Indicates the AHB Master State
-+		 * Machine is in IDLE condition. */
-+		unsigned ahbidle:1;
-+	} b;
-+} grstctl_t;
-+
-+/**
-+ * This union represents the bit fields of the Core Interrupt Mask
-+ * Register (GINTMSK). Set/clear the bits using the bit fields then
-+ * write the <i>d32</i> value to the register.
-+ */
-+typedef union gintmsk_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		unsigned reserved0:1;
-+		unsigned modemismatch:1;
-+		unsigned otgintr:1;
-+		unsigned sofintr:1;
-+		unsigned rxstsqlvl:1;
-+		unsigned nptxfempty:1;
-+		unsigned ginnakeff:1;
-+		unsigned goutnakeff:1;
-+		unsigned ulpickint:1;
-+		unsigned i2cintr:1;
-+		unsigned erlysuspend:1;
-+		unsigned usbsuspend:1;
-+		unsigned usbreset:1;
-+		unsigned enumdone:1;
-+		unsigned isooutdrop:1;
-+		unsigned eopframe:1;
-+		unsigned restoredone:1;
-+		unsigned epmismatch:1;
-+		unsigned inepintr:1;
-+		unsigned outepintr:1;
-+		unsigned incomplisoin:1;
-+		unsigned incomplisoout:1;
-+		unsigned fetsusp:1;
-+		unsigned resetdet:1;
-+		unsigned portintr:1;
-+		unsigned hcintr:1;
-+		unsigned ptxfempty:1;
-+		unsigned lpmtranrcvd:1;
-+		unsigned conidstschng:1;
-+		unsigned disconnect:1;
-+		unsigned sessreqintr:1;
-+		unsigned wkupintr:1;
-+	} b;
-+} gintmsk_data_t;
-+/**
-+ * This union represents the bit fields of the Core Interrupt Register
-+ * (GINTSTS).  Set/clear the bits using the bit fields then write the
-+ * <i>d32</i> value to the register.
-+ */
-+typedef union gintsts_data {
-+	/** raw register data */
-+	uint32_t d32;
-+#define DWC_SOF_INTR_MASK 0x0008
-+	/** register bits */
-+	struct {
-+#define DWC_HOST_MODE 1
-+		unsigned curmode:1;
-+		unsigned modemismatch:1;
-+		unsigned otgintr:1;
-+		unsigned sofintr:1;
-+		unsigned rxstsqlvl:1;
-+		unsigned nptxfempty:1;
-+		unsigned ginnakeff:1;
-+		unsigned goutnakeff:1;
-+		unsigned ulpickint:1;
-+		unsigned i2cintr:1;
-+		unsigned erlysuspend:1;
-+		unsigned usbsuspend:1;
-+		unsigned usbreset:1;
-+		unsigned enumdone:1;
-+		unsigned isooutdrop:1;
-+		unsigned eopframe:1;
-+		unsigned restoredone:1;
-+		unsigned epmismatch:1;
-+		unsigned inepint:1;
-+		unsigned outepintr:1;
-+		unsigned incomplisoin:1;
-+		unsigned incomplisoout:1;
-+		unsigned fetsusp:1;
-+		unsigned resetdet:1;
-+		unsigned portintr:1;
-+		unsigned hcintr:1;
-+		unsigned ptxfempty:1;
-+		unsigned lpmtranrcvd:1;
-+		unsigned conidstschng:1;
-+		unsigned disconnect:1;
-+		unsigned sessreqintr:1;
-+		unsigned wkupintr:1;
-+	} b;
-+} gintsts_data_t;
-+
-+/**
-+ * This union represents the bit fields in the Device Receive Status Read and
-+ * Pop Registers (GRXSTSR, GRXSTSP) Read the register into the <i>d32</i>
-+ * element then read out the bits using the <i>b</i>it elements.
-+ */
-+typedef union device_grxsts_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		unsigned epnum:4;
-+		unsigned bcnt:11;
-+		unsigned dpid:2;
-+
-+#define DWC_STS_DATA_UPDT		0x2	// OUT Data Packet
-+#define DWC_STS_XFER_COMP		0x3	// OUT Data Transfer Complete
-+
-+#define DWC_DSTS_GOUT_NAK		0x1	// Global OUT NAK
-+#define DWC_DSTS_SETUP_COMP		0x4	// Setup Phase Complete
-+#define DWC_DSTS_SETUP_UPDT 0x6	// SETUP Packet
-+		unsigned pktsts:4;
-+		unsigned fn:4;
-+		unsigned reserved25_31:7;
-+	} b;
-+} device_grxsts_data_t;
-+
-+/**
-+ * This union represents the bit fields in the Host Receive Status Read and
-+ * Pop Registers (GRXSTSR, GRXSTSP) Read the register into the <i>d32</i>
-+ * element then read out the bits using the <i>b</i>it elements.
-+ */
-+typedef union host_grxsts_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		unsigned chnum:4;
-+		unsigned bcnt:11;
-+		unsigned dpid:2;
-+
-+		unsigned pktsts:4;
-+#define DWC_GRXSTS_PKTSTS_IN			  0x2
-+#define DWC_GRXSTS_PKTSTS_IN_XFER_COMP	  0x3
-+#define DWC_GRXSTS_PKTSTS_DATA_TOGGLE_ERR 0x5
-+#define DWC_GRXSTS_PKTSTS_CH_HALTED		  0x7
-+
-+		unsigned reserved21_31:11;
-+	} b;
-+} host_grxsts_data_t;
-+
-+/**
-+ * This union represents the bit fields in the FIFO Size Registers (HPTXFSIZ,
-+ * GNPTXFSIZ, DPTXFSIZn, DIEPTXFn). Read the register into the <i>d32</i> element
-+ * then read out the bits using the <i>b</i>it elements.
-+ */
-+typedef union fifosize_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		unsigned startaddr:16;
-+		unsigned depth:16;
-+	} b;
-+} fifosize_data_t;
-+
-+/**
-+ * This union represents the bit fields in the Non-Periodic Transmit
-+ * FIFO/Queue Status Register (GNPTXSTS). Read the register into the
-+ * <i>d32</i> element then read out the bits using the <i>b</i>it
-+ * elements.
-+ */
-+typedef union gnptxsts_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		unsigned nptxfspcavail:16;
-+		unsigned nptxqspcavail:8;
-+		/** Top of the Non-Periodic Transmit Request Queue
-+		 *	- bit 24 - Terminate (Last entry for the selected
-+		 *	  channel/EP)
-+		 *	- bits 26:25 - Token Type
-+		 *	  - 2'b00 - IN/OUT
-+		 *	  - 2'b01 - Zero Length OUT
-+		 *	  - 2'b10 - PING/Complete Split
-+		 *	  - 2'b11 - Channel Halt
-+		 *	- bits 30:27 - Channel/EP Number
-+		 */
-+		unsigned nptxqtop_terminate:1;
-+		unsigned nptxqtop_token:2;
-+		unsigned nptxqtop_chnep:4;
-+		unsigned reserved:1;
-+	} b;
-+} gnptxsts_data_t;
-+
-+/**
-+ * This union represents the bit fields in the Transmit
-+ * FIFO Status Register (DTXFSTS). Read the register into the
-+ * <i>d32</i> element then read out the bits using the <i>b</i>it
-+ * elements.
-+ */
-+typedef union dtxfsts_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		unsigned txfspcavail:16;
-+		unsigned reserved:16;
-+	} b;
-+} dtxfsts_data_t;
-+
-+/**
-+ * This union represents the bit fields in the I2C Control Register
-+ * (I2CCTL). Read the register into the <i>d32</i> element then read out the
-+ * bits using the <i>b</i>it elements.
-+ */
-+typedef union gi2cctl_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		unsigned rwdata:8;
-+		unsigned regaddr:8;
-+		unsigned addr:7;
-+		unsigned i2cen:1;
-+		unsigned ack:1;
-+		unsigned i2csuspctl:1;
-+		unsigned i2cdevaddr:2;
-+		unsigned i2cdatse0:1;
-+		unsigned reserved:1;
-+		unsigned rw:1;
-+		unsigned bsydne:1;
-+	} b;
-+} gi2cctl_data_t;
-+
-+/**
-+ * This union represents the bit fields in the PHY Vendor Control Register
-+ * (GPVNDCTL). Read the register into the <i>d32</i> element then read out the
-+ * bits using the <i>b</i>it elements.
-+ */
-+typedef union gpvndctl_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		unsigned regdata:8;
-+		unsigned vctrl:8;
-+		unsigned regaddr16_21:6;
-+		unsigned regwr:1;
-+		unsigned reserved23_24:2;
-+		unsigned newregreq:1;
-+		unsigned vstsbsy:1;
-+		unsigned vstsdone:1;
-+		unsigned reserved28_30:3;
-+		unsigned disulpidrvr:1;
-+	} b;
-+} gpvndctl_data_t;
-+
-+/**
-+ * This union represents the bit fields in the General Purpose
-+ * Input/Output Register (GGPIO).
-+ * Read the register into the <i>d32</i> element then read out the
-+ * bits using the <i>b</i>it elements.
-+ */
-+typedef union ggpio_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		unsigned gpi:16;
-+		unsigned gpo:16;
-+	} b;
-+} ggpio_data_t;
-+
-+/**
-+ * This union represents the bit fields in the User ID Register
-+ * (GUID). Read the register into the <i>d32</i> element then read out the
-+ * bits using the <i>b</i>it elements.
-+ */
-+typedef union guid_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		unsigned rwdata:32;
-+	} b;
-+} guid_data_t;
-+
-+/**
-+ * This union represents the bit fields in the Synopsys ID Register
-+ * (GSNPSID). Read the register into the <i>d32</i> element then read out the
-+ * bits using the <i>b</i>it elements.
-+ */
-+typedef union gsnpsid_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		unsigned rwdata:32;
-+	} b;
-+} gsnpsid_data_t;
-+
-+/**
-+ * This union represents the bit fields in the User HW Config1
-+ * Register.  Read the register into the <i>d32</i> element then read
-+ * out the bits using the <i>b</i>it elements.
-+ */
-+typedef union hwcfg1_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		unsigned ep_dir0:2;
-+		unsigned ep_dir1:2;
-+		unsigned ep_dir2:2;
-+		unsigned ep_dir3:2;
-+		unsigned ep_dir4:2;
-+		unsigned ep_dir5:2;
-+		unsigned ep_dir6:2;
-+		unsigned ep_dir7:2;
-+		unsigned ep_dir8:2;
-+		unsigned ep_dir9:2;
-+		unsigned ep_dir10:2;
-+		unsigned ep_dir11:2;
-+		unsigned ep_dir12:2;
-+		unsigned ep_dir13:2;
-+		unsigned ep_dir14:2;
-+		unsigned ep_dir15:2;
-+	} b;
-+} hwcfg1_data_t;
-+
-+/**
-+ * This union represents the bit fields in the User HW Config2
-+ * Register.  Read the register into the <i>d32</i> element then read
-+ * out the bits using the <i>b</i>it elements.
-+ */
-+typedef union hwcfg2_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		/* GHWCFG2 */
-+		unsigned op_mode:3;
-+#define DWC_HWCFG2_OP_MODE_HNP_SRP_CAPABLE_OTG 0
-+#define DWC_HWCFG2_OP_MODE_SRP_ONLY_CAPABLE_OTG 1
-+#define DWC_HWCFG2_OP_MODE_NO_HNP_SRP_CAPABLE_OTG 2
-+#define DWC_HWCFG2_OP_MODE_SRP_CAPABLE_DEVICE 3
-+#define DWC_HWCFG2_OP_MODE_NO_SRP_CAPABLE_DEVICE 4
-+#define DWC_HWCFG2_OP_MODE_SRP_CAPABLE_HOST 5
-+#define DWC_HWCFG2_OP_MODE_NO_SRP_CAPABLE_HOST 6
-+
-+		unsigned architecture:2;
-+		unsigned point2point:1;
-+		unsigned hs_phy_type:2;
-+#define DWC_HWCFG2_HS_PHY_TYPE_NOT_SUPPORTED 0
-+#define DWC_HWCFG2_HS_PHY_TYPE_UTMI 1
-+#define DWC_HWCFG2_HS_PHY_TYPE_ULPI 2
-+#define DWC_HWCFG2_HS_PHY_TYPE_UTMI_ULPI 3
-+
-+		unsigned fs_phy_type:2;
-+		unsigned num_dev_ep:4;
-+		unsigned num_host_chan:4;
-+		unsigned perio_ep_supported:1;
-+		unsigned dynamic_fifo:1;
-+		unsigned multi_proc_int:1;
-+		unsigned reserved21:1;
-+		unsigned nonperio_tx_q_depth:2;
-+		unsigned host_perio_tx_q_depth:2;
-+		unsigned dev_token_q_depth:5;
-+		unsigned otg_enable_ic_usb:1;
-+	} b;
-+} hwcfg2_data_t;
-+
-+/**
-+ * This union represents the bit fields in the User HW Config3
-+ * Register.  Read the register into the <i>d32</i> element then read
-+ * out the bits using the <i>b</i>it elements.
-+ */
-+typedef union hwcfg3_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		/* GHWCFG3 */
-+		unsigned xfer_size_cntr_width:4;
-+		unsigned packet_size_cntr_width:3;
-+		unsigned otg_func:1;
-+		unsigned i2c:1;
-+		unsigned vendor_ctrl_if:1;
-+		unsigned optional_features:1;
-+		unsigned synch_reset_type:1;
-+		unsigned adp_supp:1;
-+		unsigned otg_enable_hsic:1;
-+		unsigned bc_support:1;
-+		unsigned otg_lpm_en:1;
-+		unsigned dfifo_depth:16;
-+	} b;
-+} hwcfg3_data_t;
-+
-+/**
-+ * This union represents the bit fields in the User HW Config4
-+ * Register.  Read the register into the <i>d32</i> element then read
-+ * out the bits using the <i>b</i>it elements.
-+ */
-+typedef union hwcfg4_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		unsigned num_dev_perio_in_ep:4;
-+		unsigned power_optimiz:1;
-+		unsigned min_ahb_freq:1;
-+		unsigned hiber:1;
-+		unsigned xhiber:1;
-+		unsigned reserved:6;
-+		unsigned utmi_phy_data_width:2;
-+		unsigned num_dev_mode_ctrl_ep:4;
-+		unsigned iddig_filt_en:1;
-+		unsigned vbus_valid_filt_en:1;
-+		unsigned a_valid_filt_en:1;
-+		unsigned b_valid_filt_en:1;
-+		unsigned session_end_filt_en:1;
-+		unsigned ded_fifo_en:1;
-+		unsigned num_in_eps:4;
-+		unsigned desc_dma:1;
-+		unsigned desc_dma_dyn:1;
-+	} b;
-+} hwcfg4_data_t;
-+
-+/**
-+ * This union represents the bit fields of the Core LPM Configuration
-+ * Register (GLPMCFG). Set the bits using bit fields then write
-+ * the <i>d32</i> value to the register.
-+ */
-+typedef union glpmctl_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		/** LPM-Capable (LPMCap) (Device and Host)
-+		 * The application uses this bit to control
-+		 * the DWC_otg core LPM capabilities.
-+		 */
-+		unsigned lpm_cap_en:1;
-+		/** LPM response programmed by application (AppL1Res) (Device)
-+		 * Handshake response to LPM token pre-programmed
-+		 * by device application software.
-+		 */
-+		unsigned appl_resp:1;
-+		/** Host Initiated Resume Duration (HIRD) (Device and Host)
-+		 * In Host mode this field indicates the value of HIRD
-+		 * to be sent in an LPM transaction.
-+		 * In Device mode this field is updated with the
-+		 * Received LPM Token HIRD bmAttribute
-+		 * when an ACK/NYET/STALL response is sent
-+		 * to an LPM transaction.
-+		 */
-+		unsigned hird:4;
-+		/** RemoteWakeEnable (bRemoteWake) (Device and Host)
-+		 * In Host mode this bit indicates the value of remote
-+		 * wake up to be sent in wIndex field of LPM transaction.
-+		 * In Device mode this field is updated with the
-+		 * Received LPM Token bRemoteWake bmAttribute
-+		 * when an ACK/NYET/STALL response is sent
-+		 * to an LPM transaction.
-+		 */
-+		unsigned rem_wkup_en:1;
-+		/** Enable utmi_sleep_n (EnblSlpM) (Device and Host)
-+		 * The application uses this bit to control
-+		 * the utmi_sleep_n assertion to the PHY when in L1 state.
-+		 */
-+		unsigned en_utmi_sleep:1;
-+		/** HIRD Threshold (HIRD_Thres) (Device and Host)
-+		 */
-+		unsigned hird_thres:5;
-+		/** LPM Response (CoreL1Res) (Device and Host)
-+		 * In Host mode this bit contains handsake response to
-+		 * LPM transaction.
-+		 * In Device mode the response of the core to
-+		 * LPM transaction received is reflected in these two bits.
-+			- 0x0 : ERROR (No handshake response)
-+			- 0x1 : STALL
-+			- 0x2 : NYET
-+			- 0x3 : ACK
-+		 */
-+		unsigned lpm_resp:2;
-+		/** Port Sleep Status (SlpSts) (Device and Host)
-+		 * This bit is set as long as a Sleep condition
-+		 * is present on the USB bus.
-+		 */
-+		unsigned prt_sleep_sts:1;
-+		/** Sleep State Resume OK (L1ResumeOK) (Device and Host)
-+		 * Indicates that the application or host
-+		 * can start resume from Sleep state.
-+		 */
-+		unsigned sleep_state_resumeok:1;
-+		/** LPM channel Index (LPM_Chnl_Indx) (Host)
-+		 * The channel number on which the LPM transaction
-+		 * has to be applied while sending
-+		 * an LPM transaction to the local device.
-+		 */
-+		unsigned lpm_chan_index:4;
-+		/** LPM Retry Count (LPM_Retry_Cnt) (Host)
-+		 * Number host retries that would be performed
-+		 * if the device response was not valid response.
-+		 */
-+		unsigned retry_count:3;
-+		/** Send LPM Transaction (SndLPM) (Host)
-+		 * When set by application software,
-+		 * an LPM transaction containing two tokens
-+		 * is sent.
-+		 */
-+		unsigned send_lpm:1;
-+		/** LPM Retry status (LPM_RetryCnt_Sts) (Host)
-+		 * Number of LPM Host Retries still remaining
-+		 * to be transmitted for the current LPM sequence
-+		 */
-+		unsigned retry_count_sts:3;
-+		unsigned reserved28_29:2;
-+		/** In host mode once this bit is set, the host
-+		 * configures to drive the HSIC Idle state on the bus.
-+		 * It then waits for the  device to initiate the Connect sequence.
-+		 * In device mode once this bit is set, the device waits for
-+		 * the HSIC Idle line state on the bus. Upon receving the Idle
-+		 * line state, it initiates the HSIC Connect sequence.
-+		 */
-+		unsigned hsic_connect:1;
-+		/** This bit overrides and functionally inverts
-+		 * the if_select_hsic input port signal.
-+		 */
-+		unsigned inv_sel_hsic:1;
-+	} b;
-+} glpmcfg_data_t;
-+
-+/**
-+ * This union represents the bit fields of the Core ADP Timer, Control and
-+ * Status Register (ADPTIMCTLSTS). Set the bits using bit fields then write
-+ * the <i>d32</i> value to the register.
-+ */
-+typedef union adpctl_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		/** Probe Discharge (PRB_DSCHG)
-+		 *  These bits set the times for TADP_DSCHG.
-+		 *  These bits are defined as follows:
-+		 *  2'b00 - 4 msec
-+		 *  2'b01 - 8 msec
-+		 *  2'b10 - 16 msec
-+		 *  2'b11 - 32 msec
-+		 */
-+		unsigned prb_dschg:2;
-+		/** Probe Delta (PRB_DELTA)
-+		 *  These bits set the resolution for RTIM   value.
-+		 *  The bits are defined in units of 32 kHz clock cycles as follows:
-+		 *  2'b00  -  1 cycles
-+		 *  2'b01  -  2 cycles
-+		 *  2'b10 -  3 cycles
-+		 *  2'b11 - 4 cycles
-+		 *  For example if this value is chosen to 2'b01, it means that RTIM
-+		 *  increments for every 3(three) 32Khz clock cycles.
-+		 */
-+		unsigned prb_delta:2;
-+		/** Probe Period (PRB_PER)
-+		 *  These bits sets the TADP_PRD as shown in Figure 4 as follows:
-+		 *  2'b00  -  0.625 to 0.925 sec (typical 0.775 sec)
-+		 *  2'b01  -  1.25 to 1.85 sec (typical 1.55 sec)
-+		 *  2'b10  -  1.9 to 2.6 sec (typical 2.275 sec)
-+		 *  2'b11  -  Reserved
-+		 */
-+		unsigned prb_per:2;
-+		/** These bits capture the latest time it took for VBUS to ramp from
-+		 *  VADP_SINK to VADP_PRB.
-+		 *  0x000  -  1 cycles
-+		 *  0x001  -  2 cycles
-+		 *  0x002  -  3 cycles
-+		 *  etc
-+		 *  0x7FF  -  2048 cycles
-+		 *  A time of 1024 cycles at 32 kHz corresponds to a time of 32 msec.
-+		*/
-+		unsigned rtim:11;
-+		/** Enable Probe (EnaPrb)
-+		 *  When programmed to 1'b1, the core performs a probe operation.
-+		 *  This bit is valid only if OTG_Ver = 1'b1.
-+		 */
-+		unsigned enaprb:1;
-+		/** Enable Sense (EnaSns)
-+		 *  When programmed to 1'b1, the core performs a Sense operation.
-+		 *  This bit is valid only if OTG_Ver = 1'b1.
-+		 */
-+		unsigned enasns:1;
-+		/** ADP Reset (ADPRes)
-+		 *  When set, ADP controller is reset.
-+		 *  This bit is valid only if OTG_Ver = 1'b1.
-+		 */
-+		unsigned adpres:1;
-+		/** ADP Enable (ADPEn)
-+		 *  When set, the core performs either ADP probing or sensing
-+		 *  based on EnaPrb or EnaSns.
-+		 *  This bit is valid only if OTG_Ver = 1'b1.
-+		 */
-+		unsigned adpen:1;
-+		/** ADP Probe Interrupt (ADP_PRB_INT)
-+		 *  When this bit is set, it means that the VBUS
-+		 *  voltage is greater than VADP_PRB or VADP_PRB is reached.
-+		 *  This bit is valid only if OTG_Ver = 1'b1.
-+		 */
-+		unsigned adp_prb_int:1;
-+		/**
-+		 *  ADP Sense Interrupt (ADP_SNS_INT)
-+		 *  When this bit is set, it means that the VBUS voltage is greater than
-+		 *  VADP_SNS value or VADP_SNS is reached.
-+		 *  This bit is valid only if OTG_Ver = 1'b1.
-+		 */
-+		unsigned adp_sns_int:1;
-+		/** ADP Tomeout Interrupt (ADP_TMOUT_INT)
-+		 *  This bit is relevant only for an ADP probe.
-+		 *  When this bit is set, it means that the ramp time has
-+		 *  completed ie ADPCTL.RTIM has reached its terminal value
-+		 *  of 0x7FF.  This is a debug feature that allows software
-+		 *  to read the ramp time after each cycle.
-+		 *  This bit is valid only if OTG_Ver = 1'b1.
-+		 */
-+		unsigned adp_tmout_int:1;
-+		/** ADP Probe Interrupt Mask (ADP_PRB_INT_MSK)
-+		 *  When this bit is set, it unmasks the interrupt due to ADP_PRB_INT.
-+		 *  This bit is valid only if OTG_Ver = 1'b1.
-+		 */
-+		unsigned adp_prb_int_msk:1;
-+		/** ADP Sense Interrupt Mask (ADP_SNS_INT_MSK)
-+		 *  When this bit is set, it unmasks the interrupt due to ADP_SNS_INT.
-+		 *  This bit is valid only if OTG_Ver = 1'b1.
-+		 */
-+		unsigned adp_sns_int_msk:1;
-+		/** ADP Timoeout Interrupt Mask (ADP_TMOUT_MSK)
-+		 *  When this bit is set, it unmasks the interrupt due to ADP_TMOUT_INT.
-+		 *  This bit is valid only if OTG_Ver = 1'b1.
-+		 */
-+		unsigned adp_tmout_int_msk:1;
-+		/** Access Request
-+		 * 2'b00 - Read/Write Valid (updated by the core)
-+		 * 2'b01 - Read
-+		 * 2'b00 - Write
-+		 * 2'b00 - Reserved
-+		 */
-+		unsigned ar:2;
-+		 /** Reserved */
-+		unsigned reserved29_31:3;
-+	} b;
-+} adpctl_data_t;
-+
-+////////////////////////////////////////////
-+// Device Registers
-+/**
-+ * Device Global Registers. <i>Offsets 800h-BFFh</i>
-+ *
-+ * The following structures define the size and relative field offsets
-+ * for the Device Mode Registers.
-+ *
-+ * <i>These registers are visible only in Device mode and must not be
-+ * accessed in Host mode, as the results are unknown.</i>
-+ */
-+typedef struct dwc_otg_dev_global_regs {
-+	/** Device Configuration Register. <i>Offset 800h</i> */
-+	volatile uint32_t dcfg;
-+	/** Device Control Register. <i>Offset: 804h</i> */
-+	volatile uint32_t dctl;
-+	/** Device Status Register (Read Only). <i>Offset: 808h</i> */
-+	volatile uint32_t dsts;
-+	/** Reserved. <i>Offset: 80Ch</i> */
-+	uint32_t unused;
-+	/** Device IN Endpoint Common Interrupt Mask
-+	 * Register. <i>Offset: 810h</i> */
-+	volatile uint32_t diepmsk;
-+	/** Device OUT Endpoint Common Interrupt Mask
-+	 * Register. <i>Offset: 814h</i> */
-+	volatile uint32_t doepmsk;
-+	/** Device All Endpoints Interrupt Register.  <i>Offset: 818h</i> */
-+	volatile uint32_t daint;
-+	/** Device All Endpoints Interrupt Mask Register.  <i>Offset:
-+	 * 81Ch</i> */
-+	volatile uint32_t daintmsk;
-+	/** Device IN Token Queue Read Register-1 (Read Only).
-+	 * <i>Offset: 820h</i> */
-+	volatile uint32_t dtknqr1;
-+	/** Device IN Token Queue Read Register-2 (Read Only).
-+	 * <i>Offset: 824h</i> */
-+	volatile uint32_t dtknqr2;
-+	/** Device VBUS	 discharge Register.  <i>Offset: 828h</i> */
-+	volatile uint32_t dvbusdis;
-+	/** Device VBUS Pulse Register.	 <i>Offset: 82Ch</i> */
-+	volatile uint32_t dvbuspulse;
-+	/** Device IN Token Queue Read Register-3 (Read Only). /
-+	 *	Device Thresholding control register (Read/Write)
-+	 * <i>Offset: 830h</i> */
-+	volatile uint32_t dtknqr3_dthrctl;
-+	/** Device IN Token Queue Read Register-4 (Read Only). /
-+	 *	Device IN EPs empty Inr. Mask Register (Read/Write)
-+	 * <i>Offset: 834h</i> */
-+	volatile uint32_t dtknqr4_fifoemptymsk;
-+	/** Device Each Endpoint Interrupt Register (Read Only). /
-+	 * <i>Offset: 838h</i> */
-+	volatile uint32_t deachint;
-+	/** Device Each Endpoint Interrupt mask Register (Read/Write). /
-+	 * <i>Offset: 83Ch</i> */
-+	volatile uint32_t deachintmsk;
-+	/** Device Each In Endpoint Interrupt mask Register (Read/Write). /
-+	 * <i>Offset: 840h</i> */
-+	volatile uint32_t diepeachintmsk[MAX_EPS_CHANNELS];
-+	/** Device Each Out Endpoint Interrupt mask Register (Read/Write). /
-+	 * <i>Offset: 880h</i> */
-+	volatile uint32_t doepeachintmsk[MAX_EPS_CHANNELS];
-+} dwc_otg_device_global_regs_t;
-+
-+/**
-+ * This union represents the bit fields in the Device Configuration
-+ * Register.  Read the register into the <i>d32</i> member then
-+ * set/clear the bits using the <i>b</i>it elements.  Write the
-+ * <i>d32</i> member to the dcfg register.
-+ */
-+typedef union dcfg_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		/** Device Speed */
-+		unsigned devspd:2;
-+		/** Non Zero Length Status OUT Handshake */
-+		unsigned nzstsouthshk:1;
-+#define DWC_DCFG_SEND_STALL 1
-+
-+		unsigned ena32khzs:1;
-+		/** Device Addresses */
-+		unsigned devaddr:7;
-+		/** Periodic Frame Interval */
-+		unsigned perfrint:2;
-+#define DWC_DCFG_FRAME_INTERVAL_80 0
-+#define DWC_DCFG_FRAME_INTERVAL_85 1
-+#define DWC_DCFG_FRAME_INTERVAL_90 2
-+#define DWC_DCFG_FRAME_INTERVAL_95 3
-+
-+		/** Enable Device OUT NAK for bulk in DDMA mode */
-+		unsigned endevoutnak:1;
-+
-+		unsigned reserved14_17:4;
-+		/** In Endpoint Mis-match count */
-+		unsigned epmscnt:5;
-+		/** Enable Descriptor DMA in Device mode */
-+		unsigned descdma:1;
-+		unsigned perschintvl:2;
-+		unsigned resvalid:6;
-+	} b;
-+} dcfg_data_t;
-+
-+/**
-+ * This union represents the bit fields in the Device Control
-+ * Register.  Read the register into the <i>d32</i> member then
-+ * set/clear the bits using the <i>b</i>it elements.
-+ */
-+typedef union dctl_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		/** Remote Wakeup */
-+		unsigned rmtwkupsig:1;
-+		/** Soft Disconnect */
-+		unsigned sftdiscon:1;
-+		/** Global Non-Periodic IN NAK Status */
-+		unsigned gnpinnaksts:1;
-+		/** Global OUT NAK Status */
-+		unsigned goutnaksts:1;
-+		/** Test Control */
-+		unsigned tstctl:3;
-+		/** Set Global Non-Periodic IN NAK */
-+		unsigned sgnpinnak:1;
-+		/** Clear Global Non-Periodic IN NAK */
-+		unsigned cgnpinnak:1;
-+		/** Set Global OUT NAK */
-+		unsigned sgoutnak:1;
-+		/** Clear Global OUT NAK */
-+		unsigned cgoutnak:1;
-+		/** Power-On Programming Done */
-+		unsigned pwronprgdone:1;
-+		/** Reserved */
-+		unsigned reserved:1;
-+		/** Global Multi Count */
-+		unsigned gmc:2;
-+		/** Ignore Frame Number for ISOC EPs */
-+		unsigned ifrmnum:1;
-+		/** NAK on Babble */
-+		unsigned nakonbble:1;
-+		/** Enable Continue on BNA */
-+		unsigned encontonbna:1;
-+
-+		unsigned reserved18_31:14;
-+	} b;
-+} dctl_data_t;
-+
-+/**
-+ * This union represents the bit fields in the Device Status
-+ * Register.  Read the register into the <i>d32</i> member then
-+ * set/clear the bits using the <i>b</i>it elements.
-+ */
-+typedef union dsts_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		/** Suspend Status */
-+		unsigned suspsts:1;
-+		/** Enumerated Speed */
-+		unsigned enumspd:2;
-+#define DWC_DSTS_ENUMSPD_HS_PHY_30MHZ_OR_60MHZ 0
-+#define DWC_DSTS_ENUMSPD_FS_PHY_30MHZ_OR_60MHZ 1
-+#define DWC_DSTS_ENUMSPD_LS_PHY_6MHZ		   2
-+#define DWC_DSTS_ENUMSPD_FS_PHY_48MHZ		   3
-+		/** Erratic Error */
-+		unsigned errticerr:1;
-+		unsigned reserved4_7:4;
-+		/** Frame or Microframe Number of the received SOF */
-+		unsigned soffn:14;
-+		unsigned reserved22_31:10;
-+	} b;
-+} dsts_data_t;
-+
-+/**
-+ * This union represents the bit fields in the Device IN EP Interrupt
-+ * Register and the Device IN EP Common Mask Register.
-+ *
-+ * - Read the register into the <i>d32</i> member then set/clear the
-+ *	 bits using the <i>b</i>it elements.
-+ */
-+typedef union diepint_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		/** Transfer complete mask */
-+		unsigned xfercompl:1;
-+		/** Endpoint disable mask */
-+		unsigned epdisabled:1;
-+		/** AHB Error mask */
-+		unsigned ahberr:1;
-+		/** TimeOUT Handshake mask (non-ISOC EPs) */
-+		unsigned timeout:1;
-+		/** IN Token received with TxF Empty mask */
-+		unsigned intktxfemp:1;
-+		/** IN Token Received with EP mismatch mask */
-+		unsigned intknepmis:1;
-+		/** IN Endpoint NAK Effective mask */
-+		unsigned inepnakeff:1;
-+		/** Reserved */
-+		unsigned emptyintr:1;
-+
-+		unsigned txfifoundrn:1;
-+
-+		/** BNA Interrupt mask */
-+		unsigned bna:1;
-+
-+		unsigned reserved10_12:3;
-+		/** BNA Interrupt mask */
-+		unsigned nak:1;
-+
-+		unsigned reserved14_31:18;
-+	} b;
-+} diepint_data_t;
-+
-+/**
-+ * This union represents the bit fields in the Device IN EP
-+ * Common/Dedicated Interrupt Mask Register.
-+ */
-+typedef union diepint_data diepmsk_data_t;
-+
-+/**
-+ * This union represents the bit fields in the Device OUT EP Interrupt
-+ * Registerand Device OUT EP Common Interrupt Mask Register.
-+ *
-+ * - Read the register into the <i>d32</i> member then set/clear the
-+ *	 bits using the <i>b</i>it elements.
-+ */
-+typedef union doepint_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		/** Transfer complete */
-+		unsigned xfercompl:1;
-+		/** Endpoint disable  */
-+		unsigned epdisabled:1;
-+		/** AHB Error */
-+		unsigned ahberr:1;
-+		/** Setup Phase Done (contorl EPs) */
-+		unsigned setup:1;
-+		/** OUT Token Received when Endpoint Disabled */
-+		unsigned outtknepdis:1;
-+
-+		unsigned stsphsercvd:1;
-+		/** Back-to-Back SETUP Packets Received */
-+		unsigned back2backsetup:1;
-+
-+		unsigned reserved7:1;
-+		/** OUT packet Error */
-+		unsigned outpkterr:1;
-+		/** BNA Interrupt */
-+		unsigned bna:1;
-+
-+		unsigned reserved10:1;
-+		/** Packet Drop Status */
-+		unsigned pktdrpsts:1;
-+		/** Babble Interrupt */
-+		unsigned babble:1;
-+		/** NAK Interrupt */
-+		unsigned nak:1;
-+		/** NYET Interrupt */
-+		unsigned nyet:1;
-+		/** Bit indicating setup packet received */
-+		unsigned sr:1;
-+
-+		unsigned reserved16_31:16;
-+	} b;
-+} doepint_data_t;
-+
-+/**
-+ * This union represents the bit fields in the Device OUT EP
-+ * Common/Dedicated Interrupt Mask Register.
-+ */
-+typedef union doepint_data doepmsk_data_t;
-+
-+/**
-+ * This union represents the bit fields in the Device All EP Interrupt
-+ * and Mask Registers.
-+ * - Read the register into the <i>d32</i> member then set/clear the
-+ *	 bits using the <i>b</i>it elements.
-+ */
-+typedef union daint_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		/** IN Endpoint bits */
-+		unsigned in:16;
-+		/** OUT Endpoint bits */
-+		unsigned out:16;
-+	} ep;
-+	struct {
-+		/** IN Endpoint bits */
-+		unsigned inep0:1;
-+		unsigned inep1:1;
-+		unsigned inep2:1;
-+		unsigned inep3:1;
-+		unsigned inep4:1;
-+		unsigned inep5:1;
-+		unsigned inep6:1;
-+		unsigned inep7:1;
-+		unsigned inep8:1;
-+		unsigned inep9:1;
-+		unsigned inep10:1;
-+		unsigned inep11:1;
-+		unsigned inep12:1;
-+		unsigned inep13:1;
-+		unsigned inep14:1;
-+		unsigned inep15:1;
-+		/** OUT Endpoint bits */
-+		unsigned outep0:1;
-+		unsigned outep1:1;
-+		unsigned outep2:1;
-+		unsigned outep3:1;
-+		unsigned outep4:1;
-+		unsigned outep5:1;
-+		unsigned outep6:1;
-+		unsigned outep7:1;
-+		unsigned outep8:1;
-+		unsigned outep9:1;
-+		unsigned outep10:1;
-+		unsigned outep11:1;
-+		unsigned outep12:1;
-+		unsigned outep13:1;
-+		unsigned outep14:1;
-+		unsigned outep15:1;
-+	} b;
-+} daint_data_t;
-+
-+/**
-+ * This union represents the bit fields in the Device IN Token Queue
-+ * Read Registers.
-+ * - Read the register into the <i>d32</i> member.
-+ * - READ-ONLY Register
-+ */
-+typedef union dtknq1_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		/** In Token Queue Write Pointer */
-+		unsigned intknwptr:5;
-+		/** Reserved */
-+		unsigned reserved05_06:2;
-+		/** write pointer has wrapped. */
-+		unsigned wrap_bit:1;
-+		/** EP Numbers of IN Tokens 0 ... 4 */
-+		unsigned epnums0_5:24;
-+	} b;
-+} dtknq1_data_t;
-+
-+/**
-+ * This union represents Threshold control Register
-+ * - Read and write the register into the <i>d32</i> member.
-+ * - READ-WRITABLE Register
-+ */
-+typedef union dthrctl_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		/** non ISO Tx Thr. Enable */
-+		unsigned non_iso_thr_en:1;
-+		/** ISO Tx Thr. Enable */
-+		unsigned iso_thr_en:1;
-+		/** Tx Thr. Length */
-+		unsigned tx_thr_len:9;
-+		/** AHB Threshold ratio */
-+		unsigned ahb_thr_ratio:2;
-+		/** Reserved */
-+		unsigned reserved13_15:3;
-+		/** Rx Thr. Enable */
-+		unsigned rx_thr_en:1;
-+		/** Rx Thr. Length */
-+		unsigned rx_thr_len:9;
-+		unsigned reserved26:1;
-+		/** Arbiter Parking Enable*/
-+		unsigned arbprken:1;
-+		/** Reserved */
-+		unsigned reserved28_31:4;
-+	} b;
-+} dthrctl_data_t;
-+
-+/**
-+ * Device Logical IN Endpoint-Specific Registers. <i>Offsets
-+ * 900h-AFCh</i>
-+ *
-+ * There will be one set of endpoint registers per logical endpoint
-+ * implemented.
-+ *
-+ * <i>These registers are visible only in Device mode and must not be
-+ * accessed in Host mode, as the results are unknown.</i>
-+ */
-+typedef struct dwc_otg_dev_in_ep_regs {
-+	/** Device IN Endpoint Control Register. <i>Offset:900h +
-+	 * (ep_num * 20h) + 00h</i> */
-+	volatile uint32_t diepctl;
-+	/** Reserved. <i>Offset:900h + (ep_num * 20h) + 04h</i> */
-+	uint32_t reserved04;
-+	/** Device IN Endpoint Interrupt Register. <i>Offset:900h +
-+	 * (ep_num * 20h) + 08h</i> */
-+	volatile uint32_t diepint;
-+	/** Reserved. <i>Offset:900h + (ep_num * 20h) + 0Ch</i> */
-+	uint32_t reserved0C;
-+	/** Device IN Endpoint Transfer Size
-+	 * Register. <i>Offset:900h + (ep_num * 20h) + 10h</i> */
-+	volatile uint32_t dieptsiz;
-+	/** Device IN Endpoint DMA Address Register. <i>Offset:900h +
-+	 * (ep_num * 20h) + 14h</i> */
-+	volatile uint32_t diepdma;
-+	/** Device IN Endpoint Transmit FIFO Status Register. <i>Offset:900h +
-+	 * (ep_num * 20h) + 18h</i> */
-+	volatile uint32_t dtxfsts;
-+	/** Device IN Endpoint DMA Buffer Register. <i>Offset:900h +
-+	 * (ep_num * 20h) + 1Ch</i> */
-+	volatile uint32_t diepdmab;
-+} dwc_otg_dev_in_ep_regs_t;
-+
-+/**
-+ * Device Logical OUT Endpoint-Specific Registers. <i>Offsets:
-+ * B00h-CFCh</i>
-+ *
-+ * There will be one set of endpoint registers per logical endpoint
-+ * implemented.
-+ *
-+ * <i>These registers are visible only in Device mode and must not be
-+ * accessed in Host mode, as the results are unknown.</i>
-+ */
-+typedef struct dwc_otg_dev_out_ep_regs {
-+	/** Device OUT Endpoint Control Register. <i>Offset:B00h +
-+	 * (ep_num * 20h) + 00h</i> */
-+	volatile uint32_t doepctl;
-+	/** Reserved. <i>Offset:B00h + (ep_num * 20h) + 04h</i> */
-+	uint32_t reserved04;
-+	/** Device OUT Endpoint Interrupt Register. <i>Offset:B00h +
-+	 * (ep_num * 20h) + 08h</i> */
-+	volatile uint32_t doepint;
-+	/** Reserved. <i>Offset:B00h + (ep_num * 20h) + 0Ch</i> */
-+	uint32_t reserved0C;
-+	/** Device OUT Endpoint Transfer Size Register. <i>Offset:
-+	 * B00h + (ep_num * 20h) + 10h</i> */
-+	volatile uint32_t doeptsiz;
-+	/** Device OUT Endpoint DMA Address Register. <i>Offset:B00h
-+	 * + (ep_num * 20h) + 14h</i> */
-+	volatile uint32_t doepdma;
-+	/** Reserved. <i>Offset:B00h + 	 * (ep_num * 20h) + 18h</i> */
-+	uint32_t unused;
-+	/** Device OUT Endpoint DMA Buffer Register. <i>Offset:B00h
-+	 * + (ep_num * 20h) + 1Ch</i> */
-+	uint32_t doepdmab;
-+} dwc_otg_dev_out_ep_regs_t;
-+
-+/**
-+ * This union represents the bit fields in the Device EP Control
-+ * Register.  Read the register into the <i>d32</i> member then
-+ * set/clear the bits using the <i>b</i>it elements.
-+ */
-+typedef union depctl_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		/** Maximum Packet Size
-+		 * IN/OUT EPn
-+		 * IN/OUT EP0 - 2 bits
-+		 *	 2'b00: 64 Bytes
-+		 *	 2'b01: 32
-+		 *	 2'b10: 16
-+		 *	 2'b11: 8 */
-+		unsigned mps:11;
-+#define DWC_DEP0CTL_MPS_64	 0
-+#define DWC_DEP0CTL_MPS_32	 1
-+#define DWC_DEP0CTL_MPS_16	 2
-+#define DWC_DEP0CTL_MPS_8	 3
-+
-+		/** Next Endpoint
-+		 * IN EPn/IN EP0
-+		 * OUT EPn/OUT EP0 - reserved */
-+		unsigned nextep:4;
-+
-+		/** USB Active Endpoint */
-+		unsigned usbactep:1;
-+
-+		/** Endpoint DPID (INTR/Bulk IN and OUT endpoints)
-+		 * This field contains the PID of the packet going to
-+		 * be received or transmitted on this endpoint. The
-+		 * application should program the PID of the first
-+		 * packet going to be received or transmitted on this
-+		 * endpoint , after the endpoint is
-+		 * activated. Application use the SetD1PID and
-+		 * SetD0PID fields of this register to program either
-+		 * D0 or D1 PID.
-+		 *
-+		 * The encoding for this field is
-+		 *	 - 0: D0
-+		 *	 - 1: D1
-+		 */
-+		unsigned dpid:1;
-+
-+		/** NAK Status */
-+		unsigned naksts:1;
-+
-+		/** Endpoint Type
-+		 *	2'b00: Control
-+		 *	2'b01: Isochronous
-+		 *	2'b10: Bulk
-+		 *	2'b11: Interrupt */
-+		unsigned eptype:2;
-+
-+		/** Snoop Mode
-+		 * OUT EPn/OUT EP0
-+		 * IN EPn/IN EP0 - reserved */
-+		unsigned snp:1;
-+
-+		/** Stall Handshake */
-+		unsigned stall:1;
-+
-+		/** Tx Fifo Number
-+		 * IN EPn/IN EP0
-+		 * OUT EPn/OUT EP0 - reserved */
-+		unsigned txfnum:4;
-+
-+		/** Clear NAK */
-+		unsigned cnak:1;
-+		/** Set NAK */
-+		unsigned snak:1;
-+		/** Set DATA0 PID (INTR/Bulk IN and OUT endpoints)
-+		 * Writing to this field sets the Endpoint DPID (DPID)
-+		 * field in this register to DATA0. Set Even
-+		 * (micro)frame (SetEvenFr) (ISO IN and OUT Endpoints)
-+		 * Writing to this field sets the Even/Odd
-+		 * (micro)frame (EO_FrNum) field to even (micro)
-+		 * frame.
-+		 */
-+		unsigned setd0pid:1;
-+		/** Set DATA1 PID (INTR/Bulk IN and OUT endpoints)
-+		 * Writing to this field sets the Endpoint DPID (DPID)
-+		 * field in this register to DATA1 Set Odd
-+		 * (micro)frame (SetOddFr) (ISO IN and OUT Endpoints)
-+		 * Writing to this field sets the Even/Odd
-+		 * (micro)frame (EO_FrNum) field to odd (micro) frame.
-+		 */
-+		unsigned setd1pid:1;
-+
-+		/** Endpoint Disable */
-+		unsigned epdis:1;
-+		/** Endpoint Enable */
-+		unsigned epena:1;
-+	} b;
-+} depctl_data_t;
-+
-+/**
-+ * This union represents the bit fields in the Device EP Transfer
-+ * Size Register.  Read the register into the <i>d32</i> member then
-+ * set/clear the bits using the <i>b</i>it elements.
-+ */
-+typedef union deptsiz_data {
-+		/** raw register data */
-+	uint32_t d32;
-+		/** register bits */
-+	struct {
-+		/** Transfer size */
-+		unsigned xfersize:19;
-+/** Max packet count for EP (pow(2,10)-1) */
-+#define MAX_PKT_CNT 1023
-+		/** Packet Count */
-+		unsigned pktcnt:10;
-+		/** Multi Count - Periodic IN endpoints */
-+		unsigned mc:2;
-+		unsigned reserved:1;
-+	} b;
-+} deptsiz_data_t;
-+
-+/**
-+ * This union represents the bit fields in the Device EP 0 Transfer
-+ * Size Register.  Read the register into the <i>d32</i> member then
-+ * set/clear the bits using the <i>b</i>it elements.
-+ */
-+typedef union deptsiz0_data {
-+		/** raw register data */
-+	uint32_t d32;
-+		/** register bits */
-+	struct {
-+		/** Transfer size */
-+		unsigned xfersize:7;
-+				/** Reserved */
-+		unsigned reserved7_18:12;
-+		/** Packet Count */
-+		unsigned pktcnt:2;
-+				/** Reserved */
-+		unsigned reserved21_28:8;
-+				/**Setup Packet Count (DOEPTSIZ0 Only) */
-+		unsigned supcnt:2;
-+		unsigned reserved31;
-+	} b;
-+} deptsiz0_data_t;
-+
-+/////////////////////////////////////////////////
-+// DMA Descriptor Specific Structures
-+//
-+
-+/** Buffer status definitions */
-+
-+#define BS_HOST_READY	0x0
-+#define BS_DMA_BUSY		0x1
-+#define BS_DMA_DONE		0x2
-+#define BS_HOST_BUSY	0x3
-+
-+/** Receive/Transmit status definitions */
-+
-+#define RTS_SUCCESS		0x0
-+#define RTS_BUFFLUSH	0x1
-+#define RTS_RESERVED	0x2
-+#define RTS_BUFERR		0x3
-+
-+/**
-+ * This union represents the bit fields in the DMA Descriptor
-+ * status quadlet. Read the quadlet into the <i>d32</i> member then
-+ * set/clear the bits using the <i>b</i>it, <i>b_iso_out</i> and
-+ * <i>b_iso_in</i> elements.
-+ */
-+typedef union dev_dma_desc_sts {
-+		/** raw register data */
-+	uint32_t d32;
-+		/** quadlet bits */
-+	struct {
-+		/** Received number of bytes */
-+		unsigned bytes:16;
-+		/** NAK bit - only for OUT EPs */
-+		unsigned nak:1;
-+		unsigned reserved17_22:6;
-+		/** Multiple Transfer - only for OUT EPs */
-+		unsigned mtrf:1;
-+		/** Setup Packet received - only for OUT EPs */
-+		unsigned sr:1;
-+		/** Interrupt On Complete */
-+		unsigned ioc:1;
-+		/** Short Packet */
-+		unsigned sp:1;
-+		/** Last */
-+		unsigned l:1;
-+		/** Receive Status */
-+		unsigned sts:2;
-+		/** Buffer Status */
-+		unsigned bs:2;
-+	} b;
-+
-+//#ifdef DWC_EN_ISOC
-+		/** iso out quadlet bits */
-+	struct {
-+		/** Received number of bytes */
-+		unsigned rxbytes:11;
-+
-+		unsigned reserved11:1;
-+		/** Frame Number */
-+		unsigned framenum:11;
-+		/** Received ISO Data PID */
-+		unsigned pid:2;
-+		/** Interrupt On Complete */
-+		unsigned ioc:1;
-+		/** Short Packet */
-+		unsigned sp:1;
-+		/** Last */
-+		unsigned l:1;
-+		/** Receive Status */
-+		unsigned rxsts:2;
-+		/** Buffer Status */
-+		unsigned bs:2;
-+	} b_iso_out;
-+
-+		/** iso in quadlet bits */
-+	struct {
-+		/** Transmited number of bytes */
-+		unsigned txbytes:12;
-+		/** Frame Number */
-+		unsigned framenum:11;
-+		/** Transmited ISO Data PID */
-+		unsigned pid:2;
-+		/** Interrupt On Complete */
-+		unsigned ioc:1;
-+		/** Short Packet */
-+		unsigned sp:1;
-+		/** Last */
-+		unsigned l:1;
-+		/** Transmit Status */
-+		unsigned txsts:2;
-+		/** Buffer Status */
-+		unsigned bs:2;
-+	} b_iso_in;
-+//#endif                                /* DWC_EN_ISOC */
-+} dev_dma_desc_sts_t;
-+
-+/**
-+ * DMA Descriptor structure
-+ *
-+ * DMA Descriptor structure contains two quadlets:
-+ * Status quadlet and Data buffer pointer.
-+ */
-+typedef struct dwc_otg_dev_dma_desc {
-+	/** DMA Descriptor status quadlet */
-+	dev_dma_desc_sts_t status;
-+	/** DMA Descriptor data buffer pointer */
-+	uint32_t buf;
-+} dwc_otg_dev_dma_desc_t;
-+
-+/**
-+ * The dwc_otg_dev_if structure contains information needed to manage
-+ * the DWC_otg controller acting in device mode. It represents the
-+ * programming view of the device-specific aspects of the controller.
-+ */
-+typedef struct dwc_otg_dev_if {
-+	/** Pointer to device Global registers.
-+	 * Device Global Registers starting at offset 800h
-+	 */
-+	dwc_otg_device_global_regs_t *dev_global_regs;
-+#define DWC_DEV_GLOBAL_REG_OFFSET 0x800
-+
-+	/**
-+	 * Device Logical IN Endpoint-Specific Registers 900h-AFCh
-+	 */
-+	dwc_otg_dev_in_ep_regs_t *in_ep_regs[MAX_EPS_CHANNELS];
-+#define DWC_DEV_IN_EP_REG_OFFSET 0x900
-+#define DWC_EP_REG_OFFSET 0x20
-+
-+	/** Device Logical OUT Endpoint-Specific Registers B00h-CFCh */
-+	dwc_otg_dev_out_ep_regs_t *out_ep_regs[MAX_EPS_CHANNELS];
-+#define DWC_DEV_OUT_EP_REG_OFFSET 0xB00
-+
-+	/* Device configuration information */
-+	uint8_t speed;				 /**< Device Speed	0: Unknown, 1: LS, 2:FS, 3: HS */
-+	uint8_t num_in_eps;		 /**< Number # of Tx EP range: 0-15 exept ep0 */
-+	uint8_t num_out_eps;		 /**< Number # of Rx EP range: 0-15 exept ep 0*/
-+
-+	/** Size of periodic FIFOs (Bytes) */
-+	uint16_t perio_tx_fifo_size[MAX_PERIO_FIFOS];
-+
-+	/** Size of Tx FIFOs (Bytes) */
-+	uint16_t tx_fifo_size[MAX_TX_FIFOS];
-+
-+	/** Thresholding enable flags and length varaiables **/
-+	uint16_t rx_thr_en;
-+	uint16_t iso_tx_thr_en;
-+	uint16_t non_iso_tx_thr_en;
-+
-+	uint16_t rx_thr_length;
-+	uint16_t tx_thr_length;
-+
-+	/**
-+	 * Pointers to the DMA Descriptors for EP0 Control
-+	 * transfers (virtual and physical)
-+	 */
-+
-+	/** 2 descriptors for SETUP packets */
-+	dwc_dma_t dma_setup_desc_addr[2];
-+	dwc_otg_dev_dma_desc_t *setup_desc_addr[2];
-+
-+	/** Pointer to Descriptor with latest SETUP packet */
-+	dwc_otg_dev_dma_desc_t *psetup;
-+
-+	/** Index of current SETUP handler descriptor */
-+	uint32_t setup_desc_index;
-+
-+	/** Descriptor for Data In or Status In phases */
-+	dwc_dma_t dma_in_desc_addr;
-+	dwc_otg_dev_dma_desc_t *in_desc_addr;
-+
-+	/** Descriptor for Data Out or Status Out phases */
-+	dwc_dma_t dma_out_desc_addr;
-+	dwc_otg_dev_dma_desc_t *out_desc_addr;
-+
-+	/** Setup Packet Detected - if set clear NAK when queueing */
-+	uint32_t spd;
-+	/** Isoc ep pointer on which incomplete happens */
-+	void *isoc_ep;
-+
-+} dwc_otg_dev_if_t;
-+
-+/////////////////////////////////////////////////
-+// Host Mode Register Structures
-+//
-+/**
-+ * The Host Global Registers structure defines the size and relative
-+ * field offsets for the Host Mode Global Registers.  Host Global
-+ * Registers offsets 400h-7FFh.
-+*/
-+typedef struct dwc_otg_host_global_regs {
-+	/** Host Configuration Register.   <i>Offset: 400h</i> */
-+	volatile uint32_t hcfg;
-+	/** Host Frame Interval Register.	<i>Offset: 404h</i> */
-+	volatile uint32_t hfir;
-+	/** Host Frame Number / Frame Remaining Register. <i>Offset: 408h</i> */
-+	volatile uint32_t hfnum;
-+	/** Reserved.	<i>Offset: 40Ch</i> */
-+	uint32_t reserved40C;
-+	/** Host Periodic Transmit FIFO/ Queue Status Register. <i>Offset: 410h</i> */
-+	volatile uint32_t hptxsts;
-+	/** Host All Channels Interrupt Register. <i>Offset: 414h</i> */
-+	volatile uint32_t haint;
-+	/** Host All Channels Interrupt Mask Register. <i>Offset: 418h</i> */
-+	volatile uint32_t haintmsk;
-+	/** Host Frame List Base Address Register . <i>Offset: 41Ch</i> */
-+	volatile uint32_t hflbaddr;
-+} dwc_otg_host_global_regs_t;
-+
-+/**
-+ * This union represents the bit fields in the Host Configuration Register.
-+ * Read the register into the <i>d32</i> member then set/clear the bits using
-+ * the <i>b</i>it elements. Write the <i>d32</i> member to the hcfg register.
-+ */
-+typedef union hcfg_data {
-+	/** raw register data */
-+	uint32_t d32;
-+
-+	/** register bits */
-+	struct {
-+		/** FS/LS Phy Clock Select */
-+		unsigned fslspclksel:2;
-+#define DWC_HCFG_30_60_MHZ 0
-+#define DWC_HCFG_48_MHZ	   1
-+#define DWC_HCFG_6_MHZ	   2
-+
-+		/** FS/LS Only Support */
-+		unsigned fslssupp:1;
-+		unsigned reserved3_6:4;
-+		/** Enable 32-KHz Suspend Mode */
-+		unsigned ena32khzs:1;
-+		/** Resume Validation Periiod */
-+		unsigned resvalid:8;
-+		unsigned reserved16_22:7;
-+		/** Enable Scatter/gather DMA in Host mode */
-+		unsigned descdma:1;
-+		/** Frame List Entries */
-+		unsigned frlisten:2;
-+		/** Enable Periodic Scheduling */
-+		unsigned perschedena:1;
-+		unsigned reserved27_30:4;
-+		unsigned modechtimen:1;
-+	} b;
-+} hcfg_data_t;
-+
-+/**
-+ * This union represents the bit fields in the Host Frame Remaing/Number
-+ * Register.
-+ */
-+typedef union hfir_data {
-+	/** raw register data */
-+	uint32_t d32;
-+
-+	/** register bits */
-+	struct {
-+		unsigned frint:16;
-+		unsigned hfirrldctrl:1;
-+		unsigned reserved:15;
-+	} b;
-+} hfir_data_t;
-+
-+/**
-+ * This union represents the bit fields in the Host Frame Remaing/Number
-+ * Register.
-+ */
-+typedef union hfnum_data {
-+	/** raw register data */
-+	uint32_t d32;
-+
-+	/** register bits */
-+	struct {
-+		unsigned frnum:16;
-+#define DWC_HFNUM_MAX_FRNUM 0x3FFF
-+		unsigned frrem:16;
-+	} b;
-+} hfnum_data_t;
-+
-+typedef union hptxsts_data {
-+	/** raw register data */
-+	uint32_t d32;
-+
-+	/** register bits */
-+	struct {
-+		unsigned ptxfspcavail:16;
-+		unsigned ptxqspcavail:8;
-+		/** Top of the Periodic Transmit Request Queue
-+		 *	- bit 24 - Terminate (last entry for the selected channel)
-+		 *	- bits 26:25 - Token Type
-+		 *	  - 2'b00 - Zero length
-+		 *	  - 2'b01 - Ping
-+		 *	  - 2'b10 - Disable
-+		 *	- bits 30:27 - Channel Number
-+		 *	- bit 31 - Odd/even microframe
-+		 */
-+		unsigned ptxqtop_terminate:1;
-+		unsigned ptxqtop_token:2;
-+		unsigned ptxqtop_chnum:4;
-+		unsigned ptxqtop_odd:1;
-+	} b;
-+} hptxsts_data_t;
-+
-+/**
-+ * This union represents the bit fields in the Host Port Control and Status
-+ * Register. Read the register into the <i>d32</i> member then set/clear the
-+ * bits using the <i>b</i>it elements. Write the <i>d32</i> member to the
-+ * hprt0 register.
-+ */
-+typedef union hprt0_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		unsigned prtconnsts:1;
-+		unsigned prtconndet:1;
-+		unsigned prtena:1;
-+		unsigned prtenchng:1;
-+		unsigned prtovrcurract:1;
-+		unsigned prtovrcurrchng:1;
-+		unsigned prtres:1;
-+		unsigned prtsusp:1;
-+		unsigned prtrst:1;
-+		unsigned reserved9:1;
-+		unsigned prtlnsts:2;
-+		unsigned prtpwr:1;
-+		unsigned prttstctl:4;
-+		unsigned prtspd:2;
-+#define DWC_HPRT0_PRTSPD_HIGH_SPEED 0
-+#define DWC_HPRT0_PRTSPD_FULL_SPEED 1
-+#define DWC_HPRT0_PRTSPD_LOW_SPEED	2
-+		unsigned reserved19_31:13;
-+	} b;
-+} hprt0_data_t;
-+
-+/**
-+ * This union represents the bit fields in the Host All Interrupt
-+ * Register.
-+ */
-+typedef union haint_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		unsigned ch0:1;
-+		unsigned ch1:1;
-+		unsigned ch2:1;
-+		unsigned ch3:1;
-+		unsigned ch4:1;
-+		unsigned ch5:1;
-+		unsigned ch6:1;
-+		unsigned ch7:1;
-+		unsigned ch8:1;
-+		unsigned ch9:1;
-+		unsigned ch10:1;
-+		unsigned ch11:1;
-+		unsigned ch12:1;
-+		unsigned ch13:1;
-+		unsigned ch14:1;
-+		unsigned ch15:1;
-+		unsigned reserved:16;
-+	} b;
-+
-+	struct {
-+		unsigned chint:16;
-+		unsigned reserved:16;
-+	} b2;
-+} haint_data_t;
-+
-+/**
-+ * This union represents the bit fields in the Host All Interrupt
-+ * Register.
-+ */
-+typedef union haintmsk_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		unsigned ch0:1;
-+		unsigned ch1:1;
-+		unsigned ch2:1;
-+		unsigned ch3:1;
-+		unsigned ch4:1;
-+		unsigned ch5:1;
-+		unsigned ch6:1;
-+		unsigned ch7:1;
-+		unsigned ch8:1;
-+		unsigned ch9:1;
-+		unsigned ch10:1;
-+		unsigned ch11:1;
-+		unsigned ch12:1;
-+		unsigned ch13:1;
-+		unsigned ch14:1;
-+		unsigned ch15:1;
-+		unsigned reserved:16;
-+	} b;
-+
-+	struct {
-+		unsigned chint:16;
-+		unsigned reserved:16;
-+	} b2;
-+} haintmsk_data_t;
-+
-+/**
-+ * Host Channel Specific Registers. <i>500h-5FCh</i>
-+ */
-+typedef struct dwc_otg_hc_regs {
-+	/** Host Channel 0 Characteristic Register. <i>Offset: 500h + (chan_num * 20h) + 00h</i> */
-+	volatile uint32_t hcchar;
-+	/** Host Channel 0 Split Control Register. <i>Offset: 500h + (chan_num * 20h) + 04h</i> */
-+	volatile uint32_t hcsplt;
-+	/** Host Channel 0 Interrupt Register. <i>Offset: 500h + (chan_num * 20h) + 08h</i> */
-+	volatile uint32_t hcint;
-+	/** Host Channel 0 Interrupt Mask Register. <i>Offset: 500h + (chan_num * 20h) + 0Ch</i> */
-+	volatile uint32_t hcintmsk;
-+	/** Host Channel 0 Transfer Size Register. <i>Offset: 500h + (chan_num * 20h) + 10h</i> */
-+	volatile uint32_t hctsiz;
-+	/** Host Channel 0 DMA Address Register. <i>Offset: 500h + (chan_num * 20h) + 14h</i> */
-+	volatile uint32_t hcdma;
-+	volatile uint32_t reserved;
-+	/** Host Channel 0 DMA Buffer Address Register. <i>Offset: 500h + (chan_num * 20h) + 1Ch</i> */
-+	volatile uint32_t hcdmab;
-+} dwc_otg_hc_regs_t;
-+
-+/**
-+ * This union represents the bit fields in the Host Channel Characteristics
-+ * Register. Read the register into the <i>d32</i> member then set/clear the
-+ * bits using the <i>b</i>it elements. Write the <i>d32</i> member to the
-+ * hcchar register.
-+ */
-+typedef union hcchar_data {
-+	/** raw register data */
-+	uint32_t d32;
-+
-+	/** register bits */
-+	struct {
-+		/** Maximum packet size in bytes */
-+		unsigned mps:11;
-+
-+		/** Endpoint number */
-+		unsigned epnum:4;
-+
-+		/** 0: OUT, 1: IN */
-+		unsigned epdir:1;
-+
-+		unsigned reserved:1;
-+
-+		/** 0: Full/high speed device, 1: Low speed device */
-+		unsigned lspddev:1;
-+
-+		/** 0: Control, 1: Isoc, 2: Bulk, 3: Intr */
-+		unsigned eptype:2;
-+
-+		/** Packets per frame for periodic transfers. 0 is reserved. */
-+		unsigned multicnt:2;
-+
-+		/** Device address */
-+		unsigned devaddr:7;
-+
-+		/**
-+		 * Frame to transmit periodic transaction.
-+		 * 0: even, 1: odd
-+		 */
-+		unsigned oddfrm:1;
-+
-+		/** Channel disable */
-+		unsigned chdis:1;
-+
-+		/** Channel enable */
-+		unsigned chen:1;
-+	} b;
-+} hcchar_data_t;
-+
-+typedef union hcsplt_data {
-+	/** raw register data */
-+	uint32_t d32;
-+
-+	/** register bits */
-+	struct {
-+		/** Port Address */
-+		unsigned prtaddr:7;
-+
-+		/** Hub Address */
-+		unsigned hubaddr:7;
-+
-+		/** Transaction Position */
-+		unsigned xactpos:2;
-+#define DWC_HCSPLIT_XACTPOS_MID 0
-+#define DWC_HCSPLIT_XACTPOS_END 1
-+#define DWC_HCSPLIT_XACTPOS_BEGIN 2
-+#define DWC_HCSPLIT_XACTPOS_ALL 3
-+
-+		/** Do Complete Split */
-+		unsigned compsplt:1;
-+
-+		/** Reserved */
-+		unsigned reserved:14;
-+
-+		/** Split Enble */
-+		unsigned spltena:1;
-+	} b;
-+} hcsplt_data_t;
-+
-+/**
-+ * This union represents the bit fields in the Host All Interrupt
-+ * Register.
-+ */
-+typedef union hcint_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		/** Transfer Complete */
-+		unsigned xfercomp:1;
-+		/** Channel Halted */
-+		unsigned chhltd:1;
-+		/** AHB Error */
-+		unsigned ahberr:1;
-+		/** STALL Response Received */
-+		unsigned stall:1;
-+		/** NAK Response Received */
-+		unsigned nak:1;
-+		/** ACK Response Received */
-+		unsigned ack:1;
-+		/** NYET Response Received */
-+		unsigned nyet:1;
-+		/** Transaction Err */
-+		unsigned xacterr:1;
-+		/** Babble Error */
-+		unsigned bblerr:1;
-+		/** Frame Overrun */
-+		unsigned frmovrun:1;
-+		/** Data Toggle Error */
-+		unsigned datatglerr:1;
-+		/** Buffer Not Available (only for DDMA mode) */
-+		unsigned bna:1;
-+		/** Exessive transaction error (only for DDMA mode) */
-+		unsigned xcs_xact:1;
-+		/** Frame List Rollover interrupt */
-+		unsigned frm_list_roll:1;
-+		/** Reserved */
-+		unsigned reserved14_31:18;
-+	} b;
-+} hcint_data_t;
-+
-+/**
-+ * This union represents the bit fields in the Host Channel Interrupt Mask
-+ * Register. Read the register into the <i>d32</i> member then set/clear the
-+ * bits using the <i>b</i>it elements. Write the <i>d32</i> member to the
-+ * hcintmsk register.
-+ */
-+typedef union hcintmsk_data {
-+	/** raw register data */
-+	uint32_t d32;
-+
-+	/** register bits */
-+	struct {
-+		unsigned xfercompl:1;
-+		unsigned chhltd:1;
-+		unsigned ahberr:1;
-+		unsigned stall:1;
-+		unsigned nak:1;
-+		unsigned ack:1;
-+		unsigned nyet:1;
-+		unsigned xacterr:1;
-+		unsigned bblerr:1;
-+		unsigned frmovrun:1;
-+		unsigned datatglerr:1;
-+		unsigned bna:1;
-+		unsigned xcs_xact:1;
-+		unsigned frm_list_roll:1;
-+		unsigned reserved14_31:18;
-+	} b;
-+} hcintmsk_data_t;
-+
-+/**
-+ * This union represents the bit fields in the Host Channel Transfer Size
-+ * Register. Read the register into the <i>d32</i> member then set/clear the
-+ * bits using the <i>b</i>it elements. Write the <i>d32</i> member to the
-+ * hcchar register.
-+ */
-+
-+typedef union hctsiz_data {
-+	/** raw register data */
-+	uint32_t d32;
-+
-+	/** register bits */
-+	struct {
-+		/** Total transfer size in bytes */
-+		unsigned xfersize:19;
-+
-+		/** Data packets to transfer */
-+		unsigned pktcnt:10;
-+
-+		/**
-+		 * Packet ID for next data packet
-+		 * 0: DATA0
-+		 * 1: DATA2
-+		 * 2: DATA1
-+		 * 3: MDATA (non-Control), SETUP (Control)
-+		 */
-+		unsigned pid:2;
-+#define DWC_HCTSIZ_DATA0 0
-+#define DWC_HCTSIZ_DATA1 2
-+#define DWC_HCTSIZ_DATA2 1
-+#define DWC_HCTSIZ_MDATA 3
-+#define DWC_HCTSIZ_SETUP 3
-+
-+		/** Do PING protocol when 1 */
-+		unsigned dopng:1;
-+	} b;
-+
-+	/** register bits */
-+	struct {
-+		/** Scheduling information */
-+		unsigned schinfo:8;
-+
-+		/** Number of transfer descriptors.
-+		 * Max value:
-+		 * 64 in general,
-+		 * 256 only for HS isochronous endpoint.
-+		 */
-+		unsigned ntd:8;
-+
-+		/** Data packets to transfer */
-+		unsigned reserved16_28:13;
-+
-+		/**
-+		 * Packet ID for next data packet
-+		 * 0: DATA0
-+		 * 1: DATA2
-+		 * 2: DATA1
-+		 * 3: MDATA (non-Control)
-+		 */
-+		unsigned pid:2;
-+
-+		/** Do PING protocol when 1 */
-+		unsigned dopng:1;
-+	} b_ddma;
-+} hctsiz_data_t;
-+
-+/**
-+ * This union represents the bit fields in the Host DMA Address
-+ * Register used in Descriptor DMA mode.
-+ */
-+typedef union hcdma_data {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		unsigned reserved0_2:3;
-+		/** Current Transfer Descriptor. Not used for ISOC */
-+		unsigned ctd:8;
-+		/** Start Address of Descriptor List */
-+		unsigned dma_addr:21;
-+	} b;
-+} hcdma_data_t;
-+
-+/**
-+ * This union represents the bit fields in the DMA Descriptor
-+ * status quadlet for host mode. Read the quadlet into the <i>d32</i> member then
-+ * set/clear the bits using the <i>b</i>it elements.
-+ */
-+typedef union host_dma_desc_sts {
-+	/** raw register data */
-+	uint32_t d32;
-+	/** quadlet bits */
-+
-+	/* for non-isochronous  */
-+	struct {
-+		/** Number of bytes */
-+		unsigned n_bytes:17;
-+		/** QTD offset to jump when Short Packet received - only for IN EPs */
-+		unsigned qtd_offset:6;
-+		/**
-+		 * Set to request the core to jump to alternate QTD if
-+		 * Short Packet received - only for IN EPs
-+		 */
-+		unsigned a_qtd:1;
-+		 /**
-+		  * Setup Packet bit. When set indicates that buffer contains
-+		  * setup packet.
-+		  */
-+		unsigned sup:1;
-+		/** Interrupt On Complete */
-+		unsigned ioc:1;
-+		/** End of List */
-+		unsigned eol:1;
-+		unsigned reserved27:1;
-+		/** Rx/Tx Status */
-+		unsigned sts:2;
-+#define DMA_DESC_STS_PKTERR	1
-+		unsigned reserved30:1;
-+		/** Active Bit */
-+		unsigned a:1;
-+	} b;
-+	/* for isochronous */
-+	struct {
-+		/** Number of bytes */
-+		unsigned n_bytes:12;
-+		unsigned reserved12_24:13;
-+		/** Interrupt On Complete */
-+		unsigned ioc:1;
-+		unsigned reserved26_27:2;
-+		/** Rx/Tx Status */
-+		unsigned sts:2;
-+		unsigned reserved30:1;
-+		/** Active Bit */
-+		unsigned a:1;
-+	} b_isoc;
-+} host_dma_desc_sts_t;
-+
-+#define	MAX_DMA_DESC_SIZE		131071
-+#define MAX_DMA_DESC_NUM_GENERIC	64
-+#define MAX_DMA_DESC_NUM_HS_ISOC	256
-+#define MAX_FRLIST_EN_NUM		64
-+/**
-+ * Host-mode DMA Descriptor structure
-+ *
-+ * DMA Descriptor structure contains two quadlets:
-+ * Status quadlet and Data buffer pointer.
-+ */
-+typedef struct dwc_otg_host_dma_desc {
-+	/** DMA Descriptor status quadlet */
-+	host_dma_desc_sts_t status;
-+	/** DMA Descriptor data buffer pointer */
-+	uint32_t buf;
-+} dwc_otg_host_dma_desc_t;
-+
-+/** OTG Host Interface Structure.
-+ *
-+ * The OTG Host Interface Structure structure contains information
-+ * needed to manage the DWC_otg controller acting in host mode. It
-+ * represents the programming view of the host-specific aspects of the
-+ * controller.
-+ */
-+typedef struct dwc_otg_host_if {
-+	/** Host Global Registers starting at offset 400h.*/
-+	dwc_otg_host_global_regs_t *host_global_regs;
-+#define DWC_OTG_HOST_GLOBAL_REG_OFFSET 0x400
-+
-+	/** Host Port 0 Control and Status Register */
-+	volatile uint32_t *hprt0;
-+#define DWC_OTG_HOST_PORT_REGS_OFFSET 0x440
-+
-+	/** Host Channel Specific Registers at offsets 500h-5FCh. */
-+	dwc_otg_hc_regs_t *hc_regs[MAX_EPS_CHANNELS];
-+#define DWC_OTG_HOST_CHAN_REGS_OFFSET 0x500
-+#define DWC_OTG_CHAN_REGS_OFFSET 0x20
-+
-+	/* Host configuration information */
-+	/** Number of Host Channels (range: 1-16) */
-+	uint8_t num_host_channels;
-+	/** Periodic EPs supported (0: no, 1: yes) */
-+	uint8_t perio_eps_supported;
-+	/** Periodic Tx FIFO Size (Only 1 host periodic Tx FIFO) */
-+	uint16_t perio_tx_fifo_size;
-+
-+} dwc_otg_host_if_t;
-+
-+/**
-+ * This union represents the bit fields in the Power and Clock Gating Control
-+ * Register. Read the register into the <i>d32</i> member then set/clear the
-+ * bits using the <i>b</i>it elements.
-+ */
-+typedef union pcgcctl_data {
-+	/** raw register data */
-+	uint32_t d32;
-+
-+	/** register bits */
-+	struct {
-+		/** Stop Pclk */
-+		unsigned stoppclk:1;
-+		/** Gate Hclk */
-+		unsigned gatehclk:1;
-+		/** Power Clamp */
-+		unsigned pwrclmp:1;
-+		/** Reset Power Down Modules */
-+		unsigned rstpdwnmodule:1;
-+		/** Reserved */
-+		unsigned reserved:1;
-+		/** Enable Sleep Clock Gating (Enbl_L1Gating) */
-+		unsigned enbl_sleep_gating:1;
-+		/** PHY In Sleep (PhySleep) */
-+		unsigned phy_in_sleep:1;
-+		/** Deep Sleep*/
-+		unsigned deep_sleep:1;
-+		unsigned resetaftsusp:1;
-+		unsigned restoremode:1;
-+		unsigned enbl_extnd_hiber:1;
-+		unsigned extnd_hiber_pwrclmp:1;
-+		unsigned extnd_hiber_switch:1;
-+		unsigned ess_reg_restored:1;
-+		unsigned prt_clk_sel:2;
-+		unsigned port_power:1;
-+		unsigned max_xcvrselect:2;
-+		unsigned max_termsel:1;
-+		unsigned mac_dev_addr:7;
-+		unsigned p2hd_dev_enum_spd:2;
-+		unsigned p2hd_prt_spd:2;
-+		unsigned if_dev_mode:1;
-+	} b;
-+} pcgcctl_data_t;
-+
-+/**
-+ * This union represents the bit fields in the Global Data FIFO Software
-+ * Configuration Register. Read the register into the <i>d32</i> member then
-+ * set/clear the bits using the <i>b</i>it elements.
-+ */
-+typedef union gdfifocfg_data {
-+	/* raw register data */
-+	uint32_t d32;
-+	/** register bits */
-+	struct {
-+		/** OTG Data FIFO depth */
-+		unsigned gdfifocfg:16;
-+		/** Start address of EP info controller */
-+		unsigned epinfobase:16;
-+	} b;
-+} gdfifocfg_data_t;
-+
-+/**
-+ * This union represents the bit fields in the Global Power Down Register
-+ * Register. Read the register into the <i>d32</i> member then set/clear the
-+ * bits using the <i>b</i>it elements.
-+ */
-+typedef union gpwrdn_data {
-+	/* raw register data */
-+	uint32_t d32;
-+
-+	/** register bits */
-+	struct {
-+		/** PMU Interrupt Select */
-+		unsigned pmuintsel:1;
-+		/** PMU Active */
-+		unsigned pmuactv:1;
-+		/** Restore */
-+		unsigned restore:1;
-+		/** Power Down Clamp */
-+		unsigned pwrdnclmp:1;
-+		/** Power Down Reset */
-+		unsigned pwrdnrstn:1;
-+		/** Power Down Switch */
-+		unsigned pwrdnswtch:1;
-+		/** Disable VBUS */
-+		unsigned dis_vbus:1;
-+		/** Line State Change */
-+		unsigned lnstschng:1;
-+		/** Line state change mask */
-+		unsigned lnstchng_msk:1;
-+		/** Reset Detected */
-+		unsigned rst_det:1;
-+		/** Reset Detect mask */
-+		unsigned rst_det_msk:1;
-+		/** Disconnect Detected */
-+		unsigned disconn_det:1;
-+		/** Disconnect Detect mask */
-+		unsigned disconn_det_msk:1;
-+		/** Connect Detected*/
-+		unsigned connect_det:1;
-+		/** Connect Detected Mask*/
-+		unsigned connect_det_msk:1;
-+		/** SRP Detected */
-+		unsigned srp_det:1;
-+		/** SRP Detect mask */
-+		unsigned srp_det_msk:1;
-+		/** Status Change Interrupt */
-+		unsigned sts_chngint:1;
-+		/** Status Change Interrupt Mask */
-+		unsigned sts_chngint_msk:1;
-+		/** Line State */
-+		unsigned linestate:2;
-+		/** Indicates current mode(status of IDDIG signal) */
-+		unsigned idsts:1;
-+		/** B Session Valid signal status*/
-+		unsigned bsessvld:1;
-+		/** ADP Event Detected */
-+		unsigned adp_int:1;
-+		/** Multi Valued ID pin */
-+		unsigned mult_val_id_bc:5;
-+		/** Reserved 24_31 */
-+		unsigned reserved29_31:3;
-+	} b;
-+} gpwrdn_data_t;
-+
-+#endif
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/test/Makefile
-@@ -0,0 +1,16 @@
-+
-+PERL=/usr/bin/perl
-+PL_TESTS=test_sysfs.pl test_mod_param.pl
-+
-+.PHONY : test
-+test : perl_tests
-+
-+perl_tests :
-+	@echo
-+	@echo Running perl tests
-+	@for test in $(PL_TESTS); do \
-+	  if $(PERL) ./$$test ; then \
-+	    echo "=======> $$test, PASSED" ; \
-+	  else echo "=======> $$test, FAILED" ; \
-+	  fi \
-+	done
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm
-@@ -0,0 +1,337 @@
-+package dwc_otg_test;
-+
-+use strict;
-+use Exporter ();
-+
-+use vars qw(@ISA @EXPORT
-+$sysfsdir $paramdir $errors $params
-+);
-+
-+@ISA = qw(Exporter);
-+
-+#
-+# Globals
-+#
-+$sysfsdir = "/sys/devices/lm0";
-+$paramdir = "/sys/module/dwc_otg";
-+$errors = 0;
-+
-+$params = [
-+	   {
-+	    NAME => "otg_cap",
-+	    DEFAULT => 0,
-+	    ENUM => [],
-+	    LOW => 0,
-+	    HIGH => 2
-+	   },
-+	   {
-+	    NAME => "dma_enable",
-+	    DEFAULT => 0,
-+	    ENUM => [],
-+	    LOW => 0,
-+	    HIGH => 1
-+	   },
-+	   {
-+	    NAME => "dma_burst_size",
-+	    DEFAULT => 32,
-+	    ENUM => [1, 4, 8, 16, 32, 64, 128, 256],
-+	    LOW => 1,
-+	    HIGH => 256
-+	   },
-+	   {
-+	    NAME => "host_speed",
-+	    DEFAULT => 0,
-+	    ENUM => [],
-+	    LOW => 0,
-+	    HIGH => 1
-+	   },
-+	   {
-+	    NAME => "host_support_fs_ls_low_power",
-+	    DEFAULT => 0,
-+	    ENUM => [],
-+	    LOW => 0,
-+	    HIGH => 1
-+	   },
-+	   {
-+	    NAME => "host_ls_low_power_phy_clk",
-+	    DEFAULT => 0,
-+	    ENUM => [],
-+	    LOW => 0,
-+	    HIGH => 1
-+	   },
-+	   {
-+	    NAME => "dev_speed",
-+	    DEFAULT => 0,
-+	    ENUM => [],
-+	    LOW => 0,
-+	    HIGH => 1
-+	   },
-+	   {
-+	    NAME => "enable_dynamic_fifo",
-+	    DEFAULT => 1,
-+	    ENUM => [],
-+	    LOW => 0,
-+	    HIGH => 1
-+	   },
-+	   {
-+	    NAME => "data_fifo_size",
-+	    DEFAULT => 8192,
-+	    ENUM => [],
-+	    LOW => 32,
-+	    HIGH => 32768
-+	   },
-+	   {
-+	    NAME => "dev_rx_fifo_size",
-+	    DEFAULT => 1064,
-+	    ENUM => [],
-+	    LOW => 16,
-+	    HIGH => 32768
-+	   },
-+	   {
-+	    NAME => "dev_nperio_tx_fifo_size",
-+	    DEFAULT => 1024,
-+	    ENUM => [],
-+	    LOW => 16,
-+	    HIGH => 32768
-+	   },
-+	   {
-+	    NAME => "dev_perio_tx_fifo_size_1",
-+	    DEFAULT => 256,
-+	    ENUM => [],
-+	    LOW => 4,
-+	    HIGH => 768
-+	   },
-+	   {
-+	    NAME => "dev_perio_tx_fifo_size_2",
-+	    DEFAULT => 256,
-+	    ENUM => [],
-+	    LOW => 4,
-+	    HIGH => 768
-+	   },
-+	   {
-+	    NAME => "dev_perio_tx_fifo_size_3",
-+	    DEFAULT => 256,
-+	    ENUM => [],
-+	    LOW => 4,
-+	    HIGH => 768
-+	   },
-+	   {
-+	    NAME => "dev_perio_tx_fifo_size_4",
-+	    DEFAULT => 256,
-+	    ENUM => [],
-+	    LOW => 4,
-+	    HIGH => 768
-+	   },
-+	   {
-+	    NAME => "dev_perio_tx_fifo_size_5",
-+	    DEFAULT => 256,
-+	    ENUM => [],
-+	    LOW => 4,
-+	    HIGH => 768
-+	   },
-+	   {
-+	    NAME => "dev_perio_tx_fifo_size_6",
-+	    DEFAULT => 256,
-+	    ENUM => [],
-+	    LOW => 4,
-+	    HIGH => 768
-+	   },
-+	   {
-+	    NAME => "dev_perio_tx_fifo_size_7",
-+	    DEFAULT => 256,
-+	    ENUM => [],
-+	    LOW => 4,
-+	    HIGH => 768
-+	   },
-+	   {
-+	    NAME => "dev_perio_tx_fifo_size_8",
-+	    DEFAULT => 256,
-+	    ENUM => [],
-+	    LOW => 4,
-+	    HIGH => 768
-+	   },
-+	   {
-+	    NAME => "dev_perio_tx_fifo_size_9",
-+	    DEFAULT => 256,
-+	    ENUM => [],
-+	    LOW => 4,
-+	    HIGH => 768
-+	   },
-+	   {
-+	    NAME => "dev_perio_tx_fifo_size_10",
-+	    DEFAULT => 256,
-+	    ENUM => [],
-+	    LOW => 4,
-+	    HIGH => 768
-+	   },
-+	   {
-+	    NAME => "dev_perio_tx_fifo_size_11",
-+	    DEFAULT => 256,
-+	    ENUM => [],
-+	    LOW => 4,
-+	    HIGH => 768
-+	   },
-+	   {
-+	    NAME => "dev_perio_tx_fifo_size_12",
-+	    DEFAULT => 256,
-+	    ENUM => [],
-+	    LOW => 4,
-+	    HIGH => 768
-+	   },
-+	   {
-+	    NAME => "dev_perio_tx_fifo_size_13",
-+	    DEFAULT => 256,
-+	    ENUM => [],
-+	    LOW => 4,
-+	    HIGH => 768
-+	   },
-+	   {
-+	    NAME => "dev_perio_tx_fifo_size_14",
-+	    DEFAULT => 256,
-+	    ENUM => [],
-+	    LOW => 4,
-+	    HIGH => 768
-+	   },
-+	   {
-+	    NAME => "dev_perio_tx_fifo_size_15",
-+	    DEFAULT => 256,
-+	    ENUM => [],
-+	    LOW => 4,
-+	    HIGH => 768
-+	   },
-+	   {
-+	    NAME => "host_rx_fifo_size",
-+	    DEFAULT => 1024,
-+	    ENUM => [],
-+	    LOW => 16,
-+	    HIGH => 32768
-+	   },
-+	   {
-+	    NAME => "host_nperio_tx_fifo_size",
-+	    DEFAULT => 1024,
-+	    ENUM => [],
-+	    LOW => 16,
-+	    HIGH => 32768
-+	   },
-+	   {
-+	    NAME => "host_perio_tx_fifo_size",
-+	    DEFAULT => 1024,
-+	    ENUM => [],
-+	    LOW => 16,
-+	    HIGH => 32768
-+	   },
-+	   {
-+	    NAME => "max_transfer_size",
-+	    DEFAULT => 65535,
-+	    ENUM => [],
-+	    LOW => 2047,
-+	    HIGH => 65535
-+	   },
-+	   {
-+	    NAME => "max_packet_count",
-+	    DEFAULT => 511,
-+	    ENUM => [],
-+	    LOW => 15,
-+	    HIGH => 511
-+	   },
-+	   {
-+	    NAME => "host_channels",
-+	    DEFAULT => 12,
-+	    ENUM => [],
-+	    LOW => 1,
-+	    HIGH => 16
-+	   },
-+	   {
-+	    NAME => "dev_endpoints",
-+	    DEFAULT => 6,
-+	    ENUM => [],
-+	    LOW => 1,
-+	    HIGH => 15
-+	   },
-+	   {
-+	    NAME => "phy_type",
-+	    DEFAULT => 1,
-+	    ENUM => [],
-+	    LOW => 0,
-+	    HIGH => 2
-+	   },
-+	   {
-+	    NAME => "phy_utmi_width",
-+	    DEFAULT => 16,
-+	    ENUM => [8, 16],
-+	    LOW => 8,
-+	    HIGH => 16
-+	   },
-+	   {
-+	    NAME => "phy_ulpi_ddr",
-+	    DEFAULT => 0,
-+	    ENUM => [],
-+	    LOW => 0,
-+	    HIGH => 1
-+	   },
-+	  ];
-+
-+
-+#
-+#
-+sub check_arch {
-+  $_ = `uname -m`;
-+  chomp;
-+  unless (m/armv4tl/) {
-+    warn "# \n# Can't execute on $_.  Run on integrator platform.\n# \n";
-+    return 0;
-+  }
-+  return 1;
-+}
-+
-+#
-+#
-+sub load_module {
-+  my $params = shift;
-+  print "\nRemoving Module\n";
-+  system "rmmod dwc_otg";
-+  print "Loading Module\n";
-+  if ($params ne "") {
-+    print "Module Parameters: $params\n";
-+  }
-+  if (system("modprobe dwc_otg $params")) {
-+    warn "Unable to load module\n";
-+    return 0;
-+  }
-+  return 1;
-+}
-+
-+#
-+#
-+sub test_status {
-+  my $arg = shift;
-+
-+  print "\n";
-+
-+  if (defined $arg) {
-+    warn "WARNING: $arg\n";
-+  }
-+
-+  if ($errors > 0) {
-+    warn "TEST FAILED with $errors errors\n";
-+    return 0;
-+  } else {
-+    print "TEST PASSED\n";
-+    return 0 if (defined $arg);
-+  }
-+  return 1;
-+}
-+
-+#
-+#
-+@EXPORT = qw(
-+$sysfsdir
-+$paramdir
-+$params
-+$errors
-+check_arch
-+load_module
-+test_status
-+);
-+
-+1;
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/test/test_mod_param.pl
-@@ -0,0 +1,133 @@
-+#!/usr/bin/perl -w
-+#
-+# Run this program on the integrator.
-+#
-+# - Tests module parameter default values.
-+# - Tests setting of valid module parameter values via modprobe.
-+# - Tests invalid module parameter values.
-+# -----------------------------------------------------------------------------
-+use strict;
-+use dwc_otg_test;
-+
-+check_arch() or die;
-+
-+#
-+#
-+sub test {
-+  my ($param,$expected) = @_;
-+  my $value = get($param);
-+
-+  if ($value == $expected) {
-+    print "$param = $value, okay\n";
-+  }
-+
-+  else {
-+    warn "ERROR: value of $param != $expected, $value\n";
-+    $errors ++;
-+  }
-+}
-+
-+#
-+#
-+sub get {
-+  my $param = shift;
-+  my $tmp = `cat $paramdir/$param`;
-+  chomp $tmp;
-+  return $tmp;
-+}
-+
-+#
-+#
-+sub test_main {
-+
-+  print "\nTesting Module Parameters\n";
-+
-+  load_module("") or die;
-+
-+  # Test initial values
-+  print "\nTesting Default Values\n";
-+  foreach (@{$params}) {
-+    test ($_->{NAME}, $_->{DEFAULT});
-+  }
-+
-+  # Test low value
-+  print "\nTesting Low Value\n";
-+  my $cmd_params = "";
-+  foreach (@{$params}) {
-+    $cmd_params = $cmd_params . "$_->{NAME}=$_->{LOW} ";
-+  }
-+  load_module($cmd_params) or die;
-+
-+  foreach (@{$params}) {
-+    test ($_->{NAME}, $_->{LOW});
-+  }
-+
-+  # Test high value
-+  print "\nTesting High Value\n";
-+  $cmd_params = "";
-+  foreach (@{$params}) {
-+    $cmd_params = $cmd_params . "$_->{NAME}=$_->{HIGH} ";
-+  }
-+  load_module($cmd_params) or die;
-+
-+  foreach (@{$params}) {
-+    test ($_->{NAME}, $_->{HIGH});
-+  }
-+
-+  # Test Enum
-+  print "\nTesting Enumerated\n";
-+  foreach (@{$params}) {
-+    if (defined $_->{ENUM}) {
-+      my $value;
-+      foreach $value (@{$_->{ENUM}}) {
-+	$cmd_params = "$_->{NAME}=$value";
-+	load_module($cmd_params) or die;
-+	test ($_->{NAME}, $value);
-+      }
-+    }
-+  }
-+
-+  # Test Invalid Values
-+  print "\nTesting Invalid Values\n";
-+  $cmd_params = "";
-+  foreach (@{$params}) {
-+    $cmd_params = $cmd_params . sprintf "$_->{NAME}=%d ", $_->{LOW}-1;
-+  }
-+  load_module($cmd_params) or die;
-+
-+  foreach (@{$params}) {
-+    test ($_->{NAME}, $_->{DEFAULT});
-+  }
-+
-+  $cmd_params = "";
-+  foreach (@{$params}) {
-+    $cmd_params = $cmd_params . sprintf "$_->{NAME}=%d ", $_->{HIGH}+1;
-+  }
-+  load_module($cmd_params) or die;
-+
-+  foreach (@{$params}) {
-+    test ($_->{NAME}, $_->{DEFAULT});
-+  }
-+
-+  print "\nTesting Enumerated\n";
-+  foreach (@{$params}) {
-+    if (defined $_->{ENUM}) {
-+      my $value;
-+      foreach $value (@{$_->{ENUM}}) {
-+	$value = $value + 1;
-+	$cmd_params = "$_->{NAME}=$value";
-+	load_module($cmd_params) or die;
-+	test ($_->{NAME}, $_->{DEFAULT});
-+	$value = $value - 2;
-+	$cmd_params = "$_->{NAME}=$value";
-+	load_module($cmd_params) or die;
-+	test ($_->{NAME}, $_->{DEFAULT});
-+      }
-+    }
-+  }
-+
-+  test_status() or die;
-+}
-+
-+test_main();
-+0;
---- /dev/null
-+++ b/drivers/usb/host/dwc_otg/test/test_sysfs.pl
-@@ -0,0 +1,193 @@
-+#!/usr/bin/perl -w
-+#
-+# Run this program on the integrator
-+# - Tests select sysfs attributes.
-+# - Todo ... test more attributes, hnp/srp, buspower/bussuspend, etc.
-+# -----------------------------------------------------------------------------
-+use strict;
-+use dwc_otg_test;
-+
-+check_arch() or die;
-+
-+#
-+#
-+sub test {
-+  my ($attr,$expected) = @_;
-+  my $string = get($attr);
-+
-+  if ($string eq $expected) {
-+    printf("$attr = $string, okay\n");
-+  }
-+  else {
-+    warn "ERROR: value of $attr != $expected, $string\n";
-+    $errors ++;
-+  }
-+}
-+
-+#
-+#
-+sub set {
-+  my ($reg, $value) = @_;
-+  system "echo $value > $sysfsdir/$reg";
-+}
-+
-+#
-+#
-+sub get {
-+  my $attr = shift;
-+  my $string = `cat $sysfsdir/$attr`;
-+  chomp $string;
-+  if ($string =~ m/\s\=\s/) {
-+    my $tmp;
-+    ($tmp, $string) = split /\s=\s/, $string;
-+  }
-+  return $string;
-+}
-+
-+#
-+#
-+sub test_main {
-+  print("\nTesting Sysfs Attributes\n");
-+
-+  load_module("") or die;
-+
-+  # Test initial values of regoffset/regvalue/guid/gsnpsid
-+  print("\nTesting Default Values\n");
-+
-+  test("regoffset", "0xffffffff");
-+  test("regvalue", "invalid offset");
-+  test("guid", "0x12345678");	# this will fail if it has been changed
-+  test("gsnpsid", "0x4f54200a");
-+
-+  # Test operation of regoffset/regvalue
-+  print("\nTesting regoffset\n");
-+  set('regoffset', '5a5a5a5a');
-+  test("regoffset", "0xffffffff");
-+
-+  set('regoffset', '0');
-+  test("regoffset", "0x00000000");
-+
-+  set('regoffset', '40000');
-+  test("regoffset", "0x00000000");
-+
-+  set('regoffset', '3ffff');
-+  test("regoffset", "0x0003ffff");
-+
-+  set('regoffset', '1');
-+  test("regoffset", "0x00000001");
-+
-+  print("\nTesting regvalue\n");
-+  set('regoffset', '3c');
-+  test("regvalue", "0x12345678");
-+  set('regvalue', '5a5a5a5a');
-+  test("regvalue", "0x5a5a5a5a");
-+  set('regvalue','a5a5a5a5');
-+  test("regvalue", "0xa5a5a5a5");
-+  set('guid','12345678');
-+
-+  # Test HNP Capable
-+  print("\nTesting HNP Capable bit\n");
-+  set('hnpcapable', '1');
-+  test("hnpcapable", "0x1");
-+  set('hnpcapable','0');
-+  test("hnpcapable", "0x0");
-+
-+  set('regoffset','0c');
-+
-+  my $old = get('gusbcfg');
-+  print("setting hnpcapable\n");
-+  set('hnpcapable', '1');
-+  test("hnpcapable", "0x1");
-+  test('gusbcfg', sprintf "0x%08x", (oct ($old) | (1<<9)));
-+  test('regvalue', sprintf "0x%08x", (oct ($old) | (1<<9)));
-+
-+  $old = get('gusbcfg');
-+  print("clearing hnpcapable\n");
-+  set('hnpcapable', '0');
-+  test("hnpcapable", "0x0");
-+  test ('gusbcfg', sprintf "0x%08x", oct ($old) & (~(1<<9)));
-+  test ('regvalue', sprintf "0x%08x", oct ($old) & (~(1<<9)));
-+
-+  # Test SRP Capable
-+  print("\nTesting SRP Capable bit\n");
-+  set('srpcapable', '1');
-+  test("srpcapable", "0x1");
-+  set('srpcapable','0');
-+  test("srpcapable", "0x0");
-+
-+  set('regoffset','0c');
-+
-+  $old = get('gusbcfg');
-+  print("setting srpcapable\n");
-+  set('srpcapable', '1');
-+  test("srpcapable", "0x1");
-+  test('gusbcfg', sprintf "0x%08x", (oct ($old) | (1<<8)));
-+  test('regvalue', sprintf "0x%08x", (oct ($old) | (1<<8)));
-+
-+  $old = get('gusbcfg');
-+  print("clearing srpcapable\n");
-+  set('srpcapable', '0');
-+  test("srpcapable", "0x0");
-+  test('gusbcfg', sprintf "0x%08x", oct ($old) & (~(1<<8)));
-+  test('regvalue', sprintf "0x%08x", oct ($old) & (~(1<<8)));
-+
-+  # Test GGPIO
-+  print("\nTesting GGPIO\n");
-+  set('ggpio','5a5a5a5a');
-+  test('ggpio','0x5a5a0000');
-+  set('ggpio','a5a5a5a5');
-+  test('ggpio','0xa5a50000');
-+  set('ggpio','11110000');
-+  test('ggpio','0x11110000');
-+  set('ggpio','00001111');
-+  test('ggpio','0x00000000');
-+
-+  # Test DEVSPEED
-+  print("\nTesting DEVSPEED\n");
-+  set('regoffset','800');
-+  $old = get('regvalue');
-+  set('devspeed','0');
-+  test('devspeed','0x0');
-+  test('regvalue',sprintf("0x%08x", oct($old) & ~(0x3)));
-+  set('devspeed','1');
-+  test('devspeed','0x1');
-+  test('regvalue',sprintf("0x%08x", oct($old) & ~(0x3) | 1));
-+  set('devspeed','2');
-+  test('devspeed','0x2');
-+  test('regvalue',sprintf("0x%08x", oct($old) & ~(0x3) | 2));
-+  set('devspeed','3');
-+  test('devspeed','0x3');
-+  test('regvalue',sprintf("0x%08x", oct($old) & ~(0x3) | 3));
-+  set('devspeed','4');
-+  test('devspeed','0x0');
-+  test('regvalue',sprintf("0x%08x", oct($old) & ~(0x3)));
-+  set('devspeed','5');
-+  test('devspeed','0x1');
-+  test('regvalue',sprintf("0x%08x", oct($old) & ~(0x3) | 1));
-+
-+
-+  #  mode	Returns the current mode:0 for device mode1 for host mode	Read
-+  #  hnp	Initiate the Host Negotiation Protocol.  Read returns the status.	Read/Write
-+  #  srp	Initiate the Session Request Protocol.  Read returns the status.	Read/Write
-+  #  buspower	Get or Set the Power State of the bus (0 - Off or 1 - On) 	Read/Write
-+  #  bussuspend	Suspend the USB bus.	Read/Write
-+  #  busconnected	Get the connection status of the bus 	Read
-+
-+  #  gotgctl	Get or set the Core Control Status Register.	Read/Write
-+  ##  gusbcfg	Get or set the Core USB Configuration Register	Read/Write
-+  #  grxfsiz	Get or set the Receive FIFO Size Register	Read/Write
-+  #  gnptxfsiz	Get or set the non-periodic Transmit Size Register	Read/Write
-+  #  gpvndctl	Get or set the PHY Vendor Control Register	Read/Write
-+  ##  ggpio	Get the value in the lower 16-bits of the General Purpose IO Register or Set the upper 16 bits.	Read/Write
-+  ##  guid	Get or set the value of the User ID Register	Read/Write
-+  ##  gsnpsid	Get the value of the Synopsys ID Regester	Read
-+  ##  devspeed	Get or set the device speed setting in the DCFG register	Read/Write
-+  #  enumspeed	Gets the device enumeration Speed.	Read
-+  #  hptxfsiz	Get the value of the Host Periodic Transmit FIFO	Read
-+  #  hprt0	Get or Set the value in the Host Port Control and Status Register	Read/Write
-+
-+  test_status("TEST NYI") or die;
-+}
-+
-+test_main();
-+0;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0107-bcm2708-framebuffer-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0107-bcm2708-framebuffer-driver.patch
deleted file mode 100644
index a8dd53e43d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0107-bcm2708-framebuffer-driver.patch
+++ /dev/null
@@ -1,3548 +0,0 @@
-From 640ae454312e24218849ca16c8a478aafc1e880f Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Wed, 17 Jun 2015 17:06:34 +0100
-Subject: [PATCH] bcm2708 framebuffer driver
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: popcornmix <popcornmix@gmail.com>
-
-bcm2708_fb : Implement blanking support using the mailbox property interface
-
-bcm2708_fb: Add pan and vsync controls
-
-bcm2708_fb: DMA acceleration for fb_copyarea
-
-Based on http://www.raspberrypi.org/phpBB3/viewtopic.php?p=62425#p62425
-Also used Simon's dmaer_master module as a reference for tweaking DMA
-settings for better performance.
-
-For now busylooping only. IRQ support might be added later.
-With non-overclocked Raspberry Pi, the performance is ~360 MB/s
-for simple copy or ~260 MB/s for two-pass copy (used when dragging
-windows to the right).
-
-In the case of using DMA channel 0, the performance improves
-to ~440 MB/s.
-
-For comparison, VFP optimized CPU copy can only do ~114 MB/s in
-the same conditions (hindered by reading uncached source buffer).
-
-Signed-off-by: Siarhei Siamashka <siarhei.siamashka@gmail.com>
-
-bcm2708_fb: report number of dma copies
-
-Add a counter (exported via debugfs) reporting the
-number of dma copies that the framebuffer driver
-has done, in order to help evaluate different
-optimization strategies.
-
-Signed-off-by: Luke Diamand <luked@broadcom.com>
-
-bcm2708_fb: use IRQ for DMA copies
-
-The copyarea ioctl() uses DMA to speed things along. This
-was busy-waiting for completion. This change supports using
-an interrupt instead for larger transfers. For small
-transfers, busy-waiting is still likely to be faster.
-
-Signed-off-by: Luke Diamand <luke@diamand.org>
-
-bcm2708: Make ioctl logging quieter
-
-video: fbdev: bcm2708_fb: Don't panic on error
-
-No need to panic the kernel if the video driver fails.
-Just print a message and return an error.
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-
-fbdev: bcm2708_fb: Add ARCH_BCM2835 support
-
-Add Device Tree support.
-Pass the device to dma_alloc_coherent() in order to get the
-correct bus address on ARCH_BCM2835.
-Use the new DMA legacy API header file.
-Including <mach/platform.h> is not necessary.
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-
-BCM270x_DT: Add bcm2708-fb device
-
-Add bcm2708-fb to Device Tree and don't add the
-platform device when booting in DT mode.
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-
-Cleanup of bcm2708_fb file to kernel coding standards
-
-Some minor change to function - remove a use of
-in_atomic, plus replacing various debug messages
-that manually specify the function name with
-("%s",.__func__)
-
-Signed-off-by: James Hughes <james.hughes@raspberrypi.org>
-
-video: bcm2708_fb: Try allocating on the ARM and passing to VPU
-
-Currently the VPU allocates the contiguous buffer for the
-framebuffer.
-Try an alternate path first where we use dma_alloc_coherent
-and pass the buffer to the VPU. Should the VPU firmware not
-support that path, then free the buffer and revert to the
-old behaviour of using the VPU allocation.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- drivers/video/fbdev/Kconfig               |   14 +
- drivers/video/fbdev/Makefile              |    1 +
- drivers/video/fbdev/bcm2708_fb.c          |  920 ++++++++
- drivers/video/logo/logo_linux_clut224.ppm | 2483 ++++++++-------------
- 4 files changed, 1816 insertions(+), 1602 deletions(-)
- create mode 100644 drivers/video/fbdev/bcm2708_fb.c
-
---- a/drivers/video/fbdev/Kconfig
-+++ b/drivers/video/fbdev/Kconfig
-@@ -212,6 +212,20 @@ config FB_TILEBLITTING
- comment "Frame buffer hardware drivers"
- 	depends on FB
- 
-+config FB_BCM2708
-+	tristate "BCM2708 framebuffer support"
-+	depends on FB && RASPBERRYPI_FIRMWARE
-+	select FB_CFB_FILLRECT
-+	select FB_CFB_COPYAREA
-+	select FB_CFB_IMAGEBLIT
-+	help
-+	  This framebuffer device driver is for the BCM2708 framebuffer.
-+
-+	  If you want to compile this as a module (=code which can be
-+	  inserted into and removed from the running kernel), say M
-+	  here and read <file:Documentation/kbuild/modules.txt>.  The module
-+	  will be called bcm2708_fb.
-+
- config FB_GRVGA
- 	tristate "Aeroflex Gaisler framebuffer support"
- 	depends on FB && SPARC
---- a/drivers/video/fbdev/Makefile
-+++ b/drivers/video/fbdev/Makefile
-@@ -11,6 +11,7 @@ obj-$(CONFIG_FB_MACMODES)      += macmod
- obj-$(CONFIG_FB_WMT_GE_ROPS)   += wmt_ge_rops.o
- 
- # Hardware specific drivers go first
-+obj-$(CONFIG_FB_BCM2708)	  += bcm2708_fb.o
- obj-$(CONFIG_FB_AMIGA)            += amifb.o c2p_planar.o
- obj-$(CONFIG_FB_ARC)              += arcfb.o
- obj-$(CONFIG_FB_CLPS711X)	  += clps711x-fb.o
---- /dev/null
-+++ b/drivers/video/fbdev/bcm2708_fb.c
-@@ -0,0 +1,920 @@
-+/*
-+ *  linux/drivers/video/bcm2708_fb.c
-+ *
-+ * Copyright (C) 2010 Broadcom
-+ *
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License.  See the file COPYING in the main directory of this archive
-+ * for more details.
-+ *
-+ * Broadcom simple framebuffer driver
-+ *
-+ * This file is derived from cirrusfb.c
-+ * Copyright 1999-2001 Jeff Garzik <jgarzik@pobox.com>
-+ *
-+ */
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/errno.h>
-+#include <linux/string.h>
-+#include <linux/slab.h>
-+#include <linux/mm.h>
-+#include <linux/fb.h>
-+#include <linux/init.h>
-+#include <linux/interrupt.h>
-+#include <linux/ioport.h>
-+#include <linux/list.h>
-+#include <linux/platform_data/dma-bcm2708.h>
-+#include <linux/platform_device.h>
-+#include <linux/clk.h>
-+#include <linux/printk.h>
-+#include <linux/console.h>
-+#include <linux/debugfs.h>
-+#include <linux/io.h>
-+#include <linux/dma-mapping.h>
-+#include <soc/bcm2835/raspberrypi-firmware.h>
-+
-+//#define BCM2708_FB_DEBUG
-+#define MODULE_NAME "bcm2708_fb"
-+
-+#ifdef BCM2708_FB_DEBUG
-+#define print_debug(fmt, ...) pr_debug("%s:%s:%d: " fmt, \
-+			MODULE_NAME, __func__, __LINE__, ##__VA_ARGS__)
-+#else
-+#define print_debug(fmt, ...)
-+#endif
-+
-+/* This is limited to 16 characters when displayed by X startup */
-+static const char *bcm2708_name = "BCM2708 FB";
-+
-+#define DRIVER_NAME "bcm2708_fb"
-+
-+static int fbwidth = 800;	/* module parameter */
-+static int fbheight = 480;	/* module parameter */
-+static int fbdepth = 32;	/* module parameter */
-+static int fbswap;		/* module parameter */
-+
-+static u32 dma_busy_wait_threshold = 1 << 15;
-+module_param(dma_busy_wait_threshold, int, 0644);
-+MODULE_PARM_DESC(dma_busy_wait_threshold, "Busy-wait for DMA completion below this area");
-+
-+struct fb_alloc_tags {
-+	struct rpi_firmware_property_tag_header tag1;
-+	u32 xres, yres;
-+	struct rpi_firmware_property_tag_header tag2;
-+	u32 xres_virtual, yres_virtual;
-+	struct rpi_firmware_property_tag_header tag3;
-+	u32 bpp;
-+	struct rpi_firmware_property_tag_header tag4;
-+	u32 xoffset, yoffset;
-+	struct rpi_firmware_property_tag_header tag5;
-+	u32 base, screen_size;
-+	struct rpi_firmware_property_tag_header tag6;
-+	u32 pitch;
-+};
-+
-+struct bcm2708_fb_stats {
-+	struct debugfs_regset32 regset;
-+	u32 dma_copies;
-+	u32 dma_irqs;
-+};
-+
-+struct bcm2708_fb {
-+	struct fb_info fb;
-+	struct platform_device *dev;
-+	struct rpi_firmware *fw;
-+	u32 cmap[16];
-+	u32 gpu_cmap[256];
-+	int dma_chan;
-+	int dma_irq;
-+	void __iomem *dma_chan_base;
-+	void *cb_base;		/* DMA control blocks */
-+	dma_addr_t cb_handle;
-+	struct dentry *debugfs_dir;
-+	wait_queue_head_t dma_waitq;
-+	struct bcm2708_fb_stats stats;
-+	unsigned long fb_bus_address;
-+	bool disable_arm_alloc;
-+	unsigned int image_size;
-+	dma_addr_t dma_addr;
-+	void *cpuaddr;
-+};
-+
-+#define to_bcm2708(info)	container_of(info, struct bcm2708_fb, fb)
-+
-+static void bcm2708_fb_debugfs_deinit(struct bcm2708_fb *fb)
-+{
-+	debugfs_remove_recursive(fb->debugfs_dir);
-+	fb->debugfs_dir = NULL;
-+}
-+
-+static int bcm2708_fb_debugfs_init(struct bcm2708_fb *fb)
-+{
-+	static struct debugfs_reg32 stats_registers[] = {
-+		{
-+			"dma_copies",
-+			offsetof(struct bcm2708_fb_stats, dma_copies)
-+		},
-+		{
-+			"dma_irqs",
-+			offsetof(struct bcm2708_fb_stats, dma_irqs)
-+		},
-+	};
-+
-+	fb->debugfs_dir = debugfs_create_dir(DRIVER_NAME, NULL);
-+	if (!fb->debugfs_dir) {
-+		pr_warn("%s: could not create debugfs entry\n",
-+			__func__);
-+		return -EFAULT;
-+	}
-+
-+	fb->stats.regset.regs = stats_registers;
-+	fb->stats.regset.nregs = ARRAY_SIZE(stats_registers);
-+	fb->stats.regset.base = &fb->stats;
-+
-+	debugfs_create_regset32("stats", 0444, fb->debugfs_dir,
-+				&fb->stats.regset);
-+	return 0;
-+}
-+
-+static int bcm2708_fb_set_bitfields(struct fb_var_screeninfo *var)
-+{
-+	int ret = 0;
-+
-+	memset(&var->transp, 0, sizeof(var->transp));
-+
-+	var->red.msb_right = 0;
-+	var->green.msb_right = 0;
-+	var->blue.msb_right = 0;
-+
-+	switch (var->bits_per_pixel) {
-+	case 1:
-+	case 2:
-+	case 4:
-+	case 8:
-+		var->red.length = var->bits_per_pixel;
-+		var->red.offset = 0;
-+		var->green.length = var->bits_per_pixel;
-+		var->green.offset = 0;
-+		var->blue.length = var->bits_per_pixel;
-+		var->blue.offset = 0;
-+		break;
-+	case 16:
-+		var->red.length = 5;
-+		var->blue.length = 5;
-+		/*
-+		 * Green length can be 5 or 6 depending whether
-+		 * we're operating in RGB555 or RGB565 mode.
-+		 */
-+		if (var->green.length != 5 && var->green.length != 6)
-+			var->green.length = 6;
-+		break;
-+	case 24:
-+		var->red.length = 8;
-+		var->blue.length = 8;
-+		var->green.length = 8;
-+		break;
-+	case 32:
-+		var->red.length = 8;
-+		var->green.length = 8;
-+		var->blue.length = 8;
-+		var->transp.length = 8;
-+		break;
-+	default:
-+		ret = -EINVAL;
-+		break;
-+	}
-+
-+	/*
-+	 * >= 16bpp displays have separate colour component bitfields
-+	 * encoded in the pixel data.  Calculate their position from
-+	 * the bitfield length defined above.
-+	 */
-+	if (ret == 0 && var->bits_per_pixel >= 24 && fbswap) {
-+		var->blue.offset = 0;
-+		var->green.offset = var->blue.offset + var->blue.length;
-+		var->red.offset = var->green.offset + var->green.length;
-+		var->transp.offset = var->red.offset + var->red.length;
-+	} else if (ret == 0 && var->bits_per_pixel >= 24) {
-+		var->red.offset = 0;
-+		var->green.offset = var->red.offset + var->red.length;
-+		var->blue.offset = var->green.offset + var->green.length;
-+		var->transp.offset = var->blue.offset + var->blue.length;
-+	} else if (ret == 0 && var->bits_per_pixel >= 16) {
-+		var->blue.offset = 0;
-+		var->green.offset = var->blue.offset + var->blue.length;
-+		var->red.offset = var->green.offset + var->green.length;
-+		var->transp.offset = var->red.offset + var->red.length;
-+	}
-+
-+	return ret;
-+}
-+
-+static int bcm2708_fb_check_var(struct fb_var_screeninfo *var,
-+				struct fb_info *info)
-+{
-+	/* info input, var output */
-+	print_debug("%s(%p) %dx%d (%dx%d), %d, %d\n",
-+		    __func__, info, info->var.xres, info->var.yres,
-+		    info->var.xres_virtual, info->var.yres_virtual,
-+		    (int)info->screen_size, info->var.bits_per_pixel);
-+	print_debug("%s(%p) %dx%d (%dx%d), %d\n", __func__, var, var->xres,
-+		    var->yres, var->xres_virtual, var->yres_virtual,
-+		    var->bits_per_pixel);
-+
-+	if (!var->bits_per_pixel)
-+		var->bits_per_pixel = 16;
-+
-+	if (bcm2708_fb_set_bitfields(var) != 0) {
-+		pr_err("%s: invalid bits_per_pixel %d\n", __func__,
-+		       var->bits_per_pixel);
-+		return -EINVAL;
-+	}
-+
-+	if (var->xres_virtual < var->xres)
-+		var->xres_virtual = var->xres;
-+	/* use highest possible virtual resolution */
-+	if (var->yres_virtual == -1) {
-+		var->yres_virtual = 480;
-+
-+		pr_err("%s: virtual resolution set to maximum of %dx%d\n",
-+		       __func__, var->xres_virtual, var->yres_virtual);
-+	}
-+	if (var->yres_virtual < var->yres)
-+		var->yres_virtual = var->yres;
-+
-+	if (var->xoffset < 0)
-+		var->xoffset = 0;
-+	if (var->yoffset < 0)
-+		var->yoffset = 0;
-+
-+	/* truncate xoffset and yoffset to maximum if too high */
-+	if (var->xoffset > var->xres_virtual - var->xres)
-+		var->xoffset = var->xres_virtual - var->xres - 1;
-+	if (var->yoffset > var->yres_virtual - var->yres)
-+		var->yoffset = var->yres_virtual - var->yres - 1;
-+
-+	return 0;
-+}
-+
-+static int bcm2708_fb_set_par(struct fb_info *info)
-+{
-+	struct bcm2708_fb *fb = to_bcm2708(info);
-+	struct fb_alloc_tags fbinfo = {
-+		.tag1 = { RPI_FIRMWARE_FRAMEBUFFER_SET_PHYSICAL_WIDTH_HEIGHT,
-+			  8, 0, },
-+			.xres = info->var.xres,
-+			.yres = info->var.yres,
-+		.tag2 = { RPI_FIRMWARE_FRAMEBUFFER_SET_VIRTUAL_WIDTH_HEIGHT,
-+			  8, 0, },
-+			.xres_virtual = info->var.xres_virtual,
-+			.yres_virtual = info->var.yres_virtual,
-+		.tag3 = { RPI_FIRMWARE_FRAMEBUFFER_SET_DEPTH, 4, 0 },
-+			.bpp = info->var.bits_per_pixel,
-+		.tag4 = { RPI_FIRMWARE_FRAMEBUFFER_SET_VIRTUAL_OFFSET, 8, 0 },
-+			.xoffset = info->var.xoffset,
-+			.yoffset = info->var.yoffset,
-+		.tag5 = { RPI_FIRMWARE_FRAMEBUFFER_ALLOCATE, 8, 0 },
-+			/* base and screen_size will be initialised later */
-+		.tag6 = { RPI_FIRMWARE_FRAMEBUFFER_SET_PITCH, 4, 0 },
-+			/* pitch will be initialised later */
-+	};
-+	int ret, image_size;
-+
-+
-+	print_debug("%s(%p) %dx%d (%dx%d), %d, %d\n", __func__, info,
-+		    info->var.xres, info->var.yres, info->var.xres_virtual,
-+		    info->var.yres_virtual, (int)info->screen_size,
-+		    info->var.bits_per_pixel);
-+
-+	/* Try allocating our own buffer. We can specify all the parameters */
-+	image_size = ((info->var.xres * info->var.yres) *
-+		      info->var.bits_per_pixel) >> 3;
-+
-+	if (!fb->disable_arm_alloc &&
-+	    (image_size != fb->image_size || !fb->dma_addr)) {
-+		if (fb->dma_addr) {
-+			dma_free_coherent(info->device, fb->image_size,
-+					  fb->cpuaddr, fb->dma_addr);
-+			fb->image_size = 0;
-+			fb->cpuaddr = NULL;
-+			fb->dma_addr = 0;
-+		}
-+
-+		fb->cpuaddr = dma_alloc_coherent(info->device, image_size,
-+						 &fb->dma_addr, GFP_KERNEL);
-+
-+		if (!fb->cpuaddr) {
-+			fb->dma_addr = 0;
-+			fb->disable_arm_alloc = true;
-+		} else {
-+			fb->image_size = image_size;
-+		}
-+	}
-+
-+	if (fb->cpuaddr) {
-+		fbinfo.base = fb->dma_addr;
-+		fbinfo.screen_size = image_size;
-+		fbinfo.pitch = (info->var.xres * info->var.bits_per_pixel) >> 3;
-+
-+		ret = rpi_firmware_property_list(fb->fw, &fbinfo,
-+						 sizeof(fbinfo));
-+		if (ret || fbinfo.base != fb->dma_addr) {
-+			/* Firmware either failed, or assigned a different base
-+			 * address (ie it doesn't support being passed an FB
-+			 * allocation).
-+			 * Destroy the allocation, and don't try again.
-+			 */
-+			dma_free_coherent(info->device, fb->image_size,
-+					  fb->cpuaddr, fb->dma_addr);
-+			fb->image_size = 0;
-+			fb->cpuaddr = NULL;
-+			fb->dma_addr = 0;
-+			fb->disable_arm_alloc = true;
-+		}
-+	} else {
-+		/* Our allocation failed - drop into the old scheme of
-+		 * allocation by the VPU.
-+		 */
-+		ret = -ENOMEM;
-+	}
-+
-+	if (ret) {
-+		/* Old scheme:
-+		 * - FRAMEBUFFER_ALLOCATE passes 0 for base and screen_size.
-+		 * - GET_PITCH instead of SET_PITCH.
-+		 */
-+		fbinfo.base = 0;
-+		fbinfo.screen_size = 0;
-+		fbinfo.tag6.tag = RPI_FIRMWARE_FRAMEBUFFER_GET_PITCH;
-+		fbinfo.pitch = 0;
-+
-+		ret = rpi_firmware_property_list(fb->fw, &fbinfo,
-+						 sizeof(fbinfo));
-+		if (ret) {
-+			dev_err(info->device,
-+				"Failed to allocate GPU framebuffer (%d)\n",
-+				ret);
-+			return ret;
-+		}
-+	}
-+
-+	if (info->var.bits_per_pixel <= 8)
-+		fb->fb.fix.visual = FB_VISUAL_PSEUDOCOLOR;
-+	else
-+		fb->fb.fix.visual = FB_VISUAL_TRUECOLOR;
-+
-+	fb->fb.fix.line_length = fbinfo.pitch;
-+	fbinfo.base |= 0x40000000;
-+	fb->fb_bus_address = fbinfo.base;
-+	fbinfo.base &= ~0xc0000000;
-+	fb->fb.fix.smem_start = fbinfo.base;
-+	fb->fb.fix.smem_len = fbinfo.pitch * fbinfo.yres_virtual;
-+	fb->fb.screen_size = fbinfo.screen_size;
-+
-+	if (!fb->dma_addr) {
-+		if (fb->fb.screen_base)
-+			iounmap(fb->fb.screen_base);
-+
-+		fb->fb.screen_base = ioremap_wc(fbinfo.base,
-+						fb->fb.screen_size);
-+	} else {
-+		fb->fb.screen_base = fb->cpuaddr;
-+	}
-+
-+	if (!fb->fb.screen_base) {
-+		/* the console may currently be locked */
-+		console_trylock();
-+		console_unlock();
-+		dev_err(info->device, "Failed to set screen_base\n");
-+		return -ENOMEM;
-+	}
-+
-+	print_debug("%s: start = %p,%p width=%d, height=%d, bpp=%d, pitch=%d size=%d\n",
-+		    __func__, (void *)fb->fb.screen_base,
-+		    (void *)fb->fb_bus_address, fbinfo.xres, fbinfo.yres,
-+		    fbinfo.bpp, fbinfo.pitch, (int)fb->fb.screen_size);
-+
-+	return 0;
-+}
-+
-+static inline u32 convert_bitfield(int val, struct fb_bitfield *bf)
-+{
-+	unsigned int mask = (1 << bf->length) - 1;
-+
-+	return (val >> (16 - bf->length) & mask) << bf->offset;
-+}
-+
-+static int bcm2708_fb_setcolreg(unsigned int regno, unsigned int red,
-+				unsigned int green, unsigned int blue,
-+				unsigned int transp, struct fb_info *info)
-+{
-+	struct bcm2708_fb *fb = to_bcm2708(info);
-+
-+	if (fb->fb.var.bits_per_pixel <= 8) {
-+		if (regno < 256) {
-+			/* blue [23:16], green [15:8], red [7:0] */
-+			fb->gpu_cmap[regno] = ((red   >> 8) & 0xff) << 0 |
-+					      ((green >> 8) & 0xff) << 8 |
-+					      ((blue  >> 8) & 0xff) << 16;
-+		}
-+		/* Hack: we need to tell GPU the palette has changed, but
-+		 * currently bcm2708_fb_set_par takes noticeable time when
-+		 * called for every (256) colour
-+		 * So just call it for what looks like the last colour in a
-+		 * list for now.
-+		 */
-+		if (regno == 15 || regno == 255) {
-+			struct packet {
-+				u32 offset;
-+				u32 length;
-+				u32 cmap[256];
-+			} *packet;
-+			int ret;
-+
-+			packet = kmalloc(sizeof(*packet), GFP_KERNEL);
-+			if (!packet)
-+				return -ENOMEM;
-+			packet->offset = 0;
-+			packet->length = regno + 1;
-+			memcpy(packet->cmap, fb->gpu_cmap,
-+			       sizeof(packet->cmap));
-+			ret = rpi_firmware_property(fb->fw,
-+						    RPI_FIRMWARE_FRAMEBUFFER_SET_PALETTE,
-+						    packet,
-+						    (2 + packet->length) * sizeof(u32));
-+			if (ret || packet->offset)
-+				dev_err(info->device,
-+					"Failed to set palette (%d,%u)\n",
-+					ret, packet->offset);
-+			kfree(packet);
-+		}
-+	} else if (regno < 16) {
-+		fb->cmap[regno] = convert_bitfield(transp, &fb->fb.var.transp) |
-+				  convert_bitfield(blue, &fb->fb.var.blue) |
-+				  convert_bitfield(green, &fb->fb.var.green) |
-+				  convert_bitfield(red, &fb->fb.var.red);
-+	}
-+	return regno > 255;
-+}
-+
-+static int bcm2708_fb_blank(int blank_mode, struct fb_info *info)
-+{
-+	struct bcm2708_fb *fb = to_bcm2708(info);
-+	u32 value;
-+	int ret;
-+
-+	switch (blank_mode) {
-+	case FB_BLANK_UNBLANK:
-+		value = 0;
-+		break;
-+	case FB_BLANK_NORMAL:
-+	case FB_BLANK_VSYNC_SUSPEND:
-+	case FB_BLANK_HSYNC_SUSPEND:
-+	case FB_BLANK_POWERDOWN:
-+		value = 1;
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	ret = rpi_firmware_property(fb->fw, RPI_FIRMWARE_FRAMEBUFFER_BLANK,
-+				    &value, sizeof(value));
-+	if (ret)
-+		dev_err(info->device, "%s(%d) failed: %d\n", __func__,
-+			blank_mode, ret);
-+
-+	return ret;
-+}
-+
-+static int bcm2708_fb_pan_display(struct fb_var_screeninfo *var,
-+				  struct fb_info *info)
-+{
-+	s32 result;
-+
-+	info->var.xoffset = var->xoffset;
-+	info->var.yoffset = var->yoffset;
-+	result = bcm2708_fb_set_par(info);
-+	if (result != 0)
-+		pr_err("%s(%d,%d) returns=%d\n", __func__, var->xoffset,
-+		       var->yoffset, result);
-+	return result;
-+}
-+
-+static int bcm2708_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
-+{
-+	struct bcm2708_fb *fb = to_bcm2708(info);
-+	u32 dummy = 0;
-+	int ret;
-+
-+	switch (cmd) {
-+	case FBIO_WAITFORVSYNC:
-+		ret = rpi_firmware_property(fb->fw,
-+					    RPI_FIRMWARE_FRAMEBUFFER_SET_VSYNC,
-+					    &dummy, sizeof(dummy));
-+		break;
-+	default:
-+		dev_dbg(info->device, "Unknown ioctl 0x%x\n", cmd);
-+		return -ENOTTY;
-+	}
-+
-+	if (ret)
-+		dev_err(info->device, "ioctl 0x%x failed (%d)\n", cmd, ret);
-+
-+	return ret;
-+}
-+static void bcm2708_fb_fillrect(struct fb_info *info,
-+				const struct fb_fillrect *rect)
-+{
-+	/* (is called) print_debug("bcm2708_fb_fillrect\n"); */
-+	cfb_fillrect(info, rect);
-+}
-+
-+/* A helper function for configuring dma control block */
-+static void set_dma_cb(struct bcm2708_dma_cb *cb,
-+		       int        burst_size,
-+		       dma_addr_t dst,
-+		       int        dst_stride,
-+		       dma_addr_t src,
-+		       int        src_stride,
-+		       int        w,
-+		       int        h)
-+{
-+	cb->info = BCM2708_DMA_BURST(burst_size) | BCM2708_DMA_S_WIDTH |
-+		   BCM2708_DMA_S_INC | BCM2708_DMA_D_WIDTH |
-+		   BCM2708_DMA_D_INC | BCM2708_DMA_TDMODE;
-+	cb->dst = dst;
-+	cb->src = src;
-+	/*
-+	 * This is not really obvious from the DMA documentation,
-+	 * but the top 16 bits must be programmmed to "height -1"
-+	 * and not "height" in 2D mode.
-+	 */
-+	cb->length = ((h - 1) << 16) | w;
-+	cb->stride = ((dst_stride - w) << 16) | (u16)(src_stride - w);
-+	cb->pad[0] = 0;
-+	cb->pad[1] = 0;
-+}
-+
-+static void bcm2708_fb_copyarea(struct fb_info *info,
-+				const struct fb_copyarea *region)
-+{
-+	struct bcm2708_fb *fb = to_bcm2708(info);
-+	struct bcm2708_dma_cb *cb = fb->cb_base;
-+	int bytes_per_pixel = (info->var.bits_per_pixel + 7) >> 3;
-+
-+	/* Channel 0 supports larger bursts and is a bit faster */
-+	int burst_size = (fb->dma_chan == 0) ? 8 : 2;
-+	int pixels = region->width * region->height;
-+
-+	/* Fallback to cfb_copyarea() if we don't like something */
-+	if (bytes_per_pixel > 4 ||
-+	    info->var.xres * info->var.yres > 1920 * 1200 ||
-+	    region->width <= 0 || region->width > info->var.xres ||
-+	    region->height <= 0 || region->height > info->var.yres ||
-+	    region->sx < 0 || region->sx >= info->var.xres ||
-+	    region->sy < 0 || region->sy >= info->var.yres ||
-+	    region->dx < 0 || region->dx >= info->var.xres ||
-+	    region->dy < 0 || region->dy >= info->var.yres ||
-+	    region->sx + region->width > info->var.xres ||
-+	    region->dx + region->width > info->var.xres ||
-+	    region->sy + region->height > info->var.yres ||
-+	    region->dy + region->height > info->var.yres) {
-+		cfb_copyarea(info, region);
-+		return;
-+	}
-+
-+	if (region->dy == region->sy && region->dx > region->sx) {
-+		/*
-+		 * A difficult case of overlapped copy. Because DMA can't
-+		 * copy individual scanlines in backwards direction, we need
-+		 * two-pass processing. We do it by programming a chain of dma
-+		 * control blocks in the first 16K part of the buffer and use
-+		 * the remaining 48K as the intermediate temporary scratch
-+		 * buffer. The buffer size is sufficient to handle up to
-+		 * 1920x1200 resolution at 32bpp pixel depth.
-+		 */
-+		int y;
-+		dma_addr_t control_block_pa = fb->cb_handle;
-+		dma_addr_t scratchbuf = fb->cb_handle + 16 * 1024;
-+		int scanline_size = bytes_per_pixel * region->width;
-+		int scanlines_per_cb = (64 * 1024 - 16 * 1024) / scanline_size;
-+
-+		for (y = 0; y < region->height; y += scanlines_per_cb) {
-+			dma_addr_t src =
-+				fb->fb_bus_address +
-+				bytes_per_pixel * region->sx +
-+				(region->sy + y) * fb->fb.fix.line_length;
-+			dma_addr_t dst =
-+				fb->fb_bus_address +
-+				bytes_per_pixel * region->dx +
-+				(region->dy + y) * fb->fb.fix.line_length;
-+
-+			if (region->height - y < scanlines_per_cb)
-+				scanlines_per_cb = region->height - y;
-+
-+			set_dma_cb(cb, burst_size, scratchbuf, scanline_size,
-+				   src, fb->fb.fix.line_length,
-+				   scanline_size, scanlines_per_cb);
-+			control_block_pa += sizeof(struct bcm2708_dma_cb);
-+			cb->next = control_block_pa;
-+			cb++;
-+
-+			set_dma_cb(cb, burst_size, dst, fb->fb.fix.line_length,
-+				   scratchbuf, scanline_size,
-+				   scanline_size, scanlines_per_cb);
-+			control_block_pa += sizeof(struct bcm2708_dma_cb);
-+			cb->next = control_block_pa;
-+			cb++;
-+		}
-+		/* move the pointer back to the last dma control block */
-+		cb--;
-+	} else {
-+		/* A single dma control block is enough. */
-+		int sy, dy, stride;
-+
-+		if (region->dy <= region->sy) {
-+			/* processing from top to bottom */
-+			dy = region->dy;
-+			sy = region->sy;
-+			stride = fb->fb.fix.line_length;
-+		} else {
-+			/* processing from bottom to top */
-+			dy = region->dy + region->height - 1;
-+			sy = region->sy + region->height - 1;
-+			stride = -fb->fb.fix.line_length;
-+		}
-+		set_dma_cb(cb, burst_size,
-+			   fb->fb_bus_address + dy * fb->fb.fix.line_length +
-+						   bytes_per_pixel * region->dx,
-+			   stride,
-+			   fb->fb_bus_address + sy * fb->fb.fix.line_length +
-+						   bytes_per_pixel * region->sx,
-+			   stride,
-+			   region->width * bytes_per_pixel,
-+			   region->height);
-+	}
-+
-+	/* end of dma control blocks chain */
-+	cb->next = 0;
-+
-+	if (pixels < dma_busy_wait_threshold) {
-+		bcm_dma_start(fb->dma_chan_base, fb->cb_handle);
-+		bcm_dma_wait_idle(fb->dma_chan_base);
-+	} else {
-+		void __iomem *dma_chan = fb->dma_chan_base;
-+
-+		cb->info |= BCM2708_DMA_INT_EN;
-+		bcm_dma_start(fb->dma_chan_base, fb->cb_handle);
-+		while (bcm_dma_is_busy(dma_chan)) {
-+			wait_event_interruptible(fb->dma_waitq,
-+						 !bcm_dma_is_busy(dma_chan));
-+		}
-+		fb->stats.dma_irqs++;
-+	}
-+	fb->stats.dma_copies++;
-+}
-+
-+static void bcm2708_fb_imageblit(struct fb_info *info,
-+				 const struct fb_image *image)
-+{
-+	/* (is called) print_debug("bcm2708_fb_imageblit\n"); */
-+	cfb_imageblit(info, image);
-+}
-+
-+static irqreturn_t bcm2708_fb_dma_irq(int irq, void *cxt)
-+{
-+	struct bcm2708_fb *fb = cxt;
-+
-+	/* FIXME: should read status register to check if this is
-+	 * actually interrupting us or not, in case this interrupt
-+	 * ever becomes shared amongst several DMA channels
-+	 *
-+	 * readl(dma_chan_base + BCM2708_DMA_CS) & BCM2708_DMA_IRQ;
-+	 */
-+
-+	/* acknowledge the interrupt */
-+	writel(BCM2708_DMA_INT, fb->dma_chan_base + BCM2708_DMA_CS);
-+
-+	wake_up(&fb->dma_waitq);
-+	return IRQ_HANDLED;
-+}
-+
-+static struct fb_ops bcm2708_fb_ops = {
-+	.owner = THIS_MODULE,
-+	.fb_check_var = bcm2708_fb_check_var,
-+	.fb_set_par = bcm2708_fb_set_par,
-+	.fb_setcolreg = bcm2708_fb_setcolreg,
-+	.fb_blank = bcm2708_fb_blank,
-+	.fb_fillrect = bcm2708_fb_fillrect,
-+	.fb_copyarea = bcm2708_fb_copyarea,
-+	.fb_imageblit = bcm2708_fb_imageblit,
-+	.fb_pan_display = bcm2708_fb_pan_display,
-+	.fb_ioctl = bcm2708_ioctl,
-+};
-+
-+static int bcm2708_fb_register(struct bcm2708_fb *fb)
-+{
-+	int ret;
-+
-+	fb->fb.fbops = &bcm2708_fb_ops;
-+	fb->fb.flags = FBINFO_FLAG_DEFAULT | FBINFO_HWACCEL_COPYAREA;
-+	fb->fb.pseudo_palette = fb->cmap;
-+
-+	strncpy(fb->fb.fix.id, bcm2708_name, sizeof(fb->fb.fix.id));
-+	fb->fb.fix.type = FB_TYPE_PACKED_PIXELS;
-+	fb->fb.fix.type_aux = 0;
-+	fb->fb.fix.xpanstep = 1;
-+	fb->fb.fix.ypanstep = 1;
-+	fb->fb.fix.ywrapstep = 0;
-+	fb->fb.fix.accel = FB_ACCEL_NONE;
-+
-+	fb->fb.var.xres = fbwidth;
-+	fb->fb.var.yres = fbheight;
-+	fb->fb.var.xres_virtual = fbwidth;
-+	fb->fb.var.yres_virtual = fbheight;
-+	fb->fb.var.bits_per_pixel = fbdepth;
-+	fb->fb.var.vmode = FB_VMODE_NONINTERLACED;
-+	fb->fb.var.activate = FB_ACTIVATE_NOW;
-+	fb->fb.var.nonstd = 0;
-+	fb->fb.var.height = -1;		/* height of picture in mm    */
-+	fb->fb.var.width = -1;		/* width of picture in mm    */
-+	fb->fb.var.accel_flags = 0;
-+
-+	fb->fb.monspecs.hfmin = 0;
-+	fb->fb.monspecs.hfmax = 100000;
-+	fb->fb.monspecs.vfmin = 0;
-+	fb->fb.monspecs.vfmax = 400;
-+	fb->fb.monspecs.dclkmin = 1000000;
-+	fb->fb.monspecs.dclkmax = 100000000;
-+
-+	bcm2708_fb_set_bitfields(&fb->fb.var);
-+	init_waitqueue_head(&fb->dma_waitq);
-+
-+	/*
-+	 * Allocate colourmap.
-+	 */
-+
-+	fb_set_var(&fb->fb, &fb->fb.var);
-+	ret = bcm2708_fb_set_par(&fb->fb);
-+	if (ret)
-+		return ret;
-+
-+	print_debug("BCM2708FB: registering framebuffer (%dx%d@%d) (%d)\n",
-+		    fbwidth, fbheight, fbdepth, fbswap);
-+
-+	ret = register_framebuffer(&fb->fb);
-+	print_debug("BCM2708FB: register framebuffer (%d)\n", ret);
-+	if (ret == 0)
-+		goto out;
-+
-+	print_debug("BCM2708FB: cannot register framebuffer (%d)\n", ret);
-+out:
-+	return ret;
-+}
-+
-+static int bcm2708_fb_probe(struct platform_device *dev)
-+{
-+	struct device_node *fw_np;
-+	struct rpi_firmware *fw;
-+	struct bcm2708_fb *fb;
-+	int ret;
-+
-+	fw_np = of_parse_phandle(dev->dev.of_node, "firmware", 0);
-+/* Remove comment when booting without Device Tree is no longer supported
-+ *	if (!fw_np) {
-+ *		dev_err(&dev->dev, "Missing firmware node\n");
-+ *		return -ENOENT;
-+ *	}
-+ */
-+	fw = rpi_firmware_get(fw_np);
-+	if (!fw)
-+		return -EPROBE_DEFER;
-+
-+	fb = kzalloc(sizeof(*fb), GFP_KERNEL);
-+	if (!fb) {
-+		ret = -ENOMEM;
-+		goto free_region;
-+	}
-+
-+	fb->fw = fw;
-+	bcm2708_fb_debugfs_init(fb);
-+
-+	fb->cb_base = dma_alloc_wc(&dev->dev, SZ_64K,
-+					     &fb->cb_handle, GFP_KERNEL);
-+	if (!fb->cb_base) {
-+		dev_err(&dev->dev, "cannot allocate DMA CBs\n");
-+		ret = -ENOMEM;
-+		goto free_fb;
-+	}
-+
-+	pr_info("BCM2708FB: allocated DMA memory %pad\n", &fb->cb_handle);
-+
-+	ret = bcm_dma_chan_alloc(BCM_DMA_FEATURE_BULK,
-+				 &fb->dma_chan_base, &fb->dma_irq);
-+	if (ret < 0) {
-+		dev_err(&dev->dev, "couldn't allocate a DMA channel\n");
-+		goto free_cb;
-+	}
-+	fb->dma_chan = ret;
-+
-+	ret = request_irq(fb->dma_irq, bcm2708_fb_dma_irq,
-+			  0, "bcm2708_fb dma", fb);
-+	if (ret) {
-+		pr_err("%s: failed to request DMA irq\n", __func__);
-+		goto free_dma_chan;
-+	}
-+
-+	pr_info("BCM2708FB: allocated DMA channel %d\n", fb->dma_chan);
-+
-+	fb->dev = dev;
-+	fb->fb.device = &dev->dev;
-+
-+	/* failure here isn't fatal, but we'll fail in vc_mem_copy if
-+	 * fb->gpu is not valid
-+	 */
-+	rpi_firmware_property(fb->fw, RPI_FIRMWARE_GET_VC_MEMORY, &fb->gpu,
-+			      sizeof(fb->gpu));
-+
-+	ret = bcm2708_fb_register(fb);
-+	if (ret == 0) {
-+		platform_set_drvdata(dev, fb);
-+		goto out;
-+	}
-+
-+free_dma_chan:
-+	bcm_dma_chan_free(fb->dma_chan);
-+free_cb:
-+	dma_free_wc(&dev->dev, SZ_64K, fb->cb_base, fb->cb_handle);
-+free_fb:
-+	kfree(fb);
-+free_region:
-+	dev_err(&dev->dev, "probe failed, err %d\n", ret);
-+out:
-+	return ret;
-+}
-+
-+static int bcm2708_fb_remove(struct platform_device *dev)
-+{
-+	struct bcm2708_fb *fb = platform_get_drvdata(dev);
-+
-+	platform_set_drvdata(dev, NULL);
-+
-+	if (fb->fb.screen_base)
-+		iounmap(fb->fb.screen_base);
-+	unregister_framebuffer(&fb->fb);
-+
-+	dma_free_wc(&dev->dev, SZ_64K, fb->cb_base, fb->cb_handle);
-+	bcm_dma_chan_free(fb->dma_chan);
-+
-+	bcm2708_fb_debugfs_deinit(fb);
-+
-+	free_irq(fb->dma_irq, fb);
-+
-+	kfree(fb);
-+
-+	return 0;
-+}
-+
-+static const struct of_device_id bcm2708_fb_of_match_table[] = {
-+	{ .compatible = "brcm,bcm2708-fb", },
-+	{},
-+};
-+MODULE_DEVICE_TABLE(of, bcm2708_fb_of_match_table);
-+
-+static struct platform_driver bcm2708_fb_driver = {
-+	.probe = bcm2708_fb_probe,
-+	.remove = bcm2708_fb_remove,
-+	.driver = {
-+		   .name = DRIVER_NAME,
-+		   .owner = THIS_MODULE,
-+		   .of_match_table = bcm2708_fb_of_match_table,
-+		   },
-+};
-+
-+static int __init bcm2708_fb_init(void)
-+{
-+	return platform_driver_register(&bcm2708_fb_driver);
-+}
-+
-+module_init(bcm2708_fb_init);
-+
-+static void __exit bcm2708_fb_exit(void)
-+{
-+	platform_driver_unregister(&bcm2708_fb_driver);
-+}
-+
-+module_exit(bcm2708_fb_exit);
-+
-+module_param(fbwidth, int, 0644);
-+module_param(fbheight, int, 0644);
-+module_param(fbdepth, int, 0644);
-+module_param(fbswap, int, 0644);
-+
-+MODULE_DESCRIPTION("BCM2708 framebuffer driver");
-+MODULE_LICENSE("GPL");
-+
-+MODULE_PARM_DESC(fbwidth, "Width of ARM Framebuffer");
-+MODULE_PARM_DESC(fbheight, "Height of ARM Framebuffer");
-+MODULE_PARM_DESC(fbdepth, "Bit depth of ARM Framebuffer");
-+MODULE_PARM_DESC(fbswap, "Swap order of red and blue in 24 and 32 bit modes");
---- a/drivers/video/logo/logo_linux_clut224.ppm
-+++ b/drivers/video/logo/logo_linux_clut224.ppm
-@@ -1,1604 +1,883 @@
- P3
--# Standard 224-color Linux logo
--80 80
-+63 80
- 255
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6   6   6   6  10  10  10  10  10  10
-- 10  10  10   6   6   6   6   6   6   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  10  10  10  14  14  14
-- 22  22  22  26  26  26  30  30  30  34  34  34
-- 30  30  30  30  30  30  26  26  26  18  18  18
-- 14  14  14  10  10  10   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  26  26  26  42  42  42
-- 54  54  54  66  66  66  78  78  78  78  78  78
-- 78  78  78  74  74  74  66  66  66  54  54  54
-- 42  42  42  26  26  26  18  18  18  10  10  10
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 22  22  22  42  42  42  66  66  66  86  86  86
-- 66  66  66  38  38  38  38  38  38  22  22  22
-- 26  26  26  34  34  34  54  54  54  66  66  66
-- 86  86  86  70  70  70  46  46  46  26  26  26
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  26  26  26
-- 50  50  50  82  82  82  58  58  58   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  6   6   6  54  54  54  86  86  86  66  66  66
-- 38  38  38  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  22  22  22  50  50  50
-- 78  78  78  34  34  34   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   6   6   6  70  70  70
-- 78  78  78  46  46  46  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  42  42  42  82  82  82
-- 26  26  26   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  14  14  14
-- 46  46  46  34  34  34   6   6   6   2   2   6
-- 42  42  42  78  78  78  42  42  42  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 10  10  10  30  30  30  66  66  66  58  58  58
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  26  26  26
-- 86  86  86 101 101 101  46  46  46  10  10  10
--  2   2   6  58  58  58  70  70  70  34  34  34
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 14  14  14  42  42  42  86  86  86  10  10  10
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  30  30  30
-- 94  94  94  94  94  94  58  58  58  26  26  26
--  2   2   6   6   6   6  78  78  78  54  54  54
-- 22  22  22   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 22  22  22  62  62  62  62  62  62   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  26  26  26
-- 54  54  54  38  38  38  18  18  18  10  10  10
--  2   2   6   2   2   6  34  34  34  82  82  82
-- 38  38  38  14  14  14   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 30  30  30  78  78  78  30  30  30   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  10  10  10
-- 10  10  10   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  78  78  78
-- 50  50  50  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  86  86  86  14  14  14   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  54  54  54
-- 66  66  66  26  26  26   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  82  82  82   2   2   6   2   2   6
--  2   2   6   6   6   6  10  10  10   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   6   6   6
-- 14  14  14  10  10  10   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  18  18  18
-- 82  82  82  34  34  34  10  10  10   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6   2   2   6
--  6   6   6   6   6   6  22  22  22  34  34  34
--  6   6   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  18  18  18  34  34  34
-- 10  10  10  50  50  50  22  22  22   2   2   6
--  2   2   6   2   2   6   2   2   6  10  10  10
-- 86  86  86  42  42  42  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6   2   2   6
-- 38  38  38 116 116 116  94  94  94  22  22  22
-- 22  22  22   2   2   6   2   2   6   2   2   6
-- 14  14  14  86  86  86 138 138 138 162 162 162
--154 154 154  38  38  38  26  26  26   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 86  86  86  46  46  46  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6  14  14  14
--134 134 134 198 198 198 195 195 195 116 116 116
-- 10  10  10   2   2   6   2   2   6   6   6   6
--101  98  89 187 187 187 210 210 210 218 218 218
--214 214 214 134 134 134  14  14  14   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 86  86  86  50  50  50  18  18  18   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  86  86  86   2   2   6  54  54  54
--218 218 218 195 195 195 226 226 226 246 246 246
-- 58  58  58   2   2   6   2   2   6  30  30  30
--210 210 210 253 253 253 174 174 174 123 123 123
--221 221 221 234 234 234  74  74  74   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 70  70  70  58  58  58  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 46  46  46  82  82  82   2   2   6 106 106 106
--170 170 170  26  26  26  86  86  86 226 226 226
--123 123 123  10  10  10  14  14  14  46  46  46
--231 231 231 190 190 190   6   6   6  70  70  70
-- 90  90  90 238 238 238 158 158 158   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 70  70  70  58  58  58  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   0
--  0   0   1   0   0   1   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  86  86  86   6   6   6 116 116 116
--106 106 106   6   6   6  70  70  70 149 149 149
--128 128 128  18  18  18  38  38  38  54  54  54
--221 221 221 106 106 106   2   2   6  14  14  14
-- 46  46  46 190 190 190 198 198 198   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 74  74  74  62  62  62  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   0
--  0   0   1   0   0   0   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  94  94  94  14  14  14 101 101 101
--128 128 128   2   2   6  18  18  18 116 116 116
--118  98  46 121  92   8 121  92   8  98  78  10
--162 162 162 106 106 106   2   2   6   2   2   6
--  2   2   6 195 195 195 195 195 195   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 74  74  74  62  62  62  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   1   0   0   1
--  0   0   1   0   0   0   0   0   1   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  90  90  90  14  14  14  58  58  58
--210 210 210  26  26  26  54  38   6 154 114  10
--226 170  11 236 186  11 225 175  15 184 144  12
--215 174  15 175 146  61  37  26   9   2   2   6
-- 70  70  70 246 246 246 138 138 138   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 70  70  70  66  66  66  26  26  26   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  86  86  86  14  14  14  10  10  10
--195 195 195 188 164 115 192 133   9 225 175  15
--239 182  13 234 190  10 232 195  16 232 200  30
--245 207  45 241 208  19 232 195  16 184 144  12
--218 194 134 211 206 186  42  42  42   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 50  50  50  74  74  74  30  30  30   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 34  34  34  86  86  86  14  14  14   2   2   6
--121  87  25 192 133   9 219 162  10 239 182  13
--236 186  11 232 195  16 241 208  19 244 214  54
--246 218  60 246 218  38 246 215  20 241 208  19
--241 208  19 226 184  13 121  87  25   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 50  50  50  82  82  82  34  34  34  10  10  10
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 34  34  34  82  82  82  30  30  30  61  42   6
--180 123   7 206 145  10 230 174  11 239 182  13
--234 190  10 238 202  15 241 208  19 246 218  74
--246 218  38 246 215  20 246 215  20 246 215  20
--226 184  13 215 174  15 184 144  12   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 26  26  26  94  94  94  42  42  42  14  14  14
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78  50  50  50 104  69   6
--192 133   9 216 158  10 236 178  12 236 186  11
--232 195  16 241 208  19 244 214  54 245 215  43
--246 215  20 246 215  20 241 208  19 198 155  10
--200 144  11 216 158  10 156 118  10   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  6   6   6  90  90  90  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78  46  46  46  22  22  22
--137  92   6 210 162  10 239 182  13 238 190  10
--238 202  15 241 208  19 246 215  20 246 215  20
--241 208  19 203 166  17 185 133  11 210 150  10
--216 158  10 210 150  10 102  78  10   2   2   6
--  6   6   6  54  54  54  14  14  14   2   2   6
--  2   2   6  62  62  62  74  74  74  30  30  30
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 34  34  34  78  78  78  50  50  50   6   6   6
-- 94  70  30 139 102  15 190 146  13 226 184  13
--232 200  30 232 195  16 215 174  15 190 146  13
--168 122  10 192 133   9 210 150  10 213 154  11
--202 150  34 182 157 106 101  98  89   2   2   6
--  2   2   6  78  78  78 116 116 116  58  58  58
--  2   2   6  22  22  22  90  90  90  46  46  46
-- 18  18  18   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  86  86  86  50  50  50   6   6   6
--128 128 128 174 154 114 156 107  11 168 122  10
--198 155  10 184 144  12 197 138  11 200 144  11
--206 145  10 206 145  10 197 138  11 188 164 115
--195 195 195 198 198 198 174 174 174  14  14  14
--  2   2   6  22  22  22 116 116 116 116 116 116
-- 22  22  22   2   2   6  74  74  74  70  70  70
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50 101 101 101  26  26  26  10  10  10
--138 138 138 190 190 190 174 154 114 156 107  11
--197 138  11 200 144  11 197 138  11 192 133   9
--180 123   7 190 142  34 190 178 144 187 187 187
--202 202 202 221 221 221 214 214 214  66  66  66
--  2   2   6   2   2   6  50  50  50  62  62  62
--  6   6   6   2   2   6  10  10  10  90  90  90
-- 50  50  50  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  34  34  34
-- 74  74  74  74  74  74   2   2   6   6   6   6
--144 144 144 198 198 198 190 190 190 178 166 146
--154 121  60 156 107  11 156 107  11 168 124  44
--174 154 114 187 187 187 190 190 190 210 210 210
--246 246 246 253 253 253 253 253 253 182 182 182
--  6   6   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  62  62  62
-- 74  74  74  34  34  34  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  10  10  10  22  22  22  54  54  54
-- 94  94  94  18  18  18   2   2   6  46  46  46
--234 234 234 221 221 221 190 190 190 190 190 190
--190 190 190 187 187 187 187 187 187 190 190 190
--190 190 190 195 195 195 214 214 214 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
-- 82  82  82   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  14  14  14
-- 86  86  86  54  54  54  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  46  46  46  90  90  90
-- 46  46  46  18  18  18   6   6   6 182 182 182
--253 253 253 246 246 246 206 206 206 190 190 190
--190 190 190 190 190 190 190 190 190 190 190 190
--206 206 206 231 231 231 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--202 202 202  14  14  14   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 42  42  42  86  86  86  42  42  42  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 14  14  14  38  38  38  74  74  74  66  66  66
--  2   2   6   6   6   6  90  90  90 250 250 250
--253 253 253 253 253 253 238 238 238 198 198 198
--190 190 190 190 190 190 195 195 195 221 221 221
--246 246 246 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253  82  82  82   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  78  78  78  70  70  70  34  34  34
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 34  34  34  66  66  66  78  78  78   6   6   6
--  2   2   6  18  18  18 218 218 218 253 253 253
--253 253 253 253 253 253 253 253 253 246 246 246
--226 226 226 231 231 231 246 246 246 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 178 178 178   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  18  18  18  90  90  90  62  62  62
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  26  26  26
-- 58  58  58  90  90  90  18  18  18   2   2   6
--  2   2   6 110 110 110 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 231 231 231  18  18  18   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  18  18  18  94  94  94
-- 54  54  54  26  26  26  10  10  10   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  22  22  22  50  50  50
-- 90  90  90  26  26  26   2   2   6   2   2   6
-- 14  14  14 195 195 195 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 242 242 242  54  54  54   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6  38  38  38
-- 86  86  86  50  50  50  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  38  38  38  82  82  82
-- 34  34  34   2   2   6   2   2   6   2   2   6
-- 42  42  42 195 195 195 246 246 246 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 242 242 242 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 250 250 250 246 246 246 238 238 238
--226 226 226 231 231 231 101 101 101   6   6   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 38  38  38  82  82  82  42  42  42  14  14  14
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 10  10  10  26  26  26  62  62  62  66  66  66
--  2   2   6   2   2   6   2   2   6   6   6   6
-- 70  70  70 170 170 170 206 206 206 234 234 234
--246 246 246 250 250 250 250 250 250 238 238 238
--226 226 226 231 231 231 238 238 238 250 250 250
--250 250 250 250 250 250 246 246 246 231 231 231
--214 214 214 206 206 206 202 202 202 202 202 202
--198 198 198 202 202 202 182 182 182  18  18  18
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  62  62  62  66  66  66  30  30  30
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 14  14  14  42  42  42  82  82  82  18  18  18
--  2   2   6   2   2   6   2   2   6  10  10  10
-- 94  94  94 182 182 182 218 218 218 242 242 242
--250 250 250 253 253 253 253 253 253 250 250 250
--234 234 234 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 246 246 246
--238 238 238 226 226 226 210 210 210 202 202 202
--195 195 195 195 195 195 210 210 210 158 158 158
--  6   6   6  14  14  14  50  50  50  14  14  14
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  86  86  86  46  46  46
-- 18  18  18   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 22  22  22  54  54  54  70  70  70   2   2   6
--  2   2   6  10  10  10   2   2   6  22  22  22
--166 166 166 231 231 231 250 250 250 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 246 246 246
--231 231 231 206 206 206 198 198 198 226 226 226
-- 94  94  94   2   2   6   6   6   6  38  38  38
-- 30  30  30   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  62  62  62  66  66  66
-- 26  26  26  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  74  74  74  50  50  50   2   2   6
-- 26  26  26  26  26  26   2   2   6 106 106 106
--238 238 238 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 246 246 246 218 218 218 202 202 202
--210 210 210  14  14  14   2   2   6   2   2   6
-- 30  30  30  22  22  22   2   2   6   2   2   6
--  2   2   6   2   2   6  18  18  18  86  86  86
-- 42  42  42  14  14  14   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 42  42  42  90  90  90  22  22  22   2   2   6
-- 42  42  42   2   2   6  18  18  18 218 218 218
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 250 250 250 221 221 221
--218 218 218 101 101 101   2   2   6  14  14  14
-- 18  18  18  38  38  38  10  10  10   2   2   6
--  2   2   6   2   2   6   2   2   6  78  78  78
-- 58  58  58  22  22  22   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 54  54  54  82  82  82   2   2   6  26  26  26
-- 22  22  22   2   2   6 123 123 123 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--238 238 238 198 198 198   6   6   6  38  38  38
-- 58  58  58  26  26  26  38  38  38   2   2   6
--  2   2   6   2   2   6   2   2   6  46  46  46
-- 78  78  78  30  30  30  10  10  10   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0  10  10  10  30  30  30
-- 74  74  74  58  58  58   2   2   6  42  42  42
--  2   2   6  22  22  22 231 231 231 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 250 250 250
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 246 246 246  46  46  46  38  38  38
-- 42  42  42  14  14  14  38  38  38  14  14  14
--  2   2   6   2   2   6   2   2   6   6   6   6
-- 86  86  86  46  46  46  14  14  14   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  14  14  14  42  42  42
-- 90  90  90  18  18  18  18  18  18  26  26  26
--  2   2   6 116 116 116 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 250 250 250 238 238 238
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253  94  94  94   6   6   6
--  2   2   6   2   2   6  10  10  10  34  34  34
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 74  74  74  58  58  58  22  22  22   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0  10  10  10  26  26  26  66  66  66
-- 82  82  82   2   2   6  38  38  38   6   6   6
-- 14  14  14 210 210 210 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 246 246 246 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 144 144 144   2   2   6
--  2   2   6   2   2   6   2   2   6  46  46  46
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 42  42  42  74  74  74  30  30  30  10  10  10
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  42  42  42  90  90  90
-- 26  26  26   6   6   6  42  42  42   2   2   6
-- 74  74  74 250 250 250 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 242 242 242 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 182 182 182   2   2   6
--  2   2   6   2   2   6   2   2   6  46  46  46
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 10  10  10  86  86  86  38  38  38  10  10  10
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 10  10  10  26  26  26  66  66  66  82  82  82
--  2   2   6  22  22  22  18  18  18   2   2   6
--149 149 149 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 206 206 206   2   2   6
--  2   2   6   2   2   6   2   2   6  38  38  38
--  2   2   6   2   2   6   2   2   6   2   2   6
--  6   6   6  86  86  86  46  46  46  14  14  14
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 18  18  18  46  46  46  86  86  86  18  18  18
--  2   2   6  34  34  34  10  10  10   6   6   6
--210 210 210 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 221 221 221   6   6   6
--  2   2   6   2   2   6   6   6   6  30  30  30
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  82  82  82  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 26  26  26  66  66  66  62  62  62   2   2   6
--  2   2   6  38  38  38  10  10  10  26  26  26
--238 238 238 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 238 238 238
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231   6   6   6
--  2   2   6   2   2   6  10  10  10  30  30  30
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  58  58  58  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 38  38  38  78  78  78   6   6   6   2   2   6
--  2   2   6  46  46  46  14  14  14  42  42  42
--246 246 246 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234  10  10  10
--  2   2   6   2   2   6  22  22  22  14  14  14
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  62  62  62  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50  74  74  74   2   2   6   2   2   6
-- 14  14  14  70  70  70  34  34  34  62  62  62
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234  14  14  14
--  2   2   6   2   2   6  30  30  30   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  62  62  62  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 54  54  54  62  62  62   2   2   6   2   2   6
--  2   2   6  30  30  30  46  46  46  70  70  70
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 226 226 226  10  10  10
--  2   2   6   6   6   6  30  30  30   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6  66  66  66  58  58  58  22  22  22
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  22  22  22
-- 58  58  58  62  62  62   2   2   6   2   2   6
--  2   2   6   2   2   6  30  30  30  78  78  78
--250 250 250 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 206 206 206   2   2   6
-- 22  22  22  34  34  34  18  14   6  22  22  22
-- 26  26  26  18  18  18   6   6   6   2   2   6
--  2   2   6  82  82  82  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  26  26  26
-- 62  62  62 106 106 106  74  54  14 185 133  11
--210 162  10 121  92   8   6   6   6  62  62  62
--238 238 238 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 246 246 246
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 158 158 158  18  18  18
-- 14  14  14   2   2   6   2   2   6   2   2   6
--  6   6   6  18  18  18  66  66  66  38  38  38
--  6   6   6  94  94  94  50  50  50  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 10  10  10  10  10  10  18  18  18  38  38  38
-- 78  78  78 142 134 106 216 158  10 242 186  14
--246 190  14 246 190  14 156 118  10  10  10  10
-- 90  90  90 238 238 238 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 250 250 250
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 246 230 190
--238 204  91 238 204  91 181 142  44  37  26   9
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  38  38  38  46  46  46
-- 26  26  26 106 106 106  54  54  54  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  14  14  14  22  22  22
-- 30  30  30  38  38  38  50  50  50  70  70  70
--106 106 106 190 142  34 226 170  11 242 186  14
--246 190  14 246 190  14 246 190  14 154 114  10
--  6   6   6  74  74  74 226 226 226 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 231 231 231 250 250 250
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 228 184  62
--241 196  14 241 208  19 232 195  16  38  30  10
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  30  30  30  26  26  26
--203 166  17 154 142  90  66  66  66  26  26  26
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  38  38  38  58  58  58
-- 78  78  78  86  86  86 101 101 101 123 123 123
--175 146  61 210 150  10 234 174  13 246 186  14
--246 190  14 246 190  14 246 190  14 238 190  10
--102  78  10   2   2   6  46  46  46 198 198 198
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 234 234 234 242 242 242
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 224 178  62
--242 186  14 241 196  14 210 166  10  22  18   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   6   6   6 121  92   8
--238 202  15 232 195  16  82  82  82  34  34  34
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-- 14  14  14  38  38  38  70  70  70 154 122  46
--190 142  34 200 144  11 197 138  11 197 138  11
--213 154  11 226 170  11 242 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--225 175  15  46  32   6   2   2   6  22  22  22
--158 158 158 250 250 250 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 250 250 250 242 242 242 224 178  62
--239 182  13 236 186  11 213 154  11  46  32   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  61  42   6 225 175  15
--238 190  10 236 186  11 112 100  78  42  42  42
-- 14  14  14   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 22  22  22  54  54  54 154 122  46 213 154  11
--226 170  11 230 174  11 226 170  11 226 170  11
--236 178  12 242 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--241 196  14 184 144  12  10  10  10   2   2   6
--  6   6   6 116 116 116 242 242 242 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 231 231 231 198 198 198 214 170  54
--236 178  12 236 178  12 210 150  10 137  92   6
-- 18  14   6   2   2   6   2   2   6   2   2   6
--  6   6   6  70  47   6 200 144  11 236 178  12
--239 182  13 239 182  13 124 112  88  58  58  58
-- 22  22  22   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  70  70  70 180 133  36 226 170  11
--239 182  13 242 186  14 242 186  14 246 186  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 232 195  16  98  70   6   2   2   6
--  2   2   6   2   2   6  66  66  66 221 221 221
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 206 206 206 198 198 198 214 166  58
--230 174  11 230 174  11 216 158  10 192 133   9
--163 110   8 116  81   8 102  78  10 116  81   8
--167 114   7 197 138  11 226 170  11 239 182  13
--242 186  14 242 186  14 162 146  94  78  78  78
-- 34  34  34  14  14  14   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 30  30  30  78  78  78 190 142  34 226 170  11
--239 182  13 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 241 196  14 203 166  17  22  18   6
--  2   2   6   2   2   6   2   2   6  38  38  38
--218 218 218 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 206 206 206 198 198 198 202 162  69
--226 170  11 236 178  12 224 166  10 210 150  10
--200 144  11 197 138  11 192 133   9 197 138  11
--210 150  10 226 170  11 242 186  14 246 190  14
--246 190  14 246 186  14 225 175  15 124 112  88
-- 62  62  62  30  30  30  14  14  14   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78 174 135  50 224 166  10
--239 182  13 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 241 196  14 139 102  15
--  2   2   6   2   2   6   2   2   6   2   2   6
-- 78  78  78 250 250 250 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--250 250 250 214 214 214 198 198 198 190 150  46
--219 162  10 236 178  12 234 174  13 224 166  10
--216 158  10 213 154  11 213 154  11 216 158  10
--226 170  11 239 182  13 246 190  14 246 190  14
--246 190  14 246 190  14 242 186  14 206 162  42
--101 101 101  58  58  58  30  30  30  14  14  14
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  74  74  74 174 135  50 216 158  10
--236 178  12 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 241 196  14 226 184  13
-- 61  42   6   2   2   6   2   2   6   2   2   6
-- 22  22  22 238 238 238 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 226 226 226 187 187 187 180 133  36
--216 158  10 236 178  12 239 182  13 236 178  12
--230 174  11 226 170  11 226 170  11 230 174  11
--236 178  12 242 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 186  14 239 182  13
--206 162  42 106 106 106  66  66  66  34  34  34
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 26  26  26  70  70  70 163 133  67 213 154  11
--236 178  12 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 241 196  14
--190 146  13  18  14   6   2   2   6   2   2   6
-- 46  46  46 246 246 246 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 221 221 221  86  86  86 156 107  11
--216 158  10 236 178  12 242 186  14 246 186  14
--242 186  14 239 182  13 239 182  13 242 186  14
--242 186  14 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--242 186  14 225 175  15 142 122  72  66  66  66
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 26  26  26  70  70  70 163 133  67 210 150  10
--236 178  12 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--232 195  16 121  92   8  34  34  34 106 106 106
--221 221 221 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--242 242 242  82  82  82  18  14   6 163 110   8
--216 158  10 236 178  12 242 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 242 186  14 163 133  67
-- 46  46  46  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  10  10  10
-- 30  30  30  78  78  78 163 133  67 210 150  10
--236 178  12 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--241 196  14 215 174  15 190 178 144 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 218 218 218
-- 58  58  58   2   2   6  22  18   6 167 114   7
--216 158  10 236 178  12 246 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 186  14 242 186  14 190 150  46
-- 54  54  54  22  22  22   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 38  38  38  86  86  86 180 133  36 213 154  11
--236 178  12 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 232 195  16 190 146  13 214 214 214
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 250 250 250 170 170 170  26  26  26
--  2   2   6   2   2   6  37  26   9 163 110   8
--219 162  10 239 182  13 246 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 186  14 236 178  12 224 166  10 142 122  72
-- 46  46  46  18  18  18   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50 109 106  95 192 133   9 224 166  10
--242 186  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--242 186  14 226 184  13 210 162  10 142 110  46
--226 226 226 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253
--198 198 198  66  66  66   2   2   6   2   2   6
--  2   2   6   2   2   6  50  34   6 156 107  11
--219 162  10 239 182  13 246 186  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 242 186  14
--234 174  13 213 154  11 154 122  46  66  66  66
-- 30  30  30  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  22  22  22
-- 58  58  58 154 121  60 206 145  10 234 174  13
--242 186  14 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 186  14 236 178  12 210 162  10 163 110   8
-- 61  42   6 138 138 138 218 218 218 250 250 250
--253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 210 210 210 144 144 144  66  66  66
--  6   6   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6  61  42   6 163 110   8
--216 158  10 236 178  12 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 239 182  13 230 174  11 216 158  10
--190 142  34 124 112  88  70  70  70  38  38  38
-- 18  18  18   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  22  22  22
-- 62  62  62 168 124  44 206 145  10 224 166  10
--236 178  12 239 182  13 242 186  14 242 186  14
--246 186  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 236 178  12 216 158  10 175 118   6
-- 80  54   7   2   2   6   6   6   6  30  30  30
-- 54  54  54  62  62  62  50  50  50  38  38  38
-- 14  14  14   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  80  54   7 167 114   7
--213 154  11 236 178  12 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 190  14 242 186  14 239 182  13 239 182  13
--230 174  11 210 150  10 174 135  50 124 112  88
-- 82  82  82  54  54  54  34  34  34  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  18  18  18
-- 50  50  50 158 118  36 192 133   9 200 144  11
--216 158  10 219 162  10 224 166  10 226 170  11
--230 174  11 236 178  12 239 182  13 239 182  13
--242 186  14 246 186  14 246 190  14 246 190  14
--246 190  14 246 190  14 246 190  14 246 190  14
--246 186  14 230 174  11 210 150  10 163 110   8
--104  69   6  10  10  10   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  91  60   6 167 114   7
--206 145  10 230 174  11 242 186  14 246 190  14
--246 190  14 246 190  14 246 186  14 242 186  14
--239 182  13 230 174  11 224 166  10 213 154  11
--180 133  36 124 112  88  86  86  86  58  58  58
-- 38  38  38  22  22  22  10  10  10   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0  14  14  14
-- 34  34  34  70  70  70 138 110  50 158 118  36
--167 114   7 180 123   7 192 133   9 197 138  11
--200 144  11 206 145  10 213 154  11 219 162  10
--224 166  10 230 174  11 239 182  13 242 186  14
--246 186  14 246 186  14 246 186  14 246 186  14
--239 182  13 216 158  10 185 133  11 152  99   6
--104  69   6  18  14   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   2   2   6   2   2   6   2   2   6
--  2   2   6   6   6   6  80  54   7 152  99   6
--192 133   9 219 162  10 236 178  12 239 182  13
--246 186  14 242 186  14 239 182  13 236 178  12
--224 166  10 206 145  10 192 133   9 154 121  60
-- 94  94  94  62  62  62  42  42  42  22  22  22
-- 14  14  14   6   6   6   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 18  18  18  34  34  34  58  58  58  78  78  78
--101  98  89 124 112  88 142 110  46 156 107  11
--163 110   8 167 114   7 175 118   6 180 123   7
--185 133  11 197 138  11 210 150  10 219 162  10
--226 170  11 236 178  12 236 178  12 234 174  13
--219 162  10 197 138  11 163 110   8 130  83   6
-- 91  60   6  10  10  10   2   2   6   2   2   6
-- 18  18  18  38  38  38  38  38  38  38  38  38
-- 38  38  38  38  38  38  38  38  38  38  38  38
-- 38  38  38  38  38  38  26  26  26   2   2   6
--  2   2   6   6   6   6  70  47   6 137  92   6
--175 118   6 200 144  11 219 162  10 230 174  11
--234 174  13 230 174  11 219 162  10 210 150  10
--192 133   9 163 110   8 124 112  88  82  82  82
-- 50  50  50  30  30  30  14  14  14   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  14  14  14  22  22  22  34  34  34
-- 42  42  42  58  58  58  74  74  74  86  86  86
--101  98  89 122 102  70 130  98  46 121  87  25
--137  92   6 152  99   6 163 110   8 180 123   7
--185 133  11 197 138  11 206 145  10 200 144  11
--180 123   7 156 107  11 130  83   6 104  69   6
-- 50  34   6  54  54  54 110 110 110 101  98  89
-- 86  86  86  82  82  82  78  78  78  78  78  78
-- 78  78  78  78  78  78  78  78  78  78  78  78
-- 78  78  78  82  82  82  86  86  86  94  94  94
--106 106 106 101 101 101  86  66  34 124  80   6
--156 107  11 180 123   7 192 133   9 200 144  11
--206 145  10 200 144  11 192 133   9 175 118   6
--139 102  15 109 106  95  70  70  70  42  42  42
-- 22  22  22  10  10  10   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   6   6   6  10  10  10
-- 14  14  14  22  22  22  30  30  30  38  38  38
-- 50  50  50  62  62  62  74  74  74  90  90  90
--101  98  89 112 100  78 121  87  25 124  80   6
--137  92   6 152  99   6 152  99   6 152  99   6
--138  86   6 124  80   6  98  70   6  86  66  30
--101  98  89  82  82  82  58  58  58  46  46  46
-- 38  38  38  34  34  34  34  34  34  34  34  34
-- 34  34  34  34  34  34  34  34  34  34  34  34
-- 34  34  34  34  34  34  38  38  38  42  42  42
-- 54  54  54  82  82  82  94  86  76  91  60   6
--134  86   6 156 107  11 167 114   7 175 118   6
--175 118   6 167 114   7 152  99   6 121  87  25
--101  98  89  62  62  62  34  34  34  18  18  18
--  6   6   6   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6   6   6   6  10  10  10
-- 18  18  18  22  22  22  30  30  30  42  42  42
-- 50  50  50  66  66  66  86  86  86 101  98  89
--106  86  58  98  70   6 104  69   6 104  69   6
--104  69   6  91  60   6  82  62  34  90  90  90
-- 62  62  62  38  38  38  22  22  22  14  14  14
-- 10  10  10  10  10  10  10  10  10  10  10  10
-- 10  10  10  10  10  10   6   6   6  10  10  10
-- 10  10  10  10  10  10  10  10  10  14  14  14
-- 22  22  22  42  42  42  70  70  70  89  81  66
-- 80  54   7 104  69   6 124  80   6 137  92   6
--134  86   6 116  81   8 100  82  52  86  86  86
-- 58  58  58  30  30  30  14  14  14   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  10  10  10  14  14  14
-- 18  18  18  26  26  26  38  38  38  54  54  54
-- 70  70  70  86  86  86  94  86  76  89  81  66
-- 89  81  66  86  86  86  74  74  74  50  50  50
-- 30  30  30  14  14  14   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6  18  18  18  34  34  34  58  58  58
-- 82  82  82  89  81  66  89  81  66  89  81  66
-- 94  86  66  94  86  76  74  74  74  50  50  50
-- 26  26  26  14  14  14   6   6   6   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  6   6   6   6   6   6  14  14  14  18  18  18
-- 30  30  30  38  38  38  46  46  46  54  54  54
-- 50  50  50  42  42  42  30  30  30  18  18  18
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   6   6   6  14  14  14  26  26  26
-- 38  38  38  50  50  50  58  58  58  58  58  58
-- 54  54  54  42  42  42  30  30  30  18  18  18
-- 10  10  10   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
--  6   6   6  10  10  10  14  14  14  18  18  18
-- 18  18  18  14  14  14  10  10  10   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   6   6   6
-- 14  14  14  18  18  18  22  22  22  22  22  22
-- 18  18  18  14  14  14  10  10  10   6   6   6
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
--  0   0   0   0   0   0   0   0   0   0   0   0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 1 0  0 0 0  0 0 0  1 1 0
-+0 1 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  1 1 0  0 0 0  0 0 0
-+0 1 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  1 1 0
-+10 15 3  2 3 1  12 18 4  42 61 14  19 27 6  11 16 4
-+38 55 13  10 15 3  3 4 1  10 15 3  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  2 3 1
-+12 18 4  1 1 0  23 34 8  31 45 11  10 15 3  32 47 11
-+34 49 12  3 4 1  3 4 1  3 4 1  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  10 15 3  29 42 10  26 37 9  12 18 4
-+55 80 19  81 118 28  55 80 19  92 132 31  106 153 36  69 100 23
-+100 144 34  80 116 27  42 61 14  81 118 28  23 34 8  27 40 9
-+15 21 5  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  1 1 0  29 42 10  15 21 5  50 72 17
-+74 107 25  45 64 15  102 148 35  80 116 27  84 121 28  111 160 38
-+69 100 23  65 94 22  81 118 28  29 42 10  17 25 6  29 42 10
-+23 34 8  2 3 1  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  3 4 1
-+15 21 5  15 21 5  34 49 12  101 146 34  111 161 38  97 141 33
-+97 141 33  119 172 41  117 170 40  116 167 40  118 170 40  118 171 40
-+117 169 40  118 170 40  111 160 38  118 170 40  96 138 32  89 128 30
-+81 118 28  11 16 4  10 15 3  1 1 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+3 4 1  3 4 1  34 49 12  101 146 34  79 115 27  111 160 38
-+114 165 39  113 163 39  118 170 40  117 169 40  118 171 40  117 169 40
-+116 167 40  119 172 41  113 163 39  92 132 31  105 151 36  113 163 39
-+75 109 26  19 27 6  16 23 5  11 16 4  0 1 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  10 15 3
-+80 116 27  106 153 36  105 151 36  114 165 39  118 170 40  118 171 40
-+118 171 40  117 169 40  117 169 40  117 169 40  117 169 40  117 169 40
-+117 169 40  117 169 40  117 170 40  117 169 40  118 170 40  118 170 40
-+117 170 40  75 109 26  75 109 26  34 49 12  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  3 4 1
-+64 92 22  65 94 22  100 144 34  118 171 40  118 170 40  117 169 40
-+117 169 40  117 169 40  117 169 40  117 169 40  117 169 40  117 169 40
-+117 169 40  117 169 40  117 169 40  118 171 41  118 170 40  117 169 40
-+109 158 37  105 151 36  104 150 35  47 69 16  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+42 61 14  115 167 39  118 170 40  117 169 40  117 169 40  117 169 40
-+117 170 40  117 170 40  117 169 40  117 169 40  117 169 40  117 169 40
-+117 169 40  117 169 40  117 169 40  117 169 40  117 169 40  117 169 40
-+117 169 40  117 169 40  118 170 40  96 138 32  17 25 6  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  47 69 16
-+114 165 39  117 168 40  117 170 40  117 169 40  117 169 40  117 169 40
-+117 169 40  117 169 40  117 169 40  117 169 40  117 169 40  117 169 40
-+117 169 40  117 169 40  118 170 40  117 169 40  117 169 40  117 169 40
-+117 170 40  119 172 41  96 138 32  12 18 4  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  10 15 3
-+32 47 11  105 151 36  118 170 40  117 169 40  117 169 40  116 168 40
-+109 157 37  111 160 38  117 169 40  118 171 40  117 169 40  117 169 40
-+117 169 40  117 169 40  117 169 40  117 169 40  117 169 40  117 169 40
-+117 169 40  117 169 40  117 169 40  118 171 40  69 100 23  2 3 1
-+0 0 0  0 0 0  0 0 0  0 0 0  19 27 6  101 146 34
-+118 171 40  117 169 40  117 169 40  117 169 40  117 169 40  117 169 40
-+117 169 40  117 169 40  117 169 40  117 169 40  117 169 40  117 170 40
-+118 171 40  115 166 39  107 154 36  111 161 38  117 169 40  117 169 40
-+117 169 40  118 171 40  75 109 26  19 27 6  2 3 1  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  16 23 5
-+89 128 30  117 169 40  117 169 40  117 169 40  117 169 40  117 169 40
-+111 160 38  92 132 31  79 115 27  96 138 32  115 166 39  119 171 41
-+117 169 40  117 169 40  117 169 40  117 169 40  117 169 40  117 169 40
-+117 169 40  117 169 40  117 169 40  118 170 40  109 157 37  26 37 9
-+0 0 0  0 0 0  0 0 0  0 0 0  64 92 22  118 171 40
-+117 169 40  117 169 40  117 169 40  117 169 40  117 169 40  117 169 40
-+117 169 40  117 169 40  117 169 40  118 170 40  118 171 40  109 157 37
-+89 128 30  81 118 28  100 144 34  115 166 39  117 169 40  117 169 40
-+117 169 40  117 170 40  113 163 39  60 86 20  1 1 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+27 40 9  96 138 32  118 170 40  117 169 40  117 169 40  117 169 40
-+117 170 40  117 169 40  101 146 34  67 96 23  55 80 19  84 121 28
-+113 163 39  119 171 41  117 169 40  117 169 40  117 169 40  117 169 40
-+117 169 40  117 169 40  117 169 40  117 169 40  119 171 41  65 94 22
-+0 0 0  0 0 0  0 0 0  15 21 5  101 146 34  118 171 40
-+117 169 40  117 169 40  117 169 40  117 169 40  117 169 40  117 169 40
-+117 169 40  118 170 40  118 171 40  104 150 35  69 100 23  53 76 18
-+81 118 28  111 160 38  118 170 40  117 169 40  117 169 40  117 169 40
-+117 169 40  114 165 39  69 100 23  10 15 3  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  1 1 0
-+31 45 11  77 111 26  117 169 40  117 169 40  117 169 40  117 169 40
-+117 169 40  117 169 40  118 170 40  116 168 40  92 132 31  47 69 16
-+38 55 13  81 118 28  113 163 39  119 171 41  117 169 40  117 169 40
-+117 169 40  117 169 40  117 169 40  117 169 40  118 171 41  92 132 31
-+10 15 3  0 0 0  0 0 0  36 52 12  115 166 39  117 169 40
-+117 169 40  117 169 40  117 169 40  117 169 40  117 169 40  118 170 40
-+118 171 40  102 148 35  64 92 22  34 49 12  65 94 22  106 153 36
-+118 171 40  117 170 40  117 169 40  117 169 40  117 169 40  117 169 40
-+118 170 40  107 154 36  55 80 19  15 21 5  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+29 42 10  101 146 34  118 171 40  117 169 40  117 169 40  117 169 40
-+117 169 40  117 169 40  117 169 40  117 169 40  118 171 40  113 163 39
-+75 109 26  27 40 9  36 52 12  89 128 30  116 167 40  118 171 40
-+117 169 40  117 169 40  117 169 40  117 169 40  118 170 40  104 150 35
-+16 23 5  0 0 0  0 0 0  53 76 18  118 171 40  117 169 40
-+117 169 40  117 169 40  117 169 40  117 169 40  119 171 41  109 157 37
-+67 96 23  23 34 8  42 61 14  96 138 32  118 170 40  118 170 40
-+117 169 40  117 169 40  117 169 40  117 169 40  117 169 40  117 169 40
-+117 169 40  117 169 40  74 107 25  10 15 3  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  31 45 11  101 146 34  118 170 40  117 169 40  117 169 40
-+117 169 40  117 169 40  117 169 40  117 169 40  117 169 40  117 169 40
-+119 171 41  102 148 35  47 69 16  14 20 5  50 72 17  102 148 35
-+118 171 40  117 169 40  117 169 40  117 169 40  118 170 40  102 148 35
-+15 21 5  0 0 0  0 0 0  50 72 17  118 170 40  117 169 40
-+117 169 40  117 169 40  118 170 40  116 167 40  84 121 28  27 40 9
-+19 27 6  74 107 25  114 165 39  118 171 40  117 169 40  117 169 40
-+117 169 40  117 169 40  117 169 40  117 169 40  117 169 40  117 169 40
-+117 169 40  75 109 26  10 15 4  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  38 55 13  102 148 35  118 171 40  117 169 40  117 169 40
-+117 169 40  117 169 40  117 169 40  117 169 40  117 169 40  117 169 40
-+117 169 40  118 170 40  115 167 39  77 111 26  17 25 6  19 27 6
-+77 111 26  115 166 39  118 170 40  117 169 40  119 172 41  81 118 28
-+3 4 1  0 0 0  0 0 0  27 40 9  111 160 38  118 170 40
-+117 169 40  118 171 40  105 151 36  50 72 17  10 15 3  38 55 13
-+100 144 34  118 171 40  117 169 40  117 169 40  117 169 40  117 169 40
-+117 169 40  117 169 40  117 169 40  117 169 40  117 169 40  117 169 40
-+117 169 40  79 115 27  15 21 5  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  10 15 3  64 92 22  111 160 38  117 169 40  117 169 40
-+117 169 40  117 169 40  117 169 40  117 169 40  117 169 40  117 169 40
-+117 169 40  117 169 40  117 169 40  118 171 40  96 138 32  32 47 11
-+3 4 1  50 72 17  107 154 36  120 173 41  105 151 36  31 45 11
-+0 0 0  0 0 0  0 0 0  3 4 1  65 94 22  117 169 40
-+118 170 40  89 128 30  26 37 9  3 4 1  60 86 20  111 161 38
-+118 171 40  117 169 40  117 169 40  117 169 40  117 169 40  117 169 40
-+117 169 40  117 169 40  117 169 40  117 169 40  117 169 40  117 169 40
-+97 141 33  36 52 12  1 1 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  14 20 5  75 109 26  117 168 40  117 169 40
-+117 169 40  117 169 40  117 169 40  117 169 40  117 169 40  117 169 40
-+117 169 40  117 169 40  117 169 40  117 169 40  118 171 40  107 154 36
-+45 64 15  2 3 1  31 45 11  75 109 26  32 47 11  0 1 0
-+0 0 0  0 0 0  0 0 0  0 0 0  10 15 3  55 80 19
-+65 94 22  11 16 4  11 16 4  75 109 26  116 168 40  118 170 40
-+117 169 40  117 169 40  117 169 40  117 169 40  117 169 40  117 169 40
-+117 169 40  117 169 40  117 169 40  117 169 40  118 170 40  107 154 36
-+47 69 16  3 4 1  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  12 18 4  69 100 23  111 161 38  118 171 40
-+117 169 40  117 169 40  117 169 40  117 169 40  117 169 40  117 169 40
-+117 169 40  117 169 40  117 169 40  117 169 40  117 169 40  118 170 40
-+111 160 38  50 72 17  2 3 1  2 3 1  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  1 1 0
-+1 1 0  12 18 4  81 118 28  118 170 40  117 169 40  117 169 40
-+117 169 40  117 169 40  117 169 40  117 169 40  117 169 40  117 169 40
-+117 169 40  117 169 40  117 169 40  117 170 40  118 171 40  101 146 34
-+42 61 14  2 3 1  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  3 4 1  36 52 12  89 128 30
-+117 169 40  117 169 40  117 169 40  117 169 40  117 169 40  117 169 40
-+117 169 40  117 169 40  117 169 40  117 169 40  117 169 40  117 169 40
-+118 171 41  101 146 34  14 20 5  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  47 69 16  118 170 40  117 169 40  117 169 40  117 169 40
-+117 169 40  117 169 40  117 169 40  117 169 40  117 169 40  117 169 40
-+117 169 40  117 169 40  117 170 40  111 160 38  69 100 23  19 27 6
-+0 1 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  11 16 4  69 100 23
-+115 167 39  119 172 41  117 169 40  117 169 40  117 169 40  117 169 40
-+117 169 40  117 169 40  117 169 40  117 169 40  117 169 40  117 169 40
-+119 172 41  75 109 26  3 4 1  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  23 34 8  106 153 36  118 170 40  117 169 40  117 169 40
-+117 169 40  117 169 40  117 169 40  117 169 40  117 169 40  117 169 40
-+117 169 40  118 170 40  119 172 41  105 151 36  42 61 14  2 3 1
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  1 1 0  15 21 5
-+45 64 15  80 116 27  114 165 39  118 170 40  117 169 40  117 169 40
-+117 169 40  117 169 40  117 169 40  117 169 40  117 169 40  119 172 41
-+97 141 33  20 30 7  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  1 1 0  53 76 18  114 165 39  118 171 40  117 169 40
-+117 169 40  117 169 40  117 169 40  117 169 40  117 169 40  117 169 40
-+118 171 40  104 150 35  64 92 22  31 45 11  10 15 3  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  36 52 12  97 141 33  109 158 37  113 163 39  116 168 40
-+117 169 40  117 170 40  118 170 40  119 172 41  115 167 39  84 121 28
-+23 34 8  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  3 4 1  50 72 17  102 148 35  118 171 40
-+119 171 41  118 170 40  117 169 40  117 169 40  115 166 39  111 161 38
-+109 157 37  79 115 27  12 18 4  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  3 4 1  15 21 5  23 34 8  45 64 15  106 153 36
-+116 167 40  111 160 38  101 146 34  79 115 27  42 61 14  10 15 3
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  1 1 0  20 30 7  60 86 20
-+89 128 30  106 153 36  113 163 39  117 169 40  84 121 28  29 42 10
-+19 27 6  10 15 3  2 3 1  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  16 23 5  38 55 13
-+36 52 12  26 37 9  12 18 4  2 3 1  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  1 0 0  19 2 7  52 5 18
-+78 7 27  88 8 31  81 7 29  56 5 19  25 2 9  3 0 1
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+3 4 1  19 27 6  31 45 11  38 55 13  32 47 11  3 4 1
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  3 0 1
-+9 0 3  12 1 4  9 0 3  4 0 1  0 0 0  0 0 0
-+0 0 0  0 0 0  28 3 10  99 9 35  156 14 55  182 16 64
-+189 17 66  190 17 67  189 17 66  184 17 65  166 15 58  118 13 41
-+45 4 16  3 0 1  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  11 1 4  52 5 18  101 9 35  134 12 47
-+151 14 53  154 14 54  151 14 53  113 10 40  11 1 4  0 0 0
-+3 0 1  67 6 24  159 14 56  190 17 67  190 17 67  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  190 17 67  191 17 67
-+174 16 61  101 9 35  14 1 5  0 0 0  35 3 12  108 10 38
-+122 11 43  122 11 43  112 10 39  87 8 30  50 5 17  13 1 5
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+3 0 1  56 5 19  141 13 49  182 16 64  191 17 67  191 17 67
-+190 17 67  190 17 67  191 17 67  113 10 40  3 0 1  1 0 0
-+79 7 28  180 16 63  190 17 67  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+189 17 66  188 17 66  122 11 43  11 1 4  41 4 14  176 16 62
-+191 17 67  191 17 67  191 17 67  190 17 67  181 16 63  146 13 51
-+75 7 26  10 1 4  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  7 1 2
-+90 8 32  178 16 62  191 17 67  188 17 66  188 17 66  188 17 66
-+188 17 66  190 17 67  141 13 49  22 2 8  0 0 0  41 4 14
-+173 16 61  190 17 67  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  88 8 31  1 0 0  89 8 31
-+185 17 65  189 17 66  188 17 66  188 17 66  189 17 66  191 17 67
-+186 17 65  124 11 43  25 2 9  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  2 0 1  89 8 31
-+184 17 65  189 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+190 17 67  151 14 53  34 3 12  0 0 0  0 0 0  79 7 28
-+190 17 67  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  191 17 67  146 13 51  9 1 3  7 1 2
-+108 10 38  187 17 66  189 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  190 17 67  141 13 49  22 2 8  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  52 5 18  176 16 62
-+189 17 66  188 17 66  188 17 66  188 17 66  188 17 66  190 17 67
-+151 14 53  38 3 13  0 0 0  0 0 0  0 0 0  50 5 17
-+180 16 63  189 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  191 17 67  141 13 49  7 1 3  0 0 0
-+11 1 4  112 10 39  187 17 66  189 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  190 17 67  113 10 40  5 0 2  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  7 1 3  132 12 46  191 17 67
-+188 17 66  188 17 66  188 17 66  188 17 66  190 17 67  146 13 51
-+35 3 12  0 0 0  0 0 0  0 0 0  0 0 0  5 0 2
-+101 9 35  185 17 65  190 17 67  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  190 17 67  180 16 63  67 6 24  0 0 0  0 0 0
-+0 0 0  11 1 4  108 10 38  186 17 65  189 17 66  188 17 66
-+188 17 66  188 17 66  189 17 66  180 16 63  56 5 19  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  44 4 15  177 16 62  189 17 66
-+188 17 66  188 17 66  189 17 66  189 17 66  134 12 47  28 3 10
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+8 1 3  79 7 28  159 14 56  188 17 66  191 17 67  190 17 67
-+189 17 66  189 17 66  189 17 66  189 17 66  190 17 67  191 17 67
-+188 17 66  158 14 55  72 7 25  4 0 1  0 0 0  0 0 0
-+0 0 0  0 0 0  8 1 3  95 9 33  182 16 64  189 17 67
-+188 17 66  188 17 66  188 17 66  191 17 67  122 11 43  3 0 1
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  88 8 31  190 17 67  188 17 66
-+188 17 66  189 17 66  185 17 65  113 10 40  18 2 6  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  1 0 0  24 2 8  77 7 27  124 11 43  154 14 54
-+168 15 59  173 16 61  173 16 61  168 15 59  154 14 54  124 11 43
-+77 7 27  22 2 8  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  5 0 2  77 7 27  173 16 61
-+190 17 67  188 17 66  188 17 66  190 17 67  164 15 57  23 2 8
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  1 0 0  118 13 41  191 17 67  188 17 66
-+190 17 67  174 16 61  87 8 30  8 1 3  0 0 0  0 0 0
-+0 0 0  0 0 0  10 1 4  29 3 10  40 4 14  36 3 13
-+18 2 6  2 0 1  0 0 0  0 0 0  3 0 1  14 1 5
-+26 2 9  33 3 11  32 3 11  25 2 9  13 1 5  3 0 1
-+0 0 0  14 1 5  56 5 19  95 9 33  109 10 38  101 9 35
-+77 7 27  35 3 12  5 0 2  0 0 0  1 0 0  56 5 19
-+156 14 55  190 17 67  188 17 66  188 17 66  182 16 64  50 5 17
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  5 0 2  134 12 47  191 17 67  189 17 66
-+151 14 53  52 5 18  2 0 1  0 0 0  0 0 0  1 0 0
-+28 3 10  90 8 32  146 13 51  170 15 60  178 16 62  174 16 61
-+158 14 55  112 10 39  40 4 14  1 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  3 0 1
-+56 5 19  146 13 51  183 17 64  191 17 67  191 17 67  191 17 67
-+188 17 66  173 16 61  122 11 43  41 4 14  1 0 0  0 0 0
-+30 3 10  124 11 43  185 17 65  190 17 67  187 17 66  67 6 24
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  6 1 2  134 12 47  168 15 59  99 9 35
-+21 2 7  0 0 0  0 0 0  0 0 0  6 1 2  77 7 27
-+162 15 57  190 17 67  191 17 67  189 17 66  189 17 66  189 17 66
-+190 17 67  191 17 67  169 15 59  75 7 26  3 0 1  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  2 0 1  79 7 28
-+178 16 62  191 17 67  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  189 17 66  191 17 67  170 15 60  79 7 28  5 0 2
-+0 0 0  10 1 3  78 7 27  159 14 56  188 17 66  75 7 26
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  1 0 0  35 3 12  29 3 10  2 0 1
-+0 0 0  0 0 0  0 0 0  9 1 3  101 9 35  183 17 64
-+190 17 67  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  190 17 67  178 16 63  67 6 23  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  52 5 18  174 16 61
-+190 17 67  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  190 17 67  182 16 64  89 8 31
-+4 0 1  0 0 0  0 0 0  25 2 9  73 7 26  31 3 11
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  4 0 1  98 9 34  187 17 66  189 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  190 17 67  158 14 55  25 2 9
-+0 0 0  0 0 0  0 0 0  8 1 3  134 12 47  191 17 67
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  189 17 66  180 16 63
-+68 6 24  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  6 1 2  19 2 7  3 0 1  0 0 0  0 0 0
-+0 0 0  0 0 0  65 6 23  180 16 63  189 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  189 17 66  83 8 29
-+0 0 0  0 0 0  0 0 0  41 4 14  177 16 62  189 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  190 17 67
-+159 14 56  28 3 10  0 0 0  0 0 0  0 0 0  23 2 8
-+41 4 14  5 0 2  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+23 2 8  113 10 40  159 14 56  65 6 23  0 0 0  0 0 0
-+0 0 0  16 1 6  146 13 51  191 17 67  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  191 17 67  132 12 46
-+5 0 2  0 0 0  0 0 0  77 7 27  189 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+190 17 67  98 9 34  0 0 0  0 0 0  12 1 4  134 12 47
-+178 16 63  108 10 38  16 1 6  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  30 3 10
-+141 13 49  190 17 67  191 17 67  134 12 47  6 1 2  0 0 0
-+0 0 0  68 6 24  186 17 65  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  190 17 67  156 14 55
-+14 1 5  0 0 0  0 0 0  98 9 34  191 17 67  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+190 17 67  156 14 55  19 2 7  0 0 0  47 4 16  181 16 63
-+190 17 67  189 17 66  126 14 44  17 2 6  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  16 1 6  134 12 47
-+191 17 67  188 17 66  190 17 67  162 15 57  19 2 7  0 0 0
-+3 0 1  123 11 43  191 17 67  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  190 17 67  163 15 57
-+20 2 7  0 0 0  0 0 0  101 9 35  191 17 67  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  182 16 64  52 5 18  0 0 0  73 7 26  188 17 66
-+188 17 66  188 17 66  189 17 66  109 10 38  5 0 2  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  95 9 33  189 17 66
-+188 17 66  188 17 66  189 17 66  171 15 60  29 3 10  0 0 0
-+16 1 6  156 14 55  190 17 67  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  190 17 67  158 14 55
-+17 2 6  0 0 0  0 0 0  85 8 30  190 17 67  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  189 17 66  81 7 29  0 0 0  85 8 30  190 17 67
-+188 17 66  188 17 66  189 17 66  180 16 63  56 5 19  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  25 2 9  162 15 57  190 17 67
-+188 17 66  188 17 66  189 17 66  173 16 61  31 3 11  0 0 0
-+30 3 10  171 15 60  189 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  191 17 67  141 13 49
-+7 1 2  0 0 0  0 0 0  56 5 19  183 17 64  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  191 17 67  98 9 34  0 0 0  88 8 31  190 17 67
-+188 17 66  188 17 66  188 17 66  191 17 67  124 11 43  5 0 2
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  68 6 24  187 17 66  188 17 66
-+188 17 66  188 17 66  189 17 66  170 15 60  28 3 10  0 0 0
-+34 3 12  174 16 61  189 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  191 17 67  101 9 35
-+0 0 0  0 0 0  0 0 0  21 2 7  159 14 56  190 17 67
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  191 17 67  98 9 34  0 0 0  81 7 29  189 17 66
-+188 17 66  188 17 66  188 17 66  189 17 66  168 15 59  28 3 10
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  109 10 38  191 17 67  188 17 66
-+188 17 66  188 17 66  190 17 67  163 15 57  21 2 7  0 0 0
-+26 2 9  168 15 59  189 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  189 17 66  180 16 63  47 4 16
-+0 0 0  0 0 0  0 0 0  0 0 0  108 10 38  190 17 67
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  189 17 66  78 7 27  0 0 0  68 6 24  187 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  183 17 64  56 5 19
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  3 0 1  131 12 46  191 17 67  188 17 66
-+188 17 66  188 17 66  190 17 67  151 14 53  12 1 4  0 0 0
-+11 1 4  146 13 51  190 17 67  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  191 17 67  126 14 44  7 1 2
-+0 0 0  0 0 0  0 0 0  0 0 0  32 3 11  164 15 58
-+190 17 67  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+189 17 66  178 16 62  44 4 15  0 0 0  50 5 17  182 16 64
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  72 7 25
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  5 0 2  134 12 47  191 17 67  188 17 66
-+188 17 66  188 17 66  191 17 67  131 12 46  3 0 1  0 0 0
-+0 0 0  101 9 35  190 17 67  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  190 17 67  170 15 60  44 4 15  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  77 7 27
-+183 17 64  189 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+191 17 67  134 12 47  9 1 3  0 0 0  31 3 11  171 15 60
-+189 17 66  188 17 66  188 17 66  188 17 66  188 17 66  72 7 25
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  2 0 1  124 11 43  191 17 67  188 17 66
-+188 17 66  188 17 66  191 17 67  101 9 35  0 0 0  0 0 0
-+0 0 0  35 3 12  168 15 59  190 17 67  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  189 17 66  182 16 64  77 7 27  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  6 1 2
-+99 9 35  185 17 65  189 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  189 17 66
-+177 16 62  56 5 19  0 0 0  0 0 0  13 1 5  151 14 53
-+190 17 67  188 17 66  188 17 66  188 17 66  185 17 65  56 5 19
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  99 9 35  191 17 67  188 17 66
-+188 17 66  188 17 66  186 17 65  65 6 23  0 0 0  0 0 0
-+0 0 0  0 0 0  79 7 28  182 16 64  190 17 67  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+191 17 67  177 16 62  83 8 29  4 0 1  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+8 1 3  89 8 31  175 16 62  191 17 67  189 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  190 17 67  181 16 63
-+85 8 30  3 0 1  0 0 0  0 0 0  1 0 0  118 13 41
-+191 17 67  188 17 66  188 17 66  189 17 66  173 16 61  34 3 12
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  56 5 19  183 17 64  188 17 66
-+188 17 66  189 17 66  169 15 59  30 3 10  0 0 0  0 0 0
-+0 0 0  0 0 0  5 0 2  83 8 29  173 16 61  191 17 67
-+190 17 67  189 17 66  189 17 66  190 17 67  191 17 67  187 17 66
-+151 14 53  56 5 19  3 0 1  0 0 0  16 1 6  50 5 17
-+79 7 28  95 9 33  95 9 33  75 7 26  41 4 14  10 1 4
-+0 0 0  2 0 1  50 5 17  132 12 46  178 16 62  190 17 67
-+191 17 67  191 17 67  191 17 67  186 17 65  154 14 54  68 6 24
-+4 0 1  0 0 0  0 0 0  0 0 0  0 0 0  72 7 25
-+187 17 66  188 17 66  188 17 66  191 17 67  141 13 49  9 1 3
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  14 1 5  151 14 53  190 17 67
-+188 17 66  191 17 67  131 12 46  5 0 2  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  2 0 1  44 4 15  113 10 40
-+156 14 55  173 16 61  174 16 61  164 15 58  134 12 47  77 7 27
-+18 2 6  0 0 0  16 1 6  85 8 30  151 14 53  182 16 64
-+189 17 66  191 17 67  190 17 67  188 17 66  177 16 62  141 13 49
-+68 6 24  8 1 3  0 0 0  8 1 3  44 4 15  88 8 31
-+113 10 40  122 11 43  108 10 38  67 6 24  20 2 7  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  28 3 10
-+166 15 58  190 17 67  188 17 66  187 17 66  79 7 28  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  73 7 26  185 17 65
-+189 17 66  184 17 65  65 6 23  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  2 0 1
-+17 2 6  32 3 11  34 3 12  22 2 8  6 1 2  0 0 0
-+0 0 0  38 3 13  141 13 49  188 17 66  190 17 67  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  189 17 66  191 17 67
-+184 17 65  122 11 43  21 2 7  0 0 0  0 0 0  0 0 0
-+0 0 0  1 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  1 0 0
-+108 10 38  191 17 67  191 17 67  141 13 49  16 1 6  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  8 1 3  112 10 39
-+186 17 65  124 11 43  10 1 4  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+36 3 13  156 14 55  191 17 67  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+189 17 66  190 17 67  134 12 47  18 2 6  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  7 1 2  41 4 14  75 7 26  66 5 23  19 2 7
-+26 2 9  144 13 50  154 14 54  40 4 14  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  13 1 5
-+56 5 19  19 2 7  0 0 0  7 1 2  29 3 10  35 3 12
-+19 2 7  2 0 1  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  13 1 5
-+134 12 47  191 17 67  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  189 17 67  108 10 38  3 0 1  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  1 0 0
-+40 4 14  124 11 43  177 16 62  188 17 66  187 17 66  144 13 50
-+24 2 8  17 2 6  22 2 8  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  19 2 7  122 11 43  171 15 60  175 16 62
-+159 14 56  112 10 39  40 4 14  2 0 1  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  72 7 25
-+186 17 65  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  189 17 66  174 16 61  41 4 14  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  3 0 1  72 7 25
-+168 15 59  191 17 67  189 17 66  188 17 66  188 17 66  190 17 67
-+95 9 33  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  95 9 33  191 17 67  189 17 66  189 17 66
-+190 17 67  191 17 67  171 15 60  90 8 32  12 1 4  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  5 0 2  132 12 46
-+191 17 67  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  190 17 67  98 9 34  0 0 0
-+0 0 0  0 0 0  0 0 0  5 0 2  88 8 31  180 16 63
-+190 17 67  188 17 66  188 17 66  188 17 66  188 17 66  191 17 67
-+146 13 51  11 1 4  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  9 1 3  144 13 50  191 17 67  188 17 66  188 17 66
-+188 17 66  188 17 66  189 17 66  187 17 66  123 11 43  20 2 7
-+0 0 0  0 0 0  0 0 0  0 0 0  21 2 7  163 15 57
-+190 17 67  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  191 17 67  134 12 47  5 0 2
-+0 0 0  0 0 0  3 0 1  88 8 31  182 16 64  189 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  189 17 66
-+171 15 60  31 3 11  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  20 2 7  162 15 57  190 17 67  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  190 17 67  132 12 46
-+20 2 7  0 0 0  0 0 0  0 0 0  32 3 11  173 16 61
-+189 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  190 17 67  151 14 53  12 1 4
-+0 0 0  0 0 0  72 7 25  180 16 63  189 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+181 16 63  47 4 16  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  21 2 7  163 15 57  190 17 67  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  190 17 67
-+122 11 43  9 1 3  0 0 0  0 0 0  30 3 10  171 15 60
-+189 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  190 17 67  146 13 51  10 1 4
-+0 0 0  38 3 13  166 15 58  190 17 67  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+183 17 64  52 5 18  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  13 1 5  154 14 54  190 17 67  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+186 17 65  79 7 28  0 0 0  0 0 0  14 1 5  156 14 54
-+190 17 67  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  191 17 67  124 11 43  2 0 1
-+5 0 2  122 11 43  191 17 67  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+182 16 64  47 4 16  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  3 0 1  126 14 44  191 17 67  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+190 17 67  158 14 55  23 2 8  0 0 0  1 0 0  113 10 40
-+191 17 67  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  78 7 27  0 0 0
-+47 4 16  177 16 62  189 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  189 17 66
-+173 16 61  34 3 12  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  85 8 30  189 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  79 7 28  0 0 0  0 0 0  47 4 16
-+175 16 62  189 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  190 17 67  156 14 55  22 2 8  0 0 0
-+109 10 38  191 17 67  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  190 17 67
-+151 14 53  13 1 5  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  35 3 12  173 16 61  189 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  191 17 67  134 12 47  7 1 2  0 0 0  3 0 1
-+99 9 35  188 17 66  189 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  189 17 66  181 16 63  68 6 24  0 0 0  18 2 6
-+156 14 55  190 17 67  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  190 17 67
-+101 9 35  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  3 0 1  118 13 41  191 17 67  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  189 17 66  168 15 59  28 3 10  0 0 0  0 0 0
-+12 1 4  113 10 40  187 17 66  189 17 67  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+190 17 67  180 16 63  88 8 31  4 0 1  0 0 0  47 4 16
-+180 16 63  189 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  190 17 67  168 15 59
-+36 3 13  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  38 3 13  164 15 58  190 17 67
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  182 16 64  50 5 17  0 0 0  0 0 0
-+0 0 0  11 1 4  90 8 32  169 15 59  190 17 67  190 17 67
-+189 17 66  189 17 66  189 17 66  189 17 66  191 17 67  189 17 66
-+158 14 55  68 6 24  4 0 1  0 0 0  0 0 0  73 7 26
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  189 17 66  185 17 65  83 8 29
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  65 6 23  174 16 61
-+190 17 67  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  185 17 65  56 5 19  0 0 0  0 0 0
-+0 0 0  0 0 0  2 0 1  35 3 12  99 9 35  146 13 51
-+170 15 60  177 16 62  177 16 62  166 15 58  141 13 49  85 8 30
-+24 2 8  0 0 0  0 0 0  0 0 0  0 0 0  85 8 30
-+190 17 67  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  189 17 66  112 10 39  8 1 3
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  1 0 0  68 6 24
-+170 15 60  191 17 67  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  182 16 64  50 5 17  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  1 0 0  11 1 4
-+28 3 10  40 4 14  38 3 13  25 2 9  8 1 3  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  78 7 27
-+189 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  189 17 66  187 17 66  113 10 40  14 1 5  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  1 0 0
-+47 4 16  141 13 49  186 17 65  191 17 67  190 17 67  189 17 66
-+189 17 66  191 17 67  156 14 55  20 2 7  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  44 4 15
-+178 16 62  190 17 67  188 17 66  188 17 66  188 17 66  190 17 67
-+191 17 67  173 16 61  90 8 32  10 1 4  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  14 1 5  68 6 24  131 12 46  162 15 57  174 16 61
-+171 15 60  146 13 51  56 5 19  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  3 0 1  14 1 5  29 3 10
-+41 4 14  47 4 16  50 5 17  45 4 16  34 3 12  18 2 6
-+5 0 2  0 0 0  0 0 0  0 0 0  0 0 0  5 0 2
-+90 8 32  169 15 59  185 17 65  187 17 66  182 16 64  163 15 57
-+113 10 40  41 4 14  2 0 1  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  5 0 2  21 2 7  34 3 12
-+29 3 10  11 1 4  0 0 0  0 0 0  0 0 0  0 0 0
-+3 0 1  32 3 11  79 7 28  124 11 43  154 14 54  171 15 60
-+180 16 63  182 16 64  182 16 64  180 16 63  174 16 61  159 14 56
-+132 12 46  88 8 31  34 3 12  3 0 1  0 0 0  0 0 0
-+3 0 1  29 3 10  56 5 19  65 6 23  50 5 17  23 2 8
-+3 0 1  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  25 2 9
-+109 10 38  169 15 59  189 17 66  191 17 67  190 17 67  189 17 66
-+189 17 66  188 17 66  188 17 66  188 17 66  189 17 66  190 17 67
-+191 17 67  190 17 67  171 15 60  98 9 34  10 1 3  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  14 1 5  141 13 49
-+191 17 67  189 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  189 17 67  186 17 65  65 6 23  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  23 2 8  166 15 58
-+190 17 67  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  189 17 66  176 16 62  45 4 16  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  1 0 0  83 8 29
-+183 17 64  189 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+188 17 66  189 17 66  185 17 65  95 9 33  3 0 1  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  5 0 2
-+85 8 30  176 16 62  191 17 67  188 17 66  188 17 66  188 17 66
-+188 17 66  188 17 66  188 17 66  188 17 66  188 17 66  188 17 66
-+191 17 67  180 16 63  95 9 33  7 1 3  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+2 0 1  52 5 18  141 13 49  185 17 65  191 17 67  189 17 67
-+189 17 66  188 17 66  188 17 66  189 17 66  191 17 67  187 17 66
-+146 13 51  56 5 19  4 0 1  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  14 1 5  68 6 24  131 12 46  166 15 58
-+180 16 63  183 17 64  180 16 63  168 15 59  134 12 47  75 7 26
-+17 2 6  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  5 0 2  24 2 8
-+44 4 15  52 5 18  45 4 16  26 2 9  6 1 2  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0
diff --git a/target/linux/bcm27xx/patches-6.1/950-0108-Pulled-in-the-multi-frame-buffer-support-from-the-Pi.patch b/target/linux/bcm27xx/patches-6.1/950-0108-Pulled-in-the-multi-frame-buffer-support-from-the-Pi.patch
deleted file mode 100644
index e3eece724b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0108-Pulled-in-the-multi-frame-buffer-support-from-the-Pi.patch
+++ /dev/null
@@ -1,778 +0,0 @@
-From 4bfcd159944e7387f701cceb85b26f6d6d17fbed Mon Sep 17 00:00:00 2001
-From: James Hughes <james.hughes@raspberrypi.org>
-Date: Thu, 14 Mar 2019 13:27:54 +0000
-Subject: [PATCH] Pulled in the multi frame buffer support from the Pi3
- repo
-
----
- drivers/video/fbdev/bcm2708_fb.c | 457 ++++++++++++++++++++++---------
- 1 file changed, 324 insertions(+), 133 deletions(-)
-
---- a/drivers/video/fbdev/bcm2708_fb.c
-+++ b/drivers/video/fbdev/bcm2708_fb.c
-@@ -2,6 +2,7 @@
-  *  linux/drivers/video/bcm2708_fb.c
-  *
-  * Copyright (C) 2010 Broadcom
-+ * Copyright (C) 2018 Raspberry Pi (Trading) Ltd
-  *
-  * This file is subject to the terms and conditions of the GNU General Public
-  * License.  See the file COPYING in the main directory of this archive
-@@ -13,6 +14,7 @@
-  * Copyright 1999-2001 Jeff Garzik <jgarzik@pobox.com>
-  *
-  */
-+
- #include <linux/module.h>
- #include <linux/kernel.h>
- #include <linux/errno.h>
-@@ -33,6 +35,7 @@
- #include <linux/io.h>
- #include <linux/dma-mapping.h>
- #include <soc/bcm2835/raspberrypi-firmware.h>
-+#include <linux/mutex.h>
- 
- //#define BCM2708_FB_DEBUG
- #define MODULE_NAME "bcm2708_fb"
-@@ -79,64 +82,150 @@ struct bcm2708_fb_stats {
- 	u32 dma_irqs;
- };
- 
-+struct vc4_display_settings_t {
-+	u32 display_num;
-+	u32 width;
-+	u32 height;
-+	u32 depth;
-+	u32 pitch;
-+	u32 virtual_width;
-+	u32 virtual_height;
-+	u32 virtual_width_offset;
-+	u32 virtual_height_offset;
-+	unsigned long fb_bus_address;
-+};
-+
-+struct bcm2708_fb_dev;
-+
- struct bcm2708_fb {
- 	struct fb_info fb;
- 	struct platform_device *dev;
--	struct rpi_firmware *fw;
- 	u32 cmap[16];
- 	u32 gpu_cmap[256];
--	int dma_chan;
--	int dma_irq;
--	void __iomem *dma_chan_base;
--	void *cb_base;		/* DMA control blocks */
--	dma_addr_t cb_handle;
- 	struct dentry *debugfs_dir;
--	wait_queue_head_t dma_waitq;
--	struct bcm2708_fb_stats stats;
-+	struct dentry *debugfs_subdir;
- 	unsigned long fb_bus_address;
--	bool disable_arm_alloc;
-+	struct { u32 base, length; } gpu;
-+	struct vc4_display_settings_t display_settings;
-+	struct debugfs_regset32 screeninfo_regset;
-+	struct bcm2708_fb_dev *fbdev;
- 	unsigned int image_size;
- 	dma_addr_t dma_addr;
- 	void *cpuaddr;
- };
- 
-+#define MAX_FRAMEBUFFERS 3
-+
-+struct bcm2708_fb_dev {
-+	int firmware_supports_multifb;
-+	/* Protects the DMA system from multiple FB access */
-+	struct mutex dma_mutex;
-+	int dma_chan;
-+	int dma_irq;
-+	void __iomem *dma_chan_base;
-+	wait_queue_head_t dma_waitq;
-+	bool disable_arm_alloc;
-+	struct bcm2708_fb_stats dma_stats;
-+	void *cb_base;	/* DMA control blocks */
-+	dma_addr_t cb_handle;
-+	int instance_count;
-+	int num_displays;
-+	struct rpi_firmware *fw;
-+	struct bcm2708_fb displays[MAX_FRAMEBUFFERS];
-+};
-+
- #define to_bcm2708(info)	container_of(info, struct bcm2708_fb, fb)
- 
- static void bcm2708_fb_debugfs_deinit(struct bcm2708_fb *fb)
- {
--	debugfs_remove_recursive(fb->debugfs_dir);
--	fb->debugfs_dir = NULL;
-+	debugfs_remove_recursive(fb->debugfs_subdir);
-+	fb->debugfs_subdir = NULL;
-+
-+	fb->fbdev->instance_count--;
-+
-+	if (!fb->fbdev->instance_count) {
-+		debugfs_remove_recursive(fb->debugfs_dir);
-+		fb->debugfs_dir = NULL;
-+	}
- }
- 
- static int bcm2708_fb_debugfs_init(struct bcm2708_fb *fb)
- {
-+	char buf[3];
-+	struct bcm2708_fb_dev *fbdev = fb->fbdev;
-+
- 	static struct debugfs_reg32 stats_registers[] = {
--		{
--			"dma_copies",
--			offsetof(struct bcm2708_fb_stats, dma_copies)
--		},
--		{
--			"dma_irqs",
--			offsetof(struct bcm2708_fb_stats, dma_irqs)
--		},
-+	{"dma_copies", offsetof(struct bcm2708_fb_stats, dma_copies)},
-+	{"dma_irqs",   offsetof(struct bcm2708_fb_stats, dma_irqs)},
- 	};
- 
--	fb->debugfs_dir = debugfs_create_dir(DRIVER_NAME, NULL);
-+	static struct debugfs_reg32 screeninfo[] = {
-+	{"width",	 offsetof(struct fb_var_screeninfo, xres)},
-+	{"height",	 offsetof(struct fb_var_screeninfo, yres)},
-+	{"bpp",		 offsetof(struct fb_var_screeninfo, bits_per_pixel)},
-+	{"xres_virtual", offsetof(struct fb_var_screeninfo, xres_virtual)},
-+	{"yres_virtual", offsetof(struct fb_var_screeninfo, yres_virtual)},
-+	{"xoffset",	 offsetof(struct fb_var_screeninfo, xoffset)},
-+	{"yoffset",	 offsetof(struct fb_var_screeninfo, yoffset)},
-+	};
-+
-+	fb->debugfs_dir = debugfs_lookup(DRIVER_NAME, NULL);
-+
-+	if (!fb->debugfs_dir)
-+		fb->debugfs_dir = debugfs_create_dir(DRIVER_NAME, NULL);
-+
- 	if (!fb->debugfs_dir) {
--		pr_warn("%s: could not create debugfs entry\n",
--			__func__);
-+		dev_warn(fb->fb.dev, "%s: could not create debugfs folder\n",
-+			 __func__);
- 		return -EFAULT;
- 	}
- 
--	fb->stats.regset.regs = stats_registers;
--	fb->stats.regset.nregs = ARRAY_SIZE(stats_registers);
--	fb->stats.regset.base = &fb->stats;
-+	snprintf(buf, sizeof(buf), "%u", fb->display_settings.display_num);
-+
-+	fb->debugfs_subdir = debugfs_create_dir(buf, fb->debugfs_dir);
- 
- 	debugfs_create_regset32("stats", 0444, fb->debugfs_dir,
- 				&fb->stats.regset);
-+
-+	if (!fb->debugfs_subdir) {
-+		dev_warn(fb->fb.dev, "%s: could not create debugfs entry %u\n",
-+			 __func__, fb->display_settings.display_num);
-+		return -EFAULT;
-+	}
-+
-+	fbdev->dma_stats.regset.regs = stats_registers;
-+	fbdev->dma_stats.regset.nregs = ARRAY_SIZE(stats_registers);
-+	fbdev->dma_stats.regset.base = &fbdev->dma_stats;
-+
-+	debugfs_create_regset32("dma_stats", 0444, fb->debugfs_subdir,
-+				&fbdev->dma_stats.regset);
-+
-+	fb->screeninfo_regset.regs = screeninfo;
-+	fb->screeninfo_regset.nregs = ARRAY_SIZE(screeninfo);
-+	fb->screeninfo_regset.base = &fb->fb.var;
-+
-+	debugfs_create_regset32("screeninfo", 0444, fb->debugfs_subdir,
-+				&fb->screeninfo_regset);
-+
-+	fbdev->instance_count++;
-+
- 	return 0;
- }
- 
-+static void set_display_num(struct bcm2708_fb *fb)
-+{
-+	if (fb && fb->fbdev && fb->fbdev->firmware_supports_multifb) {
-+		u32 tmp = fb->display_settings.display_num;
-+
-+		if (rpi_firmware_property(fb->fbdev->fw,
-+					  RPI_FIRMWARE_FRAMEBUFFER_SET_DISPLAY_NUM,
-+					  &tmp,
-+					  sizeof(tmp)))
-+			dev_warn_once(fb->fb.dev,
-+				      "Set display number call failed. Old GPU firmware?");
-+	}
-+}
-+
- static int bcm2708_fb_set_bitfields(struct fb_var_screeninfo *var)
- {
- 	int ret = 0;
-@@ -214,11 +303,11 @@ static int bcm2708_fb_check_var(struct f
- 				struct fb_info *info)
- {
- 	/* info input, var output */
--	print_debug("%s(%p) %dx%d (%dx%d), %d, %d\n",
-+	print_debug("%s(%p) %ux%u (%ux%u), %ul, %u\n",
- 		    __func__, info, info->var.xres, info->var.yres,
- 		    info->var.xres_virtual, info->var.yres_virtual,
--		    (int)info->screen_size, info->var.bits_per_pixel);
--	print_debug("%s(%p) %dx%d (%dx%d), %d\n", __func__, var, var->xres,
-+		    info->screen_size, info->var.bits_per_pixel);
-+	print_debug("%s(%p) %ux%u (%ux%u), %u\n", __func__, var, var->xres,
- 		    var->yres, var->xres_virtual, var->yres_virtual,
- 		    var->bits_per_pixel);
- 
-@@ -281,17 +370,24 @@ static int bcm2708_fb_set_par(struct fb_
- 	};
- 	int ret, image_size;
- 
--
--	print_debug("%s(%p) %dx%d (%dx%d), %d, %d\n", __func__, info,
-+	print_debug("%s(%p) %dx%d (%dx%d), %d, %d (display %d)\n", __func__,
-+		    info,
- 		    info->var.xres, info->var.yres, info->var.xres_virtual,
- 		    info->var.yres_virtual, (int)info->screen_size,
--		    info->var.bits_per_pixel);
-+		    info->var.bits_per_pixel, value);
-+
-+	/* Need to set the display number to act on first
-+	 * Cannot do it in the tag list because on older firmware the call
-+	 * will fail and stop the rest of the list being executed.
-+	 * We can ignore this call failing as the default at other end is 0
-+	 */
-+	set_display_num(fb);
- 
- 	/* Try allocating our own buffer. We can specify all the parameters */
- 	image_size = ((info->var.xres * info->var.yres) *
- 		      info->var.bits_per_pixel) >> 3;
- 
--	if (!fb->disable_arm_alloc &&
-+	if (!fb->fbdev->disable_arm_alloc &&
- 	    (image_size != fb->image_size || !fb->dma_addr)) {
- 		if (fb->dma_addr) {
- 			dma_free_coherent(info->device, fb->image_size,
-@@ -306,7 +402,7 @@ static int bcm2708_fb_set_par(struct fb_
- 
- 		if (!fb->cpuaddr) {
- 			fb->dma_addr = 0;
--			fb->disable_arm_alloc = true;
-+			fb->fbdev->disable_arm_alloc = true;
- 		} else {
- 			fb->image_size = image_size;
- 		}
-@@ -317,7 +413,7 @@ static int bcm2708_fb_set_par(struct fb_
- 		fbinfo.screen_size = image_size;
- 		fbinfo.pitch = (info->var.xres * info->var.bits_per_pixel) >> 3;
- 
--		ret = rpi_firmware_property_list(fb->fw, &fbinfo,
-+		ret = rpi_firmware_property_list(fb->fbdev->fw, &fbinfo,
- 						 sizeof(fbinfo));
- 		if (ret || fbinfo.base != fb->dma_addr) {
- 			/* Firmware either failed, or assigned a different base
-@@ -330,7 +426,7 @@ static int bcm2708_fb_set_par(struct fb_
- 			fb->image_size = 0;
- 			fb->cpuaddr = NULL;
- 			fb->dma_addr = 0;
--			fb->disable_arm_alloc = true;
-+			fb->fbdev->disable_arm_alloc = true;
- 		}
- 	} else {
- 		/* Our allocation failed - drop into the old scheme of
-@@ -349,7 +445,7 @@ static int bcm2708_fb_set_par(struct fb_
- 		fbinfo.tag6.tag = RPI_FIRMWARE_FRAMEBUFFER_GET_PITCH;
- 		fbinfo.pitch = 0;
- 
--		ret = rpi_firmware_property_list(fb->fw, &fbinfo,
-+		ret = rpi_firmware_property_list(fb->fbdev->fw, &fbinfo,
- 						 sizeof(fbinfo));
- 		if (ret) {
- 			dev_err(info->device,
-@@ -439,7 +535,10 @@ static int bcm2708_fb_setcolreg(unsigned
- 			packet->length = regno + 1;
- 			memcpy(packet->cmap, fb->gpu_cmap,
- 			       sizeof(packet->cmap));
--			ret = rpi_firmware_property(fb->fw,
-+
-+			set_display_num(fb);
-+
-+			ret = rpi_firmware_property(fb->fbdev->fw,
- 						    RPI_FIRMWARE_FRAMEBUFFER_SET_PALETTE,
- 						    packet,
- 						    (2 + packet->length) * sizeof(u32));
-@@ -478,8 +577,11 @@ static int bcm2708_fb_blank(int blank_mo
- 		return -EINVAL;
- 	}
- 
--	ret = rpi_firmware_property(fb->fw, RPI_FIRMWARE_FRAMEBUFFER_BLANK,
-+	set_display_num(fb);
-+
-+	ret = rpi_firmware_property(fb->fbdev->fw, RPI_FIRMWARE_FRAMEBUFFER_BLANK,
- 				    &value, sizeof(value));
-+
- 	if (ret)
- 		dev_err(info->device, "%s(%d) failed: %d\n", __func__,
- 			blank_mode, ret);
-@@ -496,12 +598,14 @@ static int bcm2708_fb_pan_display(struct
- 	info->var.yoffset = var->yoffset;
- 	result = bcm2708_fb_set_par(info);
- 	if (result != 0)
--		pr_err("%s(%d,%d) returns=%d\n", __func__, var->xoffset,
-+		pr_err("%s(%u,%u) returns=%d\n", __func__, var->xoffset,
- 		       var->yoffset, result);
- 	return result;
- }
- 
- static int bcm2708_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
-+static int bcm2708_ioctl(struct fb_info *info, unsigned int cmd,
-+			 unsigned long arg)
- {
- 	struct bcm2708_fb *fb = to_bcm2708(info);
- 	u32 dummy = 0;
-@@ -509,7 +613,9 @@ static int bcm2708_ioctl(struct fb_info
- 
- 	switch (cmd) {
- 	case FBIO_WAITFORVSYNC:
--		ret = rpi_firmware_property(fb->fw,
-+		set_display_num(fb);
-+
-+		ret = rpi_firmware_property(fb->fbdev->fw,
- 					    RPI_FIRMWARE_FRAMEBUFFER_SET_VSYNC,
- 					    &dummy, sizeof(dummy));
- 		break;
-@@ -526,23 +632,22 @@ static int bcm2708_ioctl(struct fb_info
- static void bcm2708_fb_fillrect(struct fb_info *info,
- 				const struct fb_fillrect *rect)
- {
--	/* (is called) print_debug("bcm2708_fb_fillrect\n"); */
- 	cfb_fillrect(info, rect);
- }
- 
- /* A helper function for configuring dma control block */
- static void set_dma_cb(struct bcm2708_dma_cb *cb,
--		       int        burst_size,
--		       dma_addr_t dst,
--		       int        dst_stride,
--		       dma_addr_t src,
--		       int        src_stride,
--		       int        w,
--		       int        h)
-+		int        burst_size,
-+		dma_addr_t dst,
-+		int        dst_stride,
-+		dma_addr_t src,
-+		int        src_stride,
-+		int        w,
-+		int        h)
- {
- 	cb->info = BCM2708_DMA_BURST(burst_size) | BCM2708_DMA_S_WIDTH |
--		   BCM2708_DMA_S_INC | BCM2708_DMA_D_WIDTH |
--		   BCM2708_DMA_D_INC | BCM2708_DMA_TDMODE;
-+		BCM2708_DMA_S_INC | BCM2708_DMA_D_WIDTH |
-+		BCM2708_DMA_D_INC | BCM2708_DMA_TDMODE;
- 	cb->dst = dst;
- 	cb->src = src;
- 	/*
-@@ -560,15 +665,19 @@ static void bcm2708_fb_copyarea(struct f
- 				const struct fb_copyarea *region)
- {
- 	struct bcm2708_fb *fb = to_bcm2708(info);
--	struct bcm2708_dma_cb *cb = fb->cb_base;
-+	struct bcm2708_fb_dev *fbdev = fb->fbdev;
-+	struct bcm2708_dma_cb *cb = fbdev->cb_base;
- 	int bytes_per_pixel = (info->var.bits_per_pixel + 7) >> 3;
- 
- 	/* Channel 0 supports larger bursts and is a bit faster */
--	int burst_size = (fb->dma_chan == 0) ? 8 : 2;
-+	int burst_size = (fbdev->dma_chan == 0) ? 8 : 2;
- 	int pixels = region->width * region->height;
- 
--	/* Fallback to cfb_copyarea() if we don't like something */
--	if (bytes_per_pixel > 4 ||
-+	/* If DMA is currently in use (ie being used on another FB), then
-+	 * rather than wait for it to finish, just use the cfb_copyarea
-+	 */
-+	if (!mutex_trylock(&fbdev->dma_mutex) ||
-+	    bytes_per_pixel > 4 ||
- 	    info->var.xres * info->var.yres > 1920 * 1200 ||
- 	    region->width <= 0 || region->width > info->var.xres ||
- 	    region->height <= 0 || region->height > info->var.yres ||
-@@ -595,8 +704,8 @@ static void bcm2708_fb_copyarea(struct f
- 		 * 1920x1200 resolution at 32bpp pixel depth.
- 		 */
- 		int y;
--		dma_addr_t control_block_pa = fb->cb_handle;
--		dma_addr_t scratchbuf = fb->cb_handle + 16 * 1024;
-+		dma_addr_t control_block_pa = fbdev->cb_handle;
-+		dma_addr_t scratchbuf = fbdev->cb_handle + 16 * 1024;
- 		int scanline_size = bytes_per_pixel * region->width;
- 		int scanlines_per_cb = (64 * 1024 - 16 * 1024) / scanline_size;
- 
-@@ -646,10 +755,10 @@ static void bcm2708_fb_copyarea(struct f
- 		}
- 		set_dma_cb(cb, burst_size,
- 			   fb->fb_bus_address + dy * fb->fb.fix.line_length +
--						   bytes_per_pixel * region->dx,
-+			   bytes_per_pixel * region->dx,
- 			   stride,
- 			   fb->fb_bus_address + sy * fb->fb.fix.line_length +
--						   bytes_per_pixel * region->sx,
-+			   bytes_per_pixel * region->sx,
- 			   stride,
- 			   region->width * bytes_per_pixel,
- 			   region->height);
-@@ -659,32 +768,33 @@ static void bcm2708_fb_copyarea(struct f
- 	cb->next = 0;
- 
- 	if (pixels < dma_busy_wait_threshold) {
--		bcm_dma_start(fb->dma_chan_base, fb->cb_handle);
--		bcm_dma_wait_idle(fb->dma_chan_base);
-+		bcm_dma_start(fbdev->dma_chan_base, fbdev->cb_handle);
-+		bcm_dma_wait_idle(fbdev->dma_chan_base);
- 	} else {
--		void __iomem *dma_chan = fb->dma_chan_base;
-+		void __iomem *local_dma_chan = fbdev->dma_chan_base;
- 
- 		cb->info |= BCM2708_DMA_INT_EN;
--		bcm_dma_start(fb->dma_chan_base, fb->cb_handle);
--		while (bcm_dma_is_busy(dma_chan)) {
--			wait_event_interruptible(fb->dma_waitq,
--						 !bcm_dma_is_busy(dma_chan));
-+		bcm_dma_start(fbdev->dma_chan_base, fbdev->cb_handle);
-+		while (bcm_dma_is_busy(local_dma_chan)) {
-+			wait_event_interruptible(fbdev->dma_waitq,
-+						 !bcm_dma_is_busy(local_dma_chan));
- 		}
--		fb->stats.dma_irqs++;
-+		fbdev->dma_stats.dma_irqs++;
- 	}
--	fb->stats.dma_copies++;
-+	fbdev->dma_stats.dma_copies++;
-+
-+	mutex_unlock(&fbdev->dma_mutex);
- }
- 
- static void bcm2708_fb_imageblit(struct fb_info *info,
- 				 const struct fb_image *image)
- {
--	/* (is called) print_debug("bcm2708_fb_imageblit\n"); */
- 	cfb_imageblit(info, image);
- }
- 
- static irqreturn_t bcm2708_fb_dma_irq(int irq, void *cxt)
- {
--	struct bcm2708_fb *fb = cxt;
-+	struct bcm2708_fb_dev *fbdev = cxt;
- 
- 	/* FIXME: should read status register to check if this is
- 	 * actually interrupting us or not, in case this interrupt
-@@ -694,9 +804,9 @@ static irqreturn_t bcm2708_fb_dma_irq(in
- 	 */
- 
- 	/* acknowledge the interrupt */
--	writel(BCM2708_DMA_INT, fb->dma_chan_base + BCM2708_DMA_CS);
-+	writel(BCM2708_DMA_INT, fbdev->dma_chan_base + BCM2708_DMA_CS);
- 
--	wake_up(&fb->dma_waitq);
-+	wake_up(&fbdev->dma_waitq);
- 	return IRQ_HANDLED;
- }
- 
-@@ -729,11 +839,23 @@ static int bcm2708_fb_register(struct bc
- 	fb->fb.fix.ywrapstep = 0;
- 	fb->fb.fix.accel = FB_ACCEL_NONE;
- 
--	fb->fb.var.xres = fbwidth;
--	fb->fb.var.yres = fbheight;
--	fb->fb.var.xres_virtual = fbwidth;
--	fb->fb.var.yres_virtual = fbheight;
--	fb->fb.var.bits_per_pixel = fbdepth;
-+	/* If we have data from the VC4 on FB's, use that, otherwise use the
-+	 * module parameters
-+	 */
-+	if (fb->display_settings.width) {
-+		fb->fb.var.xres = fb->display_settings.width;
-+		fb->fb.var.yres = fb->display_settings.height;
-+		fb->fb.var.xres_virtual = fb->fb.var.xres;
-+		fb->fb.var.yres_virtual = fb->fb.var.yres;
-+		fb->fb.var.bits_per_pixel = fb->display_settings.depth;
-+	} else {
-+		fb->fb.var.xres = fbwidth;
-+		fb->fb.var.yres = fbheight;
-+		fb->fb.var.xres_virtual = fbwidth;
-+		fb->fb.var.yres_virtual = fbheight;
-+		fb->fb.var.bits_per_pixel = fbdepth;
-+	}
-+
- 	fb->fb.var.vmode = FB_VMODE_NONINTERLACED;
- 	fb->fb.var.activate = FB_ACTIVATE_NOW;
- 	fb->fb.var.nonstd = 0;
-@@ -749,26 +871,23 @@ static int bcm2708_fb_register(struct bc
- 	fb->fb.monspecs.dclkmax = 100000000;
- 
- 	bcm2708_fb_set_bitfields(&fb->fb.var);
--	init_waitqueue_head(&fb->dma_waitq);
- 
- 	/*
- 	 * Allocate colourmap.
- 	 */
--
- 	fb_set_var(&fb->fb, &fb->fb.var);
-+
- 	ret = bcm2708_fb_set_par(&fb->fb);
-+
- 	if (ret)
- 		return ret;
- 
--	print_debug("BCM2708FB: registering framebuffer (%dx%d@%d) (%d)\n",
--		    fbwidth, fbheight, fbdepth, fbswap);
--
- 	ret = register_framebuffer(&fb->fb);
--	print_debug("BCM2708FB: register framebuffer (%d)\n", ret);
-+
- 	if (ret == 0)
- 		goto out;
- 
--	print_debug("BCM2708FB: cannot register framebuffer (%d)\n", ret);
-+	dev_warn(fb->fb.dev, "Unable to register framebuffer (%d)\n", ret);
- out:
- 	return ret;
- }
-@@ -777,10 +896,18 @@ static int bcm2708_fb_probe(struct platf
- {
- 	struct device_node *fw_np;
- 	struct rpi_firmware *fw;
--	struct bcm2708_fb *fb;
--	int ret;
-+	int ret, i;
-+	u32 num_displays;
-+	struct bcm2708_fb_dev *fbdev;
-+	struct { u32 base, length; } gpu_mem;
-+
-+	fbdev = devm_kzalloc(&dev->dev, sizeof(*fbdev), GFP_KERNEL);
-+
-+	if (!fbdev)
-+		return -ENOMEM;
- 
- 	fw_np = of_parse_phandle(dev->dev.of_node, "firmware", 0);
-+
- /* Remove comment when booting without Device Tree is no longer supported
-  *	if (!fw_np) {
-  *		dev_err(&dev->dev, "Missing firmware node\n");
-@@ -788,90 +915,154 @@ static int bcm2708_fb_probe(struct platf
-  *	}
-  */
- 	fw = rpi_firmware_get(fw_np);
-+	fbdev->fw = fw;
-+
- 	if (!fw)
- 		return -EPROBE_DEFER;
- 
--	fb = kzalloc(sizeof(*fb), GFP_KERNEL);
--	if (!fb) {
--		ret = -ENOMEM;
--		goto free_region;
-+	ret = rpi_firmware_property(fw,
-+				    RPI_FIRMWARE_FRAMEBUFFER_GET_NUM_DISPLAYS,
-+				    &num_displays, sizeof(u32));
-+
-+	/* If we fail to get the number of displays, or it returns 0, then
-+	 * assume old firmware that doesn't have the mailbox call, so just
-+	 * set one display
-+	 */
-+	if (ret || num_displays == 0) {
-+		num_displays = 1;
-+		dev_err(&dev->dev,
-+			"Unable to determine number of FB's. Assuming 1\n");
-+		ret = 0;
-+	} else {
-+		fbdev->firmware_supports_multifb = 1;
-+	}
-+
-+	if (num_displays > MAX_FRAMEBUFFERS) {
-+		dev_warn(&dev->dev,
-+			 "More displays reported from firmware than supported in driver (%u vs %u)",
-+			 num_displays, MAX_FRAMEBUFFERS);
-+		num_displays = MAX_FRAMEBUFFERS;
- 	}
- 
--	fb->fw = fw;
--	bcm2708_fb_debugfs_init(fb);
-+	dev_info(&dev->dev, "FB found %d display(s)\n", num_displays);
-+
-+	/* Set up the DMA information. Note we have just one set of DMA
-+	 * parameters to work with all the FB's so requires synchronising when
-+	 * being used
-+	 */
-+
-+	mutex_init(&fbdev->dma_mutex);
- 
--	fb->cb_base = dma_alloc_wc(&dev->dev, SZ_64K,
--					     &fb->cb_handle, GFP_KERNEL);
--	if (!fb->cb_base) {
-+	fbdev->cb_base = dma_alloc_wc(&dev->dev, SZ_64K,
-+						&fbdev->cb_handle,
-+						GFP_KERNEL);
-+	if (!fbdev->cb_base) {
- 		dev_err(&dev->dev, "cannot allocate DMA CBs\n");
- 		ret = -ENOMEM;
- 		goto free_fb;
- 	}
- 
--	pr_info("BCM2708FB: allocated DMA memory %pad\n", &fb->cb_handle);
--
- 	ret = bcm_dma_chan_alloc(BCM_DMA_FEATURE_BULK,
--				 &fb->dma_chan_base, &fb->dma_irq);
-+				 &fbdev->dma_chan_base,
-+				 &fbdev->dma_irq);
- 	if (ret < 0) {
--		dev_err(&dev->dev, "couldn't allocate a DMA channel\n");
-+		dev_err(&dev->dev, "Couldn't allocate a DMA channel\n");
- 		goto free_cb;
- 	}
--	fb->dma_chan = ret;
-+	fbdev->dma_chan = ret;
- 
--	ret = request_irq(fb->dma_irq, bcm2708_fb_dma_irq,
--			  0, "bcm2708_fb dma", fb);
-+	ret = request_irq(fbdev->dma_irq, bcm2708_fb_dma_irq,
-+			  0, "bcm2708_fb DMA", fbdev);
- 	if (ret) {
--		pr_err("%s: failed to request DMA irq\n", __func__);
-+		dev_err(&dev->dev,
-+			"Failed to request DMA irq\n");
- 		goto free_dma_chan;
- 	}
- 
--	pr_info("BCM2708FB: allocated DMA channel %d\n", fb->dma_chan);
-+	rpi_firmware_property(fbdev->fw,
-+			      RPI_FIRMWARE_GET_VC_MEMORY,
-+			      &gpu_mem, sizeof(gpu_mem));
-+
-+	for (i = 0; i < num_displays; i++) {
-+		struct bcm2708_fb *fb = &fbdev->displays[i];
-+
-+		fb->display_settings.display_num = i;
-+		fb->dev = dev;
-+		fb->fb.device = &dev->dev;
-+		fb->fbdev = fbdev;
-+
-+		fb->gpu.base = gpu_mem.base;
-+		fb->gpu.length = gpu_mem.length;
-+
-+		if (fbdev->firmware_supports_multifb) {
-+			ret = rpi_firmware_property(fw,
-+						    RPI_FIRMWARE_FRAMEBUFFER_GET_DISPLAY_SETTINGS,
-+						    &fb->display_settings,
-+						    GET_DISPLAY_SETTINGS_PAYLOAD_SIZE);
-+		} else {
-+			memset(&fb->display_settings, 0,
-+			       sizeof(fb->display_settings));
-+		}
- 
--	fb->dev = dev;
--	fb->fb.device = &dev->dev;
-+		ret = bcm2708_fb_register(fb);
- 
--	/* failure here isn't fatal, but we'll fail in vc_mem_copy if
--	 * fb->gpu is not valid
--	 */
--	rpi_firmware_property(fb->fw, RPI_FIRMWARE_GET_VC_MEMORY, &fb->gpu,
--			      sizeof(fb->gpu));
-+		if (ret == 0) {
-+			bcm2708_fb_debugfs_init(fb);
- 
--	ret = bcm2708_fb_register(fb);
--	if (ret == 0) {
--		platform_set_drvdata(dev, fb);
--		goto out;
-+			fbdev->num_displays++;
-+
-+			dev_info(&dev->dev,
-+				 "Registered framebuffer for display %u, size %ux%u\n",
-+				 fb->display_settings.display_num,
-+				 fb->fb.var.xres,
-+				 fb->fb.var.yres);
-+		} else {
-+			// Use this to flag if this FB entry is in use.
-+			fb->fbdev = NULL;
-+		}
-+	}
-+
-+	// Did we actually successfully create any FB's?
-+	if (fbdev->num_displays) {
-+		init_waitqueue_head(&fbdev->dma_waitq);
-+		platform_set_drvdata(dev, fbdev);
-+		return ret;
- 	}
- 
- free_dma_chan:
--	bcm_dma_chan_free(fb->dma_chan);
-+	bcm_dma_chan_free(fbdev->dma_chan);
- free_cb:
--	dma_free_wc(&dev->dev, SZ_64K, fb->cb_base, fb->cb_handle);
-+	dma_free_wc(&dev->dev, SZ_64K, fbdev->cb_base,
-+			      fbdev->cb_handle);
- free_fb:
--	kfree(fb);
--free_region:
- 	dev_err(&dev->dev, "probe failed, err %d\n", ret);
--out:
-+
- 	return ret;
- }
- 
- static int bcm2708_fb_remove(struct platform_device *dev)
- {
--	struct bcm2708_fb *fb = platform_get_drvdata(dev);
-+	struct bcm2708_fb_dev *fbdev = platform_get_drvdata(dev);
-+	int i;
- 
- 	platform_set_drvdata(dev, NULL);
- 
--	if (fb->fb.screen_base)
--		iounmap(fb->fb.screen_base);
--	unregister_framebuffer(&fb->fb);
--
--	dma_free_wc(&dev->dev, SZ_64K, fb->cb_base, fb->cb_handle);
--	bcm_dma_chan_free(fb->dma_chan);
--
--	bcm2708_fb_debugfs_deinit(fb);
-+	for (i = 0; i < fbdev->num_displays; i++) {
-+		if (fbdev->displays[i].fb.screen_base)
-+			iounmap(fbdev->displays[i].fb.screen_base);
-+
-+		if (fbdev->displays[i].fbdev) {
-+			unregister_framebuffer(&fbdev->displays[i].fb);
-+			bcm2708_fb_debugfs_deinit(&fbdev->displays[i]);
-+		}
-+	}
- 
--	free_irq(fb->dma_irq, fb);
-+	dma_free_wc(&dev->dev, SZ_64K, fbdev->cb_base,
-+			      fbdev->cb_handle);
-+	bcm_dma_chan_free(fbdev->dma_chan);
-+	free_irq(fbdev->dma_irq, fbdev);
- 
--	kfree(fb);
-+	mutex_destroy(&fbdev->dma_mutex);
- 
- 	return 0;
- }
-@@ -886,10 +1077,10 @@ static struct platform_driver bcm2708_fb
- 	.probe = bcm2708_fb_probe,
- 	.remove = bcm2708_fb_remove,
- 	.driver = {
--		   .name = DRIVER_NAME,
--		   .owner = THIS_MODULE,
--		   .of_match_table = bcm2708_fb_of_match_table,
--		   },
-+		  .name = DRIVER_NAME,
-+		  .owner = THIS_MODULE,
-+		  .of_match_table = bcm2708_fb_of_match_table,
-+		  },
- };
- 
- static int __init bcm2708_fb_init(void)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0109-fbdev-add-FBIOCOPYAREA-ioctl.patch b/target/linux/bcm27xx/patches-6.1/950-0109-fbdev-add-FBIOCOPYAREA-ioctl.patch
deleted file mode 100644
index ddd7c67832..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0109-fbdev-add-FBIOCOPYAREA-ioctl.patch
+++ /dev/null
@@ -1,337 +0,0 @@
-From bfcc88c456185fbb27890c03040aa824e69634b7 Mon Sep 17 00:00:00 2001
-From: Siarhei Siamashka <siarhei.siamashka@gmail.com>
-Date: Mon, 17 Jun 2013 13:32:11 +0300
-Subject: [PATCH] fbdev: add FBIOCOPYAREA ioctl
-
-Based on the patch authored by Ali Gholami Rudi at
-    https://lkml.org/lkml/2009/7/13/153
-
-Provide an ioctl for userspace applications, but only if this operation
-is hardware accelerated (otherwide it does not make any sense).
-
-Signed-off-by: Siarhei Siamashka <siarhei.siamashka@gmail.com>
-
-bcm2708_fb: Add ioctl for reading gpu memory through dma
-
-video: bcm2708_fb: Add compat_ioctl support.
-
-When using a 64 bit kernel with 32 bit userspace we need
-compat ioctl handling for FBIODMACOPY as one of the
-parameters is a pointer.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- drivers/video/fbdev/bcm2708_fb.c | 170 ++++++++++++++++++++++++++++++-
- drivers/video/fbdev/core/fbmem.c |  35 +++++++
- include/uapi/linux/fb.h          |  12 +++
- 3 files changed, 213 insertions(+), 4 deletions(-)
-
---- a/drivers/video/fbdev/bcm2708_fb.c
-+++ b/drivers/video/fbdev/bcm2708_fb.c
-@@ -32,8 +32,10 @@
- #include <linux/printk.h>
- #include <linux/console.h>
- #include <linux/debugfs.h>
-+#include <linux/uaccess.h>
- #include <linux/io.h>
- #include <linux/dma-mapping.h>
-+#include <linux/cred.h>
- #include <soc/bcm2835/raspberrypi-firmware.h>
- #include <linux/mutex.h>
- 
-@@ -184,9 +186,6 @@ static int bcm2708_fb_debugfs_init(struc
- 
- 	fb->debugfs_subdir = debugfs_create_dir(buf, fb->debugfs_dir);
- 
--	debugfs_create_regset32("stats", 0444, fb->debugfs_dir,
--				&fb->stats.regset);
--
- 	if (!fb->debugfs_subdir) {
- 		dev_warn(fb->fb.dev, "%s: could not create debugfs entry %u\n",
- 			 __func__, fb->display_settings.display_num);
-@@ -603,7 +602,110 @@ static int bcm2708_fb_pan_display(struct
- 	return result;
- }
- 
--static int bcm2708_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
-+static void dma_memcpy(struct bcm2708_fb *fb, dma_addr_t dst, dma_addr_t src,
-+		       int size)
-+{
-+	struct bcm2708_fb_dev *fbdev = fb->fbdev;
-+	struct bcm2708_dma_cb *cb = fbdev->cb_base;
-+	int burst_size = (fbdev->dma_chan == 0) ? 8 : 2;
-+
-+	cb->info = BCM2708_DMA_BURST(burst_size) | BCM2708_DMA_S_WIDTH |
-+		   BCM2708_DMA_S_INC | BCM2708_DMA_D_WIDTH |
-+		   BCM2708_DMA_D_INC;
-+	cb->dst = dst;
-+	cb->src = src;
-+	cb->length = size;
-+	cb->stride = 0;
-+	cb->pad[0] = 0;
-+	cb->pad[1] = 0;
-+	cb->next = 0;
-+
-+	// Not sure what to do if this gets a signal whilst waiting
-+	if (mutex_lock_interruptible(&fbdev->dma_mutex))
-+		return;
-+
-+	if (size < dma_busy_wait_threshold) {
-+		bcm_dma_start(fbdev->dma_chan_base, fbdev->cb_handle);
-+		bcm_dma_wait_idle(fbdev->dma_chan_base);
-+	} else {
-+		void __iomem *local_dma_chan = fbdev->dma_chan_base;
-+
-+		cb->info |= BCM2708_DMA_INT_EN;
-+		bcm_dma_start(fbdev->dma_chan_base, fbdev->cb_handle);
-+		while (bcm_dma_is_busy(local_dma_chan)) {
-+			wait_event_interruptible(fbdev->dma_waitq,
-+						 !bcm_dma_is_busy(local_dma_chan));
-+		}
-+		fbdev->dma_stats.dma_irqs++;
-+	}
-+	fbdev->dma_stats.dma_copies++;
-+
-+	mutex_unlock(&fbdev->dma_mutex);
-+}
-+
-+/* address with no aliases */
-+#define INTALIAS_NORMAL(x) ((x) & ~0xc0000000)
-+/* cache coherent but non-allocating in L1 and L2 */
-+#define INTALIAS_L1L2_NONALLOCATING(x) (((x) & ~0xc0000000) | 0x80000000)
-+
-+static long vc_mem_copy(struct bcm2708_fb *fb, struct fb_dmacopy *ioparam)
-+{
-+	size_t size = PAGE_SIZE;
-+	u32 *buf = NULL;
-+	dma_addr_t bus_addr;
-+	long rc = 0;
-+	size_t offset;
-+
-+	/* restrict this to root user */
-+	if (!uid_eq(current_euid(), GLOBAL_ROOT_UID)) {
-+		rc = -EFAULT;
-+		goto out;
-+	}
-+
-+	if (!fb->gpu.base || !fb->gpu.length) {
-+		pr_err("[%s]: Unable to determine gpu memory (%x,%x)\n",
-+		       __func__, fb->gpu.base, fb->gpu.length);
-+		return -EFAULT;
-+	}
-+
-+	if (INTALIAS_NORMAL(ioparam->src) < fb->gpu.base ||
-+	    INTALIAS_NORMAL(ioparam->src) >= fb->gpu.base + fb->gpu.length) {
-+		pr_err("[%s]: Invalid memory access %x (%x-%x)", __func__,
-+		       INTALIAS_NORMAL(ioparam->src), fb->gpu.base,
-+		       fb->gpu.base + fb->gpu.length);
-+		return -EFAULT;
-+	}
-+
-+	buf = dma_alloc_coherent(fb->fb.device, PAGE_ALIGN(size), &bus_addr,
-+				 GFP_ATOMIC);
-+	if (!buf) {
-+		pr_err("[%s]: failed to dma_alloc_coherent(%zd)\n", __func__,
-+		       size);
-+		rc = -ENOMEM;
-+		goto out;
-+	}
-+
-+	for (offset = 0; offset < ioparam->length; offset += size) {
-+		size_t remaining = ioparam->length - offset;
-+		size_t s = min(size, remaining);
-+		u8 *p = (u8 *)((uintptr_t)ioparam->src + offset);
-+		u8 *q = (u8 *)ioparam->dst + offset;
-+
-+		dma_memcpy(fb, bus_addr,
-+			   INTALIAS_L1L2_NONALLOCATING((dma_addr_t)p), size);
-+		if (copy_to_user(q, buf, s) != 0) {
-+			pr_err("[%s]: failed to copy-to-user\n", __func__);
-+			rc = -EFAULT;
-+			goto out;
-+		}
-+	}
-+out:
-+	if (buf)
-+		dma_free_coherent(fb->fb.device, PAGE_ALIGN(size), buf,
-+				  bus_addr);
-+	return rc;
-+}
-+
- static int bcm2708_ioctl(struct fb_info *info, unsigned int cmd,
- 			 unsigned long arg)
- {
-@@ -619,6 +721,21 @@ static int bcm2708_ioctl(struct fb_info
- 					    RPI_FIRMWARE_FRAMEBUFFER_SET_VSYNC,
- 					    &dummy, sizeof(dummy));
- 		break;
-+
-+	case FBIODMACOPY:
-+	{
-+		struct fb_dmacopy ioparam;
-+		/* Get the parameter data.
-+		 */
-+		if (copy_from_user
-+		    (&ioparam, (void *)arg, sizeof(ioparam))) {
-+			pr_err("[%s]: failed to copy-from-user\n", __func__);
-+			ret = -EFAULT;
-+			break;
-+		}
-+		ret = vc_mem_copy(fb, &ioparam);
-+		break;
-+	}
- 	default:
- 		dev_dbg(info->device, "Unknown ioctl 0x%x\n", cmd);
- 		return -ENOTTY;
-@@ -629,6 +746,48 @@ static int bcm2708_ioctl(struct fb_info
- 
- 	return ret;
- }
-+
-+#ifdef CONFIG_COMPAT
-+struct fb_dmacopy32 {
-+	compat_uptr_t dst;
-+	__u32 src;
-+	__u32 length;
-+};
-+
-+#define FBIODMACOPY32		_IOW('z', 0x22, struct fb_dmacopy32)
-+
-+static int bcm2708_compat_ioctl(struct fb_info *info, unsigned int cmd,
-+				unsigned long arg)
-+{
-+	struct bcm2708_fb *fb = to_bcm2708(info);
-+	int ret;
-+
-+	switch (cmd) {
-+	case FBIODMACOPY32:
-+	{
-+		struct fb_dmacopy32 param32;
-+		struct fb_dmacopy param;
-+		/* Get the parameter data.
-+		 */
-+		if (copy_from_user(&param32, (void *)arg, sizeof(param32))) {
-+			pr_err("[%s]: failed to copy-from-user\n", __func__);
-+			ret = -EFAULT;
-+			break;
-+		}
-+		param.dst = compat_ptr(param32.dst);
-+		param.src = param32.src;
-+		param.length = param32.length;
-+		ret = vc_mem_copy(fb, &param);
-+		break;
-+	}
-+	default:
-+		ret = bcm2708_ioctl(info, cmd, arg);
-+		break;
-+	}
-+	return ret;
-+}
-+#endif
-+
- static void bcm2708_fb_fillrect(struct fb_info *info,
- 				const struct fb_fillrect *rect)
- {
-@@ -821,6 +980,9 @@ static struct fb_ops bcm2708_fb_ops = {
- 	.fb_imageblit = bcm2708_fb_imageblit,
- 	.fb_pan_display = bcm2708_fb_pan_display,
- 	.fb_ioctl = bcm2708_ioctl,
-+#ifdef CONFIG_COMPAT
-+	.fb_compat_ioctl = bcm2708_compat_ioctl,
-+#endif
- };
- 
- static int bcm2708_fb_register(struct bcm2708_fb *fb)
---- a/drivers/video/fbdev/core/fbmem.c
-+++ b/drivers/video/fbdev/core/fbmem.c
-@@ -1094,6 +1094,30 @@ fb_blank(struct fb_info *info, int blank
- }
- EXPORT_SYMBOL(fb_blank);
- 
-+static int fb_copyarea_user(struct fb_info *info,
-+			    struct fb_copyarea *copy)
-+{
-+	int ret = 0;
-+	lock_fb_info(info);
-+	if (copy->dx >= info->var.xres ||
-+	    copy->sx >= info->var.xres ||
-+	    copy->width > info->var.xres ||
-+	    copy->dy >= info->var.yres ||
-+	    copy->sy >= info->var.yres ||
-+	    copy->height > info->var.yres ||
-+	    copy->dx + copy->width > info->var.xres ||
-+	    copy->sx + copy->width > info->var.xres ||
-+	    copy->dy + copy->height > info->var.yres ||
-+	    copy->sy + copy->height > info->var.yres) {
-+		ret = -EINVAL;
-+		goto out;
-+	}
-+	info->fbops->fb_copyarea(info, copy);
-+out:
-+	unlock_fb_info(info);
-+	return ret;
-+}
-+
- static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
- 			unsigned long arg)
- {
-@@ -1102,6 +1126,7 @@ static long do_fb_ioctl(struct fb_info *
- 	struct fb_fix_screeninfo fix;
- 	struct fb_cmap cmap_from;
- 	struct fb_cmap_user cmap;
-+	struct fb_copyarea copy;
- 	void __user *argp = (void __user *)arg;
- 	long ret = 0;
- 
-@@ -1183,6 +1208,15 @@ static long do_fb_ioctl(struct fb_info *
- 		unlock_fb_info(info);
- 		console_unlock();
- 		break;
-+	case FBIOCOPYAREA:
-+		if (info->flags & FBINFO_HWACCEL_COPYAREA) {
-+			/* only provide this ioctl if it is accelerated */
-+			if (copy_from_user(&copy, argp, sizeof(copy)))
-+				return -EFAULT;
-+			ret = fb_copyarea_user(info, &copy);
-+			break;
-+		}
-+		fallthrough;
- 	default:
- 		lock_fb_info(info);
- 		fb = info->fbops;
-@@ -1322,6 +1356,7 @@ static long fb_compat_ioctl(struct file
- 	case FBIOPAN_DISPLAY:
- 	case FBIOGET_CON2FBMAP:
- 	case FBIOPUT_CON2FBMAP:
-+	case FBIOCOPYAREA:
- 		arg = (unsigned long) compat_ptr(arg);
- 		fallthrough;
- 	case FBIOBLANK:
---- a/include/uapi/linux/fb.h
-+++ b/include/uapi/linux/fb.h
-@@ -35,6 +35,12 @@
- #define FBIOPUT_MODEINFO        0x4617
- #define FBIOGET_DISPINFO        0x4618
- #define FBIO_WAITFORVSYNC	_IOW('F', 0x20, __u32)
-+/*
-+ * HACK: use 'z' in order not to clash with any other ioctl numbers which might
-+ * be concurrently added to the mainline kernel
-+ */
-+#define FBIOCOPYAREA		_IOW('z', 0x21, struct fb_copyarea)
-+#define FBIODMACOPY 		_IOW('z', 0x22, struct fb_dmacopy)
- 
- #define FB_TYPE_PACKED_PIXELS		0	/* Packed Pixels	*/
- #define FB_TYPE_PLANES			1	/* Non interleaved planes */
-@@ -348,6 +354,12 @@ struct fb_copyarea {
- 	__u32 sy;
- };
- 
-+struct fb_dmacopy {
-+	void *dst;
-+	__u32 src;
-+	__u32 length;
-+};
-+
- struct fb_fillrect {
- 	__u32 dx;	/* screen-relative */
- 	__u32 dy;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0110-dmaengine-Add-support-for-BCM2708.patch b/target/linux/bcm27xx/patches-6.1/950-0110-dmaengine-Add-support-for-BCM2708.patch
deleted file mode 100644
index 0400fbfe7f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0110-dmaengine-Add-support-for-BCM2708.patch
+++ /dev/null
@@ -1,652 +0,0 @@
-From 52f0d07b546d1fd84aace07d69f8cf751ce8a3ab Mon Sep 17 00:00:00 2001
-From: Florian Meier <florian.meier@koalo.de>
-Date: Fri, 22 Nov 2013 14:22:53 +0100
-Subject: [PATCH] dmaengine: Add support for BCM2708
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Add support for DMA controller of BCM2708 as used in the Raspberry Pi.
-Currently it only supports cyclic DMA.
-
-Signed-off-by: Florian Meier <florian.meier@koalo.de>
-
-dmaengine: expand functionality by supporting scatter/gather transfers sdhci-bcm2708 and dma.c: fix for LITE channels
-
-DMA: fix cyclic LITE length overflow bug
-
-dmaengine: bcm2708: Remove chancnt affectations
-
-Mirror bcm2835-dma.c commit 9eba5536a7434c69d8c185d4bd1c70734d92287d:
-chancnt is already filled by dma_async_device_register, which uses the channel
-list to know how much channels there is.
-
-Since it's already filled, we can safely remove it from the drivers' probe
-function.
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-
-dmaengine: bcm2708: overwrite dreq only if it is not set
-
-dreq is set when the DMA channel is fetched from Device Tree.
-slave_id is set using dmaengine_slave_config().
-Only overwrite dreq with slave_id if it is not set.
-
-dreq/slave_id in the cyclic DMA case is not touched, because I don't
-have hardware to test with.
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-
-dmaengine: bcm2708: do device registration in the board file
-
-Don't register the device in the driver. Do it in the board file.
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-
-dmaengine: bcm2708: don't restrict DT support to ARCH_BCM2835
-
-Both ARCH_BCM2835 and ARCH_BCM270x are built with OF now.
-Add Device Tree support to the non ARCH_BCM2835 case.
-Use the same driver name regardless of architecture.
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-
-BCM270x_DT: add bcm2835-dma entry
-
-Add Device Tree entry for bcm2835-dma.
-The entry doesn't contain any resources since they are handled
-by the arch/arm/mach-bcm270x/dma.c driver.
-In non-DT mode, don't add the device in the board file.
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-
-bcm2708-dmaengine: Add debug options
-
-BCM270x: Add memory and irq resources to dmaengine device and DT
-
-Prepare for merging of the legacy DMA API arch driver dma.c
-with bcm2708-dmaengine by adding memory and irq resources both
-to platform file device and Device Tree node.
-Don't use BCM_DMAMAN_DRIVER_NAME so we don't have to include mach/dma.h
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-
-dmaengine: bcm2708: Merge with arch dma.c driver and disable dma.c
-
-Merge the legacy DMA API driver with bcm2708-dmaengine.
-This is done so we can use bcm2708_fb on ARCH_BCM2835 (mailbox
-driver is also needed).
-
-Changes to the dma.c code:
-- Use BIT() macro.
-- Cutdown some comments to one line.
-- Add mutex to vc_dmaman and use this, since the dev lock is locked
-  during probing of the engine part.
-- Add global g_dmaman variable since drvdata is used by the engine part.
-- Restructure for readability:
-  vc_dmaman_chan_alloc()
-  vc_dmaman_chan_free()
-  bcm_dma_chan_free()
-- Restructure bcm_dma_chan_alloc() to simplify error handling.
-- Use device irq resources instead of hardcoded bcm_dma_irqs table.
-- Remove dev_dmaman_register() and code it directly.
-- Remove dev_dmaman_deregister() and code it directly.
-- Simplify bcm_dmaman_probe() using devm_* functions.
-- Get dmachans from DT if available.
-- Keep 'dma.dmachans' module argument name for backwards compatibility.
-
-Make it available on ARCH_BCM2835 as well.
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-
-dmaengine: bcm2708: set residue_granularity field
-
-bcm2708-dmaengine supports residue reporting at burst level
-but didn't report this via the residue_granularity field.
-
-Without this field set properly we get playback issues with I2S cards.
-
-dmaengine: bcm2708-dmaengine: Fix memory leak when stopping a running transfer
-
-bcm2708-dmaengine: Use more DMA channels (but not 12)
-
-1) Only the bcm2708_fb drivers uses the legacy DMA API, and
-it requires a BULK-capable channel, so all other types
-(FAST, NORMAL and LITE) can be made available to the regular
-DMA API.
-
-2) DMA channels 11-14 share an interrupt. The driver can't
-handle this, so don't use channels 12-14 (12 was used, probably
-because it appears to have an interrupt, but in reality that
-interrupt is for activity on ANY channel). This may explain
-a lockup encountered when running out of DMA channels.
-
-The combined effect of this patch is to leave 7 DMA channels
-available + channel 0 for bcm2708_fb via the legacy API.
-
-See: https://github.com/raspberrypi/linux/issues/1110
-     https://github.com/raspberrypi/linux/issues/1108
-
-dmaengine: bcm2708: Make legacy API available for bcm2835-dma
-
-bcm2708_fb uses the legacy DMA API, so in order to start using
-bcm2835-dma, bcm2835-dma has to support the legacy API. Make this
-possible by exporting bcm_dmaman_probe() and bcm_dmaman_remove().
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-
-dmaengine: bcm2708: Change DT compatible string
-
-Both bcm2835-dma and bcm2708-dmaengine have the same compatible string.
-So change compatible to "brcm,bcm2708-dma".
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-
-dmaengine: bcm2708: Remove driver but keep legacy API
-
-Dropping non-DT support means we don't need this driver,
-but we still need the legacy DMA API.
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-
-bcm2708-dmaengine - Fix arm64 portability/build issues
-
-dma-bcm2708: Fix module compilation of CONFIG_DMA_BCM2708
-
-bcm2708-dmaengine.c defines functions like bcm_dma_start which are
-defined as well in dma-bcm2708.h as inline versions when
-CONFIG_DMA_BCM2708 is not defined. This works fine when
-CONFIG_DMA_BCM2708 is built in, but when it is selected as module build
-fails with redefinition errors because in the build system when
-CONFIG_DMA_BCM2708 is selected as module, the macro becomes
-CONFIG_DMA_BCM2708_MODULE.
-
-This patch makes the header use CONFIG_DMA_BCM2708_MODULE too when
-available.
-
-Fixes https://github.com/raspberrypi/linux/issues/2056
-
-Signed-off-by: Andrei Gherzan <andrei@gherzan.com>
-
-bcm2708-dmaengine: Use platform_get_irq
-
-The platform driver framework no longer creates IRQ resources for
-platform devices because they are expected to use platform_get_irq.
-This causes the bcm2808_fb acceleration to fail.
-
-Fix the problem by calling platform_get_irq as intended.
-
-See: https://github.com/raspberrypi/linux/issues/5131
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/dma/Kconfig                       |   6 +-
- drivers/dma/Makefile                      |   1 +
- drivers/dma/bcm2708-dmaengine.c           | 281 ++++++++++++++++++++++
- include/linux/platform_data/dma-bcm2708.h | 143 +++++++++++
- 4 files changed, 430 insertions(+), 1 deletion(-)
- create mode 100644 drivers/dma/bcm2708-dmaengine.c
- create mode 100644 include/linux/platform_data/dma-bcm2708.h
-
---- a/drivers/dma/Kconfig
-+++ b/drivers/dma/Kconfig
-@@ -135,7 +135,7 @@ config BCM_SBA_RAID
- 
- config DMA_BCM2835
- 	tristate "BCM2835 DMA engine support"
--	depends on ARCH_BCM2835 || ARCH_BCM2708 || ARCH_BCM2709
-+	depends on ARCH_BCM2835
- 	select DMA_ENGINE
- 	select DMA_VIRTUAL_CHANNELS
- 
-@@ -705,6 +705,10 @@ config UNIPHIER_XDMAC
- 	  UniPhier platform. This DMA controller can transfer data from
- 	  memory to memory, memory to peripheral and peripheral to memory.
- 
-+config DMA_BCM2708
-+	tristate "BCM2708 DMA legacy API support"
-+	depends on DMA_BCM2835
-+
- config XGENE_DMA
- 	tristate "APM X-Gene DMA support"
- 	depends on ARCH_XGENE || COMPILE_TEST
---- a/drivers/dma/Makefile
-+++ b/drivers/dma/Makefile
-@@ -22,6 +22,7 @@ obj-$(CONFIG_AT_HDMAC) += at_hdmac.o
- obj-$(CONFIG_AT_XDMAC) += at_xdmac.o
- obj-$(CONFIG_AXI_DMAC) += dma-axi-dmac.o
- obj-$(CONFIG_BCM_SBA_RAID) += bcm-sba-raid.o
-+obj-$(CONFIG_DMA_BCM2708) += bcm2708-dmaengine.o
- obj-$(CONFIG_DMA_BCM2835) += bcm2835-dma.o
- obj-$(CONFIG_DMA_JZ4780) += dma-jz4780.o
- obj-$(CONFIG_DMA_SA11X0) += sa11x0-dma.o
---- /dev/null
-+++ b/drivers/dma/bcm2708-dmaengine.c
-@@ -0,0 +1,281 @@
-+/*
-+ * BCM2708 legacy DMA API
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ */
-+
-+#include <linux/init.h>
-+#include <linux/interrupt.h>
-+#include <linux/list.h>
-+#include <linux/module.h>
-+#include <linux/platform_data/dma-bcm2708.h>
-+#include <linux/platform_device.h>
-+#include <linux/slab.h>
-+#include <linux/io.h>
-+#include <linux/spinlock.h>
-+
-+#include "virt-dma.h"
-+
-+#define CACHE_LINE_MASK 31
-+#define DEFAULT_DMACHAN_BITMAP 0x10  /* channel 4 only */
-+
-+/* valid only for channels 0 - 14, 15 has its own base address */
-+#define BCM2708_DMA_CHAN(n)	((n) << 8) /* base address */
-+#define BCM2708_DMA_CHANIO(dma_base, n) \
-+	((void __iomem *)((char *)(dma_base) + BCM2708_DMA_CHAN(n)))
-+
-+struct vc_dmaman {
-+	void __iomem *dma_base;
-+	u32 chan_available; /* bitmap of available channels */
-+	u32 has_feature[BCM_DMA_FEATURE_COUNT]; /* bitmap of feature presence */
-+	struct mutex lock;
-+};
-+
-+static struct device *dmaman_dev;	/* we assume there's only one! */
-+static struct vc_dmaman *g_dmaman;	/* DMA manager */
-+
-+/* DMA Auxiliary Functions */
-+
-+/* A DMA buffer on an arbitrary boundary may separate a cache line into a
-+   section inside the DMA buffer and another section outside it.
-+   Even if we flush DMA buffers from the cache there is always the chance that
-+   during a DMA someone will access the part of a cache line that is outside
-+   the DMA buffer - which will then bring in unwelcome data.
-+   Without being able to dictate our own buffer pools we must insist that
-+   DMA buffers consist of a whole number of cache lines.
-+*/
-+extern int bcm_sg_suitable_for_dma(struct scatterlist *sg_ptr, int sg_len)
-+{
-+	int i;
-+
-+	for (i = 0; i < sg_len; i++) {
-+		if (sg_ptr[i].offset & CACHE_LINE_MASK ||
-+		    sg_ptr[i].length & CACHE_LINE_MASK)
-+			return 0;
-+	}
-+
-+	return 1;
-+}
-+EXPORT_SYMBOL_GPL(bcm_sg_suitable_for_dma);
-+
-+extern void bcm_dma_start(void __iomem *dma_chan_base,
-+			  dma_addr_t control_block)
-+{
-+	dsb(sy);	/* ARM data synchronization (push) operation */
-+
-+	writel(control_block, dma_chan_base + BCM2708_DMA_ADDR);
-+	writel(BCM2708_DMA_ACTIVE, dma_chan_base + BCM2708_DMA_CS);
-+}
-+EXPORT_SYMBOL_GPL(bcm_dma_start);
-+
-+extern void bcm_dma_wait_idle(void __iomem *dma_chan_base)
-+{
-+	dsb(sy);
-+
-+	/* ugly busy wait only option for now */
-+	while (readl(dma_chan_base + BCM2708_DMA_CS) & BCM2708_DMA_ACTIVE)
-+		cpu_relax();
-+}
-+EXPORT_SYMBOL_GPL(bcm_dma_wait_idle);
-+
-+extern bool bcm_dma_is_busy(void __iomem *dma_chan_base)
-+{
-+	dsb(sy);
-+
-+	return readl(dma_chan_base + BCM2708_DMA_CS) & BCM2708_DMA_ACTIVE;
-+}
-+EXPORT_SYMBOL_GPL(bcm_dma_is_busy);
-+
-+/* Complete an ongoing DMA (assuming its results are to be ignored)
-+   Does nothing if there is no DMA in progress.
-+   This routine waits for the current AXI transfer to complete before
-+   terminating the current DMA. If the current transfer is hung on a DREQ used
-+   by an uncooperative peripheral the AXI transfer may never complete.	In this
-+   case the routine times out and return a non-zero error code.
-+   Use of this routine doesn't guarantee that the ongoing or aborted DMA
-+   does not produce an interrupt.
-+*/
-+extern int bcm_dma_abort(void __iomem *dma_chan_base)
-+{
-+	unsigned long int cs;
-+	int rc = 0;
-+
-+	cs = readl(dma_chan_base + BCM2708_DMA_CS);
-+
-+	if (BCM2708_DMA_ACTIVE & cs) {
-+		long int timeout = 10000;
-+
-+		/* write 0 to the active bit - pause the DMA */
-+		writel(0, dma_chan_base + BCM2708_DMA_CS);
-+
-+		/* wait for any current AXI transfer to complete */
-+		while (0 != (cs & BCM2708_DMA_ISPAUSED) && --timeout >= 0)
-+			cs = readl(dma_chan_base + BCM2708_DMA_CS);
-+
-+		if (0 != (cs & BCM2708_DMA_ISPAUSED)) {
-+			/* we'll un-pause when we set of our next DMA */
-+			rc = -ETIMEDOUT;
-+
-+		} else if (BCM2708_DMA_ACTIVE & cs) {
-+			/* terminate the control block chain */
-+			writel(0, dma_chan_base + BCM2708_DMA_NEXTCB);
-+
-+			/* abort the whole DMA */
-+			writel(BCM2708_DMA_ABORT | BCM2708_DMA_ACTIVE,
-+			       dma_chan_base + BCM2708_DMA_CS);
-+		}
-+	}
-+
-+	return rc;
-+}
-+EXPORT_SYMBOL_GPL(bcm_dma_abort);
-+
-+ /* DMA Manager Device Methods */
-+
-+static void vc_dmaman_init(struct vc_dmaman *dmaman, void __iomem *dma_base,
-+			   u32 chans_available)
-+{
-+	dmaman->dma_base = dma_base;
-+	dmaman->chan_available = chans_available;
-+	dmaman->has_feature[BCM_DMA_FEATURE_FAST_ORD] = 0x0c;  /* 2 & 3 */
-+	dmaman->has_feature[BCM_DMA_FEATURE_BULK_ORD] = 0x01;  /* 0 */
-+	dmaman->has_feature[BCM_DMA_FEATURE_NORMAL_ORD] = 0xfe;  /* 1 to 7 */
-+	dmaman->has_feature[BCM_DMA_FEATURE_LITE_ORD] = 0x7f00;  /* 8 to 14 */
-+}
-+
-+static int vc_dmaman_chan_alloc(struct vc_dmaman *dmaman,
-+				unsigned required_feature_set)
-+{
-+	u32 chans;
-+	int chan = 0;
-+	int feature;
-+
-+	chans = dmaman->chan_available;
-+	for (feature = 0; feature < BCM_DMA_FEATURE_COUNT; feature++)
-+		/* select the subset of available channels with the desired
-+		   features */
-+		if (required_feature_set & (1 << feature))
-+			chans &= dmaman->has_feature[feature];
-+
-+	if (!chans)
-+		return -ENOENT;
-+
-+	/* return the ordinal of the first channel in the bitmap */
-+	while (chans != 0 && (chans & 1) == 0) {
-+		chans >>= 1;
-+		chan++;
-+	}
-+	/* claim the channel */
-+	dmaman->chan_available &= ~(1 << chan);
-+
-+	return chan;
-+}
-+
-+static int vc_dmaman_chan_free(struct vc_dmaman *dmaman, int chan)
-+{
-+	if (chan < 0)
-+		return -EINVAL;
-+
-+	if ((1 << chan) & dmaman->chan_available)
-+		return -EIDRM;
-+
-+	dmaman->chan_available |= (1 << chan);
-+
-+	return 0;
-+}
-+
-+/* DMA Manager Monitor */
-+
-+extern int bcm_dma_chan_alloc(unsigned required_feature_set,
-+			      void __iomem **out_dma_base, int *out_dma_irq)
-+{
-+	struct vc_dmaman *dmaman = g_dmaman;
-+	struct platform_device *pdev = to_platform_device(dmaman_dev);
-+	int chan;
-+	int irq;
-+
-+	if (!dmaman_dev)
-+		return -ENODEV;
-+
-+	mutex_lock(&dmaman->lock);
-+	chan = vc_dmaman_chan_alloc(dmaman, required_feature_set);
-+	if (chan < 0)
-+		goto out;
-+
-+	irq = platform_get_irq(pdev, (unsigned int)chan);
-+	if (irq < 0) {
-+		dev_err(dmaman_dev, "failed to get irq for DMA channel %d\n",
-+			chan);
-+		vc_dmaman_chan_free(dmaman, chan);
-+		chan = -ENOENT;
-+		goto out;
-+	}
-+
-+	*out_dma_base = BCM2708_DMA_CHANIO(dmaman->dma_base, chan);
-+	*out_dma_irq = irq;
-+	dev_dbg(dmaman_dev,
-+		"Legacy API allocated channel=%d, base=%p, irq=%i\n",
-+		chan, *out_dma_base, *out_dma_irq);
-+
-+out:
-+	mutex_unlock(&dmaman->lock);
-+
-+	return chan;
-+}
-+EXPORT_SYMBOL_GPL(bcm_dma_chan_alloc);
-+
-+extern int bcm_dma_chan_free(int channel)
-+{
-+	struct vc_dmaman *dmaman = g_dmaman;
-+	int rc;
-+
-+	if (!dmaman_dev)
-+		return -ENODEV;
-+
-+	mutex_lock(&dmaman->lock);
-+	rc = vc_dmaman_chan_free(dmaman, channel);
-+	mutex_unlock(&dmaman->lock);
-+
-+	return rc;
-+}
-+EXPORT_SYMBOL_GPL(bcm_dma_chan_free);
-+
-+int bcm_dmaman_probe(struct platform_device *pdev, void __iomem *base,
-+		     u32 chans_available)
-+{
-+	struct device *dev = &pdev->dev;
-+	struct vc_dmaman *dmaman;
-+
-+	dmaman = devm_kzalloc(dev, sizeof(*dmaman), GFP_KERNEL);
-+	if (!dmaman)
-+		return -ENOMEM;
-+
-+	mutex_init(&dmaman->lock);
-+	vc_dmaman_init(dmaman, base, chans_available);
-+	g_dmaman = dmaman;
-+	dmaman_dev = dev;
-+
-+	dev_info(dev, "DMA legacy API manager, dmachans=0x%x\n",
-+		 chans_available);
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL(bcm_dmaman_probe);
-+
-+int bcm_dmaman_remove(struct platform_device *pdev)
-+{
-+	dmaman_dev = NULL;
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL(bcm_dmaman_remove);
-+
-+MODULE_LICENSE("GPL");
---- /dev/null
-+++ b/include/linux/platform_data/dma-bcm2708.h
-@@ -0,0 +1,143 @@
-+/*
-+ *  Copyright (C) 2010 Broadcom
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#ifndef _PLAT_BCM2708_DMA_H
-+#define _PLAT_BCM2708_DMA_H
-+
-+/* DMA CS Control and Status bits */
-+#define BCM2708_DMA_ACTIVE	BIT(0)
-+#define BCM2708_DMA_INT		BIT(2)
-+#define BCM2708_DMA_ISPAUSED	BIT(4)  /* Pause requested or not active */
-+#define BCM2708_DMA_ISHELD	BIT(5)  /* Is held by DREQ flow control */
-+#define BCM2708_DMA_ERR		BIT(8)
-+#define BCM2708_DMA_ABORT	BIT(30) /* stop current CB, go to next, WO */
-+#define BCM2708_DMA_RESET	BIT(31) /* WO, self clearing */
-+
-+/* DMA control block "info" field bits */
-+#define BCM2708_DMA_INT_EN	BIT(0)
-+#define BCM2708_DMA_TDMODE	BIT(1)
-+#define BCM2708_DMA_WAIT_RESP	BIT(3)
-+#define BCM2708_DMA_D_INC	BIT(4)
-+#define BCM2708_DMA_D_WIDTH	BIT(5)
-+#define BCM2708_DMA_D_DREQ	BIT(6)
-+#define BCM2708_DMA_S_INC	BIT(8)
-+#define BCM2708_DMA_S_WIDTH	BIT(9)
-+#define BCM2708_DMA_S_DREQ	BIT(10)
-+
-+#define	BCM2708_DMA_BURST(x)	(((x) & 0xf) << 12)
-+#define	BCM2708_DMA_PER_MAP(x)	((x) << 16)
-+#define	BCM2708_DMA_WAITS(x)	(((x) & 0x1f) << 21)
-+
-+#define BCM2708_DMA_DREQ_EMMC	11
-+#define BCM2708_DMA_DREQ_SDHOST	13
-+
-+#define BCM2708_DMA_CS		0x00 /* Control and Status */
-+#define BCM2708_DMA_ADDR	0x04
-+/* the current control block appears in the following registers - read only */
-+#define BCM2708_DMA_INFO	0x08
-+#define BCM2708_DMA_SOURCE_AD	0x0c
-+#define BCM2708_DMA_DEST_AD	0x10
-+#define BCM2708_DMA_NEXTCB	0x1C
-+#define BCM2708_DMA_DEBUG	0x20
-+
-+#define BCM2708_DMA4_CS		(BCM2708_DMA_CHAN(4) + BCM2708_DMA_CS)
-+#define BCM2708_DMA4_ADDR	(BCM2708_DMA_CHAN(4) + BCM2708_DMA_ADDR)
-+
-+#define BCM2708_DMA_TDMODE_LEN(w, h) ((h) << 16 | (w))
-+
-+/* When listing features we can ask for when allocating DMA channels give
-+   those with higher priority smaller ordinal numbers */
-+#define BCM_DMA_FEATURE_FAST_ORD	0
-+#define BCM_DMA_FEATURE_BULK_ORD	1
-+#define BCM_DMA_FEATURE_NORMAL_ORD	2
-+#define BCM_DMA_FEATURE_LITE_ORD	3
-+#define BCM_DMA_FEATURE_FAST		BIT(BCM_DMA_FEATURE_FAST_ORD)
-+#define BCM_DMA_FEATURE_BULK		BIT(BCM_DMA_FEATURE_BULK_ORD)
-+#define BCM_DMA_FEATURE_NORMAL		BIT(BCM_DMA_FEATURE_NORMAL_ORD)
-+#define BCM_DMA_FEATURE_LITE		BIT(BCM_DMA_FEATURE_LITE_ORD)
-+#define BCM_DMA_FEATURE_COUNT		4
-+
-+struct bcm2708_dma_cb {
-+	u32 info;
-+	u32 src;
-+	u32 dst;
-+	u32 length;
-+	u32 stride;
-+	u32 next;
-+	u32 pad[2];
-+};
-+
-+struct scatterlist;
-+struct platform_device;
-+
-+#if defined(CONFIG_DMA_BCM2708) || defined(CONFIG_DMA_BCM2708_MODULE)
-+
-+int bcm_sg_suitable_for_dma(struct scatterlist *sg_ptr, int sg_len);
-+void bcm_dma_start(void __iomem *dma_chan_base, dma_addr_t control_block);
-+void bcm_dma_wait_idle(void __iomem *dma_chan_base);
-+bool bcm_dma_is_busy(void __iomem *dma_chan_base);
-+int bcm_dma_abort(void __iomem *dma_chan_base);
-+
-+/* return channel no or -ve error */
-+int bcm_dma_chan_alloc(unsigned preferred_feature_set,
-+		       void __iomem **out_dma_base, int *out_dma_irq);
-+int bcm_dma_chan_free(int channel);
-+
-+int bcm_dmaman_probe(struct platform_device *pdev, void __iomem *base,
-+		     u32 chans_available);
-+int bcm_dmaman_remove(struct platform_device *pdev);
-+
-+#else /* CONFIG_DMA_BCM2708 */
-+
-+static inline int bcm_sg_suitable_for_dma(struct scatterlist *sg_ptr,
-+					  int sg_len)
-+{
-+	return 0;
-+}
-+
-+static inline void bcm_dma_start(void __iomem *dma_chan_base,
-+				 dma_addr_t control_block) { }
-+
-+static inline void bcm_dma_wait_idle(void __iomem *dma_chan_base) { }
-+
-+static inline bool bcm_dma_is_busy(void __iomem *dma_chan_base)
-+{
-+	return false;
-+}
-+
-+static inline int bcm_dma_abort(void __iomem *dma_chan_base)
-+{
-+	return -EINVAL;
-+}
-+
-+static inline int bcm_dma_chan_alloc(unsigned preferred_feature_set,
-+				     void __iomem **out_dma_base,
-+				     int *out_dma_irq)
-+{
-+	return -EINVAL;
-+}
-+
-+static inline int bcm_dma_chan_free(int channel)
-+{
-+	return -EINVAL;
-+}
-+
-+static inline int bcm_dmaman_probe(struct platform_device *pdev,
-+				   void __iomem *base, u32 chans_available)
-+{
-+	return 0;
-+}
-+
-+static inline int bcm_dmaman_remove(struct platform_device *pdev)
-+{
-+	return 0;
-+}
-+
-+#endif /* CONFIG_DMA_BCM2708 || CONFIG_DMA_BCM2708_MODULE */
-+
-+#endif /* _PLAT_BCM2708_DMA_H */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0111-MMC-added-alternative-MMC-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0111-MMC-added-alternative-MMC-driver.patch
deleted file mode 100644
index 6ca3493e4c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0111-MMC-added-alternative-MMC-driver.patch
+++ /dev/null
@@ -1,2018 +0,0 @@
-From c9b2c57e7fbfbebf73f96e58fb783bba83c50bd9 Mon Sep 17 00:00:00 2001
-From: gellert <gellert@raspberrypi.org>
-Date: Fri, 15 Aug 2014 16:35:06 +0100
-Subject: [PATCH] MMC: added alternative MMC driver
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-mmc: Disable CMD23 transfers on all cards
-
-Pending wire-level investigation of these types of transfers
-and associated errors on bcm2835-mmc, disable for now. Fallback of
-CMD18/CMD25 transfers will be used automatically by the MMC layer.
-
-Reported/Tested-by: Gellert Weisz <gellert@raspberrypi.org>
-
-mmc: bcm2835-mmc: enable DT support for all architectures
-
-Both ARCH_BCM2835 and ARCH_BCM270x are built with OF now.
-Enable Device Tree support for all architectures.
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-
-mmc: bcm2835-mmc: fix probe error handling
-
-Probe error handling is broken in several places.
-Simplify error handling by using device managed functions.
-Replace pr_{err,info} with dev_{err,info}.
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-
-bcm2835-mmc: Add locks when accessing sdhost registers
-
-bcm2835-mmc: Add range of debug options for slowing things down
-
-bcm2835-mmc: Add option to disable some delays
-
-bcm2835-mmc: Add option to disable MMC_QUIRK_BLK_NO_CMD23
-
-bcm2835-mmc: Default to disabling MMC_QUIRK_BLK_NO_CMD23
-
-bcm2835-mmc: Adding overclocking option
-
-Allow a different clock speed to be substitued for a requested 50MHz.
-This option is exposed using the "overclock_50" DT parameter.
-Note that the mmc interface is restricted to EVEN integer divisions of
-250MHz, and the highest sensible option is 63 (250/4 = 62.5), the
-next being 125 (250/2) which is much too high.
-
-Use at your own risk.
-
-bcm2835-mmc: Round up the overclock, so 62 works for 62.5Mhz
-
-Also only warn once for each overclock setting.
-
-mmc: bcm2835-mmc: Make available on ARCH_BCM2835
-
-Make the bcm2835-mmc driver available for use on ARCH_BCM2835.
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-
-BCM270x_DT: add bcm2835-mmc entry
-
-Add Device Tree entry for bcm2835-mmc.
-In non-DT mode, don't add the device in the board file.
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-
-bcm2835-mmc: Don't overwrite MMC capabilities from DT
-
-bcm2835-mmc: Don't override bus width capabilities from devicetree
-
-Take out the force setting of the MMC_CAP_4_BIT_DATA host capability
-so that the result read from devicetree via mmc_of_parse() is
-preserved.
-
-bcm2835-mmc: Only claim one DMA channel
-
-With both MMC controllers enabled there are few DMA channels left. The
-bcm2835-mmc driver only uses DMA in one direction at a time, so it
-doesn't need to claim two channels.
-
-See: https://github.com/raspberrypi/linux/issues/1327
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-bcm2835-mmc: New timer API
-
-mmc: bcm2835-mmc: Support underclocking
-
-Support underclocking of the SD bus using the max-frequency DT property
-(which currently has no DT parameter). The sd_overclock parameter
-already provides another way to achieve the same thing which should be
-equivalent in end result, but it is a bug not to support max-frequency
-as well.
-
-See: https://github.com/raspberrypi/linux/issues/2350
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-mmc/bcm2835: Recover from MMC_SEND_EXT_CSD
-
-If the user issues an "mmc extcsd read", the SD controller receives
-what it thinks is a SEND_IF_COND command with an unexpected data block.
-The resulting operations leave the FSM stuck in READWAIT, a state which
-persists until the MMC framework resets the controller, by which point
-the root filesystem is likely to have been unmounted.
-
-A less heavyweight solution is to detect the condition and nudge the
-FSM by asserting the (self-clearing) FORCE_DATA_MODE bit.
-
-N.B. This workaround was essentially discovered by accident and without
-a full understanding the inner workings of the controller, so it is
-fortunate that the "fix" only modifies error paths.
-
-See: https://github.com/raspberrypi/linux/issues/2728
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-bcm2835-mmc: Fix DMA channel leak
-
-The BCM2835 MMC host driver requests a DMA channel on probe but neglects
-to release the channel in the probe error path and on driver unbind.
-
-I'm seeing this happen on every boot of the Compute Module 3: On first
-driver probe, DMA channel 2 is allocated and then leaked with a "could
-not get clk, deferring probe" message. On second driver probe, channel 4
-is allocated.
-
-Fix it.
-
-Signed-off-by: Lukas Wunner <lukas@wunner.de>
-Cc: Frank Pavlic <f.pavlic@kunbus.de>
-
-bcm2835-mmc: Fix struct mmc_host leak on probe
-
-The BCM2835 MMC host driver requests the bus address of the host's
-register map on probe.  If that fails, the driver leaks the struct
-mmc_host allocated earlier.
-
-Fix it.
-
-Signed-off-by: Lukas Wunner <lukas@wunner.de>
-Cc: Frank Pavlic <f.pavlic@kunbus.de>
-
-bcm2835-mmc: Fix duplicate free_irq() on remove
-
-The BCM2835 MMC host driver requests its interrupt as a device-managed
-resource, so the interrupt is automatically freed after the driver is
-unbound.
-
-However on driver unbind, bcm2835_mmc_remove() frees the interrupt
-explicitly to avoid invocation of the interrupt handler after driver
-structures have been torn down.
-
-The interrupt is thus freed twice, leading to a WARN splat in
-__free_irq().  Fix by not requesting the interrupt as a device-managed
-resource.
-
-Signed-off-by: Lukas Wunner <lukas@wunner.de>
-Cc: Frank Pavlic <f.pavlic@kunbus.de>
-
-bcm2835-mmc: Handle mmc_add_host() errors
-
-The BCM2835 MMC host driver calls mmc_add_host() but doesn't check its
-return value.  Errors occurring in that function are therefore not
-handled.  Fix it.
-
-Signed-off-by: Lukas Wunner <lukas@wunner.de>
-Cc: Frank Pavlic <f.pavlic@kunbus.de>
-
-bcm2835-mmc: Deduplicate reset of driver data on remove
-
-The BCM2835 MMC host driver sets the device's driver data pointer to
-NULL on ->remove() even though the driver core subsequently does the
-same in __device_release_driver().  Drop the duplicate assignment.
-
-Signed-off-by: Lukas Wunner <lukas@wunner.de>
-Cc: Frank Pavlic <f.pavlic@kunbus.de>
-
-bcm2835_mmc: Remove vestigial threaded IRQ
-
-With SDIO processing now managed by the MMC framework with a
-workqueue, the bcm2835_mmc driver no longer needs a threaded
-IRQ.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-Add missing dma_unmap_sg calls to free relevant swiotlb bounce buffers.
-This prevents DMA leaks.
-
-Signed-off-by: Yaroslav Rosomakho <yaroslavros@gmail.com>
-
-Limit max_req_size under arm64 (or any other platform that uses swiotlb) to prevent potential buffer overflow due to bouncing.
-
-Signed-off-by: Yaroslav Rosomakho <yaroslavros@gmail.com>
-
-mmc: sdhci: Silence MMC warnings
-
-When the MMC isn't plugged in, the driver will spam the console which is
-pretty annoying when using NFS.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
-
-mmc: sdhci-iproc: Fix vmmc regulators on iProc
-
-The Linux support for controlling card power via regulators appears to
-be contentious. I would argue that the default behaviour is contrary to
-the SDHCI spec - turning off the power writes a reserved value to the
-SD Bus Voltage Select field of the Power Control Register, which
-seems to kill the Arasan/iProc controller - but fortunately there is a
-hook in sdhci_ops to override the behaviour. Borrow the implementation
-from sdhci_arasan_set_power.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-bcm2835-mmc: uninitialized_var is no more
-
-Revert "mmc: sdhci-iproc: Fix vmmc regulators on iProc"
-
-This reverts commit aed19399a01733dbad9be8bf026a4f7dd823b04f.
-
-Commit 6c92ae1e452f ("mmc: sdhci: Introduce sdhci_set_power_and_bus_voltage()")
-introduced a generic helper that does the same thing so use that instead in
-the following commit.
-
-Signed-off-by: Juerg Haefliger <juergh@canonical.com>
-
-mmc: sdhci-iproc: Fix vmmc regulators (pre-bcm2711)
-
-The Linux support for controlling card power via regulators appears to
-be contentious. I would argue that the default behaviour is contrary to
-the SDHCI spec - turning off the power writes a reserved value to the
-SD Bus Voltage Select field of the Power Control Register, which
-seems to kill the Arasan/iProc controller - but fortunately there is a
-hook in sdhci_ops to override the behaviour.
-
-Signed-off-by: Juerg Haefliger <juergh@canonical.com>
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/mmc/core/block.c       |   31 +-
- drivers/mmc/core/core.c        |    3 +-
- drivers/mmc/core/quirks.h      |    8 +
- drivers/mmc/host/Kconfig       |   29 +
- drivers/mmc/host/Makefile      |    1 +
- drivers/mmc/host/bcm2835-mmc.c | 1575 ++++++++++++++++++++++++++++++++
- drivers/mmc/host/sdhci-iproc.c |    1 +
- drivers/mmc/host/sdhci.c       |    6 +-
- include/linux/mmc/card.h       |    2 +
- 9 files changed, 1651 insertions(+), 5 deletions(-)
- create mode 100644 drivers/mmc/host/bcm2835-mmc.c
-
---- a/drivers/mmc/core/block.c
-+++ b/drivers/mmc/core/block.c
-@@ -173,6 +173,13 @@ static DEFINE_MUTEX(open_lock);
- module_param(perdev_minors, int, 0444);
- MODULE_PARM_DESC(perdev_minors, "Minors numbers to allocate per device");
- 
-+/*
-+ * Allow quirks to be overridden for the current card
-+ */
-+static char *card_quirks;
-+module_param(card_quirks, charp, 0644);
-+MODULE_PARM_DESC(card_quirks, "Force the use of the indicated quirks (a bitfield)");
-+
- static inline int mmc_blk_part_switch(struct mmc_card *card,
- 				      unsigned int part_type);
- static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
-@@ -3052,6 +3059,8 @@ static int mmc_blk_probe(struct mmc_card
- {
- 	struct mmc_blk_data *md;
- 	int ret = 0;
-+	char quirk_str[24];
-+	char cap_str[10];
- 
- 	/*
- 	 * Check that the card supports the command class(es) we need.
-@@ -3059,7 +3068,16 @@ static int mmc_blk_probe(struct mmc_card
- 	if (!(card->csd.cmdclass & CCC_BLOCK_READ))
- 		return -ENODEV;
- 
--	mmc_fixup_device(card, mmc_blk_fixups);
-+	if (card_quirks) {
-+		unsigned long quirks;
-+		if (kstrtoul(card_quirks, 0, &quirks) == 0)
-+			card->quirks = (unsigned int)quirks;
-+		else
-+			pr_err("mmc_block: Invalid card_quirks parameter '%s'\n",
-+			       card_quirks);
-+	}
-+	else
-+		mmc_fixup_device(card, mmc_blk_fixups);
- 
- 	card->complete_wq = alloc_workqueue("mmc_complete",
- 					WQ_MEM_RECLAIM | WQ_HIGHPRI, 0);
-@@ -3074,6 +3092,17 @@ static int mmc_blk_probe(struct mmc_card
- 		goto out_free;
- 	}
- 
-+	string_get_size((u64)get_capacity(md->disk), 512, STRING_UNITS_2,
-+			cap_str, sizeof(cap_str));
-+	if (card->quirks)
-+		snprintf(quirk_str, sizeof(quirk_str),
-+			 " (quirks 0x%08x)", card->quirks);
-+	else
-+		quirk_str[0] = '\0';
-+	pr_info("%s: %s %s %s%s%s\n",
-+		md->disk->disk_name, mmc_card_id(card), mmc_card_name(card),
-+		cap_str, md->read_only ? " (ro)" : "", quirk_str);
-+
- 	ret = mmc_blk_alloc_parts(card, md);
- 	if (ret)
- 		goto out;
---- a/drivers/mmc/core/core.c
-+++ b/drivers/mmc/core/core.c
-@@ -1819,7 +1819,8 @@ EXPORT_SYMBOL(mmc_erase);
- 
- int mmc_can_erase(struct mmc_card *card)
- {
--	if (card->csd.cmdclass & CCC_ERASE && card->erase_size)
-+	if (card->csd.cmdclass & CCC_ERASE && card->erase_size &&
-+	    !(card->quirks & MMC_QUIRK_ERASE_BROKEN))
- 		return 1;
- 	return 0;
- }
---- a/drivers/mmc/core/quirks.h
-+++ b/drivers/mmc/core/quirks.h
-@@ -130,6 +130,14 @@ static const struct mmc_fixup __maybe_un
- 	MMC_FIXUP(CID_NAME_ANY, CID_MANFID_SANDISK_SD, 0x5344, add_quirk_sd,
- 		  MMC_QUIRK_BROKEN_SD_DISCARD),
- 
-+	/*
-+	 *  On some Kingston SD cards, multiple erases of less than 64
-+	 *  sectors can cause corruption.
-+	 */
-+	MMC_FIXUP("SD16G", 0x41, 0x3432, add_quirk, MMC_QUIRK_ERASE_BROKEN),
-+	MMC_FIXUP("SD32G", 0x41, 0x3432, add_quirk, MMC_QUIRK_ERASE_BROKEN),
-+	MMC_FIXUP("SD64G", 0x41, 0x3432, add_quirk, MMC_QUIRK_ERASE_BROKEN),
-+
- 	END_FIXUP
- };
- 
---- a/drivers/mmc/host/Kconfig
-+++ b/drivers/mmc/host/Kconfig
-@@ -5,6 +5,35 @@
- 
- comment "MMC/SD/SDIO Host Controller Drivers"
- 
-+config MMC_BCM2835_MMC
-+	tristate "MMC support on BCM2835"
-+	depends on MACH_BCM2708 || MACH_BCM2709 || ARCH_BCM2835
-+	help
-+	  This selects the MMC Interface on BCM2835.
-+
-+	  If you have a controller with this interface, say Y or M here.
-+
-+	  If unsure, say N.
-+
-+config MMC_BCM2835_DMA
-+	bool "DMA support on BCM2835 Arasan controller"
-+	depends on MMC_BCM2835_MMC
-+	help
-+	  Enable DMA support on the Arasan SDHCI controller in Broadcom 2708
-+	  based chips.
-+
-+	  If unsure, say N.
-+
-+config MMC_BCM2835_PIO_DMA_BARRIER
-+	int "Block count limit for PIO transfers"
-+	depends on MMC_BCM2835_MMC && MMC_BCM2835_DMA
-+	range 0 256
-+	default 2
-+	help
-+	  The inclusive limit in bytes under which PIO will be used instead of DMA
-+
-+	  If unsure, say 2 here.
-+
- config MMC_DEBUG
- 	bool "MMC host drivers debugging"
- 	depends on MMC != n
---- a/drivers/mmc/host/Makefile
-+++ b/drivers/mmc/host/Makefile
-@@ -22,6 +22,7 @@ obj-$(CONFIG_MMC_SDHCI_F_SDH30)	+= sdhci
- obj-$(CONFIG_MMC_SDHCI_MILBEAUT)	+= sdhci-milbeaut.o
- obj-$(CONFIG_MMC_SDHCI_SPEAR)	+= sdhci-spear.o
- obj-$(CONFIG_MMC_SDHCI_AM654)	+= sdhci_am654.o
-+obj-$(CONFIG_MMC_BCM2835_MMC)	+= bcm2835-mmc.o
- obj-$(CONFIG_MMC_WBSD)		+= wbsd.o
- obj-$(CONFIG_MMC_AU1X)		+= au1xmmc.o
- obj-$(CONFIG_MMC_ALCOR)	+= alcor.o
---- /dev/null
-+++ b/drivers/mmc/host/bcm2835-mmc.c
-@@ -0,0 +1,1575 @@
-+/*
-+ * BCM2835 MMC host driver.
-+ *
-+ * Author:      Gellert Weisz <gellert@raspberrypi.org>
-+ *              Copyright 2014
-+ *
-+ * Based on
-+ *  sdhci-bcm2708.c by Broadcom
-+ *  sdhci-bcm2835.c by Stephen Warren and Oleksandr Tymoshenko
-+ *  sdhci.c and sdhci-pci.c by Pierre Ossman
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms and conditions of the GNU General Public License,
-+ * version 2, as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+ * more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <linux/delay.h>
-+#include <linux/module.h>
-+#include <linux/io.h>
-+#include <linux/mmc/mmc.h>
-+#include <linux/mmc/host.h>
-+#include <linux/mmc/sd.h>
-+#include <linux/scatterlist.h>
-+#include <linux/of_address.h>
-+#include <linux/of_irq.h>
-+#include <linux/clk.h>
-+#include <linux/platform_device.h>
-+#include <linux/err.h>
-+#include <linux/blkdev.h>
-+#include <linux/dmaengine.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/of_dma.h>
-+#include <linux/swiotlb.h>
-+
-+#include "sdhci.h"
-+
-+
-+#define DRIVER_NAME "mmc-bcm2835"
-+
-+#define DBG(f, x...) \
-+pr_debug(DRIVER_NAME " [%s()]: " f, __func__, ## x)
-+
-+#ifndef CONFIG_MMC_BCM2835_DMA
-+ #define FORCE_PIO
-+#endif
-+
-+
-+/* the inclusive limit in bytes under which PIO will be used instead of DMA */
-+#ifdef CONFIG_MMC_BCM2835_PIO_DMA_BARRIER
-+#define PIO_DMA_BARRIER CONFIG_MMC_BCM2835_PIO_DMA_BARRIER
-+#else
-+#define PIO_DMA_BARRIER 00
-+#endif
-+
-+#define MIN_FREQ 400000
-+#define TIMEOUT_VAL 0xE
-+#define BCM2835_SDHCI_WRITE_DELAY(f)	(((2 * 1000000) / f) + 1)
-+
-+
-+unsigned mmc_debug;
-+unsigned mmc_debug2;
-+
-+struct bcm2835_host {
-+	spinlock_t				lock;
-+
-+	void __iomem			*ioaddr;
-+	u32						bus_addr;
-+
-+	struct mmc_host			*mmc;
-+
-+	u32						timeout;
-+
-+	int						clock;	/* Current clock speed */
-+	u8						pwr;	/* Current voltage */
-+
-+	unsigned int			max_clk;		/* Max possible freq */
-+	unsigned int			timeout_clk;	/* Timeout freq (KHz) */
-+	unsigned int			clk_mul;		/* Clock Muliplier value */
-+
-+	struct tasklet_struct	finish_tasklet;		/* Tasklet structures */
-+
-+	struct timer_list		timer;			/* Timer for timeouts */
-+
-+	struct sg_mapping_iter	sg_miter;		/* SG state for PIO */
-+	unsigned int			blocks;			/* remaining PIO blocks */
-+
-+	int						irq;			/* Device IRQ */
-+
-+
-+	u32						ier;			/* cached registers */
-+
-+	struct mmc_request		*mrq;			/* Current request */
-+	struct mmc_command		*cmd;			/* Current command */
-+	struct mmc_data			*data;			/* Current data request */
-+	unsigned int			data_early:1;		/* Data finished before cmd */
-+
-+	wait_queue_head_t		buf_ready_int;		/* Waitqueue for Buffer Read Ready interrupt */
-+
-+	u32						shadow;
-+
-+	/*DMA part*/
-+	struct dma_chan			*dma_chan_rxtx;		/* DMA channel for reads and writes */
-+	struct dma_slave_config		dma_cfg_rx;
-+	struct dma_slave_config		dma_cfg_tx;
-+	struct dma_async_tx_descriptor	*tx_desc;	/* descriptor */
-+
-+	bool					have_dma;
-+	bool					use_dma;
-+	bool					wait_for_dma;
-+	/*end of DMA part*/
-+
-+	int						max_delay;	/* maximum length of time spent waiting */
-+
-+	int						flags;				/* Host attributes */
-+#define SDHCI_REQ_USE_DMA	(1<<2)	/* Use DMA for this req. */
-+#define SDHCI_DEVICE_DEAD	(1<<3)	/* Device unresponsive */
-+#define SDHCI_AUTO_CMD12	(1<<6)	/* Auto CMD12 support */
-+#define SDHCI_AUTO_CMD23	(1<<7)	/* Auto CMD23 support */
-+#define SDHCI_SDIO_IRQ_ENABLED	(1<<9)	/* SDIO irq enabled */
-+
-+	u32				overclock_50;	/* frequency to use when 50MHz is requested (in MHz) */
-+	u32				max_overclock;	/* Highest reported */
-+};
-+
-+
-+static inline void bcm2835_mmc_writel(struct bcm2835_host *host, u32 val, int reg, int from)
-+{
-+	unsigned delay;
-+	lockdep_assert_held_once(&host->lock);
-+	writel(val, host->ioaddr + reg);
-+	udelay(BCM2835_SDHCI_WRITE_DELAY(max(host->clock, MIN_FREQ)));
-+
-+	delay = ((mmc_debug >> 16) & 0xf) << ((mmc_debug >> 20) & 0xf);
-+	if (delay && !((1<<from) & mmc_debug2))
-+		udelay(delay);
-+}
-+
-+static inline void mmc_raw_writel(struct bcm2835_host *host, u32 val, int reg)
-+{
-+	unsigned delay;
-+	lockdep_assert_held_once(&host->lock);
-+	writel(val, host->ioaddr + reg);
-+
-+	delay = ((mmc_debug >> 24) & 0xf) << ((mmc_debug >> 28) & 0xf);
-+	if (delay)
-+		udelay(delay);
-+}
-+
-+static inline u32 bcm2835_mmc_readl(struct bcm2835_host *host, int reg)
-+{
-+	lockdep_assert_held_once(&host->lock);
-+	return readl(host->ioaddr + reg);
-+}
-+
-+static inline void bcm2835_mmc_writew(struct bcm2835_host *host, u16 val, int reg)
-+{
-+	u32 oldval = (reg == SDHCI_COMMAND) ? host->shadow :
-+		bcm2835_mmc_readl(host, reg & ~3);
-+	u32 word_num = (reg >> 1) & 1;
-+	u32 word_shift = word_num * 16;
-+	u32 mask = 0xffff << word_shift;
-+	u32 newval = (oldval & ~mask) | (val << word_shift);
-+
-+	if (reg == SDHCI_TRANSFER_MODE)
-+		host->shadow = newval;
-+	else
-+		bcm2835_mmc_writel(host, newval, reg & ~3, 0);
-+
-+}
-+
-+static inline void bcm2835_mmc_writeb(struct bcm2835_host *host, u8 val, int reg)
-+{
-+	u32 oldval = bcm2835_mmc_readl(host, reg & ~3);
-+	u32 byte_num = reg & 3;
-+	u32 byte_shift = byte_num * 8;
-+	u32 mask = 0xff << byte_shift;
-+	u32 newval = (oldval & ~mask) | (val << byte_shift);
-+
-+	bcm2835_mmc_writel(host, newval, reg & ~3, 1);
-+}
-+
-+
-+static inline u16 bcm2835_mmc_readw(struct bcm2835_host *host, int reg)
-+{
-+	u32 val = bcm2835_mmc_readl(host, (reg & ~3));
-+	u32 word_num = (reg >> 1) & 1;
-+	u32 word_shift = word_num * 16;
-+	u32 word = (val >> word_shift) & 0xffff;
-+
-+	return word;
-+}
-+
-+static inline u8 bcm2835_mmc_readb(struct bcm2835_host *host, int reg)
-+{
-+	u32 val = bcm2835_mmc_readl(host, (reg & ~3));
-+	u32 byte_num = reg & 3;
-+	u32 byte_shift = byte_num * 8;
-+	u32 byte = (val >> byte_shift) & 0xff;
-+
-+	return byte;
-+}
-+
-+static void bcm2835_mmc_unsignal_irqs(struct bcm2835_host *host, u32 clear)
-+{
-+	u32 ier;
-+
-+	ier = bcm2835_mmc_readl(host, SDHCI_SIGNAL_ENABLE);
-+	ier &= ~clear;
-+	/* change which requests generate IRQs - makes no difference to
-+	   the content of SDHCI_INT_STATUS, or the need to acknowledge IRQs */
-+	bcm2835_mmc_writel(host, ier, SDHCI_SIGNAL_ENABLE, 2);
-+}
-+
-+
-+static void bcm2835_mmc_dumpregs(struct bcm2835_host *host)
-+{
-+	pr_debug(DRIVER_NAME ": =========== REGISTER DUMP (%s)===========\n",
-+		mmc_hostname(host->mmc));
-+
-+	pr_debug(DRIVER_NAME ": Sys addr: 0x%08x | Version:  0x%08x\n",
-+		bcm2835_mmc_readl(host, SDHCI_DMA_ADDRESS),
-+		bcm2835_mmc_readw(host, SDHCI_HOST_VERSION));
-+	pr_debug(DRIVER_NAME ": Blk size: 0x%08x | Blk cnt:  0x%08x\n",
-+		bcm2835_mmc_readw(host, SDHCI_BLOCK_SIZE),
-+		bcm2835_mmc_readw(host, SDHCI_BLOCK_COUNT));
-+	pr_debug(DRIVER_NAME ": Argument: 0x%08x | Trn mode: 0x%08x\n",
-+		bcm2835_mmc_readl(host, SDHCI_ARGUMENT),
-+		bcm2835_mmc_readw(host, SDHCI_TRANSFER_MODE));
-+	pr_debug(DRIVER_NAME ": Present:  0x%08x | Host ctl: 0x%08x\n",
-+		bcm2835_mmc_readl(host, SDHCI_PRESENT_STATE),
-+		bcm2835_mmc_readb(host, SDHCI_HOST_CONTROL));
-+	pr_debug(DRIVER_NAME ": Power:    0x%08x | Blk gap:  0x%08x\n",
-+		bcm2835_mmc_readb(host, SDHCI_POWER_CONTROL),
-+		bcm2835_mmc_readb(host, SDHCI_BLOCK_GAP_CONTROL));
-+	pr_debug(DRIVER_NAME ": Wake-up:  0x%08x | Clock:    0x%08x\n",
-+		bcm2835_mmc_readb(host, SDHCI_WAKE_UP_CONTROL),
-+		bcm2835_mmc_readw(host, SDHCI_CLOCK_CONTROL));
-+	pr_debug(DRIVER_NAME ": Timeout:  0x%08x | Int stat: 0x%08x\n",
-+		bcm2835_mmc_readb(host, SDHCI_TIMEOUT_CONTROL),
-+		bcm2835_mmc_readl(host, SDHCI_INT_STATUS));
-+	pr_debug(DRIVER_NAME ": Int enab: 0x%08x | Sig enab: 0x%08x\n",
-+		bcm2835_mmc_readl(host, SDHCI_INT_ENABLE),
-+		bcm2835_mmc_readl(host, SDHCI_SIGNAL_ENABLE));
-+	pr_debug(DRIVER_NAME ": AC12 err: 0x%08x | Slot int: 0x%08x\n",
-+		bcm2835_mmc_readw(host, SDHCI_AUTO_CMD_STATUS),
-+		bcm2835_mmc_readw(host, SDHCI_SLOT_INT_STATUS));
-+	pr_debug(DRIVER_NAME ": Caps:     0x%08x | Caps_1:   0x%08x\n",
-+		bcm2835_mmc_readl(host, SDHCI_CAPABILITIES),
-+		bcm2835_mmc_readl(host, SDHCI_CAPABILITIES_1));
-+	pr_debug(DRIVER_NAME ": Cmd:      0x%08x | Max curr: 0x%08x\n",
-+		bcm2835_mmc_readw(host, SDHCI_COMMAND),
-+		bcm2835_mmc_readl(host, SDHCI_MAX_CURRENT));
-+	pr_debug(DRIVER_NAME ": Host ctl2: 0x%08x\n",
-+		bcm2835_mmc_readw(host, SDHCI_HOST_CONTROL2));
-+
-+	pr_debug(DRIVER_NAME ": ===========================================\n");
-+}
-+
-+
-+static void bcm2835_mmc_reset(struct bcm2835_host *host, u8 mask)
-+{
-+	unsigned long timeout;
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&host->lock, flags);
-+	bcm2835_mmc_writeb(host, mask, SDHCI_SOFTWARE_RESET);
-+
-+	if (mask & SDHCI_RESET_ALL)
-+		host->clock = 0;
-+
-+	/* Wait max 100 ms */
-+	timeout = 100;
-+
-+	/* hw clears the bit when it's done */
-+	while (bcm2835_mmc_readb(host, SDHCI_SOFTWARE_RESET) & mask) {
-+		if (timeout == 0) {
-+			pr_err("%s: Reset 0x%x never completed.\n",
-+				mmc_hostname(host->mmc), (int)mask);
-+			bcm2835_mmc_dumpregs(host);
-+			return;
-+		}
-+		timeout--;
-+		spin_unlock_irqrestore(&host->lock, flags);
-+		mdelay(1);
-+		spin_lock_irqsave(&host->lock, flags);
-+	}
-+
-+	if (100-timeout > 10 && 100-timeout > host->max_delay) {
-+		host->max_delay = 100-timeout;
-+		pr_warn("Warning: MMC controller hung for %d ms\n", host->max_delay);
-+	}
-+	spin_unlock_irqrestore(&host->lock, flags);
-+}
-+
-+static void bcm2835_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios);
-+
-+static void bcm2835_mmc_init(struct bcm2835_host *host, int soft)
-+{
-+	unsigned long flags;
-+	if (soft)
-+		bcm2835_mmc_reset(host, SDHCI_RESET_CMD|SDHCI_RESET_DATA);
-+	else
-+		bcm2835_mmc_reset(host, SDHCI_RESET_ALL);
-+
-+	host->ier = SDHCI_INT_BUS_POWER | SDHCI_INT_DATA_END_BIT |
-+		    SDHCI_INT_DATA_CRC | SDHCI_INT_DATA_TIMEOUT |
-+		    SDHCI_INT_INDEX | SDHCI_INT_END_BIT | SDHCI_INT_CRC |
-+		    SDHCI_INT_TIMEOUT | SDHCI_INT_DATA_END |
-+		    SDHCI_INT_RESPONSE;
-+
-+	spin_lock_irqsave(&host->lock, flags);
-+	bcm2835_mmc_writel(host, host->ier, SDHCI_INT_ENABLE, 3);
-+	bcm2835_mmc_writel(host, host->ier, SDHCI_SIGNAL_ENABLE, 3);
-+	spin_unlock_irqrestore(&host->lock, flags);
-+
-+	if (soft) {
-+		/* force clock reconfiguration */
-+		host->clock = 0;
-+		bcm2835_mmc_set_ios(host->mmc, &host->mmc->ios);
-+	}
-+}
-+
-+
-+
-+static void bcm2835_mmc_finish_data(struct bcm2835_host *host);
-+
-+static void bcm2835_mmc_dma_complete(void *param)
-+{
-+	struct bcm2835_host *host = param;
-+	struct dma_chan *dma_chan;
-+	unsigned long flags;
-+	u32 dir_data;
-+
-+	spin_lock_irqsave(&host->lock, flags);
-+
-+	host->use_dma = false;
-+
-+	if (host->data) {
-+		dma_chan = host->dma_chan_rxtx;
-+		if (host->data->flags & MMC_DATA_WRITE)
-+			dir_data = DMA_TO_DEVICE;
-+		else
-+			dir_data = DMA_FROM_DEVICE;
-+		dma_unmap_sg(dma_chan->device->dev,
-+		     host->data->sg, host->data->sg_len,
-+		     dir_data);
-+		if (! (host->data->flags & MMC_DATA_WRITE))
-+			bcm2835_mmc_finish_data(host);
-+	} else if (host->wait_for_dma) {
-+		host->wait_for_dma = false;
-+		tasklet_schedule(&host->finish_tasklet);
-+	}
-+
-+	spin_unlock_irqrestore(&host->lock, flags);
-+}
-+
-+static void bcm2835_bcm2835_mmc_read_block_pio(struct bcm2835_host *host)
-+{
-+	unsigned long flags;
-+	size_t blksize, len, chunk;
-+
-+	u32 scratch = 0;
-+	u8 *buf;
-+
-+	blksize = host->data->blksz;
-+	chunk = 0;
-+
-+	local_irq_save(flags);
-+
-+	while (blksize) {
-+		if (!sg_miter_next(&host->sg_miter))
-+			BUG();
-+
-+		len = min(host->sg_miter.length, blksize);
-+
-+		blksize -= len;
-+		host->sg_miter.consumed = len;
-+
-+		buf = host->sg_miter.addr;
-+
-+		while (len) {
-+			if (chunk == 0) {
-+				scratch = bcm2835_mmc_readl(host, SDHCI_BUFFER);
-+				chunk = 4;
-+			}
-+
-+			*buf = scratch & 0xFF;
-+
-+			buf++;
-+			scratch >>= 8;
-+			chunk--;
-+			len--;
-+		}
-+	}
-+
-+	sg_miter_stop(&host->sg_miter);
-+
-+	local_irq_restore(flags);
-+}
-+
-+static void bcm2835_bcm2835_mmc_write_block_pio(struct bcm2835_host *host)
-+{
-+	unsigned long flags;
-+	size_t blksize, len, chunk;
-+	u32 scratch;
-+	u8 *buf;
-+
-+	blksize = host->data->blksz;
-+	chunk = 0;
-+	chunk = 0;
-+	scratch = 0;
-+
-+	local_irq_save(flags);
-+
-+	while (blksize) {
-+		if (!sg_miter_next(&host->sg_miter))
-+			BUG();
-+
-+		len = min(host->sg_miter.length, blksize);
-+
-+		blksize -= len;
-+		host->sg_miter.consumed = len;
-+
-+		buf = host->sg_miter.addr;
-+
-+		while (len) {
-+			scratch |= (u32)*buf << (chunk * 8);
-+
-+			buf++;
-+			chunk++;
-+			len--;
-+
-+			if ((chunk == 4) || ((len == 0) && (blksize == 0))) {
-+				mmc_raw_writel(host, scratch, SDHCI_BUFFER);
-+				chunk = 0;
-+				scratch = 0;
-+			}
-+		}
-+	}
-+
-+	sg_miter_stop(&host->sg_miter);
-+
-+	local_irq_restore(flags);
-+}
-+
-+
-+static void bcm2835_mmc_transfer_pio(struct bcm2835_host *host)
-+{
-+	u32 mask;
-+
-+	BUG_ON(!host->data);
-+
-+	if (host->blocks == 0)
-+		return;
-+
-+	if (host->data->flags & MMC_DATA_READ)
-+		mask = SDHCI_DATA_AVAILABLE;
-+	else
-+		mask = SDHCI_SPACE_AVAILABLE;
-+
-+	while (bcm2835_mmc_readl(host, SDHCI_PRESENT_STATE) & mask) {
-+
-+		if (host->data->flags & MMC_DATA_READ)
-+			bcm2835_bcm2835_mmc_read_block_pio(host);
-+		else
-+			bcm2835_bcm2835_mmc_write_block_pio(host);
-+
-+		host->blocks--;
-+
-+		/* QUIRK used in sdhci.c removes the 'if' */
-+		/* but it seems this is unnecessary */
-+		if (host->blocks == 0)
-+			break;
-+
-+
-+	}
-+}
-+
-+
-+static void bcm2835_mmc_transfer_dma(struct bcm2835_host *host)
-+{
-+	u32 len, dir_data, dir_slave;
-+	struct dma_async_tx_descriptor *desc = NULL;
-+	struct dma_chan *dma_chan;
-+
-+
-+	WARN_ON(!host->data);
-+
-+	if (!host->data)
-+		return;
-+
-+	if (host->blocks == 0)
-+		return;
-+
-+	dma_chan = host->dma_chan_rxtx;
-+	if (host->data->flags & MMC_DATA_READ) {
-+		dir_data = DMA_FROM_DEVICE;
-+		dir_slave = DMA_DEV_TO_MEM;
-+	} else {
-+		dir_data = DMA_TO_DEVICE;
-+		dir_slave = DMA_MEM_TO_DEV;
-+	}
-+
-+	/* The parameters have already been validated, so this will not fail */
-+	(void)dmaengine_slave_config(dma_chan,
-+				     (dir_data == DMA_FROM_DEVICE) ?
-+				     &host->dma_cfg_rx :
-+				     &host->dma_cfg_tx);
-+
-+	BUG_ON(!dma_chan->device);
-+	BUG_ON(!dma_chan->device->dev);
-+	BUG_ON(!host->data->sg);
-+
-+	len = dma_map_sg(dma_chan->device->dev, host->data->sg,
-+			 host->data->sg_len, dir_data);
-+	if (len > 0) {
-+		desc = dmaengine_prep_slave_sg(dma_chan, host->data->sg,
-+					       len, dir_slave,
-+					       DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
-+	} else {
-+		dev_err(mmc_dev(host->mmc), "dma_map_sg returned zero length\n");
-+	}
-+	if (desc) {
-+		unsigned long flags;
-+		spin_lock_irqsave(&host->lock, flags);
-+		bcm2835_mmc_unsignal_irqs(host, SDHCI_INT_DATA_AVAIL |
-+						    SDHCI_INT_SPACE_AVAIL);
-+		host->tx_desc = desc;
-+		desc->callback = bcm2835_mmc_dma_complete;
-+		desc->callback_param = host;
-+		spin_unlock_irqrestore(&host->lock, flags);
-+		dmaengine_submit(desc);
-+		dma_async_issue_pending(dma_chan);
-+	} else {
-+		dma_unmap_sg(dma_chan->device->dev, host->data->sg, len, dir_data);
-+	}
-+
-+}
-+
-+
-+
-+static void bcm2835_mmc_set_transfer_irqs(struct bcm2835_host *host)
-+{
-+	u32 pio_irqs = SDHCI_INT_DATA_AVAIL | SDHCI_INT_SPACE_AVAIL;
-+	u32 dma_irqs = SDHCI_INT_DMA_END | SDHCI_INT_ADMA_ERROR;
-+
-+	if (host->use_dma)
-+		host->ier = (host->ier & ~pio_irqs) | dma_irqs;
-+	else
-+		host->ier = (host->ier & ~dma_irqs) | pio_irqs;
-+
-+	bcm2835_mmc_writel(host, host->ier, SDHCI_INT_ENABLE, 4);
-+	bcm2835_mmc_writel(host, host->ier, SDHCI_SIGNAL_ENABLE, 4);
-+}
-+
-+
-+static void bcm2835_mmc_prepare_data(struct bcm2835_host *host, struct mmc_command *cmd)
-+{
-+	u8 count;
-+	struct mmc_data *data = cmd->data;
-+
-+	WARN_ON(host->data);
-+
-+	if (data || (cmd->flags & MMC_RSP_BUSY)) {
-+		count = TIMEOUT_VAL;
-+		bcm2835_mmc_writeb(host, count, SDHCI_TIMEOUT_CONTROL);
-+	}
-+
-+	if (!data)
-+		return;
-+
-+	/* Sanity checks */
-+	BUG_ON(data->blksz * data->blocks > 524288);
-+	BUG_ON(data->blksz > host->mmc->max_blk_size);
-+	BUG_ON(data->blocks > 65535);
-+
-+	host->data = data;
-+	host->data_early = 0;
-+	host->data->bytes_xfered = 0;
-+
-+
-+	if (!(host->flags & SDHCI_REQ_USE_DMA)) {
-+		int flags;
-+
-+		flags = SG_MITER_ATOMIC;
-+		if (host->data->flags & MMC_DATA_READ)
-+			flags |= SG_MITER_TO_SG;
-+		else
-+			flags |= SG_MITER_FROM_SG;
-+		sg_miter_start(&host->sg_miter, data->sg, data->sg_len, flags);
-+		host->blocks = data->blocks;
-+	}
-+
-+	host->use_dma = host->have_dma && data->blocks > PIO_DMA_BARRIER;
-+
-+	bcm2835_mmc_set_transfer_irqs(host);
-+
-+	/* Set the DMA boundary value and block size */
-+	bcm2835_mmc_writew(host, SDHCI_MAKE_BLKSZ(SDHCI_DEFAULT_BOUNDARY_ARG,
-+		data->blksz), SDHCI_BLOCK_SIZE);
-+	bcm2835_mmc_writew(host, data->blocks, SDHCI_BLOCK_COUNT);
-+
-+	BUG_ON(!host->data);
-+}
-+
-+static void bcm2835_mmc_set_transfer_mode(struct bcm2835_host *host,
-+	struct mmc_command *cmd)
-+{
-+	u16 mode;
-+	struct mmc_data *data = cmd->data;
-+
-+	if (data == NULL) {
-+		/* clear Auto CMD settings for no data CMDs */
-+		mode = bcm2835_mmc_readw(host, SDHCI_TRANSFER_MODE);
-+		bcm2835_mmc_writew(host, mode & ~(SDHCI_TRNS_AUTO_CMD12 |
-+				SDHCI_TRNS_AUTO_CMD23), SDHCI_TRANSFER_MODE);
-+		return;
-+	}
-+
-+	WARN_ON(!host->data);
-+
-+	mode = SDHCI_TRNS_BLK_CNT_EN;
-+
-+	if ((mmc_op_multi(cmd->opcode) || data->blocks > 1)) {
-+		mode |= SDHCI_TRNS_MULTI;
-+
-+		/*
-+		 * If we are sending CMD23, CMD12 never gets sent
-+		 * on successful completion (so no Auto-CMD12).
-+		 */
-+		if (!host->mrq->sbc && (host->flags & SDHCI_AUTO_CMD12))
-+			mode |= SDHCI_TRNS_AUTO_CMD12;
-+		else if (host->mrq->sbc && (host->flags & SDHCI_AUTO_CMD23)) {
-+			mode |= SDHCI_TRNS_AUTO_CMD23;
-+			bcm2835_mmc_writel(host, host->mrq->sbc->arg, SDHCI_ARGUMENT2, 5);
-+		}
-+	}
-+
-+	if (data->flags & MMC_DATA_READ)
-+		mode |= SDHCI_TRNS_READ;
-+	if (host->flags & SDHCI_REQ_USE_DMA)
-+		mode |= SDHCI_TRNS_DMA;
-+
-+	bcm2835_mmc_writew(host, mode, SDHCI_TRANSFER_MODE);
-+}
-+
-+void bcm2835_mmc_send_command(struct bcm2835_host *host, struct mmc_command *cmd)
-+{
-+	int flags;
-+	u32 mask;
-+	unsigned long timeout;
-+
-+	WARN_ON(host->cmd);
-+
-+	/* Wait max 10 ms */
-+	timeout = 1000;
-+
-+	mask = SDHCI_CMD_INHIBIT;
-+	if ((cmd->data != NULL) || (cmd->flags & MMC_RSP_BUSY))
-+		mask |= SDHCI_DATA_INHIBIT;
-+
-+	/* We shouldn't wait for data inihibit for stop commands, even
-+	   though they might use busy signaling */
-+	if (host->mrq->data && (cmd == host->mrq->data->stop))
-+		mask &= ~SDHCI_DATA_INHIBIT;
-+
-+	while (bcm2835_mmc_readl(host, SDHCI_PRESENT_STATE) & mask) {
-+		if (timeout == 0) {
-+			pr_err("%s: Controller never released inhibit bit(s).\n",
-+				mmc_hostname(host->mmc));
-+			bcm2835_mmc_dumpregs(host);
-+			cmd->error = -EIO;
-+			tasklet_schedule(&host->finish_tasklet);
-+			return;
-+		}
-+		timeout--;
-+		udelay(10);
-+	}
-+
-+	if ((1000-timeout)/100 > 1 && (1000-timeout)/100 > host->max_delay) {
-+		host->max_delay = (1000-timeout)/100;
-+		pr_warn("Warning: MMC controller hung for %d ms\n", host->max_delay);
-+	}
-+
-+	timeout = jiffies;
-+	if (!cmd->data && cmd->busy_timeout > 9000)
-+		timeout += DIV_ROUND_UP(cmd->busy_timeout, 1000) * HZ + HZ;
-+	else
-+		timeout += 10 * HZ;
-+	mod_timer(&host->timer, timeout);
-+
-+	host->cmd = cmd;
-+	host->use_dma = false;
-+
-+	bcm2835_mmc_prepare_data(host, cmd);
-+
-+	bcm2835_mmc_writel(host, cmd->arg, SDHCI_ARGUMENT, 6);
-+
-+	bcm2835_mmc_set_transfer_mode(host, cmd);
-+
-+	if ((cmd->flags & MMC_RSP_136) && (cmd->flags & MMC_RSP_BUSY)) {
-+		pr_err("%s: Unsupported response type!\n",
-+			mmc_hostname(host->mmc));
-+		cmd->error = -EINVAL;
-+		tasklet_schedule(&host->finish_tasklet);
-+		return;
-+	}
-+
-+	if (!(cmd->flags & MMC_RSP_PRESENT))
-+		flags = SDHCI_CMD_RESP_NONE;
-+	else if (cmd->flags & MMC_RSP_136)
-+		flags = SDHCI_CMD_RESP_LONG;
-+	else if (cmd->flags & MMC_RSP_BUSY)
-+		flags = SDHCI_CMD_RESP_SHORT_BUSY;
-+	else
-+		flags = SDHCI_CMD_RESP_SHORT;
-+
-+	if (cmd->flags & MMC_RSP_CRC)
-+		flags |= SDHCI_CMD_CRC;
-+	if (cmd->flags & MMC_RSP_OPCODE)
-+		flags |= SDHCI_CMD_INDEX;
-+
-+	if (cmd->data)
-+		flags |= SDHCI_CMD_DATA;
-+
-+	bcm2835_mmc_writew(host, SDHCI_MAKE_CMD(cmd->opcode, flags), SDHCI_COMMAND);
-+}
-+
-+
-+static void bcm2835_mmc_finish_data(struct bcm2835_host *host)
-+{
-+	struct mmc_data *data;
-+
-+	BUG_ON(!host->data);
-+
-+	data = host->data;
-+	host->data = NULL;
-+
-+	if (data->error)
-+		data->bytes_xfered = 0;
-+	else
-+		data->bytes_xfered = data->blksz * data->blocks;
-+
-+	/*
-+	 * Need to send CMD12 if -
-+	 * a) open-ended multiblock transfer (no CMD23)
-+	 * b) error in multiblock transfer
-+	 */
-+	if (data->stop &&
-+	    (data->error ||
-+	     !host->mrq->sbc)) {
-+
-+		/*
-+		 * The controller needs a reset of internal state machines
-+		 * upon error conditions.
-+		 */
-+		if (data->error) {
-+			bcm2835_mmc_reset(host, SDHCI_RESET_CMD);
-+			bcm2835_mmc_reset(host, SDHCI_RESET_DATA);
-+		}
-+
-+		bcm2835_mmc_send_command(host, data->stop);
-+	} else if (host->use_dma) {
-+		host->wait_for_dma = true;
-+	} else {
-+		tasklet_schedule(&host->finish_tasklet);
-+	}
-+}
-+
-+static void bcm2835_mmc_finish_command(struct bcm2835_host *host)
-+{
-+	int i;
-+
-+	BUG_ON(host->cmd == NULL);
-+
-+	if (host->cmd->flags & MMC_RSP_PRESENT) {
-+		if (host->cmd->flags & MMC_RSP_136) {
-+			/* CRC is stripped so we need to do some shifting. */
-+			for (i = 0; i < 4; i++) {
-+				host->cmd->resp[i] = bcm2835_mmc_readl(host,
-+					SDHCI_RESPONSE + (3-i)*4) << 8;
-+				if (i != 3)
-+					host->cmd->resp[i] |=
-+						bcm2835_mmc_readb(host,
-+						SDHCI_RESPONSE + (3-i)*4-1);
-+			}
-+		} else {
-+			host->cmd->resp[0] = bcm2835_mmc_readl(host, SDHCI_RESPONSE);
-+		}
-+	}
-+
-+	host->cmd->error = 0;
-+
-+	/* Finished CMD23, now send actual command. */
-+	if (host->cmd == host->mrq->sbc) {
-+		host->cmd = NULL;
-+		bcm2835_mmc_send_command(host, host->mrq->cmd);
-+
-+		if (host->mrq->cmd->data && host->use_dma) {
-+			/* DMA transfer starts now, PIO starts after interrupt */
-+			bcm2835_mmc_transfer_dma(host);
-+		}
-+	} else {
-+
-+		/* Processed actual command. */
-+		if (host->data && host->data_early)
-+			bcm2835_mmc_finish_data(host);
-+
-+		if (!host->cmd->data)
-+			tasklet_schedule(&host->finish_tasklet);
-+
-+		host->cmd = NULL;
-+	}
-+}
-+
-+
-+static void bcm2835_mmc_timeout_timer(struct timer_list *t)
-+{
-+	struct bcm2835_host *host = from_timer(host, t, timer);
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&host->lock, flags);
-+
-+	if (host->mrq) {
-+		pr_err("%s: Timeout waiting for hardware interrupt.\n",
-+			mmc_hostname(host->mmc));
-+		bcm2835_mmc_dumpregs(host);
-+
-+		if (host->data) {
-+			host->data->error = -ETIMEDOUT;
-+			bcm2835_mmc_finish_data(host);
-+		} else {
-+			if (host->cmd)
-+				host->cmd->error = -ETIMEDOUT;
-+			else
-+				host->mrq->cmd->error = -ETIMEDOUT;
-+
-+			tasklet_schedule(&host->finish_tasklet);
-+		}
-+	}
-+
-+	spin_unlock_irqrestore(&host->lock, flags);
-+}
-+
-+
-+static void bcm2835_mmc_enable_sdio_irq_nolock(struct bcm2835_host *host, int enable)
-+{
-+	if (!(host->flags & SDHCI_DEVICE_DEAD)) {
-+		if (enable)
-+			host->ier |= SDHCI_INT_CARD_INT;
-+		else
-+			host->ier &= ~SDHCI_INT_CARD_INT;
-+
-+		bcm2835_mmc_writel(host, host->ier, SDHCI_INT_ENABLE, 7);
-+		bcm2835_mmc_writel(host, host->ier, SDHCI_SIGNAL_ENABLE, 7);
-+	}
-+}
-+
-+static void bcm2835_mmc_enable_sdio_irq(struct mmc_host *mmc, int enable)
-+{
-+	struct bcm2835_host *host = mmc_priv(mmc);
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&host->lock, flags);
-+	if (enable)
-+		host->flags |= SDHCI_SDIO_IRQ_ENABLED;
-+	else
-+		host->flags &= ~SDHCI_SDIO_IRQ_ENABLED;
-+
-+	bcm2835_mmc_enable_sdio_irq_nolock(host, enable);
-+	spin_unlock_irqrestore(&host->lock, flags);
-+}
-+
-+static void bcm2835_mmc_cmd_irq(struct bcm2835_host *host, u32 intmask)
-+{
-+
-+	BUG_ON(intmask == 0);
-+
-+	if (!host->cmd) {
-+		pr_err("%s: Got command interrupt 0x%08x even "
-+			"though no command operation was in progress.\n",
-+			mmc_hostname(host->mmc), (unsigned)intmask);
-+		bcm2835_mmc_dumpregs(host);
-+		return;
-+	}
-+
-+	if (intmask & SDHCI_INT_TIMEOUT)
-+		host->cmd->error = -ETIMEDOUT;
-+	else if (intmask & (SDHCI_INT_CRC | SDHCI_INT_END_BIT |
-+			SDHCI_INT_INDEX)) {
-+			host->cmd->error = -EILSEQ;
-+	}
-+
-+	if (host->cmd->error) {
-+		tasklet_schedule(&host->finish_tasklet);
-+		return;
-+	}
-+
-+	if (intmask & SDHCI_INT_RESPONSE)
-+		bcm2835_mmc_finish_command(host);
-+
-+}
-+
-+static void bcm2835_mmc_data_irq(struct bcm2835_host *host, u32 intmask)
-+{
-+	struct dma_chan *dma_chan;
-+	u32 dir_data;
-+
-+	BUG_ON(intmask == 0);
-+
-+	if (!host->data) {
-+		/*
-+		 * The "data complete" interrupt is also used to
-+		 * indicate that a busy state has ended. See comment
-+		 * above in sdhci_cmd_irq().
-+		 */
-+		if (host->cmd && (host->cmd->flags & MMC_RSP_BUSY)) {
-+			if (intmask & SDHCI_INT_DATA_END) {
-+				bcm2835_mmc_finish_command(host);
-+				return;
-+			}
-+		}
-+
-+		pr_debug("%s: Got data interrupt 0x%08x even "
-+			"though no data operation was in progress.\n",
-+			mmc_hostname(host->mmc), (unsigned)intmask);
-+		bcm2835_mmc_dumpregs(host);
-+
-+		return;
-+	}
-+
-+	if (intmask & SDHCI_INT_DATA_TIMEOUT)
-+		host->data->error = -ETIMEDOUT;
-+	else if (intmask & SDHCI_INT_DATA_END_BIT)
-+		host->data->error = -EILSEQ;
-+	else if ((intmask & SDHCI_INT_DATA_CRC) &&
-+		SDHCI_GET_CMD(bcm2835_mmc_readw(host, SDHCI_COMMAND))
-+			!= MMC_BUS_TEST_R)
-+		host->data->error = -EILSEQ;
-+
-+	if (host->use_dma) {
-+		if  (host->data->flags & MMC_DATA_WRITE) {
-+			/* IRQ handled here */
-+
-+			dma_chan = host->dma_chan_rxtx;
-+			dir_data = DMA_TO_DEVICE;
-+			dma_unmap_sg(dma_chan->device->dev,
-+				 host->data->sg, host->data->sg_len,
-+				 dir_data);
-+
-+			bcm2835_mmc_finish_data(host);
-+		}
-+
-+	} else {
-+		if (host->data->error)
-+			bcm2835_mmc_finish_data(host);
-+		else {
-+			if (intmask & (SDHCI_INT_DATA_AVAIL | SDHCI_INT_SPACE_AVAIL))
-+				bcm2835_mmc_transfer_pio(host);
-+
-+			if (intmask & SDHCI_INT_DATA_END) {
-+				if (host->cmd) {
-+					/*
-+					 * Data managed to finish before the
-+					 * command completed. Make sure we do
-+					 * things in the proper order.
-+					 */
-+					host->data_early = 1;
-+				} else {
-+					bcm2835_mmc_finish_data(host);
-+				}
-+			}
-+		}
-+	}
-+}
-+
-+
-+static irqreturn_t bcm2835_mmc_irq(int irq, void *dev_id)
-+{
-+	irqreturn_t result = IRQ_NONE;
-+	struct bcm2835_host *host = dev_id;
-+	u32 intmask, mask, unexpected = 0;
-+	int max_loops = 16;
-+
-+	spin_lock(&host->lock);
-+
-+	intmask = bcm2835_mmc_readl(host, SDHCI_INT_STATUS);
-+
-+	if (!intmask || intmask == 0xffffffff) {
-+		result = IRQ_NONE;
-+		goto out;
-+	}
-+
-+	do {
-+		/* Clear selected interrupts. */
-+		mask = intmask & (SDHCI_INT_CMD_MASK | SDHCI_INT_DATA_MASK |
-+				  SDHCI_INT_BUS_POWER);
-+		bcm2835_mmc_writel(host, mask, SDHCI_INT_STATUS, 8);
-+
-+
-+		if (intmask & SDHCI_INT_CMD_MASK)
-+			bcm2835_mmc_cmd_irq(host, intmask & SDHCI_INT_CMD_MASK);
-+
-+		if (intmask & SDHCI_INT_DATA_MASK)
-+			bcm2835_mmc_data_irq(host, intmask & SDHCI_INT_DATA_MASK);
-+
-+		if (intmask & SDHCI_INT_BUS_POWER)
-+			pr_err("%s: Card is consuming too much power!\n",
-+				mmc_hostname(host->mmc));
-+
-+		if (intmask & SDHCI_INT_CARD_INT) {
-+			bcm2835_mmc_enable_sdio_irq_nolock(host, false);
-+			sdio_signal_irq(host->mmc);
-+		}
-+
-+		intmask &= ~(SDHCI_INT_CARD_INSERT | SDHCI_INT_CARD_REMOVE |
-+			     SDHCI_INT_CMD_MASK | SDHCI_INT_DATA_MASK |
-+			     SDHCI_INT_ERROR | SDHCI_INT_BUS_POWER |
-+			     SDHCI_INT_CARD_INT);
-+
-+		if (intmask) {
-+			unexpected |= intmask;
-+			bcm2835_mmc_writel(host, intmask, SDHCI_INT_STATUS, 9);
-+		}
-+
-+		if (result == IRQ_NONE)
-+			result = IRQ_HANDLED;
-+
-+		intmask = bcm2835_mmc_readl(host, SDHCI_INT_STATUS);
-+	} while (intmask && --max_loops);
-+out:
-+	spin_unlock(&host->lock);
-+
-+	if (unexpected) {
-+		pr_err("%s: Unexpected interrupt 0x%08x.\n",
-+			   mmc_hostname(host->mmc), unexpected);
-+		bcm2835_mmc_dumpregs(host);
-+	}
-+
-+	return result;
-+}
-+
-+
-+static void bcm2835_mmc_ack_sdio_irq(struct mmc_host *mmc)
-+{
-+	struct bcm2835_host *host = mmc_priv(mmc);
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&host->lock, flags);
-+	if (host->flags & SDHCI_SDIO_IRQ_ENABLED)
-+		bcm2835_mmc_enable_sdio_irq_nolock(host, true);
-+	spin_unlock_irqrestore(&host->lock, flags);
-+}
-+
-+void bcm2835_mmc_set_clock(struct bcm2835_host *host, unsigned int clock)
-+{
-+	int div = 0; /* Initialized for compiler warning */
-+	int real_div = div, clk_mul = 1;
-+	u16 clk = 0;
-+	unsigned long timeout;
-+	unsigned int input_clock = clock;
-+
-+	if (host->overclock_50 && (clock == 50000000))
-+		clock = host->overclock_50 * 1000000 + 999999;
-+
-+	host->mmc->actual_clock = 0;
-+
-+	bcm2835_mmc_writew(host, 0, SDHCI_CLOCK_CONTROL);
-+
-+	if (clock == 0)
-+		return;
-+
-+	/* Version 3.00 divisors must be a multiple of 2. */
-+	if (host->max_clk <= clock)
-+		div = 1;
-+	else {
-+		for (div = 2; div < SDHCI_MAX_DIV_SPEC_300;
-+			 div += 2) {
-+			if ((host->max_clk / div) <= clock)
-+				break;
-+		}
-+	}
-+
-+	real_div = div;
-+	div >>= 1;
-+
-+	if (real_div)
-+		clock = (host->max_clk * clk_mul) / real_div;
-+	host->mmc->actual_clock = clock;
-+
-+	if ((clock > input_clock) && (clock > host->max_overclock)) {
-+		pr_warn("%s: Overclocking to %dHz\n",
-+			mmc_hostname(host->mmc), clock);
-+		host->max_overclock = clock;
-+	}
-+
-+	clk |= (div & SDHCI_DIV_MASK) << SDHCI_DIVIDER_SHIFT;
-+	clk |= ((div & SDHCI_DIV_HI_MASK) >> SDHCI_DIV_MASK_LEN)
-+		<< SDHCI_DIVIDER_HI_SHIFT;
-+	clk |= SDHCI_CLOCK_INT_EN;
-+	bcm2835_mmc_writew(host, clk, SDHCI_CLOCK_CONTROL);
-+
-+	/* Wait max 20 ms */
-+	timeout = 20;
-+	while (!((clk = bcm2835_mmc_readw(host, SDHCI_CLOCK_CONTROL))
-+		& SDHCI_CLOCK_INT_STABLE)) {
-+		if (timeout == 0) {
-+			pr_err("%s: Internal clock never "
-+				"stabilised.\n", mmc_hostname(host->mmc));
-+			bcm2835_mmc_dumpregs(host);
-+			return;
-+		}
-+		timeout--;
-+		mdelay(1);
-+	}
-+
-+	if (20-timeout > 10 && 20-timeout > host->max_delay) {
-+		host->max_delay = 20-timeout;
-+		pr_warn("Warning: MMC controller hung for %d ms\n", host->max_delay);
-+	}
-+
-+	clk |= SDHCI_CLOCK_CARD_EN;
-+	bcm2835_mmc_writew(host, clk, SDHCI_CLOCK_CONTROL);
-+}
-+
-+static void bcm2835_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq)
-+{
-+	struct bcm2835_host *host;
-+	unsigned long flags;
-+
-+	host = mmc_priv(mmc);
-+
-+	spin_lock_irqsave(&host->lock, flags);
-+
-+	WARN_ON(host->mrq != NULL);
-+
-+	host->mrq = mrq;
-+
-+	if (mrq->sbc && !(host->flags & SDHCI_AUTO_CMD23))
-+		bcm2835_mmc_send_command(host, mrq->sbc);
-+	else
-+		bcm2835_mmc_send_command(host, mrq->cmd);
-+
-+	spin_unlock_irqrestore(&host->lock, flags);
-+
-+	if (!(mrq->sbc && !(host->flags & SDHCI_AUTO_CMD23)) && mrq->cmd->data && host->use_dma) {
-+		/* DMA transfer starts now, PIO starts after interrupt */
-+		bcm2835_mmc_transfer_dma(host);
-+	}
-+}
-+
-+
-+static void bcm2835_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-+{
-+
-+	struct bcm2835_host *host = mmc_priv(mmc);
-+	unsigned long flags;
-+	u8 ctrl;
-+	u16 clk, ctrl_2;
-+
-+	pr_debug("bcm2835_mmc_set_ios: clock %d, pwr %d, bus_width %d, timing %d, vdd %d, drv_type %d\n",
-+		 ios->clock, ios->power_mode, ios->bus_width,
-+		 ios->timing, ios->signal_voltage, ios->drv_type);
-+
-+	spin_lock_irqsave(&host->lock, flags);
-+
-+	if (!ios->clock || ios->clock != host->clock) {
-+		bcm2835_mmc_set_clock(host, ios->clock);
-+		host->clock = ios->clock;
-+	}
-+
-+	if (host->pwr != SDHCI_POWER_330) {
-+		host->pwr = SDHCI_POWER_330;
-+		bcm2835_mmc_writeb(host, SDHCI_POWER_330 | SDHCI_POWER_ON, SDHCI_POWER_CONTROL);
-+	}
-+
-+	ctrl = bcm2835_mmc_readb(host, SDHCI_HOST_CONTROL);
-+
-+	/* set bus width */
-+	ctrl &= ~SDHCI_CTRL_8BITBUS;
-+	if (ios->bus_width == MMC_BUS_WIDTH_4)
-+		ctrl |= SDHCI_CTRL_4BITBUS;
-+	else
-+		ctrl &= ~SDHCI_CTRL_4BITBUS;
-+
-+	ctrl &= ~SDHCI_CTRL_HISPD; /* NO_HISPD_BIT */
-+
-+
-+	bcm2835_mmc_writeb(host, ctrl, SDHCI_HOST_CONTROL);
-+	/*
-+	 * We only need to set Driver Strength if the
-+	 * preset value enable is not set.
-+	 */
-+	ctrl_2 = bcm2835_mmc_readw(host, SDHCI_HOST_CONTROL2);
-+	ctrl_2 &= ~SDHCI_CTRL_DRV_TYPE_MASK;
-+	if (ios->drv_type == MMC_SET_DRIVER_TYPE_A)
-+		ctrl_2 |= SDHCI_CTRL_DRV_TYPE_A;
-+	else if (ios->drv_type == MMC_SET_DRIVER_TYPE_C)
-+		ctrl_2 |= SDHCI_CTRL_DRV_TYPE_C;
-+
-+	bcm2835_mmc_writew(host, ctrl_2, SDHCI_HOST_CONTROL2);
-+
-+	/* Reset SD Clock Enable */
-+	clk = bcm2835_mmc_readw(host, SDHCI_CLOCK_CONTROL);
-+	clk &= ~SDHCI_CLOCK_CARD_EN;
-+	bcm2835_mmc_writew(host, clk, SDHCI_CLOCK_CONTROL);
-+
-+	/* Re-enable SD Clock */
-+	bcm2835_mmc_set_clock(host, host->clock);
-+	bcm2835_mmc_writeb(host, ctrl, SDHCI_HOST_CONTROL);
-+
-+	spin_unlock_irqrestore(&host->lock, flags);
-+}
-+
-+
-+static struct mmc_host_ops bcm2835_ops = {
-+	.request = bcm2835_mmc_request,
-+	.set_ios = bcm2835_mmc_set_ios,
-+	.enable_sdio_irq = bcm2835_mmc_enable_sdio_irq,
-+	.ack_sdio_irq = bcm2835_mmc_ack_sdio_irq,
-+};
-+
-+
-+static void bcm2835_mmc_tasklet_finish(unsigned long param)
-+{
-+	struct bcm2835_host *host;
-+	unsigned long flags;
-+	struct mmc_request *mrq;
-+
-+	host = (struct bcm2835_host *)param;
-+
-+	spin_lock_irqsave(&host->lock, flags);
-+
-+	/*
-+	 * If this tasklet gets rescheduled while running, it will
-+	 * be run again afterwards but without any active request.
-+	 */
-+	if (!host->mrq) {
-+		spin_unlock_irqrestore(&host->lock, flags);
-+		return;
-+	}
-+
-+	del_timer(&host->timer);
-+
-+	mrq = host->mrq;
-+
-+	/*
-+	 * The controller needs a reset of internal state machines
-+	 * upon error conditions.
-+	 */
-+	if (!(host->flags & SDHCI_DEVICE_DEAD) &&
-+	    ((mrq->cmd && mrq->cmd->error) ||
-+		 (mrq->data && (mrq->data->error ||
-+		  (mrq->data->stop && mrq->data->stop->error))))) {
-+
-+		spin_unlock_irqrestore(&host->lock, flags);
-+		bcm2835_mmc_reset(host, SDHCI_RESET_CMD);
-+		bcm2835_mmc_reset(host, SDHCI_RESET_DATA);
-+		spin_lock_irqsave(&host->lock, flags);
-+	}
-+
-+	host->mrq = NULL;
-+	host->cmd = NULL;
-+	host->data = NULL;
-+
-+	spin_unlock_irqrestore(&host->lock, flags);
-+	mmc_request_done(host->mmc, mrq);
-+}
-+
-+
-+
-+static int bcm2835_mmc_add_host(struct bcm2835_host *host)
-+{
-+	struct mmc_host *mmc = host->mmc;
-+	struct device *dev = mmc->parent;
-+#ifndef FORCE_PIO
-+	struct dma_slave_config cfg;
-+#endif
-+	int ret;
-+
-+	bcm2835_mmc_reset(host, SDHCI_RESET_ALL);
-+
-+	host->clk_mul = 0;
-+
-+	if (!mmc->f_max || mmc->f_max > host->max_clk)
-+		mmc->f_max = host->max_clk;
-+	mmc->f_min = host->max_clk / SDHCI_MAX_DIV_SPEC_300;
-+
-+	/* SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK */
-+	host->timeout_clk = mmc->f_max / 1000;
-+	mmc->max_busy_timeout = (1 << 27) / host->timeout_clk;
-+
-+	/* host controller capabilities */
-+	mmc->caps |= MMC_CAP_CMD23 | MMC_CAP_NEEDS_POLL |
-+		MMC_CAP_SDIO_IRQ | MMC_CAP_SD_HIGHSPEED |
-+		MMC_CAP_MMC_HIGHSPEED;
-+
-+	mmc->caps2 |= MMC_CAP2_SDIO_IRQ_NOTHREAD;
-+
-+	host->flags = SDHCI_AUTO_CMD23;
-+
-+	dev_info(dev, "mmc_debug:%x mmc_debug2:%x\n", mmc_debug, mmc_debug2);
-+#ifdef FORCE_PIO
-+	dev_info(dev, "Forcing PIO mode\n");
-+	host->have_dma = false;
-+#else
-+	if (IS_ERR_OR_NULL(host->dma_chan_rxtx)) {
-+		dev_err(dev, "%s: Unable to initialise DMA channel. Falling back to PIO\n",
-+			DRIVER_NAME);
-+		host->have_dma = false;
-+	} else {
-+		dev_info(dev, "DMA channel allocated");
-+
-+		cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
-+		cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
-+
-+		/* Validate the slave configurations */
-+
-+		cfg.direction = DMA_MEM_TO_DEV;
-+		cfg.src_addr = 0;
-+		cfg.dst_addr = host->bus_addr + SDHCI_BUFFER;
-+
-+		ret = dmaengine_slave_config(host->dma_chan_rxtx, &cfg);
-+
-+		if (ret == 0) {
-+			host->dma_cfg_tx = cfg;
-+
-+			cfg.direction = DMA_DEV_TO_MEM;
-+			cfg.src_addr = host->bus_addr + SDHCI_BUFFER;
-+			cfg.dst_addr = 0;
-+
-+			ret = dmaengine_slave_config(host->dma_chan_rxtx, &cfg);
-+		}
-+
-+		if (ret == 0) {
-+			host->dma_cfg_rx = cfg;
-+
-+			host->have_dma = true;
-+		} else {
-+			pr_err("%s: unable to configure DMA channel. "
-+			       "Falling back to PIO\n",
-+			       mmc_hostname(mmc));
-+			dma_release_channel(host->dma_chan_rxtx);
-+			host->dma_chan_rxtx = NULL;
-+			host->have_dma = false;
-+		}
-+	}
-+#endif
-+	mmc->max_segs = 128;
-+	if (swiotlb_max_segment())
-+		mmc->max_req_size = (1 << IO_TLB_SHIFT) * IO_TLB_SEGSIZE;
-+	else
-+		mmc->max_req_size = 524288;
-+	mmc->max_seg_size = mmc->max_req_size;
-+	mmc->max_blk_size = 512;
-+	mmc->max_blk_count =  65535;
-+
-+	/* report supported voltage ranges */
-+	mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
-+
-+	tasklet_init(&host->finish_tasklet,
-+		bcm2835_mmc_tasklet_finish, (unsigned long)host);
-+
-+	timer_setup(&host->timer, bcm2835_mmc_timeout_timer, 0);
-+	init_waitqueue_head(&host->buf_ready_int);
-+
-+	bcm2835_mmc_init(host, 0);
-+	ret = request_irq(host->irq, bcm2835_mmc_irq, IRQF_SHARED,
-+				   mmc_hostname(mmc), host);
-+	if (ret) {
-+		dev_err(dev, "Failed to request IRQ %d: %d\n", host->irq, ret);
-+		goto untasklet;
-+	}
-+
-+	ret = mmc_add_host(mmc);
-+	if (ret) {
-+		dev_err(dev, "could not add MMC host\n");
-+		goto free_irq;
-+	}
-+
-+	return 0;
-+
-+free_irq:
-+	free_irq(host->irq, host);
-+untasklet:
-+	tasklet_kill(&host->finish_tasklet);
-+
-+	return ret;
-+}
-+
-+static int bcm2835_mmc_probe(struct platform_device *pdev)
-+{
-+	struct device *dev = &pdev->dev;
-+	struct device_node *node = dev->of_node;
-+	struct clk *clk;
-+	struct resource *iomem;
-+	struct bcm2835_host *host;
-+	struct mmc_host *mmc;
-+	const __be32 *addr;
-+	int ret;
-+
-+	mmc = mmc_alloc_host(sizeof(*host), dev);
-+	if (!mmc)
-+		return -ENOMEM;
-+
-+	mmc->ops = &bcm2835_ops;
-+	host = mmc_priv(mmc);
-+	host->mmc = mmc;
-+	host->timeout = msecs_to_jiffies(1000);
-+	spin_lock_init(&host->lock);
-+
-+	iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	host->ioaddr = devm_ioremap_resource(dev, iomem);
-+	if (IS_ERR(host->ioaddr)) {
-+		ret = PTR_ERR(host->ioaddr);
-+		goto err;
-+	}
-+
-+	addr = of_get_address(node, 0, NULL, NULL);
-+	if (!addr) {
-+		dev_err(dev, "could not get DMA-register address\n");
-+		ret = -ENODEV;
-+		goto err;
-+	}
-+	host->bus_addr = be32_to_cpup(addr);
-+	pr_debug(" - ioaddr %lx, iomem->start %lx, bus_addr %lx\n",
-+		 (unsigned long)host->ioaddr,
-+		 (unsigned long)iomem->start,
-+		 (unsigned long)host->bus_addr);
-+
-+#ifndef FORCE_PIO
-+	if (node) {
-+		host->dma_chan_rxtx = dma_request_slave_channel(dev, "rx-tx");
-+		if (!host->dma_chan_rxtx)
-+			host->dma_chan_rxtx =
-+				dma_request_slave_channel(dev, "tx");
-+		if (!host->dma_chan_rxtx)
-+			host->dma_chan_rxtx =
-+				dma_request_slave_channel(dev, "rx");
-+	} else {
-+		dma_cap_mask_t mask;
-+
-+		dma_cap_zero(mask);
-+		/* we don't care about the channel, any would work */
-+		dma_cap_set(DMA_SLAVE, mask);
-+		host->dma_chan_rxtx = dma_request_channel(mask, NULL, NULL);
-+	}
-+#endif
-+	clk = devm_clk_get(dev, NULL);
-+	if (IS_ERR(clk)) {
-+		ret = PTR_ERR(clk);
-+		if (ret == -EPROBE_DEFER)
-+			dev_info(dev, "could not get clk, deferring probe\n");
-+		else
-+			dev_err(dev, "could not get clk\n");
-+		goto err;
-+	}
-+
-+	host->max_clk = clk_get_rate(clk);
-+
-+	host->irq = platform_get_irq(pdev, 0);
-+	if (host->irq <= 0) {
-+		dev_err(dev, "get IRQ failed\n");
-+		ret = -EINVAL;
-+		goto err;
-+	}
-+
-+	if (node) {
-+		mmc_of_parse(mmc);
-+
-+		/* Read any custom properties */
-+		of_property_read_u32(node,
-+				     "brcm,overclock-50",
-+				     &host->overclock_50);
-+	} else {
-+		mmc->caps |= MMC_CAP_4_BIT_DATA;
-+	}
-+
-+	ret = bcm2835_mmc_add_host(host);
-+	if (ret)
-+		goto err;
-+
-+	platform_set_drvdata(pdev, host);
-+
-+	return 0;
-+err:
-+	if (host->dma_chan_rxtx)
-+		dma_release_channel(host->dma_chan_rxtx);
-+	mmc_free_host(mmc);
-+
-+	return ret;
-+}
-+
-+static int bcm2835_mmc_remove(struct platform_device *pdev)
-+{
-+	struct bcm2835_host *host = platform_get_drvdata(pdev);
-+	unsigned long flags;
-+	int dead;
-+	u32 scratch;
-+
-+	dead = 0;
-+	scratch = bcm2835_mmc_readl(host, SDHCI_INT_STATUS);
-+	if (scratch == (u32)-1)
-+		dead = 1;
-+
-+
-+	if (dead) {
-+		spin_lock_irqsave(&host->lock, flags);
-+
-+		host->flags |= SDHCI_DEVICE_DEAD;
-+
-+		if (host->mrq) {
-+			pr_err("%s: Controller removed during "
-+				" transfer!\n", mmc_hostname(host->mmc));
-+
-+			host->mrq->cmd->error = -ENOMEDIUM;
-+			tasklet_schedule(&host->finish_tasklet);
-+		}
-+
-+		spin_unlock_irqrestore(&host->lock, flags);
-+	}
-+
-+	mmc_remove_host(host->mmc);
-+
-+	if (!dead)
-+		bcm2835_mmc_reset(host, SDHCI_RESET_ALL);
-+
-+	free_irq(host->irq, host);
-+
-+	del_timer_sync(&host->timer);
-+
-+	tasklet_kill(&host->finish_tasklet);
-+
-+	if (host->dma_chan_rxtx)
-+		dma_release_channel(host->dma_chan_rxtx);
-+
-+	mmc_free_host(host->mmc);
-+
-+	return 0;
-+}
-+
-+
-+static const struct of_device_id bcm2835_mmc_match[] = {
-+	{ .compatible = "brcm,bcm2835-mmc" },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(of, bcm2835_mmc_match);
-+
-+
-+
-+static struct platform_driver bcm2835_mmc_driver = {
-+	.probe      = bcm2835_mmc_probe,
-+	.remove     = bcm2835_mmc_remove,
-+	.driver     = {
-+		.name		= DRIVER_NAME,
-+		.owner		= THIS_MODULE,
-+		.of_match_table	= bcm2835_mmc_match,
-+	},
-+};
-+module_platform_driver(bcm2835_mmc_driver);
-+
-+module_param(mmc_debug, uint, 0644);
-+module_param(mmc_debug2, uint, 0644);
-+MODULE_ALIAS("platform:mmc-bcm2835");
-+MODULE_DESCRIPTION("BCM2835 SDHCI driver");
-+MODULE_LICENSE("GPL v2");
-+MODULE_AUTHOR("Gellert Weisz");
---- a/drivers/mmc/host/sdhci-iproc.c
-+++ b/drivers/mmc/host/sdhci-iproc.c
-@@ -197,6 +197,7 @@ static const struct sdhci_ops sdhci_ipro
- 	.write_b = sdhci_iproc_writeb,
- 	.set_clock = sdhci_set_clock,
- 	.get_max_clock = sdhci_iproc_get_max_clock,
-+	.set_power = sdhci_set_power_and_bus_voltage,
- 	.set_bus_width = sdhci_set_bus_width,
- 	.reset = sdhci_reset,
- 	.set_uhs_signaling = sdhci_set_uhs_signaling,
---- a/drivers/mmc/host/sdhci.c
-+++ b/drivers/mmc/host/sdhci.c
-@@ -40,7 +40,7 @@
- 	pr_debug("%s: " DRIVER_NAME ": " f, mmc_hostname(host->mmc), ## x)
- 
- #define SDHCI_DUMP(f, x...) \
--	pr_err("%s: " DRIVER_NAME ": " f, mmc_hostname(host->mmc), ## x)
-+	pr_debug("%s: " DRIVER_NAME ": " f, mmc_hostname(host->mmc), ## x)
- 
- #define MAX_TUNING_LOOP 40
- 
-@@ -3233,7 +3233,7 @@ static void sdhci_timeout_timer(struct t
- 	spin_lock_irqsave(&host->lock, flags);
- 
- 	if (host->cmd && !sdhci_data_line_cmd(host->cmd)) {
--		pr_err("%s: Timeout waiting for hardware cmd interrupt.\n",
-+		pr_debug("%s: Timeout waiting for hardware cmd interrupt.\n",
- 		       mmc_hostname(host->mmc));
- 		sdhci_err_stats_inc(host, REQ_TIMEOUT);
- 		sdhci_dumpregs(host);
-@@ -3256,7 +3256,7 @@ static void sdhci_timeout_data_timer(str
- 
- 	if (host->data || host->data_cmd ||
- 	    (host->cmd && sdhci_data_line_cmd(host->cmd))) {
--		pr_err("%s: Timeout waiting for hardware interrupt.\n",
-+		pr_debug("%s: Timeout waiting for hardware interrupt.\n",
- 		       mmc_hostname(host->mmc));
- 		sdhci_err_stats_inc(host, REQ_TIMEOUT);
- 		sdhci_dumpregs(host);
---- a/include/linux/mmc/card.h
-+++ b/include/linux/mmc/card.h
-@@ -297,6 +297,8 @@ struct mmc_card {
- #define MMC_QUIRK_BROKEN_SD_CACHE	(1<<15)	/* Disable broken SD cache support */
- #define MMC_QUIRK_BROKEN_CACHE_FLUSH	(1<<16)	/* Don't flush cache until the write has occurred */
- 
-+#define MMC_QUIRK_ERASE_BROKEN	(1<<31)		/* Skip erase */
-+
- 	bool			written_flag;	/* Indicates eMMC has been written since power on */
- 	bool			reenable_cmdq;	/* Re-enable Command Queue */
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0112-Adding-bcm2835-sdhost-driver-and-an-overlay-to-enabl.patch b/target/linux/bcm27xx/patches-6.1/950-0112-Adding-bcm2835-sdhost-driver-and-an-overlay-to-enabl.patch
deleted file mode 100644
index 6a9c39662f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0112-Adding-bcm2835-sdhost-driver-and-an-overlay-to-enabl.patch
+++ /dev/null
@@ -1,2502 +0,0 @@
-From 0c3db37a3b78df1459c771d559a1fb577d36f5af Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Wed, 25 Mar 2015 17:49:47 +0000
-Subject: [PATCH] Adding bcm2835-sdhost driver, and an overlay to
- enable it
-
-BCM2835 has two SD card interfaces. This driver uses the other one.
-
-bcm2835-sdhost: Error handling fix, and code clarification
-
-bcm2835-sdhost: Adding overclocking option
-
-Allow a different clock speed to be substitued for a requested 50MHz.
-This option is exposed using the "overclock_50" DT parameter.
-Note that the sdhost interface is restricted to integer divisions of
-core_freq, and the highest sensible option for a core_freq of 250MHz
-is 84 (250/3 = 83.3MHz), the next being 125 (250/2) which is much too
-high.
-
-Use at your own risk.
-
-bcm2835-sdhost: Round up the overclock, so 62 works for 62.5Mhz
-
-Also only warn once for each overclock setting.
-
-bcm2835-sdhost: Improve error handling and recovery
-
-1) Expose the hw_reset method to the MMC framework, removing many
-   internal calls by the driver.
-
-2) Reduce overclock setting on error.
-
-3) Increase timeout to cope with high capacity cards.
-
-4) Add properties and parameters to control pio_limit and debug.
-
-5) Reduce messages at probe time.
-
-bcm2835-sdhost: Further improve overclock back-off
-
-bcm2835-sdhost: Clear HBLC for PIO mode
-
-Also update pio_limit default in overlay README.
-
-bcm2835-sdhost: Add the ERASE capability
-
-See: https://github.com/raspberrypi/linux/issues/1076
-
-bcm2835-sdhost: Ignore CRC7 for MMC CMD1
-
-It seems that the sdhost interface returns CRC7 errors for CMD1,
-which is the MMC-specific SEND_OP_COND. Returning these errors to
-the MMC layer causes a downward spiral, but ignoring them seems
-to be harmless.
-
-bcm2835-mmc/sdhost: Remove ARCH_BCM2835 differences
-
-The bcm2835-mmc driver (and -sdhost driver that copied from it)
-contains code to handle SDIO interrupts in a threaded interrupt
-handler rather than waking the MMC framework thread. The change
-follows a patch from Russell King that adds the facility as the
-preferred way of working.
-
-However, the new code path is only present in ARCH_BCM2835
-builds, which I have taken to be a way of testing the waters
-rather than making the change across the board; I can't see
-any technical reason why it wouldn't be enabled for MACH_BCM270X
-builds. So this patch standardises on the ARCH_BCM2835 code,
-removing the old code paths.
-
-bcm2835-sdhost: Don't log timeout errors unless debug=1
-
-The MMC card-discovery process generates timeouts. This is
-expected behaviour, so reporting it to the user serves no purpose.
-Suppress the reporting of timeout errors unless the debug flag
-is on.
-
-bcm2835-sdhost: Add workaround for odd behaviour on some cards
-
-For reasons not understood, the sdhost driver fails when reading
-sectors very near the end of some SD cards. The problem could
-be related to the similar issue that reading the final sector
-of any card as part of a multiple read never completes, and the
-workaround is an extension of the mechanism introduced to solve
-that problem which ensures those sectors are always read singly.
-
-bcm2835-sdhost: Major revision
-
-This is a significant revision of the bcm2835-sdhost driver. It
-improves on the original in a number of ways:
-
-1) Through the use of CMD23 for reads it appears to avoid problems
-   reading some sectors on certain high speed cards.
-2) Better atomicity to prevent crashes.
-3) Higher performance.
-4) Activity logging included, for easier diagnosis in the event
-   of a problem.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-bcm2835-sdhost: Restore ATOMIC flag to PIO sg mapping
-
-Allocation problems have been seen in a wireless driver, and
-this is the only change which might have been responsible.
-
-SQUASH: bcm2835-sdhost: Only claim one DMA channel
-
-With both MMC controllers enabled there are few DMA channels left. The
-bcm2835-sdhost driver only uses DMA in one direction at a time, so it
-doesn't need to claim two channels.
-
-See: https://github.com/raspberrypi/linux/issues/1327
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-bcm2835-sdhost: Workaround for "slow" sectors
-
-Some cards have been seen to cause timeouts after certain sectors are
-read. This workaround enforces a minimum delay between the stop after
-reading one of those sectors and a subsequent data command.
-
-Using CMD23 (SET_BLOCK_COUNT) avoids this problem, so good cards will
-not be penalised by this workaround.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-bcm2835-sdhost: Firmware manages the clock divisor
-
-The bcm2835-sdhost driver hands control of the CDIV clock divisor
-register to matching firmware, allowing it to adjust to a changing
-core clock. This removes the need to use the performance governor or
-to enable io_is_busy on the on-demand governor in order to get the
-best SD performance.
-
-N.B. As SD clocks must be an integer divisor of the core clock, it is
-possible that the SD clock for "turbo" mode can be different (even
-lower) than "normal" mode.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-bcm2835-sdhost: Reset the clock in task context
-
-Since reprogramming the clock can now involve a round-trip to the
-firmware it must not be done at atomic context, and a tasklet
-is not a task.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-bcm2835-sdhost: Don't exit cmd wait loop on error
-
-The FAIL flag can be set in the CMD register before command processing
-is complete, leading to spurious "failed to complete" errors. This has
-the effect of promoting harmless CRC7 errors during CMD1 processing
-into errors that can delay and even prevent booting.
-
-Also:
-1) Convert the last KERN_ERROR message in the register dumping to
-   KERN_INFO.
-2) Remove an unnecessary reset call from  bcm2835_sdhost_add_host.
-
-See: https://github.com/raspberrypi/linux/pull/1492
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-bcm2835-sdhost: mmc_card_blockaddr fix
-
-Get the definition of mmc_card_blockaddr from drivers/mmc/core/card.h.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-bcm2835-sdhost: New timer API
-
-mmc: bcm2835-sdhost: Support underclocking
-
-Support underclocking of the SD bus in two ways:
-1. using the max-frequency DT property (which currently has no DT
-   parameter), and
-2. using the exiting sd_overclock parameter.
-
-The two methods differ slightly - in the former the MMC subsystem is
-aware of the underclocking, while in the latter it isn't - but the
-end results should be the same.
-
-See: https://github.com/raspberrypi/linux/issues/2350
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-mmc: bcm2835-sdhost: Add include
-
-highmem.h (needed for kmap_atomic) is pulled in by one of the other
-include files, but only with some CONFIG settings. Make the inclusion
-explicit to cater for cases where the CONFIG setting is absent.
-
-See: https://github.com/raspberrypi/linux/issues/2366
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-mmc/bcm2835-sdhost: Recover from MMC_SEND_EXT_CSD
-
-If the user issues an "mmc extcsd read", the SD controller receives
-what it thinks is a SEND_IF_COND command with an unexpected data block.
-The resulting operations leave the FSM stuck in READWAIT, a state which
-persists until the MMC framework resets the controller, by which point
-the root filesystem is likely to have been unmounted.
-
-A less heavyweight solution is to detect the condition and nudge the
-FSM by asserting the (self-clearing) FORCE_DATA_MODE bit.
-
-N.B. This workaround was essentially discovered by accident and without
-a full understanding the inner workings of the controller, so it is
-fortunate that the "fix" only modifies error paths.
-
-See: https://github.com/raspberrypi/linux/issues/2728
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-mmc: bcm2835-sdhost: Fix warnings on arm64
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-bcm2835-sdhost: Allow for sg entries that cross pages
-
-The dma_complete handling code calculates a virtual address for a page
-then adds an offset, but if the offset is more than a page and HIGHMEM
-is in use then the summed address could be in an unmapped (or just
-incorrect) page.
-
-The upstream SDHOST driver allows for this possibility - copy the code
-that does so.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-bcm2835-sdhost: Fix DMA channel leak on error/remove
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-mmc: bcm2835-sdhost: Support 64-bit physical addresses
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-bcm2835-sdhost: Replace obsolete struct timeval
-
-struct timeval has been retired due to the impending linux 32-bit tv_sec
-rollover (only 18 years to go) - timespec64 is the obvious replacement.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-mmc: sdhost: Pass DT pointer to rpi_firmware_get
-
-Using the rpi_firmware API as intended allows proper reference counting
-of the firmware device and means we can remove a downstream patch to
-the firmware driver.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/mmc/host/Kconfig          |   10 +
- drivers/mmc/host/Makefile         |    1 +
- drivers/mmc/host/bcm2835-sdhost.c | 2209 +++++++++++++++++++++++++++++
- 3 files changed, 2220 insertions(+)
- create mode 100644 drivers/mmc/host/bcm2835-sdhost.c
-
---- a/drivers/mmc/host/Kconfig
-+++ b/drivers/mmc/host/Kconfig
-@@ -34,6 +34,16 @@ config MMC_BCM2835_PIO_DMA_BARRIER
- 
- 	  If unsure, say 2 here.
- 
-+config MMC_BCM2835_SDHOST
-+	tristate "Support for the SDHost controller on BCM2708/9"
-+	depends on ARCH_BCM2835
-+	help
-+	  This selects the SDHost controller on BCM2835/6.
-+
-+	  If you have a controller with this interface, say Y or M here.
-+
-+	  If unsure, say N.
-+
- config MMC_DEBUG
- 	bool "MMC host drivers debugging"
- 	depends on MMC != n
---- a/drivers/mmc/host/Makefile
-+++ b/drivers/mmc/host/Makefile
-@@ -23,6 +23,7 @@ obj-$(CONFIG_MMC_SDHCI_MILBEAUT)	+= sdhc
- obj-$(CONFIG_MMC_SDHCI_SPEAR)	+= sdhci-spear.o
- obj-$(CONFIG_MMC_SDHCI_AM654)	+= sdhci_am654.o
- obj-$(CONFIG_MMC_BCM2835_MMC)	+= bcm2835-mmc.o
-+obj-$(CONFIG_MMC_BCM2835_SDHOST)	+= bcm2835-sdhost.o
- obj-$(CONFIG_MMC_WBSD)		+= wbsd.o
- obj-$(CONFIG_MMC_AU1X)		+= au1xmmc.o
- obj-$(CONFIG_MMC_ALCOR)	+= alcor.o
---- /dev/null
-+++ b/drivers/mmc/host/bcm2835-sdhost.c
-@@ -0,0 +1,2209 @@
-+/*
-+ * BCM2835 SD host driver.
-+ *
-+ * Author:      Phil Elwell <phil@raspberrypi.org>
-+ *              Copyright (C) 2015-2016 Raspberry Pi (Trading) Ltd.
-+ *
-+ * Based on
-+ *  mmc-bcm2835.c by Gellert Weisz
-+ * which is, in turn, based on
-+ *  sdhci-bcm2708.c by Broadcom
-+ *  sdhci-bcm2835.c by Stephen Warren and Oleksandr Tymoshenko
-+ *  sdhci.c and sdhci-pci.c by Pierre Ossman
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms and conditions of the GNU General Public License,
-+ * version 2, as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-+ * more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#define FIFO_READ_THRESHOLD     4
-+#define FIFO_WRITE_THRESHOLD    4
-+#define ALLOW_CMD23_READ        1
-+#define ALLOW_CMD23_WRITE       0
-+#define ENABLE_LOG              1
-+#define SDDATA_FIFO_PIO_BURST   8
-+#define CMD_DALLY_US            1
-+
-+#include <linux/delay.h>
-+#include <linux/module.h>
-+#include <linux/io.h>
-+#include <linux/mmc/mmc.h>
-+#include <linux/mmc/host.h>
-+#include <linux/mmc/sd.h>
-+#include <linux/mmc/sdio.h>
-+#include <linux/scatterlist.h>
-+#include <linux/of_address.h>
-+#include <linux/of_irq.h>
-+#include <linux/clk.h>
-+#include <linux/platform_device.h>
-+#include <linux/err.h>
-+#include <linux/blkdev.h>
-+#include <linux/dmaengine.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/of_dma.h>
-+#include <linux/time.h>
-+#include <linux/workqueue.h>
-+#include <linux/interrupt.h>
-+#include <linux/highmem.h>
-+#include <soc/bcm2835/raspberrypi-firmware.h>
-+
-+/* For mmc_card_blockaddr */
-+#include "../core/card.h"
-+
-+#define DRIVER_NAME "sdhost-bcm2835"
-+
-+#define SDCMD  0x00 /* Command to SD card              - 16 R/W */
-+#define SDARG  0x04 /* Argument to SD card             - 32 R/W */
-+#define SDTOUT 0x08 /* Start value for timeout counter - 32 R/W */
-+#define SDCDIV 0x0c /* Start value for clock divider   - 11 R/W */
-+#define SDRSP0 0x10 /* SD card response (31:0)         - 32 R   */
-+#define SDRSP1 0x14 /* SD card response (63:32)        - 32 R   */
-+#define SDRSP2 0x18 /* SD card response (95:64)        - 32 R   */
-+#define SDRSP3 0x1c /* SD card response (127:96)       - 32 R   */
-+#define SDHSTS 0x20 /* SD host status                  - 11 R   */
-+#define SDVDD  0x30 /* SD card power control           -  1 R/W */
-+#define SDEDM  0x34 /* Emergency Debug Mode            - 13 R/W */
-+#define SDHCFG 0x38 /* Host configuration              -  2 R/W */
-+#define SDHBCT 0x3c /* Host byte count (debug)         - 32 R/W */
-+#define SDDATA 0x40 /* Data to/from SD card            - 32 R/W */
-+#define SDHBLC 0x50 /* Host block count (SDIO/SDHC)    -  9 R/W */
-+
-+#define SDCMD_NEW_FLAG                  0x8000
-+#define SDCMD_FAIL_FLAG                 0x4000
-+#define SDCMD_BUSYWAIT                  0x800
-+#define SDCMD_NO_RESPONSE               0x400
-+#define SDCMD_LONG_RESPONSE             0x200
-+#define SDCMD_WRITE_CMD                 0x80
-+#define SDCMD_READ_CMD                  0x40
-+#define SDCMD_CMD_MASK                  0x3f
-+
-+#define SDCDIV_MAX_CDIV                 0x7ff
-+
-+#define SDHSTS_BUSY_IRPT                0x400
-+#define SDHSTS_BLOCK_IRPT               0x200
-+#define SDHSTS_SDIO_IRPT                0x100
-+#define SDHSTS_REW_TIME_OUT             0x80
-+#define SDHSTS_CMD_TIME_OUT             0x40
-+#define SDHSTS_CRC16_ERROR              0x20
-+#define SDHSTS_CRC7_ERROR               0x10
-+#define SDHSTS_FIFO_ERROR               0x08
-+/* Reserved */
-+/* Reserved */
-+#define SDHSTS_DATA_FLAG                0x01
-+
-+#define SDHSTS_TRANSFER_ERROR_MASK      (SDHSTS_CRC7_ERROR|SDHSTS_CRC16_ERROR|SDHSTS_REW_TIME_OUT|SDHSTS_FIFO_ERROR)
-+#define SDHSTS_ERROR_MASK               (SDHSTS_CMD_TIME_OUT|SDHSTS_TRANSFER_ERROR_MASK)
-+
-+#define SDHCFG_BUSY_IRPT_EN     (1<<10)
-+#define SDHCFG_BLOCK_IRPT_EN    (1<<8)
-+#define SDHCFG_SDIO_IRPT_EN     (1<<5)
-+#define SDHCFG_DATA_IRPT_EN     (1<<4)
-+#define SDHCFG_SLOW_CARD        (1<<3)
-+#define SDHCFG_WIDE_EXT_BUS     (1<<2)
-+#define SDHCFG_WIDE_INT_BUS     (1<<1)
-+#define SDHCFG_REL_CMD_LINE     (1<<0)
-+
-+#define SDEDM_FORCE_DATA_MODE   (1<<19)
-+#define SDEDM_CLOCK_PULSE       (1<<20)
-+#define SDEDM_BYPASS            (1<<21)
-+
-+#define SDEDM_WRITE_THRESHOLD_SHIFT 9
-+#define SDEDM_READ_THRESHOLD_SHIFT 14
-+#define SDEDM_THRESHOLD_MASK     0x1f
-+
-+#define SDEDM_FSM_MASK           0xf
-+#define SDEDM_FSM_IDENTMODE      0x0
-+#define SDEDM_FSM_DATAMODE       0x1
-+#define SDEDM_FSM_READDATA       0x2
-+#define SDEDM_FSM_WRITEDATA      0x3
-+#define SDEDM_FSM_READWAIT       0x4
-+#define SDEDM_FSM_READCRC        0x5
-+#define SDEDM_FSM_WRITECRC       0x6
-+#define SDEDM_FSM_WRITEWAIT1     0x7
-+#define SDEDM_FSM_POWERDOWN      0x8
-+#define SDEDM_FSM_POWERUP        0x9
-+#define SDEDM_FSM_WRITESTART1    0xa
-+#define SDEDM_FSM_WRITESTART2    0xb
-+#define SDEDM_FSM_GENPULSES      0xc
-+#define SDEDM_FSM_WRITEWAIT2     0xd
-+#define SDEDM_FSM_STARTPOWDOWN   0xf
-+
-+#define SDDATA_FIFO_WORDS        16
-+
-+#define USE_CMD23_FLAGS          ((ALLOW_CMD23_READ * MMC_DATA_READ) | \
-+				  (ALLOW_CMD23_WRITE * MMC_DATA_WRITE))
-+
-+#define MHZ 1000000
-+
-+
-+struct bcm2835_host {
-+	spinlock_t		lock;
-+
-+	struct rpi_firmware	*fw;
-+
-+	void __iomem		*ioaddr;
-+	phys_addr_t		bus_addr;
-+
-+	struct mmc_host		*mmc;
-+
-+	u32			pio_timeout;	/* In jiffies */
-+
-+	int			clock;		/* Current clock speed */
-+
-+	bool			slow_card;	/* Force 11-bit divisor */
-+
-+	unsigned int		max_clk;	/* Max possible freq */
-+
-+	struct tasklet_struct	finish_tasklet;	/* Tasklet structures */
-+
-+	struct work_struct	cmd_wait_wq;	/* Workqueue function */
-+
-+	struct timer_list	timer;		/* Timer for timeouts */
-+
-+	struct sg_mapping_iter	sg_miter;	/* SG state for PIO */
-+	unsigned int		blocks;		/* remaining PIO blocks */
-+
-+	int			irq;		/* Device IRQ */
-+
-+	u32			cmd_quick_poll_retries;
-+	u32			ns_per_fifo_word;
-+
-+	/* cached registers */
-+	u32			hcfg;
-+	u32			cdiv;
-+
-+	struct mmc_request		*mrq;			/* Current request */
-+	struct mmc_command		*cmd;			/* Current command */
-+	struct mmc_data			*data;			/* Current data request */
-+	unsigned int			data_complete:1;	/* Data finished before cmd */
-+
-+	unsigned int			flush_fifo:1;		/* Drain the fifo when finishing */
-+
-+	unsigned int			use_busy:1;		/* Wait for busy interrupt */
-+
-+	unsigned int			use_sbc:1;		/* Send CMD23 */
-+
-+	unsigned int			debug:1;		/* Enable debug output */
-+	unsigned int			firmware_sets_cdiv:1;	/* Let the firmware manage the clock */
-+	unsigned int			reset_clock:1;		/* Reset the clock fore the next request */
-+
-+	/*DMA part*/
-+	struct dma_chan			*dma_chan_rxtx;		/* DMA channel for reads and writes */
-+	struct dma_chan			*dma_chan;		/* Channel in use */
-+	struct dma_slave_config		dma_cfg_rx;
-+	struct dma_slave_config		dma_cfg_tx;
-+	struct dma_async_tx_descriptor	*dma_desc;
-+	u32				dma_dir;
-+	u32				drain_words;
-+	struct page 			*drain_page;
-+	u32				drain_offset;
-+
-+	bool				allow_dma;
-+	bool				use_dma;
-+	/*end of DMA part*/
-+
-+	int				max_delay;	/* maximum length of time spent waiting */
-+	struct timespec64		stop_time;	/* when the last stop was issued */
-+	u32				delay_after_stop; /* minimum time between stop and subsequent data transfer */
-+	u32				delay_after_this_stop; /* minimum time between this stop and subsequent data transfer */
-+	u32				user_overclock_50; /* User's preferred frequency to use when 50MHz is requested (in MHz) */
-+	u32				overclock_50;	/* frequency to use when 50MHz is requested (in MHz) */
-+	u32				overclock;	/* Current frequency if overclocked, else zero */
-+	u32				pio_limit;	/* Maximum block count for PIO (0 = always DMA) */
-+
-+	u32				sectors;	/* Cached card size in sectors */
-+};
-+
-+#if ENABLE_LOG
-+
-+struct log_entry_struct {
-+	char event[4];
-+	u32 timestamp;
-+	u32 param1;
-+	u32 param2;
-+};
-+
-+typedef struct log_entry_struct LOG_ENTRY_T;
-+
-+LOG_ENTRY_T *sdhost_log_buf;
-+dma_addr_t sdhost_log_addr;
-+static u32 sdhost_log_idx;
-+static spinlock_t log_lock;
-+static void __iomem *timer_base;
-+
-+#define LOG_ENTRIES (256*1)
-+#define LOG_SIZE (sizeof(LOG_ENTRY_T)*LOG_ENTRIES)
-+
-+static void log_init(struct device *dev, u32 bus_to_phys)
-+{
-+	spin_lock_init(&log_lock);
-+	sdhost_log_buf = dma_alloc_coherent(dev, LOG_SIZE, &sdhost_log_addr,
-+					     GFP_KERNEL);
-+	if (sdhost_log_buf) {
-+		pr_info("sdhost: log_buf @ %p (%llx)\n",
-+			sdhost_log_buf, (u64)sdhost_log_addr);
-+		timer_base = ioremap(bus_to_phys + 0x7e003000, SZ_4K);
-+		if (!timer_base)
-+			pr_err("sdhost: failed to remap timer\n");
-+	}
-+	else
-+		pr_err("sdhost: failed to allocate log buf\n");
-+}
-+
-+static void log_event_impl(const char *event, u32 param1, u32 param2)
-+{
-+	if (sdhost_log_buf) {
-+		LOG_ENTRY_T *entry;
-+		unsigned long flags;
-+
-+		spin_lock_irqsave(&log_lock, flags);
-+
-+		entry = sdhost_log_buf + sdhost_log_idx;
-+		memcpy(entry->event, event, 4);
-+		entry->timestamp = (readl(timer_base + 4) & 0x3fffffff) +
-+			(smp_processor_id()<<30);
-+		entry->param1 = param1;
-+		entry->param2 = param2;
-+		sdhost_log_idx = (sdhost_log_idx + 1) % LOG_ENTRIES;
-+
-+		spin_unlock_irqrestore(&log_lock, flags);
-+	}
-+}
-+
-+static void log_dump(void)
-+{
-+	if (sdhost_log_buf) {
-+		LOG_ENTRY_T *entry;
-+		unsigned long flags;
-+		int idx;
-+
-+		spin_lock_irqsave(&log_lock, flags);
-+
-+		idx = sdhost_log_idx;
-+		do {
-+			entry = sdhost_log_buf + idx;
-+			if (entry->event[0] != '\0')
-+				pr_info("[%08x] %.4s %x %x\n",
-+				       entry->timestamp,
-+				       entry->event,
-+				       entry->param1,
-+				       entry->param2);
-+			idx = (idx + 1) % LOG_ENTRIES;
-+		} while (idx != sdhost_log_idx);
-+
-+		spin_unlock_irqrestore(&log_lock, flags);
-+	}
-+}
-+
-+#define log_event(event, param1, param2) log_event_impl(event, (u32)(uintptr_t)param1, (u32)(uintptr_t)param2)
-+
-+#else
-+
-+#define log_init(x) (void)0
-+#define log_event(event, param1, param2) (void)0
-+#define log_dump() (void)0
-+
-+#endif
-+
-+static inline void bcm2835_sdhost_write(struct bcm2835_host *host, u32 val, int reg)
-+{
-+	writel(val, host->ioaddr + reg);
-+}
-+
-+static inline u32 bcm2835_sdhost_read(struct bcm2835_host *host, int reg)
-+{
-+	return readl(host->ioaddr + reg);
-+}
-+
-+static inline u32 bcm2835_sdhost_read_relaxed(struct bcm2835_host *host, int reg)
-+{
-+	return readl_relaxed(host->ioaddr + reg);
-+}
-+
-+static void bcm2835_sdhost_dumpcmd(struct bcm2835_host *host,
-+				   struct mmc_command *cmd,
-+				   const char *label)
-+{
-+	if (cmd)
-+		pr_info("%s:%c%s op %d arg 0x%x flags 0x%x - resp %08x %08x %08x %08x, err %d\n",
-+			mmc_hostname(host->mmc),
-+			(cmd == host->cmd) ? '>' : ' ',
-+			label, cmd->opcode, cmd->arg, cmd->flags,
-+			cmd->resp[0], cmd->resp[1], cmd->resp[2], cmd->resp[3],
-+			cmd->error);
-+}
-+
-+static void bcm2835_sdhost_dumpregs(struct bcm2835_host *host)
-+{
-+	if (host->mrq)
-+	{
-+		bcm2835_sdhost_dumpcmd(host, host->mrq->sbc, "sbc");
-+		bcm2835_sdhost_dumpcmd(host, host->mrq->cmd, "cmd");
-+		if (host->mrq->data)
-+			pr_info("%s: data blocks %x blksz %x - err %d\n",
-+			       mmc_hostname(host->mmc),
-+			       host->mrq->data->blocks,
-+			       host->mrq->data->blksz,
-+			       host->mrq->data->error);
-+		bcm2835_sdhost_dumpcmd(host, host->mrq->stop, "stop");
-+	}
-+
-+	pr_info("%s: =========== REGISTER DUMP ===========\n",
-+		mmc_hostname(host->mmc));
-+
-+	pr_info("%s: SDCMD  0x%08x\n",
-+		mmc_hostname(host->mmc),
-+		bcm2835_sdhost_read(host, SDCMD));
-+	pr_info("%s: SDARG  0x%08x\n",
-+		mmc_hostname(host->mmc),
-+		bcm2835_sdhost_read(host, SDARG));
-+	pr_info("%s: SDTOUT 0x%08x\n",
-+		mmc_hostname(host->mmc),
-+		bcm2835_sdhost_read(host, SDTOUT));
-+	pr_info("%s: SDCDIV 0x%08x\n",
-+		mmc_hostname(host->mmc),
-+		bcm2835_sdhost_read(host, SDCDIV));
-+	pr_info("%s: SDRSP0 0x%08x\n",
-+		mmc_hostname(host->mmc),
-+		bcm2835_sdhost_read(host, SDRSP0));
-+	pr_info("%s: SDRSP1 0x%08x\n",
-+		mmc_hostname(host->mmc),
-+		bcm2835_sdhost_read(host, SDRSP1));
-+	pr_info("%s: SDRSP2 0x%08x\n",
-+		mmc_hostname(host->mmc),
-+		bcm2835_sdhost_read(host, SDRSP2));
-+	pr_info("%s: SDRSP3 0x%08x\n",
-+		mmc_hostname(host->mmc),
-+		bcm2835_sdhost_read(host, SDRSP3));
-+	pr_info("%s: SDHSTS 0x%08x\n",
-+		mmc_hostname(host->mmc),
-+		bcm2835_sdhost_read(host, SDHSTS));
-+	pr_info("%s: SDVDD  0x%08x\n",
-+		mmc_hostname(host->mmc),
-+		bcm2835_sdhost_read(host, SDVDD));
-+	pr_info("%s: SDEDM  0x%08x\n",
-+		mmc_hostname(host->mmc),
-+		bcm2835_sdhost_read(host, SDEDM));
-+	pr_info("%s: SDHCFG 0x%08x\n",
-+		mmc_hostname(host->mmc),
-+		bcm2835_sdhost_read(host, SDHCFG));
-+	pr_info("%s: SDHBCT 0x%08x\n",
-+		mmc_hostname(host->mmc),
-+		bcm2835_sdhost_read(host, SDHBCT));
-+	pr_info("%s: SDHBLC 0x%08x\n",
-+		mmc_hostname(host->mmc),
-+		bcm2835_sdhost_read(host, SDHBLC));
-+
-+	pr_info("%s: ===========================================\n",
-+		mmc_hostname(host->mmc));
-+}
-+
-+static void bcm2835_sdhost_set_power(struct bcm2835_host *host, bool on)
-+{
-+	bcm2835_sdhost_write(host, on ? 1 : 0, SDVDD);
-+}
-+
-+static void bcm2835_sdhost_reset_internal(struct bcm2835_host *host)
-+{
-+	u32 temp;
-+
-+	if (host->debug)
-+		pr_info("%s: reset\n", mmc_hostname(host->mmc));
-+
-+	bcm2835_sdhost_set_power(host, false);
-+
-+	bcm2835_sdhost_write(host, 0, SDCMD);
-+	bcm2835_sdhost_write(host, 0, SDARG);
-+	bcm2835_sdhost_write(host, 0xf00000, SDTOUT);
-+	bcm2835_sdhost_write(host, 0, SDCDIV);
-+	bcm2835_sdhost_write(host, 0x7f8, SDHSTS); /* Write 1s to clear */
-+	bcm2835_sdhost_write(host, 0, SDHCFG);
-+	bcm2835_sdhost_write(host, 0, SDHBCT);
-+	bcm2835_sdhost_write(host, 0, SDHBLC);
-+
-+	/* Limit fifo usage due to silicon bug */
-+	temp = bcm2835_sdhost_read(host, SDEDM);
-+	temp &= ~((SDEDM_THRESHOLD_MASK<<SDEDM_READ_THRESHOLD_SHIFT) |
-+		  (SDEDM_THRESHOLD_MASK<<SDEDM_WRITE_THRESHOLD_SHIFT));
-+	temp |= (FIFO_READ_THRESHOLD << SDEDM_READ_THRESHOLD_SHIFT) |
-+		(FIFO_WRITE_THRESHOLD << SDEDM_WRITE_THRESHOLD_SHIFT);
-+	bcm2835_sdhost_write(host, temp, SDEDM);
-+	mdelay(10);
-+	bcm2835_sdhost_set_power(host, true);
-+	mdelay(10);
-+	host->clock = 0;
-+	host->sectors = 0;
-+	bcm2835_sdhost_write(host, host->hcfg, SDHCFG);
-+	bcm2835_sdhost_write(host, SDCDIV_MAX_CDIV, SDCDIV);
-+}
-+
-+#if 0 // todo fix
-+static void bcm2835_sdhost_reset(struct mmc_host *mmc)
-+{
-+	struct bcm2835_host *host = mmc_priv(mmc);
-+	unsigned long flags;
-+	spin_lock_irqsave(&host->lock, flags);
-+	log_event("RST<", 0, 0);
-+
-+	bcm2835_sdhost_reset_internal(host);
-+
-+	spin_unlock_irqrestore(&host->lock, flags);
-+}
-+#endif
-+
-+static void bcm2835_sdhost_set_ios(struct mmc_host *mmc, struct mmc_ios *ios);
-+
-+static void bcm2835_sdhost_init(struct bcm2835_host *host, int soft)
-+{
-+	pr_debug("bcm2835_sdhost_init(%d)\n", soft);
-+
-+	/* Set interrupt enables */
-+	host->hcfg = SDHCFG_BUSY_IRPT_EN;
-+
-+	bcm2835_sdhost_reset_internal(host);
-+
-+	if (soft) {
-+		/* force clock reconfiguration */
-+		host->clock = 0;
-+		bcm2835_sdhost_set_ios(host->mmc, &host->mmc->ios);
-+	}
-+}
-+
-+static void bcm2835_sdhost_wait_transfer_complete(struct bcm2835_host *host)
-+{
-+	int timediff;
-+	u32 alternate_idle;
-+	u32 edm;
-+
-+	alternate_idle = (host->mrq->data->flags & MMC_DATA_READ) ?
-+		SDEDM_FSM_READWAIT : SDEDM_FSM_WRITESTART1;
-+
-+	edm = bcm2835_sdhost_read(host, SDEDM);
-+
-+	log_event("WTC<", edm, 0);
-+
-+	timediff = 0;
-+
-+	while (1) {
-+		u32 fsm = edm & SDEDM_FSM_MASK;
-+		if ((fsm == SDEDM_FSM_IDENTMODE) ||
-+		    (fsm == SDEDM_FSM_DATAMODE))
-+			break;
-+		if (fsm == alternate_idle) {
-+			bcm2835_sdhost_write(host,
-+					     edm | SDEDM_FORCE_DATA_MODE,
-+					     SDEDM);
-+			break;
-+		}
-+
-+		timediff++;
-+		if (timediff == 100000) {
-+			pr_err("%s: wait_transfer_complete - still waiting after %d retries\n",
-+			       mmc_hostname(host->mmc),
-+			       timediff);
-+			log_dump();
-+			bcm2835_sdhost_dumpregs(host);
-+			host->mrq->data->error = -ETIMEDOUT;
-+			log_event("WTC!", edm, 0);
-+			return;
-+		}
-+		cpu_relax();
-+		edm = bcm2835_sdhost_read(host, SDEDM);
-+	}
-+	log_event("WTC>", edm, 0);
-+}
-+
-+static void bcm2835_sdhost_finish_data(struct bcm2835_host *host);
-+
-+static void bcm2835_sdhost_dma_complete(void *param)
-+{
-+	struct bcm2835_host *host = param;
-+	struct mmc_data *data = host->data;
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&host->lock, flags);
-+	log_event("DMA<", host->data, bcm2835_sdhost_read(host, SDHSTS));
-+	log_event("DMA ", bcm2835_sdhost_read(host, SDCMD),
-+		  bcm2835_sdhost_read(host, SDEDM));
-+
-+	if (host->dma_chan) {
-+		dma_unmap_sg(host->dma_chan->device->dev,
-+			     data->sg, data->sg_len,
-+			     host->dma_dir);
-+
-+		host->dma_chan = NULL;
-+	}
-+
-+	if (host->drain_words) {
-+		void *page;
-+		u32 *buf;
-+
-+		if (host->drain_offset & PAGE_MASK) {
-+			host->drain_page += host->drain_offset >> PAGE_SHIFT;
-+			host->drain_offset &= ~PAGE_MASK;
-+		}
-+
-+		page = kmap_atomic(host->drain_page);
-+		buf = page + host->drain_offset;
-+
-+		while (host->drain_words) {
-+			u32 edm = bcm2835_sdhost_read(host, SDEDM);
-+			if ((edm >> 4) & 0x1f)
-+				*(buf++) = bcm2835_sdhost_read(host,
-+							       SDDATA);
-+			host->drain_words--;
-+		}
-+
-+		kunmap_atomic(page);
-+	}
-+
-+	bcm2835_sdhost_finish_data(host);
-+
-+	log_event("DMA>", host->data, 0);
-+	spin_unlock_irqrestore(&host->lock, flags);
-+}
-+
-+static void bcm2835_sdhost_read_block_pio(struct bcm2835_host *host)
-+{
-+	unsigned long flags;
-+	size_t blksize, len;
-+	u32 *buf;
-+	unsigned long wait_max;
-+
-+	blksize = host->data->blksz;
-+
-+	wait_max = jiffies + msecs_to_jiffies(host->pio_timeout);
-+
-+	local_irq_save(flags);
-+
-+	while (blksize) {
-+		int copy_words;
-+		u32 hsts = 0;
-+
-+		if (!sg_miter_next(&host->sg_miter)) {
-+			host->data->error = -EINVAL;
-+			break;
-+		}
-+
-+		len = min(host->sg_miter.length, blksize);
-+		if (len % 4) {
-+			host->data->error = -EINVAL;
-+			break;
-+		}
-+
-+		blksize -= len;
-+		host->sg_miter.consumed = len;
-+
-+		buf = (u32 *)host->sg_miter.addr;
-+
-+		copy_words = len/4;
-+
-+		while (copy_words) {
-+			int burst_words, words;
-+			u32 edm;
-+
-+			burst_words = SDDATA_FIFO_PIO_BURST;
-+			if (burst_words > copy_words)
-+				burst_words = copy_words;
-+			edm = bcm2835_sdhost_read(host, SDEDM);
-+			words = ((edm >> 4) & 0x1f);
-+
-+			if (words < burst_words) {
-+				int fsm_state = (edm & SDEDM_FSM_MASK);
-+				if ((fsm_state != SDEDM_FSM_READDATA) &&
-+				    (fsm_state != SDEDM_FSM_READWAIT) &&
-+				    (fsm_state != SDEDM_FSM_READCRC)) {
-+					hsts = bcm2835_sdhost_read(host,
-+								   SDHSTS);
-+					pr_info("%s: fsm %x, hsts %x\n",
-+					       mmc_hostname(host->mmc),
-+					       fsm_state, hsts);
-+					if (hsts & SDHSTS_ERROR_MASK)
-+						break;
-+				}
-+
-+				if (time_after(jiffies, wait_max)) {
-+					pr_err("%s: PIO read timeout - EDM %x\n",
-+					       mmc_hostname(host->mmc),
-+					       edm);
-+					hsts = SDHSTS_REW_TIME_OUT;
-+					break;
-+				}
-+				ndelay((burst_words - words) *
-+				       host->ns_per_fifo_word);
-+				continue;
-+			} else if (words > copy_words) {
-+				words = copy_words;
-+			}
-+
-+			copy_words -= words;
-+
-+			while (words) {
-+				*(buf++) = bcm2835_sdhost_read(host, SDDATA);
-+				words--;
-+			}
-+		}
-+
-+		if (hsts & SDHSTS_ERROR_MASK)
-+			break;
-+	}
-+
-+	sg_miter_stop(&host->sg_miter);
-+
-+	local_irq_restore(flags);
-+}
-+
-+static void bcm2835_sdhost_write_block_pio(struct bcm2835_host *host)
-+{
-+	unsigned long flags;
-+	size_t blksize, len;
-+	u32 *buf;
-+	unsigned long wait_max;
-+
-+	blksize = host->data->blksz;
-+
-+	wait_max = jiffies + msecs_to_jiffies(host->pio_timeout);
-+
-+	local_irq_save(flags);
-+
-+	while (blksize) {
-+		int copy_words;
-+		u32 hsts = 0;
-+
-+		if (!sg_miter_next(&host->sg_miter)) {
-+			host->data->error = -EINVAL;
-+			break;
-+		}
-+
-+		len = min(host->sg_miter.length, blksize);
-+		if (len % 4) {
-+			host->data->error = -EINVAL;
-+			break;
-+		}
-+
-+		blksize -= len;
-+		host->sg_miter.consumed = len;
-+
-+		buf = (u32 *)host->sg_miter.addr;
-+
-+		copy_words = len/4;
-+
-+		while (copy_words) {
-+			int burst_words, words;
-+			u32 edm;
-+
-+			burst_words = SDDATA_FIFO_PIO_BURST;
-+			if (burst_words > copy_words)
-+				burst_words = copy_words;
-+			edm = bcm2835_sdhost_read(host, SDEDM);
-+			words = SDDATA_FIFO_WORDS - ((edm >> 4) & 0x1f);
-+
-+			if (words < burst_words) {
-+				int fsm_state = (edm & SDEDM_FSM_MASK);
-+				if ((fsm_state != SDEDM_FSM_WRITEDATA) &&
-+				    (fsm_state != SDEDM_FSM_WRITESTART1) &&
-+				    (fsm_state != SDEDM_FSM_WRITESTART2)) {
-+					hsts = bcm2835_sdhost_read(host,
-+								   SDHSTS);
-+					pr_info("%s: fsm %x, hsts %x\n",
-+					       mmc_hostname(host->mmc),
-+					       fsm_state, hsts);
-+					if (hsts & SDHSTS_ERROR_MASK)
-+						break;
-+				}
-+
-+				if (time_after(jiffies, wait_max)) {
-+					pr_err("%s: PIO write timeout - EDM %x\n",
-+					       mmc_hostname(host->mmc),
-+					       edm);
-+					hsts = SDHSTS_REW_TIME_OUT;
-+					break;
-+				}
-+				ndelay((burst_words - words) *
-+				       host->ns_per_fifo_word);
-+				continue;
-+			} else if (words > copy_words) {
-+				words = copy_words;
-+			}
-+
-+			copy_words -= words;
-+
-+			while (words) {
-+				bcm2835_sdhost_write(host, *(buf++), SDDATA);
-+				words--;
-+			}
-+		}
-+
-+		if (hsts & SDHSTS_ERROR_MASK)
-+			break;
-+	}
-+
-+	sg_miter_stop(&host->sg_miter);
-+
-+	local_irq_restore(flags);
-+}
-+
-+static void bcm2835_sdhost_transfer_pio(struct bcm2835_host *host)
-+{
-+	u32 sdhsts;
-+	bool is_read;
-+	BUG_ON(!host->data);
-+	log_event("XFP<", host->data, host->blocks);
-+
-+	is_read = (host->data->flags & MMC_DATA_READ) != 0;
-+	if (is_read)
-+		bcm2835_sdhost_read_block_pio(host);
-+	else
-+		bcm2835_sdhost_write_block_pio(host);
-+
-+	sdhsts = bcm2835_sdhost_read(host, SDHSTS);
-+	if (sdhsts & (SDHSTS_CRC16_ERROR |
-+		      SDHSTS_CRC7_ERROR |
-+		      SDHSTS_FIFO_ERROR)) {
-+		pr_err("%s: %s transfer error - HSTS %x\n",
-+		       mmc_hostname(host->mmc),
-+		       is_read ? "read" : "write",
-+		       sdhsts);
-+		host->data->error = -EILSEQ;
-+	} else if ((sdhsts & (SDHSTS_CMD_TIME_OUT |
-+			      SDHSTS_REW_TIME_OUT))) {
-+		pr_err("%s: %s timeout error - HSTS %x\n",
-+		       mmc_hostname(host->mmc),
-+		       is_read ? "read" : "write",
-+		       sdhsts);
-+		host->data->error = -ETIMEDOUT;
-+	}
-+	log_event("XFP>", host->data, host->blocks);
-+}
-+
-+static void bcm2835_sdhost_prepare_dma(struct bcm2835_host *host,
-+	struct mmc_data *data)
-+{
-+	int len, dir_data, dir_slave;
-+	struct dma_async_tx_descriptor *desc = NULL;
-+	struct dma_chan *dma_chan;
-+
-+	log_event("PRD<", data, 0);
-+	pr_debug("bcm2835_sdhost_prepare_dma()\n");
-+
-+	dma_chan = host->dma_chan_rxtx;
-+	if (data->flags & MMC_DATA_READ) {
-+		dir_data = DMA_FROM_DEVICE;
-+		dir_slave = DMA_DEV_TO_MEM;
-+	} else {
-+		dir_data = DMA_TO_DEVICE;
-+		dir_slave = DMA_MEM_TO_DEV;
-+	}
-+	log_event("PRD1", dma_chan, 0);
-+
-+	BUG_ON(!dma_chan->device);
-+	BUG_ON(!dma_chan->device->dev);
-+	BUG_ON(!data->sg);
-+
-+	/* The block doesn't manage the FIFO DREQs properly for multi-block
-+	   transfers, so don't attempt to DMA the final few words.
-+	   Unfortunately this requires the final sg entry to be trimmed.
-+	   N.B. This code demands that the overspill is contained in
-+	   a single sg entry.
-+	*/
-+
-+	host->drain_words = 0;
-+	if ((data->blocks > 1) && (dir_data == DMA_FROM_DEVICE)) {
-+		struct scatterlist *sg;
-+		u32 len;
-+		int i;
-+
-+		len = min((u32)(FIFO_READ_THRESHOLD - 1) * 4,
-+			  (u32)data->blocks * data->blksz);
-+
-+		for_each_sg(data->sg, sg, data->sg_len, i) {
-+			if (sg_is_last(sg)) {
-+				BUG_ON(sg->length < len);
-+				sg->length -= len;
-+				host->drain_page = sg_page(sg);
-+				host->drain_offset = sg->offset + sg->length;
-+			}
-+		}
-+		host->drain_words = len/4;
-+	}
-+
-+	/* The parameters have already been validated, so this will not fail */
-+	(void)dmaengine_slave_config(dma_chan,
-+				     (dir_data == DMA_FROM_DEVICE) ?
-+				     &host->dma_cfg_rx :
-+				     &host->dma_cfg_tx);
-+
-+	len = dma_map_sg(dma_chan->device->dev, data->sg, data->sg_len,
-+			 dir_data);
-+
-+	log_event("PRD2", len, 0);
-+	if (len > 0)
-+		desc = dmaengine_prep_slave_sg(dma_chan, data->sg,
-+					       len, dir_slave,
-+					       DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
-+	log_event("PRD3", desc, 0);
-+
-+	if (desc) {
-+		desc->callback = bcm2835_sdhost_dma_complete;
-+		desc->callback_param = host;
-+		host->dma_desc = desc;
-+		host->dma_chan = dma_chan;
-+		host->dma_dir = dir_data;
-+	}
-+	log_event("PDM>", data, 0);
-+}
-+
-+static void bcm2835_sdhost_start_dma(struct bcm2835_host *host)
-+{
-+	log_event("SDMA", host->data, host->dma_chan);
-+	dmaengine_submit(host->dma_desc);
-+	dma_async_issue_pending(host->dma_chan);
-+}
-+
-+static void bcm2835_sdhost_set_transfer_irqs(struct bcm2835_host *host)
-+{
-+	u32 all_irqs = SDHCFG_DATA_IRPT_EN | SDHCFG_BLOCK_IRPT_EN |
-+		SDHCFG_BUSY_IRPT_EN;
-+	if (host->dma_desc)
-+		host->hcfg = (host->hcfg & ~all_irqs) |
-+			SDHCFG_BUSY_IRPT_EN;
-+	else
-+		host->hcfg = (host->hcfg & ~all_irqs) |
-+			SDHCFG_DATA_IRPT_EN |
-+			SDHCFG_BUSY_IRPT_EN;
-+
-+	bcm2835_sdhost_write(host, host->hcfg, SDHCFG);
-+}
-+
-+static void bcm2835_sdhost_prepare_data(struct bcm2835_host *host, struct mmc_command *cmd)
-+{
-+	struct mmc_data *data = cmd->data;
-+
-+	WARN_ON(host->data);
-+
-+	host->data = data;
-+	if (!data)
-+		return;
-+
-+	/* Sanity checks */
-+	BUG_ON(data->blksz * data->blocks > 524288);
-+	BUG_ON(data->blksz > host->mmc->max_blk_size);
-+	BUG_ON(data->blocks > 65535);
-+
-+	host->data_complete = 0;
-+	host->flush_fifo = 0;
-+	host->data->bytes_xfered = 0;
-+
-+	if (!host->sectors && host->mmc->card) {
-+		struct mmc_card *card = host->mmc->card;
-+		if (!mmc_card_sd(card) && mmc_card_blockaddr(card)) {
-+			/*
-+			 * The EXT_CSD sector count is in number of 512 byte
-+			 * sectors.
-+			 */
-+			host->sectors = card->ext_csd.sectors;
-+		} else {
-+			/*
-+			 * The CSD capacity field is in units of read_blkbits.
-+			 * set_capacity takes units of 512 bytes.
-+			 */
-+			host->sectors = card->csd.capacity <<
-+				(card->csd.read_blkbits - 9);
-+		}
-+	}
-+
-+	if (!host->dma_desc) {
-+		/* Use PIO */
-+		int flags = SG_MITER_ATOMIC;
-+
-+		if (data->flags & MMC_DATA_READ)
-+			flags |= SG_MITER_TO_SG;
-+		else
-+			flags |= SG_MITER_FROM_SG;
-+		sg_miter_start(&host->sg_miter, data->sg, data->sg_len, flags);
-+		host->blocks = data->blocks;
-+	}
-+
-+	bcm2835_sdhost_set_transfer_irqs(host);
-+
-+	bcm2835_sdhost_write(host, data->blksz, SDHBCT);
-+	bcm2835_sdhost_write(host, data->blocks, SDHBLC);
-+
-+	BUG_ON(!host->data);
-+}
-+
-+bool bcm2835_sdhost_send_command(struct bcm2835_host *host,
-+				 struct mmc_command *cmd)
-+{
-+	u32 sdcmd, sdhsts;
-+	unsigned long timeout;
-+	int delay;
-+
-+	WARN_ON(host->cmd);
-+	log_event("CMD<", cmd->opcode, cmd->arg);
-+
-+	if (cmd->data)
-+		pr_debug("%s: send_command %d 0x%x "
-+			 "(flags 0x%x) - %s %d*%d\n",
-+			 mmc_hostname(host->mmc),
-+			 cmd->opcode, cmd->arg, cmd->flags,
-+			 (cmd->data->flags & MMC_DATA_READ) ?
-+			 "read" : "write", cmd->data->blocks,
-+			 cmd->data->blksz);
-+	else
-+		pr_debug("%s: send_command %d 0x%x (flags 0x%x)\n",
-+			 mmc_hostname(host->mmc),
-+			 cmd->opcode, cmd->arg, cmd->flags);
-+
-+	/* Wait max 100 ms */
-+	timeout = 10000;
-+
-+	while (bcm2835_sdhost_read(host, SDCMD) & SDCMD_NEW_FLAG) {
-+		if (timeout == 0) {
-+			pr_warn("%s: previous command never completed.\n",
-+				mmc_hostname(host->mmc));
-+			if (host->debug)
-+				bcm2835_sdhost_dumpregs(host);
-+			cmd->error = -EILSEQ;
-+			tasklet_schedule(&host->finish_tasklet);
-+			return false;
-+		}
-+		timeout--;
-+		udelay(10);
-+	}
-+
-+	delay = (10000 - timeout)/100;
-+	if (delay > host->max_delay) {
-+		host->max_delay = delay;
-+		pr_warn("%s: controller hung for %d ms\n",
-+			   mmc_hostname(host->mmc),
-+			   host->max_delay);
-+	}
-+
-+	timeout = jiffies;
-+	if (!cmd->data && cmd->busy_timeout > 9000)
-+		timeout += DIV_ROUND_UP(cmd->busy_timeout, 1000) * HZ + HZ;
-+	else
-+		timeout += 10 * HZ;
-+	mod_timer(&host->timer, timeout);
-+
-+	host->cmd = cmd;
-+
-+	/* Clear any error flags */
-+	sdhsts = bcm2835_sdhost_read(host, SDHSTS);
-+	if (sdhsts & SDHSTS_ERROR_MASK)
-+		bcm2835_sdhost_write(host, sdhsts, SDHSTS);
-+
-+	if ((cmd->flags & MMC_RSP_136) && (cmd->flags & MMC_RSP_BUSY)) {
-+		pr_err("%s: unsupported response type!\n",
-+			mmc_hostname(host->mmc));
-+		cmd->error = -EINVAL;
-+		tasklet_schedule(&host->finish_tasklet);
-+		return false;
-+	}
-+
-+	bcm2835_sdhost_prepare_data(host, cmd);
-+
-+	bcm2835_sdhost_write(host, cmd->arg, SDARG);
-+
-+	sdcmd = cmd->opcode & SDCMD_CMD_MASK;
-+
-+	host->use_busy = 0;
-+	if (!(cmd->flags & MMC_RSP_PRESENT)) {
-+		sdcmd |= SDCMD_NO_RESPONSE;
-+	} else {
-+		if (cmd->flags & MMC_RSP_136)
-+			sdcmd |= SDCMD_LONG_RESPONSE;
-+		if (cmd->flags & MMC_RSP_BUSY) {
-+			sdcmd |= SDCMD_BUSYWAIT;
-+			host->use_busy = 1;
-+		}
-+	}
-+
-+	if (cmd->data) {
-+		log_event("CMDD", cmd->data->blocks, cmd->data->blksz);
-+		if (host->delay_after_this_stop) {
-+			struct timespec64 now;
-+			int time_since_stop;
-+
-+			ktime_get_real_ts64(&now);
-+			time_since_stop = now.tv_sec - host->stop_time.tv_sec;
-+			if (time_since_stop < 2) {
-+				/* Possibly less than one second */
-+				time_since_stop = time_since_stop * 1000000 +
-+					(now.tv_nsec - host->stop_time.tv_nsec)/1000;
-+				if (time_since_stop <
-+				    host->delay_after_this_stop)
-+					udelay(host->delay_after_this_stop -
-+					       time_since_stop);
-+			}
-+		}
-+
-+		host->delay_after_this_stop = host->delay_after_stop;
-+		if ((cmd->data->flags & MMC_DATA_READ) && !host->use_sbc) {
-+			/* See if read crosses one of the hazardous sectors */
-+			u32 first_blk, last_blk;
-+
-+			/* Intentionally include the following sector because
-+			   without CMD23/SBC the read may run on. */
-+			first_blk = host->mrq->cmd->arg;
-+			last_blk = first_blk + cmd->data->blocks;
-+
-+			if (((last_blk >= (host->sectors - 64)) &&
-+			     (first_blk <= (host->sectors - 64))) ||
-+			    ((last_blk >= (host->sectors - 32)) &&
-+			     (first_blk <= (host->sectors - 32)))) {
-+				host->delay_after_this_stop =
-+					max(250u, host->delay_after_stop);
-+			}
-+		}
-+
-+		if (cmd->data->flags & MMC_DATA_WRITE)
-+			sdcmd |= SDCMD_WRITE_CMD;
-+		if (cmd->data->flags & MMC_DATA_READ)
-+			sdcmd |= SDCMD_READ_CMD;
-+	}
-+
-+	bcm2835_sdhost_write(host, sdcmd | SDCMD_NEW_FLAG, SDCMD);
-+
-+	return true;
-+}
-+
-+static void bcm2835_sdhost_finish_command(struct bcm2835_host *host,
-+					  unsigned long *irq_flags);
-+static void bcm2835_sdhost_transfer_complete(struct bcm2835_host *host);
-+
-+static void bcm2835_sdhost_finish_data(struct bcm2835_host *host)
-+{
-+	struct mmc_data *data;
-+
-+	data = host->data;
-+	BUG_ON(!data);
-+
-+	log_event("FDA<", host->mrq, host->cmd);
-+	pr_debug("finish_data(error %d, stop %d, sbc %d)\n",
-+	       data->error, data->stop ? 1 : 0,
-+	       host->mrq->sbc ? 1 : 0);
-+
-+	host->hcfg &= ~(SDHCFG_DATA_IRPT_EN | SDHCFG_BLOCK_IRPT_EN);
-+	bcm2835_sdhost_write(host, host->hcfg, SDHCFG);
-+
-+	data->bytes_xfered = data->error ? 0 : (data->blksz * data->blocks);
-+
-+	host->data_complete = 1;
-+
-+	if (host->cmd) {
-+		/*
-+		 * Data managed to finish before the
-+		 * command completed. Make sure we do
-+		 * things in the proper order.
-+		 */
-+		pr_debug("Finished early - HSTS %x\n",
-+			 bcm2835_sdhost_read(host, SDHSTS));
-+	}
-+	else
-+		bcm2835_sdhost_transfer_complete(host);
-+	log_event("FDA>", host->mrq, host->cmd);
-+}
-+
-+static void bcm2835_sdhost_transfer_complete(struct bcm2835_host *host)
-+{
-+	struct mmc_data *data;
-+
-+	BUG_ON(host->cmd);
-+	BUG_ON(!host->data);
-+	BUG_ON(!host->data_complete);
-+
-+	data = host->data;
-+	host->data = NULL;
-+
-+	log_event("TCM<", data, data->error);
-+	pr_debug("transfer_complete(error %d, stop %d)\n",
-+	       data->error, data->stop ? 1 : 0);
-+
-+	/*
-+	 * Need to send CMD12 if -
-+	 * a) open-ended multiblock transfer (no CMD23)
-+	 * b) error in multiblock transfer
-+	 */
-+	if (host->mrq->stop && (data->error || !host->use_sbc)) {
-+		if (bcm2835_sdhost_send_command(host, host->mrq->stop)) {
-+			/* No busy, so poll for completion */
-+			if (!host->use_busy)
-+				bcm2835_sdhost_finish_command(host, NULL);
-+
-+			if (host->delay_after_this_stop)
-+				ktime_get_real_ts64(&host->stop_time);
-+		}
-+	} else {
-+		bcm2835_sdhost_wait_transfer_complete(host);
-+		tasklet_schedule(&host->finish_tasklet);
-+	}
-+	log_event("TCM>", data, 0);
-+}
-+
-+/* If irq_flags is valid, the caller is in a thread context and is allowed
-+   to sleep */
-+static void bcm2835_sdhost_finish_command(struct bcm2835_host *host,
-+					  unsigned long *irq_flags)
-+{
-+	u32 sdcmd;
-+	u32 retries;
-+#ifdef DEBUG
-+	struct timespec64 before, after;
-+	int timediff = 0;
-+#endif
-+
-+	log_event("FCM<", host->mrq, host->cmd);
-+	pr_debug("finish_command(%x)\n", bcm2835_sdhost_read(host, SDCMD));
-+
-+	BUG_ON(!host->cmd || !host->mrq);
-+
-+	/* Poll quickly at first */
-+
-+	retries = host->cmd_quick_poll_retries;
-+	if (!retries) {
-+		/* Work out how many polls take 1us by timing 10us */
-+		struct timespec64 start, now;
-+		int us_diff;
-+
-+		retries = 1;
-+		do {
-+			int i;
-+
-+			retries *= 2;
-+
-+			ktime_get_real_ts64(&start);
-+
-+			for (i = 0; i < retries; i++) {
-+				cpu_relax();
-+				sdcmd = bcm2835_sdhost_read(host, SDCMD);
-+			}
-+
-+			ktime_get_real_ts64(&now);
-+			us_diff = (now.tv_sec - start.tv_sec) * 1000000 +
-+				(now.tv_nsec - start.tv_nsec)/1000;
-+		} while (us_diff < 10);
-+
-+		host->cmd_quick_poll_retries = ((retries * us_diff + 9)*CMD_DALLY_US)/10 + 1;
-+		retries = 1; // We've already waited long enough this time
-+	}
-+
-+	for (sdcmd = bcm2835_sdhost_read(host, SDCMD);
-+	     (sdcmd & SDCMD_NEW_FLAG) && retries;
-+	     retries--) {
-+		cpu_relax();
-+		sdcmd = bcm2835_sdhost_read(host, SDCMD);
-+	}
-+
-+	if (!retries) {
-+		unsigned long wait_max;
-+
-+		if (!irq_flags) {
-+			/* Schedule the work */
-+			log_event("CWWQ", 0, 0);
-+			schedule_work(&host->cmd_wait_wq);
-+			return;
-+		}
-+
-+		/* Wait max 100 ms */
-+		wait_max = jiffies + msecs_to_jiffies(100);
-+		while (time_before(jiffies, wait_max)) {
-+			spin_unlock_irqrestore(&host->lock, *irq_flags);
-+			usleep_range(1, 10);
-+			spin_lock_irqsave(&host->lock, *irq_flags);
-+			sdcmd = bcm2835_sdhost_read(host, SDCMD);
-+			if (!(sdcmd & SDCMD_NEW_FLAG))
-+				break;
-+		}
-+	}
-+
-+	/* Check for errors */
-+	if (sdcmd & SDCMD_NEW_FLAG) {
-+		if (host->debug) {
-+			pr_err("%s: command %d never completed.\n",
-+			       mmc_hostname(host->mmc), host->cmd->opcode);
-+			bcm2835_sdhost_dumpregs(host);
-+		}
-+		host->cmd->error = -EILSEQ;
-+		tasklet_schedule(&host->finish_tasklet);
-+		return;
-+	} else if (sdcmd & SDCMD_FAIL_FLAG) {
-+		u32 sdhsts = bcm2835_sdhost_read(host, SDHSTS);
-+
-+		/* Clear the errors */
-+		bcm2835_sdhost_write(host, SDHSTS_ERROR_MASK, SDHSTS);
-+
-+		if (host->debug)
-+			pr_info("%s: error detected - CMD %x, HSTS %03x, EDM %x\n",
-+				mmc_hostname(host->mmc), sdcmd, sdhsts,
-+				bcm2835_sdhost_read(host, SDEDM));
-+
-+		if ((sdhsts & SDHSTS_CRC7_ERROR) &&
-+		    (host->cmd->opcode == 1)) {
-+			if (host->debug)
-+				pr_info("%s: ignoring CRC7 error for CMD1\n",
-+					mmc_hostname(host->mmc));
-+		} else {
-+			u32 edm, fsm;
-+
-+			if (sdhsts & SDHSTS_CMD_TIME_OUT) {
-+				if (host->debug)
-+					pr_warn("%s: command %d timeout\n",
-+					       mmc_hostname(host->mmc),
-+					       host->cmd->opcode);
-+				host->cmd->error = -ETIMEDOUT;
-+			} else {
-+				pr_warn("%s: unexpected command %d error\n",
-+				       mmc_hostname(host->mmc),
-+				       host->cmd->opcode);
-+				host->cmd->error = -EILSEQ;
-+			}
-+
-+			edm = readl(host->ioaddr + SDEDM);
-+			fsm = edm & SDEDM_FSM_MASK;
-+			if (fsm == SDEDM_FSM_READWAIT ||
-+			    fsm == SDEDM_FSM_WRITESTART1)
-+				writel(edm | SDEDM_FORCE_DATA_MODE,
-+				       host->ioaddr + SDEDM);
-+			tasklet_schedule(&host->finish_tasklet);
-+			return;
-+		}
-+	}
-+
-+	if (host->cmd->flags & MMC_RSP_PRESENT) {
-+		if (host->cmd->flags & MMC_RSP_136) {
-+			int i;
-+			for (i = 0; i < 4; i++)
-+				host->cmd->resp[3 - i] = bcm2835_sdhost_read(host, SDRSP0 + i*4);
-+			pr_debug("%s: finish_command %08x %08x %08x %08x\n",
-+				 mmc_hostname(host->mmc),
-+				 host->cmd->resp[0], host->cmd->resp[1], host->cmd->resp[2], host->cmd->resp[3]);
-+			log_event("RSP ", host->cmd->resp[0], host->cmd->resp[1]);
-+		} else {
-+			host->cmd->resp[0] = bcm2835_sdhost_read(host, SDRSP0);
-+			pr_debug("%s: finish_command %08x\n",
-+				 mmc_hostname(host->mmc),
-+				 host->cmd->resp[0]);
-+			log_event("RSP ", host->cmd->resp[0], 0);
-+		}
-+	}
-+
-+	if (host->cmd == host->mrq->sbc) {
-+		/* Finished CMD23, now send actual command. */
-+		host->cmd = NULL;
-+		if (bcm2835_sdhost_send_command(host, host->mrq->cmd)) {
-+			if (host->data && host->dma_desc)
-+				/* DMA transfer starts now, PIO starts after irq */
-+				bcm2835_sdhost_start_dma(host);
-+
-+			if (!host->use_busy)
-+				bcm2835_sdhost_finish_command(host, NULL);
-+		}
-+	} else if (host->cmd == host->mrq->stop) {
-+		/* Finished CMD12 */
-+		tasklet_schedule(&host->finish_tasklet);
-+	} else {
-+		/* Processed actual command. */
-+		host->cmd = NULL;
-+		if (!host->data)
-+			tasklet_schedule(&host->finish_tasklet);
-+		else if (host->data_complete)
-+			bcm2835_sdhost_transfer_complete(host);
-+	}
-+	log_event("FCM>", host->mrq, host->cmd);
-+}
-+
-+static void bcm2835_sdhost_timeout(struct timer_list *t)
-+{
-+	struct bcm2835_host *host = from_timer(host, t, timer);
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&host->lock, flags);
-+	log_event("TIM<", 0, 0);
-+
-+	if (host->mrq) {
-+		pr_err("%s: timeout waiting for hardware interrupt.\n",
-+			mmc_hostname(host->mmc));
-+		log_dump();
-+		bcm2835_sdhost_dumpregs(host);
-+
-+		if (host->data) {
-+			host->data->error = -ETIMEDOUT;
-+			bcm2835_sdhost_finish_data(host);
-+		} else {
-+			if (host->cmd)
-+				host->cmd->error = -ETIMEDOUT;
-+			else
-+				host->mrq->cmd->error = -ETIMEDOUT;
-+
-+			pr_debug("timeout_timer tasklet_schedule\n");
-+			tasklet_schedule(&host->finish_tasklet);
-+		}
-+	}
-+
-+	spin_unlock_irqrestore(&host->lock, flags);
-+}
-+
-+static void bcm2835_sdhost_busy_irq(struct bcm2835_host *host, u32 intmask)
-+{
-+	log_event("IRQB", host->cmd, intmask);
-+	if (!host->cmd) {
-+		pr_err("%s: got command busy interrupt 0x%08x even "
-+			"though no command operation was in progress.\n",
-+			mmc_hostname(host->mmc), (unsigned)intmask);
-+		bcm2835_sdhost_dumpregs(host);
-+		return;
-+	}
-+
-+	if (!host->use_busy) {
-+		pr_err("%s: got command busy interrupt 0x%08x even "
-+			"though not expecting one.\n",
-+			mmc_hostname(host->mmc), (unsigned)intmask);
-+		bcm2835_sdhost_dumpregs(host);
-+		return;
-+	}
-+	host->use_busy = 0;
-+
-+	if (intmask & SDHSTS_ERROR_MASK)
-+	{
-+		pr_err("sdhost_busy_irq: intmask %x, data %p\n", intmask, host->mrq->data);
-+		if (intmask & SDHSTS_CRC7_ERROR)
-+			host->cmd->error = -EILSEQ;
-+		else if (intmask & (SDHSTS_CRC16_ERROR |
-+				    SDHSTS_FIFO_ERROR)) {
-+			if (host->mrq->data)
-+				host->mrq->data->error = -EILSEQ;
-+			else
-+				host->cmd->error = -EILSEQ;
-+		} else if (intmask & SDHSTS_REW_TIME_OUT) {
-+			if (host->mrq->data)
-+				host->mrq->data->error = -ETIMEDOUT;
-+			else
-+				host->cmd->error = -ETIMEDOUT;
-+		} else if (intmask & SDHSTS_CMD_TIME_OUT)
-+			host->cmd->error = -ETIMEDOUT;
-+
-+		if (host->debug) {
-+			log_dump();
-+			bcm2835_sdhost_dumpregs(host);
-+		}
-+	}
-+	else
-+		bcm2835_sdhost_finish_command(host, NULL);
-+}
-+
-+static void bcm2835_sdhost_data_irq(struct bcm2835_host *host, u32 intmask)
-+{
-+	/* There are no dedicated data/space available interrupt
-+	   status bits, so it is necessary to use the single shared
-+	   data/space available FIFO status bits. It is therefore not
-+	   an error to get here when there is no data transfer in
-+	   progress. */
-+	log_event("IRQD", host->data, intmask);
-+	if (!host->data)
-+		return;
-+
-+	if (intmask & (SDHSTS_CRC16_ERROR |
-+		       SDHSTS_FIFO_ERROR |
-+		       SDHSTS_REW_TIME_OUT)) {
-+		if (intmask & (SDHSTS_CRC16_ERROR |
-+			       SDHSTS_FIFO_ERROR))
-+			host->data->error = -EILSEQ;
-+		else
-+			host->data->error = -ETIMEDOUT;
-+
-+		if (host->debug) {
-+			log_dump();
-+			bcm2835_sdhost_dumpregs(host);
-+		}
-+	}
-+
-+	if (host->data->error) {
-+		bcm2835_sdhost_finish_data(host);
-+	} else if (host->data->flags & MMC_DATA_WRITE) {
-+		/* Use the block interrupt for writes after the first block */
-+		host->hcfg &= ~(SDHCFG_DATA_IRPT_EN);
-+		host->hcfg |= SDHCFG_BLOCK_IRPT_EN;
-+		bcm2835_sdhost_write(host, host->hcfg, SDHCFG);
-+		bcm2835_sdhost_transfer_pio(host);
-+	} else {
-+		bcm2835_sdhost_transfer_pio(host);
-+		host->blocks--;
-+		if ((host->blocks == 0) || host->data->error)
-+			bcm2835_sdhost_finish_data(host);
-+	}
-+}
-+
-+static void bcm2835_sdhost_block_irq(struct bcm2835_host *host, u32 intmask)
-+{
-+	log_event("IRQK", host->data, intmask);
-+	if (!host->data) {
-+		pr_err("%s: got block interrupt 0x%08x even "
-+			"though no data operation was in progress.\n",
-+			mmc_hostname(host->mmc), (unsigned)intmask);
-+		bcm2835_sdhost_dumpregs(host);
-+		return;
-+	}
-+
-+	if (intmask & (SDHSTS_CRC16_ERROR |
-+		       SDHSTS_FIFO_ERROR |
-+		       SDHSTS_REW_TIME_OUT)) {
-+		if (intmask & (SDHSTS_CRC16_ERROR |
-+			       SDHSTS_FIFO_ERROR))
-+			host->data->error = -EILSEQ;
-+		else
-+			host->data->error = -ETIMEDOUT;
-+
-+		if (host->debug) {
-+			log_dump();
-+			bcm2835_sdhost_dumpregs(host);
-+		}
-+	}
-+
-+	if (!host->dma_desc) {
-+		BUG_ON(!host->blocks);
-+		if (host->data->error || (--host->blocks == 0)) {
-+			bcm2835_sdhost_finish_data(host);
-+		} else {
-+			bcm2835_sdhost_transfer_pio(host);
-+		}
-+	} else if (host->data->flags & MMC_DATA_WRITE) {
-+		bcm2835_sdhost_finish_data(host);
-+	}
-+}
-+
-+static irqreturn_t bcm2835_sdhost_irq(int irq, void *dev_id)
-+{
-+	irqreturn_t result = IRQ_NONE;
-+	struct bcm2835_host *host = dev_id;
-+	u32 intmask;
-+
-+	spin_lock(&host->lock);
-+
-+	intmask = bcm2835_sdhost_read(host, SDHSTS);
-+	log_event("IRQ<", intmask, 0);
-+
-+	bcm2835_sdhost_write(host,
-+			     SDHSTS_BUSY_IRPT |
-+			     SDHSTS_BLOCK_IRPT |
-+			     SDHSTS_SDIO_IRPT |
-+			     SDHSTS_DATA_FLAG,
-+			     SDHSTS);
-+
-+	if (intmask & SDHSTS_BLOCK_IRPT) {
-+		bcm2835_sdhost_block_irq(host, intmask);
-+		result = IRQ_HANDLED;
-+	}
-+
-+	if (intmask & SDHSTS_BUSY_IRPT) {
-+		bcm2835_sdhost_busy_irq(host, intmask);
-+		result = IRQ_HANDLED;
-+	}
-+
-+	/* There is no true data interrupt status bit, so it is
-+	   necessary to qualify the data flag with the interrupt
-+	   enable bit */
-+	if ((intmask & SDHSTS_DATA_FLAG) &&
-+	    (host->hcfg & SDHCFG_DATA_IRPT_EN)) {
-+		bcm2835_sdhost_data_irq(host, intmask);
-+		result = IRQ_HANDLED;
-+	}
-+
-+	log_event("IRQ>", bcm2835_sdhost_read(host, SDHSTS), 0);
-+	spin_unlock(&host->lock);
-+
-+	return result;
-+}
-+
-+void bcm2835_sdhost_set_clock(struct bcm2835_host *host, unsigned int clock)
-+{
-+	int div = 0; /* Initialized for compiler warning */
-+	unsigned int input_clock = clock;
-+	unsigned long flags;
-+
-+	if (host->debug)
-+		pr_info("%s: set_clock(%d)\n", mmc_hostname(host->mmc), clock);
-+
-+	if (host->overclock_50 && (clock == 50*MHZ))
-+		clock = host->overclock_50 * MHZ + (MHZ - 1);
-+
-+	/* The SDCDIV register has 11 bits, and holds (div - 2).
-+	   But in data mode the max is 50MHz wihout a minimum, and only the
-+	   bottom 3 bits are used. Since the switch over is automatic (unless
-+	   we have marked the card as slow...), chosen values have to make
-+	   sense in both modes.
-+	   Ident mode must be 100-400KHz, so can range check the requested
-+	   clock. CMD15 must be used to return to data mode, so this can be
-+	   monitored.
-+
-+	   clock 250MHz -> 0->125MHz, 1->83.3MHz, 2->62.5MHz, 3->50.0MHz
-+                           4->41.7MHz, 5->35.7MHz, 6->31.3MHz, 7->27.8MHz
-+
-+			 623->400KHz/27.8MHz
-+			 reset value (507)->491159/50MHz
-+
-+	   BUT, the 3-bit clock divisor in data mode is too small if the
-+	   core clock is higher than 250MHz, so instead use the SLOW_CARD
-+	   configuration bit to force the use of the ident clock divisor
-+	   at all times.
-+	*/
-+
-+	host->mmc->actual_clock = 0;
-+
-+	if (host->firmware_sets_cdiv) {
-+		u32 msg[3] = { clock, 0, 0 };
-+
-+		rpi_firmware_property(host->fw,
-+				      RPI_FIRMWARE_SET_SDHOST_CLOCK,
-+				      &msg, sizeof(msg));
-+
-+		clock = max(msg[1], msg[2]);
-+		spin_lock_irqsave(&host->lock, flags);
-+	} else {
-+		spin_lock_irqsave(&host->lock, flags);
-+		if (clock < 100000) {
-+			/* Can't stop the clock, but make it as slow as
-+			 * possible to show willing
-+			 */
-+			host->cdiv = SDCDIV_MAX_CDIV;
-+			bcm2835_sdhost_write(host, host->cdiv, SDCDIV);
-+			spin_unlock_irqrestore(&host->lock, flags);
-+			return;
-+		}
-+
-+		div = host->max_clk / clock;
-+		if (div < 2)
-+			div = 2;
-+		if ((host->max_clk / div) > clock)
-+			div++;
-+		div -= 2;
-+
-+		if (div > SDCDIV_MAX_CDIV)
-+			div = SDCDIV_MAX_CDIV;
-+
-+		clock = host->max_clk / (div + 2);
-+
-+		host->cdiv = div;
-+		bcm2835_sdhost_write(host, host->cdiv, SDCDIV);
-+
-+		if (host->debug)
-+			pr_info("%s: clock=%d -> max_clk=%d, cdiv=%x "
-+				"(actual clock %d)\n",
-+				mmc_hostname(host->mmc), input_clock,
-+				host->max_clk, host->cdiv,
-+				clock);
-+	}
-+
-+	/* Calibrate some delays */
-+
-+	host->ns_per_fifo_word = (1000000000/clock) *
-+		((host->mmc->caps & MMC_CAP_4_BIT_DATA) ? 8 : 32);
-+
-+	if (input_clock == 50 * MHZ) {
-+		if (clock > input_clock) {
-+			/* Save the closest value, to make it easier
-+			   to reduce in the event of error */
-+			host->overclock_50 = (clock/MHZ);
-+
-+			if (clock != host->overclock) {
-+				pr_info("%s: overclocking to %dHz\n",
-+					mmc_hostname(host->mmc), clock);
-+				host->overclock = clock;
-+			}
-+		} else if (host->overclock) {
-+			host->overclock = 0;
-+			if (clock == 50 * MHZ)
-+				pr_warn("%s: cancelling overclock\n",
-+					mmc_hostname(host->mmc));
-+		}
-+	} else if (input_clock == 0) {
-+		/* Reset the preferred overclock when the clock is stopped.
-+		 * This always happens during initialisation. */
-+		host->overclock_50 = host->user_overclock_50;
-+		host->overclock = 0;
-+	}
-+
-+	/* Set the timeout to 500ms */
-+	bcm2835_sdhost_write(host, clock/2, SDTOUT);
-+
-+	host->mmc->actual_clock = clock;
-+	host->clock = input_clock;
-+	host->reset_clock = 0;
-+
-+	spin_unlock_irqrestore(&host->lock, flags);
-+}
-+
-+static void bcm2835_sdhost_request(struct mmc_host *mmc, struct mmc_request *mrq)
-+{
-+	struct bcm2835_host *host;
-+	unsigned long flags;
-+	u32 edm, fsm;
-+
-+	host = mmc_priv(mmc);
-+
-+	if (host->debug) {
-+		struct mmc_command *cmd = mrq->cmd;
-+		BUG_ON(!cmd);
-+		if (cmd->data)
-+			pr_info("%s: cmd %d 0x%x (flags 0x%x) - %s %d*%d\n",
-+				mmc_hostname(mmc),
-+				cmd->opcode, cmd->arg, cmd->flags,
-+				(cmd->data->flags & MMC_DATA_READ) ?
-+				"read" : "write", cmd->data->blocks,
-+				cmd->data->blksz);
-+		else
-+			pr_info("%s: cmd %d 0x%x (flags 0x%x)\n",
-+				mmc_hostname(mmc),
-+				cmd->opcode, cmd->arg, cmd->flags);
-+	}
-+
-+	/* Reset the error statuses in case this is a retry */
-+	if (mrq->sbc)
-+		mrq->sbc->error = 0;
-+	if (mrq->cmd)
-+		mrq->cmd->error = 0;
-+	if (mrq->data)
-+		mrq->data->error = 0;
-+	if (mrq->stop)
-+		mrq->stop->error = 0;
-+
-+	if (mrq->data && !is_power_of_2(mrq->data->blksz)) {
-+		pr_err("%s: unsupported block size (%d bytes)\n",
-+		       mmc_hostname(mmc), mrq->data->blksz);
-+		mrq->cmd->error = -EINVAL;
-+		mmc_request_done(mmc, mrq);
-+		return;
-+	}
-+
-+	if (host->use_dma && mrq->data &&
-+	    (mrq->data->blocks > host->pio_limit))
-+		bcm2835_sdhost_prepare_dma(host, mrq->data);
-+
-+	if (host->reset_clock)
-+	    bcm2835_sdhost_set_clock(host, host->clock);
-+
-+	spin_lock_irqsave(&host->lock, flags);
-+
-+	WARN_ON(host->mrq != NULL);
-+	host->mrq = mrq;
-+
-+	edm = bcm2835_sdhost_read(host, SDEDM);
-+	fsm = edm & SDEDM_FSM_MASK;
-+
-+	log_event("REQ<", mrq, edm);
-+	if ((fsm != SDEDM_FSM_IDENTMODE) &&
-+	    (fsm != SDEDM_FSM_DATAMODE)) {
-+		log_event("REQ!", mrq, edm);
-+		if (host->debug) {
-+			pr_warn("%s: previous command (%d) not complete (EDM %x)\n",
-+			       mmc_hostname(host->mmc),
-+			       bcm2835_sdhost_read(host, SDCMD) & SDCMD_CMD_MASK,
-+			       edm);
-+			log_dump();
-+			bcm2835_sdhost_dumpregs(host);
-+		}
-+		mrq->cmd->error = -EILSEQ;
-+		tasklet_schedule(&host->finish_tasklet);
-+		spin_unlock_irqrestore(&host->lock, flags);
-+		return;
-+	}
-+
-+	host->use_sbc = !!mrq->sbc &&
-+		(host->mrq->data->flags & USE_CMD23_FLAGS);
-+	if (host->use_sbc) {
-+		if (bcm2835_sdhost_send_command(host, mrq->sbc)) {
-+			if (!host->use_busy)
-+				bcm2835_sdhost_finish_command(host, &flags);
-+		}
-+	} else if (bcm2835_sdhost_send_command(host, mrq->cmd)) {
-+		if (host->data && host->dma_desc)
-+			/* DMA transfer starts now, PIO starts after irq */
-+			bcm2835_sdhost_start_dma(host);
-+
-+		if (!host->use_busy)
-+			bcm2835_sdhost_finish_command(host, &flags);
-+	}
-+
-+	log_event("CMD ", mrq->cmd->opcode,
-+		   mrq->data ? (u32)mrq->data->blksz : 0);
-+
-+	log_event("REQ>", mrq, 0);
-+	spin_unlock_irqrestore(&host->lock, flags);
-+}
-+
-+static void bcm2835_sdhost_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-+{
-+
-+	struct bcm2835_host *host = mmc_priv(mmc);
-+	unsigned long flags;
-+
-+	if (host->debug)
-+		pr_info("%s: ios clock %d, pwr %d, bus_width %d, "
-+			"timing %d, vdd %d, drv_type %d\n",
-+			mmc_hostname(mmc),
-+			ios->clock, ios->power_mode, ios->bus_width,
-+			ios->timing, ios->signal_voltage, ios->drv_type);
-+
-+	spin_lock_irqsave(&host->lock, flags);
-+
-+	log_event("IOS<", ios->clock, 0);
-+
-+	/* set bus width */
-+	host->hcfg &= ~SDHCFG_WIDE_EXT_BUS;
-+	if (ios->bus_width == MMC_BUS_WIDTH_4)
-+		host->hcfg |= SDHCFG_WIDE_EXT_BUS;
-+
-+	host->hcfg |= SDHCFG_WIDE_INT_BUS;
-+
-+	/* Disable clever clock switching, to cope with fast core clocks */
-+	host->hcfg |= SDHCFG_SLOW_CARD;
-+
-+	bcm2835_sdhost_write(host, host->hcfg, SDHCFG);
-+
-+	spin_unlock_irqrestore(&host->lock, flags);
-+
-+	if (!ios->clock || ios->clock != host->clock)
-+		bcm2835_sdhost_set_clock(host, ios->clock);
-+}
-+
-+static struct mmc_host_ops bcm2835_sdhost_ops = {
-+	.request = bcm2835_sdhost_request,
-+	.set_ios = bcm2835_sdhost_set_ios,
-+// todo:fix	.hw_reset = bcm2835_sdhost_reset,
-+};
-+
-+static void bcm2835_sdhost_cmd_wait_work(struct work_struct *work)
-+{
-+	struct bcm2835_host *host;
-+	unsigned long flags;
-+
-+	host = container_of(work, struct bcm2835_host, cmd_wait_wq);
-+
-+	spin_lock_irqsave(&host->lock, flags);
-+
-+	log_event("CWK<", host->cmd, host->mrq);
-+
-+	/*
-+	 * If this tasklet gets rescheduled while running, it will
-+	 * be run again afterwards but without any active request.
-+	 */
-+	if (!host->mrq) {
-+		spin_unlock_irqrestore(&host->lock, flags);
-+		return;
-+	}
-+
-+	bcm2835_sdhost_finish_command(host, &flags);
-+
-+	log_event("CWK>", host->cmd, 0);
-+
-+	spin_unlock_irqrestore(&host->lock, flags);
-+}
-+
-+static void bcm2835_sdhost_tasklet_finish(unsigned long param)
-+{
-+	struct bcm2835_host *host;
-+	unsigned long flags;
-+	struct mmc_request *mrq;
-+	struct dma_chan *terminate_chan = NULL;
-+
-+	host = (struct bcm2835_host *)param;
-+
-+	spin_lock_irqsave(&host->lock, flags);
-+
-+	log_event("TSK<", host->mrq, 0);
-+	/*
-+	 * If this tasklet gets rescheduled while running, it will
-+	 * be run again afterwards but without any active request.
-+	 */
-+	if (!host->mrq) {
-+		spin_unlock_irqrestore(&host->lock, flags);
-+		return;
-+	}
-+
-+	del_timer(&host->timer);
-+
-+	mrq = host->mrq;
-+
-+	/* Drop the overclock after any data corruption, or after any
-+	 * error while overclocked. Ignore errors for status commands,
-+	 * as they are likely when a card is ejected. */
-+	if (host->overclock) {
-+		if ((mrq->cmd && mrq->cmd->error &&
-+		     (mrq->cmd->opcode != MMC_SEND_STATUS)) ||
-+		    (mrq->data && mrq->data->error) ||
-+		    (mrq->stop && mrq->stop->error) ||
-+		    (mrq->sbc && mrq->sbc->error)) {
-+			host->overclock_50--;
-+			pr_warn("%s: reducing overclock due to errors\n",
-+				mmc_hostname(host->mmc));
-+			host->reset_clock = 1;
-+			mrq->cmd->error = -ETIMEDOUT;
-+			mrq->cmd->retries = 1;
-+		}
-+	}
-+
-+	host->mrq = NULL;
-+	host->cmd = NULL;
-+	host->data = NULL;
-+
-+	host->dma_desc = NULL;
-+	terminate_chan = host->dma_chan;
-+	host->dma_chan = NULL;
-+
-+	spin_unlock_irqrestore(&host->lock, flags);
-+
-+	if (terminate_chan)
-+	{
-+		int err = dmaengine_terminate_all(terminate_chan);
-+		if (err)
-+			pr_err("%s: failed to terminate DMA (%d)\n",
-+			       mmc_hostname(host->mmc), err);
-+	}
-+
-+	/* The SDHOST block doesn't report any errors for a disconnected
-+	   interface. All cards and SDIO devices should report some supported
-+	   voltage range, so a zero response to SEND_OP_COND, IO_SEND_OP_COND
-+	   or APP_SEND_OP_COND can be treated as an error. */
-+	if (((mrq->cmd->opcode == MMC_SEND_OP_COND) ||
-+	     (mrq->cmd->opcode == SD_IO_SEND_OP_COND) ||
-+	     (mrq->cmd->opcode == SD_APP_OP_COND)) &&
-+	    (mrq->cmd->error == 0) &&
-+	    (mrq->cmd->resp[0] == 0)) {
-+		mrq->cmd->error = -ETIMEDOUT;
-+		if (host->debug)
-+			pr_info("%s: faking timeout due to zero OCR\n",
-+				mmc_hostname(host->mmc));
-+	}
-+
-+	mmc_request_done(host->mmc, mrq);
-+	log_event("TSK>", mrq, 0);
-+}
-+
-+int bcm2835_sdhost_add_host(struct bcm2835_host *host)
-+{
-+	struct mmc_host *mmc;
-+	struct dma_slave_config cfg;
-+	char pio_limit_string[20];
-+	int ret;
-+
-+	mmc = host->mmc;
-+
-+	if (!mmc->f_max || mmc->f_max > host->max_clk)
-+		mmc->f_max = host->max_clk;
-+	mmc->f_min = host->max_clk / SDCDIV_MAX_CDIV;
-+
-+	mmc->max_busy_timeout =  (~(unsigned int)0)/(mmc->f_max/1000);
-+
-+	pr_debug("f_max %d, f_min %d, max_busy_timeout %d\n",
-+		 mmc->f_max, mmc->f_min, mmc->max_busy_timeout);
-+
-+	/* host controller capabilities */
-+	mmc->caps |=
-+		MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED |
-+		MMC_CAP_NEEDS_POLL | MMC_CAP_HW_RESET |
-+		((ALLOW_CMD23_READ|ALLOW_CMD23_WRITE) * MMC_CAP_CMD23);
-+
-+	spin_lock_init(&host->lock);
-+
-+	if (host->allow_dma) {
-+		if (IS_ERR_OR_NULL(host->dma_chan_rxtx)) {
-+			pr_err("%s: unable to initialise DMA channel. "
-+			       "Falling back to PIO\n",
-+			       mmc_hostname(mmc));
-+			host->use_dma = false;
-+		} else {
-+			cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
-+			cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
-+
-+			/* Validate the slave configurations */
-+
-+			cfg.direction = DMA_MEM_TO_DEV;
-+			cfg.src_addr = 0;
-+			cfg.dst_addr = host->bus_addr + SDDATA;
-+
-+			ret = dmaengine_slave_config(host->dma_chan_rxtx, &cfg);
-+
-+			if (ret == 0) {
-+				host->dma_cfg_tx = cfg;
-+
-+				cfg.direction = DMA_DEV_TO_MEM;
-+				cfg.src_addr = host->bus_addr + SDDATA;
-+				cfg.dst_addr = 0;
-+
-+				ret = dmaengine_slave_config(host->dma_chan_rxtx, &cfg);
-+			}
-+
-+			if (ret == 0) {
-+				host->dma_cfg_rx = cfg;
-+
-+				host->use_dma = true;
-+			} else {
-+				pr_err("%s: unable to configure DMA channel. "
-+				       "Falling back to PIO\n",
-+				       mmc_hostname(mmc));
-+				dma_release_channel(host->dma_chan_rxtx);
-+				host->dma_chan_rxtx = NULL;
-+				host->use_dma = false;
-+			}
-+		}
-+	} else {
-+		host->use_dma = false;
-+	}
-+
-+	mmc->max_segs = 128;
-+	mmc->max_req_size = 524288;
-+	mmc->max_seg_size = mmc->max_req_size;
-+	mmc->max_blk_size = 512;
-+	mmc->max_blk_count =  65535;
-+
-+	/* report supported voltage ranges */
-+	mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
-+
-+	tasklet_init(&host->finish_tasklet,
-+		bcm2835_sdhost_tasklet_finish, (unsigned long)host);
-+
-+	INIT_WORK(&host->cmd_wait_wq, bcm2835_sdhost_cmd_wait_work);
-+
-+	timer_setup(&host->timer, bcm2835_sdhost_timeout, 0);
-+
-+	bcm2835_sdhost_init(host, 0);
-+
-+	ret = request_irq(host->irq, bcm2835_sdhost_irq, 0 /*IRQF_SHARED*/,
-+				  mmc_hostname(mmc), host);
-+	if (ret) {
-+		pr_err("%s: failed to request IRQ %d: %d\n",
-+		       mmc_hostname(mmc), host->irq, ret);
-+		goto untasklet;
-+	}
-+
-+	mmc_add_host(mmc);
-+
-+	pio_limit_string[0] = '\0';
-+	if (host->use_dma && (host->pio_limit > 0))
-+		sprintf(pio_limit_string, " (>%d)", host->pio_limit);
-+	pr_info("%s: %s loaded - DMA %s%s\n",
-+		mmc_hostname(mmc), DRIVER_NAME,
-+		host->use_dma ? "enabled" : "disabled",
-+		pio_limit_string);
-+
-+	return 0;
-+
-+untasklet:
-+	tasklet_kill(&host->finish_tasklet);
-+
-+	return ret;
-+}
-+
-+static int bcm2835_sdhost_probe(struct platform_device *pdev)
-+{
-+	struct device *dev = &pdev->dev;
-+	struct device_node *node = dev->of_node;
-+	struct clk *clk;
-+	struct resource *iomem;
-+	struct bcm2835_host *host;
-+	struct mmc_host *mmc;
-+	const __be32 *addr;
-+	u32 msg[3];
-+	int na;
-+	int ret;
-+
-+	pr_debug("bcm2835_sdhost_probe\n");
-+	mmc = mmc_alloc_host(sizeof(*host), dev);
-+	if (!mmc)
-+		return -ENOMEM;
-+
-+	mmc->ops = &bcm2835_sdhost_ops;
-+	host = mmc_priv(mmc);
-+	host->mmc = mmc;
-+	host->pio_timeout = msecs_to_jiffies(500);
-+	host->pio_limit = 1;
-+	host->max_delay = 1; /* Warn if over 1ms */
-+	host->allow_dma = 1;
-+	spin_lock_init(&host->lock);
-+
-+	iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	host->ioaddr = devm_ioremap_resource(dev, iomem);
-+	if (IS_ERR(host->ioaddr)) {
-+		ret = PTR_ERR(host->ioaddr);
-+		goto err;
-+	}
-+
-+	na = of_n_addr_cells(node);
-+	addr = of_get_address(node, 0, NULL, NULL);
-+	if (!addr) {
-+		dev_err(dev, "could not get DMA-register address\n");
-+		return -ENODEV;
-+	}
-+	host->bus_addr = (phys_addr_t)of_read_number(addr, na);
-+	pr_debug(" - ioaddr %lx, iomem->start %lx, bus_addr %lx\n",
-+		 (unsigned long)host->ioaddr,
-+		 (unsigned long)iomem->start,
-+		 (unsigned long)host->bus_addr);
-+
-+	if (node) {
-+		/* Read any custom properties */
-+		of_property_read_u32(node,
-+				     "brcm,delay-after-stop",
-+				     &host->delay_after_stop);
-+		of_property_read_u32(node,
-+				     "brcm,overclock-50",
-+				     &host->user_overclock_50);
-+		of_property_read_u32(node,
-+				     "brcm,pio-limit",
-+				     &host->pio_limit);
-+		host->allow_dma =
-+			!of_property_read_bool(node, "brcm,force-pio");
-+		host->debug = of_property_read_bool(node, "brcm,debug");
-+	}
-+
-+	host->dma_chan = NULL;
-+	host->dma_desc = NULL;
-+
-+	/* Formally recognise the other way of disabling DMA */
-+	if (host->pio_limit == 0x7fffffff)
-+		host->allow_dma = false;
-+
-+	if (host->allow_dma) {
-+		if (node) {
-+			host->dma_chan_rxtx =
-+				dma_request_slave_channel(dev, "rx-tx");
-+			if (!host->dma_chan_rxtx)
-+				host->dma_chan_rxtx =
-+					dma_request_slave_channel(dev, "tx");
-+			if (!host->dma_chan_rxtx)
-+				host->dma_chan_rxtx =
-+					dma_request_slave_channel(dev, "rx");
-+		} else {
-+			dma_cap_mask_t mask;
-+
-+			dma_cap_zero(mask);
-+			/* we don't care about the channel, any would work */
-+			dma_cap_set(DMA_SLAVE, mask);
-+			host->dma_chan_rxtx =
-+				dma_request_channel(mask, NULL, NULL);
-+		}
-+	}
-+
-+	clk = devm_clk_get(dev, NULL);
-+	if (IS_ERR(clk)) {
-+		ret = PTR_ERR(clk);
-+		if (ret == -EPROBE_DEFER)
-+			dev_info(dev, "could not get clk, deferring probe\n");
-+		else
-+			dev_err(dev, "could not get clk\n");
-+		goto err;
-+	}
-+
-+	host->fw = rpi_firmware_get(
-+		of_parse_phandle(dev->of_node, "firmware", 0));
-+	if (!host->fw) {
-+		ret = -EPROBE_DEFER;
-+		goto err;
-+	}
-+
-+	host->max_clk = clk_get_rate(clk);
-+
-+	host->irq = platform_get_irq(pdev, 0);
-+	if (host->irq <= 0) {
-+		dev_err(dev, "get IRQ failed\n");
-+		ret = -EINVAL;
-+		goto err;
-+	}
-+
-+	pr_debug(" - max_clk %lx, irq %d\n",
-+		 (unsigned long)host->max_clk,
-+		 (int)host->irq);
-+
-+	log_init(dev, iomem->start - host->bus_addr);
-+
-+	if (node)
-+		mmc_of_parse(mmc);
-+	else
-+		mmc->caps |= MMC_CAP_4_BIT_DATA;
-+
-+	msg[0] = 0;
-+	msg[1] = ~0;
-+	msg[2] = ~0;
-+
-+	rpi_firmware_property(host->fw,
-+			      RPI_FIRMWARE_SET_SDHOST_CLOCK,
-+			      &msg, sizeof(msg));
-+
-+	host->firmware_sets_cdiv = (msg[1] != ~0);
-+
-+	ret = bcm2835_sdhost_add_host(host);
-+	if (ret)
-+		goto err;
-+
-+	platform_set_drvdata(pdev, host);
-+
-+	pr_debug("bcm2835_sdhost_probe -> OK\n");
-+
-+	return 0;
-+
-+err:
-+	pr_debug("bcm2835_sdhost_probe -> err %d\n", ret);
-+	if (host->fw)
-+		rpi_firmware_put(host->fw);
-+	if (host->dma_chan_rxtx)
-+		dma_release_channel(host->dma_chan_rxtx);
-+	mmc_free_host(mmc);
-+
-+	return ret;
-+}
-+
-+static int bcm2835_sdhost_remove(struct platform_device *pdev)
-+{
-+	struct bcm2835_host *host = platform_get_drvdata(pdev);
-+
-+	pr_debug("bcm2835_sdhost_remove\n");
-+
-+	mmc_remove_host(host->mmc);
-+
-+	bcm2835_sdhost_set_power(host, false);
-+
-+	free_irq(host->irq, host);
-+
-+	del_timer_sync(&host->timer);
-+
-+	tasklet_kill(&host->finish_tasklet);
-+	rpi_firmware_put(host->fw);
-+	if (host->dma_chan_rxtx)
-+		dma_release_channel(host->dma_chan_rxtx);
-+	mmc_free_host(host->mmc);
-+	platform_set_drvdata(pdev, NULL);
-+
-+	pr_debug("bcm2835_sdhost_remove - OK\n");
-+	return 0;
-+}
-+
-+static const struct of_device_id bcm2835_sdhost_match[] = {
-+	{ .compatible = "brcm,bcm2835-sdhost" },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(of, bcm2835_sdhost_match);
-+
-+static struct platform_driver bcm2835_sdhost_driver = {
-+	.probe      = bcm2835_sdhost_probe,
-+	.remove     = bcm2835_sdhost_remove,
-+	.driver     = {
-+		.name		= DRIVER_NAME,
-+		.owner		= THIS_MODULE,
-+		.of_match_table	= bcm2835_sdhost_match,
-+	},
-+};
-+module_platform_driver(bcm2835_sdhost_driver);
-+
-+MODULE_ALIAS("platform:sdhost-bcm2835");
-+MODULE_DESCRIPTION("BCM2835 SDHost driver");
-+MODULE_LICENSE("GPL v2");
-+MODULE_AUTHOR("Phil Elwell");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0113-vc_mem-Add-vc_mem-driver-for-querying-firmware-memor.patch b/target/linux/bcm27xx/patches-6.1/950-0113-vc_mem-Add-vc_mem-driver-for-querying-firmware-memor.patch
deleted file mode 100644
index 8fe7df77f4..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0113-vc_mem-Add-vc_mem-driver-for-querying-firmware-memor.patch
+++ /dev/null
@@ -1,493 +0,0 @@
-From 217c196114a066a44cf9b61f31731d49fd0900eb Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Fri, 28 Oct 2016 15:36:43 +0100
-Subject: [PATCH] vc_mem: Add vc_mem driver for querying firmware
- memory addresses
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: popcornmix <popcornmix@gmail.com>
-
-BCM270x: Move vc_mem
-
-Make the vc_mem module available for ARCH_BCM2835 by moving it.
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-
-char: vc_mem: Fix up compat ioctls for 64bit kernel
-
-compat_ioctl wasn't defined, so 32bit user/64bit kernel
-always failed.
-VC_MEM_IOC_MEM_PHYS_ADDR was defined with parameter size
-unsigned long, so the ioctl cmd changes between sizes.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
-
-char: vc_mem: Fix all coding style issues.
-
-Cleans up all checkpatch errors in vc_mem.c and vc_mem.h
-No functional change to the code.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
-
-char: vc_mem: Delete dead code
-
-There are no error exists once device_create has succeeded, and
-therefore no need to call device_destroy from vc_mem_init.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/char/broadcom/Kconfig   |  18 ++
- drivers/char/broadcom/Makefile  |   1 +
- drivers/char/broadcom/vc_mem.c  | 373 ++++++++++++++++++++++++++++++++
- include/linux/broadcom/vc_mem.h |  39 ++++
- 4 files changed, 431 insertions(+)
- create mode 100644 drivers/char/broadcom/Kconfig
- create mode 100644 drivers/char/broadcom/Makefile
- create mode 100644 drivers/char/broadcom/vc_mem.c
- create mode 100644 include/linux/broadcom/vc_mem.h
-
---- /dev/null
-+++ b/drivers/char/broadcom/Kconfig
-@@ -0,0 +1,18 @@
-+#
-+# Broadcom char driver config
-+#
-+
-+menuconfig BRCM_CHAR_DRIVERS
-+	bool "Broadcom Char Drivers"
-+	help
-+	  Broadcom's char drivers
-+
-+if BRCM_CHAR_DRIVERS
-+
-+config BCM2708_VCMEM
-+	bool "Videocore Memory"
-+        default y
-+        help
-+          Helper for videocore memory access and total size allocation.
-+
-+endif
---- /dev/null
-+++ b/drivers/char/broadcom/Makefile
-@@ -0,0 +1 @@
-+obj-$(CONFIG_BCM2708_VCMEM)	+= vc_mem.o
---- /dev/null
-+++ b/drivers/char/broadcom/vc_mem.c
-@@ -0,0 +1,373 @@
-+/*
-+ * Copyright 2010 - 2011 Broadcom Corporation.  All rights reserved.
-+ *
-+ * Unless you and Broadcom execute a separate written software license
-+ * agreement governing use of this software, this software is licensed to you
-+ * under the terms of the GNU General Public License version 2, available at
-+ * http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
-+ *
-+ * Notwithstanding the above, under no circumstances may you combine this
-+ * software in any way with any other Broadcom software provided under a
-+ * license other than the GPL, without Broadcom's express prior written
-+ * consent.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/fs.h>
-+#include <linux/device.h>
-+#include <linux/cdev.h>
-+#include <linux/mm.h>
-+#include <linux/slab.h>
-+#include <linux/debugfs.h>
-+#include <linux/uaccess.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/broadcom/vc_mem.h>
-+
-+#define DRIVER_NAME  "vc-mem"
-+
-+/* Device (/dev) related variables */
-+static dev_t vc_mem_devnum;
-+static struct class *vc_mem_class;
-+static struct cdev vc_mem_cdev;
-+static int vc_mem_inited;
-+
-+#ifdef CONFIG_DEBUG_FS
-+static struct dentry *vc_mem_debugfs_entry;
-+#endif
-+
-+/*
-+ * Videocore memory addresses and size
-+ *
-+ * Drivers that wish to know the videocore memory addresses and sizes should
-+ * use these variables instead of the MM_IO_BASE and MM_ADDR_IO defines in
-+ * headers. This allows the other drivers to not be tied down to a a certain
-+ * address/size at compile time.
-+ *
-+ * In the future, the goal is to have the videocore memory virtual address and
-+ * size be calculated at boot time rather than at compile time. The decision of
-+ * where the videocore memory resides and its size would be in the hands of the
-+ * bootloader (and/or kernel). When that happens, the values of these variables
-+ * would be calculated and assigned in the init function.
-+ */
-+/* In the 2835 VC in mapped above ARM, but ARM has full access to VC space */
-+unsigned long mm_vc_mem_phys_addr;
-+EXPORT_SYMBOL(mm_vc_mem_phys_addr);
-+unsigned int mm_vc_mem_size;
-+EXPORT_SYMBOL(mm_vc_mem_size);
-+unsigned int mm_vc_mem_base;
-+EXPORT_SYMBOL(mm_vc_mem_base);
-+
-+static uint phys_addr;
-+static uint mem_size;
-+static uint mem_base;
-+
-+static int
-+vc_mem_open(struct inode *inode, struct file *file)
-+{
-+	(void)inode;
-+
-+	pr_debug("%s: called file = 0x%p\n", __func__, file);
-+
-+	return 0;
-+}
-+
-+static int
-+vc_mem_release(struct inode *inode, struct file *file)
-+{
-+	(void)inode;
-+
-+	pr_debug("%s: called file = 0x%p\n", __func__, file);
-+
-+	return 0;
-+}
-+
-+static void
-+vc_mem_get_size(void)
-+{
-+}
-+
-+static void
-+vc_mem_get_base(void)
-+{
-+}
-+
-+int
-+vc_mem_get_current_size(void)
-+{
-+	return mm_vc_mem_size;
-+}
-+EXPORT_SYMBOL_GPL(vc_mem_get_current_size);
-+
-+static long
-+vc_mem_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
-+{
-+	int rc = 0;
-+
-+	(void) cmd;
-+	(void) arg;
-+
-+	pr_debug("%s: called file = 0x%p, cmd %08x\n", __func__, file, cmd);
-+
-+	switch (cmd) {
-+	case VC_MEM_IOC_MEM_PHYS_ADDR:
-+		{
-+			pr_debug("%s: VC_MEM_IOC_MEM_PHYS_ADDR=0x%p\n",
-+				__func__, (void *)mm_vc_mem_phys_addr);
-+
-+			if (copy_to_user((void *)arg, &mm_vc_mem_phys_addr,
-+					 sizeof(mm_vc_mem_phys_addr))) {
-+				rc = -EFAULT;
-+			}
-+			break;
-+		}
-+	case VC_MEM_IOC_MEM_SIZE:
-+		{
-+			/* Get the videocore memory size first */
-+			vc_mem_get_size();
-+
-+			pr_debug("%s: VC_MEM_IOC_MEM_SIZE=%x\n", __func__,
-+				 mm_vc_mem_size);
-+
-+			if (copy_to_user((void *)arg, &mm_vc_mem_size,
-+					 sizeof(mm_vc_mem_size))) {
-+				rc = -EFAULT;
-+			}
-+			break;
-+		}
-+	case VC_MEM_IOC_MEM_BASE:
-+		{
-+			/* Get the videocore memory base */
-+			vc_mem_get_base();
-+
-+			pr_debug("%s: VC_MEM_IOC_MEM_BASE=%x\n", __func__,
-+				 mm_vc_mem_base);
-+
-+			if (copy_to_user((void *)arg, &mm_vc_mem_base,
-+					 sizeof(mm_vc_mem_base))) {
-+				rc = -EFAULT;
-+			}
-+			break;
-+		}
-+	case VC_MEM_IOC_MEM_LOAD:
-+		{
-+			/* Get the videocore memory base */
-+			vc_mem_get_base();
-+
-+			pr_debug("%s: VC_MEM_IOC_MEM_LOAD=%x\n", __func__,
-+				mm_vc_mem_base);
-+
-+			if (copy_to_user((void *)arg, &mm_vc_mem_base,
-+					 sizeof(mm_vc_mem_base))) {
-+				rc = -EFAULT;
-+			}
-+			break;
-+		}
-+	default:
-+		{
-+			return -ENOTTY;
-+		}
-+	}
-+	pr_debug("%s: file = 0x%p returning %d\n", __func__, file, rc);
-+
-+	return rc;
-+}
-+
-+#ifdef CONFIG_COMPAT
-+static long
-+vc_mem_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
-+{
-+	int rc = 0;
-+
-+	switch (cmd) {
-+	case VC_MEM_IOC_MEM_PHYS_ADDR32:
-+		pr_debug("%s: VC_MEM_IOC_MEM_PHYS_ADDR32=0x%p\n",
-+			 __func__, (void *)mm_vc_mem_phys_addr);
-+
-+		/* This isn't correct, but will cover us for now as
-+		 * VideoCore is 32bit only.
-+		 */
-+		if (copy_to_user((void *)arg, &mm_vc_mem_phys_addr,
-+				 sizeof(compat_ulong_t)))
-+			rc = -EFAULT;
-+
-+		break;
-+
-+	default:
-+		rc = vc_mem_ioctl(file, cmd, arg);
-+		break;
-+	}
-+
-+	return rc;
-+}
-+#endif
-+
-+static int
-+vc_mem_mmap(struct file *filp, struct vm_area_struct *vma)
-+{
-+	int rc = 0;
-+	unsigned long length = vma->vm_end - vma->vm_start;
-+	unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
-+
-+	pr_debug("%s: vm_start = 0x%08lx vm_end = 0x%08lx vm_pgoff = 0x%08lx\n",
-+		 __func__, (long)vma->vm_start, (long)vma->vm_end,
-+		 (long)vma->vm_pgoff);
-+
-+	if (offset + length > mm_vc_mem_size) {
-+		pr_err("%s: length %ld is too big\n", __func__, length);
-+		return -EINVAL;
-+	}
-+	/* Do not cache the memory map */
-+	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
-+
-+	rc = remap_pfn_range(vma, vma->vm_start,
-+			     (mm_vc_mem_phys_addr >> PAGE_SHIFT) +
-+			     vma->vm_pgoff, length, vma->vm_page_prot);
-+	if (rc)
-+		pr_err("%s: remap_pfn_range failed (rc=%d)\n", __func__, rc);
-+
-+	return rc;
-+}
-+
-+/* File Operations for the driver. */
-+static const struct file_operations vc_mem_fops = {
-+	.owner = THIS_MODULE,
-+	.open = vc_mem_open,
-+	.release = vc_mem_release,
-+	.unlocked_ioctl = vc_mem_ioctl,
-+#ifdef CONFIG_COMPAT
-+	.compat_ioctl = vc_mem_compat_ioctl,
-+#endif
-+	.mmap = vc_mem_mmap,
-+};
-+
-+#ifdef CONFIG_DEBUG_FS
-+static void vc_mem_debugfs_deinit(void)
-+{
-+	debugfs_remove_recursive(vc_mem_debugfs_entry);
-+	vc_mem_debugfs_entry = NULL;
-+}
-+
-+
-+static int vc_mem_debugfs_init(
-+	struct device *dev)
-+{
-+	vc_mem_debugfs_entry = debugfs_create_dir(DRIVER_NAME, NULL);
-+	if (!vc_mem_debugfs_entry) {
-+		dev_warn(dev, "could not create debugfs entry\n");
-+		return -EFAULT;
-+	}
-+
-+	debugfs_create_x32("vc_mem_phys_addr",
-+				0444,
-+				vc_mem_debugfs_entry,
-+				(u32 *)&mm_vc_mem_phys_addr);
-+	debugfs_create_x32("vc_mem_size",
-+				0444,
-+				vc_mem_debugfs_entry,
-+				(u32 *)&mm_vc_mem_size);
-+	debugfs_create_x32("vc_mem_base",
-+				0444,
-+				vc_mem_debugfs_entry,
-+				(u32 *)&mm_vc_mem_base);
-+
-+	return 0;
-+}
-+
-+#endif /* CONFIG_DEBUG_FS */
-+
-+/* Module load/unload functions */
-+
-+static int __init
-+vc_mem_init(void)
-+{
-+	int rc = -EFAULT;
-+	struct device *dev;
-+
-+	pr_debug("%s: called\n", __func__);
-+
-+	mm_vc_mem_phys_addr = phys_addr;
-+	mm_vc_mem_size = mem_size;
-+	mm_vc_mem_base = mem_base;
-+
-+	vc_mem_get_size();
-+
-+	pr_info("vc-mem: phys_addr:0x%08lx mem_base=0x%08x mem_size:0x%08x(%u MiB)\n",
-+		mm_vc_mem_phys_addr, mm_vc_mem_base, mm_vc_mem_size,
-+		mm_vc_mem_size / (1024 * 1024));
-+
-+	rc = alloc_chrdev_region(&vc_mem_devnum, 0, 1, DRIVER_NAME);
-+	if (rc < 0) {
-+		pr_err("%s: alloc_chrdev_region failed (rc=%d)\n",
-+		       __func__, rc);
-+		goto out_err;
-+	}
-+
-+	cdev_init(&vc_mem_cdev, &vc_mem_fops);
-+	rc = cdev_add(&vc_mem_cdev, vc_mem_devnum, 1);
-+	if (rc) {
-+		pr_err("%s: cdev_add failed (rc=%d)\n", __func__, rc);
-+		goto out_unregister;
-+	}
-+
-+	vc_mem_class = class_create(THIS_MODULE, DRIVER_NAME);
-+	if (IS_ERR(vc_mem_class)) {
-+		rc = PTR_ERR(vc_mem_class);
-+		pr_err("%s: class_create failed (rc=%d)\n", __func__, rc);
-+		goto out_cdev_del;
-+	}
-+
-+	dev = device_create(vc_mem_class, NULL, vc_mem_devnum, NULL,
-+			    DRIVER_NAME);
-+	if (IS_ERR(dev)) {
-+		rc = PTR_ERR(dev);
-+		pr_err("%s: device_create failed (rc=%d)\n", __func__, rc);
-+		goto out_class_destroy;
-+	}
-+
-+#ifdef CONFIG_DEBUG_FS
-+	/* don't fail if the debug entries cannot be created */
-+	vc_mem_debugfs_init(dev);
-+#endif
-+
-+	vc_mem_inited = 1;
-+	return 0;
-+
-+out_class_destroy:
-+	class_destroy(vc_mem_class);
-+	vc_mem_class = NULL;
-+
-+out_cdev_del:
-+	cdev_del(&vc_mem_cdev);
-+
-+out_unregister:
-+	unregister_chrdev_region(vc_mem_devnum, 1);
-+
-+out_err:
-+	return -1;
-+}
-+
-+static void __exit
-+vc_mem_exit(void)
-+{
-+	pr_debug("%s: called\n", __func__);
-+
-+	if (vc_mem_inited) {
-+#if CONFIG_DEBUG_FS
-+		vc_mem_debugfs_deinit();
-+#endif
-+		device_destroy(vc_mem_class, vc_mem_devnum);
-+		class_destroy(vc_mem_class);
-+		cdev_del(&vc_mem_cdev);
-+		unregister_chrdev_region(vc_mem_devnum, 1);
-+	}
-+}
-+
-+module_init(vc_mem_init);
-+module_exit(vc_mem_exit);
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Broadcom Corporation");
-+
-+module_param(phys_addr, uint, 0644);
-+module_param(mem_size, uint, 0644);
-+module_param(mem_base, uint, 0644);
---- /dev/null
-+++ b/include/linux/broadcom/vc_mem.h
-@@ -0,0 +1,39 @@
-+/*
-+ * Copyright 2010 - 2011 Broadcom Corporation.  All rights reserved.
-+ *
-+ * Unless you and Broadcom execute a separate written software license
-+ * agreement governing use of this software, this software is licensed to you
-+ * under the terms of the GNU General Public License version 2, available at
-+ * http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
-+ *
-+ * Notwithstanding the above, under no circumstances may you combine this
-+ * software in any way with any other Broadcom software provided under a
-+ * license other than the GPL, without Broadcom's express prior written
-+ * consent.
-+ */
-+
-+#ifndef _VC_MEM_H
-+#define _VC_MEM_H
-+
-+#include <linux/ioctl.h>
-+
-+#define VC_MEM_IOC_MAGIC  'v'
-+
-+#define VC_MEM_IOC_MEM_PHYS_ADDR    _IOR(VC_MEM_IOC_MAGIC, 0, unsigned long)
-+#define VC_MEM_IOC_MEM_SIZE         _IOR(VC_MEM_IOC_MAGIC, 1, unsigned int)
-+#define VC_MEM_IOC_MEM_BASE         _IOR(VC_MEM_IOC_MAGIC, 2, unsigned int)
-+#define VC_MEM_IOC_MEM_LOAD         _IOR(VC_MEM_IOC_MAGIC, 3, unsigned int)
-+
-+#ifdef __KERNEL__
-+#define VC_MEM_TO_ARM_ADDR_MASK 0x3FFFFFFF
-+
-+extern unsigned long mm_vc_mem_phys_addr;
-+extern unsigned int  mm_vc_mem_size;
-+extern int vc_mem_get_current_size(void);
-+#endif
-+
-+#ifdef CONFIG_COMPAT
-+#define VC_MEM_IOC_MEM_PHYS_ADDR32  _IOR(VC_MEM_IOC_MAGIC, 0, compat_ulong_t)
-+#endif
-+
-+#endif  /* _VC_MEM_H */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0114-Add-dev-gpiomem-device-for-rootless-user-GPIO-access.patch b/target/linux/bcm27xx/patches-6.1/950-0114-Add-dev-gpiomem-device-for-rootless-user-GPIO-access.patch
deleted file mode 100644
index b5ca061a57..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0114-Add-dev-gpiomem-device-for-rootless-user-GPIO-access.patch
+++ /dev/null
@@ -1,299 +0,0 @@
-From 31b66b686ef574df45dc09e84d84e70db32beb17 Mon Sep 17 00:00:00 2001
-From: Luke Wren <luke@raspberrypi.org>
-Date: Fri, 21 Aug 2015 23:14:48 +0100
-Subject: [PATCH] Add /dev/gpiomem device for rootless user GPIO access
-
-Signed-off-by: Luke Wren <luke@raspberrypi.org>
-
-bcm2835-gpiomem: Fix for ARCH_BCM2835 builds
-
-Build on ARCH_BCM2835, and fail to probe if no IO resource.
-
-See: https://github.com/raspberrypi/linux/issues/1154
----
- drivers/char/broadcom/Kconfig           |   8 +
- drivers/char/broadcom/Makefile          |   1 +
- drivers/char/broadcom/bcm2835-gpiomem.c | 258 ++++++++++++++++++++++++
- 3 files changed, 267 insertions(+)
- create mode 100644 drivers/char/broadcom/bcm2835-gpiomem.c
-
---- a/drivers/char/broadcom/Kconfig
-+++ b/drivers/char/broadcom/Kconfig
-@@ -16,3 +16,11 @@ config BCM2708_VCMEM
-           Helper for videocore memory access and total size allocation.
- 
- endif
-+
-+config BCM2835_DEVGPIOMEM
-+	tristate "/dev/gpiomem rootless GPIO access via mmap() on the BCM2835"
-+	default m
-+	help
-+		Provides users with root-free access to the GPIO registers
-+		on the 2835. Calling mmap(/dev/gpiomem) will map the GPIO
-+		register page to the user's pointer.
---- a/drivers/char/broadcom/Makefile
-+++ b/drivers/char/broadcom/Makefile
-@@ -1 +1,2 @@
- obj-$(CONFIG_BCM2708_VCMEM)	+= vc_mem.o
-+obj-$(CONFIG_BCM2835_DEVGPIOMEM)+= bcm2835-gpiomem.o
---- /dev/null
-+++ b/drivers/char/broadcom/bcm2835-gpiomem.c
-@@ -0,0 +1,258 @@
-+/**
-+ * GPIO memory device driver
-+ *
-+ * Creates a chardev /dev/gpiomem which will provide user access to
-+ * the BCM2835's GPIO registers when it is mmap()'d.
-+ * No longer need root for user GPIO access, but without relaxing permissions
-+ * on /dev/mem.
-+ *
-+ * Written by Luke Wren <luke@raspberrypi.org>
-+ * Copyright (c) 2015, Raspberry Pi (Trading) Ltd.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions, and the following disclaimer,
-+ *    without modification.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. The names of the above-listed copyright holders may not be used
-+ *    to endorse or promote products derived from this software without
-+ *    specific prior written permission.
-+ *
-+ * ALTERNATIVELY, this software may be distributed under the terms of the
-+ * GNU General Public License ("GPL") version 2, as published by the Free
-+ * Software Foundation.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/platform_device.h>
-+#include <linux/mm.h>
-+#include <linux/slab.h>
-+#include <linux/cdev.h>
-+#include <linux/pagemap.h>
-+#include <linux/io.h>
-+
-+#define DEVICE_NAME "bcm2835-gpiomem"
-+#define DRIVER_NAME "gpiomem-bcm2835"
-+#define DEVICE_MINOR 0
-+
-+struct bcm2835_gpiomem_instance {
-+	unsigned long gpio_regs_phys;
-+	struct device *dev;
-+};
-+
-+static struct cdev bcm2835_gpiomem_cdev;
-+static dev_t bcm2835_gpiomem_devid;
-+static struct class *bcm2835_gpiomem_class;
-+static struct device *bcm2835_gpiomem_dev;
-+static struct bcm2835_gpiomem_instance *inst;
-+
-+
-+/****************************************************************************
-+*
-+*   GPIO mem chardev file ops
-+*
-+***************************************************************************/
-+
-+static int bcm2835_gpiomem_open(struct inode *inode, struct file *file)
-+{
-+	int dev = iminor(inode);
-+	int ret = 0;
-+
-+	if (dev != DEVICE_MINOR) {
-+		dev_err(inst->dev, "Unknown minor device: %d", dev);
-+		ret = -ENXIO;
-+	}
-+	return ret;
-+}
-+
-+static int bcm2835_gpiomem_release(struct inode *inode, struct file *file)
-+{
-+	int dev = iminor(inode);
-+	int ret = 0;
-+
-+	if (dev != DEVICE_MINOR) {
-+		dev_err(inst->dev, "Unknown minor device %d", dev);
-+		ret = -ENXIO;
-+	}
-+	return ret;
-+}
-+
-+static const struct vm_operations_struct bcm2835_gpiomem_vm_ops = {
-+#ifdef CONFIG_HAVE_IOREMAP_PROT
-+	.access = generic_access_phys
-+#endif
-+};
-+
-+static int bcm2835_gpiomem_mmap(struct file *file, struct vm_area_struct *vma)
-+{
-+	/* Ignore what the user says - they're getting the GPIO regs
-+	   whether they like it or not! */
-+	unsigned long gpio_page = inst->gpio_regs_phys >> PAGE_SHIFT;
-+
-+	vma->vm_page_prot = phys_mem_access_prot(file, gpio_page,
-+						 PAGE_SIZE,
-+						 vma->vm_page_prot);
-+	vma->vm_ops = &bcm2835_gpiomem_vm_ops;
-+	if (remap_pfn_range(vma, vma->vm_start,
-+			gpio_page,
-+			PAGE_SIZE,
-+			vma->vm_page_prot)) {
-+		return -EAGAIN;
-+	}
-+	return 0;
-+}
-+
-+static const struct file_operations
-+bcm2835_gpiomem_fops = {
-+	.owner = THIS_MODULE,
-+	.open = bcm2835_gpiomem_open,
-+	.release = bcm2835_gpiomem_release,
-+	.mmap = bcm2835_gpiomem_mmap,
-+};
-+
-+
-+ /****************************************************************************
-+*
-+*   Probe and remove functions
-+*
-+***************************************************************************/
-+
-+
-+static int bcm2835_gpiomem_probe(struct platform_device *pdev)
-+{
-+	int err;
-+	void *ptr_err;
-+	struct device *dev = &pdev->dev;
-+	struct resource *ioresource;
-+
-+	/* Allocate buffers and instance data */
-+
-+	inst = kzalloc(sizeof(struct bcm2835_gpiomem_instance), GFP_KERNEL);
-+
-+	if (!inst) {
-+		err = -ENOMEM;
-+		goto failed_inst_alloc;
-+	}
-+
-+	inst->dev = dev;
-+
-+	ioresource = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (ioresource) {
-+		inst->gpio_regs_phys = ioresource->start;
-+	} else {
-+		dev_err(inst->dev, "failed to get IO resource");
-+		err = -ENOENT;
-+		goto failed_get_resource;
-+	}
-+
-+	/* Create character device entries */
-+
-+	err = alloc_chrdev_region(&bcm2835_gpiomem_devid,
-+				  DEVICE_MINOR, 1, DEVICE_NAME);
-+	if (err != 0) {
-+		dev_err(inst->dev, "unable to allocate device number");
-+		goto failed_alloc_chrdev;
-+	}
-+	cdev_init(&bcm2835_gpiomem_cdev, &bcm2835_gpiomem_fops);
-+	bcm2835_gpiomem_cdev.owner = THIS_MODULE;
-+	err = cdev_add(&bcm2835_gpiomem_cdev, bcm2835_gpiomem_devid, 1);
-+	if (err != 0) {
-+		dev_err(inst->dev, "unable to register device");
-+		goto failed_cdev_add;
-+	}
-+
-+	/* Create sysfs entries */
-+
-+	bcm2835_gpiomem_class = class_create(THIS_MODULE, DEVICE_NAME);
-+	ptr_err = bcm2835_gpiomem_class;
-+	if (IS_ERR(ptr_err))
-+		goto failed_class_create;
-+
-+	bcm2835_gpiomem_dev = device_create(bcm2835_gpiomem_class, NULL,
-+					bcm2835_gpiomem_devid, NULL,
-+					"gpiomem");
-+	ptr_err = bcm2835_gpiomem_dev;
-+	if (IS_ERR(ptr_err))
-+		goto failed_device_create;
-+
-+	dev_info(inst->dev, "Initialised: Registers at 0x%08lx",
-+		inst->gpio_regs_phys);
-+
-+	return 0;
-+
-+failed_device_create:
-+	class_destroy(bcm2835_gpiomem_class);
-+failed_class_create:
-+	cdev_del(&bcm2835_gpiomem_cdev);
-+	err = PTR_ERR(ptr_err);
-+failed_cdev_add:
-+	unregister_chrdev_region(bcm2835_gpiomem_devid, 1);
-+failed_alloc_chrdev:
-+failed_get_resource:
-+	kfree(inst);
-+failed_inst_alloc:
-+	dev_err(inst->dev, "could not load bcm2835_gpiomem");
-+	return err;
-+}
-+
-+static int bcm2835_gpiomem_remove(struct platform_device *pdev)
-+{
-+	struct device *dev = inst->dev;
-+
-+	kfree(inst);
-+	device_destroy(bcm2835_gpiomem_class, bcm2835_gpiomem_devid);
-+	class_destroy(bcm2835_gpiomem_class);
-+	cdev_del(&bcm2835_gpiomem_cdev);
-+	unregister_chrdev_region(bcm2835_gpiomem_devid, 1);
-+
-+	dev_info(dev, "GPIO mem driver removed - OK");
-+	return 0;
-+}
-+
-+ /****************************************************************************
-+*
-+*   Register the driver with device tree
-+*
-+***************************************************************************/
-+
-+static const struct of_device_id bcm2835_gpiomem_of_match[] = {
-+	{.compatible = "brcm,bcm2835-gpiomem",},
-+	{ /* sentinel */ },
-+};
-+
-+MODULE_DEVICE_TABLE(of, bcm2835_gpiomem_of_match);
-+
-+static struct platform_driver bcm2835_gpiomem_driver = {
-+	.probe = bcm2835_gpiomem_probe,
-+	.remove = bcm2835_gpiomem_remove,
-+	.driver = {
-+		   .name = DRIVER_NAME,
-+		   .owner = THIS_MODULE,
-+		   .of_match_table = bcm2835_gpiomem_of_match,
-+		   },
-+};
-+
-+module_platform_driver(bcm2835_gpiomem_driver);
-+
-+MODULE_ALIAS("platform:gpiomem-bcm2835");
-+MODULE_LICENSE("GPL");
-+MODULE_DESCRIPTION("gpiomem driver for accessing GPIO from userspace");
-+MODULE_AUTHOR("Luke Wren <luke@raspberrypi.org>");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0115-Add-SMI-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0115-Add-SMI-driver.patch
deleted file mode 100644
index 674f3f53b0..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0115-Add-SMI-driver.patch
+++ /dev/null
@@ -1,1967 +0,0 @@
-From b3077fb9ac2668fde05478fa0ef6197fecda87b6 Mon Sep 17 00:00:00 2001
-From: Luke Wren <wren6991@gmail.com>
-Date: Sat, 5 Sep 2015 01:14:45 +0100
-Subject: [PATCH] Add SMI driver
-
-Signed-off-by: Luke Wren <wren6991@gmail.com>
-
-MISC: bcm2835: smi: use clock manager and fix reload issues
-
-Use clock manager instead of self-made clockmanager.
-
-Also fix some error paths that showd up during development
-(especially missing release of dma resources on rmmod)
-
-Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
-
-bcm2835_smi: re-add dereference to fix DMA transfers
-
-bcm2835_smi_dev: Fix handling of word-odd lengths
-
-The read and write functions did not use the correct pointer offset
-when dealing with an odd number of bytes after a DMA transfer. Also,
-only handle the remaining odd bytes if the DMA transfer completed
-successfully.
-
-Submitted-by: @madimario (GitHub)
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-misc: bcm2835_smi: Use proper enum types for dma_{,un}map_single()
-
-Clang warns:
-
-  drivers/misc/bcm2835_smi.c:692:4: warning: implicit conversion from enumeration type 'enum dma_transfer_direction' to different enumeration type 'enum dma_data_direction' [-Wenum-conversion]
-                          DMA_MEM_TO_DEV);
-                          ^~~~~~~~~~~~~~~
-  ./include/linux/dma-mapping.h:406:66: note: expanded from macro 'dma_map_single'
-  #define dma_map_single(d, a, s, r) dma_map_single_attrs(d, a, s, r, 0)
-                                     ~~~~~~~~~~~~~~~~~~~~          ^
-  drivers/misc/bcm2835_smi.c:705:35: warning: implicit conversion from enumeration type 'enum dma_transfer_direction' to different enumeration type 'enum dma_data_direction' [-Wenum-conversion]
-                          (inst->dev, phy_addr, n_bytes, DMA_MEM_TO_DEV);
-                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~
-  ./include/linux/dma-mapping.h:407:70: note: expanded from macro 'dma_unmap_single'
-  #define dma_unmap_single(d, a, s, r) dma_unmap_single_attrs(d, a, s, r, 0)
-                                       ~~~~~~~~~~~~~~~~~~~~~~          ^
-  drivers/misc/bcm2835_smi.c:751:12: warning: implicit conversion from enumeration type 'enum dma_transfer_direction' to different enumeration type 'enum dma_data_direction' [-Wenum-conversion]
-                                                       DMA_DEV_TO_MEM);
-                                                       ^~~~~~~~~~~~~~~
-  ./include/linux/dma-mapping.h:406:66: note: expanded from macro 'dma_map_single'
-  #define dma_map_single(d, a, s, r) dma_map_single_attrs(d, a, s, r, 0)
-                                     ~~~~~~~~~~~~~~~~~~~~          ^
-  drivers/misc/bcm2835_smi.c:761:50: warning: implicit conversion from enumeration type 'enum dma_transfer_direction' to different enumeration type 'enum dma_data_direction' [-Wenum-conversion]
-                  dma_unmap_single(inst->dev, phy_addr, n_bytes, DMA_DEV_TO_MEM);
-                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~
-  ./include/linux/dma-mapping.h:407:70: note: expanded from macro 'dma_unmap_single'
-  #define dma_unmap_single(d, a, s, r) dma_unmap_single_attrs(d, a, s, r, 0)
-                                       ~~~~~~~~~~~~~~~~~~~~~~          ^
-  4 warnings generated.
-
-Use the proper enumerated type to clear up the warning. There is not
-actually a bug here because the enumerated types have the same integer
-value:
-
-DMA_MEM_TO_DEV = DMA_TO_DEVICE = 1
-DMA_DEV_TO_MEM = DMA_FROM_DEVICE = 2
-
-Fixes: 93254d0f7bc8 ("Add SMI driver")
-Signed-off-by: Nathan Chancellor <nathan@kernel.org>
----
- .../bindings/misc/brcm,bcm2835-smi-dev.txt    |  17 +
- .../bindings/misc/brcm,bcm2835-smi.txt        |  48 +
- drivers/char/broadcom/Kconfig                 |   9 +
- drivers/char/broadcom/Makefile                |   1 +
- drivers/char/broadcom/bcm2835_smi_dev.c       | 409 ++++++++
- drivers/misc/Kconfig                          |   8 +
- drivers/misc/Makefile                         |   1 +
- drivers/misc/bcm2835_smi.c                    | 955 ++++++++++++++++++
- include/linux/broadcom/bcm2835_smi.h          | 391 +++++++
- 9 files changed, 1839 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/misc/brcm,bcm2835-smi-dev.txt
- create mode 100644 Documentation/devicetree/bindings/misc/brcm,bcm2835-smi.txt
- create mode 100644 drivers/char/broadcom/bcm2835_smi_dev.c
- create mode 100644 drivers/misc/bcm2835_smi.c
- create mode 100644 include/linux/broadcom/bcm2835_smi.h
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi-dev.txt
-@@ -0,0 +1,17 @@
-+* Broadcom BCM2835 SMI character device driver.
-+
-+SMI or secondary memory interface is a peripheral specific to certain Broadcom
-+SOCs, and is helpful for talking to things like parallel-interface displays
-+and NAND flashes (in fact, most things with a parallel register interface).
-+
-+This driver adds a character device which provides a user-space interface to
-+an instance of the SMI driver.
-+
-+Required properties:
-+- compatible: "brcm,bcm2835-smi-dev"
-+- smi_handle: a phandle to the smi node.
-+
-+Optional properties:
-+- None.
-+
-+
---- /dev/null
-+++ b/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi.txt
-@@ -0,0 +1,48 @@
-+* Broadcom BCM2835 SMI driver.
-+
-+SMI or secondary memory interface is a peripheral specific to certain Broadcom
-+SOCs, and is helpful for talking to things like parallel-interface displays
-+and NAND flashes (in fact, most things with a parallel register interface).
-+
-+Required properties:
-+- compatible: "brcm,bcm2835-smi"
-+- reg: Should contain location and length of SMI registers and SMI clkman regs
-+- interrupts: *the* SMI interrupt.
-+- pinctrl-names: should be "default".
-+- pinctrl-0: the phandle of the gpio pin node.
-+- brcm,smi-clock-source: the clock source for clkman
-+- brcm,smi-clock-divisor: the integer clock divisor for clkman
-+- dmas: the dma controller phandle and the DREQ number (4 on a 2835)
-+- dma-names: the name used by the driver to request its channel.
-+  Should be "rx-tx".
-+
-+Optional properties:
-+- None.
-+
-+Examples:
-+
-+8 data pin configuration:
-+
-+smi: smi@7e600000 {
-+	compatible = "brcm,bcm2835-smi";
-+	reg = <0x7e600000 0x44>, <0x7e1010b0 0x8>;
-+	interrupts = <2 16>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&smi_pins>;
-+	brcm,smi-clock-source = <6>;
-+	brcm,smi-clock-divisor = <4>;
-+	dmas = <&dma 4>;
-+	dma-names = "rx-tx";
-+
-+	status = "okay";
-+};
-+
-+smi_pins: smi_pins {
-+	brcm,pins = <2 3 4 5 6 7 8 9 10 11 12 13 14 15>;
-+	/* Alt 1: SMI */
-+	brcm,function = <5 5 5 5 5 5 5 5 5 5 5 5 5 5>;
-+	/* /CS, /WE and /OE are pulled high, as they are
-+	   generally active low signals */
-+	brcm,pull = <2 2 2 2 2 2 0 0 0 0 0 0 0 0>;
-+};
-+
---- a/drivers/char/broadcom/Kconfig
-+++ b/drivers/char/broadcom/Kconfig
-@@ -24,3 +24,12 @@ config BCM2835_DEVGPIOMEM
- 		Provides users with root-free access to the GPIO registers
- 		on the 2835. Calling mmap(/dev/gpiomem) will map the GPIO
- 		register page to the user's pointer.
-+
-+config BCM2835_SMI_DEV
-+	tristate "Character device driver for BCM2835 Secondary Memory Interface"
-+	depends on BCM2835_SMI
-+	default m
-+	help
-+		This driver provides a character device interface (ioctl + read/write) to
-+		Broadcom's Secondary Memory interface. The low-level functionality is provided
-+		by the SMI driver itself.
---- a/drivers/char/broadcom/Makefile
-+++ b/drivers/char/broadcom/Makefile
-@@ -1,2 +1,3 @@
- obj-$(CONFIG_BCM2708_VCMEM)	+= vc_mem.o
- obj-$(CONFIG_BCM2835_DEVGPIOMEM)+= bcm2835-gpiomem.o
-+obj-$(CONFIG_BCM2835_SMI_DEV)	+= bcm2835_smi_dev.o
---- /dev/null
-+++ b/drivers/char/broadcom/bcm2835_smi_dev.c
-@@ -0,0 +1,409 @@
-+/**
-+ * Character device driver for Broadcom Secondary Memory Interface
-+ *
-+ * Written by Luke Wren <luke@raspberrypi.org>
-+ * Copyright (c) 2015, Raspberry Pi (Trading) Ltd.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions, and the following disclaimer,
-+ *    without modification.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. The names of the above-listed copyright holders may not be used
-+ *    to endorse or promote products derived from this software without
-+ *    specific prior written permission.
-+ *
-+ * ALTERNATIVELY, this software may be distributed under the terms of the
-+ * GNU General Public License ("GPL") version 2, as published by the Free
-+ * Software Foundation.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/platform_device.h>
-+#include <linux/slab.h>
-+#include <linux/mm.h>
-+#include <linux/pagemap.h>
-+#include <linux/fs.h>
-+#include <linux/cdev.h>
-+#include <linux/fs.h>
-+
-+#include <linux/broadcom/bcm2835_smi.h>
-+
-+#define DEVICE_NAME "bcm2835-smi-dev"
-+#define DRIVER_NAME "smi-dev-bcm2835"
-+#define DEVICE_MINOR 0
-+
-+static struct cdev bcm2835_smi_cdev;
-+static dev_t bcm2835_smi_devid;
-+static struct class *bcm2835_smi_class;
-+static struct device *bcm2835_smi_dev;
-+
-+struct bcm2835_smi_dev_instance {
-+	struct device *dev;
-+};
-+
-+static struct bcm2835_smi_instance *smi_inst;
-+static struct bcm2835_smi_dev_instance *inst;
-+
-+static const char *const ioctl_names[] = {
-+	"READ_SETTINGS",
-+	"WRITE_SETTINGS",
-+	"ADDRESS"
-+};
-+
-+/****************************************************************************
-+*
-+*   SMI chardev file ops
-+*
-+***************************************************************************/
-+static long
-+bcm2835_smi_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
-+{
-+	long ret = 0;
-+
-+	dev_info(inst->dev, "serving ioctl...");
-+
-+	switch (cmd) {
-+	case BCM2835_SMI_IOC_GET_SETTINGS:{
-+		struct smi_settings *settings;
-+
-+		dev_info(inst->dev, "Reading SMI settings to user.");
-+		settings = bcm2835_smi_get_settings_from_regs(smi_inst);
-+		if (copy_to_user((void *)arg, settings,
-+				 sizeof(struct smi_settings)))
-+			dev_err(inst->dev, "settings copy failed.");
-+		break;
-+	}
-+	case BCM2835_SMI_IOC_WRITE_SETTINGS:{
-+		struct smi_settings *settings;
-+
-+		dev_info(inst->dev, "Setting user's SMI settings.");
-+		settings = bcm2835_smi_get_settings_from_regs(smi_inst);
-+		if (copy_from_user(settings, (void *)arg,
-+				   sizeof(struct smi_settings)))
-+			dev_err(inst->dev, "settings copy failed.");
-+		else
-+			bcm2835_smi_set_regs_from_settings(smi_inst);
-+		break;
-+	}
-+	case BCM2835_SMI_IOC_ADDRESS:
-+		dev_info(inst->dev, "SMI address set: 0x%02x", (int)arg);
-+		bcm2835_smi_set_address(smi_inst, arg);
-+		break;
-+	default:
-+		dev_err(inst->dev, "invalid ioctl cmd: %d", cmd);
-+		ret = -ENOTTY;
-+		break;
-+	}
-+
-+	return ret;
-+}
-+
-+static int bcm2835_smi_open(struct inode *inode, struct file *file)
-+{
-+	int dev = iminor(inode);
-+
-+	dev_dbg(inst->dev, "SMI device opened.");
-+
-+	if (dev != DEVICE_MINOR) {
-+		dev_err(inst->dev,
-+			"bcm2835_smi_release: Unknown minor device: %d",
-+			dev);
-+		return -ENXIO;
-+	}
-+
-+	return 0;
-+}
-+
-+static int bcm2835_smi_release(struct inode *inode, struct file *file)
-+{
-+	int dev = iminor(inode);
-+
-+	if (dev != DEVICE_MINOR) {
-+		dev_err(inst->dev,
-+			"bcm2835_smi_release: Unknown minor device %d", dev);
-+		return -ENXIO;
-+	}
-+
-+	return 0;
-+}
-+
-+static ssize_t dma_bounce_user(
-+	enum dma_transfer_direction dma_dir,
-+	char __user *user_ptr,
-+	size_t count,
-+	struct bcm2835_smi_bounce_info *bounce)
-+{
-+	int chunk_size;
-+	int chunk_no = 0;
-+	int count_left = count;
-+
-+	while (count_left) {
-+		int rv;
-+		void *buf;
-+
-+		/* Wait for current chunk to complete: */
-+		if (down_timeout(&bounce->callback_sem,
-+			msecs_to_jiffies(1000))) {
-+			dev_err(inst->dev, "DMA bounce timed out");
-+			count -= (count_left);
-+			break;
-+		}
-+
-+		if (bounce->callback_sem.count >= DMA_BOUNCE_BUFFER_COUNT - 1)
-+			dev_err(inst->dev, "WARNING: Ring buffer overflow");
-+		chunk_size = count_left > DMA_BOUNCE_BUFFER_SIZE ?
-+			DMA_BOUNCE_BUFFER_SIZE : count_left;
-+		buf = bounce->buffer[chunk_no % DMA_BOUNCE_BUFFER_COUNT];
-+		if (dma_dir == DMA_DEV_TO_MEM)
-+			rv = copy_to_user(user_ptr, buf, chunk_size);
-+		else
-+			rv = copy_from_user(buf, user_ptr, chunk_size);
-+		if (rv)
-+			dev_err(inst->dev, "copy_*_user() failed!: %d", rv);
-+		user_ptr += chunk_size;
-+		count_left -= chunk_size;
-+		chunk_no++;
-+	}
-+	return count;
-+}
-+
-+static ssize_t
-+bcm2835_read_file(struct file *f, char __user *user_ptr,
-+		  size_t count, loff_t *offs)
-+{
-+	int odd_bytes;
-+	size_t count_check;
-+
-+	dev_dbg(inst->dev, "User reading %zu bytes from SMI.", count);
-+	/* We don't want to DMA a number of bytes % 4 != 0 (32 bit FIFO) */
-+	if (count > DMA_THRESHOLD_BYTES)
-+		odd_bytes = count & 0x3;
-+	else
-+		odd_bytes = count;
-+	count -= odd_bytes;
-+	count_check = count;
-+	if (count) {
-+		struct bcm2835_smi_bounce_info *bounce;
-+
-+		count = bcm2835_smi_user_dma(smi_inst,
-+			DMA_DEV_TO_MEM, user_ptr, count,
-+			&bounce);
-+		if (count)
-+			count = dma_bounce_user(DMA_DEV_TO_MEM, user_ptr,
-+				count, bounce);
-+	}
-+	if (odd_bytes && (count == count_check)) {
-+		/* Read from FIFO directly if not using DMA */
-+		uint8_t buf[DMA_THRESHOLD_BYTES];
-+		unsigned long bytes_not_transferred;
-+
-+		bcm2835_smi_read_buf(smi_inst, buf, odd_bytes);
-+		bytes_not_transferred = copy_to_user(user_ptr + count, buf, odd_bytes);
-+		if (bytes_not_transferred)
-+			dev_err(inst->dev, "copy_to_user() failed.");
-+		count += odd_bytes - bytes_not_transferred;
-+	}
-+	return count;
-+}
-+
-+static ssize_t
-+bcm2835_write_file(struct file *f, const char __user *user_ptr,
-+		   size_t count, loff_t *offs)
-+{
-+	int odd_bytes;
-+	size_t count_check;
-+
-+	dev_dbg(inst->dev, "User writing %zu bytes to SMI.", count);
-+	if (count > DMA_THRESHOLD_BYTES)
-+		odd_bytes = count & 0x3;
-+	else
-+		odd_bytes = count;
-+	count -= odd_bytes;
-+	count_check = count;
-+	if (count) {
-+		struct bcm2835_smi_bounce_info *bounce;
-+
-+		count = bcm2835_smi_user_dma(smi_inst,
-+			DMA_MEM_TO_DEV, (char __user *)user_ptr, count,
-+			&bounce);
-+		if (count)
-+			count = dma_bounce_user(DMA_MEM_TO_DEV,
-+				(char __user *)user_ptr,
-+				count, bounce);
-+	}
-+	if (odd_bytes && (count == count_check)) {
-+		uint8_t buf[DMA_THRESHOLD_BYTES];
-+		unsigned long bytes_not_transferred;
-+
-+		bytes_not_transferred = copy_from_user(buf, user_ptr + count, odd_bytes);
-+		if (bytes_not_transferred)
-+			dev_err(inst->dev, "copy_from_user() failed.");
-+		else
-+			bcm2835_smi_write_buf(smi_inst, buf, odd_bytes);
-+		count += odd_bytes - bytes_not_transferred;
-+	}
-+	return count;
-+}
-+
-+static const struct file_operations
-+bcm2835_smi_fops = {
-+	.owner = THIS_MODULE,
-+	.unlocked_ioctl = bcm2835_smi_ioctl,
-+	.open = bcm2835_smi_open,
-+	.release = bcm2835_smi_release,
-+	.read = bcm2835_read_file,
-+	.write = bcm2835_write_file,
-+};
-+
-+
-+/****************************************************************************
-+*
-+*   bcm2835_smi_probe - called when the driver is loaded.
-+*
-+***************************************************************************/
-+
-+static int bcm2835_smi_dev_probe(struct platform_device *pdev)
-+{
-+	int err;
-+	void *ptr_err;
-+	struct device *dev = &pdev->dev;
-+	struct device_node *node = dev->of_node, *smi_node;
-+
-+	if (!node) {
-+		dev_err(dev, "No device tree node supplied!");
-+		return -EINVAL;
-+	}
-+
-+	smi_node = of_parse_phandle(node, "smi_handle", 0);
-+
-+	if (!smi_node) {
-+		dev_err(dev, "No such property: smi_handle");
-+		return -ENXIO;
-+	}
-+
-+	smi_inst = bcm2835_smi_get(smi_node);
-+
-+	if (!smi_inst)
-+		return -EPROBE_DEFER;
-+
-+	/* Allocate buffers and instance data */
-+
-+	inst = devm_kzalloc(dev, sizeof(*inst), GFP_KERNEL);
-+
-+	if (!inst)
-+		return -ENOMEM;
-+
-+	inst->dev = dev;
-+
-+	/* Create character device entries */
-+
-+	err = alloc_chrdev_region(&bcm2835_smi_devid,
-+				  DEVICE_MINOR, 1, DEVICE_NAME);
-+	if (err != 0) {
-+		dev_err(inst->dev, "unable to allocate device number");
-+		return -ENOMEM;
-+	}
-+	cdev_init(&bcm2835_smi_cdev, &bcm2835_smi_fops);
-+	bcm2835_smi_cdev.owner = THIS_MODULE;
-+	err = cdev_add(&bcm2835_smi_cdev, bcm2835_smi_devid, 1);
-+	if (err != 0) {
-+		dev_err(inst->dev, "unable to register device");
-+		err = -ENOMEM;
-+		goto failed_cdev_add;
-+	}
-+
-+	/* Create sysfs entries */
-+
-+	bcm2835_smi_class = class_create(THIS_MODULE, DEVICE_NAME);
-+	ptr_err = bcm2835_smi_class;
-+	if (IS_ERR(ptr_err))
-+		goto failed_class_create;
-+
-+	bcm2835_smi_dev = device_create(bcm2835_smi_class, NULL,
-+					bcm2835_smi_devid, NULL,
-+					"smi");
-+	ptr_err = bcm2835_smi_dev;
-+	if (IS_ERR(ptr_err))
-+		goto failed_device_create;
-+
-+	dev_info(inst->dev, "initialised");
-+
-+	return 0;
-+
-+failed_device_create:
-+	class_destroy(bcm2835_smi_class);
-+failed_class_create:
-+	cdev_del(&bcm2835_smi_cdev);
-+	err = PTR_ERR(ptr_err);
-+failed_cdev_add:
-+	unregister_chrdev_region(bcm2835_smi_devid, 1);
-+	dev_err(dev, "could not load bcm2835_smi_dev");
-+	return err;
-+}
-+
-+/****************************************************************************
-+*
-+*   bcm2835_smi_remove - called when the driver is unloaded.
-+*
-+***************************************************************************/
-+
-+static int bcm2835_smi_dev_remove(struct platform_device *pdev)
-+{
-+	device_destroy(bcm2835_smi_class, bcm2835_smi_devid);
-+	class_destroy(bcm2835_smi_class);
-+	cdev_del(&bcm2835_smi_cdev);
-+	unregister_chrdev_region(bcm2835_smi_devid, 1);
-+
-+	dev_info(inst->dev, "SMI character dev removed - OK");
-+	return 0;
-+}
-+
-+/****************************************************************************
-+*
-+*   Register the driver with device tree
-+*
-+***************************************************************************/
-+
-+static const struct of_device_id bcm2835_smi_dev_of_match[] = {
-+	{.compatible = "brcm,bcm2835-smi-dev",},
-+	{ /* sentinel */ },
-+};
-+
-+MODULE_DEVICE_TABLE(of, bcm2835_smi_dev_of_match);
-+
-+static struct platform_driver bcm2835_smi_dev_driver = {
-+	.probe = bcm2835_smi_dev_probe,
-+	.remove = bcm2835_smi_dev_remove,
-+	.driver = {
-+		   .name = DRIVER_NAME,
-+		   .owner = THIS_MODULE,
-+		   .of_match_table = bcm2835_smi_dev_of_match,
-+		   },
-+};
-+
-+module_platform_driver(bcm2835_smi_dev_driver);
-+
-+MODULE_ALIAS("platform:smi-dev-bcm2835");
-+MODULE_LICENSE("GPL");
-+MODULE_DESCRIPTION(
-+	"Character device driver for BCM2835's secondary memory interface");
-+MODULE_AUTHOR("Luke Wren <luke@raspberrypi.org>");
---- a/drivers/misc/Kconfig
-+++ b/drivers/misc/Kconfig
-@@ -9,6 +9,14 @@ config SENSORS_LIS3LV02D
- 	tristate
- 	depends on INPUT
- 
-+config BCM2835_SMI
-+	tristate "Broadcom 283x Secondary Memory Interface driver"
-+	depends on ARCH_BCM2835
-+	default m
-+	help
-+		Driver for enabling and using Broadcom's Secondary/Slow Memory Interface.
-+		Appears as /dev/bcm2835_smi. For ioctl interface see drivers/misc/bcm2835_smi.h
-+
- config AD525X_DPOT
- 	tristate "Analog Devices Digital Potentiometers"
- 	depends on (I2C || SPI) && SYSFS
---- a/drivers/misc/Makefile
-+++ b/drivers/misc/Makefile
-@@ -9,6 +9,7 @@ obj-$(CONFIG_AD525X_DPOT)	+= ad525x_dpot
- obj-$(CONFIG_AD525X_DPOT_I2C)	+= ad525x_dpot-i2c.o
- obj-$(CONFIG_AD525X_DPOT_SPI)	+= ad525x_dpot-spi.o
- obj-$(CONFIG_ATMEL_SSC)		+= atmel-ssc.o
-+obj-$(CONFIG_BCM2835_SMI)	+= bcm2835_smi.o
- obj-$(CONFIG_DUMMY_IRQ)		+= dummy-irq.o
- obj-$(CONFIG_ICS932S401)	+= ics932s401.o
- obj-$(CONFIG_LKDTM)		+= lkdtm/
---- /dev/null
-+++ b/drivers/misc/bcm2835_smi.c
-@@ -0,0 +1,955 @@
-+/**
-+ * Broadcom Secondary Memory Interface driver
-+ *
-+ * Written by Luke Wren <luke@raspberrypi.org>
-+ * Copyright (c) 2015, Raspberry Pi (Trading) Ltd.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions, and the following disclaimer,
-+ *    without modification.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. The names of the above-listed copyright holders may not be used
-+ *    to endorse or promote products derived from this software without
-+ *    specific prior written permission.
-+ *
-+ * ALTERNATIVELY, this software may be distributed under the terms of the
-+ * GNU General Public License ("GPL") version 2, as published by the Free
-+ * Software Foundation.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include <linux/clk.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/platform_device.h>
-+#include <linux/of_address.h>
-+#include <linux/of_platform.h>
-+#include <linux/mm.h>
-+#include <linux/slab.h>
-+#include <linux/pagemap.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/dmaengine.h>
-+#include <linux/semaphore.h>
-+#include <linux/spinlock.h>
-+#include <linux/io.h>
-+
-+#define BCM2835_SMI_IMPLEMENTATION
-+#include <linux/broadcom/bcm2835_smi.h>
-+
-+#define DRIVER_NAME "smi-bcm2835"
-+
-+#define N_PAGES_FROM_BYTES(n) ((n + PAGE_SIZE-1) / PAGE_SIZE)
-+
-+#define DMA_WRITE_TO_MEM true
-+#define DMA_READ_FROM_MEM false
-+
-+struct bcm2835_smi_instance {
-+	struct device *dev;
-+	struct smi_settings settings;
-+	__iomem void *smi_regs_ptr;
-+	dma_addr_t smi_regs_busaddr;
-+
-+	struct dma_chan *dma_chan;
-+	struct dma_slave_config dma_config;
-+
-+	struct bcm2835_smi_bounce_info bounce;
-+
-+	struct scatterlist buffer_sgl;
-+
-+	struct clk *clk;
-+
-+	/* Sometimes we are called into in an atomic context (e.g. by
-+	   JFFS2 + MTD) so we can't use a mutex */
-+	spinlock_t transaction_lock;
-+};
-+
-+/****************************************************************************
-+*
-+*   SMI peripheral setup
-+*
-+***************************************************************************/
-+
-+static inline void write_smi_reg(struct bcm2835_smi_instance *inst,
-+	u32 val, unsigned reg)
-+{
-+	writel(val, inst->smi_regs_ptr + reg);
-+}
-+
-+static inline u32 read_smi_reg(struct bcm2835_smi_instance *inst, unsigned reg)
-+{
-+	return readl(inst->smi_regs_ptr + reg);
-+}
-+
-+/* Token-paste macro for e.g SMIDSR_RSTROBE ->  value of SMIDSR_RSTROBE_MASK */
-+#define _CONCAT(x, y) x##y
-+#define CONCAT(x, y) _CONCAT(x, y)
-+
-+#define SET_BIT_FIELD(dest, field, bits) ((dest) = \
-+	((dest) & ~CONCAT(field, _MASK)) | (((bits) << CONCAT(field, _OFFS))& \
-+	 CONCAT(field, _MASK)))
-+#define GET_BIT_FIELD(src, field) (((src) & \
-+	CONCAT(field, _MASK)) >> CONCAT(field, _OFFS))
-+
-+static void smi_dump_context_labelled(struct bcm2835_smi_instance *inst,
-+	const char *label)
-+{
-+	dev_err(inst->dev, "SMI context dump: %s", label);
-+	dev_err(inst->dev, "SMICS:  0x%08x", read_smi_reg(inst, SMICS));
-+	dev_err(inst->dev, "SMIL:   0x%08x", read_smi_reg(inst, SMIL));
-+	dev_err(inst->dev, "SMIDSR: 0x%08x", read_smi_reg(inst, SMIDSR0));
-+	dev_err(inst->dev, "SMIDSW: 0x%08x", read_smi_reg(inst, SMIDSW0));
-+	dev_err(inst->dev, "SMIDC:  0x%08x", read_smi_reg(inst, SMIDC));
-+	dev_err(inst->dev, "SMIFD:  0x%08x", read_smi_reg(inst, SMIFD));
-+	dev_err(inst->dev, " ");
-+}
-+
-+static inline void smi_dump_context(struct bcm2835_smi_instance *inst)
-+{
-+	smi_dump_context_labelled(inst, "");
-+}
-+
-+static void smi_get_default_settings(struct bcm2835_smi_instance *inst)
-+{
-+	struct smi_settings *settings = &inst->settings;
-+
-+	settings->data_width = SMI_WIDTH_16BIT;
-+	settings->pack_data = true;
-+
-+	settings->read_setup_time = 1;
-+	settings->read_hold_time = 1;
-+	settings->read_pace_time = 1;
-+	settings->read_strobe_time = 3;
-+
-+	settings->write_setup_time = settings->read_setup_time;
-+	settings->write_hold_time = settings->read_hold_time;
-+	settings->write_pace_time = settings->read_pace_time;
-+	settings->write_strobe_time = settings->read_strobe_time;
-+
-+	settings->dma_enable = true;
-+	settings->dma_passthrough_enable = false;
-+	settings->dma_read_thresh = 0x01;
-+	settings->dma_write_thresh = 0x3f;
-+	settings->dma_panic_read_thresh = 0x20;
-+	settings->dma_panic_write_thresh = 0x20;
-+}
-+
-+void bcm2835_smi_set_regs_from_settings(struct bcm2835_smi_instance *inst)
-+{
-+	struct smi_settings *settings = &inst->settings;
-+	int smidsr_temp = 0, smidsw_temp = 0, smics_temp,
-+	    smidcs_temp, smidc_temp = 0;
-+
-+	spin_lock(&inst->transaction_lock);
-+
-+	/* temporarily disable the peripheral: */
-+	smics_temp = read_smi_reg(inst, SMICS);
-+	write_smi_reg(inst, 0, SMICS);
-+	smidcs_temp = read_smi_reg(inst, SMIDCS);
-+	write_smi_reg(inst, 0, SMIDCS);
-+
-+	if (settings->pack_data)
-+		smics_temp |= SMICS_PXLDAT;
-+	else
-+		smics_temp &= ~SMICS_PXLDAT;
-+
-+	SET_BIT_FIELD(smidsr_temp, SMIDSR_RWIDTH, settings->data_width);
-+	SET_BIT_FIELD(smidsr_temp, SMIDSR_RSETUP, settings->read_setup_time);
-+	SET_BIT_FIELD(smidsr_temp, SMIDSR_RHOLD, settings->read_hold_time);
-+	SET_BIT_FIELD(smidsr_temp, SMIDSR_RPACE, settings->read_pace_time);
-+	SET_BIT_FIELD(smidsr_temp, SMIDSR_RSTROBE, settings->read_strobe_time);
-+	write_smi_reg(inst, smidsr_temp, SMIDSR0);
-+
-+	SET_BIT_FIELD(smidsw_temp, SMIDSW_WWIDTH, settings->data_width);
-+	if (settings->data_width == SMI_WIDTH_8BIT)
-+		smidsw_temp |= SMIDSW_WSWAP;
-+	else
-+		smidsw_temp &= ~SMIDSW_WSWAP;
-+	SET_BIT_FIELD(smidsw_temp, SMIDSW_WSETUP, settings->write_setup_time);
-+	SET_BIT_FIELD(smidsw_temp, SMIDSW_WHOLD, settings->write_hold_time);
-+	SET_BIT_FIELD(smidsw_temp, SMIDSW_WPACE, settings->write_pace_time);
-+	SET_BIT_FIELD(smidsw_temp, SMIDSW_WSTROBE,
-+			settings->write_strobe_time);
-+	write_smi_reg(inst, smidsw_temp, SMIDSW0);
-+
-+	SET_BIT_FIELD(smidc_temp, SMIDC_REQR, settings->dma_read_thresh);
-+	SET_BIT_FIELD(smidc_temp, SMIDC_REQW, settings->dma_write_thresh);
-+	SET_BIT_FIELD(smidc_temp, SMIDC_PANICR,
-+		      settings->dma_panic_read_thresh);
-+	SET_BIT_FIELD(smidc_temp, SMIDC_PANICW,
-+		      settings->dma_panic_write_thresh);
-+	if (settings->dma_passthrough_enable) {
-+		smidc_temp |= SMIDC_DMAP;
-+		smidsr_temp |= SMIDSR_RDREQ;
-+		write_smi_reg(inst, smidsr_temp, SMIDSR0);
-+		smidsw_temp |= SMIDSW_WDREQ;
-+		write_smi_reg(inst, smidsw_temp, SMIDSW0);
-+	} else
-+		smidc_temp &= ~SMIDC_DMAP;
-+	if (settings->dma_enable)
-+		smidc_temp |= SMIDC_DMAEN;
-+	else
-+		smidc_temp &= ~SMIDC_DMAEN;
-+
-+	write_smi_reg(inst, smidc_temp, SMIDC);
-+
-+	/* re-enable (if was previously enabled) */
-+	write_smi_reg(inst, smics_temp, SMICS);
-+	write_smi_reg(inst, smidcs_temp, SMIDCS);
-+
-+	spin_unlock(&inst->transaction_lock);
-+}
-+EXPORT_SYMBOL(bcm2835_smi_set_regs_from_settings);
-+
-+struct smi_settings *bcm2835_smi_get_settings_from_regs
-+	(struct bcm2835_smi_instance *inst)
-+{
-+	struct smi_settings *settings = &inst->settings;
-+	int smidsr, smidsw, smidc;
-+
-+	spin_lock(&inst->transaction_lock);
-+
-+	smidsr = read_smi_reg(inst, SMIDSR0);
-+	smidsw = read_smi_reg(inst, SMIDSW0);
-+	smidc = read_smi_reg(inst, SMIDC);
-+
-+	settings->pack_data = (read_smi_reg(inst, SMICS) & SMICS_PXLDAT) ?
-+	    true : false;
-+
-+	settings->data_width = GET_BIT_FIELD(smidsr, SMIDSR_RWIDTH);
-+	settings->read_setup_time = GET_BIT_FIELD(smidsr, SMIDSR_RSETUP);
-+	settings->read_hold_time = GET_BIT_FIELD(smidsr, SMIDSR_RHOLD);
-+	settings->read_pace_time = GET_BIT_FIELD(smidsr, SMIDSR_RPACE);
-+	settings->read_strobe_time = GET_BIT_FIELD(smidsr, SMIDSR_RSTROBE);
-+
-+	settings->write_setup_time = GET_BIT_FIELD(smidsw, SMIDSW_WSETUP);
-+	settings->write_hold_time = GET_BIT_FIELD(smidsw, SMIDSW_WHOLD);
-+	settings->write_pace_time = GET_BIT_FIELD(smidsw, SMIDSW_WPACE);
-+	settings->write_strobe_time = GET_BIT_FIELD(smidsw, SMIDSW_WSTROBE);
-+
-+	settings->dma_read_thresh = GET_BIT_FIELD(smidc, SMIDC_REQR);
-+	settings->dma_write_thresh = GET_BIT_FIELD(smidc, SMIDC_REQW);
-+	settings->dma_panic_read_thresh = GET_BIT_FIELD(smidc, SMIDC_PANICR);
-+	settings->dma_panic_write_thresh = GET_BIT_FIELD(smidc, SMIDC_PANICW);
-+	settings->dma_passthrough_enable = (smidc & SMIDC_DMAP) ? true : false;
-+	settings->dma_enable = (smidc & SMIDC_DMAEN) ? true : false;
-+
-+	spin_unlock(&inst->transaction_lock);
-+
-+	return settings;
-+}
-+EXPORT_SYMBOL(bcm2835_smi_get_settings_from_regs);
-+
-+static inline void smi_set_address(struct bcm2835_smi_instance *inst,
-+	unsigned int address)
-+{
-+	int smia_temp = 0, smida_temp = 0;
-+
-+	SET_BIT_FIELD(smia_temp, SMIA_ADDR, address);
-+	SET_BIT_FIELD(smida_temp, SMIDA_ADDR, address);
-+
-+	/* Write to both address registers - user doesn't care whether we're
-+	   doing programmed or direct transfers. */
-+	write_smi_reg(inst, smia_temp, SMIA);
-+	write_smi_reg(inst, smida_temp, SMIDA);
-+}
-+
-+static void smi_setup_regs(struct bcm2835_smi_instance *inst)
-+{
-+
-+	dev_dbg(inst->dev, "Initialising SMI registers...");
-+	/* Disable the peripheral if already enabled */
-+	write_smi_reg(inst, 0, SMICS);
-+	write_smi_reg(inst, 0, SMIDCS);
-+
-+	smi_get_default_settings(inst);
-+	bcm2835_smi_set_regs_from_settings(inst);
-+	smi_set_address(inst, 0);
-+
-+	write_smi_reg(inst, read_smi_reg(inst, SMICS) | SMICS_ENABLE, SMICS);
-+	write_smi_reg(inst, read_smi_reg(inst, SMIDCS) | SMIDCS_ENABLE,
-+		SMIDCS);
-+}
-+
-+/****************************************************************************
-+*
-+*   Low-level SMI access functions
-+*   Other modules should use the exported higher-level functions e.g.
-+*   bcm2835_smi_write_buf() unless they have a good reason to use these
-+*
-+***************************************************************************/
-+
-+static inline uint32_t smi_read_single_word(struct bcm2835_smi_instance *inst)
-+{
-+	int timeout = 0;
-+
-+	write_smi_reg(inst, SMIDCS_ENABLE, SMIDCS);
-+	write_smi_reg(inst, SMIDCS_ENABLE | SMIDCS_START, SMIDCS);
-+	/* Make sure things happen in the right order...*/
-+	mb();
-+	while (!(read_smi_reg(inst, SMIDCS) & SMIDCS_DONE) &&
-+		++timeout < 10000)
-+		;
-+	if (timeout < 10000)
-+		return read_smi_reg(inst, SMIDD);
-+
-+	dev_err(inst->dev,
-+		"SMI direct read timed out (is the clock set up correctly?)");
-+	return 0;
-+}
-+
-+static inline void smi_write_single_word(struct bcm2835_smi_instance *inst,
-+	uint32_t data)
-+{
-+	int timeout = 0;
-+
-+	write_smi_reg(inst, SMIDCS_ENABLE | SMIDCS_WRITE, SMIDCS);
-+	write_smi_reg(inst, data, SMIDD);
-+	write_smi_reg(inst, SMIDCS_ENABLE | SMIDCS_WRITE | SMIDCS_START,
-+		SMIDCS);
-+
-+	while (!(read_smi_reg(inst, SMIDCS) & SMIDCS_DONE) &&
-+		++timeout < 10000)
-+		;
-+	if (timeout >= 10000)
-+		dev_err(inst->dev,
-+		"SMI direct write timed out (is the clock set up correctly?)");
-+}
-+
-+/* Initiates a programmed read into the read FIFO. It is up to the caller to
-+ * read data from the FIFO -  either via paced DMA transfer,
-+ * or polling SMICS_RXD to check whether data is available.
-+ * SMICS_ACTIVE will go low upon completion. */
-+static void smi_init_programmed_read(struct bcm2835_smi_instance *inst,
-+	int num_transfers)
-+{
-+	int smics_temp;
-+
-+	/* Disable the peripheral: */
-+	smics_temp = read_smi_reg(inst, SMICS) & ~(SMICS_ENABLE | SMICS_WRITE);
-+	write_smi_reg(inst, smics_temp, SMICS);
-+	while (read_smi_reg(inst, SMICS) & SMICS_ENABLE)
-+		;
-+
-+	/* Program the transfer count: */
-+	write_smi_reg(inst, num_transfers, SMIL);
-+
-+	/* re-enable and start: */
-+	smics_temp |= SMICS_ENABLE;
-+	write_smi_reg(inst, smics_temp, SMICS);
-+	smics_temp |= SMICS_CLEAR;
-+	/* Just to be certain: */
-+	mb();
-+	while (read_smi_reg(inst, SMICS) & SMICS_ACTIVE)
-+		;
-+	write_smi_reg(inst, smics_temp, SMICS);
-+	smics_temp |= SMICS_START;
-+	write_smi_reg(inst, smics_temp, SMICS);
-+}
-+
-+/* Initiates a programmed write sequence, using data from the write FIFO.
-+ * It is up to the caller to initiate a DMA transfer before calling,
-+ * or use another method to keep the write FIFO topped up.
-+ * SMICS_ACTIVE will go low upon completion.
-+ */
-+static void smi_init_programmed_write(struct bcm2835_smi_instance *inst,
-+	int num_transfers)
-+{
-+	int smics_temp;
-+
-+	/* Disable the peripheral: */
-+	smics_temp = read_smi_reg(inst, SMICS) & ~SMICS_ENABLE;
-+	write_smi_reg(inst, smics_temp, SMICS);
-+	while (read_smi_reg(inst, SMICS) & SMICS_ENABLE)
-+		;
-+
-+	/* Program the transfer count: */
-+	write_smi_reg(inst, num_transfers, SMIL);
-+
-+	/* setup, re-enable and start: */
-+	smics_temp |= SMICS_WRITE | SMICS_ENABLE;
-+	write_smi_reg(inst, smics_temp, SMICS);
-+	smics_temp |= SMICS_START;
-+	write_smi_reg(inst, smics_temp, SMICS);
-+}
-+
-+/* Initiate a read and then poll FIFO for data, reading out as it appears. */
-+static void smi_read_fifo(struct bcm2835_smi_instance *inst,
-+	uint32_t *dest, int n_bytes)
-+{
-+	if (read_smi_reg(inst, SMICS) & SMICS_RXD) {
-+		smi_dump_context_labelled(inst,
-+			"WARNING: read FIFO not empty at start of read call.");
-+		while (read_smi_reg(inst, SMICS))
-+			;
-+	}
-+
-+	/* Dispatch the read: */
-+	if (inst->settings.data_width == SMI_WIDTH_8BIT)
-+		smi_init_programmed_read(inst, n_bytes);
-+	else if (inst->settings.data_width == SMI_WIDTH_16BIT)
-+		smi_init_programmed_read(inst, n_bytes / 2);
-+	else {
-+		dev_err(inst->dev, "Unsupported data width for read.");
-+		return;
-+	}
-+
-+	/* Poll FIFO to keep it empty */
-+	while (!(read_smi_reg(inst, SMICS) & SMICS_DONE))
-+		if (read_smi_reg(inst, SMICS) & SMICS_RXD)
-+			*dest++ = read_smi_reg(inst, SMID);
-+
-+	/* Ensure that the FIFO is emptied */
-+	if (read_smi_reg(inst, SMICS) & SMICS_RXD) {
-+		int fifo_count;
-+
-+		fifo_count = GET_BIT_FIELD(read_smi_reg(inst, SMIFD),
-+			SMIFD_FCNT);
-+		while (fifo_count--)
-+			*dest++ = read_smi_reg(inst, SMID);
-+	}
-+
-+	if (!(read_smi_reg(inst, SMICS) & SMICS_DONE))
-+		smi_dump_context_labelled(inst,
-+			"WARNING: transaction finished but done bit not set.");
-+
-+	if (read_smi_reg(inst, SMICS) & SMICS_RXD)
-+		smi_dump_context_labelled(inst,
-+			"WARNING: read FIFO not empty at end of read call.");
-+
-+}
-+
-+/* Initiate a write, and then keep the FIFO topped up. */
-+static void smi_write_fifo(struct bcm2835_smi_instance *inst,
-+	uint32_t *src, int n_bytes)
-+{
-+	int i, timeout = 0;
-+
-+	/* Empty FIFOs if not already so */
-+	if (!(read_smi_reg(inst, SMICS) & SMICS_TXE)) {
-+		smi_dump_context_labelled(inst,
-+		    "WARNING: write fifo not empty at start of write call.");
-+		write_smi_reg(inst, read_smi_reg(inst, SMICS) | SMICS_CLEAR,
-+			SMICS);
-+	}
-+
-+	/* Initiate the transfer */
-+	if (inst->settings.data_width == SMI_WIDTH_8BIT)
-+		smi_init_programmed_write(inst, n_bytes);
-+	else if (inst->settings.data_width == SMI_WIDTH_16BIT)
-+		smi_init_programmed_write(inst, n_bytes / 2);
-+	else {
-+		dev_err(inst->dev, "Unsupported data width for write.");
-+		return;
-+	}
-+	/* Fill the FIFO: */
-+	for (i = 0; i < (n_bytes - 1) / 4 + 1; ++i) {
-+		while (!(read_smi_reg(inst, SMICS) & SMICS_TXD))
-+			;
-+		write_smi_reg(inst, *src++, SMID);
-+	}
-+	/* Busy wait... */
-+	while (!(read_smi_reg(inst, SMICS) & SMICS_DONE) && ++timeout <
-+		1000000)
-+		;
-+	if (timeout >= 1000000)
-+		smi_dump_context_labelled(inst,
-+			"Timed out on write operation!");
-+	if (!(read_smi_reg(inst, SMICS) & SMICS_TXE))
-+		smi_dump_context_labelled(inst,
-+			"WARNING: FIFO not empty at end of write operation.");
-+}
-+
-+/****************************************************************************
-+*
-+*   SMI DMA operations
-+*
-+***************************************************************************/
-+
-+/* Disable SMI and put it into the correct direction before doing DMA setup.
-+   Stops spurious DREQs during setup. Peripheral is re-enabled by init_*() */
-+static void smi_disable(struct bcm2835_smi_instance *inst,
-+	enum dma_transfer_direction direction)
-+{
-+	int smics_temp = read_smi_reg(inst, SMICS) & ~SMICS_ENABLE;
-+
-+	if (direction == DMA_DEV_TO_MEM)
-+		smics_temp &= ~SMICS_WRITE;
-+	else
-+		smics_temp |= SMICS_WRITE;
-+	write_smi_reg(inst, smics_temp, SMICS);
-+	while (read_smi_reg(inst, SMICS) & SMICS_ACTIVE)
-+		;
-+}
-+
-+static struct scatterlist *smi_scatterlist_from_buffer(
-+	struct bcm2835_smi_instance *inst,
-+	dma_addr_t buf,
-+	size_t len,
-+	struct scatterlist *sg)
-+{
-+	sg_init_table(sg, 1);
-+	sg_dma_address(sg) = buf;
-+	sg_dma_len(sg) = len;
-+	return sg;
-+}
-+
-+static void smi_dma_callback_user_copy(void *param)
-+{
-+	/* Notify the bottom half that a chunk is ready for user copy */
-+	struct bcm2835_smi_instance *inst =
-+		(struct bcm2835_smi_instance *)param;
-+
-+	up(&inst->bounce.callback_sem);
-+}
-+
-+/* Creates a descriptor, assigns the given callback, and submits the
-+   descriptor to dmaengine. Does not block - can queue up multiple
-+   descriptors and then wait for them all to complete.
-+   sg_len is the number of control blocks, NOT the number of bytes.
-+   dir can be DMA_MEM_TO_DEV or DMA_DEV_TO_MEM.
-+   callback can be NULL - in this case it is not called. */
-+static inline struct dma_async_tx_descriptor *smi_dma_submit_sgl(
-+	struct bcm2835_smi_instance *inst,
-+	struct scatterlist *sgl,
-+	size_t sg_len,
-+	enum dma_transfer_direction dir,
-+	dma_async_tx_callback callback)
-+{
-+	struct dma_async_tx_descriptor *desc;
-+
-+	desc = dmaengine_prep_slave_sg(inst->dma_chan,
-+				       sgl,
-+				       sg_len,
-+				       dir,
-+				       DMA_PREP_INTERRUPT | DMA_CTRL_ACK |
-+				       DMA_PREP_FENCE);
-+	if (!desc) {
-+		dev_err(inst->dev, "read_sgl: dma slave preparation failed!");
-+		write_smi_reg(inst, read_smi_reg(inst, SMICS) & ~SMICS_ACTIVE,
-+			SMICS);
-+		while (read_smi_reg(inst, SMICS) & SMICS_ACTIVE)
-+			cpu_relax();
-+		write_smi_reg(inst, read_smi_reg(inst, SMICS) | SMICS_ACTIVE,
-+			SMICS);
-+		return NULL;
-+	}
-+	desc->callback = callback;
-+	desc->callback_param = inst;
-+	if (dmaengine_submit(desc) < 0)
-+		return NULL;
-+	return desc;
-+}
-+
-+/* NB this function blocks until the transfer is complete */
-+static void
-+smi_dma_read_sgl(struct bcm2835_smi_instance *inst,
-+	struct scatterlist *sgl, size_t sg_len, size_t n_bytes)
-+{
-+	struct dma_async_tx_descriptor *desc;
-+
-+	/* Disable SMI and set to read before dispatching DMA - if SMI is in
-+	 * write mode and TX fifo is empty, it will generate a DREQ which may
-+	 * cause the read DMA to complete before the SMI read command is even
-+	 * dispatched! We want to dispatch DMA before SMI read so that reading
-+	 * is gapless, for logic analyser.
-+	 */
-+
-+	smi_disable(inst, DMA_DEV_TO_MEM);
-+
-+	desc = smi_dma_submit_sgl(inst, sgl, sg_len, DMA_DEV_TO_MEM, NULL);
-+	dma_async_issue_pending(inst->dma_chan);
-+
-+	if (inst->settings.data_width == SMI_WIDTH_8BIT)
-+		smi_init_programmed_read(inst, n_bytes);
-+	else
-+		smi_init_programmed_read(inst, n_bytes / 2);
-+
-+	if (dma_wait_for_async_tx(desc) == DMA_ERROR)
-+		smi_dump_context_labelled(inst, "DMA timeout!");
-+}
-+
-+static void
-+smi_dma_write_sgl(struct bcm2835_smi_instance *inst,
-+	struct scatterlist *sgl, size_t sg_len, size_t n_bytes)
-+{
-+	struct dma_async_tx_descriptor *desc;
-+
-+	if (inst->settings.data_width == SMI_WIDTH_8BIT)
-+		smi_init_programmed_write(inst, n_bytes);
-+	else
-+		smi_init_programmed_write(inst, n_bytes / 2);
-+
-+	desc = smi_dma_submit_sgl(inst, sgl, sg_len, DMA_MEM_TO_DEV, NULL);
-+	dma_async_issue_pending(inst->dma_chan);
-+
-+	if (dma_wait_for_async_tx(desc) == DMA_ERROR)
-+		smi_dump_context_labelled(inst, "DMA timeout!");
-+	else
-+		/* Wait for SMI to finish our writes */
-+		while (!(read_smi_reg(inst, SMICS) & SMICS_DONE))
-+			cpu_relax();
-+}
-+
-+ssize_t bcm2835_smi_user_dma(
-+	struct bcm2835_smi_instance *inst,
-+	enum dma_transfer_direction dma_dir,
-+	char __user *user_ptr, size_t count,
-+	struct bcm2835_smi_bounce_info **bounce)
-+{
-+	int chunk_no = 0, chunk_size, count_left = count;
-+	struct scatterlist *sgl;
-+	void (*init_trans_func)(struct bcm2835_smi_instance *, int);
-+
-+	spin_lock(&inst->transaction_lock);
-+
-+	if (dma_dir == DMA_DEV_TO_MEM)
-+		init_trans_func = smi_init_programmed_read;
-+	else
-+		init_trans_func = smi_init_programmed_write;
-+
-+	smi_disable(inst, dma_dir);
-+
-+	sema_init(&inst->bounce.callback_sem, 0);
-+	if (bounce)
-+		*bounce = &inst->bounce;
-+	while (count_left) {
-+		chunk_size = count_left > DMA_BOUNCE_BUFFER_SIZE ?
-+			DMA_BOUNCE_BUFFER_SIZE : count_left;
-+		if (chunk_size == DMA_BOUNCE_BUFFER_SIZE) {
-+			sgl =
-+			&inst->bounce.sgl[chunk_no % DMA_BOUNCE_BUFFER_COUNT];
-+		} else {
-+			sgl = smi_scatterlist_from_buffer(
-+				inst,
-+				inst->bounce.phys[
-+					chunk_no % DMA_BOUNCE_BUFFER_COUNT],
-+				chunk_size,
-+				&inst->buffer_sgl);
-+		}
-+
-+		if (!smi_dma_submit_sgl(inst, sgl, 1, dma_dir,
-+			smi_dma_callback_user_copy
-+		)) {
-+			dev_err(inst->dev, "sgl submit failed");
-+			count = 0;
-+			goto out;
-+		}
-+		count_left -= chunk_size;
-+		chunk_no++;
-+	}
-+	dma_async_issue_pending(inst->dma_chan);
-+
-+	if (inst->settings.data_width == SMI_WIDTH_8BIT)
-+		init_trans_func(inst, count);
-+	else if (inst->settings.data_width == SMI_WIDTH_16BIT)
-+		init_trans_func(inst, count / 2);
-+out:
-+	spin_unlock(&inst->transaction_lock);
-+	return count;
-+}
-+EXPORT_SYMBOL(bcm2835_smi_user_dma);
-+
-+
-+/****************************************************************************
-+*
-+*   High level buffer transfer functions - for use by other drivers
-+*
-+***************************************************************************/
-+
-+/* Buffer must be physically contiguous - i.e. kmalloc, not vmalloc! */
-+void bcm2835_smi_write_buf(
-+	struct bcm2835_smi_instance *inst,
-+	const void *buf, size_t n_bytes)
-+{
-+	int odd_bytes = n_bytes & 0x3;
-+
-+	n_bytes -= odd_bytes;
-+
-+	spin_lock(&inst->transaction_lock);
-+
-+	if (n_bytes > DMA_THRESHOLD_BYTES) {
-+		dma_addr_t phy_addr = dma_map_single(
-+			inst->dev,
-+			(void *)buf,
-+			n_bytes,
-+			DMA_TO_DEVICE);
-+		struct scatterlist *sgl =
-+			smi_scatterlist_from_buffer(inst, phy_addr, n_bytes,
-+				&inst->buffer_sgl);
-+
-+		if (!sgl) {
-+			smi_dump_context_labelled(inst,
-+			"Error: could not create scatterlist for write!");
-+			goto out;
-+		}
-+		smi_dma_write_sgl(inst, sgl, 1, n_bytes);
-+
-+		dma_unmap_single
-+			(inst->dev, phy_addr, n_bytes, DMA_TO_DEVICE);
-+	} else if (n_bytes) {
-+		smi_write_fifo(inst, (uint32_t *) buf, n_bytes);
-+	}
-+	buf += n_bytes;
-+
-+	if (inst->settings.data_width == SMI_WIDTH_8BIT) {
-+		while (odd_bytes--)
-+			smi_write_single_word(inst, *(uint8_t *) (buf++));
-+	} else {
-+		while (odd_bytes >= 2) {
-+			smi_write_single_word(inst, *(uint16_t *)buf);
-+			buf += 2;
-+			odd_bytes -= 2;
-+		}
-+		if (odd_bytes) {
-+			/* Reading an odd number of bytes on a 16 bit bus is
-+			   a user bug. It's kinder to fail early and tell them
-+			   than to e.g. transparently give them the bottom byte
-+			   of a 16 bit transfer. */
-+			dev_err(inst->dev,
-+		"WARNING: odd number of bytes specified for wide transfer.");
-+			dev_err(inst->dev,
-+		"At least one byte dropped as a result.");
-+			dump_stack();
-+		}
-+	}
-+out:
-+	spin_unlock(&inst->transaction_lock);
-+}
-+EXPORT_SYMBOL(bcm2835_smi_write_buf);
-+
-+void bcm2835_smi_read_buf(struct bcm2835_smi_instance *inst,
-+	void *buf, size_t n_bytes)
-+{
-+
-+	/* SMI is inherently 32-bit, which causes surprising amounts of mess
-+	   for bytes % 4 != 0. Easiest to avoid this mess altogether
-+	   by handling remainder separately. */
-+	int odd_bytes = n_bytes & 0x3;
-+
-+	spin_lock(&inst->transaction_lock);
-+	n_bytes -= odd_bytes;
-+	if (n_bytes > DMA_THRESHOLD_BYTES) {
-+		dma_addr_t phy_addr = dma_map_single(inst->dev,
-+						     buf, n_bytes,
-+						     DMA_FROM_DEVICE);
-+		struct scatterlist *sgl = smi_scatterlist_from_buffer(
-+			inst, phy_addr, n_bytes,
-+			&inst->buffer_sgl);
-+		if (!sgl) {
-+			smi_dump_context_labelled(inst,
-+			"Error: could not create scatterlist for read!");
-+			goto out;
-+		}
-+		smi_dma_read_sgl(inst, sgl, 1, n_bytes);
-+		dma_unmap_single(inst->dev, phy_addr, n_bytes, DMA_FROM_DEVICE);
-+	} else if (n_bytes) {
-+		smi_read_fifo(inst, (uint32_t *)buf, n_bytes);
-+	}
-+	buf += n_bytes;
-+
-+	if (inst->settings.data_width == SMI_WIDTH_8BIT) {
-+		while (odd_bytes--)
-+			*((uint8_t *) (buf++)) = smi_read_single_word(inst);
-+	} else {
-+		while (odd_bytes >= 2) {
-+			*(uint16_t *) buf = smi_read_single_word(inst);
-+			buf += 2;
-+			odd_bytes -= 2;
-+		}
-+		if (odd_bytes) {
-+			dev_err(inst->dev,
-+		"WARNING: odd number of bytes specified for wide transfer.");
-+			dev_err(inst->dev,
-+		"At least one byte dropped as a result.");
-+			dump_stack();
-+		}
-+	}
-+out:
-+	spin_unlock(&inst->transaction_lock);
-+}
-+EXPORT_SYMBOL(bcm2835_smi_read_buf);
-+
-+void bcm2835_smi_set_address(struct bcm2835_smi_instance *inst,
-+	unsigned int address)
-+{
-+	spin_lock(&inst->transaction_lock);
-+	smi_set_address(inst, address);
-+	spin_unlock(&inst->transaction_lock);
-+}
-+EXPORT_SYMBOL(bcm2835_smi_set_address);
-+
-+struct bcm2835_smi_instance *bcm2835_smi_get(struct device_node *node)
-+{
-+	struct platform_device *pdev;
-+
-+	if (!node)
-+		return NULL;
-+
-+	pdev = of_find_device_by_node(node);
-+	if (!pdev)
-+		return NULL;
-+
-+	return platform_get_drvdata(pdev);
-+}
-+EXPORT_SYMBOL(bcm2835_smi_get);
-+
-+/****************************************************************************
-+*
-+*   bcm2835_smi_probe - called when the driver is loaded.
-+*
-+***************************************************************************/
-+
-+static int bcm2835_smi_dma_setup(struct bcm2835_smi_instance *inst)
-+{
-+	int i, rv = 0;
-+
-+	inst->dma_chan = dma_request_slave_channel(inst->dev, "rx-tx");
-+
-+	inst->dma_config.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
-+	inst->dma_config.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
-+	inst->dma_config.src_addr = inst->smi_regs_busaddr + SMID;
-+	inst->dma_config.dst_addr = inst->dma_config.src_addr;
-+	/* Direction unimportant - always overridden by prep_slave_sg */
-+	inst->dma_config.direction = DMA_DEV_TO_MEM;
-+	dmaengine_slave_config(inst->dma_chan, &inst->dma_config);
-+	/* Alloc and map bounce buffers */
-+	for (i = 0; i < DMA_BOUNCE_BUFFER_COUNT; ++i) {
-+		inst->bounce.buffer[i] =
-+		dmam_alloc_coherent(inst->dev, DMA_BOUNCE_BUFFER_SIZE,
-+				&inst->bounce.phys[i],
-+				GFP_KERNEL);
-+		if (!inst->bounce.buffer[i]) {
-+			dev_err(inst->dev, "Could not allocate buffer!");
-+			rv = -ENOMEM;
-+			break;
-+		}
-+		smi_scatterlist_from_buffer(
-+			inst,
-+			inst->bounce.phys[i],
-+			DMA_BOUNCE_BUFFER_SIZE,
-+			&inst->bounce.sgl[i]
-+		);
-+	}
-+
-+	return rv;
-+}
-+
-+static int bcm2835_smi_probe(struct platform_device *pdev)
-+{
-+	int err;
-+	struct device *dev = &pdev->dev;
-+	struct device_node *node = dev->of_node;
-+	struct resource *ioresource;
-+	struct bcm2835_smi_instance *inst;
-+	const __be32 *addr;
-+
-+	/* We require device tree support */
-+	if (!node)
-+		return -EINVAL;
-+	/* Allocate buffers and instance data */
-+	inst = devm_kzalloc(dev, sizeof(struct bcm2835_smi_instance),
-+		GFP_KERNEL);
-+	if (!inst)
-+		return -ENOMEM;
-+
-+	inst->dev = dev;
-+	spin_lock_init(&inst->transaction_lock);
-+
-+	ioresource = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	inst->smi_regs_ptr = devm_ioremap_resource(dev, ioresource);
-+	if (IS_ERR(inst->smi_regs_ptr)) {
-+		err = PTR_ERR(inst->smi_regs_ptr);
-+		goto err;
-+	}
-+	addr = of_get_address(node, 0, NULL, NULL);
-+	inst->smi_regs_busaddr = be32_to_cpu(*addr);
-+
-+	err = bcm2835_smi_dma_setup(inst);
-+	if (err)
-+		goto err;
-+
-+	/* request clock */
-+	inst->clk = devm_clk_get(dev, NULL);
-+	if (!inst->clk)
-+		goto err;
-+	clk_prepare_enable(inst->clk);
-+
-+	/* Finally, do peripheral setup */
-+	smi_setup_regs(inst);
-+
-+	platform_set_drvdata(pdev, inst);
-+
-+	dev_info(inst->dev, "initialised");
-+
-+	return 0;
-+err:
-+	kfree(inst);
-+	return err;
-+}
-+
-+/****************************************************************************
-+*
-+*   bcm2835_smi_remove - called when the driver is unloaded.
-+*
-+***************************************************************************/
-+
-+static int bcm2835_smi_remove(struct platform_device *pdev)
-+{
-+	struct bcm2835_smi_instance *inst = platform_get_drvdata(pdev);
-+	struct device *dev = inst->dev;
-+
-+	dmaengine_terminate_all(inst->dma_chan);
-+	dma_release_channel(inst->dma_chan);
-+
-+	clk_disable_unprepare(inst->clk);
-+
-+	dev_info(dev, "SMI device removed - OK");
-+	return 0;
-+}
-+
-+/****************************************************************************
-+*
-+*   Register the driver with device tree
-+*
-+***************************************************************************/
-+
-+static const struct of_device_id bcm2835_smi_of_match[] = {
-+	{.compatible = "brcm,bcm2835-smi",},
-+	{ /* sentinel */ },
-+};
-+
-+MODULE_DEVICE_TABLE(of, bcm2835_smi_of_match);
-+
-+static struct platform_driver bcm2835_smi_driver = {
-+	.probe = bcm2835_smi_probe,
-+	.remove = bcm2835_smi_remove,
-+	.driver = {
-+		   .name = DRIVER_NAME,
-+		   .owner = THIS_MODULE,
-+		   .of_match_table = bcm2835_smi_of_match,
-+		   },
-+};
-+
-+module_platform_driver(bcm2835_smi_driver);
-+
-+MODULE_ALIAS("platform:smi-bcm2835");
-+MODULE_LICENSE("GPL");
-+MODULE_DESCRIPTION("Device driver for BCM2835's secondary memory interface");
-+MODULE_AUTHOR("Luke Wren <luke@raspberrypi.org>");
---- /dev/null
-+++ b/include/linux/broadcom/bcm2835_smi.h
-@@ -0,0 +1,391 @@
-+/**
-+ * Declarations and definitions for Broadcom's Secondary Memory Interface
-+ *
-+ * Written by Luke Wren <luke@raspberrypi.org>
-+ * Copyright (c) 2015, Raspberry Pi (Trading) Ltd.
-+ * Copyright (c) 2010-2012 Broadcom. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions, and the following disclaimer,
-+ *    without modification.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. The names of the above-listed copyright holders may not be used
-+ *    to endorse or promote products derived from this software without
-+ *    specific prior written permission.
-+ *
-+ * ALTERNATIVELY, this software may be distributed under the terms of the
-+ * GNU General Public License ("GPL") version 2, as published by the Free
-+ * Software Foundation.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#ifndef BCM2835_SMI_H
-+#define BCM2835_SMI_H
-+
-+#include <linux/ioctl.h>
-+
-+#ifndef __KERNEL__
-+#include <stdint.h>
-+#include <stdbool.h>
-+#endif
-+
-+#define BCM2835_SMI_IOC_MAGIC 0x1
-+#define BCM2835_SMI_INVALID_HANDLE (~0)
-+
-+/* IOCTLs 0x100...0x1ff are not device-specific - we can use them */
-+#define BCM2835_SMI_IOC_GET_SETTINGS    _IO(BCM2835_SMI_IOC_MAGIC, 0)
-+#define BCM2835_SMI_IOC_WRITE_SETTINGS  _IO(BCM2835_SMI_IOC_MAGIC, 1)
-+#define BCM2835_SMI_IOC_ADDRESS	 _IO(BCM2835_SMI_IOC_MAGIC, 2)
-+#define BCM2835_SMI_IOC_MAX	     2
-+
-+#define SMI_WIDTH_8BIT 0
-+#define SMI_WIDTH_16BIT 1
-+#define SMI_WIDTH_9BIT 2
-+#define SMI_WIDTH_18BIT 3
-+
-+/* max number of bytes where DMA will not be used */
-+#define DMA_THRESHOLD_BYTES 128
-+#define DMA_BOUNCE_BUFFER_SIZE (1024 * 1024 / 2)
-+#define DMA_BOUNCE_BUFFER_COUNT 3
-+
-+
-+struct smi_settings {
-+	int data_width;
-+	/* Whether or not to pack multiple SMI transfers into a
-+	   single 32 bit FIFO word */
-+	bool pack_data;
-+
-+	/* Timing for reads (writes the same but for WE)
-+	 *
-+	 * OE ----------+	   +--------------------
-+	 *		|	   |
-+	 *		+----------+
-+	 * SD -<==============================>-----------
-+	 * SA -<=========================================>-
-+	 *    <-setup->  <-strobe ->  <-hold ->  <- pace ->
-+	 */
-+
-+	int read_setup_time;
-+	int read_hold_time;
-+	int read_pace_time;
-+	int read_strobe_time;
-+
-+	int write_setup_time;
-+	int write_hold_time;
-+	int write_pace_time;
-+	int write_strobe_time;
-+
-+	bool dma_enable;		/* DREQs */
-+	bool dma_passthrough_enable;	/* External DREQs */
-+	int dma_read_thresh;
-+	int dma_write_thresh;
-+	int dma_panic_read_thresh;
-+	int dma_panic_write_thresh;
-+};
-+
-+/****************************************************************************
-+*
-+*   Declare exported SMI functions
-+*
-+***************************************************************************/
-+
-+#ifdef __KERNEL__
-+
-+#include <linux/dmaengine.h> /* for enum dma_transfer_direction */
-+#include <linux/of.h>
-+#include <linux/semaphore.h>
-+
-+struct bcm2835_smi_instance;
-+
-+struct bcm2835_smi_bounce_info {
-+	struct semaphore callback_sem;
-+	void *buffer[DMA_BOUNCE_BUFFER_COUNT];
-+	dma_addr_t phys[DMA_BOUNCE_BUFFER_COUNT];
-+	struct scatterlist sgl[DMA_BOUNCE_BUFFER_COUNT];
-+};
-+
-+
-+void bcm2835_smi_set_regs_from_settings(struct bcm2835_smi_instance *);
-+
-+struct smi_settings *bcm2835_smi_get_settings_from_regs(
-+	struct bcm2835_smi_instance *inst);
-+
-+void bcm2835_smi_write_buf(
-+	struct bcm2835_smi_instance *inst,
-+	const void *buf,
-+	size_t n_bytes);
-+
-+void bcm2835_smi_read_buf(
-+	struct bcm2835_smi_instance *inst,
-+	void *buf,
-+	size_t n_bytes);
-+
-+void bcm2835_smi_set_address(struct bcm2835_smi_instance *inst,
-+	unsigned int address);
-+
-+ssize_t bcm2835_smi_user_dma(
-+	struct bcm2835_smi_instance *inst,
-+	enum dma_transfer_direction dma_dir,
-+	char __user *user_ptr,
-+	size_t count,
-+	struct bcm2835_smi_bounce_info **bounce);
-+
-+struct bcm2835_smi_instance *bcm2835_smi_get(struct device_node *node);
-+
-+#endif /* __KERNEL__ */
-+
-+/****************************************************************
-+*
-+*	Implementation-only declarations
-+*
-+****************************************************************/
-+
-+#ifdef BCM2835_SMI_IMPLEMENTATION
-+
-+/* Clock manager registers for SMI clock: */
-+#define CM_SMI_BASE_ADDRESS ((BCM2708_PERI_BASE) + 0x1010b0)
-+/* Clock manager "password" to protect registers from spurious writes */
-+#define CM_PWD (0x5a << 24)
-+
-+#define CM_SMI_CTL	0x00
-+#define CM_SMI_DIV	0x04
-+
-+#define CM_SMI_CTL_FLIP (1 << 8)
-+#define CM_SMI_CTL_BUSY (1 << 7)
-+#define CM_SMI_CTL_KILL (1 << 5)
-+#define CM_SMI_CTL_ENAB (1 << 4)
-+#define CM_SMI_CTL_SRC_MASK (0xf)
-+#define CM_SMI_CTL_SRC_OFFS (0)
-+
-+#define CM_SMI_DIV_DIVI_MASK (0xf <<  12)
-+#define CM_SMI_DIV_DIVI_OFFS (12)
-+#define CM_SMI_DIV_DIVF_MASK (0xff << 4)
-+#define CM_SMI_DIV_DIVF_OFFS (4)
-+
-+/* SMI register mapping:*/
-+#define SMI_BASE_ADDRESS ((BCM2708_PERI_BASE) + 0x600000)
-+
-+#define SMICS	0x00	/* control + status register		*/
-+#define SMIL	0x04	/* length/count (n external txfers)	*/
-+#define SMIA	0x08	/* address register			*/
-+#define SMID	0x0c	/* data register			*/
-+#define SMIDSR0	0x10	/* device 0 read settings		*/
-+#define SMIDSW0	0x14	/* device 0 write settings		*/
-+#define SMIDSR1	0x18	/* device 1 read settings		*/
-+#define SMIDSW1	0x1c	/* device 1 write settings		*/
-+#define SMIDSR2	0x20	/* device 2 read settings		*/
-+#define SMIDSW2	0x24	/* device 2 write settings		*/
-+#define SMIDSR3	0x28	/* device 3 read settings		*/
-+#define SMIDSW3	0x2c	/* device 3 write settings		*/
-+#define SMIDC	0x30	/* DMA control registers		*/
-+#define SMIDCS	0x34	/* direct control/status register	*/
-+#define SMIDA	0x38	/* direct address register		*/
-+#define SMIDD	0x3c	/* direct data registers		*/
-+#define SMIFD	0x40	/* FIFO debug register			*/
-+
-+
-+
-+/* Control and Status register bits:
-+ * SMICS_RXF	: RX fifo full: 1 when RX fifo is full
-+ * SMICS_TXE	: TX fifo empty: 1 when empty.
-+ * SMICS_RXD	: RX fifo contains data: 1 when there is data.
-+ * SMICS_TXD	: TX fifo can accept data: 1 when true.
-+ * SMICS_RXR	: RX fifo needs reading: 1 when fifo more than 3/4 full, or
-+ *		  when "DONE" and fifo not emptied.
-+ * SMICS_TXW	: TX fifo needs writing: 1 when less than 1/4 full.
-+ * SMICS_AFERR	: AXI FIFO error: 1 when fifo read when empty or written
-+ *		  when full. Write 1 to clear.
-+ * SMICS_EDREQ	: 1 when external DREQ received.
-+ * SMICS_PXLDAT	:  Pixel data:	write 1 to enable pixel transfer modes.
-+ * SMICS_SETERR	: 1 if there was an error writing to setup regs (e.g.
-+ *		  tx was in progress). Write 1 to clear.
-+ * SMICS_PVMODE	: Set to 1 to enable pixel valve mode.
-+ * SMICS_INTR	: Set to 1 to enable interrupt on RX.
-+ * SMICS_INTT	: Set to 1 to enable interrupt on TX.
-+ * SMICS_INTD	: Set to 1 to enable interrupt on DONE condition.
-+ * SMICS_TEEN	: Tear effect mode enabled: Programmed transfers will wait
-+ *		  for a TE trigger before writing.
-+ * SMICS_PAD1	: Padding settings for external transfers. For writes: the
-+ *		  number of bytes initially written to  the TX fifo that
-+ * SMICS_PAD0	: should be ignored. For reads: the number of bytes that will
-+ *		  be read before the data, and should be dropped.
-+ * SMICS_WRITE	: Transfer direction: 1 = write to external device, 0 = read
-+ * SMICS_CLEAR	: Write 1 to clear the FIFOs.
-+ * SMICS_START	: Write 1 to start the programmed transfer.
-+ * SMICS_ACTIVE	: Reads as 1 when a programmed transfer is underway.
-+ * SMICS_DONE	: Reads as 1 when transfer finished. For RX, not set until
-+ *		  FIFO emptied.
-+ * SMICS_ENABLE	: Set to 1 to enable the SMI peripheral, 0 to disable.
-+ */
-+
-+#define SMICS_RXF	(1 << 31)
-+#define SMICS_TXE	(1 << 30)
-+#define SMICS_RXD	(1 << 29)
-+#define SMICS_TXD	(1 << 28)
-+#define SMICS_RXR	(1 << 27)
-+#define SMICS_TXW	(1 << 26)
-+#define SMICS_AFERR	(1 << 25)
-+#define SMICS_EDREQ	(1 << 15)
-+#define SMICS_PXLDAT	(1 << 14)
-+#define SMICS_SETERR	(1 << 13)
-+#define SMICS_PVMODE	(1 << 12)
-+#define SMICS_INTR	(1 << 11)
-+#define SMICS_INTT	(1 << 10)
-+#define SMICS_INTD	(1 << 9)
-+#define SMICS_TEEN	(1 << 8)
-+#define SMICS_PAD1	(1 << 7)
-+#define SMICS_PAD0	(1 << 6)
-+#define SMICS_WRITE	(1 << 5)
-+#define SMICS_CLEAR	(1 << 4)
-+#define SMICS_START	(1 << 3)
-+#define SMICS_ACTIVE	(1 << 2)
-+#define SMICS_DONE	(1 << 1)
-+#define SMICS_ENABLE	(1 << 0)
-+
-+/* Address register bits: */
-+
-+#define SMIA_DEVICE_MASK ((1 << 9) | (1 << 8))
-+#define SMIA_DEVICE_OFFS (8)
-+#define SMIA_ADDR_MASK (0x3f)	/* bits 5 -> 0 */
-+#define SMIA_ADDR_OFFS (0)
-+
-+/* DMA control register bits:
-+ * SMIDC_DMAEN	: DMA enable: set 1: DMA requests will be issued.
-+ * SMIDC_DMAP	: DMA passthrough: when set to 0, top two data pins are used by
-+ *		  SMI as usual. When set to 1, the top two pins are used for
-+ *		  external DREQs: pin 16 read request, 17 write.
-+ * SMIDC_PANIC*	: Threshold at which DMA will panic during read/write.
-+ * SMIDC_REQ*	: Threshold at which DMA will generate a DREQ.
-+ */
-+
-+#define SMIDC_DMAEN		(1 << 28)
-+#define SMIDC_DMAP		(1 << 24)
-+#define SMIDC_PANICR_MASK	(0x3f << 18)
-+#define SMIDC_PANICR_OFFS	(18)
-+#define SMIDC_PANICW_MASK	(0x3f << 12)
-+#define SMIDC_PANICW_OFFS	(12)
-+#define SMIDC_REQR_MASK		(0x3f << 6)
-+#define SMIDC_REQR_OFFS		(6)
-+#define SMIDC_REQW_MASK		(0x3f)
-+#define SMIDC_REQW_OFFS		(0)
-+
-+/* Device settings register bits: same for all 4 (or 3?) device register sets.
-+ * Device read settings:
-+ * SMIDSR_RWIDTH	: Read transfer width. 00 = 8bit, 01 = 16bit,
-+ *			  10 = 18bit, 11 = 9bit.
-+ * SMIDSR_RSETUP	: Read setup time: number of core cycles between chip
-+ *			  select/address and read strobe. Min 1, max 64.
-+ * SMIDSR_MODE68	: 1 for System 68 mode (i.e. enable + direction pins,
-+ *			  rather than OE + WE pin)
-+ * SMIDSR_FSETUP	: If set to 1, setup time only applies to first
-+ *			  transfer after address change.
-+ * SMIDSR_RHOLD		: Number of core cycles between read strobe going
-+ *			  inactive and CS/address going inactive. Min 1, max 64
-+ * SMIDSR_RPACEALL	: When set to 1, this device's RPACE value will always
-+ *			  be used for the next transaction, even if it is not
-+ *			  to this device.
-+ * SMIDSR_RPACE		: Number of core cycles spent waiting between CS
-+ *			  deassert and start of next transfer. Min 1, max 128
-+ * SMIDSR_RDREQ		: 1 = use external DMA request on SD16 to pace reads
-+ *			  from device. Must also set DMAP in SMICS.
-+ * SMIDSR_RSTROBE	: Number of cycles to assert the read strobe.
-+ *			  min 1, max 128.
-+ */
-+#define SMIDSR_RWIDTH_MASK	((1<<31)|(1<<30))
-+#define SMIDSR_RWIDTH_OFFS	(30)
-+#define SMIDSR_RSETUP_MASK	(0x3f << 24)
-+#define SMIDSR_RSETUP_OFFS	(24)
-+#define SMIDSR_MODE68		(1 << 23)
-+#define SMIDSR_FSETUP		(1 << 22)
-+#define SMIDSR_RHOLD_MASK	(0x3f << 16)
-+#define SMIDSR_RHOLD_OFFS	(16)
-+#define SMIDSR_RPACEALL		(1 << 15)
-+#define SMIDSR_RPACE_MASK	(0x7f << 8)
-+#define SMIDSR_RPACE_OFFS	(8)
-+#define SMIDSR_RDREQ		(1 << 7)
-+#define SMIDSR_RSTROBE_MASK	(0x7f)
-+#define SMIDSR_RSTROBE_OFFS	(0)
-+
-+/* Device write settings:
-+ * SMIDSW_WWIDTH	: Write transfer width. 00 = 8bit, 01 = 16bit,
-+ *			  10= 18bit, 11 = 9bit.
-+ * SMIDSW_WSETUP	: Number of cycles between CS assert and write strobe.
-+ *			  Min 1, max 64.
-+ * SMIDSW_WFORMAT	: Pixel format of input. 0 = 16bit RGB 565,
-+ *			  1 = 32bit RGBA 8888
-+ * SMIDSW_WSWAP		: 1 = swap pixel data bits. (Use with SMICS_PXLDAT)
-+ * SMIDSW_WHOLD		: Time between WE deassert and CS deassert. 1 to 64
-+ * SMIDSW_WPACEALL	: 1: this device's WPACE will be used for the next
-+ *			  transfer, regardless of that transfer's device.
-+ * SMIDSW_WPACE		: Cycles between CS deassert and next CS assert.
-+ *			  Min 1, max 128
-+ * SMIDSW_WDREQ		: Use external DREQ on pin 17 to pace writes. DMAP must
-+ *			  be set in SMICS.
-+ * SMIDSW_WSTROBE	: Number of cycles to assert the write strobe.
-+ *			  Min 1, max 128
-+ */
-+#define SMIDSW_WWIDTH_MASK	 ((1<<31)|(1<<30))
-+#define SMIDSW_WWIDTH_OFFS	(30)
-+#define SMIDSW_WSETUP_MASK	(0x3f << 24)
-+#define SMIDSW_WSETUP_OFFS	(24)
-+#define SMIDSW_WFORMAT		(1 << 23)
-+#define SMIDSW_WSWAP		(1 << 22)
-+#define SMIDSW_WHOLD_MASK	(0x3f << 16)
-+#define SMIDSW_WHOLD_OFFS	(16)
-+#define SMIDSW_WPACEALL		(1 << 15)
-+#define SMIDSW_WPACE_MASK	(0x7f << 8)
-+#define SMIDSW_WPACE_OFFS	(8)
-+#define SMIDSW_WDREQ		(1 << 7)
-+#define SMIDSW_WSTROBE_MASK	 (0x7f)
-+#define SMIDSW_WSTROBE_OFFS	 (0)
-+
-+/* Direct transfer control + status register
-+ * SMIDCS_WRITE	: Direction of transfer: 1 -> write, 0 -> read
-+ * SMIDCS_DONE	: 1 when a transfer has finished. Write 1 to clear.
-+ * SMIDCS_START	: Write 1 to start a transfer, if one is not already underway.
-+ * SMIDCE_ENABLE: Write 1 to enable SMI in direct mode.
-+ */
-+
-+#define SMIDCS_WRITE		(1 << 3)
-+#define SMIDCS_DONE		(1 << 2)
-+#define SMIDCS_START		(1 << 1)
-+#define SMIDCS_ENABLE		(1 << 0)
-+
-+/* Direct transfer address register
-+ * SMIDA_DEVICE	: Indicates which of the device settings banks should be used.
-+ * SMIDA_ADDR	: The value to be asserted on the address pins.
-+ */
-+
-+#define SMIDA_DEVICE_MASK	((1<<9)|(1<<8))
-+#define SMIDA_DEVICE_OFFS	(8)
-+#define SMIDA_ADDR_MASK		(0x3f)
-+#define SMIDA_ADDR_OFFS		(0)
-+
-+/* FIFO debug register
-+ * SMIFD_FLVL	: The high-tide mark of FIFO count during the most recent txfer
-+ * SMIFD_FCNT	: The current FIFO count.
-+ */
-+#define SMIFD_FLVL_MASK		(0x3f << 8)
-+#define SMIFD_FLVL_OFFS		(8)
-+#define SMIFD_FCNT_MASK		(0x3f)
-+#define SMIFD_FCNT_OFFS		(0)
-+
-+#endif /* BCM2835_SMI_IMPLEMENTATION */
-+
-+#endif /* BCM2835_SMI_H */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0116-Add-Chris-Boot-s-i2c-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0116-Add-Chris-Boot-s-i2c-driver.patch
deleted file mode 100644
index d5078f2160..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0116-Add-Chris-Boot-s-i2c-driver.patch
+++ /dev/null
@@ -1,660 +0,0 @@
-From caf678b0d6d14257f9b8584ee0a417cbc174f385 Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Wed, 17 Jun 2015 15:44:08 +0100
-Subject: [PATCH] Add Chris Boot's i2c driver
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-i2c-bcm2708: fixed baudrate
-
-Fixed issue where the wrong CDIV value was set for baudrates below 3815 Hz (for 250MHz bus clock).
-In that case the computed CDIV value was more than 0xffff. However the CDIV register width is only 16 bits.
-This resulted in incorrect setting of CDIV and higher baudrate than intended.
-Example: 3500Hz -> CDIV=0x11704 -> CDIV(16bit)=0x1704 -> 42430Hz
-After correction: 3500Hz -> CDIV=0x11704 -> CDIV(16bit)=0xffff -> 3815Hz
-The correct baudrate is shown in the log after the cdiv > 0xffff correction.
-
-Perform I2C combined transactions when possible
-
-Perform I2C combined transactions whenever possible, within the
-restrictions of the Broadcomm Serial Controller.
-
-Disable DONE interrupt during TA poll
-
-Prevent interrupt from being triggered if poll is missed and transfer
-starts and finishes.
-
-i2c: Make combined transactions optional and disabled by default
-
-i2c: bcm2708: add device tree support
-
-Add DT support to driver and add to .dtsi file.
-Setup pins in .dts file.
-i2c is disabled by default.
-
-Signed-off-by: Noralf Tronnes <notro@tronnes.org>
-
-bcm2708: don't register i2c controllers when using DT
-
-The devices for the i2c controllers are in the Device Tree.
-Only register devices when not using DT.
-
-Signed-off-by: Noralf Tronnes <notro@tronnes.org>
-
-I2C: Only register the I2C device for the current board revision
-
-i2c_bcm2708: Fix clock reference counting
-
-Fix grabbing lock from atomic context in i2c driver
-
-2 main changes:
-- check for timeouts in the bcm2708_bsc_setup function as indicated by this comment:
-      /* poll for transfer start bit (should only take 1-20 polls) */
-  This implies that the setup function can now fail so account for this everywhere it's called
-- Removed the clk_get_rate call from inside the setup function as it locks a mutex and that's not ok since we call it from under a spin lock.
-
-i2c-bcm2708: When using DT, leave the GPIO setup to pinctrl
-
-i2c-bcm2708: Increase timeouts to allow larger transfers
-
-Use the timeout value provided by the I2C_TIMEOUT ioctl when waiting
-for completion. The default timeout is 1 second.
-
-See: https://github.com/raspberrypi/linux/issues/260
-
-i2c-bcm2708/BCM270X_DT: Add support for I2C2
-
-The third I2C bus (I2C2) is normally reserved for HDMI use. Careless
-use of this bus can break an attached display - use with caution.
-
-It is recommended to disable accesses by VideoCore by setting
-hdmi_ignore_edid=1 or hdmi_edid_file=1 in config.txt.
-
-The interface is disabled by default - enable using the
-i2c2_iknowwhatimdoing DT parameter.
-
-bcm2708-spi: Don't use static pin configuration with DT
-
-Also remove superfluous error checking - the SPI framework ensures the
-validity of the chip_select value.
-
-i2c-bcm2708: Remove non-DT support
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-
-Set the BSC_CLKT clock streching timeout to 35ms as per SMBus specs.
-
-Fixes i2c_bcm2708: Write to FIFO correctly - v2 (#1574)
-
-* i2c: fix i2c_bcm2708: Clear FIFO before sending data
-
-Make sure FIFO gets cleared before trying to send
-data in case of a repeated start (COMBINED=Y).
-
-* i2c: fix i2c_bcm2708: Only write to FIFO when not full
-
-Check if FIFO can accept data before writing.
-To avoid a peripheral read on the last iteration of a loop,
-both bcm2708_bsc_fifo_fill and ~drain are changed as well.
----
- drivers/i2c/busses/Kconfig       |  19 ++
- drivers/i2c/busses/Makefile      |   2 +
- drivers/i2c/busses/i2c-bcm2708.c | 512 +++++++++++++++++++++++++++++++
- 3 files changed, 533 insertions(+)
- create mode 100644 drivers/i2c/busses/i2c-bcm2708.c
-
---- a/drivers/i2c/busses/Kconfig
-+++ b/drivers/i2c/busses/Kconfig
-@@ -16,6 +16,25 @@ config I2C_CCGX_UCSI
- 	  for Cypress CCGx Type-C controller. Individual bus drivers
- 	  need to select this one on demand.
- 
-+config I2C_BCM2708
-+	tristate "BCM2708 BSC"
-+	depends on ARCH_BCM2835
-+	help
-+	  Enabling this option will add BSC (Broadcom Serial Controller)
-+	  support for the BCM2708. BSC is a Broadcom proprietary bus compatible
-+	  with I2C/TWI/SMBus.
-+
-+config I2C_BCM2708_BAUDRATE
-+	prompt "BCM2708 I2C baudrate"
-+	depends on I2C_BCM2708
-+	int
-+	default 100000
-+	help
-+	  Set the I2C baudrate. This will alter the default value. A
-+	  different baudrate can be set by using a module parameter as well. If
-+	  no parameter is provided when loading, this is the value that will be
-+	  used.
-+
- config I2C_ALI1535
- 	tristate "ALI 1535"
- 	depends on PCI
---- a/drivers/i2c/busses/Makefile
-+++ b/drivers/i2c/busses/Makefile
-@@ -3,6 +3,8 @@
- # Makefile for the i2c bus drivers.
- #
- 
-+obj-$(CONFIG_I2C_BCM2708)	+= i2c-bcm2708.o
-+
- # ACPI drivers
- obj-$(CONFIG_I2C_SCMI)		+= i2c-scmi.o
- 
---- /dev/null
-+++ b/drivers/i2c/busses/i2c-bcm2708.c
-@@ -0,0 +1,512 @@
-+/*
-+ * Driver for Broadcom BCM2708 BSC Controllers
-+ *
-+ * Copyright (C) 2012 Chris Boot & Frank Buss
-+ *
-+ * This driver is inspired by:
-+ * i2c-ocores.c, by Peter Korsgaard <jacmet@sunsite.dk>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/spinlock.h>
-+#include <linux/clk.h>
-+#include <linux/err.h>
-+#include <linux/of.h>
-+#include <linux/platform_device.h>
-+#include <linux/io.h>
-+#include <linux/slab.h>
-+#include <linux/i2c.h>
-+#include <linux/interrupt.h>
-+#include <linux/sched.h>
-+#include <linux/wait.h>
-+
-+/* BSC register offsets */
-+#define BSC_C			0x00
-+#define BSC_S			0x04
-+#define BSC_DLEN		0x08
-+#define BSC_A			0x0c
-+#define BSC_FIFO		0x10
-+#define BSC_DIV			0x14
-+#define BSC_DEL			0x18
-+#define BSC_CLKT		0x1c
-+
-+/* Bitfields in BSC_C */
-+#define BSC_C_I2CEN		0x00008000
-+#define BSC_C_INTR		0x00000400
-+#define BSC_C_INTT		0x00000200
-+#define BSC_C_INTD		0x00000100
-+#define BSC_C_ST		0x00000080
-+#define BSC_C_CLEAR_1		0x00000020
-+#define BSC_C_CLEAR_2		0x00000010
-+#define BSC_C_READ		0x00000001
-+
-+/* Bitfields in BSC_S */
-+#define BSC_S_CLKT		0x00000200
-+#define BSC_S_ERR		0x00000100
-+#define BSC_S_RXF		0x00000080
-+#define BSC_S_TXE		0x00000040
-+#define BSC_S_RXD		0x00000020
-+#define BSC_S_TXD		0x00000010
-+#define BSC_S_RXR		0x00000008
-+#define BSC_S_TXW		0x00000004
-+#define BSC_S_DONE		0x00000002
-+#define BSC_S_TA		0x00000001
-+
-+#define I2C_WAIT_LOOP_COUNT	200
-+
-+#define DRV_NAME		"bcm2708_i2c"
-+
-+static unsigned int baudrate;
-+module_param(baudrate, uint, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
-+MODULE_PARM_DESC(baudrate, "The I2C baudrate");
-+
-+static bool combined = false;
-+module_param(combined, bool, 0644);
-+MODULE_PARM_DESC(combined, "Use combined transactions");
-+
-+struct bcm2708_i2c {
-+	struct i2c_adapter adapter;
-+
-+	spinlock_t lock;
-+	void __iomem *base;
-+	int irq;
-+	struct clk *clk;
-+	u32 cdiv;
-+	u32 clk_tout;
-+
-+	struct completion done;
-+
-+	struct i2c_msg *msg;
-+	int pos;
-+	int nmsgs;
-+	bool error;
-+};
-+
-+static inline u32 bcm2708_rd(struct bcm2708_i2c *bi, unsigned reg)
-+{
-+	return readl(bi->base + reg);
-+}
-+
-+static inline void bcm2708_wr(struct bcm2708_i2c *bi, unsigned reg, u32 val)
-+{
-+	writel(val, bi->base + reg);
-+}
-+
-+static inline void bcm2708_bsc_reset(struct bcm2708_i2c *bi)
-+{
-+	bcm2708_wr(bi, BSC_C, 0);
-+	bcm2708_wr(bi, BSC_S, BSC_S_CLKT | BSC_S_ERR | BSC_S_DONE);
-+}
-+
-+static inline void bcm2708_bsc_fifo_drain(struct bcm2708_i2c *bi)
-+{
-+	while ((bi->pos < bi->msg->len) && (bcm2708_rd(bi, BSC_S) & BSC_S_RXD))
-+		bi->msg->buf[bi->pos++] = bcm2708_rd(bi, BSC_FIFO);
-+}
-+
-+static inline void bcm2708_bsc_fifo_fill(struct bcm2708_i2c *bi)
-+{
-+	while ((bi->pos < bi->msg->len) && (bcm2708_rd(bi, BSC_S) & BSC_S_TXD))
-+		bcm2708_wr(bi, BSC_FIFO, bi->msg->buf[bi->pos++]);
-+}
-+
-+static inline int bcm2708_bsc_setup(struct bcm2708_i2c *bi)
-+{
-+	u32 cdiv, s, clk_tout;
-+	u32 c = BSC_C_I2CEN | BSC_C_INTD | BSC_C_ST | BSC_C_CLEAR_1;
-+	int wait_loops = I2C_WAIT_LOOP_COUNT;
-+
-+	/* Can't call clk_get_rate as it locks a mutex and here we are spinlocked.
-+	 * Use the value that we cached in the probe.
-+	 */
-+	cdiv = bi->cdiv;
-+	clk_tout = bi->clk_tout;
-+
-+	if (bi->msg->flags & I2C_M_RD)
-+		c |= BSC_C_INTR | BSC_C_READ;
-+	else
-+		c |= BSC_C_INTT;
-+
-+	bcm2708_wr(bi, BSC_CLKT, clk_tout);
-+	bcm2708_wr(bi, BSC_DIV, cdiv);
-+	bcm2708_wr(bi, BSC_A, bi->msg->addr);
-+	bcm2708_wr(bi, BSC_DLEN, bi->msg->len);
-+	if (combined)
-+	{
-+		/* Do the next two messages meet combined transaction criteria?
-+		   - Current message is a write, next message is a read
-+		   - Both messages to same slave address
-+		   - Write message can fit inside FIFO (16 bytes or less) */
-+		if ( (bi->nmsgs > 1) &&
-+			!(bi->msg[0].flags & I2C_M_RD) && (bi->msg[1].flags & I2C_M_RD) &&
-+			 (bi->msg[0].addr == bi->msg[1].addr) && (bi->msg[0].len <= 16)) {
-+
-+			/* Clear FIFO */
-+			bcm2708_wr(bi, BSC_C, BSC_C_CLEAR_1);
-+
-+			/* Fill FIFO with entire write message (16 byte FIFO) */
-+			while (bi->pos < bi->msg->len) {
-+				bcm2708_wr(bi, BSC_FIFO, bi->msg->buf[bi->pos++]);
-+			}
-+			/* Start write transfer (no interrupts, don't clear FIFO) */
-+			bcm2708_wr(bi, BSC_C, BSC_C_I2CEN | BSC_C_ST);
-+
-+			/* poll for transfer start bit (should only take 1-20 polls) */
-+			do {
-+				s = bcm2708_rd(bi, BSC_S);
-+			} while (!(s & (BSC_S_TA | BSC_S_ERR | BSC_S_CLKT | BSC_S_DONE)) && --wait_loops >= 0);
-+
-+			/* did we time out or some error occured? */
-+			if (wait_loops < 0 || (s & (BSC_S_ERR | BSC_S_CLKT))) {
-+				return -1;
-+			}
-+
-+			/* Send next read message before the write transfer finishes. */
-+			bi->nmsgs--;
-+			bi->msg++;
-+			bi->pos = 0;
-+			bcm2708_wr(bi, BSC_DLEN, bi->msg->len);
-+			c = BSC_C_I2CEN | BSC_C_INTD | BSC_C_INTR | BSC_C_ST | BSC_C_READ;
-+		}
-+	}
-+	bcm2708_wr(bi, BSC_C, c);
-+
-+	return 0;
-+}
-+
-+static irqreturn_t bcm2708_i2c_interrupt(int irq, void *dev_id)
-+{
-+	struct bcm2708_i2c *bi = dev_id;
-+	bool handled = true;
-+	u32 s;
-+	int ret;
-+
-+	spin_lock(&bi->lock);
-+
-+	/* we may see camera interrupts on the "other" I2C channel
-+		   Just return if we've not sent anything */
-+	if (!bi->nmsgs || !bi->msg) {
-+		goto early_exit;
-+	}
-+
-+	s = bcm2708_rd(bi, BSC_S);
-+
-+	if (s & (BSC_S_CLKT | BSC_S_ERR)) {
-+		bcm2708_bsc_reset(bi);
-+		bi->error = true;
-+
-+		bi->msg = 0; /* to inform the that all work is done */
-+		bi->nmsgs = 0;
-+		/* wake up our bh */
-+		complete(&bi->done);
-+	} else if (s & BSC_S_DONE) {
-+		bi->nmsgs--;
-+
-+		if (bi->msg->flags & I2C_M_RD) {
-+			bcm2708_bsc_fifo_drain(bi);
-+		}
-+
-+		bcm2708_bsc_reset(bi);
-+
-+		if (bi->nmsgs) {
-+			/* advance to next message */
-+			bi->msg++;
-+			bi->pos = 0;
-+			ret = bcm2708_bsc_setup(bi);
-+			if (ret < 0) {
-+				bcm2708_bsc_reset(bi);
-+				bi->error = true;
-+				bi->msg = 0; /* to inform the that all work is done */
-+				bi->nmsgs = 0;
-+				/* wake up our bh */
-+				complete(&bi->done);
-+				goto early_exit;
-+			}
-+		} else {
-+			bi->msg = 0; /* to inform the that all work is done */
-+			bi->nmsgs = 0;
-+			/* wake up our bh */
-+			complete(&bi->done);
-+		}
-+	} else if (s & BSC_S_TXW) {
-+		bcm2708_bsc_fifo_fill(bi);
-+	} else if (s & BSC_S_RXR) {
-+		bcm2708_bsc_fifo_drain(bi);
-+	} else {
-+		handled = false;
-+	}
-+
-+early_exit:
-+	spin_unlock(&bi->lock);
-+
-+	return handled ? IRQ_HANDLED : IRQ_NONE;
-+}
-+
-+static int bcm2708_i2c_master_xfer(struct i2c_adapter *adap,
-+	struct i2c_msg *msgs, int num)
-+{
-+	struct bcm2708_i2c *bi = adap->algo_data;
-+	unsigned long flags;
-+	int ret;
-+
-+	spin_lock_irqsave(&bi->lock, flags);
-+
-+	reinit_completion(&bi->done);
-+	bi->msg = msgs;
-+	bi->pos = 0;
-+	bi->nmsgs = num;
-+	bi->error = false;
-+
-+	ret = bcm2708_bsc_setup(bi);
-+
-+	spin_unlock_irqrestore(&bi->lock, flags);
-+
-+	/* check the result of the setup */
-+	if (ret < 0)
-+	{
-+		dev_err(&adap->dev, "transfer setup timed out\n");
-+		goto error_timeout;
-+	}
-+
-+	ret = wait_for_completion_timeout(&bi->done, adap->timeout);
-+	if (ret == 0) {
-+		dev_err(&adap->dev, "transfer timed out\n");
-+		goto error_timeout;
-+	}
-+
-+	ret = bi->error ? -EIO : num;
-+	return ret;
-+
-+error_timeout:
-+	spin_lock_irqsave(&bi->lock, flags);
-+	bcm2708_bsc_reset(bi);
-+	bi->msg = 0; /* to inform the interrupt handler that there's nothing else to be done */
-+	bi->nmsgs = 0;
-+	spin_unlock_irqrestore(&bi->lock, flags);
-+	return -ETIMEDOUT;
-+}
-+
-+static u32 bcm2708_i2c_functionality(struct i2c_adapter *adap)
-+{
-+	return I2C_FUNC_I2C | /*I2C_FUNC_10BIT_ADDR |*/ I2C_FUNC_SMBUS_EMUL;
-+}
-+
-+static struct i2c_algorithm bcm2708_i2c_algorithm = {
-+	.master_xfer = bcm2708_i2c_master_xfer,
-+	.functionality = bcm2708_i2c_functionality,
-+};
-+
-+static int bcm2708_i2c_probe(struct platform_device *pdev)
-+{
-+	struct resource *regs;
-+	int irq, err = -ENOMEM;
-+	struct clk *clk;
-+	struct bcm2708_i2c *bi;
-+	struct i2c_adapter *adap;
-+	unsigned long bus_hz;
-+	u32 cdiv, clk_tout;
-+	u32 baud;
-+
-+	baud = CONFIG_I2C_BCM2708_BAUDRATE;
-+
-+	if (pdev->dev.of_node) {
-+		u32 bus_clk_rate;
-+		pdev->id = of_alias_get_id(pdev->dev.of_node, "i2c");
-+		if (pdev->id < 0) {
-+			dev_err(&pdev->dev, "alias is missing\n");
-+			return -EINVAL;
-+		}
-+		if (!of_property_read_u32(pdev->dev.of_node,
-+					"clock-frequency", &bus_clk_rate))
-+			baud = bus_clk_rate;
-+		else
-+			dev_warn(&pdev->dev,
-+				"Could not read clock-frequency property\n");
-+	}
-+
-+	if (baudrate)
-+		baud = baudrate;
-+
-+	regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (!regs) {
-+		dev_err(&pdev->dev, "could not get IO memory\n");
-+		return -ENXIO;
-+	}
-+
-+	irq = platform_get_irq(pdev, 0);
-+	if (irq < 0) {
-+		dev_err(&pdev->dev, "could not get IRQ\n");
-+		return irq;
-+	}
-+
-+	clk = clk_get(&pdev->dev, NULL);
-+	if (IS_ERR(clk)) {
-+		dev_err(&pdev->dev, "could not find clk: %ld\n", PTR_ERR(clk));
-+		return PTR_ERR(clk);
-+	}
-+
-+	err = clk_prepare_enable(clk);
-+	if (err) {
-+		dev_err(&pdev->dev, "could not enable clk: %d\n", err);
-+		goto out_clk_put;
-+	}
-+
-+	bi = kzalloc(sizeof(*bi), GFP_KERNEL);
-+	if (!bi)
-+		goto out_clk_disable;
-+
-+	platform_set_drvdata(pdev, bi);
-+
-+	adap = &bi->adapter;
-+	adap->class = I2C_CLASS_HWMON | I2C_CLASS_DDC;
-+	adap->algo = &bcm2708_i2c_algorithm;
-+	adap->algo_data = bi;
-+	adap->dev.parent = &pdev->dev;
-+	adap->nr = pdev->id;
-+	strlcpy(adap->name, dev_name(&pdev->dev), sizeof(adap->name));
-+	adap->dev.of_node = pdev->dev.of_node;
-+
-+	switch (pdev->id) {
-+	case 0:
-+		adap->class = I2C_CLASS_HWMON;
-+		break;
-+	case 1:
-+		adap->class = I2C_CLASS_DDC;
-+		break;
-+	case 2:
-+		adap->class = I2C_CLASS_DDC;
-+		break;
-+	default:
-+		dev_err(&pdev->dev, "can only bind to BSC 0, 1 or 2\n");
-+		err = -ENXIO;
-+		goto out_free_bi;
-+	}
-+
-+	spin_lock_init(&bi->lock);
-+	init_completion(&bi->done);
-+
-+	bi->base = ioremap(regs->start, resource_size(regs));
-+	if (!bi->base) {
-+		dev_err(&pdev->dev, "could not remap memory\n");
-+		goto out_free_bi;
-+	}
-+
-+	bi->irq = irq;
-+	bi->clk = clk;
-+
-+	err = request_irq(irq, bcm2708_i2c_interrupt, IRQF_SHARED,
-+			dev_name(&pdev->dev), bi);
-+	if (err) {
-+		dev_err(&pdev->dev, "could not request IRQ: %d\n", err);
-+		goto out_iounmap;
-+	}
-+
-+	bcm2708_bsc_reset(bi);
-+
-+	err = i2c_add_numbered_adapter(adap);
-+	if (err < 0) {
-+		dev_err(&pdev->dev, "could not add I2C adapter: %d\n", err);
-+		goto out_free_irq;
-+	}
-+
-+	bus_hz = clk_get_rate(bi->clk);
-+	cdiv = bus_hz / baud;
-+	if (cdiv > 0xffff) {
-+		cdiv = 0xffff;
-+		baud = bus_hz / cdiv;
-+	}
-+
-+	clk_tout = 35/1000*baud; //35ms timeout as per SMBus specs.
-+	if (clk_tout > 0xffff)
-+		clk_tout = 0xffff;
-+	
-+	bi->cdiv = cdiv;
-+	bi->clk_tout = clk_tout;
-+
-+	dev_info(&pdev->dev, "BSC%d Controller at 0x%08lx (irq %d) (baudrate %d)\n",
-+		pdev->id, (unsigned long)regs->start, irq, baud);
-+
-+	return 0;
-+
-+out_free_irq:
-+	free_irq(bi->irq, bi);
-+out_iounmap:
-+	iounmap(bi->base);
-+out_free_bi:
-+	kfree(bi);
-+out_clk_disable:
-+	clk_disable_unprepare(clk);
-+out_clk_put:
-+	clk_put(clk);
-+	return err;
-+}
-+
-+static int bcm2708_i2c_remove(struct platform_device *pdev)
-+{
-+	struct bcm2708_i2c *bi = platform_get_drvdata(pdev);
-+
-+	platform_set_drvdata(pdev, NULL);
-+
-+	i2c_del_adapter(&bi->adapter);
-+	free_irq(bi->irq, bi);
-+	iounmap(bi->base);
-+	clk_disable_unprepare(bi->clk);
-+	clk_put(bi->clk);
-+	kfree(bi);
-+
-+	return 0;
-+}
-+
-+static const struct of_device_id bcm2708_i2c_of_match[] = {
-+        { .compatible = "brcm,bcm2708-i2c" },
-+        {},
-+};
-+MODULE_DEVICE_TABLE(of, bcm2708_i2c_of_match);
-+
-+static struct platform_driver bcm2708_i2c_driver = {
-+	.driver		= {
-+		.name	= DRV_NAME,
-+		.owner	= THIS_MODULE,
-+		.of_match_table = bcm2708_i2c_of_match,
-+	},
-+	.probe		= bcm2708_i2c_probe,
-+	.remove		= bcm2708_i2c_remove,
-+};
-+
-+// module_platform_driver(bcm2708_i2c_driver);
-+
-+
-+static int __init bcm2708_i2c_init(void)
-+{
-+	return platform_driver_register(&bcm2708_i2c_driver);
-+}
-+
-+static void __exit bcm2708_i2c_exit(void)
-+{
-+	platform_driver_unregister(&bcm2708_i2c_driver);
-+}
-+
-+module_init(bcm2708_i2c_init);
-+module_exit(bcm2708_i2c_exit);
-+
-+
-+
-+MODULE_DESCRIPTION("BSC controller driver for Broadcom BCM2708");
-+MODULE_AUTHOR("Chris Boot <bootc@bootc.net>");
-+MODULE_LICENSE("GPL v2");
-+MODULE_ALIAS("platform:" DRV_NAME);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0117-char-broadcom-Add-vcio-module.patch b/target/linux/bcm27xx/patches-6.1/950-0117-char-broadcom-Add-vcio-module.patch
deleted file mode 100644
index b8d5209d76..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0117-char-broadcom-Add-vcio-module.patch
+++ /dev/null
@@ -1,273 +0,0 @@
-From fe0a40031a72b2cb1b36a491d71f6bc0bdb8afed Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
-Date: Fri, 26 Jun 2015 14:27:06 +0200
-Subject: [PATCH] char: broadcom: Add vcio module
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Add module for accessing the mailbox property channel through
-/dev/vcio. Was previously in bcm2708-vcio.
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-
-char: vcio: Add compat ioctl handling
-
-There was no compat ioctl handler, so 32 bit userspace on a
-64 bit kernel failed as IOCTL_MBOX_PROPERTY used the size
-of char*.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
-
-char: vcio: Fail probe if rpi_firmware is not found.
-
-Device Tree is now the only supported config mechanism, therefore
-uncomment the block of code that fails the probe if the
-firmware node can't be found.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
-
-drivers: char: vcio: Use common compat header
-
-The definition of compat_ptr is now common for most platforms, but
-requires the inclusion of <linux/compat.h>.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-char: vcio: Rewrite as a firmware node child
-
-The old vcio driver is a simple character device that manually locates
-the firmware driver. Initialising it before the firmware driver causes
-a failure, and no retries are attempted.
-
-Rewrite vcio as a platform driver that depends on a DT node for its
-instantiation and the location of the firmware driver, making use of
-the miscdevice framework to reduce the code size.
-
-N.B. Using miscdevice changes the udev SUBSYSTEM string, so a change
-to the companion udev rule is required in order to continue to set
-the correct device permissions, e.g.:
-
-    KERNEL="vcio", GROUP="video", MODE="0660"
-
-See: https://github.com/raspberrypi/linux/issues/4620
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/char/broadcom/Kconfig  |   6 ++
- drivers/char/broadcom/Makefile |   1 +
- drivers/char/broadcom/vcio.c   | 186 +++++++++++++++++++++++++++++++++
- 3 files changed, 193 insertions(+)
- create mode 100644 drivers/char/broadcom/vcio.c
-
---- a/drivers/char/broadcom/Kconfig
-+++ b/drivers/char/broadcom/Kconfig
-@@ -15,6 +15,12 @@ config BCM2708_VCMEM
-         help
-           Helper for videocore memory access and total size allocation.
- 
-+config BCM_VCIO
-+	tristate "Mailbox userspace access"
-+	depends on BCM2835_MBOX
-+	help
-+	  Gives access to the mailbox property channel from userspace.
-+
- endif
- 
- config BCM2835_DEVGPIOMEM
---- a/drivers/char/broadcom/Makefile
-+++ b/drivers/char/broadcom/Makefile
-@@ -1,3 +1,4 @@
- obj-$(CONFIG_BCM2708_VCMEM)	+= vc_mem.o
-+obj-$(CONFIG_BCM_VCIO)		+= vcio.o
- obj-$(CONFIG_BCM2835_DEVGPIOMEM)+= bcm2835-gpiomem.o
- obj-$(CONFIG_BCM2835_SMI_DEV)	+= bcm2835_smi_dev.o
---- /dev/null
-+++ b/drivers/char/broadcom/vcio.c
-@@ -0,0 +1,186 @@
-+/*
-+ *  Copyright (C) 2010 Broadcom
-+ *  Copyright (C) 2015 Noralf Trønnes
-+ *  Copyright (C) 2021 Raspberry Pi (Trading) Ltd.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ */
-+
-+#include <linux/cdev.h>
-+#include <linux/device.h>
-+#include <linux/fs.h>
-+#include <linux/init.h>
-+#include <linux/ioctl.h>
-+#include <linux/module.h>
-+#include <linux/slab.h>
-+#include <linux/uaccess.h>
-+#include <linux/compat.h>
-+#include <linux/miscdevice.h>
-+#include <soc/bcm2835/raspberrypi-firmware.h>
-+
-+#define MODULE_NAME "vcio"
-+#define VCIO_IOC_MAGIC 100
-+#define IOCTL_MBOX_PROPERTY _IOWR(VCIO_IOC_MAGIC, 0, char *)
-+#ifdef CONFIG_COMPAT
-+#define IOCTL_MBOX_PROPERTY32 _IOWR(VCIO_IOC_MAGIC, 0, compat_uptr_t)
-+#endif
-+
-+struct vcio_data {
-+	struct rpi_firmware *fw;
-+	struct miscdevice misc_dev;
-+};
-+
-+static int vcio_user_property_list(struct vcio_data *vcio, void *user)
-+{
-+	u32 *buf, size;
-+	int ret;
-+
-+	/* The first 32-bit is the size of the buffer */
-+	if (copy_from_user(&size, user, sizeof(size)))
-+		return -EFAULT;
-+
-+	buf = kmalloc(size, GFP_KERNEL);
-+	if (!buf)
-+		return -ENOMEM;
-+
-+	if (copy_from_user(buf, user, size)) {
-+		kfree(buf);
-+		return -EFAULT;
-+	}
-+
-+	/* Strip off protocol encapsulation */
-+	ret = rpi_firmware_property_list(vcio->fw, &buf[2], size - 12);
-+	if (ret) {
-+		kfree(buf);
-+		return ret;
-+	}
-+
-+	buf[1] = RPI_FIRMWARE_STATUS_SUCCESS;
-+	if (copy_to_user(user, buf, size))
-+		ret = -EFAULT;
-+
-+	kfree(buf);
-+
-+	return ret;
-+}
-+
-+static int vcio_device_open(struct inode *inode, struct file *file)
-+{
-+	try_module_get(THIS_MODULE);
-+
-+	return 0;
-+}
-+
-+static int vcio_device_release(struct inode *inode, struct file *file)
-+{
-+	module_put(THIS_MODULE);
-+
-+	return 0;
-+}
-+
-+static long vcio_device_ioctl(struct file *file, unsigned int ioctl_num,
-+			      unsigned long ioctl_param)
-+{
-+	struct vcio_data *vcio = container_of(file->private_data,
-+					      struct vcio_data, misc_dev);
-+
-+	switch (ioctl_num) {
-+	case IOCTL_MBOX_PROPERTY:
-+		return vcio_user_property_list(vcio, (void *)ioctl_param);
-+	default:
-+		pr_err("unknown ioctl: %x\n", ioctl_num);
-+		return -EINVAL;
-+	}
-+}
-+
-+#ifdef CONFIG_COMPAT
-+static long vcio_device_compat_ioctl(struct file *file, unsigned int ioctl_num,
-+				     unsigned long ioctl_param)
-+{
-+	struct vcio_data *vcio = container_of(file->private_data,
-+					      struct vcio_data, misc_dev);
-+
-+	switch (ioctl_num) {
-+	case IOCTL_MBOX_PROPERTY32:
-+		return vcio_user_property_list(vcio, compat_ptr(ioctl_param));
-+	default:
-+		pr_err("unknown ioctl: %x\n", ioctl_num);
-+		return -EINVAL;
-+	}
-+}
-+#endif
-+
-+const struct file_operations vcio_fops = {
-+	.unlocked_ioctl = vcio_device_ioctl,
-+#ifdef CONFIG_COMPAT
-+	.compat_ioctl = vcio_device_compat_ioctl,
-+#endif
-+	.open = vcio_device_open,
-+	.release = vcio_device_release,
-+};
-+
-+static int vcio_probe(struct platform_device *pdev)
-+{
-+	struct device *dev = &pdev->dev;
-+	struct device_node *np = dev->of_node;
-+	struct device_node *fw_node;
-+	struct rpi_firmware *fw;
-+	struct vcio_data *vcio;
-+
-+	fw_node = of_get_parent(np);
-+	if (!fw_node) {
-+		dev_err(dev, "Missing firmware node\n");
-+		return -ENOENT;
-+	}
-+
-+	fw = rpi_firmware_get(fw_node);
-+	of_node_put(fw_node);
-+	if (!fw)
-+		return -EPROBE_DEFER;
-+
-+	vcio = devm_kzalloc(dev, sizeof(struct vcio_data), GFP_KERNEL);
-+	if (!vcio)
-+		return -ENOMEM;
-+
-+	vcio->fw = fw;
-+	vcio->misc_dev.fops = &vcio_fops;
-+	vcio->misc_dev.minor = MISC_DYNAMIC_MINOR;
-+	vcio->misc_dev.name = "vcio";
-+	vcio->misc_dev.parent = dev;
-+
-+	return misc_register(&vcio->misc_dev);
-+}
-+
-+static int vcio_remove(struct platform_device *pdev)
-+{
-+	struct device *dev = &pdev->dev;
-+
-+	misc_deregister(dev_get_drvdata(dev));
-+	return 0;
-+}
-+
-+static const struct of_device_id vcio_ids[] = {
-+	{ .compatible = "raspberrypi,vcio" },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(of, vcio_ids);
-+
-+static struct platform_driver vcio_driver = {
-+	.driver	= {
-+		.name		= MODULE_NAME,
-+		.of_match_table	= of_match_ptr(vcio_ids),
-+	},
-+	.probe	= vcio_probe,
-+	.remove = vcio_remove,
-+};
-+
-+module_platform_driver(vcio_driver);
-+
-+MODULE_AUTHOR("Gray Girling");
-+MODULE_AUTHOR("Noralf Trønnes");
-+MODULE_DESCRIPTION("Mailbox userspace access");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS("platform:rpi-vcio");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0118-firmware-bcm2835-Support-ARCH_BCM270x.patch b/target/linux/bcm27xx/patches-6.1/950-0118-firmware-bcm2835-Support-ARCH_BCM270x.patch
deleted file mode 100644
index 3b32562b49..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0118-firmware-bcm2835-Support-ARCH_BCM270x.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From ed67c30eca94141343fa1c617578fe48b234c1fd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
-Date: Fri, 26 Jun 2015 14:25:01 +0200
-Subject: [PATCH] firmware: bcm2835: Support ARCH_BCM270x
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Support booting without Device Tree.
-Turn on USB power.
-Load driver early because of lacking support for deferred probing
-in many drivers.
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
-
-firmware: bcm2835: Don't turn on USB power
-
-The raspberrypi-power driver is now used to turn on USB power.
-
-This partly reverts commit:
-firmware: bcm2835: Support ARCH_BCM270x
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
----
- drivers/firmware/raspberrypi.c | 17 ++++++++++++++++-
- 1 file changed, 16 insertions(+), 1 deletion(-)
-
---- a/drivers/firmware/raspberrypi.c
-+++ b/drivers/firmware/raspberrypi.c
-@@ -33,6 +33,8 @@ struct rpi_firmware {
- 	struct kref consumers;
- };
- 
-+static struct platform_device *g_pdev;
-+
- static DEFINE_MUTEX(transaction_lock);
- 
- static void response_callback(struct mbox_client *cl, void *msg)
-@@ -281,6 +283,7 @@ static int rpi_firmware_probe(struct pla
- 	kref_init(&fw->consumers);
- 
- 	platform_set_drvdata(pdev, fw);
-+	g_pdev = pdev;
- 
- 	rpi_firmware_print_firmware_revision(fw);
- 	rpi_register_hwmon_driver(dev, fw);
-@@ -309,6 +312,7 @@ static int rpi_firmware_remove(struct pl
- 	rpi_clk = NULL;
- 
- 	rpi_firmware_put(fw);
-+	g_pdev = NULL;
- 
- 	return 0;
- }
-@@ -383,7 +387,18 @@ static struct platform_driver rpi_firmwa
- 	.shutdown	= rpi_firmware_shutdown,
- 	.remove		= rpi_firmware_remove,
- };
--module_platform_driver(rpi_firmware_driver);
-+
-+static int __init rpi_firmware_init(void)
-+{
-+	return platform_driver_register(&rpi_firmware_driver);
-+}
-+subsys_initcall(rpi_firmware_init);
-+
-+static void __init rpi_firmware_exit(void)
-+{
-+	platform_driver_unregister(&rpi_firmware_driver);
-+}
-+module_exit(rpi_firmware_exit);
- 
- MODULE_AUTHOR("Eric Anholt <eric@anholt.net>");
- MODULE_DESCRIPTION("Raspberry Pi firmware driver");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0119-leds-Add-the-input-trigger-for-pwr_led.patch b/target/linux/bcm27xx/patches-6.1/950-0119-leds-Add-the-input-trigger-for-pwr_led.patch
deleted file mode 100644
index 4d30fab654..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0119-leds-Add-the-input-trigger-for-pwr_led.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-From 95a128d3e27f80940acd7f5d657405a50b2bc830 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Fri, 6 Feb 2015 13:50:57 +0000
-Subject: [PATCH] leds: Add the "input" trigger, for pwr_led
-
-The "input" trigger makes the associated GPIO an input.  This is to support
-the Raspberry Pi PWR LED, which is driven by external hardware in normal use.
-
-N.B. pwr_led is not available on Model A or B boards.
-
-leds-gpio: Implement the brightness_get method
-
-The power LED uses some clever logic that means it is driven
-by a voltage measuring circuit when configured as input, otherwise
-it is driven by the GPIO output value. This patch wires up the
-brightness_get method for leds-gpio so that user-space can monitor
-the LED value via /sys/class/gpio/led1/brightness. Using the input
-trigger this returns an indication of the system power health,
-otherwise it is just whatever value the trigger has written most
-recently.
-
-See: https://github.com/raspberrypi/linux/issues/1064
----
- drivers/leds/leds-gpio.c             | 17 ++++++++-
- drivers/leds/trigger/Kconfig         |  7 ++++
- drivers/leds/trigger/Makefile        |  1 +
- drivers/leds/trigger/ledtrig-input.c | 55 ++++++++++++++++++++++++++++
- include/linux/leds.h                 |  3 ++
- 5 files changed, 82 insertions(+), 1 deletion(-)
- create mode 100644 drivers/leds/trigger/ledtrig-input.c
-
---- a/drivers/leds/leds-gpio.c
-+++ b/drivers/leds/leds-gpio.c
-@@ -47,8 +47,15 @@ static void gpio_led_set(struct led_clas
- 		led_dat->platform_gpio_blink_set(led_dat->gpiod, level,
- 						 NULL, NULL);
- 		led_dat->blinking = 0;
-+	} else if (led_dat->cdev.flags & SET_GPIO_INPUT) {
-+		gpiod_direction_input(led_dat->gpiod);
-+		led_dat->cdev.flags &= ~SET_GPIO_INPUT;
-+	} else if (led_dat->cdev.flags & SET_GPIO_OUTPUT) {
-+		gpiod_direction_output(led_dat->gpiod, level);
-+		led_dat->cdev.flags &= ~SET_GPIO_OUTPUT;
- 	} else {
--		if (led_dat->can_sleep)
-+		if (led_dat->can_sleep ||
-+			(led_dat->cdev.flags & (SET_GPIO_INPUT | SET_GPIO_OUTPUT) ))
- 			gpiod_set_value_cansleep(led_dat->gpiod, level);
- 		else
- 			gpiod_set_value(led_dat->gpiod, level);
-@@ -62,6 +69,13 @@ static int gpio_led_set_blocking(struct
- 	return 0;
- }
- 
-+static enum led_brightness gpio_led_get(struct led_classdev *led_cdev)
-+{
-+	struct gpio_led_data *led_dat =
-+		container_of(led_cdev, struct gpio_led_data, cdev);
-+	return gpiod_get_value_cansleep(led_dat->gpiod) ? LED_FULL : LED_OFF;
-+}
-+
- static int gpio_blink_set(struct led_classdev *led_cdev,
- 	unsigned long *delay_on, unsigned long *delay_off)
- {
-@@ -90,6 +104,7 @@ static int create_gpio_led(const struct
- 		led_dat->platform_gpio_blink_set = blink_set;
- 		led_dat->cdev.blink_set = gpio_blink_set;
- 	}
-+	led_dat->cdev.brightness_get = gpio_led_get;
- 	if (template->default_state == LEDS_GPIO_DEFSTATE_KEEP) {
- 		state = gpiod_get_value_cansleep(led_dat->gpiod);
- 		if (state < 0)
---- a/drivers/leds/trigger/Kconfig
-+++ b/drivers/leds/trigger/Kconfig
-@@ -115,6 +115,13 @@ config LEDS_TRIGGER_CAMERA
- 	  This enables direct flash/torch on/off by the driver, kernel space.
- 	  If unsure, say Y.
- 
-+config LEDS_TRIGGER_INPUT
-+	tristate "LED Input Trigger"
-+	depends on LEDS_TRIGGERS
-+	help
-+	  This allows the GPIOs assigned to be LEDs to be initialised to inputs.
-+	  If unsure, say Y.
-+
- config LEDS_TRIGGER_PANIC
- 	bool "LED Panic Trigger"
- 	help
---- a/drivers/leds/trigger/Makefile
-+++ b/drivers/leds/trigger/Makefile
-@@ -11,6 +11,7 @@ obj-$(CONFIG_LEDS_TRIGGER_ACTIVITY)	+= l
- obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
- obj-$(CONFIG_LEDS_TRIGGER_TRANSIENT)	+= ledtrig-transient.o
- obj-$(CONFIG_LEDS_TRIGGER_CAMERA)	+= ledtrig-camera.o
-+obj-$(CONFIG_LEDS_TRIGGER_INPUT)	+= ledtrig-input.o
- obj-$(CONFIG_LEDS_TRIGGER_PANIC)	+= ledtrig-panic.o
- obj-$(CONFIG_LEDS_TRIGGER_NETDEV)	+= ledtrig-netdev.o
- obj-$(CONFIG_LEDS_TRIGGER_PATTERN)	+= ledtrig-pattern.o
---- /dev/null
-+++ b/drivers/leds/trigger/ledtrig-input.c
-@@ -0,0 +1,55 @@
-+/*
-+ * Set LED GPIO to Input "Trigger"
-+ *
-+ * Copyright 2015 Phil Elwell <phil@raspberrypi.org>
-+ *
-+ * Based on Nick Forbes's ledtrig-default-on.c.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/leds.h>
-+#include <linux/gpio.h>
-+#include "../leds.h"
-+
-+static int input_trig_activate(struct led_classdev *led_cdev)
-+{
-+	led_cdev->flags |= SET_GPIO_INPUT;
-+	led_set_brightness(led_cdev, 0);
-+	return 0;
-+}
-+
-+static void input_trig_deactivate(struct led_classdev *led_cdev)
-+{
-+	led_cdev->flags |= SET_GPIO_OUTPUT;
-+	led_set_brightness(led_cdev, 0);
-+}
-+
-+static struct led_trigger input_led_trigger = {
-+	.name     = "input",
-+	.activate = input_trig_activate,
-+	.deactivate = input_trig_deactivate,
-+};
-+
-+static int __init input_trig_init(void)
-+{
-+	return led_trigger_register(&input_led_trigger);
-+}
-+
-+static void __exit input_trig_exit(void)
-+{
-+	led_trigger_unregister(&input_led_trigger);
-+}
-+
-+module_init(input_trig_init);
-+module_exit(input_trig_exit);
-+
-+MODULE_AUTHOR("Phil Elwell <phil@raspberrypi.org>");
-+MODULE_DESCRIPTION("Set LED GPIO to Input \"trigger\"");
-+MODULE_LICENSE("GPL");
---- a/include/linux/leds.h
-+++ b/include/linux/leds.h
-@@ -95,6 +95,9 @@ struct led_classdev {
- #define LED_BRIGHT_HW_CHANGED	BIT(21)
- #define LED_RETAIN_AT_SHUTDOWN	BIT(22)
- #define LED_INIT_DEFAULT_TRIGGER BIT(23)
-+	/* Additions for Raspberry Pi PWR LED */
-+#define SET_GPIO_INPUT		BIT(30)
-+#define SET_GPIO_OUTPUT		BIT(31)
- 
- 	/* set_brightness_work / blink_timer flags, atomic, private. */
- 	unsigned long		work_flags;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0120-Added-Device-IDs-for-August-DVB-T-205.patch b/target/linux/bcm27xx/patches-6.1/950-0120-Added-Device-IDs-for-August-DVB-T-205.patch
deleted file mode 100644
index a77f3f75b1..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0120-Added-Device-IDs-for-August-DVB-T-205.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 8e66f283a3b983e960bc6c28a71ad9eb63d2b4aa Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Wed, 3 Jul 2013 00:54:08 +0100
-Subject: [PATCH] Added Device IDs for August DVB-T 205
-
----
- drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
-+++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
-@@ -1964,6 +1964,10 @@ static const struct usb_device_id rtl28x
- 		&rtl28xxu_props, "Compro VideoMate U650F", NULL) },
- 	{ DVB_USB_DEVICE(USB_VID_KWORLD_2, 0xd394,
- 		&rtl28xxu_props, "MaxMedia HU394-T", NULL) },
-+	{ DVB_USB_DEVICE(USB_VID_GTEK, 0xb803 /*USB_PID_AUGUST_DVBT205*/,
-+		&rtl28xxu_props, "August DVB-T 205", NULL) },
-+	{ DVB_USB_DEVICE(USB_VID_GTEK, 0xa803 /*USB_PID_AUGUST_DVBT205*/,
-+		&rtl28xxu_props, "August DVB-T 205", NULL) },
- 	{ DVB_USB_DEVICE(USB_VID_LEADTEK, 0x6a03,
- 		&rtl28xxu_props, "Leadtek WinFast DTV Dongle mini", NULL) },
- 	{ DVB_USB_DEVICE(USB_VID_GTEK, USB_PID_CPYTO_REDI_PC50A,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0121-Improve-__copy_to_user-and-__copy_from_user-performa.patch b/target/linux/bcm27xx/patches-6.1/950-0121-Improve-__copy_to_user-and-__copy_from_user-performa.patch
deleted file mode 100644
index 0c2ff35ed3..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0121-Improve-__copy_to_user-and-__copy_from_user-performa.patch
+++ /dev/null
@@ -1,1611 +0,0 @@
-From 9a10ffd029c81a694db6666c1dedfa687396093b Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Mon, 28 Nov 2016 16:50:04 +0000
-Subject: [PATCH] Improve __copy_to_user and __copy_from_user
- performance
-
-Provide a __copy_from_user that uses memcpy. On BCM2708, use
-optimised memcpy/memmove/memcmp/memset implementations.
-
-arch/arm: Add mmiocpy/set aliases for memcpy/set
-
-See: https://github.com/raspberrypi/linux/issues/1082
-
-copy_from_user: CPU_SW_DOMAIN_PAN compatibility
-
-The downstream copy_from_user acceleration must also play nice with
-CONFIG_CPU_SW_DOMAIN_PAN.
-
-See: https://github.com/raspberrypi/linux/issues/1381
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-Fix copy_from_user if BCM2835_FAST_MEMCPY=n
-
-The change which introduced CONFIG_BCM2835_FAST_MEMCPY unconditionally
-changed the behaviour of arm_copy_from_user. The page pinning code
-is not safe on ARMv7 if LPAE & high memory is enabled and causes
-crashes which look like PTE corruption.
-
-Make __copy_from_user_memcpy conditional on CONFIG_2835_FAST_MEMCPY=y
-which is really an ARMv6 / Pi1 optimization and not necessary on newer
-ARM processors.
-
-arm: fix mmap unlocks in uaccess_with_memcpy.c
-
-This is a regression that was added with the commit 192a4e923ef092924dd013e7326f2ec520ee4783 as of rpi-5.8.y, since that is when the move to the mmap locking API was introduced - d8ed45c5dcd455fc5848d47f86883a1b872ac0d0
-
-The issue is that when the patch to improve performance for the __copy_to_user and __copy_from_user functions were added for the Raspberry Pi, some of the mmaps were incorrectly mapped to write instead of read. This would cause a verity of issues, and in my case, prevent the booting of a squashfs filesystem on rpi-5.8-y and above. An example of the panic you would see from this can be seen at https://pastebin.com/raw/jBz5xCzL
-
-Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
-Signed-off-by: Christopher Blake <chrisrblake93@gmail.com>
-
-arch/arm: Add __memset alias to memset_rpi.S
-
-memset_rpi.S is an optimised memset implementation, but doesn't define
-__memset (which was just added to memset.S). As a result, building
-for the BCM2835 platform causes a link failure.
-
-Add __memset as yet another alias to our common implementation.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-arm: Fix custom rpi __memset32 and __memset64
-
-See: https://github.com/raspberrypi/linux/issues/4798
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-arm: Fix annoying .eh_frame section warnings
-
-Replace the cfi directives with the UNWIND equivalents. This prevents
-the .eh_frame section from being created, eliminating the warnings.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/include/asm/string.h      |   5 +
- arch/arm/include/asm/uaccess.h     |   3 +
- arch/arm/lib/Makefile              |  14 +-
- arch/arm/lib/arm-mem.h             | 159 ++++++++++
- arch/arm/lib/copy_from_user.S      |   4 +-
- arch/arm/lib/exports_rpi.c         |  37 +++
- arch/arm/lib/memcmp_rpi.S          | 285 +++++++++++++++++
- arch/arm/lib/memcpy_rpi.S          |  63 ++++
- arch/arm/lib/memcpymove.h          | 488 +++++++++++++++++++++++++++++
- arch/arm/lib/memmove_rpi.S         |  63 ++++
- arch/arm/lib/memset_rpi.S          | 132 ++++++++
- arch/arm/lib/uaccess_with_memcpy.c | 125 +++++++-
- arch/arm/mach-bcm/Kconfig          |  24 ++
- 13 files changed, 1396 insertions(+), 6 deletions(-)
- create mode 100644 arch/arm/lib/arm-mem.h
- create mode 100644 arch/arm/lib/exports_rpi.c
- create mode 100644 arch/arm/lib/memcmp_rpi.S
- create mode 100644 arch/arm/lib/memcpy_rpi.S
- create mode 100644 arch/arm/lib/memcpymove.h
- create mode 100644 arch/arm/lib/memmove_rpi.S
- create mode 100644 arch/arm/lib/memset_rpi.S
-
---- a/arch/arm/include/asm/string.h
-+++ b/arch/arm/include/asm/string.h
-@@ -65,4 +65,9 @@ static inline void *memset64(uint64_t *p
- 
- #endif
- 
-+#ifdef CONFIG_BCM2835_FAST_MEMCPY
-+#define __HAVE_ARCH_MEMCMP
-+extern int memcmp(const void *, const void *, size_t);
-+#endif
-+
- #endif
---- a/arch/arm/include/asm/uaccess.h
-+++ b/arch/arm/include/asm/uaccess.h
-@@ -509,6 +509,9 @@ do {									\
- extern unsigned long __must_check
- arm_copy_from_user(void *to, const void __user *from, unsigned long n);
- 
-+extern unsigned long __must_check
-+__copy_from_user_std(void *to, const void __user *from, unsigned long n);
-+
- static inline unsigned long __must_check
- raw_copy_from_user(void *to, const void __user *from, unsigned long n)
- {
---- a/arch/arm/lib/Makefile
-+++ b/arch/arm/lib/Makefile
-@@ -7,8 +7,8 @@
- 
- lib-y		:= changebit.o csumipv6.o csumpartial.o               \
- 		   csumpartialcopy.o csumpartialcopyuser.o clearbit.o \
--		   delay.o delay-loop.o findbit.o memchr.o memcpy.o   \
--		   memmove.o memset.o setbit.o                        \
-+		   delay.o delay-loop.o findbit.o memchr.o            \
-+		   setbit.o                                           \
- 		   strchr.o strrchr.o                                 \
- 		   testchangebit.o testclearbit.o testsetbit.o        \
- 		   ashldi3.o ashrdi3.o lshrdi3.o muldi3.o             \
-@@ -25,6 +25,16 @@ else
-   lib-y	+= backtrace.o
- endif
- 
-+# Choose optimised implementations for Raspberry Pi
-+ifeq ($(CONFIG_BCM2835_FAST_MEMCPY),y)
-+  CFLAGS_uaccess_with_memcpy.o += -DCOPY_FROM_USER_THRESHOLD=1600
-+  CFLAGS_uaccess_with_memcpy.o += -DCOPY_TO_USER_THRESHOLD=672
-+  obj-$(CONFIG_MODULES) += exports_rpi.o
-+  lib-y        += memcpy_rpi.o memmove_rpi.o memset_rpi.o memcmp_rpi.o
-+else
-+  lib-y        += memcpy.o memmove.o memset.o
-+endif
-+
- # using lib_ here won't override already available weak symbols
- obj-$(CONFIG_UACCESS_WITH_MEMCPY) += uaccess_with_memcpy.o
- 
---- /dev/null
-+++ b/arch/arm/lib/arm-mem.h
-@@ -0,0 +1,159 @@
-+/*
-+Copyright (c) 2013, Raspberry Pi Foundation
-+Copyright (c) 2013, RISC OS Open Ltd
-+All rights reserved.
-+
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions are met:
-+    * Redistributions of source code must retain the above copyright
-+      notice, this list of conditions and the following disclaimer.
-+    * Redistributions in binary form must reproduce the above copyright
-+      notice, this list of conditions and the following disclaimer in the
-+      documentation and/or other materials provided with the distribution.
-+    * Neither the name of the copyright holder nor the
-+      names of its contributors may be used to endorse or promote products
-+      derived from this software without specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
-+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+*/
-+
-+.macro myfunc fname
-+ .func fname
-+ .global fname
-+fname:
-+.endm
-+
-+.macro preload_leading_step1  backwards, ptr, base
-+/* If the destination is already 16-byte aligned, then we need to preload
-+ * between 0 and prefetch_distance (inclusive) cache lines ahead so there
-+ * are no gaps when the inner loop starts.
-+ */
-+ .if backwards
-+        sub     ptr, base, #1
-+        bic     ptr, ptr, #31
-+ .else
-+        bic     ptr, base, #31
-+ .endif
-+ .set OFFSET, 0
-+ .rept prefetch_distance+1
-+        pld     [ptr, #OFFSET]
-+  .if backwards
-+   .set OFFSET, OFFSET-32
-+  .else
-+   .set OFFSET, OFFSET+32
-+  .endif
-+ .endr
-+.endm
-+
-+.macro preload_leading_step2  backwards, ptr, base, leading_bytes, tmp
-+/* However, if the destination is not 16-byte aligned, we may need to
-+ * preload one more cache line than that. The question we need to ask is:
-+ * are the leading bytes more than the amount by which the source
-+ * pointer will be rounded down for preloading, and if so, by how many
-+ * cache lines?
-+ */
-+ .if backwards
-+/* Here we compare against how many bytes we are into the
-+ * cache line, counting down from the highest such address.
-+ * Effectively, we want to calculate
-+ *     leading_bytes = dst&15
-+ *     cacheline_offset = 31-((src-leading_bytes-1)&31)
-+ *     extra_needed = leading_bytes - cacheline_offset
-+ * and test if extra_needed is <= 0, or rearranging:
-+ *     leading_bytes + (src-leading_bytes-1)&31 <= 31
-+ */
-+        mov     tmp, base, lsl #32-5
-+        sbc     tmp, tmp, leading_bytes, lsl #32-5
-+        adds    tmp, tmp, leading_bytes, lsl #32-5
-+        bcc     61f
-+        pld     [ptr, #-32*(prefetch_distance+1)]
-+ .else
-+/* Effectively, we want to calculate
-+ *     leading_bytes = (-dst)&15
-+ *     cacheline_offset = (src+leading_bytes)&31
-+ *     extra_needed = leading_bytes - cacheline_offset
-+ * and test if extra_needed is <= 0.
-+ */
-+        mov     tmp, base, lsl #32-5
-+        add     tmp, tmp, leading_bytes, lsl #32-5
-+        rsbs    tmp, tmp, leading_bytes, lsl #32-5
-+        bls     61f
-+        pld     [ptr, #32*(prefetch_distance+1)]
-+ .endif
-+61:
-+.endm
-+
-+.macro preload_trailing  backwards, base, remain, tmp
-+        /* We need either 0, 1 or 2 extra preloads */
-+ .if backwards
-+        rsb     tmp, base, #0
-+        mov     tmp, tmp, lsl #32-5
-+ .else
-+        mov     tmp, base, lsl #32-5
-+ .endif
-+        adds    tmp, tmp, remain, lsl #32-5
-+        adceqs  tmp, tmp, #0
-+        /* The instruction above has two effects: ensures Z is only
-+         * set if C was clear (so Z indicates that both shifted quantities
-+         * were 0), and clears C if Z was set (so C indicates that the sum
-+         * of the shifted quantities was greater and not equal to 32) */
-+        beq     82f
-+ .if backwards
-+        sub     tmp, base, #1
-+        bic     tmp, tmp, #31
-+ .else
-+        bic     tmp, base, #31
-+ .endif
-+        bcc     81f
-+ .if backwards
-+        pld     [tmp, #-32*(prefetch_distance+1)]
-+81:
-+        pld     [tmp, #-32*prefetch_distance]
-+ .else
-+        pld     [tmp, #32*(prefetch_distance+2)]
-+81:
-+        pld     [tmp, #32*(prefetch_distance+1)]
-+ .endif
-+82:
-+.endm
-+
-+.macro preload_all    backwards, narrow_case, shift, base, remain, tmp0, tmp1
-+ .if backwards
-+        sub     tmp0, base, #1
-+        bic     tmp0, tmp0, #31
-+        pld     [tmp0]
-+        sub     tmp1, base, remain, lsl #shift
-+ .else
-+        bic     tmp0, base, #31
-+        pld     [tmp0]
-+        add     tmp1, base, remain, lsl #shift
-+        sub     tmp1, tmp1, #1
-+ .endif
-+        bic     tmp1, tmp1, #31
-+        cmp     tmp1, tmp0
-+        beq     92f
-+ .if narrow_case
-+        /* In this case, all the data fits in either 1 or 2 cache lines */
-+        pld     [tmp1]
-+ .else
-+91:
-+  .if backwards
-+        sub     tmp0, tmp0, #32
-+  .else
-+        add     tmp0, tmp0, #32
-+  .endif
-+        cmp     tmp0, tmp1
-+        pld     [tmp0]
-+        bne     91b
-+ .endif
-+92:
-+.endm
---- a/arch/arm/lib/copy_from_user.S
-+++ b/arch/arm/lib/copy_from_user.S
-@@ -104,7 +104,8 @@ UNWIND( .save	{r0, r2, r3, \regs}		)
- 
- 	.text
- 
--ENTRY(arm_copy_from_user)
-+ENTRY(__copy_from_user_std)
-+WEAK(arm_copy_from_user)
- #ifdef CONFIG_CPU_SPECTRE
- 	ldr	r3, =TASK_SIZE
- 	uaccess_mask_range_ptr r1, r2, r3, ip
-@@ -113,6 +114,7 @@ ENTRY(arm_copy_from_user)
- #include "copy_template.S"
- 
- ENDPROC(arm_copy_from_user)
-+ENDPROC(__copy_from_user_std)
- 
- 	.pushsection .text.fixup,"ax"
- 	.align 0
---- /dev/null
-+++ b/arch/arm/lib/exports_rpi.c
-@@ -0,0 +1,37 @@
-+/**
-+ * Copyright (c) 2014, Raspberry Pi (Trading) Ltd.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions, and the following disclaimer,
-+ *    without modification.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. The names of the above-listed copyright holders may not be used
-+ *    to endorse or promote products derived from this software without
-+ *    specific prior written permission.
-+ *
-+ * ALTERNATIVELY, this software may be distributed under the terms of the
-+ * GNU General Public License ("GPL") version 2, as published by the Free
-+ * Software Foundation.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+
-+EXPORT_SYMBOL(memcmp);
---- /dev/null
-+++ b/arch/arm/lib/memcmp_rpi.S
-@@ -0,0 +1,285 @@
-+/*
-+Copyright (c) 2013, Raspberry Pi Foundation
-+Copyright (c) 2013, RISC OS Open Ltd
-+All rights reserved.
-+
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions are met:
-+    * Redistributions of source code must retain the above copyright
-+      notice, this list of conditions and the following disclaimer.
-+    * Redistributions in binary form must reproduce the above copyright
-+      notice, this list of conditions and the following disclaimer in the
-+      documentation and/or other materials provided with the distribution.
-+    * Neither the name of the copyright holder nor the
-+      names of its contributors may be used to endorse or promote products
-+      derived from this software without specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
-+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+*/
-+
-+#include <linux/linkage.h>
-+#include "arm-mem.h"
-+
-+/* Prevent the stack from becoming executable */
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-+
-+    .text
-+    .arch armv6
-+    .object_arch armv4
-+    .arm
-+    .altmacro
-+    .p2align 2
-+
-+.macro memcmp_process_head  unaligned
-+ .if unaligned
-+        ldr     DAT0, [S_1], #4
-+        ldr     DAT1, [S_1], #4
-+        ldr     DAT2, [S_1], #4
-+        ldr     DAT3, [S_1], #4
-+ .else
-+        ldmia   S_1!, {DAT0, DAT1, DAT2, DAT3}
-+ .endif
-+        ldmia   S_2!, {DAT4, DAT5, DAT6, DAT7}
-+.endm
-+
-+.macro memcmp_process_tail
-+        cmp     DAT0, DAT4
-+        cmpeq   DAT1, DAT5
-+        cmpeq   DAT2, DAT6
-+        cmpeq   DAT3, DAT7
-+        bne     200f
-+.endm
-+
-+.macro memcmp_leading_31bytes
-+        movs    DAT0, OFF, lsl #31
-+        ldrmib  DAT0, [S_1], #1
-+        ldrcsh  DAT1, [S_1], #2
-+        ldrmib  DAT4, [S_2], #1
-+        ldrcsh  DAT5, [S_2], #2
-+        movpl   DAT0, #0
-+        movcc   DAT1, #0
-+        movpl   DAT4, #0
-+        movcc   DAT5, #0
-+        submi   N, N, #1
-+        subcs   N, N, #2
-+        cmp     DAT0, DAT4
-+        cmpeq   DAT1, DAT5
-+        bne     200f
-+        movs    DAT0, OFF, lsl #29
-+        ldrmi   DAT0, [S_1], #4
-+        ldrcs   DAT1, [S_1], #4
-+        ldrcs   DAT2, [S_1], #4
-+        ldrmi   DAT4, [S_2], #4
-+        ldmcsia S_2!, {DAT5, DAT6}
-+        movpl   DAT0, #0
-+        movcc   DAT1, #0
-+        movcc   DAT2, #0
-+        movpl   DAT4, #0
-+        movcc   DAT5, #0
-+        movcc   DAT6, #0
-+        submi   N, N, #4
-+        subcs   N, N, #8
-+        cmp     DAT0, DAT4
-+        cmpeq   DAT1, DAT5
-+        cmpeq   DAT2, DAT6
-+        bne     200f
-+        tst     OFF, #16
-+        beq     105f
-+        memcmp_process_head  1
-+        sub     N, N, #16
-+        memcmp_process_tail
-+105:
-+.endm
-+
-+.macro memcmp_trailing_15bytes  unaligned
-+        movs    N, N, lsl #29
-+ .if unaligned
-+        ldrcs   DAT0, [S_1], #4
-+        ldrcs   DAT1, [S_1], #4
-+ .else
-+        ldmcsia S_1!, {DAT0, DAT1}
-+ .endif
-+        ldrmi   DAT2, [S_1], #4
-+        ldmcsia S_2!, {DAT4, DAT5}
-+        ldrmi   DAT6, [S_2], #4
-+        movcc   DAT0, #0
-+        movcc   DAT1, #0
-+        movpl   DAT2, #0
-+        movcc   DAT4, #0
-+        movcc   DAT5, #0
-+        movpl   DAT6, #0
-+        cmp     DAT0, DAT4
-+        cmpeq   DAT1, DAT5
-+        cmpeq   DAT2, DAT6
-+        bne     200f
-+        movs    N, N, lsl #2
-+        ldrcsh  DAT0, [S_1], #2
-+        ldrmib  DAT1, [S_1]
-+        ldrcsh  DAT4, [S_2], #2
-+        ldrmib  DAT5, [S_2]
-+        movcc   DAT0, #0
-+        movpl   DAT1, #0
-+        movcc   DAT4, #0
-+        movpl   DAT5, #0
-+        cmp     DAT0, DAT4
-+        cmpeq   DAT1, DAT5
-+        bne     200f
-+.endm
-+
-+.macro memcmp_long_inner_loop  unaligned
-+110:
-+        memcmp_process_head  unaligned
-+        pld     [S_2, #prefetch_distance*32 + 16]
-+        memcmp_process_tail
-+        memcmp_process_head  unaligned
-+        pld     [S_1, OFF]
-+        memcmp_process_tail
-+        subs    N, N, #32
-+        bhs     110b
-+        /* Just before the final (prefetch_distance+1) 32-byte blocks,
-+         * deal with final preloads */
-+        preload_trailing  0, S_1, N, DAT0
-+        preload_trailing  0, S_2, N, DAT0
-+        add     N, N, #(prefetch_distance+2)*32 - 16
-+120:
-+        memcmp_process_head  unaligned
-+        memcmp_process_tail
-+        subs    N, N, #16
-+        bhs     120b
-+        /* Trailing words and bytes */
-+        tst     N, #15
-+        beq     199f
-+        memcmp_trailing_15bytes  unaligned
-+199:    /* Reached end without detecting a difference */
-+        mov     a1, #0
-+        setend  le
-+        pop     {DAT1-DAT6, pc}
-+.endm
-+
-+.macro memcmp_short_inner_loop  unaligned
-+        subs    N, N, #16     /* simplifies inner loop termination */
-+        blo     122f
-+120:
-+        memcmp_process_head  unaligned
-+        memcmp_process_tail
-+        subs    N, N, #16
-+        bhs     120b
-+122:    /* Trailing words and bytes */
-+        tst     N, #15
-+        beq     199f
-+        memcmp_trailing_15bytes  unaligned
-+199:    /* Reached end without detecting a difference */
-+        mov     a1, #0
-+        setend  le
-+        pop     {DAT1-DAT6, pc}
-+.endm
-+
-+/*
-+ * int memcmp(const void *s1, const void *s2, size_t n);
-+ * On entry:
-+ * a1 = pointer to buffer 1
-+ * a2 = pointer to buffer 2
-+ * a3 = number of bytes to compare (as unsigned chars)
-+ * On exit:
-+ * a1 = >0/=0/<0 if s1 >/=/< s2
-+ */
-+
-+.set prefetch_distance, 2
-+
-+ENTRY(memcmp)
-+        S_1     .req    a1
-+        S_2     .req    a2
-+        N       .req    a3
-+        DAT0    .req    a4
-+        DAT1    .req    v1
-+        DAT2    .req    v2
-+        DAT3    .req    v3
-+        DAT4    .req    v4
-+        DAT5    .req    v5
-+        DAT6    .req    v6
-+        DAT7    .req    ip
-+        OFF     .req    lr
-+
-+        push    {DAT1-DAT6, lr}
-+        setend  be /* lowest-addressed bytes are most significant */
-+
-+        /* To preload ahead as we go, we need at least (prefetch_distance+2) 32-byte blocks */
-+        cmp     N, #(prefetch_distance+3)*32 - 1
-+        blo     170f
-+
-+        /* Long case */
-+        /* Adjust N so that the decrement instruction can also test for
-+         * inner loop termination. We want it to stop when there are
-+         * (prefetch_distance+1) complete blocks to go. */
-+        sub     N, N, #(prefetch_distance+2)*32
-+        preload_leading_step1  0, DAT0, S_1
-+        preload_leading_step1  0, DAT1, S_2
-+        tst     S_2, #31
-+        beq     154f
-+        rsb     OFF, S_2, #0 /* no need to AND with 15 here */
-+        preload_leading_step2  0, DAT0, S_1, OFF, DAT2
-+        preload_leading_step2  0, DAT1, S_2, OFF, DAT2
-+        memcmp_leading_31bytes
-+154:    /* Second source now cacheline (32-byte) aligned; we have at
-+         * least one prefetch to go. */
-+        /* Prefetch offset is best selected such that it lies in the
-+         * first 8 of each 32 bytes - but it's just as easy to aim for
-+         * the first one */
-+        and     OFF, S_1, #31
-+        rsb     OFF, OFF, #32*prefetch_distance
-+        tst     S_1, #3
-+        bne     140f
-+        memcmp_long_inner_loop  0
-+140:    memcmp_long_inner_loop  1
-+
-+170:    /* Short case */
-+        teq     N, #0
-+        beq     199f
-+        preload_all 0, 0, 0, S_1, N, DAT0, DAT1
-+        preload_all 0, 0, 0, S_2, N, DAT0, DAT1
-+        tst     S_2, #3
-+        beq     174f
-+172:    subs    N, N, #1
-+        blo     199f
-+        ldrb    DAT0, [S_1], #1
-+        ldrb    DAT4, [S_2], #1
-+        cmp     DAT0, DAT4
-+        bne     200f
-+        tst     S_2, #3
-+        bne     172b
-+174:    /* Second source now 4-byte aligned; we have 0 or more bytes to go */
-+        tst     S_1, #3
-+        bne     140f
-+        memcmp_short_inner_loop  0
-+140:    memcmp_short_inner_loop  1
-+
-+200:    /* Difference found: determine sign. */
-+        movhi   a1, #1
-+        movlo   a1, #-1
-+        setend  le
-+        pop     {DAT1-DAT6, pc}
-+
-+        .unreq  S_1
-+        .unreq  S_2
-+        .unreq  N
-+        .unreq  DAT0
-+        .unreq  DAT1
-+        .unreq  DAT2
-+        .unreq  DAT3
-+        .unreq  DAT4
-+        .unreq  DAT5
-+        .unreq  DAT6
-+        .unreq  DAT7
-+        .unreq  OFF
-+ENDPROC(memcmp)
---- /dev/null
-+++ b/arch/arm/lib/memcpy_rpi.S
-@@ -0,0 +1,63 @@
-+/*
-+Copyright (c) 2013, Raspberry Pi Foundation
-+Copyright (c) 2013, RISC OS Open Ltd
-+All rights reserved.
-+
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions are met:
-+    * Redistributions of source code must retain the above copyright
-+      notice, this list of conditions and the following disclaimer.
-+    * Redistributions in binary form must reproduce the above copyright
-+      notice, this list of conditions and the following disclaimer in the
-+      documentation and/or other materials provided with the distribution.
-+    * Neither the name of the copyright holder nor the
-+      names of its contributors may be used to endorse or promote products
-+      derived from this software without specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
-+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+*/
-+
-+#include <linux/linkage.h>
-+#include <asm/assembler.h>
-+#include <asm/unwind.h>
-+#include "arm-mem.h"
-+#include "memcpymove.h"
-+
-+/* Prevent the stack from becoming executable */
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-+
-+    .text
-+    .arch armv6
-+    .object_arch armv4
-+    .arm
-+    .altmacro
-+    .p2align 2
-+
-+/*
-+ * void *memcpy(void * restrict s1, const void * restrict s2, size_t n);
-+ * On entry:
-+ * a1 = pointer to destination
-+ * a2 = pointer to source
-+ * a3 = number of bytes to copy
-+ * On exit:
-+ * a1 preserved
-+ */
-+
-+.set prefetch_distance, 3
-+
-+ENTRY(mmiocpy)
-+ENTRY(memcpy)
-+        memcpy  0
-+ENDPROC(memcpy)
-+ENDPROC(mmiocpy)
---- /dev/null
-+++ b/arch/arm/lib/memcpymove.h
-@@ -0,0 +1,488 @@
-+/*
-+Copyright (c) 2013, Raspberry Pi Foundation
-+Copyright (c) 2013, RISC OS Open Ltd
-+All rights reserved.
-+
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions are met:
-+    * Redistributions of source code must retain the above copyright
-+      notice, this list of conditions and the following disclaimer.
-+    * Redistributions in binary form must reproduce the above copyright
-+      notice, this list of conditions and the following disclaimer in the
-+      documentation and/or other materials provided with the distribution.
-+    * Neither the name of the copyright holder nor the
-+      names of its contributors may be used to endorse or promote products
-+      derived from this software without specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
-+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+*/
-+
-+.macro unaligned_words  backwards, align, use_pld, words, r0, r1, r2, r3, r4, r5, r6, r7, r8
-+ .if words == 1
-+  .if backwards
-+        mov     r1, r0, lsl #32-align*8
-+        ldr     r0, [S, #-4]!
-+        orr     r1, r1, r0, lsr #align*8
-+        str     r1, [D, #-4]!
-+  .else
-+        mov     r0, r1, lsr #align*8
-+        ldr     r1, [S, #4]!
-+        orr     r0, r0, r1, lsl #32-align*8
-+        str     r0, [D], #4
-+  .endif
-+ .elseif words == 2
-+  .if backwards
-+        ldr     r1, [S, #-4]!
-+        mov     r2, r0, lsl #32-align*8
-+        ldr     r0, [S, #-4]!
-+        orr     r2, r2, r1, lsr #align*8
-+        mov     r1, r1, lsl #32-align*8
-+        orr     r1, r1, r0, lsr #align*8
-+        stmdb   D!, {r1, r2}
-+  .else
-+        ldr     r1, [S, #4]!
-+        mov     r0, r2, lsr #align*8
-+        ldr     r2, [S, #4]!
-+        orr     r0, r0, r1, lsl #32-align*8
-+        mov     r1, r1, lsr #align*8
-+        orr     r1, r1, r2, lsl #32-align*8
-+        stmia   D!, {r0, r1}
-+  .endif
-+ .elseif words == 4
-+  .if backwards
-+        ldmdb   S!, {r2, r3}
-+        mov     r4, r0, lsl #32-align*8
-+        ldmdb   S!, {r0, r1}
-+        orr     r4, r4, r3, lsr #align*8
-+        mov     r3, r3, lsl #32-align*8
-+        orr     r3, r3, r2, lsr #align*8
-+        mov     r2, r2, lsl #32-align*8
-+        orr     r2, r2, r1, lsr #align*8
-+        mov     r1, r1, lsl #32-align*8
-+        orr     r1, r1, r0, lsr #align*8
-+        stmdb   D!, {r1, r2, r3, r4}
-+  .else
-+        ldmib   S!, {r1, r2}
-+        mov     r0, r4, lsr #align*8
-+        ldmib   S!, {r3, r4}
-+        orr     r0, r0, r1, lsl #32-align*8
-+        mov     r1, r1, lsr #align*8
-+        orr     r1, r1, r2, lsl #32-align*8
-+        mov     r2, r2, lsr #align*8
-+        orr     r2, r2, r3, lsl #32-align*8
-+        mov     r3, r3, lsr #align*8
-+        orr     r3, r3, r4, lsl #32-align*8
-+        stmia   D!, {r0, r1, r2, r3}
-+  .endif
-+ .elseif words == 8
-+  .if backwards
-+        ldmdb   S!, {r4, r5, r6, r7}
-+        mov     r8, r0, lsl #32-align*8
-+        ldmdb   S!, {r0, r1, r2, r3}
-+   .if use_pld
-+        pld     [S, OFF]
-+   .endif
-+        orr     r8, r8, r7, lsr #align*8
-+        mov     r7, r7, lsl #32-align*8
-+        orr     r7, r7, r6, lsr #align*8
-+        mov     r6, r6, lsl #32-align*8
-+        orr     r6, r6, r5, lsr #align*8
-+        mov     r5, r5, lsl #32-align*8
-+        orr     r5, r5, r4, lsr #align*8
-+        mov     r4, r4, lsl #32-align*8
-+        orr     r4, r4, r3, lsr #align*8
-+        mov     r3, r3, lsl #32-align*8
-+        orr     r3, r3, r2, lsr #align*8
-+        mov     r2, r2, lsl #32-align*8
-+        orr     r2, r2, r1, lsr #align*8
-+        mov     r1, r1, lsl #32-align*8
-+        orr     r1, r1, r0, lsr #align*8
-+        stmdb   D!, {r5, r6, r7, r8}
-+        stmdb   D!, {r1, r2, r3, r4}
-+  .else
-+        ldmib   S!, {r1, r2, r3, r4}
-+        mov     r0, r8, lsr #align*8
-+        ldmib   S!, {r5, r6, r7, r8}
-+   .if use_pld
-+        pld     [S, OFF]
-+   .endif
-+        orr     r0, r0, r1, lsl #32-align*8
-+        mov     r1, r1, lsr #align*8
-+        orr     r1, r1, r2, lsl #32-align*8
-+        mov     r2, r2, lsr #align*8
-+        orr     r2, r2, r3, lsl #32-align*8
-+        mov     r3, r3, lsr #align*8
-+        orr     r3, r3, r4, lsl #32-align*8
-+        mov     r4, r4, lsr #align*8
-+        orr     r4, r4, r5, lsl #32-align*8
-+        mov     r5, r5, lsr #align*8
-+        orr     r5, r5, r6, lsl #32-align*8
-+        mov     r6, r6, lsr #align*8
-+        orr     r6, r6, r7, lsl #32-align*8
-+        mov     r7, r7, lsr #align*8
-+        orr     r7, r7, r8, lsl #32-align*8
-+        stmia   D!, {r0, r1, r2, r3}
-+        stmia   D!, {r4, r5, r6, r7}
-+  .endif
-+ .endif
-+.endm
-+
-+.macro memcpy_leading_15bytes  backwards, align
-+        movs    DAT1, DAT2, lsl #31
-+        sub     N, N, DAT2
-+ .if backwards
-+        ldrmib  DAT0, [S, #-1]!
-+        ldrcsh  DAT1, [S, #-2]!
-+        strmib  DAT0, [D, #-1]!
-+        strcsh  DAT1, [D, #-2]!
-+ .else
-+        ldrmib  DAT0, [S], #1
-+        ldrcsh  DAT1, [S], #2
-+        strmib  DAT0, [D], #1
-+        strcsh  DAT1, [D], #2
-+ .endif
-+        movs    DAT1, DAT2, lsl #29
-+ .if backwards
-+        ldrmi   DAT0, [S, #-4]!
-+  .if align == 0
-+        ldmcsdb S!, {DAT1, DAT2}
-+  .else
-+        ldrcs   DAT2, [S, #-4]!
-+        ldrcs   DAT1, [S, #-4]!
-+  .endif
-+        strmi   DAT0, [D, #-4]!
-+        stmcsdb D!, {DAT1, DAT2}
-+ .else
-+        ldrmi   DAT0, [S], #4
-+  .if align == 0
-+        ldmcsia S!, {DAT1, DAT2}
-+  .else
-+        ldrcs   DAT1, [S], #4
-+        ldrcs   DAT2, [S], #4
-+  .endif
-+        strmi   DAT0, [D], #4
-+        stmcsia D!, {DAT1, DAT2}
-+ .endif
-+.endm
-+
-+.macro memcpy_trailing_15bytes  backwards, align
-+        movs    N, N, lsl #29
-+ .if backwards
-+  .if align == 0
-+        ldmcsdb S!, {DAT0, DAT1}
-+  .else
-+        ldrcs   DAT1, [S, #-4]!
-+        ldrcs   DAT0, [S, #-4]!
-+  .endif
-+        ldrmi   DAT2, [S, #-4]!
-+        stmcsdb D!, {DAT0, DAT1}
-+        strmi   DAT2, [D, #-4]!
-+ .else
-+  .if align == 0
-+        ldmcsia S!, {DAT0, DAT1}
-+  .else
-+        ldrcs   DAT0, [S], #4
-+        ldrcs   DAT1, [S], #4
-+  .endif
-+        ldrmi   DAT2, [S], #4
-+        stmcsia D!, {DAT0, DAT1}
-+        strmi   DAT2, [D], #4
-+ .endif
-+        movs    N, N, lsl #2
-+ .if backwards
-+        ldrcsh  DAT0, [S, #-2]!
-+        ldrmib  DAT1, [S, #-1]
-+        strcsh  DAT0, [D, #-2]!
-+        strmib  DAT1, [D, #-1]
-+ .else
-+        ldrcsh  DAT0, [S], #2
-+        ldrmib  DAT1, [S]
-+        strcsh  DAT0, [D], #2
-+        strmib  DAT1, [D]
-+ .endif
-+.endm
-+
-+.macro memcpy_long_inner_loop  backwards, align
-+ .if align != 0
-+  .if backwards
-+        ldr     DAT0, [S, #-align]!
-+  .else
-+        ldr     LAST, [S, #-align]!
-+  .endif
-+ .endif
-+110:
-+ .if align == 0
-+  .if backwards
-+        ldmdb   S!, {DAT0, DAT1, DAT2, DAT3, DAT4, DAT5, DAT6, LAST}
-+        pld     [S, OFF]
-+        stmdb   D!, {DAT4, DAT5, DAT6, LAST}
-+        stmdb   D!, {DAT0, DAT1, DAT2, DAT3}
-+  .else
-+        ldmia   S!, {DAT0, DAT1, DAT2, DAT3, DAT4, DAT5, DAT6, LAST}
-+        pld     [S, OFF]
-+        stmia   D!, {DAT0, DAT1, DAT2, DAT3}
-+        stmia   D!, {DAT4, DAT5, DAT6, LAST}
-+  .endif
-+ .else
-+        unaligned_words  backwards, align, 1, 8, DAT0, DAT1, DAT2, DAT3, DAT4, DAT5, DAT6, DAT7, LAST
-+ .endif
-+        subs    N, N, #32
-+        bhs     110b
-+        /* Just before the final (prefetch_distance+1) 32-byte blocks, deal with final preloads */
-+        preload_trailing  backwards, S, N, OFF
-+        add     N, N, #(prefetch_distance+2)*32 - 32
-+120:
-+ .if align == 0
-+  .if backwards
-+        ldmdb   S!, {DAT0, DAT1, DAT2, DAT3, DAT4, DAT5, DAT6, LAST}
-+        stmdb   D!, {DAT4, DAT5, DAT6, LAST}
-+        stmdb   D!, {DAT0, DAT1, DAT2, DAT3}
-+  .else
-+        ldmia   S!, {DAT0, DAT1, DAT2, DAT3, DAT4, DAT5, DAT6, LAST}
-+        stmia   D!, {DAT0, DAT1, DAT2, DAT3}
-+        stmia   D!, {DAT4, DAT5, DAT6, LAST}
-+  .endif
-+ .else
-+        unaligned_words  backwards, align, 0, 8, DAT0, DAT1, DAT2, DAT3, DAT4, DAT5, DAT6, DAT7, LAST
-+ .endif
-+        subs    N, N, #32
-+        bhs     120b
-+        tst     N, #16
-+ .if align == 0
-+  .if backwards
-+        ldmnedb S!, {DAT0, DAT1, DAT2, LAST}
-+        stmnedb D!, {DAT0, DAT1, DAT2, LAST}
-+  .else
-+        ldmneia S!, {DAT0, DAT1, DAT2, LAST}
-+        stmneia D!, {DAT0, DAT1, DAT2, LAST}
-+  .endif
-+ .else
-+        beq     130f
-+        unaligned_words  backwards, align, 0, 4, DAT0, DAT1, DAT2, DAT3, LAST
-+130:
-+ .endif
-+        /* Trailing words and bytes */
-+        tst      N, #15
-+        beq      199f
-+ .if align != 0
-+        add     S, S, #align
-+ .endif
-+        memcpy_trailing_15bytes  backwards, align
-+199:
-+        pop     {DAT3, DAT4, DAT5, DAT6, DAT7}
-+        pop     {D, DAT1, DAT2, pc}
-+.endm
-+
-+.macro memcpy_medium_inner_loop  backwards, align
-+120:
-+ .if backwards
-+  .if align == 0
-+        ldmdb   S!, {DAT0, DAT1, DAT2, LAST}
-+  .else
-+        ldr     LAST, [S, #-4]!
-+        ldr     DAT2, [S, #-4]!
-+        ldr     DAT1, [S, #-4]!
-+        ldr     DAT0, [S, #-4]!
-+  .endif
-+        stmdb   D!, {DAT0, DAT1, DAT2, LAST}
-+ .else
-+  .if align == 0
-+        ldmia   S!, {DAT0, DAT1, DAT2, LAST}
-+  .else
-+        ldr     DAT0, [S], #4
-+        ldr     DAT1, [S], #4
-+        ldr     DAT2, [S], #4
-+        ldr     LAST, [S], #4
-+  .endif
-+        stmia   D!, {DAT0, DAT1, DAT2, LAST}
-+ .endif
-+        subs     N, N, #16
-+        bhs      120b
-+        /* Trailing words and bytes */
-+        tst      N, #15
-+        beq      199f
-+        memcpy_trailing_15bytes  backwards, align
-+199:
-+        pop     {D, DAT1, DAT2, pc}
-+.endm
-+
-+.macro memcpy_short_inner_loop  backwards, align
-+        tst     N, #16
-+ .if backwards
-+  .if align == 0
-+        ldmnedb S!, {DAT0, DAT1, DAT2, LAST}
-+  .else
-+        ldrne   LAST, [S, #-4]!
-+        ldrne   DAT2, [S, #-4]!
-+        ldrne   DAT1, [S, #-4]!
-+        ldrne   DAT0, [S, #-4]!
-+  .endif
-+        stmnedb D!, {DAT0, DAT1, DAT2, LAST}
-+ .else
-+  .if align == 0
-+        ldmneia S!, {DAT0, DAT1, DAT2, LAST}
-+  .else
-+        ldrne   DAT0, [S], #4
-+        ldrne   DAT1, [S], #4
-+        ldrne   DAT2, [S], #4
-+        ldrne   LAST, [S], #4
-+  .endif
-+        stmneia D!, {DAT0, DAT1, DAT2, LAST}
-+ .endif
-+        memcpy_trailing_15bytes  backwards, align
-+199:
-+        pop     {D, DAT1, DAT2, pc}
-+.endm
-+
-+.macro memcpy backwards
-+        D       .req    a1
-+        S       .req    a2
-+        N       .req    a3
-+        DAT0    .req    a4
-+        DAT1    .req    v1
-+        DAT2    .req    v2
-+        DAT3    .req    v3
-+        DAT4    .req    v4
-+        DAT5    .req    v5
-+        DAT6    .req    v6
-+        DAT7    .req    sl
-+        LAST    .req    ip
-+        OFF     .req    lr
-+
-+        UNWIND( .fnstart )
-+
-+        push    {D, DAT1, DAT2, lr}
-+        UNWIND( .fnend )
-+
-+        UNWIND( .fnstart )
-+        UNWIND( .save {D, DAT1, DAT2, lr} )
-+
-+ .if backwards
-+        add     D, D, N
-+        add     S, S, N
-+ .endif
-+
-+        /* See if we're guaranteed to have at least one 16-byte aligned 16-byte write */
-+        cmp     N, #31
-+        blo     170f
-+        /* To preload ahead as we go, we need at least (prefetch_distance+2) 32-byte blocks */
-+        cmp     N, #(prefetch_distance+3)*32 - 1
-+        blo     160f
-+
-+        /* Long case */
-+        push    {DAT3, DAT4, DAT5, DAT6, DAT7}
-+        UNWIND( .fnend )
-+
-+        UNWIND( .fnstart )
-+        UNWIND( .save {D, DAT1, DAT2, lr} )
-+        UNWIND( .save {DAT3, DAT4, DAT5, DAT6, DAT7} )
-+
-+        /* Adjust N so that the decrement instruction can also test for
-+         * inner loop termination. We want it to stop when there are
-+         * (prefetch_distance+1) complete blocks to go. */
-+        sub     N, N, #(prefetch_distance+2)*32
-+        preload_leading_step1  backwards, DAT0, S
-+ .if backwards
-+        /* Bug in GAS: it accepts, but mis-assembles the instruction
-+         * ands    DAT2, D, #60, 2
-+         * which sets DAT2 to the number of leading bytes until destination is aligned and also clears C (sets borrow)
-+         */
-+        .word   0xE210513C
-+        beq     154f
-+ .else
-+        ands    DAT2, D, #15
-+        beq     154f
-+        rsb     DAT2, DAT2, #16 /* number of leading bytes until destination aligned */
-+ .endif
-+        preload_leading_step2  backwards, DAT0, S, DAT2, OFF
-+        memcpy_leading_15bytes backwards, 1
-+154:    /* Destination now 16-byte aligned; we have at least one prefetch as well as at least one 16-byte output block */
-+        /* Prefetch offset is best selected such that it lies in the first 8 of each 32 bytes - but it's just as easy to aim for the first one */
-+ .if backwards
-+        rsb     OFF, S, #3
-+        and     OFF, OFF, #28
-+        sub     OFF, OFF, #32*(prefetch_distance+1)
-+ .else
-+        and     OFF, S, #28
-+        rsb     OFF, OFF, #32*prefetch_distance
-+ .endif
-+        movs    DAT0, S, lsl #31
-+        bhi     157f
-+        bcs     156f
-+        bmi     155f
-+        memcpy_long_inner_loop  backwards, 0
-+155:    memcpy_long_inner_loop  backwards, 1
-+156:    memcpy_long_inner_loop  backwards, 2
-+157:    memcpy_long_inner_loop  backwards, 3
-+
-+        UNWIND( .fnend )
-+
-+        UNWIND( .fnstart )
-+        UNWIND( .save {D, DAT1, DAT2, lr} )
-+
-+160:    /* Medium case */
-+        preload_all  backwards, 0, 0, S, N, DAT2, OFF
-+        sub     N, N, #16     /* simplifies inner loop termination */
-+ .if backwards
-+        ands    DAT2, D, #15
-+        beq     164f
-+ .else
-+        ands    DAT2, D, #15
-+        beq     164f
-+        rsb     DAT2, DAT2, #16
-+ .endif
-+        memcpy_leading_15bytes backwards, align
-+164:    /* Destination now 16-byte aligned; we have at least one 16-byte output block */
-+        tst     S, #3
-+        bne     140f
-+        memcpy_medium_inner_loop  backwards, 0
-+140:    memcpy_medium_inner_loop  backwards, 1
-+
-+170:    /* Short case, less than 31 bytes, so no guarantee of at least one 16-byte block */
-+        teq     N, #0
-+        beq     199f
-+        preload_all  backwards, 1, 0, S, N, DAT2, LAST
-+        tst     D, #3
-+        beq     174f
-+172:    subs    N, N, #1
-+        blo     199f
-+ .if backwards
-+        ldrb    DAT0, [S, #-1]!
-+        strb    DAT0, [D, #-1]!
-+ .else
-+        ldrb    DAT0, [S], #1
-+        strb    DAT0, [D], #1
-+ .endif
-+        tst     D, #3
-+        bne     172b
-+174:    /* Destination now 4-byte aligned; we have 0 or more output bytes to go */
-+        tst     S, #3
-+        bne     140f
-+        memcpy_short_inner_loop  backwards, 0
-+140:    memcpy_short_inner_loop  backwards, 1
-+
-+        UNWIND( .fnend )
-+
-+        .unreq  D
-+        .unreq  S
-+        .unreq  N
-+        .unreq  DAT0
-+        .unreq  DAT1
-+        .unreq  DAT2
-+        .unreq  DAT3
-+        .unreq  DAT4
-+        .unreq  DAT5
-+        .unreq  DAT6
-+        .unreq  DAT7
-+        .unreq  LAST
-+        .unreq  OFF
-+.endm
---- /dev/null
-+++ b/arch/arm/lib/memmove_rpi.S
-@@ -0,0 +1,63 @@
-+/*
-+Copyright (c) 2013, Raspberry Pi Foundation
-+Copyright (c) 2013, RISC OS Open Ltd
-+All rights reserved.
-+
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions are met:
-+    * Redistributions of source code must retain the above copyright
-+      notice, this list of conditions and the following disclaimer.
-+    * Redistributions in binary form must reproduce the above copyright
-+      notice, this list of conditions and the following disclaimer in the
-+      documentation and/or other materials provided with the distribution.
-+    * Neither the name of the copyright holder nor the
-+      names of its contributors may be used to endorse or promote products
-+      derived from this software without specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
-+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+*/
-+
-+#include <linux/linkage.h>
-+#include <asm/assembler.h>
-+#include <asm/unwind.h>
-+#include "arm-mem.h"
-+#include "memcpymove.h"
-+
-+/* Prevent the stack from becoming executable */
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-+
-+    .text
-+    .arch armv6
-+    .object_arch armv4
-+    .arm
-+    .altmacro
-+    .p2align 2
-+
-+/*
-+ * void *memmove(void *s1, const void *s2, size_t n);
-+ * On entry:
-+ * a1 = pointer to destination
-+ * a2 = pointer to source
-+ * a3 = number of bytes to copy
-+ * On exit:
-+ * a1 preserved
-+ */
-+
-+.set prefetch_distance, 3
-+
-+ENTRY(memmove)
-+        cmp     a2, a1
-+        bpl     memcpy  /* pl works even over -1 - 0 and 0x7fffffff - 0x80000000 boundaries */
-+        memcpy  1
-+ENDPROC(memmove)
---- /dev/null
-+++ b/arch/arm/lib/memset_rpi.S
-@@ -0,0 +1,132 @@
-+/*
-+Copyright (c) 2013, Raspberry Pi Foundation
-+Copyright (c) 2013, RISC OS Open Ltd
-+All rights reserved.
-+
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions are met:
-+    * Redistributions of source code must retain the above copyright
-+      notice, this list of conditions and the following disclaimer.
-+    * Redistributions in binary form must reproduce the above copyright
-+      notice, this list of conditions and the following disclaimer in the
-+      documentation and/or other materials provided with the distribution.
-+    * Neither the name of the copyright holder nor the
-+      names of its contributors may be used to endorse or promote products
-+      derived from this software without specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
-+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+*/
-+
-+#include <linux/linkage.h>
-+#include "arm-mem.h"
-+
-+/* Prevent the stack from becoming executable */
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-+
-+    .text
-+    .arch armv6
-+    .object_arch armv4
-+    .arm
-+    .altmacro
-+    .p2align 2
-+
-+/*
-+ *  void *memset(void *s, int c, size_t n);
-+ *  On entry:
-+ *  a1 = pointer to buffer to fill
-+ *  a2 = byte pattern to fill with (caller-narrowed)
-+ *  a3 = number of bytes to fill
-+ *  On exit:
-+ *  a1 preserved
-+ */
-+ENTRY(mmioset)
-+ENTRY(memset)
-+ENTRY(__memset)
-+
-+        S       .req    a1
-+        DAT0    .req    a2
-+        N       .req    a3
-+        DAT1    .req    a4
-+        DAT2    .req    ip
-+        DAT3    .req    lr
-+
-+        orr     DAT0, DAT0, DAT0, lsl #8
-+        orr     DAT0, DAT0, DAT0, lsl #16
-+
-+ENTRY(__memset32)
-+        mov     DAT1, DAT0
-+
-+ENTRY(__memset64)
-+        push    {S, lr}
-+
-+        /* See if we're guaranteed to have at least one 16-byte aligned 16-byte write */
-+        cmp     N, #31
-+        blo     170f
-+
-+161:    sub     N, N, #16     /* simplifies inner loop termination */
-+        /* Leading words and bytes */
-+        tst     S, #15
-+        beq     164f
-+        rsb     DAT3, S, #0   /* bits 0-3 = number of leading bytes until aligned */
-+        movs    DAT2, DAT3, lsl #31
-+        submi   N, N, #1
-+        strmib  DAT0, [S], #1
-+        subcs   N, N, #2
-+        strcsh  DAT0, [S], #2
-+        movs    DAT2, DAT3, lsl #29
-+        submi   N, N, #4
-+        strmi   DAT0, [S], #4
-+        subcs   N, N, #8
-+        stmcsia S!, {DAT0, DAT1}
-+164:    /* Delayed set up of DAT2 and DAT3 so we could use them as scratch registers above */
-+        mov     DAT2, DAT0
-+        mov     DAT3, DAT1
-+        /* Now the inner loop of 16-byte stores */
-+165:    stmia   S!, {DAT0, DAT1, DAT2, DAT3}
-+        subs    N, N, #16
-+        bhs     165b
-+166:    /* Trailing words and bytes */
-+        movs    N, N, lsl #29
-+        stmcsia S!, {DAT0, DAT1}
-+        strmi   DAT0, [S], #4
-+        movs    N, N, lsl #2
-+        strcsh  DAT0, [S], #2
-+        strmib  DAT0, [S]
-+199:    pop     {S, pc}
-+
-+170:    /* Short case */
-+        mov     DAT2, DAT0
-+        mov     DAT3, DAT1
-+        tst     S, #3
-+        beq     174f
-+172:    subs    N, N, #1
-+        blo     199b
-+        strb    DAT0, [S], #1
-+        tst     S, #3
-+        bne     172b
-+174:    tst     N, #16
-+        stmneia S!, {DAT0, DAT1, DAT2, DAT3}
-+        b       166b
-+
-+        .unreq  S
-+        .unreq  DAT0
-+        .unreq  N
-+        .unreq  DAT1
-+        .unreq  DAT2
-+        .unreq  DAT3
-+ENDPROC(__memset64)
-+ENDPROC(__memset32)
-+ENDPROC(__memset)
-+ENDPROC(memset)
-+ENDPROC(mmioset)
---- a/arch/arm/lib/uaccess_with_memcpy.c
-+++ b/arch/arm/lib/uaccess_with_memcpy.c
-@@ -19,6 +19,14 @@
- #include <asm/current.h>
- #include <asm/page.h>
- 
-+#ifndef COPY_FROM_USER_THRESHOLD
-+#define COPY_FROM_USER_THRESHOLD 64
-+#endif
-+
-+#ifndef COPY_TO_USER_THRESHOLD
-+#define COPY_TO_USER_THRESHOLD 64
-+#endif
-+
- static int
- pin_page_for_write(const void __user *_addr, pte_t **ptep, spinlock_t **ptlp)
- {
-@@ -43,7 +51,7 @@ pin_page_for_write(const void __user *_a
- 		return 0;
- 
- 	pmd = pmd_offset(pud, addr);
--	if (unlikely(pmd_none(*pmd)))
-+	if (unlikely(pmd_none(*pmd) || pmd_bad(*pmd)))
- 		return 0;
- 
- 	/*
-@@ -86,7 +94,46 @@ pin_page_for_write(const void __user *_a
- 	return 1;
- }
- 
--static unsigned long noinline
-+static int
-+pin_page_for_read(const void __user *_addr, pte_t **ptep, spinlock_t **ptlp)
-+{
-+	unsigned long addr = (unsigned long)_addr;
-+	pgd_t *pgd;
-+	p4d_t *p4d;
-+	pmd_t *pmd;
-+	pte_t *pte;
-+	pud_t *pud;
-+	spinlock_t *ptl;
-+
-+	pgd = pgd_offset(current->mm, addr);
-+	if (unlikely(pgd_none(*pgd) || pgd_bad(*pgd)))
-+		return 0;
-+
-+	p4d = p4d_offset(pgd, addr);
-+	if (unlikely(p4d_none(*p4d) || p4d_bad(*p4d)))
-+		return 0;
-+
-+	pud = pud_offset(p4d, addr);
-+	if (unlikely(pud_none(*pud) || pud_bad(*pud)))
-+		return 0;
-+
-+	pmd = pmd_offset(pud, addr);
-+	if (unlikely(pmd_none(*pmd) || pmd_bad(*pmd)))
-+		return 0;
-+
-+	pte = pte_offset_map_lock(current->mm, pmd, addr, &ptl);
-+	if (unlikely(!pte_present(*pte) || !pte_young(*pte))) {
-+		pte_unmap_unlock(pte, ptl);
-+		return 0;
-+	}
-+
-+	*ptep = pte;
-+	*ptlp = ptl;
-+
-+	return 1;
-+}
-+
-+unsigned long noinline
- __copy_to_user_memcpy(void __user *to, const void *from, unsigned long n)
- {
- 	unsigned long ua_flags;
-@@ -134,6 +181,52 @@ out:
- 	return n;
- }
- 
-+unsigned long noinline
-+__copy_from_user_memcpy(void *to, const void __user *from, unsigned long n)
-+{
-+	unsigned long ua_flags;
-+	int atomic;
-+
-+	/* the mmap semaphore is taken only if not in an atomic context */
-+	atomic = in_atomic();
-+
-+	if (!atomic)
-+		mmap_read_lock(current->mm);
-+	while (n) {
-+		pte_t *pte;
-+		spinlock_t *ptl;
-+		int tocopy;
-+
-+		while (!pin_page_for_read(from, &pte, &ptl)) {
-+			char temp;
-+			if (!atomic)
-+				mmap_read_unlock(current->mm);
-+			if (__get_user(temp, (char __user *)from))
-+				goto out;
-+			if (!atomic)
-+				mmap_read_lock(current->mm);
-+		}
-+
-+		tocopy = (~(unsigned long)from & ~PAGE_MASK) + 1;
-+		if (tocopy > n)
-+			tocopy = n;
-+
-+		ua_flags = uaccess_save_and_enable();
-+		memcpy(to, (const void *)from, tocopy);
-+		uaccess_restore(ua_flags);
-+		to += tocopy;
-+		from += tocopy;
-+		n -= tocopy;
-+
-+		pte_unmap_unlock(pte, ptl);
-+	}
-+	if (!atomic)
-+		mmap_read_unlock(current->mm);
-+
-+out:
-+	return n;
-+}
-+
- unsigned long
- arm_copy_to_user(void __user *to, const void *from, unsigned long n)
- {
-@@ -144,7 +237,7 @@ arm_copy_to_user(void __user *to, const
- 	 * With frame pointer disabled, tail call optimization kicks in
- 	 * as well making this test almost invisible.
- 	 */
--	if (n < 64) {
-+	if (n < COPY_TO_USER_THRESHOLD) {
- 		unsigned long ua_flags = uaccess_save_and_enable();
- 		n = __copy_to_user_std(to, from, n);
- 		uaccess_restore(ua_flags);
-@@ -154,6 +247,32 @@ arm_copy_to_user(void __user *to, const
- 	}
- 	return n;
- }
-+
-+unsigned long __must_check
-+arm_copy_from_user(void *to, const void __user *from, unsigned long n)
-+{
-+#ifdef CONFIG_BCM2835_FAST_MEMCPY
-+	/*
-+	 * This test is stubbed out of the main function above to keep
-+	 * the overhead for small copies low by avoiding a large
-+	 * register dump on the stack just to reload them right away.
-+	 * With frame pointer disabled, tail call optimization kicks in
-+	 * as well making this test almost invisible.
-+	 */
-+	if (n < COPY_TO_USER_THRESHOLD) {
-+		unsigned long ua_flags = uaccess_save_and_enable();
-+		n = __copy_from_user_std(to, from, n);
-+		uaccess_restore(ua_flags);
-+	} else {
-+		n = __copy_from_user_memcpy(to, from, n);
-+	}
-+#else
-+	unsigned long ua_flags = uaccess_save_and_enable();
-+	n = __copy_from_user_std(to, from, n);
-+	uaccess_restore(ua_flags);
-+#endif
-+	return n;
-+}
- 	
- static unsigned long noinline
- __clear_user_memset(void __user *addr, unsigned long n)
---- a/arch/arm/mach-bcm/Kconfig
-+++ b/arch/arm/mach-bcm/Kconfig
-@@ -182,6 +182,30 @@ config ARCH_BCM_53573
- 	  The base chip is BCM53573 and there are some packaging modifications
- 	  like BCM47189 and BCM47452.
- 
-+config ARCH_BCM_63XX
-+	bool "Broadcom BCM63xx DSL SoC"
-+	depends on ARCH_MULTI_V7
-+	select ARCH_HAS_RESET_CONTROLLER
-+	select ARM_ERRATA_754322
-+	select ARM_ERRATA_764369 if SMP
-+	select ARM_GIC
-+	select ARM_GLOBAL_TIMER
-+	select CACHE_L2X0
-+	select HAVE_ARM_ARCH_TIMER
-+	select HAVE_ARM_TWD if SMP
-+	select HAVE_ARM_SCU if SMP
-+	help
-+	  This enables support for systems based on Broadcom DSL SoCs.
-+	  It currently supports the 'BCM63XX' ARM-based family, which includes
-+	  the BCM63138 variant.
-+
-+config BCM2835_FAST_MEMCPY
-+	bool "Enable optimized __copy_to_user and __copy_from_user"
-+	depends on ARCH_BCM2835 && ARCH_MULTI_V6
-+	default y
-+	help
-+	  Optimized versions of __copy_to_user and __copy_from_user for Pi1.
-+
- config ARCH_BRCMSTB
- 	bool "Broadcom BCM7XXX based boards"
- 	depends on ARCH_MULTI_V7
diff --git a/target/linux/bcm27xx/patches-6.1/950-0122-gpio-poweroff-Allow-it-to-work-on-Raspberry-Pi.patch b/target/linux/bcm27xx/patches-6.1/950-0122-gpio-poweroff-Allow-it-to-work-on-Raspberry-Pi.patch
deleted file mode 100644
index 1cbb7c4f87..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0122-gpio-poweroff-Allow-it-to-work-on-Raspberry-Pi.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From dcd9a1f800c875433064c98113549920f3b11601 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Thu, 25 Jun 2015 12:16:11 +0100
-Subject: [PATCH] gpio-poweroff: Allow it to work on Raspberry Pi
-
-The Raspberry Pi firmware manages the power-down and reboot
-process. To do this it installs a pm_power_off handler, causing
-the gpio-poweroff module to abort the probe function.
-
-This patch introduces a "force" DT property that overrides that
-behaviour, and also adds a DT overlay to enable and control it.
-
-Note that running in an active-low configuration (DT parameter
-"active_low") requires a custom dt-blob.bin and probably won't
-allow a reboot without switching off, so an external inversion
-of the trigger signal may be preferable.
----
- drivers/power/reset/gpio-poweroff.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/drivers/power/reset/gpio-poweroff.c
-+++ b/drivers/power/reset/gpio-poweroff.c
-@@ -50,9 +50,11 @@ static int gpio_poweroff_probe(struct pl
- {
- 	bool input = false;
- 	enum gpiod_flags flags;
-+	bool force = false;
- 
- 	/* If a pm_power_off function has already been added, leave it alone */
--	if (pm_power_off != NULL) {
-+	force = of_property_read_bool(pdev->dev.of_node, "force");
-+	if (!force && (pm_power_off != NULL)) {
- 		dev_err(&pdev->dev,
- 			"%s: pm_power_off function already registered\n",
- 		       __func__);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0123-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0123-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch
deleted file mode 100644
index aa962fd401..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0123-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch
+++ /dev/null
@@ -1,850 +0,0 @@
-From 935848f5e265a5e7aaca9a3e9c724fe1a6778e78 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <pelwell@users.noreply.github.com>
-Date: Tue, 14 Jul 2015 14:32:47 +0100
-Subject: [PATCH] mfd: Add Raspberry Pi Sense HAT core driver
-
-mfd: Add rpi_sense_core of compatible string
----
- drivers/input/joystick/Kconfig           |   8 +
- drivers/input/joystick/Makefile          |   1 +
- drivers/input/joystick/rpisense-js.c     | 153 ++++++++++++
- drivers/mfd/Kconfig                      |   8 +
- drivers/mfd/Makefile                     |   1 +
- drivers/mfd/rpisense-core.c              | 164 +++++++++++++
- drivers/video/fbdev/Kconfig              |  13 +
- drivers/video/fbdev/Makefile             |   1 +
- drivers/video/fbdev/rpisense-fb.c        | 293 +++++++++++++++++++++++
- include/linux/mfd/rpisense/core.h        |  47 ++++
- include/linux/mfd/rpisense/framebuffer.h |  32 +++
- include/linux/mfd/rpisense/joystick.h    |  35 +++
- 12 files changed, 756 insertions(+)
- create mode 100644 drivers/input/joystick/rpisense-js.c
- create mode 100644 drivers/mfd/rpisense-core.c
- create mode 100644 drivers/video/fbdev/rpisense-fb.c
- create mode 100644 include/linux/mfd/rpisense/core.h
- create mode 100644 include/linux/mfd/rpisense/framebuffer.h
- create mode 100644 include/linux/mfd/rpisense/joystick.h
-
---- a/drivers/input/joystick/Kconfig
-+++ b/drivers/input/joystick/Kconfig
-@@ -412,4 +412,12 @@ config JOYSTICK_SENSEHAT
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called sensehat_joystick.
- 
-+config JOYSTICK_RPISENSE
-+	tristate "Raspberry Pi Sense HAT joystick"
-+	depends on GPIOLIB && INPUT
-+	select MFD_RPISENSE_CORE
-+
-+	help
-+	  This is the joystick driver for the Raspberry Pi Sense HAT
-+
- endif
---- a/drivers/input/joystick/Makefile
-+++ b/drivers/input/joystick/Makefile
-@@ -40,3 +40,4 @@ obj-$(CONFIG_JOYSTICK_WARRIOR)		+= warri
- obj-$(CONFIG_JOYSTICK_WALKERA0701)	+= walkera0701.o
- obj-$(CONFIG_JOYSTICK_XPAD)		+= xpad.o
- obj-$(CONFIG_JOYSTICK_ZHENHUA)		+= zhenhua.o
-+obj-$(CONFIG_JOYSTICK_RPISENSE)		+= rpisense-js.o
---- /dev/null
-+++ b/drivers/input/joystick/rpisense-js.c
-@@ -0,0 +1,153 @@
-+/*
-+ * Raspberry Pi Sense HAT joystick driver
-+ * http://raspberrypi.org
-+ *
-+ * Copyright (C) 2015 Raspberry Pi
-+ *
-+ * Author: Serge Schneider
-+ *
-+ *  This program is free software; you can redistribute  it and/or modify it
-+ *  under  the terms of  the GNU General  Public License as published by the
-+ *  Free Software Foundation;  either version 2 of the  License, or (at your
-+ *  option) any later version.
-+ *
-+ */
-+
-+#include <linux/module.h>
-+
-+#include <linux/mfd/rpisense/joystick.h>
-+#include <linux/mfd/rpisense/core.h>
-+
-+static struct rpisense *rpisense;
-+static unsigned char keymap[5] = {KEY_DOWN, KEY_RIGHT, KEY_UP, KEY_ENTER, KEY_LEFT,};
-+
-+static void keys_work_fn(struct work_struct *work)
-+{
-+	int i;
-+	static s32 prev_keys;
-+	struct rpisense_js *rpisense_js = &rpisense->joystick;
-+	s32 keys = rpisense_reg_read(rpisense, RPISENSE_KEYS);
-+	s32 changes = keys ^ prev_keys;
-+
-+	prev_keys = keys;
-+	for (i = 0; i < 5; i++) {
-+		if (changes & 1) {
-+			input_report_key(rpisense_js->keys_dev,
-+					 keymap[i], keys & 1);
-+		}
-+		changes >>= 1;
-+		keys >>= 1;
-+	}
-+	input_sync(rpisense_js->keys_dev);
-+}
-+
-+static irqreturn_t keys_irq_handler(int irq, void *pdev)
-+{
-+	struct rpisense_js *rpisense_js = &rpisense->joystick;
-+
-+	schedule_work(&rpisense_js->keys_work_s);
-+	return IRQ_HANDLED;
-+}
-+
-+static int rpisense_js_probe(struct platform_device *pdev)
-+{
-+	int ret;
-+	int i;
-+	struct rpisense_js *rpisense_js;
-+
-+	rpisense = rpisense_get_dev();
-+	rpisense_js = &rpisense->joystick;
-+
-+	INIT_WORK(&rpisense_js->keys_work_s, keys_work_fn);
-+
-+	rpisense_js->keys_dev = input_allocate_device();
-+	if (!rpisense_js->keys_dev) {
-+		dev_err(&pdev->dev, "Could not allocate input device.\n");
-+		return -ENOMEM;
-+	}
-+
-+	rpisense_js->keys_dev->evbit[0] = BIT_MASK(EV_KEY);
-+	for (i = 0; i < ARRAY_SIZE(keymap); i++) {
-+		set_bit(keymap[i],
-+			rpisense_js->keys_dev->keybit);
-+	}
-+
-+	rpisense_js->keys_dev->name = "Raspberry Pi Sense HAT Joystick";
-+	rpisense_js->keys_dev->phys = "rpi-sense-joy/input0";
-+	rpisense_js->keys_dev->id.bustype = BUS_I2C;
-+	rpisense_js->keys_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP);
-+	rpisense_js->keys_dev->keycode = keymap;
-+	rpisense_js->keys_dev->keycodesize = sizeof(unsigned char);
-+	rpisense_js->keys_dev->keycodemax = ARRAY_SIZE(keymap);
-+
-+	ret = input_register_device(rpisense_js->keys_dev);
-+	if (ret) {
-+		dev_err(&pdev->dev, "Could not register input device.\n");
-+		goto err_keys_alloc;
-+	}
-+
-+	ret = gpiod_direction_input(rpisense_js->keys_desc);
-+	if (ret) {
-+		dev_err(&pdev->dev, "Could not set keys-int direction.\n");
-+		goto err_keys_reg;
-+	}
-+
-+	rpisense_js->keys_irq = gpiod_to_irq(rpisense_js->keys_desc);
-+	if (rpisense_js->keys_irq < 0) {
-+		dev_err(&pdev->dev, "Could not determine keys-int IRQ.\n");
-+		ret = rpisense_js->keys_irq;
-+		goto err_keys_reg;
-+	}
-+
-+	ret = devm_request_irq(&pdev->dev, rpisense_js->keys_irq,
-+			       keys_irq_handler, IRQF_TRIGGER_RISING,
-+			       "keys", &pdev->dev);
-+	if (ret) {
-+		dev_err(&pdev->dev, "IRQ request failed.\n");
-+		goto err_keys_reg;
-+	}
-+	return 0;
-+err_keys_reg:
-+	input_unregister_device(rpisense_js->keys_dev);
-+err_keys_alloc:
-+	input_free_device(rpisense_js->keys_dev);
-+	return ret;
-+}
-+
-+static int rpisense_js_remove(struct platform_device *pdev)
-+{
-+	struct rpisense_js *rpisense_js = &rpisense->joystick;
-+
-+	input_unregister_device(rpisense_js->keys_dev);
-+	input_free_device(rpisense_js->keys_dev);
-+	return 0;
-+}
-+
-+#ifdef CONFIG_OF
-+static const struct of_device_id rpisense_js_id[] = {
-+	{ .compatible = "rpi,rpi-sense-js" },
-+	{ },
-+};
-+MODULE_DEVICE_TABLE(of, rpisense_js_id);
-+#endif
-+
-+static struct platform_device_id rpisense_js_device_id[] = {
-+	{ .name = "rpi-sense-js" },
-+	{ },
-+};
-+MODULE_DEVICE_TABLE(platform, rpisense_js_device_id);
-+
-+static struct platform_driver rpisense_js_driver = {
-+	.probe = rpisense_js_probe,
-+	.remove = rpisense_js_remove,
-+	.driver = {
-+		.name = "rpi-sense-js",
-+		.owner = THIS_MODULE,
-+	},
-+};
-+
-+module_platform_driver(rpisense_js_driver);
-+
-+MODULE_DESCRIPTION("Raspberry Pi Sense HAT joystick driver");
-+MODULE_AUTHOR("Serge Schneider <serge@raspberrypi.org>");
-+MODULE_LICENSE("GPL");
---- a/drivers/mfd/Kconfig
-+++ b/drivers/mfd/Kconfig
-@@ -11,6 +11,14 @@ config MFD_CORE
- 	select IRQ_DOMAIN
- 	default n
- 
-+config MFD_RPISENSE_CORE
-+	tristate "Raspberry Pi Sense HAT core functions"
-+	depends on I2C
-+	select MFD_CORE
-+	help
-+	  This is the core driver for the Raspberry Pi Sense HAT. This provides
-+	  the necessary functions to communicate with the hardware.
-+
- config MFD_CS5535
- 	tristate "AMD CS5535 and CS5536 southbridge core functions"
- 	select MFD_CORE
---- a/drivers/mfd/Makefile
-+++ b/drivers/mfd/Makefile
-@@ -268,6 +268,7 @@ obj-$(CONFIG_MFD_STMFX) 	+= stmfx.o
- obj-$(CONFIG_MFD_KHADAS_MCU) 	+= khadas-mcu.o
- obj-$(CONFIG_MFD_ACER_A500_EC)	+= acer-ec-a500.o
- obj-$(CONFIG_MFD_QCOM_PM8008)	+= qcom-pm8008.o
-+obj-$(CONFIG_MFD_RPISENSE_CORE)	+= rpisense-core.o
- 
- obj-$(CONFIG_SGI_MFD_IOC3)	+= ioc3.o
- obj-$(CONFIG_MFD_SIMPLE_MFD_I2C)	+= simple-mfd-i2c.o
---- /dev/null
-+++ b/drivers/mfd/rpisense-core.c
-@@ -0,0 +1,164 @@
-+/*
-+ * Raspberry Pi Sense HAT core driver
-+ * http://raspberrypi.org
-+ *
-+ * Copyright (C) 2015 Raspberry Pi
-+ *
-+ * Author: Serge Schneider
-+ *
-+ *  This program is free software; you can redistribute  it and/or modify it
-+ *  under  the terms of  the GNU General  Public License as published by the
-+ *  Free Software Foundation;  either version 2 of the  License, or (at your
-+ *  option) any later version.
-+ *
-+ *  This driver is based on wm8350 implementation.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/moduleparam.h>
-+#include <linux/err.h>
-+#include <linux/init.h>
-+#include <linux/i2c.h>
-+#include <linux/platform_device.h>
-+#include <linux/mfd/rpisense/core.h>
-+#include <linux/slab.h>
-+
-+static struct rpisense *rpisense;
-+
-+static void rpisense_client_dev_register(struct rpisense *rpisense,
-+					 const char *name,
-+					 struct platform_device **pdev)
-+{
-+	int ret;
-+
-+	*pdev = platform_device_alloc(name, -1);
-+	if (*pdev == NULL) {
-+		dev_err(rpisense->dev, "Failed to allocate %s\n", name);
-+		return;
-+	}
-+
-+	(*pdev)->dev.parent = rpisense->dev;
-+	platform_set_drvdata(*pdev, rpisense);
-+	ret = platform_device_add(*pdev);
-+	if (ret != 0) {
-+		dev_err(rpisense->dev, "Failed to register %s: %d\n",
-+			name, ret);
-+		platform_device_put(*pdev);
-+		*pdev = NULL;
-+	}
-+}
-+
-+static int rpisense_probe(struct i2c_client *i2c,
-+			       const struct i2c_device_id *id)
-+{
-+	int ret;
-+	struct rpisense_js *rpisense_js;
-+
-+	rpisense = devm_kzalloc(&i2c->dev, sizeof(struct rpisense), GFP_KERNEL);
-+	if (rpisense == NULL)
-+		return -ENOMEM;
-+
-+	i2c_set_clientdata(i2c, rpisense);
-+	rpisense->dev = &i2c->dev;
-+	rpisense->i2c_client = i2c;
-+
-+	ret = rpisense_reg_read(rpisense, RPISENSE_WAI);
-+	if (ret > 0) {
-+		if (ret != 's')
-+			return -EINVAL;
-+	} else {
-+		return ret;
-+	}
-+	ret = rpisense_reg_read(rpisense, RPISENSE_VER);
-+	if (ret < 0)
-+		return ret;
-+
-+	dev_info(rpisense->dev,
-+		 "Raspberry Pi Sense HAT firmware version %i\n", ret);
-+
-+	rpisense_js = &rpisense->joystick;
-+	rpisense_js->keys_desc = devm_gpiod_get(&i2c->dev,
-+						"keys-int", GPIOD_IN);
-+	if (IS_ERR(rpisense_js->keys_desc)) {
-+		dev_warn(&i2c->dev, "Failed to get keys-int descriptor.\n");
-+		rpisense_js->keys_desc = gpio_to_desc(23);
-+		if (rpisense_js->keys_desc == NULL) {
-+			dev_err(&i2c->dev, "GPIO23 fallback failed.\n");
-+			return PTR_ERR(rpisense_js->keys_desc);
-+		}
-+	}
-+	rpisense_client_dev_register(rpisense, "rpi-sense-js",
-+				     &(rpisense->joystick.pdev));
-+	rpisense_client_dev_register(rpisense, "rpi-sense-fb",
-+				     &(rpisense->framebuffer.pdev));
-+
-+	return 0;
-+}
-+
-+static void rpisense_remove(struct i2c_client *i2c)
-+{
-+	struct rpisense *rpisense = i2c_get_clientdata(i2c);
-+
-+	platform_device_unregister(rpisense->joystick.pdev);
-+}
-+
-+struct rpisense *rpisense_get_dev(void)
-+{
-+	return rpisense;
-+}
-+EXPORT_SYMBOL_GPL(rpisense_get_dev);
-+
-+s32 rpisense_reg_read(struct rpisense *rpisense, int reg)
-+{
-+	int ret = i2c_smbus_read_byte_data(rpisense->i2c_client, reg);
-+
-+	if (ret < 0)
-+		dev_err(rpisense->dev, "Read from reg %d failed\n", reg);
-+	/* Due to the BCM270x I2C clock stretching bug, some values
-+	 * may have MSB set. Clear it to avoid incorrect values.
-+	 * */
-+	return ret & 0x7F;
-+}
-+EXPORT_SYMBOL_GPL(rpisense_reg_read);
-+
-+int rpisense_block_write(struct rpisense *rpisense, const char *buf, int count)
-+{
-+	int ret = i2c_master_send(rpisense->i2c_client, buf, count);
-+
-+	if (ret < 0)
-+		dev_err(rpisense->dev, "Block write failed\n");
-+	return ret;
-+}
-+EXPORT_SYMBOL_GPL(rpisense_block_write);
-+
-+static const struct i2c_device_id rpisense_i2c_id[] = {
-+	{ "rpi-sense", 0 },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(i2c, rpisense_i2c_id);
-+
-+#ifdef CONFIG_OF
-+static const struct of_device_id rpisense_core_id[] = {
-+	{ .compatible = "rpi,rpi-sense" },
-+	{ },
-+};
-+MODULE_DEVICE_TABLE(of, rpisense_core_id);
-+#endif
-+
-+
-+static struct i2c_driver rpisense_driver = {
-+	.driver = {
-+		   .name = "rpi-sense",
-+		   .owner = THIS_MODULE,
-+	},
-+	.probe = rpisense_probe,
-+	.remove = rpisense_remove,
-+	.id_table = rpisense_i2c_id,
-+};
-+
-+module_i2c_driver(rpisense_driver);
-+
-+MODULE_DESCRIPTION("Raspberry Pi Sense HAT core driver");
-+MODULE_AUTHOR("Serge Schneider <serge@raspberrypi.org>");
-+MODULE_LICENSE("GPL");
-+
---- a/drivers/video/fbdev/Kconfig
-+++ b/drivers/video/fbdev/Kconfig
-@@ -2251,6 +2251,19 @@ config FB_SM712
- 	  called sm712fb. If you want to compile it as a module, say M
- 	  here and read <file:Documentation/kbuild/modules.rst>.
- 
-+config FB_RPISENSE
-+	tristate "Raspberry Pi Sense HAT framebuffer"
-+	depends on FB
-+	select MFD_RPISENSE_CORE
-+	select FB_SYS_FOPS
-+	select FB_SYS_FILLRECT
-+	select FB_SYS_COPYAREA
-+	select FB_SYS_IMAGEBLIT
-+	select FB_DEFERRED_IO
-+
-+	help
-+	  This is the framebuffer driver for the Raspberry Pi Sense HAT
-+
- source "drivers/video/fbdev/omap/Kconfig"
- source "drivers/video/fbdev/omap2/Kconfig"
- source "drivers/video/fbdev/mmp/Kconfig"
---- a/drivers/video/fbdev/Makefile
-+++ b/drivers/video/fbdev/Makefile
-@@ -130,6 +130,7 @@ obj-$(CONFIG_FB_MX3)		  += mx3fb.o
- obj-$(CONFIG_FB_DA8XX)		  += da8xx-fb.o
- obj-$(CONFIG_FB_SSD1307)	  += ssd1307fb.o
- obj-$(CONFIG_FB_SIMPLE)           += simplefb.o
-+obj-$(CONFIG_FB_RPISENSE)	  += rpisense-fb.o
- 
- # the test framebuffer is last
- obj-$(CONFIG_FB_VIRTUAL)          += vfb.o
---- /dev/null
-+++ b/drivers/video/fbdev/rpisense-fb.c
-@@ -0,0 +1,293 @@
-+/*
-+ * Raspberry Pi Sense HAT framebuffer driver
-+ * http://raspberrypi.org
-+ *
-+ * Copyright (C) 2015 Raspberry Pi
-+ *
-+ * Author: Serge Schneider
-+ *
-+ *  This program is free software; you can redistribute  it and/or modify it
-+ *  under  the terms of  the GNU General  Public License as published by the
-+ *  Free Software Foundation;  either version 2 of the  License, or (at your
-+ *  option) any later version.
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/errno.h>
-+#include <linux/string.h>
-+#include <linux/mm.h>
-+#include <linux/slab.h>
-+#include <linux/uaccess.h>
-+#include <linux/delay.h>
-+#include <linux/fb.h>
-+#include <linux/init.h>
-+
-+#include <linux/mfd/rpisense/framebuffer.h>
-+#include <linux/mfd/rpisense/core.h>
-+
-+static bool lowlight;
-+module_param(lowlight, bool, 0);
-+MODULE_PARM_DESC(lowlight, "Reduce LED matrix brightness to one third");
-+
-+static struct rpisense *rpisense;
-+
-+struct rpisense_fb_param {
-+	char __iomem *vmem;
-+	u8 *vmem_work;
-+	u32 vmemsize;
-+	u8 *gamma;
-+};
-+
-+static u8 gamma_default[32] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01,
-+			       0x02, 0x02, 0x03, 0x03, 0x04, 0x05, 0x06, 0x07,
-+			       0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0E, 0x0F, 0x11,
-+			       0x12, 0x14, 0x15, 0x17, 0x19, 0x1B, 0x1D, 0x1F,};
-+
-+static u8 gamma_low[32] = {0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-+			   0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02,
-+			   0x03, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x06,
-+			   0x06, 0x07, 0x07, 0x08, 0x08, 0x09, 0x0A, 0x0A,};
-+
-+static u8 gamma_user[32];
-+
-+static struct rpisense_fb_param rpisense_fb_param = {
-+	.vmem = NULL,
-+	.vmemsize = 128,
-+	.gamma = gamma_default,
-+};
-+
-+static struct fb_deferred_io rpisense_fb_defio;
-+
-+static struct fb_fix_screeninfo rpisense_fb_fix = {
-+	.id =		"RPi-Sense FB",
-+	.type =		FB_TYPE_PACKED_PIXELS,
-+	.visual =	FB_VISUAL_TRUECOLOR,
-+	.xpanstep =	0,
-+	.ypanstep =	0,
-+	.ywrapstep =	0,
-+	.accel =	FB_ACCEL_NONE,
-+	.line_length =	16,
-+};
-+
-+static struct fb_var_screeninfo rpisense_fb_var = {
-+	.xres		= 8,
-+	.yres		= 8,
-+	.xres_virtual	= 8,
-+	.yres_virtual	= 8,
-+	.bits_per_pixel = 16,
-+	.red		= {11, 5, 0},
-+	.green		= {5, 6, 0},
-+	.blue		= {0, 5, 0},
-+};
-+
-+static ssize_t rpisense_fb_write(struct fb_info *info,
-+				 const char __user *buf, size_t count,
-+				 loff_t *ppos)
-+{
-+	ssize_t res = fb_sys_write(info, buf, count, ppos);
-+
-+	schedule_delayed_work(&info->deferred_work, rpisense_fb_defio.delay);
-+	return res;
-+}
-+
-+static void rpisense_fb_fillrect(struct fb_info *info,
-+				 const struct fb_fillrect *rect)
-+{
-+	sys_fillrect(info, rect);
-+	schedule_delayed_work(&info->deferred_work, rpisense_fb_defio.delay);
-+}
-+
-+static void rpisense_fb_copyarea(struct fb_info *info,
-+				 const struct fb_copyarea *area)
-+{
-+	sys_copyarea(info, area);
-+	schedule_delayed_work(&info->deferred_work, rpisense_fb_defio.delay);
-+}
-+
-+static void rpisense_fb_imageblit(struct fb_info *info,
-+				  const struct fb_image *image)
-+{
-+	sys_imageblit(info, image);
-+	schedule_delayed_work(&info->deferred_work, rpisense_fb_defio.delay);
-+}
-+
-+static void rpisense_fb_deferred_io(struct fb_info *info,
-+				struct list_head *pagelist)
-+{
-+	int i;
-+	int j;
-+	u8 *vmem_work = rpisense_fb_param.vmem_work;
-+	u16 *mem = (u16 *)rpisense_fb_param.vmem;
-+	u8 *gamma = rpisense_fb_param.gamma;
-+
-+	vmem_work[0] = 0;
-+	for (j = 0; j < 8; j++) {
-+		for (i = 0; i < 8; i++) {
-+			vmem_work[(j * 24) + i + 1] =
-+				gamma[(mem[(j * 8) + i] >> 11) & 0x1F];
-+			vmem_work[(j * 24) + (i + 8) + 1] =
-+				gamma[(mem[(j * 8) + i] >> 6) & 0x1F];
-+			vmem_work[(j * 24) + (i + 16) + 1] =
-+				gamma[(mem[(j * 8) + i]) & 0x1F];
-+		}
-+	}
-+	rpisense_block_write(rpisense, vmem_work, 193);
-+}
-+
-+static struct fb_deferred_io rpisense_fb_defio = {
-+	.delay		= HZ/100,
-+	.deferred_io	= rpisense_fb_deferred_io,
-+};
-+
-+static int rpisense_fb_ioctl(struct fb_info *info, unsigned int cmd,
-+			     unsigned long arg)
-+{
-+	switch (cmd) {
-+	case SENSEFB_FBIOGET_GAMMA:
-+		if (copy_to_user((void __user *) arg, rpisense_fb_param.gamma,
-+				 sizeof(u8[32])))
-+			return -EFAULT;
-+		return 0;
-+	case SENSEFB_FBIOSET_GAMMA:
-+		if (copy_from_user(gamma_user, (void __user *)arg,
-+				   sizeof(u8[32])))
-+			return -EFAULT;
-+		rpisense_fb_param.gamma = gamma_user;
-+		schedule_delayed_work(&info->deferred_work,
-+				      rpisense_fb_defio.delay);
-+		return 0;
-+	case SENSEFB_FBIORESET_GAMMA:
-+		switch (arg) {
-+		case 0:
-+			rpisense_fb_param.gamma = gamma_default;
-+			break;
-+		case 1:
-+			rpisense_fb_param.gamma = gamma_low;
-+			break;
-+		case 2:
-+			rpisense_fb_param.gamma = gamma_user;
-+			break;
-+		default:
-+			return -EINVAL;
-+		}
-+		schedule_delayed_work(&info->deferred_work,
-+				      rpisense_fb_defio.delay);
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+	return 0;
-+}
-+
-+static struct fb_ops rpisense_fb_ops = {
-+	.owner		= THIS_MODULE,
-+	.fb_read	= fb_sys_read,
-+	.fb_write	= rpisense_fb_write,
-+	.fb_fillrect	= rpisense_fb_fillrect,
-+	.fb_copyarea	= rpisense_fb_copyarea,
-+	.fb_imageblit	= rpisense_fb_imageblit,
-+	.fb_ioctl	= rpisense_fb_ioctl,
-+};
-+
-+static int rpisense_fb_probe(struct platform_device *pdev)
-+{
-+	struct fb_info *info;
-+	int ret = -ENOMEM;
-+	struct rpisense_fb *rpisense_fb;
-+
-+	rpisense = rpisense_get_dev();
-+	rpisense_fb = &rpisense->framebuffer;
-+
-+	rpisense_fb_param.vmem = vzalloc(rpisense_fb_param.vmemsize);
-+	if (!rpisense_fb_param.vmem)
-+		return ret;
-+
-+	rpisense_fb_param.vmem_work = devm_kmalloc(&pdev->dev, 193, GFP_KERNEL);
-+	if (!rpisense_fb_param.vmem_work)
-+		goto err_malloc;
-+
-+	info = framebuffer_alloc(0, &pdev->dev);
-+	if (!info) {
-+		dev_err(&pdev->dev, "Could not allocate framebuffer.\n");
-+		goto err_malloc;
-+	}
-+	rpisense_fb->info = info;
-+
-+	rpisense_fb_fix.smem_start = (unsigned long)rpisense_fb_param.vmem;
-+	rpisense_fb_fix.smem_len = rpisense_fb_param.vmemsize;
-+
-+	info->fbops = &rpisense_fb_ops;
-+	info->fix = rpisense_fb_fix;
-+	info->var = rpisense_fb_var;
-+	info->fbdefio = &rpisense_fb_defio;
-+	info->flags = FBINFO_FLAG_DEFAULT | FBINFO_VIRTFB;
-+	info->screen_base = rpisense_fb_param.vmem;
-+	info->screen_size = rpisense_fb_param.vmemsize;
-+
-+	if (lowlight)
-+		rpisense_fb_param.gamma = gamma_low;
-+
-+	fb_deferred_io_init(info);
-+
-+	ret = register_framebuffer(info);
-+	if (ret < 0) {
-+		dev_err(&pdev->dev, "Could not register framebuffer.\n");
-+		goto err_fballoc;
-+	}
-+
-+	fb_info(info, "%s frame buffer device\n", info->fix.id);
-+	schedule_delayed_work(&info->deferred_work, rpisense_fb_defio.delay);
-+	return 0;
-+err_fballoc:
-+	framebuffer_release(info);
-+err_malloc:
-+	vfree(rpisense_fb_param.vmem);
-+	return ret;
-+}
-+
-+static int rpisense_fb_remove(struct platform_device *pdev)
-+{
-+	struct rpisense_fb *rpisense_fb = &rpisense->framebuffer;
-+	struct fb_info *info = rpisense_fb->info;
-+
-+	if (info) {
-+		unregister_framebuffer(info);
-+		fb_deferred_io_cleanup(info);
-+		framebuffer_release(info);
-+		vfree(rpisense_fb_param.vmem);
-+	}
-+
-+	return 0;
-+}
-+
-+#ifdef CONFIG_OF
-+static const struct of_device_id rpisense_fb_id[] = {
-+	{ .compatible = "rpi,rpi-sense-fb" },
-+	{ },
-+};
-+MODULE_DEVICE_TABLE(of, rpisense_fb_id);
-+#endif
-+
-+static struct platform_device_id rpisense_fb_device_id[] = {
-+	{ .name = "rpi-sense-fb" },
-+	{ },
-+};
-+MODULE_DEVICE_TABLE(platform, rpisense_fb_device_id);
-+
-+static struct platform_driver rpisense_fb_driver = {
-+	.probe = rpisense_fb_probe,
-+	.remove = rpisense_fb_remove,
-+	.driver = {
-+		.name = "rpi-sense-fb",
-+		.owner = THIS_MODULE,
-+	},
-+};
-+
-+module_platform_driver(rpisense_fb_driver);
-+
-+MODULE_DESCRIPTION("Raspberry Pi Sense HAT framebuffer driver");
-+MODULE_AUTHOR("Serge Schneider <serge@raspberrypi.org>");
-+MODULE_LICENSE("GPL");
-+
---- /dev/null
-+++ b/include/linux/mfd/rpisense/core.h
-@@ -0,0 +1,47 @@
-+/*
-+ * Raspberry Pi Sense HAT core driver
-+ * http://raspberrypi.org
-+ *
-+ * Copyright (C) 2015 Raspberry Pi
-+ *
-+ * Author: Serge Schneider
-+ *
-+ *  This program is free software; you can redistribute  it and/or modify it
-+ *  under  the terms of  the GNU General  Public License as published by the
-+ *  Free Software Foundation;  either version 2 of the  License, or (at your
-+ *  option) any later version.
-+ *
-+ */
-+
-+#ifndef __LINUX_MFD_RPISENSE_CORE_H_
-+#define __LINUX_MFD_RPISENSE_CORE_H_
-+
-+#include <linux/mfd/rpisense/joystick.h>
-+#include <linux/mfd/rpisense/framebuffer.h>
-+
-+/*
-+ * Register values.
-+ */
-+#define RPISENSE_FB			0x00
-+#define RPISENSE_WAI			0xF0
-+#define RPISENSE_VER			0xF1
-+#define RPISENSE_KEYS			0xF2
-+#define RPISENSE_EE_WP			0xF3
-+
-+#define RPISENSE_ID			's'
-+
-+struct rpisense {
-+	struct device *dev;
-+	struct i2c_client *i2c_client;
-+
-+	/* Client devices */
-+	struct rpisense_js joystick;
-+	struct rpisense_fb framebuffer;
-+};
-+
-+struct rpisense *rpisense_get_dev(void);
-+s32 rpisense_reg_read(struct rpisense *rpisense, int reg);
-+int rpisense_reg_write(struct rpisense *rpisense, int reg, u16 val);
-+int rpisense_block_write(struct rpisense *rpisense, const char *buf, int count);
-+
-+#endif
---- /dev/null
-+++ b/include/linux/mfd/rpisense/framebuffer.h
-@@ -0,0 +1,32 @@
-+/*
-+ * Raspberry Pi Sense HAT framebuffer driver
-+ * http://raspberrypi.org
-+ *
-+ * Copyright (C) 2015 Raspberry Pi
-+ *
-+ * Author: Serge Schneider
-+ *
-+ *  This program is free software; you can redistribute  it and/or modify it
-+ *  under  the terms of  the GNU General  Public License as published by the
-+ *  Free Software Foundation;  either version 2 of the  License, or (at your
-+ *  option) any later version.
-+ *
-+ */
-+
-+#ifndef __LINUX_RPISENSE_FB_H_
-+#define __LINUX_RPISENSE_FB_H_
-+
-+#define SENSEFB_FBIO_IOC_MAGIC 0xF1
-+
-+#define SENSEFB_FBIOGET_GAMMA _IO(SENSEFB_FBIO_IOC_MAGIC, 0)
-+#define SENSEFB_FBIOSET_GAMMA _IO(SENSEFB_FBIO_IOC_MAGIC, 1)
-+#define SENSEFB_FBIORESET_GAMMA _IO(SENSEFB_FBIO_IOC_MAGIC, 2)
-+
-+struct rpisense;
-+
-+struct rpisense_fb {
-+	struct platform_device *pdev;
-+	struct fb_info *info;
-+};
-+
-+#endif
---- /dev/null
-+++ b/include/linux/mfd/rpisense/joystick.h
-@@ -0,0 +1,35 @@
-+/*
-+ * Raspberry Pi Sense HAT joystick driver
-+ * http://raspberrypi.org
-+ *
-+ * Copyright (C) 2015 Raspberry Pi
-+ *
-+ * Author: Serge Schneider
-+ *
-+ *  This program is free software; you can redistribute  it and/or modify it
-+ *  under  the terms of  the GNU General  Public License as published by the
-+ *  Free Software Foundation;  either version 2 of the  License, or (at your
-+ *  option) any later version.
-+ *
-+ */
-+
-+#ifndef __LINUX_RPISENSE_JOYSTICK_H_
-+#define __LINUX_RPISENSE_JOYSTICK_H_
-+
-+#include <linux/input.h>
-+#include <linux/interrupt.h>
-+#include <linux/gpio/consumer.h>
-+#include <linux/platform_device.h>
-+
-+struct rpisense;
-+
-+struct rpisense_js {
-+	struct platform_device *pdev;
-+	struct input_dev *keys_dev;
-+	struct gpio_desc *keys_desc;
-+	struct work_struct keys_work_s;
-+	int keys_irq;
-+};
-+
-+
-+#endif
diff --git a/target/linux/bcm27xx/patches-6.1/950-0124-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch b/target/linux/bcm27xx/patches-6.1/950-0124-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch
deleted file mode 100644
index e384710da1..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0124-Add-support-for-all-the-downstream-rpi-sound-card-dr.patch
+++ /dev/null
@@ -1,17626 +0,0 @@
-From c30c73263981026201fc45fcc54d6e58d061b61e Mon Sep 17 00:00:00 2001
-From: Florian Meier <florian.meier@koalo.de>
-Date: Mon, 25 Jan 2016 15:48:59 +0000
-Subject: [PATCH] Add support for all the downstream rpi sound card
- drivers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-ASoC: Add support for Rpi-DAC
-
-ASoC: Add prompt for ICS43432 codec
-
-Without a prompt string, a config setting can't be included in a
-defconfig. Give CONFIG_SND_SOC_ICS43432 a prompt so that Pi soundcards
-can use the driver.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-Add IQaudIO Sound Card support for Raspberry Pi
-
-Set a limit of 0dB on Digital Volume Control
-
-The main volume control in the PCM512x DAC has a range up to
-+24dB. This is dangerously loud and can potentially cause massive
-clipping in the output stages. Therefore this sets a sensible
-limit of 0dB for this control.
-
-Allow up to 24dB digital gain to be applied when using IQAudIO DAC+
-
-24db_digital_gain DT param can be used to specify that PCM512x
-codec "Digital" volume control should not be limited to 0dB gain,
-and if specified will allow the full 24dB gain.
-
-Modify IQAudIO DAC+ ASoC driver to set card/dai config from dt
-
-Add the ability to set the card name, dai name and dai stream name, from
-dt config.
-
-Signed-off-by: DigitalDreamtime <clive.messer@digitaldreamtime.co.uk>
-
-IQaudIO: auto-mute for AMP+ and DigiAMP+
-
-IQAudIO amplifier mute via GPIO22. Add dt params for "one-shot" unmute
-and auto mute.
-
-Revision 2, auto mute implementing HiassofT suggestion to mute/unmute
-using set_bias_level, rather than startup/shutdown....
-"By default DAPM waits 5 seconds (pmdown_time) before shutting down
-playback streams so a close/stop immediately followed by open/start
-doesn't trigger an amp mute+unmute."
-
-Tested on both AMP+ (via DAC+) and DigiAMP+, with both options...
-
-dtoverlay=iqaudio-dacplus,unmute_amp
- "one-shot" unmute when kernel module loads.
-
-dtoverlay=iqaudio-dacplus,auto_mute_amp
- Unmute amp when ALSA device opened by a client. Mute, with 5 second delay
- when ALSA device closed. (Re-opening the device within the 5 second close
- window, will cancel mute.)
-
-Revision 4, using gpiod.
-
-Revision 5, clean-up formatting before adding mute code.
- - Convert tab plus 4 space formatting to 2x tab
- - Remove '// NOT USED' commented code
-
-Revision 6, don't attempt to "one-shot" unmute amp, unless card is
-successfully registered.
-
-Signed-off-by: DigitalDreamtime <clive.messer@digitaldreamtime.co.uk>
-
-ASoC: iqaudio-dac: fix S24_LE format
-
-Remove set_bclk_ratio call so 24-bit data is transmitted in
-24 bclk cycles.
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
-
-ASoC: iqaudio-dac: use modern dai_link style
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
-
-Added support for HiFiBerry DAC+
-
-The driver is based on the HiFiBerry DAC driver. However HiFiBerry DAC+ uses
-a different codec chip (PCM5122), therefore a new driver is necessary.
-
-Add support for the HiFiBerry DAC+ Pro.
-
-The HiFiBerry DAC+ and DAC+ Pro products both use the existing bcm sound driver with the DAC+ Pro having a special clock device driver representing the two high precision oscillators.
-
-An addition bug fix is included for the PCM512x codec where by the physical size of the sample frame is used in the calculation of the LRCK divisor as it was found to be wrong when using 24-bit depth sample contained in a little endian 4-byte sample frame.
-
-Limit PCM512x "Digital" gain to 0dB by default with HiFiBerry DAC+
-
-24db_digital_gain DT param can be used to specify that PCM512x
-codec "Digital" volume control should not be limited to 0dB gain,
-and if specified will allow the full 24dB gain.
-
-Add dt param to force HiFiBerry DAC+ Pro into slave mode
-
-"dtoverlay=hifiberry-dacplus,slave"
-
-Add 'slave' param to use HiFiBerry DAC+ Pro in slave mode,
-with Pi as master for bit and frame clock.
-
-Signed-off-by: DigitalDreamtime <clive.messer@digitaldreamtime.co.uk>
-
-Fixed a bug when using 352.8kHz sample rate
-
-Signed-off-by: Daniel Matuschek <daniel@hifiberry.com>
-
-ASoC: pcm512x: revert downstream changes
-
-This partially reverts commit 185ea05465aac8bf02a0d2b2f4289d42c72870b7
-which was added by https://github.com/raspberrypi/linux/pull/1152
-
-The downstream pcm512x changes caused a regression, it broke normal
-use of the 24bit format with the codec, eg when using simple-audio-card.
-
-The actual bug with 24bit playback is the incorrect usage
-of physical_width in various drivers in the downstream tree
-which causes 24bit data to be transmitted with 32 clock
-cycles. So it's not the pcm512x that needs fixing, it's the
-soundcard drivers.
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
-
-ASoC: hifiberry_dacplus: fix S24_LE format
-
-Remove set_bclk_ratio call so 24-bit data is transmitted in
-24 bclk cycles.
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
-
-ASoC: hifiberry_dacplus: transmit S24_LE with 64 BCLK cycles
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
-
-hifiberry_dacplus: switch to snd_soc_dai_set_bclk_ratio
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
-
-ASoC: hifiberry_dacplus: use modern dai_link style
-
-Signed-off-by: Hui Wang <hui.wang@canonical.com>
-
-Add driver for rpi-proto
-
-Forward port of 3.10.x driver from https://github.com/koalo
-We are using a custom board and would like to use rpi 3.18.x
-kernel. Patch works fine for our embedded system.
-
-URL to the audio chip:
-http://www.mikroe.com/add-on-boards/audio-voice/audio-codec-proto/
-
-Playback tested with devicetree enabled.
-
-Signed-off-by: Waldemar Brodkorb <wbrodkorb@conet.de>
-
-ASoC: rpi-proto: use modern dai_link style
-
-Signed-off-by: Hui Wang <hui.wang@canonical.com>
-
-Add Support for JustBoom Audio boards
-
-justboom-dac: Adjust for ALSA API change
-
-As of 4.4, snd_soc_limit_volume now takes a struct snd_soc_card *
-rather than a struct snd_soc_codec *.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-ASoC: justboom-dac: fix S24_LE format
-
-Remove set_bclk_ratio call so 24-bit data is transmitted in
-24 bclk cycles.
-
-Also remove hw_params as it's no longer needed.
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
-
-ASoC: justboom-dac: use modern dai_link style
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
-
-New AudioInjector.net Pi soundcard with low jitter audio in and out.
-
-Contains the sound/soc/bcm ALSA machine driver and necessary alterations to the Kconfig and Makefile.
-Adds the dts overlay and updates the Makefile and README.
-Updates the relevant defconfig files to enable building for the Raspberry Pi.
-Thanks to Phil Elwell (pelwell) for the review, simple-card concepts and discussion. Thanks to Clive Messer for overlay naming suggestions.
-
-Added support for headphones, microphone and bclk_ratio settings.
-
-This patch adds headphone and microphone capability to the Audio Injector sound card. The patch also sets the bit clock ratio for use in the bcm2835-i2s driver. The bcm2835-i2s can't handle an 8 kHz sample rate when the bit clock is at 12 MHz because its register is only 10 bits wide which can't represent the ch2 offset of 1508. For that reason, the rate constraint is added.
-
-ASoC: audioinjector-pi-soundcard: use modern dai_link style
-
-Signed-off-by: Hui Wang <hui.wang@canonical.com>
-
-New driver for RRA DigiDAC1 soundcard using WM8741 + WM8804
-
-ASoC: digidac1-soundcard: use modern dai_link style
-
-Signed-off-by: Hui Wang <hui.wang@canonical.com>
-
-Add support for Dion Audio LOCO DAC-AMP HAT
-
-Using dedicated machine driver and pcm5102a codec driver.
-
-Signed-off-by: DigitalDreamtime <clive.messer@digitaldreamtime.co.uk>
-
-ASoC: dionaudio_loco: use modern dai_link style
-
-Signed-off-by: Hui Wang <hui.wang@canonical.com>
-
-Allo Piano DAC boards: Initial 2 channel (stereo) support (#1645)
-
-Add initial 2 channel (stereo) support for Allo Piano DAC (2.0/2.1) boards,
-using allo-piano-dac-pcm512x-audio overlay and allo-piano-dac ALSA ASoC
-machine driver.
-
-NB. The initial support is 2 channel (stereo) ONLY!
-(The Piano DAC 2.1 will only support 2 channel (stereo) left/right output,
- pending an update to the upstream pcm512x codec driver, which will have
- to be submitted via upstream. With the initial downstream support,
- provided by this patch, the Piano DAC 2.1 subwoofer outputs will
- not function.)
-
-Signed-off-by: Baswaraj K <jaikumar@cem-solutions.net>
-Signed-off-by: Clive Messer <clive.messer@digitaldreamtime.co.uk>
-Tested-by: Clive Messer <clive.messer@digitaldreamtime.co.uk>
-
-ASoC: allo-piano-dac: fix S24_LE format
-
-Remove set_bclk_ratio call so 24-bit data is transmitted in
-24 bclk cycles.
-
-Also remove hw_params and ops as they are no longer needed.
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
-
-ASoC: allo-piano-dac: use modern dai_link style
-
-Signed-off-by: Hui Wang <hui.wang@canonical.com>
-
-Add support for Allo Piano DAC 2.1 plus add-on board for Raspberry Pi.
-
-The Piano DAC 2.1 has support for 4 channels with subwoofer.
-
-Signed-off-by: Baswaraj K <jaikumar@cem-solutions.net>
-Reviewed-by: Vijay Kumar B. <vijaykumar@zilogic.com>
-Reviewed-by: Raashid Muhammed <raashidmuhammed@zilogic.com>
-
-Add clock changes and mute gpios (#1938)
-
-Also improve code style and adhere to ALSA coding conventions.
-
-Signed-off-by: Baswaraj K <jaikumar@cem-solutions.net>
-Reviewed-by: Vijay Kumar B. <vijaykumar@zilogic.com>
-Reviewed-by: Raashid Muhammed <raashidmuhammed@zilogic.com>
-
-PianoPlus: Dual Mono & Dual Stereo features added (#2069)
-
-allo-piano-dac-plus: Master volume added + fixes
-
-Master volume added, which controls both DACs volumes.
-
-See: https://github.com/raspberrypi/linux/pull/2149
-
-Also fix initial max volume, default mode value, and unmute.
-
-Signed-off-by: allocom <sparky-dev@allo.com>
-
-ASoC: allo-piano-dac-plus: fix S24_LE format
-
-Remove set_bclk_ratio call so 24-bit data is transmitted in
-24 bclk cycles.
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
-
-sound: bcm: Fix memset dereference warning
-
-This warning appears with GCC 6.4.0 from toolchains.bootlin.com:
-
-../sound/soc/bcm/allo-piano-dac-plus.c: In function ‘snd_allo_piano_dac_init’:
-../sound/soc/bcm/allo-piano-dac-plus.c:711:30: warning: argument to ‘sizeof’ in ‘memset’ call is the same expression as the destination; did you mean to dereference it? [-Wsizeof-pointer-memaccess]
-  memset(glb_ptr, 0x00, sizeof(glb_ptr));
-                              ^
-
-Suggested-by: Phil Elwell <phil@raspberrypi.org>
-Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
-
-ASoC: allo-piano-dac-plus: use modern dai_link style
-
-Signed-off-by: Hui Wang <hui.wang@canonical.com>
-
-Add support for Allo Boss DAC add-on board for Raspberry Pi. (#1924)
-
-Signed-off-by: Baswaraj K <jaikumar@cem-solutions.net>
-Reviewed-by: Deepak <deepak@zilogic.com>
-Reviewed-by: BabuSubashChandar <babusubashchandar@zilogic.com>
-
-Add support for new clock rate and mute gpios.
-
-Signed-off-by: Baswaraj K <jaikumar@cem-solutions.net>
-Reviewed-by: Deepak <deepak@zilogic.com>
-Reviewed-by: BabuSubashChandar <babusubashchandar@zilogic.com>
-
-ASoC: allo-boss-dac: fix S24_LE format
-
-Remove set_bclk_ratio call so 24-bit data is transmitted in
-24 bclk cycles.
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
-
-ASoC: allo-boss-dac: transmit S24_LE with 64 BCLK cycles
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
-
-allo-boss-dac: switch to snd_soc_dai_set_bclk_ratio
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
-
-ASoC: allo-boss-dac: use modern dai_link style
-
-Signed-off-by: Hui Wang <hui.wang@canonical.com>
-
-Support for Blokas Labs pisound board
-
-Pisound dynamic overlay (#1760)
-
-Restructuring pisound-overlay.dts, so it can be loaded and unloaded dynamically using dtoverlay.
-
-Print a logline when the kernel module is removed.
-
-pisound improvements:
-
-* Added a writable sysfs object to enable scripts / user space software
-to blink MIDI activity LEDs for variable duration.
-* Improved hw_param constraints setting.
-* Added compatibility with S16_LE sample format.
-* Exposed some simple placeholder volume controls, so the card appears
-in volumealsa widget.
-
-Add missing SND_PISOUND selects dependency to SND_RAWMIDI
-
-Without it the Pisound module fails to compile.
-See https://github.com/raspberrypi/linux/issues/2366
-
-Updates for Pisound module code:
-
-	* Merged 'Fix a warning in DEBUG builds' (1c8b82b).
-	* Updating some strings and copyright information.
-	* Fix for handling high load of MIDI input and output.
-	* Use dual rate oversampling ratio for 96kHz instead of single
-	  rate one.
-
-Signed-off-by: Giedrius Trainavicius <giedrius@blokas.io>
-
-Fixing memset call in pisound.c
-
-Signed-off-by: Giedrius Trainavicius <giedrius@blokas.io>
-
-Fix for Pisound's MIDI Input getting blocked for a while in rare cases.
-
-There was a possible race condition which could lead to Input's FIFO queue
-to be underflown, causing high amount of processing in the worker thread for
-some period of time.
-
-Signed-off-by: Giedrius Trainavicius <giedrius@blokas.io>
-
-Fix for Pisound kernel module in Real Time kernel configuration.
-
-When handler of data_available interrupt is fired, queue_work ends up
-getting called and it can block on a spin lock which is not allowed in
-interrupt context. The fix was to run the handler from a thread context
-instead.
-
-Pisound: Remove spinlock usage around spi_sync
-
-ASoC: pisound: use modern dai_link style
-
-Signed-off-by: Hui Wang <hui.wang@canonical.com>
-
-ASoC: pisound: fix the parameter for spi_device_match
-
-Signed-off-by: Hui Wang <hui.wang@canonical.com>
-
-ASoC: Add driver for Cirrus Logic Audio Card
-
-Note: due to problems with deferred probing of regulators
-the following softdep should be added to a modprobe.d file
-
-softdep arizona-spi pre: arizona-ldo1
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
-
-ASoC: rpi-cirrus: use modern dai_link style
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
-
-sound: Support for Dion Audio LOCO-V2 DAC-AMP HAT
-
-Signed-off-by: Miquel Blauw <info@dionaudio.nl>
-
-ASoC: dionaudio_loco-v2: fix S24_LE format
-
-Remove set_bclk_ratio call so 24-bit data is transmitted in
-24 bclk cycles.
-
-Also remove hw_params and ops as they are no longer needed.
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
-
-ASoC: dionaudio_loco-v2: use modern dai_link style
-
-Signed-off-by: Hui Wang <hui.wang@canonical.com>
-
-Add support for Fe-Pi audio sound card. (#1867)
-
-Fe-Pi Audio Sound Card is based on NXP SGTL5000 codec.
-Mechanical specification of the board is the same the Raspberry Pi Zero.
-3.5mm jacks for Headphone/Mic, Line In, and Line Out.
-
-Signed-off-by: Henry Kupis <fe-pi@cox.net>
-
-ASoC: fe-pi-audio: use modern dai_link style
-
-Signed-off-by: Hui Wang <hui.wang@canonical.com>
-
-Add support for the AudioInjector.net Octo sound card
-
-AudioInjector Octo: sample rates, regulators, reset
-
-This patch adds new sample rates to the Audioinjector Octo sound card. The
-new supported rates are (in kHz) :
-96, 48, 32, 24, 16, 8, 88.2, 44.1, 29.4, 22.05, 14.7
-
-Reference the bcm270x DT regulators in the overlay.
-
-This patch adds a reset GPIO for the AudioInjector.net octo sound card.
-
-Audioinjector octo : Make the playback and capture symmetric
-
-This patch ensures that the sample rate and channel count of the audioinjector
-octo sound card are symmetric.
-
-audioinjector-octo: Add continuous clock feature
-
-By user request, add a switch to prevent the clocks being stopped when
-the stream is paused, stopped or shutdown. Provide access to the switch
-by adding a 'non-stop-clocks' parameter to the audioinjector-addons
-overlay.
-
-See: https://github.com/raspberrypi/linux/issues/2409
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-sound: Fixes for audioinjector-octo under 4.19
-
-1. Move the DT alias declaration to the I2C shim in the cases
-where the shim is enabled. This works around a problem caused by a
-4.19 commit [1] that generates DT/OF uevents for I2C drivers.
-
-2. Fix the diagnostics in an error path of the soundcard driver to
-correctly identify the reason for the failure to load.
-
-3. Move the declaration of the clock node in the overlay outside
-the I2C node to avoid warnings.
-
-4. Sort the overlay nodes so that dependencies are only to earlier
-fragments, in an attempt to get runtime dtoverlay application to
-work (it still doesn't...)
-
-See: https://github.com/Audio-Injector/Octo/issues/14
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-[1] af503716ac14 ("i2c: core: report OF style module alias for devices registered via OF")
-
-ASoC: audioinjector-octo-soundcard: use modern dai_link style
-
-Signed-off-by: Hui Wang <hui.wang@canonical.com>
-
-Driver support for Google voiceHAT soundcard.
-
-ASoC: googlevoicehat-codec: Use correct device when grabbing GPIO
-
-The fixup for the VoiceHAT in 4.18 incorrectly tried to find the
-sdmode GPIO pin under the card device, not the codec device.
-This failed, and therefore caused the device probe to fail.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
-
-ASoC: googlevoicehat-codec: Reformat for kernel coding standards
-
-Fix all whitespace, indentation, and bracing errors.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
-
-ASoC: googlevoicehat-codec: Make driver function structure const
-
-Make voicehat_component_driver a const structure.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
-
-ASoC: googlevoicehat-codec: Only convert from ms to jiffies once
-
-Minor optimisation and allows to become checkpatch clean.
-A msec value is read out of DT or from a define, and convert once to
-jiffies, rather than every time that it is used.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
-
-Driver and overlay for Allo Katana DAC
-
-Allo Katana DAC: Updated default values
-
-Signed-off-by: Jaikumar <jaikumar@cem-solutions.com>
-
-Added mute stream func
-
-Signed-off-by: Jaikumar <jaikumar@cem-solutions.net>
-
-codecs: Correct Katana minimum volume
-
-Update Katana minimum volume to get the exact 0.5 dB value in each step.
-
-Signed-off-by: Sudeep Kumar <sudeepkumar@cem-solutions.net>
-
-ASoC: Add generic RPI driver for simple soundcards.
-
-The RPI simple sound card driver provides a generic ALSA SOC card driver
-supporting a variety of Pi HAT soundcards. The intention is to avoid
-the duplication of code for cards that can't be fully supported by
-the soc simple/graph cards but are otherwise almost identical.
-
-This initial commit adds support for the ADAU1977 ADC, Google VoiceHat,
-HifiBerry AMP, HifiBerry DAC and RPI DAC.
-
-Signed-off-by: Tim Gover <tim.gover@raspberrypi.org>
-
-ASoC: Use correct card name in rpi-simple driver
-
-Use the specific card name from drvdata instead of the snd_rpi_simple
-
-rpi-simple-soundcard: Use nicer driver name "RPi-simple"
-
-Rename the driver from "RPI simple soundcard" to "RPi-simple" so that
-the driver name won't be mangled allowing to be used unaltered as the
-card conf filename.
-
-ASoC: rpi-simple-soundcard: use modern dai_link style
-
-Signed-off-by: Hui Wang <hui.wang@canonical.com>
-
-ASoC: Add Kconfig and Makefile for sound/soc/bcm
-
-Signed-off-by: popcornmix <popcornmix@gmail.com>
-
-ASoC: Create a generic Pi Hat WM8804 driver
-
-Reduce the amount of duplicated code by creating a generic driver for
-Pi Hat digi cards using the WM8804 codec.
-
-This replaces the
-Allo DigiOne, Hifiberry Digi/Pro, JustBoom Digi and IQAudIO Digi
-dedicate soundcard drivers with a generic driver.
-
-There are no significant changes to the runtime behavior of the drivers
-and end users should not have to change any configuration settings
-after upgrading.
-
-Minor changes
-* Check the return value of snd_soc_component_update_bits
-* Added some pr_debug tracing
-* Various checkpatch tidyups
-* Updated allodigi-one to use use 128FS at > 96 Khz. This appears to
-  be an omission in the original driver code so followed the Hifiberry
-  DAC driver approach.
-
-ASoC: rpi-wm8804-soundcard: use modern dai_link style
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
-
-rpi-wm8804-soundcard: drop PWRDN register writes
-
-Since kernel 4.0 the PWRDN register bits are under DAPM
-control from the wm8804 driver.
-
-Drop code that modifies that register to avoid interfering
-with DAPM.
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
-
-rpi-wm8804-soundcard: configure wm8804 clocks only on rate change
-
-This should avoid clicks when stopping and immediately afterwards
-starting a stream with the same samplerate as before.
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
-
-rpi-wm8804-soundcard: Fixed MCLKDIV for Allo Digione
-
-The Allo Digione board wants a fixed MCLKDIV of 256.
-
-See: https://github.com/raspberrypi/linux/issues/3296
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-ASoC: Add support for AudioSense-Pi add-on soundcard
-
-AudioSense-Pi is a RPi HAT based on a TI's TLV320AIC32x4 stereo codec
-
-This hardware provides multiple audio I/O capabilities to the RPi.
-The codec connects to the RPi's SoC through the I2S Bus.
-
-The following devices can be connected through a 3.5mm jack
-	1. Line-In: Plain old audio in from mobile phones, PCs, etc.,
-	2. Mic-In: Connect a microphone
-	3. Line-Out: Connect the output to a speaker
-	4. Headphones: Connect a Headphone w or w/o microphones
-
-Multiple Inputs:
-	It supports the following combinations
-	1. Two stereo Line-Inputs and a microphone
-	2. One stereo Line-Input and two microphones
-	3. Two stereo Line-Inputs, a microphone and
-		one mono line-input (with h/w hack)
-	4. One stereo Line-Input, two microphones and
-		one mono line-input (with h/w hack)
-
-Multiple Outputs:
-	Audio output can be routed to the headphones or
-		speakers (with additional hardware)
-
-Signed-off-by: b-ak <anur.bhargav@gmail.com>
-
-ASoC: audiosense-pi: use modern dai_link style
-
-Signed-off-by: Hui Wang <hui.wang@canonical.com>
-
-Added driver for the HiFiBerry DAC+ ADC (#2694)
-
-Signed-off-by: Daniel Matuschek <daniel@hifiberry.com>
-
-hifiberry_dacplusadc: switch to snd_soc_dai_set_bclk_ratio
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
-
-ASoC: hifiberry_dacplusadc: fix DAI link setup
-
-The driver only defines a single DAI link and the code that tries
-to setup the second (non-existent) DAI link looks wrong - using dmic
-as a CPU/platform driver doesn't make any sense.
-
-The DT overlay doesn't define a dmic property, so the code was never
-executed (otherwise it would have resulted in a memory corruption).
-
-So drop the offending code to prevent issues if a dmic property
-should be added to the DT overlay.
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
-
-ASoC: hifiberry_dacplusadc: use modern dai_link style
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
-
-Audiophonics I-Sabre 9038Q2M DAC driver
-
-Signed-off-by: Audiophonics <contact@audiophonics.fr>
-
-ASoC: i-sabre-q2m: use modern dai_link style
-
-Signed-off-by: Hui Wang <hui.wang@canonical.com>
-
-Added IQaudIO Pi-Codec board support (#2969)
-
-Add support for the IQaudIO Pi-Codec board.
-
-Signed-off-by: Gordon <gordon@iqaudio.com>
-
-Fixed 48k timing issue
-
-ASoC: iqaudio-codec: use modern dai_link style
-
-Signed-off-by: Hui Wang <hui.wang@canonical.com>
-
-adds the Hifiberry DAC+ADC PRO version
-
-This adds the driver for the DAC+ADC PRO version of the Hifiberry soundcard with software controlled PCM1863 ADC
-Signed-off-by: Joerg Schambacher joerg@i2audio.com
-
-Add Hifiberry DAC+DSP soundcard driver (#3224)
-
-Adds the driver for the Hifiberry DAC+DSP. It supports capture and
-playback depending on the DSP firmware.
-
-Signed-off-by: Joerg Schambacher <joerg@i2audio.com>
-
-Allow simultaneous use of JustBoom DAC and Digi
-
-Signed-off-by: Johannes Krude <johannes@krude.de>
-
-Pisound: MIDI communication fixes for scaled down CPU.
-
-* Increased maximum SPI communication speed to avoid running too slow
-  when the CPU is scaled down and losing MIDI data.
-
-* Keep track of buffer usage in millibytes for higher precision.
-
-Signed-off-by: Giedrius Trainavičius <giedrius@blokas.io>
-
-sound: Add the HiFiBerry DAC+HD version
-
-This adds the driver for the DAC+HD version supporting HiFiBerry's
-PCM179x based DACs. It also adds PLL control for clock generation.
-
-Signed-off-by: Joerg Schambacher <joerg@i2audio.com>
-
-Fix master mode settings of HiFiBerry DAC+ADC PRO card (#3424)
-
-This patch fixes the board DAI setting when in master-mode.
-Wrong setting could have caused random pop noise.
-
-Signed-off-by: Joerg Schambacher <joerg@i2audio.com>
-
-adds LED OFF feature to HiFiBerry DAC+ADC PRO sound card
-
-This adds a DT overlay parameter 'leds_off' which allows
-to switch off the onboard activity LEDs at all times
-which has been requested by some users.
-
-Signed-off-by: Joerg Schambacher <joerg@i2audio.com>
-
-adds LED OFF feature to HiFiBerry DAC+ADC sound card
-
-This adds a DT overlay parameter 'leds_off' which allows
-to switch off the onboard activity LEDs at all times
-which has been requested by some users.
-
-Signed-off-by: Joerg Schambacher <joerg@i2audio.com>
-
-adds LED OFF feature to HiFiBerry DAC+/DAC+PRO sound cards
-
-This adds a DT overlay parameter 'leds_off' which allows
-to switch off the onboard activity LEDs at all times
-which has been requested by some users.
-
-Signed-off-by: Joerg Schambacher <joerg@i2audio.com>
-
-pisound: Added reading Pisound board hardware revision and exposing it (#3425)
-
-pisound: Added reading Pisound board hardware revision and exposing it in kernel log and sysfs file:
-
-/sys/kernel/pisound/hw_version
-
-Signed-off-by: Giedrius <giedrius@blokas.io>
-
-Added driver for HiFiBerry Amp amplifier add-on board
-
-The driver contains a low-level hardware driver for the TAS5713 and the
-drivers for the Raspberry Pi I2S subsystem.
-
-TAS5713: return error if initialisation fails
-
-Existing TAS5713 driver logs errors during initialisation, but does not return
-an error code. Therefore even if initialisation fails, the driver will still be
-loaded, but won't work. This patch fixes this. I2C communication error will now
-reported correctly by a non-zero return code.
-
-HiFiBerry Amp: fix device-tree problems
-
-Some code to load the driver based on device-tree-overlays was missing. This is added by this patch.
-
-According to 5713 pdf doc CLOCK_CTRL is a readonly status register, and it behaves so. Remove useless setting
-
-sound: pcm512x-codec: Adding 352.8kHz samplerate support
-
-sound/soc: only first codec is master in multicodec setup
-
-When using multiple codecs, at most one codec should generate the master
-clock. All codecs except the first are therefore configured for slave
-mode.
-
-Signed-off-by: Johannes Krude <johannes@krude.de>
-
-ASoC: Fix snd_soc_get_pcm_runtime usage
-
-Commit [1] changed the snd_soc_get_pcm_runtime to take a dai_link
-pointer instead of a string. Patch up the downstream drivers to use
-the modified API.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-[1] 4468189ff307 ("ASoC: soc-core: find rtd via dai_link pointer at snd_soc_get_pcm_runtime()")
-
-Add support for the AudioInjector.net Isolated sound card
-
-This patch adds support for the Audio Injector Isolated sound card.
-
-Signed-off-by: Matt Flax <flatmax@flatmax.org>
-
-Add support for merus-amp soundcard and ma120x0p codec
-
-Add 96KHz rate support to MA120X0P codec and make enable and mute gpio
-pins optional.
-
-Signed-off-by: AMuszkat <ariel.muszkat@gmail.com>
-
-Fixes a problem with clock settings of HiFiBerry DAC+ADC PRO (#3545)
-
-This patch fixes a problem of the re-calculation of
-i2s-clock and -parameter settings when only the ADC is activated.
-
-Signed-off-by: Joerg Schambacher <joerg@i2audio.com>
-
-configs: Enable the AD193x codecs
-
-See: https://github.com/raspberrypi/linux/issues/2850
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-Switch to snd_soc_dai_set_bclk_ratio
-Replaces obsolete function snd_soc_dai_set_tdm_slot
-
-Signed-off-by: Joerg Schambacher <joerg@i2audio.com>
-
-Enhances the DAC+ driver to control the optional headphone amplifier
-
-Probes on the I2C bus for TPA6130A2, if successful, it sets DT-parameter
-'status' from 'disabled' to 'okay' using change_sets to enable
-the headphone control.
-
-Signed-off-by: Joerg Schambacher joerg@i2audio.com
-
-Update Allo Piano Dac Driver
-
-Add unique names to the individual dac coded drivers
-Remove some of the codec controls that are not used.
-
-Signed-off-by: Paul Hermann <paul@picoreplayer.org>
-
-Fixes an onboard clock detection problem of the PRO versions
-
-Increasing the sleep time after clock selection to 3-4ms
-allows the correct detection of all combinations of DAC+ Pro
-and DAC+ADC Pro sound cards and the various PI revisions.
-
-Signed-off-by: Joerg Schambacher <joerg@hifiberry.com>
-
-ASoC:ma120x0p: Increase maximum sample rate to 192KHz
-
-Change the maximum sample rate for the amplifier to
-192KHz as given in the Infineon specification.
-
-Signed-off-by: Joerg Schambacher <joerg@hifiberry.com>
-
-ASoC: ma120x0p: Remove unnecessary const specifier
-
-Clang warns:
-
-  sound/soc/codecs/ma120x0p.c:891:14: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier]
-  static const SOC_VALUE_ENUM_SINGLE_DECL(pwr_mode_ctrl,
-               ^
-  ./include/sound/soc.h:362:2: note: expanded from macro 'SOC_VALUE_ENUM_SINGLE_DECL'
-          SOC_VALUE_ENUM_DOUBLE_DECL(name, xreg, xshift, xshift, xmask, xtexts, xvalues)
-          ^
-  ./include/sound/soc.h:359:2: note: expanded from macro 'SOC_VALUE_ENUM_DOUBLE_DECL'
-          const struct soc_enum name = SOC_VALUE_ENUM_DOUBLE(xreg, xshift_l, xshift_r, xmask, \
-          ^
-  1 warning generated.
-
-SOC_VALUE_ENUM_DOUBLE_DECL already has a const specifier. Remove the duplicate
-const to clean up the warning.
-
-Fixes: 42444979e710 ("Add support for all the downstream rpi sound card drivers")
-Signed-off-by: Nathan Chancellor <nathan@kernel.org>
-
-ASoC: bcm: allo-piano-dac-plus: Remove unnecessary const specifiers
-
-Clang warns:
-
-  sound/soc/bcm/allo-piano-dac-plus.c:66:14: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier]
-  static const SOC_ENUM_SINGLE_DECL(allo_piano_mode_enum,
-               ^
-  ./include/sound/soc.h:355:2: note: expanded from macro 'SOC_ENUM_SINGLE_DECL'
-          SOC_ENUM_DOUBLE_DECL(name, xreg, xshift, xshift, xtexts)
-          ^
-  ./include/sound/soc.h:352:2: note: expanded from macro 'SOC_ENUM_DOUBLE_DECL'
-          const struct soc_enum name = SOC_ENUM_DOUBLE(xreg, xshift_l, xshift_r, \
-          ^
-  sound/soc/bcm/allo-piano-dac-plus.c:75:14: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier]
-  static const SOC_ENUM_SINGLE_DECL(allo_piano_dual_mode_enum,
-               ^
-  ./include/sound/soc.h:355:2: note: expanded from macro 'SOC_ENUM_SINGLE_DECL'
-          SOC_ENUM_DOUBLE_DECL(name, xreg, xshift, xshift, xtexts)
-          ^
-  ./include/sound/soc.h:352:2: note: expanded from macro 'SOC_ENUM_DOUBLE_DECL'
-          const struct soc_enum name = SOC_ENUM_DOUBLE(xreg, xshift_l, xshift_r, \
-          ^
-  sound/soc/bcm/allo-piano-dac-plus.c:96:14: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier]
-  static const SOC_ENUM_SINGLE_DECL(allo_piano_enum,
-               ^
-  ./include/sound/soc.h:355:2: note: expanded from macro 'SOC_ENUM_SINGLE_DECL'
-          SOC_ENUM_DOUBLE_DECL(name, xreg, xshift, xshift, xtexts)
-          ^
-  ./include/sound/soc.h:352:2: note: expanded from macro 'SOC_ENUM_DOUBLE_DECL'
-          const struct soc_enum name = SOC_ENUM_DOUBLE(xreg, xshift_l, xshift_r, \
-          ^
-  3 warnings generated.
-
-SOC_VALUE_ENUM_DOUBLE_DECL already has a const specifier. Remove the duplicate
-const specifiers to clean up the warnings.
-
-Fixes: 42444979e710 ("Add support for all the downstream rpi sound card drivers")
-Signed-off-by: Nathan Chancellor <nathan@kernel.org>
-
-rpi-simple-soundcard: Add Dion Audio KIWI streamer
-
-Signed-off-by: Miquel Blauw <miquelblauw@hotmail.com>
-
-rpi-simple-soundcard: adds definitions for the HiFiBerry AMP3 card
-
-Uses Infineon MA120x0 amplifier and supports full sample rate of 192ksps.
-
-Signed-off-by: Joerg Schambacher <joerg@hifiberry.com>
-
-sound: soc: bcm: Added Sound card driver for Dacberry400 Audio card for Raspberry Pi 400
-
-Added Sound card driver for DACberry400 Audio card.
-
-Signed-off-by: Ashish Vara <ashishhvara@gmail.com>
----
- .../devicetree/bindings/vendor-prefixes.txt   |  463 ++++++
- .../devicetree/bindings/vendor-prefixes.yaml  |    2 +
- drivers/clk/Kconfig                           |    6 +
- drivers/clk/Makefile                          |    3 +
- drivers/clk/clk-allo-dac.c                    |  161 ++
- drivers/clk/clk-hifiberry-dachd.c             |  332 ++++
- drivers/clk/clk-hifiberry-dacpro.c            |  160 ++
- sound/soc/bcm/Kconfig                         |  305 ++++
- sound/soc/bcm/Makefile                        |   71 +-
- sound/soc/bcm/allo-boss-dac.c                 |  457 ++++++
- sound/soc/bcm/allo-boss2-dac.c                | 1131 ++++++++++++++
- sound/soc/bcm/allo-katana-codec.c             |  387 +++++
- sound/soc/bcm/allo-piano-dac-plus.c           | 1064 +++++++++++++
- sound/soc/bcm/allo-piano-dac.c                |  122 ++
- .../bcm/audioinjector-isolated-soundcard.c    |  183 +++
- sound/soc/bcm/audioinjector-octo-soundcard.c  |  346 +++++
- sound/soc/bcm/audioinjector-pi-soundcard.c    |  189 +++
- sound/soc/bcm/audiosense-pi.c                 |  248 +++
- sound/soc/bcm/chipdip-dac.c                   |  275 ++++
- sound/soc/bcm/dacberry400.c                   |  259 ++++
- sound/soc/bcm/digidac1-soundcard.c            |  421 +++++
- sound/soc/bcm/dionaudio_loco-v2.c             |  117 ++
- sound/soc/bcm/dionaudio_loco.c                |  117 ++
- sound/soc/bcm/fe-pi-audio.c                   |  154 ++
- sound/soc/bcm/googlevoicehat-codec.c          |  214 +++
- sound/soc/bcm/hifiberry_dacplus.c             |  527 +++++++
- sound/soc/bcm/hifiberry_dacplusadc.c          |  398 +++++
- sound/soc/bcm/hifiberry_dacplusadcpro.c       |  605 ++++++++
- sound/soc/bcm/hifiberry_dacplusdsp.c          |   90 ++
- sound/soc/bcm/hifiberry_dacplushd.c           |  238 +++
- sound/soc/bcm/i-sabre-q2m.c                   |  159 ++
- sound/soc/bcm/iqaudio-codec.c                 |  275 ++++
- sound/soc/bcm/iqaudio-dac.c                   |  224 +++
- sound/soc/bcm/justboom-both.c                 |  267 ++++
- sound/soc/bcm/justboom-dac.c                  |  147 ++
- sound/soc/bcm/pifi-40.c                       |  284 ++++
- sound/soc/bcm/pisound.c                       | 1241 +++++++++++++++
- sound/soc/bcm/rpi-cirrus.c                    | 1025 ++++++++++++
- sound/soc/bcm/rpi-proto.c                     |  147 ++
- sound/soc/bcm/rpi-simple-soundcard.c          |  487 ++++++
- sound/soc/bcm/rpi-wm8804-soundcard.c          |  410 +++++
- sound/soc/codecs/Kconfig                      |   26 +-
- sound/soc/codecs/Makefile                     |    8 +
- sound/soc/codecs/cs42xx8-i2c.c                |    9 +-
- sound/soc/codecs/cs42xx8.c                    |    2 +
- sound/soc/codecs/i-sabre-codec.c              |  390 +++++
- sound/soc/codecs/i-sabre-codec.h              |   42 +
- sound/soc/codecs/ma120x0p.c                   | 1381 +++++++++++++++++
- sound/soc/codecs/pcm1794a.c                   |   69 +
- sound/soc/codecs/pcm512x.c                    |    2 +-
- sound/soc/codecs/tas5713.c                    |  361 +++++
- sound/soc/codecs/tas5713.h                    |  210 +++
- sound/soc/soc-core.c                          |   10 +-
- sound/usb/card.c                              |    8 +-
- sound/usb/quirks.c                            |    2 +
- 55 files changed, 16224 insertions(+), 7 deletions(-)
- create mode 100644 Documentation/devicetree/bindings/vendor-prefixes.txt
- create mode 100644 drivers/clk/clk-allo-dac.c
- create mode 100644 drivers/clk/clk-hifiberry-dachd.c
- create mode 100644 drivers/clk/clk-hifiberry-dacpro.c
- create mode 100644 sound/soc/bcm/allo-boss-dac.c
- create mode 100644 sound/soc/bcm/allo-boss2-dac.c
- create mode 100644 sound/soc/bcm/allo-katana-codec.c
- create mode 100644 sound/soc/bcm/allo-piano-dac-plus.c
- create mode 100644 sound/soc/bcm/allo-piano-dac.c
- create mode 100644 sound/soc/bcm/audioinjector-isolated-soundcard.c
- create mode 100644 sound/soc/bcm/audioinjector-octo-soundcard.c
- create mode 100644 sound/soc/bcm/audioinjector-pi-soundcard.c
- create mode 100644 sound/soc/bcm/audiosense-pi.c
- create mode 100644 sound/soc/bcm/chipdip-dac.c
- create mode 100644 sound/soc/bcm/dacberry400.c
- create mode 100644 sound/soc/bcm/digidac1-soundcard.c
- create mode 100644 sound/soc/bcm/dionaudio_loco-v2.c
- create mode 100644 sound/soc/bcm/dionaudio_loco.c
- create mode 100644 sound/soc/bcm/fe-pi-audio.c
- create mode 100644 sound/soc/bcm/googlevoicehat-codec.c
- create mode 100644 sound/soc/bcm/hifiberry_dacplus.c
- create mode 100644 sound/soc/bcm/hifiberry_dacplusadc.c
- create mode 100644 sound/soc/bcm/hifiberry_dacplusadcpro.c
- create mode 100644 sound/soc/bcm/hifiberry_dacplusdsp.c
- create mode 100644 sound/soc/bcm/hifiberry_dacplushd.c
- create mode 100644 sound/soc/bcm/i-sabre-q2m.c
- create mode 100644 sound/soc/bcm/iqaudio-codec.c
- create mode 100644 sound/soc/bcm/iqaudio-dac.c
- create mode 100644 sound/soc/bcm/justboom-both.c
- create mode 100644 sound/soc/bcm/justboom-dac.c
- create mode 100644 sound/soc/bcm/pifi-40.c
- create mode 100644 sound/soc/bcm/pisound.c
- create mode 100644 sound/soc/bcm/rpi-cirrus.c
- create mode 100644 sound/soc/bcm/rpi-proto.c
- create mode 100644 sound/soc/bcm/rpi-simple-soundcard.c
- create mode 100644 sound/soc/bcm/rpi-wm8804-soundcard.c
- create mode 100644 sound/soc/codecs/i-sabre-codec.c
- create mode 100644 sound/soc/codecs/i-sabre-codec.h
- create mode 100644 sound/soc/codecs/ma120x0p.c
- create mode 100644 sound/soc/codecs/pcm1794a.c
- create mode 100644 sound/soc/codecs/tas5713.c
- create mode 100644 sound/soc/codecs/tas5713.h
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
-@@ -0,0 +1,463 @@
-+Device tree binding vendor prefix registry.  Keep list in alphabetical order.
-+
-+This isn't an exhaustive list, but you should add new prefixes to it before
-+using them to avoid name-space collisions.
-+
-+abilis	Abilis Systems
-+abracon	Abracon Corporation
-+actions	Actions Semiconductor Co., Ltd.
-+active-semi	Active-Semi International Inc
-+ad	Avionic Design GmbH
-+adafruit	Adafruit Industries, LLC
-+adapteva	Adapteva, Inc.
-+adaptrum	Adaptrum, Inc.
-+adh	AD Holdings Plc.
-+adi	Analog Devices, Inc.
-+advantech	Advantech Corporation
-+aeroflexgaisler	Aeroflex Gaisler AB
-+al	Annapurna Labs
-+allo	Allo.com
-+allwinner	Allwinner Technology Co., Ltd.
-+alphascale	AlphaScale Integrated Circuits Systems, Inc.
-+altr	Altera Corp.
-+amarula	Amarula Solutions
-+amazon	Amazon.com, Inc.
-+amcc	Applied Micro Circuits Corporation (APM, formally AMCC)
-+amd	Advanced Micro Devices (AMD), Inc.
-+amediatech	Shenzhen Amediatech Technology Co., Ltd
-+amlogic	Amlogic, Inc.
-+ampire	Ampire Co., Ltd.
-+ams	AMS AG
-+amstaos	AMS-Taos Inc.
-+analogix	Analogix Semiconductor, Inc.
-+andestech	Andes Technology Corporation
-+apm	Applied Micro Circuits Corporation (APM)
-+aptina	Aptina Imaging
-+arasan	Arasan Chip Systems
-+archermind ArcherMind Technology (Nanjing) Co., Ltd.
-+arctic	Arctic Sand
-+aries	Aries Embedded GmbH
-+arm	ARM Ltd.
-+armadeus	ARMadeus Systems SARL
-+arrow	Arrow Electronics
-+artesyn	Artesyn Embedded Technologies Inc.
-+asahi-kasei	Asahi Kasei Corp.
-+aspeed	ASPEED Technology Inc.
-+asus	AsusTek Computer Inc.
-+atlas	Atlas Scientific LLC
-+atmel	Atmel Corporation
-+auo	AU Optronics Corporation
-+auvidea Auvidea GmbH
-+avago	Avago Technologies
-+avia	avia semiconductor
-+avic	Shanghai AVIC Optoelectronics Co., Ltd.
-+avnet	Avnet, Inc.
-+axentia	Axentia Technologies AB
-+axis	Axis Communications AB
-+bananapi BIPAI KEJI LIMITED
-+bhf	Beckhoff Automation GmbH & Co. KG
-+bitmain	Bitmain Technologies
-+blokaslabs	Vilniaus Blokas UAB
-+boe	BOE Technology Group Co., Ltd.
-+bosch	Bosch Sensortec GmbH
-+boundary	Boundary Devices Inc.
-+brcm	Broadcom Corporation
-+buffalo	Buffalo, Inc.
-+bticino Bticino International
-+calxeda	Calxeda
-+capella	Capella Microsystems, Inc
-+cascoda	Cascoda, Ltd.
-+catalyst	Catalyst Semiconductor, Inc.
-+cavium	Cavium, Inc.
-+cdns	Cadence Design Systems Inc.
-+cdtech	CDTech(H.K.) Electronics Limited
-+ceva	Ceva, Inc.
-+chipidea	Chipidea, Inc
-+chipone		ChipOne
-+chipspark	ChipSPARK
-+chrp	Common Hardware Reference Platform
-+chunghwa	Chunghwa Picture Tubes Ltd.
-+ciaa	Computadora Industrial Abierta Argentina
-+cirrus	Cirrus Logic, Inc.
-+cloudengines	Cloud Engines, Inc.
-+cnm	Chips&Media, Inc.
-+cnxt	Conexant Systems, Inc.
-+compulab	CompuLab Ltd.
-+cortina	Cortina Systems, Inc.
-+cosmic	Cosmic Circuits
-+crane	Crane Connectivity Solutions
-+creative	Creative Technology Ltd
-+crystalfontz	Crystalfontz America, Inc.
-+csky	Hangzhou C-SKY Microsystems Co., Ltd
-+cubietech	Cubietech, Ltd.
-+cypress	Cypress Semiconductor Corporation
-+cznic	CZ.NIC, z.s.p.o.
-+dallas	Maxim Integrated Products (formerly Dallas Semiconductor)
-+dataimage	DataImage, Inc.
-+davicom	DAVICOM Semiconductor, Inc.
-+delta	Delta Electronics, Inc.
-+denx	Denx Software Engineering
-+devantech	Devantech, Ltd.
-+dh	DH electronics GmbH
-+digi	Digi International Inc.
-+digilent	Diglent, Inc.
-+dioo	Dioo Microcircuit Co., Ltd
-+dlc	DLC Display Co., Ltd.
-+dlg	Dialog Semiconductor
-+dlink	D-Link Corporation
-+dmo	Data Modul AG
-+domintech	Domintech Co., Ltd.
-+dongwoon	Dongwoon Anatech
-+dptechnics	DPTechnics
-+dragino	Dragino Technology Co., Limited
-+ea	Embedded Artists AB
-+ebs-systart EBS-SYSTART GmbH
-+ebv	EBV Elektronik
-+eckelmann	Eckelmann AG
-+edt	Emerging Display Technologies
-+eeti	eGalax_eMPIA Technology Inc
-+elan	Elan Microelectronic Corp.
-+elgin	Elgin S/A.
-+embest	Shenzhen Embest Technology Co., Ltd.
-+emlid	Emlid, Ltd.
-+emmicro	EM Microelectronic
-+emtrion	emtrion GmbH
-+endless	Endless Mobile, Inc.
-+energymicro	Silicon Laboratories (formerly Energy Micro AS)
-+engicam	Engicam S.r.l.
-+epcos	EPCOS AG
-+epfl	Ecole Polytechnique Fédérale de Lausanne
-+epson	Seiko Epson Corp.
-+est	ESTeem Wireless Modems
-+ettus	NI Ettus Research
-+eukrea  Eukréa Electromatique
-+everest	Everest Semiconductor Co. Ltd.
-+everspin	Everspin Technologies, Inc.
-+exar	Exar Corporation
-+excito	Excito
-+ezchip	EZchip Semiconductor
-+facebook	Facebook
-+fairphone	Fairphone B.V.
-+faraday	Faraday Technology Corporation
-+fastrax	Fastrax Oy
-+fcs	Fairchild Semiconductor
-+feiyang	Shenzhen Fly Young Technology Co.,LTD.
-+firefly	Firefly
-+focaltech	FocalTech Systems Co.,Ltd
-+friendlyarm	Guangzhou FriendlyARM Computer Tech Co., Ltd
-+fsl	Freescale Semiconductor
-+fujitsu	Fujitsu Ltd.
-+gateworks	Gateworks Corporation
-+gcw Game Consoles Worldwide
-+ge	General Electric Company
-+geekbuying	GeekBuying
-+gef	GE Fanuc Intelligent Platforms Embedded Systems, Inc.
-+GEFanuc	GE Fanuc Intelligent Platforms Embedded Systems, Inc.
-+geniatech	Geniatech, Inc.
-+giantec	Giantec Semiconductor, Inc.
-+giantplus	Giantplus Technology Co., Ltd.
-+globalscale	Globalscale Technologies, Inc.
-+globaltop	GlobalTop Technology, Inc.
-+gmt	Global Mixed-mode Technology, Inc.
-+goodix	Shenzhen Huiding Technology Co., Ltd.
-+google	Google, Inc.
-+grinn	Grinn
-+grmn	Garmin Limited
-+gumstix	Gumstix, Inc.
-+gw	Gateworks Corporation
-+hannstar	HannStar Display Corporation
-+haoyu	Haoyu Microelectronic Co. Ltd.
-+hardkernel	Hardkernel Co., Ltd
-+hideep	HiDeep Inc.
-+himax	Himax Technologies, Inc.
-+hisilicon	Hisilicon Limited.
-+hit	Hitachi Ltd.
-+hitex	Hitex Development Tools
-+holt	Holt Integrated Circuits, Inc.
-+honeywell	Honeywell
-+hp	Hewlett Packard
-+holtek	Holtek Semiconductor, Inc.
-+hwacom	HwaCom Systems Inc.
-+i2se	I2SE GmbH
-+ibm	International Business Machines (IBM)
-+icplus	IC Plus Corp.
-+idt	Integrated Device Technologies, Inc.
-+ifi	Ingenieurburo Fur Ic-Technologie (I/F/I)
-+ilitek	ILI Technology Corporation (ILITEK)
-+img	Imagination Technologies Ltd.
-+infineon Infineon Technologies
-+inforce	Inforce Computing
-+ingenic	Ingenic Semiconductor
-+innolux	Innolux Corporation
-+inside-secure	INSIDE Secure
-+intel	Intel Corporation
-+intercontrol	Inter Control Group
-+invensense	InvenSense Inc.
-+inversepath	Inverse Path
-+iom	Iomega Corporation
-+isee	ISEE 2007 S.L.
-+isil	Intersil
-+issi	Integrated Silicon Solutions Inc.
-+itead	ITEAD Intelligent Systems Co.Ltd
-+iwave  iWave Systems Technologies Pvt. Ltd.
-+jdi	Japan Display Inc.
-+jedec	JEDEC Solid State Technology Association
-+jianda	Jiandangjing Technology Co., Ltd.
-+karo	Ka-Ro electronics GmbH
-+keithkoep	Keith & Koep GmbH
-+keymile	Keymile GmbH
-+khadas	Khadas
-+kiebackpeter    Kieback & Peter GmbH
-+kinetic Kinetic Technologies
-+kingdisplay	King & Display Technology Co., Ltd.
-+kingnovel	Kingnovel Technology Co., Ltd.
-+koe	Kaohsiung Opto-Electronics Inc.
-+kosagi	Sutajio Ko-Usagi PTE Ltd.
-+kyo	Kyocera Corporation
-+lacie	LaCie
-+laird	Laird PLC
-+lantiq	Lantiq Semiconductor
-+lattice	Lattice Semiconductor
-+lego	LEGO Systems A/S
-+lemaker	Shenzhen LeMaker Technology Co., Ltd.
-+lenovo	Lenovo Group Ltd.
-+lg	LG Corporation
-+libretech	Shenzhen Libre Technology Co., Ltd
-+licheepi	Lichee Pi
-+linaro	Linaro Limited
-+linksys	Belkin International, Inc. (Linksys)
-+linux	Linux-specific binding
-+linx	Linx Technologies
-+lltc	Linear Technology Corporation
-+logicpd	Logic PD, Inc.
-+lsi	LSI Corp. (LSI Logic)
-+lwn	Liebherr-Werk Nenzing GmbH
-+macnica	Macnica Americas
-+marvell	Marvell Technology Group Ltd.
-+maxim	Maxim Integrated Products
-+mbvl	Mobiveil Inc.
-+mcube	mCube
-+meas	Measurement Specialties
-+mediatek	MediaTek Inc.
-+megachips	MegaChips
-+mele	Shenzhen MeLE Digital Technology Ltd.
-+melexis	Melexis N.V.
-+melfas	MELFAS Inc.
-+mellanox	Mellanox Technologies
-+memsic	MEMSIC Inc.
-+merrii	Merrii Technology Co., Ltd.
-+micrel	Micrel Inc.
-+microchip	Microchip Technology Inc.
-+microcrystal	Micro Crystal AG
-+micron	Micron Technology Inc.
-+mikroe		MikroElektronika d.o.o.
-+minix	MINIX Technology Ltd.
-+miramems	MiraMEMS Sensing Technology Co., Ltd.
-+mitsubishi	Mitsubishi Electric Corporation
-+mosaixtech	Mosaix Technologies, Inc.
-+motorola	Motorola, Inc.
-+moxa	Moxa Inc.
-+mpl	MPL AG
-+mqmaker	mqmaker Inc.
-+mscc	Microsemi Corporation
-+msi	Micro-Star International Co. Ltd.
-+mti	Imagination Technologies Ltd. (formerly MIPS Technologies Inc.)
-+multi-inno	Multi-Inno Technology Co.,Ltd
-+mundoreader	Mundo Reader S.L.
-+murata	Murata Manufacturing Co., Ltd.
-+mxicy	Macronix International Co., Ltd.
-+myir	MYIR Tech Limited
-+national	National Semiconductor
-+nec	NEC LCD Technologies, Ltd.
-+neonode		Neonode Inc.
-+netgear	NETGEAR
-+netlogic	Broadcom Corporation (formerly NetLogic Microsystems)
-+netron-dy	Netron DY
-+netxeon		Shenzhen Netxeon Technology CO., LTD
-+nexbox	Nexbox
-+nextthing	Next Thing Co.
-+newhaven	Newhaven Display International
-+ni	National Instruments
-+nintendo	Nintendo
-+nlt	NLT Technologies, Ltd.
-+nokia	Nokia
-+nordic	Nordic Semiconductor
-+novtech NovTech, Inc.
-+nutsboard	NutsBoard
-+nuvoton	Nuvoton Technology Corporation
-+nvd	New Vision Display
-+nvidia	NVIDIA
-+nxp	NXP Semiconductors
-+okaya	Okaya Electric America, Inc.
-+oki	Oki Electric Industry Co., Ltd.
-+olimex	OLIMEX Ltd.
-+olpc	One Laptop Per Child
-+onion	Onion Corporation
-+onnn	ON Semiconductor Corp.
-+ontat	On Tat Industrial Company
-+opalkelly	Opal Kelly Incorporated
-+opencores	OpenCores.org
-+openrisc	OpenRISC.io
-+option	Option NV
-+oranth	Shenzhen Oranth Technology Co., Ltd.
-+ORCL	Oracle Corporation
-+orisetech	Orise Technology
-+ortustech	Ortus Technology Co., Ltd.
-+ovti	OmniVision Technologies
-+oxsemi	Oxford Semiconductor, Ltd.
-+panasonic	Panasonic Corporation
-+parade	Parade Technologies Inc.
-+pda	Precision Design Associates, Inc.
-+pericom	Pericom Technology Inc.
-+pervasive	Pervasive Displays, Inc.
-+phicomm PHICOMM Co., Ltd.
-+phytec	PHYTEC Messtechnik GmbH
-+picochip	Picochip Ltd
-+pine64	Pine64
-+pixcir  PIXCIR MICROELECTRONICS Co., Ltd
-+plantower Plantower Co., Ltd
-+plathome	Plat'Home Co., Ltd.
-+plda	PLDA
-+plx	Broadcom Corporation (formerly PLX Technology)
-+pni	PNI Sensor Corporation
-+portwell	Portwell Inc.
-+poslab	Poslab Technology Co., Ltd.
-+powervr	PowerVR (deprecated, use img)
-+probox2	PROBOX2 (by W2COMP Co., Ltd.)
-+pulsedlight	PulsedLight, Inc
-+qca	Qualcomm Atheros, Inc.
-+qcom	Qualcomm Technologies, Inc
-+qemu	QEMU, a generic and open source machine emulator and virtualizer
-+qi	Qi Hardware
-+qiaodian	QiaoDian XianShi Corporation
-+qnap	QNAP Systems, Inc.
-+radxa	Radxa
-+raidsonic	RaidSonic Technology GmbH
-+ralink	Mediatek/Ralink Technology Corp.
-+ramtron	Ramtron International
-+raspberrypi	Raspberry Pi Foundation
-+raydium	Raydium Semiconductor Corp.
-+rda	Unisoc Communications, Inc.
-+realtek Realtek Semiconductor Corp.
-+renesas	Renesas Electronics Corporation
-+richtek	Richtek Technology Corporation
-+ricoh	Ricoh Co. Ltd.
-+rikomagic	Rikomagic Tech Corp. Ltd
-+riscv	RISC-V Foundation
-+rockchip	Fuzhou Rockchip Electronics Co., Ltd
-+rohm	ROHM Semiconductor Co., Ltd
-+roofull	Shenzhen Roofull Technology Co, Ltd
-+samsung	Samsung Semiconductor
-+samtec	Samtec/Softing company
-+sancloud	Sancloud Ltd
-+sandisk	Sandisk Corporation
-+sbs	Smart Battery System
-+schindler	Schindler
-+seagate	Seagate Technology PLC
-+semtech	Semtech Corporation
-+sensirion	Sensirion AG
-+sff	Small Form Factor Committee
-+sgd	Solomon Goldentek Display Corporation
-+sgx	SGX Sensortech
-+sharp	Sharp Corporation
-+shimafuji	Shimafuji Electric, Inc.
-+si-en	Si-En Technology Ltd.
-+sifive	SiFive, Inc.
-+sigma	Sigma Designs, Inc.
-+sii	Seiko Instruments, Inc.
-+sil	Silicon Image
-+silabs	Silicon Laboratories
-+silead	Silead Inc.
-+silergy	Silergy Corp.
-+siliconmitus	Silicon Mitus, Inc.
-+simtek
-+sirf	SiRF Technology, Inc.
-+sis	Silicon Integrated Systems Corp.
-+sitronix	Sitronix Technology Corporation
-+skyworks	Skyworks Solutions, Inc.
-+smsc	Standard Microsystems Corporation
-+snps	Synopsys, Inc.
-+socionext	Socionext Inc.
-+solidrun	SolidRun
-+solomon        Solomon Systech Limited
-+sony	Sony Corporation
-+spansion	Spansion Inc.
-+sprd	Spreadtrum Communications Inc.
-+sst	Silicon Storage Technology, Inc.
-+st	STMicroelectronics
-+starry	Starry Electronic Technology (ShenZhen) Co., LTD
-+startek	Startek
-+ste	ST-Ericsson
-+stericsson	ST-Ericsson
-+summit	Summit microelectronics
-+sunchip	Shenzhen Sunchip Technology Co., Ltd
-+SUNW	Sun Microsystems, Inc
-+swir	Sierra Wireless
-+syna	Synaptics Inc.
-+synology	Synology, Inc.
-+tbs	TBS Technologies
-+tbs-biometrics	Touchless Biometric Systems AG
-+tcg	Trusted Computing Group
-+tcl	Toby Churchill Ltd.
-+technexion	TechNexion
-+technologic	Technologic Systems
-+tempo	Tempo Semiconductor
-+techstar	Shenzhen Techstar Electronics Co., Ltd.
-+terasic	Terasic Inc.
-+thine	THine Electronics, Inc.
-+ti	Texas Instruments
-+tianma	Tianma Micro-electronics Co., Ltd.
-+tlm	Trusted Logic Mobility
-+tmt	Tecon Microprocessor Technologies, LLC.
-+topeet  Topeet
-+toradex	Toradex AG
-+toshiba	Toshiba Corporation
-+toumaz	Toumaz
-+tpk	TPK U.S.A. LLC
-+tplink	TP-LINK Technologies Co., Ltd.
-+tpo	TPO
-+tronfy	Tronfy
-+tronsmart	Tronsmart
-+truly	Truly Semiconductors Limited
-+tsd	Theobroma Systems Design und Consulting GmbH
-+tyan	Tyan Computer Corporation
-+u-blox	u-blox
-+ucrobotics	uCRobotics
-+ubnt	Ubiquiti Networks
-+udoo	Udoo
-+uniwest	United Western Technologies Corp (UniWest)
-+upisemi	uPI Semiconductor Corp.
-+urt	United Radiant Technology Corporation
-+usi	Universal Scientific Industrial Co., Ltd.
-+v3	V3 Semiconductor
-+vamrs	Vamrs Ltd.
-+variscite	Variscite Ltd.
-+via	VIA Technologies, Inc.
-+virtio	Virtual I/O Device Specification, developed by the OASIS consortium
-+vishay	Vishay Intertechnology, Inc
-+vitesse	Vitesse Semiconductor Corporation
-+vivante	Vivante Corporation
-+vocore VoCore Studio
-+voipac	Voipac Technologies s.r.o.
-+vot	Vision Optical Technology Co., Ltd.
-+wd	Western Digital Corp.
-+wetek	WeTek Electronics, limited.
-+wexler	Wexler
-+whwave  Shenzhen whwave Electronics, Inc.
-+wi2wi	Wi2Wi, Inc.
-+winbond Winbond Electronics corp.
-+winstar	Winstar Display Corp.
-+wlf	Wolfson Microelectronics
-+wm	Wondermedia Technologies, Inc.
-+x-powers	X-Powers
-+xes	Extreme Engineering Solutions (X-ES)
-+xillybus	Xillybus Ltd.
-+xlnx	Xilinx
-+xunlong	Shenzhen Xunlong Software CO.,Limited
-+ysoft	Y Soft Corporation a.s.
-+zarlink	Zarlink Semiconductor
-+zeitec	ZEITEC Semiconductor Co., LTD.
-+zidoo	Shenzhen Zidoo Technology Co., Ltd.
-+zii	Zodiac Inflight Innovations
-+zte	ZTE Corp.
-+zyxel	ZyXEL Communications Corp.
---- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
-+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
-@@ -188,6 +188,8 @@ patternProperties:
-     description: Beckhoff Automation GmbH & Co. KG
-   "^bitmain,.*":
-     description: Bitmain Technologies
-+  "^blokaslabs,.*":
-+    description: Vilniaus Blokas UAB
-   "^blutek,.*":
-     description: BluTek Power
-   "^boe,.*":
---- a/drivers/clk/Kconfig
-+++ b/drivers/clk/Kconfig
-@@ -99,6 +99,12 @@ config COMMON_CLK_HI655X
- 	  multi-function device has one fixed-rate oscillator, clocked
- 	  at 32KHz.
- 
-+config COMMON_CLK_HIFIBERRY_DACPLUSHD
-+	tristate
-+
-+config COMMON_CLK_HIFIBERRY_DACPRO
-+	tristate
-+
- config COMMON_CLK_SCMI
- 	tristate "Clock driver controlled via SCMI interface"
- 	depends on ARM_SCMI_PROTOCOL || COMPILE_TEST
---- a/drivers/clk/Makefile
-+++ b/drivers/clk/Makefile
-@@ -19,6 +19,7 @@ endif
- 
- # hardware specific clock types
- # please keep this section sorted lexicographically by file path name
-+obj-$(CONFIG_SND_BCM2708_SOC_ALLO_BOSS_DAC)	+= clk-allo-dac.o
- obj-$(CONFIG_COMMON_CLK_APPLE_NCO)  	+= clk-apple-nco.o
- obj-$(CONFIG_MACH_ASM9260)		+= clk-asm9260.o
- obj-$(CONFIG_COMMON_CLK_AXI_CLKGEN)	+= clk-axi-clkgen.o
-@@ -43,6 +44,8 @@ obj-$(CONFIG_COMMON_CLK_K210)		+= clk-k2
- obj-$(CONFIG_LMK04832)			+= clk-lmk04832.o
- obj-$(CONFIG_COMMON_CLK_LAN966X)	+= clk-lan966x.o
- obj-$(CONFIG_COMMON_CLK_LOCHNAGAR)	+= clk-lochnagar.o
-+obj-$(CONFIG_COMMON_CLK_HIFIBERRY_DACPRO)	+= clk-hifiberry-dacpro.o
-+obj-$(CONFIG_COMMON_CLK_HIFIBERRY_DACPLUSHD)	+= clk-hifiberry-dachd.o
- obj-$(CONFIG_COMMON_CLK_MAX77686)	+= clk-max77686.o
- obj-$(CONFIG_COMMON_CLK_MAX9485)	+= clk-max9485.o
- obj-$(CONFIG_ARCH_MILBEAUT_M10V)	+= clk-milbeaut.o
---- /dev/null
-+++ b/drivers/clk/clk-allo-dac.c
-@@ -0,0 +1,161 @@
-+/*
-+ * Clock Driver for Allo DAC
-+ *
-+ * Author:	Baswaraj K <jaikumar@cem-solutions.net>
-+ *		Copyright 2016
-+ *		based on code by Stuart MacLean
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#include <linux/clk-provider.h>
-+#include <linux/clkdev.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/slab.h>
-+#include <linux/platform_device.h>
-+
-+/* Clock rate of CLK44EN attached to GPIO6 pin */
-+#define CLK_44EN_RATE 45158400UL
-+/* Clock rate of CLK48EN attached to GPIO3 pin */
-+#define CLK_48EN_RATE 49152000UL
-+
-+/**
-+ * struct allo_dac_clk - Common struct to the Allo DAC
-+ * @hw: clk_hw for the common clk framework
-+ * @mode: 0 => CLK44EN, 1 => CLK48EN
-+ */
-+struct clk_allo_hw {
-+	struct clk_hw hw;
-+	uint8_t mode;
-+};
-+
-+#define to_allo_clk(_hw) container_of(_hw, struct clk_allo_hw, hw)
-+
-+static const struct of_device_id clk_allo_dac_dt_ids[] = {
-+	{ .compatible = "allo,dac-clk",},
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(of, clk_allo_dac_dt_ids);
-+
-+static unsigned long clk_allo_dac_recalc_rate(struct clk_hw *hw,
-+	unsigned long parent_rate)
-+{
-+	return (to_allo_clk(hw)->mode == 0) ? CLK_44EN_RATE :
-+		CLK_48EN_RATE;
-+}
-+
-+static long clk_allo_dac_round_rate(struct clk_hw *hw,
-+	unsigned long rate, unsigned long *parent_rate)
-+{
-+	long actual_rate;
-+
-+	if (rate <= CLK_44EN_RATE) {
-+		actual_rate = (long)CLK_44EN_RATE;
-+	} else if (rate >= CLK_48EN_RATE) {
-+		actual_rate = (long)CLK_48EN_RATE;
-+	} else {
-+		long diff44Rate = (long)(rate - CLK_44EN_RATE);
-+		long diff48Rate = (long)(CLK_48EN_RATE - rate);
-+
-+		if (diff44Rate < diff48Rate)
-+			actual_rate = (long)CLK_44EN_RATE;
-+		else
-+			actual_rate = (long)CLK_48EN_RATE;
-+	}
-+	return actual_rate;
-+}
-+
-+
-+static int clk_allo_dac_set_rate(struct clk_hw *hw,
-+	unsigned long rate, unsigned long parent_rate)
-+{
-+	unsigned long actual_rate;
-+	struct clk_allo_hw *clk = to_allo_clk(hw);
-+
-+	actual_rate = (unsigned long)clk_allo_dac_round_rate(hw, rate,
-+		&parent_rate);
-+	clk->mode = (actual_rate == CLK_44EN_RATE) ? 0 : 1;
-+	return 0;
-+}
-+
-+
-+const struct clk_ops clk_allo_dac_rate_ops = {
-+	.recalc_rate = clk_allo_dac_recalc_rate,
-+	.round_rate = clk_allo_dac_round_rate,
-+	.set_rate = clk_allo_dac_set_rate,
-+};
-+
-+static int clk_allo_dac_probe(struct platform_device *pdev)
-+{
-+	int ret;
-+	struct clk_allo_hw *proclk;
-+	struct clk *clk;
-+	struct device *dev;
-+	struct clk_init_data init;
-+
-+	dev = &pdev->dev;
-+
-+	proclk = kzalloc(sizeof(struct clk_allo_hw), GFP_KERNEL);
-+	if (!proclk)
-+		return -ENOMEM;
-+
-+	init.name = "clk-allo-dac";
-+	init.ops = &clk_allo_dac_rate_ops;
-+	init.flags = 0;
-+	init.parent_names = NULL;
-+	init.num_parents = 0;
-+
-+	proclk->mode = 0;
-+	proclk->hw.init = &init;
-+
-+	clk = devm_clk_register(dev, &proclk->hw);
-+	if (!IS_ERR(clk)) {
-+		ret = of_clk_add_provider(dev->of_node, of_clk_src_simple_get,
-+			clk);
-+	} else {
-+		dev_err(dev, "Fail to register clock driver\n");
-+		kfree(proclk);
-+		ret = PTR_ERR(clk);
-+	}
-+	return ret;
-+}
-+
-+static int clk_allo_dac_remove(struct platform_device *pdev)
-+{
-+	of_clk_del_provider(pdev->dev.of_node);
-+	return 0;
-+}
-+
-+static struct platform_driver clk_allo_dac_driver = {
-+	.probe = clk_allo_dac_probe,
-+	.remove = clk_allo_dac_remove,
-+	.driver = {
-+		.name = "clk-allo-dac",
-+		.of_match_table = clk_allo_dac_dt_ids,
-+	},
-+};
-+
-+static int __init clk_allo_dac_init(void)
-+{
-+	return platform_driver_register(&clk_allo_dac_driver);
-+}
-+core_initcall(clk_allo_dac_init);
-+
-+static void __exit clk_allo_dac_exit(void)
-+{
-+	platform_driver_unregister(&clk_allo_dac_driver);
-+}
-+module_exit(clk_allo_dac_exit);
-+
-+MODULE_DESCRIPTION("Allo DAC clock driver");
-+MODULE_LICENSE("GPL v2");
-+MODULE_ALIAS("platform:clk-allo-dac");
---- /dev/null
-+++ b/drivers/clk/clk-hifiberry-dachd.c
-@@ -0,0 +1,332 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Clock Driver for HiFiBerry DAC+ HD
-+ *
-+ * Author: Joerg Schambacher, i2Audio GmbH for HiFiBerry
-+ *         Copyright 2020
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#include <linux/clk-provider.h>
-+#include <linux/clk.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/slab.h>
-+#include <linux/platform_device.h>
-+#include <linux/i2c.h>
-+#include <linux/regmap.h>
-+
-+#define NO_PLL_RESET			0
-+#define PLL_RESET			1
-+#define HIFIBERRY_PLL_MAX_REGISTER	256
-+#define DEFAULT_RATE			44100
-+
-+static struct reg_default hifiberry_pll_reg_defaults[] = {
-+	{0x02, 0x53}, {0x03, 0x00}, {0x07, 0x20}, {0x0F, 0x00},
-+	{0x10, 0x0D}, {0x11, 0x1D}, {0x12, 0x0D}, {0x13, 0x8C},
-+	{0x14, 0x8C}, {0x15, 0x8C}, {0x16, 0x8C}, {0x17, 0x8C},
-+	{0x18, 0x2A}, {0x1C, 0x00}, {0x1D, 0x0F}, {0x1F, 0x00},
-+	{0x2A, 0x00}, {0x2C, 0x00}, {0x2F, 0x00}, {0x30, 0x00},
-+	{0x31, 0x00}, {0x32, 0x00}, {0x34, 0x00}, {0x37, 0x00},
-+	{0x38, 0x00}, {0x39, 0x00}, {0x3A, 0x00}, {0x3B, 0x01},
-+	{0x3E, 0x00}, {0x3F, 0x00}, {0x40, 0x00}, {0x41, 0x00},
-+	{0x5A, 0x00}, {0x5B, 0x00}, {0x95, 0x00}, {0x96, 0x00},
-+	{0x97, 0x00}, {0x98, 0x00}, {0x99, 0x00}, {0x9A, 0x00},
-+	{0x9B, 0x00}, {0xA2, 0x00}, {0xA3, 0x00}, {0xA4, 0x00},
-+	{0xB7, 0x92},
-+	{0x1A, 0x3D}, {0x1B, 0x09}, {0x1E, 0xF3}, {0x20, 0x13},
-+	{0x21, 0x75}, {0x2B, 0x04}, {0x2D, 0x11}, {0x2E, 0xE0},
-+	{0x3D, 0x7A},
-+	{0x35, 0x9D}, {0x36, 0x00}, {0x3C, 0x42},
-+	{ 177, 0xAC},
-+};
-+static struct reg_default common_pll_regs[HIFIBERRY_PLL_MAX_REGISTER];
-+static int num_common_pll_regs;
-+static struct reg_default dedicated_192k_pll_regs[HIFIBERRY_PLL_MAX_REGISTER];
-+static int num_dedicated_192k_pll_regs;
-+static struct reg_default dedicated_96k_pll_regs[HIFIBERRY_PLL_MAX_REGISTER];
-+static int num_dedicated_96k_pll_regs;
-+static struct reg_default dedicated_48k_pll_regs[HIFIBERRY_PLL_MAX_REGISTER];
-+static int num_dedicated_48k_pll_regs;
-+static struct reg_default dedicated_176k4_pll_regs[HIFIBERRY_PLL_MAX_REGISTER];
-+static int num_dedicated_176k4_pll_regs;
-+static struct reg_default dedicated_88k2_pll_regs[HIFIBERRY_PLL_MAX_REGISTER];
-+static int num_dedicated_88k2_pll_regs;
-+static struct reg_default dedicated_44k1_pll_regs[HIFIBERRY_PLL_MAX_REGISTER];
-+static int num_dedicated_44k1_pll_regs;
-+
-+/**
-+ * struct clk_hifiberry_drvdata - Common struct to the HiFiBerry DAC HD Clk
-+ * @hw: clk_hw for the common clk framework
-+ */
-+struct clk_hifiberry_drvdata {
-+	struct regmap *regmap;
-+	struct clk *clk;
-+	struct clk_hw hw;
-+	unsigned long rate;
-+};
-+
-+#define to_hifiberry_clk(_hw) \
-+	container_of(_hw, struct clk_hifiberry_drvdata, hw)
-+
-+static int clk_hifiberry_dachd_write_pll_regs(struct regmap *regmap,
-+				struct reg_default *regs,
-+				int num, int do_pll_reset)
-+{
-+	int i;
-+	int ret = 0;
-+	char pll_soft_reset[] = { 177, 0xAC, };
-+
-+	for (i = 0; i < num; i++) {
-+		ret |= regmap_write(regmap, regs[i].reg, regs[i].def);
-+		if (ret)
-+			return ret;
-+	}
-+	if (do_pll_reset) {
-+		ret |= regmap_write(regmap, pll_soft_reset[0],
-+						pll_soft_reset[1]);
-+		mdelay(10);
-+	}
-+	return ret;
-+}
-+
-+static unsigned long clk_hifiberry_dachd_recalc_rate(struct clk_hw *hw,
-+	unsigned long parent_rate)
-+{
-+	return to_hifiberry_clk(hw)->rate;
-+}
-+
-+static long clk_hifiberry_dachd_round_rate(struct clk_hw *hw,
-+	unsigned long rate, unsigned long *parent_rate)
-+{
-+	return rate;
-+}
-+
-+static int clk_hifiberry_dachd_set_rate(struct clk_hw *hw,
-+	unsigned long rate, unsigned long parent_rate)
-+{
-+	int ret;
-+	struct clk_hifiberry_drvdata *drvdata = to_hifiberry_clk(hw);
-+
-+	switch (rate) {
-+	case 44100:
-+		ret = clk_hifiberry_dachd_write_pll_regs(drvdata->regmap,
-+			dedicated_44k1_pll_regs, num_dedicated_44k1_pll_regs,
-+			PLL_RESET);
-+		break;
-+	case 88200:
-+		ret = clk_hifiberry_dachd_write_pll_regs(drvdata->regmap,
-+			dedicated_88k2_pll_regs, num_dedicated_88k2_pll_regs,
-+			PLL_RESET);
-+		break;
-+	case 176400:
-+		ret = clk_hifiberry_dachd_write_pll_regs(drvdata->regmap,
-+			dedicated_176k4_pll_regs, num_dedicated_176k4_pll_regs,
-+			PLL_RESET);
-+		break;
-+	case 48000:
-+		ret = clk_hifiberry_dachd_write_pll_regs(drvdata->regmap,
-+			dedicated_48k_pll_regs,	num_dedicated_48k_pll_regs,
-+			PLL_RESET);
-+		break;
-+	case 96000:
-+		ret = clk_hifiberry_dachd_write_pll_regs(drvdata->regmap,
-+			dedicated_96k_pll_regs,	num_dedicated_96k_pll_regs,
-+			PLL_RESET);
-+		break;
-+	case 192000:
-+		ret = clk_hifiberry_dachd_write_pll_regs(drvdata->regmap,
-+			dedicated_192k_pll_regs, num_dedicated_192k_pll_regs,
-+			PLL_RESET);
-+		break;
-+	default:
-+		ret = -EINVAL;
-+		break;
-+	}
-+	to_hifiberry_clk(hw)->rate = rate;
-+
-+	return ret;
-+}
-+
-+const struct clk_ops clk_hifiberry_dachd_rate_ops = {
-+	.recalc_rate = clk_hifiberry_dachd_recalc_rate,
-+	.round_rate = clk_hifiberry_dachd_round_rate,
-+	.set_rate = clk_hifiberry_dachd_set_rate,
-+};
-+
-+static int clk_hifiberry_get_prop_values(struct device *dev,
-+					char *prop_name,
-+					struct reg_default *regs)
-+{
-+	int ret;
-+	int i;
-+	u8 tmp[2 * HIFIBERRY_PLL_MAX_REGISTER];
-+
-+	ret = of_property_read_variable_u8_array(dev->of_node, prop_name,
-+			tmp, 0, 2 * HIFIBERRY_PLL_MAX_REGISTER);
-+	if (ret < 0)
-+		return ret;
-+	if (ret & 1) {
-+		dev_err(dev,
-+			"%s <%s> -> #%i odd number of bytes for reg/val pairs!",
-+			__func__,
-+			prop_name,
-+			ret);
-+		return -EINVAL;
-+	}
-+	ret /= 2;
-+	for (i = 0; i < ret; i++) {
-+		regs[i].reg = (u32)tmp[2 * i];
-+		regs[i].def = (u32)tmp[2 * i + 1];
-+	}
-+	return ret;
-+}
-+
-+
-+static int clk_hifiberry_dachd_dt_parse(struct device *dev)
-+{
-+	num_common_pll_regs = clk_hifiberry_get_prop_values(dev,
-+				"common_pll_regs", common_pll_regs);
-+	num_dedicated_44k1_pll_regs = clk_hifiberry_get_prop_values(dev,
-+				"44k1_pll_regs", dedicated_44k1_pll_regs);
-+	num_dedicated_88k2_pll_regs = clk_hifiberry_get_prop_values(dev,
-+				"88k2_pll_regs", dedicated_88k2_pll_regs);
-+	num_dedicated_176k4_pll_regs = clk_hifiberry_get_prop_values(dev,
-+				"176k4_pll_regs", dedicated_176k4_pll_regs);
-+	num_dedicated_48k_pll_regs = clk_hifiberry_get_prop_values(dev,
-+				"48k_pll_regs", dedicated_48k_pll_regs);
-+	num_dedicated_96k_pll_regs = clk_hifiberry_get_prop_values(dev,
-+				"96k_pll_regs", dedicated_96k_pll_regs);
-+	num_dedicated_192k_pll_regs = clk_hifiberry_get_prop_values(dev,
-+				"192k_pll_regs", dedicated_192k_pll_regs);
-+	return 0;
-+}
-+
-+
-+static int clk_hifiberry_dachd_remove(struct device *dev)
-+{
-+	of_clk_del_provider(dev->of_node);
-+	return 0;
-+}
-+
-+const struct regmap_config hifiberry_pll_regmap = {
-+	.reg_bits = 8,
-+	.val_bits = 8,
-+	.max_register = HIFIBERRY_PLL_MAX_REGISTER,
-+	.reg_defaults = hifiberry_pll_reg_defaults,
-+	.num_reg_defaults = ARRAY_SIZE(hifiberry_pll_reg_defaults),
-+	.cache_type = REGCACHE_RBTREE,
-+};
-+EXPORT_SYMBOL_GPL(hifiberry_pll_regmap);
-+
-+
-+static int clk_hifiberry_dachd_i2c_probe(struct i2c_client *i2c,
-+			     const struct i2c_device_id *id)
-+{
-+	struct clk_hifiberry_drvdata *hdclk;
-+	int ret = 0;
-+	struct clk_init_data init;
-+	struct device *dev = &i2c->dev;
-+	struct device_node *dev_node = dev->of_node;
-+	struct regmap_config config = hifiberry_pll_regmap;
-+
-+	hdclk = devm_kzalloc(&i2c->dev,
-+			sizeof(struct clk_hifiberry_drvdata), GFP_KERNEL);
-+	if (!hdclk)
-+		return -ENOMEM;
-+
-+	i2c_set_clientdata(i2c, hdclk);
-+
-+	hdclk->regmap = devm_regmap_init_i2c(i2c, &config);
-+
-+	if (IS_ERR(hdclk->regmap))
-+		return PTR_ERR(hdclk->regmap);
-+
-+	/* start PLL to allow detection of DAC */
-+	ret = clk_hifiberry_dachd_write_pll_regs(hdclk->regmap,
-+				hifiberry_pll_reg_defaults,
-+				ARRAY_SIZE(hifiberry_pll_reg_defaults),
-+				PLL_RESET);
-+	if (ret)
-+		return ret;
-+
-+	clk_hifiberry_dachd_dt_parse(dev);
-+
-+	/* restart PLL with configs from DTB */
-+	ret = clk_hifiberry_dachd_write_pll_regs(hdclk->regmap, common_pll_regs,
-+					num_common_pll_regs, PLL_RESET);
-+	if (ret)
-+		return ret;
-+
-+	init.name = "clk-hifiberry-dachd";
-+	init.ops = &clk_hifiberry_dachd_rate_ops;
-+	init.flags = 0;
-+	init.parent_names = NULL;
-+	init.num_parents = 0;
-+
-+	hdclk->hw.init = &init;
-+
-+	hdclk->clk = devm_clk_register(dev, &hdclk->hw);
-+	if (IS_ERR(hdclk->clk)) {
-+		dev_err(dev, "unable to register %s\n",	init.name);
-+		return PTR_ERR(hdclk->clk);
-+	}
-+
-+	ret = of_clk_add_provider(dev_node, of_clk_src_simple_get, hdclk->clk);
-+	if (ret != 0) {
-+		dev_err(dev, "Cannot of_clk_add_provider");
-+		return ret;
-+	}
-+
-+	ret = clk_set_rate(hdclk->hw.clk, DEFAULT_RATE);
-+	if (ret != 0) {
-+		dev_err(dev, "Cannot set rate : %d\n",	ret);
-+		return -EINVAL;
-+	}
-+
-+	return ret;
-+}
-+
-+static void clk_hifiberry_dachd_i2c_remove(struct i2c_client *i2c)
-+{
-+	clk_hifiberry_dachd_remove(&i2c->dev);
-+}
-+
-+static const struct i2c_device_id clk_hifiberry_dachd_i2c_id[] = {
-+	{ "dachd-clk", },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(i2c, clk_hifiberry_dachd_i2c_id);
-+
-+static const struct of_device_id clk_hifiberry_dachd_of_match[] = {
-+	{ .compatible = "hifiberry,dachd-clk", },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(of, clk_hifiberry_dachd_of_match);
-+
-+static struct i2c_driver clk_hifiberry_dachd_i2c_driver = {
-+	.probe		= clk_hifiberry_dachd_i2c_probe,
-+	.remove		= clk_hifiberry_dachd_i2c_remove,
-+	.id_table	= clk_hifiberry_dachd_i2c_id,
-+	.driver		= {
-+		.name	= "dachd-clk",
-+		.of_match_table = of_match_ptr(clk_hifiberry_dachd_of_match),
-+	},
-+};
-+
-+module_i2c_driver(clk_hifiberry_dachd_i2c_driver);
-+
-+
-+MODULE_DESCRIPTION("HiFiBerry DAC+ HD clock driver");
-+MODULE_AUTHOR("Joerg Schambacher <joerg@i2audio.com>");
-+MODULE_LICENSE("GPL v2");
-+MODULE_ALIAS("platform:clk-hifiberry-dachd");
---- /dev/null
-+++ b/drivers/clk/clk-hifiberry-dacpro.c
-@@ -0,0 +1,160 @@
-+/*
-+ * Clock Driver for HiFiBerry DAC Pro
-+ *
-+ * Author: Stuart MacLean
-+ *         Copyright 2015
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#include <linux/clk-provider.h>
-+#include <linux/clkdev.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/slab.h>
-+#include <linux/platform_device.h>
-+
-+/* Clock rate of CLK44EN attached to GPIO6 pin */
-+#define CLK_44EN_RATE 22579200UL
-+/* Clock rate of CLK48EN attached to GPIO3 pin */
-+#define CLK_48EN_RATE 24576000UL
-+
-+/**
-+ * struct hifiberry_dacpro_clk - Common struct to the HiFiBerry DAC Pro
-+ * @hw: clk_hw for the common clk framework
-+ * @mode: 0 => CLK44EN, 1 => CLK48EN
-+ */
-+struct clk_hifiberry_hw {
-+	struct clk_hw hw;
-+	uint8_t mode;
-+};
-+
-+#define to_hifiberry_clk(_hw) container_of(_hw, struct clk_hifiberry_hw, hw)
-+
-+static const struct of_device_id clk_hifiberry_dacpro_dt_ids[] = {
-+	{ .compatible = "hifiberry,dacpro-clk",},
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(of, clk_hifiberry_dacpro_dt_ids);
-+
-+static unsigned long clk_hifiberry_dacpro_recalc_rate(struct clk_hw *hw,
-+	unsigned long parent_rate)
-+{
-+	return (to_hifiberry_clk(hw)->mode == 0) ? CLK_44EN_RATE :
-+		CLK_48EN_RATE;
-+}
-+
-+static long clk_hifiberry_dacpro_round_rate(struct clk_hw *hw,
-+	unsigned long rate, unsigned long *parent_rate)
-+{
-+	long actual_rate;
-+
-+	if (rate <= CLK_44EN_RATE) {
-+		actual_rate = (long)CLK_44EN_RATE;
-+	} else if (rate >= CLK_48EN_RATE) {
-+		actual_rate = (long)CLK_48EN_RATE;
-+	} else {
-+		long diff44Rate = (long)(rate - CLK_44EN_RATE);
-+		long diff48Rate = (long)(CLK_48EN_RATE - rate);
-+
-+		if (diff44Rate < diff48Rate)
-+			actual_rate = (long)CLK_44EN_RATE;
-+		else
-+			actual_rate = (long)CLK_48EN_RATE;
-+	}
-+	return actual_rate;
-+}
-+
-+
-+static int clk_hifiberry_dacpro_set_rate(struct clk_hw *hw,
-+	unsigned long rate, unsigned long parent_rate)
-+{
-+	unsigned long actual_rate;
-+	struct clk_hifiberry_hw *clk = to_hifiberry_clk(hw);
-+
-+	actual_rate = (unsigned long)clk_hifiberry_dacpro_round_rate(hw, rate,
-+		&parent_rate);
-+	clk->mode = (actual_rate == CLK_44EN_RATE) ? 0 : 1;
-+	return 0;
-+}
-+
-+
-+const struct clk_ops clk_hifiberry_dacpro_rate_ops = {
-+	.recalc_rate = clk_hifiberry_dacpro_recalc_rate,
-+	.round_rate = clk_hifiberry_dacpro_round_rate,
-+	.set_rate = clk_hifiberry_dacpro_set_rate,
-+};
-+
-+static int clk_hifiberry_dacpro_probe(struct platform_device *pdev)
-+{
-+	int ret;
-+	struct clk_hifiberry_hw *proclk;
-+	struct clk *clk;
-+	struct device *dev;
-+	struct clk_init_data init;
-+
-+	dev = &pdev->dev;
-+
-+	proclk = kzalloc(sizeof(struct clk_hifiberry_hw), GFP_KERNEL);
-+	if (!proclk)
-+		return -ENOMEM;
-+
-+	init.name = "clk-hifiberry-dacpro";
-+	init.ops = &clk_hifiberry_dacpro_rate_ops;
-+	init.flags = 0;
-+	init.parent_names = NULL;
-+	init.num_parents = 0;
-+
-+	proclk->mode = 0;
-+	proclk->hw.init = &init;
-+
-+	clk = devm_clk_register(dev, &proclk->hw);
-+	if (!IS_ERR(clk)) {
-+		ret = of_clk_add_provider(dev->of_node, of_clk_src_simple_get,
-+			clk);
-+	} else {
-+		dev_err(dev, "Fail to register clock driver\n");
-+		kfree(proclk);
-+		ret = PTR_ERR(clk);
-+	}
-+	return ret;
-+}
-+
-+static int clk_hifiberry_dacpro_remove(struct platform_device *pdev)
-+{
-+	of_clk_del_provider(pdev->dev.of_node);
-+	return 0;
-+}
-+
-+static struct platform_driver clk_hifiberry_dacpro_driver = {
-+	.probe = clk_hifiberry_dacpro_probe,
-+	.remove = clk_hifiberry_dacpro_remove,
-+	.driver = {
-+		.name = "clk-hifiberry-dacpro",
-+		.of_match_table = clk_hifiberry_dacpro_dt_ids,
-+	},
-+};
-+
-+static int __init clk_hifiberry_dacpro_init(void)
-+{
-+	return platform_driver_register(&clk_hifiberry_dacpro_driver);
-+}
-+core_initcall(clk_hifiberry_dacpro_init);
-+
-+static void __exit clk_hifiberry_dacpro_exit(void)
-+{
-+	platform_driver_unregister(&clk_hifiberry_dacpro_driver);
-+}
-+module_exit(clk_hifiberry_dacpro_exit);
-+
-+MODULE_DESCRIPTION("HiFiBerry DAC Pro clock driver");
-+MODULE_LICENSE("GPL v2");
-+MODULE_ALIAS("platform:clk-hifiberry-dacpro");
---- a/sound/soc/bcm/Kconfig
-+++ b/sound/soc/bcm/Kconfig
-@@ -26,3 +26,308 @@ config SND_BCM63XX_I2S_WHISTLER
- 	  DSL/PON chips (bcm63158, bcm63178)
- 
- 	  If you don't know what to do here, say N
-+
-+config SND_BCM2708_SOC_CHIPDIP_DAC
-+         tristate "Support for the ChipDip DAC"
-+         depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+         help
-+          Say Y or M if you want to add support for the ChipDip DAC soundcard
-+
-+config SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD
-+	tristate "Support for Google voiceHAT soundcard"
-+	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+	select SND_SOC_VOICEHAT
-+	select SND_RPI_SIMPLE_SOUNDCARD
-+	help
-+          Say Y or M if you want to add support for voiceHAT soundcard.
-+
-+config SND_BCM2708_SOC_HIFIBERRY_DAC
-+        tristate "Support for HifiBerry DAC"
-+        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+        select SND_SOC_PCM5102A
-+        select SND_RPI_SIMPLE_SOUNDCARD
-+        help
-+         Say Y or M if you want to add support for HifiBerry DAC.
-+
-+config SND_BCM2708_SOC_HIFIBERRY_DACPLUS
-+        tristate "Support for HifiBerry DAC+"
-+        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+        select SND_SOC_PCM512x
-+        select SND_SOC_TPA6130A2
-+        select COMMON_CLK_HIFIBERRY_DACPRO
-+        help
-+         Say Y or M if you want to add support for HifiBerry DAC+.
-+
-+config SND_BCM2708_SOC_HIFIBERRY_DACPLUSHD
-+        tristate "Support for HifiBerry DAC+ HD"
-+        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+        select SND_SOC_PCM179X_I2C
-+        select COMMON_CLK_HIFIBERRY_DACPLUSHD
-+        help
-+         Say Y or M if you want to add support for HifiBerry DAC+ HD.
-+
-+config SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC
-+        tristate "Support for HifiBerry DAC+ADC"
-+        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+        select SND_SOC_PCM512x_I2C
-+	select SND_SOC_DMIC
-+        select COMMON_CLK_HIFIBERRY_DACPRO
-+        help
-+         Say Y or M if you want to add support for HifiBerry DAC+ADC.
-+
-+config SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO
-+        tristate "Support for HifiBerry DAC+ADC PRO"
-+        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+        select SND_SOC_PCM512x_I2C
-+        select SND_SOC_PCM186X_I2C
-+        select SND_SOC_TPA6130A2
-+        select COMMON_CLK_HIFIBERRY_DACPRO
-+        help
-+         Say Y or M if you want to add support for HifiBerry DAC+ADC PRO.
-+
-+config SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP
-+        tristate "Support for HifiBerry DAC+DSP"
-+        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+	select SND_RPI_SIMPLE_SOUNDCARD
-+        help
-+         Say Y or M if you want to add support for HifiBerry DSP-DAC.
-+
-+config SND_BCM2708_SOC_HIFIBERRY_DIGI
-+        tristate "Support for HifiBerry Digi"
-+        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+        select SND_SOC_WM8804
-+        help
-+         Say Y or M if you want to add support for HifiBerry Digi S/PDIF output board.
-+
-+config SND_BCM2708_SOC_HIFIBERRY_AMP
-+        tristate "Support for the HifiBerry Amp"
-+        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+        select SND_SOC_TAS5713
-+        select SND_RPI_SIMPLE_SOUNDCARD
-+        help
-+         Say Y or M if you want to add support for the HifiBerry Amp amplifier board.
-+
-+ config SND_BCM2708_SOC_PIFI_40
-+         tristate "Support for the PiFi-40 amp"
-+         depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+         select SND_SOC_TAS571X
-+         select SND_PIFI_40
-+         help
-+          Say Y or M if you want to add support for the PiFi40 amp board
-+
-+config SND_BCM2708_SOC_RPI_CIRRUS
-+        tristate "Support for Cirrus Logic Audio Card"
-+        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+        select SND_SOC_WM5102
-+        select SND_SOC_WM8804
-+        help
-+         Say Y or M if you want to add support for the Wolfson and
-+         Cirrus Logic audio cards.
-+
-+config SND_BCM2708_SOC_RPI_DAC
-+        tristate "Support for RPi-DAC"
-+        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+        select SND_SOC_PCM1794A
-+        select SND_RPI_SIMPLE_SOUNDCARD
-+        help
-+         Say Y or M if you want to add support for RPi-DAC.
-+
-+config SND_BCM2708_SOC_RPI_PROTO
-+	tristate "Support for Rpi-PROTO"
-+	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+	select SND_SOC_WM8731
-+	help
-+	  Say Y or M if you want to add support for Audio Codec Board PROTO (WM8731).
-+
-+config SND_BCM2708_SOC_JUSTBOOM_BOTH
-+	tristate "Support for simultaneous JustBoom Digi and JustBoom DAC"
-+	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+	select SND_SOC_WM8804
-+	select SND_SOC_PCM512x
-+	help
-+		Say Y or M if you want to add support for simultaneous
-+		JustBoom Digi and JustBoom DAC.
-+
-+		This is not the right choice if you only have one but both of
-+		these cards.
-+
-+config SND_BCM2708_SOC_JUSTBOOM_DAC
-+	tristate "Support for JustBoom DAC"
-+	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+	select SND_SOC_PCM512x
-+	help
-+	  Say Y or M if you want to add support for JustBoom DAC.
-+
-+config SND_BCM2708_SOC_JUSTBOOM_DIGI
-+	tristate "Support for JustBoom Digi"
-+	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+	select SND_SOC_WM8804
-+        select SND_RPI_WM8804_SOUNDCARD
-+	help
-+	  Say Y or M if you want to add support for JustBoom Digi.
-+
-+config SND_BCM2708_SOC_IQAUDIO_CODEC
-+	tristate "Support for IQaudIO-CODEC"
-+	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+	select SND_SOC_DA7213
-+	help
-+	  Say Y or M if you want to add support for IQaudIO-CODEC.
-+
-+config SND_BCM2708_SOC_IQAUDIO_DAC
-+	tristate "Support for IQaudIO-DAC"
-+	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+	select SND_SOC_PCM512x_I2C
-+	help
-+	  Say Y or M if you want to add support for IQaudIO-DAC.
-+
-+config SND_BCM2708_SOC_IQAUDIO_DIGI
-+	tristate "Support for IQAudIO Digi"
-+	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+	select SND_SOC_WM8804
-+	select SND_RPI_WM8804_SOUNDCARD
-+	help
-+	  Say Y or M if you want to add support for IQAudIO Digital IO board.
-+
-+config SND_BCM2708_SOC_I_SABRE_Q2M
-+        tristate "Support for Audiophonics I-Sabre Q2M DAC"
-+        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+        select SND_SOC_I_SABRE_CODEC
-+        help
-+        Say Y or M if you want to add support for Audiophonics I-SABRE Q2M DAC
-+
-+config SND_BCM2708_SOC_ADAU1977_ADC
-+	tristate "Support for ADAU1977 ADC"
-+	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+	select SND_SOC_ADAU1977_I2C
-+	select SND_RPI_SIMPLE_SOUNDCARD
-+	help
-+	  Say Y or M if you want to add support for ADAU1977 ADC.
-+
-+config SND_AUDIOINJECTOR_PI_SOUNDCARD
-+	tristate "Support for audioinjector.net Pi add on soundcard"
-+	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+	select SND_SOC_WM8731
-+	help
-+	  Say Y or M if you want to add support for audioinjector.net Pi Hat
-+
-+config SND_AUDIOINJECTOR_OCTO_SOUNDCARD
-+	tristate "Support for audioinjector.net Octo channel (Hat) soundcard"
-+	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+	select SND_SOC_CS42XX8_I2C
-+	help
-+	  Say Y or M if you want to add support for audioinjector.net octo add on
-+
-+config SND_AUDIOINJECTOR_ISOLATED_SOUNDCARD
-+	tristate "Support for audioinjector.net isolated DAC and ADC soundcard"
-+	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+	select SND_SOC_CS4271_I2C
-+	help
-+	  Say Y or M if you want to add support for audioinjector.net isolated soundcard
-+
-+config SND_AUDIOSENSE_PI
-+	tristate "Support for AudioSense Add-On Soundcard"
-+	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+	select SND_SOC_TLV320AIC32X4_I2C
-+	help
-+	  Say Y or M if you want to add support for tlv320aic32x4 add-on
-+
-+config SND_DIGIDAC1_SOUNDCARD
-+        tristate "Support for Red Rocks Audio DigiDAC1"
-+        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+        select SND_SOC_WM8804
-+        select SND_SOC_WM8741
-+        help
-+         Say Y or M if you want to add support for Red Rocks Audio DigiDAC1 board.
-+
-+config SND_BCM2708_SOC_DIONAUDIO_LOCO
-+	tristate "Support for Dion Audio LOCO DAC-AMP"
-+	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+	select SND_SOC_PCM5102a
-+	help
-+	  Say Y or M if you want to add support for Dion Audio LOCO.
-+
-+config SND_BCM2708_SOC_DIONAUDIO_LOCO_V2
-+	tristate "Support for Dion Audio LOCO-V2 DAC-AMP"
-+	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+	select SND_SOC_PCM5122
-+	help
-+	  Say Y or M if you want to add support for Dion Audio LOCO-V2.
-+
-+config SND_BCM2708_SOC_ALLO_PIANO_DAC
-+	tristate "Support for Allo Piano DAC"
-+	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+	select SND_SOC_PCM512x_I2C
-+	help
-+	  Say Y or M if you want to add support for Allo Piano DAC.
-+
-+config SND_BCM2708_SOC_ALLO_PIANO_DAC_PLUS
-+	tristate "Support for Allo Piano DAC Plus"
-+	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+	select SND_SOC_PCM512x_I2C
-+	help
-+	  Say Y or M if you want to add support for Allo Piano DAC Plus.
-+
-+config SND_BCM2708_SOC_ALLO_BOSS_DAC
-+	tristate "Support for Allo Boss DAC"
-+	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+	select SND_SOC_PCM512x_I2C
-+	help
-+	  Say Y or M if you want to add support for Allo Boss DAC.
-+
-+config SND_BCM2708_SOC_ALLO_BOSS2_DAC
-+	tristate "Support for Allo Boss2 DAC"
-+	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+	depends on I2C
-+	select REGMAP_I2C
-+	select SND_AUDIO_GRAPH_CARD
-+	help
-+	  Say Y or M if you want to add support for Allo Boss2 DAC.
-+
-+config SND_BCM2708_SOC_ALLO_DIGIONE
-+	tristate "Support for Allo DigiOne"
-+	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+	select SND_SOC_WM8804
-+	select SND_RPI_WM8804_SOUNDCARD
-+	help
-+	  Say Y or M if you want to add support for Allo DigiOne.
-+
-+config SND_BCM2708_SOC_ALLO_KATANA_DAC
-+	tristate "Support for Allo Katana DAC"
-+	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+	depends on I2C
-+	select REGMAP_I2C
-+	select SND_AUDIO_GRAPH_CARD
-+	help
-+	  Say Y or M if you want to add support for Allo Katana DAC.
-+
-+config SND_BCM2708_SOC_FE_PI_AUDIO
-+	tristate "Support for Fe-Pi-Audio"
-+	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+	select SND_SOC_SGTL5000
-+	help
-+	  Say Y or M if you want to add support for Fe-Pi-Audio.
-+
-+config SND_PISOUND
-+	tristate "Support for Blokas Labs pisound"
-+	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+	select SND_RAWMIDI
-+	help
-+	  Say Y or M if you want to add support for Blokas Labs pisound.
-+
-+config SND_RPI_SIMPLE_SOUNDCARD
-+	tristate "Support for Raspberry Pi simple soundcards"
-+	help
-+	  Say Y or M if you want to add support Raspbery Pi simple soundcards
-+
-+config SND_RPI_WM8804_SOUNDCARD
-+	tristate "Support for Raspberry Pi generic WM8804 soundcards"
-+	help
-+	  Say Y or M if you want to add support for the Raspberry Pi
-+          generic driver for WM8804 based soundcards.
-+
-+config SND_DACBERRY400
-+	tristate "Support for DACBERRY400 Soundcard"
-+	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+	select SND_SOC_TLV320AIC3X_I2C
-+	help
-+	  Say Y or M if you want to add support for tlv320aic3x add-on
---- a/sound/soc/bcm/Makefile
-+++ b/sound/soc/bcm/Makefile
-@@ -12,4 +12,73 @@ obj-$(CONFIG_SND_SOC_CYGNUS) += snd-soc-
- # BCM63XX Platform Support
- snd-soc-63xx-objs := bcm63xx-i2s-whistler.o bcm63xx-pcm-whistler.o
- 
--obj-$(CONFIG_SND_BCM63XX_I2S_WHISTLER) += snd-soc-63xx.o
-\ No newline at end of file
-+obj-$(CONFIG_SND_BCM63XX_I2S_WHISTLER) += snd-soc-63xx.o
-+
-+# Google voiceHAT custom codec support
-+snd-soc-googlevoicehat-codec-objs := googlevoicehat-codec.o
-+
-+# BCM2708 Machine Support
-+snd-soc-hifiberry-dacplus-objs := hifiberry_dacplus.o
-+snd-soc-hifiberry-dacplushd-objs := hifiberry_dacplushd.o
-+snd-soc-hifiberry-dacplusadc-objs := hifiberry_dacplusadc.o
-+snd-soc-hifiberry-dacplusadcpro-objs := hifiberry_dacplusadcpro.o
-+snd-soc-hifiberry-dacplusdsp-objs := hifiberry_dacplusdsp.o
-+snd-soc-justboom-both-objs := justboom-both.o
-+snd-soc-justboom-dac-objs := justboom-dac.o
-+snd-soc-rpi-cirrus-objs := rpi-cirrus.o
-+snd-soc-rpi-proto-objs := rpi-proto.o
-+snd-soc-iqaudio-codec-objs := iqaudio-codec.o
-+snd-soc-iqaudio-dac-objs := iqaudio-dac.o
-+ snd-soc-i-sabre-q2m-objs := i-sabre-q2m.o
-+snd-soc-audioinjector-pi-soundcard-objs := audioinjector-pi-soundcard.o
-+snd-soc-audioinjector-octo-soundcard-objs := audioinjector-octo-soundcard.o
-+snd-soc-audioinjector-isolated-soundcard-objs := audioinjector-isolated-soundcard.o
-+snd-soc-audiosense-pi-objs := audiosense-pi.o
-+snd-soc-digidac1-soundcard-objs := digidac1-soundcard.o
-+snd-soc-dionaudio-loco-objs := dionaudio_loco.o
-+snd-soc-dionaudio-loco-v2-objs := dionaudio_loco-v2.o
-+snd-soc-allo-boss-dac-objs := allo-boss-dac.o
-+snd-soc-allo-boss2-dac-objs := allo-boss2-dac.o
-+snd-soc-allo-piano-dac-objs := allo-piano-dac.o
-+snd-soc-allo-piano-dac-plus-objs := allo-piano-dac-plus.o
-+snd-soc-allo-katana-codec-objs := allo-katana-codec.o
-+snd-soc-pisound-objs := pisound.o
-+snd-soc-fe-pi-audio-objs := fe-pi-audio.o
-+snd-soc-rpi-simple-soundcard-objs := rpi-simple-soundcard.o
-+snd-soc-rpi-wm8804-soundcard-objs := rpi-wm8804-soundcard.o
-+snd-soc-pifi-40-objs := pifi-40.o
-+snd-soc-chipdip-dac-objs := chipdip-dac.o
-+snd-soc-dacberry400-objs := dacberry400.o
-+
-+obj-$(CONFIG_SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD)  += snd-soc-googlevoicehat-codec.o
-+obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS) += snd-soc-hifiberry-dacplus.o
-+obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSHD) += snd-soc-hifiberry-dacplushd.o
-+obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC) += snd-soc-hifiberry-dacplusadc.o
-+obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO) += snd-soc-hifiberry-dacplusadcpro.o
-+obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP) += snd-soc-hifiberry-dacplusdsp.o
-+obj-$(CONFIG_SND_BCM2708_SOC_JUSTBOOM_BOTH) += snd-soc-justboom-both.o
-+obj-$(CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC) += snd-soc-justboom-dac.o
-+obj-$(CONFIG_SND_BCM2708_SOC_RPI_CIRRUS) += snd-soc-rpi-cirrus.o
-+obj-$(CONFIG_SND_BCM2708_SOC_RPI_PROTO) += snd-soc-rpi-proto.o
-+obj-$(CONFIG_SND_BCM2708_SOC_IQAUDIO_CODEC) += snd-soc-iqaudio-codec.o
-+obj-$(CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC) += snd-soc-iqaudio-dac.o
-+obj-$(CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M) += snd-soc-i-sabre-q2m.o
-+obj-$(CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD) += snd-soc-audioinjector-pi-soundcard.o
-+obj-$(CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD) += snd-soc-audioinjector-octo-soundcard.o
-+obj-$(CONFIG_SND_AUDIOINJECTOR_ISOLATED_SOUNDCARD) += snd-soc-audioinjector-isolated-soundcard.o
-+obj-$(CONFIG_SND_AUDIOSENSE_PI) += snd-soc-audiosense-pi.o
-+obj-$(CONFIG_SND_DIGIDAC1_SOUNDCARD) += snd-soc-digidac1-soundcard.o
-+obj-$(CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO) += snd-soc-dionaudio-loco.o
-+obj-$(CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2) += snd-soc-dionaudio-loco-v2.o
-+obj-$(CONFIG_SND_BCM2708_SOC_ALLO_BOSS_DAC) += snd-soc-allo-boss-dac.o
-+obj-$(CONFIG_SND_BCM2708_SOC_ALLO_BOSS2_DAC) += snd-soc-allo-boss2-dac.o
-+obj-$(CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC) += snd-soc-allo-piano-dac.o
-+obj-$(CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC_PLUS) += snd-soc-allo-piano-dac-plus.o
-+obj-$(CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC) += snd-soc-allo-katana-codec.o
-+obj-$(CONFIG_SND_PISOUND) += snd-soc-pisound.o
-+obj-$(CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO) += snd-soc-fe-pi-audio.o
-+obj-$(CONFIG_SND_RPI_SIMPLE_SOUNDCARD) += snd-soc-rpi-simple-soundcard.o
-+obj-$(CONFIG_SND_RPI_WM8804_SOUNDCARD) += snd-soc-rpi-wm8804-soundcard.o
-+obj-$(CONFIG_SND_BCM2708_SOC_PIFI_40) += snd-soc-pifi-40.o
-+obj-$(CONFIG_SND_BCM2708_SOC_CHIPDIP_DAC) += snd-soc-chipdip-dac.o
-+obj-$(CONFIG_SND_DACBERRY400) += snd-soc-dacberry400.o
---- /dev/null
-+++ b/sound/soc/bcm/allo-boss-dac.c
-@@ -0,0 +1,457 @@
-+/*
-+ * ALSA ASoC Machine Driver for Allo Boss DAC
-+ *
-+ * Author:	Baswaraj K <jaikumar@cem-solutions.net>
-+ *		Copyright 2017
-+ *		based on code by Daniel Matuschek,
-+ *				 Stuart MacLean <stuart@hifiberry.com>
-+ *		based on code by Florian Meier <florian.meier@koalo.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/gpio/consumer.h>
-+#include <linux/platform_device.h>
-+#include <linux/clk.h>
-+#include <linux/delay.h>
-+
-+#include <sound/core.h>
-+#include <sound/pcm.h>
-+#include <sound/pcm_params.h>
-+#include <sound/soc.h>
-+#include "../codecs/pcm512x.h"
-+
-+#define ALLO_BOSS_NOCLOCK 0
-+#define ALLO_BOSS_CLK44EN 1
-+#define ALLO_BOSS_CLK48EN 2
-+
-+struct pcm512x_priv {
-+	struct regmap *regmap;
-+	struct clk *sclk;
-+};
-+
-+static struct gpio_desc *mute_gpio;
-+
-+/* Clock rate of CLK44EN attached to GPIO6 pin */
-+#define CLK_44EN_RATE 45158400UL
-+/* Clock rate of CLK48EN attached to GPIO3 pin */
-+#define CLK_48EN_RATE 49152000UL
-+
-+static bool slave;
-+static bool snd_soc_allo_boss_master;
-+static bool digital_gain_0db_limit = true;
-+
-+static void snd_allo_boss_select_clk(struct snd_soc_component *component,
-+	int clk_id)
-+{
-+	switch (clk_id) {
-+	case ALLO_BOSS_NOCLOCK:
-+		snd_soc_component_update_bits(component, PCM512x_GPIO_CONTROL_1, 0x24, 0x00);
-+		break;
-+	case ALLO_BOSS_CLK44EN:
-+		snd_soc_component_update_bits(component, PCM512x_GPIO_CONTROL_1, 0x24, 0x20);
-+		break;
-+	case ALLO_BOSS_CLK48EN:
-+		snd_soc_component_update_bits(component, PCM512x_GPIO_CONTROL_1, 0x24, 0x04);
-+		break;
-+	}
-+}
-+
-+static void snd_allo_boss_clk_gpio(struct snd_soc_component *component)
-+{
-+	snd_soc_component_update_bits(component, PCM512x_GPIO_EN, 0x24, 0x24);
-+	snd_soc_component_update_bits(component, PCM512x_GPIO_OUTPUT_3, 0x0f, 0x02);
-+	snd_soc_component_update_bits(component, PCM512x_GPIO_OUTPUT_6, 0x0f, 0x02);
-+}
-+
-+static bool snd_allo_boss_is_sclk(struct snd_soc_component *component)
-+{
-+	unsigned int sck;
-+
-+	sck = snd_soc_component_read(component, PCM512x_RATE_DET_4);
-+	return (!(sck & 0x40));
-+}
-+
-+static bool snd_allo_boss_is_sclk_sleep(
-+	struct snd_soc_component *component)
-+{
-+	msleep(2);
-+	return snd_allo_boss_is_sclk(component);
-+}
-+
-+static bool snd_allo_boss_is_master_card(struct snd_soc_component *component)
-+{
-+	bool isClk44EN, isClk48En, isNoClk;
-+
-+	snd_allo_boss_clk_gpio(component);
-+
-+	snd_allo_boss_select_clk(component, ALLO_BOSS_CLK44EN);
-+	isClk44EN = snd_allo_boss_is_sclk_sleep(component);
-+
-+	snd_allo_boss_select_clk(component, ALLO_BOSS_NOCLOCK);
-+	isNoClk = snd_allo_boss_is_sclk_sleep(component);
-+
-+	snd_allo_boss_select_clk(component, ALLO_BOSS_CLK48EN);
-+	isClk48En = snd_allo_boss_is_sclk_sleep(component);
-+
-+	return (isClk44EN && isClk48En && !isNoClk);
-+}
-+
-+static int snd_allo_boss_clk_for_rate(int sample_rate)
-+{
-+	int type;
-+
-+	switch (sample_rate) {
-+	case 11025:
-+	case 22050:
-+	case 44100:
-+	case 88200:
-+	case 176400:
-+	case 352800:
-+		type = ALLO_BOSS_CLK44EN;
-+		break;
-+	default:
-+		type = ALLO_BOSS_CLK48EN;
-+		break;
-+	}
-+	return type;
-+}
-+
-+static void snd_allo_boss_set_sclk(struct snd_soc_component *component,
-+	int sample_rate)
-+{
-+	struct pcm512x_priv *pcm512x = snd_soc_component_get_drvdata(component);
-+
-+	if (!IS_ERR(pcm512x->sclk)) {
-+		int ctype;
-+
-+		ctype =	snd_allo_boss_clk_for_rate(sample_rate);
-+		clk_set_rate(pcm512x->sclk, (ctype == ALLO_BOSS_CLK44EN)
-+				? CLK_44EN_RATE : CLK_48EN_RATE);
-+		snd_allo_boss_select_clk(component, ctype);
-+	}
-+}
-+
-+static int snd_allo_boss_init(struct snd_soc_pcm_runtime *rtd)
-+{
-+	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
-+	struct pcm512x_priv *priv = snd_soc_component_get_drvdata(component);
-+
-+	if (slave)
-+		snd_soc_allo_boss_master = false;
-+	else
-+		snd_soc_allo_boss_master =
-+			snd_allo_boss_is_master_card(component);
-+
-+	if (snd_soc_allo_boss_master) {
-+		struct snd_soc_dai_link *dai = rtd->dai_link;
-+
-+		dai->name = "BossDAC";
-+		dai->stream_name = "Boss DAC HiFi [Master]";
-+		dai->dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-+			| SND_SOC_DAIFMT_CBM_CFM;
-+
-+		snd_soc_component_update_bits(component, PCM512x_BCLK_LRCLK_CFG, 0x31, 0x11);
-+		snd_soc_component_update_bits(component, PCM512x_MASTER_MODE, 0x03, 0x03);
-+		snd_soc_component_update_bits(component, PCM512x_MASTER_CLKDIV_2, 0x7f, 63);
-+		/*
-+		* Default sclk to CLK_48EN_RATE, otherwise codec
-+		*  pcm512x_dai_startup_master method could call
-+		*  snd_pcm_hw_constraint_ratnums using CLK_44EN/64
-+		*  which will mask 384k sample rate.
-+		*/
-+		if (!IS_ERR(priv->sclk))
-+			clk_set_rate(priv->sclk, CLK_48EN_RATE);
-+	} else {
-+		priv->sclk = ERR_PTR(-ENOENT);
-+	}
-+
-+	snd_soc_component_update_bits(component, PCM512x_GPIO_EN, 0x08, 0x08);
-+	snd_soc_component_update_bits(component, PCM512x_GPIO_OUTPUT_4, 0x0f, 0x02);
-+	snd_soc_component_update_bits(component, PCM512x_GPIO_CONTROL_1, 0x08, 0x08);
-+
-+	if (digital_gain_0db_limit) {
-+		int ret;
-+		struct snd_soc_card *card = rtd->card;
-+
-+		ret = snd_soc_limit_volume(card, "Digital Playback Volume",
-+				207);
-+		if (ret < 0)
-+			dev_warn(card->dev, "Failed to set volume limit: %d\n",
-+					ret);
-+	}
-+
-+	return 0;
-+}
-+
-+static int snd_allo_boss_update_rate_den(
-+	struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
-+	struct pcm512x_priv *pcm512x = snd_soc_component_get_drvdata(component);
-+	struct snd_ratnum *rats_no_pll;
-+	unsigned int num = 0, den = 0;
-+	int err;
-+
-+	rats_no_pll = devm_kzalloc(rtd->dev, sizeof(*rats_no_pll), GFP_KERNEL);
-+	if (!rats_no_pll)
-+		return -ENOMEM;
-+
-+	rats_no_pll->num = clk_get_rate(pcm512x->sclk) / 64;
-+	rats_no_pll->den_min = 1;
-+	rats_no_pll->den_max = 128;
-+	rats_no_pll->den_step = 1;
-+
-+	err = snd_interval_ratnum(hw_param_interval(params,
-+		SNDRV_PCM_HW_PARAM_RATE), 1, rats_no_pll, &num, &den);
-+	if (err >= 0 && den) {
-+		params->rate_num = num;
-+		params->rate_den = den;
-+	}
-+
-+	devm_kfree(rtd->dev, rats_no_pll);
-+	return 0;
-+}
-+
-+static void snd_allo_boss_gpio_mute(struct snd_soc_card *card)
-+{
-+	if (mute_gpio)
-+		gpiod_set_value_cansleep(mute_gpio, 1);
-+}
-+
-+static void snd_allo_boss_gpio_unmute(struct snd_soc_card *card)
-+{
-+	if (mute_gpio)
-+		gpiod_set_value_cansleep(mute_gpio, 0);
-+}
-+
-+static int snd_allo_boss_set_bias_level(struct snd_soc_card *card,
-+	struct snd_soc_dapm_context *dapm, enum snd_soc_bias_level level)
-+{
-+	struct snd_soc_pcm_runtime *rtd;
-+	struct snd_soc_dai *codec_dai;
-+
-+	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]);
-+	codec_dai = asoc_rtd_to_codec(rtd, 0);
-+
-+	if (dapm->dev != codec_dai->dev)
-+		return 0;
-+
-+	switch (level) {
-+	case SND_SOC_BIAS_PREPARE:
-+		if (dapm->bias_level != SND_SOC_BIAS_STANDBY)
-+			break;
-+		/* UNMUTE DAC */
-+		snd_allo_boss_gpio_unmute(card);
-+		break;
-+
-+	case SND_SOC_BIAS_STANDBY:
-+		if (dapm->bias_level != SND_SOC_BIAS_PREPARE)
-+			break;
-+		/* MUTE DAC */
-+		snd_allo_boss_gpio_mute(card);
-+		break;
-+
-+	default:
-+		break;
-+	}
-+
-+	return 0;
-+}
-+
-+static int snd_allo_boss_hw_params(
-+	struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params)
-+{
-+	int ret = 0;
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	int channels = params_channels(params);
-+	int width = snd_pcm_format_physical_width(params_format(params));
-+
-+	if (snd_soc_allo_boss_master) {
-+		struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
-+
-+		snd_allo_boss_set_sclk(component,
-+			params_rate(params));
-+
-+		ret = snd_allo_boss_update_rate_den(
-+			substream, params);
-+		if (ret)
-+			return ret;
-+	}
-+
-+	ret = snd_soc_dai_set_bclk_ratio(asoc_rtd_to_cpu(rtd, 0), channels * width);
-+	if (ret)
-+		return ret;
-+	ret = snd_soc_dai_set_bclk_ratio(asoc_rtd_to_codec(rtd, 0), channels * width);
-+	return ret;
-+}
-+
-+static int snd_allo_boss_startup(
-+	struct snd_pcm_substream *substream)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
-+	struct snd_soc_card *card = rtd->card;
-+
-+	snd_soc_component_update_bits(component, PCM512x_GPIO_CONTROL_1, 0x08, 0x08);
-+	snd_allo_boss_gpio_mute(card);
-+
-+	if (snd_soc_allo_boss_master) {
-+		struct pcm512x_priv *priv = snd_soc_component_get_drvdata(component);
-+		/*
-+		 * Default sclk to CLK_48EN_RATE, otherwise codec
-+		 * pcm512x_dai_startup_master method could call
-+		 * snd_pcm_hw_constraint_ratnums using CLK_44EN/64
-+		 * which will mask 384k sample rate.
-+		 */
-+		if (!IS_ERR(priv->sclk))
-+			clk_set_rate(priv->sclk, CLK_48EN_RATE);
-+	}
-+
-+	return 0;
-+}
-+
-+static void snd_allo_boss_shutdown(
-+	struct snd_pcm_substream *substream)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
-+
-+	snd_soc_component_update_bits(component, PCM512x_GPIO_CONTROL_1, 0x08, 0x00);
-+}
-+
-+static int snd_allo_boss_prepare(
-+	struct snd_pcm_substream *substream)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_card *card = rtd->card;
-+
-+	snd_allo_boss_gpio_unmute(card);
-+	return 0;
-+}
-+/* machine stream operations */
-+static struct snd_soc_ops snd_allo_boss_ops = {
-+	.hw_params = snd_allo_boss_hw_params,
-+	.startup = snd_allo_boss_startup,
-+	.shutdown = snd_allo_boss_shutdown,
-+	.prepare = snd_allo_boss_prepare,
-+};
-+
-+SND_SOC_DAILINK_DEFS(allo_boss,
-+	DAILINK_COMP_ARRAY(COMP_CPU("bcm2708-i2s.0")),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("pcm512x.1-004d", "pcm512x-hifi")),
-+	DAILINK_COMP_ARRAY(COMP_PLATFORM("bcm2708-i2s.0")));
-+
-+static struct snd_soc_dai_link snd_allo_boss_dai[] = {
-+{
-+	.name		= "Boss DAC",
-+	.stream_name	= "Boss DAC HiFi",
-+	.dai_fmt	= SND_SOC_DAIFMT_I2S |
-+			  SND_SOC_DAIFMT_NB_NF |
-+			  SND_SOC_DAIFMT_CBS_CFS,
-+	.ops		= &snd_allo_boss_ops,
-+	.init		= snd_allo_boss_init,
-+	SND_SOC_DAILINK_REG(allo_boss),
-+},
-+};
-+
-+/* audio machine driver */
-+static struct snd_soc_card snd_allo_boss = {
-+	.name         = "BossDAC",
-+	.owner        = THIS_MODULE,
-+	.dai_link     = snd_allo_boss_dai,
-+	.num_links    = ARRAY_SIZE(snd_allo_boss_dai),
-+};
-+
-+static int snd_allo_boss_probe(struct platform_device *pdev)
-+{
-+	int ret = 0;
-+
-+	snd_allo_boss.dev = &pdev->dev;
-+
-+	if (pdev->dev.of_node) {
-+		struct device_node *i2s_node;
-+		struct snd_soc_dai_link *dai;
-+
-+		dai = &snd_allo_boss_dai[0];
-+		i2s_node = of_parse_phandle(pdev->dev.of_node,
-+					    "i2s-controller", 0);
-+
-+		if (i2s_node) {
-+			dai->cpus->dai_name = NULL;
-+			dai->cpus->of_node = i2s_node;
-+			dai->platforms->name = NULL;
-+			dai->platforms->of_node = i2s_node;
-+		}
-+
-+		digital_gain_0db_limit = !of_property_read_bool(
-+			pdev->dev.of_node, "allo,24db_digital_gain");
-+		slave = of_property_read_bool(pdev->dev.of_node,
-+						"allo,slave");
-+
-+		mute_gpio = devm_gpiod_get_optional(&pdev->dev, "mute",
-+							GPIOD_OUT_LOW);
-+		if (IS_ERR(mute_gpio)) {
-+			ret = PTR_ERR(mute_gpio);
-+			dev_err(&pdev->dev,
-+				"failed to get mute gpio: %d\n", ret);
-+			return ret;
-+		}
-+
-+		if (mute_gpio)
-+			snd_allo_boss.set_bias_level =
-+				snd_allo_boss_set_bias_level;
-+
-+		ret = snd_soc_register_card(&snd_allo_boss);
-+		if (ret) {
-+			dev_err(&pdev->dev,
-+				"snd_soc_register_card() failed: %d\n", ret);
-+			return ret;
-+		}
-+
-+		if (mute_gpio)
-+			snd_allo_boss_gpio_mute(&snd_allo_boss);
-+
-+		return 0;
-+	}
-+
-+	return -EINVAL;
-+}
-+
-+static int snd_allo_boss_remove(struct platform_device *pdev)
-+{
-+	snd_allo_boss_gpio_mute(&snd_allo_boss);
-+	snd_soc_unregister_card(&snd_allo_boss);
-+	return 0;
-+}
-+
-+static const struct of_device_id snd_allo_boss_of_match[] = {
-+	{ .compatible = "allo,boss-dac", },
-+	{ /* sentinel */ },
-+};
-+MODULE_DEVICE_TABLE(of, snd_allo_boss_of_match);
-+
-+static struct platform_driver snd_allo_boss_driver = {
-+	.driver = {
-+		.name   = "snd-allo-boss-dac",
-+		.owner  = THIS_MODULE,
-+		.of_match_table = snd_allo_boss_of_match,
-+	},
-+	.probe          = snd_allo_boss_probe,
-+	.remove         = snd_allo_boss_remove,
-+};
-+
-+module_platform_driver(snd_allo_boss_driver);
-+
-+MODULE_AUTHOR("Baswaraj K <jaikumar@cem-solutions.net>");
-+MODULE_DESCRIPTION("ALSA ASoC Machine Driver for Allo Boss DAC");
-+MODULE_LICENSE("GPL v2");
---- /dev/null
-+++ b/sound/soc/bcm/allo-boss2-dac.c
-@@ -0,0 +1,1131 @@
-+/*
-+ * Driver for the ALLO KATANA CODEC
-+ *
-+ * Author: Jaikumar <sudeepkumar@cem-solutions.net>
-+ *		Copyright 2018
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/moduleparam.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+#include <linux/gpio.h>
-+#include <linux/gpio/consumer.h>
-+#include <linux/platform_device.h>
-+#include <linux/pm.h>
-+#include <linux/i2c.h>
-+#include <linux/of_device.h>
-+#include <linux/regmap.h>
-+#include <linux/slab.h>
-+#include <sound/core.h>
-+#include <sound/pcm.h>
-+#include <sound/pcm_params.h>
-+#include <sound/soc.h>
-+#include <sound/soc-dapm.h>
-+#include <sound/initval.h>
-+#include <sound/tlv.h>
-+#include <linux/of_gpio.h>
-+#include <linux/regulator/consumer.h>
-+#include <linux/pm_runtime.h>
-+#include <linux/of_irq.h>
-+#include <linux/completion.h>
-+#include <linux/mutex.h>
-+#include <linux/workqueue.h>
-+#include <sound/jack.h>
-+
-+#include "../codecs/cs43130.h"
-+
-+#include <linux/clk.h>
-+#include <linux/gcd.h>
-+#define DEBUG
-+
-+#define CS43130_DSD_EN_MASK             0x10
-+#define CS43130_PDN_DONE_INT_MASK        0x00
-+
-+static struct gpio_desc *snd_allo_clk44gpio;
-+static struct gpio_desc *snd_allo_clk48gpio;
-+
-+struct  cs43130_priv {
-+	struct snd_soc_component        *component;
-+	struct regmap                   *regmap;
-+	struct regulator_bulk_data      supplies[CS43130_NUM_SUPPLIES];
-+	struct gpio_desc                *reset_gpio;
-+	unsigned int                    dev_id; /* codec device ID */
-+	int                             xtal_ibias;
-+	/* shared by both DAIs */
-+	struct mutex                    clk_mutex;
-+	int                             clk_req;
-+	bool                            pll_bypass;
-+	struct completion               xtal_rdy;
-+	struct completion               pll_rdy;
-+	unsigned int                    mclk;
-+	unsigned int                    mclk_int;
-+	int                             mclk_int_src;
-+
-+	/* DAI specific */
-+	struct cs43130_dai              dais[CS43130_DAI_ID_MAX];
-+
-+	/* HP load specific */
-+	bool                            dc_meas;
-+	bool                            ac_meas;
-+	bool                            hpload_done;
-+	struct completion               hpload_evt;
-+	unsigned int                    hpload_stat;
-+	u16                             hpload_dc[2];
-+	u16                             dc_threshold[CS43130_DC_THRESHOLD];
-+	u16                             ac_freq[CS43130_AC_FREQ];
-+	u16                             hpload_ac[CS43130_AC_FREQ][2];
-+	struct workqueue_struct         *wq;
-+	struct work_struct              work;
-+	struct snd_soc_jack             jack;
-+};
-+
-+static const struct reg_default cs43130_reg_defaults[] = {
-+	{CS43130_SYS_CLK_CTL_1, 0x06},
-+	{CS43130_SP_SRATE, 0x01},
-+	{CS43130_SP_BITSIZE, 0x05},
-+	{CS43130_PAD_INT_CFG, 0x03},
-+	{CS43130_PWDN_CTL, 0xFE},
-+	{CS43130_CRYSTAL_SET, 0x04},
-+	{CS43130_PLL_SET_1, 0x00},
-+	{CS43130_PLL_SET_2, 0x00},
-+	{CS43130_PLL_SET_3, 0x00},
-+	{CS43130_PLL_SET_4, 0x00},
-+	{CS43130_PLL_SET_5, 0x40},
-+	{CS43130_PLL_SET_6, 0x10},
-+	{CS43130_PLL_SET_7, 0x80},
-+	{CS43130_PLL_SET_8, 0x03},
-+	{CS43130_PLL_SET_9, 0x02},
-+	{CS43130_PLL_SET_10, 0x02},
-+	{CS43130_CLKOUT_CTL, 0x00},
-+	{CS43130_ASP_NUM_1, 0x01},
-+	{CS43130_ASP_NUM_2, 0x00},
-+	{CS43130_ASP_DEN_1, 0x08},
-+	{CS43130_ASP_DEN_2, 0x00},
-+	{CS43130_ASP_LRCK_HI_TIME_1, 0x1F},
-+	{CS43130_ASP_LRCK_HI_TIME_2, 0x00},
-+	{CS43130_ASP_LRCK_PERIOD_1, 0x3F},
-+	{CS43130_ASP_LRCK_PERIOD_2, 0x00},
-+	{CS43130_ASP_CLOCK_CONF, 0x0C},
-+	{CS43130_ASP_FRAME_CONF, 0x0A},
-+	{CS43130_XSP_NUM_1, 0x01},
-+	{CS43130_XSP_NUM_2, 0x00},
-+	{CS43130_XSP_DEN_1, 0x02},
-+	{CS43130_XSP_DEN_2, 0x00},
-+	{CS43130_XSP_LRCK_HI_TIME_1, 0x1F},
-+	{CS43130_XSP_LRCK_HI_TIME_2, 0x00},
-+	{CS43130_XSP_LRCK_PERIOD_1, 0x3F},
-+	{CS43130_XSP_LRCK_PERIOD_2, 0x00},
-+	{CS43130_XSP_CLOCK_CONF, 0x0C},
-+	{CS43130_XSP_FRAME_CONF, 0x0A},
-+	{CS43130_ASP_CH_1_LOC, 0x00},
-+	{CS43130_ASP_CH_2_LOC, 0x00},
-+	{CS43130_ASP_CH_1_SZ_EN, 0x06},
-+	{CS43130_ASP_CH_2_SZ_EN, 0x0E},
-+	{CS43130_XSP_CH_1_LOC, 0x00},
-+	{CS43130_XSP_CH_2_LOC, 0x00},
-+	{CS43130_XSP_CH_1_SZ_EN, 0x06},
-+	{CS43130_XSP_CH_2_SZ_EN, 0x0E},
-+	{CS43130_DSD_VOL_B, 0x78},
-+	{CS43130_DSD_VOL_A, 0x78},
-+	{CS43130_DSD_PATH_CTL_1, 0xA8},
-+	{CS43130_DSD_INT_CFG, 0x00},
-+	{CS43130_DSD_PATH_CTL_2, 0x02},
-+	{CS43130_DSD_PCM_MIX_CTL, 0x00},
-+	{CS43130_DSD_PATH_CTL_3, 0x40},
-+	{CS43130_HP_OUT_CTL_1, 0x30},
-+	{CS43130_PCM_FILT_OPT, 0x02},
-+	{CS43130_PCM_VOL_B, 0x78},
-+	{CS43130_PCM_VOL_A, 0x78},
-+	{CS43130_PCM_PATH_CTL_1, 0xA8},
-+	{CS43130_PCM_PATH_CTL_2, 0x00},
-+	{CS43130_CLASS_H_CTL, 0x1E},
-+	{CS43130_HP_DETECT, 0x04},
-+	{CS43130_HP_LOAD_1, 0x00},
-+	{CS43130_HP_MEAS_LOAD_1, 0x00},
-+	{CS43130_HP_MEAS_LOAD_2, 0x00},
-+	{CS43130_INT_MASK_1, 0xFF},
-+	{CS43130_INT_MASK_2, 0xFF},
-+	{CS43130_INT_MASK_3, 0xFF},
-+	{CS43130_INT_MASK_4, 0xFF},
-+	{CS43130_INT_MASK_5, 0xFF},
-+};
-+static bool cs43130_volatile_register(struct device *dev, unsigned int reg)
-+{
-+	switch (reg) {
-+	case CS43130_INT_STATUS_1 ... CS43130_INT_STATUS_5:
-+	case CS43130_HP_DC_STAT_1 ... CS43130_HP_DC_STAT_2:
-+	case CS43130_HP_AC_STAT_1 ... CS43130_HP_AC_STAT_2:
-+		return true;
-+	default:
-+		return false;
-+	}
-+}
-+
-+static const char * const pcm_spd_texts[] = {
-+	"Fast",
-+	"Slow",
-+};
-+
-+static SOC_ENUM_SINGLE_DECL(pcm_spd_enum, CS43130_PCM_FILT_OPT, 7,
-+			pcm_spd_texts);
-+
-+static const SNDRV_CTL_TLVD_DECLARE_DB_MINMAX(master_tlv, -12750, 0);
-+
-+static const struct snd_kcontrol_new cs43130_controls[] = {
-+	SOC_DOUBLE_R_TLV("Master Playback Volume", CS43130_PCM_VOL_B,
-+			CS43130_PCM_VOL_A, 0, 255, 1, master_tlv),
-+	SOC_DOUBLE("Master Playback Switch", CS43130_PCM_PATH_CTL_1,
-+			0, 1, 1, 1),
-+	SOC_DOUBLE_R_TLV("Digital Playback Volume", CS43130_DSD_VOL_B,
-+			CS43130_DSD_VOL_A, 0, 255, 1, master_tlv),
-+	SOC_DOUBLE("Digital Playback Switch", CS43130_DSD_PATH_CTL_1,
-+			0, 1, 1, 1),
-+	SOC_SINGLE("HV_Enable", CS43130_HP_OUT_CTL_1, 0, 1, 0),
-+	SOC_ENUM("PCM Filter Speed", pcm_spd_enum),
-+	SOC_SINGLE("PCM Phase Compensation", CS43130_PCM_FILT_OPT, 6, 1, 0),
-+	SOC_SINGLE("PCM Nonoversample Emulate", CS43130_PCM_FILT_OPT, 5, 1, 0),
-+	SOC_SINGLE("PCM High-pass Filter", CS43130_PCM_FILT_OPT, 1, 1, 0),
-+	SOC_SINGLE("PCM De-emphasis Filter", CS43130_PCM_FILT_OPT, 0, 1, 0),
-+};
-+
-+static bool cs43130_readable_register(struct device *dev, unsigned int reg)
-+{
-+	switch (reg) {
-+	case CS43130_DEVID_AB ... CS43130_SYS_CLK_CTL_1:
-+	case CS43130_SP_SRATE ... CS43130_PAD_INT_CFG:
-+	case CS43130_PWDN_CTL:
-+	case CS43130_CRYSTAL_SET:
-+	case CS43130_PLL_SET_1 ... CS43130_PLL_SET_5:
-+	case CS43130_PLL_SET_6:
-+	case CS43130_PLL_SET_7:
-+	case CS43130_PLL_SET_8:
-+	case CS43130_PLL_SET_9:
-+	case CS43130_PLL_SET_10:
-+	case CS43130_CLKOUT_CTL:
-+	case CS43130_ASP_NUM_1 ... CS43130_ASP_FRAME_CONF:
-+	case CS43130_XSP_NUM_1 ... CS43130_XSP_FRAME_CONF:
-+	case CS43130_ASP_CH_1_LOC:
-+	case CS43130_ASP_CH_2_LOC:
-+	case CS43130_ASP_CH_1_SZ_EN:
-+	case CS43130_ASP_CH_2_SZ_EN:
-+	case CS43130_XSP_CH_1_LOC:
-+	case CS43130_XSP_CH_2_LOC:
-+	case CS43130_XSP_CH_1_SZ_EN:
-+	case CS43130_XSP_CH_2_SZ_EN:
-+	case CS43130_DSD_VOL_B ... CS43130_DSD_PATH_CTL_3:
-+	case CS43130_HP_OUT_CTL_1:
-+	case CS43130_PCM_FILT_OPT ... CS43130_PCM_PATH_CTL_2:
-+	case CS43130_CLASS_H_CTL:
-+	case CS43130_HP_DETECT:
-+	case CS43130_HP_STATUS:
-+	case CS43130_HP_LOAD_1:
-+	case CS43130_HP_MEAS_LOAD_1:
-+	case CS43130_HP_MEAS_LOAD_2:
-+	case CS43130_HP_DC_STAT_1:
-+	case CS43130_HP_DC_STAT_2:
-+	case CS43130_HP_AC_STAT_1:
-+	case CS43130_HP_AC_STAT_2:
-+	case CS43130_HP_LOAD_STAT:
-+	case CS43130_INT_STATUS_1 ... CS43130_INT_STATUS_5:
-+	case CS43130_INT_MASK_1 ... CS43130_INT_MASK_5:
-+		return true;
-+	default:
-+		return false;
-+	}
-+}
-+static bool cs43130_precious_register(struct device *dev, unsigned int reg)
-+{
-+	switch (reg) {
-+	case CS43130_INT_STATUS_1 ... CS43130_INT_STATUS_5:
-+		return true;
-+	default:
-+		return false;
-+	}
-+}
-+static int cs43130_pcm_pdn(struct snd_soc_component *component)
-+{
-+	struct cs43130_priv *cs43130 =
-+				snd_soc_component_get_drvdata(component);
-+	int ret;
-+	unsigned int reg, pdn_int;
-+
-+	regmap_write(cs43130->regmap, CS43130_DSD_PATH_CTL_2, 0x02);
-+	regmap_update_bits(cs43130->regmap, CS43130_INT_MASK_1,
-+			CS43130_PDN_DONE_INT_MASK, 0);
-+	regmap_update_bits(cs43130->regmap, CS43130_PWDN_CTL,
-+			CS43130_PDN_HP_MASK, 1 << CS43130_PDN_HP_SHIFT);
-+	usleep_range(10, 50);
-+	ret = regmap_read(cs43130->regmap, CS43130_INT_STATUS_1, &reg);
-+	pdn_int = reg & 0xFE;
-+	regmap_update_bits(cs43130->regmap, CS43130_PWDN_CTL,
-+			CS43130_PDN_ASP_MASK, 1 << CS43130_PDN_ASP_SHIFT);
-+	return 0;
-+
-+}
-+static int cs43130_pwr_up_asp_dac(struct snd_soc_component *component)
-+{
-+	struct cs43130_priv *cs43130 =
-+				snd_soc_component_get_drvdata(component);
-+
-+	regmap_update_bits(cs43130->regmap, CS43130_PAD_INT_CFG,
-+			CS43130_ASP_3ST_MASK, 0);
-+	regmap_write(cs43130->regmap, CS43130_DXD1, 0x99);
-+	regmap_write(cs43130->regmap, CS43130_DXD13, 0x20);
-+	regmap_update_bits(cs43130->regmap, CS43130_PWDN_CTL,
-+			CS43130_PDN_ASP_MASK, 0);
-+	regmap_update_bits(cs43130->regmap, CS43130_PWDN_CTL,
-+			CS43130_PDN_HP_MASK, 0);
-+	usleep_range(10000, 12000);
-+	regmap_write(cs43130->regmap, CS43130_DXD1, 0x00);
-+	regmap_write(cs43130->regmap, CS43130_DXD13, 0x00);
-+	return 0;
-+}
-+static int cs43130_change_clksrc(struct snd_soc_component *component,
-+				enum cs43130_mclk_src_sel src)
-+{
-+	int ret;
-+	struct cs43130_priv *cs43130 =
-+				snd_soc_component_get_drvdata(component);
-+	int mclk_int_decoded;
-+
-+	if (src == cs43130->mclk_int_src) {
-+		/* clk source has not changed */
-+		return 0;
-+	}
-+	switch (cs43130->mclk_int) {
-+	case CS43130_MCLK_22M:
-+		mclk_int_decoded = CS43130_MCLK_22P5;
-+		break;
-+	case CS43130_MCLK_24M:
-+		mclk_int_decoded = CS43130_MCLK_24P5;
-+		break;
-+	default:
-+		dev_err(component->dev, "Invalid MCLK INT freq: %u\n",
-+			cs43130->mclk_int);
-+		return -EINVAL;
-+	}
-+
-+	switch (src) {
-+	case CS43130_MCLK_SRC_EXT:
-+		cs43130->pll_bypass = true;
-+		cs43130->mclk_int_src = CS43130_MCLK_SRC_EXT;
-+		if (cs43130->xtal_ibias == CS43130_XTAL_UNUSED) {
-+			regmap_update_bits(cs43130->regmap, CS43130_PWDN_CTL,
-+					CS43130_PDN_XTAL_MASK,
-+					1 << CS43130_PDN_XTAL_SHIFT);
-+		} else {
-+			reinit_completion(&cs43130->xtal_rdy);
-+			regmap_update_bits(cs43130->regmap, CS43130_INT_MASK_1,
-+					CS43130_XTAL_RDY_INT_MASK, 0);
-+			regmap_update_bits(cs43130->regmap, CS43130_PWDN_CTL,
-+					CS43130_PDN_XTAL_MASK, 0);
-+			ret = wait_for_completion_timeout(&cs43130->xtal_rdy,
-+					msecs_to_jiffies(100));
-+			regmap_update_bits(cs43130->regmap, CS43130_INT_MASK_1,
-+					CS43130_XTAL_RDY_INT_MASK,
-+					1 << CS43130_XTAL_RDY_INT_SHIFT);
-+			if (ret == 0) {
-+				dev_err(component->dev, "Timeout waiting for XTAL_READY interrupt\n");
-+				return -ETIMEDOUT;
-+			}
-+		}
-+	regmap_update_bits(cs43130->regmap, CS43130_SYS_CLK_CTL_1,
-+				CS43130_MCLK_SRC_SEL_MASK,
-+				src << CS43130_MCLK_SRC_SEL_SHIFT);
-+	regmap_update_bits(cs43130->regmap, CS43130_SYS_CLK_CTL_1,
-+				CS43130_MCLK_INT_MASK,
-+				mclk_int_decoded << CS43130_MCLK_INT_SHIFT);
-+	usleep_range(150, 200);
-+	regmap_update_bits(cs43130->regmap, CS43130_PWDN_CTL,
-+				CS43130_PDN_PLL_MASK,
-+				1 << CS43130_PDN_PLL_SHIFT);
-+	break;
-+	case CS43130_MCLK_SRC_RCO:
-+		cs43130->mclk_int_src = CS43130_MCLK_SRC_RCO;
-+
-+		regmap_update_bits(cs43130->regmap, CS43130_SYS_CLK_CTL_1,
-+				CS43130_MCLK_SRC_SEL_MASK,
-+				src << CS43130_MCLK_SRC_SEL_SHIFT);
-+		regmap_update_bits(cs43130->regmap, CS43130_SYS_CLK_CTL_1,
-+				CS43130_MCLK_INT_MASK,
-+				CS43130_MCLK_22P5 << CS43130_MCLK_INT_SHIFT);
-+		usleep_range(150, 200);
-+		regmap_update_bits(cs43130->regmap, CS43130_PWDN_CTL,
-+				CS43130_PDN_XTAL_MASK,
-+				1 << CS43130_PDN_XTAL_SHIFT);
-+		regmap_update_bits(cs43130->regmap, CS43130_PWDN_CTL,
-+				CS43130_PDN_PLL_MASK,
-+				1 << CS43130_PDN_PLL_SHIFT);
-+	break;
-+	default:
-+		dev_err(component->dev, "Invalid MCLK source value\n");
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
-+static const struct cs43130_bitwidth_map cs43130_bitwidth_table[] = {
-+	{8,     CS43130_SP_BIT_SIZE_8,  CS43130_CH_BIT_SIZE_8},
-+	{16,    CS43130_SP_BIT_SIZE_16, CS43130_CH_BIT_SIZE_16},
-+	{24,    CS43130_SP_BIT_SIZE_24, CS43130_CH_BIT_SIZE_24},
-+	{32,    CS43130_SP_BIT_SIZE_32, CS43130_CH_BIT_SIZE_32},
-+};
-+
-+static const struct cs43130_bitwidth_map *cs43130_get_bitwidth_table(
-+					unsigned int bitwidth)
-+{
-+	int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(cs43130_bitwidth_table); i++) {
-+		if (cs43130_bitwidth_table[i].bitwidth == bitwidth)
-+			return &cs43130_bitwidth_table[i];
-+	}
-+
-+	return NULL;
-+}
-+static int cs43130_set_bitwidth(int dai_id, unsigned int bitwidth_dai,
-+				struct regmap *regmap)
-+{
-+	const struct cs43130_bitwidth_map *bw_map;
-+
-+	bw_map = cs43130_get_bitwidth_table(bitwidth_dai);
-+	if (!bw_map)
-+		return -EINVAL;
-+
-+	switch (dai_id) {
-+	case CS43130_ASP_PCM_DAI:
-+	case CS43130_ASP_DOP_DAI:
-+		regmap_update_bits(regmap, CS43130_ASP_CH_1_SZ_EN,
-+				CS43130_CH_BITSIZE_MASK, bw_map->ch_bit);
-+		regmap_update_bits(regmap, CS43130_ASP_CH_2_SZ_EN,
-+				CS43130_CH_BITSIZE_MASK, bw_map->ch_bit);
-+		regmap_update_bits(regmap, CS43130_SP_BITSIZE,
-+				CS43130_ASP_BITSIZE_MASK, bw_map->sp_bit);
-+		break;
-+	case CS43130_XSP_DOP_DAI:
-+		regmap_update_bits(regmap, CS43130_XSP_CH_1_SZ_EN,
-+				CS43130_CH_BITSIZE_MASK, bw_map->ch_bit);
-+		regmap_update_bits(regmap, CS43130_XSP_CH_2_SZ_EN,
-+				CS43130_CH_BITSIZE_MASK, bw_map->ch_bit);
-+		regmap_update_bits(regmap, CS43130_SP_BITSIZE,
-+				CS43130_XSP_BITSIZE_MASK, bw_map->sp_bit <<
-+				CS43130_XSP_BITSIZE_SHIFT);
-+	break;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
-+static const struct cs43130_rate_map cs43130_rate_table[] = {
-+	{32000,         CS43130_ASP_SPRATE_32K},
-+	{44100,         CS43130_ASP_SPRATE_44_1K},
-+	{48000,         CS43130_ASP_SPRATE_48K},
-+	{88200,         CS43130_ASP_SPRATE_88_2K},
-+	{96000,         CS43130_ASP_SPRATE_96K},
-+	{176400,        CS43130_ASP_SPRATE_176_4K},
-+	{192000,        CS43130_ASP_SPRATE_192K},
-+	{352800,        CS43130_ASP_SPRATE_352_8K},
-+	{384000,        CS43130_ASP_SPRATE_384K},
-+};
-+
-+static const struct cs43130_rate_map *cs43130_get_rate_table(int fs)
-+{
-+	int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(cs43130_rate_table); i++) {
-+		if (cs43130_rate_table[i].fs == fs)
-+			return &cs43130_rate_table[i];
-+	}
-+
-+	return NULL;
-+}
-+
-+static const struct cs43130_clk_gen *cs43130_get_clk_gen(int mclk_int, int fs,
-+	const struct cs43130_clk_gen *clk_gen_table, int len_clk_gen_table)
-+{
-+	int i;
-+
-+	for (i = 0; i < len_clk_gen_table; i++) {
-+		if (clk_gen_table[i].mclk_int == mclk_int &&
-+					clk_gen_table[i].fs == fs)
-+			return &clk_gen_table[i];
-+	}
-+	return NULL;
-+}
-+
-+static int cs43130_set_sp_fmt(int dai_id, unsigned int bitwidth_sclk,
-+				struct snd_pcm_hw_params *params,
-+				struct cs43130_priv *cs43130)
-+{
-+	u16 frm_size;
-+	u16 hi_size;
-+	u8 frm_delay;
-+	u8 frm_phase;
-+	u8 frm_data;
-+	u8 sclk_edge;
-+	u8 lrck_edge;
-+	u8 clk_data;
-+	u8 loc_ch1;
-+	u8 loc_ch2;
-+	u8 dai_mode_val;
-+	const struct cs43130_clk_gen *clk_gen;
-+
-+	switch (cs43130->dais[dai_id].dai_format) {
-+	case SND_SOC_DAIFMT_I2S:
-+		hi_size = bitwidth_sclk;
-+		frm_delay = 2;
-+		frm_phase = 0;
-+		break;
-+	case SND_SOC_DAIFMT_LEFT_J:
-+		hi_size = bitwidth_sclk;
-+		frm_delay = 2;
-+		frm_phase = 1;
-+		break;
-+	case SND_SOC_DAIFMT_DSP_A:
-+		hi_size = 1;
-+		frm_delay = 2;
-+		frm_phase = 1;
-+		break;
-+	case SND_SOC_DAIFMT_DSP_B:
-+		hi_size = 1;
-+		frm_delay = 0;
-+		frm_phase = 1;
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+	switch (cs43130->dais[dai_id].dai_mode) {
-+	case SND_SOC_DAIFMT_CBS_CFS:
-+		dai_mode_val = 0;
-+		break;
-+	case SND_SOC_DAIFMT_CBM_CFM:
-+		dai_mode_val = 1;
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	frm_size = bitwidth_sclk * params_channels(params);
-+	sclk_edge = 1;
-+	lrck_edge = 0;
-+	loc_ch1 = 0;
-+	loc_ch2 = bitwidth_sclk * (params_channels(params) - 1);
-+
-+	frm_data = frm_delay & CS43130_SP_FSD_MASK;
-+	frm_data |= (frm_phase << CS43130_SP_STP_SHIFT) & CS43130_SP_STP_MASK;
-+
-+	clk_data = lrck_edge & CS43130_SP_LCPOL_IN_MASK;
-+	clk_data |= (lrck_edge << CS43130_SP_LCPOL_OUT_SHIFT) &
-+			CS43130_SP_LCPOL_OUT_MASK;
-+	clk_data |= (sclk_edge << CS43130_SP_SCPOL_IN_SHIFT) &
-+			CS43130_SP_SCPOL_IN_MASK;
-+	clk_data |= (sclk_edge << CS43130_SP_SCPOL_OUT_SHIFT) &
-+			CS43130_SP_SCPOL_OUT_MASK;
-+	clk_data |= (dai_mode_val << CS43130_SP_MODE_SHIFT) &
-+			CS43130_SP_MODE_MASK;
-+	switch (dai_id) {
-+	case CS43130_ASP_PCM_DAI:
-+	case CS43130_ASP_DOP_DAI:
-+		regmap_update_bits(cs43130->regmap, CS43130_ASP_LRCK_PERIOD_1,
-+			CS43130_SP_LCPR_DATA_MASK, (frm_size - 1) >>
-+			CS43130_SP_LCPR_LSB_DATA_SHIFT);
-+		regmap_update_bits(cs43130->regmap, CS43130_ASP_LRCK_PERIOD_2,
-+			CS43130_SP_LCPR_DATA_MASK, (frm_size - 1) >>
-+			CS43130_SP_LCPR_MSB_DATA_SHIFT);
-+		regmap_update_bits(cs43130->regmap, CS43130_ASP_LRCK_HI_TIME_1,
-+			CS43130_SP_LCHI_DATA_MASK, (hi_size - 1) >>
-+			CS43130_SP_LCHI_LSB_DATA_SHIFT);
-+		regmap_update_bits(cs43130->regmap, CS43130_ASP_LRCK_HI_TIME_2,
-+			CS43130_SP_LCHI_DATA_MASK, (hi_size - 1) >>
-+			CS43130_SP_LCHI_MSB_DATA_SHIFT);
-+		regmap_write(cs43130->regmap, CS43130_ASP_FRAME_CONF, frm_data);
-+		regmap_write(cs43130->regmap, CS43130_ASP_CH_1_LOC, loc_ch1);
-+		regmap_write(cs43130->regmap, CS43130_ASP_CH_2_LOC, loc_ch2);
-+		regmap_update_bits(cs43130->regmap, CS43130_ASP_CH_1_SZ_EN,
-+			CS43130_CH_EN_MASK, 1 << CS43130_CH_EN_SHIFT);
-+		regmap_update_bits(cs43130->regmap, CS43130_ASP_CH_2_SZ_EN,
-+			CS43130_CH_EN_MASK, 1 << CS43130_CH_EN_SHIFT);
-+		regmap_write(cs43130->regmap, CS43130_ASP_CLOCK_CONF, clk_data);
-+		break;
-+	case CS43130_XSP_DOP_DAI:
-+		regmap_update_bits(cs43130->regmap, CS43130_XSP_LRCK_PERIOD_1,
-+			CS43130_SP_LCPR_DATA_MASK, (frm_size - 1) >>
-+			CS43130_SP_LCPR_LSB_DATA_SHIFT);
-+		regmap_update_bits(cs43130->regmap, CS43130_XSP_LRCK_PERIOD_2,
-+			CS43130_SP_LCPR_DATA_MASK, (frm_size - 1) >>
-+			CS43130_SP_LCPR_MSB_DATA_SHIFT);
-+		regmap_update_bits(cs43130->regmap, CS43130_XSP_LRCK_HI_TIME_1,
-+			CS43130_SP_LCHI_DATA_MASK, (hi_size - 1) >>
-+			CS43130_SP_LCHI_LSB_DATA_SHIFT);
-+		regmap_update_bits(cs43130->regmap, CS43130_XSP_LRCK_HI_TIME_2,
-+			CS43130_SP_LCHI_DATA_MASK, (hi_size - 1) >>
-+			CS43130_SP_LCHI_MSB_DATA_SHIFT);
-+		regmap_write(cs43130->regmap, CS43130_XSP_FRAME_CONF, frm_data);
-+		regmap_write(cs43130->regmap, CS43130_XSP_CH_1_LOC, loc_ch1);
-+		regmap_write(cs43130->regmap, CS43130_XSP_CH_2_LOC, loc_ch2);
-+		regmap_update_bits(cs43130->regmap, CS43130_XSP_CH_1_SZ_EN,
-+			CS43130_CH_EN_MASK, 1 << CS43130_CH_EN_SHIFT);
-+		regmap_update_bits(cs43130->regmap, CS43130_XSP_CH_2_SZ_EN,
-+			CS43130_CH_EN_MASK, 1 << CS43130_CH_EN_SHIFT);
-+		regmap_write(cs43130->regmap, CS43130_XSP_CLOCK_CONF, clk_data);
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+	switch (frm_size) {
-+	case 16:
-+		clk_gen = cs43130_get_clk_gen(cs43130->mclk_int,
-+						params_rate(params),
-+						cs43130_16_clk_gen,
-+						ARRAY_SIZE(cs43130_16_clk_gen));
-+		break;
-+	case 32:
-+		clk_gen = cs43130_get_clk_gen(cs43130->mclk_int,
-+						params_rate(params),
-+						cs43130_32_clk_gen,
-+						ARRAY_SIZE(cs43130_32_clk_gen));
-+		break;
-+	case 48:
-+		clk_gen = cs43130_get_clk_gen(cs43130->mclk_int,
-+						params_rate(params),
-+						cs43130_48_clk_gen,
-+						ARRAY_SIZE(cs43130_48_clk_gen));
-+		break;
-+	case 64:
-+		clk_gen = cs43130_get_clk_gen(cs43130->mclk_int,
-+						params_rate(params),
-+						cs43130_64_clk_gen,
-+						ARRAY_SIZE(cs43130_64_clk_gen));
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+	if (!clk_gen)
-+		return -EINVAL;
-+	switch (dai_id) {
-+	case CS43130_ASP_PCM_DAI:
-+	case CS43130_ASP_DOP_DAI:
-+		regmap_write(cs43130->regmap, CS43130_ASP_DEN_1,
-+				(clk_gen->v.denominator & CS43130_SP_M_LSB_DATA_MASK) >>
-+				CS43130_SP_M_LSB_DATA_SHIFT);
-+		regmap_write(cs43130->regmap, CS43130_ASP_DEN_2,
-+				(clk_gen->v.denominator & CS43130_SP_M_MSB_DATA_MASK) >>
-+				CS43130_SP_M_MSB_DATA_SHIFT);
-+		regmap_write(cs43130->regmap, CS43130_ASP_NUM_1,
-+				(clk_gen->v.numerator & CS43130_SP_N_LSB_DATA_MASK) >>
-+				CS43130_SP_N_LSB_DATA_SHIFT);
-+		regmap_write(cs43130->regmap, CS43130_ASP_NUM_2,
-+				(clk_gen->v.numerator & CS43130_SP_N_MSB_DATA_MASK) >>
-+				CS43130_SP_N_MSB_DATA_SHIFT);
-+		break;
-+	case CS43130_XSP_DOP_DAI:
-+		regmap_write(cs43130->regmap, CS43130_XSP_DEN_1,
-+				(clk_gen->v.denominator & CS43130_SP_M_LSB_DATA_MASK) >>
-+				CS43130_SP_M_LSB_DATA_SHIFT);
-+		regmap_write(cs43130->regmap, CS43130_XSP_DEN_2,
-+				(clk_gen->v.denominator & CS43130_SP_M_MSB_DATA_MASK) >>
-+				CS43130_SP_M_MSB_DATA_SHIFT);
-+		regmap_write(cs43130->regmap, CS43130_XSP_NUM_1,
-+				(clk_gen->v.numerator & CS43130_SP_N_LSB_DATA_MASK) >>
-+				CS43130_SP_N_LSB_DATA_SHIFT);
-+		regmap_write(cs43130->regmap, CS43130_XSP_NUM_2,
-+				(clk_gen->v.numerator & CS43130_SP_N_MSB_DATA_MASK) >>
-+				CS43130_SP_N_MSB_DATA_SHIFT);
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+	return 0;
-+}
-+
-+static int cs43130_hw_params(struct snd_pcm_substream *substream,
-+				struct snd_pcm_hw_params *params,
-+				struct snd_soc_dai *dai)
-+{
-+	struct snd_soc_component *component = dai->component;
-+	struct cs43130_priv *cs43130 =
-+				snd_soc_component_get_drvdata(component);
-+	const struct cs43130_rate_map *rate_map;
-+	unsigned int sclk = cs43130->dais[dai->id].sclk;
-+	unsigned int bitwidth_sclk;
-+	unsigned int bitwidth_dai = (unsigned int)(params_width(params));
-+	unsigned int dop_rate = (unsigned int)(params_rate(params));
-+	unsigned int required_clk, ret;
-+	u8 dsd_speed;
-+
-+	cs43130->pll_bypass = true;
-+	cs43130_pcm_pdn(component);
-+	mutex_lock(&cs43130->clk_mutex);
-+	if (!cs43130->clk_req) {
-+		/* no DAI is currently using clk */
-+		if (!(CS43130_MCLK_22M % params_rate(params))) {
-+			required_clk = CS43130_MCLK_22M;
-+			cs43130->mclk_int =  CS43130_MCLK_22M;
-+			gpiod_set_value_cansleep(snd_allo_clk44gpio, 1);
-+			gpiod_set_value_cansleep(snd_allo_clk48gpio, 0);
-+			usleep_range(13500, 14000);
-+		} else {
-+			required_clk = CS43130_MCLK_24M;
-+			cs43130->mclk_int =  CS43130_MCLK_24M;
-+			gpiod_set_value_cansleep(snd_allo_clk48gpio, 1);
-+			gpiod_set_value_cansleep(snd_allo_clk44gpio, 0);
-+			usleep_range(13500, 14000);
-+		}
-+		if (cs43130->pll_bypass)
-+			cs43130_change_clksrc(component, CS43130_MCLK_SRC_EXT);
-+		else
-+			cs43130_change_clksrc(component, CS43130_MCLK_SRC_PLL);
-+	}
-+
-+	cs43130->clk_req++;
-+	mutex_unlock(&cs43130->clk_mutex);
-+
-+	switch (dai->id) {
-+	case CS43130_ASP_DOP_DAI:
-+	case CS43130_XSP_DOP_DAI:
-+		/* DoP bitwidth is always 24-bit */
-+		bitwidth_dai = 24;
-+		sclk = params_rate(params) * bitwidth_dai *
-+				params_channels(params);
-+
-+		switch (params_rate(params)) {
-+		case 176400:
-+			dsd_speed = 0;
-+			break;
-+		case 352800:
-+			dsd_speed = 1;
-+			break;
-+		default:
-+			dev_err(component->dev, "Rate(%u) not supported\n",
-+				params_rate(params));
-+			return -EINVAL;
-+		}
-+
-+		regmap_update_bits(cs43130->regmap, CS43130_DSD_PATH_CTL_2,
-+					CS43130_DSD_SPEED_MASK,
-+					dsd_speed << CS43130_DSD_SPEED_SHIFT);
-+		break;
-+	case CS43130_ASP_PCM_DAI:
-+		rate_map = cs43130_get_rate_table(params_rate(params));
-+		if (!rate_map)
-+			return -EINVAL;
-+
-+		regmap_write(cs43130->regmap, CS43130_SP_SRATE, rate_map->val);
-+		if ((dop_rate == 176400) && (bitwidth_dai == 24)) {
-+			dsd_speed = 0;
-+			regmap_update_bits(cs43130->regmap,
-+					CS43130_DSD_PATH_CTL_2,
-+					CS43130_DSD_SPEED_MASK,
-+					dsd_speed << CS43130_DSD_SPEED_SHIFT);
-+			regmap_update_bits(cs43130->regmap,
-+					CS43130_DSD_PATH_CTL_2,
-+					CS43130_DSD_SRC_MASK,
-+					CS43130_DSD_SRC_ASP <<
-+					CS43130_DSD_SRC_SHIFT);
-+			regmap_update_bits(cs43130->regmap,
-+					CS43130_DSD_PATH_CTL_2,
-+					CS43130_DSD_EN_MASK, 0x01 <<
-+					CS43130_DSD_EN_SHIFT);
-+		}
-+		break;
-+	default:
-+		dev_err(component->dev, "Invalid DAI (%d)\n", dai->id);
-+		return -EINVAL;
-+	}
-+
-+	switch (dai->id) {
-+	case CS43130_ASP_DOP_DAI:
-+		regmap_update_bits(cs43130->regmap, CS43130_DSD_PATH_CTL_2,
-+				CS43130_DSD_SRC_MASK, CS43130_DSD_SRC_ASP <<
-+				CS43130_DSD_SRC_SHIFT);
-+		regmap_update_bits(cs43130->regmap, CS43130_DSD_PATH_CTL_2,
-+				CS43130_DSD_EN_MASK, 0x01 <<
-+				CS43130_DSD_EN_SHIFT);
-+		break;
-+	case CS43130_XSP_DOP_DAI:
-+		regmap_update_bits(cs43130->regmap, CS43130_DSD_PATH_CTL_2,
-+				CS43130_DSD_SRC_MASK, CS43130_DSD_SRC_XSP <<
-+				CS43130_DSD_SRC_SHIFT);
-+		break;
-+	}
-+	if (!sclk && cs43130->dais[dai->id].dai_mode ==
-+						SND_SOC_DAIFMT_CBM_CFM) {
-+		/* Calculate SCLK in master mode if unassigned */
-+		sclk = params_rate(params) * bitwidth_dai *
-+				params_channels(params);
-+	}
-+	if (!sclk) {
-+		/* at this point, SCLK must be set */
-+		dev_err(component->dev, "SCLK freq is not set\n");
-+		return -EINVAL;
-+	}
-+
-+	bitwidth_sclk = (sclk / params_rate(params)) / params_channels(params);
-+	if (bitwidth_sclk < bitwidth_dai) {
-+		dev_err(component->dev, "Format not supported: SCLK freq is too low\n");
-+		return -EINVAL;
-+	}
-+
-+	dev_dbg(component->dev,
-+		"sclk = %u, fs = %d, bitwidth_dai = %u\n",
-+		sclk, params_rate(params), bitwidth_dai);
-+
-+	dev_dbg(component->dev,
-+		"bitwidth_sclk = %u, num_ch = %u\n",
-+		bitwidth_sclk, params_channels(params));
-+
-+	cs43130_set_bitwidth(dai->id, bitwidth_dai, cs43130->regmap);
-+	cs43130_set_sp_fmt(dai->id, bitwidth_sclk, params, cs43130);
-+	ret = cs43130_pwr_up_asp_dac(component);
-+	return 0;
-+}
-+
-+static int cs43130_hw_free(struct snd_pcm_substream *substream,
-+					struct snd_soc_dai *dai)
-+{
-+	struct snd_soc_component *component = dai->component;
-+	struct cs43130_priv *cs43130 =
-+				snd_soc_component_get_drvdata(component);
-+
-+	mutex_lock(&cs43130->clk_mutex);
-+	cs43130->clk_req--;
-+	if (!cs43130->clk_req) {
-+		/* no DAI is currently using clk */
-+		cs43130_change_clksrc(component, CS43130_MCLK_SRC_RCO);
-+		cs43130_pcm_pdn(component);
-+	}
-+	mutex_unlock(&cs43130->clk_mutex);
-+
-+	return 0;
-+}
-+
-+static const unsigned int cs43130_asp_src_rates[] = {
-+	32000, 44100, 48000, 88200, 96000, 176400, 192000
-+};
-+
-+static const struct snd_pcm_hw_constraint_list cs43130_asp_constraints = {
-+	.count  = ARRAY_SIZE(cs43130_asp_src_rates),
-+	.list   = cs43130_asp_src_rates,
-+};
-+
-+static int cs43130_pcm_startup(struct snd_pcm_substream *substream,
-+					struct snd_soc_dai *dai)
-+{
-+	return snd_pcm_hw_constraint_list(substream->runtime, 0,
-+					SNDRV_PCM_HW_PARAM_RATE,
-+					&cs43130_asp_constraints);
-+}
-+
-+static int cs43130_pcm_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
-+{
-+	struct snd_soc_component *component = codec_dai->component;
-+	struct cs43130_priv *cs43130 =
-+				snd_soc_component_get_drvdata(component);
-+
-+	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-+	case SND_SOC_DAIFMT_CBS_CFS:
-+		cs43130->dais[codec_dai->id].dai_mode = SND_SOC_DAIFMT_CBS_CFS;
-+		break;
-+	case SND_SOC_DAIFMT_CBM_CFM:
-+		cs43130->dais[codec_dai->id].dai_mode = SND_SOC_DAIFMT_CBM_CFM;
-+		break;
-+	default:
-+		dev_err(component->dev, "unsupported mode\n");
-+		return -EINVAL;
-+	}
-+
-+	switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
-+	case SND_SOC_DAIFMT_I2S:
-+		cs43130->dais[codec_dai->id].dai_format = SND_SOC_DAIFMT_I2S;
-+		break;
-+	case SND_SOC_DAIFMT_LEFT_J:
-+		cs43130->dais[codec_dai->id].dai_format = SND_SOC_DAIFMT_LEFT_J;
-+		break;
-+	default:
-+		dev_err(component->dev,
-+			"unsupported audio format\n");
-+		return -EINVAL;
-+	}
-+
-+	dev_dbg(component->dev, "dai_id = %d,  dai_mode = %u, dai_format = %u\n",
-+			codec_dai->id,
-+			cs43130->dais[codec_dai->id].dai_mode,
-+			cs43130->dais[codec_dai->id].dai_format);
-+
-+	return 0;
-+}
-+
-+static int cs43130_set_sysclk(struct snd_soc_dai *codec_dai,
-+					int clk_id, unsigned int freq, int dir)
-+{
-+	struct snd_soc_component *component = codec_dai->component;
-+	struct cs43130_priv *cs43130 =
-+				snd_soc_component_get_drvdata(component);
-+
-+	cs43130->dais[codec_dai->id].sclk = freq;
-+	dev_dbg(component->dev, "dai_id = %d,  sclk = %u\n", codec_dai->id,
-+				cs43130->dais[codec_dai->id].sclk);
-+
-+	return 0;
-+}
-+
-+static int cs43130_component_set_sysclk(struct snd_soc_component *component,
-+					int clk_id, int source,
-+					unsigned int freq, int dir)
-+{
-+	struct cs43130_priv *cs43130 =
-+				snd_soc_component_get_drvdata(component);
-+
-+	dev_dbg(component->dev, "clk_id = %d, source = %d, freq = %d, dir = %d\n",
-+		clk_id, source, freq, dir);
-+
-+	switch (freq) {
-+	case CS43130_MCLK_22M:
-+	case CS43130_MCLK_24M:
-+		cs43130->mclk = freq;
-+		break;
-+	default:
-+		dev_err(component->dev, "Invalid MCLK INT freq: %u\n", freq);
-+		return -EINVAL;
-+	}
-+
-+	if (source == CS43130_MCLK_SRC_EXT) {
-+		cs43130->pll_bypass = true;
-+	} else {
-+		dev_err(component->dev, "Invalid MCLK source\n");
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
-+static u16 const cs43130_ac_freq[CS43130_AC_FREQ] = {
-+	24,
-+	43,
-+	93,
-+	200,
-+	431,
-+	928,
-+	2000,
-+	4309,
-+	9283,
-+	20000,
-+};
-+static const struct snd_soc_dai_ops cs43130_dai_ops = {
-+	.startup        = cs43130_pcm_startup,
-+	.hw_params	= cs43130_hw_params,
-+	.hw_free        = cs43130_hw_free,
-+	.set_sysclk     = cs43130_set_sysclk,
-+	.set_fmt        = cs43130_pcm_set_fmt,
-+};
-+
-+static struct snd_soc_dai_driver cs43130_codec_dai = {
-+	.name = "allo-cs43130",
-+	.playback = {
-+		.stream_name = "Playback",
-+		.channels_min = 2,
-+		.channels_max = 2,
-+		.rates = SNDRV_PCM_RATE_CONTINUOUS,
-+		.rate_min = 44100,
-+		.rate_max = 192000,
-+		.formats = SNDRV_PCM_FMTBIT_S16_LE |
-+			SNDRV_PCM_FMTBIT_S24_LE |
-+			SNDRV_PCM_FMTBIT_S32_LE
-+
-+	},
-+	.ops = &cs43130_dai_ops,
-+};
-+
-+static struct snd_soc_component_driver cs43130_component_driver = {
-+	.idle_bias_on           = true,
-+	.controls		= cs43130_controls,
-+	.num_controls		= ARRAY_SIZE(cs43130_controls),
-+	.set_sysclk             = cs43130_component_set_sysclk,
-+	.idle_bias_on           = 1,
-+	.use_pmdown_time        = 1,
-+	.endianness             = 1,
-+};
-+
-+static const struct regmap_config cs43130_regmap = {
-+	.reg_bits               = 24,
-+	.pad_bits               = 8,
-+	.val_bits               = 8,
-+
-+	.max_register           = CS43130_LASTREG,
-+	.reg_defaults           = cs43130_reg_defaults,
-+	.num_reg_defaults       = ARRAY_SIZE(cs43130_reg_defaults),
-+	.readable_reg           = cs43130_readable_register,
-+	.precious_reg           = cs43130_precious_register,
-+	.volatile_reg           = cs43130_volatile_register,
-+	.cache_type             = REGCACHE_RBTREE,
-+	/* needed for regcache_sync */
-+	.use_single_read        = true,
-+	.use_single_write       = true,
-+};
-+
-+static u16 const cs43130_dc_threshold[CS43130_DC_THRESHOLD] = {
-+	50,
-+	120,
-+};
-+
-+static int cs43130_handle_device_data(struct i2c_client *i2c_client,
-+					struct cs43130_priv *cs43130)
-+{
-+	struct device_node *np = i2c_client->dev.of_node;
-+	unsigned int val;
-+	int i;
-+
-+	if (of_property_read_u32(np, "cirrus,xtal-ibias", &val) < 0) {
-+	/* Crystal is unused. System clock is used for external MCLK */
-+		cs43130->xtal_ibias = CS43130_XTAL_UNUSED;
-+		return 0;
-+	}
-+
-+	switch (val) {
-+	case 1:
-+		cs43130->xtal_ibias = CS43130_XTAL_IBIAS_7_5UA;
-+		break;
-+	case 2:
-+		cs43130->xtal_ibias = CS43130_XTAL_IBIAS_12_5UA;
-+		break;
-+	case 3:
-+		cs43130->xtal_ibias = CS43130_XTAL_IBIAS_15UA;
-+		break;
-+	default:
-+		dev_err(&i2c_client->dev,
-+			"Invalid cirrus,xtal-ibias value: %d\n", val);
-+		return -EINVAL;
-+	}
-+
-+	cs43130->dc_meas = of_property_read_bool(np, "cirrus,dc-measure");
-+	cs43130->ac_meas = of_property_read_bool(np, "cirrus,ac-measure");
-+
-+	if (of_property_read_u16_array(np, "cirrus,ac-freq", cs43130->ac_freq,
-+					CS43130_AC_FREQ) < 0) {
-+		for (i = 0; i < CS43130_AC_FREQ; i++)
-+			cs43130->ac_freq[i] = cs43130_ac_freq[i];
-+	}
-+
-+	if (of_property_read_u16_array(np, "cirrus,dc-threshold",
-+					cs43130->dc_threshold,
-+					CS43130_DC_THRESHOLD) < 0) {
-+		for (i = 0; i < CS43130_DC_THRESHOLD; i++)
-+			cs43130->dc_threshold[i] = cs43130_dc_threshold[i];
-+	}
-+
-+	return 0;
-+}
-+
-+
-+static int allo_cs43130_component_probe(struct i2c_client *i2c,
-+			     const struct i2c_device_id *id)
-+{
-+	struct regmap *regmap;
-+	struct regmap_config config = cs43130_regmap;
-+	struct device *dev = &i2c->dev;
-+	struct cs43130_priv *cs43130;
-+	unsigned int devid = 0;
-+	unsigned int reg;
-+	int ret;
-+
-+	regmap = devm_regmap_init_i2c(i2c, &config);
-+	if (IS_ERR(regmap))
-+		return PTR_ERR(regmap);
-+
-+	cs43130 = devm_kzalloc(dev, sizeof(struct cs43130_priv),
-+					GFP_KERNEL);
-+	if (!cs43130)
-+		return -ENOMEM;
-+
-+	dev_set_drvdata(dev, cs43130);
-+	cs43130->regmap = regmap;
-+
-+	if (i2c->dev.of_node) {
-+		ret = cs43130_handle_device_data(i2c, cs43130);
-+		if (ret != 0)
-+			return ret;
-+	}
-+	usleep_range(2000, 2050);
-+
-+	ret = regmap_read(cs43130->regmap, CS43130_DEVID_AB, &reg);
-+	devid = (reg & 0xFF) << 12;
-+	ret = regmap_read(cs43130->regmap, CS43130_DEVID_CD, &reg);
-+	devid |= (reg & 0xFF) << 4;
-+	ret = regmap_read(cs43130->regmap, CS43130_DEVID_E, &reg);
-+	devid |= (reg & 0xF0) >> 4;
-+	if (devid != CS43198_CHIP_ID) {
-+		dev_err(dev, "Failed to read Chip or wrong Chip id: %d\n", ret);
-+		return ret;
-+	}
-+
-+	cs43130->mclk_int_src = CS43130_MCLK_SRC_RCO;
-+	msleep(20);
-+
-+	ret = snd_soc_register_component(dev, &cs43130_component_driver,
-+				    &cs43130_codec_dai, 1);
-+	if (ret != 0) {
-+		dev_err(dev, "failed to register codec: %d\n", ret);
-+		return ret;
-+	}
-+	regmap_update_bits(cs43130->regmap, CS43130_PAD_INT_CFG,
-+			CS43130_ASP_3ST_MASK, 0);
-+	regmap_update_bits(cs43130->regmap, CS43130_PAD_INT_CFG,
-+			CS43130_XSP_3ST_MASK, 1);
-+	regmap_update_bits(cs43130->regmap, CS43130_PWDN_CTL,
-+			CS43130_PDN_HP_MASK, 1 << CS43130_PDN_HP_SHIFT);
-+	msleep(20);
-+	regmap_write(cs43130->regmap, CS43130_CLASS_H_CTL, 0x06);
-+	snd_allo_clk44gpio = devm_gpiod_get(dev, "clock44", GPIOD_OUT_HIGH);
-+	if (IS_ERR(snd_allo_clk44gpio))
-+		dev_err(dev, "devm_gpiod_get() failed\n");
-+
-+	snd_allo_clk48gpio = devm_gpiod_get(dev, "clock48", GPIOD_OUT_LOW);
-+	if (IS_ERR(snd_allo_clk48gpio))
-+		dev_err(dev, "devm_gpiod_get() failed\n");
-+
-+	return 0;
-+}
-+
-+static void allo_cs43130_component_remove(struct i2c_client *i2c)
-+{
-+	snd_soc_unregister_component(&i2c->dev);
-+}
-+
-+static const struct i2c_device_id allo_cs43130_component_id[] = {
-+	{ "allo-cs43198", },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(i2c, allo_cs43130_component_id);
-+
-+static const struct of_device_id allo_cs43130_codec_of_match[] = {
-+	{ .compatible = "allo,allo-cs43198", },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(of, allo_cs43130_codec_of_match);
-+
-+static struct i2c_driver allo_cs43130_component_driver = {
-+	.probe		= allo_cs43130_component_probe,
-+	.remove		= allo_cs43130_component_remove,
-+	.id_table	= allo_cs43130_component_id,
-+	.driver		= {
-+	.name		= "allo-cs43198",
-+	.of_match_table = allo_cs43130_codec_of_match,
-+	},
-+};
-+
-+module_i2c_driver(allo_cs43130_component_driver);
-+
-+MODULE_DESCRIPTION("ASoC Allo Boss2 Codec Driver");
-+MODULE_AUTHOR("Sudeepkumar <sudeepkumar@cem-solutions.net>");
-+MODULE_LICENSE("GPL v2");
---- /dev/null
-+++ b/sound/soc/bcm/allo-katana-codec.c
-@@ -0,0 +1,387 @@
-+/*
-+ * Driver for the ALLO KATANA CODEC
-+ *
-+ * Author: Jaikumar <jaikumar@cem-solutions.net>
-+ *		Copyright 2018
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+
-+#include <linux/init.h>
-+#include <linux/module.h>
-+#include <linux/clk.h>
-+#include <linux/kernel.h>
-+#include <linux/regmap.h>
-+#include <linux/regulator/consumer.h>
-+#include <linux/gcd.h>
-+#include <sound/soc.h>
-+#include <sound/soc-dapm.h>
-+#include <sound/pcm_params.h>
-+#include <sound/tlv.h>
-+#include <linux/i2c.h>
-+
-+
-+#define KATANA_CODEC_CHIP_ID		0x30
-+#define KATANA_CODEC_VIRT_BASE		0x100
-+#define KATANA_CODEC_PAGE		0
-+
-+#define KATANA_CODEC_CHIP_ID_REG	(KATANA_CODEC_VIRT_BASE + 0)
-+#define KATANA_CODEC_RESET		(KATANA_CODEC_VIRT_BASE + 1)
-+#define KATANA_CODEC_VOLUME_1		(KATANA_CODEC_VIRT_BASE + 2)
-+#define KATANA_CODEC_VOLUME_2		(KATANA_CODEC_VIRT_BASE + 3)
-+#define KATANA_CODEC_MUTE		(KATANA_CODEC_VIRT_BASE + 4)
-+#define KATANA_CODEC_DSP_PROGRAM	(KATANA_CODEC_VIRT_BASE + 5)
-+#define KATANA_CODEC_DEEMPHASIS		(KATANA_CODEC_VIRT_BASE + 6)
-+#define KATANA_CODEC_DOP		(KATANA_CODEC_VIRT_BASE + 7)
-+#define KATANA_CODEC_FORMAT		(KATANA_CODEC_VIRT_BASE + 8)
-+#define KATANA_CODEC_COMMAND		(KATANA_CODEC_VIRT_BASE + 9)
-+#define KATANA_CODEC_MUTE_STREAM	(KATANA_CODEC_VIRT_BASE + 10)
-+
-+#define KATANA_CODEC_MAX_REGISTER	(KATANA_CODEC_VIRT_BASE + 10)
-+
-+#define KATANA_CODEC_FMT		0xff
-+#define KATANA_CODEC_CHAN_MONO		0x00
-+#define KATANA_CODEC_CHAN_STEREO	0x80
-+#define KATANA_CODEC_ALEN_16		0x10
-+#define KATANA_CODEC_ALEN_24		0x20
-+#define KATANA_CODEC_ALEN_32		0x30
-+#define KATANA_CODEC_RATE_11025		0x01
-+#define KATANA_CODEC_RATE_22050		0x02
-+#define KATANA_CODEC_RATE_32000		0x03
-+#define KATANA_CODEC_RATE_44100		0x04
-+#define KATANA_CODEC_RATE_48000		0x05
-+#define KATANA_CODEC_RATE_88200		0x06
-+#define KATANA_CODEC_RATE_96000		0x07
-+#define KATANA_CODEC_RATE_176400	0x08
-+#define KATANA_CODEC_RATE_192000	0x09
-+#define KATANA_CODEC_RATE_352800	0x0a
-+#define KATANA_CODEC_RATE_384000	0x0b
-+
-+
-+struct katana_codec_priv {
-+	struct regmap *regmap;
-+	int fmt;
-+};
-+
-+static const struct reg_default katana_codec_reg_defaults[] = {
-+	{ KATANA_CODEC_RESET,		0x00 },
-+	{ KATANA_CODEC_VOLUME_1,	0xF0 },
-+	{ KATANA_CODEC_VOLUME_2,	0xF0 },
-+	{ KATANA_CODEC_MUTE,		0x00 },
-+	{ KATANA_CODEC_DSP_PROGRAM,	0x04 },
-+	{ KATANA_CODEC_DEEMPHASIS,	0x00 },
-+	{ KATANA_CODEC_DOP,		0x00 },
-+	{ KATANA_CODEC_FORMAT,		0xb4 },
-+};
-+
-+static const char * const katana_codec_dsp_program_texts[] = {
-+	"Linear Phase Fast Roll-off Filter",
-+	"Linear Phase Slow Roll-off Filter",
-+	"Minimum Phase Fast Roll-off Filter",
-+	"Minimum Phase Slow Roll-off Filter",
-+	"Apodizing Fast Roll-off Filter",
-+	"Corrected Minimum Phase Fast Roll-off Filter",
-+	"Brick Wall Filter",
-+};
-+
-+static const unsigned int katana_codec_dsp_program_values[] = {
-+	0,
-+	1,
-+	2,
-+	3,
-+	4,
-+	6,
-+	7,
-+};
-+
-+static SOC_VALUE_ENUM_SINGLE_DECL(katana_codec_dsp_program,
-+				  KATANA_CODEC_DSP_PROGRAM, 0, 0x07,
-+				  katana_codec_dsp_program_texts,
-+				  katana_codec_dsp_program_values);
-+
-+static const char * const katana_codec_deemphasis_texts[] = {
-+	"Bypass",
-+	"32kHz",
-+	"44.1kHz",
-+	"48kHz",
-+};
-+
-+static const unsigned int katana_codec_deemphasis_values[] = {
-+	0,
-+	1,
-+	2,
-+	3,
-+};
-+
-+static SOC_VALUE_ENUM_SINGLE_DECL(katana_codec_deemphasis,
-+				  KATANA_CODEC_DEEMPHASIS, 0, 0x03,
-+				  katana_codec_deemphasis_texts,
-+				  katana_codec_deemphasis_values);
-+
-+static const SNDRV_CTL_TLVD_DECLARE_DB_MINMAX(master_tlv, -12750, 0);
-+
-+static const struct snd_kcontrol_new katana_codec_controls[] = {
-+	SOC_DOUBLE_R_TLV("Master Playback Volume", KATANA_CODEC_VOLUME_1,
-+			KATANA_CODEC_VOLUME_2, 0, 255, 1, master_tlv),
-+	SOC_DOUBLE("Master Playback Switch", KATANA_CODEC_MUTE, 0, 0, 1, 1),
-+	SOC_ENUM("DSP Program Route", katana_codec_dsp_program),
-+	SOC_ENUM("Deemphasis Route", katana_codec_deemphasis),
-+	SOC_SINGLE("DoP Playback Switch", KATANA_CODEC_DOP, 0, 1, 1)
-+};
-+
-+static bool katana_codec_readable_register(struct device *dev,
-+				unsigned int reg)
-+{
-+	switch (reg) {
-+	case KATANA_CODEC_CHIP_ID_REG:
-+		return true;
-+	default:
-+		return reg < 0xff;
-+	}
-+}
-+
-+static int katana_codec_hw_params(struct snd_pcm_substream *substream,
-+			     struct snd_pcm_hw_params *params,
-+			     struct snd_soc_dai *dai)
-+{
-+	struct snd_soc_component *component = dai->component;
-+	struct katana_codec_priv *katana_codec =
-+		snd_soc_component_get_drvdata(component);
-+	int fmt = 0;
-+	int ret;
-+
-+	dev_dbg(component->card->dev, "hw_params %u Hz, %u channels, %u bits\n",
-+			params_rate(params),
-+			params_channels(params),
-+			params_width(params));
-+
-+	switch (katana_codec->fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-+	case SND_SOC_DAIFMT_CBM_CFM: // master
-+		if (params_channels(params) == 2)
-+			fmt = KATANA_CODEC_CHAN_STEREO;
-+		else
-+			fmt = KATANA_CODEC_CHAN_MONO;
-+
-+		switch (params_width(params)) {
-+		case 16:
-+			fmt |= KATANA_CODEC_ALEN_16;
-+			break;
-+		case 24:
-+			fmt |= KATANA_CODEC_ALEN_24;
-+			break;
-+		case 32:
-+			fmt |= KATANA_CODEC_ALEN_32;
-+			break;
-+		default:
-+			dev_err(component->card->dev, "Bad frame size: %d\n",
-+					params_width(params));
-+			return -EINVAL;
-+		}
-+
-+		switch (params_rate(params)) {
-+		case 44100:
-+			fmt |= KATANA_CODEC_RATE_44100;
-+			break;
-+		case 48000:
-+			fmt |= KATANA_CODEC_RATE_48000;
-+			break;
-+		case 88200:
-+			fmt |= KATANA_CODEC_RATE_88200;
-+			break;
-+		case 96000:
-+			fmt |= KATANA_CODEC_RATE_96000;
-+			break;
-+		case 176400:
-+			fmt |= KATANA_CODEC_RATE_176400;
-+			break;
-+		case 192000:
-+			fmt |= KATANA_CODEC_RATE_192000;
-+			break;
-+		case 352800:
-+			fmt |= KATANA_CODEC_RATE_352800;
-+			break;
-+		case 384000:
-+			fmt |= KATANA_CODEC_RATE_384000;
-+			break;
-+		default:
-+			dev_err(component->card->dev, "Bad sample rate: %d\n",
-+					params_rate(params));
-+			return -EINVAL;
-+		}
-+
-+		ret = regmap_write(katana_codec->regmap, KATANA_CODEC_FORMAT,
-+					fmt);
-+		if (ret != 0) {
-+			dev_err(component->card->dev, "Failed to set format: %d\n", ret);
-+			return ret;
-+		}
-+		break;
-+
-+	case SND_SOC_DAIFMT_CBS_CFS:
-+		break;
-+
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
-+
-+static int katana_codec_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
-+{
-+	struct snd_soc_component *component = dai->component;
-+	struct katana_codec_priv *katana_codec =
-+		snd_soc_component_get_drvdata(component);
-+
-+	katana_codec->fmt = fmt;
-+
-+	return 0;
-+}
-+
-+int katana_codec_dai_mute_stream(struct snd_soc_dai *dai, int mute,
-+						int stream)
-+{
-+	struct snd_soc_component *component = dai->component;
-+	struct katana_codec_priv *katana_codec =
-+		snd_soc_component_get_drvdata(component);
-+	int ret = 0;
-+
-+	ret = regmap_write(katana_codec->regmap, KATANA_CODEC_MUTE_STREAM,
-+				mute);
-+	if (ret != 0) {
-+		dev_err(component->card->dev, "Failed to set mute: %d\n", ret);
-+		return ret;
-+	}
-+	return ret;
-+}
-+
-+static const struct snd_soc_dai_ops katana_codec_dai_ops = {
-+	.mute_stream = katana_codec_dai_mute_stream,
-+	.hw_params = katana_codec_hw_params,
-+	.set_fmt = katana_codec_set_fmt,
-+};
-+
-+static struct snd_soc_dai_driver katana_codec_dai = {
-+	.name = "allo-katana-codec",
-+	.playback = {
-+		.stream_name = "Playback",
-+		.channels_min = 2,
-+		.channels_max = 2,
-+		.rates = SNDRV_PCM_RATE_CONTINUOUS,
-+		.rate_min = 44100,
-+		.rate_max = 384000,
-+		.formats = SNDRV_PCM_FMTBIT_S16_LE |
-+			SNDRV_PCM_FMTBIT_S32_LE
-+	},
-+	.ops = &katana_codec_dai_ops,
-+};
-+
-+static struct snd_soc_component_driver katana_codec_component_driver = {
-+	.idle_bias_on = true,
-+
-+	.controls		= katana_codec_controls,
-+	.num_controls	= ARRAY_SIZE(katana_codec_controls),
-+};
-+
-+static const struct regmap_range_cfg katana_codec_range = {
-+	.name = "Pages", .range_min = KATANA_CODEC_VIRT_BASE,
-+	.range_max = KATANA_CODEC_MAX_REGISTER,
-+	.selector_reg = KATANA_CODEC_PAGE,
-+	.selector_mask = 0xff,
-+	.window_start = 0, .window_len = 0x100,
-+};
-+
-+const struct regmap_config katana_codec_regmap = {
-+	.reg_bits = 8,
-+	.val_bits = 8,
-+
-+	.ranges = &katana_codec_range,
-+	.num_ranges = 1,
-+
-+	.max_register = KATANA_CODEC_MAX_REGISTER,
-+	.readable_reg = katana_codec_readable_register,
-+	.reg_defaults = katana_codec_reg_defaults,
-+	.num_reg_defaults = ARRAY_SIZE(katana_codec_reg_defaults),
-+	.cache_type = REGCACHE_RBTREE,
-+};
-+
-+static int allo_katana_component_probe(struct i2c_client *i2c,
-+			     const struct i2c_device_id *id)
-+{
-+	struct regmap *regmap;
-+	struct regmap_config config = katana_codec_regmap;
-+	struct device *dev = &i2c->dev;
-+	struct katana_codec_priv *katana_codec;
-+	unsigned int chip_id = 0;
-+	int ret;
-+
-+	regmap = devm_regmap_init_i2c(i2c, &config);
-+	if (IS_ERR(regmap))
-+		return PTR_ERR(regmap);
-+
-+	katana_codec = devm_kzalloc(dev, sizeof(struct katana_codec_priv),
-+					GFP_KERNEL);
-+	if (!katana_codec)
-+		return -ENOMEM;
-+
-+	dev_set_drvdata(dev, katana_codec);
-+	katana_codec->regmap = regmap;
-+
-+	ret = regmap_read(regmap, KATANA_CODEC_CHIP_ID_REG, &chip_id);
-+	if ((ret != 0) || (chip_id != KATANA_CODEC_CHIP_ID)) {
-+		dev_err(dev, "Failed to read Chip or wrong Chip id: %d\n", ret);
-+		return ret;
-+	}
-+	regmap_update_bits(regmap, KATANA_CODEC_RESET, 0x01, 0x01);
-+	msleep(10);
-+
-+	ret = snd_soc_register_component(dev, &katana_codec_component_driver,
-+				    &katana_codec_dai, 1);
-+	if (ret != 0) {
-+		dev_err(dev, "failed to register codec: %d\n", ret);
-+		return ret;
-+	}
-+
-+	return 0;
-+}
-+
-+static void allo_katana_component_remove(struct i2c_client *i2c)
-+{
-+	snd_soc_unregister_component(&i2c->dev);
-+}
-+
-+static const struct i2c_device_id allo_katana_component_id[] = {
-+	{ "allo-katana-codec", },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(i2c, allo_katana_component_id);
-+
-+static const struct of_device_id allo_katana_codec_of_match[] = {
-+	{ .compatible = "allo,allo-katana-codec", },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(of, allo_katana_codec_of_match);
-+
-+static struct i2c_driver allo_katana_component_driver = {
-+	.probe		= allo_katana_component_probe,
-+	.remove		= allo_katana_component_remove,
-+	.id_table	= allo_katana_component_id,
-+	.driver		= {
-+	.name		= "allo-katana-codec",
-+	.of_match_table = allo_katana_codec_of_match,
-+	},
-+};
-+
-+module_i2c_driver(allo_katana_component_driver);
-+
-+MODULE_DESCRIPTION("ASoC Allo Katana Codec Driver");
-+MODULE_AUTHOR("Jaikumar <jaikumar@cem-solutions.net>");
-+MODULE_LICENSE("GPL v2");
---- /dev/null
-+++ b/sound/soc/bcm/allo-piano-dac-plus.c
-@@ -0,0 +1,1064 @@
-+/*
-+ * ALSA ASoC Machine Driver for Allo Piano DAC Plus Subwoofer
-+ *
-+ * Author:	Baswaraj K <jaikumar@cem-solutions.net>
-+ *		Copyright 2020
-+ *		based on code by David Knell <david.knell@gmail.com)
-+ *		based on code by Daniel Matuschek <info@crazy-audio.com>
-+ *		based on code by Florian Meier <florian.meier@koalo.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/gpio/consumer.h>
-+#include <sound/core.h>
-+#include <sound/pcm.h>
-+#include <sound/pcm_params.h>
-+#include <sound/soc.h>
-+#include <linux/firmware.h>
-+#include <linux/delay.h>
-+#include <sound/tlv.h>
-+#include "../codecs/pcm512x.h"
-+
-+#define P_DAC_LEFT_MUTE		0x10
-+#define P_DAC_RIGHT_MUTE	0x01
-+#define P_DAC_MUTE		0x11
-+#define P_DAC_UNMUTE		0x00
-+#define P_MUTE			1
-+#define P_UNMUTE		0
-+
-+struct dsp_code {
-+	char i2c_addr;
-+	char offset;
-+	char val;
-+};
-+
-+struct glb_pool {
-+	struct mutex lock;
-+	unsigned int dual_mode;
-+	unsigned int set_lowpass;
-+	unsigned int set_mode;
-+	unsigned int set_rate;
-+	unsigned int dsp_page_number;
-+};
-+
-+static bool digital_gain_0db_limit = true;
-+bool glb_mclk;
-+
-+static struct gpio_desc *mute_gpio[2];
-+
-+static const char * const allo_piano_mode_texts[] = {
-+	"None",
-+	"2.0",
-+	"2.1",
-+	"2.2",
-+};
-+
-+static SOC_ENUM_SINGLE_DECL(allo_piano_mode_enum,
-+		0, 0, allo_piano_mode_texts);
-+
-+static const char * const allo_piano_dual_mode_texts[] = {
-+	"None",
-+	"Dual-Mono",
-+	"Dual-Stereo",
-+};
-+
-+static SOC_ENUM_SINGLE_DECL(allo_piano_dual_mode_enum,
-+		0, 0, allo_piano_dual_mode_texts);
-+
-+static const char * const allo_piano_dsp_low_pass_texts[] = {
-+	"60",
-+	"70",
-+	"80",
-+	"90",
-+	"100",
-+	"110",
-+	"120",
-+	"130",
-+	"140",
-+	"150",
-+	"160",
-+	"170",
-+	"180",
-+	"190",
-+	"200",
-+};
-+
-+static SOC_ENUM_SINGLE_DECL(allo_piano_enum,
-+		0, 0, allo_piano_dsp_low_pass_texts);
-+
-+static int __snd_allo_piano_dsp_program(struct snd_soc_pcm_runtime *rtd,
-+		unsigned int mode, unsigned int rate, unsigned int lowpass)
-+{
-+	const struct firmware *fw;
-+	struct snd_soc_card *card = rtd->card;
-+	struct glb_pool *glb_ptr = card->drvdata;
-+	char firmware_name[60];
-+	int ret = 0, dac = 0;
-+
-+	if (rate <= 46000)
-+		rate = 44100;
-+	else if (rate <= 68000)
-+		rate = 48000;
-+	else if (rate <= 92000)
-+		rate = 88200;
-+	else if (rate <= 136000)
-+		rate = 96000;
-+	else if (rate <= 184000)
-+		rate = 176400;
-+	else
-+		rate = 192000;
-+
-+	if (lowpass > 14)
-+		glb_ptr->set_lowpass = lowpass = 0;
-+
-+	if (mode > 3)
-+		glb_ptr->set_mode = mode = 0;
-+
-+	if (mode > 0)
-+		glb_ptr->dual_mode = 0;
-+
-+	/* same configuration loaded */
-+	if ((rate == glb_ptr->set_rate) && (lowpass == glb_ptr->set_lowpass)
-+			&& (mode == glb_ptr->set_mode))
-+		return 0;
-+
-+	switch (mode) {
-+	case 0: /* None */
-+		return 1;
-+
-+	case 1: /* 2.0 */
-+		snd_soc_component_write(asoc_rtd_to_codec(rtd, 0)->component,
-+				PCM512x_MUTE, P_DAC_UNMUTE);
-+		snd_soc_component_write(asoc_rtd_to_codec(rtd, 1)->component,
-+				PCM512x_MUTE, P_DAC_MUTE);
-+		glb_ptr->set_rate = rate;
-+		glb_ptr->set_mode = mode;
-+		glb_ptr->set_lowpass = lowpass;
-+		return 1;
-+
-+	default:
-+		snd_soc_component_write(asoc_rtd_to_codec(rtd, 0)->component,
-+				PCM512x_MUTE, P_DAC_UNMUTE);
-+		snd_soc_component_write(asoc_rtd_to_codec(rtd, 1)->component,
-+				PCM512x_MUTE, P_DAC_UNMUTE);
-+	}
-+
-+	for (dac = 0; dac < rtd->dai_link->num_codecs; dac++) {
-+		struct dsp_code *dsp_code_read;
-+		int i = 1;
-+
-+		if (dac == 0) { /* high */
-+			snprintf(firmware_name, sizeof(firmware_name),
-+				"allo/piano/2.2/allo-piano-dsp-%d-%d-%d.bin",
-+				rate, ((lowpass * 10) + 60), dac);
-+		} else { /* low */
-+			snprintf(firmware_name, sizeof(firmware_name),
-+				"allo/piano/2.%d/allo-piano-dsp-%d-%d-%d.bin",
-+				(mode - 1), rate, ((lowpass * 10) + 60), dac);
-+		}
-+
-+		dev_info(rtd->card->dev, "Dsp Firmware File Name: %s\n",
-+				firmware_name);
-+
-+		ret = request_firmware(&fw, firmware_name, rtd->card->dev);
-+		if (ret < 0) {
-+			dev_err(rtd->card->dev,
-+				"Error: Allo Piano Firmware %s missing. %d\n",
-+				firmware_name, ret);
-+			goto err;
-+		}
-+
-+		while (i < (fw->size - 1)) {
-+			dsp_code_read = (struct dsp_code *)&fw->data[i];
-+
-+			if (dsp_code_read->offset == 0) {
-+				glb_ptr->dsp_page_number = dsp_code_read->val;
-+				ret = snd_soc_component_write(asoc_rtd_to_codec(rtd, dac)->component,
-+						PCM512x_PAGE_BASE(0),
-+						dsp_code_read->val);
-+
-+			} else if (dsp_code_read->offset != 0) {
-+				ret = snd_soc_component_write(asoc_rtd_to_codec(rtd, dac)->component,
-+					(PCM512x_PAGE_BASE(
-+						glb_ptr->dsp_page_number) +
-+					dsp_code_read->offset),
-+					dsp_code_read->val);
-+			}
-+			if (ret < 0) {
-+				dev_err(rtd->card->dev,
-+					"Failed to write Register: %d\n", ret);
-+				release_firmware(fw);
-+				goto err;
-+			}
-+			i = i + 3;
-+		}
-+		release_firmware(fw);
-+	}
-+	glb_ptr->set_rate = rate;
-+	glb_ptr->set_mode = mode;
-+	glb_ptr->set_lowpass = lowpass;
-+	return 1;
-+
-+err:
-+	return ret;
-+}
-+
-+static int snd_allo_piano_dsp_program(struct snd_soc_pcm_runtime *rtd,
-+		unsigned int mode, unsigned int rate, unsigned int lowpass)
-+{
-+	struct snd_soc_card *card = rtd->card;
-+	struct glb_pool *glb_ptr = card->drvdata;
-+	int ret = 0;
-+
-+	mutex_lock(&glb_ptr->lock);
-+
-+	ret = __snd_allo_piano_dsp_program(rtd, mode, rate, lowpass);
-+
-+	mutex_unlock(&glb_ptr->lock);
-+
-+	return ret;
-+}
-+
-+static int snd_allo_piano_dual_mode_get(struct snd_kcontrol *kcontrol,
-+		struct snd_ctl_elem_value *ucontrol)
-+{
-+	struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
-+	struct glb_pool *glb_ptr = card->drvdata;
-+
-+	ucontrol->value.integer.value[0] = glb_ptr->dual_mode;
-+
-+	return 0;
-+}
-+
-+static int snd_allo_piano_dual_mode_put(struct snd_kcontrol *kcontrol,
-+		struct snd_ctl_elem_value *ucontrol)
-+{
-+	struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
-+	struct glb_pool *glb_ptr = card->drvdata;
-+	struct snd_soc_pcm_runtime *rtd;
-+	struct snd_card *snd_card_ptr = card->snd_card;
-+	struct snd_kcontrol *kctl;
-+	struct soc_mixer_control *mc;
-+	unsigned int left_val = 0, right_val = 0;
-+
-+	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]);
-+
-+	if (ucontrol->value.integer.value[0] > 0) {
-+		glb_ptr->dual_mode = ucontrol->value.integer.value[0];
-+		glb_ptr->set_mode = 0;
-+	} else {
-+		if (glb_ptr->set_mode <= 0) {
-+			glb_ptr->dual_mode = 1;
-+			glb_ptr->set_mode = 0;
-+		} else {
-+			glb_ptr->dual_mode = 0;
-+			return 0;
-+		}
-+	}
-+
-+	if (glb_ptr->dual_mode == 1) { // Dual Mono
-+		snd_soc_component_write(asoc_rtd_to_codec(rtd, 0)->component,
-+				PCM512x_MUTE, P_DAC_RIGHT_MUTE);
-+		snd_soc_component_write(asoc_rtd_to_codec(rtd, 1)->component,
-+				PCM512x_MUTE, P_DAC_LEFT_MUTE);
-+		snd_soc_component_write(asoc_rtd_to_codec(rtd, 0)->component,
-+				PCM512x_DIGITAL_VOLUME_3, 0xff);
-+		snd_soc_component_write(asoc_rtd_to_codec(rtd, 1)->component,
-+				PCM512x_DIGITAL_VOLUME_2, 0xff);
-+
-+		list_for_each_entry(kctl, &snd_card_ptr->controls, list) {
-+			if (!strncmp(kctl->id.name, "Main Digital Playback Volume",
-+				sizeof(kctl->id.name))) {
-+				mc = (struct soc_mixer_control *)
-+					kctl->private_value;
-+				mc->rreg = mc->reg;
-+				break;
-+			}
-+			if (!strncmp(kctl->id.name, "Sub Digital Playback Volume",
-+				sizeof(kctl->id.name))) {
-+				mc = (struct soc_mixer_control *)
-+					kctl->private_value;
-+				mc->rreg = mc->reg;
-+				break;
-+			}
-+		}
-+	} else {
-+		left_val = snd_soc_component_read(asoc_rtd_to_codec(rtd, 0)->component,
-+						PCM512x_DIGITAL_VOLUME_2);
-+		right_val = snd_soc_component_read(asoc_rtd_to_codec(rtd, 1)->component,
-+						PCM512x_DIGITAL_VOLUME_3);
-+
-+		list_for_each_entry(kctl, &snd_card_ptr->controls, list) {
-+			if (!strncmp(kctl->id.name, "Main Digital Playback Volume",
-+				sizeof(kctl->id.name))) {
-+				mc = (struct soc_mixer_control *)
-+					kctl->private_value;
-+				mc->rreg = PCM512x_DIGITAL_VOLUME_3;
-+				break;
-+			}
-+			if (!strncmp(kctl->id.name, "Sub Digital Playback Volume",
-+				sizeof(kctl->id.name))) {
-+				mc = (struct soc_mixer_control *)
-+					kctl->private_value;
-+				mc->rreg = PCM512x_DIGITAL_VOLUME_2;
-+				break;
-+			}
-+		}
-+
-+		snd_soc_component_write(asoc_rtd_to_codec(rtd, 0)->component,
-+				PCM512x_DIGITAL_VOLUME_3, left_val);
-+		snd_soc_component_write(asoc_rtd_to_codec(rtd, 1)->component,
-+				PCM512x_DIGITAL_VOLUME_2, right_val);
-+		snd_soc_component_write(asoc_rtd_to_codec(rtd, 0)->component,
-+				PCM512x_MUTE, P_DAC_UNMUTE);
-+		snd_soc_component_write(asoc_rtd_to_codec(rtd, 1)->component,
-+				PCM512x_MUTE, P_DAC_UNMUTE);
-+	}
-+
-+	return 0;
-+}
-+
-+static int snd_allo_piano_mode_get(struct snd_kcontrol *kcontrol,
-+		struct snd_ctl_elem_value *ucontrol)
-+{
-+	struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
-+	struct glb_pool *glb_ptr = card->drvdata;
-+
-+	ucontrol->value.integer.value[0] = glb_ptr->set_mode;
-+	return 0;
-+}
-+
-+static int snd_allo_piano_mode_put(struct snd_kcontrol *kcontrol,
-+		struct snd_ctl_elem_value *ucontrol)
-+{
-+	struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
-+	struct snd_soc_pcm_runtime *rtd;
-+	struct glb_pool *glb_ptr = card->drvdata;
-+	struct snd_card *snd_card_ptr = card->snd_card;
-+	struct snd_kcontrol *kctl;
-+	struct soc_mixer_control *mc;
-+	unsigned int left_val = 0, right_val = 0;
-+
-+	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]);
-+
-+	if ((glb_ptr->dual_mode == 1) &&
-+			(ucontrol->value.integer.value[0] > 0)) {
-+		left_val = snd_soc_component_read(asoc_rtd_to_codec(rtd, 0)->component,
-+						PCM512x_DIGITAL_VOLUME_2);
-+		right_val = snd_soc_component_read(asoc_rtd_to_codec(rtd, 1)->component,
-+						PCM512x_DIGITAL_VOLUME_2);
-+
-+		list_for_each_entry(kctl, &snd_card_ptr->controls, list) {
-+			if (!strncmp(kctl->id.name, "Main Digital Playback Volume",
-+				sizeof(kctl->id.name))) {
-+				mc = (struct soc_mixer_control *)
-+					kctl->private_value;
-+				mc->rreg = PCM512x_DIGITAL_VOLUME_3;
-+				break;
-+			}
-+			if (!strncmp(kctl->id.name, "Sub Digital Playback Volume",
-+				sizeof(kctl->id.name))) {
-+				mc = (struct soc_mixer_control *)
-+					kctl->private_value;
-+				mc->rreg = PCM512x_DIGITAL_VOLUME_2;
-+				break;
-+			}
-+		}
-+		snd_soc_component_write(asoc_rtd_to_codec(rtd, 0)->component,
-+				PCM512x_DIGITAL_VOLUME_3, left_val);
-+		snd_soc_component_write(asoc_rtd_to_codec(rtd, 1)->component,
-+				PCM512x_DIGITAL_VOLUME_3, right_val);
-+	}
-+
-+	return(snd_allo_piano_dsp_program(rtd,
-+				ucontrol->value.integer.value[0],
-+				glb_ptr->set_rate, glb_ptr->set_lowpass));
-+}
-+
-+static int snd_allo_piano_lowpass_get(struct snd_kcontrol *kcontrol,
-+		struct snd_ctl_elem_value *ucontrol)
-+{
-+	struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
-+	struct glb_pool *glb_ptr = card->drvdata;
-+
-+	ucontrol->value.integer.value[0] = glb_ptr->set_lowpass;
-+	return 0;
-+}
-+
-+static int snd_allo_piano_lowpass_put(struct snd_kcontrol *kcontrol,
-+		struct snd_ctl_elem_value *ucontrol)
-+{
-+	struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
-+	struct snd_soc_pcm_runtime *rtd;
-+	struct glb_pool *glb_ptr = card->drvdata;
-+
-+	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]);
-+	return(snd_allo_piano_dsp_program(rtd,
-+				glb_ptr->set_mode, glb_ptr->set_rate,
-+				ucontrol->value.integer.value[0]));
-+}
-+
-+static int pcm512x_get_reg_sub(struct snd_kcontrol *kcontrol,
-+		struct snd_ctl_elem_value *ucontrol)
-+{
-+	struct soc_mixer_control *mc =
-+		(struct soc_mixer_control *)kcontrol->private_value;
-+	struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
-+	struct glb_pool *glb_ptr = card->drvdata;
-+	struct snd_soc_pcm_runtime *rtd;
-+	unsigned int left_val = 0;
-+	unsigned int right_val = 0;
-+	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]);
-+
-+	right_val = snd_soc_component_read(asoc_rtd_to_codec(rtd, 1)->component,
-+			PCM512x_DIGITAL_VOLUME_3);
-+	if (glb_ptr->dual_mode != 1) {
-+		left_val = snd_soc_component_read(asoc_rtd_to_codec(rtd, 1)->component,
-+				PCM512x_DIGITAL_VOLUME_2);
-+
-+	} else {
-+		left_val = right_val;
-+	}
-+
-+	ucontrol->value.integer.value[0] =
-+				(~(left_val >> mc->shift)) & mc->max;
-+	ucontrol->value.integer.value[1] =
-+				(~(right_val >> mc->shift)) & mc->max;
-+
-+	return 0;
-+}
-+
-+static int pcm512x_set_reg_sub(struct snd_kcontrol *kcontrol,
-+		struct snd_ctl_elem_value *ucontrol)
-+{
-+	struct soc_mixer_control *mc =
-+		(struct soc_mixer_control *)kcontrol->private_value;
-+	struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
-+	struct glb_pool *glb_ptr = card->drvdata;
-+	struct snd_soc_pcm_runtime *rtd;
-+	unsigned int left_val = (ucontrol->value.integer.value[0] & mc->max);
-+	unsigned int right_val = (ucontrol->value.integer.value[1] & mc->max);
-+	int ret = 0;
-+
-+	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]);
-+
-+	if (digital_gain_0db_limit) {
-+		ret = snd_soc_limit_volume(card, "Subwoofer Playback Volume",
-+					207);
-+		if (ret < 0)
-+			dev_warn(card->dev, "Failed to set volume limit: %d\n",
-+				ret);
-+	}
-+
-+	// When in Dual Mono, Sub vol control should not set anything.
-+	if (glb_ptr->dual_mode != 1) { //Not in Dual Mono mode
-+
-+		ret = snd_soc_component_write(asoc_rtd_to_codec(rtd, 1)->component,
-+				PCM512x_DIGITAL_VOLUME_2, (~left_val));
-+		if (ret < 0)
-+			return ret;
-+
-+		ret = snd_soc_component_write(asoc_rtd_to_codec(rtd, 1)->component,
-+				PCM512x_DIGITAL_VOLUME_3, (~right_val));
-+		if (ret < 0)
-+			return ret;
-+
-+	}
-+
-+	return 1;
-+}
-+
-+static int pcm512x_get_reg_sub_switch(struct snd_kcontrol *kcontrol,
-+		struct snd_ctl_elem_value *ucontrol)
-+{
-+	struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
-+	struct snd_soc_pcm_runtime *rtd;
-+	int val = 0;
-+
-+	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]);
-+	val = snd_soc_component_read(asoc_rtd_to_codec(rtd, 1)->component, PCM512x_MUTE);
-+
-+	ucontrol->value.integer.value[0] =
-+			(val & P_DAC_LEFT_MUTE) ? P_UNMUTE : P_MUTE;
-+	ucontrol->value.integer.value[1] =
-+			(val & P_DAC_RIGHT_MUTE) ? P_UNMUTE : P_MUTE;
-+
-+	return val;
-+}
-+
-+static int pcm512x_set_reg_sub_switch(struct snd_kcontrol *kcontrol,
-+		struct snd_ctl_elem_value *ucontrol)
-+{
-+	struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
-+	struct snd_soc_pcm_runtime *rtd;
-+	struct glb_pool *glb_ptr = card->drvdata;
-+	unsigned int left_val = (ucontrol->value.integer.value[0]);
-+	unsigned int right_val = (ucontrol->value.integer.value[1]);
-+	int ret = 0;
-+
-+	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]);
-+	if (glb_ptr->set_mode != 1) {
-+		ret = snd_soc_component_write(asoc_rtd_to_codec(rtd, 1)->component, PCM512x_MUTE,
-+				~((left_val & 0x01)<<4 | (right_val & 0x01)));
-+		if (ret < 0)
-+			return ret;
-+	}
-+	return 1;
-+
-+}
-+
-+static int pcm512x_get_reg_master(struct snd_kcontrol *kcontrol,
-+		struct snd_ctl_elem_value *ucontrol)
-+{
-+	struct soc_mixer_control *mc =
-+		(struct soc_mixer_control *)kcontrol->private_value;
-+	struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
-+	struct glb_pool *glb_ptr = card->drvdata;
-+	struct snd_soc_pcm_runtime *rtd;
-+	unsigned int left_val = 0, right_val = 0;
-+
-+	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]);
-+
-+	left_val = snd_soc_component_read(asoc_rtd_to_codec(rtd, 0)->component,
-+			PCM512x_DIGITAL_VOLUME_2);
-+
-+	if (glb_ptr->dual_mode == 1) {  // in Dual Mono mode
-+		right_val = snd_soc_component_read(asoc_rtd_to_codec(rtd, 1)->component,
-+				PCM512x_DIGITAL_VOLUME_3);
-+	} else {
-+		right_val = snd_soc_component_read(asoc_rtd_to_codec(rtd, 0)->component,
-+				PCM512x_DIGITAL_VOLUME_3);
-+	}
-+
-+	ucontrol->value.integer.value[0] =
-+		(~(left_val  >> mc->shift)) & mc->max;
-+	ucontrol->value.integer.value[1] =
-+		(~(right_val >> mc->shift)) & mc->max;
-+
-+	return 0;
-+}
-+
-+static int pcm512x_set_reg_master(struct snd_kcontrol *kcontrol,
-+		struct snd_ctl_elem_value *ucontrol)
-+{
-+	struct soc_mixer_control *mc =
-+		(struct soc_mixer_control *)kcontrol->private_value;
-+	struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
-+	struct glb_pool *glb_ptr = card->drvdata;
-+	struct snd_soc_pcm_runtime *rtd;
-+	unsigned int left_val = (ucontrol->value.integer.value[0] & mc->max);
-+	unsigned int right_val = (ucontrol->value.integer.value[1] & mc->max);
-+	int ret = 0;
-+
-+	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]);
-+
-+	if (digital_gain_0db_limit) {
-+		ret = snd_soc_limit_volume(card, "Master Playback Volume",
-+					207);
-+		if (ret < 0)
-+			dev_warn(card->dev, "Failed to set volume limit: %d\n",
-+				ret);
-+	}
-+
-+	if (glb_ptr->dual_mode == 1) { //in Dual Mono Mode
-+
-+		ret = snd_soc_component_write(asoc_rtd_to_codec(rtd, 0)->component,
-+				PCM512x_DIGITAL_VOLUME_2, (~left_val));
-+		if (ret < 0)
-+			return ret;
-+
-+		ret = snd_soc_component_write(asoc_rtd_to_codec(rtd, 1)->component,
-+				PCM512x_DIGITAL_VOLUME_3, (~right_val));
-+		if (ret < 0)
-+			return ret;
-+
-+	} else {
-+
-+		ret = snd_soc_component_write(asoc_rtd_to_codec(rtd, 0)->component,
-+				PCM512x_DIGITAL_VOLUME_2, (~left_val));
-+		if (ret < 0)
-+			return ret;
-+
-+		ret = snd_soc_component_write(asoc_rtd_to_codec(rtd, 0)->component,
-+				PCM512x_DIGITAL_VOLUME_3, (~right_val));
-+		if (ret < 0)
-+			return ret;
-+
-+	}
-+	return 1;
-+}
-+
-+static int pcm512x_get_reg_master_switch(struct snd_kcontrol *kcontrol,
-+		struct snd_ctl_elem_value *ucontrol)
-+{
-+	struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
-+	struct glb_pool *glb_ptr = card->drvdata;
-+	struct snd_soc_pcm_runtime *rtd;
-+	int val = 0;
-+
-+	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]);
-+
-+	val = snd_soc_component_read(asoc_rtd_to_codec(rtd, 0)->component, PCM512x_MUTE);
-+
-+	ucontrol->value.integer.value[0] =
-+			(val & P_DAC_LEFT_MUTE) ? P_UNMUTE : P_MUTE;
-+
-+	if (glb_ptr->dual_mode == 1) {
-+		val = snd_soc_component_read(asoc_rtd_to_codec(rtd, 1)->component, PCM512x_MUTE);
-+	}
-+	ucontrol->value.integer.value[1] =
-+			(val & P_DAC_RIGHT_MUTE) ? P_UNMUTE : P_MUTE;
-+
-+	return val;
-+}
-+
-+static int pcm512x_set_reg_master_switch(struct snd_kcontrol *kcontrol,
-+		struct snd_ctl_elem_value *ucontrol)
-+{
-+	struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
-+	struct snd_soc_pcm_runtime *rtd;
-+	struct glb_pool *glb_ptr = card->drvdata;
-+	unsigned int left_val = (ucontrol->value.integer.value[0]);
-+	unsigned int right_val = (ucontrol->value.integer.value[1]);
-+	int ret = 0;
-+
-+	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]);
-+	if (glb_ptr->dual_mode == 1) {
-+		ret = snd_soc_component_write(asoc_rtd_to_codec(rtd, 0)->component, PCM512x_MUTE,
-+				~((left_val & 0x01)<<4));
-+		if (ret < 0)
-+			return ret;
-+		ret = snd_soc_component_write(asoc_rtd_to_codec(rtd, 1)->component, PCM512x_MUTE,
-+				~((right_val & 0x01)));
-+		if (ret < 0)
-+			return ret;
-+
-+	} else if (glb_ptr->set_mode == 1) {
-+		ret = snd_soc_component_write(asoc_rtd_to_codec(rtd, 0)->component, PCM512x_MUTE,
-+				~((left_val & 0x01)<<4 | (right_val & 0x01)));
-+		if (ret < 0)
-+			return ret;
-+
-+	} else {
-+		ret = snd_soc_component_write(asoc_rtd_to_codec(rtd, 0)->component, PCM512x_MUTE,
-+				~((left_val & 0x01)<<4 | (right_val & 0x01)));
-+		if (ret < 0)
-+			return ret;
-+
-+		ret = snd_soc_component_write(asoc_rtd_to_codec(rtd, 1)->component, PCM512x_MUTE,
-+				~((left_val & 0x01)<<4 | (right_val & 0x01)));
-+		if (ret < 0)
-+			return ret;
-+	}
-+	return 1;
-+}
-+
-+static const DECLARE_TLV_DB_SCALE(digital_tlv_sub, -10350, 50, 1);
-+static const DECLARE_TLV_DB_SCALE(digital_tlv_master, -10350, 50, 1);
-+
-+static const struct snd_kcontrol_new allo_piano_controls[] = {
-+	SOC_ENUM_EXT("Subwoofer mode Route",
-+			allo_piano_mode_enum,
-+			snd_allo_piano_mode_get,
-+			snd_allo_piano_mode_put),
-+
-+	SOC_ENUM_EXT("Dual Mode Route",
-+			allo_piano_dual_mode_enum,
-+			snd_allo_piano_dual_mode_get,
-+			snd_allo_piano_dual_mode_put),
-+
-+	SOC_ENUM_EXT("Lowpass Route", allo_piano_enum,
-+			snd_allo_piano_lowpass_get,
-+			snd_allo_piano_lowpass_put),
-+
-+	SOC_DOUBLE_R_EXT_TLV("Subwoofer Playback Volume",
-+			PCM512x_DIGITAL_VOLUME_2,
-+			PCM512x_DIGITAL_VOLUME_3, 0, 255, 1,
-+			pcm512x_get_reg_sub,
-+			pcm512x_set_reg_sub,
-+			digital_tlv_sub),
-+
-+	SOC_DOUBLE_EXT("Subwoofer Playback Switch",
-+			PCM512x_MUTE,
-+			PCM512x_RQML_SHIFT,
-+			PCM512x_RQMR_SHIFT, 1, 1,
-+			pcm512x_get_reg_sub_switch,
-+			pcm512x_set_reg_sub_switch),
-+
-+	SOC_DOUBLE_R_EXT_TLV("Master Playback Volume",
-+			PCM512x_DIGITAL_VOLUME_2,
-+			PCM512x_DIGITAL_VOLUME_3, 0, 255, 1,
-+			pcm512x_get_reg_master,
-+			pcm512x_set_reg_master,
-+			digital_tlv_master),
-+
-+	SOC_DOUBLE_EXT("Master Playback Switch",
-+			PCM512x_MUTE,
-+			PCM512x_RQML_SHIFT,
-+			PCM512x_RQMR_SHIFT, 1, 1,
-+			pcm512x_get_reg_master_switch,
-+			pcm512x_set_reg_master_switch),
-+};
-+
-+static const char * const codec_ctl_pfx[] = { "Main", "Sub" };
-+static const char * const codec_ctl_name[] = {
-+	"Digital Playback Volume",
-+	"Digital Playback Switch",
-+	"Auto Mute Mono Switch",
-+	"Auto Mute Switch",
-+	"Auto Mute Time Left",
-+	"Auto Mute Time Right",
-+	"Clock Missing Period",
-+	"Max Overclock DAC",
-+	"Max Overclock DSP",
-+	"Max Overclock PLL",
-+	"Volume Ramp Down Emergency Rate",
-+	"Volume Ramp Down Emergency Step",
-+	"Volume Ramp Up Rate",
-+	"Volume Ramp Down Rate",
-+	"Volume Ramp Up Step",
-+	"Volume Ramp Down Step"
-+};
-+
-+static int snd_allo_piano_dac_init(struct snd_soc_pcm_runtime *rtd)
-+{
-+	struct snd_soc_card *card = rtd->card;
-+	struct glb_pool *glb_ptr;
-+	struct snd_kcontrol *kctl;
-+	int i, j;
-+
-+	glb_ptr = kzalloc(sizeof(struct glb_pool), GFP_KERNEL);
-+	if (!glb_ptr)
-+		return -ENOMEM;
-+
-+	card->drvdata = glb_ptr;
-+	glb_ptr->dual_mode = 2;
-+	glb_ptr->set_mode = 0;
-+
-+	mutex_init(&glb_ptr->lock);
-+
-+	if (digital_gain_0db_limit) {
-+		int ret;
-+
-+		//Set volume limit on both dacs
-+		for (i = 0; i < ARRAY_SIZE(codec_ctl_pfx); i++) {
-+			char cname[256];
-+
-+			sprintf(cname, "%s %s", codec_ctl_pfx[i], codec_ctl_name[0]);
-+			ret = snd_soc_limit_volume(card, cname, 207);
-+			if (ret < 0)
-+				dev_warn(card->dev, "Failed to set volume limit: %d\n",
-+					ret);
-+		}
-+	}
-+
-+	// Remove codec controls
-+	for (i = 0; i < ARRAY_SIZE(codec_ctl_pfx); i++) {
-+		for (j = 0; j < ARRAY_SIZE(codec_ctl_name); j++) {
-+			char cname[256];
-+
-+			sprintf(cname, "%s %s", codec_ctl_pfx[i], codec_ctl_name[j]);
-+			kctl = snd_soc_card_get_kcontrol(card, cname);
-+			if (!kctl) {
-+				dev_err(rtd->card->dev, "Control %s not found\n",
-+				       cname);
-+			} else {
-+				kctl->vd[0].access =
-+					SNDRV_CTL_ELEM_ACCESS_READWRITE;
-+				snd_ctl_remove(card->snd_card, kctl);
-+			}
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+static void snd_allo_piano_gpio_mute(struct snd_soc_card *card)
-+{
-+	if (mute_gpio[0])
-+		gpiod_set_value_cansleep(mute_gpio[0], P_MUTE);
-+
-+	if (mute_gpio[1])
-+		gpiod_set_value_cansleep(mute_gpio[1], P_MUTE);
-+}
-+
-+static void snd_allo_piano_gpio_unmute(struct snd_soc_card *card)
-+{
-+	if (mute_gpio[0])
-+		gpiod_set_value_cansleep(mute_gpio[0], P_UNMUTE);
-+
-+	if (mute_gpio[1])
-+		gpiod_set_value_cansleep(mute_gpio[1], P_UNMUTE);
-+}
-+
-+static int snd_allo_piano_set_bias_level(struct snd_soc_card *card,
-+	struct snd_soc_dapm_context *dapm, enum snd_soc_bias_level level)
-+{
-+	struct snd_soc_pcm_runtime *rtd;
-+	struct snd_soc_dai *codec_dai;
-+
-+	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]);
-+	codec_dai = asoc_rtd_to_codec(rtd, 0);
-+
-+	if (dapm->dev != codec_dai->dev)
-+		return 0;
-+
-+	switch (level) {
-+	case SND_SOC_BIAS_PREPARE:
-+		if (dapm->bias_level != SND_SOC_BIAS_STANDBY)
-+			break;
-+		/* UNMUTE DAC */
-+		snd_allo_piano_gpio_unmute(card);
-+		break;
-+
-+	case SND_SOC_BIAS_STANDBY:
-+		if (dapm->bias_level != SND_SOC_BIAS_PREPARE)
-+			break;
-+		/* MUTE DAC */
-+		snd_allo_piano_gpio_mute(card);
-+		break;
-+
-+	default:
-+		break;
-+	}
-+
-+	return 0;
-+}
-+
-+static int snd_allo_piano_dac_startup(
-+	struct snd_pcm_substream *substream)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_card *card = rtd->card;
-+
-+	snd_allo_piano_gpio_mute(card);
-+
-+	return 0;
-+}
-+
-+static int snd_allo_piano_dac_hw_params(
-+		struct snd_pcm_substream *substream,
-+		struct snd_pcm_hw_params *params)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	unsigned int rate = params_rate(params);
-+	struct snd_soc_card *card = rtd->card;
-+	struct glb_pool *glb_ptr = card->drvdata;
-+	int ret = 0, val = 0, dac;
-+
-+	for (dac = 0; (glb_mclk && dac < 2); dac++) {
-+		/* Configure the PLL clock reference for both the Codecs */
-+		val = snd_soc_component_read(asoc_rtd_to_codec(rtd, dac)->component,
-+					PCM512x_RATE_DET_4);
-+
-+		if (val & 0x40) {
-+			snd_soc_component_write(asoc_rtd_to_codec(rtd, dac)->component,
-+					PCM512x_PLL_REF,
-+					PCM512x_SREF_BCK);
-+
-+			dev_info(asoc_rtd_to_codec(rtd, dac)->component->dev,
-+				"Setting BCLK as input clock & Enable PLL\n");
-+		} else {
-+			snd_soc_component_write(asoc_rtd_to_codec(rtd, dac)->component,
-+					PCM512x_PLL_EN,
-+					0x00);
-+
-+			snd_soc_component_write(asoc_rtd_to_codec(rtd, dac)->component,
-+					PCM512x_PLL_REF,
-+					PCM512x_SREF_SCK);
-+
-+			dev_info(asoc_rtd_to_codec(rtd, dac)->component->dev,
-+				"Setting SCLK as input clock & disabled PLL\n");
-+		}
-+	}
-+
-+	ret = snd_allo_piano_dsp_program(rtd, glb_ptr->set_mode, rate,
-+						glb_ptr->set_lowpass);
-+	if (ret < 0)
-+		return ret;
-+
-+	return ret;
-+}
-+
-+static int snd_allo_piano_dac_prepare(
-+	struct snd_pcm_substream *substream)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_card *card = rtd->card;
-+
-+	snd_allo_piano_gpio_unmute(card);
-+
-+	return 0;
-+}
-+
-+/* machine stream operations */
-+static struct snd_soc_ops snd_allo_piano_dac_ops = {
-+	.startup = snd_allo_piano_dac_startup,
-+	.hw_params = snd_allo_piano_dac_hw_params,
-+	.prepare = snd_allo_piano_dac_prepare,
-+};
-+
-+static struct snd_soc_dai_link_component allo_piano_2_1_codecs[] = {
-+	{
-+		.dai_name = "pcm512x-hifi",
-+	},
-+	{
-+		.dai_name = "pcm512x-hifi",
-+	},
-+};
-+
-+SND_SOC_DAILINK_DEFS(allo_piano_dai_plus,
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("pcm512x.1-004c", "pcm512x-hifi"),
-+			   COMP_CODEC("pcm512x.1-004d", "pcm512x-hifi")),
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()));
-+
-+static struct snd_soc_dai_link snd_allo_piano_dac_dai[] = {
-+	{
-+		.name		= "PianoDACPlus",
-+		.stream_name	= "PianoDACPlus",
-+		.dai_fmt	= SND_SOC_DAIFMT_I2S |
-+				SND_SOC_DAIFMT_NB_NF |
-+				SND_SOC_DAIFMT_CBS_CFS,
-+		.ops		= &snd_allo_piano_dac_ops,
-+		.init		= snd_allo_piano_dac_init,
-+		SND_SOC_DAILINK_REG(allo_piano_dai_plus),
-+	},
-+};
-+
-+/* audio machine driver */
-+static struct snd_soc_card snd_allo_piano_dac = {
-+	.name = "PianoDACPlus",
-+	.owner = THIS_MODULE,
-+	.dai_link = snd_allo_piano_dac_dai,
-+	.num_links = ARRAY_SIZE(snd_allo_piano_dac_dai),
-+	.controls = allo_piano_controls,
-+	.num_controls = ARRAY_SIZE(allo_piano_controls),
-+};
-+
-+static int snd_allo_piano_dac_probe(struct platform_device *pdev)
-+{
-+	struct snd_soc_card *card = &snd_allo_piano_dac;
-+	int ret = 0, i = 0;
-+
-+	card->dev = &pdev->dev;
-+	platform_set_drvdata(pdev, &snd_allo_piano_dac);
-+
-+	if (pdev->dev.of_node) {
-+		struct device_node *i2s_node;
-+		struct snd_soc_dai_link *dai;
-+
-+		dai = &snd_allo_piano_dac_dai[0];
-+		i2s_node = of_parse_phandle(pdev->dev.of_node,
-+						"i2s-controller", 0);
-+		if (i2s_node) {
-+			for (i = 0; i < card->num_links; i++) {
-+				dai->cpus->dai_name = NULL;
-+				dai->cpus->of_node = i2s_node;
-+				dai->platforms->name = NULL;
-+				dai->platforms->of_node = i2s_node;
-+			}
-+		}
-+		digital_gain_0db_limit =
-+			!of_property_read_bool(pdev->dev.of_node,
-+						"allo,24db_digital_gain");
-+
-+		glb_mclk = of_property_read_bool(pdev->dev.of_node,
-+						"allo,glb_mclk");
-+
-+		allo_piano_2_1_codecs[0].of_node =
-+			of_parse_phandle(pdev->dev.of_node, "audio-codec", 0);
-+		if (!allo_piano_2_1_codecs[0].of_node) {
-+			dev_err(&pdev->dev,
-+				"Property 'audio-codec' missing or invalid\n");
-+			return -EINVAL;
-+		}
-+
-+		allo_piano_2_1_codecs[1].of_node =
-+			of_parse_phandle(pdev->dev.of_node, "audio-codec", 1);
-+		if (!allo_piano_2_1_codecs[1].of_node) {
-+			dev_err(&pdev->dev,
-+				"Property 'audio-codec' missing or invalid\n");
-+			return -EINVAL;
-+		}
-+
-+		mute_gpio[0] = devm_gpiod_get_optional(&pdev->dev, "mute1",
-+							GPIOD_OUT_LOW);
-+		if (IS_ERR(mute_gpio[0])) {
-+			ret = PTR_ERR(mute_gpio[0]);
-+			dev_err(&pdev->dev,
-+				"failed to get mute1 gpio6: %d\n", ret);
-+			return ret;
-+		}
-+
-+		mute_gpio[1] = devm_gpiod_get_optional(&pdev->dev, "mute2",
-+							GPIOD_OUT_LOW);
-+		if (IS_ERR(mute_gpio[1])) {
-+			ret = PTR_ERR(mute_gpio[1]);
-+			dev_err(&pdev->dev,
-+				"failed to get mute2 gpio25: %d\n", ret);
-+			return ret;
-+		}
-+
-+		if (mute_gpio[0] && mute_gpio[1])
-+			snd_allo_piano_dac.set_bias_level =
-+				snd_allo_piano_set_bias_level;
-+
-+		ret = snd_soc_register_card(&snd_allo_piano_dac);
-+		if (ret < 0) {
-+			dev_err(&pdev->dev,
-+				"snd_soc_register_card() failed: %d\n", ret);
-+			return ret;
-+		}
-+
-+		if ((mute_gpio[0]) && (mute_gpio[1]))
-+			snd_allo_piano_gpio_mute(&snd_allo_piano_dac);
-+
-+		return 0;
-+	}
-+
-+	return -EINVAL;
-+}
-+
-+static int snd_allo_piano_dac_remove(struct platform_device *pdev)
-+{
-+	struct snd_soc_card *card = platform_get_drvdata(pdev);
-+
-+	kfree(&card->drvdata);
-+	snd_allo_piano_gpio_mute(&snd_allo_piano_dac);
-+	snd_soc_unregister_card(&snd_allo_piano_dac);
-+	return 0;
-+}
-+
-+static const struct of_device_id snd_allo_piano_dac_of_match[] = {
-+	{ .compatible = "allo,piano-dac-plus", },
-+	{ /* sentinel */ },
-+};
-+
-+MODULE_DEVICE_TABLE(of, snd_allo_piano_dac_of_match);
-+
-+static struct platform_driver snd_allo_piano_dac_driver = {
-+	.driver = {
-+		.name = "snd-allo-piano-dac-plus",
-+		.owner = THIS_MODULE,
-+		.of_match_table = snd_allo_piano_dac_of_match,
-+	},
-+	.probe = snd_allo_piano_dac_probe,
-+	.remove = snd_allo_piano_dac_remove,
-+};
-+
-+module_platform_driver(snd_allo_piano_dac_driver);
-+
-+MODULE_AUTHOR("Baswaraj K <jaikumar@cem-solutions.net>");
-+MODULE_DESCRIPTION("ALSA ASoC Machine Driver for Allo Piano DAC Plus");
-+MODULE_LICENSE("GPL v2");
---- /dev/null
-+++ b/sound/soc/bcm/allo-piano-dac.c
-@@ -0,0 +1,122 @@
-+/*
-+ * ALSA ASoC Machine Driver for Allo Piano DAC
-+ *
-+ * Author:	Baswaraj K <jaikumar@cem-solutions.net>
-+ *		Copyright 2016
-+ *		based on code by Daniel Matuschek <info@crazy-audio.com>
-+ *		based on code by Florian Meier <florian.meier@koalo.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+
-+#include <sound/core.h>
-+#include <sound/pcm.h>
-+#include <sound/pcm_params.h>
-+#include <sound/soc.h>
-+
-+static bool digital_gain_0db_limit = true;
-+
-+static int snd_allo_piano_dac_init(struct snd_soc_pcm_runtime *rtd)
-+{
-+	if (digital_gain_0db_limit) {
-+		int ret;
-+		struct snd_soc_card *card = rtd->card;
-+
-+		ret = snd_soc_limit_volume(card, "Digital Playback Volume",
-+					   207);
-+		if (ret < 0)
-+			dev_warn(card->dev, "Failed to set volume limit: %d\n",
-+				 ret);
-+	}
-+
-+	return 0;
-+}
-+
-+SND_SOC_DAILINK_DEFS(allo_piano_dai,
-+	DAILINK_COMP_ARRAY(COMP_CPU("bcm2708-i2s.0")),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("pcm512x.1-004c", "pcm512x-hifi")),
-+	DAILINK_COMP_ARRAY(COMP_PLATFORM("bcm2708-i2s.0")));
-+
-+static struct snd_soc_dai_link snd_allo_piano_dac_dai[] = {
-+{
-+	.name		= "Piano DAC",
-+	.stream_name	= "Piano DAC HiFi",
-+	.dai_fmt	= SND_SOC_DAIFMT_I2S |
-+			  SND_SOC_DAIFMT_NB_NF |
-+			  SND_SOC_DAIFMT_CBS_CFS,
-+	.init		= snd_allo_piano_dac_init,
-+	SND_SOC_DAILINK_REG(allo_piano_dai),
-+},
-+};
-+
-+/* audio machine driver */
-+static struct snd_soc_card snd_allo_piano_dac = {
-+	.name         = "PianoDAC",
-+	.owner        = THIS_MODULE,
-+	.dai_link     = snd_allo_piano_dac_dai,
-+	.num_links    = ARRAY_SIZE(snd_allo_piano_dac_dai),
-+};
-+
-+static int snd_allo_piano_dac_probe(struct platform_device *pdev)
-+{
-+	int ret = 0;
-+
-+	snd_allo_piano_dac.dev = &pdev->dev;
-+
-+	if (pdev->dev.of_node) {
-+		struct device_node *i2s_node;
-+		struct snd_soc_dai_link *dai;
-+
-+		dai = &snd_allo_piano_dac_dai[0];
-+		i2s_node = of_parse_phandle(pdev->dev.of_node,
-+					    "i2s-controller", 0);
-+
-+		if (i2s_node) {
-+			dai->cpus->dai_name = NULL;
-+			dai->cpus->of_node = i2s_node;
-+			dai->platforms->name = NULL;
-+			dai->platforms->of_node = i2s_node;
-+		}
-+
-+		digital_gain_0db_limit = !of_property_read_bool(
-+			pdev->dev.of_node, "allo,24db_digital_gain");
-+	}
-+
-+	ret = devm_snd_soc_register_card(&pdev->dev, &snd_allo_piano_dac);
-+	if (ret && ret != -EPROBE_DEFER)
-+		dev_err(&pdev->dev,
-+			"snd_soc_register_card() failed: %d\n", ret);
-+
-+	return ret;
-+}
-+
-+static const struct of_device_id snd_allo_piano_dac_of_match[] = {
-+	{ .compatible = "allo,piano-dac", },
-+	{ /* sentinel */ },
-+};
-+MODULE_DEVICE_TABLE(of, snd_allo_piano_dac_of_match);
-+
-+static struct platform_driver snd_allo_piano_dac_driver = {
-+	.driver = {
-+		.name   = "snd-allo-piano-dac",
-+		.owner  = THIS_MODULE,
-+		.of_match_table = snd_allo_piano_dac_of_match,
-+	},
-+	.probe          = snd_allo_piano_dac_probe,
-+};
-+
-+module_platform_driver(snd_allo_piano_dac_driver);
-+
-+MODULE_AUTHOR("Baswaraj K <jaikumar@cem-solutions.net>");
-+MODULE_DESCRIPTION("ALSA ASoC Machine Driver for Allo Piano DAC");
-+MODULE_LICENSE("GPL v2");
---- /dev/null
-+++ b/sound/soc/bcm/audioinjector-isolated-soundcard.c
-@@ -0,0 +1,183 @@
-+/*
-+ * ASoC Driver for AudioInjector.net isolated soundcard
-+ *
-+ *  Created on: 20-February-2020
-+ *      Author: flatmax@flatmax.org
-+ *              based on audioinjector-octo-soundcard.c
-+ *
-+ * Copyright (C) 2020 Flatmax Pty. Ltd.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/types.h>
-+#include <linux/gpio/consumer.h>
-+
-+#include <sound/core.h>
-+#include <sound/soc.h>
-+#include <sound/pcm_params.h>
-+#include <sound/control.h>
-+
-+static struct gpio_desc *mute_gpio;
-+
-+static const unsigned int audioinjector_isolated_rates[] = {
-+	192000, 96000, 48000, 32000, 24000, 16000, 8000
-+};
-+
-+static struct snd_pcm_hw_constraint_list audioinjector_isolated_constraints = {
-+	.list = audioinjector_isolated_rates,
-+	.count = ARRAY_SIZE(audioinjector_isolated_rates),
-+};
-+
-+static int audioinjector_isolated_dai_init(struct snd_soc_pcm_runtime *rtd)
-+{
-+	int ret=snd_soc_dai_set_sysclk(asoc_rtd_to_codec(rtd, 0), 0, 24576000, 0);
-+	if (ret)
-+		return ret;
-+
-+	return snd_soc_dai_set_bclk_ratio(asoc_rtd_to_cpu(rtd, 0), 64);
-+}
-+
-+static int audioinjector_isolated_startup(struct snd_pcm_substream *substream)
-+{
-+	snd_pcm_hw_constraint_list(substream->runtime, 0,
-+				SNDRV_PCM_HW_PARAM_RATE, &audioinjector_isolated_constraints);
-+
-+	return 0;
-+}
-+
-+static int audioinjector_isolated_trigger(struct snd_pcm_substream *substream,
-+								int cmd){
-+
-+	switch (cmd) {
-+	case SNDRV_PCM_TRIGGER_STOP:
-+	case SNDRV_PCM_TRIGGER_SUSPEND:
-+	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-+		gpiod_set_value(mute_gpio, 0);
-+		break;
-+	case SNDRV_PCM_TRIGGER_START:
-+	case SNDRV_PCM_TRIGGER_RESUME:
-+	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-+		gpiod_set_value(mute_gpio, 1);
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+	return 0;
-+}
-+
-+static struct snd_soc_ops audioinjector_isolated_ops = {
-+	.startup	= audioinjector_isolated_startup,
-+	.trigger = audioinjector_isolated_trigger,
-+};
-+
-+SND_SOC_DAILINK_DEFS(audioinjector_isolated,
-+	DAILINK_COMP_ARRAY(COMP_CPU("bcm2708-i2s.0")),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("cs4271.1-0010", "cs4271-hifi")),
-+	DAILINK_COMP_ARRAY(COMP_PLATFORM("bcm2708-i2s.0")));
-+
-+static struct snd_soc_dai_link audioinjector_isolated_dai[] = {
-+	{
-+		.name = "AudioInjector ISO",
-+		.stream_name = "AI-HIFI",
-+		.ops = &audioinjector_isolated_ops,
-+		.init = audioinjector_isolated_dai_init,
-+		.symmetric_rate = 1,
-+		.symmetric_channels = 1,
-+		.dai_fmt = SND_SOC_DAIFMT_CBM_CFM|SND_SOC_DAIFMT_I2S|SND_SOC_DAIFMT_NB_NF,
-+		SND_SOC_DAILINK_REG(audioinjector_isolated),
-+	}
-+};
-+
-+static const struct snd_soc_dapm_widget audioinjector_isolated_widgets[] = {
-+	SND_SOC_DAPM_OUTPUT("OUTPUTS"),
-+	SND_SOC_DAPM_INPUT("INPUTS"),
-+};
-+
-+static const struct snd_soc_dapm_route audioinjector_isolated_route[] = {
-+	/* Balanced outputs */
-+	{"OUTPUTS", NULL, "AOUTA+"},
-+	{"OUTPUTS", NULL, "AOUTA-"},
-+	{"OUTPUTS", NULL, "AOUTB+"},
-+	{"OUTPUTS", NULL, "AOUTB-"},
-+
-+	/* Balanced inputs */
-+	{"AINA", NULL, "INPUTS"},
-+	{"AINB", NULL, "INPUTS"},
-+};
-+
-+static struct snd_soc_card snd_soc_audioinjector_isolated = {
-+	.name = "audioinjector-isolated-soundcard",
-+	.dai_link = audioinjector_isolated_dai,
-+	.num_links = ARRAY_SIZE(audioinjector_isolated_dai),
-+
-+	.dapm_widgets = audioinjector_isolated_widgets,
-+	.num_dapm_widgets = ARRAY_SIZE(audioinjector_isolated_widgets),
-+	.dapm_routes = audioinjector_isolated_route,
-+	.num_dapm_routes = ARRAY_SIZE(audioinjector_isolated_route),
-+};
-+
-+static int audioinjector_isolated_probe(struct platform_device *pdev)
-+{
-+	struct snd_soc_card *card = &snd_soc_audioinjector_isolated;
-+	int ret;
-+
-+	card->dev = &pdev->dev;
-+
-+	if (pdev->dev.of_node) {
-+		struct snd_soc_dai_link *dai = &audioinjector_isolated_dai[0];
-+		struct device_node *i2s_node =
-+					of_parse_phandle(pdev->dev.of_node, "i2s-controller", 0);
-+
-+		if (i2s_node) {
-+			dai->cpus->dai_name = NULL;
-+			dai->cpus->of_node = i2s_node;
-+			dai->platforms->name = NULL;
-+			dai->platforms->of_node = i2s_node;
-+		} else {
-+				dev_err(&pdev->dev,
-+				"i2s-controller missing or invalid in DT\n");
-+				return -EINVAL;
-+		}
-+
-+		mute_gpio = devm_gpiod_get_optional(&pdev->dev, "mute", GPIOD_OUT_LOW);
-+		if (IS_ERR(mute_gpio)){
-+			dev_err(&pdev->dev, "mute gpio not found in dt overlay\n");
-+			return PTR_ERR(mute_gpio);
-+		}
-+	}
-+
-+	ret = devm_snd_soc_register_card(&pdev->dev, card);
-+	if (ret && ret != -EPROBE_DEFER)
-+		dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
-+	return ret;
-+}
-+
-+static const struct of_device_id audioinjector_isolated_of_match[] = {
-+	{ .compatible = "ai,audioinjector-isolated-soundcard", },
-+	{},
-+};
-+MODULE_DEVICE_TABLE(of, audioinjector_isolated_of_match);
-+
-+static struct platform_driver audioinjector_isolated_driver = {
-+	.driver	= {
-+		.name			= "audioinjector-isolated",
-+		.owner			= THIS_MODULE,
-+		.of_match_table = audioinjector_isolated_of_match,
-+	},
-+	.probe	= audioinjector_isolated_probe,
-+};
-+
-+module_platform_driver(audioinjector_isolated_driver);
-+MODULE_AUTHOR("Matt Flax <flatmax@flatmax.org>");
-+MODULE_DESCRIPTION("AudioInjector.net isolated Soundcard");
-+MODULE_LICENSE("GPL v2");
-+MODULE_ALIAS("platform:audioinjector-isolated-soundcard");
---- /dev/null
-+++ b/sound/soc/bcm/audioinjector-octo-soundcard.c
-@@ -0,0 +1,346 @@
-+/*
-+ * ASoC Driver for AudioInjector Pi octo channel soundcard (hat)
-+ *
-+ *  Created on: 27-October-2016
-+ *      Author: flatmax@flatmax.org
-+ *              based on audioinjector-pi-soundcard.c
-+ *
-+ * Copyright (C) 2016 Flatmax Pty. Ltd.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/types.h>
-+#include <linux/gpio/consumer.h>
-+
-+#include <sound/core.h>
-+#include <sound/soc.h>
-+#include <sound/pcm_params.h>
-+#include <sound/control.h>
-+
-+static struct gpio_descs *mult_gpios;
-+static struct gpio_desc *codec_rst_gpio;
-+static unsigned int audioinjector_octo_rate;
-+static bool non_stop_clocks;
-+
-+static const unsigned int audioinjector_octo_rates[] = {
-+	96000, 48000, 32000, 24000, 16000, 8000, 88200, 44100, 29400, 22050, 14700,
-+};
-+
-+static struct snd_pcm_hw_constraint_list audioinjector_octo_constraints = {
-+	.list = audioinjector_octo_rates,
-+	.count = ARRAY_SIZE(audioinjector_octo_rates),
-+};
-+
-+static int audioinjector_octo_dai_init(struct snd_soc_pcm_runtime *rtd)
-+{
-+	return snd_soc_dai_set_bclk_ratio(asoc_rtd_to_cpu(rtd, 0), 64);
-+}
-+
-+static int audioinjector_octo_startup(struct snd_pcm_substream *substream)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	asoc_rtd_to_cpu(rtd, 0)->driver->playback.channels_min = 8;
-+	asoc_rtd_to_cpu(rtd, 0)->driver->playback.channels_max = 8;
-+	asoc_rtd_to_cpu(rtd, 0)->driver->capture.channels_min = 8;
-+	asoc_rtd_to_cpu(rtd, 0)->driver->capture.channels_max = 8;
-+	asoc_rtd_to_codec(rtd, 0)->driver->capture.channels_max = 8;
-+
-+	snd_pcm_hw_constraint_list(substream->runtime, 0,
-+				SNDRV_PCM_HW_PARAM_RATE,
-+				&audioinjector_octo_constraints);
-+
-+	return 0;
-+}
-+
-+static void audioinjector_octo_shutdown(struct snd_pcm_substream *substream)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	asoc_rtd_to_cpu(rtd, 0)->driver->playback.channels_min = 2;
-+	asoc_rtd_to_cpu(rtd, 0)->driver->playback.channels_max = 2;
-+	asoc_rtd_to_cpu(rtd, 0)->driver->capture.channels_min = 2;
-+	asoc_rtd_to_cpu(rtd, 0)->driver->capture.channels_max = 2;
-+	asoc_rtd_to_codec(rtd, 0)->driver->capture.channels_max = 6;
-+}
-+
-+static int audioinjector_octo_hw_params(struct snd_pcm_substream *substream,
-+	struct snd_pcm_hw_params *params)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+
-+	// set codec DAI configuration
-+	int ret = snd_soc_dai_set_fmt(asoc_rtd_to_codec(rtd, 0),
-+			SND_SOC_DAIFMT_CBS_CFS|SND_SOC_DAIFMT_DSP_A|
-+			SND_SOC_DAIFMT_NB_NF);
-+	if (ret < 0)
-+		return ret;
-+
-+	// set cpu DAI configuration
-+	ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0),
-+			SND_SOC_DAIFMT_CBM_CFM|SND_SOC_DAIFMT_I2S|
-+			SND_SOC_DAIFMT_NB_NF);
-+	if (ret < 0)
-+		return ret;
-+
-+	audioinjector_octo_rate = params_rate(params);
-+
-+	// Set the correct sysclock for the codec
-+	switch (audioinjector_octo_rate) {
-+	case 96000:
-+	case 48000:
-+		return snd_soc_dai_set_sysclk(asoc_rtd_to_codec(rtd, 0), 0, 49152000,
-+									0);
-+		break;
-+	case 24000:
-+		return snd_soc_dai_set_sysclk(asoc_rtd_to_codec(rtd, 0), 0, 49152000/2,
-+									0);
-+		break;
-+	case 32000:
-+	case 16000:
-+		return snd_soc_dai_set_sysclk(asoc_rtd_to_codec(rtd, 0), 0, 49152000/3,
-+									0);
-+		break;
-+	case 8000:
-+		return snd_soc_dai_set_sysclk(asoc_rtd_to_codec(rtd, 0), 0, 49152000/6,
-+									0);
-+		break;
-+	case 88200:
-+	case 44100:
-+		return snd_soc_dai_set_sysclk(asoc_rtd_to_codec(rtd, 0), 0, 45185400,
-+									0);
-+		break;
-+	case 22050:
-+		return snd_soc_dai_set_sysclk(asoc_rtd_to_codec(rtd, 0), 0, 45185400/2,
-+									0);
-+		break;
-+	case 29400:
-+	case 14700:
-+		return snd_soc_dai_set_sysclk(asoc_rtd_to_codec(rtd, 0), 0, 45185400/3,
-+									0);
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+}
-+
-+static int audioinjector_octo_trigger(struct snd_pcm_substream *substream,
-+								int cmd){
-+	DECLARE_BITMAP(mult, 4);
-+
-+	memset(mult, 0, sizeof(mult));
-+
-+	switch (cmd) {
-+	case SNDRV_PCM_TRIGGER_STOP:
-+	case SNDRV_PCM_TRIGGER_SUSPEND:
-+	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-+		if (!non_stop_clocks)
-+			break;
-+		fallthrough;
-+	case SNDRV_PCM_TRIGGER_START:
-+	case SNDRV_PCM_TRIGGER_RESUME:
-+	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-+		switch (audioinjector_octo_rate) {
-+		case 96000:
-+			__assign_bit(3, mult, 1);
-+			fallthrough;
-+		case 88200:
-+			__assign_bit(1, mult, 1);
-+			__assign_bit(2, mult, 1);
-+			break;
-+		case 48000:
-+			__assign_bit(3, mult, 1);
-+			fallthrough;
-+		case 44100:
-+			__assign_bit(2, mult, 1);
-+			break;
-+		case 32000:
-+			__assign_bit(3, mult, 1);
-+			fallthrough;
-+		case 29400:
-+			__assign_bit(0, mult, 1);
-+			__assign_bit(1, mult, 1);
-+			break;
-+		case 24000:
-+			__assign_bit(3, mult, 1);
-+			fallthrough;
-+		case 22050:
-+			__assign_bit(1, mult, 1);
-+			break;
-+		case 16000:
-+			__assign_bit(3, mult, 1);
-+			fallthrough;
-+		case 14700:
-+			__assign_bit(0, mult, 1);
-+			break;
-+		case 8000:
-+			__assign_bit(3, mult, 1);
-+			break;
-+		default:
-+			return -EINVAL;
-+		}
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+	gpiod_set_array_value_cansleep(mult_gpios->ndescs, mult_gpios->desc,
-+				       NULL, mult);
-+
-+	return 0;
-+}
-+
-+static struct snd_soc_ops audioinjector_octo_ops = {
-+	.startup	= audioinjector_octo_startup,
-+	.shutdown	= audioinjector_octo_shutdown,
-+	.hw_params = audioinjector_octo_hw_params,
-+	.trigger = audioinjector_octo_trigger,
-+};
-+
-+SND_SOC_DAILINK_DEFS(audioinjector_octo,
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()),
-+	DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "cs42448")),
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()));
-+
-+static struct snd_soc_dai_link audioinjector_octo_dai[] = {
-+	{
-+		.name = "AudioInjector Octo",
-+		.stream_name = "AudioInject-HIFI",
-+		.ops = &audioinjector_octo_ops,
-+		.init = audioinjector_octo_dai_init,
-+		.symmetric_rate = 1,
-+		.symmetric_channels = 1,
-+		SND_SOC_DAILINK_REG(audioinjector_octo),
-+	},
-+};
-+
-+static const struct snd_soc_dapm_widget audioinjector_octo_widgets[] = {
-+	SND_SOC_DAPM_OUTPUT("OUTPUTS0"),
-+	SND_SOC_DAPM_OUTPUT("OUTPUTS1"),
-+	SND_SOC_DAPM_OUTPUT("OUTPUTS2"),
-+	SND_SOC_DAPM_OUTPUT("OUTPUTS3"),
-+	SND_SOC_DAPM_INPUT("INPUTS0"),
-+	SND_SOC_DAPM_INPUT("INPUTS1"),
-+	SND_SOC_DAPM_INPUT("INPUTS2"),
-+};
-+
-+static const struct snd_soc_dapm_route audioinjector_octo_route[] = {
-+	/* Balanced outputs */
-+	{"OUTPUTS0", NULL, "AOUT1L"},
-+	{"OUTPUTS0", NULL, "AOUT1R"},
-+	{"OUTPUTS1", NULL, "AOUT2L"},
-+	{"OUTPUTS1", NULL, "AOUT2R"},
-+	{"OUTPUTS2", NULL, "AOUT3L"},
-+	{"OUTPUTS2", NULL, "AOUT3R"},
-+	{"OUTPUTS3", NULL, "AOUT4L"},
-+	{"OUTPUTS3", NULL, "AOUT4R"},
-+
-+	/* Balanced inputs */
-+	{"AIN1L", NULL, "INPUTS0"},
-+	{"AIN1R", NULL, "INPUTS0"},
-+	{"AIN2L", NULL, "INPUTS1"},
-+	{"AIN2R", NULL, "INPUTS1"},
-+	{"AIN3L", NULL, "INPUTS2"},
-+	{"AIN3R", NULL, "INPUTS2"},
-+};
-+
-+static struct snd_soc_card snd_soc_audioinjector_octo = {
-+	.name = "audioinjector-octo-soundcard",
-+	.dai_link = audioinjector_octo_dai,
-+	.num_links = ARRAY_SIZE(audioinjector_octo_dai),
-+
-+	.dapm_widgets = audioinjector_octo_widgets,
-+	.num_dapm_widgets = ARRAY_SIZE(audioinjector_octo_widgets),
-+	.dapm_routes = audioinjector_octo_route,
-+	.num_dapm_routes = ARRAY_SIZE(audioinjector_octo_route),
-+};
-+
-+static int audioinjector_octo_probe(struct platform_device *pdev)
-+{
-+	struct snd_soc_card *card = &snd_soc_audioinjector_octo;
-+	int ret;
-+
-+	card->dev = &pdev->dev;
-+
-+	if (pdev->dev.of_node) {
-+		struct snd_soc_dai_link *dai = &audioinjector_octo_dai[0];
-+		struct device_node *i2s_node =
-+					of_parse_phandle(pdev->dev.of_node,
-+							"i2s-controller", 0);
-+		struct device_node *codec_node =
-+					of_parse_phandle(pdev->dev.of_node,
-+								"codec", 0);
-+
-+		mult_gpios = devm_gpiod_get_array_optional(&pdev->dev, "mult",
-+								GPIOD_OUT_LOW);
-+		if (IS_ERR(mult_gpios))
-+			return PTR_ERR(mult_gpios);
-+
-+		codec_rst_gpio = devm_gpiod_get_optional(&pdev->dev, "reset",
-+								GPIOD_OUT_LOW);
-+		if (IS_ERR(codec_rst_gpio))
-+			return PTR_ERR(codec_rst_gpio);
-+
-+		non_stop_clocks = of_property_read_bool(pdev->dev.of_node, "non-stop-clocks");
-+
-+		if (codec_rst_gpio)
-+			gpiod_set_value(codec_rst_gpio, 1);
-+		msleep(500);
-+		if (codec_rst_gpio)
-+			gpiod_set_value(codec_rst_gpio, 0);
-+		msleep(500);
-+		if (codec_rst_gpio)
-+			gpiod_set_value(codec_rst_gpio, 1);
-+		msleep(500);
-+
-+		if (i2s_node && codec_node) {
-+			dai->cpus->dai_name = NULL;
-+			dai->cpus->of_node = i2s_node;
-+			dai->platforms->name = NULL;
-+			dai->platforms->of_node = i2s_node;
-+			dai->codecs->name = NULL;
-+			dai->codecs->of_node = codec_node;
-+		} else
-+			if (!i2s_node) {
-+				dev_err(&pdev->dev,
-+				"i2s-controller missing or invalid in DT\n");
-+				return -EINVAL;
-+			} else {
-+				dev_err(&pdev->dev,
-+				"Property 'codec' missing or invalid\n");
-+				return -EINVAL;
-+			}
-+	}
-+
-+	ret = devm_snd_soc_register_card(&pdev->dev, card);
-+	if (ret != 0)
-+		dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
-+	return ret;
-+}
-+
-+static const struct of_device_id audioinjector_octo_of_match[] = {
-+	{ .compatible = "ai,audioinjector-octo-soundcard", },
-+	{},
-+};
-+MODULE_DEVICE_TABLE(of, audioinjector_octo_of_match);
-+
-+static struct platform_driver audioinjector_octo_driver = {
-+	.driver	= {
-+		.name			= "audioinjector-octo",
-+		.owner			= THIS_MODULE,
-+		.of_match_table = audioinjector_octo_of_match,
-+	},
-+	.probe	= audioinjector_octo_probe,
-+};
-+
-+module_platform_driver(audioinjector_octo_driver);
-+MODULE_AUTHOR("Matt Flax <flatmax@flatmax.org>");
-+MODULE_DESCRIPTION("AudioInjector.net octo Soundcard");
-+MODULE_LICENSE("GPL v2");
-+MODULE_ALIAS("platform:audioinjector-octo-soundcard");
---- /dev/null
-+++ b/sound/soc/bcm/audioinjector-pi-soundcard.c
-@@ -0,0 +1,189 @@
-+/*
-+ * ASoC Driver for AudioInjector Pi add on soundcard
-+ *
-+ *  Created on: 13-May-2016
-+ *      Author: flatmax@flatmax.org
-+ *              based on code by  Cliff Cai <Cliff.Cai@analog.com> for the ssm2602 machine blackfin.
-+ *              with help from Lars-Peter Clausen for simplifying the original code to use the dai_fmt field.
-+ *		i2s_node code taken from the other sound/soc/bcm machine drivers.
-+ *
-+ * Copyright (C) 2016 Flatmax Pty. Ltd.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/types.h>
-+
-+#include <sound/core.h>
-+#include <sound/soc.h>
-+#include <sound/pcm_params.h>
-+#include <sound/control.h>
-+
-+#include "../codecs/wm8731.h"
-+
-+static const unsigned int bcm2835_rates_12000000[] = {
-+	8000, 16000, 32000, 44100, 48000, 96000, 88200,
-+};
-+
-+static struct snd_pcm_hw_constraint_list bcm2835_constraints_12000000 = {
-+	.list = bcm2835_rates_12000000,
-+	.count = ARRAY_SIZE(bcm2835_rates_12000000),
-+};
-+
-+static int snd_audioinjector_pi_soundcard_startup(struct snd_pcm_substream *substream)
-+{
-+	/* Setup constraints, because there is a 12 MHz XTAL on the board */
-+	snd_pcm_hw_constraint_list(substream->runtime, 0,
-+				SNDRV_PCM_HW_PARAM_RATE,
-+				&bcm2835_constraints_12000000);
-+	return 0;
-+}
-+
-+static int snd_audioinjector_pi_soundcard_hw_params(struct snd_pcm_substream *substream,
-+				       struct snd_pcm_hw_params *params)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
-+
-+	switch (params_rate(params)){
-+		case 8000:
-+			return snd_soc_dai_set_bclk_ratio(cpu_dai, 1);
-+		case 16000:
-+			return snd_soc_dai_set_bclk_ratio(cpu_dai, 750);
-+		case 32000:
-+			return snd_soc_dai_set_bclk_ratio(cpu_dai, 375);
-+		case 44100:
-+			return snd_soc_dai_set_bclk_ratio(cpu_dai, 272);
-+		case 48000:
-+			return snd_soc_dai_set_bclk_ratio(cpu_dai, 250);
-+		case 88200:
-+			return snd_soc_dai_set_bclk_ratio(cpu_dai, 136);
-+		case 96000:
-+			return snd_soc_dai_set_bclk_ratio(cpu_dai, 125);
-+		default:
-+			return snd_soc_dai_set_bclk_ratio(cpu_dai, 125);
-+	}
-+}
-+
-+/* machine stream operations */
-+static struct snd_soc_ops snd_audioinjector_pi_soundcard_ops = {
-+	.startup = snd_audioinjector_pi_soundcard_startup,
-+	.hw_params = snd_audioinjector_pi_soundcard_hw_params,
-+};
-+
-+static int audioinjector_pi_soundcard_dai_init(struct snd_soc_pcm_runtime *rtd)
-+{
-+	return snd_soc_dai_set_sysclk(asoc_rtd_to_codec(rtd, 0), WM8731_SYSCLK_XTAL, 12000000, SND_SOC_CLOCK_IN);
-+}
-+
-+SND_SOC_DAILINK_DEFS(audioinjector_pi,
-+	DAILINK_COMP_ARRAY(COMP_CPU("bcm2708-i2s.0")),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("wm8731.1-001a", "wm8731-hifi")),
-+	DAILINK_COMP_ARRAY(COMP_PLATFORM("bcm2835-i2s.0")));
-+
-+static struct snd_soc_dai_link audioinjector_pi_soundcard_dai[] = {
-+	{
-+		.name = "AudioInjector audio",
-+		.stream_name = "AudioInjector audio",
-+		.ops = &snd_audioinjector_pi_soundcard_ops,
-+		.init = audioinjector_pi_soundcard_dai_init,
-+		.dai_fmt = SND_SOC_DAIFMT_CBM_CFM|SND_SOC_DAIFMT_I2S|SND_SOC_DAIFMT_NB_NF,
-+		SND_SOC_DAILINK_REG(audioinjector_pi),
-+	},
-+};
-+
-+static const struct snd_soc_dapm_widget wm8731_dapm_widgets[] = {
-+	SND_SOC_DAPM_HP("Headphone Jack", NULL),
-+	SND_SOC_DAPM_SPK("Ext Spk", NULL),
-+	SND_SOC_DAPM_LINE("Line In Jacks", NULL),
-+	SND_SOC_DAPM_MIC("Microphone", NULL),
-+};
-+
-+static const struct snd_soc_dapm_route audioinjector_audio_map[] = {
-+	/* headphone connected to LHPOUT, RHPOUT */
-+	{"Headphone Jack", NULL, "LHPOUT"},
-+	{"Headphone Jack", NULL, "RHPOUT"},
-+
-+	/* speaker connected to LOUT, ROUT */
-+	{"Ext Spk", NULL, "ROUT"},
-+	{"Ext Spk", NULL, "LOUT"},
-+
-+	/* line inputs */
-+	{"Line In Jacks", NULL, "Line Input"},
-+
-+	/* mic is connected to Mic Jack, with WM8731 Mic Bias */
-+	{"Microphone", NULL, "Mic Bias"},
-+};
-+
-+static struct snd_soc_card snd_soc_audioinjector = {
-+	.name = "audioinjector-pi-soundcard",
-+	.dai_link = audioinjector_pi_soundcard_dai,
-+	.num_links = ARRAY_SIZE(audioinjector_pi_soundcard_dai),
-+
-+	.dapm_widgets = wm8731_dapm_widgets,
-+	.num_dapm_widgets = ARRAY_SIZE(wm8731_dapm_widgets),
-+	.dapm_routes = audioinjector_audio_map,
-+	.num_dapm_routes = ARRAY_SIZE(audioinjector_audio_map),
-+};
-+
-+static int audioinjector_pi_soundcard_probe(struct platform_device *pdev)
-+{
-+	struct snd_soc_card *card = &snd_soc_audioinjector;
-+	int ret;
-+	
-+	card->dev = &pdev->dev;
-+
-+	if (pdev->dev.of_node) {
-+		struct snd_soc_dai_link *dai = &audioinjector_pi_soundcard_dai[0];
-+		struct device_node *i2s_node = of_parse_phandle(pdev->dev.of_node,
-+								"i2s-controller", 0);
-+
-+		if (i2s_node) {
-+			dai->cpus->dai_name = NULL;
-+			dai->cpus->of_node = i2s_node;
-+			dai->platforms->name = NULL;
-+			dai->platforms->of_node = i2s_node;
-+		} else
-+			if (!dai->cpus->of_node) {
-+				dev_err(&pdev->dev, "Property 'i2s-controller' missing or invalid\n");
-+				return -EINVAL;
-+			}
-+	}
-+
-+	if ((ret = devm_snd_soc_register_card(&pdev->dev, card)))
-+		return dev_err_probe(&pdev->dev, ret, "%s\n", __func__);
-+
-+	dev_info(&pdev->dev, "successfully loaded\n");
-+
-+	return ret;
-+}
-+
-+static const struct of_device_id audioinjector_pi_soundcard_of_match[] = {
-+	{ .compatible = "ai,audioinjector-pi-soundcard", },
-+	{},
-+};
-+MODULE_DEVICE_TABLE(of, audioinjector_pi_soundcard_of_match);
-+
-+static struct platform_driver audioinjector_pi_soundcard_driver = {
-+       .driver         = {
-+		.name   = "audioinjector-stereo",
-+		.owner  = THIS_MODULE,
-+		.of_match_table = audioinjector_pi_soundcard_of_match,
-+       },
-+       .probe          = audioinjector_pi_soundcard_probe,
-+};
-+
-+module_platform_driver(audioinjector_pi_soundcard_driver);
-+MODULE_AUTHOR("Matt Flax <flatmax@flatmax.org>");
-+MODULE_DESCRIPTION("AudioInjector.net Pi Soundcard");
-+MODULE_LICENSE("GPL v2");
-+MODULE_ALIAS("platform:audioinjector-pi-soundcard");
-+
---- /dev/null
-+++ b/sound/soc/bcm/audiosense-pi.c
-@@ -0,0 +1,248 @@
-+/*
-+ * ASoC Driver for AudioSense add on soundcard
-+ * Author:
-+ *	Bhargav A K <anur.bhargav@gmail.com>
-+ *	Copyright 2017
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/clk.h>
-+#include <linux/i2c.h>
-+#include <sound/core.h>
-+#include <sound/pcm.h>
-+#include <sound/pcm_params.h>
-+#include <sound/soc.h>
-+#include <sound/jack.h>
-+#include <sound/control.h>
-+
-+#include <sound/tlv320aic32x4.h>
-+#include "../codecs/tlv320aic32x4.h"
-+
-+#define AIC32X4_SYSCLK_XTAL	0x00
-+
-+/*
-+ * Setup Codec Sample Rates and Channels
-+ * Supported Rates:
-+ *	8000, 11025, 16000, 22050, 32000, 44100, 48000, 64000, 88200, 96000,
-+ */
-+static const unsigned int audiosense_pi_rate[] = {
-+	48000,
-+};
-+
-+static struct snd_pcm_hw_constraint_list audiosense_constraints_rates = {
-+	.list = audiosense_pi_rate,
-+	.count = ARRAY_SIZE(audiosense_pi_rate),
-+};
-+
-+static const unsigned int audiosense_pi_channels[] = {
-+	2,
-+};
-+
-+static struct snd_pcm_hw_constraint_list audiosense_constraints_ch = {
-+	.count = ARRAY_SIZE(audiosense_pi_channels),
-+	.list = audiosense_pi_channels,
-+	.mask = 0,
-+};
-+
-+/* Setup DAPM widgets and paths */
-+static const struct snd_soc_dapm_widget audiosense_pi_dapm_widgets[] = {
-+	SND_SOC_DAPM_HP("Headphone Jack", NULL),
-+	SND_SOC_DAPM_LINE("Line Out", NULL),
-+	SND_SOC_DAPM_LINE("Line In", NULL),
-+	SND_SOC_DAPM_INPUT("CM_L"),
-+	SND_SOC_DAPM_INPUT("CM_R"),
-+};
-+
-+static const struct snd_soc_dapm_route audiosense_pi_audio_map[] = {
-+	/* Line Inputs are connected to
-+	 * (IN1_L | IN1_R)
-+	 * (IN2_L | IN2_R)
-+	 * (IN3_L | IN3_R)
-+	 */
-+	{"IN1_L", NULL, "Line In"},
-+	{"IN1_R", NULL, "Line In"},
-+	{"IN2_L", NULL, "Line In"},
-+	{"IN2_R", NULL, "Line In"},
-+	{"IN3_L", NULL, "Line In"},
-+	{"IN3_R", NULL, "Line In"},
-+
-+	/* Mic is connected to IN2_L and IN2_R */
-+	{"Left ADC", NULL, "Mic Bias"},
-+	{"Right ADC", NULL, "Mic Bias"},
-+
-+	/* Headphone connected to HPL, HPR */
-+	{"Headphone Jack", NULL, "HPL"},
-+	{"Headphone Jack", NULL, "HPR"},
-+
-+	/* Speakers connected to LOL and LOR */
-+	{"Line Out", NULL, "LOL"},
-+	{"Line Out", NULL, "LOR"},
-+};
-+
-+static int audiosense_pi_card_init(struct snd_soc_pcm_runtime *rtd)
-+{
-+	/* TODO: init of the codec specific dapm data, ignore suspend/resume */
-+	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
-+
-+	snd_soc_component_update_bits(component, AIC32X4_MICBIAS, 0x78,
-+				      AIC32X4_MICBIAS_LDOIN |
-+				      AIC32X4_MICBIAS_2075V);
-+	snd_soc_component_update_bits(component, AIC32X4_PWRCFG, 0x08,
-+				      AIC32X4_AVDDWEAKDISABLE);
-+	snd_soc_component_update_bits(component, AIC32X4_LDOCTL, 0x01,
-+				      AIC32X4_LDOCTLEN);
-+
-+	return 0;
-+}
-+
-+static int audiosense_pi_card_hw_params(
-+		struct snd_pcm_substream *substream,
-+		struct snd_pcm_hw_params *params)
-+{
-+	int ret = 0;
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
-+
-+	/* Set the codec system clock, there is a 12 MHz XTAL on the board */
-+	ret = snd_soc_dai_set_sysclk(codec_dai, AIC32X4_SYSCLK_XTAL,
-+				     12000000, SND_SOC_CLOCK_IN);
-+	if (ret) {
-+		dev_err(rtd->card->dev,
-+			"could not set codec driver clock params\n");
-+		return ret;
-+	}
-+	return 0;
-+}
-+
-+static int audiosense_pi_card_startup(struct snd_pcm_substream *substream)
-+{
-+	struct snd_pcm_runtime *runtime = substream->runtime;
-+
-+	/*
-+	 * Set codec to 48Khz Sampling, Stereo I/O and 16 bit audio
-+	 */
-+	runtime->hw.channels_max = 2;
-+	snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
-+				   &audiosense_constraints_ch);
-+
-+	runtime->hw.formats = SNDRV_PCM_FMTBIT_S16_LE;
-+	snd_pcm_hw_constraint_msbits(runtime, 0, 16, 16);
-+
-+
-+	snd_pcm_hw_constraint_list(substream->runtime, 0,
-+				   SNDRV_PCM_HW_PARAM_RATE,
-+				   &audiosense_constraints_rates);
-+	return 0;
-+}
-+
-+static struct snd_soc_ops audiosense_pi_card_ops = {
-+	.startup = audiosense_pi_card_startup,
-+	.hw_params = audiosense_pi_card_hw_params,
-+};
-+
-+SND_SOC_DAILINK_DEFS(audiosense_pi,
-+	DAILINK_COMP_ARRAY(COMP_CPU("bcm2708-i2s.0")),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("tlv320aic32x4.1-0018", "tlv320aic32x4-hifi")),
-+	DAILINK_COMP_ARRAY(COMP_PLATFORM("bcm2708-i2s.0")));
-+
-+static struct snd_soc_dai_link audiosense_pi_card_dai[] = {
-+	{
-+		.name           = "TLV320AIC3204 Audio",
-+		.stream_name    = "TLV320AIC3204 Hifi Audio",
-+		.dai_fmt        = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-+			SND_SOC_DAIFMT_CBM_CFM,
-+		.ops            = &audiosense_pi_card_ops,
-+		.init           = audiosense_pi_card_init,
-+		SND_SOC_DAILINK_REG(audiosense_pi),
-+	},
-+};
-+
-+static struct snd_soc_card audiosense_pi_card = {
-+	.name		= "audiosense-pi",
-+	.driver_name	= "audiosense-pi",
-+	.dai_link	= audiosense_pi_card_dai,
-+	.owner		= THIS_MODULE,
-+	.num_links	= ARRAY_SIZE(audiosense_pi_card_dai),
-+	.dapm_widgets	= audiosense_pi_dapm_widgets,
-+	.num_dapm_widgets = ARRAY_SIZE(audiosense_pi_dapm_widgets),
-+	.dapm_routes	= audiosense_pi_audio_map,
-+	.num_dapm_routes = ARRAY_SIZE(audiosense_pi_audio_map),
-+};
-+
-+static int audiosense_pi_card_probe(struct platform_device *pdev)
-+{
-+	int ret = 0;
-+	struct snd_soc_card *card = &audiosense_pi_card;
-+	struct snd_soc_dai_link *dai = &audiosense_pi_card_dai[0];
-+	struct device_node *i2s_node = pdev->dev.of_node;
-+
-+	card->dev = &pdev->dev;
-+
-+	if (!dai) {
-+		dev_err(&pdev->dev, "DAI not found. Missing or Invalid\n");
-+		return -EINVAL;
-+	}
-+
-+	i2s_node = of_parse_phandle(pdev->dev.of_node, "i2s-controller", 0);
-+	if (!i2s_node) {
-+		dev_err(&pdev->dev,
-+			"Property 'i2s-controller' missing or invalid\n");
-+		return -EINVAL;
-+	}
-+
-+	dai->cpus->dai_name = NULL;
-+	dai->cpus->of_node = i2s_node;
-+	dai->platforms->name = NULL;
-+	dai->platforms->of_node = i2s_node;
-+
-+	of_node_put(i2s_node);
-+
-+	ret = snd_soc_register_card(card);
-+	if (ret && ret != -EPROBE_DEFER)
-+		dev_err(&pdev->dev,
-+			"snd_soc_register_card() failed: %d\n", ret);
-+
-+	return ret;
-+}
-+
-+static int audiosense_pi_card_remove(struct platform_device *pdev)
-+{
-+	struct snd_soc_card *card = platform_get_drvdata(pdev);
-+
-+	snd_soc_unregister_card(card);
-+	return 0;
-+}
-+
-+static const struct of_device_id audiosense_pi_card_of_match[] = {
-+	{ .compatible = "as,audiosense-pi", },
-+	{},
-+};
-+MODULE_DEVICE_TABLE(of, audiosense_pi_card_of_match);
-+
-+static struct platform_driver audiosense_pi_card_driver = {
-+	.driver = {
-+		.name = "audiosense-snd-card",
-+		.owner = THIS_MODULE,
-+		.of_match_table = audiosense_pi_card_of_match,
-+	},
-+	.probe = audiosense_pi_card_probe,
-+	.remove = audiosense_pi_card_remove,
-+};
-+
-+module_platform_driver(audiosense_pi_card_driver);
-+
-+MODULE_AUTHOR("Bhargav AK <anur.bhargav@gmail.com>");
-+MODULE_DESCRIPTION("ASoC Driver for TLV320AIC3204 Audio");
-+MODULE_LICENSE("GPL v2");
-+MODULE_ALIAS("platform:audiosense-pi");
-+
---- /dev/null
-+++ b/sound/soc/bcm/chipdip-dac.c
-@@ -0,0 +1,275 @@
-+/*
-+ * ASoC Driver for ChipDip DAC
-+ *
-+ * Author:	Evgenij Sapunov
-+ *		Copyright 2021
-+ *		based on code by Milan Neskovic <info@justboom.co>
-+ *		based on code by Jaikumar <jaikumar@cem-solutions.net>
-+ *
-+ * Thanks to Phil Elwell (pelwell) for help.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/gpio/consumer.h>
-+#include <linux/platform_device.h>
-+#include <linux/delay.h>
-+
-+#include <sound/core.h>
-+#include <sound/pcm.h>
-+#include <sound/pcm_params.h>
-+#include <sound/soc.h>
-+#include <sound/jack.h>
-+
-+#define SR_BIT_0                  0 //sample rate bits
-+#define SR_BIT_1                  1
-+#define SR_BIT_2                  2
-+#define BD_BIT_0                  3 //bit depth bits
-+#define BD_BIT_1                  4
-+
-+#define SAMPLE_RATE_MASK_44_1     0
-+#define SAMPLE_RATE_MASK_48       (1 << SR_BIT_0)
-+#define SAMPLE_RATE_MASK_88_2     ((1 << SR_BIT_2) | (1 << SR_BIT_1))
-+#define SAMPLE_RATE_MASK_96       (1 << SR_BIT_1)
-+#define SAMPLE_RATE_MASK_176_4    ((1 << SR_BIT_2) | (1 << SR_BIT_1) | (1 << SR_BIT_0))
-+#define SAMPLE_RATE_MASK_192      ((1 << SR_BIT_1) | (1 << SR_BIT_0))
-+#define SAMPLE_RATE_MASK          ((1 << SR_BIT_2) | (1 << SR_BIT_1) | (1 << SR_BIT_0))
-+
-+#define BIT_DEPTH_MASK_16         0
-+#define BIT_DEPTH_MASK_24         (1 << BD_BIT_0)
-+#define BIT_DEPTH_MASK_32         (1 << BD_BIT_1)
-+#define BIT_DEPTH_MASK            ((1 << BD_BIT_1) | (1 << BD_BIT_0))
-+
-+#define MUTE_ACTIVE               0
-+#define MUTE_NOT_ACTIVE           1
-+
-+#define HW_PARAMS_GPIO_COUNT      5
-+
-+static struct gpio_desc *mute_gpio;
-+static struct gpio_desc *sdwn_gpio;
-+static struct gpio_desc *hw_params_gpios[HW_PARAMS_GPIO_COUNT];
-+static int current_width;
-+static int current_rate;
-+
-+static void snd_rpi_chipdip_dac_gpio_array_set(int value);
-+static void snd_rpi_chipdip_dac_gpio_set(struct gpio_desc *gpio_item, int value);
-+
-+static void snd_rpi_chipdip_dac_gpio_array_set(int value)
-+{
-+	int i = 0;
-+
-+	for (i = 0; i < HW_PARAMS_GPIO_COUNT; i++)
-+		snd_rpi_chipdip_dac_gpio_set(hw_params_gpios[i], ((value >> i) & 1));
-+}
-+
-+static void snd_rpi_chipdip_dac_gpio_set(struct gpio_desc *gpio_item, int value)
-+{
-+	if (gpio_item)
-+		gpiod_set_value_cansleep(gpio_item, value);
-+}
-+
-+static int snd_rpi_chipdip_dac_init(struct snd_soc_pcm_runtime *rtd)
-+{
-+	return 0;
-+}
-+
-+static int snd_rpi_chipdip_dac_hw_params(struct snd_pcm_substream *substream,
-+					 struct snd_pcm_hw_params *params)
-+{
-+	int ret = 0;
-+	int gpio_change_pending = 0;
-+	int sample_rate_state = 0;
-+	int bit_depth_state = 0;
-+	int param_value = params_width(params);
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+
-+	ret = snd_soc_dai_set_bclk_ratio(asoc_rtd_to_cpu(rtd, 0), 2 * 32);
-+
-+	if (current_width != param_value) {
-+		current_width = param_value;
-+		gpio_change_pending = 1;
-+
-+		switch (param_value) {
-+		case 16:
-+			bit_depth_state = BIT_DEPTH_MASK_16;
-+			break;
-+		case 24:
-+			bit_depth_state = BIT_DEPTH_MASK_24;
-+			break;
-+		case 32:
-+			bit_depth_state = BIT_DEPTH_MASK_32;
-+			break;
-+		default:
-+			return -EINVAL;
-+		}
-+	}
-+
-+	param_value = params_rate(params);
-+	if (current_rate != param_value) {
-+		current_rate = param_value;
-+		gpio_change_pending = 1;
-+
-+		switch (param_value) {
-+		case 44100:
-+			sample_rate_state = SAMPLE_RATE_MASK_44_1;
-+			break;
-+		case 48000:
-+			sample_rate_state = SAMPLE_RATE_MASK_48;
-+			break;
-+		case 88200:
-+			sample_rate_state = SAMPLE_RATE_MASK_88_2;
-+			break;
-+		case 96000:
-+			sample_rate_state = SAMPLE_RATE_MASK_96;
-+			break;
-+		case 176400:
-+			sample_rate_state = SAMPLE_RATE_MASK_176_4;
-+			break;
-+		case 192000:
-+			sample_rate_state = SAMPLE_RATE_MASK_192;
-+			break;
-+		default:
-+			return -EINVAL;
-+		}
-+	}
-+
-+	if (gpio_change_pending) {
-+		snd_rpi_chipdip_dac_gpio_set(mute_gpio, MUTE_ACTIVE);
-+		snd_rpi_chipdip_dac_gpio_array_set(bit_depth_state | sample_rate_state);
-+		msleep(300);
-+		snd_rpi_chipdip_dac_gpio_set(mute_gpio, MUTE_NOT_ACTIVE);
-+	}
-+
-+	return ret;
-+}
-+
-+static int snd_rpi_chipdip_dac_startup(struct snd_pcm_substream *substream)
-+{
-+	return 0;
-+}
-+
-+static void snd_rpi_chipdip_dac_shutdown(struct snd_pcm_substream *substream)
-+{
-+
-+}
-+
-+/* machine stream operations */
-+static struct snd_soc_ops snd_rpi_chipdip_dac_ops = {
-+	.hw_params = snd_rpi_chipdip_dac_hw_params,
-+	.startup = snd_rpi_chipdip_dac_startup,
-+	.shutdown = snd_rpi_chipdip_dac_shutdown,
-+};
-+
-+SND_SOC_DAILINK_DEFS(hifi,
-+	DAILINK_COMP_ARRAY(COMP_CPU("bcm2708-i2s.0")),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("spdif-transmitter", "dit-hifi")),
-+	DAILINK_COMP_ARRAY(COMP_PLATFORM("bcm2708-i2s.0")));
-+
-+static struct snd_soc_dai_link snd_rpi_chipdip_dac_dai[] = {
-+{
-+	.name		= "ChipDip DAC",
-+	.stream_name	= "ChipDip DAC HiFi",
-+	.dai_fmt	= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-+				SND_SOC_DAIFMT_CBM_CFM,
-+	.ops		= &snd_rpi_chipdip_dac_ops,
-+	.init		= snd_rpi_chipdip_dac_init,
-+	SND_SOC_DAILINK_REG(hifi),
-+},
-+};
-+
-+/* audio machine driver */
-+static struct snd_soc_card snd_rpi_chipdip_dac = {
-+	.name         = "ChipDipDAC",
-+	.driver_name  = "ChipdipDac",
-+	.owner        = THIS_MODULE,
-+	.dai_link     = snd_rpi_chipdip_dac_dai,
-+	.num_links    = ARRAY_SIZE(snd_rpi_chipdip_dac_dai),
-+};
-+
-+static int snd_rpi_chipdip_dac_probe(struct platform_device *pdev)
-+{
-+	int ret = 0;
-+	int i = 0;
-+
-+	snd_rpi_chipdip_dac.dev = &pdev->dev;
-+
-+	if (pdev->dev.of_node) {
-+		struct device_node *i2s_node;
-+		struct snd_soc_dai_link *dai = &snd_rpi_chipdip_dac_dai[0];
-+		i2s_node = of_parse_phandle(pdev->dev.of_node,
-+					"i2s-controller", 0);
-+
-+		if (i2s_node) {
-+			dai->cpus->dai_name = NULL;
-+			dai->cpus->of_node = i2s_node;
-+			dai->platforms->name = NULL;
-+			dai->platforms->of_node = i2s_node;
-+		}
-+	}
-+
-+	hw_params_gpios[SR_BIT_0] = devm_gpiod_get_optional(&pdev->dev, "sr0", GPIOD_OUT_LOW);
-+	hw_params_gpios[SR_BIT_1] = devm_gpiod_get_optional(&pdev->dev, "sr1", GPIOD_OUT_LOW);
-+	hw_params_gpios[SR_BIT_2] = devm_gpiod_get_optional(&pdev->dev, "sr2", GPIOD_OUT_LOW);
-+	hw_params_gpios[BD_BIT_0] = devm_gpiod_get_optional(&pdev->dev, "res0", GPIOD_OUT_LOW);
-+	hw_params_gpios[BD_BIT_1] = devm_gpiod_get_optional(&pdev->dev, "res1", GPIOD_OUT_LOW);
-+	mute_gpio = devm_gpiod_get_optional(&pdev->dev, "mute", GPIOD_OUT_LOW);
-+	sdwn_gpio = devm_gpiod_get_optional(&pdev->dev, "sdwn", GPIOD_OUT_HIGH);
-+
-+	for (i = 0; i < HW_PARAMS_GPIO_COUNT; i++) {
-+		if (IS_ERR(hw_params_gpios[i])) {
-+			ret = PTR_ERR(hw_params_gpios[i]);
-+			dev_err(&pdev->dev, "failed to get hw_params gpio: %d\n", ret);
-+			return ret;
-+		}
-+	}
-+
-+	if (IS_ERR(mute_gpio)) {
-+		ret = PTR_ERR(mute_gpio);
-+		dev_err(&pdev->dev, "failed to get mute gpio: %d\n", ret);
-+		return ret;
-+	}
-+
-+	if (IS_ERR(sdwn_gpio)) {
-+		ret = PTR_ERR(sdwn_gpio);
-+		dev_err(&pdev->dev, "failed to get sdwn gpio: %d\n", ret);
-+		return ret;
-+	}
-+
-+	snd_rpi_chipdip_dac_gpio_set(sdwn_gpio, 1);
-+
-+	ret = devm_snd_soc_register_card(&pdev->dev, &snd_rpi_chipdip_dac);
-+	if (ret && ret != -EPROBE_DEFER)
-+		dev_err(&pdev->dev,
-+			"snd_soc_register_card() failed: %d\n", ret);
-+
-+	return ret;
-+}
-+
-+static const struct of_device_id snd_rpi_chipdip_dac_of_match[] = {
-+	{ .compatible = "chipdip,chipdip-dac", },
-+	{},
-+};
-+MODULE_DEVICE_TABLE(of, snd_rpi_chipdip_dac_of_match);
-+
-+static struct platform_driver snd_rpi_chipdip_dac_driver = {
-+	.driver = {
-+		.name   = "snd-rpi-chipdip-dac",
-+		.owner  = THIS_MODULE,
-+		.of_match_table = snd_rpi_chipdip_dac_of_match,
-+	},
-+	.probe          = snd_rpi_chipdip_dac_probe,
-+};
-+
-+module_platform_driver(snd_rpi_chipdip_dac_driver);
-+
-+MODULE_AUTHOR("Evgenij Sapunov <evgenij.sapunov@chipdip.ru>");
-+MODULE_DESCRIPTION("ASoC Driver for ChipDip DAC");
-+MODULE_LICENSE("GPL v2");
---- /dev/null
-+++ b/sound/soc/bcm/dacberry400.c
-@@ -0,0 +1,259 @@
-+/*
-+ * ASoC Driver for Dacberry400 soundcard
-+ * Author:
-+ *      Ashish Vara<ashishhvara@gmail.com>
-+ *      Copyright 2022
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/gpio/consumer.h>
-+#include <linux/platform_device.h>
-+#include <sound/core.h>
-+#include <sound/pcm.h>
-+#include <sound/pcm_params.h>
-+#include <sound/soc.h>
-+#include <sound/jack.h>
-+#include <linux/i2c.h>
-+#include <linux/acpi.h>
-+#include <linux/slab.h>
-+#include "../sound/soc/codecs/tlv320aic3x.h"
-+
-+static const struct snd_kcontrol_new dacberry400_controls[] = {
-+	SOC_DAPM_PIN_SWITCH("MIC Jack"),
-+	SOC_DAPM_PIN_SWITCH("Line In"),
-+	SOC_DAPM_PIN_SWITCH("Line Out"),
-+	SOC_DAPM_PIN_SWITCH("Headphone Jack"),
-+};
-+
-+static const struct snd_soc_dapm_widget dacberry400_widgets[] = {
-+	SND_SOC_DAPM_HP("Headphone Jack", NULL),
-+	SND_SOC_DAPM_MIC("MIC Jack", NULL),
-+	SND_SOC_DAPM_LINE("Line In", NULL),
-+	SND_SOC_DAPM_LINE("Line Out", NULL),
-+};
-+
-+static const struct snd_soc_dapm_route dacberry400_audio_map[] = {
-+	{"Headphone Jack", NULL, "HPLOUT"},
-+	{"Headphone Jack", NULL, "HPROUT"},
-+
-+	{"LINE1L", NULL, "Line In"},
-+	{"LINE1R", NULL, "Line In"},
-+
-+	{"Line Out", NULL, "LLOUT"},
-+	{"Line Out", NULL, "RLOUT"},
-+
-+	{"MIC3L", NULL, "MIC Jack"},
-+	{"MIC3R", NULL, "MIC Jack"},
-+};
-+
-+static int snd_rpi_dacberry400_init(struct snd_soc_pcm_runtime *rtd)
-+{
-+	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
-+	struct snd_soc_component *component = codec_dai->component;
-+	int ret;
-+
-+	ret = snd_soc_dai_set_sysclk(codec_dai, 2, 12000000,
-+					SND_SOC_CLOCK_OUT);
-+
-+	if (ret && ret != -ENOTSUPP)
-+		goto err;
-+
-+	snd_soc_component_write(component, HPRCOM_CFG, 0x20);
-+	snd_soc_component_write(component, DACL1_2_HPLOUT_VOL, 0x80);
-+	snd_soc_component_write(component, DACR1_2_HPROUT_VOL, 0x80);
-+err:
-+	return ret;
-+}
-+
-+static int snd_rpi_dacberry400_set_bias_level(struct snd_soc_card *card,
-+	struct snd_soc_dapm_context *dapm, enum snd_soc_bias_level level)
-+{
-+	struct snd_soc_pcm_runtime *rtd;
-+	struct snd_soc_dai *codec_dai;
-+	struct snd_soc_component *component;
-+	struct dacberry_priv *aic3x;
-+	u8 hpcom_reg = 0;
-+
-+	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]);
-+	codec_dai = asoc_rtd_to_codec(rtd, 0);
-+	component = codec_dai->component;
-+	aic3x = snd_soc_component_get_drvdata(component);
-+	if (dapm->dev != codec_dai->dev)
-+		return 0;
-+
-+	switch (level) {
-+	case SND_SOC_BIAS_PREPARE:
-+		if (dapm->bias_level != SND_SOC_BIAS_STANDBY)
-+			break;
-+		/* UNMUTE ADC/DAC */
-+		hpcom_reg = snd_soc_component_read(component, HPLCOM_CFG);
-+		snd_soc_component_write(component, HPLCOM_CFG, hpcom_reg | 0x20);
-+		snd_soc_component_write(component, LINE1R_2_RADC_CTRL, 0x04);
-+		snd_soc_component_write(component, LINE1L_2_LADC_CTRL, 0x04);
-+		snd_soc_component_write(component, LADC_VOL, 0x00);
-+		snd_soc_component_write(component, RADC_VOL, 0x00);
-+		pr_info("%s: unmute ADC/DAC\n", __func__);
-+		break;
-+
-+	case SND_SOC_BIAS_STANDBY:
-+		if (dapm->bias_level != SND_SOC_BIAS_PREPARE)
-+			break;
-+		/* MUTE ADC/DAC */
-+		snd_soc_component_write(component, LDAC_VOL, 0x80);
-+		snd_soc_component_write(component, RDAC_VOL, 0x80);
-+		snd_soc_component_write(component, LADC_VOL, 0x80);
-+		snd_soc_component_write(component, RADC_VOL, 0x80);
-+		snd_soc_component_write(component, LINE1R_2_RADC_CTRL, 0x00);
-+		snd_soc_component_write(component, LINE1L_2_LADC_CTRL, 0x00);
-+		snd_soc_component_write(component, HPLCOM_CFG, 0x00);
-+		pr_info("%s: mute ADC/DAC\n", __func__);
-+		break;
-+	default:
-+		break;
-+	}
-+
-+	return 0;
-+}
-+
-+static int snd_rpi_dacberry400_hw_params(struct snd_pcm_substream *substream,
-+					   struct snd_pcm_hw_params *params)
-+{
-+	int ret = 0;
-+	u8 data;
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
-+	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
-+	struct snd_soc_component *component = codec_dai->component;
-+	int fsref = (params_rate(params) % 11025 == 0) ? 44100 : 48000;
-+	int channels = params_channels(params);
-+	int width = 32;
-+	u8 clock = 0;
-+
-+	data = (LDAC2LCH | RDAC2RCH);
-+	data |= (fsref == 44100) ? FSREF_44100 : FSREF_48000;
-+	if (params_rate(params) >= 64000)
-+		data |= DUAL_RATE_MODE;
-+	ret = snd_soc_component_write(component, 0x7, data);
-+	width = params_width(params);
-+
-+	clock = snd_soc_component_read(component, 2);
-+
-+	ret = snd_soc_dai_set_bclk_ratio(cpu_dai, channels*width);
-+
-+	return ret;
-+}
-+
-+static const struct snd_soc_ops snd_rpi_dacberry400_ops = {
-+	.hw_params = snd_rpi_dacberry400_hw_params,
-+};
-+
-+
-+SND_SOC_DAILINK_DEFS(rpi_dacberry400,
-+	DAILINK_COMP_ARRAY(COMP_CPU("bcm2835-i2s.0")),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("tlv320aic3x.1-0018", "tlv320aic3x-hifi")),
-+	DAILINK_COMP_ARRAY(COMP_PLATFORM("bcm2835-i2s.0")));
-+
-+static struct snd_soc_dai_link snd_rpi_dacberry400_dai[] = {
-+{
-+	.dai_fmt		= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-+					SND_SOC_DAIFMT_CBS_CFS,
-+	.init			= snd_rpi_dacberry400_init,
-+	.ops			= &snd_rpi_dacberry400_ops,
-+	.symmetric_rate		= 1,
-+	SND_SOC_DAILINK_REG(rpi_dacberry400),
-+},
-+};
-+
-+static struct snd_soc_card snd_rpi_dacberry400 = {
-+	.owner			= THIS_MODULE,
-+	.dai_link		= snd_rpi_dacberry400_dai,
-+	.num_links		= ARRAY_SIZE(snd_rpi_dacberry400_dai),
-+	.controls		= dacberry400_controls,
-+	.num_controls		= ARRAY_SIZE(dacberry400_controls),
-+	.dapm_widgets		= dacberry400_widgets,
-+	.num_dapm_widgets	= ARRAY_SIZE(dacberry400_widgets),
-+	.dapm_routes		= dacberry400_audio_map,
-+	.num_dapm_routes	= ARRAY_SIZE(dacberry400_audio_map),
-+	.set_bias_level		= snd_rpi_dacberry400_set_bias_level,
-+};
-+
-+static int snd_rpi_dacberry400_probe(struct platform_device *pdev)
-+{
-+	int ret = 0;
-+
-+	snd_rpi_dacberry400.dev = &pdev->dev;
-+
-+	if (pdev->dev.of_node) {
-+		struct device_node *i2s_node;
-+		struct snd_soc_card *card = &snd_rpi_dacberry400;
-+		struct snd_soc_dai_link *dai = &snd_rpi_dacberry400_dai[0];
-+
-+		i2s_node = of_parse_phandle(pdev->dev.of_node,
-+					    "i2s-controller", 0);
-+		if (i2s_node) {
-+			dai->cpus->dai_name = NULL;
-+			dai->cpus->of_node = i2s_node;
-+			dai->platforms->name = NULL;
-+			dai->platforms->of_node = i2s_node;
-+			of_node_put(i2s_node);
-+		}
-+
-+		if (of_property_read_string(pdev->dev.of_node, "card_name",
-+					    &card->name))
-+			card->name = "tlvaudioCODEC";
-+
-+		if (of_property_read_string(pdev->dev.of_node, "dai_name",
-+					    &dai->name))
-+			dai->name = "tlvaudio CODEC";
-+
-+	}
-+
-+	ret = snd_soc_register_card(&snd_rpi_dacberry400);
-+	if (ret) {
-+		if (ret != -EPROBE_DEFER)
-+			dev_err(&pdev->dev,
-+				"snd_soc_register_card() failed: %d\n", ret);
-+		return ret;
-+	}
-+
-+	return 0;
-+}
-+
-+static int snd_rpi_dacberry400_remove(struct platform_device *pdev)
-+{
-+	snd_soc_unregister_card(&snd_rpi_dacberry400);
-+	return 0;
-+}
-+
-+static const struct of_device_id dacberry400_match_id[] = {
-+	{ .compatible = "osaelectronics,dacberry400",},
-+	{},
-+};
-+MODULE_DEVICE_TABLE(of, dacberry400_match_id);
-+
-+static struct platform_driver snd_rpi_dacberry400_driver = {
-+	.driver = {
-+		.name = "snd-rpi-dacberry400",
-+		.owner = THIS_MODULE,
-+		.of_match_table = dacberry400_match_id,
-+	},
-+	.probe = snd_rpi_dacberry400_probe,
-+	.remove = snd_rpi_dacberry400_remove,
-+};
-+
-+module_platform_driver(snd_rpi_dacberry400_driver);
-+
-+MODULE_AUTHOR("Ashish Vara");
-+MODULE_DESCRIPTION("Dacberry400 sound card driver");
-+MODULE_LICENSE("GPL");
-+MODULE_ALIAS("platform:dacberry400");
-+MODULE_SOFTDEP("pre: snd-soc-tlv320aic3x");
---- /dev/null
-+++ b/sound/soc/bcm/digidac1-soundcard.c
-@@ -0,0 +1,421 @@
-+/*
-+ * ASoC Driver for RRA DigiDAC1
-+ * Copyright 2016
-+ * Author: José M. Tasende <vintage@redrocksaudio.es>
-+ * based on the HifiBerry DAC driver by Florian Meier <florian.meier@koalo.de>
-+ * and the Wolfson card driver by Nikesh Oswal, <Nikesh.Oswal@wolfsonmicro.com>
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/i2c.h>
-+#include <sound/core.h>
-+#include <sound/pcm.h>
-+#include <sound/pcm_params.h>
-+#include <sound/soc.h>
-+#include <sound/jack.h>
-+#include <sound/soc-dapm.h>
-+#include <sound/tlv.h>
-+#include <linux/regulator/consumer.h>
-+
-+#include "../codecs/wm8804.h"
-+#include "../codecs/wm8741.h"
-+
-+#define WM8741_NUM_SUPPLIES 2
-+
-+/* codec private data */
-+struct wm8741_priv {
-+	struct wm8741_platform_data pdata;
-+	struct regmap *regmap;
-+	struct regulator_bulk_data supplies[WM8741_NUM_SUPPLIES];
-+	unsigned int sysclk;
-+	const struct snd_pcm_hw_constraint_list *sysclk_constraints;
-+};
-+
-+static int samplerate = 44100;
-+
-+/* New Alsa Controls not exposed by original wm8741 codec driver	*/
-+/* in actual driver the att. adjustment is wrong because		*/
-+/* this DAC has a coarse attenuation register with 4dB steps		*/
-+/* and a fine level register with 0.125dB steps				*/
-+/* each register has 32 steps so combining both we have	1024 steps	*/
-+/* of 0.125 dB.								*/
-+/* The original level controls from driver are removed at startup	*/
-+/* and replaced by the corrected ones.					*/
-+/* The same wm8741 driver can be used for wm8741 and wm8742 devices	*/
-+
-+static const DECLARE_TLV_DB_SCALE(dac_tlv_fine, 0, 13, 0);
-+static const DECLARE_TLV_DB_SCALE(dac_tlv_coarse, -12700, 400, 1);
-+static const char *w8741_dither[4] = {"Off", "RPDF", "TPDF", "HPDF"};
-+static const char *w8741_filter[5] = {
-+		"Type 1", "Type 2", "Type 3", "Type 4", "Type 5"};
-+static const char *w8741_switch[2] = {"Off", "On"};
-+static const struct soc_enum w8741_enum[] = {
-+SOC_ENUM_SINGLE(WM8741_MODE_CONTROL_2, 0, 4, w8741_dither),/* dithering type */
-+SOC_ENUM_SINGLE(WM8741_FILTER_CONTROL, 0, 5, w8741_filter),/* filter type */
-+SOC_ENUM_SINGLE(WM8741_FORMAT_CONTROL, 6, 2, w8741_switch),/* phase invert */
-+SOC_ENUM_SINGLE(WM8741_VOLUME_CONTROL, 0, 2, w8741_switch),/* volume ramp */
-+SOC_ENUM_SINGLE(WM8741_VOLUME_CONTROL, 3, 2, w8741_switch),/* soft mute */
-+};
-+
-+static const struct snd_kcontrol_new w8741_snd_controls_stereo[] = {
-+SOC_DOUBLE_R_TLV("DAC Fine Playback Volume", WM8741_DACLLSB_ATTENUATION,
-+		WM8741_DACRLSB_ATTENUATION, 0, 31, 1, dac_tlv_fine),
-+SOC_DOUBLE_R_TLV("Digital Playback Volume", WM8741_DACLMSB_ATTENUATION,
-+		WM8741_DACRMSB_ATTENUATION, 0, 31, 1, dac_tlv_coarse),
-+SOC_ENUM("DAC Dither", w8741_enum[0]),
-+SOC_ENUM("DAC Digital Filter", w8741_enum[1]),
-+SOC_ENUM("DAC Phase Invert", w8741_enum[2]),
-+SOC_ENUM("DAC Volume Ramp", w8741_enum[3]),
-+SOC_ENUM("DAC Soft Mute", w8741_enum[4]),
-+};
-+
-+static const struct snd_kcontrol_new w8741_snd_controls_mono_left[] = {
-+SOC_SINGLE_TLV("DAC Fine Playback Volume", WM8741_DACLLSB_ATTENUATION,
-+		0, 31, 0, dac_tlv_fine),
-+SOC_SINGLE_TLV("Digital Playback Volume", WM8741_DACLMSB_ATTENUATION,
-+		0, 31, 1, dac_tlv_coarse),
-+SOC_ENUM("DAC Dither", w8741_enum[0]),
-+SOC_ENUM("DAC Digital Filter", w8741_enum[1]),
-+SOC_ENUM("DAC Phase Invert", w8741_enum[2]),
-+SOC_ENUM("DAC Volume Ramp", w8741_enum[3]),
-+SOC_ENUM("DAC Soft Mute", w8741_enum[4]),
-+};
-+
-+static const struct snd_kcontrol_new w8741_snd_controls_mono_right[] = {
-+SOC_SINGLE_TLV("DAC Fine Playback Volume", WM8741_DACRLSB_ATTENUATION,
-+	0, 31, 0, dac_tlv_fine),
-+SOC_SINGLE_TLV("Digital Playback Volume", WM8741_DACRMSB_ATTENUATION,
-+	0, 31, 1, dac_tlv_coarse),
-+SOC_ENUM("DAC Dither", w8741_enum[0]),
-+SOC_ENUM("DAC Digital Filter", w8741_enum[1]),
-+SOC_ENUM("DAC Phase Invert", w8741_enum[2]),
-+SOC_ENUM("DAC Volume Ramp", w8741_enum[3]),
-+SOC_ENUM("DAC Soft Mute", w8741_enum[4]),
-+};
-+
-+static int w8741_add_controls(struct snd_soc_component *component)
-+{
-+	struct wm8741_priv *wm8741 = snd_soc_component_get_drvdata(component);
-+
-+	switch (wm8741->pdata.diff_mode) {
-+	case WM8741_DIFF_MODE_STEREO:
-+	case WM8741_DIFF_MODE_STEREO_REVERSED:
-+		snd_soc_add_component_controls(component,
-+				w8741_snd_controls_stereo,
-+				ARRAY_SIZE(w8741_snd_controls_stereo));
-+		break;
-+	case WM8741_DIFF_MODE_MONO_LEFT:
-+		snd_soc_add_component_controls(component,
-+				w8741_snd_controls_mono_left,
-+				ARRAY_SIZE(w8741_snd_controls_mono_left));
-+		break;
-+	case WM8741_DIFF_MODE_MONO_RIGHT:
-+		snd_soc_add_component_controls(component,
-+				w8741_snd_controls_mono_right,
-+				ARRAY_SIZE(w8741_snd_controls_mono_right));
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
-+
-+static int digidac1_soundcard_init(struct snd_soc_pcm_runtime *rtd)
-+{
-+	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
-+	struct snd_soc_card *card = rtd->card;
-+	struct snd_soc_pcm_runtime *wm8741_rtd;
-+	struct snd_soc_component *wm8741_component;
-+	struct snd_card *sound_card = card->snd_card;
-+	struct snd_kcontrol *kctl;
-+	int ret;
-+
-+	wm8741_rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[1]);
-+	if (!wm8741_rtd) {
-+		dev_warn(card->dev, "digidac1_soundcard_init: couldn't get wm8741 rtd\n");
-+		return -EFAULT;
-+	}
-+	wm8741_component = asoc_rtd_to_codec(wm8741_rtd, 0)->component;
-+	ret = w8741_add_controls(wm8741_component);
-+	if (ret < 0)
-+		dev_warn(card->dev, "Failed to add new wm8741 controls: %d\n",
-+		ret);
-+
-+	/* enable TX output */
-+	snd_soc_component_update_bits(component, WM8804_PWRDN, 0x4, 0x0);
-+
-+	kctl = snd_soc_card_get_kcontrol(card,
-+		"Playback Volume");
-+	if (kctl) {
-+		kctl->vd[0].access = SNDRV_CTL_ELEM_ACCESS_READWRITE;
-+		snd_ctl_remove(sound_card, kctl);
-+		}
-+	kctl = snd_soc_card_get_kcontrol(card,
-+		"Fine Playback Volume");
-+	if (kctl) {
-+		kctl->vd[0].access = SNDRV_CTL_ELEM_ACCESS_READWRITE;
-+		snd_ctl_remove(sound_card, kctl);
-+		}
-+	return 0;
-+}
-+
-+static int digidac1_soundcard_startup(struct snd_pcm_substream *substream)
-+{
-+	/* turn on wm8804 digital output */
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
-+	struct snd_soc_card *card = rtd->card;
-+	struct snd_soc_pcm_runtime *wm8741_rtd;
-+	struct snd_soc_component *wm8741_component;
-+
-+	snd_soc_component_update_bits(component, WM8804_PWRDN, 0x3c, 0x00);
-+	wm8741_rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[1]);
-+	if (!wm8741_rtd) {
-+		dev_warn(card->dev, "digidac1_soundcard_startup: couldn't get WM8741 rtd\n");
-+		return -EFAULT;
-+	}
-+	wm8741_component = asoc_rtd_to_codec(wm8741_rtd, 0)->component;
-+
-+	/* latch wm8741 level */
-+	snd_soc_component_update_bits(wm8741_component, WM8741_DACLLSB_ATTENUATION,
-+		WM8741_UPDATELL, WM8741_UPDATELL);
-+	snd_soc_component_update_bits(wm8741_component, WM8741_DACLMSB_ATTENUATION,
-+		WM8741_UPDATELM, WM8741_UPDATELM);
-+	snd_soc_component_update_bits(wm8741_component, WM8741_DACRLSB_ATTENUATION,
-+		WM8741_UPDATERL, WM8741_UPDATERL);
-+	snd_soc_component_update_bits(wm8741_component, WM8741_DACRMSB_ATTENUATION,
-+		WM8741_UPDATERM, WM8741_UPDATERM);
-+
-+	return 0;
-+}
-+
-+static void digidac1_soundcard_shutdown(struct snd_pcm_substream *substream)
-+{
-+	/* turn off wm8804 digital output */
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
-+
-+	snd_soc_component_update_bits(component, WM8804_PWRDN, 0x3c, 0x3c);
-+}
-+
-+static int digidac1_soundcard_hw_params(struct snd_pcm_substream *substream,
-+				       struct snd_pcm_hw_params *params)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
-+	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
-+	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
-+	struct snd_soc_card *card = rtd->card;
-+	struct snd_soc_pcm_runtime *wm8741_rtd;
-+	struct snd_soc_component *wm8741_component;
-+
-+	int sysclk = 27000000;
-+	long mclk_freq = 0;
-+	int mclk_div = 1;
-+	int sampling_freq = 1;
-+	int ret;
-+
-+	wm8741_rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[1]);
-+	if (!wm8741_rtd) {
-+		dev_warn(card->dev, "digidac1_soundcard_hw_params: couldn't get WM8741 rtd\n");
-+		return -EFAULT;
-+	}
-+	wm8741_component = asoc_rtd_to_codec(wm8741_rtd, 0)->component;
-+	samplerate = params_rate(params);
-+
-+	if (samplerate <= 96000) {
-+		mclk_freq = samplerate*256;
-+		mclk_div = WM8804_MCLKDIV_256FS;
-+	} else {
-+		mclk_freq = samplerate*128;
-+		mclk_div = WM8804_MCLKDIV_128FS;
-+		}
-+
-+	switch (samplerate) {
-+	case 32000:
-+		sampling_freq = 0x03;
-+		break;
-+	case 44100:
-+		sampling_freq = 0x00;
-+		break;
-+	case 48000:
-+		sampling_freq = 0x02;
-+		break;
-+	case 88200:
-+		sampling_freq = 0x08;
-+		break;
-+	case 96000:
-+		sampling_freq = 0x0a;
-+		break;
-+	case 176400:
-+		sampling_freq = 0x0c;
-+		break;
-+	case 192000:
-+		sampling_freq = 0x0e;
-+		break;
-+	default:
-+		dev_err(card->dev,
-+		"Failed to set WM8804 SYSCLK, unsupported samplerate %d\n",
-+		samplerate);
-+	}
-+
-+	snd_soc_dai_set_clkdiv(codec_dai, WM8804_MCLK_DIV, mclk_div);
-+	snd_soc_dai_set_pll(codec_dai, 0, 0, sysclk, mclk_freq);
-+
-+	ret = snd_soc_dai_set_sysclk(codec_dai, WM8804_TX_CLKSRC_PLL,
-+		sysclk, SND_SOC_CLOCK_OUT);
-+	if (ret < 0) {
-+		dev_err(card->dev,
-+		"Failed to set WM8804 SYSCLK: %d\n", ret);
-+		return ret;
-+	}
-+	/* Enable wm8804 TX output */
-+	snd_soc_component_update_bits(component, WM8804_PWRDN, 0x4, 0x0);
-+
-+	/* wm8804 Power on */
-+	snd_soc_component_update_bits(component, WM8804_PWRDN, 0x9, 0);
-+
-+	/* wm8804 set sampling frequency status bits */
-+	snd_soc_component_update_bits(component, WM8804_SPDTX4, 0x0f, sampling_freq);
-+
-+	/* Now update wm8741 registers for the correct oversampling */
-+	if (samplerate <= 48000)
-+		snd_soc_component_update_bits(wm8741_component, WM8741_MODE_CONTROL_1,
-+		 WM8741_OSR_MASK, 0x00);
-+	else if (samplerate <= 96000)
-+		snd_soc_component_update_bits(wm8741_component, WM8741_MODE_CONTROL_1,
-+		 WM8741_OSR_MASK, 0x20);
-+	else
-+		snd_soc_component_update_bits(wm8741_component, WM8741_MODE_CONTROL_1,
-+		 WM8741_OSR_MASK, 0x40);
-+
-+	/* wm8741 bit size */
-+	switch (params_width(params)) {
-+	case 16:
-+		snd_soc_component_update_bits(wm8741_component, WM8741_FORMAT_CONTROL,
-+		 WM8741_IWL_MASK, 0x00);
-+		break;
-+	case 20:
-+		snd_soc_component_update_bits(wm8741_component, WM8741_FORMAT_CONTROL,
-+		 WM8741_IWL_MASK, 0x01);
-+		break;
-+	case 24:
-+		snd_soc_component_update_bits(wm8741_component, WM8741_FORMAT_CONTROL,
-+		 WM8741_IWL_MASK, 0x02);
-+		break;
-+	case 32:
-+		snd_soc_component_update_bits(wm8741_component, WM8741_FORMAT_CONTROL,
-+		 WM8741_IWL_MASK, 0x03);
-+		break;
-+	default:
-+		dev_dbg(card->dev, "wm8741_hw_params:    Unsupported bit size param = %d",
-+			params_width(params));
-+		return -EINVAL;
-+	}
-+
-+	return snd_soc_dai_set_bclk_ratio(cpu_dai, 64);
-+}
-+/* machine stream operations */
-+static struct snd_soc_ops digidac1_soundcard_ops = {
-+	.hw_params	= digidac1_soundcard_hw_params,
-+	.startup	= digidac1_soundcard_startup,
-+	.shutdown	= digidac1_soundcard_shutdown,
-+};
-+
-+SND_SOC_DAILINK_DEFS(digidac1,
-+	DAILINK_COMP_ARRAY(COMP_CPU("bcm2708-i2s.0")),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("wm8804.1-003b", "wm8804-spdif")),
-+	DAILINK_COMP_ARRAY(COMP_PLATFORM("bcm2835-i2s.0")));
-+
-+SND_SOC_DAILINK_DEFS(digidac11,
-+	DAILINK_COMP_ARRAY(COMP_CPU("wm8804-spdif")),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("wm8741.1-001a", "wm8741")),
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()));
-+
-+static struct snd_soc_dai_link digidac1_soundcard_dai[] = {
-+	{
-+	.name		= "RRA DigiDAC1",
-+	.stream_name	= "RRA DigiDAC1 HiFi",
-+	.dai_fmt	= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-+				SND_SOC_DAIFMT_CBM_CFM,
-+	.ops		= &digidac1_soundcard_ops,
-+	.init		= digidac1_soundcard_init,
-+	SND_SOC_DAILINK_REG(digidac1),
-+	},
-+	{
-+	.name		= "RRA DigiDAC11",
-+	.stream_name	= "RRA DigiDAC11 HiFi",
-+	.dai_fmt	= SND_SOC_DAIFMT_I2S
-+			| SND_SOC_DAIFMT_NB_NF
-+			| SND_SOC_DAIFMT_CBS_CFS,
-+	SND_SOC_DAILINK_REG(digidac11),
-+	},
-+};
-+
-+/* audio machine driver */
-+static struct snd_soc_card digidac1_soundcard = {
-+	.name		= "digidac1-soundcard",
-+	.owner		= THIS_MODULE,
-+	.dai_link	= digidac1_soundcard_dai,
-+	.num_links	= ARRAY_SIZE(digidac1_soundcard_dai),
-+};
-+
-+static int digidac1_soundcard_probe(struct platform_device *pdev)
-+{
-+	int ret = 0;
-+
-+	digidac1_soundcard.dev = &pdev->dev;
-+
-+	if (pdev->dev.of_node) {
-+		struct device_node *i2s_node;
-+		struct snd_soc_dai_link *dai = &digidac1_soundcard_dai[0];
-+
-+		i2s_node = of_parse_phandle(pdev->dev.of_node,
-+					"i2s-controller", 0);
-+
-+		if (i2s_node) {
-+			dai->cpus->dai_name = NULL;
-+			dai->cpus->of_node = i2s_node;
-+			dai->platforms->name = NULL;
-+			dai->platforms->of_node = i2s_node;
-+		}
-+	}
-+
-+	ret = devm_snd_soc_register_card(&pdev->dev, &digidac1_soundcard);
-+	if (ret && ret != -EPROBE_DEFER)
-+		dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
-+			ret);
-+
-+	return ret;
-+}
-+
-+static const struct of_device_id digidac1_soundcard_of_match[] = {
-+	{ .compatible = "rra,digidac1-soundcard", },
-+	{},
-+};
-+MODULE_DEVICE_TABLE(of, digidac1_soundcard_of_match);
-+
-+static struct platform_driver digidac1_soundcard_driver = {
-+	.driver = {
-+			.name		= "digidac1-audio",
-+			.owner		= THIS_MODULE,
-+			.of_match_table	= digidac1_soundcard_of_match,
-+	},
-+	.probe		= digidac1_soundcard_probe,
-+};
-+
-+module_platform_driver(digidac1_soundcard_driver);
-+
-+MODULE_AUTHOR("José M. Tasende <vintage@redrocksaudio.es>");
-+MODULE_DESCRIPTION("ASoC Driver for RRA DigiDAC1");
-+MODULE_LICENSE("GPL v2");
---- /dev/null
-+++ b/sound/soc/bcm/dionaudio_loco-v2.c
-@@ -0,0 +1,117 @@
-+/*
-+ * ASoC Driver for Dion Audio LOCO-V2 DAC-AMP
-+ *
-+ * Author:      Miquel Blauw <info@dionaudio.nl>
-+ *              Copyright 2017
-+ *
-+ * Based on the software of the RPi-DAC writen by Florian Meier
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+
-+#include <sound/core.h>
-+#include <sound/pcm.h>
-+#include <sound/pcm_params.h>
-+#include <sound/soc.h>
-+#include <sound/jack.h>
-+
-+static bool digital_gain_0db_limit = true;
-+
-+static int snd_rpi_dionaudio_loco_v2_init(struct snd_soc_pcm_runtime *rtd)
-+{
-+	if (digital_gain_0db_limit) {
-+		int ret;
-+		struct snd_soc_card *card = rtd->card;
-+
-+		ret = snd_soc_limit_volume(card, "Digital Playback Volume", 207);
-+		if (ret < 0)
-+			dev_warn(card->dev, "Failed to set volume limit: %d\n", ret);
-+	}
-+
-+	return 0;
-+}
-+
-+SND_SOC_DAILINK_DEFS(dionaudio_loco_v2,
-+	DAILINK_COMP_ARRAY(COMP_CPU("bcm2708-i2s.0")),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("pcm512x.1-004d", "pcm512x-hifi")),
-+	DAILINK_COMP_ARRAY(COMP_PLATFORM("bcm2708-i2s.0")));
-+
-+static struct snd_soc_dai_link snd_rpi_dionaudio_loco_v2_dai[] = {
-+{
-+	.name		= "DionAudio LOCO-V2",
-+	.stream_name	= "DionAudio LOCO-V2 DAC-AMP",
-+	.dai_fmt	= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-+			  SND_SOC_DAIFMT_CBS_CFS,
-+	.init		= snd_rpi_dionaudio_loco_v2_init,
-+	SND_SOC_DAILINK_REG(dionaudio_loco_v2),
-+},};
-+
-+/* audio machine driver */
-+static struct snd_soc_card snd_rpi_dionaudio_loco_v2 = {
-+	.name         = "Dion Audio LOCO-V2",
-+	.dai_link     = snd_rpi_dionaudio_loco_v2_dai,
-+	.num_links    = ARRAY_SIZE(snd_rpi_dionaudio_loco_v2_dai),
-+};
-+
-+static int snd_rpi_dionaudio_loco_v2_probe(struct platform_device *pdev)
-+{
-+	int ret = 0;
-+
-+	snd_rpi_dionaudio_loco_v2.dev = &pdev->dev;
-+
-+	if (pdev->dev.of_node) {
-+		struct device_node *i2s_node;
-+		struct snd_soc_dai_link *dai =
-+					&snd_rpi_dionaudio_loco_v2_dai[0];
-+
-+		i2s_node = of_parse_phandle(pdev->dev.of_node,
-+					    "i2s-controller", 0);
-+		if (i2s_node) {
-+			dai->cpus->dai_name = NULL;
-+			dai->cpus->of_node = i2s_node;
-+			dai->platforms->name = NULL;
-+			dai->platforms->of_node = i2s_node;
-+		}
-+
-+		digital_gain_0db_limit = !of_property_read_bool(
-+			pdev->dev.of_node, "dionaudio,24db_digital_gain");
-+	}
-+
-+	ret = devm_snd_soc_register_card(&pdev->dev, &snd_rpi_dionaudio_loco_v2);
-+	if (ret)
-+		dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
-+			ret);
-+
-+	return ret;
-+}
-+
-+static const struct of_device_id dionaudio_of_match[] = {
-+	{ .compatible = "dionaudio,dionaudio-loco-v2", },
-+	{},
-+};
-+MODULE_DEVICE_TABLE(of, dionaudio_of_match);
-+
-+static struct platform_driver snd_rpi_dionaudio_loco_v2_driver = {
-+	.driver = {
-+		.name   = "snd-rpi-dionaudio-loco-v2",
-+		.owner  = THIS_MODULE,
-+		.of_match_table = dionaudio_of_match,
-+	},
-+	.probe          = snd_rpi_dionaudio_loco_v2_probe,
-+};
-+
-+module_platform_driver(snd_rpi_dionaudio_loco_v2_driver);
-+
-+MODULE_AUTHOR("Miquel Blauw <info@dionaudio.nl>");
-+MODULE_DESCRIPTION("ASoC Driver for DionAudio LOCO-V2");
-+MODULE_LICENSE("GPL v2");
---- /dev/null
-+++ b/sound/soc/bcm/dionaudio_loco.c
-@@ -0,0 +1,117 @@
-+/*
-+ * ASoC Driver for Dion Audio LOCO DAC-AMP
-+ *
-+ * Author:      Miquel Blauw <info@dionaudio.nl>
-+ *              Copyright 2016
-+ *
-+ * Based on the software of the RPi-DAC writen by Florian Meier
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+
-+#include <sound/core.h>
-+#include <sound/pcm.h>
-+#include <sound/pcm_params.h>
-+#include <sound/soc.h>
-+#include <sound/jack.h>
-+
-+static int snd_rpi_dionaudio_loco_hw_params(
-+	struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
-+
-+	unsigned int sample_bits =
-+		snd_pcm_format_physical_width(params_format(params));
-+
-+	return snd_soc_dai_set_bclk_ratio(cpu_dai, sample_bits * 2);
-+}
-+
-+/* machine stream operations */
-+static struct snd_soc_ops snd_rpi_dionaudio_loco_ops = {
-+	.hw_params = snd_rpi_dionaudio_loco_hw_params,
-+};
-+
-+SND_SOC_DAILINK_DEFS(dionaudio_loco,
-+	DAILINK_COMP_ARRAY(COMP_CPU("bcm2708-i2s.0")),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("pcm5102a-codec", "pcm5102a-hifi")),
-+	DAILINK_COMP_ARRAY(COMP_PLATFORM("bcm2708-i2s.0")));
-+
-+static struct snd_soc_dai_link snd_rpi_dionaudio_loco_dai[] = {
-+{
-+	.name		= "DionAudio LOCO",
-+	.stream_name	= "DionAudio LOCO DAC-AMP",
-+	.dai_fmt	= SND_SOC_DAIFMT_I2S |
-+			  SND_SOC_DAIFMT_NB_NF |
-+			  SND_SOC_DAIFMT_CBS_CFS,
-+	.ops		= &snd_rpi_dionaudio_loco_ops,
-+	SND_SOC_DAILINK_REG(dionaudio_loco),
-+},
-+};
-+
-+/* audio machine driver */
-+static struct snd_soc_card snd_rpi_dionaudio_loco = {
-+	.name		= "snd_rpi_dionaudio_loco",
-+	.dai_link	= snd_rpi_dionaudio_loco_dai,
-+	.num_links	= ARRAY_SIZE(snd_rpi_dionaudio_loco_dai),
-+};
-+
-+static int snd_rpi_dionaudio_loco_probe(struct platform_device *pdev)
-+{
-+	struct device_node *np;
-+	int ret = 0;
-+
-+	snd_rpi_dionaudio_loco.dev = &pdev->dev;
-+
-+	np = pdev->dev.of_node;
-+	if (np) {
-+		struct snd_soc_dai_link *dai = &snd_rpi_dionaudio_loco_dai[0];
-+		struct device_node *i2s_np;
-+
-+		i2s_np = of_parse_phandle(np, "i2s-controller", 0);
-+		if (i2s_np) {
-+			dai->cpus->dai_name = NULL;
-+			dai->cpus->of_node = i2s_np;
-+			dai->platforms->name = NULL;
-+			dai->platforms->of_node = i2s_np;
-+		}
-+	}
-+
-+	ret = devm_snd_soc_register_card(&pdev->dev, &snd_rpi_dionaudio_loco);
-+	if (ret && ret != -EPROBE_DEFER)
-+		dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
-+			ret);
-+
-+	return ret;
-+}
-+
-+static const struct of_device_id snd_rpi_dionaudio_loco_of_match[] = {
-+	{ .compatible = "dionaudio,loco-pcm5242-tpa3118", },
-+	{ /* sentinel */ },
-+};
-+MODULE_DEVICE_TABLE(of, snd_rpi_dionaudio_loco_of_match);
-+
-+static struct platform_driver snd_rpi_dionaudio_loco_driver = {
-+	.driver = {
-+		.name		= "snd-dionaudio-loco",
-+		.owner		= THIS_MODULE,
-+		.of_match_table	= snd_rpi_dionaudio_loco_of_match,
-+	},
-+	.probe  = snd_rpi_dionaudio_loco_probe,
-+};
-+
-+module_platform_driver(snd_rpi_dionaudio_loco_driver);
-+
-+MODULE_AUTHOR("Miquel Blauw <info@dionaudio.nl>");
-+MODULE_DESCRIPTION("ASoC Driver for DionAudio LOCO");
-+MODULE_LICENSE("GPL v2");
---- /dev/null
-+++ b/sound/soc/bcm/fe-pi-audio.c
-@@ -0,0 +1,154 @@
-+/*
-+ * ASoC Driver for Fe-Pi Audio Sound Card
-+ *
-+ * Author:	Henry Kupis <kuupaz@gmail.com>
-+ *		Copyright 2016
-+ *		based on code by Florian Meier <florian.meier@koalo.de>
-+ *		based on code by Shawn Guo <shawn.guo@linaro.org>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/io.h>
-+
-+#include <sound/core.h>
-+#include <sound/pcm.h>
-+#include <sound/pcm_params.h>
-+#include <sound/soc.h>
-+#include <sound/jack.h>
-+
-+#include "../codecs/sgtl5000.h"
-+
-+static int snd_fe_pi_audio_init(struct snd_soc_pcm_runtime *rtd)
-+{
-+	struct snd_soc_card *card = rtd->card;
-+	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
-+
-+	snd_soc_dapm_force_enable_pin(&card->dapm, "LO");
-+	snd_soc_dapm_force_enable_pin(&card->dapm, "ADC");
-+	snd_soc_dapm_force_enable_pin(&card->dapm, "DAC");
-+	snd_soc_dapm_force_enable_pin(&card->dapm, "HP");
-+	snd_soc_component_update_bits(component, SGTL5000_CHIP_ANA_POWER,
-+			SGTL5000_VAG_POWERUP, SGTL5000_VAG_POWERUP);
-+
-+	return 0;
-+}
-+
-+static int snd_fe_pi_audio_hw_params(struct snd_pcm_substream *substream,
-+	struct snd_pcm_hw_params *params)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct device *dev = rtd->card->dev;
-+	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
-+
-+	int ret;
-+
-+	/* Set SGTL5000's SYSCLK */
-+	ret = snd_soc_dai_set_sysclk(codec_dai, SGTL5000_SYSCLK, 12288000, SND_SOC_CLOCK_IN);
-+	if (ret) {
-+		dev_err(dev, "could not set codec driver clock params\n");
-+		return ret;
-+	}
-+
-+	return 0;
-+}
-+
-+
-+static struct snd_soc_ops snd_fe_pi_audio_ops = {
-+	.hw_params = snd_fe_pi_audio_hw_params,
-+};
-+
-+SND_SOC_DAILINK_DEFS(fe_pi,
-+	DAILINK_COMP_ARRAY(COMP_CPU("bcm2708-i2s.0")),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("sgtl5000.1-000a", "sgtl5000")),
-+	DAILINK_COMP_ARRAY(COMP_PLATFORM("bcm2708-i2s.0")));
-+
-+static struct snd_soc_dai_link snd_fe_pi_audio_dai[] = {
-+	{
-+		.name		= "FE-PI",
-+		.stream_name	= "Fe-Pi HiFi",
-+		.dai_fmt	= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-+					SND_SOC_DAIFMT_CBM_CFM,
-+		.ops		= &snd_fe_pi_audio_ops,
-+		.init		= snd_fe_pi_audio_init,
-+		SND_SOC_DAILINK_REG(fe_pi),
-+	},
-+};
-+
-+static const struct snd_soc_dapm_route fe_pi_audio_dapm_routes[] = {
-+	{"ADC", NULL, "Mic Bias"},
-+};
-+
-+
-+static struct snd_soc_card fe_pi_audio = {
-+	.name         = "Fe-Pi Audio",
-+	.owner        = THIS_MODULE,
-+	.dai_link     = snd_fe_pi_audio_dai,
-+	.num_links    = ARRAY_SIZE(snd_fe_pi_audio_dai),
-+
-+	.dapm_routes = fe_pi_audio_dapm_routes,
-+	.num_dapm_routes = ARRAY_SIZE(fe_pi_audio_dapm_routes),
-+};
-+
-+static int snd_fe_pi_audio_probe(struct platform_device *pdev)
-+{
-+	int ret = 0;
-+	struct snd_soc_card *card = &fe_pi_audio;
-+	struct device_node *np = pdev->dev.of_node;
-+	struct device_node *i2s_node;
-+	struct snd_soc_dai_link *dai = &snd_fe_pi_audio_dai[0];
-+
-+	fe_pi_audio.dev = &pdev->dev;
-+
-+	i2s_node = of_parse_phandle(np, "i2s-controller", 0);
-+	if (!i2s_node) {
-+		dev_err(&pdev->dev, "i2s_node phandle missing or invalid\n");
-+		return -EINVAL;
-+	}
-+
-+	dai->cpus->dai_name = NULL;
-+	dai->cpus->of_node = i2s_node;
-+	dai->platforms->name = NULL;
-+	dai->platforms->of_node = i2s_node;
-+
-+	of_node_put(i2s_node);
-+
-+	card->dev = &pdev->dev;
-+	platform_set_drvdata(pdev, card);
-+
-+	ret = devm_snd_soc_register_card(&pdev->dev, card);
-+	if (ret && ret != -EPROBE_DEFER)
-+		dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret);
-+
-+	return ret;
-+}
-+
-+static const struct of_device_id snd_fe_pi_audio_of_match[] = {
-+	{ .compatible = "fe-pi,fe-pi-audio", },
-+	{},
-+};
-+MODULE_DEVICE_TABLE(of, snd_fe_pi_audio_of_match);
-+
-+static struct platform_driver snd_fe_pi_audio_driver = {
-+        .driver = {
-+                .name   = "snd-fe-pi-audio",
-+                .owner  = THIS_MODULE,
-+                .of_match_table = snd_fe_pi_audio_of_match,
-+        },
-+        .probe          = snd_fe_pi_audio_probe,
-+};
-+
-+module_platform_driver(snd_fe_pi_audio_driver);
-+
-+MODULE_AUTHOR("Henry Kupis <fe-pi@cox.net>");
-+MODULE_DESCRIPTION("ASoC Driver for Fe-Pi Audio");
-+MODULE_LICENSE("GPL v2");
---- /dev/null
-+++ b/sound/soc/bcm/googlevoicehat-codec.c
-@@ -0,0 +1,214 @@
-+/*
-+ * Driver for the Google voiceHAT audio codec for Raspberry Pi.
-+ *
-+ * Author:	Peter Malkin <petermalkin@google.com>
-+ *		Copyright 2016
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#include <linux/device.h>
-+#include <linux/err.h>
-+#include <linux/gpio.h>
-+#include <linux/gpio/consumer.h>
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/mod_devicetable.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/platform_device.h>
-+#include <linux/version.h>
-+#include <sound/pcm.h>
-+#include <sound/soc.h>
-+#include <sound/soc-dai.h>
-+#include <sound/soc-dapm.h>
-+
-+#define ICS43432_RATE_MIN_HZ	7190  /* from data sheet */
-+#define ICS43432_RATE_MAX_HZ	52800 /* from data sheet */
-+/* Delay in enabling SDMODE after clock settles to remove pop */
-+#define SDMODE_DELAY_MS		5
-+
-+struct voicehat_priv {
-+	struct delayed_work enable_sdmode_work;
-+	struct gpio_desc *sdmode_gpio;
-+	unsigned long sdmode_delay_jiffies;
-+};
-+
-+static void voicehat_enable_sdmode_work(struct work_struct *work)
-+{
-+	struct voicehat_priv *voicehat = container_of(work,
-+						      struct voicehat_priv,
-+						      enable_sdmode_work.work);
-+	gpiod_set_value(voicehat->sdmode_gpio, 1);
-+}
-+
-+static int voicehat_component_probe(struct snd_soc_component *component)
-+{
-+	struct voicehat_priv *voicehat =
-+				snd_soc_component_get_drvdata(component);
-+
-+	voicehat->sdmode_gpio = devm_gpiod_get(component->dev, "sdmode",
-+					       GPIOD_OUT_LOW);
-+	if (IS_ERR(voicehat->sdmode_gpio)) {
-+		dev_err(component->dev, "Unable to allocate GPIO pin\n");
-+		return PTR_ERR(voicehat->sdmode_gpio);
-+	}
-+
-+	INIT_DELAYED_WORK(&voicehat->enable_sdmode_work,
-+			  voicehat_enable_sdmode_work);
-+	return 0;
-+}
-+
-+static void voicehat_component_remove(struct snd_soc_component *component)
-+{
-+	struct voicehat_priv *voicehat =
-+				snd_soc_component_get_drvdata(component);
-+
-+	cancel_delayed_work_sync(&voicehat->enable_sdmode_work);
-+}
-+
-+static const struct snd_soc_dapm_widget voicehat_dapm_widgets[] = {
-+	SND_SOC_DAPM_OUTPUT("Speaker"),
-+};
-+
-+static const struct snd_soc_dapm_route voicehat_dapm_routes[] = {
-+	{"Speaker", NULL, "HiFi Playback"},
-+};
-+
-+static const struct snd_soc_component_driver voicehat_component_driver = {
-+	.probe = voicehat_component_probe,
-+	.remove = voicehat_component_remove,
-+	.dapm_widgets = voicehat_dapm_widgets,
-+	.num_dapm_widgets = ARRAY_SIZE(voicehat_dapm_widgets),
-+	.dapm_routes = voicehat_dapm_routes,
-+	.num_dapm_routes = ARRAY_SIZE(voicehat_dapm_routes),
-+};
-+
-+static int voicehat_daiops_trigger(struct snd_pcm_substream *substream, int cmd,
-+				   struct snd_soc_dai *dai)
-+{
-+	struct snd_soc_component *component = dai->component;
-+	struct voicehat_priv *voicehat =
-+				snd_soc_component_get_drvdata(component);
-+
-+	if (voicehat->sdmode_delay_jiffies == 0)
-+		return 0;
-+
-+	dev_dbg(dai->dev, "CMD             %d", cmd);
-+	dev_dbg(dai->dev, "Playback Active %d", dai->stream_active[SNDRV_PCM_STREAM_PLAYBACK]);
-+	dev_dbg(dai->dev, "Capture Active  %d", dai->stream_active[SNDRV_PCM_STREAM_CAPTURE]);
-+
-+	switch (cmd) {
-+	case SNDRV_PCM_TRIGGER_START:
-+	case SNDRV_PCM_TRIGGER_RESUME:
-+	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-+		if (dai->stream_active[SNDRV_PCM_STREAM_PLAYBACK]) {
-+			dev_info(dai->dev, "Enabling audio amp...\n");
-+			queue_delayed_work(
-+				system_power_efficient_wq,
-+				&voicehat->enable_sdmode_work,
-+				voicehat->sdmode_delay_jiffies);
-+		}
-+		break;
-+	case SNDRV_PCM_TRIGGER_STOP:
-+	case SNDRV_PCM_TRIGGER_SUSPEND:
-+	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-+		if (dai->stream_active[SNDRV_PCM_STREAM_PLAYBACK]) {
-+			cancel_delayed_work(&voicehat->enable_sdmode_work);
-+			dev_info(dai->dev, "Disabling audio amp...\n");
-+			gpiod_set_value(voicehat->sdmode_gpio, 0);
-+		}
-+		break;
-+	}
-+	return 0;
-+}
-+
-+static const struct snd_soc_dai_ops voicehat_dai_ops = {
-+	.trigger = voicehat_daiops_trigger,
-+};
-+
-+static struct snd_soc_dai_driver voicehat_dai = {
-+	.name = "voicehat-hifi",
-+	.capture = {
-+		.stream_name = "HiFi Capture",
-+		.channels_min = 2,
-+		.channels_max = 2,
-+		.rates = SNDRV_PCM_RATE_48000,
-+		.formats = SNDRV_PCM_FMTBIT_S32_LE
-+	},
-+	.playback = {
-+		.stream_name = "HiFi Playback",
-+		.channels_min = 2,
-+		.channels_max = 2,
-+		.rates = SNDRV_PCM_RATE_48000,
-+		.formats = SNDRV_PCM_FMTBIT_S32_LE
-+	},
-+	.ops = &voicehat_dai_ops,
-+	.symmetric_rate = 1
-+};
-+
-+#ifdef CONFIG_OF
-+static const struct of_device_id voicehat_ids[] = {
-+		{ .compatible = "google,voicehat", }, {}
-+	};
-+	MODULE_DEVICE_TABLE(of, voicehat_ids);
-+#endif
-+
-+static int voicehat_platform_probe(struct platform_device *pdev)
-+{
-+	struct voicehat_priv *voicehat;
-+	unsigned int sdmode_delay;
-+	int ret;
-+
-+	voicehat = devm_kzalloc(&pdev->dev, sizeof(*voicehat), GFP_KERNEL);
-+	if (!voicehat)
-+		return -ENOMEM;
-+
-+	ret = device_property_read_u32(&pdev->dev, "voicehat_sdmode_delay",
-+				       &sdmode_delay);
-+
-+	if (ret) {
-+		sdmode_delay = SDMODE_DELAY_MS;
-+		dev_info(&pdev->dev,
-+			 "property 'voicehat_sdmode_delay' not found default 5 mS");
-+	} else {
-+		dev_info(&pdev->dev, "property 'voicehat_sdmode_delay' found delay= %d mS",
-+			 sdmode_delay);
-+	}
-+	voicehat->sdmode_delay_jiffies = msecs_to_jiffies(sdmode_delay);
-+
-+	dev_set_drvdata(&pdev->dev, voicehat);
-+
-+	return snd_soc_register_component(&pdev->dev,
-+					  &voicehat_component_driver,
-+					  &voicehat_dai,
-+					  1);
-+}
-+
-+static int voicehat_platform_remove(struct platform_device *pdev)
-+{
-+	snd_soc_unregister_component(&pdev->dev);
-+	return 0;
-+}
-+
-+static struct platform_driver voicehat_driver = {
-+	.driver = {
-+		.name = "voicehat-codec",
-+		.of_match_table = of_match_ptr(voicehat_ids),
-+	},
-+	.probe = voicehat_platform_probe,
-+	.remove = voicehat_platform_remove,
-+};
-+
-+module_platform_driver(voicehat_driver);
-+
-+MODULE_DESCRIPTION("Google voiceHAT Codec driver");
-+MODULE_AUTHOR("Peter Malkin <petermalkin@google.com>");
-+MODULE_LICENSE("GPL v2");
---- /dev/null
-+++ b/sound/soc/bcm/hifiberry_dacplus.c
-@@ -0,0 +1,527 @@
-+/*
-+ * ASoC Driver for HiFiBerry DAC+ / DAC Pro / AMP100
-+ *
-+ * Author:	Daniel Matuschek, Stuart MacLean <stuart@hifiberry.com>
-+ *		Copyright 2014-2015
-+ *		based on code by Florian Meier <florian.meier@koalo.de>
-+ *		Headphone/AMP100 Joerg Schambacher <joerg@hifiberry.com>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/gpio/consumer.h>
-+#include <../drivers/gpio/gpiolib.h>
-+#include <linux/platform_device.h>
-+#include <linux/kernel.h>
-+#include <linux/clk.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/slab.h>
-+#include <linux/delay.h>
-+#include <linux/i2c.h>
-+
-+#include <sound/core.h>
-+#include <sound/pcm.h>
-+#include <sound/pcm_params.h>
-+#include <sound/soc.h>
-+#include <sound/jack.h>
-+
-+#include "../codecs/pcm512x.h"
-+
-+#define HIFIBERRY_DACPRO_NOCLOCK 0
-+#define HIFIBERRY_DACPRO_CLK44EN 1
-+#define HIFIBERRY_DACPRO_CLK48EN 2
-+
-+struct pcm512x_priv {
-+	struct regmap *regmap;
-+	struct clk *sclk;
-+};
-+
-+/* Clock rate of CLK44EN attached to GPIO6 pin */
-+#define CLK_44EN_RATE 22579200UL
-+/* Clock rate of CLK48EN attached to GPIO3 pin */
-+#define CLK_48EN_RATE 24576000UL
-+
-+static bool slave;
-+static bool snd_rpi_hifiberry_is_dacpro;
-+static bool digital_gain_0db_limit = true;
-+static bool leds_off;
-+static bool auto_mute;
-+static int mute_ext_ctl;
-+static int mute_ext;
-+static struct gpio_desc *snd_mute_gpio;
-+static struct gpio_desc *snd_reset_gpio;
-+static struct snd_soc_card snd_rpi_hifiberry_dacplus;
-+
-+static int snd_rpi_hifiberry_dacplus_mute_set(int mute)
-+{
-+	gpiod_set_value_cansleep(snd_mute_gpio, mute);
-+	return 1;
-+}
-+
-+static int snd_rpi_hifiberry_dacplus_mute_get(struct snd_kcontrol *kcontrol,
-+				struct snd_ctl_elem_value *ucontrol)
-+{
-+	ucontrol->value.integer.value[0] = mute_ext;
-+
-+	return 0;
-+}
-+
-+static int snd_rpi_hifiberry_dacplus_mute_put(struct snd_kcontrol *kcontrol,
-+				struct snd_ctl_elem_value *ucontrol)
-+{
-+	if (mute_ext == ucontrol->value.integer.value[0])
-+		return 0;
-+
-+	mute_ext = ucontrol->value.integer.value[0];
-+
-+	return snd_rpi_hifiberry_dacplus_mute_set(mute_ext);
-+}
-+
-+static const char * const mute_text[] = {"Play", "Mute"};
-+static const struct soc_enum hb_dacplus_opt_mute_enum =
-+	SOC_ENUM_SINGLE_EXT(2, mute_text);
-+
-+static const struct snd_kcontrol_new hb_dacplus_opt_mute_controls[] = {
-+	SOC_ENUM_EXT("Mute(ext)", hb_dacplus_opt_mute_enum,
-+			      snd_rpi_hifiberry_dacplus_mute_get,
-+			      snd_rpi_hifiberry_dacplus_mute_put),
-+};
-+
-+static void snd_rpi_hifiberry_dacplus_select_clk(struct snd_soc_component *component,
-+	int clk_id)
-+{
-+	switch (clk_id) {
-+	case HIFIBERRY_DACPRO_NOCLOCK:
-+		snd_soc_component_update_bits(component, PCM512x_GPIO_CONTROL_1, 0x24, 0x00);
-+		break;
-+	case HIFIBERRY_DACPRO_CLK44EN:
-+		snd_soc_component_update_bits(component, PCM512x_GPIO_CONTROL_1, 0x24, 0x20);
-+		break;
-+	case HIFIBERRY_DACPRO_CLK48EN:
-+		snd_soc_component_update_bits(component, PCM512x_GPIO_CONTROL_1, 0x24, 0x04);
-+		break;
-+	}
-+	usleep_range(3000, 4000);
-+}
-+
-+static void snd_rpi_hifiberry_dacplus_clk_gpio(struct snd_soc_component *component)
-+{
-+	snd_soc_component_update_bits(component, PCM512x_GPIO_EN, 0x24, 0x24);
-+	snd_soc_component_update_bits(component, PCM512x_GPIO_OUTPUT_3, 0x0f, 0x02);
-+	snd_soc_component_update_bits(component, PCM512x_GPIO_OUTPUT_6, 0x0f, 0x02);
-+}
-+
-+static bool snd_rpi_hifiberry_dacplus_is_sclk(struct snd_soc_component *component)
-+{
-+	unsigned int sck;
-+
-+	sck = snd_soc_component_read(component, PCM512x_RATE_DET_4);
-+	return (!(sck & 0x40));
-+}
-+
-+static bool snd_rpi_hifiberry_dacplus_is_pro_card(struct snd_soc_component *component)
-+{
-+	bool isClk44EN, isClk48En, isNoClk;
-+
-+	snd_rpi_hifiberry_dacplus_clk_gpio(component);
-+
-+	snd_rpi_hifiberry_dacplus_select_clk(component, HIFIBERRY_DACPRO_CLK44EN);
-+	isClk44EN = snd_rpi_hifiberry_dacplus_is_sclk(component);
-+
-+	snd_rpi_hifiberry_dacplus_select_clk(component, HIFIBERRY_DACPRO_NOCLOCK);
-+	isNoClk = snd_rpi_hifiberry_dacplus_is_sclk(component);
-+
-+	snd_rpi_hifiberry_dacplus_select_clk(component, HIFIBERRY_DACPRO_CLK48EN);
-+	isClk48En = snd_rpi_hifiberry_dacplus_is_sclk(component);
-+
-+	return (isClk44EN && isClk48En && !isNoClk);
-+}
-+
-+static int snd_rpi_hifiberry_dacplus_clk_for_rate(int sample_rate)
-+{
-+	int type;
-+
-+	switch (sample_rate) {
-+	case 11025:
-+	case 22050:
-+	case 44100:
-+	case 88200:
-+	case 176400:
-+	case 352800:
-+		type = HIFIBERRY_DACPRO_CLK44EN;
-+		break;
-+	default:
-+		type = HIFIBERRY_DACPRO_CLK48EN;
-+		break;
-+	}
-+	return type;
-+}
-+
-+static void snd_rpi_hifiberry_dacplus_set_sclk(struct snd_soc_component *component,
-+	int sample_rate)
-+{
-+	struct pcm512x_priv *pcm512x = snd_soc_component_get_drvdata(component);
-+
-+	if (!IS_ERR(pcm512x->sclk)) {
-+		int ctype;
-+
-+		ctype = snd_rpi_hifiberry_dacplus_clk_for_rate(sample_rate);
-+		clk_set_rate(pcm512x->sclk, (ctype == HIFIBERRY_DACPRO_CLK44EN)
-+			? CLK_44EN_RATE : CLK_48EN_RATE);
-+		snd_rpi_hifiberry_dacplus_select_clk(component, ctype);
-+	}
-+}
-+
-+static int snd_rpi_hifiberry_dacplus_init(struct snd_soc_pcm_runtime *rtd)
-+{
-+	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
-+	struct pcm512x_priv *priv;
-+	struct snd_soc_card *card = &snd_rpi_hifiberry_dacplus;
-+
-+	if (slave)
-+		snd_rpi_hifiberry_is_dacpro = false;
-+	else
-+		snd_rpi_hifiberry_is_dacpro =
-+				snd_rpi_hifiberry_dacplus_is_pro_card(component);
-+
-+	if (snd_rpi_hifiberry_is_dacpro) {
-+		struct snd_soc_dai_link *dai = rtd->dai_link;
-+
-+		dai->name = "HiFiBerry DAC+ Pro";
-+		dai->stream_name = "HiFiBerry DAC+ Pro HiFi";
-+		dai->dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-+			| SND_SOC_DAIFMT_CBM_CFM;
-+
-+		snd_soc_component_update_bits(component, PCM512x_BCLK_LRCLK_CFG, 0x31, 0x11);
-+		snd_soc_component_update_bits(component, PCM512x_MASTER_MODE, 0x03, 0x03);
-+		snd_soc_component_update_bits(component, PCM512x_MASTER_CLKDIV_2, 0x7f, 63);
-+	} else {
-+		priv = snd_soc_component_get_drvdata(component);
-+		priv->sclk = ERR_PTR(-ENOENT);
-+	}
-+
-+	snd_soc_component_update_bits(component, PCM512x_GPIO_EN, 0x08, 0x08);
-+	snd_soc_component_update_bits(component, PCM512x_GPIO_OUTPUT_4, 0x0f, 0x02);
-+	if (leds_off)
-+		snd_soc_component_update_bits(component, PCM512x_GPIO_CONTROL_1, 0x08, 0x00);
-+	else
-+		snd_soc_component_update_bits(component, PCM512x_GPIO_CONTROL_1, 0x08, 0x08);
-+
-+	if (digital_gain_0db_limit) {
-+		int ret;
-+		struct snd_soc_card *card = rtd->card;
-+
-+		ret = snd_soc_limit_volume(card, "Digital Playback Volume", 207);
-+		if (ret < 0)
-+			dev_warn(card->dev, "Failed to set volume limit: %d\n", ret);
-+	}
-+	if (snd_reset_gpio) {
-+		gpiod_set_value_cansleep(snd_reset_gpio, 0);
-+		msleep(1);
-+		gpiod_set_value_cansleep(snd_reset_gpio, 1);
-+		msleep(1);
-+		gpiod_set_value_cansleep(snd_reset_gpio, 0);
-+	}
-+
-+	if (mute_ext_ctl)
-+		snd_soc_add_card_controls(card,	hb_dacplus_opt_mute_controls,
-+				ARRAY_SIZE(hb_dacplus_opt_mute_controls));
-+
-+	if (snd_mute_gpio)
-+		gpiod_set_value_cansleep(snd_mute_gpio,	mute_ext);
-+
-+	return 0;
-+}
-+
-+static int snd_rpi_hifiberry_dacplus_update_rate_den(
-+	struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
-+	struct pcm512x_priv *pcm512x = snd_soc_component_get_drvdata(component);
-+	struct snd_ratnum *rats_no_pll;
-+	unsigned int num = 0, den = 0;
-+	int err;
-+
-+	rats_no_pll = devm_kzalloc(rtd->dev, sizeof(*rats_no_pll), GFP_KERNEL);
-+	if (!rats_no_pll)
-+		return -ENOMEM;
-+
-+	rats_no_pll->num = clk_get_rate(pcm512x->sclk) / 64;
-+	rats_no_pll->den_min = 1;
-+	rats_no_pll->den_max = 128;
-+	rats_no_pll->den_step = 1;
-+
-+	err = snd_interval_ratnum(hw_param_interval(params,
-+		SNDRV_PCM_HW_PARAM_RATE), 1, rats_no_pll, &num, &den);
-+	if (err >= 0 && den) {
-+		params->rate_num = num;
-+		params->rate_den = den;
-+	}
-+
-+	devm_kfree(rtd->dev, rats_no_pll);
-+	return 0;
-+}
-+
-+static int snd_rpi_hifiberry_dacplus_hw_params(
-+	struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params)
-+{
-+	int ret = 0;
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	int channels = params_channels(params);
-+	int width = 32;
-+
-+	if (snd_rpi_hifiberry_is_dacpro) {
-+		struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
-+
-+		width = snd_pcm_format_physical_width(params_format(params));
-+
-+		snd_rpi_hifiberry_dacplus_set_sclk(component,
-+			params_rate(params));
-+
-+		ret = snd_rpi_hifiberry_dacplus_update_rate_den(
-+			substream, params);
-+	}
-+
-+	ret = snd_soc_dai_set_bclk_ratio(asoc_rtd_to_cpu(rtd, 0), channels * width);
-+	if (ret)
-+		return ret;
-+	ret = snd_soc_dai_set_bclk_ratio(asoc_rtd_to_codec(rtd, 0), channels * width);
-+	return ret;
-+}
-+
-+static int snd_rpi_hifiberry_dacplus_startup(
-+	struct snd_pcm_substream *substream)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
-+
-+	if (auto_mute)
-+		gpiod_set_value_cansleep(snd_mute_gpio, 0);
-+	if (leds_off)
-+		return 0;
-+	snd_soc_component_update_bits(component, PCM512x_GPIO_CONTROL_1, 0x08, 0x08);
-+	return 0;
-+}
-+
-+static void snd_rpi_hifiberry_dacplus_shutdown(
-+	struct snd_pcm_substream *substream)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
-+
-+	snd_soc_component_update_bits(component, PCM512x_GPIO_CONTROL_1, 0x08, 0x00);
-+	if (auto_mute)
-+		gpiod_set_value_cansleep(snd_mute_gpio, 1);
-+}
-+
-+/* machine stream operations */
-+static struct snd_soc_ops snd_rpi_hifiberry_dacplus_ops = {
-+	.hw_params = snd_rpi_hifiberry_dacplus_hw_params,
-+	.startup = snd_rpi_hifiberry_dacplus_startup,
-+	.shutdown = snd_rpi_hifiberry_dacplus_shutdown,
-+};
-+
-+SND_SOC_DAILINK_DEFS(rpi_hifiberry_dacplus,
-+	DAILINK_COMP_ARRAY(COMP_CPU("bcm2708-i2s.0")),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("pcm512x.1-004d", "pcm512x-hifi")),
-+	DAILINK_COMP_ARRAY(COMP_PLATFORM("bcm2708-i2s.0")));
-+
-+static struct snd_soc_dai_link snd_rpi_hifiberry_dacplus_dai[] = {
-+{
-+	.name		= "HiFiBerry DAC+",
-+	.stream_name	= "HiFiBerry DAC+ HiFi",
-+	.dai_fmt	= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-+				SND_SOC_DAIFMT_CBS_CFS,
-+	.ops		= &snd_rpi_hifiberry_dacplus_ops,
-+	.init		= snd_rpi_hifiberry_dacplus_init,
-+	SND_SOC_DAILINK_REG(rpi_hifiberry_dacplus),
-+},
-+};
-+
-+/* aux device for optional headphone amp */
-+static struct snd_soc_aux_dev hifiberry_dacplus_aux_devs[] = {
-+	{
-+		.dlc = {
-+			.name = "tpa6130a2.1-0060",
-+		},
-+	},
-+};
-+
-+/* audio machine driver */
-+static struct snd_soc_card snd_rpi_hifiberry_dacplus = {
-+	.name         = "snd_rpi_hifiberry_dacplus",
-+	.driver_name  = "HifiberryDacp",
-+	.owner        = THIS_MODULE,
-+	.dai_link     = snd_rpi_hifiberry_dacplus_dai,
-+	.num_links    = ARRAY_SIZE(snd_rpi_hifiberry_dacplus_dai),
-+};
-+
-+static int hb_hp_detect(void)
-+{
-+	struct i2c_adapter *adap = i2c_get_adapter(1);
-+	int ret;
-+	struct i2c_client tpa_i2c_client = {
-+		.addr = 0x60,
-+		.adapter = adap,
-+	};
-+
-+	if (!adap)
-+		return -EPROBE_DEFER;	/* I2C module not yet available */
-+
-+	ret = i2c_smbus_read_byte(&tpa_i2c_client) >= 0;
-+	i2c_put_adapter(adap);
-+	return ret;
-+};
-+
-+static struct property tpa_enable_prop = {
-+	       .name = "status",
-+	       .length = 4 + 1, /* length 'okay' + 1 */
-+	       .value = "okay",
-+	};
-+
-+static int snd_rpi_hifiberry_dacplus_probe(struct platform_device *pdev)
-+{
-+	int ret = 0;
-+	struct snd_soc_card *card = &snd_rpi_hifiberry_dacplus;
-+	int len;
-+	struct device_node *tpa_node;
-+	struct property *tpa_prop;
-+	struct of_changeset ocs;
-+	struct property *pp;
-+	int tmp;
-+
-+	/* probe for head phone amp */
-+	ret = hb_hp_detect();
-+	if (ret < 0)
-+		return ret;
-+	if (ret) {
-+		card->aux_dev = hifiberry_dacplus_aux_devs;
-+		card->num_aux_devs =
-+				ARRAY_SIZE(hifiberry_dacplus_aux_devs);
-+		tpa_node = of_find_compatible_node(NULL, NULL, "ti,tpa6130a2");
-+		tpa_prop = of_find_property(tpa_node, "status", &len);
-+
-+		if (strcmp((char *)tpa_prop->value, "okay")) {
-+			/* and activate headphone using change_sets */
-+			dev_info(&pdev->dev, "activating headphone amplifier");
-+			of_changeset_init(&ocs);
-+			ret = of_changeset_update_property(&ocs, tpa_node,
-+							&tpa_enable_prop);
-+			if (ret) {
-+				dev_err(&pdev->dev,
-+				"cannot activate headphone amplifier\n");
-+				return -ENODEV;
-+			}
-+			ret = of_changeset_apply(&ocs);
-+			if (ret) {
-+				dev_err(&pdev->dev,
-+				"cannot activate headphone amplifier\n");
-+				return -ENODEV;
-+			}
-+		}
-+	}
-+
-+	snd_rpi_hifiberry_dacplus.dev = &pdev->dev;
-+	if (pdev->dev.of_node) {
-+		struct device_node *i2s_node;
-+		struct snd_soc_dai_link *dai;
-+
-+		dai = &snd_rpi_hifiberry_dacplus_dai[0];
-+		i2s_node = of_parse_phandle(pdev->dev.of_node,
-+			"i2s-controller", 0);
-+
-+		if (i2s_node) {
-+			dai->cpus->dai_name = NULL;
-+			dai->cpus->of_node = i2s_node;
-+			dai->platforms->name = NULL;
-+			dai->platforms->of_node = i2s_node;
-+		}
-+
-+		digital_gain_0db_limit = !of_property_read_bool(
-+			pdev->dev.of_node, "hifiberry,24db_digital_gain");
-+		slave = of_property_read_bool(pdev->dev.of_node,
-+						"hifiberry-dacplus,slave");
-+		leds_off = of_property_read_bool(pdev->dev.of_node,
-+						"hifiberry-dacplus,leds_off");
-+		auto_mute = of_property_read_bool(pdev->dev.of_node,
-+						"hifiberry-dacplus,auto_mute");
-+
-+		/*
-+		 * check for HW MUTE as defined in DT-overlay
-+		 * active high, therefore default to HIGH to MUTE
-+		 */
-+		snd_mute_gpio =	devm_gpiod_get_optional(&pdev->dev,
-+						 "mute", GPIOD_OUT_HIGH);
-+		if (IS_ERR(snd_mute_gpio)) {
-+			dev_err(&pdev->dev, "Can't allocate GPIO (HW-MUTE)");
-+			return PTR_ERR(snd_mute_gpio);
-+		}
-+
-+		/* add ALSA control if requested in DT-overlay (AMP100) */
-+		pp = of_find_property(pdev->dev.of_node,
-+				"hifiberry-dacplus,mute_ext_ctl", &tmp);
-+		if (pp) {
-+			if (!of_property_read_u32(pdev->dev.of_node,
-+				"hifiberry-dacplus,mute_ext_ctl", &mute_ext)) {
-+				/* ALSA control will be used */
-+				mute_ext_ctl = 1;
-+			}
-+		}
-+
-+		/* check for HW RESET (AMP100) */
-+		snd_reset_gpio = devm_gpiod_get_optional(&pdev->dev,
-+						"reset", GPIOD_OUT_HIGH);
-+		if (IS_ERR(snd_reset_gpio)) {
-+			dev_err(&pdev->dev, "Can't allocate GPIO (HW-RESET)");
-+			return PTR_ERR(snd_reset_gpio);
-+		}
-+
-+	}
-+
-+	ret = devm_snd_soc_register_card(&pdev->dev,
-+			&snd_rpi_hifiberry_dacplus);
-+	if (ret && ret != -EPROBE_DEFER)
-+		dev_err(&pdev->dev,
-+			"snd_soc_register_card() failed: %d\n", ret);
-+	if (!ret) {
-+		if (snd_mute_gpio)
-+			dev_info(&pdev->dev, "GPIO%i for HW-MUTE selected",
-+					gpio_chip_hwgpio(snd_mute_gpio));
-+		if (snd_reset_gpio)
-+			dev_info(&pdev->dev, "GPIO%i for HW-RESET selected",
-+					gpio_chip_hwgpio(snd_reset_gpio));
-+	}
-+	return ret;
-+}
-+
-+static const struct of_device_id snd_rpi_hifiberry_dacplus_of_match[] = {
-+	{ .compatible = "hifiberry,hifiberry-dacplus", },
-+	{},
-+};
-+MODULE_DEVICE_TABLE(of, snd_rpi_hifiberry_dacplus_of_match);
-+
-+static struct platform_driver snd_rpi_hifiberry_dacplus_driver = {
-+	.driver = {
-+		.name   = "snd-rpi-hifiberry-dacplus",
-+		.owner  = THIS_MODULE,
-+		.of_match_table = snd_rpi_hifiberry_dacplus_of_match,
-+	},
-+	.probe          = snd_rpi_hifiberry_dacplus_probe,
-+};
-+
-+module_platform_driver(snd_rpi_hifiberry_dacplus_driver);
-+
-+MODULE_AUTHOR("Daniel Matuschek <daniel@hifiberry.com>");
-+MODULE_DESCRIPTION("ASoC Driver for HiFiBerry DAC+");
-+MODULE_LICENSE("GPL v2");
---- /dev/null
-+++ b/sound/soc/bcm/hifiberry_dacplusadc.c
-@@ -0,0 +1,398 @@
-+/*
-+ * ASoC Driver for HiFiBerry DAC+ / DAC Pro with ADC
-+ *
-+ * Author:	Daniel Matuschek, Stuart MacLean <stuart@hifiberry.com>
-+ *		Copyright 2014-2015
-+ *		based on code by Florian Meier <florian.meier@koalo.de>
-+ *		ADC added by Joerg Schambacher <joscha@schambacher.com>
-+ *		Copyright 2018
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/kernel.h>
-+#include <linux/clk.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/slab.h>
-+#include <linux/delay.h>
-+
-+#include <sound/core.h>
-+#include <sound/pcm.h>
-+#include <sound/pcm_params.h>
-+#include <sound/soc.h>
-+#include <sound/jack.h>
-+
-+#include "../codecs/pcm512x.h"
-+
-+#define HIFIBERRY_DACPRO_NOCLOCK 0
-+#define HIFIBERRY_DACPRO_CLK44EN 1
-+#define HIFIBERRY_DACPRO_CLK48EN 2
-+
-+struct platform_device *dmic_codec_dev;
-+
-+struct pcm512x_priv {
-+	struct regmap *regmap;
-+	struct clk *sclk;
-+};
-+
-+/* Clock rate of CLK44EN attached to GPIO6 pin */
-+#define CLK_44EN_RATE 22579200UL
-+/* Clock rate of CLK48EN attached to GPIO3 pin */
-+#define CLK_48EN_RATE 24576000UL
-+
-+static bool slave;
-+static bool snd_rpi_hifiberry_is_dacpro;
-+static bool digital_gain_0db_limit = true;
-+static bool leds_off;
-+
-+static void snd_rpi_hifiberry_dacplusadc_select_clk(struct snd_soc_component *component,
-+	int clk_id)
-+{
-+	switch (clk_id) {
-+	case HIFIBERRY_DACPRO_NOCLOCK:
-+		snd_soc_component_update_bits(component, PCM512x_GPIO_CONTROL_1, 0x24, 0x00);
-+		break;
-+	case HIFIBERRY_DACPRO_CLK44EN:
-+		snd_soc_component_update_bits(component, PCM512x_GPIO_CONTROL_1, 0x24, 0x20);
-+		break;
-+	case HIFIBERRY_DACPRO_CLK48EN:
-+		snd_soc_component_update_bits(component, PCM512x_GPIO_CONTROL_1, 0x24, 0x04);
-+		break;
-+	}
-+}
-+
-+static void snd_rpi_hifiberry_dacplusadc_clk_gpio(struct snd_soc_component *component)
-+{
-+	snd_soc_component_update_bits(component, PCM512x_GPIO_EN, 0x24, 0x24);
-+	snd_soc_component_update_bits(component, PCM512x_GPIO_OUTPUT_3, 0x0f, 0x02);
-+	snd_soc_component_update_bits(component, PCM512x_GPIO_OUTPUT_6, 0x0f, 0x02);
-+}
-+
-+static bool snd_rpi_hifiberry_dacplusadc_is_sclk(struct snd_soc_component *component)
-+{
-+	unsigned int sck;
-+
-+	sck = snd_soc_component_read(component, PCM512x_RATE_DET_4);
-+	return (!(sck & 0x40));
-+}
-+
-+static bool snd_rpi_hifiberry_dacplusadc_is_sclk_sleep(
-+	struct snd_soc_component *component)
-+{
-+	msleep(2);
-+	return snd_rpi_hifiberry_dacplusadc_is_sclk(component);
-+}
-+
-+static bool snd_rpi_hifiberry_dacplusadc_is_pro_card(struct snd_soc_component *component)
-+{
-+	bool isClk44EN, isClk48En, isNoClk;
-+
-+	snd_rpi_hifiberry_dacplusadc_clk_gpio(component);
-+
-+	snd_rpi_hifiberry_dacplusadc_select_clk(component, HIFIBERRY_DACPRO_CLK44EN);
-+	isClk44EN = snd_rpi_hifiberry_dacplusadc_is_sclk_sleep(component);
-+
-+	snd_rpi_hifiberry_dacplusadc_select_clk(component, HIFIBERRY_DACPRO_NOCLOCK);
-+	isNoClk = snd_rpi_hifiberry_dacplusadc_is_sclk_sleep(component);
-+
-+	snd_rpi_hifiberry_dacplusadc_select_clk(component, HIFIBERRY_DACPRO_CLK48EN);
-+	isClk48En = snd_rpi_hifiberry_dacplusadc_is_sclk_sleep(component);
-+
-+	return (isClk44EN && isClk48En && !isNoClk);
-+}
-+
-+static int snd_rpi_hifiberry_dacplusadc_clk_for_rate(int sample_rate)
-+{
-+	int type;
-+
-+	switch (sample_rate) {
-+	case 11025:
-+	case 22050:
-+	case 44100:
-+	case 88200:
-+	case 176400:
-+	case 352800:
-+		type = HIFIBERRY_DACPRO_CLK44EN;
-+		break;
-+	default:
-+		type = HIFIBERRY_DACPRO_CLK48EN;
-+		break;
-+	}
-+	return type;
-+}
-+
-+static void snd_rpi_hifiberry_dacplusadc_set_sclk(struct snd_soc_component *component,
-+	int sample_rate)
-+{
-+	struct pcm512x_priv *pcm512x = snd_soc_component_get_drvdata(component);
-+
-+	if (!IS_ERR(pcm512x->sclk)) {
-+		int ctype;
-+
-+		ctype = snd_rpi_hifiberry_dacplusadc_clk_for_rate(sample_rate);
-+		clk_set_rate(pcm512x->sclk, (ctype == HIFIBERRY_DACPRO_CLK44EN)
-+			? CLK_44EN_RATE : CLK_48EN_RATE);
-+		snd_rpi_hifiberry_dacplusadc_select_clk(component, ctype);
-+	}
-+}
-+
-+static int snd_rpi_hifiberry_dacplusadc_init(struct snd_soc_pcm_runtime *rtd)
-+{
-+	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
-+	struct pcm512x_priv *priv;
-+
-+	if (slave)
-+		snd_rpi_hifiberry_is_dacpro = false;
-+	else
-+		snd_rpi_hifiberry_is_dacpro =
-+				snd_rpi_hifiberry_dacplusadc_is_pro_card(component);
-+
-+	if (snd_rpi_hifiberry_is_dacpro) {
-+		struct snd_soc_dai_link *dai = rtd->dai_link;
-+
-+		dai->name = "HiFiBerry ADCDAC+ Pro";
-+		dai->stream_name = "HiFiBerry ADCDAC+ Pro HiFi";
-+		dai->dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-+			| SND_SOC_DAIFMT_CBM_CFM;
-+
-+		snd_soc_component_update_bits(component, PCM512x_BCLK_LRCLK_CFG, 0x31, 0x11);
-+		snd_soc_component_update_bits(component, PCM512x_MASTER_MODE, 0x03, 0x03);
-+		snd_soc_component_update_bits(component, PCM512x_MASTER_CLKDIV_2, 0x7f, 63);
-+	} else {
-+		priv = snd_soc_component_get_drvdata(component);
-+		priv->sclk = ERR_PTR(-ENOENT);
-+	}
-+
-+	snd_soc_component_update_bits(component, PCM512x_GPIO_EN, 0x08, 0x08);
-+	snd_soc_component_update_bits(component, PCM512x_GPIO_OUTPUT_4, 0x0f, 0x02);
-+	if (leds_off)
-+		snd_soc_component_update_bits(component, PCM512x_GPIO_CONTROL_1, 0x08, 0x00);
-+	else
-+		snd_soc_component_update_bits(component, PCM512x_GPIO_CONTROL_1, 0x08, 0x08);
-+
-+	if (digital_gain_0db_limit) {
-+		int ret;
-+		struct snd_soc_card *card = rtd->card;
-+
-+		ret = snd_soc_limit_volume(card, "Digital Playback Volume", 207);
-+		if (ret < 0)
-+			dev_warn(card->dev, "Failed to set volume limit: %d\n", ret);
-+	}
-+
-+	return 0;
-+}
-+
-+static int snd_rpi_hifiberry_dacplusadc_update_rate_den(
-+	struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
-+	struct pcm512x_priv *pcm512x = snd_soc_component_get_drvdata(component);
-+	struct snd_ratnum *rats_no_pll;
-+	unsigned int num = 0, den = 0;
-+	int err;
-+
-+	rats_no_pll = devm_kzalloc(rtd->dev, sizeof(*rats_no_pll), GFP_KERNEL);
-+	if (!rats_no_pll)
-+		return -ENOMEM;
-+
-+	rats_no_pll->num = clk_get_rate(pcm512x->sclk) / 64;
-+	rats_no_pll->den_min = 1;
-+	rats_no_pll->den_max = 128;
-+	rats_no_pll->den_step = 1;
-+
-+	err = snd_interval_ratnum(hw_param_interval(params,
-+		SNDRV_PCM_HW_PARAM_RATE), 1, rats_no_pll, &num, &den);
-+	if (err >= 0 && den) {
-+		params->rate_num = num;
-+		params->rate_den = den;
-+	}
-+
-+	devm_kfree(rtd->dev, rats_no_pll);
-+	return 0;
-+}
-+
-+static int snd_rpi_hifiberry_dacplusadc_hw_params(
-+	struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params)
-+{
-+	int ret = 0;
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	int channels = params_channels(params);
-+	int width = 32;
-+
-+	if (snd_rpi_hifiberry_is_dacpro) {
-+		struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
-+
-+		width = snd_pcm_format_physical_width(params_format(params));
-+
-+		snd_rpi_hifiberry_dacplusadc_set_sclk(component,
-+			params_rate(params));
-+
-+		ret = snd_rpi_hifiberry_dacplusadc_update_rate_den(
-+			substream, params);
-+	}
-+
-+	ret = snd_soc_dai_set_bclk_ratio(asoc_rtd_to_cpu(rtd, 0), channels * width);
-+	if (ret)
-+		return ret;
-+	ret = snd_soc_dai_set_bclk_ratio(asoc_rtd_to_codec(rtd, 0), channels * width);
-+	return ret;
-+}
-+
-+static int hifiberry_dacplusadc_LED_cnt;
-+
-+static int snd_rpi_hifiberry_dacplusadc_startup(
-+	struct snd_pcm_substream *substream)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
-+
-+	if (leds_off)
-+		return 0;
-+	snd_soc_component_update_bits(component, PCM512x_GPIO_CONTROL_1,
-+					 0x08, 0x08);
-+	hifiberry_dacplusadc_LED_cnt++;
-+	return 0;
-+}
-+
-+static void snd_rpi_hifiberry_dacplusadc_shutdown(
-+	struct snd_pcm_substream *substream)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
-+
-+	hifiberry_dacplusadc_LED_cnt--;
-+	if (!hifiberry_dacplusadc_LED_cnt)
-+		snd_soc_component_update_bits(component, PCM512x_GPIO_CONTROL_1,
-+						 0x08, 0x00);
-+}
-+
-+/* machine stream operations */
-+static struct snd_soc_ops snd_rpi_hifiberry_dacplusadc_ops = {
-+	.hw_params = snd_rpi_hifiberry_dacplusadc_hw_params,
-+	.startup = snd_rpi_hifiberry_dacplusadc_startup,
-+	.shutdown = snd_rpi_hifiberry_dacplusadc_shutdown,
-+};
-+
-+SND_SOC_DAILINK_DEFS(hifi,
-+	DAILINK_COMP_ARRAY(COMP_CPU("bcm2708-i2s.0")),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("pcm512x.1-004d", "pcm512x-hifi"),
-+			   COMP_CODEC("dmic-codec", "dmic-hifi")),
-+	DAILINK_COMP_ARRAY(COMP_PLATFORM("bcm2708-i2s.0")));
-+
-+static struct snd_soc_dai_link snd_rpi_hifiberry_dacplusadc_dai[] = {
-+{
-+	.name		= "HiFiBerry DAC+ADC",
-+	.stream_name	= "HiFiBerry DAC+ADC HiFi",
-+	.dai_fmt	= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-+				SND_SOC_DAIFMT_CBS_CFS,
-+	.ops		= &snd_rpi_hifiberry_dacplusadc_ops,
-+	.init		= snd_rpi_hifiberry_dacplusadc_init,
-+	SND_SOC_DAILINK_REG(hifi),
-+},
-+};
-+
-+/* audio machine driver */
-+static struct snd_soc_card snd_rpi_hifiberry_dacplusadc = {
-+	.name         = "snd_rpi_hifiberry_dacplusadc",
-+	.driver_name  = "HifiberryDacpAdc",
-+	.owner        = THIS_MODULE,
-+	.dai_link     = snd_rpi_hifiberry_dacplusadc_dai,
-+	.num_links    = ARRAY_SIZE(snd_rpi_hifiberry_dacplusadc_dai),
-+};
-+
-+
-+static int snd_rpi_hifiberry_dacplusadc_probe(struct platform_device *pdev)
-+{
-+	int ret = 0;
-+
-+	snd_rpi_hifiberry_dacplusadc.dev = &pdev->dev;
-+	if (pdev->dev.of_node) {
-+		struct device_node *i2s_node;
-+		struct snd_soc_dai_link *dai;
-+
-+		dai = &snd_rpi_hifiberry_dacplusadc_dai[0];
-+		i2s_node = of_parse_phandle(pdev->dev.of_node,
-+			"i2s-controller", 0);
-+		if (i2s_node) {
-+			dai->cpus->of_node = i2s_node;
-+			dai->platforms->of_node = i2s_node;
-+			dai->cpus->dai_name = NULL;
-+			dai->platforms->name = NULL;
-+		}
-+	}
-+	digital_gain_0db_limit = !of_property_read_bool(
-+		pdev->dev.of_node, "hifiberry,24db_digital_gain");
-+	slave = of_property_read_bool(pdev->dev.of_node,
-+					"hifiberry-dacplusadc,slave");
-+	leds_off = of_property_read_bool(pdev->dev.of_node,
-+					"hifiberry-dacplusadc,leds_off");
-+
-+	ret = devm_snd_soc_register_card(&pdev->dev,
-+						 &snd_rpi_hifiberry_dacplusadc);
-+	if (ret && ret != -EPROBE_DEFER)
-+		dev_err(&pdev->dev,
-+			"snd_soc_register_card() failed: %d\n", ret);
-+
-+	return ret;
-+}
-+
-+static const struct of_device_id snd_rpi_hifiberry_dacplusadc_of_match[] = {
-+	{ .compatible = "hifiberry,hifiberry-dacplusadc", },
-+	{},
-+};
-+
-+MODULE_DEVICE_TABLE(of, snd_rpi_hifiberry_dacplusadc_of_match);
-+
-+static struct platform_driver snd_rpi_hifiberry_dacplusadc_driver = {
-+	.driver = {
-+		.name   = "snd-rpi-hifiberry-dacplusadc",
-+		.owner  = THIS_MODULE,
-+		.of_match_table = snd_rpi_hifiberry_dacplusadc_of_match,
-+	},
-+	.probe          = snd_rpi_hifiberry_dacplusadc_probe,
-+};
-+
-+static int __init hifiberry_dacplusadc_init(void)
-+{
-+	int ret;
-+
-+	dmic_codec_dev = platform_device_register_simple("dmic-codec", -1, NULL,
-+							 0);
-+	if (IS_ERR(dmic_codec_dev)) {
-+		pr_err("%s: dmic-codec device registration failed\n", __func__);
-+		return PTR_ERR(dmic_codec_dev);
-+	}
-+
-+	ret = platform_driver_register(&snd_rpi_hifiberry_dacplusadc_driver);
-+	if (ret) {
-+		pr_err("%s: platform driver registration failed\n", __func__);
-+		platform_device_unregister(dmic_codec_dev);
-+	}
-+
-+	return ret;
-+}
-+module_init(hifiberry_dacplusadc_init);
-+
-+static void __exit hifiberry_dacplusadc_exit(void)
-+{
-+	platform_driver_unregister(&snd_rpi_hifiberry_dacplusadc_driver);
-+	platform_device_unregister(dmic_codec_dev);
-+}
-+module_exit(hifiberry_dacplusadc_exit);
-+
-+MODULE_AUTHOR("Joerg Schambacher <joscha@schambacher.com>");
-+MODULE_AUTHOR("Daniel Matuschek <daniel@hifiberry.com>");
-+MODULE_DESCRIPTION("ASoC Driver for HiFiBerry DAC+ADC");
-+MODULE_LICENSE("GPL v2");
---- /dev/null
-+++ b/sound/soc/bcm/hifiberry_dacplusadcpro.c
-@@ -0,0 +1,605 @@
-+/*
-+ * ASoC Driver for HiFiBerry DAC+ / DAC Pro with ADC PRO Version (SW control)
-+ *
-+ * Author:	Daniel Matuschek, Stuart MacLean <stuart@hifiberry.com>
-+ *		Copyright 2014-2015
-+ *		based on code by Florian Meier <florian.meier@koalo.de>
-+ *		ADC, HP added by Joerg Schambacher <joerg@hifiberry.com>
-+ *		Copyright 2018-21
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/kernel.h>
-+#include <linux/clk.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/slab.h>
-+#include <linux/delay.h>
-+#include <linux/i2c.h>
-+
-+#include <sound/core.h>
-+#include <sound/pcm.h>
-+#include <sound/pcm_params.h>
-+#include <sound/soc.h>
-+#include <sound/jack.h>
-+#include <sound/tlv.h>
-+
-+#include "../codecs/pcm512x.h"
-+#include "../codecs/pcm186x.h"
-+
-+#define HIFIBERRY_DACPRO_NOCLOCK 0
-+#define HIFIBERRY_DACPRO_CLK44EN 1
-+#define HIFIBERRY_DACPRO_CLK48EN 2
-+
-+struct pcm512x_priv {
-+	struct regmap *regmap;
-+	struct clk *sclk;
-+};
-+
-+/* Clock rate of CLK44EN attached to GPIO6 pin */
-+#define CLK_44EN_RATE 22579200UL
-+/* Clock rate of CLK48EN attached to GPIO3 pin */
-+#define CLK_48EN_RATE 24576000UL
-+
-+static bool slave;
-+static bool snd_rpi_hifiberry_is_dacpro;
-+static bool digital_gain_0db_limit = true;
-+static bool leds_off;
-+
-+static const unsigned int pcm186x_adc_input_channel_sel_value[] = {
-+	0x00, 0x01, 0x02, 0x03, 0x10
-+};
-+
-+static const char * const pcm186x_adcl_input_channel_sel_text[] = {
-+	"No Select",
-+	"VINL1[SE]",					/* Default for ADCL */
-+	"VINL2[SE]",
-+	"VINL2[SE] + VINL1[SE]",
-+	"{VIN1P, VIN1M}[DIFF]"
-+};
-+
-+static const char * const pcm186x_adcr_input_channel_sel_text[] = {
-+	"No Select",
-+	"VINR1[SE]",					/* Default for ADCR */
-+	"VINR2[SE]",
-+	"VINR2[SE] + VINR1[SE]",
-+	"{VIN2P, VIN2M}[DIFF]"
-+};
-+
-+static const struct soc_enum pcm186x_adc_input_channel_sel[] = {
-+	SOC_VALUE_ENUM_SINGLE(PCM186X_ADC1_INPUT_SEL_L, 0,
-+			      PCM186X_ADC_INPUT_SEL_MASK,
-+			      ARRAY_SIZE(pcm186x_adcl_input_channel_sel_text),
-+			      pcm186x_adcl_input_channel_sel_text,
-+			      pcm186x_adc_input_channel_sel_value),
-+	SOC_VALUE_ENUM_SINGLE(PCM186X_ADC1_INPUT_SEL_R, 0,
-+			      PCM186X_ADC_INPUT_SEL_MASK,
-+			      ARRAY_SIZE(pcm186x_adcr_input_channel_sel_text),
-+			      pcm186x_adcr_input_channel_sel_text,
-+			      pcm186x_adc_input_channel_sel_value),
-+};
-+
-+static const unsigned int pcm186x_mic_bias_sel_value[] = {
-+	0x00, 0x01, 0x11
-+};
-+
-+static const char * const pcm186x_mic_bias_sel_text[] = {
-+	"Mic Bias off",
-+	"Mic Bias on",
-+	"Mic Bias with Bypass Resistor"
-+};
-+
-+static const struct soc_enum pcm186x_mic_bias_sel[] = {
-+	SOC_VALUE_ENUM_SINGLE(PCM186X_MIC_BIAS_CTRL, 0,
-+			      GENMASK(4, 0),
-+			      ARRAY_SIZE(pcm186x_mic_bias_sel_text),
-+			      pcm186x_mic_bias_sel_text,
-+			      pcm186x_mic_bias_sel_value),
-+};
-+
-+static const unsigned int pcm186x_gain_sel_value[] = {
-+	0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
-+	0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
-+	0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
-+	0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-+	0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-+	0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-+	0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
-+	0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
-+	0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
-+	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
-+	0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
-+	0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
-+	0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
-+	0x50
-+};
-+
-+static const char * const pcm186x_gain_sel_text[] = {
-+	"-12.0dB", "-11.5dB", "-11.0dB", "-10.5dB", "-10.0dB", "-9.5dB",
-+	"-9.0dB", "-8.5dB", "-8.0dB", "-7.5dB", "-7.0dB", "-6.5dB",
-+	"-6.0dB", "-5.5dB", "-5.0dB", "-4.5dB", "-4.0dB", "-3.5dB",
-+	"-3.0dB", "-2.5dB", "-2.0dB", "-1.5dB", "-1.0dB", "-0.5dB",
-+	"0.0dB", "0.5dB", "1.0dB", "1.5dB", "2.0dB", "2.5dB",
-+	"3.0dB", "3.5dB", "4.0dB", "4.5dB", "5.0dB", "5.5dB",
-+	"6.0dB", "6.5dB", "7.0dB", "7.5dB", "8.0dB", "8.5dB",
-+	"9.0dB", "9.5dB", "10.0dB", "10.5dB", "11.0dB", "11.5dB",
-+	"12.0dB", "12.5dB", "13.0dB", "13.5dB", "14.0dB", "14.5dB",
-+	"15.0dB", "15.5dB", "16.0dB", "16.5dB", "17.0dB", "17.5dB",
-+	"18.0dB", "18.5dB", "19.0dB", "19.5dB", "20.0dB", "20.5dB",
-+	"21.0dB", "21.5dB", "22.0dB", "22.5dB", "23.0dB", "23.5dB",
-+	"24.0dB", "24.5dB", "25.0dB", "25.5dB", "26.0dB", "26.5dB",
-+	"27.0dB", "27.5dB", "28.0dB", "28.5dB", "29.0dB", "29.5dB",
-+	"30.0dB", "30.5dB", "31.0dB", "31.5dB", "32.0dB", "32.5dB",
-+	"33.0dB", "33.5dB", "34.0dB", "34.5dB", "35.0dB", "35.5dB",
-+	"36.0dB", "36.5dB", "37.0dB", "37.5dB", "38.0dB", "38.5dB",
-+	"39.0dB", "39.5dB", "40.0dB"};
-+
-+static const struct soc_enum pcm186x_gain_sel[] = {
-+	SOC_VALUE_ENUM_SINGLE(PCM186X_PGA_VAL_CH1_L, 0,
-+			      0xff,
-+			      ARRAY_SIZE(pcm186x_gain_sel_text),
-+			      pcm186x_gain_sel_text,
-+			      pcm186x_gain_sel_value),
-+	SOC_VALUE_ENUM_SINGLE(PCM186X_PGA_VAL_CH1_R, 0,
-+			      0xff,
-+			      ARRAY_SIZE(pcm186x_gain_sel_text),
-+			      pcm186x_gain_sel_text,
-+			      pcm186x_gain_sel_value),
-+};
-+
-+static const struct snd_kcontrol_new pcm1863_snd_controls_card[] = {
-+	SOC_ENUM("ADC Left Input", pcm186x_adc_input_channel_sel[0]),
-+	SOC_ENUM("ADC Right Input", pcm186x_adc_input_channel_sel[1]),
-+	SOC_ENUM("ADC Mic Bias", pcm186x_mic_bias_sel),
-+	SOC_ENUM("PGA Gain Left", pcm186x_gain_sel[0]),
-+	SOC_ENUM("PGA Gain Right", pcm186x_gain_sel[1]),
-+};
-+
-+static int pcm1863_add_controls(struct snd_soc_component *component)
-+{
-+	snd_soc_add_component_controls(component,
-+			pcm1863_snd_controls_card,
-+			ARRAY_SIZE(pcm1863_snd_controls_card));
-+	return 0;
-+}
-+
-+static void snd_rpi_hifiberry_dacplusadcpro_select_clk(
-+					struct snd_soc_component *component, int clk_id)
-+{
-+	switch (clk_id) {
-+	case HIFIBERRY_DACPRO_NOCLOCK:
-+		snd_soc_component_update_bits(component,
-+				PCM512x_GPIO_CONTROL_1, 0x24, 0x00);
-+		break;
-+	case HIFIBERRY_DACPRO_CLK44EN:
-+		snd_soc_component_update_bits(component,
-+				PCM512x_GPIO_CONTROL_1, 0x24, 0x20);
-+		break;
-+	case HIFIBERRY_DACPRO_CLK48EN:
-+		snd_soc_component_update_bits(component,
-+				PCM512x_GPIO_CONTROL_1, 0x24, 0x04);
-+		break;
-+	}
-+	usleep_range(3000, 4000);
-+}
-+
-+static void snd_rpi_hifiberry_dacplusadcpro_clk_gpio(struct snd_soc_component *component)
-+{
-+	snd_soc_component_update_bits(component, PCM512x_GPIO_EN, 0x24, 0x24);
-+	snd_soc_component_update_bits(component, PCM512x_GPIO_OUTPUT_3, 0x0f, 0x02);
-+	snd_soc_component_update_bits(component, PCM512x_GPIO_OUTPUT_6, 0x0f, 0x02);
-+}
-+
-+static bool snd_rpi_hifiberry_dacplusadcpro_is_sclk(struct snd_soc_component *component)
-+{
-+	unsigned int sck;
-+
-+	sck = snd_soc_component_read(component, PCM512x_RATE_DET_4);
-+	return (!(sck & 0x40));
-+}
-+
-+static bool snd_rpi_hifiberry_dacplusadcpro_is_pro_card(struct snd_soc_component *component)
-+{
-+	bool isClk44EN, isClk48En, isNoClk;
-+
-+	snd_rpi_hifiberry_dacplusadcpro_clk_gpio(component);
-+
-+	snd_rpi_hifiberry_dacplusadcpro_select_clk(component, HIFIBERRY_DACPRO_CLK44EN);
-+	isClk44EN = snd_rpi_hifiberry_dacplusadcpro_is_sclk(component);
-+
-+	snd_rpi_hifiberry_dacplusadcpro_select_clk(component, HIFIBERRY_DACPRO_NOCLOCK);
-+	isNoClk = snd_rpi_hifiberry_dacplusadcpro_is_sclk(component);
-+
-+	snd_rpi_hifiberry_dacplusadcpro_select_clk(component, HIFIBERRY_DACPRO_CLK48EN);
-+	isClk48En = snd_rpi_hifiberry_dacplusadcpro_is_sclk(component);
-+
-+	return (isClk44EN && isClk48En && !isNoClk);
-+}
-+
-+static int snd_rpi_hifiberry_dacplusadcpro_clk_for_rate(int sample_rate)
-+{
-+	int type;
-+
-+	switch (sample_rate) {
-+	case 11025:
-+	case 22050:
-+	case 44100:
-+	case 88200:
-+	case 176400:
-+	case 352800:
-+		type = HIFIBERRY_DACPRO_CLK44EN;
-+		break;
-+	default:
-+		type = HIFIBERRY_DACPRO_CLK48EN;
-+		break;
-+	}
-+	return type;
-+}
-+
-+static void snd_rpi_hifiberry_dacplusadcpro_set_sclk(struct snd_soc_component *component,
-+	int sample_rate)
-+{
-+	struct pcm512x_priv *pcm512x = snd_soc_component_get_drvdata(component);
-+
-+	if (!IS_ERR(pcm512x->sclk)) {
-+		int ctype;
-+
-+		ctype = snd_rpi_hifiberry_dacplusadcpro_clk_for_rate(sample_rate);
-+		clk_set_rate(pcm512x->sclk, (ctype == HIFIBERRY_DACPRO_CLK44EN)
-+			? CLK_44EN_RATE : CLK_48EN_RATE);
-+		snd_rpi_hifiberry_dacplusadcpro_select_clk(component, ctype);
-+	}
-+}
-+
-+static int snd_rpi_hifiberry_dacplusadcpro_init(struct snd_soc_pcm_runtime *rtd)
-+{
-+	struct snd_soc_component *dac = asoc_rtd_to_codec(rtd, 0)->component;
-+	struct snd_soc_component *adc = asoc_rtd_to_codec(rtd, 1)->component;
-+	struct snd_soc_dai_driver *adc_driver = asoc_rtd_to_codec(rtd, 1)->driver;
-+	struct pcm512x_priv *priv;
-+	int ret;
-+
-+	if (slave)
-+		snd_rpi_hifiberry_is_dacpro = false;
-+	else
-+		snd_rpi_hifiberry_is_dacpro =
-+				snd_rpi_hifiberry_dacplusadcpro_is_pro_card(dac);
-+
-+	if (snd_rpi_hifiberry_is_dacpro) {
-+		struct snd_soc_dai_link *dai = rtd->dai_link;
-+
-+		dai->name = "HiFiBerry DAC+ADC Pro";
-+		dai->stream_name = "HiFiBerry DAC+ADC Pro HiFi";
-+		dai->dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-+			| SND_SOC_DAIFMT_CBM_CFM;
-+
-+		// set DAC DAI configuration
-+		ret = snd_soc_dai_set_fmt(asoc_rtd_to_codec(rtd, 0),
-+				SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-+			| SND_SOC_DAIFMT_CBM_CFM);
-+		if (ret < 0)
-+			return ret;
-+
-+		// set ADC DAI configuration
-+		ret = snd_soc_dai_set_fmt(asoc_rtd_to_codec(rtd, 1),
-+				SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-+			| SND_SOC_DAIFMT_CBS_CFS);
-+		if (ret < 0)
-+			return ret;
-+
-+		// set CPU DAI configuration
-+		ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0),
-+			SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS);
-+		if (ret < 0)
-+			return ret;
-+
-+		snd_soc_component_update_bits(dac, PCM512x_BCLK_LRCLK_CFG, 0x31, 0x11);
-+		snd_soc_component_update_bits(dac, PCM512x_MASTER_MODE, 0x03, 0x03);
-+		snd_soc_component_update_bits(dac, PCM512x_MASTER_CLKDIV_2, 0x7f, 63);
-+	} else {
-+		priv = snd_soc_component_get_drvdata(dac);
-+		priv->sclk = ERR_PTR(-ENOENT);
-+	}
-+
-+	/* disable 24bit mode as long as I2S module does not have sign extension fixed */
-+	adc_driver->capture.formats = SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_S16_LE;
-+
-+	snd_soc_component_update_bits(dac, PCM512x_GPIO_EN, 0x08, 0x08);
-+	snd_soc_component_update_bits(dac, PCM512x_GPIO_OUTPUT_4, 0x0f, 0x02);
-+	if (leds_off)
-+		snd_soc_component_update_bits(dac, PCM512x_GPIO_CONTROL_1, 0x08, 0x00);
-+	else
-+		snd_soc_component_update_bits(dac, PCM512x_GPIO_CONTROL_1, 0x08, 0x08);
-+
-+	ret = pcm1863_add_controls(adc);
-+	if (ret < 0)
-+		dev_warn(rtd->dev, "Failed to add pcm1863 controls: %d\n",
-+		ret);
-+
-+	/* set GPIO2 to output, GPIO3 input */
-+	snd_soc_component_write(adc, PCM186X_GPIO3_2_CTRL, 0x00);
-+	snd_soc_component_write(adc, PCM186X_GPIO3_2_DIR_CTRL, 0x04);
-+	if (leds_off)
-+		snd_soc_component_update_bits(adc, PCM186X_GPIO_IN_OUT, 0x40, 0x00);
-+	else
-+		snd_soc_component_update_bits(adc, PCM186X_GPIO_IN_OUT, 0x40, 0x40);
-+
-+	if (digital_gain_0db_limit) {
-+		int ret;
-+		struct snd_soc_card *card = rtd->card;
-+
-+		ret = snd_soc_limit_volume(card, "Digital Playback Volume", 207);
-+		if (ret < 0)
-+			dev_warn(card->dev, "Failed to set volume limit: %d\n", ret);
-+	}
-+
-+	return 0;
-+}
-+
-+static int snd_rpi_hifiberry_dacplusadcpro_update_rate_den(
-+	struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; /* only use DAC */
-+	struct pcm512x_priv *pcm512x = snd_soc_component_get_drvdata(component);
-+	struct snd_ratnum *rats_no_pll;
-+	unsigned int num = 0, den = 0;
-+	int err;
-+
-+	rats_no_pll = devm_kzalloc(rtd->dev, sizeof(*rats_no_pll), GFP_KERNEL);
-+	if (!rats_no_pll)
-+		return -ENOMEM;
-+
-+	rats_no_pll->num = clk_get_rate(pcm512x->sclk) / 64;
-+	rats_no_pll->den_min = 1;
-+	rats_no_pll->den_max = 128;
-+	rats_no_pll->den_step = 1;
-+
-+	err = snd_interval_ratnum(hw_param_interval(params,
-+		SNDRV_PCM_HW_PARAM_RATE), 1, rats_no_pll, &num, &den);
-+	if (err >= 0 && den) {
-+		params->rate_num = num;
-+		params->rate_den = den;
-+	}
-+
-+	devm_kfree(rtd->dev, rats_no_pll);
-+	return 0;
-+}
-+
-+static int snd_rpi_hifiberry_dacplusadcpro_hw_params(
-+	struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params)
-+{
-+	int ret = 0;
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	int channels = params_channels(params);
-+	int width = 32;
-+	struct snd_soc_component *dac = asoc_rtd_to_codec(rtd, 0)->component;
-+	struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0);
-+	struct snd_soc_dai_driver *drv = dai->driver;
-+	const struct snd_soc_dai_ops *ops = drv->ops;
-+
-+	if (snd_rpi_hifiberry_is_dacpro) {
-+		width = snd_pcm_format_physical_width(params_format(params));
-+
-+		snd_rpi_hifiberry_dacplusadcpro_set_sclk(dac,
-+			params_rate(params));
-+
-+		ret = snd_rpi_hifiberry_dacplusadcpro_update_rate_den(
-+			substream, params);
-+		if (ret)
-+			return ret;
-+	}
-+
-+	ret = snd_soc_dai_set_bclk_ratio(asoc_rtd_to_cpu(rtd, 0), channels * width);
-+	if (ret)
-+		return ret;
-+	ret = snd_soc_dai_set_bclk_ratio(asoc_rtd_to_codec(rtd, 0), channels * width);
-+	if (ret)
-+		return ret;
-+	if (snd_rpi_hifiberry_is_dacpro && ops->hw_params)
-+		ret = ops->hw_params(substream, params, dai);
-+	return ret;
-+}
-+
-+static int snd_rpi_hifiberry_dacplusadcpro_startup(
-+	struct snd_pcm_substream *substream)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_component *dac = asoc_rtd_to_codec(rtd, 0)->component;
-+	struct snd_soc_component *adc = asoc_rtd_to_codec(rtd, 1)->component;
-+
-+	if (leds_off)
-+		return 0;
-+	/* switch on respective LED */
-+	if (!substream->stream)
-+		snd_soc_component_update_bits(dac, PCM512x_GPIO_CONTROL_1, 0x08, 0x08);
-+	else
-+		snd_soc_component_update_bits(adc, PCM186X_GPIO_IN_OUT, 0x40, 0x40);
-+	return 0;
-+}
-+
-+static void snd_rpi_hifiberry_dacplusadcpro_shutdown(
-+	struct snd_pcm_substream *substream)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_component *dac = asoc_rtd_to_codec(rtd, 0)->component;
-+	struct snd_soc_component *adc = asoc_rtd_to_codec(rtd, 1)->component;
-+
-+	/* switch off respective LED */
-+	if (!substream->stream)
-+		snd_soc_component_update_bits(dac, PCM512x_GPIO_CONTROL_1, 0x08, 0x00);
-+	else
-+		snd_soc_component_update_bits(adc, PCM186X_GPIO_IN_OUT, 0x40, 0x00);
-+}
-+
-+
-+/* machine stream operations */
-+static struct snd_soc_ops snd_rpi_hifiberry_dacplusadcpro_ops = {
-+	.hw_params = snd_rpi_hifiberry_dacplusadcpro_hw_params,
-+	.startup = snd_rpi_hifiberry_dacplusadcpro_startup,
-+	.shutdown = snd_rpi_hifiberry_dacplusadcpro_shutdown,
-+};
-+
-+SND_SOC_DAILINK_DEFS(hifi,
-+	DAILINK_COMP_ARRAY(COMP_CPU("bcm2708-i2s.0")),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("pcm512x.1-004d", "pcm512x-hifi"),
-+			   COMP_CODEC("pcm186x.1-004a", "pcm1863-aif")),
-+	DAILINK_COMP_ARRAY(COMP_PLATFORM("bcm2708-i2s.0")));
-+
-+static struct snd_soc_dai_link snd_rpi_hifiberry_dacplusadcpro_dai[] = {
-+{
-+	.name		= "HiFiBerry DAC+ADC PRO",
-+	.stream_name	= "HiFiBerry DAC+ADC PRO HiFi",
-+	.dai_fmt	= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-+				SND_SOC_DAIFMT_CBS_CFS,
-+	.ops		= &snd_rpi_hifiberry_dacplusadcpro_ops,
-+	.init		= snd_rpi_hifiberry_dacplusadcpro_init,
-+	SND_SOC_DAILINK_REG(hifi),
-+},
-+};
-+
-+/* aux device for optional headphone amp */
-+static struct snd_soc_aux_dev hifiberry_dacplusadcpro_aux_devs[] = {
-+	{
-+		.dlc = {
-+			.name = "tpa6130a2.1-0060",
-+		},
-+	},
-+};
-+
-+/* audio machine driver */
-+static struct snd_soc_card snd_rpi_hifiberry_dacplusadcpro = {
-+	.name         = "snd_rpi_hifiberry_dacplusadcpro",
-+	.driver_name  = "HifiberryDacpAdcPro",
-+	.owner        = THIS_MODULE,
-+	.dai_link     = snd_rpi_hifiberry_dacplusadcpro_dai,
-+	.num_links    = ARRAY_SIZE(snd_rpi_hifiberry_dacplusadcpro_dai),
-+};
-+
-+static int hb_hp_detect(void)
-+{
-+	struct i2c_adapter *adap = i2c_get_adapter(1);
-+	int ret;
-+	struct i2c_client tpa_i2c_client = {
-+		.addr = 0x60,
-+		.adapter = adap,
-+	};
-+
-+	if (!adap)
-+		return -EPROBE_DEFER;	/* I2C module not yet available */
-+
-+	ret = i2c_smbus_read_byte(&tpa_i2c_client) >= 0;
-+	i2c_put_adapter(adap);
-+	return ret;
-+};
-+
-+static struct property tpa_enable_prop = {
-+	       .name = "status",
-+	       .length = 4 + 1, /* length 'okay' + 1 */
-+	       .value = "okay",
-+	};
-+
-+static int snd_rpi_hifiberry_dacplusadcpro_probe(struct platform_device *pdev)
-+{
-+	int ret = 0, i = 0;
-+	struct snd_soc_card *card = &snd_rpi_hifiberry_dacplusadcpro;
-+	struct device_node *tpa_node;
-+	struct property *tpa_prop;
-+	struct of_changeset ocs;
-+	int len;
-+
-+	/* probe for head phone amp */
-+	ret = hb_hp_detect();
-+	if (ret < 0)
-+		return ret;
-+	if (ret) {
-+		card->aux_dev = hifiberry_dacplusadcpro_aux_devs;
-+		card->num_aux_devs =
-+				ARRAY_SIZE(hifiberry_dacplusadcpro_aux_devs);
-+		tpa_node = of_find_compatible_node(NULL, NULL, "ti,tpa6130a2");
-+		tpa_prop = of_find_property(tpa_node, "status", &len);
-+
-+		if (strcmp((char *)tpa_prop->value, "okay")) {
-+			/* and activate headphone using change_sets */
-+			dev_info(&pdev->dev, "activating headphone amplifier");
-+			of_changeset_init(&ocs);
-+			ret = of_changeset_update_property(&ocs, tpa_node,
-+							&tpa_enable_prop);
-+			if (ret) {
-+				dev_err(&pdev->dev,
-+				"cannot activate headphone amplifier\n");
-+				return -ENODEV;
-+			}
-+			ret = of_changeset_apply(&ocs);
-+			if (ret) {
-+				dev_err(&pdev->dev,
-+				"cannot activate headphone amplifier\n");
-+				return -ENODEV;
-+			}
-+		}
-+	}
-+
-+	snd_rpi_hifiberry_dacplusadcpro.dev = &pdev->dev;
-+	if (pdev->dev.of_node) {
-+		struct device_node *i2s_node;
-+		struct snd_soc_dai_link *dai;
-+
-+		dai = &snd_rpi_hifiberry_dacplusadcpro_dai[0];
-+		i2s_node = of_parse_phandle(pdev->dev.of_node,
-+			"i2s-controller", 0);
-+		if (i2s_node) {
-+			for (i = 0; i < card->num_links; i++) {
-+				dai->cpus->dai_name = NULL;
-+				dai->cpus->of_node = i2s_node;
-+				dai->platforms->name = NULL;
-+				dai->platforms->of_node = i2s_node;
-+			}
-+		}
-+	}
-+	digital_gain_0db_limit = !of_property_read_bool(
-+		pdev->dev.of_node, "hifiberry-dacplusadcpro,24db_digital_gain");
-+	slave = of_property_read_bool(pdev->dev.of_node,
-+					"hifiberry-dacplusadcpro,slave");
-+	leds_off = of_property_read_bool(pdev->dev.of_node,
-+					"hifiberry-dacplusadcpro,leds_off");
-+	ret = snd_soc_register_card(&snd_rpi_hifiberry_dacplusadcpro);
-+	if (ret && ret != -EPROBE_DEFER)
-+		dev_err(&pdev->dev,
-+			"snd_soc_register_card() failed: %d\n", ret);
-+
-+	return ret;
-+}
-+
-+static const struct of_device_id snd_rpi_hifiberry_dacplusadcpro_of_match[] = {
-+	{ .compatible = "hifiberry,hifiberry-dacplusadcpro", },
-+	{},
-+};
-+
-+MODULE_DEVICE_TABLE(of, snd_rpi_hifiberry_dacplusadcpro_of_match);
-+
-+static struct platform_driver snd_rpi_hifiberry_dacplusadcpro_driver = {
-+	.driver = {
-+		.name   = "snd-rpi-hifiberry-dacplusadcpro",
-+		.owner  = THIS_MODULE,
-+		.of_match_table = snd_rpi_hifiberry_dacplusadcpro_of_match,
-+	},
-+	.probe          = snd_rpi_hifiberry_dacplusadcpro_probe,
-+};
-+
-+module_platform_driver(snd_rpi_hifiberry_dacplusadcpro_driver);
-+
-+MODULE_AUTHOR("Joerg Schambacher <joerg@hifiberry.com>");
-+MODULE_AUTHOR("Daniel Matuschek <daniel@hifiberry.com>");
-+MODULE_DESCRIPTION("ASoC Driver for HiFiBerry DAC+ADC");
-+MODULE_LICENSE("GPL v2");
---- /dev/null
-+++ b/sound/soc/bcm/hifiberry_dacplusdsp.c
-@@ -0,0 +1,90 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * ASoC Driver for HiFiBerry DAC + DSP
-+ *
-+ * Author:	Joerg Schambacher <joscha@schambacher.com>
-+ *		Copyright 2018
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#include <linux/init.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/platform_device.h>
-+#include <sound/soc.h>
-+
-+static struct snd_soc_component_driver dacplusdsp_component_driver;
-+
-+static struct snd_soc_dai_driver dacplusdsp_dai = {
-+	.name = "dacplusdsp-hifi",
-+	.capture = {
-+		.stream_name = "DAC+DSP Capture",
-+		.channels_min = 2,
-+		.channels_max = 2,
-+		.rates = SNDRV_PCM_RATE_CONTINUOUS,
-+		.formats = SNDRV_PCM_FMTBIT_S16_LE |
-+			   SNDRV_PCM_FMTBIT_S24_LE |
-+			   SNDRV_PCM_FMTBIT_S32_LE,
-+	},
-+	.playback = {
-+		.stream_name = "DACP+DSP Playback",
-+		.channels_min = 2,
-+		.channels_max = 2,
-+		.rates = SNDRV_PCM_RATE_CONTINUOUS,
-+		.formats = SNDRV_PCM_FMTBIT_S16_LE |
-+			   SNDRV_PCM_FMTBIT_S24_LE |
-+			   SNDRV_PCM_FMTBIT_S32_LE,
-+	},
-+	.symmetric_rate = 1};
-+
-+#ifdef CONFIG_OF
-+static const struct of_device_id dacplusdsp_ids[] = {
-+	{
-+		.compatible = "hifiberry,dacplusdsp",
-+	},
-+	{} };
-+MODULE_DEVICE_TABLE(of, dacplusdsp_ids);
-+#endif
-+
-+static int dacplusdsp_platform_probe(struct platform_device *pdev)
-+{
-+	int ret;
-+
-+	ret = snd_soc_register_component(&pdev->dev,
-+			&dacplusdsp_component_driver, &dacplusdsp_dai, 1);
-+	if (ret) {
-+		pr_alert("snd_soc_register_component failed\n");
-+		return ret;
-+	}
-+
-+	return 0;
-+}
-+
-+static int dacplusdsp_platform_remove(struct platform_device *pdev)
-+{
-+	snd_soc_unregister_component(&pdev->dev);
-+	return 0;
-+}
-+
-+static struct platform_driver dacplusdsp_driver = {
-+	.driver = {
-+		.name = "hifiberry-dacplusdsp-codec",
-+		.of_match_table = of_match_ptr(dacplusdsp_ids),
-+		},
-+		.probe = dacplusdsp_platform_probe,
-+		.remove = dacplusdsp_platform_remove,
-+};
-+
-+module_platform_driver(dacplusdsp_driver);
-+
-+MODULE_AUTHOR("Joerg Schambacher <joerg@i2audio.com>");
-+MODULE_DESCRIPTION("ASoC Driver for HiFiBerry DAC+DSP");
-+MODULE_LICENSE("GPL v2");
---- /dev/null
-+++ b/sound/soc/bcm/hifiberry_dacplushd.c
-@@ -0,0 +1,238 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * ASoC Driver for HiFiBerry DAC+ HD
-+ *
-+ * Author:	Joerg Schambacher, i2Audio GmbH for HiFiBerry
-+ *		Copyright 2020
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/kernel.h>
-+#include <linux/delay.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/delay.h>
-+#include <linux/gpio.h>
-+#include <linux/gpio/consumer.h>
-+#include <sound/core.h>
-+#include <sound/pcm.h>
-+#include <sound/pcm_params.h>
-+#include <sound/soc.h>
-+#include <linux/i2c.h>
-+#include <linux/clk.h>
-+
-+#include "../codecs/pcm179x.h"
-+
-+#define DEFAULT_RATE		44100
-+
-+struct brd_drv_data {
-+	struct regmap *regmap;
-+	struct clk *sclk;
-+};
-+
-+static struct brd_drv_data drvdata;
-+static struct gpio_desc *reset_gpio;
-+static const unsigned int hb_dacplushd_rates[] = {
-+	192000, 96000, 48000, 176400, 88200, 44100,
-+};
-+
-+static struct snd_pcm_hw_constraint_list hb_dacplushd_constraints = {
-+	.list = hb_dacplushd_rates,
-+	.count = ARRAY_SIZE(hb_dacplushd_rates),
-+};
-+
-+static int snd_rpi_hb_dacplushd_startup(struct snd_pcm_substream *substream)
-+{
-+	/* constraints for standard sample rates */
-+	snd_pcm_hw_constraint_list(substream->runtime, 0,
-+				SNDRV_PCM_HW_PARAM_RATE,
-+				&hb_dacplushd_constraints);
-+	return 0;
-+}
-+
-+static void snd_rpi_hifiberry_dacplushd_set_sclk(
-+		struct snd_soc_component *component,
-+		int sample_rate)
-+{
-+	if (!IS_ERR(drvdata.sclk))
-+		clk_set_rate(drvdata.sclk, sample_rate);
-+}
-+
-+static int snd_rpi_hifiberry_dacplushd_init(struct snd_soc_pcm_runtime *rtd)
-+{
-+	struct snd_soc_dai_link *dai = rtd->dai_link;
-+	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
-+
-+	dai->name = "HiFiBerry DAC+ HD";
-+	dai->stream_name = "HiFiBerry DAC+ HD HiFi";
-+	dai->dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-+		| SND_SOC_DAIFMT_CBM_CFM;
-+
-+	/* allow only fixed 32 clock counts per channel */
-+	snd_soc_dai_set_bclk_ratio(cpu_dai, 32*2);
-+
-+	return 0;
-+}
-+
-+static int snd_rpi_hifiberry_dacplushd_hw_params(
-+	struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params)
-+{
-+	int ret = 0;
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+
-+	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
-+
-+	snd_rpi_hifiberry_dacplushd_set_sclk(component, params_rate(params));
-+	return ret;
-+}
-+
-+/* machine stream operations */
-+static struct snd_soc_ops snd_rpi_hifiberry_dacplushd_ops = {
-+	.startup = snd_rpi_hb_dacplushd_startup,
-+	.hw_params = snd_rpi_hifiberry_dacplushd_hw_params,
-+};
-+
-+SND_SOC_DAILINK_DEFS(hifi,
-+	DAILINK_COMP_ARRAY(COMP_CPU("bcm2708-i2s.0")),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("pcm179x.1-004c", "pcm179x-hifi")),
-+	DAILINK_COMP_ARRAY(COMP_PLATFORM("bcm2708-i2s.0")));
-+
-+
-+static struct snd_soc_dai_link snd_rpi_hifiberry_dacplushd_dai[] = {
-+{
-+	.name		= "HiFiBerry DAC+ HD",
-+	.stream_name	= "HiFiBerry DAC+ HD HiFi",
-+	.dai_fmt	= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-+				SND_SOC_DAIFMT_CBS_CFS,
-+	.ops		= &snd_rpi_hifiberry_dacplushd_ops,
-+	.init		= snd_rpi_hifiberry_dacplushd_init,
-+	SND_SOC_DAILINK_REG(hifi),
-+},
-+};
-+
-+/* audio machine driver */
-+static struct snd_soc_card snd_rpi_hifiberry_dacplushd = {
-+	.name         = "snd_rpi_hifiberry_dacplushd",
-+	.driver_name  = "HifiberryDacplusHD",
-+	.owner        = THIS_MODULE,
-+	.dai_link     = snd_rpi_hifiberry_dacplushd_dai,
-+	.num_links    = ARRAY_SIZE(snd_rpi_hifiberry_dacplushd_dai),
-+};
-+
-+static int snd_rpi_hifiberry_dacplushd_probe(struct platform_device *pdev)
-+{
-+	int ret = 0;
-+	static int dac_reset_done;
-+	struct device *dev = &pdev->dev;
-+	struct device_node *dev_node = dev->of_node;
-+
-+	snd_rpi_hifiberry_dacplushd.dev = &pdev->dev;
-+
-+	/* get GPIO and release DAC from RESET */
-+	if (!dac_reset_done) {
-+		reset_gpio = gpiod_get(&pdev->dev, "reset", GPIOD_OUT_LOW);
-+		if (IS_ERR(reset_gpio)) {
-+			dev_err(&pdev->dev, "gpiod_get() failed\n");
-+			return -EINVAL;
-+		}
-+		dac_reset_done = 1;
-+	}
-+	if (!IS_ERR(reset_gpio))
-+		gpiod_set_value(reset_gpio, 0);
-+	msleep(1);
-+	if (!IS_ERR(reset_gpio))
-+		gpiod_set_value(reset_gpio, 1);
-+	msleep(1);
-+	if (!IS_ERR(reset_gpio))
-+		gpiod_set_value(reset_gpio, 0);
-+
-+	if (pdev->dev.of_node) {
-+		struct device_node *i2s_node;
-+		struct snd_soc_dai_link *dai;
-+
-+		dai = &snd_rpi_hifiberry_dacplushd_dai[0];
-+		i2s_node = of_parse_phandle(pdev->dev.of_node,
-+			"i2s-controller", 0);
-+
-+		if (i2s_node) {
-+			dai->cpus->of_node = i2s_node;
-+			dai->platforms->of_node = i2s_node;
-+			dai->cpus->dai_name = NULL;
-+			dai->platforms->name = NULL;
-+		} else {
-+			return -EPROBE_DEFER;
-+		}
-+
-+	}
-+
-+	ret = devm_snd_soc_register_card(&pdev->dev,
-+			&snd_rpi_hifiberry_dacplushd);
-+	if (ret && ret != -EPROBE_DEFER) {
-+		dev_err(&pdev->dev,
-+			"snd_soc_register_card() failed: %d\n", ret);
-+		return ret;
-+	}
-+	if (ret == -EPROBE_DEFER)
-+		return ret;
-+
-+	dev_set_drvdata(dev, &drvdata);
-+	if (dev_node == NULL) {
-+		dev_err(&pdev->dev, "Device tree node not found\n");
-+		return -ENODEV;
-+	}
-+
-+	drvdata.sclk = devm_clk_get(dev, NULL);
-+	if (IS_ERR(drvdata.sclk)) {
-+		drvdata.sclk = ERR_PTR(-ENOENT);
-+		return -ENODEV;
-+	}
-+
-+	clk_set_rate(drvdata.sclk, DEFAULT_RATE);
-+
-+	return ret;
-+}
-+
-+static int snd_rpi_hifiberry_dacplushd_remove(struct platform_device *pdev)
-+{
-+	if (IS_ERR(reset_gpio))
-+		return -EINVAL;
-+
-+	/* put DAC into RESET and release GPIO */
-+	gpiod_set_value(reset_gpio, 0);
-+	gpiod_put(reset_gpio);
-+
-+	return 0;
-+}
-+
-+static const struct of_device_id snd_rpi_hifiberry_dacplushd_of_match[] = {
-+	{ .compatible = "hifiberry,hifiberry-dacplushd", },
-+	{},
-+};
-+
-+MODULE_DEVICE_TABLE(of, snd_rpi_hifiberry_dacplushd_of_match);
-+
-+static struct platform_driver snd_rpi_hifiberry_dacplushd_driver = {
-+	.driver = {
-+		.name   = "snd-rpi-hifiberry-dacplushd",
-+		.owner  = THIS_MODULE,
-+		.of_match_table = snd_rpi_hifiberry_dacplushd_of_match,
-+	},
-+	.probe          = snd_rpi_hifiberry_dacplushd_probe,
-+	.remove		= snd_rpi_hifiberry_dacplushd_remove,
-+};
-+
-+module_platform_driver(snd_rpi_hifiberry_dacplushd_driver);
-+
-+MODULE_AUTHOR("Joerg Schambacher <joerg@i2audio.com>");
-+MODULE_DESCRIPTION("ASoC Driver for HiFiBerry DAC+ HD");
-+MODULE_LICENSE("GPL v2");
---- /dev/null
-+++ b/sound/soc/bcm/i-sabre-q2m.c
-@@ -0,0 +1,159 @@
-+/*
-+ * ASoC Driver for I-Sabre Q2M
-+ *
-+ * Author: Satoru Kawase
-+ * Modified by: Xiao Qingyong
-+ * Update kernel v4.18+ by : Audiophonics
-+ * 		Copyright 2018 Audiophonics
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/module.h>
-+#include <linux/delay.h>
-+#include <linux/fs.h>
-+#include <asm/uaccess.h>
-+#include <sound/core.h>
-+#include <sound/soc.h>
-+#include <sound/pcm.h>
-+#include <sound/pcm_params.h>
-+
-+#include "../codecs/i-sabre-codec.h"
-+
-+
-+static int snd_rpi_i_sabre_q2m_init(struct snd_soc_pcm_runtime *rtd)
-+{
-+	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
-+	unsigned int value;
-+
-+	/* Device ID */
-+	value = snd_soc_component_read(component, ISABRECODEC_REG_01);
-+	dev_info(component->card->dev, "Audiophonics Device ID : %02X\n", value);
-+
-+	/* API revision */
-+	value = snd_soc_component_read(component, ISABRECODEC_REG_02);
-+	dev_info(component->card->dev, "Audiophonics API revision : %02X\n", value);
-+
-+	return 0;
-+}
-+
-+static int snd_rpi_i_sabre_q2m_hw_params(
-+	struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params)
-+{
-+	struct snd_soc_pcm_runtime *rtd     = substream->private_data;
-+	struct snd_soc_dai         *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
-+	int bclk_ratio;
-+
-+	bclk_ratio = snd_pcm_format_physical_width(
-+			params_format(params)) * params_channels(params);
-+	return snd_soc_dai_set_bclk_ratio(cpu_dai, bclk_ratio);
-+}
-+
-+/* machine stream operations */
-+static struct snd_soc_ops snd_rpi_i_sabre_q2m_ops = {
-+	.hw_params = snd_rpi_i_sabre_q2m_hw_params,
-+};
-+
-+SND_SOC_DAILINK_DEFS(rpi_i_sabre_q2m,
-+	DAILINK_COMP_ARRAY(COMP_CPU("bcm2708-i2s.0")),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("i-sabre-codec-i2c.1-0048", "i-sabre-codec-dai")),
-+	DAILINK_COMP_ARRAY(COMP_PLATFORM("bcm2708-i2s.0")));
-+
-+static struct snd_soc_dai_link snd_rpi_i_sabre_q2m_dai[] = {
-+	{
-+		.name           = "I-Sabre Q2M",
-+		.stream_name    = "I-Sabre Q2M DAC",
-+		.dai_fmt        = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-+						| SND_SOC_DAIFMT_CBS_CFS,
-+		.init           = snd_rpi_i_sabre_q2m_init,
-+		.ops            = &snd_rpi_i_sabre_q2m_ops,
-+		SND_SOC_DAILINK_REG(rpi_i_sabre_q2m),
-+	}
-+};
-+
-+/* audio machine driver */
-+static struct snd_soc_card snd_rpi_i_sabre_q2m = {
-+	.name      = "I-Sabre Q2M DAC",
-+	.owner     = THIS_MODULE,
-+	.dai_link  = snd_rpi_i_sabre_q2m_dai,
-+	.num_links = ARRAY_SIZE(snd_rpi_i_sabre_q2m_dai)
-+};
-+
-+
-+static int snd_rpi_i_sabre_q2m_probe(struct platform_device *pdev)
-+{
-+	int ret = 0;
-+
-+	snd_rpi_i_sabre_q2m.dev = &pdev->dev;
-+	if (pdev->dev.of_node) {
-+		struct device_node *i2s_node;
-+		struct snd_soc_dai_link *dai;
-+
-+		dai = &snd_rpi_i_sabre_q2m_dai[0];
-+		i2s_node = of_parse_phandle(pdev->dev.of_node,
-+							"i2s-controller", 0);
-+		if (i2s_node) {
-+			dai->cpus->dai_name     = NULL;
-+			dai->cpus->of_node      = i2s_node;
-+			dai->platforms->name    = NULL;
-+			dai->platforms->of_node = i2s_node;
-+		} else {
-+			dev_err(&pdev->dev,
-+			    "Property 'i2s-controller' missing or invalid\n");
-+			return (-EINVAL);
-+		}
-+
-+		dai->name        = "I-Sabre Q2M";
-+		dai->stream_name = "I-Sabre Q2M DAC";
-+		dai->dai_fmt     = SND_SOC_DAIFMT_I2S
-+					| SND_SOC_DAIFMT_NB_NF
-+					| SND_SOC_DAIFMT_CBS_CFS;
-+	}
-+
-+	/* Wait for registering codec driver */
-+	mdelay(50);
-+
-+	ret = snd_soc_register_card(&snd_rpi_i_sabre_q2m);
-+	if (ret) {
-+		dev_err(&pdev->dev,
-+			"snd_soc_register_card() failed: %d\n", ret);
-+	}
-+
-+	return ret;
-+}
-+
-+static int snd_rpi_i_sabre_q2m_remove(struct platform_device *pdev)
-+{
-+	snd_soc_unregister_card(&snd_rpi_i_sabre_q2m);
-+	return 0;
-+}
-+
-+static const struct of_device_id snd_rpi_i_sabre_q2m_of_match[] = {
-+	{ .compatible = "audiophonics,i-sabre-q2m", },
-+	{}
-+};
-+MODULE_DEVICE_TABLE(of, snd_rpi_i_sabre_q2m_of_match);
-+
-+static struct platform_driver snd_rpi_i_sabre_q2m_driver = {
-+	.driver = {
-+		.name           = "snd-rpi-i-sabre-q2m",
-+		.owner          = THIS_MODULE,
-+		.of_match_table = snd_rpi_i_sabre_q2m_of_match,
-+	},
-+	.probe  = snd_rpi_i_sabre_q2m_probe,
-+	.remove = snd_rpi_i_sabre_q2m_remove,
-+};
-+module_platform_driver(snd_rpi_i_sabre_q2m_driver);
-+
-+MODULE_DESCRIPTION("ASoC Driver for I-Sabre Q2M");
-+MODULE_AUTHOR("Audiophonics <http://www.audiophonics.fr>");
-+MODULE_LICENSE("GPL");
---- /dev/null
-+++ b/sound/soc/bcm/iqaudio-codec.c
-@@ -0,0 +1,275 @@
-+/*
-+ * ASoC Driver for IQaudIO Raspberry Pi Codec board
-+ *
-+ * Author:	Gordon Garrity <gordon@iqaudio.com>
-+ *		(C) Copyright IQaudio Limited, 2017-2019
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/gpio/consumer.h>
-+#include <linux/platform_device.h>
-+
-+#include <sound/core.h>
-+#include <sound/pcm.h>
-+#include <sound/pcm_params.h>
-+#include <sound/soc.h>
-+#include <sound/jack.h>
-+
-+#include <linux/acpi.h>
-+#include <linux/slab.h>
-+#include "../codecs/da7213.h"
-+
-+static int pll_out = DA7213_PLL_FREQ_OUT_90316800;
-+
-+static int snd_rpi_iqaudio_pll_control(struct snd_soc_dapm_widget *w,
-+				       struct snd_kcontrol *k, int  event)
-+{
-+	int ret = 0;
-+	struct snd_soc_dapm_context *dapm = w->dapm;
-+	struct snd_soc_card *card = dapm->card;
-+	struct snd_soc_pcm_runtime *rtd =
-+		snd_soc_get_pcm_runtime(card, &card->dai_link[0]);
-+	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
-+
-+	if (SND_SOC_DAPM_EVENT_OFF(event)) {
-+		ret = snd_soc_dai_set_pll(codec_dai, 0, DA7213_SYSCLK_MCLK, 0,
-+					  0);
-+		if (ret)
-+			dev_err(card->dev, "Failed to bypass PLL: %d\n", ret);
-+		/* Allow PLL time to bypass */
-+		msleep(100);
-+	} else if (SND_SOC_DAPM_EVENT_ON(event)) {
-+		ret = snd_soc_dai_set_pll(codec_dai, 0, DA7213_SYSCLK_PLL, 0,
-+					  pll_out);
-+		if (ret)
-+			dev_err(card->dev, "Failed to enable PLL: %d\n", ret);
-+		/* Allow PLL time to lock */
-+		msleep(100);
-+	}
-+
-+	return ret;
-+}
-+
-+static int snd_rpi_iqaudio_post_dapm_event(struct snd_soc_dapm_widget *w,
-+                              struct snd_kcontrol *kcontrol,
-+                              int event)
-+{
-+     switch (event) {
-+     case SND_SOC_DAPM_POST_PMU:
-+           /* Delay for mic bias ramp */
-+           msleep(1000);
-+           break;
-+     default:
-+           break;
-+     }
-+
-+     return 0;
-+}
-+
-+static const struct snd_kcontrol_new dapm_controls[] = {
-+	SOC_DAPM_PIN_SWITCH("HP Jack"),
-+	SOC_DAPM_PIN_SWITCH("MIC Jack"),
-+	SOC_DAPM_PIN_SWITCH("Onboard MIC"),
-+	SOC_DAPM_PIN_SWITCH("AUX Jack"),
-+};
-+
-+static const struct snd_soc_dapm_widget dapm_widgets[] = {
-+	SND_SOC_DAPM_HP("HP Jack", NULL),
-+	SND_SOC_DAPM_MIC("MIC Jack", NULL),
-+	SND_SOC_DAPM_MIC("Onboard MIC", NULL),
-+	SND_SOC_DAPM_LINE("AUX Jack", NULL),
-+	SND_SOC_DAPM_SUPPLY("PLL Control", SND_SOC_NOPM, 0, 0,
-+			    snd_rpi_iqaudio_pll_control,
-+			    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
-+	SND_SOC_DAPM_POST("Post Power Up Event", snd_rpi_iqaudio_post_dapm_event),
-+};
-+
-+static const struct snd_soc_dapm_route audio_map[] = {
-+	{"HP Jack", NULL, "HPL"},
-+	{"HP Jack", NULL, "HPR"},
-+	{"HP Jack", NULL, "PLL Control"},
-+
-+	{"AUXR", NULL, "AUX Jack"},
-+	{"AUXL", NULL, "AUX Jack"},
-+	{"AUX Jack", NULL, "PLL Control"},
-+
-+	/* Assume Mic1 is linked to Headset and Mic2 to on-board mic */
-+	{"MIC1", NULL, "MIC Jack"},
-+	{"MIC Jack", NULL, "PLL Control"},
-+	{"MIC2", NULL, "Onboard MIC"},
-+	{"Onboard MIC", NULL, "PLL Control"},
-+};
-+
-+/* machine stream operations */
-+
-+static int snd_rpi_iqaudio_codec_init(struct snd_soc_pcm_runtime *rtd)
-+{
-+	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
-+	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
-+	int ret;
-+
-+	/*
-+	 * Disable AUX Jack Pin by default to prevent PLL being enabled at
-+	 * startup. This avoids holding the PLL to a fixed SR config for
-+	 * subsequent streams.
-+	 *
-+	 * This pin can still be enabled later, as required by user-space.
-+	 */
-+	snd_soc_dapm_disable_pin(&rtd->card->dapm, "AUX Jack");
-+	snd_soc_dapm_sync(&rtd->card->dapm);
-+
-+	/* Set bclk ratio to align with codec's BCLK rate */
-+	ret = snd_soc_dai_set_bclk_ratio(cpu_dai, 64);
-+	if (ret) {
-+		dev_err(rtd->dev, "Failed to set CPU BLCK ratio\n");
-+		return ret;
-+	}
-+
-+	/* Set MCLK frequency to codec, onboard 11.2896MHz clock */
-+	return snd_soc_dai_set_sysclk(codec_dai, DA7213_CLKSRC_MCLK, 11289600,
-+				      SND_SOC_CLOCK_OUT);
-+}
-+
-+static int snd_rpi_iqaudio_codec_hw_params(struct snd_pcm_substream *substream,
-+					   struct snd_pcm_hw_params *params)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	unsigned int samplerate = params_rate(params);
-+
-+	switch (samplerate) {
-+	case  8000:
-+	case 16000:
-+	case 32000:
-+	case 48000:
-+	case 96000:
-+		pll_out = DA7213_PLL_FREQ_OUT_98304000;
-+		return 0;
-+	case 44100:
-+	case 88200:
-+		pll_out = DA7213_PLL_FREQ_OUT_90316800;
-+		return 0;
-+	default:
-+		dev_err(rtd->dev,"Unsupported samplerate %d\n", samplerate);
-+		return -EINVAL;
-+	}
-+}
-+
-+static const struct snd_soc_ops snd_rpi_iqaudio_codec_ops = {
-+	.hw_params = snd_rpi_iqaudio_codec_hw_params,
-+};
-+
-+SND_SOC_DAILINK_DEFS(rpi_iqaudio,
-+	DAILINK_COMP_ARRAY(COMP_CPU("bcm2708-i2s.0")),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("da7213.1-001a", "da7213-hifi")),
-+	DAILINK_COMP_ARRAY(COMP_PLATFORM("bcm2835-i2s.0")));
-+
-+static struct snd_soc_dai_link snd_rpi_iqaudio_codec_dai[] = {
-+{
-+	.dai_fmt 		= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-+				  SND_SOC_DAIFMT_CBM_CFM,
-+	.init			= snd_rpi_iqaudio_codec_init,
-+	.ops			= &snd_rpi_iqaudio_codec_ops,
-+	.symmetric_rate	= 1,
-+	.symmetric_channels	= 1,
-+	.symmetric_sample_bits	= 1,
-+	SND_SOC_DAILINK_REG(rpi_iqaudio),
-+},
-+};
-+
-+/* audio machine driver */
-+static struct snd_soc_card snd_rpi_iqaudio_codec = {
-+	.owner			= THIS_MODULE,
-+	.dai_link		= snd_rpi_iqaudio_codec_dai,
-+	.num_links		= ARRAY_SIZE(snd_rpi_iqaudio_codec_dai),
-+	.controls		= dapm_controls,
-+	.num_controls		= ARRAY_SIZE(dapm_controls),
-+	.dapm_widgets		= dapm_widgets,
-+	.num_dapm_widgets	= ARRAY_SIZE(dapm_widgets),
-+	.dapm_routes		= audio_map,
-+	.num_dapm_routes	= ARRAY_SIZE(audio_map),
-+};
-+
-+static int snd_rpi_iqaudio_codec_probe(struct platform_device *pdev)
-+{
-+	int ret = 0;
-+
-+	snd_rpi_iqaudio_codec.dev = &pdev->dev;
-+
-+	if (pdev->dev.of_node) {
-+		struct device_node *i2s_node;
-+		struct snd_soc_card *card = &snd_rpi_iqaudio_codec;
-+		struct snd_soc_dai_link *dai = &snd_rpi_iqaudio_codec_dai[0];
-+
-+		i2s_node = of_parse_phandle(pdev->dev.of_node,
-+					    "i2s-controller", 0);
-+		if (i2s_node) {
-+			dai->cpus->dai_name = NULL;
-+			dai->cpus->of_node = i2s_node;
-+			dai->platforms->name = NULL;
-+			dai->platforms->of_node = i2s_node;
-+		}
-+
-+		if (of_property_read_string(pdev->dev.of_node, "card_name",
-+					    &card->name))
-+			card->name = "IQaudIOCODEC";
-+
-+		if (of_property_read_string(pdev->dev.of_node, "dai_name",
-+					    &dai->name))
-+			dai->name = "IQaudIO CODEC";
-+
-+		if (of_property_read_string(pdev->dev.of_node,
-+					"dai_stream_name", &dai->stream_name))
-+			dai->stream_name = "IQaudIO CODEC HiFi v1.2";
-+
-+	}
-+
-+	ret = snd_soc_register_card(&snd_rpi_iqaudio_codec);
-+	if (ret) {
-+		if (ret != -EPROBE_DEFER)
-+			dev_err(&pdev->dev,
-+				"snd_soc_register_card() failed: %d\n", ret);
-+		return ret;
-+	}
-+
-+	return 0;
-+}
-+
-+static int snd_rpi_iqaudio_codec_remove(struct platform_device *pdev)
-+{
-+	snd_soc_unregister_card(&snd_rpi_iqaudio_codec);
-+	return 0;
-+}
-+
-+static const struct of_device_id iqaudio_of_match[] = {
-+	{ .compatible = "iqaudio,iqaudio-codec", },
-+	{},
-+};
-+
-+MODULE_DEVICE_TABLE(of, iqaudio_of_match);
-+
-+static struct platform_driver snd_rpi_iqaudio_codec_driver = {
-+	.driver = {
-+		.name   = "snd-rpi-iqaudio-codec",
-+		.owner  = THIS_MODULE,
-+		.of_match_table = iqaudio_of_match,
-+	},
-+	.probe          = snd_rpi_iqaudio_codec_probe,
-+	.remove         = snd_rpi_iqaudio_codec_remove,
-+};
-+
-+
-+
-+module_platform_driver(snd_rpi_iqaudio_codec_driver);
-+
-+MODULE_AUTHOR("Gordon Garrity <gordon@iqaudio.com>");
-+MODULE_DESCRIPTION("ASoC Driver for IQaudIO CODEC");
-+MODULE_LICENSE("GPL v2");
---- /dev/null
-+++ b/sound/soc/bcm/iqaudio-dac.c
-@@ -0,0 +1,224 @@
-+/*
-+ * ASoC Driver for IQaudIO DAC
-+ *
-+ * Author:	Florian Meier <florian.meier@koalo.de>
-+ *		Copyright 2013
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/gpio/consumer.h>
-+#include <linux/platform_device.h>
-+
-+#include <sound/core.h>
-+#include <sound/pcm.h>
-+#include <sound/pcm_params.h>
-+#include <sound/soc.h>
-+#include <sound/jack.h>
-+
-+static bool digital_gain_0db_limit = true;
-+
-+static struct gpio_desc *mute_gpio;
-+
-+static int snd_rpi_iqaudio_dac_init(struct snd_soc_pcm_runtime *rtd)
-+{
-+	if (digital_gain_0db_limit)
-+	{
-+		int ret;
-+		struct snd_soc_card *card = rtd->card;
-+
-+		ret = snd_soc_limit_volume(card, "Digital Playback Volume", 207);
-+		if (ret < 0)
-+			dev_warn(card->dev, "Failed to set volume limit: %d\n", ret);
-+	}
-+
-+	return 0;
-+}
-+
-+static void snd_rpi_iqaudio_gpio_mute(struct snd_soc_card *card)
-+{
-+	if (mute_gpio) {
-+		dev_info(card->dev, "%s: muting amp using GPIO22\n",
-+			 __func__);
-+		gpiod_set_value_cansleep(mute_gpio, 0);
-+	}
-+}
-+
-+static void snd_rpi_iqaudio_gpio_unmute(struct snd_soc_card *card)
-+{
-+	if (mute_gpio) {
-+		dev_info(card->dev, "%s: un-muting amp using GPIO22\n",
-+			 __func__);
-+		gpiod_set_value_cansleep(mute_gpio, 1);
-+	}
-+}
-+
-+static int snd_rpi_iqaudio_set_bias_level(struct snd_soc_card *card,
-+	struct snd_soc_dapm_context *dapm, enum snd_soc_bias_level level)
-+{
-+	struct snd_soc_pcm_runtime *rtd;
-+	struct snd_soc_dai *codec_dai;
-+
-+	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]);
-+	codec_dai = asoc_rtd_to_codec(rtd, 0);
-+
-+	if (dapm->dev != codec_dai->dev)
-+		return 0;
-+
-+	switch (level) {
-+	case SND_SOC_BIAS_PREPARE:
-+		if (dapm->bias_level != SND_SOC_BIAS_STANDBY)
-+			break;
-+
-+		/* UNMUTE AMP */
-+		snd_rpi_iqaudio_gpio_unmute(card);
-+
-+		break;
-+	case SND_SOC_BIAS_STANDBY:
-+		if (dapm->bias_level != SND_SOC_BIAS_PREPARE)
-+			break;
-+
-+		/* MUTE AMP */
-+		snd_rpi_iqaudio_gpio_mute(card);
-+
-+		break;
-+	default:
-+		break;
-+	}
-+
-+	return 0;
-+}
-+
-+SND_SOC_DAILINK_DEFS(hifi,
-+        DAILINK_COMP_ARRAY(COMP_CPU("bcm2708-i2s.0")),
-+        DAILINK_COMP_ARRAY(COMP_CODEC("pcm512x.1-004c", "pcm512x-hifi")),
-+        DAILINK_COMP_ARRAY(COMP_PLATFORM("bcm2708-i2s.0")));
-+
-+static struct snd_soc_dai_link snd_rpi_iqaudio_dac_dai[] = {
-+{
-+	.dai_fmt	= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-+				SND_SOC_DAIFMT_CBS_CFS,
-+	.init		= snd_rpi_iqaudio_dac_init,
-+	SND_SOC_DAILINK_REG(hifi),
-+},
-+};
-+
-+/* audio machine driver */
-+static struct snd_soc_card snd_rpi_iqaudio_dac = {
-+	.owner        = THIS_MODULE,
-+	.dai_link     = snd_rpi_iqaudio_dac_dai,
-+	.num_links    = ARRAY_SIZE(snd_rpi_iqaudio_dac_dai),
-+};
-+
-+static int snd_rpi_iqaudio_dac_probe(struct platform_device *pdev)
-+{
-+	int ret = 0;
-+	bool gpio_unmute = false;
-+
-+	snd_rpi_iqaudio_dac.dev = &pdev->dev;
-+
-+	if (pdev->dev.of_node) {
-+		struct device_node *i2s_node;
-+		struct snd_soc_card *card = &snd_rpi_iqaudio_dac;
-+		struct snd_soc_dai_link *dai = &snd_rpi_iqaudio_dac_dai[0];
-+		bool auto_gpio_mute = false;
-+
-+		i2s_node = of_parse_phandle(pdev->dev.of_node,
-+					    "i2s-controller", 0);
-+		if (i2s_node) {
-+			dai->cpus->dai_name = NULL;
-+			dai->cpus->of_node = i2s_node;
-+			dai->platforms->name = NULL;
-+			dai->platforms->of_node = i2s_node;
-+		}
-+
-+		digital_gain_0db_limit = !of_property_read_bool(
-+			pdev->dev.of_node, "iqaudio,24db_digital_gain");
-+
-+		if (of_property_read_string(pdev->dev.of_node, "card_name",
-+					    &card->name))
-+			card->name = "IQaudIODAC";
-+
-+		if (of_property_read_string(pdev->dev.of_node, "dai_name",
-+					    &dai->name))
-+			dai->name = "IQaudIO DAC";
-+
-+		if (of_property_read_string(pdev->dev.of_node,
-+					"dai_stream_name", &dai->stream_name))
-+			dai->stream_name = "IQaudIO DAC HiFi";
-+
-+		/* gpio_unmute - one time unmute amp using GPIO */
-+		gpio_unmute = of_property_read_bool(pdev->dev.of_node,
-+						    "iqaudio-dac,unmute-amp");
-+
-+		/* auto_gpio_mute - mute/unmute amp using GPIO */
-+		auto_gpio_mute = of_property_read_bool(pdev->dev.of_node,
-+						"iqaudio-dac,auto-mute-amp");
-+
-+		if (auto_gpio_mute || gpio_unmute) {
-+			mute_gpio = devm_gpiod_get_optional(&pdev->dev, "mute",
-+							    GPIOD_OUT_LOW);
-+			if (IS_ERR(mute_gpio)) {
-+				ret = PTR_ERR(mute_gpio);
-+				dev_err(&pdev->dev,
-+					"Failed to get mute gpio: %d\n", ret);
-+				return ret;
-+			}
-+
-+			if (auto_gpio_mute && mute_gpio)
-+				snd_rpi_iqaudio_dac.set_bias_level =
-+						snd_rpi_iqaudio_set_bias_level;
-+		}
-+	}
-+
-+	ret = snd_soc_register_card(&snd_rpi_iqaudio_dac);
-+	if (ret) {
-+		if (ret != -EPROBE_DEFER)
-+			dev_err(&pdev->dev,
-+				"snd_soc_register_card() failed: %d\n", ret);
-+		return ret;
-+	}
-+
-+	if (gpio_unmute && mute_gpio)
-+		snd_rpi_iqaudio_gpio_unmute(&snd_rpi_iqaudio_dac);
-+
-+	return 0;
-+}
-+
-+static int snd_rpi_iqaudio_dac_remove(struct platform_device *pdev)
-+{
-+	snd_rpi_iqaudio_gpio_mute(&snd_rpi_iqaudio_dac);
-+
-+	snd_soc_unregister_card(&snd_rpi_iqaudio_dac);
-+	return 0;
-+}
-+
-+static const struct of_device_id iqaudio_of_match[] = {
-+	{ .compatible = "iqaudio,iqaudio-dac", },
-+	{},
-+};
-+MODULE_DEVICE_TABLE(of, iqaudio_of_match);
-+
-+static struct platform_driver snd_rpi_iqaudio_dac_driver = {
-+	.driver = {
-+		.name   = "snd-rpi-iqaudio-dac",
-+		.owner  = THIS_MODULE,
-+		.of_match_table = iqaudio_of_match,
-+	},
-+	.probe          = snd_rpi_iqaudio_dac_probe,
-+	.remove         = snd_rpi_iqaudio_dac_remove,
-+};
-+
-+module_platform_driver(snd_rpi_iqaudio_dac_driver);
-+
-+MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
-+MODULE_DESCRIPTION("ASoC Driver for IQAudio DAC");
-+MODULE_LICENSE("GPL v2");
---- /dev/null
-+++ b/sound/soc/bcm/justboom-both.c
-@@ -0,0 +1,267 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * rpi--wm8804.c -- ALSA SoC Raspberry Pi soundcard.
-+ *
-+ * Authors: Johannes Krude <johannes@krude.de
-+ *
-+ * Driver for when connecting simultaneously justboom-digi and justboom-dac
-+ *
-+ * Based upon code from:
-+ * justboom-digi.c
-+ * by Milan Neskovic <info@justboom.co>
-+ * justboom-dac.c
-+ * by Milan Neskovic <info@justboom.co>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+
-+#include <sound/core.h>
-+#include <sound/pcm.h>
-+#include <sound/pcm_params.h>
-+#include <sound/soc.h>
-+#include <sound/jack.h>
-+
-+#include "../codecs/wm8804.h"
-+#include "../codecs/pcm512x.h"
-+
-+
-+static bool digital_gain_0db_limit = true;
-+
-+static int snd_rpi_justboom_both_init(struct snd_soc_pcm_runtime *rtd)
-+{
-+	struct snd_soc_component *digi = asoc_rtd_to_codec(rtd, 0)->component;
-+	struct snd_soc_component *dac = asoc_rtd_to_codec(rtd, 1)->component;
-+
-+	/* enable  TX output */
-+	snd_soc_component_update_bits(digi, WM8804_PWRDN, 0x4, 0x0);
-+
-+	snd_soc_component_update_bits(dac, PCM512x_GPIO_EN, 0x08, 0x08);
-+	snd_soc_component_update_bits(dac, PCM512x_GPIO_OUTPUT_4, 0xf, 0x02);
-+	snd_soc_component_update_bits(dac, PCM512x_GPIO_CONTROL_1, 0x08, 0x08);
-+
-+	if (digital_gain_0db_limit) {
-+		int ret;
-+		struct snd_soc_card *card = rtd->card;
-+
-+		ret = snd_soc_limit_volume(card, "Digital Playback Volume",
-+									207);
-+		if (ret < 0)
-+			dev_warn(card->dev, "Failed to set volume limit: %d\n",
-+									ret);
-+	}
-+
-+	return 0;
-+}
-+
-+static int snd_rpi_justboom_both_hw_params(struct snd_pcm_substream *substream,
-+				       struct snd_pcm_hw_params *params)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
-+	struct snd_soc_component *digi = asoc_rtd_to_codec(rtd, 0)->component;
-+	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
-+
-+	int sysclk = 27000000; /* This is fixed on this board */
-+
-+	long mclk_freq    = 0;
-+	int mclk_div      = 1;
-+	int sampling_freq = 1;
-+
-+	int ret;
-+
-+	int samplerate = params_rate(params);
-+
-+	if (samplerate <= 96000) {
-+		mclk_freq = samplerate*256;
-+		mclk_div  = WM8804_MCLKDIV_256FS;
-+	} else {
-+		mclk_freq = samplerate*128;
-+		mclk_div  = WM8804_MCLKDIV_128FS;
-+	}
-+
-+	switch (samplerate) {
-+	case 32000:
-+		sampling_freq = 0x03;
-+		break;
-+	case 44100:
-+		sampling_freq = 0x00;
-+		break;
-+	case 48000:
-+		sampling_freq = 0x02;
-+		break;
-+	case 88200:
-+		sampling_freq = 0x08;
-+		break;
-+	case 96000:
-+		sampling_freq = 0x0a;
-+		break;
-+	case 176400:
-+		sampling_freq = 0x0c;
-+		break;
-+	case 192000:
-+		sampling_freq = 0x0e;
-+		break;
-+	default:
-+		dev_err(rtd->card->dev,
-+		"Failed to set WM8804 SYSCLK, unsupported samplerate %d\n",
-+		samplerate);
-+	}
-+
-+	snd_soc_dai_set_clkdiv(codec_dai, WM8804_MCLK_DIV, mclk_div);
-+	snd_soc_dai_set_pll(codec_dai, 0, 0, sysclk, mclk_freq);
-+
-+	ret = snd_soc_dai_set_sysclk(codec_dai, WM8804_TX_CLKSRC_PLL,
-+					sysclk, SND_SOC_CLOCK_OUT);
-+	if (ret < 0) {
-+		dev_err(rtd->card->dev,
-+		"Failed to set WM8804 SYSCLK: %d\n", ret);
-+		return ret;
-+	}
-+
-+	/* Enable TX output */
-+	snd_soc_component_update_bits(digi, WM8804_PWRDN, 0x4, 0x0);
-+
-+	/* Power on */
-+	snd_soc_component_update_bits(digi, WM8804_PWRDN, 0x9, 0);
-+
-+	/* set sampling frequency status bits */
-+	snd_soc_component_update_bits(digi, WM8804_SPDTX4, 0x0f, sampling_freq);
-+
-+	return snd_soc_dai_set_bclk_ratio(cpu_dai, 64);
-+}
-+
-+static int snd_rpi_justboom_both_startup(struct snd_pcm_substream *substream)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_component *digi = asoc_rtd_to_codec(rtd, 0)->component;
-+	struct snd_soc_component *dac = asoc_rtd_to_codec(rtd, 1)->component;
-+
-+	/* turn on digital output */
-+	snd_soc_component_update_bits(digi, WM8804_PWRDN, 0x3c, 0x00);
-+
-+	snd_soc_component_update_bits(dac, PCM512x_GPIO_CONTROL_1, 0x08, 0x08);
-+
-+	return 0;
-+}
-+
-+static void snd_rpi_justboom_both_shutdown(struct snd_pcm_substream *substream)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_component *digi = asoc_rtd_to_codec(rtd, 0)->component;
-+	struct snd_soc_component *dac = asoc_rtd_to_codec(rtd, 1)->component;
-+
-+	snd_soc_component_update_bits(dac, PCM512x_GPIO_CONTROL_1, 0x08, 0x00);
-+
-+	/* turn off output */
-+	snd_soc_component_update_bits(digi, WM8804_PWRDN, 0x3c, 0x3c);
-+}
-+
-+/* machine stream operations */
-+static struct snd_soc_ops snd_rpi_justboom_both_ops = {
-+	.hw_params = snd_rpi_justboom_both_hw_params,
-+	.startup   = snd_rpi_justboom_both_startup,
-+	.shutdown  = snd_rpi_justboom_both_shutdown,
-+};
-+
-+SND_SOC_DAILINK_DEFS(rpi_justboom_both,
-+	DAILINK_COMP_ARRAY(COMP_CPU("bcm2708-i2s.0")),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("pcm512x.1-004d", "pcm512x-hifi"),
-+			   COMP_CODEC("wm8804.1-003b", "wm8804-spdif")),
-+	DAILINK_COMP_ARRAY(COMP_PLATFORM("bcm2708-i2s.0")));
-+
-+static struct snd_soc_dai_link snd_rpi_justboom_both_dai[] = {
-+{
-+	.name           = "JustBoom Digi",
-+	.stream_name    = "JustBoom Digi HiFi",
-+	.dai_fmt        = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-+					SND_SOC_DAIFMT_CBM_CFM,
-+	.ops            = &snd_rpi_justboom_both_ops,
-+	.init           = snd_rpi_justboom_both_init,
-+	SND_SOC_DAILINK_REG(rpi_justboom_both),
-+},
-+};
-+
-+/* audio machine driver */
-+static struct snd_soc_card snd_rpi_justboom_both = {
-+	.name             = "snd_rpi_justboom_both",
-+	.driver_name      = "JustBoomBoth",
-+	.owner            = THIS_MODULE,
-+	.dai_link         = snd_rpi_justboom_both_dai,
-+	.num_links        = ARRAY_SIZE(snd_rpi_justboom_both_dai),
-+};
-+
-+static int snd_rpi_justboom_both_probe(struct platform_device *pdev)
-+{
-+	int ret = 0;
-+	struct snd_soc_card *card = &snd_rpi_justboom_both;
-+
-+	snd_rpi_justboom_both.dev = &pdev->dev;
-+
-+	if (pdev->dev.of_node) {
-+		struct device_node *i2s_node;
-+		struct snd_soc_dai_link *dai = &snd_rpi_justboom_both_dai[0];
-+
-+		i2s_node = of_parse_phandle(pdev->dev.of_node,
-+					    "i2s-controller", 0);
-+
-+		if (i2s_node) {
-+			int i;
-+
-+			for (i = 0; i < card->num_links; i++) {
-+				dai->cpus->dai_name = NULL;
-+				dai->cpus->of_node = i2s_node;
-+				dai->platforms->name = NULL;
-+				dai->platforms->of_node = i2s_node;
-+			}
-+		}
-+
-+		digital_gain_0db_limit = !of_property_read_bool(
-+			pdev->dev.of_node, "justboom,24db_digital_gain");
-+	}
-+
-+	ret = snd_soc_register_card(card);
-+	if (ret && ret != -EPROBE_DEFER) {
-+		dev_err(&pdev->dev,
-+			"snd_soc_register_card() failed: %d\n", ret);
-+	}
-+
-+	return ret;
-+}
-+
-+static int snd_rpi_justboom_both_remove(struct platform_device *pdev)
-+{
-+	snd_soc_unregister_card(&snd_rpi_justboom_both);
-+	return 0;
-+}
-+
-+static const struct of_device_id snd_rpi_justboom_both_of_match[] = {
-+	{ .compatible = "justboom,justboom-both", },
-+	{},
-+};
-+MODULE_DEVICE_TABLE(of, snd_rpi_justboom_both_of_match);
-+
-+static struct platform_driver snd_rpi_justboom_both_driver = {
-+	.driver = {
-+		.name   = "snd-rpi-justboom-both",
-+		.owner  = THIS_MODULE,
-+		.of_match_table = snd_rpi_justboom_both_of_match,
-+	},
-+	.probe          = snd_rpi_justboom_both_probe,
-+	.remove         = snd_rpi_justboom_both_remove,
-+};
-+
-+module_platform_driver(snd_rpi_justboom_both_driver);
-+
-+MODULE_AUTHOR("Johannes Krude <johannes@krude.de>");
-+MODULE_DESCRIPTION("ASoC Driver for simultaneous use of JustBoom PI Digi & DAC HAT Sound Cards");
-+MODULE_LICENSE("GPL v2");
---- /dev/null
-+++ b/sound/soc/bcm/justboom-dac.c
-@@ -0,0 +1,147 @@
-+/*
-+ * ASoC Driver for JustBoom DAC Raspberry Pi HAT Sound Card
-+ *
-+ * Author:	Milan Neskovic
-+ *		Copyright 2016
-+ *		based on code by Daniel Matuschek <info@crazy-audio.com>
-+ *		based on code by Florian Meier <florian.meier@koalo.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+
-+#include <sound/core.h>
-+#include <sound/pcm.h>
-+#include <sound/pcm_params.h>
-+#include <sound/soc.h>
-+#include <sound/jack.h>
-+
-+#include "../codecs/pcm512x.h"
-+
-+static bool digital_gain_0db_limit = true;
-+
-+static int snd_rpi_justboom_dac_init(struct snd_soc_pcm_runtime *rtd)
-+{
-+	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
-+	snd_soc_component_update_bits(component, PCM512x_GPIO_EN, 0x08, 0x08);
-+	snd_soc_component_update_bits(component, PCM512x_GPIO_OUTPUT_4, 0xf, 0x02);
-+	snd_soc_component_update_bits(component, PCM512x_GPIO_CONTROL_1, 0x08,0x08);
-+
-+	if (digital_gain_0db_limit)
-+	{
-+		int ret;
-+		struct snd_soc_card *card = rtd->card;
-+
-+		ret = snd_soc_limit_volume(card, "Digital Playback Volume", 207);
-+		if (ret < 0)
-+			dev_warn(card->dev, "Failed to set volume limit: %d\n", ret);
-+	}
-+
-+	return 0;
-+}
-+
-+static int snd_rpi_justboom_dac_startup(struct snd_pcm_substream *substream) {
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
-+	snd_soc_component_update_bits(component, PCM512x_GPIO_CONTROL_1, 0x08,0x08);
-+	return 0;
-+}
-+
-+static void snd_rpi_justboom_dac_shutdown(struct snd_pcm_substream *substream) {
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
-+	snd_soc_component_update_bits(component, PCM512x_GPIO_CONTROL_1, 0x08,0x00);
-+}
-+
-+/* machine stream operations */
-+static struct snd_soc_ops snd_rpi_justboom_dac_ops = {
-+	.startup = snd_rpi_justboom_dac_startup,
-+	.shutdown = snd_rpi_justboom_dac_shutdown,
-+};
-+
-+SND_SOC_DAILINK_DEFS(hifi,
-+	DAILINK_COMP_ARRAY(COMP_CPU("bcm2708-i2s.0")),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("pcm512x.1-004d", "pcm512x-hifi")),
-+	DAILINK_COMP_ARRAY(COMP_PLATFORM("bcm2708-i2s.0")));
-+
-+static struct snd_soc_dai_link snd_rpi_justboom_dac_dai[] = {
-+{
-+	.name		= "JustBoom DAC",
-+	.stream_name	= "JustBoom DAC HiFi",
-+	.dai_fmt	= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-+				SND_SOC_DAIFMT_CBS_CFS,
-+	.ops		= &snd_rpi_justboom_dac_ops,
-+	.init		= snd_rpi_justboom_dac_init,
-+	SND_SOC_DAILINK_REG(hifi),
-+},
-+};
-+
-+/* audio machine driver */
-+static struct snd_soc_card snd_rpi_justboom_dac = {
-+	.name         = "snd_rpi_justboom_dac",
-+	.driver_name  = "JustBoomDac",
-+	.owner        = THIS_MODULE,
-+	.dai_link     = snd_rpi_justboom_dac_dai,
-+	.num_links    = ARRAY_SIZE(snd_rpi_justboom_dac_dai),
-+};
-+
-+static int snd_rpi_justboom_dac_probe(struct platform_device *pdev)
-+{
-+	int ret = 0;
-+
-+	snd_rpi_justboom_dac.dev = &pdev->dev;
-+
-+	if (pdev->dev.of_node) {
-+	    struct device_node *i2s_node;
-+	    struct snd_soc_dai_link *dai = &snd_rpi_justboom_dac_dai[0];
-+	    i2s_node = of_parse_phandle(pdev->dev.of_node,
-+					"i2s-controller", 0);
-+
-+	    if (i2s_node) {
-+			dai->cpus->dai_name = NULL;
-+			dai->cpus->of_node = i2s_node;
-+			dai->platforms->name = NULL;
-+			dai->platforms->of_node = i2s_node;
-+	    }
-+
-+	    digital_gain_0db_limit = !of_property_read_bool(
-+			pdev->dev.of_node, "justboom,24db_digital_gain");
-+	}
-+
-+	ret = devm_snd_soc_register_card(&pdev->dev, &snd_rpi_justboom_dac);
-+	if (ret && ret != -EPROBE_DEFER)
-+		dev_err(&pdev->dev,
-+			"snd_soc_register_card() failed: %d\n", ret);
-+
-+	return ret;
-+}
-+
-+static const struct of_device_id snd_rpi_justboom_dac_of_match[] = {
-+	{ .compatible = "justboom,justboom-dac", },
-+	{},
-+};
-+MODULE_DEVICE_TABLE(of, snd_rpi_justboom_dac_of_match);
-+
-+static struct platform_driver snd_rpi_justboom_dac_driver = {
-+	.driver = {
-+		.name   = "snd-rpi-justboom-dac",
-+		.owner  = THIS_MODULE,
-+		.of_match_table = snd_rpi_justboom_dac_of_match,
-+	},
-+	.probe          = snd_rpi_justboom_dac_probe,
-+};
-+
-+module_platform_driver(snd_rpi_justboom_dac_driver);
-+
-+MODULE_AUTHOR("Milan Neskovic <info@justboom.co>");
-+MODULE_DESCRIPTION("ASoC Driver for JustBoom PI DAC HAT Sound Card");
-+MODULE_LICENSE("GPL v2");
---- /dev/null
-+++ b/sound/soc/bcm/pifi-40.c
-@@ -0,0 +1,284 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+/*
-+ * ALSA ASoC Machine Driver for PiFi-40
-+ *
-+ * Author:	David Knell <david.knell@gmail.com)
-+ *		based on code by Daniel Matuschek <info@crazy-audio.com>
-+ *		based on code by Florian Meier <florian.meier@koalo.de>
-+ * Copyright (C) 2020
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/gpio/consumer.h>
-+#include <sound/core.h>
-+#include <sound/pcm.h>
-+#include <sound/pcm_params.h>
-+#include <sound/soc.h>
-+#include <linux/firmware.h>
-+#include <linux/delay.h>
-+#include <sound/tlv.h>
-+
-+static struct gpio_desc *pdn_gpio;
-+static int vol = 0x30;
-+
-+// Volume control
-+static int pifi_40_vol_get(struct snd_kcontrol *kcontrol,
-+			   struct snd_ctl_elem_value *ucontrol)
-+{
-+	ucontrol->value.integer.value[0] = vol;
-+	ucontrol->value.integer.value[1] = vol;
-+	return 0;
-+}
-+
-+static int pifi_40_vol_set(struct snd_kcontrol *kcontrol,
-+			   struct snd_ctl_elem_value *ucontrol)
-+{
-+	struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
-+	struct snd_soc_pcm_runtime *rtd;
-+	unsigned int v = ucontrol->value.integer.value[0];
-+	struct snd_soc_component *dac[2];
-+
-+	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]);
-+	dac[0] = asoc_rtd_to_codec(rtd, 0)->component;
-+	dac[1] = asoc_rtd_to_codec(rtd, 1)->component;
-+
-+	snd_soc_component_write(dac[0], 0x07, 255 - v);
-+	snd_soc_component_write(dac[1], 0x07, 255 - v);
-+
-+	vol = v;
-+	return 1;
-+}
-+
-+static const DECLARE_TLV_DB_SCALE(digital_tlv_master, -10350, 50, 1);
-+static const struct snd_kcontrol_new pifi_40_controls[] = {
-+	SOC_DOUBLE_R_EXT_TLV("Master Volume", 0x00, 0x01,
-+			     0x00, // Min
-+			     0xff, // Max
-+			     0x01, // Invert
-+			     pifi_40_vol_get, pifi_40_vol_set,
-+			     digital_tlv_master)
-+};
-+
-+static const char * const codec_ctl_pfx[] = { "Left", "Right" };
-+
-+static const char * const codec_ctl_name[] = { "Master Volume",
-+					"Speaker Volume",
-+					"Speaker Switch" };
-+
-+static int snd_pifi_40_init(struct snd_soc_pcm_runtime *rtd)
-+{
-+	struct snd_soc_card *card = rtd->card;
-+	struct snd_soc_component *dac[2];
-+	struct snd_kcontrol *kctl;
-+	int i, j;
-+
-+	dac[0] = asoc_rtd_to_codec(rtd, 0)->component;
-+	dac[1] = asoc_rtd_to_codec(rtd, 1)->component;
-+
-+
-+	// Set up cards - pulse power down first
-+	gpiod_set_value_cansleep(pdn_gpio, 1);
-+	usleep_range(1000, 10000);
-+	gpiod_set_value_cansleep(pdn_gpio, 0);
-+	usleep_range(20000, 30000);
-+
-+	// Oscillator trim
-+	snd_soc_component_write(dac[0], 0x1b, 0);
-+	snd_soc_component_write(dac[1], 0x1b, 0);
-+	usleep_range(60000, 80000);
-+
-+	// Common setup
-+	for (i = 0; i < 2; i++) {
-+		// MCLK at 64fs, sample rate 44.1 or 48kHz
-+		snd_soc_component_write(dac[i], 0x00, 0x60);
-+
-+		// Set up for PBTL
-+		snd_soc_component_write(dac[i], 0x19, 0x3A);
-+		snd_soc_component_write(dac[i], 0x25, 0x01103245);
-+
-+		// Master vol to -10db
-+		snd_soc_component_write(dac[i], 0x07, 0x44);
-+	}
-+	// Inputs set to L and R respectively
-+	snd_soc_component_write(dac[0], 0x20, 0x00017772);
-+	snd_soc_component_write(dac[1], 0x20, 0x00107772);
-+
-+	// Remove codec controls
-+	for (i = 0; i < 2; i++) {
-+		for (j = 0; j < 3; j++) {
-+			char cname[256];
-+
-+			sprintf(cname, "%s %s", codec_ctl_pfx[i],
-+				codec_ctl_name[j]);
-+			kctl = snd_soc_card_get_kcontrol(card, cname);
-+			if (!kctl) {
-+				pr_info("Control %s not found\n",
-+				       cname);
-+			} else {
-+				kctl->vd[0].access =
-+					SNDRV_CTL_ELEM_ACCESS_READWRITE;
-+				snd_ctl_remove(card->snd_card, kctl);
-+			}
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+static int snd_pifi_40_hw_params(struct snd_pcm_substream *substream,
-+				 struct snd_pcm_hw_params *params)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
-+	unsigned int sample_bits;
-+
-+	sample_bits = snd_pcm_format_physical_width(params_format(params));
-+	return snd_soc_dai_set_bclk_ratio(cpu_dai, 64);
-+}
-+
-+static struct snd_soc_ops snd_pifi_40_ops = { .hw_params =
-+						      snd_pifi_40_hw_params };
-+
-+static struct snd_soc_dai_link_component pifi_40_codecs[] = {
-+	{
-+		.dai_name = "tas571x-hifi",
-+	},
-+	{
-+		.dai_name = "tas571x-hifi",
-+	},
-+};
-+
-+SND_SOC_DAILINK_DEFS(
-+	pifi_40_dai, DAILINK_COMP_ARRAY(COMP_EMPTY()),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("tas571x.1-001a", "tas571x-hifi"),
-+			   COMP_CODEC("tas571x.1-001b", "tas571x-hifi")),
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()));
-+
-+static struct snd_soc_dai_link snd_pifi_40_dai[] = {
-+	{
-+		.name = "PiFi40",
-+		.stream_name = "PiFi40",
-+		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-+			   SND_SOC_DAIFMT_CBS_CFS,
-+		.ops = &snd_pifi_40_ops,
-+		.init = snd_pifi_40_init,
-+		SND_SOC_DAILINK_REG(pifi_40_dai),
-+	},
-+};
-+
-+// Machine driver
-+static struct snd_soc_card snd_pifi_40 = {
-+	.name = "PiFi40",
-+	.owner = THIS_MODULE,
-+	.dai_link = snd_pifi_40_dai,
-+	.num_links = ARRAY_SIZE(snd_pifi_40_dai),
-+	.controls = pifi_40_controls,
-+	.num_controls = ARRAY_SIZE(pifi_40_controls)
-+};
-+
-+static void snd_pifi_40_pdn(struct snd_soc_card *card, int on)
-+{
-+	if (pdn_gpio)
-+		gpiod_set_value_cansleep(pdn_gpio, on ? 0 : 1);
-+}
-+
-+static int snd_pifi_40_probe(struct platform_device *pdev)
-+{
-+	struct snd_soc_card *card = &snd_pifi_40;
-+	int ret = 0, i = 0;
-+
-+	card->dev = &pdev->dev;
-+	platform_set_drvdata(pdev, &snd_pifi_40);
-+
-+	if (pdev->dev.of_node) {
-+		struct device_node *i2s_node;
-+		struct snd_soc_dai_link *dai;
-+
-+		dai = &snd_pifi_40_dai[0];
-+		i2s_node = of_parse_phandle(pdev->dev.of_node, "i2s-controller",
-+					    0);
-+		if (i2s_node) {
-+			for (i = 0; i < card->num_links; i++) {
-+				dai->cpus->dai_name = NULL;
-+				dai->cpus->of_node = i2s_node;
-+				dai->platforms->name = NULL;
-+				dai->platforms->of_node = i2s_node;
-+			}
-+		}
-+
-+		pifi_40_codecs[0].of_node =
-+			of_parse_phandle(pdev->dev.of_node, "audio-codec", 0);
-+		pifi_40_codecs[1].of_node =
-+			of_parse_phandle(pdev->dev.of_node, "audio-codec", 1);
-+		if (!pifi_40_codecs[0].of_node || !pifi_40_codecs[1].of_node) {
-+			dev_err(&pdev->dev,
-+				"Property 'audio-codec' missing or invalid\n");
-+			return -EINVAL;
-+		}
-+
-+		pdn_gpio = devm_gpiod_get_optional(&pdev->dev, "pdn",
-+						   GPIOD_OUT_LOW);
-+		if (IS_ERR(pdn_gpio)) {
-+			ret = PTR_ERR(pdn_gpio);
-+			dev_err(&pdev->dev, "failed to get pdn gpio: %d\n",
-+				ret);
-+			return ret;
-+		}
-+
-+		ret = snd_soc_register_card(&snd_pifi_40);
-+		if (ret < 0) {
-+			dev_err(&pdev->dev,
-+				"snd_soc_register_card() failed: %d\n", ret);
-+			return ret;
-+		}
-+
-+		return 0;
-+	}
-+
-+	return -EINVAL;
-+}
-+
-+static int snd_pifi_40_remove(struct platform_device *pdev)
-+{
-+	struct snd_soc_card *card = platform_get_drvdata(pdev);
-+
-+	kfree(&card->drvdata);
-+	snd_pifi_40_pdn(&snd_pifi_40, 0);
-+	snd_soc_unregister_card(&snd_pifi_40);
-+	return 0;
-+}
-+
-+static const struct of_device_id snd_pifi_40_of_match[] = {
-+	{
-+		.compatible = "pifi,pifi-40",
-+	},
-+	{ /* sentinel */ },
-+};
-+
-+MODULE_DEVICE_TABLE(of, snd_pifi_40_of_match);
-+
-+static struct platform_driver snd_pifi_40_driver = {
-+	.driver = {
-+		.name = "snd-pifi-40",
-+		.owner = THIS_MODULE,
-+		.of_match_table = snd_pifi_40_of_match,
-+	},
-+	.probe = snd_pifi_40_probe,
-+	.remove = snd_pifi_40_remove,
-+};
-+
-+module_platform_driver(snd_pifi_40_driver);
-+
-+MODULE_AUTHOR("David Knell <david.knell@gmail.com>");
-+MODULE_DESCRIPTION("ALSA ASoC Machine Driver for PiFi-40");
-+MODULE_LICENSE("GPL v2");
---- /dev/null
-+++ b/sound/soc/bcm/pisound.c
-@@ -0,0 +1,1241 @@
-+/*
-+ * Pisound Linux kernel module.
-+ * Copyright (C) 2016-2020  Vilniaus Blokas UAB, https://blokas.io/pisound
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; version 2 of the
-+ * License.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-+ * MA  02110-1301, USA.
-+ */
-+
-+#include <linux/init.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/gpio.h>
-+#include <linux/kobject.h>
-+#include <linux/sysfs.h>
-+#include <linux/delay.h>
-+#include <linux/spi/spi.h>
-+#include <linux/interrupt.h>
-+#include <linux/kfifo.h>
-+#include <linux/jiffies.h>
-+
-+#include <sound/core.h>
-+#include <sound/pcm.h>
-+#include <sound/pcm_params.h>
-+#include <sound/soc.h>
-+#include <sound/jack.h>
-+#include <sound/rawmidi.h>
-+#include <sound/asequencer.h>
-+#include <sound/control.h>
-+
-+static int pisnd_spi_init(struct device *dev);
-+static void pisnd_spi_uninit(void);
-+
-+static void pisnd_spi_flush(void);
-+static void pisnd_spi_start(void);
-+static uint8_t pisnd_spi_recv(uint8_t *buffer, uint8_t length);
-+
-+typedef void (*pisnd_spi_recv_cb)(void *data);
-+static void pisnd_spi_set_callback(pisnd_spi_recv_cb cb, void *data);
-+
-+static const char *pisnd_spi_get_serial(void);
-+static const char *pisnd_spi_get_id(void);
-+static const char *pisnd_spi_get_fw_version(void);
-+static const char *pisnd_spi_get_hw_version(void);
-+
-+static int pisnd_midi_init(struct snd_card *card);
-+static void pisnd_midi_uninit(void);
-+
-+enum task_e {
-+	TASK_PROCESS = 0,
-+};
-+
-+static void pisnd_schedule_process(enum task_e task);
-+
-+#define PISOUND_LOG_PREFIX "pisound: "
-+
-+#ifdef PISOUND_DEBUG
-+#	define printd(...) pr_alert(PISOUND_LOG_PREFIX __VA_ARGS__)
-+#else
-+#	define printd(...) do {} while (0)
-+#endif
-+
-+#define printe(...) pr_err(PISOUND_LOG_PREFIX __VA_ARGS__)
-+#define printi(...) pr_info(PISOUND_LOG_PREFIX __VA_ARGS__)
-+
-+static struct snd_rawmidi *g_rmidi;
-+static struct snd_rawmidi_substream *g_midi_output_substream;
-+
-+static int pisnd_output_open(struct snd_rawmidi_substream *substream)
-+{
-+	g_midi_output_substream = substream;
-+	return 0;
-+}
-+
-+static int pisnd_output_close(struct snd_rawmidi_substream *substream)
-+{
-+	g_midi_output_substream = NULL;
-+	return 0;
-+}
-+
-+static void pisnd_output_trigger(
-+	struct snd_rawmidi_substream *substream,
-+	int up
-+	)
-+{
-+	if (substream != g_midi_output_substream) {
-+		printe("MIDI output trigger called for an unexpected stream!");
-+		return;
-+	}
-+
-+	if (!up)
-+		return;
-+
-+	pisnd_spi_start();
-+}
-+
-+static void pisnd_output_drain(struct snd_rawmidi_substream *substream)
-+{
-+	pisnd_spi_flush();
-+}
-+
-+static int pisnd_input_open(struct snd_rawmidi_substream *substream)
-+{
-+	return 0;
-+}
-+
-+static int pisnd_input_close(struct snd_rawmidi_substream *substream)
-+{
-+	return 0;
-+}
-+
-+static void pisnd_midi_recv_callback(void *substream)
-+{
-+	uint8_t data[128];
-+	uint8_t n = 0;
-+
-+	while ((n = pisnd_spi_recv(data, sizeof(data)))) {
-+		int res = snd_rawmidi_receive(substream, data, n);
-+		(void)res;
-+		printd("midi recv %u bytes, res = %d\n", n, res);
-+	}
-+}
-+
-+static void pisnd_input_trigger(struct snd_rawmidi_substream *substream, int up)
-+{
-+	if (up) {
-+		pisnd_spi_set_callback(pisnd_midi_recv_callback, substream);
-+		pisnd_schedule_process(TASK_PROCESS);
-+	} else {
-+		pisnd_spi_set_callback(NULL, NULL);
-+	}
-+}
-+
-+static struct snd_rawmidi_ops pisnd_output_ops = {
-+	.open = pisnd_output_open,
-+	.close = pisnd_output_close,
-+	.trigger = pisnd_output_trigger,
-+	.drain = pisnd_output_drain,
-+};
-+
-+static struct snd_rawmidi_ops pisnd_input_ops = {
-+	.open = pisnd_input_open,
-+	.close = pisnd_input_close,
-+	.trigger = pisnd_input_trigger,
-+};
-+
-+static void pisnd_get_port_info(
-+	struct snd_rawmidi *rmidi,
-+	int number,
-+	struct snd_seq_port_info *seq_port_info
-+	)
-+{
-+	seq_port_info->type =
-+		SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC |
-+		SNDRV_SEQ_PORT_TYPE_HARDWARE |
-+		SNDRV_SEQ_PORT_TYPE_PORT;
-+	seq_port_info->midi_voices = 0;
-+}
-+
-+static struct snd_rawmidi_global_ops pisnd_global_ops = {
-+	.get_port_info = pisnd_get_port_info,
-+};
-+
-+static int pisnd_midi_init(struct snd_card *card)
-+{
-+	int err;
-+
-+	g_midi_output_substream = NULL;
-+
-+	err = snd_rawmidi_new(card, "pisound MIDI", 0, 1, 1, &g_rmidi);
-+
-+	if (err < 0) {
-+		printe("snd_rawmidi_new failed: %d\n", err);
-+		return err;
-+	}
-+
-+	strcpy(g_rmidi->name, "pisound MIDI ");
-+	strcat(g_rmidi->name, pisnd_spi_get_serial());
-+
-+	g_rmidi->info_flags =
-+		SNDRV_RAWMIDI_INFO_OUTPUT |
-+		SNDRV_RAWMIDI_INFO_INPUT |
-+		SNDRV_RAWMIDI_INFO_DUPLEX;
-+
-+	g_rmidi->ops = &pisnd_global_ops;
-+
-+	g_rmidi->private_data = (void *)0;
-+
-+	snd_rawmidi_set_ops(
-+		g_rmidi,
-+		SNDRV_RAWMIDI_STREAM_OUTPUT,
-+		&pisnd_output_ops
-+		);
-+
-+	snd_rawmidi_set_ops(
-+		g_rmidi,
-+		SNDRV_RAWMIDI_STREAM_INPUT,
-+		&pisnd_input_ops
-+		);
-+
-+	return 0;
-+}
-+
-+static void pisnd_midi_uninit(void)
-+{
-+}
-+
-+static void *g_recvData;
-+static pisnd_spi_recv_cb g_recvCallback;
-+
-+#define FIFO_SIZE 4096
-+
-+static char g_serial_num[11];
-+static char g_id[25];
-+enum { MAX_VERSION_STR_LEN = 6 };
-+static char g_fw_version[MAX_VERSION_STR_LEN];
-+static char g_hw_version[MAX_VERSION_STR_LEN];
-+
-+static uint8_t g_ledFlashDuration;
-+static bool    g_ledFlashDurationChanged;
-+
-+DEFINE_KFIFO(spi_fifo_in,  uint8_t, FIFO_SIZE);
-+DEFINE_KFIFO(spi_fifo_out, uint8_t, FIFO_SIZE);
-+
-+static struct gpio_desc *data_available;
-+static struct gpio_desc *spi_reset;
-+
-+static struct spi_device *pisnd_spi_device;
-+
-+static struct workqueue_struct *pisnd_workqueue;
-+static struct work_struct pisnd_work_process;
-+
-+static void pisnd_work_handler(struct work_struct *work);
-+
-+static void spi_transfer(const uint8_t *txbuf, uint8_t *rxbuf, int len);
-+static uint16_t spi_transfer16(uint16_t val);
-+
-+static int pisnd_init_workqueues(void)
-+{
-+	pisnd_workqueue = create_singlethread_workqueue("pisnd_workqueue");
-+	INIT_WORK(&pisnd_work_process, pisnd_work_handler);
-+
-+	return 0;
-+}
-+
-+static void pisnd_uninit_workqueues(void)
-+{
-+	flush_workqueue(pisnd_workqueue);
-+	destroy_workqueue(pisnd_workqueue);
-+
-+	pisnd_workqueue = NULL;
-+}
-+
-+static bool pisnd_spi_has_more(void)
-+{
-+	return gpiod_get_value(data_available);
-+}
-+
-+static void pisnd_schedule_process(enum task_e task)
-+{
-+	if (pisnd_spi_device != NULL &&
-+		pisnd_workqueue != NULL &&
-+		!work_pending(&pisnd_work_process)
-+		) {
-+		printd("schedule: has more = %d\n", pisnd_spi_has_more());
-+		if (task == TASK_PROCESS)
-+			queue_work(pisnd_workqueue, &pisnd_work_process);
-+	}
-+}
-+
-+static irqreturn_t data_available_interrupt_handler(int irq, void *dev_id)
-+{
-+	if (irq == gpiod_to_irq(data_available) && pisnd_spi_has_more()) {
-+		printd("schedule from irq\n");
-+		pisnd_schedule_process(TASK_PROCESS);
-+	}
-+
-+	return IRQ_HANDLED;
-+}
-+
-+static uint16_t spi_transfer16(uint16_t val)
-+{
-+	uint8_t txbuf[2];
-+	uint8_t rxbuf[2];
-+
-+	if (!pisnd_spi_device) {
-+		printe("pisnd_spi_device null, returning\n");
-+		return 0;
-+	}
-+
-+	txbuf[0] = val >> 8;
-+	txbuf[1] = val & 0xff;
-+
-+	spi_transfer(txbuf, rxbuf, sizeof(txbuf));
-+
-+	printd("received: %02x%02x\n", rxbuf[0], rxbuf[1]);
-+
-+	return (rxbuf[0] << 8) | rxbuf[1];
-+}
-+
-+static void spi_transfer(const uint8_t *txbuf, uint8_t *rxbuf, int len)
-+{
-+	int err;
-+	struct spi_transfer transfer;
-+	struct spi_message msg;
-+
-+	memset(rxbuf, 0, len);
-+
-+	if (!pisnd_spi_device) {
-+		printe("pisnd_spi_device null, returning\n");
-+		return;
-+	}
-+
-+	spi_message_init(&msg);
-+
-+	memset(&transfer, 0, sizeof(transfer));
-+
-+	transfer.tx_buf = txbuf;
-+	transfer.rx_buf = rxbuf;
-+	transfer.len = len;
-+	transfer.speed_hz = 150000;
-+	transfer.delay.value = 10;
-+	transfer.delay.unit = SPI_DELAY_UNIT_USECS;
-+
-+	spi_message_add_tail(&transfer, &msg);
-+
-+	err = spi_sync(pisnd_spi_device, &msg);
-+
-+	if (err < 0) {
-+		printe("spi_sync error %d\n", err);
-+		return;
-+	}
-+
-+	printd("hasMore %d\n", pisnd_spi_has_more());
-+}
-+
-+static int spi_read_bytes(char *dst, size_t length, uint8_t *bytesRead)
-+{
-+	uint16_t rx;
-+	uint8_t size;
-+	uint8_t i;
-+
-+	memset(dst, 0, length);
-+	*bytesRead = 0;
-+
-+	rx = spi_transfer16(0);
-+	if (!(rx >> 8))
-+		return -EINVAL;
-+
-+	size = rx & 0xff;
-+
-+	if (size > length)
-+		return -EINVAL;
-+
-+	for (i = 0; i < size; ++i) {
-+		rx = spi_transfer16(0);
-+		if (!(rx >> 8))
-+			return -EINVAL;
-+
-+		dst[i] = rx & 0xff;
-+	}
-+
-+	*bytesRead = i;
-+
-+	return 0;
-+}
-+
-+static int spi_device_match(struct device *dev, const void *data)
-+{
-+	struct spi_device *spi = container_of(dev, struct spi_device, dev);
-+
-+	printd("      %s %s %dkHz %d bits mode=0x%02X\n",
-+		spi->modalias, dev_name(dev), spi->max_speed_hz/1000,
-+		spi->bits_per_word, spi->mode);
-+
-+	if (strcmp("pisound-spi", spi->modalias) == 0) {
-+		printi("\tFound!\n");
-+		return 1;
-+	}
-+
-+	printe("\tNot found!\n");
-+	return 0;
-+}
-+
-+static struct spi_device *pisnd_spi_find_device(void)
-+{
-+	struct device *dev;
-+
-+	printi("Searching for spi device...\n");
-+	dev = bus_find_device(&spi_bus_type, NULL, NULL, spi_device_match);
-+	if (dev != NULL)
-+		return container_of(dev, struct spi_device, dev);
-+	else
-+		return NULL;
-+}
-+
-+static void pisnd_work_handler(struct work_struct *work)
-+{
-+	enum { TRANSFER_SIZE = 4 };
-+	enum { PISOUND_OUTPUT_BUFFER_SIZE_MILLIBYTES = 127 * 1000 };
-+	enum { MIDI_MILLIBYTES_PER_JIFFIE = (3125 * 1000) / HZ };
-+	int out_buffer_used_millibytes = 0;
-+	unsigned long now;
-+	uint8_t val;
-+	uint8_t txbuf[TRANSFER_SIZE];
-+	uint8_t rxbuf[TRANSFER_SIZE];
-+	uint8_t midibuf[TRANSFER_SIZE];
-+	int i, n;
-+	bool had_data;
-+
-+	unsigned long last_transfer_at = jiffies;
-+
-+	if (work == &pisnd_work_process) {
-+		if (pisnd_spi_device == NULL)
-+			return;
-+
-+		do {
-+			if (g_midi_output_substream &&
-+				kfifo_avail(&spi_fifo_out) >= sizeof(midibuf)) {
-+
-+				n = snd_rawmidi_transmit_peek(
-+					g_midi_output_substream,
-+					midibuf, sizeof(midibuf)
-+				);
-+
-+				if (n > 0) {
-+					for (i = 0; i < n; ++i)
-+						kfifo_put(
-+							&spi_fifo_out,
-+							midibuf[i]
-+							);
-+					snd_rawmidi_transmit_ack(
-+						g_midi_output_substream,
-+						i
-+						);
-+				}
-+			}
-+
-+			had_data = false;
-+			memset(txbuf, 0, sizeof(txbuf));
-+			for (i = 0; i < sizeof(txbuf) &&
-+				((out_buffer_used_millibytes+1000 <
-+				PISOUND_OUTPUT_BUFFER_SIZE_MILLIBYTES) ||
-+				g_ledFlashDurationChanged);
-+				i += 2) {
-+
-+				val = 0;
-+
-+				if (g_ledFlashDurationChanged) {
-+					txbuf[i+0] = 0xf0;
-+					txbuf[i+1] = g_ledFlashDuration;
-+					g_ledFlashDuration = 0;
-+					g_ledFlashDurationChanged = false;
-+				} else if (kfifo_get(&spi_fifo_out, &val)) {
-+					txbuf[i+0] = 0x0f;
-+					txbuf[i+1] = val;
-+					out_buffer_used_millibytes += 1000;
-+				}
-+			}
-+
-+			spi_transfer(txbuf, rxbuf, sizeof(txbuf));
-+			/* Estimate the Pisound's MIDI output buffer usage, so
-+			 * that we don't overflow it. Space in the buffer should
-+			 * be becoming available at the UART MIDI byte transfer
-+			 * rate.
-+			 */
-+			now = jiffies;
-+			if (now != last_transfer_at) {
-+				out_buffer_used_millibytes -=
-+					(now - last_transfer_at) *
-+					MIDI_MILLIBYTES_PER_JIFFIE;
-+				if (out_buffer_used_millibytes < 0)
-+					out_buffer_used_millibytes = 0;
-+				last_transfer_at = now;
-+			}
-+
-+			for (i = 0; i < sizeof(rxbuf); i += 2) {
-+				if (rxbuf[i]) {
-+					kfifo_put(&spi_fifo_in, rxbuf[i+1]);
-+					if (kfifo_len(&spi_fifo_in) > 16 &&
-+						g_recvCallback)
-+						g_recvCallback(g_recvData);
-+					had_data = true;
-+				}
-+			}
-+		} while (had_data
-+			|| !kfifo_is_empty(&spi_fifo_out)
-+			|| pisnd_spi_has_more()
-+			|| g_ledFlashDurationChanged
-+			|| out_buffer_used_millibytes != 0
-+			);
-+
-+		if (!kfifo_is_empty(&spi_fifo_in) && g_recvCallback)
-+			g_recvCallback(g_recvData);
-+	}
-+}
-+
-+static int pisnd_spi_gpio_init(struct device *dev)
-+{
-+	spi_reset = gpiod_get_index(dev, "reset", 1, GPIOD_ASIS);
-+	data_available = gpiod_get_index(dev, "data_available", 0, GPIOD_ASIS);
-+
-+	gpiod_direction_output(spi_reset, 1);
-+	gpiod_direction_input(data_available);
-+
-+	/* Reset the slave. */
-+	gpiod_set_value(spi_reset, false);
-+	mdelay(1);
-+	gpiod_set_value(spi_reset, true);
-+
-+	/* Give time for spi slave to start. */
-+	mdelay(64);
-+
-+	return 0;
-+}
-+
-+static void pisnd_spi_gpio_uninit(void)
-+{
-+	gpiod_set_value(spi_reset, false);
-+	gpiod_put(spi_reset);
-+	spi_reset = NULL;
-+
-+	gpiod_put(data_available);
-+	data_available = NULL;
-+}
-+
-+static int pisnd_spi_gpio_irq_init(struct device *dev)
-+{
-+	return request_threaded_irq(
-+		gpiod_to_irq(data_available), NULL,
-+		data_available_interrupt_handler,
-+		IRQF_TIMER | IRQF_TRIGGER_RISING | IRQF_ONESHOT,
-+		"data_available_int",
-+		NULL
-+		);
-+}
-+
-+static void pisnd_spi_gpio_irq_uninit(void)
-+{
-+	free_irq(gpiod_to_irq(data_available), NULL);
-+}
-+
-+static int spi_read_info(void)
-+{
-+	uint16_t tmp;
-+	uint8_t count;
-+	uint8_t n;
-+	uint8_t i;
-+	uint8_t j;
-+	char buffer[257];
-+	int ret;
-+	char *p;
-+
-+	memset(g_serial_num, 0, sizeof(g_serial_num));
-+	memset(g_fw_version, 0, sizeof(g_fw_version));
-+	strcpy(g_hw_version, "1.0"); // Assume 1.0 hw version.
-+	memset(g_id, 0, sizeof(g_id));
-+
-+	tmp = spi_transfer16(0);
-+
-+	if (!(tmp >> 8))
-+		return -EINVAL;
-+
-+	count = tmp & 0xff;
-+
-+	for (i = 0; i < count; ++i) {
-+		memset(buffer, 0, sizeof(buffer));
-+		ret = spi_read_bytes(buffer, sizeof(buffer)-1, &n);
-+
-+		if (ret < 0)
-+			return ret;
-+
-+		switch (i) {
-+		case 0:
-+			if (n != 2)
-+				return -EINVAL;
-+
-+			snprintf(
-+				g_fw_version,
-+				MAX_VERSION_STR_LEN,
-+				"%x.%02x",
-+				buffer[0],
-+				buffer[1]
-+				);
-+
-+			g_fw_version[MAX_VERSION_STR_LEN-1] = '\0';
-+			break;
-+		case 3:
-+			if (n != 2)
-+				return -EINVAL;
-+
-+			snprintf(
-+				g_hw_version,
-+				MAX_VERSION_STR_LEN,
-+				"%x.%x",
-+				buffer[0],
-+				buffer[1]
-+			);
-+
-+			g_hw_version[MAX_VERSION_STR_LEN-1] = '\0';
-+			break;
-+		case 1:
-+			if (n >= sizeof(g_serial_num))
-+				return -EINVAL;
-+
-+			memcpy(g_serial_num, buffer, sizeof(g_serial_num));
-+			break;
-+		case 2:
-+			{
-+				if (n*2 >= sizeof(g_id))
-+					return -EINVAL;
-+
-+				p = g_id;
-+				for (j = 0; j < n; ++j)
-+					p += sprintf(p, "%02x", buffer[j]);
-+
-+				*p = '\0';
-+			}
-+			break;
-+		default:
-+			break;
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+static int pisnd_spi_init(struct device *dev)
-+{
-+	int ret;
-+	struct spi_device *spi;
-+
-+	memset(g_serial_num, 0, sizeof(g_serial_num));
-+	memset(g_id, 0, sizeof(g_id));
-+	memset(g_fw_version, 0, sizeof(g_fw_version));
-+	memset(g_hw_version, 0, sizeof(g_hw_version));
-+
-+	spi = pisnd_spi_find_device();
-+
-+	if (spi != NULL) {
-+		printd("initializing spi!\n");
-+		pisnd_spi_device = spi;
-+		ret = spi_setup(pisnd_spi_device);
-+	} else {
-+		printe("SPI device not found, deferring!\n");
-+		return -EPROBE_DEFER;
-+	}
-+
-+	ret = pisnd_spi_gpio_init(dev);
-+
-+	if (ret < 0) {
-+		printe("SPI GPIO init failed: %d\n", ret);
-+		spi_dev_put(pisnd_spi_device);
-+		pisnd_spi_device = NULL;
-+		pisnd_spi_gpio_uninit();
-+		return ret;
-+	}
-+
-+	ret = spi_read_info();
-+
-+	if (ret < 0) {
-+		printe("Reading card info failed: %d\n", ret);
-+		spi_dev_put(pisnd_spi_device);
-+		pisnd_spi_device = NULL;
-+		pisnd_spi_gpio_uninit();
-+		return ret;
-+	}
-+
-+	/* Flash the LEDs. */
-+	spi_transfer16(0xf008);
-+
-+	ret = pisnd_spi_gpio_irq_init(dev);
-+	if (ret < 0) {
-+		printe("SPI irq request failed: %d\n", ret);
-+		spi_dev_put(pisnd_spi_device);
-+		pisnd_spi_device = NULL;
-+		pisnd_spi_gpio_irq_uninit();
-+		pisnd_spi_gpio_uninit();
-+	}
-+
-+	ret = pisnd_init_workqueues();
-+	if (ret != 0) {
-+		printe("Workqueue initialization failed: %d\n", ret);
-+		spi_dev_put(pisnd_spi_device);
-+		pisnd_spi_device = NULL;
-+		pisnd_spi_gpio_irq_uninit();
-+		pisnd_spi_gpio_uninit();
-+		pisnd_uninit_workqueues();
-+		return ret;
-+	}
-+
-+	if (pisnd_spi_has_more()) {
-+		printd("data is available, scheduling from init\n");
-+		pisnd_schedule_process(TASK_PROCESS);
-+	}
-+
-+	return 0;
-+}
-+
-+static void pisnd_spi_uninit(void)
-+{
-+	pisnd_uninit_workqueues();
-+
-+	spi_dev_put(pisnd_spi_device);
-+	pisnd_spi_device = NULL;
-+
-+	pisnd_spi_gpio_irq_uninit();
-+	pisnd_spi_gpio_uninit();
-+}
-+
-+static void pisnd_spi_flash_leds(uint8_t duration)
-+{
-+	g_ledFlashDuration = duration;
-+	g_ledFlashDurationChanged = true;
-+	printd("schedule from spi_flash_leds\n");
-+	pisnd_schedule_process(TASK_PROCESS);
-+}
-+
-+static void pisnd_spi_flush(void)
-+{
-+	while (!kfifo_is_empty(&spi_fifo_out)) {
-+		pisnd_spi_start();
-+		flush_workqueue(pisnd_workqueue);
-+	}
-+}
-+
-+static void pisnd_spi_start(void)
-+{
-+	printd("schedule from spi_start\n");
-+	pisnd_schedule_process(TASK_PROCESS);
-+}
-+
-+static uint8_t pisnd_spi_recv(uint8_t *buffer, uint8_t length)
-+{
-+	return kfifo_out(&spi_fifo_in, buffer, length);
-+}
-+
-+static void pisnd_spi_set_callback(pisnd_spi_recv_cb cb, void *data)
-+{
-+	g_recvData = data;
-+	g_recvCallback = cb;
-+}
-+
-+static const char *pisnd_spi_get_serial(void)
-+{
-+	return g_serial_num;
-+}
-+
-+static const char *pisnd_spi_get_id(void)
-+{
-+	return g_id;
-+}
-+
-+static const char *pisnd_spi_get_fw_version(void)
-+{
-+	return g_fw_version;
-+}
-+
-+static const char *pisnd_spi_get_hw_version(void)
-+{
-+	return g_hw_version;
-+}
-+
-+static const struct of_device_id pisound_of_match[] = {
-+	{ .compatible = "blokaslabs,pisound", },
-+	{ .compatible = "blokaslabs,pisound-spi", },
-+	{},
-+};
-+
-+enum {
-+	SWITCH = 0,
-+	VOLUME = 1,
-+};
-+
-+static int pisnd_ctl_info(struct snd_kcontrol *kcontrol,
-+	struct snd_ctl_elem_info *uinfo)
-+{
-+	if (kcontrol->private_value == SWITCH) {
-+		uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-+		uinfo->count = 1;
-+		uinfo->value.integer.min = 0;
-+		uinfo->value.integer.max = 1;
-+		return 0;
-+	} else if (kcontrol->private_value == VOLUME) {
-+		uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-+		uinfo->count = 1;
-+		uinfo->value.integer.min = 0;
-+		uinfo->value.integer.max = 100;
-+		return 0;
-+	}
-+	return -EINVAL;
-+}
-+
-+static int pisnd_ctl_get(struct snd_kcontrol *kcontrol,
-+	struct snd_ctl_elem_value *ucontrol)
-+{
-+	if (kcontrol->private_value == SWITCH) {
-+		ucontrol->value.integer.value[0] = 1;
-+		return 0;
-+	} else if (kcontrol->private_value == VOLUME) {
-+		ucontrol->value.integer.value[0] = 100;
-+		return 0;
-+	}
-+
-+	return -EINVAL;
-+}
-+
-+static struct snd_kcontrol_new pisnd_ctl[] = {
-+	{
-+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-+		.name = "PCM Playback Switch",
-+		.index = 0,
-+		.private_value = SWITCH,
-+		.access = SNDRV_CTL_ELEM_ACCESS_READ,
-+		.info = pisnd_ctl_info,
-+		.get = pisnd_ctl_get,
-+	},
-+	{
-+		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-+		.name = "PCM Playback Volume",
-+		.index = 0,
-+		.private_value = VOLUME,
-+		.access = SNDRV_CTL_ELEM_ACCESS_READ,
-+		.info = pisnd_ctl_info,
-+		.get = pisnd_ctl_get,
-+	},
-+};
-+
-+static int pisnd_ctl_init(struct snd_card *card)
-+{
-+	int err, i;
-+
-+	for (i = 0; i < ARRAY_SIZE(pisnd_ctl); ++i) {
-+		err = snd_ctl_add(card, snd_ctl_new1(&pisnd_ctl[i], NULL));
-+		if (err < 0)
-+			return err;
-+	}
-+
-+	return 0;
-+}
-+
-+static int pisnd_ctl_uninit(void)
-+{
-+	return 0;
-+}
-+
-+static struct gpio_desc *osr0, *osr1, *osr2;
-+static struct gpio_desc *reset;
-+static struct gpio_desc *button;
-+
-+static int pisnd_hw_params(
-+	struct snd_pcm_substream *substream,
-+	struct snd_pcm_hw_params *params
-+	)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
-+
-+	/* Pisound runs on fixed 32 clock counts per channel,
-+	 * as generated by the master ADC.
-+	 */
-+	snd_soc_dai_set_bclk_ratio(cpu_dai, 32*2);
-+
-+	printd("rate   = %d\n", params_rate(params));
-+	printd("ch     = %d\n", params_channels(params));
-+	printd("bits   = %u\n",
-+		snd_pcm_format_physical_width(params_format(params)));
-+	printd("format = %d\n", params_format(params));
-+
-+	gpiod_set_value(reset, false);
-+
-+	switch (params_rate(params)) {
-+	case 48000:
-+		gpiod_set_value(osr0, true);
-+		gpiod_set_value(osr1, false);
-+		gpiod_set_value(osr2, false);
-+		break;
-+	case 96000:
-+		gpiod_set_value(osr0, true);
-+		gpiod_set_value(osr1, false);
-+		gpiod_set_value(osr2, true);
-+		break;
-+	case 192000:
-+		gpiod_set_value(osr0, true);
-+		gpiod_set_value(osr1, true);
-+		gpiod_set_value(osr2, true);
-+		break;
-+	default:
-+		printe("Unsupported rate %u!\n", params_rate(params));
-+		return -EINVAL;
-+	}
-+
-+	gpiod_set_value(reset, true);
-+
-+	return 0;
-+}
-+
-+static unsigned int rates[3] = {
-+	48000, 96000, 192000
-+};
-+
-+static struct snd_pcm_hw_constraint_list constraints_rates = {
-+	.count = ARRAY_SIZE(rates),
-+	.list = rates,
-+	.mask = 0,
-+};
-+
-+static int pisnd_startup(struct snd_pcm_substream *substream)
-+{
-+	int err = snd_pcm_hw_constraint_list(
-+		substream->runtime,
-+		0,
-+		SNDRV_PCM_HW_PARAM_RATE,
-+		&constraints_rates
-+		);
-+
-+	if (err < 0)
-+		return err;
-+
-+	err = snd_pcm_hw_constraint_single(
-+		substream->runtime,
-+		SNDRV_PCM_HW_PARAM_CHANNELS,
-+		2
-+		);
-+
-+	if (err < 0)
-+		return err;
-+
-+	err = snd_pcm_hw_constraint_mask64(
-+		substream->runtime,
-+		SNDRV_PCM_HW_PARAM_FORMAT,
-+		SNDRV_PCM_FMTBIT_S16_LE |
-+		SNDRV_PCM_FMTBIT_S24_LE |
-+		SNDRV_PCM_FMTBIT_S32_LE
-+		);
-+
-+	if (err < 0)
-+		return err;
-+
-+	return 0;
-+}
-+
-+static struct snd_soc_ops pisnd_ops = {
-+	.startup = pisnd_startup,
-+	.hw_params = pisnd_hw_params,
-+};
-+
-+SND_SOC_DAILINK_DEFS(pisnd,
-+	DAILINK_COMP_ARRAY(COMP_CPU("bcm2708-i2s.0")),
-+	DAILINK_COMP_ARRAY(COMP_DUMMY()),
-+	DAILINK_COMP_ARRAY(COMP_PLATFORM("bcm2708-i2s.0")));
-+
-+static struct snd_soc_dai_link pisnd_dai[] = {
-+	{
-+		.name           = "pisound",
-+		.stream_name    = "pisound",
-+		.dai_fmt        =
-+			SND_SOC_DAIFMT_I2S |
-+			SND_SOC_DAIFMT_NB_NF |
-+			SND_SOC_DAIFMT_CBM_CFM,
-+		.ops            = &pisnd_ops,
-+		SND_SOC_DAILINK_REG(pisnd),
-+	},
-+};
-+
-+static int pisnd_card_probe(struct snd_soc_card *card)
-+{
-+	int err = pisnd_midi_init(card->snd_card);
-+
-+	if (err < 0) {
-+		printe("pisnd_midi_init failed: %d\n", err);
-+		return err;
-+	}
-+
-+	err = pisnd_ctl_init(card->snd_card);
-+	if (err < 0) {
-+		printe("pisnd_ctl_init failed: %d\n", err);
-+		return err;
-+	}
-+
-+	return 0;
-+}
-+
-+static int pisnd_card_remove(struct snd_soc_card *card)
-+{
-+	pisnd_ctl_uninit();
-+	pisnd_midi_uninit();
-+	return 0;
-+}
-+
-+static struct snd_soc_card pisnd_card = {
-+	.name         = "pisound",
-+	.owner        = THIS_MODULE,
-+	.dai_link     = pisnd_dai,
-+	.num_links    = ARRAY_SIZE(pisnd_dai),
-+	.probe        = pisnd_card_probe,
-+	.remove       = pisnd_card_remove,
-+};
-+
-+static int pisnd_init_gpio(struct device *dev)
-+{
-+	osr0 = gpiod_get_index(dev, "osr", 0, GPIOD_ASIS);
-+	osr1 = gpiod_get_index(dev, "osr", 1, GPIOD_ASIS);
-+	osr2 = gpiod_get_index(dev, "osr", 2, GPIOD_ASIS);
-+
-+	reset = gpiod_get_index(dev, "reset", 0, GPIOD_ASIS);
-+
-+	button = gpiod_get_index(dev, "button", 0, GPIOD_ASIS);
-+
-+	gpiod_direction_output(osr0,  1);
-+	gpiod_direction_output(osr1,  1);
-+	gpiod_direction_output(osr2,  1);
-+	gpiod_direction_output(reset, 1);
-+
-+	gpiod_set_value(reset, false);
-+	gpiod_set_value(osr0,   true);
-+	gpiod_set_value(osr1,  false);
-+	gpiod_set_value(osr2,  false);
-+	gpiod_set_value(reset,  true);
-+
-+	gpiod_export(button, false);
-+
-+	return 0;
-+}
-+
-+static int pisnd_uninit_gpio(void)
-+{
-+	int i;
-+
-+	struct gpio_desc **gpios[] = {
-+		&osr0, &osr1, &osr2, &reset, &button,
-+	};
-+
-+	gpiod_unexport(button);
-+
-+	for (i = 0; i < ARRAY_SIZE(gpios); ++i) {
-+		if (*gpios[i] == NULL) {
-+			printd("weird, GPIO[%d] is NULL already\n", i);
-+			continue;
-+		}
-+
-+		gpiod_put(*gpios[i]);
-+		*gpios[i] = NULL;
-+	}
-+
-+	return 0;
-+}
-+
-+static struct kobject *pisnd_kobj;
-+
-+static ssize_t pisnd_serial_show(
-+	struct kobject *kobj,
-+	struct kobj_attribute *attr,
-+	char *buf
-+	)
-+{
-+	return sprintf(buf, "%s\n", pisnd_spi_get_serial());
-+}
-+
-+static ssize_t pisnd_id_show(
-+	struct kobject *kobj,
-+	struct kobj_attribute *attr,
-+	char *buf
-+	)
-+{
-+	return sprintf(buf, "%s\n", pisnd_spi_get_id());
-+}
-+
-+static ssize_t pisnd_fw_version_show(
-+	struct kobject *kobj,
-+	struct kobj_attribute *attr,
-+	char *buf
-+	)
-+{
-+	return sprintf(buf, "%s\n", pisnd_spi_get_fw_version());
-+}
-+
-+static ssize_t pisnd_hw_version_show(
-+	struct kobject *kobj,
-+	struct kobj_attribute *attr,
-+	char *buf
-+)
-+{
-+	return sprintf(buf, "%s\n", pisnd_spi_get_hw_version());
-+}
-+
-+static ssize_t pisnd_led_store(
-+	struct kobject *kobj,
-+	struct kobj_attribute *attr,
-+	const char *buf,
-+	size_t length
-+	)
-+{
-+	uint32_t timeout;
-+	int err;
-+
-+	err = kstrtou32(buf, 10, &timeout);
-+
-+	if (err == 0 && timeout <= 255)
-+		pisnd_spi_flash_leds(timeout);
-+
-+	return length;
-+}
-+
-+static struct kobj_attribute pisnd_serial_attribute =
-+	__ATTR(serial, 0444, pisnd_serial_show, NULL);
-+static struct kobj_attribute pisnd_id_attribute =
-+	__ATTR(id, 0444, pisnd_id_show, NULL);
-+static struct kobj_attribute pisnd_fw_version_attribute =
-+	__ATTR(version, 0444, pisnd_fw_version_show, NULL);
-+static struct kobj_attribute pisnd_hw_version_attribute =
-+__ATTR(hw_version, 0444, pisnd_hw_version_show, NULL);
-+static struct kobj_attribute pisnd_led_attribute =
-+	__ATTR(led, 0644, NULL, pisnd_led_store);
-+
-+static struct attribute *attrs[] = {
-+	&pisnd_serial_attribute.attr,
-+	&pisnd_id_attribute.attr,
-+	&pisnd_fw_version_attribute.attr,
-+	&pisnd_hw_version_attribute.attr,
-+	&pisnd_led_attribute.attr,
-+	NULL
-+};
-+
-+static struct attribute_group attr_group = { .attrs = attrs };
-+
-+static int pisnd_probe(struct platform_device *pdev)
-+{
-+	int ret = 0;
-+	int i;
-+
-+	ret = pisnd_spi_init(&pdev->dev);
-+	if (ret < 0) {
-+		printe("pisnd_spi_init failed: %d\n", ret);
-+		return ret;
-+	}
-+
-+	printi("Detected Pisound card:\n");
-+	printi("\tSerial:           %s\n", pisnd_spi_get_serial());
-+	printi("\tFirmware Version: %s\n", pisnd_spi_get_fw_version());
-+	printi("\tHardware Version: %s\n", pisnd_spi_get_hw_version());
-+	printi("\tId:               %s\n", pisnd_spi_get_id());
-+
-+	pisnd_kobj = kobject_create_and_add("pisound", kernel_kobj);
-+	if (!pisnd_kobj) {
-+		pisnd_spi_uninit();
-+		return -ENOMEM;
-+	}
-+
-+	ret = sysfs_create_group(pisnd_kobj, &attr_group);
-+	if (ret < 0) {
-+		pisnd_spi_uninit();
-+		kobject_put(pisnd_kobj);
-+		return -ENOMEM;
-+	}
-+
-+	pisnd_init_gpio(&pdev->dev);
-+	pisnd_card.dev = &pdev->dev;
-+
-+	if (pdev->dev.of_node) {
-+		struct device_node *i2s_node;
-+
-+		i2s_node = of_parse_phandle(
-+			pdev->dev.of_node,
-+			"i2s-controller",
-+			0
-+			);
-+
-+		for (i = 0; i < pisnd_card.num_links; ++i) {
-+			struct snd_soc_dai_link *dai = &pisnd_dai[i];
-+
-+			if (i2s_node) {
-+				dai->cpus->dai_name = NULL;
-+				dai->cpus->of_node = i2s_node;
-+				dai->platforms->name = NULL;
-+				dai->platforms->of_node = i2s_node;
-+				dai->stream_name = pisnd_spi_get_serial();
-+			}
-+		}
-+	}
-+
-+	ret = snd_soc_register_card(&pisnd_card);
-+
-+	if (ret < 0) {
-+		if (ret != -EPROBE_DEFER)
-+			printe("snd_soc_register_card() failed: %d\n", ret);
-+		pisnd_uninit_gpio();
-+		kobject_put(pisnd_kobj);
-+		pisnd_spi_uninit();
-+	}
-+
-+	return ret;
-+}
-+
-+static int pisnd_remove(struct platform_device *pdev)
-+{
-+	printi("Unloading.\n");
-+
-+	if (pisnd_kobj) {
-+		kobject_put(pisnd_kobj);
-+		pisnd_kobj = NULL;
-+	}
-+
-+	pisnd_spi_uninit();
-+
-+	/* Turn off */
-+	gpiod_set_value(reset, false);
-+	pisnd_uninit_gpio();
-+
-+	snd_soc_unregister_card(&pisnd_card);
-+	return 0;
-+}
-+
-+MODULE_DEVICE_TABLE(of, pisound_of_match);
-+
-+static struct platform_driver pisnd_driver = {
-+	.driver = {
-+		.name           = "snd-rpi-pisound",
-+		.owner          = THIS_MODULE,
-+		.of_match_table = pisound_of_match,
-+	},
-+	.probe              = pisnd_probe,
-+	.remove             = pisnd_remove,
-+};
-+
-+module_platform_driver(pisnd_driver);
-+
-+MODULE_AUTHOR("Giedrius Trainavicius <giedrius@blokas.io>");
-+MODULE_DESCRIPTION("ASoC Driver for Pisound, https://blokas.io/pisound");
-+MODULE_LICENSE("GPL v2");
---- /dev/null
-+++ b/sound/soc/bcm/rpi-cirrus.c
-@@ -0,0 +1,1025 @@
-+/*
-+ * ASoC machine driver for Cirrus Logic Audio Card
-+ * (with WM5102 and WM8804 codecs)
-+ *
-+ * Copyright 2015-2017 Matthias Reichl <hias@horus.com>
-+ *
-+ * Based on rpi-cirrus-sound-pi driver (c) Wolfson / Cirrus Logic Inc.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/mutex.h>
-+#include <linux/slab.h>
-+#include <linux/list.h>
-+#include <linux/delay.h>
-+#include <sound/pcm_params.h>
-+
-+#include <linux/mfd/arizona/registers.h>
-+
-+#include "../codecs/wm5102.h"
-+#include "../codecs/wm8804.h"
-+
-+#define WM8804_CLKOUT_HZ 12000000
-+
-+#define RPI_CIRRUS_DEFAULT_RATE 44100
-+#define WM5102_MAX_SYSCLK_1 49152000 /* max sysclk for 4K family */
-+#define WM5102_MAX_SYSCLK_2 45158400 /* max sysclk for 11.025K family */
-+
-+static inline unsigned int calc_sysclk(unsigned int rate)
-+{
-+	return (rate % 4000) ? WM5102_MAX_SYSCLK_2 : WM5102_MAX_SYSCLK_1;
-+}
-+
-+enum {
-+	DAI_WM5102 = 0,
-+	DAI_WM8804,
-+};
-+
-+struct rpi_cirrus_priv {
-+	/* mutex for synchronzing FLL1 access with DAPM */
-+	struct mutex lock;
-+	unsigned int card_rate;
-+	int sync_path_enable;
-+	int fll1_freq; /* negative means RefClock in spdif rx case */
-+
-+	/* track hw params/free for substreams */
-+	unsigned int params_set;
-+	unsigned int min_rate_idx, max_rate_idx;
-+	unsigned char iec958_status[4];
-+};
-+
-+/* helper functions */
-+static inline struct snd_soc_pcm_runtime *get_wm5102_runtime(
-+	struct snd_soc_card *card) {
-+	return snd_soc_get_pcm_runtime(card, &card->dai_link[DAI_WM5102]);
-+}
-+
-+static inline struct snd_soc_pcm_runtime *get_wm8804_runtime(
-+	struct snd_soc_card *card) {
-+	return snd_soc_get_pcm_runtime(card, &card->dai_link[DAI_WM8804]);
-+}
-+
-+
-+struct rate_info {
-+	unsigned int value;
-+	char *text;
-+};
-+
-+static struct rate_info min_rates[] = {
-+	{     0, "off"},
-+	{ 32000, "32kHz"},
-+	{ 44100, "44.1kHz"}
-+};
-+
-+#define NUM_MIN_RATES ARRAY_SIZE(min_rates)
-+
-+static int rpi_cirrus_min_rate_info(struct snd_kcontrol *kcontrol,
-+	struct snd_ctl_elem_info *uinfo)
-+{
-+	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-+	uinfo->count = 1;
-+	uinfo->value.enumerated.items = NUM_MIN_RATES;
-+
-+	if (uinfo->value.enumerated.item >= NUM_MIN_RATES)
-+		uinfo->value.enumerated.item = NUM_MIN_RATES - 1;
-+	strcpy(uinfo->value.enumerated.name,
-+		min_rates[uinfo->value.enumerated.item].text);
-+	return 0;
-+}
-+
-+static int rpi_cirrus_min_rate_get(struct snd_kcontrol *kcontrol,
-+	struct snd_ctl_elem_value *ucontrol)
-+{
-+	struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
-+	struct rpi_cirrus_priv *priv = snd_soc_card_get_drvdata(card);
-+
-+	ucontrol->value.enumerated.item[0] = priv->min_rate_idx;
-+	return 0;
-+}
-+
-+static int rpi_cirrus_min_rate_put(struct snd_kcontrol *kcontrol,
-+	struct snd_ctl_elem_value *ucontrol)
-+{
-+	struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
-+	struct rpi_cirrus_priv *priv = snd_soc_card_get_drvdata(card);
-+	int changed = 0;
-+
-+	if (priv->min_rate_idx != ucontrol->value.enumerated.item[0]) {
-+		changed = 1;
-+		priv->min_rate_idx = ucontrol->value.enumerated.item[0];
-+	}
-+
-+	return changed;
-+}
-+
-+static struct rate_info max_rates[] = {
-+	{     0, "off"},
-+	{ 48000, "48kHz"},
-+	{ 96000, "96kHz"}
-+};
-+
-+#define NUM_MAX_RATES ARRAY_SIZE(max_rates)
-+
-+static int rpi_cirrus_max_rate_info(struct snd_kcontrol *kcontrol,
-+	struct snd_ctl_elem_info *uinfo)
-+{
-+	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-+	uinfo->count = 1;
-+	uinfo->value.enumerated.items = NUM_MAX_RATES;
-+	if (uinfo->value.enumerated.item >= NUM_MAX_RATES)
-+		uinfo->value.enumerated.item = NUM_MAX_RATES - 1;
-+	strcpy(uinfo->value.enumerated.name,
-+		max_rates[uinfo->value.enumerated.item].text);
-+	return 0;
-+}
-+
-+static int rpi_cirrus_max_rate_get(struct snd_kcontrol *kcontrol,
-+	struct snd_ctl_elem_value *ucontrol)
-+{
-+	struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
-+	struct rpi_cirrus_priv *priv = snd_soc_card_get_drvdata(card);
-+
-+	ucontrol->value.enumerated.item[0] = priv->max_rate_idx;
-+	return 0;
-+}
-+
-+static int rpi_cirrus_max_rate_put(struct snd_kcontrol *kcontrol,
-+	struct snd_ctl_elem_value *ucontrol)
-+{
-+	struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
-+	struct rpi_cirrus_priv *priv = snd_soc_card_get_drvdata(card);
-+	int changed = 0;
-+
-+	if (priv->max_rate_idx != ucontrol->value.enumerated.item[0]) {
-+		changed = 1;
-+		priv->max_rate_idx = ucontrol->value.enumerated.item[0];
-+	}
-+
-+	return changed;
-+}
-+
-+static int rpi_cirrus_spdif_info(struct snd_kcontrol *kcontrol,
-+	struct snd_ctl_elem_info *uinfo)
-+{
-+	uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
-+	uinfo->count = 1;
-+	return 0;
-+}
-+
-+static int rpi_cirrus_spdif_playback_get(struct snd_kcontrol *kcontrol,
-+	struct snd_ctl_elem_value *ucontrol)
-+{
-+	struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
-+	struct rpi_cirrus_priv *priv = snd_soc_card_get_drvdata(card);
-+	int i;
-+
-+	for (i = 0; i < 4; i++)
-+		ucontrol->value.iec958.status[i] = priv->iec958_status[i];
-+
-+	return 0;
-+}
-+
-+static int rpi_cirrus_spdif_playback_put(struct snd_kcontrol *kcontrol,
-+	struct snd_ctl_elem_value *ucontrol)
-+{
-+	struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
-+	struct snd_soc_component *wm8804_component =
-+		asoc_rtd_to_codec(get_wm8804_runtime(card), 0)->component;
-+	struct rpi_cirrus_priv *priv = snd_soc_card_get_drvdata(card);
-+	unsigned char *stat = priv->iec958_status;
-+	unsigned char *ctrl_stat = ucontrol->value.iec958.status;
-+	unsigned int mask;
-+	int i, changed = 0;
-+
-+	for (i = 0; i < 4; i++) {
-+		mask = (i == 3) ? 0x3f : 0xff;
-+		if ((ctrl_stat[i] & mask) != (stat[i] & mask)) {
-+			changed = 1;
-+			stat[i] = ctrl_stat[i] & mask;
-+			snd_soc_component_update_bits(wm8804_component,
-+				WM8804_SPDTX1 + i, mask, stat[i]);
-+		}
-+	}
-+
-+	return changed;
-+}
-+
-+static int rpi_cirrus_spdif_mask_get(struct snd_kcontrol *kcontrol,
-+	struct snd_ctl_elem_value *ucontrol)
-+{
-+	ucontrol->value.iec958.status[0] = 0xff;
-+	ucontrol->value.iec958.status[1] = 0xff;
-+	ucontrol->value.iec958.status[2] = 0xff;
-+	ucontrol->value.iec958.status[3] = 0x3f;
-+
-+	return 0;
-+}
-+
-+static int rpi_cirrus_spdif_capture_get(struct snd_kcontrol *kcontrol,
-+	struct snd_ctl_elem_value *ucontrol)
-+{
-+	struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
-+	struct snd_soc_component *wm8804_component =
-+		asoc_rtd_to_codec(get_wm8804_runtime(card), 0)->component;
-+	unsigned int val, mask;
-+	int i;
-+
-+	for (i = 0; i < 4; i++) {
-+		val = snd_soc_component_read(wm8804_component,
-+			WM8804_RXCHAN1 + i);
-+		mask = (i == 3) ? 0x3f : 0xff;
-+		ucontrol->value.iec958.status[i] = val & mask;
-+	}
-+
-+	return 0;
-+}
-+
-+#define SPDIF_FLAG_CTRL(desc, reg, bit, invert) \
-+{ \
-+		.access =  SNDRV_CTL_ELEM_ACCESS_READ \
-+			   | SNDRV_CTL_ELEM_ACCESS_VOLATILE, \
-+		.iface =   SNDRV_CTL_ELEM_IFACE_MIXER, \
-+		.name =    SNDRV_CTL_NAME_IEC958("", CAPTURE, NONE) \
-+				desc " Flag", \
-+		.info =    snd_ctl_boolean_mono_info, \
-+		.get =     rpi_cirrus_spdif_status_flag_get, \
-+		.private_value = \
-+			(bit) | ((reg) << 8) | ((invert) << 16) \
-+}
-+
-+static int rpi_cirrus_spdif_status_flag_get(struct snd_kcontrol *kcontrol,
-+	struct snd_ctl_elem_value *ucontrol)
-+{
-+	struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
-+	struct snd_soc_component *wm8804_component =
-+		asoc_rtd_to_codec(get_wm8804_runtime(card), 0)->component;
-+
-+	unsigned int bit = kcontrol->private_value & 0xff;
-+	unsigned int reg = (kcontrol->private_value >> 8) & 0xff;
-+	unsigned int invert = (kcontrol->private_value >> 16) & 0xff;
-+	unsigned int val;
-+	bool flag;
-+
-+	val = snd_soc_component_read(wm8804_component, reg);
-+
-+	flag = val & (1 << bit);
-+
-+	ucontrol->value.integer.value[0] = invert ? !flag : flag;
-+
-+	return 0;
-+}
-+
-+static const char * const recovered_frequency_texts[] = {
-+	"176.4/192 kHz",
-+	"88.2/96 kHz",
-+	"44.1/48 kHz",
-+	"32 kHz"
-+};
-+
-+#define NUM_RECOVERED_FREQUENCIES \
-+	ARRAY_SIZE(recovered_frequency_texts)
-+
-+static int rpi_cirrus_recovered_frequency_info(struct snd_kcontrol *kcontrol,
-+	struct snd_ctl_elem_info *uinfo)
-+{
-+	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-+	uinfo->count = 1;
-+	uinfo->value.enumerated.items = NUM_RECOVERED_FREQUENCIES;
-+	if (uinfo->value.enumerated.item >= NUM_RECOVERED_FREQUENCIES)
-+		uinfo->value.enumerated.item = NUM_RECOVERED_FREQUENCIES - 1;
-+	strcpy(uinfo->value.enumerated.name,
-+		recovered_frequency_texts[uinfo->value.enumerated.item]);
-+	return 0;
-+}
-+
-+static int rpi_cirrus_recovered_frequency_get(struct snd_kcontrol *kcontrol,
-+	struct snd_ctl_elem_value *ucontrol)
-+{
-+	struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
-+	struct snd_soc_component *wm8804_component =
-+		asoc_rtd_to_codec(get_wm8804_runtime(card), 0)->component;
-+	unsigned int val;
-+
-+	val = snd_soc_component_read(wm8804_component, WM8804_SPDSTAT);
-+
-+	ucontrol->value.enumerated.item[0] = (val >> 4) & 0x03;
-+	return 0;
-+}
-+
-+static const struct snd_kcontrol_new rpi_cirrus_controls[] = {
-+	{
-+		.iface =   SNDRV_CTL_ELEM_IFACE_MIXER,
-+		.name =    "Min Sample Rate",
-+		.info =    rpi_cirrus_min_rate_info,
-+		.get =     rpi_cirrus_min_rate_get,
-+		.put =     rpi_cirrus_min_rate_put,
-+	},
-+	{
-+		.iface =   SNDRV_CTL_ELEM_IFACE_MIXER,
-+		.name =    "Max Sample Rate",
-+		.info =    rpi_cirrus_max_rate_info,
-+		.get =     rpi_cirrus_max_rate_get,
-+		.put =     rpi_cirrus_max_rate_put,
-+	},
-+	{
-+		.iface =   SNDRV_CTL_ELEM_IFACE_MIXER,
-+		.name =    SNDRV_CTL_NAME_IEC958("", PLAYBACK, DEFAULT),
-+		.info =    rpi_cirrus_spdif_info,
-+		.get =     rpi_cirrus_spdif_playback_get,
-+		.put =     rpi_cirrus_spdif_playback_put,
-+	},
-+	{
-+		.access =  SNDRV_CTL_ELEM_ACCESS_READ
-+			   | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-+		.iface =   SNDRV_CTL_ELEM_IFACE_MIXER,
-+		.name =    SNDRV_CTL_NAME_IEC958("", CAPTURE, DEFAULT),
-+		.info =    rpi_cirrus_spdif_info,
-+		.get =     rpi_cirrus_spdif_capture_get,
-+	},
-+	{
-+		.access =  SNDRV_CTL_ELEM_ACCESS_READ,
-+		.iface =   SNDRV_CTL_ELEM_IFACE_MIXER,
-+		.name =    SNDRV_CTL_NAME_IEC958("", PLAYBACK, MASK),
-+		.info =    rpi_cirrus_spdif_info,
-+		.get =     rpi_cirrus_spdif_mask_get,
-+	},
-+	{
-+		.access =  SNDRV_CTL_ELEM_ACCESS_READ
-+			   | SNDRV_CTL_ELEM_ACCESS_VOLATILE,
-+		.iface =   SNDRV_CTL_ELEM_IFACE_MIXER,
-+		.name =    SNDRV_CTL_NAME_IEC958("", CAPTURE, NONE)
-+				"Recovered Frequency",
-+		.info =    rpi_cirrus_recovered_frequency_info,
-+		.get =     rpi_cirrus_recovered_frequency_get,
-+	},
-+	SPDIF_FLAG_CTRL("Audio", WM8804_SPDSTAT, 0, 1),
-+	SPDIF_FLAG_CTRL("Non-PCM", WM8804_SPDSTAT, 1, 0),
-+	SPDIF_FLAG_CTRL("Copyright", WM8804_SPDSTAT, 2, 1),
-+	SPDIF_FLAG_CTRL("De-Emphasis", WM8804_SPDSTAT, 3, 0),
-+	SPDIF_FLAG_CTRL("Lock", WM8804_SPDSTAT, 6, 1),
-+	SPDIF_FLAG_CTRL("Invalid", WM8804_INTSTAT, 1, 0),
-+	SPDIF_FLAG_CTRL("TransErr", WM8804_INTSTAT, 3, 0),
-+};
-+
-+static const char * const linein_micbias_texts[] = {
-+	"off", "on",
-+};
-+
-+static SOC_ENUM_SINGLE_VIRT_DECL(linein_micbias_enum,
-+	linein_micbias_texts);
-+
-+static const struct snd_kcontrol_new linein_micbias_mux =
-+	SOC_DAPM_ENUM("Route", linein_micbias_enum);
-+
-+static int rpi_cirrus_spdif_rx_enable_event(struct snd_soc_dapm_widget *w,
-+	struct snd_kcontrol *kcontrol, int event);
-+
-+const struct snd_soc_dapm_widget rpi_cirrus_dapm_widgets[] = {
-+	SND_SOC_DAPM_MIC("DMIC", NULL),
-+	SND_SOC_DAPM_MIC("Headset Mic", NULL),
-+	SND_SOC_DAPM_INPUT("Line Input"),
-+	SND_SOC_DAPM_MIC("Line Input with Micbias", NULL),
-+	SND_SOC_DAPM_MUX("Line Input Micbias", SND_SOC_NOPM, 0, 0,
-+		&linein_micbias_mux),
-+	SND_SOC_DAPM_INPUT("dummy SPDIF in"),
-+	SND_SOC_DAPM_PGA_E("dummy SPDIFRX", SND_SOC_NOPM, 0, 0, NULL, 0,
-+		rpi_cirrus_spdif_rx_enable_event,
-+		SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
-+	SND_SOC_DAPM_INPUT("Dummy Input"),
-+	SND_SOC_DAPM_OUTPUT("Dummy Output"),
-+};
-+
-+const struct snd_soc_dapm_route rpi_cirrus_dapm_routes[] = {
-+	{ "IN1L", NULL, "Headset Mic" },
-+	{ "IN1R", NULL, "Headset Mic" },
-+	{ "Headset Mic", NULL, "MICBIAS1" },
-+
-+	{ "IN2L", NULL, "DMIC" },
-+	{ "IN2R", NULL, "DMIC" },
-+	{ "DMIC", NULL, "MICBIAS2" },
-+
-+	{ "IN3L", NULL, "Line Input Micbias" },
-+	{ "IN3R", NULL, "Line Input Micbias" },
-+
-+	{ "Line Input Micbias", "off", "Line Input" },
-+	{ "Line Input Micbias", "on", "Line Input with Micbias" },
-+
-+	/* Make sure MICVDD is enabled, otherwise we get noise */
-+	{ "Line Input", NULL, "MICVDD" },
-+	{ "Line Input with Micbias", NULL, "MICBIAS3" },
-+
-+	/* Dummy routes to check whether SPDIF RX is enabled or not */
-+	{"dummy SPDIFRX", NULL, "dummy SPDIF in"},
-+	{"AIFTX", NULL, "dummy SPDIFRX"},
-+
-+	/*
-+	 * Dummy routes to keep wm5102 from staying off on
-+	 * playback/capture if all mixers are off.
-+	 */
-+	{ "Dummy Output", NULL, "AIF1RX1" },
-+	{ "Dummy Output", NULL, "AIF1RX2" },
-+	{ "AIF1TX1", NULL, "Dummy Input" },
-+	{ "AIF1TX2", NULL, "Dummy Input" },
-+};
-+
-+static int rpi_cirrus_clear_flls(struct snd_soc_card *card,
-+	struct snd_soc_component *wm5102_component) {
-+
-+	int ret1, ret2;
-+
-+	ret1 = snd_soc_component_set_pll(wm5102_component,
-+		WM5102_FLL1, ARIZONA_FLL_SRC_NONE, 0, 0);
-+	ret2 = snd_soc_component_set_pll(wm5102_component,
-+		WM5102_FLL1_REFCLK, ARIZONA_FLL_SRC_NONE, 0, 0);
-+
-+	if (ret1) {
-+		dev_warn(card->dev,
-+			"setting FLL1 to zero failed: %d\n", ret1);
-+		return ret1;
-+	}
-+	if (ret2) {
-+		dev_warn(card->dev,
-+			"setting FLL1_REFCLK to zero failed: %d\n", ret2);
-+		return ret2;
-+	}
-+	return 0;
-+}
-+
-+static int rpi_cirrus_set_fll(struct snd_soc_card *card,
-+	struct snd_soc_component *wm5102_component, unsigned int clk_freq)
-+{
-+	int ret = snd_soc_component_set_pll(wm5102_component,
-+		WM5102_FLL1,
-+		ARIZONA_CLK_SRC_MCLK1,
-+		WM8804_CLKOUT_HZ,
-+		clk_freq);
-+	if (ret)
-+		dev_err(card->dev, "Failed to set FLL1 to %d: %d\n",
-+			clk_freq, ret);
-+
-+	usleep_range(1000, 2000);
-+	return ret;
-+}
-+
-+static int rpi_cirrus_set_fll_refclk(struct snd_soc_card *card,
-+	struct snd_soc_component *wm5102_component,
-+	unsigned int clk_freq, unsigned int aif2_freq)
-+{
-+	int ret = snd_soc_component_set_pll(wm5102_component,
-+		WM5102_FLL1_REFCLK,
-+		ARIZONA_CLK_SRC_MCLK1,
-+		WM8804_CLKOUT_HZ,
-+		clk_freq);
-+	if (ret) {
-+		dev_err(card->dev,
-+			"Failed to set FLL1_REFCLK to %d: %d\n",
-+			clk_freq, ret);
-+		return ret;
-+	}
-+
-+	ret = snd_soc_component_set_pll(wm5102_component,
-+		WM5102_FLL1,
-+		ARIZONA_CLK_SRC_AIF2BCLK,
-+		aif2_freq, clk_freq);
-+	if (ret)
-+		dev_err(card->dev,
-+			"Failed to set FLL1 with Sync Clock %d to %d: %d\n",
-+			aif2_freq, clk_freq, ret);
-+
-+	usleep_range(1000, 2000);
-+	return ret;
-+}
-+
-+static int rpi_cirrus_spdif_rx_enable_event(struct snd_soc_dapm_widget *w,
-+	struct snd_kcontrol *kcontrol, int event)
-+{
-+	struct snd_soc_card *card = w->dapm->card;
-+	struct rpi_cirrus_priv *priv = snd_soc_card_get_drvdata(card);
-+	struct snd_soc_component *wm5102_component =
-+		asoc_rtd_to_codec(get_wm5102_runtime(card), 0)->component;
-+
-+	unsigned int clk_freq, aif2_freq;
-+	int ret = 0;
-+
-+	switch (event) {
-+	case SND_SOC_DAPM_POST_PMU:
-+		mutex_lock(&priv->lock);
-+
-+		/* Enable sync path in case of SPDIF capture use case */
-+
-+		clk_freq = calc_sysclk(priv->card_rate);
-+		aif2_freq = 64 * priv->card_rate;
-+
-+		dev_dbg(card->dev,
-+			"spdif_rx: changing FLL1 to use Ref Clock clk: %d spdif: %d\n",
-+			clk_freq, aif2_freq);
-+
-+		ret = rpi_cirrus_clear_flls(card, wm5102_component);
-+		if (ret) {
-+			dev_err(card->dev, "spdif_rx: failed to clear FLLs\n");
-+			goto out;
-+		}
-+
-+		ret = rpi_cirrus_set_fll_refclk(card, wm5102_component,
-+			clk_freq, aif2_freq);
-+
-+		if (ret) {
-+			dev_err(card->dev, "spdif_rx: failed to set FLLs\n");
-+			goto out;
-+		}
-+
-+		/* set to negative to indicate we're doing spdif rx */
-+		priv->fll1_freq = -clk_freq;
-+		priv->sync_path_enable = 1;
-+		break;
-+
-+	case SND_SOC_DAPM_POST_PMD:
-+		mutex_lock(&priv->lock);
-+		priv->sync_path_enable = 0;
-+		break;
-+
-+	default:
-+		return 0;
-+	}
-+
-+out:
-+	mutex_unlock(&priv->lock);
-+	return ret;
-+}
-+
-+static int rpi_cirrus_set_bias_level(struct snd_soc_card *card,
-+	struct snd_soc_dapm_context *dapm,
-+	enum snd_soc_bias_level level)
-+{
-+	struct rpi_cirrus_priv *priv = snd_soc_card_get_drvdata(card);
-+	struct snd_soc_pcm_runtime *wm5102_runtime = get_wm5102_runtime(card);
-+	struct snd_soc_component *wm5102_component =
-+		asoc_rtd_to_codec(wm5102_runtime, 0)->component;
-+
-+	int ret = 0;
-+	unsigned int clk_freq;
-+
-+	if (dapm->dev != asoc_rtd_to_codec(wm5102_runtime, 0)->dev)
-+		return 0;
-+
-+	switch (level) {
-+	case SND_SOC_BIAS_PREPARE:
-+		if (dapm->bias_level == SND_SOC_BIAS_ON)
-+			break;
-+
-+		mutex_lock(&priv->lock);
-+
-+		if (!priv->sync_path_enable) {
-+			clk_freq = calc_sysclk(priv->card_rate);
-+
-+			dev_dbg(card->dev,
-+				"set_bias: changing FLL1 from %d to %d\n",
-+				priv->fll1_freq, clk_freq);
-+
-+			ret = rpi_cirrus_set_fll(card,
-+				wm5102_component, clk_freq);
-+			if (ret)
-+				dev_err(card->dev,
-+					"set_bias: Failed to set FLL1\n");
-+			else
-+				priv->fll1_freq = clk_freq;
-+		}
-+		mutex_unlock(&priv->lock);
-+		break;
-+	default:
-+		break;
-+	}
-+
-+	return ret;
-+}
-+
-+static int rpi_cirrus_set_bias_level_post(struct snd_soc_card *card,
-+	struct snd_soc_dapm_context *dapm,
-+	enum snd_soc_bias_level level)
-+{
-+	struct rpi_cirrus_priv *priv = snd_soc_card_get_drvdata(card);
-+	struct snd_soc_pcm_runtime *wm5102_runtime = get_wm5102_runtime(card);
-+	struct snd_soc_component *wm5102_component =
-+		asoc_rtd_to_codec(wm5102_runtime, 0)->component;
-+
-+	if (dapm->dev != asoc_rtd_to_codec(wm5102_runtime, 0)->dev)
-+		return 0;
-+
-+	switch (level) {
-+	case SND_SOC_BIAS_STANDBY:
-+		mutex_lock(&priv->lock);
-+
-+		dev_dbg(card->dev,
-+			"set_bias_post: changing FLL1 from %d to off\n",
-+				priv->fll1_freq);
-+
-+		if (rpi_cirrus_clear_flls(card, wm5102_component))
-+			dev_err(card->dev,
-+				"set_bias_post: failed to clear FLLs\n");
-+		else
-+			priv->fll1_freq = 0;
-+
-+		mutex_unlock(&priv->lock);
-+
-+		break;
-+	default:
-+		break;
-+	}
-+
-+	return 0;
-+}
-+
-+static int rpi_cirrus_set_wm8804_pll(struct snd_soc_card *card,
-+	struct snd_soc_dai *wm8804_dai, unsigned int rate)
-+{
-+	int ret;
-+
-+	/* use 256fs */
-+	unsigned int clk_freq = rate * 256;
-+
-+	ret = snd_soc_dai_set_pll(wm8804_dai, 0, 0,
-+		WM8804_CLKOUT_HZ, clk_freq);
-+	if (ret) {
-+		dev_err(card->dev,
-+			"Failed to set WM8804 PLL to %d: %d\n", clk_freq, ret);
-+		return ret;
-+	}
-+
-+	/* Set MCLK as PLL Output */
-+	ret = snd_soc_dai_set_sysclk(wm8804_dai,
-+		WM8804_TX_CLKSRC_PLL, clk_freq, 0);
-+	if (ret) {
-+		dev_err(card->dev,
-+			"Failed to set MCLK as PLL Output: %d\n", ret);
-+		return ret;
-+	}
-+
-+	return ret;
-+}
-+
-+static int rpi_cirrus_startup(struct snd_pcm_substream *substream)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_card *card = rtd->card;
-+	struct rpi_cirrus_priv *priv = snd_soc_card_get_drvdata(card);
-+	unsigned int min_rate = min_rates[priv->min_rate_idx].value;
-+	unsigned int max_rate = max_rates[priv->max_rate_idx].value;
-+
-+	if (min_rate || max_rate) {
-+		if (max_rate == 0)
-+			max_rate = UINT_MAX;
-+
-+		dev_dbg(card->dev,
-+			"startup: limiting rate to %u-%u\n",
-+			min_rate, max_rate);
-+
-+		snd_pcm_hw_constraint_minmax(substream->runtime,
-+			SNDRV_PCM_HW_PARAM_RATE, min_rate, max_rate);
-+	}
-+
-+	return 0;
-+}
-+
-+static struct snd_soc_pcm_stream rpi_cirrus_dai_link2_params = {
-+	.formats = SNDRV_PCM_FMTBIT_S24_LE,
-+	.channels_min = 2,
-+	.channels_max = 2,
-+	.rate_min = RPI_CIRRUS_DEFAULT_RATE,
-+	.rate_max = RPI_CIRRUS_DEFAULT_RATE,
-+};
-+
-+static int rpi_cirrus_hw_params(struct snd_pcm_substream *substream,
-+	struct snd_pcm_hw_params *params)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_card *card = rtd->card;
-+	struct rpi_cirrus_priv *priv = snd_soc_card_get_drvdata(card);
-+	struct snd_soc_dai *bcm_i2s_dai = asoc_rtd_to_cpu(rtd, 0);
-+	struct snd_soc_component *wm5102_component = asoc_rtd_to_codec(rtd, 0)->component;
-+	struct snd_soc_dai *wm8804_dai = asoc_rtd_to_codec(get_wm8804_runtime(card), 0);
-+
-+	int ret;
-+
-+	unsigned int width = snd_pcm_format_physical_width(
-+		params_format(params));
-+	unsigned int rate = params_rate(params);
-+	unsigned int clk_freq = calc_sysclk(rate);
-+
-+	mutex_lock(&priv->lock);
-+
-+	dev_dbg(card->dev, "hw_params: setting rate to %d\n", rate);
-+
-+	ret = snd_soc_dai_set_bclk_ratio(bcm_i2s_dai, 2 * width);
-+	if (ret) {
-+		dev_err(card->dev, "set_bclk_ratio failed: %d\n", ret);
-+		goto out;
-+	}
-+
-+	ret = snd_soc_dai_set_tdm_slot(asoc_rtd_to_codec(rtd, 0), 0x03, 0x03, 2, width);
-+	if (ret) {
-+		dev_err(card->dev, "set_tdm_slot failed: %d\n", ret);
-+		goto out;
-+	}
-+
-+	/* WM8804 supports sample rates from 32k only */
-+	if (rate >= 32000) {
-+		ret = rpi_cirrus_set_wm8804_pll(card, wm8804_dai, rate);
-+		if (ret)
-+			goto out;
-+	}
-+
-+	ret = snd_soc_component_set_sysclk(wm5102_component,
-+		ARIZONA_CLK_SYSCLK,
-+		ARIZONA_CLK_SRC_FLL1,
-+		clk_freq,
-+		SND_SOC_CLOCK_IN);
-+	if (ret) {
-+		dev_err(card->dev, "Failed to set SYSCLK: %d\n", ret);
-+		goto out;
-+	}
-+
-+	if ((priv->fll1_freq > 0) && (priv->fll1_freq != clk_freq)) {
-+		dev_dbg(card->dev,
-+			"hw_params: changing FLL1 from %d to %d\n",
-+			priv->fll1_freq, clk_freq);
-+
-+		if (rpi_cirrus_clear_flls(card, wm5102_component)) {
-+			dev_err(card->dev, "hw_params: failed to clear FLLs\n");
-+			goto out;
-+		}
-+
-+		if (rpi_cirrus_set_fll(card, wm5102_component, clk_freq)) {
-+			dev_err(card->dev, "hw_params: failed to set FLL\n");
-+			goto out;
-+		}
-+
-+		priv->fll1_freq = clk_freq;
-+	}
-+
-+	priv->card_rate = rate;
-+	rpi_cirrus_dai_link2_params.rate_min = rate;
-+	rpi_cirrus_dai_link2_params.rate_max = rate;
-+
-+	priv->params_set |= 1 << substream->stream;
-+
-+out:
-+	mutex_unlock(&priv->lock);
-+
-+	return ret;
-+}
-+
-+static int rpi_cirrus_hw_free(struct snd_pcm_substream *substream)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_card *card = rtd->card;
-+	struct rpi_cirrus_priv *priv = snd_soc_card_get_drvdata(card);
-+	struct snd_soc_component *wm5102_component = asoc_rtd_to_codec(rtd, 0)->component;
-+	int ret;
-+	unsigned int old_params_set = priv->params_set;
-+
-+	priv->params_set &= ~(1 << substream->stream);
-+
-+	/* disable sysclk if this was the last open stream */
-+	if (priv->params_set == 0 && old_params_set) {
-+		dev_dbg(card->dev,
-+			"hw_free: Setting SYSCLK to Zero\n");
-+
-+		ret = snd_soc_component_set_sysclk(wm5102_component,
-+			ARIZONA_CLK_SYSCLK,
-+			ARIZONA_CLK_SRC_FLL1,
-+			0,
-+			SND_SOC_CLOCK_IN);
-+		if (ret)
-+			dev_err(card->dev,
-+				"hw_free: Failed to set SYSCLK to Zero: %d\n",
-+				ret);
-+	}
-+	return 0;
-+}
-+
-+static int rpi_cirrus_init_wm5102(struct snd_soc_pcm_runtime *rtd)
-+{
-+	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
-+	int ret;
-+
-+	/* no 32kHz input, derive it from sysclk if needed  */
-+	snd_soc_component_update_bits(component,
-+			ARIZONA_CLOCK_32K_1, ARIZONA_CLK_32K_SRC_MASK, 2);
-+
-+	if (rpi_cirrus_clear_flls(rtd->card, component))
-+		dev_warn(rtd->card->dev,
-+			"init_wm5102: failed to clear FLLs\n");
-+
-+	ret = snd_soc_component_set_sysclk(component,
-+		ARIZONA_CLK_SYSCLK, ARIZONA_CLK_SRC_FLL1,
-+		0, SND_SOC_CLOCK_IN);
-+	if (ret) {
-+		dev_err(rtd->card->dev,
-+			"Failed to set SYSCLK to Zero: %d\n", ret);
-+		return ret;
-+	}
-+
-+	return 0;
-+}
-+
-+static int rpi_cirrus_init_wm8804(struct snd_soc_pcm_runtime *rtd)
-+{
-+	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
-+	struct snd_soc_component *component = codec_dai->component;
-+	struct snd_soc_card *card = rtd->card;
-+	struct rpi_cirrus_priv *priv = snd_soc_card_get_drvdata(card);
-+	unsigned int val, mask;
-+	int i, ret;
-+
-+	for (i = 0; i < 4; i++) {
-+		val = snd_soc_component_read(component,
-+			WM8804_SPDTX1 + i);
-+		mask = (i == 3) ? 0x3f : 0xff;
-+		priv->iec958_status[i] = val & mask;
-+	}
-+
-+	/* Setup for 256fs */
-+	ret = snd_soc_dai_set_clkdiv(codec_dai,
-+		WM8804_MCLK_DIV, WM8804_MCLKDIV_256FS);
-+	if (ret) {
-+		dev_err(card->dev,
-+			"init_wm8804: Failed to set MCLK_DIV to 256fs: %d\n",
-+			ret);
-+		return ret;
-+	}
-+
-+	/* Output OSC on CLKOUT */
-+	ret = snd_soc_dai_set_sysclk(codec_dai,
-+		WM8804_CLKOUT_SRC_OSCCLK, WM8804_CLKOUT_HZ, 0);
-+	if (ret)
-+		dev_err(card->dev,
-+			"init_wm8804: Failed to set CLKOUT as OSC Frequency: %d\n",
-+			ret);
-+
-+	/* Init PLL with default samplerate */
-+	ret = rpi_cirrus_set_wm8804_pll(card, codec_dai,
-+		RPI_CIRRUS_DEFAULT_RATE);
-+	if (ret)
-+		dev_err(card->dev,
-+			"init_wm8804: Failed to setup PLL for %dHz: %d\n",
-+			RPI_CIRRUS_DEFAULT_RATE, ret);
-+
-+	return ret;
-+}
-+
-+static struct snd_soc_ops rpi_cirrus_ops = {
-+	.startup = rpi_cirrus_startup,
-+	.hw_params = rpi_cirrus_hw_params,
-+	.hw_free = rpi_cirrus_hw_free,
-+};
-+
-+SND_SOC_DAILINK_DEFS(wm5102,
-+     DAILINK_COMP_ARRAY(COMP_EMPTY()),
-+     DAILINK_COMP_ARRAY(COMP_CODEC("wm5102-codec", "wm5102-aif1")),
-+     DAILINK_COMP_ARRAY(COMP_EMPTY()));
-+
-+SND_SOC_DAILINK_DEFS(wm8804,
-+     DAILINK_COMP_ARRAY(COMP_CPU("wm5102-aif2")),
-+     DAILINK_COMP_ARRAY(COMP_CODEC("wm8804.1-003b", "wm8804-spdif")));
-+
-+static struct snd_soc_dai_link rpi_cirrus_dai[] = {
-+	[DAI_WM5102] = {
-+		.name		= "WM5102",
-+		.stream_name	= "WM5102 AiFi",
-+		.dai_fmt	=   SND_SOC_DAIFMT_I2S
-+				  | SND_SOC_DAIFMT_NB_NF
-+				  | SND_SOC_DAIFMT_CBM_CFM,
-+		.ops		= &rpi_cirrus_ops,
-+		.init		= rpi_cirrus_init_wm5102,
-+		SND_SOC_DAILINK_REG(wm5102),
-+	},
-+	[DAI_WM8804] = {
-+		.name		= "WM5102 SPDIF",
-+		.stream_name	= "SPDIF Tx/Rx",
-+		.dai_fmt	=   SND_SOC_DAIFMT_I2S
-+				  | SND_SOC_DAIFMT_NB_NF
-+				  | SND_SOC_DAIFMT_CBM_CFM,
-+		.ignore_suspend = 1,
-+		.params		= &rpi_cirrus_dai_link2_params,
-+		.init		= rpi_cirrus_init_wm8804,
-+		SND_SOC_DAILINK_REG(wm8804),
-+	},
-+};
-+
-+
-+static int rpi_cirrus_late_probe(struct snd_soc_card *card)
-+{
-+	struct rpi_cirrus_priv *priv = snd_soc_card_get_drvdata(card);
-+	struct snd_soc_pcm_runtime *wm5102_runtime = get_wm5102_runtime(card);
-+	struct snd_soc_pcm_runtime *wm8804_runtime = get_wm8804_runtime(card);
-+	int ret;
-+
-+	dev_dbg(card->dev, "iec958_bits: %02x %02x %02x %02x\n",
-+		priv->iec958_status[0],
-+		priv->iec958_status[1],
-+		priv->iec958_status[2],
-+		priv->iec958_status[3]);
-+
-+	ret = snd_soc_dai_set_sysclk(
-+		asoc_rtd_to_codec(wm5102_runtime, 0), ARIZONA_CLK_SYSCLK, 0, 0);
-+	if (ret) {
-+		dev_err(card->dev,
-+			"Failed to set WM5102 codec dai clk domain: %d\n", ret);
-+		return ret;
-+	}
-+
-+	ret = snd_soc_dai_set_sysclk(
-+		asoc_rtd_to_cpu(wm8804_runtime, 0), ARIZONA_CLK_SYSCLK, 0, 0);
-+	if (ret)
-+		dev_err(card->dev,
-+			"Failed to set WM8804 codec dai clk domain: %d\n", ret);
-+
-+	return ret;
-+}
-+
-+/* audio machine driver */
-+static struct snd_soc_card rpi_cirrus_card = {
-+	.name			= "RPi-Cirrus",
-+	.driver_name		= "RPiCirrus",
-+	.owner			= THIS_MODULE,
-+	.dai_link		= rpi_cirrus_dai,
-+	.num_links		= ARRAY_SIZE(rpi_cirrus_dai),
-+	.late_probe		= rpi_cirrus_late_probe,
-+	.controls		= rpi_cirrus_controls,
-+	.num_controls		= ARRAY_SIZE(rpi_cirrus_controls),
-+	.dapm_widgets		= rpi_cirrus_dapm_widgets,
-+	.num_dapm_widgets	= ARRAY_SIZE(rpi_cirrus_dapm_widgets),
-+	.dapm_routes		= rpi_cirrus_dapm_routes,
-+	.num_dapm_routes	= ARRAY_SIZE(rpi_cirrus_dapm_routes),
-+	.set_bias_level		= rpi_cirrus_set_bias_level,
-+	.set_bias_level_post	= rpi_cirrus_set_bias_level_post,
-+};
-+
-+static int rpi_cirrus_probe(struct platform_device *pdev)
-+{
-+	int ret = 0;
-+	struct rpi_cirrus_priv *priv;
-+	struct device_node *i2s_node;
-+
-+	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
-+	if (!priv)
-+		return -ENOMEM;
-+
-+	priv->min_rate_idx = 1; /* min samplerate 32kHz */
-+	priv->card_rate = RPI_CIRRUS_DEFAULT_RATE;
-+
-+	mutex_init(&priv->lock);
-+
-+	snd_soc_card_set_drvdata(&rpi_cirrus_card, priv);
-+
-+	if (!pdev->dev.of_node)
-+		return -ENODEV;
-+
-+	i2s_node = of_parse_phandle(
-+			pdev->dev.of_node, "i2s-controller", 0);
-+	if (!i2s_node) {
-+		dev_err(&pdev->dev, "i2s-controller missing in DT\n");
-+		return -ENODEV;
-+	}
-+
-+	rpi_cirrus_dai[DAI_WM5102].cpus->of_node = i2s_node;
-+	rpi_cirrus_dai[DAI_WM5102].platforms->of_node = i2s_node;
-+
-+	rpi_cirrus_card.dev = &pdev->dev;
-+
-+	ret = devm_snd_soc_register_card(&pdev->dev, &rpi_cirrus_card);
-+	if (ret) {
-+		if (ret == -EPROBE_DEFER)
-+			dev_dbg(&pdev->dev,
-+				"register card requested probe deferral\n");
-+		else
-+			dev_err(&pdev->dev,
-+				"Failed to register card: %d\n", ret);
-+	}
-+
-+	return ret;
-+}
-+
-+static const struct of_device_id rpi_cirrus_of_match[] = {
-+	{ .compatible = "wlf,rpi-cirrus", },
-+	{},
-+};
-+MODULE_DEVICE_TABLE(of, rpi_cirrus_of_match);
-+
-+static struct platform_driver rpi_cirrus_driver = {
-+	.driver	= {
-+		.name   = "snd-rpi-cirrus",
-+		.of_match_table = of_match_ptr(rpi_cirrus_of_match),
-+	},
-+	.probe	= rpi_cirrus_probe,
-+};
-+
-+module_platform_driver(rpi_cirrus_driver);
-+
-+MODULE_AUTHOR("Matthias Reichl <hias@horus.com>");
-+MODULE_DESCRIPTION("ASoC driver for Cirrus Logic Audio Card");
-+MODULE_LICENSE("GPL");
---- /dev/null
-+++ b/sound/soc/bcm/rpi-proto.c
-@@ -0,0 +1,147 @@
-+/*
-+ * ASoC driver for PROTO AudioCODEC (with a WM8731)
-+ * connected to a Raspberry Pi
-+ *
-+ * Author:      Florian Meier, <koalo@koalo.de>
-+ *	      Copyright 2013
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+
-+#include <sound/core.h>
-+#include <sound/pcm.h>
-+#include <sound/soc.h>
-+#include <sound/jack.h>
-+
-+#include "../codecs/wm8731.h"
-+
-+static const unsigned int wm8731_rates_12288000[] = {
-+	8000, 32000, 48000, 96000,
-+};
-+
-+static struct snd_pcm_hw_constraint_list wm8731_constraints_12288000 = {
-+	.list = wm8731_rates_12288000,
-+	.count = ARRAY_SIZE(wm8731_rates_12288000),
-+};
-+
-+static int snd_rpi_proto_startup(struct snd_pcm_substream *substream)
-+{
-+	/* Setup constraints, because there is a 12.288 MHz XTAL on the board */
-+	snd_pcm_hw_constraint_list(substream->runtime, 0,
-+				SNDRV_PCM_HW_PARAM_RATE,
-+				&wm8731_constraints_12288000);
-+	return 0;
-+}
-+
-+static int snd_rpi_proto_hw_params(struct snd_pcm_substream *substream,
-+				       struct snd_pcm_hw_params *params)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
-+	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
-+	int sysclk = 12288000; /* This is fixed on this board */
-+
-+	/* Set proto bclk */
-+	int ret = snd_soc_dai_set_bclk_ratio(cpu_dai,32*2);
-+	if (ret < 0){
-+		dev_err(rtd->card->dev,
-+				"Failed to set BCLK ratio %d\n", ret);
-+		return ret;
-+	}
-+
-+	/* Set proto sysclk */
-+	ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_XTAL,
-+			sysclk, SND_SOC_CLOCK_IN);
-+	if (ret < 0) {
-+		dev_err(rtd->card->dev,
-+				"Failed to set WM8731 SYSCLK: %d\n", ret);
-+		return ret;
-+	}
-+
-+	return 0;
-+}
-+
-+/* machine stream operations */
-+static struct snd_soc_ops snd_rpi_proto_ops = {
-+	.startup = snd_rpi_proto_startup,
-+	.hw_params = snd_rpi_proto_hw_params,
-+};
-+
-+SND_SOC_DAILINK_DEFS(rpi_proto,
-+	DAILINK_COMP_ARRAY(COMP_CPU("bcm2708-i2s.0")),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("wm8731.1-001a", "wm8731-hifi")),
-+	DAILINK_COMP_ARRAY(COMP_PLATFORM("bcm2708-i2s.0")));
-+
-+static struct snd_soc_dai_link snd_rpi_proto_dai[] = {
-+{
-+	.name		= "WM8731",
-+	.stream_name	= "WM8731 HiFi",
-+	.dai_fmt	= SND_SOC_DAIFMT_I2S
-+				| SND_SOC_DAIFMT_NB_NF
-+				| SND_SOC_DAIFMT_CBM_CFM,
-+	.ops		= &snd_rpi_proto_ops,
-+	SND_SOC_DAILINK_REG(rpi_proto),
-+},
-+};
-+
-+/* audio machine driver */
-+static struct snd_soc_card snd_rpi_proto = {
-+	.name		= "snd_rpi_proto",
-+	.owner		= THIS_MODULE,
-+	.dai_link	= snd_rpi_proto_dai,
-+	.num_links	= ARRAY_SIZE(snd_rpi_proto_dai),
-+};
-+
-+static int snd_rpi_proto_probe(struct platform_device *pdev)
-+{
-+	int ret = 0;
-+
-+	snd_rpi_proto.dev = &pdev->dev;
-+
-+	if (pdev->dev.of_node) {
-+		struct device_node *i2s_node;
-+		struct snd_soc_dai_link *dai = &snd_rpi_proto_dai[0];
-+		i2s_node = of_parse_phandle(pdev->dev.of_node,
-+				            "i2s-controller", 0);
-+
-+		if (i2s_node) {
-+			dai->cpus->dai_name = NULL;
-+			dai->cpus->of_node = i2s_node;
-+			dai->platforms->name = NULL;
-+			dai->platforms->of_node = i2s_node;
-+		}
-+	}
-+
-+	ret = devm_snd_soc_register_card(&pdev->dev, &snd_rpi_proto);
-+	if (ret && ret != -EPROBE_DEFER)
-+		dev_err(&pdev->dev,
-+				"snd_soc_register_card() failed: %d\n", ret);
-+
-+	return ret;
-+}
-+
-+static const struct of_device_id snd_rpi_proto_of_match[] = {
-+	{ .compatible = "rpi,rpi-proto", },
-+	{},
-+};
-+MODULE_DEVICE_TABLE(of, snd_rpi_proto_of_match);
-+
-+static struct platform_driver snd_rpi_proto_driver = {
-+	.driver = {
-+		.name   = "snd-rpi-proto",
-+		.owner  = THIS_MODULE,
-+		.of_match_table = snd_rpi_proto_of_match,
-+	},
-+	.probe	  = snd_rpi_proto_probe,
-+};
-+
-+module_platform_driver(snd_rpi_proto_driver);
-+
-+MODULE_AUTHOR("Florian Meier");
-+MODULE_DESCRIPTION("ASoC Driver for Raspberry Pi connected to PROTO board (WM8731)");
-+MODULE_LICENSE("GPL");
---- /dev/null
-+++ b/sound/soc/bcm/rpi-simple-soundcard.c
-@@ -0,0 +1,487 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * rpi-simple-soundcard.c -- ALSA SoC Raspberry Pi soundcard.
-+ *
-+ * Copyright (C) 2018 Raspberry Pi.
-+ *
-+ * Authors: Tim Gover <tim.gover@raspberrypi.org>
-+ *
-+ * Based on code:
-+ * hifiberry_amp.c, hifiberry_dac.c, rpi-dac.c
-+ * by Florian Meier <florian.meier@koalo.de>
-+ *
-+ * googlevoicehat-soundcard.c
-+ * by Peter Malkin <petermalkin@google.com>
-+ *
-+ * adau1977-adc.c
-+ * by Andrey Grodzovsky <andrey2805@gmail.com>
-+ *
-+ * merus-amp.c
-+ * by Ariel Muszkat <ariel.muszkat@gmail.com>
-+ *		Jorgen Kragh Jakobsen <jorgen.kraghjakobsen@infineon.com>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/gpio/consumer.h>
-+
-+#include <sound/core.h>
-+#include <sound/pcm.h>
-+#include <sound/pcm_params.h>
-+#include <sound/soc.h>
-+
-+/* Parameters for generic RPI functions */
-+struct snd_rpi_simple_drvdata {
-+	struct snd_soc_dai_link *dai;
-+	const char* card_name;
-+	unsigned int fixed_bclk_ratio;
-+};
-+
-+static struct snd_soc_card snd_rpi_simple = {
-+	.driver_name  = "RPi-simple",
-+	.owner        = THIS_MODULE,
-+	.dai_link     = NULL,
-+	.num_links    = 1, /* Only a single DAI supported at the moment */
-+};
-+
-+static int snd_rpi_simple_init(struct snd_soc_pcm_runtime *rtd)
-+{
-+	struct snd_rpi_simple_drvdata *drvdata =
-+		snd_soc_card_get_drvdata(rtd->card);
-+	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
-+
-+	if (drvdata->fixed_bclk_ratio > 0)
-+		return snd_soc_dai_set_bclk_ratio(cpu_dai,
-+				drvdata->fixed_bclk_ratio);
-+
-+	return 0;
-+}
-+
-+static int pifi_mini_210_init(struct snd_soc_pcm_runtime *rtd)
-+{
-+	struct snd_soc_component *dac;
-+	struct gpio_desc *pdn_gpio, *rst_gpio;
-+	struct snd_soc_dai *codec_dai;
-+	int ret;
-+
-+	snd_rpi_simple_init(rtd);
-+	codec_dai = asoc_rtd_to_codec(rtd, 0);
-+
-+	dac = codec_dai[0].component;
-+
-+	pdn_gpio = devm_gpiod_get_optional(snd_rpi_simple.dev, "pdn",
-+						GPIOD_OUT_LOW);
-+	if (IS_ERR(pdn_gpio)) {
-+		ret = PTR_ERR(pdn_gpio);
-+		dev_err(snd_rpi_simple.dev, "failed to get pdn gpio: %d\n", ret);
-+		return ret;
-+	}
-+
-+	rst_gpio = devm_gpiod_get_optional(snd_rpi_simple.dev, "rst",
-+						GPIOD_OUT_LOW);
-+	if (IS_ERR(rst_gpio)) {
-+		ret = PTR_ERR(rst_gpio);
-+		dev_err(snd_rpi_simple.dev, "failed to get rst gpio: %d\n", ret);
-+		return ret;
-+	}
-+
-+	// Set up cards - pulse power down and reset first, then
-+	// set up according to datasheet
-+	gpiod_set_value_cansleep(pdn_gpio, 1);
-+	gpiod_set_value_cansleep(rst_gpio, 1);
-+	usleep_range(1000, 10000);
-+	gpiod_set_value_cansleep(pdn_gpio, 0);
-+	usleep_range(20000, 30000);
-+	gpiod_set_value_cansleep(rst_gpio, 0);
-+	usleep_range(20000, 30000);
-+
-+	// Oscillator trim
-+	snd_soc_component_write(dac, 0x1b, 0);
-+	usleep_range(60000, 80000);
-+
-+	// MCLK at 64fs, sample rate 44.1 or 48kHz
-+	snd_soc_component_write(dac, 0x00, 0x60);
-+
-+	// Set up for BTL - AD/BD mode - AD is 0x00107772, BD is 0x00987772
-+	snd_soc_component_write(dac, 0x20, 0x00107772);
-+
-+	// End mute
-+	snd_soc_component_write(dac, 0x05, 0x00);
-+
-+	return 0;
-+}
-+
-+static int snd_rpi_simple_hw_params(struct snd_pcm_substream *substream,
-+		struct snd_pcm_hw_params *params)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
-+	struct snd_rpi_simple_drvdata *drvdata;
-+	unsigned int sample_bits;
-+
-+	drvdata = snd_soc_card_get_drvdata(rtd->card);
-+
-+	if (drvdata->fixed_bclk_ratio > 0)
-+		return 0; // BCLK is configured in .init
-+
-+	/* The simple drivers just set the bclk_ratio to sample_bits * 2 so
-+	 * hard-code this for now. More complex drivers could just replace
-+	 * the hw_params routine.
-+	 */
-+	sample_bits = snd_pcm_format_physical_width(params_format(params));
-+	return snd_soc_dai_set_bclk_ratio(cpu_dai, sample_bits * 2);
-+}
-+
-+static struct snd_soc_ops snd_rpi_simple_ops = {
-+	.hw_params = snd_rpi_simple_hw_params,
-+};
-+
-+static int snd_merus_amp_hw_params(struct snd_pcm_substream *substream,
-+		struct snd_pcm_hw_params *params)
-+{
-+	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
-+	int rate;
-+
-+	rate = params_rate(params);
-+	if (rate > 48000) {
-+		dev_err(rtd->card->dev,
-+		"Unsupported samplerate %d\n",
-+		rate);
-+		return -EINVAL;
-+	}
-+	return 0;
-+}
-+
-+static struct snd_soc_ops snd_merus_amp_ops = {
-+	.hw_params = snd_merus_amp_hw_params,
-+};
-+
-+enum adau1977_clk_id {
-+	ADAU1977_SYSCLK,
-+};
-+
-+enum adau1977_sysclk_src {
-+	ADAU1977_SYSCLK_SRC_MCLK,
-+	ADAU1977_SYSCLK_SRC_LRCLK,
-+};
-+
-+static int adau1977_init(struct snd_soc_pcm_runtime *rtd)
-+{
-+	int ret;
-+	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
-+
-+	ret = snd_soc_dai_set_tdm_slot(codec_dai, 0, 0, 0, 0);
-+	if (ret < 0)
-+		return ret;
-+
-+	return snd_soc_component_set_sysclk(codec_dai->component,
-+			ADAU1977_SYSCLK, ADAU1977_SYSCLK_SRC_MCLK,
-+			11289600, SND_SOC_CLOCK_IN);
-+}
-+
-+SND_SOC_DAILINK_DEFS(adau1977,
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("adau1977.1-0011", "adau1977-hifi")),
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()));
-+
-+static struct snd_soc_dai_link snd_rpi_adau1977_dai[] = {
-+	{
-+	.name           = "adau1977",
-+	.stream_name    = "ADAU1977",
-+	.init           = adau1977_init,
-+	.dai_fmt = SND_SOC_DAIFMT_I2S |
-+		SND_SOC_DAIFMT_NB_NF |
-+		SND_SOC_DAIFMT_CBM_CFM,
-+	SND_SOC_DAILINK_REG(adau1977),
-+	},
-+};
-+
-+static struct snd_rpi_simple_drvdata drvdata_adau1977 = {
-+	.card_name = "snd_rpi_adau1977_adc",
-+	.dai       = snd_rpi_adau1977_dai,
-+};
-+
-+SND_SOC_DAILINK_DEFS(gvchat,
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("voicehat-codec", "voicehat-hifi")),
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()));
-+
-+static struct snd_soc_dai_link snd_googlevoicehat_soundcard_dai[] = {
-+{
-+	.name           = "Google voiceHAT SoundCard",
-+	.stream_name    = "Google voiceHAT SoundCard HiFi",
-+	.dai_fmt        =  SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-+				SND_SOC_DAIFMT_CBS_CFS,
-+	SND_SOC_DAILINK_REG(gvchat),
-+},
-+};
-+
-+static struct snd_rpi_simple_drvdata drvdata_googlevoicehat = {
-+	.card_name = "snd_rpi_googlevoicehat_soundcard",
-+	.dai       = snd_googlevoicehat_soundcard_dai,
-+};
-+
-+SND_SOC_DAILINK_DEFS(hifiberry_dacplusdsp,
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("dacplusdsp-codec", "dacplusdsp-hifi")),
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()));
-+
-+static struct snd_soc_dai_link snd_hifiberrydacplusdsp_soundcard_dai[] = {
-+{
-+	.name           = "Hifiberry DAC+DSP SoundCard",
-+	.stream_name    = "Hifiberry DAC+DSP SoundCard HiFi",
-+	.dai_fmt        =  SND_SOC_DAIFMT_I2S |
-+			   SND_SOC_DAIFMT_NB_NF |
-+			   SND_SOC_DAIFMT_CBS_CFS,
-+	SND_SOC_DAILINK_REG(hifiberry_dacplusdsp),
-+},
-+};
-+
-+static struct snd_rpi_simple_drvdata drvdata_hifiberrydacplusdsp = {
-+	.card_name = "snd_rpi_hifiberrydacplusdsp_soundcard",
-+	.dai       = snd_hifiberrydacplusdsp_soundcard_dai,
-+};
-+
-+SND_SOC_DAILINK_DEFS(hifiberry_amp,
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("tas5713.1-001b", "tas5713-hifi")),
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()));
-+
-+static struct snd_soc_dai_link snd_hifiberry_amp_dai[] = {
-+	{
-+		.name           = "HifiBerry AMP",
-+		.stream_name    = "HifiBerry AMP HiFi",
-+		.dai_fmt        = SND_SOC_DAIFMT_I2S |
-+					SND_SOC_DAIFMT_NB_NF |
-+					SND_SOC_DAIFMT_CBS_CFS,
-+		SND_SOC_DAILINK_REG(hifiberry_amp),
-+	},
-+};
-+
-+static struct snd_rpi_simple_drvdata drvdata_hifiberry_amp = {
-+	.card_name        = "snd_rpi_hifiberry_amp",
-+	.dai              = snd_hifiberry_amp_dai,
-+	.fixed_bclk_ratio = 64,
-+};
-+
-+SND_SOC_DAILINK_DEFS(hifiberry_amp3,
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("ma120x0p.1-0020", "ma120x0p-amp")),
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()));
-+
-+static struct snd_soc_dai_link snd_hifiberry_amp3_dai[] = {
-+	{
-+		.name		= "HifiberryAmp3",
-+		.stream_name	= "Hifiberry Amp3",
-+		.dai_fmt	= SND_SOC_DAIFMT_I2S |
-+					SND_SOC_DAIFMT_NB_NF |
-+					SND_SOC_DAIFMT_CBS_CFS,
-+		SND_SOC_DAILINK_REG(hifiberry_amp3),
-+	},
-+};
-+
-+static struct snd_rpi_simple_drvdata drvdata_hifiberry_amp3 = {
-+	.card_name	 = "snd_rpi_hifiberry_amp3",
-+	.dai		 = snd_hifiberry_amp3_dai,
-+	.fixed_bclk_ratio = 64,
-+};
-+
-+SND_SOC_DAILINK_DEFS(hifiberry_dac,
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("pcm5102a-codec", "pcm5102a-hifi")),
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()));
-+
-+static struct snd_soc_dai_link snd_hifiberry_dac_dai[] = {
-+	{
-+		.name           = "HifiBerry DAC",
-+		.stream_name    = "HifiBerry DAC HiFi",
-+		.dai_fmt        = SND_SOC_DAIFMT_I2S |
-+					SND_SOC_DAIFMT_NB_NF |
-+					SND_SOC_DAIFMT_CBS_CFS,
-+		SND_SOC_DAILINK_REG(hifiberry_dac),
-+	},
-+};
-+
-+static struct snd_rpi_simple_drvdata drvdata_hifiberry_dac = {
-+	.card_name = "snd_rpi_hifiberry_dac",
-+	.dai       = snd_hifiberry_dac_dai,
-+};
-+
-+SND_SOC_DAILINK_DEFS(dionaudio_kiwi,
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("pcm1794a-codec", "pcm1794a-hifi")),
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()));
-+
-+static struct snd_soc_dai_link snd_dionaudio_kiwi_dai[] = {
-+{
-+	.name		= "DionAudio KIWI",
-+	.stream_name	= "DionAudio KIWI STREAMER",
-+	.dai_fmt	= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-+				SND_SOC_DAIFMT_CBS_CFS,
-+	SND_SOC_DAILINK_REG(dionaudio_kiwi),
-+},
-+};
-+
-+static struct snd_rpi_simple_drvdata drvdata_dionaudio_kiwi = {
-+	.card_name        = "snd_rpi_dionaudio_kiwi",
-+	.dai              = snd_dionaudio_kiwi_dai,
-+	.fixed_bclk_ratio = 64,
-+};
-+
-+SND_SOC_DAILINK_DEFS(rpi_dac,
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("pcm1794a-codec", "pcm1794a-hifi")),
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()));
-+
-+static struct snd_soc_dai_link snd_rpi_dac_dai[] = {
-+{
-+	.name		= "RPi-DAC",
-+	.stream_name	= "RPi-DAC HiFi",
-+	.dai_fmt	= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-+				SND_SOC_DAIFMT_CBS_CFS,
-+	SND_SOC_DAILINK_REG(rpi_dac),
-+},
-+};
-+
-+static struct snd_rpi_simple_drvdata drvdata_rpi_dac = {
-+	.card_name        = "snd_rpi_rpi_dac",
-+	.dai              = snd_rpi_dac_dai,
-+	.fixed_bclk_ratio = 64,
-+};
-+
-+SND_SOC_DAILINK_DEFS(merus_amp,
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("ma120x0p.1-0020", "ma120x0p-amp")),
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()));
-+
-+static struct snd_soc_dai_link snd_merus_amp_dai[] = {
-+	{
-+		.name           = "MerusAmp",
-+		.stream_name    = "Merus Audio Amp",
-+		.ops		= &snd_merus_amp_ops,
-+		.dai_fmt        = SND_SOC_DAIFMT_I2S |
-+					SND_SOC_DAIFMT_NB_NF |
-+					SND_SOC_DAIFMT_CBS_CFS,
-+		SND_SOC_DAILINK_REG(merus_amp),
-+	},
-+};
-+
-+static struct snd_rpi_simple_drvdata drvdata_merus_amp = {
-+	.card_name        = "snd_rpi_merus_amp",
-+	.dai              = snd_merus_amp_dai,
-+	.fixed_bclk_ratio = 64,
-+};
-+
-+SND_SOC_DAILINK_DEFS(pifi_mini_210,
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()),
-+	DAILINK_COMP_ARRAY(COMP_CODEC("tas571x.1-001a", "tas571x-hifi")),
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()));
-+
-+static struct snd_soc_dai_link snd_pifi_mini_210_dai[] = {
-+	{
-+		.name           = "PiFi Mini 210",
-+		.stream_name    = "PiFi Mini 210 HiFi",
-+		.init			= pifi_mini_210_init,
-+		.dai_fmt        = SND_SOC_DAIFMT_I2S |
-+					SND_SOC_DAIFMT_NB_NF |
-+					SND_SOC_DAIFMT_CBS_CFS,
-+		SND_SOC_DAILINK_REG(pifi_mini_210),
-+	},
-+};
-+
-+static struct snd_rpi_simple_drvdata drvdata_pifi_mini_210 = {
-+	.card_name        = "snd_pifi_mini_210",
-+	.dai              = snd_pifi_mini_210_dai,
-+	.fixed_bclk_ratio = 64,
-+};
-+
-+static const struct of_device_id snd_rpi_simple_of_match[] = {
-+	{ .compatible = "adi,adau1977-adc",
-+		.data = (void *) &drvdata_adau1977 },
-+	{ .compatible = "googlevoicehat,googlevoicehat-soundcard",
-+		.data = (void *) &drvdata_googlevoicehat },
-+	{ .compatible = "hifiberrydacplusdsp,hifiberrydacplusdsp-soundcard",
-+		.data = (void *) &drvdata_hifiberrydacplusdsp },
-+	{ .compatible = "hifiberry,hifiberry-amp",
-+		.data = (void *) &drvdata_hifiberry_amp },
-+	{ .compatible = "hifiberry,hifiberry-amp3",
-+		.data = (void *) &drvdata_hifiberry_amp3 },
-+	{ .compatible = "hifiberry,hifiberry-dac",
-+		.data = (void *) &drvdata_hifiberry_dac },
-+	{ .compatible = "dionaudio,dionaudio-kiwi",
-+		.data = (void *) &drvdata_dionaudio_kiwi },
-+	{ .compatible = "rpi,rpi-dac", &drvdata_rpi_dac},
-+	{ .compatible = "merus,merus-amp",
-+		.data = (void *) &drvdata_merus_amp },
-+	{ .compatible = "pifi,pifi-mini-210",
-+		.data = (void *) &drvdata_pifi_mini_210 },
-+	{},
-+};
-+
-+static int snd_rpi_simple_probe(struct platform_device *pdev)
-+{
-+	int ret = 0;
-+	const struct of_device_id *of_id;
-+
-+	snd_rpi_simple.dev = &pdev->dev;
-+	of_id = of_match_node(snd_rpi_simple_of_match, pdev->dev.of_node);
-+
-+	if (pdev->dev.of_node && of_id->data) {
-+		struct device_node *i2s_node;
-+		struct snd_rpi_simple_drvdata *drvdata =
-+			(struct snd_rpi_simple_drvdata *) of_id->data;
-+		struct snd_soc_dai_link *dai = drvdata->dai;
-+
-+		snd_soc_card_set_drvdata(&snd_rpi_simple, drvdata);
-+
-+		/* More complex drivers might override individual functions */
-+		if (!dai->init)
-+			dai->init = snd_rpi_simple_init;
-+		if (!dai->ops)
-+			dai->ops = &snd_rpi_simple_ops;
-+
-+		snd_rpi_simple.name = drvdata->card_name;
-+
-+		snd_rpi_simple.dai_link = dai;
-+		i2s_node = of_parse_phandle(pdev->dev.of_node,
-+				"i2s-controller", 0);
-+		if (!i2s_node) {
-+			pr_err("Failed to find i2s-controller DT node\n");
-+			return -ENODEV;
-+		}
-+
-+		dai->cpus->of_node = i2s_node;
-+		dai->platforms->of_node = i2s_node;
-+	}
-+
-+	ret = devm_snd_soc_register_card(&pdev->dev, &snd_rpi_simple);
-+	if (ret && ret != -EPROBE_DEFER)
-+		dev_err(&pdev->dev, "Failed to register card %d\n", ret);
-+
-+	return ret;
-+}
-+
-+static struct platform_driver snd_rpi_simple_driver = {
-+	.driver = {
-+		.name   = "snd-rpi-simple",
-+		.owner  = THIS_MODULE,
-+		.of_match_table = snd_rpi_simple_of_match,
-+	},
-+	.probe          = snd_rpi_simple_probe,
-+};
-+MODULE_DEVICE_TABLE(of, snd_rpi_simple_of_match);
-+
-+module_platform_driver(snd_rpi_simple_driver);
-+
-+MODULE_AUTHOR("Tim Gover <tim.gover@raspberrypi.org>");
-+MODULE_DESCRIPTION("ASoC Raspberry Pi simple soundcard driver ");
-+MODULE_LICENSE("GPL v2");
---- /dev/null
-+++ b/sound/soc/bcm/rpi-wm8804-soundcard.c
-@@ -0,0 +1,410 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * rpi--wm8804.c -- ALSA SoC Raspberry Pi soundcard.
-+ *
-+ * Copyright (C) 2018 Raspberry Pi.
-+ *
-+ * Authors: Tim Gover <tim.gover@raspberrypi.org>
-+ *
-+ * Generic driver for Pi Hat WM8804 digi sounds cards
-+ *
-+ * Based upon code from:
-+ * justboom-digi.c
-+ * by Milan Neskovic <info@justboom.co>
-+ *
-+ * iqaudio_digi.c
-+ * by Daniel Matuschek <info@crazy-audio.com>
-+ *
-+ * allo-digione.c
-+ * by Baswaraj <jaikumar@cem-solutions.net>
-+ *
-+ * hifiberry-digi.c
-+ * Daniel Matuschek <info@crazy-audio.com>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#include <linux/gpio/consumer.h>
-+#include <linux/platform_device.h>
-+#include <linux/module.h>
-+
-+#include <sound/core.h>
-+#include <sound/pcm.h>
-+#include <sound/pcm_params.h>
-+#include <sound/soc.h>
-+
-+#include "../codecs/wm8804.h"
-+
-+struct wm8804_clk_cfg {
-+	unsigned int sysclk_freq;
-+	unsigned int mclk_freq;
-+	unsigned int mclk_div;
-+};
-+
-+/* Parameters for generic functions */
-+struct snd_rpi_wm8804_drvdata {
-+	/* Required - pointer to the DAI structure */
-+	struct snd_soc_dai_link *dai;
-+	/* Required - snd_soc_card name */
-+	const char *card_name;
-+	/* Optional DT node names if card info is defined in DT */
-+	const char *card_name_dt;
-+	const char *dai_name_dt;
-+	const char *dai_stream_name_dt;
-+	/* Optional probe extension - called prior to register_card */
-+	int (*probe)(struct platform_device *pdev);
-+};
-+
-+static struct gpio_desc *snd_clk44gpio;
-+static struct gpio_desc *snd_clk48gpio;
-+static int wm8804_samplerate = 0;
-+
-+/* Forward declarations */
-+static struct snd_soc_dai_link snd_allo_digione_dai[];
-+static struct snd_soc_card snd_rpi_wm8804;
-+
-+
-+#define CLK_44EN_RATE 22579200UL
-+#define CLK_48EN_RATE 24576000UL
-+
-+static unsigned int snd_rpi_wm8804_enable_clock(unsigned int samplerate)
-+{
-+	switch (samplerate) {
-+	case 11025:
-+	case 22050:
-+	case 44100:
-+	case 88200:
-+	case 176400:
-+		gpiod_set_value_cansleep(snd_clk44gpio, 1);
-+		gpiod_set_value_cansleep(snd_clk48gpio, 0);
-+		return CLK_44EN_RATE;
-+	default:
-+		gpiod_set_value_cansleep(snd_clk48gpio, 1);
-+		gpiod_set_value_cansleep(snd_clk44gpio, 0);
-+		return CLK_48EN_RATE;
-+	}
-+}
-+
-+static void snd_rpi_wm8804_clk_cfg(unsigned int samplerate,
-+		struct wm8804_clk_cfg *clk_cfg)
-+{
-+	clk_cfg->sysclk_freq = 27000000;
-+
-+	if (samplerate <= 96000 ||
-+	    snd_rpi_wm8804.dai_link == snd_allo_digione_dai) {
-+		clk_cfg->mclk_freq = samplerate * 256;
-+		clk_cfg->mclk_div = WM8804_MCLKDIV_256FS;
-+	} else {
-+		clk_cfg->mclk_freq = samplerate * 128;
-+		clk_cfg->mclk_div = WM8804_MCLKDIV_128FS;
-+	}
-+
-+	if (!(IS_ERR(snd_clk44gpio) || IS_ERR(snd_clk48gpio)))
-+		clk_cfg->sysclk_freq = snd_rpi_wm8804_enable_clock(samplerate);
-+}
-+
-+static int snd_rpi_wm8804_hw_params(struct snd_pcm_substream *substream,
-+		struct snd_pcm_hw_params *params)
-+{
-+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
-+	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
-+	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
-+	int sampling_freq = 1;
-+	int ret;
-+	struct wm8804_clk_cfg clk_cfg;
-+	int samplerate = params_rate(params);
-+
-+	if (samplerate == wm8804_samplerate)
-+		return 0;
-+
-+	/* clear until all clocks are setup properly */
-+	wm8804_samplerate = 0;
-+
-+	snd_rpi_wm8804_clk_cfg(samplerate, &clk_cfg);
-+
-+	pr_debug("%s samplerate: %d mclk_freq: %u mclk_div: %u sysclk: %u\n",
-+			__func__, samplerate, clk_cfg.mclk_freq,
-+			clk_cfg.mclk_div, clk_cfg.sysclk_freq);
-+
-+	switch (samplerate) {
-+	case 32000:
-+		sampling_freq = 0x03;
-+		break;
-+	case 44100:
-+		sampling_freq = 0x00;
-+		break;
-+	case 48000:
-+		sampling_freq = 0x02;
-+		break;
-+	case 88200:
-+		sampling_freq = 0x08;
-+		break;
-+	case 96000:
-+		sampling_freq = 0x0a;
-+		break;
-+	case 176400:
-+		sampling_freq = 0x0c;
-+		break;
-+	case 192000:
-+		sampling_freq = 0x0e;
-+		break;
-+	default:
-+		dev_err(rtd->card->dev,
-+		"Failed to set WM8804 SYSCLK, unsupported samplerate %d\n",
-+		samplerate);
-+	}
-+
-+	snd_soc_dai_set_clkdiv(codec_dai, WM8804_MCLK_DIV, clk_cfg.mclk_div);
-+	snd_soc_dai_set_pll(codec_dai, 0, 0,
-+			clk_cfg.sysclk_freq, clk_cfg.mclk_freq);
-+
-+	ret = snd_soc_dai_set_sysclk(codec_dai, WM8804_TX_CLKSRC_PLL,
-+			clk_cfg.sysclk_freq, SND_SOC_CLOCK_OUT);
-+	if (ret < 0) {
-+		dev_err(rtd->card->dev,
-+		"Failed to set WM8804 SYSCLK: %d\n", ret);
-+		return ret;
-+	}
-+
-+	wm8804_samplerate = samplerate;
-+
-+	/* set sampling frequency status bits */
-+	snd_soc_component_update_bits(component, WM8804_SPDTX4, 0x0f,
-+			sampling_freq);
-+
-+	return snd_soc_dai_set_bclk_ratio(cpu_dai, 64);
-+}
-+
-+static struct snd_soc_ops snd_rpi_wm8804_ops = {
-+	.hw_params = snd_rpi_wm8804_hw_params,
-+};
-+
-+SND_SOC_DAILINK_DEFS(justboom_digi,
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()),
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()),
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()));
-+
-+static struct snd_soc_dai_link snd_justboom_digi_dai[] = {
-+{
-+	.name        = "JustBoom Digi",
-+	.stream_name = "JustBoom Digi HiFi",
-+	SND_SOC_DAILINK_REG(justboom_digi),
-+},
-+};
-+
-+static struct snd_rpi_wm8804_drvdata drvdata_justboom_digi = {
-+	.card_name            = "snd_rpi_justboom_digi",
-+	.dai                  = snd_justboom_digi_dai,
-+};
-+
-+SND_SOC_DAILINK_DEFS(iqaudio_digi,
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()),
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()),
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()));
-+
-+static struct snd_soc_dai_link snd_iqaudio_digi_dai[] = {
-+{
-+	.name        = "IQAudIO Digi",
-+	.stream_name = "IQAudIO Digi HiFi",
-+	SND_SOC_DAILINK_REG(iqaudio_digi),
-+},
-+};
-+
-+static struct snd_rpi_wm8804_drvdata drvdata_iqaudio_digi = {
-+	.card_name          = "IQAudIODigi",
-+	.dai                = snd_iqaudio_digi_dai,
-+	.card_name_dt       = "wm8804-digi,card-name",
-+	.dai_name_dt        = "wm8804-digi,dai-name",
-+	.dai_stream_name_dt = "wm8804-digi,dai-stream-name",
-+};
-+
-+static int snd_allo_digione_probe(struct platform_device *pdev)
-+{
-+	pr_debug("%s\n", __func__);
-+
-+	if (IS_ERR(snd_clk44gpio) || IS_ERR(snd_clk48gpio)) {
-+		dev_err(&pdev->dev, "devm_gpiod_get() failed\n");
-+		return -EINVAL;
-+	}
-+	return 0;
-+}
-+
-+SND_SOC_DAILINK_DEFS(allo_digione,
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()),
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()),
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()));
-+
-+static struct snd_soc_dai_link snd_allo_digione_dai[] = {
-+{
-+	.name        = "Allo DigiOne",
-+	.stream_name = "Allo DigiOne HiFi",
-+	SND_SOC_DAILINK_REG(allo_digione),
-+},
-+};
-+
-+static struct snd_rpi_wm8804_drvdata drvdata_allo_digione = {
-+	.card_name = "snd_allo_digione",
-+	.dai       = snd_allo_digione_dai,
-+	.probe     = snd_allo_digione_probe,
-+};
-+
-+SND_SOC_DAILINK_DEFS(hifiberry_digi,
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()),
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()),
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()));
-+
-+static struct snd_soc_dai_link snd_hifiberry_digi_dai[] = {
-+{
-+	.name        = "HifiBerry Digi",
-+	.stream_name = "HifiBerry Digi HiFi",
-+	SND_SOC_DAILINK_REG(hifiberry_digi),
-+},
-+};
-+
-+static int snd_hifiberry_digi_probe(struct platform_device *pdev)
-+{
-+	pr_debug("%s\n", __func__);
-+
-+	if (IS_ERR(snd_clk44gpio) || IS_ERR(snd_clk48gpio))
-+		return 0;
-+
-+	snd_hifiberry_digi_dai->name = "HiFiBerry Digi+ Pro";
-+	snd_hifiberry_digi_dai->stream_name = "HiFiBerry Digi+ Pro HiFi";
-+	return 0;
-+}
-+
-+static struct snd_rpi_wm8804_drvdata drvdata_hifiberry_digi = {
-+	.card_name = "snd_rpi_hifiberry_digi",
-+	.dai       = snd_hifiberry_digi_dai,
-+	.probe     = snd_hifiberry_digi_probe,
-+};
-+
-+static const struct of_device_id snd_rpi_wm8804_of_match[] = {
-+	{ .compatible = "justboom,justboom-digi",
-+		.data = (void *) &drvdata_justboom_digi },
-+	{ .compatible = "iqaudio,wm8804-digi",
-+		.data = (void *) &drvdata_iqaudio_digi },
-+	{ .compatible = "allo,allo-digione",
-+		.data = (void *) &drvdata_allo_digione },
-+	{ .compatible = "hifiberry,hifiberry-digi",
-+		.data = (void *) &drvdata_hifiberry_digi },
-+	{},
-+};
-+
-+static struct snd_soc_card snd_rpi_wm8804 = {
-+	.driver_name  = "RPi-WM8804",
-+	.owner        = THIS_MODULE,
-+	.dai_link     = NULL,
-+	.num_links    = 1,
-+};
-+
-+static int snd_rpi_wm8804_probe(struct platform_device *pdev)
-+{
-+	int ret = 0;
-+	const struct of_device_id *of_id;
-+
-+	snd_rpi_wm8804.dev = &pdev->dev;
-+	of_id = of_match_node(snd_rpi_wm8804_of_match, pdev->dev.of_node);
-+
-+	if (pdev->dev.of_node && of_id->data) {
-+		struct device_node *i2s_node;
-+		struct snd_rpi_wm8804_drvdata *drvdata =
-+			(struct snd_rpi_wm8804_drvdata *) of_id->data;
-+		struct snd_soc_dai_link *dai = drvdata->dai;
-+
-+		snd_soc_card_set_drvdata(&snd_rpi_wm8804, drvdata);
-+
-+		if (!dai->ops)
-+			dai->ops = &snd_rpi_wm8804_ops;
-+		if (!dai->codecs->dai_name)
-+			dai->codecs->dai_name = "wm8804-spdif";
-+		if (!dai->codecs->name)
-+			dai->codecs->name = "wm8804.1-003b";
-+		if (!dai->dai_fmt)
-+			dai->dai_fmt = SND_SOC_DAIFMT_I2S |
-+				SND_SOC_DAIFMT_NB_NF |
-+				SND_SOC_DAIFMT_CBM_CFM;
-+
-+		snd_rpi_wm8804.dai_link = dai;
-+		i2s_node = of_parse_phandle(pdev->dev.of_node,
-+				"i2s-controller", 0);
-+		if (!i2s_node) {
-+			pr_err("Failed to find i2s-controller DT node\n");
-+			return -ENODEV;
-+		}
-+
-+		snd_rpi_wm8804.name = drvdata->card_name;
-+
-+		/* If requested by in drvdata get card & DAI names from DT */
-+		if (drvdata->card_name_dt)
-+			of_property_read_string(i2s_node,
-+					drvdata->card_name_dt,
-+					&snd_rpi_wm8804.name);
-+
-+		if (drvdata->dai_name_dt)
-+			of_property_read_string(i2s_node,
-+					drvdata->dai_name_dt,
-+					&dai->name);
-+
-+		if (drvdata->dai_stream_name_dt)
-+			of_property_read_string(i2s_node,
-+					drvdata->dai_stream_name_dt,
-+					&dai->stream_name);
-+
-+		dai->cpus->of_node = i2s_node;
-+		dai->platforms->of_node = i2s_node;
-+
-+		/*
-+		 * clk44gpio and clk48gpio are not required by all cards so
-+		 * don't check the error status.
-+		 */
-+		snd_clk44gpio =
-+			devm_gpiod_get(&pdev->dev, "clock44", GPIOD_OUT_LOW);
-+
-+		snd_clk48gpio =
-+			devm_gpiod_get(&pdev->dev, "clock48", GPIOD_OUT_LOW);
-+
-+		if (drvdata->probe) {
-+			ret = drvdata->probe(pdev);
-+			if (ret < 0) {
-+				dev_err(&pdev->dev, "Custom probe failed %d\n",
-+						ret);
-+				return ret;
-+			}
-+		}
-+
-+		pr_debug("%s card: %s dai: %s stream: %s\n", __func__,
-+				snd_rpi_wm8804.name,
-+				dai->name, dai->stream_name);
-+	}
-+
-+	ret = devm_snd_soc_register_card(&pdev->dev, &snd_rpi_wm8804);
-+	if (ret && ret != -EPROBE_DEFER)
-+		dev_err(&pdev->dev, "Failed to register card %d\n", ret);
-+
-+	return ret;
-+}
-+
-+static struct platform_driver snd_rpi_wm8804_driver = {
-+	.driver = {
-+		.name           = "snd-rpi-wm8804",
-+		.owner          = THIS_MODULE,
-+		.of_match_table = snd_rpi_wm8804_of_match,
-+	},
-+	.probe  = snd_rpi_wm8804_probe,
-+};
-+MODULE_DEVICE_TABLE(of, snd_rpi_wm8804_of_match);
-+
-+module_platform_driver(snd_rpi_wm8804_driver);
-+
-+MODULE_AUTHOR("Tim Gover <tim.gover@raspberrypi.org>");
-+MODULE_DESCRIPTION("ASoC Raspberry Pi Hat generic digi driver for WM8804 based cards");
-+MODULE_LICENSE("GPL v2");
---- a/sound/soc/codecs/Kconfig
-+++ b/sound/soc/codecs/Kconfig
-@@ -109,6 +109,7 @@ config SND_SOC_ALL_CODECS
- 	imply SND_SOC_ICS43432
- 	imply SND_SOC_INNO_RK3036
- 	imply SND_SOC_ISABELLE
-+	imply SND_SOC_I_SABRE_CODEC
- 	imply SND_SOC_JZ4740_CODEC
- 	imply SND_SOC_JZ4725B_CODEC
- 	imply SND_SOC_JZ4760_CODEC
-@@ -116,6 +117,7 @@ config SND_SOC_ALL_CODECS
- 	imply SND_SOC_LM4857
- 	imply SND_SOC_LM49453
- 	imply SND_SOC_LOCHNAGAR_SC
-+	imply SND_SOC_MA120X0P
- 	imply SND_SOC_MAX98088
- 	imply SND_SOC_MAX98090
- 	imply SND_SOC_MAX98095
-@@ -156,6 +158,7 @@ config SND_SOC_ALL_CODECS
- 	imply SND_SOC_PCM179X_SPI
- 	imply SND_SOC_PCM186X_I2C
- 	imply SND_SOC_PCM186X_SPI
-+	imply SND_SOC_PCM1794A
- 	imply SND_SOC_PCM3008
- 	imply SND_SOC_PCM3060_I2C
- 	imply SND_SOC_PCM3060_SPI
-@@ -234,6 +237,7 @@ config SND_SOC_ALL_CODECS
- 	imply SND_SOC_TLV320ADCX140
- 	imply SND_SOC_TLV320AIC23_I2C
- 	imply SND_SOC_TLV320AIC23_SPI
-+	imply SND_SOC_TAS5713
- 	imply SND_SOC_TLV320AIC26
- 	imply SND_SOC_TLV320AIC31XX
- 	imply SND_SOC_TLV320AIC32X4_I2C
-@@ -383,12 +387,12 @@ config SND_SOC_AD193X
- 	tristate
- 
- config SND_SOC_AD193X_SPI
--	tristate
-+	tristate "Analog Devices AU193X CODEC - SPI"
- 	depends on SPI_MASTER
- 	select SND_SOC_AD193X
- 
- config SND_SOC_AD193X_I2C
--	tristate
-+	tristate "Analog Devices AU193X CODEC - I2C"
- 	depends on I2C
- 	select SND_SOC_AD193X
- 
-@@ -991,6 +995,13 @@ config SND_SOC_LOCHNAGAR_SC
- 	  This driver support the sound card functionality of the Cirrus
- 	  Logic Lochnagar audio development board.
- 
-+config SND_SOC_MA120X0P
-+	tristate "Infineon Merus(TM) MA120X0P Multilevel Class-D Audio amplifiers"
-+	depends on I2C
-+	help
-+		Enable support for Infineon MA120X0P Multilevel Class-D audio power
-+		amplifiers.
-+
- config SND_SOC_MADERA
- 	tristate
- 	default y if SND_SOC_CS47L15=y
-@@ -1333,6 +1344,10 @@ config SND_SOC_RT5616
- 	tristate "Realtek RT5616 CODEC"
- 	depends on I2C
- 
-+config SND_SOC_PCM1794A
-+	tristate
-+	depends on I2C
-+
- config SND_SOC_RT5631
- 	tristate "Realtek ALC5631/RT5631 CODEC"
- 	depends on I2C
-@@ -1623,6 +1638,9 @@ config SND_SOC_TFA9879
- 	tristate "NXP Semiconductors TFA9879 amplifier"
- 	depends on I2C
- 
-+config SND_SOC_TAS5713
-+	tristate
-+
- config SND_SOC_TFA989X
- 	tristate "NXP/Goodix TFA989X (TFA1) amplifiers"
- 	depends on I2C
-@@ -2169,4 +2187,8 @@ config SND_SOC_LPASS_TX_MACRO
- 	select SND_SOC_LPASS_MACRO_COMMON
- 	tristate "Qualcomm TX Macro in LPASS(Low Power Audio SubSystem)"
- 
-+config SND_SOC_I_SABRE_CODEC
-+	tristate "Audiophonics I-SABRE Codec"
-+	depends on I2C
-+
- endmenu
---- a/sound/soc/codecs/Makefile
-+++ b/sound/soc/codecs/Makefile
-@@ -113,6 +113,7 @@ snd-soc-hda-codec-objs := hda.o hda-dai.
- snd-soc-ics43432-objs := ics43432.o
- snd-soc-inno-rk3036-objs := inno_rk3036.o
- snd-soc-isabelle-objs := isabelle.o
-+snd-soc-i-sabre-codec-objs := i-sabre-codec.o
- snd-soc-jz4740-codec-objs := jz4740.o
- snd-soc-jz4725b-codec-objs := jz4725b.o
- snd-soc-jz4760-codec-objs := jz4760.o
-@@ -126,6 +127,7 @@ snd-soc-lpass-rx-macro-objs := lpass-rx-
- snd-soc-lpass-tx-macro-objs := lpass-tx-macro.o
- snd-soc-lpass-wsa-macro-objs := lpass-wsa-macro.o
- snd-soc-lpass-va-macro-objs := lpass-va-macro.o
-+snd-soc-ma120x0p-objs := ma120x0p.o
- snd-soc-madera-objs := madera.o
- snd-soc-max9759-objs := max9759.o
- snd-soc-max9768-objs := max9768.o
-@@ -172,6 +174,7 @@ snd-soc-pcm179x-spi-objs := pcm179x-spi.
- snd-soc-pcm186x-objs := pcm186x.o
- snd-soc-pcm186x-i2c-objs := pcm186x-i2c.o
- snd-soc-pcm186x-spi-objs := pcm186x-spi.o
-+snd-soc-pcm1794a-objs := pcm1794a.o
- snd-soc-pcm3008-objs := pcm3008.o
- snd-soc-pcm3060-objs := pcm3060.o
- snd-soc-pcm3060-i2c-objs := pcm3060-i2c.o
-@@ -256,6 +259,7 @@ snd-soc-tas6424-objs := tas6424.o
- snd-soc-tda7419-objs := tda7419.o
- snd-soc-tas2770-objs := tas2770.o
- snd-soc-tfa9879-objs := tfa9879.o
-+snd-soc-tas5713-objs := tas5713.o
- snd-soc-tfa989x-objs := tfa989x.o
- snd-soc-tlv320adc3xxx-objs := tlv320adc3xxx.o
- snd-soc-tlv320aic23-objs := tlv320aic23.o
-@@ -474,6 +478,7 @@ obj-$(CONFIG_SND_SOC_HDA) += snd-soc-hda
- obj-$(CONFIG_SND_SOC_ICS43432)	+= snd-soc-ics43432.o
- obj-$(CONFIG_SND_SOC_INNO_RK3036)	+= snd-soc-inno-rk3036.o
- obj-$(CONFIG_SND_SOC_ISABELLE)	+= snd-soc-isabelle.o
-+obj-$(CONFIG_SND_SOC_I_SABRE_CODEC)	+= snd-soc-i-sabre-codec.o
- obj-$(CONFIG_SND_SOC_JZ4740_CODEC)	+= snd-soc-jz4740-codec.o
- obj-$(CONFIG_SND_SOC_JZ4725B_CODEC)	+= snd-soc-jz4725b-codec.o
- obj-$(CONFIG_SND_SOC_JZ4760_CODEC)      += snd-soc-jz4760-codec.o
-@@ -482,6 +487,7 @@ obj-$(CONFIG_SND_SOC_L3)	+= snd-soc-l3.o
- obj-$(CONFIG_SND_SOC_LM4857)	+= snd-soc-lm4857.o
- obj-$(CONFIG_SND_SOC_LM49453)   += snd-soc-lm49453.o
- obj-$(CONFIG_SND_SOC_LOCHNAGAR_SC)	+= snd-soc-lochnagar-sc.o
-+obj-$(CONFIG_SND_SOC_MA120X0P)   += snd-soc-ma120x0p.o
- obj-$(CONFIG_SND_SOC_MADERA)	+= snd-soc-madera.o
- obj-$(CONFIG_SND_SOC_MAX9759)	+= snd-soc-max9759.o
- obj-$(CONFIG_SND_SOC_MAX9768)	+= snd-soc-max9768.o
-@@ -539,6 +545,7 @@ obj-$(CONFIG_SND_SOC_PCM5102A)	+= snd-so
- obj-$(CONFIG_SND_SOC_PCM512x)	+= snd-soc-pcm512x.o
- obj-$(CONFIG_SND_SOC_PCM512x_I2C)	+= snd-soc-pcm512x-i2c.o
- obj-$(CONFIG_SND_SOC_PCM512x_SPI)	+= snd-soc-pcm512x-spi.o
-+obj-$(CONFIG_SND_SOC_PCM1794A)	+= snd-soc-pcm1794a.o
- obj-$(CONFIG_SND_SOC_RK3328)	+= snd-soc-rk3328.o
- obj-$(CONFIG_SND_SOC_RK817)	+= snd-soc-rk817.o
- obj-$(CONFIG_SND_SOC_RL6231)	+= snd-soc-rl6231.o
-@@ -613,6 +620,7 @@ obj-$(CONFIG_SND_SOC_TAS5805M)	+= snd-so
- obj-$(CONFIG_SND_SOC_TAS6424)	+= snd-soc-tas6424.o
- obj-$(CONFIG_SND_SOC_TDA7419)	+= snd-soc-tda7419.o
- obj-$(CONFIG_SND_SOC_TAS2770) += snd-soc-tas2770.o
-+obj-$(CONFIG_SND_SOC_TAS5713)	+= snd-soc-tas5713.o
- obj-$(CONFIG_SND_SOC_TFA9879)	+= snd-soc-tfa9879.o
- obj-$(CONFIG_SND_SOC_TFA989X)	+= snd-soc-tfa989x.o
- obj-$(CONFIG_SND_SOC_TLV320ADC3XXX)	+= snd-soc-tlv320adc3xxx.o
---- a/sound/soc/codecs/cs42xx8-i2c.c
-+++ b/sound/soc/codecs/cs42xx8-i2c.c
-@@ -42,11 +42,18 @@ static struct i2c_device_id cs42xx8_i2c_
- };
- MODULE_DEVICE_TABLE(i2c, cs42xx8_i2c_id);
- 
-+const struct of_device_id cs42xx8_i2c_of_match[] = {
-+	{ .compatible = "cirrus,cs42448", .data = &cs42448_data, },
-+	{ .compatible = "cirrus,cs42888", .data = &cs42888_data, },
-+	{ /* sentinel */ }
-+};
-+MODULE_DEVICE_TABLE(of, cs42xx8_i2c_of_match);
-+
- static struct i2c_driver cs42xx8_i2c_driver = {
- 	.driver = {
- 		.name = "cs42xx8",
- 		.pm = &cs42xx8_pm,
--		.of_match_table = cs42xx8_of_match,
-+		.of_match_table = cs42xx8_i2c_of_match,
- 	},
- 	.probe_new = cs42xx8_i2c_probe,
- 	.remove = cs42xx8_i2c_remove,
---- a/sound/soc/codecs/cs42xx8.c
-+++ b/sound/soc/codecs/cs42xx8.c
-@@ -516,8 +516,10 @@ const struct of_device_id cs42xx8_of_mat
- 	{ .compatible = "cirrus,cs42888", .data = &cs42888_data, },
- 	{ /* sentinel */ }
- };
-+#if !IS_ENABLED(CONFIG_SND_SOC_CS42XX8_I2C)
- MODULE_DEVICE_TABLE(of, cs42xx8_of_match);
- EXPORT_SYMBOL_GPL(cs42xx8_of_match);
-+#endif
- 
- int cs42xx8_probe(struct device *dev, struct regmap *regmap)
- {
---- /dev/null
-+++ b/sound/soc/codecs/i-sabre-codec.c
-@@ -0,0 +1,390 @@
-+/*
-+ * Driver for I-Sabre Q2M
-+ *
-+ * Author: Satoru Kawase
-+ * Modified by: Xiao Qingyong
-+ * Modified by: JC BARBAUD (Mute)
-+ * Update kernel v4.18+ by : Audiophonics
-+ * 		Copyright 2018 Audiophonics
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+
-+#include <linux/init.h>
-+#include <linux/module.h>
-+#include <linux/regmap.h>
-+#include <linux/i2c.h>
-+#include <sound/soc.h>
-+#include <sound/pcm_params.h>
-+#include <sound/tlv.h>
-+
-+#include "i-sabre-codec.h"
-+
-+
-+/* I-Sabre Q2M Codec Private Data */
-+struct i_sabre_codec_priv {
-+	struct regmap *regmap;
-+	unsigned int fmt;
-+};
-+
-+
-+/* I-Sabre Q2M Codec Default Register Value */
-+static const struct reg_default i_sabre_codec_reg_defaults[] = {
-+	{ ISABRECODEC_REG_10, 0x00 },
-+	{ ISABRECODEC_REG_20, 0x00 },
-+	{ ISABRECODEC_REG_21, 0x00 },
-+	{ ISABRECODEC_REG_22, 0x00 },
-+	{ ISABRECODEC_REG_24, 0x00 },
-+};
-+
-+
-+static bool i_sabre_codec_writeable(struct device *dev, unsigned int reg)
-+{
-+	switch (reg) {
-+	case ISABRECODEC_REG_10:
-+	case ISABRECODEC_REG_20:
-+	case ISABRECODEC_REG_21:
-+	case ISABRECODEC_REG_22:
-+	case ISABRECODEC_REG_24:
-+		return true;
-+
-+	default:
-+		return false;
-+	}
-+}
-+
-+static bool i_sabre_codec_readable(struct device *dev, unsigned int reg)
-+{
-+	switch (reg) {
-+	case ISABRECODEC_REG_01:
-+	case ISABRECODEC_REG_02:
-+	case ISABRECODEC_REG_10:
-+	case ISABRECODEC_REG_20:
-+	case ISABRECODEC_REG_21:
-+	case ISABRECODEC_REG_22:
-+	case ISABRECODEC_REG_24:
-+		return true;
-+
-+	default:
-+		return false;
-+	}
-+}
-+
-+static bool i_sabre_codec_volatile(struct device *dev, unsigned int reg)
-+{
-+	switch (reg) {
-+	case ISABRECODEC_REG_01:
-+	case ISABRECODEC_REG_02:
-+		return true;
-+
-+	default:
-+		return false;
-+	}
-+}
-+
-+
-+/* Volume Scale */
-+static const DECLARE_TLV_DB_SCALE(volume_tlv, -10000, 100, 0);
-+
-+
-+/* Filter Type */
-+static const char * const fir_filter_type_texts[] = {
-+	"brick wall",
-+	"corrected minimum phase fast",
-+	"minimum phase slow",
-+	"minimum phase fast",
-+	"linear phase slow",
-+	"linear phase fast",
-+	"apodizing fast",
-+};
-+
-+static SOC_ENUM_SINGLE_DECL(i_sabre_fir_filter_type_enum,
-+				ISABRECODEC_REG_22, 0, fir_filter_type_texts);
-+
-+
-+/* I2S / SPDIF Select */
-+static const char * const iis_spdif_sel_texts[] = {
-+	"I2S",
-+	"SPDIF",
-+};
-+
-+static SOC_ENUM_SINGLE_DECL(i_sabre_iis_spdif_sel_enum,
-+				ISABRECODEC_REG_24, 0, iis_spdif_sel_texts);
-+
-+
-+/* Control */
-+static const struct snd_kcontrol_new i_sabre_codec_controls[] = {
-+SOC_SINGLE_RANGE_TLV("Digital Playback Volume", ISABRECODEC_REG_20, 0, 0, 100, 1, volume_tlv),
-+SOC_SINGLE("Digital Playback Switch", ISABRECODEC_REG_21, 0, 1, 1),
-+SOC_ENUM("FIR Filter Type", i_sabre_fir_filter_type_enum),
-+SOC_ENUM("I2S/SPDIF Select", i_sabre_iis_spdif_sel_enum),
-+};
-+
-+
-+static const u32 i_sabre_codec_dai_rates_slave[] = {
-+	8000, 11025, 16000, 22050, 32000,
-+	44100, 48000, 64000, 88200, 96000,
-+	176400, 192000, 352800, 384000,
-+	705600, 768000, 1411200, 1536000
-+};
-+
-+static const struct snd_pcm_hw_constraint_list constraints_slave = {
-+	.list  = i_sabre_codec_dai_rates_slave,
-+	.count = ARRAY_SIZE(i_sabre_codec_dai_rates_slave),
-+};
-+
-+static int i_sabre_codec_dai_startup_slave(
-+		struct snd_pcm_substream *substream, struct snd_soc_dai *dai)
-+{
-+	struct snd_soc_component *component = dai->component;
-+	int ret;
-+
-+	ret = snd_pcm_hw_constraint_list(substream->runtime,
-+			0, SNDRV_PCM_HW_PARAM_RATE, &constraints_slave);
-+	if (ret != 0) {
-+		dev_err(component->card->dev, "Failed to setup rates constraints: %d\n", ret);
-+	}
-+
-+	return ret;
-+}
-+
-+static int i_sabre_codec_dai_startup(
-+		struct snd_pcm_substream *substream, struct snd_soc_dai *dai)
-+{
-+	struct snd_soc_component      *component = dai->component;
-+	struct i_sabre_codec_priv *i_sabre_codec
-+					= snd_soc_component_get_drvdata(component);
-+
-+	switch (i_sabre_codec->fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-+	case SND_SOC_DAIFMT_CBS_CFS:
-+		return i_sabre_codec_dai_startup_slave(substream, dai);
-+
-+	default:
-+		return (-EINVAL);
-+	}
-+}
-+
-+static int i_sabre_codec_hw_params(
-+	struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params,
-+	struct snd_soc_dai *dai)
-+{
-+	struct snd_soc_component      *component = dai->component;
-+	struct i_sabre_codec_priv *i_sabre_codec
-+					= snd_soc_component_get_drvdata(component);
-+	unsigned int daifmt;
-+	int format_width;
-+
-+	dev_dbg(component->card->dev, "hw_params %u Hz, %u channels\n",
-+			params_rate(params), params_channels(params));
-+
-+	/* Check I2S Format (Bit Size) */
-+	format_width = snd_pcm_format_width(params_format(params));
-+	if ((format_width != 32) && (format_width != 16)) {
-+		dev_err(component->card->dev, "Bad frame size: %d\n",
-+				snd_pcm_format_width(params_format(params)));
-+		return (-EINVAL);
-+	}
-+
-+	/* Check Slave Mode */
-+	daifmt = i_sabre_codec->fmt & SND_SOC_DAIFMT_MASTER_MASK;
-+	if (daifmt != SND_SOC_DAIFMT_CBS_CFS) {
-+		return (-EINVAL);
-+	}
-+
-+	/* Notify Sampling Frequency  */
-+	switch (params_rate(params))
-+	{
-+	case 44100:
-+	case 48000:
-+	case 88200:
-+	case 96000:
-+	case 176400:
-+	case 192000:
-+		snd_soc_component_update_bits(component, ISABRECODEC_REG_10, 0x01, 0x00);
-+		break;
-+
-+	case 352800:
-+	case 384000:
-+	case 705600:
-+	case 768000:
-+	case 1411200:
-+	case 1536000:
-+		snd_soc_component_update_bits(component, ISABRECODEC_REG_10, 0x01, 0x01);
-+		break;
-+	}
-+
-+	return 0;
-+}
-+
-+static int i_sabre_codec_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
-+{
-+	struct snd_soc_component      *component = dai->component;
-+	struct i_sabre_codec_priv *i_sabre_codec
-+					= snd_soc_component_get_drvdata(component);
-+
-+	/* interface format */
-+	switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
-+	case SND_SOC_DAIFMT_I2S:
-+		break;
-+
-+	case SND_SOC_DAIFMT_RIGHT_J:
-+	case SND_SOC_DAIFMT_LEFT_J:
-+	default:
-+		return (-EINVAL);
-+	}
-+
-+	/* clock inversion */
-+	if ((fmt & SND_SOC_DAIFMT_INV_MASK) != SND_SOC_DAIFMT_NB_NF) {
-+		return (-EINVAL);
-+	}
-+
-+	/* Set Audio Data Format */
-+	i_sabre_codec->fmt = fmt;
-+
-+	return 0;
-+}
-+
-+static int i_sabre_codec_dac_mute(struct snd_soc_dai *dai, int mute, int direction)
-+{
-+	struct snd_soc_component *component = dai->component;
-+
-+	if (mute) {
-+		snd_soc_component_update_bits(component, ISABRECODEC_REG_21, 0x01, 0x01);
-+	} else {
-+		snd_soc_component_update_bits(component, ISABRECODEC_REG_21, 0x01, 0x00);
-+	}
-+
-+	return 0;
-+}
-+
-+
-+static const struct snd_soc_dai_ops i_sabre_codec_dai_ops = {
-+	.startup      = i_sabre_codec_dai_startup,
-+	.hw_params    = i_sabre_codec_hw_params,
-+	.set_fmt      = i_sabre_codec_set_fmt,
-+	.mute_stream  = i_sabre_codec_dac_mute,
-+};
-+
-+static struct snd_soc_dai_driver i_sabre_codec_dai = {
-+	.name = "i-sabre-codec-dai",
-+	.playback = {
-+		.stream_name  = "Playback",
-+		.channels_min = 2,
-+		.channels_max = 2,
-+		.rates = SNDRV_PCM_RATE_CONTINUOUS,
-+		.rate_min = 8000,
-+		.rate_max = 1536000,
-+		.formats      = SNDRV_PCM_FMTBIT_S16_LE
-+				| SNDRV_PCM_FMTBIT_S32_LE,
-+	},
-+	.ops = &i_sabre_codec_dai_ops,
-+};
-+
-+static struct snd_soc_component_driver i_sabre_codec_codec_driver = {
-+		.controls         = i_sabre_codec_controls,
-+		.num_controls     = ARRAY_SIZE(i_sabre_codec_controls),
-+};
-+
-+
-+static const struct regmap_config i_sabre_codec_regmap = {
-+	.reg_bits         = 8,
-+	.val_bits         = 8,
-+	.max_register     = ISABRECODEC_MAX_REG,
-+
-+	.reg_defaults     = i_sabre_codec_reg_defaults,
-+	.num_reg_defaults = ARRAY_SIZE(i_sabre_codec_reg_defaults),
-+
-+	.writeable_reg    = i_sabre_codec_writeable,
-+	.readable_reg     = i_sabre_codec_readable,
-+	.volatile_reg     = i_sabre_codec_volatile,
-+
-+	.cache_type       = REGCACHE_RBTREE,
-+};
-+
-+
-+static int i_sabre_codec_probe(struct device *dev, struct regmap *regmap)
-+{
-+	struct i_sabre_codec_priv *i_sabre_codec;
-+	int ret;
-+
-+	i_sabre_codec = devm_kzalloc(dev, sizeof(*i_sabre_codec), GFP_KERNEL);
-+	if (!i_sabre_codec) {
-+		dev_err(dev, "devm_kzalloc");
-+		return (-ENOMEM);
-+	}
-+
-+	i_sabre_codec->regmap = regmap;
-+
-+	dev_set_drvdata(dev, i_sabre_codec);
-+
-+	ret = snd_soc_register_component(dev,
-+			&i_sabre_codec_codec_driver, &i_sabre_codec_dai, 1);
-+	if (ret != 0) {
-+		dev_err(dev, "Failed to register CODEC: %d\n", ret);
-+		return ret;
-+	}
-+
-+	return 0;
-+}
-+
-+static void i_sabre_codec_remove(struct device *dev)
-+{
-+	snd_soc_unregister_component(dev);
-+}
-+
-+
-+static int i_sabre_codec_i2c_probe(
-+		struct i2c_client *i2c, const struct i2c_device_id *id)
-+{
-+	struct regmap *regmap;
-+
-+	regmap = devm_regmap_init_i2c(i2c, &i_sabre_codec_regmap);
-+	if (IS_ERR(regmap)) {
-+		return PTR_ERR(regmap);
-+	}
-+
-+	return i_sabre_codec_probe(&i2c->dev, regmap);
-+}
-+
-+static void i_sabre_codec_i2c_remove(struct i2c_client *i2c)
-+{
-+	i_sabre_codec_remove(&i2c->dev);
-+}
-+
-+
-+static const struct i2c_device_id i_sabre_codec_i2c_id[] = {
-+	{ "i-sabre-codec", },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(i2c, i_sabre_codec_i2c_id);
-+
-+static const struct of_device_id i_sabre_codec_of_match[] = {
-+	{ .compatible = "audiophonics,i-sabre-codec", },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(of, i_sabre_codec_of_match);
-+
-+static struct i2c_driver i_sabre_codec_i2c_driver = {
-+	.driver = {
-+		.name           = "i-sabre-codec-i2c",
-+		.owner          = THIS_MODULE,
-+		.of_match_table = of_match_ptr(i_sabre_codec_of_match),
-+	},
-+	.probe    = i_sabre_codec_i2c_probe,
-+	.remove   = i_sabre_codec_i2c_remove,
-+	.id_table = i_sabre_codec_i2c_id,
-+};
-+module_i2c_driver(i_sabre_codec_i2c_driver);
-+
-+
-+MODULE_DESCRIPTION("ASoC I-Sabre Q2M codec driver");
-+MODULE_AUTHOR("Audiophonics <http://www.audiophonics.fr>");
-+MODULE_LICENSE("GPL");
---- /dev/null
-+++ b/sound/soc/codecs/i-sabre-codec.h
-@@ -0,0 +1,42 @@
-+/*
-+ * Driver for I-Sabre Q2M
-+ *
-+ * Author: Satoru Kawase
-+ * Modified by: Xiao Qingyong
-+ *      Copyright 2018 Audiophonics
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#ifndef _SND_SOC_ISABRECODEC
-+#define _SND_SOC_ISABRECODEC
-+
-+
-+/* ISABRECODEC Register Address */
-+#define ISABRECODEC_REG_01	0x01	/* Virtual Device ID  :  0x01 = es9038q2m */
-+#define ISABRECODEC_REG_02	0x02	/* API revision       :  0x01 = Revision 01 */
-+#define ISABRECODEC_REG_10	0x10	/* 0x01 = above 192kHz, 0x00 = otherwise */
-+#define ISABRECODEC_REG_20	0x20	/* 0 - 100 (decimal value, 0 = min., 100 = max.) */
-+#define ISABRECODEC_REG_21	0x21	/* 0x00 = Mute OFF, 0x01 = Mute ON */
-+#define ISABRECODEC_REG_22	0x22	
-+/*
-+   0x00 = brick wall,
-+   0x01 = corrected minimum phase fast,
-+   0x02 = minimum phase slow,
-+   0x03 = minimum phase fast,
-+   0x04 = linear phase slow,
-+   0x05 = linear phase fast,
-+   0x06 = apodizing fast,
-+*/
-+//#define ISABRECODEC_REG_23	0x23	/* reserved */
-+#define ISABRECODEC_REG_24	0x24	/* 0x00 = I2S, 0x01 = SPDIF */
-+#define ISABRECODEC_MAX_REG	0x24	/* Maximum Register Number */
-+
-+#endif /* _SND_SOC_ISABRECODEC */
---- /dev/null
-+++ b/sound/soc/codecs/ma120x0p.c
-@@ -0,0 +1,1381 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later
-+/*
-+ * ASoC Driver for Infineon Merus(TM) ma120x0p multi-level class-D amplifier
-+ *
-+ * Authors:	Ariel Muszkat <ariel.muszkat@gmail.com>
-+ * Jorgen Kragh Jakobsen <jorgen.kraghjakobsen@infineon.com>
-+ *
-+ * Copyright (C) 2019 Infineon Technologies AG
-+ *
-+ */
-+#include <linux/module.h>
-+#include <linux/moduleparam.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+#include <linux/pm_runtime.h>
-+#include <linux/i2c.h>
-+#include <linux/of_device.h>
-+#include <linux/spi/spi.h>
-+#include <linux/regmap.h>
-+#include <linux/regulator/consumer.h>
-+#include <linux/slab.h>
-+#include <linux/gpio/consumer.h>
-+#include <linux/gpio.h>
-+#include <sound/core.h>
-+#include <sound/pcm.h>
-+#include <sound/pcm_params.h>
-+#include <sound/soc.h>
-+#include <sound/soc-dapm.h>
-+#include <sound/initval.h>
-+#include <sound/tlv.h>
-+#include <linux/interrupt.h>
-+
-+#include <linux/kernel.h>
-+#include <linux/string.h>
-+#include <linux/fs.h>
-+#include <linux/uaccess.h>
-+
-+#ifndef _MA120X0P_
-+#define _MA120X0P_
-+//------------------------------------------------------------------manualPM---
-+// Select Manual PowerMode control
-+#define ma_manualpm__a 0
-+#define ma_manualpm__len 1
-+#define ma_manualpm__mask 0x40
-+#define ma_manualpm__shift 0x06
-+#define ma_manualpm__reset 0x00
-+//--------------------------------------------------------------------pm_man---
-+// manual selected power mode
-+#define ma_pm_man__a 0
-+#define ma_pm_man__len 2
-+#define ma_pm_man__mask 0x30
-+#define ma_pm_man__shift 0x04
-+#define ma_pm_man__reset 0x03
-+//------------------------------------------ ----------------------mthr_1to2---
-+// mod. index threshold value for pm1=>pm2 change.
-+#define ma_mthr_1to2__a 1
-+#define ma_mthr_1to2__len 8
-+#define ma_mthr_1to2__mask 0xff
-+#define ma_mthr_1to2__shift 0x00
-+#define ma_mthr_1to2__reset 0x3c
-+//-----------------------------------------------------------------mthr_2to1---
-+// mod. index threshold value for pm2=>pm1 change.
-+#define ma_mthr_2to1__a 2
-+#define ma_mthr_2to1__len 8
-+#define ma_mthr_2to1__mask 0xff
-+#define ma_mthr_2to1__shift 0x00
-+#define ma_mthr_2to1__reset 0x32
-+//-----------------------------------------------------------------mthr_2to3---
-+// mod. index threshold value for pm2=>pm3 change.
-+#define ma_mthr_2to3__a 3
-+#define ma_mthr_2to3__len 8
-+#define ma_mthr_2to3__mask 0xff
-+#define ma_mthr_2to3__shift 0x00
-+#define ma_mthr_2to3__reset 0x5a
-+//-----------------------------------------------------------------mthr_3to2---
-+// mod. index threshold value for pm3=>pm2 change.
-+#define ma_mthr_3to2__a 4
-+#define ma_mthr_3to2__len 8
-+#define ma_mthr_3to2__mask 0xff
-+#define ma_mthr_3to2__shift 0x00
-+#define ma_mthr_3to2__reset 0x50
-+//-------------------------------------------------------------pwmclkdiv_nom---
-+// pwm default clock divider value
-+#define ma_pwmclkdiv_nom__a 8
-+#define ma_pwmclkdiv_nom__len 8
-+#define ma_pwmclkdiv_nom__mask 0xff
-+#define ma_pwmclkdiv_nom__shift 0x00
-+#define ma_pwmclkdiv_nom__reset 0x26
-+//--------- ----------------------------------------------------ocp_latch_en---
-+// high to use permanently latching level-2 ocp
-+#define ma_ocp_latch_en__a 10
-+#define ma_ocp_latch_en__len 1
-+#define ma_ocp_latch_en__mask 0x02
-+#define ma_ocp_latch_en__shift 0x01
-+#define ma_ocp_latch_en__reset 0x00
-+//---------------------------------------------------------------lf_clamp_en---
-+// high (default) to enable lf int2+3 clamping on clip
-+#define ma_lf_clamp_en__a 10
-+#define ma_lf_clamp_en__len 1
-+#define ma_lf_clamp_en__mask 0x80
-+#define ma_lf_clamp_en__shift 0x07
-+#define ma_lf_clamp_en__reset 0x00
-+//-------------------------------------------------------pmcfg_btl_b.modtype---
-+//
-+#define ma_pmcfg_btl_b__modtype__a 18
-+#define ma_pmcfg_btl_b__modtype__len 2
-+#define ma_pmcfg_btl_b__modtype__mask 0x18
-+#define ma_pmcfg_btl_b__modtype__shift 0x03
-+#define ma_pmcfg_btl_b__modtype__reset 0x02
-+//-------------------------------------------------------pmcfg_btl_b.freqdiv---
-+#define ma_pmcfg_btl_b__freqdiv__a 18
-+#define ma_pmcfg_btl_b__freqdiv__len 2
-+#define ma_pmcfg_btl_b__freqdiv__mask 0x06
-+#define ma_pmcfg_btl_b__freqdiv__shift 0x01
-+#define ma_pmcfg_btl_b__freqdiv__reset 0x01
-+//----------------------------------------------------pmcfg_btl_b.lf_gain_ol---
-+//
-+#define ma_pmcfg_btl_b__lf_gain_ol__a 18
-+#define ma_pmcfg_btl_b__lf_gain_ol__len 1
-+#define ma_pmcfg_btl_b__lf_gain_ol__mask 0x01
-+#define ma_pmcfg_btl_b__lf_gain_ol__shift 0x00
-+#define ma_pmcfg_btl_b__lf_gain_ol__reset 0x01
-+//-------------------------------------------------------pmcfg_btl_c.freqdiv---
-+//
-+#define ma_pmcfg_btl_c__freqdiv__a 19
-+#define ma_pmcfg_btl_c__freqdiv__len 2
-+#define ma_pmcfg_btl_c__freqdiv__mask 0x06
-+#define ma_pmcfg_btl_c__freqdiv__shift 0x01
-+#define ma_pmcfg_btl_c__freqdiv__reset 0x01
-+//-------------------------------------------------------pmcfg_btl_c.modtype---
-+//
-+#define ma_pmcfg_btl_c__modtype__a 19
-+#define ma_pmcfg_btl_c__modtype__len 2
-+#define ma_pmcfg_btl_c__modtype__mask 0x18
-+#define ma_pmcfg_btl_c__modtype__shift 0x03
-+#define ma_pmcfg_btl_c__modtype__reset 0x01
-+//----------------------------------------------------pmcfg_btl_c.lf_gain_ol---
-+//
-+#define ma_pmcfg_btl_c__lf_gain_ol__a 19
-+#define ma_pmcfg_btl_c__lf_gain_ol__len 1
-+#define ma_pmcfg_btl_c__lf_gain_ol__mask 0x01
-+#define ma_pmcfg_btl_c__lf_gain_ol__shift 0x00
-+#define ma_pmcfg_btl_c__lf_gain_ol__reset 0x00
-+//-------------------------------------------------------pmcfg_btl_d.modtype---
-+//
-+#define ma_pmcfg_btl_d__modtype__a 20
-+#define ma_pmcfg_btl_d__modtype__len 2
-+#define ma_pmcfg_btl_d__modtype__mask 0x18
-+#define ma_pmcfg_btl_d__modtype__shift 0x03
-+#define ma_pmcfg_btl_d__modtype__reset 0x02
-+//-------------------------------------------------------pmcfg_btl_d.freqdiv---
-+//
-+#define ma_pmcfg_btl_d__freqdiv__a 20
-+#define ma_pmcfg_btl_d__freqdiv__len 2
-+#define ma_pmcfg_btl_d__freqdiv__mask 0x06
-+#define ma_pmcfg_btl_d__freqdiv__shift 0x01
-+#define ma_pmcfg_btl_d__freqdiv__reset 0x02
-+//----------------------------------------------------pmcfg_btl_d.lf_gain_ol---
-+//
-+#define ma_pmcfg_btl_d__lf_gain_ol__a 20
-+#define ma_pmcfg_btl_d__lf_gain_ol__len 1
-+#define ma_pmcfg_btl_d__lf_gain_ol__mask 0x01
-+#define ma_pmcfg_btl_d__lf_gain_ol__shift 0x00
-+#define ma_pmcfg_btl_d__lf_gain_ol__reset 0x00
-+//------------ -------------------------------------------pmcfg_se_a.modtype---
-+//
-+#define ma_pmcfg_se_a__modtype__a 21
-+#define ma_pmcfg_se_a__modtype__len 2
-+#define ma_pmcfg_se_a__modtype__mask 0x18
-+#define ma_pmcfg_se_a__modtype__shift 0x03
-+#define ma_pmcfg_se_a__modtype__reset 0x01
-+//--------------------------------------------------------pmcfg_se_a.freqdiv---
-+//
-+#define ma_pmcfg_se_a__freqdiv__a 21
-+#define ma_pmcfg_se_a__freqdiv__len 2
-+#define ma_pmcfg_se_a__freqdiv__mask 0x06
-+#define ma_pmcfg_se_a__freqdiv__shift 0x01
-+#define ma_pmcfg_se_a__freqdiv__reset 0x00
-+//-----------------------------------------------------pmcfg_se_a.lf_gain_ol---
-+//
-+#define ma_pmcfg_se_a__lf_gain_ol__a 21
-+#define ma_pmcfg_se_a__lf_gain_ol__len 1
-+#define ma_pmcfg_se_a__lf_gain_ol__mask 0x01
-+#define ma_pmcfg_se_a__lf_gain_ol__shift 0x00
-+#define ma_pmcfg_se_a__lf_gain_ol__reset 0x01
-+//-----------------------------------------------------pmcfg_se_b.lf_gain_ol---
-+//
-+#define ma_pmcfg_se_b__lf_gain_ol__a 22
-+#define ma_pmcfg_se_b__lf_gain_ol__len 1
-+#define ma_pmcfg_se_b__lf_gain_ol__mask 0x01
-+#define ma_pmcfg_se_b__lf_gain_ol__shift 0x00
-+#define ma_pmcfg_se_b__lf_gain_ol__reset 0x00
-+//--------------------------------------------------------pmcfg_se_b.freqdiv---
-+//
-+#define ma_pmcfg_se_b__freqdiv__a 22
-+#define ma_pmcfg_se_b__freqdiv__len 2
-+#define ma_pmcfg_se_b__freqdiv__mask 0x06
-+#define ma_pmcfg_se_b__freqdiv__shift 0x01
-+#define ma_pmcfg_se_b__freqdiv__reset 0x01
-+//--------------------------------------------------------pmcfg_se_b.modtype---
-+//
-+#define ma_pmcfg_se_b__modtype__a 22
-+#define ma_pmcfg_se_b__modtype__len 2
-+#define ma_pmcfg_se_b__modtype__mask 0x18
-+#define ma_pmcfg_se_b__modtype__shift 0x03
-+#define ma_pmcfg_se_b__modtype__reset 0x01
-+//----------------------------------------------------------balwaitcount_pm1---
-+// pm1 balancing period.
-+#define ma_balwaitcount_pm1__a 23
-+#define ma_balwaitcount_pm1__len 8
-+#define ma_balwaitcount_pm1__mask 0xff
-+#define ma_balwaitcount_pm1__shift 0x00
-+#define ma_balwaitcount_pm1__reset 0x14
-+//----------------------------------------------------------balwaitcount_pm2---
-+// pm2 balancing period.
-+#define ma_balwaitcount_pm2__a 24
-+#define ma_balwaitcount_pm2__len 8
-+#define ma_balwaitcount_pm2__mask 0xff
-+#define ma_balwaitcount_pm2__shift 0x00
-+#define ma_balwaitcount_pm2__reset 0x14
-+//----------------------------------------------------------balwaitcount_pm3---
-+// pm3 balancing period.
-+#define ma_balwaitcount_pm3__a 25
-+#define ma_balwaitcount_pm3__len 8
-+#define ma_balwaitcount_pm3__mask 0xff
-+#define ma_balwaitcount_pm3__shift 0x00
-+#define ma_balwaitcount_pm3__reset 0x1a
-+//-------------------------------------------------------------usespread_pm1---
-+// pm1 pwm spread-spectrum mode on/off.
-+#define ma_usespread_pm1__a 26
-+#define ma_usespread_pm1__len 1
-+#define ma_usespread_pm1__mask 0x40
-+#define ma_usespread_pm1__shift 0x06
-+#define ma_usespread_pm1__reset 0x00
-+//---------------------------------------------------------------dtsteps_pm1---
-+// pm1 dead time setting [10ns steps].
-+#define ma_dtsteps_pm1__a 26
-+#define ma_dtsteps_pm1__len 3
-+#define ma_dtsteps_pm1__mask 0x38
-+#define ma_dtsteps_pm1__shift 0x03
-+#define ma_dtsteps_pm1__reset 0x04
-+//---------------------------------------------------------------baltype_pm1---
-+// pm1 balancing sensor scheme.
-+#define ma_baltype_pm1__a 26
-+#define ma_baltype_pm1__len 3
-+#define ma_baltype_pm1__mask 0x07
-+#define ma_baltype_pm1__shift 0x00
-+#define ma_baltype_pm1__reset 0x00
-+//-------------------------------------------------------------usespread_pm2---
-+// pm2 pwm spread-spectrum mode on/off.
-+#define ma_usespread_pm2__a 27
-+#define ma_usespread_pm2__len 1
-+#define ma_usespread_pm2__mask 0x40
-+#define ma_usespread_pm2__shift 0x06
-+#define ma_usespread_pm2__reset 0x00
-+//---------------------------------------------------------------dtsteps_pm2---
-+// pm2 dead time setting [10ns steps].
-+#define ma_dtsteps_pm2__a 27
-+#define ma_dtsteps_pm2__len 3
-+#define ma_dtsteps_pm2__mask 0x38
-+#define ma_dtsteps_pm2__shift 0x03
-+#define ma_dtsteps_pm2__reset 0x03
-+//---------------------------------------------------------------baltype_pm2---
-+// pm2 balancing sensor scheme.
-+#define ma_baltype_pm2__a 27
-+#define ma_baltype_pm2__len 3
-+#define ma_baltype_pm2__mask 0x07
-+#define ma_baltype_pm2__shift 0x00
-+#define ma_baltype_pm2__reset 0x01
-+//-------------------------------------------------------------usespread_pm3---
-+// pm3 pwm spread-spectrum mode on/off.
-+#define ma_usespread_pm3__a 28
-+#define ma_usespread_pm3__len 1
-+#define ma_usespread_pm3__mask 0x40
-+#define ma_usespread_pm3__shift 0x06
-+#define ma_usespread_pm3__reset 0x00
-+//---------------------------------------------------------------dtsteps_pm3---
-+// pm3 dead time setting [10ns steps].
-+#define ma_dtsteps_pm3__a 28
-+#define ma_dtsteps_pm3__len 3
-+#define ma_dtsteps_pm3__mask 0x38
-+#define ma_dtsteps_pm3__shift 0x03
-+#define ma_dtsteps_pm3__reset 0x01
-+//---------------------------------------------------------------baltype_pm3---
-+// pm3 balancing sensor scheme.
-+#define ma_baltype_pm3__a 28
-+#define ma_baltype_pm3__len 3
-+#define ma_baltype_pm3__mask 0x07
-+#define ma_baltype_pm3__shift 0x00
-+#define ma_baltype_pm3__reset 0x03
-+//-----------------------------------------------------------------pmprofile---
-+// pm profile select. valid presets: 0-1-2-3-4. 5=> custom profile.
-+#define ma_pmprofile__a 29
-+#define ma_pmprofile__len 3
-+#define ma_pmprofile__mask 0x07
-+#define ma_pmprofile__shift 0x00
-+#define ma_pmprofile__reset 0x00
-+//-------------------------------------------------------------------pm3_man---
-+// custom profile pm3 contents. 0=>a,  1=>b,  2=>c,  3=>d
-+#define ma_pm3_man__a 30
-+#define ma_pm3_man__len 2
-+#define ma_pm3_man__mask 0x30
-+#define ma_pm3_man__shift 0x04
-+#define ma_pm3_man__reset 0x02
-+//-------------------------------------------------------------------pm2_man---
-+// custom profile pm2 contents. 0=>a,  1=>b,  2=>c,  3=>d
-+#define ma_pm2_man__a 30
-+#define ma_pm2_man__len 2
-+#define ma_pm2_man__mask 0x0c
-+#define ma_pm2_man__shift 0x02
-+#define ma_pm2_man__reset 0x03
-+//-------------------------------------------------------------------pm1_man---
-+// custom profile pm1 contents. 0=>a,  1=>b,  2=>c,  3=>d
-+#define ma_pm1_man__a 30
-+#define ma_pm1_man__len 2
-+#define ma_pm1_man__mask 0x03
-+#define ma_pm1_man__shift 0x00
-+#define ma_pm1_man__reset 0x03
-+//-----------------------------------------------------------ocp_latch_clear---
-+// low-high clears current ocp latched condition.
-+#define ma_ocp_latch_clear__a 32
-+#define ma_ocp_latch_clear__len 1
-+#define ma_ocp_latch_clear__mask 0x80
-+#define ma_ocp_latch_clear__shift 0x07
-+#define ma_ocp_latch_clear__reset 0x00
-+//-------------------------------------------------------------audio_in_mode---
-+// audio input mode; 0-1-2-3-4-5
-+#define ma_audio_in_mode__a 37
-+#define ma_audio_in_mode__len 3
-+#define ma_audio_in_mode__mask 0xe0
-+#define ma_audio_in_mode__shift 0x05
-+#define ma_audio_in_mode__reset 0x00
-+//-----------------------------------------------------------------eh_dcshdn---
-+// high to enable dc protection
-+#define ma_eh_dcshdn__a 38
-+#define ma_eh_dcshdn__len 1
-+#define ma_eh_dcshdn__mask 0x04
-+#define ma_eh_dcshdn__shift 0x02
-+#define ma_eh_dcshdn__reset 0x01
-+//---------------------------------------------------------audio_in_mode_ext---
-+// if set,  audio_in_mode is controlled from audio_in_mode register. if not set
-+//audio_in_mode is set from fuse bank setting
-+#define ma_audio_in_mode_ext__a 39
-+#define ma_audio_in_mode_ext__len 1
-+#define ma_audio_in_mode_ext__mask 0x20
-+#define ma_audio_in_mode_ext__shift 0x05
-+#define ma_audio_in_mode_ext__reset 0x00
-+//------------------------------------------------------------------eh_clear---
-+// flip to clear error registers
-+#define ma_eh_clear__a 45
-+#define ma_eh_clear__len 1
-+#define ma_eh_clear__mask 0x04
-+#define ma_eh_clear__shift 0x02
-+#define ma_eh_clear__reset 0x00
-+//----------------------------------------------------------thermal_compr_en---
-+// enable otw-contr.  input compression?
-+#define ma_thermal_compr_en__a 45
-+#define ma_thermal_compr_en__len 1
-+#define ma_thermal_compr_en__mask 0x20
-+#define ma_thermal_compr_en__shift 0x05
-+#define ma_thermal_compr_en__reset 0x01
-+//---------------------------------------------------------------system_mute---
-+// 1 = mute system,  0 = normal operation
-+#define ma_system_mute__a 45
-+#define ma_system_mute__len 1
-+#define ma_system_mute__mask 0x40
-+#define ma_system_mute__shift 0x06
-+#define ma_system_mute__reset 0x00
-+//------------------------------------------------------thermal_compr_max_db---
-+// audio limiter max thermal reduction
-+#define ma_thermal_compr_max_db__a 46
-+#define ma_thermal_compr_max_db__len 3
-+#define ma_thermal_compr_max_db__mask 0x07
-+#define ma_thermal_compr_max_db__shift 0x00
-+#define ma_thermal_compr_max_db__reset 0x04
-+//---------------------------------------------------------audio_proc_enable---
-+// enable audio proc,  bypass if not enabled
-+#define ma_audio_proc_enable__a 53
-+#define ma_audio_proc_enable__len 1
-+#define ma_audio_proc_enable__mask 0x08
-+#define ma_audio_proc_enable__shift 0x03
-+#define ma_audio_proc_enable__reset 0x00
-+//--------------------------------------------------------audio_proc_release---
-+// 00:slow,  01:normal,  10:fast
-+#define ma_audio_proc_release__a 53
-+#define ma_audio_proc_release__len 2
-+#define ma_audio_proc_release__mask 0x30
-+#define ma_audio_proc_release__shift 0x04
-+#define ma_audio_proc_release__reset 0x00
-+//---------------------------------------------------------audio_proc_attack---
-+// 00:slow,  01:normal,  10:fast
-+#define ma_audio_proc_attack__a 53
-+#define ma_audio_proc_attack__len 2
-+#define ma_audio_proc_attack__mask 0xc0
-+#define ma_audio_proc_attack__shift 0x06
-+#define ma_audio_proc_attack__reset 0x00
-+//----------------------------------------------------------------i2s_format---
-+// i2s basic data format,  000 = std. i2s,  001 = left justified (default)
-+#define ma_i2s_format__a 53
-+#define ma_i2s_format__len 3
-+#define ma_i2s_format__mask 0x07
-+#define ma_i2s_format__shift 0x00
-+#define ma_i2s_format__reset 0x01
-+//--------------------------------------------------audio_proc_limiterenable---
-+// 1: enable limiter,  0: disable limiter
-+#define ma_audio_proc_limiterenable__a 54
-+#define ma_audio_proc_limiterenable__len 1
-+#define ma_audio_proc_limiterenable__mask 0x40
-+#define ma_audio_proc_limiterenable__shift 0x06
-+#define ma_audio_proc_limiterenable__reset 0x00
-+//-----------------------------------------------------------audio_proc_mute---
-+// 1: mute,  0: unmute
-+#define ma_audio_proc_mute__a 54
-+#define ma_audio_proc_mute__len 1
-+#define ma_audio_proc_mute__mask 0x80
-+#define ma_audio_proc_mute__shift 0x07
-+#define ma_audio_proc_mute__reset 0x00
-+//---------------------------------------------------------------i2s_sck_pol---
-+// i2s sck polarity cfg. 0 = rising edge data change
-+#define ma_i2s_sck_pol__a 54
-+#define ma_i2s_sck_pol__len 1
-+#define ma_i2s_sck_pol__mask 0x01
-+#define ma_i2s_sck_pol__shift 0x00
-+#define ma_i2s_sck_pol__reset 0x01
-+//-------------------------------------------------------------i2s_framesize---
-+// i2s word length. 00 = 32bit,  01 = 24bit
-+#define ma_i2s_framesize__a 54
-+#define ma_i2s_framesize__len 2
-+#define ma_i2s_framesize__mask 0x18
-+#define ma_i2s_framesize__shift 0x03
-+#define ma_i2s_framesize__reset 0x00
-+//----------------------------------------------------------------i2s_ws_pol---
-+// i2s ws polarity. 0 = low first
-+#define ma_i2s_ws_pol__a 54
-+#define ma_i2s_ws_pol__len 1
-+#define ma_i2s_ws_pol__mask 0x02
-+#define ma_i2s_ws_pol__shift 0x01
-+#define ma_i2s_ws_pol__reset 0x00
-+//-----------------------------------------------------------------i2s_order---
-+// i2s word bit order. 0 = msb first
-+#define ma_i2s_order__a 54
-+#define ma_i2s_order__len 1
-+#define ma_i2s_order__mask 0x04
-+#define ma_i2s_order__shift 0x02
-+#define ma_i2s_order__reset 0x00
-+//------------------------------------------------------------i2s_rightfirst---
-+// i2s l/r word order; 0 = left first
-+#define ma_i2s_rightfirst__a 54
-+#define ma_i2s_rightfirst__len 1
-+#define ma_i2s_rightfirst__mask 0x20
-+#define ma_i2s_rightfirst__shift 0x05
-+#define ma_i2s_rightfirst__reset 0x00
-+//-------------------------------------------------------------vol_db_master---
-+// master volume db
-+#define ma_vol_db_master__a 64
-+#define ma_vol_db_master__len 8
-+#define ma_vol_db_master__mask 0xff
-+#define ma_vol_db_master__shift 0x00
-+#define ma_vol_db_master__reset 0x18
-+//------------------------------------------------------------vol_lsb_master---
-+// master volume lsb 1/4 steps
-+#define ma_vol_lsb_master__a 65
-+#define ma_vol_lsb_master__len 2
-+#define ma_vol_lsb_master__mask 0x03
-+#define ma_vol_lsb_master__shift 0x00
-+#define ma_vol_lsb_master__reset 0x00
-+//----------------------------------------------------------------vol_db_ch0---
-+// volume channel 0
-+#define ma_vol_db_ch0__a 66
-+#define ma_vol_db_ch0__len 8
-+#define ma_vol_db_ch0__mask 0xff
-+#define ma_vol_db_ch0__shift 0x00
-+#define ma_vol_db_ch0__reset 0x18
-+//----------------------------------------------------------------vol_db_ch1---
-+// volume channel 1
-+#define ma_vol_db_ch1__a 67
-+#define ma_vol_db_ch1__len 8
-+#define ma_vol_db_ch1__mask 0xff
-+#define ma_vol_db_ch1__shift 0x00
-+#define ma_vol_db_ch1__reset 0x18
-+//----------------------------------------------------------------vol_db_ch2---
-+// volume channel 2
-+#define ma_vol_db_ch2__a 68
-+#define ma_vol_db_ch2__len 8
-+#define ma_vol_db_ch2__mask 0xff
-+#define ma_vol_db_ch2__shift 0x00
-+#define ma_vol_db_ch2__reset 0x18
-+//----------------------------------------------------------------vol_db_ch3---
-+// volume channel 3
-+#define ma_vol_db_ch3__a 69
-+#define ma_vol_db_ch3__len 8
-+#define ma_vol_db_ch3__mask 0xff
-+#define ma_vol_db_ch3__shift 0x00
-+#define ma_vol_db_ch3__reset 0x18
-+//---------------------------------------------------------------vol_lsb_ch0---
-+// volume channel 1 - 1/4 steps
-+#define ma_vol_lsb_ch0__a 70
-+#define ma_vol_lsb_ch0__len 2
-+#define ma_vol_lsb_ch0__mask 0x03
-+#define ma_vol_lsb_ch0__shift 0x00
-+#define ma_vol_lsb_ch0__reset 0x00
-+//---------------------------------------------------------------vol_lsb_ch1---
-+// volume channel 3 - 1/4 steps
-+#define ma_vol_lsb_ch1__a 70
-+#define ma_vol_lsb_ch1__len 2
-+#define ma_vol_lsb_ch1__mask 0x0c
-+#define ma_vol_lsb_ch1__shift 0x02
-+#define ma_vol_lsb_ch1__reset 0x00
-+//---------------------------------------------------------------vol_lsb_ch2---
-+// volume channel 2 - 1/4 steps
-+#define ma_vol_lsb_ch2__a 70
-+#define ma_vol_lsb_ch2__len 2
-+#define ma_vol_lsb_ch2__mask 0x30
-+#define ma_vol_lsb_ch2__shift 0x04
-+#define ma_vol_lsb_ch2__reset 0x00
-+//---------------------------------------------------------------vol_lsb_ch3---
-+// volume channel 3 - 1/4 steps
-+#define ma_vol_lsb_ch3__a 70
-+#define ma_vol_lsb_ch3__len 2
-+#define ma_vol_lsb_ch3__mask 0xc0
-+#define ma_vol_lsb_ch3__shift 0x06
-+#define ma_vol_lsb_ch3__reset 0x00
-+//----------------------------------------------------------------thr_db_ch0---
-+// thr_db channel 0
-+#define ma_thr_db_ch0__a 71
-+#define ma_thr_db_ch0__len 8
-+#define ma_thr_db_ch0__mask 0xff
-+#define ma_thr_db_ch0__shift 0x00
-+#define ma_thr_db_ch0__reset 0x18
-+//----------------------------------------------------------------thr_db_ch1---
-+// thr db ch1
-+#define ma_thr_db_ch1__a 72
-+#define ma_thr_db_ch1__len 8
-+#define ma_thr_db_ch1__mask 0xff
-+#define ma_thr_db_ch1__shift 0x00
-+#define ma_thr_db_ch1__reset 0x18
-+//----------------------------------------------------------------thr_db_ch2---
-+// thr db ch2
-+#define ma_thr_db_ch2__a 73
-+#define ma_thr_db_ch2__len 8
-+#define ma_thr_db_ch2__mask 0xff
-+#define ma_thr_db_ch2__shift 0x00
-+#define ma_thr_db_ch2__reset 0x18
-+//----------------------------------------------------------------thr_db_ch3---
-+// threshold db ch3
-+#define ma_thr_db_ch3__a 74
-+#define ma_thr_db_ch3__len 8
-+#define ma_thr_db_ch3__mask 0xff
-+#define ma_thr_db_ch3__shift 0x00
-+#define ma_thr_db_ch3__reset 0x18
-+//---------------------------------------------------------------thr_lsb_ch0---
-+// thr lsb ch0
-+#define ma_thr_lsb_ch0__a 75
-+#define ma_thr_lsb_ch0__len 2
-+#define ma_thr_lsb_ch0__mask 0x03
-+#define ma_thr_lsb_ch0__shift 0x00
-+#define ma_thr_lsb_ch0__reset 0x00
-+//---------------------------------------------------------------thr_lsb_ch1---
-+// thr lsb ch1
-+#define ma_thr_lsb_ch1__a 75
-+#define ma_thr_lsb_ch1__len 2
-+#define ma_thr_lsb_ch1__mask 0x0c
-+#define ma_thr_lsb_ch1__shift 0x02
-+#define ma_thr_lsb_ch1__reset 0x00
-+//---------------------------------------------------------------thr_lsb_ch2---
-+// thr lsb ch2 1/4 db step
-+#define ma_thr_lsb_ch2__a 75
-+#define ma_thr_lsb_ch2__len 2
-+#define ma_thr_lsb_ch2__mask 0x30
-+#define ma_thr_lsb_ch2__shift 0x04
-+#define ma_thr_lsb_ch2__reset 0x00
-+//---------------------------------------------------------------thr_lsb_ch3---
-+// threshold lsb ch3
-+#define ma_thr_lsb_ch3__a 75
-+#define ma_thr_lsb_ch3__len 2
-+#define ma_thr_lsb_ch3__mask 0xc0
-+#define ma_thr_lsb_ch3__shift 0x06
-+#define ma_thr_lsb_ch3__reset 0x00
-+//-----------------------------------------------------------dcu_mon0.pm_mon---
-+// power mode monitor channel 0
-+#define ma_dcu_mon0__pm_mon__a 96
-+#define ma_dcu_mon0__pm_mon__len 2
-+#define ma_dcu_mon0__pm_mon__mask 0x03
-+#define ma_dcu_mon0__pm_mon__shift 0x00
-+#define ma_dcu_mon0__pm_mon__reset 0x00
-+//-----------------------------------------------------dcu_mon0.freqmode_mon---
-+// frequence mode monitor channel 0
-+#define ma_dcu_mon0__freqmode_mon__a 96
-+#define ma_dcu_mon0__freqmode_mon__len 3
-+#define ma_dcu_mon0__freqmode_mon__mask 0x70
-+#define ma_dcu_mon0__freqmode_mon__shift 0x04
-+#define ma_dcu_mon0__freqmode_mon__reset 0x00
-+//-------------------------------------------------------dcu_mon0.pps_passed---
-+// dcu0 pps completion indicator
-+#define ma_dcu_mon0__pps_passed__a 96
-+#define ma_dcu_mon0__pps_passed__len 1
-+#define ma_dcu_mon0__pps_passed__mask 0x80
-+#define ma_dcu_mon0__pps_passed__shift 0x07
-+#define ma_dcu_mon0__pps_passed__reset 0x00
-+//----------------------------------------------------------dcu_mon0.ocp_mon---
-+// ocp monitor channel 0
-+#define ma_dcu_mon0__ocp_mon__a 97
-+#define ma_dcu_mon0__ocp_mon__len 1
-+#define ma_dcu_mon0__ocp_mon__mask 0x01
-+#define ma_dcu_mon0__ocp_mon__shift 0x00
-+#define ma_dcu_mon0__ocp_mon__reset 0x00
-+//--------------------------------------------------------dcu_mon0.vcfly1_ok---
-+// cfly1 protection monitor channel 0.
-+#define ma_dcu_mon0__vcfly1_ok__a 97
-+#define ma_dcu_mon0__vcfly1_ok__len 1
-+#define ma_dcu_mon0__vcfly1_ok__mask 0x02
-+#define ma_dcu_mon0__vcfly1_ok__shift 0x01
-+#define ma_dcu_mon0__vcfly1_ok__reset 0x00
-+//--------------------------------------------------------dcu_mon0.vcfly2_ok---
-+// cfly2 protection monitor channel 0.
-+#define ma_dcu_mon0__vcfly2_ok__a 97
-+#define ma_dcu_mon0__vcfly2_ok__len 1
-+#define ma_dcu_mon0__vcfly2_ok__mask 0x04
-+#define ma_dcu_mon0__vcfly2_ok__shift 0x02
-+#define ma_dcu_mon0__vcfly2_ok__reset 0x00
-+//----------------------------------------------------------dcu_mon0.pvdd_ok---
-+// dcu0 pvdd monitor
-+#define ma_dcu_mon0__pvdd_ok__a 97
-+#define ma_dcu_mon0__pvdd_ok__len 1
-+#define ma_dcu_mon0__pvdd_ok__mask 0x08
-+#define ma_dcu_mon0__pvdd_ok__shift 0x03
-+#define ma_dcu_mon0__pvdd_ok__reset 0x00
-+//-----------------------------------------------------------dcu_mon0.vdd_ok---
-+// dcu0 vdd monitor
-+#define ma_dcu_mon0__vdd_ok__a 97
-+#define ma_dcu_mon0__vdd_ok__len 1
-+#define ma_dcu_mon0__vdd_ok__mask 0x10
-+#define ma_dcu_mon0__vdd_ok__shift 0x04
-+#define ma_dcu_mon0__vdd_ok__reset 0x00
-+//-------------------------------------------------------------dcu_mon0.mute---
-+// dcu0 mute monitor
-+#define ma_dcu_mon0__mute__a 97
-+#define ma_dcu_mon0__mute__len 1
-+#define ma_dcu_mon0__mute__mask 0x20
-+#define ma_dcu_mon0__mute__shift 0x05
-+#define ma_dcu_mon0__mute__reset 0x00
-+//------------------------------------------------------------dcu_mon0.m_mon---
-+// m sense monitor channel 0
-+#define ma_dcu_mon0__m_mon__a 98
-+#define ma_dcu_mon0__m_mon__len 8
-+#define ma_dcu_mon0__m_mon__mask 0xff
-+#define ma_dcu_mon0__m_mon__shift 0x00
-+#define ma_dcu_mon0__m_mon__reset 0x00
-+//-----------------------------------------------------------dcu_mon1.pm_mon---
-+// power mode monitor channel 1
-+#define ma_dcu_mon1__pm_mon__a 100
-+#define ma_dcu_mon1__pm_mon__len 2
-+#define ma_dcu_mon1__pm_mon__mask 0x03
-+#define ma_dcu_mon1__pm_mon__shift 0x00
-+#define ma_dcu_mon1__pm_mon__reset 0x00
-+//-----------------------------------------------------dcu_mon1.freqmode_mon---
-+// frequence mode monitor channel 1
-+#define ma_dcu_mon1__freqmode_mon__a 100
-+#define ma_dcu_mon1__freqmode_mon__len 3
-+#define ma_dcu_mon1__freqmode_mon__mask 0x70
-+#define ma_dcu_mon1__freqmode_mon__shift 0x04
-+#define ma_dcu_mon1__freqmode_mon__reset 0x00
-+//-------------------------------------------------------dcu_mon1.pps_passed---
-+// dcu1 pps completion indicator
-+#define ma_dcu_mon1__pps_passed__a 100
-+#define ma_dcu_mon1__pps_passed__len 1
-+#define ma_dcu_mon1__pps_passed__mask 0x80
-+#define ma_dcu_mon1__pps_passed__shift 0x07
-+#define ma_dcu_mon1__pps_passed__reset 0x00
-+//----------------------------------------------------------dcu_mon1.ocp_mon---
-+// ocp monitor channel 1
-+#define ma_dcu_mon1__ocp_mon__a 101
-+#define ma_dcu_mon1__ocp_mon__len 1
-+#define ma_dcu_mon1__ocp_mon__mask 0x01
-+#define ma_dcu_mon1__ocp_mon__shift 0x00
-+#define ma_dcu_mon1__ocp_mon__reset 0x00
-+//--------------------------------------------------------dcu_mon1.vcfly1_ok---
-+// cfly1 protcetion monitor channel 1
-+#define ma_dcu_mon1__vcfly1_ok__a 101
-+#define ma_dcu_mon1__vcfly1_ok__len 1
-+#define ma_dcu_mon1__vcfly1_ok__mask 0x02
-+#define ma_dcu_mon1__vcfly1_ok__shift 0x01
-+#define ma_dcu_mon1__vcfly1_ok__reset 0x00
-+//--------------------------------------------------------dcu_mon1.vcfly2_ok---
-+// cfly2 protection monitor channel 1
-+#define ma_dcu_mon1__vcfly2_ok__a 101
-+#define ma_dcu_mon1__vcfly2_ok__len 1
-+#define ma_dcu_mon1__vcfly2_ok__mask 0x04
-+#define ma_dcu_mon1__vcfly2_ok__shift 0x02
-+#define ma_dcu_mon1__vcfly2_ok__reset 0x00
-+//----------------------------------------------------------dcu_mon1.pvdd_ok---
-+// dcu1 pvdd monitor
-+#define ma_dcu_mon1__pvdd_ok__a 101
-+#define ma_dcu_mon1__pvdd_ok__len 1
-+#define ma_dcu_mon1__pvdd_ok__mask 0x08
-+#define ma_dcu_mon1__pvdd_ok__shift 0x03
-+#define ma_dcu_mon1__pvdd_ok__reset 0x00
-+//-----------------------------------------------------------dcu_mon1.vdd_ok---
-+// dcu1 vdd monitor
-+#define ma_dcu_mon1__vdd_ok__a 101
-+#define ma_dcu_mon1__vdd_ok__len 1
-+#define ma_dcu_mon1__vdd_ok__mask 0x10
-+#define ma_dcu_mon1__vdd_ok__shift 0x04
-+#define ma_dcu_mon1__vdd_ok__reset 0x00
-+//-------------------------------------------------------------dcu_mon1.mute---
-+// dcu1 mute monitor
-+#define ma_dcu_mon1__mute__a 101
-+#define ma_dcu_mon1__mute__len 1
-+#define ma_dcu_mon1__mute__mask 0x20
-+#define ma_dcu_mon1__mute__shift 0x05
-+#define ma_dcu_mon1__mute__reset 0x00
-+//------------------------------------------------------------dcu_mon1.m_mon---
-+// m sense monitor channel 1
-+#define ma_dcu_mon1__m_mon__a 102
-+#define ma_dcu_mon1__m_mon__len 8
-+#define ma_dcu_mon1__m_mon__mask 0xff
-+#define ma_dcu_mon1__m_mon__shift 0x00
-+#define ma_dcu_mon1__m_mon__reset 0x00
-+//--------------------------------------------------------dcu_mon0.sw_enable---
-+// dcu0 switch enable monitor
-+#define ma_dcu_mon0__sw_enable__a 104
-+#define ma_dcu_mon0__sw_enable__len 1
-+#define ma_dcu_mon0__sw_enable__mask 0x40
-+#define ma_dcu_mon0__sw_enable__shift 0x06
-+#define ma_dcu_mon0__sw_enable__reset 0x00
-+//--------------------------------------------------------dcu_mon1.sw_enable---
-+// dcu1 switch enable monitor
-+#define ma_dcu_mon1__sw_enable__a 104
-+#define ma_dcu_mon1__sw_enable__len 1
-+#define ma_dcu_mon1__sw_enable__mask 0x80
-+#define ma_dcu_mon1__sw_enable__shift 0x07
-+#define ma_dcu_mon1__sw_enable__reset 0x00
-+//------------------------------------------------------------hvboot0_ok_mon---
-+// hvboot0_ok for test/debug
-+#define ma_hvboot0_ok_mon__a 105
-+#define ma_hvboot0_ok_mon__len 1
-+#define ma_hvboot0_ok_mon__mask 0x40
-+#define ma_hvboot0_ok_mon__shift 0x06
-+#define ma_hvboot0_ok_mon__reset 0x00
-+//------------------------------------------------------------hvboot1_ok_mon---
-+// hvboot1_ok for test/debug
-+#define ma_hvboot1_ok_mon__a 105
-+#define ma_hvboot1_ok_mon__len 1
-+#define ma_hvboot1_ok_mon__mask 0x80
-+#define ma_hvboot1_ok_mon__shift 0x07
-+#define ma_hvboot1_ok_mon__reset 0x00
-+//-----------------------------------------------------------------error_acc---
-+// accumulated errors,  at and after triggering
-+#define ma_error_acc__a 109
-+#define ma_error_acc__len 8
-+#define ma_error_acc__mask 0xff
-+#define ma_error_acc__shift 0x00
-+#define ma_error_acc__reset 0x00
-+//-------------------------------------------------------------i2s_data_rate---
-+// detected i2s data rate: 00/01/10 = x1/x2/x4
-+#define ma_i2s_data_rate__a 116
-+#define ma_i2s_data_rate__len 2
-+#define ma_i2s_data_rate__mask 0x03
-+#define ma_i2s_data_rate__shift 0x00
-+#define ma_i2s_data_rate__reset 0x00
-+//---------------------------------------------------------audio_in_mode_mon---
-+// audio input mode monitor
-+#define ma_audio_in_mode_mon__a 116
-+#define ma_audio_in_mode_mon__len 3
-+#define ma_audio_in_mode_mon__mask 0x1c
-+#define ma_audio_in_mode_mon__shift 0x02
-+#define ma_audio_in_mode_mon__reset 0x00
-+//------------------------------------------------------------------msel_mon---
-+// msel[2:0] monitor register
-+#define ma_msel_mon__a 117
-+#define ma_msel_mon__len 3
-+#define ma_msel_mon__mask 0x07
-+#define ma_msel_mon__shift 0x00
-+#define ma_msel_mon__reset 0x00
-+//---------------------------------------------------------------------error---
-+// current error flag monitor reg - for app. ctrl.
-+#define ma_error__a 124
-+#define ma_error__len 8
-+#define ma_error__mask 0xff
-+#define ma_error__shift 0x00
-+#define ma_error__reset 0x00
-+//----------------------------------------------------audio_proc_limiter_mon---
-+// b7-b4: channel 3-0 limiter active
-+#define ma_audio_proc_limiter_mon__a 126
-+#define ma_audio_proc_limiter_mon__len 4
-+#define ma_audio_proc_limiter_mon__mask 0xf0
-+#define ma_audio_proc_limiter_mon__shift 0x04
-+#define ma_audio_proc_limiter_mon__reset 0x00
-+//-------------------------------------------------------audio_proc_clip_mon---
-+// b3-b0: channel 3-0 clipping monitor
-+#define ma_audio_proc_clip_mon__a 126
-+#define ma_audio_proc_clip_mon__len 4
-+#define ma_audio_proc_clip_mon__mask 0x0f
-+#define ma_audio_proc_clip_mon__shift 0x00
-+#define ma_audio_proc_clip_mon__reset 0x00
-+#endif
-+
-+#define SOC_ENUM_ERR(xname, xenum)\
-+{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\
-+	.access = SNDRV_CTL_ELEM_ACCESS_READ,\
-+	.info = snd_soc_info_enum_double,\
-+	.get = snd_soc_get_enum_double, .put = snd_soc_put_enum_double,\
-+	.private_value = (unsigned long)&(xenum) }
-+
-+static struct i2c_client *i2c;
-+
-+struct ma120x0p_priv {
-+	struct regmap *regmap;
-+	int mclk_div;
-+	struct snd_soc_component *component;
-+	struct gpio_desc *enable_gpio;
-+	struct gpio_desc *mute_gpio;
-+	struct gpio_desc *booster_gpio;
-+	struct gpio_desc *error_gpio;
-+};
-+
-+static struct ma120x0p_priv *priv_data;
-+
-+//Used to share the IRQ number within this file
-+static unsigned int irqNumber;
-+
-+// Function prototype for the custom IRQ handler function
-+static irqreturn_t ma120x0p_irq_handler(int irq, void *data);
-+
-+//Alsa Controls
-+static const char * const limenable_text[] = {"Bypassed", "Enabled"};
-+static const char * const limatack_text[] = {"Slow", "Normal", "Fast"};
-+static const char * const limrelease_text[] = {"Slow", "Normal", "Fast"};
-+
-+static const char * const err_flycap_text[] = {"Ok", "Error"};
-+static const char * const err_overcurr_text[] = {"Ok", "Error"};
-+static const char * const err_pllerr_text[] = {"Ok", "Error"};
-+static const char * const err_pvddunder_text[] = {"Ok", "Error"};
-+static const char * const err_overtempw_text[] = {"Ok", "Error"};
-+static const char * const err_overtempe_text[] = {"Ok", "Error"};
-+static const char * const err_pinlowimp_text[] = {"Ok", "Error"};
-+static const char * const err_dcprot_text[] = {"Ok", "Error"};
-+
-+static const char * const pwr_mode_prof_text[] = {"PMF0", "PMF1", "PMF2",
-+"PMF3", "PMF4"};
-+
-+static const struct soc_enum lim_enable_ctrl =
-+	SOC_ENUM_SINGLE(ma_audio_proc_limiterenable__a,
-+		ma_audio_proc_limiterenable__shift,
-+		ma_audio_proc_limiterenable__len + 1,
-+		limenable_text);
-+static const struct soc_enum limatack_ctrl =
-+	SOC_ENUM_SINGLE(ma_audio_proc_attack__a,
-+		ma_audio_proc_attack__shift,
-+		ma_audio_proc_attack__len + 1,
-+		limatack_text);
-+static const struct soc_enum limrelease_ctrl =
-+	SOC_ENUM_SINGLE(ma_audio_proc_release__a,
-+		ma_audio_proc_release__shift,
-+		ma_audio_proc_release__len + 1,
-+		limrelease_text);
-+static const struct soc_enum err_flycap_ctrl =
-+	SOC_ENUM_SINGLE(ma_error__a, 0, 3, err_flycap_text);
-+static const struct soc_enum err_overcurr_ctrl =
-+	SOC_ENUM_SINGLE(ma_error__a, 1, 3, err_overcurr_text);
-+static const struct soc_enum err_pllerr_ctrl =
-+	SOC_ENUM_SINGLE(ma_error__a, 2, 3, err_pllerr_text);
-+static const struct soc_enum err_pvddunder_ctrl =
-+	SOC_ENUM_SINGLE(ma_error__a, 3, 3, err_pvddunder_text);
-+static const struct soc_enum err_overtempw_ctrl =
-+	SOC_ENUM_SINGLE(ma_error__a, 4, 3, err_overtempw_text);
-+static const struct soc_enum err_overtempe_ctrl =
-+	SOC_ENUM_SINGLE(ma_error__a, 5, 3, err_overtempe_text);
-+static const struct soc_enum err_pinlowimp_ctrl =
-+	SOC_ENUM_SINGLE(ma_error__a, 6, 3, err_pinlowimp_text);
-+static const struct soc_enum err_dcprot_ctrl =
-+	SOC_ENUM_SINGLE(ma_error__a, 7, 3, err_dcprot_text);
-+static const struct soc_enum pwr_mode_prof_ctrl =
-+	SOC_ENUM_SINGLE(ma_pmprofile__a, ma_pmprofile__shift, 5,
-+		pwr_mode_prof_text);
-+
-+static const char * const pwr_mode_texts[] = {
-+		"Dynamic power mode",
-+		"Power mode 1",
-+		"Power mode 2",
-+		"Power mode 3",
-+	};
-+
-+static const int pwr_mode_values[] = {
-+		0x10,
-+		0x50,
-+		0x60,
-+		0x70,
-+	};
-+
-+static SOC_VALUE_ENUM_SINGLE_DECL(pwr_mode_ctrl,
-+	ma_pm_man__a, 0, 0x70,
-+	pwr_mode_texts,
-+	pwr_mode_values);
-+
-+static const DECLARE_TLV_DB_SCALE(ma120x0p_vol_tlv, -5000, 100,  0);
-+static const DECLARE_TLV_DB_SCALE(ma120x0p_lim_tlv, -14400, 100,  0);
-+static const DECLARE_TLV_DB_SCALE(ma120x0p_lr_tlv, -5000, 100,  0);
-+
-+static const struct snd_kcontrol_new ma120x0p_snd_controls[] = {
-+	//Master Volume
-+	SOC_SINGLE_RANGE_TLV("A.Mstr Vol Volume",
-+		ma_vol_db_master__a, 0, 0x18, 0xa8, 1, ma120x0p_vol_tlv),
-+
-+	//L-R Volume ch0
-+	SOC_SINGLE_RANGE_TLV("B.L Vol Volume",
-+		ma_vol_db_ch0__a, 0, 0x18, 0x4a, 1, ma120x0p_lr_tlv),
-+	SOC_SINGLE_RANGE_TLV("C.R Vol Volume",
-+		ma_vol_db_ch1__a, 0, 0x18, 0x4a, 1, ma120x0p_lr_tlv),
-+
-+	//L-R Limiter Threshold ch0-ch1
-+	SOC_DOUBLE_R_RANGE_TLV("D.Lim thresh Volume",
-+		ma_thr_db_ch0__a, ma_thr_db_ch1__a, 0, 0x0e, 0x4a, 1,
-+		ma120x0p_lim_tlv),
-+
-+	//Enum Switches/Selectors
-+	//SOC_ENUM("E.AudioProc Mute", audioproc_mute_ctrl),
-+	SOC_ENUM("F.Limiter Enable", lim_enable_ctrl),
-+	SOC_ENUM("G.Limiter Attck", limatack_ctrl),
-+	SOC_ENUM("H.Limiter Rls", limrelease_ctrl),
-+
-+	//Enum Error Monitor (read-only)
-+	SOC_ENUM_ERR("I.Err flycap", err_flycap_ctrl),
-+	SOC_ENUM_ERR("J.Err overcurr", err_overcurr_ctrl),
-+	SOC_ENUM_ERR("K.Err pllerr", err_pllerr_ctrl),
-+	SOC_ENUM_ERR("L.Err pvddunder", err_pvddunder_ctrl),
-+	SOC_ENUM_ERR("M.Err overtempw", err_overtempw_ctrl),
-+	SOC_ENUM_ERR("N.Err overtempe", err_overtempe_ctrl),
-+	SOC_ENUM_ERR("O.Err pinlowimp", err_pinlowimp_ctrl),
-+	SOC_ENUM_ERR("P.Err dcprot", err_dcprot_ctrl),
-+
-+	//Power modes profiles
-+	SOC_ENUM("Q.PM Prof", pwr_mode_prof_ctrl),
-+
-+	// Power mode selection (Dynamic,1,2,3)
-+	SOC_ENUM("R.Power Mode", pwr_mode_ctrl),
-+};
-+
-+//Machine Driver
-+static int ma120x0p_hw_params(struct snd_pcm_substream *substream,
-+	struct snd_pcm_hw_params *params, struct snd_soc_dai *dai)
-+{
-+	u16 blen = 0x00;
-+
-+	struct snd_soc_component *component = dai->component;
-+
-+	priv_data->component = component;
-+
-+	switch (params_format(params)) {
-+	case SNDRV_PCM_FORMAT_S16_LE:
-+		blen = 0x10;
-+		break;
-+	case SNDRV_PCM_FORMAT_S24_LE:
-+		blen = 0x00;
-+		break;
-+	case SNDRV_PCM_FORMAT_S32_LE:
-+		blen = 0x00;
-+		break;
-+	default:
-+		dev_err(dai->dev, "Unsupported word length: %u\n",
-+		params_format(params));
-+		return -EINVAL;
-+	}
-+
-+	// set word length
-+	snd_soc_component_update_bits(component, ma_i2s_framesize__a,
-+		ma_i2s_framesize__mask, blen);
-+
-+	return 0;
-+}
-+
-+static int ma120x0p_mute_stream(struct snd_soc_dai *dai, int mute, int stream)
-+{
-+	int val = 0;
-+
-+	struct ma120x0p_priv *ma120x0p;
-+
-+	struct snd_soc_component *component = dai->component;
-+
-+	ma120x0p = snd_soc_component_get_drvdata(component);
-+
-+	if (mute)
-+		val = 0;
-+	else
-+		val = 1;
-+
-+	gpiod_set_value_cansleep(priv_data->mute_gpio, val);
-+
-+	return 0;
-+}
-+
-+static const struct snd_soc_dai_ops ma120x0p_dai_ops = {
-+	.hw_params		=	ma120x0p_hw_params,
-+	.mute_stream	=	ma120x0p_mute_stream,
-+};
-+
-+static struct snd_soc_dai_driver ma120x0p_dai = {
-+	.name		= "ma120x0p-amp",
-+	.playback	=	{
-+		.stream_name	= "Playback",
-+		.channels_min	= 2,
-+		.channels_max	= 2,
-+		.rates = SNDRV_PCM_RATE_CONTINUOUS,
-+		.rate_min = 44100,
-+		.rate_max = 192000,
-+		.formats = SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE
-+	},
-+	.ops        = &ma120x0p_dai_ops,
-+};
-+
-+//Codec Driver
-+static int ma120x0p_clear_err(struct snd_soc_component *component)
-+{
-+	int ret = 0;
-+
-+	struct ma120x0p_priv *ma120x0p;
-+
-+	ma120x0p = snd_soc_component_get_drvdata(component);
-+
-+	ret = snd_soc_component_update_bits(component,
-+		ma_eh_clear__a, ma_eh_clear__mask, 0x00);
-+	if (ret < 0)
-+		return ret;
-+
-+	ret = snd_soc_component_update_bits(component,
-+		ma_eh_clear__a, ma_eh_clear__mask, 0x04);
-+	if (ret < 0)
-+		return ret;
-+
-+	ret = snd_soc_component_update_bits(component,
-+		ma_eh_clear__a, ma_eh_clear__mask, 0x00);
-+	if (ret < 0)
-+		return ret;
-+
-+	return 0;
-+}
-+
-+static void ma120x0p_remove(struct snd_soc_component *component)
-+{
-+	struct ma120x0p_priv *ma120x0p;
-+
-+	ma120x0p = snd_soc_component_get_drvdata(component);
-+}
-+
-+static int ma120x0p_probe(struct snd_soc_component *component)
-+{
-+	struct ma120x0p_priv *ma120x0p;
-+
-+	int ret = 0;
-+
-+	i2c = container_of(component->dev, struct i2c_client, dev);
-+
-+	ma120x0p = snd_soc_component_get_drvdata(component);
-+
-+	//Reset error
-+	ma120x0p_clear_err(component);
-+	if (ret < 0)
-+		return ret;
-+
-+	// set serial audio format I2S and enable audio processor
-+	ret = snd_soc_component_write(component, ma_i2s_format__a, 0x08);
-+	if (ret < 0)
-+		return ret;
-+
-+	// Enable audio limiter
-+	ret = snd_soc_component_update_bits(component,
-+		ma_audio_proc_limiterenable__a,
-+		ma_audio_proc_limiterenable__mask, 0x40);
-+	if (ret < 0)
-+		return ret;
-+
-+	// Set lim attack to fast
-+	ret = snd_soc_component_update_bits(component,
-+		ma_audio_proc_attack__a, ma_audio_proc_attack__mask, 0x80);
-+	if (ret < 0)
-+		return ret;
-+
-+	// Set lim attack to low
-+	ret = snd_soc_component_update_bits(component,
-+		ma_audio_proc_release__a, ma_audio_proc_release__mask, 0x00);
-+	if (ret < 0)
-+		return ret;
-+
-+	// set volume to 0dB
-+	ret = snd_soc_component_write(component, ma_vol_db_master__a, 0x18);
-+	if (ret < 0)
-+		return ret;
-+
-+	// set ch0 lim thresh to -15dB
-+	ret = snd_soc_component_write(component, ma_thr_db_ch0__a, 0x27);
-+	if (ret < 0)
-+		return ret;
-+
-+	// set ch1 lim thresh to -15dB
-+	ret = snd_soc_component_write(component, ma_thr_db_ch1__a, 0x27);
-+	if (ret < 0)
-+		return ret;
-+
-+	//Check for errors
-+	ret = snd_soc_component_test_bits(component, ma_error_acc__a, 0x00, 0);
-+	if (ret < 0)
-+		return ret;
-+	ret = snd_soc_component_test_bits(component, ma_error_acc__a, 0x01, 0);
-+	if (ret < 0)
-+		return ret;
-+	ret = snd_soc_component_test_bits(component, ma_error_acc__a, 0x02, 0);
-+	if (ret < 0)
-+		return ret;
-+	ret = snd_soc_component_test_bits(component, ma_error_acc__a, 0x08, 0);
-+	if (ret < 0)
-+		return ret;
-+	ret = snd_soc_component_test_bits(component, ma_error_acc__a, 0x10, 0);
-+	if (ret < 0)
-+		return ret;
-+	ret = snd_soc_component_test_bits(component, ma_error_acc__a, 0x20, 0);
-+	if (ret < 0)
-+		return ret;
-+	ret = snd_soc_component_test_bits(component, ma_error_acc__a, 0x40, 0);
-+	if (ret < 0)
-+		return ret;
-+	ret = snd_soc_component_test_bits(component, ma_error_acc__a, 0x80, 0);
-+	if (ret < 0)
-+		return ret;
-+
-+	return 0;
-+}
-+
-+static int ma120x0p_set_bias_level(struct snd_soc_component *component,
-+	enum snd_soc_bias_level level)
-+{
-+	int ret = 0;
-+
-+	struct ma120x0p_priv *ma120x0p;
-+
-+	ma120x0p = snd_soc_component_get_drvdata(component);
-+
-+	switch (level) {
-+	case SND_SOC_BIAS_ON:
-+		break;
-+
-+	case SND_SOC_BIAS_PREPARE:
-+		break;
-+
-+	case SND_SOC_BIAS_STANDBY:
-+		ret = gpiod_get_value_cansleep(priv_data->enable_gpio);
-+		if (ret != 0) {
-+			dev_err(component->dev, "Device ma120x0p disabled in STANDBY BIAS: %d\n",
-+			ret);
-+			return ret;
-+		}
-+		break;
-+
-+	case SND_SOC_BIAS_OFF:
-+		break;
-+	}
-+
-+	return 0;
-+}
-+
-+static const struct snd_soc_dapm_widget ma120x0p_dapm_widgets[] = {
-+	SND_SOC_DAPM_OUTPUT("OUT_A"),
-+	SND_SOC_DAPM_OUTPUT("OUT_B"),
-+};
-+
-+static const struct snd_soc_dapm_route ma120x0p_dapm_routes[] = {
-+	{ "OUT_B",  NULL, "Playback" },
-+	{ "OUT_A",  NULL, "Playback" },
-+};
-+
-+static const struct snd_soc_component_driver ma120x0p_component_driver = {
-+	.probe = ma120x0p_probe,
-+	.remove = ma120x0p_remove,
-+	.set_bias_level = ma120x0p_set_bias_level,
-+	.dapm_widgets		= ma120x0p_dapm_widgets,
-+	.num_dapm_widgets	= ARRAY_SIZE(ma120x0p_dapm_widgets),
-+	.dapm_routes		= ma120x0p_dapm_routes,
-+	.num_dapm_routes	= ARRAY_SIZE(ma120x0p_dapm_routes),
-+	.controls = ma120x0p_snd_controls,
-+	.num_controls = ARRAY_SIZE(ma120x0p_snd_controls),
-+	.use_pmdown_time	= 1,
-+	.endianness		= 1,
-+};
-+
-+//I2C Driver
-+static const struct reg_default ma120x0p_reg_defaults[] = {
-+	{	0x01,	0x3c	},
-+};
-+
-+static bool ma120x0p_reg_volatile(struct device *dev, unsigned int reg)
-+{
-+	switch (reg) {
-+	case ma_error__a:
-+			return true;
-+	default:
-+			return false;
-+	}
-+}
-+
-+static const struct of_device_id ma120x0p_of_match[] = {
-+	{ .compatible = "ma,ma120x0p", },
-+	{ }
-+};
-+
-+MODULE_DEVICE_TABLE(of, ma120x0p_of_match);
-+
-+static struct regmap_config ma120x0p_regmap_config = {
-+	.reg_bits = 8,
-+	.val_bits = 8,
-+
-+	.max_register = 255,
-+	.volatile_reg = ma120x0p_reg_volatile,
-+
-+	.cache_type = REGCACHE_RBTREE,
-+	.reg_defaults = ma120x0p_reg_defaults,
-+	.num_reg_defaults = ARRAY_SIZE(ma120x0p_reg_defaults),
-+};
-+
-+static int ma120x0p_i2c_probe(struct i2c_client *i2c,
-+	const struct i2c_device_id *id)
-+{
-+	int ret;
-+
-+	priv_data = devm_kzalloc(&i2c->dev, sizeof(*priv_data), GFP_KERNEL);
-+	if (!priv_data)
-+		return -ENOMEM;
-+	i2c_set_clientdata(i2c, priv_data);
-+
-+	priv_data->regmap = devm_regmap_init_i2c(i2c, &ma120x0p_regmap_config);
-+	if (IS_ERR(priv_data->regmap)) {
-+		ret = PTR_ERR(priv_data->regmap);
-+		return ret;
-+	}
-+
-+	//Startup sequence
-+
-+	//Make sure the device is muted
-+	priv_data->mute_gpio = devm_gpiod_get_optional(&i2c->dev, "mute_gp",
-+		GPIOD_OUT_LOW);
-+	if (IS_ERR(priv_data->mute_gpio)) {
-+		ret = PTR_ERR(priv_data->mute_gpio);
-+		dev_err(&i2c->dev, "Failed to get mute gpio line: %d\n", ret);
-+		return ret;
-+	}
-+	msleep(50);
-+
-+// MA120xx0P devices are usually powered by an integrated boost converter.
-+// An option GPIO control line is provided to enable the booster properly and
-+// in sync with the enable and mute GPIO lines.
-+	priv_data->booster_gpio = devm_gpiod_get_optional(&i2c->dev,
-+		"booster_gp", GPIOD_OUT_LOW);
-+	if (IS_ERR(priv_data->booster_gpio)) {
-+		ret = PTR_ERR(priv_data->booster_gpio);
-+		dev_err(&i2c->dev,
-+		"Failed to get booster enable gpio line: %d\n", ret);
-+		return ret;
-+	}
-+	msleep(50);
-+
-+	//Enable booster and wait 200ms until stable PVDD
-+	gpiod_set_value_cansleep(priv_data->booster_gpio, 1);
-+	msleep(200);
-+
-+	//Enable ma120x0pp
-+	priv_data->enable_gpio = devm_gpiod_get_optional(&i2c->dev,
-+		"enable_gp", GPIOD_OUT_LOW);
-+	if (IS_ERR(priv_data->enable_gpio)) {
-+		ret = PTR_ERR(priv_data->enable_gpio);
-+		dev_err(&i2c->dev,
-+		"Failed to get ma120x0p enable gpio line: %d\n", ret);
-+		return ret;
-+	}
-+	msleep(50);
-+
-+	//Optional use of ma120x0pp error line as an interrupt trigger to
-+	//platform GPIO.
-+	//Get error input gpio ma120x0p
-+	priv_data->error_gpio = devm_gpiod_get_optional(&i2c->dev,
-+		 "error_gp", GPIOD_IN);
-+	if (IS_ERR(priv_data->error_gpio)) {
-+		ret = PTR_ERR(priv_data->error_gpio);
-+		dev_err(&i2c->dev,
-+			"Failed to get ma120x0p error gpio line: %d\n", ret);
-+		return ret;
-+	}
-+
-+	if (priv_data->error_gpio != NULL) {
-+		irqNumber = gpiod_to_irq(priv_data->error_gpio);
-+
-+		ret = devm_request_threaded_irq(&i2c->dev,
-+			 irqNumber, ma120x0p_irq_handler,
-+			 NULL, IRQF_TRIGGER_FALLING,
-+			 "ma120x0p", priv_data);
-+		if (ret != 0)
-+			dev_warn(&i2c->dev, "Failed to request IRQ: %d\n",
-+				ret);
-+	}
-+
-+	ret = devm_snd_soc_register_component(&i2c->dev,
-+		&ma120x0p_component_driver, &ma120x0p_dai, 1);
-+
-+	return ret;
-+}
-+
-+static irqreturn_t ma120x0p_irq_handler(int irq, void *data)
-+{
-+	gpiod_set_value_cansleep(priv_data->mute_gpio, 0);
-+	gpiod_set_value_cansleep(priv_data->enable_gpio, 1);
-+	return IRQ_HANDLED;
-+}
-+
-+static void ma120x0p_i2c_remove(struct i2c_client *i2c)
-+{
-+	snd_soc_unregister_component(&i2c->dev);
-+	i2c_set_clientdata(i2c, NULL);
-+
-+	gpiod_set_value_cansleep(priv_data->mute_gpio, 0);
-+	msleep(30);
-+	gpiod_set_value_cansleep(priv_data->enable_gpio, 1);
-+	msleep(200);
-+	gpiod_set_value_cansleep(priv_data->booster_gpio, 0);
-+	msleep(200);
-+
-+	kfree(priv_data);
-+}
-+
-+static void ma120x0p_i2c_shutdown(struct i2c_client *i2c)
-+{
-+	snd_soc_unregister_component(&i2c->dev);
-+	i2c_set_clientdata(i2c, NULL);
-+
-+	gpiod_set_value_cansleep(priv_data->mute_gpio, 0);
-+	msleep(30);
-+	gpiod_set_value_cansleep(priv_data->enable_gpio, 1);
-+	msleep(200);
-+	gpiod_set_value_cansleep(priv_data->booster_gpio, 0);
-+	msleep(200);
-+
-+	kfree(priv_data);
-+}
-+
-+static const struct i2c_device_id ma120x0p_i2c_id[] = {
-+	{ "ma120x0p", 0 },
-+	{ }
-+};
-+
-+MODULE_DEVICE_TABLE(i2c, ma120x0p_i2c_id);
-+
-+static struct i2c_driver ma120x0p_i2c_driver = {
-+	.driver = {
-+		.name = "ma120x0p",
-+		.owner = THIS_MODULE,
-+		.of_match_table = ma120x0p_of_match,
-+	},
-+	.probe = ma120x0p_i2c_probe,
-+	.remove = ma120x0p_i2c_remove,
-+	.shutdown = ma120x0p_i2c_shutdown,
-+	.id_table = ma120x0p_i2c_id
-+};
-+
-+static int __init ma120x0p_modinit(void)
-+{
-+	int ret = 0;
-+
-+	ret = i2c_add_driver(&ma120x0p_i2c_driver);
-+	if (ret != 0) {
-+		pr_err("Failed to register MA120X0P I2C driver: %d\n", ret);
-+		return ret;
-+	}
-+	return ret;
-+}
-+module_init(ma120x0p_modinit);
-+
-+static void __exit ma120x0p_exit(void)
-+{
-+	i2c_del_driver(&ma120x0p_i2c_driver);
-+}
-+module_exit(ma120x0p_exit);
-+
-+MODULE_AUTHOR("Ariel Muszkat ariel.muszkat@gmail.com>");
-+MODULE_DESCRIPTION("ASoC driver for ma120x0p");
-+MODULE_LICENSE("GPL v2");
---- /dev/null
-+++ b/sound/soc/codecs/pcm1794a.c
-@@ -0,0 +1,69 @@
-+/*
-+ * Driver for the PCM1794A codec
-+ *
-+ * Author:	Florian Meier <florian.meier@koalo.de>
-+ *		Copyright 2013
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+
-+#include <linux/init.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+
-+#include <sound/soc.h>
-+
-+static struct snd_soc_dai_driver pcm1794a_dai = {
-+	.name = "pcm1794a-hifi",
-+	.playback = {
-+		.channels_min = 2,
-+		.channels_max = 2,
-+		.rates = SNDRV_PCM_RATE_8000_192000,
-+		.formats = SNDRV_PCM_FMTBIT_S16_LE |
-+			   SNDRV_PCM_FMTBIT_S24_LE
-+	},
-+};
-+
-+static struct snd_soc_component_driver soc_component_dev_pcm1794a;
-+
-+static int pcm1794a_probe(struct platform_device *pdev)
-+{
-+	return snd_soc_register_component(&pdev->dev, &soc_component_dev_pcm1794a,
-+			&pcm1794a_dai, 1);
-+}
-+
-+static int pcm1794a_remove(struct platform_device *pdev)
-+{
-+	snd_soc_unregister_component(&pdev->dev);
-+	return 0;
-+}
-+
-+static const struct of_device_id pcm1794a_of_match[] = {
-+	{ .compatible = "ti,pcm1794a", },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(of, pcm1794a_of_match);
-+
-+static struct platform_driver pcm1794a_component_driver = {
-+	.probe 		= pcm1794a_probe,
-+	.remove 	= pcm1794a_remove,
-+	.driver		= {
-+		.name	= "pcm1794a-codec",
-+		.owner	= THIS_MODULE,
-+		.of_match_table = of_match_ptr(pcm1794a_of_match),
-+	},
-+};
-+
-+module_platform_driver(pcm1794a_component_driver);
-+
-+MODULE_DESCRIPTION("ASoC PCM1794A codec driver");
-+MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
-+MODULE_LICENSE("GPL v2");
---- a/sound/soc/codecs/pcm512x.c
-+++ b/sound/soc/codecs/pcm512x.c
-@@ -536,7 +536,7 @@ static unsigned long pcm512x_ncp_target(
- 
- static const u32 pcm512x_dai_rates[] = {
- 	8000, 11025, 16000, 22050, 32000, 44100, 48000, 64000,
--	88200, 96000, 176400, 192000, 384000,
-+	88200, 96000, 176400, 192000, 352800, 384000,
- };
- 
- static const struct snd_pcm_hw_constraint_list constraints_slave = {
---- /dev/null
-+++ b/sound/soc/codecs/tas5713.c
-@@ -0,0 +1,361 @@
-+/*
-+ * ASoC Driver for TAS5713
-+ *
-+ * Author:	Sebastian Eickhoff <basti.eickhoff@googlemail.com>
-+ *		Copyright 2014
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/moduleparam.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+#include <linux/pm.h>
-+#include <linux/i2c.h>
-+#include <linux/of_device.h>
-+#include <linux/spi/spi.h>
-+#include <linux/regmap.h>
-+#include <linux/regulator/consumer.h>
-+#include <linux/slab.h>
-+#include <sound/core.h>
-+#include <sound/pcm.h>
-+#include <sound/pcm_params.h>
-+#include <sound/soc.h>
-+#include <sound/initval.h>
-+#include <sound/tlv.h>
-+
-+#include <linux/kernel.h>
-+#include <linux/string.h>
-+#include <linux/fs.h>
-+#include <asm/uaccess.h>
-+
-+#include "tas5713.h"
-+
-+
-+static struct i2c_client *i2c;
-+
-+struct tas5713_priv {
-+	struct regmap *regmap;
-+	int mclk_div;
-+	struct snd_soc_component *component;
-+};
-+
-+static struct tas5713_priv *priv_data;
-+
-+
-+
-+
-+/*
-+ *    _   _    ___   _      ___         _           _
-+ *   /_\ | |  / __| /_\    / __|___ _ _| |_ _ _ ___| |___
-+ *  / _ \| |__\__ \/ _ \  | (__/ _ \ ' \  _| '_/ _ \ (_-<
-+ * /_/ \_\____|___/_/ \_\  \___\___/_||_\__|_| \___/_/__/
-+ *
-+ */
-+
-+static const DECLARE_TLV_DB_SCALE(tas5713_vol_tlv, -10000, 50, 1);
-+
-+
-+static const struct snd_kcontrol_new tas5713_snd_controls[] = {
-+	SOC_SINGLE_TLV  ("Master"    , TAS5713_VOL_MASTER, 0, 248, 1, tas5713_vol_tlv),
-+	SOC_DOUBLE_R_TLV("Channels"  , TAS5713_VOL_CH1, TAS5713_VOL_CH2, 0, 248, 1, tas5713_vol_tlv)
-+};
-+
-+
-+
-+
-+/*
-+ *  __  __         _    _            ___      _
-+ * |  \/  |__ _ __| |_ (_)_ _  ___  |   \ _ _(_)_ _____ _ _
-+ * | |\/| / _` / _| ' \| | ' \/ -_) | |) | '_| \ V / -_) '_|
-+ * |_|  |_\__,_\__|_||_|_|_||_\___| |___/|_| |_|\_/\___|_|
-+ *
-+ */
-+
-+static int tas5713_hw_params(struct snd_pcm_substream *substream,
-+			    struct snd_pcm_hw_params *params,
-+			    struct snd_soc_dai *dai)
-+{
-+	u16 blen = 0x00;
-+
-+	struct snd_soc_component *component = dai->component;
-+	priv_data->component = component;
-+
-+	switch (params_format(params)) {
-+	case SNDRV_PCM_FORMAT_S16_LE:
-+		blen = 0x03;
-+		break;
-+	case SNDRV_PCM_FORMAT_S20_3LE:
-+		blen = 0x1;
-+		break;
-+	case SNDRV_PCM_FORMAT_S24_LE:
-+		blen = 0x04;
-+		break;
-+	case SNDRV_PCM_FORMAT_S32_LE:
-+		blen = 0x05;
-+		break;
-+	default:
-+		dev_err(dai->dev, "Unsupported word length: %u\n",
-+			params_format(params));
-+		return -EINVAL;
-+	}
-+
-+	// set word length
-+	snd_soc_component_update_bits(component, TAS5713_SERIAL_DATA_INTERFACE, 0x7, blen);
-+
-+	return 0;
-+}
-+
-+
-+static int tas5713_mute_stream(struct snd_soc_dai *dai, int mute, int stream)
-+{
-+	unsigned int val = 0;
-+
-+	struct tas5713_priv *tas5713;
-+	struct snd_soc_component *component = dai->component;
-+	tas5713 = snd_soc_component_get_drvdata(component);
-+
-+	if (mute) {
-+		val = TAS5713_SOFT_MUTE_ALL;
-+	}
-+
-+	return regmap_write(tas5713->regmap, TAS5713_SOFT_MUTE, val);
-+}
-+
-+
-+static const struct snd_soc_dai_ops tas5713_dai_ops = {
-+	.hw_params 		= tas5713_hw_params,
-+	.mute_stream	= tas5713_mute_stream,
-+};
-+
-+
-+static struct snd_soc_dai_driver tas5713_dai = {
-+	.name		= "tas5713-hifi",
-+	.playback 	= {
-+		.stream_name	= "Playback",
-+		.channels_min	= 2,
-+		.channels_max	= 2,
-+		.rates		    = SNDRV_PCM_RATE_8000_48000,
-+		.formats	    = (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE ),
-+	},
-+	.ops        = &tas5713_dai_ops,
-+};
-+
-+
-+
-+
-+/*
-+ *   ___         _          ___      _
-+ *  / __|___  __| |___ __  |   \ _ _(_)_ _____ _ _
-+ * | (__/ _ \/ _` / -_) _| | |) | '_| \ V / -_) '_|
-+ *  \___\___/\__,_\___\__| |___/|_| |_|\_/\___|_|
-+ *
-+ */
-+
-+static void tas5713_remove(struct snd_soc_component *component)
-+{
-+	struct tas5713_priv *tas5713;
-+
-+	tas5713 = snd_soc_component_get_drvdata(component);
-+}
-+
-+
-+static int tas5713_probe(struct snd_soc_component *component)
-+{
-+	struct tas5713_priv *tas5713;
-+	int i, ret;
-+
-+	i2c = container_of(component->dev, struct i2c_client, dev);
-+
-+	tas5713 = snd_soc_component_get_drvdata(component);
-+
-+	// Reset error
-+	ret = snd_soc_component_write(component, TAS5713_ERROR_STATUS, 0x00);
-+	if (ret < 0) return ret;
-+
-+	// Trim oscillator
-+	ret = snd_soc_component_write(component, TAS5713_OSC_TRIM, 0x00);
-+	if (ret < 0) return ret;
-+	msleep(1000);
-+
-+	// Reset error
-+	ret = snd_soc_component_write(component, TAS5713_ERROR_STATUS, 0x00);
-+	if (ret < 0) return ret;
-+
-+	// I2S 24bit
-+	ret = snd_soc_component_write(component, TAS5713_SERIAL_DATA_INTERFACE, 0x05);
-+	if (ret < 0) return ret;
-+
-+	// Unmute
-+	ret = snd_soc_component_write(component, TAS5713_SYSTEM_CTRL2, 0x00);
-+	if (ret < 0) return ret;
-+	ret = snd_soc_component_write(component, TAS5713_SOFT_MUTE, 0x00);
-+	if (ret < 0) return ret;
-+
-+	// Set volume to 0db
-+	ret = snd_soc_component_write(component, TAS5713_VOL_MASTER, 0x00);
-+	if (ret < 0) return ret;
-+
-+	// Now start programming the default initialization sequence
-+	for (i = 0; i < ARRAY_SIZE(tas5713_init_sequence); ++i) {
-+		ret = i2c_master_send(i2c,
-+				     tas5713_init_sequence[i].data,
-+				     tas5713_init_sequence[i].size);
-+		if (ret < 0) {
-+			printk(KERN_INFO "TAS5713 CODEC PROBE: InitSeq returns: %d\n", ret);
-+		}
-+	}
-+
-+	// Unmute
-+	ret = snd_soc_component_write(component, TAS5713_SYSTEM_CTRL2, 0x00);
-+	if (ret < 0) return ret;
-+
-+	return 0;
-+}
-+
-+
-+static struct snd_soc_component_driver soc_codec_dev_tas5713 = {
-+	.probe = tas5713_probe,
-+	.remove = tas5713_remove,
-+	.controls = tas5713_snd_controls,
-+	.num_controls = ARRAY_SIZE(tas5713_snd_controls),
-+};
-+
-+
-+
-+
-+/*
-+ *   ___ ___ ___   ___      _
-+ *  |_ _|_  ) __| |   \ _ _(_)_ _____ _ _
-+ *   | | / / (__  | |) | '_| \ V / -_) '_|
-+ *  |___/___\___| |___/|_| |_|\_/\___|_|
-+ *
-+ */
-+
-+static const struct reg_default tas5713_reg_defaults[] = {
-+	{ 0x07 ,0x80 },     // R7  - VOL_MASTER    - -40dB
-+	{ 0x08 ,  30 },     // R8  - VOL_CH1	   -   0dB
-+	{ 0x09 ,  30 },     // R9  - VOL_CH2       -   0dB
-+	{ 0x0A ,0x80 },     // R10 - VOL_HEADPHONE - -40dB
-+};
-+
-+
-+static bool tas5713_reg_volatile(struct device *dev, unsigned int reg)
-+{
-+	switch (reg) {
-+		case TAS5713_DEVICE_ID:
-+		case TAS5713_ERROR_STATUS:
-+		case TAS5713_CLOCK_CTRL:
-+			return true;
-+	default:
-+			return false;
-+	}
-+}
-+
-+
-+static const struct of_device_id tas5713_of_match[] = {
-+	{ .compatible = "ti,tas5713", },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(of, tas5713_of_match);
-+
-+
-+static struct regmap_config tas5713_regmap_config = {
-+	.reg_bits = 8,
-+	.val_bits = 8,
-+
-+	.max_register = TAS5713_MAX_REGISTER,
-+	.volatile_reg = tas5713_reg_volatile,
-+
-+	.cache_type = REGCACHE_RBTREE,
-+	.reg_defaults = tas5713_reg_defaults,
-+	.num_reg_defaults = ARRAY_SIZE(tas5713_reg_defaults),
-+};
-+
-+
-+static int tas5713_i2c_probe(struct i2c_client *i2c,
-+			    const struct i2c_device_id *id)
-+{
-+	int ret;
-+
-+	priv_data = devm_kzalloc(&i2c->dev, sizeof *priv_data, GFP_KERNEL);
-+	if (!priv_data)
-+		return -ENOMEM;
-+
-+	priv_data->regmap = devm_regmap_init_i2c(i2c, &tas5713_regmap_config);
-+	if (IS_ERR(priv_data->regmap)) {
-+		ret = PTR_ERR(priv_data->regmap);
-+		return ret;
-+	}
-+
-+	i2c_set_clientdata(i2c, priv_data);
-+
-+	ret = snd_soc_register_component(&i2c->dev,
-+				     &soc_codec_dev_tas5713, &tas5713_dai, 1);
-+
-+	return ret;
-+}
-+
-+
-+static void tas5713_i2c_remove(struct i2c_client *i2c)
-+{
-+	snd_soc_unregister_component(&i2c->dev);
-+	i2c_set_clientdata(i2c, NULL);
-+
-+	kfree(priv_data);
-+}
-+
-+
-+static const struct i2c_device_id tas5713_i2c_id[] = {
-+	{ "tas5713", 0 },
-+	{ }
-+};
-+
-+MODULE_DEVICE_TABLE(i2c, tas5713_i2c_id);
-+
-+
-+static struct i2c_driver tas5713_i2c_driver = {
-+	.driver = {
-+		.name = "tas5713",
-+		.owner = THIS_MODULE,
-+		.of_match_table = tas5713_of_match,
-+	},
-+	.probe = tas5713_i2c_probe,
-+	.remove = tas5713_i2c_remove,
-+	.id_table = tas5713_i2c_id
-+};
-+
-+
-+static int __init tas5713_modinit(void)
-+{
-+	int ret = 0;
-+
-+	ret = i2c_add_driver(&tas5713_i2c_driver);
-+	if (ret) {
-+		printk(KERN_ERR "Failed to register tas5713 I2C driver: %d\n",
-+		       ret);
-+	}
-+
-+	return ret;
-+}
-+module_init(tas5713_modinit);
-+
-+
-+static void __exit tas5713_exit(void)
-+{
-+	i2c_del_driver(&tas5713_i2c_driver);
-+}
-+module_exit(tas5713_exit);
-+
-+
-+MODULE_AUTHOR("Sebastian Eickhoff <basti.eickhoff@googlemail.com>");
-+MODULE_DESCRIPTION("ASoC driver for TAS5713");
-+MODULE_LICENSE("GPL v2");
---- /dev/null
-+++ b/sound/soc/codecs/tas5713.h
-@@ -0,0 +1,210 @@
-+/*
-+ * ASoC Driver for TAS5713
-+ *
-+ * Author:      Sebastian Eickhoff <basti.eickhoff@googlemail.com>
-+ *              Copyright 2014
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * version 2 as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ */
-+
-+#ifndef _TAS5713_H
-+#define _TAS5713_H
-+
-+
-+// TAS5713 I2C-bus register addresses
-+
-+#define TAS5713_CLOCK_CTRL              0x00
-+#define TAS5713_DEVICE_ID               0x01
-+#define TAS5713_ERROR_STATUS            0x02
-+#define TAS5713_SYSTEM_CTRL1            0x03
-+#define TAS5713_SERIAL_DATA_INTERFACE   0x04
-+#define TAS5713_SYSTEM_CTRL2            0x05
-+#define TAS5713_SOFT_MUTE               0x06
-+#define TAS5713_VOL_MASTER              0x07
-+#define TAS5713_VOL_CH1                 0x08
-+#define TAS5713_VOL_CH2                 0x09
-+#define TAS5713_VOL_HEADPHONE           0x0A
-+#define TAS5713_VOL_CONFIG              0x0E
-+#define TAS5713_MODULATION_LIMIT        0x10
-+#define TAS5713_IC_DLY_CH1              0x11
-+#define TAS5713_IC_DLY_CH2              0x12
-+#define TAS5713_IC_DLY_CH3              0x13
-+#define TAS5713_IC_DLY_CH4              0x14
-+
-+#define TAS5713_START_STOP_PERIOD       0x1A
-+#define TAS5713_OSC_TRIM                0x1B
-+#define TAS5713_BKND_ERR                0x1C
-+
-+#define TAS5713_INPUT_MUX               0x20
-+#define TAS5713_SRC_SELECT_CH4          0x21
-+#define TAS5713_PWM_MUX                 0x25
-+
-+#define TAS5713_CH1_BQ0                 0x29
-+#define TAS5713_CH1_BQ1                 0x2A
-+#define TAS5713_CH1_BQ2                 0x2B
-+#define TAS5713_CH1_BQ3                 0x2C
-+#define TAS5713_CH1_BQ4                 0x2D
-+#define TAS5713_CH1_BQ5                 0x2E
-+#define TAS5713_CH1_BQ6                 0x2F
-+#define TAS5713_CH1_BQ7                 0x58
-+#define TAS5713_CH1_BQ8                 0x59
-+
-+#define TAS5713_CH2_BQ0                 0x30
-+#define TAS5713_CH2_BQ1                 0x31
-+#define TAS5713_CH2_BQ2                 0x32
-+#define TAS5713_CH2_BQ3                 0x33
-+#define TAS5713_CH2_BQ4                 0x34
-+#define TAS5713_CH2_BQ5                 0x35
-+#define TAS5713_CH2_BQ6                 0x36
-+#define TAS5713_CH2_BQ7                 0x5C
-+#define TAS5713_CH2_BQ8                 0x5D
-+
-+#define TAS5713_CH4_BQ0                 0x5A
-+#define TAS5713_CH4_BQ1                 0x5B
-+#define TAS5713_CH3_BQ0                 0x5E
-+#define TAS5713_CH3_BQ1                 0x5F
-+
-+#define TAS5713_DRC1_SOFTENING_FILTER_ALPHA_OMEGA       0x3B
-+#define TAS5713_DRC1_ATTACK_RELEASE_RATE                0x3C
-+#define TAS5713_DRC2_SOFTENING_FILTER_ALPHA_OMEGA       0x3E
-+#define TAS5713_DRC2_ATTACK_RELEASE_RATE                0x3F
-+#define TAS5713_DRC1_ATTACK_RELEASE_THRES               0x40
-+#define TAS5713_DRC2_ATTACK_RELEASE_THRES               0x43
-+#define TAS5713_DRC_CTRL                                0x46
-+
-+#define TAS5713_BANK_SW_CTRL            0x50
-+#define TAS5713_CH1_OUTPUT_MIXER        0x51
-+#define TAS5713_CH2_OUTPUT_MIXER        0x52
-+#define TAS5713_CH1_INPUT_MIXER         0x53
-+#define TAS5713_CH2_INPUT_MIXER         0x54
-+#define TAS5713_OUTPUT_POST_SCALE       0x56
-+#define TAS5713_OUTPUT_PRESCALE         0x57
-+
-+#define TAS5713_IDF_POST_SCALE          0x62
-+
-+#define TAS5713_CH1_INLINE_MIXER        0x70
-+#define TAS5713_CH1_INLINE_DRC_EN_MIXER 0x71
-+#define TAS5713_CH1_R_CHANNEL_MIXER     0x72
-+#define TAS5713_CH1_L_CHANNEL_MIXER     0x73
-+#define TAS5713_CH2_INLINE_MIXER        0x74
-+#define TAS5713_CH2_INLINE_DRC_EN_MIXER 0x75
-+#define TAS5713_CH2_L_CHANNEL_MIXER     0x76
-+#define TAS5713_CH2_R_CHANNEL_MIXER     0x77
-+
-+#define TAS5713_UPDATE_DEV_ADDR_KEY     0xF8
-+#define TAS5713_UPDATE_DEV_ADDR_REG     0xF9
-+
-+#define TAS5713_REGISTER_COUNT          0x46
-+#define TAS5713_MAX_REGISTER            0xF9
-+
-+
-+// Bitmasks for registers
-+#define TAS5713_SOFT_MUTE_ALL           0x07
-+
-+
-+
-+struct tas5713_init_command {
-+        const int size;
-+        const char *const data;
-+};
-+
-+static const struct tas5713_init_command tas5713_init_sequence[] = {
-+
-+        // Trim oscillator
-+    { .size = 2,  .data = "\x1B\x00" },
-+    // System control register 1 (0x03): block DC
-+    { .size = 2,  .data = "\x03\x80" },
-+    // Mute everything
-+    { .size = 2,  .data = "\x05\x40" },
-+    // Modulation limit register (0x10): 97.7%
-+    { .size = 2,  .data = "\x10\x02" },
-+    // Interchannel delay registers
-+    // (0x11, 0x12, 0x13, and 0x14): BD mode
-+    { .size = 2,  .data = "\x11\xB8" },
-+    { .size = 2,  .data = "\x12\x60" },
-+    { .size = 2,  .data = "\x13\xA0" },
-+    { .size = 2,  .data = "\x14\x48" },
-+    // PWM shutdown group register (0x19): no shutdown
-+    { .size = 2,  .data = "\x19\x00" },
-+    // Input multiplexer register (0x20): BD mode
-+    { .size = 2,  .data = "\x20\x00\x89\x77\x72" },
-+    // PWM output mux register (0x25)
-+    // Channel 1 --> OUTA, channel 1 neg --> OUTB
-+    // Channel 2 --> OUTC, channel 2 neg --> OUTD
-+    { .size = 5,  .data = "\x25\x01\x02\x13\x45" },
-+    // DRC control (0x46): DRC off
-+    { .size = 5,  .data = "\x46\x00\x00\x00\x00" },
-+    // BKND_ERR register (0x1C): 299ms reset period
-+    { .size = 2,  .data = "\x1C\x07" },
-+    // Mute channel 3
-+    { .size = 2,  .data = "\x0A\xFF" },
-+    // Volume configuration register (0x0E): volume slew 512 steps
-+    { .size = 2,  .data = "\x0E\x90" },
-+    // Clock control register (0x00): 44/48kHz, MCLK=64xfs
-+    { .size = 2,  .data = "\x00\x60" },
-+    // Bank switch and eq control (0x50): no bank switching
-+    { .size = 5,  .data = "\x50\x00\x00\x00\x00" },
-+    // Volume registers (0x07, 0x08, 0x09, 0x0A)
-+    { .size = 2,  .data = "\x07\x20" },
-+    { .size = 2,  .data = "\x08\x30" },
-+    { .size = 2,  .data = "\x09\x30" },
-+    { .size = 2,  .data = "\x0A\xFF" },
-+    // 0x72, 0x73, 0x76, 0x77 input mixer:
-+    // no intermix between channels
-+    { .size = 5,  .data = "\x72\x00\x00\x00\x00" },
-+    { .size = 5,  .data = "\x73\x00\x80\x00\x00" },
-+    { .size = 5,  .data = "\x76\x00\x00\x00\x00" },
-+    { .size = 5,  .data = "\x77\x00\x80\x00\x00" },
-+    // 0x70, 0x71, 0x74, 0x75 inline DRC mixer:
-+    // no inline DRC inmix
-+    { .size = 5,  .data = "\x70\x00\x80\x00\x00" },
-+    { .size = 5,  .data = "\x71\x00\x00\x00\x00" },
-+    { .size = 5,  .data = "\x74\x00\x80\x00\x00" },
-+    { .size = 5,  .data = "\x75\x00\x00\x00\x00" },
-+    // 0x56, 0x57 Output scale
-+    { .size = 5,  .data = "\x56\x00\x80\x00\x00" },
-+    { .size = 5,  .data = "\x57\x00\x02\x00\x00" },
-+    // 0x3B, 0x3c
-+    { .size = 9,  .data = "\x3B\x00\x08\x00\x00\x00\x78\x00\x00" },
-+    { .size = 9,  .data = "\x3C\x00\x00\x01\x00\xFF\xFF\xFF\x00" },
-+    { .size = 9,  .data = "\x3E\x00\x08\x00\x00\x00\x78\x00\x00" },
-+    { .size = 9,  .data = "\x3F\x00\x00\x01\x00\xFF\xFF\xFF\x00" },
-+    { .size = 9,  .data = "\x40\x00\x00\x01\x00\xFF\xFF\xFF\x00" },
-+    { .size = 9,  .data = "\x43\x00\x00\x01\x00\xFF\xFF\xFF\x00" },
-+    // 0x51, 0x52: output mixer
-+    { .size = 9,  .data = "\x51\x00\x80\x00\x00\x00\x00\x00\x00" },
-+    { .size = 9,  .data = "\x52\x00\x80\x00\x00\x00\x00\x00\x00" },
-+    // PEQ defaults
-+    { .size = 21,  .data = "\x29\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" },
-+    { .size = 21,  .data = "\x2A\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" },
-+    { .size = 21,  .data = "\x2B\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" },
-+    { .size = 21,  .data = "\x2C\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" },
-+    { .size = 21,  .data = "\x2D\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" },
-+    { .size = 21,  .data = "\x2E\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" },
-+    { .size = 21,  .data = "\x2F\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" },
-+    { .size = 21,  .data = "\x30\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" },
-+    { .size = 21,  .data = "\x31\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" },
-+    { .size = 21,  .data = "\x32\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" },
-+    { .size = 21,  .data = "\x33\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" },
-+    { .size = 21,  .data = "\x34\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" },
-+    { .size = 21,  .data = "\x35\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" },
-+    { .size = 21,  .data = "\x36\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" },
-+    { .size = 21,  .data = "\x58\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" },
-+    { .size = 21,  .data = "\x59\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" },
-+    { .size = 21,  .data = "\x5C\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" },
-+    { .size = 21,  .data = "\x5D\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" },
-+    { .size = 21,  .data = "\x5E\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" },
-+    { .size = 21,  .data = "\x5F\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" },
-+    { .size = 21,  .data = "\x5A\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" },
-+    { .size = 21,  .data = "\x5B\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" },
-+};
-+
-+
-+#endif  /* _TAS5713_H */
---- a/sound/soc/soc-core.c
-+++ b/sound/soc/soc-core.c
-@@ -1223,7 +1223,15 @@ int snd_soc_runtime_set_dai_fmt(struct s
- 		return 0;
- 
- 	for_each_rtd_codec_dais(rtd, i, codec_dai) {
--		ret = snd_soc_dai_set_fmt(codec_dai, dai_fmt);
-+		unsigned int codec_dai_fmt = dai_fmt;
-+
-+		// there can only be one master when using multiple codecs
-+		if (i && (codec_dai_fmt & SND_SOC_DAIFMT_MASTER_MASK)) {
-+			codec_dai_fmt &= ~SND_SOC_DAIFMT_MASTER_MASK;
-+			codec_dai_fmt |= SND_SOC_DAIFMT_CBS_CFS;
-+		}
-+
-+		ret = snd_soc_dai_set_fmt(codec_dai, codec_dai_fmt);
- 		if (ret != 0 && ret != -ENOTSUPP)
- 			return ret;
- 	}
---- a/sound/usb/card.c
-+++ b/sound/usb/card.c
-@@ -856,8 +856,14 @@ static int usb_audio_probe(struct usb_in
- 	if (ignore_ctl_error)
- 		chip->quirk_flags |= QUIRK_FLAG_IGNORE_CTL_ERROR;
- 
--	if (chip->quirk_flags & QUIRK_FLAG_DISABLE_AUTOSUSPEND)
-+	if (chip->quirk_flags & QUIRK_FLAG_DISABLE_AUTOSUSPEND) {
-+		/*
-+		* Grab the interface, because on a webcam uvcvideo may race
-+		* with snd-usb-audio during probe and re-enable autosuspend.
-+		*/
-+		usb_autopm_get_interface(intf);
- 		usb_disable_autosuspend(interface_to_usbdev(intf));
-+	}
- 
- 	/*
- 	 * For devices with more than one control interface, we assume the
---- a/sound/usb/quirks.c
-+++ b/sound/usb/quirks.c
-@@ -2087,6 +2087,8 @@ static const struct usb_audio_quirk_flag
- 		   QUIRK_FLAG_FIXED_RATE),
- 	DEVICE_FLG(0x0ecb, 0x2069, /* JBL Quantum810 Wireless */
- 		   QUIRK_FLAG_FIXED_RATE),
-+	DEVICE_FLG(0x09da, 0x2695, /* A4Tech FHD 1080p webcam */
-+		   QUIRK_FLAG_DISABLE_AUTOSUSPEND | QUIRK_FLAG_GET_SAMPLE_RATE),
- 	DEVICE_FLG(0x0fd9, 0x0008, /* Hauppauge HVR-950Q */
- 		   QUIRK_FLAG_SHARE_MEDIA_DEVICE | QUIRK_FLAG_ALIGN_TRANSFER),
- 	DEVICE_FLG(0x1224, 0x2a25, /* Jieli Technology USB PHY 2.0 */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0125-rpi_display-add-backlight-driver-and-overlay.patch b/target/linux/bcm27xx/patches-6.1/950-0125-rpi_display-add-backlight-driver-and-overlay.patch
deleted file mode 100644
index b8351a7475..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0125-rpi_display-add-backlight-driver-and-overlay.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-From 60e18013e50d1ad1307d55378f859cc8c985e5c0 Mon Sep 17 00:00:00 2001
-From: P33M <P33M@github.com>
-Date: Wed, 21 Oct 2015 14:55:21 +0100
-Subject: [PATCH] rpi_display: add backlight driver and overlay
-
-Add a mailbox-driven backlight controller for the Raspberry Pi DSI
-touchscreen display. Requires updated GPU firmware to recognise the
-mailbox request.
-
-Signed-off-by: Gordon Hollingworth <gordon@raspberrypi.org>
-
-Add Raspberry Pi firmware driver to the dependencies of backlight driver
-
-Otherwise the backlight driver fails to build if the firmware
-loading driver is not in the kernel
-
-Signed-off-by: Alex Riesen <alexander.riesen@cetitec.com>
----
- drivers/video/backlight/Kconfig         |   7 ++
- drivers/video/backlight/Makefile        |   1 +
- drivers/video/backlight/rpi_backlight.c | 119 ++++++++++++++++++++++++
- 3 files changed, 127 insertions(+)
- create mode 100644 drivers/video/backlight/rpi_backlight.c
-
---- a/drivers/video/backlight/Kconfig
-+++ b/drivers/video/backlight/Kconfig
-@@ -248,6 +248,13 @@ config BACKLIGHT_PWM
- 	  If you have a LCD backlight adjustable by PWM, say Y to enable
- 	  this driver.
- 
-+config BACKLIGHT_RPI
-+	tristate "Raspberry Pi display firmware driven backlight"
-+	depends on RASPBERRYPI_FIRMWARE
-+	help
-+	  If you have the Raspberry Pi DSI touchscreen display, say Y to
-+	  enable the mailbox-controlled backlight driver.
-+
- config BACKLIGHT_DA903X
- 	tristate "Backlight Driver for DA9030/DA9034 using WLED"
- 	depends on PMIC_DA903X
---- a/drivers/video/backlight/Makefile
-+++ b/drivers/video/backlight/Makefile
-@@ -50,6 +50,7 @@ obj-$(CONFIG_BACKLIGHT_PANDORA)		+= pand
- obj-$(CONFIG_BACKLIGHT_PCF50633)	+= pcf50633-backlight.o
- obj-$(CONFIG_BACKLIGHT_PWM)		+= pwm_bl.o
- obj-$(CONFIG_BACKLIGHT_QCOM_WLED)	+= qcom-wled.o
-+obj-$(CONFIG_BACKLIGHT_RPI)			+= rpi_backlight.o
- obj-$(CONFIG_BACKLIGHT_RT4831)		+= rt4831-backlight.o
- obj-$(CONFIG_BACKLIGHT_SAHARA)		+= kb3886_bl.o
- obj-$(CONFIG_BACKLIGHT_SKY81452)	+= sky81452-backlight.o
---- /dev/null
-+++ b/drivers/video/backlight/rpi_backlight.c
-@@ -0,0 +1,119 @@
-+/*
-+ * rpi_bl.c - Backlight controller through VPU
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#include <linux/backlight.h>
-+#include <linux/err.h>
-+#include <linux/fb.h>
-+#include <linux/gpio.h>
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/of_gpio.h>
-+#include <linux/platform_device.h>
-+#include <linux/slab.h>
-+#include <soc/bcm2835/raspberrypi-firmware.h>
-+
-+struct rpi_backlight {
-+	struct device *dev;
-+	struct device *fbdev;
-+	struct rpi_firmware *fw;
-+};
-+
-+static int rpi_backlight_update_status(struct backlight_device *bl)
-+{
-+	struct rpi_backlight *gbl = bl_get_data(bl);
-+	int brightness = bl->props.brightness;
-+	int ret;
-+
-+	if (bl->props.power != FB_BLANK_UNBLANK ||
-+	    bl->props.fb_blank != FB_BLANK_UNBLANK ||
-+	    bl->props.state & (BL_CORE_SUSPENDED | BL_CORE_FBBLANK))
-+		brightness = 0;
-+
-+	ret = rpi_firmware_property(gbl->fw,
-+			RPI_FIRMWARE_FRAMEBUFFER_SET_BACKLIGHT,
-+			&brightness, sizeof(brightness));
-+	if (ret) {
-+		dev_err(gbl->dev, "Failed to set brightness\n");
-+		return ret;
-+	}
-+
-+	if (brightness < 0) {
-+		dev_err(gbl->dev, "Backlight change failed\n");
-+		return -EAGAIN;
-+	}
-+
-+	return 0;
-+}
-+
-+static const struct backlight_ops rpi_backlight_ops = {
-+	.options	= BL_CORE_SUSPENDRESUME,
-+	.update_status	= rpi_backlight_update_status,
-+};
-+
-+static int rpi_backlight_probe(struct platform_device *pdev)
-+{
-+	struct backlight_properties props;
-+	struct backlight_device *bl;
-+	struct rpi_backlight *gbl;
-+	struct device_node *fw_node;
-+
-+	gbl = devm_kzalloc(&pdev->dev, sizeof(*gbl), GFP_KERNEL);
-+	if (gbl == NULL)
-+		return -ENOMEM;
-+
-+	gbl->dev = &pdev->dev;
-+
-+	fw_node = of_parse_phandle(pdev->dev.of_node, "firmware", 0);
-+	if (!fw_node) {
-+		dev_err(&pdev->dev, "Missing firmware node\n");
-+		return -ENOENT;
-+	}
-+
-+	gbl->fw = rpi_firmware_get(fw_node);
-+	if (!gbl->fw)
-+		return -EPROBE_DEFER;
-+
-+	memset(&props, 0, sizeof(props));
-+	props.type = BACKLIGHT_RAW;
-+	props.max_brightness = 255;
-+	bl = devm_backlight_device_register(&pdev->dev, dev_name(&pdev->dev),
-+					&pdev->dev, gbl, &rpi_backlight_ops,
-+					&props);
-+	if (IS_ERR(bl)) {
-+		dev_err(&pdev->dev, "failed to register backlight\n");
-+		return PTR_ERR(bl);
-+	}
-+
-+	bl->props.brightness = 255;
-+	backlight_update_status(bl);
-+
-+	platform_set_drvdata(pdev, bl);
-+	return 0;
-+}
-+
-+static const struct of_device_id rpi_backlight_of_match[] = {
-+	{ .compatible = "raspberrypi,rpi-backlight" },
-+	{ /* sentinel */ }
-+};
-+MODULE_DEVICE_TABLE(of, rpi_backlight_of_match);
-+
-+static struct platform_driver rpi_backlight_driver = {
-+	.driver		= {
-+		.name		= "rpi-backlight",
-+		.of_match_table = of_match_ptr(rpi_backlight_of_match),
-+	},
-+	.probe		= rpi_backlight_probe,
-+};
-+
-+module_platform_driver(rpi_backlight_driver);
-+
-+MODULE_AUTHOR("Gordon Hollingworth <gordon@raspberrypi.org>");
-+MODULE_DESCRIPTION("Raspberry Pi mailbox based Backlight Driver");
-+MODULE_LICENSE("GPL");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0126-bcm2835-virtgpio-Virtual-GPIO-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0126-bcm2835-virtgpio-Virtual-GPIO-driver.patch
deleted file mode 100644
index e84b1dfd72..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0126-bcm2835-virtgpio-Virtual-GPIO-driver.patch
+++ /dev/null
@@ -1,268 +0,0 @@
-From 33810c078d48da7e628b74ef6537a589f41bee2b Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Tue, 23 Feb 2016 19:56:04 +0000
-Subject: [PATCH] bcm2835-virtgpio: Virtual GPIO driver
-
-Add a virtual GPIO driver that uses the firmware mailbox interface to
-request that the VPU toggles LEDs.
-
-gpio: bcm-virt: Fix the get() method
-
-The get() method does not understand the on-the-wire encoding of the
-remote GPIO states, thinking they are simple on/off bits when they are
-really pairs of 16-bit counts. Rewrite the get() handler to return the
-value last written, which will eventually match the actual GPIO state
-if there are no other changes.
-
-See: https://github.com/raspberrypi/linux/issues/4638
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/gpio/Kconfig         |   6 +
- drivers/gpio/Makefile        |   1 +
- drivers/gpio/gpio-bcm-virt.c | 214 +++++++++++++++++++++++++++++++++++
- 3 files changed, 221 insertions(+)
- create mode 100644 drivers/gpio/gpio-bcm-virt.c
-
---- a/drivers/gpio/Kconfig
-+++ b/drivers/gpio/Kconfig
-@@ -194,6 +194,12 @@ config GPIO_BCM_XGS_IPROC
- 	help
- 	  Say yes here to enable GPIO support for Broadcom XGS iProc SoCs.
- 
-+config GPIO_BCM_VIRT
-+	bool "Broadcom Virt GPIO"
-+	depends on OF_GPIO && RASPBERRYPI_FIRMWARE && (ARCH_BCM2835 || COMPILE_TEST)
-+	help
-+	  Turn on virtual GPIO support for Broadcom BCM283X chips.
-+
- config GPIO_BRCMSTB
- 	tristate "BRCMSTB GPIO support"
- 	default y if (ARCH_BRCMSTB || BMIPS_GENERIC)
---- a/drivers/gpio/Makefile
-+++ b/drivers/gpio/Makefile
-@@ -37,6 +37,7 @@ obj-$(CONFIG_GPIO_ASPEED_SGPIO)		+= gpio
- obj-$(CONFIG_GPIO_ATH79)		+= gpio-ath79.o
- obj-$(CONFIG_GPIO_BCM_KONA)		+= gpio-bcm-kona.o
- obj-$(CONFIG_GPIO_BCM_XGS_IPROC)	+= gpio-xgs-iproc.o
-+obj-$(CONFIG_GPIO_BCM_VIRT)		+= gpio-bcm-virt.o
- obj-$(CONFIG_GPIO_BD71815)		+= gpio-bd71815.o
- obj-$(CONFIG_GPIO_BD71828)		+= gpio-bd71828.o
- obj-$(CONFIG_GPIO_BD9571MWV)		+= gpio-bd9571mwv.o
---- /dev/null
-+++ b/drivers/gpio/gpio-bcm-virt.c
-@@ -0,0 +1,214 @@
-+/*
-+ *  brcmvirt GPIO driver
-+ *
-+ *  Copyright (C) 2012,2013 Dom Cobley <popcornmix@gmail.com>
-+ *  Based on gpio-clps711x.c by Alexander Shiyan <shc_work@mail.ru>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ */
-+
-+#include <linux/err.h>
-+#include <linux/gpio.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/dma-mapping.h>
-+#include <soc/bcm2835/raspberrypi-firmware.h>
-+
-+#define MODULE_NAME "brcmvirt-gpio"
-+#define NUM_GPIO 2
-+
-+struct brcmvirt_gpio {
-+	struct gpio_chip	gc;
-+	u32 __iomem		*ts_base;
-+	/* two packed 16-bit counts of enabled and disables
-+           Allows host to detect a brief enable that was missed */
-+	u32			enables_disables[NUM_GPIO];
-+	dma_addr_t		bus_addr;
-+};
-+
-+static int brcmvirt_gpio_dir_in(struct gpio_chip *gc, unsigned off)
-+{
-+	struct brcmvirt_gpio *gpio;
-+	gpio = container_of(gc, struct brcmvirt_gpio, gc);
-+	return -EINVAL;
-+}
-+
-+static int brcmvirt_gpio_dir_out(struct gpio_chip *gc, unsigned off, int val)
-+{
-+	struct brcmvirt_gpio *gpio;
-+	gpio = container_of(gc, struct brcmvirt_gpio, gc);
-+	return 0;
-+}
-+
-+static int brcmvirt_gpio_get(struct gpio_chip *gc, unsigned off)
-+{
-+	struct brcmvirt_gpio *gpio;
-+	unsigned v;
-+	gpio = container_of(gc, struct brcmvirt_gpio, gc);
-+	v = readl(gpio->ts_base + off);
-+	return (s16)((v >> 16) - v) > 0;
-+}
-+
-+static void brcmvirt_gpio_set(struct gpio_chip *gc, unsigned off, int val)
-+{
-+	struct brcmvirt_gpio *gpio;
-+	u16 enables, disables;
-+	s16 diff;
-+	bool lit;
-+	gpio = container_of(gc, struct brcmvirt_gpio, gc);
-+	enables  = gpio->enables_disables[off] >> 16;
-+	disables = gpio->enables_disables[off] >>  0;
-+	diff = (s16)(enables - disables);
-+	lit = diff > 0;
-+	if ((val && lit) || (!val && !lit))
-+		return;
-+	if (val)
-+		enables++;
-+	else
-+		disables++;
-+	diff = (s16)(enables - disables);
-+	BUG_ON(diff != 0 && diff != 1);
-+	gpio->enables_disables[off] = (enables << 16) | (disables << 0);
-+	writel(gpio->enables_disables[off], gpio->ts_base + off);
-+}
-+
-+static int brcmvirt_gpio_probe(struct platform_device *pdev)
-+{
-+	int err = 0;
-+	struct device *dev = &pdev->dev;
-+	struct device_node *np = dev->of_node;
-+	struct device_node *fw_node;
-+	struct rpi_firmware *fw;
-+	struct brcmvirt_gpio *ucb;
-+	u32 gpiovirtbuf;
-+
-+	fw_node = of_parse_phandle(np, "firmware", 0);
-+	if (!fw_node) {
-+		dev_err(dev, "Missing firmware node\n");
-+		return -ENOENT;
-+	}
-+
-+	fw = rpi_firmware_get(fw_node);
-+	if (!fw)
-+		return -EPROBE_DEFER;
-+
-+	ucb = devm_kzalloc(dev, sizeof *ucb, GFP_KERNEL);
-+	if (!ucb) {
-+		err = -EINVAL;
-+		goto out;
-+	}
-+
-+	ucb->ts_base = dma_alloc_coherent(dev, PAGE_SIZE, &ucb->bus_addr, GFP_KERNEL);
-+	if (!ucb->ts_base) {
-+		pr_err("[%s]: failed to dma_alloc_coherent(%ld)\n",
-+				__func__, PAGE_SIZE);
-+		err = -ENOMEM;
-+		goto out;
-+	}
-+
-+	gpiovirtbuf = (u32)ucb->bus_addr;
-+	err = rpi_firmware_property(fw, RPI_FIRMWARE_FRAMEBUFFER_SET_GPIOVIRTBUF,
-+				    &gpiovirtbuf, sizeof(gpiovirtbuf));
-+
-+	if (err || gpiovirtbuf != 0) {
-+		dev_warn(dev, "Failed to set gpiovirtbuf, trying to get err:%x\n", err);
-+		dma_free_coherent(dev, PAGE_SIZE, ucb->ts_base, ucb->bus_addr);
-+		ucb->ts_base = 0;
-+		ucb->bus_addr = 0;
-+	}
-+
-+	if (!ucb->ts_base) {
-+		err = rpi_firmware_property(fw, RPI_FIRMWARE_FRAMEBUFFER_GET_GPIOVIRTBUF,
-+					    &gpiovirtbuf, sizeof(gpiovirtbuf));
-+
-+		if (err) {
-+			dev_err(dev, "Failed to get gpiovirtbuf\n");
-+			goto out;
-+		}
-+
-+		if (!gpiovirtbuf) {
-+			dev_err(dev, "No virtgpio buffer\n");
-+			err = -ENOENT;
-+			goto out;
-+		}
-+
-+		// mmap the physical memory
-+		gpiovirtbuf &= ~0xc0000000;
-+		ucb->ts_base = ioremap(gpiovirtbuf, 4096);
-+		if (ucb->ts_base == NULL) {
-+			dev_err(dev, "Failed to map physical address\n");
-+			err = -ENOENT;
-+			goto out;
-+		}
-+		ucb->bus_addr = 0;
-+	}
-+	ucb->gc.label = MODULE_NAME;
-+	ucb->gc.owner = THIS_MODULE;
-+	//ucb->gc.dev = dev;
-+	ucb->gc.of_node = np;
-+	ucb->gc.base = 100;
-+	ucb->gc.ngpio = NUM_GPIO;
-+
-+	ucb->gc.direction_input = brcmvirt_gpio_dir_in;
-+	ucb->gc.direction_output = brcmvirt_gpio_dir_out;
-+	ucb->gc.get = brcmvirt_gpio_get;
-+	ucb->gc.set = brcmvirt_gpio_set;
-+	ucb->gc.can_sleep = true;
-+
-+	err = gpiochip_add(&ucb->gc);
-+	if (err)
-+		goto out;
-+
-+	platform_set_drvdata(pdev, ucb);
-+
-+	return 0;
-+out:
-+	if (ucb->bus_addr) {
-+		dma_free_coherent(dev, PAGE_SIZE, ucb->ts_base, ucb->bus_addr);
-+		ucb->bus_addr = 0;
-+		ucb->ts_base = NULL;
-+	} else if (ucb->ts_base) {
-+		iounmap(ucb->ts_base);
-+		ucb->ts_base = NULL;
-+	}
-+	return err;
-+}
-+
-+static int brcmvirt_gpio_remove(struct platform_device *pdev)
-+{
-+	struct device *dev = &pdev->dev;
-+	int err = 0;
-+	struct brcmvirt_gpio *ucb = platform_get_drvdata(pdev);
-+
-+	gpiochip_remove(&ucb->gc);
-+	if (ucb->bus_addr)
-+		dma_free_coherent(dev, PAGE_SIZE, ucb->ts_base, ucb->bus_addr);
-+	else if (ucb->ts_base)
-+		iounmap(ucb->ts_base);
-+	return err;
-+}
-+
-+static const struct of_device_id __maybe_unused brcmvirt_gpio_ids[] = {
-+	{ .compatible = "brcm,bcm2835-virtgpio" },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(of, brcmvirt_gpio_ids);
-+
-+static struct platform_driver brcmvirt_gpio_driver = {
-+	.driver	= {
-+		.name		= MODULE_NAME,
-+		.owner		= THIS_MODULE,
-+		.of_match_table	= of_match_ptr(brcmvirt_gpio_ids),
-+	},
-+	.probe	= brcmvirt_gpio_probe,
-+	.remove	= brcmvirt_gpio_remove,
-+};
-+module_platform_driver(brcmvirt_gpio_driver);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Dom Cobley <popcornmix@gmail.com>");
-+MODULE_DESCRIPTION("brcmvirt GPIO driver");
-+MODULE_ALIAS("platform:brcmvirt-gpio");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0127-OF-DT-Overlay-configfs-interface.patch b/target/linux/bcm27xx/patches-6.1/950-0127-OF-DT-Overlay-configfs-interface.patch
deleted file mode 100644
index c3f60badf9..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0127-OF-DT-Overlay-configfs-interface.patch
+++ /dev/null
@@ -1,404 +0,0 @@
-From e438983899b06cf3534b773b6e19cb291456e5cb Mon Sep 17 00:00:00 2001
-From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
-Date: Wed, 3 Dec 2014 13:23:28 +0200
-Subject: [PATCH] OF: DT-Overlay configfs interface
-
-This is a port of Pantelis Antoniou's v3 port that makes use of the
-new upstreamed configfs support for binary attributes.
-
-Original commit message:
-
-Add a runtime interface to using configfs for generic device tree overlay
-usage. With it its possible to use device tree overlays without having
-to use a per-platform overlay manager.
-
-Please see Documentation/devicetree/configfs-overlays.txt for more info.
-
-Changes since v2:
-- Removed ifdef CONFIG_OF_OVERLAY (since for now it's required)
-- Created a documentation entry
-- Slight rewording in Kconfig
-
-Changes since v1:
-- of_resolve() -> of_resolve_phandles().
-
-Originally-signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-DT configfs: Fix build errors on other platforms
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-
-DT configfs: fix build error
-
-There is an error when compiling rpi-4.6.y branch:
-  CC      drivers/of/configfs.o
-drivers/of/configfs.c:291:21: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
-   .default_groups = of_cfs_def_groups,
-                     ^
-drivers/of/configfs.c:291:21: note: (near initialization for 'of_cfs_subsys.su_group.default_groups.next')
-
-The .default_groups is linked list since commit
-1ae1602de028acaa42a0f6ff18d19756f8e825c6.
-This commit uses configfs_add_default_group to fix this problem.
-
-Signed-off-by: Slawomir Stepien <sst@poczta.fm>
-
-configfs: New of_overlay API
-
-of: configfs: Use of_overlay_fdt_apply API call
-
-The published API to the dynamic overlay application mechanism now
-takes a Flattened Device Tree blob as input so that it can manage the
-lifetime of the unflattened tree. Conveniently, the new API call -
-of_overlay_fdt_apply - is virtually a drop-in replacement for
-create_overlay, which can now be deleted.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- .../devicetree/configfs-overlays.txt          |  31 ++
- drivers/of/Kconfig                            |   7 +
- drivers/of/Makefile                           |   1 +
- drivers/of/configfs.c                         | 277 ++++++++++++++++++
- 4 files changed, 316 insertions(+)
- create mode 100644 Documentation/devicetree/configfs-overlays.txt
- create mode 100644 drivers/of/configfs.c
-
---- /dev/null
-+++ b/Documentation/devicetree/configfs-overlays.txt
-@@ -0,0 +1,31 @@
-+Howto use the configfs overlay interface.
-+
-+A device-tree configfs entry is created in /config/device-tree/overlays
-+and and it is manipulated using standard file system I/O.
-+Note that this is a debug level interface, for use by developers and
-+not necessarily something accessed by normal users due to the
-+security implications of having direct access to the kernel's device tree.
-+
-+* To create an overlay you mkdir the directory:
-+
-+	# mkdir /config/device-tree/overlays/foo
-+
-+* Either you echo the overlay firmware file to the path property file.
-+
-+	# echo foo.dtbo >/config/device-tree/overlays/foo/path
-+
-+* Or you cat the contents of the overlay to the dtbo file
-+
-+	# cat foo.dtbo >/config/device-tree/overlays/foo/dtbo
-+
-+The overlay file will be applied, and devices will be created/destroyed
-+as required.
-+
-+To remove it simply rmdir the directory.
-+
-+	# rmdir /config/device-tree/overlays/foo
-+
-+The rationalle of the dual interface (firmware & direct copy) is that each is
-+better suited to different use patterns. The firmware interface is what's
-+intended to be used by hardware managers in the kernel, while the copy interface
-+make sense for developers (since it avoids problems with namespaces).
---- a/drivers/of/Kconfig
-+++ b/drivers/of/Kconfig
-@@ -94,4 +94,11 @@ config OF_DMA_DEFAULT_COHERENT
- 	# arches should select this if DMA is coherent by default for OF devices
- 	bool
- 
-+config OF_CONFIGFS
-+	bool "Device Tree Overlay ConfigFS interface"
-+	select CONFIGFS_FS
-+	select OF_OVERLAY
-+	help
-+	  Enable a simple user-space driven DT overlay interface.
-+
- endif # OF
---- a/drivers/of/Makefile
-+++ b/drivers/of/Makefile
-@@ -1,6 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0
- obj-y = base.o device.o module.o platform.o property.o
- obj-$(CONFIG_OF_KOBJ) += kobj.o
-+obj-$(CONFIG_OF_CONFIGFS) += configfs.o
- obj-$(CONFIG_OF_DYNAMIC) += dynamic.o
- obj-$(CONFIG_OF_FLATTREE) += fdt.o
- obj-$(CONFIG_OF_EARLY_FLATTREE) += fdt_address.o
---- /dev/null
-+++ b/drivers/of/configfs.c
-@@ -0,0 +1,277 @@
-+/*
-+ * Configfs entries for device-tree
-+ *
-+ * Copyright (C) 2013 - Pantelis Antoniou <panto@antoniou-consulting.com>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+#include <linux/ctype.h>
-+#include <linux/cpu.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/of_fdt.h>
-+#include <linux/spinlock.h>
-+#include <linux/slab.h>
-+#include <linux/proc_fs.h>
-+#include <linux/configfs.h>
-+#include <linux/types.h>
-+#include <linux/stat.h>
-+#include <linux/limits.h>
-+#include <linux/file.h>
-+#include <linux/vmalloc.h>
-+#include <linux/firmware.h>
-+#include <linux/sizes.h>
-+
-+#include "of_private.h"
-+
-+struct cfs_overlay_item {
-+	struct config_item	item;
-+
-+	char			path[PATH_MAX];
-+
-+	const struct firmware	*fw;
-+	struct device_node	*overlay;
-+	int			ov_id;
-+
-+	void			*dtbo;
-+	int			dtbo_size;
-+};
-+
-+static inline struct cfs_overlay_item *to_cfs_overlay_item(
-+		struct config_item *item)
-+{
-+	return item ? container_of(item, struct cfs_overlay_item, item) : NULL;
-+}
-+
-+static ssize_t cfs_overlay_item_path_show(struct config_item *item,
-+		char *page)
-+{
-+	struct cfs_overlay_item *overlay = to_cfs_overlay_item(item);
-+	return sprintf(page, "%s\n", overlay->path);
-+}
-+
-+static ssize_t cfs_overlay_item_path_store(struct config_item *item,
-+		const char *page, size_t count)
-+{
-+	struct cfs_overlay_item *overlay = to_cfs_overlay_item(item);
-+	const char *p = page;
-+	char *s;
-+	int err;
-+
-+	/* if it's set do not allow changes */
-+	if (overlay->path[0] != '\0' || overlay->dtbo_size > 0)
-+		return -EPERM;
-+
-+	/* copy to path buffer (and make sure it's always zero terminated */
-+	count = snprintf(overlay->path, sizeof(overlay->path) - 1, "%s", p);
-+	overlay->path[sizeof(overlay->path) - 1] = '\0';
-+
-+	/* strip trailing newlines */
-+	s = overlay->path + strlen(overlay->path);
-+	while (s > overlay->path && *--s == '\n')
-+		*s = '\0';
-+
-+	pr_debug("%s: path is '%s'\n", __func__, overlay->path);
-+
-+	err = request_firmware(&overlay->fw, overlay->path, NULL);
-+	if (err != 0)
-+		goto out_err;
-+
-+	err = of_overlay_fdt_apply((void *)overlay->fw->data,
-+				   (u32)overlay->fw->size, &overlay->ov_id);
-+	if (err != 0)
-+		goto out_err;
-+
-+	return count;
-+
-+out_err:
-+
-+	release_firmware(overlay->fw);
-+	overlay->fw = NULL;
-+
-+	overlay->path[0] = '\0';
-+	return err;
-+}
-+
-+static ssize_t cfs_overlay_item_status_show(struct config_item *item,
-+		char *page)
-+{
-+	struct cfs_overlay_item *overlay = to_cfs_overlay_item(item);
-+
-+	return sprintf(page, "%s\n",
-+			overlay->ov_id > 0 ? "applied" : "unapplied");
-+}
-+
-+CONFIGFS_ATTR(cfs_overlay_item_, path);
-+CONFIGFS_ATTR_RO(cfs_overlay_item_, status);
-+
-+static struct configfs_attribute *cfs_overlay_attrs[] = {
-+	&cfs_overlay_item_attr_path,
-+	&cfs_overlay_item_attr_status,
-+	NULL,
-+};
-+
-+ssize_t cfs_overlay_item_dtbo_read(struct config_item *item,
-+		void *buf, size_t max_count)
-+{
-+	struct cfs_overlay_item *overlay = to_cfs_overlay_item(item);
-+
-+	pr_debug("%s: buf=%p max_count=%zu\n", __func__,
-+			buf, max_count);
-+
-+	if (overlay->dtbo == NULL)
-+		return 0;
-+
-+	/* copy if buffer provided */
-+	if (buf != NULL) {
-+		/* the buffer must be large enough */
-+		if (overlay->dtbo_size > max_count)
-+			return -ENOSPC;
-+
-+		memcpy(buf, overlay->dtbo, overlay->dtbo_size);
-+	}
-+
-+	return overlay->dtbo_size;
-+}
-+
-+ssize_t cfs_overlay_item_dtbo_write(struct config_item *item,
-+		const void *buf, size_t count)
-+{
-+	struct cfs_overlay_item *overlay = to_cfs_overlay_item(item);
-+	int err;
-+
-+	/* if it's set do not allow changes */
-+	if (overlay->path[0] != '\0' || overlay->dtbo_size > 0)
-+		return -EPERM;
-+
-+	/* copy the contents */
-+	overlay->dtbo = kmemdup(buf, count, GFP_KERNEL);
-+	if (overlay->dtbo == NULL)
-+		return -ENOMEM;
-+
-+	overlay->dtbo_size = count;
-+
-+	err = of_overlay_fdt_apply(overlay->dtbo, overlay->dtbo_size,
-+				   &overlay->ov_id);
-+	if (err != 0)
-+		goto out_err;
-+
-+	return count;
-+
-+out_err:
-+	kfree(overlay->dtbo);
-+	overlay->dtbo = NULL;
-+	overlay->dtbo_size = 0;
-+	overlay->ov_id = 0;
-+
-+	return err;
-+}
-+
-+CONFIGFS_BIN_ATTR(cfs_overlay_item_, dtbo, NULL, SZ_1M);
-+
-+static struct configfs_bin_attribute *cfs_overlay_bin_attrs[] = {
-+	&cfs_overlay_item_attr_dtbo,
-+	NULL,
-+};
-+
-+static void cfs_overlay_release(struct config_item *item)
-+{
-+	struct cfs_overlay_item *overlay = to_cfs_overlay_item(item);
-+
-+	if (overlay->ov_id > 0)
-+		of_overlay_remove(&overlay->ov_id);
-+	if (overlay->fw)
-+		release_firmware(overlay->fw);
-+	/* kfree with NULL is safe */
-+	kfree(overlay->dtbo);
-+	kfree(overlay);
-+}
-+
-+static struct configfs_item_operations cfs_overlay_item_ops = {
-+	.release	= cfs_overlay_release,
-+};
-+
-+static struct config_item_type cfs_overlay_type = {
-+	.ct_item_ops	= &cfs_overlay_item_ops,
-+	.ct_attrs	= cfs_overlay_attrs,
-+	.ct_bin_attrs	= cfs_overlay_bin_attrs,
-+	.ct_owner	= THIS_MODULE,
-+};
-+
-+static struct config_item *cfs_overlay_group_make_item(
-+		struct config_group *group, const char *name)
-+{
-+	struct cfs_overlay_item *overlay;
-+
-+	overlay = kzalloc(sizeof(*overlay), GFP_KERNEL);
-+	if (!overlay)
-+		return ERR_PTR(-ENOMEM);
-+
-+	config_item_init_type_name(&overlay->item, name, &cfs_overlay_type);
-+	return &overlay->item;
-+}
-+
-+static void cfs_overlay_group_drop_item(struct config_group *group,
-+		struct config_item *item)
-+{
-+	struct cfs_overlay_item *overlay = to_cfs_overlay_item(item);
-+
-+	config_item_put(&overlay->item);
-+}
-+
-+static struct configfs_group_operations overlays_ops = {
-+	.make_item	= cfs_overlay_group_make_item,
-+	.drop_item	= cfs_overlay_group_drop_item,
-+};
-+
-+static struct config_item_type overlays_type = {
-+	.ct_group_ops   = &overlays_ops,
-+	.ct_owner       = THIS_MODULE,
-+};
-+
-+static struct configfs_group_operations of_cfs_ops = {
-+	/* empty - we don't allow anything to be created */
-+};
-+
-+static struct config_item_type of_cfs_type = {
-+	.ct_group_ops   = &of_cfs_ops,
-+	.ct_owner       = THIS_MODULE,
-+};
-+
-+struct config_group of_cfs_overlay_group;
-+
-+static struct configfs_subsystem of_cfs_subsys = {
-+	.su_group = {
-+		.cg_item = {
-+			.ci_namebuf = "device-tree",
-+			.ci_type = &of_cfs_type,
-+		},
-+	},
-+	.su_mutex = __MUTEX_INITIALIZER(of_cfs_subsys.su_mutex),
-+};
-+
-+static int __init of_cfs_init(void)
-+{
-+	int ret;
-+
-+	pr_info("%s\n", __func__);
-+
-+	config_group_init(&of_cfs_subsys.su_group);
-+	config_group_init_type_name(&of_cfs_overlay_group, "overlays",
-+			&overlays_type);
-+	configfs_add_default_group(&of_cfs_overlay_group,
-+			&of_cfs_subsys.su_group);
-+
-+	ret = configfs_register_subsystem(&of_cfs_subsys);
-+	if (ret != 0) {
-+		pr_err("%s: failed to register subsys\n", __func__);
-+		goto out;
-+	}
-+	pr_info("%s: OK\n", __func__);
-+out:
-+	return ret;
-+}
-+late_initcall(of_cfs_init);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0128-hci_h5-Don-t-send-conf_req-when-ACTIVE.patch b/target/linux/bcm27xx/patches-6.1/950-0128-hci_h5-Don-t-send-conf_req-when-ACTIVE.patch
deleted file mode 100644
index 91f4f6dba6..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0128-hci_h5-Don-t-send-conf_req-when-ACTIVE.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 8353daacb4848b96f96ee7c8df585045fedb2f82 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Thu, 17 Dec 2015 13:37:07 +0000
-Subject: [PATCH] hci_h5: Don't send conf_req when ACTIVE
-
-Without this patch, a modem and kernel can continuously bombard each
-other with conf_req and conf_rsp messages, in a demented game of tag.
----
- drivers/bluetooth/hci_h5.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/bluetooth/hci_h5.c
-+++ b/drivers/bluetooth/hci_h5.c
-@@ -357,7 +357,8 @@ static void h5_handle_internal_rx(struct
- 		h5_link_control(hu, conf_req, 3);
- 	} else if (memcmp(data, conf_req, 2) == 0) {
- 		h5_link_control(hu, conf_rsp, 2);
--		h5_link_control(hu, conf_req, 3);
-+		if (h5->state != H5_ACTIVE)
-+		    h5_link_control(hu, conf_req, 3);
- 	} else if (memcmp(data, conf_rsp, 2) == 0) {
- 		if (H5_HDR_LEN(hdr) > 2)
- 			h5->tx_win = (data[2] & 0x07);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0129-ARM64-Round-Robin-dispatch-IRQs-between-CPUs.patch b/target/linux/bcm27xx/patches-6.1/950-0129-ARM64-Round-Robin-dispatch-IRQs-between-CPUs.patch
deleted file mode 100644
index a78d5a90ed..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0129-ARM64-Round-Robin-dispatch-IRQs-between-CPUs.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From faa2632edba777bd250a7e18340fbafca450a28a Mon Sep 17 00:00:00 2001
-From: Michael Zoran <mzoran@crowfest.net>
-Date: Sat, 14 Jan 2017 21:43:57 -0800
-Subject: [PATCH] ARM64: Round-Robin dispatch IRQs between CPUs.
-
-IRQ-CPU mapping is round robined on ARM64 to increase
-concurrency and allow multiple interrupts to be serviced
-at a time.  This reduces the need for FIQ.
-
-Signed-off-by: Michael Zoran <mzoran@crowfest.net>
----
- drivers/irqchip/irq-bcm2835.c | 15 ++++++++++++++-
- drivers/irqchip/irq-bcm2836.c | 21 +++++++++++++++++++++
- 2 files changed, 35 insertions(+), 1 deletion(-)
-
---- a/drivers/irqchip/irq-bcm2835.c
-+++ b/drivers/irqchip/irq-bcm2835.c
-@@ -154,10 +154,23 @@ static void armctrl_unmask_irq(struct ir
- 	}
- }
- 
-+#ifdef CONFIG_ARM64
-+void bcm2836_arm_irqchip_spin_gpu_irq(void);
-+
-+static void armctrl_ack_irq(struct irq_data *d)
-+{
-+	bcm2836_arm_irqchip_spin_gpu_irq();
-+}
-+
-+#endif
-+
- static struct irq_chip armctrl_chip = {
- 	.name = "ARMCTRL-level",
- 	.irq_mask = armctrl_mask_irq,
--	.irq_unmask = armctrl_unmask_irq
-+	.irq_unmask = armctrl_unmask_irq,
-+#ifdef CONFIG_ARM64
-+	.irq_ack    = armctrl_ack_irq
-+#endif
- };
- 
- static int armctrl_xlate(struct irq_domain *d, struct device_node *ctrlr,
---- a/drivers/irqchip/irq-bcm2836.c
-+++ b/drivers/irqchip/irq-bcm2836.c
-@@ -87,6 +87,27 @@ static void bcm2836_arm_irqchip_unmask_g
- {
- }
- 
-+#ifdef CONFIG_ARM64
-+
-+void bcm2836_arm_irqchip_spin_gpu_irq(void)
-+{
-+	u32 i;
-+	void __iomem *gpurouting = (intc.base + LOCAL_GPU_ROUTING);
-+	u32 routing_val = readl(gpurouting);
-+
-+	for (i = 1; i <= 3; i++) {
-+		u32 new_routing_val = (routing_val + i) & 3;
-+
-+		if (cpu_active(new_routing_val)) {
-+			writel(new_routing_val, gpurouting);
-+			return;
-+		}
-+	}
-+}
-+EXPORT_SYMBOL(bcm2836_arm_irqchip_spin_gpu_irq);
-+
-+#endif
-+
- static struct irq_chip bcm2836_arm_irqchip_gpu = {
- 	.name		= "bcm2836-gpu",
- 	.irq_mask	= bcm2836_arm_irqchip_mask_gpu_irq,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0130-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch b/target/linux/bcm27xx/patches-6.1/950-0130-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch
deleted file mode 100644
index cbabf9983f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0130-ARM64-Force-hardware-emulation-of-deprecated-instruc.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 524cf14dafc03196173177a3f775373e9561894b Mon Sep 17 00:00:00 2001
-From: Michael Zoran <mzoran@crowfest.net>
-Date: Sat, 11 Feb 2017 01:18:31 -0800
-Subject: [PATCH] ARM64: Force hardware emulation of deprecated
- instructions.
-
----
- arch/arm64/kernel/armv8_deprecated.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/arch/arm64/kernel/armv8_deprecated.c
-+++ b/arch/arm64/kernel/armv8_deprecated.c
-@@ -183,10 +183,15 @@ static void __init register_insn_emulati
- 
- 	switch (ops->status) {
- 	case INSN_DEPRECATED:
-+#if 0
- 		insn->current_mode = INSN_EMULATE;
- 		/* Disable the HW mode if it was turned on at early boot time */
- 		run_all_cpu_set_hw_mode(insn, false);
-+#else
-+		insn->current_mode = INSN_HW;
-+		run_all_cpu_set_hw_mode(insn, true);
- 		insn->max = INSN_HW;
-+#endif
- 		break;
- 	case INSN_OBSOLETE:
- 		insn->current_mode = INSN_UNDEF;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0131-AXI-performance-monitor-driver-2222.patch b/target/linux/bcm27xx/patches-6.1/950-0131-AXI-performance-monitor-driver-2222.patch
deleted file mode 100644
index 71b1f9b78f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0131-AXI-performance-monitor-driver-2222.patch
+++ /dev/null
@@ -1,691 +0,0 @@
-From 81371496847b3c61033cb9a1c426a967c7b402bc Mon Sep 17 00:00:00 2001
-From: James Hughes <JamesH65@users.noreply.github.com>
-Date: Tue, 14 Nov 2017 15:13:15 +0000
-Subject: [PATCH] AXI performance monitor driver (#2222)
-
-Uses the debugfs I/F to provide access to the AXI
-bus performance monitors.
-
-Requires the new mailbox peripheral access for access
-to the VPU performance registers, system bus access
-is done using direct register reads.
-
-Signed-off-by: James Hughes <james.hughes@raspberrypi.org>
-
-raspberrypi_axi_monitor: suppress warning
-
-Suppress the following warning by casting the pointer to and uintptr_t
-before to u32:
-
-Signed-off-by: Matteo Croce <mcroce@redhat.com>
----
- drivers/perf/Kconfig                   |   8 +
- drivers/perf/Makefile                  |   1 +
- drivers/perf/raspberrypi_axi_monitor.c | 637 +++++++++++++++++++++++++
- 3 files changed, 646 insertions(+)
- create mode 100644 drivers/perf/raspberrypi_axi_monitor.c
-
---- a/drivers/perf/Kconfig
-+++ b/drivers/perf/Kconfig
-@@ -190,6 +190,14 @@ config ALIBABA_UNCORE_DRW_PMU
- 	  Support for Driveway PMU events monitoring on Yitian 710 DDR
- 	  Sub-system.
- 
-+config RPI_AXIPERF
-+        depends on ARCH_BCM2835
-+        tristate "RaspberryPi AXI Performance monitors"
-+        default n
-+        help
-+          Say y if you want to use Raspberry Pi AXI performance monitors, m if
-+          you want to build it as a module.
-+
- source "drivers/perf/hisilicon/Kconfig"
- 
- config MARVELL_CN10K_DDR_PMU
---- a/drivers/perf/Makefile
-+++ b/drivers/perf/Makefile
-@@ -21,3 +21,4 @@ obj-$(CONFIG_MARVELL_CN10K_TAD_PMU) += m
- obj-$(CONFIG_MARVELL_CN10K_DDR_PMU) += marvell_cn10k_ddr_pmu.o
- obj-$(CONFIG_APPLE_M1_CPU_PMU) += apple_m1_cpu_pmu.o
- obj-$(CONFIG_ALIBABA_UNCORE_DRW_PMU) += alibaba_uncore_drw_pmu.o
-+obj-$(CONFIG_RPI_AXIPERF) += raspberrypi_axi_monitor.o
---- /dev/null
-+++ b/drivers/perf/raspberrypi_axi_monitor.c
-@@ -0,0 +1,637 @@
-+/*
-+ * raspberrypi_axi_monitor.c
-+ *
-+ * Author: james.hughes@raspberrypi.org
-+ *
-+ * Raspberry Pi AXI performance counters.
-+ *
-+ * Copyright (C) 2017 Raspberry Pi Trading Ltd.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#include <linux/debugfs.h>
-+#include <linux/devcoredump.h>
-+#include <linux/device.h>
-+#include <linux/kthread.h>
-+#include <linux/module.h>
-+#include <linux/netdevice.h>
-+#include <linux/mutex.h>
-+#include <linux/of.h>
-+#include <linux/platform_device.h>
-+
-+#include <soc/bcm2835/raspberrypi-firmware.h>
-+
-+#define NUM_MONITORS 2
-+#define NUM_BUS_WATCHERS_PER_MONITOR 3
-+
-+#define SYSTEM_MONITOR 0
-+#define VPU_MONITOR 1
-+
-+#define MAX_BUSES 16
-+#define DEFAULT_SAMPLE_TIME 100
-+
-+#define NUM_BUS_WATCHER_RESULTS 9
-+
-+struct bus_watcher_data {
-+	union	{
-+		u32 results[NUM_BUS_WATCHER_RESULTS];
-+		struct {
-+			u32 atrans;
-+			u32 atwait;
-+			u32 amax;
-+			u32 wtrans;
-+			u32 wtwait;
-+			u32 wmax;
-+			u32 rtrans;
-+			u32 rtwait;
-+			u32 rmax;
-+		};
-+	};
-+};
-+
-+
-+struct rpi_axiperf {
-+	struct platform_device *dev;
-+	struct dentry *root_folder;
-+
-+	struct task_struct *monitor_thread;
-+	struct mutex lock;
-+
-+	struct rpi_firmware *firmware;
-+
-+	/* Sample time spent on for each bus */
-+	int sample_time;
-+
-+	/* Now storage for the per monitor settings and the resulting
-+	 * performance figures
-+	 */
-+	struct {
-+		/* Bit field of buses we want to monitor */
-+		int bus_enabled;
-+		/* Bit field of buses to filter by */
-+		int bus_filter;
-+		/* The current buses being monitored on this monitor */
-+		int current_bus[NUM_BUS_WATCHERS_PER_MONITOR];
-+		/* The last bus monitored on this monitor */
-+		int last_monitored;
-+
-+		/* Set true if this mailbox must use the mailbox interface
-+		 * rather than access registers directly.
-+		 */
-+		int use_mailbox_interface;
-+
-+		/* Current result values */
-+		struct bus_watcher_data results[MAX_BUSES];
-+
-+		struct dentry *debugfs_entry;
-+		void __iomem *base_address;
-+
-+	}  monitor[NUM_MONITORS];
-+
-+};
-+
-+static struct rpi_axiperf *state;
-+
-+/* Two monitors, System and VPU, each with the following register sets.
-+ * Each monitor can only monitor one bus at a time, so we time share them,
-+ * giving each bus 100ms (default, settable via debugfs) of time on its
-+ * associated monitor
-+ * Record results from the three Bus watchers per monitor and push to the sysfs
-+ */
-+
-+/* general registers */
-+const int GEN_CTRL;
-+
-+const int GEN_CTL_ENABLE_BIT	= BIT(0);
-+const int GEN_CTL_RESET_BIT	= BIT(1);
-+
-+/* Bus watcher registers */
-+const int BW_PITCH		= 0x40;
-+
-+const int BW0_CTRL		= 0x40;
-+const int BW1_CTRL		= 0x80;
-+const int BW2_CTRL		= 0xc0;
-+
-+const int BW_ATRANS_OFFSET	= 0x04;
-+const int BW_ATWAIT_OFFSET	= 0x08;
-+const int BW_AMAX_OFFSET	= 0x0c;
-+const int BW_WTRANS_OFFSET	= 0x10;
-+const int BW_WTWAIT_OFFSET	= 0x14;
-+const int BW_WMAX_OFFSET	= 0x18;
-+const int BW_RTRANS_OFFSET	= 0x1c;
-+const int BW_RTWAIT_OFFSET	= 0x20;
-+const int BW_RMAX_OFFSET	= 0x24;
-+
-+const int BW_CTRL_RESET_BIT	= BIT(31);
-+const int BW_CTRL_ENABLE_BIT	= BIT(30);
-+const int BW_CTRL_ENABLE_ID_FILTER_BIT	= BIT(29);
-+const int BW_CTRL_LIMIT_HALT_BIT	= BIT(28);
-+
-+const int BW_CTRL_SOURCE_SHIFT	= 8;
-+const int BW_CTRL_SOURCE_MASK	= GENMASK(12, 8); // 5 bits
-+const int BW_CTRL_BUS_WATCH_SHIFT;
-+const int BW_CTRL_BUS_WATCH_MASK = GENMASK(5, 0); // 6 bits
-+const int BW_CTRL_BUS_FILTER_SHIFT = 8;
-+
-+const static char *bus_filter_strings[] = {
-+	"",
-+	"CORE0_V",
-+	"ICACHE0",
-+	"DCACHE0",
-+	"CORE1_V",
-+	"ICACHE1",
-+	"DCACHE1",
-+	"L2_MAIN",
-+	"HOST_PORT",
-+	"HOST_PORT2",
-+	"HVS",
-+	"ISP",
-+	"VIDEO_DCT",
-+	"VIDEO_SD2AXI",
-+	"CAM0",
-+	"CAM1",
-+	"DMA0",
-+	"DMA1",
-+	"DMA2_VPU",
-+	"JPEG",
-+	"VIDEO_CME",
-+	"TRANSPOSER",
-+	"VIDEO_FME",
-+	"CCP2TX",
-+	"USB",
-+	"V3D0",
-+	"V3D1",
-+	"V3D2",
-+	"AVE",
-+	"DEBUG",
-+	"CPU",
-+	"M30"
-+};
-+
-+const int num_bus_filters = ARRAY_SIZE(bus_filter_strings);
-+
-+const static char *system_bus_string[] = {
-+	"DMA_L2",
-+	"TRANS",
-+	"JPEG",
-+	"SYSTEM_UC",
-+	"DMA_UC",
-+	"SYSTEM_L2",
-+	"CCP2TX",
-+	"MPHI_RX",
-+	"MPHI_TX",
-+	"HVS",
-+	"H264",
-+	"ISP",
-+	"V3D",
-+	"PERIPHERAL",
-+	"CPU_UC",
-+	"CPU_L2"
-+};
-+
-+const int num_system_buses = ARRAY_SIZE(system_bus_string);
-+
-+const static char *vpu_bus_string[] = {
-+	"VPU1_D_L2",
-+	"VPU0_D_L2",
-+	"VPU1_I_L2",
-+	"VPU0_I_L2",
-+	"SYSTEM_L2",
-+	"L2_FLUSH",
-+	"DMA_L2",
-+	"VPU1_D_UC",
-+	"VPU0_D_UC",
-+	"VPU1_I_UC",
-+	"VPU0_I_UC",
-+	"SYSTEM_UC",
-+	"L2_OUT",
-+	"DMA_UC",
-+	"SDRAM",
-+	"L2_IN"
-+};
-+
-+const int num_vpu_buses = ARRAY_SIZE(vpu_bus_string);
-+
-+const static char *monitor_name[] = {
-+	"System",
-+	"VPU"
-+};
-+
-+static inline void write_reg(int monitor, int reg, u32 value)
-+{
-+	writel(value, state->monitor[monitor].base_address + reg);
-+}
-+
-+static inline u32 read_reg(int monitor, u32 reg)
-+{
-+	return readl(state->monitor[monitor].base_address + reg);
-+}
-+
-+static void read_bus_watcher(int monitor, int watcher, u32 *results)
-+{
-+	if (state->monitor[monitor].use_mailbox_interface) {
-+		/* We have 9 results, plus the overheads of start address and
-+		 * length So 11 u32 to define
-+		 */
-+		u32 tmp[11];
-+		int err;
-+
-+		tmp[0] = (u32)(uintptr_t)(state->monitor[monitor].base_address + watcher
-+				+ BW_ATRANS_OFFSET);
-+		tmp[1] = NUM_BUS_WATCHER_RESULTS;
-+
-+		err = rpi_firmware_property(state->firmware,
-+					    RPI_FIRMWARE_GET_PERIPH_REG,
-+					    tmp, sizeof(tmp));
-+
-+		if (err < 0 || tmp[1] != NUM_BUS_WATCHER_RESULTS)
-+			dev_err_once(&state->dev->dev,
-+				     "Failed to read bus watcher");
-+		else
-+			memcpy(results, &tmp[2],
-+			       NUM_BUS_WATCHER_RESULTS * sizeof(u32));
-+	} else {
-+		int i;
-+		void __iomem *addr = state->monitor[monitor].base_address
-+				+ watcher + BW_ATRANS_OFFSET;
-+		for (i = 0; i < NUM_BUS_WATCHER_RESULTS; i++, addr += 4)
-+			*results++ = readl(addr);
-+	}
-+}
-+
-+static void set_monitor_control(int monitor, u32 set)
-+{
-+	if (state->monitor[monitor].use_mailbox_interface) {
-+		u32 tmp[3] = {(u32)(uintptr_t)(state->monitor[monitor].base_address +
-+				GEN_CTRL), 1, set};
-+		int err = rpi_firmware_property(state->firmware,
-+						RPI_FIRMWARE_SET_PERIPH_REG,
-+						tmp, sizeof(tmp));
-+
-+		if (err < 0 || tmp[1] != 1)
-+			dev_err_once(&state->dev->dev,
-+				"Failed to set monitor control");
-+	} else
-+		write_reg(monitor, GEN_CTRL, set);
-+}
-+
-+static void set_bus_watcher_control(int monitor, int watcher, u32 set)
-+{
-+	if (state->monitor[monitor].use_mailbox_interface) {
-+		u32 tmp[3] = {(u32)(uintptr_t)(state->monitor[monitor].base_address +
-+				    watcher), 1, set};
-+		int err = rpi_firmware_property(state->firmware,
-+						RPI_FIRMWARE_SET_PERIPH_REG,
-+						tmp, sizeof(tmp));
-+		if (err < 0 || tmp[1] != 1)
-+			dev_err_once(&state->dev->dev,
-+				"Failed to set bus watcher control");
-+	} else
-+		write_reg(monitor, watcher, set);
-+}
-+
-+static void monitor(struct rpi_axiperf *state)
-+{
-+	int monitor, num_buses[NUM_MONITORS];
-+
-+	mutex_lock(&state->lock);
-+
-+	for (monitor = 0; monitor < NUM_MONITORS; monitor++) {
-+		typeof(state->monitor[0]) *mon = &(state->monitor[monitor]);
-+
-+		/* Anything enabled? */
-+		if (mon->bus_enabled == 0) {
-+			/* No, disable all monitoring for this monitor */
-+			set_monitor_control(monitor, GEN_CTL_RESET_BIT);
-+		} else {
-+			int i;
-+
-+			/* Find out how many busses we want to monitor, and
-+			 * spread our 3 actual monitors over them
-+			 */
-+			num_buses[monitor] = hweight32(mon->bus_enabled);
-+			num_buses[monitor] = min(num_buses[monitor],
-+						 NUM_BUS_WATCHERS_PER_MONITOR);
-+
-+			for (i = 0; i < num_buses[monitor]; i++) {
-+				int bus_control;
-+
-+				do {
-+					mon->last_monitored++;
-+					mon->last_monitored &= 0xf;
-+				} while ((mon->bus_enabled &
-+					 (1 << mon->last_monitored)) == 0);
-+
-+				mon->current_bus[i] = mon->last_monitored;
-+
-+				/* Reset the counters */
-+				set_bus_watcher_control(monitor,
-+							BW0_CTRL +
-+							i*BW_PITCH,
-+							BW_CTRL_RESET_BIT);
-+
-+				bus_control = BW_CTRL_ENABLE_BIT |
-+						mon->current_bus[i];
-+
-+				if (mon->bus_filter) {
-+					bus_control |=
-+						BW_CTRL_ENABLE_ID_FILTER_BIT;
-+					bus_control |=
-+						((mon->bus_filter & 0x1f)
-+						<< BW_CTRL_BUS_FILTER_SHIFT);
-+				}
-+
-+				// Start capture
-+				set_bus_watcher_control(monitor,
-+							BW0_CTRL + i*BW_PITCH,
-+							bus_control);
-+			}
-+		}
-+
-+		/* start monitoring */
-+		set_monitor_control(monitor, GEN_CTL_ENABLE_BIT);
-+	}
-+
-+	mutex_unlock(&state->lock);
-+
-+	msleep(state->sample_time);
-+
-+	/* Now read the results */
-+
-+	mutex_lock(&state->lock);
-+	for (monitor = 0; monitor < NUM_MONITORS; monitor++) {
-+		typeof(state->monitor[0]) *mon = &(state->monitor[monitor]);
-+
-+		/* Anything enabled? */
-+		if (mon->bus_enabled == 0) {
-+			/* No, disable all monitoring for this monitor */
-+			set_monitor_control(monitor, 0);
-+		} else {
-+			int i;
-+
-+			for (i = 0; i < num_buses[monitor]; i++) {
-+				int bus = mon->current_bus[i];
-+
-+				read_bus_watcher(monitor,
-+					BW0_CTRL + i*BW_PITCH,
-+					(u32 *)&mon->results[bus].results);
-+			}
-+		}
-+	}
-+	mutex_unlock(&state->lock);
-+}
-+
-+static int monitor_thread(void *data)
-+{
-+	struct rpi_axiperf *state  = data;
-+
-+	while (1) {
-+		monitor(state);
-+
-+		if (kthread_should_stop())
-+			return 0;
-+	}
-+	return 0;
-+}
-+
-+static ssize_t myreader(struct file *fp, char __user *user_buffer,
-+			size_t count, loff_t *position)
-+{
-+#define INIT_BUFF_SIZE 2048
-+
-+	int i;
-+	int idx = (int)(uintptr_t)(fp->private_data);
-+	int num_buses, cnt;
-+	char *string_buffer;
-+	int buff_size = INIT_BUFF_SIZE;
-+	char *p;
-+	typeof(state->monitor[0]) *mon = &(state->monitor[idx]);
-+
-+	if (idx < 0 || idx > NUM_MONITORS)
-+		idx = 0;
-+
-+	num_buses = idx == SYSTEM_MONITOR ? num_system_buses : num_vpu_buses;
-+
-+	string_buffer = kmalloc(buff_size, GFP_KERNEL);
-+
-+	if (!string_buffer) {
-+		dev_err(&state->dev->dev,
-+				"Failed temporary string allocation\n");
-+		return 0;
-+	}
-+
-+	p = string_buffer;
-+
-+	mutex_lock(&state->lock);
-+
-+	if (mon->bus_filter) {
-+		int filt = min(mon->bus_filter & 0x1f, num_bus_filters);
-+
-+		cnt = snprintf(p, buff_size,
-+			       "\nMonitoring transactions from %s only\n",
-+			       bus_filter_strings[filt]);
-+		p += cnt;
-+		buff_size -= cnt;
-+	}
-+
-+	cnt = snprintf(p, buff_size, "     Bus   |    Atrans    Atwait      AMax    Wtrans    Wtwait      WMax    Rtrans    Rtwait      RMax\n"
-+				     "======================================================================================================\n");
-+
-+	if (cnt >= buff_size)
-+		goto done;
-+
-+	p += cnt;
-+	buff_size -= cnt;
-+
-+	for (i = 0; i < num_buses; i++) {
-+		if (mon->bus_enabled & (1 << i)) {
-+#define DIVIDER (1024)
-+			typeof(mon->results[0]) *res = &(mon->results[i]);
-+
-+			cnt = snprintf(p, buff_size,
-+					"%10s | %8uK %8uK %8uK %8uK %8uK %8uK %8uK %8uK %8uK\n",
-+					idx == SYSTEM_MONITOR ?
-+						system_bus_string[i] :
-+						vpu_bus_string[i],
-+					res->atrans/DIVIDER,
-+					res->atwait/DIVIDER,
-+					res->amax/DIVIDER,
-+					res->wtrans/DIVIDER,
-+					res->wtwait/DIVIDER,
-+					res->wmax/DIVIDER,
-+					res->rtrans/DIVIDER,
-+					res->rtwait/DIVIDER,
-+					res->rmax/DIVIDER
-+					);
-+			if (cnt >= buff_size)
-+				goto done;
-+
-+			p += cnt;
-+			buff_size -= cnt;
-+		}
-+	}
-+
-+	mutex_unlock(&state->lock);
-+
-+done:
-+
-+	/* did the last string entry exceeed our buffer size? ie out of string
-+	 * buffer space. Null terminate, use what we have.
-+	 */
-+	if (cnt >= buff_size) {
-+		buff_size = 0;
-+		string_buffer[INIT_BUFF_SIZE] = 0;
-+	}
-+
-+	cnt = simple_read_from_buffer(user_buffer, count, position,
-+				      string_buffer,
-+				      INIT_BUFF_SIZE - buff_size);
-+
-+	kfree(string_buffer);
-+
-+	return cnt;
-+}
-+
-+static ssize_t mywriter(struct file *fp, const char __user *user_buffer,
-+			size_t count, loff_t *position)
-+{
-+	int idx = (int)(uintptr_t)(fp->private_data);
-+
-+	if (idx < 0 || idx > NUM_MONITORS)
-+		idx = 0;
-+
-+	/* At the moment, this does nothing, but in the future it could be
-+	 * used to reset counters etc
-+	 */
-+	return count;
-+}
-+
-+static const struct file_operations fops_debug = {
-+	.read = myreader,
-+	.write = mywriter,
-+	.open = simple_open
-+};
-+
-+static int rpi_axiperf_probe(struct platform_device *pdev)
-+{
-+	int ret = 0, i;
-+	struct device *dev = &pdev->dev;
-+	struct device_node *np = dev->of_node;
-+	struct device_node *fw_node;
-+
-+	state = kzalloc(sizeof(struct rpi_axiperf), GFP_KERNEL);
-+	if (!state)
-+		return -ENOMEM;
-+
-+	/* Get the firmware handle for future rpi-firmware-xxx calls */
-+	fw_node = of_parse_phandle(np, "firmware", 0);
-+	if (!fw_node) {
-+		dev_err(dev, "Missing firmware node\n");
-+		return -ENOENT;
-+	}
-+
-+	state->firmware = rpi_firmware_get(fw_node);
-+	if (!state->firmware)
-+		return -EPROBE_DEFER;
-+
-+	/* Special case for the VPU monitor, we must use the mailbox interface
-+	 * as it is not accessible from the ARM address space.
-+	 */
-+	state->monitor[VPU_MONITOR].use_mailbox_interface = 1;
-+	state->monitor[SYSTEM_MONITOR].use_mailbox_interface = 0;
-+
-+	for (i = 0; i < NUM_MONITORS; i++) {
-+		if (state->monitor[i].use_mailbox_interface) {
-+			 of_property_read_u32_index(np, "reg", i*2,
-+				(u32 *)(&state->monitor[i].base_address));
-+		} else {
-+			struct resource *resource =
-+				platform_get_resource(pdev, IORESOURCE_MEM, i);
-+
-+			state->monitor[i].base_address =
-+				devm_ioremap_resource(&pdev->dev, resource);
-+		}
-+
-+		if (IS_ERR(state->monitor[i].base_address))
-+			return PTR_ERR(state->monitor[i].base_address);
-+
-+		/* Enable all buses by default */
-+		state->monitor[i].bus_enabled = 0xffff;
-+	}
-+
-+	state->dev = pdev;
-+	platform_set_drvdata(pdev, state);
-+
-+	state->sample_time = DEFAULT_SAMPLE_TIME;
-+
-+	/* Set up all the debugfs stuff */
-+	state->root_folder = debugfs_create_dir(KBUILD_MODNAME, NULL);
-+
-+	for (i = 0; i < NUM_MONITORS; i++) {
-+		state->monitor[i].debugfs_entry =
-+			debugfs_create_dir(monitor_name[i], state->root_folder);
-+		if (IS_ERR(state->monitor[i].debugfs_entry))
-+			state->monitor[i].debugfs_entry = NULL;
-+
-+		debugfs_create_file("data", 0444,
-+				    state->monitor[i].debugfs_entry,
-+				    (void *)(uintptr_t)i, &fops_debug);
-+		debugfs_create_u32("enable", 0644,
-+				   state->monitor[i].debugfs_entry,
-+				   &state->monitor[i].bus_enabled);
-+		debugfs_create_u32("filter", 0644,
-+				   state->monitor[i].debugfs_entry,
-+				   &state->monitor[i].bus_filter);
-+		debugfs_create_u32("sample_time", 0644,
-+				   state->monitor[i].debugfs_entry,
-+				   &state->sample_time);
-+	}
-+
-+	mutex_init(&state->lock);
-+
-+	state->monitor_thread = kthread_run(monitor_thread, state,
-+					    "rpi-axiperfmon");
-+
-+	return ret;
-+
-+}
-+
-+static int rpi_axiperf_remove(struct platform_device *dev)
-+{
-+	int ret = 0;
-+
-+	kthread_stop(state->monitor_thread);
-+
-+	debugfs_remove_recursive(state->root_folder);
-+	state->root_folder = NULL;
-+
-+	return ret;
-+}
-+
-+static const struct of_device_id rpi_axiperf_match[] = {
-+	{
-+		.compatible = "brcm,bcm2835-axiperf",
-+	},
-+	{},
-+};
-+MODULE_DEVICE_TABLE(of, rpi_axiperf_match);
-+
-+static struct platform_driver rpi_axiperf_driver  = {
-+	.probe =	rpi_axiperf_probe,
-+	.remove =	rpi_axiperf_remove,
-+	.driver = {
-+		.name   = "rpi-bcm2835-axiperf",
-+		.of_match_table = of_match_ptr(rpi_axiperf_match),
-+	},
-+};
-+
-+module_platform_driver(rpi_axiperf_driver);
-+
-+/* Module information */
-+MODULE_AUTHOR("James Hughes <james.hughes@raspberrypi.org>");
-+MODULE_DESCRIPTION("RPI AXI Performance monitor driver");
-+MODULE_LICENSE("GPL");
-+
diff --git a/target/linux/bcm27xx/patches-6.1/950-0132-ARM-bcm2835-Set-Serial-number-and-Revision.patch b/target/linux/bcm27xx/patches-6.1/950-0132-ARM-bcm2835-Set-Serial-number-and-Revision.patch
deleted file mode 100644
index fb17ea6391..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0132-ARM-bcm2835-Set-Serial-number-and-Revision.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 568eecc99c2222129da094eedb4f6751a6be05a1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
-Date: Wed, 3 Jun 2015 12:26:13 +0200
-Subject: [PATCH] ARM: bcm2835: Set Serial number and Revision
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The VideoCore bootloader passes in Serial number and
-Revision number through Device Tree. Make these available to
-userspace through /proc/cpuinfo.
-
-Mainline status:
-
-There is a commit in linux-next that standardize passing the serial
-number through Device Tree (string: /serial-number):
-ARM: 8355/1: arch: Show the serial number from devicetree in cpuinfo
-
-There was an attempt to do the same with the revision number, but it
-didn't get in:
-[PATCH v2 1/2] arm: devtree: Set system_rev from DT revision
-
-Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
----
- arch/arm/mach-bcm/board_bcm2835.c | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
---- a/arch/arm/mach-bcm/board_bcm2835.c
-+++ b/arch/arm/mach-bcm/board_bcm2835.c
-@@ -6,12 +6,25 @@
- #include <linux/init.h>
- #include <linux/irqchip.h>
- #include <linux/of_address.h>
-+#include <asm/system_info.h>
- 
- #include <asm/mach/arch.h>
- #include <asm/mach/map.h>
- 
- #include "platsmp.h"
- 
-+static void __init bcm2835_init(void)
-+{
-+	struct device_node *np = of_find_node_by_path("/system");
-+	u32 val;
-+	u64 val64;
-+
-+	if (!of_property_read_u32(np, "linux,revision", &val))
-+		system_rev = val;
-+	if (!of_property_read_u64(np, "linux,serial", &val64))
-+		system_serial_low = val64;
-+}
-+
- static const char * const bcm2835_compat[] = {
- #ifdef CONFIG_ARCH_MULTI_V6
- 	"brcm,bcm2835",
-@@ -24,6 +37,7 @@ static const char * const bcm2835_compat
- };
- 
- DT_MACHINE_START(BCM2835, "BCM2835")
-+	.init_machine = bcm2835_init,
- 	.dt_compat = bcm2835_compat,
- 	.smp = smp_ops(bcm2836_smp_ops),
- MACHINE_END
diff --git a/target/linux/bcm27xx/patches-6.1/950-0133-dwc-otg-FIQ-Fix-bad-mode-in-data-abort-handler.patch b/target/linux/bcm27xx/patches-6.1/950-0133-dwc-otg-FIQ-Fix-bad-mode-in-data-abort-handler.patch
deleted file mode 100644
index 2d1bc17c68..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0133-dwc-otg-FIQ-Fix-bad-mode-in-data-abort-handler.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 6ba5048c436a690309e5f45aae95d93d5e0b9001 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Mon, 16 Jul 2018 14:40:13 +0100
-Subject: [PATCH] dwc-otg: FIQ: Fix "bad mode in data abort handler"
-
-Create a semi-static mapping for the USB registers early in the boot
-process, before additional kernel threads are started, so all threads
-will have the mappings from the start. This avoids the need for
-data aborts to lazily update them.
-
-See: https://github.com/raspberrypi/linux/issues/2450
-
-Signed-off-by: Floris Bos <bos@je-eigen-domein.nl>
----
- arch/arm/mach-bcm/board_bcm2835.c | 69 +++++++++++++++++++++++++++++++
- 1 file changed, 69 insertions(+)
-
---- a/arch/arm/mach-bcm/board_bcm2835.c
-+++ b/arch/arm/mach-bcm/board_bcm2835.c
-@@ -6,6 +6,7 @@
- #include <linux/init.h>
- #include <linux/irqchip.h>
- #include <linux/of_address.h>
-+#include <linux/of_fdt.h>
- #include <asm/system_info.h>
- 
- #include <asm/mach/arch.h>
-@@ -13,6 +14,9 @@
- 
- #include "platsmp.h"
- 
-+#define BCM2835_USB_VIRT_BASE   0xf0980000
-+#define BCM2835_USB_VIRT_MPHI   0xf0006000
-+
- static void __init bcm2835_init(void)
- {
- 	struct device_node *np = of_find_node_by_path("/system");
-@@ -25,6 +29,70 @@ static void __init bcm2835_init(void)
- 		system_serial_low = val64;
- }
- 
-+/*
-+ * We need to map registers that are going to be accessed by the FIQ
-+ * very early, before any kernel threads are spawned. Because if done
-+ * later, the mapping tables are not updated instantly but lazily upon
-+ * first access through a data abort handler. While that is fine
-+ * when executing regular kernel code, if the first access in a specific
-+ * thread happens while running FIQ code this will result in a panic.
-+ *
-+ * For more background see the following old mailing list thread:
-+ * https://www.spinics.net/lists/arm-kernel/msg325250.html
-+ */
-+static int __init bcm2835_map_usb(unsigned long node, const char *uname,
-+					int depth, void *data)
-+{
-+	struct map_desc map[2];
-+	const __be32 *reg;
-+	int len;
-+	unsigned long p2b_offset = *((unsigned long *) data);
-+
-+	if (!of_flat_dt_is_compatible(node, "brcm,bcm2708-usb"))
-+		return 0;
-+	reg = of_get_flat_dt_prop(node, "reg", &len);
-+	if (!reg || len != (sizeof(unsigned long) * 4))
-+		return 0;
-+
-+	/* Use information about the physical addresses of the
-+	 * registers from the device tree, but use legacy
-+	 * iotable_init() static mapping function to map them,
-+	 * as ioremap() is not functional at this stage in boot.
-+	 */
-+	map[0].virtual = (unsigned long) BCM2835_USB_VIRT_BASE;
-+	map[0].pfn = __phys_to_pfn(be32_to_cpu(reg[0]) - p2b_offset);
-+	map[0].length = be32_to_cpu(reg[1]);
-+	map[0].type = MT_DEVICE;
-+	map[1].virtual = (unsigned long) BCM2835_USB_VIRT_MPHI;
-+	map[1].pfn = __phys_to_pfn(be32_to_cpu(reg[2]) - p2b_offset);
-+	map[1].length = be32_to_cpu(reg[3]);
-+	map[1].type = MT_DEVICE;
-+		iotable_init(map, 2);
-+
-+	return 1;
-+}
-+
-+static void __init bcm2835_map_io(void)
-+{
-+	const __be32 *ranges;
-+	int soc, len;
-+	unsigned long p2b_offset;
-+
-+	debug_ll_io_init();
-+
-+	/* Find out how to map bus to physical address first from soc/ranges */
-+	soc = of_get_flat_dt_subnode_by_name(of_get_flat_dt_root(), "soc");
-+	if (soc < 0)
-+		return;
-+	ranges = of_get_flat_dt_prop(soc, "ranges", &len);
-+	if (!ranges || len < (sizeof(unsigned long) * 3))
-+		return;
-+	p2b_offset = be32_to_cpu(ranges[0]) - be32_to_cpu(ranges[1]);
-+
-+	/* Now search for bcm2708-usb node in device tree */
-+	of_scan_flat_dt(bcm2835_map_usb, &p2b_offset);
-+}
-+
- static const char * const bcm2835_compat[] = {
- #ifdef CONFIG_ARCH_MULTI_V6
- 	"brcm,bcm2835",
-@@ -37,6 +105,7 @@ static const char * const bcm2835_compat
- };
- 
- DT_MACHINE_START(BCM2835, "BCM2835")
-+	.map_io = bcm2835_map_io,
- 	.init_machine = bcm2835_init,
- 	.dt_compat = bcm2835_compat,
- 	.smp = smp_ops(bcm2836_smp_ops),
diff --git a/target/linux/bcm27xx/patches-6.1/950-0134-ARM-Activate-FIQs-to-avoid-__irq_startup-warnings.patch b/target/linux/bcm27xx/patches-6.1/950-0134-ARM-Activate-FIQs-to-avoid-__irq_startup-warnings.patch
deleted file mode 100644
index aa581ca915..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0134-ARM-Activate-FIQs-to-avoid-__irq_startup-warnings.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From a53c906fcc7baf69861f889cf20535bdec764ae6 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Mon, 11 Dec 2017 09:18:32 +0000
-Subject: [PATCH] ARM: Activate FIQs to avoid __irq_startup warnings
-
-There is a new test in __irq_startup that the IRQ is activated, which
-hasn't been the case for FIQs since they bypass some of the usual setup.
-
-Augment enable_fiq to include a call to irq_activate to avoid the
-warning.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- arch/arm/kernel/fiq.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/arch/arm/kernel/fiq.c
-+++ b/arch/arm/kernel/fiq.c
-@@ -56,6 +56,8 @@
- static unsigned long dfl_fiq_insn;
- static struct pt_regs dfl_fiq_regs;
- 
-+extern int irq_activate(struct irq_desc *desc);
-+
- /* Default reacquire function
-  * - we always relinquish FIQ control
-  * - we always reacquire FIQ control
-@@ -140,6 +142,8 @@ static int fiq_start;
- 
- void enable_fiq(int fiq)
- {
-+	struct irq_desc *desc = irq_to_desc(fiq + fiq_start);
-+	irq_activate(desc);
- 	enable_irq(fiq + fiq_start);
- }
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0135-i2c-gpio-Also-set-bus-numbers-from-reg-property.patch b/target/linux/bcm27xx/patches-6.1/950-0135-i2c-gpio-Also-set-bus-numbers-from-reg-property.patch
deleted file mode 100644
index 5b7791f2c2..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0135-i2c-gpio-Also-set-bus-numbers-from-reg-property.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 4a2b86ccdad120b38edadfa6cada6e0cd2cabca6 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Tue, 20 Feb 2018 10:07:27 +0000
-Subject: [PATCH] i2c-gpio: Also set bus numbers from reg property
-
-I2C busses can be assigned specific bus numbers using aliases in
-Device Tree - string properties where the name is the alias and the
-value is the path to the node. The current DT parameter mechanism
-does not allow property names to be derived from a parameter value
-in any way, so it isn't possible to generate unique or matching
-aliases for nodes from an overlay that can generate multiple
-instances, e.g. i2c-gpio.
-
-Work around this limitation (at least temporarily) by allowing
-the i2c adapter number to be initialised from the "reg" property
-if present.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- drivers/i2c/busses/i2c-gpio.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/drivers/i2c/busses/i2c-gpio.c
-+++ b/drivers/i2c/busses/i2c-gpio.c
-@@ -445,7 +445,9 @@ static int i2c_gpio_probe(struct platfor
- 	adap->dev.parent = dev;
- 	adap->dev.of_node = np;
- 
--	adap->nr = pdev->id;
-+	if (pdev->id != PLATFORM_DEVID_NONE || !pdev->dev.of_node ||
-+	    of_property_read_u32(pdev->dev.of_node, "reg", &adap->nr))
-+		adap->nr = pdev->id;
- 	ret = i2c_bit_add_numbered_bus(adap);
- 	if (ret)
- 		return ret;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0136-added-capture_clear-option-to-pps-gpio-via-dtoverlay.patch b/target/linux/bcm27xx/patches-6.1/950-0136-added-capture_clear-option-to-pps-gpio-via-dtoverlay.patch
deleted file mode 100644
index 0302e955f6..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0136-added-capture_clear-option-to-pps-gpio-via-dtoverlay.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From ab7d6660039b5b12a6ffad0f23c10425ccfea306 Mon Sep 17 00:00:00 2001
-From: hdoverobinson <hdoverobinson@gmail.com>
-Date: Tue, 13 Mar 2018 06:58:39 -0400
-Subject: [PATCH] added capture_clear option to pps-gpio via dtoverlay
- (#2433)
-
----
- drivers/pps/clients/pps-gpio.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/pps/clients/pps-gpio.c
-+++ b/drivers/pps/clients/pps-gpio.c
-@@ -113,6 +113,9 @@ static int pps_gpio_setup(struct device
- 	data->assert_falling_edge =
- 		device_property_read_bool(dev, "assert-falling-edge");
- 
-+	data->capture_clear =
-+		device_property_read_bool(dev, "capture-clear");
-+
- 	data->echo_pin = devm_gpiod_get_optional(dev, "echo", GPIOD_OUT_LOW);
- 	if (IS_ERR(data->echo_pin))
- 		return dev_err_probe(dev, PTR_ERR(data->echo_pin),
diff --git a/target/linux/bcm27xx/patches-6.1/950-0137-lan78xx-Read-initial-EEE-status-from-DT.patch b/target/linux/bcm27xx/patches-6.1/950-0137-lan78xx-Read-initial-EEE-status-from-DT.patch
deleted file mode 100644
index 7c9268289c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0137-lan78xx-Read-initial-EEE-status-from-DT.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d245af88863535487d925188a59e93f93f2e39b4 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Fri, 9 Mar 2018 12:01:00 +0000
-Subject: [PATCH] lan78xx: Read initial EEE status from DT
-
-Add two new DT properties:
-* microchip,eee-enabled  - a boolean to enable EEE
-* microchip,tx-lpi-timer - time in microseconds to wait before entering
-                           low power state
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- drivers/net/usb/lan78xx.c | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
---- a/drivers/net/usb/lan78xx.c
-+++ b/drivers/net/usb/lan78xx.c
-@@ -3111,6 +3111,22 @@ static int lan78xx_open(struct net_devic
- 
- 	netif_dbg(dev, ifup, dev->net, "phy initialised successfully");
- 
-+	if (of_property_read_bool(dev->udev->dev.of_node,
-+				  "microchip,eee-enabled")) {
-+		struct ethtool_eee edata;
-+		memset(&edata, 0, sizeof(edata));
-+		edata.cmd = ETHTOOL_SEEE;
-+		edata.advertised = ADVERTISED_1000baseT_Full |
-+				   ADVERTISED_100baseT_Full;
-+		edata.eee_enabled = true;
-+		edata.tx_lpi_enabled = true;
-+		if (of_property_read_u32(dev->udev->dev.of_node,
-+					 "microchip,tx-lpi-timer",
-+					 &edata.tx_lpi_timer))
-+			edata.tx_lpi_timer = 600; /* non-aggressive */
-+		(void)lan78xx_set_eee(net, &edata);
-+	}
-+
- 	/* for Link Check */
- 	if (dev->urb_intr) {
- 		ret = usb_submit_urb(dev->urb_intr, GFP_KERNEL);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0138-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch b/target/linux/bcm27xx/patches-6.1/950-0138-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch
deleted file mode 100644
index 5ff5233844..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0138-hid-Reduce-default-mouse-polling-interval-to-60Hz.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From c9dc45bb59c8db8a761c6f98970a15265610cd93 Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Mon, 14 Jul 2014 22:02:09 +0100
-Subject: [PATCH] hid: Reduce default mouse polling interval to 60Hz
-
-Reduces overhead when using X
----
- drivers/hid/usbhid/hid-core.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/drivers/hid/usbhid/hid-core.c
-+++ b/drivers/hid/usbhid/hid-core.c
-@@ -45,7 +45,7 @@
-  * Module parameters.
-  */
- 
--static unsigned int hid_mousepoll_interval;
-+static unsigned int hid_mousepoll_interval = ~0;
- module_param_named(mousepoll, hid_mousepoll_interval, uint, 0644);
- MODULE_PARM_DESC(mousepoll, "Polling interval of mice");
- 
-@@ -1112,7 +1112,9 @@ static int usbhid_start(struct hid_devic
- 		 */
- 		switch (hid->collection->usage) {
- 		case HID_GD_MOUSE:
--			if (hid_mousepoll_interval > 0)
-+			if (hid_mousepoll_interval == ~0 && interval < 16)
-+				interval = 16;
-+			else if (hid_mousepoll_interval != ~0 && hid_mousepoll_interval != 0)
- 				interval = hid_mousepoll_interval;
- 			break;
- 		case HID_GD_JOYSTICK:
diff --git a/target/linux/bcm27xx/patches-6.1/950-0139-Add-ability-to-export-gpio-used-by-gpio-poweroff.patch b/target/linux/bcm27xx/patches-6.1/950-0139-Add-ability-to-export-gpio-used-by-gpio-poweroff.patch
deleted file mode 100644
index ebc9e2d5d2..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0139-Add-ability-to-export-gpio-used-by-gpio-poweroff.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From b67da8b7975c5e98eb222c3b47617a46acee1f89 Mon Sep 17 00:00:00 2001
-From: Nick Bulleid <nedbulleid@fastmail.com>
-Date: Thu, 10 May 2018 21:57:02 +0100
-Subject: [PATCH] Add ability to export gpio used by gpio-poweroff
-
-Signed-off-by: Nick Bulleid <nedbulleid@fastmail.com>
-
-Added export feature to gpio-poweroff documentation
-
-Signed-off-by: Nick Bulleid <nedbulleid@fastmail.com>
----
- .../bindings/power/reset/gpio-poweroff.txt    | 42 +++++++++++++++++++
- drivers/power/reset/gpio-poweroff.c           |  9 ++++
- 2 files changed, 51 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt
-@@ -0,0 +1,42 @@
-+Driver a GPIO line that can be used to turn the power off.
-+
-+The driver supports both level triggered and edge triggered power off.
-+At driver load time, the driver will request the given gpio line and
-+install a handler to power off the system. If the optional properties
-+'input' is not found, the GPIO line will be driven in the inactive
-+state. Otherwise its configured as an input.
-+
-+When the power-off handler is called, the gpio is configured as an
-+output, and drive active, so triggering a level triggered power off
-+condition. This will also cause an inactive->active edge condition, so
-+triggering positive edge triggered power off. After a delay of 100ms,
-+the GPIO is set to inactive, thus causing an active->inactive edge,
-+triggering negative edge triggered power off. After another 100ms
-+delay the GPIO is driver active again. If the power is still on and
-+the CPU still running after a 3000ms delay, a WARN_ON(1) is emitted.
-+
-+Required properties:
-+- compatible : should be "gpio-poweroff".
-+- gpios : The GPIO to set high/low, see "gpios property" in
-+  Documentation/devicetree/bindings/gpio/gpio.txt. If the pin should be
-+  low to power down the board set it to "Active Low", otherwise set
-+  gpio to "Active High".
-+
-+Optional properties:
-+- input : Initially configure the GPIO line as an input. Only reconfigure
-+  it to an output when the power-off handler is called. If this optional
-+  property is not specified, the GPIO is initialized as an output in its
-+  inactive state.
-+- active-delay-ms: Delay (default 100) to wait after driving gpio active
-+- inactive-delay-ms: Delay (default 100) to wait after driving gpio inactive
-+- timeout-ms: Time to wait before asserting a WARN_ON(1). If nothing is
-+              specified, 3000 ms is used.
-+- export : Export the GPIO line to the sysfs system
-+
-+Examples:
-+
-+gpio-poweroff {
-+	compatible = "gpio-poweroff";
-+	gpios = <&gpio 4 0>;
-+	timeout-ms = <3000>;
-+};
---- a/drivers/power/reset/gpio-poweroff.c
-+++ b/drivers/power/reset/gpio-poweroff.c
-@@ -51,6 +51,7 @@ static int gpio_poweroff_probe(struct pl
- 	bool input = false;
- 	enum gpiod_flags flags;
- 	bool force = false;
-+	bool export = false;
- 
- 	/* If a pm_power_off function has already been added, leave it alone */
- 	force = of_property_read_bool(pdev->dev.of_node, "force");
-@@ -76,6 +77,12 @@ static int gpio_poweroff_probe(struct pl
- 	if (IS_ERR(reset_gpio))
- 		return PTR_ERR(reset_gpio);
- 
-+	export = of_property_read_bool(pdev->dev.of_node, "export");
-+	if (export) {
-+		gpiod_export(reset_gpio, false);
-+		gpiod_export_link(&pdev->dev, "poweroff-gpio", reset_gpio);
-+	}
-+
- 	pm_power_off = &gpio_poweroff_do_poweroff;
- 	return 0;
- }
-@@ -85,6 +92,8 @@ static int gpio_poweroff_remove(struct p
- 	if (pm_power_off == &gpio_poweroff_do_poweroff)
- 		pm_power_off = NULL;
- 
-+	gpiod_unexport(reset_gpio);
-+
- 	return 0;
- }
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0140-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch b/target/linux/bcm27xx/patches-6.1/950-0140-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch
deleted file mode 100644
index 8a9a2da728..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0140-firmware-raspberrypi-Notify-firmware-of-a-reboot.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 25aeabb3d345aff27d7a07fafe4a61d331525b3f Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Sat, 12 May 2018 21:35:43 +0100
-Subject: [PATCH] firmware/raspberrypi: Notify firmware of a reboot
-
-Register for reboot notifications, sending RPI_FIRMWARE_NOTIFY_REBOOT
-over the mailbox interface on reception.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- drivers/firmware/raspberrypi.c | 40 +++++++++++++++++++++++++++++++++-
- 1 file changed, 39 insertions(+), 1 deletion(-)
-
---- a/drivers/firmware/raspberrypi.c
-+++ b/drivers/firmware/raspberrypi.c
-@@ -13,6 +13,7 @@
- #include <linux/module.h>
- #include <linux/of_platform.h>
- #include <linux/platform_device.h>
-+#include <linux/reboot.h>
- #include <linux/slab.h>
- #include <soc/bcm2835/raspberrypi-firmware.h>
- 
-@@ -180,6 +181,26 @@ int rpi_firmware_property(struct rpi_fir
- }
- EXPORT_SYMBOL_GPL(rpi_firmware_property);
- 
-+static int rpi_firmware_notify_reboot(struct notifier_block *nb,
-+				      unsigned long action,
-+				      void *data)
-+{
-+	struct rpi_firmware *fw;
-+	struct platform_device *pdev = g_pdev;
-+
-+	if (!pdev)
-+		return 0;
-+
-+	fw = platform_get_drvdata(pdev);
-+	if (!fw)
-+		return 0;
-+
-+	(void)rpi_firmware_property(fw, RPI_FIRMWARE_NOTIFY_REBOOT,
-+				    0, 0);
-+
-+	return 0;
-+}
-+
- static void
- rpi_firmware_print_firmware_revision(struct rpi_firmware *fw)
- {
-@@ -388,15 +409,32 @@ static struct platform_driver rpi_firmwa
- 	.remove		= rpi_firmware_remove,
- };
- 
-+static struct notifier_block rpi_firmware_reboot_notifier = {
-+	.notifier_call = rpi_firmware_notify_reboot,
-+};
-+
- static int __init rpi_firmware_init(void)
- {
--	return platform_driver_register(&rpi_firmware_driver);
-+	int ret = register_reboot_notifier(&rpi_firmware_reboot_notifier);
-+	if (ret)
-+		goto out1;
-+	ret = platform_driver_register(&rpi_firmware_driver);
-+	if (ret)
-+		goto out2;
-+
-+	return 0;
-+
-+out2:
-+	unregister_reboot_notifier(&rpi_firmware_reboot_notifier);
-+out1:
-+	return ret;
- }
- subsys_initcall(rpi_firmware_init);
- 
- static void __init rpi_firmware_exit(void)
- {
- 	platform_driver_unregister(&rpi_firmware_driver);
-+	unregister_reboot_notifier(&rpi_firmware_reboot_notifier);
- }
- module_exit(rpi_firmware_exit);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0141-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch b/target/linux/bcm27xx/patches-6.1/950-0141-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch
deleted file mode 100644
index 12f13335c8..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0141-irqchip-irq-bcm2835-Calc.-FIQ_START-at-boot-time.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From b0dce103daac406064d7720a83bb467bd65cd53a Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Thu, 14 Jun 2018 11:21:04 +0100
-Subject: [PATCH] irqchip: irq-bcm2835: Calc. FIQ_START at boot-time
-
-ad83c7cb2f37 ("irqchip/irq-bcm2836: Add support for DT interrupt polarity")
-changed the way that the BCM2836/7 local interrupts are mapped; instead
-of being pre-mapped they are now mapped on-demand. A side effect of this
-change is that the call to irq_of_parse_and_map from armctrl_of_init
-creates a new mapping, forming a gap between the IRQs and the FIQs. This
- gap breaks the FIQ<->IRQ mapping which up to now has been done by assuming:
-
-1) that the value of FIQ_START is the same as the number of normal IRQs
-that will be mapped (still true), and
-
-2) that this value is also the offset between an IRQ and its equivalent
-FIQ (which is no longer the case).
-
-Remove both assumptions by measuring the interval between the last IRQ
-and the last FIQ, passing it as the parameter to init_FIQ().
-
-Fixes: https://github.com/raspberrypi/linux/issues/2432
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- drivers/irqchip/irq-bcm2835.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/drivers/irqchip/irq-bcm2835.c
-+++ b/drivers/irqchip/irq-bcm2835.c
-@@ -74,8 +74,6 @@
- #define NR_BANKS		3
- #define IRQS_PER_BANK		32
- #define NUMBER_IRQS		MAKE_HWIRQ(NR_BANKS, 0)
--#undef FIQ_START
--#define FIQ_START		(NR_IRQS_BANK0 + MAKE_HWIRQ(NR_BANKS - 1, 0))
- 
- static const int reg_pending[] __initconst = { 0x00, 0x04, 0x08 };
- static const int reg_enable[] __initconst = { 0x18, 0x10, 0x14 };
-@@ -203,7 +201,7 @@ static int __init armctrl_of_init(struct
- 				  bool is_2836)
- {
- 	void __iomem *base;
--	int irq, b, i;
-+	int irq = 0, last_irq, b, i;
- 	u32 reg;
- 
- 	base = of_iomap(node, 0);
-@@ -243,6 +241,8 @@ static int __init armctrl_of_init(struct
- 		pr_err(FW_BUG "Bootloader left fiq enabled\n");
- 	}
- 
-+	last_irq = irq;
-+
- 	if (is_2836) {
- 		int parent_irq = irq_of_parse_and_map(node, 0);
- 
-@@ -273,7 +273,7 @@ static int __init armctrl_of_init(struct
- 		}
- 	}
- #ifndef CONFIG_ARM64
--	init_FIQ(FIQ_START);
-+	init_FIQ(irq - last_irq);
- #endif
- 
- 	return 0;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0142-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch b/target/linux/bcm27xx/patches-6.1/950-0142-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch
deleted file mode 100644
index 5304914131..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0142-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 63776a20617d4a5ffa5abd35d1d531892a347f36 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Wed, 13 Jun 2018 15:21:10 +0100
-Subject: [PATCH] net: lan78xx: Disable TCP Segmentation Offload (TSO)
-
-TSO seems to be having issues when packets are dropped and the
-remote end uses Selective Acknowledge (SACK) to denote that
-data is missing. The missing data is never resent, so the
-connection eventually stalls.
-
-There is a module parameter of enable_tso added to allow
-further debugging without forcing a rebuild of the kernel.
-
-https://github.com/raspberrypi/linux/issues/2449
-https://github.com/raspberrypi/linux/issues/2482
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- drivers/net/usb/lan78xx.c | 19 +++++++++++++++++--
- 1 file changed, 17 insertions(+), 2 deletions(-)
-
---- a/drivers/net/usb/lan78xx.c
-+++ b/drivers/net/usb/lan78xx.c
-@@ -609,6 +609,15 @@ static int lan78xx_alloc_tx_resources(st
- 				      dev->n_tx_urbs, dev->tx_urb_size, dev);
- }
- 
-+/* TSO seems to be having some issue with Selective Acknowledge (SACK) that
-+ * results in lost data never being retransmitted.
-+ * Disable it by default now, but adds a module parameter to enable it for
-+ * debug purposes (the full cause is not currently understood).
-+ */
-+static bool enable_tso;
-+module_param(enable_tso, bool, 0644);
-+MODULE_PARM_DESC(enable_tso, "Enables TCP segmentation offload");
-+
- static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data)
- {
- 	u32 *buf;
-@@ -3471,8 +3480,14 @@ static int lan78xx_bind(struct lan78xx_n
- 	if (DEFAULT_RX_CSUM_ENABLE)
- 		dev->net->features |= NETIF_F_RXCSUM;
- 
--	if (DEFAULT_TSO_CSUM_ENABLE)
--		dev->net->features |= NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_SG;
-+	if (DEFAULT_TSO_CSUM_ENABLE) {
-+		dev->net->features |= NETIF_F_SG;
-+		/* Use module parameter to control TCP segmentation offload as
-+		 * it appears to cause issues.
-+		 */
-+		if (enable_tso)
-+			dev->net->features |= NETIF_F_TSO | NETIF_F_TSO6;
-+	}
- 
- 	if (DEFAULT_VLAN_RX_OFFLOAD)
- 		dev->net->features |= NETIF_F_HW_VLAN_CTAG_RX;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0143-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch b/target/linux/bcm27xx/patches-6.1/950-0143-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch
deleted file mode 100644
index f8016c66d2..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0143-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 972383da6a0bbf4bc0b61b61da5e1712d8d66d72 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Thu, 5 Apr 2018 14:46:11 +0100
-Subject: [PATCH] lan78xx: Move enabling of EEE into PHY init code
-
-Enable EEE mode as soon as possible after connecting to the PHY, and
-before phy_start. This avoids a second link negotiation, which speeds
-up booting and stops the interface failing to become ready.
-
-See: https://github.com/raspberrypi/linux/issues/2437
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- drivers/net/usb/lan78xx.c | 32 ++++++++++++++++----------------
- 1 file changed, 16 insertions(+), 16 deletions(-)
-
---- a/drivers/net/usb/lan78xx.c
-+++ b/drivers/net/usb/lan78xx.c
-@@ -2419,6 +2419,22 @@ static int lan78xx_phy_init(struct lan78
- 	mii_adv_to_linkmode_adv_t(fc, mii_adv);
- 	linkmode_or(phydev->advertising, fc, phydev->advertising);
- 
-+	if (of_property_read_bool(dev->udev->dev.of_node,
-+				  "microchip,eee-enabled")) {
-+		struct ethtool_eee edata;
-+		memset(&edata, 0, sizeof(edata));
-+		edata.cmd = ETHTOOL_SEEE;
-+		edata.advertised = ADVERTISED_1000baseT_Full |
-+				   ADVERTISED_100baseT_Full;
-+		edata.eee_enabled = true;
-+		edata.tx_lpi_enabled = true;
-+		if (of_property_read_u32(dev->udev->dev.of_node,
-+					 "microchip,tx-lpi-timer",
-+					 &edata.tx_lpi_timer))
-+			edata.tx_lpi_timer = 600; /* non-aggressive */
-+		(void)lan78xx_set_eee(dev->net, &edata);
-+	}
-+
- 	if (phydev->mdio.dev.of_node) {
- 		u32 reg;
- 		int len;
-@@ -3120,22 +3136,6 @@ static int lan78xx_open(struct net_devic
- 
- 	netif_dbg(dev, ifup, dev->net, "phy initialised successfully");
- 
--	if (of_property_read_bool(dev->udev->dev.of_node,
--				  "microchip,eee-enabled")) {
--		struct ethtool_eee edata;
--		memset(&edata, 0, sizeof(edata));
--		edata.cmd = ETHTOOL_SEEE;
--		edata.advertised = ADVERTISED_1000baseT_Full |
--				   ADVERTISED_100baseT_Full;
--		edata.eee_enabled = true;
--		edata.tx_lpi_enabled = true;
--		if (of_property_read_u32(dev->udev->dev.of_node,
--					 "microchip,tx-lpi-timer",
--					 &edata.tx_lpi_timer))
--			edata.tx_lpi_timer = 600; /* non-aggressive */
--		(void)lan78xx_set_eee(net, &edata);
--	}
--
- 	/* for Link Check */
- 	if (dev->urb_intr) {
- 		ret = usb_submit_urb(dev->urb_intr, GFP_KERNEL);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0144-cxd2880-CXD2880_SPI_DRV-should-select-DVB_CXD2880-wi.patch b/target/linux/bcm27xx/patches-6.1/950-0144-cxd2880-CXD2880_SPI_DRV-should-select-DVB_CXD2880-wi.patch
deleted file mode 100644
index 5d3b916304..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0144-cxd2880-CXD2880_SPI_DRV-should-select-DVB_CXD2880-wi.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 2c900b1e5b80c4f55e7a5812d6fc1830742d2f31 Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Mon, 17 Sep 2018 17:31:18 +0100
-Subject: [PATCH] cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880
- with MEDIA_SUBDRV_AUTOSELECT
-
----
- drivers/media/spi/Kconfig | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/media/spi/Kconfig
-+++ b/drivers/media/spi/Kconfig
-@@ -9,6 +9,7 @@ menu "Media SPI Adapters"
- config CXD2880_SPI_DRV
- 	tristate "Sony CXD2880 SPI support"
- 	depends on DVB_CORE && SPI
-+	select DVB_CXD2880 if MEDIA_SUBDRV_AUTOSELECT
- 	default m if !MEDIA_SUBDRV_AUTOSELECT
- 	help
- 	  Choose if you would like to have SPI interface support for Sony CXD2880.
diff --git a/target/linux/bcm27xx/patches-6.1/950-0145-firmware-raspberrypi-Add-backward-compatible-get_thr.patch b/target/linux/bcm27xx/patches-6.1/950-0145-firmware-raspberrypi-Add-backward-compatible-get_thr.patch
deleted file mode 100644
index 2b5a9fc3f8..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0145-firmware-raspberrypi-Add-backward-compatible-get_thr.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 60d9a26453885070c6cc73ee224fd315120baa34 Mon Sep 17 00:00:00 2001
-From: Stefan Wahren <stefan.wahren@i2se.com>
-Date: Sat, 13 Oct 2018 13:31:21 +0200
-Subject: [PATCH] firmware: raspberrypi: Add backward compatible
- get_throttled
-
-Avoid a hard userspace ABI change by adding a compatible get_throttled
-sysfs entry. Its value is now feed by the GET_THROTTLED requests of the
-new hwmon driver. The first access to get_throttled will generate
-a warning.
-
-Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
----
- drivers/firmware/raspberrypi.c | 33 +++++++++++++++++++++++++++++++++
- 1 file changed, 33 insertions(+)
-
---- a/drivers/firmware/raspberrypi.c
-+++ b/drivers/firmware/raspberrypi.c
-@@ -32,6 +32,7 @@ struct rpi_firmware {
- 	u32 enabled;
- 
- 	struct kref consumers;
-+	u32 get_throttled;
- };
- 
- static struct platform_device *g_pdev;
-@@ -177,6 +178,12 @@ int rpi_firmware_property(struct rpi_fir
- 
- 	kfree(data);
- 
-+	if ((tag == RPI_FIRMWARE_GET_THROTTLED) &&
-+	     memcmp(&fw->get_throttled, tag_data, sizeof(fw->get_throttled))) {
-+		memcpy(&fw->get_throttled, tag_data, sizeof(fw->get_throttled));
-+		sysfs_notify(&fw->cl.dev->kobj, NULL, "get_throttled");
-+	}
-+
- 	return ret;
- }
- EXPORT_SYMBOL_GPL(rpi_firmware_property);
-@@ -201,6 +208,27 @@ static int rpi_firmware_notify_reboot(st
- 	return 0;
- }
- 
-+static ssize_t get_throttled_show(struct device *dev,
-+				  struct device_attribute *attr, char *buf)
-+{
-+	struct rpi_firmware *fw = dev_get_drvdata(dev);
-+
-+	WARN_ONCE(1, "deprecated, use hwmon sysfs instead\n");
-+
-+	return sprintf(buf, "%x\n", fw->get_throttled);
-+}
-+
-+static DEVICE_ATTR_RO(get_throttled);
-+
-+static struct attribute *rpi_firmware_dev_attrs[] = {
-+	&dev_attr_get_throttled.attr,
-+	NULL,
-+};
-+
-+static const struct attribute_group rpi_firmware_dev_group = {
-+	.attrs = rpi_firmware_dev_attrs,
-+};
-+
- static void
- rpi_firmware_print_firmware_revision(struct rpi_firmware *fw)
- {
-@@ -230,6 +258,11 @@ rpi_register_hwmon_driver(struct device
- 
- 	rpi_hwmon = platform_device_register_data(dev, "raspberrypi-hwmon",
- 						  -1, NULL, 0);
-+
-+	if (!IS_ERR_OR_NULL(rpi_hwmon)) {
-+		if (devm_device_add_group(dev, &rpi_firmware_dev_group))
-+			dev_err(dev, "Failed to create get_trottled attr\n");
-+	}
- }
- 
- static void rpi_register_clk_driver(struct device *dev)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0147-drivers-thermal-step_wise-add-support-for-hysteresis.patch b/target/linux/bcm27xx/patches-6.1/950-0147-drivers-thermal-step_wise-add-support-for-hysteresis.patch
deleted file mode 100644
index 4812f543fa..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0147-drivers-thermal-step_wise-add-support-for-hysteresis.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 3fc58056cba3cb56f20f98432de2c144f3d07308 Mon Sep 17 00:00:00 2001
-From: Ram Chandrasekar <rkumbako@codeaurora.org>
-Date: Mon, 7 May 2018 11:54:08 -0600
-Subject: [PATCH] drivers: thermal: step_wise: add support for
- hysteresis
-
-Step wise governor increases the mitigation level when the temperature
-goes above a threshold and will decrease the mitigation when the
-temperature falls below the threshold. If it were a case, where the
-temperature hovers around a threshold, the mitigation will be applied
-and removed at every iteration. This reaction to the temperature is
-inefficient for performance.
-
-The use of hysteresis temperature could avoid this ping-pong of
-mitigation by relaxing the mitigation to happen only when the
-temperature goes below this lower hysteresis value.
-
-Signed-off-by: Ram Chandrasekar <rkumbako@codeaurora.org>
-Signed-off-by: Lina Iyer <ilina@codeaurora.org>
----
- drivers/thermal/gov_step_wise.c | 34 ++++++++++++++++++++++++---------
- 1 file changed, 25 insertions(+), 9 deletions(-)
-
---- a/drivers/thermal/gov_step_wise.c
-+++ b/drivers/thermal/gov_step_wise.c
-@@ -25,7 +25,7 @@
-  *       for this trip point
-  *    d. if the trend is THERMAL_TREND_DROP_FULL, use lower limit
-  *       for this trip point
-- * If the temperature is lower than a trip point,
-+ * If the temperature is lower than a hysteresis temperature,
-  *    a. if the trend is THERMAL_TREND_RAISING, do nothing
-  *    b. if the trend is THERMAL_TREND_DROPPING, use lower cooling
-  *       state for this trip point, if the cooling state already
-@@ -97,7 +97,7 @@ static void update_passive_instance(stru
- 
- static void thermal_zone_trip_update(struct thermal_zone_device *tz, int trip)
- {
--	int trip_temp;
-+	int trip_temp, hyst_temp;
- 	enum thermal_trip_type trip_type;
- 	enum thermal_trend trend;
- 	struct thermal_instance *instance;
-@@ -107,21 +107,37 @@ static void thermal_zone_trip_update(str
- 	tz->ops->get_trip_temp(tz, trip, &trip_temp);
- 	tz->ops->get_trip_type(tz, trip, &trip_type);
- 
--	trend = get_tz_trend(tz, trip);
--
--	if (tz->temperature >= trip_temp) {
--		throttle = true;
--		trace_thermal_zone_trip(tz, trip, trip_type);
-+	tz->ops->get_trip_temp(tz, trip, &trip_temp);
-+	hyst_temp = trip_temp;
-+	if (tz->ops->get_trip_hyst) {
-+		tz->ops->get_trip_hyst(tz, trip, &hyst_temp);
-+		hyst_temp = trip_temp - hyst_temp;
- 	}
-+	tz->ops->get_trip_type(tz, trip, &trip_type);
- 
--	dev_dbg(&tz->device, "Trip%d[type=%d,temp=%d]:trend=%d,throttle=%d\n",
--				trip, trip_type, trip_temp, trend, throttle);
-+	trend = get_tz_trend(tz, trip);
-+
-+	dev_dbg(&tz->device,
-+		"Trip%d[type=%d,temp=%d,hyst=%d]:trend=%d,throttle=%d\n",
-+		trip, trip_type, trip_temp, hyst_temp, trend, throttle);
- 
- 	list_for_each_entry(instance, &tz->thermal_instances, tz_node) {
- 		if (instance->trip != trip)
- 			continue;
- 
- 		old_target = instance->target;
-+		throttle = false;
-+		/*
-+		 * Lower the mitigation only if the temperature
-+		 * goes below the hysteresis temperature.
-+		 */
-+		if (tz->temperature >= trip_temp ||
-+		   (tz->temperature >= hyst_temp &&
-+		   old_target != THERMAL_NO_TARGET)) {
-+			throttle = true;
-+			trace_thermal_zone_trip(tz, trip, trip_type);
-+		}
-+
- 		instance->target = get_target_state(instance, trend, throttle);
- 		dev_dbg(&instance->cdev->device, "old_target=%d, target=%d\n",
- 					old_target, (int)instance->target);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0148-drivers-thermal-step_wise-avoid-throttling-at-hyster.patch b/target/linux/bcm27xx/patches-6.1/950-0148-drivers-thermal-step_wise-avoid-throttling-at-hyster.patch
deleted file mode 100644
index b679aea851..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0148-drivers-thermal-step_wise-avoid-throttling-at-hyster.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 44c12b1ce29fbe79baabf40b9847a02d2330d980 Mon Sep 17 00:00:00 2001
-From: Serge Schneider <serge@raspberrypi.org>
-Date: Tue, 2 Oct 2018 11:14:15 +0100
-Subject: [PATCH] drivers: thermal: step_wise: avoid throttling at
- hysteresis temperature after dropping below it
-
-Signed-off-by: Serge Schneider <serge@raspberrypi.org>
----
- drivers/thermal/gov_step_wise.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/thermal/gov_step_wise.c
-+++ b/drivers/thermal/gov_step_wise.c
-@@ -133,7 +133,7 @@ static void thermal_zone_trip_update(str
- 		 */
- 		if (tz->temperature >= trip_temp ||
- 		   (tz->temperature >= hyst_temp &&
--		   old_target != THERMAL_NO_TARGET)) {
-+		   old_target == instance->upper)) {
- 			throttle = true;
- 			trace_thermal_zone_trip(tz, trip, trip_type);
- 		}
diff --git a/target/linux/bcm27xx/patches-6.1/950-0150-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch b/target/linux/bcm27xx/patches-6.1/950-0150-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch
deleted file mode 100644
index 2664fa1646..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0150-net-lan78xx-Support-auto-downshift-to-100Mb-s.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From e44699fd5b2738e60e52c353f0e8f3800498659b Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Mon, 26 Nov 2018 19:46:58 +0000
-Subject: [PATCH] net: lan78xx: Support auto-downshift to 100Mb/s
-
-Ethernet cables with faulty or missing pairs (specifically pairs C and
-D) allow auto-negotiation to 1000Mbs, but do not support the successful
-establishment of a link. Add a DT property, "microchip,downshift-after",
-to configure the number of auto-negotiation failures after which it
-falls back to 100Mbs. Valid values are 2, 3, 4, 5 and 0, where 0 means
-never downshift.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- .../bindings/net/microchip,lan78xx.txt        |  3 +++
- drivers/net/phy/microchip.c                   | 27 +++++++++++++++++++
- include/linux/microchipphy.h                  |  8 ++++++
- 3 files changed, 38 insertions(+)
-
---- a/Documentation/devicetree/bindings/net/microchip,lan78xx.txt
-+++ b/Documentation/devicetree/bindings/net/microchip,lan78xx.txt
-@@ -14,6 +14,9 @@ Optional properties of the embedded PHY:
- - microchip,led-modes: a 0..4 element vector, with each element configuring
-   the operating mode of an LED. Omitted LEDs are turned off. Allowed values
-   are defined in "include/dt-bindings/net/microchip-lan78xx.h".
-+- microchip,downshift-after: sets the number of failed auto-negotiation
-+  attempts after which the link is downgraded from 1000BASE-T. Should be one of
-+  2, 3, 4, 5 or 0, where 0 means never downshift.
- 
- Example:
- 
---- a/drivers/net/phy/microchip.c
-+++ b/drivers/net/phy/microchip.c
-@@ -233,6 +233,7 @@ static int lan88xx_probe(struct phy_devi
- 	struct device *dev = &phydev->mdio.dev;
- 	struct lan88xx_priv *priv;
- 	u32 led_modes[4];
-+	u32 downshift_after = 0;
- 	int len;
- 
- 	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
-@@ -262,6 +263,32 @@ static int lan88xx_probe(struct phy_devi
- 		return -EINVAL;
- 	}
- 
-+	if (!of_property_read_u32(dev->of_node,
-+				  "microchip,downshift-after",
-+				  &downshift_after)) {
-+		u32 mask = LAN78XX_PHY_CTRL3_DOWNSHIFT_CTRL_MASK;
-+		u32 val= LAN78XX_PHY_CTRL3_AUTO_DOWNSHIFT;
-+
-+		switch (downshift_after) {
-+		case 2:	val |= LAN78XX_PHY_CTRL3_DOWNSHIFT_CTRL_2;
-+			break;
-+		case 3:	val |= LAN78XX_PHY_CTRL3_DOWNSHIFT_CTRL_3;
-+			break;
-+		case 4:	val |= LAN78XX_PHY_CTRL3_DOWNSHIFT_CTRL_4;
-+			break;
-+		case 5:	val |= LAN78XX_PHY_CTRL3_DOWNSHIFT_CTRL_5;
-+			break;
-+		case 0: // Disable completely
-+			mask = LAN78XX_PHY_CTRL3_AUTO_DOWNSHIFT;
-+			val = 0;
-+			break;
-+		default:
-+			return -EINVAL;
-+		}
-+		(void)phy_modify_paged(phydev, 1, LAN78XX_PHY_CTRL3,
-+				       mask, val);
-+	}
-+
- 	/* these values can be used to identify internal PHY */
- 	priv->chip_id = phy_read_mmd(phydev, 3, LAN88XX_MMD3_CHIP_ID);
- 	priv->chip_rev = phy_read_mmd(phydev, 3, LAN88XX_MMD3_CHIP_REV);
---- a/include/linux/microchipphy.h
-+++ b/include/linux/microchipphy.h
-@@ -61,6 +61,14 @@
- /* Registers specific to the LAN7800/LAN7850 embedded phy */
- #define LAN78XX_PHY_LED_MODE_SELECT		(0x1D)
- 
-+#define LAN78XX_PHY_CTRL3			(0x14)
-+#define LAN78XX_PHY_CTRL3_AUTO_DOWNSHIFT	(0x0010)
-+#define LAN78XX_PHY_CTRL3_DOWNSHIFT_CTRL_MASK	(0x000c)
-+#define LAN78XX_PHY_CTRL3_DOWNSHIFT_CTRL_2	(0x0000)
-+#define LAN78XX_PHY_CTRL3_DOWNSHIFT_CTRL_3	(0x0004)
-+#define LAN78XX_PHY_CTRL3_DOWNSHIFT_CTRL_4	(0x0008)
-+#define LAN78XX_PHY_CTRL3_DOWNSHIFT_CTRL_5	(0x000c)
-+
- /* DSP registers */
- #define PHY_ARDENNES_MMD_DEV_3_PHY_CFG		(0x806A)
- #define PHY_ARDENNES_MMD_DEV_3_PHY_CFG_ZD_DLY_EN_	(0x2000)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0151-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch b/target/linux/bcm27xx/patches-6.1/950-0151-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch
deleted file mode 100644
index 742ae42164..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0151-firmware-raspberrypi-Report-the-fw-variant-during-pr.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 311b5d4d00862995b7cf916139384defdb6e2d85 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Thu, 10 Jan 2019 17:58:06 +0000
-Subject: [PATCH] firmware: raspberrypi: Report the fw variant during
- probe
-
-The driver already reported the firmware build date during probe.
-The mailbox calls have been extended to also report the variant
- 1 = standard start.elf
- 2 = start_x.elf (includes camera stack)
- 3 = start_db.elf (includes assert logging)
- 4 = start_cd.elf (cutdown version for smallest memory footprint).
-Log the variant during probe.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
-
-firmware: raspberrypi: Report the fw git hash during probe
-
-The firmware can now report the git hash from which it was built
-via the mailbox, so report it during probe.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- drivers/firmware/raspberrypi.c | 40 +++++++++++++++++++++++++++++++++-
- 1 file changed, 39 insertions(+), 1 deletion(-)
-
---- a/drivers/firmware/raspberrypi.c
-+++ b/drivers/firmware/raspberrypi.c
-@@ -234,6 +234,15 @@ rpi_firmware_print_firmware_revision(str
- {
- 	time64_t date_and_time;
- 	u32 packet;
-+	static const char * const variant_strs[] = {
-+		"unknown",
-+		"start",
-+		"start_x",
-+		"start_db",
-+		"start_cd",
-+	};
-+	const char *variant_str = "cmd unsupported";
-+	u32 variant;
- 	int ret = rpi_firmware_property(fw,
- 					RPI_FIRMWARE_GET_FIRMWARE_REVISION,
- 					&packet, sizeof(packet));
-@@ -243,7 +252,35 @@ rpi_firmware_print_firmware_revision(str
- 
- 	/* This is not compatible with y2038 */
- 	date_and_time = packet;
--	dev_info(fw->cl.dev, "Attached to firmware from %ptT\n", &date_and_time);
-+
-+	ret = rpi_firmware_property(fw, RPI_FIRMWARE_GET_FIRMWARE_VARIANT,
-+				    &variant, sizeof(variant));
-+
-+	if (!ret) {
-+		if (variant >= ARRAY_SIZE(variant_strs))
-+			variant = 0;
-+		variant_str = variant_strs[variant];
-+	}
-+
-+	dev_info(fw->cl.dev,
-+		 "Attached to firmware from %ptT, variant %s\n",
-+		 &date_and_time, variant_str);
-+}
-+
-+static void
-+rpi_firmware_print_firmware_hash(struct rpi_firmware *fw)
-+{
-+	u32 hash[5];
-+	int ret = rpi_firmware_property(fw,
-+					RPI_FIRMWARE_GET_FIRMWARE_HASH,
-+					hash, sizeof(hash));
-+
-+	if (ret)
-+		return;
-+
-+	dev_info(fw->cl.dev,
-+		 "Firmware hash is %08x%08x%08x%08x%08x\n",
-+		 hash[0], hash[1], hash[2], hash[3], hash[4]);
- }
- 
- static void
-@@ -340,6 +377,7 @@ static int rpi_firmware_probe(struct pla
- 	g_pdev = pdev;
- 
- 	rpi_firmware_print_firmware_revision(fw);
-+	rpi_firmware_print_firmware_hash(fw);
- 	rpi_register_hwmon_driver(dev, fw);
- 	rpi_register_clk_driver(dev);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0152-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch b/target/linux/bcm27xx/patches-6.1/950-0152-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch
deleted file mode 100644
index 193f4ec282..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0152-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 74be3d89db12ba469eaf4ec082599b6ed1e6dc44 Mon Sep 17 00:00:00 2001
-From: Joshua Emele <jemele@acm.org>
-Date: Wed, 7 Nov 2018 16:07:40 -0800
-Subject: [PATCH] lan78xx: Debounce link events to minimize poll storm
-
-The bInterval is set to 4 (i.e. 8 microframes => 1ms) and the only bit
-that the driver pays attention to is "link was reset". If there's a
-flapping status bit in that endpoint data, (such as if PHY negotiation
-needs a few tries to get a stable link) then polling at a slower rate
-would act as a de-bounce.
-
-See: https://github.com/raspberrypi/linux/issues/2447
----
- drivers/net/usb/lan78xx.c | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
---- a/drivers/net/usb/lan78xx.c
-+++ b/drivers/net/usb/lan78xx.c
-@@ -618,6 +618,11 @@ static bool enable_tso;
- module_param(enable_tso, bool, 0644);
- MODULE_PARM_DESC(enable_tso, "Enables TCP segmentation offload");
- 
-+#define INT_URB_MICROFRAMES_PER_MS	8
-+static int int_urb_interval_ms = 8;
-+module_param(int_urb_interval_ms, int, 0);
-+MODULE_PARM_DESC(int_urb_interval_ms, "Override usb interrupt urb interval");
-+
- static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data)
- {
- 	u32 *buf;
-@@ -4458,7 +4463,13 @@ static int lan78xx_probe(struct usb_inte
- 	if (ret < 0)
- 		goto out4;
- 
--	period = ep_intr->desc.bInterval;
-+	if (int_urb_interval_ms <= 0)
-+		period = ep_intr->desc.bInterval;
-+	else
-+		period = int_urb_interval_ms * INT_URB_MICROFRAMES_PER_MS;
-+
-+	netif_notice(dev, probe, netdev, "int urb period %d\n", period);
-+
- 	maxp = usb_maxpacket(dev->udev, dev->pipe_intr);
- 	buf = kmalloc(maxp, GFP_KERNEL);
- 	if (!buf) {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0153-lan78xx-EEE-support-is-now-a-PHY-property.patch b/target/linux/bcm27xx/patches-6.1/950-0153-lan78xx-EEE-support-is-now-a-PHY-property.patch
deleted file mode 100644
index 38510a6fd5..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0153-lan78xx-EEE-support-is-now-a-PHY-property.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3b7545f2031d984fe305ff095e9df065b80c06a8 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Tue, 5 Mar 2019 09:51:22 +0000
-Subject: [PATCH] lan78xx: EEE support is now a PHY property
-
-Now that EEE support is a property of the PHY, use the PHY's DT node
-when querying the EEE-related properties.
-
-See: https://github.com/raspberrypi/linux/issues/2882
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- drivers/net/usb/lan78xx.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/net/usb/lan78xx.c
-+++ b/drivers/net/usb/lan78xx.c
-@@ -2424,7 +2424,7 @@ static int lan78xx_phy_init(struct lan78
- 	mii_adv_to_linkmode_adv_t(fc, mii_adv);
- 	linkmode_or(phydev->advertising, fc, phydev->advertising);
- 
--	if (of_property_read_bool(dev->udev->dev.of_node,
-+	if (of_property_read_bool(phydev->mdio.dev.of_node,
- 				  "microchip,eee-enabled")) {
- 		struct ethtool_eee edata;
- 		memset(&edata, 0, sizeof(edata));
diff --git a/target/linux/bcm27xx/patches-6.1/950-0154-bcm2835-dma-Add-support-for-per-channel-flags.patch b/target/linux/bcm27xx/patches-6.1/950-0154-bcm2835-dma-Add-support-for-per-channel-flags.patch
deleted file mode 100644
index 5436f8f747..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0154-bcm2835-dma-Add-support-for-per-channel-flags.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From a55c9effca02c9493097c5ef2c7915adca510c28 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Fri, 20 Jul 2018 22:03:41 +0100
-Subject: [PATCH] bcm2835-dma: Add support for per-channel flags
-
-Add the ability to interpret the high bits of the dreq specifier as
-flags to be included in the DMA_CS register. The motivation for this
-change is the ability to set the DISDEBUG flag for SD card transfers
-to avoid corruption when using the VPU debugger.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- drivers/dma/bcm2835-dma.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
---- a/drivers/dma/bcm2835-dma.c
-+++ b/drivers/dma/bcm2835-dma.c
-@@ -139,6 +139,10 @@ struct bcm2835_desc {
- #define BCM2835_DMA_S_DREQ	BIT(10) /* enable SREQ for source */
- #define BCM2835_DMA_S_IGNORE	BIT(11) /* ignore source reads - read 0 */
- #define BCM2835_DMA_BURST_LENGTH(x) ((x & 15) << 12)
-+#define BCM2835_DMA_CS_FLAGS(x) (x & (BCM2835_DMA_PRIORITY(15) | \
-+				      BCM2835_DMA_PANIC_PRIORITY(15) | \
-+				      BCM2835_DMA_WAIT_FOR_WRITES | \
-+				      BCM2835_DMA_DIS_DEBUG))
- #define BCM2835_DMA_PER_MAP(x)	((x & 31) << 16) /* REQ source */
- #define BCM2835_DMA_WAIT(x)	((x & 31) << 21) /* add DMA-wait cycles */
- #define BCM2835_DMA_NO_WIDE_BURSTS BIT(26) /* no 2 beat write bursts */
-@@ -452,7 +456,8 @@ static void bcm2835_dma_start_desc(struc
- 	c->desc = d = to_bcm2835_dma_desc(&vd->tx);
- 
- 	writel(d->cb_list[0].paddr, c->chan_base + BCM2835_DMA_ADDR);
--	writel(BCM2835_DMA_ACTIVE, c->chan_base + BCM2835_DMA_CS);
-+	writel(BCM2835_DMA_ACTIVE | BCM2835_DMA_CS_FLAGS(c->dreq),
-+	       c->chan_base + BCM2835_DMA_CS);
- }
- 
- static irqreturn_t bcm2835_dma_callback(int irq, void *data)
-@@ -479,7 +484,8 @@ static irqreturn_t bcm2835_dma_callback(
- 	 * if this IRQ handler is threaded.) If the channel is finished, it
- 	 * will remain idle despite the ACTIVE flag being set.
- 	 */
--	writel(BCM2835_DMA_INT | BCM2835_DMA_ACTIVE,
-+	writel(BCM2835_DMA_INT | BCM2835_DMA_ACTIVE |
-+	       BCM2835_DMA_CS_FLAGS(c->dreq),
- 	       c->chan_base + BCM2835_DMA_CS);
- 
- 	d = c->desc;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0155-rtc-rv3028-Add-backup-switchover-mode-support.patch b/target/linux/bcm27xx/patches-6.1/950-0155-rtc-rv3028-Add-backup-switchover-mode-support.patch
deleted file mode 100644
index 0ca1388d40..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0155-rtc-rv3028-Add-backup-switchover-mode-support.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 83cbc83905d756a4da933af63c86ca37d6af64f9 Mon Sep 17 00:00:00 2001
-From: Phil Howard <phil@gadgetoid.com>
-Date: Fri, 29 Mar 2019 10:53:14 +0000
-Subject: [PATCH] rtc: rv3028: Add backup switchover mode support
-
-Signed-off-by: Phil Howard <phil@pimoroni.com>
----
- drivers/rtc/rtc-rv3028.c | 45 +++++++++++++++++++++++++++++++++++-----
- 1 file changed, 40 insertions(+), 5 deletions(-)
-
---- a/drivers/rtc/rtc-rv3028.c
-+++ b/drivers/rtc/rtc-rv3028.c
-@@ -860,6 +860,8 @@ static int rv3028_probe(struct i2c_clien
- 	struct rv3028_data *rv3028;
- 	int ret, status;
- 	u32 ohms;
-+	u32 bsm;
-+	u8 backup, backup_bits, backup_mask;
- 	struct nvmem_config nvmem_cfg = {
- 		.name = "rv3028_nvram",
- 		.word_size = 1,
-@@ -926,6 +928,21 @@ static int rv3028_probe(struct i2c_clien
- 	if (ret)
- 		return ret;
- 
-+	backup_bits = 0;
-+	backup_mask = 0;
-+
-+	/* setup backup switchover mode */
-+	if (!device_property_read_u32(&client->dev,
-+				      "backup-switchover-mode",
-+				      &bsm)) {
-+		if (bsm <= 3) {
-+			backup_bits |= (u8)(bsm << 2);
-+			backup_mask |= RV3028_BACKUP_BSM;
-+		} else {
-+			dev_warn(&client->dev, "invalid backup switchover mode value\n");
-+		}
-+	}
-+
- 	/* setup trickle charger */
- 	if (!device_property_read_u32(&client->dev, "trickle-resistor-ohms",
- 				      &ohms)) {
-@@ -936,15 +953,33 @@ static int rv3028_probe(struct i2c_clien
- 				break;
- 
- 		if (i < ARRAY_SIZE(rv3028_trickle_resistors)) {
--			ret = rv3028_update_cfg(rv3028, RV3028_BACKUP, RV3028_BACKUP_TCE |
--						 RV3028_BACKUP_TCR_MASK, RV3028_BACKUP_TCE | i);
--			if (ret)
--				return ret;
-+			backup_bits |= RV3028_BACKUP_TCE | i;
-+			backup_mask |= RV3028_BACKUP_TCE |
-+				RV3028_BACKUP_TCR_MASK;
- 		} else {
--			dev_warn(&client->dev, "invalid trickle resistor value\n");
-+			dev_warn(&client->dev,
-+				 "invalid trickle resistor value\n");
- 		}
- 	}
- 
-+	if (backup_mask) {
-+		ret = rv3028_eeprom_read((void *)rv3028, RV3028_BACKUP,
-+					 (void *)&backup, 1);
-+		/* Write register and EEPROM if needed */
-+		if (!ret && (backup & backup_mask) != backup_bits) {
-+			backup = (backup & ~backup_mask) | backup_bits;
-+			ret = rv3028_update_cfg(rv3028, RV3028_BACKUP,
-+						backup_mask, backup_bits);
-+		}
-+
-+		/* In the event of an EEPROM failure, just update the register */
-+		if (ret)
-+			ret = regmap_update_bits(rv3028->regmap, RV3028_BACKUP,
-+						 backup_mask, backup_bits);
-+		if (ret)
-+			return ret;
-+	}
-+
- 	ret = rtc_add_group(rv3028->rtc, &rv3028_attr_group);
- 	if (ret)
- 		return ret;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0156-media-tc358743-Increase-FIFO-level-to-374.patch b/target/linux/bcm27xx/patches-6.1/950-0156-media-tc358743-Increase-FIFO-level-to-374.patch
deleted file mode 100644
index 25e0808024..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0156-media-tc358743-Increase-FIFO-level-to-374.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 3ffb0a5df9f03fc5167f91167a16b386cbbd877e Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Wed, 31 Oct 2018 14:56:59 +0000
-Subject: [PATCH] media: tc358743: Increase FIFO level to 374.
-
-The existing fixed value of 16 worked for UYVY 720P60 over
-2 lanes at 594MHz, or UYVY 1080P60 over 4 lanes. (RGB888
-1080P60 needs 6 lanes at 594MHz).
-It doesn't allow for lower resolutions to work as the FIFO
-underflows.
-
-374 is required for 1080P24-30 UYVY over 2 lanes @ 972Mbit/s, but
->374 means that the FIFO underflows on 1080P50 UYVY over 2 lanes
-@ 972Mbit/s.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- drivers/media/i2c/tc358743.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/media/i2c/tc358743.c
-+++ b/drivers/media/i2c/tc358743.c
-@@ -1936,7 +1936,7 @@ static int tc358743_probe_of(struct tc35
- 	state->pdata.ddc5v_delay = DDC5V_DELAY_100_MS;
- 	state->pdata.enable_hdcp = false;
- 	/* A FIFO level of 16 should be enough for 2-lane 720p60 at 594 MHz. */
--	state->pdata.fifo_level = 16;
-+	state->pdata.fifo_level = 374;
- 	/*
- 	 * The PLL input clock is obtained by dividing refclk by pll_prd.
- 	 * It must be between 6 MHz and 40 MHz, lower frequency is better.
diff --git a/target/linux/bcm27xx/patches-6.1/950-0157-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch b/target/linux/bcm27xx/patches-6.1/950-0157-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch
deleted file mode 100644
index c2d1e83dec..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0157-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 91fa89dd812557e8894f18ce9283a7f9308bae19 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Wed, 31 Oct 2018 14:57:21 +0000
-Subject: [PATCH] media: tc358743: Add support for 972Mbit/s link freq.
-
-Adds register setups for running the CSI lanes at 972Mbit/s,
-which allows 1080P50 UYVY down 2 lanes.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- drivers/media/i2c/tc358743.c | 47 +++++++++++++++++++++++++-----------
- 1 file changed, 33 insertions(+), 14 deletions(-)
-
---- a/drivers/media/i2c/tc358743.c
-+++ b/drivers/media/i2c/tc358743.c
-@@ -1956,6 +1956,7 @@ static int tc358743_probe_of(struct tc35
- 	/*
- 	 * The CSI bps per lane must be between 62.5 Mbps and 1 Gbps.
- 	 * The default is 594 Mbps for 4-lane 1080p60 or 2-lane 720p60.
-+	 * 972 Mbps allows 1080P50 UYVY over 2-lane.
- 	 */
- 	bps_pr_lane = 2 * endpoint.link_frequencies[0];
- 	if (bps_pr_lane < 62500000U || bps_pr_lane > 1000000000U) {
-@@ -1969,23 +1970,41 @@ static int tc358743_probe_of(struct tc35
- 			       state->pdata.refclk_hz * state->pdata.pll_prd;
- 
- 	/*
--	 * FIXME: These timings are from REF_02 for 594 Mbps per lane (297 MHz
--	 * link frequency). In principle it should be possible to calculate
-+	 * FIXME: These timings are from REF_02 for 594 or 972 Mbps per lane
-+	 * (297 MHz or 486 MHz link frequency).
-+	 * In principle it should be possible to calculate
- 	 * them based on link frequency and resolution.
- 	 */
--	if (bps_pr_lane != 594000000U)
-+	switch (bps_pr_lane) {
-+	default:
- 		dev_warn(dev, "untested bps per lane: %u bps\n", bps_pr_lane);
--	state->pdata.lineinitcnt = 0xe80;
--	state->pdata.lptxtimecnt = 0x003;
--	/* tclk-preparecnt: 3, tclk-zerocnt: 20 */
--	state->pdata.tclk_headercnt = 0x1403;
--	state->pdata.tclk_trailcnt = 0x00;
--	/* ths-preparecnt: 3, ths-zerocnt: 1 */
--	state->pdata.ths_headercnt = 0x0103;
--	state->pdata.twakeup = 0x4882;
--	state->pdata.tclk_postcnt = 0x008;
--	state->pdata.ths_trailcnt = 0x2;
--	state->pdata.hstxvregcnt = 0;
-+	case 594000000U:
-+		state->pdata.lineinitcnt = 0xe80;
-+		state->pdata.lptxtimecnt = 0x003;
-+		/* tclk-preparecnt: 3, tclk-zerocnt: 20 */
-+		state->pdata.tclk_headercnt = 0x1403;
-+		state->pdata.tclk_trailcnt = 0x00;
-+		/* ths-preparecnt: 3, ths-zerocnt: 1 */
-+		state->pdata.ths_headercnt = 0x0103;
-+		state->pdata.twakeup = 0x4882;
-+		state->pdata.tclk_postcnt = 0x008;
-+		state->pdata.ths_trailcnt = 0x2;
-+		state->pdata.hstxvregcnt = 0;
-+		break;
-+	case 972000000U:
-+		state->pdata.lineinitcnt = 0x1b58;
-+		state->pdata.lptxtimecnt = 0x007;
-+		/* tclk-preparecnt: 6, tclk-zerocnt: 40 */
-+		state->pdata.tclk_headercnt = 0x2806;
-+		state->pdata.tclk_trailcnt = 0x00;
-+		/* ths-preparecnt: 6, ths-zerocnt: 8 */
-+		state->pdata.ths_headercnt = 0x0806;
-+		state->pdata.twakeup = 0x4268;
-+		state->pdata.tclk_postcnt = 0x008;
-+		state->pdata.ths_trailcnt = 0x5;
-+		state->pdata.hstxvregcnt = 0;
-+		break;
-+	}
- 
- 	state->reset_gpio = devm_gpiod_get_optional(dev, "reset",
- 						    GPIOD_OUT_LOW);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0158-media-tc358743-Check-I2C-succeeded-during-probe.patch b/target/linux/bcm27xx/patches-6.1/950-0158-media-tc358743-Check-I2C-succeeded-during-probe.patch
deleted file mode 100644
index 4c7d724124..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0158-media-tc358743-Check-I2C-succeeded-during-probe.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 7fb4eadf9ca5f960a6ef8d4b43edfe8a2fe8b48a Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Wed, 31 Oct 2018 14:57:34 +0000
-Subject: [PATCH] media: tc358743: Check I2C succeeded during probe.
-
-The probe for the TC358743 reads the CHIPID register from
-the device and compares it to the expected value of 0.
-If the I2C request fails then that also returns 0, so
-the driver loads thinking that the device is there.
-
-Generally I2C communications are reliable so there is
-limited need to check the return value on every transfer,
-therefore only amend the one read during probe to check
-for I2C errors.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- drivers/media/i2c/tc358743.c | 27 +++++++++++++++++++++++----
- 1 file changed, 23 insertions(+), 4 deletions(-)
-
---- a/drivers/media/i2c/tc358743.c
-+++ b/drivers/media/i2c/tc358743.c
-@@ -110,7 +110,7 @@ static inline struct tc358743_state *to_
- 
- /* --------------- I2C --------------- */
- 
--static void i2c_rd(struct v4l2_subdev *sd, u16 reg, u8 *values, u32 n)
-+static int i2c_rd(struct v4l2_subdev *sd, u16 reg, u8 *values, u32 n)
- {
- 	struct tc358743_state *state = to_state(sd);
- 	struct i2c_client *client = state->i2c_client;
-@@ -136,6 +136,7 @@ static void i2c_rd(struct v4l2_subdev *s
- 		v4l2_err(sd, "%s: reading register 0x%x from 0x%x failed\n",
- 				__func__, reg, client->addr);
- 	}
-+	return err != ARRAY_SIZE(msgs);
- }
- 
- static void i2c_wr(struct v4l2_subdev *sd, u16 reg, u8 *values, u32 n)
-@@ -192,15 +193,24 @@ static void i2c_wr(struct v4l2_subdev *s
- 	}
- }
- 
--static noinline u32 i2c_rdreg(struct v4l2_subdev *sd, u16 reg, u32 n)
-+static noinline u32 i2c_rdreg_err(struct v4l2_subdev *sd, u16 reg, u32 n,
-+				  int *err)
- {
-+	int error;
- 	__le32 val = 0;
- 
--	i2c_rd(sd, reg, (u8 __force *)&val, n);
-+	error = i2c_rd(sd, reg, (u8 __force *)&val, n);
-+	if (err)
-+		*err = error;
- 
- 	return le32_to_cpu(val);
- }
- 
-+static inline u32 i2c_rdreg(struct v4l2_subdev *sd, u16 reg, u32 n)
-+{
-+	return i2c_rdreg_err(sd, reg, n, NULL);
-+}
-+
- static noinline void i2c_wrreg(struct v4l2_subdev *sd, u16 reg, u32 val, u32 n)
- {
- 	__le32 raw = cpu_to_le32(val);
-@@ -229,6 +239,13 @@ static u16 i2c_rd16(struct v4l2_subdev *
- 	return i2c_rdreg(sd, reg, 2);
- }
- 
-+static int i2c_rd16_err(struct v4l2_subdev *sd, u16 reg, u16 *value)
-+{
-+	int err;
-+	*value = i2c_rdreg_err(sd, reg, 2, &err);
-+	return err;
-+}
-+
- static void i2c_wr16(struct v4l2_subdev *sd, u16 reg, u16 val)
- {
- 	i2c_wrreg(sd, reg, val, 2);
-@@ -2043,6 +2060,7 @@ static int tc358743_probe(struct i2c_cli
- 	struct tc358743_platform_data *pdata = client->dev.platform_data;
- 	struct v4l2_subdev *sd;
- 	u16 irq_mask = MASK_HDMI_MSK | MASK_CSI_MSK;
-+	u16 chipid;
- 	int err;
- 
- 	if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
-@@ -2074,7 +2092,8 @@ static int tc358743_probe(struct i2c_cli
- 	sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE | V4L2_SUBDEV_FL_HAS_EVENTS;
- 
- 	/* i2c access */
--	if ((i2c_rd16(sd, CHIPID) & MASK_CHIPID) != 0) {
-+	if (i2c_rd16_err(sd, CHIPID, &chipid) ||
-+	    (chipid & MASK_CHIPID) != 0) {
- 		v4l2_info(sd, "not a TC358743 on address 0x%x\n",
- 			  client->addr << 1);
- 		return -ENODEV;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0159-media-adv7180-Default-to-the-first-valid-input.patch b/target/linux/bcm27xx/patches-6.1/950-0159-media-adv7180-Default-to-the-first-valid-input.patch
deleted file mode 100644
index d028954107..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0159-media-adv7180-Default-to-the-first-valid-input.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 24b0bf24790c73bb20feb62bc4b3a53b529cab26 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Wed, 31 Oct 2018 14:57:46 +0000
-Subject: [PATCH] media: adv7180: Default to the first valid input
-
-The hardware default is differential CVBS on AIN1 & 2, which
-isn't very useful.
-
-Select the first input that is defined as valid for the
-chip variant (typically CVBS_AIN1).
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- drivers/media/i2c/adv7180.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
---- a/drivers/media/i2c/adv7180.c
-+++ b/drivers/media/i2c/adv7180.c
-@@ -1340,6 +1340,7 @@ static const struct adv7180_chip_info ad
- static int init_device(struct adv7180_state *state)
- {
- 	int ret;
-+	int i;
- 
- 	mutex_lock(&state->mutex);
- 
-@@ -1387,6 +1388,18 @@ static int init_device(struct adv7180_st
- 			goto out_unlock;
- 	}
- 
-+	/* Select first valid input */
-+	for (i = 0; i < 32; i++) {
-+		if (BIT(i) & state->chip_info->valid_input_mask) {
-+			ret = state->chip_info->select_input(state, i);
-+
-+			if (ret == 0) {
-+				state->input = i;
-+				break;
-+			}
-+		}
-+	}
-+
- out_unlock:
- 	mutex_unlock(&state->mutex);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0160-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch b/target/linux/bcm27xx/patches-6.1/950-0160-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch
deleted file mode 100644
index 322d56c242..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0160-media-adv7180-Add-YPrPb-support-for-ADV7282M.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From f936abf4f8b3c3e803cf9ad22f0feec9e41e97dc Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Wed, 31 Oct 2018 14:57:56 +0000
-Subject: [PATCH] media: adv7180: Add YPrPb support for ADV7282M
-
-The ADV7282M can support YPbPr on AIN1-3, but this was
-not selectable from the driver. Add it to the list of
-supported input modes.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- drivers/media/i2c/adv7180.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/media/i2c/adv7180.c
-+++ b/drivers/media/i2c/adv7180.c
-@@ -1329,6 +1329,7 @@ static const struct adv7180_chip_info ad
- 		BIT(ADV7182_INPUT_SVIDEO_AIN1_AIN2) |
- 		BIT(ADV7182_INPUT_SVIDEO_AIN3_AIN4) |
- 		BIT(ADV7182_INPUT_SVIDEO_AIN7_AIN8) |
-+		BIT(ADV7182_INPUT_YPRPB_AIN1_AIN2_AIN3) |
- 		BIT(ADV7182_INPUT_DIFF_CVBS_AIN1_AIN2) |
- 		BIT(ADV7182_INPUT_DIFF_CVBS_AIN3_AIN4) |
- 		BIT(ADV7182_INPUT_DIFF_CVBS_AIN7_AIN8),
diff --git a/target/linux/bcm27xx/patches-6.1/950-0161-media-videodev2-Add-helper-defines-for-printing-FOUR.patch b/target/linux/bcm27xx/patches-6.1/950-0161-media-videodev2-Add-helper-defines-for-printing-FOUR.patch
deleted file mode 100644
index cd7e15b1be..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0161-media-videodev2-Add-helper-defines-for-printing-FOUR.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 1222409f3aff2d4f1b9787491fa5e67602f3a352 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Wed, 31 Oct 2018 14:58:08 +0000
-Subject: [PATCH] media: videodev2: Add helper defines for printing
- FOURCCs
-
-New helper defines that allow printing of a FOURCC using
-printf(V4L2_FOURCC_CONV, V4L2_FOURCC_CONV_ARGS(fourcc));
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- include/uapi/linux/videodev2.h | 5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/include/uapi/linux/videodev2.h
-+++ b/include/uapi/linux/videodev2.h
-@@ -82,6 +82,11 @@
- 	((__u32)(a) | ((__u32)(b) << 8) | ((__u32)(c) << 16) | ((__u32)(d) << 24))
- #define v4l2_fourcc_be(a, b, c, d)	(v4l2_fourcc(a, b, c, d) | (1U << 31))
- 
-+#define V4L2_FOURCC_CONV "%c%c%c%c%s"
-+#define V4L2_FOURCC_CONV_ARGS(fourcc) \
-+	(fourcc) & 0x7f, ((fourcc) >> 8) & 0x7f, ((fourcc) >> 16) & 0x7f, \
-+	((fourcc) >> 24) & 0x7f, (fourcc) & BIT(31) ? "-BE" : ""
-+
- /*
-  *	E N U M S
-  */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0162-dt-bindings-Document-BCM283x-CSI2-CCP2-receiver.patch b/target/linux/bcm27xx/patches-6.1/950-0162-dt-bindings-Document-BCM283x-CSI2-CCP2-receiver.patch
deleted file mode 100644
index cf429ccd5b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0162-dt-bindings-Document-BCM283x-CSI2-CCP2-receiver.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From fc8a052745aba2bd5a85501a2226b1332d08ebec Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Wed, 31 Oct 2018 14:59:06 +0000
-Subject: [PATCH] dt-bindings: Document BCM283x CSI2/CCP2 receiver
-
-Document the DT bindings for the CSI2/CCP2 receiver peripheral
-(known as Unicam) on BCM283x SoCs.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Acked-by: Rob Herring <robh@kernel.org>
----
- .../bindings/media/bcm2835-unicam.txt         | 85 +++++++++++++++++++
- 1 file changed, 85 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/media/bcm2835-unicam.txt
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/media/bcm2835-unicam.txt
-@@ -0,0 +1,85 @@
-+Broadcom BCM283x Camera Interface (Unicam)
-+------------------------------------------
-+
-+The Unicam block on BCM283x SoCs is the receiver for either
-+CSI-2 or CCP2 data from image sensors or similar devices.
-+
-+The main platform using this SoC is the Raspberry Pi family of boards.
-+On the Pi the VideoCore firmware can also control this hardware block,
-+and driving it from two different processors will cause issues.
-+To avoid this, the firmware checks the device tree configuration
-+during boot. If it finds device tree nodes called csi0 or csi1 then
-+it will stop the firmware accessing the block, and it can then
-+safely be used via the device tree binding.
-+
-+Required properties:
-+===================
-+- compatible	: must be "brcm,bcm2835-unicam".
-+- reg		: physical base address and length of the register sets for the
-+		  device.
-+- interrupts	: should contain the IRQ line for this Unicam instance.
-+- clocks	: list of clock specifiers, corresponding to entries in
-+		  clock-names property.
-+- clock-names	: must contain an "lp" entry, matching entries in the
-+		  clocks property.
-+
-+Unicam supports a single port node. It should contain one 'port' child node
-+with child 'endpoint' node. Please refer to the bindings defined in
-+Documentation/devicetree/bindings/media/video-interfaces.txt.
-+
-+Within the endpoint node the "remote-endpoint" and "data-lanes" properties
-+are mandatory.
-+Data lane reordering is not supported so the data lanes must be in order,
-+starting at 1. The number of data lanes should represent the number of
-+usable lanes for the hardware block. That may be limited by either the SoC or
-+how the platform presents the interface, and the lower value must be used.
-+
-+Lane reordering is not supported on the clock lane either, so the optional
-+property "clock-lane" will implicitly be <0>.
-+Similarly lane inversion is not supported, therefore "lane-polarities" will
-+implicitly be <0 0 0 0 0>.
-+Neither of these values will be checked.
-+
-+Example:
-+	csi1: csi1@7e801000 {
-+		compatible = "brcm,bcm2835-unicam";
-+		reg = <0x7e801000 0x800>,
-+		      <0x7e802004 0x4>;
-+		interrupts = <2 7>;
-+		clocks = <&clocks BCM2835_CLOCK_CAM1>;
-+		clock-names = "lp";
-+
-+		port {
-+			csi1_ep: endpoint {
-+				remote-endpoint = <&tc358743_0>;
-+				data-lanes = <1 2>;
-+			};
-+		};
-+	};
-+
-+	i2c0: i2c@7e205000 {
-+		tc358743: csi-hdmi-bridge@0f {
-+			compatible = "toshiba,tc358743";
-+			reg = <0x0f>;
-+
-+			clocks = <&tc358743_clk>;
-+			clock-names = "refclk";
-+
-+			tc358743_clk: bridge-clk {
-+				compatible = "fixed-clock";
-+				#clock-cells = <0>;
-+				clock-frequency = <27000000>;
-+			};
-+
-+			port {
-+				tc358743_0: endpoint {
-+					remote-endpoint = <&csi1_ep>;
-+					clock-lanes = <0>;
-+					data-lanes = <1 2>;
-+					clock-noncontinuous;
-+					link-frequencies =
-+						/bits/ 64 <297000000>;
-+				};
-+			};
-+		};
-+	};
diff --git a/target/linux/bcm27xx/patches-6.1/950-0163-MAINTAINERS-Add-entry-for-BCM2835-Unicam-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0163-MAINTAINERS-Add-entry-for-BCM2835-Unicam-driver.patch
deleted file mode 100644
index a348894419..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0163-MAINTAINERS-Add-entry-for-BCM2835-Unicam-driver.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a8bdb91f7d3fb93b0e4304602fba5e15d93fc4ce Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Wed, 31 Oct 2018 14:59:40 +0000
-Subject: [PATCH] MAINTAINERS: Add entry for BCM2835 Unicam driver
-
-Adds entry for the new BCM2835 Unicam (CSI-2 receiver) driver
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- MAINTAINERS | 7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -4030,6 +4030,13 @@ N:	bcm113*
- N:	bcm216*
- N:	kona
- 
-+BROADCOM BCM2835 CAMERA DRIVER
-+M:	Dave Stevenson <dave.stevenson@raspberrypi.org>
-+L:	linux-media@vger.kernel.org
-+S:	Maintained
-+F:	drivers/media/platform/bcm2835/
-+F:	Documentation/devicetree/bindings/media/bcm2835-unicam.txt
-+
- BROADCOM BCM47XX MIPS ARCHITECTURE
- M:	Hauke Mehrtens <hauke@hauke-m.de>
- M:	Rafał Miłecki <zajec5@gmail.com>
diff --git a/target/linux/bcm27xx/patches-6.1/950-0164-media-tc358743-Return-an-appropriate-colorspace-from.patch b/target/linux/bcm27xx/patches-6.1/950-0164-media-tc358743-Return-an-appropriate-colorspace-from.patch
deleted file mode 100644
index c0823112c6..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0164-media-tc358743-Return-an-appropriate-colorspace-from.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 50b669386c0315985f460d6d25d8302d3d370b2b Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Thu, 22 Nov 2018 17:31:06 +0000
-Subject: [PATCH] media: tc358743: Return an appropriate colorspace
- from tc358743_set_fmt
-
-When calling tc358743_set_fmt, the code was calling tc358743_get_fmt
-to choose a valid format. However that sets the colorspace
-based on what was read back from the chip. When you set the format,
-then the driver would choose and program the colorspace based
-on the format code.
-
-The result was that if you called try or set format for UYVY
-when the current format was RGB3 then you would get told sRGB,
-and try RGB3 when current was UYVY and you would get told
-SMPTE170M.
-
-The value programmed into the chip is determined by this driver,
-therefore there is no need to read back the value. Return the
-colorspace based on the format set/tried instead.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- drivers/media/i2c/tc358743.c | 40 +++++++++++++-----------------------
- 1 file changed, 14 insertions(+), 26 deletions(-)
-
---- a/drivers/media/i2c/tc358743.c
-+++ b/drivers/media/i2c/tc358743.c
-@@ -1668,12 +1668,23 @@ static int tc358743_enum_mbus_code(struc
- 	return 0;
- }
- 
-+static u32 tc358743_g_colorspace(u32 code)
-+{
-+	switch (code) {
-+	case MEDIA_BUS_FMT_RGB888_1X24:
-+		return V4L2_COLORSPACE_SRGB;
-+	case MEDIA_BUS_FMT_UYVY8_1X16:
-+		return V4L2_COLORSPACE_SMPTE170M;
-+	default:
-+		return 0;
-+	}
-+}
-+
- static int tc358743_get_fmt(struct v4l2_subdev *sd,
- 		struct v4l2_subdev_state *sd_state,
- 		struct v4l2_subdev_format *format)
- {
- 	struct tc358743_state *state = to_state(sd);
--	u8 vi_rep = i2c_rd8(sd, VI_REP);
- 
- 	if (format->pad != 0)
- 		return -EINVAL;
-@@ -1683,23 +1694,7 @@ static int tc358743_get_fmt(struct v4l2_
- 	format->format.height = state->timings.bt.height;
- 	format->format.field = V4L2_FIELD_NONE;
- 
--	switch (vi_rep & MASK_VOUT_COLOR_SEL) {
--	case MASK_VOUT_COLOR_RGB_FULL:
--	case MASK_VOUT_COLOR_RGB_LIMITED:
--		format->format.colorspace = V4L2_COLORSPACE_SRGB;
--		break;
--	case MASK_VOUT_COLOR_601_YCBCR_LIMITED:
--	case MASK_VOUT_COLOR_601_YCBCR_FULL:
--		format->format.colorspace = V4L2_COLORSPACE_SMPTE170M;
--		break;
--	case MASK_VOUT_COLOR_709_YCBCR_FULL:
--	case MASK_VOUT_COLOR_709_YCBCR_LIMITED:
--		format->format.colorspace = V4L2_COLORSPACE_REC709;
--		break;
--	default:
--		format->format.colorspace = 0;
--		break;
--	}
-+	format->format.colorspace = tc358743_g_colorspace(format->format.code);
- 
- 	return 0;
- }
-@@ -1714,18 +1709,11 @@ static int tc358743_set_fmt(struct v4l2_
- 	int ret = tc358743_get_fmt(sd, sd_state, format);
- 
- 	format->format.code = code;
-+	format->format.colorspace = tc358743_g_colorspace(code);
- 
- 	if (ret)
- 		return ret;
- 
--	switch (code) {
--	case MEDIA_BUS_FMT_RGB888_1X24:
--	case MEDIA_BUS_FMT_UYVY8_1X16:
--		break;
--	default:
--		return -EINVAL;
--	}
--
- 	if (format->which == V4L2_SUBDEV_FORMAT_TRY)
- 		return 0;
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0165-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch b/target/linux/bcm27xx/patches-6.1/950-0165-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch
deleted file mode 100644
index ba8d2beed1..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0165-staging-mmal-vchiq-Avoid-use-of-bool-in-structures.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From aeb87c00a9efd574ab2a5b6018fc5aa9c97ee912 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Mon, 29 Oct 2018 16:20:46 +0000
-Subject: [PATCH] staging: mmal-vchiq: Avoid use of bool in structures
-
-Fixes up a checkpatch error "Avoid using bool structure members
-because of possible alignment issues".
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-@@ -1774,7 +1774,7 @@ int vchiq_mmal_component_enable(struct v
- 
- 	ret = enable_component(instance, component);
- 	if (ret == 0)
--		component->enabled = true;
-+		component->enabled = 1;
- 
- 	mutex_unlock(&instance->vchiq_mutex);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0166-staging-mmal-vchiq-Add-support-for-event-callbacks.patch b/target/linux/bcm27xx/patches-6.1/950-0166-staging-mmal-vchiq-Add-support-for-event-callbacks.patch
deleted file mode 100644
index 01a4d49fae..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0166-staging-mmal-vchiq-Add-support-for-event-callbacks.patch
+++ /dev/null
@@ -1,356 +0,0 @@
-From 59b45d61ae062666cb83f4961f5329cbcf3170a3 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Mon, 24 Sep 2018 18:15:38 +0100
-Subject: [PATCH] staging: mmal-vchiq: Add support for event callbacks.
-
-(Preparation for the codec driver).
-The codec uses the event mechanism to report things such as
-resolution changes. It is signalled by the cmd field of the buffer
-being non-zero.
-
-Add support for passing this information out to the client.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- .../vc04_services/vchiq-mmal/mmal-common.h    |   1 +
- .../vc04_services/vchiq-mmal/mmal-msg.h       |  35 ++++
- .../vc04_services/vchiq-mmal/mmal-vchiq.c     | 170 ++++++++++++++++--
- .../vc04_services/vchiq-mmal/mmal-vchiq.h     |   4 +
- 4 files changed, 196 insertions(+), 14 deletions(-)
-
---- a/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h
-+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h
-@@ -50,6 +50,7 @@ struct mmal_buffer {
- 
- 	struct mmal_msg_context *msg_context;
- 
-+	u32 cmd;		/* MMAL command. 0=data. */
- 	unsigned long length;
- 	u32 mmal_flags;
- 	s64 dts;
---- a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h
-+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h
-@@ -346,6 +346,41 @@ struct mmal_msg_port_parameter_get_reply
- /* event messages */
- #define MMAL_WORKER_EVENT_SPACE 256
- 
-+/* Four CC's for events */
-+#define MMAL_FOURCC(a, b, c, d) ((a) | (b << 8) | (c << 16) | (d << 24))
-+
-+#define MMAL_EVENT_ERROR		MMAL_FOURCC('E', 'R', 'R', 'O')
-+#define MMAL_EVENT_EOS			MMAL_FOURCC('E', 'E', 'O', 'S')
-+#define MMAL_EVENT_FORMAT_CHANGED	MMAL_FOURCC('E', 'F', 'C', 'H')
-+#define MMAL_EVENT_PARAMETER_CHANGED	MMAL_FOURCC('E', 'P', 'C', 'H')
-+
-+/* Structs for each of the event message payloads */
-+struct mmal_msg_event_eos {
-+	u32 port_type;	/**< Type of port that received the end of stream */
-+	u32 port_index;	/**< Index of port that received the end of stream */
-+};
-+
-+/** Format changed event data. */
-+struct mmal_msg_event_format_changed {
-+	/* Minimum size of buffers the port requires */
-+	u32 buffer_size_min;
-+	/* Minimum number of buffers the port requires */
-+	u32 buffer_num_min;
-+	/* Size of buffers the port recommends for optimal performance.
-+	 * A value of zero means no special recommendation.
-+	 */
-+	u32 buffer_size_recommended;
-+	/* Number of buffers the port recommends for optimal
-+	 * performance. A value of zero means no special recommendation.
-+	 */
-+	u32 buffer_num_recommended;
-+
-+	u32 es_ptr;
-+	struct mmal_es_format format;
-+	union mmal_es_specific_format es;
-+	u8 extradata[MMAL_FORMAT_EXTRADATA_MAX_SIZE];
-+};
-+
- struct mmal_msg_event_to_host {
- 	u32 client_component;	/* component context */
- 
---- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-@@ -143,6 +143,8 @@ struct mmal_msg_context {
- 			/* Presentation and Decode timestamps */
- 			s64 pts;
- 			s64 dts;
-+			/* MMAL buffer command flag */
-+			u32 cmd;
- 
- 			int status;	/* context status */
- 
-@@ -230,18 +232,6 @@ release_msg_context(struct mmal_msg_cont
- 	kfree(msg_context);
- }
- 
--/* deals with receipt of event to host message */
--static void event_to_host_cb(struct vchiq_mmal_instance *instance,
--			     struct mmal_msg *msg, u32 msg_len)
--{
--	pr_debug("unhandled event\n");
--	pr_debug("component:%u port type:%d num:%d cmd:0x%x length:%d\n",
--		 msg->u.event_to_host.client_component,
--		 msg->u.event_to_host.port_type,
--		 msg->u.event_to_host.port_num,
--		 msg->u.event_to_host.cmd, msg->u.event_to_host.length);
--}
--
- /* workqueue scheduled callback
-  *
-  * we do this because it is important we do not call any other vchiq
-@@ -263,13 +253,18 @@ static void buffer_work_cb(struct work_s
- 	buffer->mmal_flags = msg_context->u.bulk.mmal_flags;
- 	buffer->dts = msg_context->u.bulk.dts;
- 	buffer->pts = msg_context->u.bulk.pts;
-+	buffer->cmd = msg_context->u.bulk.cmd;
- 
--	atomic_dec(&msg_context->u.bulk.port->buffers_with_vpu);
-+	if (!buffer->cmd)
-+		atomic_dec(&msg_context->u.bulk.port->buffers_with_vpu);
- 
- 	msg_context->u.bulk.port->buffer_cb(msg_context->u.bulk.instance,
- 					    msg_context->u.bulk.port,
- 					    msg_context->u.bulk.status,
- 					    msg_context->u.bulk.buffer);
-+
-+	if (buffer->cmd)
-+		mutex_unlock(&msg_context->u.bulk.port->event_context_mutex);
- }
- 
- /* workqueue scheduled callback to handle receiving buffers
-@@ -347,6 +342,7 @@ static int bulk_receive(struct vchiq_mma
- 	msg_context->u.bulk.buffer_used = rd_len;
- 	msg_context->u.bulk.dts = msg->u.buffer_from_host.buffer_header.dts;
- 	msg_context->u.bulk.pts = msg->u.buffer_from_host.buffer_header.pts;
-+	msg_context->u.bulk.cmd = msg->u.buffer_from_host.buffer_header.cmd;
- 
- 	queue_work(msg_context->instance->bulk_wq,
- 		   &msg_context->u.bulk.buffer_to_host_work);
-@@ -449,6 +445,103 @@ buffer_from_host(struct vchiq_mmal_insta
- 	return ret;
- }
- 
-+/* deals with receipt of event to host message */
-+static void event_to_host_cb(struct vchiq_mmal_instance *instance,
-+			     struct mmal_msg *msg, u32 msg_len)
-+{
-+	/* FIXME: Not going to work on 64 bit */
-+	struct vchiq_mmal_component *component =
-+		(struct vchiq_mmal_component *)msg->u.event_to_host.client_component;
-+	struct vchiq_mmal_port *port = NULL;
-+	struct mmal_msg_context *msg_context;
-+	u32 port_num = msg->u.event_to_host.port_num;
-+
-+	if (msg->u.buffer_from_host.drvbuf.magic == MMAL_MAGIC) {
-+		pr_err("%s: MMAL_MSG_TYPE_BUFFER_TO_HOST with bad magic\n",
-+		       __func__);
-+		return;
-+	}
-+
-+	switch (msg->u.event_to_host.port_type) {
-+	case MMAL_PORT_TYPE_CONTROL:
-+		if (port_num) {
-+			pr_err("%s: port_num of %u >= number of ports 1",
-+			       __func__, port_num);
-+			return;
-+		}
-+		port = &component->control;
-+		break;
-+	case MMAL_PORT_TYPE_INPUT:
-+		if (port_num >= component->inputs) {
-+			pr_err("%s: port_num of %u >= number of ports %u",
-+			       __func__, port_num,
-+			       port_num >= component->inputs);
-+			return;
-+		}
-+		port = &component->input[port_num];
-+		break;
-+	case MMAL_PORT_TYPE_OUTPUT:
-+		if (port_num >= component->outputs) {
-+			pr_err("%s: port_num of %u >= number of ports %u",
-+			       __func__, port_num,
-+			       port_num >= component->outputs);
-+			return;
-+		}
-+		port = &component->output[port_num];
-+		break;
-+	case MMAL_PORT_TYPE_CLOCK:
-+		if (port_num >= component->clocks) {
-+			pr_err("%s: port_num of %u >= number of ports %u",
-+			       __func__, port_num,
-+			       port_num >= component->clocks);
-+			return;
-+		}
-+		port = &component->clock[port_num];
-+		break;
-+	default:
-+		break;
-+	}
-+
-+	if (!mutex_trylock(&port->event_context_mutex)) {
-+		pr_err("dropping event 0x%x\n", msg->u.event_to_host.cmd);
-+		return;
-+	}
-+	msg_context = port->event_context;
-+
-+	if (msg->h.status != MMAL_MSG_STATUS_SUCCESS) {
-+		/* message reception had an error */
-+		//pr_warn
-+		pr_err("%s: error %d in reply\n", __func__, msg->h.status);
-+
-+		msg_context->u.bulk.status = msg->h.status;
-+	} else if (msg->u.event_to_host.length > MMAL_WORKER_EVENT_SPACE) {
-+		/* data is not in message, queue a bulk receive */
-+		pr_err("%s: payload not in message - bulk receive??! NOT SUPPORTED\n",
-+		       __func__);
-+		msg_context->u.bulk.status = -1;
-+	} else {
-+		memcpy(msg_context->u.bulk.buffer->buffer,
-+		       msg->u.event_to_host.data,
-+		       msg->u.event_to_host.length);
-+
-+		msg_context->u.bulk.buffer_used =
-+		    msg->u.event_to_host.length;
-+
-+		msg_context->u.bulk.mmal_flags = 0;
-+		msg_context->u.bulk.dts = MMAL_TIME_UNKNOWN;
-+		msg_context->u.bulk.pts = MMAL_TIME_UNKNOWN;
-+		msg_context->u.bulk.cmd = msg->u.event_to_host.cmd;
-+
-+		pr_debug("event component:%u port type:%d num:%d cmd:0x%x length:%d\n",
-+			 msg->u.event_to_host.client_component,
-+			 msg->u.event_to_host.port_type,
-+			 msg->u.event_to_host.port_num,
-+			 msg->u.event_to_host.cmd, msg->u.event_to_host.length);
-+	}
-+
-+	schedule_work(&msg_context->u.bulk.work);
-+}
-+
- /* deals with receipt of buffer to host message */
- static void buffer_to_host_cb(struct vchiq_mmal_instance *instance,
- 			      struct mmal_msg *msg, u32 msg_len)
-@@ -1331,6 +1424,7 @@ static int port_disable(struct vchiq_mma
- 				mmalbuf->mmal_flags = 0;
- 				mmalbuf->dts = MMAL_TIME_UNKNOWN;
- 				mmalbuf->pts = MMAL_TIME_UNKNOWN;
-+				mmalbuf->cmd = 0;
- 				port->buffer_cb(instance,
- 						port, 0, mmalbuf);
- 			}
-@@ -1632,6 +1726,43 @@ int mmal_vchi_buffer_cleanup(struct mmal
- }
- EXPORT_SYMBOL_GPL(mmal_vchi_buffer_cleanup);
- 
-+static void init_event_context(struct vchiq_mmal_instance *instance,
-+			       struct vchiq_mmal_port *port)
-+{
-+	struct mmal_msg_context *ctx = get_msg_context(instance);
-+
-+	mutex_init(&port->event_context_mutex);
-+
-+	port->event_context = ctx;
-+	ctx->u.bulk.instance = instance;
-+	ctx->u.bulk.port = port;
-+	ctx->u.bulk.buffer =
-+		kzalloc(sizeof(*ctx->u.bulk.buffer), GFP_KERNEL);
-+	if (!ctx->u.bulk.buffer)
-+		goto release_msg_context;
-+	ctx->u.bulk.buffer->buffer = kzalloc(MMAL_WORKER_EVENT_SPACE,
-+					     GFP_KERNEL);
-+	if (!ctx->u.bulk.buffer->buffer)
-+		goto release_buffer;
-+
-+	INIT_WORK(&ctx->u.bulk.work, buffer_work_cb);
-+	return;
-+
-+release_buffer:
-+	kfree(ctx->u.bulk.buffer);
-+release_msg_context:
-+	release_msg_context(ctx);
-+}
-+
-+static void free_event_context(struct vchiq_mmal_port *port)
-+{
-+	struct mmal_msg_context *ctx = port->event_context;
-+
-+	kfree(ctx->u.bulk.buffer->buffer);
-+	kfree(ctx->u.bulk.buffer);
-+	release_msg_context(ctx);
-+}
-+
- /* Initialise a mmal component and its ports
-  *
-  */
-@@ -1681,6 +1812,7 @@ int vchiq_mmal_component_init(struct vch
- 	ret = port_info_get(instance, &component->control);
- 	if (ret < 0)
- 		goto release_component;
-+	init_event_context(instance, &component->control);
- 
- 	for (idx = 0; idx < component->inputs; idx++) {
- 		component->input[idx].type = MMAL_PORT_TYPE_INPUT;
-@@ -1691,6 +1823,7 @@ int vchiq_mmal_component_init(struct vch
- 		ret = port_info_get(instance, &component->input[idx]);
- 		if (ret < 0)
- 			goto release_component;
-+		init_event_context(instance, &component->input[idx]);
- 	}
- 
- 	for (idx = 0; idx < component->outputs; idx++) {
-@@ -1702,6 +1835,7 @@ int vchiq_mmal_component_init(struct vch
- 		ret = port_info_get(instance, &component->output[idx]);
- 		if (ret < 0)
- 			goto release_component;
-+		init_event_context(instance, &component->output[idx]);
- 	}
- 
- 	for (idx = 0; idx < component->clocks; idx++) {
-@@ -1713,6 +1847,7 @@ int vchiq_mmal_component_init(struct vch
- 		ret = port_info_get(instance, &component->clock[idx]);
- 		if (ret < 0)
- 			goto release_component;
-+		init_event_context(instance, &component->clock[idx]);
- 	}
- 
- 	*component_out = component;
-@@ -1738,7 +1873,7 @@ EXPORT_SYMBOL_GPL(vchiq_mmal_component_i
- int vchiq_mmal_component_finalise(struct vchiq_mmal_instance *instance,
- 				  struct vchiq_mmal_component *component)
- {
--	int ret;
-+	int ret, idx;
- 
- 	if (mutex_lock_interruptible(&instance->vchiq_mutex))
- 		return -EINTR;
-@@ -1750,6 +1885,13 @@ int vchiq_mmal_component_finalise(struct
- 
- 	component->in_use = 0;
- 
-+	for (idx = 0; idx < component->inputs; idx++)
-+		free_event_context(&component->input[idx]);
-+	for (idx = 0; idx < component->outputs; idx++)
-+		free_event_context(&component->output[idx]);
-+	for (idx = 0; idx < component->clocks; idx++)
-+		free_event_context(&component->clock[idx]);
-+
- 	mutex_unlock(&instance->vchiq_mutex);
- 
- 	return ret;
---- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
-+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
-@@ -79,6 +79,10 @@ struct vchiq_mmal_port {
- 	vchiq_mmal_buffer_cb buffer_cb;
- 	/* callback context */
- 	void *cb_ctx;
-+
-+	/* ensure serialised use of the one event context structure */
-+	struct mutex event_context_mutex;
-+	struct mmal_msg_context *event_context;
- };
- 
- struct vchiq_mmal_component {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0167-staging-vc04_services-Support-sending-data-to-MMAL-p.patch b/target/linux/bcm27xx/patches-6.1/950-0167-staging-vc04_services-Support-sending-data-to-MMAL-p.patch
deleted file mode 100644
index f8de496461..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0167-staging-vc04_services-Support-sending-data-to-MMAL-p.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From c2f4b644a80609291b88623dd6f9cbea144cc04f Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Mon, 24 Sep 2018 18:26:02 +0100
-Subject: [PATCH] staging: vc04_services: Support sending data to MMAL
- ports
-
-Add the ability to send data to ports. This only supports
-zero copy mode as the required bulk transfer setup calls
-are not done.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- .../vc04_services/vchiq-mmal/mmal-vchiq.c      | 18 +++++++++++++-----
- 1 file changed, 13 insertions(+), 5 deletions(-)
-
---- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-@@ -419,11 +419,19 @@ buffer_from_host(struct vchiq_mmal_insta
- 	m.u.buffer_from_host.buffer_header.data =
- 		(u32)(unsigned long)buf->buffer;
- 	m.u.buffer_from_host.buffer_header.alloc_size = buf->buffer_size;
--	m.u.buffer_from_host.buffer_header.length = 0;	/* nothing used yet */
--	m.u.buffer_from_host.buffer_header.offset = 0;	/* no offset */
--	m.u.buffer_from_host.buffer_header.flags = 0;	/* no flags */
--	m.u.buffer_from_host.buffer_header.pts = MMAL_TIME_UNKNOWN;
--	m.u.buffer_from_host.buffer_header.dts = MMAL_TIME_UNKNOWN;
-+	if (port->type == MMAL_PORT_TYPE_OUTPUT) {
-+		m.u.buffer_from_host.buffer_header.length = 0;
-+		m.u.buffer_from_host.buffer_header.offset = 0;
-+		m.u.buffer_from_host.buffer_header.flags = 0;
-+		m.u.buffer_from_host.buffer_header.pts = MMAL_TIME_UNKNOWN;
-+		m.u.buffer_from_host.buffer_header.dts = MMAL_TIME_UNKNOWN;
-+	} else {
-+		m.u.buffer_from_host.buffer_header.length = buf->length;
-+		m.u.buffer_from_host.buffer_header.offset = 0;
-+		m.u.buffer_from_host.buffer_header.flags = buf->mmal_flags;
-+		m.u.buffer_from_host.buffer_header.pts = buf->pts;
-+		m.u.buffer_from_host.buffer_header.dts = buf->dts;
-+	}
- 
- 	/* clear buffer type specific data */
- 	memset(&m.u.buffer_from_host.buffer_header_type_specific, 0,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0168-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch b/target/linux/bcm27xx/patches-6.1/950-0168-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch
deleted file mode 100644
index 88bc3311d7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0168-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From c0d0da9ddae434d913a617c643434a33424002c2 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Mon, 29 Oct 2018 17:57:45 +0000
-Subject: [PATCH] media: videobuf2: Allow exporting of a struct dmabuf
-
-videobuf2 only allowed exporting a dmabuf as a file descriptor,
-but there are instances where having the struct dma_buf is
-useful within the kernel.
-
-Split the current implementation into two, one step which
-exports a struct dma_buf, and the second which converts that
-into an fd.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- .../media/common/videobuf2/videobuf2-core.c   | 21 ++++++++++++++++---
- include/media/videobuf2-core.h                | 15 +++++++++++++
- 2 files changed, 33 insertions(+), 3 deletions(-)
-
---- a/drivers/media/common/videobuf2/videobuf2-core.c
-+++ b/drivers/media/common/videobuf2/videobuf2-core.c
-@@ -2235,12 +2235,12 @@ static int __find_plane_by_offset(struct
- 	return -EINVAL;
- }
- 
--int vb2_core_expbuf(struct vb2_queue *q, int *fd, unsigned int type,
--		unsigned int index, unsigned int plane, unsigned int flags)
-+int vb2_core_expbuf_dmabuf(struct vb2_queue *q, unsigned int type,
-+			   unsigned int index, unsigned int plane,
-+			   unsigned int flags, struct dma_buf **dmabuf)
- {
- 	struct vb2_buffer *vb = NULL;
- 	struct vb2_plane *vb_plane;
--	int ret;
- 	struct dma_buf *dbuf;
- 
- 	if (q->memory != VB2_MEMORY_MMAP) {
-@@ -2292,6 +2292,21 @@ int vb2_core_expbuf(struct vb2_queue *q,
- 		return -EINVAL;
- 	}
- 
-+	*dmabuf = dbuf;
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(vb2_core_expbuf_dmabuf);
-+
-+int vb2_core_expbuf(struct vb2_queue *q, int *fd, unsigned int type,
-+		    unsigned int index, unsigned int plane, unsigned int flags)
-+{
-+	struct dma_buf *dbuf;
-+	int ret;
-+
-+	ret = vb2_core_expbuf_dmabuf(q, type, index, plane, flags, &dbuf);
-+	if (ret)
-+		return ret;
-+
- 	ret = dma_buf_fd(dbuf, flags & ~O_ACCMODE);
- 	if (ret < 0) {
- 		dprintk(q, 3, "buffer %d, plane %d failed to export (%d)\n",
---- a/include/media/videobuf2-core.h
-+++ b/include/media/videobuf2-core.h
-@@ -912,6 +912,21 @@ int vb2_core_streamon(struct vb2_queue *
- int vb2_core_streamoff(struct vb2_queue *q, unsigned int type);
- 
- /**
-+ * vb2_core_expbuf_dmabuf() - Export a buffer as a dma_buf structure
-+ * @q:         videobuf2 queue
-+ * @type:      buffer type
-+ * @index:     id number of the buffer
-+ * @plane:     index of the plane to be exported, 0 for single plane queues
-+ * @flags:     flags for newly created file, currently only O_CLOEXEC is
-+ *             supported, refer to manual of open syscall for more details
-+ * @dmabuf:    Returns the dmabuf pointer
-+ *
-+ */
-+int vb2_core_expbuf_dmabuf(struct vb2_queue *q, unsigned int type,
-+			   unsigned int index, unsigned int plane,
-+			   unsigned int flags, struct dma_buf **dmabuf);
-+
-+/**
-  * vb2_core_expbuf() - Export a buffer as a file descriptor.
-  * @q:		pointer to &struct vb2_queue with videobuf2 queue.
-  * @fd:		pointer to the file descriptor associated with DMABUF
diff --git a/target/linux/bcm27xx/patches-6.1/950-0169-staging-mmal-vchiq-Fix-client_component-for-64-bit-k.patch b/target/linux/bcm27xx/patches-6.1/950-0169-staging-mmal-vchiq-Fix-client_component-for-64-bit-k.patch
deleted file mode 100644
index f6cea719f1..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0169-staging-mmal-vchiq-Fix-client_component-for-64-bit-k.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 8ab562e10d304fb88a56a748d081dbf8fb07c528 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Tue, 22 Jan 2019 12:04:09 +0000
-Subject: [PATCH] staging: mmal-vchiq: Fix client_component for 64 bit
- kernel
-
-The MMAL client_component field is used with the event
-mechanism to allow the client to identify the component for
-which the event is generated.
-The field is only 32bits in size, therefore we can't use a
-pointer to the component in a 64 bit kernel.
-
-Component handles are already held in an array per VCHI
-instance, so use the array index as the client_component handle
-to avoid having to create a new IDR for this purpose.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-@@ -457,9 +457,9 @@ buffer_from_host(struct vchiq_mmal_insta
- static void event_to_host_cb(struct vchiq_mmal_instance *instance,
- 			     struct mmal_msg *msg, u32 msg_len)
- {
--	/* FIXME: Not going to work on 64 bit */
-+	int comp_idx = msg->u.event_to_host.client_component;
- 	struct vchiq_mmal_component *component =
--		(struct vchiq_mmal_component *)msg->u.event_to_host.client_component;
-+					&instance->component[comp_idx];
- 	struct vchiq_mmal_port *port = NULL;
- 	struct mmal_msg_context *msg_context;
- 	u32 port_num = msg->u.event_to_host.port_num;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0170-staging-mmal_vchiq-Add-in-the-Bayer-encoding-formats.patch b/target/linux/bcm27xx/patches-6.1/950-0170-staging-mmal_vchiq-Add-in-the-Bayer-encoding-formats.patch
deleted file mode 100644
index db68c54111..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0170-staging-mmal_vchiq-Add-in-the-Bayer-encoding-formats.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 0274e5c9aa788d3f7b38e6f6424ae7f74e2d0cfc Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Wed, 13 Feb 2019 12:33:29 +0000
-Subject: [PATCH] staging: mmal_vchiq: Add in the Bayer encoding
- formats
-
-The list of formats was copied before Bayer support was added.
-The ISP supports Bayer and is being supported by the bcm2835_codec
-driver, so add in the encodings for them.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- .../vc04_services/vchiq-mmal/mmal-encodings.h | 27 +++++++++++++++++++
- 1 file changed, 27 insertions(+)
-
---- a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
-+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
-@@ -69,6 +69,33 @@
-  */
- #define MMAL_ENCODING_OPAQUE           MMAL_FOURCC('O', 'P', 'Q', 'V')
- 
-+/* Bayer formats
-+ * FourCC values copied from V4L2 where defined.
-+ */
-+/* 8 bit per pixel Bayer formats. */
-+#define MMAL_ENCODING_BAYER_SBGGR8     MMAL_FOURCC('B', 'A', '8', '1')
-+#define MMAL_ENCODING_BAYER_SGBRG8     MMAL_FOURCC('G', 'B', 'R', 'G')
-+#define MMAL_ENCODING_BAYER_SGRBG8     MMAL_FOURCC('G', 'R', 'B', 'G')
-+#define MMAL_ENCODING_BAYER_SRGGB8     MMAL_FOURCC('R', 'G', 'G', 'B')
-+
-+/* 10 bit per pixel packed Bayer formats. */
-+#define MMAL_ENCODING_BAYER_SBGGR10P   MMAL_FOURCC('p', 'B', 'A', 'A')
-+#define MMAL_ENCODING_BAYER_SGRBG10P   MMAL_FOURCC('p', 'g', 'A', 'A')
-+#define MMAL_ENCODING_BAYER_SGBRG10P   MMAL_FOURCC('p', 'G', 'A', 'A')
-+#define MMAL_ENCODING_BAYER_SRGGB10P   MMAL_FOURCC('p', 'R', 'A', 'A')
-+
-+/* 12 bit per pixel packed Bayer formats. */
-+#define MMAL_ENCODING_BAYER_SBGGR12P   MMAL_FOURCC('p', 'B', '1', '2')
-+#define MMAL_ENCODING_BAYER_SGRBG12P   MMAL_FOURCC('p', 'g', '1', '2')
-+#define MMAL_ENCODING_BAYER_SGBRG12P   MMAL_FOURCC('p', 'G', '1', '2')
-+#define MMAL_ENCODING_BAYER_SRGGB12P   MMAL_FOURCC('p', 'R', '1', '2')
-+
-+/* 16 bit per pixel Bayer formats. */
-+#define MMAL_ENCODING_BAYER_SBGGR16    MMAL_FOURCC('B', 'G', '1', '6')
-+#define MMAL_ENCODING_BAYER_SGBRG16    MMAL_FOURCC('G', 'B', '1', '6')
-+#define MMAL_ENCODING_BAYER_SGRBG16    MMAL_FOURCC('G', 'R', '1', '6')
-+#define MMAL_ENCODING_BAYER_SRGGB16    MMAL_FOURCC('R', 'G', '1', '6')
-+
- /** An EGL image handle
-  */
- #define MMAL_ENCODING_EGL_IMAGE        MMAL_FOURCC('E', 'G', 'L', 'I')
diff --git a/target/linux/bcm27xx/patches-6.1/950-0171-staging-mmal-vchiq-Update-mmal_parameters.h-with-rec.patch b/target/linux/bcm27xx/patches-6.1/950-0171-staging-mmal-vchiq-Update-mmal_parameters.h-with-rec.patch
deleted file mode 100644
index 1d35dfef68..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0171-staging-mmal-vchiq-Update-mmal_parameters.h-with-rec.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 767d43808d7fdf21896de50b38216d8884ca9f35 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Mon, 18 Feb 2019 15:52:29 +0000
-Subject: [PATCH] staging: mmal-vchiq: Update mmal_parameters.h with
- recently defined params
-
-mmal_parameters.h hasn't been updated to reflect additions made
-over the last few years. Update it to reflect the currently
-supported parameters.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- .../vchiq-mmal/mmal-parameters.h              | 32 ++++++++++++++++++-
- 1 file changed, 31 insertions(+), 1 deletion(-)
-
---- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
-+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
-@@ -577,7 +577,37 @@ enum mmal_parameter_video_type {
- 	MMAL_PARAMETER_VIDEO_ENCODE_H264_LOW_DELAY_HRD_FLAG,
- 
- 	/**< @ref MMAL_PARAMETER_BOOLEAN_T */
--	MMAL_PARAMETER_VIDEO_ENCODE_INLINE_HEADER
-+	MMAL_PARAMETER_VIDEO_ENCODE_INLINE_HEADER,
-+
-+	/**< Take a @ref MMAL_PARAMETER_BOOLEAN_T. */
-+	MMAL_PARAMETER_VIDEO_ENCODE_SEI_ENABLE,
-+
-+	/**< Take a @ref MMAL_PARAMETER_BOOLEAN_T. */
-+	MMAL_PARAMETER_VIDEO_ENCODE_INLINE_VECTORS,
-+
-+	/**< Take a @ref MMAL_PARAMETER_VIDEO_RENDER_STATS_T. */
-+	MMAL_PARAMETER_VIDEO_RENDER_STATS,
-+
-+	/**< Take a @ref MMAL_PARAMETER_VIDEO_INTERLACE_TYPE_T. */
-+	MMAL_PARAMETER_VIDEO_INTERLACE_TYPE,
-+
-+	/**< Takes a @ref MMAL_PARAMETER_BOOLEAN_T */
-+	MMAL_PARAMETER_VIDEO_INTERPOLATE_TIMESTAMPS,
-+
-+	/**< Takes a @ref MMAL_PARAMETER_BOOLEAN_T */
-+	MMAL_PARAMETER_VIDEO_ENCODE_SPS_TIMING,
-+
-+	/**< Takes a @ref MMAL_PARAMETER_UINT32_T */
-+	MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS,
-+
-+	/**< Takes a @ref MMAL_PARAMETER_SOURCE_PATTERN_T */
-+	MMAL_PARAMETER_VIDEO_SOURCE_PATTERN,
-+
-+	/**< Takes a @ref MMAL_PARAMETER_BOOLEAN_T */
-+	MMAL_PARAMETER_VIDEO_ENCODE_SEPARATE_NAL_BUFS,
-+
-+	/**< Takes a @ref MMAL_PARAMETER_UINT32_T */
-+	MMAL_PARAMETER_VIDEO_DROPPABLE_PFRAME_LENGTH,
- };
- 
- /** Valid mirror modes */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0172-staging-mmal-vchiq-Free-the-event-context-for-contro.patch b/target/linux/bcm27xx/patches-6.1/950-0172-staging-mmal-vchiq-Free-the-event-context-for-contro.patch
deleted file mode 100644
index 8625928562..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0172-staging-mmal-vchiq-Free-the-event-context-for-contro.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 65903c4bd59e980da1a54422b1aa2387a7a8e802 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Wed, 1 May 2019 13:27:23 +0100
-Subject: [PATCH] staging: mmal-vchiq: Free the event context for
- control ports
-
-vchiq_mmal_component_init calls init_event_context for the
-control port, but vchiq_mmal_component_finalise didn't free
-it, causing a memory leak..
-
-Add the free call.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-@@ -1900,6 +1900,8 @@ int vchiq_mmal_component_finalise(struct
- 	for (idx = 0; idx < component->clocks; idx++)
- 		free_event_context(&component->clock[idx]);
- 
-+	free_event_context(&component->control);
-+
- 	mutex_unlock(&instance->vchiq_mutex);
- 
- 	return ret;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0173-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch b/target/linux/bcm27xx/patches-6.1/950-0173-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch
deleted file mode 100644
index c14f6c0801..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0173-staging-mmal-vchiq-Fix-memory-leak-in-error-path.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 36fa884a872037d03ea7449922665f16056ae94d Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Thu, 2 May 2019 15:50:01 +0100
-Subject: [PATCH] staging: mmal-vchiq: Fix memory leak in error path
-
-On error, vchiq_mmal_component_init could leave the
-event context allocated for ports.
-Clean them up in the error path.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- .../vc04_services/vchiq-mmal/mmal-vchiq.c     | 29 +++++++++++++------
- 1 file changed, 20 insertions(+), 9 deletions(-)
-
---- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-@@ -1766,9 +1766,26 @@ static void free_event_context(struct vc
- {
- 	struct mmal_msg_context *ctx = port->event_context;
- 
-+	if (!ctx)
-+		return;
-+
- 	kfree(ctx->u.bulk.buffer->buffer);
- 	kfree(ctx->u.bulk.buffer);
- 	release_msg_context(ctx);
-+	port->event_context = NULL;
-+}
-+
-+static void release_all_event_contexts(struct vchiq_mmal_component *component)
-+{
-+	int idx;
-+
-+	for (idx = 0; idx < component->inputs; idx++)
-+		free_event_context(&component->input[idx]);
-+	for (idx = 0; idx < component->outputs; idx++)
-+		free_event_context(&component->output[idx]);
-+	for (idx = 0; idx < component->clocks; idx++)
-+		free_event_context(&component->clock[idx]);
-+	free_event_context(&component->control);
- }
- 
- /* Initialise a mmal component and its ports
-@@ -1866,6 +1883,7 @@ int vchiq_mmal_component_init(struct vch
- 
- release_component:
- 	destroy_component(instance, component);
-+	release_all_event_contexts(component);
- unlock:
- 	if (component)
- 		component->in_use = 0;
-@@ -1881,7 +1899,7 @@ EXPORT_SYMBOL_GPL(vchiq_mmal_component_i
- int vchiq_mmal_component_finalise(struct vchiq_mmal_instance *instance,
- 				  struct vchiq_mmal_component *component)
- {
--	int ret, idx;
-+	int ret;
- 
- 	if (mutex_lock_interruptible(&instance->vchiq_mutex))
- 		return -EINTR;
-@@ -1893,14 +1911,7 @@ int vchiq_mmal_component_finalise(struct
- 
- 	component->in_use = 0;
- 
--	for (idx = 0; idx < component->inputs; idx++)
--		free_event_context(&component->input[idx]);
--	for (idx = 0; idx < component->outputs; idx++)
--		free_event_context(&component->output[idx]);
--	for (idx = 0; idx < component->clocks; idx++)
--		free_event_context(&component->clock[idx]);
--
--	free_event_context(&component->control);
-+	release_all_event_contexts(component);
- 
- 	mutex_unlock(&instance->vchiq_mutex);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0174-w1-w1-gpio-Make-GPIO-an-output-for-strong-pullup.patch b/target/linux/bcm27xx/patches-6.1/950-0174-w1-w1-gpio-Make-GPIO-an-output-for-strong-pullup.patch
deleted file mode 100644
index e45b1830df..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0174-w1-w1-gpio-Make-GPIO-an-output-for-strong-pullup.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f9d94295b64a50f3268dcf6b32e45f8b899f806e Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Wed, 12 Jun 2019 17:15:05 +0100
-Subject: [PATCH] w1: w1-gpio: Make GPIO an output for strong pullup
-
-The logic to drive the data line high to implement a strong pullup
-assumed that the pin was already an output - setting a value does
-not change an input.
-
-See: https://github.com/raspberrypi/firmware/issues/1143
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- drivers/w1/masters/w1-gpio.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/w1/masters/w1-gpio.c
-+++ b/drivers/w1/masters/w1-gpio.c
-@@ -30,7 +30,7 @@ static u8 w1_gpio_set_pullup(void *data,
- 			 * This will OVERRIDE open drain emulation and force-pull
- 			 * the line high for some time.
- 			 */
--			gpiod_set_raw_value(pdata->gpiod, 1);
-+			gpiod_direction_output_raw(pdata->gpiod, 1);
- 			msleep(pdata->pullup_duration);
- 			/*
- 			 * This will simply set the line as input since we are doing
diff --git a/target/linux/bcm27xx/patches-6.1/950-0175-arm-bcm2835-Fix-FIQ-early-ioremap.patch b/target/linux/bcm27xx/patches-6.1/950-0175-arm-bcm2835-Fix-FIQ-early-ioremap.patch
deleted file mode 100644
index 0cbbbd5328..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0175-arm-bcm2835-Fix-FIQ-early-ioremap.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 72d80a2d3fff7bfdab235a67b3a6e154505d789f Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Wed, 20 Feb 2019 08:49:39 +0000
-Subject: [PATCH] arm: bcm2835: Fix FIQ early ioremap
-
-The ioremapping creates mappings within the vmalloc area. The
-equivalent early function, create_mapping, now checks that the
-requested explicit virtual address is between VMALLOC_START and
-VMALLOC_END. As there is no reason to have any correlation between
-the physical and virtual addresses, put the required mappings at
-VMALLOC_START and above.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- arch/arm/mach-bcm/board_bcm2835.c | 21 +++++++++++++++------
- 1 file changed, 15 insertions(+), 6 deletions(-)
-
---- a/arch/arm/mach-bcm/board_bcm2835.c
-+++ b/arch/arm/mach-bcm/board_bcm2835.c
-@@ -5,17 +5,20 @@
- 
- #include <linux/init.h>
- #include <linux/irqchip.h>
-+#include <linux/mm.h>
- #include <linux/of_address.h>
- #include <linux/of_fdt.h>
- #include <asm/system_info.h>
- 
- #include <asm/mach/arch.h>
- #include <asm/mach/map.h>
-+#include <asm/memory.h>
-+#include <asm/pgtable.h>
- 
- #include "platsmp.h"
- 
--#define BCM2835_USB_VIRT_BASE   0xf0980000
--#define BCM2835_USB_VIRT_MPHI   0xf0006000
-+#define BCM2835_USB_VIRT_BASE   (VMALLOC_START)
-+#define BCM2835_USB_VIRT_MPHI   (VMALLOC_START + 0x10000)
- 
- static void __init bcm2835_init(void)
- {
-@@ -74,20 +77,26 @@ static int __init bcm2835_map_usb(unsign
- 
- static void __init bcm2835_map_io(void)
- {
--	const __be32 *ranges;
-+	const __be32 *ranges, *address_cells;
-+	unsigned long root, addr_cells;
- 	int soc, len;
- 	unsigned long p2b_offset;
- 
- 	debug_ll_io_init();
- 
-+	root = of_get_flat_dt_root();
- 	/* Find out how to map bus to physical address first from soc/ranges */
--	soc = of_get_flat_dt_subnode_by_name(of_get_flat_dt_root(), "soc");
-+	soc = of_get_flat_dt_subnode_by_name(root, "soc");
- 	if (soc < 0)
- 		return;
-+	address_cells = of_get_flat_dt_prop(root, "#address-cells", &len);
-+	if (!address_cells || len < (sizeof(unsigned long)))
-+		return;
-+	addr_cells = be32_to_cpu(address_cells[0]);
- 	ranges = of_get_flat_dt_prop(soc, "ranges", &len);
--	if (!ranges || len < (sizeof(unsigned long) * 3))
-+	if (!ranges || len < (sizeof(unsigned long) * (2 + addr_cells)))
- 		return;
--	p2b_offset = be32_to_cpu(ranges[0]) - be32_to_cpu(ranges[1]);
-+	p2b_offset = be32_to_cpu(ranges[0]) - be32_to_cpu(ranges[addr_cells]);
- 
- 	/* Now search for bcm2708-usb node in device tree */
- 	of_scan_flat_dt(bcm2835_map_usb, &p2b_offset);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0176-arm-bcm2835-DMA-can-only-address-1GB.patch b/target/linux/bcm27xx/patches-6.1/950-0176-arm-bcm2835-DMA-can-only-address-1GB.patch
deleted file mode 100644
index 593b9a6205..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0176-arm-bcm2835-DMA-can-only-address-1GB.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e1b03f05a0c6ab0ab1d166851cd835a5715a0cbc Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Wed, 29 May 2019 15:47:42 +0100
-Subject: [PATCH] arm: bcm2835: DMA can only address 1GB
-
-The legacy peripherals can only address the first gigabyte of RAM, so
-ensure that DMA allocations are restricted to that region.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- arch/arm/mach-bcm/board_bcm2835.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/arch/arm/mach-bcm/board_bcm2835.c
-+++ b/arch/arm/mach-bcm/board_bcm2835.c
-@@ -114,6 +114,9 @@ static const char * const bcm2835_compat
- };
- 
- DT_MACHINE_START(BCM2835, "BCM2835")
-+#if defined(CONFIG_ZONE_DMA) && defined(CONFIG_ARM_LPAE)
-+	.dma_zone_size	= SZ_1G,
-+#endif
- 	.map_io = bcm2835_map_io,
- 	.init_machine = bcm2835_init,
- 	.dt_compat = bcm2835_compat,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0178-bcmgenet-constrain-max-DMA-burst-length.patch b/target/linux/bcm27xx/patches-6.1/950-0178-bcmgenet-constrain-max-DMA-burst-length.patch
deleted file mode 100644
index a31c73ca06..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0178-bcmgenet-constrain-max-DMA-burst-length.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 0c8e8bcb652acd3ddafda7f77564c5eb19ff0ccc Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.org>
-Date: Wed, 12 Sep 2018 14:44:53 +0100
-Subject: [PATCH] bcmgenet: constrain max DMA burst length
-
----
- drivers/net/ethernet/broadcom/genet/bcmgenet.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/net/ethernet/broadcom/genet/bcmgenet.h
-+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.h
-@@ -31,7 +31,7 @@
- #define ENET_PAD		8
- #define ENET_MAX_MTU_SIZE	(ETH_DATA_LEN + ETH_HLEN + VLAN_HLEN + \
- 				 ENET_BRCM_TAG_LEN + ETH_FCS_LEN + ENET_PAD)
--#define DMA_MAX_BURST_LENGTH    0x10
-+#define DMA_MAX_BURST_LENGTH    0x08
- 
- /* misc. configuration */
- #define MAX_NUM_OF_FS_RULES		16
diff --git a/target/linux/bcm27xx/patches-6.1/950-0179-bcmgenet-Better-coalescing-parameter-defaults.patch b/target/linux/bcm27xx/patches-6.1/950-0179-bcmgenet-Better-coalescing-parameter-defaults.patch
deleted file mode 100644
index 41c6199005..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0179-bcmgenet-Better-coalescing-parameter-defaults.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 8673f9820e4fad1c54f9e46f6a275170544c1963 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Wed, 27 Mar 2019 13:45:46 +0000
-Subject: [PATCH] bcmgenet: Better coalescing parameter defaults
-
-Set defaults for TX and RX packet coalescing to be equivalent to:
-
-  # ethtool -C eth0 tx-frames 10
-  # ethtool -C eth0 rx-usecs 50
-
-This may be something we want to set via DT parameters in the
-future.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
---- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
-+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
-@@ -2665,7 +2665,7 @@ static void bcmgenet_init_tx_ring(struct
- 
- 	bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_PROD_INDEX);
- 	bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_CONS_INDEX);
--	bcmgenet_tdma_ring_writel(priv, index, 1, DMA_MBUF_DONE_THRESH);
-+	bcmgenet_tdma_ring_writel(priv, index, 10, DMA_MBUF_DONE_THRESH);
- 	/* Disable rate control for now */
- 	bcmgenet_tdma_ring_writel(priv, index, flow_period_val,
- 				  TDMA_FLOW_PERIOD);
-@@ -4160,9 +4160,12 @@ static int bcmgenet_probe(struct platfor
- 	netif_set_real_num_rx_queues(priv->dev, priv->hw_params->rx_queues + 1);
- 
- 	/* Set default coalescing parameters */
--	for (i = 0; i < priv->hw_params->rx_queues; i++)
-+	for (i = 0; i < priv->hw_params->rx_queues; i++) {
- 		priv->rx_rings[i].rx_max_coalesced_frames = 1;
-+		priv->rx_rings[i].rx_coalesce_usecs = 50;
-+	}
- 	priv->rx_rings[DESC_INDEX].rx_max_coalesced_frames = 1;
-+	priv->rx_rings[DESC_INDEX].rx_coalesce_usecs = 50;
- 
- 	/* libphy will determine the link state */
- 	netif_carrier_off(dev);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0180-net-genet-enable-link-energy-detect-powerdown-for-ex.patch b/target/linux/bcm27xx/patches-6.1/950-0180-net-genet-enable-link-energy-detect-powerdown-for-ex.patch
deleted file mode 100644
index 44d8613b5e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0180-net-genet-enable-link-energy-detect-powerdown-for-ex.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5a4c1a747f378723154f2c0cc563aaff3d4d43f8 Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.org>
-Date: Tue, 14 May 2019 17:17:59 +0100
-Subject: [PATCH] net: genet: enable link energy detect powerdown for
- external PHYs
-
-There are several warts surrounding bcmgenet_mii_probe() as this
-function is called from ndo_open, but it's calling registration-type
-functions. The probe should be called at probe time and refactored
-such that the PHY device data can be extracted to limit the scope
-of this flag to Broadcom PHYs.
-
-For now, pass this flag in as it puts our attached PHY into a low-power
-state when disconnected.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
----
- drivers/net/ethernet/broadcom/genet/bcmmii.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/net/ethernet/broadcom/genet/bcmmii.c
-+++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c
-@@ -309,6 +309,8 @@ int bcmgenet_mii_probe(struct net_device
- 	/* Communicate the integrated PHY revision */
- 	if (priv->internal_phy)
- 		phy_flags = priv->gphy_rev;
-+	else
-+		phy_flags = PHY_BRCM_AUTO_PWRDWN_ENABLE;
- 
- 	/* This is an ugly quirk but we have not been correctly interpreting
- 	 * the phy_interface values and we have done that across different
diff --git a/target/linux/bcm27xx/patches-6.1/950-0181-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch b/target/linux/bcm27xx/patches-6.1/950-0181-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch
deleted file mode 100644
index 3feabeaf9d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0181-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 7492e29b5535ca9694e45d6ca600a35169b690ec Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.org>
-Date: Tue, 11 Jun 2019 10:55:00 +0100
-Subject: [PATCH] usb: add plumbing for updating interrupt endpoint
- interval state
-
-xHCI caches device and endpoint data after the interface is configured,
-so an explicit command needs to be issued for any device driver wanting
-to alter the polling interval of an endpoint.
-
-Add usb_fixup_endpoint() to allow drivers to do this. The fixup must be
-called after calculating endpoint bandwidth requirements but before any
-URBs are submitted.
-
-If polling intervals are shortened, any bandwidth reservations are no
-longer valid but in practice polling intervals are only ever relaxed.
-
-Limit the scope to interrupt transfers for now.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
----
- drivers/usb/core/hcd.c     | 10 ++++++++++
- drivers/usb/core/message.c | 15 +++++++++++++++
- include/linux/usb.h        |  2 ++
- include/linux/usb/hcd.h    |  7 +++++++
- 4 files changed, 34 insertions(+)
-
---- a/drivers/usb/core/hcd.c
-+++ b/drivers/usb/core/hcd.c
-@@ -1977,6 +1977,16 @@ reset:
- 	return ret;
- }
- 
-+void usb_hcd_fixup_endpoint(struct usb_device *udev,
-+			    struct usb_host_endpoint *ep, int interval)
-+{
-+	struct usb_hcd *hcd;
-+
-+	hcd = bus_to_hcd(udev->bus);
-+	if (hcd->driver->fixup_endpoint)
-+		hcd->driver->fixup_endpoint(hcd, udev, ep, interval);
-+}
-+
- /* Disables the endpoint: synchronizes with the hcd to make sure all
-  * endpoint state is gone from hardware.  usb_hcd_flush_endpoint() must
-  * have been called previously.  Use for set_configuration, set_interface,
---- a/drivers/usb/core/message.c
-+++ b/drivers/usb/core/message.c
-@@ -1263,6 +1263,21 @@ static void remove_intf_ep_devs(struct u
- 	intf->ep_devs_created = 0;
- }
- 
-+void usb_fixup_endpoint(struct usb_device *dev, int epaddr, int interval)
-+{
-+	unsigned int epnum = epaddr & USB_ENDPOINT_NUMBER_MASK;
-+	struct usb_host_endpoint *ep;
-+
-+	if (usb_endpoint_out(epaddr))
-+		ep = dev->ep_out[epnum];
-+	else
-+		ep = dev->ep_in[epnum];
-+
-+	if (ep && usb_endpoint_xfer_int(&ep->desc))
-+		usb_hcd_fixup_endpoint(dev, ep, interval);
-+}
-+EXPORT_SYMBOL_GPL(usb_fixup_endpoint);
-+
- /**
-  * usb_disable_endpoint -- Disable an endpoint by address
-  * @dev: the device whose endpoint is being disabled
---- a/include/linux/usb.h
-+++ b/include/linux/usb.h
-@@ -1843,6 +1843,8 @@ extern int usb_clear_halt(struct usb_dev
- extern int usb_reset_configuration(struct usb_device *dev);
- extern int usb_set_interface(struct usb_device *dev, int ifnum, int alternate);
- extern void usb_reset_endpoint(struct usb_device *dev, unsigned int epaddr);
-+extern void usb_fixup_endpoint(struct usb_device *dev, int epaddr,
-+			       int interval);
- 
- /* this request isn't really synchronous, but it belongs with the others */
- extern int usb_driver_set_configuration(struct usb_device *udev, int config);
---- a/include/linux/usb/hcd.h
-+++ b/include/linux/usb/hcd.h
-@@ -371,6 +371,11 @@ struct hc_driver {
- 		 * or bandwidth constraints.
- 		 */
- 	void	(*reset_bandwidth)(struct usb_hcd *, struct usb_device *);
-+		/* Override the endpoint-derived interval
-+		 * (if there is any cached hardware state).
-+		 */
-+	void	(*fixup_endpoint)(struct usb_hcd *hcd, struct usb_device *udev,
-+				  struct usb_host_endpoint *ep, int interval);
- 		/* Set the hardware-chosen device address */
- 	int	(*address_device)(struct usb_hcd *, struct usb_device *udev,
- 				  unsigned int timeout_ms);
-@@ -436,6 +441,8 @@ extern void usb_hcd_unmap_urb_setup_for_
- extern void usb_hcd_unmap_urb_for_dma(struct usb_hcd *, struct urb *);
- extern void usb_hcd_flush_endpoint(struct usb_device *udev,
- 		struct usb_host_endpoint *ep);
-+extern void usb_hcd_fixup_endpoint(struct usb_device *udev,
-+		struct usb_host_endpoint *ep, int interval);
- extern void usb_hcd_disable_endpoint(struct usb_device *udev,
- 		struct usb_host_endpoint *ep);
- extern void usb_hcd_reset_endpoint(struct usb_device *udev,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0182-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch b/target/linux/bcm27xx/patches-6.1/950-0182-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch
deleted file mode 100644
index a5e08d4cca..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0182-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 4094f6f14c8f72583b8f255797be87e304cfd729 Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.org>
-Date: Tue, 11 Jun 2019 11:33:39 +0100
-Subject: [PATCH] xhci: implement xhci_fixup_endpoint for interval
- adjustments
-
-Must be called in a non-atomic context, after the endpoint
-has been registered with the hardware via xhci_add_endpoint
-and before the first URB is submitted for the endpoint.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
----
- drivers/usb/host/xhci.c | 104 ++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 104 insertions(+)
-
---- a/drivers/usb/host/xhci.c
-+++ b/drivers/usb/host/xhci.c
-@@ -1643,6 +1643,109 @@ command_cleanup:
- }
- 
- /*
-+ * RPI: Fixup endpoint intervals when requested
-+ * - Check interval versus the (cached) endpoint context
-+ * - set the endpoint interval to the new value
-+ * - force an endpoint configure command
-+ * XXX: bandwidth is not recalculated. We should probably do that.
-+ */
-+
-+static unsigned int xhci_get_endpoint_flag_from_index(unsigned int ep_index)
-+{
-+	return 1 << (ep_index + 1);
-+}
-+
-+static void xhci_fixup_endpoint(struct usb_hcd *hcd, struct usb_device *udev,
-+				struct usb_host_endpoint *ep, int interval)
-+{
-+	struct xhci_hcd *xhci;
-+	struct xhci_ep_ctx *ep_ctx_out, *ep_ctx_in;
-+	struct xhci_command *command;
-+	struct xhci_input_control_ctx *ctrl_ctx;
-+	struct xhci_virt_device *vdev;
-+	int xhci_interval;
-+	int ret;
-+	int ep_index;
-+	unsigned long flags;
-+	u32 ep_info_tmp;
-+
-+	xhci = hcd_to_xhci(hcd);
-+	ep_index = xhci_get_endpoint_index(&ep->desc);
-+
-+	/* FS/LS interval translations */
-+	if ((udev->speed == USB_SPEED_FULL ||
-+	     udev->speed == USB_SPEED_LOW))
-+		interval *= 8;
-+
-+	mutex_lock(&xhci->mutex);
-+
-+	spin_lock_irqsave(&xhci->lock, flags);
-+
-+	vdev = xhci->devs[udev->slot_id];
-+	/* Get context-derived endpoint interval */
-+	ep_ctx_out = xhci_get_ep_ctx(xhci, vdev->out_ctx, ep_index);
-+	ep_ctx_in = xhci_get_ep_ctx(xhci, vdev->in_ctx, ep_index);
-+	xhci_interval = EP_INTERVAL_TO_UFRAMES(le32_to_cpu(ep_ctx_out->ep_info));
-+
-+	if (interval == xhci_interval) {
-+		spin_unlock_irqrestore(&xhci->lock, flags);
-+		mutex_unlock(&xhci->mutex);
-+		return;
-+	}
-+
-+	xhci_dbg(xhci, "Fixup interval=%d xhci_interval=%d\n",
-+		 interval, xhci_interval);
-+	command = xhci_alloc_command_with_ctx(xhci, true, GFP_ATOMIC);
-+	if (!command) {
-+		/* Failure here is benign, poll at the original rate */
-+		spin_unlock_irqrestore(&xhci->lock, flags);
-+		mutex_unlock(&xhci->mutex);
-+		return;
-+	}
-+
-+	/* xHCI uses exponents for intervals... */
-+	xhci_interval = fls(interval) - 1;
-+	xhci_interval = clamp_val(xhci_interval, 3, 10);
-+	ep_info_tmp = le32_to_cpu(ep_ctx_out->ep_info);
-+	ep_info_tmp &= ~EP_INTERVAL(255);
-+	ep_info_tmp |= EP_INTERVAL(xhci_interval);
-+
-+	/* Keep the endpoint context up-to-date while issuing the command. */
-+	xhci_endpoint_copy(xhci, vdev->in_ctx,
-+			   vdev->out_ctx, ep_index);
-+	ep_ctx_in->ep_info = cpu_to_le32(ep_info_tmp);
-+
-+	/*
-+	 * We need to drop the lock, so take an explicit copy
-+	 * of the ep context.
-+	 */
-+	xhci_endpoint_copy(xhci, command->in_ctx, vdev->in_ctx, ep_index);
-+
-+	ctrl_ctx = xhci_get_input_control_ctx(command->in_ctx);
-+	if (!ctrl_ctx) {
-+		xhci_warn(xhci,
-+			  "%s: Could not get input context, bad type.\n",
-+			  __func__);
-+		spin_unlock_irqrestore(&xhci->lock, flags);
-+		xhci_free_command(xhci, command);
-+		mutex_unlock(&xhci->mutex);
-+		return;
-+	}
-+	ctrl_ctx->add_flags = xhci_get_endpoint_flag_from_index(ep_index);
-+	ctrl_ctx->drop_flags = 0;
-+
-+	spin_unlock_irqrestore(&xhci->lock, flags);
-+
-+	ret = xhci_configure_endpoint(xhci, udev, command,
-+				      false, false);
-+	if (ret)
-+		xhci_warn(xhci, "%s: Configure endpoint failed: %d\n",
-+			  __func__, ret);
-+	xhci_free_command(xhci, command);
-+	mutex_unlock(&xhci->mutex);
-+}
-+
-+/*
-  * non-error returns are a promise to giveback() the urb later
-  * we drop ownership so next owner (or urb unlink) can get it
-  */
-@@ -5480,6 +5583,7 @@ static const struct hc_driver xhci_hc_dr
- 	.endpoint_reset =	xhci_endpoint_reset,
- 	.check_bandwidth =	xhci_check_bandwidth,
- 	.reset_bandwidth =	xhci_reset_bandwidth,
-+	.fixup_endpoint =	xhci_fixup_endpoint,
- 	.address_device =	xhci_address_device,
- 	.enable_device =	xhci_enable_device,
- 	.update_hub_device =	xhci_update_hub_device,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0183-usbhid-call-usb_fixup_endpoint-after-mangling-interv.patch b/target/linux/bcm27xx/patches-6.1/950-0183-usbhid-call-usb_fixup_endpoint-after-mangling-interv.patch
deleted file mode 100644
index b9bf485304..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0183-usbhid-call-usb_fixup_endpoint-after-mangling-interv.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 1217fa70ee62e150a9c98c72ed1da30ec9c6789b Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.org>
-Date: Tue, 11 Jun 2019 11:42:03 +0100
-Subject: [PATCH] usbhid: call usb_fixup_endpoint after mangling
- intervals
-
-Lets the mousepoll override mechanism work with xhci.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
----
- drivers/hid/usbhid/hid-core.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/hid/usbhid/hid-core.c
-+++ b/drivers/hid/usbhid/hid-core.c
-@@ -1126,6 +1126,7 @@ static int usbhid_start(struct hid_devic
- 				interval = hid_kbpoll_interval;
- 			break;
- 		}
-+		usb_fixup_endpoint(dev, endpoint->bEndpointAddress, interval);
- 
- 		ret = -ENOMEM;
- 		if (usb_endpoint_dir_in(endpoint)) {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0184-arm-bcm2835-Add-bcm2838-compatible-string.patch b/target/linux/bcm27xx/patches-6.1/950-0184-arm-bcm2835-Add-bcm2838-compatible-string.patch
deleted file mode 100644
index 7b2024ba45..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0184-arm-bcm2835-Add-bcm2838-compatible-string.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From a1adfe40993c0ce5e5d569ea434fe29c3ab034f6 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Tue, 11 Jun 2019 17:38:28 +0100
-Subject: [PATCH] arm: bcm2835: Add bcm2838 compatible string.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- arch/arm/mach-bcm/board_bcm2835.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/arch/arm/mach-bcm/board_bcm2835.c
-+++ b/arch/arm/mach-bcm/board_bcm2835.c
-@@ -109,6 +109,7 @@ static const char * const bcm2835_compat
- #ifdef CONFIG_ARCH_MULTI_V7
- 	"brcm,bcm2836",
- 	"brcm,bcm2837",
-+	"brcm,bcm2838",
- #endif
- 	NULL
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0185-i2c-bcm2835-Set-clock-stretch-timeout-to-35ms.patch b/target/linux/bcm27xx/patches-6.1/950-0185-i2c-bcm2835-Set-clock-stretch-timeout-to-35ms.patch
deleted file mode 100644
index ca7fe63733..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0185-i2c-bcm2835-Set-clock-stretch-timeout-to-35ms.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From c34a59e122ecc5b135fe202bdc2f3f8b551b7523 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Fri, 12 Jul 2019 15:38:35 +0100
-Subject: [PATCH] i2c: bcm2835: Set clock-stretch timeout to 35ms
-
-The BCM2835 I2C blocks have a register to set the clock-stretch
-timeout - how long the device is allowed to hold SCL low - in bus
-cycles. The current driver doesn't write to the register, therefore
-the default value of 64 cycles is being used for all devices.
-
-Set the timeout to the value recommended for SMBus - 35ms.
-
-See: https://github.com/raspberrypi/linux/issues/3064
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- drivers/i2c/busses/i2c-bcm2835.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
---- a/drivers/i2c/busses/i2c-bcm2835.c
-+++ b/drivers/i2c/busses/i2c-bcm2835.c
-@@ -193,6 +193,7 @@ static int clk_bcm2835_i2c_set_rate(stru
- {
- 	struct clk_bcm2835_i2c *div = to_clk_bcm2835_i2c(hw);
- 	u32 redl, fedl;
-+	u32 clk_tout;
- 	u32 divider = clk_bcm2835_i2c_calc_divider(rate, parent_rate);
- 
- 	if (divider == -EINVAL)
-@@ -216,6 +217,17 @@ static int clk_bcm2835_i2c_set_rate(stru
- 	bcm2835_i2c_writel(div->i2c_dev, BCM2835_I2C_DEL,
- 			   (fedl << BCM2835_I2C_FEDL_SHIFT) |
- 			   (redl << BCM2835_I2C_REDL_SHIFT));
-+
-+	/*
-+	 * Set the clock stretch timeout to the SMBUs-recommended 35ms.
-+	 */
-+	if (rate > 0xffff*1000/35)
-+	    clk_tout = 0xffff;
-+	else
-+	    clk_tout = 35*rate/1000;
-+
-+	bcm2835_i2c_writel(div->i2c_dev, BCM2835_I2C_CLKT, clk_tout);
-+
- 	return 0;
- }
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0186-drm-v3d-Clock-V3D-down-when-not-in-use.patch b/target/linux/bcm27xx/patches-6.1/950-0186-drm-v3d-Clock-V3D-down-when-not-in-use.patch
deleted file mode 100644
index d93055f72e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0186-drm-v3d-Clock-V3D-down-when-not-in-use.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-From 62b02a4ede83d3c54a55e1c5ef0043ab13c34ad4 Mon Sep 17 00:00:00 2001
-From: Eric Anholt <eric@anholt.net>
-Date: Thu, 2 May 2019 13:22:53 -0700
-Subject: [PATCH] drm/v3d: Clock V3D down when not in use.
-
-My various attempts at re-enabling runtime PM have failed, so just
-crank the clock down when V3D is idle to reduce power consumption.
-
-Signed-off-by: Eric Anholt <eric@anholt.net>
----
- drivers/gpu/drm/v3d/v3d_drv.c | 18 +++++++++++++
- drivers/gpu/drm/v3d/v3d_drv.h |  6 +++++
- drivers/gpu/drm/v3d/v3d_gem.c | 50 +++++++++++++++++++++++++++++++++--
- 3 files changed, 72 insertions(+), 2 deletions(-)
-
---- a/drivers/gpu/drm/v3d/v3d_drv.c
-+++ b/drivers/gpu/drm/v3d/v3d_drv.c
-@@ -260,6 +260,21 @@ static int v3d_platform_drm_probe(struct
- 		}
- 	}
- 
-+	v3d->clk = devm_clk_get(dev, NULL);
-+	if (IS_ERR(v3d->clk)) {
-+		if (ret != -EPROBE_DEFER)
-+			dev_err(dev, "Failed to get clock\n");
-+		goto dev_free;
-+	}
-+	v3d->clk_up_rate = clk_get_rate(v3d->clk);
-+	/* For downclocking, drop it to the minimum frequency we can get from
-+	 * the CPRMAN clock generator dividing off our parent.  The divider is
-+	 * 4 bits, but ask for just higher than that so that rounding doesn't
-+	 * make cprman reject our rate.
-+	 */
-+	v3d->clk_down_rate =
-+		(clk_get_rate(clk_get_parent(v3d->clk)) / (1 << 4)) + 10000;
-+
- 	if (v3d->ver < 41) {
- 		ret = map_regs(v3d, &v3d->gca_regs, "gca");
- 		if (ret)
-@@ -285,6 +300,9 @@ static int v3d_platform_drm_probe(struct
- 	if (ret)
- 		goto irq_disable;
- 
-+	ret = clk_set_rate(v3d->clk, v3d->clk_down_rate);
-+	WARN_ON_ONCE(ret != 0);
-+
- 	return 0;
- 
- irq_disable:
---- a/drivers/gpu/drm/v3d/v3d_drv.h
-+++ b/drivers/gpu/drm/v3d/v3d_drv.h
-@@ -76,6 +76,12 @@ struct v3d_dev {
- 	void __iomem *bridge_regs;
- 	void __iomem *gca_regs;
- 	struct clk *clk;
-+	struct delayed_work clk_down_work;
-+	unsigned long clk_up_rate, clk_down_rate;
-+	struct mutex clk_lock;
-+	u32 clk_refcount;
-+	bool clk_up;
-+
- 	struct reset_control *reset;
- 
- 	/* Virtual and DMA addresses of the single shared page table. */
---- a/drivers/gpu/drm/v3d/v3d_gem.c
-+++ b/drivers/gpu/drm/v3d/v3d_gem.c
-@@ -4,6 +4,7 @@
- #include <linux/device.h>
- #include <linux/dma-mapping.h>
- #include <linux/io.h>
-+#include <linux/clk.h>
- #include <linux/module.h>
- #include <linux/platform_device.h>
- #include <linux/reset.h>
-@@ -18,6 +19,47 @@
- #include "v3d_trace.h"
- 
- static void
-+v3d_clock_down_work(struct work_struct *work)
-+{
-+	struct v3d_dev *v3d =
-+		container_of(work, struct v3d_dev, clk_down_work.work);
-+	int ret;
-+
-+	ret = clk_set_rate(v3d->clk, v3d->clk_down_rate);
-+	v3d->clk_up = false;
-+	WARN_ON_ONCE(ret != 0);
-+}
-+
-+static void
-+v3d_clock_up_get(struct v3d_dev *v3d)
-+{
-+	mutex_lock(&v3d->clk_lock);
-+	if (v3d->clk_refcount++ == 0) {
-+		cancel_delayed_work_sync(&v3d->clk_down_work);
-+		if (!v3d->clk_up)  {
-+			int ret;
-+
-+			ret = clk_set_rate(v3d->clk, v3d->clk_up_rate);
-+			WARN_ON_ONCE(ret != 0);
-+			v3d->clk_up = true;
-+		}
-+	}
-+	mutex_unlock(&v3d->clk_lock);
-+}
-+
-+static void
-+v3d_clock_up_put(struct v3d_dev *v3d)
-+{
-+	mutex_lock(&v3d->clk_lock);
-+	if (--v3d->clk_refcount == 0) {
-+		schedule_delayed_work(&v3d->clk_down_work,
-+				      msecs_to_jiffies(100));
-+	}
-+	mutex_unlock(&v3d->clk_lock);
-+}
-+
-+
-+static void
- v3d_init_core(struct v3d_dev *v3d, int core)
- {
- 	/* Set OVRTMUOUT, which means that the texture sampler uniform
-@@ -360,6 +402,7 @@ static void
- v3d_job_free(struct kref *ref)
- {
- 	struct v3d_job *job = container_of(ref, struct v3d_job, refcount);
-+	struct v3d_dev *v3d = job->v3d;
- 	int i;
- 
- 	for (i = 0; i < job->bo_count; i++) {
-@@ -368,8 +411,7 @@ v3d_job_free(struct kref *ref)
- 	}
- 	kvfree(job->bo);
- 
--	dma_fence_put(job->irq_fence);
--	dma_fence_put(job->done_fence);
-+	v3d_clock_up_put(v3d);
- 
- 	if (job->perfmon)
- 		v3d_perfmon_put(job->perfmon);
-@@ -500,6 +542,7 @@ v3d_job_init(struct v3d_dev *v3d, struct
- 			goto fail_deps;
- 	}
- 
-+	v3d_clock_up_get(v3d);
- 	kref_init(&job->refcount);
- 
- 	return 0;
-@@ -1080,6 +1123,9 @@ v3d_gem_init(struct drm_device *dev)
- 	mutex_init(&v3d->sched_lock);
- 	mutex_init(&v3d->cache_clean_lock);
- 
-+	mutex_init(&v3d->clk_lock);
-+	INIT_DELAYED_WORK(&v3d->clk_down_work, v3d_clock_down_work);
-+
- 	/* Note: We don't allocate address 0.  Various bits of HW
- 	 * treat 0 as special, such as the occlusion query counters
- 	 * where 0 means "disabled".
diff --git a/target/linux/bcm27xx/patches-6.1/950-0187-drivers-char-add-chardev-for-mmap-ing-the-RPiVid-con.patch b/target/linux/bcm27xx/patches-6.1/950-0187-drivers-char-add-chardev-for-mmap-ing-the-RPiVid-con.patch
deleted file mode 100644
index 571ec80cc4..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0187-drivers-char-add-chardev-for-mmap-ing-the-RPiVid-con.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-From 7fc828638fd97e3fc077ccf777351dab909afd04 Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.org>
-Date: Thu, 9 May 2019 14:30:37 +0100
-Subject: [PATCH] drivers: char: add chardev for mmap'ing the RPiVid
- control registers
-
-Based on the gpiomem driver, allow mapping of the decoder register
-spaces such that userspace can access control/status registers.
-This driver is intended for use with a custom ffmpeg backend accelerator
-prior to a v4l2 driver being written.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
-
-driver: char: rpivid: Destroy the legacy device on remove
-
-The legacy name support created a new device that was never destroyed.
-If the driver was unloaded and reloaded, it failed due to the
-device already existing.
-
-Fixes: "75f1d14 driver: char: rpivid - also support legacy name"
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-driver: char: rpivid: Clean up error handling use of ERR_PTR/IS_ERR
-
-The driver used an unnecessary intermediate void* variable so it
-only called ERR_PTR once to convert to the error value.
-
-Switch to converting as the error arises to remove these intermediate
-variables.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-driver: char: rpivid: Add error handling to the legacy device load
-
-The return value from device_create for the legacy device was never
-checked or handled. Add the required error handling.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-driver: char: rpivid: Fix coding style whitespace issues.
-
-Makes checkpatch happier.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-driver: char: rpimem: Add SPDX licence header.
-
-Stops checkpatch complaining.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-driver: char: rpivid: Fix access to freed memory
-
-The error path during probe frees the private memory block, and
-then promptly dereferences it to log an error message.
-
-Use the base device instead of the pointer to it in the private
-structure.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-driver: char: rpivid: Remove legacy name support
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-driver: char: rpivid: Don't map more than wanted
-
-Limit mappings to the permitted range, but don't map more than asked
-for otherwise we walk off the end of the allocated VMA.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/char/broadcom/Kconfig      |   8 +
- drivers/char/broadcom/Makefile     |   1 +
- drivers/char/broadcom/rpivid-mem.c | 270 +++++++++++++++++++++++++++++
- 3 files changed, 279 insertions(+)
- create mode 100644 drivers/char/broadcom/rpivid-mem.c
-
---- a/drivers/char/broadcom/Kconfig
-+++ b/drivers/char/broadcom/Kconfig
-@@ -39,3 +39,11 @@ config BCM2835_SMI_DEV
- 		This driver provides a character device interface (ioctl + read/write) to
- 		Broadcom's Secondary Memory interface. The low-level functionality is provided
- 		by the SMI driver itself.
-+
-+config RPIVID_MEM
-+	tristate "Character device driver for the Raspberry Pi RPIVid video decoder hardware"
-+	default n
-+	help
-+		This driver provides a character device interface for memory-map operations
-+		so userspace tools can access the control and status registers of the
-+		Raspberry Pi RPiVid video decoder hardware.
---- a/drivers/char/broadcom/Makefile
-+++ b/drivers/char/broadcom/Makefile
-@@ -2,3 +2,4 @@ obj-$(CONFIG_BCM2708_VCMEM)	+= vc_mem.o
- obj-$(CONFIG_BCM_VCIO)		+= vcio.o
- obj-$(CONFIG_BCM2835_DEVGPIOMEM)+= bcm2835-gpiomem.o
- obj-$(CONFIG_BCM2835_SMI_DEV)	+= bcm2835_smi_dev.o
-+obj-$(CONFIG_RPIVID_MEM)	+= rpivid-mem.o
---- /dev/null
-+++ b/drivers/char/broadcom/rpivid-mem.c
-@@ -0,0 +1,270 @@
-+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
-+/**
-+ * rpivid-mem.c - character device access to the RPiVid decoder registers
-+ *
-+ * Based on bcm2835-gpiomem.c. Provides IO memory access to the decoder
-+ * register blocks such that ffmpeg plugins can access the hardware.
-+ *
-+ * Jonathan Bell <jonathan@raspberrypi.org>
-+ * Copyright (c) 2019, Raspberry Pi (Trading) Ltd.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions, and the following disclaimer,
-+ *    without modification.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. The names of the above-listed copyright holders may not be used
-+ *    to endorse or promote products derived from this software without
-+ *    specific prior written permission.
-+ *
-+ * ALTERNATIVELY, this software may be distributed under the terms of the
-+ * GNU General Public License ("GPL") version 2, as published by the Free
-+ * Software Foundation.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/of_device.h>
-+#include <linux/platform_device.h>
-+#include <linux/mm.h>
-+#include <linux/slab.h>
-+#include <linux/cdev.h>
-+#include <linux/pagemap.h>
-+#include <linux/io.h>
-+
-+#define DRIVER_NAME "rpivid-mem"
-+#define DEVICE_MINOR 0
-+
-+struct rpivid_mem_priv {
-+	dev_t devid;
-+	struct class *class;
-+	struct cdev rpivid_mem_cdev;
-+	unsigned long regs_phys;
-+	unsigned long mem_window_len;
-+	struct device *dev;
-+	const char *name;
-+};
-+
-+static int rpivid_mem_open(struct inode *inode, struct file *file)
-+{
-+	int dev = iminor(inode);
-+	int ret = 0;
-+	struct rpivid_mem_priv *priv;
-+
-+	if (dev != DEVICE_MINOR && dev != DEVICE_MINOR + 1)
-+		ret = -ENXIO;
-+
-+	priv = container_of(inode->i_cdev, struct rpivid_mem_priv,
-+				rpivid_mem_cdev);
-+	if (!priv)
-+		return -EINVAL;
-+	file->private_data = priv;
-+	return ret;
-+}
-+
-+static int rpivid_mem_release(struct inode *inode, struct file *file)
-+{
-+	int dev = iminor(inode);
-+	int ret = 0;
-+
-+	if (dev != DEVICE_MINOR && dev != DEVICE_MINOR + 1)
-+		ret = -ENXIO;
-+
-+	return ret;
-+}
-+
-+static const struct vm_operations_struct rpivid_mem_vm_ops = {
-+#ifdef CONFIG_HAVE_IOREMAP_PROT
-+	.access = generic_access_phys
-+#endif
-+};
-+
-+static int rpivid_mem_mmap(struct file *file, struct vm_area_struct *vma)
-+{
-+	struct rpivid_mem_priv *priv;
-+	unsigned long pages;
-+	unsigned long len;
-+
-+	priv = file->private_data;
-+	pages = priv->regs_phys >> PAGE_SHIFT;
-+	/*
-+	 * The address decode is far larger than the actual number of registers.
-+	 * Just map the whole lot in.
-+	 */
-+	len = min(vma->vm_end - vma->vm_start, priv->mem_window_len);
-+	vma->vm_page_prot = phys_mem_access_prot(file, pages, len,
-+						 vma->vm_page_prot);
-+	vma->vm_ops = &rpivid_mem_vm_ops;
-+	if (remap_pfn_range(vma, vma->vm_start,
-+			    pages, len,
-+			    vma->vm_page_prot)) {
-+		return -EAGAIN;
-+	}
-+	return 0;
-+}
-+
-+static const struct file_operations
-+rpivid_mem_fops = {
-+	.owner = THIS_MODULE,
-+	.open = rpivid_mem_open,
-+	.release = rpivid_mem_release,
-+	.mmap = rpivid_mem_mmap,
-+};
-+
-+static const struct of_device_id rpivid_mem_of_match[];
-+static int rpivid_mem_probe(struct platform_device *pdev)
-+{
-+	int err;
-+	const struct of_device_id *id;
-+	struct device *dev = &pdev->dev;
-+	struct resource *ioresource;
-+	struct rpivid_mem_priv *priv;
-+
-+	/* Allocate buffers and instance data */
-+
-+	priv = kzalloc(sizeof(struct rpivid_mem_priv), GFP_KERNEL);
-+
-+	if (!priv) {
-+		err = -ENOMEM;
-+		goto failed_inst_alloc;
-+	}
-+	platform_set_drvdata(pdev, priv);
-+
-+	priv->dev = dev;
-+	id = of_match_device(rpivid_mem_of_match, dev);
-+	if (!id)
-+		return -EINVAL;
-+	priv->name = id->data;
-+
-+	ioresource = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (ioresource) {
-+		priv->regs_phys = ioresource->start;
-+		priv->mem_window_len = (ioresource->end + 1) - ioresource->start;
-+	} else {
-+		dev_err(priv->dev, "failed to get IO resource");
-+		err = -ENOENT;
-+		goto failed_get_resource;
-+	}
-+
-+	/* Create character device entries */
-+
-+	err = alloc_chrdev_region(&priv->devid,
-+				  DEVICE_MINOR, 2, priv->name);
-+	if (err != 0) {
-+		dev_err(priv->dev, "unable to allocate device number");
-+		goto failed_alloc_chrdev;
-+	}
-+	cdev_init(&priv->rpivid_mem_cdev, &rpivid_mem_fops);
-+	priv->rpivid_mem_cdev.owner = THIS_MODULE;
-+	err = cdev_add(&priv->rpivid_mem_cdev, priv->devid, 2);
-+	if (err != 0) {
-+		dev_err(priv->dev, "unable to register device");
-+		goto failed_cdev_add;
-+	}
-+
-+	/* Create sysfs entries */
-+
-+	priv->class = class_create(THIS_MODULE, priv->name);
-+	if (IS_ERR(priv->class)) {
-+		err = PTR_ERR(priv->class);
-+		goto failed_class_create;
-+	}
-+
-+	dev = device_create(priv->class, NULL, priv->devid, NULL, priv->name);
-+	if (IS_ERR(dev)) {
-+		err = PTR_ERR(dev);
-+		goto failed_device_create;
-+	}
-+
-+	dev_info(priv->dev, "%s initialised: Registers at 0x%08lx length 0x%08lx",
-+		priv->name, priv->regs_phys, priv->mem_window_len);
-+
-+	return 0;
-+
-+failed_device_create:
-+	class_destroy(priv->class);
-+failed_class_create:
-+	cdev_del(&priv->rpivid_mem_cdev);
-+failed_cdev_add:
-+	unregister_chrdev_region(priv->devid, 1);
-+failed_alloc_chrdev:
-+failed_get_resource:
-+	kfree(priv);
-+failed_inst_alloc:
-+	dev_err(&pdev->dev, "could not load rpivid_mem");
-+	return err;
-+}
-+
-+static int rpivid_mem_remove(struct platform_device *pdev)
-+{
-+	struct device *dev = &pdev->dev;
-+	struct rpivid_mem_priv *priv = platform_get_drvdata(pdev);
-+
-+	device_destroy(priv->class, priv->devid);
-+	class_destroy(priv->class);
-+	cdev_del(&priv->rpivid_mem_cdev);
-+	unregister_chrdev_region(priv->devid, 1);
-+	kfree(priv);
-+
-+	dev_info(dev, "%s driver removed - OK", priv->name);
-+	return 0;
-+}
-+
-+static const struct of_device_id rpivid_mem_of_match[] = {
-+	{
-+		.compatible = "raspberrypi,rpivid-hevc-decoder",
-+		.data = "rpivid-hevcmem",
-+	},
-+	{
-+		.compatible = "raspberrypi,rpivid-h264-decoder",
-+		.data = "rpivid-h264mem",
-+	},
-+	{
-+		.compatible = "raspberrypi,rpivid-vp9-decoder",
-+		.data = "rpivid-vp9mem",
-+	},
-+	/* The "intc" is included as this block of hardware contains the
-+	 * "frame done" status flags.
-+	 */
-+	{
-+		.compatible = "raspberrypi,rpivid-local-intc",
-+		.data = "rpivid-intcmem",
-+	},
-+	{ /* sentinel */ },
-+};
-+
-+MODULE_DEVICE_TABLE(of, rpivid_mem_of_match);
-+
-+static struct platform_driver rpivid_mem_driver = {
-+	.probe = rpivid_mem_probe,
-+	.remove = rpivid_mem_remove,
-+	.driver = {
-+		   .name = DRIVER_NAME,
-+		   .owner = THIS_MODULE,
-+		   .of_match_table = rpivid_mem_of_match,
-+		   },
-+};
-+
-+module_platform_driver(rpivid_mem_driver);
-+
-+MODULE_ALIAS("platform:rpivid-mem");
-+MODULE_LICENSE("GPL");
-+MODULE_DESCRIPTION("Driver for accessing RPiVid decoder registers from userspace");
-+MODULE_AUTHOR("Jonathan Bell <jonathan@raspberrypi.org>");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0188-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch b/target/linux/bcm27xx/patches-6.1/950-0188-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch
deleted file mode 100644
index 168bba5c48..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0188-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From f66c4ef49f4d559a5b702fdd5df6259392389723 Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.org>
-Date: Thu, 1 Aug 2019 16:41:20 +0100
-Subject: [PATCH] hid: usb: Add device quirks for Freeway Airmouse T3
- and MX3
-
-These wireless mouse/keyboard combo remote control devices specify
-multiple "wheel" events in their report descriptors. The wheel events
-are incorrectly defined and apparently map to accelerometer data, leading
-to spurious mouse scroll events being generated at an extreme rate when
-the device is moved.
-
-As a workaround, use HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE to mask
-feeding the extra wheel events to the input subsystem.
-
-See: https://github.com/raspberrypi/firmware/issues/1189
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
----
- drivers/hid/hid-ids.h    | 6 ++++++
- drivers/hid/hid-quirks.c | 2 ++
- 2 files changed, 8 insertions(+)
-
---- a/drivers/hid/hid-ids.h
-+++ b/drivers/hid/hid-ids.h
-@@ -238,6 +238,9 @@
- #define USB_VENDOR_ID_BAANTO		0x2453
- #define USB_DEVICE_ID_BAANTO_MT_190W2	0x0100
- 
-+#define USB_VENDOR_ID_BEKEN		0x25a7
-+#define USB_DEVICE_ID_AIRMOUSE_T3	0x2402
-+
- #define USB_VENDOR_ID_BELKIN		0x050d
- #define USB_DEVICE_ID_FLIP_KVM		0x3201
- 
-@@ -1372,6 +1375,9 @@
- #define USB_VENDOR_ID_XIAOMI		0x2717
- #define USB_DEVICE_ID_MI_SILENT_MOUSE	0x5014
- 
-+#define USB_VENDOR_ID_XENTA			0x1d57
-+#define USB_DEVICE_ID_AIRMOUSE_MX3		0xad03
-+
- #define USB_VENDOR_ID_XIN_MO			0x16c0
- #define USB_DEVICE_ID_XIN_MO_DUAL_ARCADE	0x05e1
- #define USB_DEVICE_ID_THT_2P_ARCADE		0x75e1
---- a/drivers/hid/hid-quirks.c
-+++ b/drivers/hid/hid-quirks.c
-@@ -42,6 +42,7 @@ static const struct hid_device_id hid_qu
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_CS682), HID_QUIRK_NOGET },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_CS692), HID_QUIRK_NOGET },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_UC100KM), HID_QUIRK_NOGET },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_BEKEN, USB_DEVICE_ID_AIRMOUSE_T3), HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH), HID_QUIRK_MULTI_INPUT },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE2), HID_QUIRK_ALWAYS_POLL },
-@@ -200,6 +201,7 @@ static const struct hid_device_id hid_qu
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE), HID_QUIRK_MULTI_INPUT },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_GROUP_AUDIO), HID_QUIRK_NOGET },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_XENTA, USB_DEVICE_ID_AIRMOUSE_MX3), HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE },
- 
- 	{ 0 }
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0189-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch b/target/linux/bcm27xx/patches-6.1/950-0189-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch
deleted file mode 100644
index 1507baa65b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0189-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 3c252c9745794d454391f378e7b99a4b4ea4b1c3 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Fri, 9 Aug 2019 08:51:43 +0100
-Subject: [PATCH] net: bcmgenet: Workaround #2 for Pi4 Ethernet fail
-
-Some combinations of Pi 4Bs and Ethernet switches don't reliably get a
-DCHP-assigned IP address, leaving the unit with a self=assigned 169.254
-address. In the failure case, the Pi is left able to receive packets
-but not send them, suggesting that the MAC<->PHY link is getting into
-a bad state.
-
-It has been found empirically that skipping a reset step by the genet
-driver prevents the failures. No downsides have been discovered yet,
-and unlike the forced renegotiation it doesn't increase the time to
-get an IP address, so the workaround is enabled by default; add
-
-  genet.skip_umac_reset=n
-
-to the command line to disable it.
-
-See: https://github.com/raspberrypi/linux/issues/3108
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
-+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
-@@ -67,6 +67,9 @@
- 
- /* Forward declarations */
- static void bcmgenet_set_rx_mode(struct net_device *dev);
-+static bool skip_umac_reset = true;
-+module_param(skip_umac_reset, bool, 0444);
-+MODULE_PARM_DESC(skip_umac_reset, "Skip UMAC reset step");
- 
- static inline void bcmgenet_writel(u32 value, void __iomem *offset)
- {
-@@ -2494,6 +2497,11 @@ static void reset_umac(struct bcmgenet_p
- 	bcmgenet_rbuf_ctrl_set(priv, 0);
- 	udelay(10);
- 
-+	if (skip_umac_reset) {
-+		pr_warn("Skipping UMAC reset\n");
-+		return;
-+	}
-+
- 	/* issue soft reset and disable MAC while updating its registers */
- 	spin_lock_bh(&priv->reg_lock);
- 	bcmgenet_umac_writel(priv, CMD_SW_RESET, UMAC_CMD);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0190-xhci-Use-more-event-ring-segment-table-entries.patch b/target/linux/bcm27xx/patches-6.1/950-0190-xhci-Use-more-event-ring-segment-table-entries.patch
deleted file mode 100644
index 1188b4dbe4..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0190-xhci-Use-more-event-ring-segment-table-entries.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 44bfc1e281e081d9ddd0e633ed2dd73c969333f4 Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.org>
-Date: Tue, 13 Aug 2019 15:53:29 +0100
-Subject: [PATCH] xhci: Use more event ring segment table entries
-
-Users have reported log spam created by "Event Ring Full" xHC event
-TRBs. These are caused by interrupt latency in conjunction with a very
-busy set of devices on the bus. The errors are benign, but throughput
-will suffer as the xHC will pause processing of transfers until the
-event ring is drained by the kernel. Expand the number of event TRB slots
-available by increasing the number of event ring segments in the ERST.
-
-Controllers have a hardware-defined limit as to the number of ERST
-entries they can process, so make the actual number in use
-min(ERST_MAX_SEGS, hw_max).
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
----
- drivers/usb/host/xhci-mem.c | 8 +++++---
- drivers/usb/host/xhci.h     | 4 ++--
- 2 files changed, 7 insertions(+), 5 deletions(-)
-
---- a/drivers/usb/host/xhci-mem.c
-+++ b/drivers/usb/host/xhci-mem.c
-@@ -2524,9 +2524,11 @@ int xhci_mem_init(struct xhci_hcd *xhci,
- 	 * Event ring setup: Allocate a normal ring, but also setup
- 	 * the event ring segment table (ERST).  Section 4.9.3.
- 	 */
-+	val2 = 1 << HCS_ERST_MAX(xhci->hcs_params2);
-+	val2 = min_t(unsigned int, ERST_MAX_SEGS, val2);
- 	xhci_dbg_trace(xhci, trace_xhci_dbg_init, "// Allocating event ring");
--	xhci->event_ring = xhci_ring_alloc(xhci, ERST_NUM_SEGS, 1, TYPE_EVENT,
--					0, flags);
-+	xhci->event_ring = xhci_ring_alloc(xhci, val2, 1, TYPE_EVENT,
-+					   0, flags);
- 	if (!xhci->event_ring)
- 		goto fail;
- 	if (xhci_check_trb_in_td_math(xhci) < 0)
-@@ -2539,7 +2541,7 @@ int xhci_mem_init(struct xhci_hcd *xhci,
- 	/* set ERST count with the number of entries in the segment table */
- 	val = readl(&xhci->ir_set->erst_size);
- 	val &= ERST_SIZE_MASK;
--	val |= ERST_NUM_SEGS;
-+	val |= val2;
- 	xhci_dbg_trace(xhci, trace_xhci_dbg_init,
- 			"// Write ERST size = %i to ir_set 0 (some bits preserved)",
- 			val);
---- a/drivers/usb/host/xhci.h
-+++ b/drivers/usb/host/xhci.h
-@@ -1677,8 +1677,8 @@ struct urb_priv {
-  * Each segment table entry is 4*32bits long.  1K seems like an ok size:
-  * (1K bytes * 8bytes/bit) / (4*32 bits) = 64 segment entries in the table,
-  * meaning 64 ring segments.
-- * Initial allocated size of the ERST, in number of entries */
--#define	ERST_NUM_SEGS	1
-+ * Maximum number of segments in the ERST */
-+#define	ERST_MAX_SEGS	8
- /* Poll every 60 seconds */
- #define	POLL_TIMEOUT	60
- /* Stop endpoint command timeout (secs) for URB cancellation watchdog timer */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0191-arch-arm-Add-model-string-to-cpuinfo.patch b/target/linux/bcm27xx/patches-6.1/950-0191-arch-arm-Add-model-string-to-cpuinfo.patch
deleted file mode 100644
index f09060d20c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0191-arch-arm-Add-model-string-to-cpuinfo.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 08cb5799f6c6ba9168d9ce32a480a3b94d897f59 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Tue, 3 Sep 2019 18:16:56 +0100
-Subject: [PATCH] arch/arm: Add model string to cpuinfo
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- arch/arm/kernel/setup.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/arch/arm/kernel/setup.c
-+++ b/arch/arm/kernel/setup.c
-@@ -1265,6 +1265,8 @@ static int c_show(struct seq_file *m, vo
- {
- 	int i, j;
- 	u32 cpuid;
-+	struct device_node *np;
-+	const char *model;
- 
- 	for_each_online_cpu(i) {
- 		/*
-@@ -1324,6 +1326,14 @@ static int c_show(struct seq_file *m, vo
- 	seq_printf(m, "Revision\t: %04x\n", system_rev);
- 	seq_printf(m, "Serial\t\t: %s\n", system_serial);
- 
-+	np = of_find_node_by_path("/");
-+	if (np) {
-+		if (!of_property_read_string(np, "model",
-+					     &model))
-+			seq_printf(m, "Model\t\t: %s\n", model);
-+		of_node_put(np);
-+	}
-+
- 	return 0;
- }
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0192-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch b/target/linux/bcm27xx/patches-6.1/950-0192-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch
deleted file mode 100644
index 513be5ee6d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0192-arch-arm64-Add-Revision-Serial-Model-to-cpuinfo.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From adc8ba1677d4848cb02877ba7682419ce9b83647 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Tue, 3 Sep 2019 18:17:25 +0100
-Subject: [PATCH] arch/arm64: Add Revision, Serial, Model to cpuinfo
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- arch/arm64/kernel/cpuinfo.c | 25 +++++++++++++++++++++++++
- 1 file changed, 25 insertions(+)
-
---- a/arch/arm64/kernel/cpuinfo.c
-+++ b/arch/arm64/kernel/cpuinfo.c
-@@ -17,6 +17,7 @@
- #include <linux/elf.h>
- #include <linux/init.h>
- #include <linux/kernel.h>
-+#include <linux/of_platform.h>
- #include <linux/personality.h>
- #include <linux/preempt.h>
- #include <linux/printk.h>
-@@ -159,6 +160,10 @@ static int c_show(struct seq_file *m, vo
- {
- 	int i, j;
- 	bool compat = personality(current->personality) == PER_LINUX32;
-+	struct device_node *np;
-+	const char *model;
-+	const char *serial;
-+	u32 revision;
- 
- 	for_each_online_cpu(i) {
- 		struct cpuinfo_arm64 *cpuinfo = &per_cpu(cpu_data, i);
-@@ -219,6 +224,26 @@ static int c_show(struct seq_file *m, vo
- 		seq_printf(m, "CPU revision\t: %d\n\n", MIDR_REVISION(midr));
- 	}
- 
-+	seq_printf(m, "Hardware\t: BCM2835\n");
-+
-+	np = of_find_node_by_path("/system");
-+	if (np) {
-+		if (!of_property_read_u32(np, "linux,revision", &revision))
-+			seq_printf(m, "Revision\t: %04x\n", revision);
-+		of_node_put(np);
-+	}
-+
-+	np = of_find_node_by_path("/");
-+	if (np) {
-+		if (!of_property_read_string(np, "serial-number",
-+					     &serial))
-+			seq_printf(m, "Serial\t\t: %s\n", serial);
-+		if (!of_property_read_string(np, "model",
-+					     &model))
-+			seq_printf(m, "Model\t\t: %s\n", model);
-+		of_node_put(np);
-+	}
-+
- 	return 0;
- }
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0193-media-i2c-imx258-Support-for-the-Sony-IMX258-sensor.patch b/target/linux/bcm27xx/patches-6.1/950-0193-media-i2c-imx258-Support-for-the-Sony-IMX258-sensor.patch
deleted file mode 100644
index 88625ed88e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0193-media-i2c-imx258-Support-for-the-Sony-IMX258-sensor.patch
+++ /dev/null
@@ -1,1621 +0,0 @@
-From f0fa50f3ed5ff5089cb8ff3e204d12db576d6c05 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 15 Jun 2021 18:18:42 +0100
-Subject: [PATCH] media: i2c: imx258: Support for the Sony IMX258
- sensor
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-media: i2c: imx258: Remove unused defines
-
-The IMX258_FLL_* defines are unused. Remove them.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx258: Make image geometry meet sensor requirements
-
-The output image is defined as being 4208x3118 pixels in size.
-Y_ADD_STA register was set to 0, and Y_ADD_END to 3118, giving
-3119 lines total.
-
-The datasheet lists a requirement for Y_ADD_STA to be a multiple
-of a power of 2 depending on binning/scaling mode (2 for full pixel,
-4 for x2-bin/scale, 8 for (x2-bin)+(x2-subsample) or x4-bin, or 16
-for (x4-bin)+(x2-subsample)).
-(Y_ADD_END – Y_ADD_STA + 1) also has to be a similar power of 2.
-
-The current configuration for the full res modes breaks that second
-requirement, and we can't increase Y_ADD_STA to 1 to retain exactly
-the same field of view as that then breaks the first requirement.
-For the binned modes, they are worse off as 3118 is not a multiple of
-4.
-
-Increase the main mode to 4208x3120 so that it is the same FOV as the
-binned modes, with Y_ADD_STA at 0.
-Fix Y_ADD_STA and Y_ADD_END for the binned modes so that they meet the
-sensor requirements.
-
-This does change the Bayer order as the default configuration is for
-H&V flips to be enabled, so readout is from Y_STA_END to Y_ADD_STA,
-and this patch has changed Y_STA_END.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx258: Disable digital cropping on binned modes
-
-The binned modes set DIG_CROP_X_OFFSET and DIG_CROP_IMAGE_WIDTH
-to less than the full image, even though the image being captured
-is meant to be a scaled version of the full array size.
-
-Reduce X_OFFSET to 0, and increase IMAGE_WIDTH to the full array.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx258: Implement HFLIP and VFLIP controls.
-
-The sensor supports H & V flips, so implement the relevant controls.
-Note that the Bayer order changes with these flips, therefore
-they set the V4L2_CTRL_FLAG_MODIFY_LAYOUT property.
-
-As we now support flips, remove the restriction of the sensor only
-probing if rotated 180 degrees, but do take that value and initialise
-VFLIP and HFLIP based on it.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx258: Remove redundant I2C writes.
-
-Registers 0x0202 and 0x0203 are written via the control handler
-for V4L2_CID_EXPOSURE, so are not needed from the mode lists.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx258: Add regulator control
-
-The device tree bindings define the relevant regulators for the
-sensor, so update the driver to request the regulators and control
-them at the appropriate times.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx258: Make V4L2_CID_VBLANK configurable.
-
-The values and ranges of V4L2_CID_VBLANK are all computed,
-so there is no reason for it to be a read only control.
-Remove the register values from the mode lists, add the
-handler, and remove the read only flag.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx258: Register the ctrls from fwnode properties
-
-Use v4l2_ctrl_new_fwnode_properties to register the standard
-fwnode properties for the driver.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx258: Add support for 24MHz clock
-
-There's no reason why the clock must be 19.2MHz and nothing
-else (indeed this isn't even a frequency listed in the datasheet),
-so add support for 24MHz as well.
-The PLL settings result in slightly different link frequencies,
-so parameterise those.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx258: Add support for running on 2 CSI data lanes
-
-Extends the driver to also support 2 data lanes.
-Frame rates are obviously more restricted on 2 lanes, but some
-hardware simply hasn't wired more up.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx258: Follow normal V4L2 behaviours for clipping exposure
-
-V4L2 sensor drivers are expected are expected to clip the supported
-exposure range based on the VBLANK configured.
-IMX258 wasn't doing that as register 0x350 (FRM_LENGTH_CTL)
-switches it to a mode where frame length tracks coarse exposure time.
-
-Disable this mode and clip the range for V4L2_CID_EXPOSURE appropriately
-based on V4L2_CID_VBLANK.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx258: Add get_selection for pixel array information
-
-Libcamera requires the cropping information for each mode, so
-add this information to the driver.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx258: Allow configuration of clock lane behaviour
-
-The sensor supports the clock lane either remaining in HS mode
-during frame blanking, or dropping to LP11.
-
-Add configuration of the mode via V4L2_MBUS_CSI2_NONCONTINUOUS_CLOCK.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx258: Correct max FRM_LENGTH_LINES value
-
-The data sheet states that the maximum value for registers
-0x0340/0x0341 FRM_LENGTH_LINES is 65525(decimal), not the
-0xFFFF defined in this driver. Correct this limit.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx258: Add support for long exposure modes
-
-The sensor has a register CIT_LSHIFT which extends the exposure
-and frame times by the specified power of 2 for longer
-exposure times.
-
-Add support for this by configuring this register via V4L2_CID_VBLANK
-and extending the V4L2_CID_EXPOSURE range accordingly.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx258: Issue reset before starting streaming
-
-Whilst not documented, register 0x0103 bit 0 is the soft
-reset for the sensor, so send it before trying to configure
-the sensor.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx258: Set pixel_rate range to the same as the value
-
-With a read only control there is limited point in advertising
-a minimum and maximum for the control, so change to set the
-value, min, and max all to the selected pixel rate.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx258: Support faster pixel rate on binned modes
-
-With the binned modes, there is little point in faithfully
-reproducing the horizontal line length of 5352 pixels on the CSI2
-bus, and the FIFO between the pixel array and MIPI serialiser
-allows us to remove that dependency.
-
-Allow the pixel array to run with the normal settings, with the MIPI
-serialiser at half the rate. This requires some additional
-information for the link frequency to pixel rate function that
-needs to be added to the configuration tables.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: dt-bindings: imx258: Add alternate compatible strings
-
-There are a number of variants of the imx258 modules that can not
-be differentiated at runtime, so add compatible strings for them.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx258: Change register settings for variants of the sensor
-
-Sony have advised that there are variants of the IMX258 sensor which
-require slightly different register configuration to the mainline
-imx258 driver defaults.
-
-There is no available run-time detection for the variant, so add
-configuration via the DT compatible string.
-
-The Vision Components imx258 module supports PDAF, so add the
-register differences for that variant
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../devicetree/bindings/media/i2c/imx258.yaml |   3 +
- drivers/media/i2c/imx258.c                    | 807 +++++++++++++++---
- 2 files changed, 676 insertions(+), 134 deletions(-)
-
---- a/Documentation/devicetree/bindings/media/i2c/imx258.yaml
-+++ b/Documentation/devicetree/bindings/media/i2c/imx258.yaml
-@@ -14,10 +14,13 @@ description: |-
-   type stacked image sensor with a square pixel array of size 4208 x 3120. It
-   is programmable through I2C interface.  Image data is sent through MIPI
-   CSI-2.
-+  There are a number of variants of the sensor which cannot be detected at
-+  runtime, so multiple compatible strings are required to differentiate these.
- 
- properties:
-   compatible:
-     const: sony,imx258
-+    const: sony,imx258-pdaf
- 
-   assigned-clocks: true
-   assigned-clock-parents: true
---- a/drivers/media/i2c/imx258.c
-+++ b/drivers/media/i2c/imx258.c
-@@ -7,8 +7,10 @@
- #include <linux/i2c.h>
- #include <linux/module.h>
- #include <linux/pm_runtime.h>
-+#include <linux/regulator/consumer.h>
- #include <media/v4l2-ctrls.h>
- #include <media/v4l2-device.h>
-+#include <media/v4l2-fwnode.h>
- #include <asm/unaligned.h>
- 
- #define IMX258_REG_VALUE_08BIT		1
-@@ -18,6 +20,8 @@
- #define IMX258_MODE_STANDBY		0x00
- #define IMX258_MODE_STREAMING		0x01
- 
-+#define IMX258_REG_RESET		0x0103
-+
- /* Chip ID */
- #define IMX258_REG_CHIP_ID		0x0016
- #define IMX258_CHIP_ID			0x0258
-@@ -26,23 +30,20 @@
- #define IMX258_VTS_30FPS		0x0c50
- #define IMX258_VTS_30FPS_2K		0x0638
- #define IMX258_VTS_30FPS_VGA		0x034c
--#define IMX258_VTS_MAX			0xffff
-+#define IMX258_VTS_MAX			65525
- 
--/*Frame Length Line*/
--#define IMX258_FLL_MIN			0x08a6
--#define IMX258_FLL_MAX			0xffff
--#define IMX258_FLL_STEP			1
--#define IMX258_FLL_DEFAULT		0x0c98
--
--/* HBLANK control - read only */
--#define IMX258_PPL_DEFAULT		5352
-+#define IMX258_REG_VTS			0x0340
- 
- /* Exposure control */
- #define IMX258_REG_EXPOSURE		0x0202
-+#define IMX258_EXPOSURE_OFFSET		10
- #define IMX258_EXPOSURE_MIN		4
- #define IMX258_EXPOSURE_STEP		1
- #define IMX258_EXPOSURE_DEFAULT		0x640
--#define IMX258_EXPOSURE_MAX		65535
-+#define IMX258_EXPOSURE_MAX		(IMX258_VTS_MAX - IMX258_EXPOSURE_OFFSET)
-+
-+/* HBLANK control - read only */
-+#define IMX258_PPL_DEFAULT		5352
- 
- /* Analog gain control */
- #define IMX258_REG_ANALOG_GAIN		0x0204
-@@ -70,16 +71,28 @@
- #define IMX258_HDR_RATIO_STEP		1
- #define IMX258_HDR_RATIO_DEFAULT	0x0
- 
-+/* Long exposure multiplier */
-+#define IMX258_LONG_EXP_SHIFT_MAX	7
-+#define IMX258_LONG_EXP_SHIFT_REG	0x3002
-+
- /* Test Pattern Control */
- #define IMX258_REG_TEST_PATTERN		0x0600
- 
-+#define IMX258_CLK_BLANK_STOP		0x4040
-+
- /* Orientation */
- #define REG_MIRROR_FLIP_CONTROL		0x0101
--#define REG_CONFIG_MIRROR_FLIP		0x03
-+#define REG_CONFIG_MIRROR_HFLIP		0x01
-+#define REG_CONFIG_MIRROR_VFLIP		0x02
- #define REG_CONFIG_FLIP_TEST_PATTERN	0x02
- 
--/* Input clock frequency in Hz */
--#define IMX258_INPUT_CLOCK_FREQ		19200000
-+/* IMX258 native and active pixel array size. */
-+#define IMX258_NATIVE_WIDTH		4224U
-+#define IMX258_NATIVE_HEIGHT		3192U
-+#define IMX258_PIXEL_ARRAY_LEFT		8U
-+#define IMX258_PIXEL_ARRAY_TOP		16U
-+#define IMX258_PIXEL_ARRAY_WIDTH	4208U
-+#define IMX258_PIXEL_ARRAY_HEIGHT	3120U
- 
- struct imx258_reg {
- 	u16 address;
-@@ -91,12 +104,22 @@ struct imx258_reg_list {
- 	const struct imx258_reg *regs;
- };
- 
-+struct imx258_link_cfg {
-+	unsigned int lf_to_pix_rate_factor;
-+	struct imx258_reg_list reg_list;
-+};
-+
-+#define IMX258_LANE_CONFIGS	2
-+#define IMX258_2_LANE_MODE	0
-+#define IMX258_4_LANE_MODE	1
-+
- /* Link frequency config */
- struct imx258_link_freq_config {
-+	u64 link_frequency;
- 	u32 pixels_per_line;
- 
--	/* PLL registers for this link frequency */
--	struct imx258_reg_list reg_list;
-+	/* Configuration for this link frequency / num lanes selection */
-+	struct imx258_link_cfg link_cfg[IMX258_LANE_CONFIGS];
- };
- 
- /* Mode : resolution and related config&values */
-@@ -114,10 +137,37 @@ struct imx258_mode {
- 	u32 link_freq_index;
- 	/* Default register values */
- 	struct imx258_reg_list reg_list;
-+
-+	/* Analog crop rectangle. */
-+	struct v4l2_rect crop;
-+};
-+
-+/* 4208x3120 needs 1267Mbps/lane, 4 lanes. Use that rate on 2 lanes as well */
-+static const struct imx258_reg mipi_1267mbps_19_2mhz_2l[] = {
-+	{ 0x0136, 0x13 },
-+	{ 0x0137, 0x33 },
-+	{ 0x0301, 0x0A },
-+	{ 0x0303, 0x02 },
-+	{ 0x0305, 0x03 },
-+	{ 0x0306, 0x00 },
-+	{ 0x0307, 0xC6 },
-+	{ 0x0309, 0x0A },
-+	{ 0x030B, 0x01 },
-+	{ 0x030D, 0x02 },
-+	{ 0x030E, 0x00 },
-+	{ 0x030F, 0xD8 },
-+	{ 0x0310, 0x00 },
-+
-+	{ 0x0114, 0x01 },
-+	{ 0x0820, 0x09 },
-+	{ 0x0821, 0xa6 },
-+	{ 0x0822, 0x66 },
-+	{ 0x0823, 0x66 },
- };
- 
--/* 4208x3118 needs 1267Mbps/lane, 4 lanes */
--static const struct imx258_reg mipi_data_rate_1267mbps[] = {
-+static const struct imx258_reg mipi_1267mbps_19_2mhz_4l[] = {
-+	{ 0x0136, 0x13 },
-+	{ 0x0137, 0x33 },
- 	{ 0x0301, 0x05 },
- 	{ 0x0303, 0x02 },
- 	{ 0x0305, 0x03 },
-@@ -129,13 +179,61 @@ static const struct imx258_reg mipi_data
- 	{ 0x030E, 0x00 },
- 	{ 0x030F, 0xD8 },
- 	{ 0x0310, 0x00 },
-+
-+	{ 0x0114, 0x03 },
-+	{ 0x0820, 0x13 },
-+	{ 0x0821, 0x4C },
-+	{ 0x0822, 0xCC },
-+	{ 0x0823, 0xCC },
-+};
-+
-+static const struct imx258_reg mipi_1272mbps_24mhz_2l[] = {
-+	{ 0x0136, 0x18 },
-+	{ 0x0137, 0x00 },
-+	{ 0x0301, 0x0a },
-+	{ 0x0303, 0x02 },
-+	{ 0x0305, 0x04 },
-+	{ 0x0306, 0x00 },
-+	{ 0x0307, 0xD4 },
-+	{ 0x0309, 0x0A },
-+	{ 0x030B, 0x01 },
-+	{ 0x030D, 0x02 },
-+	{ 0x030E, 0x00 },
-+	{ 0x030F, 0xD8 },
-+	{ 0x0310, 0x00 },
-+
-+	{ 0x0114, 0x01 },
- 	{ 0x0820, 0x13 },
- 	{ 0x0821, 0x4C },
- 	{ 0x0822, 0xCC },
- 	{ 0x0823, 0xCC },
- };
- 
--static const struct imx258_reg mipi_data_rate_640mbps[] = {
-+static const struct imx258_reg mipi_1272mbps_24mhz_4l[] = {
-+	{ 0x0136, 0x18 },
-+	{ 0x0137, 0x00 },
-+	{ 0x0301, 0x05 },
-+	{ 0x0303, 0x02 },
-+	{ 0x0305, 0x04 },
-+	{ 0x0306, 0x00 },
-+	{ 0x0307, 0xD4 },
-+	{ 0x0309, 0x0A },
-+	{ 0x030B, 0x01 },
-+	{ 0x030D, 0x02 },
-+	{ 0x030E, 0x00 },
-+	{ 0x030F, 0xD8 },
-+	{ 0x0310, 0x00 },
-+
-+	{ 0x0114, 0x03 },
-+	{ 0x0820, 0x13 },
-+	{ 0x0821, 0xE0 },
-+	{ 0x0822, 0x00 },
-+	{ 0x0823, 0x00 },
-+};
-+
-+static const struct imx258_reg mipi_640mbps_19_2mhz_2l[] = {
-+	{ 0x0136, 0x13 },
-+	{ 0x0137, 0x33 },
- 	{ 0x0301, 0x05 },
- 	{ 0x0303, 0x02 },
- 	{ 0x0305, 0x03 },
-@@ -147,18 +245,82 @@ static const struct imx258_reg mipi_data
- 	{ 0x030E, 0x00 },
- 	{ 0x030F, 0xD8 },
- 	{ 0x0310, 0x00 },
--	{ 0x0820, 0x0A },
-+
-+	{ 0x0114, 0x01 },
-+	{ 0x0820, 0x05 },
- 	{ 0x0821, 0x00 },
- 	{ 0x0822, 0x00 },
- 	{ 0x0823, 0x00 },
- };
- 
--static const struct imx258_reg mode_4208x3118_regs[] = {
-+static const struct imx258_reg mipi_640mbps_19_2mhz_4l[] = {
- 	{ 0x0136, 0x13 },
- 	{ 0x0137, 0x33 },
-+	{ 0x0301, 0x05 },
-+	{ 0x0303, 0x02 },
-+	{ 0x0305, 0x03 },
-+	{ 0x0306, 0x00 },
-+	{ 0x0307, 0x64 },
-+	{ 0x0309, 0x0A },
-+	{ 0x030B, 0x01 },
-+	{ 0x030D, 0x02 },
-+	{ 0x030E, 0x00 },
-+	{ 0x030F, 0xD8 },
-+	{ 0x0310, 0x00 },
-+
-+	{ 0x0114, 0x03 },
-+	{ 0x0820, 0x0A },
-+	{ 0x0821, 0x00 },
-+	{ 0x0822, 0x00 },
-+	{ 0x0823, 0x00 },
-+};
-+
-+static const struct imx258_reg mipi_642mbps_24mhz_2l[] = {
-+	{ 0x0136, 0x18 },
-+	{ 0x0137, 0x00 },
-+	{ 0x0301, 0x05 },
-+	{ 0x0303, 0x02 },
-+	{ 0x0305, 0x04 },
-+	{ 0x0306, 0x00 },
-+	{ 0x0307, 0x6B },
-+	{ 0x0309, 0x0A },
-+	{ 0x030B, 0x01 },
-+	{ 0x030D, 0x02 },
-+	{ 0x030E, 0x00 },
-+	{ 0x030F, 0xD8 },
-+	{ 0x0310, 0x00 },
-+
-+	{ 0x0114, 0x01 },
-+	{ 0x0820, 0x0A },
-+	{ 0x0821, 0x00 },
-+	{ 0x0822, 0x00 },
-+	{ 0x0823, 0x00 },
-+};
-+
-+static const struct imx258_reg mipi_642mbps_24mhz_4l[] = {
-+	{ 0x0136, 0x18 },
-+	{ 0x0137, 0x00 },
-+	{ 0x0301, 0x05 },
-+	{ 0x0303, 0x02 },
-+	{ 0x0305, 0x04 },
-+	{ 0x0306, 0x00 },
-+	{ 0x0307, 0x6B },
-+	{ 0x0309, 0x0A },
-+	{ 0x030B, 0x01 },
-+	{ 0x030D, 0x02 },
-+	{ 0x030E, 0x00 },
-+	{ 0x030F, 0xD8 },
-+	{ 0x0310, 0x00 },
-+
-+	{ 0x0114, 0x03 },
-+	{ 0x0820, 0x0A },
-+	{ 0x0821, 0x00 },
-+	{ 0x0822, 0x00 },
-+	{ 0x0823, 0x00 },
-+};
-+
-+static const struct imx258_reg mode_4208x3120_regs[] = {
- 	{ 0x3051, 0x00 },
--	{ 0x3052, 0x00 },
--	{ 0x4E21, 0x14 },
- 	{ 0x6B11, 0xCF },
- 	{ 0x7FF0, 0x08 },
- 	{ 0x7FF1, 0x0F },
-@@ -181,7 +343,6 @@ static const struct imx258_reg mode_4208
- 	{ 0x7FA8, 0x03 },
- 	{ 0x7FA9, 0xFE },
- 	{ 0x7B24, 0x81 },
--	{ 0x7B25, 0x00 },
- 	{ 0x6564, 0x07 },
- 	{ 0x6B0D, 0x41 },
- 	{ 0x653D, 0x04 },
-@@ -203,11 +364,8 @@ static const struct imx258_reg mode_4208
- 	{ 0x5F05, 0xED },
- 	{ 0x0112, 0x0A },
- 	{ 0x0113, 0x0A },
--	{ 0x0114, 0x03 },
- 	{ 0x0342, 0x14 },
- 	{ 0x0343, 0xE8 },
--	{ 0x0340, 0x0C },
--	{ 0x0341, 0x50 },
- 	{ 0x0344, 0x00 },
- 	{ 0x0345, 0x00 },
- 	{ 0x0346, 0x00 },
-@@ -215,7 +373,7 @@ static const struct imx258_reg mode_4208
- 	{ 0x0348, 0x10 },
- 	{ 0x0349, 0x6F },
- 	{ 0x034A, 0x0C },
--	{ 0x034B, 0x2E },
-+	{ 0x034B, 0x2F },
- 	{ 0x0381, 0x01 },
- 	{ 0x0383, 0x01 },
- 	{ 0x0385, 0x01 },
-@@ -241,9 +399,7 @@ static const struct imx258_reg mode_4208
- 	{ 0x034D, 0x70 },
- 	{ 0x034E, 0x0C },
- 	{ 0x034F, 0x30 },
--	{ 0x0350, 0x01 },
--	{ 0x0202, 0x0C },
--	{ 0x0203, 0x46 },
-+	{ 0x0350, 0x00 },
- 	{ 0x0204, 0x00 },
- 	{ 0x0205, 0x00 },
- 	{ 0x020E, 0x01 },
-@@ -273,11 +429,7 @@ static const struct imx258_reg mode_4208
- };
- 
- static const struct imx258_reg mode_2104_1560_regs[] = {
--	{ 0x0136, 0x13 },
--	{ 0x0137, 0x33 },
- 	{ 0x3051, 0x00 },
--	{ 0x3052, 0x00 },
--	{ 0x4E21, 0x14 },
- 	{ 0x6B11, 0xCF },
- 	{ 0x7FF0, 0x08 },
- 	{ 0x7FF1, 0x0F },
-@@ -300,7 +452,6 @@ static const struct imx258_reg mode_2104
- 	{ 0x7FA8, 0x03 },
- 	{ 0x7FA9, 0xFE },
- 	{ 0x7B24, 0x81 },
--	{ 0x7B25, 0x00 },
- 	{ 0x6564, 0x07 },
- 	{ 0x6B0D, 0x41 },
- 	{ 0x653D, 0x04 },
-@@ -322,11 +473,8 @@ static const struct imx258_reg mode_2104
- 	{ 0x5F05, 0xED },
- 	{ 0x0112, 0x0A },
- 	{ 0x0113, 0x0A },
--	{ 0x0114, 0x03 },
- 	{ 0x0342, 0x14 },
- 	{ 0x0343, 0xE8 },
--	{ 0x0340, 0x06 },
--	{ 0x0341, 0x38 },
- 	{ 0x0344, 0x00 },
- 	{ 0x0345, 0x00 },
- 	{ 0x0346, 0x00 },
-@@ -334,7 +482,7 @@ static const struct imx258_reg mode_2104
- 	{ 0x0348, 0x10 },
- 	{ 0x0349, 0x6F },
- 	{ 0x034A, 0x0C },
--	{ 0x034B, 0x2E },
-+	{ 0x034B, 0x2F },
- 	{ 0x0381, 0x01 },
- 	{ 0x0383, 0x01 },
- 	{ 0x0385, 0x01 },
-@@ -345,11 +493,11 @@ static const struct imx258_reg mode_2104
- 	{ 0x0404, 0x00 },
- 	{ 0x0405, 0x20 },
- 	{ 0x0408, 0x00 },
--	{ 0x0409, 0x02 },
-+	{ 0x0409, 0x00 },
- 	{ 0x040A, 0x00 },
- 	{ 0x040B, 0x00 },
- 	{ 0x040C, 0x10 },
--	{ 0x040D, 0x6A },
-+	{ 0x040D, 0x70 },
- 	{ 0x040E, 0x06 },
- 	{ 0x040F, 0x18 },
- 	{ 0x3038, 0x00 },
-@@ -360,9 +508,7 @@ static const struct imx258_reg mode_2104
- 	{ 0x034D, 0x38 },
- 	{ 0x034E, 0x06 },
- 	{ 0x034F, 0x18 },
--	{ 0x0350, 0x01 },
--	{ 0x0202, 0x06 },
--	{ 0x0203, 0x2E },
-+	{ 0x0350, 0x00 },
- 	{ 0x0204, 0x00 },
- 	{ 0x0205, 0x00 },
- 	{ 0x020E, 0x01 },
-@@ -392,11 +538,7 @@ static const struct imx258_reg mode_2104
- };
- 
- static const struct imx258_reg mode_1048_780_regs[] = {
--	{ 0x0136, 0x13 },
--	{ 0x0137, 0x33 },
- 	{ 0x3051, 0x00 },
--	{ 0x3052, 0x00 },
--	{ 0x4E21, 0x14 },
- 	{ 0x6B11, 0xCF },
- 	{ 0x7FF0, 0x08 },
- 	{ 0x7FF1, 0x0F },
-@@ -419,7 +561,6 @@ static const struct imx258_reg mode_1048
- 	{ 0x7FA8, 0x03 },
- 	{ 0x7FA9, 0xFE },
- 	{ 0x7B24, 0x81 },
--	{ 0x7B25, 0x00 },
- 	{ 0x6564, 0x07 },
- 	{ 0x6B0D, 0x41 },
- 	{ 0x653D, 0x04 },
-@@ -441,11 +582,8 @@ static const struct imx258_reg mode_1048
- 	{ 0x5F05, 0xED },
- 	{ 0x0112, 0x0A },
- 	{ 0x0113, 0x0A },
--	{ 0x0114, 0x03 },
- 	{ 0x0342, 0x14 },
- 	{ 0x0343, 0xE8 },
--	{ 0x0340, 0x03 },
--	{ 0x0341, 0x4C },
- 	{ 0x0344, 0x00 },
- 	{ 0x0345, 0x00 },
- 	{ 0x0346, 0x00 },
-@@ -453,7 +591,7 @@ static const struct imx258_reg mode_1048
- 	{ 0x0348, 0x10 },
- 	{ 0x0349, 0x6F },
- 	{ 0x034A, 0x0C },
--	{ 0x034B, 0x2E },
-+	{ 0x034B, 0x2F },
- 	{ 0x0381, 0x01 },
- 	{ 0x0383, 0x01 },
- 	{ 0x0385, 0x01 },
-@@ -464,11 +602,11 @@ static const struct imx258_reg mode_1048
- 	{ 0x0404, 0x00 },
- 	{ 0x0405, 0x40 },
- 	{ 0x0408, 0x00 },
--	{ 0x0409, 0x06 },
-+	{ 0x0409, 0x00 },
- 	{ 0x040A, 0x00 },
- 	{ 0x040B, 0x00 },
- 	{ 0x040C, 0x10 },
--	{ 0x040D, 0x64 },
-+	{ 0x040D, 0x70 },
- 	{ 0x040E, 0x03 },
- 	{ 0x040F, 0x0C },
- 	{ 0x3038, 0x00 },
-@@ -479,9 +617,7 @@ static const struct imx258_reg mode_1048
- 	{ 0x034D, 0x18 },
- 	{ 0x034E, 0x03 },
- 	{ 0x034F, 0x0C },
--	{ 0x0350, 0x01 },
--	{ 0x0202, 0x03 },
--	{ 0x0203, 0x42 },
-+	{ 0x0350, 0x00 },
- 	{ 0x0204, 0x00 },
- 	{ 0x0205, 0x00 },
- 	{ 0x020E, 0x01 },
-@@ -510,6 +646,49 @@ static const struct imx258_reg mode_1048
- 	{ 0x0220, 0x00 },
- };
- 
-+struct imx258_variant_cfg {
-+	const struct imx258_reg *regs;
-+	unsigned int num_regs;
-+};
-+
-+static const struct imx258_reg imx258_cfg_regs[] = {
-+	{ 0x3052, 0x00 },
-+	{ 0x4E21, 0x14 },
-+	{ 0x7B25, 0x00 },
-+};
-+
-+static const struct imx258_variant_cfg imx258_cfg = {
-+	.regs = imx258_cfg_regs,
-+	.num_regs = ARRAY_SIZE(imx258_cfg_regs),
-+};
-+
-+static const struct imx258_reg imx258_pdaf_cfg_regs[] = {
-+	{ 0x3052, 0x01 },
-+	{ 0x4E21, 0x10 },
-+	{ 0x7B25, 0x01 },
-+};
-+
-+static const struct imx258_variant_cfg imx258_pdaf_cfg = {
-+	.regs = imx258_pdaf_cfg_regs,
-+	.num_regs = ARRAY_SIZE(imx258_pdaf_cfg_regs),
-+};
-+
-+/*
-+ * The supported formats.
-+ * This table MUST contain 4 entries per format, to cover the various flip
-+ * combinations in the order
-+ * - no flip
-+ * - h flip
-+ * - v flip
-+ * - h&v flips
-+ */
-+static const u32 codes[] = {
-+	/* 10-bit modes. */
-+	MEDIA_BUS_FMT_SRGGB10_1X10,
-+	MEDIA_BUS_FMT_SGRBG10_1X10,
-+	MEDIA_BUS_FMT_SGBRG10_1X10,
-+	MEDIA_BUS_FMT_SBGGR10_1X10
-+};
- static const char * const imx258_test_pattern_menu[] = {
- 	"Disabled",
- 	"Solid Colour",
-@@ -518,9 +697,15 @@ static const char * const imx258_test_pa
- 	"Pseudorandom Sequence (PN9)",
- };
- 
--/* Configurations for supported link frequencies */
--#define IMX258_LINK_FREQ_634MHZ	633600000ULL
--#define IMX258_LINK_FREQ_320MHZ	320000000ULL
-+/* regulator supplies */
-+static const char * const imx258_supply_name[] = {
-+	/* Supplies can be enabled in any order */
-+	"vana",  /* Analog (2.8V) supply */
-+	"vdig",  /* Digital Core (1.05V) supply */
-+	"vif",  /* IF (1.8V) supply */
-+};
-+
-+#define IMX258_NUM_SUPPLIES ARRAY_SIZE(imx258_supply_name)
- 
- enum {
- 	IMX258_LINK_FREQ_1267MBPS,
-@@ -528,37 +713,103 @@ enum {
- };
- 
- /*
-- * pixel_rate = link_freq * data-rate * nr_of_lanes / bits_per_sample
-- * data rate => double data rate; number of lanes => 4; bits per pixel => 10
-+ * Pixel rate does not necessarily relate to link frequency on this sensor as
-+ * there is a FIFO between the pixel array pipeline and the MIPI serializer.
-+ * The recommendation from Sony is that the pixel array is always run with a
-+ * line length of 5352 pixels, which means that there is a large amount of
-+ * blanking time for the 1048x780 mode. There is no need to replicate this
-+ * blanking on the CSI2 bus, and the configuration of register 0x0301 allows the
-+ * divider to be altered.
-+ *
-+ * The actual factor between link frequency and pixel rate is in the
-+ * imx258_link_cfg, so use this to convert between the two.
-+ * bits per pixel being 10, and D-PHY being DDR is assumed by this function, so
-+ * the value is only the combination of number of lanes and pixel clock divider.
-  */
--static u64 link_freq_to_pixel_rate(u64 f)
-+static u64 link_freq_to_pixel_rate(u64 f, const struct imx258_link_cfg *link_cfg)
- {
--	f *= 2 * 4;
-+	f *= 2 * link_cfg->lf_to_pix_rate_factor;
- 	do_div(f, 10);
- 
- 	return f;
- }
- 
- /* Menu items for LINK_FREQ V4L2 control */
--static const s64 link_freq_menu_items[] = {
-+/* Configurations for supported link frequencies */
-+#define IMX258_LINK_FREQ_634MHZ	633600000ULL
-+#define IMX258_LINK_FREQ_320MHZ	320000000ULL
-+
-+static const s64 link_freq_menu_items_19_2[] = {
- 	IMX258_LINK_FREQ_634MHZ,
- 	IMX258_LINK_FREQ_320MHZ,
- };
- 
-+/* Configurations for supported link frequencies */
-+#define IMX258_LINK_FREQ_636MHZ	636000000ULL
-+#define IMX258_LINK_FREQ_321MHZ	321000000ULL
-+
-+static const s64 link_freq_menu_items_24[] = {
-+	IMX258_LINK_FREQ_636MHZ,
-+	IMX258_LINK_FREQ_321MHZ,
-+};
-+
-+#define REGS(_list) { .num_of_regs = ARRAY_SIZE(_list), .regs = _list, }
-+
- /* Link frequency configs */
--static const struct imx258_link_freq_config link_freq_configs[] = {
-+static const struct imx258_link_freq_config link_freq_configs_19_2[] = {
- 	[IMX258_LINK_FREQ_1267MBPS] = {
- 		.pixels_per_line = IMX258_PPL_DEFAULT,
--		.reg_list = {
--			.num_of_regs = ARRAY_SIZE(mipi_data_rate_1267mbps),
--			.regs = mipi_data_rate_1267mbps,
-+		.link_cfg = {
-+			[IMX258_2_LANE_MODE] = {
-+				.lf_to_pix_rate_factor = 2 * 2,
-+				.reg_list = REGS(mipi_1267mbps_19_2mhz_2l),
-+			},
-+			[IMX258_4_LANE_MODE] = {
-+				.lf_to_pix_rate_factor = 4,
-+				.reg_list = REGS(mipi_1267mbps_19_2mhz_4l),
-+			},
- 		}
- 	},
- 	[IMX258_LINK_FREQ_640MBPS] = {
- 		.pixels_per_line = IMX258_PPL_DEFAULT,
--		.reg_list = {
--			.num_of_regs = ARRAY_SIZE(mipi_data_rate_640mbps),
--			.regs = mipi_data_rate_640mbps,
-+		.link_cfg = {
-+			[IMX258_2_LANE_MODE] = {
-+				.lf_to_pix_rate_factor = 2,
-+				.reg_list = REGS(mipi_640mbps_19_2mhz_2l),
-+			},
-+			[IMX258_4_LANE_MODE] = {
-+				.lf_to_pix_rate_factor = 4,
-+				.reg_list = REGS(mipi_640mbps_19_2mhz_4l),
-+			},
-+		}
-+	},
-+};
-+
-+static const struct imx258_link_freq_config link_freq_configs_24[] = {
-+	[IMX258_LINK_FREQ_1267MBPS] = {
-+		.pixels_per_line = IMX258_PPL_DEFAULT,
-+		.link_cfg = {
-+			[IMX258_2_LANE_MODE] = {
-+				.lf_to_pix_rate_factor = 2,
-+				.reg_list = REGS(mipi_1272mbps_24mhz_2l),
-+			},
-+			[IMX258_4_LANE_MODE] = {
-+				.lf_to_pix_rate_factor = 4,
-+				.reg_list = REGS(mipi_1272mbps_24mhz_4l),
-+			},
-+		}
-+	},
-+	[IMX258_LINK_FREQ_640MBPS] = {
-+		.pixels_per_line = IMX258_PPL_DEFAULT,
-+		.link_cfg = {
-+			[IMX258_2_LANE_MODE] = {
-+				.lf_to_pix_rate_factor = 2 * 2,
-+				.reg_list = REGS(mipi_642mbps_24mhz_2l),
-+			},
-+			[IMX258_4_LANE_MODE] = {
-+				.lf_to_pix_rate_factor = 4,
-+				.reg_list = REGS(mipi_642mbps_24mhz_4l),
-+			},
- 		}
- 	},
- };
-@@ -567,14 +818,20 @@ static const struct imx258_link_freq_con
- static const struct imx258_mode supported_modes[] = {
- 	{
- 		.width = 4208,
--		.height = 3118,
-+		.height = 3120,
- 		.vts_def = IMX258_VTS_30FPS,
- 		.vts_min = IMX258_VTS_30FPS,
- 		.reg_list = {
--			.num_of_regs = ARRAY_SIZE(mode_4208x3118_regs),
--			.regs = mode_4208x3118_regs,
-+			.num_of_regs = ARRAY_SIZE(mode_4208x3120_regs),
-+			.regs = mode_4208x3120_regs,
- 		},
- 		.link_freq_index = IMX258_LINK_FREQ_1267MBPS,
-+		.crop = {
-+			.left = IMX258_PIXEL_ARRAY_LEFT,
-+			.top = IMX258_PIXEL_ARRAY_TOP,
-+			.width = 4208,
-+			.height = 3120,
-+		},
- 	},
- 	{
- 		.width = 2104,
-@@ -586,6 +843,12 @@ static const struct imx258_mode supporte
- 			.regs = mode_2104_1560_regs,
- 		},
- 		.link_freq_index = IMX258_LINK_FREQ_640MBPS,
-+		.crop = {
-+			.left = IMX258_PIXEL_ARRAY_LEFT,
-+			.top = IMX258_PIXEL_ARRAY_TOP,
-+			.width = 4208,
-+			.height = 3120,
-+		},
- 	},
- 	{
- 		.width = 1048,
-@@ -597,6 +860,12 @@ static const struct imx258_mode supporte
- 			.regs = mode_1048_780_regs,
- 		},
- 		.link_freq_index = IMX258_LINK_FREQ_640MBPS,
-+		.crop = {
-+			.left = IMX258_PIXEL_ARRAY_LEFT,
-+			.top = IMX258_PIXEL_ARRAY_TOP,
-+			.width = 4208,
-+			.height = 3120,
-+		},
- 	},
- };
- 
-@@ -604,6 +873,8 @@ struct imx258 {
- 	struct v4l2_subdev sd;
- 	struct media_pad pad;
- 
-+	const struct imx258_variant_cfg *variant_cfg;
-+
- 	struct v4l2_ctrl_handler ctrl_handler;
- 	/* V4L2 Controls */
- 	struct v4l2_ctrl *link_freq;
-@@ -611,10 +882,19 @@ struct imx258 {
- 	struct v4l2_ctrl *vblank;
- 	struct v4l2_ctrl *hblank;
- 	struct v4l2_ctrl *exposure;
-+	struct v4l2_ctrl *hflip;
-+	struct v4l2_ctrl *vflip;
-+	/* Current long exposure factor in use. Set through V4L2_CID_VBLANK */
-+	unsigned int long_exp_shift;
- 
- 	/* Current mode */
- 	const struct imx258_mode *cur_mode;
- 
-+	const struct imx258_link_freq_config *link_freq_configs;
-+	const s64 *link_freq_menu_items;
-+	unsigned int lane_mode_idx;
-+	unsigned int csi2_flags;
-+
- 	/*
- 	 * Mutex for serialized access:
- 	 * Protect sensor module set pad format and start/stop streaming safely.
-@@ -625,6 +905,7 @@ struct imx258 {
- 	bool streaming;
- 
- 	struct clk *clk;
-+	struct regulator_bulk_data supplies[IMX258_NUM_SUPPLIES];
- };
- 
- static inline struct imx258 *to_imx258(struct v4l2_subdev *_sd)
-@@ -706,18 +987,39 @@ static int imx258_write_regs(struct imx2
- 	return 0;
- }
- 
-+/* Get bayer order based on flip setting. */
-+static u32 imx258_get_format_code(struct imx258 *imx258)
-+{
-+	unsigned int i;
-+
-+	lockdep_assert_held(&imx258->mutex);
-+
-+	i = (imx258->vflip->val ? 2 : 0) |
-+	    (imx258->hflip->val ? 1 : 0);
-+
-+	return codes[i];
-+}
- /* Open sub-device */
- static int imx258_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
- {
-+	struct imx258 *imx258 = to_imx258(sd);
- 	struct v4l2_mbus_framefmt *try_fmt =
- 		v4l2_subdev_get_try_format(sd, fh->state, 0);
-+	struct v4l2_rect *try_crop;
- 
- 	/* Initialize try_fmt */
- 	try_fmt->width = supported_modes[0].width;
- 	try_fmt->height = supported_modes[0].height;
--	try_fmt->code = MEDIA_BUS_FMT_SGRBG10_1X10;
-+	try_fmt->code = imx258_get_format_code(imx258);
- 	try_fmt->field = V4L2_FIELD_NONE;
- 
-+	/* Initialize try_crop */
-+	try_crop = v4l2_subdev_get_try_crop(sd, fh->state, 0);
-+	try_crop->left = IMX258_PIXEL_ARRAY_LEFT;
-+	try_crop->top = IMX258_PIXEL_ARRAY_TOP;
-+	try_crop->width = IMX258_PIXEL_ARRAY_WIDTH;
-+	try_crop->height = IMX258_PIXEL_ARRAY_HEIGHT;
-+
- 	return 0;
- }
- 
-@@ -748,6 +1050,39 @@ static int imx258_update_digital_gain(st
- 	return 0;
- }
- 
-+static void imx258_adjust_exposure_range(struct imx258 *imx258)
-+{
-+	int exposure_max, exposure_def;
-+
-+	/* Honour the VBLANK limits when setting exposure. */
-+	exposure_max = imx258->cur_mode->height + imx258->vblank->val -
-+		       IMX258_EXPOSURE_OFFSET;
-+	exposure_def = min(exposure_max, imx258->exposure->val);
-+	__v4l2_ctrl_modify_range(imx258->exposure, imx258->exposure->minimum,
-+				 exposure_max, imx258->exposure->step,
-+				 exposure_def);
-+}
-+
-+static int imx258_set_frame_length(struct imx258 *imx258, unsigned int val)
-+{
-+	int ret;
-+
-+	imx258->long_exp_shift = 0;
-+
-+	while (val > IMX258_VTS_MAX) {
-+		imx258->long_exp_shift++;
-+		val >>= 1;
-+	}
-+
-+	ret = imx258_write_reg(imx258, IMX258_REG_VTS,
-+			       IMX258_REG_VALUE_16BIT, val);
-+	if (ret)
-+		return ret;
-+
-+	return imx258_write_reg(imx258, IMX258_LONG_EXP_SHIFT_REG,
-+				IMX258_REG_VALUE_08BIT, imx258->long_exp_shift);
-+}
-+
- static int imx258_set_ctrl(struct v4l2_ctrl *ctrl)
- {
- 	struct imx258 *imx258 =
-@@ -756,6 +1091,13 @@ static int imx258_set_ctrl(struct v4l2_c
- 	int ret = 0;
- 
- 	/*
-+	 * The VBLANK control may change the limits of usable exposure, so check
-+	 * and adjust if necessary.
-+	 */
-+	if (ctrl->id == V4L2_CID_VBLANK)
-+		imx258_adjust_exposure_range(imx258);
-+
-+	/*
- 	 * Applying V4L2 control value only happens
- 	 * when power is up for streaming
- 	 */
-@@ -771,7 +1113,7 @@ static int imx258_set_ctrl(struct v4l2_c
- 	case V4L2_CID_EXPOSURE:
- 		ret = imx258_write_reg(imx258, IMX258_REG_EXPOSURE,
- 				IMX258_REG_VALUE_16BIT,
--				ctrl->val);
-+				ctrl->val >> imx258->long_exp_shift);
- 		break;
- 	case V4L2_CID_DIGITAL_GAIN:
- 		ret = imx258_update_digital_gain(imx258, IMX258_REG_VALUE_16BIT,
-@@ -781,10 +1123,6 @@ static int imx258_set_ctrl(struct v4l2_c
- 		ret = imx258_write_reg(imx258, IMX258_REG_TEST_PATTERN,
- 				IMX258_REG_VALUE_16BIT,
- 				ctrl->val);
--		ret = imx258_write_reg(imx258, REG_MIRROR_FLIP_CONTROL,
--				IMX258_REG_VALUE_08BIT,
--				!ctrl->val ? REG_CONFIG_MIRROR_FLIP :
--				REG_CONFIG_FLIP_TEST_PATTERN);
- 		break;
- 	case V4L2_CID_WIDE_DYNAMIC_RANGE:
- 		if (!ctrl->val) {
-@@ -802,6 +1140,19 @@ static int imx258_set_ctrl(struct v4l2_c
- 					       BIT(IMX258_HDR_RATIO_MAX));
- 		}
- 		break;
-+	case V4L2_CID_VBLANK:
-+		ret = imx258_set_frame_length(imx258,
-+					      imx258->cur_mode->height + ctrl->val);
-+		break;
-+	case V4L2_CID_VFLIP:
-+	case V4L2_CID_HFLIP:
-+		ret = imx258_write_reg(imx258, REG_MIRROR_FLIP_CONTROL,
-+				       IMX258_REG_VALUE_08BIT,
-+				       (imx258->hflip->val ?
-+					REG_CONFIG_MIRROR_HFLIP : 0) |
-+				       (imx258->vflip->val ?
-+					REG_CONFIG_MIRROR_VFLIP : 0));
-+		break;
- 	default:
- 		dev_info(&client->dev,
- 			 "ctrl(id:0x%x,val:0x%x) is not handled\n",
-@@ -823,11 +1174,13 @@ static int imx258_enum_mbus_code(struct
- 				  struct v4l2_subdev_state *sd_state,
- 				  struct v4l2_subdev_mbus_code_enum *code)
- {
--	/* Only one bayer order(GRBG) is supported */
-+	struct imx258 *imx258 = to_imx258(sd);
-+
-+	/* Only one bayer format (10 bit) is supported */
- 	if (code->index > 0)
- 		return -EINVAL;
- 
--	code->code = MEDIA_BUS_FMT_SGRBG10_1X10;
-+	code->code = imx258_get_format_code(imx258);
- 
- 	return 0;
- }
-@@ -836,10 +1189,11 @@ static int imx258_enum_frame_size(struct
- 				  struct v4l2_subdev_state *sd_state,
- 				  struct v4l2_subdev_frame_size_enum *fse)
- {
-+	struct imx258 *imx258 = to_imx258(sd);
- 	if (fse->index >= ARRAY_SIZE(supported_modes))
- 		return -EINVAL;
- 
--	if (fse->code != MEDIA_BUS_FMT_SGRBG10_1X10)
-+	if (fse->code != imx258_get_format_code(imx258))
- 		return -EINVAL;
- 
- 	fse->min_width = supported_modes[fse->index].width;
-@@ -850,12 +1204,13 @@ static int imx258_enum_frame_size(struct
- 	return 0;
- }
- 
--static void imx258_update_pad_format(const struct imx258_mode *mode,
-+static void imx258_update_pad_format(struct imx258 *imx258,
-+				     const struct imx258_mode *mode,
- 				     struct v4l2_subdev_format *fmt)
- {
- 	fmt->format.width = mode->width;
- 	fmt->format.height = mode->height;
--	fmt->format.code = MEDIA_BUS_FMT_SGRBG10_1X10;
-+	fmt->format.code = imx258_get_format_code(imx258);
- 	fmt->format.field = V4L2_FIELD_NONE;
- }
- 
-@@ -868,7 +1223,7 @@ static int __imx258_get_pad_format(struc
- 							  sd_state,
- 							  fmt->pad);
- 	else
--		imx258_update_pad_format(imx258->cur_mode, fmt);
-+		imx258_update_pad_format(imx258, imx258->cur_mode, fmt);
- 
- 	return 0;
- }
-@@ -892,8 +1247,10 @@ static int imx258_set_pad_format(struct
- 				 struct v4l2_subdev_format *fmt)
- {
- 	struct imx258 *imx258 = to_imx258(sd);
--	const struct imx258_mode *mode;
-+	const struct imx258_link_freq_config *link_freq_cfgs;
-+	const struct imx258_link_cfg *link_cfg;
- 	struct v4l2_mbus_framefmt *framefmt;
-+	const struct imx258_mode *mode;
- 	s32 vblank_def;
- 	s32 vblank_min;
- 	s64 h_blank;
-@@ -902,13 +1259,12 @@ static int imx258_set_pad_format(struct
- 
- 	mutex_lock(&imx258->mutex);
- 
--	/* Only one raw bayer(GBRG) order is supported */
--	fmt->format.code = MEDIA_BUS_FMT_SGRBG10_1X10;
-+	fmt->format.code = imx258_get_format_code(imx258);
- 
- 	mode = v4l2_find_nearest_size(supported_modes,
- 		ARRAY_SIZE(supported_modes), width, height,
- 		fmt->format.width, fmt->format.height);
--	imx258_update_pad_format(mode, fmt);
-+	imx258_update_pad_format(imx258, mode, fmt);
- 	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
- 		framefmt = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
- 		*framefmt = fmt->format;
-@@ -916,9 +1272,14 @@ static int imx258_set_pad_format(struct
- 		imx258->cur_mode = mode;
- 		__v4l2_ctrl_s_ctrl(imx258->link_freq, mode->link_freq_index);
- 
--		link_freq = link_freq_menu_items[mode->link_freq_index];
--		pixel_rate = link_freq_to_pixel_rate(link_freq);
--		__v4l2_ctrl_s_ctrl_int64(imx258->pixel_rate, pixel_rate);
-+		link_freq = imx258->link_freq_menu_items[mode->link_freq_index];
-+		link_freq_cfgs =
-+			&imx258->link_freq_configs[mode->link_freq_index];
-+
-+		link_cfg = &link_freq_cfgs->link_cfg[imx258->lane_mode_idx];
-+		pixel_rate = link_freq_to_pixel_rate(link_freq, link_cfg);
-+		__v4l2_ctrl_modify_range(imx258->pixel_rate, pixel_rate,
-+					 pixel_rate, 1, pixel_rate);
- 		/* Update limits and set FPS to default */
- 		vblank_def = imx258->cur_mode->vts_def -
- 			     imx258->cur_mode->height;
-@@ -926,11 +1287,12 @@ static int imx258_set_pad_format(struct
- 			     imx258->cur_mode->height;
- 		__v4l2_ctrl_modify_range(
- 			imx258->vblank, vblank_min,
--			IMX258_VTS_MAX - imx258->cur_mode->height, 1,
--			vblank_def);
-+			((1 << IMX258_LONG_EXP_SHIFT_MAX) * IMX258_VTS_MAX) -
-+						imx258->cur_mode->height,
-+			1, vblank_def);
- 		__v4l2_ctrl_s_ctrl(imx258->vblank, vblank_def);
- 		h_blank =
--			link_freq_configs[mode->link_freq_index].pixels_per_line
-+			imx258->link_freq_configs[mode->link_freq_index].pixels_per_line
- 			 - imx258->cur_mode->width;
- 		__v4l2_ctrl_modify_range(imx258->hblank, h_blank,
- 					 h_blank, 1, h_blank);
-@@ -941,36 +1303,107 @@ static int imx258_set_pad_format(struct
- 	return 0;
- }
- 
-+static const struct v4l2_rect *
-+__imx258_get_pad_crop(struct imx258 *imx258,
-+		      struct v4l2_subdev_state *sd_state,
-+		      unsigned int pad, enum v4l2_subdev_format_whence which)
-+{
-+	switch (which) {
-+	case V4L2_SUBDEV_FORMAT_TRY:
-+		return v4l2_subdev_get_try_crop(&imx258->sd, sd_state, pad);
-+	case V4L2_SUBDEV_FORMAT_ACTIVE:
-+		return &imx258->cur_mode->crop;
-+	}
-+
-+	return NULL;
-+}
-+
-+static int imx258_get_selection(struct v4l2_subdev *sd,
-+				struct v4l2_subdev_state *sd_state,
-+				struct v4l2_subdev_selection *sel)
-+{
-+	switch (sel->target) {
-+	case V4L2_SEL_TGT_CROP: {
-+		struct imx258 *imx258 = to_imx258(sd);
-+
-+		mutex_lock(&imx258->mutex);
-+		sel->r = *__imx258_get_pad_crop(imx258, sd_state, sel->pad,
-+						sel->which);
-+		mutex_unlock(&imx258->mutex);
-+
-+		return 0;
-+	}
-+
-+	case V4L2_SEL_TGT_NATIVE_SIZE:
-+		sel->r.left = 0;
-+		sel->r.top = 0;
-+		sel->r.width = IMX258_NATIVE_WIDTH;
-+		sel->r.height = IMX258_NATIVE_HEIGHT;
-+
-+		return 0;
-+
-+	case V4L2_SEL_TGT_CROP_DEFAULT:
-+	case V4L2_SEL_TGT_CROP_BOUNDS:
-+		sel->r.left = IMX258_PIXEL_ARRAY_LEFT;
-+		sel->r.top = IMX258_PIXEL_ARRAY_TOP;
-+		sel->r.width = IMX258_PIXEL_ARRAY_WIDTH;
-+		sel->r.height = IMX258_PIXEL_ARRAY_HEIGHT;
-+
-+		return 0;
-+	}
-+
-+	return -EINVAL;
-+}
-+
- /* Start streaming */
- static int imx258_start_streaming(struct imx258 *imx258)
- {
- 	struct i2c_client *client = v4l2_get_subdevdata(&imx258->sd);
- 	const struct imx258_reg_list *reg_list;
-+	const struct imx258_link_freq_config *link_freq_cfg;
- 	int ret, link_freq_index;
- 
-+	ret = imx258_write_reg(imx258, IMX258_REG_RESET, IMX258_REG_VALUE_08BIT,
-+			       0x01);
-+	if (ret) {
-+		dev_err(&client->dev, "%s failed to reset sensor\n", __func__);
-+		return ret;
-+	}
-+	usleep_range(10000, 15000);
-+
- 	/* Setup PLL */
- 	link_freq_index = imx258->cur_mode->link_freq_index;
--	reg_list = &link_freq_configs[link_freq_index].reg_list;
-+	link_freq_cfg = &imx258->link_freq_configs[link_freq_index];
-+
-+	reg_list = &link_freq_cfg->link_cfg[imx258->lane_mode_idx].reg_list;
- 	ret = imx258_write_regs(imx258, reg_list->regs, reg_list->num_of_regs);
- 	if (ret) {
- 		dev_err(&client->dev, "%s failed to set plls\n", __func__);
- 		return ret;
- 	}
- 
--	/* Apply default values of current mode */
--	reg_list = &imx258->cur_mode->reg_list;
--	ret = imx258_write_regs(imx258, reg_list->regs, reg_list->num_of_regs);
-+	ret = imx258_write_regs(imx258, imx258->variant_cfg->regs,
-+				imx258->variant_cfg->num_regs);
- 	if (ret) {
--		dev_err(&client->dev, "%s failed to set mode\n", __func__);
-+		dev_err(&client->dev, "%s failed to set variant config\n",
-+			__func__);
- 		return ret;
- 	}
- 
--	/* Set Orientation be 180 degree */
--	ret = imx258_write_reg(imx258, REG_MIRROR_FLIP_CONTROL,
--			       IMX258_REG_VALUE_08BIT, REG_CONFIG_MIRROR_FLIP);
-+	ret = imx258_write_reg(imx258, IMX258_CLK_BLANK_STOP,
-+			       IMX258_REG_VALUE_08BIT,
-+			       imx258->csi2_flags & V4L2_MBUS_CSI2_NONCONTINUOUS_CLOCK ?
-+			       1 : 0);
- 	if (ret) {
--		dev_err(&client->dev, "%s failed to set orientation\n",
--			__func__);
-+		dev_err(&client->dev, "%s failed to set clock lane mode\n", __func__);
-+		return ret;
-+	}
-+
-+	/* Apply default values of current mode */
-+	reg_list = &imx258->cur_mode->reg_list;
-+	ret = imx258_write_regs(imx258, reg_list->regs, reg_list->num_of_regs);
-+	if (ret) {
-+		dev_err(&client->dev, "%s failed to set mode\n", __func__);
- 		return ret;
- 	}
- 
-@@ -1010,9 +1443,19 @@ static int imx258_power_on(struct device
- 	struct imx258 *imx258 = to_imx258(sd);
- 	int ret;
- 
-+	ret = regulator_bulk_enable(IMX258_NUM_SUPPLIES,
-+				    imx258->supplies);
-+	if (ret) {
-+		dev_err(dev, "%s: failed to enable regulators\n",
-+			__func__);
-+		return ret;
-+	}
-+
- 	ret = clk_prepare_enable(imx258->clk);
--	if (ret)
-+	if (ret) {
- 		dev_err(dev, "failed to enable clock\n");
-+		regulator_bulk_disable(IMX258_NUM_SUPPLIES, imx258->supplies);
-+	}
- 
- 	return ret;
- }
-@@ -1023,6 +1466,7 @@ static int imx258_power_off(struct devic
- 	struct imx258 *imx258 = to_imx258(sd);
- 
- 	clk_disable_unprepare(imx258->clk);
-+	regulator_bulk_disable(IMX258_NUM_SUPPLIES, imx258->supplies);
- 
- 	return 0;
- }
-@@ -1133,6 +1577,7 @@ static const struct v4l2_subdev_pad_ops
- 	.get_fmt = imx258_get_pad_format,
- 	.set_fmt = imx258_set_pad_format,
- 	.enum_frame_size = imx258_enum_frame_size,
-+	.get_selection = imx258_get_selection,
- };
- 
- static const struct v4l2_subdev_ops imx258_subdev_ops = {
-@@ -1148,15 +1593,17 @@ static const struct v4l2_subdev_internal
- static int imx258_init_controls(struct imx258 *imx258)
- {
- 	struct i2c_client *client = v4l2_get_subdevdata(&imx258->sd);
-+	const struct imx258_link_freq_config *link_freq_cfgs;
-+	struct v4l2_fwnode_device_properties props;
- 	struct v4l2_ctrl_handler *ctrl_hdlr;
-+	const struct imx258_link_cfg *link_cfg;
- 	s64 vblank_def;
- 	s64 vblank_min;
--	s64 pixel_rate_min;
--	s64 pixel_rate_max;
-+	s64 pixel_rate;
- 	int ret;
- 
- 	ctrl_hdlr = &imx258->ctrl_handler;
--	ret = v4l2_ctrl_handler_init(ctrl_hdlr, 8);
-+	ret = v4l2_ctrl_handler_init(ctrl_hdlr, 12);
- 	if (ret)
- 		return ret;
- 
-@@ -1165,20 +1612,23 @@ static int imx258_init_controls(struct i
- 	imx258->link_freq = v4l2_ctrl_new_int_menu(ctrl_hdlr,
- 				&imx258_ctrl_ops,
- 				V4L2_CID_LINK_FREQ,
--				ARRAY_SIZE(link_freq_menu_items) - 1,
-+				ARRAY_SIZE(link_freq_menu_items_19_2) - 1,
- 				0,
--				link_freq_menu_items);
-+				imx258->link_freq_menu_items);
- 
- 	if (imx258->link_freq)
- 		imx258->link_freq->flags |= V4L2_CTRL_FLAG_READ_ONLY;
- 
--	pixel_rate_max = link_freq_to_pixel_rate(link_freq_menu_items[0]);
--	pixel_rate_min = link_freq_to_pixel_rate(link_freq_menu_items[1]);
-+	link_freq_cfgs = &imx258->link_freq_configs[0];
-+	link_cfg = link_freq_cfgs[imx258->lane_mode_idx].link_cfg;
-+	pixel_rate = link_freq_to_pixel_rate(imx258->link_freq_menu_items[0],
-+					     link_cfg);
-+
- 	/* By default, PIXEL_RATE is read only */
- 	imx258->pixel_rate = v4l2_ctrl_new_std(ctrl_hdlr, &imx258_ctrl_ops,
- 				V4L2_CID_PIXEL_RATE,
--				pixel_rate_min, pixel_rate_max,
--				1, pixel_rate_max);
-+				pixel_rate, pixel_rate,
-+				1, pixel_rate);
- 
- 
- 	vblank_def = imx258->cur_mode->vts_def - imx258->cur_mode->height;
-@@ -1189,9 +1639,6 @@ static int imx258_init_controls(struct i
- 				IMX258_VTS_MAX - imx258->cur_mode->height, 1,
- 				vblank_def);
- 
--	if (imx258->vblank)
--		imx258->vblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
--
- 	imx258->hblank = v4l2_ctrl_new_std(
- 				ctrl_hdlr, &imx258_ctrl_ops, V4L2_CID_HBLANK,
- 				IMX258_PPL_DEFAULT - imx258->cur_mode->width,
-@@ -1225,6 +1672,25 @@ static int imx258_init_controls(struct i
- 				ARRAY_SIZE(imx258_test_pattern_menu) - 1,
- 				0, 0, imx258_test_pattern_menu);
- 
-+	ret = v4l2_fwnode_device_parse(&client->dev, &props);
-+	if (ret)
-+		goto error;
-+	ret = v4l2_ctrl_new_fwnode_properties(ctrl_hdlr, &imx258_ctrl_ops,
-+					      &props);
-+	if (ret)
-+		goto error;
-+
-+	imx258->hflip = v4l2_ctrl_new_std(ctrl_hdlr, &imx258_ctrl_ops,
-+					  V4L2_CID_HFLIP, 0, 1, 1,
-+					  props.rotation == 180 ? 1 : 0);
-+	if (imx258->hflip)
-+		imx258->hflip->flags |= V4L2_CTRL_FLAG_MODIFY_LAYOUT;
-+
-+	imx258->vflip = v4l2_ctrl_new_std(ctrl_hdlr, &imx258_ctrl_ops,
-+					  V4L2_CID_VFLIP, 0, 1, 1,
-+					  props.rotation == 180 ? 1 : 0);
-+	if (imx258->vflip)
-+		imx258->vflip->flags |= V4L2_CTRL_FLAG_MODIFY_LAYOUT;
- 	if (ctrl_hdlr->error) {
- 		ret = ctrl_hdlr->error;
- 		dev_err(&client->dev, "%s control init failed (%d)\n",
-@@ -1249,9 +1715,33 @@ static void imx258_free_controls(struct
- 	mutex_destroy(&imx258->mutex);
- }
- 
-+static int imx258_get_regulators(struct imx258 *imx258,
-+				 struct i2c_client *client)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < IMX258_NUM_SUPPLIES; i++)
-+		imx258->supplies[i].supply = imx258_supply_name[i];
-+
-+	return devm_regulator_bulk_get(&client->dev,
-+				       IMX258_NUM_SUPPLIES,
-+				       imx258->supplies);
-+}
-+
-+static const struct of_device_id imx258_dt_ids[] = {
-+	{ .compatible = "sony,imx258", .data = &imx258_cfg },
-+	{ .compatible = "sony,imx258-pdaf", .data = &imx258_pdaf_cfg },
-+	{ /* sentinel */ }
-+};
-+
- static int imx258_probe(struct i2c_client *client)
- {
- 	struct imx258 *imx258;
-+	struct fwnode_handle *endpoint;
-+	struct v4l2_fwnode_endpoint ep = {
-+		.bus_type = V4L2_MBUS_CSI2_DPHY
-+	};
-+	const struct of_device_id *match;
- 	int ret;
- 	u32 val = 0;
- 
-@@ -1259,6 +1749,10 @@ static int imx258_probe(struct i2c_clien
- 	if (!imx258)
- 		return -ENOMEM;
- 
-+	ret = imx258_get_regulators(imx258, client);
-+	if (ret)
-+		return ret;
-+
- 	imx258->clk = devm_clk_get_optional(&client->dev, NULL);
- 	if (IS_ERR(imx258->clk))
- 		return dev_err_probe(&client->dev, PTR_ERR(imx258->clk),
-@@ -1268,21 +1762,67 @@ static int imx258_probe(struct i2c_clien
- 			"no clock provided, using clock-frequency property\n");
- 
- 		device_property_read_u32(&client->dev, "clock-frequency", &val);
-+	} else if (IS_ERR(imx258->clk)) {
-+		return dev_err_probe(&client->dev, PTR_ERR(imx258->clk),
-+				     "error getting clock\n");
- 	} else {
- 		val = clk_get_rate(imx258->clk);
- 	}
--	if (val != IMX258_INPUT_CLOCK_FREQ) {
--		dev_err(&client->dev, "input clock frequency not supported\n");
-+
-+	switch (val) {
-+	case 19200000:
-+		imx258->link_freq_configs = link_freq_configs_19_2;
-+		imx258->link_freq_menu_items = link_freq_menu_items_19_2;
-+		break;
-+	case 24000000:
-+		imx258->link_freq_configs = link_freq_configs_24;
-+		imx258->link_freq_menu_items = link_freq_menu_items_24;
-+		break;
-+	default:
-+		dev_err(&client->dev, "input clock frequency of %u not supported\n",
-+			val);
- 		return -EINVAL;
- 	}
- 
--	/*
--	 * Check that the device is mounted upside down. The driver only
--	 * supports a single pixel order right now.
--	 */
--	ret = device_property_read_u32(&client->dev, "rotation", &val);
--	if (ret || val != 180)
-+	endpoint = fwnode_graph_get_next_endpoint(dev_fwnode(&client->dev), NULL);
-+	if (!endpoint) {
-+		dev_err(&client->dev, "Endpoint node not found\n");
- 		return -EINVAL;
-+	}
-+
-+	ret = v4l2_fwnode_endpoint_alloc_parse(endpoint, &ep);
-+	fwnode_handle_put(endpoint);
-+	if (ret == -ENXIO) {
-+		dev_err(&client->dev, "Unsupported bus type, should be CSI2\n");
-+		goto error_endpoint_poweron;
-+	} else if (ret) {
-+		dev_err(&client->dev, "Parsing endpoint node failed\n");
-+		goto error_endpoint_poweron;
-+	}
-+
-+	/* Get number of data lanes */
-+	switch (ep.bus.mipi_csi2.num_data_lanes) {
-+	case 2:
-+		imx258->lane_mode_idx = IMX258_2_LANE_MODE;
-+		break;
-+	case 4:
-+		imx258->lane_mode_idx = IMX258_4_LANE_MODE;
-+		break;
-+	default:
-+		dev_err(&client->dev, "Invalid data lanes: %u\n",
-+			ep.bus.mipi_csi2.num_data_lanes);
-+		ret = -EINVAL;
-+		goto error_endpoint_poweron;
-+	}
-+
-+	imx258->csi2_flags = ep.bus.mipi_csi2.flags;
-+
-+	match = i2c_of_match_device(imx258_dt_ids, client);
-+	if (!match || !match->data)
-+		imx258->variant_cfg = &imx258_cfg;
-+	else
-+		imx258->variant_cfg =
-+			(const struct imx258_variant_cfg *)match->data;
- 
- 	/* Initialize subdev */
- 	v4l2_i2c_subdev_init(&imx258->sd, client, &imx258_subdev_ops);
-@@ -1290,7 +1830,7 @@ static int imx258_probe(struct i2c_clien
- 	/* Will be powered off via pm_runtime_idle */
- 	ret = imx258_power_on(&client->dev);
- 	if (ret)
--		return ret;
-+		goto error_endpoint_poweron;
- 
- 	/* Check module identity */
- 	ret = imx258_identify_module(imx258);
-@@ -1335,6 +1875,9 @@ error_handler_free:
- error_identify:
- 	imx258_power_off(&client->dev);
- 
-+error_endpoint_poweron:
-+	v4l2_fwnode_endpoint_free(&ep);
-+
- 	return ret;
- }
- 
-@@ -1367,10 +1910,6 @@ static const struct acpi_device_id imx25
- MODULE_DEVICE_TABLE(acpi, imx258_acpi_ids);
- #endif
- 
--static const struct of_device_id imx258_dt_ids[] = {
--	{ .compatible = "sony,imx258" },
--	{ /* sentinel */ }
--};
- MODULE_DEVICE_TABLE(of, imx258_dt_ids);
- 
- static struct i2c_driver imx258_i2c_driver = {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0194-media-i2c-imx290-Support-for-the-Sony-IMX290-sensor.patch b/target/linux/bcm27xx/patches-6.1/950-0194-media-i2c-imx290-Support-for-the-Sony-IMX290-sensor.patch
deleted file mode 100644
index a516243c70..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0194-media-i2c-imx290-Support-for-the-Sony-IMX290-sensor.patch
+++ /dev/null
@@ -1,1291 +0,0 @@
-From 9b20808b904563590556e0a86e5d6186047ef54f Mon Sep 17 00:00:00 2001
-From: Andrey Konovalov <andrey.konovalov@linaro.org>
-Date: Fri, 12 Jun 2020 15:53:46 +0200
-Subject: [PATCH] media: i2c: imx290: Support for the Sony IMX290
- sensor
-
-media: i2c: imx290: set the format before VIDIOC_SUBDEV_G_FMT is called
-
-Commit d46cfdc86c30d5ec768924f0b1e2683c8d20b671 upstream.
-
-With the current driver 'media-ctl -p' issued right after the imx290 driver
-is loaded prints:
-pad0: Source
-             [fmt:unknown/0x0]
-
-The format value of zero is due to the current_format field of the imx290
-struct not being initialized yet.
-
-As imx290_entity_init_cfg() calls imx290_set_fmt(), the current_mode field
-is also initialized, so the line which set current_mode to a default value
-in driver's probe() function is no longer needed.
-
-Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
-Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
-Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
-
-media: i2c: imx290: Add support for 74.25MHz clock
-
-The existing driver only supported a clock of 37.125MHz, but the
-sensor also supports 74.25MHz.
-
-Add the relevant register modifications to support this alternate
-clock frequency.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx290: Correct range for V4L2_CID_GAIN to 0-238
-
-The datasheet lists the gain as being 0.0 to 72.0dB in 0.3dB steps, which
-makes 238 steps total.
-Correct the 0-72 range defined in the driver.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx290: Convert HMAX setting into V4L2_CID_HBLANK
-
-Userspace needs to know HBLANK if it is to work out exposure times
-and frame rates, therefore convert it to map onto V4L2_CID_HBLANK
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx290: Add support for V4L2_CID_VBLANK
-
-In order to calculate framerate and durations userspace needs
-the vertical blanking information. This can be configurable,
-and indeed the datasheet lists different values for VBLANK for
-the 1080p and 720p modes.
-
-Add the new control, and adopt the datasheet values for each mode.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx290: Add exposure control to the driver.
-
-Adds support for V4L2_CID_EXPOSURE so that userspace can control
-the sensor exposure time.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx290: Add H and V flip controls
-
-The sensor supports horizontal and vertical flips, so support them
-through V4L2_CID_HFLIP and V4L2_CID_VFLIP.
-
-This sensor does NOT change the Bayer order when changing the
-direction of readout, therefore no special handling is required for
-that.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: dt-bindings: media: i2c: Add mono version to IMX290 bindings
-
-The IMX290 module is available as either monochrome or colour and
-the variant is not detectable at runtime.
-
-Add a new compatible string for the monochrome version.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media : i2c: imx290: Add support for the mono sensor variant.
-
-The IMX290 module is available as either mono or colour (Bayer).
-
-Update the driver so that it can advertise the correct mono
-formats instead of the colour ones.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx290: Switch set_hmax to use imx290_write_buffered_reg
-
-imx290_set_hmax was using two independent writes to set up hmax,
-when all other multi-register writes were using imx290_write_buffered_reg
-which claims the group hold first.
-
-Switch imx290_set_hmax to using imx290_write_buffered_reg too.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx290: Add support for g_selection to report cropping
-
-Userspace needs to know the cropping arrangements for each mode,
-so expose this through g_selection.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx290: Set the colorspace fields in the format
-
-The colorspace fields were left untouched in imx290_set_fmt
-which lead to a v4l2-compliance failure.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx290: Replace V4L2_CID_GAIN with V4L2_CID_ANALOGUE_GAIN
-
-Most software (including libcamera) requires V4L2_CID_ANALOGUE_GAIN,
-not V4L2_CID_GAIN.
-
-The range for the control is 0 to 100 for which the sensor uses only
-analogue gain; higher values would involve digital gain which this
-control should not apply.
-
-Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
-
-media: i2c: imx290: Fix number of controls in v4l2_ctrl_handler_init
-
-The number is only a hint, but may as well be correct.
-
-Fixes: 471e0029e98aa ("media: i2c: imx290: Convert HMAX setting into V4L2_CID_HBLANK")
-Fixes: be0b9b7ad1c27 ("media: i2c: imx290: Add support for V4L2_CID_VBLANK")
-Fixes: 8483f0d7599aa ("media: i2c: imx290: Add exposure control to the driver.")
-Fixes: 9764f3459c401 ("media: i2c: imx290: Add H and V flip controls")
-Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
-
-media: i2c: imx290: Fix up exposure calcuations and ranges
-
-Should now correspond exactly to the datasheet.
-
-Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
-
-media: i2c: imx290: Handle exposure correctly when vblank changes
-
-When vblank changes we must modify the exposure range. Also, with this
-sensor, the effective exposure time implicitly changes when vblank
-does, so we have to reset it after every vblank update.
-
-Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
-
-media: i2c: imx290: Support 60fps in 2 lane operation
-
-Commit "97589ad61c73 media: i2c: imx290: Add support for 2 data lanes"
-added support for running in two lane mode (instead of 4), but
-without changing the link frequency that resulted in a max of 30fps.
-
-Commit "98e0500eadb7 media: i2c: imx290: Add configurable link frequency
-and pixel rate" then doubled the link frequency when in 2 lane mode,
-but didn't undo the correction for running at only 30fps, just extending
-horizontal blanking instead.
-It also didn't update the CSI timing registers in accordance with the
-datasheet.
-
-Remove the 30fps limit on 2 lane by correcting the register config
-in accordance with the datasheet for 60fps operation over 2 lanes.
-Frame rate control (via V4L2_CID_VBLANK or HBLANK) can still reduce
-the frame rate on 2 lanes back to 30fps.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx290: Fix the pixel rate at 148.5Mpix/s
-
-Whilst the datasheet lists the link frequency changing between
-1080p and 720p modes, reality is that with the default blanking
-we have
-(1920 + 280) * (1080 + 45) * 60fps = 148.5MPix/s
-and
-(1280 + 2020) * (720 + 30) * 60fps = 148.5MPix/s
-and this reflects reality whether in 10 or 12 bit readout modes.
-
-How this relates to link frequency is unclear as it differs
-from the datasheet, but all exposure and frame rate calcs need
-the pixel rate to be correct, so make it so.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx290: Fix clock setup register assignments
-
-When the clock setups were added for the alternate external clocks,
-the settings for 2 lane 720p and 4 lane 1080p were transposed.
-2 lane 720p still worked, but 4 lane 1080p didn't.
-
-Correct the assignments.
-
-Fixes: 6b0c094a5b58 (media: i2c: imx290: Add support for 74.25MHz clock")
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx290: Add fwnode properties controls
-
-Add call to v4l2_ctrl_new_fwnode_properties to read and
-create the fwnode based controls.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx290: Sensor should report RAW color space
-
-Tested on Raspberry Pi running libcamera.
-
-Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
-
-media: i2c: imx290: Add compatible strings for IMX327 and IMX462
-
-IMX327 is the previous generation to IMX290, and supports up to 1080p60
-as 10 or 12 bit.
-IMX290 adds 1080p120 in 10 bit mode.
-IMX462 adds 1080p120 in both 10 and 12 bit modes.
-
-Add compatible strings for all variants.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx290: Updating VBLANK should update exposure in all states
-
-The code to update the range of the exposure control was after a
-check that the sensor was powered up. This is incorrect as the
-range should be updated under all conditions.
-
-Move the range update code to the correct place.
-
-Fixes: 52d076ea221e "media: i2c: imx290: Handle exposure correctly when vblank changes"
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx290: Drop incorrect comment about pixelrate
-
-commit b5eca6fd4284 ("media: i2c: imx290: Fix the pixel rate at 148.5Mpix/s")
-corrected imx290_calc_pixel_rate to always return the correct
-pixle rate of 148.5Mpix/s, but didn't remove the comment that said
-it relied on some other parameters.
-
-Drop that comment.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx290: Do not reset exposure time from set_fmt
-
-V4L2 controls are meant to be persistent, and only altered if
-the values break hardware constraints.
-
-In imx290_set_fmt the CID_VBLANK parameter was being reset to
-the mode default, and therefore the maximum exposure value
-potentially also changed.
-
-VBLANK is no longer reset, and even if it is, then the set_ctrl
-that will be called will alter the range for the exposure
-control. Therefore there is no need to reset the exposure time
-from set_fmt.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: imx290: Correct min HBLANK.
-
-In the 720p mode the CSI link is run at a lower frequency, and
-the minimum HBLANK value has to be increased to avoid generating
-more data from the sensor than the link can carry.
-
-Set the minimum based on the mode.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../devicetree/bindings/media/i2c/imx290.txt  |   7 +-
- drivers/media/i2c/imx290.c                    | 620 ++++++++++++++----
- 2 files changed, 491 insertions(+), 136 deletions(-)
-
---- a/Documentation/devicetree/bindings/media/i2c/imx290.txt
-+++ b/Documentation/devicetree/bindings/media/i2c/imx290.txt
-@@ -1,13 +1,14 @@
- * Sony IMX290 1/2.8-Inch CMOS Image Sensor
- 
- The Sony IMX290 is a 1/2.8-Inch CMOS Solid-state image sensor with
--Square Pixel for Color Cameras. It is programmable through I2C and 4-wire
--interfaces. The sensor output is available via CMOS logic parallel SDR output,
-+Square Pixel for Color or Monochrome Cameras. It is programmable through I2C
-+and 4-wire interfaces.
-+The sensor output is available via CMOS logic parallel SDR output,
- Low voltage LVDS DDR output and CSI-2 serial data output. The CSI-2 bus is the
- default. No bindings have been defined for the other busses.
- 
- Required Properties:
--- compatible: Should be "sony,imx290"
-+- compatible: Should be "sony,imx290", or "sony,imx290-mono"
- - reg: I2C bus address of the device
- - clocks: Reference to the xclk clock.
- - clock-names: Should be "xclk".
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -1,6 +1,16 @@
- // SPDX-License-Identifier: GPL-2.0
- /*
-- * Sony IMX290 CMOS Image Sensor Driver
-+ * Sony IMX462 / IMX290 / IMX327 CMOS Image Sensor Driver
-+ *
-+ * The IMX462, IMX290,and IMX327 are very similar 1920x1080 1/2.8 CMOS image
-+ * sensors.
-+ * IMX327 can support up to 60fps with 10 or 12bit readout.
-+ * IMX290 adds support for 120fps, but only 10bit and when connected over 4
-+ * CSI-2 lanes.
-+ * IMX462 adds support for 120fps in both 10 and 12bit readout modes.
-+ *
-+ * The modules don't appear to have a mechanism to identify whether the mono or
-+ * colour variant is connected, therefore it is done via compatible string.
-  *
-  * Copyright (C) 2019 FRAMOS GmbH.
-  *
-@@ -13,6 +23,7 @@
- #include <linux/gpio/consumer.h>
- #include <linux/i2c.h>
- #include <linux/module.h>
-+#include <linux/of_device.h>
- #include <linux/pm_runtime.h>
- #include <linux/regmap.h>
- #include <linux/regulator/consumer.h>
-@@ -22,15 +33,28 @@
- #include <media/v4l2-fwnode.h>
- #include <media/v4l2-subdev.h>
- 
-+enum imx290_clk_index {
-+	CLK_37_125,
-+	CLK_74_25,
-+};
-+
- #define IMX290_STANDBY 0x3000
- #define IMX290_REGHOLD 0x3001
- #define IMX290_XMSTA 0x3002
-+#define IMX290_FLIP_WINMODE 0x3007
- #define IMX290_FR_FDG_SEL 0x3009
- #define IMX290_BLKLEVEL_LOW 0x300a
- #define IMX290_BLKLEVEL_HIGH 0x300b
- #define IMX290_GAIN 0x3014
-+#define IMX290_VMAX_LOW 0x3018
-+#define IMX290_VMAX_MAX 0x3fff
- #define IMX290_HMAX_LOW 0x301c
- #define IMX290_HMAX_HIGH 0x301d
-+#define IMX290_HMAX_MAX 0xffff
-+
-+#define IMX290_EXPOSURE_MIN 1
-+#define IMX290_EXPOSURE_STEP 1
-+#define IMX290_EXPOSURE_LOW 0x3020
- #define IMX290_PGCTRL 0x308c
- #define IMX290_PHY_LANE_NUM 0x3407
- #define IMX290_CSI_LANE_MODE 0x3443
-@@ -39,6 +63,13 @@
- #define IMX290_PGCTRL_THRU BIT(1)
- #define IMX290_PGCTRL_MODE(n) ((n) << 4)
- 
-+#define IMX290_NATIVE_WIDTH		1945U
-+#define IMX290_NATIVE_HEIGHT		1109U
-+#define IMX290_PIXEL_ARRAY_LEFT		4U
-+#define IMX290_PIXEL_ARRAY_TOP		12U
-+#define IMX290_PIXEL_ARRAY_WIDTH	1937U
-+#define IMX290_PIXEL_ARRAY_HEIGHT	1097U
-+
- static const char * const imx290_supply_name[] = {
- 	"vdda",
- 	"vddd",
-@@ -56,19 +87,31 @@ struct imx290_mode {
- 	u32 width;
- 	u32 height;
- 	u32 hmax;
-+	u32 vmax;
- 	u8 link_freq_index;
-+	struct v4l2_rect crop;
-+
-+	const struct imx290_regval *mode_data;
-+	u32 mode_data_size;
-+	const struct imx290_regval *lane_data;
-+	u32 lane_data_size;
- 
--	const struct imx290_regval *data;
--	u32 data_size;
-+
-+	/* Clock setup can vary. Index as enum imx290_clk_index */
-+	const struct imx290_regval *clk_data[2];
-+	u32 clk_size;
- };
- 
- struct imx290 {
- 	struct device *dev;
- 	struct clk *xclk;
-+	u32 xclk_freq;
- 	struct regmap *regmap;
- 	u8 nlanes;
- 	u8 bpp;
- 
-+	const struct imx290_pixfmt *formats;
-+
- 	struct v4l2_subdev sd;
- 	struct media_pad pad;
- 	struct v4l2_mbus_framefmt current_format;
-@@ -80,6 +123,11 @@ struct imx290 {
- 	struct v4l2_ctrl_handler ctrls;
- 	struct v4l2_ctrl *link_freq;
- 	struct v4l2_ctrl *pixel_rate;
-+	struct v4l2_ctrl *hblank;
-+	struct v4l2_ctrl *vblank;
-+	struct v4l2_ctrl *hflip;
-+	struct v4l2_ctrl *vflip;
-+	struct v4l2_ctrl *exposure;
- 
- 	struct mutex lock;
- };
-@@ -89,11 +137,18 @@ struct imx290_pixfmt {
- 	u8 bpp;
- };
- 
--static const struct imx290_pixfmt imx290_formats[] = {
-+#define IMX290_NUM_FORMATS 2
-+
-+static const struct imx290_pixfmt imx290_colour_formats[IMX290_NUM_FORMATS] = {
- 	{ MEDIA_BUS_FMT_SRGGB10_1X10, 10 },
- 	{ MEDIA_BUS_FMT_SRGGB12_1X12, 12 },
- };
- 
-+static const struct imx290_pixfmt imx290_mono_formats[IMX290_NUM_FORMATS] = {
-+	{ MEDIA_BUS_FMT_Y10_1X10, 10 },
-+	{ MEDIA_BUS_FMT_Y12_1X12, 12 },
-+};
-+
- static const struct regmap_config imx290_regmap_config = {
- 	.reg_bits = 16,
- 	.val_bits = 8,
-@@ -113,11 +168,7 @@ static const char * const imx290_test_pa
- 
- static const struct imx290_regval imx290_global_init_settings[] = {
- 	{ 0x3007, 0x00 },
--	{ 0x3018, 0x65 },
--	{ 0x3019, 0x04 },
- 	{ 0x301a, 0x00 },
--	{ 0x3444, 0x20 },
--	{ 0x3445, 0x25 },
- 	{ 0x303a, 0x0c },
- 	{ 0x3040, 0x00 },
- 	{ 0x3041, 0x00 },
-@@ -171,8 +222,33 @@ static const struct imx290_regval imx290
- 	{ 0x33b3, 0x04 },
- };
- 
--static const struct imx290_regval imx290_1080p_settings[] = {
-+static const struct imx290_regval imx290_37_125mhz_clock_1080p[] = {
-+	{ 0x305c, 0x18 },
-+	{ 0x305d, 0x03 },
-+	{ 0x305e, 0x20 },
-+	{ 0x305f, 0x01 },
-+	{ 0x315e, 0x1a },
-+	{ 0x3164, 0x1a },
-+	{ 0x3444, 0x20 },
-+	{ 0x3445, 0x25 },
-+	{ 0x3480, 0x49 },
-+};
-+
-+static const struct imx290_regval imx290_74_250mhz_clock_1080p[] = {
-+	{ 0x305c, 0x0c },
-+	{ 0x305d, 0x03 },
-+	{ 0x305e, 0x10 },
-+	{ 0x305f, 0x01 },
-+	{ 0x315e, 0x1b },
-+	{ 0x3164, 0x1b },
-+	{ 0x3444, 0x40 },
-+	{ 0x3445, 0x4a },
-+	{ 0x3480, 0x92 },
-+};
-+
-+static const struct imx290_regval imx290_1080p_common_settings[] = {
- 	/* mode settings */
-+	{ IMX290_FR_FDG_SEL, 0x01 },
- 	{ 0x3007, 0x00 },
- 	{ 0x303a, 0x0c },
- 	{ 0x3414, 0x0a },
-@@ -182,15 +258,36 @@ static const struct imx290_regval imx290
- 	{ 0x3419, 0x04 },
- 	{ 0x3012, 0x64 },
- 	{ 0x3013, 0x00 },
--	{ 0x305c, 0x18 },
--	{ 0x305d, 0x03 },
--	{ 0x305e, 0x20 },
--	{ 0x305f, 0x01 },
--	{ 0x315e, 0x1a },
--	{ 0x3164, 0x1a },
--	{ 0x3480, 0x49 },
-+};
-+
-+static const struct imx290_regval imx290_1080p_2lane_settings[] = {
-+	{ 0x3405, 0x00 },
- 	/* data rate settings */
-+	{ IMX290_PHY_LANE_NUM, 0x01 },
-+	{ IMX290_CSI_LANE_MODE, 0x01 },
-+	{ 0x3446, 0x77 },
-+	{ 0x3447, 0x00 },
-+	{ 0x3448, 0x67 },
-+	{ 0x3449, 0x00 },
-+	{ 0x344a, 0x47 },
-+	{ 0x344b, 0x00 },
-+	{ 0x344c, 0x37 },
-+	{ 0x344d, 0x00 },
-+	{ 0x344e, 0x3f },
-+	{ 0x344f, 0x00 },
-+	{ 0x3450, 0xff },
-+	{ 0x3451, 0x00 },
-+	{ 0x3452, 0x3f },
-+	{ 0x3453, 0x00 },
-+	{ 0x3454, 0x37 },
-+	{ 0x3455, 0x00 },
-+};
-+
-+static const struct imx290_regval imx290_1080p_4lane_settings[] = {
- 	{ 0x3405, 0x10 },
-+	/* data rate settings */
-+	{ IMX290_PHY_LANE_NUM, 0x03 },
-+	{ IMX290_CSI_LANE_MODE, 0x03 },
- 	{ 0x3446, 0x57 },
- 	{ 0x3447, 0x00 },
- 	{ 0x3448, 0x37 },
-@@ -209,8 +306,33 @@ static const struct imx290_regval imx290
- 	{ 0x3455, 0x00 },
- };
- 
--static const struct imx290_regval imx290_720p_settings[] = {
-+static const struct imx290_regval imx290_37_125mhz_clock_720p[] = {
-+	{ 0x305c, 0x20 },
-+	{ 0x305d, 0x00 },
-+	{ 0x305e, 0x20 },
-+	{ 0x305f, 0x01 },
-+	{ 0x315e, 0x1a },
-+	{ 0x3164, 0x1a },
-+	{ 0x3444, 0x20 },
-+	{ 0x3445, 0x25 },
-+	{ 0x3480, 0x49 },
-+};
-+
-+static const struct imx290_regval imx290_74_250mhz_clock_720p[] = {
-+	{ 0x305c, 0x10 },
-+	{ 0x305d, 0x00 },
-+	{ 0x305e, 0x10 },
-+	{ 0x305f, 0x01 },
-+	{ 0x315e, 0x1b },
-+	{ 0x3164, 0x1b },
-+	{ 0x3444, 0x40 },
-+	{ 0x3445, 0x4a },
-+	{ 0x3480, 0x92 },
-+};
-+
-+static const struct imx290_regval imx290_720p_common_settings[] = {
- 	/* mode settings */
-+	{ IMX290_FR_FDG_SEL, 0x01 },
- 	{ 0x3007, 0x10 },
- 	{ 0x303a, 0x06 },
- 	{ 0x3414, 0x04 },
-@@ -220,15 +342,36 @@ static const struct imx290_regval imx290
- 	{ 0x3419, 0x02 },
- 	{ 0x3012, 0x64 },
- 	{ 0x3013, 0x00 },
--	{ 0x305c, 0x20 },
--	{ 0x305d, 0x00 },
--	{ 0x305e, 0x20 },
--	{ 0x305f, 0x01 },
--	{ 0x315e, 0x1a },
--	{ 0x3164, 0x1a },
--	{ 0x3480, 0x49 },
-+};
-+
-+static const struct imx290_regval imx290_720p_2lane_settings[] = {
-+	{ 0x3405, 0x00 },
-+	{ IMX290_PHY_LANE_NUM, 0x01 },
-+	{ IMX290_CSI_LANE_MODE, 0x01 },
- 	/* data rate settings */
-+	{ 0x3446, 0x67 },
-+	{ 0x3447, 0x00 },
-+	{ 0x3448, 0x57 },
-+	{ 0x3449, 0x00 },
-+	{ 0x344a, 0x2f },
-+	{ 0x344b, 0x00 },
-+	{ 0x344c, 0x27 },
-+	{ 0x344d, 0x00 },
-+	{ 0x344e, 0x2f },
-+	{ 0x344f, 0x00 },
-+	{ 0x3450, 0xbf },
-+	{ 0x3451, 0x00 },
-+	{ 0x3452, 0x2f },
-+	{ 0x3453, 0x00 },
-+	{ 0x3454, 0x27 },
-+	{ 0x3455, 0x00 },
-+};
-+
-+static const struct imx290_regval imx290_720p_4lane_settings[] = {
- 	{ 0x3405, 0x10 },
-+	{ IMX290_PHY_LANE_NUM, 0x03 },
-+	{ IMX290_CSI_LANE_MODE, 0x03 },
-+	/* data rate settings */
- 	{ 0x3446, 0x4f },
- 	{ 0x3447, 0x00 },
- 	{ 0x3448, 0x2f },
-@@ -308,18 +451,46 @@ static const struct imx290_mode imx290_m
- 	{
- 		.width = 1920,
- 		.height = 1080,
--		.hmax = 0x1130,
-+		.hmax = 0x0898,
-+		.vmax = 0x0465,
- 		.link_freq_index = FREQ_INDEX_1080P,
--		.data = imx290_1080p_settings,
--		.data_size = ARRAY_SIZE(imx290_1080p_settings),
-+		.crop = {
-+			.left = 4 + 8,
-+			.top = 12 + 8,
-+			.width = 1920,
-+			.height = 1080,
-+		},
-+		.mode_data = imx290_1080p_common_settings,
-+		.mode_data_size = ARRAY_SIZE(imx290_1080p_common_settings),
-+		.lane_data = imx290_1080p_2lane_settings,
-+		.lane_data_size = ARRAY_SIZE(imx290_1080p_2lane_settings),
-+		.clk_data = {
-+			[CLK_37_125] = imx290_37_125mhz_clock_1080p,
-+			[CLK_74_25] = imx290_74_250mhz_clock_1080p,
-+		},
-+		.clk_size = ARRAY_SIZE(imx290_37_125mhz_clock_1080p),
- 	},
- 	{
- 		.width = 1280,
- 		.height = 720,
--		.hmax = 0x19c8,
-+		.hmax = 0x0ce4,
-+		.vmax = 0x02ee,
- 		.link_freq_index = FREQ_INDEX_720P,
--		.data = imx290_720p_settings,
--		.data_size = ARRAY_SIZE(imx290_720p_settings),
-+		.crop = {
-+			.left = 4 + 8 + 320,
-+			.top = 12 + 8 + 180,
-+			.width = 1280,
-+			.height = 720,
-+		},
-+		.mode_data = imx290_720p_common_settings,
-+		.mode_data_size = ARRAY_SIZE(imx290_720p_common_settings),
-+		.lane_data = imx290_720p_2lane_settings,
-+		.lane_data_size = ARRAY_SIZE(imx290_720p_2lane_settings),
-+		.clk_data = {
-+			[CLK_37_125] = imx290_37_125mhz_clock_720p,
-+			[CLK_74_25] = imx290_74_250mhz_clock_720p,
-+		},
-+		.clk_size = ARRAY_SIZE(imx290_37_125mhz_clock_720p),
- 	},
- };
- 
-@@ -328,17 +499,45 @@ static const struct imx290_mode imx290_m
- 		.width = 1920,
- 		.height = 1080,
- 		.hmax = 0x0898,
-+		.vmax = 0x0465,
- 		.link_freq_index = FREQ_INDEX_1080P,
--		.data = imx290_1080p_settings,
--		.data_size = ARRAY_SIZE(imx290_1080p_settings),
-+		.crop = {
-+			.left = 4 + 8,
-+			.top = 12 + 8,
-+			.width = 1920,
-+			.height = 1080,
-+		},
-+		.mode_data = imx290_1080p_common_settings,
-+		.mode_data_size = ARRAY_SIZE(imx290_1080p_common_settings),
-+		.lane_data = imx290_1080p_4lane_settings,
-+		.lane_data_size = ARRAY_SIZE(imx290_1080p_4lane_settings),
-+		.clk_data = {
-+			[CLK_37_125] = imx290_37_125mhz_clock_1080p,
-+			[CLK_74_25] = imx290_74_250mhz_clock_1080p,
-+		},
-+		.clk_size = ARRAY_SIZE(imx290_37_125mhz_clock_1080p),
- 	},
- 	{
- 		.width = 1280,
- 		.height = 720,
- 		.hmax = 0x0ce4,
-+		.vmax = 0x02ee,
- 		.link_freq_index = FREQ_INDEX_720P,
--		.data = imx290_720p_settings,
--		.data_size = ARRAY_SIZE(imx290_720p_settings),
-+		.crop = {
-+			.left = 4 + 8 + 320,
-+			.top = 12 + 8 + 180,
-+			.width = 1280,
-+			.height = 720,
-+		},
-+		.mode_data = imx290_720p_common_settings,
-+		.mode_data_size = ARRAY_SIZE(imx290_720p_common_settings),
-+		.lane_data = imx290_720p_4lane_settings,
-+		.lane_data_size = ARRAY_SIZE(imx290_720p_4lane_settings),
-+		.clk_data = {
-+			[CLK_37_125] = imx290_37_125mhz_clock_720p,
-+			[CLK_74_25] = imx290_74_250mhz_clock_720p,
-+		},
-+		.clk_size = ARRAY_SIZE(imx290_37_125mhz_clock_720p),
- 	},
- };
- 
-@@ -452,6 +651,53 @@ static int imx290_set_gain(struct imx290
- 	return ret;
- }
- 
-+static int imx290_set_exposure(struct imx290 *imx290, u32 value)
-+{
-+	u32 exposure = (imx290->current_mode->height + imx290->vblank->val) -
-+						value - 1;
-+	int ret;
-+
-+	ret = imx290_write_buffered_reg(imx290, IMX290_EXPOSURE_LOW, 3,
-+					exposure);
-+	if (ret)
-+		dev_err(imx290->dev, "Unable to write exposure\n");
-+
-+	return ret;
-+}
-+
-+static int imx290_set_hmax(struct imx290 *imx290, u32 val)
-+{
-+	u32 hmax = val + imx290->current_mode->width;
-+	int ret;
-+
-+	ret = imx290_write_buffered_reg(imx290, IMX290_HMAX_LOW, 2,
-+					hmax);
-+	if (ret)
-+		dev_err(imx290->dev, "Error setting HMAX register\n");
-+
-+	return ret;
-+}
-+
-+static int imx290_set_vmax(struct imx290 *imx290, u32 val)
-+{
-+	u32 vmax = val + imx290->current_mode->height;
-+	int ret;
-+
-+	ret = imx290_write_buffered_reg(imx290, IMX290_VMAX_LOW, 3,
-+					vmax);
-+	if (ret)
-+		dev_err(imx290->dev, "Unable to write vmax\n");
-+
-+	/*
-+	 * Becuse of the way exposure works for this sensor, updating
-+	 * vblank causes the effective exposure to change, so we must
-+	 * set it back to the "new" correct value.
-+	 */
-+	imx290_set_exposure(imx290, imx290->exposure->val);
-+
-+	return ret;
-+}
-+
- /* Stop streaming */
- static int imx290_stop_streaming(struct imx290 *imx290)
- {
-@@ -471,15 +717,50 @@ static int imx290_set_ctrl(struct v4l2_c
- 	struct imx290 *imx290 = container_of(ctrl->handler,
- 					     struct imx290, ctrls);
- 	int ret = 0;
-+	u8 val;
-+
-+	if (ctrl->id == V4L2_CID_VBLANK) {
-+		u32 vmax = ctrl->val + imx290->current_mode->height;
-+
-+		/*
-+		 * Changing vblank changes the allowed range for exposure.
-+		 * We don't supply the current exposure as default here as it
-+		 * may lie outside the new range. We will reset it just below.
-+		 */
-+		__v4l2_ctrl_modify_range(imx290->exposure,
-+					 IMX290_EXPOSURE_MIN,
-+					 vmax - 2,
-+					 IMX290_EXPOSURE_STEP,
-+					 vmax - 2);
-+	}
- 
- 	/* V4L2 controls values will be applied only when power is already up */
- 	if (!pm_runtime_get_if_in_use(imx290->dev))
- 		return 0;
- 
- 	switch (ctrl->id) {
--	case V4L2_CID_GAIN:
-+	case V4L2_CID_ANALOGUE_GAIN:
- 		ret = imx290_set_gain(imx290, ctrl->val);
- 		break;
-+	case V4L2_CID_EXPOSURE:
-+		ret = imx290_set_exposure(imx290, ctrl->val);
-+		break;
-+	case V4L2_CID_HBLANK:
-+		ret = imx290_set_hmax(imx290, ctrl->val);
-+		break;
-+	case V4L2_CID_VBLANK:
-+		ret = imx290_set_vmax(imx290, ctrl->val);
-+		break;
-+	case V4L2_CID_HFLIP:
-+	case V4L2_CID_VFLIP:
-+		/* WINMODE is in bits [6:4], so need to read-modify-write */
-+		ret = imx290_read_reg(imx290, IMX290_FLIP_WINMODE, &val);
-+		if (ret)
-+			break;
-+		val &= ~0x03;
-+		val |= imx290->vflip->val | (imx290->hflip->val << 1);
-+		ret = imx290_write_reg(imx290, IMX290_FLIP_WINMODE, val);
-+		break;
- 	case V4L2_CID_TEST_PATTERN:
- 		if (ctrl->val) {
- 			imx290_write_reg(imx290, IMX290_BLKLEVEL_LOW, 0x00);
-@@ -519,10 +800,12 @@ static int imx290_enum_mbus_code(struct
- 				 struct v4l2_subdev_state *sd_state,
- 				 struct v4l2_subdev_mbus_code_enum *code)
- {
--	if (code->index >= ARRAY_SIZE(imx290_formats))
-+	const struct imx290 *imx290 = to_imx290(sd);
-+
-+	if (code->index >= IMX290_NUM_FORMATS)
- 		return -EINVAL;
- 
--	code->code = imx290_formats[code->index].code;
-+	code->code = imx290->formats[code->index].code;
- 
- 	return 0;
- }
-@@ -534,8 +817,8 @@ static int imx290_enum_frame_size(struct
- 	const struct imx290 *imx290 = to_imx290(sd);
- 	const struct imx290_mode *imx290_modes = imx290_modes_ptr(imx290);
- 
--	if ((fse->code != imx290_formats[0].code) &&
--	    (fse->code != imx290_formats[1].code))
-+	if (fse->code != imx290->formats[0].code &&
-+	    fse->code != imx290->formats[1].code)
- 		return -EINVAL;
- 
- 	if (fse->index >= imx290_modes_num(imx290))
-@@ -576,23 +859,9 @@ static inline u8 imx290_get_link_freq_in
- 	return imx290->current_mode->link_freq_index;
- }
- 
--static s64 imx290_get_link_freq(struct imx290 *imx290)
--{
--	u8 index = imx290_get_link_freq_index(imx290);
--
--	return *(imx290_link_freqs_ptr(imx290) + index);
--}
--
- static u64 imx290_calc_pixel_rate(struct imx290 *imx290)
- {
--	s64 link_freq = imx290_get_link_freq(imx290);
--	u8 nlanes = imx290->nlanes;
--	u64 pixel_rate;
--
--	/* pixel rate = link_freq * 2 * nr_of_lanes / bits_per_sample */
--	pixel_rate = link_freq * 2 * nlanes;
--	do_div(pixel_rate, imx290->bpp);
--	return pixel_rate;
-+	return 148500000;
- }
- 
- static int imx290_set_fmt(struct v4l2_subdev *sd,
-@@ -613,22 +882,30 @@ static int imx290_set_fmt(struct v4l2_su
- 	fmt->format.width = mode->width;
- 	fmt->format.height = mode->height;
- 
--	for (i = 0; i < ARRAY_SIZE(imx290_formats); i++)
--		if (imx290_formats[i].code == fmt->format.code)
-+	for (i = 0; i < IMX290_NUM_FORMATS; i++)
-+		if (imx290->formats[i].code == fmt->format.code)
- 			break;
- 
--	if (i >= ARRAY_SIZE(imx290_formats))
-+	if (i >= IMX290_NUM_FORMATS)
- 		i = 0;
- 
--	fmt->format.code = imx290_formats[i].code;
-+	fmt->format.code = imx290->formats[i].code;
- 	fmt->format.field = V4L2_FIELD_NONE;
-+	fmt->format.colorspace = V4L2_COLORSPACE_RAW;
-+	fmt->format.ycbcr_enc =
-+			V4L2_MAP_YCBCR_ENC_DEFAULT(fmt->format.colorspace);
-+	fmt->format.quantization =
-+		V4L2_MAP_QUANTIZATION_DEFAULT(true, fmt->format.colorspace,
-+					      fmt->format.ycbcr_enc);
-+	fmt->format.xfer_func =
-+		V4L2_MAP_XFER_FUNC_DEFAULT(fmt->format.colorspace);
- 
- 	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
- 		format = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
- 	} else {
- 		format = &imx290->current_format;
- 		imx290->current_mode = mode;
--		imx290->bpp = imx290_formats[i].bpp;
-+		imx290->bpp = imx290->formats[i].bpp;
- 
- 		if (imx290->link_freq)
- 			__v4l2_ctrl_s_ctrl(imx290->link_freq,
-@@ -636,6 +913,18 @@ static int imx290_set_fmt(struct v4l2_su
- 		if (imx290->pixel_rate)
- 			__v4l2_ctrl_s_ctrl_int64(imx290->pixel_rate,
- 						 imx290_calc_pixel_rate(imx290));
-+
-+		if (imx290->hblank)
-+			__v4l2_ctrl_modify_range(imx290->hblank,
-+						 mode->hmax - mode->width,
-+						 IMX290_HMAX_MAX - mode->width,
-+						 1, mode->hmax - mode->width);
-+		if (imx290->vblank)
-+			__v4l2_ctrl_modify_range(imx290->vblank,
-+						 mode->vmax - mode->height,
-+						 IMX290_VMAX_MAX - mode->height,
-+						 1,
-+						 mode->vmax - mode->height);
- 	}
- 
- 	*format = fmt->format;
-@@ -665,6 +954,7 @@ static int imx290_write_current_format(s
- 
- 	switch (imx290->current_format.code) {
- 	case MEDIA_BUS_FMT_SRGGB10_1X10:
-+	case MEDIA_BUS_FMT_Y10_1X10:
- 		ret = imx290_set_register_array(imx290, imx290_10bit_settings,
- 						ARRAY_SIZE(
- 							imx290_10bit_settings));
-@@ -674,6 +964,7 @@ static int imx290_write_current_format(s
- 		}
- 		break;
- 	case MEDIA_BUS_FMT_SRGGB12_1X12:
-+	case MEDIA_BUS_FMT_Y12_1X12:
- 		ret = imx290_set_register_array(imx290, imx290_12bit_settings,
- 						ARRAY_SIZE(
- 							imx290_12bit_settings));
-@@ -690,28 +981,62 @@ static int imx290_write_current_format(s
- 	return 0;
- }
- 
--static int imx290_set_hmax(struct imx290 *imx290, u32 val)
-+static const struct v4l2_rect *
-+__imx290_get_pad_crop(struct imx290 *imx290, struct v4l2_subdev_pad_config *cfg,
-+		      unsigned int pad, enum v4l2_subdev_format_whence which)
- {
--	int ret;
-+	switch (which) {
-+	case V4L2_SUBDEV_FORMAT_TRY:
-+		return v4l2_subdev_get_try_crop(&imx290->sd, cfg, pad);
-+	case V4L2_SUBDEV_FORMAT_ACTIVE:
-+		return &imx290->current_mode->crop;
-+	}
- 
--	ret = imx290_write_reg(imx290, IMX290_HMAX_LOW, (val & 0xff));
--	if (ret) {
--		dev_err(imx290->dev, "Error setting HMAX register\n");
--		return ret;
-+	return NULL;
-+}
-+
-+static int imx290_get_selection(struct v4l2_subdev *sd,
-+				struct v4l2_subdev_pad_config *cfg,
-+				struct v4l2_subdev_selection *sel)
-+{
-+	switch (sel->target) {
-+	case V4L2_SEL_TGT_CROP: {
-+		struct imx290 *imx290 = to_imx290(sd);
-+
-+		mutex_lock(&imx290->lock);
-+		sel->r = *__imx290_get_pad_crop(imx290, cfg, sel->pad,
-+						sel->which);
-+		mutex_unlock(&imx290->lock);
-+
-+		return 0;
- 	}
- 
--	ret = imx290_write_reg(imx290, IMX290_HMAX_HIGH, ((val >> 8) & 0xff));
--	if (ret) {
--		dev_err(imx290->dev, "Error setting HMAX register\n");
--		return ret;
-+	case V4L2_SEL_TGT_NATIVE_SIZE:
-+		sel->r.top = 0;
-+		sel->r.left = 0;
-+		sel->r.width = IMX290_NATIVE_WIDTH;
-+		sel->r.height = IMX290_NATIVE_HEIGHT;
-+
-+		return 0;
-+
-+	case V4L2_SEL_TGT_CROP_DEFAULT:
-+	case V4L2_SEL_TGT_CROP_BOUNDS:
-+		sel->r.top = IMX290_PIXEL_ARRAY_TOP;
-+		sel->r.left = IMX290_PIXEL_ARRAY_LEFT;
-+		sel->r.width = IMX290_PIXEL_ARRAY_WIDTH;
-+		sel->r.height = IMX290_PIXEL_ARRAY_HEIGHT;
-+
-+		return 0;
- 	}
- 
--	return 0;
-+	return -EINVAL;
- }
- 
- /* Start streaming */
- static int imx290_start_streaming(struct imx290 *imx290)
- {
-+	enum imx290_clk_index clk_idx = imx290->xclk_freq == 37125000 ?
-+					CLK_37_125 : CLK_74_25;
- 	int ret;
- 
- 	/* Set init register settings */
-@@ -723,6 +1048,14 @@ static int imx290_start_streaming(struct
- 		return ret;
- 	}
- 
-+	ret = imx290_set_register_array(imx290,
-+					imx290->current_mode->clk_data[clk_idx],
-+					imx290->current_mode->clk_size);
-+	if (ret < 0) {
-+		dev_err(imx290->dev, "Could not set clock registers\n");
-+		return ret;
-+	}
-+
- 	/* Apply the register values related to current frame format */
- 	ret = imx290_write_current_format(imx290);
- 	if (ret < 0) {
-@@ -731,15 +1064,22 @@ static int imx290_start_streaming(struct
- 	}
- 
- 	/* Apply default values of current mode */
--	ret = imx290_set_register_array(imx290, imx290->current_mode->data,
--					imx290->current_mode->data_size);
-+	ret = imx290_set_register_array(imx290,
-+					imx290->current_mode->mode_data,
-+					imx290->current_mode->mode_data_size);
- 	if (ret < 0) {
- 		dev_err(imx290->dev, "Could not set current mode\n");
- 		return ret;
- 	}
--	ret = imx290_set_hmax(imx290, imx290->current_mode->hmax);
--	if (ret < 0)
-+
-+	/* Apply lane config registers of current mode */
-+	ret = imx290_set_register_array(imx290,
-+					imx290->current_mode->lane_data,
-+					imx290->current_mode->lane_data_size);
-+	if (ret < 0) {
-+		dev_err(imx290->dev, "Could not set current mode\n");
- 		return ret;
-+	}
- 
- 	/* Apply customized values from user */
- 	ret = v4l2_ctrl_handler_setup(imx290->sd.ctrl_handler);
-@@ -778,6 +1118,9 @@ static int imx290_set_stream(struct v4l2
- 		imx290_stop_streaming(imx290);
- 		pm_runtime_put(imx290->dev);
- 	}
-+	/* vflip and hflip cannot change during streaming */
-+	__v4l2_ctrl_grab(imx290->vflip, enable);
-+	__v4l2_ctrl_grab(imx290->hflip, enable);
- 
- unlock_and_return:
- 
-@@ -795,49 +1138,6 @@ static int imx290_get_regulators(struct
- 				       imx290->supplies);
- }
- 
--static int imx290_set_data_lanes(struct imx290 *imx290)
--{
--	int ret = 0, laneval, frsel;
--
--	switch (imx290->nlanes) {
--	case 2:
--		laneval = 0x01;
--		frsel = 0x02;
--		break;
--	case 4:
--		laneval = 0x03;
--		frsel = 0x01;
--		break;
--	default:
--		/*
--		 * We should never hit this since the data lane count is
--		 * validated in probe itself
--		 */
--		dev_err(imx290->dev, "Lane configuration not supported\n");
--		ret = -EINVAL;
--		goto exit;
--	}
--
--	ret = imx290_write_reg(imx290, IMX290_PHY_LANE_NUM, laneval);
--	if (ret) {
--		dev_err(imx290->dev, "Error setting Physical Lane number register\n");
--		goto exit;
--	}
--
--	ret = imx290_write_reg(imx290, IMX290_CSI_LANE_MODE, laneval);
--	if (ret) {
--		dev_err(imx290->dev, "Error setting CSI Lane mode register\n");
--		goto exit;
--	}
--
--	ret = imx290_write_reg(imx290, IMX290_FR_FDG_SEL, frsel);
--	if (ret)
--		dev_err(imx290->dev, "Error setting FR/FDG SEL register\n");
--
--exit:
--	return ret;
--}
--
- static int imx290_power_on(struct device *dev)
- {
- 	struct v4l2_subdev *sd = dev_get_drvdata(dev);
-@@ -861,9 +1161,6 @@ static int imx290_power_on(struct device
- 	gpiod_set_value_cansleep(imx290->rst_gpio, 0);
- 	usleep_range(30000, 31000);
- 
--	/* Set data lane count */
--	imx290_set_data_lanes(imx290);
--
- 	return 0;
- }
- 
-@@ -893,6 +1190,7 @@ static const struct v4l2_subdev_pad_ops
- 	.enum_frame_size = imx290_enum_frame_size,
- 	.get_fmt = imx290_get_fmt,
- 	.set_fmt = imx290_set_fmt,
-+	.get_selection = imx290_get_selection,
- };
- 
- static const struct v4l2_subdev_ops imx290_subdev_ops = {
-@@ -926,16 +1224,35 @@ static s64 imx290_check_link_freqs(const
- 	return 0;
- }
- 
-+static const struct of_device_id imx290_of_match[] = {
-+	/*
-+	 * imx327 supports 1080p60 at 10 and 12bit.
-+	 * imx290 adds 10bit 1080p120.
-+	 * imx462 adds 10 and 12bit 1080p120.
-+	 * This driver currently maxes out at 1080p60, which is supported by all
-+	 * of them, but add the compatible strings for future implementation.
-+	 */
-+	{ .compatible = "sony,imx327", .data = imx290_colour_formats },
-+	{ .compatible = "sony,imx327-mono", .data = imx290_mono_formats },
-+	{ .compatible = "sony,imx290", .data = imx290_colour_formats },
-+	{ .compatible = "sony,imx290-mono", .data = imx290_mono_formats },
-+	{ .compatible = "sony,imx462", .data = imx290_colour_formats },
-+	{ .compatible = "sony,imx462-mono", .data = imx290_mono_formats },
-+	{ /* sentinel */ }
-+};
-+
- static int imx290_probe(struct i2c_client *client)
- {
-+	struct v4l2_fwnode_device_properties props;
- 	struct device *dev = &client->dev;
- 	struct fwnode_handle *endpoint;
- 	/* Only CSI2 is supported for now: */
- 	struct v4l2_fwnode_endpoint ep = {
- 		.bus_type = V4L2_MBUS_CSI2_DPHY
- 	};
-+	const struct of_device_id *match;
-+	const struct imx290_mode *mode;
- 	struct imx290 *imx290;
--	u32 xclk_freq;
- 	s64 fq;
- 	int ret;
- 
-@@ -950,6 +1267,11 @@ static int imx290_probe(struct i2c_clien
- 		return -ENODEV;
- 	}
- 
-+	match = of_match_device(imx290_of_match, dev);
-+	if (!match)
-+		return -ENODEV;
-+	imx290->formats = (const struct imx290_pixfmt *)match->data;
-+
- 	endpoint = fwnode_graph_get_next_endpoint(dev_fwnode(dev), NULL);
- 	if (!endpoint) {
- 		dev_err(dev, "Endpoint node not found\n");
-@@ -999,21 +1321,21 @@ static int imx290_probe(struct i2c_clien
- 	}
- 
- 	ret = fwnode_property_read_u32(dev_fwnode(dev), "clock-frequency",
--				       &xclk_freq);
-+				       &imx290->xclk_freq);
- 	if (ret) {
- 		dev_err(dev, "Could not get xclk frequency\n");
- 		goto free_err;
- 	}
- 
- 	/* external clock must be 37.125 MHz */
--	if (xclk_freq != 37125000) {
-+	if (imx290->xclk_freq != 37125000 && imx290->xclk_freq != 74250000) {
- 		dev_err(dev, "External clock frequency %u is not supported\n",
--			xclk_freq);
-+			imx290->xclk_freq);
- 		ret = -EINVAL;
- 		goto free_err;
- 	}
- 
--	ret = clk_set_rate(imx290->xclk, xclk_freq);
-+	ret = clk_set_rate(imx290->xclk, imx290->xclk_freq);
- 	if (ret) {
- 		dev_err(dev, "Could not set xclk frequency\n");
- 		goto free_err;
-@@ -1037,15 +1359,39 @@ static int imx290_probe(struct i2c_clien
- 
- 	/*
- 	 * Initialize the frame format. In particular, imx290->current_mode
--	 * and imx290->bpp are set to defaults: imx290_calc_pixel_rate() call
--	 * below relies on these fields.
-+	 * and imx290->bpp are set to defaults.
- 	 */
- 	imx290_entity_init_cfg(&imx290->sd, NULL);
- 
--	v4l2_ctrl_handler_init(&imx290->ctrls, 4);
-+	v4l2_ctrl_handler_init(&imx290->ctrls, 11);
- 
- 	v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
--			  V4L2_CID_GAIN, 0, 72, 1, 0);
-+			  V4L2_CID_ANALOGUE_GAIN, 0, 100, 1, 0);
-+
-+	mode = imx290->current_mode;
-+	imx290->hblank = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
-+					   V4L2_CID_HBLANK,
-+					   mode->hmax - mode->width,
-+					   IMX290_HMAX_MAX - mode->width, 1,
-+					   mode->hmax - mode->width);
-+
-+	imx290->vblank = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
-+					   V4L2_CID_VBLANK,
-+					   mode->vmax - mode->height,
-+					   IMX290_VMAX_MAX - mode->height, 1,
-+					   mode->vmax - mode->height);
-+
-+	imx290->exposure = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
-+					     V4L2_CID_EXPOSURE,
-+					     IMX290_EXPOSURE_MIN,
-+					     mode->vmax - 2,
-+					     IMX290_EXPOSURE_STEP,
-+					     mode->vmax - 2);
-+
-+	imx290->hflip = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
-+					  V4L2_CID_HFLIP, 0, 1, 1, 0);
-+	imx290->vflip = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
-+					  V4L2_CID_VFLIP, 0, 1, 1, 0);
- 
- 	imx290->link_freq =
- 		v4l2_ctrl_new_int_menu(&imx290->ctrls, &imx290_ctrl_ops,
-@@ -1065,6 +1411,15 @@ static int imx290_probe(struct i2c_clien
- 				     ARRAY_SIZE(imx290_test_pattern_menu) - 1,
- 				     0, 0, imx290_test_pattern_menu);
- 
-+	ret = v4l2_fwnode_device_parse(&client->dev, &props);
-+	if (ret)
-+		goto free_ctrl;
-+
-+	ret = v4l2_ctrl_new_fwnode_properties(&imx290->ctrls, &imx290_ctrl_ops,
-+					      &props);
-+	if (ret)
-+		goto free_ctrl;
-+
- 	imx290->sd.ctrl_handler = &imx290->ctrls;
- 
- 	if (imx290->ctrls.error) {
-@@ -1087,6 +1442,9 @@ static int imx290_probe(struct i2c_clien
- 		goto free_ctrl;
- 	}
- 
-+	/* Initialize the frame format (this also sets imx290->current_mode) */
-+	imx290_entity_init_cfg(&imx290->sd, NULL);
-+
- 	ret = v4l2_async_register_subdev(&imx290->sd);
- 	if (ret < 0) {
- 		dev_err(dev, "Could not register v4l2 device\n");
-@@ -1136,10 +1494,6 @@ static void imx290_remove(struct i2c_cli
- 	pm_runtime_set_suspended(imx290->dev);
- }
- 
--static const struct of_device_id imx290_of_match[] = {
--	{ .compatible = "sony,imx290" },
--	{ /* sentinel */ }
--};
- MODULE_DEVICE_TABLE(of, imx290_of_match);
- 
- static struct i2c_driver imx290_i2c_driver = {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0195-media-i2c-imx477-Support-for-the-Sony-IMX477-sensor.patch b/target/linux/bcm27xx/patches-6.1/950-0195-media-i2c-imx477-Support-for-the-Sony-IMX477-sensor.patch
deleted file mode 100644
index 4860bae933..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0195-media-i2c-imx477-Support-for-the-Sony-IMX477-sensor.patch
+++ /dev/null
@@ -1,2701 +0,0 @@
-From 227eddefe9cb07dd1d160f0015b0d17d66cd3cf8 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Thu, 7 May 2020 15:50:54 +0100
-Subject: [PATCH] media: i2c: imx477: Support for the Sony IMX477
- sensor
-
-dt-bindings: media: i2c: Add IMX477 CMOS sensor binding
-
-Add YAML device tree binding for IMX477 CMOS image sensor.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-media: i2c: Add driver for Sony IMX477 sensor
-
-Adds a driver for the 12MPix Sony IMX477 CSI2 sensor.
-Whilst the sensor supports 2 or 4 CSI2 data lanes, this driver
-currently only supports 2 lanes.
-
-The following Bayer modes are currently available:
-
-4056x3040 12-bit @ 10fps
-2028x1520 12-bit (binned) @ 40fps
-2028x1050 12-bit (cropped/binned) @ 50fps
-1012x760 10-bit (scaled) @ 120 fps
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-media: i2c: imx477: Add support for adaptive frame control
-
-Use V4L2_CID_EXPOSURE_AUTO_PRIORITY to control if the driver should
-automatically adjust the sensor frame length based on exposure time,
-allowing variable frame rates and longer exposures.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-media: i2c: imx477: Return correct result on sensor id verification
-
-The test should return -EIO if the register read id does not match
-the expected sensor id.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-media: i2c: imx477: Parse and register properties
-
-Parse device properties and register controls for them using the V4L2
-fwnode properties helpers.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-
-media: i2c: imx477: Selection compliance fixes
-
-To comply with the intended usage of the V4L2 selection target when
-used to retrieve a sensor image properties, adjust the rectangles
-returned by the imx477 driver.
-
-The top/left crop coordinates of the TGT_CROP rectangle were set to
-(0, 0) instead of (8, 16) which is the offset from the larger physical
-pixel array rectangle. This was also a mismatch with the default values
-crop rectangle value, so this is corrected. Found with v4l2-compliance.
-
-While at it, add V4L2_SEL_TGT_CROP_BOUNDS support: CROP_DEFAULT and
-CROP_BOUNDS have the same size as the non-active pixels are not readable
-using the selection API. Found with v4l2-compliance.
-
-This commit mirrors 543790f777ba1b3264c168c653db6d415e7c983f done for
-the imx219 sensor.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-media: i2c: imx477: Remove auto frame length adjusting
-
-The V4L2_CID_EXPOSURE_AUTO_PRIORITY was used to let the sensor control
-frame length (effectively framerate) based on the requested exposure
-time requested. Remove this feature as it is never used, and goes
-against how V4L2 likes to handle exposure and vblank controls.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-media: i2c: imx477: Add very long exposure control to the driver
-
-Add support for very long exposures by using the exposure multiplier
-register. Userland does not need to pass any additional controls to
-enable long exposures, it simply requests a larger vblank to extend the
-exposure control range appropriately.
-
-Currently, since hblank is fixed, a maximum of approximately 124 seconds
-of exposure time can be used. In a future change, hblank could also be
-controlled in userland to give over 200 seconds of exposure time.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-media: i2c: imx477: Fix crop height for 2028x1080 mode
-
-The crop height for this mode was set at 2600 lines, it should be 2160
-lines instead.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-media: i2c: imx477: Replace existing 1012x760 mode
-
-The existing 1012x760 120 fps mode has significant IQ problem using
-the internal sensor scaler. Replace this mode with a 1332x990 120 fps
-mode instead. This new mode has a smaller field of view, but does not
-suffer from the bad IQ of the original mode.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-media: i2c: imx477: Remove internal v4l2_mbus_framefmt from the state
-
-The only field in this struct that is used is the format code, so
-replace the struct with this single field.
-
-Save the format code in imx477_set_pad_format() when setting up a new
-mode so that imx477_get_pad_format() performs the right lookup.
-Otherwise, this caused a bug where the mode lookup occurred on the
-12-bit table rather than the 10-bit table.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-media: i2c: imx477: Remove unused function parameter
-
-The struct imx477 *ctrl parameter is not used in the function
-imx477_adjust_exposure_range(), so remove it.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-media: i2c: imx477: Fix for long exposure limit calculations
-
-Do not scale IMX477_EXPOSURE_OFFSET with the long exposure factor during
-the limit calculations. This allows larger exposure times, and does seem to be
-what the sensor is doing internally.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-media: i2c: imx477: Extend driver to support imx378 sensor
-
-The imx378 sensor is almost identical to the imx477 and can be
-supported as a "compatible" sensor with just a few extra register
-writes.
-
-Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
-
-media: i2c: imx477: Fix framerates for 1332x990 mode
-
-The imx477 driver's line length for this mode had not been updated to
-the value supplied to us by the sensor manufacturer. With this
-correction the sensor delivers the framerates that are expected.
-
-Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
-
-media: i2c: imx477: Allow control of on-sensor DPC
-
-A module parameter "dpc_enable" is added to allow the control of the
-sensor's on-board DPC (Defective Pixel Correction) function.
-
-This is a global setting to be configured before using the sensor;
-there is no intention that this would ever be changed on-the-fly.
-
-Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
-
-media: i2c: imx477: Sensor should report RAW color space
-
-Tested on Raspberry Pi running libcamera.
-
-Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
-
-media: i2c: imx477: Add vsync trigger_mode parameter
-
-trigger_mode == 0 (default) => no effect / no registers written
-trigger_mode == 1           => source
-trigger_mode == 2           => sink
-
-This can be set e.g. in /boot/cmdline.txt as imx477.trigger_mode=N
-
-Signed-off-by: Jonas Jacob <jonas.jacob@neocortexvision.com>
-
-media: i2c: Update imx477 Kconfig entry
-
-Bring the IMX477 Kconfig declaration in line with upstream entries.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-media: i2c: imx477: Correct minimum exposure lines
-
-The minimum number of exposure lines value (IMX477_EXPOSURE_MIN) was
-previously 20 but this is not correct. The datasheet is not completely
-explicit, however the new value of 4 has been tested with all the
-sensor modes supported by this driver, and matches the lowest exposure
-value of 114us that could be achieved wtih Raspberry Pi's legacy
-firmware driver.
-
-Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
-
-media: i2c: imx477: Allow dynamic horizontal blanking control
-
-Currently, the V4L2_CID_HBLANK control is marked as read-only. Remove this
-restriction and allow userland to modify the control if needed.
-
-Set the maximum limit of the line length to 0xfff0.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-media: i2c: imx477: Reset hblank on mode switch
-
-Reset the hblank control to the minimum value on every mode switch. This is to
-account for userland instances that do not yet control hblank, otherwise it
-gets set to a non-optimal value.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-media: i2c: imx477: Do not unconditionally adjust hblank and vblank limits
-
-On a mode change, only call imx477_set_framing_limits() to adjust the hblank
-and vblank limits if the new mode is different from the existing mode. This
-preserves any manual control values the user might have set.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- .../devicetree/bindings/media/i2c/imx477.yaml |  113 +
- MAINTAINERS                                   |    8 +
- drivers/media/i2c/Kconfig                     |   11 +
- drivers/media/i2c/Makefile                    |    1 +
- drivers/media/i2c/imx477.c                    | 2308 +++++++++++++++++
- 5 files changed, 2441 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/media/i2c/imx477.yaml
- create mode 100644 drivers/media/i2c/imx477.c
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/media/i2c/imx477.yaml
-@@ -0,0 +1,113 @@
-+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
-+%YAML 1.2
-+---
-+$id: http://devicetree.org/schemas/media/i2c/imx477.yaml#
-+$schema: http://devicetree.org/meta-schemas/core.yaml#
-+
-+title: Sony 1/2.3-Inch 12Mpixel CMOS Digital Image Sensor
-+
-+maintainers:
-+  - Naushir Patuck <naush@raspberypi.com>
-+
-+description: |-
-+  The Sony IMX477 is a 1/2.3-inch CMOS active pixel digital image sensor
-+  with an active array size of 4056H x 3040V. It is programmable through
-+  I2C interface. The I2C address is fixed to 0x1A as per sensor data sheet.
-+  Image data is sent through MIPI CSI-2, which is configured as either 2 or
-+  4 data lanes.
-+
-+properties:
-+  compatible:
-+    const: sony,imx477
-+
-+  reg:
-+    description: I2C device address
-+    maxItems: 1
-+
-+  clocks:
-+    maxItems: 1
-+
-+  VDIG-supply:
-+    description:
-+      Digital I/O voltage supply, 1.05 volts
-+
-+  VANA-supply:
-+    description:
-+      Analog voltage supply, 2.8 volts
-+
-+  VDDL-supply:
-+    description:
-+      Digital core voltage supply, 1.8 volts
-+
-+  reset-gpios:
-+    description: |-
-+      Reference to the GPIO connected to the xclr pin, if any.
-+      Must be released (set high) after all all supplies and INCK are applied.
-+
-+  # See ../video-interfaces.txt for more details
-+  port:
-+    type: object
-+    properties:
-+      endpoint:
-+        type: object
-+        properties:
-+          data-lanes:
-+            description: |-
-+              The sensor supports either two-lane, or four-lane operation.
-+              For two-lane operation the property must be set to <1 2>.
-+            items:
-+              - const: 1
-+              - const: 2
-+
-+          clock-noncontinuous:
-+            type: boolean
-+            description: |-
-+              MIPI CSI-2 clock is non-continuous if this property is present,
-+              otherwise it's continuous.
-+
-+          link-frequencies:
-+            allOf:
-+              - $ref: /schemas/types.yaml#/definitions/uint64-array
-+            description:
-+              Allowed data bus frequencies.
-+
-+        required:
-+          - link-frequencies
-+
-+required:
-+  - compatible
-+  - reg
-+  - clocks
-+  - VANA-supply
-+  - VDIG-supply
-+  - VDDL-supply
-+  - port
-+
-+additionalProperties: false
-+
-+examples:
-+  - |
-+    i2c0 {
-+        #address-cells = <1>;
-+        #size-cells = <0>;
-+
-+        imx477: sensor@10 {
-+            compatible = "sony,imx477";
-+            reg = <0x1a>;
-+            clocks = <&imx477_clk>;
-+            VANA-supply = <&imx477_vana>;   /* 2.8v */
-+            VDIG-supply = <&imx477_vdig>;   /* 1.05v */
-+            VDDL-supply = <&imx477_vddl>;   /* 1.8v */
-+
-+            port {
-+                imx477_0: endpoint {
-+                    remote-endpoint = <&csi1_ep>;
-+                    data-lanes = <1 2>;
-+                    clock-noncontinuous;
-+                    link-frequencies = /bits/ 64 <450000000>;
-+                };
-+            };
-+        };
-+    };
-+
-+...
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -19290,6 +19290,14 @@ T:	git git://linuxtv.org/media_tree.git
- F:	Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml
- F:	drivers/media/i2c/imx412.c
- 
-+SONY IMX477 SENSOR DRIVER
-+M:	Raspberry Pi Kernel Maintenance <kernel-list@raspberrypi.com>
-+L:	linux-media@vger.kernel.org
-+S:	Maintained
-+T:	git git://linuxtv.org/media_tree.git
-+F:	Documentation/devicetree/bindings/media/i2c/imx477.yaml
-+F:	drivers/media/i2c/imx477.c
-+
- SONY MEMORYSTICK SUBSYSTEM
- M:	Maxim Levitsky <maximlevitsky@gmail.com>
- M:	Alex Dubov <oakad@yahoo.com>
---- a/drivers/media/i2c/Kconfig
-+++ b/drivers/media/i2c/Kconfig
-@@ -1030,6 +1030,17 @@ config VIDEO_UDA1342
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called uda1342.
- 
-+config VIDEO_IMX477
-+	tristate "Sony IMX477 sensor support"
-+	depends on I2C && VIDEO_DEV
-+	select VIDEO_V4L2_SUBDEV_API
-+	help
-+	  This is a Video4Linux2 sensor driver for the Sony
-+	  IMX477 camera. Also supports the Sony IMX378.
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called imx477.
-+
- config VIDEO_VP27SMPX
- 	tristate "Panasonic VP27's internal MPX"
- 	depends on VIDEO_DEV && I2C
---- a/drivers/media/i2c/Makefile
-+++ b/drivers/media/i2c/Makefile
-@@ -48,6 +48,7 @@ obj-$(CONFIG_VIDEO_IMX334) += imx334.o
- obj-$(CONFIG_VIDEO_IMX335) += imx335.o
- obj-$(CONFIG_VIDEO_IMX355) += imx355.o
- obj-$(CONFIG_VIDEO_IMX412) += imx412.o
-+obj-$(CONFIG_VIDEO_IMX477) += imx477.o
- obj-$(CONFIG_VIDEO_IR_I2C) += ir-kbd-i2c.o
- obj-$(CONFIG_VIDEO_ISL7998X) += isl7998x.o
- obj-$(CONFIG_VIDEO_KS0127) += ks0127.o
---- /dev/null
-+++ b/drivers/media/i2c/imx477.c
-@@ -0,0 +1,2308 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * A V4L2 driver for Sony IMX477 cameras.
-+ * Copyright (C) 2020, Raspberry Pi (Trading) Ltd
-+ *
-+ * Based on Sony imx219 camera driver
-+ * Copyright (C) 2019-2020 Raspberry Pi (Trading) Ltd
-+ */
-+#include <asm/unaligned.h>
-+#include <linux/clk.h>
-+#include <linux/delay.h>
-+#include <linux/gpio/consumer.h>
-+#include <linux/i2c.h>
-+#include <linux/module.h>
-+#include <linux/of_device.h>
-+#include <linux/pm_runtime.h>
-+#include <linux/regulator/consumer.h>
-+#include <media/v4l2-ctrls.h>
-+#include <media/v4l2-device.h>
-+#include <media/v4l2-event.h>
-+#include <media/v4l2-fwnode.h>
-+#include <media/v4l2-mediabus.h>
-+
-+static int dpc_enable = 1;
-+module_param(dpc_enable, int, 0644);
-+MODULE_PARM_DESC(dpc_enable, "Enable on-sensor DPC");
-+
-+static int trigger_mode;
-+module_param(trigger_mode, int, 0644);
-+MODULE_PARM_DESC(trigger_mode, "Set vsync trigger mode: 1=source, 2=sink");
-+
-+#define IMX477_REG_VALUE_08BIT		1
-+#define IMX477_REG_VALUE_16BIT		2
-+
-+/* Chip ID */
-+#define IMX477_REG_CHIP_ID		0x0016
-+#define IMX477_CHIP_ID			0x0477
-+#define IMX378_CHIP_ID			0x0378
-+
-+#define IMX477_REG_MODE_SELECT		0x0100
-+#define IMX477_MODE_STANDBY		0x00
-+#define IMX477_MODE_STREAMING		0x01
-+
-+#define IMX477_REG_ORIENTATION		0x101
-+
-+#define IMX477_XCLK_FREQ		24000000
-+
-+#define IMX477_DEFAULT_LINK_FREQ	450000000
-+
-+/* Pixel rate is fixed at 840MHz for all the modes */
-+#define IMX477_PIXEL_RATE		840000000
-+
-+/* V_TIMING internal */
-+#define IMX477_REG_FRAME_LENGTH		0x0340
-+#define IMX477_FRAME_LENGTH_MAX		0xffdc
-+
-+/* H_TIMING internal */
-+#define IMX477_REG_LINE_LENGTH		0x0342
-+#define IMX477_LINE_LENGTH_MAX		0xfff0
-+
-+/* Long exposure multiplier */
-+#define IMX477_LONG_EXP_SHIFT_MAX	7
-+#define IMX477_LONG_EXP_SHIFT_REG	0x3100
-+
-+/* Exposure control */
-+#define IMX477_REG_EXPOSURE		0x0202
-+#define IMX477_EXPOSURE_OFFSET		22
-+#define IMX477_EXPOSURE_MIN		4
-+#define IMX477_EXPOSURE_STEP		1
-+#define IMX477_EXPOSURE_DEFAULT		0x640
-+#define IMX477_EXPOSURE_MAX		(IMX477_FRAME_LENGTH_MAX - \
-+					 IMX477_EXPOSURE_OFFSET)
-+
-+/* Analog gain control */
-+#define IMX477_REG_ANALOG_GAIN		0x0204
-+#define IMX477_ANA_GAIN_MIN		0
-+#define IMX477_ANA_GAIN_MAX		978
-+#define IMX477_ANA_GAIN_STEP		1
-+#define IMX477_ANA_GAIN_DEFAULT		0x0
-+
-+/* Digital gain control */
-+#define IMX477_REG_DIGITAL_GAIN		0x020e
-+#define IMX477_DGTL_GAIN_MIN		0x0100
-+#define IMX477_DGTL_GAIN_MAX		0xffff
-+#define IMX477_DGTL_GAIN_DEFAULT	0x0100
-+#define IMX477_DGTL_GAIN_STEP		1
-+
-+/* Test Pattern Control */
-+#define IMX477_REG_TEST_PATTERN		0x0600
-+#define IMX477_TEST_PATTERN_DISABLE	0
-+#define IMX477_TEST_PATTERN_SOLID_COLOR	1
-+#define IMX477_TEST_PATTERN_COLOR_BARS	2
-+#define IMX477_TEST_PATTERN_GREY_COLOR	3
-+#define IMX477_TEST_PATTERN_PN9		4
-+
-+/* Test pattern colour components */
-+#define IMX477_REG_TEST_PATTERN_R	0x0602
-+#define IMX477_REG_TEST_PATTERN_GR	0x0604
-+#define IMX477_REG_TEST_PATTERN_B	0x0606
-+#define IMX477_REG_TEST_PATTERN_GB	0x0608
-+#define IMX477_TEST_PATTERN_COLOUR_MIN	0
-+#define IMX477_TEST_PATTERN_COLOUR_MAX	0x0fff
-+#define IMX477_TEST_PATTERN_COLOUR_STEP	1
-+#define IMX477_TEST_PATTERN_R_DEFAULT	IMX477_TEST_PATTERN_COLOUR_MAX
-+#define IMX477_TEST_PATTERN_GR_DEFAULT	0
-+#define IMX477_TEST_PATTERN_B_DEFAULT	0
-+#define IMX477_TEST_PATTERN_GB_DEFAULT	0
-+
-+/* Trigger mode */
-+#define IMX477_REG_MC_MODE		0x3f0b
-+#define IMX477_REG_MS_SEL		0x3041
-+#define IMX477_REG_XVS_IO_CTRL		0x3040
-+#define IMX477_REG_EXTOUT_EN		0x4b81
-+
-+/* Embedded metadata stream structure */
-+#define IMX477_EMBEDDED_LINE_WIDTH 16384
-+#define IMX477_NUM_EMBEDDED_LINES 1
-+
-+enum pad_types {
-+	IMAGE_PAD,
-+	METADATA_PAD,
-+	NUM_PADS
-+};
-+
-+/* IMX477 native and active pixel array size. */
-+#define IMX477_NATIVE_WIDTH		4072U
-+#define IMX477_NATIVE_HEIGHT		3176U
-+#define IMX477_PIXEL_ARRAY_LEFT		8U
-+#define IMX477_PIXEL_ARRAY_TOP		16U
-+#define IMX477_PIXEL_ARRAY_WIDTH	4056U
-+#define IMX477_PIXEL_ARRAY_HEIGHT	3040U
-+
-+struct imx477_reg {
-+	u16 address;
-+	u8 val;
-+};
-+
-+struct imx477_reg_list {
-+	unsigned int num_of_regs;
-+	const struct imx477_reg *regs;
-+};
-+
-+/* Mode : resolution and related config&values */
-+struct imx477_mode {
-+	/* Frame width */
-+	unsigned int width;
-+
-+	/* Frame height */
-+	unsigned int height;
-+
-+	/* H-timing in pixels */
-+	unsigned int line_length_pix;
-+
-+	/* Analog crop rectangle. */
-+	struct v4l2_rect crop;
-+
-+	/* Highest possible framerate. */
-+	struct v4l2_fract timeperframe_min;
-+
-+	/* Default framerate. */
-+	struct v4l2_fract timeperframe_default;
-+
-+	/* Default register values */
-+	struct imx477_reg_list reg_list;
-+};
-+
-+static const struct imx477_reg mode_common_regs[] = {
-+	{0x0136, 0x18},
-+	{0x0137, 0x00},
-+	{0xe000, 0x00},
-+	{0xe07a, 0x01},
-+	{0x0808, 0x02},
-+	{0x4ae9, 0x18},
-+	{0x4aea, 0x08},
-+	{0xf61c, 0x04},
-+	{0xf61e, 0x04},
-+	{0x4ae9, 0x21},
-+	{0x4aea, 0x80},
-+	{0x38a8, 0x1f},
-+	{0x38a9, 0xff},
-+	{0x38aa, 0x1f},
-+	{0x38ab, 0xff},
-+	{0x55d4, 0x00},
-+	{0x55d5, 0x00},
-+	{0x55d6, 0x07},
-+	{0x55d7, 0xff},
-+	{0x55e8, 0x07},
-+	{0x55e9, 0xff},
-+	{0x55ea, 0x00},
-+	{0x55eb, 0x00},
-+	{0x574c, 0x07},
-+	{0x574d, 0xff},
-+	{0x574e, 0x00},
-+	{0x574f, 0x00},
-+	{0x5754, 0x00},
-+	{0x5755, 0x00},
-+	{0x5756, 0x07},
-+	{0x5757, 0xff},
-+	{0x5973, 0x04},
-+	{0x5974, 0x01},
-+	{0x5d13, 0xc3},
-+	{0x5d14, 0x58},
-+	{0x5d15, 0xa3},
-+	{0x5d16, 0x1d},
-+	{0x5d17, 0x65},
-+	{0x5d18, 0x8c},
-+	{0x5d1a, 0x06},
-+	{0x5d1b, 0xa9},
-+	{0x5d1c, 0x45},
-+	{0x5d1d, 0x3a},
-+	{0x5d1e, 0xab},
-+	{0x5d1f, 0x15},
-+	{0x5d21, 0x0e},
-+	{0x5d22, 0x52},
-+	{0x5d23, 0xaa},
-+	{0x5d24, 0x7d},
-+	{0x5d25, 0x57},
-+	{0x5d26, 0xa8},
-+	{0x5d37, 0x5a},
-+	{0x5d38, 0x5a},
-+	{0x5d77, 0x7f},
-+	{0x7b75, 0x0e},
-+	{0x7b76, 0x0b},
-+	{0x7b77, 0x08},
-+	{0x7b78, 0x0a},
-+	{0x7b79, 0x47},
-+	{0x7b7c, 0x00},
-+	{0x7b7d, 0x00},
-+	{0x8d1f, 0x00},
-+	{0x8d27, 0x00},
-+	{0x9004, 0x03},
-+	{0x9200, 0x50},
-+	{0x9201, 0x6c},
-+	{0x9202, 0x71},
-+	{0x9203, 0x00},
-+	{0x9204, 0x71},
-+	{0x9205, 0x01},
-+	{0x9371, 0x6a},
-+	{0x9373, 0x6a},
-+	{0x9375, 0x64},
-+	{0x991a, 0x00},
-+	{0x996b, 0x8c},
-+	{0x996c, 0x64},
-+	{0x996d, 0x50},
-+	{0x9a4c, 0x0d},
-+	{0x9a4d, 0x0d},
-+	{0xa001, 0x0a},
-+	{0xa003, 0x0a},
-+	{0xa005, 0x0a},
-+	{0xa006, 0x01},
-+	{0xa007, 0xc0},
-+	{0xa009, 0xc0},
-+	{0x3d8a, 0x01},
-+	{0x4421, 0x04},
-+	{0x7b3b, 0x01},
-+	{0x7b4c, 0x00},
-+	{0x9905, 0x00},
-+	{0x9907, 0x00},
-+	{0x9909, 0x00},
-+	{0x990b, 0x00},
-+	{0x9944, 0x3c},
-+	{0x9947, 0x3c},
-+	{0x994a, 0x8c},
-+	{0x994b, 0x50},
-+	{0x994c, 0x1b},
-+	{0x994d, 0x8c},
-+	{0x994e, 0x50},
-+	{0x994f, 0x1b},
-+	{0x9950, 0x8c},
-+	{0x9951, 0x1b},
-+	{0x9952, 0x0a},
-+	{0x9953, 0x8c},
-+	{0x9954, 0x1b},
-+	{0x9955, 0x0a},
-+	{0x9a13, 0x04},
-+	{0x9a14, 0x04},
-+	{0x9a19, 0x00},
-+	{0x9a1c, 0x04},
-+	{0x9a1d, 0x04},
-+	{0x9a26, 0x05},
-+	{0x9a27, 0x05},
-+	{0x9a2c, 0x01},
-+	{0x9a2d, 0x03},
-+	{0x9a2f, 0x05},
-+	{0x9a30, 0x05},
-+	{0x9a41, 0x00},
-+	{0x9a46, 0x00},
-+	{0x9a47, 0x00},
-+	{0x9c17, 0x35},
-+	{0x9c1d, 0x31},
-+	{0x9c29, 0x50},
-+	{0x9c3b, 0x2f},
-+	{0x9c41, 0x6b},
-+	{0x9c47, 0x2d},
-+	{0x9c4d, 0x40},
-+	{0x9c6b, 0x00},
-+	{0x9c71, 0xc8},
-+	{0x9c73, 0x32},
-+	{0x9c75, 0x04},
-+	{0x9c7d, 0x2d},
-+	{0x9c83, 0x40},
-+	{0x9c94, 0x3f},
-+	{0x9c95, 0x3f},
-+	{0x9c96, 0x3f},
-+	{0x9c97, 0x00},
-+	{0x9c98, 0x00},
-+	{0x9c99, 0x00},
-+	{0x9c9a, 0x3f},
-+	{0x9c9b, 0x3f},
-+	{0x9c9c, 0x3f},
-+	{0x9ca0, 0x0f},
-+	{0x9ca1, 0x0f},
-+	{0x9ca2, 0x0f},
-+	{0x9ca3, 0x00},
-+	{0x9ca4, 0x00},
-+	{0x9ca5, 0x00},
-+	{0x9ca6, 0x1e},
-+	{0x9ca7, 0x1e},
-+	{0x9ca8, 0x1e},
-+	{0x9ca9, 0x00},
-+	{0x9caa, 0x00},
-+	{0x9cab, 0x00},
-+	{0x9cac, 0x09},
-+	{0x9cad, 0x09},
-+	{0x9cae, 0x09},
-+	{0x9cbd, 0x50},
-+	{0x9cbf, 0x50},
-+	{0x9cc1, 0x50},
-+	{0x9cc3, 0x40},
-+	{0x9cc5, 0x40},
-+	{0x9cc7, 0x40},
-+	{0x9cc9, 0x0a},
-+	{0x9ccb, 0x0a},
-+	{0x9ccd, 0x0a},
-+	{0x9d17, 0x35},
-+	{0x9d1d, 0x31},
-+	{0x9d29, 0x50},
-+	{0x9d3b, 0x2f},
-+	{0x9d41, 0x6b},
-+	{0x9d47, 0x42},
-+	{0x9d4d, 0x5a},
-+	{0x9d6b, 0x00},
-+	{0x9d71, 0xc8},
-+	{0x9d73, 0x32},
-+	{0x9d75, 0x04},
-+	{0x9d7d, 0x42},
-+	{0x9d83, 0x5a},
-+	{0x9d94, 0x3f},
-+	{0x9d95, 0x3f},
-+	{0x9d96, 0x3f},
-+	{0x9d97, 0x00},
-+	{0x9d98, 0x00},
-+	{0x9d99, 0x00},
-+	{0x9d9a, 0x3f},
-+	{0x9d9b, 0x3f},
-+	{0x9d9c, 0x3f},
-+	{0x9d9d, 0x1f},
-+	{0x9d9e, 0x1f},
-+	{0x9d9f, 0x1f},
-+	{0x9da0, 0x0f},
-+	{0x9da1, 0x0f},
-+	{0x9da2, 0x0f},
-+	{0x9da3, 0x00},
-+	{0x9da4, 0x00},
-+	{0x9da5, 0x00},
-+	{0x9da6, 0x1e},
-+	{0x9da7, 0x1e},
-+	{0x9da8, 0x1e},
-+	{0x9da9, 0x00},
-+	{0x9daa, 0x00},
-+	{0x9dab, 0x00},
-+	{0x9dac, 0x09},
-+	{0x9dad, 0x09},
-+	{0x9dae, 0x09},
-+	{0x9dc9, 0x0a},
-+	{0x9dcb, 0x0a},
-+	{0x9dcd, 0x0a},
-+	{0x9e17, 0x35},
-+	{0x9e1d, 0x31},
-+	{0x9e29, 0x50},
-+	{0x9e3b, 0x2f},
-+	{0x9e41, 0x6b},
-+	{0x9e47, 0x2d},
-+	{0x9e4d, 0x40},
-+	{0x9e6b, 0x00},
-+	{0x9e71, 0xc8},
-+	{0x9e73, 0x32},
-+	{0x9e75, 0x04},
-+	{0x9e94, 0x0f},
-+	{0x9e95, 0x0f},
-+	{0x9e96, 0x0f},
-+	{0x9e97, 0x00},
-+	{0x9e98, 0x00},
-+	{0x9e99, 0x00},
-+	{0x9ea0, 0x0f},
-+	{0x9ea1, 0x0f},
-+	{0x9ea2, 0x0f},
-+	{0x9ea3, 0x00},
-+	{0x9ea4, 0x00},
-+	{0x9ea5, 0x00},
-+	{0x9ea6, 0x3f},
-+	{0x9ea7, 0x3f},
-+	{0x9ea8, 0x3f},
-+	{0x9ea9, 0x00},
-+	{0x9eaa, 0x00},
-+	{0x9eab, 0x00},
-+	{0x9eac, 0x09},
-+	{0x9ead, 0x09},
-+	{0x9eae, 0x09},
-+	{0x9ec9, 0x0a},
-+	{0x9ecb, 0x0a},
-+	{0x9ecd, 0x0a},
-+	{0x9f17, 0x35},
-+	{0x9f1d, 0x31},
-+	{0x9f29, 0x50},
-+	{0x9f3b, 0x2f},
-+	{0x9f41, 0x6b},
-+	{0x9f47, 0x42},
-+	{0x9f4d, 0x5a},
-+	{0x9f6b, 0x00},
-+	{0x9f71, 0xc8},
-+	{0x9f73, 0x32},
-+	{0x9f75, 0x04},
-+	{0x9f94, 0x0f},
-+	{0x9f95, 0x0f},
-+	{0x9f96, 0x0f},
-+	{0x9f97, 0x00},
-+	{0x9f98, 0x00},
-+	{0x9f99, 0x00},
-+	{0x9f9a, 0x2f},
-+	{0x9f9b, 0x2f},
-+	{0x9f9c, 0x2f},
-+	{0x9f9d, 0x00},
-+	{0x9f9e, 0x00},
-+	{0x9f9f, 0x00},
-+	{0x9fa0, 0x0f},
-+	{0x9fa1, 0x0f},
-+	{0x9fa2, 0x0f},
-+	{0x9fa3, 0x00},
-+	{0x9fa4, 0x00},
-+	{0x9fa5, 0x00},
-+	{0x9fa6, 0x1e},
-+	{0x9fa7, 0x1e},
-+	{0x9fa8, 0x1e},
-+	{0x9fa9, 0x00},
-+	{0x9faa, 0x00},
-+	{0x9fab, 0x00},
-+	{0x9fac, 0x09},
-+	{0x9fad, 0x09},
-+	{0x9fae, 0x09},
-+	{0x9fc9, 0x0a},
-+	{0x9fcb, 0x0a},
-+	{0x9fcd, 0x0a},
-+	{0xa14b, 0xff},
-+	{0xa151, 0x0c},
-+	{0xa153, 0x50},
-+	{0xa155, 0x02},
-+	{0xa157, 0x00},
-+	{0xa1ad, 0xff},
-+	{0xa1b3, 0x0c},
-+	{0xa1b5, 0x50},
-+	{0xa1b9, 0x00},
-+	{0xa24b, 0xff},
-+	{0xa257, 0x00},
-+	{0xa2ad, 0xff},
-+	{0xa2b9, 0x00},
-+	{0xb21f, 0x04},
-+	{0xb35c, 0x00},
-+	{0xb35e, 0x08},
-+	{0x0112, 0x0c},
-+	{0x0113, 0x0c},
-+	{0x0114, 0x01},
-+	{0x0350, 0x00},
-+	{0xbcf1, 0x02},
-+	{0x3ff9, 0x01},
-+};
-+
-+/* 12 mpix 10fps */
-+static const struct imx477_reg mode_4056x3040_regs[] = {
-+	{0x0342, 0x5d},
-+	{0x0343, 0xc0},
-+	{0x0344, 0x00},
-+	{0x0345, 0x00},
-+	{0x0346, 0x00},
-+	{0x0347, 0x00},
-+	{0x0348, 0x0f},
-+	{0x0349, 0xd7},
-+	{0x034a, 0x0b},
-+	{0x034b, 0xdf},
-+	{0x00e3, 0x00},
-+	{0x00e4, 0x00},
-+	{0x00fc, 0x0a},
-+	{0x00fd, 0x0a},
-+	{0x00fe, 0x0a},
-+	{0x00ff, 0x0a},
-+	{0x0220, 0x00},
-+	{0x0221, 0x11},
-+	{0x0381, 0x01},
-+	{0x0383, 0x01},
-+	{0x0385, 0x01},
-+	{0x0387, 0x01},
-+	{0x0900, 0x00},
-+	{0x0901, 0x11},
-+	{0x0902, 0x02},
-+	{0x3140, 0x02},
-+	{0x3c00, 0x00},
-+	{0x3c01, 0x03},
-+	{0x3c02, 0xa2},
-+	{0x3f0d, 0x01},
-+	{0x5748, 0x07},
-+	{0x5749, 0xff},
-+	{0x574a, 0x00},
-+	{0x574b, 0x00},
-+	{0x7b75, 0x0a},
-+	{0x7b76, 0x0c},
-+	{0x7b77, 0x07},
-+	{0x7b78, 0x06},
-+	{0x7b79, 0x3c},
-+	{0x7b53, 0x01},
-+	{0x9369, 0x5a},
-+	{0x936b, 0x55},
-+	{0x936d, 0x28},
-+	{0x9304, 0x00},
-+	{0x9305, 0x00},
-+	{0x9e9a, 0x2f},
-+	{0x9e9b, 0x2f},
-+	{0x9e9c, 0x2f},
-+	{0x9e9d, 0x00},
-+	{0x9e9e, 0x00},
-+	{0x9e9f, 0x00},
-+	{0xa2a9, 0x60},
-+	{0xa2b7, 0x00},
-+	{0x0401, 0x00},
-+	{0x0404, 0x00},
-+	{0x0405, 0x10},
-+	{0x0408, 0x00},
-+	{0x0409, 0x00},
-+	{0x040a, 0x00},
-+	{0x040b, 0x00},
-+	{0x040c, 0x0f},
-+	{0x040d, 0xd8},
-+	{0x040e, 0x0b},
-+	{0x040f, 0xe0},
-+	{0x034c, 0x0f},
-+	{0x034d, 0xd8},
-+	{0x034e, 0x0b},
-+	{0x034f, 0xe0},
-+	{0x0301, 0x05},
-+	{0x0303, 0x02},
-+	{0x0305, 0x04},
-+	{0x0306, 0x01},
-+	{0x0307, 0x5e},
-+	{0x0309, 0x0c},
-+	{0x030b, 0x02},
-+	{0x030d, 0x02},
-+	{0x030e, 0x00},
-+	{0x030f, 0x96},
-+	{0x0310, 0x01},
-+	{0x0820, 0x07},
-+	{0x0821, 0x08},
-+	{0x0822, 0x00},
-+	{0x0823, 0x00},
-+	{0x080a, 0x00},
-+	{0x080b, 0x7f},
-+	{0x080c, 0x00},
-+	{0x080d, 0x4f},
-+	{0x080e, 0x00},
-+	{0x080f, 0x77},
-+	{0x0810, 0x00},
-+	{0x0811, 0x5f},
-+	{0x0812, 0x00},
-+	{0x0813, 0x57},
-+	{0x0814, 0x00},
-+	{0x0815, 0x4f},
-+	{0x0816, 0x01},
-+	{0x0817, 0x27},
-+	{0x0818, 0x00},
-+	{0x0819, 0x3f},
-+	{0xe04c, 0x00},
-+	{0xe04d, 0x7f},
-+	{0xe04e, 0x00},
-+	{0xe04f, 0x1f},
-+	{0x3e20, 0x01},
-+	{0x3e37, 0x00},
-+	{0x3f50, 0x00},
-+	{0x3f56, 0x02},
-+	{0x3f57, 0xae},
-+};
-+
-+/* 2x2 binned. 40fps */
-+static const struct imx477_reg mode_2028x1520_regs[] = {
-+	{0x0342, 0x31},
-+	{0x0343, 0xc4},
-+	{0x0344, 0x00},
-+	{0x0345, 0x00},
-+	{0x0346, 0x00},
-+	{0x0347, 0x00},
-+	{0x0348, 0x0f},
-+	{0x0349, 0xd7},
-+	{0x034a, 0x0b},
-+	{0x034b, 0xdf},
-+	{0x0220, 0x00},
-+	{0x0221, 0x11},
-+	{0x0381, 0x01},
-+	{0x0383, 0x01},
-+	{0x0385, 0x01},
-+	{0x0387, 0x01},
-+	{0x0900, 0x01},
-+	{0x0901, 0x12},
-+	{0x0902, 0x02},
-+	{0x3140, 0x02},
-+	{0x3c00, 0x00},
-+	{0x3c01, 0x03},
-+	{0x3c02, 0xa2},
-+	{0x3f0d, 0x01},
-+	{0x5748, 0x07},
-+	{0x5749, 0xff},
-+	{0x574a, 0x00},
-+	{0x574b, 0x00},
-+	{0x7b53, 0x01},
-+	{0x9369, 0x73},
-+	{0x936b, 0x64},
-+	{0x936d, 0x5f},
-+	{0x9304, 0x00},
-+	{0x9305, 0x00},
-+	{0x9e9a, 0x2f},
-+	{0x9e9b, 0x2f},
-+	{0x9e9c, 0x2f},
-+	{0x9e9d, 0x00},
-+	{0x9e9e, 0x00},
-+	{0x9e9f, 0x00},
-+	{0xa2a9, 0x60},
-+	{0xa2b7, 0x00},
-+	{0x0401, 0x01},
-+	{0x0404, 0x00},
-+	{0x0405, 0x20},
-+	{0x0408, 0x00},
-+	{0x0409, 0x00},
-+	{0x040a, 0x00},
-+	{0x040b, 0x00},
-+	{0x040c, 0x0f},
-+	{0x040d, 0xd8},
-+	{0x040e, 0x0b},
-+	{0x040f, 0xe0},
-+	{0x034c, 0x07},
-+	{0x034d, 0xec},
-+	{0x034e, 0x05},
-+	{0x034f, 0xf0},
-+	{0x0301, 0x05},
-+	{0x0303, 0x02},
-+	{0x0305, 0x04},
-+	{0x0306, 0x01},
-+	{0x0307, 0x5e},
-+	{0x0309, 0x0c},
-+	{0x030b, 0x02},
-+	{0x030d, 0x02},
-+	{0x030e, 0x00},
-+	{0x030f, 0x96},
-+	{0x0310, 0x01},
-+	{0x0820, 0x07},
-+	{0x0821, 0x08},
-+	{0x0822, 0x00},
-+	{0x0823, 0x00},
-+	{0x080a, 0x00},
-+	{0x080b, 0x7f},
-+	{0x080c, 0x00},
-+	{0x080d, 0x4f},
-+	{0x080e, 0x00},
-+	{0x080f, 0x77},
-+	{0x0810, 0x00},
-+	{0x0811, 0x5f},
-+	{0x0812, 0x00},
-+	{0x0813, 0x57},
-+	{0x0814, 0x00},
-+	{0x0815, 0x4f},
-+	{0x0816, 0x01},
-+	{0x0817, 0x27},
-+	{0x0818, 0x00},
-+	{0x0819, 0x3f},
-+	{0xe04c, 0x00},
-+	{0xe04d, 0x7f},
-+	{0xe04e, 0x00},
-+	{0xe04f, 0x1f},
-+	{0x3e20, 0x01},
-+	{0x3e37, 0x00},
-+	{0x3f50, 0x00},
-+	{0x3f56, 0x01},
-+	{0x3f57, 0x6c},
-+};
-+
-+/* 1080p cropped mode */
-+static const struct imx477_reg mode_2028x1080_regs[] = {
-+	{0x0342, 0x31},
-+	{0x0343, 0xc4},
-+	{0x0344, 0x00},
-+	{0x0345, 0x00},
-+	{0x0346, 0x01},
-+	{0x0347, 0xb8},
-+	{0x0348, 0x0f},
-+	{0x0349, 0xd7},
-+	{0x034a, 0x0a},
-+	{0x034b, 0x27},
-+	{0x0220, 0x00},
-+	{0x0221, 0x11},
-+	{0x0381, 0x01},
-+	{0x0383, 0x01},
-+	{0x0385, 0x01},
-+	{0x0387, 0x01},
-+	{0x0900, 0x01},
-+	{0x0901, 0x12},
-+	{0x0902, 0x02},
-+	{0x3140, 0x02},
-+	{0x3c00, 0x00},
-+	{0x3c01, 0x03},
-+	{0x3c02, 0xa2},
-+	{0x3f0d, 0x01},
-+	{0x5748, 0x07},
-+	{0x5749, 0xff},
-+	{0x574a, 0x00},
-+	{0x574b, 0x00},
-+	{0x7b53, 0x01},
-+	{0x9369, 0x73},
-+	{0x936b, 0x64},
-+	{0x936d, 0x5f},
-+	{0x9304, 0x00},
-+	{0x9305, 0x00},
-+	{0x9e9a, 0x2f},
-+	{0x9e9b, 0x2f},
-+	{0x9e9c, 0x2f},
-+	{0x9e9d, 0x00},
-+	{0x9e9e, 0x00},
-+	{0x9e9f, 0x00},
-+	{0xa2a9, 0x60},
-+	{0xa2b7, 0x00},
-+	{0x0401, 0x01},
-+	{0x0404, 0x00},
-+	{0x0405, 0x20},
-+	{0x0408, 0x00},
-+	{0x0409, 0x00},
-+	{0x040a, 0x00},
-+	{0x040b, 0x00},
-+	{0x040c, 0x0f},
-+	{0x040d, 0xd8},
-+	{0x040e, 0x04},
-+	{0x040f, 0x38},
-+	{0x034c, 0x07},
-+	{0x034d, 0xec},
-+	{0x034e, 0x04},
-+	{0x034f, 0x38},
-+	{0x0301, 0x05},
-+	{0x0303, 0x02},
-+	{0x0305, 0x04},
-+	{0x0306, 0x01},
-+	{0x0307, 0x5e},
-+	{0x0309, 0x0c},
-+	{0x030b, 0x02},
-+	{0x030d, 0x02},
-+	{0x030e, 0x00},
-+	{0x030f, 0x96},
-+	{0x0310, 0x01},
-+	{0x0820, 0x07},
-+	{0x0821, 0x08},
-+	{0x0822, 0x00},
-+	{0x0823, 0x00},
-+	{0x080a, 0x00},
-+	{0x080b, 0x7f},
-+	{0x080c, 0x00},
-+	{0x080d, 0x4f},
-+	{0x080e, 0x00},
-+	{0x080f, 0x77},
-+	{0x0810, 0x00},
-+	{0x0811, 0x5f},
-+	{0x0812, 0x00},
-+	{0x0813, 0x57},
-+	{0x0814, 0x00},
-+	{0x0815, 0x4f},
-+	{0x0816, 0x01},
-+	{0x0817, 0x27},
-+	{0x0818, 0x00},
-+	{0x0819, 0x3f},
-+	{0xe04c, 0x00},
-+	{0xe04d, 0x7f},
-+	{0xe04e, 0x00},
-+	{0xe04f, 0x1f},
-+	{0x3e20, 0x01},
-+	{0x3e37, 0x00},
-+	{0x3f50, 0x00},
-+	{0x3f56, 0x01},
-+	{0x3f57, 0x6c},
-+};
-+
-+/* 4x4 binned. 120fps */
-+static const struct imx477_reg mode_1332x990_regs[] = {
-+	{0x420b, 0x01},
-+	{0x990c, 0x00},
-+	{0x990d, 0x08},
-+	{0x9956, 0x8c},
-+	{0x9957, 0x64},
-+	{0x9958, 0x50},
-+	{0x9a48, 0x06},
-+	{0x9a49, 0x06},
-+	{0x9a4a, 0x06},
-+	{0x9a4b, 0x06},
-+	{0x9a4c, 0x06},
-+	{0x9a4d, 0x06},
-+	{0x0112, 0x0a},
-+	{0x0113, 0x0a},
-+	{0x0114, 0x01},
-+	{0x0342, 0x1a},
-+	{0x0343, 0x08},
-+	{0x0340, 0x04},
-+	{0x0341, 0x1a},
-+	{0x0344, 0x00},
-+	{0x0345, 0x00},
-+	{0x0346, 0x02},
-+	{0x0347, 0x10},
-+	{0x0348, 0x0f},
-+	{0x0349, 0xd7},
-+	{0x034a, 0x09},
-+	{0x034b, 0xcf},
-+	{0x00e3, 0x00},
-+	{0x00e4, 0x00},
-+	{0x00fc, 0x0a},
-+	{0x00fd, 0x0a},
-+	{0x00fe, 0x0a},
-+	{0x00ff, 0x0a},
-+	{0xe013, 0x00},
-+	{0x0220, 0x00},
-+	{0x0221, 0x11},
-+	{0x0381, 0x01},
-+	{0x0383, 0x01},
-+	{0x0385, 0x01},
-+	{0x0387, 0x01},
-+	{0x0900, 0x01},
-+	{0x0901, 0x22},
-+	{0x0902, 0x02},
-+	{0x3140, 0x02},
-+	{0x3c00, 0x00},
-+	{0x3c01, 0x01},
-+	{0x3c02, 0x9c},
-+	{0x3f0d, 0x00},
-+	{0x5748, 0x00},
-+	{0x5749, 0x00},
-+	{0x574a, 0x00},
-+	{0x574b, 0xa4},
-+	{0x7b75, 0x0e},
-+	{0x7b76, 0x09},
-+	{0x7b77, 0x08},
-+	{0x7b78, 0x06},
-+	{0x7b79, 0x34},
-+	{0x7b53, 0x00},
-+	{0x9369, 0x73},
-+	{0x936b, 0x64},
-+	{0x936d, 0x5f},
-+	{0x9304, 0x03},
-+	{0x9305, 0x80},
-+	{0x9e9a, 0x2f},
-+	{0x9e9b, 0x2f},
-+	{0x9e9c, 0x2f},
-+	{0x9e9d, 0x00},
-+	{0x9e9e, 0x00},
-+	{0x9e9f, 0x00},
-+	{0xa2a9, 0x27},
-+	{0xa2b7, 0x03},
-+	{0x0401, 0x00},
-+	{0x0404, 0x00},
-+	{0x0405, 0x10},
-+	{0x0408, 0x01},
-+	{0x0409, 0x5c},
-+	{0x040a, 0x00},
-+	{0x040b, 0x00},
-+	{0x040c, 0x05},
-+	{0x040d, 0x34},
-+	{0x040e, 0x03},
-+	{0x040f, 0xde},
-+	{0x034c, 0x05},
-+	{0x034d, 0x34},
-+	{0x034e, 0x03},
-+	{0x034f, 0xde},
-+	{0x0301, 0x05},
-+	{0x0303, 0x02},
-+	{0x0305, 0x02},
-+	{0x0306, 0x00},
-+	{0x0307, 0xaf},
-+	{0x0309, 0x0a},
-+	{0x030b, 0x02},
-+	{0x030d, 0x02},
-+	{0x030e, 0x00},
-+	{0x030f, 0x96},
-+	{0x0310, 0x01},
-+	{0x0820, 0x07},
-+	{0x0821, 0x08},
-+	{0x0822, 0x00},
-+	{0x0823, 0x00},
-+	{0x080a, 0x00},
-+	{0x080b, 0x7f},
-+	{0x080c, 0x00},
-+	{0x080d, 0x4f},
-+	{0x080e, 0x00},
-+	{0x080f, 0x77},
-+	{0x0810, 0x00},
-+	{0x0811, 0x5f},
-+	{0x0812, 0x00},
-+	{0x0813, 0x57},
-+	{0x0814, 0x00},
-+	{0x0815, 0x4f},
-+	{0x0816, 0x01},
-+	{0x0817, 0x27},
-+	{0x0818, 0x00},
-+	{0x0819, 0x3f},
-+	{0xe04c, 0x00},
-+	{0xe04d, 0x5f},
-+	{0xe04e, 0x00},
-+	{0xe04f, 0x1f},
-+	{0x3e20, 0x01},
-+	{0x3e37, 0x00},
-+	{0x3f50, 0x00},
-+	{0x3f56, 0x00},
-+	{0x3f57, 0xbf},
-+};
-+
-+/* Mode configs */
-+static const struct imx477_mode supported_modes_12bit[] = {
-+	{
-+		/* 12MPix 10fps mode */
-+		.width = 4056,
-+		.height = 3040,
-+		.line_length_pix = 0x5dc0,
-+		.crop = {
-+			.left = IMX477_PIXEL_ARRAY_LEFT,
-+			.top = IMX477_PIXEL_ARRAY_TOP,
-+			.width = 4056,
-+			.height = 3040,
-+		},
-+		.timeperframe_min = {
-+			.numerator = 100,
-+			.denominator = 1000
-+		},
-+		.timeperframe_default = {
-+			.numerator = 100,
-+			.denominator = 1000
-+		},
-+		.reg_list = {
-+			.num_of_regs = ARRAY_SIZE(mode_4056x3040_regs),
-+			.regs = mode_4056x3040_regs,
-+		},
-+	},
-+	{
-+		/* 2x2 binned 40fps mode */
-+		.width = 2028,
-+		.height = 1520,
-+		.line_length_pix = 0x31c4,
-+		.crop = {
-+			.left = IMX477_PIXEL_ARRAY_LEFT,
-+			.top = IMX477_PIXEL_ARRAY_TOP,
-+			.width = 4056,
-+			.height = 3040,
-+		},
-+		.timeperframe_min = {
-+			.numerator = 100,
-+			.denominator = 4000
-+		},
-+		.timeperframe_default = {
-+			.numerator = 100,
-+			.denominator = 3000
-+		},
-+		.reg_list = {
-+			.num_of_regs = ARRAY_SIZE(mode_2028x1520_regs),
-+			.regs = mode_2028x1520_regs,
-+		},
-+	},
-+	{
-+		/* 1080p 50fps cropped mode */
-+		.width = 2028,
-+		.height = 1080,
-+		.line_length_pix = 0x31c4,
-+		.crop = {
-+			.left = IMX477_PIXEL_ARRAY_LEFT,
-+			.top = IMX477_PIXEL_ARRAY_TOP + 440,
-+			.width = 4056,
-+			.height = 2160,
-+		},
-+		.timeperframe_min = {
-+			.numerator = 100,
-+			.denominator = 5000
-+		},
-+		.timeperframe_default = {
-+			.numerator = 100,
-+			.denominator = 3000
-+		},
-+		.reg_list = {
-+			.num_of_regs = ARRAY_SIZE(mode_2028x1080_regs),
-+			.regs = mode_2028x1080_regs,
-+		},
-+	}
-+};
-+
-+static const struct imx477_mode supported_modes_10bit[] = {
-+	{
-+		/* 120fps. 2x2 binned and cropped */
-+		.width = 1332,
-+		.height = 990,
-+		.line_length_pix = 6664,
-+		.crop = {
-+			/*
-+			 * FIXME: the analog crop rectangle is actually
-+			 * programmed with a horizontal displacement of 0
-+			 * pixels, not 4. It gets shrunk after going through
-+			 * the scaler. Move this information to the compose
-+			 * rectangle once the driver is expanded to represent
-+			 * its processing blocks with multiple subdevs.
-+			 */
-+			.left = IMX477_PIXEL_ARRAY_LEFT + 696,
-+			.top = IMX477_PIXEL_ARRAY_TOP + 528,
-+			.width = 2664,
-+			.height = 1980,
-+		},
-+		.timeperframe_min = {
-+			.numerator = 100,
-+			.denominator = 12000
-+		},
-+		.timeperframe_default = {
-+			.numerator = 100,
-+			.denominator = 12000
-+		},
-+		.reg_list = {
-+			.num_of_regs = ARRAY_SIZE(mode_1332x990_regs),
-+			.regs = mode_1332x990_regs,
-+		}
-+	}
-+};
-+
-+/*
-+ * The supported formats.
-+ * This table MUST contain 4 entries per format, to cover the various flip
-+ * combinations in the order
-+ * - no flip
-+ * - h flip
-+ * - v flip
-+ * - h&v flips
-+ */
-+static const u32 codes[] = {
-+	/* 12-bit modes. */
-+	MEDIA_BUS_FMT_SRGGB12_1X12,
-+	MEDIA_BUS_FMT_SGRBG12_1X12,
-+	MEDIA_BUS_FMT_SGBRG12_1X12,
-+	MEDIA_BUS_FMT_SBGGR12_1X12,
-+	/* 10-bit modes. */
-+	MEDIA_BUS_FMT_SRGGB10_1X10,
-+	MEDIA_BUS_FMT_SGRBG10_1X10,
-+	MEDIA_BUS_FMT_SGBRG10_1X10,
-+	MEDIA_BUS_FMT_SBGGR10_1X10,
-+};
-+
-+static const char * const imx477_test_pattern_menu[] = {
-+	"Disabled",
-+	"Color Bars",
-+	"Solid Color",
-+	"Grey Color Bars",
-+	"PN9"
-+};
-+
-+static const int imx477_test_pattern_val[] = {
-+	IMX477_TEST_PATTERN_DISABLE,
-+	IMX477_TEST_PATTERN_COLOR_BARS,
-+	IMX477_TEST_PATTERN_SOLID_COLOR,
-+	IMX477_TEST_PATTERN_GREY_COLOR,
-+	IMX477_TEST_PATTERN_PN9,
-+};
-+
-+/* regulator supplies */
-+static const char * const imx477_supply_name[] = {
-+	/* Supplies can be enabled in any order */
-+	"VANA",  /* Analog (2.8V) supply */
-+	"VDIG",  /* Digital Core (1.05V) supply */
-+	"VDDL",  /* IF (1.8V) supply */
-+};
-+
-+#define IMX477_NUM_SUPPLIES ARRAY_SIZE(imx477_supply_name)
-+
-+/*
-+ * Initialisation delay between XCLR low->high and the moment when the sensor
-+ * can start capture (i.e. can leave software standby), given by T7 in the
-+ * datasheet is 8ms.  This does include I2C setup time as well.
-+ *
-+ * Note, that delay between XCLR low->high and reading the CCI ID register (T6
-+ * in the datasheet) is much smaller - 600us.
-+ */
-+#define IMX477_XCLR_MIN_DELAY_US	8000
-+#define IMX477_XCLR_DELAY_RANGE_US	1000
-+
-+struct imx477_compatible_data {
-+	unsigned int chip_id;
-+	struct imx477_reg_list extra_regs;
-+};
-+
-+struct imx477 {
-+	struct v4l2_subdev sd;
-+	struct media_pad pad[NUM_PADS];
-+
-+	unsigned int fmt_code;
-+
-+	struct clk *xclk;
-+	u32 xclk_freq;
-+
-+	struct gpio_desc *reset_gpio;
-+	struct regulator_bulk_data supplies[IMX477_NUM_SUPPLIES];
-+
-+	struct v4l2_ctrl_handler ctrl_handler;
-+	/* V4L2 Controls */
-+	struct v4l2_ctrl *pixel_rate;
-+	struct v4l2_ctrl *exposure;
-+	struct v4l2_ctrl *vflip;
-+	struct v4l2_ctrl *hflip;
-+	struct v4l2_ctrl *vblank;
-+	struct v4l2_ctrl *hblank;
-+
-+	/* Current mode */
-+	const struct imx477_mode *mode;
-+
-+	/*
-+	 * Mutex for serialized access:
-+	 * Protect sensor module set pad format and start/stop streaming safely.
-+	 */
-+	struct mutex mutex;
-+
-+	/* Streaming on/off */
-+	bool streaming;
-+
-+	/* Rewrite common registers on stream on? */
-+	bool common_regs_written;
-+
-+	/* Current long exposure factor in use. Set through V4L2_CID_VBLANK */
-+	unsigned int long_exp_shift;
-+
-+	/* Any extra information related to different compatible sensors */
-+	const struct imx477_compatible_data *compatible_data;
-+};
-+
-+static inline struct imx477 *to_imx477(struct v4l2_subdev *_sd)
-+{
-+	return container_of(_sd, struct imx477, sd);
-+}
-+
-+static inline void get_mode_table(unsigned int code,
-+				  const struct imx477_mode **mode_list,
-+				  unsigned int *num_modes)
-+{
-+	switch (code) {
-+	/* 12-bit */
-+	case MEDIA_BUS_FMT_SRGGB12_1X12:
-+	case MEDIA_BUS_FMT_SGRBG12_1X12:
-+	case MEDIA_BUS_FMT_SGBRG12_1X12:
-+	case MEDIA_BUS_FMT_SBGGR12_1X12:
-+		*mode_list = supported_modes_12bit;
-+		*num_modes = ARRAY_SIZE(supported_modes_12bit);
-+		break;
-+	/* 10-bit */
-+	case MEDIA_BUS_FMT_SRGGB10_1X10:
-+	case MEDIA_BUS_FMT_SGRBG10_1X10:
-+	case MEDIA_BUS_FMT_SGBRG10_1X10:
-+	case MEDIA_BUS_FMT_SBGGR10_1X10:
-+		*mode_list = supported_modes_10bit;
-+		*num_modes = ARRAY_SIZE(supported_modes_10bit);
-+		break;
-+	default:
-+		*mode_list = NULL;
-+		*num_modes = 0;
-+	}
-+}
-+
-+/* Read registers up to 2 at a time */
-+static int imx477_read_reg(struct imx477 *imx477, u16 reg, u32 len, u32 *val)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&imx477->sd);
-+	struct i2c_msg msgs[2];
-+	u8 addr_buf[2] = { reg >> 8, reg & 0xff };
-+	u8 data_buf[4] = { 0, };
-+	int ret;
-+
-+	if (len > 4)
-+		return -EINVAL;
-+
-+	/* Write register address */
-+	msgs[0].addr = client->addr;
-+	msgs[0].flags = 0;
-+	msgs[0].len = ARRAY_SIZE(addr_buf);
-+	msgs[0].buf = addr_buf;
-+
-+	/* Read data from register */
-+	msgs[1].addr = client->addr;
-+	msgs[1].flags = I2C_M_RD;
-+	msgs[1].len = len;
-+	msgs[1].buf = &data_buf[4 - len];
-+
-+	ret = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
-+	if (ret != ARRAY_SIZE(msgs))
-+		return -EIO;
-+
-+	*val = get_unaligned_be32(data_buf);
-+
-+	return 0;
-+}
-+
-+/* Write registers up to 2 at a time */
-+static int imx477_write_reg(struct imx477 *imx477, u16 reg, u32 len, u32 val)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&imx477->sd);
-+	u8 buf[6];
-+
-+	if (len > 4)
-+		return -EINVAL;
-+
-+	put_unaligned_be16(reg, buf);
-+	put_unaligned_be32(val << (8 * (4 - len)), buf + 2);
-+	if (i2c_master_send(client, buf, len + 2) != len + 2)
-+		return -EIO;
-+
-+	return 0;
-+}
-+
-+/* Write a list of registers */
-+static int imx477_write_regs(struct imx477 *imx477,
-+			     const struct imx477_reg *regs, u32 len)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&imx477->sd);
-+	unsigned int i;
-+	int ret;
-+
-+	for (i = 0; i < len; i++) {
-+		ret = imx477_write_reg(imx477, regs[i].address, 1, regs[i].val);
-+		if (ret) {
-+			dev_err_ratelimited(&client->dev,
-+					    "Failed to write reg 0x%4.4x. error = %d\n",
-+					    regs[i].address, ret);
-+
-+			return ret;
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+/* Get bayer order based on flip setting. */
-+static u32 imx477_get_format_code(struct imx477 *imx477, u32 code)
-+{
-+	unsigned int i;
-+
-+	lockdep_assert_held(&imx477->mutex);
-+
-+	for (i = 0; i < ARRAY_SIZE(codes); i++)
-+		if (codes[i] == code)
-+			break;
-+
-+	if (i >= ARRAY_SIZE(codes))
-+		i = 0;
-+
-+	i = (i & ~3) | (imx477->vflip->val ? 2 : 0) |
-+	    (imx477->hflip->val ? 1 : 0);
-+
-+	return codes[i];
-+}
-+
-+static void imx477_set_default_format(struct imx477 *imx477)
-+{
-+	/* Set default mode to max resolution */
-+	imx477->mode = &supported_modes_12bit[0];
-+	imx477->fmt_code = MEDIA_BUS_FMT_SRGGB12_1X12;
-+}
-+
-+static int imx477_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
-+{
-+	struct imx477 *imx477 = to_imx477(sd);
-+	struct v4l2_mbus_framefmt *try_fmt_img =
-+		v4l2_subdev_get_try_format(sd, fh->pad, IMAGE_PAD);
-+	struct v4l2_mbus_framefmt *try_fmt_meta =
-+		v4l2_subdev_get_try_format(sd, fh->pad, METADATA_PAD);
-+	struct v4l2_rect *try_crop;
-+
-+	mutex_lock(&imx477->mutex);
-+
-+	/* Initialize try_fmt for the image pad */
-+	try_fmt_img->width = supported_modes_12bit[0].width;
-+	try_fmt_img->height = supported_modes_12bit[0].height;
-+	try_fmt_img->code = imx477_get_format_code(imx477,
-+						   MEDIA_BUS_FMT_SRGGB12_1X12);
-+	try_fmt_img->field = V4L2_FIELD_NONE;
-+
-+	/* Initialize try_fmt for the embedded metadata pad */
-+	try_fmt_meta->width = IMX477_EMBEDDED_LINE_WIDTH;
-+	try_fmt_meta->height = IMX477_NUM_EMBEDDED_LINES;
-+	try_fmt_meta->code = MEDIA_BUS_FMT_SENSOR_DATA;
-+	try_fmt_meta->field = V4L2_FIELD_NONE;
-+
-+	/* Initialize try_crop */
-+	try_crop = v4l2_subdev_get_try_crop(sd, fh->pad, IMAGE_PAD);
-+	try_crop->left = IMX477_PIXEL_ARRAY_LEFT;
-+	try_crop->top = IMX477_PIXEL_ARRAY_TOP;
-+	try_crop->width = IMX477_PIXEL_ARRAY_WIDTH;
-+	try_crop->height = IMX477_PIXEL_ARRAY_HEIGHT;
-+
-+	mutex_unlock(&imx477->mutex);
-+
-+	return 0;
-+}
-+
-+static void imx477_adjust_exposure_range(struct imx477 *imx477)
-+{
-+	int exposure_max, exposure_def;
-+
-+	/* Honour the VBLANK limits when setting exposure. */
-+	exposure_max = imx477->mode->height + imx477->vblank->val -
-+		       IMX477_EXPOSURE_OFFSET;
-+	exposure_def = min(exposure_max, imx477->exposure->val);
-+	__v4l2_ctrl_modify_range(imx477->exposure, imx477->exposure->minimum,
-+				 exposure_max, imx477->exposure->step,
-+				 exposure_def);
-+}
-+
-+static int imx477_set_frame_length(struct imx477 *imx477, unsigned int val)
-+{
-+	int ret = 0;
-+
-+	imx477->long_exp_shift = 0;
-+
-+	while (val > IMX477_FRAME_LENGTH_MAX) {
-+		imx477->long_exp_shift++;
-+		val >>= 1;
-+	}
-+
-+	ret = imx477_write_reg(imx477, IMX477_REG_FRAME_LENGTH,
-+			       IMX477_REG_VALUE_16BIT, val);
-+	if (ret)
-+		return ret;
-+
-+	return imx477_write_reg(imx477, IMX477_LONG_EXP_SHIFT_REG,
-+				IMX477_REG_VALUE_08BIT, imx477->long_exp_shift);
-+}
-+
-+static int imx477_set_ctrl(struct v4l2_ctrl *ctrl)
-+{
-+	struct imx477 *imx477 =
-+		container_of(ctrl->handler, struct imx477, ctrl_handler);
-+	struct i2c_client *client = v4l2_get_subdevdata(&imx477->sd);
-+	int ret = 0;
-+
-+	/*
-+	 * The VBLANK control may change the limits of usable exposure, so check
-+	 * and adjust if necessary.
-+	 */
-+	if (ctrl->id == V4L2_CID_VBLANK)
-+		imx477_adjust_exposure_range(imx477);
-+
-+	/*
-+	 * Applying V4L2 control value only happens
-+	 * when power is up for streaming
-+	 */
-+	if (pm_runtime_get_if_in_use(&client->dev) == 0)
-+		return 0;
-+
-+	switch (ctrl->id) {
-+	case V4L2_CID_ANALOGUE_GAIN:
-+		ret = imx477_write_reg(imx477, IMX477_REG_ANALOG_GAIN,
-+				       IMX477_REG_VALUE_16BIT, ctrl->val);
-+		break;
-+	case V4L2_CID_EXPOSURE:
-+		ret = imx477_write_reg(imx477, IMX477_REG_EXPOSURE,
-+				       IMX477_REG_VALUE_16BIT, ctrl->val >>
-+							imx477->long_exp_shift);
-+		break;
-+	case V4L2_CID_DIGITAL_GAIN:
-+		ret = imx477_write_reg(imx477, IMX477_REG_DIGITAL_GAIN,
-+				       IMX477_REG_VALUE_16BIT, ctrl->val);
-+		break;
-+	case V4L2_CID_TEST_PATTERN:
-+		ret = imx477_write_reg(imx477, IMX477_REG_TEST_PATTERN,
-+				       IMX477_REG_VALUE_16BIT,
-+				       imx477_test_pattern_val[ctrl->val]);
-+		break;
-+	case V4L2_CID_TEST_PATTERN_RED:
-+		ret = imx477_write_reg(imx477, IMX477_REG_TEST_PATTERN_R,
-+				       IMX477_REG_VALUE_16BIT, ctrl->val);
-+		break;
-+	case V4L2_CID_TEST_PATTERN_GREENR:
-+		ret = imx477_write_reg(imx477, IMX477_REG_TEST_PATTERN_GR,
-+				       IMX477_REG_VALUE_16BIT, ctrl->val);
-+		break;
-+	case V4L2_CID_TEST_PATTERN_BLUE:
-+		ret = imx477_write_reg(imx477, IMX477_REG_TEST_PATTERN_B,
-+				       IMX477_REG_VALUE_16BIT, ctrl->val);
-+		break;
-+	case V4L2_CID_TEST_PATTERN_GREENB:
-+		ret = imx477_write_reg(imx477, IMX477_REG_TEST_PATTERN_GB,
-+				       IMX477_REG_VALUE_16BIT, ctrl->val);
-+		break;
-+	case V4L2_CID_HFLIP:
-+	case V4L2_CID_VFLIP:
-+		ret = imx477_write_reg(imx477, IMX477_REG_ORIENTATION, 1,
-+				       imx477->hflip->val |
-+				       imx477->vflip->val << 1);
-+		break;
-+	case V4L2_CID_VBLANK:
-+		ret = imx477_set_frame_length(imx477,
-+					      imx477->mode->height + ctrl->val);
-+		break;
-+	case V4L2_CID_HBLANK:
-+		ret = imx477_write_reg(imx477, IMX477_REG_LINE_LENGTH, 2,
-+				       imx477->mode->width + ctrl->val);
-+		break;
-+	default:
-+		dev_info(&client->dev,
-+			 "ctrl(id:0x%x,val:0x%x) is not handled\n",
-+			 ctrl->id, ctrl->val);
-+		ret = -EINVAL;
-+		break;
-+	}
-+
-+	pm_runtime_put(&client->dev);
-+
-+	return ret;
-+}
-+
-+static const struct v4l2_ctrl_ops imx477_ctrl_ops = {
-+	.s_ctrl = imx477_set_ctrl,
-+};
-+
-+static int imx477_enum_mbus_code(struct v4l2_subdev *sd,
-+				 struct v4l2_subdev_pad_config *cfg,
-+				 struct v4l2_subdev_mbus_code_enum *code)
-+{
-+	struct imx477 *imx477 = to_imx477(sd);
-+
-+	if (code->pad >= NUM_PADS)
-+		return -EINVAL;
-+
-+	if (code->pad == IMAGE_PAD) {
-+		if (code->index >= (ARRAY_SIZE(codes) / 4))
-+			return -EINVAL;
-+
-+		code->code = imx477_get_format_code(imx477,
-+						    codes[code->index * 4]);
-+	} else {
-+		if (code->index > 0)
-+			return -EINVAL;
-+
-+		code->code = MEDIA_BUS_FMT_SENSOR_DATA;
-+	}
-+
-+	return 0;
-+}
-+
-+static int imx477_enum_frame_size(struct v4l2_subdev *sd,
-+				  struct v4l2_subdev_pad_config *cfg,
-+				  struct v4l2_subdev_frame_size_enum *fse)
-+{
-+	struct imx477 *imx477 = to_imx477(sd);
-+
-+	if (fse->pad >= NUM_PADS)
-+		return -EINVAL;
-+
-+	if (fse->pad == IMAGE_PAD) {
-+		const struct imx477_mode *mode_list;
-+		unsigned int num_modes;
-+
-+		get_mode_table(fse->code, &mode_list, &num_modes);
-+
-+		if (fse->index >= num_modes)
-+			return -EINVAL;
-+
-+		if (fse->code != imx477_get_format_code(imx477, fse->code))
-+			return -EINVAL;
-+
-+		fse->min_width = mode_list[fse->index].width;
-+		fse->max_width = fse->min_width;
-+		fse->min_height = mode_list[fse->index].height;
-+		fse->max_height = fse->min_height;
-+	} else {
-+		if (fse->code != MEDIA_BUS_FMT_SENSOR_DATA || fse->index > 0)
-+			return -EINVAL;
-+
-+		fse->min_width = IMX477_EMBEDDED_LINE_WIDTH;
-+		fse->max_width = fse->min_width;
-+		fse->min_height = IMX477_NUM_EMBEDDED_LINES;
-+		fse->max_height = fse->min_height;
-+	}
-+
-+	return 0;
-+}
-+
-+static void imx477_reset_colorspace(struct v4l2_mbus_framefmt *fmt)
-+{
-+	fmt->colorspace = V4L2_COLORSPACE_RAW;
-+	fmt->ycbcr_enc = V4L2_MAP_YCBCR_ENC_DEFAULT(fmt->colorspace);
-+	fmt->quantization = V4L2_MAP_QUANTIZATION_DEFAULT(true,
-+							  fmt->colorspace,
-+							  fmt->ycbcr_enc);
-+	fmt->xfer_func = V4L2_MAP_XFER_FUNC_DEFAULT(fmt->colorspace);
-+}
-+
-+static void imx477_update_image_pad_format(struct imx477 *imx477,
-+					   const struct imx477_mode *mode,
-+					   struct v4l2_subdev_format *fmt)
-+{
-+	fmt->format.width = mode->width;
-+	fmt->format.height = mode->height;
-+	fmt->format.field = V4L2_FIELD_NONE;
-+	imx477_reset_colorspace(&fmt->format);
-+}
-+
-+static void imx477_update_metadata_pad_format(struct v4l2_subdev_format *fmt)
-+{
-+	fmt->format.width = IMX477_EMBEDDED_LINE_WIDTH;
-+	fmt->format.height = IMX477_NUM_EMBEDDED_LINES;
-+	fmt->format.code = MEDIA_BUS_FMT_SENSOR_DATA;
-+	fmt->format.field = V4L2_FIELD_NONE;
-+}
-+
-+static int imx477_get_pad_format(struct v4l2_subdev *sd,
-+				 struct v4l2_subdev_pad_config *cfg,
-+				 struct v4l2_subdev_format *fmt)
-+{
-+	struct imx477 *imx477 = to_imx477(sd);
-+
-+	if (fmt->pad >= NUM_PADS)
-+		return -EINVAL;
-+
-+	mutex_lock(&imx477->mutex);
-+
-+	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-+		struct v4l2_mbus_framefmt *try_fmt =
-+			v4l2_subdev_get_try_format(&imx477->sd, cfg, fmt->pad);
-+		/* update the code which could change due to vflip or hflip: */
-+		try_fmt->code = fmt->pad == IMAGE_PAD ?
-+				imx477_get_format_code(imx477, try_fmt->code) :
-+				MEDIA_BUS_FMT_SENSOR_DATA;
-+		fmt->format = *try_fmt;
-+	} else {
-+		if (fmt->pad == IMAGE_PAD) {
-+			imx477_update_image_pad_format(imx477, imx477->mode,
-+						       fmt);
-+			fmt->format.code =
-+			       imx477_get_format_code(imx477, imx477->fmt_code);
-+		} else {
-+			imx477_update_metadata_pad_format(fmt);
-+		}
-+	}
-+
-+	mutex_unlock(&imx477->mutex);
-+	return 0;
-+}
-+
-+static
-+unsigned int imx477_get_frame_length(const struct imx477_mode *mode,
-+				     const struct v4l2_fract *timeperframe)
-+{
-+	u64 frame_length;
-+
-+	frame_length = (u64)timeperframe->numerator * IMX477_PIXEL_RATE;
-+	do_div(frame_length,
-+	       (u64)timeperframe->denominator * mode->line_length_pix);
-+
-+	if (WARN_ON(frame_length > IMX477_FRAME_LENGTH_MAX))
-+		frame_length = IMX477_FRAME_LENGTH_MAX;
-+
-+	return max_t(unsigned int, frame_length, mode->height);
-+}
-+
-+static void imx477_set_framing_limits(struct imx477 *imx477)
-+{
-+	unsigned int frm_length_min, frm_length_default, hblank_min;
-+	const struct imx477_mode *mode = imx477->mode;
-+
-+	frm_length_min = imx477_get_frame_length(mode, &mode->timeperframe_min);
-+	frm_length_default =
-+		     imx477_get_frame_length(mode, &mode->timeperframe_default);
-+
-+	/* Default to no long exposure multiplier. */
-+	imx477->long_exp_shift = 0;
-+
-+	/* Update limits and set FPS to default */
-+	__v4l2_ctrl_modify_range(imx477->vblank, frm_length_min - mode->height,
-+				 ((1 << IMX477_LONG_EXP_SHIFT_MAX) *
-+					IMX477_FRAME_LENGTH_MAX) - mode->height,
-+				 1, frm_length_default - mode->height);
-+
-+	/* Setting this will adjust the exposure limits as well. */
-+	__v4l2_ctrl_s_ctrl(imx477->vblank, frm_length_default - mode->height);
-+
-+	hblank_min = mode->line_length_pix - mode->width;
-+	__v4l2_ctrl_modify_range(imx477->hblank, hblank_min,
-+				 IMX477_LINE_LENGTH_MAX, 1, hblank_min);
-+	__v4l2_ctrl_s_ctrl(imx477->hblank, hblank_min);
-+}
-+
-+static int imx477_set_pad_format(struct v4l2_subdev *sd,
-+				 struct v4l2_subdev_pad_config *cfg,
-+				 struct v4l2_subdev_format *fmt)
-+{
-+	struct v4l2_mbus_framefmt *framefmt;
-+	const struct imx477_mode *mode;
-+	struct imx477 *imx477 = to_imx477(sd);
-+
-+	if (fmt->pad >= NUM_PADS)
-+		return -EINVAL;
-+
-+	mutex_lock(&imx477->mutex);
-+
-+	if (fmt->pad == IMAGE_PAD) {
-+		const struct imx477_mode *mode_list;
-+		unsigned int num_modes;
-+
-+		/* Bayer order varies with flips */
-+		fmt->format.code = imx477_get_format_code(imx477,
-+							  fmt->format.code);
-+
-+		get_mode_table(fmt->format.code, &mode_list, &num_modes);
-+
-+		mode = v4l2_find_nearest_size(mode_list,
-+					      num_modes,
-+					      width, height,
-+					      fmt->format.width,
-+					      fmt->format.height);
-+		imx477_update_image_pad_format(imx477, mode, fmt);
-+		if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-+			framefmt = v4l2_subdev_get_try_format(sd, cfg,
-+							      fmt->pad);
-+			*framefmt = fmt->format;
-+		} else if (imx477->mode != mode) {
-+			imx477->mode = mode;
-+			imx477->fmt_code = fmt->format.code;
-+			imx477_set_framing_limits(imx477);
-+		}
-+	} else {
-+		if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-+			framefmt = v4l2_subdev_get_try_format(sd, cfg,
-+							      fmt->pad);
-+			*framefmt = fmt->format;
-+		} else {
-+			/* Only one embedded data mode is supported */
-+			imx477_update_metadata_pad_format(fmt);
-+		}
-+	}
-+
-+	mutex_unlock(&imx477->mutex);
-+
-+	return 0;
-+}
-+
-+static const struct v4l2_rect *
-+__imx477_get_pad_crop(struct imx477 *imx477, struct v4l2_subdev_pad_config *cfg,
-+		      unsigned int pad, enum v4l2_subdev_format_whence which)
-+{
-+	switch (which) {
-+	case V4L2_SUBDEV_FORMAT_TRY:
-+		return v4l2_subdev_get_try_crop(&imx477->sd, cfg, pad);
-+	case V4L2_SUBDEV_FORMAT_ACTIVE:
-+		return &imx477->mode->crop;
-+	}
-+
-+	return NULL;
-+}
-+
-+static int imx477_get_selection(struct v4l2_subdev *sd,
-+				struct v4l2_subdev_pad_config *cfg,
-+				struct v4l2_subdev_selection *sel)
-+{
-+	switch (sel->target) {
-+	case V4L2_SEL_TGT_CROP: {
-+		struct imx477 *imx477 = to_imx477(sd);
-+
-+		mutex_lock(&imx477->mutex);
-+		sel->r = *__imx477_get_pad_crop(imx477, cfg, sel->pad,
-+						sel->which);
-+		mutex_unlock(&imx477->mutex);
-+
-+		return 0;
-+	}
-+
-+	case V4L2_SEL_TGT_NATIVE_SIZE:
-+		sel->r.left = 0;
-+		sel->r.top = 0;
-+		sel->r.width = IMX477_NATIVE_WIDTH;
-+		sel->r.height = IMX477_NATIVE_HEIGHT;
-+
-+		return 0;
-+
-+	case V4L2_SEL_TGT_CROP_DEFAULT:
-+	case V4L2_SEL_TGT_CROP_BOUNDS:
-+		sel->r.left = IMX477_PIXEL_ARRAY_LEFT;
-+		sel->r.top = IMX477_PIXEL_ARRAY_TOP;
-+		sel->r.width = IMX477_PIXEL_ARRAY_WIDTH;
-+		sel->r.height = IMX477_PIXEL_ARRAY_HEIGHT;
-+
-+		return 0;
-+	}
-+
-+	return -EINVAL;
-+}
-+
-+/* Start streaming */
-+static int imx477_start_streaming(struct imx477 *imx477)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&imx477->sd);
-+	const struct imx477_reg_list *reg_list;
-+	const struct imx477_reg_list *extra_regs;
-+	int ret;
-+
-+	if (!imx477->common_regs_written) {
-+		ret = imx477_write_regs(imx477, mode_common_regs,
-+					ARRAY_SIZE(mode_common_regs));
-+		if (!ret) {
-+			extra_regs = &imx477->compatible_data->extra_regs;
-+			ret = imx477_write_regs(imx477,	extra_regs->regs,
-+						extra_regs->num_of_regs);
-+		}
-+
-+		if (ret) {
-+			dev_err(&client->dev, "%s failed to set common settings\n",
-+				__func__);
-+			return ret;
-+		}
-+		imx477->common_regs_written = true;
-+	}
-+
-+	/* Apply default values of current mode */
-+	reg_list = &imx477->mode->reg_list;
-+	ret = imx477_write_regs(imx477, reg_list->regs, reg_list->num_of_regs);
-+	if (ret) {
-+		dev_err(&client->dev, "%s failed to set mode\n", __func__);
-+		return ret;
-+	}
-+
-+	/* Set on-sensor DPC. */
-+	imx477_write_reg(imx477, 0x0b05, IMX477_REG_VALUE_08BIT, !!dpc_enable);
-+	imx477_write_reg(imx477, 0x0b06, IMX477_REG_VALUE_08BIT, !!dpc_enable);
-+
-+	/* Set vsync trigger mode */
-+	if (trigger_mode != 0) {
-+		/* trigger_mode == 1 for source, 2 for sink */
-+		const u32 val = (trigger_mode == 1) ? 1 : 0;
-+
-+		imx477_write_reg(imx477, IMX477_REG_MC_MODE,
-+				 IMX477_REG_VALUE_08BIT, 1);
-+		imx477_write_reg(imx477, IMX477_REG_MS_SEL,
-+				 IMX477_REG_VALUE_08BIT, val);
-+		imx477_write_reg(imx477, IMX477_REG_XVS_IO_CTRL,
-+				 IMX477_REG_VALUE_08BIT, val);
-+		imx477_write_reg(imx477, IMX477_REG_EXTOUT_EN,
-+				 IMX477_REG_VALUE_08BIT, val);
-+	}
-+
-+	/* Apply customized values from user */
-+	ret =  __v4l2_ctrl_handler_setup(imx477->sd.ctrl_handler);
-+	if (ret)
-+		return ret;
-+
-+	/* set stream on register */
-+	return imx477_write_reg(imx477, IMX477_REG_MODE_SELECT,
-+				IMX477_REG_VALUE_08BIT, IMX477_MODE_STREAMING);
-+}
-+
-+/* Stop streaming */
-+static void imx477_stop_streaming(struct imx477 *imx477)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&imx477->sd);
-+	int ret;
-+
-+	/* set stream off register */
-+	ret = imx477_write_reg(imx477, IMX477_REG_MODE_SELECT,
-+			       IMX477_REG_VALUE_08BIT, IMX477_MODE_STANDBY);
-+	if (ret)
-+		dev_err(&client->dev, "%s failed to set stream\n", __func__);
-+}
-+
-+static int imx477_set_stream(struct v4l2_subdev *sd, int enable)
-+{
-+	struct imx477 *imx477 = to_imx477(sd);
-+	struct i2c_client *client = v4l2_get_subdevdata(sd);
-+	int ret = 0;
-+
-+	mutex_lock(&imx477->mutex);
-+	if (imx477->streaming == enable) {
-+		mutex_unlock(&imx477->mutex);
-+		return 0;
-+	}
-+
-+	if (enable) {
-+		ret = pm_runtime_get_sync(&client->dev);
-+		if (ret < 0) {
-+			pm_runtime_put_noidle(&client->dev);
-+			goto err_unlock;
-+		}
-+
-+		/*
-+		 * Apply default & customized values
-+		 * and then start streaming.
-+		 */
-+		ret = imx477_start_streaming(imx477);
-+		if (ret)
-+			goto err_rpm_put;
-+	} else {
-+		imx477_stop_streaming(imx477);
-+		pm_runtime_put(&client->dev);
-+	}
-+
-+	imx477->streaming = enable;
-+
-+	/* vflip and hflip cannot change during streaming */
-+	__v4l2_ctrl_grab(imx477->vflip, enable);
-+	__v4l2_ctrl_grab(imx477->hflip, enable);
-+
-+	mutex_unlock(&imx477->mutex);
-+
-+	return ret;
-+
-+err_rpm_put:
-+	pm_runtime_put(&client->dev);
-+err_unlock:
-+	mutex_unlock(&imx477->mutex);
-+
-+	return ret;
-+}
-+
-+/* Power/clock management functions */
-+static int imx477_power_on(struct device *dev)
-+{
-+	struct i2c_client *client = to_i2c_client(dev);
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct imx477 *imx477 = to_imx477(sd);
-+	int ret;
-+
-+	ret = regulator_bulk_enable(IMX477_NUM_SUPPLIES,
-+				    imx477->supplies);
-+	if (ret) {
-+		dev_err(&client->dev, "%s: failed to enable regulators\n",
-+			__func__);
-+		return ret;
-+	}
-+
-+	ret = clk_prepare_enable(imx477->xclk);
-+	if (ret) {
-+		dev_err(&client->dev, "%s: failed to enable clock\n",
-+			__func__);
-+		goto reg_off;
-+	}
-+
-+	gpiod_set_value_cansleep(imx477->reset_gpio, 1);
-+	usleep_range(IMX477_XCLR_MIN_DELAY_US,
-+		     IMX477_XCLR_MIN_DELAY_US + IMX477_XCLR_DELAY_RANGE_US);
-+
-+	return 0;
-+
-+reg_off:
-+	regulator_bulk_disable(IMX477_NUM_SUPPLIES, imx477->supplies);
-+	return ret;
-+}
-+
-+static int imx477_power_off(struct device *dev)
-+{
-+	struct i2c_client *client = to_i2c_client(dev);
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct imx477 *imx477 = to_imx477(sd);
-+
-+	gpiod_set_value_cansleep(imx477->reset_gpio, 0);
-+	regulator_bulk_disable(IMX477_NUM_SUPPLIES, imx477->supplies);
-+	clk_disable_unprepare(imx477->xclk);
-+
-+	/* Force reprogramming of the common registers when powered up again. */
-+	imx477->common_regs_written = false;
-+
-+	return 0;
-+}
-+
-+static int __maybe_unused imx477_suspend(struct device *dev)
-+{
-+	struct i2c_client *client = to_i2c_client(dev);
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct imx477 *imx477 = to_imx477(sd);
-+
-+	if (imx477->streaming)
-+		imx477_stop_streaming(imx477);
-+
-+	return 0;
-+}
-+
-+static int __maybe_unused imx477_resume(struct device *dev)
-+{
-+	struct i2c_client *client = to_i2c_client(dev);
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct imx477 *imx477 = to_imx477(sd);
-+	int ret;
-+
-+	if (imx477->streaming) {
-+		ret = imx477_start_streaming(imx477);
-+		if (ret)
-+			goto error;
-+	}
-+
-+	return 0;
-+
-+error:
-+	imx477_stop_streaming(imx477);
-+	imx477->streaming = 0;
-+	return ret;
-+}
-+
-+static int imx477_get_regulators(struct imx477 *imx477)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&imx477->sd);
-+	unsigned int i;
-+
-+	for (i = 0; i < IMX477_NUM_SUPPLIES; i++)
-+		imx477->supplies[i].supply = imx477_supply_name[i];
-+
-+	return devm_regulator_bulk_get(&client->dev,
-+				       IMX477_NUM_SUPPLIES,
-+				       imx477->supplies);
-+}
-+
-+/* Verify chip ID */
-+static int imx477_identify_module(struct imx477 *imx477, u32 expected_id)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&imx477->sd);
-+	int ret;
-+	u32 val;
-+
-+	ret = imx477_read_reg(imx477, IMX477_REG_CHIP_ID,
-+			      IMX477_REG_VALUE_16BIT, &val);
-+	if (ret) {
-+		dev_err(&client->dev, "failed to read chip id %x, with error %d\n",
-+			expected_id, ret);
-+		return ret;
-+	}
-+
-+	if (val != expected_id) {
-+		dev_err(&client->dev, "chip id mismatch: %x!=%x\n",
-+			expected_id, val);
-+		return -EIO;
-+	}
-+
-+	dev_info(&client->dev, "Device found is imx%x\n", val);
-+
-+	return 0;
-+}
-+
-+static const struct v4l2_subdev_core_ops imx477_core_ops = {
-+	.subscribe_event = v4l2_ctrl_subdev_subscribe_event,
-+	.unsubscribe_event = v4l2_event_subdev_unsubscribe,
-+};
-+
-+static const struct v4l2_subdev_video_ops imx477_video_ops = {
-+	.s_stream = imx477_set_stream,
-+};
-+
-+static const struct v4l2_subdev_pad_ops imx477_pad_ops = {
-+	.enum_mbus_code = imx477_enum_mbus_code,
-+	.get_fmt = imx477_get_pad_format,
-+	.set_fmt = imx477_set_pad_format,
-+	.get_selection = imx477_get_selection,
-+	.enum_frame_size = imx477_enum_frame_size,
-+};
-+
-+static const struct v4l2_subdev_ops imx477_subdev_ops = {
-+	.core = &imx477_core_ops,
-+	.video = &imx477_video_ops,
-+	.pad = &imx477_pad_ops,
-+};
-+
-+static const struct v4l2_subdev_internal_ops imx477_internal_ops = {
-+	.open = imx477_open,
-+};
-+
-+/* Initialize control handlers */
-+static int imx477_init_controls(struct imx477 *imx477)
-+{
-+	struct v4l2_ctrl_handler *ctrl_hdlr;
-+	struct i2c_client *client = v4l2_get_subdevdata(&imx477->sd);
-+	struct v4l2_fwnode_device_properties props;
-+	unsigned int i;
-+	int ret;
-+
-+	ctrl_hdlr = &imx477->ctrl_handler;
-+	ret = v4l2_ctrl_handler_init(ctrl_hdlr, 16);
-+	if (ret)
-+		return ret;
-+
-+	mutex_init(&imx477->mutex);
-+	ctrl_hdlr->lock = &imx477->mutex;
-+
-+	/* By default, PIXEL_RATE is read only */
-+	imx477->pixel_rate = v4l2_ctrl_new_std(ctrl_hdlr, &imx477_ctrl_ops,
-+					       V4L2_CID_PIXEL_RATE,
-+					       IMX477_PIXEL_RATE,
-+					       IMX477_PIXEL_RATE, 1,
-+					       IMX477_PIXEL_RATE);
-+
-+	/*
-+	 * Create the controls here, but mode specific limits are setup
-+	 * in the imx477_set_framing_limits() call below.
-+	 */
-+	imx477->vblank = v4l2_ctrl_new_std(ctrl_hdlr, &imx477_ctrl_ops,
-+					   V4L2_CID_VBLANK, 0, 0xffff, 1, 0);
-+	imx477->hblank = v4l2_ctrl_new_std(ctrl_hdlr, &imx477_ctrl_ops,
-+					   V4L2_CID_HBLANK, 0, 0xffff, 1, 0);
-+
-+	imx477->exposure = v4l2_ctrl_new_std(ctrl_hdlr, &imx477_ctrl_ops,
-+					     V4L2_CID_EXPOSURE,
-+					     IMX477_EXPOSURE_MIN,
-+					     IMX477_EXPOSURE_MAX,
-+					     IMX477_EXPOSURE_STEP,
-+					     IMX477_EXPOSURE_DEFAULT);
-+
-+	v4l2_ctrl_new_std(ctrl_hdlr, &imx477_ctrl_ops, V4L2_CID_ANALOGUE_GAIN,
-+			  IMX477_ANA_GAIN_MIN, IMX477_ANA_GAIN_MAX,
-+			  IMX477_ANA_GAIN_STEP, IMX477_ANA_GAIN_DEFAULT);
-+
-+	v4l2_ctrl_new_std(ctrl_hdlr, &imx477_ctrl_ops, V4L2_CID_DIGITAL_GAIN,
-+			  IMX477_DGTL_GAIN_MIN, IMX477_DGTL_GAIN_MAX,
-+			  IMX477_DGTL_GAIN_STEP, IMX477_DGTL_GAIN_DEFAULT);
-+
-+	imx477->hflip = v4l2_ctrl_new_std(ctrl_hdlr, &imx477_ctrl_ops,
-+					  V4L2_CID_HFLIP, 0, 1, 1, 0);
-+	if (imx477->hflip)
-+		imx477->hflip->flags |= V4L2_CTRL_FLAG_MODIFY_LAYOUT;
-+
-+	imx477->vflip = v4l2_ctrl_new_std(ctrl_hdlr, &imx477_ctrl_ops,
-+					  V4L2_CID_VFLIP, 0, 1, 1, 0);
-+	if (imx477->vflip)
-+		imx477->vflip->flags |= V4L2_CTRL_FLAG_MODIFY_LAYOUT;
-+
-+	v4l2_ctrl_new_std_menu_items(ctrl_hdlr, &imx477_ctrl_ops,
-+				     V4L2_CID_TEST_PATTERN,
-+				     ARRAY_SIZE(imx477_test_pattern_menu) - 1,
-+				     0, 0, imx477_test_pattern_menu);
-+	for (i = 0; i < 4; i++) {
-+		/*
-+		 * The assumption is that
-+		 * V4L2_CID_TEST_PATTERN_GREENR == V4L2_CID_TEST_PATTERN_RED + 1
-+		 * V4L2_CID_TEST_PATTERN_BLUE   == V4L2_CID_TEST_PATTERN_RED + 2
-+		 * V4L2_CID_TEST_PATTERN_GREENB == V4L2_CID_TEST_PATTERN_RED + 3
-+		 */
-+		v4l2_ctrl_new_std(ctrl_hdlr, &imx477_ctrl_ops,
-+				  V4L2_CID_TEST_PATTERN_RED + i,
-+				  IMX477_TEST_PATTERN_COLOUR_MIN,
-+				  IMX477_TEST_PATTERN_COLOUR_MAX,
-+				  IMX477_TEST_PATTERN_COLOUR_STEP,
-+				  IMX477_TEST_PATTERN_COLOUR_MAX);
-+		/* The "Solid color" pattern is white by default */
-+	}
-+
-+	if (ctrl_hdlr->error) {
-+		ret = ctrl_hdlr->error;
-+		dev_err(&client->dev, "%s control init failed (%d)\n",
-+			__func__, ret);
-+		goto error;
-+	}
-+
-+	ret = v4l2_fwnode_device_parse(&client->dev, &props);
-+	if (ret)
-+		goto error;
-+
-+	ret = v4l2_ctrl_new_fwnode_properties(ctrl_hdlr, &imx477_ctrl_ops,
-+					      &props);
-+	if (ret)
-+		goto error;
-+
-+	imx477->sd.ctrl_handler = ctrl_hdlr;
-+
-+	/* Setup exposure and frame/line length limits. */
-+	imx477_set_framing_limits(imx477);
-+
-+	return 0;
-+
-+error:
-+	v4l2_ctrl_handler_free(ctrl_hdlr);
-+	mutex_destroy(&imx477->mutex);
-+
-+	return ret;
-+}
-+
-+static void imx477_free_controls(struct imx477 *imx477)
-+{
-+	v4l2_ctrl_handler_free(imx477->sd.ctrl_handler);
-+	mutex_destroy(&imx477->mutex);
-+}
-+
-+static int imx477_check_hwcfg(struct device *dev)
-+{
-+	struct fwnode_handle *endpoint;
-+	struct v4l2_fwnode_endpoint ep_cfg = {
-+		.bus_type = V4L2_MBUS_CSI2_DPHY
-+	};
-+	int ret = -EINVAL;
-+
-+	endpoint = fwnode_graph_get_next_endpoint(dev_fwnode(dev), NULL);
-+	if (!endpoint) {
-+		dev_err(dev, "endpoint node not found\n");
-+		return -EINVAL;
-+	}
-+
-+	if (v4l2_fwnode_endpoint_alloc_parse(endpoint, &ep_cfg)) {
-+		dev_err(dev, "could not parse endpoint\n");
-+		goto error_out;
-+	}
-+
-+	/* Check the number of MIPI CSI2 data lanes */
-+	if (ep_cfg.bus.mipi_csi2.num_data_lanes != 2) {
-+		dev_err(dev, "only 2 data lanes are currently supported\n");
-+		goto error_out;
-+	}
-+
-+	/* Check the link frequency set in device tree */
-+	if (!ep_cfg.nr_of_link_frequencies) {
-+		dev_err(dev, "link-frequency property not found in DT\n");
-+		goto error_out;
-+	}
-+
-+	if (ep_cfg.nr_of_link_frequencies != 1 ||
-+	    ep_cfg.link_frequencies[0] != IMX477_DEFAULT_LINK_FREQ) {
-+		dev_err(dev, "Link frequency not supported: %lld\n",
-+			ep_cfg.link_frequencies[0]);
-+		goto error_out;
-+	}
-+
-+	ret = 0;
-+
-+error_out:
-+	v4l2_fwnode_endpoint_free(&ep_cfg);
-+	fwnode_handle_put(endpoint);
-+
-+	return ret;
-+}
-+
-+static const struct imx477_compatible_data imx477_compatible = {
-+	.chip_id = IMX477_CHIP_ID,
-+	.extra_regs = {
-+		.num_of_regs = 0,
-+		.regs = NULL
-+	}
-+};
-+
-+static const struct imx477_reg imx378_regs[] = {
-+	{0x3e35, 0x01},
-+	{0x4421, 0x08},
-+	{0x3ff9, 0x00},
-+};
-+
-+static const struct imx477_compatible_data imx378_compatible = {
-+	.chip_id = IMX378_CHIP_ID,
-+	.extra_regs = {
-+		.num_of_regs = ARRAY_SIZE(imx378_regs),
-+		.regs = imx378_regs
-+	}
-+};
-+
-+static const struct of_device_id imx477_dt_ids[] = {
-+	{ .compatible = "sony,imx477", .data = &imx477_compatible },
-+	{ .compatible = "sony,imx378", .data = &imx378_compatible },
-+	{ /* sentinel */ }
-+};
-+
-+static int imx477_probe(struct i2c_client *client)
-+{
-+	struct device *dev = &client->dev;
-+	struct imx477 *imx477;
-+	const struct of_device_id *match;
-+	int ret;
-+
-+	imx477 = devm_kzalloc(&client->dev, sizeof(*imx477), GFP_KERNEL);
-+	if (!imx477)
-+		return -ENOMEM;
-+
-+	v4l2_i2c_subdev_init(&imx477->sd, client, &imx477_subdev_ops);
-+
-+	match = of_match_device(imx477_dt_ids, dev);
-+	if (!match)
-+		return -ENODEV;
-+	imx477->compatible_data =
-+		(const struct imx477_compatible_data *)match->data;
-+
-+	/* Check the hardware configuration in device tree */
-+	if (imx477_check_hwcfg(dev))
-+		return -EINVAL;
-+
-+	/* Get system clock (xclk) */
-+	imx477->xclk = devm_clk_get(dev, NULL);
-+	if (IS_ERR(imx477->xclk)) {
-+		dev_err(dev, "failed to get xclk\n");
-+		return PTR_ERR(imx477->xclk);
-+	}
-+
-+	imx477->xclk_freq = clk_get_rate(imx477->xclk);
-+	if (imx477->xclk_freq != IMX477_XCLK_FREQ) {
-+		dev_err(dev, "xclk frequency not supported: %d Hz\n",
-+			imx477->xclk_freq);
-+		return -EINVAL;
-+	}
-+
-+	ret = imx477_get_regulators(imx477);
-+	if (ret) {
-+		dev_err(dev, "failed to get regulators\n");
-+		return ret;
-+	}
-+
-+	/* Request optional enable pin */
-+	imx477->reset_gpio = devm_gpiod_get_optional(dev, "reset",
-+						     GPIOD_OUT_HIGH);
-+
-+	/*
-+	 * The sensor must be powered for imx477_identify_module()
-+	 * to be able to read the CHIP_ID register
-+	 */
-+	ret = imx477_power_on(dev);
-+	if (ret)
-+		return ret;
-+
-+	ret = imx477_identify_module(imx477, imx477->compatible_data->chip_id);
-+	if (ret)
-+		goto error_power_off;
-+
-+	/* Initialize default format */
-+	imx477_set_default_format(imx477);
-+
-+	/* Enable runtime PM and turn off the device */
-+	pm_runtime_set_active(dev);
-+	pm_runtime_enable(dev);
-+	pm_runtime_idle(dev);
-+
-+	/* This needs the pm runtime to be registered. */
-+	ret = imx477_init_controls(imx477);
-+	if (ret)
-+		goto error_power_off;
-+
-+	/* Initialize subdev */
-+	imx477->sd.internal_ops = &imx477_internal_ops;
-+	imx477->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE |
-+			    V4L2_SUBDEV_FL_HAS_EVENTS;
-+	imx477->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR;
-+
-+	/* Initialize source pads */
-+	imx477->pad[IMAGE_PAD].flags = MEDIA_PAD_FL_SOURCE;
-+	imx477->pad[METADATA_PAD].flags = MEDIA_PAD_FL_SOURCE;
-+
-+	ret = media_entity_pads_init(&imx477->sd.entity, NUM_PADS, imx477->pad);
-+	if (ret) {
-+		dev_err(dev, "failed to init entity pads: %d\n", ret);
-+		goto error_handler_free;
-+	}
-+
-+	ret = v4l2_async_register_subdev_sensor(&imx477->sd);
-+	if (ret < 0) {
-+		dev_err(dev, "failed to register sensor sub-device: %d\n", ret);
-+		goto error_media_entity;
-+	}
-+
-+	return 0;
-+
-+error_media_entity:
-+	media_entity_cleanup(&imx477->sd.entity);
-+
-+error_handler_free:
-+	imx477_free_controls(imx477);
-+
-+error_power_off:
-+	pm_runtime_disable(&client->dev);
-+	pm_runtime_set_suspended(&client->dev);
-+	imx477_power_off(&client->dev);
-+
-+	return ret;
-+}
-+
-+static void imx477_remove(struct i2c_client *client)
-+{
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct imx477 *imx477 = to_imx477(sd);
-+
-+	v4l2_async_unregister_subdev(sd);
-+	media_entity_cleanup(&sd->entity);
-+	imx477_free_controls(imx477);
-+
-+	pm_runtime_disable(&client->dev);
-+	if (!pm_runtime_status_suspended(&client->dev))
-+		imx477_power_off(&client->dev);
-+	pm_runtime_set_suspended(&client->dev);
-+}
-+
-+MODULE_DEVICE_TABLE(of, imx477_dt_ids);
-+
-+static const struct dev_pm_ops imx477_pm_ops = {
-+	SET_SYSTEM_SLEEP_PM_OPS(imx477_suspend, imx477_resume)
-+	SET_RUNTIME_PM_OPS(imx477_power_off, imx477_power_on, NULL)
-+};
-+
-+static struct i2c_driver imx477_i2c_driver = {
-+	.driver = {
-+		.name = "imx477",
-+		.of_match_table	= imx477_dt_ids,
-+		.pm = &imx477_pm_ops,
-+	},
-+	.probe_new = imx477_probe,
-+	.remove = imx477_remove,
-+};
-+
-+module_i2c_driver(imx477_i2c_driver);
-+
-+MODULE_AUTHOR("Naushir Patuck <naush@raspberrypi.com>");
-+MODULE_DESCRIPTION("Sony IMX477 sensor driver");
-+MODULE_LICENSE("GPL v2");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0196-media-i2c-imx519-Support-for-the-Sony-IMX519-sensor.patch b/target/linux/bcm27xx/patches-6.1/950-0196-media-i2c-imx519-Support-for-the-Sony-IMX519-sensor.patch
deleted file mode 100644
index 662c057e9a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0196-media-i2c-imx519-Support-for-the-Sony-IMX519-sensor.patch
+++ /dev/null
@@ -1,2317 +0,0 @@
-From 9b5a7e22d42b137d7ced182ded00337c6f819795 Mon Sep 17 00:00:00 2001
-From: Lee Jackson <info@arducam.com>
-Date: Fri, 27 Aug 2021 14:36:55 +0800
-Subject: [PATCH] media: i2c: imx519: Support for the Sony IMX519
- sensor
-
-dt-bindings: media: i2c: Add IMX519 CMOS sensor binding
-
-Add YAML device tree binding for IMX519 CMOS image sensor, and
-the relevant MAINTAINERS entries.
-
-Signed-off-by: Lee Jackson <info@arducam.com>
-
-media: i2c: Add driver for IMX519 sensor
-
-Adds a driver for the 16MPix IMX519 CSI2 sensor.
-Whilst the sensor supports 2 or 4 CSI2 data lanes, this driver
-currently only supports 2 lanes.
-
-The following Bayer modes are currently available:
-
-4656x3496 10-bit @ 10fps
-3840x2160 10-bit (cropped) @ 21fps
-2328x1748 10-bit (binned) @ 30fps
-1920x1080 10-bit (cropped/binned) @ 60fps
-1280x720 10-bit (cropped/binned) @ 120fps
-
-Signed-off-by: Lee Jackson <info@arducam.com>
-
-media: i2c: imx519: Advertise embedded data node on media pad 1
-
-This commit updates the imx519 driver to adverise support for embedded
-data streams.
-
-The imx519 sensor subdevice overloads the media pad to differentiate
-between image stream (pad 0) and embedded data stream (pad 1) when
-performing the v4l2_subdev_pad_ops functions.
-
-Signed-off-by: Lee Jackson <info@arducam.com>
-
-media: i2c: imx519: Sensor should report RAW color space
-
-Tested on Raspberry Pi running libcamera.
-
-Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
-
-media: i2c: Update imx519 Kconfig entry
-
-Bring the IMX519 Kconfig declaration in line with the upstream entries.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- .../devicetree/bindings/media/i2c/imx519.yaml |  113 +
- MAINTAINERS                                   |    8 +
- drivers/media/i2c/Kconfig                     |   11 +
- drivers/media/i2c/Makefile                    |    1 +
- drivers/media/i2c/imx519.c                    | 2090 +++++++++++++++++
- 5 files changed, 2223 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/media/i2c/imx519.yaml
- create mode 100644 drivers/media/i2c/imx519.c
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/media/i2c/imx519.yaml
-@@ -0,0 +1,113 @@
-+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
-+%YAML 1.2
-+---
-+$id: http://devicetree.org/schemas/media/i2c/imx519.yaml#
-+$schema: http://devicetree.org/meta-schemas/core.yaml#
-+
-+title: Sony 1/2.5-Inch 16Mpixel CMOS Digital Image Sensor
-+
-+maintainers:
-+  - Lee Jackson <info@arducam.com>
-+
-+description: |-
-+  The Sony IMX519 is a 1/2.5-inch CMOS active pixel digital image sensor
-+  with an active array size of 4656H x 3496V. It is programmable through
-+  I2C interface. The I2C address is fixed to 0x1A as per sensor data sheet.
-+  Image data is sent through MIPI CSI-2, which is configured as either 2 or
-+  4 data lanes.
-+
-+properties:
-+  compatible:
-+    const: sony,imx519
-+
-+  reg:
-+    description: I2C device address
-+    maxItems: 1
-+
-+  clocks:
-+    maxItems: 1
-+
-+  VDIG-supply:
-+    description:
-+      Digital I/O voltage supply, 1.05 volts
-+
-+  VANA-supply:
-+    description:
-+      Analog voltage supply, 2.8 volts
-+
-+  VDDL-supply:
-+    description:
-+      Digital core voltage supply, 1.8 volts
-+
-+  reset-gpios:
-+    description: |-
-+      Reference to the GPIO connected to the xclr pin, if any.
-+      Must be released (set high) after all supplies and INCK are applied.
-+
-+  # See ../video-interfaces.txt for more details
-+  port:
-+    type: object
-+    properties:
-+      endpoint:
-+        type: object
-+        properties:
-+          data-lanes:
-+            description: |-
-+              The sensor supports either two-lane, or four-lane operation.
-+              For two-lane operation the property must be set to <1 2>.
-+            items:
-+              - const: 1
-+              - const: 2
-+
-+          clock-noncontinuous:
-+            type: boolean
-+            description: |-
-+              MIPI CSI-2 clock is non-continuous if this property is present,
-+              otherwise it's continuous.
-+
-+          link-frequencies:
-+            allOf:
-+              - $ref: /schemas/types.yaml#/definitions/uint64-array
-+            description:
-+              Allowed data bus frequencies.
-+
-+        required:
-+          - link-frequencies
-+
-+required:
-+  - compatible
-+  - reg
-+  - clocks
-+  - VANA-supply
-+  - VDIG-supply
-+  - VDDL-supply
-+  - port
-+
-+additionalProperties: false
-+
-+examples:
-+  - |
-+    i2c0 {
-+        #address-cells = <1>;
-+        #size-cells = <0>;
-+
-+        imx519: sensor@1a {
-+            compatible = "sony,imx519";
-+            reg = <0x1a>;
-+            clocks = <&imx519_clk>;
-+            VANA-supply = <&imx519_vana>;   /* 2.8v */
-+            VDIG-supply = <&imx519_vdig>;   /* 1.05v */
-+            VDDL-supply = <&imx519_vddl>;   /* 1.8v */
-+
-+            port {
-+                imx519_0: endpoint {
-+                    remote-endpoint = <&csi1_ep>;
-+                    data-lanes = <1 2>;
-+                    clock-noncontinuous;
-+                    link-frequencies = /bits/ 64 <493500000>;
-+                };
-+            };
-+        };
-+    };
-+
-+...
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -19298,6 +19298,14 @@ T:	git git://linuxtv.org/media_tree.git
- F:	Documentation/devicetree/bindings/media/i2c/imx477.yaml
- F:	drivers/media/i2c/imx477.c
- 
-+SONY IMX519 SENSOR DRIVER
-+M:	Arducam Kernel Maintenance <info@arducam.com>
-+L:	linux-media@vger.kernel.org
-+S:	Maintained
-+T:	git git://linuxtv.org/media_tree.git
-+F:	Documentation/devicetree/bindings/media/i2c/imx519.yaml
-+F:	drivers/media/i2c/imx519.c
-+
- SONY MEMORYSTICK SUBSYSTEM
- M:	Maxim Levitsky <maximlevitsky@gmail.com>
- M:	Alex Dubov <oakad@yahoo.com>
---- a/drivers/media/i2c/Kconfig
-+++ b/drivers/media/i2c/Kconfig
-@@ -235,6 +235,17 @@ config VIDEO_IMX412
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called imx412.
- 
-+config VIDEO_IMX519
-+	tristate "Arducam IMX519 sensor support"
-+	depends on I2C && VIDEO_DEV
-+	select VIDEO_V4L2_SUBDEV_API
-+	help
-+	  This is a Video4Linux2 sensor driver for the Arducam
-+	  IMX519 camera.
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called IMX519.
-+
- config VIDEO_MAX9271_LIB
- 	tristate
- 
---- a/drivers/media/i2c/Makefile
-+++ b/drivers/media/i2c/Makefile
-@@ -49,6 +49,7 @@ obj-$(CONFIG_VIDEO_IMX335) += imx335.o
- obj-$(CONFIG_VIDEO_IMX355) += imx355.o
- obj-$(CONFIG_VIDEO_IMX412) += imx412.o
- obj-$(CONFIG_VIDEO_IMX477) += imx477.o
-+obj-$(CONFIG_VIDEO_IMX519) += imx519.o
- obj-$(CONFIG_VIDEO_IR_I2C) += ir-kbd-i2c.o
- obj-$(CONFIG_VIDEO_ISL7998X) += isl7998x.o
- obj-$(CONFIG_VIDEO_KS0127) += ks0127.o
---- /dev/null
-+++ b/drivers/media/i2c/imx519.c
-@@ -0,0 +1,2090 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * A V4L2 driver for Sony IMX519 cameras.
-+ * Copyright (C) 2021 Arducam Technology co., Ltd.
-+ *
-+ * Based on Sony IMX477 camera driver
-+ * Copyright (C) 2020 Raspberry Pi (Trading) Ltd
-+ */
-+#include <asm/unaligned.h>
-+#include <linux/clk.h>
-+#include <linux/delay.h>
-+#include <linux/gpio/consumer.h>
-+#include <linux/i2c.h>
-+#include <linux/module.h>
-+#include <linux/of_device.h>
-+#include <linux/pm_runtime.h>
-+#include <linux/regulator/consumer.h>
-+#include <media/v4l2-ctrls.h>
-+#include <media/v4l2-device.h>
-+#include <media/v4l2-event.h>
-+#include <media/v4l2-fwnode.h>
-+#include <media/v4l2-mediabus.h>
-+
-+#define IMX519_REG_VALUE_08BIT		1
-+#define IMX519_REG_VALUE_16BIT		2
-+
-+/* Chip ID */
-+#define IMX519_REG_CHIP_ID		0x0016
-+#define IMX519_CHIP_ID			0x0519
-+
-+#define IMX519_REG_MODE_SELECT		0x0100
-+#define IMX519_MODE_STANDBY		0x00
-+#define IMX519_MODE_STREAMING		0x01
-+
-+#define IMX519_REG_ORIENTATION		0x101
-+
-+#define IMX519_XCLK_FREQ		24000000
-+
-+#define IMX519_DEFAULT_LINK_FREQ	493500000
-+
-+/* Pixel rate is fixed at 686MHz for all the modes */
-+#define IMX519_PIXEL_RATE		686000000
-+
-+/* V_TIMING internal */
-+#define IMX519_REG_FRAME_LENGTH		0x0340
-+#define IMX519_FRAME_LENGTH_MAX		0xffdc
-+
-+/* Long exposure multiplier */
-+#define IMX519_LONG_EXP_SHIFT_MAX	7
-+#define IMX519_LONG_EXP_SHIFT_REG	0x3100
-+
-+/* Exposure control */
-+#define IMX519_REG_EXPOSURE		0x0202
-+#define IMX519_EXPOSURE_OFFSET		32
-+#define IMX519_EXPOSURE_MIN		1
-+#define IMX519_EXPOSURE_STEP		1
-+#define IMX519_EXPOSURE_DEFAULT		0x3e8
-+#define IMX519_EXPOSURE_MAX		(IMX519_FRAME_LENGTH_MAX - \
-+					 IMX519_EXPOSURE_OFFSET)
-+
-+/* Analog gain control */
-+#define IMX519_REG_ANALOG_GAIN		0x0204
-+#define IMX519_ANA_GAIN_MIN		0
-+#define IMX519_ANA_GAIN_MAX		960
-+#define IMX519_ANA_GAIN_STEP		1
-+#define IMX519_ANA_GAIN_DEFAULT		0x0
-+
-+/* Digital gain control */
-+#define IMX519_REG_DIGITAL_GAIN		0x020e
-+#define IMX519_DGTL_GAIN_MIN		0x0100
-+#define IMX519_DGTL_GAIN_MAX		0xffff
-+#define IMX519_DGTL_GAIN_DEFAULT	0x0100
-+#define IMX519_DGTL_GAIN_STEP		1
-+
-+/* Test Pattern Control */
-+#define IMX519_REG_TEST_PATTERN		0x0600
-+#define IMX519_TEST_PATTERN_DISABLE	0
-+#define IMX519_TEST_PATTERN_SOLID_COLOR	1
-+#define IMX519_TEST_PATTERN_COLOR_BARS	2
-+#define IMX519_TEST_PATTERN_GREY_COLOR	3
-+#define IMX519_TEST_PATTERN_PN9		4
-+
-+/* Test pattern colour components */
-+#define IMX519_REG_TEST_PATTERN_R	0x0602
-+#define IMX519_REG_TEST_PATTERN_GR	0x0604
-+#define IMX519_REG_TEST_PATTERN_B	0x0606
-+#define IMX519_REG_TEST_PATTERN_GB	0x0608
-+#define IMX519_TEST_PATTERN_COLOUR_MIN	0
-+#define IMX519_TEST_PATTERN_COLOUR_MAX	0x0fff
-+#define IMX519_TEST_PATTERN_COLOUR_STEP	1
-+#define IMX519_TEST_PATTERN_R_DEFAULT	IMX519_TEST_PATTERN_COLOUR_MAX
-+#define IMX519_TEST_PATTERN_GR_DEFAULT	0
-+#define IMX519_TEST_PATTERN_B_DEFAULT	0
-+#define IMX519_TEST_PATTERN_GB_DEFAULT	0
-+
-+/* Embedded metadata stream structure */
-+#define IMX519_EMBEDDED_LINE_WIDTH 16384
-+#define IMX519_NUM_EMBEDDED_LINES 1
-+
-+enum pad_types {
-+	IMAGE_PAD,
-+	METADATA_PAD,
-+	NUM_PADS
-+};
-+
-+/* IMX519 native and active pixel array size. */
-+#define IMX519_NATIVE_WIDTH		4672U
-+#define IMX519_NATIVE_HEIGHT		3648U
-+#define IMX519_PIXEL_ARRAY_LEFT		8U
-+#define IMX519_PIXEL_ARRAY_TOP		48U
-+#define IMX519_PIXEL_ARRAY_WIDTH	4656U
-+#define IMX519_PIXEL_ARRAY_HEIGHT	3496U
-+
-+struct imx519_reg {
-+	u16 address;
-+	u8 val;
-+};
-+
-+struct imx519_reg_list {
-+	unsigned int num_of_regs;
-+	const struct imx519_reg *regs;
-+};
-+
-+/* Mode : resolution and related config&values */
-+struct imx519_mode {
-+	/* Frame width */
-+	unsigned int width;
-+
-+	/* Frame height */
-+	unsigned int height;
-+
-+	/* H-timing in pixels */
-+	unsigned int line_length_pix;
-+
-+	/* Analog crop rectangle. */
-+	struct v4l2_rect crop;
-+
-+	/* Highest possible framerate. */
-+	struct v4l2_fract timeperframe_min;
-+
-+	/* Default framerate. */
-+	struct v4l2_fract timeperframe_default;
-+
-+	/* Default register values */
-+	struct imx519_reg_list reg_list;
-+};
-+
-+static const struct imx519_reg mode_common_regs[] = {
-+	{0x0136, 0x18},
-+	{0x0137, 0x00},
-+	{0x3c7e, 0x01},
-+	{0x3c7f, 0x07},
-+	{0x3020, 0x00},
-+	{0x3e35, 0x01},
-+	{0x3f7f, 0x01},
-+	{0x5609, 0x57},
-+	{0x5613, 0x51},
-+	{0x561f, 0x5e},
-+	{0x5623, 0xd2},
-+	{0x5637, 0x11},
-+	{0x5657, 0x11},
-+	{0x5659, 0x12},
-+	{0x5733, 0x60},
-+	{0x5905, 0x57},
-+	{0x590f, 0x51},
-+	{0x591b, 0x5e},
-+	{0x591f, 0xd2},
-+	{0x5933, 0x11},
-+	{0x5953, 0x11},
-+	{0x5955, 0x12},
-+	{0x5a2f, 0x60},
-+	{0x5a85, 0x57},
-+	{0x5a8f, 0x51},
-+	{0x5a9b, 0x5e},
-+	{0x5a9f, 0xd2},
-+	{0x5ab3, 0x11},
-+	{0x5ad3, 0x11},
-+	{0x5ad5, 0x12},
-+	{0x5baf, 0x60},
-+	{0x5c15, 0x2a},
-+	{0x5c17, 0x80},
-+	{0x5c19, 0x31},
-+	{0x5c1b, 0x87},
-+	{0x5c25, 0x25},
-+	{0x5c27, 0x7b},
-+	{0x5c29, 0x2a},
-+	{0x5c2b, 0x80},
-+	{0x5c2d, 0x31},
-+	{0x5c2f, 0x87},
-+	{0x5c35, 0x2b},
-+	{0x5c37, 0x81},
-+	{0x5c39, 0x31},
-+	{0x5c3b, 0x87},
-+	{0x5c45, 0x25},
-+	{0x5c47, 0x7b},
-+	{0x5c49, 0x2a},
-+	{0x5c4b, 0x80},
-+	{0x5c4d, 0x31},
-+	{0x5c4f, 0x87},
-+	{0x5c55, 0x2d},
-+	{0x5c57, 0x83},
-+	{0x5c59, 0x32},
-+	{0x5c5b, 0x88},
-+	{0x5c65, 0x29},
-+	{0x5c67, 0x7f},
-+	{0x5c69, 0x2e},
-+	{0x5c6b, 0x84},
-+	{0x5c6d, 0x32},
-+	{0x5c6f, 0x88},
-+	{0x5e69, 0x04},
-+	{0x5e9d, 0x00},
-+	{0x5f18, 0x10},
-+	{0x5f1a, 0x0e},
-+	{0x5f20, 0x12},
-+	{0x5f22, 0x10},
-+	{0x5f24, 0x0e},
-+	{0x5f28, 0x10},
-+	{0x5f2a, 0x0e},
-+	{0x5f30, 0x12},
-+	{0x5f32, 0x10},
-+	{0x5f34, 0x0e},
-+	{0x5f38, 0x0f},
-+	{0x5f39, 0x0d},
-+	{0x5f3c, 0x11},
-+	{0x5f3d, 0x0f},
-+	{0x5f3e, 0x0d},
-+	{0x5f61, 0x07},
-+	{0x5f64, 0x05},
-+	{0x5f67, 0x03},
-+	{0x5f6a, 0x03},
-+	{0x5f6d, 0x07},
-+	{0x5f70, 0x07},
-+	{0x5f73, 0x05},
-+	{0x5f76, 0x02},
-+	{0x5f79, 0x07},
-+	{0x5f7c, 0x07},
-+	{0x5f7f, 0x07},
-+	{0x5f82, 0x07},
-+	{0x5f85, 0x03},
-+	{0x5f88, 0x02},
-+	{0x5f8b, 0x01},
-+	{0x5f8e, 0x01},
-+	{0x5f91, 0x04},
-+	{0x5f94, 0x05},
-+	{0x5f97, 0x02},
-+	{0x5f9d, 0x07},
-+	{0x5fa0, 0x07},
-+	{0x5fa3, 0x07},
-+	{0x5fa6, 0x07},
-+	{0x5fa9, 0x03},
-+	{0x5fac, 0x01},
-+	{0x5faf, 0x01},
-+	{0x5fb5, 0x03},
-+	{0x5fb8, 0x02},
-+	{0x5fbb, 0x01},
-+	{0x5fc1, 0x07},
-+	{0x5fc4, 0x07},
-+	{0x5fc7, 0x07},
-+	{0x5fd1, 0x00},
-+	{0x6302, 0x79},
-+	{0x6305, 0x78},
-+	{0x6306, 0xa5},
-+	{0x6308, 0x03},
-+	{0x6309, 0x20},
-+	{0x630b, 0x0a},
-+	{0x630d, 0x48},
-+	{0x630f, 0x06},
-+	{0x6311, 0xa4},
-+	{0x6313, 0x03},
-+	{0x6314, 0x20},
-+	{0x6316, 0x0a},
-+	{0x6317, 0x31},
-+	{0x6318, 0x4a},
-+	{0x631a, 0x06},
-+	{0x631b, 0x40},
-+	{0x631c, 0xa4},
-+	{0x631e, 0x03},
-+	{0x631f, 0x20},
-+	{0x6321, 0x0a},
-+	{0x6323, 0x4a},
-+	{0x6328, 0x80},
-+	{0x6329, 0x01},
-+	{0x632a, 0x30},
-+	{0x632b, 0x02},
-+	{0x632c, 0x20},
-+	{0x632d, 0x02},
-+	{0x632e, 0x30},
-+	{0x6330, 0x60},
-+	{0x6332, 0x90},
-+	{0x6333, 0x01},
-+	{0x6334, 0x30},
-+	{0x6335, 0x02},
-+	{0x6336, 0x20},
-+	{0x6338, 0x80},
-+	{0x633a, 0xa0},
-+	{0x633b, 0x01},
-+	{0x633c, 0x60},
-+	{0x633d, 0x02},
-+	{0x633e, 0x60},
-+	{0x633f, 0x01},
-+	{0x6340, 0x30},
-+	{0x6341, 0x02},
-+	{0x6342, 0x20},
-+	{0x6343, 0x03},
-+	{0x6344, 0x80},
-+	{0x6345, 0x03},
-+	{0x6346, 0x90},
-+	{0x6348, 0xf0},
-+	{0x6349, 0x01},
-+	{0x634a, 0x20},
-+	{0x634b, 0x02},
-+	{0x634c, 0x10},
-+	{0x634d, 0x03},
-+	{0x634e, 0x60},
-+	{0x6350, 0xa0},
-+	{0x6351, 0x01},
-+	{0x6352, 0x60},
-+	{0x6353, 0x02},
-+	{0x6354, 0x50},
-+	{0x6355, 0x02},
-+	{0x6356, 0x60},
-+	{0x6357, 0x01},
-+	{0x6358, 0x30},
-+	{0x6359, 0x02},
-+	{0x635a, 0x30},
-+	{0x635b, 0x03},
-+	{0x635c, 0x90},
-+	{0x635f, 0x01},
-+	{0x6360, 0x10},
-+	{0x6361, 0x01},
-+	{0x6362, 0x40},
-+	{0x6363, 0x02},
-+	{0x6364, 0x50},
-+	{0x6368, 0x70},
-+	{0x636a, 0xa0},
-+	{0x636b, 0x01},
-+	{0x636c, 0x50},
-+	{0x637d, 0xe4},
-+	{0x637e, 0xb4},
-+	{0x638c, 0x8e},
-+	{0x638d, 0x38},
-+	{0x638e, 0xe3},
-+	{0x638f, 0x4c},
-+	{0x6390, 0x30},
-+	{0x6391, 0xc3},
-+	{0x6392, 0xae},
-+	{0x6393, 0xba},
-+	{0x6394, 0xeb},
-+	{0x6395, 0x6e},
-+	{0x6396, 0x34},
-+	{0x6397, 0xe3},
-+	{0x6398, 0xcf},
-+	{0x6399, 0x3c},
-+	{0x639a, 0xf3},
-+	{0x639b, 0x0c},
-+	{0x639c, 0x30},
-+	{0x639d, 0xc1},
-+	{0x63b9, 0xa3},
-+	{0x63ba, 0xfe},
-+	{0x7600, 0x01},
-+	{0x79a0, 0x01},
-+	{0x79a1, 0x01},
-+	{0x79a2, 0x01},
-+	{0x79a3, 0x01},
-+	{0x79a4, 0x01},
-+	{0x79a5, 0x20},
-+	{0x79a9, 0x00},
-+	{0x79aa, 0x01},
-+	{0x79ad, 0x00},
-+	{0x79af, 0x00},
-+	{0x8173, 0x01},
-+	{0x835c, 0x01},
-+	{0x8a74, 0x01},
-+	{0x8c1f, 0x00},
-+	{0x8c27, 0x00},
-+	{0x8c3b, 0x03},
-+	{0x9004, 0x0b},
-+	{0x920c, 0x6a},
-+	{0x920d, 0x22},
-+	{0x920e, 0x6a},
-+	{0x920f, 0x23},
-+	{0x9214, 0x6a},
-+	{0x9215, 0x20},
-+	{0x9216, 0x6a},
-+	{0x9217, 0x21},
-+	{0x9385, 0x3e},
-+	{0x9387, 0x1b},
-+	{0x938d, 0x4d},
-+	{0x938f, 0x43},
-+	{0x9391, 0x1b},
-+	{0x9395, 0x4d},
-+	{0x9397, 0x43},
-+	{0x9399, 0x1b},
-+	{0x939d, 0x3e},
-+	{0x939f, 0x2f},
-+	{0x93a5, 0x43},
-+	{0x93a7, 0x2f},
-+	{0x93a9, 0x2f},
-+	{0x93ad, 0x34},
-+	{0x93af, 0x2f},
-+	{0x93b5, 0x3e},
-+	{0x93b7, 0x2f},
-+	{0x93bd, 0x4d},
-+	{0x93bf, 0x43},
-+	{0x93c1, 0x2f},
-+	{0x93c5, 0x4d},
-+	{0x93c7, 0x43},
-+	{0x93c9, 0x2f},
-+	{0x974b, 0x02},
-+	{0x995c, 0x8c},
-+	{0x995d, 0x00},
-+	{0x995e, 0x00},
-+	{0x9963, 0x64},
-+	{0x9964, 0x50},
-+	{0xaa0a, 0x26},
-+	{0xae03, 0x04},
-+	{0xae04, 0x03},
-+	{0xae05, 0x03},
-+	{0xbc1c, 0x08},
-+	{0xbcf1, 0x02},
-+};
-+
-+/* 16 mpix 10fps */
-+static const struct imx519_reg mode_4656x3496_regs[] = {
-+	{0x0111, 0x02},
-+	{0x0112, 0x0a},
-+	{0x0113, 0x0a},
-+	{0x0114, 0x01},
-+	{0x0342, 0x42},
-+	{0x0343, 0x00},
-+	{0x0340, 0x0d},
-+	{0x0341, 0xf4},
-+	{0x0344, 0x00},
-+	{0x0345, 0x00},
-+	{0x0346, 0x00},
-+	{0x0347, 0x00},
-+	{0x0348, 0x12},
-+	{0x0349, 0x2f},
-+	{0x034a, 0x0d},
-+	{0x034b, 0xa7},
-+	{0x0220, 0x00},
-+	{0x0221, 0x11},
-+	{0x0222, 0x01},
-+	{0x0900, 0x00},
-+	{0x0901, 0x11},
-+	{0x0902, 0x0a},
-+	{0x3f4c, 0x01},
-+	{0x3f4d, 0x01},
-+	{0x4254, 0x7f},
-+	{0x0401, 0x00},
-+	{0x0404, 0x00},
-+	{0x0405, 0x10},
-+	{0x0408, 0x00},
-+	{0x0409, 0x00},
-+	{0x040a, 0x00},
-+	{0x040b, 0x00},
-+	{0x040c, 0x12},
-+	{0x040d, 0x30},
-+	{0x040e, 0x0d},
-+	{0x040f, 0xa8},
-+	{0x034c, 0x12},
-+	{0x034d, 0x30},
-+	{0x034e, 0x0d},
-+	{0x034f, 0xa8},
-+	{0x0301, 0x06},
-+	{0x0303, 0x04},
-+	{0x0305, 0x04},
-+	{0x0306, 0x01},
-+	{0x0307, 0x57},
-+	{0x0309, 0x0a},
-+	{0x030b, 0x02},
-+	{0x030d, 0x04},
-+	{0x030e, 0x01},
-+	{0x030f, 0x49},
-+	{0x0310, 0x01},
-+	{0x0820, 0x07},
-+	{0x0821, 0xb6},
-+	{0x0822, 0x00},
-+	{0x0823, 0x00},
-+	{0x3e20, 0x01},
-+	{0x3e37, 0x00},
-+	{0x3e3b, 0x00},
-+	{0x0106, 0x00},
-+	{0x0b00, 0x00},
-+	{0x3230, 0x00},
-+	{0x3f14, 0x01},
-+	{0x3f3c, 0x01},
-+	{0x3f0d, 0x0a},
-+	{0x3fbc, 0x00},
-+	{0x3c06, 0x00},
-+	{0x3c07, 0x48},
-+	{0x3c0a, 0x00},
-+	{0x3c0b, 0x00},
-+	{0x3f78, 0x00},
-+	{0x3f79, 0x40},
-+	{0x3f7c, 0x00},
-+	{0x3f7d, 0x00},
-+};
-+
-+/* 4k 21fps mode */
-+static const struct imx519_reg mode_3840x2160_regs[] = {
-+	{0x0111, 0x02},
-+	{0x0112, 0x0a},
-+	{0x0113, 0x0a},
-+	{0x0114, 0x01},
-+	{0x0342, 0x38},
-+	{0x0343, 0x70},
-+	{0x0340, 0x08},
-+	{0x0341, 0xd4},
-+	{0x0344, 0x01},
-+	{0x0345, 0x98},
-+	{0x0346, 0x02},
-+	{0x0347, 0xa0},
-+	{0x0348, 0x10},
-+	{0x0349, 0x97},
-+	{0x034a, 0x0b},
-+	{0x034b, 0x17},
-+	{0x0220, 0x00},
-+	{0x0221, 0x11},
-+	{0x0222, 0x01},
-+	{0x0900, 0x00},
-+	{0x0901, 0x11},
-+	{0x0902, 0x0a},
-+	{0x3f4c, 0x01},
-+	{0x3f4d, 0x01},
-+	{0x4254, 0x7f},
-+	{0x0401, 0x00},
-+	{0x0404, 0x00},
-+	{0x0405, 0x10},
-+	{0x0408, 0x00},
-+	{0x0409, 0x00},
-+	{0x040a, 0x00},
-+	{0x040b, 0x00},
-+	{0x040c, 0x0f},
-+	{0x040d, 0x00},
-+	{0x040e, 0x08},
-+	{0x040f, 0x70},
-+	{0x034c, 0x0f},
-+	{0x034d, 0x00},
-+	{0x034e, 0x08},
-+	{0x034f, 0x70},
-+	{0x0301, 0x06},
-+	{0x0303, 0x04},
-+	{0x0305, 0x04},
-+	{0x0306, 0x01},
-+	{0x0307, 0x57},
-+	{0x0309, 0x0a},
-+	{0x030b, 0x02},
-+	{0x030d, 0x04},
-+	{0x030e, 0x01},
-+	{0x030f, 0x49},
-+	{0x0310, 0x01},
-+	{0x0820, 0x07},
-+	{0x0821, 0xb6},
-+	{0x0822, 0x00},
-+	{0x0823, 0x00},
-+	{0x3e20, 0x01},
-+	{0x3e37, 0x00},
-+	{0x3e3b, 0x00},
-+	{0x0106, 0x00},
-+	{0x0b00, 0x00},
-+	{0x3230, 0x00},
-+	{0x3f14, 0x01},
-+	{0x3f3c, 0x01},
-+	{0x3f0d, 0x0a},
-+	{0x3fbc, 0x00},
-+	{0x3c06, 0x00},
-+	{0x3c07, 0x48},
-+	{0x3c0a, 0x00},
-+	{0x3c0b, 0x00},
-+	{0x3f78, 0x00},
-+	{0x3f79, 0x40},
-+	{0x3f7c, 0x00},
-+	{0x3f7d, 0x00},
-+};
-+
-+/* 2x2 binned 30fps mode */
-+static const struct imx519_reg mode_2328x1748_regs[] = {
-+	{0x0111, 0x02},
-+	{0x0112, 0x0a},
-+	{0x0113, 0x0a},
-+	{0x0114, 0x01},
-+	{0x0342, 0x24},
-+	{0x0343, 0x12},
-+	{0x0340, 0x09},
-+	{0x0341, 0xac},
-+	{0x0344, 0x00},
-+	{0x0345, 0x00},
-+	{0x0346, 0x00},
-+	{0x0347, 0x00},
-+	{0x0348, 0x12},
-+	{0x0349, 0x2f},
-+	{0x034a, 0x0d},
-+	{0x034b, 0xa7},
-+	{0x0220, 0x00},
-+	{0x0221, 0x11},
-+	{0x0222, 0x01},
-+	{0x0900, 0x01},
-+	{0x0901, 0x22},
-+	{0x0902, 0x0a},
-+	{0x3f4c, 0x01},
-+	{0x3f4d, 0x01},
-+	{0x4254, 0x7f},
-+	{0x0401, 0x00},
-+	{0x0404, 0x00},
-+	{0x0405, 0x10},
-+	{0x0408, 0x00},
-+	{0x0409, 0x00},
-+	{0x040a, 0x00},
-+	{0x040b, 0x00},
-+	{0x040c, 0x09},
-+	{0x040d, 0x18},
-+	{0x040e, 0x06},
-+	{0x040f, 0xd4},
-+	{0x034c, 0x09},
-+	{0x034d, 0x18},
-+	{0x034e, 0x06},
-+	{0x034f, 0xd4},
-+	{0x0301, 0x06},
-+	{0x0303, 0x04},
-+	{0x0305, 0x04},
-+	{0x0306, 0x01},
-+	{0x0307, 0x57},
-+	{0x0309, 0x0a},
-+	{0x030b, 0x02},
-+	{0x030d, 0x04},
-+	{0x030e, 0x01},
-+	{0x030f, 0x49},
-+	{0x0310, 0x01},
-+	{0x0820, 0x07},
-+	{0x0821, 0xb6},
-+	{0x0822, 0x00},
-+	{0x0823, 0x00},
-+	{0x3e20, 0x01},
-+	{0x3e37, 0x00},
-+	{0x3e3b, 0x00},
-+	{0x0106, 0x00},
-+	{0x0b00, 0x00},
-+	{0x3230, 0x00},
-+	{0x3f14, 0x01},
-+	{0x3f3c, 0x01},
-+	{0x3f0d, 0x0a},
-+	{0x3fbc, 0x00},
-+	{0x3c06, 0x00},
-+	{0x3c07, 0x48},
-+	{0x3c0a, 0x00},
-+	{0x3c0b, 0x00},
-+	{0x3f78, 0x00},
-+	{0x3f79, 0x40},
-+	{0x3f7c, 0x00},
-+	{0x3f7d, 0x00},
-+};
-+
-+/* 1080p 60fps mode */
-+static const struct imx519_reg mode_1920x1080_regs[] = {
-+	{0x0111, 0x02},
-+	{0x0112, 0x0a},
-+	{0x0113, 0x0a},
-+	{0x0114, 0x01},
-+	{0x0342, 0x25},
-+	{0x0343, 0xd9},
-+	{0x0340, 0x04},
-+	{0x0341, 0x9c},
-+	{0x0344, 0x01},
-+	{0x0345, 0x98},
-+	{0x0346, 0x02},
-+	{0x0347, 0xa2},
-+	{0x0348, 0x10},
-+	{0x0349, 0x97},
-+	{0x034a, 0x0b},
-+	{0x034b, 0x15},
-+	{0x0220, 0x00},
-+	{0x0221, 0x11},
-+	{0x0222, 0x01},
-+	{0x0900, 0x01},
-+	{0x0901, 0x22},
-+	{0x0902, 0x0a},
-+	{0x3f4c, 0x01},
-+	{0x3f4d, 0x01},
-+	{0x4254, 0x7f},
-+	{0x0401, 0x00},
-+	{0x0404, 0x00},
-+	{0x0405, 0x10},
-+	{0x0408, 0x00},
-+	{0x0409, 0x00},
-+	{0x040a, 0x00},
-+	{0x040b, 0x00},
-+	{0x040c, 0x07},
-+	{0x040d, 0x80},
-+	{0x040e, 0x04},
-+	{0x040f, 0x38},
-+	{0x034c, 0x07},
-+	{0x034d, 0x80},
-+	{0x034e, 0x04},
-+	{0x034f, 0x38},
-+	{0x0301, 0x06},
-+	{0x0303, 0x04},
-+	{0x0305, 0x04},
-+	{0x0306, 0x01},
-+	{0x0307, 0x57},
-+	{0x0309, 0x0a},
-+	{0x030b, 0x02},
-+	{0x030d, 0x04},
-+	{0x030e, 0x01},
-+	{0x030f, 0x49},
-+	{0x0310, 0x01},
-+	{0x0820, 0x07},
-+	{0x0821, 0xb6},
-+	{0x0822, 0x00},
-+	{0x0823, 0x00},
-+	{0x3e20, 0x01},
-+	{0x3e37, 0x00},
-+	{0x3e3b, 0x00},
-+	{0x0106, 0x00},
-+	{0x0b00, 0x00},
-+	{0x3230, 0x00},
-+	{0x3f14, 0x01},
-+	{0x3f3c, 0x01},
-+	{0x3f0d, 0x0a},
-+	{0x3fbc, 0x00},
-+	{0x3c06, 0x00},
-+	{0x3c07, 0x48},
-+	{0x3c0a, 0x00},
-+	{0x3c0b, 0x00},
-+	{0x3f78, 0x00},
-+	{0x3f79, 0x40},
-+	{0x3f7c, 0x00},
-+	{0x3f7d, 0x00},
-+};
-+
-+/* 720p 120fps mode */
-+static const struct imx519_reg mode_1280x720_regs[] = {
-+	{0x0111, 0x02},
-+	{0x0112, 0x0a},
-+	{0x0113, 0x0a},
-+	{0x0114, 0x01},
-+	{0x0342, 0x1b},
-+	{0x0343, 0x3b},
-+	{0x0340, 0x03},
-+	{0x0341, 0x34},
-+	{0x0344, 0x04},
-+	{0x0345, 0x18},
-+	{0x0346, 0x04},
-+	{0x0347, 0x12},
-+	{0x0348, 0x0e},
-+	{0x0349, 0x17},
-+	{0x034a, 0x09},
-+	{0x034b, 0xb6},
-+	{0x0220, 0x00},
-+	{0x0221, 0x11},
-+	{0x0222, 0x01},
-+	{0x0900, 0x01},
-+	{0x0901, 0x22},
-+	{0x0902, 0x0a},
-+	{0x3f4c, 0x01},
-+	{0x3f4d, 0x01},
-+	{0x4254, 0x7f},
-+	{0x0401, 0x00},
-+	{0x0404, 0x00},
-+	{0x0405, 0x10},
-+	{0x0408, 0x00},
-+	{0x0409, 0x00},
-+	{0x040a, 0x00},
-+	{0x040b, 0x00},
-+	{0x040c, 0x05},
-+	{0x040d, 0x00},
-+	{0x040e, 0x02},
-+	{0x040f, 0xd0},
-+	{0x034c, 0x05},
-+	{0x034d, 0x00},
-+	{0x034e, 0x02},
-+	{0x034f, 0xd0},
-+	{0x0301, 0x06},
-+	{0x0303, 0x04},
-+	{0x0305, 0x04},
-+	{0x0306, 0x01},
-+	{0x0307, 0x57},
-+	{0x0309, 0x0a},
-+	{0x030b, 0x02},
-+	{0x030d, 0x04},
-+	{0x030e, 0x01},
-+	{0x030f, 0x49},
-+	{0x0310, 0x01},
-+	{0x0820, 0x07},
-+	{0x0821, 0xb6},
-+	{0x0822, 0x00},
-+	{0x0823, 0x00},
-+	{0x3e20, 0x01},
-+	{0x3e37, 0x00},
-+	{0x3e3b, 0x00},
-+	{0x0106, 0x00},
-+	{0x0b00, 0x00},
-+	{0x3230, 0x00},
-+	{0x3f14, 0x01},
-+	{0x3f3c, 0x01},
-+	{0x3f0d, 0x0a},
-+	{0x3fbc, 0x00},
-+	{0x3c06, 0x00},
-+	{0x3c07, 0x48},
-+	{0x3c0a, 0x00},
-+	{0x3c0b, 0x00},
-+	{0x3f78, 0x00},
-+	{0x3f79, 0x40},
-+	{0x3f7c, 0x00},
-+	{0x3f7d, 0x00},
-+};
-+
-+/* Mode configs */
-+static const struct imx519_mode supported_modes_10bit[] = {
-+	{
-+		.width = 4656,
-+		.height = 3496,
-+		.line_length_pix = 0x4200,
-+		.crop = {
-+			.left = IMX519_PIXEL_ARRAY_LEFT,
-+			.top = IMX519_PIXEL_ARRAY_TOP,
-+			.width = 4656,
-+			.height = 3496,
-+		},
-+		.timeperframe_min = {
-+			.numerator = 100,
-+			.denominator = 1000
-+		},
-+		.timeperframe_default = {
-+			.numerator = 100,
-+			.denominator = 1000
-+		},
-+		.reg_list = {
-+			.num_of_regs = ARRAY_SIZE(mode_4656x3496_regs),
-+			.regs = mode_4656x3496_regs,
-+		}
-+	},
-+	{
-+		.width = 3840,
-+		.height = 2160,
-+		.line_length_pix = 0x3870,
-+		.crop = {
-+			.left = IMX519_PIXEL_ARRAY_LEFT + 408,
-+			.top = IMX519_PIXEL_ARRAY_TOP + 672,
-+			.width = 3840,
-+			.height = 2160,
-+		},
-+		.timeperframe_min = {
-+			.numerator = 100,
-+			.denominator = 2100
-+		},
-+		.timeperframe_default = {
-+			.numerator = 100,
-+			.denominator = 2100
-+		},
-+		.reg_list = {
-+			.num_of_regs = ARRAY_SIZE(mode_3840x2160_regs),
-+			.regs = mode_3840x2160_regs,
-+		}
-+	},
-+	{
-+		.width = 2328,
-+		.height = 1748,
-+		.line_length_pix = 0x2412,
-+		.crop = {
-+			.left = IMX519_PIXEL_ARRAY_LEFT,
-+			.top = IMX519_PIXEL_ARRAY_TOP,
-+			.width = 4656,
-+			.height = 3496,
-+		},
-+		.timeperframe_min = {
-+			.numerator = 100,
-+			.denominator = 3000
-+		},
-+		.timeperframe_default = {
-+			.numerator = 100,
-+			.denominator = 3000
-+		},
-+		.reg_list = {
-+			.num_of_regs = ARRAY_SIZE(mode_2328x1748_regs),
-+			.regs = mode_2328x1748_regs,
-+		}
-+	},
-+	{
-+		.width = 1920,
-+		.height = 1080,
-+		.line_length_pix = 0x25D9,
-+		.crop = {
-+			.left = IMX519_PIXEL_ARRAY_LEFT + 408,
-+			.top = IMX519_PIXEL_ARRAY_TOP + 674,
-+			.width = 3840,
-+			.height = 2160,
-+		},
-+		.timeperframe_min = {
-+			.numerator = 100,
-+			.denominator = 6000
-+		},
-+		.timeperframe_default = {
-+			.numerator = 100,
-+			.denominator = 6000
-+		},
-+		.reg_list = {
-+			.num_of_regs = ARRAY_SIZE(mode_1920x1080_regs),
-+			.regs = mode_1920x1080_regs,
-+		}
-+	},
-+	{
-+		.width = 1280,
-+		.height = 720,
-+		.line_length_pix = 0x1B3B,
-+		.crop = {
-+			.left = IMX519_PIXEL_ARRAY_LEFT + 1048,
-+			.top = IMX519_PIXEL_ARRAY_TOP + 1042,
-+			.width = 2560,
-+			.height = 1440,
-+		},
-+		.timeperframe_min = {
-+			.numerator = 100,
-+			.denominator = 12000
-+		},
-+		.timeperframe_default = {
-+			.numerator = 100,
-+			.denominator = 12000
-+		},
-+		.reg_list = {
-+			.num_of_regs = ARRAY_SIZE(mode_1280x720_regs),
-+			.regs = mode_1280x720_regs,
-+		}
-+	}
-+};
-+
-+/*
-+ * The supported formats.
-+ * This table MUST contain 4 entries per format, to cover the various flip
-+ * combinations in the order
-+ * - no flip
-+ * - h flip
-+ * - v flip
-+ * - h&v flips
-+ */
-+static const u32 codes[] = {
-+	/* 10-bit modes. */
-+	MEDIA_BUS_FMT_SRGGB10_1X10,
-+	MEDIA_BUS_FMT_SGRBG10_1X10,
-+	MEDIA_BUS_FMT_SGBRG10_1X10,
-+	MEDIA_BUS_FMT_SBGGR10_1X10,
-+};
-+
-+static const char * const imx519_test_pattern_menu[] = {
-+	"Disabled",
-+	"Color Bars",
-+	"Solid Color",
-+	"Grey Color Bars",
-+	"PN9"
-+};
-+
-+static const int imx519_test_pattern_val[] = {
-+	IMX519_TEST_PATTERN_DISABLE,
-+	IMX519_TEST_PATTERN_COLOR_BARS,
-+	IMX519_TEST_PATTERN_SOLID_COLOR,
-+	IMX519_TEST_PATTERN_GREY_COLOR,
-+	IMX519_TEST_PATTERN_PN9,
-+};
-+
-+/* regulator supplies */
-+static const char * const imx519_supply_name[] = {
-+	/* Supplies can be enabled in any order */
-+	"VANA",  /* Analog (2.8V) supply */
-+	"VDIG",  /* Digital Core (1.05V) supply */
-+	"VDDL",  /* IF (1.8V) supply */
-+};
-+
-+#define IMX519_NUM_SUPPLIES ARRAY_SIZE(imx519_supply_name)
-+
-+/*
-+ * Initialisation delay between XCLR low->high and the moment when the sensor
-+ * can start capture (i.e. can leave software standby), given by T7 in the
-+ * datasheet is 8ms.  This does include I2C setup time as well.
-+ *
-+ * Note, that delay between XCLR low->high and reading the CCI ID register (T6
-+ * in the datasheet) is much smaller - 600us.
-+ */
-+#define IMX519_XCLR_MIN_DELAY_US	8000
-+#define IMX519_XCLR_DELAY_RANGE_US	1000
-+
-+struct imx519 {
-+	struct v4l2_subdev sd;
-+	struct media_pad pad[NUM_PADS];
-+
-+	unsigned int fmt_code;
-+
-+	struct clk *xclk;
-+
-+	struct gpio_desc *reset_gpio;
-+	struct regulator_bulk_data supplies[IMX519_NUM_SUPPLIES];
-+
-+	struct v4l2_ctrl_handler ctrl_handler;
-+	/* V4L2 Controls */
-+	struct v4l2_ctrl *pixel_rate;
-+	struct v4l2_ctrl *exposure;
-+	struct v4l2_ctrl *vflip;
-+	struct v4l2_ctrl *hflip;
-+	struct v4l2_ctrl *vblank;
-+	struct v4l2_ctrl *hblank;
-+
-+	/* Current mode */
-+	const struct imx519_mode *mode;
-+
-+	/*
-+	 * Mutex for serialized access:
-+	 * Protect sensor module set pad format and start/stop streaming safely.
-+	 */
-+	struct mutex mutex;
-+
-+	/* Streaming on/off */
-+	bool streaming;
-+
-+	/* Rewrite common registers on stream on? */
-+	bool common_regs_written;
-+
-+	/* Current long exposure factor in use. Set through V4L2_CID_VBLANK */
-+	unsigned int long_exp_shift;
-+};
-+
-+static inline struct imx519 *to_imx519(struct v4l2_subdev *_sd)
-+{
-+	return container_of(_sd, struct imx519, sd);
-+}
-+
-+/* Read registers up to 2 at a time */
-+static int imx519_read_reg(struct imx519 *imx519, u16 reg, u32 len, u32 *val)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&imx519->sd);
-+	struct i2c_msg msgs[2];
-+	u8 addr_buf[2] = { reg >> 8, reg & 0xff };
-+	u8 data_buf[4] = { 0, };
-+	int ret;
-+
-+	if (len > 4)
-+		return -EINVAL;
-+
-+	/* Write register address */
-+	msgs[0].addr = client->addr;
-+	msgs[0].flags = 0;
-+	msgs[0].len = ARRAY_SIZE(addr_buf);
-+	msgs[0].buf = addr_buf;
-+
-+	/* Read data from register */
-+	msgs[1].addr = client->addr;
-+	msgs[1].flags = I2C_M_RD;
-+	msgs[1].len = len;
-+	msgs[1].buf = &data_buf[4 - len];
-+
-+	ret = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
-+	if (ret != ARRAY_SIZE(msgs))
-+		return -EIO;
-+
-+	*val = get_unaligned_be32(data_buf);
-+
-+	return 0;
-+}
-+
-+/* Write registers up to 2 at a time */
-+static int imx519_write_reg(struct imx519 *imx519, u16 reg, u32 len, u32 val)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&imx519->sd);
-+	u8 buf[6];
-+
-+	if (len > 4)
-+		return -EINVAL;
-+
-+	put_unaligned_be16(reg, buf);
-+	put_unaligned_be32(val << (8 * (4 - len)), buf + 2);
-+	if (i2c_master_send(client, buf, len + 2) != len + 2)
-+		return -EIO;
-+
-+	return 0;
-+}
-+
-+/* Write a list of registers */
-+static int imx519_write_regs(struct imx519 *imx519,
-+			     const struct imx519_reg *regs, u32 len)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&imx519->sd);
-+	unsigned int i;
-+	int ret;
-+
-+	for (i = 0; i < len; i++) {
-+		ret = imx519_write_reg(imx519, regs[i].address, 1, regs[i].val);
-+		if (ret) {
-+			dev_err_ratelimited(&client->dev,
-+					    "Failed to write reg 0x%4.4x. error = %d\n",
-+					    regs[i].address, ret);
-+
-+			return ret;
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+/* Get bayer order based on flip setting. */
-+static u32 imx519_get_format_code(struct imx519 *imx519)
-+{
-+	unsigned int i;
-+
-+	lockdep_assert_held(&imx519->mutex);
-+
-+	i = (imx519->vflip->val ? 2 : 0) |
-+	    (imx519->hflip->val ? 1 : 0);
-+
-+	return codes[i];
-+}
-+
-+static int imx519_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
-+{
-+	struct imx519 *imx519 = to_imx519(sd);
-+	struct v4l2_mbus_framefmt *try_fmt_img =
-+		v4l2_subdev_get_try_format(sd, fh->state, IMAGE_PAD);
-+	struct v4l2_mbus_framefmt *try_fmt_meta =
-+		v4l2_subdev_get_try_format(sd, fh->state, METADATA_PAD);
-+	struct v4l2_rect *try_crop;
-+
-+	mutex_lock(&imx519->mutex);
-+
-+	/* Initialize try_fmt for the image pad */
-+	try_fmt_img->width = supported_modes_10bit[0].width;
-+	try_fmt_img->height = supported_modes_10bit[0].height;
-+	try_fmt_img->code = imx519_get_format_code(imx519);
-+	try_fmt_img->field = V4L2_FIELD_NONE;
-+
-+	/* Initialize try_fmt for the embedded metadata pad */
-+	try_fmt_meta->width = IMX519_EMBEDDED_LINE_WIDTH;
-+	try_fmt_meta->height = IMX519_NUM_EMBEDDED_LINES;
-+	try_fmt_meta->code = MEDIA_BUS_FMT_SENSOR_DATA;
-+	try_fmt_meta->field = V4L2_FIELD_NONE;
-+
-+	/* Initialize try_crop */
-+	try_crop = v4l2_subdev_get_try_crop(sd, fh->state, IMAGE_PAD);
-+	try_crop->left = IMX519_PIXEL_ARRAY_LEFT;
-+	try_crop->top = IMX519_PIXEL_ARRAY_TOP;
-+	try_crop->width = IMX519_PIXEL_ARRAY_WIDTH;
-+	try_crop->height = IMX519_PIXEL_ARRAY_HEIGHT;
-+
-+	mutex_unlock(&imx519->mutex);
-+
-+	return 0;
-+}
-+
-+static void imx519_adjust_exposure_range(struct imx519 *imx519)
-+{
-+	int exposure_max, exposure_def;
-+
-+	/* Honour the VBLANK limits when setting exposure. */
-+	exposure_max = imx519->mode->height + imx519->vblank->val -
-+		       IMX519_EXPOSURE_OFFSET;
-+	exposure_def = min(exposure_max, imx519->exposure->val);
-+	__v4l2_ctrl_modify_range(imx519->exposure, imx519->exposure->minimum,
-+				 exposure_max, imx519->exposure->step,
-+				 exposure_def);
-+}
-+
-+static int imx519_set_frame_length(struct imx519 *imx519, unsigned int val)
-+{
-+	int ret = 0;
-+
-+	imx519->long_exp_shift = 0;
-+
-+	while (val > IMX519_FRAME_LENGTH_MAX) {
-+		imx519->long_exp_shift++;
-+		val >>= 1;
-+	}
-+
-+	ret = imx519_write_reg(imx519, IMX519_REG_FRAME_LENGTH,
-+			       IMX519_REG_VALUE_16BIT, val);
-+	if (ret)
-+		return ret;
-+
-+	return imx519_write_reg(imx519, IMX519_LONG_EXP_SHIFT_REG,
-+				IMX519_REG_VALUE_08BIT, imx519->long_exp_shift);
-+}
-+
-+static int imx519_set_ctrl(struct v4l2_ctrl *ctrl)
-+{
-+	struct imx519 *imx519 =
-+		container_of(ctrl->handler, struct imx519, ctrl_handler);
-+	struct i2c_client *client = v4l2_get_subdevdata(&imx519->sd);
-+	int ret = 0;
-+
-+	/*
-+	 * The VBLANK control may change the limits of usable exposure, so check
-+	 * and adjust if necessary.
-+	 */
-+	if (ctrl->id == V4L2_CID_VBLANK)
-+		imx519_adjust_exposure_range(imx519);
-+
-+	/*
-+	 * Applying V4L2 control value only happens
-+	 * when power is up for streaming
-+	 */
-+	if (pm_runtime_get_if_in_use(&client->dev) == 0)
-+		return 0;
-+
-+	switch (ctrl->id) {
-+	case V4L2_CID_ANALOGUE_GAIN:
-+		ret = imx519_write_reg(imx519, IMX519_REG_ANALOG_GAIN,
-+				       IMX519_REG_VALUE_16BIT, ctrl->val);
-+		break;
-+	case V4L2_CID_EXPOSURE:
-+		ret = imx519_write_reg(imx519, IMX519_REG_EXPOSURE,
-+				       IMX519_REG_VALUE_16BIT, ctrl->val >>
-+							imx519->long_exp_shift);
-+		break;
-+	case V4L2_CID_DIGITAL_GAIN:
-+		ret = imx519_write_reg(imx519, IMX519_REG_DIGITAL_GAIN,
-+				       IMX519_REG_VALUE_16BIT, ctrl->val);
-+		break;
-+	case V4L2_CID_TEST_PATTERN:
-+		ret = imx519_write_reg(imx519, IMX519_REG_TEST_PATTERN,
-+				       IMX519_REG_VALUE_16BIT,
-+				       imx519_test_pattern_val[ctrl->val]);
-+		break;
-+	case V4L2_CID_TEST_PATTERN_RED:
-+		ret = imx519_write_reg(imx519, IMX519_REG_TEST_PATTERN_R,
-+				       IMX519_REG_VALUE_16BIT, ctrl->val);
-+		break;
-+	case V4L2_CID_TEST_PATTERN_GREENR:
-+		ret = imx519_write_reg(imx519, IMX519_REG_TEST_PATTERN_GR,
-+				       IMX519_REG_VALUE_16BIT, ctrl->val);
-+		break;
-+	case V4L2_CID_TEST_PATTERN_BLUE:
-+		ret = imx519_write_reg(imx519, IMX519_REG_TEST_PATTERN_B,
-+				       IMX519_REG_VALUE_16BIT, ctrl->val);
-+		break;
-+	case V4L2_CID_TEST_PATTERN_GREENB:
-+		ret = imx519_write_reg(imx519, IMX519_REG_TEST_PATTERN_GB,
-+				       IMX519_REG_VALUE_16BIT, ctrl->val);
-+		break;
-+	case V4L2_CID_HFLIP:
-+	case V4L2_CID_VFLIP:
-+		ret = imx519_write_reg(imx519, IMX519_REG_ORIENTATION, 1,
-+				       imx519->hflip->val |
-+				       imx519->vflip->val << 1);
-+		break;
-+	case V4L2_CID_VBLANK:
-+		ret = imx519_set_frame_length(imx519,
-+					      imx519->mode->height + ctrl->val);
-+		break;
-+	default:
-+		dev_info(&client->dev,
-+			 "ctrl(id:0x%x,val:0x%x) is not handled\n",
-+			 ctrl->id, ctrl->val);
-+		ret = -EINVAL;
-+		break;
-+	}
-+
-+	pm_runtime_put(&client->dev);
-+
-+	return ret;
-+}
-+
-+static const struct v4l2_ctrl_ops imx519_ctrl_ops = {
-+	.s_ctrl = imx519_set_ctrl,
-+};
-+
-+static int imx519_enum_mbus_code(struct v4l2_subdev *sd,
-+				 struct v4l2_subdev_state *sd_state,
-+				 struct v4l2_subdev_mbus_code_enum *code)
-+{
-+	struct imx519 *imx519 = to_imx519(sd);
-+
-+	if (code->pad >= NUM_PADS)
-+		return -EINVAL;
-+
-+	if (code->pad == IMAGE_PAD) {
-+		if (code->index > 0)
-+			return -EINVAL;
-+
-+		code->code = imx519_get_format_code(imx519);
-+	} else {
-+		if (code->index > 0)
-+			return -EINVAL;
-+
-+		code->code = MEDIA_BUS_FMT_SENSOR_DATA;
-+	}
-+
-+	return 0;
-+}
-+
-+static int imx519_enum_frame_size(struct v4l2_subdev *sd,
-+				  struct v4l2_subdev_state *sd_state,
-+				  struct v4l2_subdev_frame_size_enum *fse)
-+{
-+	struct imx519 *imx519 = to_imx519(sd);
-+
-+	if (fse->pad >= NUM_PADS)
-+		return -EINVAL;
-+
-+	if (fse->pad == IMAGE_PAD) {
-+		if (fse->index >= ARRAY_SIZE(supported_modes_10bit))
-+			return -EINVAL;
-+
-+		if (fse->code != imx519_get_format_code(imx519))
-+			return -EINVAL;
-+
-+		fse->min_width = supported_modes_10bit[fse->index].width;
-+		fse->max_width = fse->min_width;
-+		fse->min_height = supported_modes_10bit[fse->index].height;
-+		fse->max_height = fse->min_height;
-+	} else {
-+		if (fse->code != MEDIA_BUS_FMT_SENSOR_DATA || fse->index > 0)
-+			return -EINVAL;
-+
-+		fse->min_width = IMX519_EMBEDDED_LINE_WIDTH;
-+		fse->max_width = fse->min_width;
-+		fse->min_height = IMX519_NUM_EMBEDDED_LINES;
-+		fse->max_height = fse->min_height;
-+	}
-+
-+	return 0;
-+}
-+
-+static void imx519_reset_colorspace(struct v4l2_mbus_framefmt *fmt)
-+{
-+	fmt->colorspace = V4L2_COLORSPACE_RAW;
-+	fmt->ycbcr_enc = V4L2_MAP_YCBCR_ENC_DEFAULT(fmt->colorspace);
-+	fmt->quantization = V4L2_MAP_QUANTIZATION_DEFAULT(true,
-+							  fmt->colorspace,
-+							  fmt->ycbcr_enc);
-+	fmt->xfer_func = V4L2_MAP_XFER_FUNC_DEFAULT(fmt->colorspace);
-+}
-+
-+static void imx519_update_image_pad_format(struct imx519 *imx519,
-+					   const struct imx519_mode *mode,
-+					   struct v4l2_subdev_format *fmt)
-+{
-+	fmt->format.width = mode->width;
-+	fmt->format.height = mode->height;
-+	fmt->format.field = V4L2_FIELD_NONE;
-+	imx519_reset_colorspace(&fmt->format);
-+}
-+
-+static void imx519_update_metadata_pad_format(struct v4l2_subdev_format *fmt)
-+{
-+	fmt->format.width = IMX519_EMBEDDED_LINE_WIDTH;
-+	fmt->format.height = IMX519_NUM_EMBEDDED_LINES;
-+	fmt->format.code = MEDIA_BUS_FMT_SENSOR_DATA;
-+	fmt->format.field = V4L2_FIELD_NONE;
-+}
-+
-+static int imx519_get_pad_format(struct v4l2_subdev *sd,
-+				 struct v4l2_subdev_state *sd_state,
-+				 struct v4l2_subdev_format *fmt)
-+{
-+	struct imx519 *imx519 = to_imx519(sd);
-+
-+	if (fmt->pad >= NUM_PADS)
-+		return -EINVAL;
-+
-+	mutex_lock(&imx519->mutex);
-+
-+	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-+		struct v4l2_mbus_framefmt *try_fmt =
-+			v4l2_subdev_get_try_format(&imx519->sd, sd_state,
-+						   fmt->pad);
-+		/* update the code which could change due to vflip or hflip: */
-+		try_fmt->code = fmt->pad == IMAGE_PAD ?
-+				imx519_get_format_code(imx519) :
-+				MEDIA_BUS_FMT_SENSOR_DATA;
-+		fmt->format = *try_fmt;
-+	} else {
-+		if (fmt->pad == IMAGE_PAD) {
-+			imx519_update_image_pad_format(imx519, imx519->mode,
-+						       fmt);
-+			fmt->format.code =
-+			       imx519_get_format_code(imx519);
-+		} else {
-+			imx519_update_metadata_pad_format(fmt);
-+		}
-+	}
-+
-+	mutex_unlock(&imx519->mutex);
-+	return 0;
-+}
-+
-+static
-+unsigned int imx519_get_frame_length(const struct imx519_mode *mode,
-+				     const struct v4l2_fract *timeperframe)
-+{
-+	u64 frame_length;
-+
-+	frame_length = (u64)timeperframe->numerator * IMX519_PIXEL_RATE;
-+	do_div(frame_length,
-+	       (u64)timeperframe->denominator * mode->line_length_pix);
-+
-+	if (WARN_ON(frame_length > IMX519_FRAME_LENGTH_MAX))
-+		frame_length = IMX519_FRAME_LENGTH_MAX;
-+
-+	return max_t(unsigned int, frame_length, mode->height);
-+}
-+
-+static void imx519_set_framing_limits(struct imx519 *imx519)
-+{
-+	unsigned int frm_length_min, frm_length_default, hblank;
-+	const struct imx519_mode *mode = imx519->mode;
-+
-+	frm_length_min = imx519_get_frame_length(mode, &mode->timeperframe_min);
-+	frm_length_default =
-+		     imx519_get_frame_length(mode, &mode->timeperframe_default);
-+
-+	/* Default to no long exposure multiplier. */
-+	imx519->long_exp_shift = 0;
-+
-+	/* Update limits and set FPS to default */
-+	__v4l2_ctrl_modify_range(imx519->vblank, frm_length_min - mode->height,
-+				 ((1 << IMX519_LONG_EXP_SHIFT_MAX) *
-+					IMX519_FRAME_LENGTH_MAX) - mode->height,
-+				 1, frm_length_default - mode->height);
-+
-+	/* Setting this will adjust the exposure limits as well. */
-+	__v4l2_ctrl_s_ctrl(imx519->vblank, frm_length_default - mode->height);
-+
-+	/*
-+	 * Currently PPL is fixed to the mode specified value, so hblank
-+	 * depends on mode->width only, and is not changeable in any
-+	 * way other than changing the mode.
-+	 */
-+	hblank = mode->line_length_pix - mode->width;
-+	__v4l2_ctrl_modify_range(imx519->hblank, hblank, hblank, 1, hblank);
-+}
-+
-+static int imx519_set_pad_format(struct v4l2_subdev *sd,
-+				 struct v4l2_subdev_state *sd_state,
-+				 struct v4l2_subdev_format *fmt)
-+{
-+	struct v4l2_mbus_framefmt *framefmt;
-+	const struct imx519_mode *mode;
-+	struct imx519 *imx519 = to_imx519(sd);
-+
-+	if (fmt->pad >= NUM_PADS)
-+		return -EINVAL;
-+
-+	mutex_lock(&imx519->mutex);
-+
-+	if (fmt->pad == IMAGE_PAD) {
-+		/* Bayer order varies with flips */
-+		fmt->format.code = imx519_get_format_code(imx519);
-+
-+		mode = v4l2_find_nearest_size(supported_modes_10bit,
-+					      ARRAY_SIZE(supported_modes_10bit),
-+					      width, height,
-+					      fmt->format.width,
-+					      fmt->format.height);
-+		imx519_update_image_pad_format(imx519, mode, fmt);
-+		if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-+			framefmt = v4l2_subdev_get_try_format(sd, sd_state,
-+							      fmt->pad);
-+			*framefmt = fmt->format;
-+		} else {
-+			imx519->mode = mode;
-+			imx519->fmt_code = fmt->format.code;
-+			imx519_set_framing_limits(imx519);
-+		}
-+	} else {
-+		if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-+			framefmt = v4l2_subdev_get_try_format(sd, sd_state,
-+							      fmt->pad);
-+			*framefmt = fmt->format;
-+		} else {
-+			/* Only one embedded data mode is supported */
-+			imx519_update_metadata_pad_format(fmt);
-+		}
-+	}
-+
-+	mutex_unlock(&imx519->mutex);
-+
-+	return 0;
-+}
-+
-+static const struct v4l2_rect *
-+__imx519_get_pad_crop(struct imx519 *imx519, struct v4l2_subdev_state *sd_state,
-+		      unsigned int pad, enum v4l2_subdev_format_whence which)
-+{
-+	switch (which) {
-+	case V4L2_SUBDEV_FORMAT_TRY:
-+		return v4l2_subdev_get_try_crop(&imx519->sd, sd_state, pad);
-+	case V4L2_SUBDEV_FORMAT_ACTIVE:
-+		return &imx519->mode->crop;
-+	}
-+
-+	return NULL;
-+}
-+
-+static int imx519_get_selection(struct v4l2_subdev *sd,
-+				struct v4l2_subdev_state *sd_state,
-+				struct v4l2_subdev_selection *sel)
-+{
-+	switch (sel->target) {
-+	case V4L2_SEL_TGT_CROP: {
-+		struct imx519 *imx519 = to_imx519(sd);
-+
-+		mutex_lock(&imx519->mutex);
-+		sel->r = *__imx519_get_pad_crop(imx519, sd_state, sel->pad,
-+						sel->which);
-+		mutex_unlock(&imx519->mutex);
-+
-+		return 0;
-+	}
-+
-+	case V4L2_SEL_TGT_NATIVE_SIZE:
-+		sel->r.left = 0;
-+		sel->r.top = 0;
-+		sel->r.width = IMX519_NATIVE_WIDTH;
-+		sel->r.height = IMX519_NATIVE_HEIGHT;
-+
-+		return 0;
-+
-+	case V4L2_SEL_TGT_CROP_DEFAULT:
-+	case V4L2_SEL_TGT_CROP_BOUNDS:
-+		sel->r.left = IMX519_PIXEL_ARRAY_LEFT;
-+		sel->r.top = IMX519_PIXEL_ARRAY_TOP;
-+		sel->r.width = IMX519_PIXEL_ARRAY_WIDTH;
-+		sel->r.height = IMX519_PIXEL_ARRAY_HEIGHT;
-+
-+		return 0;
-+	}
-+
-+	return -EINVAL;
-+}
-+
-+/* Start streaming */
-+static int imx519_start_streaming(struct imx519 *imx519)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&imx519->sd);
-+	const struct imx519_reg_list *reg_list;
-+	int ret;
-+
-+	if (!imx519->common_regs_written) {
-+		ret = imx519_write_regs(imx519, mode_common_regs,
-+					ARRAY_SIZE(mode_common_regs));
-+
-+		if (ret) {
-+			dev_err(&client->dev, "%s failed to set common settings\n",
-+				__func__);
-+			return ret;
-+		}
-+		imx519->common_regs_written = true;
-+	}
-+
-+	/* Apply default values of current mode */
-+	reg_list = &imx519->mode->reg_list;
-+	ret = imx519_write_regs(imx519, reg_list->regs, reg_list->num_of_regs);
-+	if (ret) {
-+		dev_err(&client->dev, "%s failed to set mode\n", __func__);
-+		return ret;
-+	}
-+
-+	/* Apply customized values from user */
-+	ret =  __v4l2_ctrl_handler_setup(imx519->sd.ctrl_handler);
-+	if (ret)
-+		return ret;
-+
-+	/* set stream on register */
-+	return imx519_write_reg(imx519, IMX519_REG_MODE_SELECT,
-+				IMX519_REG_VALUE_08BIT, IMX519_MODE_STREAMING);
-+}
-+
-+/* Stop streaming */
-+static void imx519_stop_streaming(struct imx519 *imx519)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&imx519->sd);
-+	int ret;
-+
-+	/* set stream off register */
-+	ret = imx519_write_reg(imx519, IMX519_REG_MODE_SELECT,
-+			       IMX519_REG_VALUE_08BIT, IMX519_MODE_STANDBY);
-+	if (ret)
-+		dev_err(&client->dev, "%s failed to set stream\n", __func__);
-+}
-+
-+static int imx519_set_stream(struct v4l2_subdev *sd, int enable)
-+{
-+	struct imx519 *imx519 = to_imx519(sd);
-+	struct i2c_client *client = v4l2_get_subdevdata(sd);
-+	int ret = 0;
-+
-+	mutex_lock(&imx519->mutex);
-+	if (imx519->streaming == enable) {
-+		mutex_unlock(&imx519->mutex);
-+		return 0;
-+	}
-+
-+	if (enable) {
-+		ret = pm_runtime_get_sync(&client->dev);
-+		if (ret < 0) {
-+			pm_runtime_put_noidle(&client->dev);
-+			goto err_unlock;
-+		}
-+
-+		/*
-+		 * Apply default & customized values
-+		 * and then start streaming.
-+		 */
-+		ret = imx519_start_streaming(imx519);
-+		if (ret)
-+			goto err_rpm_put;
-+	} else {
-+		imx519_stop_streaming(imx519);
-+		pm_runtime_put(&client->dev);
-+	}
-+
-+	imx519->streaming = enable;
-+
-+	/* vflip and hflip cannot change during streaming */
-+	__v4l2_ctrl_grab(imx519->vflip, enable);
-+	__v4l2_ctrl_grab(imx519->hflip, enable);
-+
-+	mutex_unlock(&imx519->mutex);
-+
-+	return ret;
-+
-+err_rpm_put:
-+	pm_runtime_put(&client->dev);
-+err_unlock:
-+	mutex_unlock(&imx519->mutex);
-+
-+	return ret;
-+}
-+
-+/* Power/clock management functions */
-+static int imx519_power_on(struct device *dev)
-+{
-+	struct i2c_client *client = to_i2c_client(dev);
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct imx519 *imx519 = to_imx519(sd);
-+	int ret;
-+
-+	ret = regulator_bulk_enable(IMX519_NUM_SUPPLIES,
-+				    imx519->supplies);
-+	if (ret) {
-+		dev_err(&client->dev, "%s: failed to enable regulators\n",
-+			__func__);
-+		return ret;
-+	}
-+
-+	ret = clk_prepare_enable(imx519->xclk);
-+	if (ret) {
-+		dev_err(&client->dev, "%s: failed to enable clock\n",
-+			__func__);
-+		goto reg_off;
-+	}
-+
-+	gpiod_set_value_cansleep(imx519->reset_gpio, 1);
-+	usleep_range(IMX519_XCLR_MIN_DELAY_US,
-+		     IMX519_XCLR_MIN_DELAY_US + IMX519_XCLR_DELAY_RANGE_US);
-+
-+	return 0;
-+
-+reg_off:
-+	regulator_bulk_disable(IMX519_NUM_SUPPLIES, imx519->supplies);
-+	return ret;
-+}
-+
-+static int imx519_power_off(struct device *dev)
-+{
-+	struct i2c_client *client = to_i2c_client(dev);
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct imx519 *imx519 = to_imx519(sd);
-+
-+	gpiod_set_value_cansleep(imx519->reset_gpio, 0);
-+	regulator_bulk_disable(IMX519_NUM_SUPPLIES, imx519->supplies);
-+	clk_disable_unprepare(imx519->xclk);
-+
-+	/* Force reprogramming of the common registers when powered up again. */
-+	imx519->common_regs_written = false;
-+
-+	return 0;
-+}
-+
-+static int __maybe_unused imx519_suspend(struct device *dev)
-+{
-+	struct i2c_client *client = to_i2c_client(dev);
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct imx519 *imx519 = to_imx519(sd);
-+
-+	if (imx519->streaming)
-+		imx519_stop_streaming(imx519);
-+
-+	return 0;
-+}
-+
-+static int __maybe_unused imx519_resume(struct device *dev)
-+{
-+	struct i2c_client *client = to_i2c_client(dev);
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct imx519 *imx519 = to_imx519(sd);
-+	int ret;
-+
-+	if (imx519->streaming) {
-+		ret = imx519_start_streaming(imx519);
-+		if (ret)
-+			goto error;
-+	}
-+
-+	return 0;
-+
-+error:
-+	imx519_stop_streaming(imx519);
-+	imx519->streaming = 0;
-+	return ret;
-+}
-+
-+static int imx519_get_regulators(struct imx519 *imx519)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&imx519->sd);
-+	unsigned int i;
-+
-+	for (i = 0; i < IMX519_NUM_SUPPLIES; i++)
-+		imx519->supplies[i].supply = imx519_supply_name[i];
-+
-+	return devm_regulator_bulk_get(&client->dev,
-+				       IMX519_NUM_SUPPLIES,
-+				       imx519->supplies);
-+}
-+
-+/* Verify chip ID */
-+static int imx519_identify_module(struct imx519 *imx519, u32 expected_id)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&imx519->sd);
-+	int ret;
-+	u32 val;
-+
-+	ret = imx519_read_reg(imx519, IMX519_REG_CHIP_ID,
-+			      IMX519_REG_VALUE_16BIT, &val);
-+	if (ret) {
-+		dev_err(&client->dev, "failed to read chip id %x, with error %d\n",
-+			expected_id, ret);
-+		return ret;
-+	}
-+
-+	if (val != expected_id) {
-+		dev_err(&client->dev, "chip id mismatch: %x!=%x\n",
-+			expected_id, val);
-+		return -EIO;
-+	}
-+
-+	dev_info(&client->dev, "Device found is imx%x\n", val);
-+
-+	return 0;
-+}
-+
-+static const struct v4l2_subdev_core_ops imx519_core_ops = {
-+	.subscribe_event = v4l2_ctrl_subdev_subscribe_event,
-+	.unsubscribe_event = v4l2_event_subdev_unsubscribe,
-+};
-+
-+static const struct v4l2_subdev_video_ops imx519_video_ops = {
-+	.s_stream = imx519_set_stream,
-+};
-+
-+static const struct v4l2_subdev_pad_ops imx519_pad_ops = {
-+	.enum_mbus_code = imx519_enum_mbus_code,
-+	.get_fmt = imx519_get_pad_format,
-+	.set_fmt = imx519_set_pad_format,
-+	.get_selection = imx519_get_selection,
-+	.enum_frame_size = imx519_enum_frame_size,
-+};
-+
-+static const struct v4l2_subdev_ops imx519_subdev_ops = {
-+	.core = &imx519_core_ops,
-+	.video = &imx519_video_ops,
-+	.pad = &imx519_pad_ops,
-+};
-+
-+static const struct v4l2_subdev_internal_ops imx519_internal_ops = {
-+	.open = imx519_open,
-+};
-+
-+/* Initialize control handlers */
-+static int imx519_init_controls(struct imx519 *imx519)
-+{
-+	struct v4l2_ctrl_handler *ctrl_hdlr;
-+	struct i2c_client *client = v4l2_get_subdevdata(&imx519->sd);
-+	struct v4l2_fwnode_device_properties props;
-+	unsigned int i;
-+	int ret;
-+
-+	ctrl_hdlr = &imx519->ctrl_handler;
-+	ret = v4l2_ctrl_handler_init(ctrl_hdlr, 16);
-+	if (ret)
-+		return ret;
-+
-+	mutex_init(&imx519->mutex);
-+	ctrl_hdlr->lock = &imx519->mutex;
-+
-+	/* By default, PIXEL_RATE is read only */
-+	imx519->pixel_rate = v4l2_ctrl_new_std(ctrl_hdlr, &imx519_ctrl_ops,
-+					       V4L2_CID_PIXEL_RATE,
-+					       IMX519_PIXEL_RATE,
-+					       IMX519_PIXEL_RATE, 1,
-+					       IMX519_PIXEL_RATE);
-+
-+	/*
-+	 * Create the controls here, but mode specific limits are setup
-+	 * in the imx519_set_framing_limits() call below.
-+	 */
-+	imx519->vblank = v4l2_ctrl_new_std(ctrl_hdlr, &imx519_ctrl_ops,
-+					   V4L2_CID_VBLANK, 0, 0xffff, 1, 0);
-+	imx519->hblank = v4l2_ctrl_new_std(ctrl_hdlr, &imx519_ctrl_ops,
-+					   V4L2_CID_HBLANK, 0, 0xffff, 1, 0);
-+
-+	/* HBLANK is read-only for now, but does change with mode. */
-+	if (imx519->hblank)
-+		imx519->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
-+
-+	imx519->exposure = v4l2_ctrl_new_std(ctrl_hdlr, &imx519_ctrl_ops,
-+					     V4L2_CID_EXPOSURE,
-+					     IMX519_EXPOSURE_MIN,
-+					     IMX519_EXPOSURE_MAX,
-+					     IMX519_EXPOSURE_STEP,
-+					     IMX519_EXPOSURE_DEFAULT);
-+
-+	v4l2_ctrl_new_std(ctrl_hdlr, &imx519_ctrl_ops, V4L2_CID_ANALOGUE_GAIN,
-+			  IMX519_ANA_GAIN_MIN, IMX519_ANA_GAIN_MAX,
-+			  IMX519_ANA_GAIN_STEP, IMX519_ANA_GAIN_DEFAULT);
-+
-+	v4l2_ctrl_new_std(ctrl_hdlr, &imx519_ctrl_ops, V4L2_CID_DIGITAL_GAIN,
-+			  IMX519_DGTL_GAIN_MIN, IMX519_DGTL_GAIN_MAX,
-+			  IMX519_DGTL_GAIN_STEP, IMX519_DGTL_GAIN_DEFAULT);
-+
-+	imx519->hflip = v4l2_ctrl_new_std(ctrl_hdlr, &imx519_ctrl_ops,
-+					  V4L2_CID_HFLIP, 0, 1, 1, 0);
-+	if (imx519->hflip)
-+		imx519->hflip->flags |= V4L2_CTRL_FLAG_MODIFY_LAYOUT;
-+
-+	imx519->vflip = v4l2_ctrl_new_std(ctrl_hdlr, &imx519_ctrl_ops,
-+					  V4L2_CID_VFLIP, 0, 1, 1, 0);
-+	if (imx519->vflip)
-+		imx519->vflip->flags |= V4L2_CTRL_FLAG_MODIFY_LAYOUT;
-+
-+	v4l2_ctrl_new_std_menu_items(ctrl_hdlr, &imx519_ctrl_ops,
-+				     V4L2_CID_TEST_PATTERN,
-+				     ARRAY_SIZE(imx519_test_pattern_menu) - 1,
-+				     0, 0, imx519_test_pattern_menu);
-+	for (i = 0; i < 4; i++) {
-+		/*
-+		 * The assumption is that
-+		 * V4L2_CID_TEST_PATTERN_GREENR == V4L2_CID_TEST_PATTERN_RED + 1
-+		 * V4L2_CID_TEST_PATTERN_BLUE   == V4L2_CID_TEST_PATTERN_RED + 2
-+		 * V4L2_CID_TEST_PATTERN_GREENB == V4L2_CID_TEST_PATTERN_RED + 3
-+		 */
-+		v4l2_ctrl_new_std(ctrl_hdlr, &imx519_ctrl_ops,
-+				  V4L2_CID_TEST_PATTERN_RED + i,
-+				  IMX519_TEST_PATTERN_COLOUR_MIN,
-+				  IMX519_TEST_PATTERN_COLOUR_MAX,
-+				  IMX519_TEST_PATTERN_COLOUR_STEP,
-+				  IMX519_TEST_PATTERN_COLOUR_MAX);
-+		/* The "Solid color" pattern is white by default */
-+	}
-+
-+	if (ctrl_hdlr->error) {
-+		ret = ctrl_hdlr->error;
-+		dev_err(&client->dev, "%s control init failed (%d)\n",
-+			__func__, ret);
-+		goto error;
-+	}
-+
-+	ret = v4l2_fwnode_device_parse(&client->dev, &props);
-+	if (ret)
-+		goto error;
-+
-+	ret = v4l2_ctrl_new_fwnode_properties(ctrl_hdlr, &imx519_ctrl_ops,
-+					      &props);
-+	if (ret)
-+		goto error;
-+
-+	imx519->sd.ctrl_handler = ctrl_hdlr;
-+
-+	/* Setup exposure and frame/line length limits. */
-+	imx519_set_framing_limits(imx519);
-+
-+	return 0;
-+
-+error:
-+	v4l2_ctrl_handler_free(ctrl_hdlr);
-+	mutex_destroy(&imx519->mutex);
-+
-+	return ret;
-+}
-+
-+static void imx519_free_controls(struct imx519 *imx519)
-+{
-+	v4l2_ctrl_handler_free(imx519->sd.ctrl_handler);
-+	mutex_destroy(&imx519->mutex);
-+}
-+
-+static int imx519_check_hwcfg(struct device *dev)
-+{
-+	struct fwnode_handle *endpoint;
-+	struct v4l2_fwnode_endpoint ep_cfg = {
-+		.bus_type = V4L2_MBUS_CSI2_DPHY
-+	};
-+	int ret = -EINVAL;
-+
-+	endpoint = fwnode_graph_get_next_endpoint(dev_fwnode(dev), NULL);
-+	if (!endpoint) {
-+		dev_err(dev, "endpoint node not found\n");
-+		return -EINVAL;
-+	}
-+
-+	if (v4l2_fwnode_endpoint_alloc_parse(endpoint, &ep_cfg)) {
-+		dev_err(dev, "could not parse endpoint\n");
-+		goto error_out;
-+	}
-+
-+	/* Check the number of MIPI CSI2 data lanes */
-+	if (ep_cfg.bus.mipi_csi2.num_data_lanes != 2) {
-+		dev_err(dev, "only 2 data lanes are currently supported\n");
-+		goto error_out;
-+	}
-+
-+	/* Check the link frequency set in device tree */
-+	if (!ep_cfg.nr_of_link_frequencies) {
-+		dev_err(dev, "link-frequency property not found in DT\n");
-+		goto error_out;
-+	}
-+
-+	if (ep_cfg.nr_of_link_frequencies != 1 ||
-+	    ep_cfg.link_frequencies[0] != IMX519_DEFAULT_LINK_FREQ) {
-+		dev_err(dev, "Link frequency not supported: %lld\n",
-+			ep_cfg.link_frequencies[0]);
-+		goto error_out;
-+	}
-+
-+	ret = 0;
-+
-+error_out:
-+	v4l2_fwnode_endpoint_free(&ep_cfg);
-+	fwnode_handle_put(endpoint);
-+
-+	return ret;
-+}
-+
-+static const struct of_device_id imx519_dt_ids[] = {
-+	{ .compatible = "sony,imx519"},
-+	{ /* sentinel */ }
-+};
-+
-+static int imx519_probe(struct i2c_client *client)
-+{
-+	struct device *dev = &client->dev;
-+	struct imx519 *imx519;
-+	const struct of_device_id *match;
-+	u32 xclk_freq;
-+	int ret;
-+
-+	imx519 = devm_kzalloc(&client->dev, sizeof(*imx519), GFP_KERNEL);
-+	if (!imx519)
-+		return -ENOMEM;
-+
-+	v4l2_i2c_subdev_init(&imx519->sd, client, &imx519_subdev_ops);
-+
-+	match = of_match_device(imx519_dt_ids, dev);
-+	if (!match)
-+		return -ENODEV;
-+
-+	/* Check the hardware configuration in device tree */
-+	if (imx519_check_hwcfg(dev))
-+		return -EINVAL;
-+
-+	/* Get system clock (xclk) */
-+	imx519->xclk = devm_clk_get(dev, NULL);
-+	if (IS_ERR(imx519->xclk)) {
-+		dev_err(dev, "failed to get xclk\n");
-+		return PTR_ERR(imx519->xclk);
-+	}
-+
-+	xclk_freq = clk_get_rate(imx519->xclk);
-+	if (xclk_freq != IMX519_XCLK_FREQ) {
-+		dev_err(dev, "xclk frequency not supported: %d Hz\n",
-+			xclk_freq);
-+		return -EINVAL;
-+	}
-+
-+	ret = imx519_get_regulators(imx519);
-+	if (ret) {
-+		dev_err(dev, "failed to get regulators\n");
-+		return ret;
-+	}
-+
-+	/* Request optional enable pin */
-+	imx519->reset_gpio = devm_gpiod_get_optional(dev, "reset",
-+						     GPIOD_OUT_HIGH);
-+
-+	/*
-+	 * The sensor must be powered for imx519_identify_module()
-+	 * to be able to read the CHIP_ID register
-+	 */
-+	ret = imx519_power_on(dev);
-+	if (ret)
-+		return ret;
-+
-+	ret = imx519_identify_module(imx519, IMX519_CHIP_ID);
-+	if (ret)
-+		goto error_power_off;
-+
-+	/* Set default mode to max resolution */
-+	imx519->mode = &supported_modes_10bit[0];
-+	imx519->fmt_code = MEDIA_BUS_FMT_SRGGB10_1X10;
-+
-+	/* Enable runtime PM and turn off the device */
-+	pm_runtime_set_active(dev);
-+	pm_runtime_enable(dev);
-+	pm_runtime_idle(dev);
-+
-+	/* This needs the pm runtime to be registered. */
-+	ret = imx519_init_controls(imx519);
-+	if (ret)
-+		goto error_power_off;
-+
-+	/* Initialize subdev */
-+	imx519->sd.internal_ops = &imx519_internal_ops;
-+	imx519->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE |
-+			    V4L2_SUBDEV_FL_HAS_EVENTS;
-+	imx519->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR;
-+
-+	/* Initialize source pads */
-+	imx519->pad[IMAGE_PAD].flags = MEDIA_PAD_FL_SOURCE;
-+	imx519->pad[METADATA_PAD].flags = MEDIA_PAD_FL_SOURCE;
-+
-+	ret = media_entity_pads_init(&imx519->sd.entity, NUM_PADS, imx519->pad);
-+	if (ret) {
-+		dev_err(dev, "failed to init entity pads: %d\n", ret);
-+		goto error_handler_free;
-+	}
-+
-+	ret = v4l2_async_register_subdev_sensor(&imx519->sd);
-+	if (ret < 0) {
-+		dev_err(dev, "failed to register sensor sub-device: %d\n", ret);
-+		goto error_media_entity;
-+	}
-+
-+	return 0;
-+
-+error_media_entity:
-+	media_entity_cleanup(&imx519->sd.entity);
-+
-+error_handler_free:
-+	imx519_free_controls(imx519);
-+
-+error_power_off:
-+	pm_runtime_disable(&client->dev);
-+	pm_runtime_set_suspended(&client->dev);
-+	imx519_power_off(&client->dev);
-+
-+	return ret;
-+}
-+
-+static void imx519_remove(struct i2c_client *client)
-+{
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct imx519 *imx519 = to_imx519(sd);
-+
-+	v4l2_async_unregister_subdev(sd);
-+	media_entity_cleanup(&sd->entity);
-+	imx519_free_controls(imx519);
-+
-+	pm_runtime_disable(&client->dev);
-+	if (!pm_runtime_status_suspended(&client->dev))
-+		imx519_power_off(&client->dev);
-+	pm_runtime_set_suspended(&client->dev);
-+}
-+
-+MODULE_DEVICE_TABLE(of, imx519_dt_ids);
-+
-+static const struct dev_pm_ops imx519_pm_ops = {
-+	SET_SYSTEM_SLEEP_PM_OPS(imx519_suspend, imx519_resume)
-+	SET_RUNTIME_PM_OPS(imx519_power_off, imx519_power_on, NULL)
-+};
-+
-+static struct i2c_driver imx519_i2c_driver = {
-+	.driver = {
-+		.name = "imx519",
-+		.of_match_table	= imx519_dt_ids,
-+		.pm = &imx519_pm_ops,
-+	},
-+	.probe_new = imx519_probe,
-+	.remove = imx519_remove,
-+};
-+
-+module_i2c_driver(imx519_i2c_driver);
-+
-+MODULE_AUTHOR("Lee Jackson <info@arducam.com>");
-+MODULE_DESCRIPTION("Sony IMX519 sensor driver");
-+MODULE_LICENSE("GPL v2");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0197-Documentation-devicetree-Add-documentation-for-imx37.patch b/target/linux/bcm27xx/patches-6.1/950-0197-Documentation-devicetree-Add-documentation-for-imx37.patch
deleted file mode 100644
index e1115b80bb..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0197-Documentation-devicetree-Add-documentation-for-imx37.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From a7cff56023c618f064a7b50998e0ce871f6c5797 Mon Sep 17 00:00:00 2001
-From: David Plowman <david.plowman@raspberrypi.com>
-Date: Tue, 29 Jun 2021 14:38:23 +0100
-Subject: [PATCH] Documentation: devicetree: Add documentation for
- imx378 sensor
-
-The imx378 sensor is compatible with the imx477 and shares common
-device tree settings.
-
-Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
----
- .../devicetree/bindings/media/i2c/imx378.yaml | 113 ++++++++++++++++++
- MAINTAINERS                                   |   1 +
- 2 files changed, 114 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/media/i2c/imx378.yaml
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/media/i2c/imx378.yaml
-@@ -0,0 +1,113 @@
-+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
-+%YAML 1.2
-+---
-+$id: http://devicetree.org/schemas/media/i2c/imx378.yaml#
-+$schema: http://devicetree.org/meta-schemas/core.yaml#
-+
-+title: Sony 1/2.3-Inch 12Mpixel CMOS Digital Image Sensor
-+
-+maintainers:
-+  - Naushir Patuck <naush@raspberypi.com>
-+
-+description: |-
-+  The Sony IMX378 is a 1/2.3-inch CMOS active pixel digital image sensor
-+  with an active array size of 4056H x 3040V. It is programmable through
-+  I2C interface. The I2C address is fixed to 0x1A as per sensor data sheet.
-+  Image data is sent through MIPI CSI-2, which is configured as either 2 or
-+  4 data lanes.
-+
-+properties:
-+  compatible:
-+    const: sony,imx378
-+
-+  reg:
-+    description: I2C device address
-+    maxItems: 1
-+
-+  clocks:
-+    maxItems: 1
-+
-+  VDIG-supply:
-+    description:
-+      Digital I/O voltage supply, 1.05 volts
-+
-+  VANA-supply:
-+    description:
-+      Analog voltage supply, 2.8 volts
-+
-+  VDDL-supply:
-+    description:
-+      Digital core voltage supply, 1.8 volts
-+
-+  reset-gpios:
-+    description: |-
-+      Reference to the GPIO connected to the xclr pin, if any.
-+      Must be released (set high) after all supplies and INCK are applied.
-+
-+  # See ../video-interfaces.txt for more details
-+  port:
-+    type: object
-+    properties:
-+      endpoint:
-+        type: object
-+        properties:
-+          data-lanes:
-+            description: |-
-+              The sensor supports either two-lane, or four-lane operation.
-+              For two-lane operation the property must be set to <1 2>.
-+            items:
-+              - const: 1
-+              - const: 2
-+
-+          clock-noncontinuous:
-+            type: boolean
-+            description: |-
-+              MIPI CSI-2 clock is non-continuous if this property is present,
-+              otherwise it's continuous.
-+
-+          link-frequencies:
-+            allOf:
-+              - $ref: /schemas/types.yaml#/definitions/uint64-array
-+            description:
-+              Allowed data bus frequencies.
-+
-+        required:
-+          - link-frequencies
-+
-+required:
-+  - compatible
-+  - reg
-+  - clocks
-+  - VANA-supply
-+  - VDIG-supply
-+  - VDDL-supply
-+  - port
-+
-+additionalProperties: false
-+
-+examples:
-+  - |
-+    i2c0 {
-+        #address-cells = <1>;
-+        #size-cells = <0>;
-+
-+        imx378: sensor@10 {
-+            compatible = "sony,imx378";
-+            reg = <0x1a>;
-+            clocks = <&imx378_clk>;
-+            VANA-supply = <&imx378_vana>;   /* 2.8v */
-+            VDIG-supply = <&imx378_vdig>;   /* 1.05v */
-+            VDDL-supply = <&imx378_vddl>;   /* 1.8v */
-+
-+            port {
-+                imx378_0: endpoint {
-+                    remote-endpoint = <&csi1_ep>;
-+                    data-lanes = <1 2>;
-+                    clock-noncontinuous;
-+                    link-frequencies = /bits/ 64 <450000000>;
-+                };
-+            };
-+        };
-+    };
-+
-+...
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -19295,6 +19295,7 @@ M:	Raspberry Pi Kernel Maintenance <kern
- L:	linux-media@vger.kernel.org
- S:	Maintained
- T:	git git://linuxtv.org/media_tree.git
-+F:	Documentation/devicetree/bindings/media/i2c/imx378.yaml
- F:	Documentation/devicetree/bindings/media/i2c/imx477.yaml
- F:	drivers/media/i2c/imx477.c
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0198-v4l2-Add-a-Greyworld-AWB-mode.patch b/target/linux/bcm27xx/patches-6.1/950-0198-v4l2-Add-a-Greyworld-AWB-mode.patch
deleted file mode 100644
index 3e54ebf4b3..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0198-v4l2-Add-a-Greyworld-AWB-mode.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From cf1ae4345b4d7ef4bb8f60f98cc26633f8a18a6d Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Fri, 6 Sep 2019 15:04:51 +0100
-Subject: [PATCH] v4l2: Add a Greyworld AWB mode.
-
-Adds a simple greyworld white balance preset, mainly for use
-with cameras without an IR filter (eg Raspberry Pi NoIR)
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- include/uapi/linux/v4l2-controls.h | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/include/uapi/linux/v4l2-controls.h
-+++ b/include/uapi/linux/v4l2-controls.h
-@@ -950,6 +950,7 @@ enum v4l2_auto_n_preset_white_balance {
- 	V4L2_WHITE_BALANCE_FLASH		= 7,
- 	V4L2_WHITE_BALANCE_CLOUDY		= 8,
- 	V4L2_WHITE_BALANCE_SHADE		= 9,
-+	V4L2_WHITE_BALANCE_GREYWORLD		= 10,
- };
- 
- #define V4L2_CID_WIDE_DYNAMIC_RANGE		(V4L2_CID_CAMERA_CLASS_BASE+21)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0199-staging-bcm2835-camera-Add-greyworld-AWB-mode.patch b/target/linux/bcm27xx/patches-6.1/950-0199-staging-bcm2835-camera-Add-greyworld-AWB-mode.patch
deleted file mode 100644
index 60ed0300ec..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0199-staging-bcm2835-camera-Add-greyworld-AWB-mode.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 823f5a2811ec0e45e4392f40c363714fc12d4d98 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Fri, 6 Sep 2019 15:13:06 +0100
-Subject: [PATCH] staging: bcm2835-camera: Add greyworld AWB mode
-
-This is mainly used for the NoIR camera which has no IR
-filter and can completely confuse normal AWB presets.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- drivers/staging/vc04_services/bcm2835-camera/controls.c    | 4 ++++
- drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h | 1 +
- 2 files changed, 5 insertions(+)
-
---- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
-+++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
-@@ -468,6 +468,10 @@ static int ctrl_set_awb_mode(struct bcm2
- 	case V4L2_WHITE_BALANCE_SHADE:
- 		u32_value = MMAL_PARAM_AWBMODE_SHADE;
- 		break;
-+
-+	case V4L2_WHITE_BALANCE_GREYWORLD:
-+		u32_value = MMAL_PARAM_AWBMODE_GREYWORLD;
-+		break;
- 	}
- 
- 	return vchiq_mmal_port_parameter_set(dev->instance, control,
---- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
-+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
-@@ -310,6 +310,7 @@ enum mmal_parameter_awbmode {
- 	MMAL_PARAM_AWBMODE_INCANDESCENT,
- 	MMAL_PARAM_AWBMODE_FLASH,
- 	MMAL_PARAM_AWBMODE_HORIZON,
-+	MMAL_PARAM_AWBMODE_GREYWORLD,
- };
- 
- enum mmal_parameter_imagefx {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0200-media-v4l2-Add-Greyworld-AWB-control-name.patch b/target/linux/bcm27xx/patches-6.1/950-0200-media-v4l2-Add-Greyworld-AWB-control-name.patch
deleted file mode 100644
index 8d116fffe1..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0200-media-v4l2-Add-Greyworld-AWB-control-name.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 2256c396e731aabb7085a4e87bf796b90df0fdbe Mon Sep 17 00:00:00 2001
-From: John Cox <jc@kynesim.co.uk>
-Date: Fri, 6 Aug 2021 14:32:44 +0100
-Subject: [PATCH] media: v4l2: Add Greyworld AWB control name
-
-Add name for greyworld to white_balance preset names.
-This patch previously applied to v4l2-ctrl.c but that was split
-and deleted.
-
-Signed-off-by: John Cox <jc@kynesim.co.uk>
----
- drivers/media/v4l2-core/v4l2-ctrls-defs.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/media/v4l2-core/v4l2-ctrls-defs.c
-+++ b/drivers/media/v4l2-core/v4l2-ctrls-defs.c
-@@ -228,6 +228,7 @@ const char * const *v4l2_ctrl_get_menu(u
- 		"Flash",
- 		"Cloudy",
- 		"Shade",
-+		"Greyworld",
- 		NULL,
- 	};
- 	static const char * const camera_iso_sensitivity_auto[] = {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0201-staging-bcm2835-camera-Fix-the-cherry-pick-of-AWB-Gr.patch b/target/linux/bcm27xx/patches-6.1/950-0201-staging-bcm2835-camera-Fix-the-cherry-pick-of-AWB-Gr.patch
deleted file mode 100644
index 5cf94f12b2..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0201-staging-bcm2835-camera-Fix-the-cherry-pick-of-AWB-Gr.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8d5fe5f8e6d877811ae270e087f19496b98ea1ca Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Mon, 8 Feb 2021 11:48:35 +0000
-Subject: [PATCH] staging:bcm2835-camera: Fix the cherry-pick of AWB
- Greyworld
-
-The cherry-pick of the patch that added the greyworld AWB mode
-was incomplete. Fix it up.
-
-Fixes: b3ef481fe243 "staging: bcm2835-camera: Add greyworld AWB mode"
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/staging/vc04_services/bcm2835-camera/controls.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
-+++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
-@@ -1050,8 +1050,8 @@ static const struct bcm2835_mmal_v4l2_ct
- 	{
- 		.id = V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE,
- 		.type = MMAL_CONTROL_TYPE_STD_MENU,
--		.min = ~0x3ff,
--		.max = V4L2_WHITE_BALANCE_SHADE,
-+		.min = ~0x7ff,
-+		.max = V4L2_WHITE_BALANCE_GREYWORLD,
- 		.def = V4L2_WHITE_BALANCE_AUTO,
- 		.step = 0,
- 		.imenu = NULL,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0202-ARM-bcm-Switch-board-clk-and-pinctrl-to-bcm2711-comp.patch b/target/linux/bcm27xx/patches-6.1/950-0202-ARM-bcm-Switch-board-clk-and-pinctrl-to-bcm2711-comp.patch
deleted file mode 100644
index 7b5e3ba0b4..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0202-ARM-bcm-Switch-board-clk-and-pinctrl-to-bcm2711-comp.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 17d91d37a51790a4d96e9e1030814ae05543f41f Mon Sep 17 00:00:00 2001
-From: Stefan Wahren <wahrenst@gmx.net>
-Date: Thu, 19 Sep 2019 20:45:30 +0200
-Subject: [PATCH] ARM: bcm: Switch board, clk and pinctrl to bcm2711
- compatible
-
-After the decision to use bcm2711 compatible for upstream, we should
-switch all accepted compatibles to bcm2711. So we can boot with
-one DTB the down- and the upstream kernel.
-
-Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
----
- arch/arm/mach-bcm/board_bcm2835.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/arm/mach-bcm/board_bcm2835.c
-+++ b/arch/arm/mach-bcm/board_bcm2835.c
-@@ -109,7 +109,7 @@ static const char * const bcm2835_compat
- #ifdef CONFIG_ARCH_MULTI_V7
- 	"brcm,bcm2836",
- 	"brcm,bcm2837",
--	"brcm,bcm2838",
-+	"brcm,bcm2711",
- #endif
- 	NULL
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0203-dt-bindings-Add-binding-for-the-Infineon-IRS1125-sen.patch b/target/linux/bcm27xx/patches-6.1/950-0203-dt-bindings-Add-binding-for-the-Infineon-IRS1125-sen.patch
deleted file mode 100644
index 3f3ad06084..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0203-dt-bindings-Add-binding-for-the-Infineon-IRS1125-sen.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 4e0a7c5bf0071a59df64eebe9efe0588c153c100 Mon Sep 17 00:00:00 2001
-From: Markus Proeller <markus.proeller@pieye.org>
-Date: Thu, 10 Oct 2019 19:12:08 +0200
-Subject: [PATCH] dt-bindings: Add binding for the Infineon IRS1125
- sensor
-
-Adds a binding for the Infineon IRS1125 time-of-flight depth
-sensor.
-
-Signed-off-by: Markus Proeller <markus.proeller@pieye.org>
----
- .../devicetree/bindings/media/i2c/irs1125.txt | 48 +++++++++++++++++++
- 1 file changed, 48 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/media/i2c/irs1125.txt
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/media/i2c/irs1125.txt
-@@ -0,0 +1,48 @@
-+* Infineon irs1125 time of flight sensor
-+
-+The Infineon irs1125 is a time of flight digital image sensor with
-+an active array size of 352H x 286V. It is programmable through I2C
-+interface. The I2C address defaults to 0x3D, but can be reconfigured
-+to address 0x3C or 0x41 via I2C commands. Image data is sent through
-+MIPI CSI-2, which is configured as either 1 or 2 data lanes.
-+
-+Required Properties:
-+- compatible: value should be "infineon,irs1125" for irs1125 sensor
-+- reg: I2C bus address of the device
-+- clocks: reference to the xclk input clock.
-+- pwdn-gpios: reference to the GPIO connected to the reset pin.
-+	      This is an active low signal to the iirs1125.
-+
-+The irs1125 device node should contain one 'port' child node with
-+an 'endpoint' subnode. For further reading on port node refer to
-+Documentation/devicetree/bindings/media/video-interfaces.txt.
-+
-+Endpoint node required properties for CSI-2 connection are:
-+- remote-endpoint: a phandle to the bus receiver's endpoint node.
-+- clock-lanes: should be set to <0> (clock lane on hardware lane 0)
-+- data-lanes: should be set to <1> or <1 2> (one or two lane CSI-2
-+  supported)
-+
-+Example:
-+	sensor@10 {
-+		compatible = "infineon,irs1125";
-+		reg = <0x3D>;
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		clocks = <&irs1125_clk>;
-+		pwdn-gpios = <&gpio 5 0>;
-+
-+		irs1125_clk: camera-clk {
-+			compatible = "fixed-clock";
-+			#clock-cells = <0>;
-+			clock-frequency = <26000000>;
-+		};
-+
-+		port {
-+			sensor_out: endpoint {
-+				remote-endpoint = <&csiss_in>;
-+				clock-lanes = <0>;
-+				data-lanes = <1 2>;
-+			};
-+		};
-+	};
diff --git a/target/linux/bcm27xx/patches-6.1/950-0204-media-i2c-Add-a-driver-for-the-Infineon-IRS1125-dept.patch b/target/linux/bcm27xx/patches-6.1/950-0204-media-i2c-Add-a-driver-for-the-Infineon-IRS1125-dept.patch
deleted file mode 100644
index ddd62a9dc4..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0204-media-i2c-Add-a-driver-for-the-Infineon-IRS1125-dept.patch
+++ /dev/null
@@ -1,1231 +0,0 @@
-From 9b1cd7fac64f53d070154fd6440ace60f6cfeab0 Mon Sep 17 00:00:00 2001
-From: Markus Proeller <markus.proeller@pieye.org>
-Date: Thu, 10 Oct 2019 19:12:36 +0200
-Subject: [PATCH] media: i2c: Add a driver for the Infineon IRS1125
- depth sensor
-
-The Infineon IRS1125 is a time of flight depth sensor that
-has a CSI-2 interface.
-
-Add a V4L2 subdevice driver for this device.
-
-Signed-off-by: Markus Proeller <markus.proeller@pieye.org>
----
- drivers/media/i2c/Kconfig   |   12 +
- drivers/media/i2c/Makefile  |    1 +
- drivers/media/i2c/irs1125.c | 1112 +++++++++++++++++++++++++++++++++++
- drivers/media/i2c/irs1125.h |   61 ++
- 4 files changed, 1186 insertions(+)
- create mode 100644 drivers/media/i2c/irs1125.c
- create mode 100644 drivers/media/i2c/irs1125.h
-
---- a/drivers/media/i2c/Kconfig
-+++ b/drivers/media/i2c/Kconfig
-@@ -1373,6 +1373,18 @@ config VIDEO_TW9910
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called tw9910.
- 
-+config VIDEO_IRS1125
-+	tristate "Infineon IRS1125 sensor support"
-+	depends on I2C && VIDEO_DEV && VIDEO_V4L2_SUBDEV_API
-+	depends on MEDIA_CAMERA_SUPPORT
-+	select V4L2_FWNODE
-+	help
-+	  This is a Video4Linux2 sensor-level driver for the Infineon
-+	  IRS1125 camera.
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called irs1125.
-+
- config VIDEO_VPX3220
- 	tristate "vpx3220a, vpx3216b & vpx3214c video decoders"
- 	depends on VIDEO_DEV && I2C
---- a/drivers/media/i2c/Makefile
-+++ b/drivers/media/i2c/Makefile
-@@ -51,6 +51,7 @@ obj-$(CONFIG_VIDEO_IMX412) += imx412.o
- obj-$(CONFIG_VIDEO_IMX477) += imx477.o
- obj-$(CONFIG_VIDEO_IMX519) += imx519.o
- obj-$(CONFIG_VIDEO_IR_I2C) += ir-kbd-i2c.o
-+obj-$(CONFIG_VIDEO_IRS1125) += irs1125.o
- obj-$(CONFIG_VIDEO_ISL7998X) += isl7998x.o
- obj-$(CONFIG_VIDEO_KS0127) += ks0127.o
- obj-$(CONFIG_VIDEO_LM3560) += lm3560.o
---- /dev/null
-+++ b/drivers/media/i2c/irs1125.c
-@@ -0,0 +1,1112 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * A V4L2 driver for Infineon IRS1125 TOF cameras.
-+ * Copyright (C) 2018, pieye GmbH
-+ *
-+ * Based on V4L2 OmniVision OV5647 Image Sensor driver
-+ * Copyright (C) 2016 Ramiro Oliveira <roliveir@synopsys.com>
-+ *
-+ * DT / fwnode changes, and GPIO control taken from ov5640.c
-+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
-+ * Copyright (C) 2014-2017 Mentor Graphics Inc.
-+ *
-+ */
-+
-+#include "irs1125.h"
-+#include <linux/clk.h>
-+#include <linux/delay.h>
-+#include <linux/gpio/consumer.h>
-+#include <linux/i2c.h>
-+#include <linux/init.h>
-+#include <linux/io.h>
-+#include <linux/module.h>
-+#include <linux/of_graph.h>
-+#include <linux/slab.h>
-+#include <linux/videodev2.h>
-+#include <linux/firmware.h>
-+#include <media/v4l2-device.h>
-+#include <media/v4l2-fwnode.h>
-+#include <media/v4l2-image-sizes.h>
-+#include <media/v4l2-mediabus.h>
-+#include <media/v4l2-ctrls.h>
-+
-+#define CHECK_BIT(val, pos) ((val) & BIT(pos))
-+
-+#define SENSOR_NAME "irs1125"
-+
-+#define RESET_ACTIVE_DELAY_MS	 20
-+
-+#define IRS1125_ALTERNATE_FW "irs1125_af.bin"
-+
-+#define IRS1125_REG_CSICFG       0xA882
-+#define IRS1125_REG_DESIGN_STEP	 0xB0AD
-+#define IRS1125_REG_EFUSEVAL2	 0xB09F
-+#define IRS1125_REG_EFUSEVAL3	 0xB0A0
-+#define IRS1125_REG_EFUSEVAL4	 0xB0A1
-+#define IRS1125_REG_DMEM_SHADOW	 0xC320
-+
-+#define IRS1125_DESIGN_STEP_EXPECTED 0x0a12
-+
-+#define IRS1125_ROW_START_DEF		0
-+#define IRS1125_COLUMN_START_DEF	0
-+#define IRS1125_WINDOW_HEIGHT_DEF	 288
-+#define IRS1125_WINDOW_WIDTH_DEF	352
-+
-+struct regval_list {
-+	u16 addr;
-+	u16 data;
-+};
-+
-+struct irs1125 {
-+	struct v4l2_subdev sd;
-+	struct media_pad pad;
-+	/* the parsed DT endpoint info */
-+	struct v4l2_fwnode_endpoint ep;
-+
-+	struct clk *xclk;
-+	struct v4l2_ctrl_handler ctrl_handler;
-+
-+	/* To serialize asynchronus callbacks */
-+	struct mutex lock;
-+
-+	/* image data layout */
-+	unsigned int num_seq;
-+
-+	/* reset pin */
-+	struct gpio_desc *reset;
-+
-+	/* V4l2 Controls to grab */
-+	struct v4l2_ctrl *ctrl_modplls;
-+	struct v4l2_ctrl *ctrl_numseq;
-+
-+	int power_count;
-+};
-+
-+static inline struct irs1125 *to_state(struct v4l2_subdev *sd)
-+{
-+	return container_of(sd, struct irs1125, sd);
-+}
-+
-+static struct regval_list irs1125_26MHz[] = {
-+	{0xB017, 0x0413},
-+	{0xB086, 0x3535},
-+	{0xB0AE, 0xEF02},
-+	{0xA000, 0x0004},
-+	{0xFFFF, 100},
-+
-+	{0xB062, 0x6383},
-+	{0xB063, 0x55A8},
-+	{0xB068, 0x7628},
-+	{0xB069, 0x03E2},
-+
-+	{0xFFFF, 100},
-+	{0xB05A, 0x01C5},
-+	{0xB05C, 0x0206},
-+	{0xB05D, 0x01C5},
-+	{0xB05F, 0x0206},
-+	{0xB016, 0x1335},
-+	{0xFFFF, 100},
-+	{0xA893, 0x8261},
-+	{0xA894, 0x89d8},
-+	{0xA895, 0x131d},
-+	{0xA896, 0x4251},
-+	{0xA897, 0x9D8A},
-+	{0xA898, 0x0BD8},
-+	{0xA899, 0x2245},
-+	{0xA89A, 0xAB9B},
-+	{0xA89B, 0x03B9},
-+	{0xA89C, 0x8041},
-+	{0xA89D, 0xE07E},
-+	{0xA89E, 0x0307},
-+	{0xFFFF, 100},
-+	{0xA88D, 0x0004},
-+	{0xA800, 0x0E68},
-+	{0xA801, 0x0000},
-+	{0xA802, 0x000C},
-+	{0xA803, 0x0000},
-+	{0xA804, 0x0E68},
-+	{0xA805, 0x0000},
-+	{0xA806, 0x0440},
-+	{0xA807, 0x0000},
-+	{0xA808, 0x0E68},
-+	{0xA809, 0x0000},
-+	{0xA80A, 0x0884},
-+	{0xA80B, 0x0000},
-+	{0xA80C, 0x0E68},
-+	{0xA80D, 0x0000},
-+	{0xA80E, 0x0CC8},
-+	{0xA80F, 0x0000},
-+	{0xA810, 0x0E68},
-+	{0xA811, 0x0000},
-+	{0xA812, 0x2000},
-+	{0xA813, 0x0000},
-+	{0xA882, 0x0081},
-+	{0xA88C, 0x403A},
-+	{0xA88F, 0x031E},
-+	{0xA892, 0x0351},
-+	{0x9813, 0x13FF},
-+	{0x981B, 0x7608},
-+
-+	{0xB008, 0x0000},
-+	{0xB015, 0x1513},
-+
-+	{0xFFFF, 100}
-+};
-+
-+static struct regval_list irs1125_seq_cfg[] = {
-+	{0xC3A0, 0x823D},
-+	{0xC3A1, 0xB13B},
-+	{0xC3A2, 0x0313},
-+	{0xC3A3, 0x4659},
-+	{0xC3A4, 0xC4EC},
-+	{0xC3A5, 0x03CE},
-+	{0xC3A6, 0x4259},
-+	{0xC3A7, 0xC4EC},
-+	{0xC3A8, 0x03CE},
-+	{0xC3A9, 0x8839},
-+	{0xC3AA, 0x89D8},
-+	{0xC3AB, 0x031D},
-+
-+	{0xC24C, 0x5529},
-+	{0xC24D, 0x0000},
-+	{0xC24E, 0x1200},
-+	{0xC24F, 0x6CB2},
-+	{0xC250, 0x0000},
-+	{0xC251, 0x5529},
-+	{0xC252, 0x42F4},
-+	{0xC253, 0xD1AF},
-+	{0xC254, 0x8A18},
-+	{0xC255, 0x0002},
-+	{0xC256, 0x5529},
-+	{0xC257, 0x6276},
-+	{0xC258, 0x11A7},
-+	{0xC259, 0xD907},
-+	{0xC25A, 0x0000},
-+	{0xC25B, 0x5529},
-+	{0xC25C, 0x07E0},
-+	{0xC25D, 0x7BFE},
-+	{0xC25E, 0x6402},
-+	{0xC25F, 0x0019},
-+
-+	{0xC3AC, 0x0007},
-+	{0xC3AD, 0xED88},
-+	{0xC320, 0x003E},
-+	{0xC321, 0x0000},
-+	{0xC322, 0x2000},
-+	{0xC323, 0x0000},
-+	{0xC324, 0x0271},
-+	{0xC325, 0x0000},
-+	{0xC326, 0x000C},
-+	{0xC327, 0x0000},
-+	{0xC328, 0x0271},
-+	{0xC329, 0x0000},
-+	{0xC32A, 0x0440},
-+	{0xC32B, 0x0000},
-+	{0xC32C, 0x0271},
-+	{0xC32D, 0x0000},
-+	{0xC32E, 0x0884},
-+	{0xC32F, 0x0000},
-+	{0xC330, 0x0271},
-+	{0xC331, 0x0000},
-+	{0xC332, 0x0CC8},
-+	{0xC333, 0x0000},
-+	{0xA88D, 0x0004},
-+
-+	{0xA890, 0x0000},
-+	{0xC219, 0x0002},
-+	{0xC21A, 0x0000},
-+	{0xC21B, 0x0000},
-+	{0xC21C, 0x00CD},
-+	{0xC21D, 0x0009},
-+	{0xC21E, 0x00CD},
-+	{0xC21F, 0x0009},
-+
-+	{0xA87C, 0x0000},
-+	{0xC032, 0x0001},
-+	{0xC034, 0x0000},
-+	{0xC035, 0x0001},
-+	{0xC039, 0x0000},
-+	{0xC401, 0x0002},
-+
-+	{0xFFFF, 1},
-+	{0xA87C, 0x0001}
-+};
-+
-+static int irs1125_write(struct v4l2_subdev *sd, u16 reg, u16 val)
-+{
-+	int ret;
-+	unsigned char data[4] = { reg >> 8, reg & 0xff, val >> 8, val & 0xff};
-+	struct i2c_client *client = v4l2_get_subdevdata(sd);
-+
-+	ret = i2c_master_send(client, data, 4);
-+	if (ret < 0)
-+		dev_err(&client->dev, "%s: i2c write error, reg: %x\n",
-+			__func__, reg);
-+
-+	return ret;
-+}
-+
-+static int irs1125_read(struct v4l2_subdev *sd, u16 reg, u16 *val)
-+{
-+	int ret;
-+	unsigned char data_w[2] = { reg >> 8, reg & 0xff };
-+	char rdval[2];
-+
-+	struct i2c_client *client = v4l2_get_subdevdata(sd);
-+
-+	ret = i2c_master_send(client, data_w, 2);
-+	if (ret < 0) {
-+		dev_dbg(&client->dev, "%s: i2c write error, reg: %x\n",
-+			__func__, reg);
-+		return ret;
-+	}
-+
-+	ret = i2c_master_recv(client, rdval, 2);
-+	if (ret < 0)
-+		dev_err(&client->dev, "%s: i2c read error, reg: %x\n",
-+			__func__, reg);
-+
-+	*val = rdval[1] | (rdval[0] << 8);
-+
-+	return ret;
-+}
-+
-+static int irs1125_write_array(struct v4l2_subdev *sd,
-+			       struct regval_list *regs, int array_size)
-+{
-+	int i, ret;
-+
-+	for (i = 0; i < array_size; i++) {
-+		if (regs[i].addr == 0xFFFF) {
-+			msleep(regs[i].data);
-+		} else {
-+			ret = irs1125_write(sd, regs[i].addr, regs[i].data);
-+			if (ret < 0)
-+				return ret;
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+static int irs1125_stream_on(struct v4l2_subdev *sd)
-+{
-+	int ret;
-+	struct irs1125 *irs1125 = to_state(sd);
-+	struct i2c_client *client = v4l2_get_subdevdata(sd);
-+
-+	v4l2_ctrl_grab(irs1125->ctrl_numseq, 1);
-+	v4l2_ctrl_grab(irs1125->ctrl_modplls, 1);
-+
-+	ret = irs1125_write(sd, 0xC400, 0x0001);
-+	if (ret < 0) {
-+		dev_err(&client->dev, "error enabling firmware: %d", ret);
-+		return ret;
-+	}
-+
-+	msleep(100);
-+
-+	return irs1125_write(sd, 0xA87C, 0x0001);
-+}
-+
-+static int irs1125_stream_off(struct v4l2_subdev *sd)
-+{
-+	int ret;
-+	struct irs1125 *irs1125 = to_state(sd);
-+	struct i2c_client *client = v4l2_get_subdevdata(sd);
-+
-+	v4l2_ctrl_grab(irs1125->ctrl_numseq, 0);
-+	v4l2_ctrl_grab(irs1125->ctrl_modplls, 0);
-+
-+	ret = irs1125_write(sd, 0xA87C, 0x0000);
-+	if (ret < 0) {
-+		dev_err(&client->dev, "error disabling trigger: %d", ret);
-+		return ret;
-+	}
-+
-+	msleep(100);
-+
-+	return irs1125_write(sd, 0xC400, 0x0002);
-+}
-+
-+static int __sensor_init(struct v4l2_subdev *sd)
-+{
-+	unsigned int cnt, idx;
-+	int ret;
-+	u16 val;
-+	struct i2c_client *client = v4l2_get_subdevdata(sd);
-+	struct irs1125 *irs1125 = to_state(sd);
-+	const struct firmware *fw;
-+	struct regval_list *reg_data;
-+
-+	cnt = 0;
-+	while (1) {
-+		ret = irs1125_read(sd, 0xC40F, &val);
-+		if (ret < 0) {
-+			dev_err(&client->dev, "read register 0xC40F failed\n");
-+			return ret;
-+		}
-+		if (CHECK_BIT(val, 14) == 0)
-+			break;
-+
-+		if (cnt >= 5) {
-+			dev_err(&client->dev, "timeout waiting for 0xC40F\n");
-+			return -EAGAIN;
-+		}
-+
-+		cnt++;
-+	}
-+
-+	ret = irs1125_write_array(sd, irs1125_26MHz,
-+				  ARRAY_SIZE(irs1125_26MHz));
-+	if (ret < 0) {
-+		dev_err(&client->dev, "write sensor default regs error\n");
-+		return ret;
-+	}
-+
-+	/* set CSI-2 number of data lanes */
-+	if (irs1125->ep.bus.mipi_csi2.num_data_lanes == 1) {
-+		val = 0x0001;
-+	} else if (irs1125->ep.bus.mipi_csi2.num_data_lanes == 2) {
-+		val = 0x0081;
-+	} else {
-+		dev_err(&client->dev, "invalid number of data lanes %d\n",
-+			irs1125->ep.bus.mipi_csi2.num_data_lanes);
-+		return -EINVAL;
-+	}
-+
-+	ret = irs1125_write(sd, IRS1125_REG_CSICFG, val);
-+	if (ret < 0) {
-+		dev_err(&client->dev, "write sensor csi2 config error\n");
-+		return ret;
-+	}
-+
-+	/* request the firmware, this will block and timeout */
-+	ret = request_firmware(&fw, IRS1125_ALTERNATE_FW, &client->dev);
-+	if (ret) {
-+		dev_err(&client->dev,
-+			"did not find the firmware file '%s' (status %d)\n",
-+			IRS1125_ALTERNATE_FW, ret);
-+		return ret;
-+	}
-+
-+	if (fw->size % 4) {
-+		dev_err(&client->dev, "firmware file '%s' invalid\n",
-+			IRS1125_ALTERNATE_FW);
-+		release_firmware(fw);
-+		return -EINVAL;
-+	}
-+
-+	for (idx = 0; idx < fw->size; idx += 4)	{
-+		reg_data = (struct regval_list *)&fw->data[idx];
-+		ret = irs1125_write(sd, reg_data->addr, reg_data->data);
-+		if (ret < 0) {
-+			dev_err(&client->dev, "firmware write error\n");
-+			release_firmware(fw);
-+			return ret;
-+		}
-+	}
-+	release_firmware(fw);
-+
-+	ret = irs1125_write_array(sd, irs1125_seq_cfg,
-+				  ARRAY_SIZE(irs1125_seq_cfg));
-+	if (ret < 0) {
-+		dev_err(&client->dev, "write default sequence failed\n");
-+		return ret;
-+	}
-+
-+	return 0;
-+}
-+
-+static int irs1125_sensor_power(struct v4l2_subdev *sd, int on)
-+{
-+	int ret = 0;
-+	struct irs1125 *irs1125 = to_state(sd);
-+	struct i2c_client *client = v4l2_get_subdevdata(sd);
-+
-+	mutex_lock(&irs1125->lock);
-+
-+	if (on && !irs1125->power_count) {
-+		gpiod_set_value_cansleep(irs1125->reset, 1);
-+		msleep(RESET_ACTIVE_DELAY_MS);
-+
-+		ret = clk_prepare_enable(irs1125->xclk);
-+		if (ret < 0) {
-+			dev_err(&client->dev, "clk prepare enable failed\n");
-+			goto out;
-+		}
-+
-+		ret = __sensor_init(sd);
-+		if (ret < 0) {
-+			clk_disable_unprepare(irs1125->xclk);
-+			dev_err(&client->dev,
-+				"Camera not available, check Power\n");
-+			goto out;
-+		}
-+	} else if (!on && irs1125->power_count == 1) {
-+		gpiod_set_value_cansleep(irs1125->reset, 0);
-+	}
-+
-+	/* Update the power count. */
-+	irs1125->power_count += on ? 1 : -1;
-+	WARN_ON(irs1125->power_count < 0);
-+
-+out:
-+	mutex_unlock(&irs1125->lock);
-+
-+	return ret;
-+}
-+
-+#ifdef CONFIG_VIDEO_ADV_DEBUG
-+static int irs1125_sensor_get_register(struct v4l2_subdev *sd,
-+				       struct v4l2_dbg_register *reg)
-+{
-+	u16 val;
-+	int ret;
-+
-+	ret = irs1125_read(sd, reg->reg & 0xffff, &val);
-+	if (ret < 0)
-+		return ret;
-+
-+	reg->val = val;
-+	reg->size = 1;
-+
-+	return 0;
-+}
-+
-+static int irs1125_sensor_set_register(struct v4l2_subdev *sd,
-+				       const struct v4l2_dbg_register *reg)
-+{
-+	return irs1125_write(sd, reg->reg & 0xffff, reg->val & 0xffff);
-+}
-+#endif
-+
-+static const struct v4l2_subdev_core_ops irs1125_subdev_core_ops = {
-+	.s_power = irs1125_sensor_power,
-+#ifdef CONFIG_VIDEO_ADV_DEBUG
-+	.g_register = irs1125_sensor_get_register,
-+	.s_register = irs1125_sensor_set_register,
-+#endif
-+};
-+
-+static int irs1125_s_stream(struct v4l2_subdev *sd, int enable)
-+{
-+	if (enable)
-+		return irs1125_stream_on(sd);
-+	else
-+		return irs1125_stream_off(sd);
-+}
-+
-+static const struct v4l2_subdev_video_ops irs1125_subdev_video_ops = {
-+	.s_stream = irs1125_s_stream,
-+};
-+
-+static int irs1125_enum_mbus_code(struct v4l2_subdev *sd,
-+				  struct v4l2_subdev_pad_config *cfg,
-+	struct v4l2_subdev_mbus_code_enum *code)
-+{
-+	if (code->index > 0)
-+		return -EINVAL;
-+
-+	code->code = MEDIA_BUS_FMT_Y12_1X12;
-+
-+	return 0;
-+}
-+
-+static int irs1125_set_get_fmt(struct v4l2_subdev *sd,
-+			       struct v4l2_subdev_pad_config *cfg,
-+			       struct v4l2_subdev_format *format)
-+{
-+	struct v4l2_mbus_framefmt *fmt = &format->format;
-+	struct irs1125 *irs1125 = to_state(sd);
-+
-+	if (format->pad != 0)
-+		return -EINVAL;
-+
-+	/* Only one format is supported, so return that */
-+	memset(fmt, 0, sizeof(*fmt));
-+	fmt->code = MEDIA_BUS_FMT_Y12_1X12;
-+	fmt->colorspace = V4L2_COLORSPACE_RAW;
-+	fmt->field = V4L2_FIELD_NONE;
-+	fmt->width = IRS1125_WINDOW_WIDTH_DEF;
-+	fmt->height = IRS1125_WINDOW_HEIGHT_DEF * irs1125->num_seq;
-+
-+	return 0;
-+}
-+
-+static const struct v4l2_subdev_pad_ops irs1125_subdev_pad_ops = {
-+	.enum_mbus_code = irs1125_enum_mbus_code,
-+	.set_fmt = irs1125_set_get_fmt,
-+	.get_fmt = irs1125_set_get_fmt,
-+};
-+
-+static const struct v4l2_subdev_ops irs1125_subdev_ops = {
-+	.core = &irs1125_subdev_core_ops,
-+	.video = &irs1125_subdev_video_ops,
-+	.pad = &irs1125_subdev_pad_ops,
-+};
-+
-+static int irs1125_s_ctrl(struct v4l2_ctrl *ctrl)
-+{
-+	struct irs1125 *dev = container_of(ctrl->handler,
-+					struct irs1125, ctrl_handler);
-+	struct i2c_client *client = v4l2_get_subdevdata(&dev->sd);
-+	int err, i;
-+	struct irs1125_mod_pll *mod_cur, *mod_new;
-+	struct irs1125_seq_cfg *cfg_cur, *cfg_new;
-+	u16 addr, val;
-+
-+	err = 0;
-+
-+	switch (ctrl->id) {
-+	case IRS1125_CID_SAFE_RECONFIG:
-+	{
-+		struct irs1125_illu *illu_cur, *illu_new;
-+
-+		illu_new = (struct irs1125_illu *)ctrl->p_new.p;
-+		illu_cur = (struct irs1125_illu *)ctrl->p_cur.p;
-+		for (i = 0; i < IRS1125_NUM_SEQ_ENTRIES; i++) {
-+			if (illu_cur[i].exposure != illu_new[i].exposure) {
-+				addr = 0xA850 + i * 2;
-+				val = illu_new[i].exposure;
-+				err = irs1125_write(&dev->sd, addr, val);
-+				if (err < 0)
-+					break;
-+			}
-+			if (illu_cur[i].framerate != illu_new[i].framerate) {
-+				addr = 0xA851 + i * 2;
-+				val = illu_new[i].framerate;
-+				err = irs1125_write(&dev->sd, addr, val);
-+				if (err < 0)
-+					break;
-+			}
-+		}
-+		break;
-+	}
-+	case IRS1125_CID_MOD_PLL:
-+		mod_new = (struct irs1125_mod_pll *)ctrl->p_new.p;
-+		mod_cur = (struct irs1125_mod_pll *)ctrl->p_cur.p;
-+		for (i = 0; i < IRS1125_NUM_MOD_PLLS; i++) {
-+			if (mod_cur[i].pllcfg1 != mod_new[i].pllcfg1) {
-+				addr = 0xC3A0 + i * 3;
-+				val = mod_new[i].pllcfg1;
-+				err = irs1125_write(&dev->sd, addr, val);
-+				if (err < 0)
-+					break;
-+			}
-+			if (mod_cur[i].pllcfg2 != mod_new[i].pllcfg2) {
-+				addr = 0xC3A1 + i * 3;
-+				val = mod_new[i].pllcfg2;
-+				err = irs1125_write(&dev->sd, addr, val);
-+				if (err < 0)
-+					break;
-+			}
-+			if (mod_cur[i].pllcfg3 != mod_new[i].pllcfg3) {
-+				addr = 0xC3A2 + i * 3;
-+				val = mod_new[i].pllcfg3;
-+				err = irs1125_write(&dev->sd, addr, val);
-+				if (err < 0)
-+					break;
-+			}
-+			if (mod_cur[i].pllcfg4 != mod_new[i].pllcfg4) {
-+				addr = 0xC24C + i * 5;
-+				val = mod_new[i].pllcfg4;
-+				err = irs1125_write(&dev->sd, addr, val);
-+				if (err < 0)
-+					break;
-+			}
-+			if (mod_cur[i].pllcfg5 != mod_new[i].pllcfg5) {
-+				addr = 0xC24D + i * 5;
-+				val = mod_new[i].pllcfg5;
-+				err = irs1125_write(&dev->sd, addr, val);
-+				if (err < 0)
-+					break;
-+			}
-+			if (mod_cur[i].pllcfg6 != mod_new[i].pllcfg6) {
-+				addr = 0xC24E + i * 5;
-+				val = mod_new[i].pllcfg6;
-+				err = irs1125_write(&dev->sd, addr, val);
-+				if (err < 0)
-+					break;
-+			}
-+			if (mod_cur[i].pllcfg7 != mod_new[i].pllcfg7) {
-+				addr = 0xC24F + i * 5;
-+				val = mod_new[i].pllcfg7;
-+				err = irs1125_write(&dev->sd, addr, val);
-+				if (err < 0)
-+					break;
-+			}
-+			if (mod_cur[i].pllcfg8 != mod_new[i].pllcfg8) {
-+				addr = 0xC250 + i * 5;
-+				val = mod_new[i].pllcfg8;
-+				err = irs1125_write(&dev->sd, addr, val);
-+				if (err < 0)
-+					break;
-+			}
-+		}
-+		break;
-+	case IRS1125_CID_SEQ_CONFIG:
-+		cfg_new = (struct irs1125_seq_cfg *)ctrl->p_new.p;
-+		cfg_cur = (struct irs1125_seq_cfg *)ctrl->p_cur.p;
-+		for (i = 0; i < IRS1125_NUM_SEQ_ENTRIES; i++) {
-+			if (cfg_cur[i].exposure != cfg_new[i].exposure)	{
-+				addr = IRS1125_REG_DMEM_SHADOW + i * 4;
-+				val = cfg_new[i].exposure;
-+				err = irs1125_write(&dev->sd, addr, val);
-+				if (err < 0)
-+					break;
-+			}
-+			if (cfg_cur[i].framerate != cfg_new[i].framerate) {
-+				addr = IRS1125_REG_DMEM_SHADOW + 1 + i * 4;
-+				val = cfg_new[i].framerate;
-+				err = irs1125_write(&dev->sd, addr, val);
-+				if (err < 0)
-+					break;
-+			}
-+			if (cfg_cur[i].ps != cfg_new[i].ps) {
-+				addr = IRS1125_REG_DMEM_SHADOW + 2 + i * 4;
-+				val = cfg_new[i].ps;
-+				err = irs1125_write(&dev->sd, addr, val);
-+				if (err < 0)
-+					break;
-+			}
-+			if (cfg_cur[i].pll != cfg_new[i].pll) {
-+				addr = IRS1125_REG_DMEM_SHADOW + 3 + i * 4;
-+				val = cfg_new[i].pll;
-+				err = irs1125_write(&dev->sd, addr, val);
-+				if (err < 0)
-+					break;
-+			}
-+		}
-+		break;
-+	case IRS1125_CID_NUM_SEQS:
-+		err = irs1125_write(&dev->sd, 0xA88D, ctrl->val - 1);
-+		if (err >= 0)
-+			dev->num_seq = ctrl->val;
-+		break;
-+	case IRS1125_CID_CONTINUOUS_TRIG:
-+		if (ctrl->val == 0)
-+			err = irs1125_write(&dev->sd, 0xA87C, 0);
-+		else
-+			err = irs1125_write(&dev->sd, 0xA87C, 1);
-+		break;
-+	case IRS1125_CID_TRIGGER:
-+		if (ctrl->val != 0) {
-+			err = irs1125_write(&dev->sd, 0xA87C, 1);
-+			if (err >= 0)
-+				err = irs1125_write(&dev->sd, 0xA87C, 0);
-+		}
-+		break;
-+	case IRS1125_CID_RECONFIG:
-+		if (ctrl->val != 0)
-+			err = irs1125_write(&dev->sd, 0xA87A, 1);
-+		break;
-+	case IRS1125_CID_ILLU_ON:
-+		if (ctrl->val == 0)
-+			err = irs1125_write(&dev->sd, 0xA892, 0x377);
-+		else
-+			err = irs1125_write(&dev->sd, 0xA892, 0x355);
-+		break;
-+	default:
-+		break;
-+	}
-+
-+	if (err < 0)
-+		dev_err(&client->dev, "Error executing control ID: %d, val %d, err %d",
-+			ctrl->id, ctrl->val, err);
-+	else
-+		err = 0;
-+
-+	return err;
-+}
-+
-+static const struct v4l2_ctrl_ops irs1125_ctrl_ops = {
-+	.s_ctrl = irs1125_s_ctrl,
-+};
-+
-+static const struct v4l2_ctrl_config irs1125_custom_ctrls[] = {
-+	{
-+		.ops = &irs1125_ctrl_ops,
-+		.id = IRS1125_CID_NUM_SEQS,
-+		.name = "Change number of sequences",
-+		.type = V4L2_CTRL_TYPE_INTEGER,
-+		.flags = V4L2_CTRL_FLAG_MODIFY_LAYOUT,
-+		.min = 1,
-+		.max = 20,
-+		.step = 1,
-+		.def = 5,
-+	}, {
-+		.ops = &irs1125_ctrl_ops,
-+		.id = IRS1125_CID_MOD_PLL,
-+		.name = "Reconfigure modulation PLLs",
-+		.type = V4L2_CTRL_TYPE_U16,
-+		.flags = V4L2_CTRL_FLAG_HAS_PAYLOAD,
-+		.min = 0,
-+		.max = U16_MAX,
-+		.step = 1,
-+		.def = 0,
-+		.elem_size = sizeof(u16),
-+		.dims = {sizeof(struct irs1125_mod_pll) / sizeof(u16),
-+			IRS1125_NUM_MOD_PLLS}
-+	}, {
-+		.ops = &irs1125_ctrl_ops,
-+		.id = IRS1125_CID_SAFE_RECONFIG,
-+		.name = "Change exposure and pause of single seq",
-+		.type = V4L2_CTRL_TYPE_U16,
-+		.flags = V4L2_CTRL_FLAG_HAS_PAYLOAD,
-+		.min = 0,
-+		.max = U16_MAX,
-+		.step = 1,
-+		.def = 0,
-+		.elem_size = sizeof(u16),
-+		.dims = {sizeof(struct irs1125_illu) / sizeof(u16),
-+			IRS1125_NUM_SEQ_ENTRIES}
-+	}, {
-+		.ops = &irs1125_ctrl_ops,
-+		.id = IRS1125_CID_SEQ_CONFIG,
-+		.name = "Change sequence settings",
-+		.type = V4L2_CTRL_TYPE_U16,
-+		.flags = V4L2_CTRL_FLAG_HAS_PAYLOAD,
-+		.min = 0,
-+		.max = U16_MAX,
-+		.step = 1,
-+		.def = 0,
-+		.elem_size = sizeof(u16),
-+		.dims = {sizeof(struct irs1125_seq_cfg) / sizeof(u16),
-+			IRS1125_NUM_SEQ_ENTRIES}
-+	}, {
-+		.ops = &irs1125_ctrl_ops,
-+		.id = IRS1125_CID_CONTINUOUS_TRIG,
-+		.name = "Enable/disable continuous trigger",
-+		.type = V4L2_CTRL_TYPE_BOOLEAN,
-+		.flags = V4L2_CTRL_FLAG_EXECUTE_ON_WRITE,
-+		.min = 0,
-+		.max = 1,
-+		.step = 1,
-+		.def = 0
-+	}, {
-+		.ops = &irs1125_ctrl_ops,
-+		.id = IRS1125_CID_TRIGGER,
-+		.name = "Capture a single sequence",
-+		.type = V4L2_CTRL_TYPE_BOOLEAN,
-+		.flags = V4L2_CTRL_FLAG_EXECUTE_ON_WRITE,
-+		.min = 0,
-+		.max = 1,
-+		.step = 1,
-+		.def = 0
-+	}, {
-+		.ops = &irs1125_ctrl_ops,
-+		.id = IRS1125_CID_RECONFIG,
-+		.name = "Trigger imager reconfiguration",
-+		.type = V4L2_CTRL_TYPE_BOOLEAN,
-+		.flags = V4L2_CTRL_FLAG_EXECUTE_ON_WRITE,
-+		.min = 0,
-+		.max = 1,
-+		.step = 1,
-+		.def = 0
-+	}, {
-+		.ops = &irs1125_ctrl_ops,
-+		.id = IRS1125_CID_ILLU_ON,
-+		.name = "Turn illu on or off",
-+		.type = V4L2_CTRL_TYPE_BOOLEAN,
-+		.flags = V4L2_CTRL_FLAG_EXECUTE_ON_WRITE,
-+		.min = 0,
-+		.max = 1,
-+		.step = 1,
-+		.def = 1
-+	}, {
-+		.ops = &irs1125_ctrl_ops,
-+		.id = IRS1125_CID_IDENT0,
-+		.name = "Get ident 0 information",
-+		.type = V4L2_CTRL_TYPE_INTEGER,
-+		.flags = V4L2_CTRL_FLAG_READ_ONLY,
-+		.min = S32_MIN,
-+		.max = S32_MAX,
-+		.step = 1,
-+		.def = 0
-+	}, {
-+		.ops = &irs1125_ctrl_ops,
-+		.id = IRS1125_CID_IDENT1,
-+		.name = "Get ident 1 information",
-+		.type = V4L2_CTRL_TYPE_INTEGER,
-+		.flags = V4L2_CTRL_FLAG_READ_ONLY,
-+		.min = S32_MIN,
-+		.max = S32_MAX,
-+		.step = 1,
-+		.def = 0
-+	}, {
-+		.ops = &irs1125_ctrl_ops,
-+		.id = IRS1125_CID_IDENT2,
-+		.name = "Get ident 2 information",
-+		.type = V4L2_CTRL_TYPE_INTEGER,
-+		.flags = V4L2_CTRL_FLAG_READ_ONLY,
-+		.min = S32_MIN,
-+		.max = S32_MAX,
-+		.step = 1,
-+		.def = 0
-+	}
-+};
-+
-+static int irs1125_detect(struct v4l2_subdev *sd)
-+{
-+	u16 read;
-+	int ret;
-+	struct i2c_client *client = v4l2_get_subdevdata(sd);
-+
-+	ret = irs1125_read(sd, IRS1125_REG_DESIGN_STEP, &read);
-+	if (ret < 0) {
-+		dev_err(&client->dev, "error reading from i2c\n");
-+		return ret;
-+	}
-+
-+	if (read != IRS1125_DESIGN_STEP_EXPECTED) {
-+		dev_err(&client->dev, "Design step expected 0x%x got 0x%x",
-+			IRS1125_DESIGN_STEP_EXPECTED, read);
-+		return -ENODEV;
-+	}
-+
-+	return 0;
-+}
-+
-+static int irs1125_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
-+{
-+	struct v4l2_mbus_framefmt *format =
-+	v4l2_subdev_get_try_format(sd, fh->pad, 0);
-+
-+	format->code = MEDIA_BUS_FMT_Y12_1X12;
-+	format->width = IRS1125_WINDOW_WIDTH_DEF;
-+	format->height = IRS1125_WINDOW_HEIGHT_DEF;
-+	format->field = V4L2_FIELD_NONE;
-+	format->colorspace = V4L2_COLORSPACE_RAW;
-+
-+	return 0;
-+}
-+
-+static const struct v4l2_subdev_internal_ops irs1125_subdev_internal_ops = {
-+	.open = irs1125_open,
-+};
-+
-+static int irs1125_ctrls_init(struct irs1125 *sensor, struct device *dev)
-+{
-+	struct v4l2_ctrl *ctrl;
-+	int err, i;
-+	struct v4l2_ctrl_handler *hdl;
-+
-+	hdl = &sensor->ctrl_handler;
-+	v4l2_ctrl_handler_init(hdl, ARRAY_SIZE(irs1125_custom_ctrls));
-+
-+	for (i = 0; i < ARRAY_SIZE(irs1125_custom_ctrls); i++)	{
-+		ctrl = v4l2_ctrl_new_custom(hdl, &irs1125_custom_ctrls[i],
-+					    NULL);
-+		if (!ctrl)
-+			dev_err(dev, "Failed to init custom control %s\n",
-+				irs1125_custom_ctrls[i].name);
-+		else if (irs1125_custom_ctrls[i].id == IRS1125_CID_NUM_SEQS)
-+			sensor->ctrl_numseq = ctrl;
-+		else if (irs1125_custom_ctrls[i].id == IRS1125_CID_MOD_PLL)
-+			sensor->ctrl_modplls = ctrl;
-+	}
-+
-+	if (hdl->error)	{
-+		dev_err(dev, "Error %d adding controls\n", hdl->error);
-+		err = hdl->error;
-+		goto error_ctrls;
-+	}
-+
-+	sensor->sd.ctrl_handler = hdl;
-+	return 0;
-+
-+error_ctrls:
-+	v4l2_ctrl_handler_free(&sensor->ctrl_handler);
-+	return -err;
-+}
-+
-+static int irs1125_ident_setup(struct irs1125 *sensor, struct device *dev)
-+{
-+	int ret;
-+	struct v4l2_ctrl *ctrl;
-+	struct v4l2_subdev *sd;
-+	u16 read;
-+
-+	sd = &sensor->sd;
-+
-+	ctrl = v4l2_ctrl_find(&sensor->ctrl_handler, IRS1125_CID_IDENT0);
-+	if (!ctrl) {
-+		dev_err(dev, "could not find device ctrl.\n");
-+		return -EINVAL;
-+	}
-+
-+	ret = irs1125_read(sd, IRS1125_REG_EFUSEVAL2, &read);
-+	if (ret < 0) {
-+		dev_err(dev, "error reading from i2c\n");
-+		return -EIO;
-+	}
-+
-+	v4l2_ctrl_s_ctrl(ctrl, read);
-+
-+	ctrl = v4l2_ctrl_find(&sensor->ctrl_handler, IRS1125_CID_IDENT1);
-+	if (!ctrl) {
-+		dev_err(dev, "could not find device ctrl.\n");
-+		return -EINVAL;
-+	}
-+
-+	ret = irs1125_read(sd, IRS1125_REG_EFUSEVAL3, &read);
-+	if (ret < 0) {
-+		dev_err(dev, "error reading from i2c\n");
-+		return -EIO;
-+	}
-+
-+	v4l2_ctrl_s_ctrl(ctrl, read);
-+
-+	ctrl = v4l2_ctrl_find(&sensor->ctrl_handler, IRS1125_CID_IDENT2);
-+	if (!ctrl) {
-+		dev_err(dev, "could not find device ctrl.\n");
-+		return -EINVAL;
-+	}
-+
-+	ret = irs1125_read(sd, IRS1125_REG_EFUSEVAL4, &read);
-+	if (ret < 0) {
-+		dev_err(dev, "error reading from i2c\n");
-+		return -EIO;
-+	}
-+	v4l2_ctrl_s_ctrl(ctrl, read & 0xFFFC);
-+
-+	return 0;
-+}
-+
-+static int irs1125_probe(struct i2c_client *client,
-+			 const struct i2c_device_id *id)
-+{
-+	struct device *dev = &client->dev;
-+	struct irs1125 *sensor;
-+	int ret;
-+	struct fwnode_handle *endpoint;
-+	u32 xclk_freq;
-+	int gpio_num;
-+
-+	sensor = devm_kzalloc(dev, sizeof(*sensor), GFP_KERNEL);
-+	if (!sensor)
-+		return -ENOMEM;
-+
-+	v4l2_i2c_subdev_init(&sensor->sd, client, &irs1125_subdev_ops);
-+
-+	/* Get CSI2 bus config */
-+	endpoint = fwnode_graph_get_next_endpoint(dev_fwnode(dev),
-+						  NULL);
-+	if (!endpoint) {
-+		dev_err(dev, "endpoint node not found\n");
-+		return -EINVAL;
-+	}
-+
-+	ret = v4l2_fwnode_endpoint_parse(endpoint, &sensor->ep);
-+	fwnode_handle_put(endpoint);
-+	if (ret) {
-+		dev_err(dev, "Could not parse endpoint\n");
-+		return ret;
-+	}
-+
-+	/* get system clock (xclk) */
-+	sensor->xclk = devm_clk_get(dev, NULL);
-+	if (IS_ERR(sensor->xclk)) {
-+		dev_err(dev, "could not get xclk");
-+		return PTR_ERR(sensor->xclk);
-+	}
-+
-+	xclk_freq = clk_get_rate(sensor->xclk);
-+	if (xclk_freq != 26000000) {
-+		dev_err(dev, "Unsupported clock frequency: %u\n", xclk_freq);
-+		return -EINVAL;
-+	}
-+
-+	sensor->num_seq = 5;
-+
-+	/* Request the power down GPIO */
-+	sensor->reset = devm_gpiod_get(&client->dev, "pwdn",
-+				       GPIOD_OUT_LOW);
-+
-+	if (IS_ERR(sensor->reset)) {
-+		dev_err(dev, "could not get reset");
-+		return PTR_ERR(sensor->reset);
-+	}
-+
-+	gpio_num = desc_to_gpio(sensor->reset);
-+
-+	mutex_init(&sensor->lock);
-+
-+	ret = irs1125_ctrls_init(sensor, dev);
-+	if (ret < 0)
-+		goto mutex_remove;
-+
-+	sensor->sd.internal_ops = &irs1125_subdev_internal_ops;
-+	sensor->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
-+	sensor->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR;
-+	sensor->pad.flags = MEDIA_PAD_FL_SOURCE;
-+	ret = media_entity_pads_init(&sensor->sd.entity, 1, &sensor->pad);
-+	if (ret < 0)
-+		goto mutex_remove;
-+
-+	gpiod_set_value_cansleep(sensor->reset, 1);
-+	msleep(RESET_ACTIVE_DELAY_MS);
-+
-+	ret = irs1125_detect(&sensor->sd);
-+	if (ret < 0)
-+		goto error;
-+
-+	ret = irs1125_ident_setup(sensor, dev);
-+	if (ret < 0)
-+		goto error;
-+
-+	gpiod_set_value_cansleep(sensor->reset, 0);
-+
-+	ret = v4l2_async_register_subdev(&sensor->sd);
-+	if (ret < 0)
-+		goto error;
-+
-+	dev_dbg(dev, "Infineon IRS1125 camera driver probed\n");
-+
-+	return 0;
-+
-+error:
-+	media_entity_cleanup(&sensor->sd.entity);
-+mutex_remove:
-+	mutex_destroy(&sensor->lock);
-+	return ret;
-+}
-+
-+static int irs1125_remove(struct i2c_client *client)
-+{
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct irs1125 *irs1125 = to_state(sd);
-+
-+	v4l2_async_unregister_subdev(&irs1125->sd);
-+	media_entity_cleanup(&irs1125->sd.entity);
-+	v4l2_device_unregister_subdev(sd);
-+	mutex_destroy(&irs1125->lock);
-+	v4l2_ctrl_handler_free(&irs1125->ctrl_handler);
-+
-+	return 0;
-+}
-+
-+#if IS_ENABLED(CONFIG_OF)
-+static const struct of_device_id irs1125_of_match[] = {
-+	{ .compatible = "infineon,irs1125" },
-+	{ /* sentinel */ },
-+};
-+MODULE_DEVICE_TABLE(of, irs1125_of_match);
-+#endif
-+
-+static struct i2c_driver irs1125_driver = {
-+	.driver = {
-+		.of_match_table = of_match_ptr(irs1125_of_match),
-+		.name	 = SENSOR_NAME,
-+	},
-+	.probe		= irs1125_probe,
-+	.remove		= irs1125_remove,
-+};
-+
-+module_i2c_driver(irs1125_driver);
-+
-+MODULE_AUTHOR("Markus Proeller <markus.proeller@pieye.org>");
-+MODULE_DESCRIPTION("Infineon irs1125 sensor driver");
-+MODULE_LICENSE("GPL v2");
-+
---- /dev/null
-+++ b/drivers/media/i2c/irs1125.h
-@@ -0,0 +1,61 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * A V4L2 driver for Infineon IRS1125 TOF cameras.
-+ * Copyright (C) 2018, pieye GmbH
-+ *
-+ * Based on V4L2 OmniVision OV5647 Image Sensor driver
-+ * Copyright (C) 2016 Ramiro Oliveira <roliveir@synopsys.com>
-+ *
-+ * DT / fwnode changes, and GPIO control taken from ov5640.c
-+ * Copyright (C) 2011-2013 Freescale Semiconductor, Inc. All Rights Reserved.
-+ * Copyright (C) 2014-2017 Mentor Graphics Inc.
-+ *
-+ */
-+
-+#ifndef IRS1125_H
-+#define IRS1125_H
-+
-+#include <linux/v4l2-controls.h>
-+#include <linux/types.h>
-+
-+#define IRS1125_NUM_SEQ_ENTRIES 20
-+#define IRS1125_NUM_MOD_PLLS 4
-+
-+#define IRS1125_CID_CUSTOM_BASE        (V4L2_CID_USER_BASE | 0xf000)
-+#define IRS1125_CID_SAFE_RECONFIG      (IRS1125_CID_CUSTOM_BASE + 0)
-+#define IRS1125_CID_CONTINUOUS_TRIG    (IRS1125_CID_CUSTOM_BASE + 1)
-+#define IRS1125_CID_TRIGGER            (IRS1125_CID_CUSTOM_BASE + 2)
-+#define IRS1125_CID_RECONFIG           (IRS1125_CID_CUSTOM_BASE + 3)
-+#define IRS1125_CID_ILLU_ON            (IRS1125_CID_CUSTOM_BASE + 4)
-+#define IRS1125_CID_NUM_SEQS           (IRS1125_CID_CUSTOM_BASE + 5)
-+#define IRS1125_CID_MOD_PLL            (IRS1125_CID_CUSTOM_BASE + 6)
-+#define IRS1125_CID_SEQ_CONFIG         (IRS1125_CID_CUSTOM_BASE + 7)
-+#define IRS1125_CID_IDENT0             (IRS1125_CID_CUSTOM_BASE + 8)
-+#define IRS1125_CID_IDENT1             (IRS1125_CID_CUSTOM_BASE + 9)
-+#define IRS1125_CID_IDENT2             (IRS1125_CID_CUSTOM_BASE + 10)
-+
-+struct irs1125_seq_cfg {
-+	__u16 exposure;
-+	__u16 framerate;
-+	__u16 ps;
-+	__u16 pll;
-+};
-+
-+struct irs1125_illu {
-+	__u16 exposure;
-+	__u16 framerate;
-+};
-+
-+struct irs1125_mod_pll {
-+	__u16 pllcfg1;
-+	__u16 pllcfg2;
-+	__u16 pllcfg3;
-+	__u16 pllcfg4;
-+	__u16 pllcfg5;
-+	__u16 pllcfg6;
-+	__u16 pllcfg7;
-+	__u16 pllcfg8;
-+};
-+
-+#endif /* IRS1125 */
-+
diff --git a/target/linux/bcm27xx/patches-6.1/950-0205-drm-v3d-Suppress-all-but-the-first-MMU-error.patch b/target/linux/bcm27xx/patches-6.1/950-0205-drm-v3d-Suppress-all-but-the-first-MMU-error.patch
deleted file mode 100644
index ef061c9d29..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0205-drm-v3d-Suppress-all-but-the-first-MMU-error.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From a2bd77e0c5e69ebfbacd3fef2e586305bb2733ff Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Mon, 11 Nov 2019 20:18:08 +0000
-Subject: [PATCH] drm/v3d: Suppress all but the first MMU error
-
-The v3d driver currently encounters a lot of MMU PTE exceptions, so
-only log the first to avoid swamping the kernel log.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- drivers/gpu/drm/v3d/v3d_irq.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/gpu/drm/v3d/v3d_irq.c
-+++ b/drivers/gpu/drm/v3d/v3d_irq.c
-@@ -177,6 +177,7 @@ v3d_hub_irq(int irq, void *arg)
- 			"GMP",
- 		};
- 		const char *client = "?";
-+		static int logged_error;
- 
- 		V3D_WRITE(V3D_MMU_CTL, V3D_READ(V3D_MMU_CTL));
- 
-@@ -186,6 +187,7 @@ v3d_hub_irq(int irq, void *arg)
- 				client = v3d41_axi_ids[axi_id];
- 		}
- 
-+		if (!logged_error)
- 		dev_err(v3d->drm.dev, "MMU error from client %s (%d) at 0x%llx%s%s%s\n",
- 			client, axi_id, (long long)vio_addr,
- 			((intsts & V3D_HUB_INT_MMU_WRV) ?
-@@ -194,6 +196,7 @@ v3d_hub_irq(int irq, void *arg)
- 			 ", pte invalid" : ""),
- 			((intsts & V3D_HUB_INT_MMU_CAP) ?
- 			 ", cap exceeded" : ""));
-+		logged_error = 1;
- 		status = IRQ_HANDLED;
- 	}
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0206-drm-v3d-Plug-dma_fence-leak.patch b/target/linux/bcm27xx/patches-6.1/950-0206-drm-v3d-Plug-dma_fence-leak.patch
deleted file mode 100644
index 022a33fb28..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0206-drm-v3d-Plug-dma_fence-leak.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From acdf673ee14bdb44493855c53d80d0d0f3a1b48c Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Tue, 12 Nov 2019 16:41:21 +0000
-Subject: [PATCH] drm/v3d: Plug dma_fence leak
-
-The irq_fence and done_fence are given a reference that is never
-released. The necessary dma_fence_put()s seem to have been
-deleted in error in an earlier commit.
-
-Fixes: 0b73676836b2 ("drm/v3d: Clock V3D down when not in use.")
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- drivers/gpu/drm/v3d/v3d_gem.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/gpu/drm/v3d/v3d_gem.c
-+++ b/drivers/gpu/drm/v3d/v3d_gem.c
-@@ -411,6 +411,9 @@ v3d_job_free(struct kref *ref)
- 	}
- 	kvfree(job->bo);
- 
-+	dma_fence_put(job->irq_fence);
-+	dma_fence_put(job->done_fence);
-+
- 	v3d_clock_up_put(v3d);
- 
- 	if (job->perfmon)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0207-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch b/target/linux/bcm27xx/patches-6.1/950-0207-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch
deleted file mode 100644
index 30fd36a5f6..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0207-staging-vchiq_arm-Register-vcsm-cma-as-a-platform-dr.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From a0a388aaf2199d592e4a787af1e4d18b18950269 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 6 Nov 2019 13:57:48 +0000
-Subject: [PATCH] staging: vchiq_arm: Register vcsm-cma as a platform
- driver
-
-Following the same pattern as bcm2835-camera and bcm2835-audio,
-register the vcsm-cma driver as a platform driver
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-@@ -67,6 +67,7 @@ struct vchiq_state g_state;
- 
- static struct platform_device *bcm2835_camera;
- static struct platform_device *bcm2835_audio;
-+static struct platform_device *vcsm_cma;
- 
- struct vchiq_drvdata {
- 	const unsigned int cache_line_size;
-@@ -1832,6 +1833,7 @@ static int vchiq_probe(struct platform_d
- 		goto error_exit;
- 	}
- 
-+	vcsm_cma = vchiq_register_child(pdev, "vcsm-cma");
- 	bcm2835_camera = vchiq_register_child(pdev, "bcm2835-camera");
- 	bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio");
- 
-@@ -1847,6 +1849,7 @@ static int vchiq_remove(struct platform_
- {
- 	platform_device_unregister(bcm2835_audio);
- 	platform_device_unregister(bcm2835_camera);
-+	platform_device_unregister(vcsm_cma);
- 	vchiq_debugfs_deinit();
- 	vchiq_deregister_chrdev();
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0208-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch b/target/linux/bcm27xx/patches-6.1/950-0208-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch
deleted file mode 100644
index 8cacee0b47..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0208-staging-vchiq_arm-Register-bcm2835-codec-as-a-platfo.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From c1cc213d717cce44bef144855662fb9256862d01 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 6 Nov 2019 13:57:58 +0000
-Subject: [PATCH] staging: vchiq_arm: Register bcm2835-codec as a
- platform driver
-
-Following the same pattern as bcm2835-camera and bcm2835-audio,
-register the V4L2 codec driver as a platform driver
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-@@ -67,6 +67,7 @@ struct vchiq_state g_state;
- 
- static struct platform_device *bcm2835_camera;
- static struct platform_device *bcm2835_audio;
-+static struct platform_device *bcm2835_codec;
- static struct platform_device *vcsm_cma;
- 
- struct vchiq_drvdata {
-@@ -1834,6 +1835,7 @@ static int vchiq_probe(struct platform_d
- 	}
- 
- 	vcsm_cma = vchiq_register_child(pdev, "vcsm-cma");
-+	bcm2835_codec = vchiq_register_child(pdev, "bcm2835-codec");
- 	bcm2835_camera = vchiq_register_child(pdev, "bcm2835-camera");
- 	bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio");
- 
-@@ -1849,6 +1851,7 @@ static int vchiq_remove(struct platform_
- {
- 	platform_device_unregister(bcm2835_audio);
- 	platform_device_unregister(bcm2835_camera);
-+	platform_device_unregister(bcm2835_codec);
- 	platform_device_unregister(vcsm_cma);
- 	vchiq_debugfs_deinit();
- 	vchiq_deregister_chrdev();
diff --git a/target/linux/bcm27xx/patches-6.1/950-0209-net-phy-2711-Allow-ethernet-LED-mode-to-be-set-via-d.patch b/target/linux/bcm27xx/patches-6.1/950-0209-net-phy-2711-Allow-ethernet-LED-mode-to-be-set-via-d.patch
deleted file mode 100644
index 9f9e61989a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0209-net-phy-2711-Allow-ethernet-LED-mode-to-be-set-via-d.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 2c7d2adefa34858208435e771690d2808eaf809d Mon Sep 17 00:00:00 2001
-From: James Hughes <james.hughes@raspberrypi.org>
-Date: Thu, 31 Oct 2019 14:39:44 +0000
-Subject: [PATCH] net:phy:2711 Allow ethernet LED mode to be set via
- device tree
-
-Add device tree entries and code to allow the specification of
-the lighting modes for the LED's on the ethernet connector.
-
-Signed-off-by: James Hughes <james.hughes@raspberrypi.org>
-
-net:phy:2711 Change the default ethernet LED actions
-
-This should return default behaviour back to that of previous
-releases.
----
- drivers/net/phy/broadcom.c | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
---- a/drivers/net/phy/broadcom.c
-+++ b/drivers/net/phy/broadcom.c
-@@ -337,6 +337,9 @@ static void bcm54xx_ptp_config_init(stru
- static int bcm54xx_config_init(struct phy_device *phydev)
- {
- 	int reg, err, val;
-+	u32 led_modes[] = {BCM_LED_MULTICOLOR_LINK_ACT,
-+			   BCM_LED_MULTICOLOR_LINK};
-+	struct device_node *np = phydev->mdio.dev.of_node;
- 
- 	reg = phy_read(phydev, MII_BCM54XX_ECR);
- 	if (reg < 0)
-@@ -392,10 +395,10 @@ static int bcm54xx_config_init(struct ph
- 
- 	bcm54xx_phydsp_config(phydev);
- 
-+	of_property_read_u32_array(np, "led-modes", led_modes, 2);
-+
- 	/* For non-SFP setups, encode link speed into LED1 and LED3 pair
- 	 * (green/amber).
--	 * Also flash these two LEDs on activity. This means configuring
--	 * them for MULTICOLOR and encoding link/activity into them.
- 	 * Don't do this for devices on an SFP module, since some of these
- 	 * use the LED outputs to control the SFP LOS signal, and changing
- 	 * these settings will cause LOS to malfunction.
-@@ -406,8 +409,8 @@ static int bcm54xx_config_init(struct ph
- 		bcm_phy_write_shadow(phydev, BCM5482_SHD_LEDS1, val);
- 
- 		val = BCM_LED_MULTICOLOR_IN_PHASE |
--			BCM5482_SHD_LEDS1_LED1(BCM_LED_MULTICOLOR_LINK_ACT) |
--			BCM5482_SHD_LEDS1_LED3(BCM_LED_MULTICOLOR_LINK_ACT);
-+			BCM5482_SHD_LEDS1_LED1(led_modes[0]) |
-+			BCM5482_SHD_LEDS1_LED3(led_modes[1]);
- 		bcm_phy_write_exp(phydev, BCM_EXP_MULTICOLOR, val);
- 	}
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0210-v3d_drv-Handle-missing-clock-more-gracefully.patch b/target/linux/bcm27xx/patches-6.1/950-0210-v3d_drv-Handle-missing-clock-more-gracefully.patch
deleted file mode 100644
index 646aa56d63..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0210-v3d_drv-Handle-missing-clock-more-gracefully.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 09e8617d7c6f61e412ab4ec53749f2c46f089482 Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Fri, 23 Aug 2019 16:34:38 +0100
-Subject: [PATCH] v3d_drv: Handle missing clock more gracefully
-
-Signed-off-by: popcornmix <popcornmix@gmail.com>
----
- drivers/gpu/drm/v3d/v3d_drv.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/drivers/gpu/drm/v3d/v3d_drv.c
-+++ b/drivers/gpu/drm/v3d/v3d_drv.c
-@@ -261,10 +261,10 @@ static int v3d_platform_drm_probe(struct
- 	}
- 
- 	v3d->clk = devm_clk_get(dev, NULL);
--	if (IS_ERR(v3d->clk)) {
--		if (ret != -EPROBE_DEFER)
--			dev_err(dev, "Failed to get clock\n");
--		goto dev_free;
-+	if (IS_ERR_OR_NULL(v3d->clk)) {
-+		if (PTR_ERR(v3d->clk) != -EPROBE_DEFER)
-+			dev_err(dev, "Failed to get clock (%ld)\n", PTR_ERR(v3d->clk));
-+		return PTR_ERR(v3d->clk);
- 	}
- 	v3d->clk_up_rate = clk_get_rate(v3d->clk);
- 	/* For downclocking, drop it to the minimum frequency we can get from
diff --git a/target/linux/bcm27xx/patches-6.1/950-0211-v3d_gem-Kick-the-clock-so-firmware-knows-we-are-usin.patch b/target/linux/bcm27xx/patches-6.1/950-0211-v3d_gem-Kick-the-clock-so-firmware-knows-we-are-usin.patch
deleted file mode 100644
index 36bb5f0754..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0211-v3d_gem-Kick-the-clock-so-firmware-knows-we-are-usin.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From b469cfe9fa518d3cea8d21a0416f68db8ea1388d Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Thu, 5 Sep 2019 17:59:14 +0100
-Subject: [PATCH] v3d_gem: Kick the clock so firmware knows we are
- using firmware clock interface
-
-Setting the v3d clock to low value allows firmware to handle dvfs in case
-where v3d hardware is not being actively used (e.g. console use).
-
-Signed-off-by: popcornmix <popcornmix@gmail.com>
----
- drivers/gpu/drm/v3d/v3d_gem.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/gpu/drm/v3d/v3d_gem.c
-+++ b/drivers/gpu/drm/v3d/v3d_gem.c
-@@ -1129,6 +1129,10 @@ v3d_gem_init(struct drm_device *dev)
- 	mutex_init(&v3d->clk_lock);
- 	INIT_DELAYED_WORK(&v3d->clk_down_work, v3d_clock_down_work);
- 
-+	/* kick the clock so firmware knows we are using firmware clock interface */
-+	v3d_clock_up_get(v3d);
-+	v3d_clock_up_put(v3d);
-+
- 	/* Note: We don't allocate address 0.  Various bits of HW
- 	 * treat 0 as special, such as the occlusion query counters
- 	 * where 0 means "disabled".
diff --git a/target/linux/bcm27xx/patches-6.1/950-0212-clk-raspberrypi-Allow-cpufreq-driver-to-also-adjust-.patch b/target/linux/bcm27xx/patches-6.1/950-0212-clk-raspberrypi-Allow-cpufreq-driver-to-also-adjust-.patch
deleted file mode 100644
index fa43d127e4..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0212-clk-raspberrypi-Allow-cpufreq-driver-to-also-adjust-.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 78e91a068539705806b8456edcc2a6f6a5f79020 Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Mon, 9 Sep 2019 15:49:56 +0100
-Subject: [PATCH] clk-raspberrypi: Allow cpufreq driver to also adjust
- gpu clocks
-
-For performance/power it is beneficial to adjust gpu clocks with arm clock.
-This is how the downstream cpufreq driver works
-
-Signed-off-by: popcornmix <popcornmix@gmail.com>
----
- drivers/clk/bcm/clk-raspberrypi.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/clk/bcm/clk-raspberrypi.c
-+++ b/drivers/clk/bcm/clk-raspberrypi.c
-@@ -181,7 +181,7 @@ static int raspberrypi_clock_property(st
- 	struct raspberrypi_firmware_prop msg = {
- 		.id = cpu_to_le32(data->id),
- 		.val = cpu_to_le32(*val),
--		.disable_turbo = cpu_to_le32(1),
-+		.disable_turbo = cpu_to_le32(0),
- 	};
- 	int ret;
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0213-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch b/target/linux/bcm27xx/patches-6.1/950-0213-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch
deleted file mode 100644
index af7a819c19..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0213-staging-vchiq_arm-Set-up-dma-ranges-on-child-devices.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From a43ba5c6c8751eeb7daf5d6f83caf5a83656721f Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Tue, 29 Jan 2019 16:13:25 +0000
-Subject: [PATCH] staging: vchiq_arm: Set up dma ranges on child
- devices
-
-The VCHIQ driver now loads the audio, camera, codec, and vc-sm
-drivers as platform drivers. However they were not being given
-the correct DMA configuration.
-
-Call of_dma_configure with the parent (VCHIQ) parameters to be
-inherited by the child.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- .../staging/vc04_services/interface/vchiq_arm/vchiq_arm.c   | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-@@ -1784,6 +1784,12 @@ vchiq_register_child(struct platform_dev
- 		child = NULL;
- 	}
- 
-+	/*
-+	 * We want the dma-ranges etc to be copied from the parent VCHIQ device
-+	 * to be passed on to the children too.
-+	 */
-+	of_dma_configure(&new_dev->dev, pdev->dev.of_node, true);
-+
- 	return child;
- }
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0214-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch b/target/linux/bcm27xx/patches-6.1/950-0214-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch
deleted file mode 100644
index da04954250..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0214-staging-vchiq-Use-the-old-dma-controller-for-OF-conf.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From d2f86c7e4c8c0e743389f9009e592a8fe03c2f47 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Tue, 18 Jun 2019 12:15:50 +0100
-Subject: [PATCH] staging: vchiq: Use the old dma controller for OF
- config on platform devices
-
-vchiq on Pi4 is no longer under the soc node, therefore it
-doesn't get the dma-ranges for the VPU.
-
-Switch to using the configuration of the old dma controller as
-that will set the dma-ranges correctly.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- .../interface/vchiq_arm/vchiq_arm.c             | 17 ++++++++++++++---
- 1 file changed, 14 insertions(+), 3 deletions(-)
-
---- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-@@ -1770,6 +1770,7 @@ vchiq_register_child(struct platform_dev
- {
- 	struct platform_device_info pdevinfo;
- 	struct platform_device *child;
-+	struct device_node *np;
- 
- 	memset(&pdevinfo, 0, sizeof(pdevinfo));
- 
-@@ -1785,10 +1786,20 @@ vchiq_register_child(struct platform_dev
- 	}
- 
- 	/*
--	 * We want the dma-ranges etc to be copied from the parent VCHIQ device
--	 * to be passed on to the children too.
-+	 * We want the dma-ranges etc to be copied from a device with the
-+	 * correct dma-ranges for the VPU.
-+	 * VCHIQ on Pi4 is now under scb which doesn't get those dma-ranges.
-+	 * Take the "dma" node as going to be suitable as it sees the world
-+	 * through the same eyes as the VPU.
- 	 */
--	of_dma_configure(&new_dev->dev, pdev->dev.of_node, true);
-+	np = of_find_node_by_path("dma");
-+	if (!np)
-+		np = pdev->dev.of_node;
-+
-+	of_dma_configure(&child->dev, np, true);
-+
-+	if (np != pdev->dev.of_node)
-+		of_node_put(np);
- 
- 	return child;
- }
diff --git a/target/linux/bcm27xx/patches-6.1/950-0215-ARM-bcm-Backport-BCM2711-support-from-upstream.patch b/target/linux/bcm27xx/patches-6.1/950-0215-ARM-bcm-Backport-BCM2711-support-from-upstream.patch
deleted file mode 100644
index a94071db22..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0215-ARM-bcm-Backport-BCM2711-support-from-upstream.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 31344f0801c2b5761ca34fbbd01cde3df947ce45 Mon Sep 17 00:00:00 2001
-From: Stefan Wahren <wahrenst@gmx.net>
-Date: Fri, 27 Dec 2019 11:40:56 +0100
-Subject: [PATCH] ARM: bcm: Backport BCM2711 support from upstream
-
-Make the BCM2711 a different machine, but keep it in board_bcm2835.
-
-Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
----
- arch/arm/mach-bcm/board_bcm2835.c | 17 +++++++++++++++--
- 1 file changed, 15 insertions(+), 2 deletions(-)
-
---- a/arch/arm/mach-bcm/board_bcm2835.c
-+++ b/arch/arm/mach-bcm/board_bcm2835.c
-@@ -109,17 +109,30 @@ static const char * const bcm2835_compat
- #ifdef CONFIG_ARCH_MULTI_V7
- 	"brcm,bcm2836",
- 	"brcm,bcm2837",
--	"brcm,bcm2711",
- #endif
- 	NULL
- };
- 
- DT_MACHINE_START(BCM2835, "BCM2835")
-+	.map_io = bcm2835_map_io,
-+	.init_machine = bcm2835_init,
-+	.dt_compat = bcm2835_compat,
-+	.smp = smp_ops(bcm2836_smp_ops),
-+MACHINE_END
-+
-+static const char * const bcm2711_compat[] = {
-+#ifdef CONFIG_ARCH_MULTI_V7
-+	"brcm,bcm2711",
-+#endif
-+	NULL
-+};
-+
-+DT_MACHINE_START(BCM2711, "BCM2711")
- #if defined(CONFIG_ZONE_DMA) && defined(CONFIG_ARM_LPAE)
- 	.dma_zone_size	= SZ_1G,
- #endif
- 	.map_io = bcm2835_map_io,
- 	.init_machine = bcm2835_init,
--	.dt_compat = bcm2835_compat,
-+	.dt_compat = bcm2711_compat,
- 	.smp = smp_ops(bcm2836_smp_ops),
- MACHINE_END
diff --git a/target/linux/bcm27xx/patches-6.1/950-0216-Initialise-rpi-firmware-before-clk-bcm2835.patch b/target/linux/bcm27xx/patches-6.1/950-0216-Initialise-rpi-firmware-before-clk-bcm2835.patch
deleted file mode 100644
index d07fdf05d0..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0216-Initialise-rpi-firmware-before-clk-bcm2835.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 108084a36931cddaf0227a1771202c73f3411c0b Mon Sep 17 00:00:00 2001
-From: Luke Hinds <7058938+lukehinds@users.noreply.github.com>
-Date: Wed, 22 Jan 2020 16:03:00 +0000
-Subject: [PATCH] Initialise rpi-firmware before clk-bcm2835
-
-The IMA (Integrity Measurement Architecture) looks for a TPM (Trusted
-Platform Module) having been registered when it initialises; otherwise
-it assumes there is no TPM. It has been observed on BCM2835 that IMA
-is initialised before TPM, and that initialising the BCM2835 clock
-driver before the firmware driver has the effect of reversing this
-order.
-
-Change the firmware driver to initialise at core_initcall, delaying the
-BCM2835 clock driver to postcore_initcall.
-
-See: https://github.com/raspberrypi/linux/issues/3291
-     https://github.com/raspberrypi/linux/pull/3297
-
-Signed-off-by: Luke Hinds <lhinds@redhat.com>
-Co-authored-by: Phil Elwell <phil@raspberrypi.org>
----
- drivers/clk/bcm/clk-bcm2835.c  | 2 +-
- drivers/firmware/raspberrypi.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/clk/bcm/clk-bcm2835.c
-+++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -2438,7 +2438,7 @@ static int __init __bcm2835_clk_driver_i
- {
- 	return platform_driver_register(&bcm2835_clk_driver);
- }
--core_initcall(__bcm2835_clk_driver_init);
-+postcore_initcall(__bcm2835_clk_driver_init);
- 
- MODULE_AUTHOR("Eric Anholt <eric@anholt.net>");
- MODULE_DESCRIPTION("BCM2835 clock driver");
---- a/drivers/firmware/raspberrypi.c
-+++ b/drivers/firmware/raspberrypi.c
-@@ -500,7 +500,7 @@ out2:
- out1:
- 	return ret;
- }
--subsys_initcall(rpi_firmware_init);
-+core_initcall(rpi_firmware_init);
- 
- static void __init rpi_firmware_exit(void)
- {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0217-staging-vchiq_arm-Give-vchiq-children-DT-nodes.patch b/target/linux/bcm27xx/patches-6.1/950-0217-staging-vchiq_arm-Give-vchiq-children-DT-nodes.patch
deleted file mode 100644
index 7c04307773..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0217-staging-vchiq_arm-Give-vchiq-children-DT-nodes.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 000b19401cbe6570cde94111ca62212d28c8ef18 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 3 Feb 2020 17:30:46 +0000
-Subject: [PATCH] staging: vchiq_arm: Give vchiq children DT nodes
-
-vchiq kernel clients are now instantiated as platform drivers rather
-than using DT, but the children of the vchiq interface may still
-benefit from access to DT properties. Give them the option of a
-a sub-node of the vchiq parent for configuration and to allow
-them to be disabled.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- .../staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-@@ -1779,12 +1779,20 @@ vchiq_register_child(struct platform_dev
- 	pdevinfo.id = PLATFORM_DEVID_NONE;
- 	pdevinfo.dma_mask = DMA_BIT_MASK(32);
- 
-+	np = of_get_child_by_name(pdev->dev.of_node, name);
-+
-+	/* Skip the child if it is explicitly disabled */
-+	if (np && !of_device_is_available(np))
-+		return NULL;
-+
- 	child = platform_device_register_full(&pdevinfo);
- 	if (IS_ERR(child)) {
- 		dev_warn(&pdev->dev, "%s not registered\n", name);
- 		child = NULL;
- 	}
- 
-+	child->dev.of_node = np;
-+
- 	/*
- 	 * We want the dma-ranges etc to be copied from a device with the
- 	 * correct dma-ranges for the VPU.
diff --git a/target/linux/bcm27xx/patches-6.1/950-0218-pinctrl-bcm2835-Remove-gpiochip-on-error.patch b/target/linux/bcm27xx/patches-6.1/950-0218-pinctrl-bcm2835-Remove-gpiochip-on-error.patch
deleted file mode 100644
index d44742982c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0218-pinctrl-bcm2835-Remove-gpiochip-on-error.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ba087b1093294e064be1ac522995a6064c97bb48 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Mon, 6 Jan 2020 16:04:30 +0000
-Subject: [PATCH] pinctrl: bcm2835: Remove gpiochip on error
-
-A failure in gpiochip_irqchip_add leads to a leak of a gpiochip. Fix
-the leak with the use of devm_gpiochip_add_data.
-
-Fixes: 85ae9e512f43 ("pinctrl: bcm2835: switch to GPIOLIB_IRQCHIP")
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- drivers/pinctrl/bcm/pinctrl-bcm2835.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
-+++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
-@@ -1355,7 +1355,7 @@ static int bcm2835_pinctrl_probe(struct
- 	girq->default_type = IRQ_TYPE_NONE;
- 	girq->handler = handle_level_irq;
- 
--	err = gpiochip_add_data(&pc->gpio_chip, pc);
-+	err = devm_gpiochip_add_data(dev, &pc->gpio_chip, pc);
- 	if (err) {
- 		dev_err(dev, "could not add GPIO chip\n");
- 		goto out_remove;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0219-video-fbdev-bcm2708_fb-Use-common-compat-header.patch b/target/linux/bcm27xx/patches-6.1/950-0219-video-fbdev-bcm2708_fb-Use-common-compat-header.patch
deleted file mode 100644
index 245977e514..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0219-video-fbdev-bcm2708_fb-Use-common-compat-header.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From b38ff55882fa7a834728238ba040e577e6cfb73a Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 2 Mar 2020 14:42:23 +0000
-Subject: [PATCH] video: fbdev: bcm2708_fb: Use common compat header
-
-The definition of compat_ptr is now common for most platforms, but
-requires the inclusion of <linux/compat.h>.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/video/fbdev/bcm2708_fb.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/video/fbdev/bcm2708_fb.c
-+++ b/drivers/video/fbdev/bcm2708_fb.c
-@@ -38,6 +38,7 @@
- #include <linux/cred.h>
- #include <soc/bcm2835/raspberrypi-firmware.h>
- #include <linux/mutex.h>
-+#include <linux/compat.h>
- 
- //#define BCM2708_FB_DEBUG
- #define MODULE_NAME "bcm2708_fb"
diff --git a/target/linux/bcm27xx/patches-6.1/950-0220-of-overlay-Correct-symbol-path-fixups.patch b/target/linux/bcm27xx/patches-6.1/950-0220-of-overlay-Correct-symbol-path-fixups.patch
deleted file mode 100644
index c468361349..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0220-of-overlay-Correct-symbol-path-fixups.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 70392105bcca68b03649b895bf2d08d409aa9cb0 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 6 Feb 2020 12:23:15 +0000
-Subject: [PATCH] of: overlay: Correct symbol path fixups
-
-When symbols from overlays are added to the live tree their paths must
-be rebased. The translated symbol is normally the result of joining
-the fragment-relative path (with a leading "/") to the target path
-(either copied directly from the "target-path" property or resolved
-from the phandle). This translation fails when the target is the root
-node (a common case for Raspberry Pi overlays) because the resulting
-path starts with a double slash. For example, if target-path is "/" and
-the fragment adds a node called "newnode", the label associated with
-that node will be assigned the path "//newnode", which can't be found
-in the tree.
-
-Fix the failure case by explicitly replacing a target path of "/" with
-an empty string.
-
-Fixes: d1651b03c2df ("of: overlay: add overlay symbols to live device tree")
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/of/overlay.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/of/overlay.c
-+++ b/drivers/of/overlay.c
-@@ -241,6 +241,8 @@ static struct property *dup_and_fixup_sy
- 	if (!target_path)
- 		return NULL;
- 	target_path_len = strlen(target_path);
-+	if (!strcmp(target_path, "/"))
-+		target_path_len = 0;
- 
- 	new_prop = kzalloc(sizeof(*new_prop), GFP_KERNEL);
- 	if (!new_prop)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0221-dt-bindings-pci-Add-DT-docs-for-Brcmstb-PCIe-device.patch b/target/linux/bcm27xx/patches-6.1/950-0221-dt-bindings-pci-Add-DT-docs-for-Brcmstb-PCIe-device.patch
deleted file mode 100644
index 15380d321b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0221-dt-bindings-pci-Add-DT-docs-for-Brcmstb-PCIe-device.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From a15724a3caab94292cc702a80c386c38e4ce5a25 Mon Sep 17 00:00:00 2001
-From: Jim Quinlan <jim2101024@gmail.com>
-Date: Mon, 15 Jan 2018 18:28:39 -0500
-Subject: [PATCH] dt-bindings: pci: Add DT docs for Brcmstb PCIe device
-
-The DT bindings description of the Brcmstb PCIe device is described.  This
-node can be used by almost all Broadcom settop box chips, using
-ARM, ARM64, or MIPS CPU architectures.
-
-Signed-off-by: Jim Quinlan <jim2101024@gmail.com>
----
- .../devicetree/bindings/pci/brcmstb-pcie.txt  | 59 +++++++++++++++++++
- 1 file changed, 59 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/pci/brcmstb-pcie.txt
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/pci/brcmstb-pcie.txt
-@@ -0,0 +1,59 @@
-+Brcmstb PCIe Host Controller Device Tree Bindings
-+
-+Required Properties:
-+- compatible
-+  "brcm,bcm7425-pcie" -- for 7425 family MIPS-based SOCs.
-+  "brcm,bcm7435-pcie" -- for 7435 family MIPS-based SOCs.
-+  "brcm,bcm7445-pcie" -- for 7445 and later ARM based SOCs (not including
-+      the 7278).
-+  "brcm,bcm7278-pcie"  -- for 7278 family ARM-based SOCs.
-+
-+- reg -- the register start address and length for the PCIe reg block.
-+- interrupts -- two interrupts are specified; the first interrupt is for
-+     the PCI host controller and the second is for MSI if the built-in
-+     MSI controller is to be used.
-+- interrupt-names -- names of the interrupts (above): "pcie" and "msi".
-+- #address-cells -- set to <3>.
-+- #size-cells -- set to <2>.
-+- #interrupt-cells: set to <1>.
-+- interrupt-map-mask and interrupt-map, standard PCI properties to define the
-+     mapping of the PCIe interface to interrupt numbers.
-+- ranges: ranges for the PCI memory and I/O regions.
-+- linux,pci-domain -- should be unique per host controller.
-+
-+Optional Properties:
-+- clocks -- phandle of pcie clock.
-+- clock-names -- set to "sw_pcie" if clocks is used.
-+- dma-ranges -- Specifies the inbound memory mapping regions when
-+     an "identity map" is not possible.
-+- msi-controller -- this property is typically specified to have the
-+     PCIe controller use its internal MSI controller.
-+- msi-parent -- set to use an external MSI interrupt controller.
-+- brcm,enable-ssc -- (boolean) indicates usage of spread-spectrum clocking.
-+- max-link-speed --  (integer) indicates desired generation of link:
-+     1 => 2.5 Gbps (gen1), 2 => 5.0 Gbps (gen2), 3 => 8.0 Gbps (gen3).
-+
-+Example Node:
-+
-+pcie0: pcie@f0460000 {
-+		reg = <0x0 0xf0460000 0x0 0x9310>;
-+		interrupts = <0x0 0x0 0x4>;
-+		compatible = "brcm,bcm7445-pcie";
-+		#address-cells = <3>;
-+		#size-cells = <2>;
-+		ranges = <0x02000000 0x00000000 0x00000000 0x00000000 0xc0000000 0x00000000 0x08000000
-+			  0x02000000 0x00000000 0x08000000 0x00000000 0xc8000000 0x00000000 0x08000000>;
-+		#interrupt-cells = <1>;
-+		interrupt-map-mask = <0 0 0 7>;
-+		interrupt-map = <0 0 0 1 &intc 0 47 3
-+				 0 0 0 2 &intc 0 48 3
-+				 0 0 0 3 &intc 0 49 3
-+				 0 0 0 4 &intc 0 50 3>;
-+		clocks = <&sw_pcie0>;
-+		clock-names = "sw_pcie";
-+		msi-parent = <&pcie0>;  /* use PCIe's internal MSI controller */
-+		msi-controller;         /* use PCIe's internal MSI controller */
-+		brcm,ssc;
-+		max-link-speed = <1>;
-+		linux,pci-domain = <0>;
-+	};
diff --git a/target/linux/bcm27xx/patches-6.1/950-0222-bcmgenet-Disable-skip_umac_reset-by-default.patch b/target/linux/bcm27xx/patches-6.1/950-0222-bcmgenet-Disable-skip_umac_reset-by-default.patch
deleted file mode 100644
index c6090d6d30..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0222-bcmgenet-Disable-skip_umac_reset-by-default.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From e7e5f31918f21c512578e3961ebaa786c847fd9e Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Wed, 1 Apr 2020 11:22:44 +0100
-Subject: [PATCH] bcmgenet: Disable skip_umac_reset by default
-
-Possible fixed upstream by 'net: bcmgenet: keep MAC in reset until PHY is up'
-
-Signed-off-by: popcornmix <popcornmix@gmail.com>
----
- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
-+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
-@@ -67,7 +67,7 @@
- 
- /* Forward declarations */
- static void bcmgenet_set_rx_mode(struct net_device *dev);
--static bool skip_umac_reset = true;
-+static bool skip_umac_reset = false;
- module_param(skip_umac_reset, bool, 0444);
- MODULE_PARM_DESC(skip_umac_reset, "Skip UMAC reset step");
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0223-media-videodev2.h-Add-a-format-for-column-YUV4-2-0-m.patch b/target/linux/bcm27xx/patches-6.1/950-0223-media-videodev2.h-Add-a-format-for-column-YUV4-2-0-m.patch
deleted file mode 100644
index d11d89cde7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0223-media-videodev2.h-Add-a-format-for-column-YUV4-2-0-m.patch
+++ /dev/null
@@ -1,309 +0,0 @@
-From ab5dc4b4c5b36da38adae79ebbc2b9d8e997f49a Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 24 Jan 2020 14:28:21 +0000
-Subject: [PATCH] media: videodev2.h: Add a format for column YUV4:2:0
- modes
-
-Some of the Broadcom codec blocks use a column based YUV4:2:0 image
-format, so add the documentation and defines for both 8 and 10 bit
-versions.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../media/v4l/pixfmt-nv12-col128.rst          | 215 ++++++++++++++++++
- .../media/v4l/pixfmt-yuv-planar.rst           |  12 +
- .../userspace-api/media/v4l/yuv-formats.rst   |  19 ++
- drivers/media/v4l2-core/v4l2-ioctl.c          |   2 +
- include/uapi/linux/videodev2.h                |   4 +
- 5 files changed, 252 insertions(+)
- create mode 100644 Documentation/userspace-api/media/v4l/pixfmt-nv12-col128.rst
-
---- /dev/null
-+++ b/Documentation/userspace-api/media/v4l/pixfmt-nv12-col128.rst
-@@ -0,0 +1,215 @@
-+.. Permission is granted to copy, distribute and/or modify this
-+.. document under the terms of the GNU Free Documentation License,
-+.. Version 1.1 or any later version published by the Free Software
-+.. Foundation, with no Invariant Sections, no Front-Cover Texts
-+.. and no Back-Cover Texts. A copy of the license is included at
-+.. Documentation/media/uapi/fdl-appendix.rst.
-+..
-+.. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
-+
-+.. _V4L2_PIX_FMT_NV12_COL128:
-+.. _V4L2_PIX_FMT_NV12_10_COL128:
-+
-+********************************************************************************
-+V4L2_PIX_FMT_NV12_COL128, V4L2_PIX_FMT_NV12_10_COL128
-+********************************************************************************
-+
-+
-+V4L2_PIX_FMT_NV21_COL128
-+Formats with ½ horizontal and vertical chroma resolution. This format
-+has two planes - one for luminance and one for chrominance. Chroma
-+samples are interleaved. The difference to ``V4L2_PIX_FMT_NV12`` is the
-+memory layout. The image is split into columns of 128 bytes wide rather than
-+being in raster order.
-+
-+V4L2_PIX_FMT_NV12_10_COL128
-+Follows the same pattern as ``V4L2_PIX_FMT_NV21_COL128`` with 128 byte, but is
-+a 10bit format with 3 10-bit samples being packed into 4 bytes. Each 128 byte
-+wide column therefore contains 96 samples.
-+
-+
-+Description
-+===========
-+
-+This is the two-plane versions of the YUV 4:2:0 format where data is
-+grouped into 128 byte wide columns. The three components are separated into
-+two sub-images or planes. The Y plane has one byte per pixel and pixels
-+are grouped into 128 byte wide columns. The CbCr plane has the same width,
-+in bytes, as the Y plane (and the image), but is half as tall in pixels.
-+The chroma plane is also in 128 byte columns, reflecting 64 Cb and 64 Cr
-+samples.
-+
-+The chroma samples for a column follow the luma samples. If there is any
-+paddding, then that will be reflected via the selection API.
-+The luma height must be a multiple of 2 lines.
-+
-+The normal bytesperline is effectively fixed at 128. However the format
-+requires knowledge of the stride between columns, therefore the bytesperline
-+value has been repurposed to denote the number of 128 byte long lines between
-+the start of each column.
-+
-+**Byte Order.**
-+
-+
-+.. flat-table::
-+    :header-rows:  0
-+    :stub-columns: 0
-+    :widths: 12 12 12 12 12 4 12 12 12 12
-+
-+    * - start + 0:
-+      - Y'\ :sub:`0,0`
-+      - Y'\ :sub:`0,1`
-+      - Y'\ :sub:`0,2`
-+      - Y'\ :sub:`0,3`
-+      - ...
-+      - Y'\ :sub:`0,124`
-+      - Y'\ :sub:`0,125`
-+      - Y'\ :sub:`0,126`
-+      - Y'\ :sub:`0,127`
-+    * - start + 128:
-+      - Y'\ :sub:`1,0`
-+      - Y'\ :sub:`1,1`
-+      - Y'\ :sub:`1,2`
-+      - Y'\ :sub:`1,3`
-+      - ...
-+      - Y'\ :sub:`1,124`
-+      - Y'\ :sub:`1,125`
-+      - Y'\ :sub:`1,126`
-+      - Y'\ :sub:`1,127`
-+    * - start + 256:
-+      - Y'\ :sub:`2,0`
-+      - Y'\ :sub:`2,1`
-+      - Y'\ :sub:`2,2`
-+      - Y'\ :sub:`2,3`
-+      - ...
-+      - Y'\ :sub:`2,124`
-+      - Y'\ :sub:`2,125`
-+      - Y'\ :sub:`2,126`
-+      - Y'\ :sub:`2,127`
-+    * - ...
-+      - ...
-+      - ...
-+      - ...
-+      - ...
-+      - ...
-+      - ...
-+      - ...
-+    * - start + ((height-1) * 128):
-+      - Y'\ :sub:`height-1,0`
-+      - Y'\ :sub:`height-1,1`
-+      - Y'\ :sub:`height-1,2`
-+      - Y'\ :sub:`height-1,3`
-+      - ...
-+      - Y'\ :sub:`height-1,124`
-+      - Y'\ :sub:`height-1,125`
-+      - Y'\ :sub:`height-1,126`
-+      - Y'\ :sub:`height-1,127`
-+    * - start + ((height) * 128):
-+      - Cb\ :sub:`0,0`
-+      - Cr\ :sub:`0,0`
-+      - Cb\ :sub:`0,1`
-+      - Cr\ :sub:`0,1`
-+      - ...
-+      - Cb\ :sub:`0,62`
-+      - Cr\ :sub:`0,62`
-+      - Cb\ :sub:`0,63`
-+      - Cr\ :sub:`0,63`
-+    * - start + ((height+1) * 128):
-+      - Cb\ :sub:`1,0`
-+      - Cr\ :sub:`1,0`
-+      - Cb\ :sub:`1,1`
-+      - Cr\ :sub:`1,1`
-+      - ...
-+      - Cb\ :sub:`1,62`
-+      - Cr\ :sub:`1,62`
-+      - Cb\ :sub:`1,63`
-+      - Cr\ :sub:`1,63`
-+    * - ...
-+      - ...
-+      - ...
-+      - ...
-+      - ...
-+      - ...
-+      - ...
-+      - ...
-+    * - start + ((height+(height/2)-1) * 128):
-+      - Cb\ :sub:`(height/2)-1,0`
-+      - Cr\ :sub:`(height/2)-1,0`
-+      - Cb\ :sub:`(height/2)-1,1`
-+      - Cr\ :sub:`(height/2)-1,1`
-+      - ...
-+      - Cb\ :sub:`(height/2)-1,62`
-+      - Cr\ :sub:`(height/2)-1,62`
-+      - Cb\ :sub:`(height/2)-1,63`
-+      - Cr\ :sub:`(height/2)-1,63`
-+    * - start + (bytesperline * 128):
-+      - Y'\ :sub:`0,128`
-+      - Y'\ :sub:`0,129`
-+      - Y'\ :sub:`0,130`
-+      - Y'\ :sub:`0,131`
-+      - ...
-+      - Y'\ :sub:`0,252`
-+      - Y'\ :sub:`0,253`
-+      - Y'\ :sub:`0,254`
-+      - Y'\ :sub:`0,255`
-+    * - ...
-+      - ...
-+      - ...
-+      - ...
-+      - ...
-+      - ...
-+      - ...
-+      - ...
-+
-+V4L2_PIX_FMT_NV12_10_COL128 uses the same 128 byte column structure, but
-+encodes 10-bit YUV.
-+3 10-bit values are packed into 4 bytes as bits 9:0, 19:10, and 29:20, with
-+bits 30 & 31 unused. For the luma plane, bits 9:0 are Y0, 19:10 are Y1, and
-+29:20 are Y2. For the chroma plane the samples always come in pairs of Cr
-+and Cb, so it needs to be considered 6 values packed in 8 bytes.
-+
-+Bit-packed representation.
-+
-+.. raw:: latex
-+
-+    \small
-+
-+.. tabularcolumns:: |p{1.2cm}||p{1.2cm}||p{1.2cm}||p{1.2cm}|p{3.2cm}|p{3.2cm}|
-+
-+.. flat-table::
-+    :header-rows:  0
-+    :stub-columns: 0
-+    :widths: 8 8 8 8
-+
-+    * - Y'\ :sub:`00[7:0]`
-+      - Y'\ :sub:`01[5:0] (bits 7--2)` Y'\ :sub:`00[9:8]`\ (bits 1--0)
-+      - Y'\ :sub:`02[3:0] (bits 7--4)` Y'\ :sub:`01[9:6]`\ (bits 3--0)
-+      - unused (bits 7--6)` Y'\ :sub:`02[9:4]`\ (bits 5--0)
-+
-+.. raw:: latex
-+
-+    \small
-+
-+.. tabularcolumns:: |p{1.2cm}||p{1.2cm}||p{1.2cm}||p{1.2cm}|p{3.2cm}|p{3.2cm}|
-+
-+.. flat-table::
-+    :header-rows:  0
-+    :stub-columns: 0
-+    :widths: 12 12 12 12 12 12 12 12
-+
-+    * - Cb\ :sub:`00[7:0]`
-+      - Cr\ :sub:`00[5:0]`\ (bits 7--2) Cb\ :sub:`00[9:8]`\ (bits 1--0)
-+      - Cb\ :sub:`01[3:0]`\ (bits 7--4) Cr\ :sub:`00[9:6]`\ (bits 3--0)
-+      - unused (bits 7--6) Cb\ :sub:`02[9:4]`\ (bits 5--0)
-+      - Cr\ :sub:`01[7:0]`
-+      - Cb\ :sub:`02[5:0]`\ (bits 7--2) Cr\ :sub:`01[9:8]`\ (bits 1--0)
-+      - Cr\ :sub:`02[3:0]`\ (bits 7--4) Cb\ :sub:`02[9:6]`\ (bits 3--0)
-+      - unused (bits 7--6) Cr\ :sub:`02[9:4]`\ (bits 5--0)
-+
-+.. raw:: latex
-+
-+    \normalsize
-+
-+
-+
-+
---- a/Documentation/userspace-api/media/v4l/pixfmt-yuv-planar.rst
-+++ b/Documentation/userspace-api/media/v4l/pixfmt-yuv-planar.rst
-@@ -579,6 +579,18 @@ Data in the 10 high bits, zeros in the 6
-       - Cr\ :sub:`11`
- 
- 
-+V4L2_PIX_FMT_NV12_COL128
-+------------------------
-+
-+``V4L2_PIX_FMT_NV12_COL128`` is the tiled version of
-+``V4L2_PIX_FMT_NV12`` with the image broken down into 128 pixel wide columns of
-+Y followed by the associated combined CbCr plane.
-+The normal bytesperline is effectively fixed at 128. However the format
-+requires knowledge of the stride between columns, therefore the bytesperline
-+value has been repurposed to denote the number of 128 byte long lines between
-+the start of each column.
-+
-+
- Fully Planar YUV Formats
- ========================
- 
---- a/Documentation/userspace-api/media/v4l/yuv-formats.rst
-+++ b/Documentation/userspace-api/media/v4l/yuv-formats.rst
-@@ -270,4 +270,23 @@ image.
-     pixfmt-y8i
-     pixfmt-y12i
-     pixfmt-uv8
-+    pixfmt-yuyv
-+    pixfmt-uyvy
-+    pixfmt-yvyu
-+    pixfmt-vyuy
-+    pixfmt-y41p
-+    pixfmt-yuv420
-+    pixfmt-yuv420m
-+    pixfmt-yuv422m
-+    pixfmt-yuv444m
-+    pixfmt-yuv410
-+    pixfmt-yuv422p
-+    pixfmt-yuv411p
-+    pixfmt-nv12
-+    pixfmt-nv12m
-+    pixfmt-nv12mt
-+    pixfmt-nv12-col128
-+    pixfmt-nv16
-+    pixfmt-nv16m
-+    pixfmt-nv24
-     pixfmt-m420
---- a/drivers/media/v4l2-core/v4l2-ioctl.c
-+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
-@@ -1364,6 +1364,8 @@ static void v4l_fill_fmtdesc(struct v4l2
- 	case V4L2_PIX_FMT_NV61M:	descr = "Y/VU 4:2:2 (N-C)"; break;
- 	case V4L2_PIX_FMT_NV12MT:	descr = "Y/UV 4:2:0 (64x32 MB, N-C)"; break;
- 	case V4L2_PIX_FMT_NV12MT_16X16:	descr = "Y/UV 4:2:0 (16x16 MB, N-C)"; break;
-+	case V4L2_PIX_FMT_NV12_COL128:  descr = "Y/CbCr 4:2:0 (128b cols)"; break;
-+	case V4L2_PIX_FMT_NV12_10_COL128: descr = "10-bit Y/CbCr 4:2:0 (128b cols)"; break;
- 	case V4L2_PIX_FMT_YUV420M:	descr = "Planar YUV 4:2:0 (N-C)"; break;
- 	case V4L2_PIX_FMT_YVU420M:	descr = "Planar YVU 4:2:0 (N-C)"; break;
- 	case V4L2_PIX_FMT_YUV422M:	descr = "Planar YUV 4:2:2 (N-C)"; break;
---- a/include/uapi/linux/videodev2.h
-+++ b/include/uapi/linux/videodev2.h
-@@ -780,6 +780,10 @@ struct v4l2_pix_format {
- #define V4L2_PIX_FMT_HI240    v4l2_fourcc('H', 'I', '2', '4') /* BTTV 8-bit dithered RGB */
- #define V4L2_PIX_FMT_QC08C    v4l2_fourcc('Q', '0', '8', 'C') /* Qualcomm 8-bit compressed */
- #define V4L2_PIX_FMT_QC10C    v4l2_fourcc('Q', '1', '0', 'C') /* Qualcomm 10-bit compressed */
-+#define V4L2_PIX_FMT_NV12_COL128 v4l2_fourcc('N', 'C', '1', '2') /* 12  Y/CbCr 4:2:0 128 pixel wide column */
-+#define V4L2_PIX_FMT_NV12_10_COL128 v4l2_fourcc('N', 'C', '3', '0')
-+								/* Y/CbCr 4:2:0 10bpc, 3x10 packed as 4 bytes in
-+								 * a 128 bytes / 96 pixel wide column */
- 
- /* 10bit raw packed, 32 bytes for every 25 pixels, last LSB 6 bits unused */
- #define V4L2_PIX_FMT_IPU3_SBGGR10	v4l2_fourcc('i', 'p', '3', 'b') /* IPU3 packed 10-bit BGGR bayer */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0224-media-dt-bindings-media-Add-binding-for-the-Raspberr.patch b/target/linux/bcm27xx/patches-6.1/950-0224-media-dt-bindings-media-Add-binding-for-the-Raspberr.patch
deleted file mode 100644
index d6f55c9703..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0224-media-dt-bindings-media-Add-binding-for-the-Raspberr.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From bdca460ca8b307202f3942df5c8c45e37a6e20df Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 17 Mar 2020 10:53:16 +0000
-Subject: [PATCH] media: dt-bindings: media: Add binding for the
- Raspberry PI HEVC decoder
-
-Adds a binding for the HEVC decoder found on the BCM2711 / Raspberry Pi 4.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../bindings/media/rpivid_hevc.yaml           | 72 +++++++++++++++++++
- MAINTAINERS                                   |  7 ++
- 2 files changed, 79 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/media/rpivid_hevc.yaml
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/media/rpivid_hevc.yaml
-@@ -0,0 +1,72 @@
-+# SPDX-License-Identifier: GPL-2.0-only
-+%YAML 1.2
-+---
-+$id: http://devicetree.org/schemas/media/rpivid_hevc.yaml#
-+$schema: http://devicetree.org/meta-schemas/core.yaml#
-+
-+title: Raspberry Pi HEVC Decoder
-+
-+maintainers:
-+  - Raspberry Pi <kernel-list@raspberrypi.com>
-+
-+description: |-
-+  The Camera Adaptation Layer (CAL) is a key component for image capture
-+  applications. The capture module provides the system interface and the
-+  processing capability to connect CSI2 image-sensor modules to the
-+  DRA72x device.
-+
-+properties:
-+  compatible:
-+    enum:
-+      - raspberrypi,rpivid-vid-decoder
-+
-+  reg:
-+    minItems: 2
-+    items:
-+      - description: The HEVC main register region
-+      - description: The Interrupt controller register region
-+
-+  reg-names:
-+    minItems: 2
-+    items:
-+      - const: hevc
-+      - const: intc
-+
-+  interrupts:
-+    maxItems: 1
-+
-+  clocks:
-+    items:
-+      - description: The HEVC block clock
-+
-+  clock-names:
-+    items:
-+      - const: hevc
-+
-+required:
-+  - compatible
-+  - reg
-+  - reg-names
-+  - interrupts
-+  - clocks
-+
-+additionalProperties: false
-+
-+examples:
-+  - |
-+    #include <dt-bindings/interrupt-controller/arm-gic.h>
-+
-+    video-codec@7eb10000 {
-+        compatible = "raspberrypi,rpivid-vid-decoder";
-+        reg = <0x0 0x7eb10000 0x1000>,	/* INTC */
-+              <0x0 0x7eb00000 0x10000>; /* HEVC */
-+        reg-names = "intc",
-+                    "hevc";
-+
-+        interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
-+
-+        clocks = <&clk 0>;
-+        clock-names = "hevc";
-+    };
-+
-+...
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -4030,6 +4030,13 @@ N:	bcm113*
- N:	bcm216*
- N:	kona
- 
-+BROADCOM BCM2711 HEVC DECODER
-+M:	Raspberry Pi Kernel Maintenance <kernel-list@raspberrypi.com>
-+L:	linux-media@vger.kernel.org
-+S:	Maintained
-+F:	Documentation/devicetree/bindings/media/rpivid_hevc.jaml
-+F:	drivers/staging/media/rpivid
-+
- BROADCOM BCM2835 CAMERA DRIVER
- M:	Dave Stevenson <dave.stevenson@raspberrypi.org>
- L:	linux-media@vger.kernel.org
diff --git a/target/linux/bcm27xx/patches-6.1/950-0225-RFC-media-Add-media_request_-pin-unpin-API.patch b/target/linux/bcm27xx/patches-6.1/950-0225-RFC-media-Add-media_request_-pin-unpin-API.patch
deleted file mode 100644
index 85b07eb5df..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0225-RFC-media-Add-media_request_-pin-unpin-API.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 88aca1377f55f0cf1eab46731a77a459724a920d Mon Sep 17 00:00:00 2001
-From: Ezequiel Garcia <ezequiel@collabora.com>
-Date: Sun, 21 Mar 2021 16:38:54 -0300
-Subject: [PATCH] RFC: media: Add media_request_{pin,unpin} API
-
-This is probably not the API we will want to add, but it
-should show what semantics are needed by drivers.
-
-The goal is to allow the OUTPUT (aka source) buffer and the
-controls associated to a request to be released from the request,
-and in particular return the OUTPUT buffer back to userspace,
-without signalling the media request fd.
-
-This is useful for devices that are able to pre-process
-the OUTPUT buffer, therefore able to release it before
-the decoding is finished. These drivers should signal
-the media request fd only after the CAPTURE buffer is done.
-
-Tested-by: John Cox <jc@kynesim.co.uk>
-Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
----
- drivers/media/mc/mc-request.c | 35 +++++++++++++++++++++++++++++++++++
- include/media/media-request.h | 12 ++++++++++++
- 2 files changed, 47 insertions(+)
-
---- a/drivers/media/mc/mc-request.c
-+++ b/drivers/media/mc/mc-request.c
-@@ -505,3 +505,38 @@ unlock:
- 		media_request_put(req);
- }
- EXPORT_SYMBOL_GPL(media_request_object_complete);
-+
-+void media_request_pin(struct media_request *req)
-+{
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&req->lock, flags);
-+	if (WARN_ON(req->state != MEDIA_REQUEST_STATE_QUEUED))
-+		goto unlock;
-+	req->num_incomplete_objects++;
-+unlock:
-+	spin_unlock_irqrestore(&req->lock, flags);
-+}
-+EXPORT_SYMBOL_GPL(media_request_pin);
-+
-+void media_request_unpin(struct media_request *req)
-+{
-+	unsigned long flags;
-+	bool completed = false;
-+
-+	spin_lock_irqsave(&req->lock, flags);
-+	if (WARN_ON(!req->num_incomplete_objects) ||
-+	    WARN_ON(req->state != MEDIA_REQUEST_STATE_QUEUED))
-+		goto unlock;
-+
-+	if (!--req->num_incomplete_objects) {
-+		req->state = MEDIA_REQUEST_STATE_COMPLETE;
-+		wake_up_interruptible_all(&req->poll_wait);
-+		completed = true;
-+	}
-+unlock:
-+	spin_unlock_irqrestore(&req->lock, flags);
-+	if (completed)
-+		media_request_put(req);
-+}
-+EXPORT_SYMBOL_GPL(media_request_unpin);
---- a/include/media/media-request.h
-+++ b/include/media/media-request.h
-@@ -189,6 +189,10 @@ static inline void media_request_get(str
-  */
- void media_request_put(struct media_request *req);
- 
-+void media_request_pin(struct media_request *req);
-+
-+void media_request_unpin(struct media_request *req);
-+
- /**
-  * media_request_get_by_fd - Get a media request by fd
-  *
-@@ -228,6 +232,14 @@ static inline void media_request_put(str
- {
- }
- 
-+static inline void media_request_pin(struct media_request *req)
-+{
-+}
-+
-+static inline void media_request_unpin(struct media_request *req)
-+{
-+}
-+
- static inline struct media_request *
- media_request_get_by_fd(struct media_device *mdev, int request_fd)
- {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0226-staging-media-rpivid-Add-Raspberry-Pi-V4L2-H265-deco.patch b/target/linux/bcm27xx/patches-6.1/950-0226-staging-media-rpivid-Add-Raspberry-Pi-V4L2-H265-deco.patch
deleted file mode 100644
index d556b19fad..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0226-staging-media-rpivid-Add-Raspberry-Pi-V4L2-H265-deco.patch
+++ /dev/null
@@ -1,5238 +0,0 @@
-From 359a25fe7208803d997488a96714c19e84b74f96 Mon Sep 17 00:00:00 2001
-From: John Cox <jc@kynesim.co.uk>
-Date: Thu, 5 Mar 2020 18:30:41 +0000
-Subject: [PATCH] staging: media: rpivid: Add Raspberry Pi V4L2 H265
- decoder
-
-This driver is for the HEVC/H265 decoder block on the Raspberry
-Pi 4, and conforms to the V4L2 stateless decoder API.
-
-Signed-off-by: John Cox <jc@kynesim.co.uk>
-
-staging: media: rpivid: Select MEDIA_CONTROLLER and MEDIA_CONTROLLER_REQUEST_API
-
-MEDIA_CONTROLLER_REQUEST_API is a hidden option. If rpivid depends on it,
-the user would need to first enable another driver that selects
-MEDIA_CONTROLLER_REQUEST_API, and only then rpivid would become available.
-
-By selecting it instead of depending on it, it becomes possible to enable
-rpivid without having to enable other potentially unnecessary drivers.
-
-Signed-off-by: Hristo Venev <hristo@venev.name>
-
-rpivid_h265: Fix width/height typo
-
-Signed-off-by: popcornmix <popcornmix@gmail.com>
-
-rpivid_h625: Fix build warnings
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-staging: rpivid: Fix crash when CMA alloc fails
-
-If realloc to increase coeff size fails then attempt to re-allocate
-the original size.  If that also fails then flag a fatal error to abort
-all further decode.
-
-Signed-off-by: John Cox <jc@kynesim.co.uk>
-
-rpivid: Request maximum hevc clock
-
-Query maximum and minimum clock from driver
-and use those
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
-
-rpivid: Switch to new clock api
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
-
-rpivid: Only clk_request_done once
-
-Fixes: 25486f49bfe2e3ae13b90478d1eebd91413136ad
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
-
-media: rpivid: Remove the need to have num_entry_points set
-
-VAAPI H265 has num entry points but never sets it. Allow a VAAPI
-shim to work without requiring rewriting the VAAPI driver.
-num_entry_points can be calculated from the slice_segment_addr
-of the next slice so delay processing until we have that.
-
-Also includes some minor cosmetics.
-
-Signed-off-by: John Cox <jc@kynesim.co.uk>
-
-media: rpivid: Convert to MPLANE
-
-Use multi-planar interface rather than single plane interface. This
-allows dmabufs holding compressed data to be resized.
-
-Signed-off-by: John Cox <jc@kynesim.co.uk>
-
-media: rpivid: Add an enable count to irq claim Qs
-
-Add an enable count to the irq Q structures to allow the irq logic to
-block further callbacks if resources associated with the irq are not
-yet available.
-
-Signed-off-by: John Cox <jc@kynesim.co.uk>
-
-media: rpivid: Add a Pass0 to accumulate slices and rework job finish
-
-Due to overheads in assembling controls and requests it is worth having
-the slice assembly phase separate from the h/w pass1 processing. Create
-a queue to service pass1 rather than have the pass1 finished callback
-trigger the next slice job.
-
-This requires a rework of the logic that splits up the buffer and
-request done events. This code contains two ways of doing that, we use
-Ezequiel Garcias <ezequiel@collabora.com> solution, but expect that
-in the future this will be handled by the framework in a cleaner manner.
-
-Fix up the handling of some of the memory exhaustion crashes uncovered
-in the process of writing this code.
-
-Signed-off-by: John Cox <jc@kynesim.co.uk>
-
-media: rpivid: Map cmd buffer directly
-
-It is unnecessary to have a separate dmabuf to hold the cmd buffer.
-Map it directly from the kmalloc.
-
-Signed-off-by: John Cox <jc@kynesim.co.uk>
-
-media: rpivid: Improve values returned when setting output format
-
-Guess a better value for the compressed bitstream buffer size
-
-Signed-off-by: John Cox <jc@kynesim.co.uk>
-
-media: rpivid: Improve stream_on/off conformance & clock setup
-
-Fix stream on & off such that failures leave the driver in the correct
-state.  Ensure that the clock is on when we are streaming and off when
-all contexts attached to this device have stopped streaming.
-
-Signed-off-by: John Cox <jc@kynesim.co.uk>
-
-media: rpivid: Improve SPS/PPS error handling/validation
-
-Move size and width checking from bitstream processing to control
-validation
-
-Signed-off-by: John Cox <jc@kynesim.co.uk>
-
-media: rpivid: Fix H265 aux ent reuse of the same slot
-
-It is legitimate, though unusual, for an aux ent associated with a slot
-to be selected in phase 0 before a previous selection has been used and
-released in phase 2. Fix such that if the slot is found to be in use
-that the aux ent associated with it is reused rather than an new aux
-ent being created. This fixes a problem where when the first aux ent
-was released the second was lost track of.
-
-This bug spotted in Nick's testing. It may explain some other occasional,
-unreliable decode error reports where dmesg included "Missing DPB AUX
-ent" logging.
-
-Signed-off-by: John Cox <jc@kynesim.co.uk>
-
-media: rpivid: Update to compile with new hevc decode params
-
-DPB entries have moved from slice params to the new decode params
-attribute - update to deal with this.  Also fixes fallthrough
-warnings which seem to be new in 5.14.
-
-Signed-off-by: John Cox <jc@kynesim.co.uk>
-
-media: rpivid: Make slice ctrl dynamic
-
-Allows the user to submit a whole frames worth of slice headers in
-one lump along with a single bitstream dmabuf for the whole lot.
-This saves potentially a lot of bitstream copying.
-
-Signed-off-by: John Cox <jc@kynesim.co.uk>
-
-media: rpivid: Only create aux entries for H265 if needed
-
-Only create aux entries of mv info for frames where that info might
-be used by a later frame.  This saves some memory bandwidth and
-potentially some memory.
-
-Signed-off-by: John Cox <jc@kynesim.co.uk>
-
-media: rpivid: Avoid returning EINVAL to a G_FMT ioctl
-
-V4L2 spec says that G/S/TRY_FMT IOCTLs should never return errors for
-anything other than wrong buffer types. Improve the capture format
-function such that this is so and unsupported values get converted
-to supported ones properly.
-
-Signed-off-by: John Cox <jc@kynesim.co.uk>
-
-media: rpivid: Remove unused ctx state variable and defines
-
-Remove unused ctx state tracking variable and associated defines.
-Their presence implies they might be used, but they aren't.
-
-Signed-off-by: John Cox <jc@kynesim.co.uk>
-
-media: rpivid: Ensure IRQs have completed before uniniting context
-
-Before uniniting the decode context sync with the IRQ queues to ensure
-that decode no longer has any buffers in use.  This fixes a problem that
-manifested as ffmpeg leaking CMA buffers when it did a stream off on
-OUTPUT before CAPTURE, though in reality it was probably much more
-dangerous than that.
-
-Signed-off-by: John Cox <jc@kynesim.co.uk>
-
-media: rpivid: remove min_buffers_needed from src queue
-
-Remove min_buffers_needed=1 from src queue init. Src buffers are bound
-to media requests therefore this setting is not needed and generates
-a WARN in kernel 5.16.
-
-Signed-off-by: John Cox <jc@kynesim.co.uk>
-
-rpivid: Use clk_get_max_rate()
-
-The driver was using clk_round_rate() to figure out the maximum clock
-rate that was allowed for the HEVC clock.
-
-Since we have a function to return it directly now, let's use it.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
-
-media: rpivid: Apply V4L2 stateless API changes
-
-media: rpivid: Fix fallthrough warning
-
-Replace old-style /* FALLTHRU */ with fallthrough;
-
-Signed-off-by: John Cox <jc@kynesim.co.uk>
-
-media: rpivid: Set min value as well as max for HEVC_DECODE_MODE
-
-As only one value can be accepted set both min and max to that value.
-
-Signed-off-by: John Cox <jc@kynesim.co.uk>
-
-media: rpivid: Accept ANNEX_B start codes
-
-Allow the START_CODE control to take ANNEX_B as a value. This makes no
-difference to any part of the decode process as the added bytes are in
-data that we ignore. This helps my testing and may help userland code
-that expects to send those bytes.
-
-Signed-off-by: John Cox <jc@kynesim.co.uk>
-
-rpivid: Convert to new clock rate API
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/media/v4l2-core/v4l2-mem2mem.c      |    2 -
- drivers/staging/media/Kconfig               |    2 +
- drivers/staging/media/Makefile              |    2 +-
- drivers/staging/media/rpivid/Kconfig        |   16 +
- drivers/staging/media/rpivid/Makefile       |    5 +
- drivers/staging/media/rpivid/rpivid.c       |  459 ++++
- drivers/staging/media/rpivid/rpivid.h       |  203 ++
- drivers/staging/media/rpivid/rpivid_dec.c   |   96 +
- drivers/staging/media/rpivid/rpivid_dec.h   |   19 +
- drivers/staging/media/rpivid/rpivid_h265.c  | 2698 +++++++++++++++++++
- drivers/staging/media/rpivid/rpivid_hw.c    |  383 +++
- drivers/staging/media/rpivid/rpivid_hw.h    |  303 +++
- drivers/staging/media/rpivid/rpivid_video.c |  696 +++++
- drivers/staging/media/rpivid/rpivid_video.h |   33 +
- 14 files changed, 4914 insertions(+), 3 deletions(-)
- create mode 100644 drivers/staging/media/rpivid/Kconfig
- create mode 100644 drivers/staging/media/rpivid/Makefile
- create mode 100644 drivers/staging/media/rpivid/rpivid.c
- create mode 100644 drivers/staging/media/rpivid/rpivid.h
- create mode 100644 drivers/staging/media/rpivid/rpivid_dec.c
- create mode 100644 drivers/staging/media/rpivid/rpivid_dec.h
- create mode 100644 drivers/staging/media/rpivid/rpivid_h265.c
- create mode 100644 drivers/staging/media/rpivid/rpivid_hw.c
- create mode 100644 drivers/staging/media/rpivid/rpivid_hw.h
- create mode 100644 drivers/staging/media/rpivid/rpivid_video.c
- create mode 100644 drivers/staging/media/rpivid/rpivid_video.h
-
---- a/drivers/media/v4l2-core/v4l2-mem2mem.c
-+++ b/drivers/media/v4l2-core/v4l2-mem2mem.c
-@@ -492,8 +492,6 @@ void v4l2_m2m_job_finish(struct v4l2_m2m
- 	 * holding capture buffers. Those should use
- 	 * v4l2_m2m_buf_done_and_job_finish() instead.
- 	 */
--	WARN_ON(m2m_ctx->out_q_ctx.q.subsystem_flags &
--		VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF);
- 	spin_lock_irqsave(&m2m_dev->job_spinlock, flags);
- 	schedule_next = _v4l2_m2m_job_finish(m2m_dev, m2m_ctx);
- 	spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags);
---- a/drivers/staging/media/Kconfig
-+++ b/drivers/staging/media/Kconfig
-@@ -34,6 +34,8 @@ source "drivers/staging/media/omap4iss/K
- 
- source "drivers/staging/media/rkvdec/Kconfig"
- 
-+source "drivers/staging/media/rpivid/Kconfig"
-+
- source "drivers/staging/media/sunxi/Kconfig"
- 
- source "drivers/staging/media/tegra-video/Kconfig"
---- a/drivers/staging/media/Makefile
-+++ b/drivers/staging/media/Makefile
-@@ -7,7 +7,7 @@ obj-$(CONFIG_VIDEO_MESON_VDEC)	+= meson/
- obj-$(CONFIG_VIDEO_MEYE)	+= deprecated/meye/
- obj-$(CONFIG_VIDEO_OMAP4)	+= omap4iss/
- obj-$(CONFIG_VIDEO_ROCKCHIP_VDEC)	+= rkvdec/
--obj-$(CONFIG_VIDEO_STKWEBCAM)	+= deprecated/stkwebcam/
-+obj-$(CONFIG_VIDEO_RPIVID)	+= rpivid/
- obj-$(CONFIG_VIDEO_SUNXI)	+= sunxi/
- obj-$(CONFIG_VIDEO_TEGRA)	+= tegra-video/
- obj-$(CONFIG_VIDEO_IPU3_IMGU)	+= ipu3/
---- /dev/null
-+++ b/drivers/staging/media/rpivid/Kconfig
-@@ -0,0 +1,16 @@
-+# SPDX-License-Identifier: GPL-2.0
-+
-+config VIDEO_RPIVID
-+	tristate "Rpi H265 driver"
-+	depends on VIDEO_DEV && VIDEO_DEV
-+	depends on OF
-+	select MEDIA_CONTROLLER
-+	select MEDIA_CONTROLLER_REQUEST_API
-+	select VIDEOBUF2_DMA_CONTIG
-+	select V4L2_MEM2MEM_DEV
-+	help
-+	  Support for the Rpi H265 h/w decoder.
-+
-+	  To compile this driver as a module, choose M here: the module
-+	  will be called rpivid-hevc.
-+
---- /dev/null
-+++ b/drivers/staging/media/rpivid/Makefile
-@@ -0,0 +1,5 @@
-+# SPDX-License-Identifier: GPL-2.0
-+obj-$(CONFIG_VIDEO_RPIVID) += rpivid-hevc.o
-+
-+rpivid-hevc-y = rpivid.o rpivid_video.o rpivid_dec.o \
-+		 rpivid_hw.o rpivid_h265.o
---- /dev/null
-+++ b/drivers/staging/media/rpivid/rpivid.c
-@@ -0,0 +1,459 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Raspberry Pi HEVC driver
-+ *
-+ * Copyright (C) 2020 Raspberry Pi (Trading) Ltd
-+ *
-+ * Based on the Cedrus VPU driver, that is:
-+ *
-+ * Copyright (C) 2016 Florent Revest <florent.revest@free-electrons.com>
-+ * Copyright (C) 2018 Paul Kocialkowski <paul.kocialkowski@bootlin.com>
-+ * Copyright (C) 2018 Bootlin
-+ */
-+
-+#include <linux/platform_device.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+
-+#include <media/v4l2-device.h>
-+#include <media/v4l2-ioctl.h>
-+#include <media/v4l2-ctrls.h>
-+#include <media/v4l2-mem2mem.h>
-+
-+#include "rpivid.h"
-+#include "rpivid_video.h"
-+#include "rpivid_hw.h"
-+#include "rpivid_dec.h"
-+
-+/*
-+ * Default /dev/videoN node number.
-+ * Deliberately avoid the very low numbers as these are often taken by webcams
-+ * etc, and simple apps tend to only go for /dev/video0.
-+ */
-+static int video_nr = 19;
-+module_param(video_nr, int, 0644);
-+MODULE_PARM_DESC(video_nr, "decoder video device number");
-+
-+static const struct rpivid_control rpivid_ctrls[] = {
-+	{
-+		.cfg = {
-+			.id	= V4L2_CID_STATELESS_HEVC_SPS,
-+			.ops	= &rpivid_hevc_sps_ctrl_ops,
-+		},
-+		.required	= true,
-+	},
-+	{
-+		.cfg = {
-+			.id	= V4L2_CID_STATELESS_HEVC_PPS,
-+			.ops	= &rpivid_hevc_pps_ctrl_ops,
-+		},
-+		.required	= true,
-+	},
-+	{
-+		.cfg = {
-+			.id = V4L2_CID_STATELESS_HEVC_SCALING_MATRIX,
-+		},
-+		.required	= false,
-+	},
-+	{
-+		.cfg = {
-+			.id	= V4L2_CID_STATELESS_HEVC_DECODE_PARAMS,
-+		},
-+		.required	= true,
-+	},
-+	{
-+		.cfg = {
-+			.name	= "Slice param array",
-+			.id	= V4L2_CID_STATELESS_HEVC_SLICE_PARAMS,
-+			.type	= V4L2_CTRL_TYPE_HEVC_SLICE_PARAMS,
-+			.flags	= V4L2_CTRL_FLAG_DYNAMIC_ARRAY,
-+			.dims	= { 0x1000 },
-+		},
-+		.required	= true,
-+	},
-+	{
-+		.cfg = {
-+			.id	= V4L2_CID_STATELESS_HEVC_DECODE_MODE,
-+			.min	= V4L2_STATELESS_HEVC_DECODE_MODE_SLICE_BASED,
-+			.max	= V4L2_STATELESS_HEVC_DECODE_MODE_SLICE_BASED,
-+			.def	= V4L2_STATELESS_HEVC_DECODE_MODE_SLICE_BASED,
-+		},
-+		.required	= false,
-+	},
-+	{
-+		.cfg = {
-+			.id	= V4L2_CID_STATELESS_HEVC_START_CODE,
-+			.min	= V4L2_STATELESS_HEVC_START_CODE_NONE,
-+			.max	= V4L2_STATELESS_HEVC_START_CODE_ANNEX_B,
-+			.def	= V4L2_STATELESS_HEVC_START_CODE_NONE,
-+		},
-+		.required	= false,
-+	},
-+};
-+
-+#define rpivid_ctrls_COUNT	ARRAY_SIZE(rpivid_ctrls)
-+
-+struct v4l2_ctrl *rpivid_find_ctrl(struct rpivid_ctx *ctx, u32 id)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; ctx->ctrls[i]; i++)
-+		if (ctx->ctrls[i]->id == id)
-+			return ctx->ctrls[i];
-+
-+	return NULL;
-+}
-+
-+void *rpivid_find_control_data(struct rpivid_ctx *ctx, u32 id)
-+{
-+	struct v4l2_ctrl *const ctrl = rpivid_find_ctrl(ctx, id);
-+
-+	return !ctrl ? NULL : ctrl->p_cur.p;
-+}
-+
-+static int rpivid_init_ctrls(struct rpivid_dev *dev, struct rpivid_ctx *ctx)
-+{
-+	struct v4l2_ctrl_handler *hdl = &ctx->hdl;
-+	struct v4l2_ctrl *ctrl;
-+	unsigned int ctrl_size;
-+	unsigned int i;
-+
-+	v4l2_ctrl_handler_init(hdl, rpivid_ctrls_COUNT);
-+	if (hdl->error) {
-+		v4l2_err(&dev->v4l2_dev,
-+			 "Failed to initialize control handler\n");
-+		return hdl->error;
-+	}
-+
-+	ctrl_size = sizeof(ctrl) * rpivid_ctrls_COUNT + 1;
-+
-+	ctx->ctrls = kzalloc(ctrl_size, GFP_KERNEL);
-+	if (!ctx->ctrls)
-+		return -ENOMEM;
-+
-+	for (i = 0; i < rpivid_ctrls_COUNT; i++) {
-+		ctrl = v4l2_ctrl_new_custom(hdl, &rpivid_ctrls[i].cfg,
-+					    ctx);
-+		if (hdl->error) {
-+			v4l2_err(&dev->v4l2_dev,
-+				 "Failed to create new custom control id=%#x\n",
-+				 rpivid_ctrls[i].cfg.id);
-+
-+			v4l2_ctrl_handler_free(hdl);
-+			kfree(ctx->ctrls);
-+			return hdl->error;
-+		}
-+
-+		ctx->ctrls[i] = ctrl;
-+	}
-+
-+	ctx->fh.ctrl_handler = hdl;
-+	v4l2_ctrl_handler_setup(hdl);
-+
-+	return 0;
-+}
-+
-+static int rpivid_request_validate(struct media_request *req)
-+{
-+	struct media_request_object *obj;
-+	struct v4l2_ctrl_handler *parent_hdl, *hdl;
-+	struct rpivid_ctx *ctx = NULL;
-+	struct v4l2_ctrl *ctrl_test;
-+	unsigned int count;
-+	unsigned int i;
-+
-+	list_for_each_entry(obj, &req->objects, list) {
-+		struct vb2_buffer *vb;
-+
-+		if (vb2_request_object_is_buffer(obj)) {
-+			vb = container_of(obj, struct vb2_buffer, req_obj);
-+			ctx = vb2_get_drv_priv(vb->vb2_queue);
-+
-+			break;
-+		}
-+	}
-+
-+	if (!ctx)
-+		return -ENOENT;
-+
-+	count = vb2_request_buffer_cnt(req);
-+	if (!count) {
-+		v4l2_info(&ctx->dev->v4l2_dev,
-+			  "No buffer was provided with the request\n");
-+		return -ENOENT;
-+	} else if (count > 1) {
-+		v4l2_info(&ctx->dev->v4l2_dev,
-+			  "More than one buffer was provided with the request\n");
-+		return -EINVAL;
-+	}
-+
-+	parent_hdl = &ctx->hdl;
-+
-+	hdl = v4l2_ctrl_request_hdl_find(req, parent_hdl);
-+	if (!hdl) {
-+		v4l2_info(&ctx->dev->v4l2_dev, "Missing codec control(s)\n");
-+		return -ENOENT;
-+	}
-+
-+	for (i = 0; i < rpivid_ctrls_COUNT; i++) {
-+		if (!rpivid_ctrls[i].required)
-+			continue;
-+
-+		ctrl_test =
-+			v4l2_ctrl_request_hdl_ctrl_find(hdl,
-+							rpivid_ctrls[i].cfg.id);
-+		if (!ctrl_test) {
-+			v4l2_info(&ctx->dev->v4l2_dev,
-+				  "Missing required codec control\n");
-+			v4l2_ctrl_request_hdl_put(hdl);
-+			return -ENOENT;
-+		}
-+	}
-+
-+	v4l2_ctrl_request_hdl_put(hdl);
-+
-+	return vb2_request_validate(req);
-+}
-+
-+static int rpivid_open(struct file *file)
-+{
-+	struct rpivid_dev *dev = video_drvdata(file);
-+	struct rpivid_ctx *ctx = NULL;
-+	int ret;
-+
-+	if (mutex_lock_interruptible(&dev->dev_mutex))
-+		return -ERESTARTSYS;
-+
-+	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
-+	if (!ctx) {
-+		mutex_unlock(&dev->dev_mutex);
-+		ret = -ENOMEM;
-+		goto err_unlock;
-+	}
-+
-+	mutex_init(&ctx->ctx_mutex);
-+
-+	v4l2_fh_init(&ctx->fh, video_devdata(file));
-+	file->private_data = &ctx->fh;
-+	ctx->dev = dev;
-+
-+	ret = rpivid_init_ctrls(dev, ctx);
-+	if (ret)
-+		goto err_free;
-+
-+	ctx->fh.m2m_ctx = v4l2_m2m_ctx_init(dev->m2m_dev, ctx,
-+					    &rpivid_queue_init);
-+	if (IS_ERR(ctx->fh.m2m_ctx)) {
-+		ret = PTR_ERR(ctx->fh.m2m_ctx);
-+		goto err_ctrls;
-+	}
-+
-+	/* The only bit of format info that we can guess now is H265 src
-+	 * Everything else we need more info for
-+	 */
-+	rpivid_prepare_src_format(&ctx->src_fmt);
-+
-+	v4l2_fh_add(&ctx->fh);
-+
-+	mutex_unlock(&dev->dev_mutex);
-+
-+	return 0;
-+
-+err_ctrls:
-+	v4l2_ctrl_handler_free(&ctx->hdl);
-+err_free:
-+	mutex_destroy(&ctx->ctx_mutex);
-+	kfree(ctx);
-+err_unlock:
-+	mutex_unlock(&dev->dev_mutex);
-+
-+	return ret;
-+}
-+
-+static int rpivid_release(struct file *file)
-+{
-+	struct rpivid_dev *dev = video_drvdata(file);
-+	struct rpivid_ctx *ctx = container_of(file->private_data,
-+					      struct rpivid_ctx, fh);
-+
-+	mutex_lock(&dev->dev_mutex);
-+
-+	v4l2_fh_del(&ctx->fh);
-+	v4l2_m2m_ctx_release(ctx->fh.m2m_ctx);
-+
-+	v4l2_ctrl_handler_free(&ctx->hdl);
-+	kfree(ctx->ctrls);
-+
-+	v4l2_fh_exit(&ctx->fh);
-+	mutex_destroy(&ctx->ctx_mutex);
-+
-+	kfree(ctx);
-+
-+	mutex_unlock(&dev->dev_mutex);
-+
-+	return 0;
-+}
-+
-+static const struct v4l2_file_operations rpivid_fops = {
-+	.owner		= THIS_MODULE,
-+	.open		= rpivid_open,
-+	.release	= rpivid_release,
-+	.poll		= v4l2_m2m_fop_poll,
-+	.unlocked_ioctl	= video_ioctl2,
-+	.mmap		= v4l2_m2m_fop_mmap,
-+};
-+
-+static const struct video_device rpivid_video_device = {
-+	.name		= RPIVID_NAME,
-+	.vfl_dir	= VFL_DIR_M2M,
-+	.fops		= &rpivid_fops,
-+	.ioctl_ops	= &rpivid_ioctl_ops,
-+	.minor		= -1,
-+	.release	= video_device_release_empty,
-+	.device_caps	= V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING,
-+};
-+
-+static const struct v4l2_m2m_ops rpivid_m2m_ops = {
-+	.device_run	= rpivid_device_run,
-+};
-+
-+static const struct media_device_ops rpivid_m2m_media_ops = {
-+	.req_validate	= rpivid_request_validate,
-+	.req_queue	= v4l2_m2m_request_queue,
-+};
-+
-+static int rpivid_probe(struct platform_device *pdev)
-+{
-+	struct rpivid_dev *dev;
-+	struct video_device *vfd;
-+	int ret;
-+
-+	dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
-+	if (!dev)
-+		return -ENOMEM;
-+
-+	dev->vfd = rpivid_video_device;
-+	dev->dev = &pdev->dev;
-+	dev->pdev = pdev;
-+
-+	ret = 0;
-+	ret = rpivid_hw_probe(dev);
-+	if (ret) {
-+		dev_err(&pdev->dev, "Failed to probe hardware\n");
-+		return ret;
-+	}
-+
-+	dev->dec_ops = &rpivid_dec_ops_h265;
-+
-+	mutex_init(&dev->dev_mutex);
-+
-+	ret = v4l2_device_register(&pdev->dev, &dev->v4l2_dev);
-+	if (ret) {
-+		dev_err(&pdev->dev, "Failed to register V4L2 device\n");
-+		return ret;
-+	}
-+
-+	vfd = &dev->vfd;
-+	vfd->lock = &dev->dev_mutex;
-+	vfd->v4l2_dev = &dev->v4l2_dev;
-+
-+	snprintf(vfd->name, sizeof(vfd->name), "%s", rpivid_video_device.name);
-+	video_set_drvdata(vfd, dev);
-+
-+	dev->m2m_dev = v4l2_m2m_init(&rpivid_m2m_ops);
-+	if (IS_ERR(dev->m2m_dev)) {
-+		v4l2_err(&dev->v4l2_dev,
-+			 "Failed to initialize V4L2 M2M device\n");
-+		ret = PTR_ERR(dev->m2m_dev);
-+
-+		goto err_v4l2;
-+	}
-+
-+	dev->mdev.dev = &pdev->dev;
-+	strscpy(dev->mdev.model, RPIVID_NAME, sizeof(dev->mdev.model));
-+	strscpy(dev->mdev.bus_info, "platform:" RPIVID_NAME,
-+		sizeof(dev->mdev.bus_info));
-+
-+	media_device_init(&dev->mdev);
-+	dev->mdev.ops = &rpivid_m2m_media_ops;
-+	dev->v4l2_dev.mdev = &dev->mdev;
-+
-+	ret = video_register_device(vfd, VFL_TYPE_VIDEO, video_nr);
-+	if (ret) {
-+		v4l2_err(&dev->v4l2_dev, "Failed to register video device\n");
-+		goto err_m2m;
-+	}
-+
-+	v4l2_info(&dev->v4l2_dev,
-+		  "Device registered as /dev/video%d\n", vfd->num);
-+
-+	ret = v4l2_m2m_register_media_controller(dev->m2m_dev, vfd,
-+						 MEDIA_ENT_F_PROC_VIDEO_DECODER);
-+	if (ret) {
-+		v4l2_err(&dev->v4l2_dev,
-+			 "Failed to initialize V4L2 M2M media controller\n");
-+		goto err_video;
-+	}
-+
-+	ret = media_device_register(&dev->mdev);
-+	if (ret) {
-+		v4l2_err(&dev->v4l2_dev, "Failed to register media device\n");
-+		goto err_m2m_mc;
-+	}
-+
-+	platform_set_drvdata(pdev, dev);
-+
-+	return 0;
-+
-+err_m2m_mc:
-+	v4l2_m2m_unregister_media_controller(dev->m2m_dev);
-+err_video:
-+	video_unregister_device(&dev->vfd);
-+err_m2m:
-+	v4l2_m2m_release(dev->m2m_dev);
-+err_v4l2:
-+	v4l2_device_unregister(&dev->v4l2_dev);
-+
-+	return ret;
-+}
-+
-+static int rpivid_remove(struct platform_device *pdev)
-+{
-+	struct rpivid_dev *dev = platform_get_drvdata(pdev);
-+
-+	if (media_devnode_is_registered(dev->mdev.devnode)) {
-+		media_device_unregister(&dev->mdev);
-+		v4l2_m2m_unregister_media_controller(dev->m2m_dev);
-+		media_device_cleanup(&dev->mdev);
-+	}
-+
-+	v4l2_m2m_release(dev->m2m_dev);
-+	video_unregister_device(&dev->vfd);
-+	v4l2_device_unregister(&dev->v4l2_dev);
-+
-+	rpivid_hw_remove(dev);
-+
-+	return 0;
-+}
-+
-+static const struct of_device_id rpivid_dt_match[] = {
-+	{
-+		.compatible = "raspberrypi,rpivid-vid-decoder",
-+	},
-+	{ /* sentinel */ }
-+};
-+MODULE_DEVICE_TABLE(of, rpivid_dt_match);
-+
-+static struct platform_driver rpivid_driver = {
-+	.probe		= rpivid_probe,
-+	.remove		= rpivid_remove,
-+	.driver		= {
-+		.name = RPIVID_NAME,
-+		.of_match_table	= of_match_ptr(rpivid_dt_match),
-+	},
-+};
-+module_platform_driver(rpivid_driver);
-+
-+MODULE_LICENSE("GPL v2");
-+MODULE_AUTHOR("John Cox <jc@kynesim.co.uk>");
-+MODULE_DESCRIPTION("Raspberry Pi HEVC V4L2 driver");
---- /dev/null
-+++ b/drivers/staging/media/rpivid/rpivid.h
-@@ -0,0 +1,203 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * Raspberry Pi HEVC driver
-+ *
-+ * Copyright (C) 2020 Raspberry Pi (Trading) Ltd
-+ *
-+ * Based on the Cedrus VPU driver, that is:
-+ *
-+ * Copyright (C) 2016 Florent Revest <florent.revest@free-electrons.com>
-+ * Copyright (C) 2018 Paul Kocialkowski <paul.kocialkowski@bootlin.com>
-+ * Copyright (C) 2018 Bootlin
-+ */
-+
-+#ifndef _RPIVID_H_
-+#define _RPIVID_H_
-+
-+#include <linux/clk.h>
-+#include <linux/platform_device.h>
-+#include <media/v4l2-ctrls.h>
-+#include <media/v4l2-device.h>
-+#include <media/v4l2-mem2mem.h>
-+#include <media/videobuf2-v4l2.h>
-+#include <media/videobuf2-dma-contig.h>
-+
-+#define OPT_DEBUG_POLL_IRQ  0
-+
-+#define RPIVID_DEC_ENV_COUNT 6
-+#define RPIVID_P1BUF_COUNT 3
-+#define RPIVID_P2BUF_COUNT 3
-+
-+#define RPIVID_NAME			"rpivid"
-+
-+#define RPIVID_CAPABILITY_UNTILED	BIT(0)
-+#define RPIVID_CAPABILITY_H265_DEC	BIT(1)
-+
-+#define RPIVID_QUIRK_NO_DMA_OFFSET	BIT(0)
-+
-+enum rpivid_irq_status {
-+	RPIVID_IRQ_NONE,
-+	RPIVID_IRQ_ERROR,
-+	RPIVID_IRQ_OK,
-+};
-+
-+struct rpivid_control {
-+	struct v4l2_ctrl_config cfg;
-+	unsigned char		required:1;
-+};
-+
-+struct rpivid_h265_run {
-+	u32 slice_ents;
-+	const struct v4l2_ctrl_hevc_sps			*sps;
-+	const struct v4l2_ctrl_hevc_pps			*pps;
-+	const struct v4l2_ctrl_hevc_decode_params      	*dec;
-+	const struct v4l2_ctrl_hevc_slice_params	*slice_params;
-+	const struct v4l2_ctrl_hevc_scaling_matrix	*scaling_matrix;
-+};
-+
-+struct rpivid_run {
-+	struct vb2_v4l2_buffer	*src;
-+	struct vb2_v4l2_buffer	*dst;
-+
-+	struct rpivid_h265_run	h265;
-+};
-+
-+struct rpivid_buffer {
-+	struct v4l2_m2m_buffer          m2m_buf;
-+};
-+
-+struct rpivid_dec_state;
-+struct rpivid_dec_env;
-+
-+struct rpivid_gptr {
-+	size_t size;
-+	__u8 *ptr;
-+	dma_addr_t addr;
-+	unsigned long attrs;
-+};
-+
-+struct rpivid_dev;
-+typedef void (*rpivid_irq_callback)(struct rpivid_dev *dev, void *ctx);
-+
-+struct rpivid_q_aux;
-+#define RPIVID_AUX_ENT_COUNT VB2_MAX_FRAME
-+
-+struct rpivid_ctx {
-+	struct v4l2_fh			fh;
-+	struct rpivid_dev		*dev;
-+
-+	struct v4l2_pix_format_mplane	src_fmt;
-+	struct v4l2_pix_format_mplane	dst_fmt;
-+	int dst_fmt_set;
-+
-+	int 				src_stream_on;
-+	int 				dst_stream_on;
-+
-+	// fatal_err is set if an error has occurred s.t. decode cannot
-+	// continue (such as running out of CMA)
-+	int fatal_err;
-+
-+	/* Lock for queue operations */
-+	struct mutex			ctx_mutex;
-+
-+	struct v4l2_ctrl_handler	hdl;
-+	struct v4l2_ctrl		**ctrls;
-+
-+	/* Decode state - stateless decoder my *** */
-+	/* state contains stuff that is only needed in phase0
-+	 * it could be held in dec_env but that would be wasteful
-+	 */
-+	struct rpivid_dec_state *state;
-+	struct rpivid_dec_env *dec0;
-+
-+	/* Spinlock protecting dec_free */
-+	spinlock_t dec_lock;
-+	struct rpivid_dec_env *dec_free;
-+
-+	struct rpivid_dec_env *dec_pool;
-+
-+	unsigned int p1idx;
-+	atomic_t p1out;
-+	struct rpivid_gptr bitbufs[RPIVID_P1BUF_COUNT];
-+
-+	/* *** Should be in dev *** */
-+	unsigned int p2idx;
-+	struct rpivid_gptr pu_bufs[RPIVID_P2BUF_COUNT];
-+	struct rpivid_gptr coeff_bufs[RPIVID_P2BUF_COUNT];
-+
-+	/* Spinlock protecting aux_free */
-+	spinlock_t aux_lock;
-+	struct rpivid_q_aux *aux_free;
-+
-+	struct rpivid_q_aux *aux_ents[RPIVID_AUX_ENT_COUNT];
-+
-+	unsigned int colmv_stride;
-+	unsigned int colmv_picsize;
-+};
-+
-+struct rpivid_dec_ops {
-+	void (*setup)(struct rpivid_ctx *ctx, struct rpivid_run *run);
-+	int (*start)(struct rpivid_ctx *ctx);
-+	void (*stop)(struct rpivid_ctx *ctx);
-+	void (*trigger)(struct rpivid_ctx *ctx);
-+};
-+
-+struct rpivid_variant {
-+	unsigned int	capabilities;
-+	unsigned int	quirks;
-+	unsigned int	mod_rate;
-+};
-+
-+struct rpivid_hw_irq_ent;
-+
-+#define RPIVID_ICTL_ENABLE_UNLIMITED (-1)
-+
-+struct rpivid_hw_irq_ctrl {
-+	/* Spinlock protecting claim and tail */
-+	spinlock_t lock;
-+	struct rpivid_hw_irq_ent *claim;
-+	struct rpivid_hw_irq_ent *tail;
-+
-+	/* Ent for pending irq - also prevents sched */
-+	struct rpivid_hw_irq_ent *irq;
-+	/* Non-zero => do not start a new job - outer layer sched pending */
-+	int no_sched;
-+	/* Enable count. -1 always OK, 0 do not sched, +ve shed & count down */
-+	int enable;
-+	/* Thread CB requested */
-+	bool thread_reqed;
-+};
-+
-+struct rpivid_dev {
-+	struct v4l2_device	v4l2_dev;
-+	struct video_device	vfd;
-+	struct media_device	mdev;
-+	struct media_pad	pad[2];
-+	struct platform_device	*pdev;
-+	struct device		*dev;
-+	struct v4l2_m2m_dev	*m2m_dev;
-+	const struct rpivid_dec_ops *dec_ops;
-+
-+	/* Device file mutex */
-+	struct mutex		dev_mutex;
-+
-+	void __iomem		*base_irq;
-+	void __iomem		*base_h265;
-+
-+	struct clk		*clock;
-+	unsigned long		max_clock_rate;
-+
-+	int			cache_align;
-+
-+	struct rpivid_hw_irq_ctrl ic_active1;
-+	struct rpivid_hw_irq_ctrl ic_active2;
-+};
-+
-+extern const struct rpivid_dec_ops rpivid_dec_ops_h265;
-+extern const struct v4l2_ctrl_ops rpivid_hevc_sps_ctrl_ops;
-+extern const struct v4l2_ctrl_ops rpivid_hevc_pps_ctrl_ops;
-+
-+struct v4l2_ctrl *rpivid_find_ctrl(struct rpivid_ctx *ctx, u32 id);
-+void *rpivid_find_control_data(struct rpivid_ctx *ctx, u32 id);
-+
-+#endif
---- /dev/null
-+++ b/drivers/staging/media/rpivid/rpivid_dec.c
-@@ -0,0 +1,96 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Raspberry Pi HEVC driver
-+ *
-+ * Copyright (C) 2020 Raspberry Pi (Trading) Ltd
-+ *
-+ * Based on the Cedrus VPU driver, that is:
-+ *
-+ * Copyright (C) 2016 Florent Revest <florent.revest@free-electrons.com>
-+ * Copyright (C) 2018 Paul Kocialkowski <paul.kocialkowski@bootlin.com>
-+ * Copyright (C) 2018 Bootlin
-+ */
-+
-+#include <media/v4l2-device.h>
-+#include <media/v4l2-ioctl.h>
-+#include <media/v4l2-event.h>
-+#include <media/v4l2-mem2mem.h>
-+
-+#include "rpivid.h"
-+#include "rpivid_dec.h"
-+
-+void rpivid_device_run(void *priv)
-+{
-+	struct rpivid_ctx *const ctx = priv;
-+	struct rpivid_dev *const dev = ctx->dev;
-+	struct rpivid_run run = {};
-+	struct media_request *src_req;
-+
-+	run.src = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
-+	run.dst = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
-+
-+	if (!run.src || !run.dst) {
-+		v4l2_err(&dev->v4l2_dev, "%s: Missing buffer: src=%p, dst=%p\n",
-+			 __func__, run.src, run.dst);
-+		goto fail;
-+	}
-+
-+	/* Apply request(s) controls */
-+	src_req = run.src->vb2_buf.req_obj.req;
-+	if (!src_req) {
-+		v4l2_err(&dev->v4l2_dev, "%s: Missing request\n", __func__);
-+		goto fail;
-+	}
-+
-+	v4l2_ctrl_request_setup(src_req, &ctx->hdl);
-+
-+	switch (ctx->src_fmt.pixelformat) {
-+	case V4L2_PIX_FMT_HEVC_SLICE:
-+	{
-+		const struct v4l2_ctrl *ctrl;
-+
-+		run.h265.sps =
-+			rpivid_find_control_data(ctx,
-+						 V4L2_CID_STATELESS_HEVC_SPS);
-+		run.h265.pps =
-+			rpivid_find_control_data(ctx,
-+						 V4L2_CID_STATELESS_HEVC_PPS);
-+		run.h265.dec =
-+			rpivid_find_control_data(ctx,
-+						 V4L2_CID_STATELESS_HEVC_DECODE_PARAMS);
-+
-+		ctrl = rpivid_find_ctrl(ctx,
-+					V4L2_CID_STATELESS_HEVC_SLICE_PARAMS);
-+		if (!ctrl || !ctrl->elems) {
-+			v4l2_err(&dev->v4l2_dev, "%s: Missing slice params\n",
-+				 __func__);
-+			goto fail;
-+		}
-+		run.h265.slice_ents = ctrl->elems;
-+		run.h265.slice_params = ctrl->p_cur.p;
-+
-+		run.h265.scaling_matrix =
-+			rpivid_find_control_data(ctx,
-+						 V4L2_CID_STATELESS_HEVC_SCALING_MATRIX);
-+		break;
-+	}
-+
-+	default:
-+		break;
-+	}
-+
-+	v4l2_m2m_buf_copy_metadata(run.src, run.dst, true);
-+
-+	dev->dec_ops->setup(ctx, &run);
-+
-+	/* Complete request(s) controls */
-+	v4l2_ctrl_request_complete(src_req, &ctx->hdl);
-+
-+	dev->dec_ops->trigger(ctx);
-+	return;
-+
-+fail:
-+	/* We really shouldn't get here but tidy up what we can */
-+	v4l2_m2m_buf_done_and_job_finish(dev->m2m_dev, ctx->fh.m2m_ctx,
-+					 VB2_BUF_STATE_ERROR);
-+}
---- /dev/null
-+++ b/drivers/staging/media/rpivid/rpivid_dec.h
-@@ -0,0 +1,19 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * Raspberry Pi HEVC driver
-+ *
-+ * Copyright (C) 2020 Raspberry Pi (Trading) Ltd
-+ *
-+ * Based on the Cedrus VPU driver, that is:
-+ *
-+ * Copyright (C) 2016 Florent Revest <florent.revest@free-electrons.com>
-+ * Copyright (C) 2018 Paul Kocialkowski <paul.kocialkowski@bootlin.com>
-+ * Copyright (C) 2018 Bootlin
-+ */
-+
-+#ifndef _RPIVID_DEC_H_
-+#define _RPIVID_DEC_H_
-+
-+void rpivid_device_run(void *priv);
-+
-+#endif
---- /dev/null
-+++ b/drivers/staging/media/rpivid/rpivid_h265.c
-@@ -0,0 +1,2698 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later
-+/*
-+ * Raspberry Pi HEVC driver
-+ *
-+ * Copyright (C) 2020 Raspberry Pi (Trading) Ltd
-+ *
-+ * Based on the Cedrus VPU driver, that is:
-+ *
-+ * Copyright (C) 2016 Florent Revest <florent.revest@free-electrons.com>
-+ * Copyright (C) 2018 Paul Kocialkowski <paul.kocialkowski@bootlin.com>
-+ * Copyright (C) 2018 Bootlin
-+ */
-+
-+#include <linux/delay.h>
-+#include <linux/types.h>
-+
-+#include <media/videobuf2-dma-contig.h>
-+
-+#include "rpivid.h"
-+#include "rpivid_hw.h"
-+#include "rpivid_video.h"
-+
-+#define DEBUG_TRACE_P1_CMD 0
-+#define DEBUG_TRACE_EXECUTION 0
-+
-+#define USE_REQUEST_PIN 1
-+
-+#if DEBUG_TRACE_EXECUTION
-+#define xtrace_in(dev_, de_)\
-+	v4l2_info(&(dev_)->v4l2_dev, "%s[%d]: in\n",   __func__,\
-+		  (de_) == NULL ? -1 : (de_)->decode_order)
-+#define xtrace_ok(dev_, de_)\
-+	v4l2_info(&(dev_)->v4l2_dev, "%s[%d]: ok\n",   __func__,\
-+		  (de_) == NULL ? -1 : (de_)->decode_order)
-+#define xtrace_fin(dev_, de_)\
-+	v4l2_info(&(dev_)->v4l2_dev, "%s[%d]: finish\n", __func__,\
-+		  (de_) == NULL ? -1 : (de_)->decode_order)
-+#define xtrace_fail(dev_, de_)\
-+	v4l2_info(&(dev_)->v4l2_dev, "%s[%d]: FAIL\n", __func__,\
-+		  (de_) == NULL ? -1 : (de_)->decode_order)
-+#else
-+#define xtrace_in(dev_, de_)
-+#define xtrace_ok(dev_, de_)
-+#define xtrace_fin(dev_, de_)
-+#define xtrace_fail(dev_, de_)
-+#endif
-+
-+enum hevc_slice_type {
-+	HEVC_SLICE_B = 0,
-+	HEVC_SLICE_P = 1,
-+	HEVC_SLICE_I = 2,
-+};
-+
-+enum hevc_layer { L0 = 0, L1 = 1 };
-+
-+static int gptr_alloc(struct rpivid_dev *const dev, struct rpivid_gptr *gptr,
-+		      size_t size, unsigned long attrs)
-+{
-+	gptr->size = size;
-+	gptr->attrs = attrs;
-+	gptr->addr = 0;
-+	gptr->ptr = dma_alloc_attrs(dev->dev, gptr->size, &gptr->addr,
-+				    GFP_KERNEL, gptr->attrs);
-+	return !gptr->ptr ? -ENOMEM : 0;
-+}
-+
-+static void gptr_free(struct rpivid_dev *const dev,
-+		      struct rpivid_gptr *const gptr)
-+{
-+	if (gptr->ptr)
-+		dma_free_attrs(dev->dev, gptr->size, gptr->ptr, gptr->addr,
-+			       gptr->attrs);
-+	gptr->size = 0;
-+	gptr->ptr = NULL;
-+	gptr->addr = 0;
-+	gptr->attrs = 0;
-+}
-+
-+/* Realloc but do not copy
-+ *
-+ * Frees then allocs.
-+ * If the alloc fails then it attempts to re-allocote the old size
-+ * On error then check gptr->ptr to determine if anything is currently
-+ * allocated.
-+ */
-+static int gptr_realloc_new(struct rpivid_dev * const dev,
-+			    struct rpivid_gptr * const gptr, size_t size)
-+{
-+	const size_t old_size = gptr->size;
-+
-+	if (size == gptr->size)
-+		return 0;
-+
-+	if (gptr->ptr)
-+		dma_free_attrs(dev->dev, gptr->size, gptr->ptr,
-+			       gptr->addr, gptr->attrs);
-+
-+	gptr->addr = 0;
-+	gptr->size = size;
-+	gptr->ptr = dma_alloc_attrs(dev->dev, gptr->size,
-+				    &gptr->addr, GFP_KERNEL, gptr->attrs);
-+
-+	if (!gptr->ptr) {
-+		gptr->addr = 0;
-+		gptr->size = old_size;
-+		gptr->ptr = dma_alloc_attrs(dev->dev, gptr->size,
-+					    &gptr->addr, GFP_KERNEL, gptr->attrs);
-+		if (!gptr->ptr) {
-+			gptr->size = 0;
-+			gptr->addr = 0;
-+			gptr->attrs = 0;
-+		}
-+		return -ENOMEM;
-+	}
-+
-+	return 0;
-+}
-+
-+static size_t next_size(const size_t x)
-+{
-+	return rpivid_round_up_size(x + 1);
-+}
-+
-+#define NUM_SCALING_FACTORS 4064 /* Not a typo = 0xbe0 + 0x400 */
-+
-+#define AXI_BASE64 0
-+
-+#define PROB_BACKUP ((20 << 12) + (20 << 6) + (0 << 0))
-+#define PROB_RELOAD ((20 << 12) + (20 << 0) + (0 << 6))
-+
-+#define HEVC_MAX_REFS V4L2_HEVC_DPB_ENTRIES_NUM_MAX
-+
-+//////////////////////////////////////////////////////////////////////////////
-+
-+struct rpi_cmd {
-+	u32 addr;
-+	u32 data;
-+} __packed;
-+
-+struct rpivid_q_aux {
-+	unsigned int refcount;
-+	unsigned int q_index;
-+	struct rpivid_q_aux *next;
-+	struct rpivid_gptr col;
-+};
-+
-+//////////////////////////////////////////////////////////////////////////////
-+
-+enum rpivid_decode_state {
-+	RPIVID_DECODE_SLICE_START,
-+	RPIVID_DECODE_SLICE_CONTINUE,
-+	RPIVID_DECODE_ERROR_CONTINUE,
-+	RPIVID_DECODE_ERROR_DONE,
-+	RPIVID_DECODE_PHASE1,
-+	RPIVID_DECODE_END,
-+};
-+
-+struct rpivid_dec_env {
-+	struct rpivid_ctx *ctx;
-+	struct rpivid_dec_env *next;
-+
-+	enum rpivid_decode_state state;
-+	unsigned int decode_order;
-+	int p1_status;		/* P1 status - what to realloc */
-+
-+	struct rpi_cmd *cmd_fifo;
-+	unsigned int cmd_len, cmd_max;
-+	unsigned int num_slice_msgs;
-+	unsigned int pic_width_in_ctbs_y;
-+	unsigned int pic_height_in_ctbs_y;
-+	unsigned int dpbno_col;
-+	u32 reg_slicestart;
-+	int collocated_from_l0_flag;
-+	/*
-+	 * Last CTB/Tile X,Y processed by (wpp_)entry_point
-+	 * Could be in _state as P0 only but needs updating where _state
-+	 * is const
-+	 */
-+	unsigned int entry_ctb_x;
-+	unsigned int entry_ctb_y;
-+	unsigned int entry_tile_x;
-+	unsigned int entry_tile_y;
-+	unsigned int entry_qp;
-+	u32 entry_slice;
-+
-+	u32 rpi_config2;
-+	u32 rpi_framesize;
-+	u32 rpi_currpoc;
-+
-+	struct vb2_v4l2_buffer *frame_buf; // Detached dest buffer
-+	struct vb2_v4l2_buffer *src_buf;   // Detached src buffer
-+	unsigned int frame_c_offset;
-+	unsigned int frame_stride;
-+	dma_addr_t frame_addr;
-+	dma_addr_t ref_addrs[16];
-+	struct rpivid_q_aux *frame_aux;
-+	struct rpivid_q_aux *col_aux;
-+
-+	dma_addr_t cmd_addr;
-+	size_t cmd_size;
-+
-+	dma_addr_t pu_base_vc;
-+	dma_addr_t coeff_base_vc;
-+	u32 pu_stride;
-+	u32 coeff_stride;
-+
-+	struct rpivid_gptr *bit_copy_gptr;
-+	size_t bit_copy_len;
-+
-+#define SLICE_MSGS_MAX (2 * HEVC_MAX_REFS * 8 + 3)
-+	u16 slice_msgs[SLICE_MSGS_MAX];
-+	u8 scaling_factors[NUM_SCALING_FACTORS];
-+
-+#if USE_REQUEST_PIN
-+	struct media_request *req_pin;
-+#else
-+	struct media_request_object *req_obj;
-+#endif
-+	struct rpivid_hw_irq_ent irq_ent;
-+};
-+
-+#define member_size(type, member) sizeof(((type *)0)->member)
-+
-+struct rpivid_dec_state {
-+	struct v4l2_ctrl_hevc_sps sps;
-+	struct v4l2_ctrl_hevc_pps pps;
-+
-+	// Helper vars & tables derived from sps/pps
-+	unsigned int log2_ctb_size;     /* log2 width of a CTB */
-+	unsigned int ctb_width;         /* Width in CTBs */
-+	unsigned int ctb_height;        /* Height in CTBs */
-+	unsigned int ctb_size;          /* Pic area in CTBs */
-+	unsigned int tile_width;        /* Width in tiles */
-+	unsigned int tile_height;       /* Height in tiles */
-+
-+	int *col_bd;
-+	int *row_bd;
-+	int *ctb_addr_rs_to_ts;
-+	int *ctb_addr_ts_to_rs;
-+
-+	// Aux starage for DPB
-+	// Hold refs
-+	struct rpivid_q_aux *ref_aux[HEVC_MAX_REFS];
-+	struct rpivid_q_aux *frame_aux;
-+
-+	// Slice vars
-+	unsigned int slice_idx;
-+	bool slice_temporal_mvp;  /* Slice flag but constant for frame */
-+	bool use_aux;
-+	bool mk_aux;
-+
-+	// Temp vars per run - don't actually need to persist
-+	u8 *src_buf;
-+	dma_addr_t src_addr;
-+	const struct v4l2_ctrl_hevc_slice_params *sh;
-+	const struct v4l2_ctrl_hevc_decode_params *dec;
-+	unsigned int nb_refs[2];
-+	unsigned int slice_qp;
-+	unsigned int max_num_merge_cand; // 0 if I-slice
-+	bool dependent_slice_segment_flag;
-+
-+	unsigned int start_ts;          /* slice_segment_addr -> ts */
-+	unsigned int start_ctb_x;       /* CTB X,Y of start_ts */
-+	unsigned int start_ctb_y;
-+	unsigned int prev_ctb_x;        /* CTB X,Y of start_ts - 1 */
-+	unsigned int prev_ctb_y;
-+};
-+
-+#if !USE_REQUEST_PIN
-+static void dst_req_obj_release(struct media_request_object *object)
-+{
-+	kfree(object);
-+}
-+
-+static const struct media_request_object_ops dst_req_obj_ops = {
-+	.release = dst_req_obj_release,
-+};
-+#endif
-+
-+static inline int clip_int(const int x, const int lo, const int hi)
-+{
-+	return x < lo ? lo : x > hi ? hi : x;
-+}
-+
-+//////////////////////////////////////////////////////////////////////////////
-+// Phase 1 command and bit FIFOs
-+
-+#if DEBUG_TRACE_P1_CMD
-+static int p1_z;
-+#endif
-+
-+static int cmds_check_space(struct rpivid_dec_env *const de, unsigned int n)
-+{
-+	struct rpi_cmd *a;
-+	unsigned int newmax;
-+
-+	if (n > 0x100000) {
-+		v4l2_err(&de->ctx->dev->v4l2_dev,
-+			 "%s: n %u implausible\n", __func__, n);
-+		return -ENOMEM;
-+	}
-+
-+	if (de->cmd_len + n <= de->cmd_max)
-+		return 0;
-+
-+	newmax = roundup_pow_of_two(de->cmd_len + n);
-+
-+	a = krealloc(de->cmd_fifo, newmax * sizeof(struct rpi_cmd),
-+		     GFP_KERNEL);
-+	if (!a) {
-+		v4l2_err(&de->ctx->dev->v4l2_dev,
-+			 "Failed cmd buffer realloc from %u to %u\n",
-+			 de->cmd_max, newmax);
-+		return -ENOMEM;
-+	}
-+	v4l2_info(&de->ctx->dev->v4l2_dev,
-+		  "cmd buffer realloc from %u to %u\n", de->cmd_max, newmax);
-+
-+	de->cmd_fifo = a;
-+	de->cmd_max = newmax;
-+	return 0;
-+}
-+
-+// ???? u16 addr - put in u32
-+static void p1_apb_write(struct rpivid_dec_env *const de, const u16 addr,
-+			 const u32 data)
-+{
-+	if (de->cmd_len >= de->cmd_max) {
-+		v4l2_err(&de->ctx->dev->v4l2_dev,
-+			 "%s: Overflow @ %d\n", __func__, de->cmd_len);
-+		return;
-+	}
-+
-+	de->cmd_fifo[de->cmd_len].addr = addr;
-+	de->cmd_fifo[de->cmd_len].data = data;
-+
-+#if DEBUG_TRACE_P1_CMD
-+	if (++p1_z < 256) {
-+		v4l2_info(&de->ctx->dev->v4l2_dev, "[%02x] %x %x\n",
-+			  de->cmd_len, addr, data);
-+	}
-+#endif
-+	de->cmd_len++;
-+}
-+
-+static int ctb_to_tile(unsigned int ctb, unsigned int *bd, int num)
-+{
-+	int i;
-+
-+	for (i = 1; ctb >= bd[i]; i++)
-+		; // bd[] has num+1 elements; bd[0]=0;
-+	return i - 1;
-+}
-+
-+static unsigned int ctb_to_tile_x(const struct rpivid_dec_state *const s,
-+				  const unsigned int ctb_x)
-+{
-+	return ctb_to_tile(ctb_x, s->col_bd, s->tile_width);
-+}
-+
-+static unsigned int ctb_to_tile_y(const struct rpivid_dec_state *const s,
-+				  const unsigned int ctb_y)
-+{
-+	return ctb_to_tile(ctb_y, s->row_bd, s->tile_height);
-+}
-+
-+static void aux_q_free(struct rpivid_ctx *const ctx,
-+		       struct rpivid_q_aux *const aq)
-+{
-+	struct rpivid_dev *const dev = ctx->dev;
-+
-+	gptr_free(dev, &aq->col);
-+	kfree(aq);
-+}
-+
-+static struct rpivid_q_aux *aux_q_alloc(struct rpivid_ctx *const ctx,
-+					const unsigned int q_index)
-+{
-+	struct rpivid_dev *const dev = ctx->dev;
-+	struct rpivid_q_aux *const aq = kzalloc(sizeof(*aq), GFP_KERNEL);
-+
-+	if (!aq)
-+		return NULL;
-+
-+	if (gptr_alloc(dev, &aq->col, ctx->colmv_picsize,
-+		       DMA_ATTR_FORCE_CONTIGUOUS | DMA_ATTR_NO_KERNEL_MAPPING))
-+		goto fail;
-+
-+	/*
-+	 * Spinlock not required as called in P0 only and
-+	 * aux checks done by _new
-+	 */
-+	aq->refcount = 1;
-+	aq->q_index = q_index;
-+	ctx->aux_ents[q_index] = aq;
-+	return aq;
-+
-+fail:
-+	kfree(aq);
-+	return NULL;
-+}
-+
-+static struct rpivid_q_aux *aux_q_new(struct rpivid_ctx *const ctx,
-+				      const unsigned int q_index)
-+{
-+	struct rpivid_q_aux *aq;
-+	unsigned long lockflags;
-+
-+	spin_lock_irqsave(&ctx->aux_lock, lockflags);
-+	/*
-+	 * If we already have this allocated to a slot then use that
-+	 * and assume that it will all work itself out in the pipeline
-+	 */
-+	if ((aq = ctx->aux_ents[q_index]) != NULL) {
-+		++aq->refcount;
-+	} else if ((aq = ctx->aux_free) != NULL) {
-+		ctx->aux_free = aq->next;
-+		aq->next = NULL;
-+		aq->refcount = 1;
-+		aq->q_index = q_index;
-+		ctx->aux_ents[q_index] = aq;
-+	}
-+	spin_unlock_irqrestore(&ctx->aux_lock, lockflags);
-+
-+	if (!aq)
-+		aq = aux_q_alloc(ctx, q_index);
-+
-+	return aq;
-+}
-+
-+static struct rpivid_q_aux *aux_q_ref_idx(struct rpivid_ctx *const ctx,
-+					  const int q_index)
-+{
-+	unsigned long lockflags;
-+	struct rpivid_q_aux *aq;
-+
-+	spin_lock_irqsave(&ctx->aux_lock, lockflags);
-+	if ((aq = ctx->aux_ents[q_index]) != NULL)
-+		++aq->refcount;
-+	spin_unlock_irqrestore(&ctx->aux_lock, lockflags);
-+
-+	return aq;
-+}
-+
-+static struct rpivid_q_aux *aux_q_ref(struct rpivid_ctx *const ctx,
-+				      struct rpivid_q_aux *const aq)
-+{
-+	if (aq) {
-+		unsigned long lockflags;
-+
-+		spin_lock_irqsave(&ctx->aux_lock, lockflags);
-+
-+		++aq->refcount;
-+
-+		spin_unlock_irqrestore(&ctx->aux_lock, lockflags);
-+	}
-+	return aq;
-+}
-+
-+static void aux_q_release(struct rpivid_ctx *const ctx,
-+			  struct rpivid_q_aux **const paq)
-+{
-+	struct rpivid_q_aux *const aq = *paq;
-+	unsigned long lockflags;
-+
-+	if (!aq)
-+		return;
-+
-+	*paq = NULL;
-+
-+	spin_lock_irqsave(&ctx->aux_lock, lockflags);
-+	if (--aq->refcount == 0) {
-+		aq->next = ctx->aux_free;
-+		ctx->aux_free = aq;
-+		ctx->aux_ents[aq->q_index] = NULL;
-+		aq->q_index = ~0U;
-+	}
-+	spin_unlock_irqrestore(&ctx->aux_lock, lockflags);
-+}
-+
-+static void aux_q_init(struct rpivid_ctx *const ctx)
-+{
-+	spin_lock_init(&ctx->aux_lock);
-+	ctx->aux_free = NULL;
-+}
-+
-+static void aux_q_uninit(struct rpivid_ctx *const ctx)
-+{
-+	struct rpivid_q_aux *aq;
-+
-+	ctx->colmv_picsize = 0;
-+	ctx->colmv_stride = 0;
-+	while ((aq = ctx->aux_free) != NULL) {
-+		ctx->aux_free = aq->next;
-+		aux_q_free(ctx, aq);
-+	}
-+}
-+
-+//////////////////////////////////////////////////////////////////////////////
-+
-+/*
-+ * Initialisation process for context variables (CABAC init)
-+ * see H.265 9.3.2.2
-+ *
-+ * N.B. If comparing with FFmpeg note that this h/w uses slightly different
-+ * offsets to FFmpegs array
-+ */
-+
-+/* Actual number of values */
-+#define RPI_PROB_VALS 154U
-+/* Rounded up as we copy words */
-+#define RPI_PROB_ARRAY_SIZE ((154 + 3) & ~3)
-+
-+/* Initialiser values - see tables H.265 9-4 through 9-42 */
-+static const u8 prob_init[3][156] = {
-+	{
-+		153, 200, 139, 141, 157, 154, 154, 154, 154, 154, 184, 154, 154,
-+		154, 184, 63,  154, 154, 154, 154, 154, 154, 154, 154, 154, 154,
-+		154, 154, 154, 153, 138, 138, 111, 141, 94,  138, 182, 154, 154,
-+		154, 140, 92,  137, 138, 140, 152, 138, 139, 153, 74,  149, 92,
-+		139, 107, 122, 152, 140, 179, 166, 182, 140, 227, 122, 197, 110,
-+		110, 124, 125, 140, 153, 125, 127, 140, 109, 111, 143, 127, 111,
-+		79,  108, 123, 63,  110, 110, 124, 125, 140, 153, 125, 127, 140,
-+		109, 111, 143, 127, 111, 79,  108, 123, 63,  91,  171, 134, 141,
-+		138, 153, 136, 167, 152, 152, 139, 139, 111, 111, 125, 110, 110,
-+		94,  124, 108, 124, 107, 125, 141, 179, 153, 125, 107, 125, 141,
-+		179, 153, 125, 107, 125, 141, 179, 153, 125, 140, 139, 182, 182,
-+		152, 136, 152, 136, 153, 136, 139, 111, 136, 139, 111, 0,   0,
-+	},
-+	{
-+		153, 185, 107, 139, 126, 197, 185, 201, 154, 149, 154, 139, 154,
-+		154, 154, 152, 110, 122, 95,  79,  63,  31,  31,  153, 153, 168,
-+		140, 198, 79,  124, 138, 94,  153, 111, 149, 107, 167, 154, 154,
-+		154, 154, 196, 196, 167, 154, 152, 167, 182, 182, 134, 149, 136,
-+		153, 121, 136, 137, 169, 194, 166, 167, 154, 167, 137, 182, 125,
-+		110, 94,  110, 95,  79,  125, 111, 110, 78,  110, 111, 111, 95,
-+		94,  108, 123, 108, 125, 110, 94,  110, 95,  79,  125, 111, 110,
-+		78,  110, 111, 111, 95,  94,  108, 123, 108, 121, 140, 61,  154,
-+		107, 167, 91,  122, 107, 167, 139, 139, 155, 154, 139, 153, 139,
-+		123, 123, 63,  153, 166, 183, 140, 136, 153, 154, 166, 183, 140,
-+		136, 153, 154, 166, 183, 140, 136, 153, 154, 170, 153, 123, 123,
-+		107, 121, 107, 121, 167, 151, 183, 140, 151, 183, 140, 0,   0,
-+	},
-+	{
-+		153, 160, 107, 139, 126, 197, 185, 201, 154, 134, 154, 139, 154,
-+		154, 183, 152, 154, 137, 95,  79,  63,  31,  31,  153, 153, 168,
-+		169, 198, 79,  224, 167, 122, 153, 111, 149, 92,  167, 154, 154,
-+		154, 154, 196, 167, 167, 154, 152, 167, 182, 182, 134, 149, 136,
-+		153, 121, 136, 122, 169, 208, 166, 167, 154, 152, 167, 182, 125,
-+		110, 124, 110, 95,  94,  125, 111, 111, 79,  125, 126, 111, 111,
-+		79,  108, 123, 93,  125, 110, 124, 110, 95,  94,  125, 111, 111,
-+		79,  125, 126, 111, 111, 79,  108, 123, 93,  121, 140, 61,  154,
-+		107, 167, 91,  107, 107, 167, 139, 139, 170, 154, 139, 153, 139,
-+		123, 123, 63,  124, 166, 183, 140, 136, 153, 154, 166, 183, 140,
-+		136, 153, 154, 166, 183, 140, 136, 153, 154, 170, 153, 138, 138,
-+		122, 121, 122, 121, 167, 151, 183, 140, 151, 183, 140, 0,   0,
-+	},
-+};
-+
-+#define CMDS_WRITE_PROB ((RPI_PROB_ARRAY_SIZE / 4) + 1)
-+static void write_prob(struct rpivid_dec_env *const de,
-+		       const struct rpivid_dec_state *const s)
-+{
-+	u8 dst[RPI_PROB_ARRAY_SIZE];
-+
-+	const unsigned int init_type =
-+		((s->sh->flags & V4L2_HEVC_SLICE_PARAMS_FLAG_CABAC_INIT) != 0 &&
-+		 s->sh->slice_type != HEVC_SLICE_I) ?
-+			s->sh->slice_type + 1 :
-+			2 - s->sh->slice_type;
-+	const u8 *p = prob_init[init_type];
-+	const int q = clip_int(s->slice_qp, 0, 51);
-+	unsigned int i;
-+
-+	for (i = 0; i < RPI_PROB_VALS; i++) {
-+		int init_value = p[i];
-+		int m = (init_value >> 4) * 5 - 45;
-+		int n = ((init_value & 15) << 3) - 16;
-+		int pre = 2 * (((m * q) >> 4) + n) - 127;
-+
-+		pre ^= pre >> 31;
-+		if (pre > 124)
-+			pre = 124 + (pre & 1);
-+		dst[i] = pre;
-+	}
-+	for (i = RPI_PROB_VALS; i != RPI_PROB_ARRAY_SIZE; ++i)
-+		dst[i] = 0;
-+
-+	for (i = 0; i < RPI_PROB_ARRAY_SIZE; i += 4)
-+		p1_apb_write(de, 0x1000 + i,
-+			     dst[i] + (dst[i + 1] << 8) + (dst[i + 2] << 16) +
-+				     (dst[i + 3] << 24));
-+
-+	/*
-+	 * Having written the prob array back it up
-+	 * This is not always needed but is a small overhead that simplifies
-+	 * (and speeds up) some multi-tile & WPP scenarios
-+	 * There are no scenarios where having written a prob we ever want
-+	 * a previous (non-initial) state back
-+	 */
-+	p1_apb_write(de, RPI_TRANSFER, PROB_BACKUP);
-+}
-+
-+#define CMDS_WRITE_SCALING_FACTORS NUM_SCALING_FACTORS
-+static void write_scaling_factors(struct rpivid_dec_env *const de)
-+{
-+	int i;
-+	const u8 *p = (u8 *)de->scaling_factors;
-+
-+	for (i = 0; i < NUM_SCALING_FACTORS; i += 4, p += 4)
-+		p1_apb_write(de, 0x2000 + i,
-+			     p[0] + (p[1] << 8) + (p[2] << 16) + (p[3] << 24));
-+}
-+
-+static inline __u32 dma_to_axi_addr(dma_addr_t a)
-+{
-+	return (__u32)(a >> 6);
-+}
-+
-+#define CMDS_WRITE_BITSTREAM 4
-+static int write_bitstream(struct rpivid_dec_env *const de,
-+			   const struct rpivid_dec_state *const s)
-+{
-+	// Note that FFmpeg V4L2 does not remove emulation prevention bytes,
-+	// so this is matched in the configuration here.
-+	// Whether that is the correct behaviour or not is not clear in the
-+	// spec.
-+	const int rpi_use_emu = 1;
-+	unsigned int offset = s->sh->data_byte_offset;
-+	const unsigned int len = (s->sh->bit_size + 7) / 8 - offset;
-+	dma_addr_t addr;
-+
-+	if (s->src_addr != 0) {
-+		addr = s->src_addr + offset;
-+	} else {
-+		if (len + de->bit_copy_len > de->bit_copy_gptr->size) {
-+			v4l2_warn(&de->ctx->dev->v4l2_dev,
-+				  "Bit copy buffer overflow: size=%zu, offset=%zu, len=%u\n",
-+				  de->bit_copy_gptr->size,
-+				  de->bit_copy_len, len);
-+			return -ENOMEM;
-+		}
-+		memcpy(de->bit_copy_gptr->ptr + de->bit_copy_len,
-+		       s->src_buf + offset, len);
-+		addr = de->bit_copy_gptr->addr + de->bit_copy_len;
-+		de->bit_copy_len += (len + 63) & ~63;
-+	}
-+	offset = addr & 63;
-+
-+	p1_apb_write(de, RPI_BFBASE, dma_to_axi_addr(addr));
-+	p1_apb_write(de, RPI_BFNUM, len);
-+	p1_apb_write(de, RPI_BFCONTROL, offset + (1 << 7)); // Stop
-+	p1_apb_write(de, RPI_BFCONTROL, offset + (rpi_use_emu << 6));
-+	return 0;
-+}
-+
-+//////////////////////////////////////////////////////////////////////////////
-+
-+/*
-+ * The slice constant part of the slice register - width and height need to
-+ * be ORed in later as they are per-tile / WPP-row
-+ */
-+static u32 slice_reg_const(const struct rpivid_dec_state *const s)
-+{
-+	u32 x = (s->max_num_merge_cand << 0) |
-+		(s->nb_refs[L0] << 4) |
-+		(s->nb_refs[L1] << 8) |
-+		(s->sh->slice_type << 12);
-+
-+	if (s->sh->flags & V4L2_HEVC_SLICE_PARAMS_FLAG_SLICE_SAO_LUMA)
-+		x |= BIT(14);
-+	if (s->sh->flags & V4L2_HEVC_SLICE_PARAMS_FLAG_SLICE_SAO_CHROMA)
-+		x |= BIT(15);
-+	if (s->sh->slice_type == HEVC_SLICE_B &&
-+	    (s->sh->flags & V4L2_HEVC_SLICE_PARAMS_FLAG_MVD_L1_ZERO))
-+		x |= BIT(16);
-+
-+	return x;
-+}
-+
-+//////////////////////////////////////////////////////////////////////////////
-+
-+#define CMDS_NEW_SLICE_SEGMENT (4 + CMDS_WRITE_SCALING_FACTORS)
-+static void new_slice_segment(struct rpivid_dec_env *const de,
-+			      const struct rpivid_dec_state *const s)
-+{
-+	const struct v4l2_ctrl_hevc_sps *const sps = &s->sps;
-+	const struct v4l2_ctrl_hevc_pps *const pps = &s->pps;
-+
-+	p1_apb_write(de,
-+		     RPI_SPS0,
-+		     ((sps->log2_min_luma_coding_block_size_minus3 + 3) << 0) |
-+		     (s->log2_ctb_size << 4) |
-+		     ((sps->log2_min_luma_transform_block_size_minus2 + 2)
-+							<< 8) |
-+		     ((sps->log2_min_luma_transform_block_size_minus2 + 2 +
-+		       sps->log2_diff_max_min_luma_transform_block_size)
-+						<< 12) |
-+		     ((sps->bit_depth_luma_minus8 + 8) << 16) |
-+		     ((sps->bit_depth_chroma_minus8 + 8) << 20) |
-+		     (sps->max_transform_hierarchy_depth_intra << 24) |
-+		     (sps->max_transform_hierarchy_depth_inter << 28));
-+
-+	p1_apb_write(de,
-+		     RPI_SPS1,
-+		     ((sps->pcm_sample_bit_depth_luma_minus1 + 1) << 0) |
-+		     ((sps->pcm_sample_bit_depth_chroma_minus1 + 1) << 4) |
-+		     ((sps->log2_min_pcm_luma_coding_block_size_minus3 + 3)
-+						<< 8) |
-+		     ((sps->log2_min_pcm_luma_coding_block_size_minus3 + 3 +
-+		       sps->log2_diff_max_min_pcm_luma_coding_block_size)
-+						<< 12) |
-+		     (((sps->flags & V4L2_HEVC_SPS_FLAG_SEPARATE_COLOUR_PLANE) ?
-+				0 : sps->chroma_format_idc) << 16) |
-+		     ((!!(sps->flags & V4L2_HEVC_SPS_FLAG_AMP_ENABLED)) << 18) |
-+		     ((!!(sps->flags & V4L2_HEVC_SPS_FLAG_PCM_ENABLED)) << 19) |
-+		     ((!!(sps->flags & V4L2_HEVC_SPS_FLAG_SCALING_LIST_ENABLED))
-+						<< 20) |
-+		     ((!!(sps->flags &
-+			   V4L2_HEVC_SPS_FLAG_STRONG_INTRA_SMOOTHING_ENABLED))
-+						<< 21));
-+
-+	p1_apb_write(de,
-+		     RPI_PPS,
-+		     ((s->log2_ctb_size - pps->diff_cu_qp_delta_depth) << 0) |
-+		     ((!!(pps->flags & V4L2_HEVC_PPS_FLAG_CU_QP_DELTA_ENABLED))
-+						 << 4) |
-+		     ((!!(pps->flags &
-+				V4L2_HEVC_PPS_FLAG_TRANSQUANT_BYPASS_ENABLED))
-+						 << 5) |
-+		     ((!!(pps->flags & V4L2_HEVC_PPS_FLAG_TRANSFORM_SKIP_ENABLED))
-+						 << 6) |
-+		     ((!!(pps->flags &
-+				V4L2_HEVC_PPS_FLAG_SIGN_DATA_HIDING_ENABLED))
-+						<< 7) |
-+		     (((pps->pps_cb_qp_offset + s->sh->slice_cb_qp_offset) & 255)
-+						<< 8) |
-+		     (((pps->pps_cr_qp_offset + s->sh->slice_cr_qp_offset) & 255)
-+						<< 16) |
-+		     ((!!(pps->flags &
-+				V4L2_HEVC_PPS_FLAG_CONSTRAINED_INTRA_PRED))
-+						<< 24));
-+
-+	if (!s->start_ts &&
-+	    (sps->flags & V4L2_HEVC_SPS_FLAG_SCALING_LIST_ENABLED) != 0)
-+		write_scaling_factors(de);
-+
-+	if (!s->dependent_slice_segment_flag) {
-+		int ctb_col = s->sh->slice_segment_addr %
-+							de->pic_width_in_ctbs_y;
-+		int ctb_row = s->sh->slice_segment_addr /
-+							de->pic_width_in_ctbs_y;
-+
-+		de->reg_slicestart = (ctb_col << 0) + (ctb_row << 16);
-+	}
-+
-+	p1_apb_write(de, RPI_SLICESTART, de->reg_slicestart);
-+}
-+
-+//////////////////////////////////////////////////////////////////////////////
-+// Slice messages
-+
-+static void msg_slice(struct rpivid_dec_env *const de, const u16 msg)
-+{
-+	de->slice_msgs[de->num_slice_msgs++] = msg;
-+}
-+
-+#define CMDS_PROGRAM_SLICECMDS (1 + SLICE_MSGS_MAX)
-+static void program_slicecmds(struct rpivid_dec_env *const de,
-+			      const int sliceid)
-+{
-+	int i;
-+
-+	p1_apb_write(de, RPI_SLICECMDS, de->num_slice_msgs + (sliceid << 8));
-+
-+	for (i = 0; i < de->num_slice_msgs; i++)
-+		p1_apb_write(de, 0x4000 + 4 * i, de->slice_msgs[i] & 0xffff);
-+}
-+
-+// NoBackwardPredictionFlag 8.3.5
-+// Simply checks POCs
-+static int has_backward(const struct v4l2_hevc_dpb_entry *const dpb,
-+			const __u8 *const idx, const unsigned int n,
-+			const s32 cur_poc)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < n; ++i) {
-+		if (cur_poc < dpb[idx[i]].pic_order_cnt_val)
-+			return 0;
-+	}
-+	return 1;
-+}
-+
-+static void pre_slice_decode(struct rpivid_dec_env *const de,
-+			     const struct rpivid_dec_state *const s)
-+{
-+	const struct v4l2_ctrl_hevc_slice_params *const sh = s->sh;
-+	const struct v4l2_ctrl_hevc_decode_params *const dec = s->dec;
-+	int weighted_pred_flag, idx;
-+	u16 cmd_slice;
-+	unsigned int collocated_from_l0_flag;
-+
-+	de->num_slice_msgs = 0;
-+
-+	cmd_slice = 0;
-+	if (sh->slice_type == HEVC_SLICE_I)
-+		cmd_slice = 1;
-+	if (sh->slice_type == HEVC_SLICE_P)
-+		cmd_slice = 2;
-+	if (sh->slice_type == HEVC_SLICE_B)
-+		cmd_slice = 3;
-+
-+	cmd_slice |= (s->nb_refs[L0] << 2) | (s->nb_refs[L1] << 6) |
-+		     (s->max_num_merge_cand << 11);
-+
-+	collocated_from_l0_flag =
-+		!s->slice_temporal_mvp ||
-+		sh->slice_type != HEVC_SLICE_B ||
-+		(sh->flags & V4L2_HEVC_SLICE_PARAMS_FLAG_COLLOCATED_FROM_L0);
-+	cmd_slice |= collocated_from_l0_flag << 14;
-+
-+	if (sh->slice_type == HEVC_SLICE_P || sh->slice_type == HEVC_SLICE_B) {
-+		// Flag to say all reference pictures are from the past
-+		const int no_backward_pred_flag =
-+			has_backward(dec->dpb, sh->ref_idx_l0, s->nb_refs[L0],
-+				     sh->slice_pic_order_cnt) &&
-+			has_backward(dec->dpb, sh->ref_idx_l1, s->nb_refs[L1],
-+				     sh->slice_pic_order_cnt);
-+		cmd_slice |= no_backward_pred_flag << 10;
-+		msg_slice(de, cmd_slice);
-+
-+		if (s->slice_temporal_mvp) {
-+			const __u8 *const rpl = collocated_from_l0_flag ?
-+						sh->ref_idx_l0 : sh->ref_idx_l1;
-+			de->dpbno_col = rpl[sh->collocated_ref_idx];
-+			//v4l2_info(&de->ctx->dev->v4l2_dev,
-+			//	    "L0=%d col_ref_idx=%d,
-+			//          dpb_no=%d\n", collocated_from_l0_flag,
-+			//          sh->collocated_ref_idx, de->dpbno_col);
-+		}
-+
-+		// Write reference picture descriptions
-+		weighted_pred_flag =
-+			sh->slice_type == HEVC_SLICE_P ?
-+				!!(s->pps.flags & V4L2_HEVC_PPS_FLAG_WEIGHTED_PRED) :
-+				!!(s->pps.flags & V4L2_HEVC_PPS_FLAG_WEIGHTED_BIPRED);
-+
-+		for (idx = 0; idx < s->nb_refs[L0]; ++idx) {
-+			unsigned int dpb_no = sh->ref_idx_l0[idx];
-+			//v4l2_info(&de->ctx->dev->v4l2_dev,
-+			//	  "L0[%d]=dpb[%d]\n", idx, dpb_no);
-+
-+			msg_slice(de,
-+				  dpb_no |
-+				  ((dec->dpb[dpb_no].flags &
-+					V4L2_HEVC_DPB_ENTRY_LONG_TERM_REFERENCE) ?
-+						 (1 << 4) : 0) |
-+				  (weighted_pred_flag ? (3 << 5) : 0));
-+			msg_slice(de, dec->dpb[dpb_no].pic_order_cnt_val & 0xffff);
-+
-+			if (weighted_pred_flag) {
-+				const struct v4l2_hevc_pred_weight_table
-+					*const w = &sh->pred_weight_table;
-+				const int luma_weight_denom =
-+					(1 << w->luma_log2_weight_denom);
-+				const unsigned int chroma_log2_weight_denom =
-+					(w->luma_log2_weight_denom +
-+					 w->delta_chroma_log2_weight_denom);
-+				const int chroma_weight_denom =
-+					(1 << chroma_log2_weight_denom);
-+
-+				msg_slice(de,
-+					  w->luma_log2_weight_denom |
-+					  (((w->delta_luma_weight_l0[idx] +
-+					     luma_weight_denom) & 0x1ff)
-+						 << 3));
-+				msg_slice(de, w->luma_offset_l0[idx] & 0xff);
-+				msg_slice(de,
-+					  chroma_log2_weight_denom |
-+					  (((w->delta_chroma_weight_l0[idx][0] +
-+					     chroma_weight_denom) & 0x1ff)
-+						   << 3));
-+				msg_slice(de,
-+					  w->chroma_offset_l0[idx][0] & 0xff);
-+				msg_slice(de,
-+					  chroma_log2_weight_denom |
-+					  (((w->delta_chroma_weight_l0[idx][1] +
-+					     chroma_weight_denom) & 0x1ff)
-+						   << 3));
-+				msg_slice(de,
-+					  w->chroma_offset_l0[idx][1] & 0xff);
-+			}
-+		}
-+
-+		for (idx = 0; idx < s->nb_refs[L1]; ++idx) {
-+			unsigned int dpb_no = sh->ref_idx_l1[idx];
-+			//v4l2_info(&de->ctx->dev->v4l2_dev,
-+			//          "L1[%d]=dpb[%d]\n", idx, dpb_no);
-+			msg_slice(de,
-+				  dpb_no |
-+				  ((dec->dpb[dpb_no].flags &
-+					 V4L2_HEVC_DPB_ENTRY_LONG_TERM_REFERENCE) ?
-+						 (1 << 4) : 0) |
-+					(weighted_pred_flag ? (3 << 5) : 0));
-+			msg_slice(de, dec->dpb[dpb_no].pic_order_cnt_val & 0xffff);
-+			if (weighted_pred_flag) {
-+				const struct v4l2_hevc_pred_weight_table
-+					*const w = &sh->pred_weight_table;
-+				const int luma_weight_denom =
-+					(1 << w->luma_log2_weight_denom);
-+				const unsigned int chroma_log2_weight_denom =
-+					(w->luma_log2_weight_denom +
-+					 w->delta_chroma_log2_weight_denom);
-+				const int chroma_weight_denom =
-+					(1 << chroma_log2_weight_denom);
-+
-+				msg_slice(de,
-+					  w->luma_log2_weight_denom |
-+					  (((w->delta_luma_weight_l1[idx] +
-+					     luma_weight_denom) & 0x1ff) << 3));
-+				msg_slice(de, w->luma_offset_l1[idx] & 0xff);
-+				msg_slice(de,
-+					  chroma_log2_weight_denom |
-+					  (((w->delta_chroma_weight_l1[idx][0] +
-+					     chroma_weight_denom) & 0x1ff)
-+							<< 3));
-+				msg_slice(de,
-+					  w->chroma_offset_l1[idx][0] & 0xff);
-+				msg_slice(de,
-+					  chroma_log2_weight_denom |
-+					  (((w->delta_chroma_weight_l1[idx][1] +
-+					     chroma_weight_denom) & 0x1ff)
-+						   << 3));
-+				msg_slice(de,
-+					  w->chroma_offset_l1[idx][1] & 0xff);
-+			}
-+		}
-+	} else {
-+		msg_slice(de, cmd_slice);
-+	}
-+
-+	msg_slice(de,
-+		  (sh->slice_beta_offset_div2 & 15) |
-+		  ((sh->slice_tc_offset_div2 & 15) << 4) |
-+		  ((sh->flags &
-+		    V4L2_HEVC_SLICE_PARAMS_FLAG_SLICE_DEBLOCKING_FILTER_DISABLED) ?
-+						1 << 8 : 0) |
-+		  ((sh->flags &
-+			  V4L2_HEVC_SLICE_PARAMS_FLAG_SLICE_LOOP_FILTER_ACROSS_SLICES_ENABLED) ?
-+						1 << 9 : 0) |
-+		  ((s->pps.flags &
-+			  V4L2_HEVC_PPS_FLAG_LOOP_FILTER_ACROSS_TILES_ENABLED) ?
-+						1 << 10 : 0));
-+
-+	msg_slice(de, ((sh->slice_cr_qp_offset & 31) << 5) +
-+		       (sh->slice_cb_qp_offset & 31)); // CMD_QPOFF
-+}
-+
-+#define CMDS_WRITE_SLICE 1
-+static void write_slice(struct rpivid_dec_env *const de,
-+			const struct rpivid_dec_state *const s,
-+			const u32 slice_const,
-+			const unsigned int ctb_col,
-+			const unsigned int ctb_row)
-+{
-+	const unsigned int cs = (1 << s->log2_ctb_size);
-+	const unsigned int w_last = s->sps.pic_width_in_luma_samples & (cs - 1);
-+	const unsigned int h_last = s->sps.pic_height_in_luma_samples & (cs - 1);
-+
-+	p1_apb_write(de, RPI_SLICE,
-+		     slice_const |
-+		     ((ctb_col + 1 < s->ctb_width || !w_last ?
-+				cs : w_last) << 17) |
-+		     ((ctb_row + 1 < s->ctb_height || !h_last ?
-+				cs : h_last) << 24));
-+}
-+
-+#define PAUSE_MODE_WPP  1
-+#define PAUSE_MODE_TILE 0xffff
-+
-+/*
-+ * N.B. This can be called to fill in data from the previous slice so must not
-+ * use any state data that may change from slice to slice (e.g. qp)
-+ */
-+#define CMDS_NEW_ENTRY_POINT (6 + CMDS_WRITE_SLICE)
-+static void new_entry_point(struct rpivid_dec_env *const de,
-+			    const struct rpivid_dec_state *const s,
-+			    const bool do_bte,
-+			    const bool reset_qp_y,
-+			    const u32 pause_mode,
-+			    const unsigned int tile_x,
-+			    const unsigned int tile_y,
-+			    const unsigned int ctb_col,
-+			    const unsigned int ctb_row,
-+			    const unsigned int slice_qp,
-+			    const u32 slice_const)
-+{
-+	const unsigned int endx = s->col_bd[tile_x + 1] - 1;
-+	const unsigned int endy = (pause_mode == PAUSE_MODE_WPP) ?
-+		ctb_row : s->row_bd[tile_y + 1] - 1;
-+
-+	p1_apb_write(de, RPI_TILESTART,
-+		     s->col_bd[tile_x] | (s->row_bd[tile_y] << 16));
-+	p1_apb_write(de, RPI_TILEEND, endx | (endy << 16));
-+
-+	if (do_bte)
-+		p1_apb_write(de, RPI_BEGINTILEEND, endx | (endy << 16));
-+
-+	write_slice(de, s, slice_const, endx, endy);
-+
-+	if (reset_qp_y) {
-+		unsigned int sps_qp_bd_offset =
-+			6 * s->sps.bit_depth_luma_minus8;
-+
-+		p1_apb_write(de, RPI_QP, sps_qp_bd_offset + slice_qp);
-+	}
-+
-+	p1_apb_write(de, RPI_MODE,
-+		     pause_mode |
-+			((endx == s->ctb_width - 1) << 17) |
-+			((endy == s->ctb_height - 1) << 18));
-+
-+	p1_apb_write(de, RPI_CONTROL, (ctb_col << 0) | (ctb_row << 16));
-+
-+	de->entry_tile_x = tile_x;
-+	de->entry_tile_y = tile_y;
-+	de->entry_ctb_x = ctb_col;
-+	de->entry_ctb_y = ctb_row;
-+	de->entry_qp = slice_qp;
-+	de->entry_slice = slice_const;
-+}
-+
-+//////////////////////////////////////////////////////////////////////////////
-+// Wavefront mode
-+
-+#define CMDS_WPP_PAUSE 4
-+static void wpp_pause(struct rpivid_dec_env *const de, int ctb_row)
-+{
-+	p1_apb_write(de, RPI_STATUS, (ctb_row << 18) | 0x25);
-+	p1_apb_write(de, RPI_TRANSFER, PROB_BACKUP);
-+	p1_apb_write(de, RPI_MODE,
-+		     ctb_row == de->pic_height_in_ctbs_y - 1 ?
-+							0x70000 : 0x30000);
-+	p1_apb_write(de, RPI_CONTROL, (ctb_row << 16) + 2);
-+}
-+
-+#define CMDS_WPP_ENTRY_FILL_1 (CMDS_WPP_PAUSE + 2 + CMDS_NEW_ENTRY_POINT)
-+static int wpp_entry_fill(struct rpivid_dec_env *const de,
-+			  const struct rpivid_dec_state *const s,
-+			  const unsigned int last_y)
-+{
-+	int rv;
-+	const unsigned int last_x = s->ctb_width - 1;
-+
-+	rv = cmds_check_space(de, CMDS_WPP_ENTRY_FILL_1 *
-+				  (last_y - de->entry_ctb_y));
-+	if (rv)
-+		return rv;
-+
-+	while (de->entry_ctb_y < last_y) {
-+		/* wpp_entry_x/y set by wpp_entry_point */
-+		if (s->ctb_width > 2)
-+			wpp_pause(de, de->entry_ctb_y);
-+		p1_apb_write(de, RPI_STATUS,
-+			     (de->entry_ctb_y << 18) | (last_x << 5) | 2);
-+
-+		/* if width == 1 then the saved state is the init one */
-+		if (s->ctb_width == 2)
-+			p1_apb_write(de, RPI_TRANSFER, PROB_BACKUP);
-+		else
-+			p1_apb_write(de, RPI_TRANSFER, PROB_RELOAD);
-+
-+		new_entry_point(de, s, false, true, PAUSE_MODE_WPP,
-+				0, 0, 0, de->entry_ctb_y + 1,
-+				de->entry_qp, de->entry_slice);
-+	}
-+	return 0;
-+}
-+
-+static int wpp_end_previous_slice(struct rpivid_dec_env *const de,
-+				  const struct rpivid_dec_state *const s)
-+{
-+	int rv;
-+
-+	rv = wpp_entry_fill(de, s, s->prev_ctb_y);
-+	if (rv)
-+		return rv;
-+
-+	rv = cmds_check_space(de, CMDS_WPP_PAUSE + 2);
-+	if (rv)
-+		return rv;
-+
-+	if (de->entry_ctb_x < 2 &&
-+	    (de->entry_ctb_y < s->start_ctb_y || s->start_ctb_x > 2) &&
-+	    s->ctb_width > 2)
-+		wpp_pause(de, s->prev_ctb_y);
-+	p1_apb_write(de, RPI_STATUS,
-+		     1 | (s->prev_ctb_x << 5) | (s->prev_ctb_y << 18));
-+	if (s->start_ctb_x == 2 ||
-+	    (s->ctb_width == 2 && de->entry_ctb_y < s->start_ctb_y))
-+		p1_apb_write(de, RPI_TRANSFER, PROB_BACKUP);
-+	return 0;
-+}
-+
-+/* Only main profile supported so WPP => !Tiles which makes some of the
-+ * next chunk code simpler
-+ */
-+static int wpp_decode_slice(struct rpivid_dec_env *const de,
-+			    const struct rpivid_dec_state *const s,
-+			    bool last_slice)
-+{
-+	bool reset_qp_y = true;
-+	const bool indep = !s->dependent_slice_segment_flag;
-+	int rv;
-+
-+	if (s->start_ts) {
-+		rv = wpp_end_previous_slice(de, s);
-+		if (rv)
-+			return rv;
-+	}
-+	pre_slice_decode(de, s);
-+
-+	rv = cmds_check_space(de,
-+			      CMDS_WRITE_BITSTREAM +
-+				CMDS_WRITE_PROB +
-+				CMDS_PROGRAM_SLICECMDS +
-+				CMDS_NEW_SLICE_SEGMENT +
-+				CMDS_NEW_ENTRY_POINT);
-+	if (rv)
-+		return rv;
-+
-+	rv = write_bitstream(de, s);
-+	if (rv)
-+		return rv;
-+
-+	if (!s->start_ts || indep || s->ctb_width == 1)
-+		write_prob(de, s);
-+	else if (!s->start_ctb_x)
-+		p1_apb_write(de, RPI_TRANSFER, PROB_RELOAD);
-+	else
-+		reset_qp_y = false;
-+
-+	program_slicecmds(de, s->slice_idx);
-+	new_slice_segment(de, s);
-+	new_entry_point(de, s, indep, reset_qp_y, PAUSE_MODE_WPP,
-+			0, 0, s->start_ctb_x, s->start_ctb_y,
-+			s->slice_qp, slice_reg_const(s));
-+
-+	if (last_slice) {
-+		rv = wpp_entry_fill(de, s, s->ctb_height - 1);
-+		if (rv)
-+			return rv;
-+
-+		rv = cmds_check_space(de, CMDS_WPP_PAUSE + 1);
-+		if (rv)
-+			return rv;
-+
-+		if (de->entry_ctb_x < 2 && s->ctb_width > 2)
-+			wpp_pause(de, s->ctb_height - 1);
-+
-+		p1_apb_write(de, RPI_STATUS,
-+			     1 | ((s->ctb_width - 1) << 5) |
-+				((s->ctb_height - 1) << 18));
-+	}
-+	return 0;
-+}
-+
-+//////////////////////////////////////////////////////////////////////////////
-+// Tiles mode
-+
-+// Guarantees 1 cmd entry free on exit
-+static int tile_entry_fill(struct rpivid_dec_env *const de,
-+			   const struct rpivid_dec_state *const s,
-+			   const unsigned int last_tile_x,
-+			   const unsigned int last_tile_y)
-+{
-+	while (de->entry_tile_y < last_tile_y ||
-+	       (de->entry_tile_y == last_tile_y &&
-+		de->entry_tile_x < last_tile_x)) {
-+		int rv;
-+		unsigned int t_x = de->entry_tile_x;
-+		unsigned int t_y = de->entry_tile_y;
-+		const unsigned int last_x = s->col_bd[t_x + 1] - 1;
-+		const unsigned int last_y = s->row_bd[t_y + 1] - 1;
-+
-+		// One more than needed here
-+		rv = cmds_check_space(de, CMDS_NEW_ENTRY_POINT + 3);
-+		if (rv)
-+			return rv;
-+
-+		p1_apb_write(de, RPI_STATUS,
-+			     2 | (last_x << 5) | (last_y << 18));
-+		p1_apb_write(de, RPI_TRANSFER, PROB_RELOAD);
-+
-+		// Inc tile
-+		if (++t_x >= s->tile_width) {
-+			t_x = 0;
-+			++t_y;
-+		}
-+
-+		new_entry_point(de, s, false, true, PAUSE_MODE_TILE,
-+				t_x, t_y, s->col_bd[t_x], s->row_bd[t_y],
-+				de->entry_qp, de->entry_slice);
-+	}
-+	return 0;
-+}
-+
-+/*
-+ * Write STATUS register with expected end CTU address of previous slice
-+ */
-+static int end_previous_slice(struct rpivid_dec_env *const de,
-+			      const struct rpivid_dec_state *const s)
-+{
-+	int rv;
-+
-+	rv = tile_entry_fill(de, s,
-+			     ctb_to_tile_x(s, s->prev_ctb_x),
-+			     ctb_to_tile_y(s, s->prev_ctb_y));
-+	if (rv)
-+		return rv;
-+
-+	p1_apb_write(de, RPI_STATUS,
-+		     1 | (s->prev_ctb_x << 5) | (s->prev_ctb_y << 18));
-+	return 0;
-+}
-+
-+static int decode_slice(struct rpivid_dec_env *const de,
-+			const struct rpivid_dec_state *const s,
-+			bool last_slice)
-+{
-+	bool reset_qp_y;
-+	unsigned int tile_x = ctb_to_tile_x(s, s->start_ctb_x);
-+	unsigned int tile_y = ctb_to_tile_y(s, s->start_ctb_y);
-+	int rv;
-+
-+	if (s->start_ts) {
-+		rv = end_previous_slice(de, s);
-+		if (rv)
-+			return rv;
-+	}
-+
-+	rv = cmds_check_space(de,
-+			      CMDS_WRITE_BITSTREAM +
-+				CMDS_WRITE_PROB +
-+				CMDS_PROGRAM_SLICECMDS +
-+				CMDS_NEW_SLICE_SEGMENT +
-+				CMDS_NEW_ENTRY_POINT);
-+	if (rv)
-+		return rv;
-+
-+	pre_slice_decode(de, s);
-+	rv = write_bitstream(de, s);
-+	if (rv)
-+		return rv;
-+
-+	reset_qp_y = !s->start_ts ||
-+		!s->dependent_slice_segment_flag ||
-+		tile_x != ctb_to_tile_x(s, s->prev_ctb_x) ||
-+		tile_y != ctb_to_tile_y(s, s->prev_ctb_y);
-+	if (reset_qp_y)
-+		write_prob(de, s);
-+
-+	program_slicecmds(de, s->slice_idx);
-+	new_slice_segment(de, s);
-+	new_entry_point(de, s, !s->dependent_slice_segment_flag, reset_qp_y,
-+			PAUSE_MODE_TILE,
-+			tile_x, tile_y, s->start_ctb_x, s->start_ctb_y,
-+			s->slice_qp, slice_reg_const(s));
-+
-+	/*
-+	 * If this is the last slice then fill in the other tile entries
-+	 * now, otherwise this will be done at the start of the next slice
-+	 * when it will be known where this slice finishes
-+	 */
-+	if (last_slice) {
-+		rv = tile_entry_fill(de, s,
-+				     s->tile_width - 1,
-+				     s->tile_height - 1);
-+		if (rv)
-+			return rv;
-+		p1_apb_write(de, RPI_STATUS,
-+			     1 | ((s->ctb_width - 1) << 5) |
-+				((s->ctb_height - 1) << 18));
-+	}
-+	return 0;
-+}
-+
-+//////////////////////////////////////////////////////////////////////////////
-+// Scaling factors
-+
-+static void expand_scaling_list(const unsigned int size_id,
-+				u8 *const dst0,
-+				const u8 *const src0, uint8_t dc)
-+{
-+	u8 *d;
-+	unsigned int x, y;
-+
-+	switch (size_id) {
-+	case 0:
-+		memcpy(dst0, src0, 16);
-+		break;
-+	case 1:
-+		memcpy(dst0, src0, 64);
-+		break;
-+	case 2:
-+		d = dst0;
-+
-+		for (y = 0; y != 16; y++) {
-+			const u8 *s = src0 + (y >> 1) * 8;
-+
-+			for (x = 0; x != 8; ++x) {
-+				*d++ = *s;
-+				*d++ = *s++;
-+			}
-+		}
-+		dst0[0] = dc;
-+		break;
-+	default:
-+		d = dst0;
-+
-+		for (y = 0; y != 32; y++) {
-+			const u8 *s = src0 + (y >> 2) * 8;
-+
-+			for (x = 0; x != 8; ++x) {
-+				*d++ = *s;
-+				*d++ = *s;
-+				*d++ = *s;
-+				*d++ = *s++;
-+			}
-+		}
-+		dst0[0] = dc;
-+		break;
-+	}
-+}
-+
-+static void populate_scaling_factors(const struct rpivid_run *const run,
-+				     struct rpivid_dec_env *const de,
-+				     const struct rpivid_dec_state *const s)
-+{
-+	const struct v4l2_ctrl_hevc_scaling_matrix *const sl =
-+		run->h265.scaling_matrix;
-+	// Array of constants for scaling factors
-+	static const u32 scaling_factor_offsets[4][6] = {
-+		// MID0    MID1    MID2    MID3    MID4    MID5
-+		// SID0 (4x4)
-+		{ 0x0000, 0x0010, 0x0020, 0x0030, 0x0040, 0x0050 },
-+		// SID1 (8x8)
-+		{ 0x0060, 0x00A0, 0x00E0, 0x0120, 0x0160, 0x01A0 },
-+		// SID2 (16x16)
-+		{ 0x01E0, 0x02E0, 0x03E0, 0x04E0, 0x05E0, 0x06E0 },
-+		// SID3 (32x32)
-+		{ 0x07E0, 0x0BE0, 0x0000, 0x0000, 0x0000, 0x0000 }
-+	};
-+
-+	unsigned int mid;
-+
-+	for (mid = 0; mid < 6; mid++)
-+		expand_scaling_list(0, de->scaling_factors +
-+					    scaling_factor_offsets[0][mid],
-+				    sl->scaling_list_4x4[mid], 0);
-+	for (mid = 0; mid < 6; mid++)
-+		expand_scaling_list(1, de->scaling_factors +
-+					    scaling_factor_offsets[1][mid],
-+				    sl->scaling_list_8x8[mid], 0);
-+	for (mid = 0; mid < 6; mid++)
-+		expand_scaling_list(2, de->scaling_factors +
-+					    scaling_factor_offsets[2][mid],
-+				    sl->scaling_list_16x16[mid],
-+				    sl->scaling_list_dc_coef_16x16[mid]);
-+	for (mid = 0; mid < 2; mid++)
-+		expand_scaling_list(3, de->scaling_factors +
-+					    scaling_factor_offsets[3][mid],
-+				    sl->scaling_list_32x32[mid],
-+				    sl->scaling_list_dc_coef_32x32[mid]);
-+}
-+
-+static void free_ps_info(struct rpivid_dec_state *const s)
-+{
-+	kfree(s->ctb_addr_rs_to_ts);
-+	s->ctb_addr_rs_to_ts = NULL;
-+	kfree(s->ctb_addr_ts_to_rs);
-+	s->ctb_addr_ts_to_rs = NULL;
-+
-+	kfree(s->col_bd);
-+	s->col_bd = NULL;
-+	kfree(s->row_bd);
-+	s->row_bd = NULL;
-+}
-+
-+static unsigned int tile_width(const struct rpivid_dec_state *const s,
-+			       const unsigned int t_x)
-+{
-+	return s->col_bd[t_x + 1] - s->col_bd[t_x];
-+}
-+
-+static unsigned int tile_height(const struct rpivid_dec_state *const s,
-+				const unsigned int t_y)
-+{
-+	return s->row_bd[t_y + 1] - s->row_bd[t_y];
-+}
-+
-+static void fill_rs_to_ts(struct rpivid_dec_state *const s)
-+{
-+	unsigned int ts = 0;
-+	unsigned int t_y;
-+	unsigned int tr_rs = 0;
-+
-+	for (t_y = 0; t_y != s->tile_height; ++t_y) {
-+		const unsigned int t_h = tile_height(s, t_y);
-+		unsigned int t_x;
-+		unsigned int tc_rs = tr_rs;
-+
-+		for (t_x = 0; t_x != s->tile_width; ++t_x) {
-+			const unsigned int t_w = tile_width(s, t_x);
-+			unsigned int y;
-+			unsigned int rs = tc_rs;
-+
-+			for (y = 0; y != t_h; ++y) {
-+				unsigned int x;
-+
-+				for (x = 0; x != t_w; ++x) {
-+					s->ctb_addr_rs_to_ts[rs + x] = ts;
-+					s->ctb_addr_ts_to_rs[ts] = rs + x;
-+					++ts;
-+				}
-+				rs += s->ctb_width;
-+			}
-+			tc_rs += t_w;
-+		}
-+		tr_rs += t_h * s->ctb_width;
-+	}
-+}
-+
-+static int updated_ps(struct rpivid_dec_state *const s)
-+{
-+	unsigned int i;
-+
-+	free_ps_info(s);
-+
-+	// Inferred parameters
-+	s->log2_ctb_size = s->sps.log2_min_luma_coding_block_size_minus3 + 3 +
-+			   s->sps.log2_diff_max_min_luma_coding_block_size;
-+
-+	s->ctb_width = (s->sps.pic_width_in_luma_samples +
-+			(1 << s->log2_ctb_size) - 1) >>
-+		       s->log2_ctb_size;
-+	s->ctb_height = (s->sps.pic_height_in_luma_samples +
-+			 (1 << s->log2_ctb_size) - 1) >>
-+			s->log2_ctb_size;
-+	s->ctb_size = s->ctb_width * s->ctb_height;
-+
-+	// Inferred parameters
-+
-+	s->ctb_addr_rs_to_ts = kmalloc_array(s->ctb_size,
-+					     sizeof(*s->ctb_addr_rs_to_ts),
-+					     GFP_KERNEL);
-+	if (!s->ctb_addr_rs_to_ts)
-+		goto fail;
-+	s->ctb_addr_ts_to_rs = kmalloc_array(s->ctb_size,
-+					     sizeof(*s->ctb_addr_ts_to_rs),
-+					     GFP_KERNEL);
-+	if (!s->ctb_addr_ts_to_rs)
-+		goto fail;
-+
-+	if (!(s->pps.flags & V4L2_HEVC_PPS_FLAG_TILES_ENABLED)) {
-+		s->tile_width = 1;
-+		s->tile_height = 1;
-+	} else {
-+		s->tile_width = s->pps.num_tile_columns_minus1 + 1;
-+		s->tile_height = s->pps.num_tile_rows_minus1 + 1;
-+	}
-+
-+	s->col_bd = kmalloc((s->tile_width + 1) * sizeof(*s->col_bd),
-+			    GFP_KERNEL);
-+	if (!s->col_bd)
-+		goto fail;
-+	s->row_bd = kmalloc((s->tile_height + 1) * sizeof(*s->row_bd),
-+			    GFP_KERNEL);
-+	if (!s->row_bd)
-+		goto fail;
-+
-+	s->col_bd[0] = 0;
-+	for (i = 1; i < s->tile_width; i++)
-+		s->col_bd[i] = s->col_bd[i - 1] +
-+			s->pps.column_width_minus1[i - 1] + 1;
-+	s->col_bd[s->tile_width] = s->ctb_width;
-+
-+	s->row_bd[0] = 0;
-+	for (i = 1; i < s->tile_height; i++)
-+		s->row_bd[i] = s->row_bd[i - 1] +
-+			s->pps.row_height_minus1[i - 1] + 1;
-+	s->row_bd[s->tile_height] = s->ctb_height;
-+
-+	fill_rs_to_ts(s);
-+	return 0;
-+
-+fail:
-+	free_ps_info(s);
-+	/* Set invalid to force reload */
-+	s->sps.pic_width_in_luma_samples = 0;
-+	return -ENOMEM;
-+}
-+
-+static int write_cmd_buffer(struct rpivid_dev *const dev,
-+			    struct rpivid_dec_env *const de,
-+			    const struct rpivid_dec_state *const s)
-+{
-+	const size_t cmd_size = ALIGN(de->cmd_len * sizeof(de->cmd_fifo[0]),
-+				      dev->cache_align);
-+
-+	de->cmd_addr = dma_map_single(dev->dev, de->cmd_fifo,
-+				      cmd_size, DMA_TO_DEVICE);
-+	if (dma_mapping_error(dev->dev, de->cmd_addr)) {
-+		v4l2_err(&dev->v4l2_dev,
-+			 "Map cmd buffer (%zu): FAILED\n", cmd_size);
-+		return -ENOMEM;
-+	}
-+	de->cmd_size = cmd_size;
-+	return 0;
-+}
-+
-+static void setup_colmv(struct rpivid_ctx *const ctx, struct rpivid_run *run,
-+			struct rpivid_dec_state *const s)
-+{
-+	ctx->colmv_stride = ALIGN(s->sps.pic_width_in_luma_samples, 64);
-+	ctx->colmv_picsize = ctx->colmv_stride *
-+		(ALIGN(s->sps.pic_height_in_luma_samples, 64) >> 4);
-+}
-+
-+// Can be called from irq context
-+static struct rpivid_dec_env *dec_env_new(struct rpivid_ctx *const ctx)
-+{
-+	struct rpivid_dec_env *de;
-+	unsigned long lock_flags;
-+
-+	spin_lock_irqsave(&ctx->dec_lock, lock_flags);
-+
-+	de = ctx->dec_free;
-+	if (de) {
-+		ctx->dec_free = de->next;
-+		de->next = NULL;
-+		de->state = RPIVID_DECODE_SLICE_START;
-+	}
-+
-+	spin_unlock_irqrestore(&ctx->dec_lock, lock_flags);
-+	return de;
-+}
-+
-+// Can be called from irq context
-+static void dec_env_delete(struct rpivid_dec_env *const de)
-+{
-+	struct rpivid_ctx * const ctx = de->ctx;
-+	unsigned long lock_flags;
-+
-+	if (de->cmd_size) {
-+		dma_unmap_single(ctx->dev->dev, de->cmd_addr, de->cmd_size,
-+				 DMA_TO_DEVICE);
-+		de->cmd_size = 0;
-+	}
-+
-+	aux_q_release(ctx, &de->frame_aux);
-+	aux_q_release(ctx, &de->col_aux);
-+
-+	spin_lock_irqsave(&ctx->dec_lock, lock_flags);
-+
-+	de->state = RPIVID_DECODE_END;
-+	de->next = ctx->dec_free;
-+	ctx->dec_free = de;
-+
-+	spin_unlock_irqrestore(&ctx->dec_lock, lock_flags);
-+}
-+
-+static void dec_env_uninit(struct rpivid_ctx *const ctx)
-+{
-+	unsigned int i;
-+
-+	if (ctx->dec_pool) {
-+		for (i = 0; i != RPIVID_DEC_ENV_COUNT; ++i) {
-+			struct rpivid_dec_env *const de = ctx->dec_pool + i;
-+
-+			kfree(de->cmd_fifo);
-+		}
-+
-+		kfree(ctx->dec_pool);
-+	}
-+
-+	ctx->dec_pool = NULL;
-+	ctx->dec_free = NULL;
-+}
-+
-+static int dec_env_init(struct rpivid_ctx *const ctx)
-+{
-+	unsigned int i;
-+
-+	ctx->dec_pool = kzalloc(sizeof(*ctx->dec_pool) * RPIVID_DEC_ENV_COUNT,
-+				GFP_KERNEL);
-+	if (!ctx->dec_pool)
-+		return -1;
-+
-+	spin_lock_init(&ctx->dec_lock);
-+
-+	// Build free chain
-+	ctx->dec_free = ctx->dec_pool;
-+	for (i = 0; i != RPIVID_DEC_ENV_COUNT - 1; ++i)
-+		ctx->dec_pool[i].next = ctx->dec_pool + i + 1;
-+
-+	// Fill in other bits
-+	for (i = 0; i != RPIVID_DEC_ENV_COUNT; ++i) {
-+		struct rpivid_dec_env *const de = ctx->dec_pool + i;
-+
-+		de->ctx = ctx;
-+		de->decode_order = i;
-+//		de->cmd_max = 1024;
-+		de->cmd_max = 8096;
-+		de->cmd_fifo = kmalloc_array(de->cmd_max,
-+					     sizeof(struct rpi_cmd),
-+					     GFP_KERNEL);
-+		if (!de->cmd_fifo)
-+			goto fail;
-+	}
-+
-+	return 0;
-+
-+fail:
-+	dec_env_uninit(ctx);
-+	return -1;
-+}
-+
-+// Assume that we get exactly the same DPB for every slice
-+// it makes no real sense otherwise
-+#if V4L2_HEVC_DPB_ENTRIES_NUM_MAX > 16
-+#error HEVC_DPB_ENTRIES > h/w slots
-+#endif
-+
-+static u32 mk_config2(const struct rpivid_dec_state *const s)
-+{
-+	const struct v4l2_ctrl_hevc_sps *const sps = &s->sps;
-+	const struct v4l2_ctrl_hevc_pps *const pps = &s->pps;
-+	u32 c;
-+	// BitDepthY
-+	c = (sps->bit_depth_luma_minus8 + 8) << 0;
-+	 // BitDepthC
-+	c |= (sps->bit_depth_chroma_minus8 + 8) << 4;
-+	 // BitDepthY
-+	if (sps->bit_depth_luma_minus8)
-+		c |= BIT(8);
-+	// BitDepthC
-+	if (sps->bit_depth_chroma_minus8)
-+		c |= BIT(9);
-+	c |= s->log2_ctb_size << 10;
-+	if (pps->flags & V4L2_HEVC_PPS_FLAG_CONSTRAINED_INTRA_PRED)
-+		c |= BIT(13);
-+	if (sps->flags & V4L2_HEVC_SPS_FLAG_STRONG_INTRA_SMOOTHING_ENABLED)
-+		c |= BIT(14);
-+	if (s->mk_aux)
-+		c |= BIT(15); /* Write motion vectors to external memory */
-+	c |= (pps->log2_parallel_merge_level_minus2 + 2) << 16;
-+	if (s->slice_temporal_mvp)
-+		c |= BIT(19);
-+	if (sps->flags & V4L2_HEVC_SPS_FLAG_PCM_LOOP_FILTER_DISABLED)
-+		c |= BIT(20);
-+	c |= (pps->pps_cb_qp_offset & 31) << 21;
-+	c |= (pps->pps_cr_qp_offset & 31) << 26;
-+	return c;
-+}
-+
-+static inline bool is_ref_unit_type(const unsigned int nal_unit_type)
-+{
-+	/* From Table 7-1
-+	 * True for 1, 3, 5, 7, 9, 11, 13, 15
-+	 */
-+	return (nal_unit_type & ~0xe) != 0;
-+}
-+
-+static void rpivid_h265_setup(struct rpivid_ctx *ctx, struct rpivid_run *run)
-+{
-+	struct rpivid_dev *const dev = ctx->dev;
-+	const struct v4l2_ctrl_hevc_decode_params *const dec =
-+						run->h265.dec;
-+	/* sh0 used where slice header contents should be constant over all
-+	 * slices, or first slice of frame
-+	 */
-+	const struct v4l2_ctrl_hevc_slice_params *const sh0 =
-+					run->h265.slice_params;
-+	struct rpivid_q_aux *dpb_q_aux[V4L2_HEVC_DPB_ENTRIES_NUM_MAX];
-+	struct rpivid_dec_state *const s = ctx->state;
-+	struct vb2_queue *vq;
-+	struct rpivid_dec_env *de = ctx->dec0;
-+	unsigned int prev_rs;
-+	unsigned int i;
-+	int rv;
-+	bool slice_temporal_mvp;
-+	bool frame_end;
-+
-+	xtrace_in(dev, de);
-+	s->sh = NULL;  // Avoid use until in the slice loop
-+
-+	frame_end =
-+		((run->src->flags & V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF) == 0);
-+
-+	slice_temporal_mvp = (sh0->flags &
-+		   V4L2_HEVC_SLICE_PARAMS_FLAG_SLICE_TEMPORAL_MVP_ENABLED);
-+
-+	if (de && de->state != RPIVID_DECODE_END) {
-+		switch (de->state) {
-+		case RPIVID_DECODE_SLICE_CONTINUE:
-+			// Expected state
-+			break;
-+		default:
-+			v4l2_err(&dev->v4l2_dev, "%s: Unexpected state: %d\n",
-+				 __func__, de->state);
-+			fallthrough;
-+		case RPIVID_DECODE_ERROR_CONTINUE:
-+			// Uncleared error - fail now
-+			goto fail;
-+		}
-+
-+		if (s->slice_temporal_mvp != slice_temporal_mvp) {
-+			v4l2_warn(&dev->v4l2_dev,
-+				  "Slice Temporal MVP non-constant\n");
-+			goto fail;
-+		}
-+	} else {
-+		/* Frame start */
-+		unsigned int ctb_size_y;
-+		bool sps_changed = false;
-+
-+		if (memcmp(&s->sps, run->h265.sps, sizeof(s->sps)) != 0) {
-+			/* SPS changed */
-+			v4l2_info(&dev->v4l2_dev, "SPS changed\n");
-+			memcpy(&s->sps, run->h265.sps, sizeof(s->sps));
-+			sps_changed = true;
-+		}
-+		if (sps_changed ||
-+		    memcmp(&s->pps, run->h265.pps, sizeof(s->pps)) != 0) {
-+			/* SPS changed */
-+			v4l2_info(&dev->v4l2_dev, "PPS changed\n");
-+			memcpy(&s->pps, run->h265.pps, sizeof(s->pps));
-+
-+			/* Recalc stuff as required */
-+			rv = updated_ps(s);
-+			if (rv)
-+				goto fail;
-+		}
-+
-+		de = dec_env_new(ctx);
-+		if (!de) {
-+			v4l2_err(&dev->v4l2_dev,
-+				 "Failed to find free decode env\n");
-+			goto fail;
-+		}
-+		ctx->dec0 = de;
-+
-+		ctb_size_y =
-+			1U << (s->sps.log2_min_luma_coding_block_size_minus3 +
-+			       3 +
-+			       s->sps.log2_diff_max_min_luma_coding_block_size);
-+
-+		de->pic_width_in_ctbs_y =
-+			(s->sps.pic_width_in_luma_samples + ctb_size_y - 1) /
-+				ctb_size_y; // 7-15
-+		de->pic_height_in_ctbs_y =
-+			(s->sps.pic_height_in_luma_samples + ctb_size_y - 1) /
-+				ctb_size_y; // 7-17
-+		de->cmd_len = 0;
-+		de->dpbno_col = ~0U;
-+
-+		de->bit_copy_gptr = ctx->bitbufs + ctx->p1idx;
-+		de->bit_copy_len = 0;
-+
-+		de->frame_c_offset = ctx->dst_fmt.height * 128;
-+		de->frame_stride = ctx->dst_fmt.plane_fmt[0].bytesperline * 128;
-+		de->frame_addr =
-+			vb2_dma_contig_plane_dma_addr(&run->dst->vb2_buf, 0);
-+		de->frame_aux = NULL;
-+
-+		if (s->sps.bit_depth_luma_minus8 !=
-+		    s->sps.bit_depth_chroma_minus8) {
-+			v4l2_warn(&dev->v4l2_dev,
-+				  "Chroma depth (%d) != Luma depth (%d)\n",
-+				  s->sps.bit_depth_chroma_minus8 + 8,
-+				  s->sps.bit_depth_luma_minus8 + 8);
-+			goto fail;
-+		}
-+		if (s->sps.bit_depth_luma_minus8 == 0) {
-+			if (ctx->dst_fmt.pixelformat !=
-+						V4L2_PIX_FMT_NV12_COL128) {
-+				v4l2_err(&dev->v4l2_dev,
-+					 "Pixel format %#x != NV12_COL128 for 8-bit output",
-+					 ctx->dst_fmt.pixelformat);
-+				goto fail;
-+			}
-+		} else if (s->sps.bit_depth_luma_minus8 == 2) {
-+			if (ctx->dst_fmt.pixelformat !=
-+						V4L2_PIX_FMT_NV12_10_COL128) {
-+				v4l2_err(&dev->v4l2_dev,
-+					 "Pixel format %#x != NV12_10_COL128 for 10-bit output",
-+					 ctx->dst_fmt.pixelformat);
-+				goto fail;
-+			}
-+		} else {
-+			v4l2_warn(&dev->v4l2_dev,
-+				  "Luma depth (%d) unsupported\n",
-+				  s->sps.bit_depth_luma_minus8 + 8);
-+			goto fail;
-+		}
-+		if (run->dst->vb2_buf.num_planes != 1) {
-+			v4l2_warn(&dev->v4l2_dev, "Capture planes (%d) != 1\n",
-+				  run->dst->vb2_buf.num_planes);
-+			goto fail;
-+		}
-+		if (run->dst->planes[0].length <
-+		    ctx->dst_fmt.plane_fmt[0].sizeimage) {
-+			v4l2_warn(&dev->v4l2_dev,
-+				  "Capture plane[0] length (%d) < sizeimage (%d)\n",
-+				  run->dst->planes[0].length,
-+				  ctx->dst_fmt.plane_fmt[0].sizeimage);
-+			goto fail;
-+		}
-+
-+		// Fill in ref planes with our address s.t. if we mess
-+		// up refs somehow then we still have a valid address
-+		// entry
-+		for (i = 0; i != 16; ++i)
-+			de->ref_addrs[i] = de->frame_addr;
-+
-+		/*
-+		 * Stash initial temporal_mvp flag
-+		 * This must be the same for all pic slices (7.4.7.1)
-+		 */
-+		s->slice_temporal_mvp = slice_temporal_mvp;
-+
-+		/*
-+		 * Need Aux ents for all (ref) DPB ents if temporal MV could
-+		 * be enabled for any pic
-+		 */
-+		s->use_aux = ((s->sps.flags &
-+			       V4L2_HEVC_SPS_FLAG_SPS_TEMPORAL_MVP_ENABLED) != 0);
-+		s->mk_aux = s->use_aux &&
-+			    (s->sps.sps_max_sub_layers_minus1 >= sh0->nuh_temporal_id_plus1 ||
-+			     is_ref_unit_type(sh0->nal_unit_type));
-+
-+		// Phase 2 reg pre-calc
-+		de->rpi_config2 = mk_config2(s);
-+		de->rpi_framesize = (s->sps.pic_height_in_luma_samples << 16) |
-+				    s->sps.pic_width_in_luma_samples;
-+		de->rpi_currpoc = sh0->slice_pic_order_cnt;
-+
-+		if (s->sps.flags &
-+		    V4L2_HEVC_SPS_FLAG_SPS_TEMPORAL_MVP_ENABLED) {
-+			setup_colmv(ctx, run, s);
-+		}
-+
-+		s->slice_idx = 0;
-+
-+		if (sh0->slice_segment_addr != 0) {
-+			v4l2_warn(&dev->v4l2_dev,
-+				  "New frame but segment_addr=%d\n",
-+				  sh0->slice_segment_addr);
-+			goto fail;
-+		}
-+
-+		/* Allocate a bitbuf if we need one - don't need one if single
-+		 * slice as we can use the src buf directly
-+		 */
-+		if (!frame_end && !de->bit_copy_gptr->ptr) {
-+			size_t bits_alloc;
-+			bits_alloc = rpivid_bit_buf_size(s->sps.pic_width_in_luma_samples,
-+							 s->sps.pic_height_in_luma_samples,
-+							 s->sps.bit_depth_luma_minus8);
-+
-+			if (gptr_alloc(dev, de->bit_copy_gptr,
-+				       bits_alloc,
-+				       DMA_ATTR_FORCE_CONTIGUOUS) != 0) {
-+				v4l2_err(&dev->v4l2_dev,
-+					 "Unable to alloc buf (%zu) for bit copy\n",
-+					 bits_alloc);
-+				goto fail;
-+			}
-+			v4l2_info(&dev->v4l2_dev,
-+				  "Alloc buf (%zu) for bit copy OK\n",
-+				  bits_alloc);
-+		}
-+	}
-+
-+	// Either map src buffer or use directly
-+	s->src_addr = 0;
-+	s->src_buf = NULL;
-+
-+	if (frame_end)
-+		s->src_addr = vb2_dma_contig_plane_dma_addr(&run->src->vb2_buf,
-+							    0);
-+	if (!s->src_addr)
-+		s->src_buf = vb2_plane_vaddr(&run->src->vb2_buf, 0);
-+	if (!s->src_addr && !s->src_buf) {
-+		v4l2_err(&dev->v4l2_dev, "Failed to map src buffer\n");
-+		goto fail;
-+	}
-+
-+	// Pre calc a few things
-+	s->dec = dec;
-+	for (i = 0; i != run->h265.slice_ents; ++i) {
-+		const struct v4l2_ctrl_hevc_slice_params *const sh = sh0 + i;
-+		const bool last_slice = frame_end && i + 1 == run->h265.slice_ents;
-+
-+		s->sh = sh;
-+
-+		if (run->src->planes[0].bytesused < (sh->bit_size + 7) / 8) {
-+			v4l2_warn(&dev->v4l2_dev,
-+				  "Bit size %d > bytesused %d\n",
-+				  sh->bit_size, run->src->planes[0].bytesused);
-+			goto fail;
-+		}
-+		if (sh->data_byte_offset >= sh->bit_size / 8) {
-+			v4l2_warn(&dev->v4l2_dev,
-+				  "Bit size %u < Byte offset %u * 8\n",
-+				  sh->bit_size, sh->data_byte_offset);
-+			goto fail;
-+		}
-+
-+		s->slice_qp = 26 + s->pps.init_qp_minus26 + sh->slice_qp_delta;
-+		s->max_num_merge_cand = sh->slice_type == HEVC_SLICE_I ?
-+						0 :
-+						(5 - sh->five_minus_max_num_merge_cand);
-+		s->dependent_slice_segment_flag =
-+			((sh->flags &
-+			  V4L2_HEVC_SLICE_PARAMS_FLAG_DEPENDENT_SLICE_SEGMENT) != 0);
-+
-+		s->nb_refs[0] = (sh->slice_type == HEVC_SLICE_I) ?
-+					0 :
-+					sh->num_ref_idx_l0_active_minus1 + 1;
-+		s->nb_refs[1] = (sh->slice_type != HEVC_SLICE_B) ?
-+					0 :
-+					sh->num_ref_idx_l1_active_minus1 + 1;
-+
-+		if (s->sps.flags & V4L2_HEVC_SPS_FLAG_SCALING_LIST_ENABLED)
-+			populate_scaling_factors(run, de, s);
-+
-+		/* Calc all the random coord info to avoid repeated conversion in/out */
-+		s->start_ts = s->ctb_addr_rs_to_ts[sh->slice_segment_addr];
-+		s->start_ctb_x = sh->slice_segment_addr % de->pic_width_in_ctbs_y;
-+		s->start_ctb_y = sh->slice_segment_addr / de->pic_width_in_ctbs_y;
-+		/* Last CTB of previous slice */
-+		prev_rs = !s->start_ts ? 0 : s->ctb_addr_ts_to_rs[s->start_ts - 1];
-+		s->prev_ctb_x = prev_rs % de->pic_width_in_ctbs_y;
-+		s->prev_ctb_y = prev_rs / de->pic_width_in_ctbs_y;
-+
-+		if ((s->pps.flags & V4L2_HEVC_PPS_FLAG_ENTROPY_CODING_SYNC_ENABLED))
-+			rv = wpp_decode_slice(de, s, last_slice);
-+		else
-+			rv = decode_slice(de, s, last_slice);
-+		if (rv)
-+			goto fail;
-+
-+		++s->slice_idx;
-+	}
-+
-+	if (!frame_end) {
-+		xtrace_ok(dev, de);
-+		return;
-+	}
-+
-+	// Frame end
-+	memset(dpb_q_aux, 0,
-+	       sizeof(*dpb_q_aux) * V4L2_HEVC_DPB_ENTRIES_NUM_MAX);
-+
-+	// Locate ref frames
-+	// At least in the current implementation this is constant across all
-+	// slices. If this changes we will need idx mapping code.
-+	// Uses sh so here rather than trigger
-+
-+	vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx,
-+			     V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE);
-+
-+	if (!vq) {
-+		v4l2_err(&dev->v4l2_dev, "VQ gone!\n");
-+		goto fail;
-+	}
-+
-+	//        v4l2_info(&dev->v4l2_dev, "rpivid_h265_end of frame\n");
-+	if (write_cmd_buffer(dev, de, s))
-+		goto fail;
-+
-+	for (i = 0; i < dec->num_active_dpb_entries; ++i) {
-+		struct vb2_buffer *buf = vb2_find_buffer(vq, dec->dpb[i].timestamp);
-+		if (!buf) {
-+			v4l2_warn(&dev->v4l2_dev,
-+				  "Missing DPB ent %d, timestamp=%lld\n",
-+				  i, (long long)dec->dpb[i].timestamp);
-+			continue;
-+		}
-+
-+		if (s->use_aux) {
-+			int buffer_index = buf->index;
-+			dpb_q_aux[i] = aux_q_ref_idx(ctx, buffer_index);
-+			if (!dpb_q_aux[i])
-+				v4l2_warn(&dev->v4l2_dev,
-+					  "Missing DPB AUX ent %d, timestamp=%lld, index=%d\n",
-+					  i, (long long)dec->dpb[i].timestamp,
-+					  buffer_index);
-+		}
-+
-+		de->ref_addrs[i] =
-+			vb2_dma_contig_plane_dma_addr(buf, 0);
-+	}
-+
-+	// Move DPB from temp
-+	for (i = 0; i != V4L2_HEVC_DPB_ENTRIES_NUM_MAX; ++i) {
-+		aux_q_release(ctx, &s->ref_aux[i]);
-+		s->ref_aux[i] = dpb_q_aux[i];
-+	}
-+	// Unref the old frame aux too - it is either in the DPB or not
-+	// now
-+	aux_q_release(ctx, &s->frame_aux);
-+
-+	if (s->mk_aux) {
-+		s->frame_aux = aux_q_new(ctx, run->dst->vb2_buf.index);
-+
-+		if (!s->frame_aux) {
-+			v4l2_err(&dev->v4l2_dev,
-+				 "Failed to obtain aux storage for frame\n");
-+			goto fail;
-+		}
-+
-+		de->frame_aux = aux_q_ref(ctx, s->frame_aux);
-+	}
-+
-+	if (de->dpbno_col != ~0U) {
-+		if (de->dpbno_col >= dec->num_active_dpb_entries) {
-+			v4l2_err(&dev->v4l2_dev,
-+				 "Col ref index %d >= %d\n",
-+				 de->dpbno_col,
-+				 dec->num_active_dpb_entries);
-+		} else {
-+			// Standard requires that the col pic is
-+			// constant for the duration of the pic
-+			// (text of collocated_ref_idx in H265-2 2018
-+			// 7.4.7.1)
-+
-+			// Spot the collocated ref in passing
-+			de->col_aux = aux_q_ref(ctx,
-+						dpb_q_aux[de->dpbno_col]);
-+
-+			if (!de->col_aux) {
-+				v4l2_warn(&dev->v4l2_dev,
-+					  "Missing DPB ent for col\n");
-+				// Probably need to abort if this fails
-+				// as P2 may explode on bad data
-+				goto fail;
-+			}
-+		}
-+	}
-+
-+	de->state = RPIVID_DECODE_PHASE1;
-+	xtrace_ok(dev, de);
-+	return;
-+
-+fail:
-+	if (de)
-+		// Actual error reporting happens in Trigger
-+		de->state = frame_end ? RPIVID_DECODE_ERROR_DONE :
-+					RPIVID_DECODE_ERROR_CONTINUE;
-+	xtrace_fail(dev, de);
-+}
-+
-+//////////////////////////////////////////////////////////////////////////////
-+// Handle PU and COEFF stream overflow
-+
-+// Returns:
-+// -1  Phase 1 decode error
-+//  0  OK
-+// >0  Out of space (bitmask)
-+
-+#define STATUS_COEFF_EXHAUSTED	8
-+#define STATUS_PU_EXHAUSTED	16
-+
-+static int check_status(const struct rpivid_dev *const dev)
-+{
-+	const u32 cfstatus = apb_read(dev, RPI_CFSTATUS);
-+	const u32 cfnum = apb_read(dev, RPI_CFNUM);
-+	u32 status = apb_read(dev, RPI_STATUS);
-+
-+	// Handle PU and COEFF stream overflow
-+
-+	// this is the definition of successful completion of phase 1
-+	// it assures that status register is zero and all blocks in each tile
-+	// have completed
-+	if (cfstatus == cfnum)
-+		return 0;	//No error
-+
-+	status &= (STATUS_PU_EXHAUSTED | STATUS_COEFF_EXHAUSTED);
-+	if (status)
-+		return status;
-+
-+	return -1;
-+}
-+
-+static void phase2_cb(struct rpivid_dev *const dev, void *v)
-+{
-+	struct rpivid_dec_env *const de = v;
-+
-+	xtrace_in(dev, de);
-+
-+	/* Done with buffers - allow new P1 */
-+	rpivid_hw_irq_active1_enable_claim(dev, 1);
-+
-+	v4l2_m2m_buf_done(de->frame_buf, VB2_BUF_STATE_DONE);
-+	de->frame_buf = NULL;
-+
-+#if USE_REQUEST_PIN
-+	media_request_unpin(de->req_pin);
-+	de->req_pin = NULL;
-+#else
-+	media_request_object_complete(de->req_obj);
-+	de->req_obj = NULL;
-+#endif
-+
-+	xtrace_ok(dev, de);
-+	dec_env_delete(de);
-+}
-+
-+static void phase2_claimed(struct rpivid_dev *const dev, void *v)
-+{
-+	struct rpivid_dec_env *const de = v;
-+	unsigned int i;
-+
-+	xtrace_in(dev, de);
-+
-+	apb_write_vc_addr(dev, RPI_PURBASE, de->pu_base_vc);
-+	apb_write_vc_len(dev, RPI_PURSTRIDE, de->pu_stride);
-+	apb_write_vc_addr(dev, RPI_COEFFRBASE, de->coeff_base_vc);
-+	apb_write_vc_len(dev, RPI_COEFFRSTRIDE, de->coeff_stride);
-+
-+	apb_write_vc_addr(dev, RPI_OUTYBASE, de->frame_addr);
-+	apb_write_vc_addr(dev, RPI_OUTCBASE,
-+			  de->frame_addr + de->frame_c_offset);
-+	apb_write_vc_len(dev, RPI_OUTYSTRIDE, de->frame_stride);
-+	apb_write_vc_len(dev, RPI_OUTCSTRIDE, de->frame_stride);
-+
-+	//    v4l2_info(&dev->v4l2_dev, "Frame: Y=%llx, C=%llx, Stride=%x\n",
-+	//              de->frame_addr, de->frame_addr + de->frame_c_offset,
-+	//              de->frame_stride);
-+
-+	for (i = 0; i < 16; i++) {
-+		// Strides are in fact unused but fill in anyway
-+		apb_write_vc_addr(dev, 0x9000 + 16 * i, de->ref_addrs[i]);
-+		apb_write_vc_len(dev, 0x9004 + 16 * i, de->frame_stride);
-+		apb_write_vc_addr(dev, 0x9008 + 16 * i,
-+				  de->ref_addrs[i] + de->frame_c_offset);
-+		apb_write_vc_len(dev, 0x900C + 16 * i, de->frame_stride);
-+	}
-+
-+	apb_write(dev, RPI_CONFIG2, de->rpi_config2);
-+	apb_write(dev, RPI_FRAMESIZE, de->rpi_framesize);
-+	apb_write(dev, RPI_CURRPOC, de->rpi_currpoc);
-+	//    v4l2_info(&dev->v4l2_dev, "Config2=%#x, FrameSize=%#x, POC=%#x\n",
-+	//    de->rpi_config2, de->rpi_framesize, de->rpi_currpoc);
-+
-+	// collocated reads/writes
-+	apb_write_vc_len(dev, RPI_COLSTRIDE,
-+			 de->ctx->colmv_stride); // Read vals
-+	apb_write_vc_len(dev, RPI_MVSTRIDE,
-+			 de->ctx->colmv_stride); // Write vals
-+	apb_write_vc_addr(dev, RPI_MVBASE,
-+			  !de->frame_aux ? 0 : de->frame_aux->col.addr);
-+	apb_write_vc_addr(dev, RPI_COLBASE,
-+			  !de->col_aux ? 0 : de->col_aux->col.addr);
-+
-+	//v4l2_info(&dev->v4l2_dev,
-+	//	   "Mv=%llx, Col=%llx, Stride=%x, Buf=%llx->%llx\n",
-+	//	   de->rpi_mvbase, de->rpi_colbase, de->ctx->colmv_stride,
-+	//	   de->ctx->colmvbuf.addr, de->ctx->colmvbuf.addr +
-+	//	   de->ctx->colmvbuf.size);
-+
-+	rpivid_hw_irq_active2_irq(dev, &de->irq_ent, phase2_cb, de);
-+
-+	apb_write_final(dev, RPI_NUMROWS, de->pic_height_in_ctbs_y);
-+
-+	xtrace_ok(dev, de);
-+}
-+
-+static void phase1_claimed(struct rpivid_dev *const dev, void *v);
-+
-+// release any and all objects associated with de
-+// and reenable phase 1 if required
-+static void phase1_err_fin(struct rpivid_dev *const dev,
-+			   struct rpivid_ctx *const ctx,
-+			   struct rpivid_dec_env *const de)
-+{
-+	/* Return all detached buffers */
-+	if (de->src_buf)
-+		v4l2_m2m_buf_done(de->src_buf, VB2_BUF_STATE_ERROR);
-+	de->src_buf = NULL;
-+	if (de->frame_buf)
-+		v4l2_m2m_buf_done(de->frame_buf, VB2_BUF_STATE_ERROR);
-+	de->frame_buf = NULL;
-+#if USE_REQUEST_PIN
-+	if (de->req_pin)
-+		media_request_unpin(de->req_pin);
-+	de->req_pin = NULL;
-+#else
-+	if (de->req_obj)
-+		media_request_object_complete(de->req_obj);
-+	de->req_obj = NULL;
-+#endif
-+
-+	dec_env_delete(de);
-+
-+	/* Reenable phase 0 if we were blocking */
-+	if (atomic_add_return(-1, &ctx->p1out) >= RPIVID_P1BUF_COUNT - 1)
-+		v4l2_m2m_job_finish(dev->m2m_dev, ctx->fh.m2m_ctx);
-+
-+	/* Done with P1-P2 buffers - allow new P1 */
-+	rpivid_hw_irq_active1_enable_claim(dev, 1);
-+}
-+
-+static void phase1_thread(struct rpivid_dev *const dev, void *v)
-+{
-+	struct rpivid_dec_env *const de = v;
-+	struct rpivid_ctx *const ctx = de->ctx;
-+
-+	struct rpivid_gptr *const pu_gptr = ctx->pu_bufs + ctx->p2idx;
-+	struct rpivid_gptr *const coeff_gptr = ctx->coeff_bufs + ctx->p2idx;
-+
-+	xtrace_in(dev, de);
-+
-+	if (de->p1_status & STATUS_PU_EXHAUSTED) {
-+		if (gptr_realloc_new(dev, pu_gptr, next_size(pu_gptr->size))) {
-+			v4l2_err(&dev->v4l2_dev,
-+				 "%s: PU realloc (%zx) failed\n",
-+				 __func__, pu_gptr->size);
-+			goto fail;
-+		}
-+		v4l2_info(&dev->v4l2_dev, "%s: PU realloc (%zx) OK\n",
-+			  __func__, pu_gptr->size);
-+	}
-+
-+	if (de->p1_status & STATUS_COEFF_EXHAUSTED) {
-+		if (gptr_realloc_new(dev, coeff_gptr,
-+				     next_size(coeff_gptr->size))) {
-+			v4l2_err(&dev->v4l2_dev,
-+				 "%s: Coeff realloc (%zx) failed\n",
-+				 __func__, coeff_gptr->size);
-+			goto fail;
-+		}
-+		v4l2_info(&dev->v4l2_dev, "%s: Coeff realloc (%zx) OK\n",
-+			  __func__, coeff_gptr->size);
-+	}
-+
-+	phase1_claimed(dev, de);
-+	xtrace_ok(dev, de);
-+	return;
-+
-+fail:
-+	if (!pu_gptr->addr || !coeff_gptr->addr) {
-+		v4l2_err(&dev->v4l2_dev,
-+			 "%s: Fatal: failed to reclaim old alloc\n",
-+			 __func__);
-+		ctx->fatal_err = 1;
-+	}
-+	xtrace_fail(dev, de);
-+	phase1_err_fin(dev, ctx, de);
-+}
-+
-+/* Always called in irq context (this is good) */
-+static void phase1_cb(struct rpivid_dev *const dev, void *v)
-+{
-+	struct rpivid_dec_env *const de = v;
-+	struct rpivid_ctx *const ctx = de->ctx;
-+
-+	xtrace_in(dev, de);
-+
-+	de->p1_status = check_status(dev);
-+
-+	if (de->p1_status != 0) {
-+		v4l2_info(&dev->v4l2_dev, "%s: Post wait: %#x\n",
-+			  __func__, de->p1_status);
-+
-+		if (de->p1_status < 0)
-+			goto fail;
-+
-+		/* Need to realloc - push onto a thread rather than IRQ */
-+		rpivid_hw_irq_active1_thread(dev, &de->irq_ent,
-+					     phase1_thread, de);
-+		return;
-+	}
-+
-+	v4l2_m2m_buf_done(de->src_buf, VB2_BUF_STATE_DONE);
-+	de->src_buf = NULL;
-+
-+	/* All phase1 error paths done - it is safe to inc p2idx */
-+	ctx->p2idx =
-+		(ctx->p2idx + 1 >= RPIVID_P2BUF_COUNT) ? 0 : ctx->p2idx + 1;
-+
-+	/* Renable the next setup if we were blocking */
-+	if (atomic_add_return(-1, &ctx->p1out) >= RPIVID_P1BUF_COUNT - 1) {
-+		xtrace_fin(dev, de);
-+		v4l2_m2m_job_finish(dev->m2m_dev, ctx->fh.m2m_ctx);
-+	}
-+
-+	rpivid_hw_irq_active2_claim(dev, &de->irq_ent, phase2_claimed, de);
-+
-+	xtrace_ok(dev, de);
-+	return;
-+
-+fail:
-+	xtrace_fail(dev, de);
-+	phase1_err_fin(dev, ctx, de);
-+}
-+
-+static void phase1_claimed(struct rpivid_dev *const dev, void *v)
-+{
-+	struct rpivid_dec_env *const de = v;
-+	struct rpivid_ctx *const ctx = de->ctx;
-+
-+	const struct rpivid_gptr * const pu_gptr = ctx->pu_bufs + ctx->p2idx;
-+	const struct rpivid_gptr * const coeff_gptr = ctx->coeff_bufs +
-+						      ctx->p2idx;
-+
-+	xtrace_in(dev, de);
-+
-+	if (ctx->fatal_err)
-+		goto fail;
-+
-+	de->pu_base_vc = pu_gptr->addr;
-+	de->pu_stride =
-+		ALIGN_DOWN(pu_gptr->size / de->pic_height_in_ctbs_y, 64);
-+
-+	de->coeff_base_vc = coeff_gptr->addr;
-+	de->coeff_stride =
-+		ALIGN_DOWN(coeff_gptr->size / de->pic_height_in_ctbs_y, 64);
-+
-+	/* phase1_claimed blocked until cb_phase1 completed so p2idx inc
-+	 * in cb_phase1 after error detection
-+	 */
-+
-+	apb_write_vc_addr(dev, RPI_PUWBASE, de->pu_base_vc);
-+	apb_write_vc_len(dev, RPI_PUWSTRIDE, de->pu_stride);
-+	apb_write_vc_addr(dev, RPI_COEFFWBASE, de->coeff_base_vc);
-+	apb_write_vc_len(dev, RPI_COEFFWSTRIDE, de->coeff_stride);
-+
-+	// Trigger command FIFO
-+	apb_write(dev, RPI_CFNUM, de->cmd_len);
-+
-+	// Claim irq
-+	rpivid_hw_irq_active1_irq(dev, &de->irq_ent, phase1_cb, de);
-+
-+	// And start the h/w
-+	apb_write_vc_addr_final(dev, RPI_CFBASE, de->cmd_addr);
-+
-+	xtrace_ok(dev, de);
-+	return;
-+
-+fail:
-+	xtrace_fail(dev, de);
-+	phase1_err_fin(dev, ctx, de);
-+}
-+
-+static void dec_state_delete(struct rpivid_ctx *const ctx)
-+{
-+	unsigned int i;
-+	struct rpivid_dec_state *const s = ctx->state;
-+
-+	if (!s)
-+		return;
-+	ctx->state = NULL;
-+
-+	free_ps_info(s);
-+
-+	for (i = 0; i != HEVC_MAX_REFS; ++i)
-+		aux_q_release(ctx, &s->ref_aux[i]);
-+	aux_q_release(ctx, &s->frame_aux);
-+
-+	kfree(s);
-+}
-+
-+struct irq_sync {
-+	atomic_t done;
-+	wait_queue_head_t wq;
-+	struct rpivid_hw_irq_ent irq_ent;
-+};
-+
-+static void phase2_sync_claimed(struct rpivid_dev *const dev, void *v)
-+{
-+	struct irq_sync *const sync = v;
-+
-+	atomic_set(&sync->done, 1);
-+	wake_up(&sync->wq);
-+}
-+
-+static void phase1_sync_claimed(struct rpivid_dev *const dev, void *v)
-+{
-+	struct irq_sync *const sync = v;
-+
-+	rpivid_hw_irq_active1_enable_claim(dev, 1);
-+	rpivid_hw_irq_active2_claim(dev, &sync->irq_ent, phase2_sync_claimed, sync);
-+}
-+
-+/* Sync with IRQ operations
-+ *
-+ * Claims phase1 and phase2 in turn and waits for the phase2 claim so any
-+ * pending IRQ ops will have completed by the time this returns
-+ *
-+ * phase1 has counted enables so must reenable once claimed
-+ * phase2 has unlimited enables
-+ */
-+static void irq_sync(struct rpivid_dev *const dev)
-+{
-+	struct irq_sync sync;
-+
-+	atomic_set(&sync.done, 0);
-+	init_waitqueue_head(&sync.wq);
-+
-+	rpivid_hw_irq_active1_claim(dev, &sync.irq_ent, phase1_sync_claimed, &sync);
-+	wait_event(sync.wq, atomic_read(&sync.done));
-+}
-+
-+static void h265_ctx_uninit(struct rpivid_dev *const dev, struct rpivid_ctx *ctx)
-+{
-+	unsigned int i;
-+
-+	dec_env_uninit(ctx);
-+	dec_state_delete(ctx);
-+
-+	// dec_env & state must be killed before this to release the buffer to
-+	// the free pool
-+	aux_q_uninit(ctx);
-+
-+	for (i = 0; i != ARRAY_SIZE(ctx->bitbufs); ++i)
-+		gptr_free(dev, ctx->bitbufs + i);
-+	for (i = 0; i != ARRAY_SIZE(ctx->pu_bufs); ++i)
-+		gptr_free(dev, ctx->pu_bufs + i);
-+	for (i = 0; i != ARRAY_SIZE(ctx->coeff_bufs); ++i)
-+		gptr_free(dev, ctx->coeff_bufs + i);
-+}
-+
-+static void rpivid_h265_stop(struct rpivid_ctx *ctx)
-+{
-+	struct rpivid_dev *const dev = ctx->dev;
-+
-+	v4l2_info(&dev->v4l2_dev, "%s\n", __func__);
-+
-+	irq_sync(dev);
-+	h265_ctx_uninit(dev, ctx);
-+}
-+
-+static int rpivid_h265_start(struct rpivid_ctx *ctx)
-+{
-+	struct rpivid_dev *const dev = ctx->dev;
-+	unsigned int i;
-+
-+	unsigned int w = ctx->dst_fmt.width;
-+	unsigned int h = ctx->dst_fmt.height;
-+	unsigned int wxh;
-+	size_t pu_alloc;
-+	size_t coeff_alloc;
-+
-+#if DEBUG_TRACE_P1_CMD
-+	p1_z = 0;
-+#endif
-+
-+	// Generate a sanitised WxH for memory alloc
-+	// Assume HD if unset
-+	if (w == 0)
-+		w = 1920;
-+	if (w > 4096)
-+		w = 4096;
-+	if (h == 0)
-+		h = 1088;
-+	if (h > 4096)
-+		h = 4096;
-+	wxh = w * h;
-+
-+	v4l2_info(&dev->v4l2_dev, "%s: (%dx%d)\n", __func__,
-+		  ctx->dst_fmt.width, ctx->dst_fmt.height);
-+
-+	ctx->fatal_err = 0;
-+	ctx->dec0 = NULL;
-+	ctx->state = kzalloc(sizeof(*ctx->state), GFP_KERNEL);
-+	if (!ctx->state) {
-+		v4l2_err(&dev->v4l2_dev, "Failed to allocate decode state\n");
-+		goto fail;
-+	}
-+
-+	if (dec_env_init(ctx) != 0) {
-+		v4l2_err(&dev->v4l2_dev, "Failed to allocate decode envs\n");
-+		goto fail;
-+	}
-+
-+	// Finger in the air PU & Coeff alloc
-+	// Will be realloced if too small
-+	coeff_alloc = rpivid_round_up_size(wxh);
-+	pu_alloc = rpivid_round_up_size(wxh / 4);
-+	for (i = 0; i != ARRAY_SIZE(ctx->pu_bufs); ++i) {
-+		// Don't actually need a kernel mapping here
-+		if (gptr_alloc(dev, ctx->pu_bufs + i, pu_alloc,
-+			       DMA_ATTR_NO_KERNEL_MAPPING))
-+			goto fail;
-+		if (gptr_alloc(dev, ctx->coeff_bufs + i, coeff_alloc,
-+			       DMA_ATTR_NO_KERNEL_MAPPING))
-+			goto fail;
-+	}
-+	aux_q_init(ctx);
-+
-+	return 0;
-+
-+fail:
-+	h265_ctx_uninit(dev, ctx);
-+	return -ENOMEM;
-+}
-+
-+static void rpivid_h265_trigger(struct rpivid_ctx *ctx)
-+{
-+	struct rpivid_dev *const dev = ctx->dev;
-+	struct rpivid_dec_env *const de = ctx->dec0;
-+
-+	xtrace_in(dev, de);
-+
-+	switch (!de ? RPIVID_DECODE_ERROR_CONTINUE : de->state) {
-+	case RPIVID_DECODE_SLICE_START:
-+		de->state = RPIVID_DECODE_SLICE_CONTINUE;
-+		fallthrough;
-+	case RPIVID_DECODE_SLICE_CONTINUE:
-+		v4l2_m2m_buf_done_and_job_finish(dev->m2m_dev, ctx->fh.m2m_ctx,
-+						 VB2_BUF_STATE_DONE);
-+		xtrace_ok(dev, de);
-+		break;
-+
-+	default:
-+		v4l2_err(&dev->v4l2_dev, "%s: Unexpected state: %d\n", __func__,
-+			 de->state);
-+		fallthrough;
-+	case RPIVID_DECODE_ERROR_DONE:
-+		ctx->dec0 = NULL;
-+		dec_env_delete(de);
-+		fallthrough;
-+	case RPIVID_DECODE_ERROR_CONTINUE:
-+		xtrace_fin(dev, de);
-+		v4l2_m2m_buf_done_and_job_finish(dev->m2m_dev, ctx->fh.m2m_ctx,
-+						 VB2_BUF_STATE_ERROR);
-+		break;
-+
-+	case RPIVID_DECODE_PHASE1:
-+		ctx->dec0 = NULL;
-+
-+#if !USE_REQUEST_PIN
-+		/* Alloc a new request object - needs to be alloced dynamically
-+		 * as the media request will release it some random time after
-+		 * it is completed
-+		 */
-+		de->req_obj = kmalloc(sizeof(*de->req_obj), GFP_KERNEL);
-+		if (!de->req_obj) {
-+			xtrace_fail(dev, de);
-+			dec_env_delete(de);
-+			v4l2_m2m_buf_done_and_job_finish(dev->m2m_dev,
-+							 ctx->fh.m2m_ctx,
-+							 VB2_BUF_STATE_ERROR);
-+			break;
-+		}
-+		media_request_object_init(de->req_obj);
-+#warning probably needs to _get the req obj too
-+#endif
-+		ctx->p1idx = (ctx->p1idx + 1 >= RPIVID_P1BUF_COUNT) ?
-+							0 : ctx->p1idx + 1;
-+
-+		/* We know we have src & dst so no need to test */
-+		de->src_buf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
-+		de->frame_buf = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
-+
-+#if USE_REQUEST_PIN
-+		de->req_pin = de->src_buf->vb2_buf.req_obj.req;
-+		media_request_pin(de->req_pin);
-+#else
-+		media_request_object_bind(de->src_buf->vb2_buf.req_obj.req,
-+					  &dst_req_obj_ops, de, false,
-+					  de->req_obj);
-+#endif
-+
-+		/* We could get rid of the src buffer here if we've already
-+		 * copied it, but we don't copy the last buffer unless it
-+		 * didn't return a contig dma addr and that shouldn't happen
-+		 */
-+
-+		/* Enable the next setup if our Q isn't too big */
-+		if (atomic_add_return(1, &ctx->p1out) < RPIVID_P1BUF_COUNT) {
-+			xtrace_fin(dev, de);
-+			v4l2_m2m_job_finish(dev->m2m_dev, ctx->fh.m2m_ctx);
-+		}
-+
-+		rpivid_hw_irq_active1_claim(dev, &de->irq_ent, phase1_claimed,
-+					    de);
-+		xtrace_ok(dev, de);
-+		break;
-+	}
-+}
-+
-+const struct rpivid_dec_ops rpivid_dec_ops_h265 = {
-+	.setup = rpivid_h265_setup,
-+	.start = rpivid_h265_start,
-+	.stop = rpivid_h265_stop,
-+	.trigger = rpivid_h265_trigger,
-+};
-+
-+static int try_ctrl_sps(struct v4l2_ctrl *ctrl)
-+{
-+	const struct v4l2_ctrl_hevc_sps *const sps = ctrl->p_new.p_hevc_sps;
-+	struct rpivid_ctx *const ctx = ctrl->priv;
-+	struct rpivid_dev *const dev = ctx->dev;
-+
-+	if (sps->chroma_format_idc != 1) {
-+		v4l2_warn(&dev->v4l2_dev,
-+			  "Chroma format (%d) unsupported\n",
-+			  sps->chroma_format_idc);
-+		return -EINVAL;
-+	}
-+
-+	if (sps->bit_depth_luma_minus8 != 0 &&
-+	    sps->bit_depth_luma_minus8 != 2) {
-+		v4l2_warn(&dev->v4l2_dev,
-+			  "Luma depth (%d) unsupported\n",
-+			  sps->bit_depth_luma_minus8 + 8);
-+		return -EINVAL;
-+	}
-+
-+	if (sps->bit_depth_luma_minus8 != sps->bit_depth_chroma_minus8) {
-+		v4l2_warn(&dev->v4l2_dev,
-+			  "Chroma depth (%d) != Luma depth (%d)\n",
-+			  sps->bit_depth_chroma_minus8 + 8,
-+			  sps->bit_depth_luma_minus8 + 8);
-+		return -EINVAL;
-+	}
-+
-+	if (!sps->pic_width_in_luma_samples ||
-+	    !sps->pic_height_in_luma_samples ||
-+	    sps->pic_width_in_luma_samples > 4096 ||
-+	    sps->pic_height_in_luma_samples > 4096) {
-+		v4l2_warn(&dev->v4l2_dev,
-+			  "Bad sps width (%u) x height (%u)\n",
-+			  sps->pic_width_in_luma_samples,
-+			  sps->pic_height_in_luma_samples);
-+		return -EINVAL;
-+	}
-+
-+	if (!ctx->dst_fmt_set)
-+		return 0;
-+
-+	if ((sps->bit_depth_luma_minus8 == 0 &&
-+	     ctx->dst_fmt.pixelformat != V4L2_PIX_FMT_NV12_COL128) ||
-+	    (sps->bit_depth_luma_minus8 == 2 &&
-+	     ctx->dst_fmt.pixelformat != V4L2_PIX_FMT_NV12_10_COL128)) {
-+		v4l2_warn(&dev->v4l2_dev,
-+			  "SPS luma depth %d does not match capture format\n",
-+			  sps->bit_depth_luma_minus8 + 8);
-+		return -EINVAL;
-+	}
-+
-+	if (sps->pic_width_in_luma_samples > ctx->dst_fmt.width ||
-+	    sps->pic_height_in_luma_samples > ctx->dst_fmt.height) {
-+		v4l2_warn(&dev->v4l2_dev,
-+			  "SPS size (%dx%d) > capture size (%d,%d)\n",
-+			  sps->pic_width_in_luma_samples,
-+			  sps->pic_height_in_luma_samples,
-+			  ctx->dst_fmt.width,
-+			  ctx->dst_fmt.height);
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
-+
-+const struct v4l2_ctrl_ops rpivid_hevc_sps_ctrl_ops = {
-+	.try_ctrl = try_ctrl_sps,
-+};
-+
-+static int try_ctrl_pps(struct v4l2_ctrl *ctrl)
-+{
-+	const struct v4l2_ctrl_hevc_pps *const pps = ctrl->p_new.p_hevc_pps;
-+	struct rpivid_ctx *const ctx = ctrl->priv;
-+	struct rpivid_dev *const dev = ctx->dev;
-+
-+	if ((pps->flags &
-+	     V4L2_HEVC_PPS_FLAG_ENTROPY_CODING_SYNC_ENABLED) &&
-+	    (pps->flags &
-+	     V4L2_HEVC_PPS_FLAG_TILES_ENABLED) &&
-+	    (pps->num_tile_columns_minus1 || pps->num_tile_rows_minus1)) {
-+		v4l2_warn(&dev->v4l2_dev,
-+			  "WPP + Tiles not supported\n");
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
-+
-+const struct v4l2_ctrl_ops rpivid_hevc_pps_ctrl_ops = {
-+	.try_ctrl = try_ctrl_pps,
-+};
-+
---- /dev/null
-+++ b/drivers/staging/media/rpivid/rpivid_hw.c
-@@ -0,0 +1,383 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Raspberry Pi HEVC driver
-+ *
-+ * Copyright (C) 2020 Raspberry Pi (Trading) Ltd
-+ *
-+ * Based on the Cedrus VPU driver, that is:
-+ *
-+ * Copyright (C) 2016 Florent Revest <florent.revest@free-electrons.com>
-+ * Copyright (C) 2018 Paul Kocialkowski <paul.kocialkowski@bootlin.com>
-+ * Copyright (C) 2018 Bootlin
-+ */
-+#include <linux/clk.h>
-+#include <linux/component.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/interrupt.h>
-+#include <linux/io.h>
-+#include <linux/of_reserved_mem.h>
-+#include <linux/of_device.h>
-+#include <linux/of_platform.h>
-+#include <linux/platform_device.h>
-+#include <linux/regmap.h>
-+#include <linux/reset.h>
-+
-+#include <media/videobuf2-core.h>
-+#include <media/v4l2-mem2mem.h>
-+
-+#include <soc/bcm2835/raspberrypi-firmware.h>
-+
-+#include "rpivid.h"
-+#include "rpivid_hw.h"
-+
-+static void pre_irq(struct rpivid_dev *dev, struct rpivid_hw_irq_ent *ient,
-+		    rpivid_irq_callback cb, void *v,
-+		    struct rpivid_hw_irq_ctrl *ictl)
-+{
-+	unsigned long flags;
-+
-+	if (ictl->irq) {
-+		v4l2_err(&dev->v4l2_dev, "Attempt to claim IRQ when already claimed\n");
-+		return;
-+	}
-+
-+	ient->cb = cb;
-+	ient->v = v;
-+
-+	spin_lock_irqsave(&ictl->lock, flags);
-+	ictl->irq = ient;
-+	ictl->no_sched++;
-+	spin_unlock_irqrestore(&ictl->lock, flags);
-+}
-+
-+/* Should be called from inside ictl->lock */
-+static inline bool sched_enabled(const struct rpivid_hw_irq_ctrl * const ictl)
-+{
-+	return ictl->no_sched <= 0 && ictl->enable;
-+}
-+
-+/* Should be called from inside ictl->lock & after checking sched_enabled() */
-+static inline void set_claimed(struct rpivid_hw_irq_ctrl * const ictl)
-+{
-+	if (ictl->enable > 0)
-+		--ictl->enable;
-+	ictl->no_sched = 1;
-+}
-+
-+/* Should be called from inside ictl->lock */
-+static struct rpivid_hw_irq_ent *get_sched(struct rpivid_hw_irq_ctrl * const ictl)
-+{
-+	struct rpivid_hw_irq_ent *ient;
-+
-+	if (!sched_enabled(ictl))
-+		return NULL;
-+
-+	ient = ictl->claim;
-+	if (!ient)
-+		return NULL;
-+	ictl->claim = ient->next;
-+
-+	set_claimed(ictl);
-+	return ient;
-+}
-+
-+/* Run a callback & check to see if there is anything else to run */
-+static void sched_cb(struct rpivid_dev * const dev,
-+		     struct rpivid_hw_irq_ctrl * const ictl,
-+		     struct rpivid_hw_irq_ent *ient)
-+{
-+	while (ient) {
-+		unsigned long flags;
-+
-+		ient->cb(dev, ient->v);
-+
-+		spin_lock_irqsave(&ictl->lock, flags);
-+
-+		/* Always dec no_sched after cb exec - must have been set
-+		 * on entry to cb
-+		 */
-+		--ictl->no_sched;
-+		ient = get_sched(ictl);
-+
-+		spin_unlock_irqrestore(&ictl->lock, flags);
-+	}
-+}
-+
-+/* Should only ever be called from its own IRQ cb so no lock required */
-+static void pre_thread(struct rpivid_dev *dev,
-+		       struct rpivid_hw_irq_ent *ient,
-+		       rpivid_irq_callback cb, void *v,
-+		       struct rpivid_hw_irq_ctrl *ictl)
-+{
-+	ient->cb = cb;
-+	ient->v = v;
-+	ictl->irq = ient;
-+	ictl->thread_reqed = true;
-+	ictl->no_sched++;	/* This is unwound in do_thread */
-+}
-+
-+// Called in irq context
-+static void do_irq(struct rpivid_dev * const dev,
-+		   struct rpivid_hw_irq_ctrl * const ictl)
-+{
-+	struct rpivid_hw_irq_ent *ient;
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&ictl->lock, flags);
-+	ient = ictl->irq;
-+	ictl->irq = NULL;
-+	spin_unlock_irqrestore(&ictl->lock, flags);
-+
-+	sched_cb(dev, ictl, ient);
-+}
-+
-+static void do_claim(struct rpivid_dev * const dev,
-+		     struct rpivid_hw_irq_ent *ient,
-+		     const rpivid_irq_callback cb, void * const v,
-+		     struct rpivid_hw_irq_ctrl * const ictl)
-+{
-+	unsigned long flags;
-+
-+	ient->next = NULL;
-+	ient->cb = cb;
-+	ient->v = v;
-+
-+	spin_lock_irqsave(&ictl->lock, flags);
-+
-+	if (ictl->claim) {
-+		// If we have a Q then add to end
-+		ictl->tail->next = ient;
-+		ictl->tail = ient;
-+		ient = NULL;
-+	} else if (!sched_enabled(ictl)) {
-+		// Empty Q but other activity in progress so Q
-+		ictl->claim = ient;
-+		ictl->tail = ient;
-+		ient = NULL;
-+	} else {
-+		// Nothing else going on - schedule immediately and
-+		// prevent anything else scheduling claims
-+		set_claimed(ictl);
-+	}
-+
-+	spin_unlock_irqrestore(&ictl->lock, flags);
-+
-+	sched_cb(dev, ictl, ient);
-+}
-+
-+/* Enable n claims.
-+ * n < 0   set to unlimited (default on init)
-+ * n = 0   if previously unlimited then disable otherwise nop
-+ * n > 0   if previously unlimited then set to n enables
-+ *         otherwise add n enables
-+ * The enable count is automatically decremented every time a claim is run
-+ */
-+static void do_enable_claim(struct rpivid_dev * const dev,
-+			    int n,
-+			    struct rpivid_hw_irq_ctrl * const ictl)
-+{
-+	unsigned long flags;
-+	struct rpivid_hw_irq_ent *ient;
-+
-+	spin_lock_irqsave(&ictl->lock, flags);
-+	ictl->enable = n < 0 ? -1 : ictl->enable <= 0 ? n : ictl->enable + n;
-+	ient = get_sched(ictl);
-+	spin_unlock_irqrestore(&ictl->lock, flags);
-+
-+	sched_cb(dev, ictl, ient);
-+}
-+
-+static void ictl_init(struct rpivid_hw_irq_ctrl * const ictl, int enables)
-+{
-+	spin_lock_init(&ictl->lock);
-+	ictl->claim = NULL;
-+	ictl->tail = NULL;
-+	ictl->irq = NULL;
-+	ictl->no_sched = 0;
-+	ictl->enable = enables;
-+	ictl->thread_reqed = false;
-+}
-+
-+static void ictl_uninit(struct rpivid_hw_irq_ctrl * const ictl)
-+{
-+	// Nothing to do
-+}
-+
-+#if !OPT_DEBUG_POLL_IRQ
-+static irqreturn_t rpivid_irq_irq(int irq, void *data)
-+{
-+	struct rpivid_dev * const dev = data;
-+	__u32 ictrl;
-+
-+	ictrl = irq_read(dev, ARG_IC_ICTRL);
-+	if (!(ictrl & ARG_IC_ICTRL_ALL_IRQ_MASK)) {
-+		v4l2_warn(&dev->v4l2_dev, "IRQ but no IRQ bits set\n");
-+		return IRQ_NONE;
-+	}
-+
-+	// Cancel any/all irqs
-+	irq_write(dev, ARG_IC_ICTRL, ictrl & ~ARG_IC_ICTRL_SET_ZERO_MASK);
-+
-+	// Service Active2 before Active1 so Phase 1 can transition to Phase 2
-+	// without delay
-+	if (ictrl & ARG_IC_ICTRL_ACTIVE2_INT_SET)
-+		do_irq(dev, &dev->ic_active2);
-+	if (ictrl & ARG_IC_ICTRL_ACTIVE1_INT_SET)
-+		do_irq(dev, &dev->ic_active1);
-+
-+	return dev->ic_active1.thread_reqed || dev->ic_active2.thread_reqed ?
-+		IRQ_WAKE_THREAD : IRQ_HANDLED;
-+}
-+
-+static void do_thread(struct rpivid_dev * const dev,
-+		      struct rpivid_hw_irq_ctrl *const ictl)
-+{
-+	unsigned long flags;
-+	struct rpivid_hw_irq_ent *ient = NULL;
-+
-+	spin_lock_irqsave(&ictl->lock, flags);
-+
-+	if (ictl->thread_reqed) {
-+		ient = ictl->irq;
-+		ictl->thread_reqed = false;
-+		ictl->irq = NULL;
-+	}
-+
-+	spin_unlock_irqrestore(&ictl->lock, flags);
-+
-+	sched_cb(dev, ictl, ient);
-+}
-+
-+static irqreturn_t rpivid_irq_thread(int irq, void *data)
-+{
-+	struct rpivid_dev * const dev = data;
-+
-+	do_thread(dev, &dev->ic_active1);
-+	do_thread(dev, &dev->ic_active2);
-+
-+	return IRQ_HANDLED;
-+}
-+#endif
-+
-+/* May only be called from Active1 CB
-+ * IRQs should not be expected until execution continues in the cb
-+ */
-+void rpivid_hw_irq_active1_thread(struct rpivid_dev *dev,
-+				  struct rpivid_hw_irq_ent *ient,
-+				  rpivid_irq_callback thread_cb, void *ctx)
-+{
-+	pre_thread(dev, ient, thread_cb, ctx, &dev->ic_active1);
-+}
-+
-+void rpivid_hw_irq_active1_enable_claim(struct rpivid_dev *dev,
-+					int n)
-+{
-+	do_enable_claim(dev, n, &dev->ic_active1);
-+}
-+
-+void rpivid_hw_irq_active1_claim(struct rpivid_dev *dev,
-+				 struct rpivid_hw_irq_ent *ient,
-+				 rpivid_irq_callback ready_cb, void *ctx)
-+{
-+	do_claim(dev, ient, ready_cb, ctx, &dev->ic_active1);
-+}
-+
-+void rpivid_hw_irq_active1_irq(struct rpivid_dev *dev,
-+			       struct rpivid_hw_irq_ent *ient,
-+			       rpivid_irq_callback irq_cb, void *ctx)
-+{
-+	pre_irq(dev, ient, irq_cb, ctx, &dev->ic_active1);
-+}
-+
-+void rpivid_hw_irq_active2_claim(struct rpivid_dev *dev,
-+				 struct rpivid_hw_irq_ent *ient,
-+				 rpivid_irq_callback ready_cb, void *ctx)
-+{
-+	do_claim(dev, ient, ready_cb, ctx, &dev->ic_active2);
-+}
-+
-+void rpivid_hw_irq_active2_irq(struct rpivid_dev *dev,
-+			       struct rpivid_hw_irq_ent *ient,
-+			       rpivid_irq_callback irq_cb, void *ctx)
-+{
-+	pre_irq(dev, ient, irq_cb, ctx, &dev->ic_active2);
-+}
-+
-+int rpivid_hw_probe(struct rpivid_dev *dev)
-+{
-+	struct rpi_firmware *firmware;
-+	struct device_node *node;
-+	struct resource *res;
-+	__u32 irq_stat;
-+	int irq_dec;
-+	int ret = 0;
-+
-+	ictl_init(&dev->ic_active1, RPIVID_P2BUF_COUNT);
-+	ictl_init(&dev->ic_active2, RPIVID_ICTL_ENABLE_UNLIMITED);
-+
-+	res = platform_get_resource_byname(dev->pdev, IORESOURCE_MEM, "intc");
-+	if (!res)
-+		return -ENODEV;
-+
-+	dev->base_irq = devm_ioremap(dev->dev, res->start, resource_size(res));
-+	if (IS_ERR(dev->base_irq))
-+		return PTR_ERR(dev->base_irq);
-+
-+	res = platform_get_resource_byname(dev->pdev, IORESOURCE_MEM, "hevc");
-+	if (!res)
-+		return -ENODEV;
-+
-+	dev->base_h265 = devm_ioremap(dev->dev, res->start, resource_size(res));
-+	if (IS_ERR(dev->base_h265))
-+		return PTR_ERR(dev->base_h265);
-+
-+	dev->clock = devm_clk_get(&dev->pdev->dev, "hevc");
-+	if (IS_ERR(dev->clock))
-+		return PTR_ERR(dev->clock);
-+
-+	node = rpi_firmware_find_node();
-+	if (!node)
-+		return -EINVAL;
-+
-+	firmware = rpi_firmware_get(node);
-+	of_node_put(node);
-+	if (!firmware)
-+		return -EPROBE_DEFER;
-+
-+	dev->max_clock_rate = rpi_firmware_clk_get_max_rate(firmware,
-+							    RPI_FIRMWARE_HEVC_CLK_ID);
-+	rpi_firmware_put(firmware);
-+
-+	dev->cache_align = dma_get_cache_alignment();
-+
-+	// Disable IRQs & reset anything pending
-+	irq_write(dev, 0,
-+		  ARG_IC_ICTRL_ACTIVE1_EN_SET | ARG_IC_ICTRL_ACTIVE2_EN_SET);
-+	irq_stat = irq_read(dev, 0);
-+	irq_write(dev, 0, irq_stat);
-+
-+#if !OPT_DEBUG_POLL_IRQ
-+	irq_dec = platform_get_irq(dev->pdev, 0);
-+	if (irq_dec <= 0)
-+		return irq_dec;
-+	ret = devm_request_threaded_irq(dev->dev, irq_dec,
-+					rpivid_irq_irq,
-+					rpivid_irq_thread,
-+					0, dev_name(dev->dev), dev);
-+	if (ret) {
-+		dev_err(dev->dev, "Failed to request IRQ - %d\n", ret);
-+
-+		return ret;
-+	}
-+#endif
-+	return ret;
-+}
-+
-+void rpivid_hw_remove(struct rpivid_dev *dev)
-+{
-+	// IRQ auto freed on unload so no need to do it here
-+	// ioremap auto freed on unload
-+	ictl_uninit(&dev->ic_active1);
-+	ictl_uninit(&dev->ic_active2);
-+}
-+
---- /dev/null
-+++ b/drivers/staging/media/rpivid/rpivid_hw.h
-@@ -0,0 +1,303 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * Raspberry Pi HEVC driver
-+ *
-+ * Copyright (C) 2020 Raspberry Pi (Trading) Ltd
-+ *
-+ * Based on the Cedrus VPU driver, that is:
-+ *
-+ * Copyright (C) 2016 Florent Revest <florent.revest@free-electrons.com>
-+ * Copyright (C) 2018 Paul Kocialkowski <paul.kocialkowski@bootlin.com>
-+ * Copyright (C) 2018 Bootlin
-+ */
-+
-+#ifndef _RPIVID_HW_H_
-+#define _RPIVID_HW_H_
-+
-+struct rpivid_hw_irq_ent {
-+	struct rpivid_hw_irq_ent *next;
-+	rpivid_irq_callback cb;
-+	void *v;
-+};
-+
-+/* Phase 1 Register offsets */
-+
-+#define RPI_SPS0 0
-+#define RPI_SPS1 4
-+#define RPI_PPS 8
-+#define RPI_SLICE 12
-+#define RPI_TILESTART 16
-+#define RPI_TILEEND 20
-+#define RPI_SLICESTART 24
-+#define RPI_MODE 28
-+#define RPI_LEFT0 32
-+#define RPI_LEFT1 36
-+#define RPI_LEFT2 40
-+#define RPI_LEFT3 44
-+#define RPI_QP 48
-+#define RPI_CONTROL 52
-+#define RPI_STATUS 56
-+#define RPI_VERSION 60
-+#define RPI_BFBASE 64
-+#define RPI_BFNUM 68
-+#define RPI_BFCONTROL 72
-+#define RPI_BFSTATUS 76
-+#define RPI_PUWBASE 80
-+#define RPI_PUWSTRIDE 84
-+#define RPI_COEFFWBASE 88
-+#define RPI_COEFFWSTRIDE 92
-+#define RPI_SLICECMDS 96
-+#define RPI_BEGINTILEEND 100
-+#define RPI_TRANSFER 104
-+#define RPI_CFBASE 108
-+#define RPI_CFNUM 112
-+#define RPI_CFSTATUS 116
-+
-+/* Phase 2 Register offsets */
-+
-+#define RPI_PURBASE 0x8000
-+#define RPI_PURSTRIDE 0x8004
-+#define RPI_COEFFRBASE 0x8008
-+#define RPI_COEFFRSTRIDE 0x800C
-+#define RPI_NUMROWS 0x8010
-+#define RPI_CONFIG2 0x8014
-+#define RPI_OUTYBASE 0x8018
-+#define RPI_OUTYSTRIDE 0x801C
-+#define RPI_OUTCBASE 0x8020
-+#define RPI_OUTCSTRIDE 0x8024
-+#define RPI_STATUS2 0x8028
-+#define RPI_FRAMESIZE 0x802C
-+#define RPI_MVBASE 0x8030
-+#define RPI_MVSTRIDE 0x8034
-+#define RPI_COLBASE 0x8038
-+#define RPI_COLSTRIDE 0x803C
-+#define RPI_CURRPOC 0x8040
-+
-+/*
-+ * Write a general register value
-+ * Order is unimportant
-+ */
-+static inline void apb_write(const struct rpivid_dev * const dev,
-+			     const unsigned int offset, const u32 val)
-+{
-+	writel_relaxed(val, dev->base_h265 + offset);
-+}
-+
-+/* Write the final register value that actually starts the phase */
-+static inline void apb_write_final(const struct rpivid_dev * const dev,
-+				   const unsigned int offset, const u32 val)
-+{
-+	writel(val, dev->base_h265 + offset);
-+}
-+
-+static inline u32 apb_read(const struct rpivid_dev * const dev,
-+			   const unsigned int offset)
-+{
-+	return readl(dev->base_h265 + offset);
-+}
-+
-+static inline void irq_write(const struct rpivid_dev * const dev,
-+			     const unsigned int offset, const u32 val)
-+{
-+	writel(val, dev->base_irq + offset);
-+}
-+
-+static inline u32 irq_read(const struct rpivid_dev * const dev,
-+			   const unsigned int offset)
-+{
-+	return readl(dev->base_irq + offset);
-+}
-+
-+static inline void apb_write_vc_addr(const struct rpivid_dev * const dev,
-+				     const unsigned int offset,
-+				     const dma_addr_t a)
-+{
-+	apb_write(dev, offset, (u32)(a >> 6));
-+}
-+
-+static inline void apb_write_vc_addr_final(const struct rpivid_dev * const dev,
-+					   const unsigned int offset,
-+					   const dma_addr_t a)
-+{
-+	apb_write_final(dev, offset, (u32)(a >> 6));
-+}
-+
-+static inline void apb_write_vc_len(const struct rpivid_dev * const dev,
-+				    const unsigned int offset,
-+				    const unsigned int x)
-+{
-+	apb_write(dev, offset, (x + 63) >> 6);
-+}
-+
-+/* *ARG_IC_ICTRL - Interrupt control for ARGON Core*
-+ * Offset (byte space) = 40'h2b10000
-+ * Physical Address (byte space) = 40'h7eb10000
-+ * Verilog Macro Address = `ARG_IC_REG_START + `ARGON_INTCTRL_ICTRL
-+ * Reset Value = 32'b100x100x_100xxxxx_xxxxxxx0_x100x100
-+ * Access = RW (32-bit only)
-+ * Interrupt control logic for ARGON Core.
-+ */
-+#define ARG_IC_ICTRL 0
-+
-+/* acc=LWC ACTIVE1_INT FIELD ACCESS: LWC
-+ *
-+ * Interrupt 1
-+ * This is set and held when an hevc_active1 interrupt edge is detected
-+ * The polarity of the edge is set by the ACTIVE1_EDGE field
-+ * Write a 1 to this bit to clear down the latched interrupt
-+ * The latched interrupt is only enabled out onto the interrupt line if
-+ * ACTIVE1_EN is set
-+ * Reset value is *0* decimal.
-+ */
-+#define ARG_IC_ICTRL_ACTIVE1_INT_SET		BIT(0)
-+
-+/* ACTIVE1_EDGE Sets the polarity of the interrupt edge detection logic
-+ * This logic detects edges of the hevc_active1 line from the argon core
-+ * 0 = negedge, 1 = posedge
-+ * Reset value is *0* decimal.
-+ */
-+#define ARG_IC_ICTRL_ACTIVE1_EDGE_SET		BIT(1)
-+
-+/* ACTIVE1_EN Enables ACTIVE1_INT out onto the argon interrupt line.
-+ * If this isn't set, the interrupt logic will work but no interrupt will be
-+ * set to the interrupt controller
-+ * Reset value is *1* decimal.
-+ *
-+ * [JC] The above appears to be a lie - if unset then b0 is never set
-+ */
-+#define ARG_IC_ICTRL_ACTIVE1_EN_SET		BIT(2)
-+
-+/* acc=RO ACTIVE1_STATUS FIELD ACCESS: RO
-+ *
-+ * The current status of the hevc_active1 signal
-+ */
-+#define ARG_IC_ICTRL_ACTIVE1_STATUS_SET		BIT(3)
-+
-+/* acc=LWC ACTIVE2_INT FIELD ACCESS: LWC
-+ *
-+ * Interrupt 2
-+ * This is set and held when an hevc_active2 interrupt edge is detected
-+ * The polarity of the edge is set by the ACTIVE2_EDGE field
-+ * Write a 1 to this bit to clear down the latched interrupt
-+ * The latched interrupt is only enabled out onto the interrupt line if
-+ * ACTIVE2_EN is set
-+ * Reset value is *0* decimal.
-+ */
-+#define ARG_IC_ICTRL_ACTIVE2_INT_SET		BIT(4)
-+
-+/* ACTIVE2_EDGE Sets the polarity of the interrupt edge detection logic
-+ * This logic detects edges of the hevc_active2 line from the argon core
-+ * 0 = negedge, 1 = posedge
-+ * Reset value is *0* decimal.
-+ */
-+#define ARG_IC_ICTRL_ACTIVE2_EDGE_SET		BIT(5)
-+
-+/* ACTIVE2_EN Enables ACTIVE2_INT out onto the argon interrupt line.
-+ * If this isn't set, the interrupt logic will work but no interrupt will be
-+ * set to the interrupt controller
-+ * Reset value is *1* decimal.
-+ */
-+#define ARG_IC_ICTRL_ACTIVE2_EN_SET		BIT(6)
-+
-+/* acc=RO ACTIVE2_STATUS FIELD ACCESS: RO
-+ *
-+ * The current status of the hevc_active2 signal
-+ */
-+#define ARG_IC_ICTRL_ACTIVE2_STATUS_SET		BIT(7)
-+
-+/* TEST_INT Forces the argon int high for test purposes.
-+ * Reset value is *0* decimal.
-+ */
-+#define ARG_IC_ICTRL_TEST_INT			BIT(8)
-+#define ARG_IC_ICTRL_SPARE			BIT(9)
-+
-+/* acc=RO VP9_INTERRUPT_STATUS FIELD ACCESS: RO
-+ *
-+ * The current status of the vp9_interrupt signal
-+ */
-+#define ARG_IC_ICTRL_VP9_INTERRUPT_STATUS	BIT(10)
-+
-+/* AIO_INT_ENABLE 1 = Or the AIO int in with the Argon int so the VPU can see
-+ * it
-+ * 0 = the AIO int is masked. (It should still be connected to the GIC though).
-+ */
-+#define ARG_IC_ICTRL_AIO_INT_ENABLE		BIT(20)
-+#define ARG_IC_ICTRL_H264_ACTIVE_INT		BIT(21)
-+#define ARG_IC_ICTRL_H264_ACTIVE_EDGE		BIT(22)
-+#define ARG_IC_ICTRL_H264_ACTIVE_EN		BIT(23)
-+#define ARG_IC_ICTRL_H264_ACTIVE_STATUS		BIT(24)
-+#define ARG_IC_ICTRL_H264_INTERRUPT_INT		BIT(25)
-+#define ARG_IC_ICTRL_H264_INTERRUPT_EDGE	BIT(26)
-+#define ARG_IC_ICTRL_H264_INTERRUPT_EN		BIT(27)
-+
-+/* acc=RO H264_INTERRUPT_STATUS FIELD ACCESS: RO
-+ *
-+ * The current status of the h264_interrupt signal
-+ */
-+#define ARG_IC_ICTRL_H264_INTERRUPT_STATUS	BIT(28)
-+
-+/* acc=LWC VP9_INTERRUPT_INT FIELD ACCESS: LWC
-+ *
-+ * Interrupt 1
-+ * This is set and held when an vp9_interrupt interrupt edge is detected
-+ * The polarity of the edge is set by the VP9_INTERRUPT_EDGE field
-+ * Write a 1 to this bit to clear down the latched interrupt
-+ * The latched interrupt is only enabled out onto the interrupt line if
-+ * VP9_INTERRUPT_EN is set
-+ * Reset value is *0* decimal.
-+ */
-+#define ARG_IC_ICTRL_VP9_INTERRUPT_INT		BIT(29)
-+
-+/* VP9_INTERRUPT_EDGE Sets the polarity of the interrupt edge detection logic
-+ * This logic detects edges of the vp9_interrupt line from the argon h264 core
-+ * 0 = negedge, 1 = posedge
-+ * Reset value is *0* decimal.
-+ */
-+#define ARG_IC_ICTRL_VP9_INTERRUPT_EDGE		BIT(30)
-+
-+/* VP9_INTERRUPT_EN Enables VP9_INTERRUPT_INT out onto the argon interrupt line.
-+ * If this isn't set, the interrupt logic will work but no interrupt will be
-+ * set to the interrupt controller
-+ * Reset value is *1* decimal.
-+ */
-+#define ARG_IC_ICTRL_VP9_INTERRUPT_EN		BIT(31)
-+
-+/* Bits 19:12, 11 reserved - read ?, write 0 */
-+#define ARG_IC_ICTRL_SET_ZERO_MASK		((0xff << 12) | BIT(11))
-+
-+/* All IRQ bits */
-+#define ARG_IC_ICTRL_ALL_IRQ_MASK   (\
-+		ARG_IC_ICTRL_VP9_INTERRUPT_INT  |\
-+		ARG_IC_ICTRL_H264_INTERRUPT_INT |\
-+		ARG_IC_ICTRL_ACTIVE1_INT_SET    |\
-+		ARG_IC_ICTRL_ACTIVE2_INT_SET)
-+
-+/* Regulate claim Q */
-+void rpivid_hw_irq_active1_enable_claim(struct rpivid_dev *dev,
-+					int n);
-+/* Auto release once all CBs called */
-+void rpivid_hw_irq_active1_claim(struct rpivid_dev *dev,
-+				 struct rpivid_hw_irq_ent *ient,
-+				 rpivid_irq_callback ready_cb, void *ctx);
-+/* May only be called in claim cb */
-+void rpivid_hw_irq_active1_irq(struct rpivid_dev *dev,
-+			       struct rpivid_hw_irq_ent *ient,
-+			       rpivid_irq_callback irq_cb, void *ctx);
-+/* May only be called in irq cb */
-+void rpivid_hw_irq_active1_thread(struct rpivid_dev *dev,
-+				  struct rpivid_hw_irq_ent *ient,
-+				  rpivid_irq_callback thread_cb, void *ctx);
-+
-+/* Auto release once all CBs called */
-+void rpivid_hw_irq_active2_claim(struct rpivid_dev *dev,
-+				 struct rpivid_hw_irq_ent *ient,
-+				 rpivid_irq_callback ready_cb, void *ctx);
-+/* May only be called in claim cb */
-+void rpivid_hw_irq_active2_irq(struct rpivid_dev *dev,
-+			       struct rpivid_hw_irq_ent *ient,
-+			       rpivid_irq_callback irq_cb, void *ctx);
-+
-+int rpivid_hw_probe(struct rpivid_dev *dev);
-+void rpivid_hw_remove(struct rpivid_dev *dev);
-+
-+#endif
---- /dev/null
-+++ b/drivers/staging/media/rpivid/rpivid_video.c
-@@ -0,0 +1,696 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Raspberry Pi HEVC driver
-+ *
-+ * Copyright (C) 2020 Raspberry Pi (Trading) Ltd
-+ *
-+ * Based on the Cedrus VPU driver, that is:
-+ *
-+ * Copyright (C) 2016 Florent Revest <florent.revest@free-electrons.com>
-+ * Copyright (C) 2018 Paul Kocialkowski <paul.kocialkowski@bootlin.com>
-+ * Copyright (C) 2018 Bootlin
-+ */
-+
-+#include <media/videobuf2-dma-contig.h>
-+#include <media/v4l2-device.h>
-+#include <media/v4l2-ioctl.h>
-+#include <media/v4l2-event.h>
-+#include <media/v4l2-mem2mem.h>
-+
-+#include "rpivid.h"
-+#include "rpivid_hw.h"
-+#include "rpivid_video.h"
-+#include "rpivid_dec.h"
-+
-+#define RPIVID_DECODE_SRC	BIT(0)
-+#define RPIVID_DECODE_DST	BIT(1)
-+
-+#define RPIVID_MIN_WIDTH	16U
-+#define RPIVID_MIN_HEIGHT	16U
-+#define RPIVID_DEFAULT_WIDTH	1920U
-+#define RPIVID_DEFAULT_HEIGHT	1088U
-+#define RPIVID_MAX_WIDTH	4096U
-+#define RPIVID_MAX_HEIGHT	4096U
-+
-+static inline struct rpivid_ctx *rpivid_file2ctx(struct file *file)
-+{
-+	return container_of(file->private_data, struct rpivid_ctx, fh);
-+}
-+
-+/* constrain x to y,y*2 */
-+static inline unsigned int constrain2x(unsigned int x, unsigned int y)
-+{
-+	return (x < y) ?
-+			y :
-+			(x > y * 2) ? y : x;
-+}
-+
-+size_t rpivid_round_up_size(const size_t x)
-+{
-+	/* Admit no size < 256 */
-+	const unsigned int n = x < 256 ? 8 : ilog2(x);
-+
-+	return x >= (3 << n) ? 4 << n : (3 << n);
-+}
-+
-+size_t rpivid_bit_buf_size(unsigned int w, unsigned int h, unsigned int bits_minus8)
-+{
-+	const size_t wxh = w * h;
-+	size_t bits_alloc;
-+
-+	/* Annex A gives a min compression of 2 @ lvl 3.1
-+	 * (wxh <= 983040) and min 4 thereafter but avoid
-+	 * the odity of 983041 having a lower limit than
-+	 * 983040.
-+	 * Multiply by 3/2 for 4:2:0
-+	 */
-+	bits_alloc = wxh < 983040 ? wxh * 3 / 4 :
-+		wxh < 983040 * 2 ? 983040 * 3 / 4 :
-+		wxh * 3 / 8;
-+	/* Allow for bit depth */
-+	bits_alloc += (bits_alloc * bits_minus8) / 8;
-+	return rpivid_round_up_size(bits_alloc);
-+}
-+
-+void rpivid_prepare_src_format(struct v4l2_pix_format_mplane *pix_fmt)
-+{
-+	size_t size;
-+	u32 w;
-+	u32 h;
-+
-+	w = pix_fmt->width;
-+	h = pix_fmt->height;
-+	if (!w || !h) {
-+		w = RPIVID_DEFAULT_WIDTH;
-+		h = RPIVID_DEFAULT_HEIGHT;
-+	}
-+	if (w > RPIVID_MAX_WIDTH)
-+		w = RPIVID_MAX_WIDTH;
-+	if (h > RPIVID_MAX_HEIGHT)
-+		h = RPIVID_MAX_HEIGHT;
-+
-+	if (!pix_fmt->plane_fmt[0].sizeimage ||
-+	    pix_fmt->plane_fmt[0].sizeimage > SZ_32M) {
-+		/* Unspecified or way too big - pick max for size */
-+		size = rpivid_bit_buf_size(w, h, 2);
-+	}
-+	/* Set a minimum */
-+	size = max_t(u32, SZ_4K, pix_fmt->plane_fmt[0].sizeimage);
-+
-+	pix_fmt->pixelformat = V4L2_PIX_FMT_HEVC_SLICE;
-+	pix_fmt->width = w;
-+	pix_fmt->height = h;
-+	pix_fmt->num_planes = 1;
-+	pix_fmt->field = V4L2_FIELD_NONE;
-+	/* Zero bytes per line for encoded source. */
-+	pix_fmt->plane_fmt[0].bytesperline = 0;
-+	pix_fmt->plane_fmt[0].sizeimage = size;
-+}
-+
-+/* Take any pix_format and make it valid */
-+static void rpivid_prepare_dst_format(struct v4l2_pix_format_mplane *pix_fmt)
-+{
-+	unsigned int width = pix_fmt->width;
-+	unsigned int height = pix_fmt->height;
-+	unsigned int sizeimage = pix_fmt->plane_fmt[0].sizeimage;
-+	unsigned int bytesperline = pix_fmt->plane_fmt[0].bytesperline;
-+
-+	if (!width)
-+		width = RPIVID_DEFAULT_WIDTH;
-+	if (width > RPIVID_MAX_WIDTH)
-+		width = RPIVID_MAX_WIDTH;
-+	if (!height)
-+		height = RPIVID_DEFAULT_HEIGHT;
-+	if (height > RPIVID_MAX_HEIGHT)
-+		height = RPIVID_MAX_HEIGHT;
-+
-+	/* For column formats set bytesperline to column height (stride2) */
-+	switch (pix_fmt->pixelformat) {
-+	default:
-+		pix_fmt->pixelformat = V4L2_PIX_FMT_NV12_COL128;
-+		fallthrough;
-+	case V4L2_PIX_FMT_NV12_COL128:
-+		/* Width rounds up to columns */
-+		width = ALIGN(width, 128);
-+
-+		/* 16 aligned height - not sure we even need that */
-+		height = ALIGN(height, 16);
-+		/* column height
-+		 * Accept suggested shape if at least min & < 2 * min
-+		 */
-+		bytesperline = constrain2x(bytesperline, height * 3 / 2);
-+
-+		/* image size
-+		 * Again allow plausible variation in case added padding is
-+		 * required
-+		 */
-+		sizeimage = constrain2x(sizeimage, bytesperline * width);
-+		break;
-+
-+	case V4L2_PIX_FMT_NV12_10_COL128:
-+		/* width in pixels (3 pels = 4 bytes) rounded to 128 byte
-+		 * columns
-+		 */
-+		width = ALIGN(((width + 2) / 3), 32) * 3;
-+
-+		/* 16-aligned height. */
-+		height = ALIGN(height, 16);
-+
-+		/* column height
-+		 * Accept suggested shape if at least min & < 2 * min
-+		 */
-+		bytesperline = constrain2x(bytesperline, height * 3 / 2);
-+
-+		/* image size
-+		 * Again allow plausible variation in case added padding is
-+		 * required
-+		 */
-+		sizeimage = constrain2x(sizeimage,
-+					bytesperline * width * 4 / 3);
-+		break;
-+	}
-+
-+	pix_fmt->width = width;
-+	pix_fmt->height = height;
-+
-+	pix_fmt->field = V4L2_FIELD_NONE;
-+	pix_fmt->plane_fmt[0].bytesperline = bytesperline;
-+	pix_fmt->plane_fmt[0].sizeimage = sizeimage;
-+	pix_fmt->num_planes = 1;
-+}
-+
-+static int rpivid_querycap(struct file *file, void *priv,
-+			   struct v4l2_capability *cap)
-+{
-+	strscpy(cap->driver, RPIVID_NAME, sizeof(cap->driver));
-+	strscpy(cap->card, RPIVID_NAME, sizeof(cap->card));
-+	snprintf(cap->bus_info, sizeof(cap->bus_info),
-+		 "platform:%s", RPIVID_NAME);
-+
-+	return 0;
-+}
-+
-+static int rpivid_enum_fmt_vid_out(struct file *file, void *priv,
-+				   struct v4l2_fmtdesc *f)
-+{
-+	// Input formats
-+
-+	// H.265 Slice only currently
-+	if (f->index == 0) {
-+		f->pixelformat = V4L2_PIX_FMT_HEVC_SLICE;
-+		return 0;
-+	}
-+
-+	return -EINVAL;
-+}
-+
-+static int rpivid_hevc_validate_sps(const struct v4l2_ctrl_hevc_sps * const sps)
-+{
-+	const unsigned int ctb_log2_size_y =
-+			sps->log2_min_luma_coding_block_size_minus3 + 3 +
-+			sps->log2_diff_max_min_luma_coding_block_size;
-+	const unsigned int min_tb_log2_size_y =
-+			sps->log2_min_luma_transform_block_size_minus2 + 2;
-+	const unsigned int max_tb_log2_size_y = min_tb_log2_size_y +
-+			sps->log2_diff_max_min_luma_transform_block_size;
-+
-+	/* Local limitations */
-+	if (sps->pic_width_in_luma_samples < 32 ||
-+	    sps->pic_width_in_luma_samples > 4096)
-+		return 0;
-+	if (sps->pic_height_in_luma_samples < 32 ||
-+	    sps->pic_height_in_luma_samples > 4096)
-+		return 0;
-+	if (!(sps->bit_depth_luma_minus8 == 0 ||
-+	      sps->bit_depth_luma_minus8 == 2))
-+		return 0;
-+	if (sps->bit_depth_luma_minus8 != sps->bit_depth_chroma_minus8)
-+		return 0;
-+	if (sps->chroma_format_idc != 1)
-+		return 0;
-+
-+	/*  Limits from H.265 7.4.3.2.1 */
-+	if (sps->log2_max_pic_order_cnt_lsb_minus4 > 12)
-+		return 0;
-+	if (sps->sps_max_dec_pic_buffering_minus1 > 15)
-+		return 0;
-+	if (sps->sps_max_num_reorder_pics >
-+				sps->sps_max_dec_pic_buffering_minus1)
-+		return 0;
-+	if (ctb_log2_size_y > 6)
-+		return 0;
-+	if (max_tb_log2_size_y > 5)
-+		return 0;
-+	if (max_tb_log2_size_y > ctb_log2_size_y)
-+		return 0;
-+	if (sps->max_transform_hierarchy_depth_inter >
-+				(ctb_log2_size_y - min_tb_log2_size_y))
-+		return 0;
-+	if (sps->max_transform_hierarchy_depth_intra >
-+				(ctb_log2_size_y - min_tb_log2_size_y))
-+		return 0;
-+	/* Check pcm stuff */
-+	if (sps->num_short_term_ref_pic_sets > 64)
-+		return 0;
-+	if (sps->num_long_term_ref_pics_sps > 32)
-+		return 0;
-+	return 1;
-+}
-+
-+static inline int is_sps_set(const struct v4l2_ctrl_hevc_sps * const sps)
-+{
-+	return sps && sps->pic_width_in_luma_samples != 0;
-+}
-+
-+static u32 pixelformat_from_sps(const struct v4l2_ctrl_hevc_sps * const sps,
-+				const int index)
-+{
-+	u32 pf = 0;
-+
-+	if (!is_sps_set(sps) || !rpivid_hevc_validate_sps(sps)) {
-+		/* Treat this as an error? For now return both */
-+		if (index == 0)
-+			pf = V4L2_PIX_FMT_NV12_COL128;
-+		else if (index == 1)
-+			pf = V4L2_PIX_FMT_NV12_10_COL128;
-+	} else if (index == 0) {
-+		if (sps->bit_depth_luma_minus8 == 0)
-+			pf = V4L2_PIX_FMT_NV12_COL128;
-+		else if (sps->bit_depth_luma_minus8 == 2)
-+			pf = V4L2_PIX_FMT_NV12_10_COL128;
-+	}
-+
-+	return pf;
-+}
-+
-+static struct v4l2_pix_format_mplane
-+rpivid_hevc_default_dst_fmt(struct rpivid_ctx * const ctx)
-+{
-+	const struct v4l2_ctrl_hevc_sps * const sps =
-+		rpivid_find_control_data(ctx, V4L2_CID_STATELESS_HEVC_SPS);
-+	struct v4l2_pix_format_mplane pix_fmt;
-+
-+	memset(&pix_fmt, 0, sizeof(pix_fmt));
-+	if (is_sps_set(sps)) {
-+		pix_fmt.width = sps->pic_width_in_luma_samples;
-+		pix_fmt.height = sps->pic_height_in_luma_samples;
-+		pix_fmt.pixelformat = pixelformat_from_sps(sps, 0);
-+	}
-+
-+	rpivid_prepare_dst_format(&pix_fmt);
-+	return pix_fmt;
-+}
-+
-+static u32 rpivid_hevc_get_dst_pixelformat(struct rpivid_ctx * const ctx,
-+					   const int index)
-+{
-+	const struct v4l2_ctrl_hevc_sps * const sps =
-+		rpivid_find_control_data(ctx, V4L2_CID_STATELESS_HEVC_SPS);
-+
-+	return pixelformat_from_sps(sps, index);
-+}
-+
-+static int rpivid_enum_fmt_vid_cap(struct file *file, void *priv,
-+				   struct v4l2_fmtdesc *f)
-+{
-+	struct rpivid_ctx * const ctx = rpivid_file2ctx(file);
-+
-+	const u32 pf = rpivid_hevc_get_dst_pixelformat(ctx, f->index);
-+
-+	if (pf == 0)
-+		return -EINVAL;
-+
-+	f->pixelformat = pf;
-+	return 0;
-+}
-+
-+/*
-+ * get dst format - sets it to default if otherwise unset
-+ * returns a pointer to the struct as a convienience
-+ */
-+static struct v4l2_pix_format_mplane *get_dst_fmt(struct rpivid_ctx *const ctx)
-+{
-+	if (!ctx->dst_fmt_set)
-+		ctx->dst_fmt = rpivid_hevc_default_dst_fmt(ctx);
-+	return &ctx->dst_fmt;
-+}
-+
-+static int rpivid_g_fmt_vid_cap(struct file *file, void *priv,
-+				struct v4l2_format *f)
-+{
-+	struct rpivid_ctx *ctx = rpivid_file2ctx(file);
-+
-+	f->fmt.pix_mp = *get_dst_fmt(ctx);
-+	return 0;
-+}
-+
-+static int rpivid_g_fmt_vid_out(struct file *file, void *priv,
-+				struct v4l2_format *f)
-+{
-+	struct rpivid_ctx *ctx = rpivid_file2ctx(file);
-+
-+	f->fmt.pix_mp = ctx->src_fmt;
-+	return 0;
-+}
-+
-+static inline void copy_color(struct v4l2_pix_format_mplane *d,
-+			      const struct v4l2_pix_format_mplane *s)
-+{
-+	d->colorspace   = s->colorspace;
-+	d->xfer_func    = s->xfer_func;
-+	d->ycbcr_enc    = s->ycbcr_enc;
-+	d->quantization = s->quantization;
-+}
-+
-+static int rpivid_try_fmt_vid_cap(struct file *file, void *priv,
-+				  struct v4l2_format *f)
-+{
-+	struct rpivid_ctx *ctx = rpivid_file2ctx(file);
-+	const struct v4l2_ctrl_hevc_sps * const sps =
-+		rpivid_find_control_data(ctx, V4L2_CID_STATELESS_HEVC_SPS);
-+	u32 pixelformat;
-+	int i;
-+
-+	for (i = 0; (pixelformat = pixelformat_from_sps(sps, i)) != 0; i++) {
-+		if (f->fmt.pix_mp.pixelformat == pixelformat)
-+			break;
-+	}
-+
-+	// We don't have any way of finding out colourspace so believe
-+	// anything we are told - take anything set in src as a default
-+	if (f->fmt.pix_mp.colorspace == V4L2_COLORSPACE_DEFAULT)
-+		copy_color(&f->fmt.pix_mp, &ctx->src_fmt);
-+
-+	f->fmt.pix_mp.pixelformat = pixelformat;
-+	rpivid_prepare_dst_format(&f->fmt.pix_mp);
-+	return 0;
-+}
-+
-+static int rpivid_try_fmt_vid_out(struct file *file, void *priv,
-+				  struct v4l2_format *f)
-+{
-+	rpivid_prepare_src_format(&f->fmt.pix_mp);
-+	return 0;
-+}
-+
-+static int rpivid_s_fmt_vid_cap(struct file *file, void *priv,
-+				struct v4l2_format *f)
-+{
-+	struct rpivid_ctx *ctx = rpivid_file2ctx(file);
-+	struct vb2_queue *vq;
-+	int ret;
-+
-+	vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type);
-+	if (vb2_is_busy(vq))
-+		return -EBUSY;
-+
-+	ret = rpivid_try_fmt_vid_cap(file, priv, f);
-+	if (ret)
-+		return ret;
-+
-+	ctx->dst_fmt = f->fmt.pix_mp;
-+	ctx->dst_fmt_set = 1;
-+
-+	return 0;
-+}
-+
-+static int rpivid_s_fmt_vid_out(struct file *file, void *priv,
-+				struct v4l2_format *f)
-+{
-+	struct rpivid_ctx *ctx = rpivid_file2ctx(file);
-+	struct vb2_queue *vq;
-+	int ret;
-+
-+	vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type);
-+	if (vb2_is_busy(vq))
-+		return -EBUSY;
-+
-+	ret = rpivid_try_fmt_vid_out(file, priv, f);
-+	if (ret)
-+		return ret;
-+
-+	ctx->src_fmt = f->fmt.pix_mp;
-+	ctx->dst_fmt_set = 0;  // Setting src invalidates dst
-+
-+	vq->subsystem_flags |=
-+		VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF;
-+
-+	/* Propagate colorspace information to capture. */
-+	copy_color(&ctx->dst_fmt, &f->fmt.pix_mp);
-+	return 0;
-+}
-+
-+const struct v4l2_ioctl_ops rpivid_ioctl_ops = {
-+	.vidioc_querycap		= rpivid_querycap,
-+
-+	.vidioc_enum_fmt_vid_cap	= rpivid_enum_fmt_vid_cap,
-+	.vidioc_g_fmt_vid_cap_mplane	= rpivid_g_fmt_vid_cap,
-+	.vidioc_try_fmt_vid_cap_mplane	= rpivid_try_fmt_vid_cap,
-+	.vidioc_s_fmt_vid_cap_mplane	= rpivid_s_fmt_vid_cap,
-+
-+	.vidioc_enum_fmt_vid_out	= rpivid_enum_fmt_vid_out,
-+	.vidioc_g_fmt_vid_out_mplane	= rpivid_g_fmt_vid_out,
-+	.vidioc_try_fmt_vid_out_mplane	= rpivid_try_fmt_vid_out,
-+	.vidioc_s_fmt_vid_out_mplane	= rpivid_s_fmt_vid_out,
-+
-+	.vidioc_reqbufs			= v4l2_m2m_ioctl_reqbufs,
-+	.vidioc_querybuf		= v4l2_m2m_ioctl_querybuf,
-+	.vidioc_qbuf			= v4l2_m2m_ioctl_qbuf,
-+	.vidioc_dqbuf			= v4l2_m2m_ioctl_dqbuf,
-+	.vidioc_prepare_buf		= v4l2_m2m_ioctl_prepare_buf,
-+	.vidioc_create_bufs		= v4l2_m2m_ioctl_create_bufs,
-+	.vidioc_expbuf			= v4l2_m2m_ioctl_expbuf,
-+
-+	.vidioc_streamon		= v4l2_m2m_ioctl_streamon,
-+	.vidioc_streamoff		= v4l2_m2m_ioctl_streamoff,
-+
-+	.vidioc_try_decoder_cmd		= v4l2_m2m_ioctl_stateless_try_decoder_cmd,
-+	.vidioc_decoder_cmd		= v4l2_m2m_ioctl_stateless_decoder_cmd,
-+
-+	.vidioc_subscribe_event		= v4l2_ctrl_subscribe_event,
-+	.vidioc_unsubscribe_event	= v4l2_event_unsubscribe,
-+};
-+
-+static int rpivid_queue_setup(struct vb2_queue *vq, unsigned int *nbufs,
-+			      unsigned int *nplanes, unsigned int sizes[],
-+			      struct device *alloc_devs[])
-+{
-+	struct rpivid_ctx *ctx = vb2_get_drv_priv(vq);
-+	struct v4l2_pix_format_mplane *pix_fmt;
-+
-+	if (V4L2_TYPE_IS_OUTPUT(vq->type))
-+		pix_fmt = &ctx->src_fmt;
-+	else
-+		pix_fmt = get_dst_fmt(ctx);
-+
-+	if (*nplanes) {
-+		if (sizes[0] < pix_fmt->plane_fmt[0].sizeimage)
-+			return -EINVAL;
-+	} else {
-+		sizes[0] = pix_fmt->plane_fmt[0].sizeimage;
-+		*nplanes = 1;
-+	}
-+
-+	return 0;
-+}
-+
-+static void rpivid_queue_cleanup(struct vb2_queue *vq, u32 state)
-+{
-+	struct rpivid_ctx *ctx = vb2_get_drv_priv(vq);
-+	struct vb2_v4l2_buffer *vbuf;
-+
-+	for (;;) {
-+		if (V4L2_TYPE_IS_OUTPUT(vq->type))
-+			vbuf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
-+		else
-+			vbuf = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
-+
-+		if (!vbuf)
-+			return;
-+
-+		v4l2_ctrl_request_complete(vbuf->vb2_buf.req_obj.req,
-+					   &ctx->hdl);
-+		v4l2_m2m_buf_done(vbuf, state);
-+	}
-+}
-+
-+static int rpivid_buf_out_validate(struct vb2_buffer *vb)
-+{
-+	struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
-+
-+	vbuf->field = V4L2_FIELD_NONE;
-+	return 0;
-+}
-+
-+static int rpivid_buf_prepare(struct vb2_buffer *vb)
-+{
-+	struct vb2_queue *vq = vb->vb2_queue;
-+	struct rpivid_ctx *ctx = vb2_get_drv_priv(vq);
-+	struct v4l2_pix_format_mplane *pix_fmt;
-+
-+	if (V4L2_TYPE_IS_OUTPUT(vq->type))
-+		pix_fmt = &ctx->src_fmt;
-+	else
-+		pix_fmt = &ctx->dst_fmt;
-+
-+	if (vb2_plane_size(vb, 0) < pix_fmt->plane_fmt[0].sizeimage)
-+		return -EINVAL;
-+
-+	vb2_set_plane_payload(vb, 0, pix_fmt->plane_fmt[0].sizeimage);
-+
-+	return 0;
-+}
-+
-+/* Only stops the clock if streaom off on both output & capture */
-+static void stop_clock(struct rpivid_dev *dev, struct rpivid_ctx *ctx)
-+{
-+	if (ctx->src_stream_on ||
-+	    ctx->dst_stream_on)
-+		return;
-+
-+	clk_set_min_rate(dev->clock, 0);
-+	clk_disable_unprepare(dev->clock);
-+}
-+
-+/* Always starts the clock if it isn't already on this ctx */
-+static int start_clock(struct rpivid_dev *dev, struct rpivid_ctx *ctx)
-+{
-+	int rv;
-+
-+	rv = clk_set_min_rate(dev->clock, dev->max_clock_rate);
-+	if (rv) {
-+		dev_err(dev->dev, "Failed to set clock rate\n");
-+		return rv;
-+	}
-+
-+	rv = clk_prepare_enable(dev->clock);
-+	if (rv) {
-+		dev_err(dev->dev, "Failed to enable clock\n");
-+		return rv;
-+	}
-+
-+	return 0;
-+}
-+
-+static int rpivid_start_streaming(struct vb2_queue *vq, unsigned int count)
-+{
-+	struct rpivid_ctx *ctx = vb2_get_drv_priv(vq);
-+	struct rpivid_dev *dev = ctx->dev;
-+	int ret = 0;
-+
-+	if (!V4L2_TYPE_IS_OUTPUT(vq->type)) {
-+		ctx->dst_stream_on = 1;
-+		goto ok;
-+	}
-+
-+	if (ctx->src_fmt.pixelformat != V4L2_PIX_FMT_HEVC_SLICE) {
-+		ret = -EINVAL;
-+		goto fail_cleanup;
-+	}
-+
-+	if (ctx->src_stream_on)
-+		goto ok;
-+
-+	ret = start_clock(dev, ctx);
-+	if (ret)
-+		goto fail_cleanup;
-+
-+	if (dev->dec_ops->start)
-+		ret = dev->dec_ops->start(ctx);
-+	if (ret)
-+		goto fail_stop_clock;
-+
-+	ctx->src_stream_on = 1;
-+ok:
-+	return 0;
-+
-+fail_stop_clock:
-+	stop_clock(dev, ctx);
-+fail_cleanup:
-+	v4l2_err(&dev->v4l2_dev, "%s: qtype=%d: FAIL\n", __func__, vq->type);
-+	rpivid_queue_cleanup(vq, VB2_BUF_STATE_QUEUED);
-+	return ret;
-+}
-+
-+static void rpivid_stop_streaming(struct vb2_queue *vq)
-+{
-+	struct rpivid_ctx *ctx = vb2_get_drv_priv(vq);
-+	struct rpivid_dev *dev = ctx->dev;
-+
-+	if (V4L2_TYPE_IS_OUTPUT(vq->type)) {
-+		ctx->src_stream_on = 0;
-+		if (dev->dec_ops->stop)
-+			dev->dec_ops->stop(ctx);
-+	} else {
-+		ctx->dst_stream_on = 0;
-+	}
-+
-+	rpivid_queue_cleanup(vq, VB2_BUF_STATE_ERROR);
-+
-+	vb2_wait_for_all_buffers(vq);
-+
-+	stop_clock(dev, ctx);
-+}
-+
-+static void rpivid_buf_queue(struct vb2_buffer *vb)
-+{
-+	struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
-+	struct rpivid_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
-+
-+	v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vbuf);
-+}
-+
-+static void rpivid_buf_request_complete(struct vb2_buffer *vb)
-+{
-+	struct rpivid_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
-+
-+	v4l2_ctrl_request_complete(vb->req_obj.req, &ctx->hdl);
-+}
-+
-+static struct vb2_ops rpivid_qops = {
-+	.queue_setup		= rpivid_queue_setup,
-+	.buf_prepare		= rpivid_buf_prepare,
-+	.buf_queue		= rpivid_buf_queue,
-+	.buf_out_validate	= rpivid_buf_out_validate,
-+	.buf_request_complete	= rpivid_buf_request_complete,
-+	.start_streaming	= rpivid_start_streaming,
-+	.stop_streaming		= rpivid_stop_streaming,
-+	.wait_prepare		= vb2_ops_wait_prepare,
-+	.wait_finish		= vb2_ops_wait_finish,
-+};
-+
-+int rpivid_queue_init(void *priv, struct vb2_queue *src_vq,
-+		      struct vb2_queue *dst_vq)
-+{
-+	struct rpivid_ctx *ctx = priv;
-+	int ret;
-+
-+	src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
-+	src_vq->io_modes = VB2_MMAP | VB2_DMABUF;
-+	src_vq->drv_priv = ctx;
-+	src_vq->buf_struct_size = sizeof(struct rpivid_buffer);
-+	src_vq->ops = &rpivid_qops;
-+	src_vq->mem_ops = &vb2_dma_contig_memops;
-+	src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
-+	src_vq->lock = &ctx->ctx_mutex;
-+	src_vq->dev = ctx->dev->dev;
-+	src_vq->supports_requests = true;
-+	src_vq->requires_requests = true;
-+
-+	ret = vb2_queue_init(src_vq);
-+	if (ret)
-+		return ret;
-+
-+	dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
-+	dst_vq->io_modes = VB2_MMAP | VB2_DMABUF;
-+	dst_vq->drv_priv = ctx;
-+	dst_vq->buf_struct_size = sizeof(struct rpivid_buffer);
-+	dst_vq->min_buffers_needed = 1;
-+	dst_vq->ops = &rpivid_qops;
-+	dst_vq->mem_ops = &vb2_dma_contig_memops;
-+	dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
-+	dst_vq->lock = &ctx->ctx_mutex;
-+	dst_vq->dev = ctx->dev->dev;
-+
-+	return vb2_queue_init(dst_vq);
-+}
---- /dev/null
-+++ b/drivers/staging/media/rpivid/rpivid_video.h
-@@ -0,0 +1,33 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * Raspberry Pi HEVC driver
-+ *
-+ * Copyright (C) 2020 Raspberry Pi (Trading) Ltd
-+ *
-+ * Based on the Cedrus VPU driver, that is:
-+ *
-+ * Copyright (C) 2016 Florent Revest <florent.revest@free-electrons.com>
-+ * Copyright (C) 2018 Paul Kocialkowski <paul.kocialkowski@bootlin.com>
-+ * Copyright (C) 2018 Bootlin
-+ */
-+
-+#ifndef _RPIVID_VIDEO_H_
-+#define _RPIVID_VIDEO_H_
-+
-+struct rpivid_format {
-+	u32		pixelformat;
-+	u32		directions;
-+	unsigned int	capabilities;
-+};
-+
-+extern const struct v4l2_ioctl_ops rpivid_ioctl_ops;
-+
-+int rpivid_queue_init(void *priv, struct vb2_queue *src_vq,
-+		      struct vb2_queue *dst_vq);
-+
-+size_t rpivid_bit_buf_size(unsigned int w, unsigned int h, unsigned int bits_minus8);
-+size_t rpivid_round_up_size(const size_t x);
-+
-+void rpivid_prepare_src_format(struct v4l2_pix_format_mplane *pix_fmt);
-+
-+#endif
diff --git a/target/linux/bcm27xx/patches-6.1/950-0227-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch b/target/linux/bcm27xx/patches-6.1/950-0227-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch
deleted file mode 100644
index 19573eda1b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0227-spi-Force-CS_HIGH-if-GPIO-descriptors-are-used.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 51a164a0654895d930acb4e3bd096f7bf54c058b Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Fri, 17 Apr 2020 10:46:19 +0100
-Subject: [PATCH] spi: Force CS_HIGH if GPIO descriptors are used
-
-Commit f3186dd87669 ("spi: Optionally use GPIO descriptors for CS GPIOs")
-amended of_spi_parse_dt() to always set SPI_CS_HIGH for SPI slaves whose
-Chip Select is defined by a "cs-gpios" devicetree property.
-
-This change breaks drivers whose probe functions set the mode field of
-the spi_device because in doing so they clear the SPI_CS_HIGH flag.
-
-Fix by setting SPI_CS_HIGH in spi_setup (under the same conditions as
-in of_spi_parse_dt()).
-
-See also: 83b2a8fe43bd ("spi: spidev: Fix CS polarity if GPIO descriptors are used")
-
-Fixes: f3186dd87669 ("spi: Optionally use GPIO descriptors for CS GPIOs")
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-SQUASH: spi: Demote SPI_CS_HIGH warning to KERN_DEBUG
-
-This warning is unavoidable from a client's perspective and
-doesn't indicate anything wrong (just surprising).
-
-SQUASH with "spi: use_gpio_descriptor fixup moved to spi_setup"
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/spi/spi.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
---- a/drivers/spi/spi.c
-+++ b/drivers/spi/spi.c
-@@ -3694,6 +3694,7 @@ static int spi_set_cs_timing(struct spi_
-  */
- int spi_setup(struct spi_device *spi)
- {
-+	struct spi_controller *ctlr = spi->controller;
- 	unsigned	bad_bits, ugly_bits;
- 	int		status = 0;
- 
-@@ -3714,6 +3715,14 @@ int spi_setup(struct spi_device *spi)
- 		(SPI_TX_DUAL | SPI_TX_QUAD | SPI_TX_OCTAL |
- 		 SPI_RX_DUAL | SPI_RX_QUAD | SPI_RX_OCTAL)))
- 		return -EINVAL;
-+
-+	if (ctlr->use_gpio_descriptors && ctlr->cs_gpiods &&
-+	    ctlr->cs_gpiods[spi->chip_select] && !(spi->mode & SPI_CS_HIGH)) {
-+		dev_dbg(&spi->dev,
-+			"setup: forcing CS_HIGH (use_gpio_descriptors)\n");
-+		spi->mode |= SPI_CS_HIGH;
-+	}
-+
- 	/*
- 	 * Help drivers fail *cleanly* when they need options
- 	 * that aren't supported with their current controller.
diff --git a/target/linux/bcm27xx/patches-6.1/950-0228-media-uapi-v4l2-core-Add-sensor-ancillary-data-V4L2-.patch b/target/linux/bcm27xx/patches-6.1/950-0228-media-uapi-v4l2-core-Add-sensor-ancillary-data-V4L2-.patch
deleted file mode 100644
index 7f4a38df07..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0228-media-uapi-v4l2-core-Add-sensor-ancillary-data-V4L2-.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 7e4d1176634203cb31b6e4eb449a1b18729dc5a9 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Wed, 1 Apr 2020 08:46:29 +0100
-Subject: [PATCH] media: uapi: v4l2-core: Add sensor ancillary data
- V4L2 foucc type.
-
-Add V4L2_META_FMT_SENSOR_DATA format 4CC.
-
-This new format will be used by the BCM2835 Unicam device to return
-out camera sensor embedded data.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- .../userspace-api/media/v4l/meta-formats.rst  |  1 +
- .../media/v4l/pixfmt-meta-sensor-data.rst     | 32 +++++++++++++++++++
- drivers/media/v4l2-core/v4l2-ioctl.c          |  1 +
- include/uapi/linux/videodev2.h                |  1 +
- 4 files changed, 35 insertions(+)
- create mode 100644 Documentation/userspace-api/media/v4l/pixfmt-meta-sensor-data.rst
-
---- a/Documentation/userspace-api/media/v4l/meta-formats.rst
-+++ b/Documentation/userspace-api/media/v4l/meta-formats.rst
-@@ -15,6 +15,7 @@ These formats are used for the :ref:`met
-     pixfmt-meta-d4xx
-     pixfmt-meta-intel-ipu3
-     pixfmt-meta-rkisp1
-+    pixfmt-meta-sensor-data
-     pixfmt-meta-uvc
-     pixfmt-meta-vsp1-hgo
-     pixfmt-meta-vsp1-hgt
---- /dev/null
-+++ b/Documentation/userspace-api/media/v4l/pixfmt-meta-sensor-data.rst
-@@ -0,0 +1,32 @@
-+.. Permission is granted to copy, distribute and/or modify this
-+.. document under the terms of the GNU Free Documentation License,
-+.. Version 1.1 or any later version published by the Free Software
-+.. Foundation, with no Invariant Sections, no Front-Cover Texts
-+.. and no Back-Cover Texts. A copy of the license is included at
-+.. Documentation/media/uapi/fdl-appendix.rst.
-+..
-+.. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
-+
-+.. _v4l2-meta-fmt-sensor-data:
-+
-+***********************************
-+V4L2_META_FMT_SENSOR_DATA  ('SENS')
-+***********************************
-+
-+Sensor Ancillary Metadata
-+
-+Description
-+===========
-+
-+This format describes ancillary data generated by a camera sensor and
-+transmitted over a stream on the camera bus. Sensor vendors generally have their
-+own custom format for this ancillary data. Some vendors follow a generic
-+CSI-2/SMIA embedded data format as described in the `CSI-2 specification.
-+<https://mipi.org/specifications/csi-2>`_
-+
-+The size of the embedded buffer is defined as a single line with a pixel width
-+width specified in bytes. This is obtained by a call to the
-+:c:type:`VIDIOC_SUBDEV_G_FMT` ioctl on the sensor subdevice where the ``pad``
-+field in :c:type:`v4l2_subdev_format` is set to 1.  Note that this size is fixed
-+and cannot be modified with a call to :c:type:`VIDIOC_SUBDEV_S_FMT`.
-+
---- a/drivers/media/v4l2-core/v4l2-ioctl.c
-+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
-@@ -1448,6 +1448,7 @@ static void v4l_fill_fmtdesc(struct v4l2
- 	case V4L2_META_FMT_RK_ISP1_STAT_3A:	descr = "Rockchip ISP1 3A Statistics"; break;
- 	case V4L2_PIX_FMT_NV12M_8L128:	descr = "NV12M (8x128 Linear)"; break;
- 	case V4L2_PIX_FMT_NV12M_10BE_8L128:	descr = "10-bit NV12M (8x128 Linear, BE)"; break;
-+	case V4L2_META_FMT_SENSOR_DATA:	descr = "Sensor Ancillary Metadata"; break;
- 
- 	default:
- 		/* Compressed formats */
---- a/include/uapi/linux/videodev2.h
-+++ b/include/uapi/linux/videodev2.h
-@@ -813,6 +813,7 @@ struct v4l2_pix_format {
- #define V4L2_META_FMT_UVC         v4l2_fourcc('U', 'V', 'C', 'H') /* UVC Payload Header metadata */
- #define V4L2_META_FMT_D4XX        v4l2_fourcc('D', '4', 'X', 'X') /* D4XX Payload Header metadata */
- #define V4L2_META_FMT_VIVID	  v4l2_fourcc('V', 'I', 'V', 'D') /* Vivid Metadata */
-+#define V4L2_META_FMT_SENSOR_DATA v4l2_fourcc('S', 'E', 'N', 'S') /* Sensor Ancillary metadata */
- 
- /* Vendor specific - used for RK_ISP1 camera sub-system */
- #define V4L2_META_FMT_RK_ISP1_PARAMS	v4l2_fourcc('R', 'K', '1', 'P') /* Rockchip ISP1 3A Parameters */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0229-media-uapi-Add-MEDIA_BUS_FMT_SENSOR_DATA-media-bus-f.patch b/target/linux/bcm27xx/patches-6.1/950-0229-media-uapi-Add-MEDIA_BUS_FMT_SENSOR_DATA-media-bus-f.patch
deleted file mode 100644
index 048aa195c8..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0229-media-uapi-Add-MEDIA_BUS_FMT_SENSOR_DATA-media-bus-f.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From defe535a8dd73134a798afd968195af3a0533b0d Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Tue, 21 Jan 2020 14:06:47 +0000
-Subject: [PATCH] media: uapi: Add MEDIA_BUS_FMT_SENSOR_DATA media bus
- format
-
-This patch adds MEDIA_BUS_FMT_SENSOR_DATA used by the bcm2835-unicam
-driver to support CSI-2 embedded data streams from camera sensors.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- .../media/v4l/subdev-formats.rst              | 32 +++++++++++++++++++
- include/uapi/linux/media-bus-format.h         |  3 ++
- 2 files changed, 35 insertions(+)
-
---- a/Documentation/userspace-api/media/v4l/subdev-formats.rst
-+++ b/Documentation/userspace-api/media/v4l/subdev-formats.rst
-@@ -8086,3 +8086,35 @@ The following table lists the existing m
- 	both sides of the link and the bus format is a fixed
- 	metadata format that is not configurable from userspace.
- 	Width and height will be set to 0 for this format.
-+
-+
-+.. _v4l2-mbus-sensor-data:
-+
-+Sensor Ancillary Metadata Formats
-+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-+
-+This section lists ancillary data generated by a camera sensor and
-+transmitted over a stream on the camera bus.
-+
-+The following table lists the existing sensor ancillary metadata formats:
-+
-+
-+.. _v4l2-mbus-pixelcode-sensor-metadata:
-+
-+.. tabularcolumns:: |p{8.0cm}|p{1.4cm}|p{7.7cm}|
-+
-+.. flat-table:: Sensor ancillary metadata formats
-+    :header-rows:  1
-+    :stub-columns: 0
-+
-+    * - Identifier
-+      - Code
-+      - Comments
-+    * .. _MEDIA_BUS_FMT_SENSOR_DATA:
-+
-+      - MEDIA_BUS_FMT_SENSOR_DATA
-+      - 0x7001
-+      - Sensor vendor specific ancillary metadata. Some vendors follow a generic
-+        CSI-2/SMIA embedded data format as described in the `CSI-2 specification.
-+	<https://mipi.org/specifications/csi-2>`_
-+
---- a/include/uapi/linux/media-bus-format.h
-+++ b/include/uapi/linux/media-bus-format.h
-@@ -172,4 +172,7 @@
-  */
- #define MEDIA_BUS_FMT_METADATA_FIXED		0x7001
- 
-+/* Sensor ancillary metadata formats - next is 0x7002 */
-+#define MEDIA_BUS_FMT_SENSOR_DATA		0x7002
-+
- #endif /* __LINUX_MEDIA_BUS_FORMAT_H */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0230-media-uapi-v4l2-core-Add-ISP-statistics-output-V4L2-.patch b/target/linux/bcm27xx/patches-6.1/950-0230-media-uapi-v4l2-core-Add-ISP-statistics-output-V4L2-.patch
deleted file mode 100644
index 818cc35cc3..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0230-media-uapi-v4l2-core-Add-ISP-statistics-output-V4L2-.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 635b5f7fbe0ac9e5a93cadd23b88b36ac1e79f91 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Thu, 23 Apr 2020 10:20:26 +0100
-Subject: [PATCH] media: uapi: v4l2-core: Add ISP statistics output
- V4L2 fourcc type
-
-Add V4L2_META_FMT_BCM2835_ISP_STATS V4L2 format type.
-
-This new format will be used by the BCM2835 ISP device to return
-out ISP statistics for 3A.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- .../userspace-api/media/v4l/meta-formats.rst  |  1 +
- .../v4l/pixfmt-meta-bcm2835-isp-stats.rst     | 41 +++++++++++++++++++
- drivers/media/v4l2-core/v4l2-ioctl.c          |  1 +
- include/uapi/linux/videodev2.h                |  1 +
- 4 files changed, 44 insertions(+)
- create mode 100644 Documentation/userspace-api/media/v4l/pixfmt-meta-bcm2835-isp-stats.rst
-
---- a/Documentation/userspace-api/media/v4l/meta-formats.rst
-+++ b/Documentation/userspace-api/media/v4l/meta-formats.rst
-@@ -12,6 +12,7 @@ These formats are used for the :ref:`met
- .. toctree::
-     :maxdepth: 1
- 
-+    pixfmt-meta-bcm2835-isp-stats
-     pixfmt-meta-d4xx
-     pixfmt-meta-intel-ipu3
-     pixfmt-meta-rkisp1
---- /dev/null
-+++ b/Documentation/userspace-api/media/v4l/pixfmt-meta-bcm2835-isp-stats.rst
-@@ -0,0 +1,41 @@
-+.. Permission is granted to copy, distribute and/or modify this
-+.. document under the terms of the GNU Free Documentation License,
-+.. Version 1.1 or any later version published by the Free Software
-+.. Foundation, with no Invariant Sections, no Front-Cover Texts
-+.. and no Back-Cover Texts. A copy of the license is included at
-+.. Documentation/media/uapi/fdl-appendix.rst.
-+..
-+.. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
-+
-+.. _v4l2-meta-fmt-bcm2835-isp-stats:
-+
-+*****************************************
-+V4L2_META_FMT_BCM2835_ISP_STATS  ('BSTA')
-+*****************************************
-+
-+BCM2835 ISP Statistics
-+
-+Description
-+===========
-+
-+The BCM2835 ISP hardware calculate image statistics for an input Bayer frame.
-+These statistics are obtained from the "bcm2835-isp0-capture3" device node
-+using the :c:type:`v4l2_meta_format` interface. They are formatted as described
-+by the :c:type:`bcm2835_isp_stats` structure below.
-+
-+.. code-block:: c
-+
-+	#define DEFAULT_AWB_REGIONS_X 16
-+	#define DEFAULT_AWB_REGIONS_Y 12
-+
-+	#define NUM_HISTOGRAMS 2
-+	#define NUM_HISTOGRAM_BINS 128
-+	#define AWB_REGIONS (DEFAULT_AWB_REGIONS_X * DEFAULT_AWB_REGIONS_Y)
-+	#define FLOATING_REGIONS 16
-+	#define AGC_REGIONS 16
-+	#define FOCUS_REGIONS 12
-+
-+.. kernel-doc:: include/uapi/linux/bcm2835-isp.h
-+   :functions: bcm2835_isp_stats_hist bcm2835_isp_stats_region
-+	             bcm2835_isp_stats_focus bcm2835_isp_stats
-+
---- a/drivers/media/v4l2-core/v4l2-ioctl.c
-+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
-@@ -1449,6 +1449,7 @@ static void v4l_fill_fmtdesc(struct v4l2
- 	case V4L2_PIX_FMT_NV12M_8L128:	descr = "NV12M (8x128 Linear)"; break;
- 	case V4L2_PIX_FMT_NV12M_10BE_8L128:	descr = "10-bit NV12M (8x128 Linear, BE)"; break;
- 	case V4L2_META_FMT_SENSOR_DATA:	descr = "Sensor Ancillary Metadata"; break;
-+	case V4L2_META_FMT_BCM2835_ISP_STATS: descr = "BCM2835 ISP Image Statistics"; break;
- 
- 	default:
- 		/* Compressed formats */
---- a/include/uapi/linux/videodev2.h
-+++ b/include/uapi/linux/videodev2.h
-@@ -814,6 +814,7 @@ struct v4l2_pix_format {
- #define V4L2_META_FMT_D4XX        v4l2_fourcc('D', '4', 'X', 'X') /* D4XX Payload Header metadata */
- #define V4L2_META_FMT_VIVID	  v4l2_fourcc('V', 'I', 'V', 'D') /* Vivid Metadata */
- #define V4L2_META_FMT_SENSOR_DATA v4l2_fourcc('S', 'E', 'N', 'S') /* Sensor Ancillary metadata */
-+#define V4L2_META_FMT_BCM2835_ISP_STATS v4l2_fourcc('B', 'S', 'T', 'A') /* BCM2835 ISP image statistics output */
- 
- /* Vendor specific - used for RK_ISP1 camera sub-system */
- #define V4L2_META_FMT_RK_ISP1_PARAMS	v4l2_fourcc('R', 'K', '1', 'P') /* Rockchip ISP1 3A Parameters */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0231-media-uapi-v4l-ctrls-Add-CID-base-for-the-bcm2835-is.patch b/target/linux/bcm27xx/patches-6.1/950-0231-media-uapi-v4l-ctrls-Add-CID-base-for-the-bcm2835-is.patch
deleted file mode 100644
index 706d6baf77..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0231-media-uapi-v4l-ctrls-Add-CID-base-for-the-bcm2835-is.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From ec0b51689845e701cb74ab285ae97efd4dcf994a Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Tue, 21 Apr 2020 15:06:19 +0100
-Subject: [PATCH] media: uapi: v4l-ctrls: Add CID base for the
- bcm2835-isp driver
-
-We are reserving controls for the new bcm2835-isp driver.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- .../admin-guide/media/bcm2835-isp.rst         | 127 ++++++++++++++++++
- .../userspace-api/media/drivers/index.rst     |   1 +
- include/uapi/linux/v4l2-controls.h            |   4 +
- 3 files changed, 132 insertions(+)
- create mode 100644 Documentation/admin-guide/media/bcm2835-isp.rst
-
---- /dev/null
-+++ b/Documentation/admin-guide/media/bcm2835-isp.rst
-@@ -0,0 +1,127 @@
-+.. SPDX-License-Identifier: GPL-2.0
-+
-+BCM2835 ISP Driver
-+==================
-+
-+Introduction
-+------------
-+
-+The BCM2835 Image Sensor Pipeline (ISP) is a fixed function hardware pipeline
-+for performing image processing operations.  Images are fed to the input
-+of the ISP through memory frame buffers.  These images may be in various YUV,
-+RGB, or Bayer formats.  A typical use case would have Bayer images obtained from
-+an image sensor by the BCM2835 Unicam peripheral, written to a memory
-+frame buffer, and finally fed into the input of the ISP.  Two concurrent output
-+images may be generated in YUV or RGB format at different resolutions.
-+Statistics output is also generated for Bayer input images.
-+
-+The bcm2835-isp driver exposes the following media pads as V4L2 device nodes:
-+
-+.. tabularcolumns:: |l|l|l|l|
-+
-+.. cssclass: longtable
-+
-+.. flat-table::
-+
-+    * - *Pad*
-+      - *Direction*
-+      - *Purpose*
-+      - *Formats*
-+
-+    * - "bcm2835-isp0-output0"
-+      - sink
-+      - Accepts Bayer, RGB or YUV format frame buffers as input to the ISP HW
-+        pipeline.
-+      - :ref:`RAW8 <V4L2-PIX-FMT-SRGGB8>`,
-+        :ref:`RAW10P <V4L2-PIX-FMT-SRGGB10P>`,
-+        :ref:`RAW12P <V4L2-PIX-FMT-SRGGB12P>`,
-+        :ref:`RAW14P <V4L2-PIX-FMT-SRGGB14P>`,
-+        :ref:`RAW16 <V4L2-PIX-FMT-SRGGB16>`,
-+        :ref:`RGB24/BGR24 <V4L2-PIX-FMT-RGB24>`,
-+        :ref:`YUYV <V4L2-PIX-FMT-YUYV>`,
-+        :ref:`YVYU <V4L2-PIX-FMT-YVYU>`,
-+        :ref:`UYVY <V4L2-PIX-FMT-UYVY>`,
-+        :ref:`VYUY <V4L2-PIX-FMT-VYUY>`,
-+        :ref:`YUV420/YVU420 <V4L2-PIX-FMT-YUV420>`
-+
-+    * - "bcm2835-isp0-capture1"
-+      - source
-+      - High resolution YUV or RGB processed output from the ISP.
-+      - :ref:`RGB565 <V4L2-PIX-FMT-RGB565>`,
-+        :ref:`RGB24/BGR24 <V4L2-PIX-FMT-RGB24>`,
-+        :ref:`ABGR32 <V4L2-PIX-FMT-ABGR32>`,
-+        :ref:`YUYV <V4L2-PIX-FMT-YUYV>`,
-+        :ref:`YVYU <V4L2-PIX-FMT-YVYU>`,
-+        :ref:`UYVY <V4L2-PIX-FMT-UYVY>`,
-+        :ref:`VYUY <V4L2-PIX-FMT-VYUY>`.
-+        :ref:`YUV420/YVU420 <V4L2-PIX-FMT-YUV420>`,
-+        :ref:`NV12/NV21 <V4L2-PIX-FMT-NV12>`,
-+
-+    * - "bcm2835-isp0-capture2"
-+      - source
-+      - Low resolution YUV processed output from the ISP. The output of
-+        this pad cannot have a resolution larger than the "bcm2835-isp0-capture1" pad in any dimension.
-+      - :ref:`YUYV <V4L2-PIX-FMT-YUYV>`,
-+        :ref:`YVYU <V4L2-PIX-FMT-YVYU>`,
-+        :ref:`UYVY <V4L2-PIX-FMT-UYVY>`,
-+        :ref:`VYUY <V4L2-PIX-FMT-VYUY>`.
-+        :ref:`YUV420/YVU420 <V4L2-PIX-FMT-YUV420>`,
-+        :ref:`NV12/NV21 <V4L2-PIX-FMT-NV12>`,
-+
-+    * - "bcm2835-isp0-capture1"
-+      - source
-+      - Image statistics calculated from the input image provided on the
-+        "bcm2835-isp0-output0" pad.  Statistics are only available for Bayer
-+        format input images.
-+      - :ref:`v4l2-meta-fmt-bcm2835-isp-stats`.
-+
-+Pipeline Configuration
-+----------------------
-+
-+The ISP pipeline can be configure through user-space by calling
-+:ref:`VIDIOC_S_EXT_CTRLS <VIDIOC_G_EXT_CTRLS>` on the “bcm2835-isp0-output0”
-+node with the appropriate parameters as shown in the table below.
-+
-+.. tabularcolumns:: |p{2cm}|p{5.0cm}|
-+
-+.. cssclass: longtable
-+
-+.. flat-table::
-+
-+    * - *id*
-+      - *Parameter*
-+
-+    * - ``V4L2_CID_USER_BCM2835_ISP_CC_MATRIX``
-+      - struct :c:type:`bcm2835_isp_custom_ccm`
-+
-+    * - ``V4L2_CID_USER_BCM2835_ISP_LENS_SHADING``
-+      - struct :c:type:`bcm2835_isp_lens_shading`
-+
-+    * - ``V4L2_CID_USER_BCM2835_ISP_BLACK_LEVEL``
-+      - struct :c:type:`bcm2835_isp_black_level`
-+
-+    * - ``V4L2_CID_USER_BCM2835_ISP_GEQ``
-+      - struct :c:type:`bcm2835_isp_geq`
-+
-+    * - ``V4L2_CID_USER_BCM2835_ISP_GAMMA``
-+      - struct :c:type:`bcm2835_isp_gamma`
-+
-+    * - ``V4L2_CID_USER_BCM2835_ISP_DENOISE``
-+      - struct :c:type:`bcm2835_isp_denoise`
-+
-+    * - ``V4L2_CID_USER_BCM2835_ISP_SHARPEN``
-+      - struct :c:type:`bcm2835_isp_sharpen`
-+
-+    * - ``V4L2_CID_USER_BCM2835_ISP_DPC``
-+      - struct :c:type:`bcm2835_isp_dpc`
-+
-+++++++++++++++++++++++++
-+Configuration Parameters
-+++++++++++++++++++++++++
-+
-+.. kernel-doc:: include/uapi/linux/bcm2835-isp.h
-+   :functions: bcm2835_isp_rational bcm2835_isp_ccm bcm2835_isp_custom_ccm
-+                bcm2835_isp_gain_format bcm2835_isp_lens_shading
-+                bcm2835_isp_black_level bcm2835_isp_geq bcm2835_isp_gamma
-+                bcm2835_isp_denoise bcm2835_isp_sharpen
-+                bcm2835_isp_dpc_mode bcm2835_isp_dpc
---- a/Documentation/userspace-api/media/drivers/index.rst
-+++ b/Documentation/userspace-api/media/drivers/index.rst
-@@ -35,6 +35,7 @@ For more details see the file COPYING in
- 	cx2341x-uapi
- 	dw100
- 	imx-uapi
-+	bcm2835-isp
- 	max2175
- 	meye-uapi
- 	omap3isp-uapi
---- a/include/uapi/linux/v4l2-controls.h
-+++ b/include/uapi/linux/v4l2-controls.h
-@@ -231,6 +231,10 @@ enum v4l2_colorfx {
-  */
- #define V4L2_CID_USER_DW100_BASE		(V4L2_CID_USER_BASE + 0x1190)
- 
-+/* The base for the bcm2835-isp driver controls.
-+ * We reserve 16 controls for this driver. */
-+#define V4L2_CID_USER_BCM2835_ISP_BASE		(V4L2_CID_USER_BASE + 0x10f0)
-+
- /* MPEG-class control IDs */
- /* The MPEG controls are applicable to all codec controls
-  * and the 'MPEG' part of the define is historical */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0232-staging-vchiq-Load-bcm2835_isp-driver-from-vchiq.patch b/target/linux/bcm27xx/patches-6.1/950-0232-staging-vchiq-Load-bcm2835_isp-driver-from-vchiq.patch
deleted file mode 100644
index 25f5de4429..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0232-staging-vchiq-Load-bcm2835_isp-driver-from-vchiq.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From b1c396f775e962e9610db24b9942ee0c9136a13d Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Wed, 22 Apr 2020 08:32:32 +0100
-Subject: [PATCH] staging: vchiq: Load bcm2835_isp driver from vchiq
-
-bcmn2835_isp is a platform driver dependent on vchiq,
-therefore add the load/unload functions for it to vchiq.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-@@ -69,6 +69,7 @@ static struct platform_device *bcm2835_c
- static struct platform_device *bcm2835_audio;
- static struct platform_device *bcm2835_codec;
- static struct platform_device *vcsm_cma;
-+static struct platform_device *bcm2835_isp;
- 
- struct vchiq_drvdata {
- 	const unsigned int cache_line_size;
-@@ -1863,6 +1864,7 @@ static int vchiq_probe(struct platform_d
- 	bcm2835_codec = vchiq_register_child(pdev, "bcm2835-codec");
- 	bcm2835_camera = vchiq_register_child(pdev, "bcm2835-camera");
- 	bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio");
-+	bcm2835_isp = vchiq_register_child(pdev, "bcm2835-isp");
- 
- 	return 0;
- 
-@@ -1874,6 +1876,7 @@ error_exit:
- 
- static int vchiq_remove(struct platform_device *pdev)
- {
-+	platform_device_unregister(bcm2835_isp);
- 	platform_device_unregister(bcm2835_audio);
- 	platform_device_unregister(bcm2835_camera);
- 	platform_device_unregister(bcm2835_codec);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0233-bcm2835-dma-Add-proper-40-bit-DMA-support.patch b/target/linux/bcm27xx/patches-6.1/950-0233-bcm2835-dma-Add-proper-40-bit-DMA-support.patch
deleted file mode 100644
index 217b29b1c3..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0233-bcm2835-dma-Add-proper-40-bit-DMA-support.patch
+++ /dev/null
@@ -1,801 +0,0 @@
-From a10f61fab094b4995974496506ee0497af745d57 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Thu, 4 Apr 2019 13:33:47 +0100
-Subject: [PATCH] bcm2835-dma: Add proper 40-bit DMA support
-
-BCM2711 has 4 DMA channels with a 40-bit address range, allowing them
-to access the full 4GB of memory on a Pi 4.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- drivers/dma/bcm2835-dma.c | 485 ++++++++++++++++++++++++++++++++------
- 1 file changed, 412 insertions(+), 73 deletions(-)
-
---- a/drivers/dma/bcm2835-dma.c
-+++ b/drivers/dma/bcm2835-dma.c
-@@ -38,6 +38,11 @@
- #define BCM2835_DMA_MAX_DMA_CHAN_SUPPORTED 14
- #define BCM2835_DMA_CHAN_NAME_SIZE 8
- #define BCM2835_DMA_BULK_MASK  BIT(0)
-+#define BCM2711_DMA_MEMCPY_CHAN 14
-+
-+struct bcm2835_dma_cfg_data {
-+	u32	chan_40bit_mask;
-+};
- 
- /**
-  * struct bcm2835_dmadev - BCM2835 DMA controller
-@@ -50,6 +55,7 @@ struct bcm2835_dmadev {
- 	struct dma_device ddev;
- 	void __iomem *base;
- 	dma_addr_t zero_page;
-+	const struct bcm2835_dma_cfg_data *cfg_data;
- };
- 
- struct bcm2835_dma_cb {
-@@ -62,6 +68,17 @@ struct bcm2835_dma_cb {
- 	uint32_t pad[2];
- };
- 
-+struct bcm2711_dma40_scb {
-+	uint32_t ti;
-+	uint32_t src;
-+	uint32_t srci;
-+	uint32_t dst;
-+	uint32_t dsti;
-+	uint32_t len;
-+	uint32_t next_cb;
-+	uint32_t rsvd;
-+};
-+
- struct bcm2835_cb_entry {
- 	struct bcm2835_dma_cb *cb;
- 	dma_addr_t paddr;
-@@ -82,6 +99,7 @@ struct bcm2835_chan {
- 	unsigned int irq_flags;
- 
- 	bool is_lite_channel;
-+	bool is_40bit_channel;
- };
- 
- struct bcm2835_desc {
-@@ -171,13 +189,118 @@ struct bcm2835_desc {
- #define BCM2835_DMA_DATA_TYPE_S128	16
- 
- /* Valid only for channels 0 - 14, 15 has its own base address */
--#define BCM2835_DMA_CHAN(n)	((n) << 8) /* Base address */
-+#define BCM2835_DMA_CHAN_SIZE	0x100
-+#define BCM2835_DMA_CHAN(n)	((n) * BCM2835_DMA_CHAN_SIZE) /* Base address */
- #define BCM2835_DMA_CHANIO(base, n) ((base) + BCM2835_DMA_CHAN(n))
- 
- /* the max dma length for different channels */
- #define MAX_DMA_LEN SZ_1G
- #define MAX_LITE_DMA_LEN (SZ_64K - 4)
- 
-+/* 40-bit DMA support */
-+#define BCM2711_DMA40_CS	0x00
-+#define BCM2711_DMA40_CB	0x04
-+#define BCM2711_DMA40_DEBUG	0x0c
-+#define BCM2711_DMA40_TI	0x10
-+#define BCM2711_DMA40_SRC	0x14
-+#define BCM2711_DMA40_SRCI	0x18
-+#define BCM2711_DMA40_DEST	0x1c
-+#define BCM2711_DMA40_DESTI	0x20
-+#define BCM2711_DMA40_LEN	0x24
-+#define BCM2711_DMA40_NEXT_CB	0x28
-+#define BCM2711_DMA40_DEBUG2	0x2c
-+
-+#define BCM2711_DMA40_ACTIVE		BIT(0)
-+#define BCM2711_DMA40_END		BIT(1)
-+#define BCM2711_DMA40_INT		BIT(2)
-+#define BCM2711_DMA40_DREQ		BIT(3)  /* DREQ state */
-+#define BCM2711_DMA40_RD_PAUSED		BIT(4)  /* Reading is paused */
-+#define BCM2711_DMA40_WR_PAUSED		BIT(5)  /* Writing is paused */
-+#define BCM2711_DMA40_DREQ_PAUSED	BIT(6)  /* Is paused by DREQ flow control */
-+#define BCM2711_DMA40_WAITING_FOR_WRITES BIT(7)  /* Waiting for last write */
-+#define BCM2711_DMA40_ERR		BIT(10)
-+#define BCM2711_DMA40_QOS(x)		(((x) & 0x1f) << 16)
-+#define BCM2711_DMA40_PANIC_QOS(x)	(((x) & 0x1f) << 20)
-+#define BCM2711_DMA40_WAIT_FOR_WRITES	BIT(28)
-+#define BCM2711_DMA40_DISDEBUG		BIT(29)
-+#define BCM2711_DMA40_ABORT		BIT(30)
-+#define BCM2711_DMA40_HALT		BIT(31)
-+#define BCM2711_DMA40_CS_FLAGS(x) (x & (BCM2711_DMA40_QOS(15) | \
-+					BCM2711_DMA40_PANIC_QOS(15) | \
-+					BCM2711_DMA40_WAIT_FOR_WRITES |	\
-+					BCM2711_DMA40_DISDEBUG))
-+
-+/* Transfer information bits */
-+#define BCM2711_DMA40_INTEN		BIT(0)
-+#define BCM2711_DMA40_TDMODE		BIT(1) /* 2D-Mode */
-+#define BCM2711_DMA40_WAIT_RESP		BIT(2) /* wait for AXI write to be acked */
-+#define BCM2711_DMA40_WAIT_RD_RESP	BIT(3) /* wait for AXI read to complete */
-+#define BCM2711_DMA40_PER_MAP(x)	((x & 31) << 9) /* REQ source */
-+#define BCM2711_DMA40_S_DREQ		BIT(14) /* enable SREQ for source */
-+#define BCM2711_DMA40_D_DREQ		BIT(15) /* enable DREQ for destination */
-+#define BCM2711_DMA40_S_WAIT(x)		((x & 0xff) << 16) /* add DMA read-wait cycles */
-+#define BCM2711_DMA40_D_WAIT(x)		((x & 0xff) << 24) /* add DMA write-wait cycles */
-+
-+/* debug register bits */
-+#define BCM2711_DMA40_DEBUG_WRITE_ERR		BIT(0)
-+#define BCM2711_DMA40_DEBUG_FIFO_ERR		BIT(1)
-+#define BCM2711_DMA40_DEBUG_READ_ERR		BIT(2)
-+#define BCM2711_DMA40_DEBUG_READ_CB_ERR		BIT(3)
-+#define BCM2711_DMA40_DEBUG_IN_ON_ERR		BIT(8)
-+#define BCM2711_DMA40_DEBUG_ABORT_ON_ERR	BIT(9)
-+#define BCM2711_DMA40_DEBUG_HALT_ON_ERR		BIT(10)
-+#define BCM2711_DMA40_DEBUG_DISABLE_CLK_GATE	BIT(11)
-+#define BCM2711_DMA40_DEBUG_RSTATE_SHIFT	14
-+#define BCM2711_DMA40_DEBUG_RSTATE_BITS		4
-+#define BCM2711_DMA40_DEBUG_WSTATE_SHIFT	18
-+#define BCM2711_DMA40_DEBUG_WSTATE_BITS		4
-+#define BCM2711_DMA40_DEBUG_RESET		BIT(23)
-+#define BCM2711_DMA40_DEBUG_ID_SHIFT		24
-+#define BCM2711_DMA40_DEBUG_ID_BITS		4
-+#define BCM2711_DMA40_DEBUG_VERSION_SHIFT	28
-+#define BCM2711_DMA40_DEBUG_VERSION_BITS	4
-+
-+/* Valid only for channels 0 - 3 (11 - 14) */
-+#define BCM2711_DMA40_CHAN(n)	(((n) + 11) << 8) /* Base address */
-+#define BCM2711_DMA40_CHANIO(base, n) ((base) + BCM2711_DMA_CHAN(n))
-+
-+/* the max dma length for different channels */
-+#define MAX_DMA40_LEN SZ_1G
-+
-+#define BCM2711_DMA40_BURST_LEN(x)	((min(x,16) - 1) << 8)
-+#define BCM2711_DMA40_INC		BIT(12)
-+#define BCM2711_DMA40_SIZE_32		(0 << 13)
-+#define BCM2711_DMA40_SIZE_64		(1 << 13)
-+#define BCM2711_DMA40_SIZE_128		(2 << 13)
-+#define BCM2711_DMA40_SIZE_256		(3 << 13)
-+#define BCM2711_DMA40_IGNORE		BIT(15)
-+#define BCM2711_DMA40_STRIDE(x)		((x) << 16) /* For 2D mode */
-+
-+#define BCM2711_DMA40_MEMCPY_FLAGS \
-+	(BCM2711_DMA40_QOS(0) | \
-+	 BCM2711_DMA40_PANIC_QOS(0) | \
-+	 BCM2711_DMA40_WAIT_FOR_WRITES | \
-+	 BCM2711_DMA40_DISDEBUG)
-+
-+#define BCM2711_DMA40_MEMCPY_XFER_INFO \
-+	(BCM2711_DMA40_SIZE_128 | \
-+	 BCM2711_DMA40_INC | \
-+	 BCM2711_DMA40_BURST_LEN(16))
-+
-+struct bcm2835_dmadev *memcpy_parent;
-+static void __iomem *memcpy_chan;
-+static struct bcm2711_dma40_scb *memcpy_scb;
-+static dma_addr_t memcpy_scb_dma;
-+DEFINE_SPINLOCK(memcpy_lock);
-+
-+static const struct bcm2835_dma_cfg_data bcm2835_dma_cfg = {
-+	.chan_40bit_mask = 0,
-+};
-+
-+static const struct bcm2835_dma_cfg_data bcm2711_dma_cfg = {
-+	.chan_40bit_mask = BIT(11) | BIT(12) | BIT(13) | BIT(14),
-+};
-+
- static inline size_t bcm2835_dma_max_frame_length(struct bcm2835_chan *c)
- {
- 	/* lite and normal channels have different max frame length */
-@@ -207,6 +330,32 @@ static inline struct bcm2835_desc *to_bc
- 	return container_of(t, struct bcm2835_desc, vd.tx);
- }
- 
-+static inline uint32_t to_bcm2711_ti(uint32_t info)
-+{
-+	return ((info & BCM2835_DMA_INT_EN) ? BCM2711_DMA40_INTEN : 0) |
-+		((info & BCM2835_DMA_WAIT_RESP) ? BCM2711_DMA40_WAIT_RESP : 0) |
-+		((info & BCM2835_DMA_S_DREQ) ?
-+		 (BCM2711_DMA40_S_DREQ | BCM2711_DMA40_WAIT_RD_RESP) : 0) |
-+		((info & BCM2835_DMA_D_DREQ) ? BCM2711_DMA40_D_DREQ : 0) |
-+		BCM2711_DMA40_PER_MAP((info >> 16) & 0x1f);
-+}
-+
-+static inline uint32_t to_bcm2711_srci(uint32_t info)
-+{
-+	return ((info & BCM2835_DMA_S_INC) ? BCM2711_DMA40_INC : 0);
-+}
-+
-+static inline uint32_t to_bcm2711_dsti(uint32_t info)
-+{
-+	return ((info & BCM2835_DMA_D_INC) ? BCM2711_DMA40_INC : 0);
-+}
-+
-+static inline uint32_t to_bcm2711_cbaddr(dma_addr_t addr)
-+{
-+	BUG_ON(addr & 0x1f);
-+	return (addr >> 5);
-+}
-+
- static void bcm2835_dma_free_cb_chain(struct bcm2835_desc *desc)
- {
- 	size_t i;
-@@ -225,45 +374,53 @@ static void bcm2835_dma_desc_free(struct
- }
- 
- static void bcm2835_dma_create_cb_set_length(
--	struct bcm2835_chan *chan,
-+	struct bcm2835_chan *c,
- 	struct bcm2835_dma_cb *control_block,
- 	size_t len,
- 	size_t period_len,
- 	size_t *total_len,
- 	u32 finalextrainfo)
- {
--	size_t max_len = bcm2835_dma_max_frame_length(chan);
-+	size_t max_len = bcm2835_dma_max_frame_length(c);
-+	uint32_t cb_len;
- 
- 	/* set the length taking lite-channel limitations into account */
--	control_block->length = min_t(u32, len, max_len);
-+	cb_len = min_t(u32, len, max_len);
- 
--	/* finished if we have no period_length */
--	if (!period_len)
--		return;
-+	if (period_len) {
-+		/*
-+		 * period_len means: that we need to generate
-+		 * transfers that are terminating at every
-+		 * multiple of period_len - this is typically
-+		 * used to set the interrupt flag in info
-+		 * which is required during cyclic transfers
-+		 */
- 
--	/*
--	 * period_len means: that we need to generate
--	 * transfers that are terminating at every
--	 * multiple of period_len - this is typically
--	 * used to set the interrupt flag in info
--	 * which is required during cyclic transfers
--	 */
-+		/* have we filled in period_length yet? */
-+		if (*total_len + cb_len < period_len) {
-+			/* update number of bytes in this period so far */
-+			*total_len += cb_len;
-+		} else {
-+			/* calculate the length that remains to reach period_len */
-+			cb_len = period_len - *total_len;
- 
--	/* have we filled in period_length yet? */
--	if (*total_len + control_block->length < period_len) {
--		/* update number of bytes in this period so far */
--		*total_len += control_block->length;
--		return;
-+			/* reset total_length for next period */
-+			*total_len = 0;
-+		}
- 	}
- 
--	/* calculate the length that remains to reach period_length */
--	control_block->length = period_len - *total_len;
--
--	/* reset total_length for next period */
--	*total_len = 0;
--
--	/* add extrainfo bits in info */
--	control_block->info |= finalextrainfo;
-+	if (c->is_40bit_channel) {
-+		struct bcm2711_dma40_scb *scb =
-+			(struct bcm2711_dma40_scb *)control_block;
-+
-+		scb->len = cb_len;
-+		/* add extrainfo bits to ti */
-+		scb->ti |= to_bcm2711_ti(finalextrainfo);
-+	} else {
-+		control_block->length = cb_len;
-+		/* add extrainfo bits to info */
-+		control_block->info |= finalextrainfo;
-+	}
- }
- 
- static inline size_t bcm2835_dma_count_frames_for_sg(
-@@ -286,7 +443,7 @@ static inline size_t bcm2835_dma_count_f
- /**
-  * bcm2835_dma_create_cb_chain - create a control block and fills data in
-  *
-- * @chan:           the @dma_chan for which we run this
-+ * @c:              the @bcm2835_chan for which we run this
-  * @direction:      the direction in which we transfer
-  * @cyclic:         it is a cyclic transfer
-  * @info:           the default info bits to apply per controlblock
-@@ -304,12 +461,11 @@ static inline size_t bcm2835_dma_count_f
-  * @gfp:            the GFP flag to use for allocation
-  */
- static struct bcm2835_desc *bcm2835_dma_create_cb_chain(
--	struct dma_chan *chan, enum dma_transfer_direction direction,
-+	struct bcm2835_chan *c, enum dma_transfer_direction direction,
- 	bool cyclic, u32 info, u32 finalextrainfo, size_t frames,
- 	dma_addr_t src, dma_addr_t dst, size_t buf_len,
- 	size_t period_len, gfp_t gfp)
- {
--	struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);
- 	size_t len = buf_len, total_len;
- 	size_t frame;
- 	struct bcm2835_desc *d;
-@@ -341,11 +497,23 @@ static struct bcm2835_desc *bcm2835_dma_
- 
- 		/* fill in the control block */
- 		control_block = cb_entry->cb;
--		control_block->info = info;
--		control_block->src = src;
--		control_block->dst = dst;
--		control_block->stride = 0;
--		control_block->next = 0;
-+		if (c->is_40bit_channel) {
-+			struct bcm2711_dma40_scb *scb =
-+				(struct bcm2711_dma40_scb *)control_block;
-+			scb->ti = to_bcm2711_ti(info);
-+			scb->src = lower_32_bits(src);
-+			scb->srci= upper_32_bits(src) | to_bcm2711_srci(info);
-+			scb->dst = lower_32_bits(dst);
-+			scb->dsti = upper_32_bits(dst) | to_bcm2711_dsti(info);
-+			scb->next_cb = 0;
-+		} else {
-+			control_block->info = info;
-+			control_block->src = src;
-+			control_block->dst = dst;
-+			control_block->stride = 0;
-+			control_block->next = 0;
-+		}
-+
- 		/* set up length in control_block if requested */
- 		if (buf_len) {
- 			/* calculate length honoring period_length */
-@@ -359,7 +527,11 @@ static struct bcm2835_desc *bcm2835_dma_
- 		}
- 
- 		/* link this the last controlblock */
--		if (frame)
-+		if (frame && c->is_40bit_channel)
-+			((struct bcm2711_dma40_scb *)
-+			 d->cb_list[frame - 1].cb)->next_cb =
-+				to_bcm2711_cbaddr(cb_entry->paddr);
-+		if (frame && !c->is_40bit_channel)
- 			d->cb_list[frame - 1].cb->next = cb_entry->paddr;
- 
- 		/* update src and dst and length */
-@@ -369,11 +541,21 @@ static struct bcm2835_desc *bcm2835_dma_
- 			dst += control_block->length;
- 
- 		/* Length of total transfer */
--		d->size += control_block->length;
-+		if (c->is_40bit_channel)
-+			d->size += ((struct bcm2711_dma40_scb *)control_block)->len;
-+		else
-+			d->size += control_block->length;
- 	}
- 
- 	/* the last frame requires extra flags */
--	d->cb_list[d->frames - 1].cb->info |= finalextrainfo;
-+	if (c->is_40bit_channel) {
-+		struct bcm2711_dma40_scb *scb =
-+			(struct bcm2711_dma40_scb *)d->cb_list[d->frames-1].cb;
-+
-+		scb->ti |= to_bcm2711_ti(finalextrainfo);
-+	} else {
-+		d->cb_list[d->frames - 1].cb->info |= finalextrainfo;
-+	}
- 
- 	/* detect a size missmatch */
- 	if (buf_len && (d->size != buf_len))
-@@ -387,13 +569,12 @@ error_cb:
- }
- 
- static void bcm2835_dma_fill_cb_chain_with_sg(
--	struct dma_chan *chan,
-+	struct bcm2835_chan *c,
- 	enum dma_transfer_direction direction,
- 	struct bcm2835_cb_entry *cb,
- 	struct scatterlist *sgl,
- 	unsigned int sg_len)
- {
--	struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);
- 	size_t len, max_len;
- 	unsigned int i;
- 	dma_addr_t addr;
-@@ -401,14 +582,35 @@ static void bcm2835_dma_fill_cb_chain_wi
- 
- 	max_len = bcm2835_dma_max_frame_length(c);
- 	for_each_sg(sgl, sgent, sg_len, i) {
--		for (addr = sg_dma_address(sgent), len = sg_dma_len(sgent);
--		     len > 0;
--		     addr += cb->cb->length, len -= cb->cb->length, cb++) {
--			if (direction == DMA_DEV_TO_MEM)
--				cb->cb->dst = addr;
--			else
--				cb->cb->src = addr;
--			cb->cb->length = min(len, max_len);
-+		if (c->is_40bit_channel) {
-+			struct bcm2711_dma40_scb *scb;
-+
-+			for (addr = sg_dma_address(sgent),
-+				     len = sg_dma_len(sgent);
-+				     len > 0;
-+			     addr += scb->len, len -= scb->len, cb++) {
-+				scb = (struct bcm2711_dma40_scb *)cb->cb;
-+				if (direction == DMA_DEV_TO_MEM) {
-+					scb->dst = lower_32_bits(addr);
-+					scb->dsti = upper_32_bits(addr) | BCM2711_DMA40_INC;
-+				} else {
-+					scb->src = lower_32_bits(addr);
-+					scb->srci = upper_32_bits(addr) | BCM2711_DMA40_INC;
-+				}
-+				scb->len = min(len, max_len);
-+			}
-+		} else {
-+			for (addr = sg_dma_address(sgent),
-+				     len = sg_dma_len(sgent);
-+			     len > 0;
-+			     addr += cb->cb->length, len -= cb->cb->length,
-+			     cb++) {
-+				if (direction == DMA_DEV_TO_MEM)
-+					cb->cb->dst = addr;
-+				else
-+					cb->cb->src = addr;
-+				cb->cb->length = min(len, max_len);
-+			}
- 		}
- 	}
- }
-@@ -417,6 +619,10 @@ static void bcm2835_dma_abort(struct bcm
- {
- 	void __iomem *chan_base = c->chan_base;
- 	long int timeout = 10000;
-+	u32 wait_mask = BCM2835_DMA_WAITING_FOR_WRITES;
-+
-+	if (c->is_40bit_channel)
-+		wait_mask = BCM2711_DMA40_WAITING_FOR_WRITES;
- 
- 	/*
- 	 * A zero control block address means the channel is idle.
-@@ -429,8 +635,7 @@ static void bcm2835_dma_abort(struct bcm
- 	writel(0, chan_base + BCM2835_DMA_CS);
- 
- 	/* Wait for any current AXI transfer to complete */
--	while ((readl(chan_base + BCM2835_DMA_CS) &
--		BCM2835_DMA_WAITING_FOR_WRITES) && --timeout)
-+	while ((readl(chan_base + BCM2835_DMA_CS) & wait_mask) && --timeout)
- 		cpu_relax();
- 
- 	/* Peripheral might be stuck and fail to signal AXI write responses */
-@@ -455,9 +660,16 @@ static void bcm2835_dma_start_desc(struc
- 
- 	c->desc = d = to_bcm2835_dma_desc(&vd->tx);
- 
--	writel(d->cb_list[0].paddr, c->chan_base + BCM2835_DMA_ADDR);
--	writel(BCM2835_DMA_ACTIVE | BCM2835_DMA_CS_FLAGS(c->dreq),
--	       c->chan_base + BCM2835_DMA_CS);
-+	if (c->is_40bit_channel) {
-+		writel(to_bcm2711_cbaddr(d->cb_list[0].paddr),
-+		       c->chan_base + BCM2711_DMA40_CB);
-+		writel(BCM2711_DMA40_ACTIVE | BCM2711_DMA40_CS_FLAGS(c->dreq),
-+		       c->chan_base + BCM2711_DMA40_CS);
-+	} else {
-+		writel(d->cb_list[0].paddr, c->chan_base + BCM2835_DMA_ADDR);
-+		writel(BCM2835_DMA_ACTIVE | BCM2835_DMA_CS_FLAGS(c->dreq),
-+		       c->chan_base + BCM2835_DMA_CS);
-+	}
- }
- 
- static irqreturn_t bcm2835_dma_callback(int irq, void *data)
-@@ -484,8 +696,7 @@ static irqreturn_t bcm2835_dma_callback(
- 	 * if this IRQ handler is threaded.) If the channel is finished, it
- 	 * will remain idle despite the ACTIVE flag being set.
- 	 */
--	writel(BCM2835_DMA_INT | BCM2835_DMA_ACTIVE |
--	       BCM2835_DMA_CS_FLAGS(c->dreq),
-+	writel(BCM2835_DMA_INT | BCM2835_DMA_ACTIVE,
- 	       c->chan_base + BCM2835_DMA_CS);
- 
- 	d = c->desc;
-@@ -588,9 +799,17 @@ static enum dma_status bcm2835_dma_tx_st
- 		struct bcm2835_desc *d = c->desc;
- 		dma_addr_t pos;
- 
--		if (d->dir == DMA_MEM_TO_DEV)
-+		if (d->dir == DMA_MEM_TO_DEV && c->is_40bit_channel)
-+			pos = readl(c->chan_base + BCM2711_DMA40_SRC) +
-+				((readl(c->chan_base + BCM2711_DMA40_SRCI) &
-+				  0xff) << 8);
-+		else if (d->dir == DMA_MEM_TO_DEV && !c->is_40bit_channel)
- 			pos = readl(c->chan_base + BCM2835_DMA_SOURCE_AD);
--		else if (d->dir == DMA_DEV_TO_MEM)
-+		else if (d->dir == DMA_DEV_TO_MEM && c->is_40bit_channel)
-+			pos = readl(c->chan_base + BCM2711_DMA40_DEST) +
-+				((readl(c->chan_base + BCM2711_DMA40_DESTI) &
-+				  0xff) << 8);
-+		else if (d->dir == DMA_DEV_TO_MEM && !c->is_40bit_channel)
- 			pos = readl(c->chan_base + BCM2835_DMA_DEST_AD);
- 		else
- 			pos = 0;
-@@ -636,7 +855,7 @@ static struct dma_async_tx_descriptor *b
- 	frames = bcm2835_dma_frames_for_length(len, max_len);
- 
- 	/* allocate the CB chain - this also fills in the pointers */
--	d = bcm2835_dma_create_cb_chain(chan, DMA_MEM_TO_MEM, false,
-+	d = bcm2835_dma_create_cb_chain(c, DMA_MEM_TO_MEM, false,
- 					info, extra, frames,
- 					src, dst, len, 0, GFP_KERNEL);
- 	if (!d)
-@@ -671,11 +890,21 @@ static struct dma_async_tx_descriptor *b
- 		if (c->cfg.src_addr_width != DMA_SLAVE_BUSWIDTH_4_BYTES)
- 			return NULL;
- 		src = c->cfg.src_addr;
-+		/*
-+		 * One would think it ought to be possible to get the physical
-+		 * to dma address mapping information from the dma-ranges DT
-+		 * property, but I've not found a way yet that doesn't involve
-+		 * open-coding the whole thing.
-+		 */
-+		if (c->is_40bit_channel)
-+		    src |= 0x400000000ull;
- 		info |= BCM2835_DMA_S_DREQ | BCM2835_DMA_D_INC;
- 	} else {
- 		if (c->cfg.dst_addr_width != DMA_SLAVE_BUSWIDTH_4_BYTES)
- 			return NULL;
- 		dst = c->cfg.dst_addr;
-+		if (c->is_40bit_channel)
-+		    dst |= 0x400000000ull;
- 		info |= BCM2835_DMA_D_DREQ | BCM2835_DMA_S_INC;
- 	}
- 
-@@ -683,7 +912,7 @@ static struct dma_async_tx_descriptor *b
- 	frames = bcm2835_dma_count_frames_for_sg(c, sgl, sg_len);
- 
- 	/* allocate the CB chain */
--	d = bcm2835_dma_create_cb_chain(chan, direction, false,
-+	d = bcm2835_dma_create_cb_chain(c, direction, false,
- 					info, extra,
- 					frames, src, dst, 0, 0,
- 					GFP_NOWAIT);
-@@ -691,7 +920,7 @@ static struct dma_async_tx_descriptor *b
- 		return NULL;
- 
- 	/* fill in frames with scatterlist pointers */
--	bcm2835_dma_fill_cb_chain_with_sg(chan, direction, d->cb_list,
-+	bcm2835_dma_fill_cb_chain_with_sg(c, direction, d->cb_list,
- 					  sgl, sg_len);
- 
- 	return vchan_tx_prep(&c->vc, &d->vd, flags);
-@@ -745,12 +974,16 @@ static struct dma_async_tx_descriptor *b
- 		if (c->cfg.src_addr_width != DMA_SLAVE_BUSWIDTH_4_BYTES)
- 			return NULL;
- 		src = c->cfg.src_addr;
-+		if (c->is_40bit_channel)
-+		    src |= 0x400000000ull;
- 		dst = buf_addr;
- 		info |= BCM2835_DMA_S_DREQ | BCM2835_DMA_D_INC;
- 	} else {
- 		if (c->cfg.dst_addr_width != DMA_SLAVE_BUSWIDTH_4_BYTES)
- 			return NULL;
- 		dst = c->cfg.dst_addr;
-+		if (c->is_40bit_channel)
-+		    dst |= 0x400000000ull;
- 		src = buf_addr;
- 		info |= BCM2835_DMA_D_DREQ | BCM2835_DMA_S_INC;
- 
-@@ -770,7 +1003,7 @@ static struct dma_async_tx_descriptor *b
- 	 * note that we need to use GFP_NOWAIT, as the ALSA i2s dmaengine
- 	 * implementation calls prep_dma_cyclic with interrupts disabled.
- 	 */
--	d = bcm2835_dma_create_cb_chain(chan, direction, true,
-+	d = bcm2835_dma_create_cb_chain(c, direction, true,
- 					info, extra,
- 					frames, src, dst, buf_len,
- 					period_len, GFP_NOWAIT);
-@@ -778,7 +1011,12 @@ static struct dma_async_tx_descriptor *b
- 		return NULL;
- 
- 	/* wrap around into a loop */
--	d->cb_list[d->frames - 1].cb->next = d->cb_list[0].paddr;
-+	if (c->is_40bit_channel)
-+		((struct bcm2711_dma40_scb *)
-+		 d->cb_list[frames - 1].cb)->next_cb =
-+			to_bcm2711_cbaddr(d->cb_list[0].paddr);
-+	else
-+		d->cb_list[d->frames - 1].cb->next = d->cb_list[0].paddr;
- 
- 	return vchan_tx_prep(&c->vc, &d->vd, flags);
- }
-@@ -839,9 +1077,11 @@ static int bcm2835_dma_chan_init(struct
- 	c->irq_number = irq;
- 	c->irq_flags = irq_flags;
- 
--	/* check in DEBUG register if this is a LITE channel */
--	if (readl(c->chan_base + BCM2835_DMA_DEBUG) &
--		BCM2835_DMA_DEBUG_LITE)
-+	/* check for 40bit and lite channels */
-+	if (d->cfg_data->chan_40bit_mask & BIT(chan_id))
-+		c->is_40bit_channel = true;
-+	else if (readl(c->chan_base + BCM2835_DMA_DEBUG) &
-+		 BCM2835_DMA_DEBUG_LITE)
- 		c->is_lite_channel = true;
- 
- 	return 0;
-@@ -861,8 +1101,58 @@ static void bcm2835_dma_free(struct bcm2
- 			     DMA_TO_DEVICE, DMA_ATTR_SKIP_CPU_SYNC);
- }
- 
-+int bcm2711_dma40_memcpy_init(void)
-+{
-+	if (!memcpy_parent)
-+		return -EPROBE_DEFER;
-+
-+	if (!memcpy_chan)
-+		return -EINVAL;
-+
-+	if (!memcpy_scb)
-+		return -ENOMEM;
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL(bcm2711_dma40_memcpy_init);
-+
-+void bcm2711_dma40_memcpy(dma_addr_t dst, dma_addr_t src, size_t size)
-+{
-+	struct bcm2711_dma40_scb *scb = memcpy_scb;
-+	unsigned long flags;
-+
-+	if (!scb) {
-+		pr_err("bcm2711_dma40_memcpy not initialised!\n");
-+		return;
-+	}
-+
-+	spin_lock_irqsave(&memcpy_lock, flags);
-+
-+	scb->ti = 0;
-+	scb->src = lower_32_bits(src);
-+	scb->srci = upper_32_bits(src) | BCM2711_DMA40_MEMCPY_XFER_INFO;
-+	scb->dst = lower_32_bits(dst);
-+	scb->dsti = upper_32_bits(dst) | BCM2711_DMA40_MEMCPY_XFER_INFO;
-+	scb->len = size;
-+	scb->next_cb = 0;
-+
-+	writel((u32)(memcpy_scb_dma >> 5), memcpy_chan + BCM2711_DMA40_CB);
-+	writel(BCM2711_DMA40_MEMCPY_FLAGS + BCM2711_DMA40_ACTIVE,
-+	       memcpy_chan + BCM2711_DMA40_CS);
-+
-+	/* Poll for completion */
-+	while (!(readl(memcpy_chan + BCM2711_DMA40_CS) & BCM2711_DMA40_END))
-+		cpu_relax();
-+
-+	writel(BCM2711_DMA40_END, memcpy_chan + BCM2711_DMA40_CS);
-+
-+	spin_unlock_irqrestore(&memcpy_lock, flags);
-+}
-+EXPORT_SYMBOL(bcm2711_dma40_memcpy);
-+
- static const struct of_device_id bcm2835_dma_of_match[] = {
--	{ .compatible = "brcm,bcm2835-dma", },
-+	{ .compatible = "brcm,bcm2835-dma", .data = &bcm2835_dma_cfg },
-+	{ .compatible = "brcm,bcm2711-dma", .data = &bcm2711_dma_cfg },
- 	{},
- };
- MODULE_DEVICE_TABLE(of, bcm2835_dma_of_match);
-@@ -894,6 +1184,8 @@ static int bcm2835_dma_probe(struct plat
- 	int irq_flags;
- 	uint32_t chans_available;
- 	char chan_name[BCM2835_DMA_CHAN_NAME_SIZE];
-+	const struct of_device_id *of_id;
-+	int chan_count, chan_start, chan_end;
- 
- 	if (!pdev->dev.dma_mask)
- 		pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
-@@ -914,9 +1206,13 @@ static int bcm2835_dma_probe(struct plat
- 	base = devm_ioremap_resource(&pdev->dev, res);
- 	if (IS_ERR(base))
- 		return PTR_ERR(base);
--	rc = bcm_dmaman_probe(pdev, base, BCM2835_DMA_BULK_MASK);
--	if (rc)
--		dev_err(&pdev->dev, "Failed to initialize the legacy API\n");
-+
-+	/* The set of channels can be split across multiple instances. */
-+	chan_start = ((u32)(uintptr_t)base / BCM2835_DMA_CHAN_SIZE) & 0xf;
-+	base -= BCM2835_DMA_CHAN(chan_start);
-+	chan_count = resource_size(res) / BCM2835_DMA_CHAN_SIZE;
-+	chan_end = min(chan_start + chan_count,
-+			 BCM2835_DMA_MAX_DMA_CHAN_SUPPORTED + 1);
- 
- 	od->base = base;
- 
-@@ -953,6 +1249,14 @@ static int bcm2835_dma_probe(struct plat
- 		return -ENOMEM;
- 	}
- 
-+	of_id = of_match_node(bcm2835_dma_of_match, pdev->dev.of_node);
-+	if (!of_id) {
-+		dev_err(&pdev->dev, "Failed to match compatible string\n");
-+		return -EINVAL;
-+	}
-+
-+	od->cfg_data = of_id->data;
-+
- 	/* Request DMA channel mask from device tree */
- 	if (of_property_read_u32(pdev->dev.of_node,
- 			"brcm,dma-channel-mask",
-@@ -962,11 +1266,34 @@ static int bcm2835_dma_probe(struct plat
- 		goto err_no_dma;
- 	}
- 
--	/* Channel 0 is used by the legacy API */
--	chans_available &= ~BCM2835_DMA_BULK_MASK;
-+	/* One channel is reserved for the legacy API */
-+	if (chans_available & BCM2835_DMA_BULK_MASK) {
-+		rc = bcm_dmaman_probe(pdev, base,
-+				      chans_available & BCM2835_DMA_BULK_MASK);
-+		if (rc)
-+			dev_err(&pdev->dev,
-+				"Failed to initialize the legacy API\n");
-+
-+		chans_available &= ~BCM2835_DMA_BULK_MASK;
-+	}
-+
-+	/* And possibly one for the 40-bit DMA memcpy API */
-+	if (chans_available & od->cfg_data->chan_40bit_mask &
-+	    BIT(BCM2711_DMA_MEMCPY_CHAN)) {
-+		memcpy_parent = od;
-+		memcpy_chan = BCM2835_DMA_CHANIO(base, BCM2711_DMA_MEMCPY_CHAN);
-+		memcpy_scb = dma_alloc_coherent(memcpy_parent->ddev.dev,
-+						sizeof(*memcpy_scb),
-+						&memcpy_scb_dma, GFP_KERNEL);
-+		if (!memcpy_scb)
-+			dev_warn(&pdev->dev,
-+				 "Failed to allocated memcpy scb\n");
-+
-+		chans_available &= ~BIT(BCM2711_DMA_MEMCPY_CHAN);
-+	}
- 
- 	/* get irqs for each channel that we support */
--	for (i = 0; i <= BCM2835_DMA_MAX_DMA_CHAN_SUPPORTED; i++) {
-+	for (i = chan_start; i < chan_end; i++) {
- 		/* skip masked out channels */
- 		if (!(chans_available & (1 << i))) {
- 			irq[i] = -1;
-@@ -989,13 +1316,17 @@ static int bcm2835_dma_probe(struct plat
- 		irq[i] = platform_get_irq(pdev, i < 11 ? i : 11);
- 	}
- 
-+	chan_count = 0;
-+
- 	/* get irqs for each channel */
--	for (i = 0; i <= BCM2835_DMA_MAX_DMA_CHAN_SUPPORTED; i++) {
-+	for (i = chan_start; i < chan_end; i++) {
- 		/* skip channels without irq */
- 		if (irq[i] < 0)
- 			continue;
- 
- 		/* check if there are other channels that also use this irq */
-+		/* FIXME: This will fail if interrupts are shared across
-+		   instances */
- 		irq_flags = 0;
- 		for (j = 0; j <= BCM2835_DMA_MAX_DMA_CHAN_SUPPORTED; j++)
- 			if ((i != j) && (irq[j] == irq[i])) {
-@@ -1007,9 +1338,10 @@ static int bcm2835_dma_probe(struct plat
- 		rc = bcm2835_dma_chan_init(od, i, irq[i], irq_flags);
- 		if (rc)
- 			goto err_no_dma;
-+		chan_count++;
- 	}
- 
--	dev_dbg(&pdev->dev, "Initialized %i DMA channels\n", i);
-+	dev_dbg(&pdev->dev, "Initialized %i DMA channels\n", chan_count);
- 
- 	/* Device-tree DMA controller registration */
- 	rc = of_dma_controller_register(pdev->dev.of_node,
-@@ -1041,6 +1373,13 @@ static int bcm2835_dma_remove(struct pla
- 
- 	bcm_dmaman_remove(pdev);
- 	dma_async_device_unregister(&od->ddev);
-+	if (memcpy_parent == od) {
-+		dma_free_coherent(&pdev->dev, sizeof(*memcpy_scb), memcpy_scb,
-+				  memcpy_scb_dma);
-+		memcpy_parent = NULL;
-+		memcpy_scb = NULL;
-+		memcpy_chan = NULL;
-+	}
- 	bcm2835_dma_free(od);
- 
- 	return 0;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0234-media-i2c-tc358743-Fix-fallthrough-warning.patch b/target/linux/bcm27xx/patches-6.1/950-0234-media-i2c-tc358743-Fix-fallthrough-warning.patch
deleted file mode 100644
index 824f9212f7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0234-media-i2c-tc358743-Fix-fallthrough-warning.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 642eccec66b8369271bcbede9ece01be1408cf24 Mon Sep 17 00:00:00 2001
-From: Jacko Dirks <jdirks.linuxdev@gmail.com>
-Date: Tue, 5 May 2020 14:28:14 +0200
-Subject: [PATCH] media: i2c: tc358743: Fix fallthrough warning
-
-Signed-off-by: Jacko Dirks <jdirks.linuxdev@gmail.com>
----
- drivers/media/i2c/tc358743.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/media/i2c/tc358743.c
-+++ b/drivers/media/i2c/tc358743.c
-@@ -1983,6 +1983,7 @@ static int tc358743_probe_of(struct tc35
- 	switch (bps_pr_lane) {
- 	default:
- 		dev_warn(dev, "untested bps per lane: %u bps\n", bps_pr_lane);
-+		fallthrough;
- 	case 594000000U:
- 		state->pdata.lineinitcnt = 0xe80;
- 		state->pdata.lptxtimecnt = 0x003;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0235-video-bcm2708_fb-Disable-FB-if-no-displays-found.patch b/target/linux/bcm27xx/patches-6.1/950-0235-video-bcm2708_fb-Disable-FB-if-no-displays-found.patch
deleted file mode 100644
index d4dd3604cf..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0235-video-bcm2708_fb-Disable-FB-if-no-displays-found.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 766c7b1963199536393ef37101265b94932489a0 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 5 May 2020 19:45:41 +0100
-Subject: [PATCH] video: bcm2708_fb: Disable FB if no displays found
-
-If the firmware hasn't detected a display, the driver would assume
-one display was available, but because it had failed to retrieve the
-display size it would try to allocate a zero-sized buffer.
-
-Avoid the allocation failure by bailing out early if no display is
-found.
-
-See: https://github.com/raspberrypi/linux/issues/3598
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/video/fbdev/bcm2708_fb.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
---- a/drivers/video/fbdev/bcm2708_fb.c
-+++ b/drivers/video/fbdev/bcm2708_fb.c
-@@ -1092,10 +1092,9 @@ static int bcm2708_fb_probe(struct platf
- 	 * set one display
- 	 */
- 	if (ret || num_displays == 0) {
--		num_displays = 1;
- 		dev_err(&dev->dev,
--			"Unable to determine number of FB's. Assuming 1\n");
--		ret = 0;
-+			"Unable to determine number of FBs. Disabling driver.\n");
-+		return -ENOENT;
- 	} else {
- 		fbdev->firmware_supports_multifb = 1;
- 	}
diff --git a/target/linux/bcm27xx/patches-6.1/950-0236-staging-vc04_services-mmal-vchiq-Update-parameters-l.patch b/target/linux/bcm27xx/patches-6.1/950-0236-staging-vc04_services-mmal-vchiq-Update-parameters-l.patch
deleted file mode 100644
index e434281ec3..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0236-staging-vc04_services-mmal-vchiq-Update-parameters-l.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 3555005ad1614e1832b9c14d66dc5f2b9d7b1a11 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 15 May 2020 13:42:10 +0100
-Subject: [PATCH] staging: vc04_services: mmal-vchiq: Update parameters
- list
-
-Adds in a couple of new MMAL parameter defines.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
-+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
-@@ -609,6 +609,12 @@ enum mmal_parameter_video_type {
- 
- 	/**< Takes a @ref MMAL_PARAMETER_UINT32_T */
- 	MMAL_PARAMETER_VIDEO_DROPPABLE_PFRAME_LENGTH,
-+
-+	/**< Take a @ref MMAL_PARAMETER_VIDEO_STALL_T */
-+	MMAL_PARAMETER_VIDEO_STALL_THRESHOLD,
-+
-+	/**< Take a @ref MMAL_PARAMETER_BOOLEAN_T */
-+	MMAL_PARAMETER_VIDEO_ENCODE_HEADERS_WITH_FRAME,
- };
- 
- /** Valid mirror modes */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0237-staging-vc04_services-bcm2835-camera-Request-headers.patch b/target/linux/bcm27xx/patches-6.1/950-0237-staging-vc04_services-bcm2835-camera-Request-headers.patch
deleted file mode 100644
index a738b33c5e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0237-staging-vc04_services-bcm2835-camera-Request-headers.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 45e23b963f9bac2f83abf1c980f2269c608a12c9 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 15 May 2020 13:48:59 +0100
-Subject: [PATCH] staging:vc04_services: bcm2835-camera: Request
- headers with I-frame
-
-V4L2 wishes to have the codec header bytes in the same buffer as the
-first encoded frame, so it does become 1-in 1-out for encoding.
-The firmware now has an option to do this, so enable it.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../staging/vc04_services/bcm2835-camera/bcm2835-camera.c   | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
-+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
-@@ -1730,6 +1730,12 @@ static int mmal_init(struct bcm2835_mmal
- 					      MMAL_PARAMETER_MINIMISE_FRAGMENTATION,
- 					      &enable,
- 					      sizeof(enable));
-+
-+		/* Enable inserting headers into the first frame */
-+		vchiq_mmal_port_parameter_set(dev->instance,
-+					      &dev->component[COMP_VIDEO_ENCODE]->control,
-+					      MMAL_PARAMETER_VIDEO_ENCODE_HEADERS_WITH_FRAME,
-+					      &enable, sizeof(enable));
- 	}
- 	ret = bcm2835_mmal_set_all_camera_controls(dev);
- 	if (ret < 0) {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0238-zswap-Defer-zswap-initialisation.patch b/target/linux/bcm27xx/patches-6.1/950-0238-zswap-Defer-zswap-initialisation.patch
deleted file mode 100644
index b27bc25e15..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0238-zswap-Defer-zswap-initialisation.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From cfe4cda49168a35df7a278e567542c2b7fa096c3 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 5 May 2020 15:23:32 +0100
-Subject: [PATCH] zswap: Defer zswap initialisation
-
-Enabling zswap support in the kernel configuration costs about 1.5MB
-of RAM, even when zswap is not enabled at runtime. This cost can be
-reduced significantly by deferring initialisation (including pool
-creation) until the "enabled" parameter is set to true. There is a
-small cost to this in that some initialisation code has to remain in
-memory after the init phase, just in case they are needed later,
-but the total size increase is negligible.
-
-See: https://github.com/raspberrypi/linux/pull/3432
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- mm/zswap.c | 53 +++++++++++++++++++++++++++++------------------------
- 1 file changed, 29 insertions(+), 24 deletions(-)
-
---- a/mm/zswap.c
-+++ b/mm/zswap.c
-@@ -663,8 +663,9 @@ error:
- 	return NULL;
- }
- 
--static __init struct zswap_pool *__zswap_pool_create_fallback(void)
-+static bool zswap_try_pool_create(void)
- {
-+	struct zswap_pool *pool;
- 	bool has_comp, has_zpool;
- 
- 	has_comp = crypto_has_acomp(zswap_compressor, 0, 0);
-@@ -700,9 +701,21 @@ static __init struct zswap_pool *__zswap
- 	}
- 
- 	if (!has_comp || !has_zpool)
--		return NULL;
-+		return false;
-+
-+	pool = zswap_pool_create(zswap_zpool_type, zswap_compressor);
- 
--	return zswap_pool_create(zswap_zpool_type, zswap_compressor);
-+	if (pool) {
-+		pr_info("loaded using pool %s/%s\n", pool->tfm_name,
-+			zpool_get_type(pool->zpool));
-+		list_add(&pool->list, &zswap_pools);
-+		zswap_has_pool = true;
-+	} else {
-+		pr_err("pool creation failed\n");
-+		zswap_enabled = false;
-+	}
-+
-+	return zswap_enabled;
- }
- 
- static void zswap_pool_destroy(struct zswap_pool *pool)
-@@ -875,16 +888,19 @@ static int zswap_zpool_param_set(const c
- static int zswap_enabled_param_set(const char *val,
- 				   const struct kernel_param *kp)
- {
-+	int ret;
-+
- 	if (zswap_init_failed) {
- 		pr_err("can't enable, initialization failed\n");
- 		return -ENODEV;
- 	}
--	if (!zswap_has_pool && zswap_init_started) {
--		pr_err("can't enable, no pool configured\n");
--		return -ENODEV;
--	}
- 
--	return param_set_bool(val, kp);
-+	ret = param_set_bool(val, kp);
-+	if (!ret && zswap_enabled && zswap_init_started && !zswap_has_pool)
-+		if (!zswap_try_pool_create())
-+			ret = -ENODEV;
-+
-+	return ret;
- }
- 
- /*********************************
-@@ -1498,7 +1514,6 @@ static int __init zswap_debugfs_init(voi
- **********************************/
- static int __init init_zswap(void)
- {
--	struct zswap_pool *pool;
- 	int ret;
- 
- 	zswap_init_started = true;
-@@ -1522,33 +1537,23 @@ static int __init init_zswap(void)
- 	if (ret)
- 		goto hp_fail;
- 
--	pool = __zswap_pool_create_fallback();
--	if (pool) {
--		pr_info("loaded using pool %s/%s\n", pool->tfm_name,
--			zpool_get_type(pool->zpool));
--		list_add(&pool->list, &zswap_pools);
--		zswap_has_pool = true;
--	} else {
--		pr_err("pool creation failed\n");
--		zswap_enabled = false;
--	}
--
- 	shrink_wq = create_workqueue("zswap-shrink");
- 	if (!shrink_wq)
--		goto fallback_fail;
-+		goto hp_fail;
- 
- 	ret = frontswap_register_ops(&zswap_frontswap_ops);
- 	if (ret)
- 		goto destroy_wq;
- 	if (zswap_debugfs_init())
- 		pr_warn("debugfs initialization failed\n");
-+
-+	if (zswap_enabled)
-+		zswap_try_pool_create();
-+
- 	return 0;
- 
- destroy_wq:
- 	destroy_workqueue(shrink_wq);
--fallback_fail:
--	if (pool)
--		zswap_pool_destroy(pool);
- hp_fail:
- 	cpuhp_remove_state(CPUHP_MM_ZSWP_MEM_PREPARE);
- dstmem_fail:
diff --git a/target/linux/bcm27xx/patches-6.1/950-0239-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch b/target/linux/bcm27xx/patches-6.1/950-0239-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch
deleted file mode 100644
index 3b2b6d688a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0239-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 14b3cf60aafc538071ad54305069763551c471af Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Tue, 24 Apr 2018 14:42:27 +0100
-Subject: [PATCH] gpiolib: Don't prevent IRQ usage of output GPIOs
-
-Upstream Linux deems using output GPIOs to generate IRQs as a bogus
-use case, even though the BCM2835 GPIO controller is capable of doing
-so. A number of users would like to make use of this facility, so
-disable the checks.
-
-See: https://github.com/raspberrypi/linux/issues/2527
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.org>
----
- drivers/gpio/gpiolib.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
---- a/drivers/gpio/gpiolib.c
-+++ b/drivers/gpio/gpiolib.c
-@@ -52,6 +52,8 @@
- #define	extra_checks	0
- #endif
- 
-+#define dont_test_bit(b,d) (0)
-+
- /* Device and char device-related information */
- static DEFINE_IDA(gpio_ida);
- static dev_t gpio_devt;
-@@ -2423,8 +2425,8 @@ int gpiod_direction_output(struct gpio_d
- 		value = !!value;
- 
- 	/* GPIOs used for enabled IRQs shall not be set as output */
--	if (test_bit(FLAG_USED_AS_IRQ, &desc->flags) &&
--	    test_bit(FLAG_IRQ_IS_ENABLED, &desc->flags)) {
-+	if (dont_test_bit(FLAG_USED_AS_IRQ, &desc->flags) &&
-+	    dont_test_bit(FLAG_IRQ_IS_ENABLED, &desc->flags)) {
- 		gpiod_err(desc,
- 			  "%s: tried to set a GPIO tied to an IRQ as output\n",
- 			  __func__);
-@@ -3302,8 +3304,8 @@ int gpiochip_lock_as_irq(struct gpio_chi
- 	}
- 
- 	/* To be valid for IRQ the line needs to be input or open drain */
--	if (test_bit(FLAG_IS_OUT, &desc->flags) &&
--	    !test_bit(FLAG_OPEN_DRAIN, &desc->flags)) {
-+	if (dont_test_bit(FLAG_IS_OUT, &desc->flags) &&
-+	    !dont_test_bit(FLAG_OPEN_DRAIN, &desc->flags)) {
- 		chip_err(gc,
- 			 "%s: tried to flag a GPIO set as output for IRQ\n",
- 			 __func__);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0240-PCI-brcmstb-Add-DT-property-to-control-L1SS.patch b/target/linux/bcm27xx/patches-6.1/950-0240-PCI-brcmstb-Add-DT-property-to-control-L1SS.patch
deleted file mode 100644
index 000a96fa4d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0240-PCI-brcmstb-Add-DT-property-to-control-L1SS.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From ebabd0b257fd8863e8038e9fd5b3b8428b06cfe2 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 11 Jun 2020 09:57:03 +0100
-Subject: [PATCH] PCI: brcmstb: Add DT property to control L1SS
-
-The BRCM PCIe block has controls to enable control of the CLKREQ#
-signal by the L1SS, and to gate the refclk with the CLKREQ# input.
-These controls are mutually exclusive - the upstream code sets the
-latter, but some use cases require the former.
-
-Add a Device Tree property - brcm,enable-l1ss - to switch to the
-L1SS configuration.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/pci/controller/pcie-brcmstb.c | 26 +++++++++++++++++++++-----
- 1 file changed, 21 insertions(+), 5 deletions(-)
-
---- a/drivers/pci/controller/pcie-brcmstb.c
-+++ b/drivers/pci/controller/pcie-brcmstb.c
-@@ -120,6 +120,7 @@
- #define  PCIE_MISC_HARD_PCIE_HARD_DEBUG_CLKREQ_DEBUG_ENABLE_MASK	0x2
- #define  PCIE_MISC_HARD_PCIE_HARD_DEBUG_SERDES_IDDQ_MASK		0x08000000
- #define  PCIE_BMIPS_MISC_HARD_PCIE_HARD_DEBUG_SERDES_IDDQ_MASK		0x00800000
-+#define  PCIE_MISC_HARD_PCIE_HARD_DEBUG_CLKREQ_L1SS_ENABLE_MASK		0x00200000
- 
- 
- #define PCIE_INTR2_CPU_BASE		0x4300
-@@ -249,6 +250,7 @@ struct brcm_pcie {
- 	struct clk		*clk;
- 	struct device_node	*np;
- 	bool			ssc;
-+	bool			l1ss;
- 	int			gen;
- 	u64			msi_target_addr;
- 	struct brcm_msi		*msi;
-@@ -1062,12 +1064,25 @@ static int brcm_pcie_start_link(struct b
- 		 pci_speed_string(pcie_link_speed[cls]), nlw,
- 		 ssc_good ? "(SSC)" : "(!SSC)");
- 
--	/*
--	 * Refclk from RC should be gated with CLKREQ# input when ASPM L0s,L1
--	 * is enabled => setting the CLKREQ_DEBUG_ENABLE field to 1.
--	 */
- 	tmp = readl(base + PCIE_MISC_HARD_PCIE_HARD_DEBUG);
--	tmp |= PCIE_MISC_HARD_PCIE_HARD_DEBUG_CLKREQ_DEBUG_ENABLE_MASK;
-+	if (pcie->l1ss) {
-+		/*
-+		 * Enable CLKREQ# signalling include L1 Substate control of
-+		 * the CLKREQ# signal and the external reference clock buffer.
-+		 * meet requirement for Endpoints that require CLKREQ#
-+		 * assertion to clock active within 400ns.
-+		 */
-+		tmp &= ~PCIE_MISC_HARD_PCIE_HARD_DEBUG_CLKREQ_DEBUG_ENABLE_MASK;
-+		tmp |= PCIE_MISC_HARD_PCIE_HARD_DEBUG_CLKREQ_L1SS_ENABLE_MASK;
-+	} else {
-+		/*
-+		 * Refclk from RC should be gated with CLKREQ# input when
-+		 * ASPM L0s,L1 is enabled => setting the CLKREQ_DEBUG_ENABLE
-+		 * field to 1.
-+		 */
-+		tmp &= ~PCIE_MISC_HARD_PCIE_HARD_DEBUG_CLKREQ_L1SS_ENABLE_MASK;
-+		tmp |= PCIE_MISC_HARD_PCIE_HARD_DEBUG_CLKREQ_DEBUG_ENABLE_MASK;
-+	}
- 	writel(tmp, base + PCIE_MISC_HARD_PCIE_HARD_DEBUG);
- 
- 	return 0;
-@@ -1523,6 +1538,7 @@ static int brcm_pcie_probe(struct platfo
- 	pcie->gen = (ret < 0) ? 0 : ret;
- 
- 	pcie->ssc = of_property_read_bool(np, "brcm,enable-ssc");
-+	pcie->l1ss = of_property_read_bool(np, "brcm,enable-l1ss");
- 
- 	ret = clk_prepare_enable(pcie->clk);
- 	if (ret) {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0241-media-irs1125-Using-i2c_transfer-for-ic2-reads.patch b/target/linux/bcm27xx/patches-6.1/950-0241-media-irs1125-Using-i2c_transfer-for-ic2-reads.patch
deleted file mode 100644
index 49b96ba27c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0241-media-irs1125-Using-i2c_transfer-for-ic2-reads.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 4923e1228b48e22d014f1f10b12ab0fa18d7821f Mon Sep 17 00:00:00 2001
-From: Markus Proeller <markus.proeller@pieye.org>
-Date: Tue, 16 Jun 2020 13:24:31 +0200
-Subject: [PATCH] media: irs1125: Using i2c_transfer for ic2 reads
-
-Reading data over i2c is done by using i2c_transfer to ensure that this
-operation can't be interrupted.
-
-Signed-off-by: Markus Proeller <markus.proeller@pieye.org>
----
- drivers/media/i2c/irs1125.c | 37 ++++++++++++++++++++++---------------
- 1 file changed, 22 insertions(+), 15 deletions(-)
-
---- a/drivers/media/i2c/irs1125.c
-+++ b/drivers/media/i2c/irs1125.c
-@@ -248,27 +248,34 @@ static int irs1125_write(struct v4l2_sub
- 
- static int irs1125_read(struct v4l2_subdev *sd, u16 reg, u16 *val)
- {
--	int ret;
--	unsigned char data_w[2] = { reg >> 8, reg & 0xff };
--	char rdval[2];
--
- 	struct i2c_client *client = v4l2_get_subdevdata(sd);
-+	struct i2c_msg msgs[2];
-+	u8 addr_buf[2] = { reg >> 8, reg & 0xff };
-+	u8 data_buf[2] = { 0, };
-+	int ret;
- 
--	ret = i2c_master_send(client, data_w, 2);
--	if (ret < 0) {
--		dev_dbg(&client->dev, "%s: i2c write error, reg: %x\n",
--			__func__, reg);
-+	/* Write register address */
-+	msgs[0].addr = client->addr;
-+	msgs[0].flags = 0;
-+	msgs[0].len = ARRAY_SIZE(addr_buf);
-+	msgs[0].buf = addr_buf;
-+
-+	/* Read data from register */
-+	msgs[1].addr = client->addr;
-+	msgs[1].flags = I2C_M_RD;
-+	msgs[1].len = 2;
-+	msgs[1].buf = data_buf;
-+
-+	ret = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
-+	if (ret != ARRAY_SIZE(msgs)) {
-+		if (ret >= 0)
-+			ret = -EIO;
- 		return ret;
- 	}
- 
--	ret = i2c_master_recv(client, rdval, 2);
--	if (ret < 0)
--		dev_err(&client->dev, "%s: i2c read error, reg: %x\n",
--			__func__, reg);
--
--	*val = rdval[1] | (rdval[0] << 8);
-+	*val = data_buf[1] | (data_buf[0] << 8);
- 
--	return ret;
-+	return 0;
- }
- 
- static int irs1125_write_array(struct v4l2_subdev *sd,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0242-media-irs1125-Refactoring-and-debug-messages.patch b/target/linux/bcm27xx/patches-6.1/950-0242-media-irs1125-Refactoring-and-debug-messages.patch
deleted file mode 100644
index 24d87c849a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0242-media-irs1125-Refactoring-and-debug-messages.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From 979c2242ce97ccc12869e60f7c1f1258c906a99c Mon Sep 17 00:00:00 2001
-From: Markus Proeller <markus.proeller@pieye.org>
-Date: Tue, 16 Jun 2020 13:27:42 +0200
-Subject: [PATCH] media: irs1125: Refactoring and debug messages
-
-Changed some variable names to comply with checkpatch --strict mode.
-Debug messages added.
-
-Signed-off-by: Markus Proeller <markus.proeller@pieye.org>
----
- drivers/media/i2c/irs1125.c | 36 ++++++++++++++++++++----------------
- 1 file changed, 20 insertions(+), 16 deletions(-)
-
---- a/drivers/media/i2c/irs1125.c
-+++ b/drivers/media/i2c/irs1125.c
-@@ -15,6 +15,7 @@
- #include "irs1125.h"
- #include <linux/clk.h>
- #include <linux/delay.h>
-+#include <linux/firmware.h>
- #include <linux/gpio/consumer.h>
- #include <linux/i2c.h>
- #include <linux/init.h>
-@@ -22,13 +23,13 @@
- #include <linux/module.h>
- #include <linux/of_graph.h>
- #include <linux/slab.h>
-+#include <linux/types.h>
- #include <linux/videodev2.h>
--#include <linux/firmware.h>
-+#include <media/v4l2-ctrls.h>
- #include <media/v4l2-device.h>
- #include <media/v4l2-fwnode.h>
- #include <media/v4l2-image-sizes.h>
- #include <media/v4l2-mediabus.h>
--#include <media/v4l2-ctrls.h>
- 
- #define CHECK_BIT(val, pos) ((val) & BIT(pos))
- 
-@@ -38,18 +39,19 @@
- 
- #define IRS1125_ALTERNATE_FW "irs1125_af.bin"
- 
--#define IRS1125_REG_CSICFG       0xA882
--#define IRS1125_REG_DESIGN_STEP	 0xB0AD
--#define IRS1125_REG_EFUSEVAL2	 0xB09F
--#define IRS1125_REG_EFUSEVAL3	 0xB0A0
--#define IRS1125_REG_EFUSEVAL4	 0xB0A1
--#define IRS1125_REG_DMEM_SHADOW	 0xC320
-+#define IRS1125_REG_SAFE_RECONFIG	0xA850
-+#define IRS1125_REG_CSICFG		0xA882
-+#define IRS1125_REG_DESIGN_STEP		0xB0AD
-+#define IRS1125_REG_EFUSEVAL2		0xB09F
-+#define IRS1125_REG_EFUSEVAL3		0xB0A0
-+#define IRS1125_REG_EFUSEVAL4		0xB0A1
-+#define IRS1125_REG_DMEM_SHADOW		0xC320
- 
--#define IRS1125_DESIGN_STEP_EXPECTED 0x0a12
-+#define IRS1125_DESIGN_STEP_EXPECTED	0x0a12
- 
- #define IRS1125_ROW_START_DEF		0
- #define IRS1125_COLUMN_START_DEF	0
--#define IRS1125_WINDOW_HEIGHT_DEF	 288
-+#define IRS1125_WINDOW_HEIGHT_DEF	288
- #define IRS1125_WINDOW_WIDTH_DEF	352
- 
- struct regval_list {
-@@ -87,7 +89,7 @@ static inline struct irs1125 *to_state(s
- 	return container_of(sd, struct irs1125, sd);
- }
- 
--static struct regval_list irs1125_26MHz[] = {
-+static struct regval_list irs1125_26mhz[] = {
- 	{0xB017, 0x0413},
- 	{0xB086, 0x3535},
- 	{0xB0AE, 0xEF02},
-@@ -153,7 +155,7 @@ static struct regval_list irs1125_26MHz[
- 	{0xFFFF, 100}
- };
- 
--static struct regval_list irs1125_seq_cfg[] = {
-+static struct regval_list irs1125_seq_cfg_init[] = {
- 	{0xC3A0, 0x823D},
- 	{0xC3A1, 0xB13B},
- 	{0xC3A2, 0x0313},
-@@ -243,6 +245,7 @@ static int irs1125_write(struct v4l2_sub
- 		dev_err(&client->dev, "%s: i2c write error, reg: %x\n",
- 			__func__, reg);
- 
-+	dev_dbg(&client->dev, "write addr 0x%04x, val 0x%04x\n", reg, val);
- 	return ret;
- }
- 
-@@ -364,8 +367,8 @@ static int __sensor_init(struct v4l2_sub
- 		cnt++;
- 	}
- 
--	ret = irs1125_write_array(sd, irs1125_26MHz,
--				  ARRAY_SIZE(irs1125_26MHz));
-+	ret = irs1125_write_array(sd, irs1125_26mhz,
-+				  ARRAY_SIZE(irs1125_26mhz));
- 	if (ret < 0) {
- 		dev_err(&client->dev, "write sensor default regs error\n");
- 		return ret;
-@@ -415,8 +418,8 @@ static int __sensor_init(struct v4l2_sub
- 	}
- 	release_firmware(fw);
- 
--	ret = irs1125_write_array(sd, irs1125_seq_cfg,
--				  ARRAY_SIZE(irs1125_seq_cfg));
-+	ret = irs1125_write_array(sd, irs1125_seq_cfg_init,
-+				  ARRAY_SIZE(irs1125_seq_cfg_init));
- 	if (ret < 0) {
- 		dev_err(&client->dev, "write default sequence failed\n");
- 		return ret;
-@@ -1037,6 +1040,7 @@ static int irs1125_probe(struct i2c_clie
- 	}
- 
- 	gpio_num = desc_to_gpio(sensor->reset);
-+	dev_dbg(&client->dev, "reset on GPIO num %d\n", gpio_num);
- 
- 	mutex_init(&sensor->lock);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0243-media-irs1125-Atomic-access-to-imager-reconfiguratio.patch b/target/linux/bcm27xx/patches-6.1/950-0243-media-irs1125-Atomic-access-to-imager-reconfiguratio.patch
deleted file mode 100644
index d1900e0c46..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0243-media-irs1125-Atomic-access-to-imager-reconfiguratio.patch
+++ /dev/null
@@ -1,381 +0,0 @@
-From 05ced6416f6eade6b1bb5aea6dc03bb1132e482f Mon Sep 17 00:00:00 2001
-From: Markus Proeller <markus.proeller@pieye.org>
-Date: Tue, 16 Jun 2020 13:31:36 +0200
-Subject: [PATCH] media: irs1125: Atomic access to imager
- reconfiguration
-
-Instead of changing the exposure and framerate settings for all sequences,
-they can be changed for every sequence individually now. Therefore the
-IRS1125_CID_SAFE_RECONFIG ctrl has been removed and replaced by
-IRS1125_CID_SAFE_RECONFIG_S<seq_num>_EXPO and *_FRAME ctrls.
-
-The consistency check in the sequence ctrl IRS1125_CID_SEQ_CONFIG
-is removed.
-
-Signed-off-by: Markus Proeller <markus.proeller@pieye.org>
----
- drivers/media/i2c/irs1125.c | 224 ++++++++++++++++++++++++------------
- drivers/media/i2c/irs1125.h |  68 ++++++++---
- 2 files changed, 204 insertions(+), 88 deletions(-)
-
---- a/drivers/media/i2c/irs1125.c
-+++ b/drivers/media/i2c/irs1125.c
-@@ -89,6 +89,52 @@ static inline struct irs1125 *to_state(s
- 	return container_of(sd, struct irs1125, sd);
- }
- 
-+static const char *expo_ctrl_names[IRS1125_NUM_SEQ_ENTRIES] = {
-+	"safe reconfiguration of exposure of sequence 0",
-+	"safe reconfiguration of exposure of sequence 1",
-+	"safe reconfiguration of exposure of sequence 2",
-+	"safe reconfiguration of exposure of sequence 3",
-+	"safe reconfiguration of exposure of sequence 4",
-+	"safe reconfiguration of exposure of sequence 5",
-+	"safe reconfiguration of exposure of sequence 6",
-+	"safe reconfiguration of exposure of sequence 7",
-+	"safe reconfiguration of exposure of sequence 8",
-+	"safe reconfiguration of exposure of sequence 9",
-+	"safe reconfiguration of exposure of sequence 10",
-+	"safe reconfiguration of exposure of sequence 11",
-+	"safe reconfiguration of exposure of sequence 12",
-+	"safe reconfiguration of exposure of sequence 13",
-+	"safe reconfiguration of exposure of sequence 14",
-+	"safe reconfiguration of exposure of sequence 15",
-+	"safe reconfiguration of exposure of sequence 16",
-+	"safe reconfiguration of exposure of sequence 17",
-+	"safe reconfiguration of exposure of sequence 18",
-+	"safe reconfiguration of exposure of sequence 19",
-+};
-+
-+static const char *frame_ctrl_names[IRS1125_NUM_SEQ_ENTRIES] = {
-+	"safe reconfiguration of framerate of sequence 0",
-+	"safe reconfiguration of framerate of sequence 1",
-+	"safe reconfiguration of framerate of sequence 2",
-+	"safe reconfiguration of framerate of sequence 3",
-+	"safe reconfiguration of framerate of sequence 4",
-+	"safe reconfiguration of framerate of sequence 5",
-+	"safe reconfiguration of framerate of sequence 6",
-+	"safe reconfiguration of framerate of sequence 7",
-+	"safe reconfiguration of framerate of sequence 8",
-+	"safe reconfiguration of framerate of sequence 9",
-+	"safe reconfiguration of framerate of sequence 10",
-+	"safe reconfiguration of framerate of sequence 11",
-+	"safe reconfiguration of framerate of sequence 12",
-+	"safe reconfiguration of framerate of sequence 13",
-+	"safe reconfiguration of framerate of sequence 14",
-+	"safe reconfiguration of framerate of sequence 15",
-+	"safe reconfiguration of framerate of sequence 16",
-+	"safe reconfiguration of framerate of sequence 17",
-+	"safe reconfiguration of framerate of sequence 18",
-+	"safe reconfiguration of framerate of sequence 19",
-+};
-+
- static struct regval_list irs1125_26mhz[] = {
- 	{0xB017, 0x0413},
- 	{0xB086, 0x3535},
-@@ -561,36 +607,57 @@ static int irs1125_s_ctrl(struct v4l2_ct
- 	struct irs1125 *dev = container_of(ctrl->handler,
- 					struct irs1125, ctrl_handler);
- 	struct i2c_client *client = v4l2_get_subdevdata(&dev->sd);
--	int err, i;
- 	struct irs1125_mod_pll *mod_cur, *mod_new;
--	struct irs1125_seq_cfg *cfg_cur, *cfg_new;
- 	u16 addr, val;
--
--	err = 0;
-+	int err = 0, i;
- 
- 	switch (ctrl->id) {
--	case IRS1125_CID_SAFE_RECONFIG:
--	{
--		struct irs1125_illu *illu_cur, *illu_new;
--
--		illu_new = (struct irs1125_illu *)ctrl->p_new.p;
--		illu_cur = (struct irs1125_illu *)ctrl->p_cur.p;
--		for (i = 0; i < IRS1125_NUM_SEQ_ENTRIES; i++) {
--			if (illu_cur[i].exposure != illu_new[i].exposure) {
--				addr = 0xA850 + i * 2;
--				val = illu_new[i].exposure;
--				err = irs1125_write(&dev->sd, addr, val);
--				if (err < 0)
--					break;
--			}
--			if (illu_cur[i].framerate != illu_new[i].framerate) {
--				addr = 0xA851 + i * 2;
--				val = illu_new[i].framerate;
--				err = irs1125_write(&dev->sd, addr, val);
--				if (err < 0)
--					break;
--			}
--		}
-+	case IRS1125_CID_SAFE_RECONFIG_S0_EXPO:
-+	case IRS1125_CID_SAFE_RECONFIG_S0_FRAME:
-+	case IRS1125_CID_SAFE_RECONFIG_S1_EXPO:
-+	case IRS1125_CID_SAFE_RECONFIG_S1_FRAME:
-+	case IRS1125_CID_SAFE_RECONFIG_S2_EXPO:
-+	case IRS1125_CID_SAFE_RECONFIG_S2_FRAME:
-+	case IRS1125_CID_SAFE_RECONFIG_S3_EXPO:
-+	case IRS1125_CID_SAFE_RECONFIG_S3_FRAME:
-+	case IRS1125_CID_SAFE_RECONFIG_S4_EXPO:
-+	case IRS1125_CID_SAFE_RECONFIG_S4_FRAME:
-+	case IRS1125_CID_SAFE_RECONFIG_S5_EXPO:
-+	case IRS1125_CID_SAFE_RECONFIG_S5_FRAME:
-+	case IRS1125_CID_SAFE_RECONFIG_S6_EXPO:
-+	case IRS1125_CID_SAFE_RECONFIG_S6_FRAME:
-+	case IRS1125_CID_SAFE_RECONFIG_S7_EXPO:
-+	case IRS1125_CID_SAFE_RECONFIG_S7_FRAME:
-+	case IRS1125_CID_SAFE_RECONFIG_S8_EXPO:
-+	case IRS1125_CID_SAFE_RECONFIG_S8_FRAME:
-+	case IRS1125_CID_SAFE_RECONFIG_S9_EXPO:
-+	case IRS1125_CID_SAFE_RECONFIG_S9_FRAME:
-+	case IRS1125_CID_SAFE_RECONFIG_S10_EXPO:
-+	case IRS1125_CID_SAFE_RECONFIG_S10_FRAME:
-+	case IRS1125_CID_SAFE_RECONFIG_S11_EXPO:
-+	case IRS1125_CID_SAFE_RECONFIG_S11_FRAME:
-+	case IRS1125_CID_SAFE_RECONFIG_S12_EXPO:
-+	case IRS1125_CID_SAFE_RECONFIG_S12_FRAME:
-+	case IRS1125_CID_SAFE_RECONFIG_S13_EXPO:
-+	case IRS1125_CID_SAFE_RECONFIG_S13_FRAME:
-+	case IRS1125_CID_SAFE_RECONFIG_S14_EXPO:
-+	case IRS1125_CID_SAFE_RECONFIG_S14_FRAME:
-+	case IRS1125_CID_SAFE_RECONFIG_S15_EXPO:
-+	case IRS1125_CID_SAFE_RECONFIG_S15_FRAME:
-+	case IRS1125_CID_SAFE_RECONFIG_S16_EXPO:
-+	case IRS1125_CID_SAFE_RECONFIG_S16_FRAME:
-+	case IRS1125_CID_SAFE_RECONFIG_S17_EXPO:
-+	case IRS1125_CID_SAFE_RECONFIG_S17_FRAME:
-+	case IRS1125_CID_SAFE_RECONFIG_S18_EXPO:
-+	case IRS1125_CID_SAFE_RECONFIG_S18_FRAME:
-+	case IRS1125_CID_SAFE_RECONFIG_S19_EXPO:
-+	case IRS1125_CID_SAFE_RECONFIG_S19_FRAME: {
-+		unsigned int offset = ctrl->id -
-+			IRS1125_CID_SAFE_RECONFIG_S0_EXPO;
-+
-+		err = irs1125_write(&dev->sd,
-+				    IRS1125_REG_SAFE_RECONFIG + offset,
-+				    ctrl->val);
- 		break;
- 	}
- 	case IRS1125_CID_MOD_PLL:
-@@ -655,40 +722,40 @@ static int irs1125_s_ctrl(struct v4l2_ct
- 			}
- 		}
- 		break;
--	case IRS1125_CID_SEQ_CONFIG:
-+	case IRS1125_CID_SEQ_CONFIG: {
-+		struct irs1125_seq_cfg *cfg_new;
-+
- 		cfg_new = (struct irs1125_seq_cfg *)ctrl->p_new.p;
--		cfg_cur = (struct irs1125_seq_cfg *)ctrl->p_cur.p;
- 		for (i = 0; i < IRS1125_NUM_SEQ_ENTRIES; i++) {
--			if (cfg_cur[i].exposure != cfg_new[i].exposure)	{
--				addr = IRS1125_REG_DMEM_SHADOW + i * 4;
--				val = cfg_new[i].exposure;
--				err = irs1125_write(&dev->sd, addr, val);
--				if (err < 0)
--					break;
--			}
--			if (cfg_cur[i].framerate != cfg_new[i].framerate) {
--				addr = IRS1125_REG_DMEM_SHADOW + 1 + i * 4;
--				val = cfg_new[i].framerate;
--				err = irs1125_write(&dev->sd, addr, val);
--				if (err < 0)
--					break;
--			}
--			if (cfg_cur[i].ps != cfg_new[i].ps) {
--				addr = IRS1125_REG_DMEM_SHADOW + 2 + i * 4;
--				val = cfg_new[i].ps;
--				err = irs1125_write(&dev->sd, addr, val);
--				if (err < 0)
--					break;
--			}
--			if (cfg_cur[i].pll != cfg_new[i].pll) {
--				addr = IRS1125_REG_DMEM_SHADOW + 3 + i * 4;
--				val = cfg_new[i].pll;
--				err = irs1125_write(&dev->sd, addr, val);
--				if (err < 0)
--					break;
--			}
-+			unsigned int seq_offset = i * 4;
-+			u16 addr, val;
-+
-+			addr = IRS1125_REG_DMEM_SHADOW + seq_offset;
-+			val = cfg_new[i].exposure;
-+			err = irs1125_write(&dev->sd, addr, val);
-+			if (err < 0)
-+				break;
-+
-+			addr = IRS1125_REG_DMEM_SHADOW + 1 + seq_offset;
-+			val = cfg_new[i].framerate;
-+			err = irs1125_write(&dev->sd, addr, val);
-+			if (err < 0)
-+				break;
-+
-+			addr = IRS1125_REG_DMEM_SHADOW + 2 + seq_offset;
-+			val = cfg_new[i].ps;
-+			err = irs1125_write(&dev->sd, addr, val);
-+			if (err < 0)
-+				break;
-+
-+			addr = IRS1125_REG_DMEM_SHADOW + 3 + seq_offset;
-+			val = cfg_new[i].pll;
-+			err = irs1125_write(&dev->sd, addr, val);
-+			if (err < 0)
-+				break;
- 		}
- 		break;
-+	}
- 	case IRS1125_CID_NUM_SEQS:
- 		err = irs1125_write(&dev->sd, 0xA88D, ctrl->val - 1);
- 		if (err >= 0)
-@@ -760,19 +827,6 @@ static const struct v4l2_ctrl_config irs
- 			IRS1125_NUM_MOD_PLLS}
- 	}, {
- 		.ops = &irs1125_ctrl_ops,
--		.id = IRS1125_CID_SAFE_RECONFIG,
--		.name = "Change exposure and pause of single seq",
--		.type = V4L2_CTRL_TYPE_U16,
--		.flags = V4L2_CTRL_FLAG_HAS_PAYLOAD,
--		.min = 0,
--		.max = U16_MAX,
--		.step = 1,
--		.def = 0,
--		.elem_size = sizeof(u16),
--		.dims = {sizeof(struct irs1125_illu) / sizeof(u16),
--			IRS1125_NUM_SEQ_ENTRIES}
--	}, {
--		.ops = &irs1125_ctrl_ops,
- 		.id = IRS1125_CID_SEQ_CONFIG,
- 		.name = "Change sequence settings",
- 		.type = V4L2_CTRL_TYPE_U16,
-@@ -900,9 +954,16 @@ static int irs1125_ctrls_init(struct irs
- {
- 	struct v4l2_ctrl *ctrl;
- 	int err, i;
--	struct v4l2_ctrl_handler *hdl;
-+	struct v4l2_ctrl_handler *hdl = &sensor->ctrl_handler;
-+	struct v4l2_ctrl_config ctrl_cfg = {
-+		.ops = &irs1125_ctrl_ops,
-+		.type = V4L2_CTRL_TYPE_INTEGER,
-+		.min = 0,
-+		.max = U16_MAX,
-+		.step = 1,
-+		.def = 0x1000
-+	};
- 
--	hdl = &sensor->ctrl_handler;
- 	v4l2_ctrl_handler_init(hdl, ARRAY_SIZE(irs1125_custom_ctrls));
- 
- 	for (i = 0; i < ARRAY_SIZE(irs1125_custom_ctrls); i++)	{
-@@ -923,6 +984,27 @@ static int irs1125_ctrls_init(struct irs
- 		goto error_ctrls;
- 	}
- 
-+	for (i = 0; i < IRS1125_NUM_SEQ_ENTRIES; i++) {
-+		ctrl_cfg.name = expo_ctrl_names[i];
-+		ctrl_cfg.id = IRS1125_CID_SAFE_RECONFIG_S0_EXPO + i * 2;
-+		ctrl = v4l2_ctrl_new_custom(hdl, &ctrl_cfg,
-+					    NULL);
-+		if (!ctrl)
-+			dev_err(dev, "Failed to init exposure control %s\n",
-+				ctrl_cfg.name);
-+	}
-+
-+	ctrl_cfg.def = 0;
-+	for (i = 0; i < IRS1125_NUM_SEQ_ENTRIES; i++) {
-+		ctrl_cfg.name = frame_ctrl_names[i];
-+		ctrl_cfg.id = IRS1125_CID_SAFE_RECONFIG_S0_FRAME + i * 2;
-+		ctrl = v4l2_ctrl_new_custom(hdl, &ctrl_cfg,
-+					    NULL);
-+		if (!ctrl)
-+			dev_err(dev, "Failed to init framerate control %s\n",
-+				ctrl_cfg.name);
-+	}
-+
- 	sensor->sd.ctrl_handler = hdl;
- 	return 0;
- 
---- a/drivers/media/i2c/irs1125.h
-+++ b/drivers/media/i2c/irs1125.h
-@@ -21,18 +21,57 @@
- #define IRS1125_NUM_SEQ_ENTRIES 20
- #define IRS1125_NUM_MOD_PLLS 4
- 
--#define IRS1125_CID_CUSTOM_BASE        (V4L2_CID_USER_BASE | 0xf000)
--#define IRS1125_CID_SAFE_RECONFIG      (IRS1125_CID_CUSTOM_BASE + 0)
--#define IRS1125_CID_CONTINUOUS_TRIG    (IRS1125_CID_CUSTOM_BASE + 1)
--#define IRS1125_CID_TRIGGER            (IRS1125_CID_CUSTOM_BASE + 2)
--#define IRS1125_CID_RECONFIG           (IRS1125_CID_CUSTOM_BASE + 3)
--#define IRS1125_CID_ILLU_ON            (IRS1125_CID_CUSTOM_BASE + 4)
--#define IRS1125_CID_NUM_SEQS           (IRS1125_CID_CUSTOM_BASE + 5)
--#define IRS1125_CID_MOD_PLL            (IRS1125_CID_CUSTOM_BASE + 6)
--#define IRS1125_CID_SEQ_CONFIG         (IRS1125_CID_CUSTOM_BASE + 7)
--#define IRS1125_CID_IDENT0             (IRS1125_CID_CUSTOM_BASE + 8)
--#define IRS1125_CID_IDENT1             (IRS1125_CID_CUSTOM_BASE + 9)
--#define IRS1125_CID_IDENT2             (IRS1125_CID_CUSTOM_BASE + 10)
-+#define IRS1125_CID_CUSTOM_BASE			(V4L2_CID_USER_BASE | 0xf000)
-+#define IRS1125_CID_CONTINUOUS_TRIG		(IRS1125_CID_CUSTOM_BASE + 1)
-+#define IRS1125_CID_TRIGGER			(IRS1125_CID_CUSTOM_BASE + 2)
-+#define IRS1125_CID_RECONFIG			(IRS1125_CID_CUSTOM_BASE + 3)
-+#define IRS1125_CID_ILLU_ON			(IRS1125_CID_CUSTOM_BASE + 4)
-+#define IRS1125_CID_NUM_SEQS			(IRS1125_CID_CUSTOM_BASE + 5)
-+#define IRS1125_CID_MOD_PLL			(IRS1125_CID_CUSTOM_BASE + 6)
-+#define IRS1125_CID_SEQ_CONFIG			(IRS1125_CID_CUSTOM_BASE + 7)
-+#define IRS1125_CID_IDENT0			(IRS1125_CID_CUSTOM_BASE + 8)
-+#define IRS1125_CID_IDENT1			(IRS1125_CID_CUSTOM_BASE + 9)
-+#define IRS1125_CID_IDENT2			(IRS1125_CID_CUSTOM_BASE + 10)
-+#define IRS1125_CID_SAFE_RECONFIG_S0_EXPO	(IRS1125_CID_CUSTOM_BASE + 11)
-+#define IRS1125_CID_SAFE_RECONFIG_S0_FRAME	(IRS1125_CID_CUSTOM_BASE + 12)
-+#define IRS1125_CID_SAFE_RECONFIG_S1_EXPO	(IRS1125_CID_CUSTOM_BASE + 13)
-+#define IRS1125_CID_SAFE_RECONFIG_S1_FRAME	(IRS1125_CID_CUSTOM_BASE + 14)
-+#define IRS1125_CID_SAFE_RECONFIG_S2_EXPO	(IRS1125_CID_CUSTOM_BASE + 15)
-+#define IRS1125_CID_SAFE_RECONFIG_S2_FRAME	(IRS1125_CID_CUSTOM_BASE + 16)
-+#define IRS1125_CID_SAFE_RECONFIG_S3_EXPO	(IRS1125_CID_CUSTOM_BASE + 17)
-+#define IRS1125_CID_SAFE_RECONFIG_S3_FRAME	(IRS1125_CID_CUSTOM_BASE + 18)
-+#define IRS1125_CID_SAFE_RECONFIG_S4_EXPO	(IRS1125_CID_CUSTOM_BASE + 19)
-+#define IRS1125_CID_SAFE_RECONFIG_S4_FRAME	(IRS1125_CID_CUSTOM_BASE + 20)
-+#define IRS1125_CID_SAFE_RECONFIG_S5_EXPO	(IRS1125_CID_CUSTOM_BASE + 21)
-+#define IRS1125_CID_SAFE_RECONFIG_S5_FRAME	(IRS1125_CID_CUSTOM_BASE + 22)
-+#define IRS1125_CID_SAFE_RECONFIG_S6_EXPO	(IRS1125_CID_CUSTOM_BASE + 23)
-+#define IRS1125_CID_SAFE_RECONFIG_S6_FRAME	(IRS1125_CID_CUSTOM_BASE + 24)
-+#define IRS1125_CID_SAFE_RECONFIG_S7_EXPO	(IRS1125_CID_CUSTOM_BASE + 25)
-+#define IRS1125_CID_SAFE_RECONFIG_S7_FRAME	(IRS1125_CID_CUSTOM_BASE + 26)
-+#define IRS1125_CID_SAFE_RECONFIG_S8_EXPO	(IRS1125_CID_CUSTOM_BASE + 27)
-+#define IRS1125_CID_SAFE_RECONFIG_S8_FRAME	(IRS1125_CID_CUSTOM_BASE + 28)
-+#define IRS1125_CID_SAFE_RECONFIG_S9_EXPO	(IRS1125_CID_CUSTOM_BASE + 29)
-+#define IRS1125_CID_SAFE_RECONFIG_S9_FRAME	(IRS1125_CID_CUSTOM_BASE + 30)
-+#define IRS1125_CID_SAFE_RECONFIG_S10_EXPO	(IRS1125_CID_CUSTOM_BASE + 31)
-+#define IRS1125_CID_SAFE_RECONFIG_S10_FRAME	(IRS1125_CID_CUSTOM_BASE + 32)
-+#define IRS1125_CID_SAFE_RECONFIG_S11_EXPO	(IRS1125_CID_CUSTOM_BASE + 33)
-+#define IRS1125_CID_SAFE_RECONFIG_S11_FRAME	(IRS1125_CID_CUSTOM_BASE + 34)
-+#define IRS1125_CID_SAFE_RECONFIG_S12_EXPO	(IRS1125_CID_CUSTOM_BASE + 35)
-+#define IRS1125_CID_SAFE_RECONFIG_S12_FRAME	(IRS1125_CID_CUSTOM_BASE + 36)
-+#define IRS1125_CID_SAFE_RECONFIG_S13_EXPO	(IRS1125_CID_CUSTOM_BASE + 37)
-+#define IRS1125_CID_SAFE_RECONFIG_S13_FRAME	(IRS1125_CID_CUSTOM_BASE + 38)
-+#define IRS1125_CID_SAFE_RECONFIG_S14_EXPO	(IRS1125_CID_CUSTOM_BASE + 39)
-+#define IRS1125_CID_SAFE_RECONFIG_S14_FRAME	(IRS1125_CID_CUSTOM_BASE + 40)
-+#define IRS1125_CID_SAFE_RECONFIG_S15_EXPO	(IRS1125_CID_CUSTOM_BASE + 41)
-+#define IRS1125_CID_SAFE_RECONFIG_S15_FRAME	(IRS1125_CID_CUSTOM_BASE + 42)
-+#define IRS1125_CID_SAFE_RECONFIG_S16_EXPO	(IRS1125_CID_CUSTOM_BASE + 43)
-+#define IRS1125_CID_SAFE_RECONFIG_S16_FRAME	(IRS1125_CID_CUSTOM_BASE + 44)
-+#define IRS1125_CID_SAFE_RECONFIG_S17_EXPO	(IRS1125_CID_CUSTOM_BASE + 45)
-+#define IRS1125_CID_SAFE_RECONFIG_S17_FRAME	(IRS1125_CID_CUSTOM_BASE + 46)
-+#define IRS1125_CID_SAFE_RECONFIG_S18_EXPO	(IRS1125_CID_CUSTOM_BASE + 47)
-+#define IRS1125_CID_SAFE_RECONFIG_S18_FRAME	(IRS1125_CID_CUSTOM_BASE + 48)
-+#define IRS1125_CID_SAFE_RECONFIG_S19_EXPO	(IRS1125_CID_CUSTOM_BASE + 49)
-+#define IRS1125_CID_SAFE_RECONFIG_S19_FRAME	(IRS1125_CID_CUSTOM_BASE + 50)
- 
- struct irs1125_seq_cfg {
- 	__u16 exposure;
-@@ -41,11 +80,6 @@ struct irs1125_seq_cfg {
- 	__u16 pll;
- };
- 
--struct irs1125_illu {
--	__u16 exposure;
--	__u16 framerate;
--};
--
- struct irs1125_mod_pll {
- 	__u16 pllcfg1;
- 	__u16 pllcfg2;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0244-media-irs1125-Keep-HW-in-sync-after-imager-reset.patch b/target/linux/bcm27xx/patches-6.1/950-0244-media-irs1125-Keep-HW-in-sync-after-imager-reset.patch
deleted file mode 100644
index 6975ff5b19..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0244-media-irs1125-Keep-HW-in-sync-after-imager-reset.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-From 4ae4ea08f58f394a82b99417230ce63ce53e68e3 Mon Sep 17 00:00:00 2001
-From: Markus Proeller <markus.proeller@pieye.org>
-Date: Tue, 16 Jun 2020 13:33:56 +0200
-Subject: [PATCH] media: irs1125: Keep HW in sync after imager reset
-
-When closing the video device, the irs1125 is put in power down state.
-To keep V4L2 ctrls and the HW in sync, v4l2_ctrl_handler_setup is
-called after power up.
-
-The compound ctrl IRS1125_CID_MOD_PLL however has a default value
-of all zeros, which puts the imager into a non responding state.
-Thus, this ctrl is not written by the driver into HW after power up.
-The userspace has to take care to write senseful data.
-
-Signed-off-by: Markus Proeller <markus.proeller@pieye.org>
----
- drivers/media/i2c/irs1125.c | 121 +++++++++++++++++-------------------
- 1 file changed, 58 insertions(+), 63 deletions(-)
-
---- a/drivers/media/i2c/irs1125.c
-+++ b/drivers/media/i2c/irs1125.c
-@@ -82,6 +82,7 @@ struct irs1125 {
- 	struct v4l2_ctrl *ctrl_numseq;
- 
- 	int power_count;
-+	bool mod_pll_init;
- };
- 
- static inline struct irs1125 *to_state(struct v4l2_subdev *sd)
-@@ -276,8 +277,7 @@ static struct regval_list irs1125_seq_cf
- 	{0xC039, 0x0000},
- 	{0xC401, 0x0002},
- 
--	{0xFFFF, 1},
--	{0xA87C, 0x0001}
-+	{0xFFFF, 1}
- };
- 
- static int irs1125_write(struct v4l2_subdev *sd, u16 reg, u16 val)
-@@ -471,7 +471,11 @@ static int __sensor_init(struct v4l2_sub
- 		return ret;
- 	}
- 
--	return 0;
-+	irs1125->mod_pll_init = true;
-+	v4l2_ctrl_handler_setup(&irs1125->ctrl_handler);
-+	irs1125->mod_pll_init = false;
-+
-+	return irs1125_write(sd, 0xA87C, 0x0001);
- }
- 
- static int irs1125_sensor_power(struct v4l2_subdev *sd, int on)
-@@ -607,8 +611,6 @@ static int irs1125_s_ctrl(struct v4l2_ct
- 	struct irs1125 *dev = container_of(ctrl->handler,
- 					struct irs1125, ctrl_handler);
- 	struct i2c_client *client = v4l2_get_subdevdata(&dev->sd);
--	struct irs1125_mod_pll *mod_cur, *mod_new;
--	u16 addr, val;
- 	int err = 0, i;
- 
- 	switch (ctrl->id) {
-@@ -660,68 +662,61 @@ static int irs1125_s_ctrl(struct v4l2_ct
- 				    ctrl->val);
- 		break;
- 	}
--	case IRS1125_CID_MOD_PLL:
-+	case IRS1125_CID_MOD_PLL: {
-+		struct irs1125_mod_pll *mod_new;
-+
-+		if (dev->mod_pll_init)
-+			break;
-+
- 		mod_new = (struct irs1125_mod_pll *)ctrl->p_new.p;
--		mod_cur = (struct irs1125_mod_pll *)ctrl->p_cur.p;
- 		for (i = 0; i < IRS1125_NUM_MOD_PLLS; i++) {
--			if (mod_cur[i].pllcfg1 != mod_new[i].pllcfg1) {
--				addr = 0xC3A0 + i * 3;
--				val = mod_new[i].pllcfg1;
--				err = irs1125_write(&dev->sd, addr, val);
--				if (err < 0)
--					break;
--			}
--			if (mod_cur[i].pllcfg2 != mod_new[i].pllcfg2) {
--				addr = 0xC3A1 + i * 3;
--				val = mod_new[i].pllcfg2;
--				err = irs1125_write(&dev->sd, addr, val);
--				if (err < 0)
--					break;
--			}
--			if (mod_cur[i].pllcfg3 != mod_new[i].pllcfg3) {
--				addr = 0xC3A2 + i * 3;
--				val = mod_new[i].pllcfg3;
--				err = irs1125_write(&dev->sd, addr, val);
--				if (err < 0)
--					break;
--			}
--			if (mod_cur[i].pllcfg4 != mod_new[i].pllcfg4) {
--				addr = 0xC24C + i * 5;
--				val = mod_new[i].pllcfg4;
--				err = irs1125_write(&dev->sd, addr, val);
--				if (err < 0)
--					break;
--			}
--			if (mod_cur[i].pllcfg5 != mod_new[i].pllcfg5) {
--				addr = 0xC24D + i * 5;
--				val = mod_new[i].pllcfg5;
--				err = irs1125_write(&dev->sd, addr, val);
--				if (err < 0)
--					break;
--			}
--			if (mod_cur[i].pllcfg6 != mod_new[i].pllcfg6) {
--				addr = 0xC24E + i * 5;
--				val = mod_new[i].pllcfg6;
--				err = irs1125_write(&dev->sd, addr, val);
--				if (err < 0)
--					break;
--			}
--			if (mod_cur[i].pllcfg7 != mod_new[i].pllcfg7) {
--				addr = 0xC24F + i * 5;
--				val = mod_new[i].pllcfg7;
--				err = irs1125_write(&dev->sd, addr, val);
--				if (err < 0)
--					break;
--			}
--			if (mod_cur[i].pllcfg8 != mod_new[i].pllcfg8) {
--				addr = 0xC250 + i * 5;
--				val = mod_new[i].pllcfg8;
--				err = irs1125_write(&dev->sd, addr, val);
--				if (err < 0)
--					break;
--			}
-+			unsigned int pll_offset, ssc_offset;
-+
-+			pll_offset = i * 3;
-+			ssc_offset = i * 5;
-+
-+			err = irs1125_write(&dev->sd, 0xC3A0 + pll_offset,
-+					    mod_new[i].pllcfg1);
-+			if (err < 0)
-+				break;
-+
-+			err = irs1125_write(&dev->sd, 0xC3A1 + pll_offset,
-+					    mod_new[i].pllcfg2);
-+			if (err < 0)
-+				break;
-+
-+			err = irs1125_write(&dev->sd, 0xC3A2 + pll_offset,
-+					    mod_new[i].pllcfg3);
-+			if (err < 0)
-+				break;
-+
-+			err = irs1125_write(&dev->sd, 0xC24C + ssc_offset,
-+					    mod_new[i].pllcfg4);
-+			if (err < 0)
-+				break;
-+
-+			err = irs1125_write(&dev->sd, 0xC24D + ssc_offset,
-+					    mod_new[i].pllcfg5);
-+			if (err < 0)
-+				break;
-+
-+			err = irs1125_write(&dev->sd, 0xC24E + ssc_offset,
-+					    mod_new[i].pllcfg6);
-+			if (err < 0)
-+				break;
-+
-+			err = irs1125_write(&dev->sd, 0xC24F + ssc_offset,
-+					    mod_new[i].pllcfg7);
-+			if (err < 0)
-+				break;
-+
-+			err = irs1125_write(&dev->sd, 0xC250 + ssc_offset,
-+					    mod_new[i].pllcfg8);
-+			if (err < 0)
-+				break;
- 		}
- 		break;
-+	}
- 	case IRS1125_CID_SEQ_CONFIG: {
- 		struct irs1125_seq_cfg *cfg_new;
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0245-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch b/target/linux/bcm27xx/patches-6.1/950-0245-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch
deleted file mode 100644
index 8f383ece2b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0245-media-bcm2835-unicam-Driver-for-CCP2-CSI2-camera-int.patch
+++ /dev/null
@@ -1,3158 +0,0 @@
-From 5f6585179d2779f98e83d1cedf780b51aef1e924 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Mon, 4 May 2020 12:25:41 +0300
-Subject: [PATCH] media: bcm2835-unicam: Driver for CCP2/CSI2 camera
- interface
-
-Add a driver for the Unicam camera receiver block on BCM283x processors.
-Compared to the bcm2835-camera driver present in staging, this driver
-handles the Unicam block only (CSI-2 receiver), and doesn't depend on
-the VC4 firmware running on the VPU.
-
-The commit is made up of a series of changes cherry-picked from the
-rpi-5.4.y branch of https://github.com/raspberrypi/linux/ with
-additional enhancements, forward-ported to the mainline kernel.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Reported-by: kbuild test robot <lkp@intel.com>
----
- MAINTAINERS                                   |    2 +-
- drivers/media/platform/bcm2835/Kconfig        |   21 +
- drivers/media/platform/bcm2835/Makefile       |    3 +
- .../media/platform/bcm2835/bcm2835-unicam.c   | 2827 +++++++++++++++++
- .../media/platform/bcm2835/vc4-regs-unicam.h  |  253 ++
- 5 files changed, 3105 insertions(+), 1 deletion(-)
- create mode 100644 drivers/media/platform/bcm2835/Kconfig
- create mode 100644 drivers/media/platform/bcm2835/Makefile
- create mode 100644 drivers/media/platform/bcm2835/bcm2835-unicam.c
- create mode 100644 drivers/media/platform/bcm2835/vc4-regs-unicam.h
-
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -4042,7 +4042,7 @@ M:	Dave Stevenson <dave.stevenson@raspbe
- L:	linux-media@vger.kernel.org
- S:	Maintained
- F:	drivers/media/platform/bcm2835/
--F:	Documentation/devicetree/bindings/media/bcm2835-unicam.txt
-+F:	Documentation/devicetree/bindings/media/brcm,bcm2835-unicam.yaml
- 
- BROADCOM BCM47XX MIPS ARCHITECTURE
- M:	Hauke Mehrtens <hauke@hauke-m.de>
---- /dev/null
-+++ b/drivers/media/platform/bcm2835/Kconfig
-@@ -0,0 +1,21 @@
-+# Broadcom VideoCore4 V4L2 camera support
-+
-+config VIDEO_BCM2835_UNICAM
-+	tristate "Broadcom BCM283x/BCM271x Unicam video capture driver"
-+	depends on VIDEO_DEV
-+	depends on ARCH_BCM2835 || COMPILE_TEST
-+	select VIDEO_V4L2_SUBDEV_API
-+	select MEDIA_CONTROLLER
-+	select VIDEOBUF2_DMA_CONTIG
-+	select V4L2_FWNODE
-+	help
-+	  Say Y here to enable support for the BCM283x/BCM271x CSI-2 receiver.
-+	  This is a V4L2 driver that controls the CSI-2 receiver directly,
-+	  independently from the VC4 firmware.
-+	  This driver is mutually exclusive with the use of bcm2835-camera. The
-+	  firmware will disable all access to the peripheral from within the
-+	  firmware if it finds a DT node using it, and bcm2835-camera will
-+	  therefore fail to probe.
-+
-+	  To compile this driver as a module, choose M here. The module will be
-+	  called bcm2835-unicam.
---- /dev/null
-+++ b/drivers/media/platform/bcm2835/Makefile
-@@ -0,0 +1,3 @@
-+# Makefile for BCM2835 Unicam driver
-+
-+obj-$(CONFIG_VIDEO_BCM2835_UNICAM) += bcm2835-unicam.o
---- /dev/null
-+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -0,0 +1,2827 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+/*
-+ * BCM2835 Unicam Capture Driver
-+ *
-+ * Copyright (C) 2017-2020 - Raspberry Pi (Trading) Ltd.
-+ *
-+ * Dave Stevenson <dave.stevenson@raspberrypi.com>
-+ *
-+ * Based on TI am437x driver by
-+ *   Benoit Parrot <bparrot@ti.com>
-+ *   Lad, Prabhakar <prabhakar.csengg@gmail.com>
-+ *
-+ * and TI CAL camera interface driver by
-+ *    Benoit Parrot <bparrot@ti.com>
-+ *
-+ *
-+ * There are two camera drivers in the kernel for BCM283x - this one
-+ * and bcm2835-camera (currently in staging).
-+ *
-+ * This driver directly controls the Unicam peripheral - there is no
-+ * involvement with the VideoCore firmware. Unicam receives CSI-2 or
-+ * CCP2 data and writes it into SDRAM.
-+ * The only potential processing options are to repack Bayer data into an
-+ * alternate format, and applying windowing.
-+ * The repacking does not shift the data, so can repack V4L2_PIX_FMT_Sxxxx10P
-+ * to V4L2_PIX_FMT_Sxxxx10, or V4L2_PIX_FMT_Sxxxx12P to V4L2_PIX_FMT_Sxxxx12,
-+ * but not generically up to V4L2_PIX_FMT_Sxxxx16. The driver will add both
-+ * formats where the relevant formats are defined, and will automatically
-+ * configure the repacking as required.
-+ * Support for windowing may be added later.
-+ *
-+ * It should be possible to connect this driver to any sensor with a
-+ * suitable output interface and V4L2 subdevice driver.
-+ *
-+ * bcm2835-camera uses the VideoCore firmware to control the sensor,
-+ * Unicam, ISP, and all tuner control loops. Fully processed frames are
-+ * delivered to the driver by the firmware. It only has sensor drivers
-+ * for Omnivision OV5647, and Sony IMX219 sensors.
-+ *
-+ * The two drivers are mutually exclusive for the same Unicam instance.
-+ * The VideoCore firmware checks the device tree configuration during boot.
-+ * If it finds device tree nodes called csi0 or csi1 it will block the
-+ * firmware from accessing the peripheral, and bcm2835-camera will
-+ * not be able to stream data.
-+ */
-+
-+#include <linux/clk.h>
-+#include <linux/delay.h>
-+#include <linux/device.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/err.h>
-+#include <linux/init.h>
-+#include <linux/interrupt.h>
-+#include <linux/io.h>
-+#include <linux/module.h>
-+#include <linux/of_device.h>
-+#include <linux/of_graph.h>
-+#include <linux/pinctrl/consumer.h>
-+#include <linux/platform_device.h>
-+#include <linux/pm_runtime.h>
-+#include <linux/slab.h>
-+#include <linux/uaccess.h>
-+#include <linux/videodev2.h>
-+
-+#include <media/v4l2-common.h>
-+#include <media/v4l2-ctrls.h>
-+#include <media/v4l2-dev.h>
-+#include <media/v4l2-device.h>
-+#include <media/v4l2-dv-timings.h>
-+#include <media/v4l2-event.h>
-+#include <media/v4l2-ioctl.h>
-+#include <media/v4l2-fwnode.h>
-+#include <media/videobuf2-dma-contig.h>
-+
-+#include <media/v4l2-async.h>
-+
-+#include "vc4-regs-unicam.h"
-+
-+#define UNICAM_MODULE_NAME	"unicam"
-+#define UNICAM_VERSION		"0.1.0"
-+
-+static int debug;
-+module_param(debug, int, 0644);
-+MODULE_PARM_DESC(debug, "Debug level 0-3");
-+
-+#define unicam_dbg(level, dev, fmt, arg...)	\
-+		v4l2_dbg(level, debug, &(dev)->v4l2_dev, fmt, ##arg)
-+#define unicam_info(dev, fmt, arg...)	\
-+		v4l2_info(&(dev)->v4l2_dev, fmt, ##arg)
-+#define unicam_err(dev, fmt, arg...)	\
-+		v4l2_err(&(dev)->v4l2_dev, fmt, ##arg)
-+
-+/*
-+ * To protect against a dodgy sensor driver never returning an error from
-+ * enum_mbus_code, set a maximum index value to be used.
-+ */
-+#define MAX_ENUM_MBUS_CODE	128
-+
-+/*
-+ * Stride is a 16 bit register, but also has to be a multiple of 32.
-+ */
-+#define BPL_ALIGNMENT		32
-+#define MAX_BYTESPERLINE	((1 << 16) - BPL_ALIGNMENT)
-+/*
-+ * Max width is therefore determined by the max stride divided by
-+ * the number of bits per pixel. Take 32bpp as a
-+ * worst case.
-+ * No imposed limit on the height, so adopt a square image for want
-+ * of anything better.
-+ */
-+#define MAX_WIDTH		(MAX_BYTESPERLINE / 4)
-+#define MAX_HEIGHT		MAX_WIDTH
-+/* Define a nominal minimum image size */
-+#define MIN_WIDTH		16
-+#define MIN_HEIGHT		16
-+/* Default size of the embedded buffer */
-+#define UNICAM_EMBEDDED_SIZE	8192
-+
-+/*
-+ * Size of the dummy buffer. Can be any size really, but the DMA
-+ * allocation works in units of page sizes.
-+ */
-+#define DUMMY_BUF_SIZE		(PAGE_SIZE)
-+
-+enum pad_types {
-+	IMAGE_PAD,
-+	METADATA_PAD,
-+	MAX_NODES
-+};
-+
-+/*
-+ * struct unicam_fmt - Unicam media bus format information
-+ * @pixelformat: V4L2 pixel format FCC identifier. 0 if n/a.
-+ * @repacked_fourcc: V4L2 pixel format FCC identifier if the data is expanded
-+ * out to 16bpp. 0 if n/a.
-+ * @code: V4L2 media bus format code.
-+ * @depth: Bits per pixel as delivered from the source.
-+ * @csi_dt: CSI data type.
-+ * @check_variants: Flag to denote that there are multiple mediabus formats
-+ *		still in the list that could match this V4L2 format.
-+ */
-+struct unicam_fmt {
-+	u32	fourcc;
-+	u32	repacked_fourcc;
-+	u32	code;
-+	u8	depth;
-+	u8	csi_dt;
-+	u8	check_variants;
-+};
-+
-+static const struct unicam_fmt formats[] = {
-+	/* YUV Formats */
-+	{
-+		.fourcc		= V4L2_PIX_FMT_YUYV,
-+		.code		= MEDIA_BUS_FMT_YUYV8_2X8,
-+		.depth		= 16,
-+		.csi_dt		= 0x1e,
-+		.check_variants = 1,
-+	}, {
-+		.fourcc		= V4L2_PIX_FMT_UYVY,
-+		.code		= MEDIA_BUS_FMT_UYVY8_2X8,
-+		.depth		= 16,
-+		.csi_dt		= 0x1e,
-+		.check_variants = 1,
-+	}, {
-+		.fourcc		= V4L2_PIX_FMT_YVYU,
-+		.code		= MEDIA_BUS_FMT_YVYU8_2X8,
-+		.depth		= 16,
-+		.csi_dt		= 0x1e,
-+		.check_variants = 1,
-+	}, {
-+		.fourcc		= V4L2_PIX_FMT_VYUY,
-+		.code		= MEDIA_BUS_FMT_VYUY8_2X8,
-+		.depth		= 16,
-+		.csi_dt		= 0x1e,
-+		.check_variants = 1,
-+	}, {
-+		.fourcc		= V4L2_PIX_FMT_YUYV,
-+		.code		= MEDIA_BUS_FMT_YUYV8_1X16,
-+		.depth		= 16,
-+		.csi_dt		= 0x1e,
-+	}, {
-+		.fourcc		= V4L2_PIX_FMT_UYVY,
-+		.code		= MEDIA_BUS_FMT_UYVY8_1X16,
-+		.depth		= 16,
-+		.csi_dt		= 0x1e,
-+	}, {
-+		.fourcc		= V4L2_PIX_FMT_YVYU,
-+		.code		= MEDIA_BUS_FMT_YVYU8_1X16,
-+		.depth		= 16,
-+		.csi_dt		= 0x1e,
-+	}, {
-+		.fourcc		= V4L2_PIX_FMT_VYUY,
-+		.code		= MEDIA_BUS_FMT_VYUY8_1X16,
-+		.depth		= 16,
-+		.csi_dt		= 0x1e,
-+	}, {
-+	/* RGB Formats */
-+		.fourcc		= V4L2_PIX_FMT_RGB565, /* gggbbbbb rrrrrggg */
-+		.code		= MEDIA_BUS_FMT_RGB565_2X8_LE,
-+		.depth		= 16,
-+		.csi_dt		= 0x22,
-+	}, {
-+		.fourcc		= V4L2_PIX_FMT_RGB565X, /* rrrrrggg gggbbbbb */
-+		.code		= MEDIA_BUS_FMT_RGB565_2X8_BE,
-+		.depth		= 16,
-+		.csi_dt		= 0x22
-+	}, {
-+		.fourcc		= V4L2_PIX_FMT_RGB555, /* gggbbbbb arrrrrgg */
-+		.code		= MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE,
-+		.depth		= 16,
-+		.csi_dt		= 0x21,
-+	}, {
-+		.fourcc		= V4L2_PIX_FMT_RGB555X, /* arrrrrgg gggbbbbb */
-+		.code		= MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE,
-+		.depth		= 16,
-+		.csi_dt		= 0x21,
-+	}, {
-+		.fourcc		= V4L2_PIX_FMT_RGB24, /* rgb */
-+		.code		= MEDIA_BUS_FMT_RGB888_1X24,
-+		.depth		= 24,
-+		.csi_dt		= 0x24,
-+	}, {
-+		.fourcc		= V4L2_PIX_FMT_BGR24, /* bgr */
-+		.code		= MEDIA_BUS_FMT_BGR888_1X24,
-+		.depth		= 24,
-+		.csi_dt		= 0x24,
-+	}, {
-+		.fourcc		= V4L2_PIX_FMT_RGB32, /* argb */
-+		.code		= MEDIA_BUS_FMT_ARGB8888_1X32,
-+		.depth		= 32,
-+		.csi_dt		= 0x0,
-+	}, {
-+	/* Bayer Formats */
-+		.fourcc		= V4L2_PIX_FMT_SBGGR8,
-+		.code		= MEDIA_BUS_FMT_SBGGR8_1X8,
-+		.depth		= 8,
-+		.csi_dt		= 0x2a,
-+	}, {
-+		.fourcc		= V4L2_PIX_FMT_SGBRG8,
-+		.code		= MEDIA_BUS_FMT_SGBRG8_1X8,
-+		.depth		= 8,
-+		.csi_dt		= 0x2a,
-+	}, {
-+		.fourcc		= V4L2_PIX_FMT_SGRBG8,
-+		.code		= MEDIA_BUS_FMT_SGRBG8_1X8,
-+		.depth		= 8,
-+		.csi_dt		= 0x2a,
-+	}, {
-+		.fourcc		= V4L2_PIX_FMT_SRGGB8,
-+		.code		= MEDIA_BUS_FMT_SRGGB8_1X8,
-+		.depth		= 8,
-+		.csi_dt		= 0x2a,
-+	}, {
-+		.fourcc		= V4L2_PIX_FMT_SBGGR10P,
-+		.repacked_fourcc = V4L2_PIX_FMT_SBGGR10,
-+		.code		= MEDIA_BUS_FMT_SBGGR10_1X10,
-+		.depth		= 10,
-+		.csi_dt		= 0x2b,
-+	}, {
-+		.fourcc		= V4L2_PIX_FMT_SGBRG10P,
-+		.repacked_fourcc = V4L2_PIX_FMT_SGBRG10,
-+		.code		= MEDIA_BUS_FMT_SGBRG10_1X10,
-+		.depth		= 10,
-+		.csi_dt		= 0x2b,
-+	}, {
-+		.fourcc		= V4L2_PIX_FMT_SGRBG10P,
-+		.repacked_fourcc = V4L2_PIX_FMT_SGRBG10,
-+		.code		= MEDIA_BUS_FMT_SGRBG10_1X10,
-+		.depth		= 10,
-+		.csi_dt		= 0x2b,
-+	}, {
-+		.fourcc		= V4L2_PIX_FMT_SRGGB10P,
-+		.repacked_fourcc = V4L2_PIX_FMT_SRGGB10,
-+		.code		= MEDIA_BUS_FMT_SRGGB10_1X10,
-+		.depth		= 10,
-+		.csi_dt		= 0x2b,
-+	}, {
-+		.fourcc		= V4L2_PIX_FMT_SBGGR12P,
-+		.repacked_fourcc = V4L2_PIX_FMT_SBGGR12,
-+		.code		= MEDIA_BUS_FMT_SBGGR12_1X12,
-+		.depth		= 12,
-+		.csi_dt		= 0x2c,
-+	}, {
-+		.fourcc		= V4L2_PIX_FMT_SGBRG12P,
-+		.repacked_fourcc = V4L2_PIX_FMT_SGBRG12,
-+		.code		= MEDIA_BUS_FMT_SGBRG12_1X12,
-+		.depth		= 12,
-+		.csi_dt		= 0x2c,
-+	}, {
-+		.fourcc		= V4L2_PIX_FMT_SGRBG12P,
-+		.repacked_fourcc = V4L2_PIX_FMT_SGRBG12,
-+		.code		= MEDIA_BUS_FMT_SGRBG12_1X12,
-+		.depth		= 12,
-+		.csi_dt		= 0x2c,
-+	}, {
-+		.fourcc		= V4L2_PIX_FMT_SRGGB12P,
-+		.repacked_fourcc = V4L2_PIX_FMT_SRGGB12,
-+		.code		= MEDIA_BUS_FMT_SRGGB12_1X12,
-+		.depth		= 12,
-+		.csi_dt		= 0x2c,
-+	}, {
-+		.fourcc		= V4L2_PIX_FMT_SBGGR14P,
-+		.code		= MEDIA_BUS_FMT_SBGGR14_1X14,
-+		.depth		= 14,
-+		.csi_dt		= 0x2d,
-+	}, {
-+		.fourcc		= V4L2_PIX_FMT_SGBRG14P,
-+		.code		= MEDIA_BUS_FMT_SGBRG14_1X14,
-+		.depth		= 14,
-+		.csi_dt		= 0x2d,
-+	}, {
-+		.fourcc		= V4L2_PIX_FMT_SGRBG14P,
-+		.code		= MEDIA_BUS_FMT_SGRBG14_1X14,
-+		.depth		= 14,
-+		.csi_dt		= 0x2d,
-+	}, {
-+		.fourcc		= V4L2_PIX_FMT_SRGGB14P,
-+		.code		= MEDIA_BUS_FMT_SRGGB14_1X14,
-+		.depth		= 14,
-+		.csi_dt		= 0x2d,
-+	}, {
-+	/*
-+	 * 16 bit Bayer formats could be supported, but there is no CSI2
-+	 * data_type defined for raw 16, and no sensors that produce it at
-+	 * present.
-+	 */
-+
-+	/* Greyscale formats */
-+		.fourcc		= V4L2_PIX_FMT_GREY,
-+		.code		= MEDIA_BUS_FMT_Y8_1X8,
-+		.depth		= 8,
-+		.csi_dt		= 0x2a,
-+	}, {
-+		.fourcc		= V4L2_PIX_FMT_Y10P,
-+		.repacked_fourcc = V4L2_PIX_FMT_Y10,
-+		.code		= MEDIA_BUS_FMT_Y10_1X10,
-+		.depth		= 10,
-+		.csi_dt		= 0x2b,
-+	}, {
-+		/* NB There is no packed V4L2 fourcc for this format. */
-+		.repacked_fourcc = V4L2_PIX_FMT_Y12,
-+		.code		= MEDIA_BUS_FMT_Y12_1X12,
-+		.depth		= 12,
-+		.csi_dt		= 0x2c,
-+	},
-+	/* Embedded data format */
-+	{
-+		.fourcc		= V4L2_META_FMT_SENSOR_DATA,
-+		.code		= MEDIA_BUS_FMT_SENSOR_DATA,
-+		.depth		= 8,
-+	}
-+};
-+
-+struct unicam_buffer {
-+	struct vb2_v4l2_buffer vb;
-+	struct list_head list;
-+};
-+
-+static inline struct unicam_buffer *to_unicam_buffer(struct vb2_buffer *vb)
-+{
-+	return container_of(vb, struct unicam_buffer, vb.vb2_buf);
-+}
-+
-+struct unicam_node {
-+	bool registered;
-+	int open;
-+	bool streaming;
-+	unsigned int pad_id;
-+	/* Pointer pointing to current v4l2_buffer */
-+	struct unicam_buffer *cur_frm;
-+	/* Pointer pointing to next v4l2_buffer */
-+	struct unicam_buffer *next_frm;
-+	/* video capture */
-+	const struct unicam_fmt *fmt;
-+	/* Used to store current pixel format */
-+	struct v4l2_format v_fmt;
-+	/* Used to store current mbus frame format */
-+	struct v4l2_mbus_framefmt m_fmt;
-+	/* Buffer queue used in video-buf */
-+	struct vb2_queue buffer_queue;
-+	/* Queue of filled frames */
-+	struct list_head dma_queue;
-+	/* IRQ lock for DMA queue */
-+	spinlock_t dma_queue_lock;
-+	/* lock used to access this structure */
-+	struct mutex lock;
-+	/* Identifies video device for this channel */
-+	struct video_device video_dev;
-+	/* Pointer to the parent handle */
-+	struct unicam_device *dev;
-+	struct media_pad pad;
-+	unsigned int embedded_lines;
-+	/*
-+	 * Dummy buffer intended to be used by unicam
-+	 * if we have no other queued buffers to swap to.
-+	 */
-+	void *dummy_buf_cpu_addr;
-+	dma_addr_t dummy_buf_dma_addr;
-+};
-+
-+struct unicam_device {
-+	struct kref kref;
-+
-+	/* V4l2 specific parameters */
-+	struct v4l2_async_subdev asd;
-+
-+	/* peripheral base address */
-+	void __iomem *base;
-+	/* clock gating base address */
-+	void __iomem *clk_gate_base;
-+	/* clock handle */
-+	struct clk *clock;
-+	/* V4l2 device */
-+	struct v4l2_device v4l2_dev;
-+	struct media_device mdev;
-+
-+	/* parent device */
-+	struct platform_device *pdev;
-+	/* subdevice async Notifier */
-+	struct v4l2_async_notifier notifier;
-+	unsigned int sequence;
-+
-+	/* ptr to  sub device */
-+	struct v4l2_subdev *sensor;
-+	/* Pad config for the sensor */
-+	struct v4l2_subdev_pad_config *sensor_config;
-+
-+	enum v4l2_mbus_type bus_type;
-+	/*
-+	 * Stores bus.mipi_csi2.flags for CSI2 sensors, or
-+	 * bus.mipi_csi1.strobe for CCP2.
-+	 */
-+	unsigned int bus_flags;
-+	unsigned int max_data_lanes;
-+	unsigned int active_data_lanes;
-+	bool sensor_embedded_data;
-+
-+	struct unicam_node node[MAX_NODES];
-+	struct v4l2_ctrl_handler ctrl_handler;
-+};
-+
-+static inline struct unicam_device *
-+to_unicam_device(struct v4l2_device *v4l2_dev)
-+{
-+	return container_of(v4l2_dev, struct unicam_device, v4l2_dev);
-+}
-+
-+/* Hardware access */
-+static inline void clk_write(struct unicam_device *dev, u32 val)
-+{
-+	writel(val | 0x5a000000, dev->clk_gate_base);
-+}
-+
-+static inline u32 reg_read(struct unicam_device *dev, u32 offset)
-+{
-+	return readl(dev->base + offset);
-+}
-+
-+static inline void reg_write(struct unicam_device *dev, u32 offset, u32 val)
-+{
-+	writel(val, dev->base + offset);
-+}
-+
-+static inline int get_field(u32 value, u32 mask)
-+{
-+	return (value & mask) >> __ffs(mask);
-+}
-+
-+static inline void set_field(u32 *valp, u32 field, u32 mask)
-+{
-+	u32 val = *valp;
-+
-+	val &= ~mask;
-+	val |= (field << __ffs(mask)) & mask;
-+	*valp = val;
-+}
-+
-+static inline u32 reg_read_field(struct unicam_device *dev, u32 offset,
-+				 u32 mask)
-+{
-+	return get_field(reg_read(dev, offset), mask);
-+}
-+
-+static inline void reg_write_field(struct unicam_device *dev, u32 offset,
-+				   u32 field, u32 mask)
-+{
-+	u32 val = reg_read(dev, offset);
-+
-+	set_field(&val, field, mask);
-+	reg_write(dev, offset, val);
-+}
-+
-+/* Power management functions */
-+static inline int unicam_runtime_get(struct unicam_device *dev)
-+{
-+	return pm_runtime_get_sync(&dev->pdev->dev);
-+}
-+
-+static inline void unicam_runtime_put(struct unicam_device *dev)
-+{
-+	pm_runtime_put_sync(&dev->pdev->dev);
-+}
-+
-+/* Format setup functions */
-+static const struct unicam_fmt *find_format_by_code(u32 code)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(formats); i++) {
-+		if (formats[i].code == code)
-+			return &formats[i];
-+	}
-+
-+	return NULL;
-+}
-+
-+static int check_mbus_format(struct unicam_device *dev,
-+			     const struct unicam_fmt *format)
-+{
-+	unsigned int i;
-+	int ret = 0;
-+
-+	for (i = 0; !ret && i < MAX_ENUM_MBUS_CODE; i++) {
-+		struct v4l2_subdev_mbus_code_enum mbus_code = {
-+			.index = i,
-+			.pad = IMAGE_PAD,
-+			.which = V4L2_SUBDEV_FORMAT_ACTIVE,
-+		};
-+
-+		ret = v4l2_subdev_call(dev->sensor, pad, enum_mbus_code,
-+				       NULL, &mbus_code);
-+
-+		if (!ret && mbus_code.code == format->code)
-+			return 1;
-+	}
-+
-+	return 0;
-+}
-+
-+static const struct unicam_fmt *find_format_by_pix(struct unicam_device *dev,
-+						   u32 pixelformat)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(formats); i++) {
-+		if (formats[i].fourcc == pixelformat ||
-+		    formats[i].repacked_fourcc == pixelformat) {
-+			if (formats[i].check_variants &&
-+			    !check_mbus_format(dev, &formats[i]))
-+				continue;
-+			return &formats[i];
-+		}
-+	}
-+
-+	return NULL;
-+}
-+
-+static inline unsigned int bytes_per_line(u32 width,
-+					  const struct unicam_fmt *fmt,
-+					  u32 v4l2_fourcc)
-+{
-+	if (v4l2_fourcc == fmt->repacked_fourcc)
-+		/* Repacking always goes to 16bpp */
-+		return ALIGN(width << 1, BPL_ALIGNMENT);
-+	else
-+		return ALIGN((width * fmt->depth) >> 3, BPL_ALIGNMENT);
-+}
-+
-+static int __subdev_get_format(struct unicam_device *dev,
-+			       struct v4l2_mbus_framefmt *fmt, int pad_id)
-+{
-+	struct v4l2_subdev_format sd_fmt = {
-+		.which = V4L2_SUBDEV_FORMAT_ACTIVE,
-+		.pad = pad_id
-+	};
-+	int ret;
-+
-+	ret = v4l2_subdev_call(dev->sensor, pad, get_fmt, dev->sensor_config,
-+			       &sd_fmt);
-+	if (ret < 0)
-+		return ret;
-+
-+	*fmt = sd_fmt.format;
-+
-+	unicam_dbg(1, dev, "%s %dx%d code:%04x\n", __func__,
-+		   fmt->width, fmt->height, fmt->code);
-+
-+	return 0;
-+}
-+
-+static int __subdev_set_format(struct unicam_device *dev,
-+			       struct v4l2_mbus_framefmt *fmt, int pad_id)
-+{
-+	struct v4l2_subdev_format sd_fmt = {
-+		.which = V4L2_SUBDEV_FORMAT_ACTIVE,
-+		.pad = pad_id
-+	};
-+	int ret;
-+
-+	sd_fmt.format = *fmt;
-+
-+	ret = v4l2_subdev_call(dev->sensor, pad, set_fmt, dev->sensor_config,
-+			       &sd_fmt);
-+	if (ret < 0)
-+		return ret;
-+
-+	*fmt = sd_fmt.format;
-+
-+	if (pad_id == IMAGE_PAD)
-+		unicam_dbg(1, dev, "%s %dx%d code:%04x\n", __func__, fmt->width,
-+			   fmt->height, fmt->code);
-+	else
-+		unicam_dbg(1, dev, "%s Embedded data code:%04x\n", __func__,
-+			   sd_fmt.format.code);
-+
-+	return 0;
-+}
-+
-+static int unicam_calc_format_size_bpl(struct unicam_device *dev,
-+				       const struct unicam_fmt *fmt,
-+				       struct v4l2_format *f)
-+{
-+	unsigned int min_bytesperline;
-+
-+	v4l_bound_align_image(&f->fmt.pix.width, MIN_WIDTH, MAX_WIDTH, 2,
-+			      &f->fmt.pix.height, MIN_HEIGHT, MAX_HEIGHT, 0,
-+			      0);
-+
-+	min_bytesperline = bytes_per_line(f->fmt.pix.width, fmt,
-+					  f->fmt.pix.pixelformat);
-+
-+	if (f->fmt.pix.bytesperline > min_bytesperline &&
-+	    f->fmt.pix.bytesperline <= MAX_BYTESPERLINE)
-+		f->fmt.pix.bytesperline = ALIGN(f->fmt.pix.bytesperline,
-+						BPL_ALIGNMENT);
-+	else
-+		f->fmt.pix.bytesperline = min_bytesperline;
-+
-+	f->fmt.pix.sizeimage = f->fmt.pix.height * f->fmt.pix.bytesperline;
-+
-+	unicam_dbg(3, dev, "%s: fourcc: %08X size: %dx%d bpl:%d img_size:%d\n",
-+		   __func__,
-+		   f->fmt.pix.pixelformat,
-+		   f->fmt.pix.width, f->fmt.pix.height,
-+		   f->fmt.pix.bytesperline, f->fmt.pix.sizeimage);
-+
-+	return 0;
-+}
-+
-+static int unicam_reset_format(struct unicam_node *node)
-+{
-+	struct unicam_device *dev = node->dev;
-+	struct v4l2_mbus_framefmt mbus_fmt;
-+	int ret;
-+
-+	if (dev->sensor_embedded_data || node->pad_id != METADATA_PAD) {
-+		ret = __subdev_get_format(dev, &mbus_fmt, node->pad_id);
-+		if (ret) {
-+			unicam_err(dev, "Failed to get_format - ret %d\n", ret);
-+			return ret;
-+		}
-+
-+		if (mbus_fmt.code != node->fmt->code) {
-+			unicam_err(dev, "code mismatch - fmt->code %08x, mbus_fmt.code %08x\n",
-+				   node->fmt->code, mbus_fmt.code);
-+			return ret;
-+		}
-+	}
-+
-+	if (node->pad_id == IMAGE_PAD) {
-+		v4l2_fill_pix_format(&node->v_fmt.fmt.pix, &mbus_fmt);
-+		node->v_fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+		unicam_calc_format_size_bpl(dev, node->fmt, &node->v_fmt);
-+	} else {
-+		node->v_fmt.type = V4L2_BUF_TYPE_META_CAPTURE;
-+		node->v_fmt.fmt.meta.dataformat = V4L2_META_FMT_SENSOR_DATA;
-+		if (dev->sensor_embedded_data) {
-+			node->v_fmt.fmt.meta.buffersize =
-+					mbus_fmt.width * mbus_fmt.height;
-+			node->embedded_lines = mbus_fmt.height;
-+		} else {
-+			node->v_fmt.fmt.meta.buffersize = UNICAM_EMBEDDED_SIZE;
-+			node->embedded_lines = 1;
-+		}
-+	}
-+
-+	node->m_fmt = mbus_fmt;
-+	return 0;
-+}
-+
-+static void unicam_wr_dma_addr(struct unicam_device *dev, dma_addr_t dmaaddr,
-+			       unsigned int buffer_size, int pad_id)
-+{
-+	dma_addr_t endaddr = dmaaddr + buffer_size;
-+
-+	/*
-+	 * dmaaddr and endaddr should be a 32-bit address with the top two bits
-+	 * set to 0x3 to signify uncached access through the Videocore memory
-+	 * controller.
-+	 */
-+	WARN_ON((dmaaddr >> 30) != 0x3 || (endaddr >> 30) != 0x3);
-+
-+	if (pad_id == IMAGE_PAD) {
-+		reg_write(dev, UNICAM_IBSA0, dmaaddr);
-+		reg_write(dev, UNICAM_IBEA0, endaddr);
-+	} else {
-+		reg_write(dev, UNICAM_DBSA0, dmaaddr);
-+		reg_write(dev, UNICAM_DBEA0, endaddr);
-+	}
-+}
-+
-+static inline unsigned int unicam_get_lines_done(struct unicam_device *dev)
-+{
-+	dma_addr_t start_addr, cur_addr;
-+	unsigned int stride = dev->node[IMAGE_PAD].v_fmt.fmt.pix.bytesperline;
-+	struct unicam_buffer *frm = dev->node[IMAGE_PAD].cur_frm;
-+
-+	if (!frm)
-+		return 0;
-+
-+	start_addr = vb2_dma_contig_plane_dma_addr(&frm->vb.vb2_buf, 0);
-+	cur_addr = reg_read(dev, UNICAM_IBWP);
-+	return (unsigned int)(cur_addr - start_addr) / stride;
-+}
-+
-+static inline void unicam_schedule_next_buffer(struct unicam_node *node)
-+{
-+	struct unicam_device *dev = node->dev;
-+	struct unicam_buffer *buf;
-+	unsigned int size;
-+	dma_addr_t addr;
-+
-+	buf = list_first_entry(&node->dma_queue, struct unicam_buffer, list);
-+	node->next_frm = buf;
-+	list_del(&buf->list);
-+
-+	addr = vb2_dma_contig_plane_dma_addr(&buf->vb.vb2_buf, 0);
-+	size = (node->pad_id == IMAGE_PAD) ?
-+			node->v_fmt.fmt.pix.sizeimage :
-+			node->v_fmt.fmt.meta.buffersize;
-+
-+	unicam_wr_dma_addr(dev, addr, size, node->pad_id);
-+}
-+
-+static inline void unicam_schedule_dummy_buffer(struct unicam_node *node)
-+{
-+	struct unicam_device *dev = node->dev;
-+
-+	unicam_dbg(3, dev, "Scheduling dummy buffer for node %d\n",
-+		   node->pad_id);
-+
-+	unicam_wr_dma_addr(dev, node->dummy_buf_dma_addr, DUMMY_BUF_SIZE,
-+			   node->pad_id);
-+	node->next_frm = NULL;
-+}
-+
-+static inline void unicam_process_buffer_complete(struct unicam_node *node,
-+						  unsigned int sequence)
-+{
-+	node->cur_frm->vb.field = node->m_fmt.field;
-+	node->cur_frm->vb.sequence = sequence;
-+
-+	vb2_buffer_done(&node->cur_frm->vb.vb2_buf, VB2_BUF_STATE_DONE);
-+}
-+
-+static bool unicam_all_nodes_streaming(struct unicam_device *dev)
-+{
-+	bool ret;
-+
-+	ret = dev->node[IMAGE_PAD].open && dev->node[IMAGE_PAD].streaming;
-+	ret &= !dev->node[METADATA_PAD].open ||
-+	       dev->node[METADATA_PAD].streaming;
-+	return ret;
-+}
-+
-+static bool unicam_all_nodes_disabled(struct unicam_device *dev)
-+{
-+	return !dev->node[IMAGE_PAD].streaming &&
-+	       !dev->node[METADATA_PAD].streaming;
-+}
-+
-+static void unicam_queue_event_sof(struct unicam_device *unicam)
-+{
-+	struct v4l2_event event = {
-+		.type = V4L2_EVENT_FRAME_SYNC,
-+		.u.frame_sync.frame_sequence = unicam->sequence,
-+	};
-+
-+	v4l2_event_queue(&unicam->node[IMAGE_PAD].video_dev, &event);
-+}
-+
-+/*
-+ * unicam_isr : ISR handler for unicam capture
-+ * @irq: irq number
-+ * @dev_id: dev_id ptr
-+ *
-+ * It changes status of the captured buffer, takes next buffer from the queue
-+ * and sets its address in unicam registers
-+ */
-+static irqreturn_t unicam_isr(int irq, void *dev)
-+{
-+	struct unicam_device *unicam = dev;
-+	unsigned int lines_done = unicam_get_lines_done(dev);
-+	unsigned int sequence = unicam->sequence;
-+	unsigned int i;
-+	u32 ista, sta;
-+	u64 ts;
-+
-+	/*
-+	 * Don't service interrupts if not streaming.
-+	 * Avoids issues if the VPU should enable the
-+	 * peripheral without the kernel knowing (that
-+	 * shouldn't happen, but causes issues if it does).
-+	 */
-+	if (unicam_all_nodes_disabled(unicam))
-+		return IRQ_NONE;
-+
-+	sta = reg_read(unicam, UNICAM_STA);
-+	/* Write value back to clear the interrupts */
-+	reg_write(unicam, UNICAM_STA, sta);
-+
-+	ista = reg_read(unicam, UNICAM_ISTA);
-+	/* Write value back to clear the interrupts */
-+	reg_write(unicam, UNICAM_ISTA, ista);
-+
-+	unicam_dbg(3, unicam, "ISR: ISTA: 0x%X, STA: 0x%X, sequence %d, lines done %d",
-+		   ista, sta, sequence, lines_done);
-+
-+	if (!(sta & (UNICAM_IS | UNICAM_PI0)))
-+		return IRQ_HANDLED;
-+
-+	/*
-+	 * We must run the frame end handler first. If we have a valid next_frm
-+	 * and we get a simultaneout FE + FS interrupt, running the FS handler
-+	 * first would null out the next_frm ptr and we would have lost the
-+	 * buffer forever.
-+	 */
-+	if (ista & UNICAM_FEI || sta & UNICAM_PI0) {
-+		/*
-+		 * Ensure we have swapped buffers already as we can't
-+		 * stop the peripheral. If no buffer is available, use a
-+		 * dummy buffer to dump out frames until we get a new buffer
-+		 * to use.
-+		 */
-+		for (i = 0; i < ARRAY_SIZE(unicam->node); i++) {
-+			if (!unicam->node[i].streaming)
-+				continue;
-+
-+			if (unicam->node[i].cur_frm)
-+				unicam_process_buffer_complete(&unicam->node[i],
-+							       sequence);
-+			unicam->node[i].cur_frm = unicam->node[i].next_frm;
-+		}
-+		unicam->sequence++;
-+	}
-+
-+	if (ista & UNICAM_FSI) {
-+		/*
-+		 * Timestamp is to be when the first data byte was captured,
-+		 * aka frame start.
-+		 */
-+		ts = ktime_get_ns();
-+		for (i = 0; i < ARRAY_SIZE(unicam->node); i++) {
-+			if (!unicam->node[i].streaming)
-+				continue;
-+
-+			if (unicam->node[i].cur_frm)
-+				unicam->node[i].cur_frm->vb.vb2_buf.timestamp =
-+								ts;
-+			/*
-+			 * Set the next frame output to go to a dummy frame
-+			 * if we have not managed to obtain another frame
-+			 * from the queue.
-+			 */
-+			unicam_schedule_dummy_buffer(&unicam->node[i]);
-+		}
-+
-+		unicam_queue_event_sof(unicam);
-+	}
-+
-+	/*
-+	 * Cannot swap buffer at frame end, there may be a race condition
-+	 * where the HW does not actually swap it if the new frame has
-+	 * already started.
-+	 */
-+	if (ista & (UNICAM_FSI | UNICAM_LCI) && !(ista & UNICAM_FEI)) {
-+		for (i = 0; i < ARRAY_SIZE(unicam->node); i++) {
-+			if (!unicam->node[i].streaming)
-+				continue;
-+
-+			spin_lock(&unicam->node[i].dma_queue_lock);
-+			if (!list_empty(&unicam->node[i].dma_queue) &&
-+			    !unicam->node[i].next_frm)
-+				unicam_schedule_next_buffer(&unicam->node[i]);
-+			spin_unlock(&unicam->node[i].dma_queue_lock);
-+		}
-+	}
-+
-+	if (reg_read(unicam, UNICAM_ICTL) & UNICAM_FCM) {
-+		/* Switch out of trigger mode if selected */
-+		reg_write_field(unicam, UNICAM_ICTL, 1, UNICAM_TFC);
-+		reg_write_field(unicam, UNICAM_ICTL, 0, UNICAM_FCM);
-+	}
-+	return IRQ_HANDLED;
-+}
-+
-+static int unicam_querycap(struct file *file, void *priv,
-+			   struct v4l2_capability *cap)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+
-+	strlcpy(cap->driver, UNICAM_MODULE_NAME, sizeof(cap->driver));
-+	strlcpy(cap->card, UNICAM_MODULE_NAME, sizeof(cap->card));
-+
-+	snprintf(cap->bus_info, sizeof(cap->bus_info),
-+		 "platform:%s", dev_name(&dev->pdev->dev));
-+
-+	cap->capabilities |= V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_META_CAPTURE;
-+
-+	return 0;
-+}
-+
-+static int unicam_enum_fmt_vid_cap(struct file *file, void  *priv,
-+				   struct v4l2_fmtdesc *f)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+	unsigned int index = 0;
-+	unsigned int i;
-+	int ret = 0;
-+
-+	if (node->pad_id != IMAGE_PAD)
-+		return -EINVAL;
-+
-+	for (i = 0; !ret && i < MAX_ENUM_MBUS_CODE; i++) {
-+		struct v4l2_subdev_mbus_code_enum mbus_code = {
-+			.index = i,
-+			.pad = IMAGE_PAD,
-+			.which = V4L2_SUBDEV_FORMAT_ACTIVE,
-+		};
-+		const struct unicam_fmt *fmt;
-+
-+		ret = v4l2_subdev_call(dev->sensor, pad, enum_mbus_code,
-+				       NULL, &mbus_code);
-+		if (ret < 0) {
-+			unicam_dbg(2, dev,
-+				   "subdev->enum_mbus_code idx %d returned %d - index invalid\n",
-+				   i, ret);
-+			return -EINVAL;
-+		}
-+
-+		fmt = find_format_by_code(mbus_code.code);
-+		if (fmt) {
-+			if (fmt->fourcc) {
-+				if (index == f->index) {
-+					f->pixelformat = fmt->fourcc;
-+					break;
-+				}
-+				index++;
-+			}
-+			if (fmt->repacked_fourcc) {
-+				if (index == f->index) {
-+					f->pixelformat = fmt->repacked_fourcc;
-+					break;
-+				}
-+				index++;
-+			}
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+static int unicam_g_fmt_vid_cap(struct file *file, void *priv,
-+				struct v4l2_format *f)
-+{
-+	struct v4l2_mbus_framefmt mbus_fmt = {0};
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+	const struct unicam_fmt *fmt = NULL;
-+	int ret;
-+
-+	if (node->pad_id != IMAGE_PAD)
-+		return -EINVAL;
-+
-+	/*
-+	 * If a flip has occurred in the sensor, the fmt code might have
-+	 * changed. So we will need to re-fetch the format from the subdevice.
-+	 */
-+	ret = __subdev_get_format(dev, &mbus_fmt, node->pad_id);
-+	if (ret)
-+		return -EINVAL;
-+
-+	/* Find the V4L2 format from mbus code. We must match a known format. */
-+	fmt = find_format_by_code(mbus_fmt.code);
-+	if (!fmt)
-+		return -EINVAL;
-+
-+	node->fmt = fmt;
-+	node->v_fmt.fmt.pix.pixelformat = fmt->fourcc;
-+	*f = node->v_fmt;
-+
-+	return 0;
-+}
-+
-+static
-+const struct unicam_fmt *get_first_supported_format(struct unicam_device *dev)
-+{
-+	struct v4l2_subdev_mbus_code_enum mbus_code;
-+	const struct unicam_fmt *fmt = NULL;
-+	unsigned int i;
-+	int ret;
-+
-+	for (i = 0; ret != -EINVAL && ret != -ENOIOCTLCMD; ++i) {
-+		memset(&mbus_code, 0, sizeof(mbus_code));
-+		mbus_code.index = i;
-+		mbus_code.pad = IMAGE_PAD;
-+		mbus_code.which = V4L2_SUBDEV_FORMAT_ACTIVE;
-+
-+		ret = v4l2_subdev_call(dev->sensor, pad, enum_mbus_code, NULL,
-+				       &mbus_code);
-+		if (ret < 0) {
-+			unicam_dbg(2, dev,
-+				   "subdev->enum_mbus_code idx %u returned %d - continue\n",
-+				   i, ret);
-+			continue;
-+		}
-+
-+		unicam_dbg(2, dev, "subdev %s: code: 0x%08x idx: %u\n",
-+			   dev->sensor->name, mbus_code.code, i);
-+
-+		fmt = find_format_by_code(mbus_code.code);
-+		unicam_dbg(2, dev, "fmt 0x%08x returned as %p, V4L2 FOURCC 0x%08x, csi_dt 0x%02x\n",
-+			   mbus_code.code, fmt, fmt ? fmt->fourcc : 0,
-+			   fmt ? fmt->csi_dt : 0);
-+		if (fmt)
-+			return fmt;
-+	}
-+
-+	return NULL;
-+}
-+
-+static int unicam_try_fmt_vid_cap(struct file *file, void *priv,
-+				  struct v4l2_format *f)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+	struct v4l2_subdev_format sd_fmt = {
-+		.which = V4L2_SUBDEV_FORMAT_TRY,
-+		.pad = IMAGE_PAD
-+	};
-+	struct v4l2_mbus_framefmt *mbus_fmt = &sd_fmt.format;
-+	const struct unicam_fmt *fmt;
-+	int ret;
-+
-+	if (node->pad_id != IMAGE_PAD)
-+		return -EINVAL;
-+
-+	fmt = find_format_by_pix(dev, f->fmt.pix.pixelformat);
-+	if (!fmt) {
-+		/*
-+		 * Pixel format not supported by unicam. Choose the first
-+		 * supported format, and let the sensor choose something else.
-+		 */
-+		unicam_dbg(3, dev, "Fourcc format (0x%08x) not found. Use first format.\n",
-+			   f->fmt.pix.pixelformat);
-+
-+		fmt = &formats[0];
-+		f->fmt.pix.pixelformat = fmt->fourcc;
-+	}
-+
-+	v4l2_fill_mbus_format(mbus_fmt, &f->fmt.pix, fmt->code);
-+	/*
-+	 * No support for receiving interlaced video, so never
-+	 * request it from the sensor subdev.
-+	 */
-+	mbus_fmt->field = V4L2_FIELD_NONE;
-+
-+	ret = v4l2_subdev_call(dev->sensor, pad, set_fmt, dev->sensor_config,
-+			       &sd_fmt);
-+	if (ret && ret != -ENOIOCTLCMD && ret != -ENODEV)
-+		return ret;
-+
-+	if (mbus_fmt->field != V4L2_FIELD_NONE)
-+		unicam_info(dev, "Sensor trying to send interlaced video - results may be unpredictable\n");
-+
-+	v4l2_fill_pix_format(&f->fmt.pix, &sd_fmt.format);
-+	if (mbus_fmt->code != fmt->code) {
-+		/* Sensor has returned an alternate format */
-+		fmt = find_format_by_code(mbus_fmt->code);
-+		if (!fmt) {
-+			/*
-+			 * The alternate format is one unicam can't support.
-+			 * Find the first format that is supported by both, and
-+			 * then set that.
-+			 */
-+			fmt = get_first_supported_format(dev);
-+			mbus_fmt->code = fmt->code;
-+
-+			ret = v4l2_subdev_call(dev->sensor, pad, set_fmt,
-+					       dev->sensor_config, &sd_fmt);
-+			if (ret && ret != -ENOIOCTLCMD && ret != -ENODEV)
-+				return ret;
-+
-+			if (mbus_fmt->field != V4L2_FIELD_NONE)
-+				unicam_info(dev, "Sensor trying to send interlaced video - results may be unpredictable\n");
-+
-+			v4l2_fill_pix_format(&f->fmt.pix, &sd_fmt.format);
-+
-+			if (mbus_fmt->code != fmt->code) {
-+				/*
-+				 * We've set a format that the sensor reports
-+				 * as being supported, but it refuses to set it.
-+				 * Not much else we can do.
-+				 * Assume that the sensor driver may accept the
-+				 * format when it is set (rather than tried).
-+				 */
-+				unicam_err(dev, "Sensor won't accept default format, and Unicam can't support sensor default\n");
-+			}
-+		}
-+
-+		if (fmt->fourcc)
-+			f->fmt.pix.pixelformat = fmt->fourcc;
-+		else
-+			f->fmt.pix.pixelformat = fmt->repacked_fourcc;
-+	}
-+
-+	return unicam_calc_format_size_bpl(dev, fmt, f);
-+}
-+
-+static int unicam_s_fmt_vid_cap(struct file *file, void *priv,
-+				struct v4l2_format *f)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+	struct vb2_queue *q = &node->buffer_queue;
-+	struct v4l2_mbus_framefmt mbus_fmt = {0};
-+	const struct unicam_fmt *fmt;
-+	int ret;
-+
-+	if (vb2_is_busy(q))
-+		return -EBUSY;
-+
-+	ret = unicam_try_fmt_vid_cap(file, priv, f);
-+	if (ret < 0)
-+		return ret;
-+
-+	fmt = find_format_by_pix(dev, f->fmt.pix.pixelformat);
-+	if (!fmt) {
-+		/*
-+		 * Unknown pixel format - adopt a default.
-+		 * This shouldn't happen as try_fmt should have resolved any
-+		 * issues first.
-+		 */
-+		fmt = get_first_supported_format(dev);
-+		if (!fmt)
-+			/*
-+			 * It shouldn't be possible to get here with no
-+			 * supported formats
-+			 */
-+			return -EINVAL;
-+		f->fmt.pix.pixelformat = fmt->fourcc;
-+		return -EINVAL;
-+	}
-+
-+	v4l2_fill_mbus_format(&mbus_fmt, &f->fmt.pix, fmt->code);
-+
-+	ret = __subdev_set_format(dev, &mbus_fmt, node->pad_id);
-+	if (ret) {
-+		unicam_dbg(3, dev, "%s __subdev_set_format failed %d\n",
-+			   __func__, ret);
-+		return ret;
-+	}
-+
-+	/* Just double check nothing has gone wrong */
-+	if (mbus_fmt.code != fmt->code) {
-+		unicam_dbg(3, dev,
-+			   "%s subdev changed format on us, this should not happen\n",
-+			   __func__);
-+		return -EINVAL;
-+	}
-+
-+	node->fmt = fmt;
-+	node->v_fmt.fmt.pix.pixelformat = f->fmt.pix.pixelformat;
-+	node->v_fmt.fmt.pix.bytesperline = f->fmt.pix.bytesperline;
-+	unicam_reset_format(node);
-+
-+	unicam_dbg(3, dev,
-+		   "%s %dx%d, mbus_fmt 0x%08X, V4L2 pix 0x%08X.\n",
-+		   __func__, node->v_fmt.fmt.pix.width,
-+		   node->v_fmt.fmt.pix.height, mbus_fmt.code,
-+		   node->v_fmt.fmt.pix.pixelformat);
-+
-+	*f = node->v_fmt;
-+
-+	return 0;
-+}
-+
-+static int unicam_enum_fmt_meta_cap(struct file *file, void *priv,
-+				    struct v4l2_fmtdesc *f)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+	const struct unicam_fmt *fmt;
-+	u32 code;
-+	int ret = 0;
-+
-+	if (node->pad_id != METADATA_PAD || f->index != 0)
-+		return -EINVAL;
-+
-+	if (dev->sensor_embedded_data) {
-+		struct v4l2_subdev_mbus_code_enum mbus_code = {
-+			.index = f->index,
-+			.which = V4L2_SUBDEV_FORMAT_ACTIVE,
-+			.pad = METADATA_PAD,
-+		};
-+
-+		ret = v4l2_subdev_call(dev->sensor, pad, enum_mbus_code, NULL,
-+				       &mbus_code);
-+		if (ret < 0) {
-+			unicam_dbg(2, dev,
-+				   "subdev->enum_mbus_code idx 0 returned %d - index invalid\n",
-+				   ret);
-+			return -EINVAL;
-+		}
-+
-+		code = mbus_code.code;
-+	} else {
-+		code = MEDIA_BUS_FMT_SENSOR_DATA;
-+	}
-+
-+	fmt = find_format_by_code(code);
-+	if (fmt)
-+		f->pixelformat = fmt->fourcc;
-+
-+	return 0;
-+}
-+
-+static int unicam_g_fmt_meta_cap(struct file *file, void *priv,
-+				 struct v4l2_format *f)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+
-+	if (node->pad_id != METADATA_PAD)
-+		return -EINVAL;
-+
-+	*f = node->v_fmt;
-+
-+	return 0;
-+}
-+
-+static int unicam_queue_setup(struct vb2_queue *vq,
-+			      unsigned int *nbuffers,
-+			      unsigned int *nplanes,
-+			      unsigned int sizes[],
-+			      struct device *alloc_devs[])
-+{
-+	struct unicam_node *node = vb2_get_drv_priv(vq);
-+	struct unicam_device *dev = node->dev;
-+	unsigned int size = node->pad_id == IMAGE_PAD ?
-+				    node->v_fmt.fmt.pix.sizeimage :
-+				    node->v_fmt.fmt.meta.buffersize;
-+
-+	if (vq->num_buffers + *nbuffers < 3)
-+		*nbuffers = 3 - vq->num_buffers;
-+
-+	if (*nplanes) {
-+		if (sizes[0] < size) {
-+			unicam_err(dev, "sizes[0] %i < size %u\n", sizes[0],
-+				   size);
-+			return -EINVAL;
-+		}
-+		size = sizes[0];
-+	}
-+
-+	*nplanes = 1;
-+	sizes[0] = size;
-+
-+	return 0;
-+}
-+
-+static int unicam_buffer_prepare(struct vb2_buffer *vb)
-+{
-+	struct unicam_node *node = vb2_get_drv_priv(vb->vb2_queue);
-+	struct unicam_device *dev = node->dev;
-+	struct unicam_buffer *buf = to_unicam_buffer(vb);
-+	unsigned long size;
-+
-+	if (WARN_ON(!node->fmt))
-+		return -EINVAL;
-+
-+	size = node->pad_id == IMAGE_PAD ? node->v_fmt.fmt.pix.sizeimage :
-+					   node->v_fmt.fmt.meta.buffersize;
-+	if (vb2_plane_size(vb, 0) < size) {
-+		unicam_err(dev, "data will not fit into plane (%lu < %lu)\n",
-+			   vb2_plane_size(vb, 0), size);
-+		return -EINVAL;
-+	}
-+
-+	vb2_set_plane_payload(&buf->vb.vb2_buf, 0, size);
-+	return 0;
-+}
-+
-+static void unicam_buffer_queue(struct vb2_buffer *vb)
-+{
-+	struct unicam_node *node = vb2_get_drv_priv(vb->vb2_queue);
-+	struct unicam_buffer *buf = to_unicam_buffer(vb);
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&node->dma_queue_lock, flags);
-+	list_add_tail(&buf->list, &node->dma_queue);
-+	spin_unlock_irqrestore(&node->dma_queue_lock, flags);
-+}
-+
-+static void unicam_set_packing_config(struct unicam_device *dev)
-+{
-+	u32 pack, unpack;
-+	u32 val;
-+
-+	if (dev->node[IMAGE_PAD].v_fmt.fmt.pix.pixelformat ==
-+	    dev->node[IMAGE_PAD].fmt->fourcc) {
-+		unpack = UNICAM_PUM_NONE;
-+		pack = UNICAM_PPM_NONE;
-+	} else {
-+		switch (dev->node[IMAGE_PAD].fmt->depth) {
-+		case 8:
-+			unpack = UNICAM_PUM_UNPACK8;
-+			break;
-+		case 10:
-+			unpack = UNICAM_PUM_UNPACK10;
-+			break;
-+		case 12:
-+			unpack = UNICAM_PUM_UNPACK12;
-+			break;
-+		case 14:
-+			unpack = UNICAM_PUM_UNPACK14;
-+			break;
-+		case 16:
-+			unpack = UNICAM_PUM_UNPACK16;
-+			break;
-+		default:
-+			unpack = UNICAM_PUM_NONE;
-+			break;
-+		}
-+
-+		/* Repacking is always to 16bpp */
-+		pack = UNICAM_PPM_PACK16;
-+	}
-+
-+	val = 0;
-+	set_field(&val, unpack, UNICAM_PUM_MASK);
-+	set_field(&val, pack, UNICAM_PPM_MASK);
-+	reg_write(dev, UNICAM_IPIPE, val);
-+}
-+
-+static void unicam_cfg_image_id(struct unicam_device *dev)
-+{
-+	if (dev->bus_type == V4L2_MBUS_CSI2_DPHY) {
-+		/* CSI2 mode, hardcode VC 0 for now. */
-+		reg_write(dev, UNICAM_IDI0,
-+			  (0 << 6) | dev->node[IMAGE_PAD].fmt->csi_dt);
-+	} else {
-+		/* CCP2 mode */
-+		reg_write(dev, UNICAM_IDI0,
-+			  0x80 | dev->node[IMAGE_PAD].fmt->csi_dt);
-+	}
-+}
-+
-+static void unicam_enable_ed(struct unicam_device *dev)
-+{
-+	u32 val = reg_read(dev, UNICAM_DCS);
-+
-+	set_field(&val, 2, UNICAM_EDL_MASK);
-+	/* Do not wrap at the end of the embedded data buffer */
-+	set_field(&val, 0, UNICAM_DBOB);
-+
-+	reg_write(dev, UNICAM_DCS, val);
-+}
-+
-+static void unicam_start_rx(struct unicam_device *dev, dma_addr_t *addr)
-+{
-+	int line_int_freq = dev->node[IMAGE_PAD].v_fmt.fmt.pix.height >> 2;
-+	unsigned int size, i;
-+	u32 val;
-+
-+	if (line_int_freq < 128)
-+		line_int_freq = 128;
-+
-+	/* Enable lane clocks */
-+	val = 1;
-+	for (i = 0; i < dev->active_data_lanes; i++)
-+		val = val << 2 | 1;
-+	clk_write(dev, val);
-+
-+	/* Basic init */
-+	reg_write(dev, UNICAM_CTRL, UNICAM_MEM);
-+
-+	/* Enable analogue control, and leave in reset. */
-+	val = UNICAM_AR;
-+	set_field(&val, 7, UNICAM_CTATADJ_MASK);
-+	set_field(&val, 7, UNICAM_PTATADJ_MASK);
-+	reg_write(dev, UNICAM_ANA, val);
-+	usleep_range(1000, 2000);
-+
-+	/* Come out of reset */
-+	reg_write_field(dev, UNICAM_ANA, 0, UNICAM_AR);
-+
-+	/* Peripheral reset */
-+	reg_write_field(dev, UNICAM_CTRL, 1, UNICAM_CPR);
-+	reg_write_field(dev, UNICAM_CTRL, 0, UNICAM_CPR);
-+
-+	reg_write_field(dev, UNICAM_CTRL, 0, UNICAM_CPE);
-+
-+	/* Enable Rx control. */
-+	val = reg_read(dev, UNICAM_CTRL);
-+	if (dev->bus_type == V4L2_MBUS_CSI2_DPHY) {
-+		set_field(&val, UNICAM_CPM_CSI2, UNICAM_CPM_MASK);
-+		set_field(&val, UNICAM_DCM_STROBE, UNICAM_DCM_MASK);
-+	} else {
-+		set_field(&val, UNICAM_CPM_CCP2, UNICAM_CPM_MASK);
-+		set_field(&val, dev->bus_flags, UNICAM_DCM_MASK);
-+	}
-+	/* Packet framer timeout */
-+	set_field(&val, 0xf, UNICAM_PFT_MASK);
-+	set_field(&val, 128, UNICAM_OET_MASK);
-+	reg_write(dev, UNICAM_CTRL, val);
-+
-+	reg_write(dev, UNICAM_IHWIN, 0);
-+	reg_write(dev, UNICAM_IVWIN, 0);
-+
-+	/* AXI bus access QoS setup */
-+	val = reg_read(dev, UNICAM_PRI);
-+	set_field(&val, 0, UNICAM_BL_MASK);
-+	set_field(&val, 0, UNICAM_BS_MASK);
-+	set_field(&val, 0xe, UNICAM_PP_MASK);
-+	set_field(&val, 8, UNICAM_NP_MASK);
-+	set_field(&val, 2, UNICAM_PT_MASK);
-+	set_field(&val, 1, UNICAM_PE);
-+	reg_write(dev, UNICAM_PRI, val);
-+
-+	reg_write_field(dev, UNICAM_ANA, 0, UNICAM_DDL);
-+
-+	/* Always start in trigger frame capture mode (UNICAM_FCM set) */
-+	val = UNICAM_FSIE | UNICAM_FEIE | UNICAM_FCM | UNICAM_IBOB;
-+	set_field(&val, line_int_freq, UNICAM_LCIE_MASK);
-+	reg_write(dev, UNICAM_ICTL, val);
-+	reg_write(dev, UNICAM_STA, UNICAM_STA_MASK_ALL);
-+	reg_write(dev, UNICAM_ISTA, UNICAM_ISTA_MASK_ALL);
-+
-+	/* tclk_term_en */
-+	reg_write_field(dev, UNICAM_CLT, 2, UNICAM_CLT1_MASK);
-+	/* tclk_settle */
-+	reg_write_field(dev, UNICAM_CLT, 6, UNICAM_CLT2_MASK);
-+	/* td_term_en */
-+	reg_write_field(dev, UNICAM_DLT, 2, UNICAM_DLT1_MASK);
-+	/* ths_settle */
-+	reg_write_field(dev, UNICAM_DLT, 6, UNICAM_DLT2_MASK);
-+	/* trx_enable */
-+	reg_write_field(dev, UNICAM_DLT, 0, UNICAM_DLT3_MASK);
-+
-+	reg_write_field(dev, UNICAM_CTRL, 0, UNICAM_SOE);
-+
-+	/* Packet compare setup - required to avoid missing frame ends */
-+	val = 0;
-+	set_field(&val, 1, UNICAM_PCE);
-+	set_field(&val, 1, UNICAM_GI);
-+	set_field(&val, 1, UNICAM_CPH);
-+	set_field(&val, 0, UNICAM_PCVC_MASK);
-+	set_field(&val, 1, UNICAM_PCDT_MASK);
-+	reg_write(dev, UNICAM_CMP0, val);
-+
-+	/* Enable clock lane and set up terminations */
-+	val = 0;
-+	if (dev->bus_type == V4L2_MBUS_CSI2_DPHY) {
-+		/* CSI2 */
-+		set_field(&val, 1, UNICAM_CLE);
-+		set_field(&val, 1, UNICAM_CLLPE);
-+		if (dev->bus_flags & V4L2_MBUS_CSI2_CONTINUOUS_CLOCK) {
-+			set_field(&val, 1, UNICAM_CLTRE);
-+			set_field(&val, 1, UNICAM_CLHSE);
-+		}
-+	} else {
-+		/* CCP2 */
-+		set_field(&val, 1, UNICAM_CLE);
-+		set_field(&val, 1, UNICAM_CLHSE);
-+		set_field(&val, 1, UNICAM_CLTRE);
-+	}
-+	reg_write(dev, UNICAM_CLK, val);
-+
-+	/*
-+	 * Enable required data lanes with appropriate terminations.
-+	 * The same value needs to be written to UNICAM_DATn registers for
-+	 * the active lanes, and 0 for inactive ones.
-+	 */
-+	val = 0;
-+	if (dev->bus_type == V4L2_MBUS_CSI2_DPHY) {
-+		/* CSI2 */
-+		set_field(&val, 1, UNICAM_DLE);
-+		set_field(&val, 1, UNICAM_DLLPE);
-+		if (dev->bus_flags & V4L2_MBUS_CSI2_CONTINUOUS_CLOCK) {
-+			set_field(&val, 1, UNICAM_DLTRE);
-+			set_field(&val, 1, UNICAM_DLHSE);
-+		}
-+	} else {
-+		/* CCP2 */
-+		set_field(&val, 1, UNICAM_DLE);
-+		set_field(&val, 1, UNICAM_DLHSE);
-+		set_field(&val, 1, UNICAM_DLTRE);
-+	}
-+	reg_write(dev, UNICAM_DAT0, val);
-+
-+	if (dev->active_data_lanes == 1)
-+		val = 0;
-+	reg_write(dev, UNICAM_DAT1, val);
-+
-+	if (dev->max_data_lanes > 2) {
-+		/*
-+		 * Registers UNICAM_DAT2 and UNICAM_DAT3 only valid if the
-+		 * instance supports more than 2 data lanes.
-+		 */
-+		if (dev->active_data_lanes == 2)
-+			val = 0;
-+		reg_write(dev, UNICAM_DAT2, val);
-+
-+		if (dev->active_data_lanes == 3)
-+			val = 0;
-+		reg_write(dev, UNICAM_DAT3, val);
-+	}
-+
-+	reg_write(dev, UNICAM_IBLS,
-+		  dev->node[IMAGE_PAD].v_fmt.fmt.pix.bytesperline);
-+	size = dev->node[IMAGE_PAD].v_fmt.fmt.pix.sizeimage;
-+	unicam_wr_dma_addr(dev, addr[IMAGE_PAD], size, IMAGE_PAD);
-+	unicam_set_packing_config(dev);
-+	unicam_cfg_image_id(dev);
-+
-+	val = reg_read(dev, UNICAM_MISC);
-+	set_field(&val, 1, UNICAM_FL0);
-+	set_field(&val, 1, UNICAM_FL1);
-+	reg_write(dev, UNICAM_MISC, val);
-+
-+	if (dev->node[METADATA_PAD].streaming && dev->sensor_embedded_data) {
-+		size = dev->node[METADATA_PAD].v_fmt.fmt.meta.buffersize;
-+		unicam_enable_ed(dev);
-+		unicam_wr_dma_addr(dev, addr[METADATA_PAD], size, METADATA_PAD);
-+	}
-+
-+	/* Enable peripheral */
-+	reg_write_field(dev, UNICAM_CTRL, 1, UNICAM_CPE);
-+
-+	/* Load image pointers */
-+	reg_write_field(dev, UNICAM_ICTL, 1, UNICAM_LIP_MASK);
-+
-+	/* Load embedded data buffer pointers if needed */
-+	if (dev->node[METADATA_PAD].streaming && dev->sensor_embedded_data)
-+		reg_write_field(dev, UNICAM_DCS, 1, UNICAM_LDP);
-+
-+	/*
-+	 * Enable trigger only for the first frame to
-+	 * sync correctly to the FS from the source.
-+	 */
-+	reg_write_field(dev, UNICAM_ICTL, 1, UNICAM_TFC);
-+}
-+
-+static void unicam_disable(struct unicam_device *dev)
-+{
-+	/* Analogue lane control disable */
-+	reg_write_field(dev, UNICAM_ANA, 1, UNICAM_DDL);
-+
-+	/* Stop the output engine */
-+	reg_write_field(dev, UNICAM_CTRL, 1, UNICAM_SOE);
-+
-+	/* Disable the data lanes. */
-+	reg_write(dev, UNICAM_DAT0, 0);
-+	reg_write(dev, UNICAM_DAT1, 0);
-+
-+	if (dev->max_data_lanes > 2) {
-+		reg_write(dev, UNICAM_DAT2, 0);
-+		reg_write(dev, UNICAM_DAT3, 0);
-+	}
-+
-+	/* Peripheral reset */
-+	reg_write_field(dev, UNICAM_CTRL, 1, UNICAM_CPR);
-+	usleep_range(50, 100);
-+	reg_write_field(dev, UNICAM_CTRL, 0, UNICAM_CPR);
-+
-+	/* Disable peripheral */
-+	reg_write_field(dev, UNICAM_CTRL, 0, UNICAM_CPE);
-+
-+	/* Clear ED setup */
-+	reg_write(dev, UNICAM_DCS, 0);
-+
-+	/* Disable all lane clocks */
-+	clk_write(dev, 0);
-+}
-+
-+static void unicam_return_buffers(struct unicam_node *node)
-+{
-+	struct unicam_buffer *buf, *tmp;
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&node->dma_queue_lock, flags);
-+	list_for_each_entry_safe(buf, tmp, &node->dma_queue, list) {
-+		list_del(&buf->list);
-+		vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
-+	}
-+
-+	if (node->cur_frm)
-+		vb2_buffer_done(&node->cur_frm->vb.vb2_buf,
-+				VB2_BUF_STATE_ERROR);
-+	if (node->next_frm && node->cur_frm != node->next_frm)
-+		vb2_buffer_done(&node->next_frm->vb.vb2_buf,
-+				VB2_BUF_STATE_ERROR);
-+
-+	node->cur_frm = NULL;
-+	node->next_frm = NULL;
-+	spin_unlock_irqrestore(&node->dma_queue_lock, flags);
-+}
-+
-+static int unicam_start_streaming(struct vb2_queue *vq, unsigned int count)
-+{
-+	struct unicam_node *node = vb2_get_drv_priv(vq);
-+	struct unicam_device *dev = node->dev;
-+	dma_addr_t buffer_addr[MAX_NODES] = { 0 };
-+	unsigned long flags;
-+	unsigned int i;
-+	int ret;
-+
-+	node->streaming = true;
-+	if (!unicam_all_nodes_streaming(dev)) {
-+		unicam_dbg(3, dev, "Not all nodes are streaming yet.");
-+		return 0;
-+	}
-+
-+	dev->sequence = 0;
-+	ret = unicam_runtime_get(dev);
-+	if (ret < 0) {
-+		unicam_dbg(3, dev, "unicam_runtime_get failed\n");
-+		goto err_streaming;
-+	}
-+
-+	/*
-+	 * TODO: Retrieve the number of active data lanes from the connected
-+	 * subdevice.
-+	 */
-+	dev->active_data_lanes = dev->max_data_lanes;
-+
-+	ret = clk_set_rate(dev->clock, 100 * 1000 * 1000);
-+	if (ret) {
-+		unicam_err(dev, "failed to set up clock\n");
-+		goto err_pm_put;
-+	}
-+
-+	ret = clk_prepare_enable(dev->clock);
-+	if (ret) {
-+		unicam_err(dev, "Failed to enable CSI clock: %d\n", ret);
-+		goto err_pm_put;
-+	}
-+
-+	for (i = 0; i < ARRAY_SIZE(dev->node); i++) {
-+		struct unicam_buffer *buf;
-+
-+		if (!dev->node[i].streaming)
-+			continue;
-+
-+		spin_lock_irqsave(&dev->node[i].dma_queue_lock, flags);
-+		buf = list_first_entry(&dev->node[i].dma_queue,
-+				       struct unicam_buffer, list);
-+		dev->node[i].cur_frm = buf;
-+		dev->node[i].next_frm = buf;
-+		list_del(&buf->list);
-+		spin_unlock_irqrestore(&dev->node[i].dma_queue_lock, flags);
-+
-+		buffer_addr[i] =
-+			vb2_dma_contig_plane_dma_addr(&buf->vb.vb2_buf, 0);
-+	}
-+
-+	unicam_start_rx(dev, buffer_addr);
-+
-+	ret = v4l2_subdev_call(dev->sensor, video, s_stream, 1);
-+	if (ret < 0) {
-+		unicam_err(dev, "stream on failed in subdev\n");
-+		goto err_disable_unicam;
-+	}
-+
-+	return 0;
-+
-+err_disable_unicam:
-+	unicam_disable(dev);
-+	clk_disable_unprepare(dev->clock);
-+err_pm_put:
-+	unicam_runtime_put(dev);
-+err_streaming:
-+	unicam_return_buffers(node);
-+	node->streaming = false;
-+
-+	return ret;
-+}
-+
-+static void unicam_stop_streaming(struct vb2_queue *vq)
-+{
-+	struct unicam_node *node = vb2_get_drv_priv(vq);
-+	struct unicam_device *dev = node->dev;
-+
-+	node->streaming = false;
-+
-+	if (node->pad_id == IMAGE_PAD) {
-+		/*
-+		 * Stop streaming the sensor and disable the peripheral.
-+		 * We cannot continue streaming embedded data with the
-+		 * image pad disabled.
-+		 */
-+		if (v4l2_subdev_call(dev->sensor, video, s_stream, 0) < 0)
-+			unicam_err(dev, "stream off failed in subdev\n");
-+
-+		unicam_disable(dev);
-+		clk_disable_unprepare(dev->clock);
-+		unicam_runtime_put(dev);
-+
-+	} else if (node->pad_id == METADATA_PAD) {
-+		/*
-+		 * Allow the hardware to spin in the dummy buffer.
-+		 * This is only really needed if the embedded data pad is
-+		 * disabled before the image pad.
-+		 */
-+		unicam_wr_dma_addr(dev, node->dummy_buf_dma_addr,
-+				   DUMMY_BUF_SIZE, METADATA_PAD);
-+	}
-+
-+	/* Clear all queued buffers for the node */
-+	unicam_return_buffers(node);
-+}
-+
-+static int unicam_enum_input(struct file *file, void *priv,
-+			     struct v4l2_input *inp)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+
-+	if (inp->index != 0)
-+		return -EINVAL;
-+
-+	inp->type = V4L2_INPUT_TYPE_CAMERA;
-+	if (v4l2_subdev_has_op(dev->sensor, video, s_dv_timings)) {
-+		inp->capabilities = V4L2_IN_CAP_DV_TIMINGS;
-+		inp->std = 0;
-+	} else if (v4l2_subdev_has_op(dev->sensor, video, s_std)) {
-+		inp->capabilities = V4L2_IN_CAP_STD;
-+		if (v4l2_subdev_call(dev->sensor, video, g_tvnorms, &inp->std)
-+					< 0)
-+			inp->std = V4L2_STD_ALL;
-+	} else {
-+		inp->capabilities = 0;
-+		inp->std = 0;
-+	}
-+	sprintf(inp->name, "Camera 0");
-+	return 0;
-+}
-+
-+static int unicam_g_input(struct file *file, void *priv, unsigned int *i)
-+{
-+	*i = 0;
-+
-+	return 0;
-+}
-+
-+static int unicam_s_input(struct file *file, void *priv, unsigned int i)
-+{
-+	/*
-+	 * FIXME: Ideally we would like to be able to query the source
-+	 * subdevice for information over the input connectors it supports,
-+	 * and map that through in to a call to video_ops->s_routing.
-+	 * There is no infrastructure support for defining that within
-+	 * devicetree at present. Until that is implemented we can't
-+	 * map a user physical connector number to s_routing input number.
-+	 */
-+	if (i > 0)
-+		return -EINVAL;
-+
-+	return 0;
-+}
-+
-+static int unicam_querystd(struct file *file, void *priv,
-+			   v4l2_std_id *std)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+
-+	return v4l2_subdev_call(dev->sensor, video, querystd, std);
-+}
-+
-+static int unicam_g_std(struct file *file, void *priv, v4l2_std_id *std)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+
-+	return v4l2_subdev_call(dev->sensor, video, g_std, std);
-+}
-+
-+static int unicam_s_std(struct file *file, void *priv, v4l2_std_id std)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+	int ret;
-+	v4l2_std_id current_std;
-+
-+	ret = v4l2_subdev_call(dev->sensor, video, g_std, &current_std);
-+	if (ret)
-+		return ret;
-+
-+	if (std == current_std)
-+		return 0;
-+
-+	if (vb2_is_busy(&node->buffer_queue))
-+		return -EBUSY;
-+
-+	ret = v4l2_subdev_call(dev->sensor, video, s_std, std);
-+
-+	/* Force recomputation of bytesperline */
-+	node->v_fmt.fmt.pix.bytesperline = 0;
-+
-+	unicam_reset_format(node);
-+
-+	return ret;
-+}
-+
-+static int unicam_s_edid(struct file *file, void *priv, struct v4l2_edid *edid)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+
-+	return v4l2_subdev_call(dev->sensor, pad, set_edid, edid);
-+}
-+
-+static int unicam_g_edid(struct file *file, void *priv, struct v4l2_edid *edid)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+
-+	return v4l2_subdev_call(dev->sensor, pad, get_edid, edid);
-+}
-+
-+static int unicam_s_selection(struct file *file, void *priv,
-+			      struct v4l2_selection *sel)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+	struct v4l2_subdev_selection sdsel = {
-+		.which = V4L2_SUBDEV_FORMAT_ACTIVE,
-+		.target = sel->target,
-+		.flags = sel->flags,
-+		.r = sel->r,
-+	};
-+
-+	return v4l2_subdev_call(dev->sensor, pad, set_selection, NULL, &sdsel);
-+}
-+
-+static int unicam_g_selection(struct file *file, void *priv,
-+			      struct v4l2_selection *sel)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+	struct v4l2_subdev_selection sdsel = {
-+		.which = V4L2_SUBDEV_FORMAT_ACTIVE,
-+		.target = sel->target,
-+	};
-+	int ret;
-+
-+	ret = v4l2_subdev_call(dev->sensor, pad, get_selection, NULL, &sdsel);
-+	if (!ret)
-+		sel->r = sdsel.r;
-+
-+	return ret;
-+}
-+
-+static int unicam_enum_framesizes(struct file *file, void *priv,
-+				  struct v4l2_frmsizeenum *fsize)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+	const struct unicam_fmt *fmt;
-+	struct v4l2_subdev_frame_size_enum fse;
-+	int ret;
-+
-+	/* check for valid format */
-+	fmt = find_format_by_pix(dev, fsize->pixel_format);
-+	if (!fmt) {
-+		unicam_dbg(3, dev, "Invalid pixel code: %x\n",
-+			   fsize->pixel_format);
-+		return -EINVAL;
-+	}
-+	fse.code = fmt->code;
-+
-+	fse.which = V4L2_SUBDEV_FORMAT_ACTIVE;
-+	fse.index = fsize->index;
-+	fse.pad = node->pad_id;
-+
-+	ret = v4l2_subdev_call(dev->sensor, pad, enum_frame_size, NULL, &fse);
-+	if (ret)
-+		return ret;
-+
-+	unicam_dbg(1, dev, "%s: index: %d code: %x W:[%d,%d] H:[%d,%d]\n",
-+		   __func__, fse.index, fse.code, fse.min_width, fse.max_width,
-+		   fse.min_height, fse.max_height);
-+
-+	fsize->type = V4L2_FRMSIZE_TYPE_DISCRETE;
-+	fsize->discrete.width = fse.max_width;
-+	fsize->discrete.height = fse.max_height;
-+
-+	return 0;
-+}
-+
-+static int unicam_enum_frameintervals(struct file *file, void *priv,
-+				      struct v4l2_frmivalenum *fival)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+	const struct unicam_fmt *fmt;
-+	struct v4l2_subdev_frame_interval_enum fie = {
-+		.index = fival->index,
-+		.width = fival->width,
-+		.height = fival->height,
-+		.which = V4L2_SUBDEV_FORMAT_ACTIVE,
-+	};
-+	int ret;
-+
-+	fmt = find_format_by_pix(dev, fival->pixel_format);
-+	if (!fmt)
-+		return -EINVAL;
-+
-+	fie.code = fmt->code;
-+	ret = v4l2_subdev_call(dev->sensor, pad, enum_frame_interval,
-+			       NULL, &fie);
-+	if (ret)
-+		return ret;
-+
-+	fival->type = V4L2_FRMIVAL_TYPE_DISCRETE;
-+	fival->discrete = fie.interval;
-+
-+	return 0;
-+}
-+
-+static int unicam_g_parm(struct file *file, void *fh, struct v4l2_streamparm *a)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+
-+	return v4l2_g_parm_cap(video_devdata(file), dev->sensor, a);
-+}
-+
-+static int unicam_s_parm(struct file *file, void *fh, struct v4l2_streamparm *a)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+
-+	return v4l2_s_parm_cap(video_devdata(file), dev->sensor, a);
-+}
-+
-+static int unicam_g_dv_timings(struct file *file, void *priv,
-+			       struct v4l2_dv_timings *timings)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+
-+	return v4l2_subdev_call(dev->sensor, video, g_dv_timings, timings);
-+}
-+
-+static int unicam_s_dv_timings(struct file *file, void *priv,
-+			       struct v4l2_dv_timings *timings)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+	struct v4l2_dv_timings current_timings;
-+	int ret;
-+
-+	ret = v4l2_subdev_call(dev->sensor, video, g_dv_timings,
-+			       &current_timings);
-+
-+	if (v4l2_match_dv_timings(timings, &current_timings, 0, false))
-+		return 0;
-+
-+	if (vb2_is_busy(&node->buffer_queue))
-+		return -EBUSY;
-+
-+	ret = v4l2_subdev_call(dev->sensor, video, s_dv_timings, timings);
-+
-+	/* Force recomputation of bytesperline */
-+	node->v_fmt.fmt.pix.bytesperline = 0;
-+
-+	unicam_reset_format(node);
-+
-+	return ret;
-+}
-+
-+static int unicam_query_dv_timings(struct file *file, void *priv,
-+				   struct v4l2_dv_timings *timings)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+
-+	return v4l2_subdev_call(dev->sensor, video, query_dv_timings, timings);
-+}
-+
-+static int unicam_enum_dv_timings(struct file *file, void *priv,
-+				  struct v4l2_enum_dv_timings *timings)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+
-+	return v4l2_subdev_call(dev->sensor, pad, enum_dv_timings, timings);
-+}
-+
-+static int unicam_dv_timings_cap(struct file *file, void *priv,
-+				 struct v4l2_dv_timings_cap *cap)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+
-+	return v4l2_subdev_call(dev->sensor, pad, dv_timings_cap, cap);
-+}
-+
-+static int unicam_subscribe_event(struct v4l2_fh *fh,
-+				  const struct v4l2_event_subscription *sub)
-+{
-+	switch (sub->type) {
-+	case V4L2_EVENT_FRAME_SYNC:
-+		return v4l2_event_subscribe(fh, sub, 2, NULL);
-+	case V4L2_EVENT_SOURCE_CHANGE:
-+		return v4l2_event_subscribe(fh, sub, 4, NULL);
-+	}
-+
-+	return v4l2_ctrl_subscribe_event(fh, sub);
-+}
-+
-+static int unicam_log_status(struct file *file, void *fh)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+	u32 reg;
-+
-+	/* status for sub devices */
-+	v4l2_device_call_all(&dev->v4l2_dev, 0, core, log_status);
-+
-+	unicam_info(dev, "-----Receiver status-----\n");
-+	unicam_info(dev, "V4L2 width/height:   %ux%u\n",
-+		    node->v_fmt.fmt.pix.width, node->v_fmt.fmt.pix.height);
-+	unicam_info(dev, "Mediabus format:     %08x\n", node->fmt->code);
-+	unicam_info(dev, "V4L2 format:         %08x\n",
-+		    node->v_fmt.fmt.pix.pixelformat);
-+	reg = reg_read(dev, UNICAM_IPIPE);
-+	unicam_info(dev, "Unpacking/packing:   %u / %u\n",
-+		    get_field(reg, UNICAM_PUM_MASK),
-+		    get_field(reg, UNICAM_PPM_MASK));
-+	unicam_info(dev, "----Live data----\n");
-+	unicam_info(dev, "Programmed stride:   %4u\n",
-+		    reg_read(dev, UNICAM_IBLS));
-+	unicam_info(dev, "Detected resolution: %ux%u\n",
-+		    reg_read(dev, UNICAM_IHSTA),
-+		    reg_read(dev, UNICAM_IVSTA));
-+	unicam_info(dev, "Write pointer:       %08x\n",
-+		    reg_read(dev, UNICAM_IBWP));
-+
-+	return 0;
-+}
-+
-+static void unicam_notify(struct v4l2_subdev *sd,
-+			  unsigned int notification, void *arg)
-+{
-+	struct unicam_device *dev = to_unicam_device(sd->v4l2_dev);
-+
-+	switch (notification) {
-+	case V4L2_DEVICE_NOTIFY_EVENT:
-+		v4l2_event_queue(&dev->node[IMAGE_PAD].video_dev, arg);
-+		break;
-+	default:
-+		break;
-+	}
-+}
-+
-+static const struct vb2_ops unicam_video_qops = {
-+	.wait_prepare		= vb2_ops_wait_prepare,
-+	.wait_finish		= vb2_ops_wait_finish,
-+	.queue_setup		= unicam_queue_setup,
-+	.buf_prepare		= unicam_buffer_prepare,
-+	.buf_queue		= unicam_buffer_queue,
-+	.start_streaming	= unicam_start_streaming,
-+	.stop_streaming		= unicam_stop_streaming,
-+};
-+
-+/*
-+ * unicam_v4l2_open : This function is based on the v4l2_fh_open helper
-+ * function. It has been augmented to handle sensor subdevice power management,
-+ */
-+static int unicam_v4l2_open(struct file *file)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+	int ret;
-+
-+	mutex_lock(&node->lock);
-+
-+	ret = v4l2_fh_open(file);
-+	if (ret) {
-+		unicam_err(dev, "v4l2_fh_open failed\n");
-+		goto unlock;
-+	}
-+
-+	node->open++;
-+
-+	if (!v4l2_fh_is_singular_file(file))
-+		goto unlock;
-+
-+	ret = v4l2_subdev_call(dev->sensor, core, s_power, 1);
-+	if (ret < 0 && ret != -ENOIOCTLCMD) {
-+		v4l2_fh_release(file);
-+		node->open--;
-+		goto unlock;
-+	}
-+
-+	ret = 0;
-+
-+unlock:
-+	mutex_unlock(&node->lock);
-+	return ret;
-+}
-+
-+static int unicam_v4l2_release(struct file *file)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+	struct v4l2_subdev *sd = dev->sensor;
-+	bool fh_singular;
-+	int ret;
-+
-+	mutex_lock(&node->lock);
-+
-+	fh_singular = v4l2_fh_is_singular_file(file);
-+
-+	ret = _vb2_fop_release(file, NULL);
-+
-+	if (fh_singular)
-+		v4l2_subdev_call(sd, core, s_power, 0);
-+
-+	node->open--;
-+	mutex_unlock(&node->lock);
-+
-+	return ret;
-+}
-+
-+/* unicam capture driver file operations */
-+static const struct v4l2_file_operations unicam_fops = {
-+	.owner		= THIS_MODULE,
-+	.open		= unicam_v4l2_open,
-+	.release	= unicam_v4l2_release,
-+	.read		= vb2_fop_read,
-+	.poll		= vb2_fop_poll,
-+	.unlocked_ioctl	= video_ioctl2,
-+	.mmap		= vb2_fop_mmap,
-+};
-+
-+/* unicam capture ioctl operations */
-+static const struct v4l2_ioctl_ops unicam_ioctl_ops = {
-+	.vidioc_querycap		= unicam_querycap,
-+	.vidioc_enum_fmt_vid_cap	= unicam_enum_fmt_vid_cap,
-+	.vidioc_g_fmt_vid_cap		= unicam_g_fmt_vid_cap,
-+	.vidioc_s_fmt_vid_cap		= unicam_s_fmt_vid_cap,
-+	.vidioc_try_fmt_vid_cap		= unicam_try_fmt_vid_cap,
-+
-+	.vidioc_enum_fmt_meta_cap	= unicam_enum_fmt_meta_cap,
-+	.vidioc_g_fmt_meta_cap		= unicam_g_fmt_meta_cap,
-+	.vidioc_s_fmt_meta_cap		= unicam_g_fmt_meta_cap,
-+	.vidioc_try_fmt_meta_cap	= unicam_g_fmt_meta_cap,
-+
-+	.vidioc_enum_input		= unicam_enum_input,
-+	.vidioc_g_input			= unicam_g_input,
-+	.vidioc_s_input			= unicam_s_input,
-+
-+	.vidioc_querystd		= unicam_querystd,
-+	.vidioc_s_std			= unicam_s_std,
-+	.vidioc_g_std			= unicam_g_std,
-+
-+	.vidioc_g_edid			= unicam_g_edid,
-+	.vidioc_s_edid			= unicam_s_edid,
-+
-+	.vidioc_enum_framesizes		= unicam_enum_framesizes,
-+	.vidioc_enum_frameintervals	= unicam_enum_frameintervals,
-+
-+	.vidioc_g_selection		= unicam_g_selection,
-+	.vidioc_s_selection		= unicam_s_selection,
-+
-+	.vidioc_g_parm			= unicam_g_parm,
-+	.vidioc_s_parm			= unicam_s_parm,
-+
-+	.vidioc_s_dv_timings		= unicam_s_dv_timings,
-+	.vidioc_g_dv_timings		= unicam_g_dv_timings,
-+	.vidioc_query_dv_timings	= unicam_query_dv_timings,
-+	.vidioc_enum_dv_timings		= unicam_enum_dv_timings,
-+	.vidioc_dv_timings_cap		= unicam_dv_timings_cap,
-+
-+	.vidioc_reqbufs			= vb2_ioctl_reqbufs,
-+	.vidioc_create_bufs		= vb2_ioctl_create_bufs,
-+	.vidioc_prepare_buf		= vb2_ioctl_prepare_buf,
-+	.vidioc_querybuf		= vb2_ioctl_querybuf,
-+	.vidioc_qbuf			= vb2_ioctl_qbuf,
-+	.vidioc_dqbuf			= vb2_ioctl_dqbuf,
-+	.vidioc_expbuf			= vb2_ioctl_expbuf,
-+	.vidioc_streamon		= vb2_ioctl_streamon,
-+	.vidioc_streamoff		= vb2_ioctl_streamoff,
-+
-+	.vidioc_log_status		= unicam_log_status,
-+	.vidioc_subscribe_event		= unicam_subscribe_event,
-+	.vidioc_unsubscribe_event	= v4l2_event_unsubscribe,
-+};
-+
-+static int
-+unicam_async_bound(struct v4l2_async_notifier *notifier,
-+		   struct v4l2_subdev *subdev,
-+		   struct v4l2_async_subdev *asd)
-+{
-+	struct unicam_device *unicam = to_unicam_device(notifier->v4l2_dev);
-+
-+	if (unicam->sensor) {
-+		unicam_info(unicam, "Rejecting subdev %s (Already set!!)",
-+			    subdev->name);
-+		return 0;
-+	}
-+
-+	unicam->sensor = subdev;
-+	unicam_dbg(1, unicam, "Using sensor %s for capture\n", subdev->name);
-+
-+	return 0;
-+}
-+
-+static void unicam_release(struct kref *kref)
-+{
-+	struct unicam_device *unicam =
-+		container_of(kref, struct unicam_device, kref);
-+
-+	v4l2_ctrl_handler_free(&unicam->ctrl_handler);
-+	media_device_cleanup(&unicam->mdev);
-+
-+	if (unicam->sensor_config)
-+		v4l2_subdev_free_pad_config(unicam->sensor_config);
-+
-+	kfree(unicam);
-+}
-+
-+static void unicam_put(struct unicam_device *unicam)
-+{
-+	kref_put(&unicam->kref, unicam_release);
-+}
-+
-+static void unicam_get(struct unicam_device *unicam)
-+{
-+	kref_get(&unicam->kref);
-+}
-+
-+static void unicam_node_release(struct video_device *vdev)
-+{
-+	struct unicam_node *node = video_get_drvdata(vdev);
-+
-+	unicam_put(node->dev);
-+}
-+
-+static int register_node(struct unicam_device *unicam, struct unicam_node *node,
-+			 enum v4l2_buf_type type, int pad_id)
-+{
-+	struct video_device *vdev;
-+	struct vb2_queue *q;
-+	struct v4l2_mbus_framefmt mbus_fmt = {0};
-+	const struct unicam_fmt *fmt;
-+	int ret;
-+
-+	if (pad_id == IMAGE_PAD) {
-+		ret = __subdev_get_format(unicam, &mbus_fmt, pad_id);
-+		if (ret) {
-+			unicam_err(unicam, "Failed to get_format - ret %d\n",
-+				   ret);
-+			return ret;
-+		}
-+
-+		fmt = find_format_by_code(mbus_fmt.code);
-+		if (!fmt) {
-+			/*
-+			 * Find the first format that the sensor and unicam both
-+			 * support
-+			 */
-+			fmt = get_first_supported_format(unicam);
-+
-+			if (!fmt)
-+				/* No compatible formats */
-+				return -EINVAL;
-+
-+			mbus_fmt.code = fmt->code;
-+			ret = __subdev_set_format(unicam, &mbus_fmt, pad_id);
-+			if (ret)
-+				return -EINVAL;
-+		}
-+		if (mbus_fmt.field != V4L2_FIELD_NONE) {
-+			/* Interlaced not supported - disable it now. */
-+			mbus_fmt.field = V4L2_FIELD_NONE;
-+			ret = __subdev_set_format(unicam, &mbus_fmt, pad_id);
-+			if (ret)
-+				return -EINVAL;
-+		}
-+
-+		node->v_fmt.fmt.pix.pixelformat = fmt->fourcc ? fmt->fourcc
-+						: fmt->repacked_fourcc;
-+	} else {
-+		/* Fix this node format as embedded data. */
-+		fmt = find_format_by_code(MEDIA_BUS_FMT_SENSOR_DATA);
-+		node->v_fmt.fmt.meta.dataformat = fmt->fourcc;
-+	}
-+
-+	node->dev = unicam;
-+	node->pad_id = pad_id;
-+	node->fmt = fmt;
-+
-+	/* Read current subdev format */
-+	unicam_reset_format(node);
-+
-+	if (v4l2_subdev_has_op(unicam->sensor, video, s_std)) {
-+		v4l2_std_id tvnorms;
-+
-+		if (WARN_ON(!v4l2_subdev_has_op(unicam->sensor, video,
-+						g_tvnorms)))
-+			/*
-+			 * Subdevice should not advertise s_std but not
-+			 * g_tvnorms
-+			 */
-+			return -EINVAL;
-+
-+		ret = v4l2_subdev_call(unicam->sensor, video,
-+				       g_tvnorms, &tvnorms);
-+		if (WARN_ON(ret))
-+			return -EINVAL;
-+		node->video_dev.tvnorms |= tvnorms;
-+	}
-+
-+	spin_lock_init(&node->dma_queue_lock);
-+	mutex_init(&node->lock);
-+
-+	vdev = &node->video_dev;
-+	if (pad_id == IMAGE_PAD) {
-+		/* Add controls from the subdevice */
-+		ret = v4l2_ctrl_add_handler(&unicam->ctrl_handler,
-+					    unicam->sensor->ctrl_handler, NULL,
-+					    true);
-+		if (ret < 0)
-+			return ret;
-+
-+		/*
-+		 * If the sensor subdevice has any controls, associate the node
-+		 *  with the ctrl handler to allow access from userland.
-+		 */
-+		if (!list_empty(&unicam->ctrl_handler.ctrls))
-+			vdev->ctrl_handler = &unicam->ctrl_handler;
-+	}
-+
-+	q = &node->buffer_queue;
-+	q->type = type;
-+	q->io_modes = VB2_MMAP | VB2_DMABUF | VB2_READ;
-+	q->drv_priv = node;
-+	q->ops = &unicam_video_qops;
-+	q->mem_ops = &vb2_dma_contig_memops;
-+	q->buf_struct_size = sizeof(struct unicam_buffer);
-+	q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
-+	q->lock = &node->lock;
-+	q->min_buffers_needed = 2;
-+	q->dev = &unicam->pdev->dev;
-+
-+	ret = vb2_queue_init(q);
-+	if (ret) {
-+		unicam_err(unicam, "vb2_queue_init() failed\n");
-+		return ret;
-+	}
-+
-+	INIT_LIST_HEAD(&node->dma_queue);
-+
-+	vdev->release = unicam_node_release;
-+	vdev->fops = &unicam_fops;
-+	vdev->ioctl_ops = &unicam_ioctl_ops;
-+	vdev->v4l2_dev = &unicam->v4l2_dev;
-+	vdev->vfl_dir = VFL_DIR_RX;
-+	vdev->queue = q;
-+	vdev->lock = &node->lock;
-+	vdev->device_caps = (pad_id == IMAGE_PAD) ?
-+			    (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING) :
-+			    (V4L2_CAP_META_CAPTURE | V4L2_CAP_STREAMING);
-+
-+	/* Define the device names */
-+	snprintf(vdev->name, sizeof(vdev->name), "%s-%s", UNICAM_MODULE_NAME,
-+		 pad_id == IMAGE_PAD ? "image" : "embedded");
-+
-+	video_set_drvdata(vdev, node);
-+	if (pad_id == IMAGE_PAD)
-+		vdev->entity.flags |= MEDIA_ENT_FL_DEFAULT;
-+	node->pad.flags = MEDIA_PAD_FL_SINK;
-+	media_entity_pads_init(&vdev->entity, 1, &node->pad);
-+
-+	node->dummy_buf_cpu_addr = dma_alloc_coherent(&unicam->pdev->dev,
-+						      DUMMY_BUF_SIZE,
-+						      &node->dummy_buf_dma_addr,
-+						      GFP_KERNEL);
-+	if (!node->dummy_buf_cpu_addr) {
-+		unicam_err(unicam, "Unable to allocate dummy buffer.\n");
-+		return -ENOMEM;
-+	}
-+
-+	if (pad_id == METADATA_PAD) {
-+		v4l2_disable_ioctl(vdev, VIDIOC_DQEVENT);
-+		v4l2_disable_ioctl(vdev, VIDIOC_SUBSCRIBE_EVENT);
-+		v4l2_disable_ioctl(vdev, VIDIOC_UNSUBSCRIBE_EVENT);
-+	}
-+	if (pad_id == METADATA_PAD ||
-+	    !v4l2_subdev_has_op(unicam->sensor, video, s_std)) {
-+		v4l2_disable_ioctl(&node->video_dev, VIDIOC_S_STD);
-+		v4l2_disable_ioctl(&node->video_dev, VIDIOC_G_STD);
-+		v4l2_disable_ioctl(&node->video_dev, VIDIOC_ENUMSTD);
-+	}
-+	if (pad_id == METADATA_PAD ||
-+	    !v4l2_subdev_has_op(unicam->sensor, video, querystd))
-+		v4l2_disable_ioctl(&node->video_dev, VIDIOC_QUERYSTD);
-+	if (pad_id == METADATA_PAD ||
-+	    !v4l2_subdev_has_op(unicam->sensor, video, s_dv_timings)) {
-+		v4l2_disable_ioctl(&node->video_dev, VIDIOC_S_EDID);
-+		v4l2_disable_ioctl(&node->video_dev, VIDIOC_G_EDID);
-+		v4l2_disable_ioctl(&node->video_dev, VIDIOC_DV_TIMINGS_CAP);
-+		v4l2_disable_ioctl(&node->video_dev, VIDIOC_G_DV_TIMINGS);
-+		v4l2_disable_ioctl(&node->video_dev, VIDIOC_S_DV_TIMINGS);
-+		v4l2_disable_ioctl(&node->video_dev, VIDIOC_ENUM_DV_TIMINGS);
-+		v4l2_disable_ioctl(&node->video_dev, VIDIOC_QUERY_DV_TIMINGS);
-+	}
-+	if (pad_id == METADATA_PAD ||
-+	    !v4l2_subdev_has_op(unicam->sensor, pad, enum_frame_interval))
-+		v4l2_disable_ioctl(&node->video_dev,
-+				   VIDIOC_ENUM_FRAMEINTERVALS);
-+	if (pad_id == METADATA_PAD ||
-+	    !v4l2_subdev_has_op(unicam->sensor, video, g_frame_interval))
-+		v4l2_disable_ioctl(&node->video_dev, VIDIOC_G_PARM);
-+	if (pad_id == METADATA_PAD ||
-+	    !v4l2_subdev_has_op(unicam->sensor, video, s_frame_interval))
-+		v4l2_disable_ioctl(&node->video_dev, VIDIOC_S_PARM);
-+
-+	if (pad_id == METADATA_PAD ||
-+	    !v4l2_subdev_has_op(unicam->sensor, pad, enum_frame_size))
-+		v4l2_disable_ioctl(&node->video_dev, VIDIOC_ENUM_FRAMESIZES);
-+
-+	if (node->pad_id == METADATA_PAD ||
-+	    !v4l2_subdev_has_op(unicam->sensor, pad, set_selection))
-+		v4l2_disable_ioctl(&node->video_dev, VIDIOC_S_SELECTION);
-+
-+	if (node->pad_id == METADATA_PAD ||
-+	    !v4l2_subdev_has_op(unicam->sensor, pad, get_selection))
-+		v4l2_disable_ioctl(&node->video_dev, VIDIOC_G_SELECTION);
-+
-+	ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
-+	if (ret) {
-+		unicam_err(unicam, "Unable to register video device %s\n",
-+			   vdev->name);
-+		return ret;
-+	}
-+
-+	/*
-+	 * Acquire a reference to unicam, which will be released when the video
-+	 * device will be unregistered and userspace will have closed all open
-+	 * file handles.
-+	 */
-+	unicam_get(unicam);
-+	node->registered = true;
-+
-+	if (pad_id != METADATA_PAD || unicam->sensor_embedded_data) {
-+		ret = media_create_pad_link(&unicam->sensor->entity, pad_id,
-+					    &node->video_dev.entity, 0,
-+					    MEDIA_LNK_FL_ENABLED |
-+					    MEDIA_LNK_FL_IMMUTABLE);
-+		if (ret)
-+			unicam_err(unicam, "Unable to create pad link for %s\n",
-+				   vdev->name);
-+	}
-+
-+	return ret;
-+}
-+
-+static void unregister_nodes(struct unicam_device *unicam)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(unicam->node); i++) {
-+		struct unicam_node *node = &unicam->node[i];
-+
-+		if (node->dummy_buf_cpu_addr) {
-+			dma_free_coherent(&unicam->pdev->dev, DUMMY_BUF_SIZE,
-+					  node->dummy_buf_cpu_addr,
-+					  node->dummy_buf_dma_addr);
-+		}
-+
-+		if (node->registered) {
-+			node->registered = false;
-+			video_unregister_device(&node->video_dev);
-+		}
-+	}
-+}
-+
-+static int unicam_probe_complete(struct unicam_device *unicam)
-+{
-+	int ret;
-+
-+	unicam->v4l2_dev.notify = unicam_notify;
-+
-+	unicam->sensor_config = v4l2_subdev_alloc_pad_config(unicam->sensor);
-+	if (!unicam->sensor_config)
-+		return -ENOMEM;
-+
-+	unicam->sensor_embedded_data = (unicam->sensor->entity.num_pads >= 2);
-+
-+	ret = register_node(unicam, &unicam->node[IMAGE_PAD],
-+			    V4L2_BUF_TYPE_VIDEO_CAPTURE, IMAGE_PAD);
-+	if (ret) {
-+		unicam_err(unicam, "Unable to register image video device.\n");
-+		goto unregister;
-+	}
-+
-+	ret = register_node(unicam, &unicam->node[METADATA_PAD],
-+			    V4L2_BUF_TYPE_META_CAPTURE, METADATA_PAD);
-+	if (ret) {
-+		unicam_err(unicam, "Unable to register metadata video device.\n");
-+		goto unregister;
-+	}
-+
-+	ret = v4l2_device_register_ro_subdev_nodes(&unicam->v4l2_dev);
-+	if (ret) {
-+		unicam_err(unicam, "Unable to register subdev nodes.\n");
-+		goto unregister;
-+	}
-+
-+	/*
-+	 * Release the initial reference, all references are now owned by the
-+	 * video devices.
-+	 */
-+	unicam_put(unicam);
-+	return 0;
-+
-+unregister:
-+	unregister_nodes(unicam);
-+	unicam_put(unicam);
-+
-+	return ret;
-+}
-+
-+static int unicam_async_complete(struct v4l2_async_notifier *notifier)
-+{
-+	struct unicam_device *unicam = to_unicam_device(notifier->v4l2_dev);
-+
-+	return unicam_probe_complete(unicam);
-+}
-+
-+static const struct v4l2_async_notifier_operations unicam_async_ops = {
-+	.bound = unicam_async_bound,
-+	.complete = unicam_async_complete,
-+};
-+
-+static int of_unicam_connect_subdevs(struct unicam_device *dev)
-+{
-+	struct platform_device *pdev = dev->pdev;
-+	struct v4l2_fwnode_endpoint ep = { 0 };
-+	struct device_node *ep_node;
-+	struct device_node *sensor_node;
-+	unsigned int lane;
-+	int ret = -EINVAL;
-+
-+	if (of_property_read_u32(pdev->dev.of_node, "brcm,num-data-lanes",
-+				 &dev->max_data_lanes) < 0) {
-+		unicam_err(dev, "number of data lanes not set\n");
-+		return -EINVAL;
-+	}
-+
-+	/* Get the local endpoint and remote device. */
-+	ep_node = of_graph_get_next_endpoint(pdev->dev.of_node, NULL);
-+	if (!ep_node) {
-+		unicam_dbg(3, dev, "can't get next endpoint\n");
-+		return -EINVAL;
-+	}
-+
-+	unicam_dbg(3, dev, "ep_node is %pOF\n", ep_node);
-+
-+	sensor_node = of_graph_get_remote_port_parent(ep_node);
-+	if (!sensor_node) {
-+		unicam_dbg(3, dev, "can't get remote parent\n");
-+		goto cleanup_exit;
-+	}
-+
-+	unicam_dbg(1, dev, "found subdevice %pOF\n", sensor_node);
-+
-+	/* Parse the local endpoint and validate its configuration. */
-+	v4l2_fwnode_endpoint_parse(of_fwnode_handle(ep_node), &ep);
-+
-+	unicam_dbg(3, dev, "parsed local endpoint, bus_type %u\n",
-+		   ep.bus_type);
-+
-+	dev->bus_type = ep.bus_type;
-+
-+	switch (ep.bus_type) {
-+	case V4L2_MBUS_CSI2_DPHY:
-+		switch (ep.bus.mipi_csi2.num_data_lanes) {
-+		case 1:
-+		case 2:
-+		case 4:
-+			break;
-+
-+		default:
-+			unicam_err(dev, "subdevice %pOF: %u data lanes not supported\n",
-+				   sensor_node,
-+				   ep.bus.mipi_csi2.num_data_lanes);
-+			goto cleanup_exit;
-+		}
-+
-+		for (lane = 0; lane < ep.bus.mipi_csi2.num_data_lanes; lane++) {
-+			if (ep.bus.mipi_csi2.data_lanes[lane] != lane + 1) {
-+				unicam_err(dev, "subdevice %pOF: data lanes reordering not supported\n",
-+					   sensor_node);
-+				goto cleanup_exit;
-+			}
-+		}
-+
-+		if (ep.bus.mipi_csi2.num_data_lanes > dev->max_data_lanes) {
-+			unicam_err(dev, "subdevice requires %u data lanes when %u are supported\n",
-+				   ep.bus.mipi_csi2.num_data_lanes,
-+				   dev->max_data_lanes);
-+		}
-+
-+		dev->max_data_lanes = ep.bus.mipi_csi2.num_data_lanes;
-+		dev->bus_flags = ep.bus.mipi_csi2.flags;
-+
-+		break;
-+
-+	case V4L2_MBUS_CCP2:
-+		if (ep.bus.mipi_csi1.clock_lane != 0 ||
-+		    ep.bus.mipi_csi1.data_lane != 1) {
-+			unicam_err(dev, "subdevice %pOF: unsupported lanes configuration\n",
-+				   sensor_node);
-+			goto cleanup_exit;
-+		}
-+
-+		dev->max_data_lanes = 1;
-+		dev->bus_flags = ep.bus.mipi_csi1.strobe;
-+		break;
-+
-+	default:
-+		/* Unsupported bus type */
-+		unicam_err(dev, "subdevice %pOF: unsupported bus type %u\n",
-+			   sensor_node, ep.bus_type);
-+		goto cleanup_exit;
-+	}
-+
-+	unicam_dbg(3, dev, "subdevice %pOF: %s bus, %u data lanes, flags=0x%08x\n",
-+		   sensor_node,
-+		   dev->bus_type == V4L2_MBUS_CSI2_DPHY ? "CSI-2" : "CCP2",
-+		   dev->max_data_lanes, dev->bus_flags);
-+
-+	/* Initialize and register the async notifier. */
-+	v4l2_async_nf_init(&dev->notifier);
-+	dev->notifier.ops = &unicam_async_ops;
-+
-+	dev->asd.match_type = V4L2_ASYNC_MATCH_FWNODE;
-+	dev->asd.match.fwnode = of_fwnode_handle(sensor_node);
-+	ret = __v4l2_async_nf_add_subdev(&dev->notifier, &dev->asd);
-+	if (ret) {
-+		unicam_err(dev, "Error adding subdevice: %d\n", ret);
-+		goto cleanup_exit;
-+	}
-+
-+	ret = v4l2_async_nf_register(&dev->v4l2_dev, &dev->notifier);
-+	if (ret) {
-+		unicam_err(dev, "Error registering async notifier: %d\n", ret);
-+		ret = -EINVAL;
-+	}
-+
-+cleanup_exit:
-+	of_node_put(sensor_node);
-+	of_node_put(ep_node);
-+
-+	return ret;
-+}
-+
-+static int unicam_probe(struct platform_device *pdev)
-+{
-+	struct unicam_device *unicam;
-+	int ret;
-+
-+	unicam = kzalloc(sizeof(*unicam), GFP_KERNEL);
-+	if (!unicam)
-+		return -ENOMEM;
-+
-+	kref_init(&unicam->kref);
-+	unicam->pdev = pdev;
-+
-+	unicam->base = devm_platform_ioremap_resource(pdev, 0);
-+	if (IS_ERR(unicam->base)) {
-+		unicam_err(unicam, "Failed to get main io block\n");
-+		ret = PTR_ERR(unicam->base);
-+		goto err_unicam_put;
-+	}
-+
-+	unicam->clk_gate_base = devm_platform_ioremap_resource(pdev, 1);
-+	if (IS_ERR(unicam->clk_gate_base)) {
-+		unicam_err(unicam, "Failed to get 2nd io block\n");
-+		ret = PTR_ERR(unicam->clk_gate_base);
-+		goto err_unicam_put;
-+	}
-+
-+	unicam->clock = devm_clk_get(&pdev->dev, "lp");
-+	if (IS_ERR(unicam->clock)) {
-+		unicam_err(unicam, "Failed to get clock\n");
-+		ret = PTR_ERR(unicam->clock);
-+		goto err_unicam_put;
-+	}
-+
-+	ret = platform_get_irq(pdev, 0);
-+	if (ret <= 0) {
-+		dev_err(&pdev->dev, "No IRQ resource\n");
-+		ret = -EINVAL;
-+		goto err_unicam_put;
-+	}
-+
-+	ret = devm_request_irq(&pdev->dev, ret, unicam_isr, 0,
-+			       "unicam_capture0", unicam);
-+	if (ret) {
-+		dev_err(&pdev->dev, "Unable to request interrupt\n");
-+		ret = -EINVAL;
-+		goto err_unicam_put;
-+	}
-+
-+	unicam->mdev.dev = &pdev->dev;
-+	strscpy(unicam->mdev.model, UNICAM_MODULE_NAME,
-+		sizeof(unicam->mdev.model));
-+	strscpy(unicam->mdev.serial, "", sizeof(unicam->mdev.serial));
-+	snprintf(unicam->mdev.bus_info, sizeof(unicam->mdev.bus_info),
-+		 "platform:%s", dev_name(&pdev->dev));
-+	unicam->mdev.hw_revision = 0;
-+
-+	media_device_init(&unicam->mdev);
-+
-+	unicam->v4l2_dev.mdev = &unicam->mdev;
-+
-+	ret = v4l2_device_register(&pdev->dev, &unicam->v4l2_dev);
-+	if (ret) {
-+		unicam_err(unicam,
-+			   "Unable to register v4l2 device.\n");
-+		goto err_unicam_put;
-+	}
-+
-+	ret = media_device_register(&unicam->mdev);
-+	if (ret < 0) {
-+		unicam_err(unicam,
-+			   "Unable to register media-controller device.\n");
-+		goto err_v4l2_unregister;
-+	}
-+
-+	/* Reserve space for the controls */
-+	ret = v4l2_ctrl_handler_init(&unicam->ctrl_handler, 16);
-+	if (ret < 0)
-+		goto err_media_unregister;
-+
-+	/* set the driver data in platform device */
-+	platform_set_drvdata(pdev, unicam);
-+
-+	ret = of_unicam_connect_subdevs(unicam);
-+	if (ret) {
-+		dev_err(&pdev->dev, "Failed to connect subdevs\n");
-+		goto err_media_unregister;
-+	}
-+
-+	/* Enable the block power domain */
-+	pm_runtime_enable(&pdev->dev);
-+
-+	return 0;
-+
-+err_media_unregister:
-+	media_device_unregister(&unicam->mdev);
-+err_v4l2_unregister:
-+	v4l2_device_unregister(&unicam->v4l2_dev);
-+err_unicam_put:
-+	unicam_put(unicam);
-+
-+	return ret;
-+}
-+
-+static int unicam_remove(struct platform_device *pdev)
-+{
-+	struct unicam_device *unicam = platform_get_drvdata(pdev);
-+
-+	unicam_dbg(2, unicam, "%s\n", __func__);
-+
-+	v4l2_async_nf_unregister(&unicam->notifier);
-+	v4l2_device_unregister(&unicam->v4l2_dev);
-+	media_device_unregister(&unicam->mdev);
-+	unregister_nodes(unicam);
-+
-+	pm_runtime_disable(&pdev->dev);
-+
-+	return 0;
-+}
-+
-+static const struct of_device_id unicam_of_match[] = {
-+	{ .compatible = "brcm,bcm2835-unicam", },
-+	{ /* sentinel */ },
-+};
-+MODULE_DEVICE_TABLE(of, unicam_of_match);
-+
-+static struct platform_driver unicam_driver = {
-+	.probe		= unicam_probe,
-+	.remove		= unicam_remove,
-+	.driver = {
-+		.name	= UNICAM_MODULE_NAME,
-+		.of_match_table = of_match_ptr(unicam_of_match),
-+	},
-+};
-+
-+module_platform_driver(unicam_driver);
-+
-+MODULE_AUTHOR("Dave Stevenson <dave.stevenson@raspberrypi.com>");
-+MODULE_DESCRIPTION("BCM2835 Unicam driver");
-+MODULE_LICENSE("GPL");
-+MODULE_VERSION(UNICAM_VERSION);
---- /dev/null
-+++ b/drivers/media/platform/bcm2835/vc4-regs-unicam.h
-@@ -0,0 +1,253 @@
-+/* SPDX-License-Identifier: GPL-2.0-only */
-+
-+/*
-+ * Copyright (C) 2017-2020 Raspberry Pi Trading.
-+ * Dave Stevenson <dave.stevenson@raspberrypi.com>
-+ */
-+
-+#ifndef VC4_REGS_UNICAM_H
-+#define VC4_REGS_UNICAM_H
-+
-+/*
-+ * The following values are taken from files found within the code drop
-+ * made by Broadcom for the BCM21553 Graphics Driver, predominantly in
-+ * brcm_usrlib/dag/vmcsx/vcinclude/hardware_vc4.h.
-+ * They have been modified to be only the register offset.
-+ */
-+#define UNICAM_CTRL	0x000
-+#define UNICAM_STA	0x004
-+#define UNICAM_ANA	0x008
-+#define UNICAM_PRI	0x00c
-+#define UNICAM_CLK	0x010
-+#define UNICAM_CLT	0x014
-+#define UNICAM_DAT0	0x018
-+#define UNICAM_DAT1	0x01c
-+#define UNICAM_DAT2	0x020
-+#define UNICAM_DAT3	0x024
-+#define UNICAM_DLT	0x028
-+#define UNICAM_CMP0	0x02c
-+#define UNICAM_CMP1	0x030
-+#define UNICAM_CAP0	0x034
-+#define UNICAM_CAP1	0x038
-+#define UNICAM_ICTL	0x100
-+#define UNICAM_ISTA	0x104
-+#define UNICAM_IDI0	0x108
-+#define UNICAM_IPIPE	0x10c
-+#define UNICAM_IBSA0	0x110
-+#define UNICAM_IBEA0	0x114
-+#define UNICAM_IBLS	0x118
-+#define UNICAM_IBWP	0x11c
-+#define UNICAM_IHWIN	0x120
-+#define UNICAM_IHSTA	0x124
-+#define UNICAM_IVWIN	0x128
-+#define UNICAM_IVSTA	0x12c
-+#define UNICAM_ICC	0x130
-+#define UNICAM_ICS	0x134
-+#define UNICAM_IDC	0x138
-+#define UNICAM_IDPO	0x13c
-+#define UNICAM_IDCA	0x140
-+#define UNICAM_IDCD	0x144
-+#define UNICAM_IDS	0x148
-+#define UNICAM_DCS	0x200
-+#define UNICAM_DBSA0	0x204
-+#define UNICAM_DBEA0	0x208
-+#define UNICAM_DBWP	0x20c
-+#define UNICAM_DBCTL	0x300
-+#define UNICAM_IBSA1	0x304
-+#define UNICAM_IBEA1	0x308
-+#define UNICAM_IDI1	0x30c
-+#define UNICAM_DBSA1	0x310
-+#define UNICAM_DBEA1	0x314
-+#define UNICAM_MISC	0x400
-+
-+/*
-+ * The following bitmasks are from the kernel released by Broadcom
-+ * for Android - https://android.googlesource.com/kernel/bcm/
-+ * The Rhea, Hawaii, and Java chips all contain the same VideoCore4
-+ * Unicam block as BCM2835, as defined in eg
-+ * arch/arm/mach-rhea/include/mach/rdb_A0/brcm_rdb_cam.h and similar.
-+ * Values reworked to use the kernel BIT and GENMASK macros.
-+ *
-+ * Some of the bit mnenomics have been amended to match the datasheet.
-+ */
-+/* UNICAM_CTRL Register */
-+#define UNICAM_CPE		BIT(0)
-+#define UNICAM_MEM		BIT(1)
-+#define UNICAM_CPR		BIT(2)
-+#define UNICAM_CPM_MASK		GENMASK(3, 3)
-+#define UNICAM_CPM_CSI2		0
-+#define UNICAM_CPM_CCP2		1
-+#define UNICAM_SOE		BIT(4)
-+#define UNICAM_DCM_MASK		GENMASK(5, 5)
-+#define UNICAM_DCM_STROBE	0
-+#define UNICAM_DCM_DATA		1
-+#define UNICAM_SLS		BIT(6)
-+#define UNICAM_PFT_MASK		GENMASK(11, 8)
-+#define UNICAM_OET_MASK		GENMASK(20, 12)
-+
-+/* UNICAM_STA Register */
-+#define UNICAM_SYN		BIT(0)
-+#define UNICAM_CS		BIT(1)
-+#define UNICAM_SBE		BIT(2)
-+#define UNICAM_PBE		BIT(3)
-+#define UNICAM_HOE		BIT(4)
-+#define UNICAM_PLE		BIT(5)
-+#define UNICAM_SSC		BIT(6)
-+#define UNICAM_CRCE		BIT(7)
-+#define UNICAM_OES		BIT(8)
-+#define UNICAM_IFO		BIT(9)
-+#define UNICAM_OFO		BIT(10)
-+#define UNICAM_BFO		BIT(11)
-+#define UNICAM_DL		BIT(12)
-+#define UNICAM_PS		BIT(13)
-+#define UNICAM_IS		BIT(14)
-+#define UNICAM_PI0		BIT(15)
-+#define UNICAM_PI1		BIT(16)
-+#define UNICAM_FSI_S		BIT(17)
-+#define UNICAM_FEI_S		BIT(18)
-+#define UNICAM_LCI_S		BIT(19)
-+#define UNICAM_BUF0_RDY		BIT(20)
-+#define UNICAM_BUF0_NO		BIT(21)
-+#define UNICAM_BUF1_RDY		BIT(22)
-+#define UNICAM_BUF1_NO		BIT(23)
-+#define UNICAM_DI		BIT(24)
-+
-+#define UNICAM_STA_MASK_ALL \
-+		(UNICAM_DL + \
-+		UNICAM_SBE + \
-+		UNICAM_PBE + \
-+		UNICAM_HOE + \
-+		UNICAM_PLE + \
-+		UNICAM_SSC + \
-+		UNICAM_CRCE + \
-+		UNICAM_IFO + \
-+		UNICAM_OFO + \
-+		UNICAM_PS + \
-+		UNICAM_PI0 + \
-+		UNICAM_PI1)
-+
-+/* UNICAM_ANA Register */
-+#define UNICAM_APD		BIT(0)
-+#define UNICAM_BPD		BIT(1)
-+#define UNICAM_AR		BIT(2)
-+#define UNICAM_DDL		BIT(3)
-+#define UNICAM_CTATADJ_MASK	GENMASK(7, 4)
-+#define UNICAM_PTATADJ_MASK	GENMASK(11, 8)
-+
-+/* UNICAM_PRI Register */
-+#define UNICAM_PE		BIT(0)
-+#define UNICAM_PT_MASK		GENMASK(2, 1)
-+#define UNICAM_NP_MASK		GENMASK(7, 4)
-+#define UNICAM_PP_MASK		GENMASK(11, 8)
-+#define UNICAM_BS_MASK		GENMASK(15, 12)
-+#define UNICAM_BL_MASK		GENMASK(17, 16)
-+
-+/* UNICAM_CLK Register */
-+#define UNICAM_CLE		BIT(0)
-+#define UNICAM_CLPD		BIT(1)
-+#define UNICAM_CLLPE		BIT(2)
-+#define UNICAM_CLHSE		BIT(3)
-+#define UNICAM_CLTRE		BIT(4)
-+#define UNICAM_CLAC_MASK	GENMASK(8, 5)
-+#define UNICAM_CLSTE		BIT(29)
-+
-+/* UNICAM_CLT Register */
-+#define UNICAM_CLT1_MASK	GENMASK(7, 0)
-+#define UNICAM_CLT2_MASK	GENMASK(15, 8)
-+
-+/* UNICAM_DATn Registers */
-+#define UNICAM_DLE		BIT(0)
-+#define UNICAM_DLPD		BIT(1)
-+#define UNICAM_DLLPE		BIT(2)
-+#define UNICAM_DLHSE		BIT(3)
-+#define UNICAM_DLTRE		BIT(4)
-+#define UNICAM_DLSM		BIT(5)
-+#define UNICAM_DLFO		BIT(28)
-+#define UNICAM_DLSTE		BIT(29)
-+
-+#define UNICAM_DAT_MASK_ALL (UNICAM_DLSTE + UNICAM_DLFO)
-+
-+/* UNICAM_DLT Register */
-+#define UNICAM_DLT1_MASK	GENMASK(7, 0)
-+#define UNICAM_DLT2_MASK	GENMASK(15, 8)
-+#define UNICAM_DLT3_MASK	GENMASK(23, 16)
-+
-+/* UNICAM_ICTL Register */
-+#define UNICAM_FSIE		BIT(0)
-+#define UNICAM_FEIE		BIT(1)
-+#define UNICAM_IBOB		BIT(2)
-+#define UNICAM_FCM		BIT(3)
-+#define UNICAM_TFC		BIT(4)
-+#define UNICAM_LIP_MASK		GENMASK(6, 5)
-+#define UNICAM_LCIE_MASK	GENMASK(28, 16)
-+
-+/* UNICAM_IDI0/1 Register */
-+#define UNICAM_ID0_MASK		GENMASK(7, 0)
-+#define UNICAM_ID1_MASK		GENMASK(15, 8)
-+#define UNICAM_ID2_MASK		GENMASK(23, 16)
-+#define UNICAM_ID3_MASK		GENMASK(31, 24)
-+
-+/* UNICAM_ISTA Register */
-+#define UNICAM_FSI		BIT(0)
-+#define UNICAM_FEI		BIT(1)
-+#define UNICAM_LCI		BIT(2)
-+
-+#define UNICAM_ISTA_MASK_ALL (UNICAM_FSI + UNICAM_FEI + UNICAM_LCI)
-+
-+/* UNICAM_IPIPE Register */
-+#define UNICAM_PUM_MASK		GENMASK(2, 0)
-+		/* Unpacking modes */
-+		#define UNICAM_PUM_NONE		0
-+		#define UNICAM_PUM_UNPACK6	1
-+		#define UNICAM_PUM_UNPACK7	2
-+		#define UNICAM_PUM_UNPACK8	3
-+		#define UNICAM_PUM_UNPACK10	4
-+		#define UNICAM_PUM_UNPACK12	5
-+		#define UNICAM_PUM_UNPACK14	6
-+		#define UNICAM_PUM_UNPACK16	7
-+#define UNICAM_DDM_MASK		GENMASK(6, 3)
-+#define UNICAM_PPM_MASK		GENMASK(9, 7)
-+		/* Packing modes */
-+		#define UNICAM_PPM_NONE		0
-+		#define UNICAM_PPM_PACK8	1
-+		#define UNICAM_PPM_PACK10	2
-+		#define UNICAM_PPM_PACK12	3
-+		#define UNICAM_PPM_PACK14	4
-+		#define UNICAM_PPM_PACK16	5
-+#define UNICAM_DEM_MASK		GENMASK(11, 10)
-+#define UNICAM_DEBL_MASK	GENMASK(14, 12)
-+#define UNICAM_ICM_MASK		GENMASK(16, 15)
-+#define UNICAM_IDM_MASK		GENMASK(17, 17)
-+
-+/* UNICAM_ICC Register */
-+#define UNICAM_ICFL_MASK	GENMASK(4, 0)
-+#define UNICAM_ICFH_MASK	GENMASK(9, 5)
-+#define UNICAM_ICST_MASK	GENMASK(12, 10)
-+#define UNICAM_ICLT_MASK	GENMASK(15, 13)
-+#define UNICAM_ICLL_MASK	GENMASK(31, 16)
-+
-+/* UNICAM_DCS Register */
-+#define UNICAM_DIE		BIT(0)
-+#define UNICAM_DIM		BIT(1)
-+#define UNICAM_DBOB		BIT(3)
-+#define UNICAM_FDE		BIT(4)
-+#define UNICAM_LDP		BIT(5)
-+#define UNICAM_EDL_MASK		GENMASK(15, 8)
-+
-+/* UNICAM_DBCTL Register */
-+#define UNICAM_DBEN		BIT(0)
-+#define UNICAM_BUF0_IE		BIT(1)
-+#define UNICAM_BUF1_IE		BIT(2)
-+
-+/* UNICAM_CMP[0,1] register */
-+#define UNICAM_PCE		BIT(31)
-+#define UNICAM_GI		BIT(9)
-+#define UNICAM_CPH		BIT(8)
-+#define UNICAM_PCVC_MASK	GENMASK(7, 6)
-+#define UNICAM_PCDT_MASK	GENMASK(5, 0)
-+
-+/* UNICAM_MISC register */
-+#define UNICAM_FL0		BIT(6)
-+#define UNICAM_FL1		BIT(9)
-+
-+#endif
diff --git a/target/linux/bcm27xx/patches-6.1/950-0246-media-bcm2835-unicam-Kconfig-Makefile-for-CCP2-CSI2-.patch b/target/linux/bcm27xx/patches-6.1/950-0246-media-bcm2835-unicam-Kconfig-Makefile-for-CCP2-CSI2-.patch
deleted file mode 100644
index 90dcf0e3ff..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0246-media-bcm2835-unicam-Kconfig-Makefile-for-CCP2-CSI2-.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 481426aced8114d03e3ced044c4094299675656d Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Wed, 1 Apr 2020 08:39:49 +0100
-Subject: [PATCH] media: bcm2835-unicam: Kconfig/Makefile for CCP2/CSI2
- camera interface
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- MAINTAINERS                     | 2 +-
- drivers/media/platform/Kconfig  | 1 +
- drivers/media/platform/Makefile | 1 +
- 3 files changed, 3 insertions(+), 1 deletion(-)
-
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -4038,7 +4038,7 @@ F:	Documentation/devicetree/bindings/med
- F:	drivers/staging/media/rpivid
- 
- BROADCOM BCM2835 CAMERA DRIVER
--M:	Dave Stevenson <dave.stevenson@raspberrypi.org>
-+M:	Raspberry Pi Kernel Maintenance <kernel-list@raspberrypi.com>
- L:	linux-media@vger.kernel.org
- S:	Maintained
- F:	drivers/media/platform/bcm2835/
---- a/drivers/media/platform/Kconfig
-+++ b/drivers/media/platform/Kconfig
-@@ -67,6 +67,7 @@ source "drivers/media/platform/amlogic/K
- source "drivers/media/platform/amphion/Kconfig"
- source "drivers/media/platform/aspeed/Kconfig"
- source "drivers/media/platform/atmel/Kconfig"
-+source "drivers/media/platform/bcm2835/Kconfig"
- source "drivers/media/platform/cadence/Kconfig"
- source "drivers/media/platform/chips-media/Kconfig"
- source "drivers/media/platform/intel/Kconfig"
---- a/drivers/media/platform/Makefile
-+++ b/drivers/media/platform/Makefile
-@@ -10,6 +10,7 @@ obj-y += amlogic/
- obj-y += amphion/
- obj-y += aspeed/
- obj-y += atmel/
-+obj-y += bcm2835/
- obj-y += cadence/
- obj-y += chips-media/
- obj-y += intel/
diff --git a/target/linux/bcm27xx/patches-6.1/950-0247-media-bcm2835-unicam-Add-support-for-get_mbus_config.patch b/target/linux/bcm27xx/patches-6.1/950-0247-media-bcm2835-unicam-Add-support-for-get_mbus_config.patch
deleted file mode 100644
index 79646d1012..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0247-media-bcm2835-unicam-Add-support-for-get_mbus_config.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 17aef1abe2ca8c01725954f7f7c7b3d7a29cb256 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 23 Jun 2020 14:32:51 +0100
-Subject: [PATCH] media: bcm2835-unicam: Add support for
- get_mbus_config to set num lanes
-
-Use the get_mbus_config pad subdev call to allow a source to use
-fewer than the number of CSI2 lanes defined in device tree.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../media/platform/bcm2835/bcm2835-unicam.c   | 31 ++++++++++++++++---
- 1 file changed, 27 insertions(+), 4 deletions(-)
-
---- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
-+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -1641,12 +1641,35 @@ static int unicam_start_streaming(struct
- 		goto err_streaming;
- 	}
- 
--	/*
--	 * TODO: Retrieve the number of active data lanes from the connected
--	 * subdevice.
--	 */
- 	dev->active_data_lanes = dev->max_data_lanes;
- 
-+	if (dev->bus_type == V4L2_MBUS_CSI2_DPHY) {
-+		struct v4l2_mbus_config mbus_config = { 0 };
-+
-+		ret = v4l2_subdev_call(dev->sensor, pad, get_mbus_config,
-+				       0, &mbus_config);
-+		if (ret < 0 && ret != -ENOIOCTLCMD) {
-+			unicam_dbg(3, dev, "g_mbus_config failed\n");
-+			goto err_pm_put;
-+		}
-+
-+		dev->active_data_lanes =
-+			(mbus_config.flags & V4L2_MBUS_CSI2_LANE_MASK) >>
-+					__ffs(V4L2_MBUS_CSI2_LANE_MASK);
-+		if (!dev->active_data_lanes)
-+			dev->active_data_lanes = dev->max_data_lanes;
-+		if (dev->active_data_lanes > dev->max_data_lanes) {
-+			unicam_err(dev, "Device has requested %u data lanes, which is >%u configured in DT\n",
-+				   dev->active_data_lanes,
-+				   dev->max_data_lanes);
-+			ret = -EINVAL;
-+			goto err_pm_put;
-+		}
-+	}
-+
-+	unicam_dbg(1, dev, "Running with %u data lanes\n",
-+		   dev->active_data_lanes);
-+
- 	ret = clk_set_rate(dev->clock, 100 * 1000 * 1000);
- 	if (ret) {
- 		unicam_err(dev, "failed to set up clock\n");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0248-media-bcm2835-unicam-Avoid-gcc-warning-over-0-on-end.patch b/target/linux/bcm27xx/patches-6.1/950-0248-media-bcm2835-unicam-Avoid-gcc-warning-over-0-on-end.patch
deleted file mode 100644
index 6c6e4fe6fe..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0248-media-bcm2835-unicam-Avoid-gcc-warning-over-0-on-end.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f64b2674da1aa8d92ca6021a52faec4db4851ffb Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 26 Jun 2020 15:53:44 +0100
-Subject: [PATCH] media: bcm2835-unicam: Avoid gcc warning over {0} on
- endpoint
-
-Older gcc versions object to = { 0 } initialisation if the first
-elemtn in the structure is a substructure.
-
-Use = { } to avoid this compiler warning.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/platform/bcm2835/bcm2835-unicam.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
-+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -2588,7 +2588,7 @@ static const struct v4l2_async_notifier_
- static int of_unicam_connect_subdevs(struct unicam_device *dev)
- {
- 	struct platform_device *pdev = dev->pdev;
--	struct v4l2_fwnode_endpoint ep = { 0 };
-+	struct v4l2_fwnode_endpoint ep = { };
- 	struct device_node *ep_node;
- 	struct device_node *sensor_node;
- 	unsigned int lane;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0249-serial-8250-bcm2835aux-defer-if-clock-is-zero.patch b/target/linux/bcm27xx/patches-6.1/950-0249-serial-8250-bcm2835aux-defer-if-clock-is-zero.patch
deleted file mode 100644
index 656defb3c7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0249-serial-8250-bcm2835aux-defer-if-clock-is-zero.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 34fb077ceed5166f4426daf21287d2ff4c0d65ca Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 2 Jul 2020 13:53:20 +0100
-Subject: [PATCH] serial: 8250: bcm2835aux - defer if clock is zero
-
-See: https://github.com/raspberrypi/linux/issues/3700
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/tty/serial/8250/8250_bcm2835aux.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/drivers/tty/serial/8250/8250_bcm2835aux.c
-+++ b/drivers/tty/serial/8250/8250_bcm2835aux.c
-@@ -182,6 +182,13 @@ static int bcm2835aux_serial_probe(struc
- 	 */
- 	up.port.uartclk = uartclk * 2;
- 
-+	/* The clock is only queried at probe time, which means we get one shot
-+	 * at this. A zero clock is never going to work and is almost certainly
-+	 * due to a parent not being ready, so prefer to defer.
-+	 */
-+	if (!up.port.uartclk)
-+	    return -EPROBE_DEFER;
-+
- 	/* register the port */
- 	ret = serial8250_register_8250_port(&up);
- 	if (ret < 0) {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0250-media-Add-a-pixel-format-for-MIPI-packed-12bit-luma-.patch b/target/linux/bcm27xx/patches-6.1/950-0250-media-Add-a-pixel-format-for-MIPI-packed-12bit-luma-.patch
deleted file mode 100644
index b32f8cc5d2..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0250-media-Add-a-pixel-format-for-MIPI-packed-12bit-luma-.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 99209ff2c535981889eaff40660c845683a885d6 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 7 May 2020 16:59:03 +0100
-Subject: [PATCH] media: Add a pixel format for MIPI packed 12bit luma
- only.
-
-This is the format used by monochrome 12bit image sensors.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../userspace-api/media/v4l/pixfmt-y12p.rst   | 45 +++++++++++++++++++
- .../userspace-api/media/v4l/yuv-formats.rst   |  1 +
- drivers/media/v4l2-core/v4l2-ioctl.c          |  1 +
- include/uapi/linux/videodev2.h                |  1 +
- 4 files changed, 48 insertions(+)
- create mode 100644 Documentation/userspace-api/media/v4l/pixfmt-y12p.rst
-
---- /dev/null
-+++ b/Documentation/userspace-api/media/v4l/pixfmt-y12p.rst
-@@ -0,0 +1,45 @@
-+.. Permission is granted to copy, distribute and/or modify this
-+.. document under the terms of the GNU Free Documentation License,
-+.. Version 1.1 or any later version published by the Free Software
-+.. Foundation, with no Invariant Sections, no Front-Cover Texts
-+.. and no Back-Cover Texts. A copy of the license is included at
-+.. Documentation/media/uapi/fdl-appendix.rst.
-+..
-+.. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
-+
-+.. _V4L2-PIX-FMT-Y12P:
-+
-+******************************
-+V4L2_PIX_FMT_Y12P ('Y12P')
-+******************************
-+
-+Grey-scale image as a MIPI RAW12 packed array
-+
-+
-+Description
-+===========
-+
-+This is a packed grey-scale image format with a depth of 12 bits per
-+pixel. Two consecutive pixels are packed into 3 bytes. The first 2 bytes
-+contain the 8 high order bits of the pixels, and the 3rd byte contains the 4
-+least significants bits of each pixel, in the same order.
-+
-+**Byte Order.**
-+Each cell is one byte.
-+
-+.. tabularcolumns:: |p{2.2cm}|p{1.2cm}|p{1.2cm}|p{3.1cm}|
-+
-+
-+.. flat-table::
-+    :header-rows:  0
-+    :stub-columns: 0
-+    :widths:       2 1 1 1
-+
-+
-+    -  -  start + 0:
-+       -  Y'\ :sub:`00high`
-+       -  Y'\ :sub:`01high`
-+       -  Y'\ :sub:`01low`\ (bits 7--4)
-+
-+          Y'\ :sub:`00low`\ (bits 3--0)
-+
---- a/Documentation/userspace-api/media/v4l/yuv-formats.rst
-+++ b/Documentation/userspace-api/media/v4l/yuv-formats.rst
-@@ -267,6 +267,7 @@ image.
-     pixfmt-packed-yuv
-     pixfmt-yuv-planar
-     pixfmt-yuv-luma
-+    pixfmt-y12p
-     pixfmt-y8i
-     pixfmt-y12i
-     pixfmt-uv8
---- a/drivers/media/v4l2-core/v4l2-ioctl.c
-+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
-@@ -1314,6 +1314,7 @@ static void v4l_fill_fmtdesc(struct v4l2
- 	case V4L2_PIX_FMT_Y16_BE:	descr = "16-bit Greyscale BE"; break;
- 	case V4L2_PIX_FMT_Y10BPACK:	descr = "10-bit Greyscale (Packed)"; break;
- 	case V4L2_PIX_FMT_Y10P:		descr = "10-bit Greyscale (MIPI Packed)"; break;
-+	case V4L2_PIX_FMT_Y12P:		descr = "12-bit Greyscale (MIPI Packed)"; break;
- 	case V4L2_PIX_FMT_IPU3_Y10:	descr = "10-bit greyscale (IPU3 Packed)"; break;
- 	case V4L2_PIX_FMT_Y8I:		descr = "Interleaved 8-bit Greyscale"; break;
- 	case V4L2_PIX_FMT_Y12I:		descr = "Interleaved 12-bit Greyscale"; break;
---- a/include/uapi/linux/videodev2.h
-+++ b/include/uapi/linux/videodev2.h
-@@ -595,6 +595,7 @@ struct v4l2_pix_format {
- /* Grey bit-packed formats */
- #define V4L2_PIX_FMT_Y10BPACK    v4l2_fourcc('Y', '1', '0', 'B') /* 10  Greyscale bit-packed */
- #define V4L2_PIX_FMT_Y10P    v4l2_fourcc('Y', '1', '0', 'P') /* 10  Greyscale, MIPI RAW10 packed */
-+#define V4L2_PIX_FMT_Y12P    v4l2_fourcc('Y', '1', '2', 'P') /* 12  Greyscale, MIPI RAW12 packed */
- #define V4L2_PIX_FMT_IPU3_Y10		v4l2_fourcc('i', 'p', '3', 'y') /* IPU3 packed 10-bit greyscale */
- 
- /* Palette formats */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0251-media-Add-a-pixel-format-for-MIPI-packed-14bit-luma-.patch b/target/linux/bcm27xx/patches-6.1/950-0251-media-Add-a-pixel-format-for-MIPI-packed-14bit-luma-.patch
deleted file mode 100644
index 0ad0f31368..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0251-media-Add-a-pixel-format-for-MIPI-packed-14bit-luma-.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 202bd8f62e30ae4da7b591b09f21e8bcd5913846 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 25 Jun 2020 17:51:03 +0100
-Subject: [PATCH] media: Add a pixel format for MIPI packed 14bit luma
- only.
-
-This is the format used by monochrome 14bit image sensors.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../userspace-api/media/v4l/pixfmt-y14p.rst   | 54 +++++++++++++++++++
- .../userspace-api/media/v4l/yuv-formats.rst   |  1 +
- drivers/media/v4l2-core/v4l2-ioctl.c          |  1 +
- include/uapi/linux/videodev2.h                |  1 +
- 4 files changed, 57 insertions(+)
- create mode 100644 Documentation/userspace-api/media/v4l/pixfmt-y14p.rst
-
---- /dev/null
-+++ b/Documentation/userspace-api/media/v4l/pixfmt-y14p.rst
-@@ -0,0 +1,54 @@
-+.. Permission is granted to copy, distribute and/or modify this
-+.. document under the terms of the GNU Free Documentation License,
-+.. Version 1.1 or any later version published by the Free Software
-+.. Foundation, with no Invariant Sections, no Front-Cover Texts
-+.. and no Back-Cover Texts. A copy of the license is included at
-+.. Documentation/media/uapi/fdl-appendix.rst.
-+..
-+.. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
-+
-+.. _V4L2-PIX-FMT-Y14P:
-+
-+**************************
-+V4L2_PIX_FMT_Y14P ('Y14P')
-+**************************
-+
-+Grey-scale image as a MIPI RAW14 packed array
-+
-+
-+Description
-+===========
-+
-+This is a packed grey-scale image format with a depth of 14 bits per
-+pixel. Every four consecutive samples are packed into seven bytes. Each
-+of the first four bytes contain the eight high order bits of the pixels,
-+and the three following bytes contains the six least significants bits of
-+each pixel, in the same order.
-+
-+**Byte Order.**
-+Each cell is one byte.
-+
-+.. tabularcolumns:: |p{1.8cm}|p{1.0cm}|p{1.0cm}|p{1.0cm}|p{1.1cm}|p{3.3cm}|p{3.3cm}|p{3.3cm}|
-+
-+.. flat-table::
-+    :header-rows:  0
-+    :stub-columns: 0
-+    :widths:       2 1 1 1 1 3 3 3
-+
-+
-+    -  -  start + 0:
-+       -  Y'\ :sub:`00high`
-+       -  Y'\ :sub:`01high`
-+       -  Y'\ :sub:`02high`
-+       -  Y'\ :sub:`03high`
-+       -  Y'\ :sub:`01low bits 1--0`\ (bits 7--6)
-+
-+	  Y'\ :sub:`00low bits 5--0`\ (bits 5--0)
-+
-+       -  Y'\ :sub:`02low bits 3--0`\ (bits 7--4)
-+
-+	  Y'\ :sub:`01low bits 5--2`\ (bits 3--0)
-+
-+       -  Y'\ :sub:`03low bits 5--0`\ (bits 7--2)
-+
-+	  Y'\ :sub:`02low bits 5--4`\ (bits 1--0)
---- a/Documentation/userspace-api/media/v4l/yuv-formats.rst
-+++ b/Documentation/userspace-api/media/v4l/yuv-formats.rst
-@@ -268,6 +268,7 @@ image.
-     pixfmt-yuv-planar
-     pixfmt-yuv-luma
-     pixfmt-y12p
-+    pixfmt-y14p
-     pixfmt-y8i
-     pixfmt-y12i
-     pixfmt-uv8
---- a/drivers/media/v4l2-core/v4l2-ioctl.c
-+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
-@@ -1315,6 +1315,7 @@ static void v4l_fill_fmtdesc(struct v4l2
- 	case V4L2_PIX_FMT_Y10BPACK:	descr = "10-bit Greyscale (Packed)"; break;
- 	case V4L2_PIX_FMT_Y10P:		descr = "10-bit Greyscale (MIPI Packed)"; break;
- 	case V4L2_PIX_FMT_Y12P:		descr = "12-bit Greyscale (MIPI Packed)"; break;
-+	case V4L2_PIX_FMT_Y14P:		descr = "14-bit Greyscale (MIPI Packed)"; break;
- 	case V4L2_PIX_FMT_IPU3_Y10:	descr = "10-bit greyscale (IPU3 Packed)"; break;
- 	case V4L2_PIX_FMT_Y8I:		descr = "Interleaved 8-bit Greyscale"; break;
- 	case V4L2_PIX_FMT_Y12I:		descr = "Interleaved 12-bit Greyscale"; break;
---- a/include/uapi/linux/videodev2.h
-+++ b/include/uapi/linux/videodev2.h
-@@ -596,6 +596,7 @@ struct v4l2_pix_format {
- #define V4L2_PIX_FMT_Y10BPACK    v4l2_fourcc('Y', '1', '0', 'B') /* 10  Greyscale bit-packed */
- #define V4L2_PIX_FMT_Y10P    v4l2_fourcc('Y', '1', '0', 'P') /* 10  Greyscale, MIPI RAW10 packed */
- #define V4L2_PIX_FMT_Y12P    v4l2_fourcc('Y', '1', '2', 'P') /* 12  Greyscale, MIPI RAW12 packed */
-+#define V4L2_PIX_FMT_Y14P    v4l2_fourcc('Y', '1', '4', 'P') /* 14  Greyscale, MIPI RAW12 packed */
- #define V4L2_PIX_FMT_IPU3_Y10		v4l2_fourcc('i', 'p', '3', 'y') /* IPU3 packed 10-bit greyscale */
- 
- /* Palette formats */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0252-media-bcm2835-unicam-Add-support-for-12bit-mono-pack.patch b/target/linux/bcm27xx/patches-6.1/950-0252-media-bcm2835-unicam-Add-support-for-12bit-mono-pack.patch
deleted file mode 100644
index 741b0020b4..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0252-media-bcm2835-unicam-Add-support-for-12bit-mono-pack.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f7554a5aefd22a105202233c1c3b4643956258e8 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 25 Jun 2020 17:53:32 +0100
-Subject: [PATCH] media: bcm2835-unicam: Add support for 12bit mono
- packed format
-
-Now that V4L2_PIX_FMT_Y12P is defined, allow passing raw 12bit
-mono packed data through the peripheral.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/platform/bcm2835/bcm2835-unicam.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
-+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -338,7 +338,7 @@ static const struct unicam_fmt formats[]
- 		.depth		= 10,
- 		.csi_dt		= 0x2b,
- 	}, {
--		/* NB There is no packed V4L2 fourcc for this format. */
-+		.fourcc		= V4L2_PIX_FMT_Y12P,
- 		.repacked_fourcc = V4L2_PIX_FMT_Y12,
- 		.code		= MEDIA_BUS_FMT_Y12_1X12,
- 		.depth		= 12,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0253-media-bcm2835-unicam-Add-support-for-14bit-mono-sour.patch b/target/linux/bcm27xx/patches-6.1/950-0253-media-bcm2835-unicam-Add-support-for-14bit-mono-sour.patch
deleted file mode 100644
index 83b5c5ac3a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0253-media-bcm2835-unicam-Add-support-for-14bit-mono-sour.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 44879ffefba60a72f31d79ff0124c20dc728234e Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 25 Jun 2020 18:03:47 +0100
-Subject: [PATCH] media: bcm2835-unicam: Add support for 14bit mono
- sources
-
-Now that V4L2_PIX_FMT_Y14 and V4L2_PIX_FMT_Y14P are defined,
-allow passing 14bit mono data through the peripheral.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/platform/bcm2835/bcm2835-unicam.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
-+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -343,6 +343,12 @@ static const struct unicam_fmt formats[]
- 		.code		= MEDIA_BUS_FMT_Y12_1X12,
- 		.depth		= 12,
- 		.csi_dt		= 0x2c,
-+	}, {
-+		.fourcc		= V4L2_PIX_FMT_Y14P,
-+		.repacked_fourcc = V4L2_PIX_FMT_Y14,
-+		.code		= MEDIA_BUS_FMT_Y14_1X14,
-+		.depth		= 14,
-+		.csi_dt		= 0x2d,
- 	},
- 	/* Embedded data format */
- 	{
diff --git a/target/linux/bcm27xx/patches-6.1/950-0254-media-bcm2835-unicam-Add-support-for-unpacked-14bit-.patch b/target/linux/bcm27xx/patches-6.1/950-0254-media-bcm2835-unicam-Add-support-for-unpacked-14bit-.patch
deleted file mode 100644
index 94da72254c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0254-media-bcm2835-unicam-Add-support-for-unpacked-14bit-.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From d98080a44a0355e7f4e061678a251022dfecbe08 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 1 Jul 2020 10:57:57 +0100
-Subject: [PATCH] media: bcm2835-unicam: Add support for unpacked 14bit
- Bayer formats
-
-Now that the 14bit non-packed Bayer formats are defined, add them
-into the supported formats lookup table.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/platform/bcm2835/bcm2835-unicam.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
-+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -301,21 +301,25 @@ static const struct unicam_fmt formats[]
- 		.csi_dt		= 0x2c,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_SBGGR14P,
-+		.repacked_fourcc = V4L2_PIX_FMT_SBGGR14,
- 		.code		= MEDIA_BUS_FMT_SBGGR14_1X14,
- 		.depth		= 14,
- 		.csi_dt		= 0x2d,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_SGBRG14P,
-+		.repacked_fourcc = V4L2_PIX_FMT_SGBRG14,
- 		.code		= MEDIA_BUS_FMT_SGBRG14_1X14,
- 		.depth		= 14,
- 		.csi_dt		= 0x2d,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_SGRBG14P,
-+		.repacked_fourcc = V4L2_PIX_FMT_SGRBG14,
- 		.code		= MEDIA_BUS_FMT_SGRBG14_1X14,
- 		.depth		= 14,
- 		.csi_dt		= 0x2d,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_SRGGB14P,
-+		.repacked_fourcc = V4L2_PIX_FMT_SRGGB14,
- 		.code		= MEDIA_BUS_FMT_SRGGB14_1X14,
- 		.depth		= 14,
- 		.csi_dt		= 0x2d,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0255-bcm2835-dma-Add-NO_WAIT_RESP-flag.patch b/target/linux/bcm27xx/patches-6.1/950-0255-bcm2835-dma-Add-NO_WAIT_RESP-flag.patch
deleted file mode 100644
index 5920656893..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0255-bcm2835-dma-Add-NO_WAIT_RESP-flag.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 508a7f2bd30c24122f8137a5234b6fbfc3f1506e Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 1 Jul 2020 20:28:27 +0100
-Subject: [PATCH] bcm2835-dma: Add NO_WAIT_RESP flag
-
-Use bit 27 of the dreq value (the second cell of the DT DMA descriptor)
-to request that the WAIT_RESP bit is not set.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/dma/bcm2835-dma.c | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
---- a/drivers/dma/bcm2835-dma.c
-+++ b/drivers/dma/bcm2835-dma.c
-@@ -165,6 +165,11 @@ struct bcm2835_desc {
- #define BCM2835_DMA_WAIT(x)	((x & 31) << 21) /* add DMA-wait cycles */
- #define BCM2835_DMA_NO_WIDE_BURSTS BIT(26) /* no 2 beat write bursts */
- 
-+/* A fake bit to request that the driver doesn't set the WAIT_RESP bit. */
-+#define BCM2835_DMA_NO_WAIT_RESP BIT(27)
-+#define WAIT_RESP(x) ((x & BCM2835_DMA_NO_WAIT_RESP) ? \
-+		      0 : BCM2835_DMA_WAIT_RESP)
-+
- /* debug register bits */
- #define BCM2835_DMA_DEBUG_LAST_NOT_SET_ERR	BIT(0)
- #define BCM2835_DMA_DEBUG_FIFO_ERR		BIT(1)
-@@ -843,7 +848,7 @@ static struct dma_async_tx_descriptor *b
- 	struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);
- 	struct bcm2835_desc *d;
- 	u32 info = BCM2835_DMA_D_INC | BCM2835_DMA_S_INC;
--	u32 extra = BCM2835_DMA_INT_EN | BCM2835_DMA_WAIT_RESP;
-+	u32 extra = BCM2835_DMA_INT_EN | WAIT_RESP(c->dreq);
- 	size_t max_len = bcm2835_dma_max_frame_length(c);
- 	size_t frames;
- 
-@@ -873,7 +878,7 @@ static struct dma_async_tx_descriptor *b
- 	struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);
- 	struct bcm2835_desc *d;
- 	dma_addr_t src = 0, dst = 0;
--	u32 info = BCM2835_DMA_WAIT_RESP;
-+	u32 info = WAIT_RESP(c->dreq);
- 	u32 extra = BCM2835_DMA_INT_EN;
- 	size_t frames;
- 
-@@ -935,7 +940,7 @@ static struct dma_async_tx_descriptor *b
- 	struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);
- 	struct bcm2835_desc *d;
- 	dma_addr_t src, dst;
--	u32 info = BCM2835_DMA_WAIT_RESP;
-+	u32 info = WAIT_RESP(c->dreq);
- 	u32 extra = 0;
- 	size_t max_len = bcm2835_dma_max_frame_length(c);
- 	size_t frames;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0256-media-bcm2835-unicam-Reinstate-V4L2_CAP_READWRITE-in.patch b/target/linux/bcm27xx/patches-6.1/950-0256-media-bcm2835-unicam-Reinstate-V4L2_CAP_READWRITE-in.patch
deleted file mode 100644
index 9b1d1ce0c5..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0256-media-bcm2835-unicam-Reinstate-V4L2_CAP_READWRITE-in.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 2176d77634f7dc1c14a1214efe6068c785dc2b84 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 7 Jul 2020 14:23:40 +0100
-Subject: [PATCH] media: bcm2835-unicam: Reinstate V4L2_CAP_READWRITE
- in the caps
-
-v4l2-compliance throws a failure if the device doesn't advertise
-V4L2_CAP_READWRITE but allows read or write operations.
-We do support read, so reinstate the flag.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/platform/bcm2835/bcm2835-unicam.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
-+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -2420,8 +2420,8 @@ static int register_node(struct unicam_d
- 	vdev->queue = q;
- 	vdev->lock = &node->lock;
- 	vdev->device_caps = (pad_id == IMAGE_PAD) ?
--			    (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING) :
--			    (V4L2_CAP_META_CAPTURE | V4L2_CAP_STREAMING);
-+				V4L2_CAP_VIDEO_CAPTURE : V4L2_CAP_META_CAPTURE;
-+	vdev->device_caps |= V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;
- 
- 	/* Define the device names */
- 	snprintf(vdev->name, sizeof(vdev->name), "%s-%s", UNICAM_MODULE_NAME,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0257-media-bcm2835-unicam-Ensure-type-is-VIDEO_CAPTURE-in.patch b/target/linux/bcm27xx/patches-6.1/950-0257-media-bcm2835-unicam-Ensure-type-is-VIDEO_CAPTURE-in.patch
deleted file mode 100644
index cb524bccae..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0257-media-bcm2835-unicam-Ensure-type-is-VIDEO_CAPTURE-in.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 8ce292d7cec3a7ac2443c7cfa59dfdaad75a6efa Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 7 Jul 2020 14:52:43 +0100
-Subject: [PATCH] media: bcm2835-unicam: Ensure type is VIDEO_CAPTURE
- in [g|s]_selection
-
-[g|s]_selection pass in a buffer type that needs to be validated
-before passing on to the sensor subdev.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/platform/bcm2835/bcm2835-unicam.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
-+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -1887,6 +1887,9 @@ static int unicam_s_selection(struct fil
- 		.r = sel->r,
- 	};
- 
-+	if (sel->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-+		return -EINVAL;
-+
- 	return v4l2_subdev_call(dev->sensor, pad, set_selection, NULL, &sdsel);
- }
- 
-@@ -1901,6 +1904,9 @@ static int unicam_g_selection(struct fil
- 	};
- 	int ret;
- 
-+	if (sel->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-+		return -EINVAL;
-+
- 	ret = v4l2_subdev_call(dev->sensor, pad, get_selection, NULL, &sdsel);
- 	if (!ret)
- 		sel->r = sdsel.r;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0258-media-bcm2835-unicam-Set-VPU-min-clock-freq-to-250Mh.patch b/target/linux/bcm27xx/patches-6.1/950-0258-media-bcm2835-unicam-Set-VPU-min-clock-freq-to-250Mh.patch
deleted file mode 100644
index 2f6d5f4482..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0258-media-bcm2835-unicam-Set-VPU-min-clock-freq-to-250Mh.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From a0dc48f88e494f662af2378aa9f1c6191e556487 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Mon, 11 May 2020 13:02:22 +0100
-Subject: [PATCH] media: bcm2835: unicam: Set VPU min clock freq to
- 250Mhz.
-
-When streaming with Unicam, the VPU must have a clock frequency of at
-least 250Mhz.  Otherwise, the input fifos could overrun, causing
-image corruption.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- .../media/platform/bcm2835/bcm2835-unicam.c   | 49 +++++++++++++++++--
- 1 file changed, 44 insertions(+), 5 deletions(-)
-
---- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
-+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -91,6 +91,11 @@ MODULE_PARM_DESC(debug, "Debug level 0-3
- 		v4l2_err(&(dev)->v4l2_dev, fmt, ##arg)
- 
- /*
-+ * Unicam must request a minimum of 250Mhz from the VPU clock.
-+ * Otherwise the input FIFOs overrun and cause image corruption.
-+ */
-+#define MIN_VPU_CLOCK_RATE (250 * 1000 * 1000)
-+/*
-  * To protect against a dodgy sensor driver never returning an error from
-  * enum_mbus_code, set a maximum index value to be used.
-  */
-@@ -419,8 +424,10 @@ struct unicam_device {
- 	void __iomem *base;
- 	/* clock gating base address */
- 	void __iomem *clk_gate_base;
--	/* clock handle */
-+	/* lp clock handle */
- 	struct clk *clock;
-+	/* vpu clock handle */
-+	struct clk *vpu_clock;
- 	/* V4l2 device */
- 	struct v4l2_device v4l2_dev;
- 	struct media_device mdev;
-@@ -1680,16 +1687,28 @@ static int unicam_start_streaming(struct
- 	unicam_dbg(1, dev, "Running with %u data lanes\n",
- 		   dev->active_data_lanes);
- 
--	ret = clk_set_rate(dev->clock, 100 * 1000 * 1000);
-+	ret = clk_set_min_rate(dev->vpu_clock, MIN_VPU_CLOCK_RATE);
-+	if (ret) {
-+		unicam_err(dev, "failed to set up VPU clock\n");
-+		goto err_pm_put;
-+	}
-+
-+	ret = clk_prepare_enable(dev->vpu_clock);
- 	if (ret) {
--		unicam_err(dev, "failed to set up clock\n");
-+		unicam_err(dev, "Failed to enable VPU clock: %d\n", ret);
- 		goto err_pm_put;
- 	}
- 
-+	ret = clk_set_rate(dev->clock, 100 * 1000 * 1000);
-+	if (ret) {
-+		unicam_err(dev, "failed to set up CSI clock\n");
-+		goto err_vpu_clock;
-+	}
-+
- 	ret = clk_prepare_enable(dev->clock);
- 	if (ret) {
- 		unicam_err(dev, "Failed to enable CSI clock: %d\n", ret);
--		goto err_pm_put;
-+		goto err_vpu_clock;
- 	}
- 
- 	for (i = 0; i < ARRAY_SIZE(dev->node); i++) {
-@@ -1723,6 +1742,11 @@ static int unicam_start_streaming(struct
- err_disable_unicam:
- 	unicam_disable(dev);
- 	clk_disable_unprepare(dev->clock);
-+err_vpu_clock:
-+	ret = clk_set_min_rate(dev->vpu_clock, 0);
-+	if (ret)
-+		unicam_err(dev, "failed to reset the VPU clock\n");
-+	clk_disable_unprepare(dev->vpu_clock);
- err_pm_put:
- 	unicam_runtime_put(dev);
- err_streaming:
-@@ -1740,6 +1764,8 @@ static void unicam_stop_streaming(struct
- 	node->streaming = false;
- 
- 	if (node->pad_id == IMAGE_PAD) {
-+		int ret;
-+
- 		/*
- 		 * Stop streaming the sensor and disable the peripheral.
- 		 * We cannot continue streaming embedded data with the
-@@ -1749,6 +1775,12 @@ static void unicam_stop_streaming(struct
- 			unicam_err(dev, "stream off failed in subdev\n");
- 
- 		unicam_disable(dev);
-+
-+		ret = clk_set_min_rate(dev->vpu_clock, 0);
-+		if (ret)
-+			unicam_err(dev, "failed to reset the min VPU clock\n");
-+
-+		clk_disable_unprepare(dev->vpu_clock);
- 		clk_disable_unprepare(dev->clock);
- 		unicam_runtime_put(dev);
- 
-@@ -2752,11 +2784,18 @@ static int unicam_probe(struct platform_
- 
- 	unicam->clock = devm_clk_get(&pdev->dev, "lp");
- 	if (IS_ERR(unicam->clock)) {
--		unicam_err(unicam, "Failed to get clock\n");
-+		unicam_err(unicam, "Failed to get lp clock\n");
- 		ret = PTR_ERR(unicam->clock);
- 		goto err_unicam_put;
- 	}
- 
-+	unicam->vpu_clock = devm_clk_get(&pdev->dev, "vpu");
-+	if (IS_ERR(unicam->vpu_clock)) {
-+		unicam_err(unicam, "Failed to get vpu clock\n");
-+		ret = PTR_ERR(unicam->vpu_clock);
-+		goto err_unicam_put;
-+	}
-+
- 	ret = platform_get_irq(pdev, 0);
- 	if (ret <= 0) {
- 		dev_err(&pdev->dev, "No IRQ resource\n");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0259-dt-bindings-bcm2835-unicam-Update-documentation-with.patch b/target/linux/bcm27xx/patches-6.1/950-0259-dt-bindings-bcm2835-unicam-Update-documentation-with.patch
deleted file mode 100644
index 71f286cc95..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0259-dt-bindings-bcm2835-unicam-Update-documentation-with.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 467458d2c7c81ba4af33813e40d7d7c699543232 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Mon, 11 May 2020 13:06:27 +0100
-Subject: [PATCH] dt-bindings: bcm2835-unicam: Update documentation
- with new clock params
-
-Update the documentation to reflect the new "VPU" clock needed
-by the bcm2835-unicam driver.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- .../devicetree/bindings/media/bcm2835-unicam.txt          | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/Documentation/devicetree/bindings/media/bcm2835-unicam.txt
-+++ b/Documentation/devicetree/bindings/media/bcm2835-unicam.txt
-@@ -20,7 +20,7 @@ Required properties:
- - interrupts	: should contain the IRQ line for this Unicam instance.
- - clocks	: list of clock specifiers, corresponding to entries in
- 		  clock-names property.
--- clock-names	: must contain an "lp" entry, matching entries in the
-+- clock-names	: must contain "lp" and "vpu" entries, matching entries in the
- 		  clocks property.
- 
- Unicam supports a single port node. It should contain one 'port' child node
-@@ -46,9 +46,9 @@ Example:
- 		reg = <0x7e801000 0x800>,
- 		      <0x7e802004 0x4>;
- 		interrupts = <2 7>;
--		clocks = <&clocks BCM2835_CLOCK_CAM1>;
--		clock-names = "lp";
--
-+		clocks = <&clocks BCM2835_CLOCK_CAM1>,
-+			 <&firmware_clocks 4>;
-+		clock-names = "lp", "vpu";
- 		port {
- 			csi1_ep: endpoint {
- 				remote-endpoint = <&tc358743_0>;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0260-leds-Add-the-actpwr-trigger.patch b/target/linux/bcm27xx/patches-6.1/950-0260-leds-Add-the-actpwr-trigger.patch
deleted file mode 100644
index 53639b4280..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0260-leds-Add-the-actpwr-trigger.patch
+++ /dev/null
@@ -1,235 +0,0 @@
-From dd39788f30b79674173148ce099a28fb175c3c4d Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 13 Jul 2020 10:33:19 +0100
-Subject: [PATCH] leds: Add the actpwr trigger
-
-The actpwr trigger is a meta trigger that cycles between an inverted
-mmc0 and default-on. It is written in a way that could fairly easily
-be generalised to support alternative sets of source triggers.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/leds/trigger/Kconfig          |  11 ++
- drivers/leds/trigger/Makefile         |   1 +
- drivers/leds/trigger/ledtrig-actpwr.c | 190 ++++++++++++++++++++++++++
- 3 files changed, 202 insertions(+)
- create mode 100644 drivers/leds/trigger/ledtrig-actpwr.c
-
---- a/drivers/leds/trigger/Kconfig
-+++ b/drivers/leds/trigger/Kconfig
-@@ -161,4 +161,15 @@ config LEDS_TRIGGER_TTY
- 
- 	  When build as a module this driver will be called ledtrig-tty.
- 
-+config LEDS_TRIGGER_ACTPWR
-+	tristate "ACT/PWR Input Trigger"
-+	depends on LEDS_TRIGGERS
-+	help
-+	  This trigger is intended for platforms that have one software-
-+	  controllable LED and no dedicated activity or power LEDs, hence the
-+	  need to make the one LED perform both functions. It cycles between
-+	  default-on and an inverted mmc0 every 500ms, guaranteeing that it is
-+	  on for at least half of the time.
-+	  If unsure, say N.
-+
- endif # LEDS_TRIGGERS
---- a/drivers/leds/trigger/Makefile
-+++ b/drivers/leds/trigger/Makefile
-@@ -17,3 +17,4 @@ obj-$(CONFIG_LEDS_TRIGGER_NETDEV)	+= led
- obj-$(CONFIG_LEDS_TRIGGER_PATTERN)	+= ledtrig-pattern.o
- obj-$(CONFIG_LEDS_TRIGGER_AUDIO)	+= ledtrig-audio.o
- obj-$(CONFIG_LEDS_TRIGGER_TTY)		+= ledtrig-tty.o
-+obj-$(CONFIG_LEDS_TRIGGER_ACTPWR)	+= ledtrig-actpwr.o
---- /dev/null
-+++ b/drivers/leds/trigger/ledtrig-actpwr.c
-@@ -0,0 +1,190 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Activity/power trigger
-+ *
-+ * Copyright (C) 2020 Raspberry Pi (Trading) Ltd.
-+ *
-+ * Based on Atsushi Nemoto's ledtrig-heartbeat.c, although there may be
-+ * nothing left of the original now.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/timer.h>
-+#include <linux/leds.h>
-+#include "../leds.h"
-+
-+enum {
-+	TRIG_ACT,
-+	TRIG_PWR,
-+
-+	TRIG_COUNT
-+};
-+
-+struct actpwr_trig_src {
-+	const char *name;
-+	int interval;
-+	bool invert;
-+};
-+
-+struct actpwr_vled {
-+	struct led_classdev cdev;
-+	struct actpwr_trig_data *parent;
-+	enum led_brightness value;
-+	unsigned int interval;
-+	bool invert;
-+};
-+
-+struct actpwr_trig_data {
-+	struct led_trigger trig;
-+	struct actpwr_vled virt_leds[TRIG_COUNT];
-+	struct actpwr_vled *active;
-+	struct timer_list timer;
-+	int next_active;
-+};
-+
-+static int actpwr_trig_activate(struct led_classdev *led_cdev);
-+static void actpwr_trig_deactivate(struct led_classdev *led_cdev);
-+
-+static const struct actpwr_trig_src actpwr_trig_sources[TRIG_COUNT] = {
-+	[TRIG_ACT] = { "mmc0", 500, true },
-+	[TRIG_PWR] = { "default-on", 500, false },
-+};
-+
-+static struct actpwr_trig_data actpwr_data = {
-+	{
-+		.name     = "actpwr",
-+		.activate = actpwr_trig_activate,
-+		.deactivate = actpwr_trig_deactivate,
-+	}
-+};
-+
-+static void actpwr_brightness_set(struct led_classdev *led_cdev,
-+				  enum led_brightness value)
-+{
-+	struct actpwr_vled *vled = container_of(led_cdev, struct actpwr_vled,
-+					       cdev);
-+	struct actpwr_trig_data *trig = vled->parent;
-+
-+	if (vled->invert)
-+		value = !value;
-+	vled->value = value;
-+
-+	if (vled == trig->active)
-+		led_trigger_event(&trig->trig, value);
-+}
-+
-+static int actpwr_brightness_set_blocking(struct led_classdev *led_cdev,
-+					  enum led_brightness value)
-+{
-+	actpwr_brightness_set(led_cdev, value);
-+	return 0;
-+}
-+
-+static enum led_brightness actpwr_brightness_get(struct led_classdev *led_cdev)
-+{
-+	struct actpwr_vled *vled = container_of(led_cdev, struct actpwr_vled,
-+					      cdev);
-+
-+	return vled->value;
-+}
-+
-+static void actpwr_trig_cycle(struct timer_list *t)
-+{
-+	struct actpwr_trig_data *trig  = &actpwr_data;
-+	struct actpwr_vled *active;
-+
-+	active = &trig->virt_leds[trig->next_active];
-+	trig->active = active;
-+	trig->next_active = (trig->next_active + 1) % TRIG_COUNT;
-+
-+	led_trigger_event(&trig->trig, active->value);
-+
-+	mod_timer(&trig->timer, jiffies + msecs_to_jiffies(active->interval));
-+}
-+
-+static int actpwr_trig_activate(struct led_classdev *led_cdev)
-+{
-+	struct actpwr_trig_data *trig  = &actpwr_data;
-+
-+	/* Start the timer if this is the first LED */
-+	if (!trig->active)
-+		actpwr_trig_cycle(&trig->timer);
-+	else
-+		led_set_brightness_nosleep(led_cdev, trig->active->value);
-+
-+	return 0;
-+}
-+
-+static void actpwr_trig_deactivate(struct led_classdev *led_cdev)
-+{
-+	struct actpwr_trig_data *trig  = &actpwr_data;
-+
-+	if (list_empty(&trig->trig.led_cdevs)) {
-+		del_timer_sync(&trig->timer);
-+		trig->active = NULL;
-+	}
-+}
-+
-+static int __init actpwr_trig_init(void)
-+{
-+	struct actpwr_trig_data *trig  = &actpwr_data;
-+	int ret = 0;
-+	int i;
-+
-+	timer_setup(&trig->timer, actpwr_trig_cycle, 0);
-+
-+	/* Register one "LED" for each source trigger */
-+	for (i = 0; i < TRIG_COUNT; i++)
-+	{
-+		struct actpwr_vled *vled = &trig->virt_leds[i];
-+		struct led_classdev *cdev = &vled->cdev;
-+		const struct actpwr_trig_src *src = &actpwr_trig_sources[i];
-+
-+		vled->parent = trig;
-+		vled->interval = src->interval;
-+		vled->invert = src->invert;
-+		cdev->name = src->name;
-+		cdev->brightness_set = actpwr_brightness_set;
-+		cdev->brightness_set_blocking = actpwr_brightness_set_blocking;
-+		cdev->brightness_get = actpwr_brightness_get;
-+		cdev->default_trigger = src->name;
-+		ret = led_classdev_register(NULL, cdev);
-+		if (ret)
-+			goto error_classdev;
-+	}
-+
-+	ret = led_trigger_register(&trig->trig);
-+	if (ret)
-+		goto error_classdev;
-+
-+	return 0;
-+
-+error_classdev:
-+	while (i > 0)
-+	{
-+		i--;
-+		led_classdev_unregister(&trig->virt_leds[i].cdev);
-+	}
-+
-+	return ret;
-+}
-+
-+static void __exit actpwr_trig_exit(void)
-+{
-+	int i;
-+
-+	led_trigger_unregister(&actpwr_data.trig);
-+	for (i = 0; i < TRIG_COUNT; i++)
-+	{
-+		led_classdev_unregister(&actpwr_data.virt_leds[i].cdev);
-+	}
-+}
-+
-+module_init(actpwr_trig_init);
-+module_exit(actpwr_trig_exit);
-+
-+MODULE_AUTHOR("Phil Elwell <phil@raspberrypi.com>");
-+MODULE_DESCRIPTION("ACT/PWR LED trigger");
-+MODULE_LICENSE("GPL v2");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0261-bcm2835-dma-Advertise-the-full-DMA-range.patch b/target/linux/bcm27xx/patches-6.1/950-0261-bcm2835-dma-Advertise-the-full-DMA-range.patch
deleted file mode 100644
index c5d3411d02..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0261-bcm2835-dma-Advertise-the-full-DMA-range.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 4ad515d1220a9067833416464338e4c4e494ce3a Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 22 Jul 2020 17:59:31 +0100
-Subject: [PATCH] bcm2835-dma: Advertise the full DMA range
-
-Unless the DMA mask is set wider than 32 bits, DMA mapping will use a
-bounce buffer.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/dma/bcm2835-dma.c | 18 +++++++++++++++---
- 1 file changed, 15 insertions(+), 3 deletions(-)
-
---- a/drivers/dma/bcm2835-dma.c
-+++ b/drivers/dma/bcm2835-dma.c
-@@ -41,6 +41,7 @@
- #define BCM2711_DMA_MEMCPY_CHAN 14
- 
- struct bcm2835_dma_cfg_data {
-+	u64	dma_mask;
- 	u32	chan_40bit_mask;
- };
- 
-@@ -300,10 +301,12 @@ DEFINE_SPINLOCK(memcpy_lock);
- 
- static const struct bcm2835_dma_cfg_data bcm2835_dma_cfg = {
- 	.chan_40bit_mask = 0,
-+	.dma_mask = DMA_BIT_MASK(32),
- };
- 
- static const struct bcm2835_dma_cfg_data bcm2711_dma_cfg = {
- 	.chan_40bit_mask = BIT(11) | BIT(12) | BIT(13) | BIT(14),
-+	.dma_mask = DMA_BIT_MASK(36),
- };
- 
- static inline size_t bcm2835_dma_max_frame_length(struct bcm2835_chan *c)
-@@ -1180,6 +1183,8 @@ static struct dma_chan *bcm2835_dma_xlat
- 
- static int bcm2835_dma_probe(struct platform_device *pdev)
- {
-+	const struct bcm2835_dma_cfg_data *cfg_data;
-+	const struct of_device_id *of_id;
- 	struct bcm2835_dmadev *od;
- 	struct resource *res;
- 	void __iomem *base;
-@@ -1189,13 +1194,20 @@ static int bcm2835_dma_probe(struct plat
- 	int irq_flags;
- 	uint32_t chans_available;
- 	char chan_name[BCM2835_DMA_CHAN_NAME_SIZE];
--	const struct of_device_id *of_id;
- 	int chan_count, chan_start, chan_end;
- 
-+	of_id = of_match_node(bcm2835_dma_of_match, pdev->dev.of_node);
-+	if (!of_id) {
-+		dev_err(&pdev->dev, "Failed to match compatible string\n");
-+		return -EINVAL;
-+	}
-+
-+	cfg_data = of_id->data;
-+
- 	if (!pdev->dev.dma_mask)
- 		pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
- 
--	rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
-+	rc = dma_set_mask_and_coherent(&pdev->dev, cfg_data->dma_mask);
- 	if (rc) {
- 		dev_err(&pdev->dev, "Unable to set DMA mask\n");
- 		return rc;
-@@ -1260,7 +1272,7 @@ static int bcm2835_dma_probe(struct plat
- 		return -EINVAL;
- 	}
- 
--	od->cfg_data = of_id->data;
-+	od->cfg_data = cfg_data;
- 
- 	/* Request DMA channel mask from device tree */
- 	if (of_property_read_u32(pdev->dev.of_node,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0262-media-bcm2835-unicam-Drop-WARN-on-uing-direct-cache-.patch b/target/linux/bcm27xx/patches-6.1/950-0262-media-bcm2835-unicam-Drop-WARN-on-uing-direct-cache-.patch
deleted file mode 100644
index 95ad85429c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0262-media-bcm2835-unicam-Drop-WARN-on-uing-direct-cache-.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 8367085242d7541f30069a8100d6adf62b7bb181 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 27 Aug 2020 16:30:26 +0100
-Subject: [PATCH] media: bcm2835-unicam: Drop WARN on uing direct cache
- alias
-
-Pi 0&1 pass all ARM accesses through the VPU L2 cache, therefore
-the dma-ranges property sets the cache alias bits to other
-than the direct alias, hence this WARN was firing.
-
-It was overprotective coding, so assume that everything is OK
-with the dma-ranges, and remove the WARN.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/platform/bcm2835/bcm2835-unicam.c | 7 -------
- 1 file changed, 7 deletions(-)
-
---- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
-+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -711,13 +711,6 @@ static void unicam_wr_dma_addr(struct un
- {
- 	dma_addr_t endaddr = dmaaddr + buffer_size;
- 
--	/*
--	 * dmaaddr and endaddr should be a 32-bit address with the top two bits
--	 * set to 0x3 to signify uncached access through the Videocore memory
--	 * controller.
--	 */
--	WARN_ON((dmaaddr >> 30) != 0x3 || (endaddr >> 30) != 0x3);
--
- 	if (pad_id == IMAGE_PAD) {
- 		reg_write(dev, UNICAM_IBSA0, dmaaddr);
- 		reg_write(dev, UNICAM_IBEA0, endaddr);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0263-media-i2c-tc358743-Only-allow-supported-pixel-fmts-i.patch b/target/linux/bcm27xx/patches-6.1/950-0263-media-i2c-tc358743-Only-allow-supported-pixel-fmts-i.patch
deleted file mode 100644
index ea1dfb28c1..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0263-media-i2c-tc358743-Only-allow-supported-pixel-fmts-i.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a415eed168882c2428acb36cc639ceb7e929c276 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 10 Jul 2020 12:40:50 +0100
-Subject: [PATCH] media: i2c: tc358743: Only allow supported pixel fmts
- in set_fmt
-
-Fix commit "media: tc358743: Return an appropriate colorspace from
-tc358743_set_fmt" to ensure that the format passed in to set_fmt
-is checked to be valid, and reset to the current format if not.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/i2c/tc358743.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/drivers/media/i2c/tc358743.c
-+++ b/drivers/media/i2c/tc358743.c
-@@ -1708,8 +1708,10 @@ static int tc358743_set_fmt(struct v4l2_
- 	u32 code = format->format.code; /* is overwritten by get_fmt */
- 	int ret = tc358743_get_fmt(sd, sd_state, format);
- 
--	format->format.code = code;
--	format->format.colorspace = tc358743_g_colorspace(code);
-+	if (code == MEDIA_BUS_FMT_RGB888_1X24 ||
-+	    code == MEDIA_BUS_FMT_UYVY8_1X16)
-+		format->format.code = code;
-+	format->format.colorspace = tc358743_g_colorspace(format->format.code);
- 
- 	if (ret)
- 		return ret;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0264-media-bcm2835-unicam-Always-service-interrupts.patch b/target/linux/bcm27xx/patches-6.1/950-0264-media-bcm2835-unicam-Always-service-interrupts.patch
deleted file mode 100644
index 50f5c98dd6..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0264-media-bcm2835-unicam-Always-service-interrupts.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 15d651ca4f29021ed3686aea6807752e47112305 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 13 May 2020 18:28:27 +0100
-Subject: [PATCH] media: bcm2835-unicam: Always service interrupts
-
-From when bringing up the driver, there was a check in the isr
-to ignore interrupts (claiming them handled) should the driver
-not be streaming.
-
-The VPU now will not register a camera driver if it finds a
-CSI2 node enabled in device tree, therefore this flawed check is
-redundant.
-
-https://github.com/raspberrypi/linux/issues/3602
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/platform/bcm2835/bcm2835-unicam.c | 15 ---------------
- 1 file changed, 15 deletions(-)
-
---- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
-+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -784,12 +784,6 @@ static bool unicam_all_nodes_streaming(s
- 	return ret;
- }
- 
--static bool unicam_all_nodes_disabled(struct unicam_device *dev)
--{
--	return !dev->node[IMAGE_PAD].streaming &&
--	       !dev->node[METADATA_PAD].streaming;
--}
--
- static void unicam_queue_event_sof(struct unicam_device *unicam)
- {
- 	struct v4l2_event event = {
-@@ -817,15 +811,6 @@ static irqreturn_t unicam_isr(int irq, v
- 	u32 ista, sta;
- 	u64 ts;
- 
--	/*
--	 * Don't service interrupts if not streaming.
--	 * Avoids issues if the VPU should enable the
--	 * peripheral without the kernel knowing (that
--	 * shouldn't happen, but causes issues if it does).
--	 */
--	if (unicam_all_nodes_disabled(unicam))
--		return IRQ_NONE;
--
- 	sta = reg_read(unicam, UNICAM_STA);
- 	/* Write value back to clear the interrupts */
- 	reg_write(unicam, UNICAM_STA, sta);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0265-media-bcm2835-unicam-Fix-uninitialized-warning.patch b/target/linux/bcm27xx/patches-6.1/950-0265-media-bcm2835-unicam-Fix-uninitialized-warning.patch
deleted file mode 100644
index 4df4b10be6..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0265-media-bcm2835-unicam-Fix-uninitialized-warning.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 7c817c47d356e4654a73c870e6d1ec866a3566b6 Mon Sep 17 00:00:00 2001
-From: Jacko Dirks <jdirks.linuxdev@gmail.com>
-Date: Tue, 5 May 2020 14:33:31 +0200
-Subject: [PATCH] media: bcm2835: unicam: Fix uninitialized warning
-
-Signed-off-by: Jacko Dirks <jdirks.linuxdev@gmail.com>
----
- drivers/media/platform/bcm2835/bcm2835-unicam.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
-+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -1006,7 +1006,7 @@ const struct unicam_fmt *get_first_suppo
- 	struct v4l2_subdev_mbus_code_enum mbus_code;
- 	const struct unicam_fmt *fmt = NULL;
- 	unsigned int i;
--	int ret;
-+	int ret = 0;
- 
- 	for (i = 0; ret != -EINVAL && ret != -ENOIOCTLCMD; ++i) {
- 		memset(&mbus_code, 0, sizeof(mbus_code));
diff --git a/target/linux/bcm27xx/patches-6.1/950-0266-media-bcm2835-unicam-Fixup-review-comments-from-Hans.patch b/target/linux/bcm27xx/patches-6.1/950-0266-media-bcm2835-unicam-Fixup-review-comments-from-Hans.patch
deleted file mode 100644
index 176a3a557f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0266-media-bcm2835-unicam-Fixup-review-comments-from-Hans.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-From b7c453de65310924a81a9fb902727a7d8f39c36b Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 23 Jun 2020 15:14:05 +0100
-Subject: [PATCH] media: bcm2835-unicam: Fixup review comments from
- Hans.
-
-Updates the driver based on the upstream review comments from
-Hans Verkuil at https://patchwork.linuxtv.org/patch/63531/
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../media/platform/bcm2835/bcm2835-unicam.c   | 70 ++++++++-----------
- 1 file changed, 31 insertions(+), 39 deletions(-)
-
---- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
-+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -1,6 +1,6 @@
- // SPDX-License-Identifier: GPL-2.0-only
- /*
-- * BCM2835 Unicam Capture Driver
-+ * BCM283x / BCM271x Unicam Capture Driver
-  *
-  * Copyright (C) 2017-2020 - Raspberry Pi (Trading) Ltd.
-  *
-@@ -573,9 +573,8 @@ static const struct unicam_fmt *find_for
- 	return NULL;
- }
- 
--static inline unsigned int bytes_per_line(u32 width,
--					  const struct unicam_fmt *fmt,
--					  u32 v4l2_fourcc)
-+static unsigned int bytes_per_line(u32 width, const struct unicam_fmt *fmt,
-+				   u32 v4l2_fourcc)
- {
- 	if (v4l2_fourcc == fmt->repacked_fourcc)
- 		/* Repacking always goes to 16bpp */
-@@ -720,7 +719,7 @@ static void unicam_wr_dma_addr(struct un
- 	}
- }
- 
--static inline unsigned int unicam_get_lines_done(struct unicam_device *dev)
-+static unsigned int unicam_get_lines_done(struct unicam_device *dev)
- {
- 	dma_addr_t start_addr, cur_addr;
- 	unsigned int stride = dev->node[IMAGE_PAD].v_fmt.fmt.pix.bytesperline;
-@@ -734,7 +733,7 @@ static inline unsigned int unicam_get_li
- 	return (unsigned int)(cur_addr - start_addr) / stride;
- }
- 
--static inline void unicam_schedule_next_buffer(struct unicam_node *node)
-+static void unicam_schedule_next_buffer(struct unicam_node *node)
- {
- 	struct unicam_device *dev = node->dev;
- 	struct unicam_buffer *buf;
-@@ -753,7 +752,7 @@ static inline void unicam_schedule_next_
- 	unicam_wr_dma_addr(dev, addr, size, node->pad_id);
- }
- 
--static inline void unicam_schedule_dummy_buffer(struct unicam_node *node)
-+static void unicam_schedule_dummy_buffer(struct unicam_node *node)
- {
- 	struct unicam_device *dev = node->dev;
- 
-@@ -765,8 +764,8 @@ static inline void unicam_schedule_dummy
- 	node->next_frm = NULL;
- }
- 
--static inline void unicam_process_buffer_complete(struct unicam_node *node,
--						  unsigned int sequence)
-+static void unicam_process_buffer_complete(struct unicam_node *node,
-+					   unsigned int sequence)
- {
- 	node->cur_frm->vb.field = node->m_fmt.field;
- 	node->cur_frm->vb.sequence = sequence;
-@@ -774,16 +773,6 @@ static inline void unicam_process_buffer
- 	vb2_buffer_done(&node->cur_frm->vb.vb2_buf, VB2_BUF_STATE_DONE);
- }
- 
--static bool unicam_all_nodes_streaming(struct unicam_device *dev)
--{
--	bool ret;
--
--	ret = dev->node[IMAGE_PAD].open && dev->node[IMAGE_PAD].streaming;
--	ret &= !dev->node[METADATA_PAD].open ||
--	       dev->node[METADATA_PAD].streaming;
--	return ret;
--}
--
- static void unicam_queue_event_sof(struct unicam_device *unicam)
- {
- 	struct v4l2_event event = {
-@@ -906,8 +895,8 @@ static int unicam_querycap(struct file *
- 	struct unicam_node *node = video_drvdata(file);
- 	struct unicam_device *dev = node->dev;
- 
--	strlcpy(cap->driver, UNICAM_MODULE_NAME, sizeof(cap->driver));
--	strlcpy(cap->card, UNICAM_MODULE_NAME, sizeof(cap->card));
-+	strscpy(cap->driver, UNICAM_MODULE_NAME, sizeof(cap->driver));
-+	strscpy(cap->card, UNICAM_MODULE_NAME, sizeof(cap->card));
- 
- 	snprintf(cap->bus_info, sizeof(cap->bus_info),
- 		 "platform:%s", dev_name(&dev->pdev->dev));
-@@ -1000,8 +989,8 @@ static int unicam_g_fmt_vid_cap(struct f
- 	return 0;
- }
- 
--static
--const struct unicam_fmt *get_first_supported_format(struct unicam_device *dev)
-+static const struct unicam_fmt *
-+get_first_supported_format(struct unicam_device *dev)
- {
- 	struct v4l2_subdev_mbus_code_enum mbus_code;
- 	const struct unicam_fmt *fmt = NULL;
-@@ -1591,7 +1580,8 @@ static void unicam_disable(struct unicam
- 	clk_write(dev, 0);
- }
- 
--static void unicam_return_buffers(struct unicam_node *node)
-+static void unicam_return_buffers(struct unicam_node *node,
-+				  enum vb2_buffer_state state)
- {
- 	struct unicam_buffer *buf, *tmp;
- 	unsigned long flags;
-@@ -1599,15 +1589,15 @@ static void unicam_return_buffers(struct
- 	spin_lock_irqsave(&node->dma_queue_lock, flags);
- 	list_for_each_entry_safe(buf, tmp, &node->dma_queue, list) {
- 		list_del(&buf->list);
--		vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
-+		vb2_buffer_done(&buf->vb.vb2_buf, state);
- 	}
- 
- 	if (node->cur_frm)
- 		vb2_buffer_done(&node->cur_frm->vb.vb2_buf,
--				VB2_BUF_STATE_ERROR);
-+				state);
- 	if (node->next_frm && node->cur_frm != node->next_frm)
- 		vb2_buffer_done(&node->next_frm->vb.vb2_buf,
--				VB2_BUF_STATE_ERROR);
-+				state);
- 
- 	node->cur_frm = NULL;
- 	node->next_frm = NULL;
-@@ -1624,7 +1614,13 @@ static int unicam_start_streaming(struct
- 	int ret;
- 
- 	node->streaming = true;
--	if (!unicam_all_nodes_streaming(dev)) {
-+	if (!(dev->node[IMAGE_PAD].open && dev->node[IMAGE_PAD].streaming &&
-+	      (!dev->node[METADATA_PAD].open ||
-+	       dev->node[METADATA_PAD].streaming))) {
-+		/*
-+		 * Metadata pad must be enabled before image pad if it is
-+		 * wanted.
-+		 */
- 		unicam_dbg(3, dev, "Not all nodes are streaming yet.");
- 		return 0;
- 	}
-@@ -1728,7 +1724,7 @@ err_vpu_clock:
- err_pm_put:
- 	unicam_runtime_put(dev);
- err_streaming:
--	unicam_return_buffers(node);
-+	unicam_return_buffers(node, VB2_BUF_STATE_QUEUED);
- 	node->streaming = false;
- 
- 	return ret;
-@@ -1773,7 +1769,7 @@ static void unicam_stop_streaming(struct
- 	}
- 
- 	/* Clear all queued buffers for the node */
--	unicam_return_buffers(node);
-+	unicam_return_buffers(node, VB2_BUF_STATE_ERROR);
- }
- 
- static int unicam_enum_input(struct file *file, void *priv,
-@@ -1791,14 +1787,13 @@ static int unicam_enum_input(struct file
- 		inp->std = 0;
- 	} else if (v4l2_subdev_has_op(dev->sensor, video, s_std)) {
- 		inp->capabilities = V4L2_IN_CAP_STD;
--		if (v4l2_subdev_call(dev->sensor, video, g_tvnorms, &inp->std)
--					< 0)
-+		if (v4l2_subdev_call(dev->sensor, video, g_tvnorms, &inp->std) < 0)
- 			inp->std = V4L2_STD_ALL;
- 	} else {
- 		inp->capabilities = 0;
- 		inp->std = 0;
- 	}
--	sprintf(inp->name, "Camera 0");
-+	snprintf(inp->name, sizeof(inp->name), "Camera 0");
- 	return 0;
- }
- 
-@@ -2027,6 +2022,9 @@ static int unicam_s_dv_timings(struct fi
- 	ret = v4l2_subdev_call(dev->sensor, video, g_dv_timings,
- 			       &current_timings);
- 
-+	if (ret < 0)
-+		return ret;
-+
- 	if (v4l2_match_dv_timings(timings, &current_timings, 0, false))
- 		return 0;
- 
-@@ -2457,12 +2455,6 @@ static int register_node(struct unicam_d
- 		unicam_err(unicam, "Unable to allocate dummy buffer.\n");
- 		return -ENOMEM;
- 	}
--
--	if (pad_id == METADATA_PAD) {
--		v4l2_disable_ioctl(vdev, VIDIOC_DQEVENT);
--		v4l2_disable_ioctl(vdev, VIDIOC_SUBSCRIBE_EVENT);
--		v4l2_disable_ioctl(vdev, VIDIOC_UNSUBSCRIBE_EVENT);
--	}
- 	if (pad_id == METADATA_PAD ||
- 	    !v4l2_subdev_has_op(unicam->sensor, video, s_std)) {
- 		v4l2_disable_ioctl(&node->video_dev, VIDIOC_S_STD);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0267-media-bcm2835-unicam-Retain-packing-information-on-G.patch b/target/linux/bcm27xx/patches-6.1/950-0267-media-bcm2835-unicam-Retain-packing-information-on-G.patch
deleted file mode 100644
index 73242cbcf7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0267-media-bcm2835-unicam-Retain-packing-information-on-G.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 3684d32820cdf7f9ca10a1cfd6236bfcaaf1c6bd Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 19 May 2020 11:46:47 +0100
-Subject: [PATCH] media: bcm2835-unicam: Retain packing information on
- G_FMT
-
-The change to retrieve the pixel format always on g_fmt didn't
-check whether the native or unpacked version of the format
-had been requested, and always returned the packed one.
-Correct this so that the packing setting is retained whereever
-possible.
-
-Fixes "9d59e89 media: bcm2835-unicam: Re-fetch mbus code from subdev
-on a g_fmt call"
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../media/platform/bcm2835/bcm2835-unicam.c   | 19 +++++++++++++++++--
- 1 file changed, 17 insertions(+), 2 deletions(-)
-
---- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
-+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -982,8 +982,23 @@ static int unicam_g_fmt_vid_cap(struct f
- 	if (!fmt)
- 		return -EINVAL;
- 
--	node->fmt = fmt;
--	node->v_fmt.fmt.pix.pixelformat = fmt->fourcc;
-+	if (node->fmt != fmt) {
-+		/*
-+		 * The sensor format has changed so the pixelformat needs to
-+		 * be updated. Try and retain the packed/unpacked choice if
-+		 * at all possible.
-+		 */
-+		if (node->fmt->repacked_fourcc ==
-+						node->v_fmt.fmt.pix.pixelformat)
-+			/* Using the repacked format */
-+			node->v_fmt.fmt.pix.pixelformat = fmt->repacked_fourcc;
-+		else
-+			/* Using the native format */
-+			node->v_fmt.fmt.pix.pixelformat = fmt->fourcc;
-+
-+		node->fmt = fmt;
-+	}
-+
- 	*f = node->v_fmt;
- 
- 	return 0;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0268-media-bcm2835-unicam-change-minimum-number-of-vb2_qu.patch b/target/linux/bcm27xx/patches-6.1/950-0268-media-bcm2835-unicam-change-minimum-number-of-vb2_qu.patch
deleted file mode 100644
index fe759d2a30..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0268-media-bcm2835-unicam-change-minimum-number-of-vb2_qu.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 44fc199145966a06d1ee06abbfb46b2a590f1b4c Mon Sep 17 00:00:00 2001
-From: David Plowman <david.plowman@raspberrypi.com>
-Date: Thu, 28 May 2020 11:09:48 +0100
-Subject: [PATCH] media: bcm2835-unicam: change minimum number of
- vb2_queue buffers to 1
-
-Since the unicam driver was modified to write to a dummy buffer when no
-user-supplied buffer is available, it can now write to and return a
-buffer even when there's only a single one. Enable this by changing the
-min_buffers_needed in the vb2_queue; it will be useful for enabling
-still captures without allocating more memory than absolutely necessary.
-
-Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
----
- drivers/media/platform/bcm2835/bcm2835-unicam.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
-+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -2430,7 +2430,7 @@ static int register_node(struct unicam_d
- 	q->buf_struct_size = sizeof(struct unicam_buffer);
- 	q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
- 	q->lock = &node->lock;
--	q->min_buffers_needed = 2;
-+	q->min_buffers_needed = 1;
- 	q->dev = &unicam->pdev->dev;
- 
- 	ret = vb2_queue_init(q);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0269-staging-fbtft-Add-support-for-display-variants.patch b/target/linux/bcm27xx/patches-6.1/950-0269-staging-fbtft-Add-support-for-display-variants.patch
deleted file mode 100644
index 6ee102718b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0269-staging-fbtft-Add-support-for-display-variants.patch
+++ /dev/null
@@ -1,293 +0,0 @@
-From 3238d5c89f86bc368fcbbc77d0380710b0db376c Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 1 Sep 2020 18:15:27 +0100
-Subject: [PATCH] staging/fbtft: Add support for display variants
-
-Display variants are intended as a replacement for the now-deleted
-fbtft_device drivers. Drivers can register additional compatible
-strings with a custom callback that can make the required changes
-to the fbtft_display structure.
-
-Start the ball rolling by adding adafruit18, adafruit18_green and
-sainsmart18 displays.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/staging/fbtft/fb_st7735r.c |  38 +++++++++-
- drivers/staging/fbtft/fbtft-core.c |  16 ++++-
- drivers/staging/fbtft/fbtft.h      | 112 +++++++++++++++++++----------
- 3 files changed, 126 insertions(+), 40 deletions(-)
-
---- a/drivers/staging/fbtft/fb_st7735r.c
-+++ b/drivers/staging/fbtft/fb_st7735r.c
-@@ -16,6 +16,10 @@
- #define DEFAULT_GAMMA   "0F 1A 0F 18 2F 28 20 22 1F 1B 23 37 00 07 02 10\n" \
- 			"0F 1B 0F 17 33 2C 29 2E 30 30 39 3F 00 07 03 10"
- 
-+#define ADAFRUIT18_GAMMA \
-+			"02 1c 07 12 37 32 29 2d 29 25 2B 39 00 01 03 10\n" \
-+			"03 1d 07 06 2E 2C 29 2D 2E 2E 37 3F 00 00 02 10"
-+
- static const s16 default_init_sequence[] = {
- 	-1, MIPI_DCS_SOFT_RESET,
- 	-2, 150,                               /* delay */
-@@ -94,6 +98,14 @@ static void set_addr_win(struct fbtft_pa
- 	write_reg(par, MIPI_DCS_WRITE_MEMORY_START);
- }
- 
-+static void adafruit18_green_tab_set_addr_win(struct fbtft_par *par,
-+					      int xs, int ys, int xe, int ye)
-+{
-+	write_reg(par, 0x2A, 0, xs + 2, 0, xe + 2);
-+	write_reg(par, 0x2B, 0, ys + 1, 0, ye + 1);
-+	write_reg(par, 0x2C);
-+}
-+
- #define MY BIT(7)
- #define MX BIT(6)
- #define MV BIT(5)
-@@ -174,12 +186,36 @@ static struct fbtft_display display = {
- 	},
- };
- 
--FBTFT_REGISTER_DRIVER(DRVNAME, "sitronix,st7735r", &display);
-+int variant_adafruit18(struct fbtft_display *display)
-+{
-+	display->gamma = ADAFRUIT18_GAMMA;
-+	return 0;
-+}
-+
-+int variant_adafruit18_green(struct fbtft_display *display)
-+{
-+	display->gamma = ADAFRUIT18_GAMMA;
-+	display->fbtftops.set_addr_win = adafruit18_green_tab_set_addr_win;
-+	return 0;
-+}
-+
-+FBTFT_REGISTER_DRIVER_START(&display)
-+FBTFT_COMPATIBLE("sitronix,st7735r")
-+FBTFT_COMPATIBLE("fbtft,sainsmart18")
-+FBTFT_VARIANT_COMPATIBLE("fbtft,adafruit18", variant_adafruit18)
-+FBTFT_VARIANT_COMPATIBLE("fbtft,adafruit18_green", variant_adafruit18_green)
-+FBTFT_REGISTER_DRIVER_END(DRVNAME, &display);
- 
- MODULE_ALIAS("spi:" DRVNAME);
- MODULE_ALIAS("platform:" DRVNAME);
- MODULE_ALIAS("spi:st7735r");
- MODULE_ALIAS("platform:st7735r");
-+MODULE_ALIAS("spi:sainsmart18");
-+MODULE_ALIAS("platform:sainsmart");
-+MODULE_ALIAS("spi:adafruit18");
-+MODULE_ALIAS("platform:adafruit18");
-+MODULE_ALIAS("spi:adafruit18_green");
-+MODULE_ALIAS("platform:adafruit18_green");
- 
- MODULE_DESCRIPTION("FB driver for the ST7735R LCD Controller");
- MODULE_AUTHOR("Noralf Tronnes");
---- a/drivers/staging/fbtft/fbtft-core.c
-+++ b/drivers/staging/fbtft/fbtft-core.c
-@@ -24,6 +24,8 @@
- #include <linux/platform_device.h>
- #include <linux/property.h>
- #include <linux/spinlock.h>
-+#include <linux/of.h>
-+#include <linux/of_device.h>
- 
- #include <video/mipi_display.h>
- 
-@@ -1183,6 +1185,7 @@ static struct fbtft_platform_data *fbtft
-  * @display: Display properties
-  * @sdev: SPI device
-  * @pdev: Platform device
-+ * @dt_ids: Compatible string table
-  *
-  * Allocates, initializes and registers a framebuffer
-  *
-@@ -1192,12 +1195,15 @@ static struct fbtft_platform_data *fbtft
-  */
- int fbtft_probe_common(struct fbtft_display *display,
- 		       struct spi_device *sdev,
--		       struct platform_device *pdev)
-+		       struct platform_device *pdev,
-+		       const struct of_device_id *dt_ids)
- {
- 	struct device *dev;
- 	struct fb_info *info;
- 	struct fbtft_par *par;
- 	struct fbtft_platform_data *pdata;
-+	const struct of_device_id *match;
-+	int (*variant)(struct fbtft_display *);
- 	int ret;
- 
- 	if (sdev)
-@@ -1213,6 +1219,14 @@ int fbtft_probe_common(struct fbtft_disp
- 		pdata = fbtft_properties_read(dev);
- 		if (IS_ERR(pdata))
- 			return PTR_ERR(pdata);
-+		match = of_match_device(dt_ids, dev);
-+		if (match && match->data) {
-+			/* apply the variant */
-+			variant = match->data;
-+			ret = (*variant)(display);
-+			if (ret)
-+				return ret;
-+		}
- 	}
- 
- 	info = fbtft_framebuffer_alloc(display, dev, pdata);
---- a/drivers/staging/fbtft/fbtft.h
-+++ b/drivers/staging/fbtft/fbtft.h
-@@ -251,7 +251,8 @@ void fbtft_register_backlight(struct fbt
- void fbtft_unregister_backlight(struct fbtft_par *par);
- int fbtft_init_display(struct fbtft_par *par);
- int fbtft_probe_common(struct fbtft_display *display, struct spi_device *sdev,
--		       struct platform_device *pdev);
-+		       struct platform_device *pdev,
-+		       const struct of_device_id *dt_ids);
- void fbtft_remove_common(struct device *dev, struct fb_info *info);
- 
- /* fbtft-io.c */
-@@ -272,42 +273,25 @@ void fbtft_write_reg8_bus9(struct fbtft_
- void fbtft_write_reg16_bus8(struct fbtft_par *par, int len, ...);
- void fbtft_write_reg16_bus16(struct fbtft_par *par, int len, ...);
- 
--#define FBTFT_DT_TABLE(_compatible)						\
--static const struct of_device_id dt_ids[] = {					\
--	{ .compatible = _compatible },						\
--	{},									\
--};										\
--MODULE_DEVICE_TABLE(of, dt_ids);
--
--#define FBTFT_SPI_DRIVER(_name, _compatible, _display, _spi_ids)		\
--										\
--static int fbtft_driver_probe_spi(struct spi_device *spi)			\
--{										\
--	return fbtft_probe_common(_display, spi, NULL);				\
--}										\
--										\
--static void fbtft_driver_remove_spi(struct spi_device *spi)			\
--{										\
--	struct fb_info *info = spi_get_drvdata(spi);				\
--										\
--	fbtft_remove_common(&spi->dev, info);					\
--}										\
--										\
--static struct spi_driver fbtft_driver_spi_driver = {				\
--	.driver = {								\
--		.name = _name,							\
--		.of_match_table = dt_ids,					\
--	},									\
--	.id_table = _spi_ids,							\
--	.probe = fbtft_driver_probe_spi,					\
--	.remove = fbtft_driver_remove_spi,					\
--};
--
--#define FBTFT_REGISTER_DRIVER(_name, _compatible, _display)                \
-+#define FBTFT_REGISTER_DRIVER_START(_display)                              \
-+									   \
-+static const struct of_device_id dt_ids[];                                 \
-+									   \
-+static int fbtft_driver_probe_spi(struct spi_device *spi)                  \
-+{                                                                          \
-+	return fbtft_probe_common(_display, spi, NULL, dt_ids);	           \
-+}                                                                          \
-+									   \
-+static void fbtft_driver_remove_spi(struct spi_device *spi)                 \
-+{                                                                          \
-+	struct fb_info *info = spi_get_drvdata(spi);                       \
-+									   \
-+	fbtft_remove_common(&spi->dev, info);                              \
-+}                                                                          \
- 									   \
- static int fbtft_driver_probe_pdev(struct platform_device *pdev)           \
- {                                                                          \
--	return fbtft_probe_common(_display, NULL, pdev);                   \
-+	return fbtft_probe_common(_display, NULL, pdev, dt_ids);           \
- }                                                                          \
- 									   \
- static int fbtft_driver_remove_pdev(struct platform_device *pdev)          \
-@@ -318,9 +302,30 @@ static int fbtft_driver_remove_pdev(stru
- 	return 0;                                                          \
- }                                                                          \
- 									   \
--FBTFT_DT_TABLE(_compatible)						   \
-+static const struct of_device_id dt_ids[] = {
-+
-+#define FBTFT_COMPATIBLE(_compatible)                                      \
-+	{ .compatible = _compatible },
-+
-+#define FBTFT_VARIANT_COMPATIBLE(_compatible, _variant)                    \
-+	{ .compatible = _compatible, .data = _variant },
-+
-+#define FBTFT_REGISTER_DRIVER_END(_name, _display)                         \
- 									   \
--FBTFT_SPI_DRIVER(_name, _compatible, _display, NULL)			   \
-+	{},                                                                \
-+};                                                                         \
-+									   \
-+MODULE_DEVICE_TABLE(of, dt_ids);                                           \
-+									   \
-+									   \
-+static struct spi_driver fbtft_driver_spi_driver = {                       \
-+	.driver = {                                                        \
-+		.name   = _name,                                           \
-+		.of_match_table = dt_ids,                                  \
-+	},                                                                 \
-+	.probe  = fbtft_driver_probe_spi,                                  \
-+	.remove = fbtft_driver_remove_spi,                                 \
-+};                                                                         \
- 									   \
- static struct platform_driver fbtft_driver_platform_driver = {             \
- 	.driver = {                                                        \
-@@ -356,18 +361,49 @@ module_exit(fbtft_driver_module_exit);
- 
- #define FBTFT_REGISTER_SPI_DRIVER(_name, _comp_vend, _comp_dev, _display)	\
- 										\
--FBTFT_DT_TABLE(_comp_vend "," _comp_dev)					\
-+static const struct of_device_id dt_ids[] = {					\
-+	{ .compatible = _comp_vend "," _comp_dev },				\
-+	{},									\
-+};										\
-+										\
-+static int fbtft_driver_probe_spi(struct spi_device *spi)			\
-+{										\
-+	return fbtft_probe_common(_display, spi, NULL, dt_ids);			\
-+}										\
-+										\
-+static void fbtft_driver_remove_spi(struct spi_device *spi)			\
-+{										\
-+	struct fb_info *info = spi_get_drvdata(spi);				\
-+										\
-+	fbtft_remove_common(&spi->dev, info);					\
-+}										\
-+										\
-+MODULE_DEVICE_TABLE(of, dt_ids);						\
- 										\
- static const struct spi_device_id spi_ids[] = {					\
- 	{ .name = _comp_dev },							\
- 	{},									\
- };										\
-+										\
- MODULE_DEVICE_TABLE(spi, spi_ids);						\
- 										\
--FBTFT_SPI_DRIVER(_name, _comp_vend "," _comp_dev, _display, spi_ids)		\
-+static struct spi_driver fbtft_driver_spi_driver = {				\
-+	.driver = {								\
-+		.name  = _name,							\
-+		.of_match_table = dt_ids,					\
-+	},									\
-+	.id_table = spi_ids,							\
-+	.probe  = fbtft_driver_probe_spi,					\
-+	.remove = fbtft_driver_remove_spi,					\
-+};										\
- 										\
- module_spi_driver(fbtft_driver_spi_driver);
- 
-+#define FBTFT_REGISTER_DRIVER(_name, _compatible, _display)                \
-+	FBTFT_REGISTER_DRIVER_START(_display)                              \
-+	FBTFT_COMPATIBLE(_compatible)                                      \
-+	FBTFT_REGISTER_DRIVER_END(_name, _display)
-+
- /* Debug macros */
- 
- /* shorthand debug levels */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0271-char-Add-broadcom-char-drivers-back-to-build-files.patch b/target/linux/bcm27xx/patches-6.1/950-0271-char-Add-broadcom-char-drivers-back-to-build-files.patch
deleted file mode 100644
index f936a15df9..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0271-char-Add-broadcom-char-drivers-back-to-build-files.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 9c796f369fc2b58287344ee4600f62e6710f937b Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Mon, 28 Sep 2020 20:23:30 +0100
-Subject: [PATCH] char: Add broadcom char drivers back to build files
-
-See: https://github.com/raspberrypi/linux/issues/3875
-Signed-off-by: popcornmix <popcornmix@gmail.com>
----
- drivers/char/Kconfig  | 2 ++
- drivers/char/Makefile | 1 +
- 2 files changed, 3 insertions(+)
-
---- a/drivers/char/Kconfig
-+++ b/drivers/char/Kconfig
-@@ -5,6 +5,8 @@
- 
- menu "Character devices"
- 
-+source "drivers/char/broadcom/Kconfig"
-+
- source "drivers/tty/Kconfig"
- 
- config TTY_PRINTK
---- a/drivers/char/Makefile
-+++ b/drivers/char/Makefile
-@@ -45,3 +45,4 @@ obj-$(CONFIG_PS3_FLASH)		+= ps3flash.o
- obj-$(CONFIG_XILLYBUS_CLASS)	+= xillybus/
- obj-$(CONFIG_POWERNV_OP_PANEL)	+= powernv-op-panel.o
- obj-$(CONFIG_ADI)		+= adi.o
-+obj-$(CONFIG_BRCM_CHAR_DRIVERS) += broadcom/
diff --git a/target/linux/bcm27xx/patches-6.1/950-0272-staging-bcm2835-camera-Replace-deprecated-V4L2_PIX_F.patch b/target/linux/bcm27xx/patches-6.1/950-0272-staging-bcm2835-camera-Replace-deprecated-V4L2_PIX_F.patch
deleted file mode 100644
index 482e99adae..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0272-staging-bcm2835-camera-Replace-deprecated-V4L2_PIX_F.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 6201ef98a10f52c12d98a0d747154d60a305c2b9 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 8 Oct 2020 15:35:14 +0100
-Subject: [PATCH] staging: bcm2835-camera: Replace deprecated
- V4L2_PIX_FMT_BGR32
-
-V4L2_PIX_FMT_BGR32 is deprecated as it is ambiguous over where
-the alpha byte is. Cheese/GStreamer appear to get it wrong for
-one, and qv4l2 gets red and blue swapped.
-
-Swap to the newer V4L2_PIX_FMT_BGRX32 format.
-
-https://www.raspberrypi.org/forums/viewtopic.php?f=38&t=267736&p=1738912
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
-+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
-@@ -176,7 +176,7 @@ static struct mmal_fmt formats[] = {
- 		.ybbp = 1,
- 		.remove_padding = 1,
- 	}, {
--		.fourcc = V4L2_PIX_FMT_BGR32,
-+		.fourcc = V4L2_PIX_FMT_BGRX32,
- 		.mmal = MMAL_ENCODING_BGRA,
- 		.depth = 32,
- 		.mmal_component = COMP_CAMERA,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0273-staging-vc04_services-Add-new-vc-sm-cma-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0273-staging-vc04_services-Add-new-vc-sm-cma-driver.patch
deleted file mode 100644
index e45d69a6db..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0273-staging-vc04_services-Add-new-vc-sm-cma-driver.patch
+++ /dev/null
@@ -1,2961 +0,0 @@
-From 152e25fc6283a130332df7908cc45d7fa3bfae19 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 8 Oct 2020 18:49:52 +0100
-Subject: [PATCH] staging: vc04_services: Add new vc-sm-cma driver
-
-Add Broadcom VideoCore Shared Memory support.
-
-This new driver allows contiguous memory blocks to be imported
-into the VideoCore VPU memory map, and manages the lifetime of
-those objects, only releasing the source dmabuf once the VPU has
-confirmed it has finished with it.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-staging: vcsm-cma: Fix memory leak from not detaching dmabuf
-
-When importing there was a missing call to detach the buffer,
-so each import leaked the sg table entry.
-
-Actually the release process for both locally allocated and
-imported buffers is identical, so fix them to both use the same
-function.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-staging/vc-sm-cma: Avoid log spamming on Pi0/1 over cache alias.
-
-Pi 0/1 use the 0x80000000 cache alias as the ARM also sees the world
-through the VPU L2 cache.
-vc-sm-cma was trying to ensure it was in an uncached alias (0xc), and
-complaining on every allocation if it weren't. Reduce this logging.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-vc-sm-cma: Restore correct cache maintainance operations
-
-We have been using the more expensive flush operations rather than
-invalidate and clean since kernel rpi-5.9.y
-
-These are exposed with:
-52f1453513ba95084ab811a030032fe605b0cbe2 Re-expose some dmi APIs for use in VCSM
-
-But I believe that commit was dropped when (non-cma) vc-sm was dropped,
-and didn't get updated when the commit was restored
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
-
-staging: vc04_services: Fix clang14 warning
-
-Insert a break to fix a fallthrough warning from clang14. Since the
-fallthrough was to another break, this is a cosmetic change.
-
-See: https://github.com/raspberrypi/linux/issues/5078
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/staging/vc04_services/Kconfig         |    2 +
- drivers/staging/vc04_services/Makefile        |    1 +
- .../include/linux/broadcom/vc_sm_cma_ioctl.h  |  114 ++
- .../staging/vc04_services/vc-sm-cma/Kconfig   |   10 +
- .../staging/vc04_services/vc-sm-cma/Makefile  |   12 +
- drivers/staging/vc04_services/vc-sm-cma/TODO  |    1 +
- .../staging/vc04_services/vc-sm-cma/vc_sm.c   | 1716 +++++++++++++++++
- .../staging/vc04_services/vc-sm-cma/vc_sm.h   |   84 +
- .../vc04_services/vc-sm-cma/vc_sm_cma_vchi.c  |  505 +++++
- .../vc04_services/vc-sm-cma/vc_sm_cma_vchi.h  |   63 +
- .../vc04_services/vc-sm-cma/vc_sm_defs.h      |  297 +++
- .../vc04_services/vc-sm-cma/vc_sm_knl.h       |   28 +
- 12 files changed, 2833 insertions(+)
- create mode 100644 drivers/staging/vc04_services/include/linux/broadcom/vc_sm_cma_ioctl.h
- create mode 100644 drivers/staging/vc04_services/vc-sm-cma/Kconfig
- create mode 100644 drivers/staging/vc04_services/vc-sm-cma/Makefile
- create mode 100644 drivers/staging/vc04_services/vc-sm-cma/TODO
- create mode 100644 drivers/staging/vc04_services/vc-sm-cma/vc_sm.c
- create mode 100644 drivers/staging/vc04_services/vc-sm-cma/vc_sm.h
- create mode 100644 drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c
- create mode 100644 drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.h
- create mode 100644 drivers/staging/vc04_services/vc-sm-cma/vc_sm_defs.h
- create mode 100644 drivers/staging/vc04_services/vc-sm-cma/vc_sm_knl.h
-
---- a/drivers/staging/vc04_services/Kconfig
-+++ b/drivers/staging/vc04_services/Kconfig
-@@ -44,6 +44,8 @@ source "drivers/staging/vc04_services/bc
- 
- source "drivers/staging/vc04_services/bcm2835-camera/Kconfig"
- 
-+source "drivers/staging/vc04_services/vc-sm-cma/Kconfig"
-+
- source "drivers/staging/vc04_services/vchiq-mmal/Kconfig"
- 
- endif
---- a/drivers/staging/vc04_services/Makefile
-+++ b/drivers/staging/vc04_services/Makefile
-@@ -14,6 +14,7 @@ endif
- obj-$(CONFIG_SND_BCM2835)		+= bcm2835-audio/
- obj-$(CONFIG_VIDEO_BCM2835)		+= bcm2835-camera/
- obj-$(CONFIG_BCM2835_VCHIQ_MMAL)	+= vchiq-mmal/
-+obj-$(CONFIG_BCM_VC_SM_CMA)		+= vc-sm-cma/
- 
- ccflags-y += -I $(srctree)/$(src)/include
- 
---- /dev/null
-+++ b/drivers/staging/vc04_services/include/linux/broadcom/vc_sm_cma_ioctl.h
-@@ -0,0 +1,114 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+
-+/*
-+ * Copyright 2019 Raspberry Pi (Trading) Ltd.  All rights reserved.
-+ *
-+ * Based on vmcs_sm_ioctl.h Copyright Broadcom Corporation.
-+ */
-+
-+#ifndef __VC_SM_CMA_IOCTL_H
-+#define __VC_SM_CMA_IOCTL_H
-+
-+/* ---- Include Files ---------------------------------------------------- */
-+
-+#if defined(__KERNEL__)
-+#include <linux/types.h>	/* Needed for standard types */
-+#else
-+#include <stdint.h>
-+#endif
-+
-+#include <linux/ioctl.h>
-+
-+/* ---- Constants and Types ---------------------------------------------- */
-+
-+#define VC_SM_CMA_RESOURCE_NAME               32
-+#define VC_SM_CMA_RESOURCE_NAME_DEFAULT       "sm-host-resource"
-+
-+/* Type define used to create unique IOCTL number */
-+#define VC_SM_CMA_MAGIC_TYPE                  'J'
-+
-+/* IOCTL commands on /dev/vc-sm-cma */
-+enum vc_sm_cma_cmd_e {
-+	VC_SM_CMA_CMD_ALLOC = 0x5A,	/* Start at 0x5A arbitrarily */
-+
-+	VC_SM_CMA_CMD_IMPORT_DMABUF,
-+
-+	VC_SM_CMA_CMD_CLEAN_INVALID2,
-+
-+	VC_SM_CMA_CMD_LAST	/* Do not delete */
-+};
-+
-+/* Cache type supported, conveniently matches the user space definition in
-+ * user-vcsm.h.
-+ */
-+enum vc_sm_cma_cache_e {
-+	VC_SM_CMA_CACHE_NONE,
-+	VC_SM_CMA_CACHE_HOST,
-+	VC_SM_CMA_CACHE_VC,
-+	VC_SM_CMA_CACHE_BOTH,
-+};
-+
-+/* IOCTL Data structures */
-+struct vc_sm_cma_ioctl_alloc {
-+	/* user -> kernel */
-+	__u32 size;
-+	__u32 num;
-+	__u32 cached;		/* enum vc_sm_cma_cache_e */
-+	__u32 pad;
-+	__u8 name[VC_SM_CMA_RESOURCE_NAME];
-+
-+	/* kernel -> user */
-+	__s32 handle;
-+	__u32 vc_handle;
-+	__u64 dma_addr;
-+};
-+
-+struct vc_sm_cma_ioctl_import_dmabuf {
-+	/* user -> kernel */
-+	__s32 dmabuf_fd;
-+	__u32 cached;		/* enum vc_sm_cma_cache_e */
-+	__u8 name[VC_SM_CMA_RESOURCE_NAME];
-+
-+	/* kernel -> user */
-+	__s32 handle;
-+	__u32 vc_handle;
-+	__u32 size;
-+	__u32 pad;
-+	__u64 dma_addr;
-+};
-+
-+/*
-+ * Cache functions to be set to struct vc_sm_cma_ioctl_clean_invalid2
-+ * invalidate_mode.
-+ */
-+#define VC_SM_CACHE_OP_NOP       0x00
-+#define VC_SM_CACHE_OP_INV       0x01
-+#define VC_SM_CACHE_OP_CLEAN     0x02
-+#define VC_SM_CACHE_OP_FLUSH     0x03
-+
-+struct vc_sm_cma_ioctl_clean_invalid2 {
-+	__u32 op_count;
-+	__u32 pad;
-+	struct vc_sm_cma_ioctl_clean_invalid_block {
-+		__u32 invalidate_mode;
-+		__u32 block_count;
-+		void *  __user start_address;
-+		__u32 block_size;
-+		__u32 inter_block_stride;
-+	} s[0];
-+};
-+
-+/* IOCTL numbers */
-+#define VC_SM_CMA_IOCTL_MEM_ALLOC\
-+	_IOR(VC_SM_CMA_MAGIC_TYPE, VC_SM_CMA_CMD_ALLOC,\
-+	 struct vc_sm_cma_ioctl_alloc)
-+
-+#define VC_SM_CMA_IOCTL_MEM_IMPORT_DMABUF\
-+	_IOR(VC_SM_CMA_MAGIC_TYPE, VC_SM_CMA_CMD_IMPORT_DMABUF,\
-+	 struct vc_sm_cma_ioctl_import_dmabuf)
-+
-+#define VC_SM_CMA_IOCTL_MEM_CLEAN_INVALID2\
-+	_IOR(VC_SM_CMA_MAGIC_TYPE, VC_SM_CMA_CMD_CLEAN_INVALID2,\
-+	 struct vc_sm_cma_ioctl_clean_invalid2)
-+
-+#endif /* __VC_SM_CMA_IOCTL_H */
---- /dev/null
-+++ b/drivers/staging/vc04_services/vc-sm-cma/Kconfig
-@@ -0,0 +1,10 @@
-+config BCM_VC_SM_CMA
-+	tristate "VideoCore Shared Memory (CMA) driver"
-+	select BCM2835_VCHIQ
-+	select RBTREE
-+	select DMA_SHARED_BUFFER
-+	help
-+	  Say Y here to enable the shared memory interface that
-+	  supports sharing dmabufs with VideoCore.
-+	  This operates over the VCHIQ interface to a service
-+	  running on VideoCore.
---- /dev/null
-+++ b/drivers/staging/vc04_services/vc-sm-cma/Makefile
-@@ -0,0 +1,12 @@
-+ccflags-y += \
-+	-I$(srctree)/$(src)/../ \
-+	-I$(srctree)/$(src)/../interface/vchiq_arm\
-+	-I$(srctree)/$(src)/../include
-+
-+ccflags-y += \
-+	-D__VCCOREVER__=0
-+
-+vc-sm-cma-$(CONFIG_BCM_VC_SM_CMA) := \
-+	vc_sm.o vc_sm_cma_vchi.o
-+
-+obj-$(CONFIG_BCM_VC_SM_CMA) += vc-sm-cma.o
---- /dev/null
-+++ b/drivers/staging/vc04_services/vc-sm-cma/TODO
-@@ -0,0 +1 @@
-+No currently outstanding tasks except some clean-up.
---- /dev/null
-+++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c
-@@ -0,0 +1,1716 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * VideoCore Shared Memory driver using CMA.
-+ *
-+ * Copyright: 2018, Raspberry Pi (Trading) Ltd
-+ * Dave Stevenson <dave.stevenson@raspberrypi.org>
-+ *
-+ * Based on vmcs_sm driver from Broadcom Corporation for some API,
-+ * and taking some code for buffer allocation and dmabuf handling from
-+ * videobuf2.
-+ *
-+ *
-+ * This driver has 3 main uses:
-+ * 1) Allocating buffers for the kernel or userspace that can be shared with the
-+ *    VPU.
-+ * 2) Importing dmabufs from elsewhere for sharing with the VPU.
-+ * 3) Allocating buffers for use by the VPU.
-+ *
-+ * In the first and second cases the native handle is a dmabuf. Releasing the
-+ * resource inherently comes from releasing the dmabuf, and this will trigger
-+ * unmapping on the VPU. The underlying allocation and our buffer structure are
-+ * retained until the VPU has confirmed that it has finished with it.
-+ *
-+ * For the VPU allocations the VPU is responsible for triggering the release,
-+ * and therefore the released message decrements the dma_buf refcount (with the
-+ * VPU mapping having already been marked as released).
-+ */
-+
-+/* ---- Include Files ----------------------------------------------------- */
-+#include <linux/cdev.h>
-+#include <linux/device.h>
-+#include <linux/debugfs.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/dma-buf.h>
-+#include <linux/errno.h>
-+#include <linux/fs.h>
-+#include <linux/kernel.h>
-+#include <linux/list.h>
-+#include <linux/miscdevice.h>
-+#include <linux/module.h>
-+#include <linux/mm.h>
-+#include <linux/of_device.h>
-+#include <linux/platform_device.h>
-+#include <linux/proc_fs.h>
-+#include <linux/slab.h>
-+#include <linux/seq_file.h>
-+#include <linux/syscalls.h>
-+#include <linux/types.h>
-+#include <asm/cacheflush.h>
-+
-+#include "vchiq_connected.h"
-+#include "vc_sm_cma_vchi.h"
-+
-+#include "vc_sm.h"
-+#include "vc_sm_knl.h"
-+#include <linux/broadcom/vc_sm_cma_ioctl.h>
-+
-+MODULE_IMPORT_NS(DMA_BUF);
-+
-+/* ---- Private Constants and Types --------------------------------------- */
-+
-+#define DEVICE_NAME		"vcsm-cma"
-+#define DEVICE_MINOR		0
-+
-+#define VC_SM_RESOURCE_NAME_DEFAULT       "sm-host-resource"
-+
-+#define VC_SM_DIR_ROOT_NAME	"vcsm-cma"
-+#define VC_SM_STATE		"state"
-+
-+/* Private file data associated with each opened device. */
-+struct vc_sm_privdata_t {
-+	pid_t pid;                      /* PID of creator. */
-+
-+	int restart_sys;		/* Tracks restart on interrupt. */
-+	enum vc_sm_msg_type int_action;	/* Interrupted action. */
-+	u32 int_trans_id;		/* Interrupted transaction. */
-+};
-+
-+typedef int (*VC_SM_SHOW) (struct seq_file *s, void *v);
-+struct sm_pde_t {
-+	VC_SM_SHOW show;          /* Debug fs function hookup. */
-+	struct dentry *dir_entry; /* Debug fs directory entry. */
-+	void *priv_data;          /* Private data */
-+};
-+
-+/* Global state information. */
-+struct sm_state_t {
-+	struct platform_device *pdev;
-+
-+	struct miscdevice misc_dev;
-+
-+	struct sm_instance *sm_handle;	/* Handle for videocore service. */
-+
-+	spinlock_t kernelid_map_lock;	/* Spinlock protecting kernelid_map */
-+	struct idr kernelid_map;
-+
-+	struct mutex map_lock;          /* Global map lock. */
-+	struct list_head buffer_list;	/* List of buffer. */
-+
-+	struct vc_sm_privdata_t *data_knl;  /* Kernel internal data tracking. */
-+	struct vc_sm_privdata_t *vpu_allocs; /* All allocations from the VPU */
-+	struct dentry *dir_root;	/* Debug fs entries root. */
-+	struct sm_pde_t dir_state;	/* Debug fs entries state sub-tree. */
-+
-+	bool require_released_callback;	/* VPU will send a released msg when it
-+					 * has finished with a resource.
-+					 */
-+	u32 int_trans_id;		/* Interrupted transaction. */
-+};
-+
-+struct vc_sm_dma_buf_attachment {
-+	struct device *dev;
-+	struct sg_table sg_table;
-+	struct list_head list;
-+	enum dma_data_direction	dma_dir;
-+};
-+
-+/* ---- Private Variables ----------------------------------------------- */
-+
-+static struct sm_state_t *sm_state;
-+static int sm_inited;
-+
-+/* ---- Private Function Prototypes -------------------------------------- */
-+
-+/* ---- Private Functions ------------------------------------------------ */
-+
-+static int get_kernel_id(struct vc_sm_buffer *buffer)
-+{
-+	int handle;
-+
-+	spin_lock(&sm_state->kernelid_map_lock);
-+	handle = idr_alloc(&sm_state->kernelid_map, buffer, 0, 0, GFP_KERNEL);
-+	spin_unlock(&sm_state->kernelid_map_lock);
-+
-+	return handle;
-+}
-+
-+static struct vc_sm_buffer *lookup_kernel_id(int handle)
-+{
-+	return idr_find(&sm_state->kernelid_map, handle);
-+}
-+
-+static void free_kernel_id(int handle)
-+{
-+	spin_lock(&sm_state->kernelid_map_lock);
-+	idr_remove(&sm_state->kernelid_map, handle);
-+	spin_unlock(&sm_state->kernelid_map_lock);
-+}
-+
-+static int vc_sm_cma_seq_file_show(struct seq_file *s, void *v)
-+{
-+	struct sm_pde_t *sm_pde;
-+
-+	sm_pde = (struct sm_pde_t *)(s->private);
-+
-+	if (sm_pde && sm_pde->show)
-+		sm_pde->show(s, v);
-+
-+	return 0;
-+}
-+
-+static int vc_sm_cma_single_open(struct inode *inode, struct file *file)
-+{
-+	return single_open(file, vc_sm_cma_seq_file_show, inode->i_private);
-+}
-+
-+static const struct file_operations vc_sm_cma_debug_fs_fops = {
-+	.open = vc_sm_cma_single_open,
-+	.read = seq_read,
-+	.llseek = seq_lseek,
-+	.release = single_release,
-+};
-+
-+static int vc_sm_cma_global_state_show(struct seq_file *s, void *v)
-+{
-+	struct vc_sm_buffer *resource = NULL;
-+	int resource_count = 0;
-+
-+	if (!sm_state)
-+		return 0;
-+
-+	seq_printf(s, "\nVC-ServiceHandle     %p\n", sm_state->sm_handle);
-+
-+	/* Log all applicable mapping(s). */
-+
-+	mutex_lock(&sm_state->map_lock);
-+	seq_puts(s, "\nResources\n");
-+	if (!list_empty(&sm_state->buffer_list)) {
-+		list_for_each_entry(resource, &sm_state->buffer_list,
-+				    global_buffer_list) {
-+			resource_count++;
-+
-+			seq_printf(s, "\nResource                %p\n",
-+				   resource);
-+			seq_printf(s, "           NAME         %s\n",
-+				   resource->name);
-+			seq_printf(s, "           SIZE         %zu\n",
-+				   resource->size);
-+			seq_printf(s, "           DMABUF       %p\n",
-+				   resource->dma_buf);
-+			if (resource->imported) {
-+				seq_printf(s, "           ATTACH       %p\n",
-+					   resource->import.attach);
-+				seq_printf(s, "           SGT          %p\n",
-+					   resource->import.sgt);
-+			} else {
-+				seq_printf(s, "           SGT          %p\n",
-+					   resource->alloc.sg_table);
-+			}
-+			seq_printf(s, "           DMA_ADDR     %pad\n",
-+				   &resource->dma_addr);
-+			seq_printf(s, "           VC_HANDLE     %08x\n",
-+				   resource->vc_handle);
-+			seq_printf(s, "           VC_MAPPING    %d\n",
-+				   resource->vpu_state);
-+		}
-+	}
-+	seq_printf(s, "\n\nTotal resource count:   %d\n\n", resource_count);
-+
-+	mutex_unlock(&sm_state->map_lock);
-+
-+	return 0;
-+}
-+
-+/*
-+ * Adds a buffer to the private data list which tracks all the allocated
-+ * data.
-+ */
-+static void vc_sm_add_resource(struct vc_sm_privdata_t *privdata,
-+			       struct vc_sm_buffer *buffer)
-+{
-+	mutex_lock(&sm_state->map_lock);
-+	list_add(&buffer->global_buffer_list, &sm_state->buffer_list);
-+	mutex_unlock(&sm_state->map_lock);
-+
-+	pr_debug("[%s]: added buffer %p (name %s, size %zu)\n",
-+		 __func__, buffer, buffer->name, buffer->size);
-+}
-+
-+/*
-+ * Cleans up imported dmabuf.
-+ * Should be called with mutex held.
-+ */
-+static void vc_sm_clean_up_dmabuf(struct vc_sm_buffer *buffer)
-+{
-+	if (!buffer->imported)
-+		return;
-+
-+	/* Handle cleaning up imported dmabufs */
-+	if (buffer->import.sgt) {
-+		dma_buf_unmap_attachment(buffer->import.attach,
-+					 buffer->import.sgt,
-+					 DMA_BIDIRECTIONAL);
-+		buffer->import.sgt = NULL;
-+	}
-+	if (buffer->import.attach) {
-+		dma_buf_detach(buffer->dma_buf, buffer->import.attach);
-+		buffer->import.attach = NULL;
-+	}
-+}
-+
-+/*
-+ * Instructs VPU to decrement the refcount on a buffer.
-+ */
-+static void vc_sm_vpu_free(struct vc_sm_buffer *buffer)
-+{
-+	if (buffer->vc_handle && buffer->vpu_state == VPU_MAPPED) {
-+		struct vc_sm_free_t free = { buffer->vc_handle, 0 };
-+		int status = vc_sm_cma_vchi_free(sm_state->sm_handle, &free,
-+					     &sm_state->int_trans_id);
-+		if (status != 0 && status != -EINTR) {
-+			pr_err("[%s]: failed to free memory on videocore (status: %u, trans_id: %u)\n",
-+			       __func__, status, sm_state->int_trans_id);
-+		}
-+
-+		if (sm_state->require_released_callback) {
-+			/* Need to wait for the VPU to confirm the free. */
-+
-+			/* Retain a reference on this until the VPU has
-+			 * released it
-+			 */
-+			buffer->vpu_state = VPU_UNMAPPING;
-+		} else {
-+			buffer->vpu_state = VPU_NOT_MAPPED;
-+			buffer->vc_handle = 0;
-+		}
-+	}
-+}
-+
-+/*
-+ * Release an allocation.
-+ * All refcounting is done via the dma buf object.
-+ *
-+ * Must be called with the mutex held. The function will either release the
-+ * mutex (if defering the release) or destroy it. The caller must therefore not
-+ * reuse the buffer on return.
-+ */
-+static void vc_sm_release_resource(struct vc_sm_buffer *buffer)
-+{
-+	pr_debug("[%s]: buffer %p (name %s, size %zu), imported %u\n",
-+		 __func__, buffer, buffer->name, buffer->size,
-+		 buffer->imported);
-+
-+	if (buffer->vc_handle) {
-+		/* We've sent the unmap request but not had the response. */
-+		pr_debug("[%s]: Waiting for VPU unmap response on %p\n",
-+			 __func__, buffer);
-+		goto defer;
-+	}
-+	if (buffer->in_use) {
-+		/* dmabuf still in use - we await the release */
-+		pr_debug("[%s]: buffer %p is still in use\n", __func__, buffer);
-+		goto defer;
-+	}
-+
-+	/* Release the allocation (whether imported dmabuf or CMA allocation) */
-+	if (buffer->imported) {
-+		if (buffer->import.dma_buf)
-+			dma_buf_put(buffer->import.dma_buf);
-+		else
-+			pr_err("%s: Imported dmabuf already been put for buf %p\n",
-+			       __func__, buffer);
-+		buffer->import.dma_buf = NULL;
-+	} else {
-+		dma_free_coherent(&sm_state->pdev->dev, buffer->size,
-+				  buffer->cookie, buffer->dma_addr);
-+	}
-+
-+	/* Free our buffer. Start by removing it from the list */
-+	mutex_lock(&sm_state->map_lock);
-+	list_del(&buffer->global_buffer_list);
-+	mutex_unlock(&sm_state->map_lock);
-+
-+	pr_debug("%s: Release our allocation - done\n", __func__);
-+	mutex_unlock(&buffer->lock);
-+
-+	mutex_destroy(&buffer->lock);
-+
-+	kfree(buffer);
-+	return;
-+
-+defer:
-+	mutex_unlock(&buffer->lock);
-+}
-+
-+/* Create support for private data tracking. */
-+static struct vc_sm_privdata_t *vc_sm_cma_create_priv_data(pid_t id)
-+{
-+	char alloc_name[32];
-+	struct vc_sm_privdata_t *file_data = NULL;
-+
-+	/* Allocate private structure. */
-+	file_data = kzalloc(sizeof(*file_data), GFP_KERNEL);
-+
-+	if (!file_data)
-+		return NULL;
-+
-+	snprintf(alloc_name, sizeof(alloc_name), "%d", id);
-+
-+	file_data->pid = id;
-+
-+	return file_data;
-+}
-+
-+/* Dma buf operations for use with our own allocations */
-+
-+static int vc_sm_dma_buf_attach(struct dma_buf *dmabuf,
-+				struct dma_buf_attachment *attachment)
-+
-+{
-+	struct vc_sm_dma_buf_attachment *a;
-+	struct sg_table *sgt;
-+	struct vc_sm_buffer *buf = dmabuf->priv;
-+	struct scatterlist *rd, *wr;
-+	int ret, i;
-+
-+	a = kzalloc(sizeof(*a), GFP_KERNEL);
-+	if (!a)
-+		return -ENOMEM;
-+
-+	pr_debug("%s dmabuf %p attachment %p\n", __func__, dmabuf, attachment);
-+
-+	mutex_lock(&buf->lock);
-+
-+	INIT_LIST_HEAD(&a->list);
-+
-+	sgt = &a->sg_table;
-+
-+	/* Copy the buf->base_sgt scatter list to the attachment, as we can't
-+	 * map the same scatter list to multiple attachments at the same time.
-+	 */
-+	ret = sg_alloc_table(sgt, buf->alloc.sg_table->orig_nents, GFP_KERNEL);
-+	if (ret) {
-+		kfree(a);
-+		return -ENOMEM;
-+	}
-+
-+	rd = buf->alloc.sg_table->sgl;
-+	wr = sgt->sgl;
-+	for (i = 0; i < sgt->orig_nents; ++i) {
-+		sg_set_page(wr, sg_page(rd), rd->length, rd->offset);
-+		rd = sg_next(rd);
-+		wr = sg_next(wr);
-+	}
-+
-+	a->dma_dir = DMA_NONE;
-+	attachment->priv = a;
-+
-+	list_add(&a->list, &buf->attachments);
-+	mutex_unlock(&buf->lock);
-+
-+	return 0;
-+}
-+
-+static void vc_sm_dma_buf_detach(struct dma_buf *dmabuf,
-+				 struct dma_buf_attachment *attachment)
-+{
-+	struct vc_sm_dma_buf_attachment *a = attachment->priv;
-+	struct vc_sm_buffer *buf = dmabuf->priv;
-+	struct sg_table *sgt;
-+
-+	pr_debug("%s dmabuf %p attachment %p\n", __func__, dmabuf, attachment);
-+	if (!a)
-+		return;
-+
-+	sgt = &a->sg_table;
-+
-+	/* release the scatterlist cache */
-+	if (a->dma_dir != DMA_NONE)
-+		dma_unmap_sg(attachment->dev, sgt->sgl, sgt->orig_nents,
-+			     a->dma_dir);
-+	sg_free_table(sgt);
-+
-+	mutex_lock(&buf->lock);
-+	list_del(&a->list);
-+	mutex_unlock(&buf->lock);
-+
-+	kfree(a);
-+}
-+
-+static struct sg_table *vc_sm_map_dma_buf(struct dma_buf_attachment *attachment,
-+					  enum dma_data_direction direction)
-+{
-+	struct vc_sm_dma_buf_attachment *a = attachment->priv;
-+	/* stealing dmabuf mutex to serialize map/unmap operations */
-+	struct mutex *lock = &attachment->dmabuf->lock;
-+	struct sg_table *table;
-+
-+	mutex_lock(lock);
-+	pr_debug("%s attachment %p\n", __func__, attachment);
-+	table = &a->sg_table;
-+
-+	/* return previously mapped sg table */
-+	if (a->dma_dir == direction) {
-+		mutex_unlock(lock);
-+		return table;
-+	}
-+
-+	/* release any previous cache */
-+	if (a->dma_dir != DMA_NONE) {
-+		dma_unmap_sg(attachment->dev, table->sgl, table->orig_nents,
-+			     a->dma_dir);
-+		a->dma_dir = DMA_NONE;
-+	}
-+
-+	/* mapping to the client with new direction */
-+	table->nents = dma_map_sg(attachment->dev, table->sgl,
-+				  table->orig_nents, direction);
-+	if (!table->nents) {
-+		pr_err("failed to map scatterlist\n");
-+		mutex_unlock(lock);
-+		return ERR_PTR(-EIO);
-+	}
-+
-+	a->dma_dir = direction;
-+	mutex_unlock(lock);
-+
-+	pr_debug("%s attachment %p\n", __func__, attachment);
-+	return table;
-+}
-+
-+static void vc_sm_unmap_dma_buf(struct dma_buf_attachment *attachment,
-+				struct sg_table *table,
-+				enum dma_data_direction direction)
-+{
-+	pr_debug("%s attachment %p\n", __func__, attachment);
-+	dma_unmap_sg(attachment->dev, table->sgl, table->nents, direction);
-+}
-+
-+static int vc_sm_dmabuf_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma)
-+{
-+	struct vc_sm_buffer *buf = dmabuf->priv;
-+	int ret;
-+
-+	pr_debug("%s dmabuf %p, buf %p, vm_start %08lX\n", __func__, dmabuf,
-+		 buf, vma->vm_start);
-+
-+	mutex_lock(&buf->lock);
-+
-+	/* now map it to userspace */
-+	vma->vm_pgoff = 0;
-+
-+	ret = dma_mmap_coherent(&sm_state->pdev->dev, vma, buf->cookie,
-+				buf->dma_addr, buf->size);
-+
-+	if (ret) {
-+		pr_err("Remapping memory failed, error: %d\n", ret);
-+		return ret;
-+	}
-+
-+	vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
-+
-+	mutex_unlock(&buf->lock);
-+
-+	if (ret)
-+		pr_err("%s: failure mapping buffer to userspace\n",
-+		       __func__);
-+
-+	return ret;
-+}
-+
-+static void vc_sm_dma_buf_release(struct dma_buf *dmabuf)
-+{
-+	struct vc_sm_buffer *buffer;
-+
-+	if (!dmabuf)
-+		return;
-+
-+	buffer = (struct vc_sm_buffer *)dmabuf->priv;
-+
-+	mutex_lock(&buffer->lock);
-+
-+	pr_debug("%s dmabuf %p, buffer %p\n", __func__, dmabuf, buffer);
-+
-+	buffer->in_use = 0;
-+
-+	/* Unmap on the VPU */
-+	vc_sm_vpu_free(buffer);
-+	pr_debug("%s vpu_free done\n", __func__);
-+
-+	/* Unmap our dma_buf object (the vc_sm_buffer remains until released
-+	 * on the VPU).
-+	 */
-+	vc_sm_clean_up_dmabuf(buffer);
-+	pr_debug("%s clean_up dmabuf done\n", __func__);
-+
-+	/* buffer->lock will be destroyed by vc_sm_release_resource if finished
-+	 * with, otherwise unlocked. Do NOT unlock here.
-+	 */
-+	vc_sm_release_resource(buffer);
-+	pr_debug("%s done\n", __func__);
-+}
-+
-+static int vc_sm_dma_buf_begin_cpu_access(struct dma_buf *dmabuf,
-+					  enum dma_data_direction direction)
-+{
-+	struct vc_sm_buffer *buf;
-+	struct vc_sm_dma_buf_attachment *a;
-+
-+	if (!dmabuf)
-+		return -EFAULT;
-+
-+	buf = dmabuf->priv;
-+	if (!buf)
-+		return -EFAULT;
-+
-+	mutex_lock(&buf->lock);
-+
-+	list_for_each_entry(a, &buf->attachments, list) {
-+		dma_sync_sg_for_cpu(a->dev, a->sg_table.sgl,
-+				    a->sg_table.nents, direction);
-+	}
-+	mutex_unlock(&buf->lock);
-+
-+	return 0;
-+}
-+
-+static int vc_sm_dma_buf_end_cpu_access(struct dma_buf *dmabuf,
-+					enum dma_data_direction direction)
-+{
-+	struct vc_sm_buffer *buf;
-+	struct vc_sm_dma_buf_attachment *a;
-+
-+	if (!dmabuf)
-+		return -EFAULT;
-+	buf = dmabuf->priv;
-+	if (!buf)
-+		return -EFAULT;
-+
-+	mutex_lock(&buf->lock);
-+
-+	list_for_each_entry(a, &buf->attachments, list) {
-+		dma_sync_sg_for_device(a->dev, a->sg_table.sgl,
-+				       a->sg_table.nents, direction);
-+	}
-+	mutex_unlock(&buf->lock);
-+
-+	return 0;
-+}
-+
-+static const struct dma_buf_ops dma_buf_ops = {
-+	.map_dma_buf = vc_sm_map_dma_buf,
-+	.unmap_dma_buf = vc_sm_unmap_dma_buf,
-+	.mmap = vc_sm_dmabuf_mmap,
-+	.release = vc_sm_dma_buf_release,
-+	.attach = vc_sm_dma_buf_attach,
-+	.detach = vc_sm_dma_buf_detach,
-+	.begin_cpu_access = vc_sm_dma_buf_begin_cpu_access,
-+	.end_cpu_access = vc_sm_dma_buf_end_cpu_access,
-+};
-+
-+/* Dma_buf operations for chaining through to an imported dma_buf */
-+
-+static
-+int vc_sm_import_dma_buf_attach(struct dma_buf *dmabuf,
-+				struct dma_buf_attachment *attachment)
-+{
-+	struct vc_sm_buffer *buf = dmabuf->priv;
-+
-+	if (!buf->imported)
-+		return -EINVAL;
-+	return buf->import.dma_buf->ops->attach(buf->import.dma_buf,
-+						attachment);
-+}
-+
-+static
-+void vc_sm_import_dma_buf_detatch(struct dma_buf *dmabuf,
-+				  struct dma_buf_attachment *attachment)
-+{
-+	struct vc_sm_buffer *buf = dmabuf->priv;
-+
-+	if (!buf->imported)
-+		return;
-+	buf->import.dma_buf->ops->detach(buf->import.dma_buf, attachment);
-+}
-+
-+static
-+struct sg_table *vc_sm_import_map_dma_buf(struct dma_buf_attachment *attachment,
-+					  enum dma_data_direction direction)
-+{
-+	struct vc_sm_buffer *buf = attachment->dmabuf->priv;
-+
-+	if (!buf->imported)
-+		return NULL;
-+	return buf->import.dma_buf->ops->map_dma_buf(attachment,
-+						     direction);
-+}
-+
-+static
-+void vc_sm_import_unmap_dma_buf(struct dma_buf_attachment *attachment,
-+				struct sg_table *table,
-+				enum dma_data_direction direction)
-+{
-+	struct vc_sm_buffer *buf = attachment->dmabuf->priv;
-+
-+	if (!buf->imported)
-+		return;
-+	buf->import.dma_buf->ops->unmap_dma_buf(attachment, table, direction);
-+}
-+
-+static
-+int vc_sm_import_dmabuf_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma)
-+{
-+	struct vc_sm_buffer *buf = dmabuf->priv;
-+
-+	pr_debug("%s: mmap dma_buf %p, buf %p, imported db %p\n", __func__,
-+		 dmabuf, buf, buf->import.dma_buf);
-+	if (!buf->imported) {
-+		pr_err("%s: mmap dma_buf %p- not an imported buffer\n",
-+		       __func__, dmabuf);
-+		return -EINVAL;
-+	}
-+	return buf->import.dma_buf->ops->mmap(buf->import.dma_buf, vma);
-+}
-+
-+static
-+int vc_sm_import_dma_buf_begin_cpu_access(struct dma_buf *dmabuf,
-+					  enum dma_data_direction direction)
-+{
-+	struct vc_sm_buffer *buf = dmabuf->priv;
-+
-+	if (!buf->imported)
-+		return -EINVAL;
-+	return buf->import.dma_buf->ops->begin_cpu_access(buf->import.dma_buf,
-+							  direction);
-+}
-+
-+static
-+int vc_sm_import_dma_buf_end_cpu_access(struct dma_buf *dmabuf,
-+					enum dma_data_direction direction)
-+{
-+	struct vc_sm_buffer *buf = dmabuf->priv;
-+
-+	if (!buf->imported)
-+		return -EINVAL;
-+	return buf->import.dma_buf->ops->end_cpu_access(buf->import.dma_buf,
-+							  direction);
-+}
-+
-+static const struct dma_buf_ops dma_buf_import_ops = {
-+	.map_dma_buf = vc_sm_import_map_dma_buf,
-+	.unmap_dma_buf = vc_sm_import_unmap_dma_buf,
-+	.mmap = vc_sm_import_dmabuf_mmap,
-+	.release = vc_sm_dma_buf_release,
-+	.attach = vc_sm_import_dma_buf_attach,
-+	.detach = vc_sm_import_dma_buf_detatch,
-+	.begin_cpu_access = vc_sm_import_dma_buf_begin_cpu_access,
-+	.end_cpu_access = vc_sm_import_dma_buf_end_cpu_access,
-+};
-+
-+/* Import a dma_buf to be shared with VC. */
-+int
-+vc_sm_cma_import_dmabuf_internal(struct vc_sm_privdata_t *private,
-+				 struct dma_buf *dma_buf,
-+				 int fd,
-+				 struct dma_buf **imported_buf)
-+{
-+	DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
-+	struct vc_sm_buffer *buffer = NULL;
-+	struct vc_sm_import import = { };
-+	struct vc_sm_import_result result = { };
-+	struct dma_buf_attachment *attach = NULL;
-+	struct sg_table *sgt = NULL;
-+	dma_addr_t dma_addr;
-+	u32 cache_alias;
-+	int ret = 0;
-+	int status;
-+
-+	/* Setup our allocation parameters */
-+	pr_debug("%s: importing dma_buf %p/fd %d\n", __func__, dma_buf, fd);
-+
-+	if (fd < 0)
-+		get_dma_buf(dma_buf);
-+	else
-+		dma_buf = dma_buf_get(fd);
-+
-+	if (!dma_buf)
-+		return -EINVAL;
-+
-+	attach = dma_buf_attach(dma_buf, &sm_state->pdev->dev);
-+	if (IS_ERR(attach)) {
-+		ret = PTR_ERR(attach);
-+		goto error;
-+	}
-+
-+	sgt = dma_buf_map_attachment(attach, DMA_BIDIRECTIONAL);
-+	if (IS_ERR(sgt)) {
-+		ret = PTR_ERR(sgt);
-+		goto error;
-+	}
-+
-+	/* Verify that the address block is contiguous */
-+	if (sgt->nents != 1) {
-+		ret = -ENOMEM;
-+		goto error;
-+	}
-+
-+	/* Allocate local buffer to track this allocation. */
-+	buffer = kzalloc(sizeof(*buffer), GFP_KERNEL);
-+	if (!buffer) {
-+		ret = -ENOMEM;
-+		goto error;
-+	}
-+
-+	import.type = VC_SM_ALLOC_NON_CACHED;
-+	dma_addr = sg_dma_address(sgt->sgl);
-+	import.addr = (u32)dma_addr;
-+	cache_alias = import.addr & 0xC0000000;
-+	if (cache_alias != 0xC0000000 && cache_alias != 0x80000000) {
-+		pr_err("%s: Expecting an uncached alias for dma_addr %pad\n",
-+		       __func__, &dma_addr);
-+		/* Note that this assumes we're on >= Pi2, but it implies a
-+		 * DT configuration error.
-+		 */
-+		import.addr |= 0xC0000000;
-+	}
-+	import.size = sg_dma_len(sgt->sgl);
-+	import.allocator = current->tgid;
-+	import.kernel_id = get_kernel_id(buffer);
-+
-+	memcpy(import.name, VC_SM_RESOURCE_NAME_DEFAULT,
-+	       sizeof(VC_SM_RESOURCE_NAME_DEFAULT));
-+
-+	pr_debug("[%s]: attempt to import \"%s\" data - type %u, addr %pad, size %u.\n",
-+		 __func__, import.name, import.type, &dma_addr, import.size);
-+
-+	/* Allocate the videocore buffer. */
-+	status = vc_sm_cma_vchi_import(sm_state->sm_handle, &import, &result,
-+				       &sm_state->int_trans_id);
-+	if (status == -EINTR) {
-+		pr_debug("[%s]: requesting import memory action restart (trans_id: %u)\n",
-+			 __func__, sm_state->int_trans_id);
-+		ret = -ERESTARTSYS;
-+		private->restart_sys = -EINTR;
-+		private->int_action = VC_SM_MSG_TYPE_IMPORT;
-+		goto error;
-+	} else if (status || !result.res_handle) {
-+		pr_debug("[%s]: failed to import memory on videocore (status: %u, trans_id: %u)\n",
-+			 __func__, status, sm_state->int_trans_id);
-+		ret = -ENOMEM;
-+		goto error;
-+	}
-+
-+	mutex_init(&buffer->lock);
-+	INIT_LIST_HEAD(&buffer->attachments);
-+	memcpy(buffer->name, import.name,
-+	       min(sizeof(buffer->name), sizeof(import.name) - 1));
-+
-+	/* Keep track of the buffer we created. */
-+	buffer->private = private;
-+	buffer->vc_handle = result.res_handle;
-+	buffer->size = import.size;
-+	buffer->vpu_state = VPU_MAPPED;
-+
-+	buffer->imported = 1;
-+	buffer->import.dma_buf = dma_buf;
-+
-+	buffer->import.attach = attach;
-+	buffer->import.sgt = sgt;
-+	buffer->dma_addr = dma_addr;
-+	buffer->in_use = 1;
-+	buffer->kernel_id = import.kernel_id;
-+
-+	/*
-+	 * We're done - we need to export a new dmabuf chaining through most
-+	 * functions, but enabling us to release our own internal references
-+	 * here.
-+	 */
-+	exp_info.ops = &dma_buf_import_ops;
-+	exp_info.size = import.size;
-+	exp_info.flags = O_RDWR;
-+	exp_info.priv = buffer;
-+
-+	buffer->dma_buf = dma_buf_export(&exp_info);
-+	if (IS_ERR(buffer->dma_buf)) {
-+		ret = PTR_ERR(buffer->dma_buf);
-+		goto error;
-+	}
-+
-+	vc_sm_add_resource(private, buffer);
-+
-+	*imported_buf = buffer->dma_buf;
-+
-+	return 0;
-+
-+error:
-+	if (result.res_handle) {
-+		struct vc_sm_free_t free = { result.res_handle, 0 };
-+
-+		vc_sm_cma_vchi_free(sm_state->sm_handle, &free,
-+				    &sm_state->int_trans_id);
-+	}
-+	free_kernel_id(import.kernel_id);
-+	kfree(buffer);
-+	if (sgt)
-+		dma_buf_unmap_attachment(attach, sgt, DMA_BIDIRECTIONAL);
-+	if (attach)
-+		dma_buf_detach(dma_buf, attach);
-+	dma_buf_put(dma_buf);
-+	return ret;
-+}
-+
-+static int vc_sm_cma_vpu_alloc(u32 size, u32 align, const char *name,
-+			       u32 mem_handle, struct vc_sm_buffer **ret_buffer)
-+{
-+	DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
-+	struct vc_sm_buffer *buffer = NULL;
-+	struct sg_table *sgt;
-+	int aligned_size;
-+	int ret = 0;
-+
-+	/* Align to the user requested align */
-+	aligned_size = ALIGN(size, align);
-+	/* and then to a page boundary */
-+	aligned_size = PAGE_ALIGN(aligned_size);
-+
-+	if (!aligned_size)
-+		return -EINVAL;
-+
-+	/* Allocate local buffer to track this allocation. */
-+	buffer = kzalloc(sizeof(*buffer), GFP_KERNEL);
-+	if (!buffer)
-+		return -ENOMEM;
-+
-+	mutex_init(&buffer->lock);
-+	/* Acquire the mutex as vc_sm_release_resource will release it in the
-+	 * error path.
-+	 */
-+	mutex_lock(&buffer->lock);
-+
-+	buffer->cookie = dma_alloc_coherent(&sm_state->pdev->dev,
-+					    aligned_size, &buffer->dma_addr,
-+					    GFP_KERNEL);
-+	if (!buffer->cookie) {
-+		pr_err("[%s]: dma_alloc_coherent alloc of %d bytes failed\n",
-+		       __func__, aligned_size);
-+		ret = -ENOMEM;
-+		goto error;
-+	}
-+
-+	pr_debug("[%s]: alloc of %d bytes success\n",
-+		 __func__, aligned_size);
-+
-+	sgt = kmalloc(sizeof(*sgt), GFP_KERNEL);
-+	if (!sgt) {
-+		ret = -ENOMEM;
-+		goto error;
-+	}
-+
-+	ret = dma_get_sgtable(&sm_state->pdev->dev, sgt, buffer->cookie,
-+			      buffer->dma_addr, buffer->size);
-+	if (ret < 0) {
-+		pr_err("failed to get scatterlist from DMA API\n");
-+		kfree(sgt);
-+		ret = -ENOMEM;
-+		goto error;
-+	}
-+	buffer->alloc.sg_table = sgt;
-+
-+	INIT_LIST_HEAD(&buffer->attachments);
-+
-+	memcpy(buffer->name, name,
-+	       min(sizeof(buffer->name), strlen(name)));
-+
-+	exp_info.ops = &dma_buf_ops;
-+	exp_info.size = aligned_size;
-+	exp_info.flags = O_RDWR;
-+	exp_info.priv = buffer;
-+
-+	buffer->dma_buf = dma_buf_export(&exp_info);
-+	if (IS_ERR(buffer->dma_buf)) {
-+		ret = PTR_ERR(buffer->dma_buf);
-+		goto error;
-+	}
-+	buffer->dma_addr = (u32)sg_dma_address(buffer->alloc.sg_table->sgl);
-+	if ((buffer->dma_addr & 0xC0000000) != 0xC0000000) {
-+		pr_warn_once("%s: Expecting an uncached alias for dma_addr %pad\n",
-+			     __func__, &buffer->dma_addr);
-+		buffer->dma_addr |= 0xC0000000;
-+	}
-+	buffer->private = sm_state->vpu_allocs;
-+
-+	buffer->vc_handle = mem_handle;
-+	buffer->vpu_state = VPU_MAPPED;
-+	buffer->vpu_allocated = 1;
-+	buffer->size = size;
-+	/*
-+	 * Create an ID that will be passed along with our message so
-+	 * that when we service the release reply, we can look up which
-+	 * resource is being released.
-+	 */
-+	buffer->kernel_id = get_kernel_id(buffer);
-+
-+	vc_sm_add_resource(sm_state->vpu_allocs, buffer);
-+
-+	mutex_unlock(&buffer->lock);
-+
-+	*ret_buffer = buffer;
-+	return 0;
-+error:
-+	if (buffer)
-+		vc_sm_release_resource(buffer);
-+	return ret;
-+}
-+
-+static void
-+vc_sm_vpu_event(struct sm_instance *instance, struct vc_sm_result_t *reply,
-+		int reply_len)
-+{
-+	switch (reply->trans_id & ~0x80000000) {
-+	case VC_SM_MSG_TYPE_CLIENT_VERSION:
-+	{
-+		/* Acknowledge that the firmware supports the version command */
-+		pr_debug("%s: firmware acked version msg. Require release cb\n",
-+			 __func__);
-+		sm_state->require_released_callback = true;
-+	}
-+	break;
-+	case VC_SM_MSG_TYPE_RELEASED:
-+	{
-+		struct vc_sm_released *release = (struct vc_sm_released *)reply;
-+		struct vc_sm_buffer *buffer =
-+					lookup_kernel_id(release->kernel_id);
-+		if (!buffer) {
-+			pr_err("%s: VC released a buffer that is already released, kernel_id %d\n",
-+			       __func__, release->kernel_id);
-+			break;
-+		}
-+		mutex_lock(&buffer->lock);
-+
-+		pr_debug("%s: Released addr %08x, size %u, id %08x, mem_handle %08x\n",
-+			 __func__, release->addr, release->size,
-+			 release->kernel_id, release->vc_handle);
-+
-+		buffer->vc_handle = 0;
-+		buffer->vpu_state = VPU_NOT_MAPPED;
-+		free_kernel_id(release->kernel_id);
-+
-+		if (buffer->vpu_allocated) {
-+			/* VPU allocation, so release the dmabuf which will
-+			 * trigger the clean up.
-+			 */
-+			mutex_unlock(&buffer->lock);
-+			dma_buf_put(buffer->dma_buf);
-+		} else {
-+			vc_sm_release_resource(buffer);
-+		}
-+	}
-+	break;
-+	case VC_SM_MSG_TYPE_VC_MEM_REQUEST:
-+	{
-+		struct vc_sm_buffer *buffer = NULL;
-+		struct vc_sm_vc_mem_request *req =
-+					(struct vc_sm_vc_mem_request *)reply;
-+		struct vc_sm_vc_mem_request_result reply;
-+		int ret;
-+
-+		pr_debug("%s: Request %u bytes of memory, align %d name %s, trans_id %08x\n",
-+			 __func__, req->size, req->align, req->name,
-+			 req->trans_id);
-+		ret = vc_sm_cma_vpu_alloc(req->size, req->align, req->name,
-+					  req->vc_handle, &buffer);
-+
-+		reply.trans_id = req->trans_id;
-+		if (!ret) {
-+			reply.addr = buffer->dma_addr;
-+			reply.kernel_id = buffer->kernel_id;
-+			pr_debug("%s: Allocated resource buffer %p, addr %pad\n",
-+				 __func__, buffer, &buffer->dma_addr);
-+		} else {
-+			pr_err("%s: Allocation failed size %u, name %s, vc_handle %u\n",
-+			       __func__, req->size, req->name, req->vc_handle);
-+			reply.addr = 0;
-+			reply.kernel_id = 0;
-+		}
-+		vc_sm_vchi_client_vc_mem_req_reply(sm_state->sm_handle, &reply,
-+						   &sm_state->int_trans_id);
-+		break;
-+	}
-+	break;
-+	default:
-+		pr_err("%s: Unknown vpu cmd %x\n", __func__, reply->trans_id);
-+		break;
-+	}
-+}
-+
-+/* Userspace handling */
-+/*
-+ * Open the device.  Creates a private state to help track all allocation
-+ * associated with this device.
-+ */
-+static int vc_sm_cma_open(struct inode *inode, struct file *file)
-+{
-+	/* Make sure the device was started properly. */
-+	if (!sm_state) {
-+		pr_err("[%s]: invalid device\n", __func__);
-+		return -EPERM;
-+	}
-+
-+	file->private_data = vc_sm_cma_create_priv_data(current->tgid);
-+	if (!file->private_data) {
-+		pr_err("[%s]: failed to create data tracker\n", __func__);
-+
-+		return -ENOMEM;
-+	}
-+
-+	return 0;
-+}
-+
-+/*
-+ * Close the vcsm-cma device.
-+ * All allocations are file descriptors to the dmabuf objects, so we will get
-+ * the clean up request on those as those are cleaned up.
-+ */
-+static int vc_sm_cma_release(struct inode *inode, struct file *file)
-+{
-+	struct vc_sm_privdata_t *file_data =
-+	    (struct vc_sm_privdata_t *)file->private_data;
-+	int ret = 0;
-+
-+	/* Make sure the device was started properly. */
-+	if (!sm_state || !file_data) {
-+		pr_err("[%s]: invalid device\n", __func__);
-+		ret = -EPERM;
-+		goto out;
-+	}
-+
-+	pr_debug("[%s]: using private data %p\n", __func__, file_data);
-+
-+	/* Terminate the private data. */
-+	kfree(file_data);
-+
-+out:
-+	return ret;
-+}
-+
-+/*
-+ * Allocate a shared memory handle and block.
-+ * Allocation is from CMA, and then imported into the VPU mappings.
-+ */
-+int vc_sm_cma_ioctl_alloc(struct vc_sm_privdata_t *private,
-+			  struct vc_sm_cma_ioctl_alloc *ioparam)
-+{
-+	DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
-+	struct vc_sm_buffer *buffer = NULL;
-+	struct vc_sm_import import = { 0 };
-+	struct vc_sm_import_result result = { 0 };
-+	struct dma_buf *dmabuf = NULL;
-+	struct sg_table *sgt;
-+	int aligned_size;
-+	int ret = 0;
-+	int status;
-+	int fd = -1;
-+
-+	aligned_size = PAGE_ALIGN(ioparam->size);
-+
-+	if (!aligned_size)
-+		return -EINVAL;
-+
-+	/* Allocate local buffer to track this allocation. */
-+	buffer = kzalloc(sizeof(*buffer), GFP_KERNEL);
-+	if (!buffer) {
-+		ret = -ENOMEM;
-+		goto error;
-+	}
-+
-+	buffer->cookie = dma_alloc_coherent(&sm_state->pdev->dev,
-+					    aligned_size,
-+					    &buffer->dma_addr,
-+					    GFP_KERNEL);
-+	if (!buffer->cookie) {
-+		pr_err("[%s]: dma_alloc_coherent alloc of %d bytes failed\n",
-+		       __func__, aligned_size);
-+		ret = -ENOMEM;
-+		goto error;
-+	}
-+
-+	import.type = VC_SM_ALLOC_NON_CACHED;
-+	import.allocator = current->tgid;
-+
-+	if (*ioparam->name)
-+		memcpy(import.name, ioparam->name, sizeof(import.name) - 1);
-+	else
-+		memcpy(import.name, VC_SM_RESOURCE_NAME_DEFAULT,
-+		       sizeof(VC_SM_RESOURCE_NAME_DEFAULT));
-+
-+	mutex_init(&buffer->lock);
-+	INIT_LIST_HEAD(&buffer->attachments);
-+	memcpy(buffer->name, import.name,
-+	       min(sizeof(buffer->name), sizeof(import.name) - 1));
-+
-+	exp_info.ops = &dma_buf_ops;
-+	exp_info.size = aligned_size;
-+	exp_info.flags = O_RDWR;
-+	exp_info.priv = buffer;
-+
-+	dmabuf = dma_buf_export(&exp_info);
-+	if (IS_ERR(dmabuf)) {
-+		ret = PTR_ERR(dmabuf);
-+		goto error;
-+	}
-+	buffer->dma_buf = dmabuf;
-+
-+	import.addr = buffer->dma_addr;
-+	import.size = aligned_size;
-+	import.kernel_id = get_kernel_id(buffer);
-+
-+	/* Wrap it into a videocore buffer. */
-+	status = vc_sm_cma_vchi_import(sm_state->sm_handle, &import, &result,
-+				       &sm_state->int_trans_id);
-+	if (status == -EINTR) {
-+		pr_debug("[%s]: requesting import memory action restart (trans_id: %u)\n",
-+			 __func__, sm_state->int_trans_id);
-+		ret = -ERESTARTSYS;
-+		private->restart_sys = -EINTR;
-+		private->int_action = VC_SM_MSG_TYPE_IMPORT;
-+		goto error;
-+	} else if (status || !result.res_handle) {
-+		pr_err("[%s]: failed to import memory on videocore (status: %u, trans_id: %u)\n",
-+		       __func__, status, sm_state->int_trans_id);
-+		ret = -ENOMEM;
-+		goto error;
-+	}
-+
-+	/* Keep track of the buffer we created. */
-+	buffer->private = private;
-+	buffer->vc_handle = result.res_handle;
-+	buffer->size = import.size;
-+	buffer->vpu_state = VPU_MAPPED;
-+	buffer->kernel_id = import.kernel_id;
-+
-+	sgt = kmalloc(sizeof(*sgt), GFP_KERNEL);
-+	if (!sgt) {
-+		ret = -ENOMEM;
-+		goto error;
-+	}
-+
-+	ret = dma_get_sgtable(&sm_state->pdev->dev, sgt, buffer->cookie,
-+			      buffer->dma_addr, buffer->size);
-+	if (ret < 0) {
-+		/* FIXME: error handling */
-+		pr_err("failed to get scatterlist from DMA API\n");
-+		kfree(sgt);
-+		ret = -ENOMEM;
-+		goto error;
-+	}
-+	buffer->alloc.sg_table = sgt;
-+
-+	fd = dma_buf_fd(dmabuf, O_CLOEXEC);
-+	if (fd < 0)
-+		goto error;
-+
-+	vc_sm_add_resource(private, buffer);
-+
-+	pr_debug("[%s]: Added resource as fd %d, buffer %p, private %p, dma_addr %pad\n",
-+		 __func__, fd, buffer, private, &buffer->dma_addr);
-+
-+	/* We're done */
-+	ioparam->handle = fd;
-+	ioparam->vc_handle = buffer->vc_handle;
-+	ioparam->dma_addr = buffer->dma_addr;
-+	return 0;
-+
-+error:
-+	pr_err("[%s]: something failed - cleanup. ret %d\n", __func__, ret);
-+
-+	if (dmabuf) {
-+		/* dmabuf has been exported, therefore allow dmabuf cleanup to
-+		 * deal with this
-+		 */
-+		dma_buf_put(dmabuf);
-+	} else {
-+		/* No dmabuf, therefore just free the buffer here */
-+		if (buffer->cookie)
-+			dma_free_coherent(&sm_state->pdev->dev, buffer->size,
-+					  buffer->cookie, buffer->dma_addr);
-+		kfree(buffer);
-+	}
-+	return ret;
-+}
-+
-+#ifndef CONFIG_ARM64
-+/* Converts VCSM_CACHE_OP_* to an operating function. */
-+static void (*cache_op_to_func(const unsigned int cache_op))
-+						(const void*, const void*)
-+{
-+	switch (cache_op) {
-+	case VC_SM_CACHE_OP_NOP:
-+		return NULL;
-+
-+	case VC_SM_CACHE_OP_INV:
-+		return dmac_inv_range;
-+	case VC_SM_CACHE_OP_CLEAN:
-+		return dmac_clean_range;
-+	case VC_SM_CACHE_OP_FLUSH:
-+		return dmac_flush_range;
-+
-+	default:
-+		pr_err("[%s]: Invalid cache_op: 0x%08x\n", __func__, cache_op);
-+		return NULL;
-+	}
-+}
-+
-+/*
-+ * Clean/invalid/flush cache of which buffer is already pinned (i.e. accessed).
-+ */
-+static int clean_invalid_contig_2d(const void __user *addr,
-+				   const size_t block_count,
-+				   const size_t block_size,
-+				   const size_t stride,
-+				   const unsigned int cache_op)
-+{
-+	size_t i;
-+	void (*op_fn)(const void *start, const void *end);
-+
-+	if (!block_size) {
-+		pr_err("[%s]: size cannot be 0\n", __func__);
-+		return -EINVAL;
-+	}
-+
-+	op_fn = cache_op_to_func(cache_op);
-+	if (!op_fn)
-+		return -EINVAL;
-+
-+	for (i = 0; i < block_count; i ++, addr += stride)
-+		op_fn(addr, addr + block_size);
-+
-+	return 0;
-+}
-+
-+static int vc_sm_cma_clean_invalid2(unsigned int cmdnr, unsigned long arg)
-+{
-+	struct vc_sm_cma_ioctl_clean_invalid2 ioparam;
-+	struct vc_sm_cma_ioctl_clean_invalid_block *block = NULL;
-+	int i, ret = 0;
-+
-+	/* Get parameter data. */
-+	if (copy_from_user(&ioparam, (void *)arg, sizeof(ioparam))) {
-+		pr_err("[%s]: failed to copy-from-user header for cmd %x\n",
-+		       __func__, cmdnr);
-+		return -EFAULT;
-+	}
-+	block = kmalloc(ioparam.op_count * sizeof(*block), GFP_KERNEL);
-+	if (!block)
-+		return -EFAULT;
-+
-+	if (copy_from_user(block, (void *)(arg + sizeof(ioparam)),
-+			   ioparam.op_count * sizeof(*block)) != 0) {
-+		pr_err("[%s]: failed to copy-from-user payload for cmd %x\n",
-+		       __func__, cmdnr);
-+		ret = -EFAULT;
-+		goto out;
-+	}
-+
-+	for (i = 0; i < ioparam.op_count; i++) {
-+		const struct vc_sm_cma_ioctl_clean_invalid_block * const op =
-+								block + i;
-+
-+		if (op->invalidate_mode == VC_SM_CACHE_OP_NOP)
-+			continue;
-+
-+		ret = clean_invalid_contig_2d((void __user *)op->start_address,
-+					      op->block_count, op->block_size,
-+					      op->inter_block_stride,
-+					      op->invalidate_mode);
-+		if (ret)
-+			break;
-+	}
-+out:
-+	kfree(block);
-+
-+	return ret;
-+}
-+#endif
-+
-+static long vc_sm_cma_ioctl(struct file *file, unsigned int cmd,
-+			    unsigned long arg)
-+{
-+	int ret = 0;
-+	unsigned int cmdnr = _IOC_NR(cmd);
-+	struct vc_sm_privdata_t *file_data =
-+	    (struct vc_sm_privdata_t *)file->private_data;
-+
-+	/* Validate we can work with this device. */
-+	if (!sm_state || !file_data) {
-+		pr_err("[%s]: invalid device\n", __func__);
-+		return -EPERM;
-+	}
-+
-+	/* Action is a re-post of a previously interrupted action? */
-+	if (file_data->restart_sys == -EINTR) {
-+		pr_debug("[%s]: clean up of action %u (trans_id: %u) following EINTR\n",
-+			 __func__, file_data->int_action,
-+			 file_data->int_trans_id);
-+
-+		file_data->restart_sys = 0;
-+	}
-+
-+	/* Now process the command. */
-+	switch (cmdnr) {
-+		/* New memory allocation.
-+		 */
-+	case VC_SM_CMA_CMD_ALLOC:
-+	{
-+		struct vc_sm_cma_ioctl_alloc ioparam;
-+
-+		/* Get the parameter data. */
-+		if (copy_from_user
-+		    (&ioparam, (void *)arg, sizeof(ioparam)) != 0) {
-+			pr_err("[%s]: failed to copy-from-user for cmd %x\n",
-+			       __func__, cmdnr);
-+			ret = -EFAULT;
-+			break;
-+		}
-+
-+		ret = vc_sm_cma_ioctl_alloc(file_data, &ioparam);
-+		if (!ret &&
-+		    (copy_to_user((void *)arg, &ioparam,
-+				  sizeof(ioparam)) != 0)) {
-+			/* FIXME: Release allocation */
-+			pr_err("[%s]: failed to copy-to-user for cmd %x\n",
-+			       __func__, cmdnr);
-+			ret = -EFAULT;
-+		}
-+		break;
-+	}
-+
-+	case VC_SM_CMA_CMD_IMPORT_DMABUF:
-+	{
-+		struct vc_sm_cma_ioctl_import_dmabuf ioparam;
-+		struct dma_buf *new_dmabuf;
-+
-+		/* Get the parameter data. */
-+		if (copy_from_user
-+		    (&ioparam, (void *)arg, sizeof(ioparam)) != 0) {
-+			pr_err("[%s]: failed to copy-from-user for cmd %x\n",
-+			       __func__, cmdnr);
-+			ret = -EFAULT;
-+			break;
-+		}
-+
-+		ret = vc_sm_cma_import_dmabuf_internal(file_data,
-+						       NULL,
-+						       ioparam.dmabuf_fd,
-+						       &new_dmabuf);
-+
-+		if (!ret) {
-+			struct vc_sm_buffer *buf = new_dmabuf->priv;
-+
-+			ioparam.size = buf->size;
-+			ioparam.handle = dma_buf_fd(new_dmabuf,
-+						    O_CLOEXEC);
-+			ioparam.vc_handle = buf->vc_handle;
-+			ioparam.dma_addr = buf->dma_addr;
-+
-+			if (ioparam.handle < 0 ||
-+			    (copy_to_user((void *)arg, &ioparam,
-+					  sizeof(ioparam)) != 0)) {
-+				dma_buf_put(new_dmabuf);
-+				/* FIXME: Release allocation */
-+				ret = -EFAULT;
-+			}
-+		}
-+		break;
-+	}
-+
-+#ifndef CONFIG_ARM64
-+	/*
-+	 * Flush/Invalidate the cache for a given mapping.
-+	 * Blocks must be pinned (i.e. accessed) before this call.
-+	 */
-+	case VC_SM_CMA_CMD_CLEAN_INVALID2:
-+		ret = vc_sm_cma_clean_invalid2(cmdnr, arg);
-+		break;
-+#endif
-+
-+	default:
-+		pr_debug("[%s]: cmd %x tgid %u, owner %u\n", __func__, cmdnr,
-+			 current->tgid, file_data->pid);
-+
-+		ret = -EINVAL;
-+		break;
-+	}
-+
-+	return ret;
-+}
-+
-+#ifdef CONFIG_COMPAT
-+struct vc_sm_cma_ioctl_clean_invalid2_32 {
-+	u32 op_count;
-+	struct vc_sm_cma_ioctl_clean_invalid_block_32 {
-+		u16 invalidate_mode;
-+		u16 block_count;
-+		compat_uptr_t start_address;
-+		u32 block_size;
-+		u32 inter_block_stride;
-+	} s[0];
-+};
-+
-+#define VC_SM_CMA_CMD_CLEAN_INVALID2_32\
-+	_IOR(VC_SM_CMA_MAGIC_TYPE, VC_SM_CMA_CMD_CLEAN_INVALID2,\
-+	 struct vc_sm_cma_ioctl_clean_invalid2_32)
-+
-+static long vc_sm_cma_compat_ioctl(struct file *file, unsigned int cmd,
-+				   unsigned long arg)
-+{
-+	switch (cmd) {
-+	case VC_SM_CMA_CMD_CLEAN_INVALID2_32:
-+		/* FIXME */
-+		return -EINVAL;
-+
-+	default:
-+		return vc_sm_cma_ioctl(file, cmd, arg);
-+	}
-+}
-+#endif
-+
-+/* Device operations that we managed in this driver. */
-+static const struct file_operations vc_sm_ops = {
-+	.owner = THIS_MODULE,
-+	.unlocked_ioctl = vc_sm_cma_ioctl,
-+#ifdef CONFIG_COMPAT
-+	.compat_ioctl = vc_sm_cma_compat_ioctl,
-+#endif
-+	.open = vc_sm_cma_open,
-+	.release = vc_sm_cma_release,
-+};
-+
-+/* Driver load/unload functions */
-+/* Videocore connected.  */
-+static void vc_sm_connected_init(void)
-+{
-+	int ret;
-+	struct vchiq_instance *vchiq_instance;
-+	struct vc_sm_version version;
-+	struct vc_sm_result_t version_result;
-+
-+	pr_info("[%s]: start\n", __func__);
-+
-+	/*
-+	 * Initialize and create a VCHI connection for the shared memory service
-+	 * running on videocore.
-+	 */
-+	ret = vchiq_initialise(&vchiq_instance);
-+	if (ret) {
-+		pr_err("[%s]: failed to initialise VCHI instance (ret=%d)\n",
-+		       __func__, ret);
-+
-+		return;
-+	}
-+
-+	ret = vchiq_connect(vchiq_instance);
-+	if (ret) {
-+		pr_err("[%s]: failed to connect VCHI instance (ret=%d)\n",
-+		       __func__, ret);
-+
-+		return;
-+	}
-+
-+	/* Initialize an instance of the shared memory service. */
-+	sm_state->sm_handle = vc_sm_cma_vchi_init(vchiq_instance, 1,
-+						  vc_sm_vpu_event);
-+	if (!sm_state->sm_handle) {
-+		pr_err("[%s]: failed to initialize shared memory service\n",
-+		       __func__);
-+
-+		return;
-+	}
-+
-+	/* Create a debug fs directory entry (root). */
-+	sm_state->dir_root = debugfs_create_dir(VC_SM_DIR_ROOT_NAME, NULL);
-+
-+	sm_state->dir_state.show = &vc_sm_cma_global_state_show;
-+	sm_state->dir_state.dir_entry =
-+		debugfs_create_file(VC_SM_STATE, 0444, sm_state->dir_root,
-+				    &sm_state->dir_state,
-+				    &vc_sm_cma_debug_fs_fops);
-+
-+	INIT_LIST_HEAD(&sm_state->buffer_list);
-+
-+	/* Create a shared memory device. */
-+	sm_state->misc_dev.minor = MISC_DYNAMIC_MINOR;
-+	sm_state->misc_dev.name = DEVICE_NAME;
-+	sm_state->misc_dev.fops = &vc_sm_ops;
-+	sm_state->misc_dev.parent = NULL;
-+	/* Temporarily set as 666 until udev rules have been sorted */
-+	sm_state->misc_dev.mode = 0666;
-+	ret = misc_register(&sm_state->misc_dev);
-+	if (ret) {
-+		pr_err("vcsm-cma: failed to register misc device.\n");
-+		goto err_remove_debugfs;
-+	}
-+
-+	sm_state->data_knl = vc_sm_cma_create_priv_data(0);
-+	if (!sm_state->data_knl) {
-+		pr_err("[%s]: failed to create kernel private data tracker\n",
-+		       __func__);
-+		goto err_remove_misc_dev;
-+	}
-+
-+	version.version = 2;
-+	ret = vc_sm_cma_vchi_client_version(sm_state->sm_handle, &version,
-+					    &version_result,
-+					    &sm_state->int_trans_id);
-+	if (ret) {
-+		pr_err("[%s]: Failed to send version request %d\n", __func__,
-+		       ret);
-+	}
-+
-+	/* Done! */
-+	sm_inited = 1;
-+	pr_info("[%s]: installed successfully\n", __func__);
-+	return;
-+
-+err_remove_misc_dev:
-+	misc_deregister(&sm_state->misc_dev);
-+err_remove_debugfs:
-+	debugfs_remove_recursive(sm_state->dir_root);
-+	vc_sm_cma_vchi_stop(&sm_state->sm_handle);
-+}
-+
-+/* Driver loading. */
-+static int bcm2835_vc_sm_cma_probe(struct platform_device *pdev)
-+{
-+	pr_info("%s: Videocore shared memory driver\n", __func__);
-+
-+	sm_state = devm_kzalloc(&pdev->dev, sizeof(*sm_state), GFP_KERNEL);
-+	if (!sm_state)
-+		return -ENOMEM;
-+	sm_state->pdev = pdev;
-+	mutex_init(&sm_state->map_lock);
-+
-+	spin_lock_init(&sm_state->kernelid_map_lock);
-+	idr_init_base(&sm_state->kernelid_map, 1);
-+
-+	pdev->dev.dma_parms = devm_kzalloc(&pdev->dev,
-+					   sizeof(*pdev->dev.dma_parms),
-+					   GFP_KERNEL);
-+	/* dma_set_max_seg_size checks if dma_parms is NULL. */
-+	dma_set_max_seg_size(&pdev->dev, 0x3FFFFFFF);
-+
-+	vchiq_add_connected_callback(vc_sm_connected_init);
-+	return 0;
-+}
-+
-+/* Driver unloading. */
-+static int bcm2835_vc_sm_cma_remove(struct platform_device *pdev)
-+{
-+	pr_debug("[%s]: start\n", __func__);
-+	if (sm_inited) {
-+		misc_deregister(&sm_state->misc_dev);
-+
-+		/* Remove all proc entries. */
-+		debugfs_remove_recursive(sm_state->dir_root);
-+
-+		/* Stop the videocore shared memory service. */
-+		vc_sm_cma_vchi_stop(&sm_state->sm_handle);
-+	}
-+
-+	if (sm_state) {
-+		idr_destroy(&sm_state->kernelid_map);
-+
-+		/* Free the memory for the state structure. */
-+		mutex_destroy(&sm_state->map_lock);
-+	}
-+
-+	pr_debug("[%s]: end\n", __func__);
-+	return 0;
-+}
-+
-+/* Kernel API calls */
-+/* Get an internal resource handle mapped from the external one. */
-+int vc_sm_cma_int_handle(void *handle)
-+{
-+	struct dma_buf *dma_buf = (struct dma_buf *)handle;
-+	struct vc_sm_buffer *buf;
-+
-+	/* Validate we can work with this device. */
-+	if (!sm_state || !handle) {
-+		pr_err("[%s]: invalid input\n", __func__);
-+		return 0;
-+	}
-+
-+	buf = (struct vc_sm_buffer *)dma_buf->priv;
-+	return buf->vc_handle;
-+}
-+EXPORT_SYMBOL_GPL(vc_sm_cma_int_handle);
-+
-+/* Free a previously allocated shared memory handle and block. */
-+int vc_sm_cma_free(void *handle)
-+{
-+	struct dma_buf *dma_buf = (struct dma_buf *)handle;
-+
-+	/* Validate we can work with this device. */
-+	if (!sm_state || !handle) {
-+		pr_err("[%s]: invalid input\n", __func__);
-+		return -EPERM;
-+	}
-+
-+	pr_debug("%s: handle %p/dmabuf %p\n", __func__, handle, dma_buf);
-+
-+	dma_buf_put(dma_buf);
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(vc_sm_cma_free);
-+
-+/* Import a dmabuf to be shared with VC. */
-+int vc_sm_cma_import_dmabuf(struct dma_buf *src_dmabuf, void **handle)
-+{
-+	struct dma_buf *new_dma_buf;
-+	int ret;
-+
-+	/* Validate we can work with this device. */
-+	if (!sm_state || !src_dmabuf || !handle) {
-+		pr_err("[%s]: invalid input\n", __func__);
-+		return -EPERM;
-+	}
-+
-+	ret = vc_sm_cma_import_dmabuf_internal(sm_state->data_knl, src_dmabuf,
-+					       -1, &new_dma_buf);
-+
-+	if (!ret) {
-+		pr_debug("%s: imported to ptr %p\n", __func__, new_dma_buf);
-+
-+		/* Assign valid handle at this time.*/
-+		*handle = new_dma_buf;
-+	} else {
-+		/*
-+		 * succeeded in importing the dma_buf, but then
-+		 * failed to look it up again. How?
-+		 * Release the fd again.
-+		 */
-+		pr_err("%s: imported vc_sm_cma_get_buffer failed %d\n",
-+		       __func__, ret);
-+	}
-+
-+	return ret;
-+}
-+EXPORT_SYMBOL_GPL(vc_sm_cma_import_dmabuf);
-+
-+static struct platform_driver bcm2835_vcsm_cma_driver = {
-+	.probe = bcm2835_vc_sm_cma_probe,
-+	.remove = bcm2835_vc_sm_cma_remove,
-+	.driver = {
-+		   .name = DEVICE_NAME,
-+		   .owner = THIS_MODULE,
-+		   },
-+};
-+
-+module_platform_driver(bcm2835_vcsm_cma_driver);
-+
-+MODULE_AUTHOR("Dave Stevenson");
-+MODULE_DESCRIPTION("VideoCore CMA Shared Memory Driver");
-+MODULE_LICENSE("GPL v2");
-+MODULE_ALIAS("platform:vcsm-cma");
---- /dev/null
-+++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.h
-@@ -0,0 +1,84 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+
-+/*
-+ * VideoCore Shared Memory driver using CMA.
-+ *
-+ * Copyright: 2018, Raspberry Pi (Trading) Ltd
-+ *
-+ */
-+
-+#ifndef VC_SM_H
-+#define VC_SM_H
-+
-+#include <linux/device.h>
-+#include <linux/dma-direction.h>
-+#include <linux/kref.h>
-+#include <linux/mm_types.h>
-+#include <linux/mutex.h>
-+#include <linux/rbtree.h>
-+#include <linux/sched.h>
-+#include <linux/shrinker.h>
-+#include <linux/types.h>
-+#include <linux/miscdevice.h>
-+
-+#define VC_SM_MAX_NAME_LEN 32
-+
-+enum vc_sm_vpu_mapping_state {
-+	VPU_NOT_MAPPED,
-+	VPU_MAPPED,
-+	VPU_UNMAPPING
-+};
-+
-+struct vc_sm_alloc_data {
-+	unsigned long num_pages;
-+	void *priv_virt;
-+	struct sg_table *sg_table;
-+};
-+
-+struct vc_sm_imported {
-+	struct dma_buf *dma_buf;
-+	struct dma_buf_attachment *attach;
-+	struct sg_table *sgt;
-+};
-+
-+struct vc_sm_buffer {
-+	struct list_head global_buffer_list;	/* Global list of buffers. */
-+
-+	/* Index in the kernel_id idr so that we can find the
-+	 * mmal_msg_context again when servicing the VCHI reply.
-+	 */
-+	int kernel_id;
-+
-+	size_t size;
-+
-+	/* Lock over all the following state for this buffer */
-+	struct mutex lock;
-+	struct list_head attachments;
-+
-+	char name[VC_SM_MAX_NAME_LEN];
-+
-+	int in_use:1;	/* Kernel is still using this resource */
-+	int imported:1;	/* Imported dmabuf */
-+
-+	enum vc_sm_vpu_mapping_state vpu_state;
-+	u32 vc_handle;	/* VideoCore handle for this buffer */
-+	int vpu_allocated;	/*
-+				 * The VPU made this allocation. Release the
-+				 * local dma_buf when the VPU releases the
-+				 * resource.
-+				 */
-+
-+	/* DMABUF related fields */
-+	struct dma_buf *dma_buf;
-+	dma_addr_t dma_addr;
-+	void *cookie;
-+
-+	struct vc_sm_privdata_t *private;
-+
-+	union {
-+		struct vc_sm_alloc_data alloc;
-+		struct vc_sm_imported import;
-+	};
-+};
-+
-+#endif
---- /dev/null
-+++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c
-@@ -0,0 +1,505 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * VideoCore Shared Memory CMA allocator
-+ *
-+ * Copyright: 2018, Raspberry Pi (Trading) Ltd
-+ * Copyright 2011-2012 Broadcom Corporation.  All rights reserved.
-+ *
-+ * Based on vmcs_sm driver from Broadcom Corporation.
-+ *
-+ */
-+
-+/* ---- Include Files ----------------------------------------------------- */
-+#include <linux/completion.h>
-+#include <linux/kernel.h>
-+#include <linux/kthread.h>
-+#include <linux/list.h>
-+#include <linux/mutex.h>
-+#include <linux/semaphore.h>
-+#include <linux/slab.h>
-+#include <linux/types.h>
-+
-+#include "vc_sm_cma_vchi.h"
-+
-+#define VC_SM_VER  1
-+#define VC_SM_MIN_VER 0
-+
-+/* ---- Private Constants and Types -------------------------------------- */
-+
-+/* Command blocks come from a pool */
-+#define SM_MAX_NUM_CMD_RSP_BLKS 32
-+
-+/* The number of supported connections */
-+#define SM_MAX_NUM_CONNECTIONS 3
-+
-+struct sm_cmd_rsp_blk {
-+	struct list_head head;	/* To create lists */
-+	/* To be signaled when the response is there */
-+	struct completion cmplt;
-+
-+	u32 id;
-+	u16 length;
-+
-+	u8 msg[VC_SM_MAX_MSG_LEN];
-+
-+	uint32_t wait:1;
-+	uint32_t sent:1;
-+	uint32_t alloc:1;
-+
-+};
-+
-+struct sm_instance {
-+	u32 num_connections;
-+	unsigned int service_handle[SM_MAX_NUM_CONNECTIONS];
-+	struct task_struct *io_thread;
-+	struct completion io_cmplt;
-+
-+	vpu_event_cb vpu_event;
-+
-+	/* Mutex over the following lists */
-+	struct mutex lock;
-+	u32 trans_id;
-+	struct list_head cmd_list;
-+	struct list_head rsp_list;
-+	struct list_head dead_list;
-+
-+	struct sm_cmd_rsp_blk free_blk[SM_MAX_NUM_CMD_RSP_BLKS];
-+
-+	/* Mutex over the free_list */
-+	struct mutex free_lock;
-+	struct list_head free_list;
-+
-+	struct semaphore free_sema;
-+
-+};
-+
-+/* ---- Private Variables ------------------------------------------------ */
-+
-+/* ---- Private Function Prototypes -------------------------------------- */
-+
-+/* ---- Private Functions ------------------------------------------------ */
-+static int
-+bcm2835_vchi_msg_queue(unsigned int handle,
-+		       void *data,
-+		       unsigned int size)
-+{
-+	return vchiq_queue_kernel_message(handle, data, size);
-+}
-+
-+static struct
-+sm_cmd_rsp_blk *vc_vchi_cmd_create(struct sm_instance *instance,
-+				   enum vc_sm_msg_type id, void *msg,
-+				   u32 size, int wait)
-+{
-+	struct sm_cmd_rsp_blk *blk;
-+	struct vc_sm_msg_hdr_t *hdr;
-+
-+	if (down_interruptible(&instance->free_sema)) {
-+		blk = kmalloc(sizeof(*blk), GFP_KERNEL);
-+		if (!blk)
-+			return NULL;
-+
-+		blk->alloc = 1;
-+		init_completion(&blk->cmplt);
-+	} else {
-+		mutex_lock(&instance->free_lock);
-+		blk =
-+		    list_first_entry(&instance->free_list,
-+				     struct sm_cmd_rsp_blk, head);
-+		list_del(&blk->head);
-+		mutex_unlock(&instance->free_lock);
-+	}
-+
-+	blk->sent = 0;
-+	blk->wait = wait;
-+	blk->length = sizeof(*hdr) + size;
-+
-+	hdr = (struct vc_sm_msg_hdr_t *)blk->msg;
-+	hdr->type = id;
-+	mutex_lock(&instance->lock);
-+	instance->trans_id++;
-+	/*
-+	 * Retain the top bit for identifying asynchronous events, or VPU cmds.
-+	 */
-+	instance->trans_id &= ~0x80000000;
-+	hdr->trans_id = instance->trans_id;
-+	blk->id = instance->trans_id;
-+	mutex_unlock(&instance->lock);
-+
-+	if (size)
-+		memcpy(hdr->body, msg, size);
-+
-+	return blk;
-+}
-+
-+static void
-+vc_vchi_cmd_delete(struct sm_instance *instance, struct sm_cmd_rsp_blk *blk)
-+{
-+	if (blk->alloc) {
-+		kfree(blk);
-+		return;
-+	}
-+
-+	mutex_lock(&instance->free_lock);
-+	list_add(&blk->head, &instance->free_list);
-+	mutex_unlock(&instance->free_lock);
-+	up(&instance->free_sema);
-+}
-+
-+static void vc_sm_cma_vchi_rx_ack(struct sm_instance *instance,
-+				  struct sm_cmd_rsp_blk *cmd,
-+				  struct vc_sm_result_t *reply,
-+				  u32 reply_len)
-+{
-+	mutex_lock(&instance->lock);
-+	list_for_each_entry(cmd,
-+			    &instance->rsp_list,
-+			    head) {
-+		if (cmd->id == reply->trans_id)
-+			break;
-+	}
-+	mutex_unlock(&instance->lock);
-+
-+	if (&cmd->head == &instance->rsp_list) {
-+		//pr_debug("%s: received response %u, throw away...",
-+		pr_err("%s: received response %u, throw away...",
-+		       __func__,
-+		       reply->trans_id);
-+	} else if (reply_len > sizeof(cmd->msg)) {
-+		pr_err("%s: reply too big (%u) %u, throw away...",
-+		       __func__, reply_len,
-+		     reply->trans_id);
-+	} else {
-+		memcpy(cmd->msg, reply,
-+		       reply_len);
-+		complete(&cmd->cmplt);
-+	}
-+}
-+
-+static int vc_sm_cma_vchi_videocore_io(void *arg)
-+{
-+	struct sm_instance *instance = arg;
-+	struct sm_cmd_rsp_blk *cmd = NULL, *cmd_tmp;
-+	struct vc_sm_result_t *reply;
-+	struct vchiq_header *header;
-+	s32 status;
-+	int svc_use = 1;
-+
-+	while (1) {
-+		if (svc_use)
-+			vchiq_release_service(instance->service_handle[0]);
-+		svc_use = 0;
-+
-+		if (wait_for_completion_interruptible(&instance->io_cmplt))
-+			continue;
-+		vchiq_use_service(instance->service_handle[0]);
-+		svc_use = 1;
-+
-+		do {
-+			/*
-+			 * Get new command and move it to response list
-+			 */
-+			mutex_lock(&instance->lock);
-+			if (list_empty(&instance->cmd_list)) {
-+				/* no more commands to process */
-+				mutex_unlock(&instance->lock);
-+				break;
-+			}
-+			cmd = list_first_entry(&instance->cmd_list,
-+					       struct sm_cmd_rsp_blk, head);
-+			list_move(&cmd->head, &instance->rsp_list);
-+			cmd->sent = 1;
-+			mutex_unlock(&instance->lock);
-+			/* Send the command */
-+			status =
-+				bcm2835_vchi_msg_queue(instance->service_handle[0],
-+						       cmd->msg, cmd->length);
-+			if (status) {
-+				pr_err("%s: failed to queue message (%d)",
-+				       __func__, status);
-+			}
-+
-+			/* If no reply is needed then we're done */
-+			if (!cmd->wait) {
-+				mutex_lock(&instance->lock);
-+				list_del(&cmd->head);
-+				mutex_unlock(&instance->lock);
-+				vc_vchi_cmd_delete(instance, cmd);
-+				continue;
-+			}
-+
-+			if (status) {
-+				complete(&cmd->cmplt);
-+				continue;
-+			}
-+
-+		} while (1);
-+
-+		while ((header = vchiq_msg_hold(instance->service_handle[0]))) {
-+			reply = (struct vc_sm_result_t *)header->data;
-+			if (reply->trans_id & 0x80000000) {
-+				/* Async event or cmd from the VPU */
-+				if (instance->vpu_event)
-+					instance->vpu_event(instance, reply,
-+							    header->size);
-+			} else {
-+				vc_sm_cma_vchi_rx_ack(instance, cmd, reply,
-+						      header->size);
-+			}
-+
-+			vchiq_release_message(instance->service_handle[0],
-+					      header);
-+		}
-+
-+		/* Go through the dead list and free them */
-+		mutex_lock(&instance->lock);
-+		list_for_each_entry_safe(cmd, cmd_tmp, &instance->dead_list,
-+					 head) {
-+			list_del(&cmd->head);
-+			vc_vchi_cmd_delete(instance, cmd);
-+		}
-+		mutex_unlock(&instance->lock);
-+	}
-+
-+	return 0;
-+}
-+
-+static enum vchiq_status vc_sm_cma_vchi_callback(enum vchiq_reason reason,
-+						 struct vchiq_header *header,
-+						 unsigned int handle, void *userdata)
-+{
-+	struct sm_instance *instance = vchiq_get_service_userdata(handle);
-+
-+	switch (reason) {
-+	case VCHIQ_MESSAGE_AVAILABLE:
-+		vchiq_msg_queue_push(handle, header);
-+		complete(&instance->io_cmplt);
-+		break;
-+
-+	case VCHIQ_SERVICE_CLOSED:
-+		pr_info("%s: service CLOSED!!", __func__);
-+		break;
-+
-+	default:
-+		break;
-+	}
-+
-+	return VCHIQ_SUCCESS;
-+}
-+
-+struct sm_instance *vc_sm_cma_vchi_init(struct vchiq_instance *vchiq_instance,
-+					unsigned int num_connections,
-+					vpu_event_cb vpu_event)
-+{
-+	u32 i;
-+	struct sm_instance *instance;
-+	int status;
-+
-+	pr_debug("%s: start", __func__);
-+
-+	if (num_connections > SM_MAX_NUM_CONNECTIONS) {
-+		pr_err("%s: unsupported number of connections %u (max=%u)",
-+		       __func__, num_connections, SM_MAX_NUM_CONNECTIONS);
-+
-+		goto err_null;
-+	}
-+	/* Allocate memory for this instance */
-+	instance = kzalloc(sizeof(*instance), GFP_KERNEL);
-+
-+	/* Misc initialisations */
-+	mutex_init(&instance->lock);
-+	init_completion(&instance->io_cmplt);
-+	INIT_LIST_HEAD(&instance->cmd_list);
-+	INIT_LIST_HEAD(&instance->rsp_list);
-+	INIT_LIST_HEAD(&instance->dead_list);
-+	INIT_LIST_HEAD(&instance->free_list);
-+	sema_init(&instance->free_sema, SM_MAX_NUM_CMD_RSP_BLKS);
-+	mutex_init(&instance->free_lock);
-+	for (i = 0; i < SM_MAX_NUM_CMD_RSP_BLKS; i++) {
-+		init_completion(&instance->free_blk[i].cmplt);
-+		list_add(&instance->free_blk[i].head, &instance->free_list);
-+	}
-+
-+	/* Open the VCHI service connections */
-+	instance->num_connections = num_connections;
-+	for (i = 0; i < num_connections; i++) {
-+		struct vchiq_service_params_kernel params = {
-+			.version = VC_SM_VER,
-+			.version_min = VC_SM_MIN_VER,
-+			.fourcc = VCHIQ_MAKE_FOURCC('S', 'M', 'E', 'M'),
-+			.callback = vc_sm_cma_vchi_callback,
-+			.userdata = instance,
-+		};
-+
-+		status = vchiq_open_service(vchiq_instance, &params,
-+					    &instance->service_handle[i]);
-+		if (status) {
-+			pr_err("%s: failed to open VCHI service (%d)",
-+			       __func__, status);
-+
-+			goto err_close_services;
-+		}
-+	}
-+	/* Create the thread which takes care of all io to/from videoocore. */
-+	instance->io_thread = kthread_create(&vc_sm_cma_vchi_videocore_io,
-+					     (void *)instance, "SMIO");
-+	if (!instance->io_thread) {
-+		pr_err("%s: failed to create SMIO thread", __func__);
-+
-+		goto err_close_services;
-+	}
-+	instance->vpu_event = vpu_event;
-+	set_user_nice(instance->io_thread, -10);
-+	wake_up_process(instance->io_thread);
-+
-+	pr_debug("%s: success - instance %p", __func__, instance);
-+	return instance;
-+
-+err_close_services:
-+	for (i = 0; i < instance->num_connections; i++) {
-+		if (instance->service_handle[i])
-+			vchiq_close_service(instance->service_handle[i]);
-+	}
-+	kfree(instance);
-+err_null:
-+	pr_debug("%s: FAILED", __func__);
-+	return NULL;
-+}
-+
-+int vc_sm_cma_vchi_stop(struct sm_instance **handle)
-+{
-+	struct sm_instance *instance;
-+	u32 i;
-+
-+	if (!handle) {
-+		pr_err("%s: invalid pointer to handle %p", __func__, handle);
-+		goto lock;
-+	}
-+
-+	if (!*handle) {
-+		pr_err("%s: invalid handle %p", __func__, *handle);
-+		goto lock;
-+	}
-+
-+	instance = *handle;
-+
-+	/* Close all VCHI service connections */
-+	for (i = 0; i < instance->num_connections; i++) {
-+		vchiq_use_service(instance->service_handle[i]);
-+		vchiq_close_service(instance->service_handle[i]);
-+	}
-+
-+	kfree(instance);
-+
-+	*handle = NULL;
-+	return 0;
-+
-+lock:
-+	return -EINVAL;
-+}
-+
-+static int vc_sm_cma_vchi_send_msg(struct sm_instance *handle,
-+				   enum vc_sm_msg_type msg_id, void *msg,
-+				   u32 msg_size, void *result, u32 result_size,
-+				   u32 *cur_trans_id, u8 wait_reply)
-+{
-+	int status = 0;
-+	struct sm_instance *instance = handle;
-+	struct sm_cmd_rsp_blk *cmd_blk;
-+
-+	if (!handle) {
-+		pr_err("%s: invalid handle", __func__);
-+		return -EINVAL;
-+	}
-+	if (!msg) {
-+		pr_err("%s: invalid msg pointer", __func__);
-+		return -EINVAL;
-+	}
-+
-+	cmd_blk =
-+	    vc_vchi_cmd_create(instance, msg_id, msg, msg_size, wait_reply);
-+	if (!cmd_blk) {
-+		pr_err("[%s]: failed to allocate global tracking resource",
-+		       __func__);
-+		return -ENOMEM;
-+	}
-+
-+	if (cur_trans_id)
-+		*cur_trans_id = cmd_blk->id;
-+
-+	mutex_lock(&instance->lock);
-+	list_add_tail(&cmd_blk->head, &instance->cmd_list);
-+	mutex_unlock(&instance->lock);
-+	complete(&instance->io_cmplt);
-+
-+	if (!wait_reply)
-+		/* We're done */
-+		return 0;
-+
-+	/* Wait for the response */
-+	if (wait_for_completion_interruptible(&cmd_blk->cmplt)) {
-+		mutex_lock(&instance->lock);
-+		if (!cmd_blk->sent) {
-+			list_del(&cmd_blk->head);
-+			mutex_unlock(&instance->lock);
-+			vc_vchi_cmd_delete(instance, cmd_blk);
-+			return -ENXIO;
-+		}
-+
-+		list_move(&cmd_blk->head, &instance->dead_list);
-+		mutex_unlock(&instance->lock);
-+		complete(&instance->io_cmplt);
-+		return -EINTR;	/* We're done */
-+	}
-+
-+	if (result && result_size) {
-+		memcpy(result, cmd_blk->msg, result_size);
-+	} else {
-+		struct vc_sm_result_t *res =
-+			(struct vc_sm_result_t *)cmd_blk->msg;
-+		status = (res->success == 0) ? 0 : -ENXIO;
-+	}
-+
-+	mutex_lock(&instance->lock);
-+	list_del(&cmd_blk->head);
-+	mutex_unlock(&instance->lock);
-+	vc_vchi_cmd_delete(instance, cmd_blk);
-+	return status;
-+}
-+
-+int vc_sm_cma_vchi_free(struct sm_instance *handle, struct vc_sm_free_t *msg,
-+			u32 *cur_trans_id)
-+{
-+	return vc_sm_cma_vchi_send_msg(handle, VC_SM_MSG_TYPE_FREE,
-+				   msg, sizeof(*msg), 0, 0, cur_trans_id, 0);
-+}
-+
-+int vc_sm_cma_vchi_import(struct sm_instance *handle, struct vc_sm_import *msg,
-+			  struct vc_sm_import_result *result, u32 *cur_trans_id)
-+{
-+	return vc_sm_cma_vchi_send_msg(handle, VC_SM_MSG_TYPE_IMPORT,
-+				   msg, sizeof(*msg), result, sizeof(*result),
-+				   cur_trans_id, 1);
-+}
-+
-+int vc_sm_cma_vchi_client_version(struct sm_instance *handle,
-+				  struct vc_sm_version *msg,
-+				  struct vc_sm_result_t *result,
-+				  u32 *cur_trans_id)
-+{
-+	return vc_sm_cma_vchi_send_msg(handle, VC_SM_MSG_TYPE_CLIENT_VERSION,
-+				   //msg, sizeof(*msg), result, sizeof(*result),
-+				   //cur_trans_id, 1);
-+				   msg, sizeof(*msg), NULL, 0,
-+				   cur_trans_id, 0);
-+}
-+
-+int vc_sm_vchi_client_vc_mem_req_reply(struct sm_instance *handle,
-+				       struct vc_sm_vc_mem_request_result *msg,
-+				       uint32_t *cur_trans_id)
-+{
-+	return vc_sm_cma_vchi_send_msg(handle,
-+				       VC_SM_MSG_TYPE_VC_MEM_REQUEST_REPLY,
-+				       msg, sizeof(*msg), 0, 0, cur_trans_id,
-+				       0);
-+}
---- /dev/null
-+++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.h
-@@ -0,0 +1,63 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+
-+/*
-+ * VideoCore Shared Memory CMA allocator
-+ *
-+ * Copyright: 2018, Raspberry Pi (Trading) Ltd
-+ * Copyright 2011-2012 Broadcom Corporation.  All rights reserved.
-+ *
-+ * Based on vmcs_sm driver from Broadcom Corporation.
-+ *
-+ */
-+
-+#ifndef __VC_SM_CMA_VCHI_H__INCLUDED__
-+#define __VC_SM_CMA_VCHI_H__INCLUDED__
-+
-+#include <linux/raspberrypi/vchiq.h>
-+
-+#include "vc_sm_defs.h"
-+
-+/*
-+ * Forward declare.
-+ */
-+struct sm_instance;
-+
-+typedef void (*vpu_event_cb)(struct sm_instance *instance,
-+			     struct vc_sm_result_t *reply, int reply_len);
-+
-+/*
-+ * Initialize the shared memory service, opens up vchi connection to talk to it.
-+ */
-+struct sm_instance *vc_sm_cma_vchi_init(struct vchiq_instance *vchi_instance,
-+					unsigned int num_connections,
-+					vpu_event_cb vpu_event);
-+
-+/*
-+ * Terminates the shared memory service.
-+ */
-+int vc_sm_cma_vchi_stop(struct sm_instance **handle);
-+
-+/*
-+ * Ask the shared memory service to free up some memory that was previously
-+ * allocated by the vc_sm_cma_vchi_alloc function call.
-+ */
-+int vc_sm_cma_vchi_free(struct sm_instance *handle, struct vc_sm_free_t *msg,
-+			u32 *cur_trans_id);
-+
-+/*
-+ * Import a contiguous block of memory and wrap it in a GPU MEM_HANDLE_T.
-+ */
-+int vc_sm_cma_vchi_import(struct sm_instance *handle, struct vc_sm_import *msg,
-+			  struct vc_sm_import_result *result,
-+			  u32 *cur_trans_id);
-+
-+int vc_sm_cma_vchi_client_version(struct sm_instance *handle,
-+				  struct vc_sm_version *msg,
-+				  struct vc_sm_result_t *result,
-+				  u32 *cur_trans_id);
-+
-+int vc_sm_vchi_client_vc_mem_req_reply(struct sm_instance *handle,
-+				       struct vc_sm_vc_mem_request_result *msg,
-+				       uint32_t *cur_trans_id);
-+
-+#endif /* __VC_SM_CMA_VCHI_H__INCLUDED__ */
---- /dev/null
-+++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_defs.h
-@@ -0,0 +1,297 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+
-+/*
-+ * VideoCore Shared Memory CMA allocator
-+ *
-+ * Copyright: 2018, Raspberry Pi (Trading) Ltd
-+ *
-+ * Based on vc_sm_defs.h from the vmcs_sm driver Copyright Broadcom Corporation.
-+ * All IPC messages are copied across to this file, even if the vc-sm-cma
-+ * driver is not currently using them.
-+ *
-+ ****************************************************************************
-+ */
-+
-+#ifndef __VC_SM_DEFS_H__INCLUDED__
-+#define __VC_SM_DEFS_H__INCLUDED__
-+
-+/* Maximum message length */
-+#define VC_SM_MAX_MSG_LEN (sizeof(union vc_sm_msg_union_t) + \
-+	sizeof(struct vc_sm_msg_hdr_t))
-+#define VC_SM_MAX_RSP_LEN (sizeof(union vc_sm_msg_union_t))
-+
-+/* Resource name maximum size */
-+#define VC_SM_RESOURCE_NAME 32
-+
-+/*
-+ * Version to be reported to the VPU
-+ * VPU assumes 0 (aka 1) which does not require the released callback, nor
-+ * expect the client to handle VC_MEM_REQUESTS.
-+ * Version 2 requires the released callback, and must support VC_MEM_REQUESTS.
-+ */
-+#define VC_SM_PROTOCOL_VERSION	2
-+
-+enum vc_sm_msg_type {
-+	/* Message types supported for HOST->VC direction */
-+
-+	/* Allocate shared memory block */
-+	VC_SM_MSG_TYPE_ALLOC,
-+	/* Lock allocated shared memory block */
-+	VC_SM_MSG_TYPE_LOCK,
-+	/* Unlock allocated shared memory block */
-+	VC_SM_MSG_TYPE_UNLOCK,
-+	/* Unlock allocated shared memory block, do not answer command */
-+	VC_SM_MSG_TYPE_UNLOCK_NOANS,
-+	/* Free shared memory block */
-+	VC_SM_MSG_TYPE_FREE,
-+	/* Resize a shared memory block */
-+	VC_SM_MSG_TYPE_RESIZE,
-+	/* Walk the allocated shared memory block(s) */
-+	VC_SM_MSG_TYPE_WALK_ALLOC,
-+
-+	/* A previously applied action will need to be reverted */
-+	VC_SM_MSG_TYPE_ACTION_CLEAN,
-+
-+	/*
-+	 * Import a physical address and wrap into a MEM_HANDLE_T.
-+	 * Release with VC_SM_MSG_TYPE_FREE.
-+	 */
-+	VC_SM_MSG_TYPE_IMPORT,
-+	/*
-+	 *Tells VC the protocol version supported by this client.
-+	 * 2 supports the async/cmd messages from the VPU for final release
-+	 * of memory, and for VC allocations.
-+	 */
-+	VC_SM_MSG_TYPE_CLIENT_VERSION,
-+	/* Response to VC request for memory */
-+	VC_SM_MSG_TYPE_VC_MEM_REQUEST_REPLY,
-+
-+	/*
-+	 * Asynchronous/cmd messages supported for VC->HOST direction.
-+	 * Signalled by setting the top bit in vc_sm_result_t trans_id.
-+	 */
-+
-+	/*
-+	 * VC has finished with an imported memory allocation.
-+	 * Release any Linux reference counts on the underlying block.
-+	 */
-+	VC_SM_MSG_TYPE_RELEASED,
-+	/* VC request for memory */
-+	VC_SM_MSG_TYPE_VC_MEM_REQUEST,
-+
-+	VC_SM_MSG_TYPE_MAX
-+};
-+
-+/* Type of memory to be allocated */
-+enum vc_sm_alloc_type_t {
-+	VC_SM_ALLOC_CACHED,
-+	VC_SM_ALLOC_NON_CACHED,
-+};
-+
-+/* Message header for all messages in HOST->VC direction */
-+struct vc_sm_msg_hdr_t {
-+	u32 type;
-+	u32 trans_id;
-+	u8 body[0];
-+
-+};
-+
-+/* Request to allocate memory (HOST->VC) */
-+struct vc_sm_alloc_t {
-+	/* type of memory to allocate */
-+	enum vc_sm_alloc_type_t type;
-+	/* byte amount of data to allocate per unit */
-+	u32 base_unit;
-+	/* number of unit to allocate */
-+	u32 num_unit;
-+	/* alignment to be applied on allocation */
-+	u32 alignment;
-+	/* identity of who allocated this block */
-+	u32 allocator;
-+	/* resource name (for easier tracking on vc side) */
-+	char name[VC_SM_RESOURCE_NAME];
-+
-+};
-+
-+/* Result of a requested memory allocation (VC->HOST) */
-+struct vc_sm_alloc_result_t {
-+	/* Transaction identifier */
-+	u32 trans_id;
-+
-+	/* Resource handle */
-+	u32 res_handle;
-+	/* Pointer to resource buffer */
-+	u32 res_mem;
-+	/* Resource base size (bytes) */
-+	u32 res_base_size;
-+	/* Resource number */
-+	u32 res_num;
-+
-+};
-+
-+/* Request to free a previously allocated memory (HOST->VC) */
-+struct vc_sm_free_t {
-+	/* Resource handle (returned from alloc) */
-+	u32 res_handle;
-+	/* Resource buffer (returned from alloc) */
-+	u32 res_mem;
-+
-+};
-+
-+/* Request to lock a previously allocated memory (HOST->VC) */
-+struct vc_sm_lock_unlock_t {
-+	/* Resource handle (returned from alloc) */
-+	u32 res_handle;
-+	/* Resource buffer (returned from alloc) */
-+	u32 res_mem;
-+
-+};
-+
-+/* Request to resize a previously allocated memory (HOST->VC) */
-+struct vc_sm_resize_t {
-+	/* Resource handle (returned from alloc) */
-+	u32 res_handle;
-+	/* Resource buffer (returned from alloc) */
-+	u32 res_mem;
-+	/* Resource *new* size requested (bytes) */
-+	u32 res_new_size;
-+
-+};
-+
-+/* Result of a requested memory lock (VC->HOST) */
-+struct vc_sm_lock_result_t {
-+	/* Transaction identifier */
-+	u32 trans_id;
-+
-+	/* Resource handle */
-+	u32 res_handle;
-+	/* Pointer to resource buffer */
-+	u32 res_mem;
-+	/*
-+	 * Pointer to former resource buffer if the memory
-+	 * was reallocated
-+	 */
-+	u32 res_old_mem;
-+
-+};
-+
-+/* Generic result for a request (VC->HOST) */
-+struct vc_sm_result_t {
-+	/* Transaction identifier */
-+	u32 trans_id;
-+
-+	s32 success;
-+
-+};
-+
-+/* Request to revert a previously applied action (HOST->VC) */
-+struct vc_sm_action_clean_t {
-+	/* Action of interest */
-+	enum vc_sm_msg_type res_action;
-+	/* Transaction identifier for the action of interest */
-+	u32 action_trans_id;
-+
-+};
-+
-+/* Request to remove all data associated with a given allocator (HOST->VC) */
-+struct vc_sm_free_all_t {
-+	/* Allocator identifier */
-+	u32 allocator;
-+};
-+
-+/* Request to import memory (HOST->VC) */
-+struct vc_sm_import {
-+	/* type of memory to allocate */
-+	enum vc_sm_alloc_type_t type;
-+	/* pointer to the VC (ie physical) address of the allocated memory */
-+	u32 addr;
-+	/* size of buffer */
-+	u32 size;
-+	/* opaque handle returned in RELEASED messages */
-+	u32 kernel_id;
-+	/* Allocator identifier */
-+	u32 allocator;
-+	/* resource name (for easier tracking on vc side) */
-+	char     name[VC_SM_RESOURCE_NAME];
-+};
-+
-+/* Result of a requested memory import (VC->HOST) */
-+struct vc_sm_import_result {
-+	/* Transaction identifier */
-+	u32 trans_id;
-+
-+	/* Resource handle */
-+	u32 res_handle;
-+};
-+
-+/* Notification that VC has finished with an allocation (VC->HOST) */
-+struct vc_sm_released {
-+	/* cmd type / trans_id */
-+	u32 cmd;
-+
-+	/* pointer to the VC (ie physical) address of the allocated memory */
-+	u32 addr;
-+	/* size of buffer */
-+	u32 size;
-+	/* opaque handle returned in RELEASED messages */
-+	u32 kernel_id;
-+	u32 vc_handle;
-+};
-+
-+/*
-+ * Client informing VC as to the protocol version it supports.
-+ * >=2 requires the released callback, and supports VC asking for memory.
-+ * Failure means that the firmware doesn't support this call, and therefore the
-+ * client should either fail, or NOT rely on getting the released callback.
-+ */
-+struct vc_sm_version {
-+	u32 version;
-+};
-+
-+/* Request FROM VideoCore for some memory */
-+struct vc_sm_vc_mem_request {
-+	/* cmd type */
-+	u32 cmd;
-+
-+	/* trans_id (from VPU) */
-+	u32 trans_id;
-+	/* size of buffer */
-+	u32 size;
-+	/* alignment of buffer */
-+	u32 align;
-+	/* resource name (for easier tracking) */
-+	char     name[VC_SM_RESOURCE_NAME];
-+	/* VPU handle for the resource */
-+	u32 vc_handle;
-+};
-+
-+/* Response from the kernel to provide the VPU with some memory */
-+struct vc_sm_vc_mem_request_result {
-+	/* Transaction identifier for the VPU */
-+	u32 trans_id;
-+	/* pointer to the physical address of the allocated memory */
-+	u32 addr;
-+	/* opaque handle returned in RELEASED messages */
-+	u32 kernel_id;
-+};
-+
-+/* Union of ALL messages */
-+union vc_sm_msg_union_t {
-+	struct vc_sm_alloc_t alloc;
-+	struct vc_sm_alloc_result_t alloc_result;
-+	struct vc_sm_free_t free;
-+	struct vc_sm_lock_unlock_t lock_unlock;
-+	struct vc_sm_action_clean_t action_clean;
-+	struct vc_sm_resize_t resize;
-+	struct vc_sm_lock_result_t lock_result;
-+	struct vc_sm_result_t result;
-+	struct vc_sm_free_all_t free_all;
-+	struct vc_sm_import import;
-+	struct vc_sm_import_result import_result;
-+	struct vc_sm_version version;
-+	struct vc_sm_released released;
-+	struct vc_sm_vc_mem_request vc_request;
-+	struct vc_sm_vc_mem_request_result vc_request_result;
-+};
-+
-+#endif /* __VC_SM_DEFS_H__INCLUDED__ */
---- /dev/null
-+++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_knl.h
-@@ -0,0 +1,28 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+
-+/*
-+ * VideoCore Shared Memory CMA allocator
-+ *
-+ * Copyright: 2018, Raspberry Pi (Trading) Ltd
-+ *
-+ * Based on vc_sm_defs.h from the vmcs_sm driver Copyright Broadcom Corporation.
-+ *
-+ */
-+
-+#ifndef __VC_SM_KNL_H__INCLUDED__
-+#define __VC_SM_KNL_H__INCLUDED__
-+
-+#if !defined(__KERNEL__)
-+#error "This interface is for kernel use only..."
-+#endif
-+
-+/* Free a previously allocated or imported shared memory handle and block. */
-+int vc_sm_cma_free(void *handle);
-+
-+/* Get an internal resource handle mapped from the external one. */
-+int vc_sm_cma_int_handle(void *handle);
-+
-+/* Import a block of memory into the GPU space. */
-+int vc_sm_cma_import_dmabuf(struct dma_buf *dmabuf, void **handle);
-+
-+#endif /* __VC_SM_KNL_H__INCLUDED__ */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0274-staging-vchiq-mmal-Add-support-for-14bit-Bayer.patch b/target/linux/bcm27xx/patches-6.1/950-0274-staging-vchiq-mmal-Add-support-for-14bit-Bayer.patch
deleted file mode 100644
index dedef4ea66..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0274-staging-vchiq-mmal-Add-support-for-14bit-Bayer.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7e0330332a23b9ed956bec1636c8ade60484ad3e Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 6 May 2020 18:09:04 +0100
-Subject: [PATCH] staging: vchiq-mmal: Add support for 14bit Bayer
-
-Add in the missing defines.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
-+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
-@@ -90,6 +90,12 @@
- #define MMAL_ENCODING_BAYER_SGBRG12P   MMAL_FOURCC('p', 'G', '1', '2')
- #define MMAL_ENCODING_BAYER_SRGGB12P   MMAL_FOURCC('p', 'R', '1', '2')
- 
-+//14 bit per pixel Bayer formats.
-+#define MMAL_ENCODING_BAYER_SBGGR14P   MMAL_FOURCC('p', 'B', 'E', 'E')
-+#define MMAL_ENCODING_BAYER_SGBRG14P   MMAL_FOURCC('p', 'G', 'E', 'E')
-+#define MMAL_ENCODING_BAYER_SGRBG14P   MMAL_FOURCC('p', 'g', 'E', 'E')
-+#define MMAL_ENCODING_BAYER_SRGGB14P   MMAL_FOURCC('p', 'R', 'E', 'E')
-+
- /* 16 bit per pixel Bayer formats. */
- #define MMAL_ENCODING_BAYER_SBGGR16    MMAL_FOURCC('B', 'G', '1', '6')
- #define MMAL_ENCODING_BAYER_SGBRG16    MMAL_FOURCC('G', 'B', '1', '6')
diff --git a/target/linux/bcm27xx/patches-6.1/950-0275-staging-mmal-vchiq-Add-monochrome-image-formats.patch b/target/linux/bcm27xx/patches-6.1/950-0275-staging-mmal-vchiq-Add-monochrome-image-formats.patch
deleted file mode 100644
index 8da8b311a6..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0275-staging-mmal-vchiq-Add-monochrome-image-formats.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 6066374b96db2606ea740c4a45b1c59edc8762d4 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 6 May 2020 18:11:14 +0100
-Subject: [PATCH] staging: mmal-vchiq: Add monochrome image formats
-
-Adds support for monochrome image formats in the various
-MIPI packings.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h | 7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
-+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
-@@ -102,6 +102,13 @@
- #define MMAL_ENCODING_BAYER_SGRBG16    MMAL_FOURCC('G', 'R', '1', '6')
- #define MMAL_ENCODING_BAYER_SRGGB16    MMAL_FOURCC('R', 'G', '1', '6')
- 
-+/* MIPI packed monochrome images */
-+#define MMAL_ENCODING_GREY    MMAL_FOURCC('G', 'R', 'E', 'Y')
-+#define MMAL_ENCODING_Y10P    MMAL_FOURCC('Y', '1', '0', 'P')
-+#define MMAL_ENCODING_Y12P    MMAL_FOURCC('Y', '1', '2', 'P')
-+#define MMAL_ENCODING_Y14P    MMAL_FOURCC('Y', '1', '4', 'P')
-+#define MMAL_ENCODING_Y16     MMAL_FOURCC('Y', '1', '6', ' ')
-+
- /** An EGL image handle
-  */
- #define MMAL_ENCODING_EGL_IMAGE        MMAL_FOURCC('E', 'G', 'L', 'I')
diff --git a/target/linux/bcm27xx/patches-6.1/950-0276-staging-mmal-vchiq-Use-vc-sm-cma-to-support-zero-cop.patch b/target/linux/bcm27xx/patches-6.1/950-0276-staging-mmal-vchiq-Use-vc-sm-cma-to-support-zero-cop.patch
deleted file mode 100644
index 59ce232639..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0276-staging-mmal-vchiq-Use-vc-sm-cma-to-support-zero-cop.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From ea4f926ea7fd76d0eeb4825bece0e3eaf36f3b0e Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Tue, 25 Sep 2018 16:07:55 +0100
-Subject: [PATCH] staging: mmal-vchiq: Use vc-sm-cma to support zero
- copy
-
-With the vc-sm-cma driver we can support zero copy of buffers between
-the kernel and VPU. Add this support to mmal-vchiq.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../staging/vc04_services/vchiq-mmal/Kconfig  |  1 +
- .../vc04_services/vchiq-mmal/mmal-common.h    |  4 ++
- .../vc04_services/vchiq-mmal/mmal-vchiq.c     | 65 ++++++++++++++++++-
- .../vc04_services/vchiq-mmal/mmal-vchiq.h     |  1 +
- 4 files changed, 69 insertions(+), 2 deletions(-)
-
---- a/drivers/staging/vc04_services/vchiq-mmal/Kconfig
-+++ b/drivers/staging/vc04_services/vchiq-mmal/Kconfig
-@@ -1,6 +1,7 @@
- config BCM2835_VCHIQ_MMAL
- 	tristate "BCM2835 MMAL VCHIQ service"
- 	depends on BCM2835_VCHIQ
-+	select BCM_VC_SM_CMA
- 	help
- 	  Enables the MMAL API over VCHIQ interface as used for the
- 	  majority of the multimedia services on VideoCore.
---- a/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h
-+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h
-@@ -50,6 +50,10 @@ struct mmal_buffer {
- 
- 	struct mmal_msg_context *msg_context;
- 
-+	struct dma_buf *dma_buf;/* Exported dmabuf fd from videobuf2 */
-+	void *vcsm_handle;	/* VCSM handle having imported the dmabuf */
-+	u32 vc_handle;		/* VC handle to that dmabuf */
-+
- 	u32 cmd;		/* MMAL command. 0=data. */
- 	unsigned long length;
- 	u32 mmal_flags;
---- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-@@ -27,9 +27,11 @@
- #include <media/videobuf2-vmalloc.h>
- 
- #include "mmal-common.h"
-+#include "mmal-parameters.h"
- #include "mmal-vchiq.h"
- #include "mmal-msg.h"
- 
-+#include "vc-sm-cma/vc_sm_knl.h"
- /*
-  * maximum number of components supported.
-  * This matches the maximum permitted by default on the VPU
-@@ -416,8 +418,13 @@ buffer_from_host(struct vchiq_mmal_insta
- 
- 	/* buffer header */
- 	m.u.buffer_from_host.buffer_header.cmd = 0;
--	m.u.buffer_from_host.buffer_header.data =
--		(u32)(unsigned long)buf->buffer;
-+	if (port->zero_copy) {
-+		m.u.buffer_from_host.buffer_header.data = buf->vc_handle;
-+	} else {
-+		m.u.buffer_from_host.buffer_header.data =
-+			(u32)(unsigned long)buf->buffer;
-+	}
-+
- 	m.u.buffer_from_host.buffer_header.alloc_size = buf->buffer_size;
- 	if (port->type == MMAL_PORT_TYPE_OUTPUT) {
- 		m.u.buffer_from_host.buffer_header.length = 0;
-@@ -583,6 +590,22 @@ static void buffer_to_host_cb(struct vch
- 
- 		msg_context->u.bulk.status = msg->h.status;
- 
-+	} else if (msg->u.buffer_from_host.is_zero_copy) {
-+		/*
-+		 * Zero copy buffer, so nothing to do.
-+		 * Copy buffer info and make callback.
-+		 */
-+		msg_context->u.bulk.buffer_used =
-+				msg->u.buffer_from_host.buffer_header.length;
-+		msg_context->u.bulk.mmal_flags =
-+				msg->u.buffer_from_host.buffer_header.flags;
-+		msg_context->u.bulk.dts =
-+				msg->u.buffer_from_host.buffer_header.dts;
-+		msg_context->u.bulk.pts =
-+				msg->u.buffer_from_host.buffer_header.pts;
-+		msg_context->u.bulk.cmd =
-+				msg->u.buffer_from_host.buffer_header.cmd;
-+
- 	} else if (msg->u.buffer_from_host.buffer_header.length == 0) {
- 		/* empty buffer */
- 		if (msg->u.buffer_from_host.buffer_header.flags &
-@@ -1529,6 +1552,9 @@ int vchiq_mmal_port_parameter_set(struct
- 
- 	mutex_unlock(&instance->vchiq_mutex);
- 
-+	if (parameter == MMAL_PARAMETER_ZERO_COPY && !ret)
-+		port->zero_copy = !!(*(bool *)value);
-+
- 	return ret;
- }
- EXPORT_SYMBOL_GPL(vchiq_mmal_port_parameter_set);
-@@ -1697,6 +1723,31 @@ int vchiq_mmal_submit_buffer(struct vchi
- 	unsigned long flags = 0;
- 	int ret;
- 
-+	/*
-+	 * We really want to do this in mmal_vchi_buffer_init but can't as
-+	 * videobuf2 won't let us have the dmabuf there.
-+	 */
-+	if (port->zero_copy && buffer->dma_buf && !buffer->vcsm_handle) {
-+		pr_debug("%s: import dmabuf %p\n", __func__, buffer->dma_buf);
-+		ret = vc_sm_cma_import_dmabuf(buffer->dma_buf,
-+					      &buffer->vcsm_handle);
-+		if (ret) {
-+			pr_err("%s: vc_sm_import_dmabuf_fd failed, ret %d\n",
-+			       __func__, ret);
-+			return ret;
-+		}
-+
-+		buffer->vc_handle = vc_sm_cma_int_handle(buffer->vcsm_handle);
-+		if (!buffer->vc_handle) {
-+			pr_err("%s: vc_sm_int_handle failed %d\n",
-+			       __func__, ret);
-+			vc_sm_cma_free(buffer->vcsm_handle);
-+			return ret;
-+		}
-+		pr_debug("%s: import dmabuf %p - got vc handle %08X\n",
-+			 __func__, buffer->dma_buf, buffer->vc_handle);
-+	}
-+
- 	ret = buffer_from_host(instance, port, buffer);
- 	if (ret == -EINVAL) {
- 		/* Port is disabled. Queue for when it is enabled. */
-@@ -1730,6 +1781,16 @@ int mmal_vchi_buffer_cleanup(struct mmal
- 		release_msg_context(msg_context);
- 	buf->msg_context = NULL;
- 
-+	if (buf->vcsm_handle) {
-+		int ret;
-+
-+		pr_debug("%s: vc_sm_cma_free on handle %p\n", __func__,
-+			 buf->vcsm_handle);
-+		ret = vc_sm_cma_free(buf->vcsm_handle);
-+		if (ret)
-+			pr_err("%s: vcsm_free failed, ret %d\n", __func__, ret);
-+		buf->vcsm_handle = 0;
-+	}
- 	return 0;
- }
- EXPORT_SYMBOL_GPL(mmal_vchi_buffer_cleanup);
---- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
-+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
-@@ -49,6 +49,7 @@ typedef void (*vchiq_mmal_buffer_cb)(
- 
- struct vchiq_mmal_port {
- 	u32 enabled:1;
-+	u32 zero_copy:1;
- 	u32 handle;
- 	u32 type; /* port type, cached to use on port info set */
- 	u32 index; /* port index, cached to use on port info set */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0277-staging-vc04_services-Add-a-V4L2-M2M-codec-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0277-staging-vc04_services-Add-a-V4L2-M2M-codec-driver.patch
deleted file mode 100644
index e35a63d90e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0277-staging-vc04_services-Add-a-V4L2-M2M-codec-driver.patch
+++ /dev/null
@@ -1,4333 +0,0 @@
-From 118b44fa3c1c3de2c8330324f6acfc8c921f3878 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 8 Oct 2020 20:24:12 +0100
-Subject: [PATCH] staging: vc04_services: Add a V4L2 M2M codec driver
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This adds a V4L2 memory to memory device that wraps the MMAL
-video decode and video_encode components for H264 and MJPEG encode
-and decode, MPEG4, H263, and VP8 decode (and MPEG2 decode
-if the appropriate licence has been purchased).
-
-This patch squashes all the work done in developing the driver
-on the Raspberry Pi rpi-5.4.y kernel branch.
-Thanks to Kieran Bingham, Aman Gupta, Chen-Yu Tsai, and
-Marek Behún for their contributions. Please refer to the
-rpi-5.4.y branch for the full history.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-staging/bcm2835-codec: Ensure OUTPUT timestamps are always forwarded
-
-The firmware by default tries to ensure that decoded frame
-timestamps always increment. This is counter to the V4L2 API
-which wants exactly the OUTPUT queue timestamps passed to the
-CAPTURE queue buffers.
-
-Disable the firmware option.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-staging/vc04_services/codec: Add support for CID MPEG_HEADER_MODE
-
-Control V4L2_CID_MPEG_VIDEO_HEADER_MODE controls whether the encoder
-is meant to emit the header bytes as a separate packet or with the
-first encoded frame.
-Add support for it.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-staging/vc04_services/codec: Clear last buf dequeued flag on START
-
-It appears that the V4L2 M2M framework requires the driver to manually
-call vb2_clear_last_buffer_dequeued on the CAPTURE queue during a
-V4L2_DEC_CMD_START.
-Add such a call.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-staging/vc04-services/codec: Fix logical precedence issue
-
-Two issues identified with operator precedence in logical
-expressions. Fix them.
-
-https://github.com/raspberrypi/linux/issues/4040
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-vc04_services: bcm2835-codec: Switch to s32fract
-
-staging/bcm2835-codec: Add the unpacked (16bpp) raw formats
-
-Now that the firmware supports the unpacked (16bpp) variants
-of the MIPI raw formats, add the mappings.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-staging/bcm2835-codec: Log the number of excess supported formats
-
-When logging that the firmware has provided more supported formats
-than we had allocated storage for, log the number allocated and
-returned.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-staging/bcm2835-codec: Add support for pixel aspect ratio
-
-If the format is detected by the driver and a V4L2_EVENT_SOURCE_CHANGE
-event is generated, then pass on the pixel aspect ratio as well.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-staging/bcm2835-codec: Implement additional g_selection calls for decode
-
-v4l_cropcap calls our vidioc_g_pixelaspect function to get the pixel
-aspect ratio, but also calls g_selection for V4L2_SEL_TGT_CROP_BOUNDS
-and V4L2_SEL_TGT_CROP_DEFAULT. Whilst it allows for vidioc_g_pixelaspect
-not to be implemented, it doesn't allow for either of the other two.
-
-Add in support for the additional selection targets.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-staging/bcm2835-codec: Add VC-1 support.
-
-Providing the relevant licence has been purchased, then Pi0-3
-can decode VC-1.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-staging/bcm2835-codec: Fix support for levels 4.1 and 4.2
-
-The driver said it supported H264 levels 4.1 and 4.2, but
-was missing the V4L2 to MMAL mappings.
-
-Add in those mappings.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-staging/bcm2835-codec: Set the colourspace appropriately for RGB formats
-
-Video decode supports YUV and RGB formats. YUV needs to report SMPTE170M
-or REC709 appropriately, whilst RGB should report SRGB.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-staging/bcm2835-codec: Pass corrupt frame flag.
-
-MMAL has the flag MMAL_BUFFER_HEADER_FLAG_CORRUPTED but that
-wasn't being passed through, so add it.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-staging/bcm2835-codec: Do not update crop from S_FMT after res change
-
-During decode, setting the CAPTURE queue format was setting the crop
-rectangle to the requested height before aligning up the format to
-cater for simple clients that weren't expecting to deal with cropping
-and the SELECTION API.
-This caused problems on some resolution change events if the client
-didn't also then use the selection API.
-
-Disable the crop update after a resolution change.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-bcm2835: Allow compressed frames to set sizeimage (#4386)
-
-Allow the user to set sizeimage in TRY_FMT and S_FMT if the format
-flags have V4L2_FMT_FLAG_COMPRESSED set
-
-Signed-off-by: John Cox <jc@kynesim.co.uk>
-
-staging/bcm2835-codec: Change the default codec res to 32x32
-
-In order to effectively guarantee that a V4L2_EVENT_SOURCE_CHANGE
-event occurs, adopt a default resolution of 32x32 so that it
-is incredibly unlikely to be decoding a stream of that resolution
-and therefore failing to note a "change" requiring the event.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-staging/bcm2835-codec: Add support for decoding interlaced streams
-
-The video decoder can support decoding interlaced streams, so add
-the required plumbing to signal this correctly.
-
-The encoder and ISP do NOT support interlaced data, so trying to
-configure an interlaced format on those nodes will be rejected.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-staging/bcm2835-codec: Correct ENUM_FRAMESIZES stepsize to 2
-
-Being YUV420 formats, the step size is always 2 to avoid part
-chroma subsampling.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-staging/bcm2835-codec: Return buffers to QUEUED not ERROR state
-
-Should start_streaming fail, or buffers be queued during
-stop_streaming, they should be returned to the core as QUEUED
-and not (as currently) as ERROR.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-staging/bcm2835_codec: Log MMAL flags in hex
-
-The flags is a bitmask, so it's far easier to interpret as hex
-data instead of decimal.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-staging: bcm2835-codec: Allow custom specified strides/bytesperline.
-
-If the client provides a bytesperline value in try_fmt/s_fmt then
-validate it and correct if necessary.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-staging/bcm2835_codec: Add support for image_fx to deinterlace
-
-Adds another /dev/video node wrapping image_fx doing deinterlace.
-
-Co-developed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
-
-staging/bcm2835-v4l2_codec: Fix for encode selection API
-
-Matches correct behaviour from DECODE and DEINTERLACE
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
-
-staging: bcm2835-codec: Allow decode res changed before STREAMON(CAPTURE)
-
-The V4L2 stateful video decoder API requires that you can STREAMON
-on only the OUTPUT queue, feed in buffers, and wait for the
-SOURCE_CHANGE event.
-This requires that we enable the MMAL output port at the same time
-as the input port, because the output port is the one that creates
-the SOURCE_CHANGED event.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-staging/bcm2835-codec: Do not send buffers to the VPU unless streaming
-
-With video decode we now enable both input and output ports on
-the component. This means that buffers will get passed to the VPU
-earlier than desired if they are queued befoer STREAMON.
-
-Check that the queue is streaming before sending buffers to the VPU.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-staging: bcm2835-codec: Format changed should trigger drain
-
-When a format changed event occurs, the spec says that it
-triggers an implicit drain, and that needs to be signalled
-via -EPIPE.
-
-For BCM2835, the format changed event happens at the point
-the format change occurs, so no further buffers exist from
-before the resolution changed point. We therefore signal the
-last buffer immediately.
-We don't have a V4L2 available to us at this point, so set
-the videobuf2 queue last_buffer_dequeued flag directly.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-staging: bcm2835-codec: Signal the firmware to stop on all changes
-
-The firmware defaults to not stopping video decode if only the
-pixel aspect ratio or colourspace change. V4L2 requires us
-to stop decoding on any change, therefore tell the firmware
-of the desire for this alternate behaviour.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-staging: bcm2835-codec: Queue flushed buffers instead of completing
-
-When a buffer is returned on a port that is disabled, return it
-to the videobuf2 QUEUED state instead of DONE which returns it
-to the client.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-staging: bcm2835_codec: Correct flushing code for refcounting
-
-Completions don't reference count, so setting the completion
-on the first buffer returned and then not reinitialising it
-means that the flush function doesn't behave as intended.
-
-Signal the completion when the last buffer is returned.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-staging: bcm2835-codec: Ensure all ctrls are set on streamon
-
-Currently the code was only setting some controls from
-bcm2835_codec_set_ctrls, but it's simpler to use
-v4l2_ctrl_handler_setup to avoid forgetting to adding new
-controls to the list.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-staging: bcm2835-codec: Add support for H&V Flips to ISP
-
-The ISP can do H & V flips whilst resizing or converting
-the image, so expose that via V4L2_CID_[H|V]FLIP.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-bcm2835-v4l2-codec: Remove advertised support of VP8
-
-The support for this format by firmware is very limited
-and won't be faster than the arm.
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
-
-Pass V4L2_CID_MPEG_VIDEO_H264_MIN_QP/MAX_QP to bcm2835-v4l2-codec
-
-Following raspberrypi/linux#4704. This is necessary to set up
-quantization for variable bitrate to avoid video flickering.
-
-staging/bcm2835-codec: bytesperline for YUV420/YVU420 needs to be 64
-
-Matching https://github.com/raspberrypi/linux/pull/4419, the ISP
-block (which is also used on the input of the encoder, and output
-of the decoder) needs the base address of all planes to be aligned
-to multiples of 32. This includes the chroma planes of YUV420 and
-YVU420.
-If the height is only a multiple of 2 (not 4), then you get an odd
-number of lines in the second plane, which means the 3rd plane
-starts at a multiple of bytesperline/2.
-
-Set the minimum bytesperline alignment to 64 for those formats
-so that the plane alignment is always right.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-staging/bcm2835-codec: Allow a different stride alignment per role
-
-Deinterlace and decode aren't affected in the same way as encode
-and ISP by the alignment requirement on 3 plane YUV420.
-Decode would be affected, but it always aligns the height up to
-a macroblock, and uses the selection API to reflect that.
-
-Add in the facility to set the bytesperline alignment per role.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-staging: vc04_services: codec: Add support for V4L2_PIX_FMT_RGBA32 format
-
-We already support V4L2_PIX_FMT_BGR32 which is the same thing with red
-and blue swapped, so it makes sense to include this variant as well.
-
-Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
-
-bcm2835-codec: Return empty buffers to the VPU instead of queueing to vbuf2
-
-The encoder can skip frames totally should rate control overshoot
-the target bitrate too far. In this situation it generates an
-output buffer of length 0.
-V4L2 treats a buffer of length 0 as an end of stream flag, which is
-not appropriate in this case, therefore we can not return that buffer
-to the client.
-
-The driver was returning the buffer to videobuf2 in the QUEUED state,
-however that buffer was then not dequeued again, so the number of
-buffers was reduced each time this happened. In the pathological
-case of using GStreamer's videotestsrc in mode 1 for noise, this happens
-sufficiently frequently to totally stall the pipeline.
-
-If the port is still enabled then return the buffer straight back to
-the VPU rather than to videobuf2.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-vc04_services: bcm2835-codec: Add support for V4L2_PIX_FMT_NV12_COL128
-
-V4L2_PIX_FMT_NV12_COL128 is supported by the ISP and the input of
-video_encode, output of video_decode, and both input and output
-of the ISP.
-
-Add in the plumbing to support the format on those ports.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-vc04_services: bcm2835-codec: Set crop_height for compressed formats
-
-In particular for the encoder where the CAPTURE format dictates
-the parameters given to the codec we need to be able to set the
-value passed as the crop_height for the compressed format.
-There's no crop available for cropped modes, so always set
-crop_height to the requested height.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-vc04_services: bcm2835-codec: Set port format from s_selection
-
-s_selection allows the crop region of an uncompressed pixel
-format to be specified, but it wasn't passing the setting on to
-the firmware. Depending on call order this would potentially
-mean that the crop wasn't actioned.
-
-Set the port format on s_selection if we have a component created.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-bcm2835-codec: /dev/video31 as interface to image_encode JPEG encoder
-
-Signed-off-by: Maxim Devaev <mdevaev@gmail.com>
-
-bcm2835-v4l2-codec: support H.264 5.0 and 5.1 levels
-
-vc04_services: bcm2835-codec:  Remove redundant role check
-
-vidioc_try_encoder_cmd checks the role, but the ioctl is disabled
-for any roles in which it is invalid.
-
-Remove the redundant check.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-vc04_services: bcm2835-codec: Allow encoder_cmd on ISP and deinterlace
-
-ISP and deinterlace also need a mechanism for passing effectively
-an EOS through the pipeline to signal when all buffers have been
-processed.
-
-VIDIOC_ENCODER_CMD does exactly this for encoders, so reuse the same
-function for ISP and deinterlace.
-(VIDIOC_DECODER_CMD is slightly different in that it also passes
-details of when and how to stop, so is not as relevant).
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/staging/vc04_services/Kconfig         |    1 +
- drivers/staging/vc04_services/Makefile        |    1 +
- .../vc04_services/bcm2835-codec/Kconfig       |   11 +
- .../vc04_services/bcm2835-codec/Makefile      |    8 +
- .../staging/vc04_services/bcm2835-codec/TODO  |    1 +
- .../bcm2835-codec/bcm2835-v4l2-codec.c        | 3834 +++++++++++++++++
- .../vchiq-mmal/mmal-parameters.h              |    8 +
- 7 files changed, 3864 insertions(+)
- create mode 100644 drivers/staging/vc04_services/bcm2835-codec/Kconfig
- create mode 100644 drivers/staging/vc04_services/bcm2835-codec/Makefile
- create mode 100644 drivers/staging/vc04_services/bcm2835-codec/TODO
- create mode 100644 drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-
---- a/drivers/staging/vc04_services/Kconfig
-+++ b/drivers/staging/vc04_services/Kconfig
-@@ -45,6 +45,7 @@ source "drivers/staging/vc04_services/bc
- source "drivers/staging/vc04_services/bcm2835-camera/Kconfig"
- 
- source "drivers/staging/vc04_services/vc-sm-cma/Kconfig"
-+source "drivers/staging/vc04_services/bcm2835-codec/Kconfig"
- 
- source "drivers/staging/vc04_services/vchiq-mmal/Kconfig"
- 
---- a/drivers/staging/vc04_services/Makefile
-+++ b/drivers/staging/vc04_services/Makefile
-@@ -15,6 +15,7 @@ obj-$(CONFIG_SND_BCM2835)		+= bcm2835-au
- obj-$(CONFIG_VIDEO_BCM2835)		+= bcm2835-camera/
- obj-$(CONFIG_BCM2835_VCHIQ_MMAL)	+= vchiq-mmal/
- obj-$(CONFIG_BCM_VC_SM_CMA)		+= vc-sm-cma/
-+obj-$(CONFIG_VIDEO_CODEC_BCM2835)	+= bcm2835-codec/
- 
- ccflags-y += -I $(srctree)/$(src)/include
- 
---- /dev/null
-+++ b/drivers/staging/vc04_services/bcm2835-codec/Kconfig
-@@ -0,0 +1,11 @@
-+config VIDEO_CODEC_BCM2835
-+	tristate "BCM2835 Video codec support"
-+	depends on MEDIA_SUPPORT && MEDIA_CONTROLLER
-+	depends on VIDEO_DEV && (ARCH_BCM2835 || COMPILE_TEST)
-+	select BCM2835_VCHIQ_MMAL
-+	select VIDEOBUF2_DMA_CONTIG
-+	select V4L2_MEM2MEM_DEV
-+	help
-+	  Say Y here to enable the V4L2 video codecs for
-+	  Broadcom BCM2835 SoC. This operates over the VCHIQ interface
-+	  to a service running on VideoCore.
---- /dev/null
-+++ b/drivers/staging/vc04_services/bcm2835-codec/Makefile
-@@ -0,0 +1,8 @@
-+# SPDX-License-Identifier: GPL-2.0
-+bcm2835-codec-objs := bcm2835-v4l2-codec.o
-+
-+obj-$(CONFIG_VIDEO_CODEC_BCM2835) += bcm2835-codec.o
-+
-+ccflags-y += \
-+	-I$(srctree)/drivers/staging/vc04_services \
-+	-D__VCCOREVER__=0x04000000
---- /dev/null
-+++ b/drivers/staging/vc04_services/bcm2835-codec/TODO
-@@ -0,0 +1 @@
-+No issues. Depends on VCHIQ which is in staging.
-\ No newline at end of file
---- /dev/null
-+++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -0,0 +1,3834 @@
-+// SPDX-License-Identifier: GPL-2.0
-+
-+/*
-+ * A v4l2-mem2mem device that wraps the video codec MMAL component.
-+ *
-+ * Copyright 2018 Raspberry Pi (Trading) Ltd.
-+ * Author: Dave Stevenson (dave.stevenson@raspberrypi.com)
-+ *
-+ * Loosely based on the vim2m virtual driver by Pawel Osciak
-+ * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
-+ * Pawel Osciak, <pawel@osciak.com>
-+ * Marek Szyprowski, <m.szyprowski@samsung.com>
-+ *
-+ * Whilst this driver uses the v4l2_mem2mem framework, it does not need the
-+ * scheduling aspects, so will always take the buffers, pass them to the VPU,
-+ * and then signal the job as complete.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by the
-+ * Free Software Foundation; either version 2 of the
-+ * License, or (at your option) any later version
-+ */
-+#include <linux/module.h>
-+#include <linux/delay.h>
-+#include <linux/fs.h>
-+#include <linux/timer.h>
-+#include <linux/sched.h>
-+#include <linux/slab.h>
-+#include <linux/platform_device.h>
-+#include <linux/syscalls.h>
-+
-+#include <media/v4l2-mem2mem.h>
-+#include <media/v4l2-device.h>
-+#include <media/v4l2-ioctl.h>
-+#include <media/v4l2-ctrls.h>
-+#include <media/v4l2-event.h>
-+#include <media/videobuf2-dma-contig.h>
-+
-+#include "vchiq-mmal/mmal-encodings.h"
-+#include "vchiq-mmal/mmal-msg.h"
-+#include "vchiq-mmal/mmal-parameters.h"
-+#include "vchiq-mmal/mmal-vchiq.h"
-+
-+MODULE_IMPORT_NS(DMA_BUF);
-+
-+/*
-+ * Default /dev/videoN node numbers for decode and encode.
-+ * Deliberately avoid the very low numbers as these are often taken by webcams
-+ * etc, and simple apps tend to only go for /dev/video0.
-+ */
-+static int decode_video_nr = 10;
-+module_param(decode_video_nr, int, 0644);
-+MODULE_PARM_DESC(decode_video_nr, "decoder video device number");
-+
-+static int encode_video_nr = 11;
-+module_param(encode_video_nr, int, 0644);
-+MODULE_PARM_DESC(encode_video_nr, "encoder video device number");
-+
-+static int isp_video_nr = 12;
-+module_param(isp_video_nr, int, 0644);
-+MODULE_PARM_DESC(isp_video_nr, "isp video device number");
-+
-+static int deinterlace_video_nr = 18;
-+module_param(deinterlace_video_nr, int, 0644);
-+MODULE_PARM_DESC(deinterlace_video_nr, "deinterlace video device number");
-+
-+static int encode_image_nr = 31;
-+module_param(encode_image_nr, int, 0644);
-+MODULE_PARM_DESC(encode_image_nr, "encoder image device number");
-+
-+/*
-+ * Workaround for GStreamer v4l2convert component not considering Bayer formats
-+ * as raw, and therefore not considering a V4L2 device that supports them as
-+ * a suitable candidate.
-+ */
-+static bool disable_bayer;
-+module_param(disable_bayer, bool, 0644);
-+MODULE_PARM_DESC(disable_bayer, "Disable support for Bayer formats");
-+
-+static unsigned int debug;
-+module_param(debug, uint, 0644);
-+MODULE_PARM_DESC(debug, "activates debug info (0-3)");
-+
-+static bool advanced_deinterlace = true;
-+module_param(advanced_deinterlace, bool, 0644);
-+MODULE_PARM_DESC(advanced_deinterlace, "Use advanced deinterlace");
-+
-+static int field_override;
-+module_param(field_override, int, 0644);
-+MODULE_PARM_DESC(field_override, "force TB(8)/BT(9) field");
-+
-+enum bcm2835_codec_role {
-+	DECODE,
-+	ENCODE,
-+	ISP,
-+	DEINTERLACE,
-+	ENCODE_IMAGE,
-+	NUM_ROLES
-+};
-+
-+static const char * const roles[] = {
-+	"decode",
-+	"encode",
-+	"isp",
-+	"image_fx",
-+	"encode_image",
-+};
-+
-+static const char * const components[] = {
-+	"ril.video_decode",
-+	"ril.video_encode",
-+	"ril.isp",
-+	"ril.image_fx",
-+	"ril.image_encode",
-+};
-+
-+/* Timeout for stop_streaming to allow all buffers to return */
-+#define COMPLETE_TIMEOUT (2 * HZ)
-+
-+#define MIN_W		32
-+#define MIN_H		32
-+#define MAX_W		1920
-+#define MAX_H		1920
-+#define BPL_ALIGN	32
-+/*
-+ * The decoder spec supports the V4L2_EVENT_SOURCE_CHANGE event, but the docs
-+ * seem to want it to always be generated on startup, which prevents the client
-+ * from configuring the CAPTURE queue based on any parsing it has already done
-+ * which may save time and allow allocation of CAPTURE buffers early. Surely
-+ * SOURCE_CHANGE means something has changed, not just "always notify".
-+ *
-+ * For those clients that don't set the CAPTURE resolution, adopt a default
-+ * resolution that is seriously unlikely to be correct, therefore almost
-+ * guaranteed to get the SOURCE_CHANGE event.
-+ */
-+#define DEFAULT_WIDTH	32
-+#define DEFAULT_HEIGHT	32
-+/*
-+ * The unanswered question - what is the maximum size of a compressed frame?
-+ * V4L2 mandates that the encoded frame must fit in a single buffer. Sizing
-+ * that buffer is a compromise between wasting memory and risking not fitting.
-+ * The 1080P version of Big Buck Bunny has some frames that exceed 512kB.
-+ * Adopt a moderately arbitrary split at 720P for switching between 512 and
-+ * 768kB buffers.
-+ */
-+#define DEF_COMP_BUF_SIZE_GREATER_720P	(768 << 10)
-+#define DEF_COMP_BUF_SIZE_720P_OR_LESS	(512 << 10)
-+/* JPEG image can be very large. For paranoid reasons 4MB is used */
-+#define DEF_COMP_BUF_SIZE_JPEG (4096 << 10)
-+
-+/* Flags that indicate a format can be used for capture/output */
-+#define MEM2MEM_CAPTURE		BIT(0)
-+#define MEM2MEM_OUTPUT		BIT(1)
-+
-+#define MEM2MEM_NAME		"bcm2835-codec"
-+
-+struct bcm2835_codec_fmt {
-+	u32	fourcc;
-+	int	depth;
-+	u8	bytesperline_align[NUM_ROLES];
-+	u32	flags;
-+	u32	mmal_fmt;
-+	int	size_multiplier_x2;
-+	bool	is_bayer;
-+};
-+
-+static const struct bcm2835_codec_fmt supported_formats[] = {
-+	{
-+		/* YUV formats */
-+		.fourcc			= V4L2_PIX_FMT_YUV420,
-+		.depth			= 8,
-+		.bytesperline_align	= { 32, 64, 64, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_I420,
-+		.size_multiplier_x2	= 3,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_YVU420,
-+		.depth			= 8,
-+		.bytesperline_align	= { 32, 64, 64, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_YV12,
-+		.size_multiplier_x2	= 3,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_NV12,
-+		.depth			= 8,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_NV12,
-+		.size_multiplier_x2	= 3,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_NV21,
-+		.depth			= 8,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_NV21,
-+		.size_multiplier_x2	= 3,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_RGB565,
-+		.depth			= 16,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_RGB16,
-+		.size_multiplier_x2	= 2,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_YUYV,
-+		.depth			= 16,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_YUYV,
-+		.size_multiplier_x2	= 2,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_UYVY,
-+		.depth			= 16,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_UYVY,
-+		.size_multiplier_x2	= 2,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_YVYU,
-+		.depth			= 16,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_YVYU,
-+		.size_multiplier_x2	= 2,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_VYUY,
-+		.depth			= 16,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_VYUY,
-+		.size_multiplier_x2	= 2,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_NV12_COL128,
-+		.depth			= 8,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_YUVUV128,
-+		.size_multiplier_x2	= 3,
-+	}, {
-+		/* RGB formats */
-+		.fourcc			= V4L2_PIX_FMT_RGB24,
-+		.depth			= 24,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_RGB24,
-+		.size_multiplier_x2	= 2,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_BGR24,
-+		.depth			= 24,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BGR24,
-+		.size_multiplier_x2	= 2,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_BGR32,
-+		.depth			= 32,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BGRA,
-+		.size_multiplier_x2	= 2,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_RGBA32,
-+		.depth			= 32,
-+		.bytesperline_align	= { 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_RGBA,
-+		.size_multiplier_x2	= 2,
-+	}, {
-+		/* Bayer formats */
-+		/* 8 bit */
-+		.fourcc			= V4L2_PIX_FMT_SRGGB8,
-+		.depth			= 8,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BAYER_SRGGB8,
-+		.size_multiplier_x2	= 2,
-+		.is_bayer		= true,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_SBGGR8,
-+		.depth			= 8,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BAYER_SBGGR8,
-+		.size_multiplier_x2	= 2,
-+		.is_bayer		= true,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_SGRBG8,
-+		.depth			= 8,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BAYER_SGRBG8,
-+		.size_multiplier_x2	= 2,
-+		.is_bayer		= true,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_SGBRG8,
-+		.depth			= 8,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BAYER_SGBRG8,
-+		.size_multiplier_x2	= 2,
-+		.is_bayer		= true,
-+	}, {
-+		/* 10 bit */
-+		.fourcc			= V4L2_PIX_FMT_SRGGB10P,
-+		.depth			= 10,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BAYER_SRGGB10P,
-+		.size_multiplier_x2	= 2,
-+		.is_bayer		= true,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_SBGGR10P,
-+		.depth			= 10,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BAYER_SBGGR10P,
-+		.size_multiplier_x2	= 2,
-+		.is_bayer		= true,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_SGRBG10P,
-+		.depth			= 10,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BAYER_SGRBG10P,
-+		.size_multiplier_x2	= 2,
-+		.is_bayer		= true,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_SGBRG10P,
-+		.depth			= 10,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BAYER_SGBRG10P,
-+		.size_multiplier_x2	= 2,
-+		.is_bayer		= true,
-+	}, {
-+		/* 12 bit */
-+		.fourcc			= V4L2_PIX_FMT_SRGGB12P,
-+		.depth			= 12,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BAYER_SRGGB12P,
-+		.size_multiplier_x2	= 2,
-+		.is_bayer		= true,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_SBGGR12P,
-+		.depth			= 12,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BAYER_SBGGR12P,
-+		.size_multiplier_x2	= 2,
-+		.is_bayer		= true,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_SGRBG12P,
-+		.depth			= 12,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BAYER_SGRBG12P,
-+		.size_multiplier_x2	= 2,
-+		.is_bayer		= true,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_SGBRG12P,
-+		.depth			= 12,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BAYER_SGBRG12P,
-+		.size_multiplier_x2	= 2,
-+		.is_bayer		= true,
-+	}, {
-+		/* 14 bit */
-+		.fourcc			= V4L2_PIX_FMT_SRGGB14P,
-+		.depth			= 14,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BAYER_SRGGB14P,
-+		.size_multiplier_x2	= 2,
-+		.is_bayer		= true,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_SBGGR14P,
-+		.depth			= 14,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BAYER_SBGGR14P,
-+		.size_multiplier_x2	= 2,
-+		.is_bayer		= true,
-+
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_SGRBG14P,
-+		.depth			= 14,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BAYER_SGRBG14P,
-+		.size_multiplier_x2	= 2,
-+		.is_bayer		= true,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_SGBRG14P,
-+		.depth			= 14,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BAYER_SGBRG14P,
-+		.size_multiplier_x2	= 2,
-+		.is_bayer		= true,
-+	}, {
-+		/* 16 bit */
-+		.fourcc			= V4L2_PIX_FMT_SRGGB16,
-+		.depth			= 16,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BAYER_SRGGB16,
-+		.size_multiplier_x2	= 2,
-+		.is_bayer		= true,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_SBGGR16,
-+		.depth			= 16,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BAYER_SBGGR16,
-+		.size_multiplier_x2	= 2,
-+		.is_bayer		= true,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_SGRBG16,
-+		.depth			= 16,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BAYER_SGRBG16,
-+		.size_multiplier_x2	= 2,
-+		.is_bayer		= true,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_SGBRG16,
-+		.depth			= 16,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BAYER_SGBRG16,
-+		.size_multiplier_x2	= 2,
-+		.is_bayer		= true,
-+	}, {
-+		/* Bayer formats unpacked to 16bpp */
-+		/* 10 bit */
-+		.fourcc			= V4L2_PIX_FMT_SRGGB10,
-+		.depth			= 16,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BAYER_SRGGB10,
-+		.size_multiplier_x2	= 2,
-+		.is_bayer		= true,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_SBGGR10,
-+		.depth			= 16,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BAYER_SBGGR10,
-+		.size_multiplier_x2	= 2,
-+		.is_bayer		= true,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_SGRBG10,
-+		.depth			= 16,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BAYER_SGRBG10,
-+		.size_multiplier_x2	= 2,
-+		.is_bayer		= true,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_SGBRG10,
-+		.depth			= 16,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BAYER_SGBRG10,
-+		.size_multiplier_x2	= 2,
-+		.is_bayer		= true,
-+	}, {
-+		/* 12 bit */
-+		.fourcc			= V4L2_PIX_FMT_SRGGB12,
-+		.depth			= 16,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BAYER_SRGGB12,
-+		.size_multiplier_x2	= 2,
-+		.is_bayer		= true,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_SBGGR12,
-+		.depth			= 16,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BAYER_SBGGR12,
-+		.size_multiplier_x2	= 2,
-+		.is_bayer		= true,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_SGRBG12,
-+		.depth			= 16,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BAYER_SGRBG12,
-+		.size_multiplier_x2	= 2,
-+		.is_bayer		= true,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_SGBRG12,
-+		.depth			= 16,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BAYER_SGBRG12,
-+		.size_multiplier_x2	= 2,
-+		.is_bayer		= true,
-+	}, {
-+		/* 14 bit */
-+		.fourcc			= V4L2_PIX_FMT_SRGGB14,
-+		.depth			= 16,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BAYER_SRGGB14,
-+		.size_multiplier_x2	= 2,
-+		.is_bayer		= true,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_SBGGR14,
-+		.depth			= 16,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BAYER_SBGGR14,
-+		.size_multiplier_x2	= 2,
-+		.is_bayer		= true,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_SGRBG14,
-+		.depth			= 16,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BAYER_SGRBG14,
-+		.size_multiplier_x2	= 2,
-+		.is_bayer		= true,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_SGBRG14,
-+		.depth			= 16,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_BAYER_SGBRG14,
-+		.size_multiplier_x2	= 2,
-+		.is_bayer		= true,
-+	}, {
-+		/* Monochrome MIPI formats */
-+		/* 8 bit */
-+		.fourcc			= V4L2_PIX_FMT_GREY,
-+		.depth			= 8,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_GREY,
-+		.size_multiplier_x2	= 2,
-+	}, {
-+		/* 10 bit */
-+		.fourcc			= V4L2_PIX_FMT_Y10P,
-+		.depth			= 10,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_Y10P,
-+		.size_multiplier_x2	= 2,
-+	}, {
-+		/* 12 bit */
-+		.fourcc			= V4L2_PIX_FMT_Y12P,
-+		.depth			= 12,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_Y12P,
-+		.size_multiplier_x2	= 2,
-+	}, {
-+		/* 14 bit */
-+		.fourcc			= V4L2_PIX_FMT_Y14P,
-+		.depth			= 14,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_Y14P,
-+		.size_multiplier_x2	= 2,
-+	}, {
-+		/* 16 bit */
-+		.fourcc			= V4L2_PIX_FMT_Y16,
-+		.depth			= 16,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_Y16,
-+		.size_multiplier_x2	= 2,
-+	}, {
-+		/* 10 bit as 16bpp */
-+		.fourcc			= V4L2_PIX_FMT_Y10,
-+		.depth			= 16,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_Y10,
-+		.size_multiplier_x2	= 2,
-+	}, {
-+		/* 12 bit as 16bpp */
-+		.fourcc			= V4L2_PIX_FMT_Y12,
-+		.depth			= 16,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_Y12,
-+		.size_multiplier_x2	= 2,
-+	}, {
-+		/* 14 bit as 16bpp */
-+		.fourcc			= V4L2_PIX_FMT_Y14,
-+		.depth			= 16,
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.flags			= 0,
-+		.mmal_fmt		= MMAL_ENCODING_Y14,
-+		.size_multiplier_x2	= 2,
-+	}, {
-+		/* Compressed formats */
-+		.fourcc			= V4L2_PIX_FMT_H264,
-+		.depth			= 0,
-+		.flags			= V4L2_FMT_FLAG_COMPRESSED,
-+		.mmal_fmt		= MMAL_ENCODING_H264,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_JPEG,
-+		.depth			= 0,
-+		.flags			= V4L2_FMT_FLAG_COMPRESSED,
-+		.mmal_fmt		= MMAL_ENCODING_JPEG,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_MJPEG,
-+		.depth			= 0,
-+		.flags			= V4L2_FMT_FLAG_COMPRESSED,
-+		.mmal_fmt		= MMAL_ENCODING_MJPEG,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_MPEG4,
-+		.depth			= 0,
-+		.flags			= V4L2_FMT_FLAG_COMPRESSED,
-+		.mmal_fmt		= MMAL_ENCODING_MP4V,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_H263,
-+		.depth			= 0,
-+		.flags			= V4L2_FMT_FLAG_COMPRESSED,
-+		.mmal_fmt		= MMAL_ENCODING_H263,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_MPEG2,
-+		.depth			= 0,
-+		.flags			= V4L2_FMT_FLAG_COMPRESSED,
-+		.mmal_fmt		= MMAL_ENCODING_MP2V,
-+	}, {
-+		.fourcc			= V4L2_PIX_FMT_VC1_ANNEX_G,
-+		.depth			= 0,
-+		.flags			= V4L2_FMT_FLAG_COMPRESSED,
-+		.mmal_fmt		= MMAL_ENCODING_WVC1,
-+	}
-+};
-+
-+struct bcm2835_codec_fmt_list {
-+	struct bcm2835_codec_fmt *list;
-+	unsigned int num_entries;
-+};
-+
-+struct m2m_mmal_buffer {
-+	struct v4l2_m2m_buffer	m2m;
-+	struct mmal_buffer	mmal;
-+};
-+
-+/* Per-queue, driver-specific private data */
-+struct bcm2835_codec_q_data {
-+	/*
-+	 * These parameters should be treated as gospel, with everything else
-+	 * being determined from them.
-+	 */
-+	/* Buffer width/height */
-+	unsigned int		bytesperline;
-+	unsigned int		height;
-+	/* Crop size used for selection handling */
-+	unsigned int		crop_width;
-+	unsigned int		crop_height;
-+	bool			selection_set;
-+	struct v4l2_fract	aspect_ratio;
-+	enum v4l2_field		field;
-+
-+	unsigned int		sizeimage;
-+	unsigned int		sequence;
-+	struct bcm2835_codec_fmt	*fmt;
-+
-+	/* One extra buffer header so we can send an EOS. */
-+	struct m2m_mmal_buffer	eos_buffer;
-+	bool			eos_buffer_in_use;	/* debug only */
-+};
-+
-+struct bcm2835_codec_dev {
-+	struct platform_device *pdev;
-+
-+	/* v4l2 devices */
-+	struct v4l2_device	v4l2_dev;
-+	struct video_device	vfd;
-+	/* mutex for the v4l2 device */
-+	struct mutex		dev_mutex;
-+	atomic_t		num_inst;
-+
-+	/* allocated mmal instance and components */
-+	enum bcm2835_codec_role	role;
-+	/* The list of formats supported on input and output queues. */
-+	struct bcm2835_codec_fmt_list	supported_fmts[2];
-+
-+	struct vchiq_mmal_instance	*instance;
-+
-+	struct v4l2_m2m_dev	*m2m_dev;
-+};
-+
-+struct bcm2835_codec_ctx {
-+	struct v4l2_fh		fh;
-+	struct bcm2835_codec_dev	*dev;
-+
-+	struct v4l2_ctrl_handler hdl;
-+
-+	struct vchiq_mmal_component  *component;
-+	bool component_enabled;
-+
-+	enum v4l2_colorspace	colorspace;
-+	enum v4l2_ycbcr_encoding ycbcr_enc;
-+	enum v4l2_xfer_func	xfer_func;
-+	enum v4l2_quantization	quant;
-+
-+	int hflip;
-+	int vflip;
-+
-+	/* Source and destination queue data */
-+	struct bcm2835_codec_q_data   q_data[2];
-+	s32  bitrate;
-+	unsigned int	framerate_num;
-+	unsigned int	framerate_denom;
-+
-+	bool aborting;
-+	int num_ip_buffers;
-+	int num_op_buffers;
-+	struct completion frame_cmplt;
-+};
-+
-+struct bcm2835_codec_driver {
-+	struct platform_device *pdev;
-+	struct media_device	mdev;
-+
-+	struct bcm2835_codec_dev *encode;
-+	struct bcm2835_codec_dev *decode;
-+	struct bcm2835_codec_dev *isp;
-+	struct bcm2835_codec_dev *deinterlace;
-+	struct bcm2835_codec_dev *encode_image;
-+};
-+
-+enum {
-+	V4L2_M2M_SRC = 0,
-+	V4L2_M2M_DST = 1,
-+};
-+
-+static const struct bcm2835_codec_fmt *get_fmt(u32 mmal_fmt)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(supported_formats); i++) {
-+		if (supported_formats[i].mmal_fmt == mmal_fmt &&
-+		    (!disable_bayer || !supported_formats[i].is_bayer))
-+			return &supported_formats[i];
-+	}
-+	return NULL;
-+}
-+
-+static inline
-+struct bcm2835_codec_fmt_list *get_format_list(struct bcm2835_codec_dev *dev,
-+					       bool capture)
-+{
-+	return &dev->supported_fmts[capture ? 1 : 0];
-+}
-+
-+static
-+struct bcm2835_codec_fmt *get_default_format(struct bcm2835_codec_dev *dev,
-+					     bool capture)
-+{
-+	return &dev->supported_fmts[capture ? 1 : 0].list[0];
-+}
-+
-+static
-+struct bcm2835_codec_fmt *find_format_pix_fmt(u32 pix_fmt,
-+					      struct bcm2835_codec_dev *dev,
-+					      bool capture)
-+{
-+	struct bcm2835_codec_fmt *fmt;
-+	unsigned int k;
-+	struct bcm2835_codec_fmt_list *fmts =
-+					&dev->supported_fmts[capture ? 1 : 0];
-+
-+	for (k = 0; k < fmts->num_entries; k++) {
-+		fmt = &fmts->list[k];
-+		if (fmt->fourcc == pix_fmt)
-+			break;
-+	}
-+	if (k == fmts->num_entries)
-+		return NULL;
-+
-+	return &fmts->list[k];
-+}
-+
-+static inline
-+struct bcm2835_codec_fmt *find_format(struct v4l2_format *f,
-+				      struct bcm2835_codec_dev *dev,
-+				      bool capture)
-+{
-+	return find_format_pix_fmt(f->fmt.pix_mp.pixelformat, dev, capture);
-+}
-+
-+static inline struct bcm2835_codec_ctx *file2ctx(struct file *file)
-+{
-+	return container_of(file->private_data, struct bcm2835_codec_ctx, fh);
-+}
-+
-+static struct bcm2835_codec_q_data *get_q_data(struct bcm2835_codec_ctx *ctx,
-+					       enum v4l2_buf_type type)
-+{
-+	switch (type) {
-+	case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
-+		return &ctx->q_data[V4L2_M2M_SRC];
-+	case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
-+		return &ctx->q_data[V4L2_M2M_DST];
-+	default:
-+		v4l2_err(&ctx->dev->v4l2_dev, "%s: Invalid queue type %u\n",
-+			 __func__, type);
-+		break;
-+	}
-+	return NULL;
-+}
-+
-+static struct vchiq_mmal_port *get_port_data(struct bcm2835_codec_ctx *ctx,
-+					     enum v4l2_buf_type type)
-+{
-+	if (!ctx->component)
-+		return NULL;
-+
-+	switch (type) {
-+	case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
-+		return &ctx->component->input[0];
-+	case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
-+		return &ctx->component->output[0];
-+	default:
-+		v4l2_err(&ctx->dev->v4l2_dev, "%s: Invalid queue type %u\n",
-+			 __func__, type);
-+		break;
-+	}
-+	return NULL;
-+}
-+
-+/*
-+ * mem2mem callbacks
-+ */
-+
-+/*
-+ * job_ready() - check whether an instance is ready to be scheduled to run
-+ */
-+static int job_ready(void *priv)
-+{
-+	struct bcm2835_codec_ctx *ctx = priv;
-+
-+	if (!v4l2_m2m_num_src_bufs_ready(ctx->fh.m2m_ctx) &&
-+	    !v4l2_m2m_num_dst_bufs_ready(ctx->fh.m2m_ctx))
-+		return 0;
-+
-+	return 1;
-+}
-+
-+static void job_abort(void *priv)
-+{
-+	struct bcm2835_codec_ctx *ctx = priv;
-+
-+	v4l2_dbg(1, debug, &ctx->dev->v4l2_dev, "%s\n", __func__);
-+	/* Will cancel the transaction in the next interrupt handler */
-+	ctx->aborting = 1;
-+}
-+
-+static inline unsigned int get_sizeimage(int bpl, int width, int height,
-+					 struct bcm2835_codec_fmt *fmt)
-+{
-+	if (fmt->flags & V4L2_FMT_FLAG_COMPRESSED) {
-+		if (fmt->fourcc == V4L2_PIX_FMT_JPEG)
-+			return DEF_COMP_BUF_SIZE_JPEG;
-+
-+		if (width * height > 1280 * 720)
-+			return DEF_COMP_BUF_SIZE_GREATER_720P;
-+		else
-+			return DEF_COMP_BUF_SIZE_720P_OR_LESS;
-+	}
-+
-+	if (fmt->fourcc != V4L2_PIX_FMT_NV12_COL128)
-+		return (bpl * height * fmt->size_multiplier_x2) >> 1;
-+
-+	/*
-+	 * V4L2_PIX_FMT_NV12_COL128 is 128 pixel wide columns.
-+	 * bytesperline is the column stride in lines, so multiply by
-+	 * the number of columns and 128.
-+	 */
-+	return (ALIGN(width, 128) * bpl);
-+}
-+
-+static inline unsigned int get_bytesperline(int width, int height,
-+					    struct bcm2835_codec_fmt *fmt,
-+					    enum bcm2835_codec_role role)
-+{
-+	if (fmt->fourcc != V4L2_PIX_FMT_NV12_COL128)
-+		return ALIGN((width * fmt->depth) >> 3,
-+			     fmt->bytesperline_align[role]);
-+
-+	/*
-+	 * V4L2_PIX_FMT_NV12_COL128 passes the column stride in lines via
-+	 * bytesperline.
-+	 * The minimum value for this is sufficient for the base luma and chroma
-+	 * with no padding.
-+	 */
-+	return (height * 3) >> 1;
-+}
-+
-+static void setup_mmal_port_format(struct bcm2835_codec_ctx *ctx,
-+				   struct bcm2835_codec_q_data *q_data,
-+				   struct vchiq_mmal_port *port)
-+{
-+	port->format.encoding = q_data->fmt->mmal_fmt;
-+	port->format.flags = 0;
-+
-+	if (!(q_data->fmt->flags & V4L2_FMT_FLAG_COMPRESSED)) {
-+		if (q_data->fmt->mmal_fmt != MMAL_ENCODING_YUVUV128) {
-+			/* Raw image format - set width/height */
-+			port->es.video.width = (q_data->bytesperline << 3) /
-+							q_data->fmt->depth;
-+			port->es.video.height = q_data->height;
-+			port->es.video.crop.width = q_data->crop_width;
-+			port->es.video.crop.height = q_data->crop_height;
-+		} else {
-+			/* NV12_COL128 / YUVUV128 column format */
-+			/* Column stride in lines */
-+			port->es.video.width = q_data->bytesperline;
-+			port->es.video.height = q_data->height;
-+			port->es.video.crop.width = q_data->crop_width;
-+			port->es.video.crop.height = q_data->crop_height;
-+			port->format.flags = MMAL_ES_FORMAT_FLAG_COL_FMTS_WIDTH_IS_COL_STRIDE;
-+		}
-+		port->es.video.frame_rate.numerator = ctx->framerate_num;
-+		port->es.video.frame_rate.denominator = ctx->framerate_denom;
-+	} else {
-+		/* Compressed format - leave resolution as 0 for decode */
-+		if (ctx->dev->role == DECODE) {
-+			port->es.video.width = 0;
-+			port->es.video.height = 0;
-+			port->es.video.crop.width = 0;
-+			port->es.video.crop.height = 0;
-+		} else {
-+			port->es.video.width = q_data->crop_width;
-+			port->es.video.height = q_data->height;
-+			port->es.video.crop.width = q_data->crop_width;
-+			port->es.video.crop.height = q_data->crop_height;
-+			port->format.bitrate = ctx->bitrate;
-+			port->es.video.frame_rate.numerator = ctx->framerate_num;
-+			port->es.video.frame_rate.denominator = ctx->framerate_denom;
-+		}
-+	}
-+	port->es.video.crop.x = 0;
-+	port->es.video.crop.y = 0;
-+
-+	port->current_buffer.size = q_data->sizeimage;
-+};
-+
-+static void ip_buffer_cb(struct vchiq_mmal_instance *instance,
-+			 struct vchiq_mmal_port *port, int status,
-+			 struct mmal_buffer *mmal_buf)
-+{
-+	struct bcm2835_codec_ctx *ctx = port->cb_ctx/*, *curr_ctx*/;
-+	struct m2m_mmal_buffer *buf =
-+			container_of(mmal_buf, struct m2m_mmal_buffer, mmal);
-+
-+	v4l2_dbg(2, debug, &ctx->dev->v4l2_dev, "%s: port %p buf %p length %lu, flags %x\n",
-+		 __func__, port, mmal_buf, mmal_buf->length,
-+		 mmal_buf->mmal_flags);
-+
-+	if (buf == &ctx->q_data[V4L2_M2M_SRC].eos_buffer) {
-+		/* Do we need to add lcoking to prevent multiple submission of
-+		 * the EOS, and therefore handle mutliple return here?
-+		 */
-+		v4l2_dbg(1, debug, &ctx->dev->v4l2_dev, "%s: eos buffer returned.\n",
-+			 __func__);
-+		ctx->q_data[V4L2_M2M_SRC].eos_buffer_in_use = false;
-+		return;
-+	}
-+
-+	if (status) {
-+		/* error in transfer */
-+		if (buf)
-+			/* there was a buffer with the error so return it */
-+			vb2_buffer_done(&buf->m2m.vb.vb2_buf,
-+					VB2_BUF_STATE_ERROR);
-+		return;
-+	}
-+	if (mmal_buf->cmd) {
-+		v4l2_err(&ctx->dev->v4l2_dev, "%s: Not expecting cmd msgs on ip callback - %08x\n",
-+			 __func__, mmal_buf->cmd);
-+		/*
-+		 * CHECKME: Should we return here. The buffer shouldn't have a
-+		 * message context or vb2 buf associated.
-+		 */
-+	}
-+
-+	v4l2_dbg(3, debug, &ctx->dev->v4l2_dev, "%s: no error. Return buffer %p\n",
-+		 __func__, &buf->m2m.vb.vb2_buf);
-+	vb2_buffer_done(&buf->m2m.vb.vb2_buf,
-+			port->enabled ? VB2_BUF_STATE_DONE :
-+					VB2_BUF_STATE_QUEUED);
-+
-+	ctx->num_ip_buffers++;
-+	v4l2_dbg(2, debug, &ctx->dev->v4l2_dev, "%s: done %d input buffers\n",
-+		 __func__, ctx->num_ip_buffers);
-+
-+	if (!port->enabled && atomic_read(&port->buffers_with_vpu))
-+		complete(&ctx->frame_cmplt);
-+}
-+
-+static void queue_res_chg_event(struct bcm2835_codec_ctx *ctx)
-+{
-+	static const struct v4l2_event ev_src_ch = {
-+		.type = V4L2_EVENT_SOURCE_CHANGE,
-+		.u.src_change.changes =
-+		V4L2_EVENT_SRC_CH_RESOLUTION,
-+	};
-+
-+	v4l2_event_queue_fh(&ctx->fh, &ev_src_ch);
-+}
-+
-+static void send_eos_event(struct bcm2835_codec_ctx *ctx)
-+{
-+	static const struct v4l2_event ev = {
-+		.type = V4L2_EVENT_EOS,
-+	};
-+
-+	v4l2_dbg(1, debug, &ctx->dev->v4l2_dev, "Sending EOS event\n");
-+
-+	v4l2_event_queue_fh(&ctx->fh, &ev);
-+}
-+
-+static void color_mmal2v4l(struct bcm2835_codec_ctx *ctx, u32 encoding,
-+			   u32 color_space)
-+{
-+	int is_rgb;
-+
-+	switch (encoding) {
-+	case MMAL_ENCODING_I420:
-+	case MMAL_ENCODING_YV12:
-+	case MMAL_ENCODING_NV12:
-+	case MMAL_ENCODING_NV21:
-+	case V4L2_PIX_FMT_YUYV:
-+	case V4L2_PIX_FMT_YVYU:
-+	case V4L2_PIX_FMT_UYVY:
-+	case V4L2_PIX_FMT_VYUY:
-+		/* YUV based colourspaces */
-+		switch (color_space) {
-+		case MMAL_COLOR_SPACE_ITUR_BT601:
-+			ctx->colorspace = V4L2_COLORSPACE_SMPTE170M;
-+			break;
-+
-+		case MMAL_COLOR_SPACE_ITUR_BT709:
-+			ctx->colorspace = V4L2_COLORSPACE_REC709;
-+			break;
-+		default:
-+			break;
-+		}
-+		break;
-+	default:
-+		/* RGB based colourspaces */
-+		ctx->colorspace = V4L2_COLORSPACE_SRGB;
-+		break;
-+	}
-+	ctx->xfer_func = V4L2_MAP_XFER_FUNC_DEFAULT(ctx->colorspace);
-+	ctx->ycbcr_enc = V4L2_MAP_YCBCR_ENC_DEFAULT(ctx->colorspace);
-+	is_rgb = ctx->colorspace == V4L2_COLORSPACE_SRGB;
-+	ctx->quant = V4L2_MAP_QUANTIZATION_DEFAULT(is_rgb, ctx->colorspace,
-+						   ctx->ycbcr_enc);
-+}
-+
-+static void handle_fmt_changed(struct bcm2835_codec_ctx *ctx,
-+			       struct mmal_buffer *mmal_buf)
-+{
-+	struct bcm2835_codec_q_data *q_data;
-+	struct mmal_msg_event_format_changed *format =
-+		(struct mmal_msg_event_format_changed *)mmal_buf->buffer;
-+	struct mmal_parameter_video_interlace_type interlace;
-+	int interlace_size = sizeof(interlace);
-+	struct vb2_queue *vq;
-+	int ret;
-+
-+	v4l2_dbg(1, debug, &ctx->dev->v4l2_dev, "%s: Format changed: buff size min %u, rec %u, buff num min %u, rec %u\n",
-+		 __func__,
-+		 format->buffer_size_min,
-+		 format->buffer_size_recommended,
-+		 format->buffer_num_min,
-+		 format->buffer_num_recommended
-+		);
-+	if (format->format.type != MMAL_ES_TYPE_VIDEO) {
-+		v4l2_dbg(1, debug, &ctx->dev->v4l2_dev, "%s: Format changed but not video %u\n",
-+			 __func__, format->format.type);
-+		return;
-+	}
-+	v4l2_dbg(1, debug, &ctx->dev->v4l2_dev, "%s: Format changed to %ux%u, crop %ux%u, colourspace %08X\n",
-+		 __func__, format->es.video.width, format->es.video.height,
-+		 format->es.video.crop.width, format->es.video.crop.height,
-+		 format->es.video.color_space);
-+
-+	q_data = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE);
-+	v4l2_dbg(1, debug, &ctx->dev->v4l2_dev, "%s: Format was %ux%u, crop %ux%u\n",
-+		 __func__, q_data->bytesperline, q_data->height,
-+		 q_data->crop_width, q_data->crop_height);
-+
-+	q_data->crop_width = format->es.video.crop.width;
-+	q_data->crop_height = format->es.video.crop.height;
-+	/*
-+	 * Stop S_FMT updating crop_height should it be unaligned.
-+	 * Client can still update the crop region via S_SELECTION should it
-+	 * really want to, but the decoder is likely to complain that the
-+	 * format then doesn't match.
-+	 */
-+	q_data->selection_set = true;
-+	q_data->bytesperline = get_bytesperline(format->es.video.width,
-+						format->es.video.height,
-+						q_data->fmt, ctx->dev->role);
-+
-+	q_data->height = format->es.video.height;
-+	q_data->sizeimage = format->buffer_size_min;
-+	if (format->es.video.color_space)
-+		color_mmal2v4l(ctx, format->format.encoding,
-+			       format->es.video.color_space);
-+
-+	q_data->aspect_ratio.numerator = format->es.video.par.numerator;
-+	q_data->aspect_ratio.denominator = format->es.video.par.denominator;
-+
-+	ret = vchiq_mmal_port_parameter_get(ctx->dev->instance,
-+					    &ctx->component->output[0],
-+					    MMAL_PARAMETER_VIDEO_INTERLACE_TYPE,
-+					    &interlace,
-+					    &interlace_size);
-+	if (!ret) {
-+		switch (interlace.mode) {
-+		case MMAL_INTERLACE_PROGRESSIVE:
-+		default:
-+			q_data->field = V4L2_FIELD_NONE;
-+			break;
-+		case MMAL_INTERLACE_FIELDS_INTERLEAVED_UPPER_FIRST:
-+			q_data->field = V4L2_FIELD_INTERLACED_TB;
-+			break;
-+		case MMAL_INTERLACE_FIELDS_INTERLEAVED_LOWER_FIRST:
-+			q_data->field = V4L2_FIELD_INTERLACED_BT;
-+			break;
-+		}
-+		v4l2_dbg(1, debug, &ctx->dev->v4l2_dev, "%s: interlace mode %u, v4l2 field %u\n",
-+			 __func__, interlace.mode, q_data->field);
-+	} else {
-+		q_data->field = V4L2_FIELD_NONE;
-+	}
-+
-+	vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE);
-+	if (vq->streaming)
-+		vq->last_buffer_dequeued = true;
-+
-+	queue_res_chg_event(ctx);
-+}
-+
-+static void op_buffer_cb(struct vchiq_mmal_instance *instance,
-+			 struct vchiq_mmal_port *port, int status,
-+			 struct mmal_buffer *mmal_buf)
-+{
-+	struct bcm2835_codec_ctx *ctx = port->cb_ctx;
-+	enum vb2_buffer_state buf_state = VB2_BUF_STATE_DONE;
-+	struct m2m_mmal_buffer *buf;
-+	struct vb2_v4l2_buffer *vb2;
-+
-+	v4l2_dbg(2, debug, &ctx->dev->v4l2_dev,
-+		 "%s: status:%d, buf:%p, length:%lu, flags %04x, pts %lld\n",
-+		 __func__, status, mmal_buf, mmal_buf->length,
-+		 mmal_buf->mmal_flags, mmal_buf->pts);
-+
-+	buf = container_of(mmal_buf, struct m2m_mmal_buffer, mmal);
-+	vb2 = &buf->m2m.vb;
-+
-+	if (status) {
-+		/* error in transfer */
-+		if (vb2) {
-+			/* there was a buffer with the error so return it */
-+			vb2_buffer_done(&vb2->vb2_buf, VB2_BUF_STATE_ERROR);
-+		}
-+		return;
-+	}
-+
-+	if (mmal_buf->cmd) {
-+		switch (mmal_buf->cmd) {
-+		case MMAL_EVENT_FORMAT_CHANGED:
-+		{
-+			handle_fmt_changed(ctx, mmal_buf);
-+			break;
-+		}
-+		default:
-+			v4l2_err(&ctx->dev->v4l2_dev, "%s: Unexpected event on output callback - %08x\n",
-+				 __func__, mmal_buf->cmd);
-+			break;
-+		}
-+		return;
-+	}
-+
-+	v4l2_dbg(3, debug, &ctx->dev->v4l2_dev, "%s: length %lu, flags %x, idx %u\n",
-+		 __func__, mmal_buf->length, mmal_buf->mmal_flags,
-+		 vb2->vb2_buf.index);
-+
-+	if (mmal_buf->length == 0) {
-+		/* stream ended, or buffer being returned during disable. */
-+		v4l2_dbg(2, debug, &ctx->dev->v4l2_dev, "%s: Empty buffer - flags %04x",
-+			 __func__, mmal_buf->mmal_flags);
-+		if (!(mmal_buf->mmal_flags & MMAL_BUFFER_HEADER_FLAG_EOS)) {
-+			if (!port->enabled) {
-+				vb2_buffer_done(&vb2->vb2_buf, VB2_BUF_STATE_QUEUED);
-+				if (atomic_read(&port->buffers_with_vpu))
-+					complete(&ctx->frame_cmplt);
-+			} else {
-+				vchiq_mmal_submit_buffer(ctx->dev->instance,
-+							 &ctx->component->output[0],
-+							 mmal_buf);
-+			}
-+			return;
-+		}
-+	}
-+	if (mmal_buf->mmal_flags & MMAL_BUFFER_HEADER_FLAG_EOS) {
-+		/* EOS packet from the VPU */
-+		send_eos_event(ctx);
-+		vb2->flags |= V4L2_BUF_FLAG_LAST;
-+	}
-+
-+	if (mmal_buf->mmal_flags & MMAL_BUFFER_HEADER_FLAG_CORRUPTED)
-+		buf_state = VB2_BUF_STATE_ERROR;
-+
-+	/* vb2 timestamps in nsecs, mmal in usecs */
-+	vb2->vb2_buf.timestamp = mmal_buf->pts * 1000;
-+
-+	vb2_set_plane_payload(&vb2->vb2_buf, 0, mmal_buf->length);
-+	switch (mmal_buf->mmal_flags &
-+				(MMAL_BUFFER_HEADER_VIDEO_FLAG_INTERLACED |
-+				 MMAL_BUFFER_HEADER_VIDEO_FLAG_TOP_FIELD_FIRST)) {
-+	case 0:
-+	case MMAL_BUFFER_HEADER_VIDEO_FLAG_TOP_FIELD_FIRST: /* Bogus */
-+		vb2->field = V4L2_FIELD_NONE;
-+		break;
-+	case MMAL_BUFFER_HEADER_VIDEO_FLAG_INTERLACED:
-+		vb2->field = V4L2_FIELD_INTERLACED_BT;
-+		break;
-+	case (MMAL_BUFFER_HEADER_VIDEO_FLAG_INTERLACED |
-+	      MMAL_BUFFER_HEADER_VIDEO_FLAG_TOP_FIELD_FIRST):
-+		vb2->field = V4L2_FIELD_INTERLACED_TB;
-+		break;
-+	}
-+
-+	if (mmal_buf->mmal_flags & MMAL_BUFFER_HEADER_FLAG_KEYFRAME)
-+		vb2->flags |= V4L2_BUF_FLAG_KEYFRAME;
-+
-+	vb2_buffer_done(&vb2->vb2_buf, buf_state);
-+	ctx->num_op_buffers++;
-+
-+	v4l2_dbg(2, debug, &ctx->dev->v4l2_dev, "%s: done %d output buffers\n",
-+		 __func__, ctx->num_op_buffers);
-+
-+	if (!port->enabled && atomic_read(&port->buffers_with_vpu))
-+		complete(&ctx->frame_cmplt);
-+}
-+
-+/* vb2_to_mmal_buffer() - converts vb2 buffer header to MMAL
-+ *
-+ * Copies all the required fields from a VB2 buffer to the MMAL buffer header,
-+ * ready for sending to the VPU.
-+ */
-+static void vb2_to_mmal_buffer(struct m2m_mmal_buffer *buf,
-+			       struct vb2_v4l2_buffer *vb2)
-+{
-+	u64 pts;
-+
-+	buf->mmal.mmal_flags = 0;
-+	if (vb2->flags & V4L2_BUF_FLAG_KEYFRAME)
-+		buf->mmal.mmal_flags |= MMAL_BUFFER_HEADER_FLAG_KEYFRAME;
-+
-+	/*
-+	 * Adding this means that the data must be framed correctly as one frame
-+	 * per buffer. The underlying decoder has no such requirement, but it
-+	 * will reduce latency as the bistream parser will be kicked immediately
-+	 * to parse the frame, rather than relying on its own heuristics for
-+	 * when to wake up.
-+	 */
-+	buf->mmal.mmal_flags |= MMAL_BUFFER_HEADER_FLAG_FRAME_END;
-+
-+	buf->mmal.length = vb2->vb2_buf.planes[0].bytesused;
-+	/*
-+	 * Minor ambiguity in the V4L2 spec as to whether passing in a 0 length
-+	 * buffer, or one with V4L2_BUF_FLAG_LAST set denotes end of stream.
-+	 * Handle either.
-+	 */
-+	if (!buf->mmal.length || vb2->flags & V4L2_BUF_FLAG_LAST)
-+		buf->mmal.mmal_flags |= MMAL_BUFFER_HEADER_FLAG_EOS;
-+
-+	/* vb2 timestamps in nsecs, mmal in usecs */
-+	pts = vb2->vb2_buf.timestamp;
-+	do_div(pts, 1000);
-+	buf->mmal.pts = pts;
-+	buf->mmal.dts = MMAL_TIME_UNKNOWN;
-+
-+	switch (field_override ? field_override : vb2->field) {
-+	default:
-+	case V4L2_FIELD_NONE:
-+		break;
-+	case V4L2_FIELD_INTERLACED_BT:
-+		buf->mmal.mmal_flags |= MMAL_BUFFER_HEADER_VIDEO_FLAG_INTERLACED;
-+		break;
-+	case V4L2_FIELD_INTERLACED_TB:
-+		buf->mmal.mmal_flags |= MMAL_BUFFER_HEADER_VIDEO_FLAG_INTERLACED |
-+					MMAL_BUFFER_HEADER_VIDEO_FLAG_TOP_FIELD_FIRST;
-+		break;
-+	}
-+}
-+
-+/* device_run() - prepares and starts the device
-+ *
-+ * This simulates all the immediate preparations required before starting
-+ * a device. This will be called by the framework when it decides to schedule
-+ * a particular instance.
-+ */
-+static void device_run(void *priv)
-+{
-+	struct bcm2835_codec_ctx *ctx = priv;
-+	struct bcm2835_codec_dev *dev = ctx->dev;
-+	struct vb2_v4l2_buffer *src_buf, *dst_buf;
-+	struct m2m_mmal_buffer *src_m2m_buf = NULL, *dst_m2m_buf = NULL;
-+	struct v4l2_m2m_buffer *m2m;
-+	int ret;
-+
-+	v4l2_dbg(3, debug, &ctx->dev->v4l2_dev, "%s: off we go\n", __func__);
-+
-+	if (ctx->fh.m2m_ctx->out_q_ctx.q.streaming) {
-+		src_buf = v4l2_m2m_buf_remove(&ctx->fh.m2m_ctx->out_q_ctx);
-+		if (src_buf) {
-+			m2m = container_of(src_buf, struct v4l2_m2m_buffer, vb);
-+			src_m2m_buf = container_of(m2m, struct m2m_mmal_buffer,
-+						   m2m);
-+			vb2_to_mmal_buffer(src_m2m_buf, src_buf);
-+
-+			ret = vchiq_mmal_submit_buffer(dev->instance,
-+						       &ctx->component->input[0],
-+						       &src_m2m_buf->mmal);
-+			v4l2_dbg(3, debug, &ctx->dev->v4l2_dev,
-+				 "%s: Submitted ip buffer len %lu, pts %llu, flags %04x\n",
-+				 __func__, src_m2m_buf->mmal.length,
-+				 src_m2m_buf->mmal.pts,
-+				 src_m2m_buf->mmal.mmal_flags);
-+			if (ret)
-+				v4l2_err(&ctx->dev->v4l2_dev,
-+					 "%s: Failed submitting ip buffer\n",
-+					 __func__);
-+		}
-+	}
-+
-+	if (ctx->fh.m2m_ctx->cap_q_ctx.q.streaming) {
-+		dst_buf = v4l2_m2m_buf_remove(&ctx->fh.m2m_ctx->cap_q_ctx);
-+		if (dst_buf) {
-+			m2m = container_of(dst_buf, struct v4l2_m2m_buffer, vb);
-+			dst_m2m_buf = container_of(m2m, struct m2m_mmal_buffer,
-+						   m2m);
-+			vb2_to_mmal_buffer(dst_m2m_buf, dst_buf);
-+
-+			v4l2_dbg(3, debug, &ctx->dev->v4l2_dev,
-+				 "%s: Submitted op buffer\n", __func__);
-+			ret = vchiq_mmal_submit_buffer(dev->instance,
-+						       &ctx->component->output[0],
-+						       &dst_m2m_buf->mmal);
-+			if (ret)
-+				v4l2_err(&ctx->dev->v4l2_dev,
-+					 "%s: Failed submitting op buffer\n",
-+					 __func__);
-+		}
-+	}
-+
-+	v4l2_dbg(3, debug, &ctx->dev->v4l2_dev, "%s: Submitted src %p, dst %p\n",
-+		 __func__, src_m2m_buf, dst_m2m_buf);
-+
-+	/* Complete the job here. */
-+	v4l2_m2m_job_finish(ctx->dev->m2m_dev, ctx->fh.m2m_ctx);
-+}
-+
-+/*
-+ * video ioctls
-+ */
-+static int vidioc_querycap(struct file *file, void *priv,
-+			   struct v4l2_capability *cap)
-+{
-+	struct bcm2835_codec_dev *dev = video_drvdata(file);
-+
-+	strncpy(cap->driver, MEM2MEM_NAME, sizeof(cap->driver) - 1);
-+	strncpy(cap->card, dev->vfd.name, sizeof(cap->card) - 1);
-+	snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:%s",
-+		 MEM2MEM_NAME);
-+	return 0;
-+}
-+
-+static int enum_fmt(struct v4l2_fmtdesc *f, struct bcm2835_codec_ctx *ctx,
-+		    bool capture)
-+{
-+	struct bcm2835_codec_fmt *fmt;
-+	struct bcm2835_codec_fmt_list *fmts =
-+					get_format_list(ctx->dev, capture);
-+
-+	if (f->index < fmts->num_entries) {
-+		/* Format found */
-+		fmt = &fmts->list[f->index];
-+		f->pixelformat = fmt->fourcc;
-+		f->flags = fmt->flags;
-+		return 0;
-+	}
-+
-+	/* Format not found */
-+	return -EINVAL;
-+}
-+
-+static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv,
-+				   struct v4l2_fmtdesc *f)
-+{
-+	struct bcm2835_codec_ctx *ctx = file2ctx(file);
-+
-+	return enum_fmt(f, ctx, true);
-+}
-+
-+static int vidioc_enum_fmt_vid_out(struct file *file, void *priv,
-+				   struct v4l2_fmtdesc *f)
-+{
-+	struct bcm2835_codec_ctx *ctx = file2ctx(file);
-+
-+	return enum_fmt(f, ctx, false);
-+}
-+
-+static int vidioc_g_fmt(struct bcm2835_codec_ctx *ctx, struct v4l2_format *f)
-+{
-+	struct vb2_queue *vq;
-+	struct bcm2835_codec_q_data *q_data;
-+
-+	vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type);
-+	if (!vq)
-+		return -EINVAL;
-+
-+	q_data = get_q_data(ctx, f->type);
-+
-+	f->fmt.pix_mp.width			= q_data->crop_width;
-+	f->fmt.pix_mp.height			= q_data->height;
-+	f->fmt.pix_mp.pixelformat		= q_data->fmt->fourcc;
-+	f->fmt.pix_mp.field			= q_data->field;
-+	f->fmt.pix_mp.colorspace		= ctx->colorspace;
-+	f->fmt.pix_mp.plane_fmt[0].sizeimage	= q_data->sizeimage;
-+	f->fmt.pix_mp.plane_fmt[0].bytesperline	= q_data->bytesperline;
-+	f->fmt.pix_mp.num_planes		= 1;
-+	f->fmt.pix_mp.ycbcr_enc			= ctx->ycbcr_enc;
-+	f->fmt.pix_mp.quantization		= ctx->quant;
-+	f->fmt.pix_mp.xfer_func			= ctx->xfer_func;
-+
-+	memset(f->fmt.pix_mp.plane_fmt[0].reserved, 0,
-+	       sizeof(f->fmt.pix_mp.plane_fmt[0].reserved));
-+
-+	return 0;
-+}
-+
-+static int vidioc_g_fmt_vid_out(struct file *file, void *priv,
-+				struct v4l2_format *f)
-+{
-+	return vidioc_g_fmt(file2ctx(file), f);
-+}
-+
-+static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
-+				struct v4l2_format *f)
-+{
-+	return vidioc_g_fmt(file2ctx(file), f);
-+}
-+
-+static int vidioc_try_fmt(struct bcm2835_codec_ctx *ctx, struct v4l2_format *f,
-+			  struct bcm2835_codec_fmt *fmt)
-+{
-+	unsigned int sizeimage, min_bytesperline;
-+
-+	/*
-+	 * The V4L2 specification requires the driver to correct the format
-+	 * struct if any of the dimensions is unsupported
-+	 */
-+	if (f->fmt.pix_mp.width > MAX_W)
-+		f->fmt.pix_mp.width = MAX_W;
-+	if (f->fmt.pix_mp.height > MAX_H)
-+		f->fmt.pix_mp.height = MAX_H;
-+
-+	if (!(fmt->flags & V4L2_FMT_FLAG_COMPRESSED)) {
-+		/* Only clip min w/h on capture. Treat 0x0 as unknown. */
-+		if (f->fmt.pix_mp.width < MIN_W)
-+			f->fmt.pix_mp.width = MIN_W;
-+		if (f->fmt.pix_mp.height < MIN_H)
-+			f->fmt.pix_mp.height = MIN_H;
-+
-+		/*
-+		 * For decoders and image encoders the buffer must have
-+		 * a vertical alignment of 16 lines.
-+		 * The selection will reflect any cropping rectangle when only
-+		 * some of the pixels are active.
-+		 */
-+		if (ctx->dev->role == DECODE || ctx->dev->role == ENCODE_IMAGE)
-+			f->fmt.pix_mp.height = ALIGN(f->fmt.pix_mp.height, 16);
-+	}
-+	f->fmt.pix_mp.num_planes = 1;
-+	min_bytesperline = get_bytesperline(f->fmt.pix_mp.width,
-+					    f->fmt.pix_mp.height,
-+					    fmt, ctx->dev->role);
-+	if (f->fmt.pix_mp.plane_fmt[0].bytesperline < min_bytesperline)
-+		f->fmt.pix_mp.plane_fmt[0].bytesperline = min_bytesperline;
-+	f->fmt.pix_mp.plane_fmt[0].bytesperline =
-+		ALIGN(f->fmt.pix_mp.plane_fmt[0].bytesperline,
-+		      fmt->bytesperline_align[ctx->dev->role]);
-+
-+	sizeimage = get_sizeimage(f->fmt.pix_mp.plane_fmt[0].bytesperline,
-+				  f->fmt.pix_mp.width, f->fmt.pix_mp.height,
-+				  fmt);
-+	/*
-+	 * Drivers must set sizeimage for uncompressed formats
-+	 * Compressed formats allow the client to request an alternate
-+	 * size for the buffer.
-+	 */
-+	if (!(fmt->flags & V4L2_FMT_FLAG_COMPRESSED) ||
-+	    f->fmt.pix_mp.plane_fmt[0].sizeimage < sizeimage)
-+		f->fmt.pix_mp.plane_fmt[0].sizeimage = sizeimage;
-+
-+	memset(f->fmt.pix_mp.plane_fmt[0].reserved, 0,
-+	       sizeof(f->fmt.pix_mp.plane_fmt[0].reserved));
-+
-+	if (ctx->dev->role == DECODE || ctx->dev->role == DEINTERLACE) {
-+		switch (f->fmt.pix_mp.field) {
-+		/*
-+		 * All of this is pretty much guesswork as we'll set the
-+		 * interlace format correctly come format changed, and signal
-+		 * it appropriately on each buffer.
-+		 */
-+		default:
-+		case V4L2_FIELD_NONE:
-+		case V4L2_FIELD_ANY:
-+			f->fmt.pix_mp.field = V4L2_FIELD_NONE;
-+			break;
-+		case V4L2_FIELD_INTERLACED:
-+			f->fmt.pix_mp.field = V4L2_FIELD_INTERLACED;
-+			break;
-+		case V4L2_FIELD_TOP:
-+		case V4L2_FIELD_BOTTOM:
-+		case V4L2_FIELD_INTERLACED_TB:
-+			f->fmt.pix_mp.field = V4L2_FIELD_INTERLACED_TB;
-+			break;
-+		case V4L2_FIELD_INTERLACED_BT:
-+			f->fmt.pix_mp.field = V4L2_FIELD_INTERLACED_BT;
-+			break;
-+		}
-+	} else {
-+		f->fmt.pix_mp.field = V4L2_FIELD_NONE;
-+	}
-+
-+	return 0;
-+}
-+
-+static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
-+				  struct v4l2_format *f)
-+{
-+	struct bcm2835_codec_fmt *fmt;
-+	struct bcm2835_codec_ctx *ctx = file2ctx(file);
-+
-+	fmt = find_format(f, ctx->dev, true);
-+	if (!fmt) {
-+		f->fmt.pix_mp.pixelformat = get_default_format(ctx->dev,
-+							       true)->fourcc;
-+		fmt = find_format(f, ctx->dev, true);
-+	}
-+
-+	return vidioc_try_fmt(ctx, f, fmt);
-+}
-+
-+static int vidioc_try_fmt_vid_out(struct file *file, void *priv,
-+				  struct v4l2_format *f)
-+{
-+	struct bcm2835_codec_fmt *fmt;
-+	struct bcm2835_codec_ctx *ctx = file2ctx(file);
-+
-+	fmt = find_format(f, ctx->dev, false);
-+	if (!fmt) {
-+		f->fmt.pix_mp.pixelformat = get_default_format(ctx->dev,
-+							       false)->fourcc;
-+		fmt = find_format(f, ctx->dev, false);
-+	}
-+
-+	if (!f->fmt.pix_mp.colorspace)
-+		f->fmt.pix_mp.colorspace = ctx->colorspace;
-+
-+	return vidioc_try_fmt(ctx, f, fmt);
-+}
-+
-+static int vidioc_s_fmt(struct bcm2835_codec_ctx *ctx, struct v4l2_format *f,
-+			unsigned int requested_height)
-+{
-+	struct bcm2835_codec_q_data *q_data;
-+	struct vb2_queue *vq;
-+	struct vchiq_mmal_port *port;
-+	bool update_capture_port = false;
-+	bool reenable_port = false;
-+	int ret;
-+
-+	v4l2_dbg(1, debug, &ctx->dev->v4l2_dev,	"Setting format for type %d, wxh: %dx%d, fmt: %08x, size %u\n",
-+		 f->type, f->fmt.pix_mp.width, f->fmt.pix_mp.height,
-+		 f->fmt.pix_mp.pixelformat,
-+		 f->fmt.pix_mp.plane_fmt[0].sizeimage);
-+
-+	vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type);
-+	if (!vq)
-+		return -EINVAL;
-+
-+	q_data = get_q_data(ctx, f->type);
-+	if (!q_data)
-+		return -EINVAL;
-+
-+	if (vb2_is_busy(vq)) {
-+		v4l2_err(&ctx->dev->v4l2_dev, "%s queue busy\n", __func__);
-+		return -EBUSY;
-+	}
-+
-+	q_data->fmt = find_format(f, ctx->dev,
-+				  f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE);
-+	q_data->crop_width = f->fmt.pix_mp.width;
-+	q_data->height = f->fmt.pix_mp.height;
-+	if (!q_data->selection_set ||
-+	    (q_data->fmt->flags & V4L2_FMT_FLAG_COMPRESSED))
-+		q_data->crop_height = requested_height;
-+
-+	/*
-+	 * Copying the behaviour of vicodec which retains a single set of
-+	 * colorspace parameters for both input and output.
-+	 */
-+	ctx->colorspace = f->fmt.pix_mp.colorspace;
-+	ctx->xfer_func = f->fmt.pix_mp.xfer_func;
-+	ctx->ycbcr_enc = f->fmt.pix_mp.ycbcr_enc;
-+	ctx->quant = f->fmt.pix_mp.quantization;
-+
-+	q_data->field = f->fmt.pix_mp.field;
-+
-+	/* All parameters should have been set correctly by try_fmt */
-+	q_data->bytesperline = f->fmt.pix_mp.plane_fmt[0].bytesperline;
-+	q_data->sizeimage = f->fmt.pix_mp.plane_fmt[0].sizeimage;
-+
-+	v4l2_dbg(1, debug, &ctx->dev->v4l2_dev,	"Calculated bpl as %u, size %u\n",
-+		 q_data->bytesperline, q_data->sizeimage);
-+
-+	if ((ctx->dev->role == DECODE || ctx->dev->role == ENCODE_IMAGE) &&
-+	    q_data->fmt->flags & V4L2_FMT_FLAG_COMPRESSED &&
-+	    q_data->crop_width && q_data->height) {
-+		/*
-+		 * On the decoder or image encoder, if provided with
-+		 * a resolution on the input side, then replicate that
-+		 * to the output side.
-+		 * GStreamer appears not to support V4L2_EVENT_SOURCE_CHANGE,
-+		 * nor set up a resolution on the output side, therefore
-+		 * we can't decode anything at a resolution other than the
-+		 * default one.
-+		 */
-+		struct bcm2835_codec_q_data *q_data_dst =
-+						&ctx->q_data[V4L2_M2M_DST];
-+
-+		q_data_dst->crop_width = q_data->crop_width;
-+		q_data_dst->crop_height = q_data->crop_height;
-+		q_data_dst->height = ALIGN(q_data->crop_height, 16);
-+
-+		q_data_dst->bytesperline =
-+			get_bytesperline(f->fmt.pix_mp.width,
-+					 f->fmt.pix_mp.height,
-+					 q_data_dst->fmt, ctx->dev->role);
-+		q_data_dst->sizeimage = get_sizeimage(q_data_dst->bytesperline,
-+						      q_data_dst->crop_width,
-+						      q_data_dst->height,
-+						      q_data_dst->fmt);
-+		update_capture_port = true;
-+	}
-+
-+	/* If we have a component then setup the port as well */
-+	port = get_port_data(ctx, vq->type);
-+	if (!port)
-+		return 0;
-+
-+	if (port->enabled) {
-+		unsigned int num_buffers;
-+
-+		/*
-+		 * This should only ever happen with DECODE and the MMAL output
-+		 * port that has been enabled for resolution changed events.
-+		 * In this case no buffers have been allocated or sent to the
-+		 * component, so warn on that.
-+		 */
-+		WARN_ON(ctx->dev->role != DECODE ||
-+			f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE ||
-+			atomic_read(&port->buffers_with_vpu));
-+
-+		/*
-+		 * Disable will reread the port format, so retain buffer count.
-+		 */
-+		num_buffers = port->current_buffer.num;
-+
-+		ret = vchiq_mmal_port_disable(ctx->dev->instance, port);
-+		if (ret)
-+			v4l2_err(&ctx->dev->v4l2_dev, "%s: Error disabling port update buffer count, ret %d\n",
-+				 __func__, ret);
-+
-+		port->current_buffer.num = num_buffers;
-+
-+		reenable_port = true;
-+	}
-+
-+	setup_mmal_port_format(ctx, q_data, port);
-+	ret = vchiq_mmal_port_set_format(ctx->dev->instance, port);
-+	if (ret) {
-+		v4l2_err(&ctx->dev->v4l2_dev, "%s: Failed vchiq_mmal_port_set_format on port, ret %d\n",
-+			 __func__, ret);
-+		ret = -EINVAL;
-+	}
-+
-+	if (q_data->sizeimage < port->minimum_buffer.size) {
-+		v4l2_err(&ctx->dev->v4l2_dev, "%s: Current buffer size of %u < min buf size %u - driver mismatch to MMAL\n",
-+			 __func__, q_data->sizeimage,
-+			 port->minimum_buffer.size);
-+	}
-+
-+	if (reenable_port) {
-+		ret = vchiq_mmal_port_enable(ctx->dev->instance,
-+					     port,
-+					     op_buffer_cb);
-+		if (ret)
-+			v4l2_err(&ctx->dev->v4l2_dev, "%s: Failed enabling o/p port, ret %d\n",
-+				 __func__, ret);
-+	}
-+	v4l2_dbg(1, debug, &ctx->dev->v4l2_dev,	"Set format for type %d, wxh: %dx%d, fmt: %08x, size %u\n",
-+		 f->type, q_data->crop_width, q_data->height,
-+		 q_data->fmt->fourcc, q_data->sizeimage);
-+
-+	if (update_capture_port) {
-+		struct vchiq_mmal_port *port_dst = &ctx->component->output[0];
-+		struct bcm2835_codec_q_data *q_data_dst =
-+						&ctx->q_data[V4L2_M2M_DST];
-+
-+		setup_mmal_port_format(ctx, q_data_dst, port_dst);
-+		ret = vchiq_mmal_port_set_format(ctx->dev->instance, port_dst);
-+		if (ret) {
-+			v4l2_err(&ctx->dev->v4l2_dev, "%s: Failed vchiq_mmal_port_set_format on output port, ret %d\n",
-+				 __func__, ret);
-+			ret = -EINVAL;
-+		}
-+	}
-+	return ret;
-+}
-+
-+static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
-+				struct v4l2_format *f)
-+{
-+	unsigned int height = f->fmt.pix_mp.height;
-+	int ret;
-+
-+	ret = vidioc_try_fmt_vid_cap(file, priv, f);
-+	if (ret)
-+		return ret;
-+
-+	return vidioc_s_fmt(file2ctx(file), f, height);
-+}
-+
-+static int vidioc_s_fmt_vid_out(struct file *file, void *priv,
-+				struct v4l2_format *f)
-+{
-+	unsigned int height = f->fmt.pix_mp.height;
-+	int ret;
-+
-+	ret = vidioc_try_fmt_vid_out(file, priv, f);
-+	if (ret)
-+		return ret;
-+
-+	ret = vidioc_s_fmt(file2ctx(file), f, height);
-+	return ret;
-+}
-+
-+static int vidioc_g_selection(struct file *file, void *priv,
-+			      struct v4l2_selection *s)
-+{
-+	struct bcm2835_codec_ctx *ctx = file2ctx(file);
-+	struct bcm2835_codec_q_data *q_data;
-+
-+	/*
-+	 * The selection API takes V4L2_BUF_TYPE_VIDEO_CAPTURE and
-+	 * V4L2_BUF_TYPE_VIDEO_OUTPUT, even if the device implements the MPLANE
-+	 * API. The V4L2 core will have converted the MPLANE variants to
-+	 * non-MPLANE.
-+	 * Open code this instead of using get_q_data in this case.
-+	 */
-+	switch (s->type) {
-+	case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-+		/* CAPTURE on encoder is not valid. */
-+		if (ctx->dev->role == ENCODE || ctx->dev->role == ENCODE_IMAGE)
-+			return -EINVAL;
-+		q_data = &ctx->q_data[V4L2_M2M_DST];
-+		break;
-+	case V4L2_BUF_TYPE_VIDEO_OUTPUT:
-+		/* OUTPUT on deoder is not valid. */
-+		if (ctx->dev->role == DECODE)
-+			return -EINVAL;
-+		q_data = &ctx->q_data[V4L2_M2M_SRC];
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	switch (ctx->dev->role) {
-+	case DECODE:
-+		switch (s->target) {
-+		case V4L2_SEL_TGT_COMPOSE_DEFAULT:
-+		case V4L2_SEL_TGT_COMPOSE:
-+			s->r.left = 0;
-+			s->r.top = 0;
-+			s->r.width = q_data->crop_width;
-+			s->r.height = q_data->crop_height;
-+			break;
-+		case V4L2_SEL_TGT_COMPOSE_BOUNDS:
-+			s->r.left = 0;
-+			s->r.top = 0;
-+			s->r.width = q_data->crop_width;
-+			s->r.height = q_data->crop_height;
-+			break;
-+		case V4L2_SEL_TGT_CROP_BOUNDS:
-+		case V4L2_SEL_TGT_CROP_DEFAULT:
-+			s->r.left = 0;
-+			s->r.top = 0;
-+			s->r.width = (q_data->bytesperline << 3) /
-+						q_data->fmt->depth;
-+			s->r.height = q_data->height;
-+			break;
-+		default:
-+			return -EINVAL;
-+		}
-+		break;
-+	case ENCODE:
-+	case ENCODE_IMAGE:
-+		switch (s->target) {
-+		case V4L2_SEL_TGT_CROP_DEFAULT:
-+		case V4L2_SEL_TGT_CROP_BOUNDS:
-+			s->r.top = 0;
-+			s->r.left = 0;
-+			s->r.width = q_data->bytesperline;
-+			s->r.height = q_data->height;
-+			break;
-+		case V4L2_SEL_TGT_CROP:
-+			s->r.top = 0;
-+			s->r.left = 0;
-+			s->r.width = q_data->crop_width;
-+			s->r.height = q_data->crop_height;
-+			break;
-+		default:
-+			return -EINVAL;
-+		}
-+		break;
-+	case ISP:
-+		break;
-+	case DEINTERLACE:
-+		if (s->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
-+			switch (s->target) {
-+			case V4L2_SEL_TGT_COMPOSE_DEFAULT:
-+			case V4L2_SEL_TGT_COMPOSE:
-+				s->r.left = 0;
-+				s->r.top = 0;
-+				s->r.width = q_data->crop_width;
-+				s->r.height = q_data->crop_height;
-+				break;
-+			case V4L2_SEL_TGT_COMPOSE_BOUNDS:
-+				s->r.left = 0;
-+				s->r.top = 0;
-+				s->r.width = q_data->crop_width;
-+				s->r.height = q_data->crop_height;
-+				break;
-+			default:
-+				return -EINVAL;
-+			}
-+		} else {
-+			/* must be V4L2_BUF_TYPE_VIDEO_OUTPUT */
-+			switch (s->target) {
-+			case V4L2_SEL_TGT_CROP_DEFAULT:
-+			case V4L2_SEL_TGT_CROP_BOUNDS:
-+				s->r.top = 0;
-+				s->r.left = 0;
-+				s->r.width = q_data->bytesperline;
-+				s->r.height = q_data->height;
-+				break;
-+			case V4L2_SEL_TGT_CROP:
-+				s->r.top = 0;
-+				s->r.left = 0;
-+				s->r.width = q_data->crop_width;
-+				s->r.height = q_data->crop_height;
-+				break;
-+			default:
-+				return -EINVAL;
-+			}
-+		}
-+		break;
-+	case NUM_ROLES:
-+		break;
-+	}
-+
-+	return 0;
-+}
-+
-+static int vidioc_s_selection(struct file *file, void *priv,
-+			      struct v4l2_selection *s)
-+{
-+	struct bcm2835_codec_ctx *ctx = file2ctx(file);
-+	struct bcm2835_codec_q_data *q_data = NULL;
-+	struct vchiq_mmal_port *port = NULL;
-+	int ret;
-+
-+	/*
-+	 * The selection API takes V4L2_BUF_TYPE_VIDEO_CAPTURE and
-+	 * V4L2_BUF_TYPE_VIDEO_OUTPUT, even if the device implements the MPLANE
-+	 * API. The V4L2 core will have converted the MPLANE variants to
-+	 * non-MPLANE.
-+	 *
-+	 * Open code this instead of using get_q_data in this case.
-+	 */
-+	switch (s->type) {
-+	case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-+		/* CAPTURE on encoder is not valid. */
-+		if (ctx->dev->role == ENCODE || ctx->dev->role == ENCODE_IMAGE)
-+			return -EINVAL;
-+		q_data = &ctx->q_data[V4L2_M2M_DST];
-+		if (ctx->component)
-+			port = &ctx->component->output[0];
-+		break;
-+	case V4L2_BUF_TYPE_VIDEO_OUTPUT:
-+		/* OUTPUT on deoder is not valid. */
-+		if (ctx->dev->role == DECODE)
-+			return -EINVAL;
-+		q_data = &ctx->q_data[V4L2_M2M_SRC];
-+		if (ctx->component)
-+			port = &ctx->component->input[0];
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	v4l2_dbg(1, debug, &ctx->dev->v4l2_dev, "%s: ctx %p, type %d, q_data %p, target %d, rect x/y %d/%d, w/h %ux%u\n",
-+		 __func__, ctx, s->type, q_data, s->target, s->r.left, s->r.top,
-+		 s->r.width, s->r.height);
-+
-+	switch (ctx->dev->role) {
-+	case DECODE:
-+		switch (s->target) {
-+		case V4L2_SEL_TGT_COMPOSE:
-+			/* Accept cropped image */
-+			s->r.left = 0;
-+			s->r.top = 0;
-+			s->r.width = min(s->r.width, q_data->crop_width);
-+			s->r.height = min(s->r.height, q_data->height);
-+			q_data->crop_width = s->r.width;
-+			q_data->crop_height = s->r.height;
-+			q_data->selection_set = true;
-+			break;
-+		default:
-+			return -EINVAL;
-+		}
-+		break;
-+	case ENCODE:
-+	case ENCODE_IMAGE:
-+		switch (s->target) {
-+		case V4L2_SEL_TGT_CROP:
-+			/* Only support crop from (0,0) */
-+			s->r.top = 0;
-+			s->r.left = 0;
-+			s->r.width = min(s->r.width, q_data->crop_width);
-+			s->r.height = min(s->r.height, q_data->height);
-+			q_data->crop_width = s->r.width;
-+			q_data->crop_height = s->r.height;
-+			q_data->selection_set = true;
-+			break;
-+		default:
-+			return -EINVAL;
-+		}
-+		break;
-+	case ISP:
-+		break;
-+	case DEINTERLACE:
-+		if (s->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
-+			switch (s->target) {
-+			case V4L2_SEL_TGT_COMPOSE:
-+				/* Accept cropped image */
-+				s->r.left = 0;
-+				s->r.top = 0;
-+				s->r.width = min(s->r.width, q_data->crop_width);
-+				s->r.height = min(s->r.height, q_data->height);
-+				q_data->crop_width = s->r.width;
-+				q_data->crop_height = s->r.height;
-+				q_data->selection_set = true;
-+				break;
-+			default:
-+				return -EINVAL;
-+			}
-+			break;
-+		} else {
-+			/* must be V4L2_BUF_TYPE_VIDEO_OUTPUT */
-+			switch (s->target) {
-+			case V4L2_SEL_TGT_CROP:
-+				/* Only support crop from (0,0) */
-+				s->r.top = 0;
-+				s->r.left = 0;
-+				s->r.width = min(s->r.width, q_data->crop_width);
-+				s->r.height = min(s->r.height, q_data->height);
-+				q_data->crop_width = s->r.width;
-+				q_data->crop_height = s->r.height;
-+				q_data->selection_set = true;
-+				break;
-+			default:
-+				return -EINVAL;
-+			}
-+			break;
-+		}
-+	case NUM_ROLES:
-+		break;
-+	}
-+
-+	if (!port)
-+		return 0;
-+
-+	setup_mmal_port_format(ctx, q_data, port);
-+	ret = vchiq_mmal_port_set_format(ctx->dev->instance, port);
-+	if (ret) {
-+		v4l2_err(&ctx->dev->v4l2_dev, "%s: Failed vchiq_mmal_port_set_format on port, ret %d\n",
-+			 __func__, ret);
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
-+
-+static int vidioc_s_parm(struct file *file, void *priv,
-+			 struct v4l2_streamparm *parm)
-+{
-+	struct bcm2835_codec_ctx *ctx = file2ctx(file);
-+
-+	if (parm->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
-+		return -EINVAL;
-+
-+	if (!parm->parm.output.timeperframe.denominator ||
-+	    !parm->parm.output.timeperframe.numerator)
-+		return -EINVAL;
-+
-+	ctx->framerate_num =
-+			parm->parm.output.timeperframe.denominator;
-+	ctx->framerate_denom =
-+			parm->parm.output.timeperframe.numerator;
-+
-+	parm->parm.output.capability = V4L2_CAP_TIMEPERFRAME;
-+
-+	return 0;
-+}
-+
-+static int vidioc_g_parm(struct file *file, void *priv,
-+			 struct v4l2_streamparm *parm)
-+{
-+	struct bcm2835_codec_ctx *ctx = file2ctx(file);
-+
-+	if (parm->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
-+		return -EINVAL;
-+
-+	parm->parm.output.capability = V4L2_CAP_TIMEPERFRAME;
-+	parm->parm.output.timeperframe.denominator =
-+			ctx->framerate_num;
-+	parm->parm.output.timeperframe.numerator =
-+			ctx->framerate_denom;
-+
-+	return 0;
-+}
-+
-+static int vidioc_g_pixelaspect(struct file *file, void *fh, int type,
-+				struct v4l2_fract *f)
-+{
-+	struct bcm2835_codec_ctx *ctx = file2ctx(file);
-+
-+	/*
-+	 * The selection API takes V4L2_BUF_TYPE_VIDEO_CAPTURE and
-+	 * V4L2_BUF_TYPE_VIDEO_OUTPUT, even if the device implements the MPLANE
-+	 * API. The V4L2 core will have converted the MPLANE variants to
-+	 * non-MPLANE.
-+	 * Open code this instead of using get_q_data in this case.
-+	 */
-+	if (ctx->dev->role != DECODE)
-+		return -ENOIOCTLCMD;
-+
-+	if (type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-+		return -EINVAL;
-+
-+	*f = ctx->q_data[V4L2_M2M_DST].aspect_ratio;
-+
-+	return 0;
-+}
-+
-+static int vidioc_subscribe_evt(struct v4l2_fh *fh,
-+				const struct v4l2_event_subscription *sub)
-+{
-+	switch (sub->type) {
-+	case V4L2_EVENT_EOS:
-+		return v4l2_event_subscribe(fh, sub, 2, NULL);
-+	case V4L2_EVENT_SOURCE_CHANGE:
-+		return v4l2_src_change_event_subscribe(fh, sub);
-+	default:
-+		return v4l2_ctrl_subscribe_event(fh, sub);
-+	}
-+}
-+
-+static int bcm2835_codec_set_level_profile(struct bcm2835_codec_ctx *ctx,
-+					   struct v4l2_ctrl *ctrl)
-+{
-+	struct mmal_parameter_video_profile param;
-+	int param_size = sizeof(param);
-+	int ret;
-+
-+	/*
-+	 * Level and Profile are set via the same MMAL parameter.
-+	 * Retrieve the current settings and amend the one that has changed.
-+	 */
-+	ret = vchiq_mmal_port_parameter_get(ctx->dev->instance,
-+					    &ctx->component->output[0],
-+					    MMAL_PARAMETER_PROFILE,
-+					    &param,
-+					    &param_size);
-+	if (ret)
-+		return ret;
-+
-+	switch (ctrl->id) {
-+	case V4L2_CID_MPEG_VIDEO_H264_PROFILE:
-+		switch (ctrl->val) {
-+		case V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE:
-+			param.profile = MMAL_VIDEO_PROFILE_H264_BASELINE;
-+			break;
-+		case V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE:
-+			param.profile =
-+				MMAL_VIDEO_PROFILE_H264_CONSTRAINED_BASELINE;
-+			break;
-+		case V4L2_MPEG_VIDEO_H264_PROFILE_MAIN:
-+			param.profile = MMAL_VIDEO_PROFILE_H264_MAIN;
-+			break;
-+		case V4L2_MPEG_VIDEO_H264_PROFILE_HIGH:
-+			param.profile = MMAL_VIDEO_PROFILE_H264_HIGH;
-+			break;
-+		default:
-+			/* Should never get here */
-+			break;
-+		}
-+		break;
-+
-+	case V4L2_CID_MPEG_VIDEO_H264_LEVEL:
-+		switch (ctrl->val) {
-+		case V4L2_MPEG_VIDEO_H264_LEVEL_1_0:
-+			param.level = MMAL_VIDEO_LEVEL_H264_1;
-+			break;
-+		case V4L2_MPEG_VIDEO_H264_LEVEL_1B:
-+			param.level = MMAL_VIDEO_LEVEL_H264_1b;
-+			break;
-+		case V4L2_MPEG_VIDEO_H264_LEVEL_1_1:
-+			param.level = MMAL_VIDEO_LEVEL_H264_11;
-+			break;
-+		case V4L2_MPEG_VIDEO_H264_LEVEL_1_2:
-+			param.level = MMAL_VIDEO_LEVEL_H264_12;
-+			break;
-+		case V4L2_MPEG_VIDEO_H264_LEVEL_1_3:
-+			param.level = MMAL_VIDEO_LEVEL_H264_13;
-+			break;
-+		case V4L2_MPEG_VIDEO_H264_LEVEL_2_0:
-+			param.level = MMAL_VIDEO_LEVEL_H264_2;
-+			break;
-+		case V4L2_MPEG_VIDEO_H264_LEVEL_2_1:
-+			param.level = MMAL_VIDEO_LEVEL_H264_21;
-+			break;
-+		case V4L2_MPEG_VIDEO_H264_LEVEL_2_2:
-+			param.level = MMAL_VIDEO_LEVEL_H264_22;
-+			break;
-+		case V4L2_MPEG_VIDEO_H264_LEVEL_3_0:
-+			param.level = MMAL_VIDEO_LEVEL_H264_3;
-+			break;
-+		case V4L2_MPEG_VIDEO_H264_LEVEL_3_1:
-+			param.level = MMAL_VIDEO_LEVEL_H264_31;
-+			break;
-+		case V4L2_MPEG_VIDEO_H264_LEVEL_3_2:
-+			param.level = MMAL_VIDEO_LEVEL_H264_32;
-+			break;
-+		case V4L2_MPEG_VIDEO_H264_LEVEL_4_0:
-+			param.level = MMAL_VIDEO_LEVEL_H264_4;
-+			break;
-+		/*
-+		 * Note that the hardware spec is level 4.0. Levels above that
-+		 * are there for correctly encoding the headers and may not
-+		 * be able to keep up with real-time.
-+		 */
-+		case V4L2_MPEG_VIDEO_H264_LEVEL_4_1:
-+			param.level = MMAL_VIDEO_LEVEL_H264_41;
-+			break;
-+		case V4L2_MPEG_VIDEO_H264_LEVEL_4_2:
-+			param.level = MMAL_VIDEO_LEVEL_H264_42;
-+			break;
-+		case V4L2_MPEG_VIDEO_H264_LEVEL_5_0:
-+			param.level = MMAL_VIDEO_LEVEL_H264_5;
-+			break;
-+		case V4L2_MPEG_VIDEO_H264_LEVEL_5_1:
-+			param.level = MMAL_VIDEO_LEVEL_H264_51;
-+			break;
-+		default:
-+			/* Should never get here */
-+			break;
-+		}
-+	}
-+	ret = vchiq_mmal_port_parameter_set(ctx->dev->instance,
-+					    &ctx->component->output[0],
-+					    MMAL_PARAMETER_PROFILE,
-+					    &param,
-+					    param_size);
-+
-+	return ret;
-+}
-+
-+static int bcm2835_codec_s_ctrl(struct v4l2_ctrl *ctrl)
-+{
-+	struct bcm2835_codec_ctx *ctx =
-+		container_of(ctrl->handler, struct bcm2835_codec_ctx, hdl);
-+	int ret = 0;
-+
-+	switch (ctrl->id) {
-+	case V4L2_CID_MPEG_VIDEO_BITRATE:
-+		ctx->bitrate = ctrl->val;
-+		if (!ctx->component)
-+			break;
-+
-+		ret = vchiq_mmal_port_parameter_set(ctx->dev->instance,
-+						    &ctx->component->output[0],
-+						    MMAL_PARAMETER_VIDEO_BIT_RATE,
-+						    &ctrl->val,
-+						    sizeof(ctrl->val));
-+		break;
-+
-+	case V4L2_CID_MPEG_VIDEO_BITRATE_MODE: {
-+		u32 bitrate_mode;
-+
-+		if (!ctx->component)
-+			break;
-+
-+		switch (ctrl->val) {
-+		default:
-+		case V4L2_MPEG_VIDEO_BITRATE_MODE_VBR:
-+			bitrate_mode = MMAL_VIDEO_RATECONTROL_VARIABLE;
-+			break;
-+		case V4L2_MPEG_VIDEO_BITRATE_MODE_CBR:
-+			bitrate_mode = MMAL_VIDEO_RATECONTROL_CONSTANT;
-+			break;
-+		}
-+
-+		ret = vchiq_mmal_port_parameter_set(ctx->dev->instance,
-+						    &ctx->component->output[0],
-+						    MMAL_PARAMETER_RATECONTROL,
-+						    &bitrate_mode,
-+						    sizeof(bitrate_mode));
-+		break;
-+	}
-+	case V4L2_CID_MPEG_VIDEO_REPEAT_SEQ_HEADER:
-+		if (!ctx->component)
-+			break;
-+
-+		ret = vchiq_mmal_port_parameter_set(ctx->dev->instance,
-+						    &ctx->component->output[0],
-+						    MMAL_PARAMETER_VIDEO_ENCODE_INLINE_HEADER,
-+						    &ctrl->val,
-+						    sizeof(ctrl->val));
-+		break;
-+
-+	case V4L2_CID_MPEG_VIDEO_HEADER_MODE:
-+		if (!ctx->component)
-+			break;
-+
-+		ret = vchiq_mmal_port_parameter_set(ctx->dev->instance,
-+						    &ctx->component->output[0],
-+						    MMAL_PARAMETER_VIDEO_ENCODE_HEADERS_WITH_FRAME,
-+						    &ctrl->val,
-+						    sizeof(ctrl->val));
-+		break;
-+
-+	case V4L2_CID_MPEG_VIDEO_H264_I_PERIOD:
-+		if (!ctx->component)
-+			break;
-+
-+		ret = vchiq_mmal_port_parameter_set(ctx->dev->instance,
-+						    &ctx->component->output[0],
-+						    MMAL_PARAMETER_INTRAPERIOD,
-+						    &ctrl->val,
-+						    sizeof(ctrl->val));
-+		break;
-+
-+	case V4L2_CID_MPEG_VIDEO_H264_PROFILE:
-+	case V4L2_CID_MPEG_VIDEO_H264_LEVEL:
-+		if (!ctx->component)
-+			break;
-+
-+		ret = bcm2835_codec_set_level_profile(ctx, ctrl);
-+		break;
-+
-+	case V4L2_CID_MPEG_VIDEO_H264_MIN_QP:
-+		if (!ctx->component)
-+			break;
-+
-+		ret = vchiq_mmal_port_parameter_set(ctx->dev->instance,
-+						    &ctx->component->output[0],
-+						    MMAL_PARAMETER_VIDEO_ENCODE_MIN_QUANT,
-+						    &ctrl->val,
-+						    sizeof(ctrl->val));
-+		break;
-+
-+	case V4L2_CID_MPEG_VIDEO_H264_MAX_QP:
-+		if (!ctx->component)
-+			break;
-+
-+		ret = vchiq_mmal_port_parameter_set(ctx->dev->instance,
-+						    &ctx->component->output[0],
-+						    MMAL_PARAMETER_VIDEO_ENCODE_MAX_QUANT,
-+						    &ctrl->val,
-+						    sizeof(ctrl->val));
-+		break;
-+
-+	case V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME: {
-+		u32 mmal_bool = 1;
-+
-+		if (!ctx->component)
-+			break;
-+
-+		ret = vchiq_mmal_port_parameter_set(ctx->dev->instance,
-+						    &ctx->component->output[0],
-+						    MMAL_PARAMETER_VIDEO_REQUEST_I_FRAME,
-+						    &mmal_bool,
-+						    sizeof(mmal_bool));
-+		break;
-+	}
-+	case V4L2_CID_HFLIP:
-+	case V4L2_CID_VFLIP: {
-+		u32 u32_value;
-+
-+		if (ctrl->id == V4L2_CID_HFLIP)
-+			ctx->hflip = ctrl->val;
-+		else
-+			ctx->vflip = ctrl->val;
-+
-+		if (!ctx->component)
-+			break;
-+
-+		if (ctx->hflip && ctx->vflip)
-+			u32_value = MMAL_PARAM_MIRROR_BOTH;
-+		else if (ctx->hflip)
-+			u32_value = MMAL_PARAM_MIRROR_HORIZONTAL;
-+		else if (ctx->vflip)
-+			u32_value = MMAL_PARAM_MIRROR_VERTICAL;
-+		else
-+			u32_value = MMAL_PARAM_MIRROR_NONE;
-+
-+		ret = vchiq_mmal_port_parameter_set(ctx->dev->instance,
-+						    &ctx->component->input[0],
-+						    MMAL_PARAMETER_MIRROR,
-+						    &u32_value,
-+						    sizeof(u32_value));
-+		break;
-+	}
-+	case V4L2_CID_JPEG_COMPRESSION_QUALITY:
-+		if (!ctx->component)
-+			break;
-+
-+		ret = vchiq_mmal_port_parameter_set(ctx->dev->instance,
-+						    &ctx->component->output[0],
-+						    MMAL_PARAMETER_JPEG_Q_FACTOR,
-+						    &ctrl->val,
-+						    sizeof(ctrl->val));
-+		break;
-+
-+	default:
-+		v4l2_err(&ctx->dev->v4l2_dev, "Invalid control\n");
-+		return -EINVAL;
-+	}
-+
-+	if (ret)
-+		v4l2_err(&ctx->dev->v4l2_dev, "Failed setting ctrl %08x, ret %d\n",
-+			 ctrl->id, ret);
-+	return ret ? -EINVAL : 0;
-+}
-+
-+static const struct v4l2_ctrl_ops bcm2835_codec_ctrl_ops = {
-+	.s_ctrl = bcm2835_codec_s_ctrl,
-+};
-+
-+static int vidioc_try_decoder_cmd(struct file *file, void *priv,
-+				  struct v4l2_decoder_cmd *cmd)
-+{
-+	struct bcm2835_codec_ctx *ctx = file2ctx(file);
-+
-+	if (ctx->dev->role != DECODE)
-+		return -EINVAL;
-+
-+	switch (cmd->cmd) {
-+	case V4L2_DEC_CMD_STOP:
-+		if (cmd->flags & V4L2_DEC_CMD_STOP_TO_BLACK) {
-+			v4l2_err(&ctx->dev->v4l2_dev, "%s: DEC cmd->flags=%u stop to black not supported",
-+				 __func__, cmd->flags);
-+			return -EINVAL;
-+		}
-+		break;
-+	case V4L2_DEC_CMD_START:
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+	return 0;
-+}
-+
-+static int vidioc_decoder_cmd(struct file *file, void *priv,
-+			      struct v4l2_decoder_cmd *cmd)
-+{
-+	struct bcm2835_codec_ctx *ctx = file2ctx(file);
-+	struct bcm2835_codec_q_data *q_data = &ctx->q_data[V4L2_M2M_SRC];
-+	struct vb2_queue *dst_vq;
-+	int ret;
-+
-+	v4l2_dbg(2, debug, &ctx->dev->v4l2_dev, "%s, cmd %u", __func__,
-+		 cmd->cmd);
-+	ret = vidioc_try_decoder_cmd(file, priv, cmd);
-+	if (ret)
-+		return ret;
-+
-+	switch (cmd->cmd) {
-+	case V4L2_DEC_CMD_STOP:
-+		if (q_data->eos_buffer_in_use)
-+			v4l2_err(&ctx->dev->v4l2_dev, "EOS buffers already in use\n");
-+		q_data->eos_buffer_in_use = true;
-+
-+		q_data->eos_buffer.mmal.buffer_size = 0;
-+		q_data->eos_buffer.mmal.length = 0;
-+		q_data->eos_buffer.mmal.mmal_flags =
-+						MMAL_BUFFER_HEADER_FLAG_EOS;
-+		q_data->eos_buffer.mmal.pts = 0;
-+		q_data->eos_buffer.mmal.dts = 0;
-+
-+		if (!ctx->component)
-+			break;
-+
-+		ret = vchiq_mmal_submit_buffer(ctx->dev->instance,
-+					       &ctx->component->input[0],
-+					       &q_data->eos_buffer.mmal);
-+		if (ret)
-+			v4l2_err(&ctx->dev->v4l2_dev,
-+				 "%s: EOS buffer submit failed %d\n",
-+				 __func__, ret);
-+
-+		break;
-+
-+	case V4L2_DEC_CMD_START:
-+		dst_vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx,
-+					 V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE);
-+		vb2_clear_last_buffer_dequeued(dst_vq);
-+		break;
-+
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
-+
-+static int vidioc_try_encoder_cmd(struct file *file, void *priv,
-+				  struct v4l2_encoder_cmd *cmd)
-+{
-+	switch (cmd->cmd) {
-+	case V4L2_ENC_CMD_STOP:
-+		break;
-+
-+	case V4L2_ENC_CMD_START:
-+		/* Do we need to do anything here? */
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+	return 0;
-+}
-+
-+static int vidioc_encoder_cmd(struct file *file, void *priv,
-+			      struct v4l2_encoder_cmd *cmd)
-+{
-+	struct bcm2835_codec_ctx *ctx = file2ctx(file);
-+	struct bcm2835_codec_q_data *q_data = &ctx->q_data[V4L2_M2M_SRC];
-+	int ret;
-+
-+	v4l2_dbg(2, debug, &ctx->dev->v4l2_dev, "%s, cmd %u", __func__,
-+		 cmd->cmd);
-+	ret = vidioc_try_encoder_cmd(file, priv, cmd);
-+	if (ret)
-+		return ret;
-+
-+	switch (cmd->cmd) {
-+	case V4L2_ENC_CMD_STOP:
-+		if (q_data->eos_buffer_in_use)
-+			v4l2_err(&ctx->dev->v4l2_dev, "EOS buffers already in use\n");
-+		q_data->eos_buffer_in_use = true;
-+
-+		q_data->eos_buffer.mmal.buffer_size = 0;
-+		q_data->eos_buffer.mmal.length = 0;
-+		q_data->eos_buffer.mmal.mmal_flags =
-+						MMAL_BUFFER_HEADER_FLAG_EOS;
-+		q_data->eos_buffer.mmal.pts = 0;
-+		q_data->eos_buffer.mmal.dts = 0;
-+
-+		if (!ctx->component)
-+			break;
-+
-+		ret = vchiq_mmal_submit_buffer(ctx->dev->instance,
-+					       &ctx->component->input[0],
-+					       &q_data->eos_buffer.mmal);
-+		if (ret)
-+			v4l2_err(&ctx->dev->v4l2_dev,
-+				 "%s: EOS buffer submit failed %d\n",
-+				 __func__, ret);
-+
-+		break;
-+	case V4L2_ENC_CMD_START:
-+		/* Do we need to do anything here? */
-+		break;
-+
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
-+
-+static int vidioc_enum_framesizes(struct file *file, void *fh,
-+				  struct v4l2_frmsizeenum *fsize)
-+{
-+	struct bcm2835_codec_fmt *fmt;
-+
-+	fmt = find_format_pix_fmt(fsize->pixel_format, file2ctx(file)->dev,
-+				  true);
-+	if (!fmt)
-+		fmt = find_format_pix_fmt(fsize->pixel_format,
-+					  file2ctx(file)->dev,
-+					  false);
-+
-+	if (!fmt)
-+		return -EINVAL;
-+
-+	if (fsize->index)
-+		return -EINVAL;
-+
-+	fsize->type = V4L2_FRMSIZE_TYPE_STEPWISE;
-+
-+	fsize->stepwise.min_width = MIN_W;
-+	fsize->stepwise.max_width = MAX_W;
-+	fsize->stepwise.step_width = 2;
-+	fsize->stepwise.min_height = MIN_H;
-+	fsize->stepwise.max_height = MAX_H;
-+	fsize->stepwise.step_height = 2;
-+
-+	return 0;
-+}
-+
-+static const struct v4l2_ioctl_ops bcm2835_codec_ioctl_ops = {
-+	.vidioc_querycap	= vidioc_querycap,
-+
-+	.vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
-+	.vidioc_g_fmt_vid_cap_mplane	= vidioc_g_fmt_vid_cap,
-+	.vidioc_try_fmt_vid_cap_mplane	= vidioc_try_fmt_vid_cap,
-+	.vidioc_s_fmt_vid_cap_mplane	= vidioc_s_fmt_vid_cap,
-+
-+	.vidioc_enum_fmt_vid_out = vidioc_enum_fmt_vid_out,
-+	.vidioc_g_fmt_vid_out_mplane	= vidioc_g_fmt_vid_out,
-+	.vidioc_try_fmt_vid_out_mplane	= vidioc_try_fmt_vid_out,
-+	.vidioc_s_fmt_vid_out_mplane	= vidioc_s_fmt_vid_out,
-+
-+	.vidioc_reqbufs		= v4l2_m2m_ioctl_reqbufs,
-+	.vidioc_querybuf	= v4l2_m2m_ioctl_querybuf,
-+	.vidioc_qbuf		= v4l2_m2m_ioctl_qbuf,
-+	.vidioc_dqbuf		= v4l2_m2m_ioctl_dqbuf,
-+	.vidioc_prepare_buf	= v4l2_m2m_ioctl_prepare_buf,
-+	.vidioc_create_bufs	= v4l2_m2m_ioctl_create_bufs,
-+	.vidioc_expbuf		= v4l2_m2m_ioctl_expbuf,
-+
-+	.vidioc_streamon	= v4l2_m2m_ioctl_streamon,
-+	.vidioc_streamoff	= v4l2_m2m_ioctl_streamoff,
-+
-+	.vidioc_g_selection	= vidioc_g_selection,
-+	.vidioc_s_selection	= vidioc_s_selection,
-+
-+	.vidioc_g_parm		= vidioc_g_parm,
-+	.vidioc_s_parm		= vidioc_s_parm,
-+
-+	.vidioc_g_pixelaspect	= vidioc_g_pixelaspect,
-+
-+	.vidioc_subscribe_event = vidioc_subscribe_evt,
-+	.vidioc_unsubscribe_event = v4l2_event_unsubscribe,
-+
-+	.vidioc_decoder_cmd = vidioc_decoder_cmd,
-+	.vidioc_try_decoder_cmd = vidioc_try_decoder_cmd,
-+	.vidioc_encoder_cmd = vidioc_encoder_cmd,
-+	.vidioc_try_encoder_cmd = vidioc_try_encoder_cmd,
-+	.vidioc_enum_framesizes = vidioc_enum_framesizes,
-+};
-+
-+static int bcm2835_codec_create_component(struct bcm2835_codec_ctx *ctx)
-+{
-+	struct bcm2835_codec_dev *dev = ctx->dev;
-+	unsigned int enable = 1;
-+	int ret;
-+
-+	ret = vchiq_mmal_component_init(dev->instance, components[dev->role],
-+					&ctx->component);
-+	if (ret < 0) {
-+		v4l2_err(&dev->v4l2_dev, "%s: failed to create component %s\n",
-+			 __func__, components[dev->role]);
-+		return -ENOMEM;
-+	}
-+
-+	vchiq_mmal_port_parameter_set(dev->instance, &ctx->component->input[0],
-+				      MMAL_PARAMETER_ZERO_COPY, &enable,
-+				      sizeof(enable));
-+	vchiq_mmal_port_parameter_set(dev->instance, &ctx->component->output[0],
-+				      MMAL_PARAMETER_ZERO_COPY, &enable,
-+				      sizeof(enable));
-+
-+	if (dev->role == DECODE) {
-+		/*
-+		 * Disable firmware option that ensures decoded timestamps
-+		 * always increase.
-+		 */
-+		enable = 0;
-+		vchiq_mmal_port_parameter_set(dev->instance,
-+					      &ctx->component->output[0],
-+					      MMAL_PARAMETER_VIDEO_VALIDATE_TIMESTAMPS,
-+					      &enable,
-+					      sizeof(enable));
-+		/*
-+		 * Enable firmware option to stop on colourspace and pixel
-+		 * aspect ratio changed
-+		 */
-+		enable = 1;
-+		vchiq_mmal_port_parameter_set(dev->instance,
-+					      &ctx->component->control,
-+					      MMAL_PARAMETER_VIDEO_STOP_ON_PAR_COLOUR_CHANGE,
-+					      &enable,
-+					      sizeof(enable));
-+	} else if (dev->role == DEINTERLACE) {
-+		/* Select the default deinterlace algorithm. */
-+		int half_framerate = 0;
-+		int default_frame_interval = -1; /* don't interpolate */
-+		int frame_type = 5; /* 0=progressive, 3=TFF, 4=BFF, 5=see frame */
-+		int use_qpus = 0;
-+		enum mmal_parameter_imagefx effect =
-+			advanced_deinterlace && ctx->q_data[V4L2_M2M_SRC].crop_width <= 800 ?
-+			MMAL_PARAM_IMAGEFX_DEINTERLACE_ADV :
-+			MMAL_PARAM_IMAGEFX_DEINTERLACE_FAST;
-+		struct mmal_parameter_imagefx_parameters params = {
-+			.effect = effect,
-+			.num_effect_params = 4,
-+			.effect_parameter = { frame_type,
-+					      default_frame_interval,
-+					      half_framerate,
-+					      use_qpus },
-+		};
-+
-+		vchiq_mmal_port_parameter_set(dev->instance,
-+					      &ctx->component->output[0],
-+					      MMAL_PARAMETER_IMAGE_EFFECT_PARAMETERS,
-+					      &params,
-+					      sizeof(params));
-+
-+	} else if (dev->role == ENCODE_IMAGE) {
-+		enable = 0;
-+		vchiq_mmal_port_parameter_set(dev->instance,
-+					      &ctx->component->control,
-+					      MMAL_PARAMETER_EXIF_DISABLE,
-+					      &enable,
-+					      sizeof(enable));
-+		enable = 1;
-+		vchiq_mmal_port_parameter_set(dev->instance,
-+					      &ctx->component->output[0],
-+						  MMAL_PARAMETER_JPEG_IJG_SCALING,
-+					      &enable,
-+					      sizeof(enable));
-+	}
-+
-+	setup_mmal_port_format(ctx, &ctx->q_data[V4L2_M2M_SRC],
-+			       &ctx->component->input[0]);
-+	ctx->component->input[0].cb_ctx = ctx;
-+
-+	setup_mmal_port_format(ctx, &ctx->q_data[V4L2_M2M_DST],
-+			       &ctx->component->output[0]);
-+	ctx->component->output[0].cb_ctx = ctx;
-+
-+	ret = vchiq_mmal_port_set_format(dev->instance,
-+					 &ctx->component->input[0]);
-+	if (ret < 0) {
-+		v4l2_dbg(1, debug, &dev->v4l2_dev,
-+			 "%s: vchiq_mmal_port_set_format ip port failed\n",
-+			 __func__);
-+		goto destroy_component;
-+	}
-+
-+	ret = vchiq_mmal_port_set_format(dev->instance,
-+					 &ctx->component->output[0]);
-+	if (ret < 0) {
-+		v4l2_dbg(1, debug, &dev->v4l2_dev,
-+			 "%s: vchiq_mmal_port_set_format op port failed\n",
-+			 __func__);
-+		goto destroy_component;
-+	}
-+
-+	if (dev->role == ENCODE || dev->role == ENCODE_IMAGE) {
-+		u32 param = 1;
-+
-+		if (ctx->q_data[V4L2_M2M_SRC].sizeimage <
-+			ctx->component->output[0].minimum_buffer.size)
-+			v4l2_err(&dev->v4l2_dev, "buffer size mismatch sizeimage %u < min size %u\n",
-+				 ctx->q_data[V4L2_M2M_SRC].sizeimage,
-+				 ctx->component->output[0].minimum_buffer.size);
-+
-+		if (dev->role == ENCODE) {
-+			/* Enable SPS Timing header so framerate information is encoded
-+			 * in the H264 header.
-+			 */
-+			vchiq_mmal_port_parameter_set(ctx->dev->instance,
-+						      &ctx->component->output[0],
-+						      MMAL_PARAMETER_VIDEO_ENCODE_SPS_TIMING,
-+						      &param, sizeof(param));
-+
-+			/* Enable inserting headers into the first frame */
-+			vchiq_mmal_port_parameter_set(ctx->dev->instance,
-+						      &ctx->component->control,
-+						      MMAL_PARAMETER_VIDEO_ENCODE_HEADERS_WITH_FRAME,
-+						      &param, sizeof(param));
-+			/*
-+			 * Avoid fragmenting the buffers over multiple frames (unless
-+			 * the frame is bigger than the whole buffer)
-+			 */
-+			vchiq_mmal_port_parameter_set(ctx->dev->instance,
-+						      &ctx->component->control,
-+						      MMAL_PARAMETER_MINIMISE_FRAGMENTATION,
-+						      &param, sizeof(param));
-+		}
-+	} else {
-+		if (ctx->q_data[V4L2_M2M_DST].sizeimage <
-+			ctx->component->output[0].minimum_buffer.size)
-+			v4l2_err(&dev->v4l2_dev, "buffer size mismatch sizeimage %u < min size %u\n",
-+				 ctx->q_data[V4L2_M2M_DST].sizeimage,
-+				 ctx->component->output[0].minimum_buffer.size);
-+	}
-+
-+	/* Now we have a component we can set all the ctrls */
-+	ret = v4l2_ctrl_handler_setup(&ctx->hdl);
-+
-+	v4l2_dbg(2, debug, &dev->v4l2_dev, "%s: component created as %s\n",
-+		 __func__, components[dev->role]);
-+
-+	return 0;
-+
-+destroy_component:
-+	vchiq_mmal_component_finalise(ctx->dev->instance, ctx->component);
-+	ctx->component = NULL;
-+
-+	return ret;
-+}
-+
-+/*
-+ * Queue operations
-+ */
-+
-+static int bcm2835_codec_queue_setup(struct vb2_queue *vq,
-+				     unsigned int *nbuffers,
-+				     unsigned int *nplanes,
-+				     unsigned int sizes[],
-+				     struct device *alloc_devs[])
-+{
-+	struct bcm2835_codec_ctx *ctx = vb2_get_drv_priv(vq);
-+	struct bcm2835_codec_q_data *q_data;
-+	struct vchiq_mmal_port *port;
-+	unsigned int size;
-+
-+	q_data = get_q_data(ctx, vq->type);
-+	if (!q_data)
-+		return -EINVAL;
-+
-+	if (!ctx->component)
-+		if (bcm2835_codec_create_component(ctx))
-+			return -EINVAL;
-+
-+	port = get_port_data(ctx, vq->type);
-+
-+	size = q_data->sizeimage;
-+
-+	if (*nplanes)
-+		return sizes[0] < size ? -EINVAL : 0;
-+
-+	*nplanes = 1;
-+
-+	sizes[0] = size;
-+	port->current_buffer.size = size;
-+
-+	if (*nbuffers < port->minimum_buffer.num)
-+		*nbuffers = port->minimum_buffer.num;
-+	/* Add one buffer to take an EOS */
-+	port->current_buffer.num = *nbuffers + 1;
-+
-+	return 0;
-+}
-+
-+static int bcm2835_codec_mmal_buf_cleanup(struct mmal_buffer *mmal_buf)
-+{
-+	mmal_vchi_buffer_cleanup(mmal_buf);
-+
-+	if (mmal_buf->dma_buf) {
-+		dma_buf_put(mmal_buf->dma_buf);
-+		mmal_buf->dma_buf = NULL;
-+	}
-+
-+	return 0;
-+}
-+
-+static int bcm2835_codec_buf_init(struct vb2_buffer *vb)
-+{
-+	struct bcm2835_codec_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
-+	struct vb2_v4l2_buffer *vb2 = to_vb2_v4l2_buffer(vb);
-+	struct v4l2_m2m_buffer *m2m = container_of(vb2, struct v4l2_m2m_buffer,
-+						   vb);
-+	struct m2m_mmal_buffer *buf = container_of(m2m, struct m2m_mmal_buffer,
-+						   m2m);
-+
-+	v4l2_dbg(2, debug, &ctx->dev->v4l2_dev, "%s: ctx:%p, vb %p\n",
-+		 __func__, ctx, vb);
-+	buf->mmal.buffer = vb2_plane_vaddr(&buf->m2m.vb.vb2_buf, 0);
-+	buf->mmal.buffer_size = vb2_plane_size(&buf->m2m.vb.vb2_buf, 0);
-+
-+	mmal_vchi_buffer_init(ctx->dev->instance, &buf->mmal);
-+
-+	return 0;
-+}
-+
-+static int bcm2835_codec_buf_prepare(struct vb2_buffer *vb)
-+{
-+	struct bcm2835_codec_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
-+	struct bcm2835_codec_q_data *q_data;
-+	struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
-+	struct v4l2_m2m_buffer *m2m = container_of(vbuf, struct v4l2_m2m_buffer,
-+						   vb);
-+	struct m2m_mmal_buffer *buf = container_of(m2m, struct m2m_mmal_buffer,
-+						   m2m);
-+	struct dma_buf *dma_buf;
-+	int ret;
-+
-+	v4l2_dbg(4, debug, &ctx->dev->v4l2_dev, "%s: type: %d ptr %p\n",
-+		 __func__, vb->vb2_queue->type, vb);
-+
-+	q_data = get_q_data(ctx, vb->vb2_queue->type);
-+	if (V4L2_TYPE_IS_OUTPUT(vb->vb2_queue->type)) {
-+		if (vbuf->field == V4L2_FIELD_ANY)
-+			vbuf->field = V4L2_FIELD_NONE;
-+	}
-+
-+	if (vb2_plane_size(vb, 0) < q_data->sizeimage) {
-+		v4l2_err(&ctx->dev->v4l2_dev, "%s data will not fit into plane (%lu < %lu)\n",
-+			 __func__, vb2_plane_size(vb, 0),
-+			 (long)q_data->sizeimage);
-+		return -EINVAL;
-+	}
-+
-+	if (!V4L2_TYPE_IS_OUTPUT(vb->vb2_queue->type))
-+		vb2_set_plane_payload(vb, 0, q_data->sizeimage);
-+
-+	switch (vb->memory) {
-+	case VB2_MEMORY_DMABUF:
-+		dma_buf = dma_buf_get(vb->planes[0].m.fd);
-+
-+		if (dma_buf != buf->mmal.dma_buf) {
-+			/* dmabuf either hasn't already been mapped, or it has
-+			 * changed.
-+			 */
-+			if (buf->mmal.dma_buf) {
-+				v4l2_err(&ctx->dev->v4l2_dev,
-+					 "%s Buffer changed - why did the core not call cleanup?\n",
-+					 __func__);
-+				bcm2835_codec_mmal_buf_cleanup(&buf->mmal);
-+			}
-+
-+			buf->mmal.dma_buf = dma_buf;
-+		} else {
-+			/* We already have a reference count on the dmabuf, so
-+			 * release the one we acquired above.
-+			 */
-+			dma_buf_put(dma_buf);
-+		}
-+		ret = 0;
-+		break;
-+	case VB2_MEMORY_MMAP:
-+		/*
-+		 * We want to do this at init, but vb2_core_expbuf checks that
-+		 * the index < q->num_buffers, and q->num_buffers only gets
-+		 * updated once all the buffers are allocated.
-+		 */
-+		if (!buf->mmal.dma_buf) {
-+			ret = vb2_core_expbuf_dmabuf(vb->vb2_queue,
-+						     vb->vb2_queue->type,
-+						     vb->index, 0,
-+						     O_CLOEXEC,
-+						     &buf->mmal.dma_buf);
-+			if (ret)
-+				v4l2_err(&ctx->dev->v4l2_dev,
-+					 "%s: Failed to expbuf idx %d, ret %d\n",
-+					 __func__, vb->index, ret);
-+		} else {
-+			ret = 0;
-+		}
-+		break;
-+	default:
-+		ret = -EINVAL;
-+		break;
-+	}
-+
-+	return ret;
-+}
-+
-+static void bcm2835_codec_buf_queue(struct vb2_buffer *vb)
-+{
-+	struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
-+	struct bcm2835_codec_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
-+
-+	v4l2_dbg(4, debug, &ctx->dev->v4l2_dev, "%s: type: %d ptr %p vbuf->flags %u, seq %u, bytesused %u\n",
-+		 __func__, vb->vb2_queue->type, vb, vbuf->flags, vbuf->sequence,
-+		 vb->planes[0].bytesused);
-+	v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vbuf);
-+}
-+
-+static void bcm2835_codec_buffer_cleanup(struct vb2_buffer *vb)
-+{
-+	struct bcm2835_codec_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
-+	struct vb2_v4l2_buffer *vb2 = to_vb2_v4l2_buffer(vb);
-+	struct v4l2_m2m_buffer *m2m = container_of(vb2, struct v4l2_m2m_buffer,
-+						   vb);
-+	struct m2m_mmal_buffer *buf = container_of(m2m, struct m2m_mmal_buffer,
-+						   m2m);
-+
-+	v4l2_dbg(2, debug, &ctx->dev->v4l2_dev, "%s: ctx:%p, vb %p\n",
-+		 __func__, ctx, vb);
-+
-+	bcm2835_codec_mmal_buf_cleanup(&buf->mmal);
-+}
-+
-+static void bcm2835_codec_flush_buffers(struct bcm2835_codec_ctx *ctx,
-+					struct vchiq_mmal_port *port)
-+{
-+	int ret;
-+
-+	if (atomic_read(&port->buffers_with_vpu)) {
-+		v4l2_dbg(1, debug, &ctx->dev->v4l2_dev, "%s: Waiting for buffers to be returned - %d outstanding\n",
-+			 __func__, atomic_read(&port->buffers_with_vpu));
-+		ret = wait_for_completion_timeout(&ctx->frame_cmplt,
-+						  COMPLETE_TIMEOUT);
-+		if (ret <= 0) {
-+			v4l2_err(&ctx->dev->v4l2_dev, "%s: Timeout waiting for buffers to be returned - %d outstanding\n",
-+				 __func__,
-+				 atomic_read(&port->buffers_with_vpu));
-+		}
-+	}
-+}
-+static int bcm2835_codec_start_streaming(struct vb2_queue *q,
-+					 unsigned int count)
-+{
-+	struct bcm2835_codec_ctx *ctx = vb2_get_drv_priv(q);
-+	struct bcm2835_codec_dev *dev = ctx->dev;
-+	struct bcm2835_codec_q_data *q_data = get_q_data(ctx, q->type);
-+	struct vchiq_mmal_port *port = get_port_data(ctx, q->type);
-+	int ret = 0;
-+
-+	v4l2_dbg(1, debug, &ctx->dev->v4l2_dev, "%s: type: %d count %d\n",
-+		 __func__, q->type, count);
-+	q_data->sequence = 0;
-+
-+	if (!ctx->component_enabled) {
-+		ret = vchiq_mmal_component_enable(dev->instance,
-+						  ctx->component);
-+		if (ret)
-+			v4l2_err(&ctx->dev->v4l2_dev, "%s: Failed enabling component, ret %d\n",
-+				 __func__, ret);
-+		ctx->component_enabled = true;
-+	}
-+
-+	if (port->enabled) {
-+		unsigned int num_buffers;
-+
-+		init_completion(&ctx->frame_cmplt);
-+
-+		/*
-+		 * This should only ever happen with DECODE and the MMAL output
-+		 * port that has been enabled for resolution changed events.
-+		 * In this case no buffers have been allocated or sent to the
-+		 * component, so warn on that.
-+		 */
-+		WARN_ON(ctx->dev->role != DECODE);
-+		WARN_ON(q->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE);
-+		WARN_ON(atomic_read(&port->buffers_with_vpu));
-+
-+		/*
-+		 * Disable will reread the port format, so retain buffer count.
-+		 */
-+		num_buffers = port->current_buffer.num;
-+
-+		ret = vchiq_mmal_port_disable(dev->instance, port);
-+		if (ret)
-+			v4l2_err(&ctx->dev->v4l2_dev, "%s: Error disabling port update buffer count, ret %d\n",
-+				 __func__, ret);
-+		bcm2835_codec_flush_buffers(ctx, port);
-+		port->current_buffer.num = num_buffers;
-+	}
-+
-+	if (count < port->minimum_buffer.num)
-+		count = port->minimum_buffer.num;
-+
-+	if (port->current_buffer.num < count + 1) {
-+		v4l2_dbg(2, debug, &ctx->dev->v4l2_dev, "%s: ctx:%p, buffer count changed %u to %u\n",
-+			 __func__, ctx, port->current_buffer.num, count + 1);
-+
-+		port->current_buffer.num = count + 1;
-+		ret = vchiq_mmal_port_set_format(dev->instance, port);
-+		if (ret)
-+			v4l2_err(&ctx->dev->v4l2_dev, "%s: Error updating buffer count, ret %d\n",
-+				 __func__, ret);
-+	}
-+
-+	if (dev->role == DECODE &&
-+	    q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE &&
-+	    !ctx->component->output[0].enabled) {
-+		/*
-+		 * Decode needs to enable the MMAL output/V4L2 CAPTURE
-+		 * port at this point too so that we have everything
-+		 * set up for dynamic resolution changes.
-+		 */
-+		ret = vchiq_mmal_port_enable(dev->instance,
-+					     &ctx->component->output[0],
-+					     op_buffer_cb);
-+		if (ret)
-+			v4l2_err(&ctx->dev->v4l2_dev, "%s: Failed enabling o/p port, ret %d\n",
-+				 __func__, ret);
-+	}
-+
-+	if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
-+		/*
-+		 * Create the EOS buffer.
-+		 * We only need the MMAL part, and want to NOT attach a memory
-+		 * buffer to it as it should only take flags.
-+		 */
-+		memset(&q_data->eos_buffer, 0, sizeof(q_data->eos_buffer));
-+		mmal_vchi_buffer_init(dev->instance,
-+				      &q_data->eos_buffer.mmal);
-+		q_data->eos_buffer_in_use = false;
-+
-+		ret = vchiq_mmal_port_enable(dev->instance,
-+					     port,
-+					     ip_buffer_cb);
-+		if (ret)
-+			v4l2_err(&ctx->dev->v4l2_dev, "%s: Failed enabling i/p port, ret %d\n",
-+				 __func__, ret);
-+	} else {
-+		if (!port->enabled) {
-+			ret = vchiq_mmal_port_enable(dev->instance,
-+						     port,
-+						     op_buffer_cb);
-+			if (ret)
-+				v4l2_err(&ctx->dev->v4l2_dev, "%s: Failed enabling o/p port, ret %d\n",
-+					 __func__, ret);
-+		}
-+	}
-+	v4l2_dbg(1, debug, &ctx->dev->v4l2_dev, "%s: Done, ret %d\n",
-+		 __func__, ret);
-+	return ret;
-+}
-+
-+static void bcm2835_codec_stop_streaming(struct vb2_queue *q)
-+{
-+	struct bcm2835_codec_ctx *ctx = vb2_get_drv_priv(q);
-+	struct bcm2835_codec_dev *dev = ctx->dev;
-+	struct bcm2835_codec_q_data *q_data = get_q_data(ctx, q->type);
-+	struct vchiq_mmal_port *port = get_port_data(ctx, q->type);
-+	struct vb2_v4l2_buffer *vbuf;
-+	int ret;
-+
-+	v4l2_dbg(1, debug, &ctx->dev->v4l2_dev, "%s: type: %d - return buffers\n",
-+		 __func__, q->type);
-+
-+	init_completion(&ctx->frame_cmplt);
-+
-+	/* Clear out all buffers held by m2m framework */
-+	for (;;) {
-+		if (V4L2_TYPE_IS_OUTPUT(q->type))
-+			vbuf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
-+		else
-+			vbuf = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
-+		if (!vbuf)
-+			break;
-+		v4l2_dbg(1, debug, &ctx->dev->v4l2_dev, "%s: return buffer %p\n",
-+			 __func__, vbuf);
-+
-+		v4l2_m2m_buf_done(vbuf, VB2_BUF_STATE_QUEUED);
-+	}
-+
-+	/* Disable MMAL port - this will flush buffers back */
-+	ret = vchiq_mmal_port_disable(dev->instance, port);
-+	if (ret)
-+		v4l2_err(&ctx->dev->v4l2_dev, "%s: Failed disabling %s port, ret %d\n",
-+			 __func__, V4L2_TYPE_IS_OUTPUT(q->type) ? "i/p" : "o/p",
-+			 ret);
-+
-+	bcm2835_codec_flush_buffers(ctx, port);
-+
-+	if (dev->role == DECODE &&
-+	    q->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE &&
-+	    ctx->component->input[0].enabled) {
-+		/*
-+		 * For decode we need to keep the MMAL output port enabled for
-+		 * resolution changed events whenever the input is enabled.
-+		 */
-+		ret = vchiq_mmal_port_enable(dev->instance,
-+					     &ctx->component->output[0],
-+					     op_buffer_cb);
-+		if (ret)
-+			v4l2_err(&ctx->dev->v4l2_dev, "%s: Failed enabling o/p port, ret %d\n",
-+				 __func__, ret);
-+	}
-+
-+	/* If both ports disabled, then disable the component */
-+	if (ctx->component_enabled &&
-+	    !ctx->component->input[0].enabled &&
-+	    !ctx->component->output[0].enabled) {
-+		ret = vchiq_mmal_component_disable(dev->instance,
-+						   ctx->component);
-+		if (ret)
-+			v4l2_err(&ctx->dev->v4l2_dev, "%s: Failed enabling component, ret %d\n",
-+				 __func__, ret);
-+		ctx->component_enabled = false;
-+	}
-+
-+	if (V4L2_TYPE_IS_OUTPUT(q->type))
-+		mmal_vchi_buffer_cleanup(&q_data->eos_buffer.mmal);
-+
-+	v4l2_dbg(1, debug, &ctx->dev->v4l2_dev, "%s: done\n", __func__);
-+}
-+
-+static const struct vb2_ops bcm2835_codec_qops = {
-+	.queue_setup	 = bcm2835_codec_queue_setup,
-+	.buf_init	 = bcm2835_codec_buf_init,
-+	.buf_prepare	 = bcm2835_codec_buf_prepare,
-+	.buf_queue	 = bcm2835_codec_buf_queue,
-+	.buf_cleanup	 = bcm2835_codec_buffer_cleanup,
-+	.start_streaming = bcm2835_codec_start_streaming,
-+	.stop_streaming  = bcm2835_codec_stop_streaming,
-+	.wait_prepare	 = vb2_ops_wait_prepare,
-+	.wait_finish	 = vb2_ops_wait_finish,
-+};
-+
-+static int queue_init(void *priv, struct vb2_queue *src_vq,
-+		      struct vb2_queue *dst_vq)
-+{
-+	struct bcm2835_codec_ctx *ctx = priv;
-+	int ret;
-+
-+	src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
-+	src_vq->io_modes = VB2_MMAP | VB2_DMABUF;
-+	src_vq->drv_priv = ctx;
-+	src_vq->buf_struct_size = sizeof(struct m2m_mmal_buffer);
-+	src_vq->ops = &bcm2835_codec_qops;
-+	src_vq->mem_ops = &vb2_dma_contig_memops;
-+	src_vq->dev = &ctx->dev->pdev->dev;
-+	src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
-+	src_vq->lock = &ctx->dev->dev_mutex;
-+
-+	ret = vb2_queue_init(src_vq);
-+	if (ret)
-+		return ret;
-+
-+	dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
-+	dst_vq->io_modes = VB2_MMAP | VB2_DMABUF;
-+	dst_vq->drv_priv = ctx;
-+	dst_vq->buf_struct_size = sizeof(struct m2m_mmal_buffer);
-+	dst_vq->ops = &bcm2835_codec_qops;
-+	dst_vq->mem_ops = &vb2_dma_contig_memops;
-+	dst_vq->dev = &ctx->dev->pdev->dev;
-+	dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
-+	dst_vq->lock = &ctx->dev->dev_mutex;
-+
-+	return vb2_queue_init(dst_vq);
-+}
-+
-+/*
-+ * File operations
-+ */
-+static int bcm2835_codec_open(struct file *file)
-+{
-+	struct bcm2835_codec_dev *dev = video_drvdata(file);
-+	struct bcm2835_codec_ctx *ctx = NULL;
-+	struct v4l2_ctrl_handler *hdl;
-+	int rc = 0;
-+
-+	if (mutex_lock_interruptible(&dev->dev_mutex)) {
-+		v4l2_err(&dev->v4l2_dev, "Mutex fail\n");
-+		return -ERESTARTSYS;
-+	}
-+	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
-+	if (!ctx) {
-+		rc = -ENOMEM;
-+		goto open_unlock;
-+	}
-+
-+	ctx->q_data[V4L2_M2M_SRC].fmt = get_default_format(dev, false);
-+	ctx->q_data[V4L2_M2M_DST].fmt = get_default_format(dev, true);
-+
-+	ctx->q_data[V4L2_M2M_SRC].crop_width = DEFAULT_WIDTH;
-+	ctx->q_data[V4L2_M2M_SRC].crop_height = DEFAULT_HEIGHT;
-+	ctx->q_data[V4L2_M2M_SRC].height = DEFAULT_HEIGHT;
-+	ctx->q_data[V4L2_M2M_SRC].bytesperline =
-+			get_bytesperline(DEFAULT_WIDTH, DEFAULT_HEIGHT,
-+					 ctx->q_data[V4L2_M2M_SRC].fmt,
-+					 dev->role);
-+	ctx->q_data[V4L2_M2M_SRC].sizeimage =
-+		get_sizeimage(ctx->q_data[V4L2_M2M_SRC].bytesperline,
-+			      ctx->q_data[V4L2_M2M_SRC].crop_width,
-+			      ctx->q_data[V4L2_M2M_SRC].height,
-+			      ctx->q_data[V4L2_M2M_SRC].fmt);
-+	ctx->q_data[V4L2_M2M_SRC].field = V4L2_FIELD_NONE;
-+
-+	ctx->q_data[V4L2_M2M_DST].crop_width = DEFAULT_WIDTH;
-+	ctx->q_data[V4L2_M2M_DST].crop_height = DEFAULT_HEIGHT;
-+	ctx->q_data[V4L2_M2M_DST].height = DEFAULT_HEIGHT;
-+	ctx->q_data[V4L2_M2M_DST].bytesperline =
-+			get_bytesperline(DEFAULT_WIDTH, DEFAULT_HEIGHT,
-+					 ctx->q_data[V4L2_M2M_DST].fmt,
-+					 dev->role);
-+	ctx->q_data[V4L2_M2M_DST].sizeimage =
-+		get_sizeimage(ctx->q_data[V4L2_M2M_DST].bytesperline,
-+			      ctx->q_data[V4L2_M2M_DST].crop_width,
-+			      ctx->q_data[V4L2_M2M_DST].height,
-+			      ctx->q_data[V4L2_M2M_DST].fmt);
-+	ctx->q_data[V4L2_M2M_DST].aspect_ratio.numerator = 1;
-+	ctx->q_data[V4L2_M2M_DST].aspect_ratio.denominator = 1;
-+	ctx->q_data[V4L2_M2M_DST].field = V4L2_FIELD_NONE;
-+
-+	ctx->colorspace = V4L2_COLORSPACE_REC709;
-+	ctx->bitrate = 10 * 1000 * 1000;
-+
-+	ctx->framerate_num = 30;
-+	ctx->framerate_denom = 1;
-+
-+	/* Initialise V4L2 contexts */
-+	v4l2_fh_init(&ctx->fh, video_devdata(file));
-+	file->private_data = &ctx->fh;
-+	ctx->dev = dev;
-+	hdl = &ctx->hdl;
-+	switch (dev->role) {
-+	case ENCODE:
-+	{
-+		/* Encode controls */
-+		v4l2_ctrl_handler_init(hdl, 11);
-+
-+		v4l2_ctrl_new_std_menu(hdl, &bcm2835_codec_ctrl_ops,
-+				       V4L2_CID_MPEG_VIDEO_BITRATE_MODE,
-+				       V4L2_MPEG_VIDEO_BITRATE_MODE_CBR, 0,
-+				       V4L2_MPEG_VIDEO_BITRATE_MODE_VBR);
-+		v4l2_ctrl_new_std(hdl, &bcm2835_codec_ctrl_ops,
-+				  V4L2_CID_MPEG_VIDEO_BITRATE,
-+				  25 * 1000, 25 * 1000 * 1000,
-+				  25 * 1000, 10 * 1000 * 1000);
-+		v4l2_ctrl_new_std_menu(hdl, &bcm2835_codec_ctrl_ops,
-+				       V4L2_CID_MPEG_VIDEO_HEADER_MODE,
-+				       V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME,
-+				       0, V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME);
-+		v4l2_ctrl_new_std(hdl, &bcm2835_codec_ctrl_ops,
-+				  V4L2_CID_MPEG_VIDEO_REPEAT_SEQ_HEADER,
-+				  0, 1,
-+				  1, 0);
-+		v4l2_ctrl_new_std(hdl, &bcm2835_codec_ctrl_ops,
-+				  V4L2_CID_MPEG_VIDEO_H264_I_PERIOD,
-+				  0, 0x7FFFFFFF,
-+				  1, 60);
-+		v4l2_ctrl_new_std_menu(hdl, &bcm2835_codec_ctrl_ops,
-+				       V4L2_CID_MPEG_VIDEO_H264_LEVEL,
-+				       V4L2_MPEG_VIDEO_H264_LEVEL_5_1,
-+				       ~(BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_0) |
-+					 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1B) |
-+					 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_1) |
-+					 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_2) |
-+					 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_3) |
-+					 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_0) |
-+					 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_1) |
-+					 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_2) |
-+					 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_0) |
-+					 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_1) |
-+					 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_2) |
-+					 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_4_0) |
-+					 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_4_1) |
-+					 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_4_2) |
-+					 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_5_0) |
-+					 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_5_1)),
-+				       V4L2_MPEG_VIDEO_H264_LEVEL_4_0);
-+		v4l2_ctrl_new_std_menu(hdl, &bcm2835_codec_ctrl_ops,
-+				       V4L2_CID_MPEG_VIDEO_H264_PROFILE,
-+				       V4L2_MPEG_VIDEO_H264_PROFILE_HIGH,
-+				       ~(BIT(V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE) |
-+					 BIT(V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE) |
-+					 BIT(V4L2_MPEG_VIDEO_H264_PROFILE_MAIN) |
-+					 BIT(V4L2_MPEG_VIDEO_H264_PROFILE_HIGH)),
-+					V4L2_MPEG_VIDEO_H264_PROFILE_HIGH);
-+		v4l2_ctrl_new_std(hdl, &bcm2835_codec_ctrl_ops,
-+				  V4L2_CID_MPEG_VIDEO_H264_MIN_QP,
-+				  0, 51,
-+				  1, 20);
-+		v4l2_ctrl_new_std(hdl, &bcm2835_codec_ctrl_ops,
-+				  V4L2_CID_MPEG_VIDEO_H264_MAX_QP,
-+				  0, 51,
-+				  1, 51);
-+		v4l2_ctrl_new_std(hdl, &bcm2835_codec_ctrl_ops,
-+				  V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME,
-+				  0, 0, 0, 0);
-+		if (hdl->error) {
-+			rc = hdl->error;
-+			goto free_ctrl_handler;
-+		}
-+		ctx->fh.ctrl_handler = hdl;
-+		v4l2_ctrl_handler_setup(hdl);
-+	}
-+	break;
-+	case DECODE:
-+	{
-+		v4l2_ctrl_handler_init(hdl, 1);
-+
-+		v4l2_ctrl_new_std(hdl, &bcm2835_codec_ctrl_ops,
-+				  V4L2_CID_MIN_BUFFERS_FOR_CAPTURE,
-+				  1, 1, 1, 1);
-+		if (hdl->error) {
-+			rc = hdl->error;
-+			goto free_ctrl_handler;
-+		}
-+		ctx->fh.ctrl_handler = hdl;
-+		v4l2_ctrl_handler_setup(hdl);
-+	}
-+	break;
-+	case ISP:
-+	{
-+		v4l2_ctrl_handler_init(hdl, 2);
-+
-+		v4l2_ctrl_new_std(hdl, &bcm2835_codec_ctrl_ops,
-+				  V4L2_CID_HFLIP,
-+				  1, 0, 1, 0);
-+		v4l2_ctrl_new_std(hdl, &bcm2835_codec_ctrl_ops,
-+				  V4L2_CID_VFLIP,
-+				  1, 0, 1, 0);
-+		if (hdl->error) {
-+			rc = hdl->error;
-+			goto free_ctrl_handler;
-+		}
-+		ctx->fh.ctrl_handler = hdl;
-+		v4l2_ctrl_handler_setup(hdl);
-+	}
-+	break;
-+	case DEINTERLACE:
-+	{
-+		v4l2_ctrl_handler_init(hdl, 0);
-+	}
-+	break;
-+	case ENCODE_IMAGE:
-+	{
-+		/* Encode image controls */
-+		v4l2_ctrl_handler_init(hdl, 1);
-+
-+		v4l2_ctrl_new_std(hdl, &bcm2835_codec_ctrl_ops,
-+				  V4L2_CID_JPEG_COMPRESSION_QUALITY,
-+				  1, 100,
-+				  1, 80);
-+		if (hdl->error) {
-+			rc = hdl->error;
-+			goto free_ctrl_handler;
-+		}
-+		ctx->fh.ctrl_handler = hdl;
-+		v4l2_ctrl_handler_setup(hdl);
-+	}
-+	break;
-+	case NUM_ROLES:
-+	break;
-+	}
-+
-+	ctx->fh.m2m_ctx = v4l2_m2m_ctx_init(dev->m2m_dev, ctx, &queue_init);
-+
-+	if (IS_ERR(ctx->fh.m2m_ctx)) {
-+		rc = PTR_ERR(ctx->fh.m2m_ctx);
-+
-+		goto free_ctrl_handler;
-+	}
-+
-+	/* Set both queues as buffered as we have buffering in the VPU. That
-+	 * means that we will be scheduled whenever either an input or output
-+	 * buffer is available (otherwise one of each are required).
-+	 */
-+	v4l2_m2m_set_src_buffered(ctx->fh.m2m_ctx, true);
-+	v4l2_m2m_set_dst_buffered(ctx->fh.m2m_ctx, true);
-+
-+	v4l2_fh_add(&ctx->fh);
-+	atomic_inc(&dev->num_inst);
-+
-+	mutex_unlock(&dev->dev_mutex);
-+	return 0;
-+
-+free_ctrl_handler:
-+	v4l2_ctrl_handler_free(hdl);
-+	kfree(ctx);
-+open_unlock:
-+	mutex_unlock(&dev->dev_mutex);
-+	return rc;
-+}
-+
-+static int bcm2835_codec_release(struct file *file)
-+{
-+	struct bcm2835_codec_dev *dev = video_drvdata(file);
-+	struct bcm2835_codec_ctx *ctx = file2ctx(file);
-+
-+	v4l2_dbg(1, debug, &dev->v4l2_dev, "%s: Releasing instance %p\n",
-+		 __func__, ctx);
-+
-+	v4l2_fh_del(&ctx->fh);
-+	v4l2_fh_exit(&ctx->fh);
-+	v4l2_ctrl_handler_free(&ctx->hdl);
-+	mutex_lock(&dev->dev_mutex);
-+	v4l2_m2m_ctx_release(ctx->fh.m2m_ctx);
-+
-+	if (ctx->component)
-+		vchiq_mmal_component_finalise(dev->instance, ctx->component);
-+
-+	mutex_unlock(&dev->dev_mutex);
-+	kfree(ctx);
-+
-+	atomic_dec(&dev->num_inst);
-+
-+	return 0;
-+}
-+
-+static const struct v4l2_file_operations bcm2835_codec_fops = {
-+	.owner		= THIS_MODULE,
-+	.open		= bcm2835_codec_open,
-+	.release	= bcm2835_codec_release,
-+	.poll		= v4l2_m2m_fop_poll,
-+	.unlocked_ioctl	= video_ioctl2,
-+	.mmap		= v4l2_m2m_fop_mmap,
-+};
-+
-+static const struct video_device bcm2835_codec_videodev = {
-+	.name		= MEM2MEM_NAME,
-+	.vfl_dir	= VFL_DIR_M2M,
-+	.fops		= &bcm2835_codec_fops,
-+	.ioctl_ops	= &bcm2835_codec_ioctl_ops,
-+	.minor		= -1,
-+	.release	= video_device_release_empty,
-+};
-+
-+static const struct v4l2_m2m_ops m2m_ops = {
-+	.device_run	= device_run,
-+	.job_ready	= job_ready,
-+	.job_abort	= job_abort,
-+};
-+
-+/* Size of the array to provide to the VPU when asking for the list of supported
-+ * formats.
-+ * The ISP component currently advertises 62 input formats, so add a small
-+ * overhead on that.
-+ */
-+#define MAX_SUPPORTED_ENCODINGS 70
-+
-+/* Populate dev->supported_fmts with the formats supported by those ports. */
-+static int bcm2835_codec_get_supported_fmts(struct bcm2835_codec_dev *dev)
-+{
-+	struct bcm2835_codec_fmt *list;
-+	struct vchiq_mmal_component *component;
-+	u32 fourccs[MAX_SUPPORTED_ENCODINGS];
-+	u32 param_size = sizeof(fourccs);
-+	unsigned int i, j, num_encodings;
-+	int ret;
-+
-+	ret = vchiq_mmal_component_init(dev->instance, components[dev->role],
-+					&component);
-+	if (ret < 0) {
-+		v4l2_err(&dev->v4l2_dev, "%s: failed to create component %s\n",
-+			 __func__, components[dev->role]);
-+		return -ENOMEM;
-+	}
-+
-+	ret = vchiq_mmal_port_parameter_get(dev->instance,
-+					    &component->input[0],
-+					    MMAL_PARAMETER_SUPPORTED_ENCODINGS,
-+					    &fourccs,
-+					    &param_size);
-+
-+	if (ret) {
-+		if (ret == MMAL_MSG_STATUS_ENOSPC) {
-+			v4l2_err(&dev->v4l2_dev,
-+				 "%s: port has more encodings than we provided space for. Some are dropped (%zu vs %u).\n",
-+				 __func__, param_size / sizeof(u32),
-+				 MAX_SUPPORTED_ENCODINGS);
-+			num_encodings = MAX_SUPPORTED_ENCODINGS;
-+		} else {
-+			v4l2_err(&dev->v4l2_dev, "%s: get_param ret %u.\n",
-+				 __func__, ret);
-+			ret = -EINVAL;
-+			goto destroy_component;
-+		}
-+	} else {
-+		num_encodings = param_size / sizeof(u32);
-+	}
-+
-+	/* Assume at this stage that all encodings will be supported in V4L2.
-+	 * Any that aren't supported will waste a very small amount of memory.
-+	 */
-+	list = devm_kzalloc(&dev->pdev->dev,
-+			    sizeof(struct bcm2835_codec_fmt) * num_encodings,
-+			    GFP_KERNEL);
-+	if (!list) {
-+		ret = -ENOMEM;
-+		goto destroy_component;
-+	}
-+	dev->supported_fmts[0].list = list;
-+
-+	for (i = 0, j = 0; i < num_encodings; i++) {
-+		const struct bcm2835_codec_fmt *fmt = get_fmt(fourccs[i]);
-+
-+		if (fmt) {
-+			list[j] = *fmt;
-+			j++;
-+		}
-+	}
-+	dev->supported_fmts[0].num_entries = j;
-+
-+	param_size = sizeof(fourccs);
-+	ret = vchiq_mmal_port_parameter_get(dev->instance,
-+					    &component->output[0],
-+					    MMAL_PARAMETER_SUPPORTED_ENCODINGS,
-+					    &fourccs,
-+					    &param_size);
-+
-+	if (ret) {
-+		if (ret == MMAL_MSG_STATUS_ENOSPC) {
-+			v4l2_err(&dev->v4l2_dev,
-+				 "%s: port has more encodings than we provided space for. Some are dropped (%zu vs %u).\n",
-+				 __func__, param_size / sizeof(u32),
-+				 MAX_SUPPORTED_ENCODINGS);
-+			num_encodings = MAX_SUPPORTED_ENCODINGS;
-+		} else {
-+			ret = -EINVAL;
-+			goto destroy_component;
-+		}
-+	} else {
-+		num_encodings = param_size / sizeof(u32);
-+	}
-+	/* Assume at this stage that all encodings will be supported in V4L2. */
-+	list = devm_kzalloc(&dev->pdev->dev,
-+			    sizeof(struct bcm2835_codec_fmt) * num_encodings,
-+			    GFP_KERNEL);
-+	if (!list) {
-+		ret = -ENOMEM;
-+		goto destroy_component;
-+	}
-+	dev->supported_fmts[1].list = list;
-+
-+	for (i = 0, j = 0; i < num_encodings; i++) {
-+		const struct bcm2835_codec_fmt *fmt = get_fmt(fourccs[i]);
-+
-+		if (fmt) {
-+			list[j] = *fmt;
-+			j++;
-+		}
-+	}
-+	dev->supported_fmts[1].num_entries = j;
-+
-+	ret = 0;
-+
-+destroy_component:
-+	vchiq_mmal_component_finalise(dev->instance, component);
-+
-+	return ret;
-+}
-+
-+static int bcm2835_codec_create(struct bcm2835_codec_driver *drv,
-+				struct bcm2835_codec_dev **new_dev,
-+				enum bcm2835_codec_role role)
-+{
-+	struct platform_device *pdev = drv->pdev;
-+	struct bcm2835_codec_dev *dev;
-+	struct video_device *vfd;
-+	int function;
-+	int video_nr;
-+	int ret;
-+
-+	dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
-+	if (!dev)
-+		return -ENOMEM;
-+
-+	dev->pdev = pdev;
-+
-+	dev->role = role;
-+
-+	ret = vchiq_mmal_init(&dev->instance);
-+	if (ret)
-+		return ret;
-+
-+	ret = bcm2835_codec_get_supported_fmts(dev);
-+	if (ret)
-+		goto vchiq_finalise;
-+
-+	atomic_set(&dev->num_inst, 0);
-+	mutex_init(&dev->dev_mutex);
-+
-+	/* Initialise the video device */
-+	dev->vfd = bcm2835_codec_videodev;
-+
-+	vfd = &dev->vfd;
-+	vfd->lock = &dev->dev_mutex;
-+	vfd->v4l2_dev = &dev->v4l2_dev;
-+	vfd->device_caps = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING;
-+	vfd->v4l2_dev->mdev = &drv->mdev;
-+
-+	ret = v4l2_device_register(&pdev->dev, &dev->v4l2_dev);
-+	if (ret)
-+		goto vchiq_finalise;
-+
-+	switch (role) {
-+	case DECODE:
-+		v4l2_disable_ioctl(vfd, VIDIOC_ENCODER_CMD);
-+		v4l2_disable_ioctl(vfd, VIDIOC_TRY_ENCODER_CMD);
-+		v4l2_disable_ioctl(vfd, VIDIOC_S_PARM);
-+		v4l2_disable_ioctl(vfd, VIDIOC_G_PARM);
-+		function = MEDIA_ENT_F_PROC_VIDEO_DECODER;
-+		video_nr = decode_video_nr;
-+		break;
-+	case ENCODE:
-+		v4l2_disable_ioctl(vfd, VIDIOC_DECODER_CMD);
-+		v4l2_disable_ioctl(vfd, VIDIOC_TRY_DECODER_CMD);
-+		function = MEDIA_ENT_F_PROC_VIDEO_ENCODER;
-+		video_nr = encode_video_nr;
-+		break;
-+	case ISP:
-+		v4l2_disable_ioctl(vfd, VIDIOC_DECODER_CMD);
-+		v4l2_disable_ioctl(vfd, VIDIOC_TRY_DECODER_CMD);
-+		v4l2_disable_ioctl(vfd, VIDIOC_S_PARM);
-+		v4l2_disable_ioctl(vfd, VIDIOC_G_PARM);
-+		function = MEDIA_ENT_F_PROC_VIDEO_SCALER;
-+		video_nr = isp_video_nr;
-+		break;
-+	case DEINTERLACE:
-+		v4l2_disable_ioctl(vfd, VIDIOC_DECODER_CMD);
-+		v4l2_disable_ioctl(vfd, VIDIOC_TRY_DECODER_CMD);
-+		v4l2_disable_ioctl(vfd, VIDIOC_S_PARM);
-+		v4l2_disable_ioctl(vfd, VIDIOC_G_PARM);
-+		function = MEDIA_ENT_F_PROC_VIDEO_PIXEL_FORMATTER;
-+		video_nr = deinterlace_video_nr;
-+		break;
-+	case ENCODE_IMAGE:
-+		v4l2_disable_ioctl(vfd, VIDIOC_DECODER_CMD);
-+		v4l2_disable_ioctl(vfd, VIDIOC_TRY_DECODER_CMD);
-+		function = MEDIA_ENT_F_PROC_VIDEO_ENCODER;
-+		video_nr = encode_image_nr;
-+		break;
-+	default:
-+		ret = -EINVAL;
-+		goto unreg_dev;
-+	}
-+
-+	ret = video_register_device(vfd, VFL_TYPE_VIDEO, video_nr);
-+	if (ret) {
-+		v4l2_err(&dev->v4l2_dev, "Failed to register video device\n");
-+		goto unreg_dev;
-+	}
-+
-+	video_set_drvdata(vfd, dev);
-+	snprintf(vfd->name, sizeof(vfd->name), "%s-%s",
-+		 bcm2835_codec_videodev.name, roles[role]);
-+	v4l2_info(&dev->v4l2_dev, "Device registered as /dev/video%d\n",
-+		  vfd->num);
-+
-+	*new_dev = dev;
-+
-+	dev->m2m_dev = v4l2_m2m_init(&m2m_ops);
-+	if (IS_ERR(dev->m2m_dev)) {
-+		v4l2_err(&dev->v4l2_dev, "Failed to init mem2mem device\n");
-+		ret = PTR_ERR(dev->m2m_dev);
-+		goto err_m2m;
-+	}
-+
-+	ret = v4l2_m2m_register_media_controller(dev->m2m_dev, vfd, function);
-+	if (ret)
-+		goto err_m2m;
-+
-+	v4l2_info(&dev->v4l2_dev, "Loaded V4L2 %s\n",
-+		  roles[role]);
-+	return 0;
-+
-+err_m2m:
-+	v4l2_m2m_release(dev->m2m_dev);
-+	video_unregister_device(&dev->vfd);
-+unreg_dev:
-+	v4l2_device_unregister(&dev->v4l2_dev);
-+vchiq_finalise:
-+	vchiq_mmal_finalise(dev->instance);
-+	return ret;
-+}
-+
-+static int bcm2835_codec_destroy(struct bcm2835_codec_dev *dev)
-+{
-+	if (!dev)
-+		return -ENODEV;
-+
-+	v4l2_info(&dev->v4l2_dev, "Removing " MEM2MEM_NAME ", %s\n",
-+		  roles[dev->role]);
-+	v4l2_m2m_unregister_media_controller(dev->m2m_dev);
-+	v4l2_m2m_release(dev->m2m_dev);
-+	video_unregister_device(&dev->vfd);
-+	v4l2_device_unregister(&dev->v4l2_dev);
-+	vchiq_mmal_finalise(dev->instance);
-+
-+	return 0;
-+}
-+
-+static int bcm2835_codec_probe(struct platform_device *pdev)
-+{
-+	struct bcm2835_codec_driver *drv;
-+	struct media_device *mdev;
-+	int ret = 0;
-+
-+	drv = devm_kzalloc(&pdev->dev, sizeof(*drv), GFP_KERNEL);
-+	if (!drv)
-+		return -ENOMEM;
-+
-+	drv->pdev = pdev;
-+	mdev = &drv->mdev;
-+	mdev->dev = &pdev->dev;
-+
-+	strscpy(mdev->model, bcm2835_codec_videodev.name, sizeof(mdev->model));
-+	strscpy(mdev->serial, "0000", sizeof(mdev->serial));
-+	snprintf(mdev->bus_info, sizeof(mdev->bus_info), "platform:%s",
-+		 pdev->name);
-+
-+	/* This should return the vgencmd version information or such .. */
-+	mdev->hw_revision = 1;
-+	media_device_init(mdev);
-+
-+	ret = bcm2835_codec_create(drv, &drv->decode, DECODE);
-+	if (ret)
-+		goto out;
-+
-+	ret = bcm2835_codec_create(drv, &drv->encode, ENCODE);
-+	if (ret)
-+		goto out;
-+
-+	ret = bcm2835_codec_create(drv, &drv->isp, ISP);
-+	if (ret)
-+		goto out;
-+
-+	ret = bcm2835_codec_create(drv, &drv->deinterlace, DEINTERLACE);
-+	if (ret)
-+		goto out;
-+
-+	ret = bcm2835_codec_create(drv, &drv->encode_image, ENCODE_IMAGE);
-+	if (ret)
-+		goto out;
-+
-+	/* Register the media device node */
-+	if (media_device_register(mdev) < 0)
-+		goto out;
-+
-+	platform_set_drvdata(pdev, drv);
-+
-+	return 0;
-+
-+out:
-+	if (drv->encode_image) {
-+		bcm2835_codec_destroy(drv->encode_image);
-+		drv->encode_image = NULL;
-+	}
-+	if (drv->deinterlace) {
-+		bcm2835_codec_destroy(drv->deinterlace);
-+		drv->deinterlace = NULL;
-+	}
-+	if (drv->isp) {
-+		bcm2835_codec_destroy(drv->isp);
-+		drv->isp = NULL;
-+	}
-+	if (drv->encode) {
-+		bcm2835_codec_destroy(drv->encode);
-+		drv->encode = NULL;
-+	}
-+	if (drv->decode) {
-+		bcm2835_codec_destroy(drv->decode);
-+		drv->decode = NULL;
-+	}
-+	return ret;
-+}
-+
-+static int bcm2835_codec_remove(struct platform_device *pdev)
-+{
-+	struct bcm2835_codec_driver *drv = platform_get_drvdata(pdev);
-+
-+	media_device_unregister(&drv->mdev);
-+
-+	bcm2835_codec_destroy(drv->encode_image);
-+
-+	bcm2835_codec_destroy(drv->deinterlace);
-+
-+	bcm2835_codec_destroy(drv->isp);
-+
-+	bcm2835_codec_destroy(drv->encode);
-+
-+	bcm2835_codec_destroy(drv->decode);
-+
-+	media_device_cleanup(&drv->mdev);
-+
-+	return 0;
-+}
-+
-+static struct platform_driver bcm2835_v4l2_codec_driver = {
-+	.probe = bcm2835_codec_probe,
-+	.remove = bcm2835_codec_remove,
-+	.driver = {
-+		   .name = "bcm2835-codec",
-+		   .owner = THIS_MODULE,
-+		   },
-+};
-+
-+module_platform_driver(bcm2835_v4l2_codec_driver);
-+
-+MODULE_DESCRIPTION("BCM2835 codec V4L2 driver");
-+MODULE_AUTHOR("Dave Stevenson, <dave.stevenson@raspberrypi.com>");
-+MODULE_LICENSE("GPL");
-+MODULE_VERSION("0.0.1");
-+MODULE_ALIAS("platform:bcm2835-codec");
---- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
-+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
-@@ -223,6 +223,8 @@ enum mmal_parameter_camera_type {
- 	MMAL_PARAMETER_SHUTTER_SPEED,
- 		/**< Takes a @ref MMAL_PARAMETER_AWB_GAINS_T */
- 	MMAL_PARAMETER_CUSTOM_AWB_GAINS,
-+		/**< Takes a @ref MMAL_PARAMETER_BOOLEAN_T */
-+	MMAL_PARAMETER_JPEG_IJG_SCALING,
- };
- 
- enum mmal_parameter_camera_config_timestamp_mode {
-@@ -615,6 +617,12 @@ enum mmal_parameter_video_type {
- 
- 	/**< Take a @ref MMAL_PARAMETER_BOOLEAN_T */
- 	MMAL_PARAMETER_VIDEO_ENCODE_HEADERS_WITH_FRAME,
-+
-+	/**< Take a @ref MMAL_PARAMETER_BOOLEAN_T */
-+	MMAL_PARAMETER_VIDEO_VALIDATE_TIMESTAMPS,
-+
-+	/**< Takes a @ref MMAL_PARAMETER_BOOLEAN_T */
-+	MMAL_PARAMETER_VIDEO_STOP_ON_PAR_COLOUR_CHANGE,
- };
- 
- /** Valid mirror modes */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0278-bcm2835-dma-only-reserve-channel-0-if-legacy-dma-dri.patch b/target/linux/bcm27xx/patches-6.1/950-0278-bcm2835-dma-only-reserve-channel-0-if-legacy-dma-dri.patch
deleted file mode 100644
index 72064bc92d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0278-bcm2835-dma-only-reserve-channel-0-if-legacy-dma-dri.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 124d503cd4c6f5a7a877226c26139ec82c7d1282 Mon Sep 17 00:00:00 2001
-From: Matthias Reichl <hias@horus.com>
-Date: Sun, 11 Oct 2020 00:48:55 +0200
-Subject: [PATCH] bcm2835-dma: only reserve channel 0 if legacy dma
- driver is enabled
-
-If CONFIG_DMA_BCM2708 isn't enabled there's no need to mask out
-one of the already scarce DMA channels.
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
----
- drivers/dma/bcm2835-dma.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/dma/bcm2835-dma.c
-+++ b/drivers/dma/bcm2835-dma.c
-@@ -1283,6 +1283,7 @@ static int bcm2835_dma_probe(struct plat
- 		goto err_no_dma;
- 	}
- 
-+#ifdef CONFIG_DMA_BCM2708
- 	/* One channel is reserved for the legacy API */
- 	if (chans_available & BCM2835_DMA_BULK_MASK) {
- 		rc = bcm_dmaman_probe(pdev, base,
-@@ -1293,6 +1294,7 @@ static int bcm2835_dma_probe(struct plat
- 
- 		chans_available &= ~BCM2835_DMA_BULK_MASK;
- 	}
-+#endif
- 
- 	/* And possibly one for the 40-bit DMA memcpy API */
- 	if (chans_available & od->cfg_data->chan_40bit_mask &
diff --git a/target/linux/bcm27xx/patches-6.1/950-0279-uapi-bcm2835-isp-Add-bcm2835-isp-uapi-header-file.patch b/target/linux/bcm27xx/patches-6.1/950-0279-uapi-bcm2835-isp-Add-bcm2835-isp-uapi-header-file.patch
deleted file mode 100644
index 8fccdbd619..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0279-uapi-bcm2835-isp-Add-bcm2835-isp-uapi-header-file.patch
+++ /dev/null
@@ -1,338 +0,0 @@
-From 35173cc820575b1e59d8278347a2146476e08fd1 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Mon, 12 Oct 2020 17:03:14 +0100
-Subject: [PATCH] uapi: bcm2835-isp: Add bcm2835-isp uapi header file
-
-This file defines the userland interface to the bcm2835-isp driver
-that will follow in a separate commit.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- include/uapi/linux/bcm2835-isp.h | 320 +++++++++++++++++++++++++++++++
- 1 file changed, 320 insertions(+)
- create mode 100644 include/uapi/linux/bcm2835-isp.h
-
---- /dev/null
-+++ b/include/uapi/linux/bcm2835-isp.h
-@@ -0,0 +1,320 @@
-+/* SPDX-License-Identifier: ((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) */
-+/*
-+ * bcm2835-isp.h
-+ *
-+ * BCM2835 ISP driver - user space header file.
-+ *
-+ * Copyright © 2019-2020 Raspberry Pi (Trading) Ltd.
-+ *
-+ * Author: Naushir Patuck (naush@raspberrypi.com)
-+ *
-+ */
-+
-+#ifndef __BCM2835_ISP_H_
-+#define __BCM2835_ISP_H_
-+
-+#include <linux/v4l2-controls.h>
-+
-+#define V4L2_CID_USER_BCM2835_ISP_CC_MATRIX	\
-+				(V4L2_CID_USER_BCM2835_ISP_BASE + 0x0001)
-+#define V4L2_CID_USER_BCM2835_ISP_LENS_SHADING	\
-+				(V4L2_CID_USER_BCM2835_ISP_BASE + 0x0002)
-+#define V4L2_CID_USER_BCM2835_ISP_BLACK_LEVEL	\
-+				(V4L2_CID_USER_BCM2835_ISP_BASE + 0x0003)
-+#define V4L2_CID_USER_BCM2835_ISP_GEQ		\
-+				(V4L2_CID_USER_BCM2835_ISP_BASE + 0x0004)
-+#define V4L2_CID_USER_BCM2835_ISP_GAMMA		\
-+				(V4L2_CID_USER_BCM2835_ISP_BASE + 0x0005)
-+#define V4L2_CID_USER_BCM2835_ISP_DENOISE	\
-+				(V4L2_CID_USER_BCM2835_ISP_BASE + 0x0006)
-+#define V4L2_CID_USER_BCM2835_ISP_SHARPEN	\
-+				(V4L2_CID_USER_BCM2835_ISP_BASE + 0x0007)
-+#define V4L2_CID_USER_BCM2835_ISP_DPC		\
-+				(V4L2_CID_USER_BCM2835_ISP_BASE + 0x0008)
-+
-+/*
-+ * All structs below are directly mapped onto the equivalent structs in
-+ * drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
-+ * for convenience.
-+ */
-+
-+/**
-+ * struct bcm2835_isp_rational - Rational value type.
-+ *
-+ * @num:	Numerator.
-+ * @den:	Denominator.
-+ */
-+struct bcm2835_isp_rational {
-+	__s32 num;
-+	__u32 den;
-+};
-+
-+/**
-+ * struct bcm2835_isp_ccm - Colour correction matrix.
-+ *
-+ * @ccm:	3x3 correction matrix coefficients.
-+ * @offsets:	1x3 correction offsets.
-+ */
-+struct bcm2835_isp_ccm {
-+	struct bcm2835_isp_rational ccm[3][3];
-+	__s32 offsets[3];
-+};
-+
-+/**
-+ * struct bcm2835_isp_custom_ccm - Custom CCM applied with the
-+ *				   V4L2_CID_USER_BCM2835_ISP_CC_MATRIX ctrl.
-+ *
-+ * @enabled:	Enable custom CCM.
-+ * @ccm:	Custom CCM coefficients and offsets.
-+ */
-+struct bcm2835_isp_custom_ccm {
-+	__u32 enabled;
-+	struct bcm2835_isp_ccm ccm;
-+};
-+
-+/**
-+ * enum bcm2835_isp_gain_format - format of the gains in the lens shading
-+ *				  tables used with the
-+ *				  V4L2_CID_USER_BCM2835_ISP_LENS_SHADING ctrl.
-+ *
-+ * @GAIN_FORMAT_U0P8_1:		Gains are u0.8 format, starting at 1.0
-+ * @GAIN_FORMAT_U1P7_0:		Gains are u1.7 format, starting at 0.0
-+ * @GAIN_FORMAT_U1P7_1:		Gains are u1.7 format, starting at 1.0
-+ * @GAIN_FORMAT_U2P6_0:		Gains are u2.6 format, starting at 0.0
-+ * @GAIN_FORMAT_U2P6_1:		Gains are u2.6 format, starting at 1.0
-+ * @GAIN_FORMAT_U3P5_0:		Gains are u3.5 format, starting at 0.0
-+ * @GAIN_FORMAT_U3P5_1:		Gains are u3.5 format, starting at 1.0
-+ * @GAIN_FORMAT_U4P10:		Gains are u4.10 format, starting at 0.0
-+ */
-+enum bcm2835_isp_gain_format {
-+	GAIN_FORMAT_U0P8_1 = 0,
-+	GAIN_FORMAT_U1P7_0 = 1,
-+	GAIN_FORMAT_U1P7_1 = 2,
-+	GAIN_FORMAT_U2P6_0 = 3,
-+	GAIN_FORMAT_U2P6_1 = 4,
-+	GAIN_FORMAT_U3P5_0 = 5,
-+	GAIN_FORMAT_U3P5_1 = 6,
-+	GAIN_FORMAT_U4P10  = 7,
-+};
-+
-+/**
-+ * struct bcm2835_isp_lens_shading - Lens shading tables supplied with the
-+ *				     V4L2_CID_USER_BCM2835_ISP_LENS_SHADING
-+ *				     ctrl.
-+ *
-+ * @enabled:		Enable lens shading.
-+ * @grid_cell_size:	Size of grid cells in samples (16, 32, 64, 128 or 256).
-+ * @grid_width:		Width of lens shading tables in grid cells.
-+ * @grid_stride:	Row to row distance (in grid cells) between grid cells
-+ *			in the same horizontal location.
-+ * @grid_height:	Height of lens shading tables in grid cells.
-+ * @dmabuf:		dmabuf file handle containing the table.
-+ * @ref_transform:	Reference transform - unsupported, please pass zero.
-+ * @corner_sampled:	Whether the gains are sampled at the corner points
-+ *			of the grid cells or in the cell centres.
-+ * @gain_format:	Format of the gains (see enum &bcm2835_isp_gain_format).
-+ */
-+struct bcm2835_isp_lens_shading {
-+	__u32 enabled;
-+	__u32 grid_cell_size;
-+	__u32 grid_width;
-+	__u32 grid_stride;
-+	__u32 grid_height;
-+	__s32 dmabuf;
-+	__u32 ref_transform;
-+	__u32 corner_sampled;
-+	__u32 gain_format;
-+};
-+
-+/**
-+ * struct bcm2835_isp_black_level - Sensor black level set with the
-+ *				    V4L2_CID_USER_BCM2835_ISP_BLACK_LEVEL ctrl.
-+ *
-+ * @enabled:		Enable black level.
-+ * @black_level_r:	Black level for red channel.
-+ * @black_level_g:	Black level for green channels.
-+ * @black_level_b:	Black level for blue channel.
-+ */
-+struct bcm2835_isp_black_level {
-+	__u32 enabled;
-+	__u16 black_level_r;
-+	__u16 black_level_g;
-+	__u16 black_level_b;
-+	__u8 padding[2]; /* Unused */
-+};
-+
-+/**
-+ * struct bcm2835_isp_geq - Green equalisation parameters set with the
-+ *			    V4L2_CID_USER_BCM2835_ISP_GEQ ctrl.
-+ *
-+ * @enabled:	Enable green equalisation.
-+ * @offset:	Fixed offset of the green equalisation threshold.
-+ * @slope:	Slope of the green equalisation threshold.
-+ */
-+struct bcm2835_isp_geq {
-+	__u32 enabled;
-+	__u32 offset;
-+	struct bcm2835_isp_rational slope;
-+};
-+
-+#define BCM2835_NUM_GAMMA_PTS 33
-+
-+/**
-+ * struct bcm2835_isp_gamma - Gamma parameters set with the
-+ *			      V4L2_CID_USER_BCM2835_ISP_GAMMA ctrl.
-+ *
-+ * @enabled:	Enable gamma adjustment.
-+ * @X:		X values of the points defining the gamma curve.
-+ *		Values should be scaled to 16 bits.
-+ * @Y:		Y values of the points defining the gamma curve.
-+ *		Values should be scaled to 16 bits.
-+ */
-+struct bcm2835_isp_gamma {
-+	__u32 enabled;
-+	__u16 x[BCM2835_NUM_GAMMA_PTS];
-+	__u16 y[BCM2835_NUM_GAMMA_PTS];
-+};
-+
-+/**
-+ * struct bcm2835_isp_denoise - Denoise parameters set with the
-+ *				V4L2_CID_USER_BCM2835_ISP_DENOISE ctrl.
-+ *
-+ * @enabled:	Enable denoise.
-+ * @constant:	Fixed offset of the noise threshold.
-+ * @slope:	Slope of the noise threshold.
-+ * @strength:	Denoise strength between 0.0 (off) and 1.0 (maximum).
-+ */
-+struct bcm2835_isp_denoise {
-+	__u32 enabled;
-+	__u32 constant;
-+	struct bcm2835_isp_rational slope;
-+	struct bcm2835_isp_rational strength;
-+};
-+
-+/**
-+ * struct bcm2835_isp_sharpen - Sharpen parameters set with the
-+ *				V4L2_CID_USER_BCM2835_ISP_SHARPEN ctrl.
-+ *
-+ * @enabled:	Enable sharpening.
-+ * @threshold:	Threshold at which to start sharpening pixels.
-+ * @strength:	Strength with which pixel sharpening increases.
-+ * @limit:	Limit to the amount of sharpening applied.
-+ */
-+struct bcm2835_isp_sharpen {
-+	__u32 enabled;
-+	struct bcm2835_isp_rational threshold;
-+	struct bcm2835_isp_rational strength;
-+	struct bcm2835_isp_rational limit;
-+};
-+
-+/**
-+ * enum bcm2835_isp_dpc_mode - defective pixel correction (DPC) strength.
-+ *
-+ * @DPC_MODE_OFF:		No DPC.
-+ * @DPC_MODE_NORMAL:		Normal DPC.
-+ * @DPC_MODE_STRONG:		Strong DPC.
-+ */
-+enum bcm2835_isp_dpc_mode {
-+	DPC_MODE_OFF = 0,
-+	DPC_MODE_NORMAL = 1,
-+	DPC_MODE_STRONG = 2,
-+};
-+
-+/**
-+ * struct bcm2835_isp_dpc - Defective pixel correction (DPC) parameters set
-+ *			    with the V4L2_CID_USER_BCM2835_ISP_DPC ctrl.
-+ *
-+ * @enabled:	Enable DPC.
-+ * @strength:	DPC strength (see enum &bcm2835_isp_dpc_mode).
-+ */
-+struct bcm2835_isp_dpc {
-+	__u32 enabled;
-+	__u32 strength;
-+};
-+
-+/*
-+ * ISP statistics structures.
-+ *
-+ * The bcm2835_isp_stats structure is generated at the output of the
-+ * statistics node.  Note that this does not directly map onto the statistics
-+ * output of the ISP HW.  Instead, the MMAL firmware code maps the HW statistics
-+ * to the bcm2835_isp_stats structure.
-+ */
-+#define DEFAULT_AWB_REGIONS_X 16
-+#define DEFAULT_AWB_REGIONS_Y 12
-+
-+#define NUM_HISTOGRAMS 2
-+#define NUM_HISTOGRAM_BINS 128
-+#define AWB_REGIONS (DEFAULT_AWB_REGIONS_X * DEFAULT_AWB_REGIONS_Y)
-+#define FLOATING_REGIONS 16
-+#define AGC_REGIONS 16
-+#define FOCUS_REGIONS 12
-+
-+/**
-+ * struct bcm2835_isp_stats_hist - Histogram statistics
-+ *
-+ * @r_hist:	Red channel histogram.
-+ * @g_hist:	Combined green channel histogram.
-+ * @b_hist:	Blue channel histogram.
-+ */
-+struct bcm2835_isp_stats_hist {
-+	__u32 r_hist[NUM_HISTOGRAM_BINS];
-+	__u32 g_hist[NUM_HISTOGRAM_BINS];
-+	__u32 b_hist[NUM_HISTOGRAM_BINS];
-+};
-+
-+/**
-+ * struct bcm2835_isp_stats_region - Region sums.
-+ *
-+ * @counted:	The number of 2x2 bayer tiles accumulated.
-+ * @notcounted:	The number of 2x2 bayer tiles not accumulated.
-+ * @r_sum:	Total sum of counted pixels in the red channel for a region.
-+ * @g_sum:	Total sum of counted pixels in the green channel for a region.
-+ * @b_sum:	Total sum of counted pixels in the blue channel for a region.
-+ */
-+struct bcm2835_isp_stats_region {
-+	__u32 counted;
-+	__u32 notcounted;
-+	__u64 r_sum;
-+	__u64 g_sum;
-+	__u64 b_sum;
-+};
-+
-+/**
-+ * struct bcm2835_isp_stats_focus - Focus statistics.
-+ *
-+ * @contrast_val:	Focus measure - accumulated output of the focus filter.
-+ *			In the first dimension, index [0] counts pixels below a
-+ *			preset threshold, and index [1] counts pixels above the
-+ *			threshold.  In the second dimension, index [0] uses the
-+ *			first predefined filter, and index [1] uses the second
-+ *			predefined filter.
-+ * @contrast_val_num:	The number of counted pixels in the above accumulation.
-+ */
-+struct bcm2835_isp_stats_focus {
-+	__u64 contrast_val[2][2];
-+	__u32 contrast_val_num[2][2];
-+};
-+
-+/**
-+ * struct bcm2835_isp_stats - ISP statistics.
-+ *
-+ * @version:		Version of the bcm2835_isp_stats structure.
-+ * @size:		Size of the bcm2835_isp_stats structure.
-+ * @hist:		Histogram statistics for the entire image.
-+ * @awb_stats:		Statistics for the regions defined for AWB calculations.
-+ * @floating_stats:	Statistics for arbitrarily placed (floating) regions.
-+ * @agc_stats:		Statistics for the regions defined for AGC calculations.
-+ * @focus_stats:	Focus filter statistics for the focus regions.
-+ */
-+struct bcm2835_isp_stats {
-+	__u32 version;
-+	__u32 size;
-+	struct bcm2835_isp_stats_hist hist[NUM_HISTOGRAMS];
-+	struct bcm2835_isp_stats_region awb_stats[AWB_REGIONS];
-+	struct bcm2835_isp_stats_region floating_stats[FLOATING_REGIONS];
-+	struct bcm2835_isp_stats_region agc_stats[AGC_REGIONS];
-+	struct bcm2835_isp_stats_focus focus_stats[FOCUS_REGIONS];
-+};
-+
-+#endif /* __BCM2835_ISP_H_ */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0280-staging-vc04_services-ISP-Add-a-more-complex-ISP-pro.patch b/target/linux/bcm27xx/patches-6.1/950-0280-staging-vc04_services-ISP-Add-a-more-complex-ISP-pro.patch
deleted file mode 100644
index 58c055b737..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0280-staging-vc04_services-ISP-Add-a-more-complex-ISP-pro.patch
+++ /dev/null
@@ -1,2408 +0,0 @@
-From cfa60cc9d644b8d12886332eceb7449e7397dff2 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Thu, 23 Apr 2020 10:17:37 +0100
-Subject: [PATCH] staging: vc04_services: ISP: Add a more complex ISP
- processing component
-
-Driver for the BCM2835 ISP hardware block.  This driver uses the MMAL
-component to program the ISP hardware through the VC firmware.
-
-The ISP component can produce two video stream outputs, and Bayer
-image statistics. This can't be encompassed in a simple V4L2
-M2M device, so create a new device that registers 4 video nodes.
-
-This patch squashes all the development patches from the earlier
-rpi-5.4.y branch into one
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- MAINTAINERS                                   |    9 +
- drivers/staging/vc04_services/Kconfig         |    1 +
- drivers/staging/vc04_services/Makefile        |    1 +
- .../staging/vc04_services/bcm2835-isp/Kconfig |   14 +
- .../vc04_services/bcm2835-isp/Makefile        |    8 +
- .../bcm2835-isp/bcm2835-isp-ctrls.h           |   67 +
- .../bcm2835-isp/bcm2835-isp-fmts.h            |  353 ++++
- .../bcm2835-isp/bcm2835-v4l2-isp.c            | 1696 +++++++++++++++++
- .../vc04_services/vchiq-mmal/mmal-encodings.h |    4 +
- .../vchiq-mmal/mmal-parameters.h              |  153 +-
- 10 files changed, 2305 insertions(+), 1 deletion(-)
- create mode 100644 drivers/staging/vc04_services/bcm2835-isp/Kconfig
- create mode 100644 drivers/staging/vc04_services/bcm2835-isp/Makefile
- create mode 100644 drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-ctrls.h
- create mode 100644 drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h
- create mode 100644 drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -4044,6 +4044,15 @@ S:	Maintained
- F:	drivers/media/platform/bcm2835/
- F:	Documentation/devicetree/bindings/media/brcm,bcm2835-unicam.yaml
- 
-+BROADCOM BCM2835 ISP DRIVER
-+M:	Raspberry Pi Kernel Maintenance <kernel-list@raspberrypi.com>
-+L:	linux-media@vger.kernel.org
-+S:	Maintained
-+F:	Documentation/media/uapi/v4l/pixfmt-meta-bcm2835-isp-stats.rst
-+F:	Documentation/media/v4l-drivers/bcm2835-isp.rst
-+F:	drivers/staging/vc04_services/bcm2835-isp
-+F:	include/uapi/linux/bcm2835-isp.h
-+
- BROADCOM BCM47XX MIPS ARCHITECTURE
- M:	Hauke Mehrtens <hauke@hauke-m.de>
- M:	Rafał Miłecki <zajec5@gmail.com>
---- a/drivers/staging/vc04_services/Kconfig
-+++ b/drivers/staging/vc04_services/Kconfig
-@@ -46,6 +46,7 @@ source "drivers/staging/vc04_services/bc
- 
- source "drivers/staging/vc04_services/vc-sm-cma/Kconfig"
- source "drivers/staging/vc04_services/bcm2835-codec/Kconfig"
-+source "drivers/staging/vc04_services/bcm2835-isp/Kconfig"
- 
- source "drivers/staging/vc04_services/vchiq-mmal/Kconfig"
- 
---- a/drivers/staging/vc04_services/Makefile
-+++ b/drivers/staging/vc04_services/Makefile
-@@ -16,6 +16,7 @@ obj-$(CONFIG_VIDEO_BCM2835)		+= bcm2835-
- obj-$(CONFIG_BCM2835_VCHIQ_MMAL)	+= vchiq-mmal/
- obj-$(CONFIG_BCM_VC_SM_CMA)		+= vc-sm-cma/
- obj-$(CONFIG_VIDEO_CODEC_BCM2835)	+= bcm2835-codec/
-+obj-$(CONFIG_VIDEO_ISP_BCM2835)		+= bcm2835-isp/
- 
- ccflags-y += -I $(srctree)/$(src)/include
- 
---- /dev/null
-+++ b/drivers/staging/vc04_services/bcm2835-isp/Kconfig
-@@ -0,0 +1,14 @@
-+config VIDEO_ISP_BCM2835
-+	tristate "BCM2835 ISP support"
-+	depends on MEDIA_SUPPORT
-+	depends on VIDEO_DEV && (ARCH_BCM2835 || COMPILE_TEST)
-+	depends on MEDIA_CONTROLLER
-+	select BCM2835_VCHIQ_MMAL
-+	select VIDEOBUF2_DMA_CONTIG
-+	help
-+	  This is the V4L2 driver for the Broadcom BCM2835 ISP hardware.
-+	  This operates over the VCHIQ interface to a service running on
-+	  VideoCore.
-+
-+	  To compile this driver as a module, choose M here: the module
-+	  will be called bcm2835-isp.
---- /dev/null
-+++ b/drivers/staging/vc04_services/bcm2835-isp/Makefile
-@@ -0,0 +1,8 @@
-+# SPDX-License-Identifier: GPL-2.0
-+bcm2835-isp-objs := bcm2835-v4l2-isp.o
-+
-+obj-$(CONFIG_VIDEO_ISP_BCM2835) += bcm2835-isp.o
-+
-+ccflags-y += \
-+	-I$(srctree)/drivers/staging/vc04_services \
-+	-D__VCCOREVER__=0x04000000
---- /dev/null
-+++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-ctrls.h
-@@ -0,0 +1,67 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * Broadcom BCM2835 ISP driver
-+ *
-+ * Copyright © 2019-2020 Raspberry Pi (Trading) Ltd.
-+ *
-+ * Author: Naushir Patuck (naush@raspberrypi.com)
-+ *
-+ */
-+
-+#ifndef BCM2835_ISP_CTRLS
-+#define BCM2835_ISP_CTRLS
-+
-+#include <linux/bcm2835-isp.h>
-+
-+struct bcm2835_isp_custom_ctrl {
-+	const char *name;
-+	u32 id;
-+	u32 size;
-+	u32 flags;
-+};
-+
-+static const struct bcm2835_isp_custom_ctrl custom_ctrls[] = {
-+	{
-+		.name	= "Colour Correction Matrix",
-+		.id	= V4L2_CID_USER_BCM2835_ISP_CC_MATRIX,
-+		.size	= sizeof(struct bcm2835_isp_custom_ccm),
-+		.flags  = 0
-+	}, {
-+		.name	= "Lens Shading",
-+		.id	= V4L2_CID_USER_BCM2835_ISP_LENS_SHADING,
-+		.size	= sizeof(struct bcm2835_isp_lens_shading),
-+		.flags  = V4L2_CTRL_FLAG_EXECUTE_ON_WRITE
-+	}, {
-+		.name	= "Black Level",
-+		.id	= V4L2_CID_USER_BCM2835_ISP_BLACK_LEVEL,
-+		.size	= sizeof(struct bcm2835_isp_black_level),
-+		.flags  = 0
-+	}, {
-+		.name	= "Green Equalisation",
-+		.id	= V4L2_CID_USER_BCM2835_ISP_GEQ,
-+		.size	= sizeof(struct bcm2835_isp_geq),
-+		.flags  = 0
-+	}, {
-+		.name	= "Gamma",
-+		.id	= V4L2_CID_USER_BCM2835_ISP_GAMMA,
-+		.size	= sizeof(struct bcm2835_isp_gamma),
-+		.flags  = 0
-+	}, {
-+		.name	= "Sharpen",
-+		.id	= V4L2_CID_USER_BCM2835_ISP_SHARPEN,
-+		.size	= sizeof(struct bcm2835_isp_sharpen),
-+		.flags  = 0
-+	}, {
-+		.name	= "Denoise",
-+		.id	= V4L2_CID_USER_BCM2835_ISP_DENOISE,
-+		.size	= sizeof(struct bcm2835_isp_denoise),
-+		.flags  = 0
-+	}, {
-+		.name	= "Defective Pixel Correction",
-+		.id	= V4L2_CID_USER_BCM2835_ISP_DPC,
-+		.size	= sizeof(struct bcm2835_isp_dpc),
-+		.flags  = 0
-+	}
-+};
-+
-+#endif
---- /dev/null
-+++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h
-@@ -0,0 +1,353 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * Broadcom BCM2835 ISP driver
-+ *
-+ * Copyright © 2019-2020 Raspberry Pi (Trading) Ltd.
-+ *
-+ * Author: Naushir Patuck (naush@raspberrypi.com)
-+ *
-+ */
-+
-+#ifndef BCM2835_ISP_FMTS
-+#define BCM2835_ISP_FMTS
-+
-+#include <linux/videodev2.h>
-+#include "vchiq-mmal/mmal-encodings.h"
-+
-+struct bcm2835_isp_fmt {
-+	u32 fourcc;
-+	int depth;
-+	int bytesperline_align;
-+	u32 mmal_fmt;
-+	int size_multiplier_x2;
-+	enum v4l2_colorspace colorspace;
-+	unsigned int step_size;
-+};
-+
-+static const struct bcm2835_isp_fmt supported_formats[] = {
-+	{
-+		/* YUV formats */
-+		.fourcc		    = V4L2_PIX_FMT_YUV420,
-+		.depth		    = 8,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_I420,
-+		.size_multiplier_x2 = 3,
-+		.colorspace	    = V4L2_COLORSPACE_SMPTE170M,
-+		.step_size	    = 2,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_YVU420,
-+		.depth		    = 8,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_YV12,
-+		.size_multiplier_x2 = 3,
-+		.colorspace	    = V4L2_COLORSPACE_SMPTE170M,
-+		.step_size	    = 2,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_NV12,
-+		.depth		    = 8,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_NV12,
-+		.size_multiplier_x2 = 3,
-+		.colorspace	    = V4L2_COLORSPACE_SMPTE170M,
-+		.step_size	    = 2,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_NV21,
-+		.depth		    = 8,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_NV21,
-+		.size_multiplier_x2 = 3,
-+		.colorspace	    = V4L2_COLORSPACE_SMPTE170M,
-+		.step_size	    = 2,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_YUYV,
-+		.depth		    = 16,
-+		.bytesperline_align = 64,
-+		.mmal_fmt	    = MMAL_ENCODING_YUYV,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_SMPTE170M,
-+		.step_size	    = 2,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_UYVY,
-+		.depth		    = 16,
-+		.bytesperline_align = 64,
-+		.mmal_fmt	    = MMAL_ENCODING_UYVY,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_SMPTE170M,
-+		.step_size	    = 2,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_YVYU,
-+		.depth		    = 16,
-+		.bytesperline_align = 64,
-+		.mmal_fmt	    = MMAL_ENCODING_YVYU,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_SMPTE170M,
-+		.step_size	    = 2,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_VYUY,
-+		.depth		    = 16,
-+		.bytesperline_align = 64,
-+		.mmal_fmt	    = MMAL_ENCODING_VYUY,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_SMPTE170M,
-+		.step_size	    = 2,
-+	}, {
-+		/* RGB formats */
-+		.fourcc		    = V4L2_PIX_FMT_RGB24,
-+		.depth		    = 24,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_RGB24,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_SRGB,
-+		.step_size	    = 1,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_RGB565,
-+		.depth		    = 16,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_RGB16,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_SRGB,
-+		.step_size	    = 1,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_BGR24,
-+		.depth		    = 24,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BGR24,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_SRGB,
-+		.step_size	    = 1,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_XBGR32,
-+		.depth		    = 32,
-+		.bytesperline_align = 64,
-+		.mmal_fmt	    = MMAL_ENCODING_BGRA,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_SRGB,
-+		.step_size	    = 1,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_RGBX32,
-+		.depth		    = 32,
-+		.bytesperline_align = 64,
-+		.mmal_fmt	    = MMAL_ENCODING_RGBA,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_SRGB,
-+		.step_size	    = 1,
-+	}, {
-+		/* Bayer formats */
-+		/* 8 bit */
-+		.fourcc		    = V4L2_PIX_FMT_SRGGB8,
-+		.depth		    = 8,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BAYER_SRGGB8,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_SBGGR8,
-+		.depth		    = 8,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BAYER_SBGGR8,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_SGRBG8,
-+		.depth		    = 8,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGRBG8,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_SGBRG8,
-+		.depth		    = 8,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGBRG8,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		/* 10 bit */
-+		.fourcc		    = V4L2_PIX_FMT_SRGGB10P,
-+		.depth		    = 10,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BAYER_SRGGB10P,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_SBGGR10P,
-+		.depth		    = 10,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BAYER_SBGGR10P,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_SGRBG10P,
-+		.depth		    = 10,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGRBG10P,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_SGBRG10P,
-+		.depth		    = 10,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGBRG10P,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		/* 12 bit */
-+		.fourcc		    = V4L2_PIX_FMT_SRGGB12P,
-+		.depth		    = 12,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BAYER_SRGGB12P,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_SBGGR12P,
-+		.depth		    = 12,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BAYER_SBGGR12P,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_SGRBG12P,
-+		.depth		    = 12,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGRBG12P,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_SGBRG12P,
-+		.depth		    = 12,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGBRG12P,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		/* 14 bit */
-+		.fourcc		    = V4L2_PIX_FMT_SRGGB14P,
-+		.depth		    = 14,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BAYER_SRGGB14P,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_SBGGR14P,
-+		.depth		    = 14,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BAYER_SBGGR14P,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_SGRBG14P,
-+		.depth		    = 14,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGRBG14P,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_SGBRG14P,
-+		.depth		    = 14,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGBRG14P,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		/* 16 bit */
-+		.fourcc		    = V4L2_PIX_FMT_SRGGB16,
-+		.depth		    = 16,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BAYER_SRGGB16,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_SBGGR16,
-+		.depth		    = 16,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BAYER_SBGGR16,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_SGRBG16,
-+		.depth		    = 16,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGRBG16,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_SGBRG16,
-+		.depth		    = 16,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGBRG16,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		/* Monochrome MIPI formats */
-+		/* 8 bit */
-+		.fourcc		    = V4L2_PIX_FMT_GREY,
-+		.depth		    = 8,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_GREY,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		/* 10 bit */
-+		.fourcc		    = V4L2_PIX_FMT_Y10P,
-+		.depth		    = 10,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_Y10P,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		/* 12 bit */
-+		.fourcc		    = V4L2_PIX_FMT_Y12P,
-+		.depth		    = 12,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_Y12P,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		/* 14 bit */
-+		.fourcc		    = V4L2_PIX_FMT_Y14P,
-+		.depth		    = 14,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_Y14P,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		/* 16 bit */
-+		.fourcc		    = V4L2_PIX_FMT_Y16,
-+		.depth		    = 16,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_Y16,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		.fourcc		    = V4L2_META_FMT_BCM2835_ISP_STATS,
-+		.mmal_fmt	    = MMAL_ENCODING_BRCM_STATS,
-+		/* The rest are not valid fields for stats. */
-+	}
-+};
-+
-+#endif
---- /dev/null
-+++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-@@ -0,0 +1,1696 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Broadcom BCM2835 ISP driver
-+ *
-+ * Copyright © 2019-2020 Raspberry Pi (Trading) Ltd.
-+ *
-+ * Author: Naushir Patuck (naush@raspberrypi.com)
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+
-+#include <media/v4l2-ctrls.h>
-+#include <media/v4l2-device.h>
-+#include <media/v4l2-event.h>
-+#include <media/v4l2-ioctl.h>
-+#include <media/videobuf2-dma-contig.h>
-+
-+#include "vchiq-mmal/mmal-msg.h"
-+#include "vchiq-mmal/mmal-parameters.h"
-+#include "vchiq-mmal/mmal-vchiq.h"
-+
-+#include "vc-sm-cma/vc_sm_knl.h"
-+
-+#include "bcm2835-isp-ctrls.h"
-+#include "bcm2835-isp-fmts.h"
-+
-+MODULE_IMPORT_NS(DMA_BUF);
-+
-+static unsigned int debug;
-+module_param(debug, uint, 0644);
-+MODULE_PARM_DESC(debug, "activates debug info");
-+
-+static unsigned int video_nr = 13;
-+module_param(video_nr, uint, 0644);
-+MODULE_PARM_DESC(video_nr, "base video device number");
-+
-+#define BCM2835_ISP_NAME "bcm2835-isp"
-+#define BCM2835_ISP_ENTITY_NAME_LEN 32
-+
-+#define BCM2835_ISP_NUM_OUTPUTS 1
-+#define BCM2835_ISP_NUM_CAPTURES 2
-+#define BCM2835_ISP_NUM_METADATA 1
-+
-+#define BCM2835_ISP_NUM_NODES						\
-+		(BCM2835_ISP_NUM_OUTPUTS + BCM2835_ISP_NUM_CAPTURES +	\
-+		 BCM2835_ISP_NUM_METADATA)
-+
-+/* Default frame dimension of 1280 pixels. */
-+#define DEFAULT_DIM 1280U
-+/*
-+ * Maximum frame dimension of 16384 pixels.  Even though the ISP runs in tiles,
-+ * have a sensible limit so that we do not create an excessive number of tiles
-+ * to process.
-+ */
-+#define MAX_DIM 16384U
-+/*
-+ * Minimum frame dimension of 64 pixels.  Anything lower, and the tiling
-+ * algorithm may not be able to cope when applying filter context.
-+ */
-+#define MIN_DIM 64U
-+
-+/* Timeout for stop_streaming to allow all buffers to return */
-+#define COMPLETE_TIMEOUT (2 * HZ)
-+
-+/* Per-queue, driver-specific private data */
-+struct bcm2835_isp_q_data {
-+	/*
-+	 * These parameters should be treated as gospel, with everything else
-+	 * being determined from them.
-+	 */
-+	unsigned int bytesperline;
-+	unsigned int width;
-+	unsigned int height;
-+	unsigned int sizeimage;
-+	const struct bcm2835_isp_fmt *fmt;
-+};
-+
-+/*
-+ * Structure to describe a single node /dev/video<N> which represents a single
-+ * input or output queue to the ISP device.
-+ */
-+struct bcm2835_isp_node {
-+	int vfl_dir;
-+	unsigned int id;
-+	const char *name;
-+	struct vchiq_mmal_port *port;
-+	struct video_device vfd;
-+	struct media_pad pad;
-+	struct media_intf_devnode *intf_devnode;
-+	struct media_link *intf_link;
-+	struct mutex lock; /* top level device node lock */
-+	struct mutex queue_lock;
-+
-+	struct vb2_queue queue;
-+	unsigned int sequence;
-+
-+	/* The list of formats supported on the node. */
-+	struct bcm2835_isp_fmt const **supported_fmts;
-+	unsigned int num_supported_fmts;
-+
-+	struct bcm2835_isp_q_data q_data;
-+
-+	/* Parent device structure */
-+	struct bcm2835_isp_dev *dev;
-+
-+	bool registered;
-+	bool media_node_registered;
-+};
-+
-+/*
-+ * Structure representing the entire ISP device, comprising several input and
-+ * output nodes /dev/video<N>.
-+ */
-+struct bcm2835_isp_dev {
-+	struct v4l2_device v4l2_dev;
-+	struct device *dev;
-+	struct v4l2_ctrl_handler ctrl_handler;
-+	struct media_device mdev;
-+	struct media_entity entity;
-+	bool media_device_registered;
-+	bool media_entity_registered;
-+	struct vchiq_mmal_instance *mmal_instance;
-+	struct vchiq_mmal_component *component;
-+	struct completion frame_cmplt;
-+
-+	struct bcm2835_isp_node node[BCM2835_ISP_NUM_NODES];
-+	struct media_pad pad[BCM2835_ISP_NUM_NODES];
-+	atomic_t num_streaming;
-+
-+	/* Image pipeline controls. */
-+	int r_gain;
-+	int b_gain;
-+};
-+
-+struct bcm2835_isp_buffer {
-+	struct vb2_v4l2_buffer vb;
-+	struct mmal_buffer mmal;
-+};
-+
-+static
-+inline struct bcm2835_isp_dev *node_get_dev(struct bcm2835_isp_node *node)
-+{
-+	return node->dev;
-+}
-+
-+static inline bool node_is_output(struct bcm2835_isp_node *node)
-+{
-+	return node->queue.type == V4L2_BUF_TYPE_VIDEO_OUTPUT;
-+}
-+
-+static inline bool node_is_capture(struct bcm2835_isp_node *node)
-+{
-+	return node->queue.type == V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+}
-+
-+static inline bool node_is_stats(struct bcm2835_isp_node *node)
-+{
-+	return node->queue.type == V4L2_BUF_TYPE_META_CAPTURE;
-+}
-+
-+static inline enum v4l2_buf_type index_to_queue_type(int index)
-+{
-+	if (index < BCM2835_ISP_NUM_OUTPUTS)
-+		return V4L2_BUF_TYPE_VIDEO_OUTPUT;
-+	else if (index < BCM2835_ISP_NUM_OUTPUTS + BCM2835_ISP_NUM_CAPTURES)
-+		return V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+	else
-+		return V4L2_BUF_TYPE_META_CAPTURE;
-+}
-+
-+static int set_isp_param(struct bcm2835_isp_node *node, u32 parameter,
-+			 void *value, u32 value_size)
-+{
-+	struct bcm2835_isp_dev *dev = node_get_dev(node);
-+
-+	return vchiq_mmal_port_parameter_set(dev->mmal_instance, node->port,
-+					     parameter, value, value_size);
-+}
-+
-+static int set_wb_gains(struct bcm2835_isp_node *node)
-+{
-+	struct bcm2835_isp_dev *dev = node_get_dev(node);
-+	struct mmal_parameter_awbgains gains = {
-+		.r_gain = { dev->r_gain, 1000 },
-+		.b_gain = { dev->b_gain, 1000 }
-+	};
-+
-+	return set_isp_param(node, MMAL_PARAMETER_CUSTOM_AWB_GAINS,
-+			     &gains, sizeof(gains));
-+}
-+
-+static int set_digital_gain(struct bcm2835_isp_node *node, uint32_t gain)
-+{
-+	struct s32_fract digital_gain = {
-+		.numerator = gain,
-+		.denominator = 1000
-+	};
-+
-+	return set_isp_param(node, MMAL_PARAMETER_DIGITAL_GAIN,
-+			     &digital_gain, sizeof(digital_gain));
-+}
-+
-+static const struct bcm2835_isp_fmt *get_fmt(u32 mmal_fmt)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(supported_formats); i++) {
-+		if (supported_formats[i].mmal_fmt == mmal_fmt)
-+			return &supported_formats[i];
-+	}
-+	return NULL;
-+}
-+
-+static const
-+struct bcm2835_isp_fmt *find_format_by_fourcc(unsigned int fourcc,
-+					      struct bcm2835_isp_node *node)
-+{
-+	const struct bcm2835_isp_fmt *fmt;
-+	unsigned int i;
-+
-+	for (i = 0; i < node->num_supported_fmts; i++) {
-+		fmt = node->supported_fmts[i];
-+		if (fmt->fourcc == fourcc)
-+			return fmt;
-+	}
-+
-+	return NULL;
-+}
-+
-+static const
-+struct bcm2835_isp_fmt *find_format(struct v4l2_format *f,
-+				    struct bcm2835_isp_node *node)
-+{
-+	return find_format_by_fourcc(node_is_stats(node) ?
-+				     f->fmt.meta.dataformat :
-+				     f->fmt.pix.pixelformat,
-+				     node);
-+}
-+
-+/* vb2_to_mmal_buffer() - converts vb2 buffer header to MMAL
-+ *
-+ * Copies all the required fields from a VB2 buffer to the MMAL buffer header,
-+ * ready for sending to the VPU.
-+ */
-+static void vb2_to_mmal_buffer(struct mmal_buffer *buf,
-+			       struct vb2_v4l2_buffer *vb2)
-+{
-+	u64 pts;
-+
-+	buf->mmal_flags = 0;
-+	if (vb2->flags & V4L2_BUF_FLAG_KEYFRAME)
-+		buf->mmal_flags |= MMAL_BUFFER_HEADER_FLAG_KEYFRAME;
-+
-+	/* Data must be framed correctly as one frame per buffer. */
-+	buf->mmal_flags |= MMAL_BUFFER_HEADER_FLAG_FRAME_END;
-+
-+	buf->length = vb2->vb2_buf.planes[0].bytesused;
-+	/*
-+	 * Minor ambiguity in the V4L2 spec as to whether passing in a 0 length
-+	 * buffer, or one with V4L2_BUF_FLAG_LAST set denotes end of stream.
-+	 * Handle either.
-+	 */
-+	if (!buf->length || vb2->flags & V4L2_BUF_FLAG_LAST)
-+		buf->mmal_flags |= MMAL_BUFFER_HEADER_FLAG_EOS;
-+
-+	/* vb2 timestamps in nsecs, mmal in usecs */
-+	pts = vb2->vb2_buf.timestamp;
-+	do_div(pts, 1000);
-+	buf->pts = pts;
-+	buf->dts = MMAL_TIME_UNKNOWN;
-+}
-+
-+static void mmal_buffer_cb(struct vchiq_mmal_instance *instance,
-+			   struct vchiq_mmal_port *port, int status,
-+			   struct mmal_buffer *mmal_buf)
-+{
-+	struct bcm2835_isp_buffer *q_buf;
-+	struct bcm2835_isp_node *node = port->cb_ctx;
-+	struct bcm2835_isp_dev *dev = node_get_dev(node);
-+	struct vb2_v4l2_buffer *vb2;
-+
-+	q_buf = container_of(mmal_buf, struct bcm2835_isp_buffer, mmal);
-+	vb2 = &q_buf->vb;
-+	v4l2_dbg(2, debug, &dev->v4l2_dev,
-+		 "%s: port:%s[%d], status:%d, buf:%p, dmabuf:%p, length:%lu, flags %u, pts %lld\n",
-+		 __func__, node_is_output(node) ? "input" : "output", node->id,
-+		 status, mmal_buf, mmal_buf->dma_buf, mmal_buf->length,
-+		 mmal_buf->mmal_flags, mmal_buf->pts);
-+
-+	if (mmal_buf->cmd)
-+		v4l2_err(&dev->v4l2_dev,
-+			 "%s: Unexpected event on output callback - %08x\n",
-+			 __func__, mmal_buf->cmd);
-+
-+	if (status) {
-+		/* error in transfer */
-+		if (vb2) {
-+			/* there was a buffer with the error so return it */
-+			vb2_buffer_done(&vb2->vb2_buf, VB2_BUF_STATE_ERROR);
-+		}
-+		return;
-+	}
-+
-+	/* vb2 timestamps in nsecs, mmal in usecs */
-+	vb2->vb2_buf.timestamp = mmal_buf->pts * 1000;
-+	vb2->sequence = node->sequence++;
-+	vb2_set_plane_payload(&vb2->vb2_buf, 0, mmal_buf->length);
-+	vb2_buffer_done(&vb2->vb2_buf, VB2_BUF_STATE_DONE);
-+
-+	if (!port->enabled)
-+		complete(&dev->frame_cmplt);
-+}
-+
-+static void setup_mmal_port_format(struct bcm2835_isp_node *node,
-+				   struct vchiq_mmal_port *port)
-+{
-+	struct bcm2835_isp_q_data *q_data = &node->q_data;
-+
-+	port->format.encoding = q_data->fmt->mmal_fmt;
-+	/* Raw image format - set width/height */
-+	port->es.video.width = (q_data->bytesperline << 3) / q_data->fmt->depth;
-+	port->es.video.height = q_data->height;
-+	port->es.video.crop.width = q_data->width;
-+	port->es.video.crop.height = q_data->height;
-+	port->es.video.crop.x = 0;
-+	port->es.video.crop.y = 0;
-+};
-+
-+static int setup_mmal_port(struct bcm2835_isp_node *node)
-+{
-+	struct bcm2835_isp_dev *dev = node_get_dev(node);
-+	unsigned int enable = 1;
-+	int ret;
-+
-+	v4l2_dbg(2, debug, &dev->v4l2_dev, "%s: setup %s[%d]\n", __func__,
-+		 node->name, node->id);
-+
-+	vchiq_mmal_port_parameter_set(dev->mmal_instance, node->port,
-+				      MMAL_PARAMETER_ZERO_COPY, &enable,
-+				      sizeof(enable));
-+	setup_mmal_port_format(node, node->port);
-+	ret = vchiq_mmal_port_set_format(dev->mmal_instance, node->port);
-+	if (ret < 0) {
-+		v4l2_dbg(1, debug, &dev->v4l2_dev,
-+			 "%s: vchiq_mmal_port_set_format failed\n",
-+			 __func__);
-+		return ret;
-+	}
-+
-+	if (node->q_data.sizeimage < node->port->minimum_buffer.size) {
-+		v4l2_err(&dev->v4l2_dev,
-+			 "buffer size mismatch sizeimage %u < min size %u\n",
-+			 node->q_data.sizeimage,
-+			 node->port->minimum_buffer.size);
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
-+
-+static int bcm2835_isp_mmal_buf_cleanup(struct mmal_buffer *mmal_buf)
-+{
-+	mmal_vchi_buffer_cleanup(mmal_buf);
-+
-+	if (mmal_buf->dma_buf) {
-+		dma_buf_put(mmal_buf->dma_buf);
-+		mmal_buf->dma_buf = NULL;
-+	}
-+
-+	return 0;
-+}
-+
-+static int bcm2835_isp_node_queue_setup(struct vb2_queue *q,
-+					unsigned int *nbuffers,
-+					unsigned int *nplanes,
-+					unsigned int sizes[],
-+					struct device *alloc_devs[])
-+{
-+	struct bcm2835_isp_node *node = vb2_get_drv_priv(q);
-+	unsigned int size;
-+
-+	if (setup_mmal_port(node))
-+		return -EINVAL;
-+
-+	size = node->q_data.sizeimage;
-+	if (size == 0) {
-+		v4l2_info(&node_get_dev(node)->v4l2_dev,
-+			  "%s: Image size unset in queue_setup for node %s[%d]\n",
-+			  __func__, node->name, node->id);
-+		return -EINVAL;
-+	}
-+
-+	if (*nplanes)
-+		return sizes[0] < size ? -EINVAL : 0;
-+
-+	*nplanes = 1;
-+	sizes[0] = size;
-+
-+	node->port->current_buffer.size = size;
-+
-+	if (*nbuffers < node->port->minimum_buffer.num)
-+		*nbuffers = node->port->minimum_buffer.num;
-+
-+	node->port->current_buffer.num = *nbuffers;
-+
-+	v4l2_dbg(2, debug, &node_get_dev(node)->v4l2_dev,
-+		 "%s: Image size %u, nbuffers %u for node %s[%d]\n",
-+		 __func__, sizes[0], *nbuffers, node->name, node->id);
-+	return 0;
-+}
-+
-+static int bcm2835_isp_buf_init(struct vb2_buffer *vb)
-+{
-+	struct bcm2835_isp_node *node = vb2_get_drv_priv(vb->vb2_queue);
-+	struct bcm2835_isp_dev *dev = node_get_dev(node);
-+	struct vb2_v4l2_buffer *vb2 = to_vb2_v4l2_buffer(vb);
-+	struct bcm2835_isp_buffer *buf =
-+		container_of(vb2, struct bcm2835_isp_buffer, vb);
-+
-+	v4l2_dbg(3, debug, &dev->v4l2_dev, "%s: vb %p\n", __func__, vb);
-+
-+	buf->mmal.buffer = vb2_plane_vaddr(&buf->vb.vb2_buf, 0);
-+	buf->mmal.buffer_size = vb2_plane_size(&buf->vb.vb2_buf, 0);
-+	mmal_vchi_buffer_init(dev->mmal_instance, &buf->mmal);
-+	return 0;
-+}
-+
-+static int bcm2835_isp_buf_prepare(struct vb2_buffer *vb)
-+{
-+	struct bcm2835_isp_node *node = vb2_get_drv_priv(vb->vb2_queue);
-+	struct bcm2835_isp_dev *dev = node_get_dev(node);
-+	struct vb2_v4l2_buffer *vb2 = to_vb2_v4l2_buffer(vb);
-+	struct bcm2835_isp_buffer *buf =
-+		container_of(vb2, struct bcm2835_isp_buffer, vb);
-+	struct dma_buf *dma_buf;
-+	int ret;
-+
-+	v4l2_dbg(3, debug, &dev->v4l2_dev, "%s: type: %d ptr %p\n",
-+		 __func__, vb->vb2_queue->type, vb);
-+
-+	if (V4L2_TYPE_IS_OUTPUT(vb->vb2_queue->type)) {
-+		if (vb2->field == V4L2_FIELD_ANY)
-+			vb2->field = V4L2_FIELD_NONE;
-+		if (vb2->field != V4L2_FIELD_NONE) {
-+			v4l2_err(&dev->v4l2_dev,
-+				 "%s field isn't supported\n", __func__);
-+			return -EINVAL;
-+		}
-+	}
-+
-+	if (vb2_plane_size(vb, 0) < node->q_data.sizeimage) {
-+		v4l2_err(&dev->v4l2_dev,
-+			 "%s data will not fit into plane (%lu < %lu)\n",
-+			 __func__, vb2_plane_size(vb, 0),
-+			 (long)node->q_data.sizeimage);
-+		return -EINVAL;
-+	}
-+
-+	if (!V4L2_TYPE_IS_OUTPUT(vb->vb2_queue->type))
-+		vb2_set_plane_payload(vb, 0, node->q_data.sizeimage);
-+
-+	switch (vb->memory) {
-+	case VB2_MEMORY_DMABUF:
-+		dma_buf = dma_buf_get(vb->planes[0].m.fd);
-+
-+		if (dma_buf != buf->mmal.dma_buf) {
-+			/*
-+			 * dmabuf either hasn't already been mapped, or it has
-+			 * changed.
-+			 */
-+			if (buf->mmal.dma_buf) {
-+				v4l2_err(&dev->v4l2_dev,
-+					 "%s Buffer changed - why did the core not call cleanup?\n",
-+					 __func__);
-+				bcm2835_isp_mmal_buf_cleanup(&buf->mmal);
-+			}
-+
-+			buf->mmal.dma_buf = dma_buf;
-+		} else {
-+			/*
-+			 * Already have a reference to the buffer, so release it
-+			 * here.
-+			 */
-+			dma_buf_put(dma_buf);
-+		}
-+		ret = 0;
-+		break;
-+	case VB2_MEMORY_MMAP:
-+		/*
-+		 * We want to do this at init, but vb2_core_expbuf checks that
-+		 * the index < q->num_buffers, and q->num_buffers only gets
-+		 * updated once all the buffers are allocated.
-+		 */
-+		if (!buf->mmal.dma_buf) {
-+			ret = vb2_core_expbuf_dmabuf(vb->vb2_queue,
-+						     vb->vb2_queue->type,
-+						     vb->index, 0, O_CLOEXEC,
-+						     &buf->mmal.dma_buf);
-+			v4l2_dbg(3, debug, &dev->v4l2_dev,
-+				 "%s: exporting ptr %p to dmabuf %p\n",
-+				 __func__, vb, buf->mmal.dma_buf);
-+			if (ret)
-+				v4l2_err(&dev->v4l2_dev,
-+					 "%s: Failed to expbuf idx %d, ret %d\n",
-+					 __func__, vb->index, ret);
-+		} else {
-+			ret = 0;
-+		}
-+		break;
-+	default:
-+		ret = -EINVAL;
-+		break;
-+	}
-+
-+	return ret;
-+}
-+
-+static void bcm2835_isp_node_buffer_queue(struct vb2_buffer *buf)
-+{
-+	struct bcm2835_isp_node *node = vb2_get_drv_priv(buf->vb2_queue);
-+	struct vb2_v4l2_buffer *vbuf =
-+		container_of(buf, struct vb2_v4l2_buffer, vb2_buf);
-+	struct bcm2835_isp_buffer *buffer =
-+		container_of(vbuf, struct bcm2835_isp_buffer, vb);
-+	struct bcm2835_isp_dev *dev = node_get_dev(node);
-+
-+	v4l2_dbg(3, debug, &dev->v4l2_dev, "%s: node %s[%d], buffer %p\n",
-+		 __func__, node->name, node->id, buffer);
-+
-+	vb2_to_mmal_buffer(&buffer->mmal, &buffer->vb);
-+	v4l2_dbg(3, debug, &dev->v4l2_dev,
-+		 "%s: node %s[%d] - submitting  mmal dmabuf %p\n", __func__,
-+		 node->name, node->id, buffer->mmal.dma_buf);
-+	vchiq_mmal_submit_buffer(dev->mmal_instance, node->port, &buffer->mmal);
-+}
-+
-+static void bcm2835_isp_buffer_cleanup(struct vb2_buffer *vb)
-+{
-+	struct vb2_v4l2_buffer *vb2 = to_vb2_v4l2_buffer(vb);
-+	struct bcm2835_isp_buffer *buffer =
-+		container_of(vb2, struct bcm2835_isp_buffer, vb);
-+
-+	bcm2835_isp_mmal_buf_cleanup(&buffer->mmal);
-+}
-+
-+static int bcm2835_isp_node_start_streaming(struct vb2_queue *q,
-+					    unsigned int count)
-+{
-+	struct bcm2835_isp_node *node = vb2_get_drv_priv(q);
-+	struct bcm2835_isp_dev *dev = node_get_dev(node);
-+	int ret;
-+
-+	v4l2_dbg(1, debug, &dev->v4l2_dev, "%s: node %s[%d] (count %u)\n",
-+		 __func__, node->name, node->id, count);
-+
-+	ret = vchiq_mmal_component_enable(dev->mmal_instance, dev->component);
-+	if (ret) {
-+		v4l2_err(&dev->v4l2_dev, "%s: Failed enabling component, ret %d\n",
-+			 __func__, ret);
-+		return -EIO;
-+	}
-+
-+	node->sequence = 0;
-+	node->port->cb_ctx = node;
-+	ret = vchiq_mmal_port_enable(dev->mmal_instance, node->port,
-+				     mmal_buffer_cb);
-+	if (!ret)
-+		atomic_inc(&dev->num_streaming);
-+	else
-+		v4l2_err(&dev->v4l2_dev,
-+			 "%s: Failed enabling port, ret %d\n", __func__, ret);
-+
-+	return ret;
-+}
-+
-+static void bcm2835_isp_node_stop_streaming(struct vb2_queue *q)
-+{
-+	struct bcm2835_isp_node *node = vb2_get_drv_priv(q);
-+	struct bcm2835_isp_dev *dev = node_get_dev(node);
-+	unsigned int i;
-+	int ret;
-+
-+	v4l2_dbg(1, debug, &dev->v4l2_dev, "%s: node %s[%d], mmal port %p\n",
-+		 __func__, node->name, node->id, node->port);
-+
-+	init_completion(&dev->frame_cmplt);
-+
-+	/* Disable MMAL port - this will flush buffers back */
-+	ret = vchiq_mmal_port_disable(dev->mmal_instance, node->port);
-+	if (ret)
-+		v4l2_err(&dev->v4l2_dev,
-+			 "%s: Failed disabling %s port, ret %d\n", __func__,
-+			 node_is_output(node) ? "i/p" : "o/p",
-+			 ret);
-+
-+	while (atomic_read(&node->port->buffers_with_vpu)) {
-+		v4l2_dbg(1, debug, &dev->v4l2_dev,
-+			 "%s: Waiting for buffers to be returned - %d outstanding\n",
-+			 __func__, atomic_read(&node->port->buffers_with_vpu));
-+		ret = wait_for_completion_timeout(&dev->frame_cmplt,
-+						  COMPLETE_TIMEOUT);
-+		if (ret <= 0) {
-+			v4l2_err(&dev->v4l2_dev,
-+				 "%s: Timeout waiting for buffers to be returned - %d outstanding\n",
-+				 __func__,
-+				 atomic_read(&node->port->buffers_with_vpu));
-+			break;
-+		}
-+	}
-+
-+	/* Release the VCSM handle here to release the associated dmabuf */
-+	for (i = 0; i < q->num_buffers; i++) {
-+		struct vb2_v4l2_buffer *vb2 = to_vb2_v4l2_buffer(q->bufs[i]);
-+		struct bcm2835_isp_buffer *buf =
-+			container_of(vb2, struct bcm2835_isp_buffer, vb);
-+		bcm2835_isp_mmal_buf_cleanup(&buf->mmal);
-+	}
-+
-+	atomic_dec(&dev->num_streaming);
-+	/* If all ports disabled, then disable the component */
-+	if (atomic_read(&dev->num_streaming) == 0) {
-+		ret = vchiq_mmal_component_disable(dev->mmal_instance,
-+						   dev->component);
-+		if (ret) {
-+			v4l2_err(&dev->v4l2_dev,
-+				 "%s: Failed disabling component, ret %d\n",
-+				 __func__, ret);
-+		}
-+	}
-+
-+	/*
-+	 * Simply wait for any vb2 buffers to finish. We could take steps to
-+	 * make them complete more quickly if we care, or even return them
-+	 * ourselves.
-+	 */
-+	vb2_wait_for_all_buffers(&node->queue);
-+}
-+
-+static const struct vb2_ops bcm2835_isp_node_queue_ops = {
-+	.queue_setup		= bcm2835_isp_node_queue_setup,
-+	.buf_init		= bcm2835_isp_buf_init,
-+	.buf_prepare		= bcm2835_isp_buf_prepare,
-+	.buf_queue		= bcm2835_isp_node_buffer_queue,
-+	.buf_cleanup		= bcm2835_isp_buffer_cleanup,
-+	.start_streaming	= bcm2835_isp_node_start_streaming,
-+	.stop_streaming		= bcm2835_isp_node_stop_streaming,
-+};
-+
-+static const
-+struct bcm2835_isp_fmt *get_default_format(struct bcm2835_isp_node *node)
-+{
-+	return node->supported_fmts[0];
-+}
-+
-+static inline unsigned int get_bytesperline(int width,
-+					    const struct bcm2835_isp_fmt *fmt)
-+{
-+	/* GPU aligns 24bpp images to a multiple of 32 pixels (not bytes). */
-+	if (fmt->depth == 24)
-+		return ALIGN(width, 32) * 3;
-+	else
-+		return ALIGN((width * fmt->depth) >> 3, fmt->bytesperline_align);
-+}
-+
-+static inline unsigned int get_sizeimage(int bpl, int width, int height,
-+					 const struct bcm2835_isp_fmt *fmt)
-+{
-+	return (bpl * height * fmt->size_multiplier_x2) >> 1;
-+}
-+
-+static int bcm2835_isp_s_ctrl(struct v4l2_ctrl *ctrl)
-+{
-+	struct bcm2835_isp_dev *dev =
-+	      container_of(ctrl->handler, struct bcm2835_isp_dev, ctrl_handler);
-+	struct bcm2835_isp_node *node = &dev->node[0];
-+	int ret = 0;
-+
-+	/*
-+	 * The ISP firmware driver will ensure these settings are applied on
-+	 * a frame boundary, so we are safe to write them as they come in.
-+	 *
-+	 * Note that the bcm2835_isp_* param structures are identical to the
-+	 * mmal-parameters.h definitions.  This avoids the need for unnecessary
-+	 * field-by-field copying between structures.
-+	 */
-+	switch (ctrl->id) {
-+	case V4L2_CID_RED_BALANCE:
-+		dev->r_gain = ctrl->val;
-+		ret = set_wb_gains(node);
-+		break;
-+	case V4L2_CID_BLUE_BALANCE:
-+		dev->b_gain = ctrl->val;
-+		ret = set_wb_gains(node);
-+		break;
-+	case V4L2_CID_DIGITAL_GAIN:
-+		ret = set_digital_gain(node, ctrl->val);
-+		break;
-+	case V4L2_CID_USER_BCM2835_ISP_CC_MATRIX:
-+		ret = set_isp_param(node, MMAL_PARAMETER_CUSTOM_CCM,
-+				    ctrl->p_new.p_u8,
-+				    sizeof(struct bcm2835_isp_custom_ccm));
-+		break;
-+	case V4L2_CID_USER_BCM2835_ISP_LENS_SHADING:
-+	{
-+		struct bcm2835_isp_lens_shading *v4l2_ls;
-+		struct mmal_parameter_lens_shading_v2 ls;
-+		struct dma_buf *dmabuf;
-+		void *vcsm_handle;
-+
-+		v4l2_ls = (struct bcm2835_isp_lens_shading *)ctrl->p_new.p_u8;
-+		/*
-+		 * struct bcm2835_isp_lens_shading and struct
-+		 * mmal_parameter_lens_shading_v2 match so that we can do a
-+		 * simple memcpy here.
-+		 * Only the dmabuf to the actual table needs any manipulation.
-+		 */
-+		memcpy(&ls, v4l2_ls, sizeof(ls));
-+
-+		dmabuf = dma_buf_get(v4l2_ls->dmabuf);
-+		if (IS_ERR_OR_NULL(dmabuf))
-+			return -EINVAL;
-+
-+		ret = vc_sm_cma_import_dmabuf(dmabuf, &vcsm_handle);
-+		if (ret) {
-+			dma_buf_put(dmabuf);
-+			return -EINVAL;
-+		}
-+
-+		ls.mem_handle_table = vc_sm_cma_int_handle(vcsm_handle);
-+		if (ls.mem_handle_table)
-+			/* The VPU will take a reference on the vcsm handle,
-+			 * which in turn will retain a reference on the dmabuf.
-+			 * This code can therefore safely release all
-+			 * references to the buffer.
-+			 */
-+			ret = set_isp_param(node,
-+					    MMAL_PARAMETER_LENS_SHADING_OVERRIDE,
-+					    &ls,
-+					    sizeof(ls));
-+		else
-+			ret = -EINVAL;
-+
-+		vc_sm_cma_free(vcsm_handle);
-+		dma_buf_put(dmabuf);
-+		break;
-+	}
-+	case V4L2_CID_USER_BCM2835_ISP_BLACK_LEVEL:
-+		ret = set_isp_param(node, MMAL_PARAMETER_BLACK_LEVEL,
-+				    ctrl->p_new.p_u8,
-+				    sizeof(struct bcm2835_isp_black_level));
-+		break;
-+	case V4L2_CID_USER_BCM2835_ISP_GEQ:
-+		ret = set_isp_param(node, MMAL_PARAMETER_GEQ,
-+				    ctrl->p_new.p_u8,
-+				    sizeof(struct bcm2835_isp_geq));
-+		break;
-+	case V4L2_CID_USER_BCM2835_ISP_GAMMA:
-+		ret = set_isp_param(node, MMAL_PARAMETER_GAMMA,
-+				    ctrl->p_new.p_u8,
-+				    sizeof(struct bcm2835_isp_gamma));
-+		break;
-+	case V4L2_CID_USER_BCM2835_ISP_DENOISE:
-+		ret = set_isp_param(node, MMAL_PARAMETER_DENOISE,
-+				    ctrl->p_new.p_u8,
-+				    sizeof(struct bcm2835_isp_denoise));
-+		break;
-+	case V4L2_CID_USER_BCM2835_ISP_SHARPEN:
-+		ret = set_isp_param(node, MMAL_PARAMETER_SHARPEN,
-+				    ctrl->p_new.p_u8,
-+				    sizeof(struct bcm2835_isp_sharpen));
-+		break;
-+	case V4L2_CID_USER_BCM2835_ISP_DPC:
-+		ret = set_isp_param(node, MMAL_PARAMETER_DPC,
-+				    ctrl->p_new.p_u8,
-+				    sizeof(struct bcm2835_isp_dpc));
-+		break;
-+	default:
-+		v4l2_info(&dev->v4l2_dev, "Unrecognised control\n");
-+		ret = -EINVAL;
-+	}
-+
-+	if (ret) {
-+		v4l2_err(&dev->v4l2_dev, "%s: Failed setting ctrl \"%s\" (%08x), err %d\n",
-+			 __func__, ctrl->name, ctrl->id, ret);
-+		ret = -EIO;
-+	}
-+
-+	return ret;
-+}
-+
-+static const struct v4l2_ctrl_ops bcm2835_isp_ctrl_ops = {
-+	.s_ctrl = bcm2835_isp_s_ctrl,
-+};
-+
-+static const struct v4l2_file_operations bcm2835_isp_fops = {
-+	.owner		= THIS_MODULE,
-+	.open		= v4l2_fh_open,
-+	.release	= vb2_fop_release,
-+	.poll		= vb2_fop_poll,
-+	.unlocked_ioctl = video_ioctl2,
-+	.mmap		= vb2_fop_mmap
-+};
-+
-+static int populate_qdata_fmt(struct v4l2_format *f,
-+			      struct bcm2835_isp_node *node)
-+{
-+	struct bcm2835_isp_dev *dev = node_get_dev(node);
-+	struct bcm2835_isp_q_data *q_data = &node->q_data;
-+	int ret;
-+
-+	if (!node_is_stats(node)) {
-+		v4l2_dbg(1, debug, &dev->v4l2_dev,
-+			 "%s: Setting pix format for type %d, wxh: %ux%u, fmt: %08x, size %u\n",
-+			 __func__, f->type, f->fmt.pix.width, f->fmt.pix.height,
-+			 f->fmt.pix.pixelformat, f->fmt.pix.sizeimage);
-+
-+		q_data->fmt = find_format(f, node);
-+		q_data->width = f->fmt.pix.width;
-+		q_data->height = f->fmt.pix.height;
-+		q_data->height = f->fmt.pix.height;
-+
-+		/* All parameters should have been set correctly by try_fmt */
-+		q_data->bytesperline = f->fmt.pix.bytesperline;
-+		q_data->sizeimage = f->fmt.pix.sizeimage;
-+	} else {
-+		v4l2_dbg(1, debug, &dev->v4l2_dev,
-+			 "%s: Setting meta format for fmt: %08x, size %u\n",
-+			 __func__, f->fmt.meta.dataformat,
-+			 f->fmt.meta.buffersize);
-+
-+		q_data->fmt = find_format(f, node);
-+		q_data->width = 0;
-+		q_data->height = 0;
-+		q_data->bytesperline = 0;
-+		q_data->sizeimage = f->fmt.meta.buffersize;
-+	}
-+
-+	v4l2_dbg(1, debug, &dev->v4l2_dev,
-+		 "%s: Calculated bpl as %u, size %u\n", __func__,
-+		 q_data->bytesperline, q_data->sizeimage);
-+
-+	setup_mmal_port_format(node, node->port);
-+	ret = vchiq_mmal_port_set_format(dev->mmal_instance, node->port);
-+	if (ret) {
-+		v4l2_err(&dev->v4l2_dev,
-+			 "%s: Failed vchiq_mmal_port_set_format on port, ret %d\n",
-+			 __func__, ret);
-+		ret = -EINVAL;
-+	}
-+
-+	if (q_data->sizeimage < node->port->minimum_buffer.size) {
-+		v4l2_err(&dev->v4l2_dev,
-+			 "%s: Current buffer size of %u < min buf size %u - driver mismatch to MMAL\n",
-+			 __func__,
-+			 q_data->sizeimage,
-+			 node->port->minimum_buffer.size);
-+	}
-+
-+	v4l2_dbg(1, debug, &dev->v4l2_dev,
-+		 "%s: Set format for type %d, wxh: %dx%d, fmt: %08x, size %u\n",
-+		 __func__, f->type, q_data->width, q_data->height,
-+		 q_data->fmt->fourcc, q_data->sizeimage);
-+
-+	return ret;
-+}
-+
-+static int bcm2835_isp_node_querycap(struct file *file, void *priv,
-+				     struct v4l2_capability *cap)
-+{
-+	strscpy(cap->driver, BCM2835_ISP_NAME, sizeof(cap->driver));
-+	strscpy(cap->card, BCM2835_ISP_NAME, sizeof(cap->card));
-+	snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:%s",
-+		 BCM2835_ISP_NAME);
-+
-+	return 0;
-+}
-+
-+static int bcm2835_isp_node_g_fmt(struct file *file, void *priv,
-+				  struct v4l2_format *f)
-+{
-+	struct bcm2835_isp_node *node = video_drvdata(file);
-+
-+	if (f->type != node->queue.type)
-+		return -EINVAL;
-+
-+	if (node_is_stats(node)) {
-+		f->fmt.meta.dataformat = V4L2_META_FMT_BCM2835_ISP_STATS;
-+		f->fmt.meta.buffersize =
-+			node->port->minimum_buffer.size;
-+	} else {
-+		struct bcm2835_isp_q_data *q_data = &node->q_data;
-+
-+		f->fmt.pix.width = q_data->width;
-+		f->fmt.pix.height = q_data->height;
-+		f->fmt.pix.field = V4L2_FIELD_NONE;
-+		f->fmt.pix.pixelformat = q_data->fmt->fourcc;
-+		f->fmt.pix.bytesperline = q_data->bytesperline;
-+		f->fmt.pix.sizeimage = q_data->sizeimage;
-+		f->fmt.pix.colorspace = q_data->fmt->colorspace;
-+	}
-+
-+	return 0;
-+}
-+
-+static int bcm2835_isp_node_enum_fmt(struct file *file, void  *priv,
-+				     struct v4l2_fmtdesc *f)
-+{
-+	struct bcm2835_isp_node *node = video_drvdata(file);
-+
-+	if (f->type != node->queue.type)
-+		return -EINVAL;
-+
-+	if (f->index < node->num_supported_fmts) {
-+		/* Format found */
-+		f->pixelformat = node->supported_fmts[f->index]->fourcc;
-+		f->flags = 0;
-+		return 0;
-+	}
-+
-+	return -EINVAL;
-+}
-+
-+static int bcm2835_isp_enum_framesizes(struct file *file, void *priv,
-+				       struct v4l2_frmsizeenum *fsize)
-+{
-+	struct bcm2835_isp_node *node = video_drvdata(file);
-+	struct bcm2835_isp_dev *dev = node_get_dev(node);
-+	const struct bcm2835_isp_fmt *fmt;
-+
-+	if (node_is_stats(node) || fsize->index)
-+		return -EINVAL;
-+
-+	fmt = find_format_by_fourcc(fsize->pixel_format, node);
-+	if (!fmt) {
-+		v4l2_err(&dev->v4l2_dev, "Invalid pixel code: %x\n",
-+			 fsize->pixel_format);
-+		return -EINVAL;
-+	}
-+
-+	fsize->type = V4L2_FRMSIZE_TYPE_STEPWISE;
-+	fsize->stepwise.min_width = MIN_DIM;
-+	fsize->stepwise.max_width = MAX_DIM;
-+	fsize->stepwise.step_width = fmt->step_size;
-+
-+	fsize->stepwise.min_height = MIN_DIM;
-+	fsize->stepwise.max_height = MAX_DIM;
-+	fsize->stepwise.step_height = fmt->step_size;
-+
-+	return 0;
-+}
-+
-+static int bcm2835_isp_node_try_fmt(struct file *file, void *priv,
-+				    struct v4l2_format *f)
-+{
-+	struct bcm2835_isp_node *node = video_drvdata(file);
-+	const struct bcm2835_isp_fmt *fmt;
-+
-+	if (f->type != node->queue.type)
-+		return -EINVAL;
-+
-+	fmt = find_format(f, node);
-+	if (!fmt)
-+		fmt = get_default_format(node);
-+
-+	if (!node_is_stats(node)) {
-+		f->fmt.pix.width = max(min(f->fmt.pix.width, MAX_DIM),
-+				       MIN_DIM);
-+		f->fmt.pix.height = max(min(f->fmt.pix.height, MAX_DIM),
-+					MIN_DIM);
-+
-+		f->fmt.pix.pixelformat = fmt->fourcc;
-+		f->fmt.pix.colorspace = fmt->colorspace;
-+		f->fmt.pix.bytesperline = get_bytesperline(f->fmt.pix.width,
-+							   fmt);
-+		f->fmt.pix.field = V4L2_FIELD_NONE;
-+		f->fmt.pix.sizeimage =
-+			get_sizeimage(f->fmt.pix.bytesperline, f->fmt.pix.width,
-+				      f->fmt.pix.height, fmt);
-+	} else {
-+		f->fmt.meta.dataformat = fmt->fourcc;
-+		f->fmt.meta.buffersize = node->port->minimum_buffer.size;
-+	}
-+
-+	return 0;
-+}
-+
-+static int bcm2835_isp_node_s_fmt(struct file *file, void *priv,
-+				  struct v4l2_format *f)
-+{
-+	struct bcm2835_isp_node *node = video_drvdata(file);
-+	int ret;
-+
-+	if (f->type != node->queue.type)
-+		return -EINVAL;
-+
-+	ret = bcm2835_isp_node_try_fmt(file, priv, f);
-+	if (ret)
-+		return ret;
-+
-+	v4l2_dbg(1, debug, &node_get_dev(node)->v4l2_dev,
-+		 "%s: Set format for node %s[%d]\n",
-+		 __func__, node->name, node->id);
-+
-+	return populate_qdata_fmt(f, node);
-+}
-+
-+static int bcm2835_isp_node_s_selection(struct file *file, void *fh,
-+					struct v4l2_selection *s)
-+{
-+	struct mmal_parameter_crop crop;
-+	struct bcm2835_isp_node *node = video_drvdata(file);
-+	struct bcm2835_isp_dev *dev = node_get_dev(node);
-+
-+	/* This return value is required fro V4L2 compliance. */
-+	if (node_is_stats(node))
-+		return -ENOTTY;
-+
-+	if (!s->r.width || !s->r.height)
-+		return -EINVAL;
-+
-+	/* We can only set crop on the input. */
-+	switch (s->target) {
-+	case V4L2_SEL_TGT_CROP:
-+		/*
-+		 * Adjust the crop window if it goes outside of the frame
-+		 * dimensions.
-+		 */
-+		s->r.left = min((unsigned int)max(s->r.left, 0),
-+				node->q_data.width - MIN_DIM);
-+		s->r.top = min((unsigned int)max(s->r.top, 0),
-+			       node->q_data.height - MIN_DIM);
-+		s->r.width = max(min(s->r.width,
-+				     node->q_data.width - s->r.left), MIN_DIM);
-+		s->r.height = max(min(s->r.height,
-+				      node->q_data.height - s->r.top), MIN_DIM);
-+		break;
-+	case V4L2_SEL_TGT_CROP_DEFAULT:
-+		/* Default (i.e. no) crop window. */
-+		s->r.left = 0;
-+		s->r.top = 0;
-+		s->r.width = node->q_data.width;
-+		s->r.height = node->q_data.height;
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	crop.rect.x = s->r.left;
-+	crop.rect.y = s->r.top;
-+	crop.rect.width = s->r.width;
-+	crop.rect.height = s->r.height;
-+
-+	return vchiq_mmal_port_parameter_set(dev->mmal_instance, node->port,
-+					     MMAL_PARAMETER_CROP,
-+					     &crop, sizeof(crop));
-+}
-+
-+static int bcm2835_isp_node_g_selection(struct file *file, void *fh,
-+					struct v4l2_selection *s)
-+{
-+	struct mmal_parameter_crop crop;
-+	struct bcm2835_isp_node *node = video_drvdata(file);
-+	struct bcm2835_isp_dev *dev = node_get_dev(node);
-+	u32 crop_size = sizeof(crop);
-+	int ret;
-+
-+	/* We can only return out an input crop. */
-+	switch (s->target) {
-+	case V4L2_SEL_TGT_CROP:
-+		ret = vchiq_mmal_port_parameter_get(dev->mmal_instance,
-+						    node->port,
-+						    MMAL_PARAMETER_CROP,
-+						    &crop, &crop_size);
-+		if (!ret) {
-+			s->r.left = crop.rect.x;
-+			s->r.top = crop.rect.y;
-+			s->r.width = crop.rect.width;
-+			s->r.height = crop.rect.height;
-+		}
-+		break;
-+	case V4L2_SEL_TGT_CROP_DEFAULT:
-+	case V4L2_SEL_TGT_CROP_BOUNDS:
-+		/* Default (i.e. no) crop window. */
-+		s->r.left = 0;
-+		s->r.top = 0;
-+		s->r.width = node->q_data.width;
-+		s->r.height = node->q_data.height;
-+		ret = 0;
-+		break;
-+	default:
-+		ret =  -EINVAL;
-+	}
-+
-+	return ret;
-+}
-+
-+static int bcm3285_isp_subscribe_event(struct v4l2_fh *fh,
-+				       const struct v4l2_event_subscription *s)
-+{
-+	switch (s->type) {
-+	/* Cannot change source parameters dynamically at runtime. */
-+	case V4L2_EVENT_SOURCE_CHANGE:
-+		return -EINVAL;
-+	case V4L2_EVENT_CTRL:
-+		return v4l2_ctrl_subscribe_event(fh, s);
-+	default:
-+		return v4l2_event_subscribe(fh, s, 4, NULL);
-+	}
-+}
-+
-+static const struct v4l2_ioctl_ops bcm2835_isp_node_ioctl_ops = {
-+	.vidioc_querycap		= bcm2835_isp_node_querycap,
-+	.vidioc_g_fmt_vid_cap		= bcm2835_isp_node_g_fmt,
-+	.vidioc_g_fmt_vid_out		= bcm2835_isp_node_g_fmt,
-+	.vidioc_g_fmt_meta_cap		= bcm2835_isp_node_g_fmt,
-+	.vidioc_s_fmt_vid_cap		= bcm2835_isp_node_s_fmt,
-+	.vidioc_s_fmt_vid_out		= bcm2835_isp_node_s_fmt,
-+	.vidioc_s_fmt_meta_cap		= bcm2835_isp_node_s_fmt,
-+	.vidioc_try_fmt_vid_cap		= bcm2835_isp_node_try_fmt,
-+	.vidioc_try_fmt_vid_out		= bcm2835_isp_node_try_fmt,
-+	.vidioc_try_fmt_meta_cap	= bcm2835_isp_node_try_fmt,
-+	.vidioc_s_selection		= bcm2835_isp_node_s_selection,
-+	.vidioc_g_selection		= bcm2835_isp_node_g_selection,
-+
-+	.vidioc_enum_fmt_vid_cap	= bcm2835_isp_node_enum_fmt,
-+	.vidioc_enum_fmt_vid_out	= bcm2835_isp_node_enum_fmt,
-+	.vidioc_enum_fmt_meta_cap	= bcm2835_isp_node_enum_fmt,
-+	.vidioc_enum_framesizes		= bcm2835_isp_enum_framesizes,
-+
-+	.vidioc_reqbufs			= vb2_ioctl_reqbufs,
-+	.vidioc_querybuf		= vb2_ioctl_querybuf,
-+	.vidioc_qbuf			= vb2_ioctl_qbuf,
-+	.vidioc_dqbuf			= vb2_ioctl_dqbuf,
-+	.vidioc_expbuf			= vb2_ioctl_expbuf,
-+	.vidioc_create_bufs		= vb2_ioctl_create_bufs,
-+	.vidioc_prepare_buf		= vb2_ioctl_prepare_buf,
-+
-+	.vidioc_streamon		= vb2_ioctl_streamon,
-+	.vidioc_streamoff		= vb2_ioctl_streamoff,
-+
-+	.vidioc_subscribe_event		= bcm3285_isp_subscribe_event,
-+	.vidioc_unsubscribe_event	= v4l2_event_unsubscribe,
-+};
-+
-+/*
-+ * Size of the array to provide to the VPU when asking for the list of supported
-+ * formats.
-+ *
-+ * The ISP component currently advertises 44 input formats, so add a small
-+ * overhead on that. Should the component advertise more formats then the excess
-+ * will be dropped and a warning logged.
-+ */
-+#define MAX_SUPPORTED_ENCODINGS 50
-+
-+/* Populate node->supported_fmts with the formats supported by those ports. */
-+static int bcm2835_isp_get_supported_fmts(struct bcm2835_isp_node *node)
-+{
-+	struct bcm2835_isp_dev *dev = node_get_dev(node);
-+	struct bcm2835_isp_fmt const **list;
-+	unsigned int i, j, num_encodings;
-+	u32 fourccs[MAX_SUPPORTED_ENCODINGS];
-+	u32 param_size = sizeof(fourccs);
-+	int ret;
-+
-+	ret = vchiq_mmal_port_parameter_get(dev->mmal_instance, node->port,
-+					    MMAL_PARAMETER_SUPPORTED_ENCODINGS,
-+					    &fourccs, &param_size);
-+
-+	if (ret) {
-+		if (ret == MMAL_MSG_STATUS_ENOSPC) {
-+			v4l2_err(&dev->v4l2_dev,
-+				 "%s: port has more encoding than we provided space for. Some are dropped.\n",
-+				 __func__);
-+			num_encodings = MAX_SUPPORTED_ENCODINGS;
-+		} else {
-+			v4l2_err(&dev->v4l2_dev, "%s: get_param ret %u.\n",
-+				 __func__, ret);
-+			return -EINVAL;
-+		}
-+	} else {
-+		num_encodings = param_size / sizeof(u32);
-+	}
-+
-+	/*
-+	 * Assume at this stage that all encodings will be supported in V4L2.
-+	 * Any that aren't supported will waste a very small amount of memory.
-+	 */
-+	list = devm_kzalloc(dev->dev,
-+			    sizeof(struct bcm2835_isp_fmt *) * num_encodings,
-+			    GFP_KERNEL);
-+	if (!list)
-+		return -ENOMEM;
-+	node->supported_fmts = list;
-+
-+	for (i = 0, j = 0; i < num_encodings; i++) {
-+		const struct bcm2835_isp_fmt *fmt = get_fmt(fourccs[i]);
-+
-+		if (fmt) {
-+			list[j] = fmt;
-+			j++;
-+		}
-+	}
-+	node->num_supported_fmts = j;
-+
-+	return 0;
-+}
-+
-+/*
-+ * Register a device node /dev/video<N> to go along with one of the ISP's input
-+ * or output nodes.
-+ */
-+static int register_node(struct bcm2835_isp_dev *dev,
-+			 struct bcm2835_isp_node *node,
-+			 int index)
-+{
-+	struct video_device *vfd;
-+	struct vb2_queue *queue;
-+	int ret;
-+
-+	mutex_init(&node->lock);
-+
-+	node->dev = dev;
-+	vfd = &node->vfd;
-+	queue = &node->queue;
-+	queue->type = index_to_queue_type(index);
-+	/*
-+	 * Setup the node type-specific params.
-+	 *
-+	 * Only the OUTPUT node can set controls and crop windows. However,
-+	 * we must allow the s/g_selection ioctl on the stats node as v4l2
-+	 * compliance expects it to return a -ENOTTY, and the framework
-+	 * does not handle it if the ioctl is disabled.
-+	 */
-+	switch (queue->type) {
-+	case V4L2_BUF_TYPE_VIDEO_OUTPUT:
-+		vfd->device_caps = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING;
-+		node->id = index;
-+		node->vfl_dir = VFL_DIR_TX;
-+		node->name = "output";
-+		node->port = &dev->component->input[node->id];
-+		break;
-+	case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-+		vfd->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
-+		/* First Capture node starts at id 0, etc. */
-+		node->id = index - BCM2835_ISP_NUM_OUTPUTS;
-+		node->vfl_dir = VFL_DIR_RX;
-+		node->name = "capture";
-+		node->port = &dev->component->output[node->id];
-+		v4l2_disable_ioctl(&node->vfd, VIDIOC_S_CTRL);
-+		v4l2_disable_ioctl(&node->vfd, VIDIOC_S_SELECTION);
-+		v4l2_disable_ioctl(&node->vfd, VIDIOC_G_SELECTION);
-+		break;
-+	case V4L2_BUF_TYPE_META_CAPTURE:
-+		vfd->device_caps = V4L2_CAP_META_CAPTURE | V4L2_CAP_STREAMING;
-+		node->id = index - BCM2835_ISP_NUM_OUTPUTS;
-+		node->vfl_dir = VFL_DIR_RX;
-+		node->name = "stats";
-+		node->port = &dev->component->output[node->id];
-+		v4l2_disable_ioctl(&node->vfd, VIDIOC_S_CTRL);
-+		v4l2_disable_ioctl(&node->vfd, VIDIOC_S_SELECTION);
-+		v4l2_disable_ioctl(&node->vfd, VIDIOC_G_SELECTION);
-+		break;
-+	}
-+
-+	/* We use the selection API instead of the old crop API. */
-+	v4l2_disable_ioctl(vfd, VIDIOC_CROPCAP);
-+	v4l2_disable_ioctl(vfd, VIDIOC_G_CROP);
-+	v4l2_disable_ioctl(vfd, VIDIOC_S_CROP);
-+
-+	ret = bcm2835_isp_get_supported_fmts(node);
-+	if (ret)
-+		return ret;
-+
-+	/* Initialise the video node. */
-+	vfd->vfl_type	= VFL_TYPE_VIDEO;
-+	vfd->fops	= &bcm2835_isp_fops,
-+	vfd->ioctl_ops	= &bcm2835_isp_node_ioctl_ops,
-+	vfd->minor	= -1,
-+	vfd->release	= video_device_release_empty,
-+	vfd->queue	= &node->queue;
-+	vfd->lock	= &node->lock;
-+	vfd->v4l2_dev	= &dev->v4l2_dev;
-+	vfd->vfl_dir	= node->vfl_dir;
-+
-+	node->q_data.fmt = get_default_format(node);
-+	node->q_data.width = DEFAULT_DIM;
-+	node->q_data.height = DEFAULT_DIM;
-+	node->q_data.bytesperline =
-+		get_bytesperline(DEFAULT_DIM, node->q_data.fmt);
-+	node->q_data.sizeimage = node_is_stats(node) ?
-+				 node->port->recommended_buffer.size :
-+				 get_sizeimage(node->q_data.bytesperline,
-+					       node->q_data.width,
-+					       node->q_data.height,
-+					       node->q_data.fmt);
-+
-+	queue->io_modes = VB2_MMAP | VB2_DMABUF;
-+	queue->drv_priv = node;
-+	queue->ops = &bcm2835_isp_node_queue_ops;
-+	queue->mem_ops = &vb2_dma_contig_memops;
-+	queue->buf_struct_size = sizeof(struct bcm2835_isp_buffer);
-+	queue->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
-+	queue->dev = dev->dev;
-+	queue->lock = &node->queue_lock;
-+
-+	ret = vb2_queue_init(queue);
-+	if (ret < 0) {
-+		v4l2_info(&dev->v4l2_dev, "vb2_queue_init failed\n");
-+		return ret;
-+	}
-+
-+	/* Set some controls and defaults, but only on the VIDEO_OUTPUT node. */
-+	if (node_is_output(node)) {
-+		unsigned int i;
-+
-+		/* Use this ctrl template to assign custom ISP ctrls. */
-+		struct v4l2_ctrl_config ctrl_template = {
-+			.ops		= &bcm2835_isp_ctrl_ops,
-+			.type		= V4L2_CTRL_TYPE_U8,
-+			.def		= 0,
-+			.min		= 0x00,
-+			.max		= 0xff,
-+			.step		= 1,
-+		};
-+
-+		/* 3 standard controls, and an array of custom controls */
-+		ret = v4l2_ctrl_handler_init(&dev->ctrl_handler,
-+					     3 + ARRAY_SIZE(custom_ctrls));
-+		if (ret) {
-+			v4l2_err(&dev->v4l2_dev, "ctrl_handler init failed (%d)\n",
-+				 ret);
-+			goto queue_cleanup;
-+		}
-+
-+		dev->r_gain = 1000;
-+		dev->b_gain = 1000;
-+
-+		v4l2_ctrl_new_std(&dev->ctrl_handler,  &bcm2835_isp_ctrl_ops,
-+				  V4L2_CID_RED_BALANCE, 1, 0xffff, 1,
-+				  dev->r_gain);
-+
-+		v4l2_ctrl_new_std(&dev->ctrl_handler, &bcm2835_isp_ctrl_ops,
-+				  V4L2_CID_BLUE_BALANCE, 1, 0xffff, 1,
-+				  dev->b_gain);
-+
-+		v4l2_ctrl_new_std(&dev->ctrl_handler, &bcm2835_isp_ctrl_ops,
-+				  V4L2_CID_DIGITAL_GAIN, 1, 0xffff, 1, 1000);
-+
-+		for (i = 0; i < ARRAY_SIZE(custom_ctrls); i++) {
-+			ctrl_template.name = custom_ctrls[i].name;
-+			ctrl_template.id = custom_ctrls[i].id;
-+			ctrl_template.dims[0] = custom_ctrls[i].size;
-+			ctrl_template.flags = custom_ctrls[i].flags;
-+			v4l2_ctrl_new_custom(&dev->ctrl_handler,
-+					     &ctrl_template, NULL);
-+		}
-+
-+		node->vfd.ctrl_handler = &dev->ctrl_handler;
-+		if (dev->ctrl_handler.error) {
-+			ret = dev->ctrl_handler.error;
-+			v4l2_err(&dev->v4l2_dev, "controls init failed (%d)\n",
-+				 ret);
-+			v4l2_ctrl_handler_free(&dev->ctrl_handler);
-+			goto ctrl_cleanup;
-+		}
-+	}
-+
-+	/* Define the device names */
-+	snprintf(vfd->name, sizeof(node->vfd.name), "%s-%s%d", BCM2835_ISP_NAME,
-+		 node->name, node->id);
-+
-+	ret = video_register_device(vfd, VFL_TYPE_VIDEO, video_nr + index);
-+	if (ret) {
-+		v4l2_err(&dev->v4l2_dev,
-+			 "Failed to register video %s[%d] device node\n",
-+			 node->name, node->id);
-+		goto ctrl_cleanup;
-+	}
-+
-+	node->registered = true;
-+	video_set_drvdata(vfd, node);
-+
-+	v4l2_info(&dev->v4l2_dev,
-+		  "Device node %s[%d] registered as /dev/video%d\n",
-+		  node->name, node->id, vfd->num);
-+
-+	return 0;
-+
-+ctrl_cleanup:
-+	if (node_is_output(node))
-+		v4l2_ctrl_handler_free(&dev->ctrl_handler);
-+queue_cleanup:
-+	vb2_queue_release(&node->queue);
-+	return ret;
-+}
-+
-+/* Unregister one of the /dev/video<N> nodes associated with the ISP. */
-+static void unregister_node(struct bcm2835_isp_node *node)
-+{
-+	struct bcm2835_isp_dev *dev = node_get_dev(node);
-+
-+	v4l2_info(&dev->v4l2_dev,
-+		  "Unregistering node %s[%d] device node /dev/video%d\n",
-+		  node->name, node->id, node->vfd.num);
-+
-+	if (node->registered) {
-+		video_unregister_device(&node->vfd);
-+		if (node_is_output(node))
-+			v4l2_ctrl_handler_free(&dev->ctrl_handler);
-+		vb2_queue_release(&node->queue);
-+	}
-+
-+	/*
-+	 * node->supported_fmts.list is free'd automatically
-+	 * as a managed resource.
-+	 */
-+	node->supported_fmts = NULL;
-+	node->num_supported_fmts = 0;
-+	node->vfd.ctrl_handler = NULL;
-+	node->registered = false;
-+}
-+
-+static void media_controller_unregister(struct bcm2835_isp_dev *dev)
-+{
-+	unsigned int i;
-+
-+	v4l2_info(&dev->v4l2_dev, "Unregister from media controller\n");
-+
-+	if (dev->media_device_registered) {
-+		media_device_unregister(&dev->mdev);
-+		media_device_cleanup(&dev->mdev);
-+		dev->media_device_registered = false;
-+	}
-+
-+	kfree(dev->entity.name);
-+	dev->entity.name = NULL;
-+
-+	if (dev->media_entity_registered) {
-+		media_device_unregister_entity(&dev->entity);
-+		dev->media_entity_registered = false;
-+	}
-+
-+	for (i = 0; i < BCM2835_ISP_NUM_NODES; i++) {
-+		struct bcm2835_isp_node *node = &dev->node[i];
-+
-+		if (node->media_node_registered) {
-+			media_remove_intf_links(node->intf_link->intf);
-+			media_entity_remove_links(&dev->node[i].vfd.entity);
-+			media_devnode_remove(node->intf_devnode);
-+			media_device_unregister_entity(&node->vfd.entity);
-+			kfree(node->vfd.entity.name);
-+		}
-+		node->media_node_registered = false;
-+	}
-+
-+	dev->v4l2_dev.mdev = NULL;
-+}
-+
-+static int media_controller_register_node(struct bcm2835_isp_dev *dev, int num)
-+{
-+	struct bcm2835_isp_node *node = &dev->node[num];
-+	struct media_entity *entity = &node->vfd.entity;
-+	int output = node_is_output(node);
-+	char *name;
-+	int ret;
-+
-+	v4l2_info(&dev->v4l2_dev,
-+		  "Register %s node %d with media controller\n",
-+		  output ? "output" : "capture", num);
-+	entity->obj_type = MEDIA_ENTITY_TYPE_VIDEO_DEVICE;
-+	entity->function = MEDIA_ENT_F_IO_V4L;
-+	entity->info.dev.major = VIDEO_MAJOR;
-+	entity->info.dev.minor = node->vfd.minor;
-+	name = kmalloc(BCM2835_ISP_ENTITY_NAME_LEN, GFP_KERNEL);
-+	if (!name) {
-+		ret = -ENOMEM;
-+		goto error_no_mem;
-+	}
-+	snprintf(name, BCM2835_ISP_ENTITY_NAME_LEN, "%s0-%s%d",
-+		 BCM2835_ISP_NAME, output ? "output" : "capture", num);
-+	entity->name = name;
-+	node->pad.flags = output ? MEDIA_PAD_FL_SOURCE : MEDIA_PAD_FL_SINK;
-+	ret = media_entity_pads_init(entity, 1, &node->pad);
-+	if (ret)
-+		goto error_pads_init;
-+	ret = media_device_register_entity(&dev->mdev, entity);
-+	if (ret)
-+		goto error_register_entity;
-+
-+	node->intf_devnode = media_devnode_create(&dev->mdev,
-+						  MEDIA_INTF_T_V4L_VIDEO, 0,
-+						  VIDEO_MAJOR, node->vfd.minor);
-+	if (!node->intf_devnode) {
-+		ret = -ENOMEM;
-+		goto error_devnode_create;
-+	}
-+
-+	node->intf_link = media_create_intf_link(entity,
-+						 &node->intf_devnode->intf,
-+						 MEDIA_LNK_FL_IMMUTABLE |
-+						 MEDIA_LNK_FL_ENABLED);
-+	if (!node->intf_link) {
-+		ret = -ENOMEM;
-+		goto error_create_intf_link;
-+	}
-+
-+	if (output)
-+		ret = media_create_pad_link(entity, 0, &dev->entity, num,
-+					    MEDIA_LNK_FL_IMMUTABLE |
-+						    MEDIA_LNK_FL_ENABLED);
-+	else
-+		ret = media_create_pad_link(&dev->entity, num, entity, 0,
-+					    MEDIA_LNK_FL_IMMUTABLE |
-+					    MEDIA_LNK_FL_ENABLED);
-+	if (ret)
-+		goto error_create_pad_link;
-+
-+	dev->node[num].media_node_registered = true;
-+	return 0;
-+
-+error_create_pad_link:
-+	media_remove_intf_links(&node->intf_devnode->intf);
-+error_create_intf_link:
-+	media_devnode_remove(node->intf_devnode);
-+error_devnode_create:
-+	media_device_unregister_entity(&node->vfd.entity);
-+error_register_entity:
-+error_pads_init:
-+	kfree(entity->name);
-+	entity->name = NULL;
-+error_no_mem:
-+	if (ret)
-+		v4l2_info(&dev->v4l2_dev, "Error registering node\n");
-+
-+	return ret;
-+}
-+
-+static int media_controller_register(struct bcm2835_isp_dev *dev)
-+{
-+	char *name;
-+	unsigned int i;
-+	int ret;
-+
-+	v4l2_dbg(2, debug, &dev->v4l2_dev, "Registering with media controller\n");
-+	dev->mdev.dev = dev->dev;
-+	strscpy(dev->mdev.model, "bcm2835-isp",
-+		sizeof(dev->mdev.model));
-+	strscpy(dev->mdev.bus_info, "platform:bcm2835-isp",
-+		sizeof(dev->mdev.bus_info));
-+	media_device_init(&dev->mdev);
-+	dev->v4l2_dev.mdev = &dev->mdev;
-+
-+	v4l2_dbg(2, debug, &dev->v4l2_dev, "Register entity for nodes\n");
-+
-+	name = kmalloc(BCM2835_ISP_ENTITY_NAME_LEN, GFP_KERNEL);
-+	if (!name) {
-+		ret = -ENOMEM;
-+		goto done;
-+	}
-+	snprintf(name, BCM2835_ISP_ENTITY_NAME_LEN, "bcm2835_isp0");
-+	dev->entity.name = name;
-+	dev->entity.obj_type = MEDIA_ENTITY_TYPE_BASE;
-+	dev->entity.function = MEDIA_ENT_F_PROC_VIDEO_SCALER;
-+
-+	for (i = 0; i < BCM2835_ISP_NUM_NODES; i++) {
-+		dev->pad[i].flags = node_is_output(&dev->node[i]) ?
-+					MEDIA_PAD_FL_SINK : MEDIA_PAD_FL_SOURCE;
-+	}
-+
-+	ret = media_entity_pads_init(&dev->entity, BCM2835_ISP_NUM_NODES,
-+				     dev->pad);
-+	if (ret)
-+		goto done;
-+
-+	ret = media_device_register_entity(&dev->mdev, &dev->entity);
-+	if (ret)
-+		goto done;
-+
-+	dev->media_entity_registered = true;
-+	for (i = 0; i < BCM2835_ISP_NUM_NODES; i++) {
-+		ret = media_controller_register_node(dev, i);
-+		if (ret)
-+			goto done;
-+	}
-+
-+	ret = media_device_register(&dev->mdev);
-+	if (!ret)
-+		dev->media_device_registered = true;
-+done:
-+	return ret;
-+}
-+
-+static int bcm2835_isp_remove(struct platform_device *pdev)
-+{
-+	struct bcm2835_isp_dev *dev = platform_get_drvdata(pdev);
-+	unsigned int i;
-+
-+	media_controller_unregister(dev);
-+
-+	for (i = 0; i < BCM2835_ISP_NUM_NODES; i++)
-+		unregister_node(&dev->node[i]);
-+
-+	v4l2_device_unregister(&dev->v4l2_dev);
-+
-+	if (dev->component)
-+		vchiq_mmal_component_finalise(dev->mmal_instance,
-+					      dev->component);
-+
-+	vchiq_mmal_finalise(dev->mmal_instance);
-+
-+	return 0;
-+}
-+
-+static int bcm2835_isp_probe(struct platform_device *pdev)
-+{
-+	struct bcm2835_isp_dev *dev;
-+	unsigned int i;
-+	int ret;
-+
-+	dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
-+	if (!dev)
-+		return -ENOMEM;
-+
-+	dev->dev = &pdev->dev;
-+
-+	ret = v4l2_device_register(&pdev->dev, &dev->v4l2_dev);
-+	if (ret)
-+		return ret;
-+
-+	ret = vchiq_mmal_init(&dev->mmal_instance);
-+	if (ret) {
-+		v4l2_device_unregister(&dev->v4l2_dev);
-+		return ret;
-+	}
-+
-+	ret = vchiq_mmal_component_init(dev->mmal_instance, "ril.isp",
-+					&dev->component);
-+	if (ret) {
-+		v4l2_err(&dev->v4l2_dev,
-+			 "%s: failed to create ril.isp component\n", __func__);
-+		goto error;
-+	}
-+
-+	if (dev->component->inputs < BCM2835_ISP_NUM_OUTPUTS ||
-+	    dev->component->outputs < BCM2835_ISP_NUM_CAPTURES +
-+					BCM2835_ISP_NUM_METADATA) {
-+		v4l2_err(&dev->v4l2_dev,
-+			 "%s: ril.isp returned %d i/p (%d expected), %d o/p (%d expected) ports\n",
-+			  __func__, dev->component->inputs,
-+			  BCM2835_ISP_NUM_OUTPUTS,
-+			  dev->component->outputs,
-+			  BCM2835_ISP_NUM_CAPTURES + BCM2835_ISP_NUM_METADATA);
-+		goto error;
-+	}
-+
-+	atomic_set(&dev->num_streaming, 0);
-+
-+	for (i = 0; i < BCM2835_ISP_NUM_NODES; i++) {
-+		struct bcm2835_isp_node *node = &dev->node[i];
-+
-+		ret = register_node(dev, node, i);
-+		if (ret)
-+			goto error;
-+	}
-+
-+	ret = media_controller_register(dev);
-+	if (ret)
-+		goto error;
-+
-+	platform_set_drvdata(pdev, dev);
-+	v4l2_info(&dev->v4l2_dev, "Loaded V4L2 %s\n", BCM2835_ISP_NAME);
-+	return 0;
-+
-+error:
-+	bcm2835_isp_remove(pdev);
-+
-+	return ret;
-+}
-+
-+static struct platform_driver bcm2835_isp_pdrv = {
-+	.probe = bcm2835_isp_probe,
-+	.remove = bcm2835_isp_remove,
-+	.driver = {
-+			.name = BCM2835_ISP_NAME,
-+		  },
-+};
-+
-+module_platform_driver(bcm2835_isp_pdrv);
-+
-+MODULE_DESCRIPTION("BCM2835 ISP driver");
-+MODULE_AUTHOR("Naushir Patuck <naush@raspberrypi.com>");
-+MODULE_LICENSE("GPL");
-+MODULE_VERSION("1.0");
-+MODULE_ALIAS("platform:bcm2835-isp");
---- a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
-+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
-@@ -113,6 +113,10 @@
-  */
- #define MMAL_ENCODING_EGL_IMAGE        MMAL_FOURCC('E', 'G', 'L', 'I')
- 
-+/** ISP image statistics format
-+ */
-+#define MMAL_ENCODING_BRCM_STATS       MMAL_FOURCC('S', 'T', 'A', 'T')
-+
- /* }@ */
- 
- /** \name Pre-defined audio encodings */
---- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
-+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
-@@ -223,6 +223,62 @@ enum mmal_parameter_camera_type {
- 	MMAL_PARAMETER_SHUTTER_SPEED,
- 		/**< Takes a @ref MMAL_PARAMETER_AWB_GAINS_T */
- 	MMAL_PARAMETER_CUSTOM_AWB_GAINS,
-+		/**< Takes a @ref MMAL_PARAMETER_CAMERA_SETTINGS_T */
-+	MMAL_PARAMETER_CAMERA_SETTINGS,
-+		/**< Takes a @ref MMAL_PARAMETER_PRIVACY_INDICATOR_T */
-+	MMAL_PARAMETER_PRIVACY_INDICATOR,
-+		/**< Takes a @ref MMAL_PARAMETER_BOOLEAN_T */
-+	MMAL_PARAMETER_VIDEO_DENOISE,
-+		/**< Takes a @ref MMAL_PARAMETER_BOOLEAN_T */
-+	MMAL_PARAMETER_STILLS_DENOISE,
-+		/**< Takes a @ref MMAL_PARAMETER_CAMERA_ANNOTATE_T */
-+	MMAL_PARAMETER_ANNOTATE,
-+		/**< Takes a @ref MMAL_PARAMETER_STEREOSCOPIC_MODE_T */
-+	MMAL_PARAMETER_STEREOSCOPIC_MODE,
-+		/**< Takes a @ref MMAL_PARAMETER_CAMERA_INTERFACE_T */
-+	MMAL_PARAMETER_CAMERA_INTERFACE,
-+		/**< Takes a @ref MMAL_PARAMETER_CAMERA_CLOCKING_MODE_T */
-+	MMAL_PARAMETER_CAMERA_CLOCKING_MODE,
-+		/**< Takes a @ref MMAL_PARAMETER_CAMERA_RX_CONFIG_T */
-+	MMAL_PARAMETER_CAMERA_RX_CONFIG,
-+		/**< Takes a @ref MMAL_PARAMETER_CAMERA_RX_TIMING_T */
-+	MMAL_PARAMETER_CAMERA_RX_TIMING,
-+		/**< Takes a @ref MMAL_PARAMETER_UINT32_T */
-+	MMAL_PARAMETER_DPF_CONFIG,
-+
-+	/* 0x50 */
-+		/**< Takes a @ref MMAL_PARAMETER_UINT32_T */
-+	MMAL_PARAMETER_JPEG_RESTART_INTERVAL,
-+		/**< Takes a @ref MMAL_PARAMETER_UINT32_T */
-+	MMAL_PARAMETER_CAMERA_ISP_BLOCK_OVERRIDE,
-+		/**< Takes a @ref MMAL_PARAMETER_LENS_SHADING_T */
-+	MMAL_PARAMETER_LENS_SHADING_OVERRIDE,
-+		/**< Takes a @ref MMAL_PARAMETER_UINT32_T */
-+	MMAL_PARAMETER_BLACK_LEVEL,
-+		/**< Takes a @ref MMAL_PARAMETER_RESIZE_T */
-+	MMAL_PARAMETER_RESIZE_PARAMS,
-+		/**< Takes a @ref MMAL_PARAMETER_CROP_T */
-+	MMAL_PARAMETER_CROP,
-+		/**< Takes a @ref MMAL_PARAMETER_INT32_T */
-+	MMAL_PARAMETER_OUTPUT_SHIFT,
-+		/**< Takes a @ref MMAL_PARAMETER_INT32_T */
-+	MMAL_PARAMETER_CCM_SHIFT,
-+		/**< Takes a @ref MMAL_PARAMETER_CUSTOM_CCM_T */
-+	MMAL_PARAMETER_CUSTOM_CCM,
-+		/**< Takes a @ref MMAL_PARAMETER_RATIONAL_T */
-+	MMAL_PARAMETER_ANALOG_GAIN,
-+		/**< Takes a @ref MMAL_PARAMETER_RATIONAL_T */
-+	MMAL_PARAMETER_DIGITAL_GAIN,
-+		/**< Takes a @ref MMAL_PARAMETER_DENOISE_T */
-+	MMAL_PARAMETER_DENOISE,
-+		/**< Takes a @ref MMAL_PARAMETER_SHARPEN_T */
-+	MMAL_PARAMETER_SHARPEN,
-+		/**< Takes a @ref MMAL_PARAMETER_GEQ_T */
-+	MMAL_PARAMETER_GEQ,
-+		/**< Tales a @ref MMAP_PARAMETER_DPC_T */
-+	MMAL_PARAMETER_DPC,
-+		/**< Tales a @ref MMAP_PARAMETER_GAMMA_T */
-+	MMAL_PARAMETER_GAMMA,
- 		/**< Takes a @ref MMAL_PARAMETER_BOOLEAN_T */
- 	MMAL_PARAMETER_JPEG_IJG_SCALING,
- };
-@@ -791,7 +847,102 @@ struct mmal_parameter_camera_info {
- 	struct mmal_parameter_camera_info_camera
- 		cameras[MMAL_PARAMETER_CAMERA_INFO_MAX_CAMERAS];
- 	struct mmal_parameter_camera_info_flash
--				flashes[MMAL_PARAMETER_CAMERA_INFO_MAX_FLASHES];
-+		flashes[MMAL_PARAMETER_CAMERA_INFO_MAX_FLASHES];
-+};
-+
-+struct mmal_parameter_ccm {
-+	struct s32_fract ccm[3][3];
-+	s32 offsets[3];
-+};
-+
-+struct mmal_parameter_custom_ccm {
-+	u32 enabled; /**< Enable the custom CCM. */
-+	struct mmal_parameter_ccm ccm; /**< CCM to be used. */
-+};
-+
-+struct mmal_parameter_lens_shading {
-+	u32 enabled;
-+	u32 grid_cell_size;
-+	u32 grid_width;
-+	u32 grid_stride;
-+	u32 grid_height;
-+	u32 mem_handle_table;
-+	u32 ref_transform;
-+};
-+
-+enum mmal_parameter_ls_gain_format_type {
-+	MMAL_PARAMETER_LS_GAIN_FORMAT_TYPE_U0P8_1 = 0,
-+	MMAL_PARAMETER_LS_GAIN_FORMAT_TYPE_U1P7_0 = 1,
-+	MMAL_PARAMETER_LS_GAIN_FORMAT_TYPE_U1P7_1 = 2,
-+	MMAL_PARAMETER_LS_GAIN_FORMAT_TYPE_U2P6_0 = 3,
-+	MMAL_PARAMETER_LS_GAIN_FORMAT_TYPE_U2P6_1 = 4,
-+	MMAL_PARAMETER_LS_GAIN_FORMAT_TYPE_U3P5_0 = 5,
-+	MMAL_PARAMETER_LS_GAIN_FORMAT_TYPE_U3P5_1 = 6,
-+	MMAL_PARAMETER_LS_GAIN_FORMAT_TYPE_U4P10  = 7,
-+	MMAL_PARAMETER_LS_GAIN_FORMAT_TYPE_DUMMY  = 0x7FFFFFFF
-+};
-+
-+struct mmal_parameter_lens_shading_v2 {
-+	u32 enabled;
-+	u32 grid_cell_size;
-+	u32 grid_width;
-+	u32 grid_stride;
-+	u32 grid_height;
-+	u32 mem_handle_table;
-+	u32 ref_transform;
-+	u32 corner_sampled;
-+	enum mmal_parameter_ls_gain_format_type gain_format;
-+};
-+
-+struct mmal_parameter_black_level {
-+	u32 enabled;
-+	u16 black_level_r;
-+	u16 black_level_g;
-+	u16 black_level_b;
-+	u8 pad_[2]; /* Unused */
-+};
-+
-+struct mmal_parameter_geq {
-+	u32 enabled;
-+	u32 offset;
-+	struct s32_fract slope;
-+};
-+
-+#define MMAL_NUM_GAMMA_PTS 33
-+struct mmal_parameter_gamma {
-+	u32 enabled;
-+	u16 x[MMAL_NUM_GAMMA_PTS];
-+	u16 y[MMAL_NUM_GAMMA_PTS];
-+};
-+
-+struct mmal_parameter_denoise {
-+	u32 enabled;
-+	u32 constant;
-+	struct s32_fract slope;
-+	struct s32_fract strength;
-+};
-+
-+struct mmal_parameter_sharpen {
-+	u32 enabled;
-+	struct s32_fract threshold;
-+	struct s32_fract strength;
-+	struct s32_fract limit;
-+};
-+
-+enum mmal_dpc_mode {
-+	MMAL_DPC_MODE_OFF = 0,
-+	MMAL_DPC_MODE_NORMAL = 1,
-+	MMAL_DPC_MODE_STRONG = 2,
-+	MMAL_DPC_MODE_MAX = 0x7FFFFFFF,
-+};
-+
-+struct mmal_parameter_dpc {
-+	u32 enabled;
-+	u32 strength;
-+};
-+
-+struct mmal_parameter_crop {
-+	struct vchiq_mmal_rect rect;
- };
- 
- #endif
diff --git a/target/linux/bcm27xx/patches-6.1/950-0281-gpio-Add-gpio-fsm-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0281-gpio-Add-gpio-fsm-driver.patch
deleted file mode 100644
index 7f65a3b660..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0281-gpio-Add-gpio-fsm-driver.patch
+++ /dev/null
@@ -1,1304 +0,0 @@
-From f0b841f737e04175f295a77245508b10efd117fb Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 30 Sep 2020 12:00:54 +0100
-Subject: [PATCH] gpio: Add gpio-fsm driver
-
-The gpio-fsm driver implements simple state machines that allow GPIOs
-to be controlled in response to inputs from other GPIOs - real and
-soft/virtual - and time delays. It can:
-+ create dummy GPIOs for drivers that demand them,
-+ drive multiple GPIOs from a single input, with optional delays,
-+ add a debounce circuit to an input,
-+ drive pattern sequences onto LEDs
-etc.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-gpio-fsm: Fix a build warning
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-gpio-fsm: Rename 'num-soft-gpios' to avoid warning
-
-As of 5.10, the Device Tree parser warns about properties that look
-like references to "suppliers" of various services. "num-soft-gpios"
-resembles a declaration of a GPIO called "num-soft", causing the value
-to be interpreted as a phandle, the owner of which is checked for a
-"#gpio-cells" property.
-
-To avoid this warning, rename the gpio-fsm property to "num-swgpios".
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-gpio-fsm: Show state info in /sys/class/gpio-fsm
-
-Add gpio-fsm sysfs entries under /sys/class/gpio-fsm. For each state
-machine show the current state, which state (if any) will be entered
-after a delay, and the current value of that delay.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-gpio-fsm: Fix shutdown timeout handling
-
-The driver is intended to jump directly to a shutdown state in the
-event of a timeout during shutdown, but the sense of the test was
-inverted.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-gpio-fsm: Clamp the delay time to zero
-
-The sysfs delay_ms value is calculated live, and it is possible for
-the time left to appear to be negative briefly if the timer handling
-hasn't completed. Ensure the displayed value never goes below zero,
-for the sake of appearances.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/gpio/Kconfig    |    9 +
- drivers/gpio/Makefile   |    1 +
- drivers/gpio/gpio-fsm.c | 1210 +++++++++++++++++++++++++++++++++++++++
- 3 files changed, 1220 insertions(+)
- create mode 100644 drivers/gpio/gpio-fsm.c
-
---- a/drivers/gpio/Kconfig
-+++ b/drivers/gpio/Kconfig
-@@ -1244,6 +1244,15 @@ config HTC_EGPIO
- 	  several HTC phones.  It provides basic support for input
- 	  pins, output pins, and IRQs.
- 
-+config GPIO_FSM
-+	tristate "GPIO FSM support"
-+	help
-+	  The GPIO FSM driver allows the creation of state machines for
-+	  manipulating GPIOs (both real and virtual), with state transitions
-+	  triggered by GPIO edges or delays.
-+
-+	  If unsure, say N.
-+
- config GPIO_JANZ_TTL
- 	tristate "Janz VMOD-TTL Digital IO Module"
- 	depends on MFD_JANZ_CMODIO
---- a/drivers/gpio/Makefile
-+++ b/drivers/gpio/Makefile
-@@ -61,6 +61,7 @@ obj-$(CONFIG_GPIO_EP93XX)		+= gpio-ep93x
- obj-$(CONFIG_GPIO_EXAR)			+= gpio-exar.o
- obj-$(CONFIG_GPIO_F7188X)		+= gpio-f7188x.o
- obj-$(CONFIG_GPIO_FTGPIO010)		+= gpio-ftgpio010.o
-+obj-$(CONFIG_GPIO_FSM)			+= gpio-fsm.o
- obj-$(CONFIG_GPIO_GE_FPGA)		+= gpio-ge.o
- obj-$(CONFIG_GPIO_GPIO_MM)		+= gpio-gpio-mm.o
- obj-$(CONFIG_GPIO_GRGPIO)		+= gpio-grgpio.o
---- /dev/null
-+++ b/drivers/gpio/gpio-fsm.c
-@@ -0,0 +1,1210 @@
-+// SPDX-License-Identifier: GPL-2.0+
-+/*
-+ *  GPIO FSM driver
-+ *
-+ *  This driver implements simple state machines that allow real GPIOs to be
-+ *  controlled in response to inputs from other GPIOs - real and soft/virtual -
-+ *  and time delays. It can:
-+ *  + create dummy GPIOs for drivers that demand them
-+ *  + drive multiple GPIOs from a single input,  with optional delays
-+ *  + add a debounce circuit to an input
-+ *  + drive pattern sequences onto LEDs
-+ *  etc.
-+ *
-+ *  Copyright (C) 2020 Raspberry Pi (Trading) Ltd.
-+ */
-+
-+#include <linux/err.h>
-+#include <linux/gpio.h>
-+#include <linux/gpio/driver.h>
-+#include <linux/interrupt.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/sysfs.h>
-+
-+#include <dt-bindings/gpio/gpio-fsm.h>
-+
-+#define MODULE_NAME "gpio-fsm"
-+
-+#define GF_IO_TYPE(x) ((u32)(x) & 0xffff)
-+#define GF_IO_INDEX(x) ((u32)(x) >> 16)
-+
-+enum {
-+	SIGNAL_GPIO,
-+	SIGNAL_SOFT
-+};
-+
-+enum {
-+	INPUT_GPIO,
-+	INPUT_SOFT
-+};
-+
-+enum {
-+	SYM_UNDEFINED,
-+	SYM_NAME,
-+	SYM_SET,
-+	SYM_START,
-+	SYM_SHUTDOWN,
-+
-+	SYM_MAX
-+};
-+
-+struct soft_gpio {
-+	int dir;
-+	int value;
-+};
-+
-+struct input_gpio_state {
-+	struct gpio_fsm *gf;
-+	struct gpio_desc  *desc;
-+	struct fsm_state *target;
-+	int index;
-+	int value;
-+	int irq;
-+	bool enabled;
-+	bool active_low;
-+};
-+
-+struct gpio_event {
-+	int index;
-+	int value;
-+	struct fsm_state *target;
-+};
-+
-+struct symtab_entry {
-+	const char *name;
-+	void *value;
-+	struct symtab_entry *next;
-+};
-+
-+struct output_signal {
-+	u8 type;
-+	u8 value;
-+	u16 index;
-+};
-+
-+struct fsm_state {
-+	const char *name;
-+	struct output_signal *signals;
-+	struct gpio_event *gpio_events;
-+	struct gpio_event *soft_events;
-+	struct fsm_state *delay_target;
-+	struct fsm_state *shutdown_target;
-+	unsigned int num_signals;
-+	unsigned int num_gpio_events;
-+	unsigned int num_soft_events;
-+	unsigned int delay_ms;
-+	unsigned int shutdown_ms;
-+};
-+
-+struct gpio_fsm {
-+	struct gpio_chip gc;
-+	struct device *dev;
-+	spinlock_t spinlock;
-+	struct work_struct work;
-+	struct timer_list timer;
-+	wait_queue_head_t shutdown_event;
-+	struct fsm_state *states;
-+	struct input_gpio_state *input_gpio_states;
-+	struct gpio_descs *input_gpios;
-+	struct gpio_descs *output_gpios;
-+	struct soft_gpio *soft_gpios;
-+	struct fsm_state *start_state;
-+	struct fsm_state *shutdown_state;
-+	unsigned int num_states;
-+	unsigned int num_output_gpios;
-+	unsigned int num_input_gpios;
-+	unsigned int num_soft_gpios;
-+	unsigned int shutdown_timeout_ms;
-+	unsigned int shutdown_jiffies;
-+
-+	struct fsm_state *current_state;
-+	struct fsm_state *next_state;
-+	struct fsm_state *delay_target_state;
-+	unsigned int delay_jiffies;
-+	int delay_ms;
-+	unsigned int debug;
-+	bool shutting_down;
-+	struct symtab_entry *symtab;
-+};
-+
-+static struct symtab_entry *do_add_symbol(struct symtab_entry **symtab,
-+					  const char *name, void *value)
-+{
-+	struct symtab_entry **p = symtab;
-+
-+	while (*p && strcmp((*p)->name, name))
-+		p = &(*p)->next;
-+
-+	if (*p) {
-+		/* This is an existing symbol */
-+		if ((*p)->value) {
-+			/* Already defined */
-+			if (value) {
-+				if ((uintptr_t)value < SYM_MAX)
-+					return ERR_PTR(-EINVAL);
-+				else
-+					return ERR_PTR(-EEXIST);
-+			}
-+		} else {
-+			/* Undefined */
-+			(*p)->value = value;
-+		}
-+	} else {
-+		/* This is a new symbol */
-+		*p = kmalloc(sizeof(struct symtab_entry), GFP_KERNEL);
-+		if (*p) {
-+			(*p)->name = name;
-+			(*p)->value = value;
-+			(*p)->next = NULL;
-+		}
-+	}
-+	return *p;
-+}
-+
-+static int add_symbol(struct symtab_entry **symtab,
-+		      const char *name, void *value)
-+{
-+	struct symtab_entry *sym = do_add_symbol(symtab, name, value);
-+
-+	return PTR_ERR_OR_ZERO(sym);
-+}
-+
-+static struct symtab_entry *get_symbol(struct symtab_entry **symtab,
-+				       const char *name)
-+{
-+	struct symtab_entry *sym = do_add_symbol(symtab, name, NULL);
-+
-+	if (IS_ERR(sym))
-+		return NULL;
-+	return sym;
-+}
-+
-+static void free_symbols(struct symtab_entry **symtab)
-+{
-+	struct symtab_entry *sym = *symtab;
-+	void *p;
-+
-+	*symtab = NULL;
-+	while (sym) {
-+		p = sym;
-+		sym = sym->next;
-+		kfree(p);
-+	}
-+}
-+
-+static int gpio_fsm_get_direction(struct gpio_chip *gc, unsigned int off)
-+{
-+	struct gpio_fsm *gf = gpiochip_get_data(gc);
-+	struct soft_gpio *sg;
-+
-+	if (off >= gf->num_soft_gpios)
-+		return -EINVAL;
-+	sg = &gf->soft_gpios[off];
-+
-+	return sg->dir;
-+}
-+
-+static int gpio_fsm_get(struct gpio_chip *gc, unsigned int off)
-+{
-+	struct gpio_fsm *gf = gpiochip_get_data(gc);
-+	struct soft_gpio *sg;
-+
-+	if (off >= gf->num_soft_gpios)
-+		return -EINVAL;
-+	sg = &gf->soft_gpios[off];
-+
-+	return sg->value;
-+}
-+
-+static void gpio_fsm_go_to_state(struct gpio_fsm *gf,
-+				   struct fsm_state *new_state)
-+{
-+	struct input_gpio_state *inp_state;
-+	struct gpio_event *gp_ev;
-+	struct fsm_state *state;
-+	int i;
-+
-+	dev_dbg(gf->dev, "go_to_state(%s)\n",
-+		  new_state ? new_state->name : "<unset>");
-+
-+	spin_lock(&gf->spinlock);
-+
-+	if (gf->next_state) {
-+		/* Something else has already requested a transition */
-+		spin_unlock(&gf->spinlock);
-+		return;
-+	}
-+
-+	gf->next_state = new_state;
-+	state = gf->current_state;
-+	gf->delay_target_state = NULL;
-+
-+	if (state) {
-+		/* Disarm any GPIO IRQs */
-+		for (i = 0; i < state->num_gpio_events; i++) {
-+			gp_ev = &state->gpio_events[i];
-+			inp_state = &gf->input_gpio_states[gp_ev->index];
-+			inp_state->target = NULL;
-+		}
-+	}
-+
-+	spin_unlock(&gf->spinlock);
-+
-+	if (new_state)
-+		schedule_work(&gf->work);
-+}
-+
-+static void gpio_fsm_set_soft(struct gpio_fsm *gf,
-+				unsigned int off, int val)
-+{
-+	struct soft_gpio *sg = &gf->soft_gpios[off];
-+	struct gpio_event *gp_ev;
-+	struct fsm_state *state;
-+	int i;
-+
-+	dev_dbg(gf->dev, "set(%d,%d)\n", off, val);
-+	state = gf->current_state;
-+	sg->value = val;
-+	for (i = 0; i < state->num_soft_events; i++) {
-+		gp_ev = &state->soft_events[i];
-+		if (gp_ev->index == off && gp_ev->value == val) {
-+			if (gf->debug)
-+				dev_info(gf->dev,
-+					 "GF_SOFT %d->%d -> %s\n", gp_ev->index,
-+					 gp_ev->value, gp_ev->target->name);
-+			gpio_fsm_go_to_state(gf, gp_ev->target);
-+			break;
-+		}
-+	}
-+}
-+
-+static int gpio_fsm_direction_input(struct gpio_chip *gc, unsigned int off)
-+{
-+	struct gpio_fsm *gf = gpiochip_get_data(gc);
-+	struct soft_gpio *sg;
-+
-+	if (off >= gf->num_soft_gpios)
-+		return -EINVAL;
-+	sg = &gf->soft_gpios[off];
-+	sg->dir = GPIOF_DIR_IN;
-+
-+	return 0;
-+}
-+
-+static int gpio_fsm_direction_output(struct gpio_chip *gc, unsigned int off,
-+				       int value)
-+{
-+	struct gpio_fsm *gf = gpiochip_get_data(gc);
-+	struct soft_gpio *sg;
-+
-+	if (off >= gf->num_soft_gpios)
-+		return -EINVAL;
-+	sg = &gf->soft_gpios[off];
-+	sg->dir = GPIOF_DIR_OUT;
-+	gpio_fsm_set_soft(gf, off, value);
-+
-+	return 0;
-+}
-+
-+static void gpio_fsm_set(struct gpio_chip *gc, unsigned int off, int val)
-+{
-+	struct gpio_fsm *gf;
-+
-+	gf = gpiochip_get_data(gc);
-+	if (off < gf->num_soft_gpios)
-+		gpio_fsm_set_soft(gf, off, val);
-+}
-+
-+static void gpio_fsm_enter_state(struct gpio_fsm *gf,
-+				   struct fsm_state *state)
-+{
-+	struct input_gpio_state *inp_state;
-+	struct output_signal *signal;
-+	struct gpio_event *event;
-+	struct gpio_desc *gpiod;
-+	struct soft_gpio *soft;
-+	int value;
-+	int i;
-+
-+	dev_dbg(gf->dev, "enter_state(%s)\n", state->name);
-+
-+	gf->current_state = state;
-+
-+	// 1. Apply any listed signals
-+	for (i = 0; i < state->num_signals; i++) {
-+		signal = &state->signals[i];
-+
-+		if (gf->debug)
-+			dev_info(gf->dev, "  set %s %d->%d\n",
-+				 (signal->type == SIGNAL_GPIO) ? "GF_OUT" :
-+				 "GF_SOFT",
-+				 signal->index, signal->value);
-+		switch (signal->type) {
-+		case SIGNAL_GPIO:
-+			gpiod = gf->output_gpios->desc[signal->index];
-+			gpiod_set_value_cansleep(gpiod, signal->value);
-+			break;
-+		case SIGNAL_SOFT:
-+			soft = &gf->soft_gpios[signal->index];
-+			gpio_fsm_set_soft(gf, signal->index, signal->value);
-+			break;
-+		}
-+	}
-+
-+	// 2. Exit if successfully reached shutdown state
-+	if (gf->shutting_down && state == state->shutdown_target) {
-+		wake_up(&gf->shutdown_event);
-+		return;
-+	}
-+
-+	// 3. Schedule a timer callback if shutting down
-+	if (state->shutdown_target) {
-+		// Remember the absolute shutdown time in case remove is called
-+		// at a later time.
-+		gf->shutdown_jiffies =
-+			jiffies + msecs_to_jiffies(state->shutdown_ms);
-+
-+		if (gf->shutting_down) {
-+			gf->delay_jiffies = gf->shutdown_jiffies;
-+			gf->delay_target_state = state->shutdown_target;
-+			gf->delay_ms = state->shutdown_ms;
-+			mod_timer(&gf->timer, gf->delay_jiffies);
-+		}
-+	}
-+
-+	// During shutdown, skip everything else
-+	if (gf->shutting_down)
-+		return;
-+
-+	// Otherwise record what the shutdown time would be
-+	gf->shutdown_jiffies = jiffies + msecs_to_jiffies(state->shutdown_ms);
-+
-+	// 4. Check soft inputs for transitions to take
-+	for (i = 0; i < state->num_soft_events; i++) {
-+		event = &state->soft_events[i];
-+		if (gf->soft_gpios[event->index].value == event->value) {
-+			if (gf->debug)
-+				dev_info(gf->dev,
-+					 "GF_SOFT %d=%d -> %s\n", event->index,
-+					 event->value, event->target->name);
-+			gpio_fsm_go_to_state(gf, event->target);
-+			return;
-+		}
-+	}
-+
-+	// 5. Check GPIOs for transitions to take, enabling the IRQs
-+	for (i = 0; i < state->num_gpio_events; i++) {
-+		event = &state->gpio_events[i];
-+		inp_state = &gf->input_gpio_states[event->index];
-+		inp_state->target = event->target;
-+		inp_state->value = event->value;
-+		inp_state->enabled = true;
-+
-+		value = gpiod_get_value(gf->input_gpios->desc[event->index]);
-+
-+		// Clear stale event state
-+		disable_irq(inp_state->irq);
-+
-+		irq_set_irq_type(inp_state->irq,
-+				 (inp_state->value ^ inp_state->active_low) ?
-+				 IRQF_TRIGGER_RISING : IRQF_TRIGGER_FALLING);
-+		enable_irq(inp_state->irq);
-+
-+		if (value == event->value && inp_state->target) {
-+			if (gf->debug)
-+				dev_info(gf->dev,
-+					 "GF_IN %d=%d -> %s\n", event->index,
-+					 event->value, event->target->name);
-+			gpio_fsm_go_to_state(gf, event->target);
-+			return;
-+		}
-+	}
-+
-+	// 6. Schedule a timer callback if delay_target
-+	if (state->delay_target) {
-+		gf->delay_target_state = state->delay_target;
-+		gf->delay_jiffies = jiffies +
-+			msecs_to_jiffies(state->delay_ms);
-+		gf->delay_ms = state->delay_ms;
-+		mod_timer(&gf->timer, gf->delay_jiffies);
-+	}
-+}
-+
-+static void gpio_fsm_work(struct work_struct *work)
-+{
-+	struct input_gpio_state *inp_state;
-+	struct fsm_state *new_state;
-+	struct fsm_state *state;
-+	struct gpio_event *gp_ev;
-+	struct gpio_fsm *gf;
-+	int i;
-+
-+	gf = container_of(work, struct gpio_fsm, work);
-+	spin_lock(&gf->spinlock);
-+	state = gf->current_state;
-+	new_state = gf->next_state;
-+	if (!new_state)
-+		new_state = gf->delay_target_state;
-+	gf->next_state = NULL;
-+	gf->delay_target_state = NULL;
-+	spin_unlock(&gf->spinlock);
-+
-+	if (state) {
-+		/* Disable any enabled GPIO IRQs */
-+		for (i = 0; i < state->num_gpio_events; i++) {
-+			gp_ev = &state->gpio_events[i];
-+			inp_state = &gf->input_gpio_states[gp_ev->index];
-+			if (inp_state->enabled) {
-+				inp_state->enabled = false;
-+				irq_set_irq_type(inp_state->irq,
-+						 IRQF_TRIGGER_NONE);
-+			}
-+		}
-+	}
-+
-+	if (new_state)
-+		gpio_fsm_enter_state(gf, new_state);
-+}
-+
-+static irqreturn_t gpio_fsm_gpio_irq_handler(int irq, void *dev_id)
-+{
-+	struct input_gpio_state *inp_state = dev_id;
-+	struct gpio_fsm *gf = inp_state->gf;
-+	struct fsm_state *target;
-+
-+	target = inp_state->target;
-+	if (!target)
-+		return IRQ_NONE;
-+
-+	/* If the IRQ has fired then the desired state _must_ have occurred */
-+	inp_state->enabled = false;
-+	irq_set_irq_type(inp_state->irq, IRQF_TRIGGER_NONE);
-+	if (gf->debug)
-+		dev_info(gf->dev, "GF_IN %d->%d -> %s\n",
-+			 inp_state->index, inp_state->value, target->name);
-+	gpio_fsm_go_to_state(gf, target);
-+	return IRQ_HANDLED;
-+}
-+
-+static void gpio_fsm_timer(struct timer_list *timer)
-+{
-+	struct gpio_fsm *gf = container_of(timer, struct gpio_fsm, timer);
-+	struct fsm_state *target;
-+
-+	target = gf->delay_target_state;
-+	if (!target)
-+		return;
-+
-+	if (gf->debug)
-+		dev_info(gf->dev, "GF_DELAY %d -> %s\n", gf->delay_ms,
-+			 target->name);
-+
-+	gpio_fsm_go_to_state(gf, target);
-+}
-+
-+int gpio_fsm_parse_signals(struct gpio_fsm *gf, struct fsm_state *state,
-+			     struct property *prop)
-+{
-+	const __be32 *cells = prop->value;
-+	struct output_signal *signal;
-+	u32 io;
-+	u32 type;
-+	u32 index;
-+	u32 value;
-+	int ret = 0;
-+	int i;
-+
-+	if (prop->length % 8) {
-+		dev_err(gf->dev, "malformed set in state %s\n",
-+			state->name);
-+		return -EINVAL;
-+	}
-+
-+	state->num_signals = prop->length/8;
-+	state->signals = devm_kcalloc(gf->dev, state->num_signals,
-+				      sizeof(struct output_signal),
-+				      GFP_KERNEL);
-+	for (i = 0; i < state->num_signals; i++) {
-+		signal = &state->signals[i];
-+		io = be32_to_cpu(cells[0]);
-+		type = GF_IO_TYPE(io);
-+		index = GF_IO_INDEX(io);
-+		value = be32_to_cpu(cells[1]);
-+
-+		if (type != GF_OUT && type != GF_SOFT) {
-+			dev_err(gf->dev,
-+				"invalid set type %d in state %s\n",
-+				type, state->name);
-+			ret = -EINVAL;
-+			break;
-+		}
-+		if (type == GF_OUT && index >= gf->num_output_gpios) {
-+			dev_err(gf->dev,
-+				"invalid GF_OUT number %d in state %s\n",
-+				index, state->name);
-+			ret = -EINVAL;
-+			break;
-+		}
-+		if (type == GF_SOFT && index >= gf->num_soft_gpios) {
-+			dev_err(gf->dev,
-+				"invalid GF_SOFT number %d in state %s\n",
-+				index, state->name);
-+			ret = -EINVAL;
-+			break;
-+		}
-+		if (value != 0 && value != 1) {
-+			dev_err(gf->dev,
-+				"invalid set value %d in state %s\n",
-+				value, state->name);
-+			ret = -EINVAL;
-+			break;
-+		}
-+		signal->type = (type == GF_OUT) ? SIGNAL_GPIO : SIGNAL_SOFT;
-+		signal->index = index;
-+		signal->value = value;
-+		cells += 2;
-+	}
-+
-+	return ret;
-+}
-+
-+struct gpio_event *new_event(struct gpio_event **events, int *num_events)
-+{
-+	int num = ++(*num_events);
-+	*events = krealloc(*events, num * sizeof(struct gpio_event),
-+			   GFP_KERNEL);
-+	return *events ? *events + (num - 1) : NULL;
-+}
-+
-+int gpio_fsm_parse_events(struct gpio_fsm *gf, struct fsm_state *state,
-+			    struct property *prop)
-+{
-+	const __be32 *cells = prop->value;
-+	struct symtab_entry *sym;
-+	int num_cells;
-+	int ret = 0;
-+	int i;
-+
-+	if (prop->length % 8) {
-+		dev_err(gf->dev,
-+			"malformed transitions from state %s to state %s\n",
-+			state->name, prop->name);
-+		return -EINVAL;
-+	}
-+
-+	sym = get_symbol(&gf->symtab, prop->name);
-+	num_cells = prop->length / 4;
-+	i = 0;
-+	while (i < num_cells) {
-+		struct gpio_event *gp_ev;
-+		u32 event, param;
-+		u32 index;
-+
-+		event = be32_to_cpu(cells[i++]);
-+		param = be32_to_cpu(cells[i++]);
-+		index = GF_IO_INDEX(event);
-+
-+		switch (GF_IO_TYPE(event)) {
-+		case GF_IN:
-+			if (index >= gf->num_input_gpios) {
-+				dev_err(gf->dev,
-+					"invalid GF_IN %d in transitions from state %s to state %s\n",
-+					index, state->name, prop->name);
-+				return -EINVAL;
-+			}
-+			if (param > 1) {
-+				dev_err(gf->dev,
-+					"invalid GF_IN value %d in transitions from state %s to state %s\n",
-+					param, state->name, prop->name);
-+				return -EINVAL;
-+			}
-+			gp_ev = new_event(&state->gpio_events,
-+					  &state->num_gpio_events);
-+			if (!gp_ev)
-+				return -ENOMEM;
-+			gp_ev->index = index;
-+			gp_ev->value = param;
-+			gp_ev->target = (struct fsm_state *)sym;
-+			break;
-+
-+		case GF_SOFT:
-+			if (index >= gf->num_soft_gpios) {
-+				dev_err(gf->dev,
-+					"invalid GF_SOFT %d in transitions from state %s to state %s\n",
-+					index, state->name, prop->name);
-+				return -EINVAL;
-+			}
-+			if (param > 1) {
-+				dev_err(gf->dev,
-+					"invalid GF_SOFT value %d in transitions from state %s to state %s\n",
-+					param, state->name, prop->name);
-+				return -EINVAL;
-+			}
-+			gp_ev = new_event(&state->soft_events,
-+					  &state->num_soft_events);
-+			if (!gp_ev)
-+				return -ENOMEM;
-+			gp_ev->index = index;
-+			gp_ev->value = param;
-+			gp_ev->target = (struct fsm_state *)sym;
-+			break;
-+
-+		case GF_DELAY:
-+			if (state->delay_target) {
-+				dev_err(gf->dev,
-+					"state %s has multiple GF_DELAYs\n",
-+					state->name);
-+				return -EINVAL;
-+			}
-+			state->delay_target = (struct fsm_state *)sym;
-+			state->delay_ms = param;
-+			break;
-+
-+		case GF_SHUTDOWN:
-+			if (state->shutdown_target == state) {
-+				dev_err(gf->dev,
-+					"shutdown state %s has GF_SHUTDOWN\n",
-+					state->name);
-+				return -EINVAL;
-+			} else if (state->shutdown_target) {
-+				dev_err(gf->dev,
-+					"state %s has multiple GF_SHUTDOWNs\n",
-+					state->name);
-+				return -EINVAL;
-+			}
-+			state->shutdown_target =
-+				(struct fsm_state *)sym;
-+			state->shutdown_ms = param;
-+			break;
-+
-+		default:
-+			dev_err(gf->dev,
-+				"invalid event %08x in transitions from state %s to state %s\n",
-+				event, state->name, prop->name);
-+			return -EINVAL;
-+		}
-+	}
-+	if (i != num_cells) {
-+		dev_err(gf->dev,
-+			"malformed transitions from state %s to state %s\n",
-+			state->name, prop->name);
-+		return -EINVAL;
-+	}
-+
-+	return ret;
-+}
-+
-+int gpio_fsm_parse_state(struct gpio_fsm *gf,
-+			   struct fsm_state *state,
-+			   struct device_node *np)
-+{
-+	struct symtab_entry *sym;
-+	struct property *prop;
-+	int ret;
-+
-+	state->name = np->name;
-+	ret = add_symbol(&gf->symtab, np->name, state);
-+	if (ret) {
-+		switch (ret) {
-+		case -EINVAL:
-+			dev_err(gf->dev, "'%s' is not a valid state name\n",
-+				np->name);
-+			break;
-+		case -EEXIST:
-+			dev_err(gf->dev, "state %s already defined\n",
-+				np->name);
-+			break;
-+		default:
-+			dev_err(gf->dev, "error %d adding state %s symbol\n",
-+				ret, np->name);
-+			break;
-+		}
-+		return ret;
-+	}
-+
-+	for_each_property_of_node(np, prop) {
-+		sym = get_symbol(&gf->symtab, prop->name);
-+		if (!sym) {
-+			ret = -ENOMEM;
-+			break;
-+		}
-+
-+		switch ((uintptr_t)sym->value) {
-+		case SYM_SET:
-+			ret = gpio_fsm_parse_signals(gf, state, prop);
-+			break;
-+		case SYM_START:
-+			if (gf->start_state) {
-+				dev_err(gf->dev, "multiple start states\n");
-+				ret = -EINVAL;
-+			} else {
-+				gf->start_state = state;
-+			}
-+			break;
-+		case SYM_SHUTDOWN:
-+			state->shutdown_target = state;
-+			gf->shutdown_state = state;
-+			break;
-+		case SYM_NAME:
-+			/* Ignore */
-+			break;
-+		default:
-+			/* A set of transition events to this state */
-+			ret = gpio_fsm_parse_events(gf, state, prop);
-+			break;
-+		}
-+	}
-+
-+	return ret;
-+}
-+
-+static void dump_all(struct gpio_fsm *gf)
-+{
-+	int i, j;
-+
-+	dev_info(gf->dev, "Input GPIOs:\n");
-+	for (i = 0; i < gf->num_input_gpios; i++)
-+		dev_info(gf->dev, "  %d: %p\n", i,
-+			 gf->input_gpios->desc[i]);
-+
-+	dev_info(gf->dev, "Output GPIOs:\n");
-+	for (i = 0; i < gf->num_output_gpios; i++)
-+		dev_info(gf->dev, "  %d: %p\n", i,
-+			 gf->output_gpios->desc[i]);
-+
-+	dev_info(gf->dev, "Soft GPIOs:\n");
-+	for (i = 0; i < gf->num_soft_gpios; i++)
-+		dev_info(gf->dev, "  %d: %s %d\n", i,
-+			 (gf->soft_gpios[i].dir == GPIOF_DIR_IN) ? "IN" : "OUT",
-+			 gf->soft_gpios[i].value);
-+
-+	dev_info(gf->dev, "Start state: %s\n",
-+		 gf->start_state ? gf->start_state->name : "-");
-+
-+	dev_info(gf->dev, "Shutdown timeout: %d ms\n",
-+		 gf->shutdown_timeout_ms);
-+
-+	for (i = 0; i < gf->num_states; i++) {
-+		struct fsm_state *state = &gf->states[i];
-+
-+		dev_info(gf->dev, "State %s:\n", state->name);
-+
-+		if (state->shutdown_target == state)
-+			dev_info(gf->dev, "  Shutdown state\n");
-+
-+		dev_info(gf->dev, "  Signals:\n");
-+		for (j = 0; j < state->num_signals; j++) {
-+			struct output_signal *signal = &state->signals[j];
-+
-+			dev_info(gf->dev, "    %d: %s %d=%d\n", j,
-+				 (signal->type == SIGNAL_GPIO) ? "GPIO" :
-+								 "SOFT",
-+				 signal->index, signal->value);
-+		}
-+
-+		dev_info(gf->dev, "  GPIO events:\n");
-+		for (j = 0; j < state->num_gpio_events; j++) {
-+			struct gpio_event *event = &state->gpio_events[j];
-+
-+			dev_info(gf->dev, "    %d: %d=%d -> %s\n", j,
-+				 event->index, event->value,
-+				 event->target->name);
-+		}
-+
-+		dev_info(gf->dev, "  Soft events:\n");
-+		for (j = 0; j < state->num_soft_events; j++) {
-+			struct gpio_event *event = &state->soft_events[j];
-+
-+			dev_info(gf->dev, "    %d: %d=%d -> %s\n", j,
-+				 event->index, event->value,
-+				 event->target->name);
-+		}
-+
-+		if (state->delay_target)
-+			dev_info(gf->dev, "  Delay: %d ms -> %s\n",
-+				 state->delay_ms, state->delay_target->name);
-+
-+		if (state->shutdown_target && state->shutdown_target != state)
-+			dev_info(gf->dev, "  Shutdown: %d ms -> %s\n",
-+				 state->shutdown_ms,
-+				 state->shutdown_target->name);
-+	}
-+	dev_info(gf->dev, "\n");
-+}
-+
-+static int resolve_sym_to_state(struct gpio_fsm *gf, struct fsm_state **pstate)
-+{
-+	struct symtab_entry *sym = (struct symtab_entry *)*pstate;
-+
-+	if (!sym)
-+		return -ENOMEM;
-+
-+	*pstate = sym->value;
-+
-+	if (!*pstate) {
-+		dev_err(gf->dev, "state %s not defined\n",
-+			sym->name);
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
-+
-+
-+/*
-+ * /sys/class/gpio-fsm/<fsm-name>/
-+ *   /state ... the current state
-+ */
-+
-+static ssize_t state_show(struct device *dev,
-+			  struct device_attribute *attr, char *buf)
-+{
-+	const struct gpio_fsm *gf = dev_get_drvdata(dev);
-+
-+	return sprintf(buf, "%s\n", gf->current_state->name);
-+}
-+static DEVICE_ATTR_RO(state);
-+
-+static ssize_t delay_state_show(struct device *dev,
-+			  struct device_attribute *attr, char *buf)
-+{
-+	const struct gpio_fsm *gf = dev_get_drvdata(dev);
-+
-+	return sprintf(buf, "%s\n",
-+		       gf->delay_target_state ? gf->delay_target_state->name :
-+		       "-");
-+}
-+
-+static DEVICE_ATTR_RO(delay_state);
-+
-+static ssize_t delay_ms_show(struct device *dev,
-+			     struct device_attribute *attr, char *buf)
-+{
-+	const struct gpio_fsm *gf = dev_get_drvdata(dev);
-+	int jiffies_left;
-+
-+	jiffies_left = max((int)(gf->delay_jiffies - jiffies), 0);
-+	return sprintf(buf,
-+		       gf->delay_target_state ? "%u\n" : "-\n",
-+		       jiffies_to_msecs(jiffies_left));
-+}
-+static DEVICE_ATTR_RO(delay_ms);
-+
-+static struct attribute *gpio_fsm_attrs[] = {
-+	&dev_attr_state.attr,
-+	&dev_attr_delay_state.attr,
-+	&dev_attr_delay_ms.attr,
-+	NULL,
-+};
-+
-+static const struct attribute_group gpio_fsm_group = {
-+	.attrs = gpio_fsm_attrs,
-+	//.is_visible = gpio_is_visible,
-+};
-+
-+static const struct attribute_group *gpio_fsm_groups[] = {
-+	&gpio_fsm_group,
-+	NULL
-+};
-+
-+static struct attribute *gpio_fsm_class_attrs[] = {
-+	// There are no top-level attributes
-+	NULL,
-+};
-+ATTRIBUTE_GROUPS(gpio_fsm_class);
-+
-+static struct class gpio_fsm_class = {
-+	.name =		MODULE_NAME,
-+	.owner =	THIS_MODULE,
-+
-+	.class_groups = gpio_fsm_class_groups,
-+};
-+
-+static int gpio_fsm_probe(struct platform_device *pdev)
-+{
-+	struct input_gpio_state *inp_state;
-+	struct device *dev = &pdev->dev;
-+	struct device *sysfs_dev;
-+	struct device_node *np = dev->of_node;
-+	struct device_node *cp;
-+	struct gpio_fsm *gf;
-+	u32 debug = 0;
-+	int num_states;
-+	u32 num_soft_gpios;
-+	int ret;
-+	int i;
-+	static const char *const reserved_symbols[] = {
-+		[SYM_NAME] = "name",
-+		[SYM_SET] = "set",
-+		[SYM_START] = "start_state",
-+		[SYM_SHUTDOWN] = "shutdown_state",
-+	};
-+
-+	if (of_property_read_u32(np, "num-swgpios", &num_soft_gpios) &&
-+	    of_property_read_u32(np, "num-soft-gpios", &num_soft_gpios)) {
-+		dev_err(dev, "missing 'num-swgpios' property\n");
-+		return -EINVAL;
-+	}
-+
-+	of_property_read_u32(np, "debug", &debug);
-+
-+	gf = devm_kzalloc(dev, sizeof(*gf), GFP_KERNEL);
-+	if (!gf)
-+		return -ENOMEM;
-+
-+	gf->dev = dev;
-+	gf->debug = debug;
-+
-+	if (of_property_read_u32(np, "shutdown-timeout-ms",
-+				 &gf->shutdown_timeout_ms))
-+		gf->shutdown_timeout_ms = 5000;
-+
-+	gf->num_soft_gpios = num_soft_gpios;
-+	gf->soft_gpios = devm_kcalloc(dev, num_soft_gpios,
-+				      sizeof(struct soft_gpio), GFP_KERNEL);
-+	if (!gf->soft_gpios)
-+		return -ENOMEM;
-+	for (i = 0; i < num_soft_gpios; i++) {
-+		struct soft_gpio *sg = &gf->soft_gpios[i];
-+
-+		sg->dir = GPIOF_DIR_IN;
-+		sg->value = 0;
-+	}
-+
-+	gf->input_gpios = devm_gpiod_get_array_optional(dev, "input", GPIOD_IN);
-+	if (IS_ERR(gf->input_gpios)) {
-+		ret = PTR_ERR(gf->input_gpios);
-+		dev_err(dev, "failed to get input gpios from DT - %d\n", ret);
-+		return ret;
-+	}
-+	gf->num_input_gpios = (gf->input_gpios ? gf->input_gpios->ndescs : 0);
-+
-+	gf->input_gpio_states = devm_kcalloc(dev, gf->num_input_gpios,
-+					     sizeof(struct input_gpio_state),
-+					     GFP_KERNEL);
-+	if (!gf->input_gpio_states)
-+		return -ENOMEM;
-+	for (i = 0; i < gf->num_input_gpios; i++) {
-+		inp_state = &gf->input_gpio_states[i];
-+		inp_state->desc = gf->input_gpios->desc[i];
-+		inp_state->gf = gf;
-+		inp_state->index = i;
-+		inp_state->irq = gpiod_to_irq(inp_state->desc);
-+		inp_state->active_low = gpiod_is_active_low(inp_state->desc);
-+		if (inp_state->irq >= 0)
-+			ret = devm_request_irq(gf->dev, inp_state->irq,
-+					       gpio_fsm_gpio_irq_handler,
-+					       IRQF_TRIGGER_NONE,
-+					       dev_name(dev),
-+					       inp_state);
-+		else
-+			ret = inp_state->irq;
-+
-+		if (ret) {
-+			dev_err(dev,
-+				"failed to get IRQ for input gpio - %d\n",
-+				ret);
-+			return ret;
-+		}
-+	}
-+
-+	gf->output_gpios = devm_gpiod_get_array_optional(dev, "output",
-+							 GPIOD_OUT_LOW);
-+	if (IS_ERR(gf->output_gpios)) {
-+		ret = PTR_ERR(gf->output_gpios);
-+		dev_err(dev, "failed to get output gpios from DT - %d\n", ret);
-+		return ret;
-+	}
-+	gf->num_output_gpios = (gf->output_gpios ? gf->output_gpios->ndescs :
-+				0);
-+
-+	num_states = of_get_child_count(np);
-+	if (!num_states) {
-+		dev_err(dev, "no states declared\n");
-+		return -EINVAL;
-+	}
-+	gf->states = devm_kcalloc(dev, num_states,
-+				  sizeof(struct fsm_state), GFP_KERNEL);
-+	if (!gf->states)
-+		return -ENOMEM;
-+
-+	// add reserved words to the symbol table
-+	for (i = 0; i < ARRAY_SIZE(reserved_symbols); i++) {
-+		if (reserved_symbols[i])
-+			add_symbol(&gf->symtab, reserved_symbols[i],
-+				   (void *)(uintptr_t)i);
-+	}
-+
-+	// parse the state
-+	for_each_child_of_node(np, cp) {
-+		struct fsm_state *state = &gf->states[gf->num_states];
-+
-+		ret = gpio_fsm_parse_state(gf, state, cp);
-+		if (ret)
-+			return ret;
-+		gf->num_states++;
-+	}
-+
-+	if (!gf->start_state) {
-+		dev_err(gf->dev, "no start state defined\n");
-+		return -EINVAL;
-+	}
-+
-+	// resolve symbol pointers into state pointers
-+	for (i = 0; !ret && i < gf->num_states; i++) {
-+		struct fsm_state *state = &gf->states[i];
-+		int j;
-+
-+		for (j = 0; !ret && j < state->num_gpio_events; j++) {
-+			struct gpio_event *ev = &state->gpio_events[j];
-+
-+			ret = resolve_sym_to_state(gf, &ev->target);
-+		}
-+
-+		for (j = 0; !ret && j < state->num_soft_events; j++) {
-+			struct gpio_event *ev = &state->soft_events[j];
-+
-+			ret = resolve_sym_to_state(gf, &ev->target);
-+		}
-+
-+		if (!ret) {
-+			resolve_sym_to_state(gf, &state->delay_target);
-+			if (state->shutdown_target != state)
-+				resolve_sym_to_state(gf,
-+						     &state->shutdown_target);
-+		}
-+	}
-+
-+	if (!ret && gf->debug > 1)
-+		dump_all(gf);
-+
-+	free_symbols(&gf->symtab);
-+
-+	if (ret)
-+		return ret;
-+
-+	gf->gc.parent = dev;
-+	gf->gc.label = np->name;
-+	gf->gc.owner = THIS_MODULE;
-+	gf->gc.of_node = np;
-+	gf->gc.base = -1;
-+	gf->gc.ngpio = num_soft_gpios;
-+
-+	gf->gc.get_direction = gpio_fsm_get_direction;
-+	gf->gc.direction_input = gpio_fsm_direction_input;
-+	gf->gc.direction_output = gpio_fsm_direction_output;
-+	gf->gc.get = gpio_fsm_get;
-+	gf->gc.set = gpio_fsm_set;
-+	gf->gc.can_sleep = true;
-+	spin_lock_init(&gf->spinlock);
-+	INIT_WORK(&gf->work, gpio_fsm_work);
-+	timer_setup(&gf->timer, gpio_fsm_timer, 0);
-+	init_waitqueue_head(&gf->shutdown_event);
-+
-+	platform_set_drvdata(pdev, gf);
-+
-+	sysfs_dev = device_create_with_groups(&gpio_fsm_class, dev,
-+					      MKDEV(0, 0), gf,
-+					      gpio_fsm_groups,
-+					      "%s", np->name);
-+	if (IS_ERR(sysfs_dev))
-+		dev_err(gf->dev, "Error creating sysfs entry\n");
-+
-+	if (gf->debug)
-+		dev_info(gf->dev, "Start -> %s\n", gf->start_state->name);
-+
-+	gpio_fsm_go_to_state(gf, gf->start_state);
-+
-+	return devm_gpiochip_add_data(dev, &gf->gc, gf);
-+}
-+
-+static int gpio_fsm_remove(struct platform_device *pdev)
-+{
-+	struct gpio_fsm *gf = platform_get_drvdata(pdev);
-+	int i;
-+
-+	if (gf->shutdown_state) {
-+		if (gf->debug)
-+			dev_info(gf->dev, "Shutting down...\n");
-+
-+		spin_lock(&gf->spinlock);
-+		gf->shutting_down = true;
-+		if (gf->current_state->shutdown_target &&
-+		    gf->current_state->shutdown_target != gf->current_state) {
-+			gf->delay_target_state =
-+				gf->current_state->shutdown_target;
-+			mod_timer(&gf->timer, gf->shutdown_jiffies);
-+		}
-+		spin_unlock(&gf->spinlock);
-+
-+		wait_event_timeout(gf->shutdown_event,
-+				   gf->current_state->shutdown_target ==
-+				   gf->current_state,
-+				   msecs_to_jiffies(gf->shutdown_timeout_ms));
-+		/* On failure to reach a shutdown state, jump to one */
-+		if (gf->current_state->shutdown_target != gf->current_state)
-+			gpio_fsm_enter_state(gf, gf->shutdown_state);
-+	}
-+	cancel_work_sync(&gf->work);
-+	del_timer_sync(&gf->timer);
-+
-+	/* Events aren't allocated from managed storage */
-+	for (i = 0; i < gf->num_states; i++) {
-+		kfree(gf->states[i].gpio_events);
-+		kfree(gf->states[i].soft_events);
-+	}
-+	if (gf->debug)
-+		dev_info(gf->dev, "Exiting\n");
-+
-+	return 0;
-+}
-+
-+static void gpio_fsm_shutdown(struct platform_device *pdev)
-+{
-+	gpio_fsm_remove(pdev);
-+}
-+
-+static const struct of_device_id gpio_fsm_ids[] = {
-+	{ .compatible = "rpi,gpio-fsm" },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(of, gpio_fsm_ids);
-+
-+static struct platform_driver gpio_fsm_driver = {
-+	.driver	= {
-+		.name		= MODULE_NAME,
-+		.of_match_table	= of_match_ptr(gpio_fsm_ids),
-+	},
-+	.probe = gpio_fsm_probe,
-+	.remove = gpio_fsm_remove,
-+	.shutdown = gpio_fsm_shutdown,
-+};
-+
-+static int gpio_fsm_init(void)
-+{
-+	int ret;
-+
-+	ret = class_register(&gpio_fsm_class);
-+	if (ret)
-+		return ret;
-+
-+	ret = platform_driver_register(&gpio_fsm_driver);
-+	if (ret)
-+		class_unregister(&gpio_fsm_class);
-+
-+	return ret;
-+}
-+module_init(gpio_fsm_init);
-+
-+static void gpio_fsm_exit(void)
-+{
-+	platform_driver_unregister(&gpio_fsm_driver);
-+	class_unregister(&gpio_fsm_class);
-+}
-+module_exit(gpio_fsm_exit);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Phil Elwell <phil@raspberrypi.com>");
-+MODULE_DESCRIPTION("GPIO FSM driver");
-+MODULE_ALIAS("platform:gpio-fsm");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0282-rpisense-fb-Set-pseudo_pallete-to-prevent-crash-on-f.patch b/target/linux/bcm27xx/patches-6.1/950-0282-rpisense-fb-Set-pseudo_pallete-to-prevent-crash-on-f.patch
deleted file mode 100644
index 65259496e1..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0282-rpisense-fb-Set-pseudo_pallete-to-prevent-crash-on-f.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 8c220240e2d5a76e67f2614e61770592364d8e4f Mon Sep 17 00:00:00 2001
-From: Serge Schneider <serge@raspberrypi.com>
-Date: Mon, 26 Oct 2020 16:38:21 +0000
-Subject: [PATCH] rpisense-fb: Set pseudo_pallete to prevent crash on
- fbcon takeover
-
-Signed-off-by: Serge Schneider <serge@raspberrypi.com>
----
- drivers/video/fbdev/rpisense-fb.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/video/fbdev/rpisense-fb.c
-+++ b/drivers/video/fbdev/rpisense-fb.c
-@@ -52,6 +52,8 @@ static u8 gamma_low[32] = {0x00, 0x01, 0
- 
- static u8 gamma_user[32];
- 
-+static u32 pseudo_palette[16];
-+
- static struct rpisense_fb_param rpisense_fb_param = {
- 	.vmem = NULL,
- 	.vmemsize = 128,
-@@ -225,6 +227,7 @@ static int rpisense_fb_probe(struct plat
- 	info->flags = FBINFO_FLAG_DEFAULT | FBINFO_VIRTFB;
- 	info->screen_base = rpisense_fb_param.vmem;
- 	info->screen_size = rpisense_fb_param.vmemsize;
-+	info->pseudo_palette = pseudo_palette;
- 
- 	if (lowlight)
- 		rpisense_fb_param.gamma = gamma_low;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0283-bcm2708_fb-Fix-a-build-warning.patch b/target/linux/bcm27xx/patches-6.1/950-0283-bcm2708_fb-Fix-a-build-warning.patch
deleted file mode 100644
index 18cf208df7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0283-bcm2708_fb-Fix-a-build-warning.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 67c4dc83131e335f92a142d3511b94db4a1dc57c Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 27 Oct 2020 12:12:22 +0000
-Subject: [PATCH] bcm2708_fb: Fix a build warning
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/video/fbdev/bcm2708_fb.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/video/fbdev/bcm2708_fb.c
-+++ b/drivers/video/fbdev/bcm2708_fb.c
-@@ -693,7 +693,8 @@ static long vc_mem_copy(struct bcm2708_f
- 		u8 *q = (u8 *)ioparam->dst + offset;
- 
- 		dma_memcpy(fb, bus_addr,
--			   INTALIAS_L1L2_NONALLOCATING((dma_addr_t)p), size);
-+			   INTALIAS_L1L2_NONALLOCATING((u32)(uintptr_t)p),
-+						       size);
- 		if (copy_to_user(q, buf, s) != 0) {
- 			pr_err("[%s]: failed to copy-to-user\n", __func__);
- 			rc = -EFAULT;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0284-watchdog-bcm2835-Ignore-params-after-the-partition-n.patch b/target/linux/bcm27xx/patches-6.1/950-0284-watchdog-bcm2835-Ignore-params-after-the-partition-n.patch
deleted file mode 100644
index a7614795df..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0284-watchdog-bcm2835-Ignore-params-after-the-partition-n.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e26bdd060e7881989a553a1087b7c1e4227f3986 Mon Sep 17 00:00:00 2001
-From: Tim Gover <tim.gover@raspberrypi.org>
-Date: Thu, 22 Oct 2020 15:30:55 +0100
-Subject: [PATCH] watchdog: bcm2835: Ignore params after the partition
- number
-
-Use sscanf to extract the partition number and ignore extra parameters
-which are only relevant to other reboot notifiers.
----
- drivers/watchdog/bcm2835_wdt.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/drivers/watchdog/bcm2835_wdt.c
-+++ b/drivers/watchdog/bcm2835_wdt.c
-@@ -127,10 +127,12 @@ static int bcm2835_restart(struct watchd
- {
- 	struct bcm2835_wdt *wdt = watchdog_get_drvdata(wdog);
- 
--	unsigned long long val;
-+	unsigned long val;
- 	u8 partition = 0;
- 
--	if (data && !kstrtoull(data, 0, &val) && val <= 63)
-+	// Allow extra arguments separated by spaces after
-+	// the partition number.
-+	if (data && sscanf(data, "%lu", &val) && val < 63)
- 		partition = val;
- 
- 	__bcm2835_restart(wdt, partition);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0285-firmware-raspberrypi-Add-support-for-tryonce-reboot-.patch b/target/linux/bcm27xx/patches-6.1/950-0285-firmware-raspberrypi-Add-support-for-tryonce-reboot-.patch
deleted file mode 100644
index 795e6bd909..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0285-firmware-raspberrypi-Add-support-for-tryonce-reboot-.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From b31a82051bb9d4ba1c854df645a9195d3f00216f Mon Sep 17 00:00:00 2001
-From: Tim Gover <tim.gover@raspberrypi.com>
-Date: Tue, 20 Oct 2020 11:55:37 +0100
-Subject: [PATCH] firmware: raspberrypi: Add support for tryonce reboot
- flag
-
-Define a new mailbox (SET_REBOOT_FLAGS) which may be used to
-pass optional flags to the Raspberry Pi firmware that changes
-the behaviour of the bootloader and firmware during a reboot.
-
-Currently this just defines the 'tryboot' flag which causes
-the firmware to load tryboot.txt instead config.txt. This
-alternate configuration file can be used to specify the
-path of an alternate firmware and kernels allowing a fallback
-mechanism to be implemented for OS upgrades.
----
- drivers/firmware/raspberrypi.c | 25 +++++++++++++++++++++++--
- 1 file changed, 23 insertions(+), 2 deletions(-)
-
---- a/drivers/firmware/raspberrypi.c
-+++ b/drivers/firmware/raspberrypi.c
-@@ -194,6 +194,7 @@ static int rpi_firmware_notify_reboot(st
- {
- 	struct rpi_firmware *fw;
- 	struct platform_device *pdev = g_pdev;
-+	u32 reboot_flags = 0;
- 
- 	if (!pdev)
- 		return 0;
-@@ -202,8 +203,28 @@ static int rpi_firmware_notify_reboot(st
- 	if (!fw)
- 		return 0;
- 
--	(void)rpi_firmware_property(fw, RPI_FIRMWARE_NOTIFY_REBOOT,
--				    0, 0);
-+	// The partition id is the first parameter followed by zero or
-+	// more flags separated by spaces indicating the reason for the reboot.
-+	//
-+	// 'tryboot': Sets a one-shot flag which is cleared upon reboot and
-+	//            causes the tryboot.txt to be loaded instead of config.txt
-+	//            by the bootloader and the start.elf firmware.
-+	//
-+	//            This is intended to allow automatic fallback to a known
-+	//            good image if an OS/FW upgrade fails.
-+	//
-+	// N.B. The firmware mechanism for storing reboot flags may vary
-+	// on different Raspberry Pi models.
-+	if (data && strstr(data, " tryboot"))
-+		reboot_flags |= 0x1;
-+
-+	// The mailbox might have been called earlier, directly via vcmailbox
-+	// so only overwrite if reboot flags are passed to the reboot command.
-+	if (reboot_flags)
-+		(void)rpi_firmware_property(fw, RPI_FIRMWARE_SET_REBOOT_FLAGS,
-+				&reboot_flags, sizeof(reboot_flags));
-+
-+	(void)rpi_firmware_property(fw, RPI_FIRMWARE_NOTIFY_REBOOT, NULL, 0);
- 
- 	return 0;
- }
diff --git a/target/linux/bcm27xx/patches-6.1/950-0286-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch b/target/linux/bcm27xx/patches-6.1/950-0286-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch
deleted file mode 100644
index 2cf011fafc..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0286-phy-broadcom-split-out-the-BCM54213PE-from-the-BCM54.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From badc33cc4a789a51ccc5ab5e9efeb94c5dc306cd Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.org>
-Date: Tue, 14 May 2019 17:00:41 +0100
-Subject: [PATCH] phy: broadcom: split out the BCM54213PE from the
- BCM54210E IDs
-
-The last nibble is a revision ID, and the 54213pe is a later rev
-than the 54210e. Running the 54210e setup code on a 54213pe results
-in a broken RGMII interface.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
----
- drivers/net/phy/broadcom.c | 15 ++++++++++++---
- include/linux/brcmphy.h    |  1 +
- 2 files changed, 13 insertions(+), 3 deletions(-)
-
---- a/drivers/net/phy/broadcom.c
-+++ b/drivers/net/phy/broadcom.c
-@@ -259,7 +259,8 @@ static void bcm54xx_adjust_rxrefclk(stru
- 	    BRCM_PHY_MODEL(phydev) != PHY_ID_BCM50610M &&
- 	    BRCM_PHY_MODEL(phydev) != PHY_ID_BCM54210E &&
- 	    BRCM_PHY_MODEL(phydev) != PHY_ID_BCM54810 &&
--	    BRCM_PHY_MODEL(phydev) != PHY_ID_BCM54811)
-+	    BRCM_PHY_MODEL(phydev) != PHY_ID_BCM54811 &&
-+	    BRCM_PHY_MODEL(phydev) != PHY_ID_BCM54213PE)
- 		return;
- 
- 	val = bcm_phy_read_shadow(phydev, BCM54XX_SHD_SCR3);
-@@ -906,7 +907,7 @@ static struct phy_driver broadcom_driver
- 	.link_change_notify	= bcm54xx_link_change_notify,
- }, {
- 	.phy_id		= PHY_ID_BCM54210E,
--	.phy_id_mask	= 0xfffffff0,
-+	.phy_id_mask	= 0xffffffff,
- 	.name		= "Broadcom BCM54210E",
- 	/* PHY_GBIT_FEATURES */
- 	.get_sset_count	= bcm_phy_get_sset_count,
-@@ -920,6 +921,13 @@ static struct phy_driver broadcom_driver
- 	.suspend	= bcm54xx_suspend,
- 	.resume		= bcm54xx_resume,
- }, {
-+	.phy_id		= PHY_ID_BCM54213PE,
-+	.phy_id_mask	= 0xffffffff,
-+	.name		= "Broadcom BCM54213PE",
-+	/* PHY_GBIT_FEATURES */
-+	.config_init	= bcm54xx_config_init,
-+	.config_intr	= bcm_phy_config_intr,
-+}, {
- 	.phy_id		= PHY_ID_BCM5461,
- 	.phy_id_mask	= 0xfffffff0,
- 	.name		= "Broadcom BCM5461",
-@@ -1158,7 +1166,8 @@ module_phy_driver(broadcom_drivers);
- static struct mdio_device_id __maybe_unused broadcom_tbl[] = {
- 	{ PHY_ID_BCM5411, 0xfffffff0 },
- 	{ PHY_ID_BCM5421, 0xfffffff0 },
--	{ PHY_ID_BCM54210E, 0xfffffff0 },
-+	{ PHY_ID_BCM54210E, 0xffffffff },
-+	{ PHY_ID_BCM54213PE, 0xffffffff },
- 	{ PHY_ID_BCM5461, 0xfffffff0 },
- 	{ PHY_ID_BCM54612E, 0xfffffff0 },
- 	{ PHY_ID_BCM54616S, 0xfffffff0 },
---- a/include/linux/brcmphy.h
-+++ b/include/linux/brcmphy.h
-@@ -23,6 +23,7 @@
- #define PHY_ID_BCM5411			0x00206070
- #define PHY_ID_BCM5421			0x002060e0
- #define PHY_ID_BCM54210E		0x600d84a0
-+#define PHY_ID_BCM54213PE		0x600d84a2
- #define PHY_ID_BCM5464			0x002060b0
- #define PHY_ID_BCM5461			0x002060c0
- #define PHY_ID_BCM54612E		0x03625e60
diff --git a/target/linux/bcm27xx/patches-6.1/950-0287-phy-broadcom-Add-bcm54213pe-configuration.patch b/target/linux/bcm27xx/patches-6.1/950-0287-phy-broadcom-Add-bcm54213pe-configuration.patch
deleted file mode 100644
index 43b834fb2b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0287-phy-broadcom-Add-bcm54213pe-configuration.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 7fc56014c11971304af9cc33609ca88fed6f272b Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 29 Oct 2020 14:10:56 +0000
-Subject: [PATCH] phy: broadcom: Add bcm54213pe configuration
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/net/phy/broadcom.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/drivers/net/phy/broadcom.c
-+++ b/drivers/net/phy/broadcom.c
-@@ -88,6 +88,11 @@ static int bcm54210e_config_init(struct
- 	return 0;
- }
- 
-+static int bcm54213pe_config_init(struct phy_device *phydev)
-+{
-+	return bcm54210e_config_init(phydev);
-+}
-+
- static int bcm54612e_config_init(struct phy_device *phydev)
- {
- 	int reg;
-@@ -378,6 +383,9 @@ static int bcm54xx_config_init(struct ph
- 	case PHY_ID_BCM54612E:
- 		err = bcm54612e_config_init(phydev);
- 		break;
-+	case PHY_ID_BCM54213PE:
-+		err = bcm54213pe_config_init(phydev);
-+		break;
- 	case PHY_ID_BCM54616S:
- 		err = bcm54616s_config_init(phydev);
- 		break;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0288-PCI-brcmstb-Restore-initial-fundamental-reset.patch b/target/linux/bcm27xx/patches-6.1/950-0288-PCI-brcmstb-Restore-initial-fundamental-reset.patch
deleted file mode 100644
index 823c3561ba..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0288-PCI-brcmstb-Restore-initial-fundamental-reset.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 15a3f19fc1235e656abd874575ed242a2330aa03 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 11 Nov 2020 17:08:33 +0000
-Subject: [PATCH] PCI: brcmstb: Restore initial fundamental reset
-
-[1] replaced a single reset function with a pointer to one of two
-implementations, but also removed the call asserting the reset
-at the start of brcm_pcie_setup. Doing so breaks Raspberry Pis with
-VL805 XHCI controllers lacking dedicated SPI EEPROMs, which have been
-used for USB booting but then need to be reset so that the kernel
-can reconfigure them. The lack of a reset causes the firmware's loading
-of the EEPROM image to RAM to fail, breaking USB for the kernel.
-
-See: https://www.raspberrypi.org/forums/viewtopic.php?p=1758157#p1758157
-
-Fixes: 04356ac30771 ("PCI: brcmstb: Add bcm7278 PERST# support")
-
-[1] 04356ac30771 ("PCI: brcmstb: Add bcm7278 PERST# support")
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/pci/controller/pcie-brcmstb.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/pci/controller/pcie-brcmstb.c
-+++ b/drivers/pci/controller/pcie-brcmstb.c
-@@ -877,6 +877,8 @@ static int brcm_pcie_setup(struct brcm_p
- 
- 	/* Reset the bridge */
- 	pcie->bridge_sw_init_set(pcie, 1);
-+	pcie->perst_set(pcie, 1);
-+
- 	usleep_range(100, 200);
- 
- 	/* Take the bridge out of reset */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0289-Input-edt-ft5x06-Poll-the-device-if-no-interrupt-is-.patch b/target/linux/bcm27xx/patches-6.1/950-0289-Input-edt-ft5x06-Poll-the-device-if-no-interrupt-is-.patch
deleted file mode 100644
index cabd47db51..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0289-Input-edt-ft5x06-Poll-the-device-if-no-interrupt-is-.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From fa1cfb50169f27443a7fe0d5d9ad3ec77ba6b8c8 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 6 Nov 2020 18:45:10 +0000
-Subject: [PATCH] Input: edt-ft5x06: Poll the device if no interrupt is
- configured.
-
-Not all systems have the interrupt line wired up, so switch to
-polling the touchscreen off a timer if no interrupt line is
-configured.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/input/touchscreen/edt-ft5x06.c | 51 +++++++++++++++++++++-----
- 1 file changed, 41 insertions(+), 10 deletions(-)
-
---- a/drivers/input/touchscreen/edt-ft5x06.c
-+++ b/drivers/input/touchscreen/edt-ft5x06.c
-@@ -75,6 +75,8 @@
- #define EDT_DEFAULT_NUM_X		1024
- #define EDT_DEFAULT_NUM_Y		1024
- 
-+#define POLL_INTERVAL_MS		17	/* 17ms = 60fps */
-+
- enum edt_pmode {
- 	EDT_PMODE_NOT_SUPPORTED,
- 	EDT_PMODE_HIBERNATE,
-@@ -136,6 +138,9 @@ struct edt_ft5x06_ts_data {
- 	enum edt_ver version;
- 	unsigned int crc_errors;
- 	unsigned int header_errors;
-+
-+	struct timer_list timer;
-+	struct work_struct work_i2c_poll;
- };
- 
- struct edt_i2c_chip_data {
-@@ -287,6 +292,22 @@ out:
- 	return IRQ_HANDLED;
- }
- 
-+static void edt_ft5x06_ts_irq_poll_timer(struct timer_list *t)
-+{
-+	struct edt_ft5x06_ts_data *tsdata = from_timer(tsdata, t, timer);
-+
-+	schedule_work(&tsdata->work_i2c_poll);
-+	mod_timer(&tsdata->timer, jiffies + msecs_to_jiffies(POLL_INTERVAL_MS));
-+}
-+
-+static void edt_ft5x06_ts_work_i2c_poll(struct work_struct *work)
-+{
-+	struct edt_ft5x06_ts_data *tsdata = container_of(work,
-+			struct edt_ft5x06_ts_data, work_i2c_poll);
-+
-+	edt_ft5x06_ts_isr(0, tsdata);
-+}
-+
- static int edt_ft5x06_register_write(struct edt_ft5x06_ts_data *tsdata,
- 				     u8 addr, u8 value)
- {
-@@ -1314,17 +1335,27 @@ static int edt_ft5x06_ts_probe(struct i2
- 
- 	i2c_set_clientdata(client, tsdata);
- 
--	irq_flags = irq_get_trigger_type(client->irq);
--	if (irq_flags == IRQF_TRIGGER_NONE)
--		irq_flags = IRQF_TRIGGER_FALLING;
--	irq_flags |= IRQF_ONESHOT;
--
--	error = devm_request_threaded_irq(&client->dev, client->irq,
--					NULL, edt_ft5x06_ts_isr, irq_flags,
--					client->name, tsdata);
--	if (error) {
--		dev_err(&client->dev, "Unable to request touchscreen IRQ.\n");
--		return error;
-+	if (client->irq) {
-+		irq_flags = irq_get_trigger_type(client->irq);
-+		if (irq_flags == IRQF_TRIGGER_NONE)
-+			irq_flags = IRQF_TRIGGER_FALLING;
-+		irq_flags |= IRQF_ONESHOT;
-+
-+		error = devm_request_threaded_irq(&client->dev, client->irq,
-+						  NULL, edt_ft5x06_ts_isr,
-+						  irq_flags, client->name,
-+						  tsdata);
-+		if (error) {
-+			dev_err(&client->dev, "Unable to request touchscreen IRQ.\n");
-+			return error;
-+		}
-+	} else {
-+		INIT_WORK(&tsdata->work_i2c_poll,
-+			  edt_ft5x06_ts_work_i2c_poll);
-+		timer_setup(&tsdata->timer, edt_ft5x06_ts_irq_poll_timer, 0);
-+		tsdata->timer.expires = jiffies +
-+					msecs_to_jiffies(POLL_INTERVAL_MS);
-+		add_timer(&tsdata->timer);
- 	}
- 
- 	error = devm_device_add_group(&client->dev, &edt_ft5x06_attr_group);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0290-drm-panel-raspberrypi-touchscreen-Use-independent-I2.patch b/target/linux/bcm27xx/patches-6.1/950-0290-drm-panel-raspberrypi-touchscreen-Use-independent-I2.patch
deleted file mode 100644
index 9cbcd81546..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0290-drm-panel-raspberrypi-touchscreen-Use-independent-I2.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 7aebec709ea87dafb9776895c4c2626a659e043c Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 23 Apr 2020 10:17:18 +0100
-Subject: [PATCH] drm/panel/raspberrypi-touchscreen: Use independent
- I2C actions with delay.
-
-We now have the hardware I2C controller pinmuxed to the drive the
-display I2C, but this controller does not support clock stretching.
-The Atmel micro-controller in the panel requires clock stretching
-to allow it to prepare any data to be read.
-
-Split the rpi_touchscreen_i2c_read into two independent transactions with
-a delay between them for the Atmel to prepare the data.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../drm/panel/panel-raspberrypi-touchscreen.c | 30 ++++++++++++++++++-
- 1 file changed, 29 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
-+++ b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
-@@ -220,7 +220,35 @@ static struct rpi_touchscreen *panel_to_
- 
- static int rpi_touchscreen_i2c_read(struct rpi_touchscreen *ts, u8 reg)
- {
--	return i2c_smbus_read_byte_data(ts->i2c, reg);
-+	struct i2c_client *client = ts->i2c;
-+	struct i2c_msg msgs[1];
-+	u8 addr_buf[1] = { reg };
-+	u8 data_buf[1] = { 0, };
-+	int ret;
-+
-+	/* Write register address */
-+	msgs[0].addr = client->addr;
-+	msgs[0].flags = 0;
-+	msgs[0].len = ARRAY_SIZE(addr_buf);
-+	msgs[0].buf = addr_buf;
-+
-+	ret = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
-+	if (ret != ARRAY_SIZE(msgs))
-+		return -EIO;
-+
-+	usleep_range(100, 300);
-+
-+	/* Read data from register */
-+	msgs[0].addr = client->addr;
-+	msgs[0].flags = I2C_M_RD;
-+	msgs[0].len = 1;
-+	msgs[0].buf = data_buf;
-+
-+	ret = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
-+	if (ret != ARRAY_SIZE(msgs))
-+		return -EIO;
-+
-+	return data_buf[0];
- }
- 
- static void rpi_touchscreen_i2c_write(struct rpi_touchscreen *ts,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0291-drm-panel-raspberrypi-ts-Insert-delay-before-polling.patch b/target/linux/bcm27xx/patches-6.1/950-0291-drm-panel-raspberrypi-ts-Insert-delay-before-polling.patch
deleted file mode 100644
index 60da18201e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0291-drm-panel-raspberrypi-ts-Insert-delay-before-polling.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 907a9f57cd845d274e75e44540c667bcf69819be Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 10 Nov 2020 11:21:56 +0000
-Subject: [PATCH] drm/panel/raspberrypi-ts: Insert delay before polling
- for startup state
-
-In switching to the hardware I2C controller there is an issue
-where we seem to not get back the correct state from the Pi
-touchscreen.
-Insert a delay before polling to avoid this condition.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
-+++ b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
-@@ -300,6 +300,7 @@ static int rpi_touchscreen_prepare(struc
- 	int i;
- 
- 	rpi_touchscreen_i2c_write(ts, REG_POWERON, 1);
-+	usleep_range(20000, 25000);
- 	/* Wait for nPWRDWN to go low to indicate poweron is done. */
- 	for (i = 0; i < 100; i++) {
- 		if (rpi_touchscreen_i2c_read(ts, REG_PORTB) & 1)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0292-dt-bindings-Add-compatible-for-BCM2711-DSI1.patch b/target/linux/bcm27xx/patches-6.1/950-0292-dt-bindings-Add-compatible-for-BCM2711-DSI1.patch
deleted file mode 100644
index 88dcdc407e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0292-dt-bindings-Add-compatible-for-BCM2711-DSI1.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 38a41d4c6e4103377bd3e31e068d8e06e2aa678d Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 12 Nov 2020 17:01:52 +0000
-Subject: [PATCH] dt-bindings: Add compatible for BCM2711 DSI1
-
-DSI1 on BCM2711 doesn't require the DMA workaround that is used
-on BCM2835/6/7, therefore it needs a new compatible string.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml
-+++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml
-@@ -21,6 +21,7 @@ properties:
-       - brcm,bcm2711-dsi1
-       - brcm,bcm2835-dsi0
-       - brcm,bcm2835-dsi1
-+      - brcm,bcm2711-dsi1
- 
-   reg:
-     maxItems: 1
diff --git a/target/linux/bcm27xx/patches-6.1/950-0293-media-bcm2835-unicam-Correctly-handle-error-propagat.patch b/target/linux/bcm27xx/patches-6.1/950-0293-media-bcm2835-unicam-Correctly-handle-error-propagat.patch
deleted file mode 100644
index bec1b9466d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0293-media-bcm2835-unicam-Correctly-handle-error-propagat.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 29f208db181f1b557b7b55fae12a796b8669b004 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Wed, 2 Dec 2020 15:22:23 +0000
-Subject: [PATCH] media: bcm2835-unicam: Correctly handle error
- propagation for stream on
-
-On a failure in start_streaming(), the error code would not propagate to
-the calling function on all conditions. This would cause the userland
-caller to not know of the failure.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/platform/bcm2835/bcm2835-unicam.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
---- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
-+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -1732,8 +1732,7 @@ err_disable_unicam:
- 	unicam_disable(dev);
- 	clk_disable_unprepare(dev->clock);
- err_vpu_clock:
--	ret = clk_set_min_rate(dev->vpu_clock, 0);
--	if (ret)
-+	if (clk_set_min_rate(dev->vpu_clock, 0))
- 		unicam_err(dev, "failed to reset the VPU clock\n");
- 	clk_disable_unprepare(dev->vpu_clock);
- err_pm_put:
diff --git a/target/linux/bcm27xx/patches-6.1/950-0294-media-bcm2835-unicam-Return-early-from-stop_streamin.patch b/target/linux/bcm27xx/patches-6.1/950-0294-media-bcm2835-unicam-Return-early-from-stop_streamin.patch
deleted file mode 100644
index 5ca99e3532..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0294-media-bcm2835-unicam-Return-early-from-stop_streamin.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 08d1267f1a93cbb44c7a7b71ce5f448d22ea5bdc Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Wed, 2 Dec 2020 15:26:09 +0000
-Subject: [PATCH] media: bcm2835-unicam: Return early from
- stop_streaming() if stopped
-
-clk_disable_unprepare() is called unconditionally in stop_streaming().
-This is incorrect in the cases where start_streaming() fails, and
-unprepares all clocks as part of the failure cleanup. To avoid this,
-ensure that clk_disable_unprepare() is only called in stop_streaming()
-if the clocks are in a prepared state.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/platform/bcm2835/bcm2835-unicam.c | 16 +++++++++-------
- 1 file changed, 9 insertions(+), 7 deletions(-)
-
---- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
-+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -428,6 +428,8 @@ struct unicam_device {
- 	struct clk *clock;
- 	/* vpu clock handle */
- 	struct clk *vpu_clock;
-+	/* clock status for error handling */
-+	bool clocks_enabled;
- 	/* V4l2 device */
- 	struct v4l2_device v4l2_dev;
- 	struct media_device mdev;
-@@ -1726,6 +1728,7 @@ static int unicam_start_streaming(struct
- 		goto err_disable_unicam;
- 	}
- 
-+	dev->clocks_enabled = true;
- 	return 0;
- 
- err_disable_unicam:
-@@ -1752,8 +1755,6 @@ static void unicam_stop_streaming(struct
- 	node->streaming = false;
- 
- 	if (node->pad_id == IMAGE_PAD) {
--		int ret;
--
- 		/*
- 		 * Stop streaming the sensor and disable the peripheral.
- 		 * We cannot continue streaming embedded data with the
-@@ -1764,12 +1765,13 @@ static void unicam_stop_streaming(struct
- 
- 		unicam_disable(dev);
- 
--		ret = clk_set_min_rate(dev->vpu_clock, 0);
--		if (ret)
--			unicam_err(dev, "failed to reset the min VPU clock\n");
-+		if (dev->clocks_enabled) {
-+			if (clk_set_min_rate(dev->vpu_clock, 0))
-+				unicam_err(dev, "failed to reset the min VPU clock\n");
- 
--		clk_disable_unprepare(dev->vpu_clock);
--		clk_disable_unprepare(dev->clock);
-+			clk_disable_unprepare(dev->vpu_clock);
-+			clk_disable_unprepare(dev->clock);
-+		}
- 		unicam_runtime_put(dev);
- 
- 	} else if (node->pad_id == METADATA_PAD) {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0295-media-bcm2835-unicam-Clear-clock-state-when-stopping.patch b/target/linux/bcm27xx/patches-6.1/950-0295-media-bcm2835-unicam-Clear-clock-state-when-stopping.patch
deleted file mode 100644
index 39cff828ba..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0295-media-bcm2835-unicam-Clear-clock-state-when-stopping.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From baca14dab127d65b4383fb1f59289a1e470026c2 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Wed, 2 Dec 2020 16:48:41 +0000
-Subject: [PATCH] media: bcm2835-unicam: Clear clock state when
- stopping streaming
-
-Commit 65e08c465020d4c5b51afb452efc2246d80fd66f failed to clear the
-clock state when the device stopped streaming. Fix this, as it might
-again cause the same problems when doing an unprepare.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/platform/bcm2835/bcm2835-unicam.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
-+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -1771,6 +1771,7 @@ static void unicam_stop_streaming(struct
- 
- 			clk_disable_unprepare(dev->vpu_clock);
- 			clk_disable_unprepare(dev->clock);
-+			dev->clocks_enabled = false;
- 		}
- 		unicam_runtime_put(dev);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0296-PCI-brcmstb-Advertise-MSI-X-support.patch b/target/linux/bcm27xx/patches-6.1/950-0296-PCI-brcmstb-Advertise-MSI-X-support.patch
deleted file mode 100644
index 11399af894..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0296-PCI-brcmstb-Advertise-MSI-X-support.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 1fe9084417e493060504f0d7950737bf7cae5390 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 3 Dec 2020 13:44:42 +0000
-Subject: [PATCH] PCI: brcmstb: Advertise MSI-X support
-
-Although the BRCMSTB PCIe interface doesn't technically support the
-MSI-X spec, in practise it seems to work provided no more than 32
-MSI-Xs are required. Add the required flag to the driver to allow
-experimentation with devices that demand MSI-X support.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/pci/controller/pcie-brcmstb.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/pci/controller/pcie-brcmstb.c
-+++ b/drivers/pci/controller/pcie-brcmstb.c
-@@ -447,7 +447,8 @@ static struct irq_chip brcm_msi_irq_chip
- 
- static struct msi_domain_info brcm_msi_domain_info = {
- 	/* Multi MSI is supported by the controller, but not by this driver */
--	.flags	= (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS),
-+	.flags	= (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS |
-+		   MSI_FLAG_PCI_MSIX),
- 	.chip	= &brcm_msi_irq_chip,
- };
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0297-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch b/target/linux/bcm27xx/patches-6.1/950-0297-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch
deleted file mode 100644
index f5f9cc7b59..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0297-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 1b226af70680dc2849aeb60d930180ad62ceb3c5 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 15 Dec 2020 16:38:37 +0000
-Subject: [PATCH] net: lan78xx: Ack pending PHY ints when resetting
-
-lan78xx_link_reset explicitly clears the MAC's view of the PHY's IRQ
-status. In doing so it potentially leaves the PHY with a pending
-interrupt that will never be acknowledged, at which point no further
-interrupts will be generated.
-
-Avoid the problem by acknowledging any pending PHY interrupt after
-clearing the MAC's status bit.
-
-See: https://github.com/raspberrypi/linux/issues/2937
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/net/usb/lan78xx.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/net/usb/lan78xx.c
-+++ b/drivers/net/usb/lan78xx.c
-@@ -1440,6 +1440,9 @@ static int lan78xx_link_reset(struct lan
- 	if (unlikely(ret < 0))
- 		return ret;
- 
-+	/* Acknowledge any pending PHY interrupt, lest it be the last */
-+	phy_read(phydev, LAN88XX_INT_STS);
-+
- 	mutex_lock(&phydev->lock);
- 	phy_read_status(phydev);
- 	link = phydev->link;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0298-vc-sm-cma-fixed-kbuild-problem.patch b/target/linux/bcm27xx/patches-6.1/950-0298-vc-sm-cma-fixed-kbuild-problem.patch
deleted file mode 100644
index f312344650..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0298-vc-sm-cma-fixed-kbuild-problem.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 1b1b4dc2eab45b425c60c708ca98086f3584b9d0 Mon Sep 17 00:00:00 2001
-From: gesangtome <gesangtome@foxmail.com>
-Date: Fri, 1 Jan 2021 18:03:17 +0800
-Subject: [PATCH] vc-sm-cma: fixed kbuild problem
-
-error logs:
-  drivers/staging/vc04_services/vc-sm-cma/Kconfig:1:error: recursive dependency detected!
-  drivers/staging/vc04_services/vc-sm-cma/Kconfig:1:      symbol BCM_VC_SM_CMA is selected by BCM2835_VCHIQ_MMAL
-  drivers/staging/vc04_services/vchiq-mmal/Kconfig:1:     symbol BCM2835_VCHIQ_MMAL depends on BCM2835_VCHIQ
-  drivers/staging/vc04_services/Kconfig:14:       symbol BCM2835_VCHIQ is selected by BCM_VC_SM_CMA
-  For a resolution refer to Documentation/kbuild/kconfig-language.rst
-  subsection "Kconfig recursive dependency limitations"
-
-Tested-by: make ARCH=arm64 bcm2711_defconfig
-Test platform: fedora 33
-Branch: rpi-5.10.y
----
- drivers/staging/vc04_services/vchiq-mmal/Kconfig | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/staging/vc04_services/vchiq-mmal/Kconfig
-+++ b/drivers/staging/vc04_services/vchiq-mmal/Kconfig
-@@ -1,6 +1,6 @@
- config BCM2835_VCHIQ_MMAL
- 	tristate "BCM2835 MMAL VCHIQ service"
--	depends on BCM2835_VCHIQ
-+	select BCM2835_VCHIQ
- 	select BCM_VC_SM_CMA
- 	help
- 	  Enables the MMAL API over VCHIQ interface as used for the
diff --git a/target/linux/bcm27xx/patches-6.1/950-0299-staging-vc04_services-Add-additional-unpacked-raw-fo.patch b/target/linux/bcm27xx/patches-6.1/950-0299-staging-vc04_services-Add-additional-unpacked-raw-fo.patch
deleted file mode 100644
index 507479c1db..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0299-staging-vc04_services-Add-additional-unpacked-raw-fo.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From e2630c03cdefa8d4fedfa35aebad776b9b17946f Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 7 Jan 2021 10:43:20 +0000
-Subject: [PATCH] staging/vc04_services: Add additional unpacked raw
- formats
-
-Support has been added for the unpacked (16bpp) versions of
-the MIPI raw 10, 12, and 14 formats, so add the 4CCs for them.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../vc04_services/vchiq-mmal/mmal-encodings.h | 22 +++++++++++++++++++
- 1 file changed, 22 insertions(+)
-
---- a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
-+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
-@@ -102,12 +102,34 @@
- #define MMAL_ENCODING_BAYER_SGRBG16    MMAL_FOURCC('G', 'R', '1', '6')
- #define MMAL_ENCODING_BAYER_SRGGB16    MMAL_FOURCC('R', 'G', '1', '6')
- 
-+/* 10 bit per pixel unpacked (16bit) Bayer formats. */
-+#define MMAL_ENCODING_BAYER_SBGGR10    MMAL_FOURCC('B', 'G', '1', '0')
-+#define MMAL_ENCODING_BAYER_SGRBG10    MMAL_FOURCC('B', 'A', '1', '0')
-+#define MMAL_ENCODING_BAYER_SGBRG10    MMAL_FOURCC('G', 'B', '1', '0')
-+#define MMAL_ENCODING_BAYER_SRGGB10    MMAL_FOURCC('R', 'G', '1', '0')
-+
-+/* 12 bit per pixel unpacked (16bit) Bayer formats */
-+#define MMAL_ENCODING_BAYER_SBGGR12    MMAL_FOURCC('B', 'G', '1', '2')
-+#define MMAL_ENCODING_BAYER_SGRBG12    MMAL_FOURCC('B', 'A', '1', '2')
-+#define MMAL_ENCODING_BAYER_SGBRG12    MMAL_FOURCC('G', 'B', '1', '2')
-+#define MMAL_ENCODING_BAYER_SRGGB12    MMAL_FOURCC('R', 'G', '1', '2')
-+
-+/* 14 bit per pixel unpacked (16bit) Bayer formats */
-+#define MMAL_ENCODING_BAYER_SBGGR14    MMAL_FOURCC('B', 'G', '1', '4')
-+#define MMAL_ENCODING_BAYER_SGBRG14    MMAL_FOURCC('G', 'B', '1', '4')
-+#define MMAL_ENCODING_BAYER_SGRBG14    MMAL_FOURCC('G', 'R', '1', '4')
-+#define MMAL_ENCODING_BAYER_SRGGB14    MMAL_FOURCC('R', 'G', '1', '4')
-+
- /* MIPI packed monochrome images */
- #define MMAL_ENCODING_GREY    MMAL_FOURCC('G', 'R', 'E', 'Y')
- #define MMAL_ENCODING_Y10P    MMAL_FOURCC('Y', '1', '0', 'P')
- #define MMAL_ENCODING_Y12P    MMAL_FOURCC('Y', '1', '2', 'P')
- #define MMAL_ENCODING_Y14P    MMAL_FOURCC('Y', '1', '4', 'P')
- #define MMAL_ENCODING_Y16     MMAL_FOURCC('Y', '1', '6', ' ')
-+/* Unpacked monochrome formats (16bit per sample, but only N LSBs used) */
-+#define MMAL_ENCODING_Y10     MMAL_FOURCC('Y', '1', '0', ' ')
-+#define MMAL_ENCODING_Y12     MMAL_FOURCC('Y', '1', '2', ' ')
-+#define MMAL_ENCODING_Y14     MMAL_FOURCC('Y', '1', '4', ' ')
- 
- /** An EGL image handle
-  */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0300-staging-bcm2835-isp-Add-the-unpacked-16bpp-raw-forma.patch b/target/linux/bcm27xx/patches-6.1/950-0300-staging-bcm2835-isp-Add-the-unpacked-16bpp-raw-forma.patch
deleted file mode 100644
index d0e9c75e7a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0300-staging-bcm2835-isp-Add-the-unpacked-16bpp-raw-forma.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From 5a6d41213c9415d999ac06f0e985ceeb4d4c1159 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 7 Jan 2021 11:37:10 +0000
-Subject: [PATCH] staging/bcm2835-isp: Add the unpacked (16bpp) raw
- formats
-
-Now that the firmware supports the unpacked (16bpp) variants
-of the MIPI raw formats, add the mappings.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../bcm2835-isp/bcm2835-isp-fmts.h            | 127 ++++++++++++++++++
- .../bcm2835-isp/bcm2835-v4l2-isp.c            |   4 +-
- 2 files changed, 129 insertions(+), 2 deletions(-)
-
---- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h
-+++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h
-@@ -298,6 +298,106 @@ static const struct bcm2835_isp_fmt supp
- 		.colorspace	    = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
-+		/* Bayer formats unpacked to 16bpp */
-+		/* 10 bit */
-+		.fourcc		    = V4L2_PIX_FMT_SRGGB10,
-+		.depth		    = 16,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BAYER_SRGGB10,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_SBGGR10,
-+		.depth		    = 16,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BAYER_SBGGR10,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_SGRBG10,
-+		.depth		    = 16,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGRBG10,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_SGBRG10,
-+		.depth		    = 16,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGBRG10,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		/* 12 bit */
-+		.fourcc		    = V4L2_PIX_FMT_SRGGB12,
-+		.depth		    = 16,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BAYER_SRGGB12,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_SBGGR12,
-+		.depth		    = 16,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BAYER_SBGGR12,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_SGRBG12,
-+		.depth		    = 16,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGRBG12,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_SGBRG12,
-+		.depth		    = 16,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGBRG12,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		/* 14 bit */
-+		.fourcc		    = V4L2_PIX_FMT_SRGGB14,
-+		.depth		    = 16,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BAYER_SRGGB14,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_SBGGR14,
-+		.depth		    = 16,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BAYER_SBGGR14,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_SGRBG14,
-+		.depth		    = 16,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGRBG14,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		.fourcc		    = V4L2_PIX_FMT_SGBRG14,
-+		.depth		    = 16,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGBRG14,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
- 		/* Monochrome MIPI formats */
- 		/* 8 bit */
- 		.fourcc		    = V4L2_PIX_FMT_GREY,
-@@ -343,6 +443,33 @@ static const struct bcm2835_isp_fmt supp
- 		.size_multiplier_x2 = 2,
- 		.colorspace	    = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
-+	}, {
-+		/* 10 bit as 16bpp */
-+		.fourcc		    = V4L2_PIX_FMT_Y10,
-+		.depth		    = 16,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_Y10,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		/* 12 bit as 16bpp */
-+		.fourcc		    = V4L2_PIX_FMT_Y12,
-+		.depth		    = 16,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_Y12,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
-+	}, {
-+		/* 14 bit as 16bpp */
-+		.fourcc		    = V4L2_PIX_FMT_Y14,
-+		.depth		    = 16,
-+		.bytesperline_align = 32,
-+		.mmal_fmt	    = MMAL_ENCODING_Y14,
-+		.size_multiplier_x2 = 2,
-+		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_META_FMT_BCM2835_ISP_STATS,
- 		.mmal_fmt	    = MMAL_ENCODING_BRCM_STATS,
---- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-+++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-@@ -1148,11 +1148,11 @@ static const struct v4l2_ioctl_ops bcm28
-  * Size of the array to provide to the VPU when asking for the list of supported
-  * formats.
-  *
-- * The ISP component currently advertises 44 input formats, so add a small
-+ * The ISP component currently advertises 62 input formats, so add a small
-  * overhead on that. Should the component advertise more formats then the excess
-  * will be dropped and a warning logged.
-  */
--#define MAX_SUPPORTED_ENCODINGS 50
-+#define MAX_SUPPORTED_ENCODINGS 70
- 
- /* Populate node->supported_fmts with the formats supported by those ports. */
- static int bcm2835_isp_get_supported_fmts(struct bcm2835_isp_node *node)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0301-staging-bcm2835-isp-Log-the-number-of-excess-support.patch b/target/linux/bcm27xx/patches-6.1/950-0301-staging-bcm2835-isp-Log-the-number-of-excess-support.patch
deleted file mode 100644
index 03b179debb..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0301-staging-bcm2835-isp-Log-the-number-of-excess-support.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 13deccb4bf26bec443f7c05001f0e4b52a5a71f7 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 7 Jan 2021 11:43:22 +0000
-Subject: [PATCH] staging/bcm2835-isp: Log the number of excess
- supported formats
-
-When logging that the firmware has provided more supported formats
-than we had allocated storage for, log the number allocated and
-returned.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
---- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-+++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-@@ -1171,8 +1171,9 @@ static int bcm2835_isp_get_supported_fmt
- 	if (ret) {
- 		if (ret == MMAL_MSG_STATUS_ENOSPC) {
- 			v4l2_err(&dev->v4l2_dev,
--				 "%s: port has more encoding than we provided space for. Some are dropped.\n",
--				 __func__);
-+				 "%s: port has more encodings than we provided space for. Some are dropped (%u vs %u).\n",
-+				 __func__, param_size / sizeof(u32),
-+				 MAX_SUPPORTED_ENCODINGS);
- 			num_encodings = MAX_SUPPORTED_ENCODINGS;
- 		} else {
- 			v4l2_err(&dev->v4l2_dev, "%s: get_param ret %u.\n",
diff --git a/target/linux/bcm27xx/patches-6.1/950-0302-bcm2835-dma-Avoid-losing-CS-flags-after-interrupt.patch b/target/linux/bcm27xx/patches-6.1/950-0302-bcm2835-dma-Avoid-losing-CS-flags-after-interrupt.patch
deleted file mode 100644
index 2ad0ddf405..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0302-bcm2835-dma-Avoid-losing-CS-flags-after-interrupt.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 79cd7c76a0274395ce5db44488fcea22dfeee6d3 Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Wed, 6 Jan 2021 18:16:10 +0000
-Subject: [PATCH] bcm2835-dma: Avoid losing CS flags after interrupt
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/dma/bcm2835-dma.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/dma/bcm2835-dma.c
-+++ b/drivers/dma/bcm2835-dma.c
-@@ -704,7 +704,7 @@ static irqreturn_t bcm2835_dma_callback(
- 	 * if this IRQ handler is threaded.) If the channel is finished, it
- 	 * will remain idle despite the ACTIVE flag being set.
- 	 */
--	writel(BCM2835_DMA_INT | BCM2835_DMA_ACTIVE,
-+	writel(BCM2835_DMA_INT | BCM2835_DMA_ACTIVE | BCM2835_DMA_CS_FLAGS(c->dreq),
- 	       c->chan_base + BCM2835_DMA_CS);
- 
- 	d = c->desc;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0303-bcm2835-dma-Add-bcm2835-dma-Add-DMA_WIDE_SOURCE-and-.patch b/target/linux/bcm27xx/patches-6.1/950-0303-bcm2835-dma-Add-bcm2835-dma-Add-DMA_WIDE_SOURCE-and-.patch
deleted file mode 100644
index 33b6ace7ae..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0303-bcm2835-dma-Add-bcm2835-dma-Add-DMA_WIDE_SOURCE-and-.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 153c92ec4e0364c12f99e39106dc79e5b7167cac Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Wed, 30 Dec 2020 14:51:29 +0000
-Subject: [PATCH] bcm2835-dma: Add bcm2835-dma: Add DMA_WIDE_SOURCE and
- DMA_WIDE_DEST flags
-
-Use (reserved) bits 24 and 25 of the dreq value
-(the second cell of the DT DMA descriptor) to request
-that wide source reads or wide dest writes are required
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/dma/bcm2835-dma.c | 19 ++++++++++++++++---
- 1 file changed, 16 insertions(+), 3 deletions(-)
-
---- a/drivers/dma/bcm2835-dma.c
-+++ b/drivers/dma/bcm2835-dma.c
-@@ -171,6 +171,17 @@ struct bcm2835_desc {
- #define WAIT_RESP(x) ((x & BCM2835_DMA_NO_WAIT_RESP) ? \
- 		      0 : BCM2835_DMA_WAIT_RESP)
- 
-+/* A fake bit to request that the driver requires wide reads */
-+#define BCM2835_DMA_WIDE_SOURCE BIT(24)
-+#define WIDE_SOURCE(x) ((x & BCM2835_DMA_WIDE_SOURCE) ? \
-+		      BCM2835_DMA_S_WIDTH : 0)
-+
-+/* A fake bit to request that the driver requires wide writes */
-+#define BCM2835_DMA_WIDE_DEST BIT(25)
-+#define WIDE_DEST(x) ((x & BCM2835_DMA_WIDE_DEST) ? \
-+		      BCM2835_DMA_D_WIDTH : 0)
-+
-+
- /* debug register bits */
- #define BCM2835_DMA_DEBUG_LAST_NOT_SET_ERR	BIT(0)
- #define BCM2835_DMA_DEBUG_FIFO_ERR		BIT(1)
-@@ -850,7 +861,8 @@ static struct dma_async_tx_descriptor *b
- {
- 	struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);
- 	struct bcm2835_desc *d;
--	u32 info = BCM2835_DMA_D_INC | BCM2835_DMA_S_INC;
-+	u32 info = BCM2835_DMA_D_INC | BCM2835_DMA_S_INC |
-+		   WIDE_SOURCE(c->dreq) | WIDE_DEST(c->dreq);
- 	u32 extra = BCM2835_DMA_INT_EN | WAIT_RESP(c->dreq);
- 	size_t max_len = bcm2835_dma_max_frame_length(c);
- 	size_t frames;
-@@ -881,7 +893,8 @@ static struct dma_async_tx_descriptor *b
- 	struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);
- 	struct bcm2835_desc *d;
- 	dma_addr_t src = 0, dst = 0;
--	u32 info = WAIT_RESP(c->dreq);
-+	u32 info = WAIT_RESP(c->dreq) |
-+		   WIDE_SOURCE(c->dreq) | WIDE_DEST(c->dreq);
- 	u32 extra = BCM2835_DMA_INT_EN;
- 	size_t frames;
- 
-@@ -943,7 +956,7 @@ static struct dma_async_tx_descriptor *b
- 	struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);
- 	struct bcm2835_desc *d;
- 	dma_addr_t src, dst;
--	u32 info = WAIT_RESP(c->dreq);
-+	u32 info = WAIT_RESP(c->dreq) | WIDE_SOURCE(c->dreq) | WIDE_DEST(c->dreq);
- 	u32 extra = 0;
- 	size_t max_len = bcm2835_dma_max_frame_length(c);
- 	size_t frames;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0304-uapi-bcm2835-isp-Add-colour-denoise-configuration.patch b/target/linux/bcm27xx/patches-6.1/950-0304-uapi-bcm2835-isp-Add-colour-denoise-configuration.patch
deleted file mode 100644
index f8c7aa9eae..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0304-uapi-bcm2835-isp-Add-colour-denoise-configuration.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From cc176690229ef17ff456b8d6082baa3f08d65662 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Thu, 14 Jan 2021 09:18:42 +0000
-Subject: [PATCH] uapi: bcm2835-isp: Add colour denoise configuration
-
-Add a configuration structure for colour denoise to the bcm2835_isp
-driver.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- include/uapi/linux/bcm2835-isp.h | 27 +++++++++++++++++++++++++++
- 1 file changed, 27 insertions(+)
-
---- a/include/uapi/linux/bcm2835-isp.h
-+++ b/include/uapi/linux/bcm2835-isp.h
-@@ -31,6 +31,8 @@
- 				(V4L2_CID_USER_BCM2835_ISP_BASE + 0x0007)
- #define V4L2_CID_USER_BCM2835_ISP_DPC		\
- 				(V4L2_CID_USER_BCM2835_ISP_BASE + 0x0008)
-+#define V4L2_CID_USER_BCM2835_ISP_CDN \
-+				(V4L2_CID_USER_BCM2835_ISP_BASE + 0x0009)
- 
- /*
-  * All structs below are directly mapped onto the equivalent structs in
-@@ -176,6 +178,31 @@ struct bcm2835_isp_gamma {
- };
- 
- /**
-+ * enum bcm2835_isp_cdn_mode - Mode of operation for colour denoise.
-+ *
-+ * @CDN_MODE_FAST:		Fast (but lower quality) colour denoise
-+ *				algorithm, typically used for video recording.
-+ * @CDN_HIGH_QUALITY:		High quality (but slower) colour denoise
-+ *				algorithm, typically used for stills capture.
-+ */
-+enum bcm2835_isp_cdn_mode {
-+	CDN_MODE_FAST = 0,
-+	CDN_MODE_HIGH_QUALITY = 1,
-+};
-+
-+/**
-+ * struct bcm2835_isp_cdn - Colour denoise parameters set with the
-+ *			    V4L2_CID_USER_BCM2835_ISP_CDN ctrl.
-+ *
-+ * @enabled:	Enable colour denoise.
-+ * @mode:	Colour denoise operating mode (see enum &bcm2835_isp_cdn_mode)
-+ */
-+struct bcm2835_isp_cdn {
-+	__u32 enabled;
-+	__u32 mode;
-+};
-+
-+/**
-  * struct bcm2835_isp_denoise - Denoise parameters set with the
-  *				V4L2_CID_USER_BCM2835_ISP_DENOISE ctrl.
-  *
diff --git a/target/linux/bcm27xx/patches-6.1/950-0305-staging-vc04_services-ISP-Add-colour-denoise-control.patch b/target/linux/bcm27xx/patches-6.1/950-0305-staging-vc04_services-ISP-Add-colour-denoise-control.patch
deleted file mode 100644
index 29e5f423cf..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0305-staging-vc04_services-ISP-Add-colour-denoise-control.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 19b66a5cc04a0f4dee17bbc862568e6c7e015963 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Thu, 14 Jan 2021 09:20:52 +0000
-Subject: [PATCH] staging: vc04_services: ISP: Add colour denoise
- control
-
-Add colour denoise control to the bcm2835 driver through a new v4l2
-control: V4L2_CID_USER_BCM2835_ISP_CDN.
-
-Add the accompanying MMAL configuration structure definitions as well.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- .../vc04_services/bcm2835-isp/bcm2835-isp-ctrls.h   |  5 +++++
- .../vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c    |  5 +++++
- .../vc04_services/vchiq-mmal/mmal-parameters.h      | 13 +++++++++++++
- 3 files changed, 23 insertions(+)
-
---- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-ctrls.h
-+++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-ctrls.h
-@@ -57,6 +57,11 @@ static const struct bcm2835_isp_custom_c
- 		.size	= sizeof(struct bcm2835_isp_denoise),
- 		.flags  = 0
- 	}, {
-+		.name	= "Colour Denoise",
-+		.id	= V4L2_CID_USER_BCM2835_ISP_CDN,
-+		.size	= sizeof(struct bcm2835_isp_cdn),
-+		.flags  = 0
-+	}, {
- 		.name	= "Defective Pixel Correction",
- 		.id	= V4L2_CID_USER_BCM2835_ISP_DPC,
- 		.size	= sizeof(struct bcm2835_isp_dpc),
---- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-+++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-@@ -766,6 +766,11 @@ static int bcm2835_isp_s_ctrl(struct v4l
- 				    ctrl->p_new.p_u8,
- 				    sizeof(struct bcm2835_isp_denoise));
- 		break;
-+	case V4L2_CID_USER_BCM2835_ISP_CDN:
-+		ret = set_isp_param(node, MMAL_PARAMETER_CDN,
-+				    ctrl->p_new.p_u8,
-+				    sizeof(struct bcm2835_isp_cdn));
-+		break;
- 	case V4L2_CID_USER_BCM2835_ISP_SHARPEN:
- 		ret = set_isp_param(node, MMAL_PARAMETER_SHARPEN,
- 				    ctrl->p_new.p_u8,
---- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
-+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
-@@ -279,6 +279,8 @@ enum mmal_parameter_camera_type {
- 	MMAL_PARAMETER_DPC,
- 		/**< Tales a @ref MMAP_PARAMETER_GAMMA_T */
- 	MMAL_PARAMETER_GAMMA,
-+		/**< Takes a @ref MMAL_PARAMETER_CDN_T */
-+	MMAL_PARAMETER_CDN,
- 		/**< Takes a @ref MMAL_PARAMETER_BOOLEAN_T */
- 	MMAL_PARAMETER_JPEG_IJG_SCALING,
- };
-@@ -915,6 +917,17 @@ struct mmal_parameter_gamma {
- 	u16 y[MMAL_NUM_GAMMA_PTS];
- };
- 
-+enum mmal_parameter_cdn_mode {
-+	MMAL_PARAM_CDN_FAST = 0,
-+	MMAL_PARAM_CDN_HIGH_QUALITY = 1,
-+	MMAL_PARAM_CDN_DUMMY  = 0x7FFFFFFF
-+};
-+
-+struct mmal_parameter_colour_denoise {
-+	u32 enabled;
-+	enum mmal_parameter_cdn_mode mode;
-+};
-+
- struct mmal_parameter_denoise {
- 	u32 enabled;
- 	u32 constant;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0306-spi-bcm2835-Workaround-fix-for-zero-length-transfers.patch b/target/linux/bcm27xx/patches-6.1/950-0306-spi-bcm2835-Workaround-fix-for-zero-length-transfers.patch
deleted file mode 100644
index 89f127654a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0306-spi-bcm2835-Workaround-fix-for-zero-length-transfers.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 6415a827951c2676cc2cf0188fbdbc0c994048a3 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 28 Jan 2021 11:30:04 +0000
-Subject: [PATCH] spi: bcm2835: Workaround/fix for zero-length
- transfers
-
-A relatively recent commit ([1]) contained optimisation for the PIO
-SPI FIFO-filling functions. The commit message includes the phrase
-"[t]he blind and counted loops are always called with nonzero count".
-This is technically true, but it is still possible for count to become
-zero before the loop is entered - if tfr->len is zero. Moving the loop
-exit condition to the end of the loop saves a few cycles, but results
-in a near-infinite loop should the revised count be zero on entry.
-
-Strangely, zero-lengthed transfers aren't filtered by the SPI framework
-and, even more strangely, the Python3 spidev library is triggering them
-for no obvious reason.
-
-Avoid the problem completely by bailing out of the main transfer
-function early if trf->len is zero, although there may be a case for
-moving the mitigation into the framework.
-
-See: https://github.com/raspberrypi/linux/issues/4100
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-[1] 26751de25d25 ("spi: bcm2835: Micro-optimise FIFO loops")
----
- drivers/spi/spi-bcm2835.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/drivers/spi/spi-bcm2835.c
-+++ b/drivers/spi/spi-bcm2835.c
-@@ -1055,6 +1055,16 @@ static int bcm2835_spi_transfer_one(stru
- 	unsigned long hz_per_byte, byte_limit;
- 	u32 cs = slv->prepare_cs;
- 
-+	if (unlikely(!tfr->len)) {
-+		static int warned;
-+
-+		if (!warned)
-+			dev_warn(&spi->dev,
-+				 "zero-length SPI transfer ignored\n");
-+		warned = 1;
-+		return 0;
-+	}
-+
- 	/* set clock */
- 	spi_hz = tfr->speed_hz;
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0307-kbuild-Silence-unavoidable-dtc-overlay-warnings.patch b/target/linux/bcm27xx/patches-6.1/950-0307-kbuild-Silence-unavoidable-dtc-overlay-warnings.patch
deleted file mode 100644
index 998d30b6f1..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0307-kbuild-Silence-unavoidable-dtc-overlay-warnings.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From eff293169d037a716e88734182bc8d7eb0c73289 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Fri, 29 Jan 2021 10:34:11 +0000
-Subject: [PATCH] kbuild: Silence unavoidable dtc overlay warnings
-
-Much effort has been put into finding ways to avoid warnings from dtc
-about overlays, usually to do with the presence of #address-cells and
-size-cells, but not exclusively so. Since the issues being warned about
-are harmless, suppress the warnings to declutter the build output and
-to avoid alarming users.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- scripts/Makefile.lib | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/scripts/Makefile.lib
-+++ b/scripts/Makefile.lib
-@@ -415,6 +415,12 @@ cmd_dtco = mkdir -p $(dir ${dtc-tmp}) ;
- 	$(DTC) -@ -H epapr -O dtb -o $@ -b 0 \
- 		-i $(dir $<) $(DTC_FLAGS) \
- 		-Wno-interrupts_property \
-+		-Wno-label_is_string \
-+		-Wno-reg_format \
-+		-Wno-pci_device_bus_num \
-+		-Wno-i2c_bus_reg \
-+		-Wno-spi_bus_reg \
-+		-Wno-avoid_default_addr_size \
- 		-d $(depfile).dtc.tmp $(dtc-tmp) ; \
- 	cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile)
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0308-bcm2835-isp-Allow-formats-with-different-colour-spac.patch b/target/linux/bcm27xx/patches-6.1/950-0308-bcm2835-isp-Allow-formats-with-different-colour-spac.patch
deleted file mode 100644
index f4f3218877..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0308-bcm2835-isp-Allow-formats-with-different-colour-spac.patch
+++ /dev/null
@@ -1,712 +0,0 @@
-From 35534584af58ed5b953399fa5bfb0338c68258db Mon Sep 17 00:00:00 2001
-From: David Plowman <david.plowman@raspberrypi.com>
-Date: Tue, 12 Jan 2021 13:55:39 +0000
-Subject: [PATCH] bcm2835-isp: Allow formats with different colour
- spaces.
-
-Each supported format now includes a mask showing the allowed colour
-spaces, as well as a default colour space for when one was not
-specified.
-
-Additionally we translate the colour space to mmal format and pass it
-over to the VideoCore.
-
-Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
----
- .../bcm2835-isp/bcm2835-isp-fmts.h            | 180 ++++++++++++------
- .../bcm2835-isp/bcm2835-v4l2-isp.c            |  66 ++++++-
- 2 files changed, 190 insertions(+), 56 deletions(-)
-
---- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h
-+++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h
-@@ -20,10 +20,29 @@ struct bcm2835_isp_fmt {
- 	int bytesperline_align;
- 	u32 mmal_fmt;
- 	int size_multiplier_x2;
--	enum v4l2_colorspace colorspace;
-+	u32 colorspace_mask;
-+	enum v4l2_colorspace colorspace_default;
- 	unsigned int step_size;
- };
- 
-+#define V4L2_COLORSPACE_MASK(colorspace) BIT(colorspace)
-+
-+#define V4L2_COLORSPACE_MASK_JPEG V4L2_COLORSPACE_MASK(V4L2_COLORSPACE_JPEG)
-+#define V4L2_COLORSPACE_MASK_SMPTE170M V4L2_COLORSPACE_MASK(V4L2_COLORSPACE_SMPTE170M)
-+#define V4L2_COLORSPACE_MASK_REC709 V4L2_COLORSPACE_MASK(V4L2_COLORSPACE_REC709)
-+#define V4L2_COLORSPACE_MASK_SRGB V4L2_COLORSPACE_MASK(V4L2_COLORSPACE_SRGB)
-+#define V4L2_COLORSPACE_MASK_RAW V4L2_COLORSPACE_MASK(V4L2_COLORSPACE_RAW)
-+
-+/*
-+ * The colour spaces we support for YUV outputs. SRGB features here because,
-+ * once you assign the default transfer func and so on, it and JPEG effectively
-+ * mean the same.
-+ */
-+#define V4L2_COLORSPACE_MASK_YUV (V4L2_COLORSPACE_MASK_JPEG | \
-+				  V4L2_COLORSPACE_MASK_SRGB | \
-+				  V4L2_COLORSPACE_MASK_SMPTE170M | \
-+				  V4L2_COLORSPACE_MASK_REC709)
-+
- static const struct bcm2835_isp_fmt supported_formats[] = {
- 	{
- 		/* YUV formats */
-@@ -32,7 +51,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_I420,
- 		.size_multiplier_x2 = 3,
--		.colorspace	    = V4L2_COLORSPACE_SMPTE170M,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_YUV,
-+		.colorspace_default = V4L2_COLORSPACE_JPEG,
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_YVU420,
-@@ -40,7 +60,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_YV12,
- 		.size_multiplier_x2 = 3,
--		.colorspace	    = V4L2_COLORSPACE_SMPTE170M,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_YUV,
-+		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_NV12,
-@@ -48,7 +69,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_NV12,
- 		.size_multiplier_x2 = 3,
--		.colorspace	    = V4L2_COLORSPACE_SMPTE170M,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_YUV,
-+		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_NV21,
-@@ -56,7 +78,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_NV21,
- 		.size_multiplier_x2 = 3,
--		.colorspace	    = V4L2_COLORSPACE_SMPTE170M,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_YUV,
-+		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_YUYV,
-@@ -64,7 +87,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 64,
- 		.mmal_fmt	    = MMAL_ENCODING_YUYV,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_SMPTE170M,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_YUV,
-+		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_UYVY,
-@@ -72,7 +96,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 64,
- 		.mmal_fmt	    = MMAL_ENCODING_UYVY,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_SMPTE170M,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_YUV,
-+		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_YVYU,
-@@ -80,7 +105,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 64,
- 		.mmal_fmt	    = MMAL_ENCODING_YVYU,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_SMPTE170M,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_YUV,
-+		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_VYUY,
-@@ -88,7 +114,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 64,
- 		.mmal_fmt	    = MMAL_ENCODING_VYUY,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_SMPTE170M,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_YUV,
-+		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
- 		.step_size	    = 2,
- 	}, {
- 		/* RGB formats */
-@@ -97,7 +124,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_RGB24,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_SRGB,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_SRGB,
-+		.colorspace_default = V4L2_COLORSPACE_SRGB,
- 		.step_size	    = 1,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_RGB565,
-@@ -105,7 +133,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_RGB16,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_SRGB,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_SRGB,
-+		.colorspace_default = V4L2_COLORSPACE_SRGB,
- 		.step_size	    = 1,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_BGR24,
-@@ -113,7 +142,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BGR24,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_SRGB,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_SRGB,
-+		.colorspace_default = V4L2_COLORSPACE_SRGB,
- 		.step_size	    = 1,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_XBGR32,
-@@ -121,7 +151,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 64,
- 		.mmal_fmt	    = MMAL_ENCODING_BGRA,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_SRGB,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_SRGB,
-+		.colorspace_default = V4L2_COLORSPACE_SRGB,
- 		.step_size	    = 1,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_RGBX32,
-@@ -129,7 +160,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 64,
- 		.mmal_fmt	    = MMAL_ENCODING_RGBA,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_SRGB,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_SRGB,
-+		.colorspace_default = V4L2_COLORSPACE_SRGB,
- 		.step_size	    = 1,
- 	}, {
- 		/* Bayer formats */
-@@ -139,7 +171,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BAYER_SRGGB8,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_SBGGR8,
-@@ -147,7 +180,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BAYER_SBGGR8,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_SGRBG8,
-@@ -155,7 +189,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGRBG8,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_SGBRG8,
-@@ -163,7 +198,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGBRG8,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		/* 10 bit */
-@@ -172,7 +208,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BAYER_SRGGB10P,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_SBGGR10P,
-@@ -180,7 +217,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BAYER_SBGGR10P,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_SGRBG10P,
-@@ -188,7 +226,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGRBG10P,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_SGBRG10P,
-@@ -196,7 +235,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGBRG10P,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		/* 12 bit */
-@@ -205,7 +245,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BAYER_SRGGB12P,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_SBGGR12P,
-@@ -213,7 +254,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BAYER_SBGGR12P,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_SGRBG12P,
-@@ -221,7 +263,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGRBG12P,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_SGBRG12P,
-@@ -229,7 +272,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGBRG12P,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		/* 14 bit */
-@@ -238,7 +282,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BAYER_SRGGB14P,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_SBGGR14P,
-@@ -246,7 +291,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BAYER_SBGGR14P,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_SGRBG14P,
-@@ -254,7 +300,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGRBG14P,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_SGBRG14P,
-@@ -262,7 +309,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGBRG14P,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		/* 16 bit */
-@@ -271,7 +319,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BAYER_SRGGB16,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_SBGGR16,
-@@ -279,7 +328,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BAYER_SBGGR16,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_SGRBG16,
-@@ -287,7 +337,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGRBG16,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_SGBRG16,
-@@ -295,7 +346,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGBRG16,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		/* Bayer formats unpacked to 16bpp */
-@@ -305,7 +357,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BAYER_SRGGB10,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_SBGGR10,
-@@ -313,7 +366,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BAYER_SBGGR10,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_SGRBG10,
-@@ -321,7 +375,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGRBG10,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_SGBRG10,
-@@ -329,7 +384,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGBRG10,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		/* 12 bit */
-@@ -338,7 +394,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BAYER_SRGGB12,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_SBGGR12,
-@@ -346,7 +403,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BAYER_SBGGR12,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_SGRBG12,
-@@ -354,7 +412,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGRBG12,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_SGBRG12,
-@@ -362,7 +421,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGBRG12,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		/* 14 bit */
-@@ -371,7 +431,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BAYER_SRGGB14,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_SBGGR14,
-@@ -379,7 +440,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BAYER_SBGGR14,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_SGRBG14,
-@@ -387,7 +449,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGRBG14,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_SGBRG14,
-@@ -395,7 +458,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BAYER_SGBRG14,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		/* Monochrome MIPI formats */
-@@ -405,7 +469,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_GREY,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		/* 10 bit */
-@@ -414,7 +479,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_Y10P,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		/* 12 bit */
-@@ -423,7 +489,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_Y12P,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		/* 14 bit */
-@@ -432,7 +499,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_Y14P,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		/* 16 bit */
-@@ -441,7 +509,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_Y16,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		/* 10 bit as 16bpp */
-@@ -450,7 +519,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_Y10,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		/* 12 bit as 16bpp */
-@@ -459,7 +529,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_Y12,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		/* 14 bit as 16bpp */
-@@ -468,7 +539,8 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_Y14,
- 		.size_multiplier_x2 = 2,
--		.colorspace	    = V4L2_COLORSPACE_RAW,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_META_FMT_BCM2835_ISP_STATS,
---- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-+++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-@@ -74,6 +74,7 @@ struct bcm2835_isp_q_data {
- 	unsigned int width;
- 	unsigned int height;
- 	unsigned int sizeimage;
-+	enum v4l2_colorspace colorspace;
- 	const struct bcm2835_isp_fmt *fmt;
- };
- 
-@@ -313,6 +314,43 @@ static void mmal_buffer_cb(struct vchiq_
- 		complete(&dev->frame_cmplt);
- }
- 
-+struct colorspace_translation {
-+	enum v4l2_colorspace v4l2_value;
-+	u32 mmal_value;
-+};
-+
-+static u32 translate_color_space(enum v4l2_colorspace color_space)
-+{
-+	static const struct colorspace_translation translations[] = {
-+		{ V4L2_COLORSPACE_DEFAULT, MMAL_COLOR_SPACE_UNKNOWN },
-+		{ V4L2_COLORSPACE_SMPTE170M, MMAL_COLOR_SPACE_ITUR_BT601 },
-+		{ V4L2_COLORSPACE_SMPTE240M, MMAL_COLOR_SPACE_SMPTE240M },
-+		{ V4L2_COLORSPACE_REC709, MMAL_COLOR_SPACE_ITUR_BT709 },
-+		/* V4L2_COLORSPACE_BT878 unavailable */
-+		{ V4L2_COLORSPACE_470_SYSTEM_M, MMAL_COLOR_SPACE_BT470_2_M },
-+		{ V4L2_COLORSPACE_470_SYSTEM_BG, MMAL_COLOR_SPACE_BT470_2_BG },
-+		{ V4L2_COLORSPACE_JPEG, MMAL_COLOR_SPACE_JPEG_JFIF },
-+		/*
-+		 * We don't have an encoding for SRGB as such, but VideoCore
-+		 * will do the right thing if it gets "unknown".
-+		 */
-+		{ V4L2_COLORSPACE_SRGB, MMAL_COLOR_SPACE_UNKNOWN },
-+		/* V4L2_COLORSPACE_OPRGB unavailable */
-+		/* V4L2_COLORSPACE_BT2020 unavailable */
-+		/* V4L2_COLORSPACE_RAW unavailable */
-+		/* V4L2_COLORSPACE_DCI_P3 unavailable */
-+	};
-+
-+	unsigned int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(translations); i++) {
-+		if (color_space == translations[i].v4l2_value)
-+			return translations[i].mmal_value;
-+	}
-+
-+	return MMAL_COLOR_SPACE_UNKNOWN;
-+}
-+
- static void setup_mmal_port_format(struct bcm2835_isp_node *node,
- 				   struct vchiq_mmal_port *port)
- {
-@@ -326,6 +364,7 @@ static void setup_mmal_port_format(struc
- 	port->es.video.crop.height = q_data->height;
- 	port->es.video.crop.x = 0;
- 	port->es.video.crop.y = 0;
-+	port->es.video.color_space = translate_color_space(q_data->colorspace);
- };
- 
- static int setup_mmal_port(struct bcm2835_isp_node *node)
-@@ -829,6 +868,9 @@ static int populate_qdata_fmt(struct v4l
- 		/* All parameters should have been set correctly by try_fmt */
- 		q_data->bytesperline = f->fmt.pix.bytesperline;
- 		q_data->sizeimage = f->fmt.pix.sizeimage;
-+
-+		/* We must indicate which of the allowed colour spaces we have. */
-+		q_data->colorspace = f->fmt.pix.colorspace;
- 	} else {
- 		v4l2_dbg(1, debug, &dev->v4l2_dev,
- 			 "%s: Setting meta format for fmt: %08x, size %u\n",
-@@ -840,6 +882,9 @@ static int populate_qdata_fmt(struct v4l
- 		q_data->height = 0;
- 		q_data->bytesperline = 0;
- 		q_data->sizeimage = f->fmt.meta.buffersize;
-+
-+		/* This won't mean anything for metadata, but may as well fill it in. */
-+		q_data->colorspace = V4L2_COLORSPACE_DEFAULT;
- 	}
- 
- 	v4l2_dbg(1, debug, &dev->v4l2_dev,
-@@ -903,7 +948,7 @@ static int bcm2835_isp_node_g_fmt(struct
- 		f->fmt.pix.pixelformat = q_data->fmt->fourcc;
- 		f->fmt.pix.bytesperline = q_data->bytesperline;
- 		f->fmt.pix.sizeimage = q_data->sizeimage;
--		f->fmt.pix.colorspace = q_data->fmt->colorspace;
-+		f->fmt.pix.colorspace = q_data->colorspace;
- 	}
- 
- 	return 0;
-@@ -970,13 +1015,29 @@ static int bcm2835_isp_node_try_fmt(stru
- 		fmt = get_default_format(node);
- 
- 	if (!node_is_stats(node)) {
-+		int is_rgb;
-+
- 		f->fmt.pix.width = max(min(f->fmt.pix.width, MAX_DIM),
- 				       MIN_DIM);
- 		f->fmt.pix.height = max(min(f->fmt.pix.height, MAX_DIM),
- 					MIN_DIM);
- 
- 		f->fmt.pix.pixelformat = fmt->fourcc;
--		f->fmt.pix.colorspace = fmt->colorspace;
-+
-+		/*
-+		 * Fill in the actual colour space when the requested one was
-+		 * not supported. This also catches the case when the "default"
-+		 * colour space was requested (as that's never in the mask).
-+		 */
-+		if (!(V4L2_COLORSPACE_MASK(f->fmt.pix.colorspace) & fmt->colorspace_mask))
-+			f->fmt.pix.colorspace = fmt->colorspace_default;
-+		/* In all cases, we only support the defaults for these: */
-+		f->fmt.pix.ycbcr_enc = V4L2_MAP_YCBCR_ENC_DEFAULT(f->fmt.pix.colorspace);
-+		f->fmt.pix.xfer_func = V4L2_MAP_XFER_FUNC_DEFAULT(f->fmt.pix.colorspace);
-+		is_rgb = f->fmt.pix.colorspace == V4L2_COLORSPACE_SRGB;
-+		f->fmt.pix.quantization = V4L2_MAP_QUANTIZATION_DEFAULT(is_rgb, f->fmt.pix.colorspace,
-+									f->fmt.pix.ycbcr_enc);
-+
- 		f->fmt.pix.bytesperline = get_bytesperline(f->fmt.pix.width,
- 							   fmt);
- 		f->fmt.pix.field = V4L2_FIELD_NONE;
-@@ -1301,6 +1362,7 @@ static int register_node(struct bcm2835_
- 					       node->q_data.width,
- 					       node->q_data.height,
- 					       node->q_data.fmt);
-+	node->q_data.colorspace = node->q_data.fmt->colorspace_default;
- 
- 	queue->io_modes = VB2_MMAP | VB2_DMABUF;
- 	queue->drv_priv = node;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0309-media-bcm2835-unicam-Fix-bug-in-buffer-swapping-logi.patch b/target/linux/bcm27xx/patches-6.1/950-0309-media-bcm2835-unicam-Fix-bug-in-buffer-swapping-logi.patch
deleted file mode 100644
index 5d365ab1d6..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0309-media-bcm2835-unicam-Fix-bug-in-buffer-swapping-logi.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From c0863c6da514311d3db381bcc1be6e0435d9b8c9 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Fri, 5 Mar 2021 15:40:45 +0000
-Subject: [PATCH] media: bcm2835-unicam: Fix bug in buffer swapping
- logic
-
-If multiple sets of interrupts occur simultaneously, it may be unsafe
-to swap buffers, as the hardware may already be re-using the current
-buffers. In such cases, avoid swapping buffers, and wait for the next
-opportunity at the Frame End interrupt to signal completion.
-
-Additionally, check the packet compare status when watching for frame
-end for buffers swaps, as this could also signify a frame end event.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- .../media/platform/bcm2835/bcm2835-unicam.c   | 21 ++++++++++++++++---
- 1 file changed, 18 insertions(+), 3 deletions(-)
-
---- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
-+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -800,6 +800,7 @@ static irqreturn_t unicam_isr(int irq, v
- 	unsigned int sequence = unicam->sequence;
- 	unsigned int i;
- 	u32 ista, sta;
-+	bool fe;
- 	u64 ts;
- 
- 	sta = reg_read(unicam, UNICAM_STA);
-@@ -817,12 +818,18 @@ static irqreturn_t unicam_isr(int irq, v
- 		return IRQ_HANDLED;
- 
- 	/*
-+	 * Look for either the Frame End interrupt or the Packet Capture status
-+	 * to signal a frame end.
-+	 */
-+	fe = (ista & UNICAM_FEI || sta & UNICAM_PI0);
-+
-+	/*
- 	 * We must run the frame end handler first. If we have a valid next_frm
- 	 * and we get a simultaneout FE + FS interrupt, running the FS handler
- 	 * first would null out the next_frm ptr and we would have lost the
- 	 * buffer forever.
- 	 */
--	if (ista & UNICAM_FEI || sta & UNICAM_PI0) {
-+	if (fe) {
- 		/*
- 		 * Ensure we have swapped buffers already as we can't
- 		 * stop the peripheral. If no buffer is available, use a
-@@ -833,7 +840,15 @@ static irqreturn_t unicam_isr(int irq, v
- 			if (!unicam->node[i].streaming)
- 				continue;
- 
--			if (unicam->node[i].cur_frm)
-+			/*
-+			 * If cur_frm == next_frm, it means we have not had
-+			 * a chance to swap buffers, likely due to having
-+			 * multiple interrupts occurring simultaneously (like FE
-+			 * + FS + LS). In this case, we cannot signal the buffer
-+			 * as complete, as the HW will reuse that buffer.
-+			 */
-+			if (unicam->node[i].cur_frm &&
-+			    unicam->node[i].cur_frm != unicam->node[i].next_frm)
- 				unicam_process_buffer_complete(&unicam->node[i],
- 							       sequence);
- 			unicam->node[i].cur_frm = unicam->node[i].next_frm;
-@@ -870,7 +885,7 @@ static irqreturn_t unicam_isr(int irq, v
- 	 * where the HW does not actually swap it if the new frame has
- 	 * already started.
- 	 */
--	if (ista & (UNICAM_FSI | UNICAM_LCI) && !(ista & UNICAM_FEI)) {
-+	if (ista & (UNICAM_FSI | UNICAM_LCI) && !fe) {
- 		for (i = 0; i < ARRAY_SIZE(unicam->node); i++) {
- 			if (!unicam->node[i].streaming)
- 				continue;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0310-Assign-crypto-aliases-to-different-AES-implementatio.patch b/target/linux/bcm27xx/patches-6.1/950-0310-Assign-crypto-aliases-to-different-AES-implementatio.patch
deleted file mode 100644
index dc4b64816a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0310-Assign-crypto-aliases-to-different-AES-implementatio.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 457ff5f820cbee7e7d687bd7cd078dcbba4d4c4e Mon Sep 17 00:00:00 2001
-From: Ben Avison <bavison@riscosopen.org>
-Date: Mon, 8 Mar 2021 15:32:25 +0000
-Subject: [PATCH] Assign crypto aliases to different AES implementation
- modules
-
-The kernel modules aes-neon-blk and aes-neon-bs perform poorly, at least on
-Cortex-A72 without crypto extensions. In fact, aes-arm64 outperforms them
-on benchmarks, despite it being a simpler implementation (only accelerating
-the single-block AES cipher).
-
-For modes of operation where multiple cipher blocks can be processed in
-parallel, aes-neon-bs outperforms aes-neon-blk by around 60-70% and aes-arm64
-is another 10-20% faster still. But the difference is even more marked with
-modes of operation with dependencies between neighbouring blocks, such as
-CBC encryption, which defeat parallelism: in these cases, aes-arm64 is
-typically around 250% faster than either aes-neon-blk or aes-neon-bs.
-
-The key trade-off with aes-arm64 is that the look-up tables are situated in
-RAM. This leaves them potentially open to cache timing attacks. The two other
-modules, by contrast, load the look-up tables into NEON registers and so are
-able to perform in constant time.
-
-This patch aims to load aes-arm64 more often.
-
-If none of the currently-loaded crypto modules implement a given algorithm,
-a new one is typically selected for loading using a platform-neutral alias
-describing the required algorithm. To enable users to still
-load aes-neon-blk or aes-neon-bs if they really want them, while still
-ensuring that aes-arm64 is usually selected, remove the aliases from
-aes-neonbs-glue.c and aes-glue.c and apply them to aes-cipher-glue.c, but
-still build the two NEON modules.
-
-Since aes-glue.c can also be used to build aes-ce-blk, leave them enabled
-if USE_V8_CRYPTO_EXTENSIONS is defined, to ensure they are selected if we
-in future use a CPU which has the crypto extensions enabled.
-
-Note that the algorithm priority specifiers are unchanged, so if
-aes-neon-bs is loaded at the same time as aes-arm64, the former will be
-used in preference. However, aes-neon-blk and aes-arm64 have tied priority,
-so whichever module was loaded first will be used (assuming aes-neon-bs is
-not loaded).
-
-Signed-off-by: Ben Avison <bavison@riscosopen.org>
----
- arch/arm64/crypto/aes-cipher-glue.c | 11 +++++++++++
- arch/arm64/crypto/aes-glue.c        |  4 ++--
- arch/arm64/crypto/aes-neonbs-glue.c |  5 -----
- 3 files changed, 13 insertions(+), 7 deletions(-)
-
---- a/arch/arm64/crypto/aes-cipher-glue.c
-+++ b/arch/arm64/crypto/aes-cipher-glue.c
-@@ -9,6 +9,17 @@
- #include <linux/crypto.h>
- #include <linux/module.h>
- 
-+MODULE_ALIAS_CRYPTO("ecb(aes)");
-+MODULE_ALIAS_CRYPTO("cbc(aes)");
-+MODULE_ALIAS_CRYPTO("ctr(aes)");
-+MODULE_ALIAS_CRYPTO("xts(aes)");
-+MODULE_ALIAS_CRYPTO("xctr(aes)");
-+MODULE_ALIAS_CRYPTO("cts(cbc(aes))");
-+MODULE_ALIAS_CRYPTO("essiv(cbc(aes),sha256)");
-+MODULE_ALIAS_CRYPTO("cmac(aes)");
-+MODULE_ALIAS_CRYPTO("xcbc(aes)");
-+MODULE_ALIAS_CRYPTO("cbcmac(aes)");
-+
- asmlinkage void __aes_arm64_encrypt(u32 *rk, u8 *out, const u8 *in, int rounds);
- asmlinkage void __aes_arm64_decrypt(u32 *rk, u8 *out, const u8 *in, int rounds);
- 
---- a/arch/arm64/crypto/aes-glue.c
-+++ b/arch/arm64/crypto/aes-glue.c
-@@ -57,18 +57,18 @@ MODULE_DESCRIPTION("AES-ECB/CBC/CTR/XTS/
- #define aes_mac_update		neon_aes_mac_update
- MODULE_DESCRIPTION("AES-ECB/CBC/CTR/XTS/XCTR using ARMv8 NEON");
- #endif
--#if defined(USE_V8_CRYPTO_EXTENSIONS) || !IS_ENABLED(CONFIG_CRYPTO_AES_ARM64_BS)
-+#if defined(USE_V8_CRYPTO_EXTENSIONS)
- MODULE_ALIAS_CRYPTO("ecb(aes)");
- MODULE_ALIAS_CRYPTO("cbc(aes)");
- MODULE_ALIAS_CRYPTO("ctr(aes)");
- MODULE_ALIAS_CRYPTO("xts(aes)");
- MODULE_ALIAS_CRYPTO("xctr(aes)");
--#endif
- MODULE_ALIAS_CRYPTO("cts(cbc(aes))");
- MODULE_ALIAS_CRYPTO("essiv(cbc(aes),sha256)");
- MODULE_ALIAS_CRYPTO("cmac(aes)");
- MODULE_ALIAS_CRYPTO("xcbc(aes)");
- MODULE_ALIAS_CRYPTO("cbcmac(aes)");
-+#endif
- 
- MODULE_AUTHOR("Ard Biesheuvel <ard.biesheuvel@linaro.org>");
- MODULE_LICENSE("GPL v2");
---- a/arch/arm64/crypto/aes-neonbs-glue.c
-+++ b/arch/arm64/crypto/aes-neonbs-glue.c
-@@ -18,11 +18,6 @@
- MODULE_AUTHOR("Ard Biesheuvel <ard.biesheuvel@linaro.org>");
- MODULE_LICENSE("GPL v2");
- 
--MODULE_ALIAS_CRYPTO("ecb(aes)");
--MODULE_ALIAS_CRYPTO("cbc(aes)");
--MODULE_ALIAS_CRYPTO("ctr(aes)");
--MODULE_ALIAS_CRYPTO("xts(aes)");
--
- asmlinkage void aesbs_convert_key(u8 out[], u32 const rk[], int rounds);
- 
- asmlinkage void aesbs_ecb_encrypt(u8 out[], u8 const in[], u8 const rk[],
diff --git a/target/linux/bcm27xx/patches-6.1/950-0311-media-v4l2_m2m-In-buffered-mode-run-jobs-if-either-p.patch b/target/linux/bcm27xx/patches-6.1/950-0311-media-v4l2_m2m-In-buffered-mode-run-jobs-if-either-p.patch
deleted file mode 100644
index 6dad15807f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0311-media-v4l2_m2m-In-buffered-mode-run-jobs-if-either-p.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f8ea9105eebec3af0fddcda3118bdd83e3130166 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Mon, 1 Feb 2021 18:48:47 +0000
-Subject: [PATCH] media/v4l2_m2m: In buffered mode run jobs if either
- port is streaming
-
-In order to get the intended behaviour of the stateful video
-decoder API where only the OUTPUT queue needs to be enabled and fed
-buffers in order to get the SOURCE_CHANGED event that configures the
-CAPTURE queue, we want the device to run should either queue be
-streaming.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/v4l2-core/v4l2-mem2mem.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
---- a/drivers/media/v4l2-core/v4l2-mem2mem.c
-+++ b/drivers/media/v4l2-core/v4l2-mem2mem.c
-@@ -301,9 +301,10 @@ static void __v4l2_m2m_try_queue(struct
- 
- 	dprintk("Trying to schedule a job for m2m_ctx: %p\n", m2m_ctx);
- 
--	if (!m2m_ctx->out_q_ctx.q.streaming
--	    || !m2m_ctx->cap_q_ctx.q.streaming) {
--		dprintk("Streaming needs to be on for both queues\n");
-+	if (!(m2m_ctx->out_q_ctx.q.streaming &&
-+	      m2m_ctx->cap_q_ctx.q.streaming) &&
-+	    !(m2m_ctx->out_q_ctx.buffered && m2m_ctx->out_q_ctx.q.streaming)) {
-+		dprintk("Streaming needs to be on for both queues, or buffered and OUTPUT streaming\n");
- 		return;
- 	}
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0312-media-i2c-add-ov9281-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0312-media-i2c-add-ov9281-driver.patch
deleted file mode 100644
index 58c5997e83..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0312-media-i2c-add-ov9281-driver.patch
+++ /dev/null
@@ -1,1729 +0,0 @@
-From d26583e9c31d10919c8d4b965b938724fde1ba3c Mon Sep 17 00:00:00 2001
-From: Zefa Chen <zefa.chen@rock-chips.com>
-Date: Fri, 17 May 2019 18:23:03 +0800
-Subject: [PATCH] media: i2c: add ov9281 driver.
-
-Change-Id: I7b77250bbc56d2f861450cf77271ad15f9b88ab1
-Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
-
-media: i2c: ov9281: fix mclk issue when probe multiple camera.
-
-Takes the ov9281 part only from the Rockchip's patch.
-
-Change-Id: I30e833baf2c1bb07d6d87ddb3b00759ab45a90e4
-Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
-
-media: i2c: ov9281: add enum_frame_interval function for iq tool 2.2 and hal3
-
-Adds the ov9281 parts of the Rockchip patch adding enum_frame_interval to
-a large number of drivers.
-
-Change-Id: I03344cd6cf278dd7c18fce8e97479089ef185a5c
-Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
-
-media: i2c: ov9281: Fixup for recent kernel releases, and remove custom code
-
-The Rockchip driver was based on a 4.4 kernel, and had several custom
-Rockchip parts.
-
-Update to 5.4 kernel APIs, with the relevant controls required by
-libcamera, and remove custom Rockchip parts.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: ov9281: Read chip ID via 2 reads
-
-Vision Components have made an OV9281 module which blocks reading
-back the majority of registers to comply with NDAs, and in doing
-so doesn't allow auto-increment register reading as used when
-reading the chip ID.
-
-Use two reads and manually combine the results.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: ov9281: Add support for 8 bit readout
-
-The sensor supports 8 bit mode as well as 10bit, so add the
-relevant code to allow selection of this.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: ov9281: Add 1280x720 and 640x480 modes
-
-Breaks out common register set and adds the different registers
-for 1280x720 (cropped) and 640x480 (skipped) modes
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-Fixed picture line bug in all ov9281 modes
-
-Signed-off-by: Mathias Anhalt <mathiasanhalt@web.de>
-
-Added hflip and vflip controls to ov9281
-
-Signed-off-by: Mathias Anhalt <mathiasanhalt@web.de>
-
-media: i2c: ov9281: Remove override of subdev name
-
-From the original Rockchip driver, the subdev was renamed
-from the default to being "mov9281 <dev_name>" whereas the
-default would have been "ov9281 <dev_name>".
-
-Remove the override to drop back to the default rather than
-a vendor custom string.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: v4l2-subdev: add subdev-wide state struct
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
-
-media: i2c: ov9281: Add fwnode properties controls
-
-Add call to v4l2_ctrl_new_fwnode_properties to read and
-create the fwnode based controls.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: i2c: ov9281: Sensor should report RAW color space
-
-Tested on Raspberry Pi running libcamera.
-
-Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
----
- drivers/media/i2c/Kconfig                     |   11 +
- drivers/media/i2c/Makefile                    |    1 +
- drivers/media/i2c/imx290.c                    |    9 +-
- drivers/media/i2c/imx477.c                    |   30 +-
- drivers/media/i2c/irs1125.c                   |   12 +-
- drivers/media/i2c/ov9281.c                    | 1290 +++++++++++++++++
- .../media/platform/bcm2835/bcm2835-unicam.c   |   20 +-
- .../bcm2835-isp/bcm2835-v4l2-isp.c            |    4 +-
- 8 files changed, 1341 insertions(+), 36 deletions(-)
- create mode 100644 drivers/media/i2c/ov9281.c
-
---- a/drivers/media/i2c/Kconfig
-+++ b/drivers/media/i2c/Kconfig
-@@ -1343,6 +1343,17 @@ config VIDEO_TW2804
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called tw2804.
- 
-+config VIDEO_OV9281
-+	tristate "OmniVision OV9281 sensor support"
-+	depends on I2C && VIDEO_DEV
-+	depends on MEDIA_CAMERA_SUPPORT
-+	help
-+	  This is a Video4Linux2 sensor-level driver for the OmniVision
-+	  OV9281 camera.
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called ov9281.
-+
- config VIDEO_TW9903
- 	tristate "Techwell TW9903 video decoder"
- 	depends on VIDEO_DEV && I2C
---- a/drivers/media/i2c/Makefile
-+++ b/drivers/media/i2c/Makefile
-@@ -98,6 +98,7 @@ obj-$(CONFIG_VIDEO_OV772X) += ov772x.o
- obj-$(CONFIG_VIDEO_OV7740) += ov7740.o
- obj-$(CONFIG_VIDEO_OV8856) += ov8856.o
- obj-$(CONFIG_VIDEO_OV8865) += ov8865.o
-+obj-$(CONFIG_VIDEO_OV9281) += ov9281.o
- obj-$(CONFIG_VIDEO_OV9282) += ov9282.o
- obj-$(CONFIG_VIDEO_OV9640) += ov9640.o
- obj-$(CONFIG_VIDEO_OV9650) += ov9650.o
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -982,12 +982,13 @@ static int imx290_write_current_format(s
- }
- 
- static const struct v4l2_rect *
--__imx290_get_pad_crop(struct imx290 *imx290, struct v4l2_subdev_pad_config *cfg,
-+__imx290_get_pad_crop(struct imx290 *imx290,
-+		      struct v4l2_subdev_state *sd_state,
- 		      unsigned int pad, enum v4l2_subdev_format_whence which)
- {
- 	switch (which) {
- 	case V4L2_SUBDEV_FORMAT_TRY:
--		return v4l2_subdev_get_try_crop(&imx290->sd, cfg, pad);
-+		return v4l2_subdev_get_try_crop(&imx290->sd, sd_state, pad);
- 	case V4L2_SUBDEV_FORMAT_ACTIVE:
- 		return &imx290->current_mode->crop;
- 	}
-@@ -996,7 +997,7 @@ __imx290_get_pad_crop(struct imx290 *imx
- }
- 
- static int imx290_get_selection(struct v4l2_subdev *sd,
--				struct v4l2_subdev_pad_config *cfg,
-+				struct v4l2_subdev_state *sd_state,
- 				struct v4l2_subdev_selection *sel)
- {
- 	switch (sel->target) {
-@@ -1004,7 +1005,7 @@ static int imx290_get_selection(struct v
- 		struct imx290 *imx290 = to_imx290(sd);
- 
- 		mutex_lock(&imx290->lock);
--		sel->r = *__imx290_get_pad_crop(imx290, cfg, sel->pad,
-+		sel->r = *__imx290_get_pad_crop(imx290, sd_state, sel->pad,
- 						sel->which);
- 		mutex_unlock(&imx290->lock);
- 
---- a/drivers/media/i2c/imx477.c
-+++ b/drivers/media/i2c/imx477.c
-@@ -1272,9 +1272,9 @@ static int imx477_open(struct v4l2_subde
- {
- 	struct imx477 *imx477 = to_imx477(sd);
- 	struct v4l2_mbus_framefmt *try_fmt_img =
--		v4l2_subdev_get_try_format(sd, fh->pad, IMAGE_PAD);
-+		v4l2_subdev_get_try_format(sd, fh->state, IMAGE_PAD);
- 	struct v4l2_mbus_framefmt *try_fmt_meta =
--		v4l2_subdev_get_try_format(sd, fh->pad, METADATA_PAD);
-+		v4l2_subdev_get_try_format(sd, fh->state, METADATA_PAD);
- 	struct v4l2_rect *try_crop;
- 
- 	mutex_lock(&imx477->mutex);
-@@ -1293,7 +1293,7 @@ static int imx477_open(struct v4l2_subde
- 	try_fmt_meta->field = V4L2_FIELD_NONE;
- 
- 	/* Initialize try_crop */
--	try_crop = v4l2_subdev_get_try_crop(sd, fh->pad, IMAGE_PAD);
-+	try_crop = v4l2_subdev_get_try_crop(sd, fh->state, IMAGE_PAD);
- 	try_crop->left = IMX477_PIXEL_ARRAY_LEFT;
- 	try_crop->top = IMX477_PIXEL_ARRAY_TOP;
- 	try_crop->width = IMX477_PIXEL_ARRAY_WIDTH;
-@@ -1425,7 +1425,7 @@ static const struct v4l2_ctrl_ops imx477
- };
- 
- static int imx477_enum_mbus_code(struct v4l2_subdev *sd,
--				 struct v4l2_subdev_pad_config *cfg,
-+				 struct v4l2_subdev_state *sd_state,
- 				 struct v4l2_subdev_mbus_code_enum *code)
- {
- 	struct imx477 *imx477 = to_imx477(sd);
-@@ -1450,7 +1450,7 @@ static int imx477_enum_mbus_code(struct
- }
- 
- static int imx477_enum_frame_size(struct v4l2_subdev *sd,
--				  struct v4l2_subdev_pad_config *cfg,
-+				  struct v4l2_subdev_state *sd_state,
- 				  struct v4l2_subdev_frame_size_enum *fse)
- {
- 	struct imx477 *imx477 = to_imx477(sd);
-@@ -1516,7 +1516,7 @@ static void imx477_update_metadata_pad_f
- }
- 
- static int imx477_get_pad_format(struct v4l2_subdev *sd,
--				 struct v4l2_subdev_pad_config *cfg,
-+				 struct v4l2_subdev_state *sd_state,
- 				 struct v4l2_subdev_format *fmt)
- {
- 	struct imx477 *imx477 = to_imx477(sd);
-@@ -1528,7 +1528,8 @@ static int imx477_get_pad_format(struct
- 
- 	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
- 		struct v4l2_mbus_framefmt *try_fmt =
--			v4l2_subdev_get_try_format(&imx477->sd, cfg, fmt->pad);
-+			v4l2_subdev_get_try_format(&imx477->sd, sd_state,
-+						   fmt->pad);
- 		/* update the code which could change due to vflip or hflip: */
- 		try_fmt->code = fmt->pad == IMAGE_PAD ?
- 				imx477_get_format_code(imx477, try_fmt->code) :
-@@ -1593,7 +1594,7 @@ static void imx477_set_framing_limits(st
- }
- 
- static int imx477_set_pad_format(struct v4l2_subdev *sd,
--				 struct v4l2_subdev_pad_config *cfg,
-+				 struct v4l2_subdev_state *sd_state,
- 				 struct v4l2_subdev_format *fmt)
- {
- 	struct v4l2_mbus_framefmt *framefmt;
-@@ -1622,7 +1623,7 @@ static int imx477_set_pad_format(struct
- 					      fmt->format.height);
- 		imx477_update_image_pad_format(imx477, mode, fmt);
- 		if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
--			framefmt = v4l2_subdev_get_try_format(sd, cfg,
-+			framefmt = v4l2_subdev_get_try_format(sd, sd_state,
- 							      fmt->pad);
- 			*framefmt = fmt->format;
- 		} else if (imx477->mode != mode) {
-@@ -1632,7 +1633,7 @@ static int imx477_set_pad_format(struct
- 		}
- 	} else {
- 		if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
--			framefmt = v4l2_subdev_get_try_format(sd, cfg,
-+			framefmt = v4l2_subdev_get_try_format(sd, sd_state,
- 							      fmt->pad);
- 			*framefmt = fmt->format;
- 		} else {
-@@ -1647,12 +1648,13 @@ static int imx477_set_pad_format(struct
- }
- 
- static const struct v4l2_rect *
--__imx477_get_pad_crop(struct imx477 *imx477, struct v4l2_subdev_pad_config *cfg,
-+__imx477_get_pad_crop(struct imx477 *imx477,
-+		      struct v4l2_subdev_state *sd_state,
- 		      unsigned int pad, enum v4l2_subdev_format_whence which)
- {
- 	switch (which) {
- 	case V4L2_SUBDEV_FORMAT_TRY:
--		return v4l2_subdev_get_try_crop(&imx477->sd, cfg, pad);
-+		return v4l2_subdev_get_try_crop(&imx477->sd, sd_state, pad);
- 	case V4L2_SUBDEV_FORMAT_ACTIVE:
- 		return &imx477->mode->crop;
- 	}
-@@ -1661,7 +1663,7 @@ __imx477_get_pad_crop(struct imx477 *imx
- }
- 
- static int imx477_get_selection(struct v4l2_subdev *sd,
--				struct v4l2_subdev_pad_config *cfg,
-+				struct v4l2_subdev_state *sd_state,
- 				struct v4l2_subdev_selection *sel)
- {
- 	switch (sel->target) {
-@@ -1669,7 +1671,7 @@ static int imx477_get_selection(struct v
- 		struct imx477 *imx477 = to_imx477(sd);
- 
- 		mutex_lock(&imx477->mutex);
--		sel->r = *__imx477_get_pad_crop(imx477, cfg, sel->pad,
-+		sel->r = *__imx477_get_pad_crop(imx477, sd_state, sel->pad,
- 						sel->which);
- 		mutex_unlock(&imx477->mutex);
- 
---- a/drivers/media/i2c/irs1125.c
-+++ b/drivers/media/i2c/irs1125.c
-@@ -562,8 +562,8 @@ static const struct v4l2_subdev_video_op
- };
- 
- static int irs1125_enum_mbus_code(struct v4l2_subdev *sd,
--				  struct v4l2_subdev_pad_config *cfg,
--	struct v4l2_subdev_mbus_code_enum *code)
-+				  struct v4l2_subdev_state *sd_state,
-+				  struct v4l2_subdev_mbus_code_enum *code)
- {
- 	if (code->index > 0)
- 		return -EINVAL;
-@@ -574,7 +574,7 @@ static int irs1125_enum_mbus_code(struct
- }
- 
- static int irs1125_set_get_fmt(struct v4l2_subdev *sd,
--			       struct v4l2_subdev_pad_config *cfg,
-+			       struct v4l2_subdev_state *sd_state,
- 			       struct v4l2_subdev_format *format)
- {
- 	struct v4l2_mbus_framefmt *fmt = &format->format;
-@@ -930,7 +930,7 @@ static int irs1125_detect(struct v4l2_su
- static int irs1125_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
- {
- 	struct v4l2_mbus_framefmt *format =
--	v4l2_subdev_get_try_format(sd, fh->pad, 0);
-+	v4l2_subdev_get_try_format(sd, fh->state, 0);
- 
- 	format->code = MEDIA_BUS_FMT_Y12_1X12;
- 	format->width = IRS1125_WINDOW_WIDTH_DEF;
-@@ -1161,7 +1161,7 @@ mutex_remove:
- 	return ret;
- }
- 
--static int irs1125_remove(struct i2c_client *client)
-+static void irs1125_remove(struct i2c_client *client)
- {
- 	struct v4l2_subdev *sd = i2c_get_clientdata(client);
- 	struct irs1125 *irs1125 = to_state(sd);
-@@ -1171,8 +1171,6 @@ static int irs1125_remove(struct i2c_cli
- 	v4l2_device_unregister_subdev(sd);
- 	mutex_destroy(&irs1125->lock);
- 	v4l2_ctrl_handler_free(&irs1125->ctrl_handler);
--
--	return 0;
- }
- 
- #if IS_ENABLED(CONFIG_OF)
---- /dev/null
-+++ b/drivers/media/i2c/ov9281.c
-@@ -0,0 +1,1290 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Omnivision OV9281 1280x800 global shutter image sensor driver
-+ *
-+ * This driver has been taken from
-+ * https://github.com/rockchip-linux/kernel/blob/develop-4.4/drivers/media/i2c/ov9281.c
-+ * cleaned up, made to compile against mainline kernels instead of the Rockchip
-+ * vendor kernel, and the relevant controls added to work with libcamera.
-+ *
-+ * Copyright (C) 2017 Fuzhou Rockchip Electronics Co., Ltd.
-+ * V0.0X01.0X02 fix mclk issue when probe multiple camera.
-+ * V0.0X01.0X03 add enum_frame_interval function.
-+ */
-+
-+#include <linux/clk.h>
-+#include <linux/device.h>
-+#include <linux/delay.h>
-+#include <linux/gpio/consumer.h>
-+#include <linux/i2c.h>
-+#include <linux/module.h>
-+#include <linux/pm_runtime.h>
-+#include <linux/regulator/consumer.h>
-+#include <linux/sysfs.h>
-+#include <linux/slab.h>
-+#include <media/media-entity.h>
-+#include <media/v4l2-async.h>
-+#include <media/v4l2-ctrls.h>
-+#include <media/v4l2-fwnode.h>
-+#include <media/v4l2-subdev.h>
-+
-+#define OV9281_LINK_FREQ_400MHZ		400000000
-+#define OV9281_LANES			2
-+
-+/* pixel rate = link frequency * 2 * lanes / BITS_PER_SAMPLE */
-+#define OV9281_PIXEL_RATE_10BIT		(OV9281_LINK_FREQ_400MHZ * 2 * \
-+					 OV9281_LANES / 10)
-+#define OV9281_PIXEL_RATE_8BIT		(OV9281_LINK_FREQ_400MHZ * 2 * \
-+					 OV9281_LANES / 8)
-+#define OV9281_XVCLK_FREQ		24000000
-+
-+#define CHIP_ID				0x9281
-+#define OV9281_REG_CHIP_ID		0x300a
-+
-+#define OV9281_REG_TIMING_FORMAT_1		0x3820
-+#define OV9281_REG_TIMING_FORMAT_2		0x3821
-+#define OV9281_FLIP_BIT				BIT(2)
-+
-+#define OV9281_REG_CTRL_MODE		0x0100
-+#define OV9281_MODE_SW_STANDBY		0x0
-+#define OV9281_MODE_STREAMING		BIT(0)
-+
-+#define OV9281_REG_EXPOSURE		0x3500
-+#define	OV9281_EXPOSURE_MIN		4
-+#define	OV9281_EXPOSURE_STEP		1
-+#define OV9281_VTS_MAX			0x7fff
-+
-+#define OV9281_REG_GAIN_H		0x3508
-+#define OV9281_REG_GAIN_L		0x3509
-+#define OV9281_GAIN_H_MASK		0x07
-+#define OV9281_GAIN_H_SHIFT		8
-+#define OV9281_GAIN_L_MASK		0xff
-+#define OV9281_GAIN_MIN			0x10
-+#define OV9281_GAIN_MAX			0xf8
-+#define OV9281_GAIN_STEP		1
-+#define OV9281_GAIN_DEFAULT		0x10
-+
-+#define OV9281_REG_TEST_PATTERN		0x5e00
-+#define OV9281_TEST_PATTERN_ENABLE	0x80
-+#define OV9281_TEST_PATTERN_DISABLE	0x0
-+
-+#define OV9281_REG_VTS			0x380e
-+
-+/*
-+ * OV9281 native and active pixel array size.
-+ * Datasheet not available to confirm these values, so assume there are no
-+ * border pixels.
-+ */
-+#define OV9281_NATIVE_WIDTH		1280U
-+#define OV9281_NATIVE_HEIGHT		800U
-+#define OV9281_PIXEL_ARRAY_LEFT		0U
-+#define OV9281_PIXEL_ARRAY_TOP		0U
-+#define OV9281_PIXEL_ARRAY_WIDTH	1280U
-+#define OV9281_PIXEL_ARRAY_HEIGHT	800U
-+
-+#define REG_NULL			0xFFFF
-+
-+#define OV9281_REG_VALUE_08BIT		1
-+#define OV9281_REG_VALUE_16BIT		2
-+#define OV9281_REG_VALUE_24BIT		3
-+
-+#define OV9281_NAME			"ov9281"
-+
-+static const char * const ov9281_supply_names[] = {
-+	"avdd",		/* Analog power */
-+	"dovdd",	/* Digital I/O power */
-+	"dvdd",		/* Digital core power */
-+};
-+
-+#define OV9281_NUM_SUPPLIES ARRAY_SIZE(ov9281_supply_names)
-+
-+struct regval {
-+	u16 addr;
-+	u8 val;
-+};
-+
-+struct ov9281_mode {
-+	u32 width;
-+	u32 height;
-+	u32 hts_def;
-+	u32 vts_def;
-+	u32 exp_def;
-+	struct v4l2_rect crop;
-+	const struct regval *reg_list;
-+};
-+
-+struct ov9281 {
-+	struct i2c_client	*client;
-+	struct clk		*xvclk;
-+	struct gpio_desc	*reset_gpio;
-+	struct gpio_desc	*pwdn_gpio;
-+	struct regulator_bulk_data supplies[OV9281_NUM_SUPPLIES];
-+
-+	struct v4l2_subdev	subdev;
-+	struct media_pad	pad;
-+	struct v4l2_ctrl_handler ctrl_handler;
-+	struct v4l2_ctrl	*exposure;
-+	struct v4l2_ctrl	*anal_gain;
-+	struct v4l2_ctrl	*digi_gain;
-+	struct v4l2_ctrl	*hblank;
-+	struct v4l2_ctrl	*vblank;
-+	struct v4l2_ctrl	*hflip;
-+	struct v4l2_ctrl	*vflip;
-+	struct v4l2_ctrl	*pixel_rate;
-+	struct v4l2_ctrl	*test_pattern;
-+	struct mutex		mutex;
-+	bool			streaming;
-+	bool			power_on;
-+	const struct ov9281_mode *cur_mode;
-+	u32			code;
-+};
-+
-+#define to_ov9281(sd) container_of(sd, struct ov9281, subdev)
-+
-+/*
-+ * Xclk 24Mhz
-+ * max_framerate 120fps for 10 bit, 144fps for 8 bit.
-+ * mipi_datarate per lane 800Mbps
-+ */
-+static const struct regval ov9281_common_regs[] = {
-+	{0x0103, 0x01},
-+	{0x0302, 0x32},
-+	{0x030e, 0x02},
-+	{0x3001, 0x00},
-+	{0x3004, 0x00},
-+	{0x3005, 0x00},
-+	{0x3006, 0x04},
-+	{0x3011, 0x0a},
-+	{0x3013, 0x18},
-+	{0x3022, 0x01},
-+	{0x3023, 0x00},
-+	{0x302c, 0x00},
-+	{0x302f, 0x00},
-+	{0x3030, 0x04},
-+	{0x3039, 0x32},
-+	{0x303a, 0x00},
-+	{0x303f, 0x01},
-+	{0x3500, 0x00},
-+	{0x3501, 0x2a},
-+	{0x3502, 0x90},
-+	{0x3503, 0x08},
-+	{0x3505, 0x8c},
-+	{0x3507, 0x03},
-+	{0x3508, 0x00},
-+	{0x3509, 0x10},
-+	{0x3610, 0x80},
-+	{0x3611, 0xa0},
-+	{0x3620, 0x6f},
-+	{0x3632, 0x56},
-+	{0x3633, 0x78},
-+	{0x3666, 0x00},
-+	{0x366f, 0x5a},
-+	{0x3680, 0x84},
-+	{0x3712, 0x80},
-+	{0x372d, 0x22},
-+	{0x3731, 0x80},
-+	{0x3732, 0x30},
-+	{0x377d, 0x22},
-+	{0x3788, 0x02},
-+	{0x3789, 0xa4},
-+	{0x378a, 0x00},
-+	{0x378b, 0x4a},
-+	{0x3799, 0x20},
-+	{0x3881, 0x42},
-+	{0x38b1, 0x00},
-+	{0x3920, 0xff},
-+	{0x4010, 0x40},
-+	{0x4043, 0x40},
-+	{0x4307, 0x30},
-+	{0x4317, 0x00},
-+	{0x4501, 0x00},
-+	{0x450a, 0x08},
-+	{0x4601, 0x04},
-+	{0x470f, 0x00},
-+	{0x4f07, 0x00},
-+	{0x4800, 0x00},
-+	{0x5000, 0x9f},
-+	{0x5001, 0x00},
-+	{0x5e00, 0x00},
-+	{0x5d00, 0x07},
-+	{0x5d01, 0x00},
-+	{REG_NULL, 0x00},
-+};
-+
-+static const struct regval ov9281_1280x800_regs[] = {
-+	{0x3778, 0x00},
-+	{0x3800, 0x00},
-+	{0x3801, 0x00},
-+	{0x3802, 0x00},
-+	{0x3803, 0x00},
-+	{0x3804, 0x05},
-+	{0x3805, 0x0f},
-+	{0x3806, 0x03},
-+	{0x3807, 0x2f},
-+	{0x3808, 0x05},
-+	{0x3809, 0x00},
-+	{0x380a, 0x03},
-+	{0x380b, 0x20},
-+	{0x380c, 0x02},
-+	{0x380d, 0xd8},
-+	{0x380e, 0x03},
-+	{0x380f, 0x8e},
-+	{0x3810, 0x00},
-+	{0x3811, 0x08},
-+	{0x3812, 0x00},
-+	{0x3813, 0x08},
-+	{0x3814, 0x11},
-+	{0x3815, 0x11},
-+	{0x3820, 0x40},
-+	{0x3821, 0x00},
-+	{0x4003, 0x40},
-+	{0x4008, 0x04},
-+	{0x4009, 0x0b},
-+	{0x400c, 0x00},
-+	{0x400d, 0x07},
-+	{0x4507, 0x00},
-+	{0x4509, 0x00},
-+	{REG_NULL, 0x00},
-+};
-+
-+static const struct regval ov9281_1280x720_regs[] = {
-+	{0x3778, 0x00},
-+	{0x3800, 0x00},
-+	{0x3801, 0x00},
-+	{0x3802, 0x00},
-+	{0x3803, 0x28},
-+	{0x3804, 0x05},
-+	{0x3805, 0x0f},
-+	{0x3806, 0x03},
-+	{0x3807, 0x07},
-+	{0x3808, 0x05},
-+	{0x3809, 0x00},
-+	{0x380a, 0x02},
-+	{0x380b, 0xd0},
-+	{0x380c, 0x02},
-+	{0x380d, 0xd8},
-+	{0x380e, 0x03},
-+	{0x380f, 0x8e},
-+	{0x3810, 0x00},
-+	{0x3811, 0x08},
-+	{0x3812, 0x00},
-+	{0x3813, 0x08},
-+	{0x3814, 0x11},
-+	{0x3815, 0x11},
-+	{0x3820, 0x40},
-+	{0x3821, 0x00},
-+	{0x4003, 0x40},
-+	{0x4008, 0x04},
-+	{0x4009, 0x0b},
-+	{0x400c, 0x00},
-+	{0x400d, 0x07},
-+	{0x4507, 0x00},
-+	{0x4509, 0x00},
-+	{REG_NULL, 0x00},
-+};
-+
-+static const struct regval ov9281_640x400_regs[] = {
-+	{0x3778, 0x10},
-+	{0x3800, 0x00},
-+	{0x3801, 0x00},
-+	{0x3802, 0x00},
-+	{0x3803, 0x00},
-+	{0x3804, 0x05},
-+	{0x3805, 0x0f},
-+	{0x3806, 0x03},
-+	{0x3807, 0x2f},
-+	{0x3808, 0x02},
-+	{0x3809, 0x80},
-+	{0x380a, 0x01},
-+	{0x380b, 0x90},
-+	{0x380c, 0x02},
-+	{0x380d, 0xd8},
-+	{0x380e, 0x02},
-+	{0x380f, 0x08},
-+	{0x3810, 0x00},
-+	{0x3811, 0x04},
-+	{0x3812, 0x00},
-+	{0x3813, 0x04},
-+	{0x3814, 0x31},
-+	{0x3815, 0x22},
-+	{0x3820, 0x60},
-+	{0x3821, 0x01},
-+	{0x4008, 0x02},
-+	{0x4009, 0x05},
-+	{0x400c, 0x00},
-+	{0x400d, 0x03},
-+	{0x4507, 0x03},
-+	{0x4509, 0x80},
-+	{REG_NULL, 0x00},
-+};
-+
-+static const struct regval op_10bit[] = {
-+	{0x030d, 0x50},
-+	{0x3662, 0x05},
-+	{REG_NULL, 0x00},
-+};
-+
-+static const struct regval op_8bit[] = {
-+	{0x030d, 0x60},
-+	{0x3662, 0x07},
-+	{REG_NULL, 0x00},
-+};
-+
-+static const struct ov9281_mode supported_modes[] = {
-+	{
-+		.width = 1280,
-+		.height = 800,
-+		.exp_def = 0x0320,
-+		.hts_def = 0x05b0,	/* 0x2d8*2 */
-+		.vts_def = 0x038e,
-+		.crop = {
-+			.left = 0,
-+			.top = 0,
-+			.width = 1280,
-+			.height = 800
-+		},
-+		.reg_list = ov9281_1280x800_regs,
-+	},
-+	{
-+		.width = 1280,
-+		.height = 720,
-+		.exp_def = 0x0320,
-+		.hts_def = 0x05b0,
-+		.vts_def = 761,
-+		.crop = {
-+			.left = 0,
-+			.top = 40,
-+			.width = 1280,
-+			.height = 720
-+		},
-+		.reg_list = ov9281_1280x720_regs,
-+	},
-+	{
-+		.width = 640,
-+		.height = 400,
-+		.exp_def = 0x0320,
-+		.hts_def = 0x05b0,
-+		.vts_def = 421,
-+		.crop = {
-+			.left = 0,
-+			.top = 0,
-+			.width = 1280,
-+			.height = 800
-+		},
-+		.reg_list = ov9281_640x400_regs,
-+	},
-+};
-+
-+static const s64 link_freq_menu_items[] = {
-+	OV9281_LINK_FREQ_400MHZ
-+};
-+
-+static const char * const ov9281_test_pattern_menu[] = {
-+	"Disabled",
-+	"Vertical Color Bar Type 1",
-+	"Vertical Color Bar Type 2",
-+	"Vertical Color Bar Type 3",
-+	"Vertical Color Bar Type 4"
-+};
-+
-+/* Write registers up to 4 at a time */
-+static int ov9281_write_reg(struct i2c_client *client, u16 reg,
-+			    u32 len, u32 val)
-+{
-+	u32 buf_i, val_i;
-+	u8 buf[6];
-+	u8 *val_p;
-+	__be32 val_be;
-+
-+	if (len > 4)
-+		return -EINVAL;
-+
-+	buf[0] = reg >> 8;
-+	buf[1] = reg & 0xff;
-+
-+	val_be = cpu_to_be32(val);
-+	val_p = (u8 *)&val_be;
-+	buf_i = 2;
-+	val_i = 4 - len;
-+
-+	while (val_i < 4)
-+		buf[buf_i++] = val_p[val_i++];
-+
-+	if (i2c_master_send(client, buf, len + 2) != len + 2)
-+		return -EIO;
-+
-+	return 0;
-+}
-+
-+static int ov9281_write_array(struct i2c_client *client,
-+			      const struct regval *regs)
-+{
-+	u32 i;
-+	int ret = 0;
-+
-+	for (i = 0; ret == 0 && regs[i].addr != REG_NULL; i++)
-+		ret = ov9281_write_reg(client, regs[i].addr,
-+				       OV9281_REG_VALUE_08BIT, regs[i].val);
-+
-+	return ret;
-+}
-+
-+/* Read registers up to 4 at a time */
-+static int ov9281_read_reg(struct i2c_client *client, u16 reg, unsigned int len,
-+			   u32 *val)
-+{
-+	struct i2c_msg msgs[2];
-+	u8 *data_be_p;
-+	__be32 data_be = 0;
-+	__be16 reg_addr_be = cpu_to_be16(reg);
-+	int ret;
-+
-+	if (len > 4 || !len)
-+		return -EINVAL;
-+
-+	data_be_p = (u8 *)&data_be;
-+	/* Write register address */
-+	msgs[0].addr = client->addr;
-+	msgs[0].flags = 0;
-+	msgs[0].len = 2;
-+	msgs[0].buf = (u8 *)&reg_addr_be;
-+
-+	/* Read data from register */
-+	msgs[1].addr = client->addr;
-+	msgs[1].flags = I2C_M_RD;
-+	msgs[1].len = len;
-+	msgs[1].buf = &data_be_p[4 - len];
-+
-+	ret = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
-+	if (ret != ARRAY_SIZE(msgs))
-+		return -EIO;
-+
-+	*val = be32_to_cpu(data_be);
-+
-+	return 0;
-+}
-+
-+static int ov9281_get_reso_dist(const struct ov9281_mode *mode,
-+				struct v4l2_mbus_framefmt *framefmt)
-+{
-+	return abs(mode->width - framefmt->width) +
-+	       abs(mode->height - framefmt->height);
-+}
-+
-+static const struct ov9281_mode *
-+ov9281_find_best_fit(struct v4l2_subdev_format *fmt)
-+{
-+	struct v4l2_mbus_framefmt *framefmt = &fmt->format;
-+	int dist;
-+	int cur_best_fit = 0;
-+	int cur_best_fit_dist = -1;
-+	unsigned int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(supported_modes); i++) {
-+		dist = ov9281_get_reso_dist(&supported_modes[i], framefmt);
-+		if (cur_best_fit_dist == -1 || dist < cur_best_fit_dist) {
-+			cur_best_fit_dist = dist;
-+			cur_best_fit = i;
-+		}
-+	}
-+
-+	return &supported_modes[cur_best_fit];
-+}
-+
-+static int ov9281_set_fmt(struct v4l2_subdev *sd,
-+			  struct v4l2_subdev_state *sd_state,
-+			  struct v4l2_subdev_format *fmt)
-+{
-+	struct ov9281 *ov9281 = to_ov9281(sd);
-+	const struct ov9281_mode *mode;
-+	s64 h_blank, vblank_def, pixel_rate;
-+
-+	mutex_lock(&ov9281->mutex);
-+
-+	mode = ov9281_find_best_fit(fmt);
-+	if (fmt->format.code != MEDIA_BUS_FMT_Y8_1X8)
-+		fmt->format.code = MEDIA_BUS_FMT_Y10_1X10;
-+	fmt->format.width = mode->width;
-+	fmt->format.height = mode->height;
-+	fmt->format.field = V4L2_FIELD_NONE;
-+	fmt->format.colorspace = V4L2_COLORSPACE_RAW;
-+	fmt->format.ycbcr_enc =
-+			V4L2_MAP_YCBCR_ENC_DEFAULT(fmt->format.colorspace);
-+	fmt->format.quantization =
-+		V4L2_MAP_QUANTIZATION_DEFAULT(true, fmt->format.colorspace,
-+					      fmt->format.ycbcr_enc);
-+	fmt->format.xfer_func =
-+		V4L2_MAP_XFER_FUNC_DEFAULT(fmt->format.colorspace);
-+
-+	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-+		*v4l2_subdev_get_try_format(sd, sd_state, fmt->pad) = fmt->format;
-+	} else {
-+		ov9281->cur_mode = mode;
-+		ov9281->code = fmt->format.code;
-+		h_blank = mode->hts_def - mode->width;
-+		__v4l2_ctrl_modify_range(ov9281->hblank, h_blank,
-+					 h_blank, 1, h_blank);
-+		__v4l2_ctrl_s_ctrl(ov9281->hblank, h_blank);
-+		vblank_def = mode->vts_def - mode->height;
-+		__v4l2_ctrl_modify_range(ov9281->vblank, vblank_def,
-+					 OV9281_VTS_MAX - mode->height,
-+					 1, vblank_def);
-+		__v4l2_ctrl_s_ctrl(ov9281->vblank, vblank_def);
-+
-+		pixel_rate = (fmt->format.code == MEDIA_BUS_FMT_Y10_1X10) ?
-+			OV9281_PIXEL_RATE_10BIT : OV9281_PIXEL_RATE_8BIT;
-+		__v4l2_ctrl_modify_range(ov9281->pixel_rate, pixel_rate,
-+					 pixel_rate, 1, pixel_rate);
-+	}
-+
-+	mutex_unlock(&ov9281->mutex);
-+
-+	return 0;
-+}
-+
-+static int ov9281_get_fmt(struct v4l2_subdev *sd,
-+			  struct v4l2_subdev_state *sd_state,
-+			  struct v4l2_subdev_format *fmt)
-+{
-+	struct ov9281 *ov9281 = to_ov9281(sd);
-+	const struct ov9281_mode *mode = ov9281->cur_mode;
-+
-+	mutex_lock(&ov9281->mutex);
-+	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-+		fmt->format = *v4l2_subdev_get_try_format(sd, sd_state,
-+							  fmt->pad);
-+	} else {
-+		fmt->format.width = mode->width;
-+		fmt->format.height = mode->height;
-+		fmt->format.code = ov9281->code;
-+		fmt->format.field = V4L2_FIELD_NONE;
-+		fmt->format.colorspace = V4L2_COLORSPACE_RAW;
-+		fmt->format.ycbcr_enc =
-+			V4L2_MAP_YCBCR_ENC_DEFAULT(fmt->format.colorspace);
-+		fmt->format.quantization =
-+			V4L2_MAP_QUANTIZATION_DEFAULT(true,
-+						      fmt->format.colorspace,
-+						      fmt->format.ycbcr_enc);
-+		fmt->format.xfer_func =
-+			V4L2_MAP_XFER_FUNC_DEFAULT(fmt->format.colorspace);
-+	}
-+	mutex_unlock(&ov9281->mutex);
-+
-+	return 0;
-+}
-+
-+static int ov9281_enum_mbus_code(struct v4l2_subdev *sd,
-+				 struct v4l2_subdev_state *sd_state,
-+				 struct v4l2_subdev_mbus_code_enum *code)
-+{
-+	switch (code->index) {
-+	default:
-+		return -EINVAL;
-+	case 0:
-+		code->code = MEDIA_BUS_FMT_Y10_1X10;
-+		break;
-+	case 1:
-+		code->code = MEDIA_BUS_FMT_Y8_1X8;
-+		break;
-+	}
-+
-+	return 0;
-+}
-+
-+static int ov9281_enum_frame_sizes(struct v4l2_subdev *sd,
-+				   struct v4l2_subdev_state *sd_state,
-+				   struct v4l2_subdev_frame_size_enum *fse)
-+{
-+	if (fse->index >= ARRAY_SIZE(supported_modes))
-+		return -EINVAL;
-+
-+	if (fse->code != MEDIA_BUS_FMT_Y10_1X10 &&
-+	    fse->code != MEDIA_BUS_FMT_Y8_1X8)
-+		return -EINVAL;
-+
-+	fse->min_width  = supported_modes[fse->index].width;
-+	fse->max_width  = supported_modes[fse->index].width;
-+	fse->max_height = supported_modes[fse->index].height;
-+	fse->min_height = supported_modes[fse->index].height;
-+
-+	return 0;
-+}
-+
-+static int ov9281_enable_test_pattern(struct ov9281 *ov9281, u32 pattern)
-+{
-+	u32 val;
-+
-+	if (pattern)
-+		val = (pattern - 1) | OV9281_TEST_PATTERN_ENABLE;
-+	else
-+		val = OV9281_TEST_PATTERN_DISABLE;
-+
-+	return ov9281_write_reg(ov9281->client, OV9281_REG_TEST_PATTERN,
-+				OV9281_REG_VALUE_08BIT, val);
-+}
-+
-+static int ov9281_set_ctrl_hflip(struct ov9281 *ov9281, int value)
-+{
-+	u32 current_val;
-+	int ret = ov9281_read_reg(ov9281->client, OV9281_REG_TIMING_FORMAT_2,
-+					OV9281_REG_VALUE_08BIT, &current_val);
-+	if (!ret) {
-+		if (value)
-+			current_val |= OV9281_FLIP_BIT;
-+		else
-+			current_val &= ~OV9281_FLIP_BIT;
-+		return ov9281_write_reg(ov9281->client,
-+						OV9281_REG_TIMING_FORMAT_2,
-+						OV9281_REG_VALUE_08BIT,
-+						current_val);
-+	}
-+	return ret;
-+}
-+
-+static int ov9281_set_ctrl_vflip(struct ov9281 *ov9281, int value)
-+{
-+	u32 current_val;
-+	int ret = ov9281_read_reg(ov9281->client, OV9281_REG_TIMING_FORMAT_1,
-+					OV9281_REG_VALUE_08BIT, &current_val);
-+	if (!ret) {
-+		if (value)
-+			current_val |= OV9281_FLIP_BIT;
-+		else
-+			current_val &= ~OV9281_FLIP_BIT;
-+		return ov9281_write_reg(ov9281->client,
-+						OV9281_REG_TIMING_FORMAT_1,
-+						OV9281_REG_VALUE_08BIT,
-+						current_val);
-+	}
-+	return ret;
-+}
-+
-+static const struct v4l2_rect *
-+__ov9281_get_pad_crop(struct ov9281 *ov9281,
-+		      struct v4l2_subdev_state *sd_state,
-+		      unsigned int pad, enum v4l2_subdev_format_whence which)
-+{
-+	switch (which) {
-+	case V4L2_SUBDEV_FORMAT_TRY:
-+		return v4l2_subdev_get_try_crop(&ov9281->subdev, sd_state,
-+						pad);
-+	case V4L2_SUBDEV_FORMAT_ACTIVE:
-+		return &ov9281->cur_mode->crop;
-+	}
-+
-+	return NULL;
-+}
-+
-+static int ov9281_get_selection(struct v4l2_subdev *sd,
-+				struct v4l2_subdev_state *sd_state,
-+				struct v4l2_subdev_selection *sel)
-+{
-+	switch (sel->target) {
-+	case V4L2_SEL_TGT_CROP: {
-+		struct ov9281 *ov9281 = to_ov9281(sd);
-+
-+		mutex_lock(&ov9281->mutex);
-+		sel->r = *__ov9281_get_pad_crop(ov9281, sd_state, sel->pad,
-+						sel->which);
-+		mutex_unlock(&ov9281->mutex);
-+
-+		return 0;
-+	}
-+
-+	case V4L2_SEL_TGT_NATIVE_SIZE:
-+		sel->r.top = 0;
-+		sel->r.left = 0;
-+		sel->r.width = OV9281_NATIVE_WIDTH;
-+		sel->r.height = OV9281_NATIVE_HEIGHT;
-+
-+		return 0;
-+
-+	case V4L2_SEL_TGT_CROP_DEFAULT:
-+	case V4L2_SEL_TGT_CROP_BOUNDS:
-+		sel->r.top = OV9281_PIXEL_ARRAY_TOP;
-+		sel->r.left = OV9281_PIXEL_ARRAY_LEFT;
-+		sel->r.width = OV9281_PIXEL_ARRAY_WIDTH;
-+		sel->r.height = OV9281_PIXEL_ARRAY_HEIGHT;
-+
-+		return 0;
-+	}
-+
-+	return -EINVAL;
-+}
-+
-+static int __ov9281_start_stream(struct ov9281 *ov9281)
-+{
-+	int ret;
-+
-+	ret = ov9281_write_array(ov9281->client, ov9281_common_regs);
-+	if (ret)
-+		return ret;
-+
-+	ret = ov9281_write_array(ov9281->client, ov9281->cur_mode->reg_list);
-+	if (ret)
-+		return ret;
-+
-+	if (ov9281->code == MEDIA_BUS_FMT_Y10_1X10)
-+		ret = ov9281_write_array(ov9281->client, op_10bit);
-+	else
-+		ret = ov9281_write_array(ov9281->client, op_8bit);
-+	if (ret)
-+		return ret;
-+
-+	/* In case these controls are set before streaming */
-+	mutex_unlock(&ov9281->mutex);
-+	ret = v4l2_ctrl_handler_setup(&ov9281->ctrl_handler);
-+	mutex_lock(&ov9281->mutex);
-+	if (ret)
-+		return ret;
-+
-+	return ov9281_write_reg(ov9281->client, OV9281_REG_CTRL_MODE,
-+				OV9281_REG_VALUE_08BIT, OV9281_MODE_STREAMING);
-+}
-+
-+static int __ov9281_stop_stream(struct ov9281 *ov9281)
-+{
-+	return ov9281_write_reg(ov9281->client, OV9281_REG_CTRL_MODE,
-+				OV9281_REG_VALUE_08BIT, OV9281_MODE_SW_STANDBY);
-+}
-+
-+static int ov9281_s_stream(struct v4l2_subdev *sd, int on)
-+{
-+	struct ov9281 *ov9281 = to_ov9281(sd);
-+	struct i2c_client *client = ov9281->client;
-+	int ret = 0;
-+
-+	mutex_lock(&ov9281->mutex);
-+	on = !!on;
-+	if (on == ov9281->streaming)
-+		goto unlock_and_return;
-+
-+	if (on) {
-+		ret = pm_runtime_get_sync(&client->dev);
-+		if (ret < 0) {
-+			pm_runtime_put_noidle(&client->dev);
-+			goto unlock_and_return;
-+		}
-+
-+		ret = __ov9281_start_stream(ov9281);
-+		if (ret) {
-+			v4l2_err(sd, "start stream failed while write regs\n");
-+			pm_runtime_put(&client->dev);
-+			goto unlock_and_return;
-+		}
-+	} else {
-+		__ov9281_stop_stream(ov9281);
-+		pm_runtime_put(&client->dev);
-+	}
-+
-+	ov9281->streaming = on;
-+
-+unlock_and_return:
-+	mutex_unlock(&ov9281->mutex);
-+
-+	return ret;
-+}
-+
-+static int ov9281_s_power(struct v4l2_subdev *sd, int on)
-+{
-+	struct ov9281 *ov9281 = to_ov9281(sd);
-+	struct i2c_client *client = ov9281->client;
-+	int ret = 0;
-+
-+	mutex_lock(&ov9281->mutex);
-+
-+	/* If the power state is not modified - no work to do. */
-+	if (ov9281->power_on == !!on)
-+		goto unlock_and_return;
-+
-+	if (on) {
-+		ret = pm_runtime_get_sync(&client->dev);
-+		if (ret < 0) {
-+			pm_runtime_put_noidle(&client->dev);
-+			goto unlock_and_return;
-+		}
-+		ov9281->power_on = true;
-+	} else {
-+		pm_runtime_put(&client->dev);
-+		ov9281->power_on = false;
-+	}
-+
-+unlock_and_return:
-+	mutex_unlock(&ov9281->mutex);
-+
-+	return ret;
-+}
-+
-+/* Calculate the delay in us by clock rate and clock cycles */
-+static inline u32 ov9281_cal_delay(u32 cycles)
-+{
-+	return DIV_ROUND_UP(cycles, OV9281_XVCLK_FREQ / 1000 / 1000);
-+}
-+
-+static int __ov9281_power_on(struct ov9281 *ov9281)
-+{
-+	int ret;
-+	u32 delay_us;
-+	struct device *dev = &ov9281->client->dev;
-+
-+	ret = clk_set_rate(ov9281->xvclk, OV9281_XVCLK_FREQ);
-+	if (ret < 0)
-+		dev_warn(dev, "Failed to set xvclk rate (24MHz)\n");
-+	if (clk_get_rate(ov9281->xvclk) != OV9281_XVCLK_FREQ)
-+		dev_warn(dev, "xvclk mismatched, modes are based on 24MHz - rate is %lu\n",
-+			 clk_get_rate(ov9281->xvclk));
-+
-+	ret = clk_prepare_enable(ov9281->xvclk);
-+	if (ret < 0) {
-+		dev_err(dev, "Failed to enable xvclk\n");
-+		return ret;
-+	}
-+
-+	if (!IS_ERR(ov9281->reset_gpio))
-+		gpiod_set_value_cansleep(ov9281->reset_gpio, 0);
-+
-+	ret = regulator_bulk_enable(OV9281_NUM_SUPPLIES, ov9281->supplies);
-+	if (ret < 0) {
-+		dev_err(dev, "Failed to enable regulators\n");
-+		goto disable_clk;
-+	}
-+
-+	if (!IS_ERR(ov9281->reset_gpio))
-+		gpiod_set_value_cansleep(ov9281->reset_gpio, 1);
-+
-+	usleep_range(500, 1000);
-+	if (!IS_ERR(ov9281->pwdn_gpio))
-+		gpiod_set_value_cansleep(ov9281->pwdn_gpio, 1);
-+
-+	/* 8192 cycles prior to first SCCB transaction */
-+	delay_us = ov9281_cal_delay(8192);
-+	usleep_range(delay_us, delay_us * 2);
-+
-+	return 0;
-+
-+disable_clk:
-+	clk_disable_unprepare(ov9281->xvclk);
-+
-+	return ret;
-+}
-+
-+static void __ov9281_power_off(struct ov9281 *ov9281)
-+{
-+	if (!IS_ERR(ov9281->pwdn_gpio))
-+		gpiod_set_value_cansleep(ov9281->pwdn_gpio, 0);
-+	clk_disable_unprepare(ov9281->xvclk);
-+	if (!IS_ERR(ov9281->reset_gpio))
-+		gpiod_set_value_cansleep(ov9281->reset_gpio, 0);
-+	regulator_bulk_disable(OV9281_NUM_SUPPLIES, ov9281->supplies);
-+}
-+
-+static int ov9281_runtime_resume(struct device *dev)
-+{
-+	struct i2c_client *client = to_i2c_client(dev);
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct ov9281 *ov9281 = to_ov9281(sd);
-+
-+	return __ov9281_power_on(ov9281);
-+}
-+
-+static int ov9281_runtime_suspend(struct device *dev)
-+{
-+	struct i2c_client *client = to_i2c_client(dev);
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct ov9281 *ov9281 = to_ov9281(sd);
-+
-+	__ov9281_power_off(ov9281);
-+
-+	return 0;
-+}
-+
-+static int ov9281_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
-+{
-+	struct ov9281 *ov9281 = to_ov9281(sd);
-+	struct v4l2_mbus_framefmt *try_fmt =
-+				v4l2_subdev_get_try_format(sd, fh->state, 0);
-+	const struct ov9281_mode *def_mode = &supported_modes[0];
-+
-+	mutex_lock(&ov9281->mutex);
-+	/* Initialize try_fmt */
-+	try_fmt->width = def_mode->width;
-+	try_fmt->height = def_mode->height;
-+	try_fmt->code = MEDIA_BUS_FMT_Y10_1X10;
-+	try_fmt->field = V4L2_FIELD_NONE;
-+	try_fmt->colorspace = V4L2_COLORSPACE_RAW;
-+	try_fmt->ycbcr_enc = V4L2_MAP_YCBCR_ENC_DEFAULT(try_fmt->colorspace);
-+	try_fmt->quantization =
-+		V4L2_MAP_QUANTIZATION_DEFAULT(true, try_fmt->colorspace,
-+					      try_fmt->ycbcr_enc);
-+	try_fmt->xfer_func = V4L2_MAP_XFER_FUNC_DEFAULT(try_fmt->colorspace);
-+
-+	mutex_unlock(&ov9281->mutex);
-+	/* No crop or compose */
-+
-+	return 0;
-+}
-+
-+static const struct dev_pm_ops ov9281_pm_ops = {
-+	SET_RUNTIME_PM_OPS(ov9281_runtime_suspend,
-+			   ov9281_runtime_resume, NULL)
-+};
-+
-+static const struct v4l2_subdev_internal_ops ov9281_internal_ops = {
-+	.open = ov9281_open,
-+};
-+
-+static const struct v4l2_subdev_core_ops ov9281_core_ops = {
-+	.s_power = ov9281_s_power,
-+};
-+
-+static const struct v4l2_subdev_video_ops ov9281_video_ops = {
-+	.s_stream = ov9281_s_stream,
-+};
-+
-+static const struct v4l2_subdev_pad_ops ov9281_pad_ops = {
-+	.enum_mbus_code = ov9281_enum_mbus_code,
-+	.enum_frame_size = ov9281_enum_frame_sizes,
-+	.get_fmt = ov9281_get_fmt,
-+	.set_fmt = ov9281_set_fmt,
-+	.get_selection = ov9281_get_selection,
-+};
-+
-+static const struct v4l2_subdev_ops ov9281_subdev_ops = {
-+	.core	= &ov9281_core_ops,
-+	.video	= &ov9281_video_ops,
-+	.pad	= &ov9281_pad_ops,
-+};
-+
-+static int ov9281_set_ctrl(struct v4l2_ctrl *ctrl)
-+{
-+	struct ov9281 *ov9281 = container_of(ctrl->handler,
-+					     struct ov9281, ctrl_handler);
-+	struct i2c_client *client = ov9281->client;
-+	s64 max;
-+	int ret = 0;
-+
-+	/* Propagate change of current control to all related controls */
-+	switch (ctrl->id) {
-+	case V4L2_CID_VBLANK:
-+		/* Update max exposure while meeting expected vblanking */
-+		max = ov9281->cur_mode->height + ctrl->val - 4;
-+		__v4l2_ctrl_modify_range(ov9281->exposure,
-+					 ov9281->exposure->minimum, max,
-+					 ov9281->exposure->step,
-+					 ov9281->exposure->default_value);
-+		break;
-+	}
-+
-+	if (pm_runtime_get(&client->dev) <= 0)
-+		return 0;
-+
-+	switch (ctrl->id) {
-+	case V4L2_CID_HFLIP:
-+		ret = ov9281_set_ctrl_hflip(ov9281, ctrl->val);
-+		break;
-+	case V4L2_CID_VFLIP:
-+		ret = ov9281_set_ctrl_vflip(ov9281, ctrl->val);
-+		break;
-+	case V4L2_CID_EXPOSURE:
-+		/* 4 least significant bits of expsoure are fractional part */
-+		ret = ov9281_write_reg(ov9281->client, OV9281_REG_EXPOSURE,
-+				       OV9281_REG_VALUE_24BIT, ctrl->val << 4);
-+		break;
-+	case V4L2_CID_ANALOGUE_GAIN:
-+		ret = ov9281_write_reg(ov9281->client, OV9281_REG_GAIN_H,
-+				       OV9281_REG_VALUE_08BIT,
-+				       (ctrl->val >> OV9281_GAIN_H_SHIFT) &
-+							OV9281_GAIN_H_MASK);
-+		ret |= ov9281_write_reg(ov9281->client, OV9281_REG_GAIN_L,
-+				       OV9281_REG_VALUE_08BIT,
-+				       ctrl->val & OV9281_GAIN_L_MASK);
-+		break;
-+	case V4L2_CID_VBLANK:
-+		ret = ov9281_write_reg(ov9281->client, OV9281_REG_VTS,
-+				       OV9281_REG_VALUE_16BIT,
-+				       ctrl->val + ov9281->cur_mode->height);
-+		break;
-+	case V4L2_CID_TEST_PATTERN:
-+		ret = ov9281_enable_test_pattern(ov9281, ctrl->val);
-+		break;
-+	default:
-+		dev_warn(&client->dev, "%s Unhandled id:0x%x, val:0x%x\n",
-+			 __func__, ctrl->id, ctrl->val);
-+		break;
-+	}
-+
-+	pm_runtime_put(&client->dev);
-+
-+	return ret;
-+}
-+
-+static const struct v4l2_ctrl_ops ov9281_ctrl_ops = {
-+	.s_ctrl = ov9281_set_ctrl,
-+};
-+
-+static int ov9281_initialize_controls(struct ov9281 *ov9281)
-+{
-+	struct v4l2_fwnode_device_properties props;
-+	const struct ov9281_mode *mode;
-+	struct v4l2_ctrl_handler *handler;
-+	struct v4l2_ctrl *ctrl;
-+	s64 exposure_max, vblank_def;
-+	u32 h_blank;
-+	int ret;
-+
-+	handler = &ov9281->ctrl_handler;
-+	mode = ov9281->cur_mode;
-+	ret = v4l2_ctrl_handler_init(handler, 11);
-+	if (ret)
-+		return ret;
-+	handler->lock = &ov9281->mutex;
-+
-+	ctrl = v4l2_ctrl_new_int_menu(handler, NULL, V4L2_CID_LINK_FREQ,
-+				      0, 0, link_freq_menu_items);
-+	if (ctrl)
-+		ctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY;
-+
-+	ov9281->pixel_rate = v4l2_ctrl_new_std(handler, NULL,
-+					       V4L2_CID_PIXEL_RATE,
-+					       OV9281_PIXEL_RATE_10BIT,
-+					       OV9281_PIXEL_RATE_10BIT, 1,
-+					       OV9281_PIXEL_RATE_10BIT);
-+
-+	h_blank = mode->hts_def - mode->width;
-+	ov9281->hblank = v4l2_ctrl_new_std(handler, NULL, V4L2_CID_HBLANK,
-+					   h_blank, h_blank, 1, h_blank);
-+	if (ov9281->hblank)
-+		ov9281->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
-+
-+	vblank_def = mode->vts_def - mode->height;
-+	ov9281->vblank = v4l2_ctrl_new_std(handler, &ov9281_ctrl_ops,
-+					   V4L2_CID_VBLANK, vblank_def,
-+					   OV9281_VTS_MAX - mode->height, 1,
-+					   vblank_def);
-+
-+	exposure_max = mode->vts_def - 4;
-+	ov9281->exposure = v4l2_ctrl_new_std(handler, &ov9281_ctrl_ops,
-+					     V4L2_CID_EXPOSURE,
-+					     OV9281_EXPOSURE_MIN, exposure_max,
-+					     OV9281_EXPOSURE_STEP,
-+					     mode->exp_def);
-+
-+	ov9281->anal_gain = v4l2_ctrl_new_std(handler, &ov9281_ctrl_ops,
-+					      V4L2_CID_ANALOGUE_GAIN,
-+					      OV9281_GAIN_MIN, OV9281_GAIN_MAX,
-+					      OV9281_GAIN_STEP,
-+					      OV9281_GAIN_DEFAULT);
-+
-+	ov9281->vflip = v4l2_ctrl_new_std(handler, &ov9281_ctrl_ops,
-+					  V4L2_CID_VFLIP,
-+						0, 1, 1, 0);
-+
-+	ov9281->hflip = v4l2_ctrl_new_std(handler, &ov9281_ctrl_ops,
-+					  V4L2_CID_HFLIP,
-+						0, 1, 1, 0);
-+
-+	ov9281->test_pattern =
-+		v4l2_ctrl_new_std_menu_items(handler, &ov9281_ctrl_ops,
-+					     V4L2_CID_TEST_PATTERN,
-+					     ARRAY_SIZE(ov9281_test_pattern_menu) - 1,
-+					     0, 0, ov9281_test_pattern_menu);
-+
-+	if (handler->error) {
-+		ret = handler->error;
-+		dev_err(&ov9281->client->dev,
-+			"Failed to init controls(%d)\n", ret);
-+		goto err_free_handler;
-+	}
-+
-+	ret = v4l2_fwnode_device_parse(&ov9281->client->dev, &props);
-+	if (ret)
-+		goto err_free_handler;
-+
-+	ret = v4l2_ctrl_new_fwnode_properties(handler, &ov9281_ctrl_ops,
-+					      &props);
-+	if (ret)
-+		goto err_free_handler;
-+
-+	ov9281->subdev.ctrl_handler = handler;
-+
-+	return 0;
-+
-+err_free_handler:
-+	v4l2_ctrl_handler_free(handler);
-+
-+	return ret;
-+}
-+
-+static int ov9281_check_sensor_id(struct ov9281 *ov9281,
-+				  struct i2c_client *client)
-+{
-+	struct device *dev = &ov9281->client->dev;
-+	u32 id = 0, id_msb;
-+	int ret;
-+
-+	ret = ov9281_read_reg(client, OV9281_REG_CHIP_ID + 1,
-+			      OV9281_REG_VALUE_08BIT, &id);
-+	if (!ret)
-+		ret = ov9281_read_reg(client, OV9281_REG_CHIP_ID,
-+				      OV9281_REG_VALUE_08BIT, &id_msb);
-+	id |= (id_msb << 8);
-+	if (ret || id != CHIP_ID) {
-+		dev_err(dev, "Unexpected sensor id(%04x), ret(%d)\n", id, ret);
-+		return -ENODEV;
-+	}
-+
-+	dev_info(dev, "Detected OV%06x sensor\n", CHIP_ID);
-+
-+	return 0;
-+}
-+
-+static int ov9281_configure_regulators(struct ov9281 *ov9281)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < OV9281_NUM_SUPPLIES; i++)
-+		ov9281->supplies[i].supply = ov9281_supply_names[i];
-+
-+	return devm_regulator_bulk_get(&ov9281->client->dev,
-+				       OV9281_NUM_SUPPLIES,
-+				       ov9281->supplies);
-+}
-+
-+static int ov9281_probe(struct i2c_client *client,
-+			const struct i2c_device_id *id)
-+{
-+	struct device *dev = &client->dev;
-+	struct ov9281 *ov9281;
-+	struct v4l2_subdev *sd;
-+	int ret;
-+
-+	ov9281 = devm_kzalloc(dev, sizeof(*ov9281), GFP_KERNEL);
-+	if (!ov9281)
-+		return -ENOMEM;
-+
-+	ov9281->client = client;
-+	ov9281->cur_mode = &supported_modes[0];
-+
-+	ov9281->xvclk = devm_clk_get(dev, "xvclk");
-+	if (IS_ERR(ov9281->xvclk)) {
-+		dev_err(dev, "Failed to get xvclk\n");
-+		return -EINVAL;
-+	}
-+
-+	ov9281->reset_gpio = devm_gpiod_get_optional(dev, "reset",
-+						     GPIOD_OUT_LOW);
-+	if (IS_ERR(ov9281->reset_gpio))
-+		dev_warn(dev, "Failed to get reset-gpios\n");
-+
-+	ov9281->pwdn_gpio = devm_gpiod_get_optional(dev, "pwdn", GPIOD_OUT_LOW);
-+	if (IS_ERR(ov9281->pwdn_gpio))
-+		dev_warn(dev, "Failed to get pwdn-gpios\n");
-+
-+	ret = ov9281_configure_regulators(ov9281);
-+	if (ret) {
-+		dev_err(dev, "Failed to get power regulators\n");
-+		return ret;
-+	}
-+
-+	mutex_init(&ov9281->mutex);
-+
-+	sd = &ov9281->subdev;
-+	v4l2_i2c_subdev_init(sd, client, &ov9281_subdev_ops);
-+	ret = ov9281_initialize_controls(ov9281);
-+	if (ret)
-+		goto err_destroy_mutex;
-+
-+	ret = __ov9281_power_on(ov9281);
-+	if (ret)
-+		goto err_free_handler;
-+
-+	ret = ov9281_check_sensor_id(ov9281, client);
-+	if (ret)
-+		goto err_power_off;
-+
-+	sd->internal_ops = &ov9281_internal_ops;
-+	sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
-+
-+	ov9281->pad.flags = MEDIA_PAD_FL_SOURCE;
-+	sd->entity.function = MEDIA_ENT_F_CAM_SENSOR;
-+	ret = media_entity_pads_init(&sd->entity, 1, &ov9281->pad);
-+	if (ret < 0)
-+		goto err_power_off;
-+
-+	ret = v4l2_async_register_subdev_sensor(sd);
-+	if (ret) {
-+		dev_err(dev, "v4l2 async register subdev failed\n");
-+		goto err_clean_entity;
-+	}
-+
-+	pm_runtime_set_active(dev);
-+	pm_runtime_enable(dev);
-+	pm_runtime_idle(dev);
-+
-+	return 0;
-+
-+err_clean_entity:
-+	media_entity_cleanup(&sd->entity);
-+err_power_off:
-+	__ov9281_power_off(ov9281);
-+err_free_handler:
-+	v4l2_ctrl_handler_free(&ov9281->ctrl_handler);
-+err_destroy_mutex:
-+	mutex_destroy(&ov9281->mutex);
-+
-+	return ret;
-+}
-+
-+static void ov9281_remove(struct i2c_client *client)
-+{
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct ov9281 *ov9281 = to_ov9281(sd);
-+
-+	v4l2_async_unregister_subdev(sd);
-+	media_entity_cleanup(&sd->entity);
-+	v4l2_ctrl_handler_free(&ov9281->ctrl_handler);
-+	mutex_destroy(&ov9281->mutex);
-+
-+	pm_runtime_disable(&client->dev);
-+	if (!pm_runtime_status_suspended(&client->dev))
-+		__ov9281_power_off(ov9281);
-+	pm_runtime_set_suspended(&client->dev);
-+}
-+
-+static const struct of_device_id ov9281_of_match[] = {
-+	{ .compatible = "ovti,ov9281" },
-+	{},
-+};
-+MODULE_DEVICE_TABLE(of, ov9281_of_match);
-+
-+static const struct i2c_device_id ov9281_match_id[] = {
-+	{ "ovti,ov9281", 0 },
-+	{ },
-+};
-+
-+static struct i2c_driver ov9281_i2c_driver = {
-+	.driver = {
-+		.name = OV9281_NAME,
-+		.pm = &ov9281_pm_ops,
-+		.of_match_table = of_match_ptr(ov9281_of_match),
-+	},
-+	.probe		= &ov9281_probe,
-+	.remove		= &ov9281_remove,
-+	.id_table	= ov9281_match_id,
-+};
-+
-+static int __init sensor_mod_init(void)
-+{
-+	return i2c_add_driver(&ov9281_i2c_driver);
-+}
-+
-+static void __exit sensor_mod_exit(void)
-+{
-+	i2c_del_driver(&ov9281_i2c_driver);
-+}
-+
-+device_initcall_sync(sensor_mod_init);
-+module_exit(sensor_mod_exit);
-+
-+MODULE_DESCRIPTION("OmniVision ov9281 sensor driver");
-+MODULE_LICENSE("GPL v2");
---- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
-+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -443,7 +443,7 @@ struct unicam_device {
- 	/* ptr to  sub device */
- 	struct v4l2_subdev *sensor;
- 	/* Pad config for the sensor */
--	struct v4l2_subdev_pad_config *sensor_config;
-+	struct v4l2_subdev_state *sensor_state;
- 
- 	enum v4l2_mbus_type bus_type;
- 	/*
-@@ -594,7 +594,7 @@ static int __subdev_get_format(struct un
- 	};
- 	int ret;
- 
--	ret = v4l2_subdev_call(dev->sensor, pad, get_fmt, dev->sensor_config,
-+	ret = v4l2_subdev_call(dev->sensor, pad, get_fmt, dev->sensor_state,
- 			       &sd_fmt);
- 	if (ret < 0)
- 		return ret;
-@@ -618,7 +618,7 @@ static int __subdev_set_format(struct un
- 
- 	sd_fmt.format = *fmt;
- 
--	ret = v4l2_subdev_call(dev->sensor, pad, set_fmt, dev->sensor_config,
-+	ret = v4l2_subdev_call(dev->sensor, pad, set_fmt, dev->sensor_state,
- 			       &sd_fmt);
- 	if (ret < 0)
- 		return ret;
-@@ -1094,7 +1094,7 @@ static int unicam_try_fmt_vid_cap(struct
- 	 */
- 	mbus_fmt->field = V4L2_FIELD_NONE;
- 
--	ret = v4l2_subdev_call(dev->sensor, pad, set_fmt, dev->sensor_config,
-+	ret = v4l2_subdev_call(dev->sensor, pad, set_fmt, dev->sensor_state,
- 			       &sd_fmt);
- 	if (ret && ret != -ENOIOCTLCMD && ret != -ENODEV)
- 		return ret;
-@@ -1116,7 +1116,7 @@ static int unicam_try_fmt_vid_cap(struct
- 			mbus_fmt->code = fmt->code;
- 
- 			ret = v4l2_subdev_call(dev->sensor, pad, set_fmt,
--					       dev->sensor_config, &sd_fmt);
-+					       dev->sensor_state, &sd_fmt);
- 			if (ret && ret != -ENOIOCTLCMD && ret != -ENODEV)
- 				return ret;
- 
-@@ -2320,8 +2320,8 @@ static void unicam_release(struct kref *
- 	v4l2_ctrl_handler_free(&unicam->ctrl_handler);
- 	media_device_cleanup(&unicam->mdev);
- 
--	if (unicam->sensor_config)
--		v4l2_subdev_free_pad_config(unicam->sensor_config);
-+	if (unicam->sensor_state)
-+		__v4l2_subdev_state_free(unicam->sensor_state);
- 
- 	kfree(unicam);
- }
-@@ -2579,12 +2579,14 @@ static void unregister_nodes(struct unic
- 
- static int unicam_probe_complete(struct unicam_device *unicam)
- {
-+	static struct lock_class_key key;
- 	int ret;
- 
- 	unicam->v4l2_dev.notify = unicam_notify;
- 
--	unicam->sensor_config = v4l2_subdev_alloc_pad_config(unicam->sensor);
--	if (!unicam->sensor_config)
-+	unicam->sensor_state = __v4l2_subdev_state_alloc(unicam->sensor,
-+							 "unicam:async->lock", &key);
-+	if (!unicam->sensor_state)
- 		return -ENOMEM;
- 
- 	unicam->sensor_embedded_data = (unicam->sensor->entity.num_pads >= 2);
---- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-+++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-@@ -1465,7 +1465,7 @@ queue_cleanup:
- }
- 
- /* Unregister one of the /dev/video<N> nodes associated with the ISP. */
--static void unregister_node(struct bcm2835_isp_node *node)
-+static void bcm2835_unregister_node(struct bcm2835_isp_node *node)
- {
- 	struct bcm2835_isp_dev *dev = node_get_dev(node);
- 
-@@ -1668,7 +1668,7 @@ static int bcm2835_isp_remove(struct pla
- 	media_controller_unregister(dev);
- 
- 	for (i = 0; i < BCM2835_ISP_NUM_NODES; i++)
--		unregister_node(&dev->node[i]);
-+		bcm2835_unregister_node(&dev->node[i]);
- 
- 	v4l2_device_unregister(&dev->v4l2_dev);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0313-media-ov5647-Fix-return-codes-from-ov5647_write-ov56.patch b/target/linux/bcm27xx/patches-6.1/950-0313-media-ov5647-Fix-return-codes-from-ov5647_write-ov56.patch
deleted file mode 100644
index 0012039bc8..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0313-media-ov5647-Fix-return-codes-from-ov5647_write-ov56.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 38aa34eae8e6aa8504f97f86ac155a0ebc6a0557 Mon Sep 17 00:00:00 2001
-From: David Plowman <david.plowman@raspberrypi.org>
-Date: Wed, 15 Jan 2020 13:40:38 +0000
-Subject: [PATCH] media: ov5647: Fix return codes from
- ov5647_write/ov5647_read functions.
-
-Previously they were returning positive non-zero codes for success,
-which were getting passed up the call stack. Since release 4.19,
-do_dentry_open (fs/open.c) has been catching these and flagging an
-error. (So this driver has been broken since that date.)
-
-Fixes: 3c2472a [media] media: i2c: Add support for OV5647 sensor
-Signed-off-by: David Plowman <david.plowman@raspberrypi.org>
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/i2c/ov5647.c | 38 ++++++++++++++++++++++++++++++++------
- 1 file changed, 32 insertions(+), 6 deletions(-)
-
---- a/drivers/media/i2c/ov5647.c
-+++ b/drivers/media/i2c/ov5647.c
-@@ -587,7 +587,13 @@ static int ov5647_write16(struct v4l2_su
- 	int ret;
- 
- 	ret = i2c_master_send(client, data, 4);
--	if (ret < 0) {
-+	/*
-+	 * Writing the wrong number of bytes also needs to be flagged as an
-+	 * error. Success needs to produce a 0 return code.
-+	 */
-+	if (ret == 4) {
-+		ret = 0;
-+	} else {
- 		dev_dbg(&client->dev, "%s: i2c write error, reg: %x\n",
- 			__func__, reg);
- 		return ret;
-@@ -603,10 +609,17 @@ static int ov5647_write(struct v4l2_subd
- 	int ret;
- 
- 	ret = i2c_master_send(client, data, 3);
--	if (ret < 0) {
-+	/*
-+	 * Writing the wrong number of bytes also needs to be flagged as an
-+	 * error. Success needs to produce a 0 return code.
-+	 */
-+	if (ret == 3) {
-+		ret = 0;
-+	} else {
- 		dev_dbg(&client->dev, "%s: i2c write error, reg: %x\n",
- 				__func__, reg);
--		return ret;
-+		if (ret >= 0)
-+			ret = -EINVAL;
- 	}
- 
- 	return 0;
-@@ -619,17 +632,30 @@ static int ov5647_read(struct v4l2_subde
- 	int ret;
- 
- 	ret = i2c_master_send(client, data_w, 2);
--	if (ret < 0) {
-+	/*
-+	 * A negative return code, or sending the wrong number of bytes, both
-+	 * count as an error.
-+	 */
-+	if (ret != 2) {
- 		dev_dbg(&client->dev, "%s: i2c write error, reg: %x\n",
- 			__func__, reg);
-+		if (ret >= 0)
-+			ret = -EINVAL;
- 		return ret;
- 	}
- 
- 	ret = i2c_master_recv(client, val, 1);
--	if (ret < 0) {
-+	/*
-+	 * The only return value indicating success is 1. Anything else, even
-+	 * a non-negative value, indicates something went wrong.
-+	 */
-+	if (ret == 1) {
-+		ret = 0;
-+	} else {
- 		dev_dbg(&client->dev, "%s: i2c read error, reg: %x\n",
- 				__func__, reg);
--		return ret;
-+		if (ret >= 0)
-+			ret = -EINVAL;
- 	}
- 
- 	return 0;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0314-media-i2c-ov5647-Parse-and-register-properties.patch b/target/linux/bcm27xx/patches-6.1/950-0314-media-i2c-ov5647-Parse-and-register-properties.patch
deleted file mode 100644
index a26c6f0788..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0314-media-i2c-ov5647-Parse-and-register-properties.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 1103a0bb22ef77a47a7a1ac2293b1dd4ad2cf506 Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Sat, 4 Jul 2020 01:45:08 +0300
-Subject: [PATCH] media: i2c: ov5647: Parse and register properties
-
-Parse device properties and register controls for them using the V4L2
-fwnode properties helpers.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
----
- drivers/media/i2c/ov5647.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
---- a/drivers/media/i2c/ov5647.c
-+++ b/drivers/media/i2c/ov5647.c
-@@ -1291,10 +1291,11 @@ static const struct v4l2_ctrl_ops ov5647
- 	.s_ctrl = ov5647_s_ctrl,
- };
- 
--static int ov5647_init_controls(struct ov5647 *sensor)
-+static int ov5647_init_controls(struct ov5647 *sensor, struct device *dev)
- {
- 	struct i2c_client *client = v4l2_get_subdevdata(&sensor->sd);
- 	int hblank, exposure_max, exposure_def;
-+	struct v4l2_fwnode_device_properties props;
- 
- 	v4l2_ctrl_handler_init(&sensor->ctrls, 8);
- 
-@@ -1340,6 +1341,11 @@ static int ov5647_init_controls(struct o
- 					   sensor->mode->vts -
- 					   sensor->mode->format.height);
- 
-+	v4l2_fwnode_device_parse(dev, &props);
-+
-+	v4l2_ctrl_new_fwnode_properties(&sensor->ctrls, &ov5647_ctrl_ops,
-+					&props);
-+
- 	if (sensor->ctrls.error)
- 		goto handler_free;
- 
-@@ -1426,7 +1432,7 @@ static int ov5647_probe(struct i2c_clien
- 
- 	sensor->mode = OV5647_DEFAULT_MODE;
- 
--	ret = ov5647_init_controls(sensor);
-+	ret = ov5647_init_controls(sensor, dev);
- 	if (ret)
- 		goto mutex_destroy;
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0315-staging-bcm2835-camera-Add-support-for-DMABUFs.patch b/target/linux/bcm27xx/patches-6.1/950-0315-staging-bcm2835-camera-Add-support-for-DMABUFs.patch
deleted file mode 100644
index a41791c0e2..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0315-staging-bcm2835-camera-Add-support-for-DMABUFs.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 62d78891ffd2cc65c2d33bedc5a9ade25dc10041 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 17 Mar 2021 12:34:57 +0000
-Subject: [PATCH] staging/bcm2835-camera: Add support for DMABUFs
-
-DMABUFs are all handled by videobuf2, so there is no reason not
-to enable support for them.
-
-Note that this driver is still using the vmalloc allocator, so
-the buffers it allocates will not be compatible with the codec
-or ISP driver that require contiguous buffers. However this
-driver should be able to import the buffers allocated by them.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
-+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
-@@ -1449,6 +1449,7 @@ static const struct v4l2_ioctl_ops camer
- 	.vidioc_querybuf = vb2_ioctl_querybuf,
- 	.vidioc_qbuf = vb2_ioctl_qbuf,
- 	.vidioc_dqbuf = vb2_ioctl_dqbuf,
-+	.vidioc_expbuf = vb2_ioctl_expbuf,
- 	.vidioc_enum_framesizes = vidioc_enum_framesizes,
- 	.vidioc_enum_frameintervals = vidioc_enum_frameintervals,
- 	.vidioc_g_parm        = vidioc_g_parm,
-@@ -1928,7 +1929,7 @@ static int bcm2835_mmal_probe(struct pla
- 		q = &dev->capture.vb_vidq;
- 		memset(q, 0, sizeof(*q));
- 		q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
--		q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
-+		q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
- 		q->drv_priv = dev;
- 		q->buf_struct_size = sizeof(struct vb2_mmal_buffer);
- 		q->ops = &bcm2835_mmal_video_qops;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0316-staging-fbtft-Add-minipitft13-variant.patch b/target/linux/bcm27xx/patches-6.1/950-0316-staging-fbtft-Add-minipitft13-variant.patch
deleted file mode 100644
index 8096071756..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0316-staging-fbtft-Add-minipitft13-variant.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From b036f748f2f077e5028d57c726cacabf39465305 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Fri, 19 Feb 2021 10:25:01 +0000
-Subject: [PATCH] staging: fbtft: Add minipitft13 variant
-
-The Adafruit Mini-PiTFT13 display needs offsets applying when rotated,
-so use the "variant" mechanism to select a custom set_addr_win method
-using a dedicated compatible string of "fbtft,minipitft13".
-
-See: https://github.com/raspberrypi/firmware/issues/1524
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/staging/fbtft/fb_st7789v.c | 44 +++++++++++++++++++++++++++++-
- 1 file changed, 43 insertions(+), 1 deletion(-)
-
---- a/drivers/staging/fbtft/fb_st7789v.c
-+++ b/drivers/staging/fbtft/fb_st7789v.c
-@@ -75,6 +75,11 @@ enum st7789v_command {
- 
- static struct completion panel_te; /* completion for panel TE line */
- static int irq_te; /* Linux IRQ for LCD TE line */
-+static u32 col_offset = 0;
-+static u32 row_offset = 0;
-+static u8 col_hack_fix_offset = 0;
-+static short x_offset = 0;
-+static short y_offset = 0;
- 
- static irqreturn_t panel_te_handler(int irq, void *data)
- {
-@@ -261,6 +266,22 @@ static int write_vmem(struct fbtft_par *
- 	return ret;
- }
- 
-+static void minipitft13_set_addr_win(struct fbtft_par *par, int xs, int ys,
-+				     int xe, int ye)
-+{
-+	xs += x_offset;
-+	xe += x_offset;
-+	ys += y_offset;
-+	ye += y_offset;
-+	write_reg(par, MIPI_DCS_SET_COLUMN_ADDRESS,
-+		  xs >> 8, xs & 0xFF, xe >> 8, xe & 0xFF);
-+
-+	write_reg(par, MIPI_DCS_SET_PAGE_ADDRESS,
-+		  ys >> 8, ys & 0xFF, ye >> 8, ye & 0xFF);
-+
-+	write_reg(par, MIPI_DCS_WRITE_MEMORY_START);
-+}
-+
- /**
-  * set_var() - apply LCD properties like rotation and BGR mode
-  *
-@@ -271,20 +292,32 @@ static int write_vmem(struct fbtft_par *
- static int set_var(struct fbtft_par *par)
- {
- 	u8 madctl_par = 0;
-+	struct fbtft_display *display = &par->pdata->display;
-+	u32 width = display->width;
-+	u32 height = display->height;
- 
- 	if (par->bgr)
- 		madctl_par |= MADCTL_BGR;
- 	switch (par->info->var.rotate) {
- 	case 0:
-+		x_offset = 0;
-+		y_offset = 0;
- 		break;
- 	case 90:
- 		madctl_par |= (MADCTL_MV | MADCTL_MY);
-+		x_offset = (320 - height) - row_offset;
-+		y_offset = (240 - width) - col_offset;
- 		break;
- 	case 180:
- 		madctl_par |= (MADCTL_MX | MADCTL_MY);
-+		x_offset = (240 - width) - col_offset + col_hack_fix_offset;
-+		// hack tweak to account for extra pixel width to make even
-+		y_offset = (320 - height) - row_offset;
- 		break;
- 	case 270:
- 		madctl_par |= (MADCTL_MV | MADCTL_MX);
-+		x_offset = row_offset;
-+		y_offset = col_offset;
- 		break;
- 	default:
- 		return -EINVAL;
-@@ -382,7 +415,16 @@ static struct fbtft_display display = {
- 	},
- };
- 
--FBTFT_REGISTER_DRIVER(DRVNAME, "sitronix,st7789v", &display);
-+int variant_minipitft13(struct fbtft_display *display)
-+{
-+	display->fbtftops.set_addr_win = minipitft13_set_addr_win;
-+	return 0;
-+}
-+
-+FBTFT_REGISTER_DRIVER_START(&display)
-+FBTFT_COMPATIBLE("sitronix,st7789v")
-+FBTFT_VARIANT_COMPATIBLE("fbtft,minipitft13", variant_minipitft13)
-+FBTFT_REGISTER_DRIVER_END(DRVNAME, &display);
- 
- MODULE_ALIAS("spi:" DRVNAME);
- MODULE_ALIAS("platform:" DRVNAME);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0317-drm-panel-jdi-lt070me05000-Use-gpiod_set_value_cansl.patch b/target/linux/bcm27xx/patches-6.1/950-0317-drm-panel-jdi-lt070me05000-Use-gpiod_set_value_cansl.patch
deleted file mode 100644
index f33690c184..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0317-drm-panel-jdi-lt070me05000-Use-gpiod_set_value_cansl.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 02e0cfa1a5d43db75f95db29af672947eed587ed Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 15 Apr 2021 17:30:35 +0100
-Subject: [PATCH] drm/panel: jdi-lt070me05000: Use
- gpiod_set_value_cansleep
-
-There is no reason why the control GPIOs for the panel can not
-be connected to I2C or similar GPIO interfaces that may need to
-sleep, therefore switch from gpiod_set_value to
-gpiod_set_value_cansleep calls to configure them.
-Without that you get complaints from gpiolib every time the state
-is changed.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
---- a/drivers/gpu/drm/panel/panel-jdi-lt070me05000.c
-+++ b/drivers/gpu/drm/panel/panel-jdi-lt070me05000.c
-@@ -205,11 +205,11 @@ static int jdi_panel_unprepare(struct dr
- 	if (ret < 0)
- 		dev_err(dev, "regulator disable failed, %d\n", ret);
- 
--	gpiod_set_value(jdi->enable_gpio, 0);
-+	gpiod_set_value_cansleep(jdi->enable_gpio, 0);
- 
--	gpiod_set_value(jdi->reset_gpio, 1);
-+	gpiod_set_value_cansleep(jdi->reset_gpio, 1);
- 
--	gpiod_set_value(jdi->dcdc_en_gpio, 0);
-+	gpiod_set_value_cansleep(jdi->dcdc_en_gpio, 0);
- 
- 	jdi->prepared = false;
- 
-@@ -233,13 +233,13 @@ static int jdi_panel_prepare(struct drm_
- 
- 	msleep(20);
- 
--	gpiod_set_value(jdi->dcdc_en_gpio, 1);
-+	gpiod_set_value_cansleep(jdi->dcdc_en_gpio, 1);
- 	usleep_range(10, 20);
- 
--	gpiod_set_value(jdi->reset_gpio, 0);
-+	gpiod_set_value_cansleep(jdi->reset_gpio, 0);
- 	usleep_range(10, 20);
- 
--	gpiod_set_value(jdi->enable_gpio, 1);
-+	gpiod_set_value_cansleep(jdi->enable_gpio, 1);
- 	usleep_range(10, 20);
- 
- 	ret = jdi_panel_init(jdi);
-@@ -263,11 +263,11 @@ poweroff:
- 	if (ret < 0)
- 		dev_err(dev, "regulator disable failed, %d\n", ret);
- 
--	gpiod_set_value(jdi->enable_gpio, 0);
-+	gpiod_set_value_cansleep(jdi->enable_gpio, 0);
- 
--	gpiod_set_value(jdi->reset_gpio, 1);
-+	gpiod_set_value_cansleep(jdi->reset_gpio, 1);
- 
--	gpiod_set_value(jdi->dcdc_en_gpio, 0);
-+	gpiod_set_value_cansleep(jdi->dcdc_en_gpio, 0);
- 
- 	return ret;
- }
diff --git a/target/linux/bcm27xx/patches-6.1/950-0318-staging-bcm2835-camera-Add-support-for-H264-levels-4.patch b/target/linux/bcm27xx/patches-6.1/950-0318-staging-bcm2835-camera-Add-support-for-H264-levels-4.patch
deleted file mode 100644
index 739fbeebda..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0318-staging-bcm2835-camera-Add-support-for-H264-levels-4.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 6ed6d972bb37594cc54f5b1d9d78b463b30ff70d Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 25 Mar 2021 18:34:50 +0000
-Subject: [PATCH] staging/bcm2835-camera: Add support for H264 levels
- 4.1 and 4.2
-
-Whilst the hardware can't achieve the limits of level 4.2 under
-all situations, it can exceed level 4.0.
-
-Allow selection of levels 4.1 and 4.2.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../vc04_services/bcm2835-camera/controls.c   | 19 +++++++++++++++++--
- 1 file changed, 17 insertions(+), 2 deletions(-)
-
---- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
-+++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
-@@ -704,6 +704,8 @@ static int ctrl_set_video_encode_profile
- 		case V4L2_MPEG_VIDEO_H264_LEVEL_3_1:
- 		case V4L2_MPEG_VIDEO_H264_LEVEL_3_2:
- 		case V4L2_MPEG_VIDEO_H264_LEVEL_4_0:
-+		case V4L2_MPEG_VIDEO_H264_LEVEL_4_1:
-+		case V4L2_MPEG_VIDEO_H264_LEVEL_4_2:
- 			dev->capture.enc_level = ctrl->val;
- 			break;
- 		default:
-@@ -769,6 +771,17 @@ static int ctrl_set_video_encode_profile
- 		case V4L2_MPEG_VIDEO_H264_LEVEL_4_0:
- 			param.level = MMAL_VIDEO_LEVEL_H264_4;
- 			break;
-+		/*
-+		 * Note that the hardware spec is level 4.0. Achieving levels
-+		 * above that depend on exactly the resolution and frame rate
-+		 * being requested.
-+		 */
-+		case V4L2_MPEG_VIDEO_H264_LEVEL_4_1:
-+			param.level = MMAL_VIDEO_LEVEL_H264_41;
-+			break;
-+		case V4L2_MPEG_VIDEO_H264_LEVEL_4_2:
-+			param.level = MMAL_VIDEO_LEVEL_H264_42;
-+			break;
- 		default:
- 			/* Should never get here */
- 			break;
-@@ -1218,8 +1231,10 @@ static const struct bcm2835_mmal_v4l2_ct
- 			 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_0) |
- 			 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_1) |
- 			 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_2) |
--			 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_4_0)),
--		.max = V4L2_MPEG_VIDEO_H264_LEVEL_4_0,
-+			 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_4_0) |
-+			 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_4_1) |
-+			 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_4_2)),
-+		.max = V4L2_MPEG_VIDEO_H264_LEVEL_4_2,
- 		.def = V4L2_MPEG_VIDEO_H264_LEVEL_4_0,
- 		.step = 1,
- 		.imenu = NULL,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0319-staging-bcm2835-isp-Fix-compiler-warning.patch b/target/linux/bcm27xx/patches-6.1/950-0319-staging-bcm2835-isp-Fix-compiler-warning.patch
deleted file mode 100644
index e59ffff01c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0319-staging-bcm2835-isp-Fix-compiler-warning.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 951e400fb6cc92e1363016871c676d34bc649e19 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Fri, 23 Apr 2021 16:16:49 +0100
-Subject: [PATCH] staging/bcm2835-isp: Fix compiler warning
-
-The result of dividing a u32 by a size_t is an unsigned int on arm32
-and a long unsigned int on arm64. Use "%zu" (the size_t format) to
-remove the build warning for 64-bit builds.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-+++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-@@ -1237,7 +1237,7 @@ static int bcm2835_isp_get_supported_fmt
- 	if (ret) {
- 		if (ret == MMAL_MSG_STATUS_ENOSPC) {
- 			v4l2_err(&dev->v4l2_dev,
--				 "%s: port has more encodings than we provided space for. Some are dropped (%u vs %u).\n",
-+				 "%s: port has more encodings than we provided space for. Some are dropped (%zu vs %u).\n",
- 				 __func__, param_size / sizeof(u32),
- 				 MAX_SUPPORTED_ENCODINGS);
- 			num_encodings = MAX_SUPPORTED_ENCODINGS;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0320-gpio-poweroff-Remember-the-old-poweroff-handler.patch b/target/linux/bcm27xx/patches-6.1/950-0320-gpio-poweroff-Remember-the-old-poweroff-handler.patch
deleted file mode 100644
index f433037e14..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0320-gpio-poweroff-Remember-the-old-poweroff-handler.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 23450a1ff298fad192f6d098cc1c920473fc50f6 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 27 Apr 2021 08:59:01 +0100
-Subject: [PATCH] gpio-poweroff: Remember the old poweroff handler
-
-Keeping a copy of the old poweroff handler allows it to be restored
-should this module be unloaded, but also provides a fallback if the
-power hasn't been removed when the timeout elapses.
-
-See: https://github.com/raspberrypi/rpi-eeprom/issues/330
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/power/reset/gpio-poweroff.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
---- a/drivers/power/reset/gpio-poweroff.c
-+++ b/drivers/power/reset/gpio-poweroff.c
-@@ -24,6 +24,7 @@ static struct gpio_desc *reset_gpio;
- static u32 timeout = DEFAULT_TIMEOUT_MS;
- static u32 active_delay = 100;
- static u32 inactive_delay = 100;
-+static void (*old_power_off)(void);
- 
- static void gpio_poweroff_do_poweroff(void)
- {
-@@ -43,6 +44,9 @@ static void gpio_poweroff_do_poweroff(vo
- 	/* give it some time */
- 	mdelay(timeout);
- 
-+	if (old_power_off)
-+		old_power_off();
-+
- 	WARN_ON(1);
- }
- 
-@@ -83,6 +87,7 @@ static int gpio_poweroff_probe(struct pl
- 		gpiod_export_link(&pdev->dev, "poweroff-gpio", reset_gpio);
- 	}
- 
-+	old_power_off = pm_power_off;
- 	pm_power_off = &gpio_poweroff_do_poweroff;
- 	return 0;
- }
-@@ -90,7 +95,7 @@ static int gpio_poweroff_probe(struct pl
- static int gpio_poweroff_remove(struct platform_device *pdev)
- {
- 	if (pm_power_off == &gpio_poweroff_do_poweroff)
--		pm_power_off = NULL;
-+		pm_power_off = old_power_off;
- 
- 	gpiod_unexport(reset_gpio);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0321-media-i2c-ov5647-Correct-pixel-array-offset.patch b/target/linux/bcm27xx/patches-6.1/950-0321-media-i2c-ov5647-Correct-pixel-array-offset.patch
deleted file mode 100644
index 4c9c7445c6..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0321-media-i2c-ov5647-Correct-pixel-array-offset.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e048b294c24e640077d01e48fe7ef09301e53171 Mon Sep 17 00:00:00 2001
-From: David Plowman <david.plowman@raspberrypi.com>
-Date: Tue, 11 May 2021 12:52:26 +0100
-Subject: [PATCH] media: i2c: ov5647: Correct pixel array offset
-
-The top offset in the pixel array is actually 6 (see page 3-1 of the
-OV5647 data sheet).
-
-Fixes: f2f7ad5ce5e52 ("media: i2c: ov5647: Selection compliance fixes")
-Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
----
- drivers/media/i2c/ov5647.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/media/i2c/ov5647.c
-+++ b/drivers/media/i2c/ov5647.c
-@@ -68,7 +68,7 @@
- #define OV5647_NATIVE_HEIGHT		1956U
- 
- #define OV5647_PIXEL_ARRAY_LEFT		16U
--#define OV5647_PIXEL_ARRAY_TOP		16U
-+#define OV5647_PIXEL_ARRAY_TOP		6U
- #define OV5647_PIXEL_ARRAY_WIDTH	2592U
- #define OV5647_PIXEL_ARRAY_HEIGHT	1944U
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0322-media-i2c-ov5647-Correct-minimum-VBLANK-value.patch b/target/linux/bcm27xx/patches-6.1/950-0322-media-i2c-ov5647-Correct-minimum-VBLANK-value.patch
deleted file mode 100644
index 38431a5f22..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0322-media-i2c-ov5647-Correct-minimum-VBLANK-value.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8a6c0eb1a5e3a3e6e01c95be2bdbe21da41102f6 Mon Sep 17 00:00:00 2001
-From: David Plowman <david.plowman@raspberrypi.com>
-Date: Tue, 11 May 2021 12:57:22 +0100
-Subject: [PATCH] media: i2c: ov5647: Correct minimum VBLANK value
-
-Trial and error reveals that the minimum vblank value appears to be 24
-(the OV5647 data sheet does not give any clues). This fixes streaming
-lock-ups in full resolution mode.
-
-Fixes: 9b5a5ebedc303 ("media: i2c: ov5647: Add support for V4L2_CID_VBLANK")
-Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
----
- drivers/media/i2c/ov5647.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/media/i2c/ov5647.c
-+++ b/drivers/media/i2c/ov5647.c
-@@ -72,7 +72,7 @@
- #define OV5647_PIXEL_ARRAY_WIDTH	2592U
- #define OV5647_PIXEL_ARRAY_HEIGHT	1944U
- 
--#define OV5647_VBLANK_MIN		4
-+#define OV5647_VBLANK_MIN		24
- #define OV5647_VTS_MAX			32767
- 
- #define OV5647_EXPOSURE_MIN		4
diff --git a/target/linux/bcm27xx/patches-6.1/950-0323-media-i2c-ov5647-Fix-v4l2-compliance-failure-subscri.patch b/target/linux/bcm27xx/patches-6.1/950-0323-media-i2c-ov5647-Fix-v4l2-compliance-failure-subscri.patch
deleted file mode 100644
index e01602b090..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0323-media-i2c-ov5647-Fix-v4l2-compliance-failure-subscri.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 47435f12464daa6316e5da8efe7ce110cda3d671 Mon Sep 17 00:00:00 2001
-From: David Plowman <david.plowman@raspberrypi.com>
-Date: Wed, 12 May 2021 07:39:21 +0100
-Subject: [PATCH] media: i2c: ov5647: Fix v4l2-compliance failure
- subscribing to events
-
-Fixes the following v4l2-compliance failure:
-
-fail: v4l2-test-controls.cpp(871): subscribe event for control 'User Controls' failed test
-
-Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
----
- drivers/media/i2c/ov5647.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/media/i2c/ov5647.c
-+++ b/drivers/media/i2c/ov5647.c
-@@ -879,6 +879,8 @@ static const struct v4l2_subdev_core_ops
- 	.g_register		= ov5647_sensor_get_register,
- 	.s_register		= ov5647_sensor_set_register,
- #endif
-+	.subscribe_event = v4l2_ctrl_subdev_subscribe_event,
-+	.unsubscribe_event = v4l2_event_subdev_unsubscribe,
- };
- 
- static const struct v4l2_rect *
diff --git a/target/linux/bcm27xx/patches-6.1/950-0324-staging-vc04_services-isp-Set-the-YUV420-YVU420-form.patch b/target/linux/bcm27xx/patches-6.1/950-0324-staging-vc04_services-isp-Set-the-YUV420-YVU420-form.patch
deleted file mode 100644
index 52abb3d570..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0324-staging-vc04_services-isp-Set-the-YUV420-YVU420-form.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 6fca4e449c1dee8eb4e8ef4717c5996dfc33507e Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Tue, 29 Jun 2021 12:50:58 +0100
-Subject: [PATCH] staging: vc04_services: isp: Set the YUV420/YVU420
- format stride to 64 bytes
-
-The bcm2835 ISP requires the base address of all input/output planes to have 32
-byte alignment. Using a Y stride of 32 bytes would not guarantee that the V
-plane would fulfil this, e.g. a height of 650 lines would mean the V plane
-buffer is not 32 byte aligned for YUV420 formats.
-
-Having a Y stride of 64 bytes would ensure both U and V planes have a 32 byte
-alignment, as the luma height will always be an even number of lines.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h
-+++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h
-@@ -48,7 +48,7 @@ static const struct bcm2835_isp_fmt supp
- 		/* YUV formats */
- 		.fourcc		    = V4L2_PIX_FMT_YUV420,
- 		.depth		    = 8,
--		.bytesperline_align = 32,
-+		.bytesperline_align = 64,
- 		.mmal_fmt	    = MMAL_ENCODING_I420,
- 		.size_multiplier_x2 = 3,
- 		.colorspace_mask    = V4L2_COLORSPACE_MASK_YUV,
-@@ -57,7 +57,7 @@ static const struct bcm2835_isp_fmt supp
- 	}, {
- 		.fourcc		    = V4L2_PIX_FMT_YVU420,
- 		.depth		    = 8,
--		.bytesperline_align = 32,
-+		.bytesperline_align = 64,
- 		.mmal_fmt	    = MMAL_ENCODING_YV12,
- 		.size_multiplier_x2 = 3,
- 		.colorspace_mask    = V4L2_COLORSPACE_MASK_YUV,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0325-media-bcm2835-unicam-Forward-input-status-from-subde.patch b/target/linux/bcm27xx/patches-6.1/950-0325-media-bcm2835-unicam-Forward-input-status-from-subde.patch
deleted file mode 100644
index 2cc4cff177..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0325-media-bcm2835-unicam-Forward-input-status-from-subde.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From df490e112fa3285ba73edbc33e02a41dad5e4d2e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jakub=20Van=C4=9Bk?= <linuxtardis@gmail.com>
-Date: Wed, 7 Jul 2021 22:48:20 +0200
-Subject: [PATCH] media: bcm2835-unicam: Forward input status from
- subdevice
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The vidioc_enum_input() v4l2 ioctl is capable of returning
-sensor/input status as well. This is used in current
-GStreamer HEAD for signal detection [1].
-
-bcm2835-unicam does handle this syscall, but it didn't ask
-the subdevice driver about the input status. The input then
-appeared as always present.
-
-This commit adds the necessary query. There is a precedent for
-this - the R-Car VIN V4L2 driver does a similar call [2].
-
-[1]: https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/blob/ce0be27caf69aa9d96b73bc2b50737451b6f6936/sys/v4l2/gstv4l2src.c#L553
-[2]: https://github.com/raspberrypi/linux/blob/7fb9d006d3ff3baf2e205e0c85c4e4fd0a64fcd0/drivers/media/platform/rcar-vin/rcar-v4l2.c#L548
-
-Signed-off-by: Jakub Vaněk <linuxtardis@gmail.com>
----
- drivers/media/platform/bcm2835/bcm2835-unicam.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
---- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
-+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -1809,6 +1809,7 @@ static int unicam_enum_input(struct file
- {
- 	struct unicam_node *node = video_drvdata(file);
- 	struct unicam_device *dev = node->dev;
-+	int ret;
- 
- 	if (inp->index != 0)
- 		return -EINVAL;
-@@ -1825,6 +1826,14 @@ static int unicam_enum_input(struct file
- 		inp->capabilities = 0;
- 		inp->std = 0;
- 	}
-+
-+	if (v4l2_subdev_has_op(dev->sensor, video, g_input_status)) {
-+		ret = v4l2_subdev_call(dev->sensor, video, g_input_status,
-+				       &inp->status);
-+		if (ret < 0)
-+			return ret;
-+	}
-+
- 	snprintf(inp->name, sizeof(inp->name), "Camera 0");
- 	return 0;
- }
diff --git a/target/linux/bcm27xx/patches-6.1/950-0326-media-i2c-ov7251-Add-fwnode-properties-controls.patch b/target/linux/bcm27xx/patches-6.1/950-0326-media-i2c-ov7251-Add-fwnode-properties-controls.patch
deleted file mode 100644
index 07ab808090..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0326-media-i2c-ov7251-Add-fwnode-properties-controls.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From aeacfdd4ae221a3d01cdefafbdde157bb39181fb Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 3 Aug 2021 11:33:33 +0100
-Subject: [PATCH] media: i2c: ov7251: Add fwnode properties controls
-
-Add call to v4l2_ctrl_new_fwnode_properties to read and
-create the fwnode based controls.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/i2c/ov7251.c | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
---- a/drivers/media/i2c/ov7251.c
-+++ b/drivers/media/i2c/ov7251.c
-@@ -1541,7 +1541,7 @@ static int ov7251_init_ctrls(struct ov72
- 	s64 pixel_rate;
- 	int hblank;
- 
--	v4l2_ctrl_handler_init(&ov7251->ctrls, 7);
-+	v4l2_ctrl_handler_init(&ov7251->ctrls, 9);
- 	ov7251->ctrls.lock = &ov7251->lock;
- 
- 	v4l2_ctrl_new_std(&ov7251->ctrls, &ov7251_ctrl_ops,
-@@ -1600,6 +1600,7 @@ static int ov7251_init_ctrls(struct ov72
- 
- static int ov7251_probe(struct i2c_client *client)
- {
-+	struct v4l2_fwnode_device_properties props;
- 	struct device *dev = &client->dev;
- 	struct ov7251 *ov7251;
- 	unsigned int rate = 0, clk_rate = 0;
-@@ -1690,6 +1691,15 @@ static int ov7251_probe(struct i2c_clien
- 		goto destroy_mutex;
- 	}
- 
-+	ret = v4l2_fwnode_device_parse(&client->dev, &props);
-+	if (ret)
-+		goto free_ctrl;
-+
-+	ret = v4l2_ctrl_new_fwnode_properties(&ov7251->ctrls, &ov7251_ctrl_ops,
-+					      &props);
-+	if (ret)
-+		goto free_ctrl;
-+
- 	v4l2_i2c_subdev_init(&ov7251->sd, client, &ov7251_subdev_ops);
- 	ov7251->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
- 	ov7251->pad.flags = MEDIA_PAD_FL_SOURCE;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0327-usb-xhci-workaround-for-bogus-SET_DEQ_PENDING-endpoi.patch b/target/linux/bcm27xx/patches-6.1/950-0327-usb-xhci-workaround-for-bogus-SET_DEQ_PENDING-endpoi.patch
deleted file mode 100644
index ed242cbbe4..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0327-usb-xhci-workaround-for-bogus-SET_DEQ_PENDING-endpoi.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 55a8f65623880e02c9bc7ad6237513e0ef5f371b Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.com>
-Date: Wed, 11 Aug 2021 15:33:57 +0100
-Subject: [PATCH] usb: xhci: workaround for bogus SET_DEQ_PENDING
- endpoint state
-
-See https://github.com/raspberrypi/linux/issues/3981
-
-An unknown unsafe memory access can result in the ep_state variable
-in xhci_virt_ep being trampled with a stuck SET_DEQ_PENDING state
-despite successful completion of a Set TR Deq Pointer command.
-
-All URB enqueue/dequeue calls for the endpoint will fail in this state
-so no transfers are possible until the device is reconnected.
-
-As a workaround, clear the flag if we see it set and issue a new Set
-TR Deq command anyway - this should be harmless, as a prior Set TR Deq
-command will only have been issued in the Stopped state, and if the
-endpoint is Running then the controller is required to ignore it and
-respond with a Context State Error event TRB.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- drivers/usb/host/xhci-ring.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/drivers/usb/host/xhci-ring.c
-+++ b/drivers/usb/host/xhci-ring.c
-@@ -675,9 +675,9 @@ deq_found:
- 	}
- 
- 	if ((ep->ep_state & SET_DEQ_PENDING)) {
--		xhci_warn(xhci, "Set TR Deq already pending, don't submit for 0x%pad\n",
--			  &addr);
--		return -EBUSY;
-+		xhci_warn(xhci, "WARN A Set TR Deq Ptr command is pending for slot %u ep %u\n",
-+			  slot_id, ep_index);
-+		ep->ep_state &= ~SET_DEQ_PENDING;
- 	}
- 
- 	/* This function gets called from contexts where it cannot sleep */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0328-staging-vchiq_arm-Add-36-bit-address-support.patch b/target/linux/bcm27xx/patches-6.1/950-0328-staging-vchiq_arm-Add-36-bit-address-support.patch
deleted file mode 100644
index a9e9991d1a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0328-staging-vchiq_arm-Add-36-bit-address-support.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-From 57584e2ea9dbcbe0ddfbbc997d938dea9798938d Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 1 Nov 2018 17:31:37 +0000
-Subject: [PATCH] staging: vchiq_arm: Add 36-bit address support
-
-Conditional on a new compatible string, change the pagelist encoding
-such that the top 24 bits are the pfn, leaving 8 bits for run length
-(-1), giving a 36-bit address range.
-
-Manage the split between addresses for the VPU and addresses for the
-40-bit DMA controller with a dedicated DMA device pointer that on non-
-BCM2711 platforms is the same as the main VCHIQ device. This allows
-the VCHIQ node to stay in the usual place in the DT.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- .../interface/vchiq_arm/vchiq_arm.c           | 125 +++++++++++++-----
- 1 file changed, 90 insertions(+), 35 deletions(-)
-
---- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-@@ -73,6 +73,7 @@ static struct platform_device *bcm2835_i
- 
- struct vchiq_drvdata {
- 	const unsigned int cache_line_size;
-+	const bool use_36bit_addrs;
- 	struct rpi_firmware *fw;
- };
- 
-@@ -118,6 +119,11 @@ struct vchiq_arm_state {
- 	int first_connect;
- };
- 
-+static struct vchiq_drvdata bcm2711_drvdata = {
-+	.cache_line_size = 64,
-+	.use_36bit_addrs = true,
-+};
-+
- struct vchiq_2835_state {
- 	int inited;
- 	struct vchiq_arm_state arm_state;
-@@ -147,10 +153,12 @@ static void __iomem *g_regs;
-  * of 32.
-  */
- static unsigned int g_cache_line_size = 32;
-+static unsigned int g_use_36bit_addrs = 0;
- static unsigned int g_fragments_size;
- static char *g_fragments_base;
- static char *g_free_fragments;
- static struct semaphore g_free_fragments_sema;
-+static struct device *g_dma_dev;
- 
- static DEFINE_SEMAPHORE(g_free_fragments_mutex);
- 
-@@ -180,7 +188,7 @@ static void
- cleanup_pagelistinfo(struct vchiq_instance *instance, struct vchiq_pagelist_info *pagelistinfo)
- {
- 	if (pagelistinfo->scatterlist_mapped) {
--		dma_unmap_sg(instance->state->dev, pagelistinfo->scatterlist,
-+		dma_unmap_sg(g_dma_dev, pagelistinfo->scatterlist,
- 			     pagelistinfo->num_pages, pagelistinfo->dma_dir);
- 	}
- 
-@@ -340,7 +348,7 @@ create_pagelist(struct vchiq_instance *i
- 		count -= len;
- 	}
- 
--	dma_buffers = dma_map_sg(instance->state->dev,
-+	dma_buffers = dma_map_sg(g_dma_dev,
- 				 scatterlist,
- 				 num_pages,
- 				 pagelistinfo->dma_dir);
-@@ -354,22 +362,61 @@ create_pagelist(struct vchiq_instance *i
- 
- 	/* Combine adjacent blocks for performance */
- 	k = 0;
--	for_each_sg(scatterlist, sg, dma_buffers, i) {
--		u32 len = sg_dma_len(sg);
--		u32 addr = sg_dma_address(sg);
--
--		/* Note: addrs is the address + page_count - 1
--		 * The firmware expects blocks after the first to be page-
--		 * aligned and a multiple of the page size
--		 */
--		WARN_ON(len == 0);
--		WARN_ON(i && (i != (dma_buffers - 1)) && (len & ~PAGE_MASK));
--		WARN_ON(i && (addr & ~PAGE_MASK));
--		if (is_adjacent_block(addrs, addr, k))
--			addrs[k - 1] += ((len + PAGE_SIZE - 1) >> PAGE_SHIFT);
--		else
--			addrs[k++] = (addr & PAGE_MASK) |
--				(((len + PAGE_SIZE - 1) >> PAGE_SHIFT) - 1);
-+	if (g_use_36bit_addrs) {
-+		for_each_sg(scatterlist, sg, dma_buffers, i) {
-+			u32 len = sg_dma_len(sg);
-+			u64 addr = sg_dma_address(sg);
-+			u32 page_id = (u32)((addr >> 4) & ~0xff);
-+			u32 sg_pages = (len + PAGE_SIZE - 1) >> PAGE_SHIFT;
-+
-+			/* Note: addrs is the address + page_count - 1
-+			 * The firmware expects blocks after the first to be page-
-+			 * aligned and a multiple of the page size
-+			 */
-+			WARN_ON(len == 0);
-+			WARN_ON(i &&
-+				(i != (dma_buffers - 1)) && (len & ~PAGE_MASK));
-+			WARN_ON(i && (addr & ~PAGE_MASK));
-+			WARN_ON(upper_32_bits(addr) > 0xf);
-+
-+			if (k > 0 &&
-+			    ((addrs[k - 1] & ~0xff) +
-+			     (((addrs[k - 1] & 0xff) + 1) << 8)
-+			     == page_id)) {
-+				u32 inc_pages = min(sg_pages,
-+						    0xff - (addrs[k - 1] & 0xff));
-+				addrs[k - 1] += inc_pages;
-+				page_id += inc_pages << 8;
-+				sg_pages -= inc_pages;
-+			}
-+			while (sg_pages) {
-+				u32 inc_pages = min(sg_pages, 0x100u);
-+				addrs[k++] = page_id | (inc_pages - 1);
-+				page_id += inc_pages << 8;
-+				sg_pages -= inc_pages;
-+			}
-+		}
-+	} else {
-+		for_each_sg(scatterlist, sg, dma_buffers, i) {
-+			u32 len = sg_dma_len(sg);
-+			u32 addr = sg_dma_address(sg);
-+			u32 new_pages = (len + PAGE_SIZE - 1) >> PAGE_SHIFT;
-+
-+			/* Note: addrs is the address + page_count - 1
-+			 * The firmware expects blocks after the first to be page-
-+			 * aligned and a multiple of the page size
-+			 */
-+			WARN_ON(len == 0);
-+			WARN_ON(i && (i != (dma_buffers - 1)) && (len & ~PAGE_MASK));
-+			WARN_ON(i && (addr & ~PAGE_MASK));
-+			if (k > 0 &&
-+			    ((addrs[k - 1] & PAGE_MASK) +
-+			     (((addrs[k - 1] & ~PAGE_MASK) + 1) << PAGE_SHIFT))
-+			    == (addr & PAGE_MASK))
-+				addrs[k - 1] += new_pages;
-+			else
-+				addrs[k++] = (addr & PAGE_MASK) | (new_pages - 1);
-+		}
- 	}
- 
- 	/* Partial cache lines (fragments) require special measures */
-@@ -413,7 +460,7 @@ free_pagelist(struct vchiq_instance *ins
- 	 * NOTE: dma_unmap_sg must be called before the
- 	 * cpu can touch any of the data/pages.
- 	 */
--	dma_unmap_sg(instance->state->dev, pagelistinfo->scatterlist,
-+	dma_unmap_sg(g_dma_dev, pagelistinfo->scatterlist,
- 		     pagelistinfo->num_pages, pagelistinfo->dma_dir);
- 	pagelistinfo->scatterlist_mapped = 0;
- 
-@@ -468,6 +515,7 @@ free_pagelist(struct vchiq_instance *ins
- static int vchiq_platform_init(struct platform_device *pdev, struct vchiq_state *state)
- {
- 	struct device *dev = &pdev->dev;
-+	struct device *dma_dev = NULL;
- 	struct vchiq_drvdata *drvdata = platform_get_drvdata(pdev);
- 	struct rpi_firmware *fw = drvdata->fw;
- 	struct vchiq_slot_zero *vchiq_slot_zero;
-@@ -489,6 +537,24 @@ static int vchiq_platform_init(struct pl
- 	g_cache_line_size = drvdata->cache_line_size;
- 	g_fragments_size = 2 * g_cache_line_size;
- 
-+	if (drvdata->use_36bit_addrs) {
-+		struct device_node *dma_node =
-+			of_find_compatible_node(NULL, NULL, "brcm,bcm2711-dma");
-+
-+		if (dma_node) {
-+			struct platform_device *pdev;
-+
-+			pdev = of_find_device_by_node(dma_node);
-+			if (pdev)
-+				dma_dev = &pdev->dev;
-+			of_node_put(dma_node);
-+			g_use_36bit_addrs = true;
-+		} else {
-+			dev_err(dev, "40-bit DMA controller not found\n");
-+			return -EINVAL;
-+		}
-+	}
-+
- 	/* Allocate space for the channels in coherent memory */
- 	slot_mem_size = PAGE_ALIGN(TOTAL_SLOTS * VCHIQ_SLOT_SIZE);
- 	frag_mem_size = PAGE_ALIGN(g_fragments_size * MAX_FRAGMENTS);
-@@ -501,13 +567,14 @@ static int vchiq_platform_init(struct pl
- 	}
- 
- 	WARN_ON(((unsigned long)slot_mem & (PAGE_SIZE - 1)) != 0);
-+	channelbase = slot_phys;
- 
- 	vchiq_slot_zero = vchiq_init_slots(slot_mem, slot_mem_size);
- 	if (!vchiq_slot_zero)
- 		return -EINVAL;
- 
- 	vchiq_slot_zero->platform_data[VCHIQ_PLATFORM_FRAGMENTS_OFFSET_IDX] =
--		(int)slot_phys + slot_mem_size;
-+		channelbase + slot_mem_size;
- 	vchiq_slot_zero->platform_data[VCHIQ_PLATFORM_FRAGMENTS_COUNT_IDX] =
- 		MAX_FRAGMENTS;
- 
-@@ -541,7 +608,6 @@ static int vchiq_platform_init(struct pl
- 	}
- 
- 	/* Send the base address of the slots to VideoCore */
--	channelbase = slot_phys;
- 	err = rpi_firmware_property(fw, RPI_FIRMWARE_VCHIQ_INIT,
- 				    &channelbase, sizeof(channelbase));
- 	if (err || channelbase) {
-@@ -549,6 +615,8 @@ static int vchiq_platform_init(struct pl
- 		return err ? : -ENXIO;
- 	}
- 
-+	g_dma_dev = dma_dev ?: dev;
-+
- 	vchiq_log_info(vchiq_arm_log_level, "vchiq_init - done (slots %pK, phys %pad)",
- 		       vchiq_slot_zero, &slot_phys);
- 
-@@ -1762,6 +1830,7 @@ void vchiq_platform_conn_state_changed(s
- static const struct of_device_id vchiq_of_match[] = {
- 	{ .compatible = "brcm,bcm2835-vchiq", .data = &bcm2835_drvdata },
- 	{ .compatible = "brcm,bcm2836-vchiq", .data = &bcm2836_drvdata },
-+	{ .compatible = "brcm,bcm2711-vchiq", .data = &bcm2711_drvdata },
- 	{},
- };
- MODULE_DEVICE_TABLE(of, vchiq_of_match);
-@@ -1794,22 +1863,8 @@ vchiq_register_child(struct platform_dev
- 
- 	child->dev.of_node = np;
- 
--	/*
--	 * We want the dma-ranges etc to be copied from a device with the
--	 * correct dma-ranges for the VPU.
--	 * VCHIQ on Pi4 is now under scb which doesn't get those dma-ranges.
--	 * Take the "dma" node as going to be suitable as it sees the world
--	 * through the same eyes as the VPU.
--	 */
--	np = of_find_node_by_path("dma");
--	if (!np)
--		np = pdev->dev.of_node;
--
- 	of_dma_configure(&child->dev, np, true);
- 
--	if (np != pdev->dev.of_node)
--		of_node_put(np);
--
- 	return child;
- }
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0329-staging-vchiq_arm-children-inherit-DMA-config.patch b/target/linux/bcm27xx/patches-6.1/950-0329-staging-vchiq_arm-children-inherit-DMA-config.patch
deleted file mode 100644
index 30b15fb03b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0329-staging-vchiq_arm-children-inherit-DMA-config.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From fa78b693940b9da1878353de758b2b6f69169b3a Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 21 Jul 2020 17:34:09 +0100
-Subject: [PATCH] staging: vchiq_arm: children inherit DMA config
-
-Although it is no longer necessary for vchiq's children to have a
-different DMA configuration to the parent, they do still need to
-explicitly to have their DMA configuration set - to be that of the
-parent.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- .../vc04_services/interface/vchiq_arm/vchiq_arm.c      | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-@@ -1863,8 +1863,18 @@ vchiq_register_child(struct platform_dev
- 
- 	child->dev.of_node = np;
- 
-+	/*
-+	 * We want the dma-ranges etc to be copied from the parent VCHIQ device
-+	 * to be passed on to the children without a node of their own.
-+	 */
-+	if (!np)
-+		np = pdev->dev.of_node;
-+
- 	of_dma_configure(&child->dev, np, true);
- 
-+	if (np != pdev->dev.of_node)
-+		of_node_put(np);
-+
- 	return child;
- }
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0330-staging-vchiq_arm-Usa-a-DMA-pool-for-small-bulks.patch b/target/linux/bcm27xx/patches-6.1/950-0330-staging-vchiq_arm-Usa-a-DMA-pool-for-small-bulks.patch
deleted file mode 100644
index 0f0f247480..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0330-staging-vchiq_arm-Usa-a-DMA-pool-for-small-bulks.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From dfbd92cb3b27855e388e17dc5035fa0e5fb70474 Mon Sep 17 00:00:00 2001
-From: detule <ogjoneski@gmail.com>
-Date: Tue, 2 Oct 2018 04:10:08 -0400
-Subject: [PATCH] staging: vchiq_arm: Usa a DMA pool for small bulks
-
-During a bulk transfer we request a DMA allocation to hold the
-scatter-gather list.  Most of the time, this allocation is small
-(<< PAGE_SIZE), however it can be requested at a high enough frequency
-to cause fragmentation and/or stress the CMA allocator (think time
-spent in compaction here, or during allocations elsewhere).
-
-Implement a pool to serve up small DMA allocations, falling back
-to a coherent allocation if the request is greater than
-VCHIQ_DMA_POOL_SIZE.
-
-Signed-off-by: Oliver Gjoneski <ogjoneski@gmail.com>
----
- .../interface/vchiq_arm/vchiq_arm.c           | 33 ++++++++++++++++---
- 1 file changed, 29 insertions(+), 4 deletions(-)
-
---- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-@@ -22,6 +22,7 @@
- #include <linux/platform_device.h>
- #include <linux/compat.h>
- #include <linux/dma-mapping.h>
-+#include <linux/dmapool.h>
- #include <linux/rcupdate.h>
- #include <linux/delay.h>
- #include <linux/slab.h>
-@@ -51,6 +52,8 @@
- 
- #define ARM_DS_ACTIVE	BIT(2)
- 
-+#define VCHIQ_DMA_POOL_SIZE PAGE_SIZE
-+
- /* Override the default prefix, which would be vchiq_arm (from the filename) */
- #undef MODULE_PARAM_PREFIX
- #define MODULE_PARAM_PREFIX DEVICE_NAME "."
-@@ -133,6 +136,7 @@ struct vchiq_pagelist_info {
- 	struct pagelist *pagelist;
- 	size_t pagelist_buffer_size;
- 	dma_addr_t dma_addr;
-+	bool is_from_pool;
- 	enum dma_data_direction dma_dir;
- 	unsigned int num_pages;
- 	unsigned int pages_need_release;
-@@ -153,6 +157,7 @@ static void __iomem *g_regs;
-  * of 32.
-  */
- static unsigned int g_cache_line_size = 32;
-+static struct dma_pool *g_dma_pool;
- static unsigned int g_use_36bit_addrs = 0;
- static unsigned int g_fragments_size;
- static char *g_fragments_base;
-@@ -195,8 +200,13 @@ cleanup_pagelistinfo(struct vchiq_instan
- 	if (pagelistinfo->pages_need_release)
- 		unpin_user_pages(pagelistinfo->pages, pagelistinfo->num_pages);
- 
--	dma_free_coherent(instance->state->dev, pagelistinfo->pagelist_buffer_size,
--			  pagelistinfo->pagelist, pagelistinfo->dma_addr);
-+	if (pagelistinfo->is_from_pool) {
-+		dma_pool_free(g_dma_pool, pagelistinfo->pagelist,
-+			      pagelistinfo->dma_addr);
-+	} else {
-+		dma_free_coherent(instance->state->dev, pagelistinfo->pagelist_buffer_size,
-+				  pagelistinfo->pagelist, pagelistinfo->dma_addr);
-+	}
- }
- 
- static inline bool
-@@ -231,6 +241,7 @@ create_pagelist(struct vchiq_instance *i
- 	u32 *addrs;
- 	unsigned int num_pages, offset, i, k;
- 	int actual_pages;
-+	bool is_from_pool;
- 	size_t pagelist_size;
- 	struct scatterlist *scatterlist, *sg;
- 	int dma_buffers;
-@@ -260,8 +271,14 @@ create_pagelist(struct vchiq_instance *i
- 	/* Allocate enough storage to hold the page pointers and the page
- 	 * list
- 	 */
--	pagelist = dma_alloc_coherent(instance->state->dev, pagelist_size, &dma_addr,
--				      GFP_KERNEL);
-+	if (pagelist_size > VCHIQ_DMA_POOL_SIZE) {
-+		pagelist = dma_alloc_coherent(instance->state->dev, pagelist_size, &dma_addr,
-+					      GFP_KERNEL);
-+		is_from_pool = false;
-+	} else {
-+		pagelist = dma_pool_alloc(g_dma_pool, GFP_KERNEL, &dma_addr);
-+		is_from_pool = true;
-+	}
- 
- 	vchiq_log_trace(vchiq_arm_log_level, "%s - %pK", __func__, pagelist);
- 
-@@ -282,6 +299,7 @@ create_pagelist(struct vchiq_instance *i
- 	pagelistinfo->pagelist = pagelist;
- 	pagelistinfo->pagelist_buffer_size = pagelist_size;
- 	pagelistinfo->dma_addr = dma_addr;
-+	pagelistinfo->is_from_pool = is_from_pool;
- 	pagelistinfo->dma_dir =  (type == PAGELIST_WRITE) ?
- 				  DMA_TO_DEVICE : DMA_FROM_DEVICE;
- 	pagelistinfo->num_pages = num_pages;
-@@ -616,6 +634,13 @@ static int vchiq_platform_init(struct pl
- 	}
- 
- 	g_dma_dev = dma_dev ?: dev;
-+	g_dma_pool = dmam_pool_create("vchiq_scatter_pool", dev,
-+				      VCHIQ_DMA_POOL_SIZE, g_cache_line_size,
-+				      0);
-+	if (!g_dma_pool) {
-+		dev_err(dev, "failed to create dma pool");
-+		return -ENOMEM;
-+	}
- 
- 	vchiq_log_info(vchiq_arm_log_level, "vchiq_init - done (slots %pK, phys %pad)",
- 		       vchiq_slot_zero, &slot_phys);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0331-drm-panel-raspberrypi-touchscreen-Handle-I2C-errors.patch b/target/linux/bcm27xx/patches-6.1/950-0331-drm-panel-raspberrypi-touchscreen-Handle-I2C-errors.patch
deleted file mode 100644
index 985c43c79e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0331-drm-panel-raspberrypi-touchscreen-Handle-I2C-errors.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 59f8ed6b3423efc893c752db80a066668b911d5f Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 8 Sep 2021 14:21:38 +0100
-Subject: [PATCH] drm/panel/raspberrypi-touchscreen: Handle I2C errors.
-
-rpi_touchscreen_i2c_read returns any errors from i2c_transfer,
-or the 8 bit received value.
-Check for error values before trying to process the data as
-valid.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
---- a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
-+++ b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
-@@ -297,13 +297,14 @@ static int rpi_touchscreen_noop(struct d
- static int rpi_touchscreen_prepare(struct drm_panel *panel)
- {
- 	struct rpi_touchscreen *ts = panel_to_ts(panel);
--	int i;
-+	int i, data;
- 
- 	rpi_touchscreen_i2c_write(ts, REG_POWERON, 1);
- 	usleep_range(20000, 25000);
- 	/* Wait for nPWRDWN to go low to indicate poweron is done. */
- 	for (i = 0; i < 100; i++) {
--		if (rpi_touchscreen_i2c_read(ts, REG_PORTB) & 1)
-+		data = rpi_touchscreen_i2c_read(ts, REG_PORTB);
-+		if (data >= 0 && (data & 1))
- 			break;
- 	}
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0332-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch b/target/linux/bcm27xx/patches-6.1/950-0332-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch
deleted file mode 100644
index fa6aaa3d19..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0332-drm-panel-simple-Add-a-timing-for-the-Raspberry-Pi-7.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 231e27c3d0f8a9dc323391fcbca5b48ca863a727 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 26 Mar 2021 17:06:36 +0000
-Subject: [PATCH] drm/panel-simple: Add a timing for the Raspberry Pi
- 7" panel
-
-The Raspberry Pi 7" 800x480 panel uses a Toshiba TC358762 DSI
-to DPI bridge chip, so there is a requirement for the timings
-to be specified for the end panel. Add such a definition.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/panel/panel-simple.c | 28 ++++++++++++++++++++++++++++
- 1 file changed, 28 insertions(+)
-
---- a/drivers/gpu/drm/panel/panel-simple.c
-+++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -3196,6 +3196,31 @@ static const struct panel_desc qishenglo
- 	.connector_type = DRM_MODE_CONNECTOR_DPI,
- };
- 
-+static const struct drm_display_mode raspberrypi_7inch_mode = {
-+	.clock = 25979400 / 1000,
-+	.hdisplay = 800,
-+	.hsync_start = 800 + 2,
-+	.hsync_end = 800 + 2 + 2,
-+	.htotal = 800 + 2 + 2 + 46,
-+	.vdisplay = 480,
-+	.vsync_start = 480 + 7,
-+	.vsync_end = 480 + 7 + 2,
-+	.vtotal = 480 + 7 + 2 + 21,
-+	.flags = DRM_MODE_FLAG_NVSYNC | DRM_MODE_FLAG_NHSYNC,
-+};
-+
-+static const struct panel_desc raspberrypi_7inch = {
-+	.modes = &raspberrypi_7inch_mode,
-+	.num_modes = 1,
-+	.bpc = 8,
-+	.size = {
-+		.width = 154,
-+		.height = 86,
-+	},
-+	.bus_format = MEDIA_BUS_FMT_RGB888_1X24,
-+	.connector_type = DRM_MODE_CONNECTOR_DSI,
-+};
-+
- static const struct display_timing rocktech_rk070er9427_timing = {
- 	.pixelclock = { 26400000, 33300000, 46800000 },
- 	.hactive = { 800, 800, 800 },
-@@ -4229,6 +4254,9 @@ static const struct of_device_id platfor
- 		.compatible = "qishenglong,gopher2b-lcd",
- 		.data = &qishenglong_gopher2b_lcd,
- 	}, {
-+		.compatible = "raspberrypi,7inch-dsi",
-+		.data = &raspberrypi_7inch,
-+	}, {
- 		.compatible = "rocktech,rk070er9427",
- 		.data = &rocktech_rk070er9427,
- 	}, {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0333-Input-edt-ft54x6-Clean-up-timer-and-workqueue-on-rem.patch b/target/linux/bcm27xx/patches-6.1/950-0333-Input-edt-ft54x6-Clean-up-timer-and-workqueue-on-rem.patch
deleted file mode 100644
index 223da15a19..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0333-Input-edt-ft54x6-Clean-up-timer-and-workqueue-on-rem.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1d2ab2a7cfba5a4298b0d06d05fdc0584c63c6f4 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 8 Sep 2021 14:46:17 +0100
-Subject: [PATCH] Input: edt-ft54x6: Clean up timer and workqueue on
- remove
-
-If no interrupt is defined then a timer and workqueue are used
-to poll the controller.
-On remove these were not being cleaned up correctly.
-
-Fixes: ca61fdaba79f "Input: edt-ft5x06: Poll the device if no interrupt is
-configured."
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/input/touchscreen/edt-ft5x06.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/input/touchscreen/edt-ft5x06.c
-+++ b/drivers/input/touchscreen/edt-ft5x06.c
-@@ -1381,6 +1381,10 @@ static void edt_ft5x06_ts_remove(struct
- {
- 	struct edt_ft5x06_ts_data *tsdata = i2c_get_clientdata(client);
- 
-+	if (!client->irq) {
-+		del_timer(&tsdata->timer);
-+		cancel_work_sync(&tsdata->work_i2c_poll);
-+	}
- 	edt_ft5x06_ts_teardown_debugfs(tsdata);
- }
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0334-staging-vchiq-mmal-Add-buffer-flags-for-interlaced-v.patch b/target/linux/bcm27xx/patches-6.1/950-0334-staging-vchiq-mmal-Add-buffer-flags-for-interlaced-v.patch
deleted file mode 100644
index 4c4c0ffa69..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0334-staging-vchiq-mmal-Add-buffer-flags-for-interlaced-v.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 346b7aa8f5b44101fc0c43eca615c26755c89e12 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Sun, 10 Jan 2021 19:05:17 +0000
-Subject: [PATCH] staging/vchiq-mmal: Add buffer flags for interlaced
- video
-
-Add the buffer flags that the firmware uses to identify fields
-on interlaced video
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../vc04_services/vchiq-mmal/mmal-msg.h       | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
---- a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h
-+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h
-@@ -253,6 +253,25 @@ struct mmal_msg_port_action_reply {
- /* Signals that a buffer failed to be transmitted */
- #define MMAL_BUFFER_HEADER_FLAG_TRANSMISSION_FAILED    BIT(10)
- 
-+/* Video buffer header flags
-+ * videobufferheaderflags
-+ * The following flags describe properties of a video buffer header.
-+ * As there is no collision with the MMAL_BUFFER_HEADER_FLAGS_ defines, these
-+ * flags will also be present in the MMAL_BUFFER_HEADER_T flags field.
-+ */
-+#define MMAL_BUFFER_HEADER_FLAG_FORMAT_SPECIFIC_START_BIT 16
-+#define MMAL_BUFFER_HEADER_FLAG_FORMAT_SPECIFIC_START \
-+			(1 << MMAL_BUFFER_HEADER_FLAG_FORMAT_SPECIFIC_START_BIT)
-+/* Signals an interlaced video frame */
-+#define MMAL_BUFFER_HEADER_VIDEO_FLAG_INTERLACED \
-+			(MMAL_BUFFER_HEADER_FLAG_FORMAT_SPECIFIC_START << 0)
-+/*
-+ * Signals that the top field of the current interlaced frame should be
-+ * displayed first
-+ */
-+#define MMAL_BUFFER_HEADER_VIDEO_FLAG_TOP_FIELD_FIRST \
-+			(MMAL_BUFFER_HEADER_FLAG_FORMAT_SPECIFIC_START << 1)
-+
- struct mmal_driver_buffer {
- 	u32 magic;
- 	u32 component_handle;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0335-staging-vchiq-mmal-Add-parameters-for-interlaced-vid.patch b/target/linux/bcm27xx/patches-6.1/950-0335-staging-vchiq-mmal-Add-parameters-for-interlaced-vid.patch
deleted file mode 100644
index 130ce59193..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0335-staging-vchiq-mmal-Add-parameters-for-interlaced-vid.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 72f32ce98a5414dd6b2b20ea4e983d7cbc6eaf8b Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 5 Aug 2021 16:38:34 +0100
-Subject: [PATCH] staging/vchiq-mmal: Add parameters for interlaced
- video support
-
-Adds enum mmal_interlace_type and struct
-mmal_parameter_video_interlace_type to allow for querying the
-interlacing mode on decoders.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../vchiq-mmal/mmal-parameters.h              | 37 +++++++++++++++++++
- 1 file changed, 37 insertions(+)
-
---- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
-+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
-@@ -811,6 +811,43 @@ struct mmal_parameter_displayregion {
- 	u32 alpha;
- };
- 
-+enum mmal_interlace_type {
-+	/* The data is not interlaced, it is progressive scan */
-+	MMAL_INTERLACE_PROGRESSIVE,
-+	/*
-+	 * The data is interlaced, fields sent separately in temporal order, with
-+	 * upper field first
-+	 */
-+	MMAL_INTERLACE_FIELD_SINGLE_UPPER_FIRST,
-+	/*
-+	 * The data is interlaced, fields sent separately in temporal order, with
-+	 * lower field first
-+	 */
-+	MMAL_INTERLACE_FIELD_SINGLE_LOWER_FIRST,
-+	/*
-+	 * The data is interlaced, two fields sent together line interleaved,
-+	 * with the upper field temporally earlier
-+	 */
-+	MMAL_INTERLACE_FIELDS_INTERLEAVED_UPPER_FIRST,
-+	/*
-+	 * The data is interlaced, two fields sent together line interleaved,
-+	 * with the lower field temporally earlier
-+	 */
-+	MMAL_INTERLACE_FIELDS_INTERLEAVED_LOWER_FIRST,
-+	/*
-+	 * The stream may contain a mixture of progressive and interlaced
-+	 * frames
-+	 */
-+	MMAL_INTERLACE_MIXED,
-+
-+	MMAL_INTERLACE_DUMMY = 0x7FFFFFFF
-+};
-+
-+struct mmal_parameter_video_interlace_type {
-+	enum mmal_interlace_type mode;	/* The interlace type of the content */
-+	u32 bRepeatFirstField;		/* Whether to repeat the first field */
-+};
-+
- #define MMAL_MAX_IMAGEFX_PARAMETERS 5
- 
- struct mmal_parameter_imagefx_parameters {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0336-staging-vchiq-mmal-Add-the-deinterlace-image-effects.patch b/target/linux/bcm27xx/patches-6.1/950-0336-staging-vchiq-mmal-Add-the-deinterlace-image-effects.patch
deleted file mode 100644
index 07bc43cd13..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0336-staging-vchiq-mmal-Add-the-deinterlace-image-effects.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 03858fd82aa88a6ae491128cd757d37ce11e85f7 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 6 Aug 2021 15:44:21 +0100
-Subject: [PATCH] staging/vchiq-mmal: Add the deinterlace image effects
- enums
-
-As we're wanting to wrap the image_fx component for deinterlacing,
-add the deinterlace algorithm values to enum mmal_parameter_imagefx
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
-+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
-@@ -397,6 +397,9 @@ enum mmal_parameter_imagefx {
- 	MMAL_PARAM_IMAGEFX_COLOURPOINT,
- 	MMAL_PARAM_IMAGEFX_COLOURBALANCE,
- 	MMAL_PARAM_IMAGEFX_CARTOON,
-+	MMAL_PARAM_IMAGEFX_DEINTERLACE_DOUBLE,
-+	MMAL_PARAM_IMAGEFX_DEINTERLACE_ADV,
-+	MMAL_PARAM_IMAGEFX_DEINTERLACE_FAST,
- };
- 
- enum MMAL_PARAM_FLICKERAVOID {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0337-Add-Raspberry-Pi-PoE-HAT-support.patch b/target/linux/bcm27xx/patches-6.1/950-0337-Add-Raspberry-Pi-PoE-HAT-support.patch
deleted file mode 100644
index 773e7b8b02..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0337-Add-Raspberry-Pi-PoE-HAT-support.patch
+++ /dev/null
@@ -1,268 +0,0 @@
-From 74481ea65f3ebb77c7c02040ecd3b0d4cffb8e9e Mon Sep 17 00:00:00 2001
-From: Serge Schneider <serge@raspberrypi.com>
-Date: Mon, 2 Dec 2019 14:48:05 +0000
-Subject: [PATCH] Add Raspberry Pi PoE+ HAT support
-
-Signed-off-by: Serge Schneider <serge@raspberrypi.com>
----
- drivers/power/supply/Kconfig         |   6 +
- drivers/power/supply/Makefile        |   1 +
- drivers/power/supply/rpi_poe_power.c | 227 +++++++++++++++++++++++++++
- 3 files changed, 234 insertions(+)
- create mode 100644 drivers/power/supply/rpi_poe_power.c
-
---- a/drivers/power/supply/Kconfig
-+++ b/drivers/power/supply/Kconfig
-@@ -28,6 +28,12 @@ config POWER_SUPPLY_HWMON
- 	  Say 'Y' here if you want power supplies to
- 	  have hwmon sysfs interface too.
- 
-+config RPI_POE_POWER
-+	tristate "Raspberry Pi PoE+ HAT power supply driver"
-+	depends on RASPBERRYPI_FIRMWARE
-+	help
-+	  Say Y here to enable support for Raspberry Pi PoE+ (Power over Ethernet
-+	  Plus) HAT current measurement.
- 
- config PDA_POWER
- 	tristate "Generic PDA/phone power driver"
---- a/drivers/power/supply/Makefile
-+++ b/drivers/power/supply/Makefile
-@@ -9,6 +9,7 @@ obj-$(CONFIG_POWER_SUPPLY)	+= power_supp
- obj-$(CONFIG_POWER_SUPPLY_HWMON) += power_supply_hwmon.o
- obj-$(CONFIG_GENERIC_ADC_BATTERY)	+= generic-adc-battery.o
- 
-+obj-$(CONFIG_RPI_POE_POWER)	+= rpi_poe_power.o
- obj-$(CONFIG_PDA_POWER)		+= pda_power.o
- obj-$(CONFIG_APM_POWER)		+= apm_power.o
- obj-$(CONFIG_AXP20X_POWER)	+= axp20x_usb_power.o
---- /dev/null
-+++ b/drivers/power/supply/rpi_poe_power.c
-@@ -0,0 +1,227 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * rpi-poe-power.c - Raspberry Pi PoE+ HAT power supply driver.
-+ *
-+ * Copyright (C) 2019 Raspberry Pi (Trading) Ltd.
-+ * Based on axp20x_ac_power.c by Quentin Schulz <quentin.schulz@free-electrons.com>
-+ *
-+ * Author: Serge Schneider <serge@raspberrypi.org>
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/platform_device.h>
-+#include <linux/power_supply.h>
-+#include <soc/bcm2835/raspberrypi-firmware.h>
-+
-+#define RPI_POE_ADC_REG			0x2
-+#define RPI_POE_FLAG_REG		0x4
-+
-+#define RPI_POE_FLAG_AT			BIT(0)
-+#define RPI_POE_FLAG_OC			BIT(1)
-+
-+#define RPI_POE_CURRENT_AF_MAX	(2500 * 1000)
-+#define RPI_POE_CURRENT_AT_MAX	(5000 * 1000)
-+
-+#define DRVNAME "rpi-poe-power-supply"
-+
-+struct rpi_poe_power_supply_ctx {
-+	struct power_supply *supply;
-+	struct rpi_firmware *fw;
-+};
-+
-+struct fw_tag_data_s {
-+	u32 reg;
-+	u32 val;
-+	u32 ret;
-+};
-+
-+static int write_reg(struct rpi_firmware *fw, u32 reg, u32 *val)
-+{
-+	struct fw_tag_data_s fw_tag_data = {
-+		.reg = reg,
-+		.val = *val
-+	};
-+	int ret;
-+
-+	ret = rpi_firmware_property(fw, RPI_FIRMWARE_SET_POE_HAT_VAL,
-+				    &fw_tag_data, sizeof(fw_tag_data));
-+	if (ret)
-+		return ret;
-+	else if (fw_tag_data.ret)
-+		return -EIO;
-+	return 0;
-+}
-+
-+static int read_reg(struct rpi_firmware *fw, u32 reg, u32 *val)
-+{
-+	struct fw_tag_data_s fw_tag_data = {
-+		.reg = reg,
-+		.val = *val
-+	};
-+	int ret;
-+
-+	ret = rpi_firmware_property(fw, RPI_FIRMWARE_GET_POE_HAT_VAL,
-+				    &fw_tag_data, sizeof(fw_tag_data));
-+	if (ret)
-+		return ret;
-+	else if (fw_tag_data.ret)
-+		return -EIO;
-+
-+	*val = fw_tag_data.val;
-+	return 0;
-+}
-+
-+static int rpi_poe_power_supply_get_property(struct power_supply *psy,
-+					enum power_supply_property psp,
-+					union power_supply_propval *r_val)
-+{
-+	struct rpi_poe_power_supply_ctx *ctx = power_supply_get_drvdata(psy);
-+	int ret;
-+	unsigned int val = 0;
-+
-+	switch (psp) {
-+	case POWER_SUPPLY_PROP_HEALTH:
-+		ret = read_reg(ctx->fw, RPI_POE_FLAG_REG, &val);
-+		if (ret)
-+			return ret;
-+
-+		if (val & RPI_POE_FLAG_OC) {
-+			r_val->intval = POWER_SUPPLY_HEALTH_UNSPEC_FAILURE;
-+			val = RPI_POE_FLAG_OC;
-+			ret = write_reg(ctx->fw, RPI_POE_FLAG_REG, &val);
-+			if (ret)
-+				return ret;
-+			return 0;
-+		}
-+
-+		r_val->intval = POWER_SUPPLY_HEALTH_GOOD;
-+		return 0;
-+
-+	case POWER_SUPPLY_PROP_ONLINE:
-+		ret = read_reg(ctx->fw, RPI_POE_ADC_REG, &val);
-+		if (ret)
-+			return ret;
-+
-+		r_val->intval = (val > 5);
-+		return 0;
-+
-+	case POWER_SUPPLY_PROP_CURRENT_AVG:
-+		val = 50;
-+		ret = read_reg(ctx->fw, RPI_POE_ADC_REG, &val);
-+		if (ret)
-+			return ret;
-+		val = (val * 3300)/9821;
-+		r_val->intval = val * 1000;
-+		return 0;
-+
-+	case POWER_SUPPLY_PROP_CURRENT_NOW:
-+		ret = read_reg(ctx->fw, RPI_POE_ADC_REG, &val);
-+		if (ret)
-+			return ret;
-+		val = (val * 3300)/9821;
-+		r_val->intval = val * 1000;
-+		return 0;
-+
-+	case POWER_SUPPLY_PROP_CURRENT_MAX:
-+		ret = read_reg(ctx->fw, RPI_POE_FLAG_REG, &val);
-+		if (ret)
-+			return ret;
-+
-+		if (val & RPI_POE_FLAG_AT) {
-+			r_val->intval = RPI_POE_CURRENT_AT_MAX;
-+			return 0;
-+		}
-+		r_val->intval = RPI_POE_CURRENT_AF_MAX;
-+		return 0;
-+
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	return -EINVAL;
-+}
-+
-+static enum power_supply_property rpi_poe_power_supply_properties[] = {
-+	POWER_SUPPLY_PROP_HEALTH,
-+	POWER_SUPPLY_PROP_ONLINE,
-+	POWER_SUPPLY_PROP_CURRENT_AVG,
-+	POWER_SUPPLY_PROP_CURRENT_NOW,
-+	POWER_SUPPLY_PROP_CURRENT_MAX,
-+};
-+
-+static const struct power_supply_desc rpi_poe_power_supply_desc = {
-+	.name = "rpi-poe",
-+	.type = POWER_SUPPLY_TYPE_MAINS,
-+	.properties = rpi_poe_power_supply_properties,
-+	.num_properties = ARRAY_SIZE(rpi_poe_power_supply_properties),
-+	.get_property = rpi_poe_power_supply_get_property,
-+};
-+
-+static int rpi_poe_power_supply_probe(struct platform_device *pdev)
-+{
-+	struct power_supply_config psy_cfg = {};
-+	struct rpi_poe_power_supply_ctx *ctx;
-+	struct device_node *fw_node;
-+	u32 revision;
-+
-+	if (!of_device_is_available(pdev->dev.of_node))
-+		return -ENODEV;
-+
-+	fw_node = of_parse_phandle(pdev->dev.of_node, "firmware", 0);
-+	if (!fw_node) {
-+		dev_err(&pdev->dev, "Missing firmware node\n");
-+		return -ENOENT;
-+	}
-+
-+	ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);
-+	if (!ctx)
-+		return -ENOMEM;
-+
-+	ctx->fw = rpi_firmware_get(fw_node);
-+	if (!ctx->fw)
-+		return -EPROBE_DEFER;
-+	if (rpi_firmware_property(ctx->fw,
-+			RPI_FIRMWARE_GET_FIRMWARE_REVISION,
-+			&revision, sizeof(revision))) {
-+		dev_err(&pdev->dev, "Failed to get firmware revision\n");
-+		return -ENOENT;
-+	}
-+	if (revision < 0x60af72e8) {
-+		dev_err(&pdev->dev, "Unsupported firmware\n");
-+		return -ENOENT;
-+	}
-+	platform_set_drvdata(pdev, ctx);
-+
-+	psy_cfg.of_node = pdev->dev.of_node;
-+	psy_cfg.drv_data = ctx;
-+
-+	ctx->supply = devm_power_supply_register(&pdev->dev,
-+						   &rpi_poe_power_supply_desc,
-+						   &psy_cfg);
-+	if (IS_ERR(ctx->supply))
-+		return PTR_ERR(ctx->supply);
-+
-+	return 0;
-+}
-+
-+static const struct of_device_id of_rpi_poe_power_supply_match[] = {
-+	{ .compatible = "raspberrypi,rpi-poe-power-supply", },
-+	{ /* sentinel */ }
-+};
-+MODULE_DEVICE_TABLE(of, of_rpi_poe_power_supply_match);
-+
-+static struct platform_driver rpi_poe_power_supply_driver = {
-+	.probe = rpi_poe_power_supply_probe,
-+	.driver = {
-+		.name = DRVNAME,
-+		.of_match_table = of_rpi_poe_power_supply_match
-+	},
-+};
-+
-+module_platform_driver(rpi_poe_power_supply_driver);
-+
-+MODULE_AUTHOR("Serge Schneider <serge@raspberrypi.org>");
-+MODULE_ALIAS("platform:" DRVNAME);
-+MODULE_DESCRIPTION("Raspberry Pi PoE+ HAT power supply driver");
-+MODULE_LICENSE("GPL");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0338-staging-mmal-vchiq-Rationalise-included-headers.patch b/target/linux/bcm27xx/patches-6.1/950-0338-staging-mmal-vchiq-Rationalise-included-headers.patch
deleted file mode 100644
index 68ced6d37f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0338-staging-mmal-vchiq-Rationalise-included-headers.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 0313c767d00d9f2113747d0efcb7ef40ed9022b6 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 15 Sep 2021 17:49:41 +0100
-Subject: [PATCH] staging/mmal-vchiq: Rationalise included headers
-
-The list of includes was slightly over generic, and wasn't
-in alphabetical order. Clean it up.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
---- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-@@ -15,16 +15,15 @@
- 
- #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
- 
-+#include <linux/completion.h>
- #include <linux/errno.h>
- #include <linux/kernel.h>
-+#include <linux/mm.h>
- #include <linux/module.h>
- #include <linux/mutex.h>
--#include <linux/mm.h>
--#include <linux/slab.h>
--#include <linux/completion.h>
--#include <linux/vmalloc.h>
- #include <linux/raspberrypi/vchiq.h>
--#include <media/videobuf2-vmalloc.h>
-+#include <linux/vmalloc.h>
-+#include <media/videobuf2-v4l2.h>
- 
- #include "mmal-common.h"
- #include "mmal-parameters.h"
diff --git a/target/linux/bcm27xx/patches-6.1/950-0339-staging-mmal-vchiq-Add-module-parameter-to-enable-lo.patch b/target/linux/bcm27xx/patches-6.1/950-0339-staging-mmal-vchiq-Add-module-parameter-to-enable-lo.patch
deleted file mode 100644
index 9fef146bfb..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0339-staging-mmal-vchiq-Add-module-parameter-to-enable-lo.patch
+++ /dev/null
@@ -1,314 +0,0 @@
-From 63d550818a9470a88fa5dbe1b05bd8839ab40ab0 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 15 Sep 2021 17:54:11 +0100
-Subject: [PATCH] staging/mmal-vchiq: Add module parameter to enable
- logging.
-
-Adds a module parameter "debug" to enable various logging levels.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../vc04_services/vchiq-mmal/mmal-vchiq.c     | 140 ++++++++++--------
- 1 file changed, 78 insertions(+), 62 deletions(-)
-
---- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-@@ -31,6 +31,17 @@
- #include "mmal-msg.h"
- 
- #include "vc-sm-cma/vc_sm_knl.h"
-+
-+#define pr_dbg_lvl(__level, __debug, __fmt, __arg...)		\
-+	do {							\
-+		if (__debug >= (__level))			\
-+			printk(KERN_DEBUG __fmt, ##__arg);	\
-+	} while (0)
-+
-+static unsigned int debug;
-+module_param(debug, uint, 0644);
-+MODULE_PARM_DESC(debug, "activates debug info (0-3)");
-+
- /*
-  * maximum number of components supported.
-  * This matches the maximum permitted by default on the VPU
-@@ -378,7 +389,8 @@ buffer_from_host(struct vchiq_mmal_insta
- 	if (!port->enabled)
- 		return -EINVAL;
- 
--	pr_debug("instance:%u buffer:%p\n", instance->service_handle, buf);
-+	pr_dbg_lvl(3, debug, "instance:%u buffer:%p\n",
-+		   instance->service_handle, buf);
- 
- 	/* get context */
- 	if (!buf->msg_context) {
-@@ -546,11 +558,11 @@ static void event_to_host_cb(struct vchi
- 		msg_context->u.bulk.pts = MMAL_TIME_UNKNOWN;
- 		msg_context->u.bulk.cmd = msg->u.event_to_host.cmd;
- 
--		pr_debug("event component:%u port type:%d num:%d cmd:0x%x length:%d\n",
--			 msg->u.event_to_host.client_component,
--			 msg->u.event_to_host.port_type,
--			 msg->u.event_to_host.port_num,
--			 msg->u.event_to_host.cmd, msg->u.event_to_host.length);
-+		pr_dbg_lvl(3, debug, "event component:%u port type:%d num:%d cmd:0x%x length:%d\n",
-+			   msg->u.event_to_host.client_component,
-+			   msg->u.event_to_host.port_type,
-+			   msg->u.event_to_host.port_num,
-+			   msg->u.event_to_host.cmd, msg->u.event_to_host.length);
- 	}
- 
- 	schedule_work(&msg_context->u.bulk.work);
-@@ -563,8 +575,8 @@ static void buffer_to_host_cb(struct vch
- 	struct mmal_msg_context *msg_context;
- 	u32 handle;
- 
--	pr_debug("%s: instance:%p msg:%p msg_len:%d\n",
--		 __func__, instance, msg, msg_len);
-+	pr_dbg_lvl(3, debug, "%s: instance:%p msg:%p msg_len:%d\n",
-+		   __func__, instance, msg, msg_len);
- 
- 	if (msg->u.buffer_from_host.drvbuf.magic == MMAL_MAGIC) {
- 		handle = msg->u.buffer_from_host.drvbuf.client_context;
-@@ -835,39 +847,42 @@ static int send_synchronous_mmal_msg(str
- 
- static void dump_port_info(struct vchiq_mmal_port *port)
- {
--	pr_debug("port handle:0x%x enabled:%d\n", port->handle, port->enabled);
-+	pr_dbg_lvl(3, debug, "port handle:0x%x enabled:%d\n", port->handle,
-+		   port->enabled);
- 
--	pr_debug("buffer minimum num:%d size:%d align:%d\n",
--		 port->minimum_buffer.num,
--		 port->minimum_buffer.size, port->minimum_buffer.alignment);
--
--	pr_debug("buffer recommended num:%d size:%d align:%d\n",
--		 port->recommended_buffer.num,
--		 port->recommended_buffer.size,
--		 port->recommended_buffer.alignment);
--
--	pr_debug("buffer current values num:%d size:%d align:%d\n",
--		 port->current_buffer.num,
--		 port->current_buffer.size, port->current_buffer.alignment);
--
--	pr_debug("elementary stream: type:%d encoding:0x%x variant:0x%x\n",
--		 port->format.type,
--		 port->format.encoding, port->format.encoding_variant);
-+	pr_dbg_lvl(3, debug, "buffer minimum num:%d size:%d align:%d\n",
-+		   port->minimum_buffer.num,
-+		   port->minimum_buffer.size, port->minimum_buffer.alignment);
-+
-+	pr_dbg_lvl(3, debug, "buffer recommended num:%d size:%d align:%d\n",
-+		   port->recommended_buffer.num,
-+		   port->recommended_buffer.size,
-+		   port->recommended_buffer.alignment);
-+
-+	pr_dbg_lvl(3, debug, "buffer current values num:%d size:%d align:%d\n",
-+		   port->current_buffer.num,
-+		   port->current_buffer.size, port->current_buffer.alignment);
-+
-+	pr_dbg_lvl(3, debug, "elementary stream: type:%d encoding:0x%x variant:0x%x\n",
-+		   port->format.type,
-+		   port->format.encoding, port->format.encoding_variant);
- 
--	pr_debug("		    bitrate:%d flags:0x%x\n",
--		 port->format.bitrate, port->format.flags);
-+	pr_dbg_lvl(3, debug, "		    bitrate:%d flags:0x%x\n",
-+		   port->format.bitrate, port->format.flags);
- 
- 	if (port->format.type == MMAL_ES_TYPE_VIDEO) {
--		pr_debug
--		    ("es video format: width:%d height:%d colourspace:0x%x\n",
-+		pr_dbg_lvl(3, debug,
-+		    "es video format: width:%d height:%d colourspace:0x%x\n",
- 		     port->es.video.width, port->es.video.height,
- 		     port->es.video.color_space);
- 
--		pr_debug("		 : crop xywh %d,%d,%d,%d\n",
-+		pr_dbg_lvl(3, debug,
-+			 "		 : crop xywh %d,%d,%d,%d\n",
- 			 port->es.video.crop.x,
- 			 port->es.video.crop.y,
- 			 port->es.video.crop.width, port->es.video.crop.height);
--		pr_debug("		 : framerate %d/%d  aspect %d/%d\n",
-+		pr_dbg_lvl(3, debug,
-+			 "		 : framerate %d/%d  aspect %d/%d\n",
- 			 port->es.video.frame_rate.numerator,
- 			 port->es.video.frame_rate.denominator,
- 			 port->es.video.par.numerator, port->es.video.par.denominator);
-@@ -901,7 +916,7 @@ static int port_info_set(struct vchiq_mm
- 	struct mmal_msg *rmsg;
- 	struct vchiq_header *rmsg_handle;
- 
--	pr_debug("setting port info port %p\n", port);
-+	pr_dbg_lvl(1, debug, "setting port info port %p\n", port);
- 	if (!port)
- 		return -1;
- 	dump_port_info(port);
-@@ -944,8 +959,8 @@ static int port_info_set(struct vchiq_mm
- 	/* return operation status */
- 	ret = -rmsg->u.port_info_get_reply.status;
- 
--	pr_debug("%s:result:%d component:0x%x port:%d\n", __func__, ret,
--		 port->component->handle, port->handle);
-+	pr_dbg_lvl(1, debug, "%s:result:%d component:0x%x port:%d\n", __func__,
-+		   ret, port->component->handle, port->handle);
- 
- release_msg:
- 	vchiq_release_message(instance->vchiq_instance, instance->service_handle, rmsg_handle);
-@@ -1035,13 +1050,13 @@ static int port_info_get(struct vchiq_mm
- 	       rmsg->u.port_info_get_reply.extradata,
- 	       port->format.extradata_size);
- 
--	pr_debug("received port info\n");
-+	pr_dbg_lvl(1, debug, "received port info\n");
- 	dump_port_info(port);
- 
- release_msg:
- 
--	pr_debug("%s:result:%d component:0x%x port:%d\n",
--		 __func__, ret, port->component->handle, port->handle);
-+	pr_dbg_lvl(1, debug, "%s:result:%d component:0x%x port:%d\n",
-+		   __func__, ret, port->component->handle, port->handle);
- 
- 	vchiq_release_message(instance->vchiq_instance, instance->service_handle, rmsg_handle);
- 
-@@ -1087,9 +1102,9 @@ static int create_component(struct vchiq
- 	component->outputs = rmsg->u.component_create_reply.output_num;
- 	component->clocks = rmsg->u.component_create_reply.clock_num;
- 
--	pr_debug("Component handle:0x%x in:%d out:%d clock:%d\n",
--		 component->handle,
--		 component->inputs, component->outputs, component->clocks);
-+	pr_dbg_lvl(2, debug, "Component handle:0x%x in:%d out:%d clock:%d\n",
-+		   component->handle,
-+		   component->inputs, component->outputs, component->clocks);
- 
- release_msg:
- 	vchiq_release_message(instance->vchiq_instance, instance->service_handle, rmsg_handle);
-@@ -1258,10 +1273,9 @@ static int port_action_port(struct vchiq
- 
- 	ret = -rmsg->u.port_action_reply.status;
- 
--	pr_debug("%s:result:%d component:0x%x port:%d action:%s(%d)\n",
--		 __func__,
--		 ret, port->component->handle, port->handle,
--		 port_action_type_names[action_type], action_type);
-+	pr_dbg_lvl(2, debug, "%s:result:%d component:0x%x port:%d action:%s(%d)\n",
-+		   __func__, ret, port->component->handle, port->handle,
-+		   port_action_type_names[action_type], action_type);
- 
- release_msg:
- 	vchiq_release_message(instance->vchiq_instance, instance->service_handle, rmsg_handle);
-@@ -1305,11 +1319,11 @@ static int port_action_handle(struct vch
- 
- 	ret = -rmsg->u.port_action_reply.status;
- 
--	pr_debug("%s:result:%d component:0x%x port:%d action:%s(%d) connect component:0x%x connect port:%d\n",
--		 __func__,
--		 ret, port->component->handle, port->handle,
--		 port_action_type_names[action_type],
--		 action_type, connect_component_handle, connect_port_handle);
-+	pr_dbg_lvl(2, debug,
-+		   "%s:result:%d component:0x%x port:%d action:%s(%d) connect component:0x%x connect port:%d\n",
-+		   __func__, ret, port->component->handle, port->handle,
-+		   port_action_type_names[action_type],
-+		   action_type, connect_component_handle, connect_port_handle);
- 
- release_msg:
- 	vchiq_release_message(instance->vchiq_instance, instance->service_handle, rmsg_handle);
-@@ -1348,9 +1362,9 @@ static int port_parameter_set(struct vch
- 
- 	ret = -rmsg->u.port_parameter_set_reply.status;
- 
--	pr_debug("%s:result:%d component:0x%x port:%d parameter:%d\n",
--		 __func__,
--		 ret, port->component->handle, port->handle, parameter_id);
-+	pr_dbg_lvl(1, debug, "%s:result:%d component:0x%x port:%d parameter:%d\n",
-+		   __func__, ret, port->component->handle, port->handle,
-+		   parameter_id);
- 
- release_msg:
- 	vchiq_release_message(instance->vchiq_instance, instance->service_handle, rmsg_handle);
-@@ -1408,8 +1422,9 @@ static int port_parameter_get(struct vch
- 	/* Always report the size of the returned parameter to the caller */
- 	*value_size = rmsg->u.port_parameter_get_reply.size;
- 
--	pr_debug("%s:result:%d component:0x%x port:%d parameter:%d\n", __func__,
--		 ret, port->component->handle, port->handle, parameter_id);
-+	pr_dbg_lvl(1, debug, "%s:result:%d component:0x%x port:%d parameter:%d\n",
-+		   __func__, ret, port->component->handle, port->handle,
-+		   parameter_id);
- 
- release_msg:
- 	vchiq_release_message(instance->vchiq_instance, instance->service_handle, rmsg_handle);
-@@ -1666,7 +1681,7 @@ int vchiq_mmal_port_connect_tunnel(struc
- 	if (!dst) {
- 		/* do not make new connection */
- 		ret = 0;
--		pr_debug("not making new connection\n");
-+		pr_dbg_lvl(3, debug, "not making new connection\n");
- 		goto release_unlock;
- 	}
- 
-@@ -1684,14 +1699,14 @@ int vchiq_mmal_port_connect_tunnel(struc
- 	/* set new format */
- 	ret = port_info_set(instance, dst);
- 	if (ret) {
--		pr_debug("setting port info failed\n");
-+		pr_dbg_lvl(1, debug, "setting port info failed\n");
- 		goto release_unlock;
- 	}
- 
- 	/* read what has actually been set */
- 	ret = port_info_get(instance, dst);
- 	if (ret) {
--		pr_debug("read back port info failed\n");
-+		pr_dbg_lvl(1, debug, "read back port info failed\n");
- 		goto release_unlock;
- 	}
- 
-@@ -1700,9 +1715,9 @@ int vchiq_mmal_port_connect_tunnel(struc
- 				 MMAL_MSG_PORT_ACTION_TYPE_CONNECT,
- 				 dst->component->handle, dst->handle);
- 	if (ret < 0) {
--		pr_debug("connecting port %d:%d to %d:%d failed\n",
--			 src->component->handle, src->handle,
--			 dst->component->handle, dst->handle);
-+		pr_dbg_lvl(2, debug, "connecting port %d:%d to %d:%d failed\n",
-+			   src->component->handle, src->handle,
-+			   dst->component->handle, dst->handle);
- 		goto release_unlock;
- 	}
- 	src->connected = dst;
-@@ -1727,7 +1742,8 @@ int vchiq_mmal_submit_buffer(struct vchi
- 	 * videobuf2 won't let us have the dmabuf there.
- 	 */
- 	if (port->zero_copy && buffer->dma_buf && !buffer->vcsm_handle) {
--		pr_debug("%s: import dmabuf %p\n", __func__, buffer->dma_buf);
-+		pr_dbg_lvl(2, debug, "%s: import dmabuf %p\n",
-+			   __func__, buffer->dma_buf);
- 		ret = vc_sm_cma_import_dmabuf(buffer->dma_buf,
- 					      &buffer->vcsm_handle);
- 		if (ret) {
-@@ -1743,8 +1759,8 @@ int vchiq_mmal_submit_buffer(struct vchi
- 			vc_sm_cma_free(buffer->vcsm_handle);
- 			return ret;
- 		}
--		pr_debug("%s: import dmabuf %p - got vc handle %08X\n",
--			 __func__, buffer->dma_buf, buffer->vc_handle);
-+		pr_dbg_lvl(2, debug, "%s: import dmabuf %p - got vc handle %08X\n",
-+			   __func__, buffer->dma_buf, buffer->vc_handle);
- 	}
- 
- 	ret = buffer_from_host(instance, port, buffer);
-@@ -1783,8 +1799,8 @@ int mmal_vchi_buffer_cleanup(struct mmal
- 	if (buf->vcsm_handle) {
- 		int ret;
- 
--		pr_debug("%s: vc_sm_cma_free on handle %p\n", __func__,
--			 buf->vcsm_handle);
-+		pr_dbg_lvl(2, debug, "%s: vc_sm_cma_free on handle %p\n", __func__,
-+			   buf->vcsm_handle);
- 		ret = vc_sm_cma_free(buf->vcsm_handle);
- 		if (ret)
- 			pr_err("%s: vcsm_free failed, ret %d\n", __func__, ret);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0340-staging-mmal-vchiq-Reset-buffers_with_vpu-on-port_en.patch b/target/linux/bcm27xx/patches-6.1/950-0340-staging-mmal-vchiq-Reset-buffers_with_vpu-on-port_en.patch
deleted file mode 100644
index 8b7eb58b73..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0340-staging-mmal-vchiq-Reset-buffers_with_vpu-on-port_en.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 10f20f30bb2617ec138ca456b059c164c8a4b03c Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 21 Sep 2021 17:17:57 +0100
-Subject: [PATCH] staging: mmal-vchiq: Reset buffers_with_vpu on
- port_enable
-
-Should we go through the timeout failure case with port_disable
-not returning all buffers for whatever reason, the
-buffers_with_vpu counter gets left at a non-zero value, which
-will cause reference counting issues should the instance be
-reused.
-
-Reset the count when the port is enabled again, but before
-any buffers have been sent to the VPU.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-@@ -1501,6 +1501,8 @@ static int port_enable(struct vchiq_mmal
- 
- 	port->enabled = 1;
- 
-+	atomic_set(&port->buffers_with_vpu, 0);
-+
- 	if (port->buffer_cb) {
- 		/* send buffer headers to videocore */
- 		hdr_count = 1;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0341-drivers-gpio-Add-a-driver-that-wraps-the-PWM-API-as-.patch b/target/linux/bcm27xx/patches-6.1/950-0341-drivers-gpio-Add-a-driver-that-wraps-the-PWM-API-as-.patch
deleted file mode 100644
index f48aaff978..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0341-drivers-gpio-Add-a-driver-that-wraps-the-PWM-API-as-.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-From dbd522842d668d590dd415cc99045a9b1f05aeae Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 14 Oct 2021 11:09:18 +0100
-Subject: [PATCH] drivers/gpio: Add a driver that wraps the PWM API as
- a GPIO controller
-
-For cases where spare PWM outputs are available, but are desired
-to be addressed a standard outputs instead.
-Wraps a PWM channel as a new GPIO chip with the one output.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpio/Kconfig    |   8 +++
- drivers/gpio/Makefile   |   1 +
- drivers/gpio/gpio-pwm.c | 144 ++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 153 insertions(+)
- create mode 100644 drivers/gpio/gpio-pwm.c
-
---- a/drivers/gpio/Kconfig
-+++ b/drivers/gpio/Kconfig
-@@ -500,6 +500,14 @@ config GPIO_PMIC_EIC_SPRD
- 	help
- 	  Say yes here to support Spreadtrum PMIC EIC device.
- 
-+config GPIO_PWM
-+	tristate "PWM chip GPIO"
-+	depends on OF_GPIO
-+	depends on PWM
-+	help
-+	  Turn on support for exposing a PWM chip as a GPIO
-+	  driver.
-+
- config GPIO_PXA
- 	bool "PXA GPIO support"
- 	depends on ARCH_PXA || ARCH_MMP || COMPILE_TEST
---- a/drivers/gpio/Makefile
-+++ b/drivers/gpio/Makefile
-@@ -123,6 +123,7 @@ obj-$(CONFIG_GPIO_PCI_IDIO_16)		+= gpio-
- obj-$(CONFIG_GPIO_PISOSR)		+= gpio-pisosr.o
- obj-$(CONFIG_GPIO_PL061)		+= gpio-pl061.o
- obj-$(CONFIG_GPIO_PMIC_EIC_SPRD)	+= gpio-pmic-eic-sprd.o
-+obj-$(CONFIG_GPIO_PWM)			+= gpio-pwm.o
- obj-$(CONFIG_GPIO_PXA)			+= gpio-pxa.o
- obj-$(CONFIG_GPIO_RASPBERRYPI_EXP)	+= gpio-raspberrypi-exp.o
- obj-$(CONFIG_GPIO_RC5T583)		+= gpio-rc5t583.o
---- /dev/null
-+++ b/drivers/gpio/gpio-pwm.c
-@@ -0,0 +1,144 @@
-+// SPDX-License-Identifier: GPL-2.0+
-+/*
-+ * GPIO driver wrapping PWM API
-+ *
-+ * PWM 0% and PWM 100% are equivalent to digital GPIO
-+ * outputs, and there are times where it is useful to use
-+ * PWM outputs as straight GPIOs (eg outputs of NXP PCA9685
-+ * I2C PWM chip). This driver wraps the PWM API as a GPIO
-+ * controller.
-+ *
-+ * Copyright (C) 2021 Raspberry Pi (Trading) Ltd.
-+ */
-+
-+#include <linux/err.h>
-+#include <linux/gpio/driver.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/pwm.h>
-+
-+struct pwm_gpio {
-+	struct gpio_chip gc;
-+	struct pwm_device **pwm;
-+};
-+
-+static int pwm_gpio_get_direction(struct gpio_chip *gc, unsigned int off)
-+{
-+	return GPIO_LINE_DIRECTION_OUT;
-+}
-+
-+static void pwm_gpio_set(struct gpio_chip *gc, unsigned int off, int val)
-+{
-+	struct pwm_gpio *pwm_gpio = gpiochip_get_data(gc);
-+	struct pwm_state state;
-+
-+	pwm_get_state(pwm_gpio->pwm[off], &state);
-+	state.duty_cycle = val ? state.period : 0;
-+	pwm_apply_state(pwm_gpio->pwm[off], &state);
-+}
-+
-+static int pwm_gpio_parse_dt(struct pwm_gpio *pwm_gpio,
-+			     struct device *dev)
-+{
-+	struct device_node *node = dev->of_node;
-+	struct pwm_state state;
-+	int ret = 0, i, num_gpios;
-+	const char *pwm_name;
-+
-+	if (!node)
-+		return -ENODEV;
-+
-+	num_gpios = of_property_count_strings(node, "pwm-names");
-+	if (num_gpios <= 0)
-+		return 0;
-+
-+	pwm_gpio->pwm = devm_kzalloc(dev,
-+				     sizeof(*pwm_gpio->pwm) * num_gpios,
-+				     GFP_KERNEL);
-+	if (!pwm_gpio->pwm)
-+		return -ENOMEM;
-+
-+	for (i = 0; i < num_gpios; i++) {
-+		ret = of_property_read_string_index(node, "pwm-names", i,
-+						    &pwm_name);
-+		if (ret) {
-+			dev_err(dev, "unable to get pwm device index %d, name %s",
-+				i, pwm_name);
-+			goto error;
-+		}
-+
-+		pwm_gpio->pwm[i] = devm_pwm_get(dev, pwm_name);
-+		if (IS_ERR(pwm_gpio->pwm[i])) {
-+			ret = PTR_ERR(pwm_gpio->pwm[i]);
-+			if (ret != -EPROBE_DEFER)
-+				dev_err(dev, "unable to request PWM\n");
-+			goto error;
-+		}
-+
-+		/* Sync up PWM state. */
-+		pwm_init_state(pwm_gpio->pwm[i], &state);
-+
-+		state.duty_cycle = 0;
-+		pwm_apply_state(pwm_gpio->pwm[i], &state);
-+	}
-+
-+	pwm_gpio->gc.ngpio = num_gpios;
-+
-+error:
-+	return ret;
-+}
-+
-+static int pwm_gpio_probe(struct platform_device *pdev)
-+{
-+	struct device *dev = &pdev->dev;
-+	struct pwm_gpio *pwm_gpio;
-+	int ret;
-+
-+	pwm_gpio = devm_kzalloc(dev, sizeof(*pwm_gpio), GFP_KERNEL);
-+	if (!pwm_gpio)
-+		return -ENOMEM;
-+
-+	pwm_gpio->gc.parent = dev;
-+	pwm_gpio->gc.label = "pwm-gpio";
-+	pwm_gpio->gc.owner = THIS_MODULE;
-+	pwm_gpio->gc.of_node = dev->of_node;
-+	pwm_gpio->gc.base = -1;
-+
-+	pwm_gpio->gc.get_direction = pwm_gpio_get_direction;
-+	pwm_gpio->gc.set = pwm_gpio_set;
-+	pwm_gpio->gc.can_sleep = true;
-+
-+	ret = pwm_gpio_parse_dt(pwm_gpio, dev);
-+	if (ret)
-+		return ret;
-+
-+	if (!pwm_gpio->gc.ngpio)
-+		return 0;
-+
-+	return devm_gpiochip_add_data(dev, &pwm_gpio->gc, pwm_gpio);
-+}
-+
-+static int pwm_gpio_remove(struct platform_device *pdev)
-+{
-+	return 0;
-+}
-+
-+static const struct of_device_id pwm_gpio_of_match[] = {
-+	{ .compatible = "pwm-gpio" },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(of, pwm_gpio_of_match);
-+
-+static struct platform_driver pwm_gpio_driver = {
-+	.driver	= {
-+		.name		= "pwm-gpio",
-+		.of_match_table	= of_match_ptr(pwm_gpio_of_match),
-+	},
-+	.probe	= pwm_gpio_probe,
-+	.remove	= pwm_gpio_remove,
-+};
-+module_platform_driver(pwm_gpio_driver);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Dave Stevenson <dave.stevenson@raspberrypi.com>");
-+MODULE_DESCRIPTION("PWM GPIO driver");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0342-media-i2c-ov5647-Sensor-should-report-RAW-color-spac.patch b/target/linux/bcm27xx/patches-6.1/950-0342-media-i2c-ov5647-Sensor-should-report-RAW-color-spac.patch
deleted file mode 100644
index 68dc55ebd2..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0342-media-i2c-ov5647-Sensor-should-report-RAW-color-spac.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 448cd18658f69e4af0e4504cd9f525e72a461e23 Mon Sep 17 00:00:00 2001
-From: David Plowman <david.plowman@raspberrypi.com>
-Date: Thu, 21 Oct 2021 14:47:00 +0100
-Subject: [PATCH] media: i2c: ov5647: Sensor should report RAW color
- space
-
-Tested on Raspberry Pi running libcamera.
-
-Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
----
- drivers/media/i2c/ov5647.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/drivers/media/i2c/ov5647.c
-+++ b/drivers/media/i2c/ov5647.c
-@@ -494,7 +494,7 @@ static const struct ov5647_mode ov5647_m
- 	{
- 		.format = {
- 			.code		= MEDIA_BUS_FMT_SBGGR10_1X10,
--			.colorspace	= V4L2_COLORSPACE_SRGB,
-+			.colorspace	= V4L2_COLORSPACE_RAW,
- 			.field		= V4L2_FIELD_NONE,
- 			.width		= 2592,
- 			.height		= 1944
-@@ -515,7 +515,7 @@ static const struct ov5647_mode ov5647_m
- 	{
- 		.format = {
- 			.code		= MEDIA_BUS_FMT_SBGGR10_1X10,
--			.colorspace	= V4L2_COLORSPACE_SRGB,
-+			.colorspace	= V4L2_COLORSPACE_RAW,
- 			.field		= V4L2_FIELD_NONE,
- 			.width		= 1920,
- 			.height		= 1080
-@@ -536,7 +536,7 @@ static const struct ov5647_mode ov5647_m
- 	{
- 		.format = {
- 			.code		= MEDIA_BUS_FMT_SBGGR10_1X10,
--			.colorspace	= V4L2_COLORSPACE_SRGB,
-+			.colorspace	= V4L2_COLORSPACE_RAW,
- 			.field		= V4L2_FIELD_NONE,
- 			.width		= 1296,
- 			.height		= 972
-@@ -557,7 +557,7 @@ static const struct ov5647_mode ov5647_m
- 	{
- 		.format = {
- 			.code		= MEDIA_BUS_FMT_SBGGR10_1X10,
--			.colorspace	= V4L2_COLORSPACE_SRGB,
-+			.colorspace	= V4L2_COLORSPACE_RAW,
- 			.field		= V4L2_FIELD_NONE,
- 			.width		= 640,
- 			.height		= 480
diff --git a/target/linux/bcm27xx/patches-6.1/950-0343-vc04_services-isp-Report-input-node-as-wanting-full-.patch b/target/linux/bcm27xx/patches-6.1/950-0343-vc04_services-isp-Report-input-node-as-wanting-full-.patch
deleted file mode 100644
index 8a4c0280e7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0343-vc04_services-isp-Report-input-node-as-wanting-full-.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 069a73472178545d5b4683ba3c83eb5b16f0fb6a Mon Sep 17 00:00:00 2001
-From: David Plowman <david.plowman@raspberrypi.com>
-Date: Thu, 21 Oct 2021 14:49:15 +0100
-Subject: [PATCH] vc04_services: isp: Report input node as wanting full
- range RAW color space
-
-RAW color spaces are more usually reported as having full range
-quantization.
-
-Tested using libcamera.
-
-Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
----
- drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-+++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-@@ -1034,7 +1034,9 @@ static int bcm2835_isp_node_try_fmt(stru
- 		/* In all cases, we only support the defaults for these: */
- 		f->fmt.pix.ycbcr_enc = V4L2_MAP_YCBCR_ENC_DEFAULT(f->fmt.pix.colorspace);
- 		f->fmt.pix.xfer_func = V4L2_MAP_XFER_FUNC_DEFAULT(f->fmt.pix.colorspace);
--		is_rgb = f->fmt.pix.colorspace == V4L2_COLORSPACE_SRGB;
-+		/* RAW counts as sRGB here so that we get full range. */
-+		is_rgb = f->fmt.pix.colorspace == V4L2_COLORSPACE_SRGB ||
-+			f->fmt.pix.colorspace == V4L2_COLORSPACE_RAW;
- 		f->fmt.pix.quantization = V4L2_MAP_QUANTIZATION_DEFAULT(is_rgb, f->fmt.pix.colorspace,
- 									f->fmt.pix.ycbcr_enc);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0344-media-bcm2835-unicam-Parse-pad-numbers-correctly.patch b/target/linux/bcm27xx/patches-6.1/950-0344-media-bcm2835-unicam-Parse-pad-numbers-correctly.patch
deleted file mode 100644
index 283591efbe..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0344-media-bcm2835-unicam-Parse-pad-numbers-correctly.patch
+++ /dev/null
@@ -1,232 +0,0 @@
-From a335da8b55f0ade5c4488d5dddda9681f885fb45 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 23 Sep 2020 15:16:18 +0100
-Subject: [PATCH] media/bcm2835-unicam: Parse pad numbers correctly
-
-The driver was making big assumptions about the source device
-using pad 0 and 1, which doesn't follow for more complex
-devices where Unicam's source device may be a sink device for
-something else.
-
-Read the pad numbers through media controller, and reference
-them appropriately.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../media/platform/bcm2835/bcm2835-unicam.c   | 89 ++++++++++++-------
- 1 file changed, 58 insertions(+), 31 deletions(-)
-
---- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
-+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -382,6 +382,8 @@ struct unicam_node {
- 	int open;
- 	bool streaming;
- 	unsigned int pad_id;
-+	/* Source pad id on the sensor for this node */
-+	unsigned int src_pad_id;
- 	/* Pointer pointing to current v4l2_buffer */
- 	struct unicam_buffer *cur_frm;
- 	/* Pointer pointing to next v4l2_buffer */
-@@ -590,7 +592,7 @@ static int __subdev_get_format(struct un
- {
- 	struct v4l2_subdev_format sd_fmt = {
- 		.which = V4L2_SUBDEV_FORMAT_ACTIVE,
--		.pad = pad_id
-+		.pad = dev->node[pad_id].src_pad_id,
- 	};
- 	int ret;
- 
-@@ -612,7 +614,7 @@ static int __subdev_set_format(struct un
- {
- 	struct v4l2_subdev_format sd_fmt = {
- 		.which = V4L2_SUBDEV_FORMAT_ACTIVE,
--		.pad = pad_id
-+		.pad = dev->node[pad_id].src_pad_id,
- 	};
- 	int ret;
- 
-@@ -1980,7 +1982,7 @@ static int unicam_enum_framesizes(struct
- 
- 	fse.which = V4L2_SUBDEV_FORMAT_ACTIVE;
- 	fse.index = fsize->index;
--	fse.pad = node->pad_id;
-+	fse.pad = node->src_pad_id;
- 
- 	ret = v4l2_subdev_call(dev->sensor, pad, enum_frame_size, NULL, &fse);
- 	if (ret)
-@@ -2005,6 +2007,7 @@ static int unicam_enum_frameintervals(st
- 	const struct unicam_fmt *fmt;
- 	struct v4l2_subdev_frame_interval_enum fie = {
- 		.index = fival->index,
-+		.pad = node->src_pad_id,
- 		.width = fival->width,
- 		.height = fival->height,
- 		.which = V4L2_SUBDEV_FORMAT_ACTIVE,
-@@ -2096,8 +2099,13 @@ static int unicam_enum_dv_timings(struct
- {
- 	struct unicam_node *node = video_drvdata(file);
- 	struct unicam_device *dev = node->dev;
-+	int ret;
-+
-+	timings->pad = node->src_pad_id;
-+	ret = v4l2_subdev_call(dev->sensor, pad, enum_dv_timings, timings);
-+	timings->pad = node->pad_id;
- 
--	return v4l2_subdev_call(dev->sensor, pad, enum_dv_timings, timings);
-+	return ret;
- }
- 
- static int unicam_dv_timings_cap(struct file *file, void *priv,
-@@ -2105,8 +2113,13 @@ static int unicam_dv_timings_cap(struct
- {
- 	struct unicam_node *node = video_drvdata(file);
- 	struct unicam_device *dev = node->dev;
-+	int ret;
-+
-+	cap->pad = node->src_pad_id;
-+	ret = v4l2_subdev_call(dev->sensor, pad, dv_timings_cap, cap);
-+	cap->pad = node->pad_id;
- 
--	return v4l2_subdev_call(dev->sensor, pad, dv_timings_cap, cap);
-+	return ret;
- }
- 
- static int unicam_subscribe_event(struct v4l2_fh *fh,
-@@ -2377,14 +2390,12 @@ static int register_node(struct unicam_d
- 			 */
- 			fmt = get_first_supported_format(unicam);
- 
--			if (!fmt)
--				/* No compatible formats */
--				return -EINVAL;
--
--			mbus_fmt.code = fmt->code;
--			ret = __subdev_set_format(unicam, &mbus_fmt, pad_id);
--			if (ret)
--				return -EINVAL;
-+			if (fmt) {
-+				mbus_fmt.code = fmt->code;
-+				ret = __subdev_set_format(unicam, &mbus_fmt, pad_id);
-+				if (ret)
-+					return -EINVAL;
-+			}
- 		}
- 		if (mbus_fmt.field != V4L2_FIELD_NONE) {
- 			/* Interlaced not supported - disable it now. */
-@@ -2394,7 +2405,8 @@ static int register_node(struct unicam_d
- 				return -EINVAL;
- 		}
- 
--		node->v_fmt.fmt.pix.pixelformat = fmt->fourcc ? fmt->fourcc
-+		if (fmt)
-+			node->v_fmt.fmt.pix.pixelformat = fmt->fourcc ? fmt->fourcc
- 						: fmt->repacked_fourcc;
- 	} else {
- 		/* Fix this node format as embedded data. */
-@@ -2407,7 +2419,8 @@ static int register_node(struct unicam_d
- 	node->fmt = fmt;
- 
- 	/* Read current subdev format */
--	unicam_reset_format(node);
-+	if (fmt)
-+		unicam_reset_format(node);
- 
- 	if (v4l2_subdev_has_op(unicam->sensor, video, s_std)) {
- 		v4l2_std_id tvnorms;
-@@ -2496,6 +2509,7 @@ static int register_node(struct unicam_d
- 		unicam_err(unicam, "Unable to allocate dummy buffer.\n");
- 		return -ENOMEM;
- 	}
-+
- 	if (pad_id == METADATA_PAD ||
- 	    !v4l2_subdev_has_op(unicam->sensor, video, s_std)) {
- 		v4l2_disable_ioctl(&node->video_dev, VIDIOC_S_STD);
-@@ -2554,7 +2568,8 @@ static int register_node(struct unicam_d
- 	node->registered = true;
- 
- 	if (pad_id != METADATA_PAD || unicam->sensor_embedded_data) {
--		ret = media_create_pad_link(&unicam->sensor->entity, pad_id,
-+		ret = media_create_pad_link(&unicam->sensor->entity,
-+					    node->src_pad_id,
- 					    &node->video_dev.entity, 0,
- 					    MEDIA_LNK_FL_ENABLED |
- 					    MEDIA_LNK_FL_IMMUTABLE);
-@@ -2586,9 +2601,11 @@ static void unregister_nodes(struct unic
- 	}
- }
- 
--static int unicam_probe_complete(struct unicam_device *unicam)
-+static int unicam_async_complete(struct v4l2_async_notifier *notifier)
- {
- 	static struct lock_class_key key;
-+	struct unicam_device *unicam = to_unicam_device(notifier->v4l2_dev);
-+	unsigned int i, source_pads = 0;
- 	int ret;
- 
- 	unicam->v4l2_dev.notify = unicam_notify;
-@@ -2598,7 +2615,20 @@ static int unicam_probe_complete(struct
- 	if (!unicam->sensor_state)
- 		return -ENOMEM;
- 
--	unicam->sensor_embedded_data = (unicam->sensor->entity.num_pads >= 2);
-+	for (i = 0; i < unicam->sensor->entity.num_pads; i++) {
-+		if (unicam->sensor->entity.pads[i].flags & MEDIA_PAD_FL_SOURCE) {
-+			if (source_pads < MAX_NODES) {
-+				unicam->node[source_pads].src_pad_id = i;
-+				unicam_err(unicam, "source pad %u is index %u\n",
-+					   source_pads, i);
-+			}
-+			source_pads++;
-+		}
-+	}
-+	if (!source_pads) {
-+		unicam_err(unicam, "No source pads on sensor.\n");
-+		goto unregister;
-+	}
- 
- 	ret = register_node(unicam, &unicam->node[IMAGE_PAD],
- 			    V4L2_BUF_TYPE_VIDEO_CAPTURE, IMAGE_PAD);
-@@ -2607,11 +2637,15 @@ static int unicam_probe_complete(struct
- 		goto unregister;
- 	}
- 
--	ret = register_node(unicam, &unicam->node[METADATA_PAD],
--			    V4L2_BUF_TYPE_META_CAPTURE, METADATA_PAD);
--	if (ret) {
--		unicam_err(unicam, "Unable to register metadata video device.\n");
--		goto unregister;
-+	if (source_pads >= 2) {
-+		unicam->sensor_embedded_data = true;
-+
-+		ret = register_node(unicam, &unicam->node[METADATA_PAD],
-+				    V4L2_BUF_TYPE_META_CAPTURE, METADATA_PAD);
-+		if (ret) {
-+			unicam_err(unicam, "Unable to register metadata video device.\n");
-+			goto unregister;
-+		}
- 	}
- 
- 	ret = v4l2_device_register_ro_subdev_nodes(&unicam->v4l2_dev);
-@@ -2634,13 +2668,6 @@ unregister:
- 	return ret;
- }
- 
--static int unicam_async_complete(struct v4l2_async_notifier *notifier)
--{
--	struct unicam_device *unicam = to_unicam_device(notifier->v4l2_dev);
--
--	return unicam_probe_complete(unicam);
--}
--
- static const struct v4l2_async_notifier_operations unicam_async_ops = {
- 	.bound = unicam_async_bound,
- 	.complete = unicam_async_complete,
-@@ -2749,7 +2776,7 @@ static int of_unicam_connect_subdevs(str
- 	dev->notifier.ops = &unicam_async_ops;
- 
- 	dev->asd.match_type = V4L2_ASYNC_MATCH_FWNODE;
--	dev->asd.match.fwnode = of_fwnode_handle(sensor_node);
-+	dev->asd.match.fwnode = fwnode_graph_get_remote_endpoint(of_fwnode_handle(ep_node));
- 	ret = __v4l2_async_nf_add_subdev(&dev->notifier, &dev->asd);
- 	if (ret) {
- 		unicam_err(dev, "Error adding subdevice: %d\n", ret);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0345-media-bcm2835-unicam-Add-support-for-configuration-v.patch b/target/linux/bcm27xx/patches-6.1/950-0345-media-bcm2835-unicam-Add-support-for-configuration-v.patch
deleted file mode 100644
index 83d40d730e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0345-media-bcm2835-unicam-Add-support-for-configuration-v.patch
+++ /dev/null
@@ -1,1952 +0,0 @@
-From 9556f5777a8961dec3259f4c09c267ca5c77c90a Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 15 Oct 2021 17:57:27 +0100
-Subject: [PATCH] media/bcm2835-unicam: Add support for configuration
- via MC API
-
-Adds Media Controller API support for more complex pipelines.
-libcamera is about to switch to using this mechanism for configuring
-sensors.
-
-This can be enabled by either a module parameter, or device tree.
-
-Various functions have been moved to group video-centric and
-mc-centric functions together.
-
-Based on a similar conversion done to ti-vpe.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: bcm2835-unicam: Fixup for 5.18 and new get_mbus_config struct
-
-The number of active CSI2 data lanes has moved within the struct
-v4l2_mbus_config used by the get_mbus_config API call.
-Update the driver to match the changes in mainline.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../media/platform/bcm2835/bcm2835-unicam.c   | 2111 ++++++++++-------
- 1 file changed, 1306 insertions(+), 805 deletions(-)
-
---- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
-+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -83,6 +83,10 @@ static int debug;
- module_param(debug, int, 0644);
- MODULE_PARM_DESC(debug, "Debug level 0-3");
- 
-+static int media_controller;
-+module_param(media_controller, int, 0644);
-+MODULE_PARM_DESC(media_controller, "Use media controller API");
-+
- #define unicam_dbg(level, dev, fmt, arg...)	\
- 		v4l2_dbg(level, debug, &(dev)->v4l2_dev, fmt, ##arg)
- #define unicam_info(dev, fmt, arg...)	\
-@@ -119,7 +123,7 @@ MODULE_PARM_DESC(debug, "Debug level 0-3
- #define MIN_WIDTH		16
- #define MIN_HEIGHT		16
- /* Default size of the embedded buffer */
--#define UNICAM_EMBEDDED_SIZE	8192
-+#define UNICAM_EMBEDDED_SIZE	16384
- 
- /*
-  * Size of the dummy buffer. Can be any size really, but the DMA
-@@ -133,6 +137,22 @@ enum pad_types {
- 	MAX_NODES
- };
- 
-+#define MASK_CS_DEFAULT		BIT(V4L2_COLORSPACE_DEFAULT)
-+#define MASK_CS_SMPTE170M	BIT(V4L2_COLORSPACE_SMPTE170M)
-+#define MASK_CS_SMPTE240M	BIT(V4L2_COLORSPACE_SMPTE240M)
-+#define MASK_CS_REC709		BIT(V4L2_COLORSPACE_REC709)
-+#define MASK_CS_BT878		BIT(V4L2_COLORSPACE_BT878)
-+#define MASK_CS_470_M		BIT(V4L2_COLORSPACE_470_SYSTEM_M)
-+#define MASK_CS_470_BG		BIT(V4L2_COLORSPACE_470_SYSTEM_BG)
-+#define MASK_CS_JPEG		BIT(V4L2_COLORSPACE_JPEG)
-+#define MASK_CS_SRGB		BIT(V4L2_COLORSPACE_SRGB)
-+#define MASK_CS_OPRGB		BIT(V4L2_COLORSPACE_OPRGB)
-+#define MASK_CS_BT2020		BIT(V4L2_COLORSPACE_BT2020)
-+#define MASK_CS_RAW		BIT(V4L2_COLORSPACE_RAW)
-+#define MASK_CS_DCI_P3		BIT(V4L2_COLORSPACE_DCI_P3)
-+
-+#define MAX_COLORSPACE		32
-+
- /*
-  * struct unicam_fmt - Unicam media bus format information
-  * @pixelformat: V4L2 pixel format FCC identifier. 0 if n/a.
-@@ -141,8 +161,14 @@ enum pad_types {
-  * @code: V4L2 media bus format code.
-  * @depth: Bits per pixel as delivered from the source.
-  * @csi_dt: CSI data type.
-+ * @valid_colorspaces: Bitmask of valid colorspaces so that the Media Controller
-+ *		centric try_fmt can validate the colorspace and pass
-+ *		v4l2-compliance.
-  * @check_variants: Flag to denote that there are multiple mediabus formats
-  *		still in the list that could match this V4L2 format.
-+ * @mc_skip: Media Controller shouldn't list this format via ENUM_FMT as it is
-+ *		a duplicate of an earlier format.
-+ * @metadata_fmt: This format only applies to the metadata pad.
-  */
- struct unicam_fmt {
- 	u32	fourcc;
-@@ -150,7 +176,10 @@ struct unicam_fmt {
- 	u32	code;
- 	u8	depth;
- 	u8	csi_dt;
--	u8	check_variants;
-+	u32	valid_colorspaces;
-+	u8	check_variants:1;
-+	u8	mc_skip:1;
-+	u8	metadata_fmt:1;
- };
- 
- static const struct unicam_fmt formats[] = {
-@@ -161,173 +190,216 @@ static const struct unicam_fmt formats[]
- 		.depth		= 16,
- 		.csi_dt		= 0x1e,
- 		.check_variants = 1,
-+		.valid_colorspaces = MASK_CS_SMPTE170M | MASK_CS_REC709 |
-+				     MASK_CS_JPEG,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_UYVY,
- 		.code		= MEDIA_BUS_FMT_UYVY8_2X8,
- 		.depth		= 16,
- 		.csi_dt		= 0x1e,
- 		.check_variants = 1,
-+		.valid_colorspaces = MASK_CS_SMPTE170M | MASK_CS_REC709 |
-+				     MASK_CS_JPEG,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_YVYU,
- 		.code		= MEDIA_BUS_FMT_YVYU8_2X8,
- 		.depth		= 16,
- 		.csi_dt		= 0x1e,
- 		.check_variants = 1,
-+		.valid_colorspaces = MASK_CS_SMPTE170M | MASK_CS_REC709 |
-+				     MASK_CS_JPEG,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_VYUY,
- 		.code		= MEDIA_BUS_FMT_VYUY8_2X8,
- 		.depth		= 16,
- 		.csi_dt		= 0x1e,
- 		.check_variants = 1,
-+		.valid_colorspaces = MASK_CS_SMPTE170M | MASK_CS_REC709 |
-+				     MASK_CS_JPEG,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_YUYV,
- 		.code		= MEDIA_BUS_FMT_YUYV8_1X16,
- 		.depth		= 16,
- 		.csi_dt		= 0x1e,
-+		.mc_skip	= 1,
-+		.valid_colorspaces = MASK_CS_SMPTE170M | MASK_CS_REC709 |
-+				     MASK_CS_JPEG,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_UYVY,
- 		.code		= MEDIA_BUS_FMT_UYVY8_1X16,
- 		.depth		= 16,
- 		.csi_dt		= 0x1e,
-+		.mc_skip	= 1,
-+		.valid_colorspaces = MASK_CS_SMPTE170M | MASK_CS_REC709 |
-+				     MASK_CS_JPEG,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_YVYU,
- 		.code		= MEDIA_BUS_FMT_YVYU8_1X16,
- 		.depth		= 16,
- 		.csi_dt		= 0x1e,
-+		.mc_skip	= 1,
-+		.valid_colorspaces = MASK_CS_SMPTE170M | MASK_CS_REC709 |
-+				     MASK_CS_JPEG,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_VYUY,
- 		.code		= MEDIA_BUS_FMT_VYUY8_1X16,
- 		.depth		= 16,
- 		.csi_dt		= 0x1e,
-+		.mc_skip	= 1,
-+		.valid_colorspaces = MASK_CS_SMPTE170M | MASK_CS_REC709 |
-+				     MASK_CS_JPEG,
- 	}, {
- 	/* RGB Formats */
- 		.fourcc		= V4L2_PIX_FMT_RGB565, /* gggbbbbb rrrrrggg */
- 		.code		= MEDIA_BUS_FMT_RGB565_2X8_LE,
- 		.depth		= 16,
- 		.csi_dt		= 0x22,
-+		.valid_colorspaces = MASK_CS_SRGB,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_RGB565X, /* rrrrrggg gggbbbbb */
- 		.code		= MEDIA_BUS_FMT_RGB565_2X8_BE,
- 		.depth		= 16,
--		.csi_dt		= 0x22
-+		.csi_dt		= 0x22,
-+		.valid_colorspaces = MASK_CS_SRGB,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_RGB555, /* gggbbbbb arrrrrgg */
- 		.code		= MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE,
- 		.depth		= 16,
- 		.csi_dt		= 0x21,
-+		.valid_colorspaces = MASK_CS_SRGB,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_RGB555X, /* arrrrrgg gggbbbbb */
- 		.code		= MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE,
- 		.depth		= 16,
- 		.csi_dt		= 0x21,
-+		.valid_colorspaces = MASK_CS_SRGB,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_RGB24, /* rgb */
- 		.code		= MEDIA_BUS_FMT_RGB888_1X24,
- 		.depth		= 24,
- 		.csi_dt		= 0x24,
-+		.valid_colorspaces = MASK_CS_SRGB,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_BGR24, /* bgr */
- 		.code		= MEDIA_BUS_FMT_BGR888_1X24,
- 		.depth		= 24,
- 		.csi_dt		= 0x24,
-+		.valid_colorspaces = MASK_CS_SRGB,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_RGB32, /* argb */
- 		.code		= MEDIA_BUS_FMT_ARGB8888_1X32,
- 		.depth		= 32,
- 		.csi_dt		= 0x0,
-+		.valid_colorspaces = MASK_CS_SRGB,
- 	}, {
- 	/* Bayer Formats */
- 		.fourcc		= V4L2_PIX_FMT_SBGGR8,
- 		.code		= MEDIA_BUS_FMT_SBGGR8_1X8,
- 		.depth		= 8,
- 		.csi_dt		= 0x2a,
-+		.valid_colorspaces = MASK_CS_RAW,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_SGBRG8,
- 		.code		= MEDIA_BUS_FMT_SGBRG8_1X8,
- 		.depth		= 8,
- 		.csi_dt		= 0x2a,
-+		.valid_colorspaces = MASK_CS_RAW,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_SGRBG8,
- 		.code		= MEDIA_BUS_FMT_SGRBG8_1X8,
- 		.depth		= 8,
- 		.csi_dt		= 0x2a,
-+		.valid_colorspaces = MASK_CS_RAW,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_SRGGB8,
- 		.code		= MEDIA_BUS_FMT_SRGGB8_1X8,
- 		.depth		= 8,
- 		.csi_dt		= 0x2a,
-+		.valid_colorspaces = MASK_CS_RAW,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_SBGGR10P,
- 		.repacked_fourcc = V4L2_PIX_FMT_SBGGR10,
- 		.code		= MEDIA_BUS_FMT_SBGGR10_1X10,
- 		.depth		= 10,
- 		.csi_dt		= 0x2b,
-+		.valid_colorspaces = MASK_CS_RAW,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_SGBRG10P,
- 		.repacked_fourcc = V4L2_PIX_FMT_SGBRG10,
- 		.code		= MEDIA_BUS_FMT_SGBRG10_1X10,
- 		.depth		= 10,
- 		.csi_dt		= 0x2b,
-+		.valid_colorspaces = MASK_CS_RAW,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_SGRBG10P,
- 		.repacked_fourcc = V4L2_PIX_FMT_SGRBG10,
- 		.code		= MEDIA_BUS_FMT_SGRBG10_1X10,
- 		.depth		= 10,
- 		.csi_dt		= 0x2b,
-+		.valid_colorspaces = MASK_CS_RAW,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_SRGGB10P,
- 		.repacked_fourcc = V4L2_PIX_FMT_SRGGB10,
- 		.code		= MEDIA_BUS_FMT_SRGGB10_1X10,
- 		.depth		= 10,
- 		.csi_dt		= 0x2b,
-+		.valid_colorspaces = MASK_CS_RAW,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_SBGGR12P,
- 		.repacked_fourcc = V4L2_PIX_FMT_SBGGR12,
- 		.code		= MEDIA_BUS_FMT_SBGGR12_1X12,
- 		.depth		= 12,
- 		.csi_dt		= 0x2c,
-+		.valid_colorspaces = MASK_CS_RAW,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_SGBRG12P,
- 		.repacked_fourcc = V4L2_PIX_FMT_SGBRG12,
- 		.code		= MEDIA_BUS_FMT_SGBRG12_1X12,
- 		.depth		= 12,
- 		.csi_dt		= 0x2c,
-+		.valid_colorspaces = MASK_CS_RAW,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_SGRBG12P,
- 		.repacked_fourcc = V4L2_PIX_FMT_SGRBG12,
- 		.code		= MEDIA_BUS_FMT_SGRBG12_1X12,
- 		.depth		= 12,
- 		.csi_dt		= 0x2c,
-+		.valid_colorspaces = MASK_CS_RAW,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_SRGGB12P,
- 		.repacked_fourcc = V4L2_PIX_FMT_SRGGB12,
- 		.code		= MEDIA_BUS_FMT_SRGGB12_1X12,
- 		.depth		= 12,
- 		.csi_dt		= 0x2c,
-+		.valid_colorspaces = MASK_CS_RAW,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_SBGGR14P,
- 		.repacked_fourcc = V4L2_PIX_FMT_SBGGR14,
- 		.code		= MEDIA_BUS_FMT_SBGGR14_1X14,
- 		.depth		= 14,
- 		.csi_dt		= 0x2d,
-+		.valid_colorspaces = MASK_CS_RAW,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_SGBRG14P,
- 		.repacked_fourcc = V4L2_PIX_FMT_SGBRG14,
- 		.code		= MEDIA_BUS_FMT_SGBRG14_1X14,
- 		.depth		= 14,
- 		.csi_dt		= 0x2d,
-+		.valid_colorspaces = MASK_CS_RAW,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_SGRBG14P,
- 		.repacked_fourcc = V4L2_PIX_FMT_SGRBG14,
- 		.code		= MEDIA_BUS_FMT_SGRBG14_1X14,
- 		.depth		= 14,
- 		.csi_dt		= 0x2d,
-+		.valid_colorspaces = MASK_CS_RAW,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_SRGGB14P,
- 		.repacked_fourcc = V4L2_PIX_FMT_SRGGB14,
- 		.code		= MEDIA_BUS_FMT_SRGGB14_1X14,
- 		.depth		= 14,
- 		.csi_dt		= 0x2d,
-+		.valid_colorspaces = MASK_CS_RAW,
- 	}, {
- 	/*
- 	 * 16 bit Bayer formats could be supported, but there is no CSI2
-@@ -340,30 +412,35 @@ static const struct unicam_fmt formats[]
- 		.code		= MEDIA_BUS_FMT_Y8_1X8,
- 		.depth		= 8,
- 		.csi_dt		= 0x2a,
-+		.valid_colorspaces = MASK_CS_RAW,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_Y10P,
- 		.repacked_fourcc = V4L2_PIX_FMT_Y10,
- 		.code		= MEDIA_BUS_FMT_Y10_1X10,
- 		.depth		= 10,
- 		.csi_dt		= 0x2b,
-+		.valid_colorspaces = MASK_CS_RAW,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_Y12P,
- 		.repacked_fourcc = V4L2_PIX_FMT_Y12,
- 		.code		= MEDIA_BUS_FMT_Y12_1X12,
- 		.depth		= 12,
- 		.csi_dt		= 0x2c,
-+		.valid_colorspaces = MASK_CS_RAW,
- 	}, {
- 		.fourcc		= V4L2_PIX_FMT_Y14P,
- 		.repacked_fourcc = V4L2_PIX_FMT_Y14,
- 		.code		= MEDIA_BUS_FMT_Y14_1X14,
- 		.depth		= 14,
- 		.csi_dt		= 0x2d,
-+		.valid_colorspaces = MASK_CS_RAW,
- 	},
- 	/* Embedded data format */
- 	{
- 		.fourcc		= V4L2_META_FMT_SENSOR_DATA,
- 		.code		= MEDIA_BUS_FMT_SENSOR_DATA,
- 		.depth		= 8,
-+		.metadata_fmt	= 1,
- 	}
- };
- 
-@@ -408,6 +485,7 @@ struct unicam_node {
- 	struct unicam_device *dev;
- 	struct media_pad pad;
- 	unsigned int embedded_lines;
-+	struct media_pipeline pipe;
- 	/*
- 	 * Dummy buffer intended to be used by unicam
- 	 * if we have no other queued buffers to swap to.
-@@ -459,6 +537,8 @@ struct unicam_device {
- 
- 	struct unicam_node node[MAX_NODES];
- 	struct v4l2_ctrl_handler ctrl_handler;
-+
-+	bool mc_api;
- };
- 
- static inline struct unicam_device *
-@@ -908,6 +988,7 @@ static irqreturn_t unicam_isr(int irq, v
- 	return IRQ_HANDLED;
- }
- 
-+/* V4L2 Common IOCTLs */
- static int unicam_querycap(struct file *file, void *priv,
- 			   struct v4l2_capability *cap)
- {
-@@ -925,6 +1006,38 @@ static int unicam_querycap(struct file *
- 	return 0;
- }
- 
-+static int unicam_log_status(struct file *file, void *fh)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+	u32 reg;
-+
-+	/* status for sub devices */
-+	v4l2_device_call_all(&dev->v4l2_dev, 0, core, log_status);
-+
-+	unicam_info(dev, "-----Receiver status-----\n");
-+	unicam_info(dev, "V4L2 width/height:   %ux%u\n",
-+		    node->v_fmt.fmt.pix.width, node->v_fmt.fmt.pix.height);
-+	unicam_info(dev, "Mediabus format:     %08x\n", node->fmt->code);
-+	unicam_info(dev, "V4L2 format:         %08x\n",
-+		    node->v_fmt.fmt.pix.pixelformat);
-+	reg = reg_read(dev, UNICAM_IPIPE);
-+	unicam_info(dev, "Unpacking/packing:   %u / %u\n",
-+		    get_field(reg, UNICAM_PUM_MASK),
-+		    get_field(reg, UNICAM_PPM_MASK));
-+	unicam_info(dev, "----Live data----\n");
-+	unicam_info(dev, "Programmed stride:   %4u\n",
-+		    reg_read(dev, UNICAM_IBLS));
-+	unicam_info(dev, "Detected resolution: %ux%u\n",
-+		    reg_read(dev, UNICAM_IHSTA),
-+		    reg_read(dev, UNICAM_IVSTA));
-+	unicam_info(dev, "Write pointer:       %08x\n",
-+		    reg_read(dev, UNICAM_IBWP));
-+
-+	return 0;
-+}
-+
-+/* V4L2 Video Centric IOCTLs */
- static int unicam_enum_fmt_vid_cap(struct file *file, void  *priv,
- 				   struct v4l2_fmtdesc *f)
- {
-@@ -1269,6 +1382,727 @@ static int unicam_g_fmt_meta_cap(struct
- 	return 0;
- }
- 
-+static int unicam_enum_input(struct file *file, void *priv,
-+			     struct v4l2_input *inp)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+	int ret;
-+
-+	if (inp->index != 0)
-+		return -EINVAL;
-+
-+	inp->type = V4L2_INPUT_TYPE_CAMERA;
-+	if (v4l2_subdev_has_op(dev->sensor, video, s_dv_timings)) {
-+		inp->capabilities = V4L2_IN_CAP_DV_TIMINGS;
-+		inp->std = 0;
-+	} else if (v4l2_subdev_has_op(dev->sensor, video, s_std)) {
-+		inp->capabilities = V4L2_IN_CAP_STD;
-+		if (v4l2_subdev_call(dev->sensor, video, g_tvnorms, &inp->std) < 0)
-+			inp->std = V4L2_STD_ALL;
-+	} else {
-+		inp->capabilities = 0;
-+		inp->std = 0;
-+	}
-+
-+	if (v4l2_subdev_has_op(dev->sensor, video, g_input_status)) {
-+		ret = v4l2_subdev_call(dev->sensor, video, g_input_status,
-+				       &inp->status);
-+		if (ret < 0)
-+			return ret;
-+	}
-+
-+	snprintf(inp->name, sizeof(inp->name), "Camera 0");
-+	return 0;
-+}
-+
-+static int unicam_g_input(struct file *file, void *priv, unsigned int *i)
-+{
-+	*i = 0;
-+
-+	return 0;
-+}
-+
-+static int unicam_s_input(struct file *file, void *priv, unsigned int i)
-+{
-+	/*
-+	 * FIXME: Ideally we would like to be able to query the source
-+	 * subdevice for information over the input connectors it supports,
-+	 * and map that through in to a call to video_ops->s_routing.
-+	 * There is no infrastructure support for defining that within
-+	 * devicetree at present. Until that is implemented we can't
-+	 * map a user physical connector number to s_routing input number.
-+	 */
-+	if (i > 0)
-+		return -EINVAL;
-+
-+	return 0;
-+}
-+
-+static int unicam_querystd(struct file *file, void *priv,
-+			   v4l2_std_id *std)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+
-+	return v4l2_subdev_call(dev->sensor, video, querystd, std);
-+}
-+
-+static int unicam_g_std(struct file *file, void *priv, v4l2_std_id *std)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+
-+	return v4l2_subdev_call(dev->sensor, video, g_std, std);
-+}
-+
-+static int unicam_s_std(struct file *file, void *priv, v4l2_std_id std)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+	int ret;
-+	v4l2_std_id current_std;
-+
-+	ret = v4l2_subdev_call(dev->sensor, video, g_std, &current_std);
-+	if (ret)
-+		return ret;
-+
-+	if (std == current_std)
-+		return 0;
-+
-+	if (vb2_is_busy(&node->buffer_queue))
-+		return -EBUSY;
-+
-+	ret = v4l2_subdev_call(dev->sensor, video, s_std, std);
-+
-+	/* Force recomputation of bytesperline */
-+	node->v_fmt.fmt.pix.bytesperline = 0;
-+
-+	unicam_reset_format(node);
-+
-+	return ret;
-+}
-+
-+static int unicam_s_edid(struct file *file, void *priv, struct v4l2_edid *edid)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+
-+	return v4l2_subdev_call(dev->sensor, pad, set_edid, edid);
-+}
-+
-+static int unicam_g_edid(struct file *file, void *priv, struct v4l2_edid *edid)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+
-+	return v4l2_subdev_call(dev->sensor, pad, get_edid, edid);
-+}
-+
-+static int unicam_s_selection(struct file *file, void *priv,
-+			      struct v4l2_selection *sel)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+	struct v4l2_subdev_selection sdsel = {
-+		.which = V4L2_SUBDEV_FORMAT_ACTIVE,
-+		.target = sel->target,
-+		.flags = sel->flags,
-+		.r = sel->r,
-+	};
-+
-+	if (sel->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-+		return -EINVAL;
-+
-+	return v4l2_subdev_call(dev->sensor, pad, set_selection, NULL, &sdsel);
-+}
-+
-+static int unicam_g_selection(struct file *file, void *priv,
-+			      struct v4l2_selection *sel)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+	struct v4l2_subdev_selection sdsel = {
-+		.which = V4L2_SUBDEV_FORMAT_ACTIVE,
-+		.target = sel->target,
-+	};
-+	int ret;
-+
-+	if (sel->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-+		return -EINVAL;
-+
-+	ret = v4l2_subdev_call(dev->sensor, pad, get_selection, NULL, &sdsel);
-+	if (!ret)
-+		sel->r = sdsel.r;
-+
-+	return ret;
-+}
-+
-+static int unicam_enum_framesizes(struct file *file, void *priv,
-+				  struct v4l2_frmsizeenum *fsize)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+	const struct unicam_fmt *fmt;
-+	struct v4l2_subdev_frame_size_enum fse;
-+	int ret;
-+
-+	/* check for valid format */
-+	fmt = find_format_by_pix(dev, fsize->pixel_format);
-+	if (!fmt) {
-+		unicam_dbg(3, dev, "Invalid pixel code: %x\n",
-+			   fsize->pixel_format);
-+		return -EINVAL;
-+	}
-+	fse.code = fmt->code;
-+
-+	fse.which = V4L2_SUBDEV_FORMAT_ACTIVE;
-+	fse.index = fsize->index;
-+	fse.pad = node->src_pad_id;
-+
-+	ret = v4l2_subdev_call(dev->sensor, pad, enum_frame_size, NULL, &fse);
-+	if (ret)
-+		return ret;
-+
-+	unicam_dbg(1, dev, "%s: index: %d code: %x W:[%d,%d] H:[%d,%d]\n",
-+		   __func__, fse.index, fse.code, fse.min_width, fse.max_width,
-+		   fse.min_height, fse.max_height);
-+
-+	fsize->type = V4L2_FRMSIZE_TYPE_DISCRETE;
-+	fsize->discrete.width = fse.max_width;
-+	fsize->discrete.height = fse.max_height;
-+
-+	return 0;
-+}
-+
-+static int unicam_enum_frameintervals(struct file *file, void *priv,
-+				      struct v4l2_frmivalenum *fival)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+	const struct unicam_fmt *fmt;
-+	struct v4l2_subdev_frame_interval_enum fie = {
-+		.index = fival->index,
-+		.pad = node->src_pad_id,
-+		.width = fival->width,
-+		.height = fival->height,
-+		.which = V4L2_SUBDEV_FORMAT_ACTIVE,
-+	};
-+	int ret;
-+
-+	fmt = find_format_by_pix(dev, fival->pixel_format);
-+	if (!fmt)
-+		return -EINVAL;
-+
-+	fie.code = fmt->code;
-+	ret = v4l2_subdev_call(dev->sensor, pad, enum_frame_interval,
-+			       NULL, &fie);
-+	if (ret)
-+		return ret;
-+
-+	fival->type = V4L2_FRMIVAL_TYPE_DISCRETE;
-+	fival->discrete = fie.interval;
-+
-+	return 0;
-+}
-+
-+static int unicam_g_parm(struct file *file, void *fh, struct v4l2_streamparm *a)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+
-+	return v4l2_g_parm_cap(video_devdata(file), dev->sensor, a);
-+}
-+
-+static int unicam_s_parm(struct file *file, void *fh, struct v4l2_streamparm *a)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+
-+	return v4l2_s_parm_cap(video_devdata(file), dev->sensor, a);
-+}
-+
-+static int unicam_g_dv_timings(struct file *file, void *priv,
-+			       struct v4l2_dv_timings *timings)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+
-+	return v4l2_subdev_call(dev->sensor, video, g_dv_timings, timings);
-+}
-+
-+static int unicam_s_dv_timings(struct file *file, void *priv,
-+			       struct v4l2_dv_timings *timings)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+	struct v4l2_dv_timings current_timings;
-+	int ret;
-+
-+	ret = v4l2_subdev_call(dev->sensor, video, g_dv_timings,
-+			       &current_timings);
-+
-+	if (ret < 0)
-+		return ret;
-+
-+	if (v4l2_match_dv_timings(timings, &current_timings, 0, false))
-+		return 0;
-+
-+	if (vb2_is_busy(&node->buffer_queue))
-+		return -EBUSY;
-+
-+	ret = v4l2_subdev_call(dev->sensor, video, s_dv_timings, timings);
-+
-+	/* Force recomputation of bytesperline */
-+	node->v_fmt.fmt.pix.bytesperline = 0;
-+
-+	unicam_reset_format(node);
-+
-+	return ret;
-+}
-+
-+static int unicam_query_dv_timings(struct file *file, void *priv,
-+				   struct v4l2_dv_timings *timings)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+
-+	return v4l2_subdev_call(dev->sensor, video, query_dv_timings, timings);
-+}
-+
-+static int unicam_enum_dv_timings(struct file *file, void *priv,
-+				  struct v4l2_enum_dv_timings *timings)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+	int ret;
-+
-+	timings->pad = node->src_pad_id;
-+	ret = v4l2_subdev_call(dev->sensor, pad, enum_dv_timings, timings);
-+	timings->pad = node->pad_id;
-+
-+	return ret;
-+}
-+
-+static int unicam_dv_timings_cap(struct file *file, void *priv,
-+				 struct v4l2_dv_timings_cap *cap)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+	int ret;
-+
-+	cap->pad = node->src_pad_id;
-+	ret = v4l2_subdev_call(dev->sensor, pad, dv_timings_cap, cap);
-+	cap->pad = node->pad_id;
-+
-+	return ret;
-+}
-+
-+static int unicam_subscribe_event(struct v4l2_fh *fh,
-+				  const struct v4l2_event_subscription *sub)
-+{
-+	switch (sub->type) {
-+	case V4L2_EVENT_FRAME_SYNC:
-+		return v4l2_event_subscribe(fh, sub, 2, NULL);
-+	case V4L2_EVENT_SOURCE_CHANGE:
-+		return v4l2_event_subscribe(fh, sub, 4, NULL);
-+	}
-+
-+	return v4l2_ctrl_subscribe_event(fh, sub);
-+}
-+
-+static void unicam_notify(struct v4l2_subdev *sd,
-+			  unsigned int notification, void *arg)
-+{
-+	struct unicam_device *dev = to_unicam_device(sd->v4l2_dev);
-+
-+	switch (notification) {
-+	case V4L2_DEVICE_NOTIFY_EVENT:
-+		v4l2_event_queue(&dev->node[IMAGE_PAD].video_dev, arg);
-+		break;
-+	default:
-+		break;
-+	}
-+}
-+
-+/* unicam capture ioctl operations */
-+static const struct v4l2_ioctl_ops unicam_ioctl_ops = {
-+	.vidioc_querycap		= unicam_querycap,
-+	.vidioc_enum_fmt_vid_cap	= unicam_enum_fmt_vid_cap,
-+	.vidioc_g_fmt_vid_cap		= unicam_g_fmt_vid_cap,
-+	.vidioc_s_fmt_vid_cap		= unicam_s_fmt_vid_cap,
-+	.vidioc_try_fmt_vid_cap		= unicam_try_fmt_vid_cap,
-+
-+	.vidioc_enum_fmt_meta_cap	= unicam_enum_fmt_meta_cap,
-+	.vidioc_g_fmt_meta_cap		= unicam_g_fmt_meta_cap,
-+	.vidioc_s_fmt_meta_cap		= unicam_g_fmt_meta_cap,
-+	.vidioc_try_fmt_meta_cap	= unicam_g_fmt_meta_cap,
-+
-+	.vidioc_enum_input		= unicam_enum_input,
-+	.vidioc_g_input			= unicam_g_input,
-+	.vidioc_s_input			= unicam_s_input,
-+
-+	.vidioc_querystd		= unicam_querystd,
-+	.vidioc_s_std			= unicam_s_std,
-+	.vidioc_g_std			= unicam_g_std,
-+
-+	.vidioc_g_edid			= unicam_g_edid,
-+	.vidioc_s_edid			= unicam_s_edid,
-+
-+	.vidioc_enum_framesizes		= unicam_enum_framesizes,
-+	.vidioc_enum_frameintervals	= unicam_enum_frameintervals,
-+
-+	.vidioc_g_selection		= unicam_g_selection,
-+	.vidioc_s_selection		= unicam_s_selection,
-+
-+	.vidioc_g_parm			= unicam_g_parm,
-+	.vidioc_s_parm			= unicam_s_parm,
-+
-+	.vidioc_s_dv_timings		= unicam_s_dv_timings,
-+	.vidioc_g_dv_timings		= unicam_g_dv_timings,
-+	.vidioc_query_dv_timings	= unicam_query_dv_timings,
-+	.vidioc_enum_dv_timings		= unicam_enum_dv_timings,
-+	.vidioc_dv_timings_cap		= unicam_dv_timings_cap,
-+
-+	.vidioc_reqbufs			= vb2_ioctl_reqbufs,
-+	.vidioc_create_bufs		= vb2_ioctl_create_bufs,
-+	.vidioc_prepare_buf		= vb2_ioctl_prepare_buf,
-+	.vidioc_querybuf		= vb2_ioctl_querybuf,
-+	.vidioc_qbuf			= vb2_ioctl_qbuf,
-+	.vidioc_dqbuf			= vb2_ioctl_dqbuf,
-+	.vidioc_expbuf			= vb2_ioctl_expbuf,
-+	.vidioc_streamon		= vb2_ioctl_streamon,
-+	.vidioc_streamoff		= vb2_ioctl_streamoff,
-+
-+	.vidioc_log_status		= unicam_log_status,
-+	.vidioc_subscribe_event		= unicam_subscribe_event,
-+	.vidioc_unsubscribe_event	= v4l2_event_unsubscribe,
-+};
-+
-+/* V4L2 Media Controller Centric IOCTLs */
-+
-+static int unicam_mc_enum_fmt_vid_cap(struct file *file, void  *priv,
-+				      struct v4l2_fmtdesc *f)
-+{
-+	int i, j;
-+
-+	for (i = 0, j = 0; i < ARRAY_SIZE(formats); i++) {
-+		if (f->mbus_code && formats[i].code != f->mbus_code)
-+			continue;
-+		if (formats[i].mc_skip || formats[i].metadata_fmt)
-+			continue;
-+
-+		if (formats[i].fourcc) {
-+			if (j == f->index) {
-+				f->pixelformat = formats[i].fourcc;
-+				f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+				return 0;
-+			}
-+			j++;
-+		}
-+		if (formats[i].repacked_fourcc) {
-+			if (j == f->index) {
-+				f->pixelformat = formats[i].repacked_fourcc;
-+				f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+				return 0;
-+			}
-+			j++;
-+		}
-+	}
-+
-+	return -EINVAL;
-+}
-+
-+static int unicam_mc_g_fmt_vid_cap(struct file *file, void *priv,
-+				   struct v4l2_format *f)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+
-+	if (node->pad_id != IMAGE_PAD)
-+		return -EINVAL;
-+
-+	*f = node->v_fmt;
-+
-+	return 0;
-+}
-+
-+static void unicam_mc_try_fmt(struct unicam_node *node, struct v4l2_format *f,
-+			      const struct unicam_fmt **ret_fmt)
-+{
-+	struct v4l2_pix_format *v4l2_format = &f->fmt.pix;
-+	struct unicam_device *dev = node->dev;
-+	const struct unicam_fmt *fmt;
-+	int is_rgb;
-+
-+	/*
-+	 * Default to the first format if the requested pixel format code isn't
-+	 * supported.
-+	 */
-+	fmt = find_format_by_pix(dev, v4l2_format->pixelformat);
-+	if (!fmt) {
-+		fmt = &formats[0];
-+		v4l2_format->pixelformat = fmt->fourcc;
-+	}
-+
-+	unicam_calc_format_size_bpl(dev, fmt, f);
-+
-+	if (v4l2_format->field == V4L2_FIELD_ANY)
-+		v4l2_format->field = V4L2_FIELD_NONE;
-+
-+	if (ret_fmt)
-+		*ret_fmt = fmt;
-+
-+	if (v4l2_format->colorspace >= MAX_COLORSPACE ||
-+	    !(fmt->valid_colorspaces & (1 << v4l2_format->colorspace))) {
-+		v4l2_format->colorspace = __ffs(fmt->valid_colorspaces);
-+
-+		v4l2_format->xfer_func =
-+			V4L2_MAP_XFER_FUNC_DEFAULT(v4l2_format->colorspace);
-+		v4l2_format->ycbcr_enc =
-+			V4L2_MAP_YCBCR_ENC_DEFAULT(v4l2_format->colorspace);
-+		is_rgb = v4l2_format->colorspace == V4L2_COLORSPACE_SRGB;
-+		v4l2_format->quantization =
-+			V4L2_MAP_QUANTIZATION_DEFAULT(is_rgb,
-+						      v4l2_format->colorspace,
-+						      v4l2_format->ycbcr_enc);
-+	}
-+
-+	unicam_dbg(3, dev, "%s: %08x %ux%u (bytesperline %u sizeimage %u)\n",
-+		   __func__, v4l2_format->pixelformat,
-+		   v4l2_format->width, v4l2_format->height,
-+		   v4l2_format->bytesperline, v4l2_format->sizeimage);
-+}
-+
-+static int unicam_mc_try_fmt_vid_cap(struct file *file, void *priv,
-+				     struct v4l2_format *f)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+
-+	unicam_mc_try_fmt(node, f, NULL);
-+	return 0;
-+}
-+
-+static int unicam_mc_s_fmt_vid_cap(struct file *file, void *priv,
-+				   struct v4l2_format *f)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+	const struct unicam_fmt *fmt;
-+
-+	if (vb2_is_busy(&node->buffer_queue)) {
-+		unicam_dbg(3, dev, "%s device busy\n", __func__);
-+		return -EBUSY;
-+	}
-+
-+	unicam_mc_try_fmt(node, f, &fmt);
-+
-+	node->v_fmt = *f;
-+	node->fmt = fmt;
-+
-+	return 0;
-+}
-+
-+static int unicam_mc_enum_framesizes(struct file *file, void *fh,
-+				     struct v4l2_frmsizeenum *fsize)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+	struct unicam_device *dev = node->dev;
-+
-+	if (fsize->index > 0)
-+		return -EINVAL;
-+
-+	if (!find_format_by_pix(dev, fsize->pixel_format)) {
-+		unicam_dbg(3, dev, "Invalid pixel format 0x%08x\n",
-+			   fsize->pixel_format);
-+		return -EINVAL;
-+	}
-+
-+	fsize->type = V4L2_FRMSIZE_TYPE_STEPWISE;
-+	fsize->stepwise.min_width = MIN_WIDTH;
-+	fsize->stepwise.max_width = MAX_WIDTH;
-+	fsize->stepwise.step_width = 1;
-+	fsize->stepwise.min_height = MIN_HEIGHT;
-+	fsize->stepwise.max_height = MAX_HEIGHT;
-+	fsize->stepwise.step_height = 1;
-+
-+	return 0;
-+}
-+
-+static int unicam_mc_enum_fmt_meta_cap(struct file *file, void  *priv,
-+				       struct v4l2_fmtdesc *f)
-+{
-+	int i, j;
-+
-+	for (i = 0, j = 0; i < ARRAY_SIZE(formats); i++) {
-+		if (f->mbus_code && formats[i].code != f->mbus_code)
-+			continue;
-+		if (!formats[i].metadata_fmt)
-+			continue;
-+
-+		if (formats[i].fourcc) {
-+			if (j == f->index) {
-+				f->pixelformat = formats[i].fourcc;
-+				f->type = V4L2_BUF_TYPE_META_CAPTURE;
-+				return 0;
-+			}
-+			j++;
-+		}
-+	}
-+
-+	return -EINVAL;
-+}
-+
-+static int unicam_mc_g_fmt_meta_cap(struct file *file, void *priv,
-+				    struct v4l2_format *f)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+
-+	if (node->pad_id != METADATA_PAD)
-+		return -EINVAL;
-+
-+	*f = node->v_fmt;
-+
-+	return 0;
-+}
-+
-+static int unicam_mc_try_fmt_meta_cap(struct file *file, void *priv,
-+				      struct v4l2_format *f)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+
-+	if (node->pad_id != METADATA_PAD)
-+		return -EINVAL;
-+
-+	f->fmt.meta.dataformat = V4L2_META_FMT_SENSOR_DATA;
-+
-+	return 0;
-+}
-+
-+static int unicam_mc_s_fmt_meta_cap(struct file *file, void *priv,
-+				    struct v4l2_format *f)
-+{
-+	struct unicam_node *node = video_drvdata(file);
-+
-+	if (node->pad_id != METADATA_PAD)
-+		return -EINVAL;
-+
-+	unicam_mc_try_fmt_meta_cap(file, priv, f);
-+
-+	node->v_fmt = *f;
-+
-+	return 0;
-+}
-+
-+static const struct v4l2_ioctl_ops unicam_mc_ioctl_ops = {
-+	.vidioc_querycap      = unicam_querycap,
-+	.vidioc_enum_fmt_vid_cap  = unicam_mc_enum_fmt_vid_cap,
-+	.vidioc_g_fmt_vid_cap     = unicam_mc_g_fmt_vid_cap,
-+	.vidioc_try_fmt_vid_cap   = unicam_mc_try_fmt_vid_cap,
-+	.vidioc_s_fmt_vid_cap     = unicam_mc_s_fmt_vid_cap,
-+
-+	.vidioc_enum_fmt_meta_cap	= unicam_mc_enum_fmt_meta_cap,
-+	.vidioc_g_fmt_meta_cap		= unicam_mc_g_fmt_meta_cap,
-+	.vidioc_try_fmt_meta_cap	= unicam_mc_try_fmt_meta_cap,
-+	.vidioc_s_fmt_meta_cap		= unicam_mc_s_fmt_meta_cap,
-+
-+	.vidioc_enum_framesizes   = unicam_mc_enum_framesizes,
-+	.vidioc_reqbufs       = vb2_ioctl_reqbufs,
-+	.vidioc_create_bufs   = vb2_ioctl_create_bufs,
-+	.vidioc_prepare_buf   = vb2_ioctl_prepare_buf,
-+	.vidioc_querybuf      = vb2_ioctl_querybuf,
-+	.vidioc_qbuf          = vb2_ioctl_qbuf,
-+	.vidioc_dqbuf         = vb2_ioctl_dqbuf,
-+	.vidioc_expbuf        = vb2_ioctl_expbuf,
-+	.vidioc_streamon      = vb2_ioctl_streamon,
-+	.vidioc_streamoff     = vb2_ioctl_streamoff,
-+
-+	.vidioc_log_status		= unicam_log_status,
-+	.vidioc_subscribe_event		= unicam_subscribe_event,
-+	.vidioc_unsubscribe_event	= v4l2_event_unsubscribe,
-+};
-+
-+static int
-+unicam_mc_subdev_link_validate_get_format(struct media_pad *pad,
-+					  struct v4l2_subdev_format *fmt)
-+{
-+	if (is_media_entity_v4l2_subdev(pad->entity)) {
-+		struct v4l2_subdev *sd =
-+			media_entity_to_v4l2_subdev(pad->entity);
-+
-+		fmt->which = V4L2_SUBDEV_FORMAT_ACTIVE;
-+		fmt->pad = pad->index;
-+		return v4l2_subdev_call(sd, pad, get_fmt, NULL, fmt);
-+	}
-+
-+	return -EINVAL;
-+}
-+
-+static int unicam_mc_video_link_validate(struct media_link *link)
-+{
-+	struct video_device *vd = container_of(link->sink->entity,
-+						struct video_device, entity);
-+	struct unicam_node *node = container_of(vd, struct unicam_node,
-+						video_dev);
-+	struct unicam_device *unicam = node->dev;
-+	struct v4l2_subdev_format source_fmt;
-+	int ret;
-+
-+	if (!media_entity_remote_source_pad_unique(link->sink->entity)) {
-+		unicam_dbg(1, unicam,
-+			   "video node %s pad not connected\n", vd->name);
-+		return -ENOTCONN;
-+	}
-+
-+	ret = unicam_mc_subdev_link_validate_get_format(link->source,
-+							&source_fmt);
-+	if (ret < 0)
-+		return 0;
-+
-+	if (node->pad_id == IMAGE_PAD) {
-+		struct v4l2_pix_format *pix_fmt = &node->v_fmt.fmt.pix;
-+		const struct unicam_fmt *fmt;
-+
-+		if (source_fmt.format.width != pix_fmt->width ||
-+		    source_fmt.format.height != pix_fmt->height) {
-+			unicam_err(unicam,
-+				   "Wrong width or height %ux%u (remote pad set to %ux%u)\n",
-+				   pix_fmt->width, pix_fmt->height,
-+				   source_fmt.format.width,
-+				   source_fmt.format.height);
-+			return -EINVAL;
-+		}
-+
-+		fmt = find_format_by_code(source_fmt.format.code);
-+
-+		if (!fmt || (fmt->fourcc != pix_fmt->pixelformat &&
-+			     fmt->repacked_fourcc != pix_fmt->pixelformat))
-+			return -EINVAL;
-+	} else {
-+		struct v4l2_meta_format *meta_fmt = &node->v_fmt.fmt.meta;
-+
-+		if (source_fmt.format.width != meta_fmt->buffersize ||
-+		    source_fmt.format.height != 1 ||
-+		    source_fmt.format.code != MEDIA_BUS_FMT_SENSOR_DATA) {
-+			unicam_err(unicam,
-+				   "Wrong metadata width/height/code %ux%u %08x (remote pad set to %ux%u %08x)\n",
-+				   meta_fmt->buffersize, 1,
-+				   MEDIA_BUS_FMT_SENSOR_DATA,
-+				   source_fmt.format.width,
-+				   source_fmt.format.height,
-+				   source_fmt.format.code);
-+			return -EINVAL;
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+static const struct media_entity_operations unicam_mc_entity_ops = {
-+	.link_validate = unicam_mc_video_link_validate,
-+};
-+
-+/* videobuf2 Operations */
-+
- static int unicam_queue_setup(struct vb2_queue *vq,
- 			      unsigned int *nbuffers,
- 			      unsigned int *nplanes,
-@@ -1495,7 +2329,7 @@ static void unicam_start_rx(struct unica
- 		/* CSI2 */
- 		set_field(&val, 1, UNICAM_CLE);
- 		set_field(&val, 1, UNICAM_CLLPE);
--		if (dev->bus_flags & V4L2_MBUS_CSI2_CONTINUOUS_CLOCK) {
-+		if (!(dev->bus_flags & V4L2_MBUS_CSI2_NONCONTINUOUS_CLOCK)) {
- 			set_field(&val, 1, UNICAM_CLTRE);
- 			set_field(&val, 1, UNICAM_CLHSE);
- 		}
-@@ -1517,7 +2351,7 @@ static void unicam_start_rx(struct unica
- 		/* CSI2 */
- 		set_field(&val, 1, UNICAM_DLE);
- 		set_field(&val, 1, UNICAM_DLLPE);
--		if (dev->bus_flags & V4L2_MBUS_CSI2_CONTINUOUS_CLOCK) {
-+		if (!(dev->bus_flags & V4L2_MBUS_CSI2_NONCONTINUOUS_CLOCK)) {
- 			set_field(&val, 1, UNICAM_DLTRE);
- 			set_field(&val, 1, UNICAM_DLHSE);
- 		}
-@@ -1666,6 +2500,12 @@ static int unicam_start_streaming(struct
- 		goto err_streaming;
- 	}
- 
-+	ret = media_pipeline_start(&node->video_dev.entity, &node->pipe);
-+	if (ret < 0) {
-+		unicam_err(dev, "Failed to start media pipeline: %d\n", ret);
-+		goto err_pm_put;
-+	}
-+
- 	dev->active_data_lanes = dev->max_data_lanes;
- 
- 	if (dev->bus_type == V4L2_MBUS_CSI2_DPHY) {
-@@ -1675,12 +2515,10 @@ static int unicam_start_streaming(struct
- 				       0, &mbus_config);
- 		if (ret < 0 && ret != -ENOIOCTLCMD) {
- 			unicam_dbg(3, dev, "g_mbus_config failed\n");
--			goto err_pm_put;
-+			goto error_pipeline;
- 		}
- 
--		dev->active_data_lanes =
--			(mbus_config.flags & V4L2_MBUS_CSI2_LANE_MASK) >>
--					__ffs(V4L2_MBUS_CSI2_LANE_MASK);
-+		dev->active_data_lanes = mbus_config.bus.mipi_csi2.num_data_lanes;
- 		if (!dev->active_data_lanes)
- 			dev->active_data_lanes = dev->max_data_lanes;
- 		if (dev->active_data_lanes > dev->max_data_lanes) {
-@@ -1688,7 +2526,7 @@ static int unicam_start_streaming(struct
- 				   dev->active_data_lanes,
- 				   dev->max_data_lanes);
- 			ret = -EINVAL;
--			goto err_pm_put;
-+			goto error_pipeline;
- 		}
- 	}
- 
-@@ -1698,13 +2536,13 @@ static int unicam_start_streaming(struct
- 	ret = clk_set_min_rate(dev->vpu_clock, MIN_VPU_CLOCK_RATE);
- 	if (ret) {
- 		unicam_err(dev, "failed to set up VPU clock\n");
--		goto err_pm_put;
-+		goto error_pipeline;
- 	}
- 
- 	ret = clk_prepare_enable(dev->vpu_clock);
- 	if (ret) {
- 		unicam_err(dev, "Failed to enable VPU clock: %d\n", ret);
--		goto err_pm_put;
-+		goto error_pipeline;
- 	}
- 
- 	ret = clk_set_rate(dev->clock, 100 * 1000 * 1000);
-@@ -1755,6 +2593,8 @@ err_vpu_clock:
- 	if (clk_set_min_rate(dev->vpu_clock, 0))
- 		unicam_err(dev, "failed to reset the VPU clock\n");
- 	clk_disable_unprepare(dev->vpu_clock);
-+error_pipeline:
-+	media_pipeline_stop(&node->video_dev.entity);
- err_pm_put:
- 	unicam_runtime_put(dev);
- err_streaming:
-@@ -1782,6 +2622,8 @@ static void unicam_stop_streaming(struct
- 
- 		unicam_disable(dev);
- 
-+		media_pipeline_stop(&node->video_dev.entity);
-+
- 		if (dev->clocks_enabled) {
- 			if (clk_set_min_rate(dev->vpu_clock, 0))
- 				unicam_err(dev, "failed to reset the min VPU clock\n");
-@@ -1806,379 +2648,6 @@ static void unicam_stop_streaming(struct
- 	unicam_return_buffers(node, VB2_BUF_STATE_ERROR);
- }
- 
--static int unicam_enum_input(struct file *file, void *priv,
--			     struct v4l2_input *inp)
--{
--	struct unicam_node *node = video_drvdata(file);
--	struct unicam_device *dev = node->dev;
--	int ret;
--
--	if (inp->index != 0)
--		return -EINVAL;
--
--	inp->type = V4L2_INPUT_TYPE_CAMERA;
--	if (v4l2_subdev_has_op(dev->sensor, video, s_dv_timings)) {
--		inp->capabilities = V4L2_IN_CAP_DV_TIMINGS;
--		inp->std = 0;
--	} else if (v4l2_subdev_has_op(dev->sensor, video, s_std)) {
--		inp->capabilities = V4L2_IN_CAP_STD;
--		if (v4l2_subdev_call(dev->sensor, video, g_tvnorms, &inp->std) < 0)
--			inp->std = V4L2_STD_ALL;
--	} else {
--		inp->capabilities = 0;
--		inp->std = 0;
--	}
--
--	if (v4l2_subdev_has_op(dev->sensor, video, g_input_status)) {
--		ret = v4l2_subdev_call(dev->sensor, video, g_input_status,
--				       &inp->status);
--		if (ret < 0)
--			return ret;
--	}
--
--	snprintf(inp->name, sizeof(inp->name), "Camera 0");
--	return 0;
--}
--
--static int unicam_g_input(struct file *file, void *priv, unsigned int *i)
--{
--	*i = 0;
--
--	return 0;
--}
--
--static int unicam_s_input(struct file *file, void *priv, unsigned int i)
--{
--	/*
--	 * FIXME: Ideally we would like to be able to query the source
--	 * subdevice for information over the input connectors it supports,
--	 * and map that through in to a call to video_ops->s_routing.
--	 * There is no infrastructure support for defining that within
--	 * devicetree at present. Until that is implemented we can't
--	 * map a user physical connector number to s_routing input number.
--	 */
--	if (i > 0)
--		return -EINVAL;
--
--	return 0;
--}
--
--static int unicam_querystd(struct file *file, void *priv,
--			   v4l2_std_id *std)
--{
--	struct unicam_node *node = video_drvdata(file);
--	struct unicam_device *dev = node->dev;
--
--	return v4l2_subdev_call(dev->sensor, video, querystd, std);
--}
--
--static int unicam_g_std(struct file *file, void *priv, v4l2_std_id *std)
--{
--	struct unicam_node *node = video_drvdata(file);
--	struct unicam_device *dev = node->dev;
--
--	return v4l2_subdev_call(dev->sensor, video, g_std, std);
--}
--
--static int unicam_s_std(struct file *file, void *priv, v4l2_std_id std)
--{
--	struct unicam_node *node = video_drvdata(file);
--	struct unicam_device *dev = node->dev;
--	int ret;
--	v4l2_std_id current_std;
--
--	ret = v4l2_subdev_call(dev->sensor, video, g_std, &current_std);
--	if (ret)
--		return ret;
--
--	if (std == current_std)
--		return 0;
--
--	if (vb2_is_busy(&node->buffer_queue))
--		return -EBUSY;
--
--	ret = v4l2_subdev_call(dev->sensor, video, s_std, std);
--
--	/* Force recomputation of bytesperline */
--	node->v_fmt.fmt.pix.bytesperline = 0;
--
--	unicam_reset_format(node);
--
--	return ret;
--}
--
--static int unicam_s_edid(struct file *file, void *priv, struct v4l2_edid *edid)
--{
--	struct unicam_node *node = video_drvdata(file);
--	struct unicam_device *dev = node->dev;
--
--	return v4l2_subdev_call(dev->sensor, pad, set_edid, edid);
--}
--
--static int unicam_g_edid(struct file *file, void *priv, struct v4l2_edid *edid)
--{
--	struct unicam_node *node = video_drvdata(file);
--	struct unicam_device *dev = node->dev;
--
--	return v4l2_subdev_call(dev->sensor, pad, get_edid, edid);
--}
--
--static int unicam_s_selection(struct file *file, void *priv,
--			      struct v4l2_selection *sel)
--{
--	struct unicam_node *node = video_drvdata(file);
--	struct unicam_device *dev = node->dev;
--	struct v4l2_subdev_selection sdsel = {
--		.which = V4L2_SUBDEV_FORMAT_ACTIVE,
--		.target = sel->target,
--		.flags = sel->flags,
--		.r = sel->r,
--	};
--
--	if (sel->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
--		return -EINVAL;
--
--	return v4l2_subdev_call(dev->sensor, pad, set_selection, NULL, &sdsel);
--}
--
--static int unicam_g_selection(struct file *file, void *priv,
--			      struct v4l2_selection *sel)
--{
--	struct unicam_node *node = video_drvdata(file);
--	struct unicam_device *dev = node->dev;
--	struct v4l2_subdev_selection sdsel = {
--		.which = V4L2_SUBDEV_FORMAT_ACTIVE,
--		.target = sel->target,
--	};
--	int ret;
--
--	if (sel->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
--		return -EINVAL;
--
--	ret = v4l2_subdev_call(dev->sensor, pad, get_selection, NULL, &sdsel);
--	if (!ret)
--		sel->r = sdsel.r;
--
--	return ret;
--}
--
--static int unicam_enum_framesizes(struct file *file, void *priv,
--				  struct v4l2_frmsizeenum *fsize)
--{
--	struct unicam_node *node = video_drvdata(file);
--	struct unicam_device *dev = node->dev;
--	const struct unicam_fmt *fmt;
--	struct v4l2_subdev_frame_size_enum fse;
--	int ret;
--
--	/* check for valid format */
--	fmt = find_format_by_pix(dev, fsize->pixel_format);
--	if (!fmt) {
--		unicam_dbg(3, dev, "Invalid pixel code: %x\n",
--			   fsize->pixel_format);
--		return -EINVAL;
--	}
--	fse.code = fmt->code;
--
--	fse.which = V4L2_SUBDEV_FORMAT_ACTIVE;
--	fse.index = fsize->index;
--	fse.pad = node->src_pad_id;
--
--	ret = v4l2_subdev_call(dev->sensor, pad, enum_frame_size, NULL, &fse);
--	if (ret)
--		return ret;
--
--	unicam_dbg(1, dev, "%s: index: %d code: %x W:[%d,%d] H:[%d,%d]\n",
--		   __func__, fse.index, fse.code, fse.min_width, fse.max_width,
--		   fse.min_height, fse.max_height);
--
--	fsize->type = V4L2_FRMSIZE_TYPE_DISCRETE;
--	fsize->discrete.width = fse.max_width;
--	fsize->discrete.height = fse.max_height;
--
--	return 0;
--}
--
--static int unicam_enum_frameintervals(struct file *file, void *priv,
--				      struct v4l2_frmivalenum *fival)
--{
--	struct unicam_node *node = video_drvdata(file);
--	struct unicam_device *dev = node->dev;
--	const struct unicam_fmt *fmt;
--	struct v4l2_subdev_frame_interval_enum fie = {
--		.index = fival->index,
--		.pad = node->src_pad_id,
--		.width = fival->width,
--		.height = fival->height,
--		.which = V4L2_SUBDEV_FORMAT_ACTIVE,
--	};
--	int ret;
--
--	fmt = find_format_by_pix(dev, fival->pixel_format);
--	if (!fmt)
--		return -EINVAL;
--
--	fie.code = fmt->code;
--	ret = v4l2_subdev_call(dev->sensor, pad, enum_frame_interval,
--			       NULL, &fie);
--	if (ret)
--		return ret;
--
--	fival->type = V4L2_FRMIVAL_TYPE_DISCRETE;
--	fival->discrete = fie.interval;
--
--	return 0;
--}
--
--static int unicam_g_parm(struct file *file, void *fh, struct v4l2_streamparm *a)
--{
--	struct unicam_node *node = video_drvdata(file);
--	struct unicam_device *dev = node->dev;
--
--	return v4l2_g_parm_cap(video_devdata(file), dev->sensor, a);
--}
--
--static int unicam_s_parm(struct file *file, void *fh, struct v4l2_streamparm *a)
--{
--	struct unicam_node *node = video_drvdata(file);
--	struct unicam_device *dev = node->dev;
--
--	return v4l2_s_parm_cap(video_devdata(file), dev->sensor, a);
--}
--
--static int unicam_g_dv_timings(struct file *file, void *priv,
--			       struct v4l2_dv_timings *timings)
--{
--	struct unicam_node *node = video_drvdata(file);
--	struct unicam_device *dev = node->dev;
--
--	return v4l2_subdev_call(dev->sensor, video, g_dv_timings, timings);
--}
--
--static int unicam_s_dv_timings(struct file *file, void *priv,
--			       struct v4l2_dv_timings *timings)
--{
--	struct unicam_node *node = video_drvdata(file);
--	struct unicam_device *dev = node->dev;
--	struct v4l2_dv_timings current_timings;
--	int ret;
--
--	ret = v4l2_subdev_call(dev->sensor, video, g_dv_timings,
--			       &current_timings);
--
--	if (ret < 0)
--		return ret;
--
--	if (v4l2_match_dv_timings(timings, &current_timings, 0, false))
--		return 0;
--
--	if (vb2_is_busy(&node->buffer_queue))
--		return -EBUSY;
--
--	ret = v4l2_subdev_call(dev->sensor, video, s_dv_timings, timings);
--
--	/* Force recomputation of bytesperline */
--	node->v_fmt.fmt.pix.bytesperline = 0;
--
--	unicam_reset_format(node);
--
--	return ret;
--}
--
--static int unicam_query_dv_timings(struct file *file, void *priv,
--				   struct v4l2_dv_timings *timings)
--{
--	struct unicam_node *node = video_drvdata(file);
--	struct unicam_device *dev = node->dev;
--
--	return v4l2_subdev_call(dev->sensor, video, query_dv_timings, timings);
--}
--
--static int unicam_enum_dv_timings(struct file *file, void *priv,
--				  struct v4l2_enum_dv_timings *timings)
--{
--	struct unicam_node *node = video_drvdata(file);
--	struct unicam_device *dev = node->dev;
--	int ret;
--
--	timings->pad = node->src_pad_id;
--	ret = v4l2_subdev_call(dev->sensor, pad, enum_dv_timings, timings);
--	timings->pad = node->pad_id;
--
--	return ret;
--}
--
--static int unicam_dv_timings_cap(struct file *file, void *priv,
--				 struct v4l2_dv_timings_cap *cap)
--{
--	struct unicam_node *node = video_drvdata(file);
--	struct unicam_device *dev = node->dev;
--	int ret;
--
--	cap->pad = node->src_pad_id;
--	ret = v4l2_subdev_call(dev->sensor, pad, dv_timings_cap, cap);
--	cap->pad = node->pad_id;
--
--	return ret;
--}
--
--static int unicam_subscribe_event(struct v4l2_fh *fh,
--				  const struct v4l2_event_subscription *sub)
--{
--	switch (sub->type) {
--	case V4L2_EVENT_FRAME_SYNC:
--		return v4l2_event_subscribe(fh, sub, 2, NULL);
--	case V4L2_EVENT_SOURCE_CHANGE:
--		return v4l2_event_subscribe(fh, sub, 4, NULL);
--	}
--
--	return v4l2_ctrl_subscribe_event(fh, sub);
--}
--
--static int unicam_log_status(struct file *file, void *fh)
--{
--	struct unicam_node *node = video_drvdata(file);
--	struct unicam_device *dev = node->dev;
--	u32 reg;
--
--	/* status for sub devices */
--	v4l2_device_call_all(&dev->v4l2_dev, 0, core, log_status);
--
--	unicam_info(dev, "-----Receiver status-----\n");
--	unicam_info(dev, "V4L2 width/height:   %ux%u\n",
--		    node->v_fmt.fmt.pix.width, node->v_fmt.fmt.pix.height);
--	unicam_info(dev, "Mediabus format:     %08x\n", node->fmt->code);
--	unicam_info(dev, "V4L2 format:         %08x\n",
--		    node->v_fmt.fmt.pix.pixelformat);
--	reg = reg_read(dev, UNICAM_IPIPE);
--	unicam_info(dev, "Unpacking/packing:   %u / %u\n",
--		    get_field(reg, UNICAM_PUM_MASK),
--		    get_field(reg, UNICAM_PPM_MASK));
--	unicam_info(dev, "----Live data----\n");
--	unicam_info(dev, "Programmed stride:   %4u\n",
--		    reg_read(dev, UNICAM_IBLS));
--	unicam_info(dev, "Detected resolution: %ux%u\n",
--		    reg_read(dev, UNICAM_IHSTA),
--		    reg_read(dev, UNICAM_IVSTA));
--	unicam_info(dev, "Write pointer:       %08x\n",
--		    reg_read(dev, UNICAM_IBWP));
--
--	return 0;
--}
--
--static void unicam_notify(struct v4l2_subdev *sd,
--			  unsigned int notification, void *arg)
--{
--	struct unicam_device *dev = to_unicam_device(sd->v4l2_dev);
--
--	switch (notification) {
--	case V4L2_DEVICE_NOTIFY_EVENT:
--		v4l2_event_queue(&dev->node[IMAGE_PAD].video_dev, arg);
--		break;
--	default:
--		break;
--	}
--}
- 
- static const struct vb2_ops unicam_video_qops = {
- 	.wait_prepare		= vb2_ops_wait_prepare,
-@@ -2261,60 +2730,6 @@ static const struct v4l2_file_operations
- 	.mmap		= vb2_fop_mmap,
- };
- 
--/* unicam capture ioctl operations */
--static const struct v4l2_ioctl_ops unicam_ioctl_ops = {
--	.vidioc_querycap		= unicam_querycap,
--	.vidioc_enum_fmt_vid_cap	= unicam_enum_fmt_vid_cap,
--	.vidioc_g_fmt_vid_cap		= unicam_g_fmt_vid_cap,
--	.vidioc_s_fmt_vid_cap		= unicam_s_fmt_vid_cap,
--	.vidioc_try_fmt_vid_cap		= unicam_try_fmt_vid_cap,
--
--	.vidioc_enum_fmt_meta_cap	= unicam_enum_fmt_meta_cap,
--	.vidioc_g_fmt_meta_cap		= unicam_g_fmt_meta_cap,
--	.vidioc_s_fmt_meta_cap		= unicam_g_fmt_meta_cap,
--	.vidioc_try_fmt_meta_cap	= unicam_g_fmt_meta_cap,
--
--	.vidioc_enum_input		= unicam_enum_input,
--	.vidioc_g_input			= unicam_g_input,
--	.vidioc_s_input			= unicam_s_input,
--
--	.vidioc_querystd		= unicam_querystd,
--	.vidioc_s_std			= unicam_s_std,
--	.vidioc_g_std			= unicam_g_std,
--
--	.vidioc_g_edid			= unicam_g_edid,
--	.vidioc_s_edid			= unicam_s_edid,
--
--	.vidioc_enum_framesizes		= unicam_enum_framesizes,
--	.vidioc_enum_frameintervals	= unicam_enum_frameintervals,
--
--	.vidioc_g_selection		= unicam_g_selection,
--	.vidioc_s_selection		= unicam_s_selection,
--
--	.vidioc_g_parm			= unicam_g_parm,
--	.vidioc_s_parm			= unicam_s_parm,
--
--	.vidioc_s_dv_timings		= unicam_s_dv_timings,
--	.vidioc_g_dv_timings		= unicam_g_dv_timings,
--	.vidioc_query_dv_timings	= unicam_query_dv_timings,
--	.vidioc_enum_dv_timings		= unicam_enum_dv_timings,
--	.vidioc_dv_timings_cap		= unicam_dv_timings_cap,
--
--	.vidioc_reqbufs			= vb2_ioctl_reqbufs,
--	.vidioc_create_bufs		= vb2_ioctl_create_bufs,
--	.vidioc_prepare_buf		= vb2_ioctl_prepare_buf,
--	.vidioc_querybuf		= vb2_ioctl_querybuf,
--	.vidioc_qbuf			= vb2_ioctl_qbuf,
--	.vidioc_dqbuf			= vb2_ioctl_dqbuf,
--	.vidioc_expbuf			= vb2_ioctl_expbuf,
--	.vidioc_streamon		= vb2_ioctl_streamon,
--	.vidioc_streamoff		= vb2_ioctl_streamoff,
--
--	.vidioc_log_status		= unicam_log_status,
--	.vidioc_subscribe_event		= unicam_subscribe_event,
--	.vidioc_unsubscribe_event	= v4l2_event_unsubscribe,
--};
--
- static int
- unicam_async_bound(struct v4l2_async_notifier *notifier,
- 		   struct v4l2_subdev *subdev,
-@@ -2365,11 +2780,11 @@ static void unicam_node_release(struct v
- 	unicam_put(node->dev);
- }
- 
--static int register_node(struct unicam_device *unicam, struct unicam_node *node,
--			 enum v4l2_buf_type type, int pad_id)
-+static int unicam_set_default_format(struct unicam_device *unicam,
-+				     struct unicam_node *node,
-+				     int pad_id,
-+				     const struct unicam_fmt **ret_fmt)
- {
--	struct video_device *vdev;
--	struct vb2_queue *q;
- 	struct v4l2_mbus_framefmt mbus_fmt = {0};
- 	const struct unicam_fmt *fmt;
- 	int ret;
-@@ -2414,15 +2829,69 @@ static int register_node(struct unicam_d
- 		node->v_fmt.fmt.meta.dataformat = fmt->fourcc;
- 	}
- 
-+	*ret_fmt = fmt;
-+
-+	return 0;
-+}
-+
-+static void unicam_mc_set_default_format(struct unicam_node *node, int pad_id)
-+{
-+	if (pad_id == IMAGE_PAD) {
-+		struct v4l2_pix_format *pix_fmt = &node->v_fmt.fmt.pix;
-+
-+		pix_fmt->width = 640;
-+		pix_fmt->height = 480;
-+		pix_fmt->field = V4L2_FIELD_NONE;
-+		pix_fmt->colorspace = V4L2_COLORSPACE_SRGB;
-+		pix_fmt->ycbcr_enc = V4L2_YCBCR_ENC_601;
-+		pix_fmt->quantization = V4L2_QUANTIZATION_LIM_RANGE;
-+		pix_fmt->xfer_func = V4L2_XFER_FUNC_SRGB;
-+		pix_fmt->pixelformat = formats[0].fourcc;
-+		unicam_calc_format_size_bpl(node->dev, &formats[0],
-+					    &node->v_fmt);
-+		node->v_fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+
-+		node->fmt = &formats[0];
-+	} else {
-+		const struct unicam_fmt *fmt;
-+
-+		/* Fix this node format as embedded data. */
-+		fmt = find_format_by_code(MEDIA_BUS_FMT_SENSOR_DATA);
-+		node->v_fmt.fmt.meta.dataformat = fmt->fourcc;
-+		node->fmt = fmt;
-+
-+		node->v_fmt.fmt.meta.buffersize = UNICAM_EMBEDDED_SIZE;
-+		node->embedded_lines = 1;
-+		node->v_fmt.type = V4L2_BUF_TYPE_META_CAPTURE;
-+	}
-+}
-+
-+static int register_node(struct unicam_device *unicam, struct unicam_node *node,
-+			 enum v4l2_buf_type type, int pad_id)
-+{
-+	struct video_device *vdev;
-+	struct vb2_queue *q;
-+	int ret;
-+
- 	node->dev = unicam;
- 	node->pad_id = pad_id;
--	node->fmt = fmt;
- 
--	/* Read current subdev format */
--	if (fmt)
--		unicam_reset_format(node);
-+	if (!unicam->mc_api) {
-+		const struct unicam_fmt *fmt;
- 
--	if (v4l2_subdev_has_op(unicam->sensor, video, s_std)) {
-+		ret = unicam_set_default_format(unicam, node, pad_id, &fmt);
-+		if (ret)
-+			return ret;
-+		node->fmt = fmt;
-+		/* Read current subdev format */
-+		if (fmt)
-+			unicam_reset_format(node);
-+	} else {
-+		unicam_mc_set_default_format(node, pad_id);
-+	}
-+
-+	if (!unicam->mc_api &&
-+	    v4l2_subdev_has_op(unicam->sensor, video, s_std)) {
- 		v4l2_std_id tvnorms;
- 
- 		if (WARN_ON(!v4l2_subdev_has_op(unicam->sensor, video,
-@@ -2445,12 +2914,15 @@ static int register_node(struct unicam_d
- 
- 	vdev = &node->video_dev;
- 	if (pad_id == IMAGE_PAD) {
--		/* Add controls from the subdevice */
--		ret = v4l2_ctrl_add_handler(&unicam->ctrl_handler,
--					    unicam->sensor->ctrl_handler, NULL,
--					    true);
--		if (ret < 0)
--			return ret;
-+		if (!unicam->mc_api) {
-+			/* Add controls from the subdevice */
-+			ret = v4l2_ctrl_add_handler(&unicam->ctrl_handler,
-+						    unicam->sensor->ctrl_handler,
-+						    NULL,
-+						    true);
-+			if (ret < 0)
-+				return ret;
-+		}
- 
- 		/*
- 		 * If the sensor subdevice has any controls, associate the node
-@@ -2482,7 +2954,8 @@ static int register_node(struct unicam_d
- 
- 	vdev->release = unicam_node_release;
- 	vdev->fops = &unicam_fops;
--	vdev->ioctl_ops = &unicam_ioctl_ops;
-+	vdev->ioctl_ops = unicam->mc_api ? &unicam_mc_ioctl_ops :
-+					   &unicam_ioctl_ops;
- 	vdev->v4l2_dev = &unicam->v4l2_dev;
- 	vdev->vfl_dir = VFL_DIR_RX;
- 	vdev->queue = q;
-@@ -2490,6 +2963,10 @@ static int register_node(struct unicam_d
- 	vdev->device_caps = (pad_id == IMAGE_PAD) ?
- 				V4L2_CAP_VIDEO_CAPTURE : V4L2_CAP_META_CAPTURE;
- 	vdev->device_caps |= V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;
-+	if (unicam->mc_api) {
-+		vdev->device_caps |= V4L2_CAP_IO_MC;
-+		vdev->entity.ops = &unicam_mc_entity_ops;
-+	}
- 
- 	/* Define the device names */
- 	snprintf(vdev->name, sizeof(vdev->name), "%s-%s", UNICAM_MODULE_NAME,
-@@ -2509,48 +2986,61 @@ static int register_node(struct unicam_d
- 		unicam_err(unicam, "Unable to allocate dummy buffer.\n");
- 		return -ENOMEM;
- 	}
--
--	if (pad_id == METADATA_PAD ||
--	    !v4l2_subdev_has_op(unicam->sensor, video, s_std)) {
--		v4l2_disable_ioctl(&node->video_dev, VIDIOC_S_STD);
--		v4l2_disable_ioctl(&node->video_dev, VIDIOC_G_STD);
--		v4l2_disable_ioctl(&node->video_dev, VIDIOC_ENUMSTD);
--	}
--	if (pad_id == METADATA_PAD ||
--	    !v4l2_subdev_has_op(unicam->sensor, video, querystd))
--		v4l2_disable_ioctl(&node->video_dev, VIDIOC_QUERYSTD);
--	if (pad_id == METADATA_PAD ||
--	    !v4l2_subdev_has_op(unicam->sensor, video, s_dv_timings)) {
--		v4l2_disable_ioctl(&node->video_dev, VIDIOC_S_EDID);
--		v4l2_disable_ioctl(&node->video_dev, VIDIOC_G_EDID);
--		v4l2_disable_ioctl(&node->video_dev, VIDIOC_DV_TIMINGS_CAP);
--		v4l2_disable_ioctl(&node->video_dev, VIDIOC_G_DV_TIMINGS);
--		v4l2_disable_ioctl(&node->video_dev, VIDIOC_S_DV_TIMINGS);
--		v4l2_disable_ioctl(&node->video_dev, VIDIOC_ENUM_DV_TIMINGS);
--		v4l2_disable_ioctl(&node->video_dev, VIDIOC_QUERY_DV_TIMINGS);
--	}
--	if (pad_id == METADATA_PAD ||
--	    !v4l2_subdev_has_op(unicam->sensor, pad, enum_frame_interval))
--		v4l2_disable_ioctl(&node->video_dev,
--				   VIDIOC_ENUM_FRAMEINTERVALS);
--	if (pad_id == METADATA_PAD ||
--	    !v4l2_subdev_has_op(unicam->sensor, video, g_frame_interval))
--		v4l2_disable_ioctl(&node->video_dev, VIDIOC_G_PARM);
--	if (pad_id == METADATA_PAD ||
--	    !v4l2_subdev_has_op(unicam->sensor, video, s_frame_interval))
--		v4l2_disable_ioctl(&node->video_dev, VIDIOC_S_PARM);
--
--	if (pad_id == METADATA_PAD ||
--	    !v4l2_subdev_has_op(unicam->sensor, pad, enum_frame_size))
--		v4l2_disable_ioctl(&node->video_dev, VIDIOC_ENUM_FRAMESIZES);
--
--	if (node->pad_id == METADATA_PAD ||
--	    !v4l2_subdev_has_op(unicam->sensor, pad, set_selection))
--		v4l2_disable_ioctl(&node->video_dev, VIDIOC_S_SELECTION);
--
--	if (node->pad_id == METADATA_PAD ||
--	    !v4l2_subdev_has_op(unicam->sensor, pad, get_selection))
--		v4l2_disable_ioctl(&node->video_dev, VIDIOC_G_SELECTION);
-+	if (!unicam->mc_api) {
-+		if (pad_id == METADATA_PAD ||
-+		    !v4l2_subdev_has_op(unicam->sensor, video, s_std)) {
-+			v4l2_disable_ioctl(&node->video_dev, VIDIOC_S_STD);
-+			v4l2_disable_ioctl(&node->video_dev, VIDIOC_G_STD);
-+			v4l2_disable_ioctl(&node->video_dev, VIDIOC_ENUMSTD);
-+		}
-+		if (pad_id == METADATA_PAD ||
-+		    !v4l2_subdev_has_op(unicam->sensor, video, querystd))
-+			v4l2_disable_ioctl(&node->video_dev, VIDIOC_QUERYSTD);
-+		if (pad_id == METADATA_PAD ||
-+		    !v4l2_subdev_has_op(unicam->sensor, video, s_dv_timings)) {
-+			v4l2_disable_ioctl(&node->video_dev, VIDIOC_S_EDID);
-+			v4l2_disable_ioctl(&node->video_dev, VIDIOC_G_EDID);
-+			v4l2_disable_ioctl(&node->video_dev,
-+					   VIDIOC_DV_TIMINGS_CAP);
-+			v4l2_disable_ioctl(&node->video_dev,
-+					   VIDIOC_G_DV_TIMINGS);
-+			v4l2_disable_ioctl(&node->video_dev,
-+					   VIDIOC_S_DV_TIMINGS);
-+			v4l2_disable_ioctl(&node->video_dev,
-+					   VIDIOC_ENUM_DV_TIMINGS);
-+			v4l2_disable_ioctl(&node->video_dev,
-+					   VIDIOC_QUERY_DV_TIMINGS);
-+		}
-+		if (pad_id == METADATA_PAD ||
-+		    !v4l2_subdev_has_op(unicam->sensor, pad,
-+					enum_frame_interval))
-+			v4l2_disable_ioctl(&node->video_dev,
-+					   VIDIOC_ENUM_FRAMEINTERVALS);
-+		if (pad_id == METADATA_PAD ||
-+		    !v4l2_subdev_has_op(unicam->sensor, video,
-+					g_frame_interval))
-+			v4l2_disable_ioctl(&node->video_dev, VIDIOC_G_PARM);
-+		if (pad_id == METADATA_PAD ||
-+		    !v4l2_subdev_has_op(unicam->sensor, video,
-+					s_frame_interval))
-+			v4l2_disable_ioctl(&node->video_dev, VIDIOC_S_PARM);
-+
-+		if (pad_id == METADATA_PAD ||
-+		    !v4l2_subdev_has_op(unicam->sensor, pad,
-+					enum_frame_size))
-+			v4l2_disable_ioctl(&node->video_dev,
-+					   VIDIOC_ENUM_FRAMESIZES);
-+
-+		if (node->pad_id == METADATA_PAD ||
-+		    !v4l2_subdev_has_op(unicam->sensor, pad, set_selection))
-+			v4l2_disable_ioctl(&node->video_dev,
-+					   VIDIOC_S_SELECTION);
-+
-+		if (node->pad_id == METADATA_PAD ||
-+		    !v4l2_subdev_has_op(unicam->sensor, pad, get_selection))
-+			v4l2_disable_ioctl(&node->video_dev,
-+					   VIDIOC_G_SELECTION);
-+	}
- 
- 	ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
- 	if (ret) {
-@@ -2619,7 +3109,7 @@ static int unicam_async_complete(struct
- 		if (unicam->sensor->entity.pads[i].flags & MEDIA_PAD_FL_SOURCE) {
- 			if (source_pads < MAX_NODES) {
- 				unicam->node[source_pads].src_pad_id = i;
--				unicam_err(unicam, "source pad %u is index %u\n",
-+				unicam_dbg(3, unicam, "source pad %u is index %u\n",
- 					   source_pads, i);
- 			}
- 			source_pads++;
-@@ -2648,7 +3138,10 @@ static int unicam_async_complete(struct
- 		}
- 	}
- 
--	ret = v4l2_device_register_ro_subdev_nodes(&unicam->v4l2_dev);
-+	if (unicam->mc_api)
-+		ret = v4l2_device_register_subdev_nodes(&unicam->v4l2_dev);
-+	else
-+		ret = v4l2_device_register_ro_subdev_nodes(&unicam->v4l2_dev);
- 	if (ret) {
- 		unicam_err(unicam, "Unable to register subdev nodes.\n");
- 		goto unregister;
-@@ -2808,6 +3301,14 @@ static int unicam_probe(struct platform_
- 	kref_init(&unicam->kref);
- 	unicam->pdev = pdev;
- 
-+	/*
-+	 * Adopt the current setting of the module parameter, and check if
-+	 * device tree requests it.
-+	 */
-+	unicam->mc_api = media_controller;
-+	if (of_property_read_bool(pdev->dev.of_node, "brcm,media-controller"))
-+		unicam->mc_api = true;
-+
- 	unicam->base = devm_platform_ioremap_resource(pdev, 0);
- 	if (IS_ERR(unicam->base)) {
- 		unicam_err(unicam, "Failed to get main io block\n");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0346-staging-bcm2835-camera-Add-support-for-H264_MIN_QP-H.patch b/target/linux/bcm27xx/patches-6.1/950-0346-staging-bcm2835-camera-Add-support-for-H264_MIN_QP-H.patch
deleted file mode 100644
index 41210c9a7a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0346-staging-bcm2835-camera-Add-support-for-H264_MIN_QP-H.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 0a62b2ce6504656b601b077f890215a56fb0dd99 Mon Sep 17 00:00:00 2001
-From: soyer <soyer@irl.hu>
-Date: Sat, 23 Oct 2021 12:23:50 +0200
-Subject: [PATCH] staging/bcm2835-camera: Add support for H264_MIN_QP,
- H264_MAX_QP
-
-Signed-off-by: Gergo Koteles <soyer@irl.hu>
----
- .../bcm2835-camera/bcm2835-camera.h           |  2 +-
- .../vc04_services/bcm2835-camera/controls.c   | 22 +++++++++++++++++++
- 2 files changed, 23 insertions(+), 1 deletion(-)
-
---- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
-+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
-@@ -13,7 +13,7 @@
-  * core driver device
-  */
- 
--#define V4L2_CTRL_COUNT 29 /* number of v4l controls */
-+#define V4L2_CTRL_COUNT 31 /* number of v4l controls */
- 
- enum {
- 	COMP_CAMERA = 0,
---- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
-+++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
-@@ -1264,6 +1264,28 @@ static const struct bcm2835_mmal_v4l2_ct
- 		.mmal_id = MMAL_PARAMETER_INTRAPERIOD,
- 		.setter = ctrl_set_video_encode_param_output,
- 	},
-+	{
-+		.id = V4L2_CID_MPEG_VIDEO_H264_MIN_QP,
-+		.type = MMAL_CONTROL_TYPE_STD,
-+		.min = 0,
-+		.max = 51,
-+		.def = 0,
-+		.step = 1,
-+		.imenu = NULL,
-+		.mmal_id = MMAL_PARAMETER_VIDEO_ENCODE_MIN_QUANT,
-+		.setter = ctrl_set_video_encode_param_output,
-+	},
-+	{
-+		.id = V4L2_CID_MPEG_VIDEO_H264_MAX_QP,
-+		.type = MMAL_CONTROL_TYPE_STD,
-+		.min = 0,
-+		.max = 51,
-+		.def = 0,
-+		.step = 1,
-+		.imenu = NULL,
-+		.mmal_id = MMAL_PARAMETER_VIDEO_ENCODE_MAX_QUANT,
-+		.setter = ctrl_set_video_encode_param_output,
-+	},
- };
- 
- int bcm2835_mmal_set_all_camera_controls(struct bcm2835_mmal_dev *dev)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0347-staging-bcm2835-camera-Add-support-for-MPEG_VIDEO_FO.patch b/target/linux/bcm27xx/patches-6.1/950-0347-staging-bcm2835-camera-Add-support-for-MPEG_VIDEO_FO.patch
deleted file mode 100644
index 7a1c39c1d0..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0347-staging-bcm2835-camera-Add-support-for-MPEG_VIDEO_FO.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From f8733b8f8d5ffccc7ec0c03311e8494c0aa57ad3 Mon Sep 17 00:00:00 2001
-From: Gergo Koteles <soyer@irl.hu>
-Date: Sun, 24 Oct 2021 23:18:09 +0200
-Subject: [PATCH] staging/bcm2835-camera: Add support for
- MPEG_VIDEO_FORCE_KEY_FRAME
-
-Signed-off-by: Gergo Koteles <soyer@irl.hu>
----
- .../vc04_services/bcm2835-camera/bcm2835-camera.h     |  2 +-
- .../staging/vc04_services/bcm2835-camera/controls.c   | 11 +++++++++++
- 2 files changed, 12 insertions(+), 1 deletion(-)
-
---- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
-+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
-@@ -13,7 +13,7 @@
-  * core driver device
-  */
- 
--#define V4L2_CTRL_COUNT 31 /* number of v4l controls */
-+#define V4L2_CTRL_COUNT 32 /* number of v4l controls */
- 
- enum {
- 	COMP_CAMERA = 0,
---- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
-+++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
-@@ -1286,6 +1286,17 @@ static const struct bcm2835_mmal_v4l2_ct
- 		.mmal_id = MMAL_PARAMETER_VIDEO_ENCODE_MAX_QUANT,
- 		.setter = ctrl_set_video_encode_param_output,
- 	},
-+	{
-+		.id = V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME,
-+		.type = MMAL_CONTROL_TYPE_STD,
-+		.min = 0,
-+		.max = 0,
-+		.def = 0,
-+		.step = 0,
-+		.imenu = NULL,
-+		.mmal_id = MMAL_PARAMETER_VIDEO_REQUEST_I_FRAME,
-+		.setter = ctrl_set_video_encode_param_output,
-+	},
- };
- 
- int bcm2835_mmal_set_all_camera_controls(struct bcm2835_mmal_dev *dev)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0348-media-i2c-ov5647-Support-HFLIP-and-VFLIP.patch b/target/linux/bcm27xx/patches-6.1/950-0348-media-i2c-ov5647-Support-HFLIP-and-VFLIP.patch
deleted file mode 100644
index 36e9417739..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0348-media-i2c-ov5647-Support-HFLIP-and-VFLIP.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-From d6ad0d9b5ccc3323cea3c193db0348eff5e3383e Mon Sep 17 00:00:00 2001
-From: David Plowman <david.plowman@raspberrypi.com>
-Date: Mon, 22 Nov 2021 13:10:39 +0000
-Subject: [PATCH] media: i2c: ov5647: Support HFLIP and VFLIP
-
-Add these missing V4L2 controls. Tested binned and full resolution
-modes in all four orientations using Raspberry Pi running libcamera.
-
-Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
----
- drivers/media/i2c/ov5647.c | 76 +++++++++++++++++++++++++++++++++++---
- 1 file changed, 70 insertions(+), 6 deletions(-)
-
---- a/drivers/media/i2c/ov5647.c
-+++ b/drivers/media/i2c/ov5647.c
-@@ -54,6 +54,8 @@
- #define OV5647_REG_GAIN_LO		0x350b
- #define OV5647_REG_VTS_HI		0x380e
- #define OV5647_REG_VTS_LO		0x380f
-+#define OV5647_REG_VFLIP		0x3820
-+#define OV5647_REG_HFLIP		0x3821
- #define OV5647_REG_FRAME_OFF_NUMBER	0x4202
- #define OV5647_REG_MIPI_CTRL00		0x4800
- #define OV5647_REG_MIPI_CTRL14		0x4814
-@@ -108,6 +110,8 @@ struct ov5647 {
- 	struct v4l2_ctrl		*hblank;
- 	struct v4l2_ctrl		*vblank;
- 	struct v4l2_ctrl		*exposure;
-+	struct v4l2_ctrl		*hflip;
-+	struct v4l2_ctrl		*vflip;
- 	bool				streaming;
- };
- 
-@@ -136,7 +140,7 @@ static struct regval_list ov5647_2592x19
- 	{0x3036, 0x69},
- 	{0x303c, 0x11},
- 	{0x3106, 0xf5},
--	{0x3821, 0x06},
-+	{0x3821, 0x00},
- 	{0x3820, 0x00},
- 	{0x3827, 0xec},
- 	{0x370c, 0x03},
-@@ -225,7 +229,7 @@ static struct regval_list ov5647_1080p30
- 	{0x3036, 0x62},
- 	{0x303c, 0x11},
- 	{0x3106, 0xf5},
--	{0x3821, 0x06},
-+	{0x3821, 0x00},
- 	{0x3820, 0x00},
- 	{0x3827, 0xec},
- 	{0x370c, 0x03},
-@@ -389,7 +393,7 @@ static struct regval_list ov5647_2x2binn
- 	{0x4800, 0x24},
- 	{0x3503, 0x03},
- 	{0x3820, 0x41},
--	{0x3821, 0x07},
-+	{0x3821, 0x01},
- 	{0x350a, 0x00},
- 	{0x350b, 0x10},
- 	{0x3500, 0x00},
-@@ -405,7 +409,7 @@ static struct regval_list ov5647_640x480
- 	{0x3035, 0x11},
- 	{0x3036, 0x46},
- 	{0x303c, 0x11},
--	{0x3821, 0x07},
-+	{0x3821, 0x01},
- 	{0x3820, 0x41},
- 	{0x370c, 0x03},
- 	{0x3612, 0x59},
-@@ -946,6 +950,25 @@ static const struct v4l2_subdev_video_op
- 	.s_stream =		ov5647_s_stream,
- };
- 
-+/* This function returns the mbus code for the current settings of the
-+   HFLIP and VFLIP controls. */
-+
-+static u32 ov5647_get_mbus_code(struct v4l2_subdev *sd)
-+{
-+	struct ov5647 *sensor = to_sensor(sd);
-+	/* The control values are only 0 or 1. */
-+	int index =  sensor->hflip->val | (sensor->vflip->val << 1);
-+
-+	static const u32 codes[4] = {
-+		MEDIA_BUS_FMT_SGBRG10_1X10,
-+		MEDIA_BUS_FMT_SBGGR10_1X10,
-+		MEDIA_BUS_FMT_SRGGB10_1X10,
-+		MEDIA_BUS_FMT_SGRBG10_1X10
-+	};
-+
-+	return codes[index];
-+}
-+
- static int ov5647_enum_mbus_code(struct v4l2_subdev *sd,
- 				 struct v4l2_subdev_state *sd_state,
- 				 struct v4l2_subdev_mbus_code_enum *code)
-@@ -953,7 +976,7 @@ static int ov5647_enum_mbus_code(struct
- 	if (code->index > 0)
- 		return -EINVAL;
- 
--	code->code = MEDIA_BUS_FMT_SBGGR10_1X10;
-+	code->code = ov5647_get_mbus_code(sd);
- 
- 	return 0;
- }
-@@ -964,7 +987,7 @@ static int ov5647_enum_frame_size(struct
- {
- 	const struct v4l2_mbus_framefmt *fmt;
- 
--	if (fse->code != MEDIA_BUS_FMT_SBGGR10_1X10 ||
-+	if (fse->code != ov5647_get_mbus_code(sd) ||
- 	    fse->index >= ARRAY_SIZE(ov5647_modes))
- 		return -EINVAL;
- 
-@@ -997,6 +1020,8 @@ static int ov5647_get_pad_fmt(struct v4l
- 	}
- 
- 	*fmt = *sensor_format;
-+	/* The code we pass back must reflect the current h/vflips. */
-+	fmt->code = ov5647_get_mbus_code(sd);
- 	mutex_unlock(&sensor->lock);
- 
- 	return 0;
-@@ -1044,6 +1069,8 @@ static int ov5647_set_pad_fmt(struct v4l
- 					 exposure_def);
- 	}
- 	*fmt = mode->format;
-+	/* The code we pass back must reflect the current h/vflips. */
-+	fmt->code = ov5647_get_mbus_code(sd);
- 	mutex_unlock(&sensor->lock);
- 
- 	return 0;
-@@ -1219,6 +1246,25 @@ static int ov5647_s_exposure(struct v4l2
- 	return ov5647_write(sd, OV5647_REG_EXP_LO, (val & 0xf) << 4);
- }
- 
-+static int ov5647_s_flip( struct v4l2_subdev *sd, u16 reg, u32 ctrl_val)
-+{
-+	int ret;
-+	u8 reg_val;
-+
-+	/* Set or clear bit 1 and leave everything else alone. */
-+	ret = ov5647_read(sd, reg, &reg_val);
-+	if (ret == 0) {
-+		if (ctrl_val)
-+			reg_val |= 2;
-+		else
-+			reg_val &= ~2;
-+
-+		ret = ov5647_write(sd, reg, reg_val);
-+	}
-+
-+	return ret;
-+}
-+
- static int ov5647_s_ctrl(struct v4l2_ctrl *ctrl)
- {
- 	struct ov5647 *sensor = container_of(ctrl->handler,
-@@ -1277,6 +1323,14 @@ static int ov5647_s_ctrl(struct v4l2_ctr
- 		/* Read-only, but we adjust it based on mode. */
- 		break;
- 
-+	case V4L2_CID_HFLIP:
-+		/* There's an in-built hflip in the sensor, so account for that here. */
-+		ov5647_s_flip(sd, OV5647_REG_HFLIP, !ctrl->val);
-+		break;
-+	case V4L2_CID_VFLIP:
-+		ov5647_s_flip(sd, OV5647_REG_VFLIP, ctrl->val);
-+		break;
-+
- 	default:
- 		dev_info(&client->dev,
- 			 "Control (id:0x%x, val:0x%x) not supported\n",
-@@ -1343,6 +1397,16 @@ static int ov5647_init_controls(struct o
- 					   sensor->mode->vts -
- 					   sensor->mode->format.height);
- 
-+	sensor->hflip = v4l2_ctrl_new_std(&sensor->ctrls, &ov5647_ctrl_ops,
-+					  V4L2_CID_HFLIP, 0, 1, 1, 0);
-+	if (sensor->hflip)
-+		sensor->hflip->flags |= V4L2_CTRL_FLAG_MODIFY_LAYOUT;
-+
-+	sensor->vflip = v4l2_ctrl_new_std(&sensor->ctrls, &ov5647_ctrl_ops,
-+					  V4L2_CID_VFLIP, 0, 1, 1, 0);
-+	if (sensor->vflip)
-+		sensor->vflip->flags |= V4L2_CTRL_FLAG_MODIFY_LAYOUT;
-+
- 	v4l2_fwnode_device_parse(dev, &props);
- 
- 	v4l2_ctrl_new_fwnode_properties(&sensor->ctrls, &ov5647_ctrl_ops,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0349-drivers-bcm2835_isp-Allow-multiple-users-for-the-ISP.patch b/target/linux/bcm27xx/patches-6.1/950-0349-drivers-bcm2835_isp-Allow-multiple-users-for-the-ISP.patch
deleted file mode 100644
index b2fadfb0ec..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0349-drivers-bcm2835_isp-Allow-multiple-users-for-the-ISP.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-From e858cd97b4301df3cc6b65f0ef16b4c1db1e1a06 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Tue, 16 Nov 2021 12:38:44 +0000
-Subject: [PATCH] drivers: bcm2835_isp: Allow multiple users for the
- ISP driver.
-
-Add a second (identical) set of device nodes to allow concurrent use of the ISP
-hardware by another user. This change effectively creates a second state
-structure (struct bcm2835_isp_dev) to maintain independent state for the second
-user. Node and media entity names are appened with the instance index
-appropriately.
-
-Further users can be added by changing the BCM2835_ISP_NUM_INSTANCES define.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- .../bcm2835-isp/bcm2835-v4l2-isp.c            | 76 +++++++++++++++----
- 1 file changed, 60 insertions(+), 16 deletions(-)
-
---- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-+++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-@@ -26,15 +26,21 @@
- #include "bcm2835-isp-ctrls.h"
- #include "bcm2835-isp-fmts.h"
- 
-+/*
-+ * We want to instantiate 2 independent instances allowing 2 simultaneous users
-+ * of the ISP hardware.
-+ */
-+#define BCM2835_ISP_NUM_INSTANCES 2
-+
- MODULE_IMPORT_NS(DMA_BUF);
- 
- static unsigned int debug;
- module_param(debug, uint, 0644);
- MODULE_PARM_DESC(debug, "activates debug info");
- 
--static unsigned int video_nr = 13;
--module_param(video_nr, uint, 0644);
--MODULE_PARM_DESC(video_nr, "base video device number");
-+static unsigned int video_nr[BCM2835_ISP_NUM_INSTANCES] = { 13, 20 };
-+module_param_array(video_nr, uint, NULL, 0644);
-+MODULE_PARM_DESC(video_nr, "base video device numbers");
- 
- #define BCM2835_ISP_NAME "bcm2835-isp"
- #define BCM2835_ISP_ENTITY_NAME_LEN 32
-@@ -1281,6 +1287,7 @@ static int bcm2835_isp_get_supported_fmt
-  * or output nodes.
-  */
- static int register_node(struct bcm2835_isp_dev *dev,
-+			 unsigned int instance,
- 			 struct bcm2835_isp_node *node,
- 			 int index)
- {
-@@ -1441,7 +1448,7 @@ static int register_node(struct bcm2835_
- 	snprintf(vfd->name, sizeof(node->vfd.name), "%s-%s%d", BCM2835_ISP_NAME,
- 		 node->name, node->id);
- 
--	ret = video_register_device(vfd, VFL_TYPE_VIDEO, video_nr + index);
-+	ret = video_register_device(vfd, VFL_TYPE_VIDEO, video_nr[instance]);
- 	if (ret) {
- 		v4l2_err(&dev->v4l2_dev,
- 			 "Failed to register video %s[%d] device node\n",
-@@ -1662,9 +1669,8 @@ done:
- 	return ret;
- }
- 
--static int bcm2835_isp_remove(struct platform_device *pdev)
-+static void bcm2835_isp_remove_instance(struct bcm2835_isp_dev *dev)
- {
--	struct bcm2835_isp_dev *dev = platform_get_drvdata(pdev);
- 	unsigned int i;
- 
- 	media_controller_unregister(dev);
-@@ -1679,11 +1685,11 @@ static int bcm2835_isp_remove(struct pla
- 					      dev->component);
- 
- 	vchiq_mmal_finalise(dev->mmal_instance);
--
--	return 0;
- }
- 
--static int bcm2835_isp_probe(struct platform_device *pdev)
-+static int bcm2835_isp_probe_instance(struct platform_device *pdev,
-+				      struct bcm2835_isp_dev **dev_int,
-+				      unsigned int instance)
- {
- 	struct bcm2835_isp_dev *dev;
- 	unsigned int i;
-@@ -1693,6 +1699,7 @@ static int bcm2835_isp_probe(struct plat
- 	if (!dev)
- 		return -ENOMEM;
- 
-+	*dev_int = dev;
- 	dev->dev = &pdev->dev;
- 
- 	ret = v4l2_device_register(&pdev->dev, &dev->v4l2_dev);
-@@ -1710,7 +1717,7 @@ static int bcm2835_isp_probe(struct plat
- 	if (ret) {
- 		v4l2_err(&dev->v4l2_dev,
- 			 "%s: failed to create ril.isp component\n", __func__);
--		goto error;
-+		return ret;
- 	}
- 
- 	if (dev->component->inputs < BCM2835_ISP_NUM_OUTPUTS ||
-@@ -1722,7 +1729,7 @@ static int bcm2835_isp_probe(struct plat
- 			  BCM2835_ISP_NUM_OUTPUTS,
- 			  dev->component->outputs,
- 			  BCM2835_ISP_NUM_CAPTURES + BCM2835_ISP_NUM_METADATA);
--		goto error;
-+		return -EINVAL;
- 	}
- 
- 	atomic_set(&dev->num_streaming, 0);
-@@ -1730,17 +1737,54 @@ static int bcm2835_isp_probe(struct plat
- 	for (i = 0; i < BCM2835_ISP_NUM_NODES; i++) {
- 		struct bcm2835_isp_node *node = &dev->node[i];
- 
--		ret = register_node(dev, node, i);
-+		ret = register_node(dev, instance, node, i);
- 		if (ret)
--			goto error;
-+			return ret;
- 	}
- 
- 	ret = media_controller_register(dev);
- 	if (ret)
--		goto error;
-+		return ret;
-+
-+	return 0;
-+}
-+
-+static int bcm2835_isp_remove(struct platform_device *pdev)
-+{
-+	struct bcm2835_isp_dev **bcm2835_isp_instances;
-+	unsigned int i;
-+
-+	bcm2835_isp_instances = platform_get_drvdata(pdev);
-+	for (i = 0; i < BCM2835_ISP_NUM_INSTANCES; i++) {
-+		if (bcm2835_isp_instances[i])
-+			bcm2835_isp_remove_instance(bcm2835_isp_instances[i]);
-+	}
-+
-+	return 0;
-+}
-+
-+static int bcm2835_isp_probe(struct platform_device *pdev)
-+{
-+	struct bcm2835_isp_dev **bcm2835_isp_instances;
-+	unsigned int i;
-+	int ret;
-+
-+	bcm2835_isp_instances = devm_kzalloc(&pdev->dev,
-+					     sizeof(bcm2835_isp_instances) *
-+						      BCM2835_ISP_NUM_INSTANCES,
-+					     GFP_KERNEL);
-+	if (!bcm2835_isp_instances)
-+		return -ENOMEM;
-+
-+	for (i = 0; i < BCM2835_ISP_NUM_INSTANCES; i++) {
-+		ret = bcm2835_isp_probe_instance(pdev,
-+						 &bcm2835_isp_instances[i], i);
-+		if (ret)
-+			goto error;
-+	}
- 
--	platform_set_drvdata(pdev, dev);
--	v4l2_info(&dev->v4l2_dev, "Loaded V4L2 %s\n", BCM2835_ISP_NAME);
-+	platform_set_drvdata(pdev, bcm2835_isp_instances);
-+	dev_info(&pdev->dev, "Loaded V4L2 %s\n", BCM2835_ISP_NAME);
- 	return 0;
- 
- error:
diff --git a/target/linux/bcm27xx/patches-6.1/950-0350-drivers-bcm2835_isp-Fix-div-by-0-bug.patch b/target/linux/bcm27xx/patches-6.1/950-0350-drivers-bcm2835_isp-Fix-div-by-0-bug.patch
deleted file mode 100644
index 559b930fe8..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0350-drivers-bcm2835_isp-Fix-div-by-0-bug.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From e5ae35523b1104b5de70935a865076f438f577c8 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Thu, 25 Nov 2021 08:59:58 +0000
-Subject: [PATCH] drivers: bcm2835_isp: Fix div by 0 bug.
-
-Fix a possible division by 0 bug when setting up the mmal port for the stats
-port.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h
-+++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h
-@@ -544,6 +544,7 @@ static const struct bcm2835_isp_fmt supp
- 		.step_size	    = 2,
- 	}, {
- 		.fourcc		    = V4L2_META_FMT_BCM2835_ISP_STATS,
-+		.depth		    = 8,
- 		.mmal_fmt	    = MMAL_ENCODING_BRCM_STATS,
- 		/* The rest are not valid fields for stats. */
- 	}
diff --git a/target/linux/bcm27xx/patches-6.1/950-0351-spi-spidev-Restore-loading-from-Device-Tree.patch b/target/linux/bcm27xx/patches-6.1/950-0351-spi-spidev-Restore-loading-from-Device-Tree.patch
deleted file mode 100644
index 72bb627cf8..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0351-spi-spidev-Restore-loading-from-Device-Tree.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 03d0602f418f7b2b0fc18c0eb3edc91cf85824a0 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 29 Nov 2021 12:14:49 +0000
-Subject: [PATCH] spi: spidev: Restore loading from Device Tree
-
-As happens occasionally, an upstream change has once again prevented
-spidev from being loaded via Device Tree. We now need "spidev" to be
-included in the new spi_device_id list, otherwise although the
-spidev driver gets loaded no /dev/spidev*.* entries will appear.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/spi/spidev.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/spi/spidev.c
-+++ b/drivers/spi/spidev.c
-@@ -687,6 +687,7 @@ static const struct file_operations spid
- static struct class *spidev_class;
- 
- static const struct spi_device_id spidev_spi_ids[] = {
-+	{ .name = "spidev" },
- 	{ .name = "dh2228fv" },
- 	{ .name = "ltc2488" },
- 	{ .name = "sx1301" },
diff --git a/target/linux/bcm27xx/patches-6.1/950-0352-input-edt-ft5x06-Handle-unreliable-TOUCH_UP-events.patch b/target/linux/bcm27xx/patches-6.1/950-0352-input-edt-ft5x06-Handle-unreliable-TOUCH_UP-events.patch
deleted file mode 100644
index d180f67216..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0352-input-edt-ft5x06-Handle-unreliable-TOUCH_UP-events.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From ece2b3041c1182b41a17937d1894c58bd0b54364 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 26 Nov 2021 14:37:40 +0000
-Subject: [PATCH] input: edt-ft5x06: Handle unreliable TOUCH_UP events
-
-The ft5x06 is unreliable in sending touch up events, so some
-touch IDs can become stuck in the detected state.
-
-Ensure that IDs that are unreported by the controller are
-released.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/input/touchscreen/edt-ft5x06.c | 21 ++++++++++++++++++++-
- 1 file changed, 20 insertions(+), 1 deletion(-)
-
---- a/drivers/input/touchscreen/edt-ft5x06.c
-+++ b/drivers/input/touchscreen/edt-ft5x06.c
-@@ -130,6 +130,7 @@ struct edt_ft5x06_ts_data {
- 	int offset_y;
- 	int report_rate;
- 	int max_support_points;
-+	unsigned int known_ids;
- 
- 	char name[EDT_NAME_LEN];
- 	char fw_version[EDT_NAME_LEN];
-@@ -208,6 +209,9 @@ static irqreturn_t edt_ft5x06_ts_isr(int
- 	int i, type, x, y, id;
- 	int offset, tplen, datalen, crclen;
- 	int error;
-+	unsigned int active_ids = 0, known_ids = tsdata->known_ids;
-+	long released_ids;
-+	int b = 0;
- 
- 	switch (tsdata->version) {
- 	case EDT_M06:
-@@ -280,10 +284,25 @@ static irqreturn_t edt_ft5x06_ts_isr(int
- 
- 		input_mt_slot(tsdata->input, id);
- 		if (input_mt_report_slot_state(tsdata->input, MT_TOOL_FINGER,
--					       type != TOUCH_EVENT_UP))
-+					       type != TOUCH_EVENT_UP)) {
- 			touchscreen_report_pos(tsdata->input, &tsdata->prop,
- 					       x, y, true);
-+			active_ids |= BIT(id);
-+		} else {
-+			known_ids &= ~BIT(id);
-+		}
-+	}
-+
-+	/* One issue with the device is the TOUCH_UP message is not always
-+	 * returned. Instead track which ids we know about and report when they
-+	 * are no longer updated
-+	 */
-+	released_ids = known_ids & ~active_ids;
-+	for_each_set_bit_from(b, &released_ids, tsdata->max_support_points) {
-+		input_mt_slot(tsdata->input, b);
-+		input_mt_report_slot_inactive(tsdata->input);
- 	}
-+	tsdata->known_ids = active_ids;
- 
- 	input_mt_report_pointer_emulation(tsdata->input, true);
- 	input_sync(tsdata->input);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0353-drivers-bcm2835_unicam-Add-logging-message-when-a-fr.patch b/target/linux/bcm27xx/patches-6.1/950-0353-drivers-bcm2835_unicam-Add-logging-message-when-a-fr.patch
deleted file mode 100644
index 6914c13c86..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0353-drivers-bcm2835_unicam-Add-logging-message-when-a-fr.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0050fef5616e557182a9cccbc8ff507f7a21d47d Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Tue, 30 Nov 2021 10:39:41 +0000
-Subject: [PATCH] drivers: bcm2835_unicam: Add logging message when a
- frame is dropped.
-
-If a dummy buffer is still active on a frame start, it indicates that this frame
-will be dropped. The explicit logging helps users identify performance issues.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/platform/bcm2835/bcm2835-unicam.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
-+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -951,6 +951,9 @@ static irqreturn_t unicam_isr(int irq, v
- 			if (unicam->node[i].cur_frm)
- 				unicam->node[i].cur_frm->vb.vb2_buf.timestamp =
- 								ts;
-+			else
-+				unicam_dbg(2, unicam, "ISR: [%d] Dropping frame, buffer not available at FS\n",
-+					   i);
- 			/*
- 			 * Set the next frame output to go to a dummy frame
- 			 * if we have not managed to obtain another frame
diff --git a/target/linux/bcm27xx/patches-6.1/950-0354-regulator-rpi-panel-attiny-Don-t-read-the-LCD-power-.patch b/target/linux/bcm27xx/patches-6.1/950-0354-regulator-rpi-panel-attiny-Don-t-read-the-LCD-power-.patch
deleted file mode 100644
index 0196d63179..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0354-regulator-rpi-panel-attiny-Don-t-read-the-LCD-power-.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 59431ad65437c29a3728f31428363c83e9e4e45c Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Mon, 29 Nov 2021 18:31:37 +0000
-Subject: [PATCH] regulator/rpi-panel-attiny: Don't read the LCD power
- status
-
-The I2C to the Atmel is very fussy, and locks up easily on
-Pi0-3 particularly on reads.
-
-The LCD power status is controlled solely by this driver, so
-rather than reading it back from the Atmel, use the cached
-status last set.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/regulator/rpi-panel-attiny-regulator.c | 18 +-----------------
- 1 file changed, 1 insertion(+), 17 deletions(-)
-
---- a/drivers/regulator/rpi-panel-attiny-regulator.c
-+++ b/drivers/regulator/rpi-panel-attiny-regulator.c
-@@ -144,24 +144,8 @@ static int attiny_lcd_power_disable(stru
- static int attiny_lcd_power_is_enabled(struct regulator_dev *rdev)
- {
- 	struct attiny_lcd *state = rdev_get_drvdata(rdev);
--	unsigned int data;
--	int ret, i;
- 
--	mutex_lock(&state->lock);
--
--	for (i = 0; i < 10; i++) {
--		ret = regmap_read(rdev->regmap, REG_PORTC, &data);
--		if (!ret)
--			break;
--		usleep_range(10000, 12000);
--	}
--
--	mutex_unlock(&state->lock);
--
--	if (ret < 0)
--		return ret;
--
--	return data & PC_RST_BRIDGE_N;
-+	return state->port_states[REG_PORTC - REG_PORTA] & PC_RST_BRIDGE_N;
- }
- 
- static const struct regulator_init_data attiny_regulator_default = {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0355-input-edt-ft5x06-Only-look-at-the-number-of-points-r.patch b/target/linux/bcm27xx/patches-6.1/950-0355-input-edt-ft5x06-Only-look-at-the-number-of-points-r.patch
deleted file mode 100644
index c28b2b08b8..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0355-input-edt-ft5x06-Only-look-at-the-number-of-points-r.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 037324a6b9f331943f246fdf39c4ae58a6e8f287 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 30 Nov 2021 17:28:50 +0000
-Subject: [PATCH] input: edt-ft5x06: Only look at the number of points
- reported
-
-Register 0x02 in the FT5x06 is TD_STATUS containing the number
-of valid touch points being reported.
-
-Iterate over that number of points rather than all that are
-supported on the device.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/input/touchscreen/edt-ft5x06.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
---- a/drivers/input/touchscreen/edt-ft5x06.c
-+++ b/drivers/input/touchscreen/edt-ft5x06.c
-@@ -212,6 +212,7 @@ static irqreturn_t edt_ft5x06_ts_isr(int
- 	unsigned int active_ids = 0, known_ids = tsdata->known_ids;
- 	long released_ids;
- 	int b = 0;
-+	unsigned int num_points;
- 
- 	switch (tsdata->version) {
- 	case EDT_M06:
-@@ -260,9 +261,15 @@ static irqreturn_t edt_ft5x06_ts_isr(int
- 
- 		if (!edt_ft5x06_ts_check_crc(tsdata, rdbuf, datalen))
- 			goto out;
-+		num_points = tsdata->max_support_points;
-+	} else {
-+		/* Register 2 is TD_STATUS, containing the number of touch
-+		 * points.
-+		 */
-+		num_points = min(rdbuf[2] & 0xf, tsdata->max_support_points);
- 	}
- 
--	for (i = 0; i < tsdata->max_support_points; i++) {
-+	for (i = 0; i < num_points; i++) {
- 		u8 *buf = &rdbuf[i * tplen + offset];
- 
- 		type = buf[0] >> 6;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0356-rtc-pcf8523-Fix-oscillator-stop-bit-handling.patch b/target/linux/bcm27xx/patches-6.1/950-0356-rtc-pcf8523-Fix-oscillator-stop-bit-handling.patch
deleted file mode 100644
index ab98d4ea36..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0356-rtc-pcf8523-Fix-oscillator-stop-bit-handling.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From d4caec563cc89319516a29a9b3c40ec302925d7a Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Mon, 29 Oct 2018 14:45:45 +0000
-Subject: [PATCH] rtc: pcf8523: Fix oscillator stop bit handling
-
-See: https://github.com/raspberrypi/firmware/issues/1065
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/rtc/rtc-pcf8523.c | 29 +++++++++++++++++++++++++++--
- 1 file changed, 27 insertions(+), 2 deletions(-)
-
---- a/drivers/rtc/rtc-pcf8523.c
-+++ b/drivers/rtc/rtc-pcf8523.c
-@@ -100,6 +100,7 @@ static int pcf8523_rtc_read_time(struct
- {
- 	struct pcf8523 *pcf8523 = dev_get_drvdata(dev);
- 	u8 regs[7];
-+	u32 value;
- 	int err;
- 
- 	err = regmap_bulk_read(pcf8523->regmap, PCF8523_REG_SECONDS, regs,
-@@ -107,8 +108,32 @@ static int pcf8523_rtc_read_time(struct
- 	if (err < 0)
- 		return err;
- 
--	if (regs[0] & PCF8523_SECONDS_OS)
--		return -EINVAL;
-+	if (regs[0] & PCF8523_SECONDS_OS) {
-+		/*
-+		 * If the oscillator was stopped, try to clear the flag. Upon
-+		 * power-up the flag is always set, but if we cannot clear it
-+		 * the oscillator isn't running properly for some reason. The
-+		 * sensible thing therefore is to return an error, signalling
-+		 * that the clock cannot be assumed to be correct.
-+		 */
-+
-+		regs[0] &= ~PCF8523_SECONDS_OS;
-+
-+		err = regmap_write(pcf8523->regmap, PCF8523_REG_SECONDS,
-+				   regs[0]);
-+		if (err < 0)
-+			return err;
-+
-+		err = regmap_read(pcf8523->regmap, PCF8523_REG_SECONDS,
-+				  &value);
-+		if (err < 0)
-+			return err;
-+
-+		if (value & PCF8523_SECONDS_OS)
-+			return -EAGAIN;
-+
-+		regs[0] = value;
-+	}
- 
- 	tm->tm_sec = bcd2bin(regs[0] & 0x7f);
- 	tm->tm_min = bcd2bin(regs[1] & 0x7f);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0357-drm-panel-simple-Populate-bpc-when-using-panel-dpi.patch b/target/linux/bcm27xx/patches-6.1/950-0357-drm-panel-simple-Populate-bpc-when-using-panel-dpi.patch
deleted file mode 100644
index 2782caabee..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0357-drm-panel-simple-Populate-bpc-when-using-panel-dpi.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e1b2f1d5c797e2073e058326f492fad3e61fb403 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 2 Dec 2021 18:10:55 +0000
-Subject: [PATCH] drm/panel-simple: Populate bpc when using panel-dpi
-
-panel-dpi doesn't know the bit depth, so in the same way that
-DPI is guessed for the connector type, guess that it'll be 8bpc.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/panel/panel-simple.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/gpu/drm/panel/panel-simple.c
-+++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -499,6 +499,8 @@ static int panel_dpi_probe(struct device
- 
- 	/* We do not know the connector for the DT node, so guess it */
- 	desc->connector_type = DRM_MODE_CONNECTOR_DPI;
-+	/* Likewise for the bit depth. */
-+	desc->bpc = 8;
- 
- 	panel->desc = desc;
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0358-drm-panel-simple-Allow-the-bus-format-to-be-read-fro.patch b/target/linux/bcm27xx/patches-6.1/950-0358-drm-panel-simple-Allow-the-bus-format-to-be-read-fro.patch
deleted file mode 100644
index d1e9158d77..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0358-drm-panel-simple-Allow-the-bus-format-to-be-read-fro.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 74026738d66fbd32a9e7f27879168f857fba6a3c Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 2 Dec 2021 18:16:21 +0000
-Subject: [PATCH] drm/panel-simple: Allow the bus format to be read
- from DT for panel-dpi
-
-The "panel-dpi" compatible string configures panel from device tree,
-but it doesn't provide any way of configuring the bus format (colour
-representation), nor does it populate it.
-
-Add a DT parameter "bus-format" that allows the MEDIA_BUS_FMT_xxx value
-to be specified from device tree.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/panel/panel-simple.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/gpu/drm/panel/panel-simple.c
-+++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -490,6 +490,7 @@ static int panel_dpi_probe(struct device
- 
- 	of_property_read_u32(np, "width-mm", &desc->size.width);
- 	of_property_read_u32(np, "height-mm", &desc->size.height);
-+	of_property_read_u32(np, "bus-format", &desc->bus_format);
- 
- 	/* Extract bus_flags from display_timing */
- 	bus_flags = 0;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0359-xhci-quirks-add-link-TRB-quirk-for-VL805.patch b/target/linux/bcm27xx/patches-6.1/950-0359-xhci-quirks-add-link-TRB-quirk-for-VL805.patch
deleted file mode 100644
index 0725689bf8..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0359-xhci-quirks-add-link-TRB-quirk-for-VL805.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From d0375d97a100054ab79539522b458855a6127e27 Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.org>
-Date: Mon, 26 Oct 2020 14:03:35 +0000
-Subject: [PATCH] xhci: quirks: add link TRB quirk for VL805
-
-The VL805 controller can't cope with the TR Dequeue Pointer for an endpoint
-being set to a Link TRB. The hardware-maintained endpoint context ends up
-stuck at the address of the Link TRB, leading to erroneous ring expansion
-events whenever the enqueue pointer wraps to the dequeue position.
-
-If the search for the end of the current TD and ring cycle state lands on
-a Link TRB, move to the next segment.
-
-See: https://github.com/raspberrypi/linux/issues/3919
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- drivers/usb/host/xhci-pci.c  | 1 +
- drivers/usb/host/xhci-ring.c | 9 +++++++++
- drivers/usb/host/xhci.h      | 1 +
- 3 files changed, 11 insertions(+)
-
---- a/drivers/usb/host/xhci-pci.c
-+++ b/drivers/usb/host/xhci-pci.c
-@@ -293,8 +293,10 @@ static void xhci_pci_quirks(struct devic
- 			pdev->device == 0x3432)
- 		xhci->quirks |= XHCI_BROKEN_STREAMS;
- 
--	if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == 0x3483)
-+	if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == 0x3483) {
- 		xhci->quirks |= XHCI_LPM_SUPPORT;
-+		xhci->quirks |= XHCI_AVOID_DQ_ON_LINK;
-+	}
- 
- 	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
- 		pdev->device == PCI_DEVICE_ID_ASMEDIA_1042_XHCI) {
---- a/drivers/usb/host/xhci-ring.c
-+++ b/drivers/usb/host/xhci-ring.c
-@@ -665,6 +665,15 @@ static int xhci_move_dequeue_past_td(str
- 	} while (!cycle_found || !td_last_trb_found);
- 
- deq_found:
-+	/*
-+	 * Quirk: the xHC does not correctly parse link TRBs if the HW Dequeue
-+	 * pointer is set to one. Advance to the next TRB (and next segment).
-+	 */
-+	if (xhci->quirks & XHCI_AVOID_DQ_ON_LINK && trb_is_link(new_deq)) {
-+		if (link_trb_toggles_cycle(new_deq))
-+			new_cycle ^= 0x1;
-+		next_trb(xhci, ep_ring, &new_seg, &new_deq);
-+	}
- 
- 	/* Don't update the ring cycle state for the producer (us). */
- 	addr = xhci_trb_virt_to_dma(new_seg, new_deq);
---- a/drivers/usb/host/xhci.h
-+++ b/drivers/usb/host/xhci.h
-@@ -1907,6 +1907,7 @@ struct xhci_hcd {
- #define XHCI_RESET_TO_DEFAULT	BIT_ULL(44)
- #define XHCI_ZHAOXIN_TRB_FETCH	BIT_ULL(45)
- #define XHCI_ZHAOXIN_HOST	BIT_ULL(46)
-+#define XHCI_AVOID_DQ_ON_LINK  BIT_ULL(47)
- 
- 	unsigned int		num_active_eps;
- 	unsigned int		limit_active_eps;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0360-xhci-correct-room_on_ring-for-cases-where-there-is-a.patch b/target/linux/bcm27xx/patches-6.1/950-0360-xhci-correct-room_on_ring-for-cases-where-there-is-a.patch
deleted file mode 100644
index 6d9b38621a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0360-xhci-correct-room_on_ring-for-cases-where-there-is-a.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c45817219ac5a438c2480219460bc73a264585ba Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.com>
-Date: Fri, 3 Dec 2021 14:32:05 +0000
-Subject: [PATCH] xhci: correct room_on_ring() for cases where there is
- a single segment
-
-Don't calculate space based on the number of TRBs in the current segment,
-as it's OK to wrap to the start (and flip the cycle state bit).
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- drivers/usb/host/xhci-ring.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/drivers/usb/host/xhci-ring.c
-+++ b/drivers/usb/host/xhci-ring.c
-@@ -309,6 +309,12 @@ static inline int room_on_ring(struct xh
- 		return 0;
- 
- 	if (ring->type != TYPE_COMMAND && ring->type != TYPE_EVENT) {
-+		/*
-+		 * If the ring has a single segment the dequeue segment
-+		 * never changes, so don't use it as measure of free space.
-+		 */
-+		if (ring->num_segs == 1)
-+			return ring->num_trbs_free >= num_trbs;
- 		num_trbs_in_deq_seg = ring->dequeue - ring->deq_seg->trbs;
- 		if (ring->num_trbs_free < num_trbs + num_trbs_in_deq_seg)
- 			return 0;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0361-xhci-refactor-out-TRBS_PER_SEGMENT-define-in-runtime.patch b/target/linux/bcm27xx/patches-6.1/950-0361-xhci-refactor-out-TRBS_PER_SEGMENT-define-in-runtime.patch
deleted file mode 100644
index 4147167600..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0361-xhci-refactor-out-TRBS_PER_SEGMENT-define-in-runtime.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From 11527dad9862ba7e53654943fdacc3ffdad00ae2 Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.com>
-Date: Mon, 13 Dec 2021 15:05:56 +0000
-Subject: [PATCH] xhci: refactor out TRBS_PER_SEGMENT define in runtime
- code
-
-In anticipation of adjusting the number of utilised TRBs in a ring
-segment, add trbs_per_seg to struct xhci_ring and use this instead
-of a compile-time define.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- drivers/usb/host/xhci-mem.c  | 48 +++++++++++++++++++-----------------
- drivers/usb/host/xhci-ring.c | 20 +++++++++------
- drivers/usb/host/xhci.c      |  6 ++---
- drivers/usb/host/xhci.h      |  1 +
- 4 files changed, 42 insertions(+), 33 deletions(-)
-
---- a/drivers/usb/host/xhci-mem.c
-+++ b/drivers/usb/host/xhci-mem.c
-@@ -98,6 +98,7 @@ static void xhci_free_segments_for_ring(
-  */
- static void xhci_link_segments(struct xhci_segment *prev,
- 			       struct xhci_segment *next,
-+			       unsigned int trbs_per_seg,
- 			       enum xhci_ring_type type, bool chain_links)
- {
- 	u32 val;
-@@ -106,16 +107,16 @@ static void xhci_link_segments(struct xh
- 		return;
- 	prev->next = next;
- 	if (type != TYPE_EVENT) {
--		prev->trbs[TRBS_PER_SEGMENT-1].link.segment_ptr =
-+		prev->trbs[trbs_per_seg - 1].link.segment_ptr =
- 			cpu_to_le64(next->dma);
- 
- 		/* Set the last TRB in the segment to have a TRB type ID of Link TRB */
--		val = le32_to_cpu(prev->trbs[TRBS_PER_SEGMENT-1].link.control);
-+		val = le32_to_cpu(prev->trbs[trbs_per_seg - 1].link.control);
- 		val &= ~TRB_TYPE_BITMASK;
- 		val |= TRB_TYPE(TRB_LINK);
- 		if (chain_links)
- 			val |= TRB_CHAIN;
--		prev->trbs[TRBS_PER_SEGMENT-1].link.control = cpu_to_le32(val);
-+		prev->trbs[trbs_per_seg - 1].link.control = cpu_to_le32(val);
- 	}
- }
- 
-@@ -139,15 +140,17 @@ static void xhci_link_rings(struct xhci_
- 			  (xhci->quirks & XHCI_AMD_0x96_HOST)));
- 
- 	next = ring->enq_seg->next;
--	xhci_link_segments(ring->enq_seg, first, ring->type, chain_links);
--	xhci_link_segments(last, next, ring->type, chain_links);
-+	xhci_link_segments(ring->enq_seg, first, ring->trbs_per_seg,
-+			   ring->type, chain_links);
-+	xhci_link_segments(last, next, ring->trbs_per_seg,
-+			   ring->type, chain_links);
- 	ring->num_segs += num_segs;
--	ring->num_trbs_free += (TRBS_PER_SEGMENT - 1) * num_segs;
-+	ring->num_trbs_free += (ring->trbs_per_seg - 1) * num_segs;
- 
- 	if (ring->type != TYPE_EVENT && ring->enq_seg == ring->last_seg) {
--		ring->last_seg->trbs[TRBS_PER_SEGMENT-1].link.control
-+		ring->last_seg->trbs[ring->trbs_per_seg - 1].link.control
- 			&= ~cpu_to_le32(LINK_TOGGLE);
--		last->trbs[TRBS_PER_SEGMENT-1].link.control
-+		last->trbs[ring->trbs_per_seg - 1].link.control
- 			|= cpu_to_le32(LINK_TOGGLE);
- 		ring->last_seg = last;
- 	}
-@@ -314,14 +317,15 @@ void xhci_initialize_ring_info(struct xh
- 	 * Each segment has a link TRB, and leave an extra TRB for SW
- 	 * accounting purpose
- 	 */
--	ring->num_trbs_free = ring->num_segs * (TRBS_PER_SEGMENT - 1) - 1;
-+	ring->num_trbs_free = ring->num_segs * (ring->trbs_per_seg - 1) - 1;
- }
- 
- /* Allocate segments and link them for a ring */
- static int xhci_alloc_segments_for_ring(struct xhci_hcd *xhci,
- 		struct xhci_segment **first, struct xhci_segment **last,
--		unsigned int num_segs, unsigned int cycle_state,
--		enum xhci_ring_type type, unsigned int max_packet, gfp_t flags)
-+		unsigned int num_segs, unsigned int trbs_per_seg,
-+		unsigned int cycle_state, enum xhci_ring_type type,
-+		unsigned int max_packet, gfp_t flags)
- {
- 	struct xhci_segment *prev;
- 	bool chain_links;
-@@ -350,12 +354,12 @@ static int xhci_alloc_segments_for_ring(
- 			}
- 			return -ENOMEM;
- 		}
--		xhci_link_segments(prev, next, type, chain_links);
-+		xhci_link_segments(prev, next, trbs_per_seg, type, chain_links);
- 
- 		prev = next;
- 		num_segs--;
- 	}
--	xhci_link_segments(prev, *first, type, chain_links);
-+	xhci_link_segments(prev, *first, trbs_per_seg, type, chain_links);
- 	*last = prev;
- 
- 	return 0;
-@@ -387,16 +391,17 @@ struct xhci_ring *xhci_ring_alloc(struct
- 	if (num_segs == 0)
- 		return ring;
- 
-+	ring->trbs_per_seg = TRBS_PER_SEGMENT;
- 	ret = xhci_alloc_segments_for_ring(xhci, &ring->first_seg,
--			&ring->last_seg, num_segs, cycle_state, type,
--			max_packet, flags);
-+			&ring->last_seg, num_segs, ring->trbs_per_seg,
-+			cycle_state, type, max_packet, flags);
- 	if (ret)
- 		goto fail;
- 
- 	/* Only event ring does not use link TRB */
- 	if (type != TYPE_EVENT) {
- 		/* See section 4.9.2.1 and 6.4.4.1 */
--		ring->last_seg->trbs[TRBS_PER_SEGMENT - 1].link.control |=
-+		ring->last_seg->trbs[ring->trbs_per_seg - 1].link.control |=
- 			cpu_to_le32(LINK_TOGGLE);
- 	}
- 	xhci_initialize_ring_info(ring, cycle_state);
-@@ -429,15 +434,14 @@ int xhci_ring_expansion(struct xhci_hcd
- 	unsigned int		num_segs_needed;
- 	int			ret;
- 
--	num_segs_needed = (num_trbs + (TRBS_PER_SEGMENT - 1) - 1) /
--				(TRBS_PER_SEGMENT - 1);
--
-+	num_segs_needed = (num_trbs + (ring->trbs_per_seg - 1) - 1) /
-+				(ring->trbs_per_seg - 1);
- 	/* Allocate number of segments we needed, or double the ring size */
- 	num_segs = max(ring->num_segs, num_segs_needed);
- 
- 	ret = xhci_alloc_segments_for_ring(xhci, &first, &last,
--			num_segs, ring->cycle_state, ring->type,
--			ring->bounce_buf_len, flags);
-+			num_segs, ring->trbs_per_seg, ring->cycle_state,
-+			ring->type, ring->bounce_buf_len, flags);
- 	if (ret)
- 		return -ENOMEM;
- 
-@@ -1813,7 +1817,7 @@ int xhci_alloc_erst(struct xhci_hcd *xhc
- 	for (val = 0; val < evt_ring->num_segs; val++) {
- 		entry = &erst->entries[val];
- 		entry->seg_addr = cpu_to_le64(seg->dma);
--		entry->seg_size = cpu_to_le32(TRBS_PER_SEGMENT);
-+		entry->seg_size = cpu_to_le32(evt_ring->trbs_per_seg);
- 		entry->rsvd = 0;
- 		seg = seg->next;
- 	}
---- a/drivers/usb/host/xhci-ring.c
-+++ b/drivers/usb/host/xhci-ring.c
-@@ -90,15 +90,16 @@ static bool trb_is_link(union xhci_trb *
- 	return TRB_TYPE_LINK_LE32(trb->link.control);
- }
- 
--static bool last_trb_on_seg(struct xhci_segment *seg, union xhci_trb *trb)
-+static bool last_trb_on_seg(struct xhci_segment *seg,
-+			    unsigned int trbs_per_seg, union xhci_trb *trb)
- {
--	return trb == &seg->trbs[TRBS_PER_SEGMENT - 1];
-+	return trb == &seg->trbs[trbs_per_seg - 1];
- }
- 
- static bool last_trb_on_ring(struct xhci_ring *ring,
- 			struct xhci_segment *seg, union xhci_trb *trb)
- {
--	return last_trb_on_seg(seg, trb) && (seg->next == ring->first_seg);
-+	return last_trb_on_seg(seg, ring->trbs_per_seg, trb) && (seg->next == ring->first_seg);
- }
- 
- static bool link_trb_toggles_cycle(union xhci_trb *trb)
-@@ -161,7 +162,8 @@ void inc_deq(struct xhci_hcd *xhci, stru
- 
- 	/* event ring doesn't have link trbs, check for last trb */
- 	if (ring->type == TYPE_EVENT) {
--		if (!last_trb_on_seg(ring->deq_seg, ring->dequeue)) {
-+		if (!last_trb_on_seg(ring->deq_seg, ring->trbs_per_seg,
-+				     ring->dequeue)) {
- 			ring->dequeue++;
- 			goto out;
- 		}
-@@ -174,7 +176,8 @@ void inc_deq(struct xhci_hcd *xhci, stru
- 
- 	/* All other rings have link trbs */
- 	if (!trb_is_link(ring->dequeue)) {
--		if (last_trb_on_seg(ring->deq_seg, ring->dequeue)) {
-+		if (last_trb_on_seg(ring->deq_seg, ring->trbs_per_seg,
-+		    ring->dequeue)) {
- 			xhci_warn(xhci, "Missing link TRB at end of segment\n");
- 		} else {
- 			ring->dequeue++;
-@@ -225,7 +228,7 @@ static void inc_enq(struct xhci_hcd *xhc
- 	if (!trb_is_link(ring->enqueue))
- 		ring->num_trbs_free--;
- 
--	if (last_trb_on_seg(ring->enq_seg, ring->enqueue)) {
-+	if (last_trb_on_seg(ring->enq_seg, ring->trbs_per_seg, ring->enqueue)) {
- 		xhci_err(xhci, "Tried to move enqueue past ring segment\n");
- 		return;
- 	}
-@@ -3151,7 +3154,7 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd
- 	 * that clears the EHB.
- 	 */
- 	while (xhci_handle_event(xhci) > 0) {
--		if (event_loop++ < TRBS_PER_SEGMENT / 2)
-+		if (event_loop++ < xhci->event_ring->trbs_per_seg / 2)
- 			continue;
- 		xhci_update_erst_dequeue(xhci, event_ring_deq);
- 		event_ring_deq = xhci->event_ring->dequeue;
-@@ -3293,7 +3296,8 @@ static int prepare_ring(struct xhci_hcd
- 		}
- 	}
- 
--	if (last_trb_on_seg(ep_ring->enq_seg, ep_ring->enqueue)) {
-+	if (last_trb_on_seg(ep_ring->enq_seg, ep_ring->trbs_per_seg,
-+	    ep_ring->enqueue)) {
- 		xhci_warn(xhci, "Missing link TRB at end of ring segment\n");
- 		return -EINVAL;
- 	}
---- a/drivers/usb/host/xhci.c
-+++ b/drivers/usb/host/xhci.c
-@@ -895,8 +895,8 @@ static void xhci_clear_command_ring(stru
- 	seg = ring->deq_seg;
- 	do {
- 		memset(seg->trbs, 0,
--			sizeof(union xhci_trb) * (TRBS_PER_SEGMENT - 1));
--		seg->trbs[TRBS_PER_SEGMENT - 1].link.control &=
-+			sizeof(union xhci_trb) * (ring->trbs_per_seg - 1));
-+		seg->trbs[ring->trbs_per_seg - 1].link.control &=
- 			cpu_to_le32(~TRB_CYCLE);
- 		seg = seg->next;
- 	} while (seg != ring->deq_seg);
-@@ -907,7 +907,7 @@ static void xhci_clear_command_ring(stru
- 	ring->enq_seg = ring->deq_seg;
- 	ring->enqueue = ring->dequeue;
- 
--	ring->num_trbs_free = ring->num_segs * (TRBS_PER_SEGMENT - 1) - 1;
-+	ring->num_trbs_free = ring->num_segs * (ring->trbs_per_seg - 1) - 1;
- 	/*
- 	 * Ring is now zeroed, so the HW should look for change of ownership
- 	 * when the cycle bit is set to 1.
---- a/drivers/usb/host/xhci.h
-+++ b/drivers/usb/host/xhci.h
-@@ -1639,6 +1639,7 @@ struct xhci_ring {
- 	unsigned int		num_trbs_free;
- 	unsigned int		num_trbs_free_temp;
- 	unsigned int		bounce_buf_len;
-+	unsigned int		trbs_per_seg;
- 	enum xhci_ring_type	type;
- 	bool			last_td_was_short;
- 	struct radix_tree_root	*trb_address_map;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0362-usb-xhci-add-VLI_TRB_CACHE_BUG-quirk.patch b/target/linux/bcm27xx/patches-6.1/950-0362-usb-xhci-add-VLI_TRB_CACHE_BUG-quirk.patch
deleted file mode 100644
index da0d7cd969..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0362-usb-xhci-add-VLI_TRB_CACHE_BUG-quirk.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 02b78815e793d3f778b3f9b199f17cdd7f7e074d Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.com>
-Date: Mon, 13 Dec 2021 16:04:03 +0000
-Subject: [PATCH] usb: xhci: add VLI_TRB_CACHE_BUG quirk
-
-The VL805 fetches up to 4 transfer TRBs at a time. TRB reads don't cross
-a 64B boundary, and if a TRB is fetched and is not on a 64B boundary,
-the read is sized up to the next 64B boundary.
-
-However the VL805 implements a readahead prefetch for TRBs on a transfer
-ring. This fetches the next 64B after any TRB read has happened. Near
-the end of a ring segment, the prefetcher can read the first 64B of the
-next page in physical memory and this is where the behaviour causes a
-bug.
-
-The controller does not tag reads with which endpoint they are for, so
-if the start of the next page is a ring segment used by a victim
-endpoint, and the victim endpoint is about to fetch TRBs from the start
-of the segment, the victim endpoint will read from the prefetched data
-and not perform a read to main memory. If the data is stale, the ring
-cycle state bit may not be correct and the endpoint will silently halt.
-
-Adjust trbs_per_seg for transfer rings allocated for this controller.
-
-See https://github.com/raspberrypi/linux/issues/4685
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- drivers/usb/host/xhci-mem.c | 11 +++++++++++
- drivers/usb/host/xhci-pci.c |  1 +
- drivers/usb/host/xhci.h     |  1 +
- 3 files changed, 13 insertions(+)
-
---- a/drivers/usb/host/xhci-mem.c
-+++ b/drivers/usb/host/xhci-mem.c
-@@ -392,6 +392,17 @@ struct xhci_ring *xhci_ring_alloc(struct
- 		return ring;
- 
- 	ring->trbs_per_seg = TRBS_PER_SEGMENT;
-+	/*
-+	 * The Via VL805 has a bug where cache readahead will fetch off the end
-+	 * of a page if the Link TRB of a transfer ring is in the last 4 slots.
-+	 * Where there are consecutive physical pages containing ring segments,
-+	 * this can cause a desync between the controller's view of a ring
-+	 * and the host.
-+	 */
-+	if (xhci->quirks & XHCI_VLI_TRB_CACHE_BUG &&
-+	    type != TYPE_EVENT && type != TYPE_COMMAND)
-+		ring->trbs_per_seg -= 4;
-+
- 	ret = xhci_alloc_segments_for_ring(xhci, &ring->first_seg,
- 			&ring->last_seg, num_segs, ring->trbs_per_seg,
- 			cycle_state, type, max_packet, flags);
---- a/drivers/usb/host/xhci-pci.c
-+++ b/drivers/usb/host/xhci-pci.c
-@@ -296,6 +296,7 @@ static void xhci_pci_quirks(struct devic
- 	if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == 0x3483) {
- 		xhci->quirks |= XHCI_LPM_SUPPORT;
- 		xhci->quirks |= XHCI_AVOID_DQ_ON_LINK;
-+		xhci->quirks |= XHCI_VLI_TRB_CACHE_BUG;
- 	}
- 
- 	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
---- a/drivers/usb/host/xhci.h
-+++ b/drivers/usb/host/xhci.h
-@@ -1909,6 +1909,7 @@ struct xhci_hcd {
- #define XHCI_ZHAOXIN_TRB_FETCH	BIT_ULL(45)
- #define XHCI_ZHAOXIN_HOST	BIT_ULL(46)
- #define XHCI_AVOID_DQ_ON_LINK  BIT_ULL(47)
-+#define XHCI_VLI_TRB_CACHE_BUG BIT_ULL(48)
- 
- 	unsigned int		num_active_eps;
- 	unsigned int		limit_active_eps;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0363-media-i2c-ov5647-Add-support-for-regulator-control.patch b/target/linux/bcm27xx/patches-6.1/950-0363-media-i2c-ov5647-Add-support-for-regulator-control.patch
deleted file mode 100644
index c65e63970e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0363-media-i2c-ov5647-Add-support-for-regulator-control.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 0f2ea90b02dff030db20b3725a4b3148c51892d8 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Mon, 22 Nov 2021 12:31:35 +0000
-Subject: [PATCH] media: i2c: ov5647: Add support for regulator
- control.
-
-The driver supported using GPIOs to control the shutdown line,
-but no regulator control.
-
-Add regulator hooks.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/i2c/ov5647.c | 37 +++++++++++++++++++++++++++++++++++++
- 1 file changed, 37 insertions(+)
-
---- a/drivers/media/i2c/ov5647.c
-+++ b/drivers/media/i2c/ov5647.c
-@@ -20,6 +20,7 @@
- #include <linux/module.h>
- #include <linux/of_graph.h>
- #include <linux/pm_runtime.h>
-+#include <linux/regulator/consumer.h>
- #include <linux/slab.h>
- #include <linux/videodev2.h>
- #include <media/v4l2-ctrls.h>
-@@ -82,6 +83,15 @@
- #define OV5647_EXPOSURE_DEFAULT		1000
- #define OV5647_EXPOSURE_MAX		65535
- 
-+/* regulator supplies */
-+static const char * const ov5647_supply_names[] = {
-+	"avdd",		/* Analog power */
-+	"dovdd",	/* Digital I/O power */
-+	"dvdd",		/* Digital core power */
-+};
-+
-+#define OV5647_NUM_SUPPLIES ARRAY_SIZE(ov5647_supply_names)
-+
- struct regval_list {
- 	u16 addr;
- 	u8 data;
-@@ -103,6 +113,7 @@ struct ov5647 {
- 	struct mutex			lock;
- 	struct clk			*xclk;
- 	struct gpio_desc		*pwdn;
-+	struct regulator_bulk_data supplies[OV5647_NUM_SUPPLIES];
- 	bool				clock_ncont;
- 	struct v4l2_ctrl_handler	ctrls;
- 	const struct ov5647_mode	*mode;
-@@ -787,6 +798,12 @@ static int ov5647_power_on(struct device
- 
- 	dev_dbg(dev, "OV5647 power on\n");
- 
-+	ret = regulator_bulk_enable(OV5647_NUM_SUPPLIES, sensor->supplies);
-+	if (ret < 0) {
-+		dev_err(dev, "Failed to enable regulators\n");
-+		return ret;
-+	}
-+
- 	if (sensor->pwdn) {
- 		gpiod_set_value_cansleep(sensor->pwdn, 0);
- 		msleep(PWDN_ACTIVE_DELAY_MS);
-@@ -818,6 +835,7 @@ error_clk_disable:
- 	clk_disable_unprepare(sensor->xclk);
- error_pwdn:
- 	gpiod_set_value_cansleep(sensor->pwdn, 1);
-+	regulator_bulk_disable(OV5647_NUM_SUPPLIES, sensor->supplies);
- 
- 	return ret;
- }
-@@ -847,6 +865,7 @@ static int ov5647_power_off(struct devic
- 
- 	clk_disable_unprepare(sensor->xclk);
- 	gpiod_set_value_cansleep(sensor->pwdn, 1);
-+	regulator_bulk_disable(OV5647_NUM_SUPPLIES, sensor->supplies);
- 
- 	return 0;
- }
-@@ -1347,6 +1366,18 @@ static const struct v4l2_ctrl_ops ov5647
- 	.s_ctrl = ov5647_s_ctrl,
- };
- 
-+static int ov5647_configure_regulators(struct device *dev,
-+				       struct ov5647 *sensor)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < OV5647_NUM_SUPPLIES; i++)
-+		sensor->supplies[i].supply = ov5647_supply_names[i];
-+
-+	return devm_regulator_bulk_get(dev, OV5647_NUM_SUPPLIES,
-+				       sensor->supplies);
-+}
-+
- static int ov5647_init_controls(struct ov5647 *sensor, struct device *dev)
- {
- 	struct i2c_client *client = v4l2_get_subdevdata(&sensor->sd);
-@@ -1494,6 +1525,12 @@ static int ov5647_probe(struct i2c_clien
- 		return -EINVAL;
- 	}
- 
-+	ret = ov5647_configure_regulators(dev, sensor);
-+	if (ret) {
-+		dev_err(dev, "Failed to get power regulators\n");
-+		return ret;
-+	}
-+
- 	mutex_init(&sensor->lock);
- 
- 	sensor->mode = OV5647_DEFAULT_MODE;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0364-media-i2c-ov7251-Make-the-enable-GPIO-optional.patch b/target/linux/bcm27xx/patches-6.1/950-0364-media-i2c-ov7251-Make-the-enable-GPIO-optional.patch
deleted file mode 100644
index 1fa99226da..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0364-media-i2c-ov7251-Make-the-enable-GPIO-optional.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8e2ed1f961359103c877cf29959895bf36960e11 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 14 Dec 2021 17:18:49 +0000
-Subject: [PATCH] media: i2c: ov7251: Make the enable GPIO optional.
-
-Not all implementations wire up the enable GPIO and may just tie
-it to a supply rail.
-Make it optional.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/i2c/ov7251.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/media/i2c/ov7251.c
-+++ b/drivers/media/i2c/ov7251.c
-@@ -1676,7 +1676,8 @@ static int ov7251_probe(struct i2c_clien
- 		return PTR_ERR(ov7251->analog_regulator);
- 	}
- 
--	ov7251->enable_gpio = devm_gpiod_get(dev, "enable", GPIOD_OUT_HIGH);
-+	ov7251->enable_gpio = devm_gpiod_get_optional(dev, "enable",
-+						      GPIOD_OUT_HIGH);
- 	if (IS_ERR(ov7251->enable_gpio)) {
- 		dev_err(dev, "cannot get enable gpio\n");
- 		return PTR_ERR(ov7251->enable_gpio);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0365-staging-bcm2835-isp-Fix-cleanup-after-init-fail.patch b/target/linux/bcm27xx/patches-6.1/950-0365-staging-bcm2835-isp-Fix-cleanup-after-init-fail.patch
deleted file mode 100644
index 786148ed13..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0365-staging-bcm2835-isp-Fix-cleanup-after-init-fail.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 35a9acc89dc7f7dc2f6e080abebcc3416be420db Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 16 Dec 2021 16:25:00 +0000
-Subject: [PATCH] staging/bcm2835-isp: Fix cleanup after init fail
-
-bcm2835_isp_remove is called on an initialisation failure, but at that
-point the drvdata hasn't been set. This causes a crash when e.g. using
-the cutdown firmware (gpu_mem=16).
-
-Move platform_set_drvdata before the instance probing loop to avoid the
-problem.
-
-See: https://github.com/raspberrypi/linux/issues/4774
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-+++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-@@ -1776,6 +1776,8 @@ static int bcm2835_isp_probe(struct plat
- 	if (!bcm2835_isp_instances)
- 		return -ENOMEM;
- 
-+	platform_set_drvdata(pdev, bcm2835_isp_instances);
-+
- 	for (i = 0; i < BCM2835_ISP_NUM_INSTANCES; i++) {
- 		ret = bcm2835_isp_probe_instance(pdev,
- 						 &bcm2835_isp_instances[i], i);
-@@ -1783,7 +1785,6 @@ static int bcm2835_isp_probe(struct plat
- 			goto error;
- 	}
- 
--	platform_set_drvdata(pdev, bcm2835_isp_instances);
- 	dev_info(&pdev->dev, "Loaded V4L2 %s\n", BCM2835_ISP_NAME);
- 	return 0;
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0366-uapi-v4l2-controls-Reset-V4L2_CID_USER_BCM2835_ISP_B.patch b/target/linux/bcm27xx/patches-6.1/950-0366-uapi-v4l2-controls-Reset-V4L2_CID_USER_BCM2835_ISP_B.patch
deleted file mode 100644
index 8ff83761bb..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0366-uapi-v4l2-controls-Reset-V4L2_CID_USER_BCM2835_ISP_B.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From ac4eb1ccf6e4889519548d6fbbea428997406e88 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 4 Jan 2022 13:56:42 +0000
-Subject: [PATCH] uapi/v4l2-controls: Reset
- V4L2_CID_USER_BCM2835_ISP_BASE to same as 5.10
-
-https://github.com/raspberrypi/linux/issues/4440
-
-Upstream has added additional device specific controls, so the
-V4L2_CID_USER_BASE + 0x10e0 value that had been defined for use with
-the ISP has been taken by something else (and +0x10f0 has been used as
-well)
-
-Duplicate the use on V4L2_CID_USER_BASE + 0x10e0 so that userspace
-(libcamera) doesn't need to change. Once the driver is upstream, then
-we'll update libcamera to adopt the new value as it then won't change.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- include/uapi/linux/v4l2-controls.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/include/uapi/linux/v4l2-controls.h
-+++ b/include/uapi/linux/v4l2-controls.h
-@@ -233,7 +233,7 @@ enum v4l2_colorfx {
- 
- /* The base for the bcm2835-isp driver controls.
-  * We reserve 16 controls for this driver. */
--#define V4L2_CID_USER_BCM2835_ISP_BASE		(V4L2_CID_USER_BASE + 0x10f0)
-+#define V4L2_CID_USER_BCM2835_ISP_BASE		(V4L2_CID_USER_BASE + 0x10e0)
- 
- /* MPEG-class control IDs */
- /* The MPEG controls are applicable to all codec controls
diff --git a/target/linux/bcm27xx/patches-6.1/950-0367-media-i2c-ov9281-Increase-diff-between-VTS-and-max-e.patch b/target/linux/bcm27xx/patches-6.1/950-0367-media-i2c-ov9281-Increase-diff-between-VTS-and-max-e.patch
deleted file mode 100644
index f7450cbe2c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0367-media-i2c-ov9281-Increase-diff-between-VTS-and-max-e.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From d66098625b057d12fcffdb07a6f2d462e0e2495d Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 4 Jan 2022 14:46:01 +0000
-Subject: [PATCH] media: i2c: ov9281: Increase diff between VTS and max
- exposure
-
-The driver did allow the exposure to go up to VTS - 4 lines,
-but this would produce a visible line on 1280x800, and a stall of
-the sensor at 640x480.
-
-Whilst it appears to work with a difference of 5, the datasheet states
-there should be at least 25 lines difference between VTS and exposure,
-so use that value.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/i2c/ov9281.c | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
---- a/drivers/media/i2c/ov9281.c
-+++ b/drivers/media/i2c/ov9281.c
-@@ -52,7 +52,11 @@
- #define OV9281_REG_EXPOSURE		0x3500
- #define	OV9281_EXPOSURE_MIN		4
- #define	OV9281_EXPOSURE_STEP		1
--#define OV9281_VTS_MAX			0x7fff
-+/*
-+ * Number of lines less than frame length (VTS) that exposure must be.
-+ * Datasheet states 25, although empirically 5 appears to work.
-+ */
-+#define OV9281_EXPOSURE_OFFSET		25
- 
- #define OV9281_REG_GAIN_H		0x3508
- #define OV9281_REG_GAIN_L		0x3509
-@@ -69,6 +73,7 @@
- #define OV9281_TEST_PATTERN_DISABLE	0x0
- 
- #define OV9281_REG_VTS			0x380e
-+#define OV9281_VTS_MAX			0x7fff
- 
- /*
-  * OV9281 native and active pixel array size.
-@@ -967,7 +972,7 @@ static int ov9281_set_ctrl(struct v4l2_c
- 	switch (ctrl->id) {
- 	case V4L2_CID_VBLANK:
- 		/* Update max exposure while meeting expected vblanking */
--		max = ov9281->cur_mode->height + ctrl->val - 4;
-+		max = ov9281->cur_mode->height + ctrl->val - OV9281_EXPOSURE_OFFSET;
- 		__v4l2_ctrl_modify_range(ov9281->exposure,
- 					 ov9281->exposure->minimum, max,
- 					 ov9281->exposure->step,
-@@ -1062,7 +1067,7 @@ static int ov9281_initialize_controls(st
- 					   OV9281_VTS_MAX - mode->height, 1,
- 					   vblank_def);
- 
--	exposure_max = mode->vts_def - 4;
-+	exposure_max = mode->vts_def - OV9281_EXPOSURE_OFFSET;
- 	ov9281->exposure = v4l2_ctrl_new_std(handler, &ov9281_ctrl_ops,
- 					     V4L2_CID_EXPOSURE,
- 					     OV9281_EXPOSURE_MIN, exposure_max,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0369-bcm2835-v4l2-isp-Add-missing-lock-initialization.patch b/target/linux/bcm27xx/patches-6.1/950-0369-bcm2835-v4l2-isp-Add-missing-lock-initialization.patch
deleted file mode 100644
index 21758b4980..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0369-bcm2835-v4l2-isp-Add-missing-lock-initialization.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 0c2ce359491f9eafe67c4118be10070fb8ca367d Mon Sep 17 00:00:00 2001
-From: Padmanabha Srinivasaiah <treasure4paddy@gmail.com>
-Date: Thu, 30 Dec 2021 21:45:10 +0100
-Subject: [PATCH] bcm2835-v4l2-isp: Add missing lock initialization
-
-ISP device allocation is dynamic hence the locks too.
-struct mutex queue_lock is not initialized which result in bug.
-
-Fixing same by initializing it.
-
-[   29.847138] INFO: trying to register non-static key.
-[   29.847156] The code is fine but needs lockdep annotation, or maybe
-[   29.847159] you didn't initialize this object before use?
-[   29.847161] turning off the locking correctness validator.
-[   29.847167] CPU: 1 PID: 343 Comm: v4l_id Tainted: G         C        5.15.11-rt24-v8+ #8
-[   29.847187] Hardware name: Raspberry Pi 4 Model B Rev 1.4 (DT)
-[   29.847194] Call trace:
-[   29.847197]  dump_backtrace+0x0/0x1b8
-[   29.847227]  show_stack+0x20/0x30
-[   29.847240]  dump_stack_lvl+0x8c/0xb8
-[   29.847254]  dump_stack+0x18/0x34
-[   29.847263]  register_lock_class+0x494/0x4a0
-[   29.847278]  __lock_acquire+0x80/0x1680
-[   29.847289]  lock_acquire+0x214/0x3a0
-[   29.847300]  mutex_lock_nested+0x70/0xc8
-[   29.847312]  _vb2_fop_release+0x3c/0xa8 [videobuf2_v4l2]
-[   29.847346]  vb2_fop_release+0x34/0x60 [videobuf2_v4l2]
-[   29.847367]  v4l2_release+0xc8/0x108 [videodev]
-[   29.847453]  __fput+0x8c/0x258
-[   29.847476]  ____fput+0x18/0x28
-[   29.847487]  task_work_run+0x98/0x180
-[   29.847502]  do_notify_resume+0x228/0x3f8
-[   29.847515]  el0_svc+0xec/0xf0
-[   29.847523]  el0t_64_sync_handler+0x90/0xb8
-[   29.847531]  el0t_64_sync+0x180/0x184
-
-Signed-off-by: Padmanabha Srinivasaiah <treasure4paddy@gmail.com>
----
- drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-+++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-@@ -1296,6 +1296,7 @@ static int register_node(struct bcm2835_
- 	int ret;
- 
- 	mutex_init(&node->lock);
-+	mutex_init(&node->queue_lock);
- 
- 	node->dev = dev;
- 	vfd = &node->vfd;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0370-mfd-simple-mfd-i2c-Add-configuration-for-RPi-POE-HAT.patch b/target/linux/bcm27xx/patches-6.1/950-0370-mfd-simple-mfd-i2c-Add-configuration-for-RPi-POE-HAT.patch
deleted file mode 100644
index 2d66e12658..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0370-mfd-simple-mfd-i2c-Add-configuration-for-RPi-POE-HAT.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From aa4a0729c4e6f94fde5281d6454342bbd4fc69e1 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 19 Jan 2022 17:22:57 +0000
-Subject: [PATCH] mfd: simple-mfd-i2c: Add configuration for RPi POE
- HAT
-
-The Raspbery Pi PoE+ HAT exposes a fan controller and power
-supply status reporting via a single I2C address.
-
-Create an MFD device that allows loading of the relevant
-sub-drivers, with a shared I2C regmap.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/mfd/Kconfig          | 10 ++++++++++
- drivers/mfd/simple-mfd-i2c.c | 10 ++++++++++
- 2 files changed, 20 insertions(+)
-
---- a/drivers/mfd/Kconfig
-+++ b/drivers/mfd/Kconfig
-@@ -1152,6 +1152,16 @@ config MFD_SY7636A
- 	  To enable support for building sub-devices as modules,
- 	  choose M here.
- 
-+config MFD_RASPBERRYPI_POE_HAT
-+	tristate "Raspberry Pi PoE HAT MFD"
-+	depends on I2C
-+	select MFD_SIMPLE_MFD_I2C
-+	help
-+	  This module supports the PWM fan controller found on the Raspberry Pi
-+	  POE and POE+ HAT boards, and the power supply driver on the POE+ HAT.
-+	  (Functionally it relies on MFD_SIMPLE_MFD_I2C to provide the framework
-+	  that loads the child drivers).
-+
- config MFD_RDC321X
- 	tristate "RDC R-321x southbridge"
- 	select MFD_CORE
---- a/drivers/mfd/simple-mfd-i2c.c
-+++ b/drivers/mfd/simple-mfd-i2c.c
-@@ -29,6 +29,15 @@ static const struct regmap_config regmap
- 	.val_bits = 8,
- };
- 
-+static const struct regmap_config regmap_config_16r_8v = {
-+	.reg_bits = 16,
-+	.val_bits = 8,
-+};
-+
-+static const struct simple_mfd_data rpi_poe_core = {
-+	.regmap_config = &regmap_config_16r_8v,
-+};
-+
- static int simple_mfd_i2c_probe(struct i2c_client *i2c)
- {
- 	const struct simple_mfd_data *simple_mfd_data;
-@@ -75,6 +84,7 @@ static const struct simple_mfd_data sile
- static const struct of_device_id simple_mfd_i2c_of_match[] = {
- 	{ .compatible = "kontron,sl28cpld" },
- 	{ .compatible = "silergy,sy7636a", .data = &silergy_sy7636a},
-+	{ .compatible = "raspberrypi,poe-core", &rpi_poe_core },
- 	{}
- };
- MODULE_DEVICE_TABLE(of, simple_mfd_i2c_of_match);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0371-pwm-raspberrypi-poe-Add-option-of-being-created-by-M.patch b/target/linux/bcm27xx/patches-6.1/950-0371-pwm-raspberrypi-poe-Add-option-of-being-created-by-M.patch
deleted file mode 100644
index 0f5d61465c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0371-pwm-raspberrypi-poe-Add-option-of-being-created-by-M.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 750fcf1df4414e0823100135a3ff7ea760d0fa86 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 19 Jan 2022 17:26:22 +0000
-Subject: [PATCH] pwm: raspberrypi-poe: Add option of being created by
- MFD or FW
-
-The firmware can only use I2C0 if the kernel isn't, therefore
-with libcamera and DRM using it the PoE HAT fan control needs
-to move to the kernel.
-
-Add the option for the driver to be created by the PoE HAT core
-MFD driver, and use the I2C regmap that provides to control fan
-functions.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/pwm/pwm-raspberrypi-poe.c | 81 ++++++++++++++++++-------------
- 1 file changed, 48 insertions(+), 33 deletions(-)
-
---- a/drivers/pwm/pwm-raspberrypi-poe.c
-+++ b/drivers/pwm/pwm-raspberrypi-poe.c
-@@ -16,6 +16,7 @@
- #include <linux/of.h>
- #include <linux/platform_device.h>
- #include <linux/pwm.h>
-+#include <linux/regmap.h>
- 
- #include <soc/bcm2835/raspberrypi-firmware.h>
- #include <dt-bindings/pwm/raspberrypi,firmware-poe-pwm.h>
-@@ -27,6 +28,10 @@
- 
- struct raspberrypi_pwm {
- 	struct rpi_firmware *firmware;
-+
-+	struct regmap *regmap;
-+	u32 offset;
-+
- 	struct pwm_chip chip;
- 	unsigned int duty_cycle;
- };
-@@ -43,7 +48,7 @@ struct raspberrypi_pwm *raspberrypi_pwm_
- 	return container_of(chip, struct raspberrypi_pwm, chip);
- }
- 
--static int raspberrypi_pwm_set_property(struct rpi_firmware *firmware,
-+static int raspberrypi_pwm_set_property(struct raspberrypi_pwm *pwm,
- 					u32 reg, u32 val)
- {
- 	struct raspberrypi_pwm_prop msg = {
-@@ -52,17 +57,19 @@ static int raspberrypi_pwm_set_property(
- 	};
- 	int ret;
- 
--	ret = rpi_firmware_property(firmware, RPI_FIRMWARE_SET_POE_HAT_VAL,
--				    &msg, sizeof(msg));
--	if (ret)
--		return ret;
--	if (msg.ret)
--		return -EIO;
-+	if (pwm->firmware) {
-+		ret = rpi_firmware_property(pwm->firmware, RPI_FIRMWARE_SET_POE_HAT_VAL,
-+					    &msg, sizeof(msg));
-+		if (!ret && msg.ret)
-+			ret = -EIO;
-+	} else {
-+		ret = regmap_write(pwm->regmap, pwm->offset + reg, val);
-+	}
- 
--	return 0;
-+	return ret;
- }
- 
--static int raspberrypi_pwm_get_property(struct rpi_firmware *firmware,
-+static int raspberrypi_pwm_get_property(struct raspberrypi_pwm *pwm,
- 					u32 reg, u32 *val)
- {
- 	struct raspberrypi_pwm_prop msg = {
-@@ -70,16 +77,17 @@ static int raspberrypi_pwm_get_property(
- 	};
- 	int ret;
- 
--	ret = rpi_firmware_property(firmware, RPI_FIRMWARE_GET_POE_HAT_VAL,
--				    &msg, sizeof(msg));
--	if (ret)
--		return ret;
--	if (msg.ret)
--		return -EIO;
--
--	*val = le32_to_cpu(msg.val);
-+	if (pwm->firmware) {
-+		ret = rpi_firmware_property(pwm->firmware, RPI_FIRMWARE_GET_POE_HAT_VAL,
-+					    &msg, sizeof(msg));
-+		if (!ret && msg.ret)
-+			ret = -EIO;
-+		*val = le32_to_cpu(msg.val);
-+	} else {
-+		ret = regmap_read(pwm->regmap, pwm->offset + reg, val);
-+	}
- 
--	return 0;
-+	return ret;
- }
- 
- static int raspberrypi_pwm_get_state(struct pwm_chip *chip,
-@@ -119,7 +127,7 @@ static int raspberrypi_pwm_apply(struct
- 	if (duty_cycle == rpipwm->duty_cycle)
- 		return 0;
- 
--	ret = raspberrypi_pwm_set_property(rpipwm->firmware, RPI_PWM_CUR_DUTY_REG,
-+	ret = raspberrypi_pwm_set_property(rpipwm, RPI_PWM_CUR_DUTY_REG,
- 					   duty_cycle);
- 	if (ret) {
- 		dev_err(chip->dev, "Failed to set duty cycle: %pe\n",
-@@ -146,28 +154,34 @@ static int raspberrypi_pwm_probe(struct
- 	struct raspberrypi_pwm *rpipwm;
- 	int ret;
- 
--	firmware_node = of_get_parent(dev->of_node);
--	if (!firmware_node) {
--		dev_err(dev, "Missing firmware node\n");
--		return -ENOENT;
--	}
--
--	firmware = devm_rpi_firmware_get(&pdev->dev, firmware_node);
--	of_node_put(firmware_node);
--	if (!firmware)
--		return dev_err_probe(dev, -EPROBE_DEFER,
--				     "Failed to get firmware handle\n");
--
- 	rpipwm = devm_kzalloc(&pdev->dev, sizeof(*rpipwm), GFP_KERNEL);
- 	if (!rpipwm)
- 		return -ENOMEM;
- 
--	rpipwm->firmware = firmware;
-+	if (pdev->dev.parent)
-+		rpipwm->regmap = dev_get_regmap(pdev->dev.parent, NULL);
-+
-+	if (rpipwm->regmap) {
-+		ret = device_property_read_u32(&pdev->dev, "reg", &rpipwm->offset);
-+		if (ret)
-+			return -EINVAL;
-+	} else {
-+		firmware_node = of_get_parent(dev->of_node);
-+
-+		firmware = devm_rpi_firmware_get(&pdev->dev, firmware_node);
-+		of_node_put(firmware_node);
-+		if (!firmware)
-+			return dev_err_probe(dev, -EPROBE_DEFER,
-+					     "Failed to get firmware handle\n");
-+
-+		rpipwm->firmware = firmware;
-+	}
-+
- 	rpipwm->chip.dev = dev;
- 	rpipwm->chip.ops = &raspberrypi_pwm_ops;
- 	rpipwm->chip.npwm = RASPBERRYPI_FIRMWARE_PWM_NUM;
- 
--	ret = raspberrypi_pwm_get_property(rpipwm->firmware, RPI_PWM_CUR_DUTY_REG,
-+	ret = raspberrypi_pwm_get_property(rpipwm, RPI_PWM_CUR_DUTY_REG,
- 					   &rpipwm->duty_cycle);
- 	if (ret) {
- 		dev_err(dev, "Failed to get duty cycle: %pe\n", ERR_PTR(ret));
-@@ -179,6 +193,7 @@ static int raspberrypi_pwm_probe(struct
- 
- static const struct of_device_id raspberrypi_pwm_of_match[] = {
- 	{ .compatible = "raspberrypi,firmware-poe-pwm", },
-+	{ .compatible = "raspberrypi,poe-pwm", },
- 	{ }
- };
- MODULE_DEVICE_TABLE(of, raspberrypi_pwm_of_match);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0372-power-rpi-poe-Drop-CURRENT_AVG-as-it-is-not-hardware.patch b/target/linux/bcm27xx/patches-6.1/950-0372-power-rpi-poe-Drop-CURRENT_AVG-as-it-is-not-hardware.patch
deleted file mode 100644
index e2b9bd8731..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0372-power-rpi-poe-Drop-CURRENT_AVG-as-it-is-not-hardware.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 1a9e61cf83ad61803255a749d89957aabe80ba98 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 20 Jan 2022 15:48:03 +0000
-Subject: [PATCH] power: rpi-poe: Drop CURRENT_AVG as it is not
- hardware averaged
-
-As documented the _AVG parameters are meant to be hardware
-averaged, but the implementation for the PoE+ HAT was done in
-software in the firmware.
-
-Drop the property.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/power/supply/rpi_poe_power.c | 10 ----------
- 1 file changed, 10 deletions(-)
-
---- a/drivers/power/supply/rpi_poe_power.c
-+++ b/drivers/power/supply/rpi_poe_power.c
-@@ -106,15 +106,6 @@ static int rpi_poe_power_supply_get_prop
- 		r_val->intval = (val > 5);
- 		return 0;
- 
--	case POWER_SUPPLY_PROP_CURRENT_AVG:
--		val = 50;
--		ret = read_reg(ctx->fw, RPI_POE_ADC_REG, &val);
--		if (ret)
--			return ret;
--		val = (val * 3300)/9821;
--		r_val->intval = val * 1000;
--		return 0;
--
- 	case POWER_SUPPLY_PROP_CURRENT_NOW:
- 		ret = read_reg(ctx->fw, RPI_POE_ADC_REG, &val);
- 		if (ret)
-@@ -145,7 +136,6 @@ static int rpi_poe_power_supply_get_prop
- static enum power_supply_property rpi_poe_power_supply_properties[] = {
- 	POWER_SUPPLY_PROP_HEALTH,
- 	POWER_SUPPLY_PROP_ONLINE,
--	POWER_SUPPLY_PROP_CURRENT_AVG,
- 	POWER_SUPPLY_PROP_CURRENT_NOW,
- 	POWER_SUPPLY_PROP_CURRENT_MAX,
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0373-power-rpi-poe-Add-option-of-being-created-by-MFD-or-.patch b/target/linux/bcm27xx/patches-6.1/950-0373-power-rpi-poe-Add-option-of-being-created-by-MFD-or-.patch
deleted file mode 100644
index de3396850a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0373-power-rpi-poe-Add-option-of-being-created-by-MFD-or-.patch
+++ /dev/null
@@ -1,234 +0,0 @@
-From 710a8410b88cd3cf6b56477b45c09686cc30e576 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 20 Jan 2022 15:50:27 +0000
-Subject: [PATCH] power: rpi-poe: Add option of being created by MFD or
- FW
-
-The firmware can only use I2C0 if the kernel isn't, therefore
-with libcamera and DRM using it the PoE HAT fan control needs
-to move to the kernel.
-
-Add the option for the driver to be created by the PoE HAT core
-MFD driver, and use the I2C regmap that provides to control fan
-functions.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/power/supply/rpi_poe_power.c | 124 ++++++++++++++++-----------
- 1 file changed, 75 insertions(+), 49 deletions(-)
-
---- a/drivers/power/supply/rpi_poe_power.c
-+++ b/drivers/power/supply/rpi_poe_power.c
-@@ -12,10 +12,13 @@
- #include <linux/of.h>
- #include <linux/platform_device.h>
- #include <linux/power_supply.h>
-+#include <linux/regmap.h>
- #include <soc/bcm2835/raspberrypi-firmware.h>
- 
--#define RPI_POE_ADC_REG			0x2
--#define RPI_POE_FLAG_REG		0x4
-+#define RPI_POE_FW_BASE_REG		0x2
-+
-+#define RPI_POE_ADC_REG			0x0
-+#define RPI_POE_FLAG_REG		0x2
- 
- #define RPI_POE_FLAG_AT			BIT(0)
- #define RPI_POE_FLAG_OC			BIT(1)
-@@ -26,8 +29,12 @@
- #define DRVNAME "rpi-poe-power-supply"
- 
- struct rpi_poe_power_supply_ctx {
--	struct power_supply *supply;
- 	struct rpi_firmware *fw;
-+
-+	struct regmap *regmap;
-+	u32 offset;
-+
-+	struct power_supply *supply;
- };
- 
- struct fw_tag_data_s {
-@@ -36,40 +43,51 @@ struct fw_tag_data_s {
- 	u32 ret;
- };
- 
--static int write_reg(struct rpi_firmware *fw, u32 reg, u32 *val)
-+static int write_reg(struct rpi_poe_power_supply_ctx *ctx, u32 reg, u32 *val)
- {
- 	struct fw_tag_data_s fw_tag_data = {
--		.reg = reg,
-+		.reg = reg + RPI_POE_FW_BASE_REG,
- 		.val = *val
- 	};
- 	int ret;
- 
--	ret = rpi_firmware_property(fw, RPI_FIRMWARE_SET_POE_HAT_VAL,
--				    &fw_tag_data, sizeof(fw_tag_data));
--	if (ret)
--		return ret;
--	else if (fw_tag_data.ret)
--		return -EIO;
--	return 0;
-+	if (ctx->fw) {
-+		ret = rpi_firmware_property(ctx->fw, RPI_FIRMWARE_SET_POE_HAT_VAL,
-+					    &fw_tag_data, sizeof(fw_tag_data));
-+		if (!ret && fw_tag_data.ret)
-+			ret = -EIO;
-+	} else {
-+		ret = regmap_write(ctx->regmap, ctx->offset + reg, *val);
-+	}
-+
-+	return ret;
- }
- 
--static int read_reg(struct rpi_firmware *fw, u32 reg, u32 *val)
-+static int read_reg(struct rpi_poe_power_supply_ctx *ctx, u32 reg, u32 *val)
- {
- 	struct fw_tag_data_s fw_tag_data = {
--		.reg = reg,
-+		.reg = reg + RPI_POE_FW_BASE_REG,
- 		.val = *val
- 	};
-+	u32 value;
- 	int ret;
- 
--	ret = rpi_firmware_property(fw, RPI_FIRMWARE_GET_POE_HAT_VAL,
--				    &fw_tag_data, sizeof(fw_tag_data));
--	if (ret)
--		return ret;
--	else if (fw_tag_data.ret)
--		return -EIO;
-+	if (ctx->fw) {
-+		ret = rpi_firmware_property(ctx->fw, RPI_FIRMWARE_GET_POE_HAT_VAL,
-+					    &fw_tag_data, sizeof(fw_tag_data));
-+		if (!ret && fw_tag_data.ret)
-+			ret = -EIO;
-+		*val = fw_tag_data.val;
-+	} else {
-+		ret = regmap_read(ctx->regmap, ctx->offset + reg, &value);
-+		if (!ret) {
-+			*val = value;
-+			ret = regmap_read(ctx->regmap, ctx->offset + reg + 1, &value);
-+			*val |= value << 8;
-+		}
-+	}
- 
--	*val = fw_tag_data.val;
--	return 0;
-+	return ret;
- }
- 
- static int rpi_poe_power_supply_get_property(struct power_supply *psy,
-@@ -82,14 +100,14 @@ static int rpi_poe_power_supply_get_prop
- 
- 	switch (psp) {
- 	case POWER_SUPPLY_PROP_HEALTH:
--		ret = read_reg(ctx->fw, RPI_POE_FLAG_REG, &val);
-+		ret = read_reg(ctx, RPI_POE_FLAG_REG, &val);
- 		if (ret)
- 			return ret;
- 
- 		if (val & RPI_POE_FLAG_OC) {
- 			r_val->intval = POWER_SUPPLY_HEALTH_UNSPEC_FAILURE;
- 			val = RPI_POE_FLAG_OC;
--			ret = write_reg(ctx->fw, RPI_POE_FLAG_REG, &val);
-+			ret = write_reg(ctx, RPI_POE_FLAG_REG, &val);
- 			if (ret)
- 				return ret;
- 			return 0;
-@@ -99,7 +117,7 @@ static int rpi_poe_power_supply_get_prop
- 		return 0;
- 
- 	case POWER_SUPPLY_PROP_ONLINE:
--		ret = read_reg(ctx->fw, RPI_POE_ADC_REG, &val);
-+		ret = read_reg(ctx, RPI_POE_ADC_REG, &val);
- 		if (ret)
- 			return ret;
- 
-@@ -107,7 +125,7 @@ static int rpi_poe_power_supply_get_prop
- 		return 0;
- 
- 	case POWER_SUPPLY_PROP_CURRENT_NOW:
--		ret = read_reg(ctx->fw, RPI_POE_ADC_REG, &val);
-+		ret = read_reg(ctx, RPI_POE_ADC_REG, &val);
- 		if (ret)
- 			return ret;
- 		val = (val * 3300)/9821;
-@@ -115,15 +133,14 @@ static int rpi_poe_power_supply_get_prop
- 		return 0;
- 
- 	case POWER_SUPPLY_PROP_CURRENT_MAX:
--		ret = read_reg(ctx->fw, RPI_POE_FLAG_REG, &val);
-+		ret = read_reg(ctx, RPI_POE_FLAG_REG, &val);
- 		if (ret)
- 			return ret;
- 
--		if (val & RPI_POE_FLAG_AT) {
-+		if (val & RPI_POE_FLAG_AT)
- 			r_val->intval = RPI_POE_CURRENT_AT_MAX;
--			return 0;
--		}
--		r_val->intval = RPI_POE_CURRENT_AF_MAX;
-+		else
-+			r_val->intval = RPI_POE_CURRENT_AF_MAX;
- 		return 0;
- 
- 	default:
-@@ -158,29 +175,38 @@ static int rpi_poe_power_supply_probe(st
- 	if (!of_device_is_available(pdev->dev.of_node))
- 		return -ENODEV;
- 
--	fw_node = of_parse_phandle(pdev->dev.of_node, "firmware", 0);
--	if (!fw_node) {
--		dev_err(&pdev->dev, "Missing firmware node\n");
--		return -ENOENT;
--	}
--
- 	ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);
- 	if (!ctx)
- 		return -ENOMEM;
- 
--	ctx->fw = rpi_firmware_get(fw_node);
--	if (!ctx->fw)
--		return -EPROBE_DEFER;
--	if (rpi_firmware_property(ctx->fw,
--			RPI_FIRMWARE_GET_FIRMWARE_REVISION,
--			&revision, sizeof(revision))) {
--		dev_err(&pdev->dev, "Failed to get firmware revision\n");
--		return -ENOENT;
--	}
--	if (revision < 0x60af72e8) {
--		dev_err(&pdev->dev, "Unsupported firmware\n");
--		return -ENOENT;
-+	if (pdev->dev.parent)
-+		ctx->regmap = dev_get_regmap(pdev->dev.parent, NULL);
-+
-+	if (ctx->regmap) {
-+		if (device_property_read_u32(&pdev->dev, "reg", &ctx->offset))
-+			return -EINVAL;
-+	} else {
-+		fw_node = of_parse_phandle(pdev->dev.of_node, "firmware", 0);
-+		if (!fw_node) {
-+			dev_err(&pdev->dev, "Missing firmware node\n");
-+			return -ENOENT;
-+		}
-+
-+		ctx->fw = rpi_firmware_get(fw_node);
-+		if (!ctx->fw)
-+			return -EPROBE_DEFER;
-+		if (rpi_firmware_property(ctx->fw,
-+					  RPI_FIRMWARE_GET_FIRMWARE_REVISION,
-+					  &revision, sizeof(revision))) {
-+			dev_err(&pdev->dev, "Failed to get firmware revision\n");
-+			return -ENOENT;
-+		}
-+		if (revision < 0x60af72e8) {
-+			dev_err(&pdev->dev, "Unsupported firmware\n");
-+			return -ENOENT;
-+		}
- 	}
-+
- 	platform_set_drvdata(pdev, ctx);
- 
- 	psy_cfg.of_node = pdev->dev.of_node;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0374-drivers-bcm2835_unicam-Disable-trigger-mode-operatio.patch b/target/linux/bcm27xx/patches-6.1/950-0374-drivers-bcm2835_unicam-Disable-trigger-mode-operatio.patch
deleted file mode 100644
index 9751370e62..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0374-drivers-bcm2835_unicam-Disable-trigger-mode-operatio.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 741fb135f1f1746a9e20b6b2445a798c1a296b75 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Tue, 18 Jan 2022 13:13:14 +0000
-Subject: [PATCH] drivers: bcm2835_unicam: Disable trigger mode
- operation
-
-On a Pi3 B/B+ platform the imx219 sensor frequently generates a single corrupt
-frame when the sensor first starts. This can either be a missing line, or
-invalid samples within the line. This only occurrs using the Unicam kernel
-driver.
-
-Disabling trigger mode elimiates this corruption. Since trigger mode is a
-legacy feature copied from the firmware driver and not expected to be needed,
-remove it. Tested on the Raspberry Pi cameras and shows no ill effects.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/platform/bcm2835/bcm2835-unicam.c | 14 +-------------
- 1 file changed, 1 insertion(+), 13 deletions(-)
-
---- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
-+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -983,11 +983,6 @@ static irqreturn_t unicam_isr(int irq, v
- 		}
- 	}
- 
--	if (reg_read(unicam, UNICAM_ICTL) & UNICAM_FCM) {
--		/* Switch out of trigger mode if selected */
--		reg_write_field(unicam, UNICAM_ICTL, 1, UNICAM_TFC);
--		reg_write_field(unicam, UNICAM_ICTL, 0, UNICAM_FCM);
--	}
- 	return IRQ_HANDLED;
- }
- 
-@@ -2297,8 +2292,7 @@ static void unicam_start_rx(struct unica
- 
- 	reg_write_field(dev, UNICAM_ANA, 0, UNICAM_DDL);
- 
--	/* Always start in trigger frame capture mode (UNICAM_FCM set) */
--	val = UNICAM_FSIE | UNICAM_FEIE | UNICAM_FCM | UNICAM_IBOB;
-+	val = UNICAM_FSIE | UNICAM_FEIE | UNICAM_IBOB;
- 	set_field(&val, line_int_freq, UNICAM_LCIE_MASK);
- 	reg_write(dev, UNICAM_ICTL, val);
- 	reg_write(dev, UNICAM_STA, UNICAM_STA_MASK_ALL);
-@@ -2411,12 +2405,6 @@ static void unicam_start_rx(struct unica
- 	/* Load embedded data buffer pointers if needed */
- 	if (dev->node[METADATA_PAD].streaming && dev->sensor_embedded_data)
- 		reg_write_field(dev, UNICAM_DCS, 1, UNICAM_LDP);
--
--	/*
--	 * Enable trigger only for the first frame to
--	 * sync correctly to the FS from the source.
--	 */
--	reg_write_field(dev, UNICAM_ICTL, 1, UNICAM_TFC);
- }
- 
- static void unicam_disable(struct unicam_device *dev)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0375-Extending-ili9881c-driver-support-for-nwe080-panel.patch b/target/linux/bcm27xx/patches-6.1/950-0375-Extending-ili9881c-driver-support-for-nwe080-panel.patch
deleted file mode 100644
index 3ee30d2ab4..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0375-Extending-ili9881c-driver-support-for-nwe080-panel.patch
+++ /dev/null
@@ -1,296 +0,0 @@
-From b9e101dfe5e967b90c8d9e5a90d3784d2cdfb102 Mon Sep 17 00:00:00 2001
-From: Penk Chen <penk@cutiepi.io>
-Date: Mon, 20 Dec 2021 03:44:56 +0900
-Subject: [PATCH] Extending ili9881c driver support for nwe080 panel
-
-Signed-off-by: Penk Chen <penk@cutiepi.io>
----
- drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 249 ++++++++++++++++++
- 1 file changed, 249 insertions(+)
-
---- a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
-+++ b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
-@@ -1,6 +1,8 @@
- // SPDX-License-Identifier: GPL-2.0
- /*
-  * Copyright (C) 2017-2018, Bootlin
-+ * Copyright (C) 2021, Henson Li <henson@cutiepi.io>
-+ * Copyright (C) 2021, Penk Chen <penk@cutiepi.io>
-  */
- 
- #include <linux/delay.h>
-@@ -456,6 +458,228 @@ static const struct ili9881c_instr k101_
- 	ILI9881C_COMMAND_INSTR(0xD3, 0x3F), /* VN0 */
- };
- 
-+static const struct ili9881c_instr nwe080_init[] = {
-+	ILI9881C_SWITCH_PAGE_INSTR(3),
-+	//GIP_1
-+	ILI9881C_COMMAND_INSTR(0x01, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x02, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x03, 0x73),
-+	ILI9881C_COMMAND_INSTR(0x04, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x05, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x06, 0x0A),
-+	ILI9881C_COMMAND_INSTR(0x07, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x08, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x09, 0x20),
-+	ILI9881C_COMMAND_INSTR(0x0a, 0x20),
-+	ILI9881C_COMMAND_INSTR(0x0b, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x0c, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x0d, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x0e, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x0f, 0x1E),
-+	ILI9881C_COMMAND_INSTR(0x10, 0x1E),
-+	ILI9881C_COMMAND_INSTR(0x11, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x12, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x13, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x14, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x15, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x16, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x17, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x18, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x19, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x1A, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x1B, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x1C, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x1D, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x1E, 0x40),
-+	ILI9881C_COMMAND_INSTR(0x1F, 0x80),
-+	ILI9881C_COMMAND_INSTR(0x20, 0x06),
-+	ILI9881C_COMMAND_INSTR(0x21, 0x01),
-+	ILI9881C_COMMAND_INSTR(0x22, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x23, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x24, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x25, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x26, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x27, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x28, 0x33),
-+	ILI9881C_COMMAND_INSTR(0x29, 0x03),
-+	ILI9881C_COMMAND_INSTR(0x2A, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x2B, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x2C, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x2D, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x2E, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x2F, 0x00),
-+
-+	ILI9881C_COMMAND_INSTR(0x30, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x31, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x32, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x33, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x34, 0x04),
-+	ILI9881C_COMMAND_INSTR(0x35, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x36, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x37, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x38, 0x3C),
-+	ILI9881C_COMMAND_INSTR(0x39, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x3A, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x3B, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x3C, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x3D, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x3E, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x3F, 0x00),
-+
-+	ILI9881C_COMMAND_INSTR(0x40, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x41, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x42, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x43, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x44, 0x00),
-+
-+	ILI9881C_COMMAND_INSTR(0x50, 0x10),
-+	ILI9881C_COMMAND_INSTR(0x51, 0x32),
-+	ILI9881C_COMMAND_INSTR(0x52, 0x54),
-+	ILI9881C_COMMAND_INSTR(0x53, 0x76),
-+	ILI9881C_COMMAND_INSTR(0x54, 0x98),
-+	ILI9881C_COMMAND_INSTR(0x55, 0xba),
-+	ILI9881C_COMMAND_INSTR(0x56, 0x10),
-+	ILI9881C_COMMAND_INSTR(0x57, 0x32),
-+	ILI9881C_COMMAND_INSTR(0x58, 0x54),
-+	ILI9881C_COMMAND_INSTR(0x59, 0x76),
-+	ILI9881C_COMMAND_INSTR(0x5A, 0x98),
-+	ILI9881C_COMMAND_INSTR(0x5B, 0xba),
-+	ILI9881C_COMMAND_INSTR(0x5C, 0xdc),
-+	ILI9881C_COMMAND_INSTR(0x5D, 0xfe),
-+
-+	//GIP_3
-+	ILI9881C_COMMAND_INSTR(0x5E, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x5F, 0x01),
-+	ILI9881C_COMMAND_INSTR(0x60, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x61, 0x15),
-+	ILI9881C_COMMAND_INSTR(0x62, 0x14),
-+	ILI9881C_COMMAND_INSTR(0x63, 0x0E),
-+	ILI9881C_COMMAND_INSTR(0x64, 0x0F),
-+	ILI9881C_COMMAND_INSTR(0x65, 0x0C),
-+	ILI9881C_COMMAND_INSTR(0x66, 0x0D),
-+	ILI9881C_COMMAND_INSTR(0x67, 0x06),
-+	ILI9881C_COMMAND_INSTR(0x68, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x69, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x6A, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x6B, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x6C, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x6D, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x6E, 0x07),
-+	ILI9881C_COMMAND_INSTR(0x6F, 0x02),
-+
-+	ILI9881C_COMMAND_INSTR(0x70, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x71, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x72, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x73, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x74, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x75, 0x01),
-+	ILI9881C_COMMAND_INSTR(0x76, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x77, 0x14),
-+	ILI9881C_COMMAND_INSTR(0x78, 0x15),
-+	ILI9881C_COMMAND_INSTR(0x79, 0x0E),
-+	ILI9881C_COMMAND_INSTR(0x7A, 0x0F),
-+	ILI9881C_COMMAND_INSTR(0x7B, 0x0C),
-+	ILI9881C_COMMAND_INSTR(0x7C, 0x0D),
-+	ILI9881C_COMMAND_INSTR(0x7D, 0x06),
-+	ILI9881C_COMMAND_INSTR(0x7E, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x7F, 0x02),
-+
-+	ILI9881C_COMMAND_INSTR(0x80, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x81, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x82, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x83, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x84, 0x07),
-+	ILI9881C_COMMAND_INSTR(0x85, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x86, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x87, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x88, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x89, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x8A, 0x02),
-+
-+	ILI9881C_SWITCH_PAGE_INSTR(4),
-+	ILI9881C_COMMAND_INSTR(0x6C, 0x15),
-+	ILI9881C_COMMAND_INSTR(0x6E, 0x2A),
-+
-+	//clamp 15V
-+	ILI9881C_COMMAND_INSTR(0x6F, 0x35),
-+	ILI9881C_COMMAND_INSTR(0x3A, 0x92),
-+	ILI9881C_COMMAND_INSTR(0x8D, 0x1F),
-+	ILI9881C_COMMAND_INSTR(0x87, 0xBA),
-+	ILI9881C_COMMAND_INSTR(0x26, 0x76),
-+	ILI9881C_COMMAND_INSTR(0xB2, 0xD1),
-+	ILI9881C_COMMAND_INSTR(0xB5, 0x27),
-+	ILI9881C_COMMAND_INSTR(0x31, 0x75),
-+	ILI9881C_COMMAND_INSTR(0x30, 0x03),
-+	ILI9881C_COMMAND_INSTR(0x3B, 0x98),
-+	ILI9881C_COMMAND_INSTR(0x35, 0x17),
-+	ILI9881C_COMMAND_INSTR(0x33, 0x14),
-+	ILI9881C_COMMAND_INSTR(0x38, 0x01),
-+	ILI9881C_COMMAND_INSTR(0x39, 0x00),
-+
-+	ILI9881C_SWITCH_PAGE_INSTR(1),
-+	// direction rotate
-+	//ILI9881C_COMMAND_INSTR(0x22, 0x0B),
-+	ILI9881C_COMMAND_INSTR(0x22, 0x0A),
-+	ILI9881C_COMMAND_INSTR(0x31, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x53, 0x63),
-+	ILI9881C_COMMAND_INSTR(0x55, 0x69),
-+	ILI9881C_COMMAND_INSTR(0x50, 0xC7),
-+	ILI9881C_COMMAND_INSTR(0x51, 0xC2),
-+	ILI9881C_COMMAND_INSTR(0x60, 0x26),
-+
-+	ILI9881C_COMMAND_INSTR(0xA0, 0x08),
-+	ILI9881C_COMMAND_INSTR(0xA1, 0x0F),
-+	ILI9881C_COMMAND_INSTR(0xA2, 0x25),
-+	ILI9881C_COMMAND_INSTR(0xA3, 0x01),
-+	ILI9881C_COMMAND_INSTR(0xA4, 0x23),
-+	ILI9881C_COMMAND_INSTR(0xA5, 0x18),
-+	ILI9881C_COMMAND_INSTR(0xA6, 0x11),
-+	ILI9881C_COMMAND_INSTR(0xA7, 0x1A),
-+	ILI9881C_COMMAND_INSTR(0xA8, 0x81),
-+	ILI9881C_COMMAND_INSTR(0xA9, 0x19),
-+	ILI9881C_COMMAND_INSTR(0xAA, 0x26),
-+	ILI9881C_COMMAND_INSTR(0xAB, 0x7C),
-+	ILI9881C_COMMAND_INSTR(0xAC, 0x24),
-+	ILI9881C_COMMAND_INSTR(0xAD, 0x1E),
-+	ILI9881C_COMMAND_INSTR(0xAE, 0x5C),
-+	ILI9881C_COMMAND_INSTR(0xAF, 0x2A),
-+	ILI9881C_COMMAND_INSTR(0xB0, 0x2B),
-+	ILI9881C_COMMAND_INSTR(0xB1, 0x50),
-+	ILI9881C_COMMAND_INSTR(0xB2, 0x5C),
-+	ILI9881C_COMMAND_INSTR(0xB3, 0x39),
-+
-+	ILI9881C_COMMAND_INSTR(0xC0, 0x08),
-+	ILI9881C_COMMAND_INSTR(0xC1, 0x1F),
-+	ILI9881C_COMMAND_INSTR(0xC2, 0x24),
-+	ILI9881C_COMMAND_INSTR(0xC3, 0x1D),
-+	ILI9881C_COMMAND_INSTR(0xC4, 0x04),
-+	ILI9881C_COMMAND_INSTR(0xC5, 0x32),
-+	ILI9881C_COMMAND_INSTR(0xC6, 0x24),
-+	ILI9881C_COMMAND_INSTR(0xC7, 0x1F),
-+	ILI9881C_COMMAND_INSTR(0xC8, 0x90),
-+	ILI9881C_COMMAND_INSTR(0xC9, 0x20),
-+	ILI9881C_COMMAND_INSTR(0xCA, 0x2C),
-+	ILI9881C_COMMAND_INSTR(0xCB, 0x82),
-+	ILI9881C_COMMAND_INSTR(0xCC, 0x19),
-+	ILI9881C_COMMAND_INSTR(0xCD, 0x22),
-+	ILI9881C_COMMAND_INSTR(0xCE, 0x4E),
-+	ILI9881C_COMMAND_INSTR(0xCF, 0x28),
-+	ILI9881C_COMMAND_INSTR(0xD0, 0x2D),
-+	ILI9881C_COMMAND_INSTR(0xD1, 0x51),
-+	ILI9881C_COMMAND_INSTR(0xD2, 0x5D),
-+	ILI9881C_COMMAND_INSTR(0xD3, 0x39),
-+
-+	ILI9881C_SWITCH_PAGE_INSTR(0),
-+	//PWM
-+	ILI9881C_COMMAND_INSTR(0x51, 0x0F),
-+	ILI9881C_COMMAND_INSTR(0x52, 0xFF),
-+	ILI9881C_COMMAND_INSTR(0x53, 0x2C),
-+
-+	ILI9881C_COMMAND_INSTR(0x11, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x29, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x35, 0x00),
-+};
-+
- static const struct ili9881c_instr w552946ab_init[] = {
- 	ILI9881C_SWITCH_PAGE_INSTR(3),
- 	ILI9881C_COMMAND_INSTR(0x01, 0x00),
-@@ -813,6 +1037,23 @@ static const struct drm_display_mode k10
- 	.height_mm	= 217,
- };
- 
-+static const struct drm_display_mode nwe080_default_mode = {
-+	.clock 		= 71750,
-+
-+	.hdisplay	= 800,
-+	.hsync_start	= 800 + 52,
-+	.hsync_end	= 800 + 52 + 8,
-+	.htotal		= 800 + 52 + 8 + 48,
-+
-+	.vdisplay	= 1280,
-+	.vsync_start	= 1280 + 16,
-+	.vsync_end	= 1280 + 16 + 6,
-+	.vtotal		= 1280 + 16 + 6 + 15,
-+
-+	.width_mm 	= 107,
-+	.height_mm 	= 170,
-+};
-+
- static const struct drm_display_mode w552946aba_default_mode = {
- 	.clock		= 64000,
- 
-@@ -945,6 +1186,13 @@ static const struct ili9881c_desc k101_i
- 	.mode_flags = MIPI_DSI_MODE_VIDEO_SYNC_PULSE,
- };
- 
-+static const struct ili9881c_desc nwe080_desc = {
-+	.init = nwe080_init,
-+	.init_length = ARRAY_SIZE(nwe080_init),
-+	.mode = &nwe080_default_mode,
-+	.mode_flags = MIPI_DSI_MODE_VIDEO_SYNC_PULSE | MIPI_DSI_MODE_VIDEO,
-+};
-+
- static const struct ili9881c_desc w552946aba_desc = {
- 	.init = w552946ab_init,
- 	.init_length = ARRAY_SIZE(w552946ab_init),
-@@ -956,6 +1204,7 @@ static const struct ili9881c_desc w55294
- static const struct of_device_id ili9881c_of_match[] = {
- 	{ .compatible = "bananapi,lhr050h41", .data = &lhr050h41_desc },
- 	{ .compatible = "feixin,k101-im2byl02", .data = &k101_im2byl02_desc },
-+	{ .compatible = "nwe,nwe080", .data = &nwe080_desc },
- 	{ .compatible = "wanchanglong,w552946aba", .data = &w552946aba_desc },
- 	{ }
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0376-media-bcm2835-unicam-Set-ret-on-error-path-in-unicam.patch b/target/linux/bcm27xx/patches-6.1/950-0376-media-bcm2835-unicam-Set-ret-on-error-path-in-unicam.patch
deleted file mode 100644
index e604817c90..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0376-media-bcm2835-unicam-Set-ret-on-error-path-in-unicam.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 7104c55664bae574b77e442520513abdff90d278 Mon Sep 17 00:00:00 2001
-From: Nathan Chancellor <nathan@kernel.org>
-Date: Mon, 31 Jan 2022 17:23:38 -0700
-Subject: [PATCH] media: bcm2835-unicam: Set ret on error path in
- unicam_async_complete()
-
-Clang warns:
-
-  drivers/media/platform/bcm2835/bcm2835-unicam.c:3109:6: warning: variable 'ret' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized]
-          if (!source_pads) {
-              ^~~~~~~~~~~~
-  drivers/media/platform/bcm2835/bcm2835-unicam.c:3152:9: note: uninitialized use occurs here
-          return ret;
-                 ^~~
-  drivers/media/platform/bcm2835/bcm2835-unicam.c:3109:2: note: remove the 'if' if its condition is always false
-          if (!source_pads) {
-          ^~~~~~~~~~~~~~~~~~~
-  drivers/media/platform/bcm2835/bcm2835-unicam.c:3091:9: note: initialize the variable 'ret' to silence this warning
-          int ret;
-                 ^
-                  = 0
-  1 warning generated.
-
-When the if condition is true, ret will be used uninitialized, which
-could result in undesirable behavior. Set ret to -ENODEV on the error
-path, which is a standard error code for the ->complete() callback.
-
-Fixes: d056e86eb35f ("media/bcm2835-unicam: Parse pad numbers correctly")
-Signed-off-by: Nathan Chancellor <nathan@kernel.org>
----
- drivers/media/platform/bcm2835/bcm2835-unicam.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
-+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -3108,6 +3108,7 @@ static int unicam_async_complete(struct
- 	}
- 	if (!source_pads) {
- 		unicam_err(unicam, "No source pads on sensor.\n");
-+		ret = -ENODEV;
- 		goto unregister;
- 	}
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0377-media-i2c-ov9281-Initialize-id_msb-to-zero-in-ov9281.patch b/target/linux/bcm27xx/patches-6.1/950-0377-media-i2c-ov9281-Initialize-id_msb-to-zero-in-ov9281.patch
deleted file mode 100644
index a27ed1f25e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0377-media-i2c-ov9281-Initialize-id_msb-to-zero-in-ov9281.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 49036d4ab54259a8fa8c1511a7024ed95d68037d Mon Sep 17 00:00:00 2001
-From: Nathan Chancellor <nathan@kernel.org>
-Date: Mon, 31 Jan 2022 17:50:43 -0700
-Subject: [PATCH] media: i2c: ov9281: Initialize id_msb to zero in
- ov9281_check_sensor_id()
-
-Clang warns:
-
-  drivers/media/i2c/ov9281.c:1132:6: warning: variable 'id_msb' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized]
-          if (!ret)
-              ^~~~
-  drivers/media/i2c/ov9281.c:1135:9: note: uninitialized use occurs here
-          id |= (id_msb << 8);
-                 ^~~~~~
-  drivers/media/i2c/ov9281.c:1132:2: note: remove the 'if' if its condition is always true
-          if (!ret)
-          ^~~~~~~~~
-  drivers/media/i2c/ov9281.c:1127:20: note: initialize the variable 'id_msb' to silence this warning
-          u32 id = 0, id_msb;
-                            ^
-                             = 0
-  1 warning generated.
-
-If the first ov9281_read_reg() call fails, id_msb will be used
-uninitialized. However, this warning does not actually matter in
-practice because the value of id is not used when either call to
-ov9281_read_reg() fails, as the boolean OR will short circuit due to the
-ret condition being checked first. Regardless, it is not good to use
-variables uninitialized so silence the warning by initializing id_msb to
-0, as was done with id.
-
-Fixes: 20855581e0eb ("media: i2c: ov9281: Read chip ID via 2 reads")
-Signed-off-by: Nathan Chancellor <nathan@kernel.org>
----
- drivers/media/i2c/ov9281.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/media/i2c/ov9281.c
-+++ b/drivers/media/i2c/ov9281.c
-@@ -1124,7 +1124,7 @@ static int ov9281_check_sensor_id(struct
- 				  struct i2c_client *client)
- {
- 	struct device *dev = &ov9281->client->dev;
--	u32 id = 0, id_msb;
-+	u32 id = 0, id_msb = 0;
- 	int ret;
- 
- 	ret = ov9281_read_reg(client, OV9281_REG_CHIP_ID + 1,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0378-i2c-bcm2835-Make-clock-stretch-timeout-configurable.patch b/target/linux/bcm27xx/patches-6.1/950-0378-i2c-bcm2835-Make-clock-stretch-timeout-configurable.patch
deleted file mode 100644
index 97131e77a2..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0378-i2c-bcm2835-Make-clock-stretch-timeout-configurable.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 622a9f1ce0c53f661bd323fa3e3b071f5a3733b5 Mon Sep 17 00:00:00 2001
-From: Alex Crawford <raspberrypi/linux@code.acrawford.com>
-Date: Fri, 28 Jan 2022 13:36:51 -0800
-Subject: [PATCH] i2c: bcm2835: Make clock-stretch timeout configurable
-
-The default clock-stretch timeout is 35 mS, which works well for
-SMBus, but there are some I2C devices which can stretch the clock even
-longer. Rather than trying to prescribe a safe default for everyone,
-allow the timeout to be configured.
-
-Signed-off-by: Alex Crawford <raspberrypi/linux@code.acrawford.com>
----
- drivers/i2c/busses/i2c-bcm2835.c | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
---- a/drivers/i2c/busses/i2c-bcm2835.c
-+++ b/drivers/i2c/busses/i2c-bcm2835.c
-@@ -60,6 +60,10 @@ static unsigned int debug;
- module_param(debug, uint, 0644);
- MODULE_PARM_DESC(debug, "1=err, 2=isr, 3=xfer");
- 
-+static unsigned int clk_tout_ms = 35; /* SMBUs-recommended 35ms */
-+module_param(clk_tout_ms, uint, 0644);
-+MODULE_PARM_DESC(clk_tout_ms, "clock-stretch timeout (mS)");
-+
- #define BCM2835_DEBUG_MAX	512
- struct bcm2835_debug {
- 	struct i2c_msg *msg;
-@@ -219,12 +223,12 @@ static int clk_bcm2835_i2c_set_rate(stru
- 			   (redl << BCM2835_I2C_REDL_SHIFT));
- 
- 	/*
--	 * Set the clock stretch timeout to the SMBUs-recommended 35ms.
-+	 * Set the clock stretch timeout.
- 	 */
--	if (rate > 0xffff*1000/35)
-+	if (rate > 0xffff*1000/clk_tout_ms)
- 	    clk_tout = 0xffff;
- 	else
--	    clk_tout = 35*rate/1000;
-+	    clk_tout = clk_tout_ms*rate/1000;
- 
- 	bcm2835_i2c_writel(div->i2c_dev, BCM2835_I2C_CLKT, clk_tout);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0379-Patching-lan78xx-for-SOF_TIMESTAMPING_TX_SOFTWARE-su.patch b/target/linux/bcm27xx/patches-6.1/950-0379-Patching-lan78xx-for-SOF_TIMESTAMPING_TX_SOFTWARE-su.patch
deleted file mode 100644
index 10032530fe..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0379-Patching-lan78xx-for-SOF_TIMESTAMPING_TX_SOFTWARE-su.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From d0916eacc78777e9b87f686e0de64dd09540621b Mon Sep 17 00:00:00 2001
-From: tiagofreire-pt <41837236+tiagofreire-pt@users.noreply.github.com>
-Date: Sat, 29 Jan 2022 10:01:36 +0000
-Subject: [PATCH] Patching lan78xx for SOF_TIMESTAMPING_TX_SOFTWARE
- support
-
----
- drivers/net/usb/lan78xx.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/net/usb/lan78xx.c
-+++ b/drivers/net/usb/lan78xx.c
-@@ -1955,6 +1955,7 @@ static const struct ethtool_ops lan78xx_
- 	.set_link_ksettings = lan78xx_set_link_ksettings,
- 	.get_regs_len	= lan78xx_get_regs_len,
- 	.get_regs	= lan78xx_get_regs,
-+	.get_ts_info    = ethtool_op_get_ts_info,
- };
- 
- static void lan78xx_init_mac_address(struct lan78xx_net *dev)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0380-media-uapi-Document-format-MEDIA_BUS_FMT_RGB565_1X24.patch b/target/linux/bcm27xx/patches-6.1/950-0380-media-uapi-Document-format-MEDIA_BUS_FMT_RGB565_1X24.patch
deleted file mode 100644
index 68fface7ae..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0380-media-uapi-Document-format-MEDIA_BUS_FMT_RGB565_1X24.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 11858fa85265b2c9918ed60941926c200f3e3866 Mon Sep 17 00:00:00 2001
-From: Chris Morgan <macromorgan@hotmail.com>
-Date: Fri, 28 Jan 2022 17:37:43 -0600
-Subject: [PATCH] media: uapi: Document format
- MEDIA_BUS_FMT_RGB565_1X24_CPADHI
-
-Add support for MEDIA_BUS_FMT_RGB565_1X24_CPADHI. This format is used
-by the Geekworm MZP280 panel which interfaces with the Raspberry Pi.
-
-Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
----
- .../media/v4l/subdev-formats.rst              | 37 +++++++++++++++++++
- 1 file changed, 37 insertions(+)
-
---- a/Documentation/userspace-api/media/v4l/subdev-formats.rst
-+++ b/Documentation/userspace-api/media/v4l/subdev-formats.rst
-@@ -624,6 +624,43 @@ The following tables list existing packe
-       - b\ :sub:`2`
-       - b\ :sub:`1`
-       - b\ :sub:`0`
-+    * .. _MEDIA_BUS_FMT_RGB565_1X24_CPADHI:
-+
-+      - MEDIA_BUS_FMT_RGB565_1X24_CPADHI
-+      - 0x1020
-+      -
-+      -
-+      -
-+      -
-+      -
-+      -
-+      -
-+      -
-+      -
-+      - 0
-+      - 0
-+      - 0
-+      - r\ :sub:`4`
-+      - r\ :sub:`3`
-+      - r\ :sub:`2`
-+      - r\ :sub:`1`
-+      - r\ :sub:`0`
-+      - 0
-+      - 0
-+      - g\ :sub:`5`
-+      - g\ :sub:`4`
-+      - g\ :sub:`3`
-+      - g\ :sub:`2`
-+      - g\ :sub:`1`
-+      - g\ :sub:`0`
-+      - 0
-+      - 0
-+      - 0
-+      - b\ :sub:`4`
-+      - b\ :sub:`3`
-+      - b\ :sub:`2`
-+      - b\ :sub:`1`
-+      - b\ :sub:`0`
-     * .. _MEDIA-BUS-FMT-BGR565-2X8-BE:
- 
-       - MEDIA_BUS_FMT_BGR565_2X8_BE
diff --git a/target/linux/bcm27xx/patches-6.1/950-0381-dt-bindings-vendor-prefixes-Add-Geekworm.patch b/target/linux/bcm27xx/patches-6.1/950-0381-dt-bindings-vendor-prefixes-Add-Geekworm.patch
deleted file mode 100644
index 63fc078e84..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0381-dt-bindings-vendor-prefixes-Add-Geekworm.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From d7e2b470acddada015b8c048374cc528720c8b9a Mon Sep 17 00:00:00 2001
-From: Chris Morgan <macromorgan@hotmail.com>
-Date: Fri, 28 Jan 2022 17:40:50 -0600
-Subject: [PATCH] dt-bindings: vendor-prefixes: Add Geekworm
-
-Add vendor prefix for Geekworm (https://geekworm.com).
-
-Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
----
- Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
-+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
-@@ -484,6 +484,8 @@ patternProperties:
-     description: General Electric Company
-   "^geekbuying,.*":
-     description: GeekBuying
-+  "^geekworm,.*":
-+    description: Geekworm
-   "^gef,.*":
-     description: GE Fanuc Intelligent Platforms Embedded Systems, Inc.
-   "^GEFanuc,.*":
diff --git a/target/linux/bcm27xx/patches-6.1/950-0382-dt-bindings-display-simple-add-Geekworm-MZP280-Panel.patch b/target/linux/bcm27xx/patches-6.1/950-0382-dt-bindings-display-simple-add-Geekworm-MZP280-Panel.patch
deleted file mode 100644
index cc127a3aa1..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0382-dt-bindings-display-simple-add-Geekworm-MZP280-Panel.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 041fb70fa6ddea179c915878cf365b28e9b814d9 Mon Sep 17 00:00:00 2001
-From: Chris Morgan <macromorgan@hotmail.com>
-Date: Fri, 28 Jan 2022 17:41:18 -0600
-Subject: [PATCH] dt-bindings: display: simple: add Geekworm MZP280
- Panel
-
-The Geekworm MZP280 panel is a 480x640 (portrait) panel with a
-capacitive touch interface and a 40 pin header meant to interface
-directly with the Raspberry Pi. The screen is 2.8 inches diagonally,
-and there appear to be at least 4 distinct versions all with the same
-panel timings.
-
-Timings were derived from drivers posted on the github located here:
-https://github.com/tianyoujian/MZDPI/tree/master/vga
-
-Additional details about this panel family can be found here:
-https://wiki.geekworm.com/2.8_inch_Touch_Screen_for_Pi_zero
-
-Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
----
- .../devicetree/bindings/display/panel/panel-simple.yaml         | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/Documentation/devicetree/bindings/display/panel/panel-simple.yaml
-+++ b/Documentation/devicetree/bindings/display/panel/panel-simple.yaml
-@@ -156,6 +156,8 @@ properties:
-       - frida,frd350h54004
-         # FriendlyELEC HD702E 800x1280 LCD panel
-       - friendlyarm,hd702e
-+        # Geekworm MZP280 2.8" 480x640 LCD panel with capacitive touch
-+      - geekworm,mzp280
-         # GiantPlus GPG48273QS5 4.3" (480x272) WQVGA TFT LCD panel
-       - giantplus,gpg48273qs5
-         # GiantPlus GPM940B0 3.0" QVGA TFT LCD panel
diff --git a/target/linux/bcm27xx/patches-6.1/950-0383-drm-panel-simple-add-Geekworm-MZP280-Panel.patch b/target/linux/bcm27xx/patches-6.1/950-0383-drm-panel-simple-add-Geekworm-MZP280-Panel.patch
deleted file mode 100644
index 904df714dc..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0383-drm-panel-simple-add-Geekworm-MZP280-Panel.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 93e97366535209b281dce980b4d78362f25bb34c Mon Sep 17 00:00:00 2001
-From: Chris Morgan <macromorgan@hotmail.com>
-Date: Fri, 28 Jan 2022 17:42:12 -0600
-Subject: [PATCH] drm/panel: simple: add Geekworm MZP280 Panel
-
-Add support for the Geekworm MZP280 Panel
-
-Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
-Acked-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/panel/panel-simple.c | 29 ++++++++++++++++++++++++++++
- 1 file changed, 29 insertions(+)
-
---- a/drivers/gpu/drm/panel/panel-simple.c
-+++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -1946,6 +1946,32 @@ static const struct panel_desc friendlya
- 	},
- };
- 
-+static const struct drm_display_mode geekworm_mzp280_mode = {
-+	.clock = 32000,
-+	.hdisplay = 480,
-+	.hsync_start = 480 + 41,
-+	.hsync_end = 480 + 41 + 20,
-+	.htotal = 480 + 41 + 20 + 60,
-+	.vdisplay = 640,
-+	.vsync_start = 640 + 5,
-+	.vsync_end = 640 + 5 + 10,
-+	.vtotal = 640 + 5 + 10 + 10,
-+	.flags = DRM_MODE_FLAG_NVSYNC | DRM_MODE_FLAG_NHSYNC,
-+};
-+
-+static const struct panel_desc geekworm_mzp280 = {
-+	.modes = &geekworm_mzp280_mode,
-+	.num_modes = 1,
-+	.bpc = 6,
-+	.size = {
-+		.width = 47,
-+		.height = 61,
-+	},
-+	.bus_format = MEDIA_BUS_FMT_RGB565_1X24_CPADHI,
-+	.bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE,
-+	.connector_type = DRM_MODE_CONNECTOR_DPI,
-+};
-+
- static const struct drm_display_mode giantplus_gpg482739qs5_mode = {
- 	.clock = 9000,
- 	.hdisplay = 480,
-@@ -4113,6 +4139,9 @@ static const struct of_device_id platfor
- 		.compatible = "friendlyarm,hd702e",
- 		.data = &friendlyarm_hd702e,
- 	}, {
-+		.compatible = "geekworm,mzp280",
-+		.data = &geekworm_mzp280,
-+	}, {
- 		.compatible = "giantplus,gpg482739qs5",
- 		.data = &giantplus_gpg482739qs5
- 	}, {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0384-drm-panel-simple-Remove-custom-handling-of-orientati.patch b/target/linux/bcm27xx/patches-6.1/950-0384-drm-panel-simple-Remove-custom-handling-of-orientati.patch
deleted file mode 100644
index 179f548880..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0384-drm-panel-simple-Remove-custom-handling-of-orientati.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 948df06ed7f7a44da737aadcb8e9b2b6c1c35dbf Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 1 Feb 2022 12:24:51 +0000
-Subject: [PATCH] drm/panel: simple: Remove custom handling of
- orientation
-
-Panel orientation is now handled by the drm_panel and
-panel_bridge frameworks, so remove the custom handling.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/panel/panel-simple.c | 14 --------------
- 1 file changed, 14 deletions(-)
-
---- a/drivers/gpu/drm/panel/panel-simple.c
-+++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -154,8 +154,6 @@ struct panel_simple {
- 	struct edid *edid;
- 
- 	struct drm_display_mode override_mode;
--
--	enum drm_panel_orientation orientation;
- };
- 
- static inline struct panel_simple *to_panel_simple(struct drm_panel *panel)
-@@ -414,12 +412,6 @@ static int panel_simple_get_modes(struct
- 	/* add hard-coded panel modes */
- 	num += panel_simple_get_non_edid_modes(p, connector);
- 
--	/*
--	 * TODO: Remove once all drm drivers call
--	 * drm_connector_set_orientation_from_panel()
--	 */
--	drm_connector_set_panel_orientation(connector, p->orientation);
--
- 	return num;
- }
- 
-@@ -582,12 +574,6 @@ static int panel_simple_probe(struct dev
- 		return dev_err_probe(dev, PTR_ERR(panel->enable_gpio),
- 				     "failed to request GPIO\n");
- 
--	err = of_drm_get_panel_orientation(dev->of_node, &panel->orientation);
--	if (err) {
--		dev_err(dev, "%pOF: failed to get orientation %d\n", dev->of_node, err);
--		return err;
--	}
--
- 	ddc = of_parse_phandle(dev->of_node, "ddc-i2c-bus", 0);
- 	if (ddc) {
- 		panel->ddc = of_find_i2c_adapter_by_node(ddc);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0385-drm-panel-Add-panel-driver-for-Ilitek-ILI9806E-panel.patch b/target/linux/bcm27xx/patches-6.1/950-0385-drm-panel-Add-panel-driver-for-Ilitek-ILI9806E-panel.patch
deleted file mode 100644
index 8352cfe066..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0385-drm-panel-Add-panel-driver-for-Ilitek-ILI9806E-panel.patch
+++ /dev/null
@@ -1,535 +0,0 @@
-From d7d0a974aad1ff44ee49feffe77b51e8183b953b Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 5 Jan 2022 19:14:48 +0000
-Subject: [PATCH] drm/panel: Add panel driver for Ilitek ILI9806E panel
-
-The Ilitek ILI9806E driver is used in the Pimoroni HyperPixel4
-and potentially other displays. Whilst it can support multiple
-interfaces, this driver only accounts for SPI configuration and
-DPI video data.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/panel/Kconfig                 |  11 +
- drivers/gpu/drm/panel/Makefile                |   1 +
- drivers/gpu/drm/panel/panel-ilitek-ili9806e.c | 484 ++++++++++++++++++
- 3 files changed, 496 insertions(+)
- create mode 100644 drivers/gpu/drm/panel/panel-ilitek-ili9806e.c
-
---- a/drivers/gpu/drm/panel/Kconfig
-+++ b/drivers/gpu/drm/panel/Kconfig
-@@ -174,6 +174,17 @@ config DRM_PANEL_ILITEK_ILI9341
- 	  QVGA (240x320) RGB panels. support serial & parallel rgb
- 	  interface.
- 
-+config DRM_PANEL_ILITEK_ILI9806E
-+	tristate "Ilitek ILI9806E-based panels"
-+	depends on OF && SPI
-+	select DRM_KMS_HELPER
-+	depends on DRM_GEM_CMA_HELPER
-+	depends on BACKLIGHT_CLASS_DEVICE
-+	select DRM_MIPI_DBI
-+	help
-+	  Say Y if you want to enable support for panels based on the
-+	  Ilitek ILI9806e controller.
-+
- config DRM_PANEL_ILITEK_ILI9881C
- 	tristate "Ilitek ILI9881C-based panels"
- 	depends on OF
---- a/drivers/gpu/drm/panel/Makefile
-+++ b/drivers/gpu/drm/panel/Makefile
-@@ -15,6 +15,7 @@ obj-$(CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA
- obj-$(CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D) += panel-feiyang-fy07024di26a30d.o
- obj-$(CONFIG_DRM_PANEL_ILITEK_IL9322) += panel-ilitek-ili9322.o
- obj-$(CONFIG_DRM_PANEL_ILITEK_ILI9341) += panel-ilitek-ili9341.o
-+obj-$(CONFIG_DRM_PANEL_ILITEK_ILI9806E) += panel-ilitek-ili9806e.o
- obj-$(CONFIG_DRM_PANEL_ILITEK_ILI9881C) += panel-ilitek-ili9881c.o
- obj-$(CONFIG_DRM_PANEL_INNOLUX_EJ030NA) += panel-innolux-ej030na.o
- obj-$(CONFIG_DRM_PANEL_INNOLUX_P079ZCA) += panel-innolux-p079zca.o
---- /dev/null
-+++ b/drivers/gpu/drm/panel/panel-ilitek-ili9806e.c
-@@ -0,0 +1,484 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+/*
-+ * Ilitek ILI9806E TFT LCD drm_panel driver.
-+ *
-+ * Copyright (C) 2022 Raspberry Pi Ltd
-+ *
-+ * Derived from drivers/drm/gpu/panel/panel-sitronix-st7789v.c
-+ * Copyright (C) 2017 Free Electrons
-+ */
-+
-+#include <drm/drm_modes.h>
-+#include <drm/drm_panel.h>
-+
-+#include <linux/bitops.h>
-+#include <linux/gpio/consumer.h>
-+#include <linux/media-bus-format.h>
-+#include <linux/module.h>
-+#include <linux/of_device.h>
-+#include <linux/regmap.h>
-+#include <linux/regulator/consumer.h>
-+#include <linux/spi/spi.h>
-+
-+#include <video/mipi_display.h>
-+#include <video/of_videomode.h>
-+#include <video/videomode.h>
-+
-+struct ili9806 {
-+	struct drm_panel panel;
-+	struct spi_device *spi;
-+	struct gpio_desc *reset;
-+	struct regulator *power;
-+	u32 bus_format;
-+};
-+
-+#define ILI9806_DATA		BIT(8)
-+
-+#define ILI9806_MAX_MSG_LEN	6
-+
-+struct ili9806e_msg {
-+	unsigned int len;
-+	u16 msg[ILI9806_MAX_MSG_LEN];
-+};
-+
-+#define ILI9806_SET_PAGE(page)	\
-+	{				\
-+		.len = 6,		\
-+		.msg = {		\
-+			0xFF,			\
-+			ILI9806_DATA | 0xFF,	\
-+			ILI9806_DATA | 0x98,	\
-+			ILI9806_DATA | 0x06,	\
-+			ILI9806_DATA | 0x04,	\
-+			ILI9806_DATA | (page)	\
-+		},				\
-+	}
-+
-+#define ILI9806_SET_REG_PARAM(reg, data)	\
-+	{					\
-+		.len = 2,			\
-+		.msg = {			\
-+			(reg),			\
-+			ILI9806_DATA | (data),	\
-+		},				\
-+	}
-+
-+#define ILI9806_SET_REG(reg)	\
-+	{				\
-+		.len = 1,		\
-+		.msg = { (reg) },		\
-+	}
-+
-+static const struct ili9806e_msg panel_init[] = {
-+	ILI9806_SET_PAGE(1),
-+
-+	/* interface mode
-+	 *   SEPT_SDIO = 0 (spi interface transfer through SDA pin)
-+	 *   SDO_STATUS = 1 (always output, but without output tri-state)
-+	 */
-+	ILI9806_SET_REG_PARAM(0x08, 0x10),
-+	/* display control
-+	 * VSPL = 1 (vertical sync polarity)
-+	 * HSPL = 0 (horizontal sync polarity)
-+	 * DPL = 0 (PCLK polarity)
-+	 * EPL = 1 (data enable polarity)
-+	 */
-+	ILI9806_SET_REG_PARAM(0x21, 0x0d),
-+	/* resolution control (0x02 = 480x800) */
-+	ILI9806_SET_REG_PARAM(0x30, 0x02),
-+	/* display inversion control (0x00 = column inversion) */
-+	ILI9806_SET_REG_PARAM(0x31, 0x00),
-+	/* power control
-+	 *  EXB1T = 0 (internal charge pump)
-+	 *  EXT_CPCK_SEL = 1 (pump clock control signal = output 2 x waveform)
-+	 *  BT = 0 (DDVDH / DDVDL voltage = VCI x 2 / VCI x -2)
-+	 */
-+	ILI9806_SET_REG_PARAM(0x40, 0x10),
-+	/* power control
-+	 *  DDVDH_CLP = 5.6 (DDVDH clamp leve)
-+	 *  DDVDL_CLP = -5.6 (DDVDL clamp leve)
-+	 */
-+	ILI9806_SET_REG_PARAM(0x41, 0x55),
-+	/* power control
-+	 *  VGH_CP = 2DDVDH - DDVDL (step up factor for VGH)
-+	 *  VGL_CP = DDVDL + VCL - VCIP (step up factor for VGL)
-+	 */
-+	ILI9806_SET_REG_PARAM(0x42, 0x02),
-+	/* power control
-+	 *  VGH_CLPEN = 0 (disable VGH clamp level)
-+	 *  VGH_CLP = 9 (15.0 VGH clamp level - but this is disabled so not used?)
-+	 */
-+	ILI9806_SET_REG_PARAM(0x43, 0x84),
-+	/* power control
-+	 *  VGL_CLPEN = 0 (disable VGL clamp level)
-+	 *  VGL_CLP = 9 (-11.0 VGL clamp level - but this is disabled so not used?)
-+	 */
-+	ILI9806_SET_REG_PARAM(0x44, 0x84),
-+
-+	/* power control
-+	 *  VREG1OUT voltage for positive gamma?
-+	 */
-+	ILI9806_SET_REG_PARAM(0x50, 0x78),
-+	/* power control
-+	 *  VREG2OUT voltage for negative gamma?
-+	 */
-+	ILI9806_SET_REG_PARAM(0x51, 0x78),
-+
-+	ILI9806_SET_REG_PARAM(0x52, 0x00),
-+	ILI9806_SET_REG_PARAM(0x53, 0x77),
-+	ILI9806_SET_REG_PARAM(0x57, 0x60),
-+	ILI9806_SET_REG_PARAM(0x60, 0x07),
-+	ILI9806_SET_REG_PARAM(0x61, 0x00),
-+	ILI9806_SET_REG_PARAM(0x62, 0x08),
-+	ILI9806_SET_REG_PARAM(0x63, 0x00),
-+	ILI9806_SET_REG_PARAM(0xA0, 0x00),
-+	ILI9806_SET_REG_PARAM(0xA1, 0x07),
-+	ILI9806_SET_REG_PARAM(0xA2, 0x0C),
-+	ILI9806_SET_REG_PARAM(0xA3, 0x0B),
-+	ILI9806_SET_REG_PARAM(0xA4, 0x03),
-+	ILI9806_SET_REG_PARAM(0xA5, 0x07),
-+	ILI9806_SET_REG_PARAM(0xA6, 0x06),
-+	ILI9806_SET_REG_PARAM(0xA7, 0x04),
-+	ILI9806_SET_REG_PARAM(0xA8, 0x08),
-+	ILI9806_SET_REG_PARAM(0xA9, 0x0C),
-+	ILI9806_SET_REG_PARAM(0xAA, 0x13),
-+	ILI9806_SET_REG_PARAM(0xAB, 0x06),
-+	ILI9806_SET_REG_PARAM(0xAC, 0x0D),
-+	ILI9806_SET_REG_PARAM(0xAD, 0x19),
-+	ILI9806_SET_REG_PARAM(0xAE, 0x10),
-+	ILI9806_SET_REG_PARAM(0xAF, 0x00),
-+	/* negative gamma control
-+	 * set the gray scale voltage to adjust the gamma characteristics of the panel
-+	 */
-+	ILI9806_SET_REG_PARAM(0xC0, 0x00),
-+	ILI9806_SET_REG_PARAM(0xC1, 0x07),
-+	ILI9806_SET_REG_PARAM(0xC2, 0x0C),
-+	ILI9806_SET_REG_PARAM(0xC3, 0x0B),
-+	ILI9806_SET_REG_PARAM(0xC4, 0x03),
-+	ILI9806_SET_REG_PARAM(0xC5, 0x07),
-+	ILI9806_SET_REG_PARAM(0xC6, 0x07),
-+	ILI9806_SET_REG_PARAM(0xC7, 0x04),
-+	ILI9806_SET_REG_PARAM(0xC8, 0x08),
-+	ILI9806_SET_REG_PARAM(0xC9, 0x0C),
-+	ILI9806_SET_REG_PARAM(0xCA, 0x13),
-+	ILI9806_SET_REG_PARAM(0xCB, 0x06),
-+	ILI9806_SET_REG_PARAM(0xCC, 0x0D),
-+	ILI9806_SET_REG_PARAM(0xCD, 0x18),
-+	ILI9806_SET_REG_PARAM(0xCE, 0x10),
-+	ILI9806_SET_REG_PARAM(0xCF, 0x00),
-+
-+	ILI9806_SET_PAGE(6),
-+
-+	ILI9806_SET_REG_PARAM(0x00, 0x20),
-+	ILI9806_SET_REG_PARAM(0x01, 0x0A),
-+	ILI9806_SET_REG_PARAM(0x02, 0x00),
-+	ILI9806_SET_REG_PARAM(0x03, 0x00),
-+	ILI9806_SET_REG_PARAM(0x04, 0x01),
-+	ILI9806_SET_REG_PARAM(0x05, 0x01),
-+	ILI9806_SET_REG_PARAM(0x06, 0x98),
-+	ILI9806_SET_REG_PARAM(0x07, 0x06),
-+	ILI9806_SET_REG_PARAM(0x08, 0x01),
-+	ILI9806_SET_REG_PARAM(0x09, 0x80),
-+	ILI9806_SET_REG_PARAM(0x0A, 0x00),
-+	ILI9806_SET_REG_PARAM(0x0B, 0x00),
-+	ILI9806_SET_REG_PARAM(0x0C, 0x01),
-+	ILI9806_SET_REG_PARAM(0x0D, 0x01),
-+	ILI9806_SET_REG_PARAM(0x0E, 0x00),
-+	ILI9806_SET_REG_PARAM(0x0F, 0x00),
-+	ILI9806_SET_REG_PARAM(0x10, 0xF0),
-+	ILI9806_SET_REG_PARAM(0x11, 0xF4),
-+	ILI9806_SET_REG_PARAM(0x12, 0x01),
-+	ILI9806_SET_REG_PARAM(0x13, 0x00),
-+	ILI9806_SET_REG_PARAM(0x14, 0x00),
-+	ILI9806_SET_REG_PARAM(0x15, 0xC0),
-+	ILI9806_SET_REG_PARAM(0x16, 0x08),
-+	ILI9806_SET_REG_PARAM(0x17, 0x00),
-+	ILI9806_SET_REG_PARAM(0x18, 0x00),
-+	ILI9806_SET_REG_PARAM(0x19, 0x00),
-+	ILI9806_SET_REG_PARAM(0x1A, 0x00),
-+	ILI9806_SET_REG_PARAM(0x1B, 0x00),
-+	ILI9806_SET_REG_PARAM(0x1C, 0x00),
-+	ILI9806_SET_REG_PARAM(0x1D, 0x00),
-+	ILI9806_SET_REG_PARAM(0x20, 0x01),
-+	ILI9806_SET_REG_PARAM(0x21, 0x23),
-+	ILI9806_SET_REG_PARAM(0x22, 0x45),
-+	ILI9806_SET_REG_PARAM(0x23, 0x67),
-+	ILI9806_SET_REG_PARAM(0x24, 0x01),
-+	ILI9806_SET_REG_PARAM(0x25, 0x23),
-+	ILI9806_SET_REG_PARAM(0x26, 0x45),
-+	ILI9806_SET_REG_PARAM(0x27, 0x67),
-+	ILI9806_SET_REG_PARAM(0x30, 0x11),
-+	ILI9806_SET_REG_PARAM(0x31, 0x11),
-+	ILI9806_SET_REG_PARAM(0x32, 0x00),
-+	ILI9806_SET_REG_PARAM(0x33, 0xEE),
-+	ILI9806_SET_REG_PARAM(0x34, 0xFF),
-+	ILI9806_SET_REG_PARAM(0x35, 0xBB),
-+	ILI9806_SET_REG_PARAM(0x36, 0xAA),
-+	ILI9806_SET_REG_PARAM(0x37, 0xDD),
-+	ILI9806_SET_REG_PARAM(0x38, 0xCC),
-+	ILI9806_SET_REG_PARAM(0x39, 0x66),
-+	ILI9806_SET_REG_PARAM(0x3A, 0x77),
-+	ILI9806_SET_REG_PARAM(0x3B, 0x22),
-+	ILI9806_SET_REG_PARAM(0x3C, 0x22),
-+	ILI9806_SET_REG_PARAM(0x3D, 0x22),
-+	ILI9806_SET_REG_PARAM(0x3E, 0x22),
-+	ILI9806_SET_REG_PARAM(0x3F, 0x22),
-+	ILI9806_SET_REG_PARAM(0x40, 0x22),
-+	/* register doesn't exist on page 6? */
-+	ILI9806_SET_REG_PARAM(0x52, 0x10),
-+	/* doesn't make sense, not valid according to datasheet */
-+	ILI9806_SET_REG_PARAM(0x53, 0x10),
-+	/* doesn't make sense, not valid according to datasheet */
-+	ILI9806_SET_REG_PARAM(0x54, 0x13),
-+
-+	ILI9806_SET_PAGE(7),
-+
-+	/* enable VREG */
-+	ILI9806_SET_REG_PARAM(0x18, 0x1D),
-+	/* enable VGL_REG */
-+	ILI9806_SET_REG_PARAM(0x17, 0x22),
-+	/* register doesn't exist on page 7? */
-+	ILI9806_SET_REG_PARAM(0x02, 0x77),
-+	/* register doesn't exist on page 7? */
-+	ILI9806_SET_REG_PARAM(0x26, 0xB2),
-+	/* register doesn't exist on page 7? */
-+	ILI9806_SET_REG_PARAM(0xE1, 0x79),
-+
-+	ILI9806_SET_PAGE(0),
-+
-+	ILI9806_SET_REG_PARAM(MIPI_DCS_SET_PIXEL_FORMAT,
-+			      MIPI_DCS_PIXEL_FMT_18BIT << 4),
-+	ILI9806_SET_REG_PARAM(MIPI_DCS_SET_TEAR_ON, 0x00),
-+	ILI9806_SET_REG(MIPI_DCS_EXIT_SLEEP_MODE),
-+};
-+
-+#define NUM_INIT_REGS ARRAY_SIZE(panel_init)
-+
-+static inline struct ili9806 *panel_to_ili9806(struct drm_panel *panel)
-+{
-+	return container_of(panel, struct ili9806, panel);
-+}
-+
-+static int ili9806_write_msg(struct ili9806 *ctx, const struct ili9806e_msg *msg)
-+{
-+	struct spi_transfer xfer = { };
-+	struct spi_message spi;
-+	//u16 txbuf[] = { msg->, ILI9806_DATA | data };
-+
-+	spi_message_init(&spi);
-+
-+	xfer.tx_buf = msg->msg;
-+	xfer.bits_per_word = 9;
-+	xfer.len = sizeof(u16) * msg->len;
-+
-+	spi_message_add_tail(&xfer, &spi);
-+	return spi_sync(ctx->spi, &spi);
-+}
-+
-+static int ili9806e_write_msg_list(struct ili9806 *ctx,
-+				   const struct ili9806e_msg msgs[],
-+				   unsigned int num_msgs)
-+{
-+	int ret, i;
-+
-+	for (i = 0; i < num_msgs; i++) {
-+		ret = ili9806_write_msg(ctx, &msgs[i]);
-+		if (ret)
-+			break;
-+	}
-+
-+	return ret;
-+}
-+
-+static const struct drm_display_mode ili9806e_480x800_mode = {
-+	.clock = 32000,
-+	.hdisplay = 480,
-+	.hsync_start = 480 + 10,
-+	.hsync_end = 480 + 10 + 16,
-+	.htotal = 480 + 10 + 16 + 59,
-+	.vdisplay = 800,
-+	.vsync_start = 800 + 15,
-+	.vsync_end = 800 + 15 + 113,
-+	.vtotal = 800 + 15 + 113 + 15,
-+	.flags = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC,
-+};
-+
-+static int ili9806_get_modes(struct drm_panel *panel,
-+			     struct drm_connector *connector)
-+{
-+	struct ili9806 *ctx = panel_to_ili9806(panel);
-+	struct drm_display_mode *mode;
-+
-+	mode = drm_mode_duplicate(connector->dev, &ili9806e_480x800_mode);
-+	if (!mode) {
-+		dev_err(panel->dev, "failed to add mode %ux%ux@%u\n",
-+			ili9806e_480x800_mode.hdisplay,
-+			ili9806e_480x800_mode.vdisplay,
-+			drm_mode_vrefresh(&ili9806e_480x800_mode));
-+		return -ENOMEM;
-+	}
-+
-+	drm_mode_set_name(mode);
-+
-+	mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED;
-+	drm_mode_probed_add(connector, mode);
-+
-+	connector->display_info.width_mm = 61;
-+	connector->display_info.height_mm = 103;
-+	drm_display_info_set_bus_formats(&connector->display_info,
-+					 &ctx->bus_format, 1);
-+	connector->display_info.bus_flags =
-+					DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE;
-+
-+	return 1;
-+}
-+
-+static int ili9806_prepare(struct drm_panel *panel)
-+{
-+	struct ili9806 *ctx = panel_to_ili9806(panel);
-+	int ret;
-+
-+	ret = regulator_enable(ctx->power);
-+	if (ret)
-+		return ret;
-+
-+	ret = ili9806e_write_msg_list(ctx, panel_init, NUM_INIT_REGS);
-+
-+	return ret;
-+}
-+
-+static int ili9806_enable(struct drm_panel *panel)
-+{
-+	struct ili9806 *ctx = panel_to_ili9806(panel);
-+	const struct ili9806e_msg msg = ILI9806_SET_REG(MIPI_DCS_SET_DISPLAY_ON);
-+	int ret;
-+
-+	ret = ili9806_write_msg(ctx, &msg);
-+
-+	return ret;
-+}
-+
-+static int ili9806_disable(struct drm_panel *panel)
-+{
-+	struct ili9806 *ctx = panel_to_ili9806(panel);
-+	const struct ili9806e_msg msg = ILI9806_SET_REG(MIPI_DCS_SET_DISPLAY_OFF);
-+	int ret;
-+
-+	ret = ili9806_write_msg(ctx, &msg);
-+
-+	return ret;
-+}
-+
-+static int ili9806_unprepare(struct drm_panel *panel)
-+{
-+	struct ili9806 *ctx = panel_to_ili9806(panel);
-+	const struct ili9806e_msg msg = ILI9806_SET_REG(MIPI_DCS_ENTER_SLEEP_MODE);
-+	int ret;
-+
-+	ret = ili9806_write_msg(ctx, &msg);
-+
-+	return ret;
-+}
-+
-+static const struct drm_panel_funcs ili9806_drm_funcs = {
-+	.disable	= ili9806_disable,
-+	.enable		= ili9806_enable,
-+	.get_modes	= ili9806_get_modes,
-+	.prepare	= ili9806_prepare,
-+	.unprepare	= ili9806_unprepare,
-+};
-+
-+static const struct of_device_id ili9806_of_match[] = {
-+	{	.compatible = "txw,txw397017s2",
-+		.data = (void *)MEDIA_BUS_FMT_RGB888_1X24,
-+	}, {
-+		.compatible = "pimoroni,hyperpixel4",
-+		.data = (void *)MEDIA_BUS_FMT_RGB666_1X24_CPADHI,
-+	}, {
-+		.compatible = "ilitek,ili9806e",
-+		.data = (void *)MEDIA_BUS_FMT_RGB888_1X24,
-+	}, {
-+		/* sentinel */
-+	}
-+};
-+MODULE_DEVICE_TABLE(of, ili9806_of_match);
-+
-+static int ili9806_probe(struct spi_device *spi)
-+{
-+	const struct ili9806e_msg panel_reset[] = {
-+		ILI9806_SET_PAGE(0),
-+		ILI9806_SET_REG_PARAM(0x01, 0x00)
-+	};
-+	const struct of_device_id *id;
-+	struct ili9806 *ctx;
-+	int ret;
-+
-+	ctx = devm_kzalloc(&spi->dev, sizeof(*ctx), GFP_KERNEL);
-+	if (!ctx)
-+		return -ENOMEM;
-+
-+	id = of_match_node(ili9806_of_match, spi->dev.of_node);
-+	if (!id)
-+		return -ENODEV;
-+
-+	ctx->bus_format = (u32)(uintptr_t)id->data;
-+
-+	spi_set_drvdata(spi, ctx);
-+	ctx->spi = spi;
-+
-+	drm_panel_init(&ctx->panel, &spi->dev, &ili9806_drm_funcs,
-+		       DRM_MODE_CONNECTOR_DPI);
-+
-+	ctx->power = devm_regulator_get(&spi->dev, "power");
-+	if (IS_ERR(ctx->power))
-+		return PTR_ERR(ctx->power);
-+
-+	ctx->reset = devm_gpiod_get_optional(&spi->dev, "reset", GPIOD_OUT_LOW);
-+	if (IS_ERR(ctx->reset)) {
-+		dev_err(&spi->dev, "Couldn't get our reset line\n");
-+		return PTR_ERR(ctx->reset);
-+	}
-+
-+	/* Soft reset */
-+	ili9806e_write_msg_list(ctx, panel_reset, ARRAY_SIZE(panel_reset));
-+	msleep(200);
-+
-+	ret = drm_panel_of_backlight(&ctx->panel);
-+	if (ret)
-+		return ret;
-+
-+	drm_panel_add(&ctx->panel);
-+
-+	return 0;
-+}
-+
-+static void ili9806_remove(struct spi_device *spi)
-+{
-+	struct ili9806 *ctx = spi_get_drvdata(spi);
-+
-+	drm_panel_remove(&ctx->panel);
-+}
-+
-+static const struct spi_device_id ili9806_ids[] = {
-+	{ "txw397017s2", 0 },
-+	{ "ili9806e", 0 },
-+	{ "hyperpixel4", 0 },
-+	{ /* sentinel */ }
-+};
-+
-+MODULE_DEVICE_TABLE(spi, ili9806_ids);
-+
-+static struct spi_driver ili9806_driver = {
-+	.probe = ili9806_probe,
-+	.remove = ili9806_remove,
-+	.driver = {
-+		.name = "ili9806e",
-+		.of_match_table = ili9806_of_match,
-+	},
-+	.id_table = ili9806_ids,
-+};
-+module_spi_driver(ili9806_driver);
-+
-+MODULE_AUTHOR("Dave Stevenson <dave.stevenson@raspberrypi.com>");
-+MODULE_DESCRIPTION("ili9806 LCD panel driver");
-+MODULE_LICENSE("GPL v2");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0386-drm-panel-Add-panel-driver-for-TDO-Y17B-based-panels.patch b/target/linux/bcm27xx/patches-6.1/950-0386-drm-panel-Add-panel-driver-for-TDO-Y17B-based-panels.patch
deleted file mode 100644
index 9950e78e5d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0386-drm-panel-Add-panel-driver-for-TDO-Y17B-based-panels.patch
+++ /dev/null
@@ -1,329 +0,0 @@
-From b74aec9ca440eb1ed2f48a3cc4ef471cd9c9d623 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 26 Jan 2022 16:02:31 +0000
-Subject: [PATCH] drm/panel: Add panel driver for TDO Y17B based panels
-
-The Top DisplayOptoelectronics (TDO) T17B driver chip is used
-in the TL040HDS20CT panel (found in the Pimoroni HyperPixel4
-Square display) and potentially other displays.
-The driver chip supports SPI for  configuration and DPI
-video data.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/panel/Kconfig          |  11 +
- drivers/gpu/drm/panel/Makefile         |   1 +
- drivers/gpu/drm/panel/panel-tdo-y17p.c | 277 +++++++++++++++++++++++++
- 3 files changed, 289 insertions(+)
- create mode 100644 drivers/gpu/drm/panel/panel-tdo-y17p.c
-
---- a/drivers/gpu/drm/panel/Kconfig
-+++ b/drivers/gpu/drm/panel/Kconfig
-@@ -669,6 +669,17 @@ config DRM_PANEL_TDO_TL070WSH30
- 	  24 bit RGB per pixel. It provides a MIPI DSI interface to
- 	  the host, a built-in LED backlight and touch controller.
- 
-+config DRM_PANEL_TPO_Y17P
-+	tristate "TDO Y17P-based panels"
-+	depends on OF && SPI
-+	select DRM_KMS_HELPER
-+	depends on DRM_GEM_CMA_HELPER
-+	depends on BACKLIGHT_CLASS_DEVICE
-+	select DRM_MIPI_DBI
-+	help
-+	  Say Y if you want to enable support for panels based on the
-+	  TDO Y17P controller.
-+
- config DRM_PANEL_TPO_TD028TTEC1
- 	tristate "Toppoly (TPO) TD028TTEC1 panel driver"
- 	depends on OF && SPI
---- a/drivers/gpu/drm/panel/Makefile
-+++ b/drivers/gpu/drm/panel/Makefile
-@@ -67,6 +67,7 @@ obj-$(CONFIG_DRM_PANEL_SITRONIX_ST7789V)
- obj-$(CONFIG_DRM_PANEL_SONY_ACX565AKM) += panel-sony-acx565akm.o
- obj-$(CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521) += panel-sony-tulip-truly-nt35521.o
- obj-$(CONFIG_DRM_PANEL_TDO_TL070WSH30) += panel-tdo-tl070wsh30.o
-+obj-$(CONFIG_DRM_PANEL_TPO_Y17P) += panel-tdo-y17p.o
- obj-$(CONFIG_DRM_PANEL_TPO_TD028TTEC1) += panel-tpo-td028ttec1.o
- obj-$(CONFIG_DRM_PANEL_TPO_TD043MTEA1) += panel-tpo-td043mtea1.o
- obj-$(CONFIG_DRM_PANEL_TPO_TPG110) += panel-tpo-tpg110.o
---- /dev/null
-+++ b/drivers/gpu/drm/panel/panel-tdo-y17p.c
-@@ -0,0 +1,277 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+/*
-+ * TDO Y17P TFT LCD drm_panel driver.
-+ *
-+ * SPI configured DPI display controller
-+ * Copyright (C) 2022 Raspberry Pi Ltd
-+ *
-+ * Derived from drivers/drm/gpu/panel/panel-sitronix-st7789v.c
-+ * Copyright (C) 2017 Free Electrons
-+ */
-+
-+#include <drm/drm_modes.h>
-+#include <drm/drm_panel.h>
-+
-+#include <linux/bitops.h>
-+#include <linux/gpio/consumer.h>
-+#include <linux/media-bus-format.h>
-+#include <linux/module.h>
-+#include <linux/of_device.h>
-+#include <linux/regmap.h>
-+#include <linux/regulator/consumer.h>
-+#include <linux/spi/spi.h>
-+
-+#include <video/mipi_display.h>
-+#include <video/of_videomode.h>
-+#include <video/videomode.h>
-+
-+struct tdo_y17p {
-+	struct drm_panel panel;
-+	struct spi_device *spi;
-+	struct gpio_desc *reset;
-+	struct regulator *power;
-+	u32 bus_format;
-+};
-+
-+static const u16 panel_init[] = {
-+	0x0ff, 0x1ff, 0x198, 0x106, 0x104, 0x101, 0x008, 0x110,
-+	0x021, 0x109, 0x030, 0x102, 0x031, 0x100, 0x040, 0x110,
-+	0x041, 0x155, 0x042, 0x102, 0x043, 0x109, 0x044, 0x107,
-+	0x050, 0x178, 0x051, 0x178, 0x052, 0x100, 0x053, 0x16d,
-+	0x060, 0x107, 0x061, 0x100, 0x062, 0x108, 0x063, 0x100,
-+	0x0a0, 0x100, 0x0a1, 0x107, 0x0a2, 0x10c, 0x0a3, 0x10b,
-+	0x0a4, 0x103, 0x0a5, 0x107, 0x0a6, 0x106, 0x0a7, 0x104,
-+	0x0a8, 0x108, 0x0a9, 0x10c, 0x0aa, 0x113, 0x0ab, 0x106,
-+	0x0ac, 0x10d, 0x0ad, 0x119, 0x0ae, 0x110, 0x0af, 0x100,
-+	0x0c0, 0x100, 0x0c1, 0x107, 0x0c2, 0x10c, 0x0c3, 0x10b,
-+	0x0c4, 0x103, 0x0c5, 0x107, 0x0c6, 0x107, 0x0c7, 0x104,
-+	0x0c8, 0x108, 0x0c9, 0x10c, 0x0ca, 0x113, 0x0cb, 0x106,
-+	0x0cc, 0x10d, 0x0cd, 0x118, 0x0ce, 0x110, 0x0cf, 0x100,
-+	0x0ff, 0x1ff, 0x198, 0x106, 0x104, 0x106, 0x000, 0x120,
-+	0x001, 0x10a, 0x002, 0x100, 0x003, 0x100, 0x004, 0x101,
-+	0x005, 0x101, 0x006, 0x198, 0x007, 0x106, 0x008, 0x101,
-+	0x009, 0x180, 0x00a, 0x100, 0x00b, 0x100, 0x00c, 0x101,
-+	0x00d, 0x101, 0x00e, 0x100, 0x00f, 0x100, 0x010, 0x1f0,
-+	0x011, 0x1f4, 0x012, 0x101, 0x013, 0x100, 0x014, 0x100,
-+	0x015, 0x1c0, 0x016, 0x108, 0x017, 0x100, 0x018, 0x100,
-+	0x019, 0x100, 0x01a, 0x100, 0x01b, 0x100, 0x01c, 0x100,
-+	0x01d, 0x100, 0x020, 0x101, 0x021, 0x123, 0x022, 0x145,
-+	0x023, 0x167, 0x024, 0x101, 0x025, 0x123, 0x026, 0x145,
-+	0x027, 0x167, 0x030, 0x111, 0x031, 0x111, 0x032, 0x100,
-+	0x033, 0x1ee, 0x034, 0x1ff, 0x035, 0x1bb, 0x036, 0x1aa,
-+	0x037, 0x1dd, 0x038, 0x1cc, 0x039, 0x166, 0x03a, 0x177,
-+	0x03b, 0x122, 0x03c, 0x122, 0x03d, 0x122, 0x03e, 0x122,
-+	0x03f, 0x122, 0x040, 0x122, 0x052, 0x110, 0x053, 0x110,
-+	0x0ff, 0x1ff, 0x198, 0x106, 0x104, 0x107, 0x018, 0x11d,
-+	0x017, 0x122, 0x002, 0x177, 0x026, 0x1b2, 0x0e1, 0x179,
-+	0x0ff, 0x1ff, 0x198, 0x106, 0x104, 0x100, 0x03a, 0x160,
-+	0x035, 0x100, 0x011, 0x100,
-+};
-+
-+#define NUM_INIT_REGS ARRAY_SIZE(panel_init)
-+
-+static inline struct tdo_y17p *panel_to_tdo_y17p(struct drm_panel *panel)
-+{
-+	return container_of(panel, struct tdo_y17p, panel);
-+}
-+
-+static int tdo_y17p_write_msg(struct tdo_y17p *ctx, const u16 *msg, unsigned int len)
-+{
-+	struct spi_transfer xfer = { };
-+	struct spi_message spi;
-+
-+	spi_message_init(&spi);
-+
-+	xfer.tx_buf = msg;
-+	xfer.bits_per_word = 9;
-+	xfer.len = sizeof(u16) * len;
-+
-+	spi_message_add_tail(&xfer, &spi);
-+	return spi_sync(ctx->spi, &spi);
-+}
-+
-+static const struct drm_display_mode tdo_y17pe_720x720_mode = {
-+	.clock = 36720,
-+	.hdisplay = 720,
-+	.hsync_start = 720 + 20,
-+	.hsync_end = 720 + 20 + 20,
-+	.htotal = 720 + 20 + 20 + 40,
-+	.vdisplay = 720,
-+	.vsync_start = 720 + 15,
-+	.vsync_end = 720 + 15 + 15,
-+	.vtotal = 720 + 15 + 15 + 15,
-+	.flags = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC,
-+};
-+
-+static int tdo_y17p_get_modes(struct drm_panel *panel,
-+			      struct drm_connector *connector)
-+{
-+	struct tdo_y17p *ctx = panel_to_tdo_y17p(panel);
-+	struct drm_display_mode *mode;
-+
-+	mode = drm_mode_duplicate(connector->dev, &tdo_y17pe_720x720_mode);
-+	if (!mode) {
-+		dev_err(panel->dev, "failed to add mode %ux%ux@%u\n",
-+			tdo_y17pe_720x720_mode.hdisplay,
-+			tdo_y17pe_720x720_mode.vdisplay,
-+			drm_mode_vrefresh(&tdo_y17pe_720x720_mode));
-+		return -ENOMEM;
-+	}
-+
-+	drm_mode_set_name(mode);
-+
-+	mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED;
-+	drm_mode_probed_add(connector, mode);
-+
-+	connector->display_info.width_mm = 72;
-+	connector->display_info.height_mm = 72;
-+	drm_display_info_set_bus_formats(&connector->display_info,
-+					 &ctx->bus_format, 1);
-+	connector->display_info.bus_flags = 0;
-+
-+	return 1;
-+}
-+
-+static int tdo_y17p_prepare(struct drm_panel *panel)
-+{
-+	struct tdo_y17p *ctx = panel_to_tdo_y17p(panel);
-+	int ret;
-+
-+	ret = regulator_enable(ctx->power);
-+	if (ret)
-+		return ret;
-+
-+	ret = tdo_y17p_write_msg(ctx, panel_init, NUM_INIT_REGS);
-+
-+	msleep(120);
-+
-+	return ret;
-+}
-+
-+static int tdo_y17p_enable(struct drm_panel *panel)
-+{
-+	struct tdo_y17p *ctx = panel_to_tdo_y17p(panel);
-+	const u16 msg[] = { MIPI_DCS_SET_DISPLAY_ON };
-+	int ret;
-+
-+	ret = tdo_y17p_write_msg(ctx, msg, ARRAY_SIZE(msg));
-+
-+	return ret;
-+}
-+
-+static int tdo_y17p_disable(struct drm_panel *panel)
-+{
-+	struct tdo_y17p *ctx = panel_to_tdo_y17p(panel);
-+	const u16 msg[] = { MIPI_DCS_SET_DISPLAY_OFF };
-+	int ret;
-+
-+	ret = tdo_y17p_write_msg(ctx, msg, ARRAY_SIZE(msg));
-+
-+	return ret;
-+}
-+
-+static int tdo_y17p_unprepare(struct drm_panel *panel)
-+{
-+	struct tdo_y17p *ctx = panel_to_tdo_y17p(panel);
-+	const u16 msg[] = { MIPI_DCS_ENTER_SLEEP_MODE };
-+	int ret;
-+
-+	ret = tdo_y17p_write_msg(ctx, msg, ARRAY_SIZE(msg));
-+
-+	return ret;
-+}
-+
-+static const struct drm_panel_funcs tdo_y17p_drm_funcs = {
-+	.disable	= tdo_y17p_disable,
-+	.enable		= tdo_y17p_enable,
-+	.get_modes	= tdo_y17p_get_modes,
-+	.prepare	= tdo_y17p_prepare,
-+	.unprepare	= tdo_y17p_unprepare,
-+};
-+
-+static const struct of_device_id tdo_y17p_of_match[] = {
-+	{	.compatible = "tdo,tl040hds20ct",
-+		.data = (void *)MEDIA_BUS_FMT_BGR888_1X24,
-+	}, {
-+		.compatible = "pimoroni,hyperpixel4square",
-+		.data = (void *)MEDIA_BUS_FMT_BGR666_1X24_CPADHI,
-+	}, {
-+		.compatible = "tdo,y17p",
-+		.data = (void *)MEDIA_BUS_FMT_BGR888_1X24,
-+	}, {
-+		/* sentinel */
-+	}
-+};
-+MODULE_DEVICE_TABLE(of, tdo_y17p_of_match);
-+
-+static int tdo_y17p_probe(struct spi_device *spi)
-+{
-+	const struct of_device_id *id;
-+	struct tdo_y17p *ctx;
-+	int ret;
-+
-+	ctx = devm_kzalloc(&spi->dev, sizeof(*ctx), GFP_KERNEL);
-+	if (!ctx)
-+		return -ENOMEM;
-+
-+	id = of_match_node(tdo_y17p_of_match, spi->dev.of_node);
-+	if (!id)
-+		return -ENODEV;
-+
-+	ctx->bus_format = (u32)(uintptr_t)id->data;
-+
-+	spi_set_drvdata(spi, ctx);
-+	ctx->spi = spi;
-+
-+	drm_panel_init(&ctx->panel, &spi->dev, &tdo_y17p_drm_funcs,
-+		       DRM_MODE_CONNECTOR_DPI);
-+
-+	ctx->power = devm_regulator_get(&spi->dev, "power");
-+	if (IS_ERR(ctx->power))
-+		return PTR_ERR(ctx->power);
-+
-+	ctx->reset = devm_gpiod_get_optional(&spi->dev, "reset", GPIOD_OUT_LOW);
-+	if (IS_ERR(ctx->reset)) {
-+		dev_err(&spi->dev, "Couldn't get our reset line\n");
-+		return PTR_ERR(ctx->reset);
-+	}
-+
-+	ret = drm_panel_of_backlight(&ctx->panel);
-+	if (ret)
-+		return ret;
-+
-+	drm_panel_add(&ctx->panel);
-+
-+	return 0;
-+}
-+
-+static void tdo_y17p_remove(struct spi_device *spi)
-+{
-+	struct tdo_y17p *ctx = spi_get_drvdata(spi);
-+
-+	drm_panel_remove(&ctx->panel);
-+}
-+
-+static const struct spi_device_id tdo_y17p_ids[] = {
-+	{ "tl040hds20ct", 0 },
-+	{ "hyperpixel4square", 0 },
-+	{ "y17p", 0 },
-+	{ /* sentinel */ }
-+};
-+
-+MODULE_DEVICE_TABLE(spi, tdo_y17p_ids);
-+
-+static struct spi_driver tdo_y17p_driver = {
-+	.probe = tdo_y17p_probe,
-+	.remove = tdo_y17p_remove,
-+	.driver = {
-+		.name = "tdo_y17p",
-+		.of_match_table = tdo_y17p_of_match,
-+	},
-+	.id_table = tdo_y17p_ids,
-+};
-+module_spi_driver(tdo_y17p_driver);
-+
-+MODULE_AUTHOR("Dave Stevenson <dave.stevenson@raspberrypi.com>");
-+MODULE_DESCRIPTION("TDO Y17P LCD panel driver");
-+MODULE_LICENSE("GPL v2");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0387-bindings-Add-sck-idle-input-to-spi-gpio.patch b/target/linux/bcm27xx/patches-6.1/950-0387-bindings-Add-sck-idle-input-to-spi-gpio.patch
deleted file mode 100644
index 809bc23308..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0387-bindings-Add-sck-idle-input-to-spi-gpio.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 9131831f5e3f0953dde8ca3807406f1aa1b34791 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Fri, 4 Feb 2022 11:33:28 +0000
-Subject: [PATCH] bindings: Add sck-idle-input to spi-gpio
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- Documentation/devicetree/bindings/spi/spi-gpio.yaml | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/Documentation/devicetree/bindings/spi/spi-gpio.yaml
-+++ b/Documentation/devicetree/bindings/spi/spi-gpio.yaml
-@@ -43,6 +43,10 @@ properties:
-       with no chip select is connected.
-     $ref: "/schemas/types.yaml#/definitions/uint32"
- 
-+  sck-idle-input:
-+    description: Make SCK an input when inactive.
-+    type: boolean
-+
-   # Deprecated properties
-   gpio-sck: false
-   gpio-miso: false
diff --git a/target/linux/bcm27xx/patches-6.1/950-0388-spi-gpio-Add-sck-idle-input-property.patch b/target/linux/bcm27xx/patches-6.1/950-0388-spi-gpio-Add-sck-idle-input-property.patch
deleted file mode 100644
index 461fd7f9e8..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0388-spi-gpio-Add-sck-idle-input-property.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From d9061fef9a7109c32d7e4eb1d42e387b9781e92a Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 12 Jan 2022 08:23:28 +0000
-Subject: [PATCH] spi: gpio: Add sck-idle-input property
-
-The sck-idle-input property indicates that the spi-gpio driver should
-return the SCK line to an input when the chip select signals are
-inactive.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/spi/spi-gpio.c | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
---- a/drivers/spi/spi-gpio.c
-+++ b/drivers/spi/spi-gpio.c
-@@ -35,6 +35,7 @@ struct spi_gpio {
- 	struct gpio_desc		*sck;
- 	struct gpio_desc		*miso;
- 	struct gpio_desc		*mosi;
-+	bool				sck_idle_input;
- 	struct gpio_desc		**cs_gpios;
- };
- 
-@@ -225,8 +226,12 @@ static void spi_gpio_chipselect(struct s
- 	struct spi_gpio *spi_gpio = spi_to_spi_gpio(spi);
- 
- 	/* set initial clock line level */
--	if (is_active)
--		gpiod_set_value_cansleep(spi_gpio->sck, spi->mode & SPI_CPOL);
-+	if (is_active) {
-+		if (spi_gpio->sck_idle_input)
-+			gpiod_direction_output(spi_gpio->sck, spi->mode & SPI_CPOL);
-+		else
-+			gpiod_set_value_cansleep(spi_gpio->sck, spi->mode & SPI_CPOL);
-+	}
- 
- 	/* Drive chip select line, if we have one */
- 	if (spi_gpio->cs_gpios) {
-@@ -235,6 +240,9 @@ static void spi_gpio_chipselect(struct s
- 		/* SPI chip selects are normally active-low */
- 		gpiod_set_value_cansleep(cs, (spi->mode & SPI_CS_HIGH) ? is_active : !is_active);
- 	}
-+
-+	if (spi_gpio->sck_idle_input && !is_active)
-+		gpiod_direction_input(spi_gpio->sck);
- }
- 
- static int spi_gpio_setup(struct spi_device *spi)
-@@ -323,6 +331,7 @@ static int spi_gpio_request(struct devic
- 	if (IS_ERR(spi_gpio->miso))
- 		return PTR_ERR(spi_gpio->miso);
- 
-+	spi_gpio->sck_idle_input = device_property_read_bool(dev, "sck-idle-input");
- 	spi_gpio->sck = devm_gpiod_get(dev, "sck", GPIOD_OUT_LOW);
- 	return PTR_ERR_OR_ZERO(spi_gpio->sck);
- }
diff --git a/target/linux/bcm27xx/patches-6.1/950-0389-media-bcm2835-unicam-Handle-a-repeated-frame-start-w.patch b/target/linux/bcm27xx/patches-6.1/950-0389-media-bcm2835-unicam-Handle-a-repeated-frame-start-w.patch
deleted file mode 100644
index 40a0d51cc5..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0389-media-bcm2835-unicam-Handle-a-repeated-frame-start-w.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From e042524d5b516f852f107661cfb68187e5b1f95b Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 4 Feb 2022 16:12:35 +0000
-Subject: [PATCH] media: bcm2835-unicam: Handle a repeated frame start
- with no end
-
-In the case of 2 frame starts being received with no frame end
-between, the queued buffer held in next_frm was lost as the
-pointer was overwritten with the dummy buffer.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../media/platform/bcm2835/bcm2835-unicam.c   | 29 +++++++++++++++----
- 1 file changed, 24 insertions(+), 5 deletions(-)
-
---- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
-+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -930,10 +930,14 @@ static irqreturn_t unicam_isr(int irq, v
- 			 * as complete, as the HW will reuse that buffer.
- 			 */
- 			if (unicam->node[i].cur_frm &&
--			    unicam->node[i].cur_frm != unicam->node[i].next_frm)
-+			    unicam->node[i].cur_frm != unicam->node[i].next_frm) {
- 				unicam_process_buffer_complete(&unicam->node[i],
- 							       sequence);
--			unicam->node[i].cur_frm = unicam->node[i].next_frm;
-+				unicam->node[i].cur_frm = unicam->node[i].next_frm;
-+				unicam->node[i].next_frm = NULL;
-+			} else {
-+				unicam->node[i].cur_frm = unicam->node[i].next_frm;
-+			}
- 		}
- 		unicam->sequence++;
- 	}
-@@ -956,10 +960,25 @@ static irqreturn_t unicam_isr(int irq, v
- 					   i);
- 			/*
- 			 * Set the next frame output to go to a dummy frame
--			 * if we have not managed to obtain another frame
--			 * from the queue.
-+			 * if no buffer currently queued.
- 			 */
--			unicam_schedule_dummy_buffer(&unicam->node[i]);
-+			if (!unicam->node[i].next_frm ||
-+			    unicam->node[i].next_frm == unicam->node[i].cur_frm) {
-+				unicam_schedule_dummy_buffer(&unicam->node[i]);
-+			} else if (unicam->node[i].cur_frm) {
-+				/*
-+				 * Repeated FS without FE. Hardware will have
-+				 * swapped buffers, but the cur_frm doesn't
-+				 * contain valid data. Return cur_frm to the
-+				 * queue.
-+				 */
-+				spin_lock(&unicam->node[i].dma_queue_lock);
-+				list_add_tail(&unicam->node[i].cur_frm->list,
-+					      &unicam->node[i].dma_queue);
-+				spin_unlock(&unicam->node[i].dma_queue_lock);
-+				unicam->node[i].cur_frm = unicam->node[i].next_frm;
-+				unicam->node[i].next_frm = NULL;
-+			}
- 		}
- 
- 		unicam_queue_event_sof(unicam);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0390-usb-xhci-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch b/target/linux/bcm27xx/patches-6.1/950-0390-usb-xhci-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch
deleted file mode 100644
index df13f539bd..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0390-usb-xhci-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From ba09ce751542f6f80019433364d46a14ade59dd0 Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.com>
-Date: Wed, 16 Feb 2022 14:31:02 +0000
-Subject: [PATCH] usb: xhci: add a quirk for Superspeed bulk OUT
- transfers on VL805
-
-The VL805 has a bug in its internal FIFO space accounting that results
-in bulk OUT babble if a TRB in a large multi-element TD has a data
-buffer size that is larger than and not a multiple of wMaxPacketSize for
-the endpoint. If the downstream USB3.0 link is congested, or latency is
-increased through an intermediate hub, then the VL805 enters a suspected
-FIFO overflow condition and transmits repeated, garbled data to the
-endpoint.
-
-TDs with TRBs of exact multiples of wMaxPacketSize and smaller than
-wMaxPacketSize appear to be handled correctly, so split buffers at a
-1024-byte length boundary and put the remainder in a separate smaller
-TRB.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- drivers/usb/host/xhci-pci.c  |  1 +
- drivers/usb/host/xhci-ring.c | 21 +++++++++++++++++++--
- drivers/usb/host/xhci.h      |  1 +
- 3 files changed, 21 insertions(+), 2 deletions(-)
-
---- a/drivers/usb/host/xhci-pci.c
-+++ b/drivers/usb/host/xhci-pci.c
-@@ -297,6 +297,7 @@ static void xhci_pci_quirks(struct devic
- 		xhci->quirks |= XHCI_LPM_SUPPORT;
- 		xhci->quirks |= XHCI_AVOID_DQ_ON_LINK;
- 		xhci->quirks |= XHCI_VLI_TRB_CACHE_BUG;
-+		xhci->quirks |= XHCI_VLI_SS_BULK_OUT_BUG;
- 	}
- 
- 	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
---- a/drivers/usb/host/xhci-ring.c
-+++ b/drivers/usb/host/xhci-ring.c
-@@ -3606,14 +3606,15 @@ int xhci_queue_bulk_tx(struct xhci_hcd *
- 	unsigned int num_trbs;
- 	unsigned int start_cycle, num_sgs = 0;
- 	unsigned int enqd_len, block_len, trb_buff_len, full_len;
--	int sent_len, ret;
--	u32 field, length_field, remainder;
-+	int sent_len, ret, vli_quirk = 0;
-+	u32 field, length_field, remainder, maxpacket;
- 	u64 addr, send_addr;
- 
- 	ring = xhci_urb_to_transfer_ring(xhci, urb);
- 	if (!ring)
- 		return -EINVAL;
- 
-+	maxpacket = usb_endpoint_maxp(&urb->ep->desc);
- 	full_len = urb->transfer_buffer_length;
- 	/* If we have scatter/gather list, we use it. */
- 	if (urb->num_sgs && !(urb->transfer_flags & URB_DMA_MAP_SINGLE)) {
-@@ -3650,6 +3651,17 @@ int xhci_queue_bulk_tx(struct xhci_hcd *
- 	start_cycle = ring->cycle_state;
- 	send_addr = addr;
- 
-+	if (xhci->quirks & XHCI_VLI_SS_BULK_OUT_BUG &&
-+	    !usb_urb_dir_in(urb) && urb->dev->speed >= USB_SPEED_SUPER) {
-+		/*
-+		 * VL805 - superspeed bulk OUT traffic can cause
-+		 * an internal fifo overflow if the TRB buffer is larger
-+		 * than wMaxPacket and the length is not an integer
-+		 * multiple of wMaxPacket.
-+		 */
-+		vli_quirk = 1;
-+	}
-+
- 	/* Queue the TRBs, even if they are zero-length */
- 	for (enqd_len = 0; first_trb || enqd_len < full_len;
- 			enqd_len += trb_buff_len) {
-@@ -3662,6 +3674,11 @@ int xhci_queue_bulk_tx(struct xhci_hcd *
- 		if (enqd_len + trb_buff_len > full_len)
- 			trb_buff_len = full_len - enqd_len;
- 
-+		if (vli_quirk && trb_buff_len > maxpacket) {
-+			/* SS bulk wMaxPacket is 1024B */
-+			remainder = trb_buff_len & (maxpacket - 1);
-+			trb_buff_len -= remainder;
-+		}
- 		/* Don't change the cycle bit of the first TRB until later */
- 		if (first_trb) {
- 			first_trb = false;
---- a/drivers/usb/host/xhci.h
-+++ b/drivers/usb/host/xhci.h
-@@ -1910,6 +1910,7 @@ struct xhci_hcd {
- #define XHCI_ZHAOXIN_HOST	BIT_ULL(46)
- #define XHCI_AVOID_DQ_ON_LINK  BIT_ULL(47)
- #define XHCI_VLI_TRB_CACHE_BUG BIT_ULL(48)
-+#define XHCI_VLI_SS_BULK_OUT_BUG       BIT_ULL(49)
- 
- 	unsigned int		num_active_eps;
- 	unsigned int		limit_active_eps;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0391-media-i2c-ov7251-Reinstate-setting-ov7251_global_ini.patch b/target/linux/bcm27xx/patches-6.1/950-0391-media-i2c-ov7251-Reinstate-setting-ov7251_global_ini.patch
deleted file mode 100644
index 4cab9adb0b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0391-media-i2c-ov7251-Reinstate-setting-ov7251_global_ini.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 69feaeba2b7f283074d81b12df78218f881159f1 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 17 Feb 2022 14:48:30 +0000
-Subject: [PATCH] media: i2c: ov7251: Reinstate setting
- ov7251_global_init_setting
-
-"media: i2c: Remove .s_power() from ov7251" removed the call that
-sent ov7251_global_init_setting to the sensor. Send it when starting
-streaming.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/i2c/ov7251.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/drivers/media/i2c/ov7251.c
-+++ b/drivers/media/i2c/ov7251.c
-@@ -1344,6 +1344,14 @@ static int ov7251_s_stream(struct v4l2_s
- 		if (ret < 0)
- 			goto err_power_down;
- 
-+		ret = ov7251_set_register_array(ov7251,
-+					ov7251_global_init_setting,
-+					ARRAY_SIZE(ov7251_global_init_setting));
-+		if (ret < 0) {
-+			dev_err(ov7251->dev, "could not set global_init_setting\n");
-+			goto err_power_down;
-+		}
-+
- 		ret = ov7251_pll_configure(ov7251);
- 		if (ret) {
- 			dev_err(ov7251->dev, "error configuring PLLs\n");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0392-usb-xhci-rework-XHCI_VLI_SS_BULK_OUT_BUG-quirk.patch b/target/linux/bcm27xx/patches-6.1/950-0392-usb-xhci-rework-XHCI_VLI_SS_BULK_OUT_BUG-quirk.patch
deleted file mode 100644
index fecee7d952..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0392-usb-xhci-rework-XHCI_VLI_SS_BULK_OUT_BUG-quirk.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 855c0e315e283985bacb623ee72bae2fcec3a463 Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.com>
-Date: Tue, 1 Mar 2022 15:12:15 +0000
-Subject: [PATCH] usb: xhci: rework XHCI_VLI_SS_BULK_OUT_BUG quirk
-
-Fix incorrectly applying the quirk for bulk IN endpoints and remove the
-commentary which is not completely accurate based on observed behaviour.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- drivers/usb/host/xhci-ring.c | 15 +++++----------
- 1 file changed, 5 insertions(+), 10 deletions(-)
-
---- a/drivers/usb/host/xhci-ring.c
-+++ b/drivers/usb/host/xhci-ring.c
-@@ -3606,7 +3606,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd *
- 	unsigned int num_trbs;
- 	unsigned int start_cycle, num_sgs = 0;
- 	unsigned int enqd_len, block_len, trb_buff_len, full_len;
--	int sent_len, ret, vli_quirk = 0;
-+	int sent_len, ret, vli_bulk_quirk = 0;
- 	u32 field, length_field, remainder, maxpacket;
- 	u64 addr, send_addr;
- 
-@@ -3652,14 +3652,9 @@ int xhci_queue_bulk_tx(struct xhci_hcd *
- 	send_addr = addr;
- 
- 	if (xhci->quirks & XHCI_VLI_SS_BULK_OUT_BUG &&
--	    !usb_urb_dir_in(urb) && urb->dev->speed >= USB_SPEED_SUPER) {
--		/*
--		 * VL805 - superspeed bulk OUT traffic can cause
--		 * an internal fifo overflow if the TRB buffer is larger
--		 * than wMaxPacket and the length is not an integer
--		 * multiple of wMaxPacket.
--		 */
--		vli_quirk = 1;
-+	    usb_endpoint_is_bulk_out(&urb->ep->desc)
-+	    && urb->dev->speed >= USB_SPEED_SUPER) {
-+		vli_bulk_quirk = 1;
- 	}
- 
- 	/* Queue the TRBs, even if they are zero-length */
-@@ -3674,7 +3669,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd *
- 		if (enqd_len + trb_buff_len > full_len)
- 			trb_buff_len = full_len - enqd_len;
- 
--		if (vli_quirk && trb_buff_len > maxpacket) {
-+		if (vli_bulk_quirk && trb_buff_len > maxpacket) {
- 			/* SS bulk wMaxPacket is 1024B */
- 			remainder = trb_buff_len & (maxpacket - 1);
- 			trb_buff_len -= remainder;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0393-media-i2c-Add-driver-for-Omnivision-OV2311.patch b/target/linux/bcm27xx/patches-6.1/950-0393-media-i2c-Add-driver-for-Omnivision-OV2311.patch
deleted file mode 100644
index cff524e2f1..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0393-media-i2c-Add-driver-for-Omnivision-OV2311.patch
+++ /dev/null
@@ -1,1228 +0,0 @@
-From 6390e65023f728f3ba3a85d4a6e7ed883bf8e7e8 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 25 Feb 2022 18:16:13 +0000
-Subject: [PATCH] media/i2c: Add driver for Omnivision OV2311
-
-Omnivision OV2311 is a CSI2 1600x1300 global shutter image sensor.
-Add a driver for it.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/i2c/Kconfig  |   11 +
- drivers/media/i2c/Makefile |    1 +
- drivers/media/i2c/ov2311.c | 1179 ++++++++++++++++++++++++++++++++++++
- 3 files changed, 1191 insertions(+)
- create mode 100644 drivers/media/i2c/ov2311.c
-
---- a/drivers/media/i2c/Kconfig
-+++ b/drivers/media/i2c/Kconfig
-@@ -402,6 +402,17 @@ config VIDEO_OV13B10
- 	  This is a Video4Linux2 sensor driver for the OmniVision
- 	  OV13B10 camera.
- 
-+config VIDEO_OV2311
-+	tristate "OmniVision OV2311 sensor support"
-+	depends on I2C && VIDEO_DEV
-+	depends on MEDIA_CAMERA_SUPPORT
-+	help
-+	  This is a Video4Linux2 sensor-level driver for the OmniVision
-+	  OV2311 camera.
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called ov2311.
-+
- config VIDEO_OV2640
- 	tristate "OmniVision OV2640 sensor support"
- 	depends on VIDEO_DEV && I2C
---- a/drivers/media/i2c/Makefile
-+++ b/drivers/media/i2c/Makefile
-@@ -77,6 +77,7 @@ obj-$(CONFIG_VIDEO_OV02A10) += ov02a10.o
- obj-$(CONFIG_VIDEO_OV08D10) += ov08d10.o
- obj-$(CONFIG_VIDEO_OV13858) += ov13858.o
- obj-$(CONFIG_VIDEO_OV13B10) += ov13b10.o
-+obj-$(CONFIG_VIDEO_OV2311) += ov2311.o
- obj-$(CONFIG_VIDEO_OV2640) += ov2640.o
- obj-$(CONFIG_VIDEO_OV2659) += ov2659.o
- obj-$(CONFIG_VIDEO_OV2680) += ov2680.o
---- /dev/null
-+++ b/drivers/media/i2c/ov2311.c
-@@ -0,0 +1,1179 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Omnivision OV2311 1600x1300 global shutter image sensor driver
-+ * Copyright (C) 2022, Raspberry Pi (Trading) Ltd
-+ *
-+ * This driver is based on the OV9281 driver.
-+ * Copyright (C) 2017 Fuzhou Rockchip Electronics Co., Ltd.
-+ * Register configuration from
-+ * https://github.com/ArduCAM/ArduCAM_USB_Camera_Shield/tree/master/Config/USB3.0_UC-425_Rev.C%2BUC-628_Rev.B/OV2311
-+ * with additional exposure and gain register information from
-+ * https://github.com/renesas-rcar/linux-bsp/tree/0cf6e36f5bf49e1c2aab87139ec5b588623c56f8/drivers/media/i2c/imagers
-+ */
-+
-+#include <linux/clk.h>
-+#include <linux/device.h>
-+#include <linux/delay.h>
-+#include <linux/gpio/consumer.h>
-+#include <linux/i2c.h>
-+#include <linux/module.h>
-+#include <linux/pm_runtime.h>
-+#include <linux/regulator/consumer.h>
-+#include <media/media-entity.h>
-+#include <media/v4l2-async.h>
-+#include <media/v4l2-ctrls.h>
-+#include <media/v4l2-event.h>
-+#include <media/v4l2-fwnode.h>
-+#include <media/v4l2-subdev.h>
-+
-+#define OV2311_LINK_FREQ		400000000
-+#define OV2311_LANES			2
-+
-+/* pixel rate = link frequency * 2 * lanes / BITS_PER_SAMPLE */
-+#define OV2311_PIXEL_RATE_10BIT		(OV2311_LINK_FREQ * 2 * \
-+					 OV2311_LANES / 10)
-+#define OV2311_PIXEL_RATE_8BIT		(OV2311_LINK_FREQ * 2 * \
-+					 OV2311_LANES / 8)
-+#define OV2311_XVCLK_FREQ		24000000
-+
-+#define CHIP_ID				0x2311
-+#define OV2311_REG_CHIP_ID		0x300a
-+
-+#define OV2311_REG_CTRL_MODE		0x0100
-+#define OV2311_MODE_SW_STANDBY		0x0
-+#define OV2311_MODE_STREAMING		BIT(0)
-+
-+#define OV2311_REG_V_FLIP		0x3820
-+#define OV2311_REG_H_FLIP		0x3821
-+#define OV2311_FLIP_BIT			BIT(2)
-+
-+#define OV2311_REG_EXPOSURE		0x3501
-+#define	OV2311_EXPOSURE_MIN		4
-+#define	OV2311_EXPOSURE_STEP		1
-+#define OV2311_VTS_MAX			0xffff
-+
-+#define OV2311_REG_GAIN_H		0x3508
-+#define OV2311_REG_GAIN_L		0x3509
-+#define OV2311_GAIN_H_MASK		0x07
-+#define OV2311_GAIN_H_SHIFT		8
-+#define OV2311_GAIN_L_MASK		0xff
-+#define OV2311_GAIN_MIN			0x100
-+#define OV2311_GAIN_MAX			0x780
-+#define OV2311_GAIN_STEP		1
-+#define OV2311_GAIN_DEFAULT		OV2311_GAIN_MIN
-+
-+#define OV2311_REG_TEST_PATTERN		0x5e00
-+#define OV2311_TEST_PATTERN_ENABLE	0x80
-+#define OV2311_TEST_PATTERN_DISABLE	0x0
-+
-+#define OV2311_REG_VTS			0x380e
-+
-+/*
-+ * OV2311 native and active pixel array size.
-+ * Datasheet not available to confirm these values. renesas-rcar linux-bsp tree
-+ * has these values.
-+ */
-+#define OV2311_NATIVE_WIDTH		1616U
-+#define OV2311_NATIVE_HEIGHT		1316U
-+#define OV2311_PIXEL_ARRAY_LEFT		8U
-+#define OV2311_PIXEL_ARRAY_TOP		8U
-+#define OV2311_PIXEL_ARRAY_WIDTH	1600U
-+#define OV2311_PIXEL_ARRAY_HEIGHT	1300U
-+
-+#define REG_NULL			0xFFFF
-+
-+#define OV2311_REG_VALUE_08BIT		1
-+#define OV2311_REG_VALUE_16BIT		2
-+#define OV2311_REG_VALUE_24BIT		3
-+
-+#define OV2311_NAME			"ov2311"
-+
-+static const char * const ov2311_supply_names[] = {
-+	"avdd",		/* Analog power */
-+	"dovdd",	/* Digital I/O power */
-+	"dvdd",		/* Digital core power */
-+};
-+
-+#define OV2311_NUM_SUPPLIES ARRAY_SIZE(ov2311_supply_names)
-+
-+struct regval {
-+	u16 addr;
-+	u8 val;
-+};
-+
-+struct ov2311_mode {
-+	u32 width;
-+	u32 height;
-+	u32 hts_def;
-+	u32 vts_def;
-+	u32 exp_def;
-+	struct v4l2_rect crop;
-+	const struct regval *reg_list;
-+};
-+
-+struct ov2311 {
-+	struct i2c_client	*client;
-+	struct clk		*xvclk;
-+	struct gpio_desc	*reset_gpio;
-+	struct gpio_desc	*pwdn_gpio;
-+	struct regulator_bulk_data supplies[OV2311_NUM_SUPPLIES];
-+
-+	struct v4l2_subdev	subdev;
-+	struct media_pad	pad;
-+	struct v4l2_ctrl_handler ctrl_handler;
-+	struct v4l2_ctrl	*exposure;
-+	struct v4l2_ctrl	*hblank;
-+	struct v4l2_ctrl	*vblank;
-+	struct v4l2_ctrl	*pixel_rate;
-+	/*
-+	 * Mutex for serialized access:
-+	 * Protect sensor module set pad format and start/stop streaming safely.
-+	 */
-+	struct mutex		mutex;
-+
-+	/* Streaming on/off */
-+	bool streaming;
-+
-+	const struct ov2311_mode *cur_mode;
-+	u32			code;
-+};
-+
-+#define to_ov2311(sd) container_of(sd, struct ov2311, subdev)
-+
-+/*
-+ * Xclk 24Mhz
-+ * max_framerate 60fps for 10 bit, 74.6fps for 8 bit.
-+ */
-+static const struct regval ov2311_common_regs[] = {
-+	{ 0x0103, 0x01 },
-+	{ 0x0100, 0x00 },
-+	{ 0x0300, 0x01 },
-+	{ 0x0302, 0x32 },
-+	{ 0x0303, 0x00 },
-+	{ 0x0304, 0x03 },
-+	{ 0x0305, 0x02 },
-+	{ 0x0306, 0x01 },
-+	{ 0x030e, 0x04 },
-+	{ 0x3001, 0x02 },
-+	{ 0x3004, 0x00 },
-+	{ 0x3005, 0x00 },
-+	{ 0x3006, 0x00 },
-+	{ 0x3011, 0x0d },
-+	{ 0x3014, 0x04 },
-+	{ 0x301c, 0xf0 },
-+	{ 0x3020, 0x00 },
-+	{ 0x302c, 0x00 },
-+	{ 0x302d, 0x12 },
-+	{ 0x302e, 0x4c },
-+	{ 0x302f, 0x8c },
-+	{ 0x3030, 0x10 },
-+	{ 0x303f, 0x03 },
-+	{ 0x3103, 0x00 },
-+	{ 0x3106, 0x08 },
-+	{ 0x31ff, 0x01 },
-+	{ 0x3501, 0x05 },
-+	{ 0x3502, 0xba },
-+	{ 0x3506, 0x00 },
-+	{ 0x3507, 0x00 },
-+	{ 0x3620, 0x67 },
-+	{ 0x3633, 0x78 },
-+	{ 0x3666, 0x00 },
-+	{ 0x3670, 0x68 },
-+	{ 0x3674, 0x10 },
-+	{ 0x3675, 0x00 },
-+	{ 0x3680, 0x84 },
-+	{ 0x36a2, 0x04 },
-+	{ 0x36a3, 0x80 },
-+	{ 0x36b0, 0x00 },
-+	{ 0x3700, 0x35 },
-+	{ 0x3704, 0x59 },
-+	{ 0x3712, 0x00 },
-+	{ 0x3713, 0x02 },
-+	{ 0x379b, 0x01 },
-+	{ 0x379c, 0x10 },
-+	{ 0x3800, 0x00 },
-+	{ 0x3801, 0x00 },
-+	{ 0x3804, 0x06 },
-+	{ 0x3805, 0x4f },
-+	{ 0x3810, 0x00 },
-+	{ 0x3811, 0x08 },
-+	{ 0x3812, 0x00 },
-+	{ 0x3813, 0x08 },
-+	{ 0x3814, 0x11 },
-+	{ 0x3815, 0x11 },
-+	{ 0x3816, 0x00 },
-+	{ 0x3817, 0x00 },
-+	{ 0x3818, 0x04 },
-+	{ 0x3819, 0x00 },
-+	{ 0x382b, 0x5a },
-+	{ 0x382c, 0x09 },
-+	{ 0x382d, 0x9a },
-+	{ 0x3882, 0x02 },
-+	{ 0x3883, 0x6c },
-+	{ 0x3885, 0x07 },
-+	{ 0x389d, 0x03 },
-+	{ 0x38a6, 0x00 },
-+	{ 0x38a7, 0x01 },
-+	{ 0x38b3, 0x07 },
-+	{ 0x38b1, 0x00 },
-+	{ 0x38e5, 0x02 },
-+	{ 0x38e7, 0x00 },
-+	{ 0x38e8, 0x00 },
-+	{ 0x3910, 0xff },
-+	{ 0x3911, 0xff },
-+	{ 0x3912, 0x08 },
-+	{ 0x3913, 0x00 },
-+	{ 0x3914, 0x00 },
-+	{ 0x3915, 0x00 },
-+	{ 0x391c, 0x00 },
-+	{ 0x3920, 0xa5 },
-+	{ 0x3921, 0x00 },
-+	{ 0x3922, 0x00 },
-+	{ 0x3923, 0x00 },
-+	{ 0x3924, 0x05 },
-+	{ 0x3925, 0x00 },
-+	{ 0x3926, 0x00 },
-+	{ 0x3927, 0x00 },
-+	{ 0x3928, 0x1a },
-+	{ 0x392d, 0x05 },
-+	{ 0x392e, 0xf2 },
-+	{ 0x392f, 0x40 },
-+	{ 0x4001, 0x00 },
-+	{ 0x4003, 0x40 },
-+	{ 0x4008, 0x12 },
-+	{ 0x4009, 0x1b },
-+	{ 0x400c, 0x0c },
-+	{ 0x400d, 0x13 },
-+	{ 0x4010, 0xf0 },
-+	{ 0x4011, 0x00 },
-+	{ 0x4016, 0x00 },
-+	{ 0x4017, 0x04 },
-+	{ 0x4042, 0x11 },
-+	{ 0x4043, 0x70 },
-+	{ 0x4045, 0x00 },
-+	{ 0x4409, 0x5f },
-+	{ 0x450b, 0x00 },
-+	{ 0x4600, 0x00 },
-+	{ 0x4601, 0xa0 },
-+	{ 0x4708, 0x09 },
-+	{ 0x470c, 0x81 },
-+	{ 0x4710, 0x06 },
-+	{ 0x4711, 0x00 },
-+	{ 0x4800, 0x00 },
-+	{ 0x481f, 0x30 },
-+	{ 0x4837, 0x14 },
-+	{ 0x4f00, 0x00 },
-+	{ 0x4f07, 0x00 },
-+	{ 0x4f08, 0x03 },
-+	{ 0x4f09, 0x08 },
-+	{ 0x4f0c, 0x06 },
-+	{ 0x4f0d, 0x02 },
-+	{ 0x4f10, 0x00 },
-+	{ 0x4f11, 0x00 },
-+	{ 0x4f12, 0x07 },
-+	{ 0x4f13, 0xe2 },
-+	{ 0x5000, 0x9f },
-+	{ 0x5001, 0x20 },
-+	{ 0x5026, 0x00 },
-+	{ 0x5c00, 0x00 },
-+	{ 0x5c01, 0x2c },
-+	{ 0x5c02, 0x00 },
-+	{ 0x5c03, 0x7f },
-+	{ 0x5e00, 0x00 },
-+	{ 0x5e01, 0x41 },
-+	{REG_NULL, 0x00},
-+};
-+
-+static const struct regval ov2311_1600x1300_regs[] = {
-+	{ 0x3802, 0x00 },
-+	{ 0x3803, 0x00 },
-+	{ 0x3806, 0x05 },
-+	{ 0x3807, 0x23 },
-+	{ 0x3808, 0x06 },
-+	{ 0x3809, 0x40 },
-+	{ 0x380a, 0x05 },
-+	{ 0x380b, 0x14 },
-+	{ 0x380c, 0x03 },
-+	{ 0x380d, 0x88 },
-+	{REG_NULL, 0x00},
-+};
-+
-+static const struct regval ov2311_1600x1080_regs[] = {
-+	{ 0x3802, 0x00 },
-+	{ 0x3803, 0x6e },
-+	{ 0x3806, 0x04 },
-+	{ 0x3807, 0xae },
-+	{ 0x3808, 0x06 },
-+	{ 0x3809, 0x40 },
-+	{ 0x380a, 0x04 },
-+	{ 0x380b, 0x38 },
-+	{ 0x380c, 0x03 },
-+	{ 0x380d, 0x88 },
-+
-+	{ 0x5d01, 0x00 },
-+	{ 0x5d02, 0x04 },
-+	{ 0x5d03, 0x00 },
-+	{ 0x5d04, 0x04 },
-+	{ 0x5d05, 0x00 },
-+	{REG_NULL, 0x00},
-+};
-+
-+static const struct regval op_10bit[] = {
-+	{ 0x030d, 0x5a },
-+	{ 0x3662, 0x65 },
-+	{REG_NULL, 0x00},
-+};
-+
-+static const struct regval op_8bit[] = {
-+	{ 0x030d, 0x70 },
-+	{ 0x3662, 0x67 },
-+	{REG_NULL, 0x00},
-+};
-+
-+static const struct ov2311_mode supported_modes[] = {
-+	{
-+		.width = 1600,
-+		.height = 1300,
-+		.exp_def = 0x0320,
-+		.hts_def = (0x0388 * 2),/* Registers 0x380c / 0x380d  * 2 */
-+		.vts_def = 0x5c2,	/* Registers 0x380e / 0x380f
-+					 * 60fps for 10bpp
-+					 */
-+		.crop = {
-+			.left = OV2311_PIXEL_ARRAY_LEFT,
-+			.top = OV2311_PIXEL_ARRAY_TOP,
-+			.width = 1600,
-+			.height = 1300
-+		},
-+		.reg_list = ov2311_1600x1300_regs,
-+	},
-+	{
-+		.width = 1600,
-+		.height = 1080,
-+		.exp_def = 0x0320,
-+		.hts_def = (0x0388 * 2),/* Registers 0x380c / 0x380d  * 2 */
-+		.vts_def = 0x5c2,	/* Registers 0x380e / 0x380f
-+					 * 60fps for 10bpp
-+					 */
-+		.crop = {
-+			.left = OV2311_PIXEL_ARRAY_LEFT,
-+			.top = 110 + OV2311_PIXEL_ARRAY_TOP,
-+			.width = 1600,
-+			.height = 1080
-+		},
-+		.reg_list = ov2311_1600x1080_regs,
-+	},
-+};
-+
-+static const s64 link_freq_menu_items[] = {
-+	OV2311_LINK_FREQ
-+};
-+
-+static const char * const ov2311_test_pattern_menu[] = {
-+	"Disabled",
-+	"Vertical Color Bar Type 1",
-+	"Vertical Color Bar Type 2",
-+	"Vertical Color Bar Type 3",
-+	"Vertical Color Bar Type 4"
-+};
-+
-+/* Write registers up to 4 at a time */
-+static int ov2311_write_reg(struct i2c_client *client, u16 reg,
-+			    u32 len, u32 val)
-+{
-+	u32 buf_i, val_i;
-+	u8 buf[6];
-+	u8 *val_p;
-+	__be32 val_be;
-+
-+	if (len > 4)
-+		return -EINVAL;
-+
-+	buf[0] = reg >> 8;
-+	buf[1] = reg & 0xff;
-+
-+	val_be = cpu_to_be32(val);
-+	val_p = (u8 *)&val_be;
-+	buf_i = 2;
-+	val_i = 4 - len;
-+
-+	while (val_i < 4)
-+		buf[buf_i++] = val_p[val_i++];
-+
-+	if (i2c_master_send(client, buf, len + 2) != len + 2)
-+		return -EIO;
-+
-+	return 0;
-+}
-+
-+static int ov2311_write_array(struct i2c_client *client,
-+			      const struct regval *regs)
-+{
-+	u32 i;
-+	int ret = 0;
-+
-+	for (i = 0; ret == 0 && regs[i].addr != REG_NULL; i++)
-+		ret = ov2311_write_reg(client, regs[i].addr,
-+				       OV2311_REG_VALUE_08BIT, regs[i].val);
-+
-+	return ret;
-+}
-+
-+/* Read registers up to 4 at a time */
-+static int ov2311_read_reg(struct i2c_client *client, u16 reg, unsigned int len,
-+			   u32 *val)
-+{
-+	struct i2c_msg msgs[2];
-+	u8 *data_be_p;
-+	__be32 data_be = 0;
-+	__be16 reg_addr_be = cpu_to_be16(reg);
-+	int ret;
-+
-+	if (len > 4 || !len)
-+		return -EINVAL;
-+
-+	data_be_p = (u8 *)&data_be;
-+	/* Write register address */
-+	msgs[0].addr = client->addr;
-+	msgs[0].flags = 0;
-+	msgs[0].len = 2;
-+	msgs[0].buf = (u8 *)&reg_addr_be;
-+
-+	/* Read data from register */
-+	msgs[1].addr = client->addr;
-+	msgs[1].flags = I2C_M_RD;
-+	msgs[1].len = len;
-+	msgs[1].buf = &data_be_p[4 - len];
-+
-+	ret = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
-+	if (ret != ARRAY_SIZE(msgs))
-+		return -EIO;
-+
-+	*val = be32_to_cpu(data_be);
-+
-+	return 0;
-+}
-+
-+static int ov2311_set_fmt(struct v4l2_subdev *sd,
-+			  struct v4l2_subdev_state *sd_state,
-+			  struct v4l2_subdev_format *fmt)
-+{
-+	struct ov2311 *ov2311 = to_ov2311(sd);
-+	const struct ov2311_mode *mode;
-+	s64 h_blank, vblank_def, pixel_rate;
-+
-+	mutex_lock(&ov2311->mutex);
-+
-+	mode = v4l2_find_nearest_size(supported_modes,
-+				      ARRAY_SIZE(supported_modes),
-+				      width, height,
-+				      fmt->format.width,
-+				      fmt->format.height);
-+	if (fmt->format.code != MEDIA_BUS_FMT_Y8_1X8)
-+		fmt->format.code = MEDIA_BUS_FMT_Y10_1X10;
-+	fmt->format.width = mode->width;
-+	fmt->format.height = mode->height;
-+	fmt->format.field = V4L2_FIELD_NONE;
-+	fmt->format.colorspace = V4L2_COLORSPACE_RAW;
-+	fmt->format.ycbcr_enc =
-+			V4L2_MAP_YCBCR_ENC_DEFAULT(fmt->format.colorspace);
-+	fmt->format.quantization =
-+		V4L2_MAP_QUANTIZATION_DEFAULT(true, fmt->format.colorspace,
-+					      fmt->format.ycbcr_enc);
-+	fmt->format.xfer_func =
-+		V4L2_MAP_XFER_FUNC_DEFAULT(fmt->format.colorspace);
-+
-+	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-+		*v4l2_subdev_get_try_format(sd, sd_state, fmt->pad) =
-+								fmt->format;
-+	} else {
-+		ov2311->cur_mode = mode;
-+		ov2311->code = fmt->format.code;
-+		h_blank = mode->hts_def - mode->width;
-+		__v4l2_ctrl_modify_range(ov2311->hblank, h_blank,
-+					 h_blank, 1, h_blank);
-+		__v4l2_ctrl_s_ctrl(ov2311->hblank, h_blank);
-+		vblank_def = mode->vts_def - mode->height;
-+		__v4l2_ctrl_modify_range(ov2311->vblank, vblank_def,
-+					 OV2311_VTS_MAX - mode->height,
-+					 1, vblank_def);
-+		__v4l2_ctrl_s_ctrl(ov2311->vblank, vblank_def);
-+
-+		pixel_rate = (fmt->format.code == MEDIA_BUS_FMT_Y10_1X10) ?
-+			OV2311_PIXEL_RATE_10BIT : OV2311_PIXEL_RATE_8BIT;
-+		__v4l2_ctrl_modify_range(ov2311->pixel_rate, pixel_rate,
-+					 pixel_rate, 1, pixel_rate);
-+	}
-+
-+	mutex_unlock(&ov2311->mutex);
-+
-+	return 0;
-+}
-+
-+static int ov2311_get_fmt(struct v4l2_subdev *sd,
-+			  struct v4l2_subdev_state *sd_state,
-+			  struct v4l2_subdev_format *fmt)
-+{
-+	struct ov2311 *ov2311 = to_ov2311(sd);
-+	const struct ov2311_mode *mode = ov2311->cur_mode;
-+
-+	mutex_lock(&ov2311->mutex);
-+	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-+		fmt->format = *v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
-+	} else {
-+		fmt->format.width = mode->width;
-+		fmt->format.height = mode->height;
-+		fmt->format.code = ov2311->code;
-+		fmt->format.field = V4L2_FIELD_NONE;
-+		fmt->format.colorspace = V4L2_COLORSPACE_SRGB;
-+		fmt->format.ycbcr_enc =
-+			V4L2_MAP_YCBCR_ENC_DEFAULT(fmt->format.colorspace);
-+		fmt->format.quantization =
-+			V4L2_MAP_QUANTIZATION_DEFAULT(true,
-+						      fmt->format.colorspace,
-+						      fmt->format.ycbcr_enc);
-+		fmt->format.xfer_func =
-+			V4L2_MAP_XFER_FUNC_DEFAULT(fmt->format.colorspace);
-+	}
-+	mutex_unlock(&ov2311->mutex);
-+
-+	return 0;
-+}
-+
-+static int ov2311_enum_mbus_code(struct v4l2_subdev *sd,
-+				 struct v4l2_subdev_state *sd_state,
-+				 struct v4l2_subdev_mbus_code_enum *code)
-+{
-+	switch (code->index) {
-+	default:
-+		return -EINVAL;
-+	case 0:
-+		code->code = MEDIA_BUS_FMT_Y10_1X10;
-+		break;
-+	case 1:
-+		code->code = MEDIA_BUS_FMT_Y8_1X8;
-+		break;
-+	}
-+
-+	return 0;
-+}
-+
-+static int ov2311_enum_frame_sizes(struct v4l2_subdev *sd,
-+				   struct v4l2_subdev_state *sd_state,
-+				   struct v4l2_subdev_frame_size_enum *fse)
-+{
-+	if (fse->index >= ARRAY_SIZE(supported_modes))
-+		return -EINVAL;
-+
-+	if (fse->code != MEDIA_BUS_FMT_Y10_1X10 &&
-+	    fse->code != MEDIA_BUS_FMT_Y8_1X8)
-+		return -EINVAL;
-+
-+	fse->min_width  = supported_modes[fse->index].width;
-+	fse->max_width  = supported_modes[fse->index].width;
-+	fse->max_height = supported_modes[fse->index].height;
-+	fse->min_height = supported_modes[fse->index].height;
-+
-+	return 0;
-+}
-+
-+static int ov2311_enable_test_pattern(struct ov2311 *ov2311, u32 pattern)
-+{
-+	u32 val;
-+
-+	if (pattern)
-+		val = (pattern - 1) | OV2311_TEST_PATTERN_ENABLE;
-+	else
-+		val = OV2311_TEST_PATTERN_DISABLE;
-+
-+	return ov2311_write_reg(ov2311->client, OV2311_REG_TEST_PATTERN,
-+				OV2311_REG_VALUE_08BIT, val);
-+}
-+
-+static const struct v4l2_rect *
-+__ov2311_get_pad_crop(struct ov2311 *ov2311, struct v4l2_subdev_state *sd_state,
-+		      unsigned int pad, enum v4l2_subdev_format_whence which)
-+{
-+	switch (which) {
-+	case V4L2_SUBDEV_FORMAT_TRY:
-+		return v4l2_subdev_get_try_crop(&ov2311->subdev, sd_state, pad);
-+	case V4L2_SUBDEV_FORMAT_ACTIVE:
-+		return &ov2311->cur_mode->crop;
-+	}
-+
-+	return NULL;
-+}
-+
-+static int ov2311_get_selection(struct v4l2_subdev *sd,
-+				struct v4l2_subdev_state *sd_state,
-+				struct v4l2_subdev_selection *sel)
-+{
-+	switch (sel->target) {
-+	case V4L2_SEL_TGT_CROP: {
-+		struct ov2311 *ov2311 = to_ov2311(sd);
-+
-+		mutex_lock(&ov2311->mutex);
-+		sel->r = *__ov2311_get_pad_crop(ov2311, sd_state, sel->pad,
-+						sel->which);
-+		mutex_unlock(&ov2311->mutex);
-+
-+		return 0;
-+	}
-+
-+	case V4L2_SEL_TGT_NATIVE_SIZE:
-+		sel->r.top = 0;
-+		sel->r.left = 0;
-+		sel->r.width = OV2311_NATIVE_WIDTH;
-+		sel->r.height = OV2311_NATIVE_HEIGHT;
-+
-+		return 0;
-+
-+	case V4L2_SEL_TGT_CROP_DEFAULT:
-+	case V4L2_SEL_TGT_CROP_BOUNDS:
-+		sel->r.top = OV2311_PIXEL_ARRAY_TOP;
-+		sel->r.left = OV2311_PIXEL_ARRAY_LEFT;
-+		sel->r.width = OV2311_PIXEL_ARRAY_WIDTH;
-+		sel->r.height = OV2311_PIXEL_ARRAY_HEIGHT;
-+
-+		return 0;
-+	}
-+
-+	return -EINVAL;
-+}
-+
-+static int ov2311_start_stream(struct ov2311 *ov2311)
-+{
-+	int ret;
-+
-+	ret = ov2311_write_array(ov2311->client, ov2311_common_regs);
-+	if (ret)
-+		return ret;
-+
-+	ret = ov2311_write_array(ov2311->client, ov2311->cur_mode->reg_list);
-+	if (ret)
-+		return ret;
-+
-+	if (ov2311->code == MEDIA_BUS_FMT_Y10_1X10)
-+		ret = ov2311_write_array(ov2311->client, op_10bit);
-+	else
-+		ret = ov2311_write_array(ov2311->client, op_8bit);
-+	if (ret)
-+		return ret;
-+
-+	/* In case these controls are set before streaming */
-+	mutex_unlock(&ov2311->mutex);
-+	ret = v4l2_ctrl_handler_setup(&ov2311->ctrl_handler);
-+	mutex_lock(&ov2311->mutex);
-+	if (ret)
-+		return ret;
-+
-+	return ov2311_write_reg(ov2311->client, OV2311_REG_CTRL_MODE,
-+				OV2311_REG_VALUE_08BIT, OV2311_MODE_STREAMING);
-+}
-+
-+static int ov2311_stop_stream(struct ov2311 *ov2311)
-+{
-+	return ov2311_write_reg(ov2311->client, OV2311_REG_CTRL_MODE,
-+				OV2311_REG_VALUE_08BIT, OV2311_MODE_SW_STANDBY);
-+}
-+
-+static int ov2311_s_stream(struct v4l2_subdev *sd, int enable)
-+{
-+	struct ov2311 *ov2311 = to_ov2311(sd);
-+	struct i2c_client *client = ov2311->client;
-+	int ret = 0;
-+
-+	mutex_lock(&ov2311->mutex);
-+	if (ov2311->streaming == enable) {
-+		mutex_unlock(&ov2311->mutex);
-+		return 0;
-+	}
-+
-+	if (enable) {
-+		ret = pm_runtime_resume_and_get(&client->dev);
-+		if (ret < 0)
-+			goto unlock_and_return;
-+
-+		ret = ov2311_start_stream(ov2311);
-+		if (ret) {
-+			v4l2_err(sd, "start stream failed while write regs\n");
-+			pm_runtime_put(&client->dev);
-+			goto unlock_and_return;
-+		}
-+	} else {
-+		ov2311_stop_stream(ov2311);
-+		pm_runtime_put(&client->dev);
-+	}
-+
-+	ov2311->streaming = enable;
-+
-+unlock_and_return:
-+	mutex_unlock(&ov2311->mutex);
-+
-+	return ret;
-+}
-+
-+static int ov2311_power_on(struct device *dev)
-+{
-+	struct v4l2_subdev *sd = dev_get_drvdata(dev);
-+	struct ov2311 *ov2311 = to_ov2311(sd);
-+	int ret;
-+
-+	ret = clk_set_rate(ov2311->xvclk, OV2311_XVCLK_FREQ);
-+	if (ret < 0)
-+		dev_warn(dev, "Failed to set xvclk rate (24MHz)\n");
-+	if (clk_get_rate(ov2311->xvclk) != OV2311_XVCLK_FREQ)
-+		dev_warn(dev, "xvclk mismatched, modes are based on 24MHz - rate is %lu\n",
-+			 clk_get_rate(ov2311->xvclk));
-+
-+	ret = clk_prepare_enable(ov2311->xvclk);
-+	if (ret < 0) {
-+		dev_err(dev, "Failed to enable xvclk\n");
-+		return ret;
-+	}
-+
-+	gpiod_set_value_cansleep(ov2311->reset_gpio, 0);
-+
-+	ret = regulator_bulk_enable(OV2311_NUM_SUPPLIES, ov2311->supplies);
-+	if (ret < 0) {
-+		dev_err(dev, "Failed to enable regulators\n");
-+		goto disable_clk;
-+	}
-+
-+	gpiod_set_value_cansleep(ov2311->reset_gpio, 1);
-+
-+	usleep_range(500, 1000);
-+	gpiod_set_value_cansleep(ov2311->pwdn_gpio, 1);
-+
-+	usleep_range(1000, 2000);
-+
-+	return 0;
-+
-+disable_clk:
-+	clk_disable_unprepare(ov2311->xvclk);
-+
-+	return ret;
-+}
-+
-+static int ov2311_power_off(struct device *dev)
-+{
-+	struct v4l2_subdev *sd = dev_get_drvdata(dev);
-+	struct ov2311 *ov2311 = to_ov2311(sd);
-+
-+	gpiod_set_value_cansleep(ov2311->pwdn_gpio, 0);
-+	clk_disable_unprepare(ov2311->xvclk);
-+	gpiod_set_value_cansleep(ov2311->reset_gpio, 0);
-+	regulator_bulk_disable(OV2311_NUM_SUPPLIES, ov2311->supplies);
-+
-+	return 0;
-+}
-+
-+static int ov2311_runtime_resume(struct device *dev)
-+{
-+	struct v4l2_subdev *sd = dev_get_drvdata(dev);
-+	struct ov2311 *ov2311 = to_ov2311(sd);
-+	int ret;
-+
-+	if (ov2311->streaming) {
-+		ret = ov2311_start_stream(ov2311);
-+		if (ret)
-+			goto error;
-+	}
-+	return 0;
-+
-+error:
-+	ov2311_stop_stream(ov2311);
-+	ov2311->streaming = 0;
-+	return ret;
-+}
-+
-+static int ov2311_runtime_suspend(struct device *dev)
-+{
-+	struct v4l2_subdev *sd = dev_get_drvdata(dev);
-+	struct ov2311 *ov2311 = to_ov2311(sd);
-+
-+	if (ov2311->streaming)
-+		ov2311_stop_stream(ov2311);
-+
-+	return 0;
-+}
-+
-+static int ov2311_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
-+{
-+	struct ov2311 *ov2311 = to_ov2311(sd);
-+	struct v4l2_mbus_framefmt *try_fmt =
-+				v4l2_subdev_get_try_format(sd, fh->state, 0);
-+	const struct ov2311_mode *def_mode = &supported_modes[0];
-+
-+	mutex_lock(&ov2311->mutex);
-+	/* Initialize try_fmt */
-+	try_fmt->width = def_mode->width;
-+	try_fmt->height = def_mode->height;
-+	try_fmt->code = MEDIA_BUS_FMT_Y10_1X10;
-+	try_fmt->field = V4L2_FIELD_NONE;
-+	try_fmt->colorspace = V4L2_COLORSPACE_RAW;
-+	try_fmt->ycbcr_enc = V4L2_MAP_YCBCR_ENC_DEFAULT(try_fmt->colorspace);
-+	try_fmt->quantization =
-+		V4L2_MAP_QUANTIZATION_DEFAULT(true, try_fmt->colorspace,
-+					      try_fmt->ycbcr_enc);
-+	try_fmt->xfer_func = V4L2_MAP_XFER_FUNC_DEFAULT(try_fmt->colorspace);
-+
-+	mutex_unlock(&ov2311->mutex);
-+	/* No crop or compose */
-+
-+	return 0;
-+}
-+
-+static const struct dev_pm_ops ov2311_pm_ops = {
-+	SET_RUNTIME_PM_OPS(ov2311_runtime_suspend, ov2311_runtime_resume, NULL)
-+	SET_RUNTIME_PM_OPS(ov2311_power_off, ov2311_power_on, NULL)
-+};
-+
-+static const struct v4l2_subdev_internal_ops ov2311_internal_ops = {
-+	.open = ov2311_open,
-+};
-+
-+static const struct v4l2_subdev_core_ops ov2311_core_ops = {
-+	.subscribe_event = v4l2_ctrl_subdev_subscribe_event,
-+	.unsubscribe_event = v4l2_event_subdev_unsubscribe,
-+};
-+
-+static const struct v4l2_subdev_video_ops ov2311_video_ops = {
-+	.s_stream = ov2311_s_stream,
-+};
-+
-+static const struct v4l2_subdev_pad_ops ov2311_pad_ops = {
-+	.enum_mbus_code = ov2311_enum_mbus_code,
-+	.enum_frame_size = ov2311_enum_frame_sizes,
-+	.get_fmt = ov2311_get_fmt,
-+	.set_fmt = ov2311_set_fmt,
-+	.get_selection = ov2311_get_selection,
-+};
-+
-+static const struct v4l2_subdev_ops ov2311_subdev_ops = {
-+	.core	= &ov2311_core_ops,
-+	.video	= &ov2311_video_ops,
-+	.pad	= &ov2311_pad_ops,
-+};
-+
-+static int ov2311_set_ctrl(struct v4l2_ctrl *ctrl)
-+{
-+	struct ov2311 *ov2311 = container_of(ctrl->handler,
-+					     struct ov2311, ctrl_handler);
-+	struct i2c_client *client = ov2311->client;
-+	s64 max;
-+	int ret = 0;
-+
-+	/* Propagate change of current control to all related controls */
-+	switch (ctrl->id) {
-+	case V4L2_CID_VBLANK:
-+		/* Update max exposure while meeting expected vblanking */
-+		max = ov2311->cur_mode->height + ctrl->val - 4;
-+		__v4l2_ctrl_modify_range(ov2311->exposure,
-+					 ov2311->exposure->minimum, max,
-+					 ov2311->exposure->step,
-+					 ov2311->exposure->default_value);
-+		break;
-+	}
-+
-+	if (pm_runtime_get(&client->dev) <= 0)
-+		return 0;
-+
-+	switch (ctrl->id) {
-+	case V4L2_CID_EXPOSURE:
-+		ret = ov2311_write_reg(ov2311->client, OV2311_REG_EXPOSURE,
-+				       OV2311_REG_VALUE_16BIT, ctrl->val);
-+		break;
-+	case V4L2_CID_ANALOGUE_GAIN:
-+		ret = ov2311_write_reg(ov2311->client, OV2311_REG_GAIN_H,
-+				       OV2311_REG_VALUE_08BIT,
-+				       (ctrl->val >> OV2311_GAIN_H_SHIFT) &
-+							OV2311_GAIN_H_MASK);
-+		ret |= ov2311_write_reg(ov2311->client, OV2311_REG_GAIN_L,
-+				       OV2311_REG_VALUE_08BIT,
-+				       ctrl->val & OV2311_GAIN_L_MASK);
-+		break;
-+	case V4L2_CID_VBLANK:
-+		ret = ov2311_write_reg(ov2311->client, OV2311_REG_VTS,
-+				       OV2311_REG_VALUE_16BIT,
-+				       ctrl->val + ov2311->cur_mode->height);
-+		break;
-+	case V4L2_CID_TEST_PATTERN:
-+		ret = ov2311_enable_test_pattern(ov2311, ctrl->val);
-+		break;
-+	case V4L2_CID_HFLIP:
-+		ret = ov2311_write_reg(ov2311->client, OV2311_REG_H_FLIP,
-+				       OV2311_REG_VALUE_08BIT,
-+				       ctrl->val ? OV2311_FLIP_BIT : 0);
-+		break;
-+	case V4L2_CID_VFLIP:
-+		ret = ov2311_write_reg(ov2311->client, OV2311_REG_V_FLIP,
-+				       OV2311_REG_VALUE_08BIT,
-+				       ctrl->val ? OV2311_FLIP_BIT : 0);
-+		break;
-+	default:
-+		dev_warn(&client->dev, "%s Unhandled id:0x%x, val:0x%x\n",
-+			 __func__, ctrl->id, ctrl->val);
-+		break;
-+	}
-+
-+	pm_runtime_put(&client->dev);
-+
-+	return ret;
-+}
-+
-+static const struct v4l2_ctrl_ops ov2311_ctrl_ops = {
-+	.s_ctrl = ov2311_set_ctrl,
-+};
-+
-+static int ov2311_initialize_controls(struct ov2311 *ov2311)
-+{
-+	struct v4l2_fwnode_device_properties props;
-+	const struct ov2311_mode *mode;
-+	struct v4l2_ctrl_handler *handler;
-+	struct v4l2_ctrl *ctrl;
-+	s64 exposure_max, vblank_def;
-+	u32 h_blank;
-+	int ret;
-+
-+	handler = &ov2311->ctrl_handler;
-+	mode = ov2311->cur_mode;
-+	ret = v4l2_ctrl_handler_init(handler, 11);
-+	if (ret)
-+		return ret;
-+	handler->lock = &ov2311->mutex;
-+
-+	ctrl = v4l2_ctrl_new_int_menu(handler, NULL, V4L2_CID_LINK_FREQ,
-+				      0, 0, link_freq_menu_items);
-+	if (ctrl)
-+		ctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY;
-+
-+	ov2311->pixel_rate = v4l2_ctrl_new_std(handler, NULL,
-+					       V4L2_CID_PIXEL_RATE,
-+					       OV2311_PIXEL_RATE_10BIT,
-+					       OV2311_PIXEL_RATE_10BIT, 1,
-+					       OV2311_PIXEL_RATE_10BIT);
-+
-+	h_blank = mode->hts_def - mode->width;
-+	ov2311->hblank = v4l2_ctrl_new_std(handler, NULL, V4L2_CID_HBLANK,
-+					   h_blank, h_blank, 1, h_blank);
-+	if (ov2311->hblank)
-+		ov2311->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
-+
-+	vblank_def = mode->vts_def - mode->height;
-+	ov2311->vblank = v4l2_ctrl_new_std(handler, &ov2311_ctrl_ops,
-+					   V4L2_CID_VBLANK, vblank_def,
-+					   OV2311_VTS_MAX - mode->height, 1,
-+					   vblank_def);
-+
-+	exposure_max = mode->vts_def - 4;
-+	ov2311->exposure = v4l2_ctrl_new_std(handler, &ov2311_ctrl_ops,
-+					     V4L2_CID_EXPOSURE,
-+					     OV2311_EXPOSURE_MIN, exposure_max,
-+					     OV2311_EXPOSURE_STEP,
-+					     mode->exp_def);
-+
-+	v4l2_ctrl_new_std(handler, &ov2311_ctrl_ops, V4L2_CID_ANALOGUE_GAIN,
-+			  OV2311_GAIN_MIN, OV2311_GAIN_MAX, OV2311_GAIN_STEP,
-+			  OV2311_GAIN_DEFAULT);
-+
-+	v4l2_ctrl_new_std_menu_items(handler, &ov2311_ctrl_ops,
-+				     V4L2_CID_TEST_PATTERN,
-+				     ARRAY_SIZE(ov2311_test_pattern_menu) - 1,
-+				     0, 0, ov2311_test_pattern_menu);
-+
-+	v4l2_ctrl_new_std(handler, &ov2311_ctrl_ops,
-+			  V4L2_CID_HFLIP, 0, 1, 1, 0);
-+
-+	v4l2_ctrl_new_std(handler, &ov2311_ctrl_ops,
-+			  V4L2_CID_VFLIP, 0, 1, 1, 0);
-+
-+	ret = v4l2_fwnode_device_parse(&ov2311->client->dev, &props);
-+	if (ret)
-+		goto err_free_handler;
-+
-+	ret = v4l2_ctrl_new_fwnode_properties(handler, &ov2311_ctrl_ops,
-+					      &props);
-+	if (ret)
-+		goto err_free_handler;
-+
-+	if (handler->error) {
-+		ret = handler->error;
-+		dev_err(&ov2311->client->dev,
-+			"Failed to init controls(%d)\n", ret);
-+		goto err_free_handler;
-+	}
-+
-+	ov2311->subdev.ctrl_handler = handler;
-+
-+	return 0;
-+
-+err_free_handler:
-+	v4l2_ctrl_handler_free(handler);
-+
-+	return ret;
-+}
-+
-+static int ov2311_check_sensor_id(struct ov2311 *ov2311,
-+				  struct i2c_client *client)
-+{
-+	struct device *dev = &ov2311->client->dev;
-+	u32 id = 0, id_msb;
-+	int ret;
-+
-+	ret = ov2311_read_reg(client, OV2311_REG_CHIP_ID + 1,
-+			      OV2311_REG_VALUE_08BIT, &id);
-+	if (!ret)
-+		ret = ov2311_read_reg(client, OV2311_REG_CHIP_ID,
-+				      OV2311_REG_VALUE_08BIT, &id_msb);
-+	id |= (id_msb << 8);
-+	if (ret || id != CHIP_ID) {
-+		dev_err(dev, "Unexpected sensor id(%04x), ret(%d)\n", id, ret);
-+		return -ENODEV;
-+	}
-+
-+	dev_info(dev, "Detected OV%06x sensor\n", CHIP_ID);
-+
-+	return 0;
-+}
-+
-+static int ov2311_configure_regulators(struct ov2311 *ov2311)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < OV2311_NUM_SUPPLIES; i++)
-+		ov2311->supplies[i].supply = ov2311_supply_names[i];
-+
-+	return devm_regulator_bulk_get(&ov2311->client->dev,
-+				       OV2311_NUM_SUPPLIES,
-+				       ov2311->supplies);
-+}
-+
-+static int ov2311_probe(struct i2c_client *client,
-+			const struct i2c_device_id *id)
-+{
-+	struct device *dev = &client->dev;
-+	struct ov2311 *ov2311;
-+	struct v4l2_subdev *sd;
-+	int ret;
-+
-+	ov2311 = devm_kzalloc(dev, sizeof(*ov2311), GFP_KERNEL);
-+	if (!ov2311)
-+		return -ENOMEM;
-+
-+	ov2311->client = client;
-+	ov2311->cur_mode = &supported_modes[0];
-+
-+	ov2311->xvclk = devm_clk_get(dev, "xvclk");
-+	if (IS_ERR(ov2311->xvclk)) {
-+		dev_err(dev, "Failed to get xvclk\n");
-+		return -EINVAL;
-+	}
-+
-+	ov2311->reset_gpio = devm_gpiod_get_optional(dev, "reset",
-+						     GPIOD_OUT_LOW);
-+	if (IS_ERR(ov2311->reset_gpio))
-+		dev_warn(dev, "Failed to get reset-gpios\n");
-+
-+	ov2311->pwdn_gpio = devm_gpiod_get_optional(dev, "pwdn", GPIOD_OUT_LOW);
-+	if (IS_ERR(ov2311->pwdn_gpio))
-+		dev_warn(dev, "Failed to get pwdn-gpios\n");
-+
-+	ret = ov2311_configure_regulators(ov2311);
-+	if (ret) {
-+		dev_err(dev, "Failed to get power regulators\n");
-+		return ret;
-+	}
-+
-+	mutex_init(&ov2311->mutex);
-+
-+	sd = &ov2311->subdev;
-+	v4l2_i2c_subdev_init(sd, client, &ov2311_subdev_ops);
-+	ret = ov2311_initialize_controls(ov2311);
-+	if (ret)
-+		goto err_destroy_mutex;
-+
-+	ret = ov2311_power_on(&client->dev);
-+	if (ret)
-+		goto err_free_handler;
-+
-+	ret = ov2311_check_sensor_id(ov2311, client);
-+	if (ret)
-+		goto err_power_off;
-+
-+	sd->internal_ops = &ov2311_internal_ops;
-+	sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
-+
-+	ov2311->pad.flags = MEDIA_PAD_FL_SOURCE;
-+	sd->entity.function = MEDIA_ENT_F_CAM_SENSOR;
-+	ret = media_entity_pads_init(&sd->entity, 1, &ov2311->pad);
-+	if (ret < 0)
-+		goto err_power_off;
-+
-+	ret = v4l2_async_register_subdev(sd);
-+	if (ret) {
-+		dev_err(dev, "v4l2 async register subdev failed\n");
-+		goto err_clean_entity;
-+	}
-+
-+	pm_runtime_set_active(dev);
-+	pm_runtime_enable(dev);
-+	pm_runtime_idle(dev);
-+
-+	return 0;
-+
-+err_clean_entity:
-+	media_entity_cleanup(&sd->entity);
-+err_power_off:
-+	ov2311_power_off(&client->dev);
-+err_free_handler:
-+	v4l2_ctrl_handler_free(&ov2311->ctrl_handler);
-+err_destroy_mutex:
-+	mutex_destroy(&ov2311->mutex);
-+
-+	return ret;
-+}
-+
-+static void ov2311_remove(struct i2c_client *client)
-+{
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct ov2311 *ov2311 = to_ov2311(sd);
-+
-+	v4l2_async_unregister_subdev(sd);
-+	media_entity_cleanup(&sd->entity);
-+	v4l2_ctrl_handler_free(&ov2311->ctrl_handler);
-+	mutex_destroy(&ov2311->mutex);
-+
-+	pm_runtime_disable(&client->dev);
-+	if (!pm_runtime_status_suspended(&client->dev))
-+		ov2311_power_off(&client->dev);
-+	pm_runtime_set_suspended(&client->dev);
-+}
-+
-+static const struct of_device_id ov2311_of_match[] = {
-+	{ .compatible = "ovti,ov2311" },
-+	{},
-+};
-+MODULE_DEVICE_TABLE(of, ov2311_of_match);
-+
-+static const struct i2c_device_id ov2311_match_id[] = {
-+	{ "ovti,ov2311", 0 },
-+	{ },
-+};
-+
-+static struct i2c_driver ov2311_i2c_driver = {
-+	.driver = {
-+		.name = OV2311_NAME,
-+		.pm = &ov2311_pm_ops,
-+		.of_match_table = of_match_ptr(ov2311_of_match),
-+	},
-+	.probe		= &ov2311_probe,
-+	.remove		= &ov2311_remove,
-+	.id_table	= ov2311_match_id,
-+};
-+
-+module_i2c_driver(ov2311_i2c_driver);
-+
-+MODULE_AUTHOR("Dave Stevenson <dave.stevenson@raspberrypi.com");
-+MODULE_DESCRIPTION("OmniVision OV2311 sensor driver");
-+MODULE_LICENSE("GPL v2");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0394-staging-vc04_services-isp-Permit-all-sRGB-colour-spa.patch b/target/linux/bcm27xx/patches-6.1/950-0394-staging-vc04_services-isp-Permit-all-sRGB-colour-spa.patch
deleted file mode 100644
index a2daffe359..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0394-staging-vc04_services-isp-Permit-all-sRGB-colour-spa.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From 429c4f01eeb8485cf35df0a1c077a66a7cd0a53e Mon Sep 17 00:00:00 2001
-From: David Plowman <david.plowman@raspberrypi.com>
-Date: Wed, 2 Mar 2022 16:47:37 +0000
-Subject: [PATCH] staging: vc04_services: isp: Permit all sRGB colour
- spaces on ISP outputs
-
-ISP outputs actually support all colour spaces that are fundamentally
-sRGB underneath, regardless of whether an RGB or YUV output format is
-actually requested.
-
-Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
----
- .../bcm2835-isp/bcm2835-isp-fmts.h            | 45 ++++++++++---------
- 1 file changed, 25 insertions(+), 20 deletions(-)
-
---- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h
-+++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h
-@@ -34,14 +34,19 @@ struct bcm2835_isp_fmt {
- #define V4L2_COLORSPACE_MASK_RAW V4L2_COLORSPACE_MASK(V4L2_COLORSPACE_RAW)
- 
- /*
-- * The colour spaces we support for YUV outputs. SRGB features here because,
-- * once you assign the default transfer func and so on, it and JPEG effectively
-- * mean the same.
-+ * All three colour spaces JPEG, SMPTE170M and REC709 are fundamentally sRGB
-+ * underneath (as near as makes no difference to us), just with different YCbCr
-+ * encodings. Therefore the ISP can generate sRGB on its main output and any of
-+ * the others on its low resolution output. Applications should, when using both
-+ * outputs, program the colour spaces on them to be the same, matching whatever
-+ * is requested for the low resolution output, even if the main output is
-+ * producing an RGB format. In turn this requires us to allow all these colour
-+ * spaces for every YUV/RGB output format.
-  */
--#define V4L2_COLORSPACE_MASK_YUV (V4L2_COLORSPACE_MASK_JPEG | \
--				  V4L2_COLORSPACE_MASK_SRGB | \
--				  V4L2_COLORSPACE_MASK_SMPTE170M | \
--				  V4L2_COLORSPACE_MASK_REC709)
-+#define V4L2_COLORSPACE_MASK_ALL_SRGB (V4L2_COLORSPACE_MASK_JPEG |	\
-+				       V4L2_COLORSPACE_MASK_SRGB |	\
-+				       V4L2_COLORSPACE_MASK_SMPTE170M |	\
-+				       V4L2_COLORSPACE_MASK_REC709)
- 
- static const struct bcm2835_isp_fmt supported_formats[] = {
- 	{
-@@ -51,7 +56,7 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 64,
- 		.mmal_fmt	    = MMAL_ENCODING_I420,
- 		.size_multiplier_x2 = 3,
--		.colorspace_mask    = V4L2_COLORSPACE_MASK_YUV,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
- 		.colorspace_default = V4L2_COLORSPACE_JPEG,
- 		.step_size	    = 2,
- 	}, {
-@@ -60,7 +65,7 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 64,
- 		.mmal_fmt	    = MMAL_ENCODING_YV12,
- 		.size_multiplier_x2 = 3,
--		.colorspace_mask    = V4L2_COLORSPACE_MASK_YUV,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
- 		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
- 		.step_size	    = 2,
- 	}, {
-@@ -69,7 +74,7 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_NV12,
- 		.size_multiplier_x2 = 3,
--		.colorspace_mask    = V4L2_COLORSPACE_MASK_YUV,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
- 		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
- 		.step_size	    = 2,
- 	}, {
-@@ -78,7 +83,7 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_NV21,
- 		.size_multiplier_x2 = 3,
--		.colorspace_mask    = V4L2_COLORSPACE_MASK_YUV,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
- 		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
- 		.step_size	    = 2,
- 	}, {
-@@ -87,7 +92,7 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 64,
- 		.mmal_fmt	    = MMAL_ENCODING_YUYV,
- 		.size_multiplier_x2 = 2,
--		.colorspace_mask    = V4L2_COLORSPACE_MASK_YUV,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
- 		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
- 		.step_size	    = 2,
- 	}, {
-@@ -96,7 +101,7 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 64,
- 		.mmal_fmt	    = MMAL_ENCODING_UYVY,
- 		.size_multiplier_x2 = 2,
--		.colorspace_mask    = V4L2_COLORSPACE_MASK_YUV,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
- 		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
- 		.step_size	    = 2,
- 	}, {
-@@ -105,7 +110,7 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 64,
- 		.mmal_fmt	    = MMAL_ENCODING_YVYU,
- 		.size_multiplier_x2 = 2,
--		.colorspace_mask    = V4L2_COLORSPACE_MASK_YUV,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
- 		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
- 		.step_size	    = 2,
- 	}, {
-@@ -114,7 +119,7 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 64,
- 		.mmal_fmt	    = MMAL_ENCODING_VYUY,
- 		.size_multiplier_x2 = 2,
--		.colorspace_mask    = V4L2_COLORSPACE_MASK_YUV,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
- 		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
- 		.step_size	    = 2,
- 	}, {
-@@ -124,7 +129,7 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_RGB24,
- 		.size_multiplier_x2 = 2,
--		.colorspace_mask    = V4L2_COLORSPACE_MASK_SRGB,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
- 		.colorspace_default = V4L2_COLORSPACE_SRGB,
- 		.step_size	    = 1,
- 	}, {
-@@ -133,7 +138,7 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_RGB16,
- 		.size_multiplier_x2 = 2,
--		.colorspace_mask    = V4L2_COLORSPACE_MASK_SRGB,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
- 		.colorspace_default = V4L2_COLORSPACE_SRGB,
- 		.step_size	    = 1,
- 	}, {
-@@ -142,7 +147,7 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 32,
- 		.mmal_fmt	    = MMAL_ENCODING_BGR24,
- 		.size_multiplier_x2 = 2,
--		.colorspace_mask    = V4L2_COLORSPACE_MASK_SRGB,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
- 		.colorspace_default = V4L2_COLORSPACE_SRGB,
- 		.step_size	    = 1,
- 	}, {
-@@ -151,7 +156,7 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 64,
- 		.mmal_fmt	    = MMAL_ENCODING_BGRA,
- 		.size_multiplier_x2 = 2,
--		.colorspace_mask    = V4L2_COLORSPACE_MASK_SRGB,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
- 		.colorspace_default = V4L2_COLORSPACE_SRGB,
- 		.step_size	    = 1,
- 	}, {
-@@ -160,7 +165,7 @@ static const struct bcm2835_isp_fmt supp
- 		.bytesperline_align = 64,
- 		.mmal_fmt	    = MMAL_ENCODING_RGBA,
- 		.size_multiplier_x2 = 2,
--		.colorspace_mask    = V4L2_COLORSPACE_MASK_SRGB,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
- 		.colorspace_default = V4L2_COLORSPACE_SRGB,
- 		.step_size	    = 1,
- 	}, {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0395-drivers-staging-bcm2835-isp-Do-not-cleanup-mmal-vcsm.patch b/target/linux/bcm27xx/patches-6.1/950-0395-drivers-staging-bcm2835-isp-Do-not-cleanup-mmal-vcsm.patch
deleted file mode 100644
index bc8a08afd3..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0395-drivers-staging-bcm2835-isp-Do-not-cleanup-mmal-vcsm.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 503fc3bae65b74555d0836871a77163f1ea903dc Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Thu, 3 Mar 2022 16:45:53 +0000
-Subject: [PATCH] drivers: staging: bcm2835-isp: Do not cleanup mmal
- vcsm buffer on stop_streaming
-
-On stop_streaming() the vcsm buffer handle gets released by the buffer cleanup
-code.  This will subsequently cause and error if userland re-queues the same
-buffer on the next start_streaming() call.
-
-Remove this cleanup code and rely on the vb2_ops->buf_cleanup() call to do the
-cleanups instead.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- .../staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c | 9 ---------
- 1 file changed, 9 deletions(-)
-
---- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-+++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-@@ -624,7 +624,6 @@ static void bcm2835_isp_node_stop_stream
- {
- 	struct bcm2835_isp_node *node = vb2_get_drv_priv(q);
- 	struct bcm2835_isp_dev *dev = node_get_dev(node);
--	unsigned int i;
- 	int ret;
- 
- 	v4l2_dbg(1, debug, &dev->v4l2_dev, "%s: node %s[%d], mmal port %p\n",
-@@ -655,14 +654,6 @@ static void bcm2835_isp_node_stop_stream
- 		}
- 	}
- 
--	/* Release the VCSM handle here to release the associated dmabuf */
--	for (i = 0; i < q->num_buffers; i++) {
--		struct vb2_v4l2_buffer *vb2 = to_vb2_v4l2_buffer(q->bufs[i]);
--		struct bcm2835_isp_buffer *buf =
--			container_of(vb2, struct bcm2835_isp_buffer, vb);
--		bcm2835_isp_mmal_buf_cleanup(&buf->mmal);
--	}
--
- 	atomic_dec(&dev->num_streaming);
- 	/* If all ports disabled, then disable the component */
- 	if (atomic_read(&dev->num_streaming) == 0) {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0396-dt-bindings-media-i2c-Add-binding-for-ad5398-VCM.patch b/target/linux/bcm27xx/patches-6.1/950-0396-dt-bindings-media-i2c-Add-binding-for-ad5398-VCM.patch
deleted file mode 100644
index 09b52545a4..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0396-dt-bindings-media-i2c-Add-binding-for-ad5398-VCM.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From f9517de50bf99b3e9325bf416db6082aeaa94bd5 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 29 Sep 2021 12:33:35 +0100
-Subject: [PATCH] dt-bindings: media: i2c: Add binding for ad5398 VCM
-
-Add a binding for Analog Devices AD5398 10bit current
-sinking DAC when used as a lens VCM driver.
-
-FIXME: Convert to YAML
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../devicetree/bindings/media/i2c/ad5398.txt  | 20 +++++++++++++++++++
- 1 file changed, 20 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/media/i2c/ad5398.txt
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/media/i2c/ad5398.txt
-@@ -0,0 +1,20 @@
-+* Analog Devices AD5398 autofocus coil
-+
-+Required Properties:
-+
-+  - compatible: Must contain one of:
-+		- "adi,ad5398"
-+
-+  - reg: I2C slave address
-+
-+  - VANA-supply: supply of voltage for VANA pin
-+
-+Example:
-+
-+       ad5398: coil@c {
-+               compatible = "adi,ad5398";
-+               reg = <0x0c>;
-+
-+               VANA-supply = <&vaux4>;
-+       };
-+
diff --git a/target/linux/bcm27xx/patches-6.1/950-0397-media-i2c-Add-driver-for-AD5398-VCM-lens-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0397-media-i2c-Add-driver-for-AD5398-VCM-lens-driver.patch
deleted file mode 100644
index 00420b044c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0397-media-i2c-Add-driver-for-AD5398-VCM-lens-driver.patch
+++ /dev/null
@@ -1,387 +0,0 @@
-From 099c31b8568b7e8c11e57ffced2da1cbccbfbcad Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 29 Sep 2021 14:04:28 +0100
-Subject: [PATCH] media: i2c: Add driver for AD5398 VCM lens driver
-
-Adds a driver for the Analog Devices AD5398 10 bit
-I2C DAC which is commonly used for driving VCM lens
-mechanisms.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/i2c/Kconfig  |   7 +
- drivers/media/i2c/Makefile |   1 +
- drivers/media/i2c/ad5398.c | 341 +++++++++++++++++++++++++++++++++++++
- 3 files changed, 349 insertions(+)
- create mode 100644 drivers/media/i2c/ad5398.c
-
---- a/drivers/media/i2c/Kconfig
-+++ b/drivers/media/i2c/Kconfig
-@@ -817,6 +817,13 @@ endif
- menu "Lens drivers"
- 	visible if MEDIA_CAMERA_SUPPORT
- 
-+config VIDEO_AD5398
-+	tristate "AD5398 lens voice coil support"
-+	depends on GPIOLIB && I2C && VIDEO_DEV
-+	select MEDIA_CONTROLLER
-+	help
-+	  This is a driver for the AD5398 camera lens voice coil.
-+
- config VIDEO_AD5820
- 	tristate "AD5820 lens voice coil support"
- 	depends on GPIOLIB && I2C && VIDEO_DEV
---- a/drivers/media/i2c/Makefile
-+++ b/drivers/media/i2c/Makefile
-@@ -3,6 +3,7 @@
- msp3400-objs	:=	msp3400-driver.o msp3400-kthreads.o
- 
- obj-$(CONFIG_SDR_MAX2175) += max2175.o
-+obj-$(CONFIG_VIDEO_AD5398)  += ad5398.o
- obj-$(CONFIG_VIDEO_AD5820) += ad5820.o
- obj-$(CONFIG_VIDEO_AD9389B) += ad9389b.o
- obj-$(CONFIG_VIDEO_ADP1653) += adp1653.o
---- /dev/null
-+++ b/drivers/media/i2c/ad5398.c
-@@ -0,0 +1,341 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+/*
-+ * AD5398 DAC driver for camera voice coil focus.
-+ * Copyright (C) 2021 Raspberry Pi (Trading) Ltd.
-+ *
-+ * Based on AD5820 DAC driver by Nokia and TI.
-+ *
-+ * This driver uses the regulator framework notification hooks on the
-+ * assumption that the VCM and sensor share a regulator. This means the VCM
-+ * position will be restored when either the sensor or VCM subdevices are opened
-+ * or powered up. The client can therefore choose to ignore the VCM subdevice,
-+ * and the lens position will be as previously requested. Without that, there
-+ * is a hard requirement to have the VCM subdevice open in order for the VCM
-+ * to be powered and at the requested position.
-+ */
-+
-+#include <linux/errno.h>
-+#include <linux/i2c.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/regulator/consumer.h>
-+#include <linux/gpio/consumer.h>
-+
-+#include <media/v4l2-ctrls.h>
-+#include <media/v4l2-device.h>
-+#include <media/v4l2-subdev.h>
-+
-+/* Register definitions */
-+#define AD5398_POWER_DOWN		BIT(15)
-+#define AD5398_DAC_SHIFT		4
-+
-+#define to_ad5398_device(sd)	container_of(sd, struct ad5398_device, subdev)
-+
-+struct ad5398_device {
-+	struct v4l2_subdev subdev;
-+	struct ad5398_platform_data *platform_data;
-+	struct regulator *vana;
-+	struct notifier_block nb;
-+
-+	struct v4l2_ctrl_handler ctrls;
-+	u32 focus_absolute;
-+
-+	bool standby;
-+};
-+
-+static int ad5398_write(struct ad5398_device *coil, u16 data)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&coil->subdev);
-+	struct i2c_msg msg;
-+	__be16 be_data;
-+	int r;
-+
-+	if (!client->adapter)
-+		return -ENODEV;
-+
-+	be_data = cpu_to_be16(data);
-+	msg.addr  = client->addr;
-+	msg.flags = 0;
-+	msg.len   = 2;
-+	msg.buf   = (u8 *)&be_data;
-+
-+	r = i2c_transfer(client->adapter, &msg, 1);
-+	if (r < 0) {
-+		dev_err(&client->dev, "write failed, error %d\n", r);
-+		return r;
-+	}
-+
-+	return 0;
-+}
-+
-+/*
-+ * Calculate status word and write it to the device based on current
-+ * values of V4L2 controls. It is assumed that the stored V4L2 control
-+ * values are properly limited and rounded.
-+ */
-+static int ad5398_update_hw(struct ad5398_device *coil)
-+{
-+	u16 status;
-+
-+	status = coil->focus_absolute << AD5398_DAC_SHIFT;
-+
-+	if (coil->standby)
-+		status |= AD5398_POWER_DOWN;
-+
-+	return ad5398_write(coil, status);
-+}
-+
-+/*
-+ * Power handling
-+ */
-+static int ad5398_power_off(struct ad5398_device *coil)
-+{
-+	int ret = 0;
-+
-+	coil->standby = true;
-+	ret = ad5398_update_hw(coil);
-+
-+	return ret;
-+}
-+
-+static int ad5398_power_on(struct ad5398_device *coil)
-+{
-+	int ret;
-+
-+	/* Restore the hardware settings. */
-+	coil->standby = false;
-+	ret = ad5398_update_hw(coil);
-+	if (ret)
-+		goto fail;
-+
-+	return 0;
-+
-+fail:
-+	coil->standby = true;
-+
-+	return ret;
-+}
-+
-+/*
-+ * V4L2 controls
-+ */
-+static int ad5398_set_ctrl(struct v4l2_ctrl *ctrl)
-+{
-+	struct ad5398_device *coil =
-+		container_of(ctrl->handler, struct ad5398_device, ctrls);
-+
-+	switch (ctrl->id) {
-+	case V4L2_CID_FOCUS_ABSOLUTE:
-+		coil->focus_absolute = ctrl->val;
-+		return ad5398_update_hw(coil);
-+	}
-+
-+	return 0;
-+}
-+
-+static const struct v4l2_ctrl_ops ad5398_ctrl_ops = {
-+	.s_ctrl = ad5398_set_ctrl,
-+};
-+
-+static int ad5398_init_controls(struct ad5398_device *coil)
-+{
-+	v4l2_ctrl_handler_init(&coil->ctrls, 1);
-+
-+	/*
-+	 * V4L2_CID_FOCUS_ABSOLUTE
-+	 *
-+	 * Minimum current is 0 mA, maximum is 120 mA. Thus, 1 code is
-+	 * equivalent to 120/1023 = 0.1173 mA. Nevertheless, we do not use [mA]
-+	 * for focus position, because it is meaningless for user. Meaningful
-+	 * would be to use focus distance or even its inverse, but since the
-+	 * driver doesn't have sufficient knowledge to do the conversion, we
-+	 * will just use abstract codes here. In any case, smaller value = focus
-+	 * position farther from camera. The default zero value means focus at
-+	 * infinity, and also least current consumption.
-+	 */
-+	v4l2_ctrl_new_std(&coil->ctrls, &ad5398_ctrl_ops,
-+			  V4L2_CID_FOCUS_ABSOLUTE, 0, 1023, 1, 0);
-+
-+	if (coil->ctrls.error)
-+		return coil->ctrls.error;
-+
-+	coil->focus_absolute = 0;
-+
-+	coil->subdev.ctrl_handler = &coil->ctrls;
-+
-+	return 0;
-+}
-+
-+/*
-+ * V4L2 subdev operations
-+ */
-+static int ad5398_registered(struct v4l2_subdev *subdev)
-+{
-+	struct ad5398_device *coil = to_ad5398_device(subdev);
-+
-+	return ad5398_init_controls(coil);
-+}
-+
-+static int
-+ad5398_set_power(struct v4l2_subdev *subdev, int on)
-+{
-+	struct ad5398_device *coil = to_ad5398_device(subdev);
-+	int ret;
-+
-+	if (on)
-+		ret = regulator_enable(coil->vana);
-+	else
-+		ret = regulator_disable(coil->vana);
-+
-+	return ret;
-+}
-+
-+static int ad5398_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
-+{
-+	struct ad5398_device *coil = to_ad5398_device(sd);
-+
-+	return regulator_enable(coil->vana);
-+}
-+
-+static int ad5398_close(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
-+{
-+	struct ad5398_device *coil = to_ad5398_device(sd);
-+
-+	return regulator_disable(coil->vana);
-+}
-+
-+static const struct v4l2_subdev_core_ops ad5398_core_ops = {
-+	.s_power = ad5398_set_power,
-+};
-+
-+static const struct v4l2_subdev_ops ad5398_ops = {
-+	.core = &ad5398_core_ops,
-+};
-+
-+static const struct v4l2_subdev_internal_ops ad5398_internal_ops = {
-+	.registered = ad5398_registered,
-+	.open = ad5398_open,
-+	.close = ad5398_close,
-+};
-+
-+/*
-+ * I2C driver
-+ */
-+static int __maybe_unused ad5398_suspend(struct device *dev)
-+{
-+	struct i2c_client *client = container_of(dev, struct i2c_client, dev);
-+	struct v4l2_subdev *subdev = i2c_get_clientdata(client);
-+	struct ad5398_device *coil = to_ad5398_device(subdev);
-+
-+	return regulator_enable(coil->vana);
-+}
-+
-+static int __maybe_unused ad5398_resume(struct device *dev)
-+{
-+	struct i2c_client *client = container_of(dev, struct i2c_client, dev);
-+	struct v4l2_subdev *subdev = i2c_get_clientdata(client);
-+	struct ad5398_device *coil = to_ad5398_device(subdev);
-+
-+	return regulator_disable(coil->vana);
-+}
-+
-+static int ad5398_regulator_notifier(struct notifier_block *nb,
-+				     unsigned long event,
-+				     void *ignored)
-+{
-+	struct ad5398_device *coil = container_of(nb, struct ad5398_device, nb);
-+
-+	if (event == REGULATOR_EVENT_ENABLE)
-+		ad5398_power_on(coil);
-+	else if (event == REGULATOR_EVENT_PRE_DISABLE)
-+		ad5398_power_off(coil);
-+
-+	return NOTIFY_OK;
-+}
-+
-+static int ad5398_probe(struct i2c_client *client,
-+			const struct i2c_device_id *devid)
-+{
-+	struct ad5398_device *coil;
-+	int ret;
-+
-+	coil = devm_kzalloc(&client->dev, sizeof(*coil), GFP_KERNEL);
-+	if (!coil)
-+		return -ENOMEM;
-+
-+	coil->vana = devm_regulator_get(&client->dev, "VANA");
-+	if (IS_ERR(coil->vana)) {
-+		ret = PTR_ERR(coil->vana);
-+		if (ret != -EPROBE_DEFER)
-+			dev_err(&client->dev, "could not get regulator for vana\n");
-+		return ret;
-+	}
-+
-+	v4l2_i2c_subdev_init(&coil->subdev, client, &ad5398_ops);
-+	coil->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
-+	coil->subdev.internal_ops = &ad5398_internal_ops;
-+	coil->subdev.entity.function = MEDIA_ENT_F_LENS;
-+	strscpy(coil->subdev.name, "ad5398 focus", sizeof(coil->subdev.name));
-+
-+	coil->nb.notifier_call = &ad5398_regulator_notifier;
-+	ret = regulator_register_notifier(coil->vana, &coil->nb);
-+	if (ret < 0)
-+		return ret;
-+
-+	ret = media_entity_pads_init(&coil->subdev.entity, 0, NULL);
-+	if (ret < 0)
-+		goto cleanup2;
-+
-+	ret = v4l2_async_register_subdev(&coil->subdev);
-+	if (ret < 0)
-+		goto cleanup;
-+
-+	return ret;
-+
-+cleanup:
-+	media_entity_cleanup(&coil->subdev.entity);
-+cleanup2:
-+	regulator_unregister_notifier(coil->vana, &coil->nb);
-+	return ret;
-+}
-+
-+static void ad5398_remove(struct i2c_client *client)
-+{
-+	struct v4l2_subdev *subdev = i2c_get_clientdata(client);
-+	struct ad5398_device *coil = to_ad5398_device(subdev);
-+
-+	v4l2_async_unregister_subdev(&coil->subdev);
-+	v4l2_ctrl_handler_free(&coil->ctrls);
-+	media_entity_cleanup(&coil->subdev.entity);
-+}
-+
-+static const struct i2c_device_id ad5398_id_table[] = {
-+	{ "ad5398", 0 },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(i2c, ad5398_id_table);
-+
-+static const struct of_device_id ad5398_of_table[] = {
-+	{ .compatible = "adi,ad5398" },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(of, ad5398_of_table);
-+
-+static SIMPLE_DEV_PM_OPS(ad5398_pm, ad5398_suspend, ad5398_resume);
-+
-+static struct i2c_driver ad5398_i2c_driver = {
-+	.driver		= {
-+		.name	= "ad5398",
-+		.pm	= &ad5398_pm,
-+		.of_match_table = ad5398_of_table,
-+	},
-+	.probe		= ad5398_probe,
-+	.remove		= ad5398_remove,
-+	.id_table	= ad5398_id_table,
-+};
-+
-+module_i2c_driver(ad5398_i2c_driver);
-+
-+MODULE_AUTHOR("Dave Stevenson <dave.stevenson@raspberrypi.com>");
-+MODULE_DESCRIPTION("AD5398 camera lens driver");
-+MODULE_LICENSE("GPL");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0398-media-i2c-ov5647-Use-v4l2_async_register_subdev_sens.patch b/target/linux/bcm27xx/patches-6.1/950-0398-media-i2c-ov5647-Use-v4l2_async_register_subdev_sens.patch
deleted file mode 100644
index 8df6a0ce18..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0398-media-i2c-ov5647-Use-v4l2_async_register_subdev_sens.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7c6e7b7571e837d22e94ecfd26328ea59a25a076 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 16 Mar 2022 12:15:41 +0000
-Subject: [PATCH] media: i2c: ov5647: Use
- v4l2_async_register_subdev_sensor for lens binding
-
-v4l2_async_register_subdev doesn't bind in lens or flash drivers,
-but v4l2_async_register_subdev_sensor does.
-Switch to using v4l2_async_register_subdev_sensor.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/i2c/ov5647.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/media/i2c/ov5647.c
-+++ b/drivers/media/i2c/ov5647.c
-@@ -1558,7 +1558,7 @@ static int ov5647_probe(struct i2c_clien
- 	if (ret < 0)
- 		goto power_off;
- 
--	ret = v4l2_async_register_subdev(sd);
-+	ret = v4l2_async_register_subdev_sensor(sd);
- 	if (ret < 0)
- 		goto power_off;
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0399-media-i2c-Rename-ad5398-to-ad5398_vcm.patch b/target/linux/bcm27xx/patches-6.1/950-0399-media-i2c-Rename-ad5398-to-ad5398_vcm.patch
deleted file mode 100644
index e3d4031504..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0399-media-i2c-Rename-ad5398-to-ad5398_vcm.patch
+++ /dev/null
@@ -1,717 +0,0 @@
-From 75bcf465c32541eb20eb5c75c16e073830c5b1d1 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 17 Mar 2022 15:13:10 +0000
-Subject: [PATCH] media: i2c: Rename ad5398 to ad5398_vcm
-
-There's already a regulator module called ad5398 that exposes
-this device through the regulator API. That is meaningless in
-the terms that it uses and how it maps to V4L2, so a new driver
-was added. However the module name collision wasn't noted, so
-rename it now.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/i2c/Makefile                   | 2 +-
- drivers/media/i2c/{ad5398.c => ad5398_vcm.c} | 0
- 2 files changed, 1 insertion(+), 1 deletion(-)
- rename drivers/media/i2c/{ad5398.c => ad5398_vcm.c} (100%)
-
---- a/drivers/media/i2c/Makefile
-+++ b/drivers/media/i2c/Makefile
-@@ -3,7 +3,7 @@
- msp3400-objs	:=	msp3400-driver.o msp3400-kthreads.o
- 
- obj-$(CONFIG_SDR_MAX2175) += max2175.o
--obj-$(CONFIG_VIDEO_AD5398)  += ad5398.o
-+obj-$(CONFIG_VIDEO_AD5398) += ad5398_vcm.o
- obj-$(CONFIG_VIDEO_AD5820) += ad5820.o
- obj-$(CONFIG_VIDEO_AD9389B) += ad9389b.o
- obj-$(CONFIG_VIDEO_ADP1653) += adp1653.o
---- a/drivers/media/i2c/ad5398.c
-+++ /dev/null
-@@ -1,341 +0,0 @@
--// SPDX-License-Identifier: GPL-2.0-only
--/*
-- * AD5398 DAC driver for camera voice coil focus.
-- * Copyright (C) 2021 Raspberry Pi (Trading) Ltd.
-- *
-- * Based on AD5820 DAC driver by Nokia and TI.
-- *
-- * This driver uses the regulator framework notification hooks on the
-- * assumption that the VCM and sensor share a regulator. This means the VCM
-- * position will be restored when either the sensor or VCM subdevices are opened
-- * or powered up. The client can therefore choose to ignore the VCM subdevice,
-- * and the lens position will be as previously requested. Without that, there
-- * is a hard requirement to have the VCM subdevice open in order for the VCM
-- * to be powered and at the requested position.
-- */
--
--#include <linux/errno.h>
--#include <linux/i2c.h>
--#include <linux/kernel.h>
--#include <linux/module.h>
--#include <linux/regulator/consumer.h>
--#include <linux/gpio/consumer.h>
--
--#include <media/v4l2-ctrls.h>
--#include <media/v4l2-device.h>
--#include <media/v4l2-subdev.h>
--
--/* Register definitions */
--#define AD5398_POWER_DOWN		BIT(15)
--#define AD5398_DAC_SHIFT		4
--
--#define to_ad5398_device(sd)	container_of(sd, struct ad5398_device, subdev)
--
--struct ad5398_device {
--	struct v4l2_subdev subdev;
--	struct ad5398_platform_data *platform_data;
--	struct regulator *vana;
--	struct notifier_block nb;
--
--	struct v4l2_ctrl_handler ctrls;
--	u32 focus_absolute;
--
--	bool standby;
--};
--
--static int ad5398_write(struct ad5398_device *coil, u16 data)
--{
--	struct i2c_client *client = v4l2_get_subdevdata(&coil->subdev);
--	struct i2c_msg msg;
--	__be16 be_data;
--	int r;
--
--	if (!client->adapter)
--		return -ENODEV;
--
--	be_data = cpu_to_be16(data);
--	msg.addr  = client->addr;
--	msg.flags = 0;
--	msg.len   = 2;
--	msg.buf   = (u8 *)&be_data;
--
--	r = i2c_transfer(client->adapter, &msg, 1);
--	if (r < 0) {
--		dev_err(&client->dev, "write failed, error %d\n", r);
--		return r;
--	}
--
--	return 0;
--}
--
--/*
-- * Calculate status word and write it to the device based on current
-- * values of V4L2 controls. It is assumed that the stored V4L2 control
-- * values are properly limited and rounded.
-- */
--static int ad5398_update_hw(struct ad5398_device *coil)
--{
--	u16 status;
--
--	status = coil->focus_absolute << AD5398_DAC_SHIFT;
--
--	if (coil->standby)
--		status |= AD5398_POWER_DOWN;
--
--	return ad5398_write(coil, status);
--}
--
--/*
-- * Power handling
-- */
--static int ad5398_power_off(struct ad5398_device *coil)
--{
--	int ret = 0;
--
--	coil->standby = true;
--	ret = ad5398_update_hw(coil);
--
--	return ret;
--}
--
--static int ad5398_power_on(struct ad5398_device *coil)
--{
--	int ret;
--
--	/* Restore the hardware settings. */
--	coil->standby = false;
--	ret = ad5398_update_hw(coil);
--	if (ret)
--		goto fail;
--
--	return 0;
--
--fail:
--	coil->standby = true;
--
--	return ret;
--}
--
--/*
-- * V4L2 controls
-- */
--static int ad5398_set_ctrl(struct v4l2_ctrl *ctrl)
--{
--	struct ad5398_device *coil =
--		container_of(ctrl->handler, struct ad5398_device, ctrls);
--
--	switch (ctrl->id) {
--	case V4L2_CID_FOCUS_ABSOLUTE:
--		coil->focus_absolute = ctrl->val;
--		return ad5398_update_hw(coil);
--	}
--
--	return 0;
--}
--
--static const struct v4l2_ctrl_ops ad5398_ctrl_ops = {
--	.s_ctrl = ad5398_set_ctrl,
--};
--
--static int ad5398_init_controls(struct ad5398_device *coil)
--{
--	v4l2_ctrl_handler_init(&coil->ctrls, 1);
--
--	/*
--	 * V4L2_CID_FOCUS_ABSOLUTE
--	 *
--	 * Minimum current is 0 mA, maximum is 120 mA. Thus, 1 code is
--	 * equivalent to 120/1023 = 0.1173 mA. Nevertheless, we do not use [mA]
--	 * for focus position, because it is meaningless for user. Meaningful
--	 * would be to use focus distance or even its inverse, but since the
--	 * driver doesn't have sufficient knowledge to do the conversion, we
--	 * will just use abstract codes here. In any case, smaller value = focus
--	 * position farther from camera. The default zero value means focus at
--	 * infinity, and also least current consumption.
--	 */
--	v4l2_ctrl_new_std(&coil->ctrls, &ad5398_ctrl_ops,
--			  V4L2_CID_FOCUS_ABSOLUTE, 0, 1023, 1, 0);
--
--	if (coil->ctrls.error)
--		return coil->ctrls.error;
--
--	coil->focus_absolute = 0;
--
--	coil->subdev.ctrl_handler = &coil->ctrls;
--
--	return 0;
--}
--
--/*
-- * V4L2 subdev operations
-- */
--static int ad5398_registered(struct v4l2_subdev *subdev)
--{
--	struct ad5398_device *coil = to_ad5398_device(subdev);
--
--	return ad5398_init_controls(coil);
--}
--
--static int
--ad5398_set_power(struct v4l2_subdev *subdev, int on)
--{
--	struct ad5398_device *coil = to_ad5398_device(subdev);
--	int ret;
--
--	if (on)
--		ret = regulator_enable(coil->vana);
--	else
--		ret = regulator_disable(coil->vana);
--
--	return ret;
--}
--
--static int ad5398_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
--{
--	struct ad5398_device *coil = to_ad5398_device(sd);
--
--	return regulator_enable(coil->vana);
--}
--
--static int ad5398_close(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
--{
--	struct ad5398_device *coil = to_ad5398_device(sd);
--
--	return regulator_disable(coil->vana);
--}
--
--static const struct v4l2_subdev_core_ops ad5398_core_ops = {
--	.s_power = ad5398_set_power,
--};
--
--static const struct v4l2_subdev_ops ad5398_ops = {
--	.core = &ad5398_core_ops,
--};
--
--static const struct v4l2_subdev_internal_ops ad5398_internal_ops = {
--	.registered = ad5398_registered,
--	.open = ad5398_open,
--	.close = ad5398_close,
--};
--
--/*
-- * I2C driver
-- */
--static int __maybe_unused ad5398_suspend(struct device *dev)
--{
--	struct i2c_client *client = container_of(dev, struct i2c_client, dev);
--	struct v4l2_subdev *subdev = i2c_get_clientdata(client);
--	struct ad5398_device *coil = to_ad5398_device(subdev);
--
--	return regulator_enable(coil->vana);
--}
--
--static int __maybe_unused ad5398_resume(struct device *dev)
--{
--	struct i2c_client *client = container_of(dev, struct i2c_client, dev);
--	struct v4l2_subdev *subdev = i2c_get_clientdata(client);
--	struct ad5398_device *coil = to_ad5398_device(subdev);
--
--	return regulator_disable(coil->vana);
--}
--
--static int ad5398_regulator_notifier(struct notifier_block *nb,
--				     unsigned long event,
--				     void *ignored)
--{
--	struct ad5398_device *coil = container_of(nb, struct ad5398_device, nb);
--
--	if (event == REGULATOR_EVENT_ENABLE)
--		ad5398_power_on(coil);
--	else if (event == REGULATOR_EVENT_PRE_DISABLE)
--		ad5398_power_off(coil);
--
--	return NOTIFY_OK;
--}
--
--static int ad5398_probe(struct i2c_client *client,
--			const struct i2c_device_id *devid)
--{
--	struct ad5398_device *coil;
--	int ret;
--
--	coil = devm_kzalloc(&client->dev, sizeof(*coil), GFP_KERNEL);
--	if (!coil)
--		return -ENOMEM;
--
--	coil->vana = devm_regulator_get(&client->dev, "VANA");
--	if (IS_ERR(coil->vana)) {
--		ret = PTR_ERR(coil->vana);
--		if (ret != -EPROBE_DEFER)
--			dev_err(&client->dev, "could not get regulator for vana\n");
--		return ret;
--	}
--
--	v4l2_i2c_subdev_init(&coil->subdev, client, &ad5398_ops);
--	coil->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
--	coil->subdev.internal_ops = &ad5398_internal_ops;
--	coil->subdev.entity.function = MEDIA_ENT_F_LENS;
--	strscpy(coil->subdev.name, "ad5398 focus", sizeof(coil->subdev.name));
--
--	coil->nb.notifier_call = &ad5398_regulator_notifier;
--	ret = regulator_register_notifier(coil->vana, &coil->nb);
--	if (ret < 0)
--		return ret;
--
--	ret = media_entity_pads_init(&coil->subdev.entity, 0, NULL);
--	if (ret < 0)
--		goto cleanup2;
--
--	ret = v4l2_async_register_subdev(&coil->subdev);
--	if (ret < 0)
--		goto cleanup;
--
--	return ret;
--
--cleanup:
--	media_entity_cleanup(&coil->subdev.entity);
--cleanup2:
--	regulator_unregister_notifier(coil->vana, &coil->nb);
--	return ret;
--}
--
--static void ad5398_remove(struct i2c_client *client)
--{
--	struct v4l2_subdev *subdev = i2c_get_clientdata(client);
--	struct ad5398_device *coil = to_ad5398_device(subdev);
--
--	v4l2_async_unregister_subdev(&coil->subdev);
--	v4l2_ctrl_handler_free(&coil->ctrls);
--	media_entity_cleanup(&coil->subdev.entity);
--}
--
--static const struct i2c_device_id ad5398_id_table[] = {
--	{ "ad5398", 0 },
--	{ }
--};
--MODULE_DEVICE_TABLE(i2c, ad5398_id_table);
--
--static const struct of_device_id ad5398_of_table[] = {
--	{ .compatible = "adi,ad5398" },
--	{ }
--};
--MODULE_DEVICE_TABLE(of, ad5398_of_table);
--
--static SIMPLE_DEV_PM_OPS(ad5398_pm, ad5398_suspend, ad5398_resume);
--
--static struct i2c_driver ad5398_i2c_driver = {
--	.driver		= {
--		.name	= "ad5398",
--		.pm	= &ad5398_pm,
--		.of_match_table = ad5398_of_table,
--	},
--	.probe		= ad5398_probe,
--	.remove		= ad5398_remove,
--	.id_table	= ad5398_id_table,
--};
--
--module_i2c_driver(ad5398_i2c_driver);
--
--MODULE_AUTHOR("Dave Stevenson <dave.stevenson@raspberrypi.com>");
--MODULE_DESCRIPTION("AD5398 camera lens driver");
--MODULE_LICENSE("GPL");
---- /dev/null
-+++ b/drivers/media/i2c/ad5398_vcm.c
-@@ -0,0 +1,341 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+/*
-+ * AD5398 DAC driver for camera voice coil focus.
-+ * Copyright (C) 2021 Raspberry Pi (Trading) Ltd.
-+ *
-+ * Based on AD5820 DAC driver by Nokia and TI.
-+ *
-+ * This driver uses the regulator framework notification hooks on the
-+ * assumption that the VCM and sensor share a regulator. This means the VCM
-+ * position will be restored when either the sensor or VCM subdevices are opened
-+ * or powered up. The client can therefore choose to ignore the VCM subdevice,
-+ * and the lens position will be as previously requested. Without that, there
-+ * is a hard requirement to have the VCM subdevice open in order for the VCM
-+ * to be powered and at the requested position.
-+ */
-+
-+#include <linux/errno.h>
-+#include <linux/i2c.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/regulator/consumer.h>
-+#include <linux/gpio/consumer.h>
-+
-+#include <media/v4l2-ctrls.h>
-+#include <media/v4l2-device.h>
-+#include <media/v4l2-subdev.h>
-+
-+/* Register definitions */
-+#define AD5398_POWER_DOWN		BIT(15)
-+#define AD5398_DAC_SHIFT		4
-+
-+#define to_ad5398_device(sd)	container_of(sd, struct ad5398_device, subdev)
-+
-+struct ad5398_device {
-+	struct v4l2_subdev subdev;
-+	struct ad5398_platform_data *platform_data;
-+	struct regulator *vana;
-+	struct notifier_block nb;
-+
-+	struct v4l2_ctrl_handler ctrls;
-+	u32 focus_absolute;
-+
-+	bool standby;
-+};
-+
-+static int ad5398_write(struct ad5398_device *coil, u16 data)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&coil->subdev);
-+	struct i2c_msg msg;
-+	__be16 be_data;
-+	int r;
-+
-+	if (!client->adapter)
-+		return -ENODEV;
-+
-+	be_data = cpu_to_be16(data);
-+	msg.addr  = client->addr;
-+	msg.flags = 0;
-+	msg.len   = 2;
-+	msg.buf   = (u8 *)&be_data;
-+
-+	r = i2c_transfer(client->adapter, &msg, 1);
-+	if (r < 0) {
-+		dev_err(&client->dev, "write failed, error %d\n", r);
-+		return r;
-+	}
-+
-+	return 0;
-+}
-+
-+/*
-+ * Calculate status word and write it to the device based on current
-+ * values of V4L2 controls. It is assumed that the stored V4L2 control
-+ * values are properly limited and rounded.
-+ */
-+static int ad5398_update_hw(struct ad5398_device *coil)
-+{
-+	u16 status;
-+
-+	status = coil->focus_absolute << AD5398_DAC_SHIFT;
-+
-+	if (coil->standby)
-+		status |= AD5398_POWER_DOWN;
-+
-+	return ad5398_write(coil, status);
-+}
-+
-+/*
-+ * Power handling
-+ */
-+static int ad5398_power_off(struct ad5398_device *coil)
-+{
-+	int ret = 0;
-+
-+	coil->standby = true;
-+	ret = ad5398_update_hw(coil);
-+
-+	return ret;
-+}
-+
-+static int ad5398_power_on(struct ad5398_device *coil)
-+{
-+	int ret;
-+
-+	/* Restore the hardware settings. */
-+	coil->standby = false;
-+	ret = ad5398_update_hw(coil);
-+	if (ret)
-+		goto fail;
-+
-+	return 0;
-+
-+fail:
-+	coil->standby = true;
-+
-+	return ret;
-+}
-+
-+/*
-+ * V4L2 controls
-+ */
-+static int ad5398_set_ctrl(struct v4l2_ctrl *ctrl)
-+{
-+	struct ad5398_device *coil =
-+		container_of(ctrl->handler, struct ad5398_device, ctrls);
-+
-+	switch (ctrl->id) {
-+	case V4L2_CID_FOCUS_ABSOLUTE:
-+		coil->focus_absolute = ctrl->val;
-+		return ad5398_update_hw(coil);
-+	}
-+
-+	return 0;
-+}
-+
-+static const struct v4l2_ctrl_ops ad5398_ctrl_ops = {
-+	.s_ctrl = ad5398_set_ctrl,
-+};
-+
-+static int ad5398_init_controls(struct ad5398_device *coil)
-+{
-+	v4l2_ctrl_handler_init(&coil->ctrls, 1);
-+
-+	/*
-+	 * V4L2_CID_FOCUS_ABSOLUTE
-+	 *
-+	 * Minimum current is 0 mA, maximum is 120 mA. Thus, 1 code is
-+	 * equivalent to 120/1023 = 0.1173 mA. Nevertheless, we do not use [mA]
-+	 * for focus position, because it is meaningless for user. Meaningful
-+	 * would be to use focus distance or even its inverse, but since the
-+	 * driver doesn't have sufficient knowledge to do the conversion, we
-+	 * will just use abstract codes here. In any case, smaller value = focus
-+	 * position farther from camera. The default zero value means focus at
-+	 * infinity, and also least current consumption.
-+	 */
-+	v4l2_ctrl_new_std(&coil->ctrls, &ad5398_ctrl_ops,
-+			  V4L2_CID_FOCUS_ABSOLUTE, 0, 1023, 1, 0);
-+
-+	if (coil->ctrls.error)
-+		return coil->ctrls.error;
-+
-+	coil->focus_absolute = 0;
-+
-+	coil->subdev.ctrl_handler = &coil->ctrls;
-+
-+	return 0;
-+}
-+
-+/*
-+ * V4L2 subdev operations
-+ */
-+static int ad5398_registered(struct v4l2_subdev *subdev)
-+{
-+	struct ad5398_device *coil = to_ad5398_device(subdev);
-+
-+	return ad5398_init_controls(coil);
-+}
-+
-+static int
-+ad5398_set_power(struct v4l2_subdev *subdev, int on)
-+{
-+	struct ad5398_device *coil = to_ad5398_device(subdev);
-+	int ret;
-+
-+	if (on)
-+		ret = regulator_enable(coil->vana);
-+	else
-+		ret = regulator_disable(coil->vana);
-+
-+	return ret;
-+}
-+
-+static int ad5398_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
-+{
-+	struct ad5398_device *coil = to_ad5398_device(sd);
-+
-+	return regulator_enable(coil->vana);
-+}
-+
-+static int ad5398_close(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
-+{
-+	struct ad5398_device *coil = to_ad5398_device(sd);
-+
-+	return regulator_disable(coil->vana);
-+}
-+
-+static const struct v4l2_subdev_core_ops ad5398_core_ops = {
-+	.s_power = ad5398_set_power,
-+};
-+
-+static const struct v4l2_subdev_ops ad5398_ops = {
-+	.core = &ad5398_core_ops,
-+};
-+
-+static const struct v4l2_subdev_internal_ops ad5398_internal_ops = {
-+	.registered = ad5398_registered,
-+	.open = ad5398_open,
-+	.close = ad5398_close,
-+};
-+
-+/*
-+ * I2C driver
-+ */
-+static int __maybe_unused ad5398_suspend(struct device *dev)
-+{
-+	struct i2c_client *client = container_of(dev, struct i2c_client, dev);
-+	struct v4l2_subdev *subdev = i2c_get_clientdata(client);
-+	struct ad5398_device *coil = to_ad5398_device(subdev);
-+
-+	return regulator_enable(coil->vana);
-+}
-+
-+static int __maybe_unused ad5398_resume(struct device *dev)
-+{
-+	struct i2c_client *client = container_of(dev, struct i2c_client, dev);
-+	struct v4l2_subdev *subdev = i2c_get_clientdata(client);
-+	struct ad5398_device *coil = to_ad5398_device(subdev);
-+
-+	return regulator_disable(coil->vana);
-+}
-+
-+static int ad5398_regulator_notifier(struct notifier_block *nb,
-+				     unsigned long event,
-+				     void *ignored)
-+{
-+	struct ad5398_device *coil = container_of(nb, struct ad5398_device, nb);
-+
-+	if (event == REGULATOR_EVENT_ENABLE)
-+		ad5398_power_on(coil);
-+	else if (event == REGULATOR_EVENT_PRE_DISABLE)
-+		ad5398_power_off(coil);
-+
-+	return NOTIFY_OK;
-+}
-+
-+static int ad5398_probe(struct i2c_client *client,
-+			const struct i2c_device_id *devid)
-+{
-+	struct ad5398_device *coil;
-+	int ret;
-+
-+	coil = devm_kzalloc(&client->dev, sizeof(*coil), GFP_KERNEL);
-+	if (!coil)
-+		return -ENOMEM;
-+
-+	coil->vana = devm_regulator_get(&client->dev, "VANA");
-+	if (IS_ERR(coil->vana)) {
-+		ret = PTR_ERR(coil->vana);
-+		if (ret != -EPROBE_DEFER)
-+			dev_err(&client->dev, "could not get regulator for vana\n");
-+		return ret;
-+	}
-+
-+	v4l2_i2c_subdev_init(&coil->subdev, client, &ad5398_ops);
-+	coil->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
-+	coil->subdev.internal_ops = &ad5398_internal_ops;
-+	coil->subdev.entity.function = MEDIA_ENT_F_LENS;
-+	strscpy(coil->subdev.name, "ad5398 focus", sizeof(coil->subdev.name));
-+
-+	coil->nb.notifier_call = &ad5398_regulator_notifier;
-+	ret = regulator_register_notifier(coil->vana, &coil->nb);
-+	if (ret < 0)
-+		return ret;
-+
-+	ret = media_entity_pads_init(&coil->subdev.entity, 0, NULL);
-+	if (ret < 0)
-+		goto cleanup2;
-+
-+	ret = v4l2_async_register_subdev(&coil->subdev);
-+	if (ret < 0)
-+		goto cleanup;
-+
-+	return ret;
-+
-+cleanup:
-+	media_entity_cleanup(&coil->subdev.entity);
-+cleanup2:
-+	regulator_unregister_notifier(coil->vana, &coil->nb);
-+	return ret;
-+}
-+
-+static void ad5398_remove(struct i2c_client *client)
-+{
-+	struct v4l2_subdev *subdev = i2c_get_clientdata(client);
-+	struct ad5398_device *coil = to_ad5398_device(subdev);
-+
-+	v4l2_async_unregister_subdev(&coil->subdev);
-+	v4l2_ctrl_handler_free(&coil->ctrls);
-+	media_entity_cleanup(&coil->subdev.entity);
-+}
-+
-+static const struct i2c_device_id ad5398_id_table[] = {
-+	{ "ad5398", 0 },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(i2c, ad5398_id_table);
-+
-+static const struct of_device_id ad5398_of_table[] = {
-+	{ .compatible = "adi,ad5398" },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(of, ad5398_of_table);
-+
-+static SIMPLE_DEV_PM_OPS(ad5398_pm, ad5398_suspend, ad5398_resume);
-+
-+static struct i2c_driver ad5398_i2c_driver = {
-+	.driver		= {
-+		.name	= "ad5398",
-+		.pm	= &ad5398_pm,
-+		.of_match_table = ad5398_of_table,
-+	},
-+	.probe		= ad5398_probe,
-+	.remove		= ad5398_remove,
-+	.id_table	= ad5398_id_table,
-+};
-+
-+module_i2c_driver(ad5398_i2c_driver);
-+
-+MODULE_AUTHOR("Dave Stevenson <dave.stevenson@raspberrypi.com>");
-+MODULE_DESCRIPTION("AD5398 camera lens driver");
-+MODULE_LICENSE("GPL");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0400-drivers-staging-bcm2835-isp-Clear-LS-table-handle-in.patch b/target/linux/bcm27xx/patches-6.1/950-0400-drivers-staging-bcm2835-isp-Clear-LS-table-handle-in.patch
deleted file mode 100644
index 2183f27594..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0400-drivers-staging-bcm2835-isp-Clear-LS-table-handle-in.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From bdce2bf86c56f023dc37130afafa3617f05e7876 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Tue, 22 Mar 2022 15:16:40 +0000
-Subject: [PATCH] drivers: staging: bcm2835-isp: Clear LS table handle
- in the firmware
-
-When all nodes have stopped streaming, ensure the firmware has released its
-handle on the LS table dmabuf. This is done by passing a null handle in the
-LS params.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- .../vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c    | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
---- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-+++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-@@ -657,6 +657,19 @@ static void bcm2835_isp_node_stop_stream
- 	atomic_dec(&dev->num_streaming);
- 	/* If all ports disabled, then disable the component */
- 	if (atomic_read(&dev->num_streaming) == 0) {
-+		struct bcm2835_isp_lens_shading ls;
-+		/*
-+		 * The ISP component on the firmware has a reference to the
-+		 * dmabuf handle for the lens shading table.  Pass a null handle
-+		 * to remove that reference now.
-+		 */
-+		memset(&ls, 0, sizeof(ls));
-+		/* Must set a valid grid size for the FW */
-+		ls.grid_cell_size = 16;
-+		set_isp_param(&dev->node[0],
-+			      MMAL_PARAMETER_LENS_SHADING_OVERRIDE,
-+			      &ls, sizeof(ls));
-+
- 		ret = vchiq_mmal_component_disable(dev->mmal_instance,
- 						   dev->component);
- 		if (ret) {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0401-mm-page_alloc-cma-introduce-a-customisable-threshold.patch b/target/linux/bcm27xx/patches-6.1/950-0401-mm-page_alloc-cma-introduce-a-customisable-threshold.patch
deleted file mode 100644
index fed130ca85..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0401-mm-page_alloc-cma-introduce-a-customisable-threshold.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From ad2b3cbdb8303c5d4eb6c7c6d6428443dbb8d547 Mon Sep 17 00:00:00 2001
-From: David Plowman <david.plowman@raspberrypi.com>
-Date: Tue, 29 Mar 2022 16:10:06 +0100
-Subject: [PATCH] mm,page_alloc,cma: introduce a customisable threshold
- for allocating pages in cma
-
-On some platforms the cma area can be half the entire system memory,
-meaning that allocations start happening in the cma area immediately.
-This leads to fragmentation and subsequent fatal cma_alloc failures.
-
-We introduce an "alloc_in_cma_threshold" parameter which requires that
-this many sixteenths of the free pages must be in cma before it will
-try to use them. By default this is set to 12, but the previous
-behaviour can be restored by setting it to 8 on startup.
-
-Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
----
- mm/page_alloc.c | 28 +++++++++++++++++++++++++---
- 1 file changed, 25 insertions(+), 3 deletions(-)
-
---- a/mm/page_alloc.c
-+++ b/mm/page_alloc.c
-@@ -253,6 +253,27 @@ EXPORT_SYMBOL(init_on_alloc);
- DEFINE_STATIC_KEY_MAYBE(CONFIG_INIT_ON_FREE_DEFAULT_ON, init_on_free);
- EXPORT_SYMBOL(init_on_free);
- 
-+#define ALLOC_IN_CMA_THRESHOLD_MAX 16
-+#define ALLOC_IN_CMA_THRESHOLD_DEFAULT 12
-+
-+static unsigned long _alloc_in_cma_threshold __read_mostly
-+				= ALLOC_IN_CMA_THRESHOLD_DEFAULT;
-+
-+static int __init alloc_in_cma_threshold_setup(char *buf)
-+{
-+	unsigned long res;
-+
-+	if (kstrtoul(buf, 10, &res) < 0 ||
-+	    res > ALLOC_IN_CMA_THRESHOLD_MAX) {
-+		pr_err("Bad alloc_cma_threshold value\n");
-+		return 0;
-+	}
-+	_alloc_in_cma_threshold = res;
-+	pr_info("Setting alloc_in_cma_threshold to %lu\n", res);
-+	return 0;
-+}
-+early_param("alloc_in_cma_threshold", alloc_in_cma_threshold_setup);
-+
- static bool _init_on_alloc_enabled_early __read_mostly
- 				= IS_ENABLED(CONFIG_INIT_ON_ALLOC_DEFAULT_ON);
- static int __init early_init_on_alloc(char *buf)
-@@ -3073,12 +3094,13 @@ __rmqueue(struct zone *zone, unsigned in
- 	if (IS_ENABLED(CONFIG_CMA)) {
- 		/*
- 		 * Balance movable allocations between regular and CMA areas by
--		 * allocating from CMA when over half of the zone's free memory
--		 * is in the CMA area.
-+		 * allocating from CMA when over more than a given proportion of
-+		 * the zone's free memory is in the CMA area.
- 		 */
- 		if (alloc_flags & ALLOC_CMA &&
- 		    zone_page_state(zone, NR_FREE_CMA_PAGES) >
--		    zone_page_state(zone, NR_FREE_PAGES) / 2) {
-+		    zone_page_state(zone, NR_FREE_PAGES) / ALLOC_IN_CMA_THRESHOLD_MAX
-+		    * _alloc_in_cma_threshold) {
- 			page = __rmqueue_cma_fallback(zone, order);
- 			if (page)
- 				return page;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0402-pinctrl-bcm2835-Only-return-non-GPIOs-to-inputs.patch b/target/linux/bcm27xx/patches-6.1/950-0402-pinctrl-bcm2835-Only-return-non-GPIOs-to-inputs.patch
deleted file mode 100644
index bd199b76e2..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0402-pinctrl-bcm2835-Only-return-non-GPIOs-to-inputs.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 5e59ca8ad881317cf15fc4b0e7423cc3d411a969 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 30 Mar 2022 09:48:41 +0100
-Subject: [PATCH] pinctrl: bcm2835: Only return non-GPIOs to inputs
-
-Allowing GPIO state to persist allows the use of gpioset to control
-GPIO levels without having to use the --mode=wait feature.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/pinctrl/bcm/pinctrl-bcm2835.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
---- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
-+++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
-@@ -926,9 +926,12 @@ static int bcm2835_pmx_free(struct pinct
- 		unsigned offset)
- {
- 	struct bcm2835_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
-+	enum bcm2835_fsel fsel = bcm2835_pinctrl_fsel_get(pc, offset);
-+
-+	/* Return non-GPIOs to GPIO_IN */
-+	if (fsel != BCM2835_FSEL_GPIO_IN && fsel != BCM2835_FSEL_GPIO_OUT)
-+		bcm2835_pinctrl_fsel_set(pc, offset, BCM2835_FSEL_GPIO_IN);
- 
--	/* disable by setting to GPIO_IN */
--	bcm2835_pinctrl_fsel_set(pc, offset, BCM2835_FSEL_GPIO_IN);
- 	return 0;
- }
- 
-@@ -970,10 +973,7 @@ static void bcm2835_pmx_gpio_disable_fre
- 		struct pinctrl_gpio_range *range,
- 		unsigned offset)
- {
--	struct bcm2835_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
--
--	/* disable by setting to GPIO_IN */
--	bcm2835_pinctrl_fsel_set(pc, offset, BCM2835_FSEL_GPIO_IN);
-+	(void)bcm2835_pmx_free(pctldev, offset);
- }
- 
- static int bcm2835_pmx_gpio_set_direction(struct pinctrl_dev *pctldev,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0403-drm-panel-ilitek-ili9881c-Clean-up-on-mipi_dsi_attac.patch b/target/linux/bcm27xx/patches-6.1/950-0403-drm-panel-ilitek-ili9881c-Clean-up-on-mipi_dsi_attac.patch
deleted file mode 100644
index 25a12d5912..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0403-drm-panel-ilitek-ili9881c-Clean-up-on-mipi_dsi_attac.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5ff331cb050f52361ec40512cc6d87f4923ed29f Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 31 Mar 2022 12:03:36 +0100
-Subject: [PATCH] drm/panel: ilitek-ili9881c: Clean up on
- mipi_dsi_attach failure
-
-mipi_dsi_attach is allowed to fail, and currently the probe
-code doesn't clean up (mainly drm_panel_remove) if this happens.
-
-Add cleanup code on failure.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
-+++ b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
-@@ -1161,7 +1161,11 @@ static int ili9881c_dsi_probe(struct mip
- 	dsi->format = MIPI_DSI_FMT_RGB888;
- 	dsi->lanes = 4;
- 
--	return mipi_dsi_attach(dsi);
-+	ret = mipi_dsi_attach(dsi);
-+	if (ret)
-+		drm_panel_remove(&ctx->panel);
-+
-+	return ret;
- }
- 
- static void ili9881c_dsi_remove(struct mipi_dsi_device *dsi)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0404-drm-panel-panel-ilitek9881c-Add-prepare_upstream_fir.patch b/target/linux/bcm27xx/patches-6.1/950-0404-drm-panel-panel-ilitek9881c-Add-prepare_upstream_fir.patch
deleted file mode 100644
index ce66c7d2ee..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0404-drm-panel-panel-ilitek9881c-Add-prepare_upstream_fir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 942d55434af46aebe8f5508995807253a6b235b3 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 31 Mar 2022 12:05:04 +0100
-Subject: [PATCH] drm/panel: panel-ilitek9881c: Add
- prepare_prev_first flag
-
-The panel sends MIPI DCS commands during prepare and is expecting
-the bus to remain in LP-11 state in-between.
-
-Set the prepare_prev_first flag so that the upstream DSI host
-is prepared / pre_enabled first, and therefore the bus is in a
-defined state.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
-+++ b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
-@@ -1131,6 +1131,7 @@ static int ili9881c_dsi_probe(struct mip
- 	ctx->dsi = dsi;
- 	ctx->desc = of_device_get_match_data(&dsi->dev);
- 
-+	ctx->panel.prepare_prev_first = true;
- 	drm_panel_init(&ctx->panel, &dsi->dev, &ili9881c_funcs,
- 		       DRM_MODE_CONNECTOR_DSI);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0405-clk-bcm2835-use-subsys_initcall-for-the-clock-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0405-clk-bcm2835-use-subsys_initcall-for-the-clock-driver.patch
deleted file mode 100644
index 387d557055..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0405-clk-bcm2835-use-subsys_initcall-for-the-clock-driver.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 08e395e134dfe841947baaaf5693f3d329ebdea1 Mon Sep 17 00:00:00 2001
-From: Alberto Solavagione <albertosolavagione30@gmail.com>
-Date: Wed, 20 Apr 2022 17:15:42 +0200
-Subject: [PATCH] clk-bcm2835: use subsys_initcall for the clock driver
- when IMA is enabled
-
-Co-authored-by: Davide Scovotto <scovottodavide@gmail.com>
-Co-developed-by: Davide Scovotto <scovottodavide@gmail.com>
-Signed-off-by: Davide Scovotto <scovottodavide@gmail.com>
-Signed-off-by: Alberto Solavagione <albertosolavagione30@gmail.com>
----
- drivers/clk/bcm/clk-bcm2835.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/clk/bcm/clk-bcm2835.c
-+++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -2438,7 +2438,11 @@ static int __init __bcm2835_clk_driver_i
- {
- 	return platform_driver_register(&bcm2835_clk_driver);
- }
-+#ifdef CONFIG_IMA
-+subsys_initcall(__bcm2835_clk_driver_init);
-+#else
- postcore_initcall(__bcm2835_clk_driver_init);
-+#endif
- 
- MODULE_AUTHOR("Eric Anholt <eric@anholt.net>");
- MODULE_DESCRIPTION("BCM2835 clock driver");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0406-tpm_tis_spi_main-Force-probe-routine-to-run-synchron.patch b/target/linux/bcm27xx/patches-6.1/950-0406-tpm_tis_spi_main-Force-probe-routine-to-run-synchron.patch
deleted file mode 100644
index cec0faaffa..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0406-tpm_tis_spi_main-Force-probe-routine-to-run-synchron.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 608da34369e1d306cb95a9eca5bb5f930243b654 Mon Sep 17 00:00:00 2001
-From: Scovotto Davide <scovottodavide@gmail.com>
-Date: Wed, 20 Apr 2022 17:22:17 +0200
-Subject: [PATCH] tpm_tis_spi_main: Force probe routine to run
- synchronously with driver and device registration when IMA is enabled
-
-Co-authored-by: Alberto Solavagione <albertosolavagione30@gmail.com>
-Co-developed-by: Alberto Solavagione <albertosolavagione30@gmail.com>
-Signed-off-by: Alberto Solavagione <albertosolavagione30@gmail.com>
-Signed-off-by: Davide Scovotto <scovottodavide@gmail.com>
----
- drivers/char/tpm/tpm_tis_spi_main.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/char/tpm/tpm_tis_spi_main.c
-+++ b/drivers/char/tpm/tpm_tis_spi_main.c
-@@ -252,7 +252,11 @@ static struct spi_driver tpm_tis_spi_dri
- 		.pm = &tpm_tis_pm,
- 		.of_match_table = of_match_ptr(of_tis_spi_match),
- 		.acpi_match_table = ACPI_PTR(acpi_tis_spi_match),
-+#ifdef CONFIG_IMA
-+		.probe_type = PROBE_FORCE_SYNCHRONOUS,
-+#else
- 		.probe_type = PROBE_PREFER_ASYNCHRONOUS,
-+#endif
- 	},
- 	.probe = tpm_tis_spi_driver_probe,
- 	.remove = tpm_tis_spi_remove,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0407-staging-vchiq_arm-Add-log_level-module-params.patch b/target/linux/bcm27xx/patches-6.1/950-0407-staging-vchiq_arm-Add-log_level-module-params.patch
deleted file mode 100644
index d7eab66233..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0407-staging-vchiq_arm-Add-log_level-module-params.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 9ef67cc6f5d954d15471fed8d28b15345edda34d Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Fri, 29 Apr 2022 09:19:10 +0100
-Subject: [PATCH] staging: vchiq_arm: Add log_level module params
-
-Add module parameters to control the logging levels for the various
-vchiq logging categories.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- .../staging/vc04_services/interface/vchiq_arm/vchiq_arm.c    | 5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-@@ -64,6 +64,11 @@
- /* Run time control of log level, based on KERN_XXX level. */
- int vchiq_arm_log_level = VCHIQ_LOG_DEFAULT;
- int vchiq_susp_log_level = VCHIQ_LOG_ERROR;
-+module_param_named(arm_log_level, vchiq_arm_log_level, int, 0644);
-+module_param_named(susp_log_level, vchiq_susp_log_level, int, 0644);
-+module_param_named(core_log_level, vchiq_core_log_level, int, 0644);
-+module_param_named(core_msg_log_level, vchiq_core_msg_log_level, int, 0644);
-+module_param_named(sync_log_level, vchiq_sync_log_level, int, 0644);
- 
- DEFINE_SPINLOCK(msg_queue_spinlock);
- struct vchiq_state g_state;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0408-dt-bindings-vendor-prefixes-Add-Arducam.patch b/target/linux/bcm27xx/patches-6.1/950-0408-dt-bindings-vendor-prefixes-Add-Arducam.patch
deleted file mode 100644
index 37cf24447d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0408-dt-bindings-vendor-prefixes-Add-Arducam.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From c486b073a13f5a0f3391526cd5c4f3bab938f58b Mon Sep 17 00:00:00 2001
-From: Lee Jackson <info@arducam.com>
-Date: Thu, 21 Apr 2022 14:14:29 +0800
-Subject: [PATCH] dt-bindings: vendor-prefixes: Add Arducam
-
-Add vendor prefix for Arducam (https://arducam.com).
-
-Signed-off-by: Lee Jackson <info@arducam.com>
----
- Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
-+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
-@@ -127,6 +127,8 @@ patternProperties:
-     description: arcx Inc. / Archronix Inc.
-   "^aries,.*":
-     description: Aries Embedded GmbH
-+  "^arducam,.*":
-+    description: Arducam Technology co., Ltd.
-   "^arm,.*":
-     description: ARM Ltd.
-   "^armadeus,.*":
diff --git a/target/linux/bcm27xx/patches-6.1/950-0409-media-dt-bindings-media-i2c-Add-Arducam-Pivariety-Se.patch b/target/linux/bcm27xx/patches-6.1/950-0409-media-dt-bindings-media-i2c-Add-Arducam-Pivariety-Se.patch
deleted file mode 100644
index 29ad23c0f3..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0409-media-dt-bindings-media-i2c-Add-Arducam-Pivariety-Se.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From 543fdf41f158306f263ead06f6036cdfc1e73b05 Mon Sep 17 00:00:00 2001
-From: Lee Jackson <info@arducam.com>
-Date: Thu, 21 Apr 2022 14:18:44 +0800
-Subject: [PATCH] media: dt-bindings: media: i2c: Add Arducam Pivariety
- Series CMOS sensor binding
-
-Add YAML device tree binding for Arducam Pivariety CMOS image sensor, and
-the relevant MAINTAINERS entries.
-
-Signed-off-by: Lee Jackson <info@arducam.com>
----
- .../bindings/media/i2c/arducam-pivariety.yaml | 112 ++++++++++++++++++
- MAINTAINERS                                   |   8 ++
- 2 files changed, 120 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/media/i2c/arducam-pivariety.yaml
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/media/i2c/arducam-pivariety.yaml
-@@ -0,0 +1,112 @@
-+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
-+%YAML 1.2
-+---
-+$id: http://devicetree.org/schemas/media/i2c/arducam-pivariety.yaml#
-+$schema: http://devicetree.org/meta-schemas/core.yaml#
-+
-+title: Arducam Pivariety Series CMOS Digital Image Sensor
-+
-+maintainers:
-+  - Lee Jackson <info@arducam.com>
-+
-+description: |-
-+  Arducam Pivariety series cameras make compatibility layers for various CMOS
-+  sensors and provide a unified command interface. It is programmable through
-+  I2C interface. The I2C address is fixed to 0x0C. Image data is sent through
-+  MIPI CSI-2, which is configured as either 1, 2 or 4 data lanes.
-+
-+properties:
-+  compatible:
-+    const: arducam,arducam-pivariety
-+
-+  reg:
-+    description: I2C device address
-+    maxItems: 1
-+
-+  clocks:
-+    maxItems: 1
-+
-+  VDIG-supply:
-+    description:
-+      Digital I/O voltage supply, 1.05 volts
-+
-+  VANA-supply:
-+    description:
-+      Analog voltage supply, 2.8 volts
-+
-+  VDDL-supply:
-+    description:
-+      Digital core voltage supply, 1.8 volts
-+
-+  reset-gpios:
-+    description: |-
-+      Reference to the GPIO connected to the xclr pin, if any.
-+      Must be released (set high) after all supplies and INCK are applied.
-+
-+  # See ../video-interfaces.txt for more details
-+  port:
-+    type: object
-+    properties:
-+      endpoint:
-+        type: object
-+        properties:
-+          data-lanes:
-+            description: |-
-+              The sensor supports either two-lane, or four-lane operation.
-+              For two-lane operation the property must be set to <1 2>.
-+            items:
-+              - const: 1
-+              - const: 2
-+
-+          clock-noncontinuous:
-+            type: boolean
-+            description: |-
-+              MIPI CSI-2 clock is non-continuous if this property is present,
-+              otherwise it's continuous.
-+
-+          link-frequencies:
-+            allOf:
-+              - $ref: /schemas/types.yaml#/definitions/uint64-array
-+            description:
-+              Allowed data bus frequencies.
-+
-+        required:
-+          - link-frequencies
-+
-+required:
-+  - compatible
-+  - reg
-+  - clocks
-+  - VANA-supply
-+  - VDIG-supply
-+  - VDDL-supply
-+  - port
-+
-+additionalProperties: false
-+
-+examples:
-+  - |
-+    i2c0 {
-+        #address-cells = <1>;
-+        #size-cells = <0>;
-+
-+        arducam_pivariety: sensor@0c {
-+            compatible = "arducam,arducam-pivariety";
-+            reg = <0x0c>;
-+            clocks = <&arducam_pivariety_clk>;
-+            VANA-supply = <&arducam_pivariety_vana>;   /* 2.8v */
-+            VDIG-supply = <&arducam_pivariety_vdig>;   /* 1.05v */
-+            VDDL-supply = <&arducam_pivariety_vddl>;   /* 1.8v */
-+
-+            port {
-+                arducam_pivariety_0: endpoint {
-+                    remote-endpoint = <&csi1_ep>;
-+                    data-lanes = <1 2>;
-+                    clock-noncontinuous;
-+                    link-frequencies = /bits/ 64 <493500000>;
-+                };
-+            };
-+        };
-+    };
-+
-+...
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -1559,6 +1559,14 @@ S:	Maintained
- F:	drivers/net/arcnet/
- F:	include/uapi/linux/if_arcnet.h
- 
-+ARDUCAM PIVARIETY SENSOR DRIVER
-+M:	Arducam Kernel Maintenance <info@arducam.com>
-+L:	linux-media@vger.kernel.org
-+S:	Maintained
-+T:	git git://linuxtv.org/media_tree.git
-+F:	Documentation/devicetree/bindings/media/i2c/arducam-pivariety.yaml
-+F:	drivers/media/i2c/arducam-pivariety.c
-+
- ARM ARCHITECTED TIMER DRIVER
- M:	Mark Rutland <mark.rutland@arm.com>
- M:	Marc Zyngier <maz@kernel.org>
diff --git a/target/linux/bcm27xx/patches-6.1/950-0410-media-i2c-Add-driver-of-Arducam-Pivariety-series-cam.patch b/target/linux/bcm27xx/patches-6.1/950-0410-media-i2c-Add-driver-of-Arducam-Pivariety-series-cam.patch
deleted file mode 100644
index 04c69d186a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0410-media-i2c-Add-driver-of-Arducam-Pivariety-series-cam.patch
+++ /dev/null
@@ -1,1635 +0,0 @@
-From 3be790df5d506e21cc729cc0646a16dfebe01aa1 Mon Sep 17 00:00:00 2001
-From: Lee Jackson <info@arducam.com>
-Date: Thu, 14 Apr 2022 17:31:01 +0800
-Subject: [PATCH] media: i2c: Add driver of Arducam Pivariety series
- camera
-
-Add a driver for the Arducam Pivariety series CSI2 camera sensor.
-
-Signed-off-by: Lee Jackson <info@arducam.com>
-
-SQUASH: Fix VIDEO_ARDUCAM_PIVARIETY Kconfig entry
-
-The cherry-pick from rpi-5.17.y put it in the wrong section, and failed
-to update it for 5.18.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/media/i2c/Kconfig             |   11 +
- drivers/media/i2c/Makefile            |    1 +
- drivers/media/i2c/arducam-pivariety.c | 1467 +++++++++++++++++++++++++
- drivers/media/i2c/arducam-pivariety.h |  107 ++
- 4 files changed, 1586 insertions(+)
- create mode 100644 drivers/media/i2c/arducam-pivariety.c
- create mode 100644 drivers/media/i2c/arducam-pivariety.h
-
---- a/drivers/media/i2c/Kconfig
-+++ b/drivers/media/i2c/Kconfig
-@@ -54,6 +54,17 @@ config VIDEO_AR0521
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called ar0521.
- 
-+config VIDEO_ARDUCAM_PIVARIETY
-+	tristate "Arducam Pivariety sensor support"
-+	depends on I2C && VIDEO_DEV
-+	select VIDEO_V4L2_SUBDEV_API
-+	help
-+	  This is a Video4Linux2 sensor driver for the Arducam
-+	  Pivariety camera series.
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called arducam-pivariety.
-+
- config VIDEO_HI556
- 	tristate "Hynix Hi-556 sensor support"
- 	depends on I2C && VIDEO_DEV
---- a/drivers/media/i2c/Makefile
-+++ b/drivers/media/i2c/Makefile
-@@ -21,6 +21,7 @@ obj-$(CONFIG_VIDEO_AK7375) += ak7375.o
- obj-$(CONFIG_VIDEO_AK881X) += ak881x.o
- obj-$(CONFIG_VIDEO_APTINA_PLL) += aptina-pll.o
- obj-$(CONFIG_VIDEO_AR0521) += ar0521.o
-+obj-$(CONFIG_VIDEO_ARDUCAM_PIVARIETY) += arducam-pivariety.o
- obj-$(CONFIG_VIDEO_BT819) += bt819.o
- obj-$(CONFIG_VIDEO_BT856) += bt856.o
- obj-$(CONFIG_VIDEO_BT866) += bt866.o
---- /dev/null
-+++ b/drivers/media/i2c/arducam-pivariety.c
-@@ -0,0 +1,1467 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * A V4L2 driver for Arducam Pivariety Cameras
-+ * Copyright (C) 2022 Arducam Technology co., Ltd.
-+ *
-+ * Based on Sony IMX219 camera driver
-+ * Copyright (C) 2019, Raspberry Pi (Trading) Ltd
-+ *
-+ * I2C read and write method is taken from the OV9281 driver
-+ * Copyright (C) 2017 Fuzhou Rockchip Electronics Co., Ltd.
-+ */
-+
-+#include <linux/clk.h>
-+#include <linux/delay.h>
-+#include <linux/gpio/consumer.h>
-+#include <linux/i2c.h>
-+#include <linux/module.h>
-+#include <linux/pm_runtime.h>
-+#include <linux/regulator/consumer.h>
-+#include <media/v4l2-ctrls.h>
-+#include <media/v4l2-device.h>
-+#include <media/v4l2-event.h>
-+#include <media/v4l2-fwnode.h>
-+#include "arducam-pivariety.h"
-+
-+static int debug;
-+module_param(debug, int, 0644);
-+
-+/* regulator supplies */
-+static const char * const pivariety_supply_name[] = {
-+	/* Supplies can be enabled in any order */
-+	"VANA",  /* Analog (2.8V) supply */
-+	"VDIG",  /* Digital Core (1.8V) supply */
-+	"VDDL",  /* IF (1.2V) supply */
-+};
-+
-+/* The supported raw formats. */
-+static const u32 codes[] = {
-+	MEDIA_BUS_FMT_SBGGR8_1X8,
-+	MEDIA_BUS_FMT_SGBRG8_1X8,
-+	MEDIA_BUS_FMT_SGRBG8_1X8,
-+	MEDIA_BUS_FMT_SRGGB8_1X8,
-+	MEDIA_BUS_FMT_Y8_1X8,
-+
-+	MEDIA_BUS_FMT_SBGGR10_1X10,
-+	MEDIA_BUS_FMT_SGBRG10_1X10,
-+	MEDIA_BUS_FMT_SGRBG10_1X10,
-+	MEDIA_BUS_FMT_SRGGB10_1X10,
-+	MEDIA_BUS_FMT_Y10_1X10,
-+
-+	MEDIA_BUS_FMT_SBGGR12_1X12,
-+	MEDIA_BUS_FMT_SGBRG12_1X12,
-+	MEDIA_BUS_FMT_SGRBG12_1X12,
-+	MEDIA_BUS_FMT_SRGGB12_1X12,
-+	MEDIA_BUS_FMT_Y12_1X12,
-+};
-+
-+#define ARDUCAM_NUM_SUPPLIES ARRAY_SIZE(pivariety_supply_name)
-+
-+#define ARDUCAM_XCLR_MIN_DELAY_US	10000
-+#define ARDUCAM_XCLR_DELAY_RANGE_US	1000
-+
-+#define MAX_CTRLS 32
-+
-+struct pivariety {
-+	struct v4l2_subdev sd;
-+	struct media_pad pad;
-+
-+	struct v4l2_fwnode_bus_mipi_csi2 bus;
-+	struct clk *xclk;
-+	u32 xclk_freq;
-+
-+	struct gpio_desc *reset_gpio;
-+	struct regulator_bulk_data supplies[ARDUCAM_NUM_SUPPLIES];
-+
-+	struct arducam_format *supported_formats;
-+	int num_supported_formats;
-+	int current_format_idx;
-+	int current_resolution_idx;
-+	int lanes;
-+	int bayer_order_volatile;
-+	bool wait_until_free;
-+
-+	struct v4l2_ctrl_handler ctrl_handler;
-+	struct v4l2_ctrl *ctrls[MAX_CTRLS];
-+	/* V4L2 Controls */
-+	struct v4l2_ctrl *vflip;
-+	struct v4l2_ctrl *hflip;
-+
-+	struct v4l2_rect crop;
-+	/*
-+	 * Mutex for serialized access:
-+	 * Protect sensor module set pad format and start/stop streaming safely.
-+	 */
-+	struct mutex mutex;
-+
-+	/* Streaming on/off */
-+	bool streaming;
-+};
-+
-+static inline struct pivariety *to_pivariety(struct v4l2_subdev *_sd)
-+{
-+	return container_of(_sd, struct pivariety, sd);
-+}
-+
-+/* Write registers up to 4 at a time */
-+static int pivariety_write_reg(struct i2c_client *client, u16 reg, u32 val)
-+{
-+	unsigned int len = sizeof(u32);
-+	u32 buf_i, val_i = 0;
-+	u8 buf[6];
-+	u8 *val_p;
-+	__be32 val_be;
-+
-+	buf[0] = reg >> 8;
-+	buf[1] = reg & 0xff;
-+
-+	val_be = cpu_to_be32(val);
-+	val_p = (u8 *)&val_be;
-+	buf_i = 2;
-+
-+	while (val_i < 4)
-+		buf[buf_i++] = val_p[val_i++];
-+
-+	if (i2c_master_send(client, buf, len + 2) != len + 2)
-+		return -EIO;
-+
-+	return 0;
-+}
-+
-+/* Read registers up to 4 at a time */
-+static int pivariety_read_reg(struct i2c_client *client, u16 reg, u32 *val)
-+{
-+	struct i2c_msg msgs[2];
-+	unsigned int len = sizeof(u32);
-+	u8 *data_be_p;
-+	__be32 data_be = 0;
-+	__be16 reg_addr_be = cpu_to_be16(reg);
-+	int ret;
-+
-+	data_be_p = (u8 *)&data_be;
-+	/* Write register address */
-+	msgs[0].addr = client->addr;
-+	msgs[0].flags = 0;
-+	msgs[0].len = 2;
-+	msgs[0].buf = (u8 *)&reg_addr_be;
-+
-+	/* Read data from register */
-+	msgs[1].addr = client->addr;
-+	msgs[1].flags = I2C_M_RD;
-+	msgs[1].len = len;
-+	msgs[1].buf = data_be_p;
-+
-+	ret = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
-+	if (ret != ARRAY_SIZE(msgs))
-+		return -EIO;
-+
-+	*val = be32_to_cpu(data_be);
-+
-+	return 0;
-+}
-+
-+static int
-+pivariety_read(struct pivariety *pivariety, u16 addr, u32 *value)
-+{
-+	struct v4l2_subdev *sd = &pivariety->sd;
-+	struct i2c_client *client = v4l2_get_subdevdata(sd);
-+	int ret, count = 0;
-+
-+	while (count++ < I2C_READ_RETRY_COUNT) {
-+		ret = pivariety_read_reg(client, addr, value);
-+		if (!ret) {
-+			v4l2_dbg(2, debug, sd, "%s: 0x%02x 0x%04x\n",
-+				 __func__, addr, *value);
-+			return ret;
-+		}
-+	}
-+
-+	v4l2_err(sd, "%s: Reading register 0x%02x failed\n",
-+		 __func__, addr);
-+
-+	return ret;
-+}
-+
-+static int pivariety_write(struct pivariety *pivariety, u16 addr, u32 value)
-+{
-+	struct v4l2_subdev *sd = &pivariety->sd;
-+	struct i2c_client *client = v4l2_get_subdevdata(sd);
-+	int ret, count = 0;
-+
-+	while (count++ < I2C_WRITE_RETRY_COUNT) {
-+		ret = pivariety_write_reg(client, addr, value);
-+		if (!ret)
-+			return ret;
-+	}
-+
-+	v4l2_err(sd, "%s: Write 0x%04x to register 0x%02x failed\n",
-+		 __func__, value, addr);
-+
-+	return ret;
-+}
-+
-+static int wait_for_free(struct pivariety *pivariety, int interval)
-+{
-+	u32 value;
-+	u32 count = 0;
-+
-+	while (count++ < (1000 / interval)) {
-+		int ret = pivariety_read(pivariety, SYSTEM_IDLE_REG, &value);
-+
-+		if (!ret && !value)
-+			break;
-+		msleep(interval);
-+	}
-+
-+	v4l2_dbg(2, debug, &pivariety->sd, "%s: End wait, Count: %d.\n",
-+		 __func__, count);
-+
-+	return 0;
-+}
-+
-+static int is_raw(int pixformat)
-+{
-+	return pixformat >= 0x28 && pixformat <= 0x2D;
-+}
-+
-+static u32 bayer_to_mbus_code(int data_type, int bayer_order)
-+{
-+	const u32 depth8[] = {
-+		MEDIA_BUS_FMT_SBGGR8_1X8,
-+		MEDIA_BUS_FMT_SGBRG8_1X8,
-+		MEDIA_BUS_FMT_SGRBG8_1X8,
-+		MEDIA_BUS_FMT_SRGGB8_1X8,
-+		MEDIA_BUS_FMT_Y8_1X8,
-+	};
-+
-+	const u32 depth10[] = {
-+		MEDIA_BUS_FMT_SBGGR10_1X10,
-+		MEDIA_BUS_FMT_SGBRG10_1X10,
-+		MEDIA_BUS_FMT_SGRBG10_1X10,
-+		MEDIA_BUS_FMT_SRGGB10_1X10,
-+		MEDIA_BUS_FMT_Y10_1X10,
-+	};
-+
-+	const u32 depth12[] = {
-+		MEDIA_BUS_FMT_SBGGR12_1X12,
-+		MEDIA_BUS_FMT_SGBRG12_1X12,
-+		MEDIA_BUS_FMT_SGRBG12_1X12,
-+		MEDIA_BUS_FMT_SRGGB12_1X12,
-+		MEDIA_BUS_FMT_Y12_1X12,
-+	};
-+
-+	if (bayer_order < 0 || bayer_order > 4)
-+		return 0;
-+
-+	switch (data_type) {
-+	case IMAGE_DT_RAW8:
-+		return depth8[bayer_order];
-+	case IMAGE_DT_RAW10:
-+		return depth10[bayer_order];
-+	case IMAGE_DT_RAW12:
-+		return depth12[bayer_order];
-+	}
-+
-+	return 0;
-+}
-+
-+static u32 yuv422_to_mbus_code(int data_type, int order)
-+{
-+	const u32 depth8[] = {
-+		MEDIA_BUS_FMT_YUYV8_1X16,
-+		MEDIA_BUS_FMT_YVYU8_1X16,
-+		MEDIA_BUS_FMT_UYVY8_1X16,
-+		MEDIA_BUS_FMT_VYUY8_1X16,
-+	};
-+
-+	const u32 depth10[] = {
-+		MEDIA_BUS_FMT_YUYV10_1X20,
-+		MEDIA_BUS_FMT_YVYU10_1X20,
-+		MEDIA_BUS_FMT_UYVY10_1X20,
-+		MEDIA_BUS_FMT_VYUY10_1X20,
-+	};
-+
-+	if (order < 0 || order > 3)
-+		return 0;
-+
-+	switch (data_type) {
-+	case IMAGE_DT_YUV422_8:
-+		return depth8[order];
-+	case IMAGE_DT_YUV422_10:
-+		return depth10[order];
-+	}
-+
-+	return 0;
-+}
-+
-+static u32 data_type_to_mbus_code(int data_type, int bayer_order)
-+{
-+	if (is_raw(data_type))
-+		return bayer_to_mbus_code(data_type, bayer_order);
-+
-+	switch (data_type) {
-+	case IMAGE_DT_YUV422_8:
-+	case IMAGE_DT_YUV422_10:
-+		return yuv422_to_mbus_code(data_type, bayer_order);
-+	case IMAGE_DT_RGB565:
-+		return MEDIA_BUS_FMT_RGB565_2X8_LE;
-+	case IMAGE_DT_RGB888:
-+		return MEDIA_BUS_FMT_RGB888_1X24;
-+	}
-+
-+	return 0;
-+}
-+
-+/* Get bayer order based on flip setting. */
-+static u32 pivariety_get_format_code(struct pivariety *pivariety,
-+				     struct arducam_format *format)
-+{
-+	unsigned int order, origin_order;
-+
-+	lockdep_assert_held(&pivariety->mutex);
-+
-+	/*
-+	 * Only the bayer format needs to transform the format.
-+	 */
-+	if (!is_raw(format->data_type) ||
-+	    !pivariety->bayer_order_volatile ||
-+	    format->bayer_order == BAYER_ORDER_GRAY)
-+		return data_type_to_mbus_code(format->data_type,
-+					      format->bayer_order);
-+
-+	order = format->bayer_order;
-+
-+	origin_order = order;
-+
-+	order = (pivariety->hflip && pivariety->hflip->val ? order ^ 1 : order);
-+	order = (pivariety->vflip && pivariety->vflip->val ? order ^ 2 : order);
-+
-+	v4l2_dbg(1, debug, &pivariety->sd, "%s: before: %d, after: %d.\n",
-+		 __func__, origin_order, order);
-+
-+	return data_type_to_mbus_code(format->data_type, order);
-+}
-+
-+/* Power/clock management functions */
-+static int pivariety_power_on(struct device *dev)
-+{
-+	struct i2c_client *client = to_i2c_client(dev);
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct pivariety *pivariety = to_pivariety(sd);
-+	int ret;
-+
-+	ret = regulator_bulk_enable(ARDUCAM_NUM_SUPPLIES,
-+				    pivariety->supplies);
-+	if (ret) {
-+		dev_err(dev, "%s: failed to enable regulators\n",
-+			__func__);
-+		return ret;
-+	}
-+
-+	ret = clk_prepare_enable(pivariety->xclk);
-+	if (ret) {
-+		dev_err(dev, "%s: failed to enable clock\n",
-+			__func__);
-+		goto reg_off;
-+	}
-+
-+	gpiod_set_value_cansleep(pivariety->reset_gpio, 1);
-+	usleep_range(ARDUCAM_XCLR_MIN_DELAY_US,
-+		     ARDUCAM_XCLR_MIN_DELAY_US + ARDUCAM_XCLR_DELAY_RANGE_US);
-+
-+	return 0;
-+
-+reg_off:
-+	regulator_bulk_disable(ARDUCAM_NUM_SUPPLIES, pivariety->supplies);
-+
-+	return ret;
-+}
-+
-+static int pivariety_power_off(struct device *dev)
-+{
-+	struct i2c_client *client = to_i2c_client(dev);
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct pivariety *pivariety = to_pivariety(sd);
-+
-+	gpiod_set_value_cansleep(pivariety->reset_gpio, 0);
-+	regulator_bulk_disable(ARDUCAM_NUM_SUPPLIES, pivariety->supplies);
-+	clk_disable_unprepare(pivariety->xclk);
-+
-+	return 0;
-+}
-+
-+static int pivariety_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
-+{
-+	struct pivariety *pivariety = to_pivariety(sd);
-+	struct v4l2_mbus_framefmt *try_fmt =
-+		v4l2_subdev_get_try_format(sd, fh->state, 0);
-+	struct arducam_format *def_fmt = &pivariety->supported_formats[0];
-+
-+	/* Initialize try_fmt */
-+	try_fmt->width = def_fmt->resolution_set->width;
-+	try_fmt->height = def_fmt->resolution_set->height;
-+	try_fmt->code = def_fmt->mbus_code;
-+	try_fmt->field = V4L2_FIELD_NONE;
-+
-+	return 0;
-+}
-+
-+static int pivariety_s_ctrl(struct v4l2_ctrl *ctrl)
-+{
-+	int ret, i;
-+	struct pivariety *pivariety =
-+		container_of(ctrl->handler, struct pivariety,
-+			     ctrl_handler);
-+	struct arducam_format *supported_fmts = pivariety->supported_formats;
-+	int num_supported_formats = pivariety->num_supported_formats;
-+
-+	v4l2_dbg(3, debug, &pivariety->sd, "%s: cid = (0x%X), value = (%d).\n",
-+		 __func__, ctrl->id, ctrl->val);
-+
-+	ret = pivariety_write(pivariety, CTRL_ID_REG, ctrl->id);
-+	ret += pivariety_write(pivariety, CTRL_VALUE_REG, ctrl->val);
-+	if (ret < 0)
-+		return -EINVAL;
-+
-+	/* When flip is set, modify all bayer formats */
-+	if (ctrl->id == V4L2_CID_VFLIP || ctrl->id == V4L2_CID_HFLIP) {
-+		for (i = 0; i < num_supported_formats; i++) {
-+			supported_fmts[i].mbus_code =
-+				pivariety_get_format_code(pivariety,
-+							  &supported_fmts[i]);
-+		}
-+	}
-+
-+	/*
-+	 * When starting streaming, controls are set in batches,
-+	 * and the short interval will cause some controls to be unsuccessfully
-+	 * set.
-+	 */
-+	if (pivariety->wait_until_free)
-+		wait_for_free(pivariety, 1);
-+	else
-+		usleep_range(200, 210);
-+
-+	return 0;
-+}
-+
-+static const struct v4l2_ctrl_ops pivariety_ctrl_ops = {
-+	.s_ctrl = pivariety_s_ctrl,
-+};
-+
-+static int pivariety_enum_mbus_code(struct v4l2_subdev *sd,
-+				    struct v4l2_subdev_state *sd_state,
-+				    struct v4l2_subdev_mbus_code_enum *code)
-+{
-+	struct pivariety *pivariety = to_pivariety(sd);
-+	struct arducam_format *supported_formats = pivariety->supported_formats;
-+	int num_supported_formats = pivariety->num_supported_formats;
-+
-+	v4l2_dbg(1, debug, sd, "%s: index = (%d)\n", __func__, code->index);
-+
-+	if (code->index >= num_supported_formats)
-+		return -EINVAL;
-+
-+	code->code = supported_formats[code->index].mbus_code;
-+
-+	return 0;
-+}
-+
-+static int pivariety_enum_framesizes(struct v4l2_subdev *sd,
-+				     struct v4l2_subdev_state *sd_state,
-+				     struct v4l2_subdev_frame_size_enum *fse)
-+{
-+	int i;
-+	struct pivariety *pivariety = to_pivariety(sd);
-+	struct arducam_format *supported_formats = pivariety->supported_formats;
-+	int num_supported_formats = pivariety->num_supported_formats;
-+	struct arducam_format *format;
-+	struct arducam_resolution *resolution;
-+
-+	v4l2_dbg(1, debug, sd, "%s: code = (0x%X), index = (%d)\n",
-+		 __func__, fse->code, fse->index);
-+
-+	for (i = 0; i < num_supported_formats; i++) {
-+		format = &supported_formats[i];
-+		if (fse->code == format->mbus_code) {
-+			if (fse->index >= format->num_resolution_set)
-+				return -EINVAL;
-+
-+			resolution = &format->resolution_set[fse->index];
-+			fse->min_width = resolution->width;
-+			fse->max_width = resolution->width;
-+			fse->min_height = resolution->height;
-+			fse->max_height = resolution->height;
-+
-+			return 0;
-+		}
-+	}
-+
-+	return -EINVAL;
-+}
-+
-+static int pivariety_get_fmt(struct v4l2_subdev *sd,
-+			     struct v4l2_subdev_state *sd_state,
-+			     struct v4l2_subdev_format *format)
-+{
-+	struct pivariety *pivariety = to_pivariety(sd);
-+	struct arducam_format *current_format;
-+	struct v4l2_mbus_framefmt *fmt = &format->format;
-+	int cur_res_idx;
-+
-+	if (format->pad != 0)
-+		return -EINVAL;
-+
-+	mutex_lock(&pivariety->mutex);
-+
-+	current_format =
-+		&pivariety->supported_formats[pivariety->current_format_idx];
-+	cur_res_idx = pivariety->current_resolution_idx;
-+	format->format.width =
-+		current_format->resolution_set[cur_res_idx].width;
-+	format->format.height =
-+		current_format->resolution_set[cur_res_idx].height;
-+	format->format.code = current_format->mbus_code;
-+	format->format.field = V4L2_FIELD_NONE;
-+	fmt->colorspace = V4L2_COLORSPACE_RAW;
-+	fmt->ycbcr_enc = V4L2_MAP_YCBCR_ENC_DEFAULT(fmt->colorspace);
-+	fmt->quantization = V4L2_MAP_QUANTIZATION_DEFAULT(true,
-+							  fmt->colorspace,
-+							  fmt->ycbcr_enc);
-+	fmt->xfer_func = V4L2_MAP_XFER_FUNC_DEFAULT(fmt->colorspace);
-+
-+	v4l2_dbg(1, debug, sd, "%s: width: (%d) height: (%d) code: (0x%X)\n",
-+		 __func__, format->format.width, format->format.height,
-+		 format->format.code);
-+
-+	mutex_unlock(&pivariety->mutex);
-+	return 0;
-+}
-+
-+static int pivariety_get_fmt_idx_by_code(struct pivariety *pivariety,
-+					 u32 mbus_code)
-+{
-+	int i;
-+	u32 data_type;
-+	struct arducam_format *formats = pivariety->supported_formats;
-+
-+	for (i = 0; i < pivariety->num_supported_formats; i++) {
-+		if (formats[i].mbus_code == mbus_code)
-+			return i;
-+	}
-+
-+	/*
-+	 * If the specified format is not found in the list of supported
-+	 * formats, try to find a format of the same data type.
-+	 */
-+	for (i = 0; i < ARRAY_SIZE(codes); i++)
-+		if (codes[i] == mbus_code)
-+			break;
-+
-+	if (i >= ARRAY_SIZE(codes))
-+		return -EINVAL;
-+
-+	data_type = i / 5 + IMAGE_DT_RAW8;
-+
-+	for (i = 0; i < pivariety->num_supported_formats; i++) {
-+		if (formats[i].data_type == data_type)
-+			return i;
-+	}
-+
-+	return -EINVAL;
-+}
-+
-+static struct v4l2_ctrl *get_control(struct pivariety *pivariety,
-+				     u32 id)
-+{
-+	int index = 0;
-+
-+	while (index < MAX_CTRLS && pivariety->ctrls[index]) {
-+		if (pivariety->ctrls[index]->id == id)
-+			return pivariety->ctrls[index];
-+		index++;
-+	}
-+
-+	return NULL;
-+}
-+
-+static int update_control(struct pivariety *pivariety, u32 id)
-+{
-+	struct v4l2_subdev *sd = &pivariety->sd;
-+	struct v4l2_ctrl *ctrl;
-+	u32 min, max, step, def, id2;
-+	int ret = 0;
-+
-+	pivariety_write(pivariety, CTRL_ID_REG, id);
-+	pivariety_read(pivariety, CTRL_ID_REG, &id2);
-+
-+	v4l2_dbg(1, debug, sd, "%s: Write ID: 0x%08X Read ID: 0x%08X\n",
-+		 __func__, id, id2);
-+
-+	pivariety_write(pivariety, CTRL_VALUE_REG, 0);
-+	wait_for_free(pivariety, 1);
-+
-+	ret += pivariety_read(pivariety, CTRL_MAX_REG, &max);
-+	ret += pivariety_read(pivariety, CTRL_MIN_REG, &min);
-+	ret += pivariety_read(pivariety, CTRL_DEF_REG, &def);
-+	ret += pivariety_read(pivariety, CTRL_STEP_REG, &step);
-+
-+	if (ret < 0)
-+		goto err;
-+
-+	if (id == NO_DATA_AVAILABLE || max == NO_DATA_AVAILABLE ||
-+	    min == NO_DATA_AVAILABLE || def == NO_DATA_AVAILABLE ||
-+	    step == NO_DATA_AVAILABLE)
-+		goto err;
-+
-+	v4l2_dbg(1, debug, sd, "%s: min: %d, max: %d, step: %d, def: %d\n",
-+		 __func__, min, max, step, def);
-+
-+	ctrl = get_control(pivariety, id);
-+	return __v4l2_ctrl_modify_range(ctrl, min, max, step, def);
-+
-+err:
-+	return -EINVAL;
-+}
-+
-+static int update_controls(struct pivariety *pivariety)
-+{
-+	int ret = 0;
-+	int index = 0;
-+
-+	wait_for_free(pivariety, 5);
-+
-+	while (index < MAX_CTRLS && pivariety->ctrls[index]) {
-+		ret += update_control(pivariety, pivariety->ctrls[index]->id);
-+		index++;
-+	}
-+
-+	return ret;
-+}
-+
-+static int pivariety_set_fmt(struct v4l2_subdev *sd,
-+			     struct v4l2_subdev_state *sd_state,
-+			     struct v4l2_subdev_format *format)
-+{
-+	int i, j;
-+	struct pivariety *pivariety = to_pivariety(sd);
-+	struct arducam_format *supported_formats = pivariety->supported_formats;
-+
-+	if (format->pad != 0)
-+		return -EINVAL;
-+
-+	mutex_lock(&pivariety->mutex);
-+
-+	format->format.colorspace = V4L2_COLORSPACE_RAW;
-+	format->format.field = V4L2_FIELD_NONE;
-+
-+	v4l2_dbg(1, debug, sd, "%s: code: 0x%X, width: %d, height: %d\n",
-+		 __func__, format->format.code, format->format.width,
-+		 format->format.height);
-+
-+	i = pivariety_get_fmt_idx_by_code(pivariety, format->format.code);
-+	if (i < 0)
-+		i = 0;
-+
-+	format->format.code = supported_formats[i].mbus_code;
-+
-+	for (j = 0; j < supported_formats[i].num_resolution_set; j++) {
-+		if (supported_formats[i].resolution_set[j].width ==
-+						format->format.width &&
-+			supported_formats[i].resolution_set[j].height ==
-+						format->format.height) {
-+			v4l2_dbg(1, debug, sd,
-+				 "%s: format match.\n", __func__);
-+			v4l2_dbg(1, debug, sd,
-+				 "%s: set format to device: %d %d.\n",
-+				 __func__, supported_formats[i].index, j);
-+
-+			pivariety_write(pivariety, PIXFORMAT_INDEX_REG,
-+					supported_formats[i].index);
-+			pivariety_write(pivariety, RESOLUTION_INDEX_REG, j);
-+
-+			pivariety->current_format_idx = i;
-+			pivariety->current_resolution_idx = j;
-+
-+			update_controls(pivariety);
-+
-+			goto unlock;
-+		}
-+	}
-+
-+	format->format.width = supported_formats[i].resolution_set[0].width;
-+	format->format.height = supported_formats[i].resolution_set[0].height;
-+
-+	pivariety_write(pivariety, PIXFORMAT_INDEX_REG,
-+			supported_formats[i].index);
-+	pivariety_write(pivariety, RESOLUTION_INDEX_REG, 0);
-+
-+	pivariety->current_format_idx = i;
-+	pivariety->current_resolution_idx = 0;
-+	update_controls(pivariety);
-+
-+unlock:
-+
-+	mutex_unlock(&pivariety->mutex);
-+
-+	return 0;
-+}
-+
-+/* Start streaming */
-+static int pivariety_start_streaming(struct pivariety *pivariety)
-+{
-+	int ret;
-+
-+	/* set stream on register */
-+	ret = pivariety_write(pivariety, MODE_SELECT_REG,
-+			      ARDUCAM_MODE_STREAMING);
-+
-+	if (ret)
-+		return ret;
-+
-+	wait_for_free(pivariety, 2);
-+
-+	/*
-+	 * When starting streaming, controls are set in batches,
-+	 * and the short interval will cause some controls to be unsuccessfully
-+	 * set.
-+	 */
-+	pivariety->wait_until_free = true;
-+	/* Apply customized values from user */
-+	ret =  __v4l2_ctrl_handler_setup(pivariety->sd.ctrl_handler);
-+
-+	pivariety->wait_until_free = false;
-+	if (ret)
-+		return ret;
-+
-+	wait_for_free(pivariety, 2);
-+
-+	return ret;
-+}
-+
-+static int pivariety_read_sel(struct pivariety *pivariety,
-+			      struct v4l2_rect *rect)
-+{
-+	int ret = 0;
-+
-+	ret += pivariety_read(pivariety, IPC_SEL_TOP_REG, &rect->top);
-+	ret += pivariety_read(pivariety, IPC_SEL_LEFT_REG, &rect->left);
-+	ret += pivariety_read(pivariety, IPC_SEL_WIDTH_REG, &rect->width);
-+	ret += pivariety_read(pivariety, IPC_SEL_HEIGHT_REG, &rect->height);
-+
-+	if (ret || rect->top == NO_DATA_AVAILABLE ||
-+	    rect->left == NO_DATA_AVAILABLE ||
-+	    rect->width == NO_DATA_AVAILABLE ||
-+	    rect->height == NO_DATA_AVAILABLE) {
-+		v4l2_err(&pivariety->sd, "%s: Failed to read selection.\n",
-+			 __func__);
-+		return -EINVAL;
-+		}
-+
-+	return 0;
-+}
-+
-+static const struct v4l2_rect *
-+__pivariety_get_pad_crop(struct pivariety *pivariety,
-+			 struct v4l2_subdev_state *sd_state,
-+			 unsigned int pad,
-+			 enum v4l2_subdev_format_whence which)
-+{
-+	int ret;
-+
-+	switch (which) {
-+	case V4L2_SUBDEV_FORMAT_TRY:
-+		return v4l2_subdev_get_try_crop(&pivariety->sd, sd_state, pad);
-+	case V4L2_SUBDEV_FORMAT_ACTIVE:
-+		ret = pivariety_read_sel(pivariety, &pivariety->crop);
-+		if (ret)
-+			return NULL;
-+		return &pivariety->crop;
-+	}
-+
-+	return NULL;
-+}
-+
-+static int pivariety_get_selection(struct v4l2_subdev *sd,
-+				   struct v4l2_subdev_state *sd_state,
-+				   struct v4l2_subdev_selection *sel)
-+{
-+	int ret = 0;
-+	struct v4l2_rect rect;
-+	struct pivariety *pivariety = to_pivariety(sd);
-+
-+	ret = pivariety_write(pivariety, IPC_SEL_TARGET_REG, sel->target);
-+	if (ret) {
-+		v4l2_err(sd, "%s: Write register 0x%02x failed\n",
-+			 __func__, IPC_SEL_TARGET_REG);
-+		return -EINVAL;
-+	}
-+
-+	wait_for_free(pivariety, 2);
-+
-+	switch (sel->target) {
-+	case V4L2_SEL_TGT_CROP: {
-+		mutex_lock(&pivariety->mutex);
-+		sel->r = *__pivariety_get_pad_crop(pivariety, sd_state,
-+						   sel->pad,
-+						   sel->which);
-+		mutex_unlock(&pivariety->mutex);
-+
-+		return 0;
-+	}
-+
-+	case V4L2_SEL_TGT_NATIVE_SIZE:
-+	case V4L2_SEL_TGT_CROP_DEFAULT:
-+	case V4L2_SEL_TGT_CROP_BOUNDS:
-+		ret = pivariety_read_sel(pivariety, &rect);
-+		if (ret)
-+			return -EINVAL;
-+
-+		sel->r = rect;
-+		return 0;
-+	}
-+
-+	return -EINVAL;
-+}
-+
-+/* Stop streaming */
-+static int pivariety_stop_streaming(struct pivariety *pivariety)
-+{
-+	int ret;
-+
-+	/* set stream off register */
-+	ret = pivariety_write(pivariety, MODE_SELECT_REG, ARDUCAM_MODE_STANDBY);
-+	if (ret)
-+		v4l2_err(&pivariety->sd, "%s failed to set stream\n", __func__);
-+
-+	/*
-+	 * Return success even if it was an error, as there is nothing the
-+	 * caller can do about it.
-+	 */
-+	return 0;
-+}
-+
-+static int pivariety_set_stream(struct v4l2_subdev *sd, int enable)
-+{
-+	struct pivariety *pivariety = to_pivariety(sd);
-+	struct i2c_client *client = v4l2_get_subdevdata(sd);
-+	int ret = 0;
-+
-+	mutex_lock(&pivariety->mutex);
-+	if (pivariety->streaming == enable) {
-+		mutex_unlock(&pivariety->mutex);
-+		return 0;
-+	}
-+
-+	if (enable) {
-+		ret = pm_runtime_get_sync(&client->dev);
-+		if (ret < 0) {
-+			pm_runtime_put_noidle(&client->dev);
-+			goto err_unlock;
-+		}
-+
-+		/*
-+		 * Apply default & customized values
-+		 * and then start streaming.
-+		 */
-+		ret = pivariety_start_streaming(pivariety);
-+		if (ret)
-+			goto err_rpm_put;
-+	} else {
-+		pivariety_stop_streaming(pivariety);
-+		pm_runtime_put(&client->dev);
-+	}
-+
-+	pivariety->streaming = enable;
-+
-+	/*
-+	 * vflip and hflip cannot change during streaming
-+	 * Pivariety may not implement flip control.
-+	 */
-+	if (pivariety->vflip)
-+		__v4l2_ctrl_grab(pivariety->vflip, enable);
-+
-+	if (pivariety->hflip)
-+		__v4l2_ctrl_grab(pivariety->hflip, enable);
-+
-+	mutex_unlock(&pivariety->mutex);
-+
-+	return ret;
-+
-+err_rpm_put:
-+	pm_runtime_put(&client->dev);
-+err_unlock:
-+	mutex_unlock(&pivariety->mutex);
-+
-+	return ret;
-+}
-+
-+static int __maybe_unused pivariety_suspend(struct device *dev)
-+{
-+	struct i2c_client *client = to_i2c_client(dev);
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct pivariety *pivariety = to_pivariety(sd);
-+
-+	if (pivariety->streaming)
-+		pivariety_stop_streaming(pivariety);
-+
-+	return 0;
-+}
-+
-+static int __maybe_unused pivariety_resume(struct device *dev)
-+{
-+	struct i2c_client *client = to_i2c_client(dev);
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct pivariety *pivariety = to_pivariety(sd);
-+	int ret;
-+
-+	if (pivariety->streaming) {
-+		ret = pivariety_start_streaming(pivariety);
-+		if (ret)
-+			goto error;
-+	}
-+
-+	return 0;
-+
-+error:
-+	pivariety_stop_streaming(pivariety);
-+	pivariety->streaming = 0;
-+	return ret;
-+}
-+
-+static int pivariety_get_regulators(struct pivariety *pivariety)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&pivariety->sd);
-+	int i;
-+
-+	for (i = 0; i < ARDUCAM_NUM_SUPPLIES; i++)
-+		pivariety->supplies[i].supply = pivariety_supply_name[i];
-+
-+	return devm_regulator_bulk_get(&client->dev,
-+				       ARDUCAM_NUM_SUPPLIES,
-+				       pivariety->supplies);
-+}
-+
-+static int pivariety_get_mbus_config(struct v4l2_subdev *sd, unsigned int pad,
-+				     struct v4l2_mbus_config *cfg)
-+{
-+	struct pivariety *pivariety = to_pivariety(sd);
-+	const u32 mask = V4L2_MBUS_CSI2_LANE_MASK;
-+
-+	if (pivariety->lanes > pivariety->bus.num_data_lanes)
-+		return -EINVAL;
-+
-+	cfg->type = V4L2_MBUS_CSI2_DPHY;
-+	cfg->flags = (pivariety->lanes << __ffs(mask)) & mask;
-+
-+	return 0;
-+}
-+
-+static const struct v4l2_subdev_core_ops pivariety_core_ops = {
-+	.subscribe_event = v4l2_ctrl_subdev_subscribe_event,
-+	.unsubscribe_event = v4l2_event_subdev_unsubscribe,
-+};
-+
-+static const struct v4l2_subdev_video_ops pivariety_video_ops = {
-+	.s_stream = pivariety_set_stream,
-+};
-+
-+static const struct v4l2_subdev_pad_ops pivariety_pad_ops = {
-+	.enum_mbus_code = pivariety_enum_mbus_code,
-+	.get_fmt = pivariety_get_fmt,
-+	.set_fmt = pivariety_set_fmt,
-+	.enum_frame_size = pivariety_enum_framesizes,
-+	.get_selection = pivariety_get_selection,
-+	.get_mbus_config = pivariety_get_mbus_config,
-+};
-+
-+static const struct v4l2_subdev_ops pivariety_subdev_ops = {
-+	.core = &pivariety_core_ops,
-+	.video = &pivariety_video_ops,
-+	.pad = &pivariety_pad_ops,
-+};
-+
-+static const struct v4l2_subdev_internal_ops pivariety_internal_ops = {
-+	.open = pivariety_open,
-+};
-+
-+static void pivariety_free_controls(struct pivariety *pivariety)
-+{
-+	v4l2_ctrl_handler_free(pivariety->sd.ctrl_handler);
-+	mutex_destroy(&pivariety->mutex);
-+}
-+
-+static int pivariety_get_length_of_set(struct pivariety *pivariety,
-+				       u16 idx_reg, u16 val_reg)
-+{
-+	int ret;
-+	int index = 0;
-+	u32 val;
-+
-+	while (1) {
-+		ret = pivariety_write(pivariety, idx_reg, index);
-+		ret += pivariety_read(pivariety, val_reg, &val);
-+
-+		if (ret < 0)
-+			return -1;
-+
-+		if (val == NO_DATA_AVAILABLE)
-+			break;
-+		index++;
-+	}
-+	pivariety_write(pivariety, idx_reg, 0);
-+	return index;
-+}
-+
-+static int pivariety_enum_resolution(struct pivariety *pivariety,
-+				     struct arducam_format *format)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&pivariety->sd);
-+	int index = 0;
-+	u32 width, height;
-+	int num_resolution = 0;
-+	int ret;
-+
-+	num_resolution = pivariety_get_length_of_set(pivariety,
-+						     RESOLUTION_INDEX_REG,
-+						     FORMAT_WIDTH_REG);
-+	if (num_resolution < 0)
-+		goto err;
-+
-+	format->resolution_set = devm_kzalloc(&client->dev,
-+					      sizeof(*format->resolution_set) *
-+								num_resolution,
-+					      GFP_KERNEL);
-+	while (1) {
-+		ret = pivariety_write(pivariety, RESOLUTION_INDEX_REG, index);
-+		ret += pivariety_read(pivariety, FORMAT_WIDTH_REG, &width);
-+		ret += pivariety_read(pivariety, FORMAT_HEIGHT_REG, &height);
-+
-+		if (ret < 0)
-+			goto err;
-+
-+		if (width == NO_DATA_AVAILABLE || height == NO_DATA_AVAILABLE)
-+			break;
-+
-+		format->resolution_set[index].width = width;
-+		format->resolution_set[index].height = height;
-+
-+		index++;
-+	}
-+
-+	format->num_resolution_set = index;
-+	pivariety_write(pivariety, RESOLUTION_INDEX_REG, 0);
-+	return 0;
-+err:
-+	return -ENODEV;
-+}
-+
-+static int pivariety_enum_pixformat(struct pivariety *pivariety)
-+{
-+	int ret = 0;
-+	u32 mbus_code = 0;
-+	int pixfmt_type;
-+	int bayer_order;
-+	int bayer_order_not_volatile;
-+	int lanes;
-+	int index = 0;
-+	int num_pixformat = 0;
-+	struct arducam_format *arducam_fmt;
-+	struct i2c_client *client = v4l2_get_subdevdata(&pivariety->sd);
-+
-+	num_pixformat = pivariety_get_length_of_set(pivariety,
-+						    PIXFORMAT_INDEX_REG,
-+						    PIXFORMAT_TYPE_REG);
-+
-+	if (num_pixformat < 0)
-+		goto err;
-+
-+	ret = pivariety_read(pivariety, FLIPS_DONT_CHANGE_ORDER_REG,
-+			     &bayer_order_not_volatile);
-+	if (bayer_order_not_volatile == NO_DATA_AVAILABLE)
-+		pivariety->bayer_order_volatile = 1;
-+	else
-+		pivariety->bayer_order_volatile = !bayer_order_not_volatile;
-+
-+	if (ret < 0)
-+		goto err;
-+
-+	pivariety->supported_formats =
-+		devm_kzalloc(&client->dev,
-+			     sizeof(*pivariety->supported_formats) *
-+								num_pixformat,
-+			     GFP_KERNEL);
-+
-+	while (1) {
-+		ret = pivariety_write(pivariety, PIXFORMAT_INDEX_REG, index);
-+		ret += pivariety_read(pivariety, PIXFORMAT_TYPE_REG,
-+				      &pixfmt_type);
-+
-+		if (pixfmt_type == NO_DATA_AVAILABLE)
-+			break;
-+
-+		ret += pivariety_read(pivariety, MIPI_LANES_REG, &lanes);
-+		if (lanes == NO_DATA_AVAILABLE)
-+			break;
-+
-+		ret += pivariety_read(pivariety, PIXFORMAT_ORDER_REG,
-+				      &bayer_order);
-+		if (ret < 0)
-+			goto err;
-+
-+		mbus_code = data_type_to_mbus_code(pixfmt_type, bayer_order);
-+		arducam_fmt = &pivariety->supported_formats[index];
-+		arducam_fmt->index = index;
-+		arducam_fmt->mbus_code = mbus_code;
-+		arducam_fmt->bayer_order = bayer_order;
-+		arducam_fmt->data_type = pixfmt_type;
-+		if (pivariety_enum_resolution(pivariety, arducam_fmt))
-+			goto err;
-+
-+		index++;
-+	}
-+
-+	pivariety_write(pivariety, PIXFORMAT_INDEX_REG, 0);
-+	pivariety->num_supported_formats = index;
-+	pivariety->current_format_idx = 0;
-+	pivariety->current_resolution_idx = 0;
-+	pivariety->lanes = lanes;
-+
-+	return 0;
-+
-+err:
-+	return -ENODEV;
-+}
-+
-+static const char *pivariety_ctrl_get_name(u32 id)
-+{
-+	switch (id) {
-+	case V4L2_CID_ARDUCAM_EXT_TRI:
-+		return "trigger_mode";
-+	case V4L2_CID_ARDUCAM_IRCUT:
-+		return "ircut";
-+	default:
-+		return NULL;
-+	}
-+}
-+
-+enum v4l2_ctrl_type pivariety_get_v4l2_ctrl_type(u32 id)
-+{
-+	switch (id) {
-+	case V4L2_CID_ARDUCAM_EXT_TRI:
-+		return V4L2_CTRL_TYPE_BOOLEAN;
-+	case V4L2_CID_ARDUCAM_IRCUT:
-+		return V4L2_CTRL_TYPE_BOOLEAN;
-+	default:
-+		return V4L2_CTRL_TYPE_INTEGER;
-+	}
-+}
-+
-+static struct v4l2_ctrl *v4l2_ctrl_new_arducam(struct v4l2_ctrl_handler *hdl,
-+					       const struct v4l2_ctrl_ops *ops,
-+					       u32 id, s64 min, s64 max,
-+					       u64 step, s64 def)
-+{
-+	struct v4l2_ctrl_config ctrl_cfg = {
-+		.ops = ops,
-+		.id = id,
-+		.name = NULL,
-+		.type = V4L2_CTRL_TYPE_INTEGER,
-+		.flags = 0,
-+		.min = min,
-+		.max = max,
-+		.def = def,
-+		.step = step,
-+	};
-+
-+	ctrl_cfg.name = pivariety_ctrl_get_name(id);
-+	ctrl_cfg.type = pivariety_get_v4l2_ctrl_type(id);
-+
-+	return v4l2_ctrl_new_custom(hdl, &ctrl_cfg, NULL);
-+}
-+
-+static int pivariety_enum_controls(struct pivariety *pivariety)
-+{
-+	struct v4l2_subdev *sd = &pivariety->sd;
-+	struct i2c_client *client = v4l2_get_subdevdata(sd);
-+	struct v4l2_ctrl_handler *ctrl_hdlr = &pivariety->ctrl_handler;
-+	struct v4l2_fwnode_device_properties props;
-+	struct v4l2_ctrl **ctrl = pivariety->ctrls;
-+	int ret, index, num_ctrls;
-+	u32 id, min, max, def, step;
-+
-+	num_ctrls = pivariety_get_length_of_set(pivariety, CTRL_INDEX_REG,
-+						CTRL_ID_REG);
-+	if (num_ctrls < 0)
-+		goto err;
-+
-+	v4l2_dbg(1, debug, sd, "%s: num_ctrls = %d\n",
-+		 __func__, num_ctrls);
-+
-+	ret = v4l2_ctrl_handler_init(ctrl_hdlr, num_ctrls);
-+	if (ret)
-+		return ret;
-+
-+	index = 0;
-+	while (1) {
-+		ret = pivariety_write(pivariety, CTRL_INDEX_REG, index);
-+		pivariety_write(pivariety, CTRL_VALUE_REG, 0);
-+		wait_for_free(pivariety, 1);
-+
-+		ret += pivariety_read(pivariety, CTRL_ID_REG, &id);
-+		ret += pivariety_read(pivariety, CTRL_MAX_REG, &max);
-+		ret += pivariety_read(pivariety, CTRL_MIN_REG, &min);
-+		ret += pivariety_read(pivariety, CTRL_DEF_REG, &def);
-+		ret += pivariety_read(pivariety, CTRL_STEP_REG, &step);
-+		if (ret < 0)
-+			goto err;
-+
-+		if (id == NO_DATA_AVAILABLE || max == NO_DATA_AVAILABLE ||
-+		    min == NO_DATA_AVAILABLE || def == NO_DATA_AVAILABLE ||
-+		    step == NO_DATA_AVAILABLE)
-+			break;
-+
-+		v4l2_dbg(1, debug, sd,
-+			 "%s: index = %d, id = 0x%x, max = %d, min = %d, def = %d, step = %d\n",
-+			 __func__, index, id, max, min, def, step);
-+
-+		if (v4l2_ctrl_get_name(id)) {
-+			*ctrl = v4l2_ctrl_new_std(ctrl_hdlr,
-+						  &pivariety_ctrl_ops,
-+						  id, min,
-+						  max, step,
-+						  def);
-+			v4l2_dbg(1, debug, sd, "%s: ctrl: 0x%p\n",
-+				 __func__, *ctrl);
-+		} else if (pivariety_ctrl_get_name(id)) {
-+			*ctrl = v4l2_ctrl_new_arducam(ctrl_hdlr,
-+						      &pivariety_ctrl_ops,
-+						      id, min, max, step, def);
-+
-+			v4l2_dbg(1, debug, sd,
-+				 "%s: new custom ctrl, ctrl: 0x%p.\n",
-+				 __func__, *ctrl);
-+		} else {
-+			index++;
-+			continue;
-+		}
-+
-+		if (!*ctrl)
-+			goto err;
-+
-+		switch (id) {
-+		case V4L2_CID_HFLIP:
-+			pivariety->hflip = *ctrl;
-+			if (pivariety->bayer_order_volatile)
-+				pivariety->hflip->flags |=
-+						V4L2_CTRL_FLAG_MODIFY_LAYOUT;
-+			break;
-+
-+		case V4L2_CID_VFLIP:
-+			pivariety->vflip = *ctrl;
-+			if (pivariety->bayer_order_volatile)
-+				pivariety->vflip->flags |=
-+						V4L2_CTRL_FLAG_MODIFY_LAYOUT;
-+			break;
-+
-+		case V4L2_CID_HBLANK:
-+			(*ctrl)->flags |= V4L2_CTRL_FLAG_READ_ONLY;
-+			break;
-+		}
-+
-+		ctrl++;
-+		index++;
-+	}
-+
-+	pivariety_write(pivariety, CTRL_INDEX_REG, 0);
-+
-+	ret = v4l2_fwnode_device_parse(&client->dev, &props);
-+	if (ret)
-+		goto err;
-+
-+	ret = v4l2_ctrl_new_fwnode_properties(ctrl_hdlr,
-+					      &pivariety_ctrl_ops,
-+					      &props);
-+	if (ret)
-+		goto err;
-+
-+	pivariety->sd.ctrl_handler = ctrl_hdlr;
-+	v4l2_ctrl_handler_setup(ctrl_hdlr);
-+	return 0;
-+err:
-+	return -ENODEV;
-+}
-+
-+static int pivariety_parse_dt(struct pivariety *pivariety, struct device *dev)
-+{
-+	struct fwnode_handle *endpoint;
-+	struct v4l2_fwnode_endpoint ep_cfg = {
-+		.bus_type = V4L2_MBUS_CSI2_DPHY
-+	};
-+	int ret = -EINVAL;
-+
-+	/* Get CSI2 bus config */
-+	endpoint = fwnode_graph_get_next_endpoint(dev_fwnode(dev), NULL);
-+	if (!endpoint) {
-+		dev_err(dev, "endpoint node not found\n");
-+		return -EINVAL;
-+	}
-+
-+	if (v4l2_fwnode_endpoint_alloc_parse(endpoint, &ep_cfg)) {
-+		dev_err(dev, "could not parse endpoint\n");
-+		goto error_out;
-+	}
-+
-+	pivariety->bus = ep_cfg.bus.mipi_csi2;
-+
-+	ret = 0;
-+
-+error_out:
-+	v4l2_fwnode_endpoint_free(&ep_cfg);
-+	fwnode_handle_put(endpoint);
-+
-+	return ret;
-+}
-+
-+static int pivariety_probe(struct i2c_client *client,
-+			   const struct i2c_device_id *id)
-+{
-+	struct device *dev = &client->dev;
-+	struct pivariety *pivariety;
-+	u32 device_id, firmware_version;
-+	int ret;
-+
-+	pivariety = devm_kzalloc(&client->dev, sizeof(*pivariety), GFP_KERNEL);
-+	if (!pivariety)
-+		return -ENOMEM;
-+
-+	/* Initialize subdev */
-+	v4l2_i2c_subdev_init(&pivariety->sd, client,
-+			     &pivariety_subdev_ops);
-+
-+	if (pivariety_parse_dt(pivariety, dev))
-+		return -EINVAL;
-+
-+	/* Get system clock (xclk) */
-+	pivariety->xclk = devm_clk_get(dev, "xclk");
-+	if (IS_ERR(pivariety->xclk)) {
-+		dev_err(dev, "failed to get xclk\n");
-+		return PTR_ERR(pivariety->xclk);
-+	}
-+
-+	pivariety->xclk_freq = clk_get_rate(pivariety->xclk);
-+	if (pivariety->xclk_freq != 24000000) {
-+		dev_err(dev, "xclk frequency not supported: %d Hz\n",
-+			pivariety->xclk_freq);
-+		return -EINVAL;
-+	}
-+
-+	ret = pivariety_get_regulators(pivariety);
-+	if (ret)
-+		return ret;
-+
-+	/* Request optional enable pin */
-+	pivariety->reset_gpio = devm_gpiod_get_optional(dev, "reset",
-+							GPIOD_OUT_HIGH);
-+
-+	ret = pivariety_power_on(dev);
-+	if (ret)
-+		return ret;
-+
-+	ret = pivariety_read(pivariety, DEVICE_ID_REG, &device_id);
-+	if (ret || device_id != DEVICE_ID) {
-+		dev_err(dev, "probe failed\n");
-+		ret = -ENODEV;
-+		goto error_power_off;
-+	}
-+
-+	ret = pivariety_read(pivariety, DEVICE_VERSION_REG, &firmware_version);
-+	if (ret)
-+		dev_err(dev, "read firmware version failed\n");
-+
-+	dev_info(dev, "firmware version: 0x%04X\n", firmware_version);
-+
-+	if (pivariety_enum_pixformat(pivariety)) {
-+		dev_err(dev, "enum pixformat failed.\n");
-+		ret = -ENODEV;
-+		goto error_power_off;
-+	}
-+
-+	if (pivariety_enum_controls(pivariety)) {
-+		dev_err(dev, "enum controls failed.\n");
-+		ret = -ENODEV;
-+		goto error_power_off;
-+	}
-+
-+	/* Initialize subdev */
-+	pivariety->sd.internal_ops = &pivariety_internal_ops;
-+	pivariety->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
-+	pivariety->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR;
-+	/* Initialize source pad */
-+	pivariety->pad.flags = MEDIA_PAD_FL_SOURCE;
-+
-+	ret = media_entity_pads_init(&pivariety->sd.entity, 1, &pivariety->pad);
-+	if (ret)
-+		goto error_handler_free;
-+
-+	ret = v4l2_async_register_subdev_sensor(&pivariety->sd);
-+	if (ret < 0)
-+		goto error_media_entity;
-+
-+	pm_runtime_set_active(dev);
-+	pm_runtime_enable(dev);
-+	pm_runtime_idle(dev);
-+
-+	return 0;
-+
-+error_media_entity:
-+	media_entity_cleanup(&pivariety->sd.entity);
-+
-+error_handler_free:
-+	pivariety_free_controls(pivariety);
-+
-+error_power_off:
-+	pivariety_power_off(dev);
-+
-+	return ret;
-+}
-+
-+static void pivariety_remove(struct i2c_client *client)
-+{
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct pivariety *pivariety = to_pivariety(sd);
-+
-+	v4l2_async_unregister_subdev(sd);
-+	media_entity_cleanup(&sd->entity);
-+	pivariety_free_controls(pivariety);
-+
-+	pm_runtime_disable(&client->dev);
-+	pm_runtime_set_suspended(&client->dev);
-+}
-+
-+static const struct dev_pm_ops pivariety_pm_ops = {
-+	SET_SYSTEM_SLEEP_PM_OPS(pivariety_suspend, pivariety_resume)
-+	SET_RUNTIME_PM_OPS(pivariety_power_off, pivariety_power_on, NULL)
-+};
-+
-+static const struct of_device_id arducam_pivariety_dt_ids[] = {
-+	{ .compatible = "arducam,arducam-pivariety" },
-+	{ /* sentinel */ }
-+};
-+MODULE_DEVICE_TABLE(of, arducam_pivariety_dt_ids);
-+
-+static struct i2c_driver arducam_pivariety_i2c_driver = {
-+	.driver = {
-+		.name = "arducam-pivariety",
-+		.of_match_table	= arducam_pivariety_dt_ids,
-+		.pm = &pivariety_pm_ops,
-+	},
-+	.probe = pivariety_probe,
-+	.remove = pivariety_remove,
-+};
-+
-+module_i2c_driver(arducam_pivariety_i2c_driver);
-+
-+MODULE_AUTHOR("Lee Jackson <info@arducam.com>");
-+MODULE_DESCRIPTION("Arducam Pivariety v4l2 driver");
-+MODULE_LICENSE("GPL v2");
---- /dev/null
-+++ b/drivers/media/i2c/arducam-pivariety.h
-@@ -0,0 +1,107 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+#ifndef _ARDUCAM_PIVARIETY_H_
-+#define _ARDUCAM_PIVARIETY_H_
-+
-+#define DEVICE_REG_BASE		0x0100
-+#define PIXFORMAT_REG_BASE	0x0200
-+#define FORMAT_REG_BASE		0x0300
-+#define CTRL_REG_BASE		0x0400
-+#define IPC_REG_BASE		0x0600
-+
-+#define ARDUCAM_MODE_STANDBY		0x00
-+#define ARDUCAM_MODE_STREAMING		0x01
-+
-+#define MODE_SELECT_REG		(DEVICE_REG_BASE | 0x0000)
-+#define DEVICE_VERSION_REG	(DEVICE_REG_BASE | 0x0001)
-+#define SENSOR_ID_REG		(DEVICE_REG_BASE | 0x0002)
-+#define DEVICE_ID_REG		(DEVICE_REG_BASE | 0x0003)
-+#define SYSTEM_IDLE_REG		(DEVICE_REG_BASE | 0x0007)
-+
-+#define PIXFORMAT_INDEX_REG		(PIXFORMAT_REG_BASE | 0x0000)
-+#define PIXFORMAT_TYPE_REG		(PIXFORMAT_REG_BASE | 0x0001)
-+#define PIXFORMAT_ORDER_REG		(PIXFORMAT_REG_BASE | 0x0002)
-+#define MIPI_LANES_REG			(PIXFORMAT_REG_BASE | 0x0003)
-+#define FLIPS_DONT_CHANGE_ORDER_REG	(PIXFORMAT_REG_BASE | 0x0004)
-+
-+#define RESOLUTION_INDEX_REG	(FORMAT_REG_BASE | 0x0000)
-+#define FORMAT_WIDTH_REG	(FORMAT_REG_BASE | 0x0001)
-+#define FORMAT_HEIGHT_REG	(FORMAT_REG_BASE | 0x0002)
-+
-+#define CTRL_INDEX_REG	(CTRL_REG_BASE | 0x0000)
-+#define CTRL_ID_REG	(CTRL_REG_BASE | 0x0001)
-+#define CTRL_MIN_REG	(CTRL_REG_BASE | 0x0002)
-+#define CTRL_MAX_REG	(CTRL_REG_BASE | 0x0003)
-+#define CTRL_STEP_REG	(CTRL_REG_BASE | 0x0004)
-+#define CTRL_DEF_REG	(CTRL_REG_BASE | 0x0005)
-+#define CTRL_VALUE_REG	(CTRL_REG_BASE | 0x0006)
-+
-+#define IPC_SEL_TARGET_REG	(IPC_REG_BASE | 0x0000)
-+#define IPC_SEL_TOP_REG		(IPC_REG_BASE | 0x0001)
-+#define IPC_SEL_LEFT_REG	(IPC_REG_BASE | 0x0002)
-+#define IPC_SEL_WIDTH_REG	(IPC_REG_BASE | 0x0003)
-+#define IPC_SEL_HEIGHT_REG	(IPC_REG_BASE | 0x0004)
-+#define IPC_DELAY_REG		(IPC_REG_BASE | 0x0005)
-+
-+#define NO_DATA_AVAILABLE	0xFFFFFFFE
-+
-+#define DEVICE_ID	0x0030
-+
-+#define I2C_READ_RETRY_COUNT	3
-+#define I2C_WRITE_RETRY_COUNT	2
-+
-+#define V4L2_CID_ARDUCAM_BASE		(V4L2_CID_USER_BASE + 0x1000)
-+#define V4L2_CID_ARDUCAM_EXT_TRI	(V4L2_CID_ARDUCAM_BASE + 1)
-+#define V4L2_CID_ARDUCAM_IRCUT		(V4L2_CID_ARDUCAM_BASE + 8)
-+
-+enum image_dt {
-+	IMAGE_DT_YUV420_8 = 0x18,
-+	IMAGE_DT_YUV420_10,
-+
-+	IMAGE_DT_YUV420CSPS_8 = 0x1C,
-+	IMAGE_DT_YUV420CSPS_10,
-+	IMAGE_DT_YUV422_8,
-+	IMAGE_DT_YUV422_10,
-+	IMAGE_DT_RGB444,
-+	IMAGE_DT_RGB555,
-+	IMAGE_DT_RGB565,
-+	IMAGE_DT_RGB666,
-+	IMAGE_DT_RGB888,
-+
-+	IMAGE_DT_RAW6 = 0x28,
-+	IMAGE_DT_RAW7,
-+	IMAGE_DT_RAW8,
-+	IMAGE_DT_RAW10,
-+	IMAGE_DT_RAW12,
-+	IMAGE_DT_RAW14,
-+};
-+
-+enum bayer_order {
-+	BAYER_ORDER_BGGR = 0,
-+	BAYER_ORDER_GBRG = 1,
-+	BAYER_ORDER_GRBG = 2,
-+	BAYER_ORDER_RGGB = 3,
-+	BAYER_ORDER_GRAY = 4,
-+};
-+
-+enum yuv_order {
-+	YUV_ORDER_YUYV = 0,
-+	YUV_ORDER_YVYU = 1,
-+	YUV_ORDER_UYVY = 2,
-+	YUV_ORDER_VYUY = 3,
-+};
-+
-+struct arducam_resolution {
-+	u32 width;
-+	u32 height;
-+};
-+
-+struct arducam_format {
-+	u32 index;
-+	u32 mbus_code;
-+	u32 bayer_order;
-+	u32 data_type;
-+	u32 num_resolution_set;
-+	struct arducam_resolution *resolution_set;
-+};
-+
-+#endif
diff --git a/target/linux/bcm27xx/patches-6.1/950-0411-thermal-broadcom-Use-dev_err_probe-to-suppress-defer.patch b/target/linux/bcm27xx/patches-6.1/950-0411-thermal-broadcom-Use-dev_err_probe-to-suppress-defer.patch
deleted file mode 100644
index 1664118980..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0411-thermal-broadcom-Use-dev_err_probe-to-suppress-defer.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From edf2f98b1a08b36a6ccbb4dd090acb741e09e085 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 6 May 2022 15:34:44 +0100
-Subject: [PATCH] thermal: broadcom: Use dev_err_probe to suppress
- defer errors
-
-It is quite common for the devm_thermal_zone_of_sensor_register
-to need to defer, so avoid spamming the log by using
-dev_err_probe instead of dev_err.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/thermal/broadcom/bcm2711_thermal.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/thermal/broadcom/bcm2711_thermal.c
-+++ b/drivers/thermal/broadcom/bcm2711_thermal.c
-@@ -92,7 +92,7 @@ static int bcm2711_thermal_probe(struct
- 						&bcm2711_thermal_of_ops);
- 	if (IS_ERR(thermal)) {
- 		ret = PTR_ERR(thermal);
--		dev_err(dev, "could not register sensor: %d\n", ret);
-+		dev_err_probe(dev, ret, "could not register sensor: %d\n", ret);
- 		return ret;
- 	}
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0412-dt-bindings-hwmon-add-microchip-emc2305.yaml-dt-bind.patch b/target/linux/bcm27xx/patches-6.1/950-0412-dt-bindings-hwmon-add-microchip-emc2305.yaml-dt-bind.patch
deleted file mode 100644
index e6cfecfe25..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0412-dt-bindings-hwmon-add-microchip-emc2305.yaml-dt-bind.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 25478932f5d9e6f763cdf9a0ee2272e33510a76a Mon Sep 17 00:00:00 2001
-From: Michael Shych <michaelsh@nvidia.com>
-Date: Sat, 30 Apr 2022 14:49:04 +0300
-Subject: [PATCH] dt-bindings: hwmon: add microchip,emc2305.yaml dt
- binding description.
-
-Submitted to linux-hwmon mailing list at
-https://patchwork.kernel.org/project/linux-hwmon/patch/20220430114905.53448-3-michaelsh@nvidia.com/
-
-Add basic description of emc2305 driver device tree binding.
-
-Signed-off-by: Michael Shych <michaelsh@nvidia.com>
-Reviewed-by: Vadim Pasternak <vadimp@nvidia.com>
----
- .../bindings/hwmon/microchip,emc2305.yaml     | 54 +++++++++++++++++++
- 1 file changed, 54 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/hwmon/microchip,emc2305.yaml
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/hwmon/microchip,emc2305.yaml
-@@ -0,0 +1,54 @@
-+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
-+%YAML 1.2
-+---
-+
-+$id: http://devicetree.org/schemas/hwmon/emc2305.yaml#
-+$schema: http://devicetree.org/meta-schemas/core.yaml#
-+
-+title: Microchip EMC2305 RPM-based PWM Fan Speed Controller
-+
-+properties:
-+  compatible:
-+    enum:
-+      - microcip,emc2305
-+
-+  emc2305,pwm-min:
-+    description:
-+      Min pwm of emc2305
-+    maxItems: 1
-+  emc2305,pwm-max:
-+    description:
-+      Max pwm of emc2305
-+    maxItems: 1
-+  emc2305,pwm-channel:
-+    description:
-+      Max number of pwm channels
-+    maxItems: 1
-+  emcs205,max-state:
-+    description:
-+    maxItems: 1
-+  emc2305,cooling-levels:
-+    description:
-+      Quantity of cooling level state.
-+    maxItems: 1
-+
-+required:
-+  - compatible
-+
-+optional:
-+  - emc2305,min-pwm
-+  - emc2305,max-pwm
-+  - emc2305,pwm-channels
-+  - emc2305,cooling-levels
-+
-+additionalProperties: false
-+
-+examples:
-+  - |
-+    fan {
-+        emc2305,compatible = "microchip,emc2305";
-+        emc2305,pwm-min = <0>;
-+        emc2305,pwm-max = <255>;
-+        emc2305,pwm-channel = <5>
-+        emc2305,cooling-levels = <10>;
-+    };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0413-dtbindings-Fixup-microchip-emc2305.yaml-bindings.patch b/target/linux/bcm27xx/patches-6.1/950-0413-dtbindings-Fixup-microchip-emc2305.yaml-bindings.patch
deleted file mode 100644
index 93a913903e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0413-dtbindings-Fixup-microchip-emc2305.yaml-bindings.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2bc4fabde3e63ffb5484804a5f0d1ee950d77475 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 10 May 2022 14:03:30 +0100
-Subject: [PATCH] dtbindings: Fixup microchip,emc2305.yaml bindings
-
-The bindings submitted to mainline had some issues, so fix them up.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../devicetree/bindings/hwmon/microchip,emc2305.yaml      | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/Documentation/devicetree/bindings/hwmon/microchip,emc2305.yaml
-+++ b/Documentation/devicetree/bindings/hwmon/microchip,emc2305.yaml
-@@ -5,13 +5,13 @@
- $id: http://devicetree.org/schemas/hwmon/emc2305.yaml#
- $schema: http://devicetree.org/meta-schemas/core.yaml#
- 
--title: Microchip EMC2305 RPM-based PWM Fan Speed Controller
-+title: Microchip EMC230[1|2|3|5] RPM-based PWM Fan Speed Controller
- 
- properties:
-   compatible:
-     enum:
--      - microcip,emc2305
--
-+      - microchip,emc2305
-+      - microchip,emc2301
-   emc2305,pwm-min:
-     description:
-       Min pwm of emc2305
-@@ -46,7 +46,7 @@ additionalProperties: false
- examples:
-   - |
-     fan {
--        emc2305,compatible = "microchip,emc2305";
-+        compatible = "microchip,emc2305";
-         emc2305,pwm-min = <0>;
-         emc2305,pwm-max = <255>;
-         emc2305,pwm-channel = <5>
diff --git a/target/linux/bcm27xx/patches-6.1/950-0414-media-i2c-Update-ov2311-Kconfig-entry.patch b/target/linux/bcm27xx/patches-6.1/950-0414-media-i2c-Update-ov2311-Kconfig-entry.patch
deleted file mode 100644
index f874c934da..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0414-media-i2c-Update-ov2311-Kconfig-entry.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From ad20758237a3cd6c88baa9ef4d874b93a9c36c9f Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 12 May 2022 14:29:48 +0100
-Subject: [PATCH] media: i2c: Update ov2311 Kconfig entry
-
-Bring the OV2311 Kconfig declaration in line with upstream entries.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/media/i2c/Kconfig | 1 -
- 1 file changed, 1 deletion(-)
-
---- a/drivers/media/i2c/Kconfig
-+++ b/drivers/media/i2c/Kconfig
-@@ -416,7 +416,6 @@ config VIDEO_OV13B10
- config VIDEO_OV2311
- 	tristate "OmniVision OV2311 sensor support"
- 	depends on I2C && VIDEO_DEV
--	depends on MEDIA_CAMERA_SUPPORT
- 	help
- 	  This is a Video4Linux2 sensor-level driver for the OmniVision
- 	  OV2311 camera.
diff --git a/target/linux/bcm27xx/patches-6.1/950-0415-media-i2c-Update-ov9281-Kconfig-entry.patch b/target/linux/bcm27xx/patches-6.1/950-0415-media-i2c-Update-ov9281-Kconfig-entry.patch
deleted file mode 100644
index b6e0e80070..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0415-media-i2c-Update-ov9281-Kconfig-entry.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 53d17ef5f5618b7abb34b5b0b471253cb8a5358e Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 12 May 2022 14:31:43 +0100
-Subject: [PATCH] media: i2c: Update ov9281 Kconfig entry
-
-Bring the OV9281 Kconfig declaration in line with upstream entries.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/media/i2c/Kconfig | 1 -
- 1 file changed, 1 deletion(-)
-
---- a/drivers/media/i2c/Kconfig
-+++ b/drivers/media/i2c/Kconfig
-@@ -1374,7 +1374,6 @@ config VIDEO_TW2804
- config VIDEO_OV9281
- 	tristate "OmniVision OV9281 sensor support"
- 	depends on I2C && VIDEO_DEV
--	depends on MEDIA_CAMERA_SUPPORT
- 	help
- 	  This is a Video4Linux2 sensor-level driver for the OmniVision
- 	  OV9281 camera.
diff --git a/target/linux/bcm27xx/patches-6.1/950-0416-media-i2c-Update-irs1125-Kconfig-entry.patch b/target/linux/bcm27xx/patches-6.1/950-0416-media-i2c-Update-irs1125-Kconfig-entry.patch
deleted file mode 100644
index 6f27e4be37..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0416-media-i2c-Update-irs1125-Kconfig-entry.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 641461e6a0e15b822b28ad63d8d4976441c493e5 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 12 May 2022 14:32:26 +0100
-Subject: [PATCH] media: i2c: Update irs1125 Kconfig entry
-
-Bring the IRS1125 Kconfig declaration in line with upstream entries.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/media/i2c/Kconfig | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/media/i2c/Kconfig
-+++ b/drivers/media/i2c/Kconfig
-@@ -1413,8 +1413,8 @@ config VIDEO_TW9910
- 
- config VIDEO_IRS1125
- 	tristate "Infineon IRS1125 sensor support"
--	depends on I2C && VIDEO_DEV && VIDEO_V4L2_SUBDEV_API
--	depends on MEDIA_CAMERA_SUPPORT
-+	depends on I2C && VIDEO_DEV
-+	select VIDEO_V4L2_SUBDEV_API
- 	select V4L2_FWNODE
- 	help
- 	  This is a Video4Linux2 sensor-level driver for the Infineon
diff --git a/target/linux/bcm27xx/patches-6.1/950-0417-media-i2c-arducam-pivariety-Fixup-for-mainline-API-c.patch b/target/linux/bcm27xx/patches-6.1/950-0417-media-i2c-arducam-pivariety-Fixup-for-mainline-API-c.patch
deleted file mode 100644
index 82a5fb11bb..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0417-media-i2c-arducam-pivariety-Fixup-for-mainline-API-c.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 3018f1ad77f6943665d5300490cff3c1ee1e4f17 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 12 May 2022 17:42:08 +0100
-Subject: [PATCH] media: i2c: arducam-pivariety: Fixup for mainline API
- changes
-
-Mainline APIs have changed the way in which the bus flags and
-number of active CSI2 data lanes is signalled, so fix the driver
-up accordingly.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/i2c/arducam-pivariety.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/drivers/media/i2c/arducam-pivariety.c
-+++ b/drivers/media/i2c/arducam-pivariety.c
-@@ -66,7 +66,7 @@ struct pivariety {
- 	struct v4l2_subdev sd;
- 	struct media_pad pad;
- 
--	struct v4l2_fwnode_bus_mipi_csi2 bus;
-+	struct v4l2_mbus_config_mipi_csi2 bus;
- 	struct clk *xclk;
- 	u32 xclk_freq;
- 
-@@ -946,13 +946,13 @@ static int pivariety_get_mbus_config(str
- 				     struct v4l2_mbus_config *cfg)
- {
- 	struct pivariety *pivariety = to_pivariety(sd);
--	const u32 mask = V4L2_MBUS_CSI2_LANE_MASK;
- 
- 	if (pivariety->lanes > pivariety->bus.num_data_lanes)
- 		return -EINVAL;
- 
- 	cfg->type = V4L2_MBUS_CSI2_DPHY;
--	cfg->flags = (pivariety->lanes << __ffs(mask)) & mask;
-+	cfg->bus.mipi_csi2.flags = pivariety->bus.flags;
-+	cfg->bus.mipi_csi2.num_data_lanes = pivariety->lanes;
- 
- 	return 0;
- }
diff --git a/target/linux/bcm27xx/patches-6.1/950-0418-mmc-block-Don-t-do-single-sector-reads-during-recove.patch b/target/linux/bcm27xx/patches-6.1/950-0418-mmc-block-Don-t-do-single-sector-reads-during-recove.patch
deleted file mode 100644
index 44dfc2ba56..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0418-mmc-block-Don-t-do-single-sector-reads-during-recove.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 46b28bf91d411852abb18119c27d73da6064826d Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.com>
-Date: Mon, 16 May 2022 10:28:27 +0100
-Subject: [PATCH] mmc: block: Don't do single-sector reads during
- recovery
-
-See https://github.com/raspberrypi/linux/issues/5019
-
-If an SD card has degraded performance such that IO operations time out
-then the MMC block layer will leak SG DMA mappings in the swiotlb during
-recovery. It retries the same SG and this causes the leak, as it is
-mapped twice - once in sdhci_pre_req() and again during single-block
-reads in sdhci_prepare_data().
-
-Resetting the card (including power-cycling if a regulator for vmmc is
-present) ought to be enough to recover a stuck state, so for now don't
-try single-block reads in the recovery path.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- drivers/mmc/core/block.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/mmc/core/block.c
-+++ b/drivers/mmc/core/block.c
-@@ -1972,7 +1972,7 @@ static void mmc_blk_mq_rw_recovery(struc
- 		return;
- 	}
- 
--	if (rq_data_dir(req) == READ && brq->data.blocks >
-+	if (0 && rq_data_dir(req) == READ && brq->data.blocks >
- 			queue_physical_block_size(mq->queue) >> 9) {
- 		/* Read one (native) sector at a time */
- 		mmc_blk_read_single(mq, req);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0419-vc04_services-vchiq-mmal-Add-defines-for-mmal_es_for.patch b/target/linux/bcm27xx/patches-6.1/950-0419-vc04_services-vchiq-mmal-Add-defines-for-mmal_es_for.patch
deleted file mode 100644
index fb581531ba..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0419-vc04_services-vchiq-mmal-Add-defines-for-mmal_es_for.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 7517e03b97bd0f2f9272ec837e972dce920f2029 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Mon, 16 May 2022 17:33:48 +0100
-Subject: [PATCH] vc04_services: vchiq-mmal: Add defines for
- mmal_es_format flags
-
-There is a flags field in struct mmal_es_format, but the defines
-for what the bits meant weren't included in the headers.
-For V4L2_PIX_FMT_NV12_COL128 support we need them, so add them in.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../staging/vc04_services/vchiq-mmal/mmal-msg-format.h | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg-format.h
-+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-msg-format.h
-@@ -53,6 +53,16 @@ union mmal_es_specific_format {
- 	struct mmal_subpicture_format subpicture;
- };
- 
-+/* The elementary stream will already be framed */
-+#define MMAL_ES_FORMAT_FLAG_FRAMED				BIT(0)
-+/*
-+ * For column formats we ideally want to pass in the column stride. This hasn't
-+ * been the past behaviour, so require a new flag to be set should
-+ * es->video.width be the column stride (in lines) instead of an ignored width
-+ * value.
-+ */
-+#define MMAL_ES_FORMAT_FLAG_COL_FMTS_WIDTH_IS_COL_STRIDE	BIT(1)
-+
- /* Definition of an elementary stream format (MMAL_ES_FORMAT_T) */
- struct mmal_es_format_local {
- 	u32 type;	/* enum mmal_es_type */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0420-random-do-not-use-jump-labels-before-they-are-initia.patch b/target/linux/bcm27xx/patches-6.1/950-0420-random-do-not-use-jump-labels-before-they-are-initia.patch
deleted file mode 100644
index a5cefb298d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0420-random-do-not-use-jump-labels-before-they-are-initia.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From c577ded541087c1d21a6904020670fd59c218e04 Mon Sep 17 00:00:00 2001
-From: "Jason A. Donenfeld" <Jason@zx2c4.com>
-Date: Tue, 7 Jun 2022 12:02:10 +0200
-Subject: [PATCH] random: do not use jump labels before they are
- initialized
-
-[ I would like to pursue fixing this more directly first before actually
-  merging this, but I thought I'd send this to the list now anyway as a
-  the "backup" plan. If I can't figure out how to make headway on the
-  main plan in the next few days, it'll be easy to just do this. ]
-
-Stephen reported that a static key warning splat appears during early
-boot on systems that credit randomness from device trees that contain an
-"rng-seed" property, because because setup_machine_fdt() is called
-before jump_label_init() during setup_arch():
-
- static_key_enable_cpuslocked(): static key '0xffffffe51c6fcfc0' used before call to jump_label_init()
- WARNING: CPU: 0 PID: 0 at kernel/jump_label.c:166 static_key_enable_cpuslocked+0xb0/0xb8
- Modules linked in:
- CPU: 0 PID: 0 Comm: swapper Not tainted 5.18.0+ #224 44b43e377bfc84bc99bb5ab885ff694984ee09ff
- pstate: 600001c9 (nZCv dAIF -PAN -UAO -TCO -DIT -SSBS BTYPE=--)
- pc : static_key_enable_cpuslocked+0xb0/0xb8
- lr : static_key_enable_cpuslocked+0xb0/0xb8
- sp : ffffffe51c393cf0
- x29: ffffffe51c393cf0 x28: 000000008185054c x27: 00000000f1042f10
- x26: 0000000000000000 x25: 00000000f10302b2 x24: 0000002513200000
- x23: 0000002513200000 x22: ffffffe51c1c9000 x21: fffffffdfdc00000
- x20: ffffffe51c2f0831 x19: ffffffe51c6fcfc0 x18: 00000000ffff1020
- x17: 00000000e1e2ac90 x16: 00000000000000e0 x15: ffffffe51b710708
- x14: 0000000000000066 x13: 0000000000000018 x12: 0000000000000000
- x11: 0000000000000000 x10: 00000000ffffffff x9 : 0000000000000000
- x8 : 0000000000000000 x7 : 61632065726f6665 x6 : 6220646573752027
- x5 : ffffffe51c641d25 x4 : ffffffe51c13142c x3 : ffff0a00ffffff05
- x2 : 40000000ffffe003 x1 : 00000000000001c0 x0 : 0000000000000065
- Call trace:
-  static_key_enable_cpuslocked+0xb0/0xb8
-  static_key_enable+0x2c/0x40
-  crng_set_ready+0x24/0x30
-  execute_in_process_context+0x80/0x90
-  _credit_init_bits+0x100/0x154
-  add_bootloader_randomness+0x64/0x78
-  early_init_dt_scan_chosen+0x140/0x184
-  early_init_dt_scan_nodes+0x28/0x4c
-  early_init_dt_scan+0x40/0x44
-  setup_machine_fdt+0x7c/0x120
-  setup_arch+0x74/0x1d8
-  start_kernel+0x84/0x44c
-  __primary_switched+0xc0/0xc8
- ---[ end trace 0000000000000000 ]---
- random: crng init done
- Machine model: Google Lazor (rev1 - 2) with LTE
-
-A trivial fix went in to address this on arm64, 73e2d827a501 ("arm64:
-Initialize jump labels before setup_machine_fdt()"). But it appears that
-fixing it on other platforms might not be so trivial. Instead, defer the
-setting of the static branch until later in the boot process.
-
-Fixes: f5bda35fba61 ("random: use static branch for crng_ready()")
-Reported-by: Stephen Boyd <swboyd@chromium.org>
-Cc: Ard Biesheuvel <ardb@kernel.org>
-Cc: Catalin Marinas <catalin.marinas@arm.com>
-Cc: Russell King <linux@armlinux.org.uk>
-Cc: Arnd Bergmann <arnd@arndb.de>
-Cc: Phil Elwell <phil@raspberrypi.com>
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- drivers/char/random.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/drivers/char/random.c
-+++ b/drivers/char/random.c
-@@ -823,6 +823,14 @@ void __init random_init_early(const char
- 	unsigned long entropy[BLAKE2S_BLOCK_SIZE / sizeof(long)];
- 	size_t i, longs, arch_bits;
- 
-+	/*
-+	 * If we were initialized by the bootloader before jump labels are
-+	 * initialized, then we should enable the static branch here, where
-+	 * it's guaranteed that jump labels have been initialized.
-+	 */
-+	if (!static_branch_likely(&crng_is_ready) && crng_init >= CRNG_READY)
-+		crng_set_ready(NULL);
-+
- #if defined(LATENT_ENTROPY_PLUGIN)
- 	static const u8 compiletime_seed[BLAKE2S_BLOCK_SIZE] __initconst __latent_entropy;
- 	_mix_pool_bytes(compiletime_seed, sizeof(compiletime_seed));
diff --git a/target/linux/bcm27xx/patches-6.1/950-0421-drm-v3d-Switch-clock-setting-to-new-api.patch b/target/linux/bcm27xx/patches-6.1/950-0421-drm-v3d-Switch-clock-setting-to-new-api.patch
deleted file mode 100644
index 8339d44fa4..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0421-drm-v3d-Switch-clock-setting-to-new-api.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From fd72b430d69e0352214449cccf3c111b0390ee99 Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Wed, 20 Apr 2022 18:08:38 +0100
-Subject: [PATCH] drm/v3d: Switch clock setting to new api
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
-
-drm/v3d: Convert to new clock range API
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/v3d/v3d_drv.c | 22 ++++++++++++++++++++--
- drivers/gpu/drm/v3d/v3d_gem.c |  4 ++--
- 2 files changed, 22 insertions(+), 4 deletions(-)
-
---- a/drivers/gpu/drm/v3d/v3d_drv.c
-+++ b/drivers/gpu/drm/v3d/v3d_drv.c
-@@ -24,6 +24,9 @@
- #include <drm/drm_drv.h>
- #include <drm/drm_fb_helper.h>
- #include <drm/drm_managed.h>
-+
-+#include <soc/bcm2835/raspberrypi-firmware.h>
-+
- #include <uapi/drm/v3d_drm.h>
- 
- #include "v3d_drv.h"
-@@ -207,6 +210,8 @@ map_regs(struct v3d_dev *v3d, void __iom
- static int v3d_platform_drm_probe(struct platform_device *pdev)
- {
- 	struct device *dev = &pdev->dev;
-+	struct rpi_firmware *firmware;
-+	struct device_node *node;
- 	struct drm_device *drm;
- 	struct v3d_dev *v3d;
- 	int ret;
-@@ -266,7 +271,20 @@ static int v3d_platform_drm_probe(struct
- 			dev_err(dev, "Failed to get clock (%ld)\n", PTR_ERR(v3d->clk));
- 		return PTR_ERR(v3d->clk);
- 	}
--	v3d->clk_up_rate = clk_get_rate(v3d->clk);
-+
-+	node = rpi_firmware_find_node();
-+	if (!node)
-+		return -EINVAL;
-+
-+	firmware = rpi_firmware_get(node);
-+	of_node_put(node);
-+	if (!firmware)
-+		return -EPROBE_DEFER;
-+
-+	v3d->clk_up_rate = rpi_firmware_clk_get_max_rate(firmware,
-+							 RPI_FIRMWARE_V3D_CLK_ID);
-+	rpi_firmware_put(firmware);
-+
- 	/* For downclocking, drop it to the minimum frequency we can get from
- 	 * the CPRMAN clock generator dividing off our parent.  The divider is
- 	 * 4 bits, but ask for just higher than that so that rounding doesn't
-@@ -300,7 +318,7 @@ static int v3d_platform_drm_probe(struct
- 	if (ret)
- 		goto irq_disable;
- 
--	ret = clk_set_rate(v3d->clk, v3d->clk_down_rate);
-+	ret = clk_set_min_rate(v3d->clk, v3d->clk_down_rate);
- 	WARN_ON_ONCE(ret != 0);
- 
- 	return 0;
---- a/drivers/gpu/drm/v3d/v3d_gem.c
-+++ b/drivers/gpu/drm/v3d/v3d_gem.c
-@@ -25,7 +25,7 @@ v3d_clock_down_work(struct work_struct *
- 		container_of(work, struct v3d_dev, clk_down_work.work);
- 	int ret;
- 
--	ret = clk_set_rate(v3d->clk, v3d->clk_down_rate);
-+	ret = clk_set_min_rate(v3d->clk, v3d->clk_down_rate);
- 	v3d->clk_up = false;
- 	WARN_ON_ONCE(ret != 0);
- }
-@@ -39,7 +39,7 @@ v3d_clock_up_get(struct v3d_dev *v3d)
- 		if (!v3d->clk_up)  {
- 			int ret;
- 
--			ret = clk_set_rate(v3d->clk, v3d->clk_up_rate);
-+			ret = clk_set_min_rate(v3d->clk, v3d->clk_up_rate);
- 			WARN_ON_ONCE(ret != 0);
- 			v3d->clk_up = true;
- 		}
diff --git a/target/linux/bcm27xx/patches-6.1/950-0422-clk-raspberrypi-Enable-minimize-for-all-firmware-clo.patch b/target/linux/bcm27xx/patches-6.1/950-0422-clk-raspberrypi-Enable-minimize-for-all-firmware-clo.patch
deleted file mode 100644
index b5fc1c2539..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0422-clk-raspberrypi-Enable-minimize-for-all-firmware-clo.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 7ce9009442ecacc352f54944cfdf2d256232e1d5 Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Wed, 20 Apr 2022 17:40:47 +0100
-Subject: [PATCH] clk-raspberrypi: Enable minimize for all firmware
- clocks
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/clk/bcm/clk-raspberrypi.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/drivers/clk/bcm/clk-raspberrypi.c
-+++ b/drivers/clk/bcm/clk-raspberrypi.c
-@@ -136,21 +136,26 @@ raspberrypi_clk_variants[RPI_FIRMWARE_NU
- 	},
- 	[RPI_FIRMWARE_V3D_CLK_ID] = {
- 		.export = true,
-+		.minimize = true,
- 	},
- 	[RPI_FIRMWARE_PIXEL_CLK_ID] = {
- 		.export = true,
- 	},
- 	[RPI_FIRMWARE_HEVC_CLK_ID] = {
- 		.export = true,
-+		.minimize = true,
- 	},
- 	[RPI_FIRMWARE_ISP_CLK_ID] = {
- 		.export = true,
-+		.minimize = true,
- 	},
- 	[RPI_FIRMWARE_PIXEL_BVB_CLK_ID] = {
- 		.export = true,
-+		.minimize = true,
- 	},
- 	[RPI_FIRMWARE_VEC_CLK_ID] = {
- 		.export = true,
-+		.minimize = true,
- 	},
- };
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0423-media-dt-bindings-media-i2c-Add-Arducam-64MP-CMOS-se.patch b/target/linux/bcm27xx/patches-6.1/950-0423-media-dt-bindings-media-i2c-Add-Arducam-64MP-CMOS-se.patch
deleted file mode 100644
index 3a0b78ccb2..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0423-media-dt-bindings-media-i2c-Add-Arducam-64MP-CMOS-se.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From 53d998a246f34b6fbded6c0a7d2d8a8d742142b5 Mon Sep 17 00:00:00 2001
-From: Lee Jackson <info@arducam.com>
-Date: Fri, 13 May 2022 17:21:42 +0800
-Subject: [PATCH] media: dt-bindings: media: i2c: Add Arducam 64MP CMOS
- sensor binding
-
-Add YAML device tree binding for Arducam 64MP CMOS image sensor, and
-the relevant MAINTAINERS entries.
-
-Signed-off-by: Lee Jackson <info@arducam.com>
----
- .../bindings/media/i2c/arducam,64mp.yaml      | 115 ++++++++++++++++++
- MAINTAINERS                                   |   8 ++
- 2 files changed, 123 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/media/i2c/arducam,64mp.yaml
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/media/i2c/arducam,64mp.yaml
-@@ -0,0 +1,115 @@
-+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
-+%YAML 1.2
-+---
-+$id: http://devicetree.org/schemas/media/i2c/arducam,64mp.yaml#
-+$schema: http://devicetree.org/meta-schemas/core.yaml#
-+
-+title: Arducam 1/1.7-Inch 64Mpixel CMOS Digital Image Sensor
-+
-+maintainers:
-+  - Lee Jackson <info@arducam.com>
-+
-+description: |-
-+  The Arducam 1/1.7-Inch 64Mpixel CMOS active pixel digital image sensor
-+  with an active array size of 9248 x 6944. It is programmable through
-+  I2C interface. The I2C address is fixed to 0x1A as per sensor data sheet.
-+  Image data is sent through MIPI CSI-2, which can be configured for operation
-+  with either 2 or 4 data lanes.
-+
-+properties:
-+  compatible:
-+    const: arducam,64mp
-+
-+  reg:
-+    description: I2C device address
-+    maxItems: 1
-+
-+  clocks:
-+    maxItems: 1
-+
-+  VDIG-supply:
-+    description:
-+      Digital I/O voltage supply, 1.05 volts
-+
-+  VANA-supply:
-+    description:
-+      Analog voltage supply, 2.8 volts
-+
-+  VDDL-supply:
-+    description:
-+      Digital core voltage supply, 1.8 volts
-+
-+  reset-gpios:
-+    description: |-
-+      Reference to the GPIO connected to the xclr pin, if any.
-+      Must be released (set high) after all supplies and INCK are applied.
-+
-+  # See ../video-interfaces.txt for more details
-+  port:
-+    type: object
-+    properties:
-+      endpoint:
-+        type: object
-+        properties:
-+          data-lanes:
-+            description: |-
-+              The sensor supports either two-lane, or four-lane operation.
-+              For two-lane operation the property must be set to <1 2>.
-+            anyOf:
-+              - items:
-+                  - const: 1
-+                  - const: 2
-+              - items:
-+                  - const: 1
-+                  - const: 2
-+                  - const: 3
-+                  - const: 4
-+
-+          clock-noncontinuous: true
-+
-+          link-frequencies:
-+            allOf:
-+              - $ref: /schemas/types.yaml#/definitions/uint64-array
-+            description:
-+              Allowed data bus frequencies.
-+
-+        required:
-+          - link-frequencies
-+
-+required:
-+  - compatible
-+  - reg
-+  - clocks
-+  - VANA-supply
-+  - VDIG-supply
-+  - VDDL-supply
-+  - port
-+
-+additionalProperties: false
-+
-+examples:
-+  - |
-+    i2c0 {
-+        #address-cells = <1>;
-+        #size-cells = <0>;
-+
-+        arducam_64mp: sensor@1a {
-+            compatible = "arducam,64mp";
-+            reg = <0x1a>;
-+            clocks = <&arducam_64mp_clk>;
-+            VANA-supply = <&arducam_64mp_vana>;   /* 2.8v */
-+            VDIG-supply = <&arducam_64mp_vdig>;   /* 1.05v */
-+            VDDL-supply = <&arducam_64mp_vddl>;   /* 1.8v */
-+
-+            port {
-+                arducam_64mp_0: endpoint {
-+                    remote-endpoint = <&csi1_ep>;
-+                    data-lanes = <1 2>;
-+                    clock-noncontinuous;
-+                    link-frequencies = /bits/ 64 <456000000>;
-+                };
-+            };
-+        };
-+    };
-+
-+...
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -1559,6 +1559,14 @@ S:	Maintained
- F:	drivers/net/arcnet/
- F:	include/uapi/linux/if_arcnet.h
- 
-+ARDUCAM 64MP SENSOR DRIVER
-+M:	Arducam Kernel Maintenance <info@arducam.com>
-+L:	linux-media@vger.kernel.org
-+S:	Maintained
-+T:	git git://linuxtv.org/media_tree.git
-+F:	Documentation/devicetree/bindings/media/i2c/arducam,64mp.yaml
-+F:	drivers/media/i2c/arducam_64mp.c
-+
- ARDUCAM PIVARIETY SENSOR DRIVER
- M:	Arducam Kernel Maintenance <info@arducam.com>
- L:	linux-media@vger.kernel.org
diff --git a/target/linux/bcm27xx/patches-6.1/950-0424-media-i2c-Add-driver-of-Arducam-64MP-camera.patch b/target/linux/bcm27xx/patches-6.1/950-0424-media-i2c-Add-driver-of-Arducam-64MP-camera.patch
deleted file mode 100644
index faf453206c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0424-media-i2c-Add-driver-of-Arducam-64MP-camera.patch
+++ /dev/null
@@ -1,2458 +0,0 @@
-From 1a28fde906ac8a8268b72879dd035e536d4c09c5 Mon Sep 17 00:00:00 2001
-From: Lee Jackson <info@arducam.com>
-Date: Fri, 13 May 2022 17:11:35 +0800
-Subject: [PATCH] media: i2c: Add driver of Arducam 64MP camera
-
-Add a driver for the Arducam 64MP camera sensor.
-Whilst the sensor supports 2 or 4 CSI2 data lanes, this driver
-currently only supports 2 lanes.
-
-The following Bayer modes are currently available:
-
-9152x6944 10-bit @ 2.7fps
-4624x3472 10-bit (binned) @ 10fps
-3840x2160 10-bit (cropped/binned) @ 20fps
-2312x1736 10-bit (binned) @ 30fps
-1920x1080 10-bit (cropped/binned) @ 60fps
-1280x720 10-bit (cropped/binned) @ 120fps
-
-Signed-off-by: Lee Jackson <info@arducam.com>
----
- drivers/media/i2c/Kconfig        |   11 +
- drivers/media/i2c/Makefile       |    1 +
- drivers/media/i2c/arducam_64mp.c | 2399 ++++++++++++++++++++++++++++++
- 3 files changed, 2411 insertions(+)
- create mode 100644 drivers/media/i2c/arducam_64mp.c
-
---- a/drivers/media/i2c/Kconfig
-+++ b/drivers/media/i2c/Kconfig
-@@ -54,6 +54,17 @@ config VIDEO_AR0521
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called ar0521.
- 
-+config VIDEO_ARDUCAM_64MP
-+	tristate "Arducam 64MP sensor support"
-+	depends on I2C && VIDEO_DEV
-+	select VIDEO_V4L2_SUBDEV_API
-+	help
-+	  This is a Video4Linux2 sensor driver for the Arducam
-+	  64MP camera.
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called arducam_64mp.
-+
- config VIDEO_ARDUCAM_PIVARIETY
- 	tristate "Arducam Pivariety sensor support"
- 	depends on I2C && VIDEO_DEV
---- a/drivers/media/i2c/Makefile
-+++ b/drivers/media/i2c/Makefile
-@@ -21,6 +21,7 @@ obj-$(CONFIG_VIDEO_AK7375) += ak7375.o
- obj-$(CONFIG_VIDEO_AK881X) += ak881x.o
- obj-$(CONFIG_VIDEO_APTINA_PLL) += aptina-pll.o
- obj-$(CONFIG_VIDEO_AR0521) += ar0521.o
-+obj-$(CONFIG_VIDEO_ARDUCAM_64MP) += arducam_64mp.o
- obj-$(CONFIG_VIDEO_ARDUCAM_PIVARIETY) += arducam-pivariety.o
- obj-$(CONFIG_VIDEO_BT819) += bt819.o
- obj-$(CONFIG_VIDEO_BT856) += bt856.o
---- /dev/null
-+++ b/drivers/media/i2c/arducam_64mp.c
-@@ -0,0 +1,2399 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * A V4L2 driver for Arducam 64MP cameras.
-+ * Copyright (C) 2021 Arducam Technology co., Ltd.
-+ *
-+ * Based on Sony IMX477 camera driver
-+ * Copyright (C) 2020 Raspberry Pi (Trading) Ltd
-+ */
-+#include <asm/unaligned.h>
-+#include <linux/clk.h>
-+#include <linux/delay.h>
-+#include <linux/gpio/consumer.h>
-+#include <linux/i2c.h>
-+#include <linux/module.h>
-+#include <linux/of_device.h>
-+#include <linux/pm_runtime.h>
-+#include <linux/regulator/consumer.h>
-+#include <media/v4l2-ctrls.h>
-+#include <media/v4l2-device.h>
-+#include <media/v4l2-event.h>
-+#include <media/v4l2-fwnode.h>
-+#include <media/v4l2-mediabus.h>
-+
-+#define ARDUCAM_64MP_REG_VALUE_08BIT	1
-+#define ARDUCAM_64MP_REG_VALUE_16BIT	2
-+
-+/* Chip ID */
-+#define ARDUCAM_64MP_REG_CHIP_ID	0x005E
-+#define ARDUCAM_64MP_CHIP_ID		0x4136
-+
-+#define ARDUCAM_64MP_REG_MODE_SELECT	0x0100
-+#define ARDUCAM_64MP_MODE_STANDBY	0x00
-+#define ARDUCAM_64MP_MODE_STREAMING	0x01
-+
-+#define ARDUCAM_64MP_REG_ORIENTATION	0x101
-+
-+#define ARDUCAM_64MP_XCLK_FREQ		24000000
-+
-+#define ARDUCAM_64MP_DEFAULT_LINK_FREQ	456000000
-+
-+/* Pixel rate is fixed at 900MHz for all the modes */
-+#define ARDUCAM_64MP_PIXEL_RATE		900000000
-+
-+/* V_TIMING internal */
-+#define ARDUCAM_64MP_REG_FRAME_LENGTH	0x0340
-+#define ARDUCAM_64MP_FRAME_LENGTH_MAX	0xffff
-+
-+/* Long exposure multiplier */
-+#define ARDUCAM_64MP_LONG_EXP_SHIFT_MAX	7
-+#define ARDUCAM_64MP_LONG_EXP_SHIFT_REG	0x3100
-+
-+/* Exposure control */
-+#define ARDUCAM_64MP_REG_EXPOSURE	0x0202
-+#define ARDUCAM_64MP_EXPOSURE_OFFSET	48
-+#define ARDUCAM_64MP_EXPOSURE_MIN	9
-+#define ARDUCAM_64MP_EXPOSURE_STEP	1
-+#define ARDUCAM_64MP_EXPOSURE_DEFAULT	0x3e8
-+#define ARDUCAM_64MP_EXPOSURE_MAX	(ARDUCAM_64MP_FRAME_LENGTH_MAX - \
-+					 ARDUCAM_64MP_EXPOSURE_OFFSET)
-+
-+/* Analog gain control */
-+#define ARDUCAM_64MP_REG_ANALOG_GAIN		0x0204
-+#define ARDUCAM_64MP_ANA_GAIN_MIN		0
-+#define ARDUCAM_64MP_ANA_GAIN_MAX		1008
-+#define ARDUCAM_64MP_ANA_GAIN_STEP		1
-+#define ARDUCAM_64MP_ANA_GAIN_DEFAULT		0x0
-+
-+/* Digital gain control */
-+#define ARDUCAM_64MP_REG_DIGITAL_GAIN		0x020e
-+#define ARDUCAM_64MP_DGTL_GAIN_MIN		0x0100
-+#define ARDUCAM_64MP_DGTL_GAIN_MAX		0x0fff
-+#define ARDUCAM_64MP_DGTL_GAIN_DEFAULT		0x0100
-+#define ARDUCAM_64MP_DGTL_GAIN_STEP		1
-+
-+/* Test Pattern Control */
-+#define ARDUCAM_64MP_REG_TEST_PATTERN		0x0600
-+#define ARDUCAM_64MP_TEST_PATTERN_DISABLE	0
-+#define ARDUCAM_64MP_TEST_PATTERN_SOLID_COLOR	1
-+#define ARDUCAM_64MP_TEST_PATTERN_COLOR_BARS	2
-+#define ARDUCAM_64MP_TEST_PATTERN_GREY_COLOR	3
-+#define ARDUCAM_64MP_TEST_PATTERN_PN9		4
-+
-+/* Test pattern colour components */
-+#define ARDUCAM_64MP_REG_TEST_PATTERN_R		0x0602
-+#define ARDUCAM_64MP_REG_TEST_PATTERN_GR	0x0604
-+#define ARDUCAM_64MP_REG_TEST_PATTERN_B		0x0606
-+#define ARDUCAM_64MP_REG_TEST_PATTERN_GB	0x0608
-+#define ARDUCAM_64MP_TEST_PATTERN_COLOUR_MIN	0
-+#define ARDUCAM_64MP_TEST_PATTERN_COLOUR_MAX	0x0fff
-+#define ARDUCAM_64MP_TEST_PATTERN_COLOUR_STEP	1
-+#define ARDUCAM_64MP_TEST_PATTERN_R_DEFAULT	\
-+	ARDUCAM_64MP_TEST_PATTERN_COLOUR_MAX
-+#define ARDUCAM_64MP_TEST_PATTERN_GR_DEFAULT	0
-+#define ARDUCAM_64MP_TEST_PATTERN_B_DEFAULT	0
-+#define ARDUCAM_64MP_TEST_PATTERN_GB_DEFAULT	0
-+
-+/* ARDUCAM_64MP native and active pixel array size. */
-+#define ARDUCAM_64MP_NATIVE_WIDTH		9344U
-+#define ARDUCAM_64MP_NATIVE_HEIGHT		7032U
-+#define ARDUCAM_64MP_PIXEL_ARRAY_LEFT		48U
-+#define ARDUCAM_64MP_PIXEL_ARRAY_TOP		40U
-+#define ARDUCAM_64MP_PIXEL_ARRAY_WIDTH		9248U
-+#define ARDUCAM_64MP_PIXEL_ARRAY_HEIGHT		6944U
-+
-+struct arducam_64mp_reg {
-+	u16 address;
-+	u8 val;
-+};
-+
-+struct arducam_64mp_reg_list {
-+	unsigned int num_of_regs;
-+	const struct arducam_64mp_reg *regs;
-+};
-+
-+/* Mode : resolution and related config&values */
-+struct arducam_64mp_mode {
-+	/* Frame width */
-+	unsigned int width;
-+
-+	/* Frame height */
-+	unsigned int height;
-+
-+	/* H-timing in pixels */
-+	unsigned int line_length_pix;
-+
-+	/* Analog crop rectangle. */
-+	struct v4l2_rect crop;
-+
-+	/* Default framerate. */
-+	struct v4l2_fract timeperframe_default;
-+
-+	/* Default register values */
-+	struct arducam_64mp_reg_list reg_list;
-+};
-+
-+static const struct arducam_64mp_reg mode_common_regs[] = {
-+	{0x0136, 0x18},
-+	{0x0137, 0x00},
-+	{0x33F0, 0x01},
-+	{0x33F1, 0x03},
-+	{0x0111, 0x02},
-+	{0x3062, 0x00},
-+	{0x3063, 0x30},
-+	{0x3076, 0x00},
-+	{0x3077, 0x30},
-+	{0x1f06, 0x06},
-+	{0x1f07, 0x82},
-+	{0x1f04, 0x71},
-+	{0x1f05, 0x01},
-+	{0x1f08, 0x01},
-+	{0x5bfe, 0x14},
-+	{0x5c0d, 0x2d},
-+	{0x5c1c, 0x30},
-+	{0x5c2b, 0x32},
-+	{0x5c37, 0x2e},
-+	{0x5c40, 0x30},
-+	{0x5c50, 0x14},
-+	{0x5c5f, 0x28},
-+	{0x5c6e, 0x28},
-+	{0x5c7d, 0x32},
-+	{0x5c89, 0x37},
-+	{0x5c92, 0x56},
-+	{0x5bfc, 0x12},
-+	{0x5c0b, 0x2a},
-+	{0x5c1a, 0x2c},
-+	{0x5c29, 0x2f},
-+	{0x5c36, 0x2e},
-+	{0x5c3f, 0x2e},
-+	{0x5c4e, 0x06},
-+	{0x5c5d, 0x1e},
-+	{0x5c6c, 0x20},
-+	{0x5c7b, 0x1e},
-+	{0x5c88, 0x32},
-+	{0x5c91, 0x32},
-+	{0x5c02, 0x14},
-+	{0x5c11, 0x2f},
-+	{0x5c20, 0x32},
-+	{0x5c2f, 0x34},
-+	{0x5c39, 0x31},
-+	{0x5c42, 0x31},
-+	{0x5c8b, 0x28},
-+	{0x5c94, 0x28},
-+	{0x5c00, 0x10},
-+	{0x5c0f, 0x2c},
-+	{0x5c1e, 0x2e},
-+	{0x5c2d, 0x32},
-+	{0x5c38, 0x2e},
-+	{0x5c41, 0x2b},
-+	{0x5c61, 0x0a},
-+	{0x5c70, 0x0a},
-+	{0x5c7f, 0x0a},
-+	{0x5c8a, 0x1e},
-+	{0x5c93, 0x2a},
-+	{0x5bfa, 0x2b},
-+	{0x5c09, 0x2d},
-+	{0x5c18, 0x2e},
-+	{0x5c27, 0x30},
-+	{0x5c5b, 0x28},
-+	{0x5c6a, 0x22},
-+	{0x5c79, 0x42},
-+	{0x5bfb, 0x2c},
-+	{0x5c0a, 0x2f},
-+	{0x5c19, 0x2e},
-+	{0x5c28, 0x2e},
-+	{0x5c4d, 0x20},
-+	{0x5c5c, 0x1e},
-+	{0x5c6b, 0x32},
-+	{0x5c7a, 0x32},
-+	{0x5bfd, 0x30},
-+	{0x5c0c, 0x32},
-+	{0x5c1b, 0x2e},
-+	{0x5c2a, 0x30},
-+	{0x5c4f, 0x28},
-+	{0x5c5e, 0x32},
-+	{0x5c6d, 0x37},
-+	{0x5c7c, 0x56},
-+	{0x5bff, 0x2e},
-+	{0x5c0e, 0x32},
-+	{0x5c1d, 0x2e},
-+	{0x5c2c, 0x2b},
-+	{0x5c51, 0x0a},
-+	{0x5c60, 0x0a},
-+	{0x5c6f, 0x1e},
-+	{0x5c7e, 0x2a},
-+	{0x5c01, 0x32},
-+	{0x5c10, 0x34},
-+	{0x5c1f, 0x31},
-+	{0x5c2e, 0x31},
-+	{0x5c71, 0x28},
-+	{0x5c80, 0x28},
-+	{0x5c4c, 0x2a},
-+	{0x33f2, 0x01},
-+	{0x1f04, 0x73},
-+	{0x1f05, 0x01},
-+	{0x5bfa, 0x35},
-+	{0x5c09, 0x38},
-+	{0x5c18, 0x3a},
-+	{0x5c27, 0x38},
-+	{0x5c5b, 0x25},
-+	{0x5c6a, 0x24},
-+	{0x5c79, 0x47},
-+	{0x5bfc, 0x15},
-+	{0x5c0b, 0x2e},
-+	{0x5c1a, 0x36},
-+	{0x5c29, 0x38},
-+	{0x5c36, 0x36},
-+	{0x5c3f, 0x36},
-+	{0x5c4e, 0x0b},
-+	{0x5c5d, 0x20},
-+	{0x5c6c, 0x2a},
-+	{0x5c7b, 0x25},
-+	{0x5c88, 0x25},
-+	{0x5c91, 0x22},
-+	{0x5bfe, 0x15},
-+	{0x5c0d, 0x32},
-+	{0x5c1c, 0x36},
-+	{0x5c2b, 0x36},
-+	{0x5c37, 0x3a},
-+	{0x5c40, 0x39},
-+	{0x5c50, 0x06},
-+	{0x5c5f, 0x22},
-+	{0x5c6e, 0x23},
-+	{0x5c7d, 0x2e},
-+	{0x5c89, 0x44},
-+	{0x5c92, 0x51},
-+	{0x5d7f, 0x0a},
-+	{0x5c00, 0x17},
-+	{0x5c0f, 0x36},
-+	{0x5c1e, 0x38},
-+	{0x5c2d, 0x3c},
-+	{0x5c38, 0x38},
-+	{0x5c41, 0x36},
-+	{0x5c52, 0x0a},
-+	{0x5c61, 0x21},
-+	{0x5c70, 0x23},
-+	{0x5c7f, 0x1b},
-+	{0x5c8a, 0x22},
-+	{0x5c93, 0x20},
-+	{0x5c02, 0x1a},
-+	{0x5c11, 0x3e},
-+	{0x5c20, 0x3f},
-+	{0x5c2f, 0x3d},
-+	{0x5c39, 0x3e},
-+	{0x5c42, 0x3c},
-+	{0x5c54, 0x02},
-+	{0x5c63, 0x12},
-+	{0x5c72, 0x14},
-+	{0x5c81, 0x24},
-+	{0x5c8b, 0x1c},
-+	{0x5c94, 0x4e},
-+	{0x5d8a, 0x09},
-+	{0x5bfb, 0x36},
-+	{0x5c0a, 0x38},
-+	{0x5c19, 0x36},
-+	{0x5c28, 0x36},
-+	{0x5c4d, 0x2a},
-+	{0x5c5c, 0x25},
-+	{0x5c6b, 0x25},
-+	{0x5c7a, 0x22},
-+	{0x5bfd, 0x36},
-+	{0x5c0c, 0x36},
-+	{0x5c1b, 0x3a},
-+	{0x5c2a, 0x39},
-+	{0x5c4f, 0x23},
-+	{0x5c5e, 0x2e},
-+	{0x5c6d, 0x44},
-+	{0x5c7c, 0x51},
-+	{0x5d63, 0x0a},
-+	{0x5bff, 0x38},
-+	{0x5c0e, 0x3c},
-+	{0x5c1d, 0x38},
-+	{0x5c2c, 0x36},
-+	{0x5c51, 0x23},
-+	{0x5c60, 0x1b},
-+	{0x5c6f, 0x22},
-+	{0x5c7e, 0x20},
-+	{0x5c01, 0x3f},
-+	{0x5c10, 0x3d},
-+	{0x5c1f, 0x3e},
-+	{0x5c2e, 0x3c},
-+	{0x5c53, 0x14},
-+	{0x5c62, 0x24},
-+	{0x5c71, 0x1c},
-+	{0x5c80, 0x4e},
-+	{0x5d76, 0x09},
-+	{0x5c4c, 0x2a},
-+	{0x33f2, 0x02},
-+	{0x1f04, 0x78},
-+	{0x1f05, 0x01},
-+	{0x5bfa, 0x37},
-+	{0x5c09, 0x36},
-+	{0x5c18, 0x39},
-+	{0x5c27, 0x38},
-+	{0x5c5b, 0x27},
-+	{0x5c6a, 0x2b},
-+	{0x5c79, 0x48},
-+	{0x5bfc, 0x16},
-+	{0x5c0b, 0x32},
-+	{0x5c1a, 0x33},
-+	{0x5c29, 0x37},
-+	{0x5c36, 0x36},
-+	{0x5c3f, 0x35},
-+	{0x5c4e, 0x0d},
-+	{0x5c5d, 0x2d},
-+	{0x5c6c, 0x23},
-+	{0x5c7b, 0x25},
-+	{0x5c88, 0x31},
-+	{0x5c91, 0x2e},
-+	{0x5bfe, 0x15},
-+	{0x5c0d, 0x31},
-+	{0x5c1c, 0x35},
-+	{0x5c2b, 0x36},
-+	{0x5c37, 0x35},
-+	{0x5c40, 0x37},
-+	{0x5c50, 0x0f},
-+	{0x5c5f, 0x31},
-+	{0x5c6e, 0x30},
-+	{0x5c7d, 0x33},
-+	{0x5c89, 0x36},
-+	{0x5c92, 0x5b},
-+	{0x5c00, 0x13},
-+	{0x5c0f, 0x2f},
-+	{0x5c1e, 0x2e},
-+	{0x5c2d, 0x34},
-+	{0x5c38, 0x33},
-+	{0x5c41, 0x32},
-+	{0x5c52, 0x0d},
-+	{0x5c61, 0x27},
-+	{0x5c70, 0x28},
-+	{0x5c7f, 0x1f},
-+	{0x5c8a, 0x25},
-+	{0x5c93, 0x2c},
-+	{0x5c02, 0x15},
-+	{0x5c11, 0x36},
-+	{0x5c20, 0x39},
-+	{0x5c2f, 0x3a},
-+	{0x5c39, 0x37},
-+	{0x5c42, 0x37},
-+	{0x5c54, 0x04},
-+	{0x5c63, 0x1c},
-+	{0x5c72, 0x1c},
-+	{0x5c81, 0x1c},
-+	{0x5c8b, 0x28},
-+	{0x5c94, 0x24},
-+	{0x5bfb, 0x33},
-+	{0x5c0a, 0x37},
-+	{0x5c19, 0x36},
-+	{0x5c28, 0x35},
-+	{0x5c4d, 0x23},
-+	{0x5c5c, 0x25},
-+	{0x5c6b, 0x31},
-+	{0x5c7a, 0x2e},
-+	{0x5bfd, 0x35},
-+	{0x5c0c, 0x36},
-+	{0x5c1b, 0x35},
-+	{0x5c2a, 0x37},
-+	{0x5c4f, 0x30},
-+	{0x5c5e, 0x33},
-+	{0x5c6d, 0x36},
-+	{0x5c7c, 0x5b},
-+	{0x5bff, 0x2e},
-+	{0x5c0e, 0x34},
-+	{0x5c1d, 0x33},
-+	{0x5c2c, 0x32},
-+	{0x5c51, 0x28},
-+	{0x5c60, 0x1f},
-+	{0x5c6f, 0x25},
-+	{0x5c7e, 0x2c},
-+	{0x5c01, 0x39},
-+	{0x5c10, 0x3a},
-+	{0x5c1f, 0x37},
-+	{0x5c2e, 0x37},
-+	{0x5c53, 0x1c},
-+	{0x5c62, 0x1c},
-+	{0x5c71, 0x28},
-+	{0x5c80, 0x24},
-+	{0x5c4c, 0x2c},
-+	{0x33f2, 0x03},
-+	{0x1f08, 0x00},
-+	{0x32c8, 0x00},
-+	{0x4017, 0x40},
-+	{0x40a2, 0x01},
-+	{0x40ac, 0x01},
-+	{0x4328, 0x00},
-+	{0x4329, 0xb3},
-+	{0x4e15, 0x10},
-+	{0x4e19, 0x2f},
-+	{0x4e21, 0x0f},
-+	{0x4e2f, 0x10},
-+	{0x4e3d, 0x10},
-+	{0x4e41, 0x2f},
-+	{0x4e57, 0x29},
-+	{0x4ffb, 0x2f},
-+	{0x5011, 0x24},
-+	{0x501d, 0x03},
-+	{0x505f, 0x41},
-+	{0x5060, 0xdf},
-+	{0x5065, 0xdf},
-+	{0x5066, 0x37},
-+	{0x506e, 0x57},
-+	{0x5070, 0xc5},
-+	{0x5072, 0x57},
-+	{0x5075, 0x53},
-+	{0x5076, 0x55},
-+	{0x5077, 0xc1},
-+	{0x5078, 0xc3},
-+	{0x5079, 0x53},
-+	{0x507a, 0x55},
-+	{0x507d, 0x57},
-+	{0x507e, 0xdf},
-+	{0x507f, 0xc5},
-+	{0x5081, 0x57},
-+	{0x53c8, 0x01},
-+	{0x53c9, 0xe2},
-+	{0x53ca, 0x03},
-+	{0x5422, 0x7a},
-+	{0x548e, 0x40},
-+	{0x5497, 0x5e},
-+	{0x54a1, 0x40},
-+	{0x54a9, 0x40},
-+	{0x54b2, 0x5e},
-+	{0x54bc, 0x40},
-+	{0x57c6, 0x00},
-+	{0x583d, 0x0e},
-+	{0x583e, 0x0e},
-+	{0x583f, 0x0e},
-+	{0x5840, 0x0e},
-+	{0x5841, 0x0e},
-+	{0x5842, 0x0e},
-+	{0x5900, 0x12},
-+	{0x5901, 0x12},
-+	{0x5902, 0x14},
-+	{0x5903, 0x12},
-+	{0x5904, 0x14},
-+	{0x5905, 0x12},
-+	{0x5906, 0x14},
-+	{0x5907, 0x12},
-+	{0x590f, 0x12},
-+	{0x5911, 0x12},
-+	{0x5913, 0x12},
-+	{0x591c, 0x12},
-+	{0x591e, 0x12},
-+	{0x5920, 0x12},
-+	{0x5948, 0x08},
-+	{0x5949, 0x08},
-+	{0x594a, 0x08},
-+	{0x594b, 0x08},
-+	{0x594c, 0x08},
-+	{0x594d, 0x08},
-+	{0x594e, 0x08},
-+	{0x594f, 0x08},
-+	{0x595c, 0x08},
-+	{0x595e, 0x08},
-+	{0x5960, 0x08},
-+	{0x596e, 0x08},
-+	{0x5970, 0x08},
-+	{0x5972, 0x08},
-+	{0x597e, 0x0f},
-+	{0x597f, 0x0f},
-+	{0x599a, 0x0f},
-+	{0x59de, 0x08},
-+	{0x59df, 0x08},
-+	{0x59fa, 0x08},
-+	{0x5a59, 0x22},
-+	{0x5a5b, 0x22},
-+	{0x5a5d, 0x1a},
-+	{0x5a5f, 0x22},
-+	{0x5a61, 0x1a},
-+	{0x5a63, 0x22},
-+	{0x5a65, 0x1a},
-+	{0x5a67, 0x22},
-+	{0x5a77, 0x22},
-+	{0x5a7b, 0x22},
-+	{0x5a7f, 0x22},
-+	{0x5a91, 0x22},
-+	{0x5a95, 0x22},
-+	{0x5a99, 0x22},
-+	{0x5ae9, 0x66},
-+	{0x5aeb, 0x66},
-+	{0x5aed, 0x5e},
-+	{0x5aef, 0x66},
-+	{0x5af1, 0x5e},
-+	{0x5af3, 0x66},
-+	{0x5af5, 0x5e},
-+	{0x5af7, 0x66},
-+	{0x5b07, 0x66},
-+	{0x5b0b, 0x66},
-+	{0x5b0f, 0x66},
-+	{0x5b21, 0x66},
-+	{0x5b25, 0x66},
-+	{0x5b29, 0x66},
-+	{0x5b79, 0x46},
-+	{0x5b7b, 0x3e},
-+	{0x5b7d, 0x3e},
-+	{0x5b89, 0x46},
-+	{0x5b8b, 0x46},
-+	{0x5b97, 0x46},
-+	{0x5b99, 0x46},
-+	{0x5c9e, 0x0a},
-+	{0x5c9f, 0x08},
-+	{0x5ca0, 0x0a},
-+	{0x5ca1, 0x0a},
-+	{0x5ca2, 0x0b},
-+	{0x5ca3, 0x06},
-+	{0x5ca4, 0x04},
-+	{0x5ca5, 0x06},
-+	{0x5ca6, 0x04},
-+	{0x5cad, 0x0b},
-+	{0x5cae, 0x0a},
-+	{0x5caf, 0x0c},
-+	{0x5cb0, 0x0a},
-+	{0x5cb1, 0x0b},
-+	{0x5cb2, 0x08},
-+	{0x5cb3, 0x06},
-+	{0x5cb4, 0x08},
-+	{0x5cb5, 0x04},
-+	{0x5cbc, 0x0b},
-+	{0x5cbd, 0x09},
-+	{0x5cbe, 0x08},
-+	{0x5cbf, 0x09},
-+	{0x5cc0, 0x0a},
-+	{0x5cc1, 0x08},
-+	{0x5cc2, 0x06},
-+	{0x5cc3, 0x08},
-+	{0x5cc4, 0x06},
-+	{0x5ccb, 0x0a},
-+	{0x5ccc, 0x09},
-+	{0x5ccd, 0x0a},
-+	{0x5cce, 0x08},
-+	{0x5ccf, 0x0a},
-+	{0x5cd0, 0x08},
-+	{0x5cd1, 0x08},
-+	{0x5cd2, 0x08},
-+	{0x5cd3, 0x08},
-+	{0x5cda, 0x09},
-+	{0x5cdb, 0x09},
-+	{0x5cdc, 0x08},
-+	{0x5cdd, 0x08},
-+	{0x5ce3, 0x09},
-+	{0x5ce4, 0x08},
-+	{0x5ce5, 0x08},
-+	{0x5ce6, 0x08},
-+	{0x5cf4, 0x04},
-+	{0x5d04, 0x04},
-+	{0x5d13, 0x06},
-+	{0x5d22, 0x06},
-+	{0x5d23, 0x04},
-+	{0x5d2e, 0x06},
-+	{0x5d37, 0x06},
-+	{0x5d6f, 0x09},
-+	{0x5d72, 0x0f},
-+	{0x5d88, 0x0f},
-+	{0x5de6, 0x01},
-+	{0x5de7, 0x01},
-+	{0x5de8, 0x01},
-+	{0x5de9, 0x01},
-+	{0x5dea, 0x01},
-+	{0x5deb, 0x01},
-+	{0x5dec, 0x01},
-+	{0x5df2, 0x01},
-+	{0x5df3, 0x01},
-+	{0x5df4, 0x01},
-+	{0x5df5, 0x01},
-+	{0x5df6, 0x01},
-+	{0x5df7, 0x01},
-+	{0x5df8, 0x01},
-+	{0x5dfe, 0x01},
-+	{0x5dff, 0x01},
-+	{0x5e00, 0x01},
-+	{0x5e01, 0x01},
-+	{0x5e02, 0x01},
-+	{0x5e03, 0x01},
-+	{0x5e04, 0x01},
-+	{0x5e0a, 0x01},
-+	{0x5e0b, 0x01},
-+	{0x5e0c, 0x01},
-+	{0x5e0d, 0x01},
-+	{0x5e0e, 0x01},
-+	{0x5e0f, 0x01},
-+	{0x5e10, 0x01},
-+	{0x5e16, 0x01},
-+	{0x5e17, 0x01},
-+	{0x5e18, 0x01},
-+	{0x5e1e, 0x01},
-+	{0x5e1f, 0x01},
-+	{0x5e20, 0x01},
-+	{0x5e6e, 0x5a},
-+	{0x5e6f, 0x46},
-+	{0x5e70, 0x46},
-+	{0x5e71, 0x3c},
-+	{0x5e72, 0x3c},
-+	{0x5e73, 0x28},
-+	{0x5e74, 0x28},
-+	{0x5e75, 0x6e},
-+	{0x5e76, 0x6e},
-+	{0x5e81, 0x46},
-+	{0x5e83, 0x3c},
-+	{0x5e85, 0x28},
-+	{0x5e87, 0x6e},
-+	{0x5e92, 0x46},
-+	{0x5e94, 0x3c},
-+	{0x5e96, 0x28},
-+	{0x5e98, 0x6e},
-+	{0x5ecb, 0x26},
-+	{0x5ecc, 0x26},
-+	{0x5ecd, 0x26},
-+	{0x5ece, 0x26},
-+	{0x5ed2, 0x26},
-+	{0x5ed3, 0x26},
-+	{0x5ed4, 0x26},
-+	{0x5ed5, 0x26},
-+	{0x5ed9, 0x26},
-+	{0x5eda, 0x26},
-+	{0x5ee5, 0x08},
-+	{0x5ee6, 0x08},
-+	{0x5ee7, 0x08},
-+	{0x6006, 0x14},
-+	{0x6007, 0x14},
-+	{0x6008, 0x14},
-+	{0x6009, 0x14},
-+	{0x600a, 0x14},
-+	{0x600b, 0x14},
-+	{0x600c, 0x14},
-+	{0x600d, 0x22},
-+	{0x600e, 0x22},
-+	{0x600f, 0x14},
-+	{0x601a, 0x14},
-+	{0x601b, 0x14},
-+	{0x601c, 0x14},
-+	{0x601d, 0x14},
-+	{0x601e, 0x14},
-+	{0x601f, 0x14},
-+	{0x6020, 0x14},
-+	{0x6021, 0x22},
-+	{0x6022, 0x22},
-+	{0x6023, 0x14},
-+	{0x602e, 0x14},
-+	{0x602f, 0x14},
-+	{0x6030, 0x14},
-+	{0x6031, 0x22},
-+	{0x6039, 0x14},
-+	{0x603a, 0x14},
-+	{0x603b, 0x14},
-+	{0x603c, 0x22},
-+	{0x6132, 0x0f},
-+	{0x6133, 0x0f},
-+	{0x6134, 0x0f},
-+	{0x6135, 0x0f},
-+	{0x6136, 0x0f},
-+	{0x6137, 0x0f},
-+	{0x6138, 0x0f},
-+	{0x613e, 0x0f},
-+	{0x613f, 0x0f},
-+	{0x6140, 0x0f},
-+	{0x6141, 0x0f},
-+	{0x6142, 0x0f},
-+	{0x6143, 0x0f},
-+	{0x6144, 0x0f},
-+	{0x614a, 0x0f},
-+	{0x614b, 0x0f},
-+	{0x614c, 0x0f},
-+	{0x614d, 0x0f},
-+	{0x614e, 0x0f},
-+	{0x614f, 0x0f},
-+	{0x6150, 0x0f},
-+	{0x6156, 0x0f},
-+	{0x6157, 0x0f},
-+	{0x6158, 0x0f},
-+	{0x6159, 0x0f},
-+	{0x615a, 0x0f},
-+	{0x615b, 0x0f},
-+	{0x615c, 0x0f},
-+	{0x6162, 0x0f},
-+	{0x6163, 0x0f},
-+	{0x6164, 0x0f},
-+	{0x616a, 0x0f},
-+	{0x616b, 0x0f},
-+	{0x616c, 0x0f},
-+	{0x6226, 0x00},
-+	{0x84f8, 0x01},
-+	{0x8501, 0x00},
-+	{0x8502, 0x01},
-+	{0x8505, 0x00},
-+	{0x8744, 0x00},
-+	{0x883c, 0x01},
-+	{0x8845, 0x00},
-+	{0x8846, 0x01},
-+	{0x8849, 0x00},
-+	{0x9004, 0x1f},
-+	{0x9064, 0x4d},
-+	{0x9065, 0x3d},
-+	{0x922e, 0x91},
-+	{0x922f, 0x2a},
-+	{0x9230, 0xe2},
-+	{0x9231, 0xc0},
-+	{0x9232, 0xe2},
-+	{0x9233, 0xc1},
-+	{0x9234, 0xe2},
-+	{0x9235, 0xc2},
-+	{0x9236, 0xe2},
-+	{0x9237, 0xc3},
-+	{0x9238, 0xe2},
-+	{0x9239, 0xd4},
-+	{0x923a, 0xe2},
-+	{0x923b, 0xd5},
-+	{0x923c, 0x90},
-+	{0x923d, 0x64},
-+	{0xb0b9, 0x10},
-+	{0xbc76, 0x00},
-+	{0xbc77, 0x00},
-+	{0xbc78, 0x00},
-+	{0xbc79, 0x00},
-+	{0xbc7b, 0x28},
-+	{0xbc7c, 0x00},
-+	{0xbc7d, 0x00},
-+	{0xbc7f, 0xc0},
-+	{0xc6b9, 0x01},
-+	{0xecb5, 0x04},
-+	{0xecbf, 0x04},
-+	{0x0112, 0x0a},
-+	{0x0113, 0x0a},
-+	{0x0114, 0x01},
-+	{0x0301, 0x08},
-+	{0x0303, 0x02},
-+	{0x0305, 0x04},
-+	{0x0306, 0x01},
-+	{0x0307, 0x2c},
-+	{0x030b, 0x02},
-+	{0x030d, 0x04},
-+	{0x030e, 0x01},
-+	{0x030f, 0x30},
-+	{0x0310, 0x01},
-+	{0x4018, 0x00},
-+	{0x4019, 0x00},
-+	{0x401a, 0x00},
-+	{0x401b, 0x00},
-+	{0x3400, 0x01},
-+	{0x3092, 0x01},
-+	{0x3093, 0x00},
-+	{0x0350, 0x00},
-+};
-+
-+/* 64 mpix 2.7fps */
-+static const struct arducam_64mp_reg mode_9152x6944_regs[] = {
-+	{0x0342, 0xb6},
-+	{0x0343, 0xb2},
-+	{0x0340, 0x1b},
-+	{0x0341, 0x76},
-+	{0x0344, 0x00},
-+	{0x0345, 0x00},
-+	{0x0346, 0x00},
-+	{0x0347, 0x00},
-+	{0x0348, 0x24},
-+	{0x0349, 0x1f},
-+	{0x034a, 0x1b},
-+	{0x034b, 0x1f},
-+	{0x0900, 0x00},
-+	{0x0901, 0x11},
-+	{0x0902, 0x0a},
-+	{0x30d8, 0x00},
-+	{0x3200, 0x01},
-+	{0x3201, 0x01},
-+	{0x0408, 0x00},
-+	{0x0409, 0x00},
-+	{0x040a, 0x00},
-+	{0x040b, 0x00},
-+	{0x040c, 0x23},
-+	{0x040d, 0xc0},
-+	{0x040e, 0x1b},
-+	{0x040f, 0x20},
-+	{0x034c, 0x23},
-+	{0x034d, 0xc0},
-+	{0x034e, 0x1b},
-+	{0x034f, 0x20},
-+	{0x30d9, 0x01},
-+	{0x32d5, 0x01},
-+	{0x32d6, 0x00},
-+	{0x401e, 0x00},
-+	{0x40b8, 0x04},
-+	{0x40b9, 0x20},
-+	{0x40bc, 0x02},
-+	{0x40bd, 0x58},
-+	{0x40be, 0x02},
-+	{0x40bf, 0x58},
-+	{0x41a4, 0x00},
-+	{0x5a09, 0x01},
-+	{0x5a17, 0x01},
-+	{0x5a25, 0x01},
-+	{0x5a33, 0x01},
-+	{0x98d7, 0x14},
-+	{0x98d8, 0x14},
-+	{0x98d9, 0x00},
-+	{0x99c4, 0x00},
-+	{0x0202, 0x03},
-+	{0x0203, 0xe8},
-+	{0x0204, 0x00},
-+	{0x0205, 0x00},
-+	{0x020e, 0x01},
-+	{0x020f, 0x00},
-+};
-+
-+/* 16 mpix 10fps */
-+static const struct arducam_64mp_reg mode_4624x3472_regs[] = {
-+	{0x0342, 0x63},
-+	{0x0343, 0x97},
-+	{0x0340, 0x0d},
-+	{0x0341, 0xca},
-+	{0x0344, 0x00},
-+	{0x0345, 0x00},
-+	{0x0346, 0x00},
-+	{0x0347, 0x00},
-+	{0x0348, 0x24},
-+	{0x0349, 0x1f},
-+	{0x034a, 0x1b},
-+	{0x034b, 0x1f},
-+	{0x0900, 0x01},
-+	{0x0901, 0x22},
-+	{0x0902, 0x08},
-+	{0x30d8, 0x04},
-+	{0x3200, 0x41},
-+	{0x3201, 0x41},
-+	{0x0408, 0x00},
-+	{0x0409, 0x00},
-+	{0x040a, 0x00},
-+	{0x040b, 0x00},
-+	{0x040c, 0x12},
-+	{0x040d, 0x10},
-+	{0x040e, 0x0d},
-+	{0x040f, 0x90},
-+	{0x034c, 0x12},
-+	{0x034d, 0x10},
-+	{0x034e, 0x0d},
-+	{0x034f, 0x90},
-+	{0x30d9, 0x00},
-+	{0x32d5, 0x00},
-+	{0x32d6, 0x00},
-+	{0x401e, 0x00},
-+	{0x40b8, 0x01},
-+	{0x40b9, 0x2c},
-+	{0x40bc, 0x01},
-+	{0x40bd, 0x18},
-+	{0x40be, 0x00},
-+	{0x40bf, 0x00},
-+	{0x41a4, 0x00},
-+	{0x5a09, 0x01},
-+	{0x5a17, 0x01},
-+	{0x5a25, 0x01},
-+	{0x5a33, 0x01},
-+	{0x98d7, 0xb4},
-+	{0x98d8, 0x8c},
-+	{0x98d9, 0x0a},
-+	{0x99c4, 0x16},
-+};
-+
-+/* 4k 20fps mode */
-+static const struct arducam_64mp_reg mode_3840x2160_regs[] = {
-+	{0x0342, 0x4e},
-+	{0x0343, 0xb7},
-+	{0x0340, 0x08},
-+	{0x0341, 0xb9},
-+	{0x0344, 0x03},
-+	{0x0345, 0x10},
-+	{0x0346, 0x05},
-+	{0x0347, 0x20},
-+	{0x0348, 0x21},
-+	{0x0349, 0x0f},
-+	{0x034a, 0x15},
-+	{0x034b, 0xff},
-+	{0x0900, 0x01},
-+	{0x0901, 0x22},
-+	{0x0902, 0x08},
-+	{0x30d8, 0x04},
-+	{0x3200, 0x41},
-+	{0x3201, 0x41},
-+	{0x0408, 0x00},
-+	{0x0409, 0x00},
-+	{0x040a, 0x00},
-+	{0x040b, 0x00},
-+	{0x040c, 0x0f},
-+	{0x040d, 0x00},
-+	{0x040e, 0x08},
-+	{0x040f, 0x70},
-+	{0x034c, 0x0f},
-+	{0x034d, 0x00},
-+	{0x034e, 0x08},
-+	{0x034f, 0x70},
-+	{0x30d9, 0x00},
-+	{0x32d5, 0x00},
-+	{0x32d6, 0x00},
-+	{0x401e, 0x00},
-+	{0x40b8, 0x01},
-+	{0x40b9, 0x2c},
-+	{0x40bc, 0x01},
-+	{0x40bd, 0x18},
-+	{0x40be, 0x00},
-+	{0x40bf, 0x00},
-+	{0x41a4, 0x00},
-+	{0x5a09, 0x01},
-+	{0x5a17, 0x01},
-+	{0x5a25, 0x01},
-+	{0x5a33, 0x01},
-+	{0x98d7, 0xb4},
-+	{0x98d8, 0x8c},
-+	{0x98d9, 0x0a},
-+	{0x99c4, 0x16},
-+};
-+
-+/* 4x4 binned 30fps mode */
-+static const struct arducam_64mp_reg mode_2312x1736_regs[] = {
-+	{0x0342, 0x33},
-+	{0x0343, 0x60},
-+	{0x0340, 0x08},
-+	{0x0341, 0xe9},
-+	{0x0344, 0x00},
-+	{0x0345, 0x00},
-+	{0x0346, 0x00},
-+	{0x0347, 0x00},
-+	{0x0348, 0x24},
-+	{0x0349, 0x1f},
-+	{0x034a, 0x1b},
-+	{0x034b, 0x1f},
-+	{0x0900, 0x01},
-+	{0x0901, 0x44},
-+	{0x0902, 0x08},
-+	{0x30d8, 0x00},
-+	{0x3200, 0x43},
-+	{0x3201, 0x43},
-+	{0x0408, 0x00},
-+	{0x0409, 0x00},
-+	{0x040a, 0x00},
-+	{0x040b, 0x00},
-+	{0x040c, 0x09},
-+	{0x040d, 0x08},
-+	{0x040e, 0x06},
-+	{0x040f, 0xc8},
-+	{0x034c, 0x09},
-+	{0x034d, 0x08},
-+	{0x034e, 0x06},
-+	{0x034f, 0xc8},
-+	{0x30d9, 0x01},
-+	{0x32d5, 0x00},
-+	{0x32d6, 0x00},
-+	{0x401e, 0x00},
-+	{0x40b8, 0x01},
-+	{0x40b9, 0x2c},
-+	{0x40bc, 0x01},
-+	{0x40bd, 0x18},
-+	{0x40be, 0x00},
-+	{0x40bf, 0x00},
-+	{0x41a4, 0x00},
-+	{0x5a09, 0x01},
-+	{0x5a17, 0x01},
-+	{0x5a25, 0x01},
-+	{0x5a33, 0x01},
-+	{0x98d7, 0xb4},
-+	{0x98d8, 0x8c},
-+	{0x98d9, 0x0a},
-+	{0x99c4, 0x16},
-+};
-+
-+/* 1080p 60fps mode */
-+static const struct arducam_64mp_reg mode_1920x1080_regs[] = {
-+	{0x0342, 0x29},
-+	{0x0343, 0xe3},
-+	{0x0340, 0x05},
-+	{0x0341, 0x76},
-+	{0x0344, 0x03},
-+	{0x0345, 0x10},
-+	{0x0346, 0x05},
-+	{0x0347, 0x20},
-+	{0x0348, 0x21},
-+	{0x0349, 0x0f},
-+	{0x034a, 0x16},
-+	{0x034b, 0x0f},
-+	{0x0900, 0x01},
-+	{0x0901, 0x44},
-+	{0x0902, 0x08},
-+	{0x30d8, 0x04},
-+	{0x3200, 0x43},
-+	{0x3201, 0x43},
-+	{0x0408, 0x00},
-+	{0x0409, 0x00},
-+	{0x040a, 0x00},
-+	{0x040b, 0x00},
-+	{0x040c, 0x07},
-+	{0x040d, 0x80},
-+	{0x040e, 0x04},
-+	{0x040f, 0x38},
-+	{0x034c, 0x07},
-+	{0x034d, 0x80},
-+	{0x034e, 0x04},
-+	{0x034f, 0x38},
-+	{0x30d9, 0x00},
-+	{0x32d5, 0x00},
-+	{0x32d6, 0x00},
-+	{0x401e, 0x00},
-+	{0x40b8, 0x01},
-+	{0x40b9, 0x2c},
-+	{0x40bc, 0x01},
-+	{0x40bd, 0x18},
-+	{0x40be, 0x00},
-+	{0x40bf, 0x00},
-+	{0x41a4, 0x00},
-+	{0x5a09, 0x01},
-+	{0x5a17, 0x01},
-+	{0x5a25, 0x01},
-+	{0x5a33, 0x01},
-+	{0x98d7, 0xb4},
-+	{0x98d8, 0x8c},
-+	{0x98d9, 0x0a},
-+	{0x99c4, 0x16},
-+};
-+
-+/* 720p 120fps mode */
-+static const struct arducam_64mp_reg mode_1280x720_regs[] = {
-+	{0x0342, 0x1d},
-+	{0x0343, 0xc4},
-+	{0x0340, 0x03},
-+	{0x0341, 0xd8},
-+	{0x0344, 0x08},
-+	{0x0345, 0x10},
-+	{0x0346, 0x07},
-+	{0x0347, 0xf0},
-+	{0x0348, 0x1c},
-+	{0x0349, 0x0f},
-+	{0x034a, 0x13},
-+	{0x034b, 0x3f},
-+	{0x0900, 0x01},
-+	{0x0901, 0x44},
-+	{0x0902, 0x08},
-+	{0x30d8, 0x04},
-+	{0x3200, 0x43},
-+	{0x3201, 0x43},
-+	{0x0408, 0x00},
-+	{0x0409, 0x00},
-+	{0x040a, 0x00},
-+	{0x040b, 0x00},
-+	{0x040c, 0x05},
-+	{0x040d, 0x00},
-+	{0x040e, 0x02},
-+	{0x040f, 0xd0},
-+	{0x034c, 0x05},
-+	{0x034d, 0x00},
-+	{0x034e, 0x02},
-+	{0x034f, 0xd0},
-+	{0x30d9, 0x00},
-+	{0x32d5, 0x00},
-+	{0x32d6, 0x00},
-+	{0x401e, 0x00},
-+	{0x40b8, 0x01},
-+	{0x40b9, 0x2c},
-+	{0x40bc, 0x01},
-+	{0x40bd, 0x18},
-+	{0x40be, 0x00},
-+	{0x40bf, 0x00},
-+	{0x41a4, 0x00},
-+	{0x5a09, 0x01},
-+	{0x5a17, 0x01},
-+	{0x5a25, 0x01},
-+	{0x5a33, 0x01},
-+	{0x98d7, 0xb4},
-+	{0x98d8, 0x8c},
-+	{0x98d9, 0x0a},
-+	{0x99c4, 0x16},
-+};
-+
-+/* Mode configs */
-+static const struct arducam_64mp_mode supported_modes[] = {
-+	{
-+		.width = 9152,
-+		.height = 6944,
-+		.line_length_pix = 0xb6b2,
-+		.crop = {
-+			.left = ARDUCAM_64MP_PIXEL_ARRAY_LEFT,
-+			.top = ARDUCAM_64MP_PIXEL_ARRAY_TOP,
-+			.width = 9248,
-+			.height = 6944,
-+		},
-+		.timeperframe_default = {
-+			.numerator = 100,
-+			.denominator = 270
-+		},
-+		.reg_list = {
-+			.num_of_regs = ARRAY_SIZE(mode_9152x6944_regs),
-+			.regs = mode_9152x6944_regs,
-+		}
-+	}, {
-+		.width = 4624,
-+		.height = 3472,
-+		.line_length_pix = 0x6397,
-+		.crop = {
-+			.left = ARDUCAM_64MP_PIXEL_ARRAY_LEFT,
-+			.top = ARDUCAM_64MP_PIXEL_ARRAY_TOP,
-+			.width = 9248,
-+			.height = 6944,
-+		},
-+		.timeperframe_default = {
-+			.numerator = 100,
-+			.denominator = 1000
-+		},
-+		.reg_list = {
-+			.num_of_regs = ARRAY_SIZE(mode_4624x3472_regs),
-+			.regs = mode_4624x3472_regs,
-+		}
-+	}, {
-+		.width = 3840,
-+		.height = 2160,
-+		.line_length_pix = 0x4eb7,
-+		.crop = {
-+			.left = ARDUCAM_64MP_PIXEL_ARRAY_LEFT + 784,
-+			.top = ARDUCAM_64MP_PIXEL_ARRAY_TOP + 1312,
-+			.width = 7680,
-+			.height = 4320,
-+		},
-+		.timeperframe_default = {
-+			.numerator = 100,
-+			.denominator = 2000
-+		},
-+		.reg_list = {
-+			.num_of_regs = ARRAY_SIZE(mode_3840x2160_regs),
-+			.regs = mode_3840x2160_regs,
-+		}
-+	}, {
-+		.width = 2312,
-+		.height = 1736,
-+		.line_length_pix = 0x3360,
-+		.crop = {
-+			.left = ARDUCAM_64MP_PIXEL_ARRAY_LEFT,
-+			.top = ARDUCAM_64MP_PIXEL_ARRAY_TOP,
-+			.width = 9248,
-+			.height = 6944,
-+		},
-+		.timeperframe_default = {
-+			.numerator = 100,
-+			.denominator = 3000
-+		},
-+		.reg_list = {
-+			.num_of_regs = ARRAY_SIZE(mode_2312x1736_regs),
-+			.regs = mode_2312x1736_regs,
-+		}
-+	}, {
-+		.width = 1920,
-+		.height = 1080,
-+		.line_length_pix = 0x29e3,
-+		.crop = {
-+			.left = ARDUCAM_64MP_PIXEL_ARRAY_LEFT + 784,
-+			.top = ARDUCAM_64MP_PIXEL_ARRAY_TOP + 1312,
-+			.width = 7680,
-+			.height = 4320,
-+		},
-+		.timeperframe_default = {
-+			.numerator = 100,
-+			.denominator = 6000
-+		},
-+		.reg_list = {
-+			.num_of_regs = ARRAY_SIZE(mode_1920x1080_regs),
-+			.regs = mode_1920x1080_regs,
-+		}
-+	}, {
-+		.width = 1280,
-+		.height = 720,
-+		.line_length_pix = 0x1dc4,
-+		.crop = {
-+			.left = ARDUCAM_64MP_PIXEL_ARRAY_LEFT + 2064,
-+			.top = ARDUCAM_64MP_PIXEL_ARRAY_TOP + 2032,
-+			.width = 5120,
-+			.height = 2880,
-+		},
-+		.timeperframe_default = {
-+			.numerator = 100,
-+			.denominator = 12000
-+		},
-+		.reg_list = {
-+			.num_of_regs = ARRAY_SIZE(mode_1280x720_regs),
-+			.regs = mode_1280x720_regs,
-+		}
-+	},
-+};
-+
-+/*
-+ * The supported formats.
-+ * This table MUST contain 4 entries per format, to cover the various flip
-+ * combinations in the order
-+ * - no flip
-+ * - h flip
-+ * - v flip
-+ * - h&v flips
-+ */
-+static const u32 codes[] = {
-+	/* 10-bit modes. */
-+	MEDIA_BUS_FMT_SRGGB10_1X10,
-+	MEDIA_BUS_FMT_SGRBG10_1X10,
-+	MEDIA_BUS_FMT_SGBRG10_1X10,
-+	MEDIA_BUS_FMT_SBGGR10_1X10,
-+};
-+
-+static const char * const arducam_64mp_test_pattern_menu[] = {
-+	"Disabled",
-+	"Color Bars",
-+	"Solid Color",
-+	"Grey Color Bars",
-+	"PN9"
-+};
-+
-+static const int arducam_64mp_test_pattern_val[] = {
-+	ARDUCAM_64MP_TEST_PATTERN_DISABLE,
-+	ARDUCAM_64MP_TEST_PATTERN_COLOR_BARS,
-+	ARDUCAM_64MP_TEST_PATTERN_SOLID_COLOR,
-+	ARDUCAM_64MP_TEST_PATTERN_GREY_COLOR,
-+	ARDUCAM_64MP_TEST_PATTERN_PN9,
-+};
-+
-+/* regulator supplies */
-+static const char * const arducam_64mp_supply_name[] = {
-+	/* Supplies can be enabled in any order */
-+	"VANA",  /* Analog (2.8V) supply */
-+	"VDIG",  /* Digital Core (1.05V) supply */
-+	"VDDL",  /* IF (1.8V) supply */
-+};
-+
-+#define ARDUCAM_64MP_NUM_SUPPLIES ARRAY_SIZE(arducam_64mp_supply_name)
-+
-+/*
-+ * Initialisation delay between XCLR low->high and the moment when the sensor
-+ * can start capture (i.e. can leave software standby), given by T7 in the
-+ * datasheet is 7.7ms.  This does include I2C setup time as well.
-+ *
-+ * Note, that delay between XCLR low->high and reading the CCI ID register (T6
-+ * in the datasheet) is much smaller - 1ms.
-+ */
-+#define ARDUCAM_64MP_XCLR_MIN_DELAY_US		8000
-+#define ARDUCAM_64MP_XCLR_DELAY_RANGE_US	1000
-+
-+struct arducam_64mp {
-+	struct v4l2_subdev sd;
-+	struct media_pad pad;
-+
-+	unsigned int fmt_code;
-+
-+	struct clk *xclk;
-+
-+	struct gpio_desc *reset_gpio;
-+	struct regulator_bulk_data supplies[ARDUCAM_64MP_NUM_SUPPLIES];
-+
-+	struct v4l2_ctrl_handler ctrl_handler;
-+	/* V4L2 Controls */
-+	struct v4l2_ctrl *pixel_rate;
-+	struct v4l2_ctrl *exposure;
-+	struct v4l2_ctrl *vflip;
-+	struct v4l2_ctrl *hflip;
-+	struct v4l2_ctrl *vblank;
-+	struct v4l2_ctrl *hblank;
-+
-+	/* Current mode */
-+	const struct arducam_64mp_mode *mode;
-+
-+	/*
-+	 * Mutex for serialized access:
-+	 * Protect sensor module set pad format and start/stop streaming safely.
-+	 */
-+	struct mutex mutex;
-+
-+	/* Streaming on/off */
-+	bool streaming;
-+
-+	/* Rewrite common registers on stream on? */
-+	bool common_regs_written;
-+
-+	/* Current long exposure factor in use. Set through V4L2_CID_VBLANK */
-+	unsigned int long_exp_shift;
-+};
-+
-+static inline struct arducam_64mp *to_arducam_64mp(struct v4l2_subdev *_sd)
-+{
-+	return container_of(_sd, struct arducam_64mp, sd);
-+}
-+
-+/* Read registers up to 2 at a time */
-+static int arducam_64mp_read_reg(struct i2c_client *client,
-+				 u16 reg, u32 len, u32 *val)
-+{
-+	struct i2c_msg msgs[2];
-+	u8 addr_buf[2] = { reg >> 8, reg & 0xff };
-+	u8 data_buf[4] = { 0, };
-+	int ret;
-+
-+	if (len > 4)
-+		return -EINVAL;
-+
-+	/* Write register address */
-+	msgs[0].addr = client->addr;
-+	msgs[0].flags = 0;
-+	msgs[0].len = ARRAY_SIZE(addr_buf);
-+	msgs[0].buf = addr_buf;
-+
-+	/* Read data from register */
-+	msgs[1].addr = client->addr;
-+	msgs[1].flags = I2C_M_RD;
-+	msgs[1].len = len;
-+	msgs[1].buf = &data_buf[4 - len];
-+
-+	ret = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
-+	if (ret != ARRAY_SIZE(msgs))
-+		return -EIO;
-+
-+	*val = get_unaligned_be32(data_buf);
-+
-+	return 0;
-+}
-+
-+/* Write registers up to 2 at a time */
-+static int arducam_64mp_write_reg(struct arducam_64mp *arducam_64mp,
-+				  u16 reg, u32 len, u32 val)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&arducam_64mp->sd);
-+	u8 buf[6];
-+
-+	if (len > 4)
-+		return -EINVAL;
-+
-+	put_unaligned_be16(reg, buf);
-+	put_unaligned_be32(val << (8 * (4 - len)), buf + 2);
-+	if (i2c_master_send(client, buf, len + 2) != len + 2)
-+		return -EIO;
-+
-+	return 0;
-+}
-+
-+/* Write a list of registers */
-+static int arducam_64mp_write_regs(struct arducam_64mp *arducam_64mp,
-+				   const struct arducam_64mp_reg *regs, u32 len)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&arducam_64mp->sd);
-+	unsigned int i;
-+	int ret;
-+
-+	for (i = 0; i < len; i++) {
-+		ret = arducam_64mp_write_reg(arducam_64mp, regs[i].address, 1,
-+					     regs[i].val);
-+		if (ret) {
-+			dev_err_ratelimited(&client->dev,
-+					    "Failed to write reg 0x%4.4x. error = %d\n",
-+					    regs[i].address, ret);
-+
-+			return ret;
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+/* Get bayer order based on flip setting. */
-+static u32 arducam_64mp_get_format_code(struct arducam_64mp *arducam_64mp)
-+{
-+	unsigned int i;
-+
-+	lockdep_assert_held(&arducam_64mp->mutex);
-+
-+	i = (arducam_64mp->vflip->val ? 2 : 0) |
-+	    (arducam_64mp->hflip->val ? 1 : 0);
-+
-+	return codes[i];
-+}
-+
-+static int arducam_64mp_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
-+{
-+	struct arducam_64mp *arducam_64mp = to_arducam_64mp(sd);
-+	struct v4l2_mbus_framefmt *try_fmt_img =
-+		v4l2_subdev_get_try_format(sd, fh->state, 0);
-+	struct v4l2_rect *try_crop;
-+
-+	mutex_lock(&arducam_64mp->mutex);
-+
-+	/* Initialize try_fmt for the image pad */
-+	try_fmt_img->width = supported_modes[0].width;
-+	try_fmt_img->height = supported_modes[0].height;
-+	try_fmt_img->code = arducam_64mp_get_format_code(arducam_64mp);
-+	try_fmt_img->field = V4L2_FIELD_NONE;
-+
-+	/* Initialize try_crop */
-+	try_crop = v4l2_subdev_get_try_crop(sd, fh->state, 0);
-+	try_crop->left = ARDUCAM_64MP_PIXEL_ARRAY_LEFT;
-+	try_crop->top = ARDUCAM_64MP_PIXEL_ARRAY_TOP;
-+	try_crop->width = ARDUCAM_64MP_PIXEL_ARRAY_WIDTH;
-+	try_crop->height = ARDUCAM_64MP_PIXEL_ARRAY_HEIGHT;
-+
-+	mutex_unlock(&arducam_64mp->mutex);
-+
-+	return 0;
-+}
-+
-+static void
-+arducam_64mp_adjust_exposure_range(struct arducam_64mp *arducam_64mp)
-+{
-+	int exposure_max, exposure_def;
-+
-+	/* Honour the VBLANK limits when setting exposure. */
-+	exposure_max = arducam_64mp->mode->height + arducam_64mp->vblank->val -
-+		       ARDUCAM_64MP_EXPOSURE_OFFSET;
-+	exposure_def = min(exposure_max, arducam_64mp->exposure->val);
-+	__v4l2_ctrl_modify_range(arducam_64mp->exposure,
-+				 arducam_64mp->exposure->minimum,
-+				 exposure_max, arducam_64mp->exposure->step,
-+				 exposure_def);
-+}
-+
-+static int arducam_64mp_set_frame_length(struct arducam_64mp *arducam_64mp,
-+					 unsigned int vblank)
-+{
-+	unsigned int val = vblank + arducam_64mp->mode->height;
-+	int ret = 0;
-+
-+	arducam_64mp->long_exp_shift = 0;
-+
-+	while (val > ARDUCAM_64MP_FRAME_LENGTH_MAX) {
-+		arducam_64mp->long_exp_shift++;
-+		val >>= 1;
-+	}
-+
-+	ret = arducam_64mp_write_reg(arducam_64mp,
-+				     ARDUCAM_64MP_REG_FRAME_LENGTH,
-+				     ARDUCAM_64MP_REG_VALUE_16BIT, val);
-+	if (ret)
-+		return ret;
-+
-+	return arducam_64mp_write_reg(arducam_64mp,
-+				      ARDUCAM_64MP_LONG_EXP_SHIFT_REG,
-+				      ARDUCAM_64MP_REG_VALUE_08BIT,
-+				      arducam_64mp->long_exp_shift);
-+}
-+
-+static int arducam_64mp_set_ctrl(struct v4l2_ctrl *ctrl)
-+{
-+	struct arducam_64mp *arducam_64mp =
-+		container_of(ctrl->handler, struct arducam_64mp, ctrl_handler);
-+	struct i2c_client *client = v4l2_get_subdevdata(&arducam_64mp->sd);
-+	int ret;
-+	u32 val;
-+	/*
-+	 * The VBLANK control may change the limits of usable exposure, so check
-+	 * and adjust if necessary.
-+	 */
-+	if (ctrl->id == V4L2_CID_VBLANK)
-+		arducam_64mp_adjust_exposure_range(arducam_64mp);
-+
-+	/*
-+	 * Applying V4L2 control value only happens
-+	 * when power is up for streaming
-+	 */
-+	if (pm_runtime_get_if_in_use(&client->dev) == 0)
-+		return 0;
-+
-+	switch (ctrl->id) {
-+	case V4L2_CID_ANALOGUE_GAIN:
-+		ret = arducam_64mp_write_reg(arducam_64mp,
-+					     ARDUCAM_64MP_REG_ANALOG_GAIN,
-+					     ARDUCAM_64MP_REG_VALUE_16BIT,
-+					     ctrl->val);
-+		break;
-+	case V4L2_CID_EXPOSURE:
-+		val = ctrl->val >> arducam_64mp->long_exp_shift;
-+		ret = arducam_64mp_write_reg(arducam_64mp,
-+					     ARDUCAM_64MP_REG_EXPOSURE,
-+					     ARDUCAM_64MP_REG_VALUE_16BIT,
-+					     val);
-+		break;
-+	case V4L2_CID_DIGITAL_GAIN:
-+		ret = arducam_64mp_write_reg(arducam_64mp,
-+					     ARDUCAM_64MP_REG_DIGITAL_GAIN,
-+					     ARDUCAM_64MP_REG_VALUE_16BIT,
-+					     ctrl->val);
-+		break;
-+	case V4L2_CID_TEST_PATTERN:
-+		val = arducam_64mp_test_pattern_val[ctrl->val];
-+		ret = arducam_64mp_write_reg(arducam_64mp,
-+					     ARDUCAM_64MP_REG_TEST_PATTERN,
-+					     ARDUCAM_64MP_REG_VALUE_16BIT,
-+					     val);
-+		break;
-+	case V4L2_CID_TEST_PATTERN_RED:
-+		ret = arducam_64mp_write_reg(arducam_64mp,
-+					     ARDUCAM_64MP_REG_TEST_PATTERN_R,
-+					     ARDUCAM_64MP_REG_VALUE_16BIT,
-+					     ctrl->val);
-+		break;
-+	case V4L2_CID_TEST_PATTERN_GREENR:
-+		ret = arducam_64mp_write_reg(arducam_64mp,
-+					     ARDUCAM_64MP_REG_TEST_PATTERN_GR,
-+					     ARDUCAM_64MP_REG_VALUE_16BIT,
-+					     ctrl->val);
-+		break;
-+	case V4L2_CID_TEST_PATTERN_BLUE:
-+		ret = arducam_64mp_write_reg(arducam_64mp,
-+					     ARDUCAM_64MP_REG_TEST_PATTERN_B,
-+					     ARDUCAM_64MP_REG_VALUE_16BIT,
-+					     ctrl->val);
-+		break;
-+	case V4L2_CID_TEST_PATTERN_GREENB:
-+		ret = arducam_64mp_write_reg(arducam_64mp,
-+					     ARDUCAM_64MP_REG_TEST_PATTERN_GB,
-+					     ARDUCAM_64MP_REG_VALUE_16BIT,
-+					     ctrl->val);
-+		break;
-+	case V4L2_CID_HFLIP:
-+	case V4L2_CID_VFLIP:
-+		ret = arducam_64mp_write_reg(arducam_64mp,
-+					     ARDUCAM_64MP_REG_ORIENTATION, 1,
-+					     arducam_64mp->hflip->val |
-+						arducam_64mp->vflip->val << 1);
-+		break;
-+	case V4L2_CID_VBLANK:
-+		ret = arducam_64mp_set_frame_length(arducam_64mp, ctrl->val);
-+		break;
-+	default:
-+		dev_info(&client->dev,
-+			 "ctrl(id:0x%x,val:0x%x) is not handled\n",
-+			 ctrl->id, ctrl->val);
-+		ret = -EINVAL;
-+		break;
-+	}
-+
-+	pm_runtime_put(&client->dev);
-+
-+	return ret;
-+}
-+
-+static const struct v4l2_ctrl_ops arducam_64mp_ctrl_ops = {
-+	.s_ctrl = arducam_64mp_set_ctrl,
-+};
-+
-+static int arducam_64mp_enum_mbus_code(struct v4l2_subdev *sd,
-+				       struct v4l2_subdev_state *sd_state,
-+				       struct v4l2_subdev_mbus_code_enum *code)
-+{
-+	struct arducam_64mp *arducam_64mp = to_arducam_64mp(sd);
-+
-+	if (code->index > 0)
-+		return -EINVAL;
-+
-+	code->code = arducam_64mp_get_format_code(arducam_64mp);
-+
-+	return 0;
-+}
-+
-+static int arducam_64mp_enum_frame_size(struct v4l2_subdev *sd,
-+					struct v4l2_subdev_state *sd_state,
-+					struct v4l2_subdev_frame_size_enum *fse)
-+{
-+	struct arducam_64mp *arducam_64mp = to_arducam_64mp(sd);
-+
-+	if (fse->index >= ARRAY_SIZE(supported_modes))
-+		return -EINVAL;
-+
-+	if (fse->code != arducam_64mp_get_format_code(arducam_64mp))
-+		return -EINVAL;
-+
-+	fse->min_width = supported_modes[fse->index].width;
-+	fse->max_width = fse->min_width;
-+	fse->min_height = supported_modes[fse->index].height;
-+	fse->max_height = fse->min_height;
-+
-+	return 0;
-+}
-+
-+static void arducam_64mp_reset_colorspace(struct v4l2_mbus_framefmt *fmt)
-+{
-+	fmt->colorspace = V4L2_COLORSPACE_RAW;
-+	fmt->ycbcr_enc = V4L2_MAP_YCBCR_ENC_DEFAULT(fmt->colorspace);
-+	fmt->quantization = V4L2_MAP_QUANTIZATION_DEFAULT(true,
-+							  fmt->colorspace,
-+							  fmt->ycbcr_enc);
-+	fmt->xfer_func = V4L2_MAP_XFER_FUNC_DEFAULT(fmt->colorspace);
-+}
-+
-+static void
-+arducam_64mp_update_image_pad_format(struct arducam_64mp *arducam_64mp,
-+				     const struct arducam_64mp_mode *mode,
-+				     struct v4l2_subdev_format *fmt)
-+{
-+	fmt->format.width = mode->width;
-+	fmt->format.height = mode->height;
-+	fmt->format.field = V4L2_FIELD_NONE;
-+	arducam_64mp_reset_colorspace(&fmt->format);
-+}
-+
-+static int arducam_64mp_get_pad_format(struct v4l2_subdev *sd,
-+				       struct v4l2_subdev_state *sd_state,
-+				       struct v4l2_subdev_format *fmt)
-+{
-+	struct arducam_64mp *arducam_64mp = to_arducam_64mp(sd);
-+
-+	if (fmt->pad != 0)
-+		return -EINVAL;
-+
-+	mutex_lock(&arducam_64mp->mutex);
-+
-+	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-+		struct v4l2_mbus_framefmt *try_fmt =
-+			v4l2_subdev_get_try_format(&arducam_64mp->sd, sd_state,
-+						   fmt->pad);
-+		/* update the code which could change due to vflip or hflip: */
-+		try_fmt->code = arducam_64mp_get_format_code(arducam_64mp);
-+		fmt->format = *try_fmt;
-+	} else {
-+		arducam_64mp_update_image_pad_format(arducam_64mp,
-+						     arducam_64mp->mode,
-+						     fmt);
-+		fmt->format.code =
-+			arducam_64mp_get_format_code(arducam_64mp);
-+	}
-+
-+	mutex_unlock(&arducam_64mp->mutex);
-+	return 0;
-+}
-+
-+static unsigned int
-+arducam_64mp_get_frame_length(const struct arducam_64mp_mode *mode,
-+			      const struct v4l2_fract *timeperframe)
-+{
-+	u64 frame_length;
-+
-+	frame_length = (u64)timeperframe->numerator * ARDUCAM_64MP_PIXEL_RATE;
-+	do_div(frame_length,
-+	       (u64)timeperframe->denominator * mode->line_length_pix);
-+
-+	if (WARN_ON(frame_length > ARDUCAM_64MP_FRAME_LENGTH_MAX))
-+		frame_length = ARDUCAM_64MP_FRAME_LENGTH_MAX;
-+
-+	return max_t(unsigned int, frame_length, mode->height);
-+}
-+
-+static void arducam_64mp_set_framing_limits(struct arducam_64mp *arducam_64mp)
-+{
-+	unsigned int frm_length_min, frm_length_default, hblank;
-+	const struct arducam_64mp_mode *mode = arducam_64mp->mode;
-+
-+	/* The default framerate is highest possible framerate. */
-+	frm_length_min =
-+		arducam_64mp_get_frame_length(mode,
-+					      &mode->timeperframe_default);
-+	frm_length_default =
-+		arducam_64mp_get_frame_length(mode,
-+					      &mode->timeperframe_default);
-+
-+	/* Default to no long exposure multiplier. */
-+	arducam_64mp->long_exp_shift = 0;
-+
-+	/* Update limits and set FPS to default */
-+	__v4l2_ctrl_modify_range(arducam_64mp->vblank,
-+				 frm_length_min - mode->height,
-+				 ((1 << ARDUCAM_64MP_LONG_EXP_SHIFT_MAX) *
-+				  ARDUCAM_64MP_FRAME_LENGTH_MAX) - mode->height,
-+				 1, frm_length_default - mode->height);
-+
-+	/* Setting this will adjust the exposure limits as well. */
-+	__v4l2_ctrl_s_ctrl(arducam_64mp->vblank,
-+			   frm_length_default - mode->height);
-+
-+	/*
-+	 * Currently PPL is fixed to the mode specified value, so hblank
-+	 * depends on mode->width only, and is not changeable in any
-+	 * way other than changing the mode.
-+	 */
-+	hblank = mode->line_length_pix - mode->width;
-+	__v4l2_ctrl_modify_range(arducam_64mp->hblank, hblank, hblank, 1,
-+				 hblank);
-+}
-+
-+static int arducam_64mp_set_pad_format(struct v4l2_subdev *sd,
-+				       struct v4l2_subdev_state *sd_state,
-+				       struct v4l2_subdev_format *fmt)
-+{
-+	struct v4l2_mbus_framefmt *framefmt;
-+	const struct arducam_64mp_mode *mode;
-+	struct arducam_64mp *arducam_64mp = to_arducam_64mp(sd);
-+
-+	if (fmt->pad != 0)
-+		return -EINVAL;
-+
-+	mutex_lock(&arducam_64mp->mutex);
-+
-+	/* Bayer order varies with flips */
-+	fmt->format.code = arducam_64mp_get_format_code(arducam_64mp);
-+
-+	mode = v4l2_find_nearest_size(supported_modes,
-+				      ARRAY_SIZE(supported_modes),
-+				      width, height,
-+				      fmt->format.width,
-+				      fmt->format.height);
-+	arducam_64mp_update_image_pad_format(arducam_64mp, mode, fmt);
-+	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-+		framefmt = v4l2_subdev_get_try_format(sd, sd_state,
-+							fmt->pad);
-+		*framefmt = fmt->format;
-+	} else {
-+		arducam_64mp->mode = mode;
-+		arducam_64mp->fmt_code = fmt->format.code;
-+		arducam_64mp_set_framing_limits(arducam_64mp);
-+	}
-+
-+	mutex_unlock(&arducam_64mp->mutex);
-+
-+	return 0;
-+}
-+
-+static const struct v4l2_rect *
-+__arducam_64mp_get_pad_crop(struct arducam_64mp *arducam_64mp,
-+			    struct v4l2_subdev_state *sd_state,
-+			    unsigned int pad,
-+			    enum v4l2_subdev_format_whence which)
-+{
-+	switch (which) {
-+	case V4L2_SUBDEV_FORMAT_TRY:
-+		return v4l2_subdev_get_try_crop(&arducam_64mp->sd, sd_state,
-+						pad);
-+	case V4L2_SUBDEV_FORMAT_ACTIVE:
-+		return &arducam_64mp->mode->crop;
-+	}
-+
-+	return NULL;
-+}
-+
-+static int arducam_64mp_get_selection(struct v4l2_subdev *sd,
-+				      struct v4l2_subdev_state *sd_state,
-+				      struct v4l2_subdev_selection *sel)
-+{
-+	switch (sel->target) {
-+	case V4L2_SEL_TGT_CROP: {
-+		struct arducam_64mp *arducam_64mp = to_arducam_64mp(sd);
-+
-+		mutex_lock(&arducam_64mp->mutex);
-+		sel->r = *__arducam_64mp_get_pad_crop(arducam_64mp, sd_state,
-+						      sel->pad, sel->which);
-+		mutex_unlock(&arducam_64mp->mutex);
-+
-+		return 0;
-+	}
-+
-+	case V4L2_SEL_TGT_NATIVE_SIZE:
-+		sel->r.left = 0;
-+		sel->r.top = 0;
-+		sel->r.width = ARDUCAM_64MP_NATIVE_WIDTH;
-+		sel->r.height = ARDUCAM_64MP_NATIVE_HEIGHT;
-+
-+		return 0;
-+
-+	case V4L2_SEL_TGT_CROP_DEFAULT:
-+	case V4L2_SEL_TGT_CROP_BOUNDS:
-+		sel->r.left = ARDUCAM_64MP_PIXEL_ARRAY_LEFT;
-+		sel->r.top = ARDUCAM_64MP_PIXEL_ARRAY_TOP;
-+		sel->r.width = ARDUCAM_64MP_PIXEL_ARRAY_WIDTH;
-+		sel->r.height = ARDUCAM_64MP_PIXEL_ARRAY_HEIGHT;
-+
-+		return 0;
-+	}
-+
-+	return -EINVAL;
-+}
-+
-+/* Start streaming */
-+static int arducam_64mp_start_streaming(struct arducam_64mp *arducam_64mp)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&arducam_64mp->sd);
-+	const struct arducam_64mp_reg_list *reg_list;
-+	int ret;
-+
-+	if (!arducam_64mp->common_regs_written) {
-+		ret = arducam_64mp_write_regs(arducam_64mp, mode_common_regs,
-+					      ARRAY_SIZE(mode_common_regs));
-+
-+		if (ret) {
-+			dev_err(&client->dev, "%s failed to set common settings\n",
-+				__func__);
-+			return ret;
-+		}
-+		arducam_64mp->common_regs_written = true;
-+	}
-+
-+	/* Apply default values of current mode */
-+	reg_list = &arducam_64mp->mode->reg_list;
-+	ret = arducam_64mp_write_regs(arducam_64mp, reg_list->regs,
-+				      reg_list->num_of_regs);
-+	if (ret) {
-+		dev_err(&client->dev, "%s failed to set mode\n", __func__);
-+		return ret;
-+	}
-+
-+	/* Apply customized values from user */
-+	ret =  __v4l2_ctrl_handler_setup(arducam_64mp->sd.ctrl_handler);
-+	if (ret)
-+		return ret;
-+
-+	/* set stream on register */
-+	return arducam_64mp_write_reg(arducam_64mp,
-+				      ARDUCAM_64MP_REG_MODE_SELECT,
-+				      ARDUCAM_64MP_REG_VALUE_08BIT,
-+				      ARDUCAM_64MP_MODE_STREAMING);
-+}
-+
-+/* Stop streaming */
-+static void arducam_64mp_stop_streaming(struct arducam_64mp *arducam_64mp)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&arducam_64mp->sd);
-+	int ret;
-+
-+	/* set stream off register */
-+	ret = arducam_64mp_write_reg(arducam_64mp, ARDUCAM_64MP_REG_MODE_SELECT,
-+				     ARDUCAM_64MP_REG_VALUE_08BIT,
-+				     ARDUCAM_64MP_MODE_STANDBY);
-+	if (ret)
-+		dev_err(&client->dev, "%s failed to set stream\n", __func__);
-+}
-+
-+static int arducam_64mp_set_stream(struct v4l2_subdev *sd, int enable)
-+{
-+	struct arducam_64mp *arducam_64mp = to_arducam_64mp(sd);
-+	struct i2c_client *client = v4l2_get_subdevdata(sd);
-+	int ret = 0;
-+
-+	mutex_lock(&arducam_64mp->mutex);
-+	if (arducam_64mp->streaming == enable) {
-+		mutex_unlock(&arducam_64mp->mutex);
-+		return 0;
-+	}
-+
-+	if (enable) {
-+		ret = pm_runtime_get_sync(&client->dev);
-+		if (ret < 0) {
-+			pm_runtime_put_noidle(&client->dev);
-+			goto err_unlock;
-+		}
-+
-+		/*
-+		 * Apply default & customized values
-+		 * and then start streaming.
-+		 */
-+		ret = arducam_64mp_start_streaming(arducam_64mp);
-+		if (ret)
-+			goto err_rpm_put;
-+	} else {
-+		arducam_64mp_stop_streaming(arducam_64mp);
-+		pm_runtime_put(&client->dev);
-+	}
-+
-+	arducam_64mp->streaming = enable;
-+
-+	/* vflip and hflip cannot change during streaming */
-+	__v4l2_ctrl_grab(arducam_64mp->vflip, enable);
-+	__v4l2_ctrl_grab(arducam_64mp->hflip, enable);
-+
-+	mutex_unlock(&arducam_64mp->mutex);
-+
-+	return ret;
-+
-+err_rpm_put:
-+	pm_runtime_put(&client->dev);
-+err_unlock:
-+	mutex_unlock(&arducam_64mp->mutex);
-+
-+	return ret;
-+}
-+
-+/* Power/clock management functions */
-+static int arducam_64mp_power_on(struct device *dev)
-+{
-+	struct i2c_client *client = to_i2c_client(dev);
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct arducam_64mp *arducam_64mp = to_arducam_64mp(sd);
-+	int ret;
-+
-+	ret = regulator_bulk_enable(ARDUCAM_64MP_NUM_SUPPLIES,
-+				    arducam_64mp->supplies);
-+	if (ret) {
-+		dev_err(&client->dev, "%s: failed to enable regulators\n",
-+			__func__);
-+		return ret;
-+	}
-+
-+	ret = clk_prepare_enable(arducam_64mp->xclk);
-+	if (ret) {
-+		dev_err(&client->dev, "%s: failed to enable clock\n",
-+			__func__);
-+		goto reg_off;
-+	}
-+
-+	gpiod_set_value_cansleep(arducam_64mp->reset_gpio, 1);
-+	usleep_range(ARDUCAM_64MP_XCLR_MIN_DELAY_US,
-+		     ARDUCAM_64MP_XCLR_MIN_DELAY_US +
-+					ARDUCAM_64MP_XCLR_DELAY_RANGE_US);
-+
-+	return 0;
-+
-+reg_off:
-+	regulator_bulk_disable(ARDUCAM_64MP_NUM_SUPPLIES,
-+			       arducam_64mp->supplies);
-+	return ret;
-+}
-+
-+static int arducam_64mp_power_off(struct device *dev)
-+{
-+	struct i2c_client *client = to_i2c_client(dev);
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct arducam_64mp *arducam_64mp = to_arducam_64mp(sd);
-+
-+	gpiod_set_value_cansleep(arducam_64mp->reset_gpio, 0);
-+	regulator_bulk_disable(ARDUCAM_64MP_NUM_SUPPLIES,
-+			       arducam_64mp->supplies);
-+	clk_disable_unprepare(arducam_64mp->xclk);
-+
-+	/* Force reprogramming of the common registers when powered up again. */
-+	arducam_64mp->common_regs_written = false;
-+
-+	return 0;
-+}
-+
-+static int __maybe_unused arducam_64mp_suspend(struct device *dev)
-+{
-+	struct i2c_client *client = to_i2c_client(dev);
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct arducam_64mp *arducam_64mp = to_arducam_64mp(sd);
-+
-+	if (arducam_64mp->streaming)
-+		arducam_64mp_stop_streaming(arducam_64mp);
-+
-+	return 0;
-+}
-+
-+static int __maybe_unused arducam_64mp_resume(struct device *dev)
-+{
-+	struct i2c_client *client = to_i2c_client(dev);
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct arducam_64mp *arducam_64mp = to_arducam_64mp(sd);
-+	int ret;
-+
-+	if (arducam_64mp->streaming) {
-+		ret = arducam_64mp_start_streaming(arducam_64mp);
-+		if (ret)
-+			goto error;
-+	}
-+
-+	return 0;
-+
-+error:
-+	arducam_64mp_stop_streaming(arducam_64mp);
-+	arducam_64mp->streaming = 0;
-+	return ret;
-+}
-+
-+static int arducam_64mp_get_regulators(struct arducam_64mp *arducam_64mp)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&arducam_64mp->sd);
-+	unsigned int i;
-+
-+	for (i = 0; i < ARDUCAM_64MP_NUM_SUPPLIES; i++)
-+		arducam_64mp->supplies[i].supply = arducam_64mp_supply_name[i];
-+
-+	return devm_regulator_bulk_get(&client->dev,
-+				       ARDUCAM_64MP_NUM_SUPPLIES,
-+				       arducam_64mp->supplies);
-+}
-+
-+/* Verify chip ID */
-+static int arducam_64mp_identify_module(struct arducam_64mp *arducam_64mp)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&arducam_64mp->sd);
-+	struct i2c_client *arducam_identifier;
-+	int ret;
-+	u32 val;
-+
-+	arducam_identifier = i2c_new_dummy_device(client->adapter, 0x50);
-+	if (IS_ERR(arducam_identifier)) {
-+		dev_err(&client->dev, "failed to create arducam_identifier\n");
-+		return PTR_ERR(arducam_identifier);
-+	}
-+
-+	ret = arducam_64mp_read_reg(arducam_identifier,
-+				    ARDUCAM_64MP_REG_CHIP_ID,
-+				    ARDUCAM_64MP_REG_VALUE_16BIT, &val);
-+	if (ret) {
-+		dev_err(&client->dev, "failed to read chip id %x, with error %d\n",
-+			ARDUCAM_64MP_CHIP_ID, ret);
-+		goto error;
-+	}
-+
-+	if (val != ARDUCAM_64MP_CHIP_ID) {
-+		dev_err(&client->dev, "chip id mismatch: %x!=%x\n",
-+			ARDUCAM_64MP_CHIP_ID, val);
-+		ret = -EIO;
-+		goto error;
-+	}
-+
-+	dev_info(&client->dev, "Device found Arducam 64MP.\n");
-+
-+error:
-+	i2c_unregister_device(arducam_identifier);
-+
-+	return ret;
-+}
-+
-+static const struct v4l2_subdev_core_ops arducam_64mp_core_ops = {
-+	.subscribe_event = v4l2_ctrl_subdev_subscribe_event,
-+	.unsubscribe_event = v4l2_event_subdev_unsubscribe,
-+};
-+
-+static const struct v4l2_subdev_video_ops arducam_64mp_video_ops = {
-+	.s_stream = arducam_64mp_set_stream,
-+};
-+
-+static const struct v4l2_subdev_pad_ops arducam_64mp_pad_ops = {
-+	.enum_mbus_code = arducam_64mp_enum_mbus_code,
-+	.get_fmt = arducam_64mp_get_pad_format,
-+	.set_fmt = arducam_64mp_set_pad_format,
-+	.get_selection = arducam_64mp_get_selection,
-+	.enum_frame_size = arducam_64mp_enum_frame_size,
-+};
-+
-+static const struct v4l2_subdev_ops arducam_64mp_subdev_ops = {
-+	.core = &arducam_64mp_core_ops,
-+	.video = &arducam_64mp_video_ops,
-+	.pad = &arducam_64mp_pad_ops,
-+};
-+
-+static const struct v4l2_subdev_internal_ops arducam_64mp_internal_ops = {
-+	.open = arducam_64mp_open,
-+};
-+
-+/* Initialize control handlers */
-+static int arducam_64mp_init_controls(struct arducam_64mp *arducam_64mp)
-+{
-+	struct v4l2_ctrl_handler *ctrl_hdlr;
-+	struct i2c_client *client = v4l2_get_subdevdata(&arducam_64mp->sd);
-+	struct v4l2_fwnode_device_properties props;
-+	unsigned int i;
-+	int ret;
-+	u8 test_pattern_max;
-+
-+	ctrl_hdlr = &arducam_64mp->ctrl_handler;
-+	ret = v4l2_ctrl_handler_init(ctrl_hdlr, 16);
-+	if (ret)
-+		return ret;
-+
-+	mutex_init(&arducam_64mp->mutex);
-+	ctrl_hdlr->lock = &arducam_64mp->mutex;
-+
-+	/* By default, PIXEL_RATE is read only */
-+	arducam_64mp->pixel_rate = v4l2_ctrl_new_std(ctrl_hdlr,
-+						     &arducam_64mp_ctrl_ops,
-+						     V4L2_CID_PIXEL_RATE,
-+						     ARDUCAM_64MP_PIXEL_RATE,
-+						     ARDUCAM_64MP_PIXEL_RATE, 1,
-+						     ARDUCAM_64MP_PIXEL_RATE);
-+
-+	/*
-+	 * Create the controls here, but mode specific limits are setup
-+	 * in the arducam_64mp_set_framing_limits() call below.
-+	 */
-+	arducam_64mp->vblank = v4l2_ctrl_new_std(ctrl_hdlr,
-+						 &arducam_64mp_ctrl_ops,
-+						 V4L2_CID_VBLANK,
-+						 0, 0xffff, 1, 0);
-+	arducam_64mp->hblank = v4l2_ctrl_new_std(ctrl_hdlr,
-+						 &arducam_64mp_ctrl_ops,
-+						 V4L2_CID_HBLANK,
-+						 0, 0xffff, 1, 0);
-+
-+	/* HBLANK is read-only, but does change with mode. */
-+	if (arducam_64mp->hblank)
-+		arducam_64mp->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
-+
-+	arducam_64mp->exposure =
-+		v4l2_ctrl_new_std(ctrl_hdlr,
-+				  &arducam_64mp_ctrl_ops,
-+				  V4L2_CID_EXPOSURE,
-+				  ARDUCAM_64MP_EXPOSURE_MIN,
-+				  ARDUCAM_64MP_EXPOSURE_MAX,
-+				  ARDUCAM_64MP_EXPOSURE_STEP,
-+				  ARDUCAM_64MP_EXPOSURE_DEFAULT);
-+
-+	v4l2_ctrl_new_std(ctrl_hdlr, &arducam_64mp_ctrl_ops,
-+			  V4L2_CID_ANALOGUE_GAIN, ARDUCAM_64MP_ANA_GAIN_MIN,
-+			  ARDUCAM_64MP_ANA_GAIN_MAX, ARDUCAM_64MP_ANA_GAIN_STEP,
-+			  ARDUCAM_64MP_ANA_GAIN_DEFAULT);
-+
-+	v4l2_ctrl_new_std(ctrl_hdlr, &arducam_64mp_ctrl_ops,
-+			  V4L2_CID_DIGITAL_GAIN, ARDUCAM_64MP_DGTL_GAIN_MIN,
-+			  ARDUCAM_64MP_DGTL_GAIN_MAX,
-+			  ARDUCAM_64MP_DGTL_GAIN_STEP,
-+			  ARDUCAM_64MP_DGTL_GAIN_DEFAULT);
-+
-+	arducam_64mp->hflip = v4l2_ctrl_new_std(ctrl_hdlr,
-+						&arducam_64mp_ctrl_ops,
-+						V4L2_CID_HFLIP, 0, 1, 1, 0);
-+	if (arducam_64mp->hflip)
-+		arducam_64mp->hflip->flags |= V4L2_CTRL_FLAG_MODIFY_LAYOUT;
-+
-+	arducam_64mp->vflip = v4l2_ctrl_new_std(ctrl_hdlr,
-+						&arducam_64mp_ctrl_ops,
-+						V4L2_CID_VFLIP, 0, 1, 1, 0);
-+	if (arducam_64mp->vflip)
-+		arducam_64mp->vflip->flags |= V4L2_CTRL_FLAG_MODIFY_LAYOUT;
-+
-+	test_pattern_max = ARRAY_SIZE(arducam_64mp_test_pattern_menu) - 1;
-+	v4l2_ctrl_new_std_menu_items(ctrl_hdlr, &arducam_64mp_ctrl_ops,
-+				     V4L2_CID_TEST_PATTERN,
-+				     test_pattern_max,
-+				     0, 0, arducam_64mp_test_pattern_menu);
-+	for (i = 0; i < 4; i++) {
-+		/*
-+		 * The assumption is that
-+		 * V4L2_CID_TEST_PATTERN_GREENR == V4L2_CID_TEST_PATTERN_RED + 1
-+		 * V4L2_CID_TEST_PATTERN_BLUE   == V4L2_CID_TEST_PATTERN_RED + 2
-+		 * V4L2_CID_TEST_PATTERN_GREENB == V4L2_CID_TEST_PATTERN_RED + 3
-+		 */
-+		v4l2_ctrl_new_std(ctrl_hdlr, &arducam_64mp_ctrl_ops,
-+				  V4L2_CID_TEST_PATTERN_RED + i,
-+				  ARDUCAM_64MP_TEST_PATTERN_COLOUR_MIN,
-+				  ARDUCAM_64MP_TEST_PATTERN_COLOUR_MAX,
-+				  ARDUCAM_64MP_TEST_PATTERN_COLOUR_STEP,
-+				  ARDUCAM_64MP_TEST_PATTERN_COLOUR_MAX);
-+		/* The "Solid color" pattern is white by default */
-+	}
-+
-+	if (ctrl_hdlr->error) {
-+		ret = ctrl_hdlr->error;
-+		dev_err(&client->dev, "%s control init failed (%d)\n",
-+			__func__, ret);
-+		goto error;
-+	}
-+
-+	ret = v4l2_fwnode_device_parse(&client->dev, &props);
-+	if (ret)
-+		goto error;
-+
-+	ret = v4l2_ctrl_new_fwnode_properties(ctrl_hdlr, &arducam_64mp_ctrl_ops,
-+					      &props);
-+	if (ret)
-+		goto error;
-+
-+	arducam_64mp->sd.ctrl_handler = ctrl_hdlr;
-+
-+	/* Setup exposure and frame/line length limits. */
-+	arducam_64mp_set_framing_limits(arducam_64mp);
-+
-+	return 0;
-+
-+error:
-+	v4l2_ctrl_handler_free(ctrl_hdlr);
-+	mutex_destroy(&arducam_64mp->mutex);
-+
-+	return ret;
-+}
-+
-+static void arducam_64mp_free_controls(struct arducam_64mp *arducam_64mp)
-+{
-+	v4l2_ctrl_handler_free(arducam_64mp->sd.ctrl_handler);
-+	mutex_destroy(&arducam_64mp->mutex);
-+}
-+
-+static int arducam_64mp_check_hwcfg(struct device *dev)
-+{
-+	struct fwnode_handle *endpoint;
-+	struct v4l2_fwnode_endpoint ep_cfg = {
-+		.bus_type = V4L2_MBUS_CSI2_DPHY
-+	};
-+	int ret = -EINVAL;
-+
-+	endpoint = fwnode_graph_get_next_endpoint(dev_fwnode(dev), NULL);
-+	if (!endpoint) {
-+		dev_err(dev, "endpoint node not found\n");
-+		return -EINVAL;
-+	}
-+
-+	if (v4l2_fwnode_endpoint_alloc_parse(endpoint, &ep_cfg)) {
-+		dev_err(dev, "could not parse endpoint\n");
-+		goto error_out;
-+	}
-+
-+	/* Check the number of MIPI CSI2 data lanes */
-+	if (ep_cfg.bus.mipi_csi2.num_data_lanes != 2) {
-+		dev_err(dev, "only 2 data lanes are currently supported\n");
-+		goto error_out;
-+	}
-+
-+	/* Check the link frequency set in device tree */
-+	if (!ep_cfg.nr_of_link_frequencies) {
-+		dev_err(dev, "link-frequency property not found in DT\n");
-+		goto error_out;
-+	}
-+
-+	if (ep_cfg.nr_of_link_frequencies != 1 ||
-+	    ep_cfg.link_frequencies[0] != ARDUCAM_64MP_DEFAULT_LINK_FREQ) {
-+		dev_err(dev, "Link frequency not supported: %lld\n",
-+			ep_cfg.link_frequencies[0]);
-+		goto error_out;
-+	}
-+
-+	ret = 0;
-+
-+error_out:
-+	v4l2_fwnode_endpoint_free(&ep_cfg);
-+	fwnode_handle_put(endpoint);
-+
-+	return ret;
-+}
-+
-+static const struct of_device_id arducam_64mp_dt_ids[] = {
-+	{ .compatible = "arducam,64mp"},
-+	{ /* sentinel */ }
-+};
-+
-+static int arducam_64mp_probe(struct i2c_client *client)
-+{
-+	struct device *dev = &client->dev;
-+	struct arducam_64mp *arducam_64mp;
-+	const struct of_device_id *match;
-+	u32 xclk_freq;
-+	int ret;
-+
-+	arducam_64mp = devm_kzalloc(&client->dev, sizeof(*arducam_64mp),
-+				    GFP_KERNEL);
-+	if (!arducam_64mp)
-+		return -ENOMEM;
-+
-+	v4l2_i2c_subdev_init(&arducam_64mp->sd, client,
-+			     &arducam_64mp_subdev_ops);
-+
-+	match = of_match_device(arducam_64mp_dt_ids, dev);
-+	if (!match)
-+		return -ENODEV;
-+
-+	/* Check the hardware configuration in device tree */
-+	if (arducam_64mp_check_hwcfg(dev))
-+		return -EINVAL;
-+
-+	/* Get system clock (xclk) */
-+	arducam_64mp->xclk = devm_clk_get(dev, NULL);
-+	if (IS_ERR(arducam_64mp->xclk)) {
-+		dev_err(dev, "failed to get xclk\n");
-+		return PTR_ERR(arducam_64mp->xclk);
-+	}
-+
-+	xclk_freq = clk_get_rate(arducam_64mp->xclk);
-+	if (xclk_freq != ARDUCAM_64MP_XCLK_FREQ) {
-+		dev_err(dev, "xclk frequency not supported: %d Hz\n",
-+			xclk_freq);
-+		return -EINVAL;
-+	}
-+
-+	ret = arducam_64mp_get_regulators(arducam_64mp);
-+	if (ret) {
-+		dev_err(dev, "failed to get regulators\n");
-+		return ret;
-+	}
-+
-+	/* Request optional enable pin */
-+	arducam_64mp->reset_gpio = devm_gpiod_get_optional(dev, "reset",
-+							   GPIOD_OUT_HIGH);
-+
-+	/*
-+	 * The sensor must be powered for arducam_64mp_identify_module()
-+	 * to be able to read the CHIP_ID from arducam_identifier.
-+	 */
-+	ret = arducam_64mp_power_on(dev);
-+	if (ret)
-+		return ret;
-+
-+	ret = arducam_64mp_identify_module(arducam_64mp);
-+	if (ret)
-+		goto error_power_off;
-+
-+	/* Set default mode to max resolution */
-+	arducam_64mp->mode = &supported_modes[0];
-+	arducam_64mp->fmt_code = MEDIA_BUS_FMT_SRGGB10_1X10;
-+
-+	/* Enable runtime PM and turn off the device */
-+	pm_runtime_set_active(dev);
-+	pm_runtime_enable(dev);
-+	pm_runtime_idle(dev);
-+
-+	/* This needs the pm runtime to be registered. */
-+	ret = arducam_64mp_init_controls(arducam_64mp);
-+	if (ret)
-+		goto error_power_off;
-+
-+	/* Initialize subdev */
-+	arducam_64mp->sd.internal_ops = &arducam_64mp_internal_ops;
-+	arducam_64mp->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE |
-+			    V4L2_SUBDEV_FL_HAS_EVENTS;
-+	arducam_64mp->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR;
-+
-+	/* Initialize source pads */
-+	arducam_64mp->pad.flags = MEDIA_PAD_FL_SOURCE;
-+
-+	ret = media_entity_pads_init(&arducam_64mp->sd.entity, 1,
-+				     &arducam_64mp->pad);
-+	if (ret) {
-+		dev_err(dev, "failed to init entity pads: %d\n", ret);
-+		goto error_handler_free;
-+	}
-+
-+	ret = v4l2_async_register_subdev_sensor(&arducam_64mp->sd);
-+	if (ret < 0) {
-+		dev_err(dev, "failed to register sensor sub-device: %d\n", ret);
-+		goto error_media_entity;
-+	}
-+
-+	return 0;
-+
-+error_media_entity:
-+	media_entity_cleanup(&arducam_64mp->sd.entity);
-+
-+error_handler_free:
-+	arducam_64mp_free_controls(arducam_64mp);
-+
-+error_power_off:
-+	pm_runtime_disable(&client->dev);
-+	pm_runtime_set_suspended(&client->dev);
-+	arducam_64mp_power_off(&client->dev);
-+
-+	return ret;
-+}
-+
-+static void arducam_64mp_remove(struct i2c_client *client)
-+{
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct arducam_64mp *arducam_64mp = to_arducam_64mp(sd);
-+
-+	v4l2_async_unregister_subdev(sd);
-+	media_entity_cleanup(&sd->entity);
-+	arducam_64mp_free_controls(arducam_64mp);
-+
-+	pm_runtime_disable(&client->dev);
-+	if (!pm_runtime_status_suspended(&client->dev))
-+		arducam_64mp_power_off(&client->dev);
-+	pm_runtime_set_suspended(&client->dev);
-+}
-+
-+MODULE_DEVICE_TABLE(of, arducam_64mp_dt_ids);
-+
-+static const struct dev_pm_ops arducam_64mp_pm_ops = {
-+	SET_SYSTEM_SLEEP_PM_OPS(arducam_64mp_suspend, arducam_64mp_resume)
-+	SET_RUNTIME_PM_OPS(arducam_64mp_power_off, arducam_64mp_power_on, NULL)
-+};
-+
-+static struct i2c_driver arducam_64mp_i2c_driver = {
-+	.driver = {
-+		.name = "arducam_64mp",
-+		.of_match_table	= arducam_64mp_dt_ids,
-+		.pm = &arducam_64mp_pm_ops,
-+	},
-+	.probe_new = arducam_64mp_probe,
-+	.remove = arducam_64mp_remove,
-+};
-+
-+module_i2c_driver(arducam_64mp_i2c_driver);
-+
-+MODULE_AUTHOR("Lee Jackson <info@arducam.com>");
-+MODULE_DESCRIPTION("Arducam 64MP sensor driver");
-+MODULE_LICENSE("GPL v2");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0425-media-i2c-arducam_64mp-Advertise-embedded-data-node-.patch b/target/linux/bcm27xx/patches-6.1/950-0425-media-i2c-arducam_64mp-Advertise-embedded-data-node-.patch
deleted file mode 100644
index f1310f2b77..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0425-media-i2c-arducam_64mp-Advertise-embedded-data-node-.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-From 8acf47ea3641126ed10ec54a8f6d72622dd2c61e Mon Sep 17 00:00:00 2001
-From: Lee Jackson <info@arducam.com>
-Date: Wed, 18 May 2022 15:18:59 +0800
-Subject: [PATCH] media: i2c: arducam_64mp: Advertise embedded data
- node on media pad 1
-
-This commit updates the arducam_64mp driver to adverise support for
-embedded data streams.
-
-The arducam_64mp sensor subdevice overloads the media pad to differentiate
-between image stream (pad 0) and embedded data stream (pad 1) when
-performing the v4l2_subdev_pad_ops functions.
-
-Signed-off-by: Lee Jackson <info@arducam.com>
----
- drivers/media/i2c/arducam_64mp.c | 146 ++++++++++++++++++++++---------
- 1 file changed, 107 insertions(+), 39 deletions(-)
-
---- a/drivers/media/i2c/arducam_64mp.c
-+++ b/drivers/media/i2c/arducam_64mp.c
-@@ -94,6 +94,16 @@
- #define ARDUCAM_64MP_TEST_PATTERN_B_DEFAULT	0
- #define ARDUCAM_64MP_TEST_PATTERN_GB_DEFAULT	0
- 
-+/* Embedded metadata stream structure */
-+#define ARDUCAM_64MP_EMBEDDED_LINE_WIDTH 16384
-+#define ARDUCAM_64MP_NUM_EMBEDDED_LINES 1
-+
-+enum pad_types {
-+	IMAGE_PAD,
-+	METADATA_PAD,
-+	NUM_PADS
-+};
-+
- /* ARDUCAM_64MP native and active pixel array size. */
- #define ARDUCAM_64MP_NATIVE_WIDTH		9344U
- #define ARDUCAM_64MP_NATIVE_HEIGHT		7032U
-@@ -1273,7 +1283,7 @@ static const char * const arducam_64mp_s
- 
- struct arducam_64mp {
- 	struct v4l2_subdev sd;
--	struct media_pad pad;
-+	struct media_pad pad[NUM_PADS];
- 
- 	unsigned int fmt_code;
- 
-@@ -1406,7 +1416,9 @@ static int arducam_64mp_open(struct v4l2
- {
- 	struct arducam_64mp *arducam_64mp = to_arducam_64mp(sd);
- 	struct v4l2_mbus_framefmt *try_fmt_img =
--		v4l2_subdev_get_try_format(sd, fh->state, 0);
-+		v4l2_subdev_get_try_format(sd, fh->state, IMAGE_PAD);
-+	struct v4l2_mbus_framefmt *try_fmt_meta =
-+		v4l2_subdev_get_try_format(sd, fh->state, METADATA_PAD);
- 	struct v4l2_rect *try_crop;
- 
- 	mutex_lock(&arducam_64mp->mutex);
-@@ -1417,8 +1429,14 @@ static int arducam_64mp_open(struct v4l2
- 	try_fmt_img->code = arducam_64mp_get_format_code(arducam_64mp);
- 	try_fmt_img->field = V4L2_FIELD_NONE;
- 
-+	/* Initialize try_fmt for the embedded metadata pad */
-+	try_fmt_meta->width = ARDUCAM_64MP_EMBEDDED_LINE_WIDTH;
-+	try_fmt_meta->height = ARDUCAM_64MP_NUM_EMBEDDED_LINES;
-+	try_fmt_meta->code = MEDIA_BUS_FMT_SENSOR_DATA;
-+	try_fmt_meta->field = V4L2_FIELD_NONE;
-+
- 	/* Initialize try_crop */
--	try_crop = v4l2_subdev_get_try_crop(sd, fh->state, 0);
-+	try_crop = v4l2_subdev_get_try_crop(sd, fh->state, IMAGE_PAD);
- 	try_crop->left = ARDUCAM_64MP_PIXEL_ARRAY_LEFT;
- 	try_crop->top = ARDUCAM_64MP_PIXEL_ARRAY_TOP;
- 	try_crop->width = ARDUCAM_64MP_PIXEL_ARRAY_WIDTH;
-@@ -1574,10 +1592,20 @@ static int arducam_64mp_enum_mbus_code(s
- {
- 	struct arducam_64mp *arducam_64mp = to_arducam_64mp(sd);
- 
--	if (code->index > 0)
-+	if (code->pad >= NUM_PADS)
- 		return -EINVAL;
- 
--	code->code = arducam_64mp_get_format_code(arducam_64mp);
-+	if (code->pad == IMAGE_PAD) {
-+		if (code->index > 0)
-+			return -EINVAL;
-+
-+		code->code = arducam_64mp_get_format_code(arducam_64mp);
-+	} else {
-+		if (code->index > 0)
-+			return -EINVAL;
-+
-+		code->code = MEDIA_BUS_FMT_SENSOR_DATA;
-+	}
- 
- 	return 0;
- }
-@@ -1588,16 +1616,29 @@ static int arducam_64mp_enum_frame_size(
- {
- 	struct arducam_64mp *arducam_64mp = to_arducam_64mp(sd);
- 
--	if (fse->index >= ARRAY_SIZE(supported_modes))
-+	if (fse->pad >= NUM_PADS)
- 		return -EINVAL;
- 
--	if (fse->code != arducam_64mp_get_format_code(arducam_64mp))
--		return -EINVAL;
-+	if (fse->pad == IMAGE_PAD) {
-+		if (fse->index >= ARRAY_SIZE(supported_modes))
-+			return -EINVAL;
-+
-+		if (fse->code != arducam_64mp_get_format_code(arducam_64mp))
-+			return -EINVAL;
-+
-+		fse->min_width = supported_modes[fse->index].width;
-+		fse->max_width = fse->min_width;
-+		fse->min_height = supported_modes[fse->index].height;
-+		fse->max_height = fse->min_height;
-+	} else {
-+		if (fse->code != MEDIA_BUS_FMT_SENSOR_DATA || fse->index > 0)
-+			return -EINVAL;
- 
--	fse->min_width = supported_modes[fse->index].width;
--	fse->max_width = fse->min_width;
--	fse->min_height = supported_modes[fse->index].height;
--	fse->max_height = fse->min_height;
-+		fse->min_width = ARDUCAM_64MP_EMBEDDED_LINE_WIDTH;
-+		fse->max_width = fse->min_width;
-+		fse->min_height = ARDUCAM_64MP_NUM_EMBEDDED_LINES;
-+		fse->max_height = fse->min_height;
-+	}
- 
- 	return 0;
- }
-@@ -1623,13 +1664,22 @@ arducam_64mp_update_image_pad_format(str
- 	arducam_64mp_reset_colorspace(&fmt->format);
- }
- 
-+static void
-+arducam_64mp_update_metadata_pad_format(struct v4l2_subdev_format *fmt)
-+{
-+	fmt->format.width = ARDUCAM_64MP_EMBEDDED_LINE_WIDTH;
-+	fmt->format.height = ARDUCAM_64MP_NUM_EMBEDDED_LINES;
-+	fmt->format.code = MEDIA_BUS_FMT_SENSOR_DATA;
-+	fmt->format.field = V4L2_FIELD_NONE;
-+}
-+
- static int arducam_64mp_get_pad_format(struct v4l2_subdev *sd,
- 				       struct v4l2_subdev_state *sd_state,
- 				       struct v4l2_subdev_format *fmt)
- {
- 	struct arducam_64mp *arducam_64mp = to_arducam_64mp(sd);
- 
--	if (fmt->pad != 0)
-+	if (fmt->pad >= NUM_PADS)
- 		return -EINVAL;
- 
- 	mutex_lock(&arducam_64mp->mutex);
-@@ -1639,14 +1689,20 @@ static int arducam_64mp_get_pad_format(s
- 			v4l2_subdev_get_try_format(&arducam_64mp->sd, sd_state,
- 						   fmt->pad);
- 		/* update the code which could change due to vflip or hflip: */
--		try_fmt->code = arducam_64mp_get_format_code(arducam_64mp);
-+		try_fmt->code = fmt->pad == IMAGE_PAD ?
-+				arducam_64mp_get_format_code(arducam_64mp) :
-+				MEDIA_BUS_FMT_SENSOR_DATA;
- 		fmt->format = *try_fmt;
- 	} else {
--		arducam_64mp_update_image_pad_format(arducam_64mp,
--						     arducam_64mp->mode,
--						     fmt);
--		fmt->format.code =
--			arducam_64mp_get_format_code(arducam_64mp);
-+		if (fmt->pad == IMAGE_PAD) {
-+			arducam_64mp_update_image_pad_format(arducam_64mp,
-+							     arducam_64mp->mode,
-+							     fmt);
-+			fmt->format.code =
-+			       arducam_64mp_get_format_code(arducam_64mp);
-+		} else {
-+			arducam_64mp_update_metadata_pad_format(fmt);
-+		}
- 	}
- 
- 	mutex_unlock(&arducam_64mp->mutex);
-@@ -1714,28 +1770,39 @@ static int arducam_64mp_set_pad_format(s
- 	const struct arducam_64mp_mode *mode;
- 	struct arducam_64mp *arducam_64mp = to_arducam_64mp(sd);
- 
--	if (fmt->pad != 0)
-+	if (fmt->pad >= NUM_PADS)
- 		return -EINVAL;
- 
- 	mutex_lock(&arducam_64mp->mutex);
- 
--	/* Bayer order varies with flips */
--	fmt->format.code = arducam_64mp_get_format_code(arducam_64mp);
--
--	mode = v4l2_find_nearest_size(supported_modes,
--				      ARRAY_SIZE(supported_modes),
--				      width, height,
--				      fmt->format.width,
--				      fmt->format.height);
--	arducam_64mp_update_image_pad_format(arducam_64mp, mode, fmt);
--	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
--		framefmt = v4l2_subdev_get_try_format(sd, sd_state,
--							fmt->pad);
--		*framefmt = fmt->format;
-+	if (fmt->pad == IMAGE_PAD) {
-+		/* Bayer order varies with flips */
-+		fmt->format.code = arducam_64mp_get_format_code(arducam_64mp);
-+
-+		mode = v4l2_find_nearest_size(supported_modes,
-+					      ARRAY_SIZE(supported_modes),
-+					      width, height,
-+					      fmt->format.width,
-+					      fmt->format.height);
-+		arducam_64mp_update_image_pad_format(arducam_64mp, mode, fmt);
-+		if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-+			framefmt = v4l2_subdev_get_try_format(sd, sd_state,
-+							      fmt->pad);
-+			*framefmt = fmt->format;
-+		} else {
-+			arducam_64mp->mode = mode;
-+			arducam_64mp->fmt_code = fmt->format.code;
-+			arducam_64mp_set_framing_limits(arducam_64mp);
-+		}
- 	} else {
--		arducam_64mp->mode = mode;
--		arducam_64mp->fmt_code = fmt->format.code;
--		arducam_64mp_set_framing_limits(arducam_64mp);
-+		if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-+			framefmt = v4l2_subdev_get_try_format(sd, sd_state,
-+							      fmt->pad);
-+			*framefmt = fmt->format;
-+		} else {
-+			/* Only one embedded data mode is supported */
-+			arducam_64mp_update_metadata_pad_format(fmt);
-+		}
- 	}
- 
- 	mutex_unlock(&arducam_64mp->mutex);
-@@ -2329,10 +2396,11 @@ static int arducam_64mp_probe(struct i2c
- 	arducam_64mp->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR;
- 
- 	/* Initialize source pads */
--	arducam_64mp->pad.flags = MEDIA_PAD_FL_SOURCE;
-+	arducam_64mp->pad[IMAGE_PAD].flags = MEDIA_PAD_FL_SOURCE;
-+	arducam_64mp->pad[METADATA_PAD].flags = MEDIA_PAD_FL_SOURCE;
- 
--	ret = media_entity_pads_init(&arducam_64mp->sd.entity, 1,
--				     &arducam_64mp->pad);
-+	ret = media_entity_pads_init(&arducam_64mp->sd.entity, NUM_PADS,
-+				     arducam_64mp->pad);
- 	if (ret) {
- 		dev_err(dev, "failed to init entity pads: %d\n", ret);
- 		goto error_handler_free;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0426-Add-HDMI1-facility-to-the-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0426-Add-HDMI1-facility-to-the-driver.patch
deleted file mode 100644
index 4aa973b66c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0426-Add-HDMI1-facility-to-the-driver.patch
+++ /dev/null
@@ -1,296 +0,0 @@
-From 0f9e17aaa52c2f7fc586b1864c3a85156648253d Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Wed, 8 Jun 2022 20:49:22 +0100
-Subject: [PATCH] Add HDMI1 facility to the driver.
-
-Also check for which HDMI devices are connected and only create
-devices for those that are present.
-
-Signed-off-by: James Hughes <james.hughes@raspberrypi.org>
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
-
-snd_bcm2835: disable HDMI audio when vc4 is used (#3640)
-
-Things don't work too well when both the vc4 driver and the firmware
-driver are trying to control the same audio output:
-
-[  763.569406] bcm2835_audio bcm2835_audio: vchi message timeout, msg=5
-
-Hence, when the vc4 HDMI driver is used, let it control audio. This is done
-by introducing a new device tree property to the audio node, and
-extending the vc4-kms-v3d overlays to set it appropriately.
-
-Signed-off-by: Hristo Venev <hristo@venev.name>
-
-staging: bcm2835-audio: Add disable-headphones flag
-
-Add a property to allow the headphone output to be disabled. Use an
-integer property rather than a boolean so that an overlay can clear it.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-staging: bcm2835-audio: Find compatible firmware node
-
-Commit "ARM: dts: Adopt the upstream snd_bcm2835 handling" removed the
-audio section from the DT and the driver can no longer access the
-referenced firmware node 'brcm,firmware'. Fix that by searching for a
-compatible firmware node instead, similar to drivers/gpu/drm/vc4.
-
-Fixes: b9e62329e096 ("ARM: dts: Adopt the upstream snd_bcm2835 handling")
-Signed-off-by: Juerg Haefliger <juergh@proton.me>
-
-staging: bcm2835-audio: Fix firmware node refcounting
-
-Decrement firmware node refcounts on all exit paths in set_hdmi_enables().
-
-Signed-off-by: Juerg Haefliger <juergh@proton.me>
-
-staging: bcm2835-audio: Log errors in case of firmware query failures
-
-The driver queries the firmware for the number of detected HDMI displays
-and their IDs. Log error messages if queries fail.
-
-Signed-off-by: Juerg Haefliger <juergh@proton.me>
-
-staging: bcm2835-audio: Fix unused enable_hdmi module parameter
-
-The commit "Add HDMI1 facility to the driver." made the enable_hdmi module
-parameter unused. Fix that by making it a global switch for all available
-HDMI audio outputs.
-
-Fixes: 755f3366084b ("Add HDMI1 facility to the driver.")
-Signed-off-by: Juerg Haefliger <juergh@proton.me>
-
-staging: bcm2835-audio: Fix unused enable_headphones module parameter
-
-Since commit "staging: bcm2835-audio: Add disable-headphones flag" the
-enabling/disabling of the headphones output is solely determined by the
-presence of the DT property 'brcm,disable-headphones' and the
-enable_headphones module parameter is unused. Fix that by making it a
-global switch.
-
-Fixes: ee90e47d8824 ("staging: bcm2835-audio: Add disable-headphones flag")
-Signed-off-by: Juerg Haefliger <juergh@proton.me>
----
- .../vc04_services/bcm2835-audio/bcm2835-pcm.c |   3 +-
- .../vc04_services/bcm2835-audio/bcm2835.c     | 110 ++++++++++++++++--
- .../vc04_services/bcm2835-audio/bcm2835.h     |   6 +-
- 3 files changed, 105 insertions(+), 14 deletions(-)
-
---- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
-+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
-@@ -321,10 +321,11 @@ static const struct snd_pcm_ops snd_bcm2
- 
- /* create a pcm device */
- int snd_bcm2835_new_pcm(struct bcm2835_chip *chip, const char *name,
--			int idx, enum snd_bcm2835_route route,
-+			enum snd_bcm2835_route route,
- 			u32 numchannels, bool spdif)
- {
- 	struct snd_pcm *pcm;
-+	int idx = chip->index++;
- 	int err;
- 
- 	err = snd_pcm_new(chip->card, name, idx, numchannels, 0, &pcm);
---- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
-+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
-@@ -8,8 +8,9 @@
- #include <linux/module.h>
- 
- #include "bcm2835.h"
-+#include <soc/bcm2835/raspberrypi-firmware.h>
- 
--static bool enable_hdmi;
-+static bool enable_hdmi, enable_hdmi0, enable_hdmi1;
- static bool enable_headphones = true;
- static int num_channels = MAX_SUBSTREAMS;
- 
-@@ -65,14 +66,13 @@ static int bcm2835_audio_dual_newpcm(str
- 				     u32 numchannels)
- {
- 	int err;
--
--	err = snd_bcm2835_new_pcm(chip, name, 0, route,
-+	err = snd_bcm2835_new_pcm(chip, name, route,
- 				  numchannels, false);
- 
- 	if (err)
- 		return err;
- 
--	err = snd_bcm2835_new_pcm(chip, "IEC958", 1, route, 1, true);
-+	err = snd_bcm2835_new_pcm(chip, name, route, 1, true);
- 	if (err)
- 		return err;
- 
-@@ -84,20 +84,33 @@ static int bcm2835_audio_simple_newpcm(s
- 				       enum snd_bcm2835_route route,
- 				       u32 numchannels)
- {
--	return snd_bcm2835_new_pcm(chip, name, 0, route, numchannels, false);
-+	return snd_bcm2835_new_pcm(chip, name, route, numchannels, false);
- }
- 
--static struct bcm2835_audio_driver bcm2835_audio_hdmi = {
-+static struct bcm2835_audio_driver bcm2835_audio_hdmi0 = {
-+	.driver = {
-+		.name = "bcm2835_hdmi",
-+		.owner = THIS_MODULE,
-+	},
-+	.shortname = "bcm2835 HDMI 1",
-+	.longname  = "bcm2835 HDMI 1",
-+	.minchannels = 1,
-+	.newpcm = bcm2835_audio_dual_newpcm,
-+	.newctl = snd_bcm2835_new_hdmi_ctl,
-+	.route = AUDIO_DEST_HDMI0
-+};
-+
-+static struct bcm2835_audio_driver bcm2835_audio_hdmi1 = {
- 	.driver = {
- 		.name = "bcm2835_hdmi",
- 		.owner = THIS_MODULE,
- 	},
--	.shortname = "bcm2835 HDMI",
--	.longname  = "bcm2835 HDMI",
-+	.shortname = "bcm2835 HDMI 2",
-+	.longname  = "bcm2835 HDMI 2",
- 	.minchannels = 1,
- 	.newpcm = bcm2835_audio_dual_newpcm,
- 	.newctl = snd_bcm2835_new_hdmi_ctl,
--	.route = AUDIO_DEST_HDMI
-+	.route = AUDIO_DEST_HDMI1
- };
- 
- static struct bcm2835_audio_driver bcm2835_audio_headphones = {
-@@ -120,8 +133,12 @@ struct bcm2835_audio_drivers {
- 
- static struct bcm2835_audio_drivers children_devices[] = {
- 	{
--		.audio_driver = &bcm2835_audio_hdmi,
--		.is_enabled = &enable_hdmi,
-+		.audio_driver = &bcm2835_audio_hdmi0,
-+		.is_enabled = &enable_hdmi0,
-+	},
-+	{
-+		.audio_driver = &bcm2835_audio_hdmi1,
-+		.is_enabled = &enable_hdmi1,
- 	},
- 	{
- 		.audio_driver = &bcm2835_audio_headphones,
-@@ -268,10 +285,70 @@ static int snd_add_child_devices(struct
- 	return 0;
- }
- 
-+static void set_hdmi_enables(struct device *dev)
-+{
-+	struct device_node *firmware_node;
-+	struct rpi_firmware *firmware = NULL;
-+	u32 num_displays, i, display_id;
-+	int ret;
-+
-+	firmware_node = of_find_compatible_node(NULL, NULL,
-+					"raspberrypi,bcm2835-firmware");
-+	if (firmware_node) {
-+		firmware = rpi_firmware_get(firmware_node);
-+		of_node_put(firmware_node);
-+	}
-+
-+	if (!firmware) {
-+		dev_err(dev, "Failed to get fw structure\n");
-+		return;
-+	}
-+
-+	ret = rpi_firmware_property(firmware,
-+				    RPI_FIRMWARE_FRAMEBUFFER_GET_NUM_DISPLAYS,
-+				    &num_displays, sizeof(u32));
-+	if (ret) {
-+		dev_err(dev, "Failed to get fw property NUM_DISPLAYS\n");
-+		goto out_rpi_fw_put;
-+	}
-+
-+	for (i = 0; i < num_displays; i++) {
-+		display_id = i;
-+		ret = rpi_firmware_property(firmware,
-+				RPI_FIRMWARE_FRAMEBUFFER_GET_DISPLAY_ID,
-+				&display_id, sizeof(display_id));
-+		if (ret) {
-+			dev_err(dev, "Failed to get fw property DISPLAY_ID "
-+				"(i = %d)\n", i);
-+		} else {
-+			if (display_id == 2)
-+				enable_hdmi0 = true;
-+			if (display_id == 7)
-+				enable_hdmi1 = true;
-+		}
-+	}
-+
-+	if (!enable_hdmi0 && enable_hdmi1) {
-+		/* Swap them over and reassign route. This means
-+		 * that if we only have one connected, it is always named
-+		 *  HDMI1, irrespective of if its on port HDMI0 or HDMI1.
-+		 *  This should match with the naming of HDMI ports in DRM
-+		 */
-+		enable_hdmi0 = true;
-+		enable_hdmi1 = false;
-+		bcm2835_audio_hdmi0.route = AUDIO_DEST_HDMI1;
-+	}
-+
-+out_rpi_fw_put:
-+	rpi_firmware_put(firmware);
-+	return;
-+}
-+
- static int snd_bcm2835_alsa_probe(struct platform_device *pdev)
- {
- 	struct device *dev = &pdev->dev;
- 	int err;
-+	u32 disable_headphones = 0;
- 
- 	if (num_channels <= 0 || num_channels > MAX_SUBSTREAMS) {
- 		num_channels = MAX_SUBSTREAMS;
-@@ -279,6 +356,17 @@ static int snd_bcm2835_alsa_probe(struct
- 			 num_channels);
- 	}
- 
-+	if (enable_hdmi &&
-+	    !of_property_read_bool(dev->of_node, "brcm,disable-hdmi"))
-+		set_hdmi_enables(dev);
-+
-+	if (enable_headphones) {
-+		of_property_read_u32(dev->of_node,
-+				     "brcm,disable-headphones",
-+				     &disable_headphones);
-+		enable_headphones = !disable_headphones;
-+	}
-+
- 	err = bcm2835_devm_add_vchi_ctx(dev);
- 	if (err)
- 		return err;
---- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
-+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
-@@ -33,7 +33,8 @@ enum {
- enum snd_bcm2835_route {
- 	AUDIO_DEST_AUTO = 0,
- 	AUDIO_DEST_HEADPHONES = 1,
--	AUDIO_DEST_HDMI = 2,
-+	AUDIO_DEST_HDMI0 = 2,
-+	AUDIO_DEST_HDMI1 = 3,
- 	AUDIO_DEST_MAX,
- };
- 
-@@ -58,6 +59,7 @@ struct bcm2835_chip {
- 	int volume;
- 	int dest;
- 	int mute;
-+	int index;
- 
- 	unsigned int opened;
- 	unsigned int spdif_status;
-@@ -85,7 +87,7 @@ struct bcm2835_alsa_stream {
- 
- int snd_bcm2835_new_ctl(struct bcm2835_chip *chip);
- int snd_bcm2835_new_pcm(struct bcm2835_chip *chip, const char *name,
--			int idx, enum snd_bcm2835_route route,
-+			enum snd_bcm2835_route route,
- 			u32 numchannels, bool spdif);
- 
- int snd_bcm2835_new_hdmi_ctl(struct bcm2835_chip *chip);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0427-Populate-phy-driver-block-for-BCM54213PE.patch b/target/linux/bcm27xx/patches-6.1/950-0427-Populate-phy-driver-block-for-BCM54213PE.patch
deleted file mode 100644
index cdfc996abf..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0427-Populate-phy-driver-block-for-BCM54213PE.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 437be8fec1433d9b023f34af8e4ac2dbe3a113f9 Mon Sep 17 00:00:00 2001
-From: Jonathan Lemon <jonathan.lemon@gmail.com>
-Date: Wed, 4 May 2022 14:33:05 -0700
-Subject: [PATCH] Populate phy driver block for BCM54213PE
-
-The BCM54213PE identifier is a RPI-specific addition.
-Populate the remainder of the driver functions, including the
-required probe routine.
-
-Add a version of bcm54xx_suspend, from upstream.
-
-Signed-off-by: Jonathan Lemon <jonathan.lemon@gmail.com>
----
- drivers/net/phy/broadcom.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/drivers/net/phy/broadcom.c
-+++ b/drivers/net/phy/broadcom.c
-@@ -933,8 +933,14 @@ static struct phy_driver broadcom_driver
- 	.phy_id_mask	= 0xffffffff,
- 	.name		= "Broadcom BCM54213PE",
- 	/* PHY_GBIT_FEATURES */
-+	.get_sset_count	= bcm_phy_get_sset_count,
-+	.get_strings	= bcm_phy_get_strings,
-+	.get_stats	= bcm54xx_get_stats,
-+	.probe		= bcm54xx_phy_probe,
- 	.config_init	= bcm54xx_config_init,
- 	.config_intr	= bcm_phy_config_intr,
-+	.suspend	= bcm54xx_suspend,
-+	.resume		= bcm54xx_resume,
- }, {
- 	.phy_id		= PHY_ID_BCM5461,
- 	.phy_id_mask	= 0xfffffff0,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0428-clk-bcm-rpi-Add-the-BCM283x-pixel-clock.patch b/target/linux/bcm27xx/patches-6.1/950-0428-clk-bcm-rpi-Add-the-BCM283x-pixel-clock.patch
deleted file mode 100644
index 609e7b83b9..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0428-clk-bcm-rpi-Add-the-BCM283x-pixel-clock.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 275331bce7ee7dc7f045218468560db6981d3b95 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 2 Dec 2021 13:53:36 +0000
-Subject: [PATCH] clk: bcm: rpi: Add the BCM283x pixel clock.
-
-The clk-bcm2835 handling of the pixel clock does not function
-correctly when the HDMI power domain is disabled.
-
-The firmware supports it correctly, so add it to the
-firmware clock driver.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/clk/bcm/clk-raspberrypi.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/clk/bcm/clk-raspberrypi.c
-+++ b/drivers/clk/bcm/clk-raspberrypi.c
-@@ -140,6 +140,7 @@ raspberrypi_clk_variants[RPI_FIRMWARE_NU
- 	},
- 	[RPI_FIRMWARE_PIXEL_CLK_ID] = {
- 		.export = true,
-+		.minimize = true,
- 	},
- 	[RPI_FIRMWARE_HEVC_CLK_ID] = {
- 		.export = true,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0429-media-i2c-ov9281-Correct-min-def-vts-for-640x400.patch b/target/linux/bcm27xx/patches-6.1/950-0429-media-i2c-ov9281-Correct-min-def-vts-for-640x400.patch
deleted file mode 100644
index 28379c221f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0429-media-i2c-ov9281-Correct-min-def-vts-for-640x400.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 286fa1d98e627f4991f3fe3981b806555df18cd8 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Mon, 4 Jul 2022 18:10:23 +0100
-Subject: [PATCH] media: i2c: ov9281: Correct min/def vts for 640x400
-
-A VTS of 421 in the 640x400 mode only streams at 130.2fps
-instead of the expected ~261fps. This appears to be an invalid
-value for the sensor, as a VTS of 422 works fine to give 259.79fps.
-
-Set the minimum (and default) to 422.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/i2c/ov9281.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/media/i2c/ov9281.c
-+++ b/drivers/media/i2c/ov9281.c
-@@ -369,7 +369,7 @@ static const struct ov9281_mode supporte
- 		.height = 400,
- 		.exp_def = 0x0320,
- 		.hts_def = 0x05b0,
--		.vts_def = 421,
-+		.vts_def = 422,
- 		.crop = {
- 			.left = 0,
- 			.top = 0,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0430-media-i2c-ov9281-Change-exposure-default-value-with-.patch b/target/linux/bcm27xx/patches-6.1/950-0430-media-i2c-ov9281-Change-exposure-default-value-with-.patch
deleted file mode 100644
index 0a7dac9002..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0430-media-i2c-ov9281-Change-exposure-default-value-with-.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ec8627b0eff55db1a8bdfe7bb327c31c6ca3dad7 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Mon, 4 Jul 2022 18:12:56 +0100
-Subject: [PATCH] media: i2c: ov9281: Change exposure default value
- with mode choice
-
-When the exposure range is updated due to changing VBLANK, adopt
-the mode default value, not the current default.
-
-Should the specific default value be outside of the min/max range
-defined, then the whole update is rejected, which can leave an
-invalid exposure range active.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/i2c/ov9281.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/media/i2c/ov9281.c
-+++ b/drivers/media/i2c/ov9281.c
-@@ -976,7 +976,7 @@ static int ov9281_set_ctrl(struct v4l2_c
- 		__v4l2_ctrl_modify_range(ov9281->exposure,
- 					 ov9281->exposure->minimum, max,
- 					 ov9281->exposure->step,
--					 ov9281->exposure->default_value);
-+					 ov9281->cur_mode->vts_def);
- 		break;
- 	}
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0431-media-bcm2835-unicam-Correctly-handle-FS-FE-ISR-cond.patch b/target/linux/bcm27xx/patches-6.1/950-0431-media-bcm2835-unicam-Correctly-handle-FS-FE-ISR-cond.patch
deleted file mode 100644
index efec3af2a1..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0431-media-bcm2835-unicam-Correctly-handle-FS-FE-ISR-cond.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 1ecf9ebf26821996ae3344765e1b770d7bc4bfc2 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Mon, 8 Aug 2022 10:01:41 +0100
-Subject: [PATCH] media: bcm2835-unicam: Correctly handle FS + FE ISR
- condtion
-
-If we get a simultaneous FS + FE interrupt for the same frame, it cannot be
-marked as completed and returned to userland as the framebuffer will be refilled
-by Unicam on the next sensor frame. Additionally, the timestamp will be set to 0
-as the FS interrupt handling code will not have run yet.
-
-To avoid these problems, the frame is considered dropped in the FE handler,
-and will be returned to userland on the subsequent sensor frame.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- .../media/platform/bcm2835/bcm2835-unicam.c   | 28 +++++++++++++------
- 1 file changed, 20 insertions(+), 8 deletions(-)
-
---- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
-+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -919,7 +919,9 @@ static irqreturn_t unicam_isr(int irq, v
- 		 * to use.
- 		 */
- 		for (i = 0; i < ARRAY_SIZE(unicam->node); i++) {
--			if (!unicam->node[i].streaming)
-+			struct unicam_node *node = &unicam->node[i];
-+
-+			if (!node->streaming)
- 				continue;
- 
- 			/*
-@@ -929,14 +931,24 @@ static irqreturn_t unicam_isr(int irq, v
- 			 * + FS + LS). In this case, we cannot signal the buffer
- 			 * as complete, as the HW will reuse that buffer.
- 			 */
--			if (unicam->node[i].cur_frm &&
--			    unicam->node[i].cur_frm != unicam->node[i].next_frm) {
--				unicam_process_buffer_complete(&unicam->node[i],
--							       sequence);
--				unicam->node[i].cur_frm = unicam->node[i].next_frm;
--				unicam->node[i].next_frm = NULL;
-+			if (node->cur_frm && node->cur_frm != node->next_frm) {
-+				/*
-+				 * This condition checks if FE + FS for the same
-+				 * frame has occurred. In such cases, we cannot
-+				 * return out the frame, as no buffer handling
-+				 * or timestamping has yet been done as part of
-+				 * the FS handler.
-+				 */
-+				if (!node->cur_frm->vb.vb2_buf.timestamp) {
-+					unicam_dbg(2, unicam, "ISR: FE without FS, dropping frame\n");
-+					continue;
-+				}
-+
-+				unicam_process_buffer_complete(node, sequence);
-+				node->cur_frm = node->next_frm;
-+				node->next_frm = NULL;
- 			} else {
--				unicam->node[i].cur_frm = unicam->node[i].next_frm;
-+				node->cur_frm = node->next_frm;
- 			}
- 		}
- 		unicam->sequence++;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0432-drm-panel-simple-hack-ignore-orientation.patch b/target/linux/bcm27xx/patches-6.1/950-0432-drm-panel-simple-hack-ignore-orientation.patch
deleted file mode 100644
index f7c47caf31..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0432-drm-panel-simple-hack-ignore-orientation.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 65c56896ea9cad77b237d26624b6b31c4b4af51b Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Mon, 15 Aug 2022 19:42:38 +0100
-Subject: [PATCH] drm/panel-simple: hack ignore orientation
-
-downstream removal of orientation plus upstream adding of new function
----
- drivers/gpu/drm/panel/panel-simple.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/gpu/drm/panel/panel-simple.c
-+++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -434,9 +434,9 @@ static int panel_simple_get_timings(stru
- 
- static enum drm_panel_orientation panel_simple_get_orientation(struct drm_panel *panel)
- {
--	struct panel_simple *p = to_panel_simple(panel);
-+	//struct panel_simple *p = to_panel_simple(panel);
- 
--	return p->orientation;
-+	return DRM_MODE_PANEL_ORIENTATION_UNKNOWN;
- }
- 
- static const struct drm_panel_funcs panel_simple_funcs = {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0433-vc04_services-vc-sm-cma-Handle-upstream-require-vchi.patch b/target/linux/bcm27xx/patches-6.1/950-0433-vc04_services-vc-sm-cma-Handle-upstream-require-vchi.patch
deleted file mode 100644
index d512ffaa64..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0433-vc04_services-vc-sm-cma-Handle-upstream-require-vchi.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-From ac1d09b5d0dd7e9877ace3954d6042723fa75169 Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Mon, 15 Aug 2022 19:44:20 +0100
-Subject: [PATCH] vc04_services/vc-sm-cma: Handle upstream require
- vchiq_instance to be passed around
-
----
- .../staging/vc04_services/vc-sm-cma/vc_sm.c   | 12 +++----
- .../vc04_services/vc-sm-cma/vc_sm_cma_vchi.c  | 36 +++++++++++--------
- .../vc04_services/vc-sm-cma/vc_sm_cma_vchi.h  |  2 +-
- 3 files changed, 28 insertions(+), 22 deletions(-)
-
---- a/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c
-+++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c
-@@ -106,6 +106,7 @@ struct sm_state_t {
- 					 * has finished with a resource.
- 					 */
- 	u32 int_trans_id;		/* Interrupted transaction. */
-+	struct vchiq_instance *vchiq_instance;
- };
- 
- struct vc_sm_dma_buf_attachment {
-@@ -1491,7 +1492,6 @@ static const struct file_operations vc_s
- static void vc_sm_connected_init(void)
- {
- 	int ret;
--	struct vchiq_instance *vchiq_instance;
- 	struct vc_sm_version version;
- 	struct vc_sm_result_t version_result;
- 
-@@ -1501,7 +1501,7 @@ static void vc_sm_connected_init(void)
- 	 * Initialize and create a VCHI connection for the shared memory service
- 	 * running on videocore.
- 	 */
--	ret = vchiq_initialise(&vchiq_instance);
-+	ret = vchiq_initialise(&sm_state->vchiq_instance);
- 	if (ret) {
- 		pr_err("[%s]: failed to initialise VCHI instance (ret=%d)\n",
- 		       __func__, ret);
-@@ -1509,7 +1509,7 @@ static void vc_sm_connected_init(void)
- 		return;
- 	}
- 
--	ret = vchiq_connect(vchiq_instance);
-+	ret = vchiq_connect(sm_state->vchiq_instance);
- 	if (ret) {
- 		pr_err("[%s]: failed to connect VCHI instance (ret=%d)\n",
- 		       __func__, ret);
-@@ -1518,7 +1518,7 @@ static void vc_sm_connected_init(void)
- 	}
- 
- 	/* Initialize an instance of the shared memory service. */
--	sm_state->sm_handle = vc_sm_cma_vchi_init(vchiq_instance, 1,
-+	sm_state->sm_handle = vc_sm_cma_vchi_init(sm_state->vchiq_instance, 1,
- 						  vc_sm_vpu_event);
- 	if (!sm_state->sm_handle) {
- 		pr_err("[%s]: failed to initialize shared memory service\n",
-@@ -1576,7 +1576,7 @@ err_remove_misc_dev:
- 	misc_deregister(&sm_state->misc_dev);
- err_remove_debugfs:
- 	debugfs_remove_recursive(sm_state->dir_root);
--	vc_sm_cma_vchi_stop(&sm_state->sm_handle);
-+	vc_sm_cma_vchi_stop(sm_state->vchiq_instance, &sm_state->sm_handle);
- }
- 
- /* Driver loading. */
-@@ -1614,7 +1614,7 @@ static int bcm2835_vc_sm_cma_remove(stru
- 		debugfs_remove_recursive(sm_state->dir_root);
- 
- 		/* Stop the videocore shared memory service. */
--		vc_sm_cma_vchi_stop(&sm_state->sm_handle);
-+		vc_sm_cma_vchi_stop(sm_state->vchiq_instance, &sm_state->sm_handle);
- 	}
- 
- 	if (sm_state) {
---- a/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c
-+++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c
-@@ -70,7 +70,7 @@ struct sm_instance {
- 	struct list_head free_list;
- 
- 	struct semaphore free_sema;
--
-+	struct vchiq_instance *vchiq_instance;
- };
- 
- /* ---- Private Variables ------------------------------------------------ */
-@@ -79,11 +79,11 @@ struct sm_instance {
- 
- /* ---- Private Functions ------------------------------------------------ */
- static int
--bcm2835_vchi_msg_queue(unsigned int handle,
-+bcm2835_vchi_msg_queue(struct vchiq_instance *vchiq_instance, unsigned int handle,
- 		       void *data,
- 		       unsigned int size)
- {
--	return vchiq_queue_kernel_message(handle, data, size);
-+	return vchiq_queue_kernel_message(vchiq_instance, handle, data, size);
- }
- 
- static struct
-@@ -187,12 +187,12 @@ static int vc_sm_cma_vchi_videocore_io(v
- 
- 	while (1) {
- 		if (svc_use)
--			vchiq_release_service(instance->service_handle[0]);
-+			vchiq_release_service(instance->vchiq_instance, instance->service_handle[0]);
- 		svc_use = 0;
- 
- 		if (wait_for_completion_interruptible(&instance->io_cmplt))
- 			continue;
--		vchiq_use_service(instance->service_handle[0]);
-+		vchiq_use_service(instance->vchiq_instance, instance->service_handle[0]);
- 		svc_use = 1;
- 
- 		do {
-@@ -212,7 +212,8 @@ static int vc_sm_cma_vchi_videocore_io(v
- 			mutex_unlock(&instance->lock);
- 			/* Send the command */
- 			status =
--				bcm2835_vchi_msg_queue(instance->service_handle[0],
-+				bcm2835_vchi_msg_queue(instance->vchiq_instance,
-+						       instance->service_handle[0],
- 						       cmd->msg, cmd->length);
- 			if (status) {
- 				pr_err("%s: failed to queue message (%d)",
-@@ -235,7 +236,8 @@ static int vc_sm_cma_vchi_videocore_io(v
- 
- 		} while (1);
- 
--		while ((header = vchiq_msg_hold(instance->service_handle[0]))) {
-+		while ((header = vchiq_msg_hold(instance->vchiq_instance,
-+						instance->service_handle[0]))) {
- 			reply = (struct vc_sm_result_t *)header->data;
- 			if (reply->trans_id & 0x80000000) {
- 				/* Async event or cmd from the VPU */
-@@ -247,7 +249,8 @@ static int vc_sm_cma_vchi_videocore_io(v
- 						      header->size);
- 			}
- 
--			vchiq_release_message(instance->service_handle[0],
-+			vchiq_release_message(instance->vchiq_instance,
-+					      instance->service_handle[0],
- 					      header);
- 		}
- 
-@@ -264,15 +267,16 @@ static int vc_sm_cma_vchi_videocore_io(v
- 	return 0;
- }
- 
--static enum vchiq_status vc_sm_cma_vchi_callback(enum vchiq_reason reason,
-+static enum vchiq_status vc_sm_cma_vchi_callback(struct vchiq_instance *vchiq_instance,
-+						 enum vchiq_reason reason,
- 						 struct vchiq_header *header,
- 						 unsigned int handle, void *userdata)
- {
--	struct sm_instance *instance = vchiq_get_service_userdata(handle);
-+	struct sm_instance *instance = vchiq_get_service_userdata(vchiq_instance, handle);
- 
- 	switch (reason) {
- 	case VCHIQ_MESSAGE_AVAILABLE:
--		vchiq_msg_queue_push(handle, header);
-+		vchiq_msg_queue_push(vchiq_instance, handle, header);
- 		complete(&instance->io_cmplt);
- 		break;
- 
-@@ -320,6 +324,8 @@ struct sm_instance *vc_sm_cma_vchi_init(
- 		list_add(&instance->free_blk[i].head, &instance->free_list);
- 	}
- 
-+	instance->vchiq_instance = vchiq_instance;
-+
- 	/* Open the VCHI service connections */
- 	instance->num_connections = num_connections;
- 	for (i = 0; i < num_connections; i++) {
-@@ -358,7 +364,7 @@ struct sm_instance *vc_sm_cma_vchi_init(
- err_close_services:
- 	for (i = 0; i < instance->num_connections; i++) {
- 		if (instance->service_handle[i])
--			vchiq_close_service(instance->service_handle[i]);
-+			vchiq_close_service(vchiq_instance, instance->service_handle[i]);
- 	}
- 	kfree(instance);
- err_null:
-@@ -366,7 +372,7 @@ err_null:
- 	return NULL;
- }
- 
--int vc_sm_cma_vchi_stop(struct sm_instance **handle)
-+int vc_sm_cma_vchi_stop(struct vchiq_instance *vchiq_instance, struct sm_instance **handle)
- {
- 	struct sm_instance *instance;
- 	u32 i;
-@@ -385,8 +391,8 @@ int vc_sm_cma_vchi_stop(struct sm_instan
- 
- 	/* Close all VCHI service connections */
- 	for (i = 0; i < instance->num_connections; i++) {
--		vchiq_use_service(instance->service_handle[i]);
--		vchiq_close_service(instance->service_handle[i]);
-+		vchiq_use_service(vchiq_instance, instance->service_handle[i]);
-+		vchiq_close_service(vchiq_instance, instance->service_handle[i]);
- 	}
- 
- 	kfree(instance);
---- a/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.h
-+++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.h
-@@ -35,7 +35,7 @@ struct sm_instance *vc_sm_cma_vchi_init(
- /*
-  * Terminates the shared memory service.
-  */
--int vc_sm_cma_vchi_stop(struct sm_instance **handle);
-+int vc_sm_cma_vchi_stop(struct vchiq_instance *vchi_instance, struct sm_instance **handle);
- 
- /*
-  * Ask the shared memory service to free up some memory that was previously
diff --git a/target/linux/bcm27xx/patches-6.1/950-0434-media-video-mux-Read-CSI2-config-from-FW-and-pass-to.patch b/target/linux/bcm27xx/patches-6.1/950-0434-media-video-mux-Read-CSI2-config-from-FW-and-pass-to.patch
deleted file mode 100644
index f057e78f1f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0434-media-video-mux-Read-CSI2-config-from-FW-and-pass-to.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-From 49c4d625a8477689891d68509d9f2b3ede3ed3f9 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 29 Jul 2022 17:46:49 +0100
-Subject: [PATCH] media: video-mux: Read CSI2 config from FW, and pass
- to receiver
-
-There is no obligation for all source devices on a video-mux to
-require the same bus configuration, so read the configuration
-from the sink ports, and relay via get_mbus_config on the source
-port.
-If the sources support get_mbus_config, then call that first.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/platform/video-mux.c | 68 +++++++++++++++++++++++++++++-
- 1 file changed, 66 insertions(+), 2 deletions(-)
-
---- a/drivers/media/platform/video-mux.c
-+++ b/drivers/media/platform/video-mux.c
-@@ -20,11 +20,28 @@
- #include <media/v4l2-mc.h>
- #include <media/v4l2-subdev.h>
- 
-+struct video_mux_asd {
-+	struct v4l2_async_subdev base;
-+	unsigned int port;
-+};
-+
-+static inline struct video_mux_asd *to_video_mux_asd(struct v4l2_async_subdev *asd)
-+{
-+	return container_of(asd, struct video_mux_asd, base);
-+}
-+
-+struct video_mux_pad_cfg {
-+	unsigned int num_lanes;
-+	bool non_continuous;
-+	struct v4l2_subdev *source;
-+};
-+
- struct video_mux {
- 	struct v4l2_subdev subdev;
- 	struct v4l2_async_notifier notifier;
- 	struct media_pad *pads;
- 	struct v4l2_mbus_framefmt *format_mbus;
-+	struct video_mux_pad_cfg *cfg;
- 	struct mux_control *mux;
- 	struct mutex lock;
- 	int active;
-@@ -330,10 +347,34 @@ static int video_mux_init_cfg(struct v4l
- 	return 0;
- }
- 
-+static int video_mux_get_mbus_config(struct v4l2_subdev *sd,
-+				     unsigned int pad,
-+				     struct v4l2_mbus_config *cfg)
-+{
-+	struct video_mux *vmux = v4l2_subdev_to_video_mux(sd);
-+	int ret;
-+
-+	ret = v4l2_subdev_call(vmux->cfg[vmux->active].source, pad, get_mbus_config,
-+			       0, cfg);
-+
-+	if (ret != -ENOIOCTLCMD)
-+		return ret;
-+
-+	cfg->type = V4L2_MBUS_CSI2_DPHY;
-+	cfg->bus.mipi_csi2.num_data_lanes = vmux->cfg[vmux->active].num_lanes;
-+
-+	/* Support for non-continuous CSI-2 clock is missing in pdate mode */
-+	if (vmux->cfg[vmux->active].non_continuous)
-+		cfg->bus.mipi_csi2.flags |= V4L2_MBUS_CSI2_NONCONTINUOUS_CLOCK;
-+
-+	return 0;
-+};
-+
- static const struct v4l2_subdev_pad_ops video_mux_pad_ops = {
- 	.init_cfg = video_mux_init_cfg,
- 	.get_fmt = video_mux_get_format,
- 	.set_fmt = video_mux_set_format,
-+	.get_mbus_config = video_mux_get_mbus_config,
- };
- 
- static const struct v4l2_subdev_ops video_mux_subdev_ops = {
-@@ -346,6 +387,9 @@ static int video_mux_notify_bound(struct
- 				  struct v4l2_async_subdev *asd)
- {
- 	struct video_mux *vmux = notifier_to_video_mux(notifier);
-+	unsigned int port = to_video_mux_asd(asd)->port;
-+
-+	vmux->cfg[port].source = sd;
- 
- 	return v4l2_create_fwnode_links(sd, &vmux->subdev);
- }
-@@ -363,7 +407,7 @@ static int video_mux_async_register(stru
- 	v4l2_async_nf_init(&vmux->notifier);
- 
- 	for (i = 0; i < num_input_pads; i++) {
--		struct v4l2_async_subdev *asd;
-+		struct video_mux_asd *asd;
- 		struct fwnode_handle *ep, *remote_ep;
- 
- 		ep = fwnode_graph_get_endpoint_by_id(
-@@ -381,7 +425,8 @@ static int video_mux_async_register(stru
- 		fwnode_handle_put(remote_ep);
- 
- 		asd = v4l2_async_nf_add_fwnode_remote(&vmux->notifier, ep,
--						      struct v4l2_async_subdev);
-+						      struct video_mux_asd);
-+		asd->port = i;
- 
- 		fwnode_handle_put(ep);
- 
-@@ -406,6 +451,9 @@ static int video_mux_probe(struct platfo
- {
- 	struct device_node *np = pdev->dev.of_node;
- 	struct device *dev = &pdev->dev;
-+	struct v4l2_fwnode_endpoint fwnode_ep = {
-+		.bus_type = V4L2_MBUS_CSI2_DPHY
-+	};
- 	struct device_node *ep;
- 	struct video_mux *vmux;
- 	unsigned int num_pads = 0;
-@@ -458,10 +506,26 @@ static int video_mux_probe(struct platfo
- 	if (!vmux->format_mbus)
- 		return -ENOMEM;
- 
-+	vmux->cfg = devm_kcalloc(dev, num_pads, sizeof(*vmux->cfg), GFP_KERNEL);
-+	if (!vmux->cfg)
-+		return -ENOMEM;
-+
- 	for (i = 0; i < num_pads; i++) {
- 		vmux->pads[i].flags = (i < num_pads - 1) ? MEDIA_PAD_FL_SINK
- 							 : MEDIA_PAD_FL_SOURCE;
- 		vmux->format_mbus[i] = video_mux_format_mbus_default;
-+
-+		ep = of_graph_get_endpoint_by_regs(pdev->dev.of_node, i, 0);
-+		if (ep) {
-+			ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(ep), &fwnode_ep);
-+			if (!ret) {
-+				/* Get number of data lanes */
-+				vmux->cfg[i].num_lanes = fwnode_ep.bus.mipi_csi2.num_data_lanes;
-+				vmux->cfg[i].non_continuous = fwnode_ep.bus.mipi_csi2.flags &
-+							V4L2_MBUS_CSI2_NONCONTINUOUS_CLOCK;
-+			}
-+			of_node_put(ep);
-+		}
- 	}
- 
- 	vmux->subdev.entity.function = MEDIA_ENT_F_VID_MUX;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0435-media-i2c-arducam-pivariety-Add-custom-controls.patch b/target/linux/bcm27xx/patches-6.1/950-0435-media-i2c-arducam-pivariety-Add-custom-controls.patch
deleted file mode 100644
index 165197b406..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0435-media-i2c-arducam-pivariety-Add-custom-controls.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b319421a01177d883539b2f25302300e9544afb0 Mon Sep 17 00:00:00 2001
-From: Lee Jackson <info@arducam.com>
-Date: Fri, 26 Aug 2022 11:41:49 +0800
-Subject: [PATCH] media: i2c: arducam-pivariety: Add custom controls
-
-Add support for strobe_shift, strobe_width and mode custom controls.
-
-Signed-off-by: Lee Jackson <info@arducam.com>
----
- drivers/media/i2c/arducam-pivariety.c | 6 ++++++
- drivers/media/i2c/arducam-pivariety.h | 3 +++
- 2 files changed, 9 insertions(+)
-
---- a/drivers/media/i2c/arducam-pivariety.c
-+++ b/drivers/media/i2c/arducam-pivariety.c
-@@ -1140,6 +1140,12 @@ static const char *pivariety_ctrl_get_na
- 		return "trigger_mode";
- 	case V4L2_CID_ARDUCAM_IRCUT:
- 		return "ircut";
-+	case V4L2_CID_ARDUCAM_STROBE_SHIFT:
-+		return "strobe_shift";
-+	case V4L2_CID_ARDUCAM_STROBE_WIDTH:
-+		return "strobe_width";
-+	case V4L2_CID_ARDUCAM_MODE:
-+		return "mode";
- 	default:
- 		return NULL;
- 	}
---- a/drivers/media/i2c/arducam-pivariety.h
-+++ b/drivers/media/i2c/arducam-pivariety.h
-@@ -52,6 +52,9 @@
- #define V4L2_CID_ARDUCAM_BASE		(V4L2_CID_USER_BASE + 0x1000)
- #define V4L2_CID_ARDUCAM_EXT_TRI	(V4L2_CID_ARDUCAM_BASE + 1)
- #define V4L2_CID_ARDUCAM_IRCUT		(V4L2_CID_ARDUCAM_BASE + 8)
-+#define V4L2_CID_ARDUCAM_STROBE_SHIFT	(V4L2_CID_ARDUCAM_BASE + 14)
-+#define V4L2_CID_ARDUCAM_STROBE_WIDTH	(V4L2_CID_ARDUCAM_BASE + 15)
-+#define V4L2_CID_ARDUCAM_MODE		(V4L2_CID_ARDUCAM_BASE + 16)
- 
- enum image_dt {
- 	IMAGE_DT_YUV420_8 = 0x18,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0436-media-bcm2835-unicam-Fix-for-possible-dummy-buffer-o.patch b/target/linux/bcm27xx/patches-6.1/950-0436-media-bcm2835-unicam-Fix-for-possible-dummy-buffer-o.patch
deleted file mode 100644
index 24e3e5ee8a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0436-media-bcm2835-unicam-Fix-for-possible-dummy-buffer-o.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 5631d65a09fe2249d22fad0985c25dc776b41808 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Fri, 2 Sep 2022 08:35:35 +0100
-Subject: [PATCH] media: bcm2835-unicam: Fix for possible dummy buffer
- overrun
-
-The Unicam hardware has been observed to cause a buffer overrun when using the
-dummy buffer as a circular buffer. The conditions that cause the overrun are not
-fully known, but it seems to occur when the memory bus is heavily loaded.
-
-To avoid the overrun, program the hardware with a buffer size of 0 when using
-the dummy buffer. This will cause overrun into the allocated dummy buffer, but
-avoid out of bounds writes.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/platform/bcm2835/bcm2835-unicam.c | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
---- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
-+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -126,8 +126,11 @@ MODULE_PARM_DESC(media_controller, "Use
- #define UNICAM_EMBEDDED_SIZE	16384
- 
- /*
-- * Size of the dummy buffer. Can be any size really, but the DMA
-- * allocation works in units of page sizes.
-+ * Size of the dummy buffer allocation.
-+ *
-+ * Due to a HW bug causing buffer overruns in circular buffer mode under certain
-+ * (not yet fully known) conditions, the dummy buffer allocation is set to a
-+ * a single page size, but the hardware gets programmed with a buffer size of 0.
-  */
- #define DUMMY_BUF_SIZE		(PAGE_SIZE)
- 
-@@ -843,8 +846,7 @@ static void unicam_schedule_dummy_buffer
- 	unicam_dbg(3, dev, "Scheduling dummy buffer for node %d\n",
- 		   node->pad_id);
- 
--	unicam_wr_dma_addr(dev, node->dummy_buf_dma_addr, DUMMY_BUF_SIZE,
--			   node->pad_id);
-+	unicam_wr_dma_addr(dev, node->dummy_buf_dma_addr, 0, node->pad_id);
- 	node->next_frm = NULL;
- }
- 
-@@ -2662,8 +2664,8 @@ static void unicam_stop_streaming(struct
- 		 * This is only really needed if the embedded data pad is
- 		 * disabled before the image pad.
- 		 */
--		unicam_wr_dma_addr(dev, node->dummy_buf_dma_addr,
--				   DUMMY_BUF_SIZE, METADATA_PAD);
-+		unicam_wr_dma_addr(dev, node->dummy_buf_dma_addr, 0,
-+				   METADATA_PAD);
- 	}
- 
- 	/* Clear all queued buffers for the node */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0437-usb-xhci-expand-mitigations-for-VLI_SS_BULK_OUT_BUG-.patch b/target/linux/bcm27xx/patches-6.1/950-0437-usb-xhci-expand-mitigations-for-VLI_SS_BULK_OUT_BUG-.patch
deleted file mode 100644
index 9b46c5ea5b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0437-usb-xhci-expand-mitigations-for-VLI_SS_BULK_OUT_BUG-.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From c843ba12fdedd07ddd809c84740f4b585839599b Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.com>
-Date: Thu, 8 Sep 2022 15:50:15 +0100
-Subject: [PATCH] usb: xhci: expand mitigations for VLI_SS_BULK_OUT_BUG
- quirk
-
-The VL805 can cause data corruption if a SS Bulk OUT endpoint enters a
-flow-control condition and there are TRBs in the transfer ring that are
-not an integral size of wMaxPacket and the endpoint is behind one or more
-hubs.
-
-This is frequently the case encountered when FAT32 filesystems are
-present on mass-storage devices with cluster sizes of 1 sector, and the
-filesystem is being written to with an aggregate of small files.
-
-The initial implementation of this quirk separated TRBs that didn't
-adhere to this limitation into two - the first a multiple of wMaxPacket
-and the second the 512-byte remainder - in an attempt to force TD
-fragments to align with packet boundaries. This reduced the incidence
-rate of data corruption but did not resolve it.
-
-The fix as recommended by VIA is to disable bursts if this sequence of
-TRBs can occur.
-
-Limit turning off bursts to just USB mass-storage devices by searching
-the device's configuration for an interface with a class type of
-USB_CLASS_MASS_STORAGE.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- drivers/usb/host/xhci-mem.c | 31 ++++++++++++++++++++++++++++++-
- 1 file changed, 30 insertions(+), 1 deletion(-)
-
---- a/drivers/usb/host/xhci-mem.c
-+++ b/drivers/usb/host/xhci-mem.c
-@@ -1437,6 +1437,7 @@ int xhci_endpoint_init(struct xhci_hcd *
- 	unsigned int ep_index;
- 	struct xhci_ep_ctx *ep_ctx;
- 	struct xhci_ring *ep_ring;
-+	struct usb_interface_cache *intfc;
- 	unsigned int max_packet;
- 	enum xhci_ring_type ring_type;
- 	u32 max_esit_payload;
-@@ -1446,6 +1447,8 @@ int xhci_endpoint_init(struct xhci_hcd *
- 	unsigned int mult;
- 	unsigned int avg_trb_len;
- 	unsigned int err_count = 0;
-+	unsigned int is_ums_dev = 0;
-+	unsigned int i;
- 
- 	ep_index = xhci_get_endpoint_index(&ep->desc);
- 	ep_ctx = xhci_get_ep_ctx(xhci, virt_dev->in_ctx, ep_index);
-@@ -1477,9 +1480,35 @@ int xhci_endpoint_init(struct xhci_hcd *
- 
- 	mult = xhci_get_endpoint_mult(udev, ep);
- 	max_packet = usb_endpoint_maxp(&ep->desc);
--	max_burst = xhci_get_endpoint_max_burst(udev, ep);
- 	avg_trb_len = max_esit_payload;
- 
-+	/*
-+	 * VL805 errata - Bulk OUT bursts to superspeed mass-storage
-+	 * devices behind hub ports can cause data corruption with
-+	 * non-wMaxPacket-multiple transfers.
-+	 */
-+	for (i = 0; i < udev->config->desc.bNumInterfaces; i++) {
-+		intfc = udev->config->intf_cache[i];
-+		/*
-+		 * Slight hack - look at interface altsetting 0, which
-+		 * should be the UMS bulk-only interface. If the class
-+		 * matches, then we disable out bursts for all OUT
-+		 * endpoints because endpoint assignments may change
-+		 * between alternate settings.
-+		 */
-+		if (intfc->altsetting[0].desc.bInterfaceClass ==
-+		    USB_CLASS_MASS_STORAGE) {
-+			is_ums_dev = 1;
-+			break;
-+		}
-+	}
-+	if (xhci->quirks & XHCI_VLI_SS_BULK_OUT_BUG &&
-+	    usb_endpoint_is_bulk_out(&ep->desc) && is_ums_dev &&
-+	    udev->route)
-+		max_burst = 0;
-+	else
-+		max_burst = xhci_get_endpoint_max_burst(udev, ep);
-+
- 	/* FIXME dig Mult and streams info out of ep companion desc */
- 
- 	/* Allow 3 retries for everything but isoc, set CErr = 3 */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0438-usb-xhci-account-for-num_trbs_free-when-invalidating.patch b/target/linux/bcm27xx/patches-6.1/950-0438-usb-xhci-account-for-num_trbs_free-when-invalidating.patch
deleted file mode 100644
index 1afe830091..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0438-usb-xhci-account-for-num_trbs_free-when-invalidating.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 18f08bf8df95c687d6fee3d2bb747cbd2fa0b878 Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.com>
-Date: Thu, 22 Sep 2022 14:55:54 +0100
-Subject: [PATCH] usb: xhci: account for num_trbs_free when
- invalidating TDs
-
-If a ring has a number of TDs enqueued past the dequeue pointer, and the
-URBs corresponding to these TDs are dequeued, then num_trbs_free isn't
-updated to show that these TDs have been converted to no-ops and
-effectively "freed". This means that num_trbs_free creeps downwards
-until the count is exhausted, which then triggers xhci_ring_expansion()
-and effectively leaks memory by infinitely growing the transfer ring.
-
-This is commonly encounted through the use of a usb-serial port where
-the port is repeatedly opened, read, then closed.
-
-Move the num_trbs_free crediting out of the Set TR Dequeue Pointer
-handling and into xhci_invalidate_cancelled_tds().
-
-There is a potential for overestimating the actual space on the ring if
-the ring is nearly full and TDs are arbitrarily enqueued by a device
-driver while it is dequeueing them, but dequeues are usually batched
-during device close/shutdown or endpoint error recovery.
-
-See https://github.com/raspberrypi/linux/issues/5088
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- drivers/usb/host/xhci-ring.c | 14 +++-----------
- 1 file changed, 3 insertions(+), 11 deletions(-)
-
---- a/drivers/usb/host/xhci-ring.c
-+++ b/drivers/usb/host/xhci-ring.c
-@@ -1013,11 +1013,13 @@ static int xhci_invalidate_cancelled_tds
- 						 td->urb->stream_id, td->urb,
- 						 cached_td->urb->stream_id, cached_td->urb);
- 				cached_td = td;
-+				ring->num_trbs_free += td->num_trbs;
- 				break;
- 			}
- 		} else {
- 			td_to_noop(xhci, ring, td, false);
- 			td->cancel_status = TD_CLEARED;
-+			ring->num_trbs_free += td->num_trbs;
- 		}
- 	}
- 
-@@ -1265,10 +1267,7 @@ static void update_ring_for_set_deq_comp
- 		unsigned int ep_index)
- {
- 	union xhci_trb *dequeue_temp;
--	int num_trbs_free_temp;
--	bool revert = false;
- 
--	num_trbs_free_temp = ep_ring->num_trbs_free;
- 	dequeue_temp = ep_ring->dequeue;
- 
- 	/* If we get two back-to-back stalls, and the first stalled transfer
-@@ -1283,8 +1282,6 @@ static void update_ring_for_set_deq_comp
- 	}
- 
- 	while (ep_ring->dequeue != dev->eps[ep_index].queued_deq_ptr) {
--		/* We have more usable TRBs */
--		ep_ring->num_trbs_free++;
- 		ep_ring->dequeue++;
- 		if (trb_is_link(ep_ring->dequeue)) {
- 			if (ep_ring->dequeue ==
-@@ -1294,15 +1291,10 @@ static void update_ring_for_set_deq_comp
- 			ep_ring->dequeue = ep_ring->deq_seg->trbs;
- 		}
- 		if (ep_ring->dequeue == dequeue_temp) {
--			revert = true;
-+			xhci_dbg(xhci, "Unable to find new dequeue pointer\n");
- 			break;
- 		}
- 	}
--
--	if (revert) {
--		xhci_dbg(xhci, "Unable to find new dequeue pointer\n");
--		ep_ring->num_trbs_free = num_trbs_free_temp;
--	}
- }
- 
- /*
diff --git a/target/linux/bcm27xx/patches-6.1/950-0440-drm-panel-Rename-GEM-CMA-helpers-GEM-DMA-helpers.patch b/target/linux/bcm27xx/patches-6.1/950-0440-drm-panel-Rename-GEM-CMA-helpers-GEM-DMA-helpers.patch
deleted file mode 100644
index 14a6b7063f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0440-drm-panel-Rename-GEM-CMA-helpers-GEM-DMA-helpers.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From e305f541c34d109a0c415048f5779179d802e0f4 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 18 Oct 2022 16:36:47 +0100
-Subject: [PATCH] drm/panel: Rename GEM CMA helpers GEM DMA helpers
-
-As a result of [1], DRM_GEM_CMA_HELPER has been replaced by
-DRM_GEM_CMA_HELPER.
-
-[1] 4a83c26a1d87 ("drm/gem: rename GEM CMA helpers to GEM DMA helpers")
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/gpu/drm/panel/Kconfig | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/gpu/drm/panel/Kconfig
-+++ b/drivers/gpu/drm/panel/Kconfig
-@@ -178,7 +178,7 @@ config DRM_PANEL_ILITEK_ILI9806E
- 	tristate "Ilitek ILI9806E-based panels"
- 	depends on OF && SPI
- 	select DRM_KMS_HELPER
--	depends on DRM_GEM_CMA_HELPER
-+	depends on DRM_GEM_DMA_HELPER
- 	depends on BACKLIGHT_CLASS_DEVICE
- 	select DRM_MIPI_DBI
- 	help
-@@ -673,7 +673,7 @@ config DRM_PANEL_TPO_Y17P
- 	tristate "TDO Y17P-based panels"
- 	depends on OF && SPI
- 	select DRM_KMS_HELPER
--	depends on DRM_GEM_CMA_HELPER
-+	depends on DRM_GEM_DMA_HELPER
- 	depends on BACKLIGHT_CLASS_DEVICE
- 	select DRM_MIPI_DBI
- 	help
diff --git a/target/linux/bcm27xx/patches-6.1/950-0441-hwmon-emc2305-fixups-for-driver-submitted-to-mailing.patch b/target/linux/bcm27xx/patches-6.1/950-0441-hwmon-emc2305-fixups-for-driver-submitted-to-mailing.patch
deleted file mode 100644
index abb1eacef2..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0441-hwmon-emc2305-fixups-for-driver-submitted-to-mailing.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From c53aee9d78372213c34f5ebfb084b58be754a23c Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 5 May 2022 15:46:07 +0100
-Subject: [PATCH] hwmon: emc2305: fixups for driver submitted to
- mailing lists
-
-The driver had a number of issues, checkpatch warnings/errors,
-and other limitations, so fix these up to make it usable.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/hwmon/emc2305.c | 73 +++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 71 insertions(+), 2 deletions(-)
-
---- a/drivers/hwmon/emc2305.c
-+++ b/drivers/hwmon/emc2305.c
-@@ -15,12 +15,13 @@
- static const unsigned short
- emc2305_normal_i2c[] = { 0x27, 0x2c, 0x2d, 0x2e, 0x2f, 0x4c, 0x4d, I2C_CLIENT_END };
- 
-+#define EMC2305_REG_FAN_STATUS		0x24
-+#define EMC2305_REG_FAN_STALL_STATUS	0x25
- #define EMC2305_REG_DRIVE_FAIL_STATUS	0x27
- #define EMC2305_REG_VENDOR		0xfe
- #define EMC2305_FAN_MAX			0xff
- #define EMC2305_FAN_MIN			0x00
- #define EMC2305_FAN_MAX_STATE		10
--#define EMC2305_DEVICE			0x34
- #define EMC2305_VENDOR			0x5d
- #define EMC2305_REG_PRODUCT_ID		0xfd
- #define EMC2305_TACH_REGS_UNUSE_BITS	3
-@@ -39,6 +40,7 @@ emc2305_normal_i2c[] = { 0x27, 0x2c, 0x2
- #define EMC2305_RPM_FACTOR		3932160
- 
- #define EMC2305_REG_FAN_DRIVE(n)	(0x30 + 0x10 * (n))
-+#define EMC2305_REG_FAN_CFG(n)		(0x32 + 0x10 * (n))
- #define EMC2305_REG_FAN_MIN_DRIVE(n)	(0x38 + 0x10 * (n))
- #define EMC2305_REG_FAN_TACH(n)		(0x3e + 0x10 * (n))
- 
-@@ -58,6 +60,15 @@ static const struct i2c_device_id emc230
- };
- MODULE_DEVICE_TABLE(i2c, emc2305_ids);
- 
-+static const struct of_device_id emc2305_dt_ids[] = {
-+	{ .compatible = "microchip,emc2305" },
-+	{ .compatible = "microchip,emc2303" },
-+	{ .compatible = "microchip,emc2302" },
-+	{ .compatible = "microchip,emc2301" },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(of, emc2305_dt_ids);
-+
- /**
-  * @cdev: cooling device;
-  * @curr_state: cooling current state;
-@@ -101,6 +112,7 @@ struct emc2305_data {
- 	u8 pwm_num;
- 	bool pwm_separate;
- 	u8 pwm_min[EMC2305_PWM_MAX];
-+	u8 pwm_max;
- 	struct emc2305_cdev_data cdev_data[EMC2305_PWM_MAX];
- };
- 
-@@ -273,7 +285,7 @@ static int emc2305_set_pwm(struct device
- 	struct i2c_client *client = data->client;
- 	int ret;
- 
--	if (val < data->pwm_min[channel] || val > EMC2305_FAN_MAX)
-+	if (val < data->pwm_min[channel] || val > data->pwm_max)
- 		return -EINVAL;
- 
- 	ret = i2c_smbus_write_byte_data(client, EMC2305_REG_FAN_DRIVE(channel), val);
-@@ -284,6 +296,49 @@ static int emc2305_set_pwm(struct device
- 	return 0;
- }
- 
-+static int emc2305_get_tz_of(struct device *dev)
-+{
-+	struct device_node *np = dev->of_node;
-+	struct emc2305_data *data = dev_get_drvdata(dev);
-+	int ret = 0;
-+	u32 val;
-+	int i;
-+
-+	/* OF parameters are optional - overwrite default setting
-+	 * if some of them are provided.
-+	 */
-+
-+	ret = of_property_read_u32(np, "emc2305,cooling-levels", &val);
-+	if (!ret)
-+		data->max_state = (u8)val;
-+	else if (ret != -EINVAL)
-+		return ret;
-+
-+	ret = of_property_read_u32(np, "emc2305,pwm-max", &val);
-+	if (!ret)
-+		data->pwm_max = (u8)val;
-+	else if (ret != -EINVAL)
-+		return ret;
-+
-+	ret = of_property_read_u32(np, "emc2305,pwm-min", &val);
-+	if (!ret)
-+		for (i = 0; i < EMC2305_PWM_MAX; i++)
-+			data->pwm_min[i] = (u8)val;
-+	else if (ret != -EINVAL)
-+		return ret;
-+
-+	/* Not defined or 0 means one thermal zone over all cooling devices.
-+	 * Otherwise - separated thermal zones for each PWM channel.
-+	 */
-+	ret = of_property_read_u32(np, "emc2305,pwm-channel", &val);
-+	if (!ret)
-+		data->pwm_separate = (val != 0);
-+	else if (ret != -EINVAL)
-+		return ret;
-+
-+	return 0;
-+}
-+
- static int emc2305_set_single_tz(struct device *dev, int idx)
- {
- 	struct emc2305_data *data = dev_get_drvdata(dev);
-@@ -572,11 +627,18 @@ static int emc2305_probe(struct i2c_clie
- 		data->pwm_separate = pdata->pwm_separate;
- 		for (i = 0; i < EMC2305_PWM_MAX; i++)
- 			data->pwm_min[i] = pdata->pwm_min[i];
-+		data->pwm_max = EMC2305_FAN_MAX;
- 	} else {
- 		data->max_state = EMC2305_FAN_MAX_STATE;
- 		data->pwm_separate = false;
- 		for (i = 0; i < EMC2305_PWM_MAX; i++)
- 			data->pwm_min[i] = EMC2305_FAN_MIN;
-+		data->pwm_max = EMC2305_FAN_MAX;
-+		if (dev->of_node) {
-+			ret = emc2305_get_tz_of(dev);
-+			if (ret < 0)
-+				return ret;
-+		}
- 	}
- 
- 	data->hwmon_dev = devm_hwmon_device_register_with_info(dev, "emc2305", data,
-@@ -597,6 +659,12 @@ static int emc2305_probe(struct i2c_clie
- 			return ret;
- 	}
- 
-+	/* Acknowledge any existing faults. Stops the device responding on the
-+	 * SMBus alert address.
-+	 */
-+	i2c_smbus_read_byte_data(client, EMC2305_REG_FAN_STALL_STATUS);
-+	i2c_smbus_read_byte_data(client, EMC2305_REG_FAN_STATUS);
-+
- 	return 0;
- }
- 
-@@ -612,6 +680,7 @@ static struct i2c_driver emc2305_driver
- 	.class  = I2C_CLASS_HWMON,
- 	.driver = {
- 		.name = "emc2305",
-+		.of_match_table = emc2305_dt_ids,
- 	},
- 	.probe    = emc2305_probe,
- 	.remove	  = emc2305_remove,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0442-media-bcm2835-unicam-Fix-up-start-stop-api-change.patch b/target/linux/bcm27xx/patches-6.1/950-0442-media-bcm2835-unicam-Fix-up-start-stop-api-change.patch
deleted file mode 100644
index d7b56e9d54..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0442-media-bcm2835-unicam-Fix-up-start-stop-api-change.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From bfaa98808955e8f1984a1fee7bdc31add1ea72a7 Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Mon, 24 Oct 2022 13:57:23 +0100
-Subject: [PATCH] media: bcm2835-unicam: Fix up start/stop api change
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/media/platform/bcm2835/bcm2835-unicam.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
-+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -2524,7 +2524,7 @@ static int unicam_start_streaming(struct
- 		goto err_streaming;
- 	}
- 
--	ret = media_pipeline_start(&node->video_dev.entity, &node->pipe);
-+	ret = media_pipeline_start(node->video_dev.entity.pads, &node->pipe);
- 	if (ret < 0) {
- 		unicam_err(dev, "Failed to start media pipeline: %d\n", ret);
- 		goto err_pm_put;
-@@ -2618,7 +2618,7 @@ err_vpu_clock:
- 		unicam_err(dev, "failed to reset the VPU clock\n");
- 	clk_disable_unprepare(dev->vpu_clock);
- error_pipeline:
--	media_pipeline_stop(&node->video_dev.entity);
-+	media_pipeline_stop(node->video_dev.entity.pads);
- err_pm_put:
- 	unicam_runtime_put(dev);
- err_streaming:
-@@ -2646,7 +2646,7 @@ static void unicam_stop_streaming(struct
- 
- 		unicam_disable(dev);
- 
--		media_pipeline_stop(&node->video_dev.entity);
-+		media_pipeline_stop(node->video_dev.entity.pads);
- 
- 		if (dev->clocks_enabled) {
- 			if (clk_set_min_rate(dev->vpu_clock, 0))
diff --git a/target/linux/bcm27xx/patches-6.1/950-0443-drivers-usb-dwc_otg-fix-reference-passing-when-check.patch b/target/linux/bcm27xx/patches-6.1/950-0443-drivers-usb-dwc_otg-fix-reference-passing-when-check.patch
deleted file mode 100644
index ffe3c4f955..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0443-drivers-usb-dwc_otg-fix-reference-passing-when-check.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 366250d6009a093ad8843a3721148aad7b45b291 Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.com>
-Date: Tue, 25 Oct 2022 10:50:10 +0100
-Subject: [PATCH] drivers: usb: dwc_otg: fix reference passing when
- checking bandwidth
-
-The pointer (struct usb_host_endpoint *)->hcpriv should contain a
-reference to dwc_otg_qh_t if the driver has already seen a URB submitted
-to this endpoint.
-
-It then checks whether the qh exists and is already in a schedule in
-order to decide whether to allocate periodic bandwidth or not. Passing a
-pointer to an offset inside of struct usb_host_endpoint instead of just
-the pointer means it dereferences bogus addresses.
-
-Rationalise (delete) a variable while we're at it.
-
-See https://github.com/raspberrypi/linux/issues/5189
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
---- a/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
-@@ -807,7 +807,6 @@ static int dwc_otg_urb_enqueue(struct us
- 	struct usb_host_endpoint *ep = urb->ep;
- #endif
- 	dwc_irqflags_t irqflags;
--        void **ref_ep_hcpriv = &ep->hcpriv;
- 	dwc_otg_hcd_t *dwc_otg_hcd = hcd_to_dwc_otg_hcd(hcd);
- 	dwc_otg_hcd_urb_t *dwc_otg_urb;
- 	int i;
-@@ -824,7 +823,7 @@ static int dwc_otg_urb_enqueue(struct us
- 	if ((usb_pipetype(urb->pipe) == PIPE_ISOCHRONOUS)
- 	    || (usb_pipetype(urb->pipe) == PIPE_INTERRUPT)) {
- 		if (!dwc_otg_hcd_is_bandwidth_allocated
--		    (dwc_otg_hcd, ref_ep_hcpriv)) {
-+		    (dwc_otg_hcd, ep->hcpriv)) {
- 			alloc_bandwidth = 1;
- 		}
- 	}
-@@ -910,13 +909,12 @@ static int dwc_otg_urb_enqueue(struct us
- #endif
- 	{
- 		retval = dwc_otg_hcd_urb_enqueue(dwc_otg_hcd, dwc_otg_urb,
--						/*(dwc_otg_qh_t **)*/
--						ref_ep_hcpriv, 1);
-+						&ep->hcpriv, 1);
- 		if (0 == retval) {
- 			if (alloc_bandwidth) {
- 				allocate_bus_bandwidth(hcd,
- 						dwc_otg_hcd_get_ep_bandwidth(
--							dwc_otg_hcd, *ref_ep_hcpriv),
-+							dwc_otg_hcd, ep->hcpriv),
- 						urb);
- 			}
- 		} else {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0444-drivers-gpu-drm-vc4-Add-missing-32-bit-RGB-formats.patch b/target/linux/bcm27xx/patches-6.1/950-0444-drivers-gpu-drm-vc4-Add-missing-32-bit-RGB-formats.patch
deleted file mode 100644
index 8f8e0184b7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0444-drivers-gpu-drm-vc4-Add-missing-32-bit-RGB-formats.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From bfdb79d68e27c16a8b3ef43e77f95958774d1bd1 Mon Sep 17 00:00:00 2001
-From: David Plowman <david.plowman@raspberrypi.com>
-Date: Mon, 17 Oct 2022 15:18:24 +0100
-Subject: [PATCH] drivers/gpu/drm/vc4: Add missing 32-bit RGB formats
-
-The missing 32-bit per pixel ABGR and various "RGB with an X value"
-formats are added. Change sent by Dave Stevenson.
-
-Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_firmware_kms.c | 28 +++++++++++++++-----------
- 1 file changed, 16 insertions(+), 12 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-+++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-@@ -184,18 +184,22 @@ static const struct vc_image_format {
- 		.drm = DRM_FORMAT_ARGB8888,
- 		.vc_image = VC_IMAGE_ARGB8888,
- 	},
--/*
-- *	FIXME: Need to resolve which DRM format goes to which vc_image format
-- *	for the remaining RGBA and RGBX formats.
-- *	{
-- *		.drm = DRM_FORMAT_ABGR8888,
-- *		.vc_image = VC_IMAGE_RGBA8888,
-- *	},
-- *	{
-- *		.drm = DRM_FORMAT_XBGR8888,
-- *		.vc_image = VC_IMAGE_RGBA8888,
-- *	},
-- */
-+	{
-+		.drm = DRM_FORMAT_XBGR8888,
-+		.vc_image = VC_IMAGE_RGBX32,
-+	},
-+	{
-+		.drm = DRM_FORMAT_ABGR8888,
-+		.vc_image = VC_IMAGE_RGBA32,
-+	},
-+	{
-+		.drm = DRM_FORMAT_RGBX8888,
-+		.vc_image = VC_IMAGE_BGRX8888,
-+	},
-+	{
-+		.drm = DRM_FORMAT_BGRX8888,
-+		.vc_image = VC_IMAGE_RGBX8888,
-+	},
- 	{
- 		.drm = DRM_FORMAT_RGB565,
- 		.vc_image = VC_IMAGE_RGB565,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0445-overlays-Add-i2c-sensor-support-for-AHT10.patch b/target/linux/bcm27xx/patches-6.1/950-0445-overlays-Add-i2c-sensor-support-for-AHT10.patch
deleted file mode 100644
index 30be68169f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0445-overlays-Add-i2c-sensor-support-for-AHT10.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 028a15d99246ddf1ac126586a5680faab59e6a86 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 25 Oct 2022 20:27:00 +0100
-Subject: [PATCH] overlays: Add i2c-sensor support for AHT10
-
-Add support for the Aosong AHT10 temperature and humidity sensor.
-
-See: https://github.com/raspberrypi/linux/issues/5222
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/README                 |  3 +++
- arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi | 15 +++++++++++++++
- 2 files changed, 18 insertions(+)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -1933,6 +1933,9 @@ Params: addr                    Set the
-                                 BMP280, CCS811, DS1621, HDC100X, LM75, SHT3x or
-                                 TMP102
- 
-+        aht10                   Select the Aosong AHT10 temperature and humidity
-+                                sensor
-+
-         bh1750                  Select the Rohm BH1750 ambient light sensor
-                                 Valid addresses 0x23 or 0x5c, default 0x23
- 
---- a/arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi
-+++ b/arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi
-@@ -309,6 +309,20 @@
- 		};
- 	};
- 
-+	fragment@20 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			aht10: aht10@38 {
-+				compatible = "aosong,aht10";
-+				reg = <0x38>;
-+			};
-+		};
-+	};
-+
- 	__overrides__ {
- 		bme280 = <0>,"+0";
- 		bmp085 = <0>,"+1";
-@@ -331,6 +345,7 @@
- 		ccs811 = <0>, "+17";
- 		bh1750 = <0>, "+18";
- 		max30102 = <0>,"+19";
-+		aht10 = <0>,"+20";
- 
- 		addr =  <&bme280>,"reg:0", <&bmp280>,"reg:0", <&tmp102>,"reg:0",
- 			<&lm75>,"reg:0", <&hdc100x>,"reg:0", <&sht3x>,"reg:0",
diff --git a/target/linux/bcm27xx/patches-6.1/950-0446-overlays-Add-README-entry-for-i2c-rtc-rv3032.patch b/target/linux/bcm27xx/patches-6.1/950-0446-overlays-Add-README-entry-for-i2c-rtc-rv3032.patch
deleted file mode 100644
index 1dc4bb6a57..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0446-overlays-Add-README-entry-for-i2c-rtc-rv3032.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From dd2870ac96dd1cc5234ba674f4ea5a0e408235d5 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 25 Oct 2022 20:08:51 +0100
-Subject: [PATCH] overlays: Add README entry for i2c-rtc,rv3032
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/README | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -1808,6 +1808,8 @@ Params: abx80x                  Select o
- 
-         rv3028                  Select the Micro Crystal RV3028 device
- 
-+        rv3032                  Select the Micro Crystal RV3032 device
-+
-         rv8803                  Select the Micro Crystal RV8803 device
- 
-         sd3078                  Select the ZXW Shenzhen whwave SD3078 device
-@@ -1892,6 +1894,8 @@ Params: abx80x                  Select o
- 
-         rv3028                  Select the Micro Crystal RV3028 device
- 
-+        rv3032                  Select the Micro Crystal RV3032 device
-+
-         rv8803                  Select the Micro Crystal RV8803 device
- 
-         sd3078                  Select the ZXW Shenzhen whwave SD3078 device
diff --git a/target/linux/bcm27xx/patches-6.1/950-0447-drivers-dwc_otg-stop-GCC-from-patching-FIQ-functions.patch b/target/linux/bcm27xx/patches-6.1/950-0447-drivers-dwc_otg-stop-GCC-from-patching-FIQ-functions.patch
deleted file mode 100644
index f017549ee5..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0447-drivers-dwc_otg-stop-GCC-from-patching-FIQ-functions.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 63c794845de126d36d75c7d992fa2e5221651b1b Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.com>
-Date: Wed, 26 Oct 2022 17:46:44 +0100
-Subject: [PATCH] drivers: dwc_otg: stop GCC from patching FIQ
- functions
-
-Configuring GCC to use task stack protector canaries means it will
-insert calls to check functions in FIQ code. This is bad, as a) the
-FIQ's stack is banked and b) the failure invokes __stack_chk_fail which
-eventually tries to call printk(). Printing to the console inside the
-FIQ is generally fatal.
-
-Add CFLAGS to stop this happening in FIQ code.
-
-Also catch one function where notrace wasn't specified.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- drivers/usb/host/dwc_otg/Makefile          | 1 +
- drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/usb/host/dwc_otg/Makefile
-+++ b/drivers/usb/host/dwc_otg/Makefile
-@@ -28,6 +28,7 @@ ccflags-y   	+= -DDWC_LINUX
- ccflags-y   	+= $(CFI)
- ccflags-y	+= $(BUS_INTERFACE)
- #ccflags-y	+= -DDWC_DEV_SRPCAP
-+CFLAGS_dwc_otg_fiq_fsm.o += -fno-stack-protector
- 
- obj-$(CONFIG_USB_DWCOTG) += dwc_otg.o
- 
---- a/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c
-@@ -142,7 +142,7 @@ inline void fiq_fsm_spin_unlock(fiq_lock
-  * fiq_fsm_restart_channel() - Poke channel enable bit for a split transaction
-  * @channel: channel to re-enable
-  */
--static void fiq_fsm_restart_channel(struct fiq_state *st, int n, int force)
-+static void notrace fiq_fsm_restart_channel(struct fiq_state *st, int n, int force)
- {
- 	hcchar_data_t hcchar = { .d32 = FIQ_READ(st->dwc_regs_base + HC_START + (HC_OFFSET * n) + HCCHAR) };
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0448-overlays-i2c-sensor-Add-mcp980x-support.patch b/target/linux/bcm27xx/patches-6.1/950-0448-overlays-i2c-sensor-Add-mcp980x-support.patch
deleted file mode 100644
index a43886ea9e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0448-overlays-i2c-sensor-Add-mcp980x-support.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 4fdc12dae89db7fd02bfbef1a15a0b78263a7764 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 1 Nov 2022 08:47:21 +0000
-Subject: [PATCH] overlays: i2c-sensor: Add mcp980x support
-
-See: https://github.com/raspberrypi/linux/issues/5234
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/README               |  4 ++++
- .../boot/dts/overlays/i2c-sensor-common.dtsi    | 17 ++++++++++++++++-
- 2 files changed, 20 insertions(+), 1 deletion(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -1981,6 +1981,10 @@ Params: addr                    Set the
-         max30102                Select the Maxim Integrated MAX30102 heart-rate
-                                 and blood-oxygen sensor
- 
-+        mcp980x                 Select the Maxim MCP980x range of temperature
-+                                sensors (e.g. MCP9808).
-+                                Valid addresses are 0x18-0x1f (default 0x18)
-+
-         sht3x                   Select the Sensiron SHT3x temperature and
-                                 humidity sensor. Valid addresses 0x44-0x45,
-                                 default 0x44
---- a/arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi
-+++ b/arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi
-@@ -323,6 +323,20 @@
- 		};
- 	};
- 
-+	fragment@21 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			mcp980x: mcp980x@18 {
-+				compatible = "maxim,mcp980x";
-+				reg = <0x18>;
-+			};
-+		};
-+	};
-+
- 	__overrides__ {
- 		bme280 = <0>,"+0";
- 		bmp085 = <0>,"+1";
-@@ -346,11 +360,12 @@
- 		bh1750 = <0>, "+18";
- 		max30102 = <0>,"+19";
- 		aht10 = <0>,"+20";
-+		mcp980x = <0>,"+21";
- 
- 		addr =  <&bme280>,"reg:0", <&bmp280>,"reg:0", <&tmp102>,"reg:0",
- 			<&lm75>,"reg:0", <&hdc100x>,"reg:0", <&sht3x>,"reg:0",
- 			<&ds1621>,"reg:0", <&bme680>,"reg:0", <&ccs811>,"reg:0",
--			<&bh1750>,"reg:0";
-+			<&bh1750>,"reg:0", <&mcp980x>,"reg:0";
- 		int_pin = <&max30102>, "interrupts:0";
- 	};
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0449-overlays-pisound-Make-button-pins-owned-by-card.patch b/target/linux/bcm27xx/patches-6.1/950-0449-overlays-pisound-Make-button-pins-owned-by-card.patch
deleted file mode 100644
index fbdb8ba209..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0449-overlays-pisound-Make-button-pins-owned-by-card.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 028e7d32c62c7cd277b23990d29fc71e43f1f66b Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 2 Nov 2022 09:54:39 +0000
-Subject: [PATCH] overlays: pisound: Make button pins owned by card
-
-The pisound overlay claims a number of GPIOs using a pinctrl node, but
-for some reason hangs this claim on the main gpio node. This obscures
-the ownership of the pins (as shown by gpioinfo and in the kernel logs)
-and isn't scalable - only one overlay can use the trick at a time.
-
-Change the overlay to make the pin ownership clear and avoid any future
-conflicts, removing a bogus claim on pins_spi0 at the same time.
-
-See: https://github.com/raspberrypi/linux/issues/5235
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/pisound-overlay.dts | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/pisound-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/pisound-overlay.dts
-@@ -55,8 +55,6 @@
- 			pisound_spi: pisound_spi@0{
- 				compatible = "blokaslabs,pisound-spi";
- 				reg = <0>;
--				pinctrl-names = "default";
--				pinctrl-0 = <&spi0_pins>;
- 				spi-max-frequency = <1000000>;
- 			};
- 		};
-@@ -80,6 +78,7 @@
- 			i2s-controller = <&i2s>;
- 			status = "okay";
- 
-+			pinctrl-names = "default";
- 			pinctrl-0 = <&pisound_button_pins>;
- 
- 			osr-gpios =
-@@ -100,9 +99,6 @@
- 	fragment@6 {
- 		target = <&gpio>;
- 		__overlay__ {
--			pinctrl-names = "default";
--			pinctrl-0 = <&pisound_button_pins>;
--
- 			pisound_button_pins: pisound_button_pins {
- 				brcm,pins = <17>;
- 				brcm,function = <0>; // Input
diff --git a/target/linux/bcm27xx/patches-6.1/950-0450-firmware-raspberrypi-Introduce-rpi_firmware_find_nod.patch b/target/linux/bcm27xx/patches-6.1/950-0450-firmware-raspberrypi-Introduce-rpi_firmware_find_nod.patch
deleted file mode 100644
index 742b9d2858..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0450-firmware-raspberrypi-Introduce-rpi_firmware_find_nod.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 7069072c10f54de136613947a5b82f504e5f8478 Mon Sep 17 00:00:00 2001
-From: "maxime@cerno.tech" <maxime@cerno.tech>
-Date: Thu, 20 Oct 2022 11:12:09 +0200
-Subject: [PATCH] firmware: raspberrypi: Introduce
- rpi_firmware_find_node()
-
-A significant number of RaspberryPi drivers using the firmware don't
-have a phandle to it, so end up scanning the device tree to find a node
-with the firmware compatible.
-
-That code is duplicated everywhere, so let's introduce a helper instead.
-
-Link: https://lore.kernel.org/r/20220815-rpi-fix-4k-60-v4-1-a1b40526df3e@cerno.tech
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/firmware/raspberrypi.c             | 18 ++++++++++++------
- include/soc/bcm2835/raspberrypi-firmware.h |  7 +++++++
- 2 files changed, 19 insertions(+), 6 deletions(-)
-
---- a/drivers/firmware/raspberrypi.c
-+++ b/drivers/firmware/raspberrypi.c
-@@ -430,6 +430,18 @@ static int rpi_firmware_remove(struct pl
- 	return 0;
- }
- 
-+static const struct of_device_id rpi_firmware_of_match[] = {
-+	{ .compatible = "raspberrypi,bcm2835-firmware", },
-+	{},
-+};
-+MODULE_DEVICE_TABLE(of, rpi_firmware_of_match);
-+
-+struct device_node *rpi_firmware_find_node(void)
-+{
-+	return of_find_matching_node(NULL, rpi_firmware_of_match);
-+}
-+EXPORT_SYMBOL_GPL(rpi_firmware_find_node);
-+
- /**
-  * rpi_firmware_get - Get pointer to rpi_firmware structure.
-  * @firmware_node:    Pointer to the firmware Device Tree node.
-@@ -485,12 +497,6 @@ struct rpi_firmware *devm_rpi_firmware_g
- }
- EXPORT_SYMBOL_GPL(devm_rpi_firmware_get);
- 
--static const struct of_device_id rpi_firmware_of_match[] = {
--	{ .compatible = "raspberrypi,bcm2835-firmware", },
--	{},
--};
--MODULE_DEVICE_TABLE(of, rpi_firmware_of_match);
--
- static struct platform_driver rpi_firmware_driver = {
- 	.driver = {
- 		.name = "raspberrypi-firmware",
---- a/include/soc/bcm2835/raspberrypi-firmware.h
-+++ b/include/soc/bcm2835/raspberrypi-firmware.h
-@@ -168,6 +168,7 @@ int rpi_firmware_property(struct rpi_fir
- int rpi_firmware_property_list(struct rpi_firmware *fw,
- 			       void *data, size_t tag_size);
- void rpi_firmware_put(struct rpi_firmware *fw);
-+struct device_node *rpi_firmware_find_node(void);
- struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node);
- struct rpi_firmware *devm_rpi_firmware_get(struct device *dev,
- 					   struct device_node *firmware_node);
-@@ -185,6 +186,12 @@ static inline int rpi_firmware_property_
- }
- 
- static inline void rpi_firmware_put(struct rpi_firmware *fw) { }
-+
-+static inline struct device_node *rpi_firmware_find_node(void)
-+{
-+	return NULL;
-+}
-+
- static inline struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node)
- {
- 	return NULL;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0451-firmware-raspberrypi-Move-the-clock-IDs-to-the-firmw.patch b/target/linux/bcm27xx/patches-6.1/950-0451-firmware-raspberrypi-Move-the-clock-IDs-to-the-firmw.patch
deleted file mode 100644
index 0b474a5d54..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0451-firmware-raspberrypi-Move-the-clock-IDs-to-the-firmw.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 9f520509f20c5c56a0e092c5fb3c991d02420672 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Tue, 20 Sep 2022 13:43:19 +0200
-Subject: [PATCH] firmware: raspberrypi: Move the clock IDs to the
- firmware header
-
-We'll need the clock IDs in more drivers than just the clock driver from
-now on, so let's move them in the firmware header.
-
-Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-Acked-by: Stephen Boyd <sboyd@kernel.org>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/clk/bcm/clk-raspberrypi.c          | 19 -------------------
- include/soc/bcm2835/raspberrypi-firmware.h | 19 +++++++++++++++++++
- 2 files changed, 19 insertions(+), 19 deletions(-)
-
---- a/drivers/clk/bcm/clk-raspberrypi.c
-+++ b/drivers/clk/bcm/clk-raspberrypi.c
-@@ -18,25 +18,6 @@
- 
- #include <soc/bcm2835/raspberrypi-firmware.h>
- 
--enum rpi_firmware_clk_id {
--	RPI_FIRMWARE_EMMC_CLK_ID = 1,
--	RPI_FIRMWARE_UART_CLK_ID,
--	RPI_FIRMWARE_ARM_CLK_ID,
--	RPI_FIRMWARE_CORE_CLK_ID,
--	RPI_FIRMWARE_V3D_CLK_ID,
--	RPI_FIRMWARE_H264_CLK_ID,
--	RPI_FIRMWARE_ISP_CLK_ID,
--	RPI_FIRMWARE_SDRAM_CLK_ID,
--	RPI_FIRMWARE_PIXEL_CLK_ID,
--	RPI_FIRMWARE_PWM_CLK_ID,
--	RPI_FIRMWARE_HEVC_CLK_ID,
--	RPI_FIRMWARE_EMMC2_CLK_ID,
--	RPI_FIRMWARE_M2MC_CLK_ID,
--	RPI_FIRMWARE_PIXEL_BVB_CLK_ID,
--	RPI_FIRMWARE_VEC_CLK_ID,
--	RPI_FIRMWARE_NUM_CLK_ID,
--};
--
- static char *rpi_firmware_clk_names[] = {
- 	[RPI_FIRMWARE_EMMC_CLK_ID]	= "emmc",
- 	[RPI_FIRMWARE_UART_CLK_ID]	= "uart",
---- a/include/soc/bcm2835/raspberrypi-firmware.h
-+++ b/include/soc/bcm2835/raspberrypi-firmware.h
-@@ -160,6 +160,25 @@ enum rpi_firmware_property_tag {
- 	RPI_FIRMWARE_GET_DMA_CHANNELS =                       0x00060001,
- };
- 
-+enum rpi_firmware_clk_id {
-+	RPI_FIRMWARE_EMMC_CLK_ID = 1,
-+	RPI_FIRMWARE_UART_CLK_ID,
-+	RPI_FIRMWARE_ARM_CLK_ID,
-+	RPI_FIRMWARE_CORE_CLK_ID,
-+	RPI_FIRMWARE_V3D_CLK_ID,
-+	RPI_FIRMWARE_H264_CLK_ID,
-+	RPI_FIRMWARE_ISP_CLK_ID,
-+	RPI_FIRMWARE_SDRAM_CLK_ID,
-+	RPI_FIRMWARE_PIXEL_CLK_ID,
-+	RPI_FIRMWARE_PWM_CLK_ID,
-+	RPI_FIRMWARE_HEVC_CLK_ID,
-+	RPI_FIRMWARE_EMMC2_CLK_ID,
-+	RPI_FIRMWARE_M2MC_CLK_ID,
-+	RPI_FIRMWARE_PIXEL_BVB_CLK_ID,
-+	RPI_FIRMWARE_VEC_CLK_ID,
-+	RPI_FIRMWARE_NUM_CLK_ID,
-+};
-+
- #define GET_DISPLAY_SETTINGS_PAYLOAD_SIZE 64
- 
- #if IS_ENABLED(CONFIG_RASPBERRYPI_FIRMWARE)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0452-firmware-raspberrypi-Provide-a-helper-to-query-a-clo.patch b/target/linux/bcm27xx/patches-6.1/950-0452-firmware-raspberrypi-Provide-a-helper-to-query-a-clo.patch
deleted file mode 100644
index d5ac2e941f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0452-firmware-raspberrypi-Provide-a-helper-to-query-a-clo.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 4c64053e0646f66463bded712d7e6975757cf4c2 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Tue, 20 Sep 2022 13:49:10 +0200
-Subject: [PATCH] firmware: raspberrypi: Provide a helper to query a
- clock max rate
-
-The firmware allows to query for its clocks the operating range of a
-given clock. We'll need this for some drivers (KMS, in particular) to
-infer the state of some configuration options, so let's create a
-function to do so.
-
-Acked-by: Stephen Boyd <sboyd@kernel.org>
-Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/firmware/raspberrypi.c             | 20 +++++++++++++++++
- include/soc/bcm2835/raspberrypi-firmware.h | 26 ++++++++++++++++++++++
- 2 files changed, 46 insertions(+)
-
---- a/drivers/firmware/raspberrypi.c
-+++ b/drivers/firmware/raspberrypi.c
-@@ -343,6 +343,26 @@ static void rpi_register_clk_driver(stru
- 						-1, NULL, 0);
- }
- 
-+unsigned int rpi_firmware_clk_get_max_rate(struct rpi_firmware *fw, unsigned int id)
-+{
-+	struct rpi_firmware_clk_rate_request msg =
-+		RPI_FIRMWARE_CLK_RATE_REQUEST(id);
-+	int ret;
-+
-+	ret = rpi_firmware_property(fw, RPI_FIRMWARE_GET_MAX_CLOCK_RATE,
-+				    &msg, sizeof(msg));
-+	if (ret)
-+		/*
-+		 * If our firmware doesn't support that operation, or fails, we
-+		 * assume the maximum clock rate is absolute maximum we can
-+		 * store over our type.
-+		 */
-+		 return UINT_MAX;
-+
-+	return le32_to_cpu(msg.rate);
-+}
-+EXPORT_SYMBOL_GPL(rpi_firmware_clk_get_max_rate);
-+
- static void rpi_firmware_delete(struct kref *kref)
- {
- 	struct rpi_firmware *fw = container_of(kref, struct rpi_firmware,
---- a/include/soc/bcm2835/raspberrypi-firmware.h
-+++ b/include/soc/bcm2835/raspberrypi-firmware.h
-@@ -181,12 +181,32 @@ enum rpi_firmware_clk_id {
- 
- #define GET_DISPLAY_SETTINGS_PAYLOAD_SIZE 64
- 
-+/**
-+ * struct rpi_firmware_clk_rate_request - Firmware Request for a rate
-+ * @id:	ID of the clock being queried
-+ * @rate: Rate in Hertz. Set by the firmware.
-+ *
-+ * Used by @RPI_FIRMWARE_GET_CLOCK_RATE, @RPI_FIRMWARE_GET_CLOCK_MEASURED,
-+ * @RPI_FIRMWARE_GET_MAX_CLOCK_RATE and @RPI_FIRMWARE_GET_MIN_CLOCK_RATE.
-+ */
-+struct rpi_firmware_clk_rate_request {
-+	__le32 id;
-+	__le32 rate;
-+} __packed;
-+
-+#define RPI_FIRMWARE_CLK_RATE_REQUEST(_id)	\
-+	{					\
-+		.id = _id,			\
-+	}
-+
- #if IS_ENABLED(CONFIG_RASPBERRYPI_FIRMWARE)
- int rpi_firmware_property(struct rpi_firmware *fw,
- 			  u32 tag, void *data, size_t len);
- int rpi_firmware_property_list(struct rpi_firmware *fw,
- 			       void *data, size_t tag_size);
- void rpi_firmware_put(struct rpi_firmware *fw);
-+unsigned int rpi_firmware_clk_get_max_rate(struct rpi_firmware *fw,
-+					   unsigned int id);
- struct device_node *rpi_firmware_find_node(void);
- struct rpi_firmware *rpi_firmware_get(struct device_node *firmware_node);
- struct rpi_firmware *devm_rpi_firmware_get(struct device *dev,
-@@ -206,6 +226,12 @@ static inline int rpi_firmware_property_
- 
- static inline void rpi_firmware_put(struct rpi_firmware *fw) { }
- 
-+static inline unsigned int rpi_firmware_clk_get_max_rate(struct rpi_firmware *fw,
-+							 unsigned int id)
-+{
-+	return UINT_MAX;
-+}
-+
- static inline struct device_node *rpi_firmware_find_node(void)
- {
- 	return NULL;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0453-drm-vc4-hdmi-Fix-hdmi_enable_4kp60-detection.patch b/target/linux/bcm27xx/patches-6.1/950-0453-drm-vc4-hdmi-Fix-hdmi_enable_4kp60-detection.patch
deleted file mode 100644
index be8676e2f2..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0453-drm-vc4-hdmi-Fix-hdmi_enable_4kp60-detection.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 98bd7718d38db5c3e8e8af83f30f9cab0d3c140d Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Thu, 24 Mar 2022 11:57:57 +0100
-Subject: [PATCH] drm/vc4: hdmi: Fix hdmi_enable_4kp60 detection
-
-In order to support higher HDMI frequencies, users have to set the
-hdmi_enable_4kp60 parameter in their config.txt file.
-
-We were detecting this so far by calling clk_round_rate() on the core
-clock with the frequency we're supposed to run at when one of those
-modes is enabled. Whether or not the parameter was enabled could then be
-inferred by the returned rate since the maximum clock rate reported by
-the firmware was one of the side effect of setting that parameter.
-
-However, the recent clock rework we did changed what clk_round_rate()
-was returning to always return the minimum allowed, and thus this test
-wasn't reliable anymore.
-
-Let's use the new clk_get_max_rate() function to reliably determine the
-maximum rate allowed on that clock and fix the 4k@60Hz output.
-
-Fixes: e9d6cea2af1c ("clk: bcm: rpi: Run some clocks at the minimum rate allowed")
-Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_hdmi.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hdmi.c
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -46,6 +46,7 @@
- #include <linux/pm_runtime.h>
- #include <linux/rational.h>
- #include <linux/reset.h>
-+#include <soc/bcm2835/raspberrypi-clocks.h>
- #include <sound/dmaengine_pcm.h>
- #include <sound/hdmi-codec.h>
- #include <sound/pcm_drm_eld.h>
-@@ -3697,7 +3698,7 @@ static int vc4_hdmi_bind(struct device *
- 
- 	if (variant->max_pixel_clock == 600000000) {
- 		struct vc4_dev *vc4 = to_vc4_dev(drm);
--		long max_rate = clk_round_rate(vc4->hvs->core_clk, 550000000);
-+		unsigned int max_rate = rpi_firmware_clk_get_max_rate(vc4->hvs->core_clk);
- 
- 		if (max_rate < 550000000)
- 			vc4_hdmi->disable_4kp60 = true;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0454-drm-vc4-hdmi-Rework-hdmi_enable_4kp60-detection-code.patch b/target/linux/bcm27xx/patches-6.1/950-0454-drm-vc4-hdmi-Rework-hdmi_enable_4kp60-detection-code.patch
deleted file mode 100644
index d8522d4ffa..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0454-drm-vc4-hdmi-Rework-hdmi_enable_4kp60-detection-code.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From 1f8c105adca8bcd42256602e3ef9c1dbd0715e37 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Thu, 24 Mar 2022 11:57:57 +0100
-Subject: [PATCH] drm/vc4: hdmi: Rework hdmi_enable_4kp60 detection
- code
-
-In order to support higher HDMI frequencies, users have to set the
-hdmi_enable_4kp60 parameter in their config.txt file.
-
-This will have the side-effect of raising the maximum of the core clock,
-tied to the HVS, and managed by the HVS driver.
-
-However, we are querying this in the HDMI driver by poking into the HVS
-structure to get our struct clk handle.
-
-Let's make this part of the HVS bind implementation to have all the core
-clock related setup in the same place.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_drv.h  | 10 ++++++++++
- drivers/gpu/drm/vc4/vc4_hdmi.c | 15 ++++-----------
- drivers/gpu/drm/vc4/vc4_hdmi.h |  8 --------
- drivers/gpu/drm/vc4/vc4_hvs.c  | 23 +++++++++++++++++++++++
- 4 files changed, 37 insertions(+), 19 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -331,6 +331,8 @@ struct vc4_hvs {
- 
- 	struct clk *core_clk;
- 
-+	unsigned long max_core_rate;
-+
- 	/* Memory manager for CRTCs to allocate space in the display
- 	 * list.  Units are dwords.
- 	 */
-@@ -342,6 +344,14 @@ struct vc4_hvs {
- 	struct drm_mm_node mitchell_netravali_filter;
- 
- 	struct debugfs_regset32 regset;
-+
-+	/*
-+	 * Even if HDMI0 on the RPi4 can output modes requiring a pixel
-+	 * rate higher than 297MHz, it needs some adjustments in the
-+	 * config.txt file to be able to do so and thus won't always be
-+	 * available.
-+	 */
-+	bool vc5_hdmi_enable_hdmi_20;
- };
- 
- struct vc4_plane {
---- a/drivers/gpu/drm/vc4/vc4_hdmi.c
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -46,7 +46,6 @@
- #include <linux/pm_runtime.h>
- #include <linux/rational.h>
- #include <linux/reset.h>
--#include <soc/bcm2835/raspberrypi-clocks.h>
- #include <sound/dmaengine_pcm.h>
- #include <sound/hdmi-codec.h>
- #include <sound/pcm_drm_eld.h>
-@@ -494,6 +493,7 @@ static int vc4_hdmi_connector_detect_ctx
- static int vc4_hdmi_connector_get_modes(struct drm_connector *connector)
- {
- 	struct vc4_hdmi *vc4_hdmi = connector_to_vc4_hdmi(connector);
-+	struct vc4_dev *vc4 = to_vc4_dev(connector->dev);
- 	int ret = 0;
- 	struct edid *edid;
- 
-@@ -517,7 +517,7 @@ static int vc4_hdmi_connector_get_modes(
- 	ret = drm_add_edid_modes(connector, edid);
- 	kfree(edid);
- 
--	if (vc4_hdmi->disable_4kp60) {
-+	if (!vc4->hvs->vc5_hdmi_enable_hdmi_20) {
- 		struct drm_device *drm = connector->dev;
- 		const struct drm_display_mode *mode;
- 
-@@ -1980,11 +1980,12 @@ vc4_hdmi_encoder_clock_valid(const struc
- {
- 	const struct drm_connector *connector = &vc4_hdmi->connector;
- 	const struct drm_display_info *info = &connector->display_info;
-+	struct vc4_dev *vc4 = to_vc4_dev(connector->dev);
- 
- 	if (clock > vc4_hdmi->variant->max_pixel_clock)
- 		return MODE_CLOCK_HIGH;
- 
--	if (vc4_hdmi->disable_4kp60 && clock > HDMI_14_MAX_TMDS_CLK)
-+	if (!vc4->hvs->vc5_hdmi_enable_hdmi_20 && clock > HDMI_14_MAX_TMDS_CLK)
- 		return MODE_CLOCK_HIGH;
- 
- 	if (info->max_tmds_clock && clock > (info->max_tmds_clock * 1000))
-@@ -3696,14 +3697,6 @@ static int vc4_hdmi_bind(struct device *
- 	vc4_hdmi->disable_wifi_frequencies =
- 		of_property_read_bool(dev->of_node, "wifi-2.4ghz-coexistence");
- 
--	if (variant->max_pixel_clock == 600000000) {
--		struct vc4_dev *vc4 = to_vc4_dev(drm);
--		unsigned int max_rate = rpi_firmware_clk_get_max_rate(vc4->hvs->core_clk);
--
--		if (max_rate < 550000000)
--			vc4_hdmi->disable_4kp60 = true;
--	}
--
- 	ret = devm_pm_runtime_enable(dev);
- 	if (ret)
- 		return ret;
---- a/drivers/gpu/drm/vc4/vc4_hdmi.h
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
-@@ -158,14 +158,6 @@ struct vc4_hdmi {
- 	 */
- 	bool disable_wifi_frequencies;
- 
--	/*
--	 * Even if HDMI0 on the RPi4 can output modes requiring a pixel
--	 * rate higher than 297MHz, it needs some adjustments in the
--	 * config.txt file to be able to do so and thus won't always be
--	 * available.
--	 */
--	bool disable_4kp60;
--
- 	struct cec_adapter *cec_adap;
- 	struct cec_msg cec_rx_msg;
- 	bool cec_tx_ok;
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -28,6 +28,8 @@
- #include <drm/drm_drv.h>
- #include <drm/drm_vblank.h>
- 
-+#include <soc/bcm2835/raspberrypi-firmware.h>
-+
- #include "vc4_drv.h"
- #include "vc4_regs.h"
- 
-@@ -1033,12 +1035,33 @@ static int vc4_hvs_bind(struct device *d
- 	hvs->regset.nregs = ARRAY_SIZE(hvs_regs);
- 
- 	if (vc4->is_vc5) {
-+		struct rpi_firmware *firmware;
-+		struct device_node *node;
-+		unsigned int max_rate;
-+
-+		node = rpi_firmware_find_node();
-+		if (!node)
-+			return -EINVAL;
-+
-+		firmware = rpi_firmware_get(node);
-+		of_node_put(node);
-+		if (!firmware)
-+			return -EPROBE_DEFER;
-+
- 		hvs->core_clk = devm_clk_get(&pdev->dev, NULL);
- 		if (IS_ERR(hvs->core_clk)) {
- 			dev_err(&pdev->dev, "Couldn't get core clock\n");
- 			return PTR_ERR(hvs->core_clk);
- 		}
- 
-+		max_rate = rpi_firmware_clk_get_max_rate(firmware,
-+							 RPI_FIRMWARE_CORE_CLK_ID);
-+		rpi_firmware_put(firmware);
-+		if (max_rate >= 550000000)
-+			hvs->vc5_hdmi_enable_hdmi_20 = true;
-+
-+		hvs->max_core_rate = max_rate;
-+
- 		ret = clk_prepare_enable(hvs->core_clk);
- 		if (ret) {
- 			dev_err(&pdev->dev, "Couldn't enable the core clock\n");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0455-drm-vc4-hdmi-Add-more-checks-for-4k-resolutions.patch b/target/linux/bcm27xx/patches-6.1/950-0455-drm-vc4-hdmi-Add-more-checks-for-4k-resolutions.patch
deleted file mode 100644
index 5c4ae878bb..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0455-drm-vc4-hdmi-Add-more-checks-for-4k-resolutions.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From d3c267836e424c9246a4b174d9bd024cb0f656b4 Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Tue, 17 May 2022 12:46:42 +0100
-Subject: [PATCH] drm/vc4: hdmi: Add more checks for 4k resolutions
-
-At least the 4096x2160@60Hz mode requires some overclocking that isn't
-available by default, even if hdmi_enable_4kp60 is enabled.
-
-Let's add some logic to detect whether we can satisfy the core clock
-requirements for that mode, and prevent it from being used otherwise.
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
-Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_drv.h  |  6 ++++++
- drivers/gpu/drm/vc4/vc4_hdmi.c | 11 +++++++++--
- drivers/gpu/drm/vc4/vc4_hvs.c  |  3 +++
- 3 files changed, 18 insertions(+), 2 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -352,6 +352,12 @@ struct vc4_hvs {
- 	 * available.
- 	 */
- 	bool vc5_hdmi_enable_hdmi_20;
-+
-+	/*
-+	 * 4096x2160@60 requires a core overclock to work, so register
-+	 * whether that is sufficient.
-+	 */
-+	bool vc5_hdmi_enable_4096by2160;
- };
- 
- struct vc4_plane {
---- a/drivers/gpu/drm/vc4/vc4_hdmi.c
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -1976,6 +1976,7 @@ vc4_hdmi_sink_supports_format_bpc(const
- 
- static enum drm_mode_status
- vc4_hdmi_encoder_clock_valid(const struct vc4_hdmi *vc4_hdmi,
-+			     const struct drm_display_mode *mode,
- 			     unsigned long long clock)
- {
- 	const struct drm_connector *connector = &vc4_hdmi->connector;
-@@ -1988,6 +1989,12 @@ vc4_hdmi_encoder_clock_valid(const struc
- 	if (!vc4->hvs->vc5_hdmi_enable_hdmi_20 && clock > HDMI_14_MAX_TMDS_CLK)
- 		return MODE_CLOCK_HIGH;
- 
-+	/* 4096x2160@60 is not reliable without overclocking core */
-+	if (!vc4->hvs->vc5_hdmi_enable_4096by2160 &&
-+	    mode->hdisplay > 3840 && mode->vdisplay >= 2160 &&
-+	    drm_mode_vrefresh(mode) >= 50)
-+		return MODE_CLOCK_HIGH;
-+
- 	if (info->max_tmds_clock && clock > (info->max_tmds_clock * 1000))
- 		return MODE_CLOCK_HIGH;
- 
-@@ -2022,7 +2029,7 @@ vc4_hdmi_encoder_compute_clock(const str
- 	unsigned long long clock;
- 
- 	clock = vc4_hdmi_encoder_compute_mode_clock(mode, bpc, fmt);
--	if (vc4_hdmi_encoder_clock_valid(vc4_hdmi, clock) != MODE_OK)
-+	if (vc4_hdmi_encoder_clock_valid(vc4_hdmi, mode, clock) != MODE_OK)
- 		return -EINVAL;
- 
- 	vc4_state->tmds_char_rate = clock;
-@@ -2185,7 +2192,7 @@ vc4_hdmi_encoder_mode_valid(struct drm_e
- 	     (mode->hsync_end % 2) || (mode->htotal % 2)))
- 		return MODE_H_ILLEGAL;
- 
--	return vc4_hdmi_encoder_clock_valid(vc4_hdmi, mode->clock * 1000);
-+	return vc4_hdmi_encoder_clock_valid(vc4_hdmi, mode, mode->clock * 1000);
- }
- 
- static const struct drm_encoder_helper_funcs vc4_hdmi_encoder_helper_funcs = {
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -1060,6 +1060,9 @@ static int vc4_hvs_bind(struct device *d
- 		if (max_rate >= 550000000)
- 			hvs->vc5_hdmi_enable_hdmi_20 = true;
- 
-+		if (max_rate >= 600000000)
-+			hvs->vc5_hdmi_enable_4096by2160 = true;
-+
- 		hvs->max_core_rate = max_rate;
- 
- 		ret = clk_prepare_enable(hvs->core_clk);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0456-drm-vc4-Make-sure-we-don-t-end-up-with-a-core-clock-.patch b/target/linux/bcm27xx/patches-6.1/950-0456-drm-vc4-Make-sure-we-don-t-end-up-with-a-core-clock-.patch
deleted file mode 100644
index b38cb1f878..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0456-drm-vc4-Make-sure-we-don-t-end-up-with-a-core-clock-.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From adf7289aab83651c41e7734b34844470a25ecc5f Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 25 Mar 2022 17:09:41 +0100
-Subject: [PATCH] drm/vc4: Make sure we don't end up with a core clock
- too high
-
-Following the clock rate range improvements to the clock framework,
-trying to set a disjoint range on a clock will now result in an error.
-
-Thus, we can't set a minimum rate higher than the maximum reported by
-the firmware, or clk_set_min_rate() will fail.
-
-Thus we need to clamp the rate we are about to ask for to the maximum
-rate possible on that clock.
-
-Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_kms.c | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_kms.c
-+++ b/drivers/gpu/drm/vc4/vc4_kms.c
-@@ -399,8 +399,8 @@ static void vc4_atomic_commit_tail(struc
- 	if (vc4->is_vc5 && !vc4->firmware_kms) {
- 		unsigned long state_rate = max(old_hvs_state->core_clock_rate,
- 					       new_hvs_state->core_clock_rate);
--		unsigned long core_rate = max_t(unsigned long,
--						500000000, state_rate);
-+		unsigned long core_rate = clamp_t(unsigned long, state_rate,
-+						  500000000, hvs->max_core_rate);
- 
- 		drm_dbg(dev, "Raising the core clock at %lu Hz\n", core_rate);
- 
-@@ -436,14 +436,17 @@ static void vc4_atomic_commit_tail(struc
- 	drm_atomic_helper_cleanup_planes(dev, state);
- 
- 	if (vc4->is_vc5 && !vc4->firmware_kms) {
--		drm_dbg(dev, "Running the core clock at %lu Hz\n",
--			new_hvs_state->core_clock_rate);
-+		unsigned long core_rate = min_t(unsigned long,
-+						hvs->max_core_rate,
-+						new_hvs_state->core_clock_rate);
-+
-+		drm_dbg(dev, "Running the core clock at %lu Hz\n", core_rate);
- 
- 		/*
- 		 * Request a clock rate based on the current HVS
- 		 * requirements.
- 		 */
--		WARN_ON(clk_set_min_rate(hvs->core_clk, new_hvs_state->core_clock_rate));
-+		WARN_ON(clk_set_min_rate(hvs->core_clk, core_rate));
- 
- 		drm_dbg(dev, "Core clock actual rate: %lu Hz\n",
- 			clk_get_rate(hvs->core_clk));
diff --git a/target/linux/bcm27xx/patches-6.1/950-0457-net-phy-BCM54210PE-does-not-support-PTP.patch b/target/linux/bcm27xx/patches-6.1/950-0457-net-phy-BCM54210PE-does-not-support-PTP.patch
deleted file mode 100644
index 070d33bab7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0457-net-phy-BCM54210PE-does-not-support-PTP.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From b7bdb564eb5b2d0672d0c49d8b6b4c14196f71ca Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Sat, 5 Nov 2022 11:46:08 +0000
-Subject: [PATCH] net: phy: BCM54210PE does not support PTP
-
-BCM54213PE is an Ethernet PHY that supports PTP hardware timestamping.
-BCM54210PW ia another Ethernet PHY, but one without PTP support.
-Unfortunately the two PHYs return the same ID when queried, so some
-extra information is required to determine whether the PHY is PTP-
-capable.
-
-There are two Raspberry Pi products that use these PHYs - Pi 4B and
-CM4 - and fortunately they use different PHY addresses, so use that as
-a differentiator. Choose to treat a PHY with the same ID but another
-address as a BCM54210PE, which seems more common.
-
-See: https://github.com/raspberrypi/linux/issues/5104
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/net/phy/bcm-phy-ptp.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
---- a/drivers/net/phy/bcm-phy-ptp.c
-+++ b/drivers/net/phy/bcm-phy-ptp.c
-@@ -916,6 +916,18 @@ struct bcm_ptp_private *bcm_ptp_probe(st
- 	switch (BRCM_PHY_MODEL(phydev)) {
- 	case PHY_ID_BCM54210E:
- 		break;
-+#ifdef PHY_ID_BCM54213PE
-+	case PHY_ID_BCM54213PE:
-+		switch (phydev->mdio.addr) {
-+		case 0: // CM4 - this is a BCM54210PE which supports PTP
-+			break;
-+		case 1: //  4B - this is a BCM54213PE which doesn't
-+			return NULL;
-+		default: // Unknown - assume it's BCM54210PE
-+			break;
-+		}
-+		break;
-+#endif
- 	default:
- 		return NULL;
- 	}
diff --git a/target/linux/bcm27xx/patches-6.1/950-0458-drm-vc4_hdmi-Allow-hotplug-detect-to-be-forced.patch b/target/linux/bcm27xx/patches-6.1/950-0458-drm-vc4_hdmi-Allow-hotplug-detect-to-be-forced.patch
deleted file mode 100644
index aa52ad983f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0458-drm-vc4_hdmi-Allow-hotplug-detect-to-be-forced.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From d75b03d83ecc46b2f0ea13b7934cf3a093914388 Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Wed, 1 Jun 2022 15:43:51 +0100
-Subject: [PATCH] drm/vc4_hdmi: Allow hotplug detect to be forced
-
-See: https://forum.libreelec.tv/thread/24783-tv-avr-turns-back-on-right-after-turning-them-off
-
-While the kernel provides a :D flag for assuming device is connected,
-it doesn't stop this function from being called and generating a cec_phys_addr_invalidate
-message when hotplug is deasserted.
-
-That message provokes a flurry of CEC messages which for many users results in the TV
-switching back on again and it's very hard to get it to stay switched off.
-
-It seems to only occur with an AVR and TV connected but has been observed across a
-number of manufacturers.
-
-The issue started with https://github.com/raspberrypi/linux/pull/4371
-and this provides an optional way of getting back the old behaviour
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/gpu/drm/vc4/vc4_hdmi.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hdmi.c
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -41,6 +41,8 @@
- #include <linux/component.h>
- #include <linux/gpio/consumer.h>
- #include <linux/i2c.h>
-+#include <linux/module.h>
-+#include <linux/moduleparam.h>
- #include <linux/of_address.h>
- #include <linux/of_platform.h>
- #include <linux/pm_runtime.h>
-@@ -113,6 +115,10 @@
- 
- #define HDMI_14_MAX_TMDS_CLK   (340 * 1000 * 1000)
- 
-+/* bit field to force hotplug detection. bit0 = HDMI0 */
-+static int force_hotplug = 0;
-+module_param(force_hotplug, int, 0644);
-+
- static const char * const output_format_str[] = {
- 	[VC4_HDMI_OUTPUT_RGB]		= "RGB",
- 	[VC4_HDMI_OUTPUT_YUV420]	= "YUV 4:2:0",
-@@ -475,7 +481,9 @@ static int vc4_hdmi_connector_detect_ctx
- 
- 	WARN_ON(pm_runtime_resume_and_get(&vc4_hdmi->pdev->dev));
- 
--	if (vc4_hdmi->hpd_gpio) {
-+	if (force_hotplug & BIT(vc4_hdmi->encoder.type - VC4_ENCODER_TYPE_HDMI0))
-+		status = connector_status_connected;
-+	else if (vc4_hdmi->hpd_gpio) {
- 		if (gpiod_get_value_cansleep(vc4_hdmi->hpd_gpio))
- 			status = connector_status_connected;
- 	} else {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0459-overlays-i2c-sensor-Add-the-jc42-class-of-sensor.patch b/target/linux/bcm27xx/patches-6.1/950-0459-overlays-i2c-sensor-Add-the-jc42-class-of-sensor.patch
deleted file mode 100644
index 543b1e1654..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0459-overlays-i2c-sensor-Add-the-jc42-class-of-sensor.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 2ed7fb7bf15420d80c3b272a3a887e142046b7b2 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 7 Nov 2022 15:31:43 +0000
-Subject: [PATCH] overlays: i2c-sensor: Add the jc42 class of sensor
-
-This is a second attempt to solve issue 5234, since it turns out that
-the mcp980x driver only supports MCP9800-MCP9803. MCP9804, MCP9805 and
-MCP9808 require the jc42 driver.
-
-See: https://github.com/raspberrypi/linux/issues/5234
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/README              | 13 ++++++++++++-
- .../boot/dts/overlays/i2c-sensor-common.dtsi   | 18 +++++++++++++++++-
- 2 files changed, 29 insertions(+), 2 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -1970,6 +1970,15 @@ Params: addr                    Set the
-         int_pin                 Set the GPIO to use for interrupts (max30102
-                                 only)
- 
-+        jc42                    Select any of the many JEDEC JC42.4-compliant
-+                                temperature sensors, including:
-+                                  ADT7408, AT30TS00, CAT34TS02, CAT6095,
-+                                  MAX6604, MCP9804, MCP9805, MCP9808,
-+                                  MCP98242, MCP98243, MCP98244, MCP9843,
-+                                  SE97, SE98, STTS424(E), STTS2002, STTS3000,
-+                                  TSE2002, TSE2004, TS3000, and TS3001.
-+                                The default address is 0x18.
-+
-         lm75                    Select the Maxim LM75 temperature sensor
-                                 Valid addresses 0x48-0x4f, default 0x4f
- 
-@@ -1982,7 +1991,9 @@ Params: addr                    Set the
-                                 and blood-oxygen sensor
- 
-         mcp980x                 Select the Maxim MCP980x range of temperature
--                                sensors (e.g. MCP9808).
-+                                sensors (i.e. MCP9800, MCP9801, MCP9802 and
-+                                MCP9803). N.B. For MCP9804, MCP9805 and MCP9808,
-+                                use the "jc42" option.
-                                 Valid addresses are 0x18-0x1f (default 0x18)
- 
-         sht3x                   Select the Sensiron SHT3x temperature and
---- a/arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi
-+++ b/arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi
-@@ -337,6 +337,21 @@
- 		};
- 	};
- 
-+	fragment@22 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			jc42: jc42@18 {
-+				compatible = "jedec,jc-42.4-temp";
-+				reg = <0x18>;
-+				smbus-timeout-disable;
-+			};
-+		};
-+	};
-+
- 	__overrides__ {
- 		bme280 = <0>,"+0";
- 		bmp085 = <0>,"+1";
-@@ -361,11 +376,12 @@
- 		max30102 = <0>,"+19";
- 		aht10 = <0>,"+20";
- 		mcp980x = <0>,"+21";
-+		jc42 = <0>,"+22";
- 
- 		addr =  <&bme280>,"reg:0", <&bmp280>,"reg:0", <&tmp102>,"reg:0",
- 			<&lm75>,"reg:0", <&hdc100x>,"reg:0", <&sht3x>,"reg:0",
- 			<&ds1621>,"reg:0", <&bme680>,"reg:0", <&ccs811>,"reg:0",
--			<&bh1750>,"reg:0", <&mcp980x>,"reg:0";
-+			<&bh1750>,"reg:0", <&mcp980x>,"reg:0", <&jc42>,"reg:0";
- 		int_pin = <&max30102>, "interrupts:0";
- 	};
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0460-overlays-Extend-audremap-to-supports-other-pins.patch b/target/linux/bcm27xx/patches-6.1/950-0460-overlays-Extend-audremap-to-supports-other-pins.patch
deleted file mode 100644
index 79c833411a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0460-overlays-Extend-audremap-to-supports-other-pins.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 714dd0cab06df74fb47c4b379df332fb0d2ff0de Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 8 Nov 2022 14:40:52 +0000
-Subject: [PATCH] overlays: Extend audremap to supports other pins
-
-Add the parameters pins_40_41 and pins_40_45 to support other audio pin
-options. Also, simplify the overlay using literal assignments.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/README             |  6 ++--
- .../boot/dts/overlays/audremap-overlay.dts    | 29 ++++++-------------
- 2 files changed, 13 insertions(+), 22 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -680,10 +680,12 @@ Info:   Switches PWM sound output to GPI
- Load:   dtoverlay=audremap,<param>=<val>
- Params: swap_lr                 Reverse the channel allocation, which will also
-                                 swap the audio jack outputs (default off)
--        enable_jack             Don't switch off the audio jack output
--                                (default off)
-+        enable_jack             Don't switch off the audio jack output. Does
-+                                nothing on BCM2711 (default off)
-         pins_12_13              Select GPIOs 12 & 13 (default)
-         pins_18_19              Select GPIOs 18 & 19
-+        pins_40_41              Select GPIOs 40 & 41
-+        pins_40_45              Select GPIOs 40 & 45
- 
- 
- Name:   balena-fin
---- a/arch/arm/boot/dts/overlays/audremap-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/audremap-overlay.dts
-@@ -7,28 +7,11 @@
-         fragment@0 {
-                 target = <&audio_pins>;
-                 frag0: __overlay__ {
-+                        brcm,pins = <12 13>;
-                 };
-         };
- 
- 	fragment@1 {
--                target = <&audio_pins>;
--                __overlay__ {
--                        brcm,pins = < 12 13 >;
--                        brcm,function = < 4 >; /* alt0 alt0 */
--                        brcm,pull = < 0 >;
--                };
--        };
--
--	fragment@2 {
--		target = <&audio_pins>;
--		__dormant__ {
--                        brcm,pins = < 18 19 >;
--                        brcm,function = < 2 >; /* alt5 alt5 */
--                        brcm,pull = < 0 >;
--		};
--	};
--
--	fragment@3 {
- 		target = <&chosen>;
- 		__overlay__  {
- 			bootargs = "snd_bcm2835.enable_headphones=1";
-@@ -38,7 +21,13 @@
- 	__overrides__ {
- 		swap_lr = <&frag0>, "swap_lr?";
- 		enable_jack = <&frag0>, "enable_jack?";
--		pins_12_13 = <0>,"+1-2";
--		pins_18_19 = <0>,"-1+2";
-+		pins_12_13 = <&frag0>,"brcm,pins:0=12",
-+		             <&frag0>,"brcm,pins:4=13";
-+		pins_18_19 = <&frag0>,"brcm,pins:0=18",
-+		             <&frag0>,"brcm,pins:4=19";
-+		pins_40_41 = <&frag0>,"brcm,pins:0=40",
-+		             <&frag0>,"brcm,pins:4=41";
-+		pins_40_45 = <&frag0>,"brcm,pins:0=40",
-+		             <&frag0>,"brcm,pins:4=45";
- 	};
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0461-media-adv7180-Nasty-hack-to-allow-input-selection.patch b/target/linux/bcm27xx/patches-6.1/950-0461-media-adv7180-Nasty-hack-to-allow-input-selection.patch
deleted file mode 100644
index 00a6ece362..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0461-media-adv7180-Nasty-hack-to-allow-input-selection.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 0b62eb1a849990ea513249adac661003c7138aeb Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Wed, 31 Oct 2018 15:00:04 +0000
-Subject: [PATCH] media: adv7180: Nasty hack to allow input selection.
-
-Whilst the adv7180 driver support s_routing, nothing else
-does, and there is a missing lump of framework code to
-define the mapping from connectors on a board to the inputs
-they represent on the ADV7180.
-
-Add a nasty hack to take a module parameter that is passed in
-to s_routing on any call to G_STD, or S_STD (or subdev
-g_input_status call).
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- drivers/media/i2c/adv7180.c | 30 ++++++++++++++++++++++++++++--
- 1 file changed, 28 insertions(+), 2 deletions(-)
-
---- a/drivers/media/i2c/adv7180.c
-+++ b/drivers/media/i2c/adv7180.c
-@@ -188,6 +188,10 @@
- /* Initial number of frames to skip to avoid possible garbage */
- #define ADV7180_NUM_OF_SKIP_FRAMES       2
- 
-+static int dbg_input;
-+module_param(dbg_input, int, 0644);
-+MODULE_PARM_DESC(dbg_input, "Input number (0-31)");
-+
- struct adv7180_state;
- 
- #define ADV7180_FLAG_RESET_POWERED	BIT(0)
-@@ -406,10 +410,24 @@ out:
- 	return ret;
- }
- 
-+static void adv7180_check_input(struct v4l2_subdev *sd)
-+{
-+	struct adv7180_state *state = to_state(sd);
-+
-+	if (state->input != dbg_input)
-+		if (adv7180_s_routing(sd, dbg_input, 0, 0))
-+			/* Failed - reset dbg_input */
-+			dbg_input = state->input;
-+}
-+
- static int adv7180_g_input_status(struct v4l2_subdev *sd, u32 *status)
- {
- 	struct adv7180_state *state = to_state(sd);
--	int ret = mutex_lock_interruptible(&state->mutex);
-+	int ret;
-+
-+	adv7180_check_input(sd);
-+
-+	ret = mutex_lock_interruptible(&state->mutex);
- 	if (ret)
- 		return ret;
- 
-@@ -435,7 +453,11 @@ static int adv7180_program_std(struct ad
- static int adv7180_s_std(struct v4l2_subdev *sd, v4l2_std_id std)
- {
- 	struct adv7180_state *state = to_state(sd);
--	int ret = mutex_lock_interruptible(&state->mutex);
-+	int ret;
-+
-+	adv7180_check_input(sd);
-+
-+	ret = mutex_lock_interruptible(&state->mutex);
- 
- 	if (ret)
- 		return ret;
-@@ -457,6 +479,8 @@ static int adv7180_g_std(struct v4l2_sub
- {
- 	struct adv7180_state *state = to_state(sd);
- 
-+	adv7180_check_input(sd);
-+
- 	*norm = state->curr_norm;
- 
- 	return 0;
-@@ -886,6 +910,8 @@ static int adv7180_s_stream(struct v4l2_
- 		return 0;
- 	}
- 
-+	adv7180_check_input(sd);
-+
- 	/* Must wait until querystd released the lock */
- 	ret = mutex_lock_interruptible(&state->mutex);
- 	if (ret)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0462-vc04_services-bcm2835_codec-Allow-larger-images-thro.patch b/target/linux/bcm27xx/patches-6.1/950-0462-vc04_services-bcm2835_codec-Allow-larger-images-thro.patch
deleted file mode 100644
index de62fd9549..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0462-vc04_services-bcm2835_codec-Allow-larger-images-thro.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 38822ea8817873a2cf74353ef6ad8e363e3dea70 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 3 Nov 2022 13:45:37 +0000
-Subject: [PATCH] vc04_services: bcm2835_codec: Allow larger images
- through the ISP
-
-Whilst the codecs are restricted to 1920x1080 / 1080x1920, the ISP
-isn't, but the limits advertised via V4L2 was 1920x1920 for all
-roles.
-
-Increase the limit to 16k x 16k for the ISP.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../bcm2835-codec/bcm2835-v4l2-codec.c        | 31 ++++++++++++++-----
- 1 file changed, 23 insertions(+), 8 deletions(-)
-
---- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-+++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -119,8 +119,10 @@ static const char * const components[] =
- 
- #define MIN_W		32
- #define MIN_H		32
--#define MAX_W		1920
--#define MAX_H		1920
-+#define MAX_W_CODEC	1920
-+#define MAX_H_CODEC	1920
-+#define MAX_W_ISP	16384
-+#define MAX_H_ISP	16384
- #define BPL_ALIGN	32
- /*
-  * The decoder spec supports the V4L2_EVENT_SOURCE_CHANGE event, but the docs
-@@ -686,6 +688,13 @@ struct bcm2835_codec_dev {
- 	/* The list of formats supported on input and output queues. */
- 	struct bcm2835_codec_fmt_list	supported_fmts[2];
- 
-+	/*
-+	 * Max size supported varies based on role. Store during
-+	 * bcm2835_codec_create for use later.
-+	 */
-+	unsigned int max_w;
-+	unsigned int max_h;
-+
- 	struct vchiq_mmal_instance	*instance;
- 
- 	struct v4l2_m2m_dev	*m2m_dev;
-@@ -1471,10 +1480,10 @@ static int vidioc_try_fmt(struct bcm2835
- 	 * The V4L2 specification requires the driver to correct the format
- 	 * struct if any of the dimensions is unsupported
- 	 */
--	if (f->fmt.pix_mp.width > MAX_W)
--		f->fmt.pix_mp.width = MAX_W;
--	if (f->fmt.pix_mp.height > MAX_H)
--		f->fmt.pix_mp.height = MAX_H;
-+	if (f->fmt.pix_mp.width > ctx->dev->max_w)
-+		f->fmt.pix_mp.width = ctx->dev->max_w;
-+	if (f->fmt.pix_mp.height > ctx->dev->max_h)
-+		f->fmt.pix_mp.height = ctx->dev->max_h;
- 
- 	if (!(fmt->flags & V4L2_FMT_FLAG_COMPRESSED)) {
- 		/* Only clip min w/h on capture. Treat 0x0 as unknown. */
-@@ -2528,6 +2537,7 @@ static int vidioc_encoder_cmd(struct fil
- static int vidioc_enum_framesizes(struct file *file, void *fh,
- 				  struct v4l2_frmsizeenum *fsize)
- {
-+	struct bcm2835_codec_ctx *ctx = file2ctx(file);
- 	struct bcm2835_codec_fmt *fmt;
- 
- 	fmt = find_format_pix_fmt(fsize->pixel_format, file2ctx(file)->dev,
-@@ -2546,10 +2556,10 @@ static int vidioc_enum_framesizes(struct
- 	fsize->type = V4L2_FRMSIZE_TYPE_STEPWISE;
- 
- 	fsize->stepwise.min_width = MIN_W;
--	fsize->stepwise.max_width = MAX_W;
-+	fsize->stepwise.max_width = ctx->dev->max_w;
- 	fsize->stepwise.step_width = 2;
- 	fsize->stepwise.min_height = MIN_H;
--	fsize->stepwise.max_height = MAX_H;
-+	fsize->stepwise.max_height = ctx->dev->max_h;
- 	fsize->stepwise.step_height = 2;
- 
- 	return 0;
-@@ -3623,6 +3633,9 @@ static int bcm2835_codec_create(struct b
- 	if (ret)
- 		goto vchiq_finalise;
- 
-+	dev->max_w = MAX_W_CODEC;
-+	dev->max_h = MAX_H_CODEC;
-+
- 	switch (role) {
- 	case DECODE:
- 		v4l2_disable_ioctl(vfd, VIDIOC_ENCODER_CMD);
-@@ -3645,6 +3658,8 @@ static int bcm2835_codec_create(struct b
- 		v4l2_disable_ioctl(vfd, VIDIOC_G_PARM);
- 		function = MEDIA_ENT_F_PROC_VIDEO_SCALER;
- 		video_nr = isp_video_nr;
-+		dev->max_w = MAX_W_ISP;
-+		dev->max_h = MAX_H_ISP;
- 		break;
- 	case DEINTERLACE:
- 		v4l2_disable_ioctl(vfd, VIDIOC_DECODER_CMD);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0463-imx296-overlay-clock-frequency-defaults-to-54MHz-but.patch b/target/linux/bcm27xx/patches-6.1/950-0463-imx296-overlay-clock-frequency-defaults-to-54MHz-but.patch
deleted file mode 100644
index 30178c8f4c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0463-imx296-overlay-clock-frequency-defaults-to-54MHz-but.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 55eafc594a9ec1aaa8b01207c5361e79d6b52fe7 Mon Sep 17 00:00:00 2001
-From: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
-Date: Fri, 11 Nov 2022 13:36:07 +0000
-Subject: [PATCH] imx296-overlay: clock-frequency defaults to 54MHz but
- can be overridden
-
-Signed-off-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/README             | 3 +++
- arch/arm/boot/dts/overlays/imx296-overlay.dts | 5 +++--
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -2207,6 +2207,9 @@ Params: rotation                Mounting
-                                 configuring the sensor (default on)
-         cam0                    Adopt the default configuration for CAM0 on a
-                                 Compute Module (CSI0, i2c_vc, and cam0_reg).
-+        clock-frequency         Sets the clock frequency to match that used on
-+                                the board, which should be one of 54000000
-+                                (the default), 37125000 or 74250000.
- 
- 
- Name:   imx327
---- a/arch/arm/boot/dts/overlays/imx296-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/imx296-overlay.dts
-@@ -17,9 +17,9 @@
- 
- 	clk_frag: fragment@1 {
- 		target = <&cam1_clk>;
--		__overlay__ {
-+		clk_over: __overlay__ {
- 			status = "okay";
--			clock-frequency = <37125000>;
-+			clock-frequency = <54000000>;
- 		};
- 	};
- 
-@@ -99,5 +99,6 @@
- 		       <&clk_frag>, "target:0=",<&cam0_clk>,
- 		       <&imx296>, "clocks:0=",<&cam0_clk>,
- 		       <&imx296>, "VANA-supply:0=",<&cam0_reg>;
-+		clock-frequency = <&clk_over>, "clock-frequency:0";
- 	};
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0464-ASoC-ma120x0p-Corrects-the-volume-level-display.patch b/target/linux/bcm27xx/patches-6.1/950-0464-ASoC-ma120x0p-Corrects-the-volume-level-display.patch
deleted file mode 100644
index 7e58dfa66a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0464-ASoC-ma120x0p-Corrects-the-volume-level-display.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 4aec425e27e06f9743fd3f869f6ead77260cf523 Mon Sep 17 00:00:00 2001
-From: Joerg Schambacher <joerg@hifiberry.com>
-Date: Tue, 15 Nov 2022 18:04:45 +0100
-Subject: [PATCH] ASoC:ma120x0p: Corrects the volume level display
-
-Fixes the wrongly changed 'limiter volume' display back to -50dB minimum
-and sets the correct minimum volume level to -144dB to be aligned with
-the controls and display in alsamixer etc.
-
-Signed-off-by: Joerg Schambacher <joerg@hifiberry.com>
----
- sound/soc/codecs/ma120x0p.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/sound/soc/codecs/ma120x0p.c
-+++ b/sound/soc/codecs/ma120x0p.c
-@@ -893,8 +893,8 @@ static SOC_VALUE_ENUM_SINGLE_DECL(pwr_mo
- 	pwr_mode_texts,
- 	pwr_mode_values);
- 
--static const DECLARE_TLV_DB_SCALE(ma120x0p_vol_tlv, -5000, 100,  0);
--static const DECLARE_TLV_DB_SCALE(ma120x0p_lim_tlv, -14400, 100,  0);
-+static const DECLARE_TLV_DB_SCALE(ma120x0p_vol_tlv, -14400, 100,  0);
-+static const DECLARE_TLV_DB_SCALE(ma120x0p_lim_tlv, -5000, 100,  0);
- static const DECLARE_TLV_DB_SCALE(ma120x0p_lr_tlv, -5000, 100,  0);
- 
- static const struct snd_kcontrol_new ma120x0p_snd_controls[] = {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0465-overlays-Add-overlay-pwm1.patch b/target/linux/bcm27xx/patches-6.1/950-0465-overlays-Add-overlay-pwm1.patch
deleted file mode 100644
index 89930e4b86..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0465-overlays-Add-overlay-pwm1.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From 6f5604a2d672ffb874f89f9ae276b565ae99dcc6 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 16 Nov 2022 14:54:08 +0000
-Subject: [PATCH] overlays: Add overlay pwm1
-
-pwm1 enables the second PWM interface found on BCM2711. It can only
-be mapped to GPIOs 40 & 41.
-
-See: https://forums.raspberrypi.com/viewtopic.php?t=342458
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/Makefile         |  1 +
- arch/arm/boot/dts/overlays/README           | 18 +++++++
- arch/arm/boot/dts/overlays/overlay_map.dts  |  4 ++
- arch/arm/boot/dts/overlays/pwm1-overlay.dts | 60 +++++++++++++++++++++
- 4 files changed, 83 insertions(+)
- create mode 100644 arch/arm/boot/dts/overlays/pwm1-overlay.dts
-
---- a/arch/arm/boot/dts/overlays/Makefile
-+++ b/arch/arm/boot/dts/overlays/Makefile
-@@ -183,6 +183,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
- 	pwm.dtbo \
- 	pwm-2chan.dtbo \
- 	pwm-ir-tx.dtbo \
-+	pwm1.dtbo \
- 	qca7000.dtbo \
- 	qca7000-uart0.dtbo \
- 	ramoops.dtbo \
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -3216,6 +3216,24 @@ Params: gpio_pin                Output G
-         func                    Pin function (default 2 = Alt5)
- 
- 
-+Name:   pwm1
-+Info:   Configures one or two PWM channel on PWM1 (BCM2711 only)
-+        N.B.:
-+          1) The onboard analogue audio output uses both PWM channels.
-+          2) So be careful mixing audio and PWM.
-+        Note that even when only one pin is enabled, both channels are available
-+        from the PWM driver, so be careful to use the correct one.
-+Load:   dtoverlay=pwm1,<param>=<val>
-+Params: clock                   PWM clock frequency (informational)
-+        pins_40                 Enable channel 0 (PWM1_0) on GPIO 40
-+        pins_41                 Enable channel 1 (PWM1_1) on GPIO 41
-+        pins_40_41              Enable channels 0 (PWM1_0) and 1 (PW1_1) on
-+                                GPIOs 40 and 41 (default)
-+        pull_up                 Enable pull-ups on the PWM pins (default)
-+        pull_down               Enable pull-downs on the PWM pins
-+        pull_off                Disable pulls on the PWM pins
-+
-+
- Name:   qca7000
- Info:   in-tech's Evaluation Board for PLC Stamp micro
-         This uses spi0 and a separate GPIO interrupt to connect the QCA7000.
---- a/arch/arm/boot/dts/overlays/overlay_map.dts
-+++ b/arch/arm/boot/dts/overlays/overlay_map.dts
-@@ -77,6 +77,10 @@
- 		renamed = "miniuart-bt";
- 	};
- 
-+	pwm1 {
-+		bcm2711;
-+	};
-+
- 	ramoops {
- 		bcm2835;
- 		bcm2711 = "ramoops-pi4";
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/pwm1-overlay.dts
-@@ -0,0 +1,60 @@
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/pinctrl/bcm2835.h>
-+
-+/ {
-+	compatible = "brcm,bcm2711";
-+
-+	fragment@0 {
-+		target = <&pins>;
-+		__overlay__ {
-+			brcm,pins = <40 41>;
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&pins>;
-+		__dormant__ {
-+			brcm,pins = <40>;
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&pins>;
-+		__dormant__ {
-+			brcm,pins = <41>;
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			pins: pwm1_overlay_pins {
-+				brcm,pins = <40 41>;
-+				brcm,function = <BCM2835_FSEL_ALT0>;
-+				brcm,pull = <BCM2835_PUD_UP>;
-+			};
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&pwm1>;
-+		pwm: __overlay__ {
-+			status = "okay";
-+			assigned-clock-rates = <100000000>;
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&pins>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		clock = <&pwm>, "assigned-clock-rates:0";
-+		pins_40_41 = <0>,"+0-1-2";
-+		pins_40 = <0>,"-0+1-2";
-+		pins_41 = <0>,"-0-1+2";
-+		pull_up = <&pins>, "brcm,pull:0=", <BCM2835_PUD_UP>;
-+		pull_down = <&pins>, "brcm,pull:0=", <BCM2835_PUD_DOWN>;
-+		pull_off = <&pins>, "brcm,pull:0=", <BCM2835_PUD_OFF>;
-+	};
-+};
diff --git a/target/linux/bcm27xx/patches-6.1/950-0466-overlays-audremap-Include-the-fsels-values.patch b/target/linux/bcm27xx/patches-6.1/950-0466-overlays-audremap-Include-the-fsels-values.patch
deleted file mode 100644
index a6b71271dc..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0466-overlays-audremap-Include-the-fsels-values.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From ba0b41445ee8a911ed780564788fbd58c34a62fa Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 21 Nov 2022 14:18:57 +0000
-Subject: [PATCH] overlays: audremap: Include the fsels values
-
-Add the alt function selectors, and document that pins_40_45 is not
-suitable for BCM2711 because the pins are split across the two PWM
-interfaces.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/README               |  3 ++-
- arch/arm/boot/dts/overlays/audremap-overlay.dts | 12 ++++++++----
- 2 files changed, 10 insertions(+), 5 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -685,7 +685,8 @@ Params: swap_lr                 Reverse
-         pins_12_13              Select GPIOs 12 & 13 (default)
-         pins_18_19              Select GPIOs 18 & 19
-         pins_40_41              Select GPIOs 40 & 41
--        pins_40_45              Select GPIOs 40 & 45
-+        pins_40_45              Select GPIOs 40 & 45 (don't use on BCM2711 - the
-+                                pins are on different controllers)
- 
- 
- Name:   balena-fin
---- a/arch/arm/boot/dts/overlays/audremap-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/audremap-overlay.dts
-@@ -22,12 +22,16 @@
- 		swap_lr = <&frag0>, "swap_lr?";
- 		enable_jack = <&frag0>, "enable_jack?";
- 		pins_12_13 = <&frag0>,"brcm,pins:0=12",
--		             <&frag0>,"brcm,pins:4=13";
-+		             <&frag0>,"brcm,pins:4=13",
-+			     <&frag0>,"brcm,function:0=4";
- 		pins_18_19 = <&frag0>,"brcm,pins:0=18",
--		             <&frag0>,"brcm,pins:4=19";
-+		             <&frag0>,"brcm,pins:4=19",
-+			     <&frag0>,"brcm,function:0=2";
- 		pins_40_41 = <&frag0>,"brcm,pins:0=40",
--		             <&frag0>,"brcm,pins:4=41";
-+		             <&frag0>,"brcm,pins:4=41",
-+			     <&frag0>,"brcm,function:0=4";
- 		pins_40_45 = <&frag0>,"brcm,pins:0=40",
--		             <&frag0>,"brcm,pins:4=45";
-+		             <&frag0>,"brcm,pins:4=45",
-+			     <&frag0>,"brcm,function:0=4";
- 	};
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0467-overlays-i2c-sensor-Make-smbus-timeout-disable-optio.patch b/target/linux/bcm27xx/patches-6.1/950-0467-overlays-i2c-sensor-Make-smbus-timeout-disable-optio.patch
deleted file mode 100644
index 83663a2f02..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0467-overlays-i2c-sensor-Make-smbus-timeout-disable-optio.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From ef6a692bf0e076c905a912fbb8e65481c354a7ca Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 23 Nov 2022 11:51:38 +0000
-Subject: [PATCH] overlays: i2c-sensor: Make smbus-timeout-disable
- optional
-
-Although disabling the SMBUS timeout may be useful, not all chips
-support it. The driver treats attempting to disable the timeout on a
-non-supporting chip as an error, so make it an option enabled using the
-no_timeout parameter.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/README                 | 5 +++++
- arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi | 2 +-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -1999,6 +1999,11 @@ Params: addr                    Set the
-                                 use the "jc42" option.
-                                 Valid addresses are 0x18-0x1f (default 0x18)
- 
-+        no_timeout              Disable the SMBUS timeout. N.B. Only supported
-+                                by some jc42 devices - using with an
-+                                incompatible device can stop it from being
-+                                activated.
-+
-         sht3x                   Select the Sensiron SHT3x temperature and
-                                 humidity sensor. Valid addresses 0x44-0x45,
-                                 default 0x44
---- a/arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi
-+++ b/arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi
-@@ -347,7 +347,6 @@
- 			jc42: jc42@18 {
- 				compatible = "jedec,jc-42.4-temp";
- 				reg = <0x18>;
--				smbus-timeout-disable;
- 			};
- 		};
- 	};
-@@ -383,5 +382,6 @@
- 			<&ds1621>,"reg:0", <&bme680>,"reg:0", <&ccs811>,"reg:0",
- 			<&bh1750>,"reg:0", <&mcp980x>,"reg:0", <&jc42>,"reg:0";
- 		int_pin = <&max30102>, "interrupts:0";
-+		no_timeout = <&jc42>, "smbus-timeout-disable?";
- 	};
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0468-overlays-Mention-Digi2-Pro-audio-card-in-README.patch b/target/linux/bcm27xx/patches-6.1/950-0468-overlays-Mention-Digi2-Pro-audio-card-in-README.patch
deleted file mode 100644
index f2eab6a6a4..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0468-overlays-Mention-Digi2-Pro-audio-card-in-README.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 14b2f77aa947c953b9629ae69d4a5fd47933c943 Mon Sep 17 00:00:00 2001
-From: reinisb <reinis.babris@gmail.com>
-Date: Fri, 25 Nov 2022 12:53:50 +0200
-Subject: [PATCH] overlays: Mention Digi2 Pro audio card in README
-
-https://www.hifiberry.com/blog/the-new-digi2-pro/
----
- arch/arm/boot/dts/overlays/README | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -1606,7 +1606,7 @@ Params: <None>
- 
- 
- Name:   hifiberry-digi-pro
--Info:   Configures the HifiBerry Digi+ Pro audio card
-+Info:   Configures the HifiBerry Digi+ Pro and Digi2 Pro audio card
- Load:   dtoverlay=hifiberry-digi-pro
- Params: <None>
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0469-usb-xhci-add-XHCI_VLI_HUB_TT_QUIRK.patch b/target/linux/bcm27xx/patches-6.1/950-0469-usb-xhci-add-XHCI_VLI_HUB_TT_QUIRK.patch
deleted file mode 100644
index ab0bae587b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0469-usb-xhci-add-XHCI_VLI_HUB_TT_QUIRK.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 4f3e85c6f129199a432ef4ed3edbb667a5dedcc1 Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.com>
-Date: Thu, 1 Dec 2022 16:59:44 +0000
-Subject: [PATCH] usb: xhci: add XHCI_VLI_HUB_TT_QUIRK
-
-The integrated USB2.0 hub in the VL805 chipset has a bug where it
-incorrectly determines the remaining available frame time before the
-host next sends a SOF packet with an incremented frame_number.
-
-See the USB2.0 specification sections 11.3 and 11.14.2.3.
-
-The hub's non-periodic TT handler can transmit the IN/OUT handshake
-token too late, so a following 64-byte DATA0/1 packet causes the ACK
-handshake to collide with the propagated SOF. This causes port babble.
-
-Avoid ringing doorbells for vulnerable endpoints during uFrame 7 if the
-TR is Idle to stop one source of babble. An IN transfer for a Running TR
-may happen at any time, so there's not much we can do about that.
-
-Ideally a hub firmware update to properly implement frame timeouts is
-needed, and to avoid spinning for up to 125us when submitting TDs to
-Idle rings.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- drivers/usb/host/xhci-pci.c  |  1 +
- drivers/usb/host/xhci-ring.c | 46 ++++++++++++++++++++++++++++++++++++
- drivers/usb/host/xhci.h      |  1 +
- 3 files changed, 48 insertions(+)
-
---- a/drivers/usb/host/xhci-pci.c
-+++ b/drivers/usb/host/xhci-pci.c
-@@ -298,6 +298,7 @@ static void xhci_pci_quirks(struct devic
- 		xhci->quirks |= XHCI_AVOID_DQ_ON_LINK;
- 		xhci->quirks |= XHCI_VLI_TRB_CACHE_BUG;
- 		xhci->quirks |= XHCI_VLI_SS_BULK_OUT_BUG;
-+		xhci->quirks |= XHCI_VLI_HUB_TT_QUIRK;
- 	}
- 
- 	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
---- a/drivers/usb/host/xhci-ring.c
-+++ b/drivers/usb/host/xhci-ring.c
-@@ -3583,6 +3583,48 @@ static int xhci_align_td(struct xhci_hcd
- 	return 1;
- }
- 
-+static void xhci_vl805_hub_tt_quirk(struct xhci_hcd *xhci, struct urb *urb,
-+				    struct xhci_ring *ring)
-+{
-+	struct list_head *tmp;
-+	struct usb_device *udev = urb->dev;
-+	unsigned int timeout = 0;
-+	unsigned int single_td = 0;
-+
-+	/*
-+	 * Adding a TD to an Idle ring for a FS nonperiodic endpoint
-+	 * that is behind the internal hub's TT will run the risk of causing a
-+	 * downstream port babble if submitted late in uFrame 7.
-+	 * Wait until we've moved on into at least uFrame 0
-+	 * (MFINDEX references the next SOF to be transmitted).
-+	 *
-+	 * Rings for IN endpoints in the Running state also risk causing
-+	 * babble if the returned data is large, but there's not much we can do
-+	 * about it here.
-+	 */
-+	if (udev->route & 0xffff0 || udev->speed != USB_SPEED_FULL)
-+		return;
-+
-+	list_for_each(tmp, &ring->td_list) {
-+		single_td++;
-+		if (single_td == 2) {
-+			single_td = 0;
-+			break;
-+		}
-+	}
-+	if (single_td) {
-+		while (timeout < 20 &&
-+		       (readl(&xhci->run_regs->microframe_index) & 0x7) == 0) {
-+			udelay(10);
-+			timeout++;
-+		}
-+		if (timeout >= 20)
-+			xhci_warn(xhci, "MFINDEX didn't advance - %u.%u dodged\n",
-+				  readl(&xhci->run_regs->microframe_index) >> 3,
-+				  readl(&xhci->run_regs->microframe_index) & 7);
-+	}
-+}
-+
- /* This is very similar to what ehci-q.c qtd_fill() does */
- int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
- 		struct urb *urb, int slot_id, unsigned int ep_index)
-@@ -3751,6 +3793,8 @@ int xhci_queue_bulk_tx(struct xhci_hcd *
- 	}
- 
- 	check_trb_math(urb, enqd_len);
-+	if (xhci->quirks & XHCI_VLI_HUB_TT_QUIRK)
-+		xhci_vl805_hub_tt_quirk(xhci, urb, ring);
- 	giveback_first_trb(xhci, slot_id, ep_index, urb->stream_id,
- 			start_cycle, start_trb);
- 	return 0;
-@@ -3886,6 +3930,8 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *
- 			/* Event on completion */
- 			field | TRB_IOC | TRB_TYPE(TRB_STATUS) | ep_ring->cycle_state);
- 
-+	if (xhci->quirks & XHCI_VLI_HUB_TT_QUIRK)
-+		xhci_vl805_hub_tt_quirk(xhci, urb, ep_ring);
- 	giveback_first_trb(xhci, slot_id, ep_index, 0,
- 			start_cycle, start_trb);
- 	return 0;
---- a/drivers/usb/host/xhci.h
-+++ b/drivers/usb/host/xhci.h
-@@ -1911,6 +1911,7 @@ struct xhci_hcd {
- #define XHCI_AVOID_DQ_ON_LINK  BIT_ULL(47)
- #define XHCI_VLI_TRB_CACHE_BUG BIT_ULL(48)
- #define XHCI_VLI_SS_BULK_OUT_BUG       BIT_ULL(49)
-+#define XHCI_VLI_HUB_TT_QUIRK  BIT_ULL(50)
- 
- 	unsigned int		num_active_eps;
- 	unsigned int		limit_active_eps;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0470-media-i2c-ov7251-Add-module-param-to-select-ext-trig.patch b/target/linux/bcm27xx/patches-6.1/950-0470-media-i2c-ov7251-Add-module-param-to-select-ext-trig.patch
deleted file mode 100644
index dba8f36af9..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0470-media-i2c-ov7251-Add-module-param-to-select-ext-trig.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 9524eae5a46285e574b869879fb0228fb4424a5f Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 1 Dec 2022 13:54:49 +0000
-Subject: [PATCH] media: i2c: ov7251: Add module param to select ext
- trig mode
-
-As there isn't currently a defined mechanism for selecting an
-external trigger mode on image sensors, copy the imx477
-approach of using a module parameter to enable ext trig.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/i2c/ov7251.c | 35 ++++++++++++++++++++++++++++++++---
- 1 file changed, 32 insertions(+), 3 deletions(-)
-
---- a/drivers/media/i2c/ov7251.c
-+++ b/drivers/media/i2c/ov7251.c
-@@ -23,6 +23,10 @@
- #include <media/v4l2-fwnode.h>
- #include <media/v4l2-subdev.h>
- 
-+static int trigger_mode;
-+module_param(trigger_mode, int, 0644);
-+MODULE_PARM_DESC(trigger_mode, "Set vsync trigger mode: 0=standalone, (1=source - not implemented), 2=sink");
-+
- #define OV7251_SC_MODE_SELECT		0x0100
- #define OV7251_SC_MODE_SELECT_SW_STANDBY	0x0
- #define OV7251_SC_MODE_SELECT_STREAMING		0x1
-@@ -525,7 +529,6 @@ static const struct reg_value ov7251_set
- 	{ 0x3662, 0x01 },
- 	{ 0x3663, 0x70 },
- 	{ 0x3664, 0x50 },
--	{ 0x3666, 0x0a },
- 	{ 0x3669, 0x1a },
- 	{ 0x366a, 0x00 },
- 	{ 0x366b, 0x50 },
-@@ -592,9 +595,8 @@ static const struct reg_value ov7251_set
- 	{ 0x3c00, 0x89 },
- 	{ 0x3c01, 0x63 },
- 	{ 0x3c02, 0x01 },
--	{ 0x3c03, 0x00 },
- 	{ 0x3c04, 0x00 },
--	{ 0x3c05, 0x03 },
-+	{ 0x3c05, 0x01 },
- 	{ 0x3c06, 0x00 },
- 	{ 0x3c07, 0x06 },
- 	{ 0x3c0c, 0x01 },
-@@ -624,6 +626,16 @@ static const struct reg_value ov7251_set
- 	{ 0x5001, 0x80 },
- };
- 
-+static const struct reg_value ov7251_ext_trig_on[] = {
-+	{ 0x3666, 0x00 },
-+	{ 0x3c03, 0x17 },
-+};
-+
-+static const struct reg_value ov7251_ext_trig_off[] = {
-+	{ 0x3666, 0x0a },
-+	{ 0x3c03, 0x00 },
-+};
-+
- static const unsigned long supported_xclk_rates[] = {
- 	[OV7251_19_2_MHZ] = 19200000,
- 	[OV7251_24_MHZ] = 24000000,
-@@ -1372,6 +1384,23 @@ static int ov7251_s_stream(struct v4l2_s
- 			dev_err(ov7251->dev, "could not sync v4l2 controls\n");
- 			goto err_power_down;
- 		}
-+
-+		/* Set vsync trigger mode */
-+		switch (trigger_mode) {
-+		case 2:
-+			ov7251_set_register_array(ov7251,
-+						  ov7251_ext_trig_on,
-+						  ARRAY_SIZE(ov7251_ext_trig_on));
-+			break;
-+		case 0:
-+		default:
-+			/* case 1 for ext trig source currently not implemented */
-+			ov7251_set_register_array(ov7251,
-+						  ov7251_ext_trig_off,
-+						  ARRAY_SIZE(ov7251_ext_trig_off));
-+			break;
-+		}
-+
- 		ret = ov7251_write_reg(ov7251, OV7251_SC_MODE_SELECT,
- 				       OV7251_SC_MODE_SELECT_STREAMING);
- 		if (ret)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0471-vc4_hdmi-Avoid-log-spam-for-audio-start-failure.patch b/target/linux/bcm27xx/patches-6.1/950-0471-vc4_hdmi-Avoid-log-spam-for-audio-start-failure.patch
deleted file mode 100644
index 5032cd8256..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0471-vc4_hdmi-Avoid-log-spam-for-audio-start-failure.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From fc47ef1a8d52d47d00d5957ec45d6b7b4dc661f6 Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Tue, 6 Dec 2022 15:05:56 +0000
-Subject: [PATCH] vc4_hdmi: Avoid log spam for audio start failure
-
-We regularly get dmesg error reports of:
-[   18.184066] hdmi-audio-codec hdmi-audio-codec.3.auto: ASoC: error at snd_soc_dai_startup on i2s-hifi: -19
-[   18.184098]  MAI: soc_pcm_open() failed (-19)
-
-Currently I get 30 of these when booting to desktop.
-We always say, ignore they are harmless, but removing them would be good.
-
-A bit of investigation shows, for me, the errors are all generated by second, unused hdmi interface.
-
-It shows as an alsa device, and pulseaudio attempts to open it (numerous times), generating a kernel
-error message each time.
-
-systemctl --user restart pulseaudio.service generates 6 additional error messages.
-
-The error messages all come through:
-https://github.com/raspberrypi/linux/blob/a009a9c0d79dfec114ee5102ec3d3325a172c952/sound/soc/soc-pcm.c#L39
-
-which suggests returning ENOTSUPP, rather that ENODEV will be quiet. And indeed it is.
-
-Note: earlier kernels do not have the quiet ENOTSUPP, so additional cherry-picks will be needed to backport
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hdmi.c
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -2368,7 +2368,7 @@ static int vc4_hdmi_audio_startup(struct
- 	}
- 
- 	if (!vc4_hdmi_audio_can_stream(vc4_hdmi)) {
--		ret = -ENODEV;
-+		ret = -ENOTSUPP;
- 		goto out_dev_exit;
- 	}
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0472-drm-tests-Order-Kunit-tests-in-Makefile.patch b/target/linux/bcm27xx/patches-6.1/950-0472-drm-tests-Order-Kunit-tests-in-Makefile.patch
deleted file mode 100644
index 679889ac16..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0472-drm-tests-Order-Kunit-tests-in-Makefile.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From e5cda9b56eb3140b7bf698b545686aa850de9928 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Thu, 29 Sep 2022 18:30:56 +0200
-Subject: [PATCH] drm/tests: Order Kunit tests in Makefile
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Since we've recently added a ton of tests, the list starts to be a bit
-of a mess and creates unneeded conflicts.
-
-Let's order it alphabetically.
-
-Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
-Reviewed-by: Noralf Trønnes <noralf@tronnes.org>
-Link: https://lore.kernel.org/r/20220728-rpi-analog-tv-properties-v4-2-60d38873f782@cerno.tech
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/tests/Makefile | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
---- a/drivers/gpu/drm/tests/Makefile
-+++ b/drivers/gpu/drm/tests/Makefile
-@@ -1,5 +1,13 @@
- # SPDX-License-Identifier: GPL-2.0
- 
--obj-$(CONFIG_DRM_KUNIT_TEST) += drm_format_helper_test.o drm_damage_helper_test.o \
--	drm_cmdline_parser_test.o drm_rect_test.o drm_format_test.o drm_plane_helper_test.o \
--	drm_dp_mst_helper_test.o drm_framebuffer_test.o drm_buddy_test.o drm_mm_test.o
-+obj-$(CONFIG_DRM_KUNIT_TEST) += \
-+	drm_buddy_test.o \
-+	drm_cmdline_parser_test.o \
-+	drm_damage_helper_test.o \
-+	drm_dp_mst_helper_test.o \
-+	drm_format_helper_test.o \
-+	drm_format_test.o \
-+	drm_framebuffer_test.o \
-+	drm_mm_test.o \
-+	drm_plane_helper_test.o \
-+	drm_rect_test.o
diff --git a/target/linux/bcm27xx/patches-6.1/950-0473-drm-tests-Add-Kunit-Helpers.patch b/target/linux/bcm27xx/patches-6.1/950-0473-drm-tests-Add-Kunit-Helpers.patch
deleted file mode 100644
index 1bc53ef3db..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0473-drm-tests-Add-Kunit-Helpers.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From baf556e423385c116217e143fe352d2b062a10e3 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Mon, 14 Nov 2022 14:00:21 +0100
-Subject: [PATCH] drm/tests: Add Kunit Helpers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-As the number of kunit tests in KMS grows further, we start to have
-multiple test suites that, for example, need to register a mock DRM
-driver to interact with the KMS function they are supposed to test.
-
-Let's add a file meant to provide those kind of helpers to avoid
-duplication.
-
-Reviewed-by: Noralf Trønnes <noralf@tronnes.org>
-Tested-by: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
-Link: https://lore.kernel.org/r/20220728-rpi-analog-tv-properties-v9-2-24b168e5bcd5@cerno.tech
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/tests/Makefile            |  1 +
- drivers/gpu/drm/tests/drm_kunit_helpers.c | 64 +++++++++++++++++++++++
- drivers/gpu/drm/tests/drm_kunit_helpers.h |  9 ++++
- 3 files changed, 74 insertions(+)
- create mode 100644 drivers/gpu/drm/tests/drm_kunit_helpers.c
- create mode 100644 drivers/gpu/drm/tests/drm_kunit_helpers.h
-
---- a/drivers/gpu/drm/tests/Makefile
-+++ b/drivers/gpu/drm/tests/Makefile
-@@ -8,6 +8,7 @@ obj-$(CONFIG_DRM_KUNIT_TEST) += \
- 	drm_format_helper_test.o \
- 	drm_format_test.o \
- 	drm_framebuffer_test.o \
-+	drm_kunit_helpers.o \
- 	drm_mm_test.o \
- 	drm_plane_helper_test.o \
- 	drm_rect_test.o
---- /dev/null
-+++ b/drivers/gpu/drm/tests/drm_kunit_helpers.c
-@@ -0,0 +1,64 @@
-+#include <drm/drm_drv.h>
-+#include <drm/drm_managed.h>
-+
-+#include <kunit/resource.h>
-+
-+#include <linux/device.h>
-+
-+struct kunit_dev {
-+	struct drm_device base;
-+};
-+
-+static const struct drm_mode_config_funcs drm_mode_config_funcs = {
-+};
-+
-+static int dev_init(struct kunit_resource *res, void *ptr)
-+{
-+	char *name = ptr;
-+	struct device *dev;
-+
-+	dev = root_device_register(name);
-+	if (IS_ERR(dev))
-+		return PTR_ERR(dev);
-+
-+	res->data = dev;
-+	return 0;
-+}
-+
-+static void dev_free(struct kunit_resource *res)
-+{
-+	struct device *dev = res->data;
-+
-+	root_device_unregister(dev);
-+}
-+
-+struct drm_device *drm_kunit_device_init(struct kunit *test, u32 features, char *name)
-+{
-+	struct kunit_dev *kdev;
-+	struct drm_device *drm;
-+	struct drm_driver *driver;
-+	struct device *dev;
-+	int ret;
-+
-+	dev = kunit_alloc_resource(test, dev_init, dev_free, GFP_KERNEL, name);
-+	if (!dev)
-+		return ERR_PTR(-ENOMEM);
-+
-+	driver = kunit_kzalloc(test, sizeof(*driver), GFP_KERNEL);
-+	if (!driver)
-+		return ERR_PTR(-ENOMEM);
-+
-+	driver->driver_features = features;
-+	kdev = devm_drm_dev_alloc(dev, driver, struct kunit_dev, base);
-+	if (IS_ERR(kdev))
-+		return ERR_CAST(kdev);
-+
-+	drm = &kdev->base;
-+	drm->mode_config.funcs = &drm_mode_config_funcs;
-+
-+	ret = drmm_mode_config_init(drm);
-+	if (ret)
-+		return ERR_PTR(ret);
-+
-+	return drm;
-+}
---- /dev/null
-+++ b/drivers/gpu/drm/tests/drm_kunit_helpers.h
-@@ -0,0 +1,9 @@
-+#ifndef DRM_KUNIT_HELPERS_H_
-+#define DRM_KUNIT_HELPERS_H_
-+
-+struct drm_device;
-+struct kunit;
-+
-+struct drm_device *drm_kunit_device_init(struct kunit *test, u32 features, char *name);
-+
-+#endif // DRM_KUNIT_HELPERS_H_
diff --git a/target/linux/bcm27xx/patches-6.1/950-0474-drm-tests-Include-helpers-header.patch b/target/linux/bcm27xx/patches-6.1/950-0474-drm-tests-Include-helpers-header.patch
deleted file mode 100644
index 4971d403ad..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0474-drm-tests-Include-helpers-header.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 9cd3f22045be6d2e97fb0efeec08a248e0c05bc8 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Wed, 16 Nov 2022 10:17:10 +0100
-Subject: [PATCH] drm/tests: Include helpers header
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The kunit helpers code weren't including its header, leading to a
-warning that no previous prototype had been defined for public
-functions.
-
-Include the matching header to fix the warning.
-
-Fixes: 44a3928324e9 ("drm/tests: Add Kunit Helpers")
-Reported-by: kernel test robot <lkp@intel.com>
-Reviewed-by: Maíra Canal <mairacanal@riseup.net>
-Link: https://lore.kernel.org/r/20221116091712.1309651-1-maxime@cerno.tech
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/tests/drm_kunit_helpers.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/gpu/drm/tests/drm_kunit_helpers.c
-+++ b/drivers/gpu/drm/tests/drm_kunit_helpers.c
-@@ -5,6 +5,8 @@
- 
- #include <linux/device.h>
- 
-+#include "drm_kunit_helpers.h"
-+
- struct kunit_dev {
- 	struct drm_device base;
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0475-drm-tests-helpers-Add-module-infos.patch b/target/linux/bcm27xx/patches-6.1/950-0475-drm-tests-helpers-Add-module-infos.patch
deleted file mode 100644
index c2fea45aa8..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0475-drm-tests-helpers-Add-module-infos.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 42707dfeb57dc0a1cb1519b7ea29de15b4b3af6e Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Wed, 16 Nov 2022 10:17:11 +0100
-Subject: [PATCH] drm/tests: helpers: Add module infos
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The MODULE_LICENSE macro is missing from the kunit helpers file, thus
-leading to a build error.
-
-Let's introduce it along with MODULE_AUTHOR.
-
-Fixes: 44a3928324e9 ("drm/tests: Add Kunit Helpers")
-Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
-Reviewed-by: Maíra Canal <mairacanal@riseup.net>
-Link: https://lore.kernel.org/r/20221116091712.1309651-2-maxime@cerno.tech
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/tests/drm_kunit_helpers.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/gpu/drm/tests/drm_kunit_helpers.c
-+++ b/drivers/gpu/drm/tests/drm_kunit_helpers.c
-@@ -64,3 +64,6 @@ struct drm_device *drm_kunit_device_init
- 
- 	return drm;
- }
-+
-+MODULE_AUTHOR("Maxime Ripard <maxime@cerno.tech>");
-+MODULE_LICENSE("GPL");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0476-drm-tests-helpers-Add-SPDX-header.patch b/target/linux/bcm27xx/patches-6.1/950-0476-drm-tests-helpers-Add-SPDX-header.patch
deleted file mode 100644
index 44d93987e7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0476-drm-tests-helpers-Add-SPDX-header.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From b15a8411b58861833fa961620417ae51ad052397 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Wed, 16 Nov 2022 16:18:33 +0100
-Subject: [PATCH] drm/tests: helpers: Add SPDX header
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The SPDX header is missing, let's add it and fix the corresponding
-checkpatch warning.
-
-Suggested-by: Maíra Canal <mairacanal@riseup.net>
-Fixes: 44a3928324e9 ("drm/tests: Add Kunit Helpers")
-Reviewed-by: Maíra Canal <mairacanal@riseup.net>
-Link: https://lore.kernel.org/r/20221116151833.1679379-2-maxime@cerno.tech
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/tests/drm_kunit_helpers.c | 2 ++
- drivers/gpu/drm/tests/drm_kunit_helpers.h | 2 ++
- 2 files changed, 4 insertions(+)
-
---- a/drivers/gpu/drm/tests/drm_kunit_helpers.c
-+++ b/drivers/gpu/drm/tests/drm_kunit_helpers.c
-@@ -1,3 +1,5 @@
-+// SPDX-License-Identifier: GPL-2.0
-+
- #include <drm/drm_drv.h>
- #include <drm/drm_managed.h>
- 
---- a/drivers/gpu/drm/tests/drm_kunit_helpers.h
-+++ b/drivers/gpu/drm/tests/drm_kunit_helpers.h
-@@ -1,3 +1,5 @@
-+// SPDX-License-Identifier: GPL-2.0
-+
- #ifndef DRM_KUNIT_HELPERS_H_
- #define DRM_KUNIT_HELPERS_H_
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0477-drm-atomic-Constify-the-old-new-state-accessors.patch b/target/linux/bcm27xx/patches-6.1/950-0477-drm-atomic-Constify-the-old-new-state-accessors.patch
deleted file mode 100644
index f12a952ec2..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0477-drm-atomic-Constify-the-old-new-state-accessors.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-From d094cf748495c8c9be15bbbf9801237c8e390c8a Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Wed, 23 Nov 2022 16:25:51 +0100
-Subject: [PATCH] drm/atomic: Constify the old/new state accessors
-
-The drm_atomic_get_(old|new)_*_state don't modify the passed
-drm_atomic_state, so we can make it const.
-
-Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
-Link: https://patchwork.freedesktop.org/patch/msgid/20221123-rpi-kunit-tests-v1-9-051a0bb60a16@cerno.tech
----
- drivers/gpu/drm/drm_atomic.c | 12 ++++++------
- include/drm/drm_atomic.h     | 32 ++++++++++++++++----------------
- 2 files changed, 22 insertions(+), 22 deletions(-)
-
---- a/drivers/gpu/drm/drm_atomic.c
-+++ b/drivers/gpu/drm/drm_atomic.c
-@@ -889,7 +889,7 @@ EXPORT_SYMBOL(drm_atomic_get_private_obj
-  * or NULL if the private_obj is not part of the global atomic state.
-  */
- struct drm_private_state *
--drm_atomic_get_old_private_obj_state(struct drm_atomic_state *state,
-+drm_atomic_get_old_private_obj_state(const struct drm_atomic_state *state,
- 				     struct drm_private_obj *obj)
- {
- 	int i;
-@@ -911,7 +911,7 @@ EXPORT_SYMBOL(drm_atomic_get_old_private
-  * or NULL if the private_obj is not part of the global atomic state.
-  */
- struct drm_private_state *
--drm_atomic_get_new_private_obj_state(struct drm_atomic_state *state,
-+drm_atomic_get_new_private_obj_state(const struct drm_atomic_state *state,
- 				     struct drm_private_obj *obj)
- {
- 	int i;
-@@ -943,7 +943,7 @@ EXPORT_SYMBOL(drm_atomic_get_new_private
-  * not connected.
-  */
- struct drm_connector *
--drm_atomic_get_old_connector_for_encoder(struct drm_atomic_state *state,
-+drm_atomic_get_old_connector_for_encoder(const struct drm_atomic_state *state,
- 					 struct drm_encoder *encoder)
- {
- 	struct drm_connector_state *conn_state;
-@@ -977,7 +977,7 @@ EXPORT_SYMBOL(drm_atomic_get_old_connect
-  * not connected.
-  */
- struct drm_connector *
--drm_atomic_get_new_connector_for_encoder(struct drm_atomic_state *state,
-+drm_atomic_get_new_connector_for_encoder(const struct drm_atomic_state *state,
- 					 struct drm_encoder *encoder)
- {
- 	struct drm_connector_state *conn_state;
-@@ -1127,7 +1127,7 @@ EXPORT_SYMBOL(drm_atomic_get_bridge_stat
-  * the bridge is not part of the global atomic state.
-  */
- struct drm_bridge_state *
--drm_atomic_get_old_bridge_state(struct drm_atomic_state *state,
-+drm_atomic_get_old_bridge_state(const struct drm_atomic_state *state,
- 				struct drm_bridge *bridge)
- {
- 	struct drm_private_state *obj_state;
-@@ -1149,7 +1149,7 @@ EXPORT_SYMBOL(drm_atomic_get_old_bridge_
-  * the bridge is not part of the global atomic state.
-  */
- struct drm_bridge_state *
--drm_atomic_get_new_bridge_state(struct drm_atomic_state *state,
-+drm_atomic_get_new_bridge_state(const struct drm_atomic_state *state,
- 				struct drm_bridge *bridge)
- {
- 	struct drm_private_state *obj_state;
---- a/include/drm/drm_atomic.h
-+++ b/include/drm/drm_atomic.h
-@@ -515,17 +515,17 @@ struct drm_private_state * __must_check
- drm_atomic_get_private_obj_state(struct drm_atomic_state *state,
- 				 struct drm_private_obj *obj);
- struct drm_private_state *
--drm_atomic_get_old_private_obj_state(struct drm_atomic_state *state,
-+drm_atomic_get_old_private_obj_state(const struct drm_atomic_state *state,
- 				     struct drm_private_obj *obj);
- struct drm_private_state *
--drm_atomic_get_new_private_obj_state(struct drm_atomic_state *state,
-+drm_atomic_get_new_private_obj_state(const struct drm_atomic_state *state,
- 				     struct drm_private_obj *obj);
- 
- struct drm_connector *
--drm_atomic_get_old_connector_for_encoder(struct drm_atomic_state *state,
-+drm_atomic_get_old_connector_for_encoder(const struct drm_atomic_state *state,
- 					 struct drm_encoder *encoder);
- struct drm_connector *
--drm_atomic_get_new_connector_for_encoder(struct drm_atomic_state *state,
-+drm_atomic_get_new_connector_for_encoder(const struct drm_atomic_state *state,
- 					 struct drm_encoder *encoder);
- 
- /**
-@@ -540,7 +540,7 @@ drm_atomic_get_new_connector_for_encoder
-  * @drm_atomic_get_new_crtc_state should be used instead.
-  */
- static inline struct drm_crtc_state *
--drm_atomic_get_existing_crtc_state(struct drm_atomic_state *state,
-+drm_atomic_get_existing_crtc_state(const struct drm_atomic_state *state,
- 				   struct drm_crtc *crtc)
- {
- 	return state->crtcs[drm_crtc_index(crtc)].state;
-@@ -555,7 +555,7 @@ drm_atomic_get_existing_crtc_state(struc
-  * NULL if the CRTC is not part of the global atomic state.
-  */
- static inline struct drm_crtc_state *
--drm_atomic_get_old_crtc_state(struct drm_atomic_state *state,
-+drm_atomic_get_old_crtc_state(const struct drm_atomic_state *state,
- 			      struct drm_crtc *crtc)
- {
- 	return state->crtcs[drm_crtc_index(crtc)].old_state;
-@@ -569,7 +569,7 @@ drm_atomic_get_old_crtc_state(struct drm
-  * NULL if the CRTC is not part of the global atomic state.
-  */
- static inline struct drm_crtc_state *
--drm_atomic_get_new_crtc_state(struct drm_atomic_state *state,
-+drm_atomic_get_new_crtc_state(const struct drm_atomic_state *state,
- 			      struct drm_crtc *crtc)
- {
- 	return state->crtcs[drm_crtc_index(crtc)].new_state;
-@@ -587,7 +587,7 @@ drm_atomic_get_new_crtc_state(struct drm
-  * @drm_atomic_get_new_plane_state should be used instead.
-  */
- static inline struct drm_plane_state *
--drm_atomic_get_existing_plane_state(struct drm_atomic_state *state,
-+drm_atomic_get_existing_plane_state(const struct drm_atomic_state *state,
- 				    struct drm_plane *plane)
- {
- 	return state->planes[drm_plane_index(plane)].state;
-@@ -602,7 +602,7 @@ drm_atomic_get_existing_plane_state(stru
-  * NULL if the plane is not part of the global atomic state.
-  */
- static inline struct drm_plane_state *
--drm_atomic_get_old_plane_state(struct drm_atomic_state *state,
-+drm_atomic_get_old_plane_state(const struct drm_atomic_state *state,
- 			       struct drm_plane *plane)
- {
- 	return state->planes[drm_plane_index(plane)].old_state;
-@@ -617,7 +617,7 @@ drm_atomic_get_old_plane_state(struct dr
-  * NULL if the plane is not part of the global atomic state.
-  */
- static inline struct drm_plane_state *
--drm_atomic_get_new_plane_state(struct drm_atomic_state *state,
-+drm_atomic_get_new_plane_state(const struct drm_atomic_state *state,
- 			       struct drm_plane *plane)
- {
- 	return state->planes[drm_plane_index(plane)].new_state;
-@@ -635,7 +635,7 @@ drm_atomic_get_new_plane_state(struct dr
-  * @drm_atomic_get_new_connector_state should be used instead.
-  */
- static inline struct drm_connector_state *
--drm_atomic_get_existing_connector_state(struct drm_atomic_state *state,
-+drm_atomic_get_existing_connector_state(const struct drm_atomic_state *state,
- 					struct drm_connector *connector)
- {
- 	int index = drm_connector_index(connector);
-@@ -655,7 +655,7 @@ drm_atomic_get_existing_connector_state(
-  * or NULL if the connector is not part of the global atomic state.
-  */
- static inline struct drm_connector_state *
--drm_atomic_get_old_connector_state(struct drm_atomic_state *state,
-+drm_atomic_get_old_connector_state(const struct drm_atomic_state *state,
- 				   struct drm_connector *connector)
- {
- 	int index = drm_connector_index(connector);
-@@ -675,7 +675,7 @@ drm_atomic_get_old_connector_state(struc
-  * or NULL if the connector is not part of the global atomic state.
-  */
- static inline struct drm_connector_state *
--drm_atomic_get_new_connector_state(struct drm_atomic_state *state,
-+drm_atomic_get_new_connector_state(const struct drm_atomic_state *state,
- 				   struct drm_connector *connector)
- {
- 	int index = drm_connector_index(connector);
-@@ -713,7 +713,7 @@ drm_atomic_get_new_connector_state(struc
-  * Read-only pointer to the current plane state.
-  */
- static inline const struct drm_plane_state *
--__drm_atomic_get_current_plane_state(struct drm_atomic_state *state,
-+__drm_atomic_get_current_plane_state(const struct drm_atomic_state *state,
- 				     struct drm_plane *plane)
- {
- 	if (state->planes[drm_plane_index(plane)].state)
-@@ -1134,10 +1134,10 @@ struct drm_bridge_state *
- drm_atomic_get_bridge_state(struct drm_atomic_state *state,
- 			    struct drm_bridge *bridge);
- struct drm_bridge_state *
--drm_atomic_get_old_bridge_state(struct drm_atomic_state *state,
-+drm_atomic_get_old_bridge_state(const struct drm_atomic_state *state,
- 				struct drm_bridge *bridge);
- struct drm_bridge_state *
--drm_atomic_get_new_bridge_state(struct drm_atomic_state *state,
-+drm_atomic_get_new_bridge_state(const struct drm_atomic_state *state,
- 				struct drm_bridge *bridge);
- 
- #endif /* DRM_ATOMIC_H_ */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0478-drm-vc4-Constify-container_of-wrappers.patch b/target/linux/bcm27xx/patches-6.1/950-0478-drm-vc4-Constify-container_of-wrappers.patch
deleted file mode 100644
index 795c8e191e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0478-drm-vc4-Constify-container_of-wrappers.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From aec4486d6889afcfe706684f2d24cfe9350168b4 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Wed, 23 Nov 2022 16:25:53 +0100
-Subject: [PATCH] drm/vc4: Constify container_of wrappers
-
-None of our wrappers around container_of to access our objects from the
-DRM object pointer actually modify the latter.
-
-Let's make them const.
-
-Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
-Link: https://patchwork.freedesktop.org/patch/msgid/20221123-rpi-kunit-tests-v1-11-051a0bb60a16@cerno.tech
----
- drivers/gpu/drm/vc4/vc4_drv.h | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -238,7 +238,7 @@ struct vc4_dev {
- };
- 
- static inline struct vc4_dev *
--to_vc4_dev(struct drm_device *dev)
-+to_vc4_dev(const struct drm_device *dev)
- {
- 	return container_of(dev, struct vc4_dev, base);
- }
-@@ -291,7 +291,7 @@ struct vc4_bo {
- };
- 
- static inline struct vc4_bo *
--to_vc4_bo(struct drm_gem_object *bo)
-+to_vc4_bo(const struct drm_gem_object *bo)
- {
- 	return container_of(to_drm_gem_dma_obj(bo), struct vc4_bo, base);
- }
-@@ -304,7 +304,7 @@ struct vc4_fence {
- };
- 
- static inline struct vc4_fence *
--to_vc4_fence(struct dma_fence *fence)
-+to_vc4_fence(const struct dma_fence *fence)
- {
- 	return container_of(fence, struct vc4_fence, base);
- }
-@@ -365,7 +365,7 @@ struct vc4_plane {
- };
- 
- static inline struct vc4_plane *
--to_vc4_plane(struct drm_plane *plane)
-+to_vc4_plane(const struct drm_plane *plane)
- {
- 	return container_of(plane, struct vc4_plane, base);
- }
-@@ -441,7 +441,7 @@ struct vc4_plane_state {
- };
- 
- static inline struct vc4_plane_state *
--to_vc4_plane_state(struct drm_plane_state *state)
-+to_vc4_plane_state(const struct drm_plane_state *state)
- {
- 	return container_of(state, struct vc4_plane_state, base);
- }
-@@ -471,7 +471,7 @@ struct vc4_encoder {
- };
- 
- static inline struct vc4_encoder *
--to_vc4_encoder(struct drm_encoder *encoder)
-+to_vc4_encoder(const struct drm_encoder *encoder)
- {
- 	return container_of(encoder, struct vc4_encoder, base);
- }
-@@ -565,7 +565,7 @@ struct vc4_crtc {
- };
- 
- static inline struct vc4_crtc *
--to_vc4_crtc(struct drm_crtc *crtc)
-+to_vc4_crtc(const struct drm_crtc *crtc)
- {
- 	return container_of(crtc, struct vc4_crtc, base);
- }
-@@ -608,7 +608,7 @@ struct vc4_crtc_state {
- #define VC4_HVS_CHANNEL_DISABLED ((unsigned int)-1)
- 
- static inline struct vc4_crtc_state *
--to_vc4_crtc_state(struct drm_crtc_state *crtc_state)
-+to_vc4_crtc_state(const struct drm_crtc_state *crtc_state)
- {
- 	return container_of(crtc_state, struct vc4_crtc_state, base);
- }
diff --git a/target/linux/bcm27xx/patches-6.1/950-0479-drm-vc4-kms-Constify-the-HVS-old-new-state-helpers.patch b/target/linux/bcm27xx/patches-6.1/950-0479-drm-vc4-kms-Constify-the-HVS-old-new-state-helpers.patch
deleted file mode 100644
index e94dbb8a31..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0479-drm-vc4-kms-Constify-the-HVS-old-new-state-helpers.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 18d15815d045976ffce0c57aed3d3a61e0d04297 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Wed, 23 Nov 2022 16:25:55 +0100
-Subject: [PATCH] drm/vc4: kms: Constify the HVS old/new state helpers
-
-The vc4_hvs_get_(old|new)_global_state functions don't modify the
-drm_atomic_state passed as an argument, so let's make it const.
-
-Link: https://lore.kernel.org/r/20221123-rpi-kunit-tests-v1-13-051a0bb60a16@cerno.tech
-Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_kms.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_kms.c
-+++ b/drivers/gpu/drm/vc4/vc4_kms.c
-@@ -194,7 +194,7 @@ vc4_ctm_commit(struct vc4_dev *vc4, stru
- }
- 
- static struct vc4_hvs_state *
--vc4_hvs_get_new_global_state(struct drm_atomic_state *state)
-+vc4_hvs_get_new_global_state(const struct drm_atomic_state *state)
- {
- 	struct vc4_dev *vc4 = to_vc4_dev(state->dev);
- 	struct drm_private_state *priv_state;
-@@ -207,7 +207,7 @@ vc4_hvs_get_new_global_state(struct drm_
- }
- 
- static struct vc4_hvs_state *
--vc4_hvs_get_old_global_state(struct drm_atomic_state *state)
-+vc4_hvs_get_old_global_state(const struct drm_atomic_state *state)
- {
- 	struct vc4_dev *vc4 = to_vc4_dev(state->dev);
- 	struct drm_private_state *priv_state;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0480-drm-vc4-kms-Sort-the-CRTCs-by-output-before-assignin.patch b/target/linux/bcm27xx/patches-6.1/950-0480-drm-vc4-kms-Sort-the-CRTCs-by-output-before-assignin.patch
deleted file mode 100644
index dc667ed366..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0480-drm-vc4-kms-Sort-the-CRTCs-by-output-before-assignin.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-From 91dc4d4202c571edfcbc9357642609b07a9cbee8 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Wed, 23 Nov 2022 16:25:52 +0100
-Subject: [PATCH] drm/vc4: kms: Sort the CRTCs by output before
- assigning them
-
-On the vc4 devices (and later), the blending is done by a single device
-called the HVS. The HVS has three FIFO that can operate in parallel, and
-route their output to 6 CRTCs and 7 encoders on the BCM2711.
-
-Each of these CRTCs and encoders have some constraints on which FIFO
-they can feed from, so we need some code to take all those constraints
-into account and assign FIFOs to CRTCs.
-
-The problem can be simplified by assigning those FIFOs to CRTCs by
-ascending output index number. We had a comment mentioning it already,
-but we were never actually enforcing it.
-
-It was working still in most situations because the probe order is
-roughly equivalent, except for the (optional, and fairly rarely used on
-the Pi4) VEC which was last in the probe order sequence, but one of the
-earliest device to assign.
-
-This resulted in configurations that were rejected by our code but were
-still valid with a different assignment.
-
-We can fix this by making sure we assign CRTCs to FIFOs by ordering
-them by ascending HVS output index.
-
-Fixes: 87ebcd42fb7b ("drm/vc4: crtc: Assign output to channel automatically")
-Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
-Link: https://patchwork.freedesktop.org/patch/msgid/20221123-rpi-kunit-tests-v1-10-051a0bb60a16@cerno.tech
----
- drivers/gpu/drm/vc4/vc4_kms.c | 109 ++++++++++++++++++++++++----------
- 1 file changed, 76 insertions(+), 33 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_kms.c
-+++ b/drivers/gpu/drm/vc4/vc4_kms.c
-@@ -12,6 +12,7 @@
-  */
- 
- #include <linux/clk.h>
-+#include <linux/sort.h>
- 
- #include <drm/drm_atomic.h>
- #include <drm/drm_atomic_helper.h>
-@@ -791,6 +792,20 @@ static int vc4_hvs_channels_obj_init(str
- 	return drmm_add_action_or_reset(&vc4->base, vc4_hvs_channels_obj_fini, NULL);
- }
- 
-+static int cmp_vc4_crtc_hvs_output(const void *a, const void *b)
-+{
-+	const struct vc4_crtc *crtc_a =
-+		to_vc4_crtc(*(const struct drm_crtc **)a);
-+	const struct vc4_crtc_data *data_a =
-+		vc4_crtc_to_vc4_crtc_data(crtc_a);
-+	const struct vc4_crtc *crtc_b =
-+		to_vc4_crtc(*(const struct drm_crtc **)b);
-+	const struct vc4_crtc_data *data_b =
-+		vc4_crtc_to_vc4_crtc_data(crtc_b);
-+
-+	return data_a->hvs_output - data_b->hvs_output;
-+}
-+
- /*
-  * The BCM2711 HVS has up to 7 outputs connected to the pixelvalves and
-  * the TXP (and therefore all the CRTCs found on that platform).
-@@ -826,10 +841,11 @@ static int vc4_pv_muxing_atomic_check(st
- {
- 	struct vc4_dev *vc4 = to_vc4_dev(state->dev);
- 	struct vc4_hvs_state *hvs_new_state;
--	struct drm_crtc_state *old_crtc_state, *new_crtc_state;
-+	struct drm_crtc **sorted_crtcs;
- 	struct drm_crtc *crtc;
- 	unsigned int unassigned_channels = 0;
- 	unsigned int i;
-+	int ret;
- 
- 	hvs_new_state = vc4_hvs_get_global_state(state);
- 	if (IS_ERR(hvs_new_state))
-@@ -839,18 +855,62 @@ static int vc4_pv_muxing_atomic_check(st
- 		if (!hvs_new_state->fifo_state[i].in_use)
- 			unassigned_channels |= BIT(i);
- 
--	for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {
--		struct vc4_crtc_state *old_vc4_crtc_state =
--			to_vc4_crtc_state(old_crtc_state);
--		struct vc4_crtc_state *new_vc4_crtc_state =
--			to_vc4_crtc_state(new_crtc_state);
--		struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
-+	/*
-+	 * The problem we have to solve here is that we have up to 7
-+	 * encoders, connected to up to 6 CRTCs.
-+	 *
-+	 * Those CRTCs, depending on the instance, can be routed to 1, 2
-+	 * or 3 HVS FIFOs, and we need to set the muxing between FIFOs and
-+	 * outputs in the HVS accordingly.
-+	 *
-+	 * It would be pretty hard to come up with an algorithm that
-+	 * would generically solve this. However, the current routing
-+	 * trees we support allow us to simplify a bit the problem.
-+	 *
-+	 * Indeed, with the current supported layouts, if we try to
-+	 * assign in the ascending crtc index order the FIFOs, we can't
-+	 * fall into the situation where an earlier CRTC that had
-+	 * multiple routes is assigned one that was the only option for
-+	 * a later CRTC.
-+	 *
-+	 * If the layout changes and doesn't give us that in the future,
-+	 * we will need to have something smarter, but it works so far.
-+	 */
-+	sorted_crtcs = kmalloc_array(dev->num_crtcs, sizeof(*sorted_crtcs), GFP_KERNEL);
-+	if (!sorted_crtcs)
-+		return -ENOMEM;
-+
-+	i = 0;
-+	drm_for_each_crtc(crtc, dev)
-+		sorted_crtcs[i++] = crtc;
-+
-+	sort(sorted_crtcs, i, sizeof(*sorted_crtcs), cmp_vc4_crtc_hvs_output, NULL);
-+
-+	for (i = 0; i < dev->num_crtcs; i++) {
-+		struct vc4_crtc_state *old_vc4_crtc_state, *new_vc4_crtc_state;
-+		struct drm_crtc_state *old_crtc_state, *new_crtc_state;
-+		struct vc4_crtc *vc4_crtc;
- 		unsigned int matching_channels;
- 		unsigned int channel;
- 
- 		if (vc4->firmware_kms)
- 			continue;
- 
-+		crtc = sorted_crtcs[i];
-+		if (!crtc)
-+			continue;
-+		vc4_crtc = to_vc4_crtc(crtc);
-+
-+		old_crtc_state = drm_atomic_get_old_crtc_state(state, crtc);
-+		if (!old_crtc_state)
-+			continue;
-+		old_vc4_crtc_state = to_vc4_crtc_state(old_crtc_state);
-+
-+		new_crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
-+		if (!new_crtc_state)
-+			continue;
-+		new_vc4_crtc_state = to_vc4_crtc_state(new_crtc_state);
-+
- 		drm_dbg(dev, "%s: Trying to find a channel.\n", crtc->name);
- 
- 		/* Nothing to do here, let's skip it */
-@@ -879,33 +939,11 @@ static int vc4_pv_muxing_atomic_check(st
- 			continue;
- 		}
- 
--		/*
--		 * The problem we have to solve here is that we have
--		 * up to 7 encoders, connected to up to 6 CRTCs.
--		 *
--		 * Those CRTCs, depending on the instance, can be
--		 * routed to 1, 2 or 3 HVS FIFOs, and we need to set
--		 * the change the muxing between FIFOs and outputs in
--		 * the HVS accordingly.
--		 *
--		 * It would be pretty hard to come up with an
--		 * algorithm that would generically solve
--		 * this. However, the current routing trees we support
--		 * allow us to simplify a bit the problem.
--		 *
--		 * Indeed, with the current supported layouts, if we
--		 * try to assign in the ascending crtc index order the
--		 * FIFOs, we can't fall into the situation where an
--		 * earlier CRTC that had multiple routes is assigned
--		 * one that was the only option for a later CRTC.
--		 *
--		 * If the layout changes and doesn't give us that in
--		 * the future, we will need to have something smarter,
--		 * but it works so far.
--		 */
- 		matching_channels = unassigned_channels & vc4_crtc->data->hvs_available_channels;
--		if (!matching_channels)
--			return -EINVAL;
-+		if (!matching_channels) {
-+			ret = -EINVAL;
-+			goto err_free_crtc_array;
-+		}
- 
- 		channel = ffs(matching_channels) - 1;
- 
-@@ -915,7 +953,12 @@ static int vc4_pv_muxing_atomic_check(st
- 		hvs_new_state->fifo_state[channel].in_use = true;
- 	}
- 
-+	kfree(sorted_crtcs);
- 	return 0;
-+
-+err_free_crtc_array:
-+	kfree(sorted_crtcs);
-+	return ret;
- }
- 
- static int
diff --git a/target/linux/bcm27xx/patches-6.1/950-0481-drm-vc4-txp-Reorder-the-variable-assignments.patch b/target/linux/bcm27xx/patches-6.1/950-0481-drm-vc4-txp-Reorder-the-variable-assignments.patch
deleted file mode 100644
index 99a0dae2d1..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0481-drm-vc4-txp-Reorder-the-variable-assignments.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 32d1377cec2075ce76756f687b964b1b02beed65 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Wed, 23 Nov 2022 16:25:56 +0100
-Subject: [PATCH] drm/vc4: txp: Reorder the variable assignments
-
-The current order of variable assignments is unneccessarily complex,
-let's make it simpler.
-
-Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
-Link: https://patchwork.freedesktop.org/patch/msgid/20221123-rpi-kunit-tests-v1-14-051a0bb60a16@cerno.tech
----
- drivers/gpu/drm/vc4/vc4_txp.c | 15 ++++++---------
- 1 file changed, 6 insertions(+), 9 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_txp.c
-+++ b/drivers/gpu/drm/vc4/vc4_txp.c
-@@ -490,7 +490,6 @@ static int vc4_txp_bind(struct device *d
- 	struct drm_device *drm = dev_get_drvdata(master);
- 	struct vc4_crtc *vc4_crtc;
- 	struct vc4_txp *txp;
--	struct drm_crtc *crtc;
- 	struct drm_encoder *encoder;
- 	int ret, irq;
- 
-@@ -501,18 +500,16 @@ static int vc4_txp_bind(struct device *d
- 	txp = drmm_kzalloc(drm, sizeof(*txp), GFP_KERNEL);
- 	if (!txp)
- 		return -ENOMEM;
--	vc4_crtc = &txp->base;
--	crtc = &vc4_crtc->base;
--
--	vc4_crtc->pdev = pdev;
--	vc4_crtc->data = &vc4_txp_crtc_data;
--	vc4_crtc->feeds_txp = true;
- 
- 	txp->pdev = pdev;
--
- 	txp->regs = vc4_ioremap_regs(pdev, 0);
- 	if (IS_ERR(txp->regs))
- 		return PTR_ERR(txp->regs);
-+
-+	vc4_crtc = &txp->base;
-+	vc4_crtc->pdev = pdev;
-+	vc4_crtc->data = &vc4_txp_crtc_data;
-+	vc4_crtc->feeds_txp = true;
- 	vc4_crtc->regset.base = txp->regs;
- 	vc4_crtc->regset.regs = txp_regs;
- 	vc4_crtc->regset.nregs = ARRAY_SIZE(txp_regs);
-@@ -533,7 +530,7 @@ static int vc4_txp_bind(struct device *d
- 		return ret;
- 
- 	encoder = &txp->connector.encoder;
--	encoder->possible_crtcs = drm_crtc_mask(crtc);
-+	encoder->possible_crtcs = drm_crtc_mask(&vc4_crtc->base);
- 
- 	ret = devm_request_irq(dev, irq, vc4_txp_interrupt, 0,
- 			       dev_name(dev), txp);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0482-drm-vc4-Add-TXP-encoder-type.patch b/target/linux/bcm27xx/patches-6.1/950-0482-drm-vc4-Add-TXP-encoder-type.patch
deleted file mode 100644
index 0784395c41..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0482-drm-vc4-Add-TXP-encoder-type.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From cbaaad53cb0b50e64a981c1acde491243a525861 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Wed, 23 Nov 2022 16:25:57 +0100
-Subject: [PATCH] drm/vc4: Add TXP encoder type
-
-The TXP is integrated as a separate CRTC/Encoder/Connector combo, but
-for some reason doesn't rely on the vc4_encoder type and it's associated
-type.
-
-Let's create a type to make it consistent with the other encoders.
-
-Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
-Link: https://patchwork.freedesktop.org/patch/msgid/20221123-rpi-kunit-tests-v1-15-051a0bb60a16@cerno.tech
----
- drivers/gpu/drm/vc4/vc4_drv.h |  1 +
- drivers/gpu/drm/vc4/vc4_txp.c | 30 ++++++++++++++++++++----------
- 2 files changed, 21 insertions(+), 10 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -455,6 +455,7 @@ enum vc4_encoder_type {
- 	VC4_ENCODER_TYPE_DSI1,
- 	VC4_ENCODER_TYPE_SMI,
- 	VC4_ENCODER_TYPE_DPI,
-+	VC4_ENCODER_TYPE_TXP,
- };
- 
- struct vc4_encoder {
---- a/drivers/gpu/drm/vc4/vc4_txp.c
-+++ b/drivers/gpu/drm/vc4/vc4_txp.c
-@@ -153,6 +153,7 @@ struct vc4_txp {
- 
- 	struct platform_device *pdev;
- 
-+	struct vc4_encoder encoder;
- 	struct drm_writeback_connector connector;
- 
- 	void __iomem *regs;
-@@ -160,7 +161,7 @@ struct vc4_txp {
- 
- static inline struct vc4_txp *encoder_to_vc4_txp(struct drm_encoder *encoder)
- {
--	return container_of(encoder, struct vc4_txp, connector.encoder);
-+	return container_of(encoder, struct vc4_txp, encoder.base);
- }
- 
- static inline struct vc4_txp *connector_to_vc4_txp(struct drm_connector *conn)
-@@ -488,9 +489,10 @@ static int vc4_txp_bind(struct device *d
- {
- 	struct platform_device *pdev = to_platform_device(dev);
- 	struct drm_device *drm = dev_get_drvdata(master);
-+	struct vc4_encoder *vc4_encoder;
-+	struct drm_encoder *encoder;
- 	struct vc4_crtc *vc4_crtc;
- 	struct vc4_txp *txp;
--	struct drm_encoder *encoder;
- 	int ret, irq;
- 
- 	irq = platform_get_irq(pdev, 0);
-@@ -514,13 +516,24 @@ static int vc4_txp_bind(struct device *d
- 	vc4_crtc->regset.regs = txp_regs;
- 	vc4_crtc->regset.nregs = ARRAY_SIZE(txp_regs);
- 
-+	vc4_encoder = &txp->encoder;
-+	txp->encoder.type = VC4_ENCODER_TYPE_TXP;
-+
-+	encoder = &vc4_encoder->base;
-+	encoder->possible_crtcs = drm_crtc_mask(&vc4_crtc->base);
-+
-+	drm_encoder_helper_add(encoder, &vc4_txp_encoder_helper_funcs);
-+
-+	ret = drmm_encoder_init(drm, encoder, NULL, DRM_MODE_ENCODER_VIRTUAL, NULL);
-+	if (ret)
-+		return ret;
-+
- 	drm_connector_helper_add(&txp->connector.base,
- 				 &vc4_txp_connector_helper_funcs);
--	ret = drm_writeback_connector_init(drm, &txp->connector,
--					   &vc4_txp_connector_funcs,
--					   &vc4_txp_encoder_helper_funcs,
--					   drm_fmts, ARRAY_SIZE(drm_fmts),
--					   0);
-+	ret = drm_writeback_connector_init_with_encoder(drm, &txp->connector,
-+							encoder,
-+							&vc4_txp_connector_funcs,
-+							drm_fmts, ARRAY_SIZE(drm_fmts));
- 	if (ret)
- 		return ret;
- 
-@@ -529,9 +542,6 @@ static int vc4_txp_bind(struct device *d
- 	if (ret)
- 		return ret;
- 
--	encoder = &txp->connector.encoder;
--	encoder->possible_crtcs = drm_crtc_mask(&vc4_crtc->base);
--
- 	ret = devm_request_irq(dev, irq, vc4_txp_interrupt, 0,
- 			       dev_name(dev), txp);
- 	if (ret)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0483-drm-vc4-txp-Initialise-the-CRTC-before-the-encoder-a.patch b/target/linux/bcm27xx/patches-6.1/950-0483-drm-vc4-txp-Initialise-the-CRTC-before-the-encoder-a.patch
deleted file mode 100644
index 3db32889cd..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0483-drm-vc4-txp-Initialise-the-CRTC-before-the-encoder-a.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 6314c24d162b32cfe3113329e5a44bfd7ac71ddc Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Wed, 23 Nov 2022 16:25:58 +0100
-Subject: [PATCH] drm/vc4: txp: Initialise the CRTC before the encoder
- and connector
-
-It makes more sense to register the CRTC before the encoder and
-connectors, so let's move our call around.
-
-Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
-Link: https://patchwork.freedesktop.org/patch/msgid/20221123-rpi-kunit-tests-v1-16-051a0bb60a16@cerno.tech
----
- drivers/gpu/drm/vc4/vc4_txp.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_txp.c
-+++ b/drivers/gpu/drm/vc4/vc4_txp.c
-@@ -516,6 +516,11 @@ static int vc4_txp_bind(struct device *d
- 	vc4_crtc->regset.regs = txp_regs;
- 	vc4_crtc->regset.nregs = ARRAY_SIZE(txp_regs);
- 
-+	ret = vc4_crtc_init(drm, vc4_crtc,
-+			    &vc4_txp_crtc_funcs, &vc4_txp_crtc_helper_funcs);
-+	if (ret)
-+		return ret;
-+
- 	vc4_encoder = &txp->encoder;
- 	txp->encoder.type = VC4_ENCODER_TYPE_TXP;
- 
-@@ -537,11 +542,6 @@ static int vc4_txp_bind(struct device *d
- 	if (ret)
- 		return ret;
- 
--	ret = vc4_crtc_init(drm, vc4_crtc,
--			    &vc4_txp_crtc_funcs, &vc4_txp_crtc_helper_funcs);
--	if (ret)
--		return ret;
--
- 	ret = devm_request_irq(dev, irq, vc4_txp_interrupt, 0,
- 			       dev_name(dev), txp);
- 	if (ret)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0484-drm-vc4-crtc-Pass-the-device-and-data-in-vc4_crtc_in.patch b/target/linux/bcm27xx/patches-6.1/950-0484-drm-vc4-crtc-Pass-the-device-and-data-in-vc4_crtc_in.patch
deleted file mode 100644
index e3526c089b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0484-drm-vc4-crtc-Pass-the-device-and-data-in-vc4_crtc_in.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 81c14f160cd4129057f3fec5ff5a0f897f91db54 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Wed, 23 Nov 2022 16:25:59 +0100
-Subject: [PATCH] drm/vc4: crtc: Pass the device and data in
- vc4_crtc_init
-
-Both users of vc4_crtc_init need the same extra initialization to set
-the pointer to the platform_device and the CRTC data. Since it's
-mandatory, let's make them both arguments of vc4_crtc_init().
-
-Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
-Link: https://patchwork.freedesktop.org/patch/msgid/20221123-rpi-kunit-tests-v1-17-051a0bb60a16@cerno.tech
----
- drivers/gpu/drm/vc4/vc4_crtc.c | 17 +++++++++++------
- drivers/gpu/drm/vc4/vc4_drv.h  |  6 ++++--
- drivers/gpu/drm/vc4/vc4_txp.c  |  7 ++-----
- 3 files changed, 17 insertions(+), 13 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_crtc.c
-+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
-@@ -1318,9 +1318,12 @@ static void vc4_set_crtc_possible_masks(
- 	}
- }
- 
--int vc4_crtc_init(struct drm_device *drm, struct vc4_crtc *vc4_crtc,
-+int vc4_crtc_init(struct drm_device *drm, struct platform_device *pdev,
-+		  struct vc4_crtc *vc4_crtc,
-+		  const struct vc4_crtc_data *data,
- 		  const struct drm_crtc_funcs *crtc_funcs,
--		  const struct drm_crtc_helper_funcs *crtc_helper_funcs)
-+		  const struct drm_crtc_helper_funcs *crtc_helper_funcs,
-+		  bool feeds_txp)
- {
- 	struct vc4_dev *vc4 = to_vc4_dev(drm);
- 	struct drm_crtc *crtc = &vc4_crtc->base;
-@@ -1340,6 +1343,9 @@ int vc4_crtc_init(struct drm_device *drm
- 		return PTR_ERR(primary_plane);
- 	}
- 
-+	vc4_crtc->data = data;
-+	vc4_crtc->pdev = pdev;
-+	vc4_crtc->feeds_txp = feeds_txp;
- 	spin_lock_init(&vc4_crtc->irq_lock);
- 	ret = drmm_crtc_init_with_planes(drm, crtc, primary_plane, NULL,
- 					 crtc_funcs, NULL);
-@@ -1402,8 +1408,6 @@ static int vc4_crtc_bind(struct device *
- 	pv_data = of_device_get_match_data(dev);
- 	if (!pv_data)
- 		return -ENODEV;
--	vc4_crtc->data = &pv_data->base;
--	vc4_crtc->pdev = pdev;
- 
- 	vc4_crtc->regs = vc4_ioremap_regs(pdev, 0);
- 	if (IS_ERR(vc4_crtc->regs))
-@@ -1413,8 +1417,9 @@ static int vc4_crtc_bind(struct device *
- 	vc4_crtc->regset.regs = crtc_regs;
- 	vc4_crtc->regset.nregs = ARRAY_SIZE(crtc_regs);
- 
--	ret = vc4_crtc_init(drm, vc4_crtc,
--			    &vc4_crtc_funcs, &vc4_crtc_helper_funcs);
-+	ret = vc4_crtc_init(drm, pdev, vc4_crtc, &pv_data->base,
-+			    &vc4_crtc_funcs, &vc4_crtc_helper_funcs,
-+			    false);
- 	if (ret)
- 		return ret;
- 	vc4_set_crtc_possible_masks(drm, crtc);
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -887,9 +887,11 @@ int vc4_bo_debugfs_init(struct drm_minor
- /* vc4_crtc.c */
- extern struct platform_driver vc4_crtc_driver;
- int vc4_crtc_disable_at_boot(struct drm_crtc *crtc);
--int vc4_crtc_init(struct drm_device *drm, struct vc4_crtc *vc4_crtc,
-+int vc4_crtc_init(struct drm_device *drm, struct platform_device *pdev,
-+		  struct vc4_crtc *vc4_crtc, const struct vc4_crtc_data *data,
- 		  const struct drm_crtc_funcs *crtc_funcs,
--		  const struct drm_crtc_helper_funcs *crtc_helper_funcs);
-+		  const struct drm_crtc_helper_funcs *crtc_helper_funcs,
-+		  bool feeds_txp);
- int vc4_page_flip(struct drm_crtc *crtc,
- 		  struct drm_framebuffer *fb,
- 		  struct drm_pending_vblank_event *event,
---- a/drivers/gpu/drm/vc4/vc4_txp.c
-+++ b/drivers/gpu/drm/vc4/vc4_txp.c
-@@ -509,15 +509,12 @@ static int vc4_txp_bind(struct device *d
- 		return PTR_ERR(txp->regs);
- 
- 	vc4_crtc = &txp->base;
--	vc4_crtc->pdev = pdev;
--	vc4_crtc->data = &vc4_txp_crtc_data;
--	vc4_crtc->feeds_txp = true;
- 	vc4_crtc->regset.base = txp->regs;
- 	vc4_crtc->regset.regs = txp_regs;
- 	vc4_crtc->regset.nregs = ARRAY_SIZE(txp_regs);
- 
--	ret = vc4_crtc_init(drm, vc4_crtc,
--			    &vc4_txp_crtc_funcs, &vc4_txp_crtc_helper_funcs);
-+	ret = vc4_crtc_init(drm, pdev, vc4_crtc, &vc4_txp_crtc_data,
-+			    &vc4_txp_crtc_funcs, &vc4_txp_crtc_helper_funcs, true);
- 	if (ret)
- 		return ret;
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0485-drm-vc4-crtc-Provide-a-CRTC-name.patch b/target/linux/bcm27xx/patches-6.1/950-0485-drm-vc4-crtc-Provide-a-CRTC-name.patch
deleted file mode 100644
index bfb344a994..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0485-drm-vc4-crtc-Provide-a-CRTC-name.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 0058bbeb9f6223b9760aba662ccba5d25290e4bd Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Wed, 23 Nov 2022 16:26:02 +0100
-Subject: [PATCH] drm/vc4: crtc: Provide a CRTC name
-
-It's fairly hard to figure out the instance of the CRTC affected by an
-atomic change using the default name.
-
-Since we can provide our own to the CRTC initialization functions, let's
-do so to make the debugging sessions easier.
-
-Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
-Link: https://patchwork.freedesktop.org/patch/msgid/20221123-rpi-kunit-tests-v1-20-051a0bb60a16@cerno.tech
----
- drivers/gpu/drm/vc4/vc4_crtc.c | 10 +++++++++-
- drivers/gpu/drm/vc4/vc4_drv.h  |  2 ++
- drivers/gpu/drm/vc4/vc4_txp.c  |  1 +
- 3 files changed, 12 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/vc4/vc4_crtc.c
-+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
-@@ -1173,6 +1173,7 @@ static const struct drm_crtc_helper_func
- 
- static const struct vc4_pv_data bcm2835_pv0_data = {
- 	.base = {
-+		.name = "pixelvalve-0",
- 		.debugfs_name = "crtc0_regs",
- 		.hvs_available_channels = BIT(0),
- 		.hvs_output = 0,
-@@ -1187,6 +1188,7 @@ static const struct vc4_pv_data bcm2835_
- 
- static const struct vc4_pv_data bcm2835_pv1_data = {
- 	.base = {
-+		.name = "pixelvalve-1",
- 		.debugfs_name = "crtc1_regs",
- 		.hvs_available_channels = BIT(2),
- 		.hvs_output = 2,
-@@ -1201,6 +1203,7 @@ static const struct vc4_pv_data bcm2835_
- 
- static const struct vc4_pv_data bcm2835_pv2_data = {
- 	.base = {
-+		.name = "pixelvalve-2",
- 		.debugfs_name = "crtc2_regs",
- 		.hvs_available_channels = BIT(1),
- 		.hvs_output = 1,
-@@ -1215,6 +1218,7 @@ static const struct vc4_pv_data bcm2835_
- 
- static const struct vc4_pv_data bcm2711_pv0_data = {
- 	.base = {
-+		.name = "pixelvalve-0",
- 		.debugfs_name = "crtc0_regs",
- 		.hvs_available_channels = BIT(0),
- 		.hvs_output = 0,
-@@ -1229,6 +1233,7 @@ static const struct vc4_pv_data bcm2711_
- 
- static const struct vc4_pv_data bcm2711_pv1_data = {
- 	.base = {
-+		.name = "pixelvalve-1",
- 		.debugfs_name = "crtc1_regs",
- 		.hvs_available_channels = BIT(0) | BIT(1) | BIT(2),
- 		.hvs_output = 3,
-@@ -1243,6 +1248,7 @@ static const struct vc4_pv_data bcm2711_
- 
- static const struct vc4_pv_data bcm2711_pv2_data = {
- 	.base = {
-+		.name = "pixelvalve-2",
- 		.debugfs_name = "crtc2_regs",
- 		.hvs_available_channels = BIT(0) | BIT(1) | BIT(2),
- 		.hvs_output = 4,
-@@ -1256,6 +1262,7 @@ static const struct vc4_pv_data bcm2711_
- 
- static const struct vc4_pv_data bcm2711_pv3_data = {
- 	.base = {
-+		.name = "pixelvalve-3",
- 		.debugfs_name = "crtc3_regs",
- 		.hvs_available_channels = BIT(1),
- 		.hvs_output = 1,
-@@ -1269,6 +1276,7 @@ static const struct vc4_pv_data bcm2711_
- 
- static const struct vc4_pv_data bcm2711_pv4_data = {
- 	.base = {
-+		.name = "pixelvalve-4",
- 		.debugfs_name = "crtc4_regs",
- 		.hvs_available_channels = BIT(0) | BIT(1) | BIT(2),
- 		.hvs_output = 5,
-@@ -1348,7 +1356,7 @@ int vc4_crtc_init(struct drm_device *drm
- 	vc4_crtc->feeds_txp = feeds_txp;
- 	spin_lock_init(&vc4_crtc->irq_lock);
- 	ret = drmm_crtc_init_with_planes(drm, crtc, primary_plane, NULL,
--					 crtc_funcs, NULL);
-+					 crtc_funcs, data->name);
- 	if (ret)
- 		return ret;
- 
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -478,6 +478,8 @@ to_vc4_encoder(const struct drm_encoder
- }
- 
- struct vc4_crtc_data {
-+	const char *name;
-+
- 	const char *debugfs_name;
- 
- 	/* Bitmask of channels (FIFOs) of the HVS that the output can source from */
---- a/drivers/gpu/drm/vc4/vc4_txp.c
-+++ b/drivers/gpu/drm/vc4/vc4_txp.c
-@@ -480,6 +480,7 @@ static irqreturn_t vc4_txp_interrupt(int
- }
- 
- static const struct vc4_crtc_data vc4_txp_crtc_data = {
-+	.name = "txp",
- 	.debugfs_name = "txp_regs",
- 	.hvs_available_channels = BIT(2),
- 	.hvs_output = 2,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0486-drm-tests-helpers-Add-missing-export.patch b/target/linux/bcm27xx/patches-6.1/950-0486-drm-tests-helpers-Add-missing-export.patch
deleted file mode 100644
index 55272f2ffe..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0486-drm-tests-helpers-Add-missing-export.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 06a4752fb31b0b4abf0f31301cec18b59f6454bd Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Mon, 28 Nov 2022 09:19:38 +0100
-Subject: [PATCH] drm/tests: helpers: Add missing export
-
-drm_kunit_device_init() is a public function meant to be used by other
-tests, but isn't exported. This leads to modpost errors when the other
-tests are compiled as module.
-
-Reported-by: kernel test robot <lkp@intel.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/tests/drm_kunit_helpers.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/gpu/drm/tests/drm_kunit_helpers.c
-+++ b/drivers/gpu/drm/tests/drm_kunit_helpers.c
-@@ -66,6 +66,7 @@ struct drm_device *drm_kunit_device_init
- 
- 	return drm;
- }
-+EXPORT_SYMBOL(drm_kunit_device_init);
- 
- MODULE_AUTHOR("Maxime Ripard <maxime@cerno.tech>");
- MODULE_LICENSE("GPL");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0487-drm-tests-helpers-Move-the-helper-header-to-include-.patch b/target/linux/bcm27xx/patches-6.1/950-0487-drm-tests-helpers-Move-the-helper-header-to-include-.patch
deleted file mode 100644
index 2f8671c0e1..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0487-drm-tests-helpers-Move-the-helper-header-to-include-.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From f5e9c38169dc19ff64f32a38e4fdd3eef74df103 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Mon, 28 Nov 2022 14:12:43 +0100
-Subject: [PATCH] drm/tests: helpers: Move the helper header to
- include/drm
-
-We'll need to use those helpers from drivers too, so let's move it to a
-more visible location.
-
-Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/tests/drm_kunit_helpers.c                  | 3 +--
- {drivers/gpu/drm/tests => include/drm}/drm_kunit_helpers.h | 0
- 2 files changed, 1 insertion(+), 2 deletions(-)
- rename {drivers/gpu/drm/tests => include/drm}/drm_kunit_helpers.h (100%)
-
---- a/drivers/gpu/drm/tests/drm_kunit_helpers.c
-+++ b/drivers/gpu/drm/tests/drm_kunit_helpers.c
-@@ -1,14 +1,13 @@
- // SPDX-License-Identifier: GPL-2.0
- 
- #include <drm/drm_drv.h>
-+#include <drm/drm_kunit_helpers.h>
- #include <drm/drm_managed.h>
- 
- #include <kunit/resource.h>
- 
- #include <linux/device.h>
- 
--#include "drm_kunit_helpers.h"
--
- struct kunit_dev {
- 	struct drm_device base;
- };
---- a/drivers/gpu/drm/tests/drm_kunit_helpers.h
-+++ /dev/null
-@@ -1,11 +0,0 @@
--// SPDX-License-Identifier: GPL-2.0
--
--#ifndef DRM_KUNIT_HELPERS_H_
--#define DRM_KUNIT_HELPERS_H_
--
--struct drm_device;
--struct kunit;
--
--struct drm_device *drm_kunit_device_init(struct kunit *test, u32 features, char *name);
--
--#endif // DRM_KUNIT_HELPERS_H_
---- /dev/null
-+++ b/include/drm/drm_kunit_helpers.h
-@@ -0,0 +1,11 @@
-+// SPDX-License-Identifier: GPL-2.0
-+
-+#ifndef DRM_KUNIT_HELPERS_H_
-+#define DRM_KUNIT_HELPERS_H_
-+
-+struct drm_device;
-+struct kunit;
-+
-+struct drm_device *drm_kunit_device_init(struct kunit *test, u32 features, char *name);
-+
-+#endif // DRM_KUNIT_HELPERS_H_
diff --git a/target/linux/bcm27xx/patches-6.1/950-0488-drm-tests-Introduce-a-config-option-for-the-KUnit-he.patch b/target/linux/bcm27xx/patches-6.1/950-0488-drm-tests-Introduce-a-config-option-for-the-KUnit-he.patch
deleted file mode 100644
index bac2e70163..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0488-drm-tests-Introduce-a-config-option-for-the-KUnit-he.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 1ddfbb0af0c23a845e941f4e49c6a65358b1c58e Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Thu, 1 Dec 2022 13:37:20 +0100
-Subject: [PATCH] drm/tests: Introduce a config option for the KUnit
- helpers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Driver-specific tests will need access to the helpers without pulling
-every DRM framework test. Let's create an intermediate Kconfig options
-for the helpers.
-
-Suggested-by: Maíra Canal <mcanal@igalia.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/Kconfig        | 7 +++++++
- drivers/gpu/drm/Makefile       | 2 +-
- drivers/gpu/drm/tests/Makefile | 4 +++-
- 3 files changed, 11 insertions(+), 2 deletions(-)
-
---- a/drivers/gpu/drm/Kconfig
-+++ b/drivers/gpu/drm/Kconfig
-@@ -64,6 +64,12 @@ config DRM_USE_DYNAMIC_DEBUG
- 	  bytes per callsite, the .data costs can be substantial, and
- 	  are therefore configurable.
- 
-+config DRM_KUNIT_TEST_HELPERS
-+	tristate
-+	depends on DRM && KUNIT
-+	help
-+	  KUnit Helpers for KMS drivers.
-+
- config DRM_KUNIT_TEST
- 	tristate "KUnit tests for DRM" if !KUNIT_ALL_TESTS
- 	depends on DRM && KUNIT
-@@ -74,6 +80,7 @@ config DRM_KUNIT_TEST
- 	select DRM_KMS_HELPER
- 	select DRM_BUDDY
- 	select DRM_EXPORT_FOR_TESTS if m
-+	select DRM_KUNIT_TEST_HELPERS
- 	default KUNIT_ALL_TESTS
- 	help
- 	  This builds unit tests for DRM. This option is not useful for
---- a/drivers/gpu/drm/Makefile
-+++ b/drivers/gpu/drm/Makefile
-@@ -77,7 +77,7 @@ obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_
- # Drivers and the rest
- #
- 
--obj-$(CONFIG_DRM_KUNIT_TEST) += tests/
-+obj-y			+= tests/
- 
- obj-$(CONFIG_DRM_MIPI_DBI) += drm_mipi_dbi.o
- obj-$(CONFIG_DRM_MIPI_DSI) += drm_mipi_dsi.o
---- a/drivers/gpu/drm/tests/Makefile
-+++ b/drivers/gpu/drm/tests/Makefile
-@@ -1,5 +1,8 @@
- # SPDX-License-Identifier: GPL-2.0
- 
-+obj-$(CONFIG_DRM_KUNIT_TEST_HELPERS) += \
-+	drm_kunit_helpers.o
-+
- obj-$(CONFIG_DRM_KUNIT_TEST) += \
- 	drm_buddy_test.o \
- 	drm_cmdline_parser_test.o \
-@@ -8,7 +11,6 @@ obj-$(CONFIG_DRM_KUNIT_TEST) += \
- 	drm_format_helper_test.o \
- 	drm_format_test.o \
- 	drm_framebuffer_test.o \
--	drm_kunit_helpers.o \
- 	drm_mm_test.o \
- 	drm_plane_helper_test.o \
- 	drm_rect_test.o
diff --git a/target/linux/bcm27xx/patches-6.1/950-0489-drm-tests-helpers-Document-drm_kunit_device_init.patch b/target/linux/bcm27xx/patches-6.1/950-0489-drm-tests-helpers-Document-drm_kunit_device_init.patch
deleted file mode 100644
index 01f21d73ef..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0489-drm-tests-helpers-Document-drm_kunit_device_init.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 1b723c252bbfb7abefd4bd866825a5385bfa5748 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Mon, 28 Nov 2022 13:50:58 +0100
-Subject: [PATCH] drm/tests: helpers: Document drm_kunit_device_init()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit 44a3928324e9 ("drm/tests: Add Kunit Helpers") introduced the
-drm_kunit_device_init() function but didn't document it properly. Add
-that documentation.
-
-Reviewed-by: Maíra Canal <mcanal@igalia.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/tests/drm_kunit_helpers.c | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
---- a/drivers/gpu/drm/tests/drm_kunit_helpers.c
-+++ b/drivers/gpu/drm/tests/drm_kunit_helpers.c
-@@ -35,6 +35,23 @@ static void dev_free(struct kunit_resour
- 	root_device_unregister(dev);
- }
- 
-+/**
-+ * drm_kunit_device_init - Allocates a mock DRM device for KUnit tests
-+ * @test: The test context object
-+ * @features: Mocked DRM device driver features
-+ * @name: Name of the struct &device to allocate
-+ *
-+ * This function allocates a new struct &device, creates a struct
-+ * &drm_driver and will create a struct &drm_device using both.
-+ *
-+ * The device and driver are tied to the @test context and will get
-+ * cleaned at the end of the test. The drm_device is allocated through
-+ * devm_drm_dev_alloc() and will thus be freed through a device-managed
-+ * resource.
-+ *
-+ * Returns:
-+ * A pointer to the new drm_device, or an ERR_PTR() otherwise.
-+ */
- struct drm_device *drm_kunit_device_init(struct kunit *test, u32 features, char *name)
- {
- 	struct kunit_dev *kdev;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0490-drm-tests-helpers-Switch-to-EXPORT_SYMBOL_GPL.patch b/target/linux/bcm27xx/patches-6.1/950-0490-drm-tests-helpers-Switch-to-EXPORT_SYMBOL_GPL.patch
deleted file mode 100644
index 47971cae52..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0490-drm-tests-helpers-Switch-to-EXPORT_SYMBOL_GPL.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d0799b2a8757875d6bcfb91dfad037b017b764c3 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Thu, 1 Dec 2022 14:59:07 +0100
-Subject: [PATCH] drm/tests: helpers: Switch to EXPORT_SYMBOL_GPL
-
-drm_kunit_device_init() among other things will allocate a device and
-wrap around root_device_register. This function is exported with
-EXPORT_SYMBOL_GPL, so we can't really change the license.
-
-Fixes: 199557fab925 ("drm/tests: helpers: Add missing export")
-Suggested-by: Javier Martinez Canillas <javierm@redhat.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/tests/drm_kunit_helpers.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/tests/drm_kunit_helpers.c
-+++ b/drivers/gpu/drm/tests/drm_kunit_helpers.c
-@@ -82,7 +82,7 @@ struct drm_device *drm_kunit_device_init
- 
- 	return drm;
- }
--EXPORT_SYMBOL(drm_kunit_device_init);
-+EXPORT_SYMBOL_GPL(drm_kunit_device_init);
- 
- MODULE_AUTHOR("Maxime Ripard <maxime@cerno.tech>");
- MODULE_LICENSE("GPL");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0491-drm-tests-helpers-Rename-the-device-init-helper.patch b/target/linux/bcm27xx/patches-6.1/950-0491-drm-tests-helpers-Rename-the-device-init-helper.patch
deleted file mode 100644
index c8f0d9c481..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0491-drm-tests-helpers-Rename-the-device-init-helper.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 781ffca07b71a83a6d81e1782659f8a43d7ea401 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Mon, 21 Nov 2022 13:22:59 +0100
-Subject: [PATCH] drm/tests: helpers: Rename the device init helper
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The name doesn't really fit the conventions for the other helpers in
-DRM/KMS, so let's rename it to make it obvious that we allocate a new
-DRM device.
-
-Reviewed-by: Maíra Canal <mcanal@igalia.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/tests/drm_kunit_helpers.c | 8 +++++---
- include/drm/drm_kunit_helpers.h           | 5 ++++-
- 2 files changed, 9 insertions(+), 4 deletions(-)
-
---- a/drivers/gpu/drm/tests/drm_kunit_helpers.c
-+++ b/drivers/gpu/drm/tests/drm_kunit_helpers.c
-@@ -36,7 +36,7 @@ static void dev_free(struct kunit_resour
- }
- 
- /**
-- * drm_kunit_device_init - Allocates a mock DRM device for KUnit tests
-+ * drm_kunit_helper_alloc_drm_device - Allocates a mock DRM device for KUnit tests
-  * @test: The test context object
-  * @features: Mocked DRM device driver features
-  * @name: Name of the struct &device to allocate
-@@ -52,7 +52,9 @@ static void dev_free(struct kunit_resour
-  * Returns:
-  * A pointer to the new drm_device, or an ERR_PTR() otherwise.
-  */
--struct drm_device *drm_kunit_device_init(struct kunit *test, u32 features, char *name)
-+struct drm_device *
-+drm_kunit_helper_alloc_drm_device(struct kunit *test,
-+				  u32 features, char *name)
- {
- 	struct kunit_dev *kdev;
- 	struct drm_device *drm;
-@@ -82,7 +84,7 @@ struct drm_device *drm_kunit_device_init
- 
- 	return drm;
- }
--EXPORT_SYMBOL_GPL(drm_kunit_device_init);
-+EXPORT_SYMBOL_GPL(drm_kunit_helper_alloc_drm_device);
- 
- MODULE_AUTHOR("Maxime Ripard <maxime@cerno.tech>");
- MODULE_LICENSE("GPL");
---- a/include/drm/drm_kunit_helpers.h
-+++ b/include/drm/drm_kunit_helpers.h
-@@ -6,6 +6,9 @@
- struct drm_device;
- struct kunit;
- 
--struct drm_device *drm_kunit_device_init(struct kunit *test, u32 features, char *name);
-+struct drm_device *
-+drm_kunit_helper_alloc_drm_device(struct kunit *test,
-+				  u32 features,
-+				  char *name);
- 
- #endif // DRM_KUNIT_HELPERS_H_
diff --git a/target/linux/bcm27xx/patches-6.1/950-0492-drm-tests-helpers-Remove-the-name-parameter.patch b/target/linux/bcm27xx/patches-6.1/950-0492-drm-tests-helpers-Remove-the-name-parameter.patch
deleted file mode 100644
index a9cc4d53c4..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0492-drm-tests-helpers-Remove-the-name-parameter.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 3a47f6ffdf0cdfd2c59105322ea75796c2708586 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Mon, 21 Nov 2022 13:25:32 +0100
-Subject: [PATCH] drm/tests: helpers: Remove the name parameter
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The device name isn't really useful, we can just define it instead of
-exposing it in the API.
-
-Reviewed-by: Maíra Canal <mcanal@igalia.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/tests/drm_kunit_helpers.c | 7 ++++---
- include/drm/drm_kunit_helpers.h           | 3 +--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
---- a/drivers/gpu/drm/tests/drm_kunit_helpers.c
-+++ b/drivers/gpu/drm/tests/drm_kunit_helpers.c
-@@ -8,6 +8,8 @@
- 
- #include <linux/device.h>
- 
-+#define KUNIT_DEVICE_NAME	"drm-kunit-mock-device"
-+
- struct kunit_dev {
- 	struct drm_device base;
- };
-@@ -39,7 +41,6 @@ static void dev_free(struct kunit_resour
-  * drm_kunit_helper_alloc_drm_device - Allocates a mock DRM device for KUnit tests
-  * @test: The test context object
-  * @features: Mocked DRM device driver features
-- * @name: Name of the struct &device to allocate
-  *
-  * This function allocates a new struct &device, creates a struct
-  * &drm_driver and will create a struct &drm_device using both.
-@@ -54,7 +55,7 @@ static void dev_free(struct kunit_resour
-  */
- struct drm_device *
- drm_kunit_helper_alloc_drm_device(struct kunit *test,
--				  u32 features, char *name)
-+				  u32 features)
- {
- 	struct kunit_dev *kdev;
- 	struct drm_device *drm;
-@@ -62,7 +63,7 @@ drm_kunit_helper_alloc_drm_device(struct
- 	struct device *dev;
- 	int ret;
- 
--	dev = kunit_alloc_resource(test, dev_init, dev_free, GFP_KERNEL, name);
-+	dev = kunit_alloc_resource(test, dev_init, dev_free, GFP_KERNEL, KUNIT_DEVICE_NAME);
- 	if (!dev)
- 		return ERR_PTR(-ENOMEM);
- 
---- a/include/drm/drm_kunit_helpers.h
-+++ b/include/drm/drm_kunit_helpers.h
-@@ -8,7 +8,6 @@ struct kunit;
- 
- struct drm_device *
- drm_kunit_helper_alloc_drm_device(struct kunit *test,
--				  u32 features,
--				  char *name);
-+				  u32 features);
- 
- #endif // DRM_KUNIT_HELPERS_H_
diff --git a/target/linux/bcm27xx/patches-6.1/950-0493-drm-tests-helpers-Create-the-device-in-another-funct.patch b/target/linux/bcm27xx/patches-6.1/950-0493-drm-tests-helpers-Create-the-device-in-another-funct.patch
deleted file mode 100644
index 8c5b6531fd..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0493-drm-tests-helpers-Create-the-device-in-another-funct.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From cb8e04462f60d3f0659ef3adbba06cdf474f7fe3 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Mon, 21 Nov 2022 11:11:52 +0100
-Subject: [PATCH] drm/tests: helpers: Create the device in another
- function
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We'll need in some tests to control when the device needs to be added
-and removed, so let's split the device creation from the DRM device
-creation function.
-
-Reviewed-by: Maíra Canal <mcanal@igalia.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/tests/drm_kunit_helpers.c | 56 +++++++++++++----------
- include/drm/drm_kunit_helpers.h           |  5 +-
- 2 files changed, 37 insertions(+), 24 deletions(-)
-
---- a/drivers/gpu/drm/tests/drm_kunit_helpers.c
-+++ b/drivers/gpu/drm/tests/drm_kunit_helpers.c
-@@ -17,36 +17,51 @@ struct kunit_dev {
- static const struct drm_mode_config_funcs drm_mode_config_funcs = {
- };
- 
--static int dev_init(struct kunit_resource *res, void *ptr)
-+/**
-+ * drm_kunit_helper_alloc_device - Allocate a mock device for a KUnit test
-+ * @test: The test context object
-+ *
-+ * This allocates a fake struct &device to create a mock for a KUnit
-+ * test.
-+ *
-+ * Callers need to make sure drm_kunit_helper_free_device() on the
-+ * device when done.
-+ *
-+ * Returns:
-+ * A pointer to the new device, or an ERR_PTR() otherwise.
-+ */
-+struct device *drm_kunit_helper_alloc_device(struct kunit *test)
- {
--	char *name = ptr;
--	struct device *dev;
--
--	dev = root_device_register(name);
--	if (IS_ERR(dev))
--		return PTR_ERR(dev);
--
--	res->data = dev;
--	return 0;
-+	return root_device_register(KUNIT_DEVICE_NAME);
- }
-+EXPORT_SYMBOL_GPL(drm_kunit_helper_alloc_device);
- 
--static void dev_free(struct kunit_resource *res)
-+/**
-+ * drm_kunit_helper_free_device - Frees a mock device
-+ * @test: The test context object
-+ * @dev: The device to free
-+ *
-+ * Frees a device allocated with drm_kunit_helper_alloc_device().
-+ */
-+void drm_kunit_helper_free_device(struct kunit *test, struct device *dev)
- {
--	struct device *dev = res->data;
--
- 	root_device_unregister(dev);
- }
-+EXPORT_SYMBOL_GPL(drm_kunit_helper_free_device);
- 
- /**
-  * drm_kunit_helper_alloc_drm_device - Allocates a mock DRM device for KUnit tests
-  * @test: The test context object
-+ * @dev: The parent device object
-  * @features: Mocked DRM device driver features
-  *
-- * This function allocates a new struct &device, creates a struct
-- * &drm_driver and will create a struct &drm_device using both.
-+ * This function creates a struct &drm_driver and will create a struct
-+ * &drm_device from @dev and that driver.
-  *
-- * The device and driver are tied to the @test context and will get
-- * cleaned at the end of the test. The drm_device is allocated through
-+ * @dev should be allocated using drm_kunit_helper_alloc_device().
-+ *
-+ * The driver is tied to the @test context and will get cleaned at the
-+ * end of the test. The drm_device is allocated through
-  * devm_drm_dev_alloc() and will thus be freed through a device-managed
-  * resource.
-  *
-@@ -54,19 +69,14 @@ static void dev_free(struct kunit_resour
-  * A pointer to the new drm_device, or an ERR_PTR() otherwise.
-  */
- struct drm_device *
--drm_kunit_helper_alloc_drm_device(struct kunit *test,
-+drm_kunit_helper_alloc_drm_device(struct kunit *test, struct device *dev,
- 				  u32 features)
- {
- 	struct kunit_dev *kdev;
- 	struct drm_device *drm;
- 	struct drm_driver *driver;
--	struct device *dev;
- 	int ret;
- 
--	dev = kunit_alloc_resource(test, dev_init, dev_free, GFP_KERNEL, KUNIT_DEVICE_NAME);
--	if (!dev)
--		return ERR_PTR(-ENOMEM);
--
- 	driver = kunit_kzalloc(test, sizeof(*driver), GFP_KERNEL);
- 	if (!driver)
- 		return ERR_PTR(-ENOMEM);
---- a/include/drm/drm_kunit_helpers.h
-+++ b/include/drm/drm_kunit_helpers.h
-@@ -6,8 +6,11 @@
- struct drm_device;
- struct kunit;
- 
-+struct device *drm_kunit_helper_alloc_device(struct kunit *test);
-+void drm_kunit_helper_free_device(struct kunit *test, struct device *dev);
-+
- struct drm_device *
--drm_kunit_helper_alloc_drm_device(struct kunit *test,
-+drm_kunit_helper_alloc_drm_device(struct kunit *test, struct device *dev,
- 				  u32 features);
- 
- #endif // DRM_KUNIT_HELPERS_H_
diff --git a/target/linux/bcm27xx/patches-6.1/950-0494-drm-tests-helpers-Switch-to-a-platform_device.patch b/target/linux/bcm27xx/patches-6.1/950-0494-drm-tests-helpers-Switch-to-a-platform_device.patch
deleted file mode 100644
index 21310b83df..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0494-drm-tests-helpers-Switch-to-a-platform_device.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 04f6ec35cbb9794bb185f58d15c7d8f326374618 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Mon, 21 Nov 2022 13:33:37 +0100
-Subject: [PATCH] drm/tests: helpers: Switch to a platform_device
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The device managed resources are ran if the device has bus, which is not
-the case of a root_device.
-
-Let's use a platform_device instead.
-
-Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
-Reviewed-by: Maíra Canal <mcanal@igalia.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/tests/drm_kunit_helpers.c | 16 ++++++++++++++--
- 1 file changed, 14 insertions(+), 2 deletions(-)
-
---- a/drivers/gpu/drm/tests/drm_kunit_helpers.c
-+++ b/drivers/gpu/drm/tests/drm_kunit_helpers.c
-@@ -7,6 +7,7 @@
- #include <kunit/resource.h>
- 
- #include <linux/device.h>
-+#include <linux/platform_device.h>
- 
- #define KUNIT_DEVICE_NAME	"drm-kunit-mock-device"
- 
-@@ -32,7 +33,16 @@ static const struct drm_mode_config_func
-  */
- struct device *drm_kunit_helper_alloc_device(struct kunit *test)
- {
--	return root_device_register(KUNIT_DEVICE_NAME);
-+	struct platform_device *pdev;
-+	int ret;
-+
-+	pdev = platform_device_alloc(KUNIT_DEVICE_NAME, PLATFORM_DEVID_NONE);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, pdev);
-+
-+	ret = platform_device_add(pdev);
-+	KUNIT_ASSERT_EQ(test, ret, 0);
-+
-+	return &pdev->dev;
- }
- EXPORT_SYMBOL_GPL(drm_kunit_helper_alloc_device);
- 
-@@ -45,7 +55,9 @@ EXPORT_SYMBOL_GPL(drm_kunit_helper_alloc
-  */
- void drm_kunit_helper_free_device(struct kunit *test, struct device *dev)
- {
--	root_device_unregister(dev);
-+	struct platform_device *pdev = to_platform_device(dev);
-+
-+	platform_device_unregister(pdev);
- }
- EXPORT_SYMBOL_GPL(drm_kunit_helper_free_device);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0495-drm-tests-helpers-Make-sure-the-device-is-bound.patch b/target/linux/bcm27xx/patches-6.1/950-0495-drm-tests-helpers-Make-sure-the-device-is-bound.patch
deleted file mode 100644
index 76989df502..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0495-drm-tests-helpers-Make-sure-the-device-is-bound.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 51e89f803856386ebecef22453ab34907a393954 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Mon, 21 Nov 2022 13:18:29 +0100
-Subject: [PATCH] drm/tests: helpers: Make sure the device is bound
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The device managed resources are freed when the device is detached, so
-it has to be bound in the first place.
-
-Let's create a fake driver that we will bind to our fake device to
-benefit from the device managed cleanups in our tests.
-
-Reviewed-by: Maíra Canal <mcanal@igalia.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/tests/drm_kunit_helpers.c | 26 ++++++++++++++++++++++-
- 1 file changed, 25 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/tests/drm_kunit_helpers.c
-+++ b/drivers/gpu/drm/tests/drm_kunit_helpers.c
-@@ -18,12 +18,32 @@ struct kunit_dev {
- static const struct drm_mode_config_funcs drm_mode_config_funcs = {
- };
- 
-+static int fake_probe(struct platform_device *pdev)
-+{
-+	return 0;
-+}
-+
-+static int fake_remove(struct platform_device *pdev)
-+{
-+	return 0;
-+}
-+
-+static struct platform_driver fake_platform_driver = {
-+	.probe	= fake_probe,
-+	.remove	= fake_remove,
-+	.driver = {
-+		.name	= KUNIT_DEVICE_NAME,
-+	},
-+};
-+
- /**
-  * drm_kunit_helper_alloc_device - Allocate a mock device for a KUnit test
-  * @test: The test context object
-  *
-  * This allocates a fake struct &device to create a mock for a KUnit
-- * test.
-+ * test. The device will also be bound to a fake driver. It will thus be
-+ * able to leverage the usual infrastructure and most notably the
-+ * device-managed resources just like a "real" device.
-  *
-  * Callers need to make sure drm_kunit_helper_free_device() on the
-  * device when done.
-@@ -36,6 +56,9 @@ struct device *drm_kunit_helper_alloc_de
- 	struct platform_device *pdev;
- 	int ret;
- 
-+	ret = platform_driver_register(&fake_platform_driver);
-+	KUNIT_ASSERT_EQ(test, ret, 0);
-+
- 	pdev = platform_device_alloc(KUNIT_DEVICE_NAME, PLATFORM_DEVID_NONE);
- 	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, pdev);
- 
-@@ -58,6 +81,7 @@ void drm_kunit_helper_free_device(struct
- 	struct platform_device *pdev = to_platform_device(dev);
- 
- 	platform_device_unregister(pdev);
-+	platform_driver_unregister(&fake_platform_driver);
- }
- EXPORT_SYMBOL_GPL(drm_kunit_helper_free_device);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0496-drm-tests-helpers-Allow-for-a-custom-device-struct-t.patch b/target/linux/bcm27xx/patches-6.1/950-0496-drm-tests-helpers-Allow-for-a-custom-device-struct-t.patch
deleted file mode 100644
index 4e88976d9d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0496-drm-tests-helpers-Allow-for-a-custom-device-struct-t.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 6f034f1e2e19a86ea85355efdf6dc55fa8a04e59 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Mon, 21 Nov 2022 14:28:44 +0100
-Subject: [PATCH] drm/tests: helpers: Allow for a custom device struct
- to be allocated
-
-The current helper to allocate a DRM device doesn't allow for any
-subclassing by drivers, which is going to be troublesome as we work on
-getting some kunit testing on atomic modesetting code.
-
-Let's use a similar pattern to the other allocation helpers by providing
-the structure size and offset as arguments.
-
-Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/tests/drm_kunit_helpers.c | 40 +++++------------------
- include/drm/drm_kunit_helpers.h           | 32 ++++++++++++++++--
- 2 files changed, 39 insertions(+), 33 deletions(-)
-
---- a/drivers/gpu/drm/tests/drm_kunit_helpers.c
-+++ b/drivers/gpu/drm/tests/drm_kunit_helpers.c
-@@ -11,10 +11,6 @@
- 
- #define KUNIT_DEVICE_NAME	"drm-kunit-mock-device"
- 
--struct kunit_dev {
--	struct drm_device base;
--};
--
- static const struct drm_mode_config_funcs drm_mode_config_funcs = {
- };
- 
-@@ -85,32 +81,14 @@ void drm_kunit_helper_free_device(struct
- }
- EXPORT_SYMBOL_GPL(drm_kunit_helper_free_device);
- 
--/**
-- * drm_kunit_helper_alloc_drm_device - Allocates a mock DRM device for KUnit tests
-- * @test: The test context object
-- * @dev: The parent device object
-- * @features: Mocked DRM device driver features
-- *
-- * This function creates a struct &drm_driver and will create a struct
-- * &drm_device from @dev and that driver.
-- *
-- * @dev should be allocated using drm_kunit_helper_alloc_device().
-- *
-- * The driver is tied to the @test context and will get cleaned at the
-- * end of the test. The drm_device is allocated through
-- * devm_drm_dev_alloc() and will thus be freed through a device-managed
-- * resource.
-- *
-- * Returns:
-- * A pointer to the new drm_device, or an ERR_PTR() otherwise.
-- */
- struct drm_device *
--drm_kunit_helper_alloc_drm_device(struct kunit *test, struct device *dev,
--				  u32 features)
-+__drm_kunit_helper_alloc_drm_device(struct kunit *test, struct device *dev,
-+				    size_t size, size_t offset,
-+				    u32 features)
- {
--	struct kunit_dev *kdev;
- 	struct drm_device *drm;
- 	struct drm_driver *driver;
-+	void *container;
- 	int ret;
- 
- 	driver = kunit_kzalloc(test, sizeof(*driver), GFP_KERNEL);
-@@ -118,11 +96,11 @@ drm_kunit_helper_alloc_drm_device(struct
- 		return ERR_PTR(-ENOMEM);
- 
- 	driver->driver_features = features;
--	kdev = devm_drm_dev_alloc(dev, driver, struct kunit_dev, base);
--	if (IS_ERR(kdev))
--		return ERR_CAST(kdev);
-+	container = __devm_drm_dev_alloc(dev, driver, size, offset);
-+	if (IS_ERR(container))
-+		return ERR_CAST(container);
- 
--	drm = &kdev->base;
-+	drm = container + offset;
- 	drm->mode_config.funcs = &drm_mode_config_funcs;
- 
- 	ret = drmm_mode_config_init(drm);
-@@ -131,7 +109,7 @@ drm_kunit_helper_alloc_drm_device(struct
- 
- 	return drm;
- }
--EXPORT_SYMBOL_GPL(drm_kunit_helper_alloc_drm_device);
-+EXPORT_SYMBOL_GPL(__drm_kunit_helper_alloc_drm_device);
- 
- MODULE_AUTHOR("Maxime Ripard <maxime@cerno.tech>");
- MODULE_LICENSE("GPL");
---- a/include/drm/drm_kunit_helpers.h
-+++ b/include/drm/drm_kunit_helpers.h
-@@ -10,7 +10,35 @@ struct device *drm_kunit_helper_alloc_de
- void drm_kunit_helper_free_device(struct kunit *test, struct device *dev);
- 
- struct drm_device *
--drm_kunit_helper_alloc_drm_device(struct kunit *test, struct device *dev,
--				  u32 features);
-+__drm_kunit_helper_alloc_drm_device(struct kunit *test, struct device *dev,
-+				    size_t size, size_t offset,
-+				    u32 features);
-+
-+/**
-+ * drm_kunit_helper_alloc_drm_device - Allocates a mock DRM device for KUnit tests
-+ * @_test: The test context object
-+ * @_dev: The parent device object
-+ * @_type: the type of the struct which contains struct &drm_device
-+ * @_member: the name of the &drm_device within @_type.
-+ * @_features: Mocked DRM device driver features
-+ *
-+ * This function creates a struct &drm_driver and will create a struct
-+ * &drm_device from @_dev and that driver.
-+ *
-+ * @_dev should be allocated using drm_kunit_helper_alloc_device().
-+ *
-+ * The driver is tied to the @_test context and will get cleaned at the
-+ * end of the test. The drm_device is allocated through
-+ * devm_drm_dev_alloc() and will thus be freed through a device-managed
-+ * resource.
-+ *
-+ * Returns:
-+ * A pointer to the new drm_device, or an ERR_PTR() otherwise.
-+ */
-+#define drm_kunit_helper_alloc_drm_device(_test, _dev, _type, _member, _feat)	\
-+	((_type *)__drm_kunit_helper_alloc_drm_device(_test, _dev,		\
-+						      sizeof(_type),		\
-+						      offsetof(_type, _member),	\
-+						      _feat))
- 
- #endif // DRM_KUNIT_HELPERS_H_
diff --git a/target/linux/bcm27xx/patches-6.1/950-0497-drm-tests-helpers-Allow-to-pass-a-custom-drm_driver.patch b/target/linux/bcm27xx/patches-6.1/950-0497-drm-tests-helpers-Allow-to-pass-a-custom-drm_driver.patch
deleted file mode 100644
index a241045d10..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0497-drm-tests-helpers-Allow-to-pass-a-custom-drm_driver.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From 9dd62a4a37af19e33bfb3c8f7e7a096ffc6ce8a9 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Mon, 21 Nov 2022 17:02:15 +0100
-Subject: [PATCH] drm/tests: helpers: Allow to pass a custom drm_driver
-
-Some tests will need to provide their own drm_driver instead of relying
-on the dumb one in the helpers, so let's create a helper that allows to
-do so.
-
-Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/tests/drm_kunit_helpers.c | 15 +++----
- include/drm/drm_kunit_helpers.h           | 51 ++++++++++++++++++++++-
- 2 files changed, 54 insertions(+), 12 deletions(-)
-
---- a/drivers/gpu/drm/tests/drm_kunit_helpers.c
-+++ b/drivers/gpu/drm/tests/drm_kunit_helpers.c
-@@ -82,20 +82,15 @@ void drm_kunit_helper_free_device(struct
- EXPORT_SYMBOL_GPL(drm_kunit_helper_free_device);
- 
- struct drm_device *
--__drm_kunit_helper_alloc_drm_device(struct kunit *test, struct device *dev,
--				    size_t size, size_t offset,
--				    u32 features)
-+__drm_kunit_helper_alloc_drm_device_with_driver(struct kunit *test,
-+						struct device *dev,
-+						size_t size, size_t offset,
-+						const struct drm_driver *driver)
- {
- 	struct drm_device *drm;
--	struct drm_driver *driver;
- 	void *container;
- 	int ret;
- 
--	driver = kunit_kzalloc(test, sizeof(*driver), GFP_KERNEL);
--	if (!driver)
--		return ERR_PTR(-ENOMEM);
--
--	driver->driver_features = features;
- 	container = __devm_drm_dev_alloc(dev, driver, size, offset);
- 	if (IS_ERR(container))
- 		return ERR_CAST(container);
-@@ -109,7 +104,7 @@ __drm_kunit_helper_alloc_drm_device(stru
- 
- 	return drm;
- }
--EXPORT_SYMBOL_GPL(__drm_kunit_helper_alloc_drm_device);
-+EXPORT_SYMBOL_GPL(__drm_kunit_helper_alloc_drm_device_with_driver);
- 
- MODULE_AUTHOR("Maxime Ripard <maxime@cerno.tech>");
- MODULE_LICENSE("GPL");
---- a/include/drm/drm_kunit_helpers.h
-+++ b/include/drm/drm_kunit_helpers.h
-@@ -3,6 +3,8 @@
- #ifndef DRM_KUNIT_HELPERS_H_
- #define DRM_KUNIT_HELPERS_H_
- 
-+#include <kunit/test.h>
-+
- struct drm_device;
- struct kunit;
- 
-@@ -10,9 +12,54 @@ struct device *drm_kunit_helper_alloc_de
- void drm_kunit_helper_free_device(struct kunit *test, struct device *dev);
- 
- struct drm_device *
--__drm_kunit_helper_alloc_drm_device(struct kunit *test, struct device *dev,
-+__drm_kunit_helper_alloc_drm_device_with_driver(struct kunit *test,
-+						struct device *dev,
-+						size_t size, size_t offset,
-+						const struct drm_driver *driver);
-+
-+/**
-+ * drm_kunit_helper_alloc_drm_device_with_driver - Allocates a mock DRM device for KUnit tests
-+ * @_test: The test context object
-+ * @_dev: The parent device object
-+ * @_type: the type of the struct which contains struct &drm_device
-+ * @_member: the name of the &drm_device within @_type.
-+ * @_drv: Mocked DRM device driver features
-+ *
-+ * This function creates a struct &drm_device from @_dev and @_drv.
-+ *
-+ * @_dev should be allocated using drm_kunit_helper_alloc_device().
-+ *
-+ * The driver is tied to the @_test context and will get cleaned at the
-+ * end of the test. The drm_device is allocated through
-+ * devm_drm_dev_alloc() and will thus be freed through a device-managed
-+ * resource.
-+ *
-+ * Returns:
-+ * A pointer to the new drm_device, or an ERR_PTR() otherwise.
-+ */
-+#define drm_kunit_helper_alloc_drm_device_with_driver(_test, _dev, _type, _member, _drv)	\
-+	((_type *)__drm_kunit_helper_alloc_drm_device_with_driver(_test, _dev,			\
-+						       sizeof(_type),				\
-+						       offsetof(_type, _member),		\
-+						       _drv))
-+
-+static inline struct drm_device *
-+__drm_kunit_helper_alloc_drm_device(struct kunit *test,
-+				    struct device *dev,
- 				    size_t size, size_t offset,
--				    u32 features);
-+				    u32 features)
-+{
-+	struct drm_driver *driver;
-+
-+	driver = kunit_kzalloc(test, sizeof(*driver), GFP_KERNEL);
-+	KUNIT_ASSERT_NOT_NULL(test, driver);
-+
-+	driver->driver_features = features;
-+
-+	return __drm_kunit_helper_alloc_drm_device_with_driver(test, dev,
-+							       size, offset,
-+							       driver);
-+}
- 
- /**
-  * drm_kunit_helper_alloc_drm_device - Allocates a mock DRM device for KUnit tests
diff --git a/target/linux/bcm27xx/patches-6.1/950-0498-drm-vc4-Move-HVS-state-to-main-header.patch b/target/linux/bcm27xx/patches-6.1/950-0498-drm-vc4-Move-HVS-state-to-main-header.patch
deleted file mode 100644
index cb492fcb64..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0498-drm-vc4-Move-HVS-state-to-main-header.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 037268376a9c4698eae418cff89e5cd188c0c73c Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Thu, 10 Nov 2022 12:57:53 +0100
-Subject: [PATCH] drm/vc4: Move HVS state to main header
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In order to introduce unit tests for the HVS state computation, we'll
-need access to the vc4_hvs_state struct definition and its associated
-helpers.
-
-Let's move them in our driver header.
-
-Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
-Reviewed-by: Maíra Canal <mcanal@igalia.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_drv.h | 23 +++++++++++++++++++++++
- drivers/gpu/drm/vc4/vc4_kms.c | 25 +++----------------------
- 2 files changed, 26 insertions(+), 22 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -360,6 +360,29 @@ struct vc4_hvs {
- 	bool vc5_hdmi_enable_4096by2160;
- };
- 
-+#define HVS_NUM_CHANNELS 3
-+
-+struct vc4_hvs_state {
-+	struct drm_private_state base;
-+	unsigned long core_clock_rate;
-+
-+	struct {
-+		unsigned in_use: 1;
-+		unsigned long fifo_load;
-+		struct drm_crtc_commit *pending_commit;
-+	} fifo_state[HVS_NUM_CHANNELS];
-+};
-+
-+static inline struct vc4_hvs_state *
-+to_vc4_hvs_state(const struct drm_private_state *priv)
-+{
-+	return container_of(priv, struct vc4_hvs_state, base);
-+}
-+
-+struct vc4_hvs_state *vc4_hvs_get_global_state(struct drm_atomic_state *state);
-+struct vc4_hvs_state *vc4_hvs_get_old_global_state(const struct drm_atomic_state *state);
-+struct vc4_hvs_state *vc4_hvs_get_new_global_state(const struct drm_atomic_state *state);
-+
- struct vc4_plane {
- 	struct drm_plane base;
- };
---- a/drivers/gpu/drm/vc4/vc4_kms.c
-+++ b/drivers/gpu/drm/vc4/vc4_kms.c
-@@ -25,8 +25,6 @@
- #include "vc4_drv.h"
- #include "vc4_regs.h"
- 
--#define HVS_NUM_CHANNELS 3
--
- struct vc4_ctm_state {
- 	struct drm_private_state base;
- 	struct drm_color_ctm *ctm;
-@@ -39,23 +37,6 @@ to_vc4_ctm_state(const struct drm_privat
- 	return container_of(priv, struct vc4_ctm_state, base);
- }
- 
--struct vc4_hvs_state {
--	struct drm_private_state base;
--	unsigned long core_clock_rate;
--
--	struct {
--		unsigned in_use: 1;
--		unsigned long fifo_load;
--		struct drm_crtc_commit *pending_commit;
--	} fifo_state[HVS_NUM_CHANNELS];
--};
--
--static struct vc4_hvs_state *
--to_vc4_hvs_state(const struct drm_private_state *priv)
--{
--	return container_of(priv, struct vc4_hvs_state, base);
--}
--
- struct vc4_load_tracker_state {
- 	struct drm_private_state base;
- 	u64 hvs_load;
-@@ -194,7 +175,7 @@ vc4_ctm_commit(struct vc4_dev *vc4, stru
- 		  VC4_SET_FIELD(ctm_state->fifo, SCALER_OLEDOFFS_DISPFIFO));
- }
- 
--static struct vc4_hvs_state *
-+struct vc4_hvs_state *
- vc4_hvs_get_new_global_state(const struct drm_atomic_state *state)
- {
- 	struct vc4_dev *vc4 = to_vc4_dev(state->dev);
-@@ -207,7 +188,7 @@ vc4_hvs_get_new_global_state(const struc
- 	return to_vc4_hvs_state(priv_state);
- }
- 
--static struct vc4_hvs_state *
-+struct vc4_hvs_state *
- vc4_hvs_get_old_global_state(const struct drm_atomic_state *state)
- {
- 	struct vc4_dev *vc4 = to_vc4_dev(state->dev);
-@@ -220,7 +201,7 @@ vc4_hvs_get_old_global_state(const struc
- 	return to_vc4_hvs_state(priv_state);
- }
- 
--static struct vc4_hvs_state *
-+struct vc4_hvs_state *
- vc4_hvs_get_global_state(struct drm_atomic_state *state)
- {
- 	struct vc4_dev *vc4 = to_vc4_dev(state->dev);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0499-drm-vc4-crtc-Introduce-a-lower-level-crtc-init-helpe.patch b/target/linux/bcm27xx/patches-6.1/950-0499-drm-vc4-crtc-Introduce-a-lower-level-crtc-init-helpe.patch
deleted file mode 100644
index aaec147cd1..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0499-drm-vc4-crtc-Introduce-a-lower-level-crtc-init-helpe.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From 4e2742244ff3084dfcd465180d7b7b843af13854 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Mon, 14 Nov 2022 14:11:41 +0100
-Subject: [PATCH] drm/vc4: crtc: Introduce a lower-level crtc init
- helper
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The current vc4_crtc_init() helper assumes that we will be using
-hardware planes and calls vc4_plane_init().
-
-While it's a reasonable assumption, we'll want to mock the plane and
-thus provide our own. Let's create a helper that will take the plane as
-an argument.
-
-Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
-Reviewed-by: Maíra Canal <mcanal@igalia.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_crtc.c | 70 +++++++++++++++++++++++++---------
- drivers/gpu/drm/vc4/vc4_drv.h  |  6 +++
- 2 files changed, 57 insertions(+), 19 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_crtc.c
-+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
-@@ -1326,31 +1326,38 @@ static void vc4_set_crtc_possible_masks(
- 	}
- }
- 
--int vc4_crtc_init(struct drm_device *drm, struct platform_device *pdev,
--		  struct vc4_crtc *vc4_crtc,
--		  const struct vc4_crtc_data *data,
--		  const struct drm_crtc_funcs *crtc_funcs,
--		  const struct drm_crtc_helper_funcs *crtc_helper_funcs,
--		  bool feeds_txp)
-+/**
-+ * __vc4_crtc_init - Initializes a CRTC
-+ * @drm: DRM Device
-+ * @pdev: CRTC Platform Device
-+ * @vc4_crtc: CRTC Object to Initialize
-+ * @data: Configuration data associated with this CRTC
-+ * @primary_plane: Primary plane for CRTC
-+ * @crtc_funcs: Callbacks for the new CRTC
-+ * @crtc_helper_funcs: Helper Callbacks for the new CRTC
-+ * @feeds_txp: Is this CRTC connected to the TXP?
-+ *
-+ * Initializes our private CRTC structure. This function is mostly
-+ * relevant for KUnit testing, all other users should use
-+ * vc4_crtc_init() instead.
-+ *
-+ * Returns:
-+ * 0 on success, a negative error code on failure.
-+ */
-+int __vc4_crtc_init(struct drm_device *drm,
-+		    struct platform_device *pdev,
-+		    struct vc4_crtc *vc4_crtc,
-+		    const struct vc4_crtc_data *data,
-+		    struct drm_plane *primary_plane,
-+		    const struct drm_crtc_funcs *crtc_funcs,
-+		    const struct drm_crtc_helper_funcs *crtc_helper_funcs,
-+		    bool feeds_txp)
- {
- 	struct vc4_dev *vc4 = to_vc4_dev(drm);
- 	struct drm_crtc *crtc = &vc4_crtc->base;
--	struct drm_plane *primary_plane;
- 	unsigned int i;
- 	int ret;
- 
--	/* For now, we create just the primary and the legacy cursor
--	 * planes.  We should be able to stack more planes on easily,
--	 * but to do that we would need to compute the bandwidth
--	 * requirement of the plane configuration, and reject ones
--	 * that will take too much.
--	 */
--	primary_plane = vc4_plane_init(drm, DRM_PLANE_TYPE_PRIMARY, 0);
--	if (IS_ERR(primary_plane)) {
--		dev_err(drm->dev, "failed to construct primary plane\n");
--		return PTR_ERR(primary_plane);
--	}
--
- 	vc4_crtc->data = data;
- 	vc4_crtc->pdev = pdev;
- 	vc4_crtc->feeds_txp = feeds_txp;
-@@ -1399,6 +1406,31 @@ int vc4_crtc_init(struct drm_device *drm
- 	return 0;
- }
- 
-+int vc4_crtc_init(struct drm_device *drm, struct platform_device *pdev,
-+		  struct vc4_crtc *vc4_crtc,
-+		  const struct vc4_crtc_data *data,
-+		  const struct drm_crtc_funcs *crtc_funcs,
-+		  const struct drm_crtc_helper_funcs *crtc_helper_funcs,
-+		  bool feeds_txp)
-+{
-+	struct drm_plane *primary_plane;
-+
-+	/* For now, we create just the primary and the legacy cursor
-+	 * planes.  We should be able to stack more planes on easily,
-+	 * but to do that we would need to compute the bandwidth
-+	 * requirement of the plane configuration, and reject ones
-+	 * that will take too much.
-+	 */
-+	primary_plane = vc4_plane_init(drm, DRM_PLANE_TYPE_PRIMARY, 0);
-+	if (IS_ERR(primary_plane)) {
-+		dev_err(drm->dev, "failed to construct primary plane\n");
-+		return PTR_ERR(primary_plane);
-+	}
-+
-+	return __vc4_crtc_init(drm, pdev, vc4_crtc, data, primary_plane,
-+			       crtc_funcs, crtc_helper_funcs, feeds_txp);
-+}
-+
- static int vc4_crtc_bind(struct device *dev, struct device *master, void *data)
- {
- 	struct platform_device *pdev = to_platform_device(dev);
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -912,6 +912,12 @@ int vc4_bo_debugfs_init(struct drm_minor
- /* vc4_crtc.c */
- extern struct platform_driver vc4_crtc_driver;
- int vc4_crtc_disable_at_boot(struct drm_crtc *crtc);
-+int __vc4_crtc_init(struct drm_device *drm, struct platform_device *pdev,
-+		    struct vc4_crtc *vc4_crtc, const struct vc4_crtc_data *data,
-+		    struct drm_plane *primary_plane,
-+		    const struct drm_crtc_funcs *crtc_funcs,
-+		    const struct drm_crtc_helper_funcs *crtc_helper_funcs,
-+		    bool feeds_txp);
- int vc4_crtc_init(struct drm_device *drm, struct platform_device *pdev,
- 		  struct vc4_crtc *vc4_crtc, const struct vc4_crtc_data *data,
- 		  const struct drm_crtc_funcs *crtc_funcs,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0500-drm-vc4-crtc-Make-encoder-lookup-helper-public.patch b/target/linux/bcm27xx/patches-6.1/950-0500-drm-vc4-crtc-Make-encoder-lookup-helper-public.patch
deleted file mode 100644
index 995a0e7a0c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0500-drm-vc4-crtc-Make-encoder-lookup-helper-public.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 5607ae85bd64208356567c77fed84a395d4e2182 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Mon, 14 Nov 2022 16:18:09 +0100
-Subject: [PATCH] drm/vc4: crtc: Make encoder lookup helper public
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We'll need a function that looks up an encoder by its vc4_encoder_type.
-Such a function is already present in the CRTC code, so let's make it
-public so that we can reuse it in the unit tests.
-
-Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
-Reviewed-by: Maíra Canal <mcanal@igalia.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_crtc.c | 17 +----------------
- drivers/gpu/drm/vc4/vc4_drv.h  | 16 ++++++++++++++++
- 2 files changed, 17 insertions(+), 16 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_crtc.c
-+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
-@@ -520,21 +520,6 @@ static int vc4_crtc_disable(struct drm_c
- 	return 0;
- }
- 
--static struct drm_encoder *vc4_crtc_get_encoder_by_type(struct drm_crtc *crtc,
--							enum vc4_encoder_type type)
--{
--	struct drm_encoder *encoder;
--
--	drm_for_each_encoder(encoder, crtc->dev) {
--		struct vc4_encoder *vc4_encoder = to_vc4_encoder(encoder);
--
--		if (vc4_encoder->type == type)
--			return encoder;
--	}
--
--	return NULL;
--}
--
- int vc4_crtc_disable_at_boot(struct drm_crtc *crtc)
- {
- 	struct drm_device *drm = crtc->dev;
-@@ -570,7 +555,7 @@ int vc4_crtc_disable_at_boot(struct drm_
- 
- 	pv_data = vc4_crtc_to_vc4_pv_data(vc4_crtc);
- 	encoder_type = pv_data->encoder_types[encoder_sel];
--	encoder = vc4_crtc_get_encoder_by_type(crtc, encoder_type);
-+	encoder = vc4_find_encoder_by_type(drm, encoder_type);
- 	if (WARN_ON(!encoder))
- 		return 0;
- 
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -500,6 +500,22 @@ to_vc4_encoder(const struct drm_encoder
- 	return container_of(encoder, struct vc4_encoder, base);
- }
- 
-+static inline
-+struct drm_encoder *vc4_find_encoder_by_type(struct drm_device *drm,
-+					     enum vc4_encoder_type type)
-+{
-+	struct drm_encoder *encoder;
-+
-+	drm_for_each_encoder(encoder, drm) {
-+		struct vc4_encoder *vc4_encoder = to_vc4_encoder(encoder);
-+
-+		if (vc4_encoder->type == type)
-+			return encoder;
-+	}
-+
-+	return NULL;
-+}
-+
- struct vc4_crtc_data {
- 	const char *name;
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0501-drm-vc4-hvs-Provide-a-function-to-initialize-the-HVS.patch b/target/linux/bcm27xx/patches-6.1/950-0501-drm-vc4-hvs-Provide-a-function-to-initialize-the-HVS.patch
deleted file mode 100644
index 033fd9843a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0501-drm-vc4-hvs-Provide-a-function-to-initialize-the-HVS.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From e75de2a5fd951a0244b2000dc2ad3922b0ab0f5e Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Wed, 23 Nov 2022 16:00:53 +0100
-Subject: [PATCH] drm/vc4: hvs: Provide a function to initialize the
- HVS structure
-
-We'll need to initialize the HVS structure without a backing device to
-create a mock we'll use for testing.
-
-Split the structure initialization part into a separate function.
-
-Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_drv.h |  1 +
- drivers/gpu/drm/vc4/vc4_hvs.c | 73 +++++++++++++++++++++--------------
- 2 files changed, 44 insertions(+), 30 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -1036,6 +1036,7 @@ void vc4_irq_reset(struct drm_device *de
- 
- /* vc4_hvs.c */
- extern struct platform_driver vc4_hvs_driver;
-+struct vc4_hvs *__vc4_hvs_alloc(struct vc4_dev *vc4, struct platform_device *pdev);
- void vc4_hvs_stop_channel(struct vc4_hvs *hvs, unsigned int output);
- int vc4_hvs_get_fifo_from_output(struct vc4_hvs *hvs, unsigned int output);
- u8 vc4_hvs_get_fifo_frame_count(struct vc4_hvs *hvs, unsigned int fifo);
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -1010,6 +1010,46 @@ int vc4_hvs_debugfs_init(struct drm_mino
- 	return 0;
- }
- 
-+struct vc4_hvs *__vc4_hvs_alloc(struct vc4_dev *vc4, struct platform_device *pdev)
-+{
-+	struct drm_device *drm = &vc4->base;
-+	struct vc4_hvs *hvs;
-+
-+	hvs = drmm_kzalloc(drm, sizeof(*hvs), GFP_KERNEL);
-+	if (!hvs)
-+		return ERR_PTR(-ENOMEM);
-+
-+	hvs->vc4 = vc4;
-+	hvs->pdev = pdev;
-+
-+	spin_lock_init(&hvs->mm_lock);
-+
-+	/* Set up the HVS display list memory manager.  We never
-+	 * overwrite the setup from the bootloader (just 128b out of
-+	 * our 16K), since we don't want to scramble the screen when
-+	 * transitioning from the firmware's boot setup to runtime.
-+	 */
-+	drm_mm_init(&hvs->dlist_mm,
-+		    HVS_BOOTLOADER_DLIST_END,
-+		    (SCALER_DLIST_SIZE >> 2) - HVS_BOOTLOADER_DLIST_END);
-+
-+	/* Set up the HVS LBM memory manager.  We could have some more
-+	 * complicated data structure that allowed reuse of LBM areas
-+	 * between planes when they don't overlap on the screen, but
-+	 * for now we just allocate globally.
-+	 */
-+	if (!vc4->is_vc5)
-+		/* 48k words of 2x12-bit pixels */
-+		drm_mm_init(&hvs->lbm_mm, 0, 48 * 1024);
-+	else
-+		/* 60k words of 4x12-bit pixels */
-+		drm_mm_init(&hvs->lbm_mm, 0, 60 * 1024);
-+
-+	vc4->hvs = hvs;
-+
-+	return hvs;
-+}
-+
- static int vc4_hvs_bind(struct device *dev, struct device *master, void *data)
- {
- 	struct platform_device *pdev = to_platform_device(dev);
-@@ -1020,11 +1060,9 @@ static int vc4_hvs_bind(struct device *d
- 	u32 dispctrl;
- 	u32 reg, top;
- 
--	hvs = drmm_kzalloc(drm, sizeof(*hvs), GFP_KERNEL);
--	if (!hvs)
--		return -ENOMEM;
--	hvs->vc4 = vc4;
--	hvs->pdev = pdev;
-+	hvs = __vc4_hvs_alloc(vc4, NULL);
-+	if (IS_ERR(hvs))
-+		return PTR_ERR(hvs);
- 
- 	hvs->regs = vc4_ioremap_regs(pdev, 0);
- 	if (IS_ERR(hvs->regs))
-@@ -1077,29 +1115,6 @@ static int vc4_hvs_bind(struct device *d
- 	else
- 		hvs->dlist = hvs->regs + SCALER5_DLIST_START;
- 
--	spin_lock_init(&hvs->mm_lock);
--
--	/* Set up the HVS display list memory manager.  We never
--	 * overwrite the setup from the bootloader (just 128b out of
--	 * our 16K), since we don't want to scramble the screen when
--	 * transitioning from the firmware's boot setup to runtime.
--	 */
--	drm_mm_init(&hvs->dlist_mm,
--		    HVS_BOOTLOADER_DLIST_END,
--		    (SCALER_DLIST_SIZE >> 2) - HVS_BOOTLOADER_DLIST_END);
--
--	/* Set up the HVS LBM memory manager.  We could have some more
--	 * complicated data structure that allowed reuse of LBM areas
--	 * between planes when they don't overlap on the screen, but
--	 * for now we just allocate globally.
--	 */
--	if (!vc4->is_vc5)
--		/* 48k words of 2x12-bit pixels */
--		drm_mm_init(&hvs->lbm_mm, 0, 48 * 1024);
--	else
--		/* 60k words of 4x12-bit pixels */
--		drm_mm_init(&hvs->lbm_mm, 0, 60 * 1024);
--
- 	/* Upload filter kernels.  We only have the one for now, so we
- 	 * keep it around for the lifetime of the driver.
- 	 */
-@@ -1109,8 +1124,6 @@ static int vc4_hvs_bind(struct device *d
- 	if (ret)
- 		return ret;
- 
--	vc4->hvs = hvs;
--
- 	reg = HVS_READ(SCALER_DISPECTRL);
- 	reg &= ~SCALER_DISPECTRL_DSP2_MUX_MASK;
- 	HVS_WRITE(SCALER_DISPECTRL,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0502-drm-vc4-tests-Introduce-a-mocking-infrastructure.patch b/target/linux/bcm27xx/patches-6.1/950-0502-drm-vc4-tests-Introduce-a-mocking-infrastructure.patch
deleted file mode 100644
index 7290aa2084..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0502-drm-vc4-tests-Introduce-a-mocking-infrastructure.patch
+++ /dev/null
@@ -1,736 +0,0 @@
-From 8e1854782b26898db7c4f6ea7247e56be0469a01 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Mon, 21 Nov 2022 18:18:40 +0100
-Subject: [PATCH] drm/vc4: tests: Introduce a mocking infrastructure
-
-In order to test the current atomic_check hooks we need to have a DRM
-device that has roughly the same capabilities and layout that the actual
-hardware. We'll also need a bunch of functions to create arbitrary
-atomic states.
-
-Let's create some helpers to create a device that behaves like the real
-one, and some helpers to maintain the atomic state we want to check.
-
-Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/Kconfig                 |  16 ++
- drivers/gpu/drm/vc4/Makefile                |   6 +
- drivers/gpu/drm/vc4/tests/.kunitconfig      |  13 ++
- drivers/gpu/drm/vc4/tests/vc4_mock.c        | 200 ++++++++++++++++++++
- drivers/gpu/drm/vc4/tests/vc4_mock.h        |  60 ++++++
- drivers/gpu/drm/vc4/tests/vc4_mock_crtc.c   |  41 ++++
- drivers/gpu/drm/vc4/tests/vc4_mock_output.c |  99 ++++++++++
- drivers/gpu/drm/vc4/tests/vc4_mock_plane.c  |  47 +++++
- drivers/gpu/drm/vc4/vc4_crtc.c              |  20 +-
- drivers/gpu/drm/vc4/vc4_drv.c               |   4 +-
- drivers/gpu/drm/vc4/vc4_drv.h               |  16 ++
- drivers/gpu/drm/vc4/vc4_firmware_kms.c      |   6 +-
- drivers/gpu/drm/vc4/vc4_txp.c               |   2 +-
- 13 files changed, 514 insertions(+), 16 deletions(-)
- create mode 100644 drivers/gpu/drm/vc4/tests/.kunitconfig
- create mode 100644 drivers/gpu/drm/vc4/tests/vc4_mock.c
- create mode 100644 drivers/gpu/drm/vc4/tests/vc4_mock.h
- create mode 100644 drivers/gpu/drm/vc4/tests/vc4_mock_crtc.c
- create mode 100644 drivers/gpu/drm/vc4/tests/vc4_mock_output.c
- create mode 100644 drivers/gpu/drm/vc4/tests/vc4_mock_plane.c
-
---- a/drivers/gpu/drm/vc4/Kconfig
-+++ b/drivers/gpu/drm/vc4/Kconfig
-@@ -34,3 +34,19 @@ config DRM_VC4_HDMI_CEC
- 	help
- 	  Choose this option if you have a Broadcom VC4 GPU
- 	  and want to use CEC.
-+
-+config DRM_VC4_KUNIT_TEST
-+	bool "KUnit tests for VC4" if !KUNIT_ALL_TESTS
-+	depends on DRM_VC4 && KUNIT
-+	select DRM_KUNIT_TEST_HELPERS
-+	default KUNIT_ALL_TESTS
-+	help
-+	  This builds unit tests for the VC4 DRM/KMS driver. This option is
-+	  not useful for distributions or general kernels, but only for kernel
-+	  developers working on the VC4 driver.
-+
-+	  For more information on KUnit and unit tests in general,
-+	  please refer to the KUnit documentation in
-+	  Documentation/dev-tools/kunit/.
-+
-+	  If in doubt, say "N".
---- a/drivers/gpu/drm/vc4/Makefile
-+++ b/drivers/gpu/drm/vc4/Makefile
-@@ -26,6 +26,12 @@ vc4-y := \
- 	vc4_validate.o \
- 	vc4_validate_shaders.o
- 
-+vc4-$(CONFIG_DRM_VC4_KUNIT_TEST) += \
-+	tests/vc4_mock.o \
-+	tests/vc4_mock_crtc.o \
-+	tests/vc4_mock_output.o \
-+	tests/vc4_mock_plane.o
-+
- vc4-$(CONFIG_DEBUG_FS) += vc4_debugfs.o
- 
- obj-$(CONFIG_DRM_VC4)  += vc4.o
---- /dev/null
-+++ b/drivers/gpu/drm/vc4/tests/.kunitconfig
-@@ -0,0 +1,13 @@
-+CONFIG_ARCH_BCM=y
-+CONFIG_ARCH_BCM2835=y
-+CONFIG_BCM2835_MBOX=y
-+CONFIG_KUNIT=y
-+CONFIG_DRM=y
-+CONFIG_DRM_VC4=y
-+CONFIG_DRM_VC4_KUNIT_TEST=y
-+CONFIG_MAILBOX=y
-+CONFIG_RASPBERRYPI_FIRMWARE=y
-+CONFIG_SND=y
-+CONFIG_SND_SOC=y
-+CONFIG_SOUND=y
-+CONFIG_COMMON_CLK=y
---- /dev/null
-+++ b/drivers/gpu/drm/vc4/tests/vc4_mock.c
-@@ -0,0 +1,200 @@
-+// SPDX-License-Identifier: GPL-2.0
-+
-+#include <drm/drm_drv.h>
-+#include <drm/drm_kunit_helpers.h>
-+
-+#include <kunit/test.h>
-+
-+#include "vc4_mock.h"
-+
-+struct vc4_mock_output_desc {
-+	enum vc4_encoder_type	vc4_encoder_type;
-+	unsigned int		encoder_type;
-+	unsigned int		connector_type;
-+};
-+
-+#define VC4_MOCK_OUTPUT_DESC(_vc4_type, _etype, _ctype)					\
-+	{										\
-+		.vc4_encoder_type = _vc4_type,						\
-+		.encoder_type = _etype,							\
-+		.connector_type = _ctype,						\
-+	}
-+
-+struct vc4_mock_pipe_desc {
-+	const struct vc4_crtc_data *data;
-+	const struct vc4_mock_output_desc *outputs;
-+	unsigned int noutputs;
-+};
-+
-+#define VC4_MOCK_CRTC_DESC(_data, ...)							\
-+	{										\
-+		.data = _data,								\
-+		.outputs = (struct vc4_mock_output_desc[]) { __VA_ARGS__ },		\
-+		.noutputs = sizeof((struct vc4_mock_output_desc[]) { __VA_ARGS__ }) /	\
-+			     sizeof(struct vc4_mock_output_desc),			\
-+	}
-+
-+#define VC4_MOCK_PIXELVALVE_DESC(_data, ...)						\
-+	VC4_MOCK_CRTC_DESC(&(_data)->base, __VA_ARGS__)
-+
-+struct vc4_mock_desc {
-+	const struct vc4_mock_pipe_desc *pipes;
-+	unsigned int npipes;
-+};
-+
-+#define VC4_MOCK_DESC(...)								\
-+	{										\
-+		.pipes = (struct vc4_mock_pipe_desc[]) { __VA_ARGS__ },			\
-+		.npipes = sizeof((struct vc4_mock_pipe_desc[]) { __VA_ARGS__ }) /	\
-+			     sizeof(struct vc4_mock_pipe_desc),				\
-+	}
-+
-+static const struct vc4_mock_desc vc4_mock =
-+	VC4_MOCK_DESC(
-+		VC4_MOCK_CRTC_DESC(&vc4_txp_crtc_data,
-+				   VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_TXP,
-+							DRM_MODE_ENCODER_VIRTUAL,
-+							DRM_MODE_CONNECTOR_WRITEBACK)),
-+		VC4_MOCK_PIXELVALVE_DESC(&bcm2835_pv0_data,
-+					 VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_DSI0,
-+							      DRM_MODE_ENCODER_DSI,
-+							      DRM_MODE_CONNECTOR_DSI),
-+					 VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_DPI,
-+							      DRM_MODE_ENCODER_DPI,
-+							      DRM_MODE_CONNECTOR_DPI)),
-+		VC4_MOCK_PIXELVALVE_DESC(&bcm2835_pv1_data,
-+					 VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_DSI1,
-+							      DRM_MODE_ENCODER_DSI,
-+							      DRM_MODE_CONNECTOR_DSI)),
-+		VC4_MOCK_PIXELVALVE_DESC(&bcm2835_pv2_data,
-+					 VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_HDMI0,
-+							      DRM_MODE_ENCODER_TMDS,
-+							      DRM_MODE_CONNECTOR_HDMIA),
-+					 VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_VEC,
-+							      DRM_MODE_ENCODER_TVDAC,
-+							      DRM_MODE_CONNECTOR_Composite)),
-+);
-+
-+static const struct vc4_mock_desc vc5_mock =
-+	VC4_MOCK_DESC(
-+		VC4_MOCK_CRTC_DESC(&vc4_txp_crtc_data,
-+				   VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_TXP,
-+							DRM_MODE_ENCODER_VIRTUAL,
-+							DRM_MODE_CONNECTOR_WRITEBACK)),
-+		VC4_MOCK_PIXELVALVE_DESC(&bcm2711_pv0_data,
-+					 VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_DSI0,
-+							      DRM_MODE_ENCODER_DSI,
-+							      DRM_MODE_CONNECTOR_DSI),
-+					 VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_DPI,
-+							      DRM_MODE_ENCODER_DPI,
-+							      DRM_MODE_CONNECTOR_DPI)),
-+		VC4_MOCK_PIXELVALVE_DESC(&bcm2711_pv1_data,
-+					 VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_DSI1,
-+							      DRM_MODE_ENCODER_DSI,
-+							      DRM_MODE_CONNECTOR_DSI)),
-+		VC4_MOCK_PIXELVALVE_DESC(&bcm2711_pv2_data,
-+					 VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_HDMI0,
-+							      DRM_MODE_ENCODER_TMDS,
-+							      DRM_MODE_CONNECTOR_HDMIA)),
-+		VC4_MOCK_PIXELVALVE_DESC(&bcm2711_pv3_data,
-+					 VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_VEC,
-+							      DRM_MODE_ENCODER_TVDAC,
-+							      DRM_MODE_CONNECTOR_Composite)),
-+		VC4_MOCK_PIXELVALVE_DESC(&bcm2711_pv4_data,
-+					 VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_HDMI1,
-+							      DRM_MODE_ENCODER_TMDS,
-+							      DRM_MODE_CONNECTOR_HDMIA)),
-+);
-+
-+static int __build_one_pipe(struct kunit *test, struct drm_device *drm,
-+			    const struct vc4_mock_pipe_desc *pipe)
-+{
-+	struct vc4_dummy_plane *dummy_plane;
-+	struct drm_plane *plane;
-+	struct vc4_dummy_crtc *dummy_crtc;
-+	struct drm_crtc *crtc;
-+	unsigned int i;
-+
-+	dummy_plane = vc4_dummy_plane(test, drm, DRM_PLANE_TYPE_PRIMARY);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dummy_plane);
-+
-+	plane = &dummy_plane->plane.base;
-+	dummy_crtc = vc4_mock_pv(test, drm, plane, pipe->data);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dummy_crtc);
-+
-+	crtc = &dummy_crtc->crtc.base;
-+	for (i = 0; i < pipe->noutputs; i++) {
-+		const struct vc4_mock_output_desc *mock_output = &pipe->outputs[i];
-+		struct vc4_dummy_output *dummy_output;
-+
-+		dummy_output = vc4_dummy_output(test, drm, crtc,
-+						mock_output->vc4_encoder_type,
-+						mock_output->encoder_type,
-+						mock_output->connector_type);
-+		KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dummy_output);
-+	}
-+
-+	return 0;
-+}
-+
-+static int __build_mock(struct kunit *test, struct drm_device *drm,
-+			const struct vc4_mock_desc *mock)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < mock->npipes; i++) {
-+		const struct vc4_mock_pipe_desc *pipe = &mock->pipes[i];
-+		int ret;
-+
-+		ret = __build_one_pipe(test, drm, pipe);
-+		KUNIT_ASSERT_EQ(test, ret, 0);
-+	}
-+
-+	return 0;
-+}
-+
-+static struct vc4_dev *__mock_device(struct kunit *test, bool is_vc5)
-+{
-+	struct drm_device *drm;
-+	const struct drm_driver *drv = is_vc5 ? &vc5_drm_driver : &vc4_drm_driver;
-+	const struct vc4_mock_desc *desc = is_vc5 ? &vc5_mock : &vc4_mock;
-+	struct vc4_dev *vc4;
-+	struct device *dev;
-+	int ret;
-+
-+	dev = drm_kunit_helper_alloc_device(test);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dev);
-+
-+	vc4 = drm_kunit_helper_alloc_drm_device_with_driver(test, dev,
-+							    struct vc4_dev, base,
-+							    drv);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, vc4);
-+
-+	vc4->dev = dev;
-+	vc4->is_vc5 = is_vc5;
-+
-+	vc4->hvs = __vc4_hvs_alloc(vc4, NULL);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, vc4->hvs);
-+
-+	drm = &vc4->base;
-+	ret = __build_mock(test, drm, desc);
-+	KUNIT_ASSERT_EQ(test, ret, 0);
-+
-+	ret = vc4_kms_load(drm);
-+	KUNIT_ASSERT_EQ(test, ret, 0);
-+
-+	ret = drm_dev_register(drm, 0);
-+	KUNIT_ASSERT_EQ(test, ret, 0);
-+
-+	return vc4;
-+}
-+
-+struct vc4_dev *vc4_mock_device(struct kunit *test)
-+{
-+	return __mock_device(test, false);
-+}
-+
-+struct vc4_dev *vc5_mock_device(struct kunit *test)
-+{
-+	return __mock_device(test, true);
-+}
---- /dev/null
-+++ b/drivers/gpu/drm/vc4/tests/vc4_mock.h
-@@ -0,0 +1,60 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+
-+#ifndef VC4_MOCK_H_
-+#define VC4_MOCK_H_
-+
-+#include "../vc4_drv.h"
-+
-+static inline
-+struct drm_crtc *vc4_find_crtc_for_encoder(struct kunit *test,
-+					   struct drm_device *drm,
-+					   struct drm_encoder *encoder)
-+{
-+	struct drm_crtc *crtc;
-+
-+	KUNIT_ASSERT_EQ(test, hweight32(encoder->possible_crtcs), 1);
-+
-+	drm_for_each_crtc(crtc, drm)
-+		if (encoder->possible_crtcs & drm_crtc_mask(crtc))
-+			return crtc;
-+
-+	return NULL;
-+}
-+
-+struct vc4_dummy_plane {
-+	struct vc4_plane plane;
-+};
-+
-+struct vc4_dummy_plane *vc4_dummy_plane(struct kunit *test,
-+					struct drm_device *drm,
-+					enum drm_plane_type type);
-+
-+struct vc4_dummy_crtc {
-+	struct vc4_crtc crtc;
-+};
-+
-+struct vc4_dummy_crtc *vc4_mock_pv(struct kunit *test,
-+				   struct drm_device *drm,
-+				   struct drm_plane *plane,
-+				   const struct vc4_crtc_data *data);
-+
-+struct vc4_dummy_output {
-+	struct vc4_encoder encoder;
-+	struct drm_connector connector;
-+};
-+
-+struct vc4_dummy_output *vc4_dummy_output(struct kunit *test,
-+					  struct drm_device *drm,
-+					  struct drm_crtc *crtc,
-+					  enum vc4_encoder_type vc4_encoder_type,
-+					  unsigned int kms_encoder_type,
-+					  unsigned int connector_type);
-+
-+struct vc4_dev *vc4_mock_device(struct kunit *test);
-+struct vc4_dev *vc5_mock_device(struct kunit *test);
-+
-+int vc4_mock_atomic_add_output(struct kunit *test, struct drm_device *drm,
-+			       enum vc4_encoder_type type,
-+			       struct drm_atomic_state *state);
-+
-+#endif // VC4_MOCK_H_
---- /dev/null
-+++ b/drivers/gpu/drm/vc4/tests/vc4_mock_crtc.c
-@@ -0,0 +1,41 @@
-+// SPDX-License-Identifier: GPL-2.0
-+
-+#include <drm/drm_atomic_state_helper.h>
-+#include <drm/drm_modeset_helper_vtables.h>
-+
-+#include <kunit/test.h>
-+
-+#include "vc4_mock.h"
-+
-+static const struct drm_crtc_helper_funcs vc4_dummy_crtc_helper_funcs = {
-+	.atomic_check	= vc4_crtc_atomic_check,
-+};
-+
-+static const struct drm_crtc_funcs vc4_dummy_crtc_funcs = {
-+	.atomic_destroy_state	= vc4_crtc_destroy_state,
-+	.atomic_duplicate_state	= vc4_crtc_duplicate_state,
-+	.reset			= vc4_crtc_reset,
-+};
-+
-+struct vc4_dummy_crtc *vc4_mock_pv(struct kunit *test,
-+				   struct drm_device *drm,
-+				   struct drm_plane *plane,
-+				   const struct vc4_crtc_data *data)
-+{
-+	struct vc4_dummy_crtc *dummy_crtc;
-+	struct vc4_crtc *vc4_crtc;
-+	int ret;
-+
-+	dummy_crtc = kunit_kzalloc(test, sizeof(*dummy_crtc), GFP_KERNEL);
-+	KUNIT_ASSERT_NOT_NULL(test, dummy_crtc);
-+
-+	vc4_crtc = &dummy_crtc->crtc;
-+	ret = __vc4_crtc_init(drm, NULL,
-+			      vc4_crtc, data, plane,
-+			      &vc4_dummy_crtc_funcs,
-+			      &vc4_dummy_crtc_helper_funcs,
-+			      false);
-+	KUNIT_ASSERT_EQ(test, ret, 0);
-+
-+	return dummy_crtc;
-+}
---- /dev/null
-+++ b/drivers/gpu/drm/vc4/tests/vc4_mock_output.c
-@@ -0,0 +1,99 @@
-+// SPDX-License-Identifier: GPL-2.0
-+
-+#include <drm/drm_atomic_state_helper.h>
-+#include <drm/drm_atomic_uapi.h>
-+#include <drm/drm_connector.h>
-+#include <drm/drm_crtc.h>
-+#include <drm/drm_encoder.h>
-+#include <drm/drm_modeset_helper_vtables.h>
-+
-+#include <kunit/test.h>
-+
-+#include "vc4_mock.h"
-+
-+static const struct drm_connector_helper_funcs vc4_dummy_connector_helper_funcs = {
-+};
-+
-+static const struct drm_connector_funcs vc4_dummy_connector_funcs = {
-+	.atomic_destroy_state	= drm_atomic_helper_connector_destroy_state,
-+	.atomic_duplicate_state	= drm_atomic_helper_connector_duplicate_state,
-+	.reset			= drm_atomic_helper_connector_reset,
-+};
-+
-+struct vc4_dummy_output *vc4_dummy_output(struct kunit *test,
-+					  struct drm_device *drm,
-+					  struct drm_crtc *crtc,
-+					  enum vc4_encoder_type vc4_encoder_type,
-+					  unsigned int kms_encoder_type,
-+					  unsigned int connector_type)
-+{
-+	struct vc4_dummy_output *dummy_output;
-+	struct drm_connector *conn;
-+	struct drm_encoder *enc;
-+	int ret;
-+
-+	dummy_output = kunit_kzalloc(test, sizeof(*dummy_output), GFP_KERNEL);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dummy_output);
-+	dummy_output->encoder.type = vc4_encoder_type;
-+
-+	enc = &dummy_output->encoder.base;
-+	ret = drmm_encoder_init(drm, enc,
-+				NULL,
-+				kms_encoder_type,
-+				NULL);
-+	KUNIT_ASSERT_EQ(test, ret, 0);
-+	enc->possible_crtcs = drm_crtc_mask(crtc);
-+
-+	conn = &dummy_output->connector;
-+	ret = drmm_connector_init(drm, conn,
-+				  &vc4_dummy_connector_funcs,
-+				  connector_type,
-+				  NULL);
-+	KUNIT_ASSERT_EQ(test, ret, 0);
-+
-+	drm_connector_helper_add(conn, &vc4_dummy_connector_helper_funcs);
-+	drm_connector_attach_encoder(conn, enc);
-+
-+	return dummy_output;
-+}
-+
-+static const struct drm_display_mode default_mode = {
-+	DRM_SIMPLE_MODE(640, 480, 64, 48)
-+};
-+
-+int vc4_mock_atomic_add_output(struct kunit *test, struct drm_device *drm,
-+			       enum vc4_encoder_type type,
-+			       struct drm_atomic_state *state)
-+{
-+	struct vc4_dummy_output *output;
-+	struct drm_connector *conn;
-+	struct drm_connector_state *conn_state;
-+	struct drm_encoder *encoder;
-+	struct drm_crtc *crtc;
-+	struct drm_crtc_state *crtc_state;
-+	int ret;
-+
-+	encoder = vc4_find_encoder_by_type(drm, type);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, encoder);
-+
-+	crtc = vc4_find_crtc_for_encoder(test, drm, encoder);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc);
-+
-+	output = container_of(encoder, struct vc4_dummy_output, encoder.base);
-+	conn = &output->connector;
-+	conn_state = drm_atomic_get_connector_state(state, conn);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, conn_state);
-+
-+	ret = drm_atomic_set_crtc_for_connector(conn_state, crtc);
-+	KUNIT_EXPECT_EQ(test, ret, 0);
-+
-+	crtc_state = drm_atomic_get_crtc_state(state, crtc);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc_state);
-+
-+	ret = drm_atomic_set_mode_for_crtc(crtc_state, &default_mode);
-+	KUNIT_EXPECT_EQ(test, ret, 0);
-+
-+	crtc_state->active = true;
-+
-+	return 0;
-+}
---- /dev/null
-+++ b/drivers/gpu/drm/vc4/tests/vc4_mock_plane.c
-@@ -0,0 +1,47 @@
-+// SPDX-License-Identifier: GPL-2.0
-+
-+#include <drm/drm_atomic_state_helper.h>
-+#include <drm/drm_fourcc.h>
-+#include <drm/drm_modeset_helper_vtables.h>
-+#include <drm/drm_plane.h>
-+
-+#include <kunit/test.h>
-+
-+#include "vc4_mock.h"
-+
-+static const struct drm_plane_helper_funcs vc4_dummy_plane_helper_funcs = {
-+};
-+
-+static const struct drm_plane_funcs vc4_dummy_plane_funcs = {
-+	.atomic_destroy_state	= drm_atomic_helper_plane_destroy_state,
-+	.atomic_duplicate_state	= drm_atomic_helper_plane_duplicate_state,
-+	.reset			= drm_atomic_helper_plane_reset,
-+};
-+
-+static const uint32_t vc4_dummy_plane_formats[] = {
-+	DRM_FORMAT_XRGB8888,
-+};
-+
-+struct vc4_dummy_plane *vc4_dummy_plane(struct kunit *test,
-+					struct drm_device *drm,
-+					enum drm_plane_type type)
-+{
-+	struct vc4_dummy_plane *dummy_plane;
-+	struct drm_plane *plane;
-+
-+	dummy_plane = drmm_universal_plane_alloc(drm,
-+						 struct vc4_dummy_plane, plane.base,
-+						 0,
-+						 &vc4_dummy_plane_funcs,
-+						 vc4_dummy_plane_formats,
-+						 ARRAY_SIZE(vc4_dummy_plane_formats),
-+						 NULL,
-+						 DRM_PLANE_TYPE_PRIMARY,
-+						 NULL);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dummy_plane);
-+
-+	plane = &dummy_plane->plane.base;
-+	drm_plane_helper_add(plane, &vc4_dummy_plane_helper_funcs);
-+
-+	return dummy_plane;
-+}
---- a/drivers/gpu/drm/vc4/vc4_crtc.c
-+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
-@@ -709,8 +709,8 @@ void vc4_crtc_get_margins(struct drm_crt
- 	}
- }
- 
--static int vc4_crtc_atomic_check(struct drm_crtc *crtc,
--				 struct drm_atomic_state *state)
-+int vc4_crtc_atomic_check(struct drm_crtc *crtc,
-+			  struct drm_atomic_state *state)
- {
- 	struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,
- 									  crtc);
-@@ -1156,7 +1156,7 @@ static const struct drm_crtc_helper_func
- 	.get_scanout_position = vc4_crtc_get_scanout_position,
- };
- 
--static const struct vc4_pv_data bcm2835_pv0_data = {
-+const struct vc4_pv_data bcm2835_pv0_data = {
- 	.base = {
- 		.name = "pixelvalve-0",
- 		.debugfs_name = "crtc0_regs",
-@@ -1171,7 +1171,7 @@ static const struct vc4_pv_data bcm2835_
- 	},
- };
- 
--static const struct vc4_pv_data bcm2835_pv1_data = {
-+const struct vc4_pv_data bcm2835_pv1_data = {
- 	.base = {
- 		.name = "pixelvalve-1",
- 		.debugfs_name = "crtc1_regs",
-@@ -1186,7 +1186,7 @@ static const struct vc4_pv_data bcm2835_
- 	},
- };
- 
--static const struct vc4_pv_data bcm2835_pv2_data = {
-+const struct vc4_pv_data bcm2835_pv2_data = {
- 	.base = {
- 		.name = "pixelvalve-2",
- 		.debugfs_name = "crtc2_regs",
-@@ -1201,7 +1201,7 @@ static const struct vc4_pv_data bcm2835_
- 	},
- };
- 
--static const struct vc4_pv_data bcm2711_pv0_data = {
-+const struct vc4_pv_data bcm2711_pv0_data = {
- 	.base = {
- 		.name = "pixelvalve-0",
- 		.debugfs_name = "crtc0_regs",
-@@ -1216,7 +1216,7 @@ static const struct vc4_pv_data bcm2711_
- 	},
- };
- 
--static const struct vc4_pv_data bcm2711_pv1_data = {
-+const struct vc4_pv_data bcm2711_pv1_data = {
- 	.base = {
- 		.name = "pixelvalve-1",
- 		.debugfs_name = "crtc1_regs",
-@@ -1231,7 +1231,7 @@ static const struct vc4_pv_data bcm2711_
- 	},
- };
- 
--static const struct vc4_pv_data bcm2711_pv2_data = {
-+const struct vc4_pv_data bcm2711_pv2_data = {
- 	.base = {
- 		.name = "pixelvalve-2",
- 		.debugfs_name = "crtc2_regs",
-@@ -1245,7 +1245,7 @@ static const struct vc4_pv_data bcm2711_
- 	},
- };
- 
--static const struct vc4_pv_data bcm2711_pv3_data = {
-+const struct vc4_pv_data bcm2711_pv3_data = {
- 	.base = {
- 		.name = "pixelvalve-3",
- 		.debugfs_name = "crtc3_regs",
-@@ -1259,7 +1259,7 @@ static const struct vc4_pv_data bcm2711_
- 	},
- };
- 
--static const struct vc4_pv_data bcm2711_pv4_data = {
-+const struct vc4_pv_data bcm2711_pv4_data = {
- 	.base = {
- 		.name = "pixelvalve-4",
- 		.debugfs_name = "crtc4_regs",
---- a/drivers/gpu/drm/vc4/vc4_drv.c
-+++ b/drivers/gpu/drm/vc4/vc4_drv.c
-@@ -196,7 +196,7 @@ static const struct drm_ioctl_desc vc4_d
- 	DRM_IOCTL_DEF_DRV(VC4_PERFMON_GET_VALUES, vc4_perfmon_get_values_ioctl, DRM_RENDER_ALLOW),
- };
- 
--static const struct drm_driver vc4_drm_driver = {
-+const struct drm_driver vc4_drm_driver = {
- 	.driver_features = (DRIVER_MODESET |
- 			    DRIVER_ATOMIC |
- 			    DRIVER_GEM |
-@@ -225,7 +225,7 @@ static const struct drm_driver vc4_drm_d
- 	.patchlevel = DRIVER_PATCHLEVEL,
- };
- 
--static const struct drm_driver vc5_drm_driver = {
-+const struct drm_driver vc5_drm_driver = {
- 	.driver_features = (DRIVER_MODESET |
- 			    DRIVER_ATOMIC |
- 			    DRIVER_GEM),
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -25,6 +25,9 @@
- struct drm_device;
- struct drm_gem_object;
- 
-+extern const struct drm_driver vc4_drm_driver;
-+extern const struct drm_driver vc5_drm_driver;
-+
- /* Don't forget to update vc4_bo.c: bo_type_names[] when adding to
-  * this.
-  */
-@@ -528,6 +531,8 @@ struct vc4_crtc_data {
- 	int hvs_output;
- };
- 
-+extern const struct vc4_crtc_data vc4_txp_crtc_data;
-+
- struct vc4_pv_data {
- 	struct vc4_crtc_data	base;
- 
-@@ -540,6 +545,15 @@ struct vc4_pv_data {
- 	enum vc4_encoder_type encoder_types[4];
- };
- 
-+extern const struct vc4_pv_data bcm2835_pv0_data;
-+extern const struct vc4_pv_data bcm2835_pv1_data;
-+extern const struct vc4_pv_data bcm2835_pv2_data;
-+extern const struct vc4_pv_data bcm2711_pv0_data;
-+extern const struct vc4_pv_data bcm2711_pv1_data;
-+extern const struct vc4_pv_data bcm2711_pv2_data;
-+extern const struct vc4_pv_data bcm2711_pv3_data;
-+extern const struct vc4_pv_data bcm2711_pv4_data;
-+
- struct vc5_gamma_entry {
- 	u32 x_c_terms;
- 	u32 grad_term;
-@@ -944,6 +958,8 @@ int vc4_page_flip(struct drm_crtc *crtc,
- 		  struct drm_pending_vblank_event *event,
- 		  uint32_t flags,
- 		  struct drm_modeset_acquire_ctx *ctx);
-+int vc4_crtc_atomic_check(struct drm_crtc *crtc,
-+			  struct drm_atomic_state *state);
- struct drm_crtc_state *vc4_crtc_duplicate_state(struct drm_crtc *crtc);
- void vc4_crtc_destroy_state(struct drm_crtc *crtc,
- 			    struct drm_crtc_state *state);
---- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-+++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-@@ -1161,8 +1161,8 @@ vc4_crtc_mode_valid(struct drm_crtc *crt
- 	return MODE_OK;
- }
- 
--static int vc4_crtc_atomic_check(struct drm_crtc *crtc,
--				 struct drm_atomic_state *state)
-+static int vc4_fkms_crtc_atomic_check(struct drm_crtc *crtc,
-+				      struct drm_atomic_state *state)
- {
- 	struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,
- 									  crtc);
-@@ -1341,7 +1341,7 @@ static const struct drm_crtc_funcs vc4_c
- static const struct drm_crtc_helper_funcs vc4_crtc_helper_funcs = {
- 	.mode_set_nofb = vc4_crtc_mode_set_nofb,
- 	.mode_valid = vc4_crtc_mode_valid,
--	.atomic_check = vc4_crtc_atomic_check,
-+	.atomic_check = vc4_fkms_crtc_atomic_check,
- 	.atomic_flush = vc4_crtc_atomic_flush,
- 	.atomic_enable = vc4_crtc_enable,
- 	.atomic_disable = vc4_crtc_disable,
---- a/drivers/gpu/drm/vc4/vc4_txp.c
-+++ b/drivers/gpu/drm/vc4/vc4_txp.c
-@@ -479,7 +479,7 @@ static irqreturn_t vc4_txp_interrupt(int
- 	return IRQ_HANDLED;
- }
- 
--static const struct vc4_crtc_data vc4_txp_crtc_data = {
-+const struct vc4_crtc_data vc4_txp_crtc_data = {
- 	.name = "txp",
- 	.debugfs_name = "txp_regs",
- 	.hvs_available_channels = BIT(2),
diff --git a/target/linux/bcm27xx/patches-6.1/950-0503-drm-vc4-tests-Fail-the-current-test-if-we-access-a-r.patch b/target/linux/bcm27xx/patches-6.1/950-0503-drm-vc4-tests-Fail-the-current-test-if-we-access-a-r.patch
deleted file mode 100644
index 3edc1814d1..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0503-drm-vc4-tests-Fail-the-current-test-if-we-access-a-r.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-From 01e67fe435419efedf2431d582fdd17340041453 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Mon, 21 Nov 2022 17:04:31 +0100
-Subject: [PATCH] drm/vc4: tests: Fail the current test if we access a
- register
-
-Accessing a register when running under kunit is a bad idea since our
-device is completely mocked.
-
-Fail the current test if we ever access any of our hardware registers.
-
-Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_crtc.c      | 13 +++++++++++--
- drivers/gpu/drm/vc4/vc4_dpi.c       | 13 +++++++++++--
- drivers/gpu/drm/vc4/vc4_drv.h       | 29 +++++++++++++++++++++++++----
- drivers/gpu/drm/vc4/vc4_dsi.c       |  9 ++++++++-
- drivers/gpu/drm/vc4/vc4_hdmi_regs.h |  4 ++++
- drivers/gpu/drm/vc4/vc4_txp.c       | 13 +++++++++++--
- drivers/gpu/drm/vc4/vc4_vec.c       | 13 +++++++++++--
- 7 files changed, 81 insertions(+), 13 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_crtc.c
-+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
-@@ -50,8 +50,17 @@
- 
- #define HVS_FIFO_LATENCY_PIX	6
- 
--#define CRTC_WRITE(offset, val) writel(val, vc4_crtc->regs + (offset))
--#define CRTC_READ(offset) readl(vc4_crtc->regs + (offset))
-+#define CRTC_WRITE(offset, val)								\
-+	do {										\
-+		kunit_fail_current_test("Accessing a register in a unit test!\n");	\
-+		writel(val, vc4_crtc->regs + (offset));					\
-+	} while (0)
-+
-+#define CRTC_READ(offset)								\
-+	({										\
-+		kunit_fail_current_test("Accessing a register in a unit test!\n");	\
-+		readl(vc4_crtc->regs + (offset));					\
-+	})
- 
- static const struct debugfs_reg32 crtc_regs[] = {
- 	VC4_REG32(PV_CONTROL),
---- a/drivers/gpu/drm/vc4/vc4_dpi.c
-+++ b/drivers/gpu/drm/vc4/vc4_dpi.c
-@@ -103,8 +103,17 @@ to_vc4_dpi(struct drm_encoder *encoder)
- 	return container_of(encoder, struct vc4_dpi, encoder.base);
- }
- 
--#define DPI_READ(offset) readl(dpi->regs + (offset))
--#define DPI_WRITE(offset, val) writel(val, dpi->regs + (offset))
-+#define DPI_READ(offset)								\
-+	({										\
-+		kunit_fail_current_test("Accessing a register in a unit test!\n");	\
-+		readl(dpi->regs + (offset));						\
-+	})
-+
-+#define DPI_WRITE(offset, val)								\
-+	do {										\
-+		kunit_fail_current_test("Accessing a register in a unit test!\n");	\
-+		writel(val, dpi->regs + (offset));					\
-+	} while (0)
- 
- static const struct debugfs_reg32 dpi_regs[] = {
- 	VC4_REG32(DPI_C),
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -19,6 +19,8 @@
- #include <drm/drm_mm.h>
- #include <drm/drm_modeset_lock.h>
- 
-+#include <kunit/test-bug.h>
-+
- #include "uapi/drm/vc4_drm.h"
- #include "vc4_regs.h"
- 
-@@ -669,10 +671,29 @@ to_vc4_crtc_state(const struct drm_crtc_
- 	return container_of(crtc_state, struct vc4_crtc_state, base);
- }
- 
--#define V3D_READ(offset) readl(vc4->v3d->regs + offset)
--#define V3D_WRITE(offset, val) writel(val, vc4->v3d->regs + offset)
--#define HVS_READ(offset) readl(hvs->regs + offset)
--#define HVS_WRITE(offset, val) writel(val, hvs->regs + offset)
-+#define V3D_READ(offset)								\
-+	({										\
-+		kunit_fail_current_test("Accessing a register in a unit test!\n");	\
-+		readl(vc4->v3d->regs + (offset));						\
-+	})
-+
-+#define V3D_WRITE(offset, val)								\
-+	do {										\
-+		kunit_fail_current_test("Accessing a register in a unit test!\n");	\
-+		writel(val, vc4->v3d->regs + (offset));					\
-+	} while (0)
-+
-+#define HVS_READ(offset)								\
-+	({										\
-+		kunit_fail_current_test("Accessing a register in a unit test!\n");	\
-+		readl(hvs->regs + (offset));						\
-+	})
-+
-+#define HVS_WRITE(offset, val)								\
-+	do {										\
-+		kunit_fail_current_test("Accessing a register in a unit test!\n");	\
-+		writel(val, hvs->regs + (offset));					\
-+	} while (0)
- 
- #define VC4_REG32(reg) { .name = #reg, .offset = reg }
- 
---- a/drivers/gpu/drm/vc4/vc4_dsi.c
-+++ b/drivers/gpu/drm/vc4/vc4_dsi.c
-@@ -623,6 +623,8 @@ dsi_dma_workaround_write(struct vc4_dsi
- 	dma_cookie_t cookie;
- 	int ret;
- 
-+	kunit_fail_current_test("Accessing a register in a unit test!\n");
-+
- 	/* DSI0 should be able to write normally. */
- 	if (!chan) {
- 		writel(val, dsi->regs + offset);
-@@ -651,7 +653,12 @@ dsi_dma_workaround_write(struct vc4_dsi
- 		DRM_ERROR("Failed to wait for DMA: %d\n", ret);
- }
- 
--#define DSI_READ(offset) readl(dsi->regs + (offset))
-+#define DSI_READ(offset)								\
-+	({										\
-+		kunit_fail_current_test("Accessing a register in a unit test!\n");	\
-+		readl(dsi->regs + (offset));						\
-+	})
-+
- #define DSI_WRITE(offset, val) dsi_dma_workaround_write(dsi, offset, val)
- #define DSI_PORT_READ(offset) \
- 	DSI_READ(dsi->variant->port ? DSI1_##offset : DSI0_##offset)
---- a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
-@@ -456,6 +456,8 @@ static inline u32 vc4_hdmi_read(struct v
- 
- 	WARN_ON(pm_runtime_status_suspended(&hdmi->pdev->dev));
- 
-+	kunit_fail_current_test("Accessing an HDMI register in a unit test!\n");
-+
- 	if (reg >= variant->num_registers) {
- 		dev_warn(&hdmi->pdev->dev,
- 			 "Invalid register ID %u\n", reg);
-@@ -486,6 +488,8 @@ static inline void vc4_hdmi_write(struct
- 
- 	WARN_ON(pm_runtime_status_suspended(&hdmi->pdev->dev));
- 
-+	kunit_fail_current_test("Accessing an HDMI register in a unit test!\n");
-+
- 	if (reg >= variant->num_registers) {
- 		dev_warn(&hdmi->pdev->dev,
- 			 "Invalid register ID %u\n", reg);
---- a/drivers/gpu/drm/vc4/vc4_txp.c
-+++ b/drivers/gpu/drm/vc4/vc4_txp.c
-@@ -145,8 +145,17 @@
- /* Number of lines received and committed to memory. */
- #define TXP_PROGRESS		0x10
- 
--#define TXP_READ(offset) readl(txp->regs + (offset))
--#define TXP_WRITE(offset, val) writel(val, txp->regs + (offset))
-+#define TXP_READ(offset)								\
-+	({										\
-+		kunit_fail_current_test("Accessing a register in a unit test!\n");	\
-+		readl(txp->regs + (offset));						\
-+	})
-+
-+#define TXP_WRITE(offset, val)								\
-+	do {										\
-+		kunit_fail_current_test("Accessing a register in a unit test!\n");	\
-+		writel(val, txp->regs + (offset));					\
-+	} while (0)
- 
- struct vc4_txp {
- 	struct vc4_crtc	base;
---- a/drivers/gpu/drm/vc4/vc4_vec.c
-+++ b/drivers/gpu/drm/vc4/vc4_vec.c
-@@ -207,8 +207,17 @@ struct vc4_vec {
- 	struct debugfs_regset32 regset;
- };
- 
--#define VEC_READ(offset) readl(vec->regs + (offset))
--#define VEC_WRITE(offset, val) writel(val, vec->regs + (offset))
-+#define VEC_READ(offset)								\
-+	({										\
-+		kunit_fail_current_test("Accessing a register in a unit test!\n");	\
-+		readl(vec->regs + (offset));						\
-+	})
-+
-+#define VEC_WRITE(offset, val)								\
-+	do {										\
-+		kunit_fail_current_test("Accessing a register in a unit test!\n");	\
-+		writel(val, vec->regs + (offset));					\
-+	} while (0)
- 
- static inline struct vc4_vec *
- encoder_to_vc4_vec(struct drm_encoder *encoder)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0504-drm-vc4-tests-Add-unit-test-suite-for-the-PV-muxing.patch b/target/linux/bcm27xx/patches-6.1/950-0504-drm-vc4-tests-Add-unit-test-suite-for-the-PV-muxing.patch
deleted file mode 100644
index 5ab57ce3a1..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0504-drm-vc4-tests-Add-unit-test-suite-for-the-PV-muxing.patch
+++ /dev/null
@@ -1,1159 +0,0 @@
-From 27aebda6c6498ff8f948b9cc8facef30f522af33 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Mon, 14 Nov 2022 16:06:22 +0100
-Subject: [PATCH] drm/vc4: tests: Add unit test suite for the PV muxing
-
-The HVS to PixelValve muxing code is fairly error prone and has a bunch
-of arbitrary constraints due to the hardware setup.
-
-Let's create a test suite that makes sure that the possible combinations
-work and the invalid ones don't.
-
-Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/Makefile                  |    3 +-
- drivers/gpu/drm/vc4/tests/vc4_mock.h          |    9 +-
- drivers/gpu/drm/vc4/tests/vc4_mock_output.c   |   49 +-
- .../gpu/drm/vc4/tests/vc4_test_pv_muxing.c    | 1039 +++++++++++++++++
- 4 files changed, 1091 insertions(+), 9 deletions(-)
- create mode 100644 drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c
-
---- a/drivers/gpu/drm/vc4/Makefile
-+++ b/drivers/gpu/drm/vc4/Makefile
-@@ -30,7 +30,8 @@ vc4-$(CONFIG_DRM_VC4_KUNIT_TEST) += \
- 	tests/vc4_mock.o \
- 	tests/vc4_mock_crtc.o \
- 	tests/vc4_mock_output.o \
--	tests/vc4_mock_plane.o
-+	tests/vc4_mock_plane.o \
-+	tests/vc4_test_pv_muxing.o
- 
- vc4-$(CONFIG_DEBUG_FS) += vc4_debugfs.o
- 
---- a/drivers/gpu/drm/vc4/tests/vc4_mock.h
-+++ b/drivers/gpu/drm/vc4/tests/vc4_mock.h
-@@ -53,8 +53,11 @@ struct vc4_dummy_output *vc4_dummy_outpu
- struct vc4_dev *vc4_mock_device(struct kunit *test);
- struct vc4_dev *vc5_mock_device(struct kunit *test);
- 
--int vc4_mock_atomic_add_output(struct kunit *test, struct drm_device *drm,
--			       enum vc4_encoder_type type,
--			       struct drm_atomic_state *state);
-+int vc4_mock_atomic_add_output(struct kunit *test,
-+			       struct drm_atomic_state *state,
-+			       enum vc4_encoder_type type);
-+int vc4_mock_atomic_del_output(struct kunit *test,
-+			       struct drm_atomic_state *state,
-+			       enum vc4_encoder_type type);
- 
- #endif // VC4_MOCK_H_
---- a/drivers/gpu/drm/vc4/tests/vc4_mock_output.c
-+++ b/drivers/gpu/drm/vc4/tests/vc4_mock_output.c
-@@ -61,16 +61,17 @@ static const struct drm_display_mode def
- 	DRM_SIMPLE_MODE(640, 480, 64, 48)
- };
- 
--int vc4_mock_atomic_add_output(struct kunit *test, struct drm_device *drm,
--			       enum vc4_encoder_type type,
--			       struct drm_atomic_state *state)
-+int vc4_mock_atomic_add_output(struct kunit *test,
-+			       struct drm_atomic_state *state,
-+			       enum vc4_encoder_type type)
- {
-+	struct drm_device *drm = state->dev;
-+	struct drm_connector_state *conn_state;
-+	struct drm_crtc_state *crtc_state;
- 	struct vc4_dummy_output *output;
- 	struct drm_connector *conn;
--	struct drm_connector_state *conn_state;
- 	struct drm_encoder *encoder;
- 	struct drm_crtc *crtc;
--	struct drm_crtc_state *crtc_state;
- 	int ret;
- 
- 	encoder = vc4_find_encoder_by_type(drm, type);
-@@ -97,3 +98,41 @@ int vc4_mock_atomic_add_output(struct ku
- 
- 	return 0;
- }
-+
-+int vc4_mock_atomic_del_output(struct kunit *test,
-+			       struct drm_atomic_state *state,
-+			       enum vc4_encoder_type type)
-+{
-+	struct drm_device *drm = state->dev;
-+	struct drm_connector_state *conn_state;
-+	struct drm_crtc_state *crtc_state;
-+	struct vc4_dummy_output *output;
-+	struct drm_connector *conn;
-+	struct drm_encoder *encoder;
-+	struct drm_crtc *crtc;
-+	int ret;
-+
-+	encoder = vc4_find_encoder_by_type(drm, type);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, encoder);
-+
-+	crtc = vc4_find_crtc_for_encoder(test, drm, encoder);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc);
-+
-+	crtc_state = drm_atomic_get_crtc_state(state, crtc);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc_state);
-+
-+	crtc_state->active = false;
-+
-+	ret = drm_atomic_set_mode_for_crtc(crtc_state, NULL);
-+	KUNIT_ASSERT_EQ(test, ret, 0);
-+
-+	output = container_of(encoder, struct vc4_dummy_output, encoder.base);
-+	conn = &output->connector;
-+	conn_state = drm_atomic_get_connector_state(state, conn);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, conn_state);
-+
-+	ret = drm_atomic_set_crtc_for_connector(conn_state, NULL);
-+	KUNIT_ASSERT_EQ(test, ret, 0);
-+
-+	return 0;
-+}
---- /dev/null
-+++ b/drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c
-@@ -0,0 +1,1039 @@
-+// SPDX-License-Identifier: GPL-2.0
-+
-+#include <drm/drm_atomic.h>
-+#include <drm/drm_atomic_helper.h>
-+#include <drm/drm_atomic_state_helper.h>
-+#include <drm/drm_atomic_uapi.h>
-+#include <drm/drm_crtc.h>
-+#include <drm/drm_drv.h>
-+#include <drm/drm_fourcc.h>
-+#include <drm/drm_kunit_helpers.h>
-+#include <drm/drm_mode.h>
-+#include <drm/drm_modeset_helper_vtables.h>
-+#include <drm/drm_plane.h>
-+
-+#include <kunit/test.h>
-+
-+#include "../vc4_drv.h"
-+
-+#include "vc4_mock.h"
-+
-+struct pv_muxing_priv {
-+	struct vc4_dev *vc4;
-+	struct drm_modeset_acquire_ctx ctx;
-+	struct drm_atomic_state *state;
-+};
-+
-+static bool check_fifo_conflict(struct kunit *test,
-+				const struct drm_atomic_state *state)
-+{
-+	struct vc4_hvs_state *hvs_state;
-+	unsigned int used_fifos = 0;
-+	unsigned int i;
-+
-+	hvs_state = vc4_hvs_get_new_global_state(state);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, hvs_state);
-+
-+	for (i = 0; i < HVS_NUM_CHANNELS; i++) {
-+		if (!hvs_state->fifo_state[i].in_use)
-+			continue;
-+
-+		KUNIT_EXPECT_FALSE(test, used_fifos & BIT(i));
-+		used_fifos |= BIT(i);
-+	}
-+
-+	return true;
-+}
-+
-+struct encoder_constraint {
-+	enum vc4_encoder_type type;
-+	unsigned int *channels;
-+	size_t nchannels;
-+};
-+
-+#define ENCODER_CONSTRAINT(_type, ...)					\
-+	{								\
-+		.type = _type,						\
-+		.channels = (unsigned int[]) { __VA_ARGS__ },		\
-+		.nchannels = sizeof((unsigned int[]) { __VA_ARGS__ }) /	\
-+			     sizeof(unsigned int),			\
-+	}
-+
-+static bool __check_encoder_constraints(const struct encoder_constraint *constraints,
-+					size_t nconstraints,
-+					enum vc4_encoder_type type,
-+					unsigned int channel)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < nconstraints; i++) {
-+		const struct encoder_constraint *constraint = &constraints[i];
-+		unsigned int j;
-+
-+		if (constraint->type != type)
-+			continue;
-+
-+		for (j = 0; j < constraint->nchannels; j++) {
-+			unsigned int _channel = constraint->channels[j];
-+
-+			if (channel != _channel)
-+				continue;
-+
-+			return true;
-+		}
-+	}
-+
-+	return false;
-+}
-+
-+static const struct encoder_constraint vc4_encoder_constraints[] = {
-+	ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_DPI, 0),
-+	ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_DSI0, 0),
-+	ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_HDMI0, 1),
-+	ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_VEC, 1),
-+	ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_TXP, 2),
-+	ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_DSI1, 2),
-+};
-+
-+static const struct encoder_constraint vc5_encoder_constraints[] = {
-+	ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_DPI, 0),
-+	ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_DSI0, 0),
-+	ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_VEC, 1),
-+	ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_TXP, 0, 2),
-+	ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_DSI1, 0, 1, 2),
-+	ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_HDMI0, 0, 1, 2),
-+	ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_HDMI1, 0, 1, 2),
-+};
-+
-+static bool check_vc4_encoder_constraints(enum vc4_encoder_type type, unsigned int channel)
-+{
-+	return __check_encoder_constraints(vc4_encoder_constraints,
-+					   ARRAY_SIZE(vc4_encoder_constraints),
-+					   type, channel);
-+}
-+
-+static bool check_vc5_encoder_constraints(enum vc4_encoder_type type, unsigned int channel)
-+{
-+	return __check_encoder_constraints(vc5_encoder_constraints,
-+					   ARRAY_SIZE(vc5_encoder_constraints),
-+					   type, channel);
-+}
-+
-+static struct vc4_crtc_state *
-+get_vc4_crtc_state_for_encoder(struct kunit *test,
-+			       const struct drm_atomic_state *state,
-+			       enum vc4_encoder_type type)
-+{
-+	struct drm_device *drm = state->dev;
-+	struct drm_crtc_state *new_crtc_state;
-+	struct drm_encoder *encoder;
-+	struct drm_crtc *crtc;
-+
-+	encoder = vc4_find_encoder_by_type(drm, type);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, encoder);
-+
-+	crtc = vc4_find_crtc_for_encoder(test, drm, encoder);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc);
-+
-+	new_crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
-+	if (!new_crtc_state)
-+		return NULL;
-+
-+	return to_vc4_crtc_state(new_crtc_state);
-+}
-+
-+static bool check_channel_for_encoder(struct kunit *test,
-+				      const struct drm_atomic_state *state,
-+				      enum vc4_encoder_type type,
-+				      bool (*check_fn)(enum vc4_encoder_type type, unsigned int channel))
-+{
-+	struct vc4_crtc_state *new_vc4_crtc_state;
-+	struct vc4_hvs_state *new_hvs_state;
-+	unsigned int channel;
-+
-+	new_hvs_state = vc4_hvs_get_new_global_state(state);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, new_hvs_state);
-+
-+	new_vc4_crtc_state = get_vc4_crtc_state_for_encoder(test, state, type);
-+	KUNIT_ASSERT_NOT_NULL(test, new_vc4_crtc_state);
-+
-+	channel = new_vc4_crtc_state->assigned_channel;
-+	KUNIT_EXPECT_NE(test, channel, VC4_HVS_CHANNEL_DISABLED);
-+
-+	KUNIT_EXPECT_TRUE(test, new_hvs_state->fifo_state[channel].in_use);
-+
-+	KUNIT_EXPECT_TRUE(test, check_fn(type, channel));
-+
-+	return true;
-+}
-+
-+struct pv_muxing_param {
-+	const char *name;
-+	struct vc4_dev *(*mock_fn)(struct kunit *test);
-+	bool (*check_fn)(enum vc4_encoder_type type, unsigned int channel);
-+	enum vc4_encoder_type *encoders;
-+	size_t nencoders;
-+};
-+
-+static void vc4_test_pv_muxing_desc(const struct pv_muxing_param *t, char *desc)
-+{
-+	strscpy(desc, t->name, KUNIT_PARAM_DESC_SIZE);
-+}
-+
-+#define PV_MUXING_TEST(_name, _mock_fn, _check_fn, ...)					\
-+	{										\
-+		.name = _name,								\
-+		.mock_fn = &_mock_fn,							\
-+		.check_fn = &_check_fn,							\
-+		.encoders = (enum vc4_encoder_type[]) { __VA_ARGS__ },			\
-+		.nencoders = sizeof((enum vc4_encoder_type[]) { __VA_ARGS__ }) /	\
-+			     sizeof(enum vc4_encoder_type),				\
-+	}
-+
-+#define VC4_PV_MUXING_TEST(_name, ...)		\
-+	PV_MUXING_TEST(_name, vc4_mock_device, check_vc4_encoder_constraints, __VA_ARGS__)
-+
-+#define VC5_PV_MUXING_TEST(_name, ...)		\
-+	PV_MUXING_TEST(_name, vc5_mock_device, check_vc5_encoder_constraints, __VA_ARGS__)
-+
-+static const struct pv_muxing_param vc4_test_pv_muxing_params[] = {
-+	VC4_PV_MUXING_TEST("1 output: DSI0",
-+			   VC4_ENCODER_TYPE_DSI0),
-+	VC4_PV_MUXING_TEST("1 output: DPI",
-+			   VC4_ENCODER_TYPE_DPI),
-+	VC4_PV_MUXING_TEST("1 output: HDMI0",
-+			   VC4_ENCODER_TYPE_HDMI0),
-+	VC4_PV_MUXING_TEST("1 output: VEC",
-+			   VC4_ENCODER_TYPE_VEC),
-+	VC4_PV_MUXING_TEST("1 output: DSI1",
-+			   VC4_ENCODER_TYPE_DSI1),
-+	VC4_PV_MUXING_TEST("1 output: TXP",
-+			   VC4_ENCODER_TYPE_TXP),
-+	VC4_PV_MUXING_TEST("2 outputs: DSI0, HDMI0",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_HDMI0),
-+	VC4_PV_MUXING_TEST("2 outputs: DSI0, VEC",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_VEC),
-+	VC4_PV_MUXING_TEST("2 outputs: DSI0, DSI1",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_DSI1),
-+	VC4_PV_MUXING_TEST("2 outputs: DSI0, TXP",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_TXP),
-+	VC4_PV_MUXING_TEST("2 outputs: DPI, HDMI0",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_HDMI0),
-+	VC4_PV_MUXING_TEST("2 outputs: DPI, VEC",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_VEC),
-+	VC4_PV_MUXING_TEST("2 outputs: DPI, DSI1",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_DSI1),
-+	VC4_PV_MUXING_TEST("2 outputs: DPI, TXP",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_TXP),
-+	VC4_PV_MUXING_TEST("2 outputs: HDMI0, DSI1",
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_DSI1),
-+	VC4_PV_MUXING_TEST("2 outputs: HDMI0, TXP",
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_TXP),
-+	VC4_PV_MUXING_TEST("2 outputs: VEC, DSI1",
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_DSI1),
-+	VC4_PV_MUXING_TEST("2 outputs: VEC, TXP",
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_TXP),
-+	VC4_PV_MUXING_TEST("3 outputs: DSI0, HDMI0, DSI1",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_DSI1),
-+	VC4_PV_MUXING_TEST("3 outputs: DSI0, HDMI0, TXP",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_TXP),
-+	VC4_PV_MUXING_TEST("3 outputs: DSI0, VEC, DSI1",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_DSI1),
-+	VC4_PV_MUXING_TEST("3 outputs: DSI0, VEC, TXP",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_TXP),
-+	VC4_PV_MUXING_TEST("3 outputs: DPI, HDMI0, DSI1",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_DSI1),
-+	VC4_PV_MUXING_TEST("3 outputs: DPI, HDMI0, TXP",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_TXP),
-+	VC4_PV_MUXING_TEST("3 outputs: DPI, VEC, DSI1",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_DSI1),
-+	VC4_PV_MUXING_TEST("3 outputs: DPI, VEC, TXP",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_TXP),
-+};
-+
-+KUNIT_ARRAY_PARAM(vc4_test_pv_muxing,
-+		  vc4_test_pv_muxing_params,
-+		  vc4_test_pv_muxing_desc);
-+
-+static const struct pv_muxing_param vc4_test_pv_muxing_invalid_params[] = {
-+	VC4_PV_MUXING_TEST("DPI/DSI0 Conflict",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_DSI0),
-+	VC4_PV_MUXING_TEST("TXP/DSI1 Conflict",
-+			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_DSI1),
-+	VC4_PV_MUXING_TEST("HDMI0/VEC Conflict",
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_VEC),
-+	VC4_PV_MUXING_TEST("More than 3 outputs: DSI0, HDMI0, DSI1, TXP",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_TXP),
-+	VC4_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, DSI1, TXP",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_TXP),
-+	VC4_PV_MUXING_TEST("More than 3 outputs: DPI, HDMI0, DSI1, TXP",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_TXP),
-+	VC4_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, DSI1, TXP",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_TXP),
-+};
-+
-+KUNIT_ARRAY_PARAM(vc4_test_pv_muxing_invalid,
-+		  vc4_test_pv_muxing_invalid_params,
-+		  vc4_test_pv_muxing_desc);
-+
-+static const struct pv_muxing_param vc5_test_pv_muxing_params[] = {
-+	VC5_PV_MUXING_TEST("1 output: DPI",
-+			   VC4_ENCODER_TYPE_DPI),
-+	VC5_PV_MUXING_TEST("1 output: DSI0",
-+			   VC4_ENCODER_TYPE_DSI0),
-+	VC5_PV_MUXING_TEST("1 output: DSI1",
-+			   VC4_ENCODER_TYPE_DSI1),
-+	VC5_PV_MUXING_TEST("1 output: HDMI0",
-+			   VC4_ENCODER_TYPE_HDMI0),
-+	VC5_PV_MUXING_TEST("1 output: HDMI1",
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("1 output: VEC",
-+			   VC4_ENCODER_TYPE_VEC),
-+	VC5_PV_MUXING_TEST("2 outputs: DPI, DSI1",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_DSI1),
-+	VC5_PV_MUXING_TEST("2 outputs: DPI, HDMI0",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_HDMI0),
-+	VC5_PV_MUXING_TEST("2 outputs: DPI, HDMI1",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("2 outputs: DPI, TXP",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_TXP),
-+	VC5_PV_MUXING_TEST("2 outputs: DPI, VEC",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_VEC),
-+	VC5_PV_MUXING_TEST("2 outputs: DPI, DSI1",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_DSI1),
-+	VC5_PV_MUXING_TEST("2 outputs: DSI0, DSI1",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_DSI1),
-+	VC5_PV_MUXING_TEST("2 outputs: DSI0, HDMI0",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_HDMI0),
-+	VC5_PV_MUXING_TEST("2 outputs: DSI0, HDMI1",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("2 outputs: DSI0, TXP",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_TXP),
-+	VC5_PV_MUXING_TEST("2 outputs: DSI0, VEC",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_VEC),
-+	VC5_PV_MUXING_TEST("2 outputs: DSI0, DSI1",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_DSI1),
-+	VC5_PV_MUXING_TEST("2 outputs: DSI1, VEC",
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_VEC),
-+	VC5_PV_MUXING_TEST("2 outputs: DSI1, TXP",
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_TXP),
-+	VC5_PV_MUXING_TEST("2 outputs: DSI1, HDMI0",
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_HDMI0),
-+	VC5_PV_MUXING_TEST("2 outputs: DSI1, HDMI1",
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("2 outputs: HDMI0, VEC",
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_VEC),
-+	VC5_PV_MUXING_TEST("2 outputs: HDMI0, TXP",
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_TXP),
-+	VC5_PV_MUXING_TEST("2 outputs: HDMI0, HDMI1",
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("2 outputs: HDMI1, VEC",
-+			   VC4_ENCODER_TYPE_HDMI1,
-+			   VC4_ENCODER_TYPE_VEC),
-+	VC5_PV_MUXING_TEST("2 outputs: HDMI1, TXP",
-+			   VC4_ENCODER_TYPE_HDMI1,
-+			   VC4_ENCODER_TYPE_TXP),
-+	VC5_PV_MUXING_TEST("2 outputs: TXP, VEC",
-+			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_VEC),
-+	VC5_PV_MUXING_TEST("3 outputs: DPI, VEC, TXP",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_TXP),
-+	VC5_PV_MUXING_TEST("3 outputs: DPI, VEC, DSI1",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_DSI1),
-+	VC5_PV_MUXING_TEST("3 outputs: DPI, VEC, HDMI0",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_HDMI0),
-+	VC5_PV_MUXING_TEST("3 outputs: DPI, VEC, HDMI1",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("3 outputs: DPI, TXP, DSI1",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_DSI1),
-+	VC5_PV_MUXING_TEST("3 outputs: DPI, TXP, HDMI0",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_HDMI0),
-+	VC5_PV_MUXING_TEST("3 outputs: DPI, TXP, HDMI1",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("3 outputs: DPI, DSI1, HDMI0",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_HDMI0),
-+	VC5_PV_MUXING_TEST("3 outputs: DPI, DSI1, HDMI1",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("3 outputs: DPI, HDMI0, HDMI1",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("3 outputs: DSI0, VEC, TXP",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_TXP),
-+	VC5_PV_MUXING_TEST("3 outputs: DSI0, VEC, DSI1",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_DSI1),
-+	VC5_PV_MUXING_TEST("3 outputs: DSI0, VEC, HDMI0",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_HDMI0),
-+	VC5_PV_MUXING_TEST("3 outputs: DSI0, VEC, HDMI1",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("3 outputs: DSI0, TXP, DSI1",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_DSI1),
-+	VC5_PV_MUXING_TEST("3 outputs: DSI0, TXP, HDMI0",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_HDMI0),
-+	VC5_PV_MUXING_TEST("3 outputs: DSI0, TXP, HDMI1",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("3 outputs: DSI0, DSI1, HDMI0",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_HDMI0),
-+	VC5_PV_MUXING_TEST("3 outputs: DSI0, DSI1, HDMI1",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("3 outputs: DSI0, HDMI0, HDMI1",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+};
-+
-+KUNIT_ARRAY_PARAM(vc5_test_pv_muxing,
-+		  vc5_test_pv_muxing_params,
-+		  vc4_test_pv_muxing_desc);
-+
-+static const struct pv_muxing_param vc5_test_pv_muxing_invalid_params[] = {
-+	VC5_PV_MUXING_TEST("DPI/DSI0 Conflict",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_DSI0),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, TXP, DSI1",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_DSI1),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, TXP, HDMI0",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_HDMI0),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, TXP, HDMI1",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, DSI1, HDMI0",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_HDMI0),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, DSI1, HDMI1",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, HDMI0, HDMI1",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: DPI, TXP, DSI1, HDMI0",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_HDMI0),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: DPI, TXP, DSI1, HDMI1",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: DPI, TXP, HDMI0, HDMI1",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: DPI, DSI1, HDMI0, HDMI1",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, TXP, DSI1, HDMI0",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_HDMI0),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, TXP, DSI1, HDMI1",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, TXP, HDMI0, HDMI1",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, DSI1, HDMI0, HDMI1",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: DPI, TXP, DSI1, HDMI0, HDMI1",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, TXP, DSI1",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_DSI1),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, TXP, HDMI0",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_HDMI0),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, TXP, HDMI1",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, DSI1, HDMI0",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_HDMI0),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, DSI1, HDMI1",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, HDMI0, HDMI1",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, TXP, DSI1, HDMI0",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_HDMI0),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, TXP, DSI1, HDMI1",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, TXP, HDMI0, HDMI1",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, DSI1, HDMI0, HDMI1",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, TXP, DSI1, HDMI0",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_HDMI0),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, TXP, DSI1, HDMI1",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, TXP, HDMI0, HDMI1",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, DSI1, HDMI0, HDMI1",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, TXP, DSI1, HDMI0, HDMI1",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: VEC, TXP, DSI1, HDMI0, HDMI1",
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, TXP, DSI1, HDMI0, HDMI1",
-+			   VC4_ENCODER_TYPE_DPI,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, TXP, DSI1, HDMI0, HDMI1",
-+			   VC4_ENCODER_TYPE_DSI0,
-+			   VC4_ENCODER_TYPE_VEC,
-+			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_DSI1,
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+};
-+
-+KUNIT_ARRAY_PARAM(vc5_test_pv_muxing_invalid,
-+		  vc5_test_pv_muxing_invalid_params,
-+		  vc4_test_pv_muxing_desc);
-+
-+static void drm_vc4_test_pv_muxing(struct kunit *test)
-+{
-+	const struct pv_muxing_param *params = test->param_value;
-+	const struct pv_muxing_priv *priv = test->priv;
-+	struct drm_atomic_state *state = priv->state;
-+	unsigned int i;
-+	int ret;
-+
-+	for (i = 0; i < params->nencoders; i++) {
-+		enum vc4_encoder_type enc_type = params->encoders[i];
-+
-+		ret = vc4_mock_atomic_add_output(test, state, enc_type);
-+		KUNIT_ASSERT_EQ(test, ret, 0);
-+	}
-+
-+	ret = drm_atomic_check_only(state);
-+	KUNIT_EXPECT_EQ(test, ret, 0);
-+
-+	KUNIT_EXPECT_TRUE(test,
-+			  check_fifo_conflict(test, state));
-+
-+	for (i = 0; i < params->nencoders; i++) {
-+		enum vc4_encoder_type enc_type = params->encoders[i];
-+
-+		KUNIT_EXPECT_TRUE(test, check_channel_for_encoder(test, state, enc_type,
-+								  params->check_fn));
-+	}
-+}
-+
-+static void drm_vc4_test_pv_muxing_invalid(struct kunit *test)
-+{
-+	const struct pv_muxing_param *params = test->param_value;
-+	const struct pv_muxing_priv *priv = test->priv;
-+	struct drm_atomic_state *state = priv->state;
-+	unsigned int i;
-+	int ret;
-+
-+	for (i = 0; i < params->nencoders; i++) {
-+		enum vc4_encoder_type enc_type = params->encoders[i];
-+
-+		ret = vc4_mock_atomic_add_output(test, state, enc_type);
-+		KUNIT_ASSERT_EQ(test, ret, 0);
-+	}
-+
-+	ret = drm_atomic_check_only(state);
-+	KUNIT_EXPECT_LT(test, ret, 0);
-+}
-+
-+static int vc4_pv_muxing_test_init(struct kunit *test)
-+{
-+	const struct pv_muxing_param *params = test->param_value;
-+	struct drm_atomic_state *state;
-+	struct pv_muxing_priv *priv;
-+	struct drm_device *drm;
-+	struct vc4_dev *vc4;
-+
-+	priv = kunit_kzalloc(test, sizeof(*priv), GFP_KERNEL);
-+	KUNIT_ASSERT_NOT_NULL(test, priv);
-+	test->priv = priv;
-+
-+	vc4 = params->mock_fn(test);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, vc4);
-+	priv->vc4 = vc4;
-+
-+	drm_modeset_acquire_init(&priv->ctx, 0);
-+
-+	drm = &vc4->base;
-+	state = drm_atomic_state_alloc(drm);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);
-+
-+	state->acquire_ctx = &priv->ctx;
-+
-+	priv->state = state;
-+
-+	return 0;
-+}
-+
-+static void vc4_pv_muxing_test_exit(struct kunit *test)
-+{
-+	struct pv_muxing_priv *priv = test->priv;
-+	struct vc4_dev *vc4 = priv->vc4;
-+	struct drm_device *drm = &vc4->base;
-+	struct drm_atomic_state *state = priv->state;
-+
-+	drm_atomic_state_put(state);
-+	drm_modeset_drop_locks(&priv->ctx);
-+	drm_modeset_acquire_fini(&priv->ctx);
-+	drm_dev_unregister(drm);
-+	drm_kunit_helper_free_device(test, vc4->dev);
-+}
-+
-+static struct kunit_case vc4_pv_muxing_tests[] = {
-+	KUNIT_CASE_PARAM(drm_vc4_test_pv_muxing,
-+			 vc4_test_pv_muxing_gen_params),
-+	KUNIT_CASE_PARAM(drm_vc4_test_pv_muxing_invalid,
-+			 vc4_test_pv_muxing_invalid_gen_params),
-+	{}
-+};
-+
-+static struct kunit_suite vc4_pv_muxing_test_suite = {
-+	.name = "vc4-pv-muxing-combinations",
-+	.init = vc4_pv_muxing_test_init,
-+	.exit = vc4_pv_muxing_test_exit,
-+	.test_cases = vc4_pv_muxing_tests,
-+};
-+
-+static struct kunit_case vc5_pv_muxing_tests[] = {
-+	KUNIT_CASE_PARAM(drm_vc4_test_pv_muxing,
-+			 vc5_test_pv_muxing_gen_params),
-+	KUNIT_CASE_PARAM(drm_vc4_test_pv_muxing_invalid,
-+			 vc5_test_pv_muxing_invalid_gen_params),
-+	{}
-+};
-+
-+static struct kunit_suite vc5_pv_muxing_test_suite = {
-+	.name = "vc5-pv-muxing-combinations",
-+	.init = vc4_pv_muxing_test_init,
-+	.exit = vc4_pv_muxing_test_exit,
-+	.test_cases = vc5_pv_muxing_tests,
-+};
-+
-+/* See
-+ * https://lore.kernel.org/all/3e113525-aa89-b1e2-56b7-ca55bd41d057@samsung.com/
-+ * and
-+ * https://lore.kernel.org/dri-devel/20200917121623.42023-1-maxime@cerno.tech/
-+ */
-+static void drm_test_vc5_pv_muxing_bugs_subsequent_crtc_enable(struct kunit *test)
-+{
-+	struct drm_modeset_acquire_ctx ctx;
-+	struct drm_atomic_state *state;
-+	struct vc4_crtc_state *new_vc4_crtc_state;
-+	struct vc4_hvs_state *new_hvs_state;
-+	unsigned int hdmi0_channel;
-+	unsigned int hdmi1_channel;
-+	struct drm_device *drm;
-+	struct vc4_dev *vc4;
-+	int ret;
-+
-+	vc4 = vc5_mock_device(test);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, vc4);
-+
-+	drm_modeset_acquire_init(&ctx, 0);
-+
-+	drm = &vc4->base;
-+	state = drm_atomic_state_alloc(drm);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);
-+
-+	state->acquire_ctx = &ctx;
-+
-+	ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI0);
-+	KUNIT_ASSERT_EQ(test, ret, 0);
-+
-+	ret = drm_atomic_check_only(state);
-+	KUNIT_ASSERT_EQ(test, ret, 0);
-+
-+	new_hvs_state = vc4_hvs_get_new_global_state(state);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, new_hvs_state);
-+
-+	new_vc4_crtc_state = get_vc4_crtc_state_for_encoder(test, state,
-+							    VC4_ENCODER_TYPE_HDMI0);
-+	KUNIT_ASSERT_NOT_NULL(test, new_vc4_crtc_state);
-+
-+	hdmi0_channel = new_vc4_crtc_state->assigned_channel;
-+	KUNIT_ASSERT_NE(test, hdmi0_channel, VC4_HVS_CHANNEL_DISABLED);
-+	KUNIT_ASSERT_TRUE(test, new_hvs_state->fifo_state[hdmi0_channel].in_use);
-+
-+	ret = drm_atomic_helper_swap_state(state, false);
-+	KUNIT_ASSERT_EQ(test, ret, 0);
-+
-+	drm_atomic_state_put(state);
-+
-+	state = drm_atomic_state_alloc(drm);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);
-+
-+	state->acquire_ctx = &ctx;
-+
-+	ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI1);
-+	KUNIT_ASSERT_EQ(test, ret, 0);
-+
-+	ret = drm_atomic_check_only(state);
-+	KUNIT_ASSERT_EQ(test, ret, 0);
-+
-+	new_hvs_state = vc4_hvs_get_new_global_state(state);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, new_hvs_state);
-+
-+	new_vc4_crtc_state = get_vc4_crtc_state_for_encoder(test, state,
-+							    VC4_ENCODER_TYPE_HDMI1);
-+	KUNIT_ASSERT_NOT_NULL(test, new_vc4_crtc_state);
-+
-+	hdmi1_channel = new_vc4_crtc_state->assigned_channel;
-+	KUNIT_ASSERT_NE(test, hdmi1_channel, VC4_HVS_CHANNEL_DISABLED);
-+	KUNIT_ASSERT_TRUE(test, new_hvs_state->fifo_state[hdmi1_channel].in_use);
-+
-+	KUNIT_EXPECT_NE(test, hdmi0_channel, hdmi1_channel);
-+
-+	drm_atomic_state_put(state);
-+	drm_modeset_drop_locks(&ctx);
-+	drm_modeset_acquire_fini(&ctx);
-+	drm_dev_unregister(drm);
-+	drm_kunit_helper_free_device(test, vc4->dev);
-+}
-+
-+static void drm_test_vc5_pv_muxing_bugs_stable_fifo(struct kunit *test)
-+{
-+	struct drm_modeset_acquire_ctx ctx;
-+	struct drm_atomic_state *state;
-+	struct vc4_crtc_state *new_vc4_crtc_state;
-+	struct vc4_hvs_state *new_hvs_state;
-+	unsigned int old_hdmi0_channel;
-+	unsigned int old_hdmi1_channel;
-+	struct drm_device *drm;
-+	struct vc4_dev *vc4;
-+	int ret;
-+
-+	vc4 = vc5_mock_device(test);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, vc4);
-+
-+	drm_modeset_acquire_init(&ctx, 0);
-+
-+	drm = &vc4->base;
-+	state = drm_atomic_state_alloc(drm);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);
-+
-+	state->acquire_ctx = &ctx;
-+
-+	ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI0);
-+	KUNIT_ASSERT_EQ(test, ret, 0);
-+
-+	ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI1);
-+	KUNIT_ASSERT_EQ(test, ret, 0);
-+
-+	ret = drm_atomic_check_only(state);
-+	KUNIT_ASSERT_EQ(test, ret, 0);
-+
-+	new_hvs_state = vc4_hvs_get_new_global_state(state);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, new_hvs_state);
-+
-+	new_vc4_crtc_state = get_vc4_crtc_state_for_encoder(test, state,
-+							    VC4_ENCODER_TYPE_HDMI0);
-+	KUNIT_ASSERT_NOT_NULL(test, new_vc4_crtc_state);
-+
-+	old_hdmi0_channel = new_vc4_crtc_state->assigned_channel;
-+	KUNIT_ASSERT_NE(test, old_hdmi0_channel, VC4_HVS_CHANNEL_DISABLED);
-+	KUNIT_ASSERT_TRUE(test, new_hvs_state->fifo_state[old_hdmi0_channel].in_use);
-+
-+	new_vc4_crtc_state = get_vc4_crtc_state_for_encoder(test, state,
-+							    VC4_ENCODER_TYPE_HDMI1);
-+	KUNIT_ASSERT_NOT_NULL(test, new_vc4_crtc_state);
-+
-+	old_hdmi1_channel = new_vc4_crtc_state->assigned_channel;
-+	KUNIT_ASSERT_NE(test, old_hdmi1_channel, VC4_HVS_CHANNEL_DISABLED);
-+	KUNIT_ASSERT_TRUE(test, new_hvs_state->fifo_state[old_hdmi1_channel].in_use);
-+
-+	ret = drm_atomic_helper_swap_state(state, false);
-+	KUNIT_ASSERT_EQ(test, ret, 0);
-+
-+	drm_atomic_state_put(state);
-+
-+	state = drm_atomic_state_alloc(drm);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);
-+
-+	state->acquire_ctx = &ctx;
-+
-+	ret = vc4_mock_atomic_del_output(test, state, VC4_ENCODER_TYPE_HDMI0);
-+	KUNIT_ASSERT_EQ(test, ret, 0);
-+
-+	ret = drm_atomic_check_only(state);
-+	KUNIT_ASSERT_EQ(test, ret, 0);
-+
-+	new_hvs_state = vc4_hvs_get_new_global_state(state);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, new_hvs_state);
-+
-+	new_vc4_crtc_state = get_vc4_crtc_state_for_encoder(test, state,
-+							    VC4_ENCODER_TYPE_HDMI1);
-+
-+	if (new_vc4_crtc_state) {
-+		unsigned int hdmi1_channel;
-+
-+		hdmi1_channel = new_vc4_crtc_state->assigned_channel;
-+		KUNIT_ASSERT_NE(test, hdmi1_channel, VC4_HVS_CHANNEL_DISABLED);
-+		KUNIT_ASSERT_TRUE(test, new_hvs_state->fifo_state[hdmi1_channel].in_use);
-+
-+		KUNIT_EXPECT_EQ(test, old_hdmi1_channel, hdmi1_channel);
-+	}
-+
-+	drm_atomic_state_put(state);
-+	drm_modeset_drop_locks(&ctx);
-+	drm_modeset_acquire_fini(&ctx);
-+	drm_dev_unregister(drm);
-+	drm_kunit_helper_free_device(test, vc4->dev);
-+}
-+
-+static void
-+drm_test_vc5_pv_muxing_bugs_subsequent_crtc_enable_too_many_crtc_state(struct kunit *test)
-+{
-+	struct drm_modeset_acquire_ctx ctx;
-+	struct drm_atomic_state *state;
-+	struct vc4_crtc_state *new_vc4_crtc_state;
-+	struct drm_device *drm;
-+	struct vc4_dev *vc4;
-+	int ret;
-+
-+	vc4 = vc5_mock_device(test);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, vc4);
-+
-+	drm_modeset_acquire_init(&ctx, 0);
-+
-+	drm = &vc4->base;
-+	state = drm_atomic_state_alloc(drm);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);
-+
-+	state->acquire_ctx = &ctx;
-+
-+	ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI0);
-+	KUNIT_ASSERT_EQ(test, ret, 0);
-+
-+	ret = drm_atomic_check_only(state);
-+	KUNIT_ASSERT_EQ(test, ret, 0);
-+
-+	ret = drm_atomic_helper_swap_state(state, false);
-+	KUNIT_ASSERT_EQ(test, ret, 0);
-+
-+	drm_atomic_state_put(state);
-+
-+	state = drm_atomic_state_alloc(drm);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);
-+
-+	state->acquire_ctx = &ctx;
-+
-+	ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI1);
-+	KUNIT_ASSERT_EQ(test, ret, 0);
-+
-+	ret = drm_atomic_check_only(state);
-+	KUNIT_ASSERT_EQ(test, ret, 0);
-+
-+	new_vc4_crtc_state = get_vc4_crtc_state_for_encoder(test, state,
-+							    VC4_ENCODER_TYPE_HDMI0);
-+	KUNIT_EXPECT_NULL(test, new_vc4_crtc_state);
-+
-+	drm_atomic_state_put(state);
-+	drm_modeset_drop_locks(&ctx);
-+	drm_modeset_acquire_fini(&ctx);
-+	drm_dev_unregister(drm);
-+	drm_kunit_helper_free_device(test, vc4->dev);
-+}
-+
-+static struct kunit_case vc5_pv_muxing_bugs_tests[] = {
-+	KUNIT_CASE(drm_test_vc5_pv_muxing_bugs_subsequent_crtc_enable),
-+	KUNIT_CASE(drm_test_vc5_pv_muxing_bugs_subsequent_crtc_enable_too_many_crtc_state),
-+	KUNIT_CASE(drm_test_vc5_pv_muxing_bugs_stable_fifo),
-+	{}
-+};
-+
-+static struct kunit_suite vc5_pv_muxing_bugs_test_suite = {
-+	.name = "vc5-pv-muxing-bugs",
-+	.test_cases = vc5_pv_muxing_bugs_tests,
-+};
-+
-+kunit_test_suites(
-+	&vc4_pv_muxing_test_suite,
-+	&vc5_pv_muxing_test_suite,
-+	&vc5_pv_muxing_bugs_test_suite
-+);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0505-Documentation-gpu-vc4-Add-KUnit-Tests-Section.patch b/target/linux/bcm27xx/patches-6.1/950-0505-Documentation-gpu-vc4-Add-KUnit-Tests-Section.patch
deleted file mode 100644
index 633691570f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0505-Documentation-gpu-vc4-Add-KUnit-Tests-Section.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 2765d84553542d356236a0e4f79ca320fba5aa73 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Thu, 1 Dec 2022 11:08:24 +0100
-Subject: [PATCH] Documentation: gpu: vc4: Add KUnit Tests Section
-
-Now that we have VC4-specific tests in place, let's document them
-properly.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- Documentation/gpu/vc4.rst | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
---- a/Documentation/gpu/vc4.rst
-+++ b/Documentation/gpu/vc4.rst
-@@ -54,6 +54,22 @@ VEC (Composite TV out) encoder
- .. kernel-doc:: drivers/gpu/drm/vc4/vc4_vec.c
-    :doc: VC4 SDTV module
- 
-+KUnit Tests
-+===========
-+
-+The VC4 Driver uses KUnit to perform driver-specific unit and
-+integration tests.
-+
-+These tests are using a mock driver and can be ran using the
-+command::
-+	./tools/testing/kunit/kunit.py run \
-+		--kunitconfig=drivers/gpu/drm/vc4/tests/.kunitconfig \
-+		--cross_compile aarch64-linux-gnu- --arch arm64
-+
-+Parts of the driver that are currently covered by tests are:
-+ * The HVS to PixelValve dynamic FIFO assignment, for the BCM2835-7
-+   and BCM2711.
-+
- Memory Management and 3D Command Submission
- ===========================================
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0510-drm-panel-panel-ilitek9881c-Use-cansleep-methods.patch b/target/linux/bcm27xx/patches-6.1/950-0510-drm-panel-panel-ilitek9881c-Use-cansleep-methods.patch
deleted file mode 100644
index c95f4c0323..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0510-drm-panel-panel-ilitek9881c-Use-cansleep-methods.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From b969ef21e3522c6829aafaa1fecd33fa653596e4 Mon Sep 17 00:00:00 2001
-From: Mark Williams <mwp@mwp.id.au>
-Date: Wed, 7 Dec 2022 18:20:40 -0700
-Subject: [PATCH] drm/panel: panel-ilitek9881c: Use cansleep methods
-
-Use cansleep version of gpiod_set_value so external IO drivers (like
-via I2C) can be used.
-
-Signed-off-by: Mark Williams <mwp@mwp.id.au>
----
- drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
-+++ b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
-@@ -940,10 +940,10 @@ static int ili9881c_prepare(struct drm_p
- 	msleep(5);
- 
- 	/* And reset it */
--	gpiod_set_value(ctx->reset, 1);
-+	gpiod_set_value_cansleep(ctx->reset, 1);
- 	msleep(20);
- 
--	gpiod_set_value(ctx->reset, 0);
-+	gpiod_set_value_cansleep(ctx->reset, 0);
- 	msleep(20);
- 
- 	for (i = 0; i < ctx->desc->init_length; i++) {
-@@ -998,7 +998,7 @@ static int ili9881c_unprepare(struct drm
- 
- 	mipi_dsi_dcs_enter_sleep_mode(ctx->dsi);
- 	regulator_disable(ctx->power);
--	gpiod_set_value(ctx->reset, 1);
-+	gpiod_set_value_cansleep(ctx->reset, 1);
- 
- 	return 0;
- }
diff --git a/target/linux/bcm27xx/patches-6.1/950-0511-drm-panel-panel-ilitek9881c-Crystalfontz-support.patch b/target/linux/bcm27xx/patches-6.1/950-0511-drm-panel-panel-ilitek9881c-Crystalfontz-support.patch
deleted file mode 100644
index 10b8c5122e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0511-drm-panel-panel-ilitek9881c-Crystalfontz-support.patch
+++ /dev/null
@@ -1,276 +0,0 @@
-From 87125150ecb1a21daff9a95165d4357f80d68ec6 Mon Sep 17 00:00:00 2001
-From: Mark Williams <mwp@mwp.id.au>
-Date: Wed, 7 Dec 2022 19:55:15 -0700
-Subject: [PATCH] drm/panel: panel-ilitek9881c: Crystalfontz support
-
-Add support for Crystalfontz CFAF7201280A0-050Tx panel.
-
-Signed-off-by: Mark Williams <mwp@mwp.id.au>
----
- drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 229 ++++++++++++++++++
- 1 file changed, 229 insertions(+)
-
---- a/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
-+++ b/drivers/gpu/drm/panel/panel-ilitek-ili9881c.c
-@@ -3,6 +3,7 @@
-  * Copyright (C) 2017-2018, Bootlin
-  * Copyright (C) 2021, Henson Li <henson@cutiepi.io>
-  * Copyright (C) 2021, Penk Chen <penk@cutiepi.io>
-+ * Copyright (C) 2022, Mark Williams <mark@crystalfontz.com>
-  */
- 
- #include <linux/delay.h>
-@@ -887,6 +888,212 @@ static const struct ili9881c_instr w5529
- 	ILI9881C_SWITCH_PAGE_INSTR(0),
- };
- 
-+static const struct ili9881c_instr cfaf7201280a0_050tx_init[] = {
-+	//ILI9881C PAGE3
-+	ILI9881C_SWITCH_PAGE_INSTR(3),
-+	//GIP_1
-+	ILI9881C_COMMAND_INSTR(0x01, 0x00), //added
-+	ILI9881C_COMMAND_INSTR(0x02, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x03, 0x73),
-+	ILI9881C_COMMAND_INSTR(0x04, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x05, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x06, 0x0A),
-+	ILI9881C_COMMAND_INSTR(0x07, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x08, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x09, 0x01),
-+	ILI9881C_COMMAND_INSTR(0x0A, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x0B, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x0C, 0x01),
-+	ILI9881C_COMMAND_INSTR(0x0D, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x0E, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x0F, 0x1D),
-+	ILI9881C_COMMAND_INSTR(0x10, 0x1D),
-+	ILI9881C_COMMAND_INSTR(0x11, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x12, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x13, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x14, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x15, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x16, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x17, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x18, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x19, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x1A, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x1B, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x1C, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x1D, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x1E, 0x40),
-+	ILI9881C_COMMAND_INSTR(0x1F, 0x80),
-+	ILI9881C_COMMAND_INSTR(0x20, 0x06),
-+	ILI9881C_COMMAND_INSTR(0x21, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x22, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x23, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x24, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x25, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x26, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x27, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x28, 0x33),
-+	ILI9881C_COMMAND_INSTR(0x29, 0x03),
-+	ILI9881C_COMMAND_INSTR(0x2A, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x2B, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x2C, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x2D, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x2E, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x2F, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x30, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x31, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x32, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x33, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x34, 0x04),
-+	ILI9881C_COMMAND_INSTR(0x35, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x36, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x37, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x38, 0x3C),
-+	ILI9881C_COMMAND_INSTR(0x39, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x3A, 0x40),
-+	ILI9881C_COMMAND_INSTR(0x3B, 0x40),
-+	ILI9881C_COMMAND_INSTR(0x3C, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x3D, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x3E, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x3F, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x40, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x41, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x42, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x43, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x44, 0x00),
-+	//GIP_2
-+	ILI9881C_COMMAND_INSTR(0x50, 0x01),
-+	ILI9881C_COMMAND_INSTR(0x51, 0x23),
-+	ILI9881C_COMMAND_INSTR(0x52, 0x45),
-+	ILI9881C_COMMAND_INSTR(0x53, 0x67),
-+	ILI9881C_COMMAND_INSTR(0x54, 0x89),
-+	ILI9881C_COMMAND_INSTR(0x55, 0xAB),
-+	ILI9881C_COMMAND_INSTR(0x56, 0x01),
-+	ILI9881C_COMMAND_INSTR(0x57, 0x23),
-+	ILI9881C_COMMAND_INSTR(0x58, 0x45),
-+	ILI9881C_COMMAND_INSTR(0x59, 0x67),
-+	ILI9881C_COMMAND_INSTR(0x5A, 0x89),
-+	ILI9881C_COMMAND_INSTR(0x5B, 0xAB),
-+	ILI9881C_COMMAND_INSTR(0x5C, 0xCD),
-+	ILI9881C_COMMAND_INSTR(0x5D, 0xEF),
-+	//GIP_3
-+	ILI9881C_COMMAND_INSTR(0x5E, 0x11),
-+	ILI9881C_COMMAND_INSTR(0x5F, 0x01),
-+	ILI9881C_COMMAND_INSTR(0x60, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x61, 0x15),
-+	ILI9881C_COMMAND_INSTR(0x62, 0x14),
-+	ILI9881C_COMMAND_INSTR(0x63, 0x0E),
-+	ILI9881C_COMMAND_INSTR(0x64, 0x0F),
-+	ILI9881C_COMMAND_INSTR(0x65, 0x0C),
-+	ILI9881C_COMMAND_INSTR(0x66, 0x0D),
-+	ILI9881C_COMMAND_INSTR(0x67, 0x06),
-+	ILI9881C_COMMAND_INSTR(0x68, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x69, 0x07),
-+	ILI9881C_COMMAND_INSTR(0x6A, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x6B, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x6C, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x6D, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x6E, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x6F, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x70, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x71, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x72, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x73, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x74, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x75, 0x01),
-+	ILI9881C_COMMAND_INSTR(0x76, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x77, 0x14),
-+	ILI9881C_COMMAND_INSTR(0x78, 0x15),
-+	ILI9881C_COMMAND_INSTR(0x79, 0x0E),
-+	ILI9881C_COMMAND_INSTR(0x7A, 0x0F),
-+	ILI9881C_COMMAND_INSTR(0x7B, 0x0C),
-+	ILI9881C_COMMAND_INSTR(0x7C, 0x0D),
-+	ILI9881C_COMMAND_INSTR(0x7D, 0x06),
-+	ILI9881C_COMMAND_INSTR(0x7E, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x7F, 0x07),
-+	ILI9881C_COMMAND_INSTR(0x80, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x81, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x82, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x83, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x84, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x85, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x86, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x87, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x88, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x89, 0x02),
-+	ILI9881C_COMMAND_INSTR(0x8A, 0x02),
-+	//ILI9881C PAGE4
-+	ILI9881C_SWITCH_PAGE_INSTR(4),
-+	ILI9881C_COMMAND_INSTR(0x6C, 0x15),
-+	ILI9881C_COMMAND_INSTR(0x6E, 0x2B),
-+	// VGH & VGL OUTPUT
-+	ILI9881C_COMMAND_INSTR(0x6F, 0x33),
-+	ILI9881C_COMMAND_INSTR(0x8D, 0x18),
-+	ILI9881C_COMMAND_INSTR(0x87, 0xBA),
-+	ILI9881C_COMMAND_INSTR(0x26, 0x76),
-+	//Reload Gamma setting
-+	ILI9881C_COMMAND_INSTR(0xB2, 0xD1),
-+	ILI9881C_COMMAND_INSTR(0xB5, 0x06),
-+	ILI9881C_COMMAND_INSTR(0x3A, 0x24),
-+	ILI9881C_COMMAND_INSTR(0x35, 0x1F),
-+
-+	//ILI9881C PAGE1
-+	ILI9881C_SWITCH_PAGE_INSTR(1),
-+	ILI9881C_COMMAND_INSTR(0x22, 0x09),
-+	//Column inversion
-+	ILI9881C_COMMAND_INSTR(0x31, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x40, 0x33),
-+	ILI9881C_COMMAND_INSTR(0x53, 0xA2),
-+	ILI9881C_COMMAND_INSTR(0x55, 0x92),
-+	ILI9881C_COMMAND_INSTR(0x50, 0x96),
-+	ILI9881C_COMMAND_INSTR(0x51, 0x96),
-+	ILI9881C_COMMAND_INSTR(0x60, 0x22),
-+	ILI9881C_COMMAND_INSTR(0x61, 0x00),
-+	ILI9881C_COMMAND_INSTR(0x62, 0x19),
-+	ILI9881C_COMMAND_INSTR(0x63, 0x00),
-+	//---P-GAMMA START---
-+	ILI9881C_COMMAND_INSTR(0xA0, 0x08),
-+	ILI9881C_COMMAND_INSTR(0xA1, 0x11),
-+	ILI9881C_COMMAND_INSTR(0xA2, 0x19),
-+	ILI9881C_COMMAND_INSTR(0xA3, 0x0D),
-+	ILI9881C_COMMAND_INSTR(0xA4, 0x0D),
-+	ILI9881C_COMMAND_INSTR(0xA5, 0x1E),
-+	ILI9881C_COMMAND_INSTR(0xA6, 0x14),
-+	ILI9881C_COMMAND_INSTR(0xA7, 0x17),
-+	ILI9881C_COMMAND_INSTR(0xA8, 0x4F),
-+	ILI9881C_COMMAND_INSTR(0xA9, 0x1A),
-+	ILI9881C_COMMAND_INSTR(0xAA, 0x27),
-+	ILI9881C_COMMAND_INSTR(0xAB, 0x49),
-+	ILI9881C_COMMAND_INSTR(0xAC, 0x1A),
-+	ILI9881C_COMMAND_INSTR(0xAD, 0x18),
-+	ILI9881C_COMMAND_INSTR(0xAE, 0x4C),
-+	ILI9881C_COMMAND_INSTR(0xAF, 0x22),
-+	ILI9881C_COMMAND_INSTR(0xB0, 0x27),
-+	ILI9881C_COMMAND_INSTR(0xB1, 0x4B),
-+	ILI9881C_COMMAND_INSTR(0xB2, 0x60),
-+	ILI9881C_COMMAND_INSTR(0xB3, 0x39),
-+	//--- N-GAMMA START---
-+	ILI9881C_COMMAND_INSTR(0xC0, 0x08),
-+	ILI9881C_COMMAND_INSTR(0xC1, 0x11),
-+	ILI9881C_COMMAND_INSTR(0xC2, 0x19),
-+	ILI9881C_COMMAND_INSTR(0xC3, 0x0D),
-+	ILI9881C_COMMAND_INSTR(0xC4, 0x0D),
-+	ILI9881C_COMMAND_INSTR(0xC5, 0x1E),
-+	ILI9881C_COMMAND_INSTR(0xC6, 0x14),
-+	ILI9881C_COMMAND_INSTR(0xC7, 0x17),
-+	ILI9881C_COMMAND_INSTR(0xC8, 0x4F),
-+	ILI9881C_COMMAND_INSTR(0xC9, 0x1A),
-+	ILI9881C_COMMAND_INSTR(0xCA, 0x27),
-+	ILI9881C_COMMAND_INSTR(0xCB, 0x49),
-+	ILI9881C_COMMAND_INSTR(0xCC, 0x1A),
-+	ILI9881C_COMMAND_INSTR(0xCD, 0x18),
-+	ILI9881C_COMMAND_INSTR(0xCE, 0x4C),
-+	ILI9881C_COMMAND_INSTR(0xCF, 0x33),
-+	ILI9881C_COMMAND_INSTR(0xD0, 0x27),
-+	ILI9881C_COMMAND_INSTR(0xD1, 0x4B),
-+	ILI9881C_COMMAND_INSTR(0xD2, 0x60),
-+	ILI9881C_COMMAND_INSTR(0xD3, 0x39),
-+};
-+
- static inline struct ili9881c *panel_to_ili9881c(struct drm_panel *panel)
- {
- 	return container_of(panel, struct ili9881c, panel);
-@@ -1071,6 +1278,20 @@ static const struct drm_display_mode w55
- 	.height_mm	= 121,
- };
- 
-+static const struct drm_display_mode cfaf7201280a0_050tx_default_mode = {
-+	.clock		= 72830,
-+	.hdisplay	= 720,
-+	.hsync_start	= 720 + 87,
-+	.hsync_end	= 720 + 87 + 20,
-+	.htotal		= 720 + 87 + 20 + 87,
-+	.vdisplay	= 1280,
-+	.vsync_start	= 1280 + 16,
-+	.vsync_end	= 1280 + 16 + 8,
-+	.vtotal		= 1280 + 16 + 8 + 16,
-+	.width_mm	= 62,
-+	.height_mm	= 1108
-+};
-+
- static int ili9881c_get_modes(struct drm_panel *panel,
- 			      struct drm_connector *connector)
- {
-@@ -1206,11 +1427,19 @@ static const struct ili9881c_desc w55294
- 		      MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_NO_EOT_PACKET,
- };
- 
-+static const struct ili9881c_desc cfaf7201280a0_050tx_desc = {
-+	.init = cfaf7201280a0_050tx_init,
-+	.init_length = ARRAY_SIZE(cfaf7201280a0_050tx_init),
-+	.mode = &cfaf7201280a0_050tx_default_mode,
-+	.mode_flags = MIPI_DSI_MODE_VIDEO_SYNC_PULSE | MIPI_DSI_MODE_VIDEO,
-+};
-+
- static const struct of_device_id ili9881c_of_match[] = {
- 	{ .compatible = "bananapi,lhr050h41", .data = &lhr050h41_desc },
- 	{ .compatible = "feixin,k101-im2byl02", .data = &k101_im2byl02_desc },
- 	{ .compatible = "nwe,nwe080", .data = &nwe080_desc },
- 	{ .compatible = "wanchanglong,w552946aba", .data = &w552946aba_desc },
-+	{ .compatible = "crystalfontz,cfaf7201280a0_050tx", .data = &cfaf7201280a0_050tx_desc },
- 	{ }
- };
- MODULE_DEVICE_TABLE(of, ili9881c_of_match);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0512-overlays-Add-crystalfontz-cfa050_pi_m.patch b/target/linux/bcm27xx/patches-6.1/950-0512-overlays-Add-crystalfontz-cfa050_pi_m.patch
deleted file mode 100644
index 94109e2669..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0512-overlays-Add-crystalfontz-cfa050_pi_m.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-From 86356a59b7688f8080aab516f1723f2ffbf15090 Mon Sep 17 00:00:00 2001
-From: Mark Williams <mwp@mwp.id.au>
-Date: Thu, 8 Dec 2022 04:58:05 -0700
-Subject: [PATCH] overlays: Add crystalfontz-cfa050_pi_m
-
-Add support for the Crystalfontz CFA050-PI-M series of Raspberry Pi
-CM4-based modules using the CFAF7201280A0_050Tx TFT LCD displays.
-
-Signed-off-by: Mark Williams <mwp@mwp.id.au>
----
- arch/arm/boot/dts/overlays/Makefile           |   1 +
- arch/arm/boot/dts/overlays/README             |   9 ++
- .../crystalfontz-cfa050_pi_m-overlay.dts      | 124 ++++++++++++++++++
- 3 files changed, 134 insertions(+)
- create mode 100644 arch/arm/boot/dts/overlays/crystalfontz-cfa050_pi_m-overlay.dts
-
---- a/arch/arm/boot/dts/overlays/Makefile
-+++ b/arch/arm/boot/dts/overlays/Makefile
-@@ -40,6 +40,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
- 	chipdip-dac.dtbo \
- 	cirrus-wm5102.dtbo \
- 	cma.dtbo \
-+	crystalfontz-cfa050_pi_m.dtbo \
- 	cutiepi-panel.dtbo \
- 	dacberry400.dtbo \
- 	dht11.dtbo \
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -804,6 +804,15 @@ Params: cma-512                 CMA is 5
-         cma-default             Use upstream's default value
- 
- 
-+Name:   crystalfontz-cfa050_pi_m
-+Info:   Configures the Crystalfontz CFA050-PI-M series of Raspberry Pi CM4
-+        based modules using the CFA7201280A0_050Tx 7" TFT LCD displays,
-+        with or without capacitive touch screen.
-+        Requires use of vc4-kms-v3d.
-+Load:   dtoverlay=crystalfontz-cfa050_pi_m,<param>=<val>
-+Params: captouch                Enable capacitive touch display
-+
-+
- Name:   cutiepi-panel
- Info:   8" TFT LCD display and touch panel used by cutiepi.io
- Load:   dtoverlay=cutiepi-panel
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/crystalfontz-cfa050_pi_m-overlay.dts
-@@ -0,0 +1,124 @@
-+/*
-+ * crystalfontz-cfa050_pi_m-overlay.dts
-+ * Configures the Crystalfontz CFA050-PI-M series of modules
-+ * using CFAF7201280A0-050TC/TN panels with RaspberryPi CM4 DSI1
-+ */
-+/dts-v1/;
-+/plugin/;
-+/{
-+// RaspberryPi CM4
-+	compatible = "brcm,bcm2835";
-+// PCF8574 I2C GPIO EXPANDER
-+	fragment@0 {
-+		target = <&i2c_csi_dsi>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+			pcf8574a: pcf8574a@38 {
-+				reg = <0x38>;
-+				compatible = "nxp,pcf8574";
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				ngpios = <8>;
-+				gpio-line-names = "TFT_RESET", "TOUCH_RESET", "EXT_P2", "EXT_P3",
-+					"EXT_P4", "EXT_P5", "EXT_P6", "EXT_P7";
-+			};
-+		};
-+	};
-+// LM3630a BACKLIGHT LED CONTROLLER
-+	fragment@1 {
-+		target = <&i2c_csi_dsi>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+			lm3630a: backlight@36 {
-+				reg = <0x36>;
-+				compatible = "ti,lm3630a";
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				led@0 {
-+					reg = <0>;
-+					led-sources = <0 1>;
-+					label = "lcd-backlight";
-+					default-brightness = <128>;
-+					max-brightness = <255>;
-+				};
-+			};
-+		};
-+	};
-+// CFAF7201280A0_050Tx TFT DSI PANEL
-+	fragment@2 {
-+		target = <&dsi1>;
-+		__overlay__  {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+			port {
-+				dsi_out: endpoint {
-+					remote-endpoint = <&panel_in>;
-+				};
-+			};
-+			dsi_panel: dsi_panel@0 {
-+				compatible = "crystalfontz,cfaf7201280a0_050tx";
-+				reg = <0>;
-+				reset-gpios = <&pcf8574a 0 1>;
-+				backlight = <&lm3630a>;
-+				fps = <60>;
-+				port {
-+					panel_in: endpoint {
-+						remote-endpoint = <&dsi_out>;
-+					};
-+				};
-+			};
-+		};
-+	};
-+// rPI GPIO INPUT FOR TOUCH IC IRQ
-+	fragment@3 {
-+		target = <&gpio>;
-+		__dormant__ {
-+			gt928intpins: gt928intpins {
-+				brcm,pins = <26>;
-+				brcm,function = <0>;
-+				brcm,pull = <1>;
-+			};
-+		};
-+	};
-+// GT928 TOUCH CONTROLLER IC
-+	fragment@4 {
-+		target = <&i2c_csi_dsi>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+			gt928@5d {
-+				compatible = "goodix,gt928";
-+				reg = <0x5d>;
-+				interrupt-parent = <&gpio>;
-+				interrupts = <26 2>;
-+				irq-gpios = <&gpio 26 0>;
-+				reset-gpios = <&pcf8574a 1 1>;
-+				touchscreen-inverted-x;
-+				touchscreen-inverted-y;
-+			};
-+		};
-+	};
-+// PCF85063A RTC on I2C
-+	fragment@5 {
-+		target = <&i2c_csi_dsi>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+			pcf85063a@51 {
-+				compatible = "nxp,pcf85063a";
-+				reg = <0x51>;
-+			};
-+		};
-+	};
-+// CAPACITIVE TOUCH OPTION FOR TFT PANEL
-+	__overrides__ {
-+		captouch = <0>,"+3+4";
-+	};
-+};
diff --git a/target/linux/bcm27xx/patches-6.1/950-0513-net-bcmgenet-Add-eee-module-parameter.patch b/target/linux/bcm27xx/patches-6.1/950-0513-net-bcmgenet-Add-eee-module-parameter.patch
deleted file mode 100644
index 1d035c105c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0513-net-bcmgenet-Add-eee-module-parameter.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From d69cdb1cc4e3f717f63910cb2c40ca26f912ea34 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 14 Dec 2022 15:00:51 +0000
-Subject: [PATCH] net: bcmgenet: Add 'eee' module parameter
-
-On some switches, having EEE enabled causes the link to become
-unstable. With this patch, adding 'genet.eee=N' to the kernel command
-line will cause EEE to be disabled on the link.
-
-See: https://github.com/raspberrypi/linux/issues/4289
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
---- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
-+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
-@@ -70,6 +70,9 @@ static void bcmgenet_set_rx_mode(struct
- static bool skip_umac_reset = false;
- module_param(skip_umac_reset, bool, 0444);
- MODULE_PARM_DESC(skip_umac_reset, "Skip UMAC reset step");
-+static bool eee = true;
-+module_param(eee, bool, 0444);
-+MODULE_PARM_DESC(eee, "Enable EEE (default Y)");
- 
- static inline void bcmgenet_writel(u32 value, void __iomem *offset)
- {
-@@ -3448,6 +3451,17 @@ static int bcmgenet_open(struct net_devi
- 
- 	bcmgenet_phy_pause_set(dev, priv->rx_pause, priv->tx_pause);
- 
-+	if (!eee) {
-+		struct ethtool_eee eee_data;
-+
-+		ret = bcmgenet_get_eee(dev, &eee_data);
-+		if (ret == 0) {
-+			eee_data.eee_enabled = 0;
-+			bcmgenet_set_eee(dev, &eee_data);
-+			netdev_warn(dev, "EEE disabled\n");
-+		}
-+	}
-+
- 	bcmgenet_netif_start(dev);
- 
- 	netif_tx_start_all_queues(dev);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0514-dts-bcm2711-Add-eee-dtparam.patch b/target/linux/bcm27xx/patches-6.1/950-0514-dts-bcm2711-Add-eee-dtparam.patch
deleted file mode 100644
index 37566eedd6..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0514-dts-bcm2711-Add-eee-dtparam.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From efba9faf0c1bbf937989e03a75b9cf1d7ed59677 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 14 Dec 2022 15:28:16 +0000
-Subject: [PATCH] dts: bcm2711: Add 'eee' dtparam
-
-The 'eee' dtparam allows EEE to be disabled on the onboard Ethernet
-controller. Adding 'dtparam=eee=off' to config.txt causes
-'genet.eee=N' to be added to the kernel command line, which in turn
-tells the Genet driver to disable EEE.
-
-See: https://github.com/raspberrypi/linux/issues/4289
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2711-rpi-ds.dtsi | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
-+++ b/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
-@@ -2,8 +2,12 @@
- #include "bcm270x-rpi.dtsi"
- 
- / {
-+	chosen: chosen {
-+	};
-+
- 	__overrides__ {
- 		arm_freq;
-+		eee = <&chosen>,"bootargs{on='',off='genet.eee=N'}";
- 		hdmi = <&hdmi0>,"status",
- 		       <&hdmi1>,"status";
- 		pcie = <&pcie0>,"status";
diff --git a/target/linux/bcm27xx/patches-6.1/950-0515-dtoverlays-Add-overlay-cm-swap-i2c0-to-swap-buses-on.patch b/target/linux/bcm27xx/patches-6.1/950-0515-dtoverlays-Add-overlay-cm-swap-i2c0-to-swap-buses-on.patch
deleted file mode 100644
index 5c37d93698..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0515-dtoverlays-Add-overlay-cm-swap-i2c0-to-swap-buses-on.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 16188a175bccc8fc6809b2751ba853defdff9197 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 15 Dec 2022 15:57:18 +0000
-Subject: [PATCH] dtoverlays: Add overlay cm-swap-i2c0 to swap buses on
- i2c0mux
-
-The legacy camera stack wiring instructions connect the cameras
-to the opposite sets of GPIOs compared to the arrangement
-more normally used with libcamera on all other platforms.
-
-Add an overlay to allow easy swapping of the assignments so
-that the legacy wiring can be used with libcamera.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/Makefile           |  1 +
- arch/arm/boot/dts/overlays/README             | 16 +++++++++++
- .../dts/overlays/cm-swap-i2c0-overlay.dts     | 27 +++++++++++++++++++
- 3 files changed, 44 insertions(+)
- create mode 100644 arch/arm/boot/dts/overlays/cm-swap-i2c0-overlay.dts
-
---- a/arch/arm/boot/dts/overlays/Makefile
-+++ b/arch/arm/boot/dts/overlays/Makefile
-@@ -39,6 +39,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
- 	cap1106.dtbo \
- 	chipdip-dac.dtbo \
- 	cirrus-wm5102.dtbo \
-+	cm-swap-i2c0.dtbo \
- 	cma.dtbo \
- 	crystalfontz-cfa050_pi_m.dtbo \
- 	cutiepi-panel.dtbo \
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -787,6 +787,22 @@ Load:   dtoverlay=cirrus-wm5102
- Params: <None>
- 
- 
-+Name:   cm-swap-i2c0
-+Info:   Largely for Compute Modules 1&3 where the original instructions for
-+        adding a camera used GPIOs 0&1 for CAM1 and 28&29 for CAM0, whilst all
-+        other platforms use 28&29 (or 44&45) for CAM1.
-+        The default assignment through using this overlay is for
-+        i2c0 to use 28&29, and i2c10 (aka i2c_csi_dsi) to use 28&29, but the
-+        overrides allow this to be changed.
-+Load:   dtoverlay=cm-swap-i2c0,<param>=<val>
-+Params: i2c0-gpio0              Use GPIOs 0&1 for i2c0
-+        i2c0-gpio28             Use GPIOs 28&29 for i2c0 (default)
-+        i2c0-gpio44             Use GPIOs 44&45 for i2c0
-+        i2c10-gpio0             Use GPIOs 0&1 for i2c0 (default)
-+        i2c10-gpio28            Use GPIOs 28&29 for i2c0
-+        i2c10-gpio44            Use GPIOs 44&45 for i2c0
-+
-+
- Name:   cma
- Info:   Set custom CMA sizes, only use if you know what you are doing, might
-         clash with other overlays like vc4-fkms-v3d and vc4-kms-v3d.
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/cm-swap-i2c0-overlay.dts
-@@ -0,0 +1,27 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+// Definitions for IMX708 camera module on VC I2C bus
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2c0mux>;
-+		i2c0mux_frag: __overlay__ {
-+			pinctrl-0 = <&i2c0_gpio28>;
-+			pinctrl-1 = <&i2c0_gpio0>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		i2c0-gpio0 = <&i2c0mux_frag>, "pinctrl-0:0=",<&i2c0_gpio0>;
-+		i2c0-gpio28 = <&i2c0mux_frag>, "pinctrl-0:0=",<&i2c0_gpio28>;
-+		i2c0-gpio44 = <&i2c0mux_frag>, "pinctrl-0:0=",<&i2c0_gpio44>;
-+		i2c10-gpio0 = <&i2c0mux_frag>, "pinctrl-1:0=",<&i2c0_gpio0>;
-+		i2c10-gpio28 = <&i2c0mux_frag>, "pinctrl-1:0=",<&i2c0_gpio28>;
-+		i2c10-gpio44 = <&i2c0mux_frag>, "pinctrl-1:0=",<&i2c0_gpio44>;
-+	};
-+};
diff --git a/target/linux/bcm27xx/patches-6.1/950-0516-dt-Correct-cam_reg-GPIO-assignments-for-CM1-3.patch b/target/linux/bcm27xx/patches-6.1/950-0516-dt-Correct-cam_reg-GPIO-assignments-for-CM1-3.patch
deleted file mode 100644
index 57c8dc10f1..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0516-dt-Correct-cam_reg-GPIO-assignments-for-CM1-3.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 531f8723c990ecb8727ae40716db3069d954acd7 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 15 Dec 2022 15:59:28 +0000
-Subject: [PATCH] dt: Correct cam_reg GPIO assignments for CM1&3.
-
-The standard instructions for wiring up cameras on CM1&3
-assign GPIOs for both the shutdown and LED pins on the
-camera connectors.
-The assignment in DT matched the LED wiring, not the shutdown
-line, so didn't control the camera power correctly.
-
-Update the base DT accordingly.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2708-rpi-cm.dts  | 4 ++--
- arch/arm/boot/dts/bcm2710-rpi-cm3.dts | 4 ++--
- arch/arm/boot/dts/overlays/README     | 4 ++--
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
---- a/arch/arm/boot/dts/bcm2708-rpi-cm.dts
-+++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dts
-@@ -11,12 +11,12 @@
- };
- 
- &cam1_reg {
--	gpio = <&gpio 2 GPIO_ACTIVE_HIGH>;
-+	gpio = <&gpio 3 GPIO_ACTIVE_HIGH>;
- 	status = "disabled";
- };
- 
- cam0_reg: &cam0_regulator {
--	gpio = <&gpio 30 GPIO_ACTIVE_HIGH>;
-+	gpio = <&gpio 31 GPIO_ACTIVE_HIGH>;
- };
- 
- &uart0 {
---- a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
-+++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
-@@ -11,12 +11,12 @@
- };
- 
- &cam1_reg {
--	gpio = <&gpio 2 GPIO_ACTIVE_HIGH>;
-+	gpio = <&gpio 3 GPIO_ACTIVE_HIGH>;
- 	status = "disabled";
- };
- 
- cam0_reg: &cam0_regulator {
--	gpio = <&gpio 30 GPIO_ACTIVE_HIGH>;
-+	gpio = <&gpio 31 GPIO_ACTIVE_HIGH>;
- };
- 
- &uart0 {
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -146,12 +146,12 @@ Params:
- 
-         cam0_reg                Enables CAM 0 regulator. CM1 & 3 only.
- 
--        cam0_reg_gpio           Set GPIO for CAM 0 regulator. Default 30.
-+        cam0_reg_gpio           Set GPIO for CAM 0 regulator. Default 31.
-                                 CM1 & 3 only.
- 
-         cam1_reg                Enables CAM 1 regulator. CM1 & 3 only.
- 
--        cam1_reg_gpio           Set GPIO for CAM 1 regulator. Default 2.
-+        cam1_reg_gpio           Set GPIO for CAM 1 regulator. Default 3.
-                                 CM1 & 3 only.
- 
-         eee                     Enable Energy Efficient Ethernet support for
diff --git a/target/linux/bcm27xx/patches-6.1/950-0517-dt-Add-camX_reg_gpio-to-CM4.patch b/target/linux/bcm27xx/patches-6.1/950-0517-dt-Add-camX_reg_gpio-to-CM4.patch
deleted file mode 100644
index 4c6b108df3..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0517-dt-Add-camX_reg_gpio-to-CM4.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 4aa602dc3f534cc5b1afcc587f1be8d713e389e5 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 15 Dec 2022 16:13:07 +0000
-Subject: [PATCH] dt: Add camX_reg_gpio to CM4
-
-To make it easier for custom routing of camera control GPIOs,
-add the camX_reg_gpio parameter to CM4 DT as well.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2711-rpi-cm4.dts |  7 +++++++
- arch/arm/boot/dts/overlays/README     | 18 ++++++++++++------
- 2 files changed, 19 insertions(+), 6 deletions(-)
-
---- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
-@@ -574,5 +574,12 @@ cam0_reg: &cam1_reg {
- 		sd_poll_once = <&emmc2>, "non-removable?";
- 		spi_dma4 = <&spi0>, "dmas:0=", <&dma40>,
- 			   <&spi0>, "dmas:8=", <&dma40>;
-+
-+		cam0_reg = <&cam0_reg>,"status";
-+		cam0_reg_gpio = <&cam0_reg>,"gpio:4",
-+				  <&cam0_reg>,"gpio:0=", <&gpio>;
-+		cam1_reg = <&cam1_reg>,"status";
-+		cam1_reg_gpio = <&cam1_reg>,"gpio:4",
-+				  <&cam1_reg>,"gpio:0=", <&gpio>;
- 	};
- };
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -144,15 +144,21 @@ Params:
-                                 See /sys/kernel/debug/raspberrypi_axi_monitor
-                                 for the results.
- 
--        cam0_reg                Enables CAM 0 regulator. CM1 & 3 only.
-+        cam0_reg                Enables CAM 0 regulator.
-+                                Only required on CM1 & 3.
- 
--        cam0_reg_gpio           Set GPIO for CAM 0 regulator. Default 31.
--                                CM1 & 3 only.
-+        cam0_reg_gpio           Set GPIO for CAM 0 regulator.
-+                                Default 31 on CM1 & 3.
-+                                Default of GPIO expander 5 on CM4, but override
-+                                switches to normal GPIO.
- 
--        cam1_reg                Enables CAM 1 regulator. CM1 & 3 only.
-+        cam1_reg                Enables CAM 1 regulator.
-+                                Only required on CM1 & 3.
- 
--        cam1_reg_gpio           Set GPIO for CAM 1 regulator. Default 3.
--                                CM1 & 3 only.
-+        cam1_reg_gpio           Set GPIO for CAM 1 regulator.
-+                                Default 3 on CM1 & 3.
-+                                Default of GPIO expander 5 on CM4, but override
-+                                switches to normal GPIO.
- 
-         eee                     Enable Energy Efficient Ethernet support for
-                                 compatible devices (default "on"). See also
diff --git a/target/linux/bcm27xx/patches-6.1/950-0518-dt-Add-camX_reg-and-camX_reg_gpio-overrides-to-CM4S.patch b/target/linux/bcm27xx/patches-6.1/950-0518-dt-Add-camX_reg-and-camX_reg_gpio-overrides-to-CM4S.patch
deleted file mode 100644
index 238e0ed688..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0518-dt-Add-camX_reg-and-camX_reg_gpio-overrides-to-CM4S.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From d9bad36a8f7530ec17ffe93521a8a71bc1e54a20 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 15 Dec 2022 16:15:27 +0000
-Subject: [PATCH] dt: Add camX_reg and camX_reg_gpio overrides to CM4S
-
-CM4S follows the pattern of CM1&3 for routing camera
-GPIO control, but didn't have the overrides defined to
-allow enabling and configuring the camera regulator
-GPIOs. Add them.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2711-rpi-cm4s.dts | 9 +++++++--
- arch/arm/boot/dts/overlays/README      | 4 ++--
- 2 files changed, 9 insertions(+), 4 deletions(-)
-
---- a/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
-@@ -403,12 +403,12 @@
- };
- 
- &cam1_reg {
--	gpio = <&gpio 2 GPIO_ACTIVE_HIGH>;
-+	gpio = <&gpio 3 GPIO_ACTIVE_HIGH>;
- 	status = "disabled";
- };
- 
- cam0_reg: &cam0_regulator {
--	gpio = <&gpio 30 GPIO_ACTIVE_HIGH>;
-+	gpio = <&gpio 31 GPIO_ACTIVE_HIGH>;
- 	status = "disabled";
- };
- 
-@@ -423,5 +423,10 @@ cam0_reg: &cam0_regulator {
- 		sd_poll_once = <&emmc2>, "non-removable?";
- 		spi_dma4 = <&spi0>, "dmas:0=", <&dma40>,
- 			   <&spi0>, "dmas:8=", <&dma40>;
-+
-+		cam0_reg = <&cam0_reg>,"status";
-+		cam0_reg_gpio = <&cam0_reg>,"gpio:4";
-+		cam1_reg = <&cam1_reg>,"status";
-+		cam1_reg_gpio = <&cam1_reg>,"gpio:4";
- 	};
- };
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -148,7 +148,7 @@ Params:
-                                 Only required on CM1 & 3.
- 
-         cam0_reg_gpio           Set GPIO for CAM 0 regulator.
--                                Default 31 on CM1 & 3.
-+                                Default 31 on CM1, 3, and 4S.
-                                 Default of GPIO expander 5 on CM4, but override
-                                 switches to normal GPIO.
- 
-@@ -156,7 +156,7 @@ Params:
-                                 Only required on CM1 & 3.
- 
-         cam1_reg_gpio           Set GPIO for CAM 1 regulator.
--                                Default 3 on CM1 & 3.
-+                                Default 3 on CM1, 3, and 4S.
-                                 Default of GPIO expander 5 on CM4, but override
-                                 switches to normal GPIO.
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0519-overlays-Add-disable-emmc2.patch b/target/linux/bcm27xx/patches-6.1/950-0519-overlays-Add-disable-emmc2.patch
deleted file mode 100644
index 5b95bdf350..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0519-overlays-Add-disable-emmc2.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 138d3b64a111b52f2cfe42c3ef84283bd281fae4 Mon Sep 17 00:00:00 2001
-From: Tim Gover <tim.gover@raspberrypi.com>
-Date: Fri, 16 Dec 2022 15:51:17 +0000
-Subject: [PATCH] overlays: Add disable-emmc2
-
-Add a new overlay that disables the EMMC2 controller on BCM2711.
-This can be useful on a Compute Module 4 if the onboard EMMC2
-storage is unreliable and the system can be booted by other
-means e.g Network / USB.
-
-Signed-off-by: Tim Gover <tim.gover@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/Makefile                 |  1 +
- arch/arm/boot/dts/overlays/README                   |  8 ++++++++
- .../arm/boot/dts/overlays/disable-emmc2-overlay.dts | 13 +++++++++++++
- arch/arm/boot/dts/overlays/overlay_map.dts          |  4 ++++
- 4 files changed, 26 insertions(+)
- create mode 100644 arch/arm/boot/dts/overlays/disable-emmc2-overlay.dts
-
---- a/arch/arm/boot/dts/overlays/Makefile
-+++ b/arch/arm/boot/dts/overlays/Makefile
-@@ -49,6 +49,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
- 	dionaudio-loco.dtbo \
- 	dionaudio-loco-v2.dtbo \
- 	disable-bt.dtbo \
-+	disable-emmc2.dtbo \
- 	disable-wifi.dtbo \
- 	dpi18.dtbo \
- 	dpi18cpadhi.dtbo \
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -895,6 +895,14 @@ Load:   dtoverlay=disable-bt
- Params: <None>
- 
- 
-+Name:   disable-emmc2
-+Info:   Disable EMMC2 controller on BCM2711.
-+        The allows the onboard EMMC storage on Compute Module 4 to be disabled
-+        e.g. if a fault has occurred.
-+Load:   dtoverlay=disable-emmc2
-+Params: <None>
-+
-+
- Name:   disable-wifi
- Info:   Disable onboard WLAN on Pi 3B, 3B+, 3A+, 4B and Zero W.
- Load:   dtoverlay=disable-wifi
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/disable-emmc2-overlay.dts
-@@ -0,0 +1,13 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2711";
-+
-+	fragment@0 {
-+		target = <&emmc2>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+};
---- a/arch/arm/boot/dts/overlays/overlay_map.dts
-+++ b/arch/arm/boot/dts/overlays/overlay_map.dts
-@@ -9,6 +9,10 @@
- 		bcm2711;
- 	};
- 
-+	disable-emmc2 {
-+		bcm2711;
-+	};
-+
- 	highperi {
- 		bcm2711;
- 	};
diff --git a/target/linux/bcm27xx/patches-6.1/950-0520-xhci-constrain-XHCI_VLI_HUB_TT_QUIRK-to-old-firmware.patch b/target/linux/bcm27xx/patches-6.1/950-0520-xhci-constrain-XHCI_VLI_HUB_TT_QUIRK-to-old-firmware.patch
deleted file mode 100644
index b35584c786..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0520-xhci-constrain-XHCI_VLI_HUB_TT_QUIRK-to-old-firmware.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From b5a62178cd25c598612036858df5934c4140d242 Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.com>
-Date: Fri, 16 Dec 2022 15:18:21 +0000
-Subject: [PATCH] xhci: constrain XHCI_VLI_HUB_TT_QUIRK to old firmware
- versions
-
-VLI have a firmware update for the VL805 which resolves the incorrect
-frame time calculation in the hub's TT. Limit applying the quirk to
-known-bad firmwares.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- drivers/usb/host/xhci-pci.c | 15 ++++++++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
-
---- a/drivers/usb/host/xhci-pci.c
-+++ b/drivers/usb/host/xhci-pci.c
-@@ -27,6 +27,8 @@
- #define SPARSE_DISABLE_BIT	17
- #define SPARSE_CNTL_ENABLE	0xC12C
- 
-+#define VL805_FW_VER_0138C0	0x0138C0
-+
- /* Device for a quirk */
- #define PCI_VENDOR_ID_FRESCO_LOGIC	0x1b73
- #define PCI_DEVICE_ID_FRESCO_LOGIC_PDK	0x1000
-@@ -104,6 +106,16 @@ static int xhci_pci_reinit(struct xhci_h
- 	return 0;
- }
- 
-+static u32 xhci_vl805_get_fw_version(struct pci_dev *dev)
-+{
-+	int ret;
-+	u32 ver;
-+
-+	ret = pci_read_config_dword(dev, 0x50, &ver);
-+	/* Default to a fw version of 0 instead of ~0 */
-+	return ret ? 0 : ver;
-+}
-+
- static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
- {
- 	struct pci_dev                  *pdev = to_pci_dev(dev);
-@@ -298,7 +310,8 @@ static void xhci_pci_quirks(struct devic
- 		xhci->quirks |= XHCI_AVOID_DQ_ON_LINK;
- 		xhci->quirks |= XHCI_VLI_TRB_CACHE_BUG;
- 		xhci->quirks |= XHCI_VLI_SS_BULK_OUT_BUG;
--		xhci->quirks |= XHCI_VLI_HUB_TT_QUIRK;
-+		if (xhci_vl805_get_fw_version(pdev) < VL805_FW_VER_0138C0)
-+			xhci->quirks |= XHCI_VLI_HUB_TT_QUIRK;
- 	}
- 
- 	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
diff --git a/target/linux/bcm27xx/patches-6.1/950-0521-drm-panel-simple-Add-Innolux-AT056tN53V1-5.6-VGA.patch b/target/linux/bcm27xx/patches-6.1/950-0521-drm-panel-simple-Add-Innolux-AT056tN53V1-5.6-VGA.patch
deleted file mode 100644
index 9abd05b5e2..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0521-drm-panel-simple-Add-Innolux-AT056tN53V1-5.6-VGA.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-From ca58a9eacc862c84c9caf066aaa32ea16195d2c2 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <8911409+pelwell@users.noreply.github.com>
-Date: Mon, 19 Dec 2022 16:32:33 +0000
-Subject: [PATCH] drm/panel: simple: Add Innolux AT056tN53V1 5.6" VGA
-
-Add support for the Innolux AT056tN53V1 5.6" VGA (640x480) TFT LCD
-panel.
-
-Signed-off-by: Joerg Quinten <aBUGSworstnightmare@gmail.com>
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- .../bindings/display/panel/panel-simple.yaml  |  2 +
- .../media/v4l/subdev-formats.rst              | 76 ++++++++++++++++++-
- drivers/gpu/drm/panel/panel-simple.c          | 35 +++++++++
- 3 files changed, 112 insertions(+), 1 deletion(-)
-
---- a/Documentation/devicetree/bindings/display/panel/panel-simple.yaml
-+++ b/Documentation/devicetree/bindings/display/panel/panel-simple.yaml
-@@ -174,6 +174,8 @@ properties:
-       - ivo,m133nwf4-r0
-         # Innolux AT043TN24 4.3" WQVGA TFT LCD panel
-       - innolux,at043tn24
-+        # Innolux AT056tN53V1 5.6" VGA (640x480) TFT LCD panel
-+      - innolux,at056tn53v1
-         # Innolux AT070TN92 7.0" WQVGA TFT LCD panel
-       - innolux,at070tn92
-         # Innolux G070Y2-L01 7" WVGA (800x480) TFT LCD panel
---- a/Documentation/userspace-api/media/v4l/subdev-formats.rst
-+++ b/Documentation/userspace-api/media/v4l/subdev-formats.rst
-@@ -627,7 +627,7 @@ The following tables list existing packe
-     * .. _MEDIA_BUS_FMT_RGB565_1X24_CPADHI:
- 
-       - MEDIA_BUS_FMT_RGB565_1X24_CPADHI
--      - 0x1020
-+      - 0x1022
-       -
-       -
-       -
-@@ -949,6 +949,43 @@ The following tables list existing packe
-       - g\ :sub:`5`
-       - g\ :sub:`4`
-       - g\ :sub:`3`
-+    * .. _MEDIA-BUS-FMT-BGR666-1X18:
-+
-+      - MEDIA_BUS_FMT-BGR666_1X18
-+      - 0x1023
-+      -
-+      -
-+      -
-+      -
-+      -
-+      -
-+      -
-+      -
-+      -
-+      -
-+      -
-+      -
-+      -
-+      -
-+      -
-+      - b\ :sub:`5`
-+      - b\ :sub:`4`
-+      - b\ :sub:`3`
-+      - b\ :sub:`2`
-+      - b\ :sub:`1`
-+      - b\ :sub:`0`
-+      - g\ :sub:`5`
-+      - g\ :sub:`4`
-+      - g\ :sub:`3`
-+      - g\ :sub:`2`
-+      - g\ :sub:`1`
-+      - g\ :sub:`0`
-+      - r\ :sub:`5`
-+      - r\ :sub:`4`
-+      - r\ :sub:`3`
-+      - r\ :sub:`2`
-+      - r\ :sub:`1`
-+      - r\ :sub:`0`
-     * .. _MEDIA-BUS-FMT-RGB666-1X18:
- 
-       - MEDIA_BUS_FMT_RGB666_1X18
-@@ -1023,6 +1060,43 @@ The following tables list existing packe
-       - g\ :sub:`2`
-       - g\ :sub:`1`
-       - g\ :sub:`0`
-+    * .. _MEDIA-BUS-FMT-BGR666-1X24_CPADHI:
-+
-+      - MEDIA_BUS_FMT_BGR666_1X24_CPADHI
-+      - 0x1024
-+      -
-+      -
-+      -
-+      -
-+      -
-+      -
-+      -
-+      -
-+      -
-+      - 0
-+      - 0
-+      - b\ :sub:`5`
-+      - b\ :sub:`4`
-+      - b\ :sub:`3`
-+      - b\ :sub:`2`
-+      - b\ :sub:`1`
-+      - b\ :sub:`0`
-+      - 0
-+      - 0
-+      - g\ :sub:`5`
-+      - g\ :sub:`4`
-+      - g\ :sub:`3`
-+      - g\ :sub:`2`
-+      - g\ :sub:`1`
-+      - g\ :sub:`0`
-+      - 0
-+      - 0
-+      - r\ :sub:`5`
-+      - r\ :sub:`4`
-+      - r\ :sub:`3`
-+      - r\ :sub:`2`
-+      - r\ :sub:`1`
-+      - r\ :sub:`0`
-     * .. _MEDIA-BUS-FMT-RGB666-1X24_CPADHI:
- 
-       - MEDIA_BUS_FMT_RGB666_1X24_CPADHI
---- a/drivers/gpu/drm/panel/panel-simple.c
-+++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -2138,6 +2138,38 @@ static const struct panel_desc innolux_a
- 	.bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE,
- };
- 
-+static const struct display_timing innolux_at056tn53v1_timing = {
-+	.pixelclock = { 39700000, 39700000, 39700000},
-+	.hactive = { 640, 640, 640 },
-+	.hfront_porch = { 16, 16, 16 },
-+	.hback_porch = { 134, 134, 134 },
-+	.hsync_len = { 10, 10, 10},
-+	.vactive = { 480, 480, 480 },
-+	.vfront_porch = { 32, 32, 32},
-+	.vback_porch = { 11, 11, 11 },
-+	.vsync_len = { 2, 2, 2 },
-+	.flags = DRM_MODE_FLAG_PVSYNC | DRM_MODE_FLAG_PHSYNC,
-+};
-+
-+static const struct panel_desc innolux_at056tn53v1 = {
-+	.timings = &innolux_at056tn53v1_timing,
-+	.num_timings = 1,
-+	.bpc = 6,
-+	.size = {
-+		.width = 112,
-+		.height = 84,
-+	},
-+	.delay = {
-+		.prepare = 50,
-+		.enable = 200,
-+		.disable = 110,
-+		.unprepare = 200,
-+	},
-+	.bus_format = MEDIA_BUS_FMT_BGR666_1X24_CPADHI,
-+	.bus_flags = DRM_BUS_FLAG_PIXDATA_SAMPLE_POSEDGE,
-+	.connector_type = DRM_MODE_CONNECTOR_DPI,
-+};
-+
- static const struct drm_display_mode innolux_at070tn92_mode = {
- 	.clock = 33333,
- 	.hdisplay = 800,
-@@ -4149,6 +4181,9 @@ static const struct of_device_id platfor
- 		.compatible = "innolux,at043tn24",
- 		.data = &innolux_at043tn24,
- 	}, {
-+		.compatible = "innolux,at056tn53v1",
-+		.data = &innolux_at056tn53v1,
-+	}, {
- 		.compatible = "innolux,at070tn92",
- 		.data = &innolux_at070tn92,
- 	}, {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0522-overlays-audremap-Fix-setting-of-the-pin-function.patch b/target/linux/bcm27xx/patches-6.1/950-0522-overlays-audremap-Fix-setting-of-the-pin-function.patch
deleted file mode 100644
index 2305c9f5c0..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0522-overlays-audremap-Fix-setting-of-the-pin-function.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From afb542abe9793ff22690244e6e07c5069f829628 Mon Sep 17 00:00:00 2001
-From: Krzysztof Kotlenga <k.kotlenga@sims.pl>
-Date: Thu, 29 Dec 2022 19:14:32 +0100
-Subject: [PATCH] overlays: audremap: Fix setting of the pin function
-
-The brcm,function property must be set in the overlay fragment too -
-otherwise the parametrization won't work. At least that's the case for
-bcm2711-rpi-cm4.dts which starts with empty properties:
-
-&gpio {
-        audio_pins: audio_pins {
-                brcm,pins = <>;
-                brcm,function = <>;
-        };
-};
-
-This was broken since a56df85d2f42fd461fdc05f33617141aca5ba465.
-
-Signed-off-by: Krzysztof Kotlenga <k.kotlenga@sims.pl>
----
- arch/arm/boot/dts/overlays/audremap-overlay.dts | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/arch/arm/boot/dts/overlays/audremap-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/audremap-overlay.dts
-@@ -8,6 +8,7 @@
-                 target = <&audio_pins>;
-                 frag0: __overlay__ {
-                         brcm,pins = <12 13>;
-+                        brcm,function = <4>; /* alt0 alt0 */
-                 };
-         };
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0523-media-dt-bindings-Add-DW9817-to-DW9807-binding.patch b/target/linux/bcm27xx/patches-6.1/950-0523-media-dt-bindings-Add-DW9817-to-DW9807-binding.patch
deleted file mode 100644
index e8e6c6ac4c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0523-media-dt-bindings-Add-DW9817-to-DW9807-binding.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 44511cf5030dc164dfb5bf523de28713fe0cfc0a Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 3 Jan 2023 15:44:10 +0000
-Subject: [PATCH] media: dt-bindings: Add DW9817 to DW9807 binding
-
-The DW9817 is programmatically the same as DW9807, but
-the output drive is a bi-directional -100 to +100mA
-instead of 0-100mA.
-
-Add the appropriate compativle string.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../bindings/media/i2c/dongwoon,dw9807-vcm.yaml      | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
---- a/Documentation/devicetree/bindings/media/i2c/dongwoon,dw9807-vcm.yaml
-+++ b/Documentation/devicetree/bindings/media/i2c/dongwoon,dw9807-vcm.yaml
-@@ -5,18 +5,24 @@
- $id: http://devicetree.org/schemas/media/i2c/dongwoon,dw9807-vcm.yaml#
- $schema: http://devicetree.org/meta-schemas/core.yaml#
- 
--title: Dongwoon Anatech DW9807 voice coil lens driver
-+title: Dongwoon Anatech DW9807 and DW9817 voice coil lens driver
- 
- maintainers:
-   - Sakari Ailus <sakari.ailus@linux.intel.com>
- 
- description: |
-   DW9807 is a 10-bit DAC with current sink capability. It is intended for
--  controlling voice coil lenses.
-+  controlling voice coil lenses. The output drive is 0-100mA.
-+  DW9817 is very similar as a 10-bit DAC with current sink capability,
-+  however the output drive is a bidirection -100 to +100mA.
-+
- 
- properties:
-   compatible:
--    const: dongwoon,dw9807-vcm
-+    items:
-+      - enum:
-+          - dongwoon,dw9807-vcm
-+          - dongwoon,dw9817-vcm
- 
-   reg:
-     maxItems: 1
diff --git a/target/linux/bcm27xx/patches-6.1/950-0524-media-dw9807-vcm-Add-support-for-DW9817-bidirectiona.patch b/target/linux/bcm27xx/patches-6.1/950-0524-media-dw9807-vcm-Add-support-for-DW9817-bidirectiona.patch
deleted file mode 100644
index 8521afad65..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0524-media-dw9807-vcm-Add-support-for-DW9817-bidirectiona.patch
+++ /dev/null
@@ -1,223 +0,0 @@
-From 2977dc08b02dd7097791a4d3c94796f33a165abc Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 3 Jan 2023 15:38:08 +0000
-Subject: [PATCH] media: dw9807-vcm: Add support for DW9817
- bidirectional VCM driver
-
-The DW9817 is effectively the same as DW9807 from a programming
-interface, however it drives +/-100mA instead of 0-100mA. This means
-that the power on ramp needs to take the lens from the midpoint, and
-power off return it there. It also changes the default position for
-the module.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/i2c/dw9807-vcm.c | 115 +++++++++++++++++++++++++--------
- 1 file changed, 88 insertions(+), 27 deletions(-)
-
---- a/drivers/media/i2c/dw9807-vcm.c
-+++ b/drivers/media/i2c/dw9807-vcm.c
-@@ -1,6 +1,14 @@
- // SPDX-License-Identifier: GPL-2.0
- // Copyright (C) 2018 Intel Corporation
- 
-+/*
-+ * DW9807 is a 10-bit DAC driver, capable of sinking up to 100mA.
-+ *
-+ * DW9817 is a bidirectional 10-bit driver, driving up to +/- 100mA.
-+ * Operationally it is identical to DW9807, except that the idle position is
-+ * the mid-point, not 0.
-+ */
-+
- #include <linux/acpi.h>
- #include <linux/delay.h>
- #include <linux/i2c.h>
-@@ -38,10 +46,16 @@
- 
- #define MAX_RETRY		10
- 
-+struct dw9807_cfg {
-+	unsigned int idle_pos;
-+	unsigned int default_pos;
-+};
-+
- struct dw9807_device {
- 	struct v4l2_ctrl_handler ctrls_vcm;
- 	struct v4l2_subdev sd;
- 	u16 current_val;
-+	u16 idle_pos;
- };
- 
- static inline struct dw9807_device *sd_to_dw9807_vcm(
-@@ -109,6 +123,40 @@ static int dw9807_set_dac(struct i2c_cli
- 	return 0;
- }
- 
-+/*
-+ * The lens position is gradually moved in units of DW9807_CTRL_STEPS,
-+ * to make the movements smoothly. In all cases, even when "start" and
-+ * "end" are the same, the lens will be set to the "end" position.
-+ *
-+ * (We don't use hardware slew rate control, because it differs widely
-+ * between otherwise-compatible ICs, and may need lens-specific tuning.)
-+ */
-+static int dw9807_ramp(struct i2c_client *client, int start, int end)
-+{
-+	int step, val, ret;
-+
-+	if (start < end)
-+		step = DW9807_CTRL_STEPS;
-+	else
-+		step = -DW9807_CTRL_STEPS;
-+
-+	val = start;
-+	while (true) {
-+		val += step;
-+		if (step * (val - end) >= 0)
-+			val = end;
-+		ret = dw9807_set_dac(client, val);
-+		if (ret)
-+			dev_err_ratelimited(&client->dev, "%s I2C failure: %d",
-+					    __func__, ret);
-+		if (val == end)
-+			break;
-+		usleep_range(DW9807_CTRL_DELAY_US, DW9807_CTRL_DELAY_US + 10);
-+	}
-+
-+	return ret;
-+}
-+
- static int dw9807_set_ctrl(struct v4l2_ctrl *ctrl)
- {
- 	struct dw9807_device *dev_vcm = container_of(ctrl->handler,
-@@ -118,7 +166,7 @@ static int dw9807_set_ctrl(struct v4l2_c
- 		struct i2c_client *client = v4l2_get_subdevdata(&dev_vcm->sd);
- 
- 		dev_vcm->current_val = ctrl->val;
--		return dw9807_set_dac(client, ctrl->val);
-+		return dw9807_ramp(client, ctrl->val, ctrl->val);
- 	}
- 
- 	return -EINVAL;
-@@ -163,7 +211,8 @@ static int dw9807_init_controls(struct d
- 	v4l2_ctrl_handler_init(hdl, 1);
- 
- 	v4l2_ctrl_new_std(hdl, ops, V4L2_CID_FOCUS_ABSOLUTE,
--			  0, DW9807_MAX_FOCUS_POS, DW9807_FOCUS_STEPS, 0);
-+			  0, DW9807_MAX_FOCUS_POS, DW9807_FOCUS_STEPS,
-+			  dev_vcm->current_val);
- 
- 	dev_vcm->sd.ctrl_handler = hdl;
- 	if (hdl->error) {
-@@ -175,9 +224,32 @@ static int dw9807_init_controls(struct d
- 	return 0;
- }
- 
-+/* Compatible devices; in fact there are many similar chips.
-+ * "data" holds the powered-off (zero current) lens position and a
-+ * default/initial control value (which need not be the same as the powered-off
-+ * value).
-+ */
-+static const struct dw9807_cfg dw9807_cfg = {
-+	.idle_pos = 0,
-+	.default_pos = 0
-+};
-+
-+static const struct dw9807_cfg dw9817_cfg = {
-+	.idle_pos = 512,
-+	.default_pos = 480,
-+};
-+
-+static const struct of_device_id dw9807_of_table[] = {
-+	{ .compatible = "dongwoon,dw9807-vcm", .data = &dw9807_cfg },
-+	{ .compatible = "dongwoon,dw9817-vcm", .data = &dw9817_cfg },
-+	{ /* sentinel */ }
-+};
-+
- static int dw9807_probe(struct i2c_client *client)
- {
- 	struct dw9807_device *dw9807_dev;
-+	const struct of_device_id *match;
-+	const struct dw9807_cfg *cfg;
- 	int rval;
- 
- 	dw9807_dev = devm_kzalloc(&client->dev, sizeof(*dw9807_dev),
-@@ -185,6 +257,13 @@ static int dw9807_probe(struct i2c_clien
- 	if (dw9807_dev == NULL)
- 		return -ENOMEM;
- 
-+	match = i2c_of_match_device(dw9807_of_table, client);
-+	if (match) {
-+		cfg = (const struct dw9807_cfg *)match->data;
-+		dw9807_dev->idle_pos = cfg->idle_pos;
-+		dw9807_dev->current_val = cfg->default_pos;
-+	}
-+
- 	v4l2_i2c_subdev_init(&dw9807_dev->sd, client, &dw9807_ops);
- 	dw9807_dev->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
- 	dw9807_dev->sd.internal_ops = &dw9807_int_ops;
-@@ -203,7 +282,8 @@ static int dw9807_probe(struct i2c_clien
- 	if (rval < 0)
- 		goto err_cleanup;
- 
--	pm_runtime_set_active(&client->dev);
-+	if (!dw9807_dev->vdd)
-+		pm_runtime_set_active(&client->dev);
- 	pm_runtime_enable(&client->dev);
- 	pm_runtime_idle(&client->dev);
- 
-@@ -237,15 +317,10 @@ static int __maybe_unused dw9807_vcm_sus
- 	struct v4l2_subdev *sd = i2c_get_clientdata(client);
- 	struct dw9807_device *dw9807_dev = sd_to_dw9807_vcm(sd);
- 	const char tx_data[2] = { DW9807_CTL_ADDR, 0x01 };
--	int ret, val;
-+	int ret;
- 
--	for (val = dw9807_dev->current_val & ~(DW9807_CTRL_STEPS - 1);
--	     val >= 0; val -= DW9807_CTRL_STEPS) {
--		ret = dw9807_set_dac(client, val);
--		if (ret)
--			dev_err_once(dev, "%s I2C failure: %d", __func__, ret);
--		usleep_range(DW9807_CTRL_DELAY_US, DW9807_CTRL_DELAY_US + 10);
--	}
-+	if (abs(dw9807_dev->current_val - dw9807_dev->idle_pos) > DW9807_CTRL_STEPS)
-+		dw9807_ramp(client, dw9807_dev->current_val, dw9807_dev->idle_pos);
- 
- 	/* Power down */
- 	ret = i2c_master_send(client, tx_data, sizeof(tx_data));
-@@ -269,7 +344,7 @@ static int  __maybe_unused dw9807_vcm_re
- 	struct v4l2_subdev *sd = i2c_get_clientdata(client);
- 	struct dw9807_device *dw9807_dev = sd_to_dw9807_vcm(sd);
- 	const char tx_data[2] = { DW9807_CTL_ADDR, 0x00 };
--	int ret, val;
-+	int ret;
- 
- 	/* Power on */
- 	ret = i2c_master_send(client, tx_data, sizeof(tx_data));
-@@ -278,25 +353,11 @@ static int  __maybe_unused dw9807_vcm_re
- 		return ret;
- 	}
- 
--	for (val = dw9807_dev->current_val % DW9807_CTRL_STEPS;
--	     val < dw9807_dev->current_val + DW9807_CTRL_STEPS - 1;
--	     val += DW9807_CTRL_STEPS) {
--		ret = dw9807_set_dac(client, val);
--		if (ret)
--			dev_err_ratelimited(dev, "%s I2C failure: %d",
--						__func__, ret);
--		usleep_range(DW9807_CTRL_DELAY_US, DW9807_CTRL_DELAY_US + 10);
--	}
-+	dw9807_ramp(client, dw9807_dev->idle_pos, dw9807_dev->current_val);
- 
- 	return 0;
- }
- 
--static const struct of_device_id dw9807_of_table[] = {
--	{ .compatible = "dongwoon,dw9807-vcm" },
--	/* Compatibility for older firmware, NEVER USE THIS IN FIRMWARE! */
--	{ .compatible = "dongwoon,dw9807" },
--	{ /* sentinel */ }
--};
- MODULE_DEVICE_TABLE(of, dw9807_of_table);
- 
- static const struct dev_pm_ops dw9807_pm_ops = {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0525-media-dt-bindings-Add-regulator-to-dw9807-vcm.patch b/target/linux/bcm27xx/patches-6.1/950-0525-media-dt-bindings-Add-regulator-to-dw9807-vcm.patch
deleted file mode 100644
index 13d9175644..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0525-media-dt-bindings-Add-regulator-to-dw9807-vcm.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d2b7bb49d170cecb5c4f3e8df19b7b2a2891e4ce Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 3 Jan 2023 16:41:08 +0000
-Subject: [PATCH] media: dt-bindings: Add regulator to dw9807-vcm
-
-The VCM driver will often be controlled via a regulator,
-therefore add in the relevant DT hooks.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../devicetree/bindings/media/i2c/dongwoon,dw9807-vcm.yaml    | 4 ++++
- drivers/media/i2c/dw9807-vcm.c                                | 4 ++++
- 2 files changed, 8 insertions(+)
-
---- a/Documentation/devicetree/bindings/media/i2c/dongwoon,dw9807-vcm.yaml
-+++ b/Documentation/devicetree/bindings/media/i2c/dongwoon,dw9807-vcm.yaml
-@@ -27,6 +27,10 @@ properties:
-   reg:
-     maxItems: 1
- 
-+  VDD-supply:
-+    description:
-+      Definition of the regulator used as VDD power supply to the driver.
-+
- required:
-   - compatible
-   - reg
---- a/drivers/media/i2c/dw9807-vcm.c
-+++ b/drivers/media/i2c/dw9807-vcm.c
-@@ -301,6 +301,10 @@ static void dw9807_remove(struct i2c_cli
- 	struct v4l2_subdev *sd = i2c_get_clientdata(client);
- 	struct dw9807_device *dw9807_dev = sd_to_dw9807_vcm(sd);
- 
-+	if (dw9807_dev->vdd)
-+		regulator_unregister_notifier(dw9807_dev->vdd,
-+					      &dw9807_dev->notifier);
-+
- 	pm_runtime_disable(&client->dev);
- 
- 	dw9807_subdev_cleanup(dw9807_dev);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0526-media-dw9807-vcm-Add-regulator-support-to-the-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0526-media-dw9807-vcm-Add-regulator-support-to-the-driver.patch
deleted file mode 100644
index aa814c7e1c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0526-media-dw9807-vcm-Add-regulator-support-to-the-driver.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-From 441e1fbef6c33549520b52ff357682b6fe7e8646 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 3 Jan 2023 16:35:59 +0000
-Subject: [PATCH] media: dw9807-vcm: Add regulator support to the
- driver
-
-Uses the regulator notifier framework so that the current
-focus position will be restored whenever any user of the
-regulator powers it up. This means that should the VCM
-and sensor share a common regulator then starting the sensor
-will automatically restore the default position. If they
-have independent regulators then it will behave be powered
-up when the VCM subdev is opened.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/i2c/dw9807-vcm.c | 113 ++++++++++++++++++++++++++-------
- 1 file changed, 90 insertions(+), 23 deletions(-)
-
---- a/drivers/media/i2c/dw9807-vcm.c
-+++ b/drivers/media/i2c/dw9807-vcm.c
-@@ -15,6 +15,7 @@
- #include <linux/iopoll.h>
- #include <linux/module.h>
- #include <linux/pm_runtime.h>
-+#include <linux/regulator/consumer.h>
- #include <media/v4l2-ctrls.h>
- #include <media/v4l2-device.h>
- 
-@@ -46,6 +47,9 @@
- 
- #define MAX_RETRY		10
- 
-+#define DW9807_PW_MIN_DELAY_US		100
-+#define DW9807_PW_DELAY_RANGE_US	10
-+
- struct dw9807_cfg {
- 	unsigned int idle_pos;
- 	unsigned int default_pos;
-@@ -56,6 +60,8 @@ struct dw9807_device {
- 	struct v4l2_subdev sd;
- 	u16 current_val;
- 	u16 idle_pos;
-+	struct regulator *vdd;
-+	struct notifier_block notifier;
- };
- 
- static inline struct dw9807_device *sd_to_dw9807_vcm(
-@@ -157,6 +163,66 @@ static int dw9807_ramp(struct i2c_client
- 	return ret;
- }
- 
-+static int dw9807_active(struct dw9807_device *dw9807_dev)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&dw9807_dev->sd);
-+	const char tx_data[2] = { DW9807_CTL_ADDR, 0x00 };
-+	int ret;
-+
-+	/* Power on */
-+	ret = i2c_master_send(client, tx_data, sizeof(tx_data));
-+	if (ret < 0) {
-+		dev_err(&client->dev, "I2C write CTL fail ret = %d\n", ret);
-+		return ret;
-+	}
-+
-+	return dw9807_ramp(client, dw9807_dev->idle_pos, dw9807_dev->current_val);
-+}
-+
-+static int dw9807_standby(struct dw9807_device *dw9807_dev)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&dw9807_dev->sd);
-+	const char tx_data[2] = { DW9807_CTL_ADDR, 0x01 };
-+	int ret;
-+
-+	if (abs(dw9807_dev->current_val - dw9807_dev->idle_pos) > DW9807_CTRL_STEPS)
-+		dw9807_ramp(client, dw9807_dev->current_val, dw9807_dev->idle_pos);
-+
-+	/* Power down */
-+	ret = i2c_master_send(client, tx_data, sizeof(tx_data));
-+	if (ret < 0) {
-+		dev_err(&client->dev, "I2C write CTL fail ret = %d\n", ret);
-+		return ret;
-+	}
-+
-+	return 0;
-+}
-+
-+static int dw9807_regulator_event(struct notifier_block *nb,
-+				  unsigned long action, void *data)
-+{
-+	struct dw9807_device *dw9807_dev =
-+		container_of(nb, struct dw9807_device, notifier);
-+
-+	if (action & REGULATOR_EVENT_ENABLE) {
-+		/*
-+		 * Initialisation delay between VDD low->high and the moment
-+		 * when the i2c command is available.
-+		 * From the datasheet, it should be 10ms + 2ms (max power
-+		 * up sequence duration)
-+		 */
-+		usleep_range(DW9807_PW_MIN_DELAY_US,
-+			     DW9807_PW_MIN_DELAY_US +
-+			     DW9807_PW_DELAY_RANGE_US);
-+
-+		dw9807_active(dw9807_dev);
-+	} else if (action & REGULATOR_EVENT_PRE_DISABLE) {
-+		dw9807_standby(dw9807_dev);
-+	}
-+
-+	return 0;
-+}
-+
- static int dw9807_set_ctrl(struct v4l2_ctrl *ctrl)
- {
- 	struct dw9807_device *dev_vcm = container_of(ctrl->handler,
-@@ -257,6 +323,24 @@ static int dw9807_probe(struct i2c_clien
- 	if (dw9807_dev == NULL)
- 		return -ENOMEM;
- 
-+	dw9807_dev->vdd = devm_regulator_get_optional(&client->dev, "VDD");
-+	if (IS_ERR(dw9807_dev->vdd)) {
-+		if (PTR_ERR(dw9807_dev->vdd) != -ENODEV)
-+			return PTR_ERR(dw9807_dev->vdd);
-+
-+		dw9807_dev->vdd = NULL;
-+	} else {
-+		dw9807_dev->notifier.notifier_call = dw9807_regulator_event;
-+
-+		rval = regulator_register_notifier(dw9807_dev->vdd,
-+						   &dw9807_dev->notifier);
-+		if (rval) {
-+			dev_err(&client->dev,
-+				"could not register regulator notifier\n");
-+			return rval;
-+		}
-+	}
-+
- 	match = i2c_of_match_device(dw9807_of_table, client);
- 	if (match) {
- 		cfg = (const struct dw9807_cfg *)match->data;
-@@ -320,20 +404,11 @@ static int __maybe_unused dw9807_vcm_sus
- 	struct i2c_client *client = to_i2c_client(dev);
- 	struct v4l2_subdev *sd = i2c_get_clientdata(client);
- 	struct dw9807_device *dw9807_dev = sd_to_dw9807_vcm(sd);
--	const char tx_data[2] = { DW9807_CTL_ADDR, 0x01 };
--	int ret;
--
--	if (abs(dw9807_dev->current_val - dw9807_dev->idle_pos) > DW9807_CTRL_STEPS)
--		dw9807_ramp(client, dw9807_dev->current_val, dw9807_dev->idle_pos);
- 
--	/* Power down */
--	ret = i2c_master_send(client, tx_data, sizeof(tx_data));
--	if (ret < 0) {
--		dev_err(&client->dev, "I2C write CTL fail ret = %d\n", ret);
--		return ret;
--	}
-+	if (dw9807_dev->vdd)
-+		return regulator_disable(dw9807_dev->vdd);
- 
--	return 0;
-+	return dw9807_standby(dw9807_dev);
- }
- 
- /*
-@@ -347,19 +422,11 @@ static int  __maybe_unused dw9807_vcm_re
- 	struct i2c_client *client = to_i2c_client(dev);
- 	struct v4l2_subdev *sd = i2c_get_clientdata(client);
- 	struct dw9807_device *dw9807_dev = sd_to_dw9807_vcm(sd);
--	const char tx_data[2] = { DW9807_CTL_ADDR, 0x00 };
--	int ret;
--
--	/* Power on */
--	ret = i2c_master_send(client, tx_data, sizeof(tx_data));
--	if (ret < 0) {
--		dev_err(&client->dev, "I2C write CTL fail ret = %d\n", ret);
--		return ret;
--	}
- 
--	dw9807_ramp(client, dw9807_dev->idle_pos, dw9807_dev->current_val);
-+	if (dw9807_dev->vdd)
-+		return regulator_enable(dw9807_dev->vdd);
- 
--	return 0;
-+	return dw9807_active(dw9807_dev);
- }
- 
- MODULE_DEVICE_TABLE(of, dw9807_of_table);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0527-media-dw9807-vcm-Smooth-the-first-user-movement-of-t.patch b/target/linux/bcm27xx/patches-6.1/950-0527-media-dw9807-vcm-Smooth-the-first-user-movement-of-t.patch
deleted file mode 100644
index 60c25d6023..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0527-media-dw9807-vcm-Smooth-the-first-user-movement-of-t.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From a701a312ff709f0dcd6862be6e8fcc328379c4d1 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 3 Jan 2023 16:53:37 +0000
-Subject: [PATCH] media: dw9807-vcm: Smooth the first user movement of
- the lens
-
-The power up/down sequence is already ramped. Extend this to
-the first user movement as well, as this will generally avoid
-the "tick" noises due to rapid movements and overshooting.
-Subsequent movements are generally smaller and so don't cause
-issues.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/i2c/dw9807-vcm.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
---- a/drivers/media/i2c/dw9807-vcm.c
-+++ b/drivers/media/i2c/dw9807-vcm.c
-@@ -62,6 +62,7 @@ struct dw9807_device {
- 	u16 idle_pos;
- 	struct regulator *vdd;
- 	struct notifier_block notifier;
-+	bool first;
- };
- 
- static inline struct dw9807_device *sd_to_dw9807_vcm(
-@@ -176,6 +177,8 @@ static int dw9807_active(struct dw9807_d
- 		return ret;
- 	}
- 
-+	dw9807_dev->first = true;
-+
- 	return dw9807_ramp(client, dw9807_dev->idle_pos, dw9807_dev->current_val);
- }
- 
-@@ -230,9 +233,11 @@ static int dw9807_set_ctrl(struct v4l2_c
- 
- 	if (ctrl->id == V4L2_CID_FOCUS_ABSOLUTE) {
- 		struct i2c_client *client = v4l2_get_subdevdata(&dev_vcm->sd);
-+		int start = (dev_vcm->first) ? dev_vcm->current_val : ctrl->val;
- 
-+		dev_vcm->first = false;
- 		dev_vcm->current_val = ctrl->val;
--		return dw9807_ramp(client, ctrl->val, ctrl->val);
-+		return dw9807_ramp(client, start, ctrl->val);
- 	}
- 
- 	return -EINVAL;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0528-dtbindings-media-i2c-Add-IMX708-CMOS-sensor-binding.patch b/target/linux/bcm27xx/patches-6.1/950-0528-dtbindings-media-i2c-Add-IMX708-CMOS-sensor-binding.patch
deleted file mode 100644
index efee9ebcd7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0528-dtbindings-media-i2c-Add-IMX708-CMOS-sensor-binding.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From 27a49357c8dc582428cc7a7c80b39da157bf3f66 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 22 Dec 2022 14:08:35 +0000
-Subject: [PATCH] dtbindings: media: i2c: Add IMX708 CMOS sensor
- binding
-
-Add YAML devicetree binding for IMX708 CMOS image sensor.
-Let's also add a MAINTAINERS entry for the binding and driver.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../devicetree/bindings/media/i2c/imx708.yaml | 119 ++++++++++++++++++
- MAINTAINERS                                   |   8 ++
- 2 files changed, 127 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/media/i2c/imx708.yaml
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/media/i2c/imx708.yaml
-@@ -0,0 +1,119 @@
-+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
-+%YAML 1.2
-+---
-+$id: http://devicetree.org/schemas/media/i2c/imx708.yaml#
-+$schema: http://devicetree.org/meta-schemas/core.yaml#
-+
-+title: Sony 1/2.3-Inch 12Mpixel CMOS Digital Image Sensor
-+
-+maintainers:
-+  - Naushir Patuck <naush@raspberypi.com>
-+
-+description: |-
-+  The Sony IMX708 is a 1/2.3-inch CMOS active pixel digital image sensor
-+  with an active array size of 4608H x 2592V. It is programmable through
-+  I2C interface. The I2C address is fixed to 0x1A as per sensor data sheet.
-+  Image data is sent through MIPI CSI-2, which is configured as either 2 or
-+  4 data lanes.
-+
-+properties:
-+  compatible:
-+    const: sony,imx708
-+
-+  reg:
-+    description: I2C device address
-+    maxItems: 1
-+
-+  clocks:
-+    maxItems: 1
-+
-+  VDIG-supply:
-+    description:
-+      Digital I/O voltage supply, 1.1 volts
-+
-+  VANA1-supply:
-+    description:
-+      Analog1 voltage supply, 2.8 volts
-+
-+  VANA2-supply:
-+    description:
-+      Analog2 voltage supply, 1.8 volts
-+
-+  VDDL-supply:
-+    description:
-+      Digital core voltage supply, 1.8 volts
-+
-+  reset-gpios:
-+    description: |-
-+      Reference to the GPIO connected to the xclr pin, if any.
-+      Must be released (set high) after all supplies and INCK are applied.
-+
-+  # See ../video-interfaces.txt for more details
-+  port:
-+    type: object
-+    properties:
-+      endpoint:
-+        type: object
-+        properties:
-+          data-lanes:
-+            description: |-
-+              The sensor supports either two-lane, or four-lane operation.
-+              For two-lane operation the property must be set to <1 2>.
-+            items:
-+              - const: 1
-+              - const: 2
-+
-+          clock-noncontinuous:
-+            type: boolean
-+            description: |-
-+              MIPI CSI-2 clock is non-continuous if this property is present,
-+              otherwise it's continuous.
-+
-+          link-frequencies:
-+            allOf:
-+              - $ref: /schemas/types.yaml#/definitions/uint64-array
-+            description:
-+              Allowed data bus frequencies.
-+
-+        required:
-+          - link-frequencies
-+
-+required:
-+  - compatible
-+  - reg
-+  - clocks
-+  - VANA1-supply
-+  - VANA2-supply
-+  - VDIG-supply
-+  - VDDL-supply
-+  - port
-+
-+additionalProperties: false
-+
-+examples:
-+  - |
-+    i2c0 {
-+        #address-cells = <1>;
-+        #size-cells = <0>;
-+
-+        imx708: sensor@1a {
-+            compatible = "sony,imx708";
-+            reg = <0x1a>;
-+            clocks = <&imx708_clk>;
-+            VANA1-supply = <&imx708_vana1>; /* 1.8v */
-+            VANA2-supply = <&imx708_vana2>; /* 2.8v */
-+            VDIG-supply = <&imx708_vdig>;   /* 1.1v */
-+            VDDL-supply = <&imx708_vddl>;   /* 1.8v */
-+
-+            port {
-+                imx708_0: endpoint {
-+                    remote-endpoint = <&csi1_ep>;
-+                    data-lanes = <1 2>;
-+                    clock-noncontinuous;
-+                    link-frequencies = /bits/ 64 <450000000>;
-+                };
-+            };
-+        };
-+    };
-+
-+...
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -19339,6 +19339,14 @@ T:	git git://linuxtv.org/media_tree.git
- F:	Documentation/devicetree/bindings/media/i2c/imx519.yaml
- F:	drivers/media/i2c/imx519.c
- 
-+SONY IMX708 SENSOR DRIVER
-+M:	Raspberry Pi Kernel Maintenance <kernel-list@raspberrypi.com>
-+L:	linux-media@vger.kernel.org
-+S:	Maintained
-+T:	git git://linuxtv.org/media_tree.git
-+F:	Documentation/devicetree/bindings/media/i2c/imx708.yaml
-+F:	drivers/media/i2c/imx708.c
-+
- SONY MEMORYSTICK SUBSYSTEM
- M:	Maxim Levitsky <maximlevitsky@gmail.com>
- M:	Alex Dubov <oakad@yahoo.com>
diff --git a/target/linux/bcm27xx/patches-6.1/950-0529-media-i2c-Add-a-driver-for-the-Sony-IMX708-image-sen.patch b/target/linux/bcm27xx/patches-6.1/950-0529-media-i2c-Add-a-driver-for-the-Sony-IMX708-image-sen.patch
deleted file mode 100644
index b4154c9cca..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0529-media-i2c-Add-a-driver-for-the-Sony-IMX708-image-sen.patch
+++ /dev/null
@@ -1,2045 +0,0 @@
-From e97a08baa18802bb3704e1dfda87193417d5fa58 Mon Sep 17 00:00:00 2001
-From: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
-Date: Thu, 22 Dec 2022 13:59:33 +0000
-Subject: [PATCH] media/i2c: Add a driver for the Sony IMX708 image
- sensor
-
-The imx708 is a 12MP MIPI sensor with a 16:9 aspect ratio, here using
-two CSI-2 lanes. It is a "quad Bayer" sensor with all 3 modes offering
-10-bit output:
-
-12MP: 4608x2592 up to 14.35fps (full FoV)
-1080p: 2304x1296 up to 56.02fps (full FoV)
-720p: 1536x864 up to 120.12fps (cropped)
-
-This imx708 sensor driver is based heavily on the imx477 driver and
-has been tested on the Raspberry Pi platform using libcamera.
-
-Signed-off-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/i2c/Kconfig  |   13 +
- drivers/media/i2c/Makefile |    1 +
- drivers/media/i2c/imx708.c | 1984 ++++++++++++++++++++++++++++++++++++
- 3 files changed, 1998 insertions(+)
- create mode 100644 drivers/media/i2c/imx708.c
-
---- a/drivers/media/i2c/Kconfig
-+++ b/drivers/media/i2c/Kconfig
-@@ -268,6 +268,19 @@ config VIDEO_IMX519
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called IMX519.
- 
-+config VIDEO_IMX708
-+	tristate "Sony IMX708 sensor support"
-+	depends on I2C && VIDEO_DEV
-+	select MEDIA_CONTROLLER
-+	select VIDEO_V4L2_SUBDEV_API
-+	select V4L2_FWNODE
-+	help
-+	  This is a Video4Linux2 sensor driver for the Sony
-+	  IMX708 camera.
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called imx708.
-+
- config VIDEO_MAX9271_LIB
- 	tristate
- 
---- a/drivers/media/i2c/Makefile
-+++ b/drivers/media/i2c/Makefile
-@@ -53,6 +53,7 @@ obj-$(CONFIG_VIDEO_IMX355) += imx355.o
- obj-$(CONFIG_VIDEO_IMX412) += imx412.o
- obj-$(CONFIG_VIDEO_IMX477) += imx477.o
- obj-$(CONFIG_VIDEO_IMX519) += imx519.o
-+obj-$(CONFIG_VIDEO_IMX708) += imx708.o
- obj-$(CONFIG_VIDEO_IR_I2C) += ir-kbd-i2c.o
- obj-$(CONFIG_VIDEO_IRS1125) += irs1125.o
- obj-$(CONFIG_VIDEO_ISL7998X) += isl7998x.o
---- /dev/null
-+++ b/drivers/media/i2c/imx708.c
-@@ -0,0 +1,1984 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * A V4L2 driver for Sony IMX708 cameras.
-+ * Copyright (C) 2022, Raspberry Pi Ltd
-+ *
-+ * Based on Sony imx477 camera driver
-+ * Copyright (C) 2020 Raspberry Pi Ltd
-+ */
-+#include <asm/unaligned.h>
-+#include <linux/clk.h>
-+#include <linux/delay.h>
-+#include <linux/gpio/consumer.h>
-+#include <linux/i2c.h>
-+#include <linux/module.h>
-+#include <linux/pm_runtime.h>
-+#include <linux/regulator/consumer.h>
-+#include <media/v4l2-ctrls.h>
-+#include <media/v4l2-device.h>
-+#include <media/v4l2-event.h>
-+#include <media/v4l2-fwnode.h>
-+#include <media/v4l2-mediabus.h>
-+
-+#define IMX708_REG_VALUE_08BIT		1
-+#define IMX708_REG_VALUE_16BIT		2
-+
-+/* Chip ID */
-+#define IMX708_REG_CHIP_ID		0x0016
-+#define IMX708_CHIP_ID			0x0708
-+
-+#define IMX708_REG_MODE_SELECT		0x0100
-+#define IMX708_MODE_STANDBY		0x00
-+#define IMX708_MODE_STREAMING		0x01
-+
-+#define IMX708_REG_ORIENTATION		0x101
-+
-+#define IMX708_XCLK_FREQ		24000000
-+
-+#define IMX708_DEFAULT_LINK_FREQ	450000000
-+
-+/* Default initial pixel rate, will get updated for each mode. */
-+#define IMX708_INITIAL_PIXEL_RATE	590000000
-+
-+/* V_TIMING internal */
-+#define IMX708_REG_FRAME_LENGTH		0x0340
-+#define IMX708_FRAME_LENGTH_MAX		0xffff
-+
-+/* Exposure control */
-+#define IMX708_REG_EXPOSURE		0x0202
-+#define IMX708_EXPOSURE_OFFSET		48
-+#define IMX708_EXPOSURE_DEFAULT		0x640
-+#define IMX708_EXPOSURE_STEP		1
-+#define IMX708_EXPOSURE_MIN		1
-+#define IMX708_EXPOSURE_MAX		(IMX708_FRAME_LENGTH_MAX - \
-+					 IMX708_EXPOSURE_OFFSET)
-+
-+/* Analog gain control */
-+#define IMX708_REG_ANALOG_GAIN		0x0204
-+#define IMX708_ANA_GAIN_MIN		112
-+#define IMX708_ANA_GAIN_MAX		960
-+#define IMX708_ANA_GAIN_STEP		1
-+#define IMX708_ANA_GAIN_DEFAULT	   IMX708_ANA_GAIN_MIN
-+
-+/* Digital gain control */
-+#define IMX708_REG_DIGITAL_GAIN		0x020e
-+#define IMX708_DGTL_GAIN_MIN		0x0100
-+#define IMX708_DGTL_GAIN_MAX		0xffff
-+#define IMX708_DGTL_GAIN_DEFAULT	0x0100
-+#define IMX708_DGTL_GAIN_STEP		1
-+
-+/* Colour balance controls */
-+#define IMX708_REG_COLOUR_BALANCE_RED   0x0b90
-+#define IMX708_REG_COLOUR_BALANCE_BLUE	0x0b92
-+#define IMX708_COLOUR_BALANCE_MIN	0x01
-+#define IMX708_COLOUR_BALANCE_MAX	0xffff
-+#define IMX708_COLOUR_BALANCE_STEP	0x01
-+#define IMX708_COLOUR_BALANCE_DEFAULT	0x100
-+
-+/* Test Pattern Control */
-+#define IMX708_REG_TEST_PATTERN		0x0600
-+#define IMX708_TEST_PATTERN_DISABLE	0
-+#define IMX708_TEST_PATTERN_SOLID_COLOR	1
-+#define IMX708_TEST_PATTERN_COLOR_BARS	2
-+#define IMX708_TEST_PATTERN_GREY_COLOR	3
-+#define IMX708_TEST_PATTERN_PN9		4
-+
-+/* Test pattern colour components */
-+#define IMX708_REG_TEST_PATTERN_R	0x0602
-+#define IMX708_REG_TEST_PATTERN_GR	0x0604
-+#define IMX708_REG_TEST_PATTERN_B	0x0606
-+#define IMX708_REG_TEST_PATTERN_GB	0x0608
-+#define IMX708_TEST_PATTERN_COLOUR_MIN	0
-+#define IMX708_TEST_PATTERN_COLOUR_MAX	0x0fff
-+#define IMX708_TEST_PATTERN_COLOUR_STEP	1
-+
-+#define IMX708_REG_BASE_SPC_GAINS_L	0x7b10
-+#define IMX708_REG_BASE_SPC_GAINS_R	0x7c00
-+
-+/* HDR exposure ratio (long:med == med:short) */
-+#define IMX708_HDR_EXPOSURE_RATIO       4
-+#define IMX708_REG_MID_EXPOSURE	0x3116
-+#define IMX708_REG_SHT_EXPOSURE	0x0224
-+#define IMX708_REG_MID_ANALOG_GAIN	0x3118
-+#define IMX708_REG_SHT_ANALOG_GAIN	0x0216
-+
-+/*
-+ * Metadata buffer holds a variety of data, all sent with the same VC/DT (0x12).
-+ * It comprises two scanlines (of up to 5760 bytes each, for 4608 pixels)
-+ * of embedded data, one line of PDAF data, and two lines of AE-HIST data
-+ * (AE histograms are valid for HDR mode and empty in non-HDR modes).
-+ */
-+#define IMX708_EMBEDDED_LINE_WIDTH (5 * 5760)
-+#define IMX708_NUM_EMBEDDED_LINES 1
-+
-+enum pad_types {
-+	IMAGE_PAD,
-+	METADATA_PAD,
-+	NUM_PADS
-+};
-+
-+/* IMX708 native and active pixel array size. */
-+#define IMX708_NATIVE_WIDTH		4640U
-+#define IMX708_NATIVE_HEIGHT		2658U
-+#define IMX708_PIXEL_ARRAY_LEFT		16U
-+#define IMX708_PIXEL_ARRAY_TOP		24U
-+#define IMX708_PIXEL_ARRAY_WIDTH	4608U
-+#define IMX708_PIXEL_ARRAY_HEIGHT	2592U
-+
-+struct imx708_reg {
-+	u16 address;
-+	u8 val;
-+};
-+
-+struct imx708_reg_list {
-+	unsigned int num_of_regs;
-+	const struct imx708_reg *regs;
-+};
-+
-+/* Mode : resolution and related config&values */
-+struct imx708_mode {
-+	/* Frame width */
-+	unsigned int width;
-+
-+	/* Frame height */
-+	unsigned int height;
-+
-+	/* H-timing in pixels */
-+	unsigned int line_length_pix;
-+
-+	/* Analog crop rectangle. */
-+	struct v4l2_rect crop;
-+
-+	/* Highest possible framerate. */
-+	unsigned int vblank_min;
-+
-+	/* Default framerate. */
-+	unsigned int vblank_default;
-+
-+	/* Default register values */
-+	struct imx708_reg_list reg_list;
-+
-+	/* Not all modes have the same pixel rate. */
-+	u64 pixel_rate;
-+
-+	/* Not all modes have the same minimum exposure. */
-+	u32 exposure_lines_min;
-+
-+	/* Not all modes have the same exposure lines step. */
-+	u32 exposure_lines_step;
-+
-+	/* HDR flag, currently not used at runtime */
-+	bool hdr;
-+};
-+
-+/* Default PDAF pixel correction gains */
-+static const u8 pdaf_gains[2][9] = {
-+	{ 0x4c, 0x4c, 0x4c, 0x46, 0x3e, 0x38, 0x35, 0x35, 0x35 },
-+	{ 0x35, 0x35, 0x35, 0x38, 0x3e, 0x46, 0x4c, 0x4c, 0x4c }
-+};
-+
-+static const struct imx708_reg mode_common_regs[] = {
-+	{0x0100, 0x00},
-+	{0x0136, 0x18},
-+	{0x0137, 0x00},
-+	{0x33F0, 0x02},
-+	{0x33F1, 0x05},
-+	{0x3062, 0x00},
-+	{0x3063, 0x12},
-+	{0x3068, 0x00},
-+	{0x3069, 0x12},
-+	{0x306A, 0x00},
-+	{0x306B, 0x30},
-+	{0x3076, 0x00},
-+	{0x3077, 0x30},
-+	{0x3078, 0x00},
-+	{0x3079, 0x30},
-+	{0x5E54, 0x0C},
-+	{0x6E44, 0x00},
-+	{0xB0B6, 0x01},
-+	{0xE829, 0x00},
-+	{0xF001, 0x08},
-+	{0xF003, 0x08},
-+	{0xF00D, 0x10},
-+	{0xF00F, 0x10},
-+	{0xF031, 0x08},
-+	{0xF033, 0x08},
-+	{0xF03D, 0x10},
-+	{0xF03F, 0x10},
-+	{0x0112, 0x0A},
-+	{0x0113, 0x0A},
-+	{0x0114, 0x01},
-+	{0x0B8E, 0x01},
-+	{0x0B8F, 0x00},
-+	{0x0B94, 0x01},
-+	{0x0B95, 0x00},
-+	{0x3400, 0x01},
-+	{0x3478, 0x01},
-+	{0x3479, 0x1c},
-+	{0x3091, 0x01},
-+	{0x3092, 0x00},
-+	{0x3419, 0x00},
-+	{0xBCF1, 0x02},
-+	{0x3094, 0x01},
-+	{0x3095, 0x01},
-+	{0x3362, 0x00},
-+	{0x3363, 0x00},
-+	{0x3364, 0x00},
-+	{0x3365, 0x00},
-+	{0x0138, 0x01},
-+};
-+
-+/* 10-bit. */
-+static const struct imx708_reg mode_4608x2592_regs[] = {
-+	{0x0342, 0x3D},
-+	{0x0343, 0x20},
-+	{0x0340, 0x0A},
-+	{0x0341, 0x59},
-+	{0x0344, 0x00},
-+	{0x0345, 0x00},
-+	{0x0346, 0x00},
-+	{0x0347, 0x00},
-+	{0x0348, 0x11},
-+	{0x0349, 0xFF},
-+	{0x034A, 0X0A},
-+	{0x034B, 0x1F},
-+	{0x0220, 0x62},
-+	{0x0222, 0x01},
-+	{0x0900, 0x00},
-+	{0x0901, 0x11},
-+	{0x0902, 0x0A},
-+	{0x3200, 0x01},
-+	{0x3201, 0x01},
-+	{0x32D5, 0x01},
-+	{0x32D6, 0x00},
-+	{0x32DB, 0x01},
-+	{0x32DF, 0x00},
-+	{0x350C, 0x00},
-+	{0x350D, 0x00},
-+	{0x0408, 0x00},
-+	{0x0409, 0x00},
-+	{0x040A, 0x00},
-+	{0x040B, 0x00},
-+	{0x040C, 0x12},
-+	{0x040D, 0x00},
-+	{0x040E, 0x0A},
-+	{0x040F, 0x20},
-+	{0x034C, 0x12},
-+	{0x034D, 0x00},
-+	{0x034E, 0x0A},
-+	{0x034F, 0x20},
-+	{0x0301, 0x05},
-+	{0x0303, 0x02},
-+	{0x0305, 0x02},
-+	{0x0306, 0x00},
-+	{0x0307, 0x7C},
-+	{0x030B, 0x02},
-+	{0x030D, 0x04},
-+	{0x030E, 0x01},
-+	{0x030F, 0x2C},
-+	{0x0310, 0x01},
-+	{0x3CA0, 0x00},
-+	{0x3CA1, 0x64},
-+	{0x3CA4, 0x00},
-+	{0x3CA5, 0x00},
-+	{0x3CA6, 0x00},
-+	{0x3CA7, 0x00},
-+	{0x3CAA, 0x00},
-+	{0x3CAB, 0x00},
-+	{0x3CB8, 0x00},
-+	{0x3CB9, 0x08},
-+	{0x3CBA, 0x00},
-+	{0x3CBB, 0x00},
-+	{0x3CBC, 0x00},
-+	{0x3CBD, 0x3C},
-+	{0x3CBE, 0x00},
-+	{0x3CBF, 0x00},
-+	{0x0202, 0x0A},
-+	{0x0203, 0x29},
-+	{0x0224, 0x01},
-+	{0x0225, 0xF4},
-+	{0x3116, 0x01},
-+	{0x3117, 0xF4},
-+	{0x0204, 0x00},
-+	{0x0205, 0x00},
-+	{0x0216, 0x00},
-+	{0x0217, 0x00},
-+	{0x0218, 0x01},
-+	{0x0219, 0x00},
-+	{0x020E, 0x01},
-+	{0x020F, 0x00},
-+	{0x3118, 0x00},
-+	{0x3119, 0x00},
-+	{0x311A, 0x01},
-+	{0x311B, 0x00},
-+	{0x341a, 0x00},
-+	{0x341b, 0x00},
-+	{0x341c, 0x00},
-+	{0x341d, 0x00},
-+	{0x341e, 0x01},
-+	{0x341f, 0x20},
-+	{0x3420, 0x00},
-+	{0x3421, 0xd8},
-+	{0xC428, 0x00},
-+	{0xC429, 0x04},
-+	{0x3366, 0x00},
-+	{0x3367, 0x00},
-+	{0x3368, 0x00},
-+	{0x3369, 0x00},
-+};
-+
-+static const struct imx708_reg mode_2x2binned_regs[] = {
-+	{0x0342, 0x1E},
-+	{0x0343, 0x90},
-+	{0x0340, 0x05},
-+	{0x0341, 0x38},
-+	{0x0344, 0x00},
-+	{0x0345, 0x00},
-+	{0x0346, 0x00},
-+	{0x0347, 0x00},
-+	{0x0348, 0x11},
-+	{0x0349, 0xFF},
-+	{0x034A, 0X0A},
-+	{0x034B, 0x1F},
-+	{0x0220, 0x62},
-+	{0x0222, 0x01},
-+	{0x0900, 0x01},
-+	{0x0901, 0x22},
-+	{0x0902, 0x08},
-+	{0x3200, 0x41},
-+	{0x3201, 0x41},
-+	{0x32D5, 0x00},
-+	{0x32D6, 0x00},
-+	{0x32DB, 0x01},
-+	{0x32DF, 0x00},
-+	{0x350C, 0x00},
-+	{0x350D, 0x00},
-+	{0x0408, 0x00},
-+	{0x0409, 0x00},
-+	{0x040A, 0x00},
-+	{0x040B, 0x00},
-+	{0x040C, 0x09},
-+	{0x040D, 0x00},
-+	{0x040E, 0x05},
-+	{0x040F, 0x10},
-+	{0x034C, 0x09},
-+	{0x034D, 0x00},
-+	{0x034E, 0x05},
-+	{0x034F, 0x10},
-+	{0x0301, 0x05},
-+	{0x0303, 0x02},
-+	{0x0305, 0x02},
-+	{0x0306, 0x00},
-+	{0x0307, 0x7A},
-+	{0x030B, 0x02},
-+	{0x030D, 0x04},
-+	{0x030E, 0x01},
-+	{0x030F, 0x2C},
-+	{0x0310, 0x01},
-+	{0x3CA0, 0x00},
-+	{0x3CA1, 0x3C},
-+	{0x3CA4, 0x00},
-+	{0x3CA5, 0x3C},
-+	{0x3CA6, 0x00},
-+	{0x3CA7, 0x00},
-+	{0x3CAA, 0x00},
-+	{0x3CAB, 0x00},
-+	{0x3CB8, 0x00},
-+	{0x3CB9, 0x1C},
-+	{0x3CBA, 0x00},
-+	{0x3CBB, 0x08},
-+	{0x3CBC, 0x00},
-+	{0x3CBD, 0x1E},
-+	{0x3CBE, 0x00},
-+	{0x3CBF, 0x0A},
-+	{0x0202, 0x05},
-+	{0x0203, 0x08},
-+	{0x0224, 0x01},
-+	{0x0225, 0xF4},
-+	{0x3116, 0x01},
-+	{0x3117, 0xF4},
-+	{0x0204, 0x00},
-+	{0x0205, 0x70},
-+	{0x0216, 0x00},
-+	{0x0217, 0x70},
-+	{0x0218, 0x01},
-+	{0x0219, 0x00},
-+	{0x020E, 0x01},
-+	{0x020F, 0x00},
-+	{0x3118, 0x00},
-+	{0x3119, 0x70},
-+	{0x311A, 0x01},
-+	{0x311B, 0x00},
-+	{0x341a, 0x00},
-+	{0x341b, 0x00},
-+	{0x341c, 0x00},
-+	{0x341d, 0x00},
-+	{0x341e, 0x00},
-+	{0x341f, 0x90},
-+	{0x3420, 0x00},
-+	{0x3421, 0x6c},
-+	{0x3366, 0x00},
-+	{0x3367, 0x00},
-+	{0x3368, 0x00},
-+	{0x3369, 0x00},
-+};
-+
-+static const struct imx708_reg mode_2x2binned_720p_regs[] = {
-+	{0x0342, 0x14},
-+	{0x0343, 0x60},
-+	{0x0340, 0x04},
-+	{0x0341, 0xB6},
-+	{0x0344, 0x03},
-+	{0x0345, 0x00},
-+	{0x0346, 0x01},
-+	{0x0347, 0xB0},
-+	{0x0348, 0x0E},
-+	{0x0349, 0xFF},
-+	{0x034A, 0x08},
-+	{0x034B, 0x6F},
-+	{0x0220, 0x62},
-+	{0x0222, 0x01},
-+	{0x0900, 0x01},
-+	{0x0901, 0x22},
-+	{0x0902, 0x08},
-+	{0x3200, 0x41},
-+	{0x3201, 0x41},
-+	{0x32D5, 0x00},
-+	{0x32D6, 0x00},
-+	{0x32DB, 0x01},
-+	{0x32DF, 0x01},
-+	{0x350C, 0x00},
-+	{0x350D, 0x00},
-+	{0x0408, 0x00},
-+	{0x0409, 0x00},
-+	{0x040A, 0x00},
-+	{0x040B, 0x00},
-+	{0x040C, 0x06},
-+	{0x040D, 0x00},
-+	{0x040E, 0x03},
-+	{0x040F, 0x60},
-+	{0x034C, 0x06},
-+	{0x034D, 0x00},
-+	{0x034E, 0x03},
-+	{0x034F, 0x60},
-+	{0x0301, 0x05},
-+	{0x0303, 0x02},
-+	{0x0305, 0x02},
-+	{0x0306, 0x00},
-+	{0x0307, 0x76},
-+	{0x030B, 0x02},
-+	{0x030D, 0x04},
-+	{0x030E, 0x01},
-+	{0x030F, 0x2C},
-+	{0x0310, 0x01},
-+	{0x3CA0, 0x00},
-+	{0x3CA1, 0x3C},
-+	{0x3CA4, 0x01},
-+	{0x3CA5, 0x5E},
-+	{0x3CA6, 0x00},
-+	{0x3CA7, 0x00},
-+	{0x3CAA, 0x00},
-+	{0x3CAB, 0x00},
-+	{0x3CB8, 0x00},
-+	{0x3CB9, 0x0C},
-+	{0x3CBA, 0x00},
-+	{0x3CBB, 0x04},
-+	{0x3CBC, 0x00},
-+	{0x3CBD, 0x1E},
-+	{0x3CBE, 0x00},
-+	{0x3CBF, 0x05},
-+	{0x0202, 0x04},
-+	{0x0203, 0x86},
-+	{0x0224, 0x01},
-+	{0x0225, 0xF4},
-+	{0x3116, 0x01},
-+	{0x3117, 0xF4},
-+	{0x0204, 0x00},
-+	{0x0205, 0x70},
-+	{0x0216, 0x00},
-+	{0x0217, 0x70},
-+	{0x0218, 0x01},
-+	{0x0219, 0x00},
-+	{0x020E, 0x01},
-+	{0x020F, 0x00},
-+	{0x3118, 0x00},
-+	{0x3119, 0x70},
-+	{0x311A, 0x01},
-+	{0x311B, 0x00},
-+	{0x341a, 0x00},
-+	{0x341b, 0x00},
-+	{0x341c, 0x00},
-+	{0x341d, 0x00},
-+	{0x341e, 0x00},
-+	{0x341f, 0x60},
-+	{0x3420, 0x00},
-+	{0x3421, 0x48},
-+	{0x3366, 0x00},
-+	{0x3367, 0x00},
-+	{0x3368, 0x00},
-+	{0x3369, 0x00},
-+};
-+
-+static const struct imx708_reg mode_hdr_regs[] = {
-+	{0x0342, 0x14},
-+	{0x0343, 0x60},
-+	{0x0340, 0x0A},
-+	{0x0341, 0x5B},
-+	{0x0344, 0x00},
-+	{0x0345, 0x00},
-+	{0x0346, 0x00},
-+	{0x0347, 0x00},
-+	{0x0348, 0x11},
-+	{0x0349, 0xFF},
-+	{0x034A, 0X0A},
-+	{0x034B, 0x1F},
-+	{0x0220, 0x01},
-+	{0x0222, IMX708_HDR_EXPOSURE_RATIO},
-+	{0x0900, 0x00},
-+	{0x0901, 0x11},
-+	{0x0902, 0x0A},
-+	{0x3200, 0x01},
-+	{0x3201, 0x01},
-+	{0x32D5, 0x00},
-+	{0x32D6, 0x00},
-+	{0x32DB, 0x01},
-+	{0x32DF, 0x00},
-+	{0x350C, 0x00},
-+	{0x350D, 0x00},
-+	{0x0408, 0x00},
-+	{0x0409, 0x00},
-+	{0x040A, 0x00},
-+	{0x040B, 0x00},
-+	{0x040C, 0x09},
-+	{0x040D, 0x00},
-+	{0x040E, 0x05},
-+	{0x040F, 0x10},
-+	{0x034C, 0x09},
-+	{0x034D, 0x00},
-+	{0x034E, 0x05},
-+	{0x034F, 0x10},
-+	{0x0301, 0x05},
-+	{0x0303, 0x02},
-+	{0x0305, 0x02},
-+	{0x0306, 0x00},
-+	{0x0307, 0xA2},
-+	{0x030B, 0x02},
-+	{0x030D, 0x04},
-+	{0x030E, 0x01},
-+	{0x030F, 0x2C},
-+	{0x0310, 0x01},
-+	{0x3CA0, 0x00},
-+	{0x3CA1, 0x00},
-+	{0x3CA4, 0x00},
-+	{0x3CA5, 0x00},
-+	{0x3CA6, 0x00},
-+	{0x3CA7, 0x28},
-+	{0x3CAA, 0x00},
-+	{0x3CAB, 0x00},
-+	{0x3CB8, 0x00},
-+	{0x3CB9, 0x30},
-+	{0x3CBA, 0x00},
-+	{0x3CBB, 0x00},
-+	{0x3CBC, 0x00},
-+	{0x3CBD, 0x32},
-+	{0x3CBE, 0x00},
-+	{0x3CBF, 0x00},
-+	{0x0202, 0x0A},
-+	{0x0203, 0x2B},
-+	{0x0224, 0x0A},
-+	{0x0225, 0x2B},
-+	{0x3116, 0x0A},
-+	{0x3117, 0x2B},
-+	{0x0204, 0x00},
-+	{0x0205, 0x00},
-+	{0x0216, 0x00},
-+	{0x0217, 0x00},
-+	{0x0218, 0x01},
-+	{0x0219, 0x00},
-+	{0x020E, 0x01},
-+	{0x020F, 0x00},
-+	{0x3118, 0x00},
-+	{0x3119, 0x00},
-+	{0x311A, 0x01},
-+	{0x311B, 0x00},
-+	{0x341a, 0x00},
-+	{0x341b, 0x00},
-+	{0x341c, 0x00},
-+	{0x341d, 0x00},
-+	{0x341e, 0x00},
-+	{0x341f, 0x90},
-+	{0x3420, 0x00},
-+	{0x3421, 0x6c},
-+	{0x3360, 0x01},
-+	{0x3361, 0x01},
-+	{0x3366, 0x09},
-+	{0x3367, 0x00},
-+	{0x3368, 0x05},
-+	{0x3369, 0x10},
-+};
-+
-+/* Mode configs. Keep separate lists for when HDR is enabled or not. */
-+static const struct imx708_mode supported_modes_10bit_no_hdr[] = {
-+	{
-+		/* Full resolution. */
-+		.width = 4608,
-+		.height = 2592,
-+		.line_length_pix = 0x3d20,
-+		.crop = {
-+			.left = IMX708_PIXEL_ARRAY_LEFT,
-+			.top = IMX708_PIXEL_ARRAY_TOP,
-+			.width = 4608,
-+			.height = 2592,
-+		},
-+		.vblank_min = 58,
-+		.vblank_default = 58,
-+		.reg_list = {
-+			.num_of_regs = ARRAY_SIZE(mode_4608x2592_regs),
-+			.regs = mode_4608x2592_regs,
-+		},
-+		.pixel_rate = 595200000,
-+		.exposure_lines_min = 8,
-+		.exposure_lines_step = 1,
-+		.hdr = false
-+	},
-+	{
-+		/* regular 2x2 binned. */
-+		.width = 2304,
-+		.height = 1296,
-+		.line_length_pix = 0x1e90,
-+		.crop = {
-+			.left = IMX708_PIXEL_ARRAY_LEFT,
-+			.top = IMX708_PIXEL_ARRAY_TOP,
-+			.width = 4608,
-+			.height = 2592,
-+		},
-+		.vblank_min = 40,
-+		.vblank_default = 1198,
-+		.reg_list = {
-+			.num_of_regs = ARRAY_SIZE(mode_2x2binned_regs),
-+			.regs = mode_2x2binned_regs,
-+		},
-+		.pixel_rate = 585600000,
-+		.exposure_lines_min = 4,
-+		.exposure_lines_step = 2,
-+		.hdr = false
-+	},
-+	{
-+		/* 2x2 binned and cropped for 720p. */
-+		.width = 1536,
-+		.height = 864,
-+		.line_length_pix = 0x1460,
-+		.crop = {
-+			.left = IMX708_PIXEL_ARRAY_LEFT,
-+			.top = IMX708_PIXEL_ARRAY_TOP,
-+			.width = 4608,
-+			.height = 2592,
-+		},
-+		.vblank_min = 40,
-+		.vblank_default = 2755,
-+		.reg_list = {
-+			.num_of_regs = ARRAY_SIZE(mode_2x2binned_720p_regs),
-+			.regs = mode_2x2binned_720p_regs,
-+		},
-+		.pixel_rate = 566400000,
-+		.exposure_lines_min = 4,
-+		.exposure_lines_step = 2,
-+		.hdr = false
-+	},
-+};
-+
-+static const struct imx708_mode supported_modes_10bit_hdr[] = {
-+	{
-+		/* There's only one HDR mode, which is 2x2 downscaled */
-+		.width = 2304,
-+		.height = 1296,
-+		.line_length_pix = 0x1460,
-+		.crop = {
-+			.left = IMX708_PIXEL_ARRAY_LEFT,
-+			.top = IMX708_PIXEL_ARRAY_TOP,
-+			.width = 4608,
-+			.height = 2592,
-+		},
-+		.vblank_min = 3673,
-+		.vblank_default = 3673,
-+		.reg_list = {
-+			.num_of_regs = ARRAY_SIZE(mode_hdr_regs),
-+			.regs = mode_hdr_regs,
-+		},
-+		.pixel_rate = 777600000,
-+		.exposure_lines_min = 8 * IMX708_HDR_EXPOSURE_RATIO * IMX708_HDR_EXPOSURE_RATIO,
-+		.exposure_lines_step = 2 * IMX708_HDR_EXPOSURE_RATIO * IMX708_HDR_EXPOSURE_RATIO,
-+		.hdr = true
-+	}
-+};
-+
-+/*
-+ * The supported formats.
-+ * This table MUST contain 4 entries per format, to cover the various flip
-+ * combinations in the order
-+ * - no flip
-+ * - h flip
-+ * - v flip
-+ * - h&v flips
-+ */
-+static const u32 codes[] = {
-+	/* 10-bit modes. */
-+	MEDIA_BUS_FMT_SRGGB10_1X10,
-+	MEDIA_BUS_FMT_SGRBG10_1X10,
-+	MEDIA_BUS_FMT_SGBRG10_1X10,
-+	MEDIA_BUS_FMT_SBGGR10_1X10,
-+};
-+
-+static const char * const imx708_test_pattern_menu[] = {
-+	"Disabled",
-+	"Color Bars",
-+	"Solid Color",
-+	"Grey Color Bars",
-+	"PN9"
-+};
-+
-+static const int imx708_test_pattern_val[] = {
-+	IMX708_TEST_PATTERN_DISABLE,
-+	IMX708_TEST_PATTERN_COLOR_BARS,
-+	IMX708_TEST_PATTERN_SOLID_COLOR,
-+	IMX708_TEST_PATTERN_GREY_COLOR,
-+	IMX708_TEST_PATTERN_PN9,
-+};
-+
-+/* regulator supplies */
-+static const char * const imx708_supply_name[] = {
-+	/* Supplies can be enabled in any order */
-+	"VANA1",  /* Analog1 (2.8V) supply */
-+	"VANA2",  /* Analog2 (1.8V) supply */
-+	"VDIG",  /* Digital Core (1.1V) supply */
-+	"VDDL",  /* IF (1.8V) supply */
-+};
-+
-+#define IMX708_NUM_SUPPLIES ARRAY_SIZE(imx708_supply_name)
-+
-+/*
-+ * Initialisation delay between XCLR low->high and the moment when the sensor
-+ * can start capture (i.e. can leave software standby), given by T7 in the
-+ * datasheet is 8ms.  This does include I2C setup time as well.
-+ *
-+ * Note, that delay between XCLR low->high and reading the CCI ID register (T6
-+ * in the datasheet) is much smaller - 600us.
-+ */
-+#define IMX708_XCLR_MIN_DELAY_US	8000
-+#define IMX708_XCLR_DELAY_RANGE_US	1000
-+
-+struct imx708 {
-+	struct v4l2_subdev sd;
-+	struct media_pad pad[NUM_PADS];
-+
-+	struct v4l2_mbus_framefmt fmt;
-+
-+	struct clk *xclk;
-+	u32 xclk_freq;
-+
-+	struct gpio_desc *reset_gpio;
-+	struct regulator_bulk_data supplies[IMX708_NUM_SUPPLIES];
-+
-+	struct v4l2_ctrl_handler ctrl_handler;
-+	/* V4L2 Controls */
-+	struct v4l2_ctrl *pixel_rate;
-+	struct v4l2_ctrl *exposure;
-+	struct v4l2_ctrl *vflip;
-+	struct v4l2_ctrl *hflip;
-+	struct v4l2_ctrl *vblank;
-+	struct v4l2_ctrl *hblank;
-+	struct v4l2_ctrl *red_balance;
-+	struct v4l2_ctrl *blue_balance;
-+	struct v4l2_ctrl *notify_gains;
-+	struct v4l2_ctrl *hdr_mode;
-+
-+	/* Current mode */
-+	const struct imx708_mode *mode;
-+
-+	/*
-+	 * Mutex for serialized access:
-+	 * Protect sensor module set pad format and start/stop streaming safely.
-+	 */
-+	struct mutex mutex;
-+
-+	/* Streaming on/off */
-+	bool streaming;
-+
-+	/* Rewrite common registers on stream on? */
-+	bool common_regs_written;
-+};
-+
-+static inline struct imx708 *to_imx708(struct v4l2_subdev *_sd)
-+{
-+	return container_of(_sd, struct imx708, sd);
-+}
-+
-+static inline void get_mode_table(unsigned int code,
-+				  const struct imx708_mode **mode_list,
-+				  unsigned int *num_modes,
-+				  bool hdr_enable)
-+{
-+	switch (code) {
-+	/* 10-bit */
-+	case MEDIA_BUS_FMT_SRGGB10_1X10:
-+	case MEDIA_BUS_FMT_SGRBG10_1X10:
-+	case MEDIA_BUS_FMT_SGBRG10_1X10:
-+	case MEDIA_BUS_FMT_SBGGR10_1X10:
-+		if (hdr_enable) {
-+			*mode_list = supported_modes_10bit_hdr;
-+			*num_modes = ARRAY_SIZE(supported_modes_10bit_hdr);
-+		} else {
-+			*mode_list = supported_modes_10bit_no_hdr;
-+			*num_modes = ARRAY_SIZE(supported_modes_10bit_no_hdr);
-+		}
-+		break;
-+	default:
-+		*mode_list = NULL;
-+		*num_modes = 0;
-+	}
-+}
-+
-+/* Read registers up to 2 at a time */
-+static int imx708_read_reg(struct imx708 *imx708, u16 reg, u32 len, u32 *val)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&imx708->sd);
-+	struct i2c_msg msgs[2];
-+	u8 addr_buf[2] = { reg >> 8, reg & 0xff };
-+	u8 data_buf[4] = { 0, };
-+	int ret;
-+
-+	if (len > 4)
-+		return -EINVAL;
-+
-+	/* Write register address */
-+	msgs[0].addr = client->addr;
-+	msgs[0].flags = 0;
-+	msgs[0].len = ARRAY_SIZE(addr_buf);
-+	msgs[0].buf = addr_buf;
-+
-+	/* Read data from register */
-+	msgs[1].addr = client->addr;
-+	msgs[1].flags = I2C_M_RD;
-+	msgs[1].len = len;
-+	msgs[1].buf = &data_buf[4 - len];
-+
-+	ret = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
-+	if (ret != ARRAY_SIZE(msgs))
-+		return -EIO;
-+
-+	*val = get_unaligned_be32(data_buf);
-+
-+	return 0;
-+}
-+
-+/* Write registers up to 2 at a time */
-+static int imx708_write_reg(struct imx708 *imx708, u16 reg, u32 len, u32 val)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&imx708->sd);
-+	u8 buf[6];
-+
-+	if (len > 4)
-+		return -EINVAL;
-+
-+	put_unaligned_be16(reg, buf);
-+	put_unaligned_be32(val << (8 * (4 - len)), buf + 2);
-+	if (i2c_master_send(client, buf, len + 2) != len + 2)
-+		return -EIO;
-+
-+	return 0;
-+}
-+
-+/* Write a list of registers */
-+static int imx708_write_regs(struct imx708 *imx708,
-+			     const struct imx708_reg *regs, u32 len)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&imx708->sd);
-+	unsigned int i;
-+	int ret;
-+
-+	for (i = 0; i < len; i++) {
-+		ret = imx708_write_reg(imx708, regs[i].address, 1, regs[i].val);
-+		if (ret) {
-+			dev_err_ratelimited(&client->dev,
-+					    "Failed to write reg 0x%4.4x. error = %d\n",
-+					    regs[i].address, ret);
-+
-+			return ret;
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+/* Get bayer order based on flip setting. */
-+static u32 imx708_get_format_code(struct imx708 *imx708)
-+{
-+	unsigned int i;
-+
-+	lockdep_assert_held(&imx708->mutex);
-+
-+	i = (imx708->vflip->val ? 2 : 0) |
-+	    (imx708->hflip->val ? 1 : 0);
-+
-+	return codes[i];
-+}
-+
-+static void imx708_set_default_format(struct imx708 *imx708)
-+{
-+	struct v4l2_mbus_framefmt *fmt = &imx708->fmt;
-+
-+	/* Set default mode to max resolution */
-+	imx708->mode = &supported_modes_10bit_no_hdr[0];
-+
-+	/* fmt->code not set as it will always be computed based on flips */
-+	fmt->colorspace = V4L2_COLORSPACE_RAW;
-+	fmt->ycbcr_enc = V4L2_MAP_YCBCR_ENC_DEFAULT(fmt->colorspace);
-+	fmt->quantization = V4L2_MAP_QUANTIZATION_DEFAULT(true,
-+							  fmt->colorspace,
-+							  fmt->ycbcr_enc);
-+	fmt->xfer_func = V4L2_MAP_XFER_FUNC_DEFAULT(fmt->colorspace);
-+	fmt->width = imx708->mode->width;
-+	fmt->height = imx708->mode->height;
-+	fmt->field = V4L2_FIELD_NONE;
-+}
-+
-+static int imx708_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
-+{
-+	struct imx708 *imx708 = to_imx708(sd);
-+	struct v4l2_mbus_framefmt *try_fmt_img =
-+		v4l2_subdev_get_try_format(sd, fh->state, IMAGE_PAD);
-+	struct v4l2_mbus_framefmt *try_fmt_meta =
-+		v4l2_subdev_get_try_format(sd, fh->state, METADATA_PAD);
-+	struct v4l2_rect *try_crop;
-+
-+	mutex_lock(&imx708->mutex);
-+
-+	/* Initialize try_fmt for the image pad */
-+	if (imx708->hdr_mode->val) {
-+		try_fmt_img->width = supported_modes_10bit_hdr[0].width;
-+		try_fmt_img->height = supported_modes_10bit_hdr[0].height;
-+	} else {
-+		try_fmt_img->width = supported_modes_10bit_no_hdr[0].width;
-+		try_fmt_img->height = supported_modes_10bit_no_hdr[0].height;
-+	}
-+	try_fmt_img->code = imx708_get_format_code(imx708);
-+	try_fmt_img->field = V4L2_FIELD_NONE;
-+
-+	/* Initialize try_fmt for the embedded metadata pad */
-+	try_fmt_meta->width = IMX708_EMBEDDED_LINE_WIDTH;
-+	try_fmt_meta->height = IMX708_NUM_EMBEDDED_LINES;
-+	try_fmt_meta->code = MEDIA_BUS_FMT_SENSOR_DATA;
-+	try_fmt_meta->field = V4L2_FIELD_NONE;
-+
-+	/* Initialize try_crop */
-+	try_crop = v4l2_subdev_get_try_crop(sd, fh->state, IMAGE_PAD);
-+	try_crop->left = IMX708_PIXEL_ARRAY_LEFT;
-+	try_crop->top = IMX708_PIXEL_ARRAY_TOP;
-+	try_crop->width = IMX708_PIXEL_ARRAY_WIDTH;
-+	try_crop->height = IMX708_PIXEL_ARRAY_HEIGHT;
-+
-+	mutex_unlock(&imx708->mutex);
-+
-+	return 0;
-+}
-+
-+static int imx708_set_exposure(struct imx708 *imx708, unsigned int val)
-+{
-+	int ret;
-+
-+	val = max(val, imx708->mode->exposure_lines_min);
-+	val -= val % imx708->mode->exposure_lines_step;
-+
-+	/*
-+	 * In HDR mode this will set the longest exposure. The sensor
-+	 * will automatically divide the medium and short ones by 4,16.
-+	 */
-+	ret = imx708_write_reg(imx708, IMX708_REG_EXPOSURE,
-+			       IMX708_REG_VALUE_16BIT, val);
-+
-+	return ret;
-+}
-+
-+static void imx708_adjust_exposure_range(struct imx708 *imx708,
-+					 struct v4l2_ctrl *ctrl)
-+{
-+	int exposure_max, exposure_def;
-+
-+	/* Honour the VBLANK limits when setting exposure. */
-+	exposure_max = imx708->mode->height + imx708->vblank->val -
-+		IMX708_EXPOSURE_OFFSET;
-+	exposure_def = min(exposure_max, imx708->exposure->val);
-+	__v4l2_ctrl_modify_range(imx708->exposure, imx708->exposure->minimum,
-+				 exposure_max, imx708->exposure->step,
-+				 exposure_def);
-+}
-+
-+static int imx708_set_analogue_gain(struct imx708 *imx708, unsigned int val)
-+{
-+	int ret;
-+
-+	/*
-+	 * In HDR mode this will set the gain for the longest exposure,
-+	 * and by default the sensor uses the same gain for all of them.
-+	 */
-+	ret = imx708_write_reg(imx708, IMX708_REG_ANALOG_GAIN,
-+			       IMX708_REG_VALUE_16BIT, val);
-+
-+	return ret;
-+}
-+
-+static void imx708_set_framing_limits(struct imx708 *imx708)
-+{
-+	unsigned int hblank;
-+	const struct imx708_mode *mode = imx708->mode;
-+
-+	__v4l2_ctrl_modify_range(imx708->pixel_rate,
-+				 mode->pixel_rate, mode->pixel_rate,
-+				 1, mode->pixel_rate);
-+
-+	/* Update limits and set FPS to default */
-+	__v4l2_ctrl_modify_range(imx708->vblank, mode->vblank_min,
-+				 IMX708_FRAME_LENGTH_MAX - mode->height,
-+				 1, mode->vblank_default);
-+
-+	/*
-+	 * Currently PPL is fixed to the mode specified value, so hblank
-+	 * depends on mode->width only, and is not changeable in any
-+	 * way other than changing the mode.
-+	 */
-+	hblank = mode->line_length_pix - mode->width;
-+	__v4l2_ctrl_modify_range(imx708->hblank, hblank, hblank, 1, hblank);
-+}
-+
-+static int imx708_set_ctrl(struct v4l2_ctrl *ctrl)
-+{
-+	struct imx708 *imx708 =
-+		container_of(ctrl->handler, struct imx708, ctrl_handler);
-+	struct i2c_client *client = v4l2_get_subdevdata(&imx708->sd);
-+	const struct imx708_mode *mode_list;
-+	unsigned int code, num_modes;
-+	int ret = 0;
-+
-+	/*
-+	 * The VBLANK control may change the limits of usable exposure, so check
-+	 * and adjust if necessary.
-+	 */
-+	if (ctrl->id == V4L2_CID_VBLANK)
-+		imx708_adjust_exposure_range(imx708, ctrl);
-+
-+	/*
-+	 * Applying V4L2 control value only happens
-+	 * when power is up for streaming
-+	 */
-+	if (pm_runtime_get_if_in_use(&client->dev) == 0)
-+		return 0;
-+
-+	switch (ctrl->id) {
-+	case V4L2_CID_ANALOGUE_GAIN:
-+		imx708_set_analogue_gain(imx708, ctrl->val);
-+		break;
-+	case V4L2_CID_EXPOSURE:
-+		ret = imx708_set_exposure(imx708, ctrl->val);
-+		break;
-+	case V4L2_CID_DIGITAL_GAIN:
-+		ret = imx708_write_reg(imx708, IMX708_REG_DIGITAL_GAIN,
-+				       IMX708_REG_VALUE_16BIT, ctrl->val);
-+		break;
-+	case V4L2_CID_TEST_PATTERN:
-+		ret = imx708_write_reg(imx708, IMX708_REG_TEST_PATTERN,
-+				       IMX708_REG_VALUE_16BIT,
-+				       imx708_test_pattern_val[ctrl->val]);
-+		break;
-+	case V4L2_CID_TEST_PATTERN_RED:
-+		ret = imx708_write_reg(imx708, IMX708_REG_TEST_PATTERN_R,
-+				       IMX708_REG_VALUE_16BIT, ctrl->val);
-+		break;
-+	case V4L2_CID_TEST_PATTERN_GREENR:
-+		ret = imx708_write_reg(imx708, IMX708_REG_TEST_PATTERN_GR,
-+				       IMX708_REG_VALUE_16BIT, ctrl->val);
-+		break;
-+	case V4L2_CID_TEST_PATTERN_BLUE:
-+		ret = imx708_write_reg(imx708, IMX708_REG_TEST_PATTERN_B,
-+				       IMX708_REG_VALUE_16BIT, ctrl->val);
-+		break;
-+	case V4L2_CID_TEST_PATTERN_GREENB:
-+		ret = imx708_write_reg(imx708, IMX708_REG_TEST_PATTERN_GB,
-+				       IMX708_REG_VALUE_16BIT, ctrl->val);
-+		break;
-+	case V4L2_CID_HFLIP:
-+	case V4L2_CID_VFLIP:
-+		ret = imx708_write_reg(imx708, IMX708_REG_ORIENTATION, 1,
-+				       imx708->hflip->val |
-+				       imx708->vflip->val << 1);
-+		break;
-+	case V4L2_CID_VBLANK:
-+		ret = imx708_write_reg(imx708, IMX708_REG_FRAME_LENGTH,
-+				       IMX708_REG_VALUE_16BIT,
-+				       imx708->mode->height + ctrl->val);
-+		break;
-+	case V4L2_CID_NOTIFY_GAINS:
-+		ret = imx708_write_reg(imx708, IMX708_REG_COLOUR_BALANCE_BLUE,
-+				       IMX708_REG_VALUE_16BIT,
-+				       imx708->notify_gains->p_new.p_u32[0]);
-+		if (ret)
-+			break;
-+		ret = imx708_write_reg(imx708, IMX708_REG_COLOUR_BALANCE_RED,
-+				       IMX708_REG_VALUE_16BIT,
-+				       imx708->notify_gains->p_new.p_u32[3]);
-+		break;
-+	case V4L2_CID_WIDE_DYNAMIC_RANGE:
-+		code = imx708_get_format_code(imx708);
-+		get_mode_table(code, &mode_list, &num_modes, ctrl->val);
-+		imx708->mode = v4l2_find_nearest_size(mode_list,
-+						      num_modes,
-+						      width, height,
-+						      imx708->mode->width,
-+						      imx708->mode->height);
-+		imx708_set_framing_limits(imx708);
-+		break;
-+	default:
-+		dev_info(&client->dev,
-+			 "ctrl(id:0x%x,val:0x%x) is not handled\n",
-+			 ctrl->id, ctrl->val);
-+		ret = -EINVAL;
-+		break;
-+	}
-+
-+	pm_runtime_put(&client->dev);
-+
-+	return ret;
-+}
-+
-+static const struct v4l2_ctrl_ops imx708_ctrl_ops = {
-+	.s_ctrl = imx708_set_ctrl,
-+};
-+
-+static int imx708_enum_mbus_code(struct v4l2_subdev *sd,
-+				 struct v4l2_subdev_state *sd_state,
-+				 struct v4l2_subdev_mbus_code_enum *code)
-+{
-+	struct imx708 *imx708 = to_imx708(sd);
-+
-+	if (code->pad >= NUM_PADS)
-+		return -EINVAL;
-+
-+	if (code->pad == IMAGE_PAD) {
-+		if (code->index >= (ARRAY_SIZE(codes) / 4))
-+			return -EINVAL;
-+
-+		code->code = imx708_get_format_code(imx708);
-+	} else {
-+		if (code->index > 0)
-+			return -EINVAL;
-+
-+		code->code = MEDIA_BUS_FMT_SENSOR_DATA;
-+	}
-+
-+	return 0;
-+}
-+
-+static int imx708_enum_frame_size(struct v4l2_subdev *sd,
-+				  struct v4l2_subdev_state *sd_state,
-+				  struct v4l2_subdev_frame_size_enum *fse)
-+{
-+	struct imx708 *imx708 = to_imx708(sd);
-+
-+	if (fse->pad >= NUM_PADS)
-+		return -EINVAL;
-+
-+	if (fse->pad == IMAGE_PAD) {
-+		const struct imx708_mode *mode_list;
-+		unsigned int num_modes;
-+
-+		get_mode_table(fse->code, &mode_list, &num_modes,
-+			       imx708->hdr_mode->val);
-+
-+		if (fse->index >= num_modes)
-+			return -EINVAL;
-+
-+		if (fse->code != imx708_get_format_code(imx708))
-+			return -EINVAL;
-+
-+		fse->min_width = mode_list[fse->index].width;
-+		fse->max_width = fse->min_width;
-+		fse->min_height = mode_list[fse->index].height;
-+		fse->max_height = fse->min_height;
-+	} else {
-+		if (fse->code != MEDIA_BUS_FMT_SENSOR_DATA || fse->index > 0)
-+			return -EINVAL;
-+
-+		fse->min_width = IMX708_EMBEDDED_LINE_WIDTH;
-+		fse->max_width = fse->min_width;
-+		fse->min_height = IMX708_NUM_EMBEDDED_LINES;
-+		fse->max_height = fse->min_height;
-+	}
-+
-+	return 0;
-+}
-+
-+static void imx708_reset_colorspace(struct v4l2_mbus_framefmt *fmt)
-+{
-+	fmt->colorspace = V4L2_COLORSPACE_RAW;
-+	fmt->ycbcr_enc = V4L2_MAP_YCBCR_ENC_DEFAULT(fmt->colorspace);
-+	fmt->quantization = V4L2_MAP_QUANTIZATION_DEFAULT(true,
-+							  fmt->colorspace,
-+							  fmt->ycbcr_enc);
-+	fmt->xfer_func = V4L2_MAP_XFER_FUNC_DEFAULT(fmt->colorspace);
-+}
-+
-+static void imx708_update_image_pad_format(struct imx708 *imx708,
-+					   const struct imx708_mode *mode,
-+					   struct v4l2_subdev_format *fmt)
-+{
-+	fmt->format.width = mode->width;
-+	fmt->format.height = mode->height;
-+	fmt->format.field = V4L2_FIELD_NONE;
-+	imx708_reset_colorspace(&fmt->format);
-+}
-+
-+static void imx708_update_metadata_pad_format(struct v4l2_subdev_format *fmt)
-+{
-+	fmt->format.width = IMX708_EMBEDDED_LINE_WIDTH;
-+	fmt->format.height = IMX708_NUM_EMBEDDED_LINES;
-+	fmt->format.code = MEDIA_BUS_FMT_SENSOR_DATA;
-+	fmt->format.field = V4L2_FIELD_NONE;
-+}
-+
-+static int imx708_get_pad_format(struct v4l2_subdev *sd,
-+				 struct v4l2_subdev_state *sd_state,
-+				 struct v4l2_subdev_format *fmt)
-+{
-+	struct imx708 *imx708 = to_imx708(sd);
-+
-+	if (fmt->pad >= NUM_PADS)
-+		return -EINVAL;
-+
-+	mutex_lock(&imx708->mutex);
-+
-+	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-+		struct v4l2_mbus_framefmt *try_fmt =
-+			v4l2_subdev_get_try_format(&imx708->sd, sd_state,
-+						   fmt->pad);
-+		/* update the code which could change due to vflip or hflip */
-+		try_fmt->code = fmt->pad == IMAGE_PAD ?
-+				imx708_get_format_code(imx708) :
-+				MEDIA_BUS_FMT_SENSOR_DATA;
-+		fmt->format = *try_fmt;
-+	} else {
-+		if (fmt->pad == IMAGE_PAD) {
-+			imx708_update_image_pad_format(imx708, imx708->mode,
-+						       fmt);
-+			fmt->format.code = imx708_get_format_code(imx708);
-+		} else {
-+			imx708_update_metadata_pad_format(fmt);
-+		}
-+	}
-+
-+	mutex_unlock(&imx708->mutex);
-+	return 0;
-+}
-+
-+static int imx708_set_pad_format(struct v4l2_subdev *sd,
-+				 struct v4l2_subdev_state *sd_state,
-+				 struct v4l2_subdev_format *fmt)
-+{
-+	struct v4l2_mbus_framefmt *framefmt;
-+	const struct imx708_mode *mode;
-+	struct imx708 *imx708 = to_imx708(sd);
-+
-+	if (fmt->pad >= NUM_PADS)
-+		return -EINVAL;
-+
-+	mutex_lock(&imx708->mutex);
-+
-+	if (fmt->pad == IMAGE_PAD) {
-+		const struct imx708_mode *mode_list;
-+		unsigned int num_modes;
-+
-+		/* Bayer order varies with flips */
-+		fmt->format.code = imx708_get_format_code(imx708);
-+
-+		get_mode_table(fmt->format.code, &mode_list, &num_modes,
-+			       imx708->hdr_mode->val);
-+
-+		mode = v4l2_find_nearest_size(mode_list,
-+					      num_modes,
-+					      width, height,
-+					      fmt->format.width,
-+					      fmt->format.height);
-+		imx708_update_image_pad_format(imx708, mode, fmt);
-+		if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-+			framefmt = v4l2_subdev_get_try_format(sd, sd_state,
-+							      fmt->pad);
-+			*framefmt = fmt->format;
-+		} else {
-+			imx708->mode = mode;
-+			imx708_set_framing_limits(imx708);
-+		}
-+	} else {
-+		if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-+			framefmt = v4l2_subdev_get_try_format(sd, sd_state,
-+							      fmt->pad);
-+			*framefmt = fmt->format;
-+		} else {
-+			/* Only one embedded data mode is supported */
-+			imx708_update_metadata_pad_format(fmt);
-+		}
-+	}
-+
-+	mutex_unlock(&imx708->mutex);
-+
-+	return 0;
-+}
-+
-+static const struct v4l2_rect *
-+__imx708_get_pad_crop(struct imx708 *imx708, struct v4l2_subdev_state *sd_state,
-+		      unsigned int pad, enum v4l2_subdev_format_whence which)
-+{
-+	switch (which) {
-+	case V4L2_SUBDEV_FORMAT_TRY:
-+		return v4l2_subdev_get_try_crop(&imx708->sd, sd_state, pad);
-+	case V4L2_SUBDEV_FORMAT_ACTIVE:
-+		return &imx708->mode->crop;
-+	}
-+
-+	return NULL;
-+}
-+
-+static int imx708_get_selection(struct v4l2_subdev *sd,
-+				struct v4l2_subdev_state *sd_state,
-+				struct v4l2_subdev_selection *sel)
-+{
-+	switch (sel->target) {
-+	case V4L2_SEL_TGT_CROP: {
-+		struct imx708 *imx708 = to_imx708(sd);
-+
-+		mutex_lock(&imx708->mutex);
-+		sel->r = *__imx708_get_pad_crop(imx708, sd_state, sel->pad,
-+						sel->which);
-+		mutex_unlock(&imx708->mutex);
-+
-+		return 0;
-+	}
-+
-+	case V4L2_SEL_TGT_NATIVE_SIZE:
-+		sel->r.left = 0;
-+		sel->r.top = 0;
-+		sel->r.width = IMX708_NATIVE_WIDTH;
-+		sel->r.height = IMX708_NATIVE_HEIGHT;
-+
-+		return 0;
-+
-+	case V4L2_SEL_TGT_CROP_DEFAULT:
-+	case V4L2_SEL_TGT_CROP_BOUNDS:
-+		sel->r.left = IMX708_PIXEL_ARRAY_LEFT;
-+		sel->r.top = IMX708_PIXEL_ARRAY_TOP;
-+		sel->r.width = IMX708_PIXEL_ARRAY_WIDTH;
-+		sel->r.height = IMX708_PIXEL_ARRAY_HEIGHT;
-+
-+		return 0;
-+	}
-+
-+	return -EINVAL;
-+}
-+
-+/* Start streaming */
-+static int imx708_start_streaming(struct imx708 *imx708)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&imx708->sd);
-+	const struct imx708_reg_list *reg_list;
-+	int i, ret;
-+	u32 val;
-+
-+	if (!imx708->common_regs_written) {
-+		ret = imx708_write_regs(imx708, mode_common_regs,
-+					ARRAY_SIZE(mode_common_regs));
-+		if (ret) {
-+			dev_err(&client->dev, "%s failed to set common settings\n",
-+				__func__);
-+			return ret;
-+		}
-+
-+		ret = imx708_read_reg(imx708, IMX708_REG_BASE_SPC_GAINS_L,
-+				      IMX708_REG_VALUE_08BIT, &val);
-+		if (ret == 0 && val == 0x40) {
-+			for (i = 0; i < 54 && ret == 0; i++) {
-+				ret = imx708_write_reg(imx708,
-+						       IMX708_REG_BASE_SPC_GAINS_L + i,
-+						       IMX708_REG_VALUE_08BIT,
-+						       pdaf_gains[0][i % 9]);
-+			}
-+			for (i = 0; i < 54 && ret == 0; i++) {
-+				ret = imx708_write_reg(imx708,
-+						       IMX708_REG_BASE_SPC_GAINS_R + i,
-+						       IMX708_REG_VALUE_08BIT,
-+						       pdaf_gains[1][i % 9]);
-+			}
-+		}
-+		if (ret) {
-+			dev_err(&client->dev, "%s failed to set PDAF gains\n",
-+				__func__);
-+			return ret;
-+		}
-+
-+		imx708->common_regs_written = true;
-+	}
-+
-+	/* Apply default values of current mode */
-+	reg_list = &imx708->mode->reg_list;
-+	ret = imx708_write_regs(imx708, reg_list->regs, reg_list->num_of_regs);
-+	if (ret) {
-+		dev_err(&client->dev, "%s failed to set mode\n", __func__);
-+		return ret;
-+	}
-+
-+	/* Apply customized values from user */
-+	ret =  __v4l2_ctrl_handler_setup(imx708->sd.ctrl_handler);
-+	if (ret)
-+		return ret;
-+
-+	/* set stream on register */
-+	return imx708_write_reg(imx708, IMX708_REG_MODE_SELECT,
-+				IMX708_REG_VALUE_08BIT, IMX708_MODE_STREAMING);
-+}
-+
-+/* Stop streaming */
-+static void imx708_stop_streaming(struct imx708 *imx708)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&imx708->sd);
-+	int ret;
-+
-+	/* set stream off register */
-+	ret = imx708_write_reg(imx708, IMX708_REG_MODE_SELECT,
-+			       IMX708_REG_VALUE_08BIT, IMX708_MODE_STANDBY);
-+	if (ret)
-+		dev_err(&client->dev, "%s failed to set stream\n", __func__);
-+}
-+
-+static int imx708_set_stream(struct v4l2_subdev *sd, int enable)
-+{
-+	struct imx708 *imx708 = to_imx708(sd);
-+	struct i2c_client *client = v4l2_get_subdevdata(sd);
-+	int ret = 0;
-+
-+	mutex_lock(&imx708->mutex);
-+	if (imx708->streaming == enable) {
-+		mutex_unlock(&imx708->mutex);
-+		return 0;
-+	}
-+
-+	if (enable) {
-+		ret = pm_runtime_get_sync(&client->dev);
-+		if (ret < 0) {
-+			pm_runtime_put_noidle(&client->dev);
-+			goto err_unlock;
-+		}
-+
-+		/*
-+		 * Apply default & customized values
-+		 * and then start streaming.
-+		 */
-+		ret = imx708_start_streaming(imx708);
-+		if (ret)
-+			goto err_rpm_put;
-+	} else {
-+		imx708_stop_streaming(imx708);
-+		pm_runtime_put(&client->dev);
-+	}
-+
-+	imx708->streaming = enable;
-+
-+	/* vflip/hflip and hdr mode cannot change during streaming */
-+	__v4l2_ctrl_grab(imx708->vflip, enable);
-+	__v4l2_ctrl_grab(imx708->hflip, enable);
-+	__v4l2_ctrl_grab(imx708->hdr_mode, enable);
-+
-+	mutex_unlock(&imx708->mutex);
-+
-+	return ret;
-+
-+err_rpm_put:
-+	pm_runtime_put(&client->dev);
-+err_unlock:
-+	mutex_unlock(&imx708->mutex);
-+
-+	return ret;
-+}
-+
-+/* Power/clock management functions */
-+static int imx708_power_on(struct device *dev)
-+{
-+	struct i2c_client *client = to_i2c_client(dev);
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct imx708 *imx708 = to_imx708(sd);
-+	int ret;
-+
-+	ret = regulator_bulk_enable(IMX708_NUM_SUPPLIES,
-+				    imx708->supplies);
-+	if (ret) {
-+		dev_err(&client->dev, "%s: failed to enable regulators\n",
-+			__func__);
-+		return ret;
-+	}
-+
-+	ret = clk_prepare_enable(imx708->xclk);
-+	if (ret) {
-+		dev_err(&client->dev, "%s: failed to enable clock\n",
-+			__func__);
-+		goto reg_off;
-+	}
-+
-+	gpiod_set_value_cansleep(imx708->reset_gpio, 1);
-+	usleep_range(IMX708_XCLR_MIN_DELAY_US,
-+		     IMX708_XCLR_MIN_DELAY_US + IMX708_XCLR_DELAY_RANGE_US);
-+
-+	return 0;
-+
-+reg_off:
-+	regulator_bulk_disable(IMX708_NUM_SUPPLIES, imx708->supplies);
-+	return ret;
-+}
-+
-+static int imx708_power_off(struct device *dev)
-+{
-+	struct i2c_client *client = to_i2c_client(dev);
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct imx708 *imx708 = to_imx708(sd);
-+
-+	gpiod_set_value_cansleep(imx708->reset_gpio, 0);
-+	regulator_bulk_disable(IMX708_NUM_SUPPLIES, imx708->supplies);
-+	clk_disable_unprepare(imx708->xclk);
-+
-+	/* Force reprogramming of the common registers when powered up again. */
-+	imx708->common_regs_written = false;
-+
-+	return 0;
-+}
-+
-+static int __maybe_unused imx708_suspend(struct device *dev)
-+{
-+	struct i2c_client *client = to_i2c_client(dev);
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct imx708 *imx708 = to_imx708(sd);
-+
-+	if (imx708->streaming)
-+		imx708_stop_streaming(imx708);
-+
-+	return 0;
-+}
-+
-+static int __maybe_unused imx708_resume(struct device *dev)
-+{
-+	struct i2c_client *client = to_i2c_client(dev);
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct imx708 *imx708 = to_imx708(sd);
-+	int ret;
-+
-+	if (imx708->streaming) {
-+		ret = imx708_start_streaming(imx708);
-+		if (ret)
-+			goto error;
-+	}
-+
-+	return 0;
-+
-+error:
-+	imx708_stop_streaming(imx708);
-+	imx708->streaming = 0;
-+	return ret;
-+}
-+
-+static int imx708_get_regulators(struct imx708 *imx708)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&imx708->sd);
-+	unsigned int i;
-+
-+	for (i = 0; i < IMX708_NUM_SUPPLIES; i++)
-+		imx708->supplies[i].supply = imx708_supply_name[i];
-+
-+	return devm_regulator_bulk_get(&client->dev,
-+				       IMX708_NUM_SUPPLIES,
-+				       imx708->supplies);
-+}
-+
-+/* Verify chip ID */
-+static int imx708_identify_module(struct imx708 *imx708)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&imx708->sd);
-+	int ret;
-+	u32 val;
-+
-+	ret = imx708_read_reg(imx708, IMX708_REG_CHIP_ID,
-+			      IMX708_REG_VALUE_16BIT, &val);
-+	if (ret) {
-+		dev_err(&client->dev, "failed to read chip id %x, with error %d\n",
-+			IMX708_CHIP_ID, ret);
-+		return ret;
-+	}
-+
-+	if (val != IMX708_CHIP_ID) {
-+		dev_err(&client->dev, "chip id mismatch: %x!=%x\n",
-+			IMX708_CHIP_ID, val);
-+		return -EIO;
-+	}
-+
-+	ret = imx708_read_reg(imx708, 0x0000, IMX708_REG_VALUE_16BIT, &val);
-+	if (!ret) {
-+		dev_info(&client->dev, "camera module ID 0x%04x\n", val);
-+		snprintf(imx708->sd.name, sizeof(imx708->sd.name), "imx708%s%s",
-+			 val & 0x02 ? "_wide" : "",
-+			 val & 0x80 ? "_noir" : "");
-+	}
-+
-+	return 0;
-+}
-+
-+static const struct v4l2_subdev_core_ops imx708_core_ops = {
-+	.subscribe_event = v4l2_ctrl_subdev_subscribe_event,
-+	.unsubscribe_event = v4l2_event_subdev_unsubscribe,
-+};
-+
-+static const struct v4l2_subdev_video_ops imx708_video_ops = {
-+	.s_stream = imx708_set_stream,
-+};
-+
-+static const struct v4l2_subdev_pad_ops imx708_pad_ops = {
-+	.enum_mbus_code = imx708_enum_mbus_code,
-+	.get_fmt = imx708_get_pad_format,
-+	.set_fmt = imx708_set_pad_format,
-+	.get_selection = imx708_get_selection,
-+	.enum_frame_size = imx708_enum_frame_size,
-+};
-+
-+static const struct v4l2_subdev_ops imx708_subdev_ops = {
-+	.core = &imx708_core_ops,
-+	.video = &imx708_video_ops,
-+	.pad = &imx708_pad_ops,
-+};
-+
-+static const struct v4l2_subdev_internal_ops imx708_internal_ops = {
-+	.open = imx708_open,
-+};
-+
-+static const struct v4l2_ctrl_config imx708_notify_gains_ctrl = {
-+	.ops = &imx708_ctrl_ops,
-+	.id = V4L2_CID_NOTIFY_GAINS,
-+	.type = V4L2_CTRL_TYPE_U32,
-+	.min = IMX708_COLOUR_BALANCE_MIN,
-+	.max = IMX708_COLOUR_BALANCE_MAX,
-+	.step = IMX708_COLOUR_BALANCE_STEP,
-+	.def = IMX708_COLOUR_BALANCE_DEFAULT,
-+	.dims = { 4 },
-+	.elem_size = sizeof(u32),
-+};
-+
-+/* Initialize control handlers */
-+static int imx708_init_controls(struct imx708 *imx708)
-+{
-+	struct v4l2_ctrl_handler *ctrl_hdlr;
-+	struct i2c_client *client = v4l2_get_subdevdata(&imx708->sd);
-+	struct v4l2_fwnode_device_properties props;
-+	unsigned int i;
-+	int ret;
-+
-+	ctrl_hdlr = &imx708->ctrl_handler;
-+	ret = v4l2_ctrl_handler_init(ctrl_hdlr, 16);
-+	if (ret)
-+		return ret;
-+
-+	mutex_init(&imx708->mutex);
-+	ctrl_hdlr->lock = &imx708->mutex;
-+
-+	/* By default, PIXEL_RATE is read only */
-+	imx708->pixel_rate = v4l2_ctrl_new_std(ctrl_hdlr, &imx708_ctrl_ops,
-+					       V4L2_CID_PIXEL_RATE,
-+					       IMX708_INITIAL_PIXEL_RATE,
-+					       IMX708_INITIAL_PIXEL_RATE, 1,
-+					       IMX708_INITIAL_PIXEL_RATE);
-+
-+	/*
-+	 * Create the controls here, but mode specific limits are setup
-+	 * in the imx708_set_framing_limits() call below.
-+	 */
-+	imx708->vblank = v4l2_ctrl_new_std(ctrl_hdlr, &imx708_ctrl_ops,
-+					   V4L2_CID_VBLANK, 0, 0xffff, 1, 0);
-+	imx708->hblank = v4l2_ctrl_new_std(ctrl_hdlr, &imx708_ctrl_ops,
-+					   V4L2_CID_HBLANK, 0, 0xffff, 1, 0);
-+
-+	imx708->exposure = v4l2_ctrl_new_std(ctrl_hdlr, &imx708_ctrl_ops,
-+					     V4L2_CID_EXPOSURE,
-+					     IMX708_EXPOSURE_MIN,
-+					     IMX708_EXPOSURE_MAX,
-+					     IMX708_EXPOSURE_STEP,
-+					     IMX708_EXPOSURE_DEFAULT);
-+
-+	v4l2_ctrl_new_std(ctrl_hdlr, &imx708_ctrl_ops, V4L2_CID_ANALOGUE_GAIN,
-+			  IMX708_ANA_GAIN_MIN, IMX708_ANA_GAIN_MAX,
-+			  IMX708_ANA_GAIN_STEP, IMX708_ANA_GAIN_DEFAULT);
-+
-+	v4l2_ctrl_new_std(ctrl_hdlr, &imx708_ctrl_ops, V4L2_CID_DIGITAL_GAIN,
-+			  IMX708_DGTL_GAIN_MIN, IMX708_DGTL_GAIN_MAX,
-+			  IMX708_DGTL_GAIN_STEP, IMX708_DGTL_GAIN_DEFAULT);
-+
-+	imx708->hflip = v4l2_ctrl_new_std(ctrl_hdlr, &imx708_ctrl_ops,
-+					  V4L2_CID_HFLIP, 0, 1, 1, 0);
-+
-+	imx708->vflip = v4l2_ctrl_new_std(ctrl_hdlr, &imx708_ctrl_ops,
-+					  V4L2_CID_VFLIP, 0, 1, 1, 0);
-+
-+	v4l2_ctrl_new_std_menu_items(ctrl_hdlr, &imx708_ctrl_ops,
-+				     V4L2_CID_TEST_PATTERN,
-+				     ARRAY_SIZE(imx708_test_pattern_menu) - 1,
-+				     0, 0, imx708_test_pattern_menu);
-+	for (i = 0; i < 4; i++) {
-+		/*
-+		 * The assumption is that
-+		 * V4L2_CID_TEST_PATTERN_GREENR == V4L2_CID_TEST_PATTERN_RED + 1
-+		 * V4L2_CID_TEST_PATTERN_BLUE   == V4L2_CID_TEST_PATTERN_RED + 2
-+		 * V4L2_CID_TEST_PATTERN_GREENB == V4L2_CID_TEST_PATTERN_RED + 3
-+		 */
-+		v4l2_ctrl_new_std(ctrl_hdlr, &imx708_ctrl_ops,
-+				  V4L2_CID_TEST_PATTERN_RED + i,
-+				  IMX708_TEST_PATTERN_COLOUR_MIN,
-+				  IMX708_TEST_PATTERN_COLOUR_MAX,
-+				  IMX708_TEST_PATTERN_COLOUR_STEP,
-+				  IMX708_TEST_PATTERN_COLOUR_MAX);
-+		/* The "Solid color" pattern is white by default */
-+	}
-+
-+	imx708->notify_gains = v4l2_ctrl_new_custom(ctrl_hdlr,
-+						    &imx708_notify_gains_ctrl, NULL);
-+
-+	imx708->hdr_mode = v4l2_ctrl_new_std(ctrl_hdlr, &imx708_ctrl_ops,
-+					     V4L2_CID_WIDE_DYNAMIC_RANGE,
-+					     0, 1, 1, 0);
-+
-+	ret = v4l2_fwnode_device_parse(&client->dev, &props);
-+	if (ret)
-+		goto error;
-+
-+	v4l2_ctrl_new_fwnode_properties(ctrl_hdlr, &imx708_ctrl_ops, &props);
-+
-+	if (ctrl_hdlr->error) {
-+		ret = ctrl_hdlr->error;
-+		dev_err(&client->dev, "%s control init failed (%d)\n",
-+			__func__, ret);
-+		goto error;
-+	}
-+
-+	imx708->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
-+	imx708->hflip->flags |= V4L2_CTRL_FLAG_MODIFY_LAYOUT;
-+	imx708->vflip->flags |= V4L2_CTRL_FLAG_MODIFY_LAYOUT;
-+	imx708->hdr_mode->flags |= V4L2_CTRL_FLAG_MODIFY_LAYOUT;
-+
-+	imx708->sd.ctrl_handler = ctrl_hdlr;
-+
-+	/* Setup exposure and frame/line length limits. */
-+	imx708_set_framing_limits(imx708);
-+
-+	return 0;
-+
-+error:
-+	v4l2_ctrl_handler_free(ctrl_hdlr);
-+	mutex_destroy(&imx708->mutex);
-+
-+	return ret;
-+}
-+
-+static void imx708_free_controls(struct imx708 *imx708)
-+{
-+	v4l2_ctrl_handler_free(imx708->sd.ctrl_handler);
-+	mutex_destroy(&imx708->mutex);
-+}
-+
-+static int imx708_check_hwcfg(struct device *dev)
-+{
-+	struct fwnode_handle *endpoint;
-+	struct v4l2_fwnode_endpoint ep_cfg = {
-+		.bus_type = V4L2_MBUS_CSI2_DPHY
-+	};
-+	int ret = -EINVAL;
-+
-+	endpoint = fwnode_graph_get_next_endpoint(dev_fwnode(dev), NULL);
-+	if (!endpoint) {
-+		dev_err(dev, "endpoint node not found\n");
-+		return -EINVAL;
-+	}
-+
-+	if (v4l2_fwnode_endpoint_alloc_parse(endpoint, &ep_cfg)) {
-+		dev_err(dev, "could not parse endpoint\n");
-+		goto error_out;
-+	}
-+
-+	/* Check the number of MIPI CSI2 data lanes */
-+	if (ep_cfg.bus.mipi_csi2.num_data_lanes != 2) {
-+		dev_err(dev, "only 2 data lanes are currently supported\n");
-+		goto error_out;
-+	}
-+
-+	/* Check the link frequency set in device tree */
-+	if (!ep_cfg.nr_of_link_frequencies) {
-+		dev_err(dev, "link-frequency property not found in DT\n");
-+		goto error_out;
-+	}
-+
-+	if (ep_cfg.nr_of_link_frequencies != 1 ||
-+	    ep_cfg.link_frequencies[0] != IMX708_DEFAULT_LINK_FREQ) {
-+		dev_err(dev, "Link frequency not supported: %lld\n",
-+			ep_cfg.link_frequencies[0]);
-+		goto error_out;
-+	}
-+
-+	ret = 0;
-+
-+error_out:
-+	v4l2_fwnode_endpoint_free(&ep_cfg);
-+	fwnode_handle_put(endpoint);
-+
-+	return ret;
-+}
-+
-+static int imx708_probe(struct i2c_client *client)
-+{
-+	struct device *dev = &client->dev;
-+	struct imx708 *imx708;
-+	int ret;
-+
-+	imx708 = devm_kzalloc(&client->dev, sizeof(*imx708), GFP_KERNEL);
-+	if (!imx708)
-+		return -ENOMEM;
-+
-+	v4l2_i2c_subdev_init(&imx708->sd, client, &imx708_subdev_ops);
-+
-+	/* Check the hardware configuration in device tree */
-+	if (imx708_check_hwcfg(dev))
-+		return -EINVAL;
-+
-+	/* Get system clock (xclk) */
-+	imx708->xclk = devm_clk_get(dev, NULL);
-+	if (IS_ERR(imx708->xclk)) {
-+		dev_err(dev, "failed to get xclk\n");
-+		return PTR_ERR(imx708->xclk);
-+	}
-+
-+	imx708->xclk_freq = clk_get_rate(imx708->xclk);
-+	if (imx708->xclk_freq != IMX708_XCLK_FREQ) {
-+		dev_err(dev, "xclk frequency not supported: %d Hz\n",
-+			imx708->xclk_freq);
-+		return -EINVAL;
-+	}
-+
-+	ret = imx708_get_regulators(imx708);
-+	if (ret) {
-+		dev_err(dev, "failed to get regulators\n");
-+		return ret;
-+	}
-+
-+	/* Request optional enable pin */
-+	imx708->reset_gpio = devm_gpiod_get_optional(dev, "reset",
-+						     GPIOD_OUT_HIGH);
-+
-+	/*
-+	 * The sensor must be powered for imx708_identify_module()
-+	 * to be able to read the CHIP_ID register
-+	 */
-+	ret = imx708_power_on(dev);
-+	if (ret)
-+		return ret;
-+
-+	ret = imx708_identify_module(imx708);
-+	if (ret)
-+		goto error_power_off;
-+
-+	/* Initialize default format */
-+	imx708_set_default_format(imx708);
-+
-+	/* Enable runtime PM and turn off the device */
-+	pm_runtime_set_active(dev);
-+	pm_runtime_enable(dev);
-+	pm_runtime_idle(dev);
-+
-+	/* This needs the pm runtime to be registered. */
-+	ret = imx708_init_controls(imx708);
-+	if (ret)
-+		goto error_power_off;
-+
-+	/* Initialize subdev */
-+	imx708->sd.internal_ops = &imx708_internal_ops;
-+	imx708->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE |
-+			    V4L2_SUBDEV_FL_HAS_EVENTS;
-+	imx708->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR;
-+
-+	/* Initialize source pads */
-+	imx708->pad[IMAGE_PAD].flags = MEDIA_PAD_FL_SOURCE;
-+	imx708->pad[METADATA_PAD].flags = MEDIA_PAD_FL_SOURCE;
-+
-+	ret = media_entity_pads_init(&imx708->sd.entity, NUM_PADS, imx708->pad);
-+	if (ret) {
-+		dev_err(dev, "failed to init entity pads: %d\n", ret);
-+		goto error_handler_free;
-+	}
-+
-+	ret = v4l2_async_register_subdev_sensor(&imx708->sd);
-+	if (ret < 0) {
-+		dev_err(dev, "failed to register sensor sub-device: %d\n", ret);
-+		goto error_media_entity;
-+	}
-+
-+	return 0;
-+
-+error_media_entity:
-+	media_entity_cleanup(&imx708->sd.entity);
-+
-+error_handler_free:
-+	imx708_free_controls(imx708);
-+
-+error_power_off:
-+	pm_runtime_disable(&client->dev);
-+	pm_runtime_set_suspended(&client->dev);
-+	imx708_power_off(&client->dev);
-+
-+	return ret;
-+}
-+
-+static void imx708_remove(struct i2c_client *client)
-+{
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct imx708 *imx708 = to_imx708(sd);
-+
-+	v4l2_async_unregister_subdev(sd);
-+	media_entity_cleanup(&sd->entity);
-+	imx708_free_controls(imx708);
-+
-+	pm_runtime_disable(&client->dev);
-+	if (!pm_runtime_status_suspended(&client->dev))
-+		imx708_power_off(&client->dev);
-+	pm_runtime_set_suspended(&client->dev);
-+}
-+
-+static const struct of_device_id imx708_dt_ids[] = {
-+	{ .compatible = "sony,imx708" },
-+	{ /* sentinel */ }
-+};
-+MODULE_DEVICE_TABLE(of, imx708_dt_ids);
-+
-+static const struct dev_pm_ops imx708_pm_ops = {
-+	SET_SYSTEM_SLEEP_PM_OPS(imx708_suspend, imx708_resume)
-+	SET_RUNTIME_PM_OPS(imx708_power_off, imx708_power_on, NULL)
-+};
-+
-+static struct i2c_driver imx708_i2c_driver = {
-+	.driver = {
-+		.name = "imx708",
-+		.of_match_table	= imx708_dt_ids,
-+		.pm = &imx708_pm_ops,
-+	},
-+	.probe_new = imx708_probe,
-+	.remove = imx708_remove,
-+};
-+
-+module_i2c_driver(imx708_i2c_driver);
-+
-+MODULE_AUTHOR("David Plowman <david.plowman@raspberrypi.com>");
-+MODULE_DESCRIPTION("Sony IMX708 sensor driver");
-+MODULE_LICENSE("GPL v2");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0530-dtoverlays-Add-overlays-for-the-IMX708-image-sensor.patch b/target/linux/bcm27xx/patches-6.1/950-0530-dtoverlays-Add-overlays-for-the-IMX708-image-sensor.patch
deleted file mode 100644
index bbfa81a4b1..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0530-dtoverlays-Add-overlays-for-the-IMX708-image-sensor.patch
+++ /dev/null
@@ -1,434 +0,0 @@
-From 15808e7f0b3e320c52e71cab722f2dbb137a6d95 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 22 Dec 2022 14:12:54 +0000
-Subject: [PATCH] dtoverlays: Add overlays for the IMX708 image sensor
-
-New overlay to support the Sony IMX708 image sensor.
-This includes a VCM for lens control.
-Also adds support to the camera mux overlays.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/Makefile           |   1 +
- arch/arm/boot/dts/overlays/README             |  23 ++++
- .../dts/overlays/camera-mux-2port-overlay.dts |  32 ++++++
- .../dts/overlays/camera-mux-4port-overlay.dts |  64 +++++++++++
- arch/arm/boot/dts/overlays/imx708-overlay.dts | 104 ++++++++++++++++++
- arch/arm/boot/dts/overlays/imx708.dtsi        |  35 ++++++
- 6 files changed, 259 insertions(+)
- create mode 100644 arch/arm/boot/dts/overlays/imx708-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/imx708.dtsi
-
---- a/arch/arm/boot/dts/overlays/Makefile
-+++ b/arch/arm/boot/dts/overlays/Makefile
-@@ -122,6 +122,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
- 	imx462.dtbo \
- 	imx477.dtbo \
- 	imx519.dtbo \
-+	imx708.dtbo \
- 	iqaudio-codec.dtbo \
- 	iqaudio-dac.dtbo \
- 	iqaudio-dacplus.dtbo \
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -716,6 +716,7 @@ Params: cam0-imx219             Select I
-         cam0-imx258             Select IMX258 for camera on port 0
-         cam0-imx290             Select IMX290 for camera on port 0
-         cam0-imx477             Select IMX477 for camera on port 0
-+        cam0-imx708             Select IMX708 for camera on port 0
-         cam0-ov2311             Select OV2311 for camera on port 0
-         cam0-ov5647             Select OV5647 for camera on port 0
-         cam0-ov7251             Select OV7251 for camera on port 0
-@@ -725,6 +726,7 @@ Params: cam0-imx219             Select I
-         cam1-imx258             Select IMX258 for camera on port 1
-         cam1-imx290             Select IMX290 for camera on port 1
-         cam1-imx477             Select IMX477 for camera on port 1
-+        cam1-imx708             Select IMX708 for camera on port 1
-         cam1-ov2311             Select OV2311 for camera on port 1
-         cam1-ov5647             Select OV5647 for camera on port 1
-         cam1-ov7251             Select OV7251 for camera on port 1
-@@ -741,6 +743,7 @@ Params: cam0-imx219             Select I
-         cam0-imx258             Select IMX258 for camera on port 0
-         cam0-imx290             Select IMX290 for camera on port 0
-         cam0-imx477             Select IMX477 for camera on port 0
-+        cam0-imx708             Select IMX708 for camera on port 0
-         cam0-ov2311             Select OV2311 for camera on port 0
-         cam0-ov5647             Select OV5647 for camera on port 0
-         cam0-ov7251             Select OV7251 for camera on port 0
-@@ -750,6 +753,7 @@ Params: cam0-imx219             Select I
-         cam1-imx258             Select IMX258 for camera on port 1
-         cam1-imx290             Select IMX290 for camera on port 1
-         cam1-imx477             Select IMX477 for camera on port 1
-+        cam1-imx708             Select IMX708 for camera on port 1
-         cam1-ov2311             Select OV2311 for camera on port 1
-         cam1-ov5647             Select OV5647 for camera on port 1
-         cam1-ov7251             Select OV7251 for camera on port 1
-@@ -759,6 +763,7 @@ Params: cam0-imx219             Select I
-         cam2-imx258             Select IMX258 for camera on port 2
-         cam2-imx290             Select IMX290 for camera on port 2
-         cam2-imx477             Select IMX477 for camera on port 2
-+        cam2-imx708             Select IMX708 for camera on port 2
-         cam2-ov2311             Select OV2311 for camera on port 2
-         cam2-ov5647             Select OV5647 for camera on port 2
-         cam2-ov7251             Select OV7251 for camera on port 2
-@@ -768,6 +773,7 @@ Params: cam0-imx219             Select I
-         cam3-imx258             Select IMX258 for camera on port 3
-         cam3-imx290             Select IMX290 for camera on port 3
-         cam3-imx477             Select IMX477 for camera on port 3
-+        cam3-imx708             Select IMX708 for camera on port 3
-         cam3-ov2311             Select OV2311 for camera on port 3
-         cam3-ov5647             Select OV5647 for camera on port 3
-         cam3-ov7251             Select OV7251 for camera on port 3
-@@ -2345,6 +2351,23 @@ Params: rotation                Mounting
-         media-controller        Configure use of Media Controller API for
-                                 configuring the sensor (default on)
-         cam0                    Adopt the default configuration for CAM0 on a
-+                                Compute Module (CSI0, i2c_vc, and cam0_reg).
-+
-+
-+Name:   imx708
-+Info:   Sony IMX708 camera module.
-+        Uses Unicam 1, which is the standard camera connector on most Pi
-+        variants.
-+Load:   dtoverlay=imx708,<param>=<val>
-+Params: rotation                Mounting rotation of the camera sensor (0 or
-+                                180, default 180)
-+        orientation             Sensor orientation (0 = front, 1 = rear,
-+                                2 = external, default external)
-+        vcm                     Select lens driver state. Default is enabled,
-+                                but vcm=off will disable.
-+        media-controller        Configure use of Media Controller API for
-+                                configuring the sensor (default on)
-+        cam0                    Adopt the default configuration for CAM0 on a
-                                 Compute Module (CSI0, i2c_vc, and cam0_reg).
- 
- 
---- a/arch/arm/boot/dts/overlays/camera-mux-2port-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/camera-mux-2port-overlay.dts
-@@ -112,6 +112,16 @@
- 					#undef cam_endpoint
- 					#undef cam1_clk
- 
-+					#define cam_node imx708_0
-+					#define cam_endpoint imx708_0_ep
-+					#define vcm_node imx708_0_vcm
-+					#define cam1_clk clk_24mhz
-+					#include "imx708.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef vcm_node
-+					#undef cam1_clk
-+
- 					#define cam_node ov5647_0
- 					#define cam_endpoint ov5647_0_ep
- 					#define cam1_clk clk_25mhz
-@@ -182,6 +192,16 @@
- 					#undef cam_endpoint
- 					#undef cam1_clk
- 
-+					#define cam_node imx708_1
-+					#define cam_endpoint imx708_1_ep
-+					#define vcm_node imx708_1_vcm
-+					#define cam1_clk clk_24mhz
-+					#include "imx708.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef vcm_node
-+					#undef cam1_clk
-+
- 					#define cam_node ov5647_1
- 					#define cam_endpoint ov5647_1_ep
- 					#define cam1_clk clk_25mhz
-@@ -353,6 +373,12 @@
- 			      <&imx477_0_ep>, "remote-endpoint:0=",<&mux_in0>,
- 			      <&mux_in0>, "clock-noncontinuous?",
- 			      <&imx477_0>, "status=okay";
-+		cam0-imx708 = <&mux_in0>, "remote-endpoint:0=",<&imx708_0_ep>,
-+			      <&imx708_0_ep>, "remote-endpoint:0=",<&mux_in0>,
-+			      <&mux_in0>, "clock-noncontinuous?",
-+			      <&imx708_0>, "status=okay",
-+			      <&imx708_0_vcm>, "status=okay",
-+			      <&imx708_0>,"lens-focus:0=", <&imx708_0_vcm>;
- 		cam0-ov5647 = <&mux_in0>, "remote-endpoint:0=",<&ov5647_0_ep>,
- 			      <&ov5647_0_ep>, "remote-endpoint:0=",<&mux_in0>,
- 			      <&ov5647_0>, "status=okay";
-@@ -381,6 +407,12 @@
- 			      <&imx477_1_ep>, "remote-endpoint:0=",<&mux_in1>,
- 			      <&mux_in1>, "clock-noncontinuous?",
- 			      <&imx477_1>, "status=okay";
-+		cam1-imx708 = <&mux_in1>, "remote-endpoint:0=",<&imx708_1_ep>,
-+			      <&imx708_1_ep>, "remote-endpoint:0=",<&mux_in1>,
-+			      <&mux_in1>, "clock-noncontinuous?",
-+			      <&imx708_1>, "status=okay",
-+			      <&imx708_1_vcm>, "status=okay",
-+			      <&imx708_1>,"lens-focus:0=", <&imx708_1_vcm>;
- 		cam1-ov5647 = <&mux_in1>, "remote-endpoint:0=",<&ov5647_1_ep>,
- 			      <&ov5647_1_ep>, "remote-endpoint:0=",<&mux_in1>,
- 			      <&ov5647_1>, "status=okay";
---- a/arch/arm/boot/dts/overlays/camera-mux-4port-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/camera-mux-4port-overlay.dts
-@@ -170,6 +170,16 @@
- 					#undef cam_endpoint
- 					#undef cam1_clk
- 
-+					#define cam_node imx708_0
-+					#define cam_endpoint imx708_0_ep
-+					#define vcm_node imx708_0_vcm
-+					#define cam1_clk clk_24mhz
-+					#include "imx708.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef vcm_node
-+					#undef cam1_clk
-+
- 					#define cam_node ov5647_0
- 					#define cam_endpoint ov5647_0_ep
- 					#define cam1_clk clk_25mhz
-@@ -240,6 +250,16 @@
- 					#undef cam_endpoint
- 					#undef cam1_clk
- 
-+					#define cam_node imx708_1
-+					#define cam_endpoint imx708_1_ep
-+					#define vcm_node imx708_1_vcm
-+					#define cam1_clk clk_24mhz
-+					#include "imx708.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef vcm_node
-+					#undef cam1_clk
-+
- 					#define cam_node ov5647_1
- 					#define cam_endpoint ov5647_1_ep
- 					#define cam1_clk clk_25mhz
-@@ -310,6 +330,16 @@
- 					#undef cam_endpoint
- 					#undef cam1_clk
- 
-+					#define cam_node imx708_2
-+					#define cam_endpoint imx708_2_ep
-+					#define vcm_node imx708_2_vcm
-+					#define cam1_clk clk_24mhz
-+					#include "imx708.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef vcm_node
-+					#undef cam1_clk
-+
- 					#define cam_node ov5647_2
- 					#define cam_endpoint ov5647_2_ep
- 					#define cam1_clk clk_25mhz
-@@ -380,6 +410,16 @@
- 					#undef cam_endpoint
- 					#undef cam1_clk
- 
-+					#define cam_node imx708_3
-+					#define cam_endpoint imx708_3_ep
-+					#define vcm_node imx708_3_vcm
-+					#define cam1_clk clk_24mhz
-+					#include "imx708.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef vcm_node
-+					#undef cam1_clk
-+
- 					#define cam_node ov5647_3
- 					#define cam_endpoint ov5647_3_ep
- 					#define cam1_clk clk_25mhz
-@@ -568,6 +608,12 @@
- 			      <&imx477_0_ep>, "remote-endpoint:0=",<&mux_in0>,
- 			      <&mux_in0>, "clock-noncontinuous?",
- 			      <&imx477_0>, "status=okay";
-+		cam0-imx708 = <&mux_in0>, "remote-endpoint:0=",<&imx708_0_ep>,
-+			      <&imx708_0_ep>, "remote-endpoint:0=",<&mux_in0>,
-+			      <&mux_in0>, "clock-noncontinuous?",
-+			      <&imx708_0>, "status=okay",
-+			      <&imx708_0_vcm>, "status=okay",
-+			      <&imx708_0>,"lens-focus:0=", <&imx708_0_vcm>;
- 		cam0-ov5647 = <&mux_in0>, "remote-endpoint:0=",<&ov5647_0_ep>,
- 			      <&ov5647_0_ep>, "remote-endpoint:0=",<&mux_in0>,
- 			      <&ov5647_0>, "status=okay";
-@@ -596,6 +642,12 @@
- 			      <&imx477_1_ep>, "remote-endpoint:0=",<&mux_in1>,
- 			      <&mux_in1>, "clock-noncontinuous?",
- 			      <&imx477_1>, "status=okay";
-+		cam1-imx708 = <&mux_in1>, "remote-endpoint:0=",<&imx708_1_ep>,
-+			      <&imx708_1_ep>, "remote-endpoint:0=",<&mux_in1>,
-+			      <&mux_in1>, "clock-noncontinuous?",
-+			      <&imx708_1>, "status=okay",
-+			      <&imx708_1_vcm>, "status=okay",
-+			      <&imx708_1>,"lens-focus:0=", <&imx708_1_vcm>;
- 		cam1-ov5647 = <&mux_in1>, "remote-endpoint:0=",<&ov5647_1_ep>,
- 			      <&ov5647_1_ep>, "remote-endpoint:0=",<&mux_in1>,
- 			      <&ov5647_1>, "status=okay";
-@@ -624,6 +676,12 @@
- 			      <&imx477_2_ep>, "remote-endpoint:0=",<&mux_in2>,
- 			      <&mux_in2>, "clock-noncontinuous?",
- 			      <&imx477_2>, "status=okay";
-+		cam2-imx708 = <&mux_in2>, "remote-endpoint:0=",<&imx708_2_ep>,
-+			      <&imx708_2_ep>, "remote-endpoint:0=",<&mux_in2>,
-+			      <&mux_in2>, "clock-noncontinuous?",
-+			      <&imx708_2>, "status=okay",
-+			      <&imx708_2_vcm>, "status=okay",
-+			      <&imx708_2>,"lens-focus:0=", <&imx708_2_vcm>;
- 		cam2-ov5647 = <&mux_in2>, "remote-endpoint:0=",<&ov5647_2_ep>,
- 			      <&ov5647_2_ep>, "remote-endpoint:0=",<&mux_in2>,
- 			      <&ov5647_2>, "status=okay";
-@@ -652,6 +710,12 @@
- 			      <&imx477_3_ep>, "remote-endpoint:0=",<&mux_in3>,
- 			      <&mux_in3>, "clock-noncontinuous?",
- 			      <&imx477_3>, "status=okay";
-+		cam3-imx708 = <&mux_in3>, "remote-endpoint:0=",<&imx708_3_ep>,
-+			      <&imx708_3_ep>, "remote-endpoint:0=",<&mux_in3>,
-+			      <&mux_in3>, "clock-noncontinuous?",
-+			      <&imx708_3>, "status=okay",
-+			      <&imx708_3_vcm>, "status=okay",
-+			      <&imx708_3>,"lens-focus:0=", <&imx708_3_vcm>;
- 		cam3-ov5647 = <&mux_in3>, "remote-endpoint:0=",<&ov5647_3_ep>,
- 			      <&ov5647_3_ep>, "remote-endpoint:0=",<&mux_in3>,
- 			      <&ov5647_3>, "status=okay";
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/imx708-overlay.dts
-@@ -0,0 +1,104 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+// Definitions for IMX708 camera module on VC I2C bus
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2c0if>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	clk_frag: fragment@1 {
-+		target = <&cam1_clk>;
-+		__overlay__ {
-+			status = "okay";
-+			clock-frequency = <24000000>;
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c0mux>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	reg_frag: fragment@3 {
-+		target = <&cam1_reg>;
-+		cam_reg: __overlay__ {
-+			startup-delay-us = <70000>;
-+			off-on-delay-us = <30000>;
-+			regulator-min-microvolt = <2700000>;
-+			regulator-max-microvolt = <2700000>;
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&cam_node>;
-+		__overlay__ {
-+			lens-focus = <&vcm_node>;
-+		};
-+	};
-+
-+	i2c_frag: fragment@100 {
-+		target = <&i2c_csi_dsi>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			#include "imx708.dtsi"
-+		};
-+	};
-+
-+	csi_frag: fragment@101 {
-+		target = <&csi1>;
-+		csi: __overlay__ {
-+			status = "okay";
-+			brcm,media-controller;
-+
-+			port {
-+				csi_ep: endpoint {
-+					remote-endpoint = <&cam_endpoint>;
-+					clock-lanes = <0>;
-+					data-lanes = <1 2>;
-+					clock-noncontinuous;
-+				};
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		rotation = <&cam_node>,"rotation:0";
-+		orientation = <&cam_node>,"orientation:0";
-+		media-controller = <&csi>,"brcm,media-controller?";
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
-+		       <&csi_frag>, "target:0=",<&csi0>,
-+		       <&clk_frag>, "target:0=",<&cam0_clk>,
-+		       <&reg_frag>, "target:0=",<&cam0_reg>,
-+		       <&cam_node>, "clocks:0=",<&cam0_clk>,
-+		       <&cam_node>, "VANA1-supply:0=",<&cam0_reg>,
-+		       <&vcm_node>, "VDD-supply:0=",<&cam0_reg>;
-+		vcm = <&vcm_node>, "status",
-+		      <0>, "=4";
-+	};
-+};
-+
-+&cam_node {
-+	status = "okay";
-+};
-+
-+&cam_endpoint {
-+	remote-endpoint = <&csi_ep>;
-+};
-+
-+&vcm_node {
-+	status = "okay";
-+};
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/imx708.dtsi
-@@ -0,0 +1,35 @@
-+// Fragment that configures a Sony IMX708
-+
-+cam_node: imx708@1a {
-+	compatible = "sony,imx708";
-+	reg = <0x1a>;
-+	status = "disabled";
-+
-+	clocks = <&cam1_clk>;
-+	clock-names = "xclk";
-+
-+	VANA1-supply = <&cam1_reg>;	/* 2.8v */
-+	VANA2-supply = <&cam_dummy_reg>;/* 1.8v */
-+	VDIG-supply = <&cam_dummy_reg>;	/* 1.1v */
-+	VDDL-supply = <&cam_dummy_reg>;	/* 1.8v */
-+
-+	rotation = <180>;
-+	orientation = <2>;
-+
-+	port {
-+		cam_endpoint: endpoint {
-+			clock-lanes = <0>;
-+			data-lanes = <1 2>;
-+			clock-noncontinuous;
-+			link-frequencies =
-+				/bits/ 64 <450000000>;
-+		};
-+	};
-+};
-+
-+vcm_node: dw9817@c {
-+	compatible = "dongwoon,dw9817-vcm";
-+	reg = <0x0c>;
-+	status = "disabled";
-+	VDD-supply = <&cam1_reg>;
-+};
diff --git a/target/linux/bcm27xx/patches-6.1/950-0531-net-phy-broadcom-Make-LEDs-3-4-shadow-LEDs-1-2.patch b/target/linux/bcm27xx/patches-6.1/950-0531-net-phy-broadcom-Make-LEDs-3-4-shadow-LEDs-1-2.patch
deleted file mode 100644
index ce389fd3f0..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0531-net-phy-broadcom-Make-LEDs-3-4-shadow-LEDs-1-2.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 72f813551de816215429cae538359371730ade97 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 3 Jan 2023 16:00:21 +0000
-Subject: [PATCH] net: phy: broadcom: Make LEDs 3+4 shadow LEDs 1+2
-
-CM4 uses BCM54210PE, which supports 2 additional LEDs, choosing LED3
-for the amber LED because it shows activity by default (LED4 is not
-connected). However, this makes it uncontrollable by the eth_led<n>
-dtparams which target LEDs 1+2.
-
-Solve the problem by making LEDs 3+4 mirror LEDs 1+2 (which is much
-simpler than adding baseboard-specific overrides, but comes with a
-risk of making one of the LEDs redundant).
-
-See: https://github.com/raspberrypi/linux/issues/5289
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/net/phy/broadcom.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/drivers/net/phy/broadcom.c
-+++ b/drivers/net/phy/broadcom.c
-@@ -416,6 +416,11 @@ static int bcm54xx_config_init(struct ph
- 		val = BCM5482_SHD_LEDS1_LED1(BCM_LED_SRC_MULTICOLOR1) |
- 			BCM5482_SHD_LEDS1_LED3(BCM_LED_SRC_MULTICOLOR1);
- 		bcm_phy_write_shadow(phydev, BCM5482_SHD_LEDS1, val);
-+		/* BCM54210PE controls two extra LEDs with the next register.
-+		 * Make them shadow the first pair of LEDs - useful on CM4 which
-+		 * uses LED3 for ETH_LEDY instead of LED1.
-+		 */
-+		bcm_phy_write_shadow(phydev, BCM5482_SHD_LEDS1 + 1, val);
- 
- 		val = BCM_LED_MULTICOLOR_IN_PHASE |
- 			BCM5482_SHD_LEDS1_LED1(led_modes[0]) |
diff --git a/target/linux/bcm27xx/patches-6.1/950-0532-overlays-i2c-sensor-MS-temp-pressure-sensors.patch b/target/linux/bcm27xx/patches-6.1/950-0532-overlays-i2c-sensor-MS-temp-pressure-sensors.patch
deleted file mode 100644
index 368c4e9e87..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0532-overlays-i2c-sensor-MS-temp-pressure-sensors.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From 837a3647eb9edd7b11d98d85e9c70997a6717397 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 4 Jan 2023 09:14:53 +0000
-Subject: [PATCH] overlays: i2c-sensor: MS temp & pressure sensors
-
-Add support for the Measurement Specialities temperature and pressure
-sensors to the i2c-sensor overlay. The supported devices are MS5637,
-MS5803, MS5805, MS5837 and MS8607.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/README             | 20 ++++-
- .../boot/dts/overlays/i2c-sensor-common.dtsi  | 79 ++++++++++++++++++-
- 2 files changed, 96 insertions(+), 3 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -1982,8 +1982,9 @@ Info:   Adds support for a number of I2C
-         light level and chemical sensors on i2c_arm
- Load:   dtoverlay=i2c-sensor,<param>=<val>
- Params: addr                    Set the address for the BH1750, BME280, BME680,
--                                BMP280, CCS811, DS1621, HDC100X, LM75, SHT3x or
--                                TMP102
-+                                BMP280, CCS811, DS1621, HDC100X, JC42, LM75,
-+                                MCP980x, MS5637, MS5803, MS5805, MS5837, MS8607,
-+                                SHT3x or TMP102
- 
-         aht10                   Select the Aosong AHT10 temperature and humidity
-                                 sensor
-@@ -2044,6 +2045,21 @@ Params: addr                    Set the
-                                 use the "jc42" option.
-                                 Valid addresses are 0x18-0x1f (default 0x18)
- 
-+        ms5637                  Select the Measurement Specialities MS5637
-+                                pressure and temperature sensor.
-+
-+        ms5803                  Select the Measurement Specialities MS5803
-+                                pressure and temperature sensor.
-+
-+        ms5805                  Select the Measurement Specialities MS5805
-+                                pressure and temperature sensor.
-+
-+        ms5837                  Select the Measurement Specialities MS5837
-+                                pressure and temperature sensor.
-+
-+        ms8607                  Select the Measurement Specialities MS8607
-+                                pressure and temperature sensor.
-+
-         no_timeout              Disable the SMBUS timeout. N.B. Only supported
-                                 by some jc42 devices - using with an
-                                 incompatible device can stop it from being
---- a/arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi
-+++ b/arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi
-@@ -351,6 +351,76 @@
- 		};
- 	};
- 
-+	fragment@23 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			ms5637: ms5637@76 {
-+				compatible = "meas,ms5637";
-+				reg = <0x76>;
-+			};
-+		};
-+	};
-+
-+	fragment@24 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			ms5803: ms5803@76 {
-+				compatible = "meas,ms5803";
-+				reg = <0x76>;
-+			};
-+		};
-+	};
-+
-+	fragment@25 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			ms5805: ms5805@76 {
-+				compatible = "meas,ms5805";
-+				reg = <0x76>;
-+			};
-+		};
-+	};
-+
-+	fragment@26 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			ms5837: ms5837@76 {
-+				compatible = "meas,ms5837";
-+				reg = <0x76>;
-+			};
-+		};
-+	};
-+
-+	fragment@27 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			ms8607: ms8607@76 {
-+				compatible = "meas,ms8607-temppressure";
-+				reg = <0x76>;
-+			};
-+		};
-+	};
-+
- 	__overrides__ {
- 		bme280 = <0>,"+0";
- 		bmp085 = <0>,"+1";
-@@ -376,11 +446,18 @@
- 		aht10 = <0>,"+20";
- 		mcp980x = <0>,"+21";
- 		jc42 = <0>,"+22";
-+		ms5637 = <0>,"+23";
-+		ms5803 = <0>,"+24";
-+		ms5805 = <0>,"+25";
-+		ms5837 = <0>,"+26";
-+		ms8607 = <0>,"+27";
- 
- 		addr =  <&bme280>,"reg:0", <&bmp280>,"reg:0", <&tmp102>,"reg:0",
- 			<&lm75>,"reg:0", <&hdc100x>,"reg:0", <&sht3x>,"reg:0",
- 			<&ds1621>,"reg:0", <&bme680>,"reg:0", <&ccs811>,"reg:0",
--			<&bh1750>,"reg:0", <&mcp980x>,"reg:0", <&jc42>,"reg:0";
-+			<&bh1750>,"reg:0", <&mcp980x>,"reg:0", <&jc42>,"reg:0",
-+			<&ms5637>,"reg:0", <&ms5803>,"reg:0", <&ms5805>,"reg:0",
-+			<&ms5837>,"reg:0", <&ms8607>,"reg:0";
- 		int_pin = <&max30102>, "interrupts:0";
- 		no_timeout = <&jc42>, "smbus-timeout-disable?";
- 	};
diff --git a/target/linux/bcm27xx/patches-6.1/950-0533-drivers-media-imx708-Enable-long-exposure-mode.patch b/target/linux/bcm27xx/patches-6.1/950-0533-drivers-media-imx708-Enable-long-exposure-mode.patch
deleted file mode 100644
index 9672efdfd9..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0533-drivers-media-imx708-Enable-long-exposure-mode.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 321814f1f361336278e9d682492152098b0a0f00 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Thu, 5 Jan 2023 14:44:48 +0000
-Subject: [PATCH] drivers: media: imx708: Enable long exposure mode
-
-Enable long exposure modes by using the long exposure shift register setting
-in the imx708 sensor.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/i2c/imx708.c | 41 +++++++++++++++++++++++++++++++++-----
- 1 file changed, 36 insertions(+), 5 deletions(-)
-
---- a/drivers/media/i2c/imx708.c
-+++ b/drivers/media/i2c/imx708.c
-@@ -44,6 +44,10 @@
- #define IMX708_REG_FRAME_LENGTH		0x0340
- #define IMX708_FRAME_LENGTH_MAX		0xffff
- 
-+/* Long exposure multiplier */
-+#define IMX708_LONG_EXP_SHIFT_MAX	7
-+#define IMX708_LONG_EXP_SHIFT_REG	0x3100
-+
- /* Exposure control */
- #define IMX708_REG_EXPOSURE		0x0202
- #define IMX708_EXPOSURE_OFFSET		48
-@@ -806,6 +810,9 @@ struct imx708 {
- 
- 	/* Rewrite common registers on stream on? */
- 	bool common_regs_written;
-+
-+	/* Current long exposure factor in use. Set through V4L2_CID_VBLANK */
-+	unsigned int long_exp_shift;
- };
- 
- static inline struct imx708 *to_imx708(struct v4l2_subdev *_sd)
-@@ -994,7 +1001,8 @@ static int imx708_set_exposure(struct im
- 	 * will automatically divide the medium and short ones by 4,16.
- 	 */
- 	ret = imx708_write_reg(imx708, IMX708_REG_EXPOSURE,
--			       IMX708_REG_VALUE_16BIT, val);
-+			       IMX708_REG_VALUE_16BIT,
-+			       val >> imx708->long_exp_shift);
- 
- 	return ret;
- }
-@@ -1027,18 +1035,42 @@ static int imx708_set_analogue_gain(stru
- 	return ret;
- }
- 
-+static int imx708_set_frame_length(struct imx708 *imx708, unsigned int val)
-+{
-+	int ret = 0;
-+
-+	imx708->long_exp_shift = 0;
-+
-+	while (val > IMX708_FRAME_LENGTH_MAX) {
-+		imx708->long_exp_shift++;
-+		val >>= 1;
-+	}
-+
-+	ret = imx708_write_reg(imx708, IMX708_REG_FRAME_LENGTH,
-+			       IMX708_REG_VALUE_16BIT, val);
-+	if (ret)
-+		return ret;
-+
-+	return imx708_write_reg(imx708, IMX708_LONG_EXP_SHIFT_REG,
-+				IMX708_REG_VALUE_08BIT, imx708->long_exp_shift);
-+}
-+
- static void imx708_set_framing_limits(struct imx708 *imx708)
- {
- 	unsigned int hblank;
- 	const struct imx708_mode *mode = imx708->mode;
- 
-+	/* Default to no long exposure multiplier */
-+	imx708->long_exp_shift = 0;
-+
- 	__v4l2_ctrl_modify_range(imx708->pixel_rate,
- 				 mode->pixel_rate, mode->pixel_rate,
- 				 1, mode->pixel_rate);
- 
- 	/* Update limits and set FPS to default */
- 	__v4l2_ctrl_modify_range(imx708->vblank, mode->vblank_min,
--				 IMX708_FRAME_LENGTH_MAX - mode->height,
-+				 ((1 << IMX708_LONG_EXP_SHIFT_MAX) *
-+					IMX708_FRAME_LENGTH_MAX) - mode->height,
- 				 1, mode->vblank_default);
- 
- 	/*
-@@ -1112,9 +1144,8 @@ static int imx708_set_ctrl(struct v4l2_c
- 				       imx708->vflip->val << 1);
- 		break;
- 	case V4L2_CID_VBLANK:
--		ret = imx708_write_reg(imx708, IMX708_REG_FRAME_LENGTH,
--				       IMX708_REG_VALUE_16BIT,
--				       imx708->mode->height + ctrl->val);
-+		ret = imx708_set_frame_length(imx708,
-+					      imx708->mode->height + ctrl->val);
- 		break;
- 	case V4L2_CID_NOTIFY_GAINS:
- 		ret = imx708_write_reg(imx708, IMX708_REG_COLOUR_BALANCE_BLUE,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0534-drivers-media-i2c-imx708-Fix-crop-information.patch b/target/linux/bcm27xx/patches-6.1/950-0534-drivers-media-i2c-imx708-Fix-crop-information.patch
deleted file mode 100644
index 5f30cc4c07..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0534-drivers-media-i2c-imx708-Fix-crop-information.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5148d8f41352d28fac3752c7aa116fd213e50c98 Mon Sep 17 00:00:00 2001
-From: David Plowman <david.plowman@raspberrypi.com>
-Date: Tue, 10 Jan 2023 13:14:27 +0000
-Subject: [PATCH] drivers: media: i2c: imx708: Fix crop information
-
-The 1536x864 mode contained incorrect crop information.
-
-Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
----
- drivers/media/i2c/imx708.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/drivers/media/i2c/imx708.c
-+++ b/drivers/media/i2c/imx708.c
-@@ -673,10 +673,10 @@ static const struct imx708_mode supporte
- 		.height = 864,
- 		.line_length_pix = 0x1460,
- 		.crop = {
--			.left = IMX708_PIXEL_ARRAY_LEFT,
--			.top = IMX708_PIXEL_ARRAY_TOP,
--			.width = 4608,
--			.height = 2592,
-+			.left = IMX708_PIXEL_ARRAY_LEFT + 768,
-+			.top = IMX708_PIXEL_ARRAY_TOP + 432,
-+			.width = 3072,
-+			.height = 1728,
- 		},
- 		.vblank_min = 40,
- 		.vblank_default = 2755,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0535-drm-vc4-hdmi-Correct-CSC-setup-for-YCbCr4-4-4.patch b/target/linux/bcm27xx/patches-6.1/950-0535-drm-vc4-hdmi-Correct-CSC-setup-for-YCbCr4-4-4.patch
deleted file mode 100644
index 76b2d41f31..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0535-drm-vc4-hdmi-Correct-CSC-setup-for-YCbCr4-4-4.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From e872dd065cd2b55d9532213404dc70f351de0031 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Mon, 14 Nov 2022 19:30:27 +0000
-Subject: [PATCH] drm/vc4: hdmi: Correct CSC setup for YCbCr4:4:4
-
-The CSC requires the coefficients to be swapped around for
-4:4:4 mode, but the swap was incorrectly defined.
-
-Correct the swap.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_hdmi.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hdmi.c
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -1335,12 +1335,12 @@ static void vc5_hdmi_set_csc_coeffs_swap
- 	lockdep_assert_held(&vc4_hdmi->hw_lock);
- 
- 	/* YUV444 needs the CSC matrices using the channels in a different order */
--	HDMI_WRITE(HDMI_CSC_12_11, (coeffs[2][1] << 16) | coeffs[2][0]);
--	HDMI_WRITE(HDMI_CSC_14_13, (coeffs[2][3] << 16) | coeffs[2][2]);
--	HDMI_WRITE(HDMI_CSC_22_21, (coeffs[0][1] << 16) | coeffs[0][0]);
--	HDMI_WRITE(HDMI_CSC_24_23, (coeffs[0][3] << 16) | coeffs[0][2]);
--	HDMI_WRITE(HDMI_CSC_32_31, (coeffs[1][1] << 16) | coeffs[1][0]);
--	HDMI_WRITE(HDMI_CSC_34_33, (coeffs[1][3] << 16) | coeffs[1][2]);
-+	HDMI_WRITE(HDMI_CSC_12_11, (coeffs[1][1] << 16) | coeffs[1][0]);
-+	HDMI_WRITE(HDMI_CSC_14_13, (coeffs[1][3] << 16) | coeffs[1][2]);
-+	HDMI_WRITE(HDMI_CSC_22_21, (coeffs[2][1] << 16) | coeffs[2][0]);
-+	HDMI_WRITE(HDMI_CSC_24_23, (coeffs[2][3] << 16) | coeffs[2][2]);
-+	HDMI_WRITE(HDMI_CSC_32_31, (coeffs[0][1] << 16) | coeffs[0][0]);
-+	HDMI_WRITE(HDMI_CSC_34_33, (coeffs[0][3] << 16) | coeffs[0][2]);
- }
- 
- static void vc5_hdmi_csc_setup(struct vc4_hdmi *vc4_hdmi,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0536-drm-vc4-hdmi-Add-property-to-allow-manual-config-of-.patch b/target/linux/bcm27xx/patches-6.1/950-0536-drm-vc4-hdmi-Add-property-to-allow-manual-config-of-.patch
deleted file mode 100644
index 957b970246..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0536-drm-vc4-hdmi-Add-property-to-allow-manual-config-of-.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From 8bac9bb3f865b262e009faffb31d0d0b844faa5f Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Mon, 14 Nov 2022 19:32:10 +0000
-Subject: [PATCH] drm/vc4: hdmi: Add property to allow manual config of
- RGB or YCbCr
-
-Add a custom property "Output format" that allows the overriding
-of the default colourspace choice in the way that the old
-firmware hdmi_pixel_encoding property did. If the chosen format is not
-supported, then it will still drop back to the older behaviour.
-
-This won't be acceptable to upstream, but it adds back the missing
-functionality of hdmi_pixel_encoding.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_hdmi.c | 60 ++++++++++++++++++++++++++++++++++
- drivers/gpu/drm/vc4/vc4_hdmi.h |  8 +++++
- 2 files changed, 68 insertions(+)
-
---- a/drivers/gpu/drm/vc4/vc4_hdmi.c
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -556,6 +556,7 @@ static int vc4_hdmi_connector_atomic_che
- 
- 	if (old_state->colorspace != new_state->colorspace ||
- 	    old_vc4_state->broadcast_rgb != new_vc4_state->broadcast_rgb ||
-+	    old_vc4_state->requested_output_format != new_vc4_state->requested_output_format ||
- 	    !drm_connector_atomic_hdr_metadata_equal(old_state, new_state)) {
- 		struct drm_crtc_state *crtc_state;
- 
-@@ -590,6 +591,8 @@ int vc4_hdmi_connector_get_property(stru
- 
- 	if (property == vc4_hdmi->broadcast_rgb_property) {
- 		*val = vc4_conn_state->broadcast_rgb;
-+	} else if (property == vc4_hdmi->output_format_property) {
-+		*val = vc4_conn_state->requested_output_format;
- 	} else {
- 		DRM_DEBUG_ATOMIC("Unknown property [PROP:%d:%s]\n",
- 				 property->base.id, property->name);
-@@ -621,6 +624,9 @@ int vc4_hdmi_connector_set_property(stru
- 	if (property == vc4_hdmi->broadcast_rgb_property) {
- 		vc4_conn_state->broadcast_rgb = val;
- 		return 0;
-+	} else if (property == vc4_hdmi->output_format_property) {
-+		vc4_conn_state->requested_output_format = val;
-+		return 0;
- 	}
- 
- 	DRM_DEBUG_ATOMIC("Unknown property [PROP:%d:%s]\n",
-@@ -664,6 +670,7 @@ vc4_hdmi_connector_duplicate_state(struc
- 	new_state->tmds_char_rate = vc4_state->tmds_char_rate;
- 	new_state->output_bpc = vc4_state->output_bpc;
- 	new_state->output_format = vc4_state->output_format;
-+	new_state->requested_output_format = vc4_state->requested_output_format;
- 	new_state->broadcast_rgb = vc4_state->broadcast_rgb;
- 	__drm_atomic_helper_connector_duplicate_state(connector, &new_state->base);
- 
-@@ -711,6 +718,33 @@ vc4_hdmi_attach_broadcast_rgb_property(s
- 	drm_object_attach_property(&vc4_hdmi->connector.base, prop, 0);
- }
- 
-+static const struct drm_prop_enum_list output_format_names[] = {
-+	{ VC4_HDMI_OUTPUT_AUTO, "Automatic" },
-+	{ VC4_HDMI_OUTPUT_RGB, "RGB" },
-+	{ VC4_HDMI_OUTPUT_YUV422, "YCbCr 4:2:2" },
-+	{ VC4_HDMI_OUTPUT_YUV444, "YCbCr 4:4:4" },
-+};
-+
-+static void
-+vc4_hdmi_attach_output_format_property(struct drm_device *dev,
-+				       struct vc4_hdmi *vc4_hdmi)
-+{
-+	struct drm_property *prop = vc4_hdmi->output_format_property;
-+
-+	if (!prop) {
-+		prop = drm_property_create_enum(dev, DRM_MODE_PROP_ENUM,
-+						"Output format",
-+						output_format_names,
-+						ARRAY_SIZE(output_format_names));
-+		if (!prop)
-+			return;
-+
-+		vc4_hdmi->output_format_property = prop;
-+	}
-+
-+	drm_object_attach_property(&vc4_hdmi->connector.base, prop, 0);
-+}
-+
- static int vc4_hdmi_connector_init(struct drm_device *dev,
- 				   struct vc4_hdmi *vc4_hdmi)
- {
-@@ -758,6 +792,7 @@ static int vc4_hdmi_connector_init(struc
- 		drm_connector_attach_hdr_output_metadata_property(connector);
- 
- 	vc4_hdmi_attach_broadcast_rgb_property(dev, vc4_hdmi);
-+	vc4_hdmi_attach_output_format_property(dev, vc4_hdmi);
- 
- 	drm_connector_attach_encoder(connector, encoder);
- 
-@@ -1895,6 +1930,11 @@ static void vc4_hdmi_encoder_atomic_mode
- 	vc4_hdmi->broadcast_rgb = vc4_state->broadcast_rgb;
- 	vc4_hdmi->output_bpc = vc4_state->output_bpc;
- 	vc4_hdmi->output_format = vc4_state->output_format;
-+	vc4_hdmi->requested_output_format = vc4_state->requested_output_format;
-+	vc4_hdmi->broadcast_rgb = vc4_state->broadcast_rgb;
-+	memcpy(&vc4_hdmi->saved_adjusted_mode,
-+	       &crtc_state->adjusted_mode,
-+	       sizeof(vc4_hdmi->saved_adjusted_mode));
- 	mutex_unlock(&vc4_hdmi->mutex);
- }
- 
-@@ -2056,6 +2096,26 @@ vc4_hdmi_encoder_compute_format(const st
- 	const struct drm_display_info *info = &connector->display_info;
- 	unsigned int format;
- 
-+	if (vc4_state->requested_output_format != VC4_HDMI_OUTPUT_AUTO) {
-+		drm_dbg(dev, "Trying with user requested output %u\n",
-+			vc4_state->requested_output_format);
-+
-+		format = vc4_state->requested_output_format;
-+		if (vc4_hdmi_sink_supports_format_bpc(vc4_hdmi, info, mode,
-+						      format, bpc)) {
-+			int ret;
-+
-+			ret = vc4_hdmi_encoder_compute_clock(vc4_hdmi, vc4_state,
-+							     mode, bpc, format);
-+			if (!ret) {
-+				vc4_state->output_format = format;
-+				return 0;
-+			}
-+		}
-+
-+		return -EINVAL;
-+	}
-+
- 	drm_dbg(dev, "Trying with an RGB output\n");
- 
- 	format = VC4_HDMI_OUTPUT_RGB;
---- a/drivers/gpu/drm/vc4/vc4_hdmi.h
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
-@@ -111,6 +111,7 @@ struct vc4_hdmi_audio {
- };
- 
- enum vc4_hdmi_output_format {
-+	VC4_HDMI_OUTPUT_AUTO,
- 	VC4_HDMI_OUTPUT_RGB,
- 	VC4_HDMI_OUTPUT_YUV422,
- 	VC4_HDMI_OUTPUT_YUV444,
-@@ -130,6 +131,7 @@ struct vc4_hdmi {
- 	struct delayed_work scrambling_work;
- 
- 	struct drm_property *broadcast_rgb_property;
-+	struct drm_property *output_format_property;
- 
- 	struct i2c_adapter *ddc;
- 	void __iomem *hdmicore_regs;
-@@ -223,6 +225,11 @@ struct vc4_hdmi {
- 	 * for use outside of KMS hooks. Protected by @mutex.
- 	 */
- 	enum vc4_hdmi_output_format output_format;
-+	/**
-+	 * @requested_output_format: Copy of @vc4_connector_state.requested_output_format
-+	 * for use outside of KMS hooks. Protected by @mutex.
-+	 */
-+	enum vc4_hdmi_output_format requested_output_format;
- 
- 	/**
- 	 * @broadcast_rgb: Copy of @vc4_connector_state.broadcast_rgb
-@@ -249,6 +256,7 @@ struct vc4_hdmi_connector_state {
- 	unsigned long long		tmds_char_rate;
- 	unsigned int 			output_bpc;
- 	enum vc4_hdmi_output_format	output_format;
-+	enum vc4_hdmi_output_format	requested_output_format;
- 	int				broadcast_rgb;
- };
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0537-bcm2835-mmc-Honor-return-value-of-mmc_of_parse.patch b/target/linux/bcm27xx/patches-6.1/950-0537-bcm2835-mmc-Honor-return-value-of-mmc_of_parse.patch
deleted file mode 100644
index 6648e5e44f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0537-bcm2835-mmc-Honor-return-value-of-mmc_of_parse.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a29e90b43912193131804427e133d1869695044f Mon Sep 17 00:00:00 2001
-From: Lukas Wunner <lukas@wunner.de>
-Date: Sat, 14 Jan 2023 10:03:46 +0100
-Subject: [PATCH] bcm2835-mmc: Honor return value of mmc_of_parse()
-
-bcm2835_mmc_probe() ignores errors returned by mmc_of_parse() and in
-particular ignores -EPROBE_DEFER, which may be returned if the power
-sequencing driver configured in the devicetree is compiled as a module.
-
-The user-visible result is that access to the SDIO device fails because
-its power sequencing requirements have not been observed.  Fix it.
-
-Signed-off-by: Lukas Wunner <lukas@wunner.de>
----
- drivers/mmc/host/bcm2835-mmc.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/drivers/mmc/host/bcm2835-mmc.c
-+++ b/drivers/mmc/host/bcm2835-mmc.c
-@@ -1474,7 +1474,9 @@ static int bcm2835_mmc_probe(struct plat
- 	}
- 
- 	if (node) {
--		mmc_of_parse(mmc);
-+		ret = mmc_of_parse(mmc);
-+		if (ret)
-+			goto err;
- 
- 		/* Read any custom properties */
- 		of_property_read_u32(node,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0539-overlays-i2c-sensor-Add-mpu6050-and-mpu9250.patch b/target/linux/bcm27xx/patches-6.1/950-0539-overlays-i2c-sensor-Add-mpu6050-and-mpu9250.patch
deleted file mode 100644
index 9ff84dd1e7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0539-overlays-i2c-sensor-Add-mpu6050-and-mpu9250.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-From d9cc69d32d100db9e383c81bd5c8f62ec16fd61c Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 17 Jan 2023 15:47:04 +0000
-Subject: [PATCH] overlays: i2c-sensor: Add mpu6050 and mpu9250
-
-Add support for the MPU6050 and MPU9250 IMU sensors to the i2c-sensor
-container overlay. At the same time, deprecate the standalone mpu6050
-overlay, but keep it around for now.
-
-(Also fix a few typos spotted while editing)
-
-See: https://github.com/raspberrypi/linux/issues/5325
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/README             | 26 ++++++-----
- .../boot/dts/overlays/i2c-sensor-common.dtsi  | 43 ++++++++++++++++++-
- arch/arm/boot/dts/overlays/overlay_map.dts    |  4 ++
- 3 files changed, 61 insertions(+), 12 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -1983,8 +1983,8 @@ Info:   Adds support for a number of I2C
- Load:   dtoverlay=i2c-sensor,<param>=<val>
- Params: addr                    Set the address for the BH1750, BME280, BME680,
-                                 BMP280, CCS811, DS1621, HDC100X, JC42, LM75,
--                                MCP980x, MS5637, MS5803, MS5805, MS5837, MS8607,
--                                SHT3x or TMP102
-+                                MCP980x, MPU6050, MPU9250, MS5637, MS5803,
-+                                MS5805, MS5837, MS8607, SHT3x or TMP102
- 
-         aht10                   Select the Aosong AHT10 temperature and humidity
-                                 sensor
-@@ -2016,8 +2016,8 @@ Params: addr                    Set the
- 
-         htu21                   Select the HTU21 temperature and humidity sensor
- 
--        int_pin                 Set the GPIO to use for interrupts (max30102
--                                only)
-+        int_pin                 Set the GPIO to use for interrupts (max30102,
-+                                mpu6050 and mpu9250 only)
- 
-         jc42                    Select any of the many JEDEC JC42.4-compliant
-                                 temperature sensors, including:
-@@ -2045,6 +2045,12 @@ Params: addr                    Set the
-                                 use the "jc42" option.
-                                 Valid addresses are 0x18-0x1f (default 0x18)
- 
-+        mpu6050                 Select the InvenSense MPU6050 IMU. Valid
-+                                valid addresses are 0x68 and 0x69 (default 0x68)
-+
-+        mpu9250                 Select the InvenSense MPU9250 IMU. Valid
-+                                valid addresses are 0x68 and 0x69 (default 0x68)
-+
-         ms5637                  Select the Measurement Specialities MS5637
-                                 pressure and temperature sensor.
- 
-@@ -2913,10 +2919,10 @@ Params: overclock_50            Clock (i
- 
- 
- Name:   mpu6050
--Info:   Overlay for i2c connected mpu6050 imu
--Load:   dtoverlay=mpu6050,<param>=<val>
--Params: interrupt               GPIO pin for interrupt (default 4)
--        addr                    I2C address of the device (default 0x68)
-+Info:   This overlay has been deprecated - use "dtoverlay=i2c-sensor,mpu6050"
-+        instead. Note that "int_pin" is the new name for the "interrupt"
-+        parameter.
-+Load:   <Deprecated>
- 
- 
- Name:   mz61581
-@@ -3416,7 +3422,7 @@ Params: <None>
- 
- 
- Name:   rpi-dac
--Info:   This overlay has been renaamed to i2s-dac.
-+Info:   This overlay has been renamed to i2s-dac.
- Load:   <Deprecated>
- 
- 
-@@ -3546,7 +3552,7 @@ Params: poe_fan_temp0           Temperat
- 
- 
- Name:   rpi-proto
--Info:   This overlay has been renamaed to proto-codec.
-+Info:   This overlay has been renamed to proto-codec.
- Load:   <Deprecated>
- 
- 
---- a/arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi
-+++ b/arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi
-@@ -421,6 +421,40 @@
- 		};
- 	};
- 
-+	fragment@28 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+                        clock-frequency = <400000>;
-+
-+                        mpu6050: mpu6050@68 {
-+                                compatible = "invensense,mpu6050";
-+                                reg = <0x68>;
-+                                interrupt-parent = <&gpio>;
-+                                interrupts = <4 2>;
-+                        };
-+		};
-+	};
-+
-+	fragment@29 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+                        clock-frequency = <400000>;
-+
-+                        mpu9250: mpu9250@68 {
-+                                compatible = "invensense,mpu9250";
-+                                reg = <0x68>;
-+                                interrupt-parent = <&gpio>;
-+                                interrupts = <4 2>;
-+                        };
-+		};
-+	};
-+
- 	__overrides__ {
- 		bme280 = <0>,"+0";
- 		bmp085 = <0>,"+1";
-@@ -451,14 +485,19 @@
- 		ms5805 = <0>,"+25";
- 		ms5837 = <0>,"+26";
- 		ms8607 = <0>,"+27";
-+		mpu6050 = <0>,"+28";
-+		mpu9250 = <0>,"+29";
- 
- 		addr =  <&bme280>,"reg:0", <&bmp280>,"reg:0", <&tmp102>,"reg:0",
- 			<&lm75>,"reg:0", <&hdc100x>,"reg:0", <&sht3x>,"reg:0",
- 			<&ds1621>,"reg:0", <&bme680>,"reg:0", <&ccs811>,"reg:0",
- 			<&bh1750>,"reg:0", <&mcp980x>,"reg:0", <&jc42>,"reg:0",
- 			<&ms5637>,"reg:0", <&ms5803>,"reg:0", <&ms5805>,"reg:0",
--			<&ms5837>,"reg:0", <&ms8607>,"reg:0";
--		int_pin = <&max30102>, "interrupts:0";
-+			<&ms5837>,"reg:0", <&ms8607>,"reg:0",
-+			<&mpu6050>, "reg:0", <&mpu9250>, "reg:0";
-+		int_pin = <&max30102>, "interrupts:0",
-+			<&mpu6050>, "interrupts:0",
-+			<&mpu9250>, "interrupts:0";
- 		no_timeout = <&jc42>, "smbus-timeout-disable?";
- 	};
- };
---- a/arch/arm/boot/dts/overlays/overlay_map.dts
-+++ b/arch/arm/boot/dts/overlays/overlay_map.dts
-@@ -61,6 +61,10 @@
- 		bcm2711;
- 	};
- 
-+	mpu6050 {
-+		deprecated = "use i2c-sensor,mpu6050";
-+	};
-+
- 	pcie-32bit-dma {
- 		bcm2711;
- 	};
diff --git a/target/linux/bcm27xx/patches-6.1/950-0541-overlays-i2c-sensor-Use-TABs-for-indentation.patch b/target/linux/bcm27xx/patches-6.1/950-0541-overlays-i2c-sensor-Use-TABs-for-indentation.patch
deleted file mode 100644
index c7746c78e0..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0541-overlays-i2c-sensor-Use-TABs-for-indentation.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 20bdf59afc9d613744e22c4c12f531dc22554f10 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 18 Jan 2023 16:37:01 +0000
-Subject: [PATCH] overlays: i2c-sensor: Use TABs for indentation
-
-A whitespace-only change replacing groups of 8 spaces with TABs.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- .../boot/dts/overlays/i2c-sensor-common.dtsi  | 34 +++++++++----------
- 1 file changed, 17 insertions(+), 17 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi
-+++ b/arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi
-@@ -427,14 +427,14 @@
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 			status = "okay";
--                        clock-frequency = <400000>;
-+			clock-frequency = <400000>;
- 
--                        mpu6050: mpu6050@68 {
--                                compatible = "invensense,mpu6050";
--                                reg = <0x68>;
--                                interrupt-parent = <&gpio>;
--                                interrupts = <4 2>;
--                        };
-+			mpu6050: mpu6050@68 {
-+				compatible = "invensense,mpu6050";
-+				reg = <0x68>;
-+				interrupt-parent = <&gpio>;
-+				interrupts = <4 2>;
-+			};
- 		};
- 	};
- 
-@@ -444,14 +444,14 @@
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 			status = "okay";
--                        clock-frequency = <400000>;
-+			clock-frequency = <400000>;
- 
--                        mpu9250: mpu9250@68 {
--                                compatible = "invensense,mpu9250";
--                                reg = <0x68>;
--                                interrupt-parent = <&gpio>;
--                                interrupts = <4 2>;
--                        };
-+			mpu9250: mpu9250@68 {
-+				compatible = "invensense,mpu9250";
-+				reg = <0x68>;
-+				interrupt-parent = <&gpio>;
-+				interrupts = <4 2>;
-+			};
- 		};
- 	};
- 
-@@ -488,7 +488,7 @@
- 		mpu6050 = <0>,"+28";
- 		mpu9250 = <0>,"+29";
- 
--		addr =  <&bme280>,"reg:0", <&bmp280>,"reg:0", <&tmp102>,"reg:0",
-+		addr =	<&bme280>,"reg:0", <&bmp280>,"reg:0", <&tmp102>,"reg:0",
- 			<&lm75>,"reg:0", <&hdc100x>,"reg:0", <&sht3x>,"reg:0",
- 			<&ds1621>,"reg:0", <&bme680>,"reg:0", <&ccs811>,"reg:0",
- 			<&bh1750>,"reg:0", <&mcp980x>,"reg:0", <&jc42>,"reg:0",
diff --git a/target/linux/bcm27xx/patches-6.1/950-0542-overlays-i2c-sensor-Add-BNO055-IMU-sensor.patch b/target/linux/bcm27xx/patches-6.1/950-0542-overlays-i2c-sensor-Add-BNO055-IMU-sensor.patch
deleted file mode 100644
index 3d8ba021ac..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0542-overlays-i2c-sensor-Add-BNO055-IMU-sensor.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 04ca4e22abfc21a615b6003ea512fa79dee94cd5 Mon Sep 17 00:00:00 2001
-From: PolarStarWalker <savmot1929@gmail.com>
-Date: Mon, 2 Jan 2023 02:13:27 +0300
-Subject: [PATCH] overlays: i2c-sensor: Add BNO055 IMU sensor
-
-Add support for the Bosch BNO055 9-dof IMU sensor.
-
-Signed-off-by: PolarStarWalker <savmot1929@gmail.com>
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/README             |  6 ++++
- .../boot/dts/overlays/i2c-sensor-common.dtsi  | 28 ++++++++++++++++++-
- 2 files changed, 33 insertions(+), 1 deletion(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -2005,6 +2005,9 @@ Params: addr                    Set the
-         bmp280                  Select the Bosch Sensortronic BMP280
-                                 Valid addresses 0x76-0x77, default 0x76
- 
-+        bno055                  Select the Bosch Sensortronic BNO055 IMU
-+                                Valid address 0x28-0x29, default 0x29
-+
-         ccs811                  Select the AMS CCS811 digital gas sensor
-                                 Valid addresses 0x5a-0x5b, default 0x5b
- 
-@@ -2071,6 +2074,9 @@ Params: addr                    Set the
-                                 incompatible device can stop it from being
-                                 activated.
- 
-+        reset_pin               GPIO to be used to reset the device (bno055
-+                                only, disabled by default)
-+
-         sht3x                   Select the Sensiron SHT3x temperature and
-                                 humidity sensor. Valid addresses 0x44-0x45,
-                                 default 0x44
---- a/arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi
-+++ b/arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi
-@@ -2,6 +2,8 @@
- /dts-v1/;
- /plugin/;
- 
-+#include <dt-bindings/gpio/gpio.h>
-+
- / {
- 	compatible = "brcm,bcm2835";
- 
-@@ -455,6 +457,27 @@
- 		};
- 	};
- 
-+	fragment@30 {
-+		target = <&bno055>;
-+		__dormant__ {
-+			reset-gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+
-+	fragment@31 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			bno055: bno055@29 {
-+				compatible = "bosch,bno055";
-+				reg = <0x29>;
-+			};
-+		};
-+	};
-+
- 	__overrides__ {
- 		bme280 = <0>,"+0";
- 		bmp085 = <0>,"+1";
-@@ -487,6 +510,7 @@
- 		ms8607 = <0>,"+27";
- 		mpu6050 = <0>,"+28";
- 		mpu9250 = <0>,"+29";
-+		bno055 = <0>,"+31";
- 
- 		addr =	<&bme280>,"reg:0", <&bmp280>,"reg:0", <&tmp102>,"reg:0",
- 			<&lm75>,"reg:0", <&hdc100x>,"reg:0", <&sht3x>,"reg:0",
-@@ -494,10 +518,12 @@
- 			<&bh1750>,"reg:0", <&mcp980x>,"reg:0", <&jc42>,"reg:0",
- 			<&ms5637>,"reg:0", <&ms5803>,"reg:0", <&ms5805>,"reg:0",
- 			<&ms5837>,"reg:0", <&ms8607>,"reg:0",
--			<&mpu6050>, "reg:0", <&mpu9250>, "reg:0";
-+			<&mpu6050>,"reg:0", <&mpu9250>,"reg:0",
-+			<&bno055>,"reg:0";
- 		int_pin = <&max30102>, "interrupts:0",
- 			<&mpu6050>, "interrupts:0",
- 			<&mpu9250>, "interrupts:0";
- 		no_timeout = <&jc42>, "smbus-timeout-disable?";
-+		reset_pin = <&bno055>,"reset-gpios:4", <0>,"+30";
- 	};
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0543-dtoverlay-Update-vc4-kms-dpi-generic-for-changed-med.patch b/target/linux/bcm27xx/patches-6.1/950-0543-dtoverlay-Update-vc4-kms-dpi-generic-for-changed-med.patch
deleted file mode 100644
index 2efac2bf71..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0543-dtoverlay-Update-vc4-kms-dpi-generic-for-changed-med.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 5db5dc0aaa9800c196066c76078947d941ee45ad Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 19 Jan 2023 19:51:49 +0000
-Subject: [PATCH] dtoverlay: Update vc4-kms-dpi-generic for changed
- mediabus formats
-
-Several of the media bus formats aren't merged upstream yet,
-therefore the values change when upstream does introduce
-new formats.
-
-As vc4-kms-dpi-generic references the media bus formats explicitly
-by number, update it to match.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-generic-overlay.dts
-@@ -65,10 +65,10 @@
- 
- 		rgb565 = <&panel_generic>, "bus-format:0=0x1017",
- 			<&dpi_node_generic>, "pinctrl-0:0=",<&dpi_16bit_gpio0>;
--		rgb565-padhi = <&panel_generic>, "bus-format:0=0x1020",
-+		rgb565-padhi = <&panel_generic>, "bus-format:0=0x1022",
- 			<&dpi_node_generic>, "pinctrl-0:0=",<&dpi_16bit_cpadhi_gpio0>;
--		bgr666 = <&panel_generic>, "bus-format:0=0x101f";
--		bgr666-padhi = <&panel_generic>, "bus-format:0=0x101e",
-+		bgr666 = <&panel_generic>, "bus-format:0=0x1023";
-+		bgr666-padhi = <&panel_generic>, "bus-format:0=0x1024",
- 			<&dpi_node_generic>, "pinctrl-0:0=",<&dpi_18bit_cpadhi_gpio0>;
- 		rgb666-padhi = <&panel_generic>, "bus-format:0=0x1015",
- 			<&dpi_node_generic>, "pinctrl-0:0=",<&dpi_18bit_cpadhi_gpio0>;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0544-drm-vc4-hvs-Defer-dlist-slots-deallocation.patch b/target/linux/bcm27xx/patches-6.1/950-0544-drm-vc4-hvs-Defer-dlist-slots-deallocation.patch
deleted file mode 100644
index 86359ea61c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0544-drm-vc4-hvs-Defer-dlist-slots-deallocation.patch
+++ /dev/null
@@ -1,401 +0,0 @@
-From 01576f30d7af7455fcf6d650834791f4b80901e8 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Thu, 16 Dec 2021 14:54:54 +0100
-Subject: [PATCH] drm/vc4: hvs: Defer dlist slots deallocation
-
-During normal operations, the cursor position update is done through an
-asynchronous plane update, which on the vc4 driver basically just
-modifies the right dlist word to move the plane to the new coordinates.
-
-However, when we have the overscan margins setup, we fall back to a
-regular commit when we are next to the edges. And since that commit
-happens to be on a cursor plane, it's considered a legacy cursor update
-by KMS.
-
-The main difference it makes is that it won't wait for its completion
-(ie, next vblank) before returning. This means if we have multiple
-commits happening in rapid succession, we can have several of them
-happening before the next vblank.
-
-In parallel, our dlist allocation is tied to a CRTC state, and each time
-we do a commit we end up with a new CRTC state, with the previous one
-being freed. This means that we free our previous dlist entry (but don't
-clear it though) every time a new one is being committed.
-
-Now, if we were to have two commits happening before the next vblank, we
-could end up freeing reusing the same dlist entries before the next
-vblank.
-
-Indeed, we would start from an initial state taking, for example, the
-dlist entries 10 to 20, then start a commit taking the entries 20 to 30
-and setting the dlist pointer to 20, and freeing the dlist entries 10 to
-20. However, since we haven't reach vblank yet, the HVS is still using
-the entries 10 to 20.
-
-If we were to make a new commit now, chances are the allocator are going
-to give the 10 to 20 entries back, and we would change their content to
-match the new state. If vblank hasn't happened yet, we just corrupted
-the active dlist entries.
-
-A first attempt to solve this was made by creating an intermediate dlist
-buffer to store the current (ie, as of the last commit) dlist content,
-that we would update each time the HVS is done with a frame. However, if
-the interrupt handler missed the vblank window, we would end up copying
-our intermediate dlist to the hardware one during the composition,
-essentially creating the same issue.
-
-Since making sure that our interrupt handler runs within a fixed,
-constrained, time window would require to make Linux a real-time kernel,
-this seems a bit out of scope.
-
-Instead, we can work around our original issue by keeping the dlist
-slots allocation longer. That way, we won't reuse a dlist slot while
-it's still in flight. In order to achieve this, instead of freeing the
-dlist slot when its associated CRTC state is destroyed, we'll queue it
-in a list.
-
-A naive implementation would free the buffers in that queue when we get
-our end of frame interrupt. However, there's still a race since, just
-like in the shadow dlist case, we don't control when the handler for
-that interrupt is going to run. Thus, we can end up with a commit adding
-an old dlist allocation to our queue during the window between our
-actual interrupt and when our handler will run. And since that buffer is
-still being used for the composition of the current frame, we can't free
-it right away, exposing us to the original bug.
-
-Fortunately for us, the hardware provides a frame counter that is
-increased each time the first line of a frame is being generated.
-Associating the frame counter the image is supposed to go away to the
-allocation, and then only deallocate buffers that have a counter below
-or equal to the one we see when the deallocation code should prevent the
-above race from occuring.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_crtc.c |  10 +-
- drivers/gpu/drm/vc4/vc4_drv.h  |  15 ++-
- drivers/gpu/drm/vc4/vc4_hvs.c  | 184 ++++++++++++++++++++++++++++++---
- 3 files changed, 186 insertions(+), 23 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_crtc.c
-+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
-@@ -1096,14 +1096,8 @@ void vc4_crtc_destroy_state(struct drm_c
- 	struct vc4_dev *vc4 = to_vc4_dev(crtc->dev);
- 	struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(state);
- 
--	if (drm_mm_node_allocated(&vc4_state->mm)) {
--		unsigned long flags;
--
--		spin_lock_irqsave(&vc4->hvs->mm_lock, flags);
--		drm_mm_remove_node(&vc4_state->mm);
--		spin_unlock_irqrestore(&vc4->hvs->mm_lock, flags);
--
--	}
-+	vc4_hvs_mark_dlist_entry_stale(vc4->hvs, vc4_state->mm);
-+	vc4_state->mm = NULL;
- 
- 	drm_atomic_helper_crtc_destroy_state(crtc, state);
- }
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -346,6 +346,9 @@ struct vc4_hvs {
- 	struct drm_mm lbm_mm;
- 	spinlock_t mm_lock;
- 
-+	struct list_head stale_dlist_entries;
-+	struct work_struct free_dlist_work;
-+
- 	struct drm_mm_node mitchell_netravali_filter;
- 
- 	struct debugfs_regset32 regset;
-@@ -648,10 +651,16 @@ struct drm_connector *vc4_get_crtc_conne
- struct drm_encoder *vc4_get_crtc_encoder(struct drm_crtc *crtc,
- 					 struct drm_crtc_state *state);
- 
-+struct vc4_hvs_dlist_allocation {
-+	struct list_head node;
-+	struct drm_mm_node mm_node;
-+	unsigned int channel;
-+	u8 target_frame_count;
-+};
-+
- struct vc4_crtc_state {
- 	struct drm_crtc_state base;
--	/* Dlist area for this CRTC configuration. */
--	struct drm_mm_node mm;
-+	struct vc4_hvs_dlist_allocation *mm;
- 	bool txp_armed;
- 	unsigned int assigned_channel;
- 
-@@ -1077,6 +1086,8 @@ struct vc4_hvs *__vc4_hvs_alloc(struct v
- void vc4_hvs_stop_channel(struct vc4_hvs *hvs, unsigned int output);
- int vc4_hvs_get_fifo_from_output(struct vc4_hvs *hvs, unsigned int output);
- u8 vc4_hvs_get_fifo_frame_count(struct vc4_hvs *hvs, unsigned int fifo);
-+void vc4_hvs_mark_dlist_entry_stale(struct vc4_hvs *hvs,
-+				    struct vc4_hvs_dlist_allocation *alloc);
- int vc4_hvs_atomic_check(struct drm_crtc *crtc, struct drm_atomic_state *state);
- void vc4_hvs_atomic_begin(struct drm_crtc *crtc, struct drm_atomic_state *state);
- void vc4_hvs_atomic_enable(struct drm_crtc *crtc, struct drm_atomic_state *state);
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -412,6 +412,152 @@ static void vc5_hvs_update_gamma_lut(str
- 	vc5_hvs_lut_load(hvs, vc4_crtc);
- }
- 
-+static void vc4_hvs_irq_enable_eof(const struct vc4_hvs *hvs,
-+				   unsigned int channel)
-+{
-+	struct vc4_dev *vc4 = hvs->vc4;
-+	u32 irq_mask = vc4->is_vc5 ?
-+		SCALER5_DISPCTRL_DSPEIEOF(channel) :
-+		SCALER_DISPCTRL_DSPEIEOF(channel);
-+
-+	HVS_WRITE(SCALER_DISPCTRL,
-+		  HVS_READ(SCALER_DISPCTRL) | irq_mask);
-+}
-+
-+static void vc4_hvs_irq_clear_eof(const struct vc4_hvs *hvs,
-+				  unsigned int channel)
-+{
-+	struct vc4_dev *vc4 = hvs->vc4;
-+	u32 irq_mask = vc4->is_vc5 ?
-+		SCALER5_DISPCTRL_DSPEIEOF(channel) :
-+		SCALER_DISPCTRL_DSPEIEOF(channel);
-+
-+	HVS_WRITE(SCALER_DISPCTRL,
-+		  HVS_READ(SCALER_DISPCTRL) & ~irq_mask);
-+}
-+
-+static struct vc4_hvs_dlist_allocation *
-+vc4_hvs_alloc_dlist_entry(struct vc4_hvs *hvs,
-+			  unsigned int channel,
-+			  size_t dlist_count)
-+{
-+	struct vc4_hvs_dlist_allocation *alloc;
-+	unsigned long flags;
-+	int ret;
-+
-+	if (channel == VC4_HVS_CHANNEL_DISABLED)
-+		return NULL;
-+
-+	alloc = kzalloc(sizeof(*alloc), GFP_KERNEL);
-+	if (!alloc)
-+		return ERR_PTR(-ENOMEM);
-+
-+	spin_lock_irqsave(&hvs->mm_lock, flags);
-+	ret = drm_mm_insert_node(&hvs->dlist_mm, &alloc->mm_node,
-+				 dlist_count);
-+	spin_unlock_irqrestore(&hvs->mm_lock, flags);
-+	if (ret)
-+		return ERR_PTR(ret);
-+
-+	alloc->channel = channel;
-+
-+	return alloc;
-+}
-+
-+void vc4_hvs_mark_dlist_entry_stale(struct vc4_hvs *hvs,
-+				    struct vc4_hvs_dlist_allocation *alloc)
-+{
-+	unsigned long flags;
-+	u8 frcnt;
-+
-+	if (!alloc)
-+		return;
-+
-+	if (!drm_mm_node_allocated(&alloc->mm_node))
-+		return;
-+
-+	frcnt = vc4_hvs_get_fifo_frame_count(hvs, alloc->channel);
-+	alloc->target_frame_count = (frcnt + 1) & ((1 << 6) - 1);
-+
-+	spin_lock_irqsave(&hvs->mm_lock, flags);
-+
-+	list_add_tail(&alloc->node, &hvs->stale_dlist_entries);
-+
-+	HVS_WRITE(SCALER_DISPSTAT, SCALER_DISPSTAT_EOF(alloc->channel));
-+	vc4_hvs_irq_enable_eof(hvs, alloc->channel);
-+
-+	spin_unlock_irqrestore(&hvs->mm_lock, flags);
-+}
-+
-+static void vc4_hvs_schedule_dlist_sweep(struct vc4_hvs *hvs,
-+					 unsigned int channel)
-+{
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&hvs->mm_lock, flags);
-+
-+	if (!list_empty(&hvs->stale_dlist_entries))
-+		queue_work(system_unbound_wq, &hvs->free_dlist_work);
-+
-+	vc4_hvs_irq_clear_eof(hvs, channel);
-+
-+	spin_unlock_irqrestore(&hvs->mm_lock, flags);
-+}
-+
-+/*
-+ * Frame counts are essentially sequence numbers over 6 bits, and we
-+ * thus can use sequence number arithmetic and follow the RFC1982 to
-+ * implement proper comparison between them.
-+ */
-+static bool vc4_hvs_frcnt_lte(u8 cnt1, u8 cnt2)
-+{
-+	return (s8)((cnt1 << 2) - (cnt2 << 2)) <= 0;
-+}
-+
-+/*
-+ * Some atomic commits (legacy cursor updates, mostly) will not wait for
-+ * the next vblank and will just return once the commit has been pushed
-+ * to the hardware.
-+ *
-+ * On the hardware side, our HVS stores the planes parameters in its
-+ * context RAM, and will use part of the RAM to store data during the
-+ * frame rendering.
-+ *
-+ * This interacts badly if we get multiple commits before the next
-+ * vblank since we could end up overwriting the DLIST entries used by
-+ * previous commits if our dlist allocation reuses that entry. In such a
-+ * case, we would overwrite the data currently being used by the
-+ * hardware, resulting in a corrupted frame.
-+ *
-+ * In order to work around this, we'll queue the dlist entries in a list
-+ * once the associated CRTC state is destroyed. The HVS only allows us
-+ * to know which entry is being active, but not which one are no longer
-+ * being used, so in order to avoid freeing entries that are still used
-+ * by the hardware we add a guesstimate of the frame count where our
-+ * entry will no longer be used, and thus will only free those entries
-+ * when we will have reached that frame count.
-+ */
-+static void vc4_hvs_dlist_free_work(struct work_struct *work)
-+{
-+	struct vc4_hvs *hvs = container_of(work, struct vc4_hvs, free_dlist_work);
-+	struct vc4_hvs_dlist_allocation *cur, *next;
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&hvs->mm_lock, flags);
-+	list_for_each_entry_safe(cur, next, &hvs->stale_dlist_entries, node) {
-+		u8 frcnt;
-+
-+		frcnt = vc4_hvs_get_fifo_frame_count(hvs, cur->channel);
-+		if (!vc4_hvs_frcnt_lte(cur->target_frame_count, frcnt))
-+			continue;
-+
-+		list_del(&cur->node);
-+		drm_mm_remove_node(&cur->mm_node);
-+		kfree(cur);
-+	}
-+	spin_unlock_irqrestore(&hvs->mm_lock, flags);
-+}
-+
- u8 vc4_hvs_get_fifo_frame_count(struct vc4_hvs *hvs, unsigned int fifo)
- {
- 	struct drm_device *drm = &hvs->vc4->base;
-@@ -643,13 +789,12 @@ int vc4_hvs_atomic_check(struct drm_crtc
- {
- 	struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
- 	struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc_state);
-+	struct vc4_hvs_dlist_allocation *alloc;
- 	struct drm_device *dev = crtc->dev;
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 	struct drm_plane *plane;
--	unsigned long flags;
- 	const struct drm_plane_state *plane_state;
- 	u32 dlist_count = 0;
--	int ret;
- 
- 	/* The pixelvalve can only feed one encoder (and encoders are
- 	 * 1:1 with connectors.)
-@@ -662,12 +807,11 @@ int vc4_hvs_atomic_check(struct drm_crtc
- 
- 	dlist_count++; /* Account for SCALER_CTL0_END. */
- 
--	spin_lock_irqsave(&vc4->hvs->mm_lock, flags);
--	ret = drm_mm_insert_node(&vc4->hvs->dlist_mm, &vc4_state->mm,
--				 dlist_count);
--	spin_unlock_irqrestore(&vc4->hvs->mm_lock, flags);
--	if (ret)
--		return ret;
-+	alloc = vc4_hvs_alloc_dlist_entry(vc4->hvs, vc4_state->assigned_channel, dlist_count);
-+	if (IS_ERR(alloc))
-+		return PTR_ERR(alloc);
-+
-+	vc4_state->mm = alloc;
- 
- 	return vc4_hvs_gamma_check(crtc, state);
- }
-@@ -683,8 +827,9 @@ static void vc4_hvs_install_dlist(struct
- 	if (!drm_dev_enter(dev, &idx))
- 		return;
- 
-+	WARN_ON(!vc4_state->mm);
- 	HVS_WRITE(SCALER_DISPLISTX(vc4_state->assigned_channel),
--		  vc4_state->mm.start);
-+		  vc4_state->mm->mm_node.start);
- 
- 	drm_dev_exit(idx);
- }
-@@ -711,8 +856,10 @@ static void vc4_hvs_update_dlist(struct
- 		spin_unlock_irqrestore(&dev->event_lock, flags);
- 	}
- 
-+	WARN_ON(!vc4_state->mm);
-+
- 	spin_lock_irqsave(&vc4_crtc->irq_lock, flags);
--	vc4_crtc->current_dlist = vc4_state->mm.start;
-+	vc4_crtc->current_dlist = vc4_state->mm->mm_node.start;
- 	spin_unlock_irqrestore(&vc4_crtc->irq_lock, flags);
- }
- 
-@@ -769,8 +916,7 @@ void vc4_hvs_atomic_flush(struct drm_crt
- 	struct vc4_plane_state *vc4_plane_state;
- 	bool debug_dump_regs = false;
- 	bool enable_bg_fill = false;
--	u32 __iomem *dlist_start = vc4->hvs->dlist + vc4_state->mm.start;
--	u32 __iomem *dlist_next = dlist_start;
-+	u32 __iomem *dlist_start, *dlist_next;
- 	unsigned int zpos = 0;
- 	bool found = false;
- 	int idx;
-@@ -788,6 +934,9 @@ void vc4_hvs_atomic_flush(struct drm_crt
- 		vc4_hvs_dump_state(hvs);
- 	}
- 
-+	dlist_start = vc4->hvs->dlist + vc4_state->mm->mm_node.start;
-+	dlist_next = dlist_start;
-+
- 	/* Copy all the active planes' dlist contents to the hardware dlist. */
- 	do {
- 		found = false;
-@@ -821,7 +970,8 @@ void vc4_hvs_atomic_flush(struct drm_crt
- 	writel(SCALER_CTL0_END, dlist_next);
- 	dlist_next++;
- 
--	WARN_ON_ONCE(dlist_next - dlist_start != vc4_state->mm.size);
-+	WARN_ON(!vc4_state->mm);
-+	WARN_ON_ONCE(dlist_next - dlist_start != vc4_state->mm->mm_node.size);
- 
- 	if (enable_bg_fill)
- 		/* This sets a black background color fill, as is the case
-@@ -960,6 +1110,11 @@ static irqreturn_t vc4_hvs_irq_handler(i
- 
- 			irqret = IRQ_HANDLED;
- 		}
-+
-+		if (status & SCALER_DISPSTAT_EOF(channel)) {
-+			vc4_hvs_schedule_dlist_sweep(hvs, channel);
-+			irqret = IRQ_HANDLED;
-+		}
- 	}
- 
- 	/* Clear every per-channel interrupt flag. */
-@@ -1024,6 +1179,9 @@ struct vc4_hvs *__vc4_hvs_alloc(struct v
- 
- 	spin_lock_init(&hvs->mm_lock);
- 
-+	INIT_LIST_HEAD(&hvs->stale_dlist_entries);
-+	INIT_WORK(&hvs->free_dlist_work, vc4_hvs_dlist_free_work);
-+
- 	/* Set up the HVS display list memory manager.  We never
- 	 * overwrite the setup from the bootloader (just 128b out of
- 	 * our 16K), since we don't want to scramble the screen when
diff --git a/target/linux/bcm27xx/patches-6.1/950-0545-vc4-hdmi-Always-enable-GCP-with-AVMUTE-cleared.patch b/target/linux/bcm27xx/patches-6.1/950-0545-vc4-hdmi-Always-enable-GCP-with-AVMUTE-cleared.patch
deleted file mode 100644
index 69933251c8..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0545-vc4-hdmi-Always-enable-GCP-with-AVMUTE-cleared.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 3bd2ed90a679b87d4dc3fe0a70a83c323df915de Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Wed, 11 Jan 2023 17:30:58 +0000
-Subject: [PATCH] vc4/hdmi: Always enable GCP with AVMUTE cleared
-
-See: https://forum.libreelec.tv/thread/24780-le-10-0-1-rpi4-no-picture-after-update-from-le-10-0-0
-
-Issue is some displays go blank at the point of firmware to kms handover.
-Plugging/unplugging hdmi cable, power cycling display, or switching standby off/on
-typically resolve this case.
-
-Finally managed to find a display that suffers from this, and track down the issue.
-
-The firmware uses AVMUTE in normal operation. It will set AVMUTE before disabling hdmi
-clocks and phy. It will clear AVMUTE after clocks and phy are set up for a new hdmi mode.
-
-But with the hdmi handover from firmware to kms, AVMUTE will be set by firmware.
-
-kms driver typically has no GCP packet (except for deep colour modes).
-The spec isn't clear on whether to consider the AVMUTE as continuing indefinitely
-in the absense of a GCP packet, or to consider that state to have ended.
-
-Most displays behave as we want, but there are a number (from mutiple manufacturers)
-which need to see AVMUTE cleared before displaying a picture.
-
-Lets just always enable GCP packet with AVMUTE cleared. That resolves the issue on
-problematic displays.
-
-From HDMI 1.4 spec:
-A CD field of zero (Color Depth not indicated) shall be used whenever the Sink does
-not indicate support for Deep Color. This value may also be used in Deep Color mode
-to transmit a GCP indicating only non-Deep Color information (e.g. AVMUTE).
-
-So use CD=0 where we were previously not enabling a GCP.
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hdmi.c
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -107,6 +107,10 @@
- #define VC5_HDMI_GCP_WORD_1_GCP_SUBPACKET_BYTE_1_SHIFT	8
- #define VC5_HDMI_GCP_WORD_1_GCP_SUBPACKET_BYTE_1_MASK	VC4_MASK(15, 8)
- 
-+#define VC5_HDMI_GCP_WORD_1_GCP_SUBPACKET_BYTE_0_MASK	VC4_MASK(7, 0)
-+#define VC5_HDMI_GCP_WORD_1_GCP_SUBPACKET_BYTE_0_SET_AVMUTE	BIT(0)
-+#define VC5_HDMI_GCP_WORD_1_GCP_SUBPACKET_BYTE_0_CLEAR_AVMUTE	BIT(4)
-+
- # define VC4_HD_M_SW_RST			BIT(2)
- # define VC4_HD_M_ENABLE			BIT(0)
- 
-@@ -1559,7 +1563,6 @@ static void vc5_hdmi_set_timings(struct
- 					VC4_HDMI_VERTB_VBP));
- 	unsigned long flags;
- 	unsigned char gcp;
--	bool gcp_en;
- 	u32 reg;
- 	int idx;
- 
-@@ -1594,16 +1597,13 @@ static void vc5_hdmi_set_timings(struct
- 	switch (vc4_state->output_bpc) {
- 	case 12:
- 		gcp = 6;
--		gcp_en = true;
- 		break;
- 	case 10:
- 		gcp = 5;
--		gcp_en = true;
- 		break;
- 	case 8:
- 	default:
--		gcp = 4;
--		gcp_en = false;
-+		gcp = 0;
- 		break;
- 	}
- 
-@@ -1612,8 +1612,7 @@ static void vc5_hdmi_set_timings(struct
- 	 * doesn't signal in GCP.
- 	 */
- 	if (vc4_state->output_format == VC4_HDMI_OUTPUT_YUV422) {
--		gcp = 4;
--		gcp_en = false;
-+		gcp = 0;
- 	}
- 
- 	reg = HDMI_READ(HDMI_DEEP_COLOR_CONFIG_1);
-@@ -1626,11 +1625,12 @@ static void vc5_hdmi_set_timings(struct
- 	reg = HDMI_READ(HDMI_GCP_WORD_1);
- 	reg &= ~VC5_HDMI_GCP_WORD_1_GCP_SUBPACKET_BYTE_1_MASK;
- 	reg |= VC4_SET_FIELD(gcp, VC5_HDMI_GCP_WORD_1_GCP_SUBPACKET_BYTE_1);
-+	reg &= ~VC5_HDMI_GCP_WORD_1_GCP_SUBPACKET_BYTE_0_MASK;
-+	reg |= VC5_HDMI_GCP_WORD_1_GCP_SUBPACKET_BYTE_0_CLEAR_AVMUTE;
- 	HDMI_WRITE(HDMI_GCP_WORD_1, reg);
- 
- 	reg = HDMI_READ(HDMI_GCP_CONFIG);
--	reg &= ~VC5_HDMI_GCP_CONFIG_GCP_ENABLE;
--	reg |= gcp_en ? VC5_HDMI_GCP_CONFIG_GCP_ENABLE : 0;
-+	reg |= VC5_HDMI_GCP_CONFIG_GCP_ENABLE;
- 	HDMI_WRITE(HDMI_GCP_CONFIG, reg);
- 
- 	reg = HDMI_READ(HDMI_MISC_CONTROL);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0546-media-bcm2835-v4l2-codec-Enable-selection-ioctl-for-.patch b/target/linux/bcm27xx/patches-6.1/950-0546-media-bcm2835-v4l2-codec-Enable-selection-ioctl-for-.patch
deleted file mode 100644
index cf2e9a804a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0546-media-bcm2835-v4l2-codec-Enable-selection-ioctl-for-.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 774df1d5ef0d70c558ce8c6a56ab9e1e7114bb5f Mon Sep 17 00:00:00 2001
-From: John Cox <jc@kynesim.co.uk>
-Date: Thu, 19 Jan 2023 16:46:32 +0000
-Subject: [PATCH] media: bcm2835-v4l2-codec: Enable selection ioctl for
- ISP
-
-The ISP cases do nothing. Remove the break that separates them from the
-deinterlace case so they now do the same as deinterlace. This enables
-simple width & height setting, but does not enable setting left and
-top coordinates.
-
-Signed-off-by: John Cox <jc@kynesim.co.uk>
----
- .../staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c    | 2 --
- 1 file changed, 2 deletions(-)
-
---- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-+++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -1857,7 +1857,6 @@ static int vidioc_g_selection(struct fil
- 		}
- 		break;
- 	case ISP:
--		break;
- 	case DEINTERLACE:
- 		if (s->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
- 			switch (s->target) {
-@@ -1981,7 +1980,6 @@ static int vidioc_s_selection(struct fil
- 		}
- 		break;
- 	case ISP:
--		break;
- 	case DEINTERLACE:
- 		if (s->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
- 			switch (s->target) {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0548-overlays-i2c-sensor-Add-SHT4X-support.patch b/target/linux/bcm27xx/patches-6.1/950-0548-overlays-i2c-sensor-Add-SHT4X-support.patch
deleted file mode 100644
index 28fb05e567..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0548-overlays-i2c-sensor-Add-SHT4X-support.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 7f4d21e48d07ada294c9c383b350860aa20efeea Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 24 Jan 2023 11:34:38 +0000
-Subject: [PATCH] overlays: i2c-sensor: Add SHT4X support
-
-Add support for the Sensirion SHT4X temperature and humidity
-sensor.
-
-See: https://github.com/raspberrypi/linux/issues/5334
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/README              |  8 ++++++--
- .../boot/dts/overlays/i2c-sensor-common.dtsi   | 18 +++++++++++++++++-
- 2 files changed, 23 insertions(+), 3 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -2077,8 +2077,12 @@ Params: addr                    Set the
-         reset_pin               GPIO to be used to reset the device (bno055
-                                 only, disabled by default)
- 
--        sht3x                   Select the Sensiron SHT3x temperature and
--                                humidity sensor. Valid addresses 0x44-0x45,
-+        sht3x                   Select the Sensirion SHT3x temperature and
-+                                humidity sensors. Valid addresses 0x44-0x45,
-+                                default 0x44
-+
-+        sht4x                   Select the Sensirion SHT4x temperature and
-+                                humidity sensors. Valid addresses 0x44-0x45,
-                                 default 0x44
- 
-         si7020                  Select the Silicon Labs Si7013/20/21 humidity/
---- a/arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi
-+++ b/arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi
-@@ -478,6 +478,21 @@
- 		};
- 	};
- 
-+	fragment@32 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			sht4x: sht4x@44 {
-+				compatible = "sht4x";
-+				reg = <0x44>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
- 	__overrides__ {
- 		bme280 = <0>,"+0";
- 		bmp085 = <0>,"+1";
-@@ -511,6 +526,7 @@
- 		mpu6050 = <0>,"+28";
- 		mpu9250 = <0>,"+29";
- 		bno055 = <0>,"+31";
-+		sht4x = <0>,"+32";
- 
- 		addr =	<&bme280>,"reg:0", <&bmp280>,"reg:0", <&tmp102>,"reg:0",
- 			<&lm75>,"reg:0", <&hdc100x>,"reg:0", <&sht3x>,"reg:0",
-@@ -519,7 +535,7 @@
- 			<&ms5637>,"reg:0", <&ms5803>,"reg:0", <&ms5805>,"reg:0",
- 			<&ms5837>,"reg:0", <&ms8607>,"reg:0",
- 			<&mpu6050>,"reg:0", <&mpu9250>,"reg:0",
--			<&bno055>,"reg:0";
-+			<&bno055>,"reg:0", <&sht4x>,"reg:0";
- 		int_pin = <&max30102>, "interrupts:0",
- 			<&mpu6050>, "interrupts:0",
- 			<&mpu9250>, "interrupts:0";
diff --git a/target/linux/bcm27xx/patches-6.1/950-0549-kunit-Provide-a-static-key-to-check-if-KUnit-is-acti.patch b/target/linux/bcm27xx/patches-6.1/950-0549-kunit-Provide-a-static-key-to-check-if-KUnit-is-acti.patch
deleted file mode 100644
index cfd4c22919..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0549-kunit-Provide-a-static-key-to-check-if-KUnit-is-acti.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 0f354629c10f457751c20a230b13b1b7ac2f1fbc Mon Sep 17 00:00:00 2001
-From: David Gow <davidgow@google.com>
-Date: Fri, 25 Nov 2022 16:43:04 +0800
-Subject: [PATCH] kunit: Provide a static key to check if KUnit is
- actively running tests
-
-KUnit does a few expensive things when enabled. This hasn't been a
-problem because KUnit was only enabled on test kernels, but with a few
-people enabling (but not _using_) KUnit on production systems, we need a
-runtime way of handling this.
-
-Provide a 'kunit_running' static key (defaulting to false), which allows
-us to hide any KUnit code behind a static branch. This should reduce the
-performance impact (on other code) of having KUnit enabled to a single
-NOP when no tests are running.
-
-Note that, while it looks unintuitive, tests always run entirely within
-__kunit_test_suites_init(), so it's safe to decrement the static key at
-the end of this function, rather than in __kunit_test_suites_exit(),
-which is only there to clean up results in debugfs.
-
-Signed-off-by: David Gow <davidgow@google.com>
-Reviewed-by: Daniel Latypov <dlatypov@google.com>
-Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
----
- include/kunit/test.h | 4 ++++
- lib/kunit/test.c     | 6 ++++++
- 2 files changed, 10 insertions(+)
-
---- a/include/kunit/test.h
-+++ b/include/kunit/test.h
-@@ -16,6 +16,7 @@
- #include <linux/container_of.h>
- #include <linux/err.h>
- #include <linux/init.h>
-+#include <linux/jump_label.h>
- #include <linux/kconfig.h>
- #include <linux/kref.h>
- #include <linux/list.h>
-@@ -27,6 +28,9 @@
- 
- #include <asm/rwonce.h>
- 
-+/* Static key: true if any KUnit tests are currently running */
-+DECLARE_STATIC_KEY_FALSE(kunit_running);
-+
- struct kunit;
- 
- /* Size of log associated with test. */
---- a/lib/kunit/test.c
-+++ b/lib/kunit/test.c
-@@ -20,6 +20,8 @@
- #include "string-stream.h"
- #include "try-catch-impl.h"
- 
-+DEFINE_STATIC_KEY_FALSE(kunit_running);
-+
- #if IS_BUILTIN(CONFIG_KUNIT)
- /*
-  * Fail the current test and print an error message to the log.
-@@ -622,10 +624,14 @@ int __kunit_test_suites_init(struct kuni
- 		return 0;
- 	}
- 
-+	static_branch_inc(&kunit_running);
-+
- 	for (i = 0; i < num_suites; i++) {
- 		kunit_init_suite(suites[i]);
- 		kunit_run_tests(suites[i]);
- 	}
-+
-+	static_branch_dec(&kunit_running);
- 	return 0;
- }
- EXPORT_SYMBOL_GPL(__kunit_test_suites_init);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0550-kunit-Use-the-static-key-when-retrieving-the-current.patch b/target/linux/bcm27xx/patches-6.1/950-0550-kunit-Use-the-static-key-when-retrieving-the-current.patch
deleted file mode 100644
index 531d5fe6ac..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0550-kunit-Use-the-static-key-when-retrieving-the-current.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From e7950beaf2123170d65709df3988c25a280c05f1 Mon Sep 17 00:00:00 2001
-From: David Gow <davidgow@google.com>
-Date: Fri, 25 Nov 2022 16:43:05 +0800
-Subject: [PATCH] kunit: Use the static key when retrieving the current
- test
-
-In order to detect if a KUnit test is running, and to access its
-context, the 'kunit_test' member of the current task_struct is used.
-Usually, this is accessed directly or via the kunit_fail_current_task()
-function.
-
-In order to speed up the case where no test is running, add a wrapper,
-kunit_get_current_test(), which uses the static key to fail early.
-Equally, Speed up kunit_fail_current_test() by using the static key.
-
-This should make it convenient for code to call this
-unconditionally in fakes or error paths, without worrying that this will
-slow the code down significantly.
-
-If CONFIG_KUNIT=n (or m), this compiles away to nothing. If
-CONFIG_KUNIT=y, it will compile down to a NOP (on most architectures) if
-no KUnit test is currently running.
-
-Note that kunit_get_current_test() does not work if KUnit is built as a
-module. This mirrors the existing restriction on kunit_fail_current_test().
-
-Note that the definition of kunit_fail_current_test() still wraps an
-empty, inline function if KUnit is not built-in. This is to ensure that
-the printf format string __attribute__ will still work.
-
-Also update the documentation to suggest users use the new
-kunit_get_current_test() function, update the example, and to describe
-the behaviour when KUnit is disabled better.
-
-Cc: Jonathan Corbet <corbet@lwn.net>
-Cc: Sadiya Kazi <sadiyakazi@google.com>
-Signed-off-by: David Gow <davidgow@google.com>
-Reviewed-by: Daniel Latypov <dlatypov@google.com>
-Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
----
- Documentation/dev-tools/kunit/usage.rst | 30 +++++++++-----
- include/kunit/test-bug.h                | 53 +++++++++++++++++++++++--
- 2 files changed, 71 insertions(+), 12 deletions(-)
-
---- a/Documentation/dev-tools/kunit/usage.rst
-+++ b/Documentation/dev-tools/kunit/usage.rst
-@@ -625,17 +625,23 @@ as shown in next section: *Accessing The
- Accessing The Current Test
- --------------------------
- 
--In some cases, we need to call test-only code from outside the test file.
--For example, see example in section *Injecting Test-Only Code* or if
--we are providing a fake implementation of an ops struct. Using
--``kunit_test`` field in ``task_struct``, we can access it via
--``current->kunit_test``.
-+In some cases, we need to call test-only code from outside the test file.  This
-+is helpful, for example, when providing a fake implementation of a function, or
-+to fail any current test from within an error handler.
-+We can do this via the ``kunit_test`` field in ``task_struct``, which we can
-+access using the ``kunit_get_current_test()`` function in ``kunit/test-bug.h``.
-+
-+``kunit_get_current_test()`` is safe to call even if KUnit is not enabled. If
-+KUnit is not enabled, was built as a module (``CONFIG_KUNIT=m``), or no test is
-+running in the current task, it will return ``NULL``. This compiles down to
-+either a no-op or a static key check, so will have a negligible performance
-+impact when no test is running.
- 
--The example below includes how to implement "mocking":
-+The example below uses this to implement a "mock" implementation of a function, ``foo``:
- 
- .. code-block:: c
- 
--	#include <linux/sched.h> /* for current */
-+	#include <kunit/test-bug.h> /* for kunit_get_current_test */
- 
- 	struct test_data {
- 		int foo_result;
-@@ -644,7 +650,7 @@ The example below includes how to implem
- 
- 	static int fake_foo(int arg)
- 	{
--		struct kunit *test = current->kunit_test;
-+		struct kunit *test = kunit_get_current_test();
- 		struct test_data *test_data = test->priv;
- 
- 		KUNIT_EXPECT_EQ(test, test_data->want_foo_called_with, arg);
-@@ -675,7 +681,7 @@ Each test can have multiple resources wh
- flexibility as a ``priv`` member, but also, for example, allowing helper
- functions to create resources without conflicting with each other. It is also
- possible to define a clean up function for each resource, making it easy to
--avoid resource leaks. For more information, see Documentation/dev-tools/kunit/api/test.rst.
-+avoid resource leaks. For more information, see Documentation/dev-tools/kunit/api/resource.rst.
- 
- Failing The Current Test
- ------------------------
-@@ -703,3 +709,9 @@ structures as shown below:
- 	static void my_debug_function(void) { }
- 	#endif
- 
-+``kunit_fail_current_test()`` is safe to call even if KUnit is not enabled. If
-+KUnit is not enabled, was built as a module (``CONFIG_KUNIT=m``), or no test is
-+running in the current task, it will do nothing. This compiles down to either a
-+no-op or a static key check, so will have a negligible performance impact when
-+no test is running.
-+
---- a/include/kunit/test-bug.h
-+++ b/include/kunit/test-bug.h
-@@ -9,16 +9,63 @@
- #ifndef _KUNIT_TEST_BUG_H
- #define _KUNIT_TEST_BUG_H
- 
--#define kunit_fail_current_test(fmt, ...) \
--	__kunit_fail_current_test(__FILE__, __LINE__, fmt, ##__VA_ARGS__)
--
- #if IS_BUILTIN(CONFIG_KUNIT)
- 
-+#include <linux/jump_label.h> /* For static branch */
-+#include <linux/sched.h>
-+
-+/* Static key if KUnit is running any tests. */
-+DECLARE_STATIC_KEY_FALSE(kunit_running);
-+
-+/**
-+ * kunit_get_current_test() - Return a pointer to the currently running
-+ *			      KUnit test.
-+ *
-+ * If a KUnit test is running in the current task, returns a pointer to its
-+ * associated struct kunit. This pointer can then be passed to any KUnit
-+ * function or assertion. If no test is running (or a test is running in a
-+ * different task), returns NULL.
-+ *
-+ * This function is safe to call even when KUnit is disabled. If CONFIG_KUNIT
-+ * is not enabled, it will compile down to nothing and will return quickly no
-+ * test is running.
-+ */
-+static inline struct kunit *kunit_get_current_test(void)
-+{
-+	if (!static_branch_unlikely(&kunit_running))
-+		return NULL;
-+
-+	return current->kunit_test;
-+}
-+
-+
-+/**
-+ * kunit_fail_current_test() - If a KUnit test is running, fail it.
-+ *
-+ * If a KUnit test is running in the current task, mark that test as failed.
-+ *
-+ * This macro will only work if KUnit is built-in (though the tests
-+ * themselves can be modules). Otherwise, it compiles down to nothing.
-+ */
-+#define kunit_fail_current_test(fmt, ...) do {					\
-+		if (static_branch_unlikely(&kunit_running)) {			\
-+			__kunit_fail_current_test(__FILE__, __LINE__,		\
-+						  fmt, ##__VA_ARGS__);		\
-+		}								\
-+	} while (0)
-+
-+
- extern __printf(3, 4) void __kunit_fail_current_test(const char *file, int line,
- 						    const char *fmt, ...);
- 
- #else
- 
-+static inline struct kunit *kunit_get_current_test(void) { return NULL; }
-+
-+/* We define this with an empty helper function so format string warnings work */
-+#define kunit_fail_current_test(fmt, ...) \
-+		__kunit_fail_current_test(__FILE__, __LINE__, fmt, ##__VA_ARGS__)
-+
- static inline __printf(3, 4) void __kunit_fail_current_test(const char *file, int line,
- 							    const char *fmt, ...)
- {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0551-drm-vc4-hvs-Initialize-the-dlist-allocation-list-ent.patch b/target/linux/bcm27xx/patches-6.1/950-0551-drm-vc4-hvs-Initialize-the-dlist-allocation-list-ent.patch
deleted file mode 100644
index 9cd549b355..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0551-drm-vc4-hvs-Initialize-the-dlist-allocation-list-ent.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 8c51f78f0fb8bd8a3bab02155eea8d1f5cdc1a9b Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Wed, 25 Jan 2023 12:38:37 +0100
-Subject: [PATCH] drm/vc4: hvs: Initialize the dlist allocation list
- entry
-
-The vc4_hvs_dlist_allocation structure has a list that we don't
-initialize when we allocate a new instance.
-
-This makes any call reading the list structure (such as list_empty) fail
-with a NULL pointer dereference.
-
-Let's make sure our list is always initialized.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_hvs.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -452,6 +452,8 @@ vc4_hvs_alloc_dlist_entry(struct vc4_hvs
- 	if (!alloc)
- 		return ERR_PTR(-ENOMEM);
- 
-+	INIT_LIST_HEAD(&alloc->node);
-+
- 	spin_lock_irqsave(&hvs->mm_lock, flags);
- 	ret = drm_mm_insert_node(&hvs->dlist_mm, &alloc->mm_node,
- 				 dlist_count);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0552-drm-vc4-hvs-Move-the-dlist-allocation-destruction-to.patch b/target/linux/bcm27xx/patches-6.1/950-0552-drm-vc4-hvs-Move-the-dlist-allocation-destruction-to.patch
deleted file mode 100644
index 0db7059415..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0552-drm-vc4-hvs-Move-the-dlist-allocation-destruction-to.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 718d920a2dfd680811bdf987706b50a6e23f0527 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Wed, 25 Jan 2023 12:54:36 +0100
-Subject: [PATCH] drm/vc4: hvs: Move the dlist allocation destruction
- to a function
-
-We'll need to destroy a dlist allocation in multiple code paths, so
-let's move it to a separate function.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_hvs.c | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -466,6 +466,18 @@ vc4_hvs_alloc_dlist_entry(struct vc4_hvs
- 	return alloc;
- }
- 
-+static void vc4_hvs_free_dlist_entry_locked(struct vc4_hvs *hvs,
-+					    struct vc4_hvs_dlist_allocation *alloc)
-+{
-+	lockdep_assert_held(&hvs->mm_lock);
-+
-+	if (!list_empty(&alloc->node))
-+		list_del(&alloc->node);
-+
-+	drm_mm_remove_node(&alloc->mm_node);
-+	kfree(alloc);
-+}
-+
- void vc4_hvs_mark_dlist_entry_stale(struct vc4_hvs *hvs,
- 				    struct vc4_hvs_dlist_allocation *alloc)
- {
-@@ -553,9 +565,7 @@ static void vc4_hvs_dlist_free_work(stru
- 		if (!vc4_hvs_frcnt_lte(cur->target_frame_count, frcnt))
- 			continue;
- 
--		list_del(&cur->node);
--		drm_mm_remove_node(&cur->mm_node);
--		kfree(cur);
-+		vc4_hvs_free_dlist_entry_locked(hvs, cur);
- 	}
- 	spin_unlock_irqrestore(&hvs->mm_lock, flags);
- }
diff --git a/target/linux/bcm27xx/patches-6.1/950-0553-drm-vc4-hvs-Destroy-dlist-allocations-immediately-wh.patch b/target/linux/bcm27xx/patches-6.1/950-0553-drm-vc4-hvs-Destroy-dlist-allocations-immediately-wh.patch
deleted file mode 100644
index ad5fc3740f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0553-drm-vc4-hvs-Destroy-dlist-allocations-immediately-wh.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 9be7327ba367a71d75ecd86688b9fb317444529c Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Wed, 25 Jan 2023 13:05:26 +0100
-Subject: [PATCH] drm/vc4: hvs: Destroy dlist allocations immediately
- when running a test
-
-When running a kunit test, the driver runs with a mock device. As such,
-any attempt to read or write to a hardware register will fail the
-current test immediately.
-
-The dlist allocation management recently introduced will read the
-current frame count from the HVS to defer its destruction until a
-subsequent frame has been output. This obviously involves a register
-read that fails the Kunit tests.
-
-Change the destruction deferral function to destroy the allocation
-immediately if we run under kunit. This is essentially harmless since
-the main reason for that deferall is to prevent any access to the
-hardware dlist while a frame described by that list is rendered. On our
-mock driver, we have neither a hardware dlist nor a rendering, so it
-doesn't matter.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_hvs.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -490,6 +490,18 @@ void vc4_hvs_mark_dlist_entry_stale(stru
- 	if (!drm_mm_node_allocated(&alloc->mm_node))
- 		return;
- 
-+	/*
-+	 * Kunit tests run with a mock device and we consider any hardware
-+	 * access a test failure. Let's free the dlist allocation right away if
-+	 * we're running under kunit, we won't risk a dlist corruption anyway.
-+	 */
-+	if (kunit_get_current_test()) {
-+		spin_lock_irqsave(&hvs->mm_lock, flags);
-+		vc4_hvs_free_dlist_entry_locked(hvs, alloc);
-+		spin_unlock_irqrestore(&hvs->mm_lock, flags);
-+		return;
-+	}
-+
- 	frcnt = vc4_hvs_get_fifo_frame_count(hvs, alloc->channel);
- 	alloc->target_frame_count = (frcnt + 1) & ((1 << 6) - 1);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0554-ARM-dts-Set-the-LED-default-state-to-off.patch b/target/linux/bcm27xx/patches-6.1/950-0554-ARM-dts-Set-the-LED-default-state-to-off.patch
deleted file mode 100644
index 257561318b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0554-ARM-dts-Set-the-LED-default-state-to-off.patch
+++ /dev/null
@@ -1,270 +0,0 @@
-From 808b5ec5bddc978f7dcb3e7afafd959503213b1c Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 24 Jan 2023 16:54:16 +0000
-Subject: [PATCH] ARM: dts: Set the LED default-state to "off"
-
-The default-state property for an LED determines the state of the LED
-when its trigger is set to "none". Many users expect that specifying a
-trigger of "none" means that the LED will be off, and there is a logic
-to that assumption, but the current default of "keep" makes the
-assumption false.
-
-Given that no Pi models have a default-trigger of "none", changing the
-default-state should have no visible impact for most people, but doing
-so will permit a more obvious and more consistent way of turning off
-the LEDs.
-
-Note that 6.2 included an upstream DT reorganisation that required some
-downstream changes, and while doing that I changed the default states.
-This commit brings rpi-6.1.y into line with rpi-6.2.y.
-
-See: https://github.com/raspberrypi/firmware/issues/1742
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2708-rpi-b-plus.dts   | 2 ++
- arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts   | 1 +
- arch/arm/boot/dts/bcm2708-rpi-b.dts        | 1 +
- arch/arm/boot/dts/bcm2708-rpi-cm.dtsi      | 1 +
- arch/arm/boot/dts/bcm2708-rpi-zero-w.dts   | 1 +
- arch/arm/boot/dts/bcm2708-rpi-zero.dts     | 1 +
- arch/arm/boot/dts/bcm2709-rpi-2-b.dts      | 2 ++
- arch/arm/boot/dts/bcm2709-rpi-cm2.dts      | 1 +
- arch/arm/boot/dts/bcm2710-rpi-2-b.dts      | 2 ++
- arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts | 2 ++
- arch/arm/boot/dts/bcm2710-rpi-3-b.dts      | 2 ++
- arch/arm/boot/dts/bcm2710-rpi-cm3.dts      | 1 +
- arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts | 1 +
- arch/arm/boot/dts/bcm2711-rpi-4-b.dts      | 2 ++
- arch/arm/boot/dts/bcm2711-rpi-400.dts      | 3 ++-
- arch/arm/boot/dts/bcm2711-rpi-cm4.dts      | 2 ++
- arch/arm/boot/dts/bcm2711-rpi-cm4s.dts     | 1 +
- 17 files changed, 25 insertions(+), 1 deletion(-)
-
---- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
-+++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
-@@ -158,12 +158,14 @@
- &leds {
- 	act_led: led-act {
- 		label = "led0";
-+		default-state = "off";
- 		linux,default-trigger = "mmc0";
- 		gpios = <&gpio 47 0>;
- 	};
- 
- 	pwr_led: led-pwr {
- 		label = "led1";
-+		default-state = "off";
- 		linux,default-trigger = "input";
- 		gpios = <&gpio 35 0>;
- 	};
---- a/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
-+++ b/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
-@@ -176,6 +176,7 @@ i2c_csi_dsi: &i2c1 {
- &leds {
- 	act_led: led-act {
- 		label = "led0";
-+		default-state = "off";
- 		linux,default-trigger = "mmc0";
- 		gpios = <&gpio 16 1>;
- 	};
---- a/arch/arm/boot/dts/bcm2708-rpi-b.dts
-+++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts
-@@ -158,6 +158,7 @@
- &leds {
- 	act_led: led-act {
- 		label = "led0";
-+		default-state = "off";
- 		linux,default-trigger = "mmc0";
- 		gpios = <&gpio 16 1>;
- 	};
---- a/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
-+++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
-@@ -4,6 +4,7 @@
- &leds {
- 	act_led: led-act {
- 		label = "led0";
-+		default-state = "off";
- 		linux,default-trigger = "mmc0";
- 		gpios = <&gpio 47 0>;
- 	};
---- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
-+++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
-@@ -214,6 +214,7 @@
- &leds {
- 	act_led: led-act {
- 		label = "led0";
-+		default-state = "off";
- 		linux,default-trigger = "actpwr";
- 		gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
- 	};
---- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts
-+++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
-@@ -155,6 +155,7 @@
- &leds {
- 	act_led: led-act {
- 		label = "led0";
-+		default-state = "off";
- 		linux,default-trigger = "actpwr";
- 		gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
- 	};
---- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
-+++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
-@@ -158,12 +158,14 @@
- &leds {
- 	act_led: led-act {
- 		label = "led0";
-+		default-state = "off";
- 		linux,default-trigger = "mmc0";
- 		gpios = <&gpio 47 0>;
- 	};
- 
- 	pwr_led: led-pwr {
- 		label = "led1";
-+		default-state = "off";
- 		linux,default-trigger = "input";
- 		gpios = <&gpio 35 0>;
- 	};
---- a/arch/arm/boot/dts/bcm2709-rpi-cm2.dts
-+++ b/arch/arm/boot/dts/bcm2709-rpi-cm2.dts
-@@ -192,6 +192,7 @@ cam0_reg: &cam0_regulator {
- &leds {
- 	act_led: led-act {
- 		label = "led0";
-+		default-state = "off";
- 		linux,default-trigger = "mmc0";
- 		gpios = <&virtgpio 0 0>;
- 	};
---- a/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
-+++ b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
-@@ -158,12 +158,14 @@
- &leds {
- 	act_led: led-act {
- 		label = "led0";
-+		default-state = "off";
- 		linux,default-trigger = "mmc0";
- 		gpios = <&gpio 47 0>;
- 	};
- 
- 	pwr_led: led-pwr {
- 		label = "led1";
-+		default-state = "off";
- 		linux,default-trigger = "input";
- 		gpios = <&gpio 35 0>;
- 	};
---- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
-+++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
-@@ -234,12 +234,14 @@
- &leds {
- 	act_led: led-act {
- 		label = "led0";
-+		default-state = "off";
- 		linux,default-trigger = "mmc0";
- 		gpios = <&gpio 29 0>;
- 	};
- 
- 	pwr_led: led-pwr {
- 		label = "led1";
-+		default-state = "off";
- 		linux,default-trigger = "default-on";
- 		gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
- 	};
---- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
-+++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
-@@ -249,12 +249,14 @@
- &leds {
- 	act_led: led-act {
- 		label = "led0";
-+		default-state = "off";
- 		linux,default-trigger = "mmc0";
- 		gpios = <&virtgpio 0 0>;
- 	};
- 
- 	pwr_led: led-pwr {
- 		label = "led1";
-+		default-state = "off";
- 		linux,default-trigger = "input";
- 		gpios = <&expgpio 7 0>;
- 	};
---- a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
-+++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
-@@ -191,6 +191,7 @@ cam0_reg: &cam0_regulator {
- &leds {
- 	act_led: led-act {
- 		label = "led0";
-+		default-state = "off";
- 		linux,default-trigger = "mmc0";
- 		gpios = <&virtgpio 0 0>;
- 	};
---- a/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
-+++ b/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
-@@ -227,6 +227,7 @@
- &leds {
- 	act_led: led-act {
- 		label = "led0";
-+		default-state = "off";
- 		linux,default-trigger = "actpwr";
- 		gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
- 	};
---- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-@@ -507,12 +507,14 @@
- &leds {
- 	act_led: led-act {
- 		label = "led0";
-+		default-state = "off";
- 		linux,default-trigger = "mmc0";
- 		gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
- 	};
- 
- 	pwr_led: led-pwr {
- 		label = "led1";
-+		default-state = "off";
- 		linux,default-trigger = "default-on";
- 		gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
- 	};
---- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
-@@ -514,13 +514,14 @@
- &leds {
- 	act_led: led-act {
- 		label = "led0";
-+		default-state = "off";
- 		linux,default-trigger = "default-on";
--		default-state = "on";
- 		gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
- 	};
- 
- 	pwr_led: led-pwr {
- 		label = "led1";
-+		default-state = "off";
- 		linux,default-trigger = "default-on";
- 		gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
- 	};
---- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
-@@ -519,12 +519,14 @@
- &leds {
- 	act_led: led-act {
- 		label = "led0";
-+		default-state = "off";
- 		linux,default-trigger = "mmc0";
- 		gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
- 	};
- 
- 	pwr_led: led-pwr {
- 		label = "led1";
-+		default-state = "off";
- 		linux,default-trigger = "default-on";
- 		gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
- 	};
---- a/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
-@@ -389,6 +389,7 @@
- &leds {
- 	act_led: led-act {
- 		label = "led0";
-+		default-state = "off";
- 		linux,default-trigger = "mmc0";
- 	};
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0557-media-bcm2835-v4l2-codec-Add-profile-level-ctrls-to-.patch b/target/linux/bcm27xx/patches-6.1/950-0557-media-bcm2835-v4l2-codec-Add-profile-level-ctrls-to-.patch
deleted file mode 100644
index 002280d1ea..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0557-media-bcm2835-v4l2-codec-Add-profile-level-ctrls-to-.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From a99a43c595e40de8e584c47b0d05a61d931b416e Mon Sep 17 00:00:00 2001
-From: John Cox <jc@kynesim.co.uk>
-Date: Mon, 30 Jan 2023 16:34:55 +0000
-Subject: [PATCH] media: bcm2835-v4l2-codec: Add profile & level ctrls
- to decode
-
-In order to support discovery of what profile & levels are supported by
-stateful decoders implement the profile and level controls where they
-are defined by V4L2.
-
-Signed-off-by: John Cox <jc@kynesim.co.uk>
----
- .../bcm2835-codec/bcm2835-v4l2-codec.c        | 86 ++++++++++++++++++-
- 1 file changed, 85 insertions(+), 1 deletion(-)
-
---- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-+++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -3195,6 +3195,89 @@ static int queue_init(void *priv, struct
- 	return vb2_queue_init(dst_vq);
- }
- 
-+static void dec_add_profile_ctrls(struct bcm2835_codec_dev *const dev,
-+				  struct v4l2_ctrl_handler *const hdl)
-+{
-+	unsigned int i;
-+	const struct bcm2835_codec_fmt_list *const list = &dev->supported_fmts[0];
-+
-+	for (i = 0; i < list->num_entries; ++i) {
-+		switch (list->list[i].fourcc) {
-+		case V4L2_PIX_FMT_H264:
-+			v4l2_ctrl_new_std_menu(hdl, &bcm2835_codec_ctrl_ops,
-+					       V4L2_CID_MPEG_VIDEO_H264_LEVEL,
-+					       V4L2_MPEG_VIDEO_H264_LEVEL_4_2,
-+					       ~(BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_0) |
-+						 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1B) |
-+						 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_1) |
-+						 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_2) |
-+						 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_3) |
-+						 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_0) |
-+						 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_1) |
-+						 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_2) |
-+						 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_0) |
-+						 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_1) |
-+						 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_2) |
-+						 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_4_0) |
-+						 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_4_1) |
-+						 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_4_2)),
-+					       V4L2_MPEG_VIDEO_H264_LEVEL_4_0);
-+			v4l2_ctrl_new_std_menu(hdl, &bcm2835_codec_ctrl_ops,
-+					       V4L2_CID_MPEG_VIDEO_H264_PROFILE,
-+					       V4L2_MPEG_VIDEO_H264_PROFILE_HIGH,
-+					       ~(BIT(V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE) |
-+						 BIT(V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE) |
-+						 BIT(V4L2_MPEG_VIDEO_H264_PROFILE_MAIN) |
-+						 BIT(V4L2_MPEG_VIDEO_H264_PROFILE_HIGH)),
-+						V4L2_MPEG_VIDEO_H264_PROFILE_HIGH);
-+			break;
-+		case V4L2_PIX_FMT_MPEG2:
-+			v4l2_ctrl_new_std_menu(hdl, &bcm2835_codec_ctrl_ops,
-+					       V4L2_CID_MPEG_VIDEO_MPEG2_LEVEL,
-+					       V4L2_MPEG_VIDEO_MPEG2_LEVEL_HIGH,
-+					       ~(BIT(V4L2_MPEG_VIDEO_MPEG2_LEVEL_LOW) |
-+						 BIT(V4L2_MPEG_VIDEO_MPEG2_LEVEL_MAIN) |
-+						 BIT(V4L2_MPEG_VIDEO_MPEG2_LEVEL_HIGH_1440) |
-+						 BIT(V4L2_MPEG_VIDEO_MPEG2_LEVEL_HIGH)),
-+					       V4L2_MPEG_VIDEO_MPEG2_LEVEL_MAIN);
-+			v4l2_ctrl_new_std_menu(hdl, &bcm2835_codec_ctrl_ops,
-+					       V4L2_CID_MPEG_VIDEO_MPEG2_PROFILE,
-+					       V4L2_MPEG_VIDEO_MPEG2_PROFILE_MAIN,
-+					       ~(BIT(V4L2_MPEG_VIDEO_MPEG2_PROFILE_SIMPLE) |
-+						 BIT(V4L2_MPEG_VIDEO_MPEG2_PROFILE_MAIN)),
-+					       V4L2_MPEG_VIDEO_MPEG2_PROFILE_MAIN);
-+			break;
-+		case V4L2_PIX_FMT_MPEG4:
-+			v4l2_ctrl_new_std_menu(hdl, &bcm2835_codec_ctrl_ops,
-+					       V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL,
-+					       V4L2_MPEG_VIDEO_MPEG4_LEVEL_5,
-+					       ~(BIT(V4L2_MPEG_VIDEO_MPEG4_LEVEL_0) |
-+						 BIT(V4L2_MPEG_VIDEO_MPEG4_LEVEL_0B) |
-+						 BIT(V4L2_MPEG_VIDEO_MPEG4_LEVEL_1) |
-+						 BIT(V4L2_MPEG_VIDEO_MPEG4_LEVEL_2) |
-+						 BIT(V4L2_MPEG_VIDEO_MPEG4_LEVEL_3) |
-+						 BIT(V4L2_MPEG_VIDEO_MPEG4_LEVEL_3B) |
-+						 BIT(V4L2_MPEG_VIDEO_MPEG4_LEVEL_4) |
-+						 BIT(V4L2_MPEG_VIDEO_MPEG4_LEVEL_5)),
-+					       V4L2_MPEG_VIDEO_MPEG4_LEVEL_4);
-+			v4l2_ctrl_new_std_menu(hdl, &bcm2835_codec_ctrl_ops,
-+					       V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE,
-+					       V4L2_MPEG_VIDEO_MPEG4_PROFILE_ADVANCED_SIMPLE,
-+					       ~(BIT(V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE) |
-+						 BIT(V4L2_MPEG_VIDEO_MPEG4_PROFILE_ADVANCED_SIMPLE)),
-+					       V4L2_MPEG_VIDEO_MPEG4_PROFILE_ADVANCED_SIMPLE);
-+			break;
-+		/* No profiles defined by V4L2 */
-+		case V4L2_PIX_FMT_H263:
-+		case V4L2_PIX_FMT_JPEG:
-+		case V4L2_PIX_FMT_MJPEG:
-+		case V4L2_PIX_FMT_VC1_ANNEX_G:
-+		default:
-+			break;
-+		}
-+	}
-+}
-+
- /*
-  * File operations
-  */
-@@ -3334,11 +3417,12 @@ static int bcm2835_codec_open(struct fil
- 	break;
- 	case DECODE:
- 	{
--		v4l2_ctrl_handler_init(hdl, 1);
-+		v4l2_ctrl_handler_init(hdl, 1 + dev->supported_fmts[0].num_entries * 2);
- 
- 		v4l2_ctrl_new_std(hdl, &bcm2835_codec_ctrl_ops,
- 				  V4L2_CID_MIN_BUFFERS_FOR_CAPTURE,
- 				  1, 1, 1, 1);
-+		dec_add_profile_ctrls(dev, hdl);
- 		if (hdl->error) {
- 			rc = hdl->error;
- 			goto free_ctrl_handler;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0558-drm-vc4_plane-Add-support-for-YUV444-formats.patch b/target/linux/bcm27xx/patches-6.1/950-0558-drm-vc4_plane-Add-support-for-YUV444-formats.patch
deleted file mode 100644
index e71d5ecd26..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0558-drm-vc4_plane-Add-support-for-YUV444-formats.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 18c4facfe095ee51ea193970bbe7826f86cbabf7 Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Tue, 31 Jan 2023 15:14:32 +0000
-Subject: [PATCH] drm/vc4_plane: Add support for YUV444 formats
-
-Support displaying DRM_FORMAT_YUV444 and DRM_FORMAT_YVU444 formats.
-Tested with kmstest and kodi. e.g.
-
-kmstest -r 1920x1080@60 -f 400x300-YU24
-
-Note: without the shift of width, only half the chroma is fetched,
-resulting in correct left half of image and corrupt colours on right half.
-
-The increase in width shouldn't affect fetching of Y data,
-as the hardware will clamp at dest width.
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/gpu/drm/vc4/vc4_plane.c | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
---- a/drivers/gpu/drm/vc4/vc4_plane.c
-+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -110,6 +110,18 @@ static const struct hvs_format {
- 		.pixel_order_hvs5 = HVS_PIXEL_ORDER_XYCRCB,
- 	},
- 	{
-+		.drm = DRM_FORMAT_YUV444,
-+		.hvs = HVS_PIXEL_FORMAT_YCBCR_YUV422_3PLANE,
-+		.pixel_order = HVS_PIXEL_ORDER_XYCBCR,
-+		.pixel_order_hvs5 = HVS_PIXEL_ORDER_XYCBCR,
-+	},
-+	{
-+		.drm = DRM_FORMAT_YVU444,
-+		.hvs = HVS_PIXEL_FORMAT_YCBCR_YUV422_3PLANE,
-+		.pixel_order = HVS_PIXEL_ORDER_XYCRCB,
-+		.pixel_order_hvs5 = HVS_PIXEL_ORDER_XYCRCB,
-+	},
-+	{
- 		.drm = DRM_FORMAT_YUV420,
- 		.hvs = HVS_PIXEL_FORMAT_YCBCR_YUV420_3PLANE,
- 		.pixel_order = HVS_PIXEL_ORDER_XYCBCR,
-@@ -1106,6 +1118,10 @@ static int vc4_plane_mode_set(struct drm
- 	       vc4_state->src_y + vc4_state->src_h[0] < (state->fb->height << 16))
- 		height++;
- 
-+	/* for YUV444 hardware wants double the width, otherwise it doesn't fetch full width of chroma */
-+	if (format->drm == DRM_FORMAT_YUV444 || format->drm == DRM_FORMAT_YVU444)
-+		width <<= 1;
-+
- 	/* Don't waste cycles mixing with plane alpha if the set alpha
- 	 * is opaque or there is no per-pixel alpha information.
- 	 * In any case we use the alpha property value as the fixed alpha.
diff --git a/target/linux/bcm27xx/patches-6.1/950-0559-drm-vc4-Calculate-bpc-based-on-max_requested_bpc.patch b/target/linux/bcm27xx/patches-6.1/950-0559-drm-vc4-Calculate-bpc-based-on-max_requested_bpc.patch
deleted file mode 100644
index 849b6911f2..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0559-drm-vc4-Calculate-bpc-based-on-max_requested_bpc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c62902946e0ff3f3032c9fa1327924dd7de42abb Mon Sep 17 00:00:00 2001
-From: Matthias Reichl <hias@horus.com>
-Date: Sat, 14 Jan 2023 16:24:39 +0100
-Subject: [PATCH] drm/vc4: Calculate bpc based on max_requested_bpc
-
-This aligns vc4 with Intel, AMD and Synopsis drivers and fixes max bpc
-connector property not working as expected on monitors with YCbCr 4:2:2
-support but not deep color support.
-
-max_bpc in connector state is clamped at max_bpc from display info and
-the latter only takes deep color modes into account so it will always
-be 8, even if the display can do 4:2:2 12-bit output.
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
----
- drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hdmi.c
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -2156,7 +2156,7 @@ vc4_hdmi_encoder_compute_config(const st
- {
- 	struct drm_device *dev = vc4_hdmi->connector.dev;
- 	struct drm_connector_state *conn_state = &vc4_state->base;
--	unsigned int max_bpc = clamp_t(unsigned int, conn_state->max_bpc, 8, 12);
-+	unsigned int max_bpc = clamp_t(unsigned int, conn_state->max_requested_bpc, 8, 12);
- 	unsigned int bpc;
- 	int ret;
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0560-media-dt-bindings-ak7375-Convert-to-DT-schema.patch b/target/linux/bcm27xx/patches-6.1/950-0560-media-dt-bindings-ak7375-Convert-to-DT-schema.patch
deleted file mode 100644
index a740212aeb..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0560-media-dt-bindings-ak7375-Convert-to-DT-schema.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From cf1b98c1d99fcc779414f18a8f79b501260043c3 Mon Sep 17 00:00:00 2001
-From: Yassine Oudjana <y.oudjana@protonmail.com>
-Date: Fri, 9 Dec 2022 17:37:39 +0300
-Subject: [PATCH] media: dt-bindings: ak7375: Convert to DT schema
-
-commit 6d801f89ad7c485bbb14c0138d991beebd307aa6 upstream
-
-Convert DT bindings document for AKM AK7375 VCM to DT schema
-format and add an example.
-
-Signed-off-by: Yassine Oudjana <y.oudjana@protonmail.com>
-Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
-Tested-by: Umang Jain <umang.jain@ideasonboard.com>
----
- .../devicetree/bindings/media/i2c/ak7375.txt  |  8 ----
- .../media/i2c/asahi-kasei,ak7375.yaml         | 41 +++++++++++++++++++
- MAINTAINERS                                   |  2 +-
- 3 files changed, 42 insertions(+), 9 deletions(-)
- delete mode 100644 Documentation/devicetree/bindings/media/i2c/ak7375.txt
- create mode 100644 Documentation/devicetree/bindings/media/i2c/asahi-kasei,ak7375.yaml
-
---- a/Documentation/devicetree/bindings/media/i2c/ak7375.txt
-+++ /dev/null
-@@ -1,8 +0,0 @@
--Asahi Kasei Microdevices AK7375 voice coil lens driver
--
--AK7375 is a camera voice coil lens.
--
--Mandatory properties:
--
--- compatible: "asahi-kasei,ak7375"
--- reg: I2C slave address
---- /dev/null
-+++ b/Documentation/devicetree/bindings/media/i2c/asahi-kasei,ak7375.yaml
-@@ -0,0 +1,41 @@
-+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
-+%YAML 1.2
-+---
-+$id: http://devicetree.org/schemas/media/i2c/asahi-kasei,ak7375.yaml#
-+$schema: http://devicetree.org/meta-schemas/core.yaml#
-+
-+title: Asahi Kasei Microdevices AK7375 voice coil lens actuator
-+
-+maintainers:
-+  - Tianshu Qiu <tian.shu.qiu@intel.com>
-+
-+description:
-+  AK7375 is a voice coil motor (VCM) camera lens actuator that
-+  is controlled over I2C.
-+
-+properties:
-+  compatible:
-+    const: asahi-kasei,ak7375
-+
-+  reg:
-+    maxItems: 1
-+
-+required:
-+  - compatible
-+  - reg
-+
-+additionalProperties: false
-+
-+examples:
-+  - |
-+    i2c {
-+        #address-cells = <1>;
-+        #size-cells = <0>;
-+
-+        ak7375: camera-lens@c {
-+            compatible = "asahi-kasei,ak7375";
-+            reg = <0x0c>;
-+        };
-+    };
-+
-+...
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -3173,7 +3173,7 @@ M:	Tianshu Qiu <tian.shu.qiu@intel.com>
- L:	linux-media@vger.kernel.org
- S:	Maintained
- T:	git git://linuxtv.org/media_tree.git
--F:	Documentation/devicetree/bindings/media/i2c/ak7375.txt
-+F:	Documentation/devicetree/bindings/media/i2c/asahi-kasei,ak7375.yaml
- F:	drivers/media/i2c/ak7375.c
- 
- ASAHI KASEI AK8974 DRIVER
diff --git a/target/linux/bcm27xx/patches-6.1/950-0561-media-dt-bindings-ak7375-Add-supplies.patch b/target/linux/bcm27xx/patches-6.1/950-0561-media-dt-bindings-ak7375-Add-supplies.patch
deleted file mode 100644
index d8fd614181..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0561-media-dt-bindings-ak7375-Add-supplies.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From b076677ea22db8ceb66aa168c82c9c160dc1a9f1 Mon Sep 17 00:00:00 2001
-From: Yassine Oudjana <y.oudjana@protonmail.com>
-Date: Fri, 9 Dec 2022 17:37:40 +0300
-Subject: [PATCH] media: dt-bindings: ak7375: Add supplies
-
-commit 04a79f078329b14f260db15250e84c97022f42cd upstream
-
-Add supply properties to describe regulators needed to power
-the AK7375 VCM.
-
-Signed-off-by: Yassine Oudjana <y.oudjana@protonmail.com>
-Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
-Tested-by: Umang Jain <umang.jain@ideasonboard.com>
----
- .../bindings/media/i2c/asahi-kasei,ak7375.yaml        | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
---- a/Documentation/devicetree/bindings/media/i2c/asahi-kasei,ak7375.yaml
-+++ b/Documentation/devicetree/bindings/media/i2c/asahi-kasei,ak7375.yaml
-@@ -20,9 +20,17 @@ properties:
-   reg:
-     maxItems: 1
- 
-+  vdd-supply:
-+    description: VDD supply
-+
-+  vio-supply:
-+    description: I/O pull-up supply
-+
- required:
-   - compatible
-   - reg
-+  - vdd-supply
-+  - vio-supply
- 
- additionalProperties: false
- 
-@@ -35,6 +43,9 @@ examples:
-         ak7375: camera-lens@c {
-             compatible = "asahi-kasei,ak7375";
-             reg = <0x0c>;
-+
-+            vdd-supply = <&vreg_l23a_2p8>;
-+            vio-supply = <&vreg_lvs1a_1p8>;
-         };
-     };
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0562-media-i2c-ak7375-Add-regulator-management.patch b/target/linux/bcm27xx/patches-6.1/950-0562-media-i2c-ak7375-Add-regulator-management.patch
deleted file mode 100644
index 55d276dbc0..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0562-media-i2c-ak7375-Add-regulator-management.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 159ef6a1740ded1bfd542bab7d69208cf0865814 Mon Sep 17 00:00:00 2001
-From: Yassine Oudjana <y.oudjana@protonmail.com>
-Date: Fri, 9 Dec 2022 17:37:41 +0300
-Subject: [PATCH] media: i2c: ak7375: Add regulator management
-
-commit 90f7e76eac50c1ae54a445abc6a286837ade46cf upstream
-
-Make the driver get needed regulators on probe and enable/disable
-them on runtime PM callbacks.
-
-Signed-off-by: Yassine Oudjana <y.oudjana@protonmail.com>
-Tested-by: Umang Jain <umang.jain@ideasonboard.com>
----
- drivers/media/i2c/ak7375.c | 38 ++++++++++++++++++++++++++++++++++++++
- 1 file changed, 38 insertions(+)
-
---- a/drivers/media/i2c/ak7375.c
-+++ b/drivers/media/i2c/ak7375.c
-@@ -6,6 +6,7 @@
- #include <linux/i2c.h>
- #include <linux/module.h>
- #include <linux/pm_runtime.h>
-+#include <linux/regulator/consumer.h>
- #include <media/v4l2-ctrls.h>
- #include <media/v4l2-device.h>
- 
-@@ -23,17 +24,29 @@
-  */
- #define AK7375_CTRL_STEPS	64
- #define AK7375_CTRL_DELAY_US	1000
-+/*
-+ * The vcm may take up 10 ms (tDELAY) to power on and start taking
-+ * I2C messages. Based on AK7371 datasheet.
-+ */
-+#define AK7375_POWER_DELAY_US	10000
- 
- #define AK7375_REG_POSITION	0x0
- #define AK7375_REG_CONT		0x2
- #define AK7375_MODE_ACTIVE	0x0
- #define AK7375_MODE_STANDBY	0x40
- 
-+static const char * const ak7375_supply_names[] = {
-+	"vdd",
-+	"vio",
-+};
-+
- /* ak7375 device structure */
- struct ak7375_device {
- 	struct v4l2_ctrl_handler ctrls_vcm;
- 	struct v4l2_subdev sd;
- 	struct v4l2_ctrl *focus;
-+	struct regulator_bulk_data supplies[ARRAY_SIZE(ak7375_supply_names)];
-+
- 	/* active or standby mode */
- 	bool active;
- };
-@@ -133,12 +146,24 @@ static int ak7375_probe(struct i2c_clien
- {
- 	struct ak7375_device *ak7375_dev;
- 	int ret;
-+	unsigned int i;
- 
- 	ak7375_dev = devm_kzalloc(&client->dev, sizeof(*ak7375_dev),
- 				  GFP_KERNEL);
- 	if (!ak7375_dev)
- 		return -ENOMEM;
- 
-+	for (i = 0; i < ARRAY_SIZE(ak7375_supply_names); i++)
-+		ak7375_dev->supplies[i].supply = ak7375_supply_names[i];
-+
-+	ret = devm_regulator_bulk_get(&client->dev,
-+				      ARRAY_SIZE(ak7375_supply_names),
-+				      ak7375_dev->supplies);
-+	if (ret) {
-+		dev_err_probe(&client->dev, ret, "Failed to get regulators\n");
-+		return ret;
-+	}
-+
- 	v4l2_i2c_subdev_init(&ak7375_dev->sd, client, &ak7375_ops);
- 	ak7375_dev->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
- 	ak7375_dev->sd.internal_ops = &ak7375_int_ops;
-@@ -208,6 +233,11 @@ static int __maybe_unused ak7375_vcm_sus
- 	if (ret)
- 		dev_err(dev, "%s I2C failure: %d\n", __func__, ret);
- 
-+	ret = regulator_bulk_disable(ARRAY_SIZE(ak7375_supply_names),
-+				     ak7375_dev->supplies);
-+	if (ret)
-+		return ret;
-+
- 	ak7375_dev->active = false;
- 
- 	return 0;
-@@ -228,6 +258,14 @@ static int __maybe_unused ak7375_vcm_res
- 	if (ak7375_dev->active)
- 		return 0;
- 
-+	ret = regulator_bulk_enable(ARRAY_SIZE(ak7375_supply_names),
-+				    ak7375_dev->supplies);
-+	if (ret)
-+		return ret;
-+
-+	/* Wait for vcm to become ready */
-+	usleep_range(AK7375_POWER_DELAY_US, AK7375_POWER_DELAY_US + 500);
-+
- 	ret = ak7375_i2c_write(ak7375_dev, AK7375_REG_CONT,
- 		AK7375_MODE_ACTIVE, 1);
- 	if (ret) {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0563-dtoverlays-Add-VCM-option-to-imx519.patch b/target/linux/bcm27xx/patches-6.1/950-0563-dtoverlays-Add-VCM-option-to-imx519.patch
deleted file mode 100644
index 92439d348d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0563-dtoverlays-Add-VCM-option-to-imx519.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From 0c0ce98b6c48ffd63690e17872c82a6ea4e08fbf Mon Sep 17 00:00:00 2001
-From: Lee Jackson <info@arducam.com>
-Date: Mon, 20 Feb 2023 10:25:33 +0800
-Subject: [PATCH] dtoverlays: Add VCM option to imx519
-
-VCM is enabled by default, but you can use 'vcm=off' to disable VCM support.
-
-Signed-off-by: Lee Jackson <lee.jackson@arducam.com>
----
- arch/arm/boot/dts/overlays/README             |  2 +
- arch/arm/boot/dts/overlays/imx519-overlay.dts | 61 +++++++++----------
- arch/arm/boot/dts/overlays/imx519.dtsi        | 34 +++++++++++
- 3 files changed, 65 insertions(+), 32 deletions(-)
- create mode 100644 arch/arm/boot/dts/overlays/imx519.dtsi
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -2384,6 +2384,8 @@ Params: rotation                Mounting
-                                 configuring the sensor (default on)
-         cam0                    Adopt the default configuration for CAM0 on a
-                                 Compute Module (CSI0, i2c_vc, and cam0_reg).
-+        vcm                     Select lens driver state. Default is enabled,
-+                                but vcm=off will disable.
- 
- 
- Name:   imx708
---- a/arch/arm/boot/dts/overlays/imx519-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/imx519-overlay.dts
-@@ -15,32 +15,7 @@
- 			#size-cells = <0>;
- 			status = "okay";
- 
--			imx519: imx519@1a {
--				compatible = "sony,imx519";
--				reg = <0x1a>;
--				status = "okay";
--
--				clocks = <&cam1_clk>;
--				clock-names = "xclk";
--
--				VANA-supply = <&cam1_reg>;	/* 2.8v */
--				VDIG-supply = <&cam_dummy_reg>;	/* 1.8v */
--				VDDL-supply = <&cam_dummy_reg>;	/* 1.2v */
--
--				rotation = <0>;
--				orientation = <2>;
--
--				port {
--					imx519_0: endpoint {
--						remote-endpoint = <&csi1_ep>;
--						clock-lanes = <0>;
--						data-lanes = <1 2>;
--						clock-noncontinuous;
--						link-frequencies =
--							/bits/ 64 <493500000>;
--					};
--				};
--			};
-+			#include "imx519.dtsi"
- 		};
- 	};
- 
-@@ -51,8 +26,8 @@
- 			brcm,media-controller;
- 
- 			port{
--				csi1_ep: endpoint{
--					remote-endpoint = <&imx519_0>;
-+				csi_ep: endpoint{
-+					remote-endpoint = <&cam_endpoint>;
- 					clock-lanes = <0>;
- 					data-lanes = <1 2>;
- 					clock-noncontinuous;
-@@ -83,14 +58,36 @@
- 		};
- 	};
- 
-+	fragment@5 {
-+		target = <&cam_node>;
-+		__overlay__ {
-+			lens-focus = <&vcm_node>;
-+		};
-+	};
-+
- 	__overrides__ {
--		rotation = <&imx519>,"rotation:0";
--		orientation = <&imx519>,"orientation:0";
-+		rotation = <&cam_node>,"rotation:0";
-+		orientation = <&cam_node>,"orientation:0";
- 		media-controller = <&csi>,"brcm,media-controller?";
- 		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
- 		       <&csi_frag>, "target:0=",<&csi0>,
- 		       <&clk_frag>, "target:0=",<&cam0_clk>,
--		       <&imx519>, "clocks:0=",<&cam0_clk>,
--		       <&imx519>, "VANA-supply:0=",<&cam0_reg>;
-+		       <&cam_node>, "clocks:0=",<&cam0_clk>,
-+		       <&cam_node>, "VANA-supply:0=",<&cam0_reg>,
-+		       <&vcm_node>, "vdd-supply:0=",<&cam0_reg>;
-+		vcm = <&vcm_node>, "status",
-+		      <0>, "=5";
- 	};
- };
-+
-+&cam_node {
-+	status = "okay";
-+};
-+
-+&cam_endpoint {
-+	remote-endpoint = <&csi_ep>;
-+};
-+
-+&vcm_node {
-+	status = "okay";
-+};
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/imx519.dtsi
-@@ -0,0 +1,34 @@
-+// Fragment that configures a Sony IMX519
-+
-+cam_node: imx519@1a {
-+	compatible = "sony,imx519";
-+	reg = <0x1a>;
-+	status = "disabled";
-+
-+	clocks = <&cam1_clk>;
-+	clock-names = "xclk";
-+
-+	VANA-supply = <&cam1_reg>;	/* 2.8v */
-+	VDIG-supply = <&cam_dummy_reg>;	/* 1.8v */
-+	VDDL-supply = <&cam_dummy_reg>;	/* 1.2v */
-+
-+	rotation = <0>;
-+	orientation = <2>;
-+
-+	port {
-+		cam_endpoint: endpoint {
-+			clock-lanes = <0>;
-+			data-lanes = <1 2>;
-+			clock-noncontinuous;
-+			link-frequencies =
-+				/bits/ 64 <493500000>;
-+		};
-+	};
-+};
-+
-+vcm_node: ak7375@c {
-+	compatible = "asahi-kasei,ak7375";
-+	reg = <0x0c>;
-+	status = "disabled";
-+	vdd-supply = <&cam1_reg>;
-+};
diff --git a/target/linux/bcm27xx/patches-6.1/950-0564-dtoverlays-Add-IMX519-support-to-camera-mux-overlays.patch b/target/linux/bcm27xx/patches-6.1/950-0564-dtoverlays-Add-IMX519-support-to-camera-mux-overlays.patch
deleted file mode 100644
index 2b551e60a9..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0564-dtoverlays-Add-IMX519-support-to-camera-mux-overlays.patch
+++ /dev/null
@@ -1,246 +0,0 @@
-From 5e2246c5ac556309546fc603fd7a17f8b143b566 Mon Sep 17 00:00:00 2001
-From: Lee Jackson <info@arducam.com>
-Date: Fri, 24 Feb 2023 08:33:34 +0800
-Subject: [PATCH] dtoverlays: Add IMX519 support to camera mux overlays
-
-Signed-off-by: Lee Jackson <lee.jackson@arducam.com>
----
- arch/arm/boot/dts/overlays/README             |  6 ++
- .../dts/overlays/camera-mux-2port-overlay.dts | 32 ++++++++++
- .../dts/overlays/camera-mux-4port-overlay.dts | 64 +++++++++++++++++++
- 3 files changed, 102 insertions(+)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -716,6 +716,7 @@ Params: cam0-imx219             Select I
-         cam0-imx258             Select IMX258 for camera on port 0
-         cam0-imx290             Select IMX290 for camera on port 0
-         cam0-imx477             Select IMX477 for camera on port 0
-+        cam0-imx519             Select IMX519 for camera on port 0
-         cam0-imx708             Select IMX708 for camera on port 0
-         cam0-ov2311             Select OV2311 for camera on port 0
-         cam0-ov5647             Select OV5647 for camera on port 0
-@@ -726,6 +727,7 @@ Params: cam0-imx219             Select I
-         cam1-imx258             Select IMX258 for camera on port 1
-         cam1-imx290             Select IMX290 for camera on port 1
-         cam1-imx477             Select IMX477 for camera on port 1
-+        cam1-imx519             Select IMX519 for camera on port 1
-         cam1-imx708             Select IMX708 for camera on port 1
-         cam1-ov2311             Select OV2311 for camera on port 1
-         cam1-ov5647             Select OV5647 for camera on port 1
-@@ -743,6 +745,7 @@ Params: cam0-imx219             Select I
-         cam0-imx258             Select IMX258 for camera on port 0
-         cam0-imx290             Select IMX290 for camera on port 0
-         cam0-imx477             Select IMX477 for camera on port 0
-+        cam0-imx519             Select IMX519 for camera on port 0
-         cam0-imx708             Select IMX708 for camera on port 0
-         cam0-ov2311             Select OV2311 for camera on port 0
-         cam0-ov5647             Select OV5647 for camera on port 0
-@@ -753,6 +756,7 @@ Params: cam0-imx219             Select I
-         cam1-imx258             Select IMX258 for camera on port 1
-         cam1-imx290             Select IMX290 for camera on port 1
-         cam1-imx477             Select IMX477 for camera on port 1
-+        cam1-imx519             Select IMX519 for camera on port 1
-         cam1-imx708             Select IMX708 for camera on port 1
-         cam1-ov2311             Select OV2311 for camera on port 1
-         cam1-ov5647             Select OV5647 for camera on port 1
-@@ -763,6 +767,7 @@ Params: cam0-imx219             Select I
-         cam2-imx258             Select IMX258 for camera on port 2
-         cam2-imx290             Select IMX290 for camera on port 2
-         cam2-imx477             Select IMX477 for camera on port 2
-+        cam2-imx519             Select IMX519 for camera on port 2
-         cam2-imx708             Select IMX708 for camera on port 2
-         cam2-ov2311             Select OV2311 for camera on port 2
-         cam2-ov5647             Select OV5647 for camera on port 2
-@@ -773,6 +778,7 @@ Params: cam0-imx219             Select I
-         cam3-imx258             Select IMX258 for camera on port 3
-         cam3-imx290             Select IMX290 for camera on port 3
-         cam3-imx477             Select IMX477 for camera on port 3
-+        cam3-imx519             Select IMX519 for camera on port 3
-         cam3-imx708             Select IMX708 for camera on port 3
-         cam3-ov2311             Select OV2311 for camera on port 3
-         cam3-ov5647             Select OV5647 for camera on port 3
---- a/arch/arm/boot/dts/overlays/camera-mux-2port-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/camera-mux-2port-overlay.dts
-@@ -112,6 +112,16 @@
- 					#undef cam_endpoint
- 					#undef cam1_clk
- 
-+					#define cam_node imx519_0
-+					#define cam_endpoint imx519_0_ep
-+					#define vcm_node imx519_0_vcm
-+					#define cam1_clk clk_24mhz
-+					#include "imx519.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef vcm_node
-+					#undef cam1_clk
-+
- 					#define cam_node imx708_0
- 					#define cam_endpoint imx708_0_ep
- 					#define vcm_node imx708_0_vcm
-@@ -192,6 +202,16 @@
- 					#undef cam_endpoint
- 					#undef cam1_clk
- 
-+					#define cam_node imx519_1
-+					#define cam_endpoint imx519_1_ep
-+					#define vcm_node imx519_1_vcm
-+					#define cam1_clk clk_24mhz
-+					#include "imx519.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef vcm_node
-+					#undef cam1_clk
-+
- 					#define cam_node imx708_1
- 					#define cam_endpoint imx708_1_ep
- 					#define vcm_node imx708_1_vcm
-@@ -373,6 +393,12 @@
- 			      <&imx477_0_ep>, "remote-endpoint:0=",<&mux_in0>,
- 			      <&mux_in0>, "clock-noncontinuous?",
- 			      <&imx477_0>, "status=okay";
-+		cam0-imx519 = <&mux_in0>, "remote-endpoint:0=",<&imx519_0_ep>,
-+			      <&imx519_0_ep>, "remote-endpoint:0=",<&mux_in0>,
-+			      <&mux_in0>, "clock-noncontinuous?",
-+			      <&imx519_0>, "status=okay",
-+				  <&imx519_0_vcm>, "status=okay",
-+			      <&imx519_0>,"lens-focus:0=", <&imx519_0_vcm>;
- 		cam0-imx708 = <&mux_in0>, "remote-endpoint:0=",<&imx708_0_ep>,
- 			      <&imx708_0_ep>, "remote-endpoint:0=",<&mux_in0>,
- 			      <&mux_in0>, "clock-noncontinuous?",
-@@ -407,6 +433,12 @@
- 			      <&imx477_1_ep>, "remote-endpoint:0=",<&mux_in1>,
- 			      <&mux_in1>, "clock-noncontinuous?",
- 			      <&imx477_1>, "status=okay";
-+		cam1-imx519 = <&mux_in1>, "remote-endpoint:0=",<&imx519_1_ep>,
-+			      <&imx519_1_ep>, "remote-endpoint:0=",<&mux_in1>,
-+			      <&mux_in1>, "clock-noncontinuous?",
-+			      <&imx519_1>, "status=okay",
-+			      <&imx519_1_vcm>, "status=okay",
-+			      <&imx519_1>,"lens-focus:0=", <&imx519_1_vcm>;
- 		cam1-imx708 = <&mux_in1>, "remote-endpoint:0=",<&imx708_1_ep>,
- 			      <&imx708_1_ep>, "remote-endpoint:0=",<&mux_in1>,
- 			      <&mux_in1>, "clock-noncontinuous?",
---- a/arch/arm/boot/dts/overlays/camera-mux-4port-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/camera-mux-4port-overlay.dts
-@@ -170,6 +170,16 @@
- 					#undef cam_endpoint
- 					#undef cam1_clk
- 
-+					#define cam_node imx519_0
-+					#define cam_endpoint imx519_0_ep
-+					#define vcm_node imx519_0_vcm
-+					#define cam1_clk clk_24mhz
-+					#include "imx519.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef vcm_node
-+					#undef cam1_clk
-+
- 					#define cam_node imx708_0
- 					#define cam_endpoint imx708_0_ep
- 					#define vcm_node imx708_0_vcm
-@@ -250,6 +260,16 @@
- 					#undef cam_endpoint
- 					#undef cam1_clk
- 
-+					#define cam_node imx519_1
-+					#define cam_endpoint imx519_1_ep
-+					#define vcm_node imx519_1_vcm
-+					#define cam1_clk clk_24mhz
-+					#include "imx519.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef vcm_node
-+					#undef cam1_clk
-+
- 					#define cam_node imx708_1
- 					#define cam_endpoint imx708_1_ep
- 					#define vcm_node imx708_1_vcm
-@@ -330,6 +350,16 @@
- 					#undef cam_endpoint
- 					#undef cam1_clk
- 
-+					#define cam_node imx519_2
-+					#define cam_endpoint imx519_2_ep
-+					#define vcm_node imx519_2_vcm
-+					#define cam1_clk clk_24mhz
-+					#include "imx519.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef vcm_node
-+					#undef cam1_clk
-+
- 					#define cam_node imx708_2
- 					#define cam_endpoint imx708_2_ep
- 					#define vcm_node imx708_2_vcm
-@@ -410,6 +440,16 @@
- 					#undef cam_endpoint
- 					#undef cam1_clk
- 
-+					#define cam_node imx519_3
-+					#define cam_endpoint imx519_3_ep
-+					#define vcm_node imx519_3_vcm
-+					#define cam1_clk clk_24mhz
-+					#include "imx519.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef vcm_node
-+					#undef cam1_clk
-+
- 					#define cam_node imx708_3
- 					#define cam_endpoint imx708_3_ep
- 					#define vcm_node imx708_3_vcm
-@@ -608,6 +648,12 @@
- 			      <&imx477_0_ep>, "remote-endpoint:0=",<&mux_in0>,
- 			      <&mux_in0>, "clock-noncontinuous?",
- 			      <&imx477_0>, "status=okay";
-+		cam0-imx519 = <&mux_in0>, "remote-endpoint:0=",<&imx519_0_ep>,
-+			      <&imx519_0_ep>, "remote-endpoint:0=",<&mux_in0>,
-+			      <&mux_in0>, "clock-noncontinuous?",
-+			      <&imx519_0>, "status=okay",
-+			      <&imx519_0_vcm>, "status=okay",
-+			      <&imx519_0>,"lens-focus:0=", <&imx519_0_vcm>;
- 		cam0-imx708 = <&mux_in0>, "remote-endpoint:0=",<&imx708_0_ep>,
- 			      <&imx708_0_ep>, "remote-endpoint:0=",<&mux_in0>,
- 			      <&mux_in0>, "clock-noncontinuous?",
-@@ -642,6 +688,12 @@
- 			      <&imx477_1_ep>, "remote-endpoint:0=",<&mux_in1>,
- 			      <&mux_in1>, "clock-noncontinuous?",
- 			      <&imx477_1>, "status=okay";
-+		cam1-imx519 = <&mux_in1>, "remote-endpoint:0=",<&imx519_1_ep>,
-+			      <&imx519_1_ep>, "remote-endpoint:0=",<&mux_in1>,
-+			      <&mux_in1>, "clock-noncontinuous?",
-+			      <&imx519_1>, "status=okay",
-+			      <&imx519_1_vcm>, "status=okay",
-+			      <&imx519_1>,"lens-focus:0=", <&imx519_1_vcm>;
- 		cam1-imx708 = <&mux_in1>, "remote-endpoint:0=",<&imx708_1_ep>,
- 			      <&imx708_1_ep>, "remote-endpoint:0=",<&mux_in1>,
- 			      <&mux_in1>, "clock-noncontinuous?",
-@@ -676,6 +728,12 @@
- 			      <&imx477_2_ep>, "remote-endpoint:0=",<&mux_in2>,
- 			      <&mux_in2>, "clock-noncontinuous?",
- 			      <&imx477_2>, "status=okay";
-+		cam2-imx519 = <&mux_in2>, "remote-endpoint:0=",<&imx519_2_ep>,
-+			      <&imx519_2_ep>, "remote-endpoint:0=",<&mux_in2>,
-+			      <&mux_in2>, "clock-noncontinuous?",
-+			      <&imx519_2>, "status=okay",
-+			      <&imx519_2_vcm>, "status=okay",
-+			      <&imx519_2>,"lens-focus:0=", <&imx519_2_vcm>;
- 		cam2-imx708 = <&mux_in2>, "remote-endpoint:0=",<&imx708_2_ep>,
- 			      <&imx708_2_ep>, "remote-endpoint:0=",<&mux_in2>,
- 			      <&mux_in2>, "clock-noncontinuous?",
-@@ -710,6 +768,12 @@
- 			      <&imx477_3_ep>, "remote-endpoint:0=",<&mux_in3>,
- 			      <&mux_in3>, "clock-noncontinuous?",
- 			      <&imx477_3>, "status=okay";
-+		cam3-imx519 = <&mux_in3>, "remote-endpoint:0=",<&imx519_3_ep>,
-+			      <&imx519_3_ep>, "remote-endpoint:0=",<&mux_in3>,
-+			      <&mux_in3>, "clock-noncontinuous?",
-+			      <&imx519_3>, "status=okay",
-+			      <&imx519_3_vcm>, "status=okay",
-+			      <&imx519_3>,"lens-focus:0=", <&imx519_3_vcm>;
- 		cam3-imx708 = <&mux_in3>, "remote-endpoint:0=",<&imx708_3_ep>,
- 			      <&imx708_3_ep>, "remote-endpoint:0=",<&mux_in3>,
- 			      <&mux_in3>, "clock-noncontinuous?",
diff --git a/target/linux/bcm27xx/patches-6.1/950-0565-vc04_services-bcm2835_codec-Ignore-READ_ONLY-ctrls-i.patch b/target/linux/bcm27xx/patches-6.1/950-0565-vc04_services-bcm2835_codec-Ignore-READ_ONLY-ctrls-i.patch
deleted file mode 100644
index d1968b0b77..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0565-vc04_services-bcm2835_codec-Ignore-READ_ONLY-ctrls-i.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-From 3ad45d26aba6f69f82220f59824b4d8422b2b220 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 14 Feb 2023 15:35:43 +0000
-Subject: [PATCH] vc04_services: bcm2835_codec: Ignore READ_ONLY ctrls
- in s_ctrl
-
-In adding the MPEG2/MPEG4/H264 level and profile controls to
-the decoder, they weren't declared as read-only, nor handlers
-added to bcm2835_codec_s_ctrl. That resulted in an error message
-"Invalid control" being logged every time v4l2_ctrl_handler_setup
-was called from bcm2835_codec_create_component.
-
-Define those controls as read only, and exit early from s_ctrl
-on read only controls.
-
-Fixes: "media: bcm2835-v4l2-codec: Add profile & level ctrls to decode"
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../bcm2835-codec/bcm2835-v4l2-codec.c        | 127 ++++++++++--------
- 1 file changed, 68 insertions(+), 59 deletions(-)
-
---- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-+++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -2224,6 +2224,9 @@ static int bcm2835_codec_s_ctrl(struct v
- 		container_of(ctrl->handler, struct bcm2835_codec_ctx, hdl);
- 	int ret = 0;
- 
-+	if (ctrl->flags & V4L2_CTRL_FLAG_READ_ONLY)
-+		return 0;
-+
- 	switch (ctrl->id) {
- 	case V4L2_CID_MPEG_VIDEO_BITRATE:
- 		ctx->bitrate = ctrl->val;
-@@ -2376,7 +2379,7 @@ static int bcm2835_codec_s_ctrl(struct v
- 		break;
- 
- 	default:
--		v4l2_err(&ctx->dev->v4l2_dev, "Invalid control\n");
-+		v4l2_err(&ctx->dev->v4l2_dev, "Invalid control %08x\n", ctrl->id);
- 		return -EINVAL;
- 	}
- 
-@@ -3198,74 +3201,80 @@ static int queue_init(void *priv, struct
- static void dec_add_profile_ctrls(struct bcm2835_codec_dev *const dev,
- 				  struct v4l2_ctrl_handler *const hdl)
- {
-+	struct v4l2_ctrl *ctrl;
- 	unsigned int i;
- 	const struct bcm2835_codec_fmt_list *const list = &dev->supported_fmts[0];
- 
- 	for (i = 0; i < list->num_entries; ++i) {
- 		switch (list->list[i].fourcc) {
- 		case V4L2_PIX_FMT_H264:
--			v4l2_ctrl_new_std_menu(hdl, &bcm2835_codec_ctrl_ops,
--					       V4L2_CID_MPEG_VIDEO_H264_LEVEL,
--					       V4L2_MPEG_VIDEO_H264_LEVEL_4_2,
--					       ~(BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_0) |
--						 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1B) |
--						 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_1) |
--						 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_2) |
--						 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_3) |
--						 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_0) |
--						 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_1) |
--						 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_2) |
--						 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_0) |
--						 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_1) |
--						 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_2) |
--						 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_4_0) |
--						 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_4_1) |
--						 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_4_2)),
--					       V4L2_MPEG_VIDEO_H264_LEVEL_4_0);
--			v4l2_ctrl_new_std_menu(hdl, &bcm2835_codec_ctrl_ops,
--					       V4L2_CID_MPEG_VIDEO_H264_PROFILE,
--					       V4L2_MPEG_VIDEO_H264_PROFILE_HIGH,
--					       ~(BIT(V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE) |
--						 BIT(V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE) |
--						 BIT(V4L2_MPEG_VIDEO_H264_PROFILE_MAIN) |
--						 BIT(V4L2_MPEG_VIDEO_H264_PROFILE_HIGH)),
--						V4L2_MPEG_VIDEO_H264_PROFILE_HIGH);
-+			ctrl = v4l2_ctrl_new_std_menu(hdl, &bcm2835_codec_ctrl_ops,
-+						      V4L2_CID_MPEG_VIDEO_H264_LEVEL,
-+						      V4L2_MPEG_VIDEO_H264_LEVEL_4_2,
-+						      ~(BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_0) |
-+							BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1B) |
-+							BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_1) |
-+							BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_2) |
-+							BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_3) |
-+							BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_0) |
-+							BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_1) |
-+							BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_2) |
-+							BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_0) |
-+							BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_1) |
-+							BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_2) |
-+							BIT(V4L2_MPEG_VIDEO_H264_LEVEL_4_0) |
-+							BIT(V4L2_MPEG_VIDEO_H264_LEVEL_4_1) |
-+							BIT(V4L2_MPEG_VIDEO_H264_LEVEL_4_2)),
-+						       V4L2_MPEG_VIDEO_H264_LEVEL_4_0);
-+			ctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY;
-+			ctrl = v4l2_ctrl_new_std_menu(hdl, &bcm2835_codec_ctrl_ops,
-+						      V4L2_CID_MPEG_VIDEO_H264_PROFILE,
-+						      V4L2_MPEG_VIDEO_H264_PROFILE_HIGH,
-+						      ~(BIT(V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE) |
-+							BIT(V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE) |
-+							BIT(V4L2_MPEG_VIDEO_H264_PROFILE_MAIN) |
-+							BIT(V4L2_MPEG_VIDEO_H264_PROFILE_HIGH)),
-+						       V4L2_MPEG_VIDEO_H264_PROFILE_HIGH);
-+			ctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY;
- 			break;
- 		case V4L2_PIX_FMT_MPEG2:
--			v4l2_ctrl_new_std_menu(hdl, &bcm2835_codec_ctrl_ops,
--					       V4L2_CID_MPEG_VIDEO_MPEG2_LEVEL,
--					       V4L2_MPEG_VIDEO_MPEG2_LEVEL_HIGH,
--					       ~(BIT(V4L2_MPEG_VIDEO_MPEG2_LEVEL_LOW) |
--						 BIT(V4L2_MPEG_VIDEO_MPEG2_LEVEL_MAIN) |
--						 BIT(V4L2_MPEG_VIDEO_MPEG2_LEVEL_HIGH_1440) |
--						 BIT(V4L2_MPEG_VIDEO_MPEG2_LEVEL_HIGH)),
--					       V4L2_MPEG_VIDEO_MPEG2_LEVEL_MAIN);
--			v4l2_ctrl_new_std_menu(hdl, &bcm2835_codec_ctrl_ops,
--					       V4L2_CID_MPEG_VIDEO_MPEG2_PROFILE,
--					       V4L2_MPEG_VIDEO_MPEG2_PROFILE_MAIN,
--					       ~(BIT(V4L2_MPEG_VIDEO_MPEG2_PROFILE_SIMPLE) |
--						 BIT(V4L2_MPEG_VIDEO_MPEG2_PROFILE_MAIN)),
--					       V4L2_MPEG_VIDEO_MPEG2_PROFILE_MAIN);
-+			ctrl = v4l2_ctrl_new_std_menu(hdl, &bcm2835_codec_ctrl_ops,
-+						      V4L2_CID_MPEG_VIDEO_MPEG2_LEVEL,
-+						      V4L2_MPEG_VIDEO_MPEG2_LEVEL_HIGH,
-+						      ~(BIT(V4L2_MPEG_VIDEO_MPEG2_LEVEL_LOW) |
-+							BIT(V4L2_MPEG_VIDEO_MPEG2_LEVEL_MAIN) |
-+							BIT(V4L2_MPEG_VIDEO_MPEG2_LEVEL_HIGH_1440) |
-+							BIT(V4L2_MPEG_VIDEO_MPEG2_LEVEL_HIGH)),
-+						      V4L2_MPEG_VIDEO_MPEG2_LEVEL_MAIN);
-+			ctrl = v4l2_ctrl_new_std_menu(hdl, &bcm2835_codec_ctrl_ops,
-+						      V4L2_CID_MPEG_VIDEO_MPEG2_PROFILE,
-+						      V4L2_MPEG_VIDEO_MPEG2_PROFILE_MAIN,
-+						      ~(BIT(V4L2_MPEG_VIDEO_MPEG2_PROFILE_SIMPLE) |
-+							BIT(V4L2_MPEG_VIDEO_MPEG2_PROFILE_MAIN)),
-+						      V4L2_MPEG_VIDEO_MPEG2_PROFILE_MAIN);
-+			ctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY;
- 			break;
- 		case V4L2_PIX_FMT_MPEG4:
--			v4l2_ctrl_new_std_menu(hdl, &bcm2835_codec_ctrl_ops,
--					       V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL,
--					       V4L2_MPEG_VIDEO_MPEG4_LEVEL_5,
--					       ~(BIT(V4L2_MPEG_VIDEO_MPEG4_LEVEL_0) |
--						 BIT(V4L2_MPEG_VIDEO_MPEG4_LEVEL_0B) |
--						 BIT(V4L2_MPEG_VIDEO_MPEG4_LEVEL_1) |
--						 BIT(V4L2_MPEG_VIDEO_MPEG4_LEVEL_2) |
--						 BIT(V4L2_MPEG_VIDEO_MPEG4_LEVEL_3) |
--						 BIT(V4L2_MPEG_VIDEO_MPEG4_LEVEL_3B) |
--						 BIT(V4L2_MPEG_VIDEO_MPEG4_LEVEL_4) |
--						 BIT(V4L2_MPEG_VIDEO_MPEG4_LEVEL_5)),
--					       V4L2_MPEG_VIDEO_MPEG4_LEVEL_4);
--			v4l2_ctrl_new_std_menu(hdl, &bcm2835_codec_ctrl_ops,
--					       V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE,
--					       V4L2_MPEG_VIDEO_MPEG4_PROFILE_ADVANCED_SIMPLE,
--					       ~(BIT(V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE) |
--						 BIT(V4L2_MPEG_VIDEO_MPEG4_PROFILE_ADVANCED_SIMPLE)),
--					       V4L2_MPEG_VIDEO_MPEG4_PROFILE_ADVANCED_SIMPLE);
-+			ctrl = v4l2_ctrl_new_std_menu(hdl, &bcm2835_codec_ctrl_ops,
-+						      V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL,
-+						      V4L2_MPEG_VIDEO_MPEG4_LEVEL_5,
-+						      ~(BIT(V4L2_MPEG_VIDEO_MPEG4_LEVEL_0) |
-+							BIT(V4L2_MPEG_VIDEO_MPEG4_LEVEL_0B) |
-+							BIT(V4L2_MPEG_VIDEO_MPEG4_LEVEL_1) |
-+							BIT(V4L2_MPEG_VIDEO_MPEG4_LEVEL_2) |
-+							BIT(V4L2_MPEG_VIDEO_MPEG4_LEVEL_3) |
-+							BIT(V4L2_MPEG_VIDEO_MPEG4_LEVEL_3B) |
-+							BIT(V4L2_MPEG_VIDEO_MPEG4_LEVEL_4) |
-+							BIT(V4L2_MPEG_VIDEO_MPEG4_LEVEL_5)),
-+						      V4L2_MPEG_VIDEO_MPEG4_LEVEL_4);
-+			ctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY;
-+			ctrl = v4l2_ctrl_new_std_menu(hdl, &bcm2835_codec_ctrl_ops,
-+						      V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE,
-+						      V4L2_MPEG_VIDEO_MPEG4_PROFILE_ADVANCED_SIMPLE,
-+						      ~(BIT(V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE) |
-+							BIT(V4L2_MPEG_VIDEO_MPEG4_PROFILE_ADVANCED_SIMPLE)),
-+						      V4L2_MPEG_VIDEO_MPEG4_PROFILE_ADVANCED_SIMPLE);
-+			ctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY;
- 			break;
- 		/* No profiles defined by V4L2 */
- 		case V4L2_PIX_FMT_H263:
diff --git a/target/linux/bcm27xx/patches-6.1/950-0566-ASoC-bcm-Fix-Rpi-PROTO-and-audioinjector.net-Pi.patch b/target/linux/bcm27xx/patches-6.1/950-0566-ASoC-bcm-Fix-Rpi-PROTO-and-audioinjector.net-Pi.patch
deleted file mode 100644
index 4a8d9eaf90..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0566-ASoC-bcm-Fix-Rpi-PROTO-and-audioinjector.net-Pi.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 686855c2e6dcd6d802570e51dae19e95b78d2630 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 28 Feb 2023 14:15:42 +0000
-Subject: [PATCH] ASoC: bcm: Fix Rpi-PROTO and audioinjector.net Pi
-
-As of kernel 5.19 the WM8731 driver has separate I2C and SPI support
-modules. Change the Kconfig definitions for the audioinjector.net Pi
-and Rpi-PROTO soundcards to select SND_SOC_WM8731_I2C.
-
-See: https://github.com/raspberrypi/linux/issues/5364
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- sound/soc/bcm/Kconfig | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/sound/soc/bcm/Kconfig
-+++ b/sound/soc/bcm/Kconfig
-@@ -135,7 +135,7 @@ config SND_BCM2708_SOC_RPI_DAC
- config SND_BCM2708_SOC_RPI_PROTO
- 	tristate "Support for Rpi-PROTO"
- 	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
--	select SND_SOC_WM8731
-+	select SND_SOC_WM8731_I2C
- 	help
- 	  Say Y or M if you want to add support for Audio Codec Board PROTO (WM8731).
- 
-@@ -206,7 +206,7 @@ config SND_BCM2708_SOC_ADAU1977_ADC
- config SND_AUDIOINJECTOR_PI_SOUNDCARD
- 	tristate "Support for audioinjector.net Pi add on soundcard"
- 	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
--	select SND_SOC_WM8731
-+	select SND_SOC_WM8731_I2C
- 	help
- 	  Say Y or M if you want to add support for audioinjector.net Pi Hat
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0567-dtoverlays-Add-VCM-option-to-Arducam64MP.patch b/target/linux/bcm27xx/patches-6.1/950-0567-dtoverlays-Add-VCM-option-to-Arducam64MP.patch
deleted file mode 100644
index 14051e4c85..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0567-dtoverlays-Add-VCM-option-to-Arducam64MP.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From 96fddfeae4b139aa4b84540a1784a5be8053454c Mon Sep 17 00:00:00 2001
-From: Lee Jackson <info@arducam.com>
-Date: Mon, 27 Feb 2023 08:47:23 +0800
-Subject: [PATCH] dtoverlays: Add VCM option to Arducam64MP
-
-VCM is enabled by default, but you can use 'vcm=off' to disable VCM support.
-
-Signed-off-by: Lee Jackson <lee.jackson@arducam.com>
----
- arch/arm/boot/dts/overlays/README             |  2 +
- .../dts/overlays/arducam-64mp-overlay.dts     | 61 +++++++++----------
- arch/arm/boot/dts/overlays/arducam-64mp.dtsi  | 34 +++++++++++
- 3 files changed, 65 insertions(+), 32 deletions(-)
- create mode 100644 arch/arm/boot/dts/overlays/arducam-64mp.dtsi
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -613,6 +613,8 @@ Params: rotation                Mounting
-                                 configuring the sensor (default on)
-         cam0                    Adopt the default configuration for CAM0 on a
-                                 Compute Module (CSI0, i2c_vc, and cam0_reg).
-+        vcm                     Select lens driver state. Default is enabled,
-+                                but vcm=off will disable.
- 
- 
- Name:   arducam-pivariety
---- a/arch/arm/boot/dts/overlays/arducam-64mp-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/arducam-64mp-overlay.dts
-@@ -13,32 +13,7 @@
- 			#size-cells = <0>;
- 			status = "okay";
- 
--			arducam_64mp: arducam_64mp@1a {
--				compatible = "arducam,64mp";
--				reg = <0x1a>;
--				status = "okay";
--
--				clocks = <&cam1_clk>;
--				clock-names = "xclk";
--
--				VANA-supply = <&cam1_reg>;	/* 2.8v */
--				VDIG-supply = <&cam_dummy_reg>;	/* 1.8v */
--				VDDL-supply = <&cam_dummy_reg>;	/* 1.2v */
--
--				rotation = <0>;
--				orientation = <2>;
--
--				port {
--					arducam_64mp_0: endpoint {
--						remote-endpoint = <&csi1_ep>;
--						clock-lanes = <0>;
--						data-lanes = <1 2>;
--						clock-noncontinuous;
--						link-frequencies =
--							/bits/ 64 <456000000>;
--					};
--				};
--			};
-+			#include "arducam-64mp.dtsi"
- 		};
- 	};
- 
-@@ -49,8 +24,8 @@
- 			brcm,media-controller;
- 
- 			port{
--				csi1_ep: endpoint{
--					remote-endpoint = <&arducam_64mp_0>;
-+				csi_ep: endpoint{
-+					remote-endpoint = <&cam_endpoint>;
- 					clock-lanes = <0>;
- 					data-lanes = <1 2>;
- 					clock-noncontinuous;
-@@ -81,14 +56,36 @@
- 		};
- 	};
- 
-+	fragment@5 {
-+		target = <&cam_node>;
-+		__overlay__ {
-+			lens-focus = <&vcm_node>;
-+		};
-+	};
-+
- 	__overrides__ {
--		rotation = <&arducam_64mp>,"rotation:0";
--		orientation = <&arducam_64mp>,"orientation:0";
-+		rotation = <&cam_node>,"rotation:0";
-+		orientation = <&cam_node>,"orientation:0";
- 		media-controller = <&csi>,"brcm,media-controller?";
- 		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
- 		       <&csi_frag>, "target:0=",<&csi0>,
- 		       <&clk_frag>, "target:0=",<&cam0_clk>,
--		       <&arducam_64mp>, "clocks:0=",<&cam0_clk>,
--		       <&arducam_64mp>, "VANA-supply:0=",<&cam0_reg>;
-+		       <&cam_node>, "clocks:0=",<&cam0_clk>,
-+		       <&cam_node>, "VANA-supply:0=",<&cam0_reg>,
-+		       <&vcm_node>, "VDD-supply:0=", <&cam0_reg>;
-+		vcm = <&vcm_node>, "status",
-+		      <0>, "=5";
- 	};
- };
-+
-+&cam_node {
-+	status = "okay";
-+};
-+
-+&cam_endpoint {
-+	remote-endpoint = <&csi_ep>;
-+};
-+
-+&vcm_node {
-+	status = "okay";
-+};
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/arducam-64mp.dtsi
-@@ -0,0 +1,34 @@
-+// Fragment that configures a Arducam64MP
-+
-+cam_node: arducam_64mp@1a {
-+	compatible = "arducam,64mp";
-+	reg = <0x1a>;
-+	status = "disabled";
-+
-+	clocks = <&cam1_clk>;
-+	clock-names = "xclk";
-+
-+	VANA-supply = <&cam1_reg>;	/* 2.8v */
-+	VDIG-supply = <&cam_dummy_reg>;	/* 1.8v */
-+	VDDL-supply = <&cam_dummy_reg>;	/* 1.2v */
-+
-+	rotation = <0>;
-+	orientation = <2>;
-+
-+	port {
-+		cam_endpoint: endpoint {
-+			clock-lanes = <0>;
-+			data-lanes = <1 2>;
-+			clock-noncontinuous;
-+			link-frequencies =
-+				/bits/ 64 <456000000>;
-+		};
-+	};
-+};
-+
-+vcm_node: dw9817_arducam64mp@c {
-+	compatible = "dongwoon,dw9817-vcm";
-+	reg = <0x0c>;
-+	status = "disabled";
-+	VDD-supply = <&cam1_reg>;
-+};
diff --git a/target/linux/bcm27xx/patches-6.1/950-0568-dtoverlays-Add-Arducam64MP-support-to-camera-mux-ove.patch b/target/linux/bcm27xx/patches-6.1/950-0568-dtoverlays-Add-Arducam64MP-support-to-camera-mux-ove.patch
deleted file mode 100644
index 77a4746d02..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0568-dtoverlays-Add-Arducam64MP-support-to-camera-mux-ove.patch
+++ /dev/null
@@ -1,251 +0,0 @@
-From 7db83bf5b09ebc07e5e70bc88496a60b9abecdc4 Mon Sep 17 00:00:00 2001
-From: Lee Jackson <info@arducam.com>
-Date: Mon, 27 Feb 2023 19:38:05 +0800
-Subject: [PATCH] dtoverlays: Add Arducam64MP support to camera mux
- overlays
-
-Signed-off-by: Lee Jackson <lee.jackson@arducam.com>
----
- arch/arm/boot/dts/overlays/README             | 10 ++-
- .../dts/overlays/camera-mux-2port-overlay.dts | 32 ++++++++++
- .../dts/overlays/camera-mux-4port-overlay.dts | 64 +++++++++++++++++++
- 3 files changed, 104 insertions(+), 2 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -714,7 +714,8 @@ Info:   Configures a 2 port camera multi
-         Note that currently ALL IMX290 modules share a common clock, therefore
-         all modules will need to have the same clock frequency.
- Load:   dtoverlay=camera-mux-2port,<param>=<val>
--Params: cam0-imx219             Select IMX219 for camera on port 0
-+Params: cam0-arducam-64mp       Select Arducam64MP for camera on port 0
-+        cam0-imx219             Select IMX219 for camera on port 0
-         cam0-imx258             Select IMX258 for camera on port 0
-         cam0-imx290             Select IMX290 for camera on port 0
-         cam0-imx477             Select IMX477 for camera on port 0
-@@ -725,6 +726,7 @@ Params: cam0-imx219             Select I
-         cam0-ov7251             Select OV7251 for camera on port 0
-         cam0-ov9281             Select OV9281 for camera on port 0
-         cam0-imx290-clk-freq    Set clock frequency for an IMX290 on port 0
-+        cam1-arducam-64mp       Select Arducam64MP for camera on port 1
-         cam1-imx219             Select IMX219 for camera on port 1
-         cam1-imx258             Select IMX258 for camera on port 1
-         cam1-imx290             Select IMX290 for camera on port 1
-@@ -743,7 +745,8 @@ Info:   Configures a 4 port camera multi
-         Note that currently ALL IMX290 modules share a common clock, therefore
-         all modules will need to have the same clock frequency.
- Load:   dtoverlay=camera-mux-4port,<param>=<val>
--Params: cam0-imx219             Select IMX219 for camera on port 0
-+Params: cam0-arducam-64mp       Select Arducam64MP for camera on port 0
-+        cam0-imx219             Select IMX219 for camera on port 0
-         cam0-imx258             Select IMX258 for camera on port 0
-         cam0-imx290             Select IMX290 for camera on port 0
-         cam0-imx477             Select IMX477 for camera on port 0
-@@ -754,6 +757,7 @@ Params: cam0-imx219             Select I
-         cam0-ov7251             Select OV7251 for camera on port 0
-         cam0-ov9281             Select OV9281 for camera on port 0
-         cam0-imx290-clk-freq    Set clock frequency for an IMX290 on port 0
-+        cam1-arducam-64mp       Select Arducam64MP for camera on port 1
-         cam1-imx219             Select IMX219 for camera on port 1
-         cam1-imx258             Select IMX258 for camera on port 1
-         cam1-imx290             Select IMX290 for camera on port 1
-@@ -765,6 +769,7 @@ Params: cam0-imx219             Select I
-         cam1-ov7251             Select OV7251 for camera on port 1
-         cam1-ov9281             Select OV9281 for camera on port 1
-         cam1-imx290-clk-freq    Set clock frequency for an IMX290 on port 1
-+        cam2-arducam-64mp       Select Arducam64MP for camera on port 2
-         cam2-imx219             Select IMX219 for camera on port 2
-         cam2-imx258             Select IMX258 for camera on port 2
-         cam2-imx290             Select IMX290 for camera on port 2
-@@ -776,6 +781,7 @@ Params: cam0-imx219             Select I
-         cam2-ov7251             Select OV7251 for camera on port 2
-         cam2-ov9281             Select OV9281 for camera on port 2
-         cam2-imx290-clk-freq    Set clock frequency for an IMX290 on port 2
-+        cam3-arducam-64mp       Select Arducam64MP for camera on port 3
-         cam3-imx219             Select IMX219 for camera on port 3
-         cam3-imx258             Select IMX258 for camera on port 3
-         cam3-imx290             Select IMX290 for camera on port 3
---- a/arch/arm/boot/dts/overlays/camera-mux-2port-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/camera-mux-2port-overlay.dts
-@@ -96,6 +96,16 @@
- 					#address-cells = <1>;
- 					#size-cells = <0>;
- 
-+					#define cam_node arducam_64mp_0
-+					#define cam_endpoint arducam_64mp_0_ep
-+					#define vcm_node arducam_64mp_0_vcm
-+					#define cam1_clk clk_24mhz
-+					#include "arducam-64mp.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef vcm_node
-+					#undef cam1_clk
-+
- 					#define cam_node imx219_0
- 					#define cam_endpoint imx219_0_ep
- 					#define cam1_clk clk_24mhz
-@@ -186,6 +196,16 @@
- 					#address-cells = <1>;
- 					#size-cells = <0>;
- 
-+					#define cam_node arducam_64mp_1
-+					#define cam_endpoint arducam_64mp_1_ep
-+					#define vcm_node arducam_64mp_1_vcm
-+					#define cam1_clk clk_24mhz
-+					#include "arducam-64mp.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef vcm_node
-+					#undef cam1_clk
-+
- 					#define cam_node imx219_1
- 					#define cam_endpoint imx219_1_ep
- 					#define cam1_clk clk_24mhz
-@@ -385,6 +405,12 @@
- 	};
- 
- 	__overrides__ {
-+		cam0-arducam-64mp = <&mux_in0>, "remote-endpoint:0=",<&arducam_64mp_0_ep>,
-+				    <&arducam_64mp_0_ep>, "remote-endpoint:0=",<&mux_in0>,
-+				    <&mux_in0>, "clock-noncontinuous?",
-+				    <&arducam_64mp_0>, "status=okay",
-+				    <&arducam_64mp_0_vcm>, "status=okay",
-+				    <&arducam_64mp_0>,"lens-focus:0=", <&arducam_64mp_0_vcm>;
- 		cam0-imx219 = <&mux_in0>, "remote-endpoint:0=",<&imx219_0_ep>,
- 			      <&imx219_0_ep>, "remote-endpoint:0=",<&mux_in0>,
- 			      <&mux_in0>, "clock-noncontinuous?",
-@@ -425,6 +451,12 @@
- 			      <&ov2311_0_ep>, "remote-endpoint:0=",<&mux_in0>,
- 			      <&ov2311_0>, "status=okay";
- 
-+		cam1-arducam-64mp = <&mux_in1>, "remote-endpoint:0=",<&arducam_64mp_1_ep>,
-+				    <&arducam_64mp_1_ep>, "remote-endpoint:0=",<&mux_in1>,
-+				    <&mux_in1>, "clock-noncontinuous?",
-+				    <&arducam_64mp_1>, "status=okay",
-+				    <&arducam_64mp_1_vcm>, "status=okay",
-+				    <&arducam_64mp_1>,"lens-focus:0=", <&arducam_64mp_1_vcm>;
- 		cam1-imx219 = <&mux_in1>, "remote-endpoint:0=",<&imx219_1_ep>,
- 			      <&imx219_1_ep>, "remote-endpoint:0=",<&mux_in1>,
- 			      <&mux_in1>, "clock-noncontinuous?",
---- a/arch/arm/boot/dts/overlays/camera-mux-4port-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/camera-mux-4port-overlay.dts
-@@ -154,6 +154,16 @@
- 					#address-cells = <1>;
- 					#size-cells = <0>;
- 
-+					#define cam_node arducam_64mp_0
-+					#define cam_endpoint arducam_64mp_0_ep
-+					#define vcm_node arducam_64mp_0_vcm
-+					#define cam1_clk clk_24mhz
-+					#include "arducam-64mp.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef vcm_node
-+					#undef cam1_clk
-+
- 					#define cam_node imx219_0
- 					#define cam_endpoint imx219_0_ep
- 					#define cam1_clk clk_24mhz
-@@ -244,6 +254,16 @@
- 					#address-cells = <1>;
- 					#size-cells = <0>;
- 
-+					#define cam_node arducam_64mp_1
-+					#define cam_endpoint arducam_64mp_1_ep
-+					#define vcm_node arducam_64mp_1_vcm
-+					#define cam1_clk clk_24mhz
-+					#include "arducam-64mp.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef vcm_node
-+					#undef cam1_clk
-+
- 					#define cam_node imx219_1
- 					#define cam_endpoint imx219_1_ep
- 					#define cam1_clk clk_24mhz
-@@ -334,6 +354,16 @@
- 					#address-cells = <1>;
- 					#size-cells = <0>;
- 
-+					#define cam_node arducam_64mp_2
-+					#define cam_endpoint arducam_64mp_2_ep
-+					#define vcm_node arducam_64mp_2_vcm
-+					#define cam1_clk clk_24mhz
-+					#include "arducam-64mp.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef vcm_node
-+					#undef cam1_clk
-+
- 					#define cam_node imx219_2
- 					#define cam_endpoint imx219_2_ep
- 					#define cam1_clk clk_24mhz
-@@ -424,6 +454,16 @@
- 					#address-cells = <1>;
- 					#size-cells = <0>;
- 
-+					#define cam_node arducam_64mp_3
-+					#define cam_endpoint arducam_64mp_3_ep
-+					#define vcm_node arducam_64mp_3_vcm
-+					#define cam1_clk clk_24mhz
-+					#include "arducam-64mp.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef vcm_node
-+					#undef cam1_clk
-+
- 					#define cam_node imx219_3
- 					#define cam_endpoint imx219_3_ep
- 					#define cam1_clk clk_24mhz
-@@ -640,6 +680,12 @@
- 	};
- 
- 	__overrides__ {
-+		cam0-arducam-64mp = <&mux_in0>, "remote-endpoint:0=",<&arducam_64mp_0_ep>,
-+				    <&arducam_64mp_0_ep>, "remote-endpoint:0=",<&mux_in0>,
-+				    <&mux_in0>, "clock-noncontinuous?",
-+				    <&arducam_64mp_0>, "status=okay",
-+				    <&arducam_64mp_0_vcm>, "status=okay",
-+				    <&arducam_64mp_0>,"lens-focus:0=", <&arducam_64mp_0_vcm>;
- 		cam0-imx219 = <&mux_in0>, "remote-endpoint:0=",<&imx219_0_ep>,
- 			      <&imx219_0_ep>, "remote-endpoint:0=",<&mux_in0>,
- 			      <&mux_in0>, "clock-noncontinuous?",
-@@ -680,6 +726,12 @@
- 			      <&ov2311_0_ep>, "remote-endpoint:0=",<&mux_in0>,
- 			      <&ov2311_0>, "status=okay";
- 
-+		cam1-arducam-64mp = <&mux_in1>, "remote-endpoint:0=",<&arducam_64mp_1_ep>,
-+				    <&arducam_64mp_1_ep>, "remote-endpoint:0=",<&mux_in1>,
-+				    <&mux_in1>, "clock-noncontinuous?",
-+				    <&arducam_64mp_1>, "status=okay",
-+				    <&arducam_64mp_1_vcm>, "status=okay",
-+				    <&arducam_64mp_1>,"lens-focus:0=", <&arducam_64mp_1_vcm>;
- 		cam1-imx219 = <&mux_in1>, "remote-endpoint:0=",<&imx219_1_ep>,
- 			      <&imx219_1_ep>, "remote-endpoint:0=",<&mux_in1>,
- 			      <&mux_in1>, "clock-noncontinuous?",
-@@ -720,6 +772,12 @@
- 			      <&ov2311_1_ep>, "remote-endpoint:0=",<&mux_in1>,
- 			      <&ov2311_1>, "status=okay";
- 
-+		cam2-arducam-64mp = <&mux_in2>, "remote-endpoint:0=",<&arducam_64mp_2_ep>,
-+				    <&arducam_64mp_2_ep>, "remote-endpoint:0=",<&mux_in2>,
-+				    <&mux_in2>, "clock-noncontinuous?",
-+				    <&arducam_64mp_2>, "status=okay",
-+				    <&arducam_64mp_2_vcm>, "status=okay",
-+				    <&arducam_64mp_2>,"lens-focus:0=", <&arducam_64mp_2_vcm>;
- 		cam2-imx219 = <&mux_in2>, "remote-endpoint:0=",<&imx219_2_ep>,
- 			      <&imx219_2_ep>, "remote-endpoint:0=",<&mux_in2>,
- 			      <&mux_in2>, "clock-noncontinuous?",
-@@ -760,6 +818,12 @@
- 			      <&ov2311_2_ep>, "remote-endpoint:0=",<&mux_in2>,
- 			      <&ov2311_2>, "status=okay";
- 
-+		cam3-arducam-64mp = <&mux_in3>, "remote-endpoint:0=",<&arducam_64mp_3_ep>,
-+				    <&arducam_64mp_3_ep>, "remote-endpoint:0=",<&mux_in3>,
-+				    <&mux_in3>, "clock-noncontinuous?",
-+				    <&arducam_64mp_3>, "status=okay",
-+				    <&arducam_64mp_3_vcm>, "status=okay",
-+				    <&arducam_64mp_3>,"lens-focus:0=", <&arducam_64mp_3_vcm>;
- 		cam3-imx219 = <&mux_in3>, "remote-endpoint:0=",<&imx219_3_ep>,
- 			      <&imx219_3_ep>, "remote-endpoint:0=",<&mux_in3>,
- 			      <&mux_in3>, "clock-noncontinuous?",
diff --git a/target/linux/bcm27xx/patches-6.1/950-0569-drm-panel-panel-sitronix-st7701-Support-SPI-config-a.patch b/target/linux/bcm27xx/patches-6.1/950-0569-drm-panel-panel-sitronix-st7701-Support-SPI-config-a.patch
deleted file mode 100644
index 1f0d517b2a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0569-drm-panel-panel-sitronix-st7701-Support-SPI-config-a.patch
+++ /dev/null
@@ -1,555 +0,0 @@
-From bf7ce2d1c54900ac19fef0bf0e317732682820e5 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 1 Feb 2022 15:27:01 +0000
-Subject: [PATCH] drm/panel/panel-sitronix-st7701: Support SPI config
- and RGB data
-
-The ST7701 supports numerous different interface mechanisms for
-MIPI DSI, RGB, or SPI. The driver was only implementing DSI input,
-so add RGB parallel input with SPI configuration.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/panel/panel-sitronix-st7701.c | 374 ++++++++++++++++--
- 1 file changed, 351 insertions(+), 23 deletions(-)
-
---- a/drivers/gpu/drm/panel/panel-sitronix-st7701.c
-+++ b/drivers/gpu/drm/panel/panel-sitronix-st7701.c
-@@ -7,16 +7,21 @@
- #include <drm/drm_mipi_dsi.h>
- #include <drm/drm_modes.h>
- #include <drm/drm_panel.h>
-+#include <drm/drm_print.h>
- 
- #include <linux/bitfield.h>
- #include <linux/gpio/consumer.h>
- #include <linux/delay.h>
-+#include <linux/media-bus-format.h>
- #include <linux/module.h>
- #include <linux/of_device.h>
- #include <linux/regulator/consumer.h>
-+#include <linux/spi/spi.h>
- 
- #include <video/mipi_display.h>
- 
-+#define SPI_DATA_FLAG			0x100
-+
- /* Command2 BKx selection command */
- #define DSI_CMD2BKX_SEL			0xFF
- 
-@@ -53,6 +58,10 @@
- #define DSI_CMD2BK1_SEL			0x11
- #define DSI_CMD2BK3_SEL			0x13
- #define DSI_CMD2BKX_SEL_NONE		0x00
-+#define SPI_CMD2BK3_SEL			(SPI_DATA_FLAG | DSI_CMD2BK3_SEL)
-+#define SPI_CMD2BK1_SEL			(SPI_DATA_FLAG | DSI_CMD2BK1_SEL)
-+#define SPI_CMD2BK0_SEL			(SPI_DATA_FLAG | DSI_CMD2BK0_SEL)
-+#define SPI_CMD2BKX_SEL_NONE		(SPI_DATA_FLAG | DSI_CMD2BKX_SEL_NONE)
- 
- /* Command2, BK0 bytes */
- #define DSI_CMD2_BK0_GAMCTRL_AJ_MASK	GENMASK(7, 6)
-@@ -112,11 +121,23 @@ enum op_bias {
- 
- struct st7701;
- 
-+struct st7701;
-+
-+enum st7701_ctrl_if {
-+	ST7701_CTRL_DSI,
-+	ST7701_CTRL_SPI,
-+};
-+
- struct st7701_panel_desc {
- 	const struct drm_display_mode *mode;
- 	unsigned int lanes;
- 	enum mipi_dsi_pixel_format format;
-+	u32 mediabus_format;
- 	unsigned int panel_sleep_delay;
-+	void (*init_sequence)(struct st7701 *st7701);
-+	unsigned int conn_type;
-+	enum st7701_ctrl_if interface;
-+	u32 bus_flags;
- 
- 	/* TFT matrix driver configuration, panel specific. */
- 	const u8	pv_gamma[16];	/* Positive voltage gamma control */
-@@ -142,6 +163,9 @@ struct st7701_panel_desc {
- struct st7701 {
- 	struct drm_panel panel;
- 	struct mipi_dsi_device *dsi;
-+	struct spi_device *spi;
-+	const struct device *dev;
-+
- 	const struct st7701_panel_desc *desc;
- 
- 	struct regulator_bulk_data supplies[2];
-@@ -191,7 +215,23 @@ static u8 st7701_vgls_map(struct st7701
- 	return 0;
- }
- 
--static void st7701_init_sequence(struct st7701 *st7701)
-+#define ST7701_SPI(st7701, seq...)				\
-+	{							\
-+		const u16 d[] = { seq };			\
-+		struct spi_transfer xfer = { };			\
-+		struct spi_message spi;				\
-+								\
-+		spi_message_init(&spi);				\
-+								\
-+		xfer.tx_buf = d;				\
-+		xfer.bits_per_word = 9;				\
-+		xfer.len = sizeof(u16) * ARRAY_SIZE(d);		\
-+								\
-+		spi_message_add_tail(&xfer, &spi);		\
-+		spi_sync((st7701)->spi, &spi);			\
-+	}
-+
-+static void ts8550b_init_sequence(struct st7701 *st7701)
- {
- 	const struct st7701_panel_desc *desc = st7701->desc;
- 	const struct drm_display_mode *mode = desc->mode;
-@@ -404,6 +444,111 @@ static void dmt028vghmcmi_1a_gip_sequenc
- 	ST7701_DSI(st7701, 0x3A, 0x70);
- }
- 
-+static void txw210001b0_init_sequence(struct st7701 *st7701)
-+{
-+	ST7701_SPI(st7701, MIPI_DCS_SOFT_RESET);
-+
-+	usleep_range(5000, 7000);
-+
-+	ST7701_SPI(st7701, DSI_CMD2BKX_SEL,
-+		   0x177, 0x101, 0x100, 0x100, SPI_CMD2BK0_SEL);
-+
-+	ST7701_SPI(st7701, DSI_CMD2_BK0_LNESET, 0x13B, 0x100);
-+
-+	ST7701_SPI(st7701, DSI_CMD2_BK0_PORCTRL, 0x10B, 0x102);
-+
-+	ST7701_SPI(st7701, DSI_CMD2_BK0_INVSEL, 0x100, 0x102);
-+
-+	ST7701_SPI(st7701, 0xCC, 0x110);
-+
-+	/*
-+	 * Gamma option B:
-+	 * Positive Voltage Gamma Control
-+	 */
-+	ST7701_SPI(st7701, DSI_CMD2_BK0_PVGAMCTRL,
-+		   0x102, 0x113, 0x11B, 0x10D, 0x110, 0x105, 0x108, 0x107,
-+		   0x107, 0x124, 0x104, 0x111, 0x10E, 0x12C, 0x133, 0x11D);
-+
-+	/* Negative Voltage Gamma Control */
-+	ST7701_SPI(st7701, DSI_CMD2_BK0_NVGAMCTRL,
-+		   0x105, 0x113, 0x11B, 0x10D, 0x111, 0x105, 0x108, 0x107,
-+		   0x107, 0x124, 0x104, 0x111, 0x10E, 0x12C, 0x133, 0x11D);
-+
-+	ST7701_SPI(st7701, DSI_CMD2BKX_SEL,
-+		   0x177, 0x101, 0x100, 0x100, SPI_CMD2BK1_SEL);
-+
-+	ST7701_SPI(st7701, DSI_CMD2_BK1_VRHS, 0x15D);
-+
-+	ST7701_SPI(st7701, DSI_CMD2_BK1_VCOM, 0x143);
-+
-+	ST7701_SPI(st7701, DSI_CMD2_BK1_VGHSS, 0x181);
-+
-+	ST7701_SPI(st7701, DSI_CMD2_BK1_TESTCMD, 0x180);
-+
-+	ST7701_SPI(st7701, DSI_CMD2_BK1_VGLS, 0x143);
-+
-+	ST7701_SPI(st7701, DSI_CMD2_BK1_PWCTLR1, 0x185);
-+
-+	ST7701_SPI(st7701, DSI_CMD2_BK1_PWCTLR2, 0x120);
-+
-+	ST7701_SPI(st7701, DSI_CMD2_BK1_SPD1, 0x178);
-+
-+	ST7701_SPI(st7701, DSI_CMD2_BK1_SPD2, 0x178);
-+
-+	ST7701_SPI(st7701, DSI_CMD2_BK1_MIPISET1, 0x188);
-+
-+	ST7701_SPI(st7701, 0xE0, 0x100, 0x100, 0x102);
-+
-+	ST7701_SPI(st7701, 0xE1,
-+		   0x103, 0x1A0, 0x100, 0x100, 0x104, 0x1A0, 0x100, 0x100,
-+		   0x100, 0x120, 0x120);
-+
-+	ST7701_SPI(st7701, 0xE2,
-+		   0x100, 0x100, 0x100, 0x100, 0x100, 0x100, 0x100, 0x100,
-+		   0x100, 0x100, 0x100, 0x100, 0x100);
-+
-+	ST7701_SPI(st7701, 0xE3, 0x100, 0x100, 0x111, 0x100);
-+
-+	ST7701_SPI(st7701, 0xE4, 0x122, 0x100);
-+
-+	ST7701_SPI(st7701, 0xE5,
-+		   0x105, 0x1EC, 0x1A0, 0x1A0, 0x107, 0x1EE, 0x1A0, 0x1A0,
-+		   0x100, 0x100, 0x100, 0x100, 0x100, 0x100, 0x100, 0x100);
-+
-+	ST7701_SPI(st7701, 0xE6, 0x100, 0x100, 0x111, 0x100);
-+
-+	ST7701_SPI(st7701, 0xE7, 0x122, 0x100);
-+
-+	ST7701_SPI(st7701, 0xE8,
-+		   0x106, 0x1ED, 0x1A0, 0x1A0, 0x108, 0x1EF, 0x1A0, 0x1A0,
-+		   0x100, 0x100, 0x100, 0x100, 0x100, 0x100, 0x100, 0x100);
-+
-+	ST7701_SPI(st7701, 0xEB,
-+		   0x100, 0x100, 0x140, 0x140, 0x100, 0x100, 0x100);
-+
-+	ST7701_SPI(st7701, 0xED,
-+		   0x1FF, 0x1FF, 0x1FF, 0x1BA, 0x10A, 0x1BF, 0x145, 0x1FF,
-+		   0x1FF, 0x154, 0x1FB, 0x1A0, 0x1AB, 0x1FF, 0x1FF, 0x1FF);
-+
-+	ST7701_SPI(st7701, 0xEF, 0x110, 0x10D, 0x104, 0x108, 0x13F, 0x11F);
-+
-+	ST7701_SPI(st7701, DSI_CMD2BKX_SEL,
-+		   0x177, 0x101, 0x100, 0x100, SPI_CMD2BK3_SEL);
-+
-+	ST7701_SPI(st7701, 0xEF, 0x108);
-+
-+	ST7701_SPI(st7701, DSI_CMD2BKX_SEL,
-+		   0x177, 0x101, 0x100, 0x100, SPI_CMD2BKX_SEL_NONE);
-+
-+	ST7701_SPI(st7701, 0xCD, 0x108);  /* RGB format COLCTRL */
-+
-+	ST7701_SPI(st7701, 0x36, 0x108); /* MadCtl */
-+
-+	ST7701_SPI(st7701, 0x3A, 0x166);  /* Colmod */
-+
-+	ST7701_SPI(st7701, MIPI_DCS_EXIT_SLEEP_MODE);
-+}
-+
- static int st7701_prepare(struct drm_panel *panel)
- {
- 	struct st7701 *st7701 = panel_to_st7701(panel);
-@@ -420,7 +565,7 @@ static int st7701_prepare(struct drm_pan
- 	gpiod_set_value(st7701->reset, 1);
- 	msleep(150);
- 
--	st7701_init_sequence(st7701);
-+	st7701->desc->init_sequence(st7701);
- 
- 	if (st7701->desc->gip_sequence)
- 		st7701->desc->gip_sequence(st7701);
-@@ -436,7 +581,15 @@ static int st7701_enable(struct drm_pane
- {
- 	struct st7701 *st7701 = panel_to_st7701(panel);
- 
--	ST7701_DSI(st7701, MIPI_DCS_SET_DISPLAY_ON, 0x00);
-+	switch (st7701->desc->interface) {
-+	case ST7701_CTRL_DSI:
-+		ST7701_DSI(st7701, MIPI_DCS_SET_DISPLAY_ON, 0x00);
-+		break;
-+	case ST7701_CTRL_SPI:
-+		ST7701_SPI(st7701, MIPI_DCS_SET_DISPLAY_ON);
-+		msleep(30);
-+		break;
-+	}
- 
- 	return 0;
- }
-@@ -445,7 +598,14 @@ static int st7701_disable(struct drm_pan
- {
- 	struct st7701 *st7701 = panel_to_st7701(panel);
- 
--	ST7701_DSI(st7701, MIPI_DCS_SET_DISPLAY_OFF, 0x00);
-+	switch (st7701->desc->interface) {
-+	case ST7701_CTRL_DSI:
-+		ST7701_DSI(st7701, MIPI_DCS_SET_DISPLAY_OFF, 0x00);
-+		break;
-+	case ST7701_CTRL_SPI:
-+		ST7701_SPI(st7701, MIPI_DCS_SET_DISPLAY_OFF);
-+		break;
-+	}
- 
- 	return 0;
- }
-@@ -454,7 +614,14 @@ static int st7701_unprepare(struct drm_p
- {
- 	struct st7701 *st7701 = panel_to_st7701(panel);
- 
--	ST7701_DSI(st7701, MIPI_DCS_ENTER_SLEEP_MODE, 0x00);
-+	switch (st7701->desc->interface) {
-+	case ST7701_CTRL_DSI:
-+		ST7701_DSI(st7701, MIPI_DCS_ENTER_SLEEP_MODE, 0x00);
-+		break;
-+	case ST7701_CTRL_SPI:
-+		ST7701_SPI(st7701, MIPI_DCS_ENTER_SLEEP_MODE);
-+		break;
-+	}
- 
- 	msleep(st7701->sleep_delay);
- 
-@@ -485,7 +652,7 @@ static int st7701_get_modes(struct drm_p
- 
- 	mode = drm_mode_duplicate(connector->dev, desc_mode);
- 	if (!mode) {
--		dev_err(&st7701->dsi->dev, "failed to add mode %ux%u@%u\n",
-+		dev_err(st7701->dev, "failed to add mode %ux%u@%u\n",
- 			desc_mode->hdisplay, desc_mode->vdisplay,
- 			drm_mode_vrefresh(desc_mode));
- 		return -ENOMEM;
-@@ -494,9 +661,18 @@ static int st7701_get_modes(struct drm_p
- 	drm_mode_set_name(mode);
- 	drm_mode_probed_add(connector, mode);
- 
-+	if (st7701->desc->mediabus_format)
-+		drm_display_info_set_bus_formats(&connector->display_info,
-+						 &st7701->desc->mediabus_format,
-+						 1);
-+	connector->display_info.bus_flags = 0;
-+
- 	connector->display_info.width_mm = desc_mode->width_mm;
- 	connector->display_info.height_mm = desc_mode->height_mm;
- 
-+	if (st7701->desc->bus_flags)
-+		connector->display_info.bus_flags = st7701->desc->bus_flags;
-+
- 	return 1;
- }
- 
-@@ -532,6 +708,9 @@ static const struct st7701_panel_desc ts
- 	.lanes = 2,
- 	.format = MIPI_DSI_FMT_RGB888,
- 	.panel_sleep_delay = 80, /* panel need extra 80ms for sleep out cmd */
-+	.init_sequence = ts8550b_init_sequence,
-+	.conn_type = DRM_MODE_CONNECTOR_DSI,
-+	.interface = ST7701_CTRL_DSI,
- 
- 	.pv_gamma = {
- 		CFIELD_PREP(DSI_CMD2_BK0_GAMCTRL_AJ_MASK, 0) |
-@@ -708,38 +887,74 @@ static const struct st7701_panel_desc dm
- 	.gip_sequence = dmt028vghmcmi_1a_gip_sequence,
- };
- 
--static int st7701_dsi_probe(struct mipi_dsi_device *dsi)
-+static const struct drm_display_mode txw210001b0_mode = {
-+	.clock		= 19200,
-+
-+	.hdisplay	= 480,
-+	.hsync_start	= 480 + 10,
-+	.hsync_end	= 480 + 10 + 16,
-+	.htotal		= 480 + 10 + 16 + 56,
-+
-+	.vdisplay	= 480,
-+	.vsync_start	= 480 + 15,
-+	.vsync_end	= 480 + 15 + 60,
-+	.vtotal		= 480 + 15 + 60 + 15,
-+
-+	.width_mm	= 53,
-+	.height_mm	= 53,
-+	.flags = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC,
-+
-+	.type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED,
-+};
-+
-+static const struct st7701_panel_desc txw210001b0_desc = {
-+	.mode = &txw210001b0_mode,
-+	.mediabus_format = MEDIA_BUS_FMT_RGB888_1X24,
-+	.init_sequence = txw210001b0_init_sequence,
-+	.conn_type = DRM_MODE_CONNECTOR_DPI,
-+	.interface = ST7701_CTRL_SPI,
-+	.bus_flags = DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE,
-+};
-+
-+static const struct st7701_panel_desc hyperpixel2r_desc = {
-+	.mode = &txw210001b0_mode,
-+	.mediabus_format = MEDIA_BUS_FMT_RGB666_1X24_CPADHI,
-+	.init_sequence = txw210001b0_init_sequence,
-+	.conn_type = DRM_MODE_CONNECTOR_DPI,
-+	.interface = ST7701_CTRL_SPI,
-+	.bus_flags = DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE,
-+};
-+
-+static int st7701_probe(struct device *dev, struct st7701 **ret_st7701)
- {
- 	const struct st7701_panel_desc *desc;
- 	struct st7701 *st7701;
- 	int ret;
- 
--	st7701 = devm_kzalloc(&dsi->dev, sizeof(*st7701), GFP_KERNEL);
-+	st7701 = devm_kzalloc(dev, sizeof(*st7701), GFP_KERNEL);
- 	if (!st7701)
- 		return -ENOMEM;
- 
--	desc = of_device_get_match_data(&dsi->dev);
--	dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST |
--			  MIPI_DSI_MODE_LPM | MIPI_DSI_CLOCK_NON_CONTINUOUS;
--	dsi->format = desc->format;
--	dsi->lanes = desc->lanes;
-+	desc = of_device_get_match_data(dev);
-+	if (!desc)
-+		return -EINVAL;
- 
- 	st7701->supplies[0].supply = "VCC";
- 	st7701->supplies[1].supply = "IOVCC";
- 
--	ret = devm_regulator_bulk_get(&dsi->dev, ARRAY_SIZE(st7701->supplies),
-+	ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(st7701->supplies),
- 				      st7701->supplies);
- 	if (ret < 0)
- 		return ret;
- 
--	st7701->reset = devm_gpiod_get(&dsi->dev, "reset", GPIOD_OUT_LOW);
-+	st7701->reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);
- 	if (IS_ERR(st7701->reset)) {
--		dev_err(&dsi->dev, "Couldn't get our reset GPIO\n");
-+		dev_err(dev, "Couldn't get our reset GPIO\n");
- 		return PTR_ERR(st7701->reset);
- 	}
- 
--	drm_panel_init(&st7701->panel, &dsi->dev, &st7701_funcs,
--		       DRM_MODE_CONNECTOR_DSI);
-+	drm_panel_init(&st7701->panel, dev, &st7701_funcs,
-+		       desc->conn_type);
- 
- 	/**
- 	 * Once sleep out has been issued, ST7701 IC required to wait 120ms
-@@ -758,9 +973,30 @@ static int st7701_dsi_probe(struct mipi_
- 
- 	drm_panel_add(&st7701->panel);
- 
-+	st7701->desc = desc;
-+	st7701->dev = dev;
-+
-+	*ret_st7701 = st7701;
-+
-+	return 0;
-+}
-+
-+static int st7701_dsi_probe(struct mipi_dsi_device *dsi)
-+{
-+	struct st7701 *st7701;
-+	int ret;
-+
-+	ret = st7701_probe(&dsi->dev, &st7701);
-+
-+	if (ret)
-+		return ret;
-+
-+	dsi->mode_flags = MIPI_DSI_MODE_VIDEO;
-+	dsi->format = st7701->desc->format;
-+	dsi->lanes = st7701->desc->lanes;
-+
- 	mipi_dsi_set_drvdata(dsi, st7701);
- 	st7701->dsi = dsi;
--	st7701->desc = desc;
- 
- 	ret = mipi_dsi_attach(dsi);
- 	if (ret)
-@@ -781,22 +1017,114 @@ static void st7701_dsi_remove(struct mip
- 	drm_panel_remove(&st7701->panel);
- }
- 
--static const struct of_device_id st7701_of_match[] = {
-+static const struct of_device_id st7701_dsi_of_match[] = {
- 	{ .compatible = "densitron,dmt028vghmcmi-1a", .data = &dmt028vghmcmi_1a_desc },
- 	{ .compatible = "techstar,ts8550b", .data = &ts8550b_desc },
- 	{ }
- };
--MODULE_DEVICE_TABLE(of, st7701_of_match);
-+MODULE_DEVICE_TABLE(of, st7701_dsi_of_match);
- 
- static struct mipi_dsi_driver st7701_dsi_driver = {
- 	.probe		= st7701_dsi_probe,
- 	.remove		= st7701_dsi_remove,
- 	.driver = {
- 		.name		= "st7701",
--		.of_match_table	= st7701_of_match,
-+		.of_match_table	= st7701_dsi_of_match,
- 	},
- };
--module_mipi_dsi_driver(st7701_dsi_driver);
-+
-+/* SPI display  probe */
-+static const struct of_device_id st7701_spi_of_match[] = {
-+	{	.compatible = "txw,txw210001b0",
-+		.data = &txw210001b0_desc,
-+	}, {
-+		.compatible = "pimoroni,hyperpixel2round",
-+		.data = &hyperpixel2r_desc,
-+	}, {
-+		/* sentinel */
-+	}
-+};
-+MODULE_DEVICE_TABLE(of, st7701_spi_of_match);
-+
-+static int st7701_spi_probe(struct spi_device *spi)
-+{
-+	struct st7701 *st7701;
-+	int ret;
-+
-+	spi->mode = SPI_MODE_3;
-+	spi->bits_per_word = 9;
-+	ret = spi_setup(spi);
-+	if (ret < 0) {
-+		dev_err(&spi->dev, "failed to setup SPI: %d\n", ret);
-+		return ret;
-+	}
-+
-+	ret = st7701_probe(&spi->dev, &st7701);
-+
-+	if (ret)
-+		return ret;
-+
-+	spi_set_drvdata(spi, st7701);
-+	st7701->spi = spi;
-+
-+	return 0;
-+}
-+
-+static void st7701_spi_remove(struct spi_device *spi)
-+{
-+	struct st7701 *ctx = spi_get_drvdata(spi);
-+
-+	drm_panel_remove(&ctx->panel);
-+}
-+
-+static const struct spi_device_id st7701_spi_ids[] = {
-+	{ "txw210001b0", 0 },
-+	{ "hyperpixel2round", 0 },
-+	{ /* sentinel */ }
-+};
-+MODULE_DEVICE_TABLE(spi, st7701_spi_ids);
-+
-+static struct spi_driver st7701_spi_driver = {
-+	.probe = st7701_spi_probe,
-+	.remove = st7701_spi_remove,
-+	.driver = {
-+		.name = "st7701",
-+		.of_match_table = st7701_spi_of_match,
-+	},
-+	.id_table = st7701_spi_ids,
-+};
-+
-+static int __init panel_st7701_init(void)
-+{
-+	int err;
-+
-+	err = spi_register_driver(&st7701_spi_driver);
-+	if (err < 0)
-+		return err;
-+
-+	if (IS_ENABLED(CONFIG_DRM_MIPI_DSI)) {
-+		err = mipi_dsi_driver_register(&st7701_dsi_driver);
-+		if (err < 0)
-+			goto err_did_spi_register;
-+	}
-+
-+	return 0;
-+
-+err_did_spi_register:
-+	spi_unregister_driver(&st7701_spi_driver);
-+
-+	return err;
-+}
-+module_init(panel_st7701_init);
-+
-+static void __exit panel_st7701_exit(void)
-+{
-+	if (IS_ENABLED(CONFIG_DRM_MIPI_DSI))
-+		mipi_dsi_driver_unregister(&st7701_dsi_driver);
-+
-+	spi_unregister_driver(&st7701_spi_driver);
-+}
-+module_exit(panel_st7701_exit);
- 
- MODULE_AUTHOR("Jagan Teki <jagan@amarulasolutions.com>");
- MODULE_DESCRIPTION("Sitronix ST7701 LCD Panel Driver");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0570-overlays-Remove-lirc-rpi-from-media-center.patch b/target/linux/bcm27xx/patches-6.1/950-0570-overlays-Remove-lirc-rpi-from-media-center.patch
deleted file mode 100644
index 0f2db63d24..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0570-overlays-Remove-lirc-rpi-from-media-center.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 1ec1688fcb2ecc8a4bf865b6f61d65bf8410a157 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 6 Mar 2023 16:34:39 +0000
-Subject: [PATCH] overlays: Remove lirc-rpi from media-center
-
-lirc-rpi was retired years ago, suggesting that this overlay is not
-being used. Before deleting outright, remove the lirc-rpi element.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/README             | 12 -----
- .../dts/overlays/media-center-overlay.dts     | 50 +------------------
- 2 files changed, 1 insertion(+), 61 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -2774,18 +2774,6 @@ Params: speed                   Display
-         xohms                   Touchpanel sensitivity (X-plate resistance)
-         swapxy                  Swap x and y axis
-         backlight               Change backlight GPIO pin {e.g. 12, 18}
--        gpio_out_pin            GPIO for output (default "17")
--        gpio_in_pin             GPIO for input (default "18")
--        gpio_in_pull            Pull up/down/off on the input pin
--                                (default "down")
--        sense                   Override the IR receive auto-detection logic:
--                                 "0" = force active-high
--                                 "1" = force active-low
--                                 "-1" = use auto-detection
--                                (default "-1")
--        softcarrier             Turn the software carrier "on" or "off"
--                                (default "on")
--        invert                  "on" = invert the output pin (default "off")
-         debug                   "on" = enable additional debug messages
-                                 (default "off")
- 
---- a/arch/arm/boot/dts/overlays/media-center-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/media-center-overlay.dts
-@@ -73,62 +73,14 @@
- 		};
- 	};
- 
--	fragment@4 {
--		target-path = "/";
--		__overlay__ {
--			lirc_rpi: lirc_rpi {
--				compatible = "rpi,lirc-rpi";
--				pinctrl-names = "default";
--				pinctrl-0 = <&lirc_pins>;
--				status = "okay";
--
--				// Override autodetection of IR receiver circuit
--				// (0 = active high, 1 = active low, -1 = no override )
--				rpi,sense = <0xffffffff>;
--
--				// Software carrier
--				// (0 = off, 1 = on)
--				rpi,softcarrier = <1>;
--
--				// Invert output
--				// (0 = off, 1 = on)
--				rpi,invert = <0>;
--
--				// Enable debugging messages
--				// (0 = off, 1 = on)
--				rpi,debug = <0>;
--			};
--		};
--	};
--
--	fragment@5 {
--		target = <&gpio>;
--		__overlay__ {
--			lirc_pins: lirc_pins {
--				brcm,pins = <6 5>;
--				brcm,function = <1 0>; // out in
--				brcm,pull = <0 1>; // off down
--			};
--		};
--	};
--
- 	__overrides__ {
- 		speed =     <&rpidisplay>,"spi-max-frequency:0";
- 		rotate =    <&rpidisplay>,"rotate:0";
- 		fps =       <&rpidisplay>,"fps:0";
--		debug =     <&rpidisplay>,"debug:0", 
--		            <&lirc_rpi>,"rpi,debug:0";
-+		debug =     <&rpidisplay>,"debug:0";
- 		xohms =     <&rpidisplay_ts>,"ti,x-plate-ohms;0";
- 		swapxy =    <&rpidisplay_ts>,"ti,swap-xy?";
- 		backlight = <&rpidisplay>,"led-gpios:4",
- 		            <&rpi_display_pins>,"brcm,pins:0";
--
--		gpio_out_pin =  <&lirc_pins>,"brcm,pins:0";
--		gpio_in_pin =   <&lirc_pins>,"brcm,pins:4";
--		gpio_in_pull =  <&lirc_pins>,"brcm,pull:4";
--
--		sense =         <&lirc_rpi>,"rpi,sense:0";
--		softcarrier =   <&lirc_rpi>,"rpi,softcarrier:0";
--		invert =        <&lirc_rpi>,"rpi,invert:0";
- 	};
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0571-overlays-pca953x-Fix-a-typos-in-the-pcal-variants.patch b/target/linux/bcm27xx/patches-6.1/950-0571-overlays-pca953x-Fix-a-typos-in-the-pcal-variants.patch
deleted file mode 100644
index 43118f08b3..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0571-overlays-pca953x-Fix-a-typos-in-the-pcal-variants.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From cdbefcc4fdaa9623f6bed4beef692e6d4453a17d Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 6 Mar 2023 17:15:36 +0000
-Subject: [PATCH] overlays: pca953x: Fix a typos in the pcal variants
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/README              |  6 +++---
- arch/arm/boot/dts/overlays/pca953x-overlay.dts | 12 ++++++------
- 2 files changed, 9 insertions(+), 9 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -3045,9 +3045,9 @@ Params: addr                    I2C addr
-         pca9574                 Select the NXP PCA9574 (8 bit)
-         pca9575                 Select the NXP PCA9575 (16 bit)
-         pca9698                 Select the NXP PCA9698 (40 bit)
--        pca16416                Select the NXP PCA16416 (16 bit)
--        pca16524                Select the NXP PCA16524 (24 bit)
--        pca19555a               Select the NXP PCA19555A (16 bit)
-+        pcal6416                Select the NXP PCAL6416 (16 bit)
-+        pcal6524                Select the NXP PCAL6524 (24 bit)
-+        pcal9555a               Select the NXP PCAL9555A (16 bit)
-         max7310                 Select the Maxim MAX7310 (8 bit)
-         max7312                 Select the Maxim MAX7312 (16 bit)
-         max7313                 Select the Maxim MAX7313 (16 bit)
---- a/arch/arm/boot/dts/overlays/pca953x-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/pca953x-overlay.dts
-@@ -110,19 +110,19 @@
- 	fragment@15 {
- 		target = <&pca>;
- 		__dormant__ {
--			compatible = "nxp,pca16416";
-+			compatible = "nxp,pcal6416";
- 		};
- 	};
- 	fragment@16 {
- 		target = <&pca>;
- 		__dormant__ {
--			compatible = "nxp,pca16524";
-+			compatible = "nxp,pcal6524";
- 		};
- 	};
- 	fragment@17 {
- 		target = <&pca>;
- 		__dormant__ {
--			compatible = "nxp,pca19555a";
-+			compatible = "nxp,pcal9555a";
- 		};
- 	};
- 	fragment@18 {
-@@ -220,9 +220,9 @@
- 		pca9574 = <0>, "+12";
- 		pca9575 = <0>, "+13";
- 		pca9698 = <0>, "+14";
--		pca16416 = <0>, "+15";
--		pca16524 = <0>, "+16";
--		pca19555a = <0>, "+17";
-+		pcal6416 = <0>, "+15";
-+		pcal6524 = <0>, "+16";
-+		pcal9555a = <0>, "+17";
- 		max7310 = <0>, "+18";
- 		max7312 = <0>, "+19";
- 		max7313 = <0>, "+20";
diff --git a/target/linux/bcm27xx/patches-6.1/950-0572-iio-adc-mcp3422-Add-correct-compatible-strings.patch b/target/linux/bcm27xx/patches-6.1/950-0572-iio-adc-mcp3422-Add-correct-compatible-strings.patch
deleted file mode 100644
index 2b6bc3ebb5..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0572-iio-adc-mcp3422-Add-correct-compatible-strings.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 019ce2b273a27409664b52ae73a26f06dc696239 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 6 Mar 2023 20:04:34 +0000
-Subject: [PATCH] iio: adc: mcp3422: Add correct compatible strings
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/iio/adc/mcp3422.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
---- a/drivers/iio/adc/mcp3422.c
-+++ b/drivers/iio/adc/mcp3422.c
-@@ -407,7 +407,14 @@ static const struct i2c_device_id mcp342
- MODULE_DEVICE_TABLE(i2c, mcp3422_id);
- 
- static const struct of_device_id mcp3422_of_match[] = {
--	{ .compatible = "mcp3422" },
-+	{ .compatible = "microchip,mcp3421" },
-+	{ .compatible = "microchip,mcp3422" },
-+	{ .compatible = "microchip,mcp3423" },
-+	{ .compatible = "microchip,mcp3424" },
-+	{ .compatible = "microchip,mcp3425" },
-+	{ .compatible = "microchip,mcp3426" },
-+	{ .compatible = "microchip,mcp3427" },
-+	{ .compatible = "microchip,mcp3428" },
- 	{ }
- };
- MODULE_DEVICE_TABLE(of, mcp3422_of_match);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0573-ASoC-adau1977-Add-correct-compatible-strings.patch b/target/linux/bcm27xx/patches-6.1/950-0573-ASoC-adau1977-Add-correct-compatible-strings.patch
deleted file mode 100644
index 20a194d87e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0573-ASoC-adau1977-Add-correct-compatible-strings.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From f341deecd13b96ad61614eeff4b92afa766f7269 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 6 Mar 2023 20:48:14 +0000
-Subject: [PATCH] ASoC: adau1977: Add correct compatible strings
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- sound/soc/codecs/adau1977-i2c.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/sound/soc/codecs/adau1977-i2c.c
-+++ b/sound/soc/codecs/adau1977-i2c.c
-@@ -38,9 +38,19 @@ static const struct i2c_device_id adau19
- };
- MODULE_DEVICE_TABLE(i2c, adau1977_i2c_ids);
- 
-+static const struct of_device_id adau1977_of_ids[] = {
-+	{ .compatible = "adi,adau1977", },
-+	{ .compatible = "adi,adau1978", },
-+	{ .compatible = "adi,adau1979", },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(of, adau1977_of_ids);
-+
-+
- static struct i2c_driver adau1977_i2c_driver = {
- 	.driver = {
- 		.name = "adau1977",
-+		.of_match_table = adau1977_of_ids,
- 	},
- 	.probe_new = adau1977_i2c_probe,
- 	.id_table = adau1977_i2c_ids,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0574-overlays-Use-vendor-qualified-compatible-strings.patch b/target/linux/bcm27xx/patches-6.1/950-0574-overlays-Use-vendor-qualified-compatible-strings.patch
deleted file mode 100644
index c656267c12..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0574-overlays-Use-vendor-qualified-compatible-strings.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From bc54d285f62135f434d6b481ae25e3a71a05702d Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 6 Mar 2023 20:54:47 +0000
-Subject: [PATCH] overlays: Use vendor-qualified compatible strings
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- .../arm/boot/dts/overlays/i2c-rtc-common.dtsi |  2 +-
- .../boot/dts/overlays/i2c-sensor-common.dtsi  | 22 +++++++++----------
- .../arm/boot/dts/overlays/papirus-overlay.dts |  2 +-
- .../arm/boot/dts/overlays/spi-rtc-overlay.dts |  4 ++--
- 4 files changed, 15 insertions(+), 15 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/i2c-rtc-common.dtsi
-+++ b/arch/arm/boot/dts/overlays/i2c-rtc-common.dtsi
-@@ -250,7 +250,7 @@
- 			#size-cells = <0>;
- 
- 			s35390a: s35390a@30 {
--				compatible = "ablic,s35390a";
-+				compatible = "sii,s35390a";
- 				reg = <0x30>;
- 			};
- 		};
---- a/arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi
-+++ b/arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi
-@@ -76,7 +76,7 @@
- 			status = "okay";
- 
- 			htu21: htu21@40 {
--				compatible = "htu21";
-+				compatible = "meas,htu21";
- 				reg = <0x40>;
- 				status = "okay";
- 			};
-@@ -91,7 +91,7 @@
- 			status = "okay";
- 
- 			lm75: lm75@4f {
--				compatible = "lm75";
-+				compatible = "national,lm75";
- 				reg = <0x4f>;
- 				status = "okay";
- 			};
-@@ -106,7 +106,7 @@
- 			status = "okay";
- 
- 			si7020: si7020@40 {
--				compatible = "si7020";
-+				compatible = "silabs,si7020";
- 				reg = <0x40>;
- 				status = "okay";
- 			};
-@@ -136,7 +136,7 @@
- 			status = "okay";
- 
- 			hdc100x: hdc100x@40 {
--				compatible = "hdc100x";
-+				compatible = "ti,hdc1000";
- 				reg = <0x40>;
- 				status = "okay";
- 			};
-@@ -151,7 +151,7 @@
- 			status = "okay";
- 
- 			tsl4531: tsl4531@29 {
--				compatible = "tsl4531";
-+				compatible = "amstaos,tsl4531";
- 				reg = <0x29>;
- 				status = "okay";
- 			};
-@@ -166,7 +166,7 @@
- 			status = "okay";
- 
- 			veml6070: veml6070@38 {
--				compatible = "veml6070";
-+				compatible = "vishay,veml6070";
- 				reg = <0x38>;
- 				status = "okay";
- 			};
-@@ -181,7 +181,7 @@
- 			status = "okay";
- 
- 			sht3x: sht3x@44 {
--				compatible = "sht3x";
-+				compatible = "sensirion,sht3x";
- 				reg = <0x44>;
- 				status = "okay";
- 			};
-@@ -196,7 +196,7 @@
- 			status = "okay";
- 
- 			ds1621: ds1621@48 {
--				compatible = "ds1621";
-+				compatible = "dallas,ds1621";
- 				reg = <0x48>;
- 				status = "okay";
- 			};
-@@ -271,7 +271,7 @@
- 			status = "okay";
- 
- 			ccs811: ccs811@5b {
--				compatible = "ccs811";
-+				compatible = "ams,ccs811";
- 				reg = <0x5b>;
- 				status = "okay";
- 			};
-@@ -286,7 +286,7 @@
- 			status = "okay";
- 
- 			bh1750: bh1750@23 {
--				compatible = "bh1750";
-+				compatible = "rohm,bh1750";
- 				reg = <0x23>;
- 				status = "okay";
- 			};
-@@ -486,7 +486,7 @@
- 			status = "okay";
- 
- 			sht4x: sht4x@44 {
--				compatible = "sht4x";
-+				compatible = "sensirion,sht4x";
- 				reg = <0x44>;
- 				status = "okay";
- 			};
---- a/arch/arm/boot/dts/overlays/papirus-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/papirus-overlay.dts
-@@ -14,7 +14,7 @@
- 			status = "okay";
- 
- 			display_temp: lm75@48 {
--				compatible = "lm75b";
-+				compatible = "national,lm75b";
- 				reg = <0x48>;
- 				status = "okay";
- 				#thermal-sensor-cells = <0>;
---- a/arch/arm/boot/dts/overlays/spi-rtc-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/spi-rtc-overlay.dts
-@@ -8,14 +8,14 @@
- 	fragment@0 {
- 		target = <&rtc>;
- 		__dormant__ {
--			compatible = "maxim,ds3232";
-+			compatible = "dallas,ds3232";
- 		};
- 	};
- 
- 	fragment@1 {
- 		target = <&rtc>;
- 		__dormant__ {
--			compatible = "maxim,ds3234";
-+			compatible = "dallas,ds3234";
- 		};
- 	};
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0575-mfd-arizona-i2c-Declare-of-MODULE_DEVICE_TABLE.patch b/target/linux/bcm27xx/patches-6.1/950-0575-mfd-arizona-i2c-Declare-of-MODULE_DEVICE_TABLE.patch
deleted file mode 100644
index 5c38ec84e0..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0575-mfd-arizona-i2c-Declare-of-MODULE_DEVICE_TABLE.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From cb8f89d446f8d204f0dbcd968bf27b0415c835ab Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 6 Mar 2023 20:56:08 +0000
-Subject: [PATCH] mfd: arizona-i2c: Declare of MODULE_DEVICE_TABLE
-
-Without a MODULE_DEVICE_TABLE declare for the of_device_ids, the
-compatible strings won't be turned into module aliases.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/mfd/arizona-i2c.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/mfd/arizona-i2c.c
-+++ b/drivers/mfd/arizona-i2c.c
-@@ -112,6 +112,7 @@ static const struct of_device_id arizona
- 	{ .compatible = "wlf,wm1814", .data = (void *)WM1814 },
- 	{},
- };
-+MODULE_DEVICE_TABLE(of, arizona_i2c_of_match);
- #endif
- 
- static struct i2c_driver arizona_i2c_driver = {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0576-gpio-pca953x-Add-ti-tca9554-compatible-string.patch b/target/linux/bcm27xx/patches-6.1/950-0576-gpio-pca953x-Add-ti-tca9554-compatible-string.patch
deleted file mode 100644
index a310201d1a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0576-gpio-pca953x-Add-ti-tca9554-compatible-string.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 960361905d77ecf3a84eaa5ca02369ddb5144bd4 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 6 Mar 2023 21:04:05 +0000
-Subject: [PATCH] gpio: pca953x: Add ti,tca9554 compatible string
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/gpio/gpio-pca953x.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/gpio/gpio-pca953x.c
-+++ b/drivers/gpio/gpio-pca953x.c
-@@ -1358,6 +1358,7 @@ static const struct of_device_id pca953x
- 	{ .compatible = "ti,tca6416", .data = OF_953X(16, PCA_INT), },
- 	{ .compatible = "ti,tca6424", .data = OF_953X(24, PCA_INT), },
- 	{ .compatible = "ti,tca9539", .data = OF_953X(16, PCA_INT), },
-+	{ .compatible = "ti,tca9554", .data = OF_953X( 8, PCA_INT), },
- 
- 	{ .compatible = "onnn,cat9554", .data = OF_953X( 8, PCA_INT), },
- 	{ .compatible = "onnn,pca9654", .data = OF_953X( 8, PCA_INT), },
diff --git a/target/linux/bcm27xx/patches-6.1/950-0577-hwmon-aht10-Add-DT-compatible-string.patch b/target/linux/bcm27xx/patches-6.1/950-0577-hwmon-aht10-Add-DT-compatible-string.patch
deleted file mode 100644
index 3b316c0fee..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0577-hwmon-aht10-Add-DT-compatible-string.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From b77c63aa6c620edb9ad908b5660d24fb3e27bd12 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 7 Mar 2023 11:52:36 +0000
-Subject: [PATCH] hwmon: (aht10): Add DT compatible string
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/hwmon/aht10.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/drivers/hwmon/aht10.c
-+++ b/drivers/hwmon/aht10.c
-@@ -332,9 +332,16 @@ static const struct i2c_device_id aht10_
- };
- MODULE_DEVICE_TABLE(i2c, aht10_id);
- 
-+static const struct of_device_id aht10_of_id[] = {
-+	{ .compatible = "aosong,aht10", },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(of, aht10_of_id);
-+
- static struct i2c_driver aht10_driver = {
- 	.driver = {
- 		.name = "aht10",
-+		.of_match_table = aht10_of_id,
- 	},
- 	.probe      = aht10_probe,
- 	.id_table   = aht10_id,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0578-hwmon-ds1621-Add-DT-compatible-strings.patch b/target/linux/bcm27xx/patches-6.1/950-0578-hwmon-ds1621-Add-DT-compatible-strings.patch
deleted file mode 100644
index 5903e8afbb..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0578-hwmon-ds1621-Add-DT-compatible-strings.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9205fca2f330f2b7bd7a53eaec7bf2f8015d4501 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 7 Mar 2023 12:12:36 +0000
-Subject: [PATCH] hwmon: (ds1621) Add DT compatible strings
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/hwmon/ds1621.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/drivers/hwmon/ds1621.c
-+++ b/drivers/hwmon/ds1621.c
-@@ -378,6 +378,16 @@ static const struct i2c_device_id ds1621
- };
- MODULE_DEVICE_TABLE(i2c, ds1621_id);
- 
-+static const struct of_device_id ds1621_of_ids[] = {
-+	{ .compatible = "dallas,ds1621", },
-+	{ .compatible = "dallas,ds1625", },
-+	{ .compatible = "dallas,ds1631", },
-+	{ .compatible = "dallas,ds1721", },
-+	{ .compatible = "dallas,ds1731", },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(of, ds1621_of_ids);
-+
- /* This is the driver that will be inserted */
- static struct i2c_driver ds1621_driver = {
- 	.class		= I2C_CLASS_HWMON,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0579-rtc-ds3232-Add-DT-compatible-string-for-ds3234.patch b/target/linux/bcm27xx/patches-6.1/950-0579-rtc-ds3232-Add-DT-compatible-string-for-ds3234.patch
deleted file mode 100644
index 1cd473dd4f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0579-rtc-ds3232-Add-DT-compatible-string-for-ds3234.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From bff500336ec392a64586aca9e1fc024a5cc159a8 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 7 Mar 2023 20:51:53 +0000
-Subject: [PATCH] rtc: ds3232: Add DT compatible string for ds3234
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/rtc/rtc-ds3232.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/drivers/rtc/rtc-ds3232.c
-+++ b/drivers/rtc/rtc-ds3232.c
-@@ -701,9 +701,16 @@ static int ds3234_probe(struct spi_devic
- 	return ds3232_probe(&spi->dev, regmap, spi->irq, "ds3234");
- }
- 
-+static const  __maybe_unused struct of_device_id ds3234_of_match[] = {
-+	{ .compatible = "dallas,ds3234" },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(of, ds3234_of_match);
-+
- static struct spi_driver ds3234_driver = {
- 	.driver = {
- 		.name	 = "ds3234",
-+		.of_match_table = of_match_ptr(ds3234_of_match),
- 	},
- 	.probe	 = ds3234_probe,
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0580-hwmon-sht3x-Add-DT-compatible-string.patch b/target/linux/bcm27xx/patches-6.1/950-0580-hwmon-sht3x-Add-DT-compatible-string.patch
deleted file mode 100644
index bed23fcb70..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0580-hwmon-sht3x-Add-DT-compatible-string.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 4ae8587685a3def5b87881f43940ffe0fd794208 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 7 Mar 2023 21:47:58 +0000
-Subject: [PATCH] hwmon: (sht3x) Add DT compatible string
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/hwmon/sht3x.c | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
---- a/drivers/hwmon/sht3x.c
-+++ b/drivers/hwmon/sht3x.c
-@@ -741,8 +741,18 @@ static const struct i2c_device_id sht3x_
- 
- MODULE_DEVICE_TABLE(i2c, sht3x_ids);
- 
-+static const struct of_device_id sht3x_of_ids[] = {
-+	{ .compatible = "sensirion,sht3x" },
-+	{ .compatible = "sensirion,sts3x" },
-+	{}
-+};
-+MODULE_DEVICE_TABLE(of, sht3x_of_ids);
-+
- static struct i2c_driver sht3x_i2c_driver = {
--	.driver.name = "sht3x",
-+	.driver = {
-+		.name = "sht3x",
-+		.of_match_table = sht3x_of_ids,
-+	},
- 	.probe_new   = sht3x_probe,
- 	.id_table    = sht3x_ids,
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0581-iio-light-tsl4531-Add-DT-compatible-string.patch b/target/linux/bcm27xx/patches-6.1/950-0581-iio-light-tsl4531-Add-DT-compatible-string.patch
deleted file mode 100644
index df279eec43..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0581-iio-light-tsl4531-Add-DT-compatible-string.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 267601d68d4c5184727b4abe1fe64e89157ee8d7 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 7 Mar 2023 21:48:54 +0000
-Subject: [PATCH] iio: light: tsl4531: Add DT compatible string
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/iio/light/tsl4531.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/drivers/iio/light/tsl4531.c
-+++ b/drivers/iio/light/tsl4531.c
-@@ -233,9 +233,16 @@ static const struct i2c_device_id tsl453
- };
- MODULE_DEVICE_TABLE(i2c, tsl4531_id);
- 
-+static const struct of_device_id tsl4531_of_id[] = {
-+	{ .compatible = "amstaos,tsl4531" },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(of, tsl4531_of_id);
-+
- static struct i2c_driver tsl4531_driver = {
- 	.driver = {
- 		.name   = TSL4531_DRV_NAME,
-+		.of_match_table = tsl4531_of_id,
- 		.pm	= pm_sleep_ptr(&tsl4531_pm_ops),
- 	},
- 	.probe  = tsl4531_probe,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0582-iio-light-veml6070-Add-DT-compatible-string.patch b/target/linux/bcm27xx/patches-6.1/950-0582-iio-light-veml6070-Add-DT-compatible-string.patch
deleted file mode 100644
index 437ecae793..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0582-iio-light-veml6070-Add-DT-compatible-string.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d337a3f310c82341597676d4b8ad51e60aa4a243 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 7 Mar 2023 21:49:30 +0000
-Subject: [PATCH] iio: light: veml6070: Add DT compatible string
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/iio/light/veml6070.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/drivers/iio/light/veml6070.c
-+++ b/drivers/iio/light/veml6070.c
-@@ -195,9 +195,16 @@ static const struct i2c_device_id veml60
- };
- MODULE_DEVICE_TABLE(i2c, veml6070_id);
- 
-+static const struct of_device_id veml6070_of_id[] = {
-+	{ .compatible = "vishay,veml6070" },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(of, veml6070_of_id);
-+
- static struct i2c_driver veml6070_driver = {
- 	.driver = {
- 		.name   = VEML6070_DRV_NAME,
-+		.of_match_table = veml6070_of_id,
- 	},
- 	.probe  = veml6070_probe,
- 	.remove  = veml6070_remove,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0584-ARM-dts-Standardise-on-the-upstream-LED-names.patch b/target/linux/bcm27xx/patches-6.1/950-0584-ARM-dts-Standardise-on-the-upstream-LED-names.patch
deleted file mode 100644
index c7b568933b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0584-ARM-dts-Standardise-on-the-upstream-LED-names.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-From 38dcfe11a53bf7467858b1bae60e16754bf1869f Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Fri, 10 Mar 2023 10:02:35 +0000
-Subject: [PATCH] ARM: dts: Standardise on the upstream LED names
-
-Historically, downstream Pi DTS files have named the LEDs led0 and (if
-present) led1, while upstream have used the more meaningful "ACT" and
-"PWR". As part of a closer alignment with upstream, make the LED names
-match.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2708-rpi-b-plus.dts   | 3 +--
- arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts   | 1 -
- arch/arm/boot/dts/bcm2708-rpi-b.dts        | 1 -
- arch/arm/boot/dts/bcm2708-rpi-cm.dtsi      | 1 -
- arch/arm/boot/dts/bcm2708-rpi-zero-w.dts   | 1 -
- arch/arm/boot/dts/bcm2708-rpi-zero.dts     | 1 -
- arch/arm/boot/dts/bcm2709-rpi-2-b.dts      | 3 +--
- arch/arm/boot/dts/bcm2709-rpi-cm2.dts      | 1 -
- arch/arm/boot/dts/bcm2710-rpi-2-b.dts      | 3 +--
- arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts | 3 +--
- arch/arm/boot/dts/bcm2710-rpi-3-b.dts      | 3 +--
- arch/arm/boot/dts/bcm2710-rpi-cm3.dts      | 1 -
- arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts | 1 -
- arch/arm/boot/dts/bcm2711-rpi-4-b.dts      | 2 --
- arch/arm/boot/dts/bcm2711-rpi-400.dts      | 2 --
- arch/arm/boot/dts/bcm2711-rpi-cm4.dts      | 2 --
- arch/arm/boot/dts/bcm2711-rpi-cm4s.dts     | 1 -
- 17 files changed, 5 insertions(+), 25 deletions(-)
-
---- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
-+++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
-@@ -157,14 +157,13 @@
- 
- &leds {
- 	act_led: led-act {
--		label = "led0";
- 		default-state = "off";
- 		linux,default-trigger = "mmc0";
- 		gpios = <&gpio 47 0>;
- 	};
- 
- 	pwr_led: led-pwr {
--		label = "led1";
-+		label = "PWR";
- 		default-state = "off";
- 		linux,default-trigger = "input";
- 		gpios = <&gpio 35 0>;
---- a/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
-+++ b/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
-@@ -175,7 +175,6 @@ i2c_csi_dsi: &i2c1 {
- 
- &leds {
- 	act_led: led-act {
--		label = "led0";
- 		default-state = "off";
- 		linux,default-trigger = "mmc0";
- 		gpios = <&gpio 16 1>;
---- a/arch/arm/boot/dts/bcm2708-rpi-b.dts
-+++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts
-@@ -157,7 +157,6 @@
- 
- &leds {
- 	act_led: led-act {
--		label = "led0";
- 		default-state = "off";
- 		linux,default-trigger = "mmc0";
- 		gpios = <&gpio 16 1>;
---- a/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
-+++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
-@@ -3,7 +3,6 @@
- 
- &leds {
- 	act_led: led-act {
--		label = "led0";
- 		default-state = "off";
- 		linux,default-trigger = "mmc0";
- 		gpios = <&gpio 47 0>;
---- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
-+++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
-@@ -213,7 +213,6 @@
- 
- &leds {
- 	act_led: led-act {
--		label = "led0";
- 		default-state = "off";
- 		linux,default-trigger = "actpwr";
- 		gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
---- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts
-+++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
-@@ -154,7 +154,6 @@
- 
- &leds {
- 	act_led: led-act {
--		label = "led0";
- 		default-state = "off";
- 		linux,default-trigger = "actpwr";
- 		gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
---- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
-+++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
-@@ -157,14 +157,13 @@
- 
- &leds {
- 	act_led: led-act {
--		label = "led0";
- 		default-state = "off";
- 		linux,default-trigger = "mmc0";
- 		gpios = <&gpio 47 0>;
- 	};
- 
- 	pwr_led: led-pwr {
--		label = "led1";
-+		label = "PWR";
- 		default-state = "off";
- 		linux,default-trigger = "input";
- 		gpios = <&gpio 35 0>;
---- a/arch/arm/boot/dts/bcm2709-rpi-cm2.dts
-+++ b/arch/arm/boot/dts/bcm2709-rpi-cm2.dts
-@@ -191,7 +191,6 @@ cam0_reg: &cam0_regulator {
- 
- &leds {
- 	act_led: led-act {
--		label = "led0";
- 		default-state = "off";
- 		linux,default-trigger = "mmc0";
- 		gpios = <&virtgpio 0 0>;
---- a/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
-+++ b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
-@@ -157,14 +157,13 @@
- 
- &leds {
- 	act_led: led-act {
--		label = "led0";
- 		default-state = "off";
- 		linux,default-trigger = "mmc0";
- 		gpios = <&gpio 47 0>;
- 	};
- 
- 	pwr_led: led-pwr {
--		label = "led1";
-+		label = "PWR";
- 		default-state = "off";
- 		linux,default-trigger = "input";
- 		gpios = <&gpio 35 0>;
---- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
-+++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
-@@ -233,14 +233,13 @@
- 
- &leds {
- 	act_led: led-act {
--		label = "led0";
- 		default-state = "off";
- 		linux,default-trigger = "mmc0";
- 		gpios = <&gpio 29 0>;
- 	};
- 
- 	pwr_led: led-pwr {
--		label = "led1";
-+		label = "PWR";
- 		default-state = "off";
- 		linux,default-trigger = "default-on";
- 		gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
---- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
-+++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
-@@ -248,14 +248,13 @@
- 
- &leds {
- 	act_led: led-act {
--		label = "led0";
- 		default-state = "off";
- 		linux,default-trigger = "mmc0";
- 		gpios = <&virtgpio 0 0>;
- 	};
- 
- 	pwr_led: led-pwr {
--		label = "led1";
-+		label = "PWR";
- 		default-state = "off";
- 		linux,default-trigger = "input";
- 		gpios = <&expgpio 7 0>;
---- a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
-+++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
-@@ -190,7 +190,6 @@ cam0_reg: &cam0_regulator {
- 
- &leds {
- 	act_led: led-act {
--		label = "led0";
- 		default-state = "off";
- 		linux,default-trigger = "mmc0";
- 		gpios = <&virtgpio 0 0>;
---- a/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
-+++ b/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
-@@ -226,7 +226,6 @@
- 
- &leds {
- 	act_led: led-act {
--		label = "led0";
- 		default-state = "off";
- 		linux,default-trigger = "actpwr";
- 		gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
---- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-@@ -506,14 +506,12 @@
- 
- &leds {
- 	act_led: led-act {
--		label = "led0";
- 		default-state = "off";
- 		linux,default-trigger = "mmc0";
- 		gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
- 	};
- 
- 	pwr_led: led-pwr {
--		label = "led1";
- 		default-state = "off";
- 		linux,default-trigger = "default-on";
- 		gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
---- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
-@@ -513,14 +513,12 @@
- 
- &leds {
- 	act_led: led-act {
--		label = "led0";
- 		default-state = "off";
- 		linux,default-trigger = "default-on";
- 		gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
- 	};
- 
- 	pwr_led: led-pwr {
--		label = "led1";
- 		default-state = "off";
- 		linux,default-trigger = "default-on";
- 		gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
---- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
-@@ -518,14 +518,12 @@
- 
- &leds {
- 	act_led: led-act {
--		label = "led0";
- 		default-state = "off";
- 		linux,default-trigger = "mmc0";
- 		gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
- 	};
- 
- 	pwr_led: led-pwr {
--		label = "led1";
- 		default-state = "off";
- 		linux,default-trigger = "default-on";
- 		gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
---- a/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
-@@ -388,7 +388,6 @@
- 
- &leds {
- 	act_led: led-act {
--		label = "led0";
- 		default-state = "off";
- 		linux,default-trigger = "mmc0";
- 	};
diff --git a/target/linux/bcm27xx/patches-6.1/950-0585-ARM-dts-bcm2711-rpi-400-Restore-the-ACT-LED.patch b/target/linux/bcm27xx/patches-6.1/950-0585-ARM-dts-bcm2711-rpi-400-Restore-the-ACT-LED.patch
deleted file mode 100644
index 1e3ef094a7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0585-ARM-dts-bcm2711-rpi-400-Restore-the-ACT-LED.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 11289568f8c1530a16721c9aeaae3ae1668eacbb Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Fri, 10 Mar 2023 11:22:24 +0000
-Subject: [PATCH] ARM: dts: bcm2711-rpi-400: Restore the ACT LED
-
-Pi 400 doesn't have an ACT LED, only a green PWR LED, but a user may
-wish to remap the ACT functionality to a GPIO on the 40-pin header.
-Restore the ACT LED declaration, but leave it disabled in order to
-prevent a GPIO being claimed until either the act_led_gpio dtparam
-or the act-led overlay is used.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2711-rpi-400.dts          | 12 ++++++++----
- arch/arm/boot/dts/overlays/act-led-overlay.dts |  3 ++-
- 2 files changed, 10 insertions(+), 5 deletions(-)
-
---- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
-@@ -512,16 +512,19 @@
- };
- 
- &leds {
-+	// Declare the LED but leave it disabled, in case a user wants to map it
-+	// to a GPIO on the header
- 	act_led: led-act {
- 		default-state = "off";
--		linux,default-trigger = "default-on";
--		gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
-+		linux,default-trigger = "mmc0";
-+		gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
-+		status = "disabled";
- 	};
- 
- 	pwr_led: led-pwr {
- 		default-state = "off";
- 		linux,default-trigger = "default-on";
--		gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
-+		gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
- 	};
- };
- 
-@@ -542,7 +545,8 @@
- 	__overrides__ {
- 		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_hdmi=0'}";
- 
--		act_led_gpio = <&act_led>,"gpios:4";
-+		act_led_gpio = <&act_led>,"gpios:4",
-+			       <&act_led>,"status=okay";
- 		act_led_activelow = <&act_led>,"gpios:8";
- 		act_led_trigger = <&act_led>,"linux,default-trigger";
- 
---- a/arch/arm/boot/dts/overlays/act-led-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/act-led-overlay.dts
-@@ -21,7 +21,8 @@
- 	};
- 
- 	__overrides__ {
--		gpio = <&frag0>,"gpios:4";
-+		gpio = <&frag0>,"gpios:4",
-+		       <&frag0>,"status=okay";
- 		activelow = <&frag0>,"gpios:8";
- 	};
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0586-ARM-dts-bcm2711-rpi-400-Add-dummy-cam1-regulator.patch b/target/linux/bcm27xx/patches-6.1/950-0586-ARM-dts-bcm2711-rpi-400-Add-dummy-cam1-regulator.patch
deleted file mode 100644
index 77f25f7f59..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0586-ARM-dts-bcm2711-rpi-400-Add-dummy-cam1-regulator.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 54449638b90cf7d225c537792ffc57ec93b12148 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Fri, 10 Mar 2023 11:56:10 +0000
-Subject: [PATCH] ARM: dts: bcm2711-rpi-400: Add dummy cam1 regulator
-
-Adding the cam1_reg label to the dummy camera regulator gets rid of an
-error when all overlays are tried against all boards, and brings it
-closer to what's happening in 6.2.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2711-rpi-400.dts | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
-@@ -537,6 +537,9 @@
- 	pinctrl-0 = <&audio_pins>;
- };
- 
-+cam0_reg: &cam_dummy_reg {
-+};
-+
- &genet_mdio {
- 	clock-frequency = <1950000>;
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0587-overlays-vc4-kms-fkms-v3d-Raise-CMA-to-512MB.patch b/target/linux/bcm27xx/patches-6.1/950-0587-overlays-vc4-kms-fkms-v3d-Raise-CMA-to-512MB.patch
deleted file mode 100644
index 71149da59f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0587-overlays-vc4-kms-fkms-v3d-Raise-CMA-to-512MB.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d1f5ac4f1a999b010e043072bf5d26c80d382b33 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Fri, 10 Mar 2023 15:07:10 +0000
-Subject: [PATCH] overlays: vc4-kms/fkms-v3d: Raise CMA to 512MB
-
-On Pi 4, raise the requested CMA size to 512MB by default, on the
-understanding that the firmware will cap that to 256MB if it's a
-32-bit kernel with less than 2GB of RAM.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/vc4-fkms-v3d-pi4-overlay.dts | 2 +-
- arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts  | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/vc4-fkms-v3d-pi4-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-pi4-overlay.dts
-@@ -8,7 +8,7 @@
- #include "cma-overlay.dts"
- 
- &frag0 {
--	size = <((320-4)*1024*1024)>;
-+	size = <((512-4)*1024*1024)>;
- };
- 
- / {
---- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts
-@@ -10,7 +10,7 @@
- #include "cma-overlay.dts"
- 
- &frag0 {
--	size = <((320-4)*1024*1024)>;
-+	size = <((512-4)*1024*1024)>;
- };
- 
- / {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0588-media-i2c-imx219-Sensor-should-report-RAW-color-spac.patch b/target/linux/bcm27xx/patches-6.1/950-0588-media-i2c-imx219-Sensor-should-report-RAW-color-spac.patch
deleted file mode 100644
index d842cd1099..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0588-media-i2c-imx219-Sensor-should-report-RAW-color-spac.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From fa426d8007bf462ad9423b49f01e6106865caca5 Mon Sep 17 00:00:00 2001
-From: David Plowman <david.plowman@raspberrypi.com>
-Date: Thu, 21 Oct 2021 14:41:55 +0100
-Subject: [PATCH] media: i2c: imx219: Sensor should report RAW color
- space
-
-Tested on Raspberry Pi running libcamera.
-
-Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
----
- drivers/media/i2c/imx219.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/media/i2c/imx219.c
-+++ b/drivers/media/i2c/imx219.c
-@@ -584,7 +584,7 @@ static void imx219_set_default_format(st
- 
- 	fmt = &imx219->fmt;
- 	fmt->code = MEDIA_BUS_FMT_SRGGB10_1X10;
--	fmt->colorspace = V4L2_COLORSPACE_SRGB;
-+	fmt->colorspace = V4L2_COLORSPACE_RAW;
- 	fmt->ycbcr_enc = V4L2_MAP_YCBCR_ENC_DEFAULT(fmt->colorspace);
- 	fmt->quantization = V4L2_MAP_QUANTIZATION_DEFAULT(true,
- 							  fmt->colorspace,
-@@ -754,7 +754,7 @@ static int imx219_enum_frame_size(struct
- 
- static void imx219_reset_colorspace(struct v4l2_mbus_framefmt *fmt)
- {
--	fmt->colorspace = V4L2_COLORSPACE_SRGB;
-+	fmt->colorspace = V4L2_COLORSPACE_RAW;
- 	fmt->ycbcr_enc = V4L2_MAP_YCBCR_ENC_DEFAULT(fmt->colorspace);
- 	fmt->quantization = V4L2_MAP_QUANTIZATION_DEFAULT(true,
- 							  fmt->colorspace,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0589-media-i2c-imx219-Correct-the-minimum-vblanking-value.patch b/target/linux/bcm27xx/patches-6.1/950-0589-media-i2c-imx219-Correct-the-minimum-vblanking-value.patch
deleted file mode 100644
index 8383a967e2..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0589-media-i2c-imx219-Correct-the-minimum-vblanking-value.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From dc65a6b457153e907fe66e49364a21f3c5248add Mon Sep 17 00:00:00 2001
-From: David Plowman <david.plowman@raspberrypi.com>
-Date: Tue, 25 Jan 2022 15:48:53 +0000
-Subject: [PATCH] media: i2c: imx219: Correct the minimum vblanking
- value
-
-The datasheet for this sensor documents the minimum vblanking as being
-32 lines. It does fix some problems with occasional black lines at the
-bottom of images (tested on Raspberry Pi).
-
-Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
----
- drivers/media/i2c/imx219.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/media/i2c/imx219.c
-+++ b/drivers/media/i2c/imx219.c
-@@ -55,7 +55,7 @@
- #define IMX219_VTS_30FPS_640x480	0x06e3
- #define IMX219_VTS_MAX			0xffff
- 
--#define IMX219_VBLANK_MIN		4
-+#define IMX219_VBLANK_MIN		32
- 
- /*Frame Length Line*/
- #define IMX219_FLL_MIN			0x08a6
diff --git a/target/linux/bcm27xx/patches-6.1/950-0590-media-i2c-imx219-make-HBLANK-r-w-to-allow-longer-exp.patch b/target/linux/bcm27xx/patches-6.1/950-0590-media-i2c-imx219-make-HBLANK-r-w-to-allow-longer-exp.patch
deleted file mode 100644
index dffae37774..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0590-media-i2c-imx219-make-HBLANK-r-w-to-allow-longer-exp.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 9c3cf1138410254184dd863ab2177d1f8d6c652b Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 10 Mar 2023 17:27:10 +0000
-Subject: [PATCH] media: i2c: imx219: make HBLANK r/w to allow longer
- exposures
-
-The HBLANK control was read-only, and always configured such
-that the sensor HTS register was 3448. This limited the maximum
-exposure time that could be achieved to around 1.26 secs.
-
-Make HBLANK read/write so that the line time can be extended,
-and thereby allow longer exposures (and slower frame rates).
-Retain the overall HTS setting when changing modes rather than
-resetting it to a default.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/i2c/imx219.c | 37 ++++++++++++++++++++++++-------------
- 1 file changed, 24 insertions(+), 13 deletions(-)
-
---- a/drivers/media/i2c/imx219.c
-+++ b/drivers/media/i2c/imx219.c
-@@ -63,8 +63,10 @@
- #define IMX219_FLL_STEP			1
- #define IMX219_FLL_DEFAULT		0x0c98
- 
--/* HBLANK control - read only */
--#define IMX219_PPL_DEFAULT		3448
-+/* HBLANK control range */
-+#define IMX219_PPL_MIN			3448
-+#define IMX219_PPL_MAX			0x7ff0
-+#define IMX219_REG_HTS			0x0162
- 
- /* Exposure control */
- #define IMX219_REG_EXPOSURE		0x015a
-@@ -191,8 +193,6 @@ static const struct imx219_reg imx219_co
- 	{0x479b, 0x0e},
- 
- 	/* Frame Bank Register Group "A" */
--	{0x0162, 0x0d},	/* Line_Length_A */
--	{0x0163, 0x78},
- 	{0x0170, 0x01}, /* X_ODD_INC_A */
- 	{0x0171, 0x01}, /* Y_ODD_INC_A */
- 
-@@ -679,6 +679,11 @@ static int imx219_set_ctrl(struct v4l2_c
- 				       IMX219_REG_VALUE_16BIT,
- 				       imx219->mode->height + ctrl->val);
- 		break;
-+	case V4L2_CID_HBLANK:
-+		ret = imx219_write_reg(imx219, IMX219_REG_HTS,
-+				       IMX219_REG_VALUE_16BIT,
-+				       imx219->mode->width + ctrl->val);
-+		break;
- 	case V4L2_CID_TEST_PATTERN_RED:
- 		ret = imx219_write_reg(imx219, IMX219_REG_TESTP_RED,
- 				       IMX219_REG_VALUE_16BIT, ctrl->val);
-@@ -837,6 +842,8 @@ static int imx219_set_pad_format(struct
- 		*framefmt = fmt->format;
- 	} else if (imx219->mode != mode ||
- 		   imx219->fmt.code != fmt->format.code) {
-+		u32 prev_hts = imx219->mode->width + imx219->hblank->val;
-+
- 		imx219->fmt = fmt->format;
- 		imx219->mode = mode;
- 		/* Update limits and set FPS to default */
-@@ -854,13 +861,19 @@ static int imx219_set_pad_format(struct
- 					 exposure_max, imx219->exposure->step,
- 					 exposure_def);
- 		/*
--		 * Currently PPL is fixed to IMX219_PPL_DEFAULT, so hblank
--		 * depends on mode->width only, and is not changeble in any
--		 * way other than changing the mode.
-+		 * Retain PPL setting from previous mode so that the
-+		 * line time does not change on a mode change.
-+		 * Limits have to be recomputed as the controls define
-+		 * the blanking only, so PPL values need to have the
-+		 * mode width subtracted.
- 		 */
--		hblank = IMX219_PPL_DEFAULT - mode->width;
--		__v4l2_ctrl_modify_range(imx219->hblank, hblank, hblank, 1,
--					 hblank);
-+		hblank = prev_hts - mode->width;
-+		__v4l2_ctrl_modify_range(imx219->hblank,
-+					 IMX219_PPL_MIN - mode->width,
-+					 IMX219_PPL_MAX - mode->width,
-+					 1,
-+					 IMX219_PPL_MIN - mode->width);
-+		__v4l2_ctrl_s_ctrl(imx219->hblank, hblank);
- 	}
- 
- 	mutex_unlock(&imx219->mutex);
-@@ -1263,12 +1276,10 @@ static int imx219_init_controls(struct i
- 					   V4L2_CID_VBLANK, IMX219_VBLANK_MIN,
- 					   IMX219_VTS_MAX - height, 1,
- 					   imx219->mode->vts_def - height);
--	hblank = IMX219_PPL_DEFAULT - imx219->mode->width;
-+	hblank = IMX219_PPL_MIN - imx219->mode->width;
- 	imx219->hblank = v4l2_ctrl_new_std(ctrl_hdlr, &imx219_ctrl_ops,
- 					   V4L2_CID_HBLANK, hblank, hblank,
- 					   1, hblank);
--	if (imx219->hblank)
--		imx219->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
- 	exposure_max = imx219->mode->vts_def - 4;
- 	exposure_def = (exposure_max < IMX219_EXPOSURE_DEFAULT) ?
- 		exposure_max : IMX219_EXPOSURE_DEFAULT;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0591-media-imx219-Advertise-embedded-data-node-on-media-p.patch b/target/linux/bcm27xx/patches-6.1/950-0591-media-imx219-Advertise-embedded-data-node-on-media-p.patch
deleted file mode 100644
index cecf3dd366..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0591-media-imx219-Advertise-embedded-data-node-on-media-p.patch
+++ /dev/null
@@ -1,356 +0,0 @@
-From 99c350f5550237cf14e6d90149e87837b995c11b Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Fri, 10 Mar 2023 17:43:57 +0000
-Subject: [PATCH] media: imx219: Advertise embedded data node on media
- pad 1
-
-This commit updates the imx219 driver to adverise support for embedded
-data streams.  This can then be used by the bcm2835-unicam driver, which
-has recently been updated to expose the embedded data stream to
-userland.
-
-The imx219 sensor subdevice overloads the media pad to differentiate
-between image stream (pad 0) and embedded data stream (pad 1) when
-performing the v4l2_subdev_pad_ops functions.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/i2c/imx219.c | 243 ++++++++++++++++++++++++-------------
- 1 file changed, 161 insertions(+), 82 deletions(-)
-
---- a/drivers/media/i2c/imx219.c
-+++ b/drivers/media/i2c/imx219.c
-@@ -126,6 +126,16 @@
- #define IMX219_PIXEL_ARRAY_WIDTH	3280U
- #define IMX219_PIXEL_ARRAY_HEIGHT	2464U
- 
-+/* Embedded metadata stream structure */
-+#define IMX219_EMBEDDED_LINE_WIDTH 16384
-+#define IMX219_NUM_EMBEDDED_LINES 1
-+
-+enum pad_types {
-+	IMAGE_PAD,
-+	METADATA_PAD,
-+	NUM_PADS
-+};
-+
- struct imx219_reg {
- 	u16 address;
- 	u8 val;
-@@ -448,7 +458,7 @@ static const struct imx219_mode supporte
- 
- struct imx219 {
- 	struct v4l2_subdev sd;
--	struct media_pad pad;
-+	struct media_pad pad[NUM_PADS];
- 
- 	struct v4l2_mbus_framefmt fmt;
- 
-@@ -598,18 +608,26 @@ static void imx219_set_default_format(st
- static int imx219_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
- {
- 	struct imx219 *imx219 = to_imx219(sd);
--	struct v4l2_mbus_framefmt *try_fmt =
--		v4l2_subdev_get_try_format(sd, fh->state, 0);
-+	struct v4l2_mbus_framefmt *try_fmt_img =
-+		v4l2_subdev_get_try_format(sd, fh->state, IMAGE_PAD);
-+	struct v4l2_mbus_framefmt *try_fmt_meta =
-+		v4l2_subdev_get_try_format(sd, fh->state, METADATA_PAD);
- 	struct v4l2_rect *try_crop;
- 
- 	mutex_lock(&imx219->mutex);
- 
- 	/* Initialize try_fmt */
--	try_fmt->width = supported_modes[0].width;
--	try_fmt->height = supported_modes[0].height;
--	try_fmt->code = imx219_get_format_code(imx219,
--					       MEDIA_BUS_FMT_SRGGB10_1X10);
--	try_fmt->field = V4L2_FIELD_NONE;
-+	try_fmt_img->width = supported_modes[0].width;
-+	try_fmt_img->height = supported_modes[0].height;
-+	try_fmt_img->code = imx219_get_format_code(imx219,
-+						   MEDIA_BUS_FMT_SRGGB10_1X10);
-+	try_fmt_img->field = V4L2_FIELD_NONE;
-+
-+	/* Initialize try_fmt for the embedded metadata pad */
-+	try_fmt_meta->width = IMX219_EMBEDDED_LINE_WIDTH;
-+	try_fmt_meta->height = IMX219_NUM_EMBEDDED_LINES;
-+	try_fmt_meta->code = MEDIA_BUS_FMT_SENSOR_DATA;
-+	try_fmt_meta->field = V4L2_FIELD_NONE;
- 
- 	/* Initialize try_crop rectangle. */
- 	try_crop = v4l2_subdev_get_try_crop(sd, fh->state, 0);
-@@ -723,12 +741,22 @@ static int imx219_enum_mbus_code(struct
- {
- 	struct imx219 *imx219 = to_imx219(sd);
- 
--	if (code->index >= (ARRAY_SIZE(codes) / 4))
-+	if (code->pad >= NUM_PADS)
- 		return -EINVAL;
- 
--	mutex_lock(&imx219->mutex);
--	code->code = imx219_get_format_code(imx219, codes[code->index * 4]);
--	mutex_unlock(&imx219->mutex);
-+	if (code->pad == IMAGE_PAD) {
-+		if (code->index >= (ARRAY_SIZE(codes) / 4))
-+			return -EINVAL;
-+
-+		mutex_lock(&imx219->mutex);
-+		code->code = imx219_get_format_code(imx219, codes[code->index * 4]);
-+		mutex_unlock(&imx219->mutex);
-+	} else {
-+		if (code->index > 0)
-+			return -EINVAL;
-+
-+		code->code = MEDIA_BUS_FMT_SENSOR_DATA;
-+	}
- 
- 	return 0;
- }
-@@ -740,19 +768,32 @@ static int imx219_enum_frame_size(struct
- 	struct imx219 *imx219 = to_imx219(sd);
- 	u32 code;
- 
--	if (fse->index >= ARRAY_SIZE(supported_modes))
-+	if (fse->pad >= NUM_PADS)
- 		return -EINVAL;
- 
--	mutex_lock(&imx219->mutex);
--	code = imx219_get_format_code(imx219, fse->code);
--	mutex_unlock(&imx219->mutex);
--	if (fse->code != code)
--		return -EINVAL;
-+	if (fse->pad == IMAGE_PAD) {
-+		if (fse->index >= ARRAY_SIZE(supported_modes))
-+			return -EINVAL;
-+
-+		mutex_lock(&imx219->mutex);
-+		code = imx219_get_format_code(imx219, fse->code);
-+		mutex_unlock(&imx219->mutex);
-+		if (fse->code != code)
-+			return -EINVAL;
-+
-+		fse->min_width = supported_modes[fse->index].width;
-+		fse->max_width = fse->min_width;
-+		fse->min_height = supported_modes[fse->index].height;
-+		fse->max_height = fse->min_height;
-+	} else {
-+		if (fse->code != MEDIA_BUS_FMT_SENSOR_DATA || fse->index > 0)
-+			return -EINVAL;
- 
--	fse->min_width = supported_modes[fse->index].width;
--	fse->max_width = fse->min_width;
--	fse->min_height = supported_modes[fse->index].height;
--	fse->max_height = fse->min_height;
-+		fse->min_width = IMX219_EMBEDDED_LINE_WIDTH;
-+		fse->max_width = fse->min_width;
-+		fse->min_height = IMX219_NUM_EMBEDDED_LINES;
-+		fse->max_height = fse->min_height;
-+	}
- 
- 	return 0;
- }
-@@ -767,9 +808,9 @@ static void imx219_reset_colorspace(stru
- 	fmt->xfer_func = V4L2_MAP_XFER_FUNC_DEFAULT(fmt->colorspace);
- }
- 
--static void imx219_update_pad_format(struct imx219 *imx219,
--				     const struct imx219_mode *mode,
--				     struct v4l2_subdev_format *fmt)
-+static void imx219_update_image_pad_format(struct imx219 *imx219,
-+					   const struct imx219_mode *mode,
-+					   struct v4l2_subdev_format *fmt)
- {
- 	fmt->format.width = mode->width;
- 	fmt->format.height = mode->height;
-@@ -777,21 +818,39 @@ static void imx219_update_pad_format(str
- 	imx219_reset_colorspace(&fmt->format);
- }
- 
-+static void imx219_update_metadata_pad_format(struct v4l2_subdev_format *fmt)
-+{
-+	fmt->format.width = IMX219_EMBEDDED_LINE_WIDTH;
-+	fmt->format.height = IMX219_NUM_EMBEDDED_LINES;
-+	fmt->format.code = MEDIA_BUS_FMT_SENSOR_DATA;
-+	fmt->format.field = V4L2_FIELD_NONE;
-+}
-+
- static int __imx219_get_pad_format(struct imx219 *imx219,
- 				   struct v4l2_subdev_state *sd_state,
- 				   struct v4l2_subdev_format *fmt)
- {
-+	if (fmt->pad >= NUM_PADS)
-+		return -EINVAL;
-+
- 	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
- 		struct v4l2_mbus_framefmt *try_fmt =
- 			v4l2_subdev_get_try_format(&imx219->sd, sd_state,
- 						   fmt->pad);
- 		/* update the code which could change due to vflip or hflip: */
--		try_fmt->code = imx219_get_format_code(imx219, try_fmt->code);
-+		try_fmt->code = fmt->pad == IMAGE_PAD ?
-+				imx219_get_format_code(imx219, try_fmt->code) :
-+				MEDIA_BUS_FMT_SENSOR_DATA;
- 		fmt->format = *try_fmt;
- 	} else {
--		imx219_update_pad_format(imx219, imx219->mode, fmt);
--		fmt->format.code = imx219_get_format_code(imx219,
--							  imx219->fmt.code);
-+		if (fmt->pad == IMAGE_PAD) {
-+			imx219_update_image_pad_format(imx219, imx219->mode,
-+						       fmt);
-+			fmt->format.code = imx219_get_format_code(imx219,
-+								  imx219->fmt.code);
-+		} else {
-+			imx219_update_metadata_pad_format(fmt);
-+		}
- 	}
- 
- 	return 0;
-@@ -821,59 +880,78 @@ static int imx219_set_pad_format(struct
- 	int exposure_max, exposure_def, hblank;
- 	unsigned int i;
- 
--	mutex_lock(&imx219->mutex);
--
--	for (i = 0; i < ARRAY_SIZE(codes); i++)
--		if (codes[i] == fmt->format.code)
--			break;
--	if (i >= ARRAY_SIZE(codes))
--		i = 0;
-+	if (fmt->pad >= NUM_PADS)
-+		return -EINVAL;
- 
--	/* Bayer order varies with flips */
--	fmt->format.code = imx219_get_format_code(imx219, codes[i]);
-+	mutex_lock(&imx219->mutex);
- 
--	mode = v4l2_find_nearest_size(supported_modes,
--				      ARRAY_SIZE(supported_modes),
--				      width, height,
--				      fmt->format.width, fmt->format.height);
--	imx219_update_pad_format(imx219, mode, fmt);
--	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
--		framefmt = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
--		*framefmt = fmt->format;
--	} else if (imx219->mode != mode ||
--		   imx219->fmt.code != fmt->format.code) {
--		u32 prev_hts = imx219->mode->width + imx219->hblank->val;
--
--		imx219->fmt = fmt->format;
--		imx219->mode = mode;
--		/* Update limits and set FPS to default */
--		__v4l2_ctrl_modify_range(imx219->vblank, IMX219_VBLANK_MIN,
--					 IMX219_VTS_MAX - mode->height, 1,
--					 mode->vts_def - mode->height);
--		__v4l2_ctrl_s_ctrl(imx219->vblank,
--				   mode->vts_def - mode->height);
--		/* Update max exposure while meeting expected vblanking */
--		exposure_max = mode->vts_def - 4;
--		exposure_def = (exposure_max < IMX219_EXPOSURE_DEFAULT) ?
--			exposure_max : IMX219_EXPOSURE_DEFAULT;
--		__v4l2_ctrl_modify_range(imx219->exposure,
--					 imx219->exposure->minimum,
--					 exposure_max, imx219->exposure->step,
--					 exposure_def);
--		/*
--		 * Retain PPL setting from previous mode so that the
--		 * line time does not change on a mode change.
--		 * Limits have to be recomputed as the controls define
--		 * the blanking only, so PPL values need to have the
--		 * mode width subtracted.
--		 */
--		hblank = prev_hts - mode->width;
--		__v4l2_ctrl_modify_range(imx219->hblank,
--					 IMX219_PPL_MIN - mode->width,
--					 IMX219_PPL_MAX - mode->width,
--					 1,
--					 IMX219_PPL_MIN - mode->width);
--		__v4l2_ctrl_s_ctrl(imx219->hblank, hblank);
-+	if (fmt->pad == IMAGE_PAD) {
-+		for (i = 0; i < ARRAY_SIZE(codes); i++)
-+			if (codes[i] == fmt->format.code)
-+				break;
-+		if (i >= ARRAY_SIZE(codes))
-+			i = 0;
-+
-+		/* Bayer order varies with flips */
-+		fmt->format.code = imx219_get_format_code(imx219, codes[i]);
-+
-+		mode = v4l2_find_nearest_size(supported_modes,
-+					      ARRAY_SIZE(supported_modes),
-+					      width, height,
-+					      fmt->format.width,
-+					      fmt->format.height);
-+		imx219_update_image_pad_format(imx219, mode, fmt);
-+		if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-+			framefmt = v4l2_subdev_get_try_format(sd, sd_state,
-+							      fmt->pad);
-+			*framefmt = fmt->format;
-+		} else if (imx219->mode != mode ||
-+			   imx219->fmt.code != fmt->format.code) {
-+			u32 prev_hts = imx219->mode->width + imx219->hblank->val;
-+
-+			imx219->fmt = fmt->format;
-+			imx219->mode = mode;
-+			/* Update limits and set FPS to default */
-+			__v4l2_ctrl_modify_range(imx219->vblank,
-+						 IMX219_VBLANK_MIN,
-+						 IMX219_VTS_MAX - mode->height,
-+						 1,
-+						 mode->vts_def - mode->height);
-+			__v4l2_ctrl_s_ctrl(imx219->vblank,
-+					   mode->vts_def - mode->height);
-+			/* Update max exposure while meeting expected vblanking */
-+			exposure_max = mode->vts_def - 4;
-+			exposure_def = (exposure_max < IMX219_EXPOSURE_DEFAULT) ?
-+				exposure_max : IMX219_EXPOSURE_DEFAULT;
-+			__v4l2_ctrl_modify_range(imx219->exposure,
-+						 imx219->exposure->minimum,
-+						 exposure_max,
-+						 imx219->exposure->step,
-+						 exposure_def);
-+			/*
-+			 * Retain PPL setting from previous mode so that the
-+			 * line time does not change on a mode change.
-+			 * Limits have to be recomputed as the controls define
-+			 * the blanking only, so PPL values need to have the
-+			 * mode width subtracted.
-+			 */
-+			hblank = prev_hts - mode->width;
-+			__v4l2_ctrl_modify_range(imx219->hblank,
-+						 IMX219_PPL_MIN - mode->width,
-+						 IMX219_PPL_MAX - mode->width,
-+						 1,
-+						 IMX219_PPL_MIN - mode->width);
-+			__v4l2_ctrl_s_ctrl(imx219->hblank, hblank);
-+		}
-+	} else {
-+		if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-+			framefmt = v4l2_subdev_get_try_format(sd, sd_state,
-+							      fmt->pad);
-+			*framefmt = fmt->format;
-+		} else {
-+			/* Only one embedded data mode is supported */
-+			imx219_update_metadata_pad_format(fmt);
-+		}
- 	}
- 
- 	mutex_unlock(&imx219->mutex);
-@@ -1490,12 +1568,13 @@ static int imx219_probe(struct i2c_clien
- 	imx219->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR;
- 
- 	/* Initialize source pad */
--	imx219->pad.flags = MEDIA_PAD_FL_SOURCE;
-+	imx219->pad[IMAGE_PAD].flags = MEDIA_PAD_FL_SOURCE;
-+	imx219->pad[METADATA_PAD].flags = MEDIA_PAD_FL_SOURCE;
- 
- 	/* Initialize default format */
- 	imx219_set_default_format(imx219);
- 
--	ret = media_entity_pads_init(&imx219->sd.entity, 1, &imx219->pad);
-+	ret = media_entity_pads_init(&imx219->sd.entity, NUM_PADS, imx219->pad);
- 	if (ret) {
- 		dev_err(dev, "failed to init entity pads: %d\n", ret);
- 		goto error_handler_free;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0592-drm-vc4-drop-unnecessary-and-harmful-HDMI-RGB-format.patch b/target/linux/bcm27xx/patches-6.1/950-0592-drm-vc4-drop-unnecessary-and-harmful-HDMI-RGB-format.patch
deleted file mode 100644
index 61da526f70..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0592-drm-vc4-drop-unnecessary-and-harmful-HDMI-RGB-format.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d2bcf55697d2fcdbbc7752779e9d35ff84d8975e Mon Sep 17 00:00:00 2001
-From: Matthias Reichl <hias@horus.com>
-Date: Sat, 11 Mar 2023 22:41:17 +0100
-Subject: [PATCH] drm/vc4: drop unnecessary and harmful HDMI RGB format
- check
-
-RGB is a mandatory format for all DVI and HDMI monitors so there's
-no need to check for presence of the DRM_COLOR_FORMAT_RGB444 bit in
-color_formats.
-
-More importantly this checks breaks working around EDID issues with
-eg video=HDMI-A-1:1024x768D or drm.edid_firmware=edid/1024x768.bin
-as the RGB444 bit is only set when a valid EDID with digital bit set in
-the input byte is present - which isn't the case when no EDID can be
-read from the display device at all or with the in-built kernel EDIDs,
-which mimic analog (VGA) displays without the digital bit set.
-
-So drop the check, if we output video on the HDMI connector we can
-assume that the display can accept 8bit RGB.
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
----
- drivers/gpu/drm/vc4/vc4_hdmi.c | 3 ---
- 1 file changed, 3 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hdmi.c
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -1962,9 +1962,6 @@ vc4_hdmi_sink_supports_format_bpc(const
- 	case VC4_HDMI_OUTPUT_RGB:
- 		drm_dbg(dev, "RGB Format, checking the constraints.\n");
- 
--		if (!(info->color_formats & DRM_COLOR_FORMAT_RGB444))
--			return false;
--
- 		if (bpc == 10 && !(info->edid_hdmi_rgb444_dc_modes & DRM_EDID_HDMI_DC_30)) {
- 			drm_dbg(dev, "10 BPC but sink doesn't support Deep Color 30.\n");
- 			return false;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0593-dt-bindings-media-i2c-Add-IMX296-CMOS-sensor-binding.patch b/target/linux/bcm27xx/patches-6.1/950-0593-dt-bindings-media-i2c-Add-IMX296-CMOS-sensor-binding.patch
deleted file mode 100644
index 003e0d4ccb..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0593-dt-bindings-media-i2c-Add-IMX296-CMOS-sensor-binding.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From 7ed07a716b1aab15c91a3238dacbc1fc76ace567 Mon Sep 17 00:00:00 2001
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-Date: Tue, 23 Aug 2022 03:58:21 +0300
-Subject: [PATCH] dt-bindings: media: i2c: Add IMX296 CMOS sensor
- binding
-
-Add YAML devicetree binding for IMX296 CMOS image sensor. Let's also
-add MAINTAINERS entry for the binding and driver.
-
-Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Reviewed-by: Rob Herring <robh@kernel.org>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- .../bindings/media/i2c/sony,imx296.yaml       | 106 ++++++++++++++++++
- MAINTAINERS                                   |   8 ++
- 2 files changed, 114 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/media/i2c/sony,imx296.yaml
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/media/i2c/sony,imx296.yaml
-@@ -0,0 +1,106 @@
-+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
-+%YAML 1.2
-+---
-+$id: http://devicetree.org/schemas/media/i2c/sony,imx296.yaml#
-+$schema: http://devicetree.org/meta-schemas/core.yaml#
-+
-+title: Sony IMX296 1/2.8-Inch CMOS Image Sensor
-+
-+maintainers:
-+  - Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-+  - Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-+
-+description: |-
-+  The Sony IMX296 is a 1/2.9-Inch active pixel type CMOS Solid-state image
-+  sensor with square pixel array and 1.58 M effective pixels. This chip
-+  features a global shutter with variable charge-integration time. It is
-+  programmable through I2C and 4-wire interfaces. The sensor output is
-+  available via CSI-2 serial data output (1 Lane).
-+
-+properties:
-+  compatible:
-+    enum:
-+      - sony,imx296
-+      - sony,imx296ll
-+      - sony,imx296lq
-+    description:
-+      The IMX296 sensor exists in two different models, a colour variant
-+      (IMX296LQ) and a monochrome variant (IMX296LL). The device exposes the
-+      model through registers, allowing for auto-detection with a common
-+      "sony,imx296" compatible string. However, some camera modules disable the
-+      ability to read the sensor model register, which disables this feature.
-+      In those cases, the exact model needs to be specified as "sony,imx296ll"
-+      or "sony,imx296lq".
-+
-+  reg:
-+    maxItems: 1
-+
-+  clocks:
-+    maxItems: 1
-+
-+  clock-names:
-+    description: Input clock (37.125 MHz, 54 MHz or 74.25 MHz)
-+    items:
-+      - const: inck
-+
-+  avdd-supply:
-+    description: Analog power supply (3.3V)
-+
-+  dvdd-supply:
-+    description: Digital power supply (1.2V)
-+
-+  ovdd-supply:
-+    description: Interface power supply (1.8V)
-+
-+  reset-gpios:
-+    description: Sensor reset (XCLR) GPIO
-+    maxItems: 1
-+
-+  port:
-+    $ref: /schemas/graph.yaml#/properties/port
-+
-+required:
-+  - compatible
-+  - reg
-+  - clocks
-+  - clock-names
-+  - avdd-supply
-+  - dvdd-supply
-+  - ovdd-supply
-+  - port
-+
-+additionalProperties: false
-+
-+examples:
-+  - |
-+    #include <dt-bindings/gpio/gpio.h>
-+
-+    i2c {
-+        #address-cells = <1>;
-+        #size-cells = <0>;
-+
-+        imx296: camera-sensor@1a {
-+            compatible = "sony,imx296";
-+            reg = <0x1a>;
-+
-+            pinctrl-names = "default";
-+            pinctrl-0 = <&camera_rear_default>;
-+
-+            clocks = <&gcc 90>;
-+            clock-names = "inck";
-+
-+            avdd-supply = <&camera_vdda_3v3>;
-+            dvdd-supply = <&camera_vddd_1v2>;
-+            ovdd-supply = <&camera_vddo_1v8>;
-+
-+            reset-gpios = <&msmgpio 35 GPIO_ACTIVE_LOW>;
-+
-+            port {
-+                imx296_ep: endpoint {
-+                    remote-endpoint = <&csiphy0_ep>;
-+                };
-+            };
-+        };
-+    };
-+
-+...
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -19281,6 +19281,14 @@ T:	git git://linuxtv.org/media_tree.git
- F:	Documentation/devicetree/bindings/media/i2c/imx290.txt
- F:	drivers/media/i2c/imx290.c
- 
-+SONY IMX296 SENSOR DRIVER
-+M:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-+M:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-+L:	linux-media@vger.kernel.org
-+S:	Maintained
-+T:	git git://linuxtv.org/media_tree.git
-+F:	Documentation/devicetree/bindings/media/i2c/sony,imx296.yaml
-+
- SONY IMX319 SENSOR DRIVER
- M:	Bingbu Cao <bingbu.cao@intel.com>
- L:	linux-media@vger.kernel.org
diff --git a/target/linux/bcm27xx/patches-6.1/950-0594-media-i2c-IMX296-camera-sensor-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0594-media-i2c-IMX296-camera-sensor-driver.patch
deleted file mode 100644
index 853b2c757a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0594-media-i2c-IMX296-camera-sensor-driver.patch
+++ /dev/null
@@ -1,1240 +0,0 @@
-From 1a08cc86d5da8bb08747277d8f46040b0fb0da3e Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Tue, 23 Aug 2022 03:58:22 +0300
-Subject: [PATCH] media: i2c: IMX296 camera sensor driver
-
-The IMX296LLR is a monochrome 1.60MP CMOS sensor from Sony. The driver
-supports cropping and binning (but not both at the same time due to
-hardware limitations) and exposure, gain, vertical blanking and test
-pattern controls.
-
-Preliminary support is also included for the color IMX296LQR sensor.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-[Sakari Ailus: Make driver's remove function return void]
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- MAINTAINERS                |    1 +
- drivers/media/i2c/Kconfig  |   13 +
- drivers/media/i2c/Makefile |    1 +
- drivers/media/i2c/imx296.c | 1172 ++++++++++++++++++++++++++++++++++++
- 4 files changed, 1187 insertions(+)
- create mode 100644 drivers/media/i2c/imx296.c
-
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -19288,6 +19288,7 @@ L:	linux-media@vger.kernel.org
- S:	Maintained
- T:	git git://linuxtv.org/media_tree.git
- F:	Documentation/devicetree/bindings/media/i2c/sony,imx296.yaml
-+F:	drivers/media/i2c/imx296.c
- 
- SONY IMX319 SENSOR DRIVER
- M:	Bingbu Cao <bingbu.cao@intel.com>
---- a/drivers/media/i2c/Kconfig
-+++ b/drivers/media/i2c/Kconfig
-@@ -191,6 +191,19 @@ config VIDEO_IMX290
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called imx290.
- 
-+config VIDEO_IMX296
-+	tristate "Sony IMX296 sensor support"
-+	depends on I2C && VIDEO_DEV
-+	select MEDIA_CONTROLLER
-+	select V4L2_FWNODE
-+	select VIDEO_V4L2_SUBDEV_API
-+	help
-+	  This is a Video4Linux2 sensor driver for the Sony
-+	  IMX296 camera.
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called imx296.
-+
- config VIDEO_IMX319
- 	tristate "Sony IMX319 sensor support"
- 	depends on I2C && VIDEO_DEV
---- a/drivers/media/i2c/Makefile
-+++ b/drivers/media/i2c/Makefile
-@@ -46,6 +46,7 @@ obj-$(CONFIG_VIDEO_IMX219) += imx219.o
- obj-$(CONFIG_VIDEO_IMX258) += imx258.o
- obj-$(CONFIG_VIDEO_IMX274) += imx274.o
- obj-$(CONFIG_VIDEO_IMX290) += imx290.o
-+obj-$(CONFIG_VIDEO_IMX296) += imx296.o
- obj-$(CONFIG_VIDEO_IMX319) += imx319.o
- obj-$(CONFIG_VIDEO_IMX334) += imx334.o
- obj-$(CONFIG_VIDEO_IMX335) += imx335.o
---- /dev/null
-+++ b/drivers/media/i2c/imx296.c
-@@ -0,0 +1,1172 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Driver for IMX296 CMOS Image Sensor from Sony
-+ *
-+ * Copyright 2019 Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-+ */
-+
-+#include <linux/clk.h>
-+#include <linux/gpio/consumer.h>
-+#include <linux/i2c.h>
-+#include <linux/module.h>
-+#include <linux/of_device.h>
-+#include <linux/pm_runtime.h>
-+#include <linux/regmap.h>
-+#include <linux/regulator/consumer.h>
-+#include <linux/slab.h>
-+#include <linux/videodev2.h>
-+
-+#include <media/v4l2-ctrls.h>
-+#include <media/v4l2-fwnode.h>
-+#include <media/v4l2-subdev.h>
-+
-+#define IMX296_PIXEL_ARRAY_WIDTH			1456
-+#define IMX296_PIXEL_ARRAY_HEIGHT			1088
-+
-+#define IMX296_REG_8BIT(n)				((1 << 16) | (n))
-+#define IMX296_REG_16BIT(n)				((2 << 16) | (n))
-+#define IMX296_REG_24BIT(n)				((3 << 16) | (n))
-+#define IMX296_REG_SIZE_SHIFT				16
-+#define IMX296_REG_ADDR_MASK				0xffff
-+
-+#define IMX296_CTRL00					IMX296_REG_8BIT(0x3000)
-+#define IMX296_CTRL00_STANDBY				BIT(0)
-+#define IMX296_CTRL08					IMX296_REG_8BIT(0x3008)
-+#define IMX296_CTRL08_REGHOLD				BIT(0)
-+#define IMX296_CTRL0A					IMX296_REG_8BIT(0x300a)
-+#define IMX296_CTRL0A_XMSTA				BIT(0)
-+#define IMX296_CTRL0B					IMX296_REG_8BIT(0x300b)
-+#define IMX296_CTRL0B_TRIGEN				BIT(0)
-+#define IMX296_CTRL0D					IMX296_REG_8BIT(0x300d)
-+#define IMX296_CTRL0D_WINMODE_ALL			(0 << 0)
-+#define IMX296_CTRL0D_WINMODE_FD_BINNING		(2 << 0)
-+#define IMX296_CTRL0D_HADD_ON_BINNING			BIT(5)
-+#define IMX296_CTRL0D_SAT_CNT				BIT(6)
-+#define IMX296_CTRL0E					IMX296_REG_8BIT(0x300e)
-+#define IMX296_CTRL0E_VREVERSE				BIT(0)
-+#define IMX296_CTRL0E_HREVERSE				BIT(1)
-+#define IMX296_VMAX					IMX296_REG_24BIT(0x3010)
-+#define IMX296_HMAX					IMX296_REG_16BIT(0x3014)
-+#define IMX296_TMDCTRL					IMX296_REG_8BIT(0x301d)
-+#define IMX296_TMDCTRL_LATCH				BIT(0)
-+#define IMX296_TMDOUT					IMX296_REG_16BIT(0x301e)
-+#define IMX296_TMDOUT_MASK				0x3ff
-+#define IMX296_WDSEL					IMX296_REG_8BIT(0x3021)
-+#define IMX296_WDSEL_NORMAL				(0 << 0)
-+#define IMX296_WDSEL_MULTI_2				(1 << 0)
-+#define IMX296_WDSEL_MULTI_4				(3 << 0)
-+#define IMX296_BLKLEVELAUTO				IMX296_REG_8BIT(0x3022)
-+#define IMX296_BLKLEVELAUTO_ON				0x01
-+#define IMX296_BLKLEVELAUTO_OFF				0xf0
-+#define IMX296_SST					IMX296_REG_8BIT(0x3024)
-+#define IMX296_SST_EN					BIT(0)
-+#define IMX296_CTRLTOUT					IMX296_REG_8BIT(0x3026)
-+#define IMX296_CTRLTOUT_TOUT1SEL_LOW			(0 << 0)
-+#define IMX296_CTRLTOUT_TOUT1SEL_PULSE			(3 << 0)
-+#define IMX296_CTRLTOUT_TOUT2SEL_LOW			(0 << 2)
-+#define IMX296_CTRLTOUT_TOUT2SEL_PULSE			(3 << 2)
-+#define IMX296_CTRLTRIG					IMX296_REG_8BIT(0x3029)
-+#define IMX296_CTRLTRIG_TOUT1_SEL_LOW			(0 << 0)
-+#define IMX296_CTRLTRIG_TOUT1_SEL_PULSE1		(1 << 0)
-+#define IMX296_CTRLTRIG_TOUT2_SEL_LOW			(0 << 4)
-+#define IMX296_CTRLTRIG_TOUT2_SEL_PULSE2		(2 << 4)
-+#define IMX296_SYNCSEL					IMX296_REG_8BIT(0x3036)
-+#define IMX296_SYNCSEL_NORMAL				0xc0
-+#define IMX296_SYNCSEL_HIZ				0xf0
-+#define IMX296_PULSE1					IMX296_REG_8BIT(0x306d)
-+#define IMX296_PULSE1_EN_NOR				BIT(0)
-+#define IMX296_PULSE1_EN_TRIG				BIT(1)
-+#define IMX296_PULSE1_POL_HIGH				(0 << 2)
-+#define IMX296_PULSE1_POL_LOW				(1 << 2)
-+#define IMX296_PULSE1_UP				IMX296_REG_24BIT(0x3070)
-+#define IMX296_PULSE1_DN				IMX296_REG_24BIT(0x3074)
-+#define IMX296_PULSE2					IMX296_REG_8BIT(0x3079)
-+#define IMX296_PULSE2_EN_NOR				BIT(0)
-+#define IMX296_PULSE2_EN_TRIG				BIT(1)
-+#define IMX296_PULSE2_POL_HIGH				(0 << 2)
-+#define IMX296_PULSE2_POL_LOW				(1 << 2)
-+#define IMX296_PULSE2_UP				IMX296_REG_24BIT(0x307c)
-+#define IMX296_PULSE2_DN				IMX296_REG_24BIT(0x3080)
-+#define IMX296_INCKSEL(n)				IMX296_REG_8BIT(0x3089 + (n))
-+#define IMX296_SHS1					IMX296_REG_24BIT(0x308d)
-+#define IMX296_SHS2					IMX296_REG_24BIT(0x3090)
-+#define IMX296_SHS3					IMX296_REG_24BIT(0x3094)
-+#define IMX296_SHS4					IMX296_REG_24BIT(0x3098)
-+#define IMX296_VBLANKLP					IMX296_REG_8BIT(0x309c)
-+#define IMX296_VBLANKLP_NORMAL				0x04
-+#define IMX296_VBLANKLP_LOW_POWER			0x2c
-+#define IMX296_EXP_CNT					IMX296_REG_8BIT(0x30a3)
-+#define IMX296_EXP_CNT_RESET				BIT(0)
-+#define IMX296_EXP_MAX					IMX296_REG_16BIT(0x30a6)
-+#define IMX296_VINT					IMX296_REG_8BIT(0x30aa)
-+#define IMX296_VINT_EN					BIT(0)
-+#define IMX296_LOWLAGTRG				IMX296_REG_8BIT(0x30ae)
-+#define IMX296_LOWLAGTRG_FAST				BIT(0)
-+#define IMX296_I2CCTRL					IMX296_REG_8BIT(0x30ef)
-+#define IMX296_I2CCTRL_I2CACKEN				BIT(0)
-+
-+#define IMX296_SENSOR_INFO				IMX296_REG_16BIT(0x3148)
-+#define IMX296_SENSOR_INFO_MONO				BIT(15)
-+#define IMX296_SENSOR_INFO_IMX296LQ			0x4a00
-+#define IMX296_SENSOR_INFO_IMX296LL			0xca00
-+#define IMX296_S_SHSA					IMX296_REG_16BIT(0x31ca)
-+#define IMX296_S_SHSB					IMX296_REG_16BIT(0x31d2)
-+/*
-+ * Registers 0x31c8 to 0x31cd, 0x31d0 to 0x31d5, 0x31e2, 0x31e3, 0x31ea and
-+ * 0x31eb are related to exposure mode but otherwise not documented.
-+ */
-+
-+#define IMX296_GAINCTRL					IMX296_REG_8BIT(0x3200)
-+#define IMX296_GAINCTRL_WD_GAIN_MODE_NORMAL		0x01
-+#define IMX296_GAINCTRL_WD_GAIN_MODE_MULTI		0x41
-+#define IMX296_GAIN					IMX296_REG_16BIT(0x3204)
-+#define IMX296_GAIN_MIN					0
-+#define IMX296_GAIN_MAX					480
-+#define IMX296_GAIN1					IMX296_REG_16BIT(0x3208)
-+#define IMX296_GAIN2					IMX296_REG_16BIT(0x320c)
-+#define IMX296_GAIN3					IMX296_REG_16BIT(0x3210)
-+#define IMX296_GAINDLY					IMX296_REG_8BIT(0x3212)
-+#define IMX296_GAINDLY_NONE				0x08
-+#define IMX296_GAINDLY_1FRAME				0x09
-+#define IMX296_PGCTRL					IMX296_REG_8BIT(0x3238)
-+#define IMX296_PGCTRL_REGEN				BIT(0)
-+#define IMX296_PGCTRL_THRU				BIT(1)
-+#define IMX296_PGCTRL_CLKEN				BIT(2)
-+#define IMX296_PGCTRL_MODE(n)				((n) << 3)
-+#define IMX296_PGHPOS					IMX296_REG_16BIT(0x3239)
-+#define IMX296_PGVPOS					IMX296_REG_16BIT(0x323c)
-+#define IMX296_PGHPSTEP					IMX296_REG_8BIT(0x323e)
-+#define IMX296_PGVPSTEP					IMX296_REG_8BIT(0x323f)
-+#define IMX296_PGHPNUM					IMX296_REG_8BIT(0x3240)
-+#define IMX296_PGVPNUM					IMX296_REG_8BIT(0x3241)
-+#define IMX296_PGDATA1					IMX296_REG_16BIT(0x3244)
-+#define IMX296_PGDATA2					IMX296_REG_16BIT(0x3246)
-+#define IMX296_PGHGSTEP					IMX296_REG_8BIT(0x3249)
-+#define IMX296_BLKLEVEL					IMX296_REG_16BIT(0x3254)
-+
-+#define IMX296_FID0_ROI					IMX296_REG_8BIT(0x3300)
-+#define IMX296_FID0_ROIH1ON				BIT(0)
-+#define IMX296_FID0_ROIV1ON				BIT(1)
-+#define IMX296_FID0_ROIPH1				IMX296_REG_16BIT(0x3310)
-+#define IMX296_FID0_ROIPV1				IMX296_REG_16BIT(0x3312)
-+#define IMX296_FID0_ROIWH1				IMX296_REG_16BIT(0x3314)
-+#define IMX296_FID0_ROIWH1_MIN				80
-+#define IMX296_FID0_ROIWV1				IMX296_REG_16BIT(0x3316)
-+#define IMX296_FID0_ROIWV1_MIN				4
-+
-+#define IMX296_CM_HSST_STARTTMG				IMX296_REG_16BIT(0x4018)
-+#define IMX296_CM_HSST_ENDTMG				IMX296_REG_16BIT(0x401a)
-+#define IMX296_DA_HSST_STARTTMG				IMX296_REG_16BIT(0x404d)
-+#define IMX296_DA_HSST_ENDTMG				IMX296_REG_16BIT(0x4050)
-+#define IMX296_LM_HSST_STARTTMG				IMX296_REG_16BIT(0x4094)
-+#define IMX296_LM_HSST_ENDTMG				IMX296_REG_16BIT(0x4096)
-+#define IMX296_SST_SIEASTA1_SET				IMX296_REG_8BIT(0x40c9)
-+#define IMX296_SST_SIEASTA1PRE_1U			IMX296_REG_16BIT(0x40cc)
-+#define IMX296_SST_SIEASTA1PRE_1D			IMX296_REG_16BIT(0x40ce)
-+#define IMX296_SST_SIEASTA1PRE_2U			IMX296_REG_16BIT(0x40d0)
-+#define IMX296_SST_SIEASTA1PRE_2D			IMX296_REG_16BIT(0x40d2)
-+#define IMX296_HSST					IMX296_REG_8BIT(0x40dc)
-+#define IMX296_HSST_EN					BIT(2)
-+
-+#define IMX296_CKREQSEL					IMX296_REG_8BIT(0x4101)
-+#define IMX296_CKREQSEL_HS				BIT(2)
-+#define IMX296_GTTABLENUM				IMX296_REG_8BIT(0x4114)
-+#define IMX296_CTRL418C					IMX296_REG_8BIT(0x418c)
-+
-+struct imx296_clk_params {
-+	unsigned int freq;
-+	u8 incksel[4];
-+	u8 ctrl418c;
-+};
-+
-+static const struct imx296_clk_params imx296_clk_params[] = {
-+	{ 37125000, { 0x80, 0x0b, 0x80, 0x08 }, 116 },
-+	{ 54000000, { 0xb0, 0x0f, 0xb0, 0x0c }, 168 },
-+	{ 74250000, { 0x80, 0x0f, 0x80, 0x0c }, 232 },
-+};
-+
-+static const char * const imx296_supply_names[] = {
-+	"dvdd",
-+	"ovdd",
-+	"avdd",
-+};
-+
-+struct imx296 {
-+	struct device *dev;
-+	struct clk *clk;
-+	struct regulator_bulk_data supplies[ARRAY_SIZE(imx296_supply_names)];
-+	struct gpio_desc *reset;
-+	struct regmap *regmap;
-+
-+	const struct imx296_clk_params *clk_params;
-+	bool mono;
-+
-+	bool streaming;
-+
-+	struct v4l2_subdev subdev;
-+	struct media_pad pad;
-+
-+	struct v4l2_ctrl_handler ctrls;
-+	struct v4l2_ctrl *hblank;
-+	struct v4l2_ctrl *vblank;
-+};
-+
-+static inline struct imx296 *to_imx296(struct v4l2_subdev *sd)
-+{
-+	return container_of(sd, struct imx296, subdev);
-+}
-+
-+static int imx296_read(struct imx296 *sensor, u32 addr)
-+{
-+	u8 data[3] = { 0, 0, 0 };
-+	int ret;
-+
-+	ret = regmap_raw_read(sensor->regmap, addr & IMX296_REG_ADDR_MASK, data,
-+			      (addr >> IMX296_REG_SIZE_SHIFT) & 3);
-+	if (ret < 0)
-+		return ret;
-+
-+	return (data[2] << 16) | (data[1] << 8) | data[0];
-+}
-+
-+static int imx296_write(struct imx296 *sensor, u32 addr, u32 value, int *err)
-+{
-+	u8 data[3] = { value & 0xff, (value >> 8) & 0xff, value >> 16 };
-+	int ret;
-+
-+	if (err && *err)
-+		return *err;
-+
-+	ret = regmap_raw_write(sensor->regmap, addr & IMX296_REG_ADDR_MASK,
-+			       data, (addr >> IMX296_REG_SIZE_SHIFT) & 3);
-+	if (ret < 0) {
-+		dev_err(sensor->dev, "%u-bit write to 0x%04x failed: %d\n",
-+			((addr >> IMX296_REG_SIZE_SHIFT) & 3) * 8,
-+			addr & IMX296_REG_ADDR_MASK, ret);
-+		if (err)
-+			*err = ret;
-+	}
-+
-+	return ret;
-+}
-+
-+static int imx296_power_on(struct imx296 *sensor)
-+{
-+	int ret;
-+
-+	ret = regulator_bulk_enable(ARRAY_SIZE(sensor->supplies),
-+				    sensor->supplies);
-+	if (ret < 0)
-+		return ret;
-+
-+	udelay(1);
-+
-+	ret = gpiod_direction_output(sensor->reset, 0);
-+	if (ret < 0)
-+		goto err_supply;
-+
-+	udelay(1);
-+
-+	ret = clk_prepare_enable(sensor->clk);
-+	if (ret < 0)
-+		goto err_reset;
-+
-+	/*
-+	 * The documentation doesn't explicitly say how much time is required
-+	 * after providing a clock and before starting I2C communication. It
-+	 * mentions a delay of 20µs in 4-wire mode, but tests showed that a
-+	 * delay of 100µs resulted in I2C communication failures, while 500µs
-+	 * seems to be enough. Be conservative.
-+	 */
-+	usleep_range(1000, 2000);
-+
-+	return 0;
-+
-+err_reset:
-+	gpiod_direction_output(sensor->reset, 1);
-+err_supply:
-+	regulator_bulk_disable(ARRAY_SIZE(sensor->supplies), sensor->supplies);
-+	return ret;
-+}
-+
-+static void imx296_power_off(struct imx296 *sensor)
-+{
-+	clk_disable_unprepare(sensor->clk);
-+	gpiod_direction_output(sensor->reset, 1);
-+	regulator_bulk_disable(ARRAY_SIZE(sensor->supplies), sensor->supplies);
-+}
-+
-+/* -----------------------------------------------------------------------------
-+ * Controls
-+ */
-+
-+static const char * const imx296_test_pattern_menu[] = {
-+	"Disabled",
-+	"Multiple Pixels",
-+	"Sequence 1",
-+	"Sequence 2",
-+	"Gradient",
-+	"Row",
-+	"Column",
-+	"Cross",
-+	"Stripe",
-+	"Checks",
-+};
-+
-+static int imx296_s_ctrl(struct v4l2_ctrl *ctrl)
-+{
-+	struct imx296 *sensor = container_of(ctrl->handler, struct imx296, ctrls);
-+	const struct v4l2_mbus_framefmt *format;
-+	struct v4l2_subdev_state *state;
-+	unsigned int vmax;
-+	int ret = 0;
-+
-+	if (!sensor->streaming)
-+		return 0;
-+
-+	state = v4l2_subdev_get_locked_active_state(&sensor->subdev);
-+	format = v4l2_subdev_get_pad_format(&sensor->subdev, state, 0);
-+
-+	switch (ctrl->id) {
-+	case V4L2_CID_EXPOSURE:
-+		/* Clamp the exposure value to VMAX. */
-+		vmax = format->height + sensor->vblank->cur.val;
-+		ctrl->val = min_t(int, ctrl->val, vmax);
-+		imx296_write(sensor, IMX296_SHS1, vmax - ctrl->val, &ret);
-+		break;
-+
-+	case V4L2_CID_ANALOGUE_GAIN:
-+		imx296_write(sensor, IMX296_GAIN, ctrl->val, &ret);
-+		break;
-+
-+	case V4L2_CID_VBLANK:
-+		imx296_write(sensor, IMX296_VMAX, format->height + ctrl->val,
-+			     &ret);
-+		break;
-+
-+	case V4L2_CID_TEST_PATTERN:
-+		if (ctrl->val) {
-+			imx296_write(sensor, IMX296_PGHPOS, 8, &ret);
-+			imx296_write(sensor, IMX296_PGVPOS, 8, &ret);
-+			imx296_write(sensor, IMX296_PGHPSTEP, 8, &ret);
-+			imx296_write(sensor, IMX296_PGVPSTEP, 8, &ret);
-+			imx296_write(sensor, IMX296_PGHPNUM, 100, &ret);
-+			imx296_write(sensor, IMX296_PGVPNUM, 100, &ret);
-+			imx296_write(sensor, IMX296_PGDATA1, 0x300, &ret);
-+			imx296_write(sensor, IMX296_PGDATA2, 0x100, &ret);
-+			imx296_write(sensor, IMX296_PGHGSTEP, 0, &ret);
-+			imx296_write(sensor, IMX296_BLKLEVEL, 0, &ret);
-+			imx296_write(sensor, IMX296_BLKLEVELAUTO,
-+				     IMX296_BLKLEVELAUTO_OFF, &ret);
-+			imx296_write(sensor, IMX296_PGCTRL,
-+				     IMX296_PGCTRL_REGEN |
-+				     IMX296_PGCTRL_CLKEN |
-+				     IMX296_PGCTRL_MODE(ctrl->val - 1), &ret);
-+		} else {
-+			imx296_write(sensor, IMX296_PGCTRL,
-+				     IMX296_PGCTRL_CLKEN, &ret);
-+			imx296_write(sensor, IMX296_BLKLEVEL, 0x3c, &ret);
-+			imx296_write(sensor, IMX296_BLKLEVELAUTO,
-+				     IMX296_BLKLEVELAUTO_ON, &ret);
-+		}
-+		break;
-+
-+	default:
-+		ret = -EINVAL;
-+		break;
-+	}
-+
-+	return ret;
-+}
-+
-+static const struct v4l2_ctrl_ops imx296_ctrl_ops = {
-+	.s_ctrl = imx296_s_ctrl,
-+};
-+
-+static int imx296_ctrls_init(struct imx296 *sensor)
-+{
-+	struct v4l2_fwnode_device_properties props;
-+	unsigned int hblank;
-+	int ret;
-+
-+	ret = v4l2_fwnode_device_parse(sensor->dev, &props);
-+	if (ret < 0)
-+		return ret;
-+
-+	v4l2_ctrl_handler_init(&sensor->ctrls, 9);
-+
-+	v4l2_ctrl_new_std(&sensor->ctrls, &imx296_ctrl_ops,
-+			  V4L2_CID_EXPOSURE, 1, 1048575, 1, 1104);
-+	v4l2_ctrl_new_std(&sensor->ctrls, &imx296_ctrl_ops,
-+			  V4L2_CID_ANALOGUE_GAIN, IMX296_GAIN_MIN,
-+			  IMX296_GAIN_MAX, 1, IMX296_GAIN_MIN);
-+
-+	/*
-+	 * Horizontal blanking is controlled through the HMAX register, which
-+	 * contains a line length in INCK clock units. The INCK frequency is
-+	 * fixed to 74.25 MHz. The HMAX value is currently fixed to 1100,
-+	 * convert it to a number of pixels based on the nominal pixel rate.
-+	 */
-+	hblank = 1100 * 1188000000ULL / 10 / 74250000
-+	       - IMX296_PIXEL_ARRAY_WIDTH;
-+	sensor->hblank = v4l2_ctrl_new_std(&sensor->ctrls, &imx296_ctrl_ops,
-+					   V4L2_CID_HBLANK, hblank, hblank, 1,
-+					   hblank);
-+	if (sensor->hblank)
-+		sensor->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
-+
-+	sensor->vblank = v4l2_ctrl_new_std(&sensor->ctrls, &imx296_ctrl_ops,
-+					   V4L2_CID_VBLANK, 30,
-+					   1048575 - IMX296_PIXEL_ARRAY_HEIGHT,
-+					   1, 30);
-+	/*
-+	 * The sensor calculates the MIPI timings internally to achieve a bit
-+	 * rate between 1122 and 1198 Mbps. The exact value is unfortunately not
-+	 * reported, at least according to the documentation. Report a nominal
-+	 * rate of 1188 Mbps as that is used by the datasheet in multiple
-+	 * examples.
-+	 */
-+	v4l2_ctrl_new_std(&sensor->ctrls, NULL, V4L2_CID_PIXEL_RATE,
-+			  1122000000 / 10, 1198000000 / 10, 1, 1188000000 / 10);
-+	v4l2_ctrl_new_std_menu_items(&sensor->ctrls, &imx296_ctrl_ops,
-+				     V4L2_CID_TEST_PATTERN,
-+				     ARRAY_SIZE(imx296_test_pattern_menu) - 1,
-+				     0, 0, imx296_test_pattern_menu);
-+
-+	v4l2_ctrl_new_fwnode_properties(&sensor->ctrls, &imx296_ctrl_ops,
-+					&props);
-+
-+	if (sensor->ctrls.error) {
-+		dev_err(sensor->dev, "failed to add controls (%d)\n",
-+			sensor->ctrls.error);
-+		v4l2_ctrl_handler_free(&sensor->ctrls);
-+		return sensor->ctrls.error;
-+	}
-+
-+	sensor->subdev.ctrl_handler = &sensor->ctrls;
-+
-+	return 0;
-+}
-+
-+/* -----------------------------------------------------------------------------
-+ * V4L2 Subdev Operations
-+ */
-+
-+/*
-+ * This table is extracted from vendor data that is entirely undocumented. The
-+ * first register write is required to activate the CSI-2 output. The other
-+ * entries may or may not be optional?
-+ */
-+static const struct {
-+	unsigned int reg;
-+	unsigned int value;
-+} imx296_init_table[] = {
-+	{ IMX296_REG_8BIT(0x3005), 0xf0 },
-+	{ IMX296_REG_8BIT(0x309e), 0x04 },
-+	{ IMX296_REG_8BIT(0x30a0), 0x04 },
-+	{ IMX296_REG_8BIT(0x30a1), 0x3c },
-+	{ IMX296_REG_8BIT(0x30a4), 0x5f },
-+	{ IMX296_REG_8BIT(0x30a8), 0x91 },
-+	{ IMX296_REG_8BIT(0x30ac), 0x28 },
-+	{ IMX296_REG_8BIT(0x30af), 0x09 },
-+	{ IMX296_REG_8BIT(0x30df), 0x00 },
-+	{ IMX296_REG_8BIT(0x3165), 0x00 },
-+	{ IMX296_REG_8BIT(0x3169), 0x10 },
-+	{ IMX296_REG_8BIT(0x316a), 0x02 },
-+	{ IMX296_REG_8BIT(0x31c8), 0xf3 },	/* Exposure-related */
-+	{ IMX296_REG_8BIT(0x31d0), 0xf4 },	/* Exposure-related */
-+	{ IMX296_REG_8BIT(0x321a), 0x00 },
-+	{ IMX296_REG_8BIT(0x3226), 0x02 },
-+	{ IMX296_REG_8BIT(0x3256), 0x01 },
-+	{ IMX296_REG_8BIT(0x3541), 0x72 },
-+	{ IMX296_REG_8BIT(0x3516), 0x77 },
-+	{ IMX296_REG_8BIT(0x350b), 0x7f },
-+	{ IMX296_REG_8BIT(0x3758), 0xa3 },
-+	{ IMX296_REG_8BIT(0x3759), 0x00 },
-+	{ IMX296_REG_8BIT(0x375a), 0x85 },
-+	{ IMX296_REG_8BIT(0x375b), 0x00 },
-+	{ IMX296_REG_8BIT(0x3832), 0xf5 },
-+	{ IMX296_REG_8BIT(0x3833), 0x00 },
-+	{ IMX296_REG_8BIT(0x38a2), 0xf6 },
-+	{ IMX296_REG_8BIT(0x38a3), 0x00 },
-+	{ IMX296_REG_8BIT(0x3a00), 0x80 },
-+	{ IMX296_REG_8BIT(0x3d48), 0xa3 },
-+	{ IMX296_REG_8BIT(0x3d49), 0x00 },
-+	{ IMX296_REG_8BIT(0x3d4a), 0x85 },
-+	{ IMX296_REG_8BIT(0x3d4b), 0x00 },
-+	{ IMX296_REG_8BIT(0x400e), 0x58 },
-+	{ IMX296_REG_8BIT(0x4014), 0x1c },
-+	{ IMX296_REG_8BIT(0x4041), 0x2a },
-+	{ IMX296_REG_8BIT(0x40a2), 0x06 },
-+	{ IMX296_REG_8BIT(0x40c1), 0xf6 },
-+	{ IMX296_REG_8BIT(0x40c7), 0x0f },
-+	{ IMX296_REG_8BIT(0x40c8), 0x00 },
-+	{ IMX296_REG_8BIT(0x4174), 0x00 },
-+};
-+
-+static int imx296_setup(struct imx296 *sensor, struct v4l2_subdev_state *state)
-+{
-+	const struct v4l2_mbus_framefmt *format;
-+	const struct v4l2_rect *crop;
-+	unsigned int i;
-+	int ret = 0;
-+
-+	format = v4l2_subdev_get_pad_format(&sensor->subdev, state, 0);
-+	crop = v4l2_subdev_get_pad_crop(&sensor->subdev, state, 0);
-+
-+	for (i = 0; i < ARRAY_SIZE(imx296_init_table); ++i)
-+		imx296_write(sensor, imx296_init_table[i].reg,
-+			     imx296_init_table[i].value, &ret);
-+
-+	if (crop->width != IMX296_PIXEL_ARRAY_WIDTH ||
-+	    crop->height != IMX296_PIXEL_ARRAY_HEIGHT) {
-+		imx296_write(sensor, IMX296_FID0_ROI,
-+			     IMX296_FID0_ROIH1ON | IMX296_FID0_ROIV1ON, &ret);
-+		imx296_write(sensor, IMX296_FID0_ROIPH1, crop->left, &ret);
-+		imx296_write(sensor, IMX296_FID0_ROIPV1, crop->top, &ret);
-+		imx296_write(sensor, IMX296_FID0_ROIWH1, crop->width, &ret);
-+		imx296_write(sensor, IMX296_FID0_ROIWV1, crop->height, &ret);
-+	} else {
-+		imx296_write(sensor, IMX296_FID0_ROI, 0, &ret);
-+	}
-+
-+	imx296_write(sensor, IMX296_CTRL0D,
-+		     (crop->width != format->width ?
-+		      IMX296_CTRL0D_HADD_ON_BINNING : 0) |
-+		     (crop->height != format->height ?
-+		      IMX296_CTRL0D_WINMODE_FD_BINNING : 0),
-+		     &ret);
-+
-+	/*
-+	 * HMAX and VMAX configure horizontal and vertical blanking by
-+	 * specifying the total line time and frame time respectively. The line
-+	 * time is specified in operational clock units (which appears to be the
-+	 * output of an internal PLL, fixed at 74.25 MHz regardless of the
-+	 * exernal clock frequency), while the frame time is specified as a
-+	 * number of lines.
-+	 *
-+	 * In the vertical direction the sensor outputs the following:
-+	 *
-+	 * - one line for the FS packet
-+	 * - two lines of embedded data (DT 0x12)
-+	 * - six null lines (DT 0x10)
-+	 * - four lines of vertical effective optical black (DT 0x37)
-+	 * - 8 to 1088 lines of active image data (RAW10, DT 0x2b)
-+	 * - one line for the FE packet
-+	 * - 16 or more lines of vertical blanking
-+	 */
-+	imx296_write(sensor, IMX296_HMAX, 1100, &ret);
-+	imx296_write(sensor, IMX296_VMAX,
-+		     format->height + sensor->vblank->cur.val, &ret);
-+
-+	for (i = 0; i < ARRAY_SIZE(sensor->clk_params->incksel); ++i)
-+		imx296_write(sensor, IMX296_INCKSEL(i),
-+			     sensor->clk_params->incksel[i], &ret);
-+	imx296_write(sensor, IMX296_GTTABLENUM, 0xc5, &ret);
-+	imx296_write(sensor, IMX296_CTRL418C, sensor->clk_params->ctrl418c,
-+		     &ret);
-+
-+	imx296_write(sensor, IMX296_GAINDLY, IMX296_GAINDLY_NONE, &ret);
-+	imx296_write(sensor, IMX296_BLKLEVEL, 0x03c, &ret);
-+
-+	return ret;
-+}
-+
-+static int imx296_stream_on(struct imx296 *sensor)
-+{
-+	int ret = 0;
-+
-+	imx296_write(sensor, IMX296_CTRL00, 0, &ret);
-+	usleep_range(2000, 5000);
-+	imx296_write(sensor, IMX296_CTRL0A, 0, &ret);
-+
-+	return ret;
-+}
-+
-+static int imx296_stream_off(struct imx296 *sensor)
-+{
-+	int ret = 0;
-+
-+	imx296_write(sensor, IMX296_CTRL0A, IMX296_CTRL0A_XMSTA, &ret);
-+	imx296_write(sensor, IMX296_CTRL00, IMX296_CTRL00_STANDBY, &ret);
-+
-+	return ret;
-+}
-+
-+static int imx296_s_stream(struct v4l2_subdev *sd, int enable)
-+{
-+	struct imx296 *sensor = to_imx296(sd);
-+	struct v4l2_subdev_state *state;
-+	int ret;
-+
-+	state = v4l2_subdev_lock_and_get_active_state(sd);
-+
-+	if (!enable) {
-+		ret = imx296_stream_off(sensor);
-+
-+		pm_runtime_mark_last_busy(sensor->dev);
-+		pm_runtime_put_autosuspend(sensor->dev);
-+
-+		sensor->streaming = false;
-+
-+		goto unlock;
-+	}
-+
-+	ret = pm_runtime_resume_and_get(sensor->dev);
-+	if (ret < 0)
-+		goto unlock;
-+
-+	ret = imx296_setup(sensor, state);
-+	if (ret < 0)
-+		goto err_pm;
-+
-+	/*
-+	 * Set streaming to true to ensure __v4l2_ctrl_handler_setup() will set
-+	 * the controls. The flag is reset to false further down if an error
-+	 * occurs.
-+	 */
-+	sensor->streaming = true;
-+
-+	ret = __v4l2_ctrl_handler_setup(&sensor->ctrls);
-+	if (ret < 0)
-+		goto err_pm;
-+
-+	ret = imx296_stream_on(sensor);
-+	if (ret)
-+		goto err_pm;
-+
-+unlock:
-+	v4l2_subdev_unlock_state(state);
-+
-+	return ret;
-+
-+err_pm:
-+	/*
-+	 * In case of error, turn the power off synchronously as the device
-+	 * likely has no other chance to recover.
-+	 */
-+	pm_runtime_put_sync(sensor->dev);
-+	sensor->streaming = false;
-+
-+	goto unlock;
-+}
-+
-+static int imx296_enum_mbus_code(struct v4l2_subdev *sd,
-+				 struct v4l2_subdev_state *state,
-+				 struct v4l2_subdev_mbus_code_enum *code)
-+{
-+	struct imx296 *sensor = to_imx296(sd);
-+
-+	if (code->index != 0)
-+		return -EINVAL;
-+
-+	code->code = sensor->mono ? MEDIA_BUS_FMT_Y10_1X10
-+		   : MEDIA_BUS_FMT_SBGGR10_1X10;
-+
-+	return 0;
-+}
-+
-+static int imx296_enum_frame_size(struct v4l2_subdev *sd,
-+				  struct v4l2_subdev_state *state,
-+				  struct v4l2_subdev_frame_size_enum *fse)
-+{
-+	const struct v4l2_mbus_framefmt *format;
-+
-+	format = v4l2_subdev_get_pad_format(sd, state, fse->pad);
-+
-+	if (fse->index >= 2 || fse->code != format->code)
-+		return -EINVAL;
-+
-+	fse->min_width = IMX296_PIXEL_ARRAY_WIDTH / (fse->index + 1);
-+	fse->max_width = fse->min_width;
-+	fse->min_height = IMX296_PIXEL_ARRAY_HEIGHT / (fse->index + 1);
-+	fse->max_height = fse->min_height;
-+
-+	return 0;
-+}
-+
-+static int imx296_get_format(struct v4l2_subdev *sd,
-+			     struct v4l2_subdev_state *state,
-+			     struct v4l2_subdev_format *fmt)
-+{
-+	fmt->format = *v4l2_subdev_get_pad_format(sd, state, fmt->pad);
-+
-+	return 0;
-+}
-+
-+static int imx296_set_format(struct v4l2_subdev *sd,
-+			     struct v4l2_subdev_state *state,
-+			     struct v4l2_subdev_format *fmt)
-+{
-+	struct imx296 *sensor = to_imx296(sd);
-+	struct v4l2_mbus_framefmt *format;
-+	struct v4l2_rect *crop;
-+
-+	crop = v4l2_subdev_get_pad_crop(sd, state, fmt->pad);
-+	format = v4l2_subdev_get_pad_format(sd, state, fmt->pad);
-+
-+	/*
-+	 * Binning is only allowed when cropping is disabled according to the
-+	 * documentation. This should be double-checked.
-+	 */
-+	if (crop->width == IMX296_PIXEL_ARRAY_WIDTH &&
-+	    crop->height == IMX296_PIXEL_ARRAY_HEIGHT) {
-+		unsigned int width;
-+		unsigned int height;
-+		unsigned int hratio;
-+		unsigned int vratio;
-+
-+		/* Clamp the width and height to avoid dividing by zero. */
-+		width = clamp_t(unsigned int, fmt->format.width,
-+				crop->width / 2, crop->width);
-+		height = clamp_t(unsigned int, fmt->format.height,
-+				 crop->height / 2, crop->height);
-+
-+		hratio = DIV_ROUND_CLOSEST(crop->width, width);
-+		vratio = DIV_ROUND_CLOSEST(crop->height, height);
-+
-+		format->width = crop->width / hratio;
-+		format->height = crop->height / vratio;
-+	} else {
-+		format->width = crop->width;
-+		format->height = crop->height;
-+	}
-+
-+	format->code = sensor->mono ? MEDIA_BUS_FMT_Y10_1X10
-+		     : MEDIA_BUS_FMT_SBGGR10_1X10;
-+	format->field = V4L2_FIELD_NONE;
-+	format->colorspace = V4L2_COLORSPACE_RAW;
-+	format->ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT;
-+	format->quantization = V4L2_QUANTIZATION_FULL_RANGE;
-+	format->xfer_func = V4L2_XFER_FUNC_NONE;
-+
-+	fmt->format = *format;
-+
-+	return 0;
-+}
-+
-+static int imx296_get_selection(struct v4l2_subdev *sd,
-+				struct v4l2_subdev_state *state,
-+				struct v4l2_subdev_selection *sel)
-+{
-+	switch (sel->target) {
-+	case V4L2_SEL_TGT_CROP:
-+		sel->r = *v4l2_subdev_get_pad_crop(sd, state, sel->pad);
-+		break;
-+
-+	case V4L2_SEL_TGT_CROP_DEFAULT:
-+	case V4L2_SEL_TGT_CROP_BOUNDS:
-+	case V4L2_SEL_TGT_NATIVE_SIZE:
-+		sel->r.left = 0;
-+		sel->r.top = 0;
-+		sel->r.width = IMX296_PIXEL_ARRAY_WIDTH;
-+		sel->r.height = IMX296_PIXEL_ARRAY_HEIGHT;
-+		break;
-+
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
-+
-+static int imx296_set_selection(struct v4l2_subdev *sd,
-+				struct v4l2_subdev_state *state,
-+				struct v4l2_subdev_selection *sel)
-+{
-+	struct v4l2_mbus_framefmt *format;
-+	struct v4l2_rect *crop;
-+	struct v4l2_rect rect;
-+
-+	if (sel->target != V4L2_SEL_TGT_CROP)
-+		return -EINVAL;
-+
-+	/*
-+	 * Clamp the crop rectangle boundaries and align them to a multiple of 4
-+	 * pixels to satisfy hardware requirements.
-+	 */
-+	rect.left = clamp(ALIGN(sel->r.left, 4), 0,
-+			  IMX296_PIXEL_ARRAY_WIDTH - IMX296_FID0_ROIWH1_MIN);
-+	rect.top = clamp(ALIGN(sel->r.top, 4), 0,
-+			 IMX296_PIXEL_ARRAY_HEIGHT - IMX296_FID0_ROIWV1_MIN);
-+	rect.width = clamp_t(unsigned int, ALIGN(sel->r.width, 4),
-+			     IMX296_FID0_ROIWH1_MIN, IMX296_PIXEL_ARRAY_WIDTH);
-+	rect.height = clamp_t(unsigned int, ALIGN(sel->r.height, 4),
-+			      IMX296_FID0_ROIWV1_MIN, IMX296_PIXEL_ARRAY_HEIGHT);
-+
-+	rect.width = min_t(unsigned int, rect.width,
-+			   IMX296_PIXEL_ARRAY_WIDTH - rect.left);
-+	rect.height = min_t(unsigned int, rect.height,
-+			    IMX296_PIXEL_ARRAY_HEIGHT - rect.top);
-+
-+	crop = v4l2_subdev_get_pad_crop(sd, state, sel->pad);
-+
-+	if (rect.width != crop->width || rect.height != crop->height) {
-+		/*
-+		 * Reset the output image size if the crop rectangle size has
-+		 * been modified.
-+		 */
-+		format = v4l2_subdev_get_pad_format(sd, state, sel->pad);
-+		format->width = rect.width;
-+		format->height = rect.height;
-+	}
-+
-+	*crop = rect;
-+	sel->r = rect;
-+
-+	return 0;
-+}
-+
-+static int imx296_init_cfg(struct v4l2_subdev *sd,
-+			   struct v4l2_subdev_state *state)
-+{
-+	struct v4l2_subdev_selection sel = {
-+		.target = V4L2_SEL_TGT_CROP,
-+		.r.width = IMX296_PIXEL_ARRAY_WIDTH,
-+		.r.height = IMX296_PIXEL_ARRAY_HEIGHT,
-+	};
-+	struct v4l2_subdev_format format = {
-+		.format = {
-+			.width = IMX296_PIXEL_ARRAY_WIDTH,
-+			.height = IMX296_PIXEL_ARRAY_HEIGHT,
-+		},
-+	};
-+
-+	imx296_set_selection(sd, state, &sel);
-+	imx296_set_format(sd, state, &format);
-+
-+	return 0;
-+}
-+
-+static const struct v4l2_subdev_video_ops imx296_subdev_video_ops = {
-+	.s_stream = imx296_s_stream,
-+};
-+
-+static const struct v4l2_subdev_pad_ops imx296_subdev_pad_ops = {
-+	.enum_mbus_code = imx296_enum_mbus_code,
-+	.enum_frame_size = imx296_enum_frame_size,
-+	.get_fmt = imx296_get_format,
-+	.set_fmt = imx296_set_format,
-+	.get_selection = imx296_get_selection,
-+	.set_selection = imx296_set_selection,
-+	.init_cfg = imx296_init_cfg,
-+};
-+
-+static const struct v4l2_subdev_ops imx296_subdev_ops = {
-+	.video = &imx296_subdev_video_ops,
-+	.pad = &imx296_subdev_pad_ops,
-+};
-+
-+static int imx296_subdev_init(struct imx296 *sensor)
-+{
-+	struct i2c_client *client = to_i2c_client(sensor->dev);
-+	int ret;
-+
-+	v4l2_i2c_subdev_init(&sensor->subdev, client, &imx296_subdev_ops);
-+
-+	ret = imx296_ctrls_init(sensor);
-+	if (ret < 0)
-+		return ret;
-+
-+	sensor->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
-+	sensor->pad.flags = MEDIA_PAD_FL_SOURCE;
-+	sensor->subdev.entity.function = MEDIA_ENT_F_CAM_SENSOR;
-+	ret = media_entity_pads_init(&sensor->subdev.entity, 1, &sensor->pad);
-+	if (ret < 0) {
-+		v4l2_ctrl_handler_free(&sensor->ctrls);
-+		return ret;
-+	}
-+
-+	sensor->subdev.state_lock = sensor->subdev.ctrl_handler->lock;
-+
-+	v4l2_subdev_init_finalize(&sensor->subdev);
-+
-+	return ret;
-+}
-+
-+static void imx296_subdev_cleanup(struct imx296 *sensor)
-+{
-+	media_entity_cleanup(&sensor->subdev.entity);
-+	v4l2_ctrl_handler_free(&sensor->ctrls);
-+}
-+
-+/* -----------------------------------------------------------------------------
-+ * Power management
-+ */
-+
-+static int __maybe_unused imx296_runtime_resume(struct device *dev)
-+{
-+	struct i2c_client *client = to_i2c_client(dev);
-+	struct v4l2_subdev *subdev = i2c_get_clientdata(client);
-+	struct imx296 *sensor = to_imx296(subdev);
-+
-+	return imx296_power_on(sensor);
-+}
-+
-+static int __maybe_unused imx296_runtime_suspend(struct device *dev)
-+{
-+	struct i2c_client *client = to_i2c_client(dev);
-+	struct v4l2_subdev *subdev = i2c_get_clientdata(client);
-+	struct imx296 *sensor = to_imx296(subdev);
-+
-+	imx296_power_off(sensor);
-+
-+	return 0;
-+}
-+
-+static const struct dev_pm_ops imx296_pm_ops = {
-+	SET_RUNTIME_PM_OPS(imx296_runtime_suspend, imx296_runtime_resume, NULL)
-+};
-+
-+/* -----------------------------------------------------------------------------
-+ * Probe & Remove
-+ */
-+
-+static int imx296_read_temperature(struct imx296 *sensor, int *temp)
-+{
-+	int tmdout;
-+	int ret;
-+
-+	ret = imx296_write(sensor, IMX296_TMDCTRL, IMX296_TMDCTRL_LATCH, NULL);
-+	if (ret < 0)
-+		return ret;
-+
-+	tmdout = imx296_read(sensor, IMX296_TMDOUT) & IMX296_TMDOUT_MASK;
-+	if (tmdout < 0)
-+		return tmdout;
-+
-+	/* T(°C) = 246.312 - 0.304 * TMDOUT */;
-+	*temp = 246312 - 304 * tmdout;
-+
-+	return imx296_write(sensor, IMX296_TMDCTRL, 0, NULL);
-+}
-+
-+static int imx296_identify_model(struct imx296 *sensor)
-+{
-+	unsigned int model;
-+	int temp = 0;
-+	int ret;
-+
-+	model = (uintptr_t)of_device_get_match_data(sensor->dev);
-+	if (model) {
-+		dev_dbg(sensor->dev,
-+			"sensor model auto-detection disabled, forcing 0x%04x\n",
-+			model);
-+		sensor->mono = model & IMX296_SENSOR_INFO_MONO;
-+		return 0;
-+	}
-+
-+	/*
-+	 * While most registers can be read when the sensor is in standby, this
-+	 * is not the case of the sensor info register :-(
-+	 */
-+	ret = imx296_write(sensor, IMX296_CTRL00, 0, NULL);
-+	if (ret < 0) {
-+		dev_err(sensor->dev,
-+			"failed to get sensor out of standby (%d)\n", ret);
-+		return ret;
-+	}
-+
-+	ret = imx296_read(sensor, IMX296_SENSOR_INFO);
-+	if (ret < 0) {
-+		dev_err(sensor->dev, "failed to read sensor information (%d)\n",
-+			ret);
-+		goto done;
-+	}
-+
-+	model = (ret >> 6) & 0x1ff;
-+
-+	switch (model) {
-+	case 296:
-+		sensor->mono = ret & IMX296_SENSOR_INFO_MONO;
-+		break;
-+	/*
-+	 * The IMX297 seems to share features with the IMX296, it may be
-+	 * possible to support it in the same driver.
-+	 */
-+	case 297:
-+	default:
-+		dev_err(sensor->dev, "invalid device model 0x%04x\n", ret);
-+		ret = -ENODEV;
-+		goto done;
-+	}
-+
-+	ret = imx296_read_temperature(sensor, &temp);
-+	if (ret < 0)
-+		goto done;
-+
-+	dev_info(sensor->dev, "found IMX%u%s (%u.%uC)\n", model,
-+		 sensor->mono ? "LL" : "LQ", temp / 1000, (temp / 100) % 10);
-+
-+done:
-+	imx296_write(sensor, IMX296_CTRL00, IMX296_CTRL00_STANDBY, NULL);
-+	return ret;
-+}
-+
-+static const struct regmap_config imx296_regmap_config = {
-+	.reg_bits = 16,
-+	.val_bits = 8,
-+
-+	.wr_table = &(const struct regmap_access_table) {
-+		.no_ranges = (const struct regmap_range[]) {
-+			{
-+				.range_min = IMX296_SENSOR_INFO & 0xffff,
-+				.range_max = (IMX296_SENSOR_INFO & 0xffff) + 1,
-+			},
-+		},
-+		.n_no_ranges = 1,
-+	},
-+};
-+
-+static int imx296_probe(struct i2c_client *client)
-+{
-+	struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
-+	unsigned long clk_rate;
-+	struct imx296 *sensor;
-+	unsigned int i;
-+	int ret;
-+
-+	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
-+		dev_warn(&adapter->dev,
-+			 "I2C-Adapter doesn't support I2C_FUNC_SMBUS_BYTE\n");
-+		return -EIO;
-+	}
-+
-+	sensor = devm_kzalloc(&client->dev, sizeof(*sensor), GFP_KERNEL);
-+	if (!sensor)
-+		return -ENOMEM;
-+
-+	sensor->dev = &client->dev;
-+
-+	/* Acquire resources. */
-+	for (i = 0; i < ARRAY_SIZE(sensor->supplies); ++i)
-+		sensor->supplies[i].supply = imx296_supply_names[i];
-+
-+	ret = devm_regulator_bulk_get(sensor->dev, ARRAY_SIZE(sensor->supplies),
-+				      sensor->supplies);
-+	if (ret) {
-+		dev_err_probe(sensor->dev, ret, "failed to get supplies\n");
-+		return ret;
-+	}
-+
-+	sensor->reset = devm_gpiod_get_optional(sensor->dev, "reset",
-+						GPIOD_OUT_HIGH);
-+	if (IS_ERR(sensor->reset))
-+		return dev_err_probe(sensor->dev, PTR_ERR(sensor->reset),
-+				     "failed to get reset GPIO\n");
-+
-+	sensor->clk = devm_clk_get(sensor->dev, "inck");
-+	if (IS_ERR(sensor->clk))
-+		return dev_err_probe(sensor->dev, PTR_ERR(sensor->clk),
-+				     "failed to get clock\n");
-+
-+	clk_rate = clk_get_rate(sensor->clk);
-+	for (i = 0; i < ARRAY_SIZE(imx296_clk_params); ++i) {
-+		if (clk_rate == imx296_clk_params[i].freq) {
-+			sensor->clk_params = &imx296_clk_params[i];
-+			break;
-+		}
-+	}
-+
-+	if (!sensor->clk_params) {
-+		dev_err(sensor->dev, "unsupported clock rate %lu\n", clk_rate);
-+		return -EINVAL;
-+	}
-+
-+	sensor->regmap = devm_regmap_init_i2c(client, &imx296_regmap_config);
-+	if (IS_ERR(sensor->regmap))
-+		return PTR_ERR(sensor->regmap);
-+
-+	/*
-+	 * Enable power management. The driver supports runtime PM, but needs to
-+	 * work when runtime PM is disabled in the kernel. To that end, power
-+	 * the sensor on manually here, identify it, and fully initialize it.
-+	 */
-+	ret = imx296_power_on(sensor);
-+	if (ret < 0)
-+		return ret;
-+
-+	ret = imx296_identify_model(sensor);
-+	if (ret < 0)
-+		goto err_power;
-+
-+	/* Initialize the V4L2 subdev. */
-+	ret = imx296_subdev_init(sensor);
-+	if (ret < 0)
-+		goto err_power;
-+
-+	/*
-+	 * Enable runtime PM. As the device has been powered manually, mark it
-+	 * as active, and increase the usage count without resuming the device.
-+	 */
-+	pm_runtime_set_active(sensor->dev);
-+	pm_runtime_get_noresume(sensor->dev);
-+	pm_runtime_enable(sensor->dev);
-+
-+	/* Register the V4L2 subdev. */
-+	ret = v4l2_async_register_subdev(&sensor->subdev);
-+	if (ret < 0)
-+		goto err_pm;
-+
-+	/*
-+	 * Finally, enable autosuspend and decrease the usage count. The device
-+	 * will get suspended after the autosuspend delay, turning the power
-+	 * off.
-+	 */
-+	pm_runtime_set_autosuspend_delay(sensor->dev, 1000);
-+	pm_runtime_use_autosuspend(sensor->dev);
-+	pm_runtime_put_autosuspend(sensor->dev);
-+
-+	return 0;
-+
-+err_pm:
-+	pm_runtime_disable(sensor->dev);
-+	pm_runtime_put_noidle(sensor->dev);
-+	imx296_subdev_cleanup(sensor);
-+err_power:
-+	imx296_power_off(sensor);
-+	return ret;
-+}
-+
-+static void imx296_remove(struct i2c_client *client)
-+{
-+	struct v4l2_subdev *subdev = i2c_get_clientdata(client);
-+	struct imx296 *sensor = to_imx296(subdev);
-+
-+	v4l2_async_unregister_subdev(subdev);
-+
-+	imx296_subdev_cleanup(sensor);
-+
-+	/*
-+	 * Disable runtime PM. In case runtime PM is disabled in the kernel,
-+	 * make sure to turn power off manually.
-+	 */
-+	pm_runtime_disable(sensor->dev);
-+	if (!pm_runtime_status_suspended(sensor->dev))
-+		imx296_power_off(sensor);
-+	pm_runtime_set_suspended(sensor->dev);
-+}
-+
-+static const struct of_device_id imx296_of_match[] = {
-+	{ .compatible = "sony,imx296", .data = NULL },
-+	{ .compatible = "sony,imx296ll", .data = (void *)IMX296_SENSOR_INFO_IMX296LL },
-+	{ .compatible = "sony,imx296lq", .data = (void *)IMX296_SENSOR_INFO_IMX296LQ },
-+	{ /* sentinel */ },
-+};
-+MODULE_DEVICE_TABLE(of, imx296_of_match);
-+
-+static struct i2c_driver imx296_i2c_driver = {
-+	.driver = {
-+		.of_match_table = imx296_of_match,
-+		.name = "imx296",
-+		.pm = &imx296_pm_ops
-+	},
-+	.probe_new = imx296_probe,
-+	.remove = imx296_remove,
-+};
-+
-+module_i2c_driver(imx296_i2c_driver);
-+
-+MODULE_DESCRIPTION("Sony IMX296 Camera driver");
-+MODULE_AUTHOR("Laurent Pinchart <laurent.pinchart@ideasonboard.com>");
-+MODULE_LICENSE("GPL");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0595-media-i2c-imx296-Get-sensor-crop-working.patch b/target/linux/bcm27xx/patches-6.1/950-0595-media-i2c-imx296-Get-sensor-crop-working.patch
deleted file mode 100644
index 7a7d96f398..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0595-media-i2c-imx296-Get-sensor-crop-working.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 95efa1b896a11f6392c3194a9d71960ea01c9443 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Tue, 14 Mar 2023 10:10:01 +0000
-Subject: [PATCH] media: i2c: imx296: Get sensor crop working
-
-Add a missing register write (MIPIC_AREA3W) when setting up a crop
-window in the sensor to get this functionality working.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/i2c/imx296.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/media/i2c/imx296.c
-+++ b/drivers/media/i2c/imx296.c
-@@ -171,6 +171,7 @@
- #define IMX296_CKREQSEL					IMX296_REG_8BIT(0x4101)
- #define IMX296_CKREQSEL_HS				BIT(2)
- #define IMX296_GTTABLENUM				IMX296_REG_8BIT(0x4114)
-+#define IMX296_MIPIC_AREA3W				IMX296_REG_16BIT(0x4182)
- #define IMX296_CTRL418C					IMX296_REG_8BIT(0x418c)
- 
- struct imx296_clk_params {
-@@ -526,8 +527,11 @@ static int imx296_setup(struct imx296 *s
- 		imx296_write(sensor, IMX296_FID0_ROIPV1, crop->top, &ret);
- 		imx296_write(sensor, IMX296_FID0_ROIWH1, crop->width, &ret);
- 		imx296_write(sensor, IMX296_FID0_ROIWV1, crop->height, &ret);
-+		imx296_write(sensor, IMX296_MIPIC_AREA3W, crop->height, &ret);
- 	} else {
- 		imx296_write(sensor, IMX296_FID0_ROI, 0, &ret);
-+		imx296_write(sensor, IMX296_MIPIC_AREA3W,
-+			     IMX296_PIXEL_ARRAY_HEIGHT, &ret);
- 	}
- 
- 	imx296_write(sensor, IMX296_CTRL0D,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0596-media-i2c-imx296-Disable-binning-for-colour-variant.patch b/target/linux/bcm27xx/patches-6.1/950-0596-media-i2c-imx296-Disable-binning-for-colour-variant.patch
deleted file mode 100644
index 01ab02df94..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0596-media-i2c-imx296-Disable-binning-for-colour-variant.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 6e52a6d45d5296b5396b0b8ad27bbe6dfc3db235 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Tue, 14 Mar 2023 12:55:14 +0000
-Subject: [PATCH] media: i2c: imx296: Disable binning for colour
- variant
-
-Binning is only supported on the mono variant of the IMX296 sensor.
-Disable reporting of the binning mode for the colour variant.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/i2c/imx296.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
---- a/drivers/media/i2c/imx296.c
-+++ b/drivers/media/i2c/imx296.c
-@@ -674,11 +674,14 @@ static int imx296_enum_frame_size(struct
- 				  struct v4l2_subdev_state *state,
- 				  struct v4l2_subdev_frame_size_enum *fse)
- {
-+	const struct imx296 *sensor = to_imx296(sd);
- 	const struct v4l2_mbus_framefmt *format;
-+	/* Binning only works on the mono sensor variant */
-+	unsigned int max_index = sensor->mono ? 2 : 1;
- 
- 	format = v4l2_subdev_get_pad_format(sd, state, fse->pad);
- 
--	if (fse->index >= 2 || fse->code != format->code)
-+	if (fse->index >= max_index || fse->code != format->code)
- 		return -EINVAL;
- 
- 	fse->min_width = IMX296_PIXEL_ARRAY_WIDTH / (fse->index + 1);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0597-media-i2c-imx296-Add-helper-for-hblank-control.patch b/target/linux/bcm27xx/patches-6.1/950-0597-media-i2c-imx296-Add-helper-for-hblank-control.patch
deleted file mode 100644
index 06463d82e6..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0597-media-i2c-imx296-Add-helper-for-hblank-control.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 6b0cce78e4c84189c93ad0fbad7b8d08439135d4 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Tue, 14 Mar 2023 12:56:14 +0000
-Subject: [PATCH] media: i2c: imx296: Add helper for hblank control
-
-Add a helper function to setup the horizontal blanking control. Update
-the control limits on set_format as the horizontal blanking time must
-remain constant regardless of sensor output width.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/i2c/imx296.c | 44 ++++++++++++++++++++++++++------------
- 1 file changed, 30 insertions(+), 14 deletions(-)
-
---- a/drivers/media/i2c/imx296.c
-+++ b/drivers/media/i2c/imx296.c
-@@ -384,10 +384,36 @@ static const struct v4l2_ctrl_ops imx296
- 	.s_ctrl = imx296_s_ctrl,
- };
- 
-+static void imx296_setup_hblank(struct imx296 *sensor, unsigned int width)
-+{
-+	/*
-+	 * Horizontal blanking is controlled through the HMAX register, which
-+	 * contains a line length in contains a line length in units of an
-+	 * internal 74.25 MHz clock derived from the INCLK. The HMAX value is
-+	 * currently fixed to 1100, convert it to a number of pixels based on
-+	 * the nominal pixel rate.
-+	 *
-+	 * Horizontal blanking is fixed, regardless of the crop width, so
-+	 * ensure the hblank limits are adjusted to account for this.
-+	 */
-+	unsigned int hblank = 1100 * 1188000000ULL / 10 / 74250000 - width;
-+
-+	if (!sensor->hblank) {
-+		sensor->hblank = v4l2_ctrl_new_std(&sensor->ctrls,
-+						   &imx296_ctrl_ops,
-+						   V4L2_CID_HBLANK, hblank,
-+						   hblank, 1, hblank);
-+		if (sensor->hblank)
-+			sensor->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
-+	} else {
-+		__v4l2_ctrl_modify_range(sensor->hblank, hblank, hblank, 1,
-+					 hblank);
-+	}
-+}
-+
- static int imx296_ctrls_init(struct imx296 *sensor)
- {
- 	struct v4l2_fwnode_device_properties props;
--	unsigned int hblank;
- 	int ret;
- 
- 	ret = v4l2_fwnode_device_parse(sensor->dev, &props);
-@@ -402,19 +428,7 @@ static int imx296_ctrls_init(struct imx2
- 			  V4L2_CID_ANALOGUE_GAIN, IMX296_GAIN_MIN,
- 			  IMX296_GAIN_MAX, 1, IMX296_GAIN_MIN);
- 
--	/*
--	 * Horizontal blanking is controlled through the HMAX register, which
--	 * contains a line length in INCK clock units. The INCK frequency is
--	 * fixed to 74.25 MHz. The HMAX value is currently fixed to 1100,
--	 * convert it to a number of pixels based on the nominal pixel rate.
--	 */
--	hblank = 1100 * 1188000000ULL / 10 / 74250000
--	       - IMX296_PIXEL_ARRAY_WIDTH;
--	sensor->hblank = v4l2_ctrl_new_std(&sensor->ctrls, &imx296_ctrl_ops,
--					   V4L2_CID_HBLANK, hblank, hblank, 1,
--					   hblank);
--	if (sensor->hblank)
--		sensor->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
-+	imx296_setup_hblank(sensor, IMX296_PIXEL_ARRAY_WIDTH);
- 
- 	sensor->vblank = v4l2_ctrl_new_std(&sensor->ctrls, &imx296_ctrl_ops,
- 					   V4L2_CID_VBLANK, 30,
-@@ -739,6 +753,8 @@ static int imx296_set_format(struct v4l2
- 		format->height = crop->height;
- 	}
- 
-+	imx296_setup_hblank(sensor, format->width);
-+
- 	format->code = sensor->mono ? MEDIA_BUS_FMT_Y10_1X10
- 		     : MEDIA_BUS_FMT_SBGGR10_1X10;
- 	format->field = V4L2_FIELD_NONE;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0598-media-i2c-imx296-Set-a-1-frame-gain-delay.patch b/target/linux/bcm27xx/patches-6.1/950-0598-media-i2c-imx296-Set-a-1-frame-gain-delay.patch
deleted file mode 100644
index 2537d9f774..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0598-media-i2c-imx296-Set-a-1-frame-gain-delay.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9fc440641b43e04a07d04988bba830bb57f1231c Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Tue, 14 Mar 2023 10:46:46 +0000
-Subject: [PATCH] media: i2c: imx296: Set a 1 frame gain delay
-
-Set the gain delay to 1 frame in the sensor. This avoids any race
-condition or ambiguity over when the setting is applied through
-userland.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/i2c/imx296.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/media/i2c/imx296.c
-+++ b/drivers/media/i2c/imx296.c
-@@ -584,7 +584,7 @@ static int imx296_setup(struct imx296 *s
- 	imx296_write(sensor, IMX296_CTRL418C, sensor->clk_params->ctrl418c,
- 		     &ret);
- 
--	imx296_write(sensor, IMX296_GAINDLY, IMX296_GAINDLY_NONE, &ret);
-+	imx296_write(sensor, IMX296_GAINDLY, IMX296_GAINDLY_1FRAME, &ret);
- 	imx296_write(sensor, IMX296_BLKLEVEL, 0x03c, &ret);
- 
- 	return ret;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0599-media-i2c-imx296-Add-horizontal-vertical-flip-suppor.patch b/target/linux/bcm27xx/patches-6.1/950-0599-media-i2c-imx296-Add-horizontal-vertical-flip-suppor.patch
deleted file mode 100644
index 139bc6b434..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0599-media-i2c-imx296-Add-horizontal-vertical-flip-suppor.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From 621a1194ac97d166b4bf747c5fedabdbfb01620c Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Tue, 14 Mar 2023 11:00:48 +0000
-Subject: [PATCH] media: i2c: imx296: Add horizontal/vertical flip
- support
-
-Add support for setting horizontal and/or vertial flips in the IMX296
-sensor through the V4L2_CID_HFLIP and V4L2_CID_VFLIP controls.
-
-Add a new helper function to return the media bus format code that
-depends on the sensor flips.
-
-Grab the V4L2_CID_HFLIP and V4L2_CID_VFLIP controls on stream on, and
-release on stream off to ensure flips cannot be changed while the sensor
-is streaming.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/i2c/imx296.c | 64 +++++++++++++++++++++++++++++++++++---
- 1 file changed, 59 insertions(+), 5 deletions(-)
-
---- a/drivers/media/i2c/imx296.c
-+++ b/drivers/media/i2c/imx296.c
-@@ -210,6 +210,8 @@ struct imx296 {
- 	struct v4l2_ctrl_handler ctrls;
- 	struct v4l2_ctrl *hblank;
- 	struct v4l2_ctrl *vblank;
-+	struct v4l2_ctrl *vflip;
-+	struct v4l2_ctrl *hflip;
- };
- 
- static inline struct imx296 *to_imx296(struct v4l2_subdev *sd)
-@@ -251,6 +253,36 @@ static int imx296_write(struct imx296 *s
- 	return ret;
- }
- 
-+/*
-+ * The supported formats.
-+ * This table MUST contain 4 entries per format, to cover the various flip
-+ * combinations in the order
-+ * - no flip
-+ * - h flip
-+ * - v flip
-+ * - h&v flips
-+ */
-+static const u32 mbus_codes[] = {
-+	/* 10-bit modes. */
-+	MEDIA_BUS_FMT_SRGGB10_1X10,
-+	MEDIA_BUS_FMT_SGRBG10_1X10,
-+	MEDIA_BUS_FMT_SGBRG10_1X10,
-+	MEDIA_BUS_FMT_SBGGR10_1X10,
-+};
-+
-+static u32 imx296_mbus_code(const struct imx296 *sensor)
-+{
-+	unsigned int i = 0;
-+
-+	if (sensor->mono)
-+		return MEDIA_BUS_FMT_Y10_1X10;
-+
-+	if (sensor->vflip && sensor->hflip)
-+		i = (sensor->vflip->val ? 2 : 0) | (sensor->hflip->val ? 1 : 0);
-+
-+	return mbus_codes[i];
-+}
-+
- static int imx296_power_on(struct imx296 *sensor)
- {
- 	int ret;
-@@ -345,6 +377,13 @@ static int imx296_s_ctrl(struct v4l2_ctr
- 			     &ret);
- 		break;
- 
-+	case V4L2_CID_HFLIP:
-+	case V4L2_CID_VFLIP:
-+		imx296_write(sensor, IMX296_CTRL0E,
-+			     sensor->vflip->val | (sensor->hflip->val << 1),
-+			     &ret);
-+		break;
-+
- 	case V4L2_CID_TEST_PATTERN:
- 		if (ctrl->val) {
- 			imx296_write(sensor, IMX296_PGHPOS, 8, &ret);
-@@ -428,6 +467,16 @@ static int imx296_ctrls_init(struct imx2
- 			  V4L2_CID_ANALOGUE_GAIN, IMX296_GAIN_MIN,
- 			  IMX296_GAIN_MAX, 1, IMX296_GAIN_MIN);
- 
-+	sensor->hflip = v4l2_ctrl_new_std(&sensor->ctrls, &imx296_ctrl_ops,
-+					  V4L2_CID_HFLIP, 0, 1, 1, 0);
-+	if (sensor->hflip && !sensor->mono)
-+		sensor->hflip->flags |= V4L2_CTRL_FLAG_MODIFY_LAYOUT;
-+
-+	sensor->vflip = v4l2_ctrl_new_std(&sensor->ctrls, &imx296_ctrl_ops,
-+					  V4L2_CID_VFLIP, 0, 1, 1, 0);
-+	if (sensor->vflip && !sensor->mono)
-+		sensor->vflip->flags |= V4L2_CTRL_FLAG_MODIFY_LAYOUT;
-+
- 	imx296_setup_hblank(sensor, IMX296_PIXEL_ARRAY_WIDTH);
- 
- 	sensor->vblank = v4l2_ctrl_new_std(&sensor->ctrls, &imx296_ctrl_ops,
-@@ -598,6 +647,10 @@ static int imx296_stream_on(struct imx29
- 	usleep_range(2000, 5000);
- 	imx296_write(sensor, IMX296_CTRL0A, 0, &ret);
- 
-+	/* vflip and hflip cannot change during streaming */
-+	__v4l2_ctrl_grab(sensor->vflip, 1);
-+	__v4l2_ctrl_grab(sensor->hflip, 1);
-+
- 	return ret;
- }
- 
-@@ -608,6 +661,9 @@ static int imx296_stream_off(struct imx2
- 	imx296_write(sensor, IMX296_CTRL0A, IMX296_CTRL0A_XMSTA, &ret);
- 	imx296_write(sensor, IMX296_CTRL00, IMX296_CTRL00_STANDBY, &ret);
- 
-+	__v4l2_ctrl_grab(sensor->vflip, 0);
-+	__v4l2_ctrl_grab(sensor->hflip, 0);
-+
- 	return ret;
- }
- 
-@@ -678,8 +734,7 @@ static int imx296_enum_mbus_code(struct
- 	if (code->index != 0)
- 		return -EINVAL;
- 
--	code->code = sensor->mono ? MEDIA_BUS_FMT_Y10_1X10
--		   : MEDIA_BUS_FMT_SBGGR10_1X10;
-+	code->code = imx296_mbus_code(sensor);
- 
- 	return 0;
- }
-@@ -695,7 +750,7 @@ static int imx296_enum_frame_size(struct
- 
- 	format = v4l2_subdev_get_pad_format(sd, state, fse->pad);
- 
--	if (fse->index >= max_index || fse->code != format->code)
-+	if (fse->index >= max_index || fse->code != imx296_mbus_code(sensor))
- 		return -EINVAL;
- 
- 	fse->min_width = IMX296_PIXEL_ARRAY_WIDTH / (fse->index + 1);
-@@ -755,8 +810,7 @@ static int imx296_set_format(struct v4l2
- 
- 	imx296_setup_hblank(sensor, format->width);
- 
--	format->code = sensor->mono ? MEDIA_BUS_FMT_Y10_1X10
--		     : MEDIA_BUS_FMT_SBGGR10_1X10;
-+	format->code = imx296_mbus_code(sensor);
- 	format->field = V4L2_FIELD_NONE;
- 	format->colorspace = V4L2_COLORSPACE_RAW;
- 	format->ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0600-media-i2c-imx296-Adjust-cropping-limits.patch b/target/linux/bcm27xx/patches-6.1/950-0600-media-i2c-imx296-Adjust-cropping-limits.patch
deleted file mode 100644
index 4a967c29f3..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0600-media-i2c-imx296-Adjust-cropping-limits.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b7f69e6c5afbf151131d52420da5ef9169b616d0 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Thu, 16 Mar 2023 09:29:41 +0000
-Subject: [PATCH] media: i2c: imx296: Adjust cropping limits
-
-Through emperical testing, the sensor can crop upto a 96x88 window to
-produce a valid Bayer frame. Adjust the ROIWH1_MIN ROIWV1_MIN
-appropriately for this limit.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/i2c/imx296.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/media/i2c/imx296.c
-+++ b/drivers/media/i2c/imx296.c
-@@ -150,9 +150,9 @@
- #define IMX296_FID0_ROIPH1				IMX296_REG_16BIT(0x3310)
- #define IMX296_FID0_ROIPV1				IMX296_REG_16BIT(0x3312)
- #define IMX296_FID0_ROIWH1				IMX296_REG_16BIT(0x3314)
--#define IMX296_FID0_ROIWH1_MIN				80
-+#define IMX296_FID0_ROIWH1_MIN				96
- #define IMX296_FID0_ROIWV1				IMX296_REG_16BIT(0x3316)
--#define IMX296_FID0_ROIWV1_MIN				4
-+#define IMX296_FID0_ROIWV1_MIN				88
- 
- #define IMX296_CM_HSST_STARTTMG				IMX296_REG_16BIT(0x4018)
- #define IMX296_CM_HSST_ENDTMG				IMX296_REG_16BIT(0x401a)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0601-reboot-Use-power-off-rather-than-busy-spinning-when-.patch b/target/linux/bcm27xx/patches-6.1/950-0601-reboot-Use-power-off-rather-than-busy-spinning-when-.patch
deleted file mode 100644
index ac774db5b2..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0601-reboot-Use-power-off-rather-than-busy-spinning-when-.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 55974977523c2c5089613549ea51c007d7a71b40 Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Thu, 16 Mar 2023 14:41:16 +0000
-Subject: [PATCH] reboot: Use power off rather than busy spinning when
- halt is requested
-
-Busy spinning after halt is dumb
-We've previously applied this patch to arch/arm
-but it is currenltly missing in arch/arm64
-
-Pi4 after "sudo halt" uses 520mA
-Pi4 after "sudo shutdown now" uses 310mA
-
-Make them both use the lower powered option
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- arch/arm64/kernel/process.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
---- a/arch/arm64/kernel/process.c
-+++ b/arch/arm64/kernel/process.c
-@@ -96,9 +96,7 @@ void machine_shutdown(void)
-  */
- void machine_halt(void)
- {
--	local_irq_disable();
--	smp_send_stop();
--	while (1);
-+	machine_power_off();
- }
- 
- /*
diff --git a/target/linux/bcm27xx/patches-6.1/950-0602-media-i2c-Add-PDAF-support-for-IMX519.patch b/target/linux/bcm27xx/patches-6.1/950-0602-media-i2c-Add-PDAF-support-for-IMX519.patch
deleted file mode 100644
index 974baae559..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0602-media-i2c-Add-PDAF-support-for-IMX519.patch
+++ /dev/null
@@ -1,427 +0,0 @@
-From 534b6bc119e761da1aa2b1aabcb13f3b9878e7ec Mon Sep 17 00:00:00 2001
-From: Lee Jackson <lee.jackson@arducam.com>
-Date: Wed, 22 Mar 2023 16:19:13 +0800
-Subject: [PATCH] media: i2c: Add PDAF support for IMX519
-
-Add PDAF support for IMX519, and reduce the pixel rate to 426666667,
-link freq to 408000000.
-
-Signed-off-by: Lee Jackson <lee.jackson@arducam.com>
----
- drivers/media/i2c/imx519.c | 170 +++++++++++++++++++++++--------------
- 1 file changed, 106 insertions(+), 64 deletions(-)
-
---- a/drivers/media/i2c/imx519.c
-+++ b/drivers/media/i2c/imx519.c
-@@ -36,10 +36,10 @@
- 
- #define IMX519_XCLK_FREQ		24000000
- 
--#define IMX519_DEFAULT_LINK_FREQ	493500000
-+#define IMX519_DEFAULT_LINK_FREQ	408000000
- 
--/* Pixel rate is fixed at 686MHz for all the modes */
--#define IMX519_PIXEL_RATE		686000000
-+/* Pixel rate is fixed at 426MHz for all the modes */
-+#define IMX519_PIXEL_RATE		426666667
- 
- /* V_TIMING internal */
- #define IMX519_REG_FRAME_LENGTH		0x0340
-@@ -52,7 +52,7 @@
- /* Exposure control */
- #define IMX519_REG_EXPOSURE		0x0202
- #define IMX519_EXPOSURE_OFFSET		32
--#define IMX519_EXPOSURE_MIN		1
-+#define IMX519_EXPOSURE_MIN		20
- #define IMX519_EXPOSURE_STEP		1
- #define IMX519_EXPOSURE_DEFAULT		0x3e8
- #define IMX519_EXPOSURE_MAX		(IMX519_FRAME_LENGTH_MAX - \
-@@ -94,7 +94,7 @@
- #define IMX519_TEST_PATTERN_GB_DEFAULT	0
- 
- /* Embedded metadata stream structure */
--#define IMX519_EMBEDDED_LINE_WIDTH 16384
-+#define IMX519_EMBEDDED_LINE_WIDTH (5820 * 3)
- #define IMX519_NUM_EMBEDDED_LINES 1
- 
- enum pad_types {
-@@ -146,6 +146,7 @@ struct imx519_mode {
- };
- 
- static const struct imx519_reg mode_common_regs[] = {
-+	{0x0100, 0x00},
- 	{0x0136, 0x18},
- 	{0x0137, 0x00},
- 	{0x3c7e, 0x01},
-@@ -418,6 +419,7 @@ static const struct imx519_reg mode_comm
- 	{0xae05, 0x03},
- 	{0xbc1c, 0x08},
- 	{0xbcf1, 0x02},
-+	{0x38a3, 0x00},
- };
- 
- /* 16 mpix 10fps */
-@@ -426,8 +428,8 @@ static const struct imx519_reg mode_4656
- 	{0x0112, 0x0a},
- 	{0x0113, 0x0a},
- 	{0x0114, 0x01},
--	{0x0342, 0x42},
--	{0x0343, 0x00},
-+	{0x0342, 0x31},
-+	{0x0343, 0x6a},
- 	{0x0340, 0x0d},
- 	{0x0341, 0xf4},
- 	{0x0344, 0x00},
-@@ -464,22 +466,30 @@ static const struct imx519_reg mode_4656
- 	{0x034f, 0xa8},
- 	{0x0301, 0x06},
- 	{0x0303, 0x04},
--	{0x0305, 0x04},
-+	{0x0305, 0x06},
- 	{0x0306, 0x01},
--	{0x0307, 0x57},
-+	{0x0307, 0x40},
- 	{0x0309, 0x0a},
- 	{0x030b, 0x02},
- 	{0x030d, 0x04},
- 	{0x030e, 0x01},
--	{0x030f, 0x49},
-+	{0x030f, 0x10},
- 	{0x0310, 0x01},
--	{0x0820, 0x07},
--	{0x0821, 0xb6},
-+	{0x0820, 0x0a},
-+	{0x0821, 0x20},
- 	{0x0822, 0x00},
- 	{0x0823, 0x00},
- 	{0x3e20, 0x01},
--	{0x3e37, 0x00},
-+	{0x3e37, 0x01},
- 	{0x3e3b, 0x00},
-+	{0x38a4, 0x00},
-+	{0x38a5, 0x00},
-+	{0x38a6, 0x00},
-+	{0x38a7, 0x00},
-+	{0x38a8, 0x01},
-+	{0x38a9, 0x23},
-+	{0x38aa, 0x01},
-+	{0x38ab, 0x23},
- 	{0x0106, 0x00},
- 	{0x0b00, 0x00},
- 	{0x3230, 0x00},
-@@ -503,8 +513,8 @@ static const struct imx519_reg mode_3840
- 	{0x0112, 0x0a},
- 	{0x0113, 0x0a},
- 	{0x0114, 0x01},
--	{0x0342, 0x38},
--	{0x0343, 0x70},
-+	{0x0342, 0x28},
-+	{0x0343, 0xf6},
- 	{0x0340, 0x08},
- 	{0x0341, 0xd4},
- 	{0x0344, 0x01},
-@@ -541,22 +551,30 @@ static const struct imx519_reg mode_3840
- 	{0x034f, 0x70},
- 	{0x0301, 0x06},
- 	{0x0303, 0x04},
--	{0x0305, 0x04},
-+	{0x0305, 0x06},
- 	{0x0306, 0x01},
--	{0x0307, 0x57},
-+	{0x0307, 0x40},
- 	{0x0309, 0x0a},
- 	{0x030b, 0x02},
- 	{0x030d, 0x04},
- 	{0x030e, 0x01},
--	{0x030f, 0x49},
-+	{0x030f, 0x10},
- 	{0x0310, 0x01},
--	{0x0820, 0x07},
--	{0x0821, 0xb6},
-+	{0x0820, 0x0a},
-+	{0x0821, 0x20},
- 	{0x0822, 0x00},
- 	{0x0823, 0x00},
- 	{0x3e20, 0x01},
--	{0x3e37, 0x00},
-+	{0x3e37, 0x01},
- 	{0x3e3b, 0x00},
-+	{0x38a4, 0x00},
-+	{0x38a5, 0x00},
-+	{0x38a6, 0x00},
-+	{0x38a7, 0x00},
-+	{0x38a8, 0x00},
-+	{0x38a9, 0xf0},
-+	{0x38aa, 0x00},
-+	{0x38ab, 0xb4},
- 	{0x0106, 0x00},
- 	{0x0b00, 0x00},
- 	{0x3230, 0x00},
-@@ -580,10 +598,10 @@ static const struct imx519_reg mode_2328
- 	{0x0112, 0x0a},
- 	{0x0113, 0x0a},
- 	{0x0114, 0x01},
--	{0x0342, 0x24},
--	{0x0343, 0x12},
--	{0x0340, 0x09},
--	{0x0341, 0xac},
-+	{0x0342, 0x19},
-+	{0x0343, 0x70},
-+	{0x0340, 0x08},
-+	{0x0341, 0x88},
- 	{0x0344, 0x00},
- 	{0x0345, 0x00},
- 	{0x0346, 0x00},
-@@ -598,8 +616,8 @@ static const struct imx519_reg mode_2328
- 	{0x0900, 0x01},
- 	{0x0901, 0x22},
- 	{0x0902, 0x0a},
--	{0x3f4c, 0x01},
--	{0x3f4d, 0x01},
-+	{0x3f4c, 0x05},
-+	{0x3f4d, 0x03},
- 	{0x4254, 0x7f},
- 	{0x0401, 0x00},
- 	{0x0404, 0x00},
-@@ -618,22 +636,30 @@ static const struct imx519_reg mode_2328
- 	{0x034f, 0xd4},
- 	{0x0301, 0x06},
- 	{0x0303, 0x04},
--	{0x0305, 0x04},
-+	{0x0305, 0x06},
- 	{0x0306, 0x01},
--	{0x0307, 0x57},
-+	{0x0307, 0x40},
- 	{0x0309, 0x0a},
- 	{0x030b, 0x02},
- 	{0x030d, 0x04},
- 	{0x030e, 0x01},
--	{0x030f, 0x49},
-+	{0x030f, 0x10},
- 	{0x0310, 0x01},
--	{0x0820, 0x07},
--	{0x0821, 0xb6},
-+	{0x0820, 0x0a},
-+	{0x0821, 0x20},
- 	{0x0822, 0x00},
- 	{0x0823, 0x00},
- 	{0x3e20, 0x01},
--	{0x3e37, 0x00},
-+	{0x3e37, 0x01},
- 	{0x3e3b, 0x00},
-+	{0x38a4, 0x00},
-+	{0x38a5, 0x00},
-+	{0x38a6, 0x00},
-+	{0x38a7, 0x00},
-+	{0x38a8, 0x00},
-+	{0x38a9, 0x91},
-+	{0x38aa, 0x00},
-+	{0x38ab, 0x91},
- 	{0x0106, 0x00},
- 	{0x0b00, 0x00},
- 	{0x3230, 0x00},
-@@ -657,8 +683,8 @@ static const struct imx519_reg mode_1920
- 	{0x0112, 0x0a},
- 	{0x0113, 0x0a},
- 	{0x0114, 0x01},
--	{0x0342, 0x25},
--	{0x0343, 0xd9},
-+	{0x0342, 0x17},
-+	{0x0343, 0x8b},
- 	{0x0340, 0x04},
- 	{0x0341, 0x9c},
- 	{0x0344, 0x01},
-@@ -675,8 +701,8 @@ static const struct imx519_reg mode_1920
- 	{0x0900, 0x01},
- 	{0x0901, 0x22},
- 	{0x0902, 0x0a},
--	{0x3f4c, 0x01},
--	{0x3f4d, 0x01},
-+	{0x3f4c, 0x05},
-+	{0x3f4d, 0x03},
- 	{0x4254, 0x7f},
- 	{0x0401, 0x00},
- 	{0x0404, 0x00},
-@@ -695,22 +721,30 @@ static const struct imx519_reg mode_1920
- 	{0x034f, 0x38},
- 	{0x0301, 0x06},
- 	{0x0303, 0x04},
--	{0x0305, 0x04},
-+	{0x0305, 0x06},
- 	{0x0306, 0x01},
--	{0x0307, 0x57},
-+	{0x0307, 0x40},
- 	{0x0309, 0x0a},
- 	{0x030b, 0x02},
- 	{0x030d, 0x04},
- 	{0x030e, 0x01},
--	{0x030f, 0x49},
-+	{0x030f, 0x10},
- 	{0x0310, 0x01},
--	{0x0820, 0x07},
--	{0x0821, 0xb6},
-+	{0x0820, 0x0a},
-+	{0x0821, 0x20},
- 	{0x0822, 0x00},
- 	{0x0823, 0x00},
- 	{0x3e20, 0x01},
--	{0x3e37, 0x00},
-+	{0x3e37, 0x01},
- 	{0x3e3b, 0x00},
-+	{0x38a4, 0x00},
-+	{0x38a5, 0x00},
-+	{0x38a6, 0x00},
-+	{0x38a7, 0x00},
-+	{0x38a8, 0x00},
-+	{0x38a9, 0x78},
-+	{0x38aa, 0x00},
-+	{0x38ab, 0x5a},
- 	{0x0106, 0x00},
- 	{0x0b00, 0x00},
- 	{0x3230, 0x00},
-@@ -734,8 +768,8 @@ static const struct imx519_reg mode_1280
- 	{0x0112, 0x0a},
- 	{0x0113, 0x0a},
- 	{0x0114, 0x01},
--	{0x0342, 0x1b},
--	{0x0343, 0x3b},
-+	{0x0342, 0x18},
-+	{0x0343, 0x00},
- 	{0x0340, 0x03},
- 	{0x0341, 0x34},
- 	{0x0344, 0x04},
-@@ -752,8 +786,8 @@ static const struct imx519_reg mode_1280
- 	{0x0900, 0x01},
- 	{0x0901, 0x22},
- 	{0x0902, 0x0a},
--	{0x3f4c, 0x01},
--	{0x3f4d, 0x01},
-+	{0x3f4c, 0x05},
-+	{0x3f4d, 0x03},
- 	{0x4254, 0x7f},
- 	{0x0401, 0x00},
- 	{0x0404, 0x00},
-@@ -772,22 +806,30 @@ static const struct imx519_reg mode_1280
- 	{0x034f, 0xd0},
- 	{0x0301, 0x06},
- 	{0x0303, 0x04},
--	{0x0305, 0x04},
-+	{0x0305, 0x06},
- 	{0x0306, 0x01},
--	{0x0307, 0x57},
-+	{0x0307, 0x40},
- 	{0x0309, 0x0a},
- 	{0x030b, 0x02},
- 	{0x030d, 0x04},
- 	{0x030e, 0x01},
--	{0x030f, 0x49},
-+	{0x030f, 0x10},
- 	{0x0310, 0x01},
--	{0x0820, 0x07},
--	{0x0821, 0xb6},
-+	{0x0820, 0x0a},
-+	{0x0821, 0x20},
- 	{0x0822, 0x00},
- 	{0x0823, 0x00},
- 	{0x3e20, 0x01},
--	{0x3e37, 0x00},
-+	{0x3e37, 0x01},
- 	{0x3e3b, 0x00},
-+	{0x38a4, 0x00},
-+	{0x38a5, 0x00},
-+	{0x38a6, 0x00},
-+	{0x38a7, 0x00},
-+	{0x38a8, 0x00},
-+	{0x38a9, 0x50},
-+	{0x38aa, 0x00},
-+	{0x38ab, 0x3c},
- 	{0x0106, 0x00},
- 	{0x0b00, 0x00},
- 	{0x3230, 0x00},
-@@ -810,7 +852,7 @@ static const struct imx519_mode supporte
- 	{
- 		.width = 4656,
- 		.height = 3496,
--		.line_length_pix = 0x4200,
-+		.line_length_pix = 0x316a,
- 		.crop = {
- 			.left = IMX519_PIXEL_ARRAY_LEFT,
- 			.top = IMX519_PIXEL_ARRAY_TOP,
-@@ -819,11 +861,11 @@ static const struct imx519_mode supporte
- 		},
- 		.timeperframe_min = {
- 			.numerator = 100,
--			.denominator = 1000
-+			.denominator = 900
- 		},
- 		.timeperframe_default = {
- 			.numerator = 100,
--			.denominator = 1000
-+			.denominator = 900
- 		},
- 		.reg_list = {
- 			.num_of_regs = ARRAY_SIZE(mode_4656x3496_regs),
-@@ -833,7 +875,7 @@ static const struct imx519_mode supporte
- 	{
- 		.width = 3840,
- 		.height = 2160,
--		.line_length_pix = 0x3870,
-+		.line_length_pix = 0x28f6,
- 		.crop = {
- 			.left = IMX519_PIXEL_ARRAY_LEFT + 408,
- 			.top = IMX519_PIXEL_ARRAY_TOP + 672,
-@@ -842,11 +884,11 @@ static const struct imx519_mode supporte
- 		},
- 		.timeperframe_min = {
- 			.numerator = 100,
--			.denominator = 2100
-+			.denominator = 1800
- 		},
- 		.timeperframe_default = {
- 			.numerator = 100,
--			.denominator = 2100
-+			.denominator = 1800
- 		},
- 		.reg_list = {
- 			.num_of_regs = ARRAY_SIZE(mode_3840x2160_regs),
-@@ -856,7 +898,7 @@ static const struct imx519_mode supporte
- 	{
- 		.width = 2328,
- 		.height = 1748,
--		.line_length_pix = 0x2412,
-+		.line_length_pix = 0x1970,
- 		.crop = {
- 			.left = IMX519_PIXEL_ARRAY_LEFT,
- 			.top = IMX519_PIXEL_ARRAY_TOP,
-@@ -879,7 +921,7 @@ static const struct imx519_mode supporte
- 	{
- 		.width = 1920,
- 		.height = 1080,
--		.line_length_pix = 0x25D9,
-+		.line_length_pix = 0x178b,
- 		.crop = {
- 			.left = IMX519_PIXEL_ARRAY_LEFT + 408,
- 			.top = IMX519_PIXEL_ARRAY_TOP + 674,
-@@ -902,7 +944,7 @@ static const struct imx519_mode supporte
- 	{
- 		.width = 1280,
- 		.height = 720,
--		.line_length_pix = 0x1B3B,
-+		.line_length_pix = 0x1800,
- 		.crop = {
- 			.left = IMX519_PIXEL_ARRAY_LEFT + 1048,
- 			.top = IMX519_PIXEL_ARRAY_TOP + 1042,
-@@ -911,11 +953,11 @@ static const struct imx519_mode supporte
- 		},
- 		.timeperframe_min = {
- 			.numerator = 100,
--			.denominator = 12000
-+			.denominator = 8000
- 		},
- 		.timeperframe_default = {
- 			.numerator = 100,
--			.denominator = 12000
-+			.denominator = 8000
- 		},
- 		.reg_list = {
- 			.num_of_regs = ARRAY_SIZE(mode_1280x720_regs),
diff --git a/target/linux/bcm27xx/patches-6.1/950-0603-dtoverlays-Reduce-the-link-frequencies-of-IMX519.patch b/target/linux/bcm27xx/patches-6.1/950-0603-dtoverlays-Reduce-the-link-frequencies-of-IMX519.patch
deleted file mode 100644
index 1145cca377..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0603-dtoverlays-Reduce-the-link-frequencies-of-IMX519.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 24a303eec794e5a1e8479430191237c2ebdd23d9 Mon Sep 17 00:00:00 2001
-From: Lee Jackson <lee.jackson@arducam.com>
-Date: Wed, 22 Mar 2023 16:24:19 +0800
-Subject: [PATCH] dtoverlays: Reduce the link-frequencies of IMX519
-
-Modify the link-frequencies of IMX519 to 408000000.
-
-Signed-off-by: Lee Jackson <lee.jackson@arducam.com>
----
- arch/arm/boot/dts/overlays/imx519.dtsi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/arm/boot/dts/overlays/imx519.dtsi
-+++ b/arch/arm/boot/dts/overlays/imx519.dtsi
-@@ -21,7 +21,7 @@ cam_node: imx519@1a {
- 			data-lanes = <1 2>;
- 			clock-noncontinuous;
- 			link-frequencies =
--				/bits/ 64 <493500000>;
-+				/bits/ 64 <408000000>;
- 		};
- 	};
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0604-drivers-media-i2c-imx708-Fix-WIDE_DYNAMIC_RANGE-cont.patch b/target/linux/bcm27xx/patches-6.1/950-0604-drivers-media-i2c-imx708-Fix-WIDE_DYNAMIC_RANGE-cont.patch
deleted file mode 100644
index 2d0c0e4ffe..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0604-drivers-media-i2c-imx708-Fix-WIDE_DYNAMIC_RANGE-cont.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 700a1a11144c9b18b9da3d900a1d8bfa30a195a8 Mon Sep 17 00:00:00 2001
-From: David Plowman <david.plowman@raspberrypi.com>
-Date: Wed, 22 Mar 2023 12:01:57 +0000
-Subject: [PATCH] drivers: media: i2c: imx708: Fix WIDE_DYNAMIC_RANGE
- control with long exposure
-
-Setting V4L2_CID_WIDE_DYNAMIC_RANGE was causing the long exposure
-shift count to be reset, which is incorrect if the user has already
-changed the frame length to cause it to have a non-zero value.
-
-Because it only updates control ranges and doesn't set any registers,
-the control can also be applied when the sensor is not powered on.
-
-Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
----
- drivers/media/i2c/imx708.c | 45 ++++++++++++++++++++++++--------------
- 1 file changed, 28 insertions(+), 17 deletions(-)
-
---- a/drivers/media/i2c/imx708.c
-+++ b/drivers/media/i2c/imx708.c
-@@ -171,7 +171,7 @@ struct imx708_mode {
- 	/* Not all modes have the same exposure lines step. */
- 	u32 exposure_lines_step;
- 
--	/* HDR flag, currently not used at runtime */
-+	/* HDR flag, used for checking if the current mode is HDR */
- 	bool hdr;
- };
- 
-@@ -1060,9 +1060,6 @@ static void imx708_set_framing_limits(st
- 	unsigned int hblank;
- 	const struct imx708_mode *mode = imx708->mode;
- 
--	/* Default to no long exposure multiplier */
--	imx708->long_exp_shift = 0;
--
- 	__v4l2_ctrl_modify_range(imx708->pixel_rate,
- 				 mode->pixel_rate, mode->pixel_rate,
- 				 1, mode->pixel_rate);
-@@ -1091,12 +1088,33 @@ static int imx708_set_ctrl(struct v4l2_c
- 	unsigned int code, num_modes;
- 	int ret = 0;
- 
--	/*
--	 * The VBLANK control may change the limits of usable exposure, so check
--	 * and adjust if necessary.
--	 */
--	if (ctrl->id == V4L2_CID_VBLANK)
-+	switch (ctrl->id) {
-+	case V4L2_CID_VBLANK:
-+		/*
-+		 * The VBLANK control may change the limits of usable exposure,
-+		 * so check and adjust if necessary.
-+		 */
- 		imx708_adjust_exposure_range(imx708, ctrl);
-+		break;
-+
-+	case V4L2_CID_WIDE_DYNAMIC_RANGE:
-+		/*
-+		 * The WIDE_DYNAMIC_RANGE control can also be applied immediately
-+		 * as it doesn't set any registers. Don't do anything if the mode
-+		 * already matches.
-+		 */
-+		if (imx708->mode && imx708->mode->hdr != ctrl->val) {
-+			code = imx708_get_format_code(imx708);
-+			get_mode_table(code, &mode_list, &num_modes, ctrl->val);
-+			imx708->mode = v4l2_find_nearest_size(mode_list,
-+							      num_modes,
-+							      width, height,
-+							      imx708->mode->width,
-+							      imx708->mode->height);
-+			imx708_set_framing_limits(imx708);
-+		}
-+		break;
-+	}
- 
- 	/*
- 	 * Applying V4L2 control value only happens
-@@ -1158,14 +1176,7 @@ static int imx708_set_ctrl(struct v4l2_c
- 				       imx708->notify_gains->p_new.p_u32[3]);
- 		break;
- 	case V4L2_CID_WIDE_DYNAMIC_RANGE:
--		code = imx708_get_format_code(imx708);
--		get_mode_table(code, &mode_list, &num_modes, ctrl->val);
--		imx708->mode = v4l2_find_nearest_size(mode_list,
--						      num_modes,
--						      width, height,
--						      imx708->mode->width,
--						      imx708->mode->height);
--		imx708_set_framing_limits(imx708);
-+		/* Already handled above. */
- 		break;
- 	default:
- 		dev_info(&client->dev,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0605-rpisense-fb-Add-explicit-fb_deferred_io_mmap-hook.patch b/target/linux/bcm27xx/patches-6.1/950-0605-rpisense-fb-Add-explicit-fb_deferred_io_mmap-hook.patch
deleted file mode 100644
index e5abb783e2..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0605-rpisense-fb-Add-explicit-fb_deferred_io_mmap-hook.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4b9950c6574aa5c9302b3b8bbf44fd31ee1cad7a Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 27 Mar 2023 10:25:25 +0100
-Subject: [PATCH] rpisense-fb: Add explicit fb_deferred_io_mmap hook
-
-As of commit [1], introduced in 5.18, fbdev drivers that use
-deferred IO and need mmap support must include an explicit fb_mmap
-pointer to the fb_deferred_io_mmap.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-[1] 590558510327 ("fbdev: Put mmap for deferred I/O into drivers")
----
- drivers/video/fbdev/rpisense-fb.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/video/fbdev/rpisense-fb.c
-+++ b/drivers/video/fbdev/rpisense-fb.c
-@@ -191,6 +191,7 @@ static struct fb_ops rpisense_fb_ops = {
- 	.fb_copyarea	= rpisense_fb_copyarea,
- 	.fb_imageblit	= rpisense_fb_imageblit,
- 	.fb_ioctl	= rpisense_fb_ioctl,
-+	.fb_mmap	= fb_deferred_io_mmap,
- };
- 
- static int rpisense_fb_probe(struct platform_device *pdev)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0606-hwrng-bcm2835-sleep-more-intelligently.patch b/target/linux/bcm27xx/patches-6.1/950-0606-hwrng-bcm2835-sleep-more-intelligently.patch
deleted file mode 100644
index db806313cc..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0606-hwrng-bcm2835-sleep-more-intelligently.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 3537a855e3858b1f8b6cee545a22b8b67037235c Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 22 Mar 2023 15:30:38 +0000
-Subject: [PATCH] hwrng: bcm2835 - sleep more intelligently
-
-While waiting for random data, use sleeps that are proportional
-to the amount of data expected. Prevent indefinite waits by
-giving up if nothing is received for a second.
-
-See: https://github.com/raspberrypi/linux/issues/5390
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/char/hw_random/bcm2835-rng.c | 20 ++++++++++++++------
- 1 file changed, 14 insertions(+), 6 deletions(-)
-
---- a/drivers/char/hw_random/bcm2835-rng.c
-+++ b/drivers/char/hw_random/bcm2835-rng.c
-@@ -14,6 +14,7 @@
- #include <linux/printk.h>
- #include <linux/clk.h>
- #include <linux/reset.h>
-+#include <linux/delay.h>
- 
- #define RNG_CTRL	0x0
- #define RNG_STATUS	0x4
-@@ -28,6 +29,9 @@
- 
- #define RNG_INT_OFF	0x1
- 
-+#define RNG_FIFO_WORDS	4
-+#define RNG_US_PER_WORD	34 /* Tuned for throughput */
-+
- struct bcm2835_rng_priv {
- 	struct hwrng rng;
- 	void __iomem *base;
-@@ -64,19 +68,23 @@ static inline void rng_writel(struct bcm
- static int bcm2835_rng_read(struct hwrng *rng, void *buf, size_t max,
- 			       bool wait)
- {
-+	u32 retries = 1000000/(RNG_FIFO_WORDS * RNG_US_PER_WORD);
- 	struct bcm2835_rng_priv *priv = to_rng_priv(rng);
- 	u32 max_words = max / sizeof(u32);
- 	u32 num_words, count;
- 
--	while ((rng_readl(priv, RNG_STATUS) >> 24) == 0) {
--		if (!wait)
-+	num_words = rng_readl(priv, RNG_STATUS) >> 24;
-+
-+	while (!num_words) {
-+		if (!wait || !retries)
- 			return 0;
--		hwrng_yield(rng);
-+		retries--;
-+		usleep_range((u32)RNG_US_PER_WORD,
-+				(u32)RNG_US_PER_WORD * RNG_FIFO_WORDS);
-+		num_words = rng_readl(priv, RNG_STATUS) >> 24;
- 	}
- 
--	num_words = rng_readl(priv, RNG_STATUS) >> 24;
--	if (num_words > max_words)
--		num_words = max_words;
-+	num_words = min(num_words, max_words);
- 
- 	for (count = 0; count < num_words; count++)
- 		((u32 *)buf)[count] = rng_readl(priv, RNG_DATA);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0607-vc04_services-bcm2835_codec-Set-MPEG2_LEVEL-control-.patch b/target/linux/bcm27xx/patches-6.1/950-0607-vc04_services-bcm2835_codec-Set-MPEG2_LEVEL-control-.patch
deleted file mode 100644
index 8392f17b4c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0607-vc04_services-bcm2835_codec-Set-MPEG2_LEVEL-control-.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e718fc8f42a900b7b07b806ddfdb8c2b7a1aa3b1 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 10 Mar 2023 16:57:29 +0000
-Subject: [PATCH] vc04_services: bcm2835_codec: Set MPEG2_LEVEL control
- to READ_ONLY
-
-V4L2_CID_MPEG_VIDEO_MPEG2_LEVEL  was missed from
-"vc04_services: bcm2835_codec: Ignore READ_ONLY ctrls in s_ctrl"
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-+++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -3246,6 +3246,7 @@ static void dec_add_profile_ctrls(struct
- 							BIT(V4L2_MPEG_VIDEO_MPEG2_LEVEL_HIGH_1440) |
- 							BIT(V4L2_MPEG_VIDEO_MPEG2_LEVEL_HIGH)),
- 						      V4L2_MPEG_VIDEO_MPEG2_LEVEL_MAIN);
-+			ctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY;
- 			ctrl = v4l2_ctrl_new_std_menu(hdl, &bcm2835_codec_ctrl_ops,
- 						      V4L2_CID_MPEG_VIDEO_MPEG2_PROFILE,
- 						      V4L2_MPEG_VIDEO_MPEG2_PROFILE_MAIN,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0608-staging-bcm2835-codec-Add-V4L2_CID_MPEG_VIDEO_B_FRAM.patch b/target/linux/bcm27xx/patches-6.1/950-0608-staging-bcm2835-codec-Add-V4L2_CID_MPEG_VIDEO_B_FRAM.patch
deleted file mode 100644
index 168b2d8c9d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0608-staging-bcm2835-codec-Add-V4L2_CID_MPEG_VIDEO_B_FRAM.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From bf9263611ac50bbe7b0113782468f653a28d2e52 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 14 Mar 2023 14:29:52 +0000
-Subject: [PATCH] staging: bcm2835-codec: Add
- V4L2_CID_MPEG_VIDEO_B_FRAMES control
-
-FFmpeg insists on trying to set V4L2_CID_MPEG_VIDEO_B_FRAMES to
-0, and generates an error should it fail.
-As our encoder doesn't support B frames, add a stub handler for
-it to silence FFmpeg.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c   | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
---- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-+++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -2367,6 +2367,10 @@ static int bcm2835_codec_s_ctrl(struct v
- 						    sizeof(u32_value));
- 		break;
- 	}
-+	case V4L2_CID_MPEG_VIDEO_B_FRAMES:
-+		ret = 0;
-+		break;
-+
- 	case V4L2_CID_JPEG_COMPRESSION_QUALITY:
- 		if (!ctx->component)
- 			break;
-@@ -3356,7 +3360,7 @@ static int bcm2835_codec_open(struct fil
- 	case ENCODE:
- 	{
- 		/* Encode controls */
--		v4l2_ctrl_handler_init(hdl, 11);
-+		v4l2_ctrl_handler_init(hdl, 12);
- 
- 		v4l2_ctrl_new_std_menu(hdl, &bcm2835_codec_ctrl_ops,
- 				       V4L2_CID_MPEG_VIDEO_BITRATE_MODE,
-@@ -3417,6 +3421,10 @@ static int bcm2835_codec_open(struct fil
- 		v4l2_ctrl_new_std(hdl, &bcm2835_codec_ctrl_ops,
- 				  V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME,
- 				  0, 0, 0, 0);
-+		v4l2_ctrl_new_std(hdl, &bcm2835_codec_ctrl_ops,
-+				  V4L2_CID_MPEG_VIDEO_B_FRAMES,
-+				  0, 0,
-+				  1, 0);
- 		if (hdl->error) {
- 			rc = hdl->error;
- 			goto free_ctrl_handler;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0609-staging-bcm2835-codec-Add-support-for-V4L2_CID_MPEG_.patch b/target/linux/bcm27xx/patches-6.1/950-0609-staging-bcm2835-codec-Add-support-for-V4L2_CID_MPEG_.patch
deleted file mode 100644
index a8cb19652c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0609-staging-bcm2835-codec-Add-support-for-V4L2_CID_MPEG_.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From f096c11828df983c5581bb96e8b238543652c008 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 14 Mar 2023 16:49:46 +0000
-Subject: [PATCH] staging: bcm2835-codec: Add support for
- V4L2_CID_MPEG_VIDEO_GOP_SIZE
-
-For H264, V4L2_CID_MPEG_VIDEO_H264_I_PERIOD is meant to be the intra
-I-frame period, whilst V4L2_CID_MPEG_VIDEO_GOP_SIZE is the intra IDR
-frame period.
-The firmware encoder doesn't produce I-frames that aren't IDR as well,
-therefore V4L2_CID_MPEG_VIDEO_GOP_SIZE is technically the correct
-control, however users may have adopted V4L2_CID_MPEG_VIDEO_H264_I_PERIOD.
-
-Add support for V4L2_CID_MPEG_VIDEO_GOP_SIZE controlling the encoder,
-and have VIDIOC_S_CTRL for V4L2_CID_MPEG_VIDEO_H264_I_PERIOD update
-the value for V4L2_CID_MPEG_VIDEO_GOP_SIZE (the reverse is not
-implemented).
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../bcm2835-codec/bcm2835-v4l2-codec.c          | 17 ++++++++++++++++-
- 1 file changed, 16 insertions(+), 1 deletion(-)
-
---- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-+++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -705,6 +705,7 @@ struct bcm2835_codec_ctx {
- 	struct bcm2835_codec_dev	*dev;
- 
- 	struct v4l2_ctrl_handler hdl;
-+	struct v4l2_ctrl *gop_size;
- 
- 	struct vchiq_mmal_component  *component;
- 	bool component_enabled;
-@@ -2286,6 +2287,17 @@ static int bcm2835_codec_s_ctrl(struct v
- 		break;
- 
- 	case V4L2_CID_MPEG_VIDEO_H264_I_PERIOD:
-+		/*
-+		 * Incorrect initial implementation meant that H264_I_PERIOD
-+		 * was implemented to control intra-I period. As the MMAL
-+		 * encoder never produces I-frames that aren't IDR frames, it
-+		 * should actually have been GOP_SIZE.
-+		 * Support both controls, but writing to H264_I_PERIOD will
-+		 * update GOP_SIZE.
-+		 */
-+		__v4l2_ctrl_s_ctrl(ctx->gop_size, ctrl->val);
-+	fallthrough;
-+	case V4L2_CID_MPEG_VIDEO_GOP_SIZE:
- 		if (!ctx->component)
- 			break;
- 
-@@ -3360,7 +3372,7 @@ static int bcm2835_codec_open(struct fil
- 	case ENCODE:
- 	{
- 		/* Encode controls */
--		v4l2_ctrl_handler_init(hdl, 12);
-+		v4l2_ctrl_handler_init(hdl, 13);
- 
- 		v4l2_ctrl_new_std_menu(hdl, &bcm2835_codec_ctrl_ops,
- 				       V4L2_CID_MPEG_VIDEO_BITRATE_MODE,
-@@ -3425,6 +3437,9 @@ static int bcm2835_codec_open(struct fil
- 				  V4L2_CID_MPEG_VIDEO_B_FRAMES,
- 				  0, 0,
- 				  1, 0);
-+		ctx->gop_size = v4l2_ctrl_new_std(hdl, &bcm2835_codec_ctrl_ops,
-+						  V4L2_CID_MPEG_VIDEO_GOP_SIZE,
-+						  0, 0x7FFFFFFF, 1, 60);
- 		if (hdl->error) {
- 			rc = hdl->error;
- 			goto free_ctrl_handler;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0610-dtoverlays-Add-inverted-override-property-to-ssd1306.patch b/target/linux/bcm27xx/patches-6.1/950-0610-dtoverlays-Add-inverted-override-property-to-ssd1306.patch
deleted file mode 100644
index 535c751da6..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0610-dtoverlays-Add-inverted-override-property-to-ssd1306.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From d2db7798740061f6d54487ecaa9da15bc89cdc3c Mon Sep 17 00:00:00 2001
-From: Javier Martinez Canillas <javierm@redhat.com>
-Date: Tue, 28 Mar 2023 05:11:58 +0200
-Subject: [PATCH] dtoverlays: Add inverted override property to
- ssd1306-spi
-
-The new ssd130x DRM driver supports both SSD1306 I2C and SPI panels and is
-compatible with the ssd1307fb driver bindings. So the "solomon,com-invdir"
-DT property (to invert the COM pin scan dir) can also be used for SPI now.
-
-This allows to configure panels whose scan direction needs to be inverted.
-
-Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
----
- arch/arm/boot/dts/overlays/README                  | 2 ++
- arch/arm/boot/dts/overlays/ssd1306-spi-overlay.dts | 1 +
- 2 files changed, 3 insertions(+)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -4074,6 +4074,8 @@ Params: speed                   SPI bus
-         dc_pin                  GPIO pin for D/C (default 24)
-         reset_pin               GPIO pin for RESET (default 25)
-         height                  Display height (32 or 64; default 64)
-+        inverted                Set this if display is inverted and mirrored.
-+                                (default=not set)
- 
- 
- Name:   ssd1331-spi
---- a/arch/arm/boot/dts/overlays/ssd1306-spi-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/ssd1306-spi-overlay.dts
-@@ -80,5 +80,6 @@
- 		reset_pin = <&ssd1306>,"reset-gpios:4",
- 		            <&ssd1306_pins>,"brcm,pins:0";
- 		height    = <&ssd1306>,"solomon,height:0";
-+		inverted = <&ssd1306>,"solomon,com-invdir?";
- 	};
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0611-media-i2c-imx290-Reset-to-upstream.patch b/target/linux/bcm27xx/patches-6.1/950-0611-media-i2c-imx290-Reset-to-upstream.patch
deleted file mode 100644
index 338329f22f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0611-media-i2c-imx290-Reset-to-upstream.patch
+++ /dev/null
@@ -1,1002 +0,0 @@
-From da0ac2bb7f9ce7ab8657ccd20d704a16a9cc61c0 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 24 Nov 2022 18:09:07 +0000
-Subject: [PATCH] media: i2c: imx290: Reset to upstream.
-
-For backporting a load of upstream commits, reset to upstream first.
-Downstream patches then need to be regenerated and applied.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/i2c/imx290.c | 621 ++++++++-----------------------------
- 1 file changed, 133 insertions(+), 488 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -1,16 +1,6 @@
- // SPDX-License-Identifier: GPL-2.0
- /*
-- * Sony IMX462 / IMX290 / IMX327 CMOS Image Sensor Driver
-- *
-- * The IMX462, IMX290,and IMX327 are very similar 1920x1080 1/2.8 CMOS image
-- * sensors.
-- * IMX327 can support up to 60fps with 10 or 12bit readout.
-- * IMX290 adds support for 120fps, but only 10bit and when connected over 4
-- * CSI-2 lanes.
-- * IMX462 adds support for 120fps in both 10 and 12bit readout modes.
-- *
-- * The modules don't appear to have a mechanism to identify whether the mono or
-- * colour variant is connected, therefore it is done via compatible string.
-+ * Sony IMX290 CMOS Image Sensor Driver
-  *
-  * Copyright (C) 2019 FRAMOS GmbH.
-  *
-@@ -23,7 +13,6 @@
- #include <linux/gpio/consumer.h>
- #include <linux/i2c.h>
- #include <linux/module.h>
--#include <linux/of_device.h>
- #include <linux/pm_runtime.h>
- #include <linux/regmap.h>
- #include <linux/regulator/consumer.h>
-@@ -33,28 +22,15 @@
- #include <media/v4l2-fwnode.h>
- #include <media/v4l2-subdev.h>
- 
--enum imx290_clk_index {
--	CLK_37_125,
--	CLK_74_25,
--};
--
- #define IMX290_STANDBY 0x3000
- #define IMX290_REGHOLD 0x3001
- #define IMX290_XMSTA 0x3002
--#define IMX290_FLIP_WINMODE 0x3007
- #define IMX290_FR_FDG_SEL 0x3009
- #define IMX290_BLKLEVEL_LOW 0x300a
- #define IMX290_BLKLEVEL_HIGH 0x300b
- #define IMX290_GAIN 0x3014
--#define IMX290_VMAX_LOW 0x3018
--#define IMX290_VMAX_MAX 0x3fff
- #define IMX290_HMAX_LOW 0x301c
- #define IMX290_HMAX_HIGH 0x301d
--#define IMX290_HMAX_MAX 0xffff
--
--#define IMX290_EXPOSURE_MIN 1
--#define IMX290_EXPOSURE_STEP 1
--#define IMX290_EXPOSURE_LOW 0x3020
- #define IMX290_PGCTRL 0x308c
- #define IMX290_PHY_LANE_NUM 0x3407
- #define IMX290_CSI_LANE_MODE 0x3443
-@@ -63,13 +39,6 @@ enum imx290_clk_index {
- #define IMX290_PGCTRL_THRU BIT(1)
- #define IMX290_PGCTRL_MODE(n) ((n) << 4)
- 
--#define IMX290_NATIVE_WIDTH		1945U
--#define IMX290_NATIVE_HEIGHT		1109U
--#define IMX290_PIXEL_ARRAY_LEFT		4U
--#define IMX290_PIXEL_ARRAY_TOP		12U
--#define IMX290_PIXEL_ARRAY_WIDTH	1937U
--#define IMX290_PIXEL_ARRAY_HEIGHT	1097U
--
- static const char * const imx290_supply_name[] = {
- 	"vdda",
- 	"vddd",
-@@ -87,31 +56,19 @@ struct imx290_mode {
- 	u32 width;
- 	u32 height;
- 	u32 hmax;
--	u32 vmax;
- 	u8 link_freq_index;
--	struct v4l2_rect crop;
--
--	const struct imx290_regval *mode_data;
--	u32 mode_data_size;
--	const struct imx290_regval *lane_data;
--	u32 lane_data_size;
- 
--
--	/* Clock setup can vary. Index as enum imx290_clk_index */
--	const struct imx290_regval *clk_data[2];
--	u32 clk_size;
-+	const struct imx290_regval *data;
-+	u32 data_size;
- };
- 
- struct imx290 {
- 	struct device *dev;
- 	struct clk *xclk;
--	u32 xclk_freq;
- 	struct regmap *regmap;
- 	u8 nlanes;
- 	u8 bpp;
- 
--	const struct imx290_pixfmt *formats;
--
- 	struct v4l2_subdev sd;
- 	struct media_pad pad;
- 	struct v4l2_mbus_framefmt current_format;
-@@ -123,11 +80,6 @@ struct imx290 {
- 	struct v4l2_ctrl_handler ctrls;
- 	struct v4l2_ctrl *link_freq;
- 	struct v4l2_ctrl *pixel_rate;
--	struct v4l2_ctrl *hblank;
--	struct v4l2_ctrl *vblank;
--	struct v4l2_ctrl *hflip;
--	struct v4l2_ctrl *vflip;
--	struct v4l2_ctrl *exposure;
- 
- 	struct mutex lock;
- };
-@@ -137,18 +89,11 @@ struct imx290_pixfmt {
- 	u8 bpp;
- };
- 
--#define IMX290_NUM_FORMATS 2
--
--static const struct imx290_pixfmt imx290_colour_formats[IMX290_NUM_FORMATS] = {
-+static const struct imx290_pixfmt imx290_formats[] = {
- 	{ MEDIA_BUS_FMT_SRGGB10_1X10, 10 },
- 	{ MEDIA_BUS_FMT_SRGGB12_1X12, 12 },
- };
- 
--static const struct imx290_pixfmt imx290_mono_formats[IMX290_NUM_FORMATS] = {
--	{ MEDIA_BUS_FMT_Y10_1X10, 10 },
--	{ MEDIA_BUS_FMT_Y12_1X12, 12 },
--};
--
- static const struct regmap_config imx290_regmap_config = {
- 	.reg_bits = 16,
- 	.val_bits = 8,
-@@ -168,7 +113,11 @@ static const char * const imx290_test_pa
- 
- static const struct imx290_regval imx290_global_init_settings[] = {
- 	{ 0x3007, 0x00 },
-+	{ 0x3018, 0x65 },
-+	{ 0x3019, 0x04 },
- 	{ 0x301a, 0x00 },
-+	{ 0x3444, 0x20 },
-+	{ 0x3445, 0x25 },
- 	{ 0x303a, 0x0c },
- 	{ 0x3040, 0x00 },
- 	{ 0x3041, 0x00 },
-@@ -222,33 +171,8 @@ static const struct imx290_regval imx290
- 	{ 0x33b3, 0x04 },
- };
- 
--static const struct imx290_regval imx290_37_125mhz_clock_1080p[] = {
--	{ 0x305c, 0x18 },
--	{ 0x305d, 0x03 },
--	{ 0x305e, 0x20 },
--	{ 0x305f, 0x01 },
--	{ 0x315e, 0x1a },
--	{ 0x3164, 0x1a },
--	{ 0x3444, 0x20 },
--	{ 0x3445, 0x25 },
--	{ 0x3480, 0x49 },
--};
--
--static const struct imx290_regval imx290_74_250mhz_clock_1080p[] = {
--	{ 0x305c, 0x0c },
--	{ 0x305d, 0x03 },
--	{ 0x305e, 0x10 },
--	{ 0x305f, 0x01 },
--	{ 0x315e, 0x1b },
--	{ 0x3164, 0x1b },
--	{ 0x3444, 0x40 },
--	{ 0x3445, 0x4a },
--	{ 0x3480, 0x92 },
--};
--
--static const struct imx290_regval imx290_1080p_common_settings[] = {
-+static const struct imx290_regval imx290_1080p_settings[] = {
- 	/* mode settings */
--	{ IMX290_FR_FDG_SEL, 0x01 },
- 	{ 0x3007, 0x00 },
- 	{ 0x303a, 0x0c },
- 	{ 0x3414, 0x0a },
-@@ -258,36 +182,15 @@ static const struct imx290_regval imx290
- 	{ 0x3419, 0x04 },
- 	{ 0x3012, 0x64 },
- 	{ 0x3013, 0x00 },
--};
--
--static const struct imx290_regval imx290_1080p_2lane_settings[] = {
--	{ 0x3405, 0x00 },
-+	{ 0x305c, 0x18 },
-+	{ 0x305d, 0x03 },
-+	{ 0x305e, 0x20 },
-+	{ 0x305f, 0x01 },
-+	{ 0x315e, 0x1a },
-+	{ 0x3164, 0x1a },
-+	{ 0x3480, 0x49 },
- 	/* data rate settings */
--	{ IMX290_PHY_LANE_NUM, 0x01 },
--	{ IMX290_CSI_LANE_MODE, 0x01 },
--	{ 0x3446, 0x77 },
--	{ 0x3447, 0x00 },
--	{ 0x3448, 0x67 },
--	{ 0x3449, 0x00 },
--	{ 0x344a, 0x47 },
--	{ 0x344b, 0x00 },
--	{ 0x344c, 0x37 },
--	{ 0x344d, 0x00 },
--	{ 0x344e, 0x3f },
--	{ 0x344f, 0x00 },
--	{ 0x3450, 0xff },
--	{ 0x3451, 0x00 },
--	{ 0x3452, 0x3f },
--	{ 0x3453, 0x00 },
--	{ 0x3454, 0x37 },
--	{ 0x3455, 0x00 },
--};
--
--static const struct imx290_regval imx290_1080p_4lane_settings[] = {
- 	{ 0x3405, 0x10 },
--	/* data rate settings */
--	{ IMX290_PHY_LANE_NUM, 0x03 },
--	{ IMX290_CSI_LANE_MODE, 0x03 },
- 	{ 0x3446, 0x57 },
- 	{ 0x3447, 0x00 },
- 	{ 0x3448, 0x37 },
-@@ -306,33 +209,8 @@ static const struct imx290_regval imx290
- 	{ 0x3455, 0x00 },
- };
- 
--static const struct imx290_regval imx290_37_125mhz_clock_720p[] = {
--	{ 0x305c, 0x20 },
--	{ 0x305d, 0x00 },
--	{ 0x305e, 0x20 },
--	{ 0x305f, 0x01 },
--	{ 0x315e, 0x1a },
--	{ 0x3164, 0x1a },
--	{ 0x3444, 0x20 },
--	{ 0x3445, 0x25 },
--	{ 0x3480, 0x49 },
--};
--
--static const struct imx290_regval imx290_74_250mhz_clock_720p[] = {
--	{ 0x305c, 0x10 },
--	{ 0x305d, 0x00 },
--	{ 0x305e, 0x10 },
--	{ 0x305f, 0x01 },
--	{ 0x315e, 0x1b },
--	{ 0x3164, 0x1b },
--	{ 0x3444, 0x40 },
--	{ 0x3445, 0x4a },
--	{ 0x3480, 0x92 },
--};
--
--static const struct imx290_regval imx290_720p_common_settings[] = {
-+static const struct imx290_regval imx290_720p_settings[] = {
- 	/* mode settings */
--	{ IMX290_FR_FDG_SEL, 0x01 },
- 	{ 0x3007, 0x10 },
- 	{ 0x303a, 0x06 },
- 	{ 0x3414, 0x04 },
-@@ -342,36 +220,15 @@ static const struct imx290_regval imx290
- 	{ 0x3419, 0x02 },
- 	{ 0x3012, 0x64 },
- 	{ 0x3013, 0x00 },
--};
--
--static const struct imx290_regval imx290_720p_2lane_settings[] = {
--	{ 0x3405, 0x00 },
--	{ IMX290_PHY_LANE_NUM, 0x01 },
--	{ IMX290_CSI_LANE_MODE, 0x01 },
-+	{ 0x305c, 0x20 },
-+	{ 0x305d, 0x00 },
-+	{ 0x305e, 0x20 },
-+	{ 0x305f, 0x01 },
-+	{ 0x315e, 0x1a },
-+	{ 0x3164, 0x1a },
-+	{ 0x3480, 0x49 },
- 	/* data rate settings */
--	{ 0x3446, 0x67 },
--	{ 0x3447, 0x00 },
--	{ 0x3448, 0x57 },
--	{ 0x3449, 0x00 },
--	{ 0x344a, 0x2f },
--	{ 0x344b, 0x00 },
--	{ 0x344c, 0x27 },
--	{ 0x344d, 0x00 },
--	{ 0x344e, 0x2f },
--	{ 0x344f, 0x00 },
--	{ 0x3450, 0xbf },
--	{ 0x3451, 0x00 },
--	{ 0x3452, 0x2f },
--	{ 0x3453, 0x00 },
--	{ 0x3454, 0x27 },
--	{ 0x3455, 0x00 },
--};
--
--static const struct imx290_regval imx290_720p_4lane_settings[] = {
- 	{ 0x3405, 0x10 },
--	{ IMX290_PHY_LANE_NUM, 0x03 },
--	{ IMX290_CSI_LANE_MODE, 0x03 },
--	/* data rate settings */
- 	{ 0x3446, 0x4f },
- 	{ 0x3447, 0x00 },
- 	{ 0x3448, 0x2f },
-@@ -451,46 +308,18 @@ static const struct imx290_mode imx290_m
- 	{
- 		.width = 1920,
- 		.height = 1080,
--		.hmax = 0x0898,
--		.vmax = 0x0465,
-+		.hmax = 0x1130,
- 		.link_freq_index = FREQ_INDEX_1080P,
--		.crop = {
--			.left = 4 + 8,
--			.top = 12 + 8,
--			.width = 1920,
--			.height = 1080,
--		},
--		.mode_data = imx290_1080p_common_settings,
--		.mode_data_size = ARRAY_SIZE(imx290_1080p_common_settings),
--		.lane_data = imx290_1080p_2lane_settings,
--		.lane_data_size = ARRAY_SIZE(imx290_1080p_2lane_settings),
--		.clk_data = {
--			[CLK_37_125] = imx290_37_125mhz_clock_1080p,
--			[CLK_74_25] = imx290_74_250mhz_clock_1080p,
--		},
--		.clk_size = ARRAY_SIZE(imx290_37_125mhz_clock_1080p),
-+		.data = imx290_1080p_settings,
-+		.data_size = ARRAY_SIZE(imx290_1080p_settings),
- 	},
- 	{
- 		.width = 1280,
- 		.height = 720,
--		.hmax = 0x0ce4,
--		.vmax = 0x02ee,
-+		.hmax = 0x19c8,
- 		.link_freq_index = FREQ_INDEX_720P,
--		.crop = {
--			.left = 4 + 8 + 320,
--			.top = 12 + 8 + 180,
--			.width = 1280,
--			.height = 720,
--		},
--		.mode_data = imx290_720p_common_settings,
--		.mode_data_size = ARRAY_SIZE(imx290_720p_common_settings),
--		.lane_data = imx290_720p_2lane_settings,
--		.lane_data_size = ARRAY_SIZE(imx290_720p_2lane_settings),
--		.clk_data = {
--			[CLK_37_125] = imx290_37_125mhz_clock_720p,
--			[CLK_74_25] = imx290_74_250mhz_clock_720p,
--		},
--		.clk_size = ARRAY_SIZE(imx290_37_125mhz_clock_720p),
-+		.data = imx290_720p_settings,
-+		.data_size = ARRAY_SIZE(imx290_720p_settings),
- 	},
- };
- 
-@@ -499,45 +328,17 @@ static const struct imx290_mode imx290_m
- 		.width = 1920,
- 		.height = 1080,
- 		.hmax = 0x0898,
--		.vmax = 0x0465,
- 		.link_freq_index = FREQ_INDEX_1080P,
--		.crop = {
--			.left = 4 + 8,
--			.top = 12 + 8,
--			.width = 1920,
--			.height = 1080,
--		},
--		.mode_data = imx290_1080p_common_settings,
--		.mode_data_size = ARRAY_SIZE(imx290_1080p_common_settings),
--		.lane_data = imx290_1080p_4lane_settings,
--		.lane_data_size = ARRAY_SIZE(imx290_1080p_4lane_settings),
--		.clk_data = {
--			[CLK_37_125] = imx290_37_125mhz_clock_1080p,
--			[CLK_74_25] = imx290_74_250mhz_clock_1080p,
--		},
--		.clk_size = ARRAY_SIZE(imx290_37_125mhz_clock_1080p),
-+		.data = imx290_1080p_settings,
-+		.data_size = ARRAY_SIZE(imx290_1080p_settings),
- 	},
- 	{
- 		.width = 1280,
- 		.height = 720,
- 		.hmax = 0x0ce4,
--		.vmax = 0x02ee,
- 		.link_freq_index = FREQ_INDEX_720P,
--		.crop = {
--			.left = 4 + 8 + 320,
--			.top = 12 + 8 + 180,
--			.width = 1280,
--			.height = 720,
--		},
--		.mode_data = imx290_720p_common_settings,
--		.mode_data_size = ARRAY_SIZE(imx290_720p_common_settings),
--		.lane_data = imx290_720p_4lane_settings,
--		.lane_data_size = ARRAY_SIZE(imx290_720p_4lane_settings),
--		.clk_data = {
--			[CLK_37_125] = imx290_37_125mhz_clock_720p,
--			[CLK_74_25] = imx290_74_250mhz_clock_720p,
--		},
--		.clk_size = ARRAY_SIZE(imx290_37_125mhz_clock_720p),
-+		.data = imx290_720p_settings,
-+		.data_size = ARRAY_SIZE(imx290_720p_settings),
- 	},
- };
- 
-@@ -651,53 +452,6 @@ static int imx290_set_gain(struct imx290
- 	return ret;
- }
- 
--static int imx290_set_exposure(struct imx290 *imx290, u32 value)
--{
--	u32 exposure = (imx290->current_mode->height + imx290->vblank->val) -
--						value - 1;
--	int ret;
--
--	ret = imx290_write_buffered_reg(imx290, IMX290_EXPOSURE_LOW, 3,
--					exposure);
--	if (ret)
--		dev_err(imx290->dev, "Unable to write exposure\n");
--
--	return ret;
--}
--
--static int imx290_set_hmax(struct imx290 *imx290, u32 val)
--{
--	u32 hmax = val + imx290->current_mode->width;
--	int ret;
--
--	ret = imx290_write_buffered_reg(imx290, IMX290_HMAX_LOW, 2,
--					hmax);
--	if (ret)
--		dev_err(imx290->dev, "Error setting HMAX register\n");
--
--	return ret;
--}
--
--static int imx290_set_vmax(struct imx290 *imx290, u32 val)
--{
--	u32 vmax = val + imx290->current_mode->height;
--	int ret;
--
--	ret = imx290_write_buffered_reg(imx290, IMX290_VMAX_LOW, 3,
--					vmax);
--	if (ret)
--		dev_err(imx290->dev, "Unable to write vmax\n");
--
--	/*
--	 * Becuse of the way exposure works for this sensor, updating
--	 * vblank causes the effective exposure to change, so we must
--	 * set it back to the "new" correct value.
--	 */
--	imx290_set_exposure(imx290, imx290->exposure->val);
--
--	return ret;
--}
--
- /* Stop streaming */
- static int imx290_stop_streaming(struct imx290 *imx290)
- {
-@@ -717,50 +471,15 @@ static int imx290_set_ctrl(struct v4l2_c
- 	struct imx290 *imx290 = container_of(ctrl->handler,
- 					     struct imx290, ctrls);
- 	int ret = 0;
--	u8 val;
--
--	if (ctrl->id == V4L2_CID_VBLANK) {
--		u32 vmax = ctrl->val + imx290->current_mode->height;
--
--		/*
--		 * Changing vblank changes the allowed range for exposure.
--		 * We don't supply the current exposure as default here as it
--		 * may lie outside the new range. We will reset it just below.
--		 */
--		__v4l2_ctrl_modify_range(imx290->exposure,
--					 IMX290_EXPOSURE_MIN,
--					 vmax - 2,
--					 IMX290_EXPOSURE_STEP,
--					 vmax - 2);
--	}
- 
- 	/* V4L2 controls values will be applied only when power is already up */
- 	if (!pm_runtime_get_if_in_use(imx290->dev))
- 		return 0;
- 
- 	switch (ctrl->id) {
--	case V4L2_CID_ANALOGUE_GAIN:
-+	case V4L2_CID_GAIN:
- 		ret = imx290_set_gain(imx290, ctrl->val);
- 		break;
--	case V4L2_CID_EXPOSURE:
--		ret = imx290_set_exposure(imx290, ctrl->val);
--		break;
--	case V4L2_CID_HBLANK:
--		ret = imx290_set_hmax(imx290, ctrl->val);
--		break;
--	case V4L2_CID_VBLANK:
--		ret = imx290_set_vmax(imx290, ctrl->val);
--		break;
--	case V4L2_CID_HFLIP:
--	case V4L2_CID_VFLIP:
--		/* WINMODE is in bits [6:4], so need to read-modify-write */
--		ret = imx290_read_reg(imx290, IMX290_FLIP_WINMODE, &val);
--		if (ret)
--			break;
--		val &= ~0x03;
--		val |= imx290->vflip->val | (imx290->hflip->val << 1);
--		ret = imx290_write_reg(imx290, IMX290_FLIP_WINMODE, val);
--		break;
- 	case V4L2_CID_TEST_PATTERN:
- 		if (ctrl->val) {
- 			imx290_write_reg(imx290, IMX290_BLKLEVEL_LOW, 0x00);
-@@ -800,12 +519,10 @@ static int imx290_enum_mbus_code(struct
- 				 struct v4l2_subdev_state *sd_state,
- 				 struct v4l2_subdev_mbus_code_enum *code)
- {
--	const struct imx290 *imx290 = to_imx290(sd);
--
--	if (code->index >= IMX290_NUM_FORMATS)
-+	if (code->index >= ARRAY_SIZE(imx290_formats))
- 		return -EINVAL;
- 
--	code->code = imx290->formats[code->index].code;
-+	code->code = imx290_formats[code->index].code;
- 
- 	return 0;
- }
-@@ -817,8 +534,8 @@ static int imx290_enum_frame_size(struct
- 	const struct imx290 *imx290 = to_imx290(sd);
- 	const struct imx290_mode *imx290_modes = imx290_modes_ptr(imx290);
- 
--	if (fse->code != imx290->formats[0].code &&
--	    fse->code != imx290->formats[1].code)
-+	if ((fse->code != imx290_formats[0].code) &&
-+	    (fse->code != imx290_formats[1].code))
- 		return -EINVAL;
- 
- 	if (fse->index >= imx290_modes_num(imx290))
-@@ -859,9 +576,23 @@ static inline u8 imx290_get_link_freq_in
- 	return imx290->current_mode->link_freq_index;
- }
- 
-+static s64 imx290_get_link_freq(struct imx290 *imx290)
-+{
-+	u8 index = imx290_get_link_freq_index(imx290);
-+
-+	return *(imx290_link_freqs_ptr(imx290) + index);
-+}
-+
- static u64 imx290_calc_pixel_rate(struct imx290 *imx290)
- {
--	return 148500000;
-+	s64 link_freq = imx290_get_link_freq(imx290);
-+	u8 nlanes = imx290->nlanes;
-+	u64 pixel_rate;
-+
-+	/* pixel rate = link_freq * 2 * nr_of_lanes / bits_per_sample */
-+	pixel_rate = link_freq * 2 * nlanes;
-+	do_div(pixel_rate, imx290->bpp);
-+	return pixel_rate;
- }
- 
- static int imx290_set_fmt(struct v4l2_subdev *sd,
-@@ -882,30 +613,22 @@ static int imx290_set_fmt(struct v4l2_su
- 	fmt->format.width = mode->width;
- 	fmt->format.height = mode->height;
- 
--	for (i = 0; i < IMX290_NUM_FORMATS; i++)
--		if (imx290->formats[i].code == fmt->format.code)
-+	for (i = 0; i < ARRAY_SIZE(imx290_formats); i++)
-+		if (imx290_formats[i].code == fmt->format.code)
- 			break;
- 
--	if (i >= IMX290_NUM_FORMATS)
-+	if (i >= ARRAY_SIZE(imx290_formats))
- 		i = 0;
- 
--	fmt->format.code = imx290->formats[i].code;
-+	fmt->format.code = imx290_formats[i].code;
- 	fmt->format.field = V4L2_FIELD_NONE;
--	fmt->format.colorspace = V4L2_COLORSPACE_RAW;
--	fmt->format.ycbcr_enc =
--			V4L2_MAP_YCBCR_ENC_DEFAULT(fmt->format.colorspace);
--	fmt->format.quantization =
--		V4L2_MAP_QUANTIZATION_DEFAULT(true, fmt->format.colorspace,
--					      fmt->format.ycbcr_enc);
--	fmt->format.xfer_func =
--		V4L2_MAP_XFER_FUNC_DEFAULT(fmt->format.colorspace);
- 
- 	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
- 		format = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
- 	} else {
- 		format = &imx290->current_format;
- 		imx290->current_mode = mode;
--		imx290->bpp = imx290->formats[i].bpp;
-+		imx290->bpp = imx290_formats[i].bpp;
- 
- 		if (imx290->link_freq)
- 			__v4l2_ctrl_s_ctrl(imx290->link_freq,
-@@ -913,18 +636,6 @@ static int imx290_set_fmt(struct v4l2_su
- 		if (imx290->pixel_rate)
- 			__v4l2_ctrl_s_ctrl_int64(imx290->pixel_rate,
- 						 imx290_calc_pixel_rate(imx290));
--
--		if (imx290->hblank)
--			__v4l2_ctrl_modify_range(imx290->hblank,
--						 mode->hmax - mode->width,
--						 IMX290_HMAX_MAX - mode->width,
--						 1, mode->hmax - mode->width);
--		if (imx290->vblank)
--			__v4l2_ctrl_modify_range(imx290->vblank,
--						 mode->vmax - mode->height,
--						 IMX290_VMAX_MAX - mode->height,
--						 1,
--						 mode->vmax - mode->height);
- 	}
- 
- 	*format = fmt->format;
-@@ -954,7 +665,6 @@ static int imx290_write_current_format(s
- 
- 	switch (imx290->current_format.code) {
- 	case MEDIA_BUS_FMT_SRGGB10_1X10:
--	case MEDIA_BUS_FMT_Y10_1X10:
- 		ret = imx290_set_register_array(imx290, imx290_10bit_settings,
- 						ARRAY_SIZE(
- 							imx290_10bit_settings));
-@@ -964,7 +674,6 @@ static int imx290_write_current_format(s
- 		}
- 		break;
- 	case MEDIA_BUS_FMT_SRGGB12_1X12:
--	case MEDIA_BUS_FMT_Y12_1X12:
- 		ret = imx290_set_register_array(imx290, imx290_12bit_settings,
- 						ARRAY_SIZE(
- 							imx290_12bit_settings));
-@@ -981,63 +690,28 @@ static int imx290_write_current_format(s
- 	return 0;
- }
- 
--static const struct v4l2_rect *
--__imx290_get_pad_crop(struct imx290 *imx290,
--		      struct v4l2_subdev_state *sd_state,
--		      unsigned int pad, enum v4l2_subdev_format_whence which)
--{
--	switch (which) {
--	case V4L2_SUBDEV_FORMAT_TRY:
--		return v4l2_subdev_get_try_crop(&imx290->sd, sd_state, pad);
--	case V4L2_SUBDEV_FORMAT_ACTIVE:
--		return &imx290->current_mode->crop;
--	}
--
--	return NULL;
--}
--
--static int imx290_get_selection(struct v4l2_subdev *sd,
--				struct v4l2_subdev_state *sd_state,
--				struct v4l2_subdev_selection *sel)
-+static int imx290_set_hmax(struct imx290 *imx290, u32 val)
- {
--	switch (sel->target) {
--	case V4L2_SEL_TGT_CROP: {
--		struct imx290 *imx290 = to_imx290(sd);
--
--		mutex_lock(&imx290->lock);
--		sel->r = *__imx290_get_pad_crop(imx290, sd_state, sel->pad,
--						sel->which);
--		mutex_unlock(&imx290->lock);
-+	int ret;
- 
--		return 0;
-+	ret = imx290_write_reg(imx290, IMX290_HMAX_LOW, (val & 0xff));
-+	if (ret) {
-+		dev_err(imx290->dev, "Error setting HMAX register\n");
-+		return ret;
- 	}
- 
--	case V4L2_SEL_TGT_NATIVE_SIZE:
--		sel->r.top = 0;
--		sel->r.left = 0;
--		sel->r.width = IMX290_NATIVE_WIDTH;
--		sel->r.height = IMX290_NATIVE_HEIGHT;
--
--		return 0;
--
--	case V4L2_SEL_TGT_CROP_DEFAULT:
--	case V4L2_SEL_TGT_CROP_BOUNDS:
--		sel->r.top = IMX290_PIXEL_ARRAY_TOP;
--		sel->r.left = IMX290_PIXEL_ARRAY_LEFT;
--		sel->r.width = IMX290_PIXEL_ARRAY_WIDTH;
--		sel->r.height = IMX290_PIXEL_ARRAY_HEIGHT;
--
--		return 0;
-+	ret = imx290_write_reg(imx290, IMX290_HMAX_HIGH, ((val >> 8) & 0xff));
-+	if (ret) {
-+		dev_err(imx290->dev, "Error setting HMAX register\n");
-+		return ret;
- 	}
- 
--	return -EINVAL;
-+	return 0;
- }
- 
- /* Start streaming */
- static int imx290_start_streaming(struct imx290 *imx290)
- {
--	enum imx290_clk_index clk_idx = imx290->xclk_freq == 37125000 ?
--					CLK_37_125 : CLK_74_25;
- 	int ret;
- 
- 	/* Set init register settings */
-@@ -1049,14 +723,6 @@ static int imx290_start_streaming(struct
- 		return ret;
- 	}
- 
--	ret = imx290_set_register_array(imx290,
--					imx290->current_mode->clk_data[clk_idx],
--					imx290->current_mode->clk_size);
--	if (ret < 0) {
--		dev_err(imx290->dev, "Could not set clock registers\n");
--		return ret;
--	}
--
- 	/* Apply the register values related to current frame format */
- 	ret = imx290_write_current_format(imx290);
- 	if (ret < 0) {
-@@ -1065,22 +731,15 @@ static int imx290_start_streaming(struct
- 	}
- 
- 	/* Apply default values of current mode */
--	ret = imx290_set_register_array(imx290,
--					imx290->current_mode->mode_data,
--					imx290->current_mode->mode_data_size);
-+	ret = imx290_set_register_array(imx290, imx290->current_mode->data,
-+					imx290->current_mode->data_size);
- 	if (ret < 0) {
- 		dev_err(imx290->dev, "Could not set current mode\n");
- 		return ret;
- 	}
--
--	/* Apply lane config registers of current mode */
--	ret = imx290_set_register_array(imx290,
--					imx290->current_mode->lane_data,
--					imx290->current_mode->lane_data_size);
--	if (ret < 0) {
--		dev_err(imx290->dev, "Could not set current mode\n");
-+	ret = imx290_set_hmax(imx290, imx290->current_mode->hmax);
-+	if (ret < 0)
- 		return ret;
--	}
- 
- 	/* Apply customized values from user */
- 	ret = v4l2_ctrl_handler_setup(imx290->sd.ctrl_handler);
-@@ -1119,9 +778,6 @@ static int imx290_set_stream(struct v4l2
- 		imx290_stop_streaming(imx290);
- 		pm_runtime_put(imx290->dev);
- 	}
--	/* vflip and hflip cannot change during streaming */
--	__v4l2_ctrl_grab(imx290->vflip, enable);
--	__v4l2_ctrl_grab(imx290->hflip, enable);
- 
- unlock_and_return:
- 
-@@ -1139,6 +795,49 @@ static int imx290_get_regulators(struct
- 				       imx290->supplies);
- }
- 
-+static int imx290_set_data_lanes(struct imx290 *imx290)
-+{
-+	int ret = 0, laneval, frsel;
-+
-+	switch (imx290->nlanes) {
-+	case 2:
-+		laneval = 0x01;
-+		frsel = 0x02;
-+		break;
-+	case 4:
-+		laneval = 0x03;
-+		frsel = 0x01;
-+		break;
-+	default:
-+		/*
-+		 * We should never hit this since the data lane count is
-+		 * validated in probe itself
-+		 */
-+		dev_err(imx290->dev, "Lane configuration not supported\n");
-+		ret = -EINVAL;
-+		goto exit;
-+	}
-+
-+	ret = imx290_write_reg(imx290, IMX290_PHY_LANE_NUM, laneval);
-+	if (ret) {
-+		dev_err(imx290->dev, "Error setting Physical Lane number register\n");
-+		goto exit;
-+	}
-+
-+	ret = imx290_write_reg(imx290, IMX290_CSI_LANE_MODE, laneval);
-+	if (ret) {
-+		dev_err(imx290->dev, "Error setting CSI Lane mode register\n");
-+		goto exit;
-+	}
-+
-+	ret = imx290_write_reg(imx290, IMX290_FR_FDG_SEL, frsel);
-+	if (ret)
-+		dev_err(imx290->dev, "Error setting FR/FDG SEL register\n");
-+
-+exit:
-+	return ret;
-+}
-+
- static int imx290_power_on(struct device *dev)
- {
- 	struct v4l2_subdev *sd = dev_get_drvdata(dev);
-@@ -1162,6 +861,9 @@ static int imx290_power_on(struct device
- 	gpiod_set_value_cansleep(imx290->rst_gpio, 0);
- 	usleep_range(30000, 31000);
- 
-+	/* Set data lane count */
-+	imx290_set_data_lanes(imx290);
-+
- 	return 0;
- }
- 
-@@ -1191,7 +893,6 @@ static const struct v4l2_subdev_pad_ops
- 	.enum_frame_size = imx290_enum_frame_size,
- 	.get_fmt = imx290_get_fmt,
- 	.set_fmt = imx290_set_fmt,
--	.get_selection = imx290_get_selection,
- };
- 
- static const struct v4l2_subdev_ops imx290_subdev_ops = {
-@@ -1225,35 +926,16 @@ static s64 imx290_check_link_freqs(const
- 	return 0;
- }
- 
--static const struct of_device_id imx290_of_match[] = {
--	/*
--	 * imx327 supports 1080p60 at 10 and 12bit.
--	 * imx290 adds 10bit 1080p120.
--	 * imx462 adds 10 and 12bit 1080p120.
--	 * This driver currently maxes out at 1080p60, which is supported by all
--	 * of them, but add the compatible strings for future implementation.
--	 */
--	{ .compatible = "sony,imx327", .data = imx290_colour_formats },
--	{ .compatible = "sony,imx327-mono", .data = imx290_mono_formats },
--	{ .compatible = "sony,imx290", .data = imx290_colour_formats },
--	{ .compatible = "sony,imx290-mono", .data = imx290_mono_formats },
--	{ .compatible = "sony,imx462", .data = imx290_colour_formats },
--	{ .compatible = "sony,imx462-mono", .data = imx290_mono_formats },
--	{ /* sentinel */ }
--};
--
- static int imx290_probe(struct i2c_client *client)
- {
--	struct v4l2_fwnode_device_properties props;
- 	struct device *dev = &client->dev;
- 	struct fwnode_handle *endpoint;
- 	/* Only CSI2 is supported for now: */
- 	struct v4l2_fwnode_endpoint ep = {
- 		.bus_type = V4L2_MBUS_CSI2_DPHY
- 	};
--	const struct of_device_id *match;
--	const struct imx290_mode *mode;
- 	struct imx290 *imx290;
-+	u32 xclk_freq;
- 	s64 fq;
- 	int ret;
- 
-@@ -1268,11 +950,6 @@ static int imx290_probe(struct i2c_clien
- 		return -ENODEV;
- 	}
- 
--	match = of_match_device(imx290_of_match, dev);
--	if (!match)
--		return -ENODEV;
--	imx290->formats = (const struct imx290_pixfmt *)match->data;
--
- 	endpoint = fwnode_graph_get_next_endpoint(dev_fwnode(dev), NULL);
- 	if (!endpoint) {
- 		dev_err(dev, "Endpoint node not found\n");
-@@ -1322,21 +999,21 @@ static int imx290_probe(struct i2c_clien
- 	}
- 
- 	ret = fwnode_property_read_u32(dev_fwnode(dev), "clock-frequency",
--				       &imx290->xclk_freq);
-+				       &xclk_freq);
- 	if (ret) {
- 		dev_err(dev, "Could not get xclk frequency\n");
- 		goto free_err;
- 	}
- 
- 	/* external clock must be 37.125 MHz */
--	if (imx290->xclk_freq != 37125000 && imx290->xclk_freq != 74250000) {
-+	if (xclk_freq != 37125000) {
- 		dev_err(dev, "External clock frequency %u is not supported\n",
--			imx290->xclk_freq);
-+			xclk_freq);
- 		ret = -EINVAL;
- 		goto free_err;
- 	}
- 
--	ret = clk_set_rate(imx290->xclk, imx290->xclk_freq);
-+	ret = clk_set_rate(imx290->xclk, xclk_freq);
- 	if (ret) {
- 		dev_err(dev, "Could not set xclk frequency\n");
- 		goto free_err;
-@@ -1360,39 +1037,15 @@ static int imx290_probe(struct i2c_clien
- 
- 	/*
- 	 * Initialize the frame format. In particular, imx290->current_mode
--	 * and imx290->bpp are set to defaults.
-+	 * and imx290->bpp are set to defaults: imx290_calc_pixel_rate() call
-+	 * below relies on these fields.
- 	 */
- 	imx290_entity_init_cfg(&imx290->sd, NULL);
- 
--	v4l2_ctrl_handler_init(&imx290->ctrls, 11);
-+	v4l2_ctrl_handler_init(&imx290->ctrls, 4);
- 
- 	v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
--			  V4L2_CID_ANALOGUE_GAIN, 0, 100, 1, 0);
--
--	mode = imx290->current_mode;
--	imx290->hblank = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
--					   V4L2_CID_HBLANK,
--					   mode->hmax - mode->width,
--					   IMX290_HMAX_MAX - mode->width, 1,
--					   mode->hmax - mode->width);
--
--	imx290->vblank = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
--					   V4L2_CID_VBLANK,
--					   mode->vmax - mode->height,
--					   IMX290_VMAX_MAX - mode->height, 1,
--					   mode->vmax - mode->height);
--
--	imx290->exposure = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
--					     V4L2_CID_EXPOSURE,
--					     IMX290_EXPOSURE_MIN,
--					     mode->vmax - 2,
--					     IMX290_EXPOSURE_STEP,
--					     mode->vmax - 2);
--
--	imx290->hflip = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
--					  V4L2_CID_HFLIP, 0, 1, 1, 0);
--	imx290->vflip = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
--					  V4L2_CID_VFLIP, 0, 1, 1, 0);
-+			  V4L2_CID_GAIN, 0, 72, 1, 0);
- 
- 	imx290->link_freq =
- 		v4l2_ctrl_new_int_menu(&imx290->ctrls, &imx290_ctrl_ops,
-@@ -1412,15 +1065,6 @@ static int imx290_probe(struct i2c_clien
- 				     ARRAY_SIZE(imx290_test_pattern_menu) - 1,
- 				     0, 0, imx290_test_pattern_menu);
- 
--	ret = v4l2_fwnode_device_parse(&client->dev, &props);
--	if (ret)
--		goto free_ctrl;
--
--	ret = v4l2_ctrl_new_fwnode_properties(&imx290->ctrls, &imx290_ctrl_ops,
--					      &props);
--	if (ret)
--		goto free_ctrl;
--
- 	imx290->sd.ctrl_handler = &imx290->ctrls;
- 
- 	if (imx290->ctrls.error) {
-@@ -1443,9 +1087,6 @@ static int imx290_probe(struct i2c_clien
- 		goto free_ctrl;
- 	}
- 
--	/* Initialize the frame format (this also sets imx290->current_mode) */
--	imx290_entity_init_cfg(&imx290->sd, NULL);
--
- 	ret = v4l2_async_register_subdev(&imx290->sd);
- 	if (ret < 0) {
- 		dev_err(dev, "Could not register v4l2 device\n");
-@@ -1495,6 +1136,10 @@ static void imx290_remove(struct i2c_cli
- 	pm_runtime_set_suspended(imx290->dev);
- }
- 
-+static const struct of_device_id imx290_of_match[] = {
-+	{ .compatible = "sony,imx290" },
-+	{ /* sentinel */ }
-+};
- MODULE_DEVICE_TABLE(of, imx290_of_match);
- 
- static struct i2c_driver imx290_i2c_driver = {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0612-media-i2c-imx290-Use-device-lock-for-the-control-han.patch b/target/linux/bcm27xx/patches-6.1/950-0612-media-i2c-imx290-Use-device-lock-for-the-control-han.patch
deleted file mode 100644
index ab8dfc4797..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0612-media-i2c-imx290-Use-device-lock-for-the-control-han.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 9da6b4ad7ee76da4d274f305412fc6f2bc95c91c Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Sun, 16 Oct 2022 09:15:05 +0300
-Subject: [PATCH] media: i2c: imx290: Use device lock for the control
- handler
-
-Upstream commit 08878cbc0cbf.
-
-The link frequency and pixel rate controls are set without holding the
-control handler lock, resulting in kernel warnings. As the value of
-those controls depend on the format, the simplest fix is to use the
-device lock for the control handler.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -1043,6 +1043,7 @@ static int imx290_probe(struct i2c_clien
- 	imx290_entity_init_cfg(&imx290->sd, NULL);
- 
- 	v4l2_ctrl_handler_init(&imx290->ctrls, 4);
-+	imx290->ctrls.lock = &imx290->lock;
- 
- 	v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
- 			  V4L2_CID_GAIN, 0, 72, 1, 0);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0613-media-i2c-imx290-Print-error-code-when-I2C-transfer-.patch b/target/linux/bcm27xx/patches-6.1/950-0613-media-i2c-imx290-Print-error-code-when-I2C-transfer-.patch
deleted file mode 100644
index bb5a2a6b1a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0613-media-i2c-imx290-Print-error-code-when-I2C-transfer-.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 25b4bd6894bf79b5d6150d66222d63afea32f24f Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Sun, 16 Oct 2022 09:15:06 +0300
-Subject: [PATCH] media: i2c: imx290: Print error code when I2C
- transfer fails
-
-Upstream commit fbe0a89dc7e3.
-
-Knowing why I2C transfers fail is useful for debugging. Extend the error
-message to print the error code.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -370,7 +370,8 @@ static inline int __always_unused imx290
- 
- 	ret = regmap_read(imx290->regmap, addr, &regval);
- 	if (ret) {
--		dev_err(imx290->dev, "I2C read failed for addr: %x\n", addr);
-+		dev_err(imx290->dev, "Failed to read register 0x%04x: %d\n",
-+			addr, ret);
- 		return ret;
- 	}
- 
-@@ -385,7 +386,8 @@ static int imx290_write_reg(struct imx29
- 
- 	ret = regmap_write(imx290->regmap, addr, value);
- 	if (ret) {
--		dev_err(imx290->dev, "I2C write failed for addr: %x\n", addr);
-+		dev_err(imx290->dev, "Failed to write register 0x%04x: %d\n",
-+			addr, ret);
- 		return ret;
- 	}
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0614-media-i2c-imx290-Replace-macro-with-explicit-ARRAY_S.patch b/target/linux/bcm27xx/patches-6.1/950-0614-media-i2c-imx290-Replace-macro-with-explicit-ARRAY_S.patch
deleted file mode 100644
index 136998b0ac..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0614-media-i2c-imx290-Replace-macro-with-explicit-ARRAY_S.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 40361e75c3da4145a21ef6284ad76c28983b4364 Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Sun, 16 Oct 2022 09:15:07 +0300
-Subject: [PATCH] media: i2c: imx290: Replace macro with explicit
- ARRAY_SIZE()
-
-Upstream commit 2548df538cdd.
-
-Use ARRAY_SIZE(imx290->supplies) for code that needs the size of the
-array, instead of relying on the IMX290_NUM_SUPPLIES. The result is less
-error-prone as it ties the size to the array.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -790,10 +790,10 @@ static int imx290_get_regulators(struct
- {
- 	unsigned int i;
- 
--	for (i = 0; i < IMX290_NUM_SUPPLIES; i++)
-+	for (i = 0; i < ARRAY_SIZE(imx290->supplies); i++)
- 		imx290->supplies[i].supply = imx290_supply_name[i];
- 
--	return devm_regulator_bulk_get(dev, IMX290_NUM_SUPPLIES,
-+	return devm_regulator_bulk_get(dev, ARRAY_SIZE(imx290->supplies),
- 				       imx290->supplies);
- }
- 
-@@ -852,7 +852,8 @@ static int imx290_power_on(struct device
- 		return ret;
- 	}
- 
--	ret = regulator_bulk_enable(IMX290_NUM_SUPPLIES, imx290->supplies);
-+	ret = regulator_bulk_enable(ARRAY_SIZE(imx290->supplies),
-+				    imx290->supplies);
- 	if (ret) {
- 		dev_err(dev, "Failed to enable regulators\n");
- 		clk_disable_unprepare(imx290->xclk);
-@@ -876,7 +877,7 @@ static int imx290_power_off(struct devic
- 
- 	clk_disable_unprepare(imx290->xclk);
- 	gpiod_set_value_cansleep(imx290->rst_gpio, 1);
--	regulator_bulk_disable(IMX290_NUM_SUPPLIES, imx290->supplies);
-+	regulator_bulk_disable(ARRAY_SIZE(imx290->supplies), imx290->supplies);
- 
- 	return 0;
- }
diff --git a/target/linux/bcm27xx/patches-6.1/950-0615-media-i2c-imx290-Drop-imx290_write_buffered_reg.patch b/target/linux/bcm27xx/patches-6.1/950-0615-media-i2c-imx290-Drop-imx290_write_buffered_reg.patch
deleted file mode 100644
index 101eb38834..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0615-media-i2c-imx290-Drop-imx290_write_buffered_reg.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 51fc780bc99a0cfe74fcfc42744d8265fcafedcb Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Sun, 16 Oct 2022 09:15:08 +0300
-Subject: [PATCH] media: i2c: imx290: Drop imx290_write_buffered_reg()
-
-Upstream commit b817888a0c50.
-
-The imx290_write_buffered_reg() function wraps a register write with
-register hold, to enable changing multiple registers synchronously. It
-is used for the gain only, which is an 8-bit register, defeating its
-purpose.
-
-The feature is useful, but should be implemented differently. Drop the
-function for now, to prepare for a rework of register access.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Acked-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 32 +-------------------------------
- 1 file changed, 1 insertion(+), 31 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -413,41 +413,11 @@ static int imx290_set_register_array(str
- 	return 0;
- }
- 
--static int imx290_write_buffered_reg(struct imx290 *imx290, u16 address_low,
--				     u8 nr_regs, u32 value)
--{
--	unsigned int i;
--	int ret;
--
--	ret = imx290_write_reg(imx290, IMX290_REGHOLD, 0x01);
--	if (ret) {
--		dev_err(imx290->dev, "Error setting hold register\n");
--		return ret;
--	}
--
--	for (i = 0; i < nr_regs; i++) {
--		ret = imx290_write_reg(imx290, address_low + i,
--				       (u8)(value >> (i * 8)));
--		if (ret) {
--			dev_err(imx290->dev, "Error writing buffered registers\n");
--			return ret;
--		}
--	}
--
--	ret = imx290_write_reg(imx290, IMX290_REGHOLD, 0x00);
--	if (ret) {
--		dev_err(imx290->dev, "Error setting hold register\n");
--		return ret;
--	}
--
--	return ret;
--}
--
- static int imx290_set_gain(struct imx290 *imx290, u32 value)
- {
- 	int ret;
- 
--	ret = imx290_write_buffered_reg(imx290, IMX290_GAIN, 1, value);
-+	ret = imx290_write_reg(imx290, IMX290_GAIN, value);
- 	if (ret)
- 		dev_err(imx290->dev, "Unable to write gain\n");
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0616-media-i2c-imx290-Drop-regmap-cache.patch b/target/linux/bcm27xx/patches-6.1/950-0616-media-i2c-imx290-Drop-regmap-cache.patch
deleted file mode 100644
index a6183217c4..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0616-media-i2c-imx290-Drop-regmap-cache.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 02e4438d2270b2684190970cef3e5252156d8e7c Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Sun, 16 Oct 2022 09:15:09 +0300
-Subject: [PATCH] media: i2c: imx290: Drop regmap cache
-
-Upstream commit 72e4bf6dd136.
-
-Only two registers are ever read, and once only. There's no need to
-cache values.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 1 -
- 1 file changed, 1 deletion(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -97,7 +97,6 @@ static const struct imx290_pixfmt imx290
- static const struct regmap_config imx290_regmap_config = {
- 	.reg_bits = 16,
- 	.val_bits = 8,
--	.cache_type = REGCACHE_RBTREE,
- };
- 
- static const char * const imx290_test_pattern_menu[] = {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0617-media-i2c-imx290-Specify-HMAX-values-in-decimal.patch b/target/linux/bcm27xx/patches-6.1/950-0617-media-i2c-imx290-Specify-HMAX-values-in-decimal.patch
deleted file mode 100644
index 05206cbe0a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0617-media-i2c-imx290-Specify-HMAX-values-in-decimal.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From c1461dc7f90c1789418e493df0fb866ebe74151a Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Sun, 16 Oct 2022 09:15:10 +0300
-Subject: [PATCH] media: i2c: imx290: Specify HMAX values in decimal
-
-Upstream commit 72825bc6f7f5.
-
-The HMAX value specifies the total line length in pixels. It's thus more
-readable in decimal than hexadecimal. Fix it.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -307,7 +307,7 @@ static const struct imx290_mode imx290_m
- 	{
- 		.width = 1920,
- 		.height = 1080,
--		.hmax = 0x1130,
-+		.hmax = 4400,
- 		.link_freq_index = FREQ_INDEX_1080P,
- 		.data = imx290_1080p_settings,
- 		.data_size = ARRAY_SIZE(imx290_1080p_settings),
-@@ -315,7 +315,7 @@ static const struct imx290_mode imx290_m
- 	{
- 		.width = 1280,
- 		.height = 720,
--		.hmax = 0x19c8,
-+		.hmax = 6600,
- 		.link_freq_index = FREQ_INDEX_720P,
- 		.data = imx290_720p_settings,
- 		.data_size = ARRAY_SIZE(imx290_720p_settings),
-@@ -326,7 +326,7 @@ static const struct imx290_mode imx290_m
- 	{
- 		.width = 1920,
- 		.height = 1080,
--		.hmax = 0x0898,
-+		.hmax = 2200,
- 		.link_freq_index = FREQ_INDEX_1080P,
- 		.data = imx290_1080p_settings,
- 		.data_size = ARRAY_SIZE(imx290_1080p_settings),
-@@ -334,7 +334,7 @@ static const struct imx290_mode imx290_m
- 	{
- 		.width = 1280,
- 		.height = 720,
--		.hmax = 0x0ce4,
-+		.hmax = 3300,
- 		.link_freq_index = FREQ_INDEX_720P,
- 		.data = imx290_720p_settings,
- 		.data_size = ARRAY_SIZE(imx290_720p_settings),
diff --git a/target/linux/bcm27xx/patches-6.1/950-0618-media-i2c-imx290-Support-variable-sized-registers.patch b/target/linux/bcm27xx/patches-6.1/950-0618-media-i2c-imx290-Support-variable-sized-registers.patch
deleted file mode 100644
index 0768f7f97f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0618-media-i2c-imx290-Support-variable-sized-registers.patch
+++ /dev/null
@@ -1,431 +0,0 @@
-From dbb775e681426042415eb6cf48242c5c980af293 Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Sun, 16 Oct 2022 09:15:11 +0300
-Subject: [PATCH] media: i2c: imx290: Support variable-sized registers
-
-Upstream commit e70abe881463.
-
-The IMX290 has registers of different sizes. To simplify the code,
-handle this in the read/write functions instead of in the callers by
-encoding the register size in the symbolic name macros. All registers
-are defined as 8-bit for now, a subsequent change will move to larger
-registers where applicable.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 354 +++++++++++++++++++------------------
- 1 file changed, 181 insertions(+), 173 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -22,22 +22,28 @@
- #include <media/v4l2-fwnode.h>
- #include <media/v4l2-subdev.h>
- 
--#define IMX290_STANDBY 0x3000
--#define IMX290_REGHOLD 0x3001
--#define IMX290_XMSTA 0x3002
--#define IMX290_FR_FDG_SEL 0x3009
--#define IMX290_BLKLEVEL_LOW 0x300a
--#define IMX290_BLKLEVEL_HIGH 0x300b
--#define IMX290_GAIN 0x3014
--#define IMX290_HMAX_LOW 0x301c
--#define IMX290_HMAX_HIGH 0x301d
--#define IMX290_PGCTRL 0x308c
--#define IMX290_PHY_LANE_NUM 0x3407
--#define IMX290_CSI_LANE_MODE 0x3443
--
--#define IMX290_PGCTRL_REGEN BIT(0)
--#define IMX290_PGCTRL_THRU BIT(1)
--#define IMX290_PGCTRL_MODE(n) ((n) << 4)
-+#define IMX290_REG_SIZE_SHIFT				16
-+#define IMX290_REG_ADDR_MASK				0xffff
-+#define IMX290_REG_8BIT(n)				((1U << IMX290_REG_SIZE_SHIFT) | (n))
-+#define IMX290_REG_16BIT(n)				((2U << IMX290_REG_SIZE_SHIFT) | (n))
-+#define IMX290_REG_24BIT(n)				((3U << IMX290_REG_SIZE_SHIFT) | (n))
-+
-+#define IMX290_STANDBY					IMX290_REG_8BIT(0x3000)
-+#define IMX290_REGHOLD					IMX290_REG_8BIT(0x3001)
-+#define IMX290_XMSTA					IMX290_REG_8BIT(0x3002)
-+#define IMX290_FR_FDG_SEL				IMX290_REG_8BIT(0x3009)
-+#define IMX290_BLKLEVEL_LOW				IMX290_REG_8BIT(0x300a)
-+#define IMX290_BLKLEVEL_HIGH				IMX290_REG_8BIT(0x300b)
-+#define IMX290_GAIN					IMX290_REG_8BIT(0x3014)
-+#define IMX290_HMAX_LOW					IMX290_REG_8BIT(0x301c)
-+#define IMX290_HMAX_HIGH				IMX290_REG_8BIT(0x301d)
-+#define IMX290_PGCTRL					IMX290_REG_8BIT(0x308c)
-+#define IMX290_PHY_LANE_NUM				IMX290_REG_8BIT(0x3407)
-+#define IMX290_CSI_LANE_MODE				IMX290_REG_8BIT(0x3443)
-+
-+#define IMX290_PGCTRL_REGEN				BIT(0)
-+#define IMX290_PGCTRL_THRU				BIT(1)
-+#define IMX290_PGCTRL_MODE(n)				((n) << 4)
- 
- static const char * const imx290_supply_name[] = {
- 	"vdda",
-@@ -48,7 +54,7 @@ static const char * const imx290_supply_
- #define IMX290_NUM_SUPPLIES ARRAY_SIZE(imx290_supply_name)
- 
- struct imx290_regval {
--	u16 reg;
-+	u32 reg;
- 	u8 val;
- };
- 
-@@ -111,163 +117,163 @@ static const char * const imx290_test_pa
- };
- 
- static const struct imx290_regval imx290_global_init_settings[] = {
--	{ 0x3007, 0x00 },
--	{ 0x3018, 0x65 },
--	{ 0x3019, 0x04 },
--	{ 0x301a, 0x00 },
--	{ 0x3444, 0x20 },
--	{ 0x3445, 0x25 },
--	{ 0x303a, 0x0c },
--	{ 0x3040, 0x00 },
--	{ 0x3041, 0x00 },
--	{ 0x303c, 0x00 },
--	{ 0x303d, 0x00 },
--	{ 0x3042, 0x9c },
--	{ 0x3043, 0x07 },
--	{ 0x303e, 0x49 },
--	{ 0x303f, 0x04 },
--	{ 0x304b, 0x0a },
--	{ 0x300f, 0x00 },
--	{ 0x3010, 0x21 },
--	{ 0x3012, 0x64 },
--	{ 0x3016, 0x09 },
--	{ 0x3070, 0x02 },
--	{ 0x3071, 0x11 },
--	{ 0x309b, 0x10 },
--	{ 0x309c, 0x22 },
--	{ 0x30a2, 0x02 },
--	{ 0x30a6, 0x20 },
--	{ 0x30a8, 0x20 },
--	{ 0x30aa, 0x20 },
--	{ 0x30ac, 0x20 },
--	{ 0x30b0, 0x43 },
--	{ 0x3119, 0x9e },
--	{ 0x311c, 0x1e },
--	{ 0x311e, 0x08 },
--	{ 0x3128, 0x05 },
--	{ 0x313d, 0x83 },
--	{ 0x3150, 0x03 },
--	{ 0x317e, 0x00 },
--	{ 0x32b8, 0x50 },
--	{ 0x32b9, 0x10 },
--	{ 0x32ba, 0x00 },
--	{ 0x32bb, 0x04 },
--	{ 0x32c8, 0x50 },
--	{ 0x32c9, 0x10 },
--	{ 0x32ca, 0x00 },
--	{ 0x32cb, 0x04 },
--	{ 0x332c, 0xd3 },
--	{ 0x332d, 0x10 },
--	{ 0x332e, 0x0d },
--	{ 0x3358, 0x06 },
--	{ 0x3359, 0xe1 },
--	{ 0x335a, 0x11 },
--	{ 0x3360, 0x1e },
--	{ 0x3361, 0x61 },
--	{ 0x3362, 0x10 },
--	{ 0x33b0, 0x50 },
--	{ 0x33b2, 0x1a },
--	{ 0x33b3, 0x04 },
-+	{ IMX290_REG_8BIT(0x3007), 0x00 },
-+	{ IMX290_REG_8BIT(0x3018), 0x65 },
-+	{ IMX290_REG_8BIT(0x3019), 0x04 },
-+	{ IMX290_REG_8BIT(0x301a), 0x00 },
-+	{ IMX290_REG_8BIT(0x3444), 0x20 },
-+	{ IMX290_REG_8BIT(0x3445), 0x25 },
-+	{ IMX290_REG_8BIT(0x303a), 0x0c },
-+	{ IMX290_REG_8BIT(0x3040), 0x00 },
-+	{ IMX290_REG_8BIT(0x3041), 0x00 },
-+	{ IMX290_REG_8BIT(0x303c), 0x00 },
-+	{ IMX290_REG_8BIT(0x303d), 0x00 },
-+	{ IMX290_REG_8BIT(0x3042), 0x9c },
-+	{ IMX290_REG_8BIT(0x3043), 0x07 },
-+	{ IMX290_REG_8BIT(0x303e), 0x49 },
-+	{ IMX290_REG_8BIT(0x303f), 0x04 },
-+	{ IMX290_REG_8BIT(0x304b), 0x0a },
-+	{ IMX290_REG_8BIT(0x300f), 0x00 },
-+	{ IMX290_REG_8BIT(0x3010), 0x21 },
-+	{ IMX290_REG_8BIT(0x3012), 0x64 },
-+	{ IMX290_REG_8BIT(0x3016), 0x09 },
-+	{ IMX290_REG_8BIT(0x3070), 0x02 },
-+	{ IMX290_REG_8BIT(0x3071), 0x11 },
-+	{ IMX290_REG_8BIT(0x309b), 0x10 },
-+	{ IMX290_REG_8BIT(0x309c), 0x22 },
-+	{ IMX290_REG_8BIT(0x30a2), 0x02 },
-+	{ IMX290_REG_8BIT(0x30a6), 0x20 },
-+	{ IMX290_REG_8BIT(0x30a8), 0x20 },
-+	{ IMX290_REG_8BIT(0x30aa), 0x20 },
-+	{ IMX290_REG_8BIT(0x30ac), 0x20 },
-+	{ IMX290_REG_8BIT(0x30b0), 0x43 },
-+	{ IMX290_REG_8BIT(0x3119), 0x9e },
-+	{ IMX290_REG_8BIT(0x311c), 0x1e },
-+	{ IMX290_REG_8BIT(0x311e), 0x08 },
-+	{ IMX290_REG_8BIT(0x3128), 0x05 },
-+	{ IMX290_REG_8BIT(0x313d), 0x83 },
-+	{ IMX290_REG_8BIT(0x3150), 0x03 },
-+	{ IMX290_REG_8BIT(0x317e), 0x00 },
-+	{ IMX290_REG_8BIT(0x32b8), 0x50 },
-+	{ IMX290_REG_8BIT(0x32b9), 0x10 },
-+	{ IMX290_REG_8BIT(0x32ba), 0x00 },
-+	{ IMX290_REG_8BIT(0x32bb), 0x04 },
-+	{ IMX290_REG_8BIT(0x32c8), 0x50 },
-+	{ IMX290_REG_8BIT(0x32c9), 0x10 },
-+	{ IMX290_REG_8BIT(0x32ca), 0x00 },
-+	{ IMX290_REG_8BIT(0x32cb), 0x04 },
-+	{ IMX290_REG_8BIT(0x332c), 0xd3 },
-+	{ IMX290_REG_8BIT(0x332d), 0x10 },
-+	{ IMX290_REG_8BIT(0x332e), 0x0d },
-+	{ IMX290_REG_8BIT(0x3358), 0x06 },
-+	{ IMX290_REG_8BIT(0x3359), 0xe1 },
-+	{ IMX290_REG_8BIT(0x335a), 0x11 },
-+	{ IMX290_REG_8BIT(0x3360), 0x1e },
-+	{ IMX290_REG_8BIT(0x3361), 0x61 },
-+	{ IMX290_REG_8BIT(0x3362), 0x10 },
-+	{ IMX290_REG_8BIT(0x33b0), 0x50 },
-+	{ IMX290_REG_8BIT(0x33b2), 0x1a },
-+	{ IMX290_REG_8BIT(0x33b3), 0x04 },
- };
- 
- static const struct imx290_regval imx290_1080p_settings[] = {
- 	/* mode settings */
--	{ 0x3007, 0x00 },
--	{ 0x303a, 0x0c },
--	{ 0x3414, 0x0a },
--	{ 0x3472, 0x80 },
--	{ 0x3473, 0x07 },
--	{ 0x3418, 0x38 },
--	{ 0x3419, 0x04 },
--	{ 0x3012, 0x64 },
--	{ 0x3013, 0x00 },
--	{ 0x305c, 0x18 },
--	{ 0x305d, 0x03 },
--	{ 0x305e, 0x20 },
--	{ 0x305f, 0x01 },
--	{ 0x315e, 0x1a },
--	{ 0x3164, 0x1a },
--	{ 0x3480, 0x49 },
-+	{ IMX290_REG_8BIT(0x3007), 0x00 },
-+	{ IMX290_REG_8BIT(0x303a), 0x0c },
-+	{ IMX290_REG_8BIT(0x3414), 0x0a },
-+	{ IMX290_REG_8BIT(0x3472), 0x80 },
-+	{ IMX290_REG_8BIT(0x3473), 0x07 },
-+	{ IMX290_REG_8BIT(0x3418), 0x38 },
-+	{ IMX290_REG_8BIT(0x3419), 0x04 },
-+	{ IMX290_REG_8BIT(0x3012), 0x64 },
-+	{ IMX290_REG_8BIT(0x3013), 0x00 },
-+	{ IMX290_REG_8BIT(0x305c), 0x18 },
-+	{ IMX290_REG_8BIT(0x305d), 0x03 },
-+	{ IMX290_REG_8BIT(0x305e), 0x20 },
-+	{ IMX290_REG_8BIT(0x305f), 0x01 },
-+	{ IMX290_REG_8BIT(0x315e), 0x1a },
-+	{ IMX290_REG_8BIT(0x3164), 0x1a },
-+	{ IMX290_REG_8BIT(0x3480), 0x49 },
- 	/* data rate settings */
--	{ 0x3405, 0x10 },
--	{ 0x3446, 0x57 },
--	{ 0x3447, 0x00 },
--	{ 0x3448, 0x37 },
--	{ 0x3449, 0x00 },
--	{ 0x344a, 0x1f },
--	{ 0x344b, 0x00 },
--	{ 0x344c, 0x1f },
--	{ 0x344d, 0x00 },
--	{ 0x344e, 0x1f },
--	{ 0x344f, 0x00 },
--	{ 0x3450, 0x77 },
--	{ 0x3451, 0x00 },
--	{ 0x3452, 0x1f },
--	{ 0x3453, 0x00 },
--	{ 0x3454, 0x17 },
--	{ 0x3455, 0x00 },
-+	{ IMX290_REG_8BIT(0x3405), 0x10 },
-+	{ IMX290_REG_8BIT(0x3446), 0x57 },
-+	{ IMX290_REG_8BIT(0x3447), 0x00 },
-+	{ IMX290_REG_8BIT(0x3448), 0x37 },
-+	{ IMX290_REG_8BIT(0x3449), 0x00 },
-+	{ IMX290_REG_8BIT(0x344a), 0x1f },
-+	{ IMX290_REG_8BIT(0x344b), 0x00 },
-+	{ IMX290_REG_8BIT(0x344c), 0x1f },
-+	{ IMX290_REG_8BIT(0x344d), 0x00 },
-+	{ IMX290_REG_8BIT(0x344e), 0x1f },
-+	{ IMX290_REG_8BIT(0x344f), 0x00 },
-+	{ IMX290_REG_8BIT(0x3450), 0x77 },
-+	{ IMX290_REG_8BIT(0x3451), 0x00 },
-+	{ IMX290_REG_8BIT(0x3452), 0x1f },
-+	{ IMX290_REG_8BIT(0x3453), 0x00 },
-+	{ IMX290_REG_8BIT(0x3454), 0x17 },
-+	{ IMX290_REG_8BIT(0x3455), 0x00 },
- };
- 
- static const struct imx290_regval imx290_720p_settings[] = {
- 	/* mode settings */
--	{ 0x3007, 0x10 },
--	{ 0x303a, 0x06 },
--	{ 0x3414, 0x04 },
--	{ 0x3472, 0x00 },
--	{ 0x3473, 0x05 },
--	{ 0x3418, 0xd0 },
--	{ 0x3419, 0x02 },
--	{ 0x3012, 0x64 },
--	{ 0x3013, 0x00 },
--	{ 0x305c, 0x20 },
--	{ 0x305d, 0x00 },
--	{ 0x305e, 0x20 },
--	{ 0x305f, 0x01 },
--	{ 0x315e, 0x1a },
--	{ 0x3164, 0x1a },
--	{ 0x3480, 0x49 },
-+	{ IMX290_REG_8BIT(0x3007), 0x10 },
-+	{ IMX290_REG_8BIT(0x303a), 0x06 },
-+	{ IMX290_REG_8BIT(0x3414), 0x04 },
-+	{ IMX290_REG_8BIT(0x3472), 0x00 },
-+	{ IMX290_REG_8BIT(0x3473), 0x05 },
-+	{ IMX290_REG_8BIT(0x3418), 0xd0 },
-+	{ IMX290_REG_8BIT(0x3419), 0x02 },
-+	{ IMX290_REG_8BIT(0x3012), 0x64 },
-+	{ IMX290_REG_8BIT(0x3013), 0x00 },
-+	{ IMX290_REG_8BIT(0x305c), 0x20 },
-+	{ IMX290_REG_8BIT(0x305d), 0x00 },
-+	{ IMX290_REG_8BIT(0x305e), 0x20 },
-+	{ IMX290_REG_8BIT(0x305f), 0x01 },
-+	{ IMX290_REG_8BIT(0x315e), 0x1a },
-+	{ IMX290_REG_8BIT(0x3164), 0x1a },
-+	{ IMX290_REG_8BIT(0x3480), 0x49 },
- 	/* data rate settings */
--	{ 0x3405, 0x10 },
--	{ 0x3446, 0x4f },
--	{ 0x3447, 0x00 },
--	{ 0x3448, 0x2f },
--	{ 0x3449, 0x00 },
--	{ 0x344a, 0x17 },
--	{ 0x344b, 0x00 },
--	{ 0x344c, 0x17 },
--	{ 0x344d, 0x00 },
--	{ 0x344e, 0x17 },
--	{ 0x344f, 0x00 },
--	{ 0x3450, 0x57 },
--	{ 0x3451, 0x00 },
--	{ 0x3452, 0x17 },
--	{ 0x3453, 0x00 },
--	{ 0x3454, 0x17 },
--	{ 0x3455, 0x00 },
-+	{ IMX290_REG_8BIT(0x3405), 0x10 },
-+	{ IMX290_REG_8BIT(0x3446), 0x4f },
-+	{ IMX290_REG_8BIT(0x3447), 0x00 },
-+	{ IMX290_REG_8BIT(0x3448), 0x2f },
-+	{ IMX290_REG_8BIT(0x3449), 0x00 },
-+	{ IMX290_REG_8BIT(0x344a), 0x17 },
-+	{ IMX290_REG_8BIT(0x344b), 0x00 },
-+	{ IMX290_REG_8BIT(0x344c), 0x17 },
-+	{ IMX290_REG_8BIT(0x344d), 0x00 },
-+	{ IMX290_REG_8BIT(0x344e), 0x17 },
-+	{ IMX290_REG_8BIT(0x344f), 0x00 },
-+	{ IMX290_REG_8BIT(0x3450), 0x57 },
-+	{ IMX290_REG_8BIT(0x3451), 0x00 },
-+	{ IMX290_REG_8BIT(0x3452), 0x17 },
-+	{ IMX290_REG_8BIT(0x3453), 0x00 },
-+	{ IMX290_REG_8BIT(0x3454), 0x17 },
-+	{ IMX290_REG_8BIT(0x3455), 0x00 },
- };
- 
- static const struct imx290_regval imx290_10bit_settings[] = {
--	{ 0x3005, 0x00},
--	{ 0x3046, 0x00},
--	{ 0x3129, 0x1d},
--	{ 0x317c, 0x12},
--	{ 0x31ec, 0x37},
--	{ 0x3441, 0x0a},
--	{ 0x3442, 0x0a},
--	{ 0x300a, 0x3c},
--	{ 0x300b, 0x00},
-+	{ IMX290_REG_8BIT(0x3005), 0x00},
-+	{ IMX290_REG_8BIT(0x3046), 0x00},
-+	{ IMX290_REG_8BIT(0x3129), 0x1d},
-+	{ IMX290_REG_8BIT(0x317c), 0x12},
-+	{ IMX290_REG_8BIT(0x31ec), 0x37},
-+	{ IMX290_REG_8BIT(0x3441), 0x0a},
-+	{ IMX290_REG_8BIT(0x3442), 0x0a},
-+	{ IMX290_REG_8BIT(0x300a), 0x3c},
-+	{ IMX290_REG_8BIT(0x300b), 0x00},
- };
- 
- static const struct imx290_regval imx290_12bit_settings[] = {
--	{ 0x3005, 0x01 },
--	{ 0x3046, 0x01 },
--	{ 0x3129, 0x00 },
--	{ 0x317c, 0x00 },
--	{ 0x31ec, 0x0e },
--	{ 0x3441, 0x0c },
--	{ 0x3442, 0x0c },
--	{ 0x300a, 0xf0 },
--	{ 0x300b, 0x00 },
-+	{ IMX290_REG_8BIT(0x3005), 0x01 },
-+	{ IMX290_REG_8BIT(0x3046), 0x01 },
-+	{ IMX290_REG_8BIT(0x3129), 0x00 },
-+	{ IMX290_REG_8BIT(0x317c), 0x00 },
-+	{ IMX290_REG_8BIT(0x31ec), 0x0e },
-+	{ IMX290_REG_8BIT(0x3441), 0x0c },
-+	{ IMX290_REG_8BIT(0x3442), 0x0c },
-+	{ IMX290_REG_8BIT(0x300a), 0xf0 },
-+	{ IMX290_REG_8BIT(0x300b), 0x00 },
- };
- 
- /* supported link frequencies */
-@@ -362,33 +368,35 @@ static inline struct imx290 *to_imx290(s
- 	return container_of(_sd, struct imx290, sd);
- }
- 
--static inline int __always_unused imx290_read_reg(struct imx290 *imx290, u16 addr, u8 *value)
-+static int __always_unused imx290_read_reg(struct imx290 *imx290, u32 addr, u32 *value)
- {
--	unsigned int regval;
-+	u8 data[3] = { 0, 0, 0 };
- 	int ret;
- 
--	ret = regmap_read(imx290->regmap, addr, &regval);
--	if (ret) {
--		dev_err(imx290->dev, "Failed to read register 0x%04x: %d\n",
--			addr, ret);
-+	ret = regmap_raw_read(imx290->regmap, addr & IMX290_REG_ADDR_MASK,
-+			      data, (addr >> IMX290_REG_SIZE_SHIFT) & 3);
-+	if (ret < 0) {
-+		dev_err(imx290->dev, "%u-bit read from 0x%04x failed: %d\n",
-+			 ((addr >> IMX290_REG_SIZE_SHIFT) & 3) * 8,
-+			 addr & IMX290_REG_ADDR_MASK, ret);
- 		return ret;
- 	}
- 
--	*value = regval & 0xff;
--
-+	*value = (data[2] << 16) | (data[1] << 8) | data[0];
- 	return 0;
- }
- 
--static int imx290_write_reg(struct imx290 *imx290, u16 addr, u8 value)
-+static int imx290_write_reg(struct imx290 *imx290, u32 addr, u32 value)
- {
-+	u8 data[3] = { value & 0xff, (value >> 8) & 0xff, value >> 16 };
- 	int ret;
- 
--	ret = regmap_write(imx290->regmap, addr, value);
--	if (ret) {
--		dev_err(imx290->dev, "Failed to write register 0x%04x: %d\n",
--			addr, ret);
--		return ret;
--	}
-+	ret = regmap_raw_write(imx290->regmap, addr & IMX290_REG_ADDR_MASK,
-+			       data, (addr >> IMX290_REG_SIZE_SHIFT) & 3);
-+	if (ret < 0)
-+		dev_err(imx290->dev, "%u-bit write to 0x%04x failed: %d\n",
-+			 ((addr >> IMX290_REG_SIZE_SHIFT) & 3) * 8,
-+			 addr & IMX290_REG_ADDR_MASK, ret);
- 
- 	return ret;
- }
diff --git a/target/linux/bcm27xx/patches-6.1/950-0619-media-i2c-imx290-Correct-register-sizes.patch b/target/linux/bcm27xx/patches-6.1/950-0619-media-i2c-imx290-Correct-register-sizes.patch
deleted file mode 100644
index 2c6ebf1a86..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0619-media-i2c-imx290-Correct-register-sizes.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From babb7bfc9e6eb5b0484912f72636a81cd38db3d1 Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Sun, 16 Oct 2022 09:15:12 +0300
-Subject: [PATCH] media: i2c: imx290: Correct register sizes
-
-Upstream commit 454a86f33dd0.
-
-Define registers with the appropriate size, using the variable-size
-register access mechanism that has just been introduced. This simplifies
-the code.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 39 +++++++++-----------------------------
- 1 file changed, 9 insertions(+), 30 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -32,12 +32,11 @@
- #define IMX290_REGHOLD					IMX290_REG_8BIT(0x3001)
- #define IMX290_XMSTA					IMX290_REG_8BIT(0x3002)
- #define IMX290_FR_FDG_SEL				IMX290_REG_8BIT(0x3009)
--#define IMX290_BLKLEVEL_LOW				IMX290_REG_8BIT(0x300a)
--#define IMX290_BLKLEVEL_HIGH				IMX290_REG_8BIT(0x300b)
-+#define IMX290_BLKLEVEL					IMX290_REG_16BIT(0x300a)
- #define IMX290_GAIN					IMX290_REG_8BIT(0x3014)
--#define IMX290_HMAX_LOW					IMX290_REG_8BIT(0x301c)
--#define IMX290_HMAX_HIGH				IMX290_REG_8BIT(0x301d)
-+#define IMX290_HMAX					IMX290_REG_16BIT(0x301c)
- #define IMX290_PGCTRL					IMX290_REG_8BIT(0x308c)
-+#define IMX290_CHIP_ID					IMX290_REG_16BIT(0x319a)
- #define IMX290_PHY_LANE_NUM				IMX290_REG_8BIT(0x3407)
- #define IMX290_CSI_LANE_MODE				IMX290_REG_8BIT(0x3443)
- 
-@@ -461,8 +460,7 @@ static int imx290_set_ctrl(struct v4l2_c
- 		break;
- 	case V4L2_CID_TEST_PATTERN:
- 		if (ctrl->val) {
--			imx290_write_reg(imx290, IMX290_BLKLEVEL_LOW, 0x00);
--			imx290_write_reg(imx290, IMX290_BLKLEVEL_HIGH, 0x00);
-+			imx290_write_reg(imx290, IMX290_BLKLEVEL, 0);
- 			usleep_range(10000, 11000);
- 			imx290_write_reg(imx290, IMX290_PGCTRL,
- 					 (u8)(IMX290_PGCTRL_REGEN |
-@@ -472,12 +470,11 @@ static int imx290_set_ctrl(struct v4l2_c
- 			imx290_write_reg(imx290, IMX290_PGCTRL, 0x00);
- 			usleep_range(10000, 11000);
- 			if (imx290->bpp == 10)
--				imx290_write_reg(imx290, IMX290_BLKLEVEL_LOW,
-+				imx290_write_reg(imx290, IMX290_BLKLEVEL,
- 						 0x3c);
- 			else /* 12 bits per pixel */
--				imx290_write_reg(imx290, IMX290_BLKLEVEL_LOW,
-+				imx290_write_reg(imx290, IMX290_BLKLEVEL,
- 						 0xf0);
--			imx290_write_reg(imx290, IMX290_BLKLEVEL_HIGH, 0x00);
- 		}
- 		break;
- 	default:
-@@ -669,25 +666,6 @@ static int imx290_write_current_format(s
- 	return 0;
- }
- 
--static int imx290_set_hmax(struct imx290 *imx290, u32 val)
--{
--	int ret;
--
--	ret = imx290_write_reg(imx290, IMX290_HMAX_LOW, (val & 0xff));
--	if (ret) {
--		dev_err(imx290->dev, "Error setting HMAX register\n");
--		return ret;
--	}
--
--	ret = imx290_write_reg(imx290, IMX290_HMAX_HIGH, ((val >> 8) & 0xff));
--	if (ret) {
--		dev_err(imx290->dev, "Error setting HMAX register\n");
--		return ret;
--	}
--
--	return 0;
--}
--
- /* Start streaming */
- static int imx290_start_streaming(struct imx290 *imx290)
- {
-@@ -716,8 +694,9 @@ static int imx290_start_streaming(struct
- 		dev_err(imx290->dev, "Could not set current mode\n");
- 		return ret;
- 	}
--	ret = imx290_set_hmax(imx290, imx290->current_mode->hmax);
--	if (ret < 0)
-+
-+	ret = imx290_write_reg(imx290, IMX290_HMAX, imx290->current_mode->hmax);
-+	if (ret)
- 		return ret;
- 
- 	/* Apply customized values from user */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0620-media-i2c-imx290-Simplify-error-handling-when-writin.patch b/target/linux/bcm27xx/patches-6.1/950-0620-media-i2c-imx290-Simplify-error-handling-when-writin.patch
deleted file mode 100644
index bd36c22f6e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0620-media-i2c-imx290-Simplify-error-handling-when-writin.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-From a04966a5f739570c32ac6bcc44c68643bf836780 Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Sun, 16 Oct 2022 09:15:13 +0300
-Subject: [PATCH] media: i2c: imx290: Simplify error handling when
- writing registers
-
-Upstream commit e611f3dac54c.
-
-Error handling for register writes requires checking the error status of
-every single write. This makes the code complex, or incorrect when the
-checks are omitted. Simplify this by passing a pointer to an error code
-to the imx290_write_reg() function, which allows writing multiple
-registers in a row and only checking for errors at the end.
-
-While at it, rename imx290_write_reg() to imx290_write() as there's
-nothing else than registers to write, and rename imx290_read_reg()
-accordingly.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 86 ++++++++++++++------------------------
- 1 file changed, 32 insertions(+), 54 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -367,7 +367,7 @@ static inline struct imx290 *to_imx290(s
- 	return container_of(_sd, struct imx290, sd);
- }
- 
--static int __always_unused imx290_read_reg(struct imx290 *imx290, u32 addr, u32 *value)
-+static int __always_unused imx290_read(struct imx290 *imx290, u32 addr, u32 *value)
- {
- 	u8 data[3] = { 0, 0, 0 };
- 	int ret;
-@@ -385,17 +385,23 @@ static int __always_unused imx290_read_r
- 	return 0;
- }
- 
--static int imx290_write_reg(struct imx290 *imx290, u32 addr, u32 value)
-+static int imx290_write(struct imx290 *imx290, u32 addr, u32 value, int *err)
- {
- 	u8 data[3] = { value & 0xff, (value >> 8) & 0xff, value >> 16 };
- 	int ret;
- 
-+	if (err && *err)
-+		return *err;
-+
- 	ret = regmap_raw_write(imx290->regmap, addr & IMX290_REG_ADDR_MASK,
- 			       data, (addr >> IMX290_REG_SIZE_SHIFT) & 3);
--	if (ret < 0)
-+	if (ret < 0) {
- 		dev_err(imx290->dev, "%u-bit write to 0x%04x failed: %d\n",
- 			 ((addr >> IMX290_REG_SIZE_SHIFT) & 3) * 8,
- 			 addr & IMX290_REG_ADDR_MASK, ret);
-+		if (err)
-+			*err = ret;
-+	}
- 
- 	return ret;
- }
-@@ -408,7 +414,7 @@ static int imx290_set_register_array(str
- 	int ret;
- 
- 	for (i = 0; i < num_settings; ++i, ++settings) {
--		ret = imx290_write_reg(imx290, settings->reg, settings->val);
-+		ret = imx290_write(imx290, settings->reg, settings->val, NULL);
- 		if (ret < 0)
- 			return ret;
- 	}
-@@ -419,29 +425,16 @@ static int imx290_set_register_array(str
- 	return 0;
- }
- 
--static int imx290_set_gain(struct imx290 *imx290, u32 value)
--{
--	int ret;
--
--	ret = imx290_write_reg(imx290, IMX290_GAIN, value);
--	if (ret)
--		dev_err(imx290->dev, "Unable to write gain\n");
--
--	return ret;
--}
--
- /* Stop streaming */
- static int imx290_stop_streaming(struct imx290 *imx290)
- {
--	int ret;
-+	int ret = 0;
- 
--	ret = imx290_write_reg(imx290, IMX290_STANDBY, 0x01);
--	if (ret < 0)
--		return ret;
-+	imx290_write(imx290, IMX290_STANDBY, 0x01, &ret);
- 
- 	msleep(30);
- 
--	return imx290_write_reg(imx290, IMX290_XMSTA, 0x01);
-+	return imx290_write(imx290, IMX290_XMSTA, 0x01, &ret);
- }
- 
- static int imx290_set_ctrl(struct v4l2_ctrl *ctrl)
-@@ -456,25 +449,25 @@ static int imx290_set_ctrl(struct v4l2_c
- 
- 	switch (ctrl->id) {
- 	case V4L2_CID_GAIN:
--		ret = imx290_set_gain(imx290, ctrl->val);
-+		ret = imx290_write(imx290, IMX290_GAIN, ctrl->val, NULL);
- 		break;
- 	case V4L2_CID_TEST_PATTERN:
- 		if (ctrl->val) {
--			imx290_write_reg(imx290, IMX290_BLKLEVEL, 0);
-+			imx290_write(imx290, IMX290_BLKLEVEL, 0, &ret);
- 			usleep_range(10000, 11000);
--			imx290_write_reg(imx290, IMX290_PGCTRL,
--					 (u8)(IMX290_PGCTRL_REGEN |
--					 IMX290_PGCTRL_THRU |
--					 IMX290_PGCTRL_MODE(ctrl->val)));
-+			imx290_write(imx290, IMX290_PGCTRL,
-+				     (u8)(IMX290_PGCTRL_REGEN |
-+				     IMX290_PGCTRL_THRU |
-+				     IMX290_PGCTRL_MODE(ctrl->val)), &ret);
- 		} else {
--			imx290_write_reg(imx290, IMX290_PGCTRL, 0x00);
-+			imx290_write(imx290, IMX290_PGCTRL, 0x00, &ret);
- 			usleep_range(10000, 11000);
- 			if (imx290->bpp == 10)
--				imx290_write_reg(imx290, IMX290_BLKLEVEL,
--						 0x3c);
-+				imx290_write(imx290, IMX290_BLKLEVEL, 0x3c,
-+					     &ret);
- 			else /* 12 bits per pixel */
--				imx290_write_reg(imx290, IMX290_BLKLEVEL,
--						 0xf0);
-+				imx290_write(imx290, IMX290_BLKLEVEL, 0xf0,
-+					     &ret);
- 		}
- 		break;
- 	default:
-@@ -695,7 +688,8 @@ static int imx290_start_streaming(struct
- 		return ret;
- 	}
- 
--	ret = imx290_write_reg(imx290, IMX290_HMAX, imx290->current_mode->hmax);
-+	ret = imx290_write(imx290, IMX290_HMAX, imx290->current_mode->hmax,
-+			   NULL);
- 	if (ret)
- 		return ret;
- 
-@@ -706,14 +700,12 @@ static int imx290_start_streaming(struct
- 		return ret;
- 	}
- 
--	ret = imx290_write_reg(imx290, IMX290_STANDBY, 0x00);
--	if (ret < 0)
--		return ret;
-+	imx290_write(imx290, IMX290_STANDBY, 0x00, &ret);
- 
- 	msleep(30);
- 
- 	/* Start streaming */
--	return imx290_write_reg(imx290, IMX290_XMSTA, 0x00);
-+	return imx290_write(imx290, IMX290_XMSTA, 0x00, &ret);
- }
- 
- static int imx290_set_stream(struct v4l2_subdev *sd, int enable)
-@@ -772,27 +764,13 @@ static int imx290_set_data_lanes(struct
- 		 * validated in probe itself
- 		 */
- 		dev_err(imx290->dev, "Lane configuration not supported\n");
--		ret = -EINVAL;
--		goto exit;
--	}
--
--	ret = imx290_write_reg(imx290, IMX290_PHY_LANE_NUM, laneval);
--	if (ret) {
--		dev_err(imx290->dev, "Error setting Physical Lane number register\n");
--		goto exit;
--	}
--
--	ret = imx290_write_reg(imx290, IMX290_CSI_LANE_MODE, laneval);
--	if (ret) {
--		dev_err(imx290->dev, "Error setting CSI Lane mode register\n");
--		goto exit;
-+		return -EINVAL;
- 	}
- 
--	ret = imx290_write_reg(imx290, IMX290_FR_FDG_SEL, frsel);
--	if (ret)
--		dev_err(imx290->dev, "Error setting FR/FDG SEL register\n");
-+	imx290_write(imx290, IMX290_PHY_LANE_NUM, laneval, &ret);
-+	imx290_write(imx290, IMX290_CSI_LANE_MODE, laneval, &ret);
-+	imx290_write(imx290, IMX290_FR_FDG_SEL, frsel, &ret);
- 
--exit:
- 	return ret;
- }
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0621-media-i2c-imx290-Define-more-register-macros.patch b/target/linux/bcm27xx/patches-6.1/950-0621-media-i2c-imx290-Define-more-register-macros.patch
deleted file mode 100644
index cd45f56ac9..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0621-media-i2c-imx290-Define-more-register-macros.patch
+++ /dev/null
@@ -1,294 +0,0 @@
-From 43a9d91f96b8206813d95dce2fd5bbcf5f3bf586 Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Mon, 17 Oct 2022 11:35:45 +0300
-Subject: [PATCH] media: i2c: imx290: Define more register macros
-
-Upstream commit 79d99ae8a77e.
-
-Define macros for all registers programmed by the driver for which
-documentation is available to increase readability. This starts making
-use of 16-bit registers in the register arrays, so the value field has
-to be increased to 32 bits.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Acked-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 219 +++++++++++++++++++++----------------
- 1 file changed, 124 insertions(+), 95 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -31,14 +31,73 @@
- #define IMX290_STANDBY					IMX290_REG_8BIT(0x3000)
- #define IMX290_REGHOLD					IMX290_REG_8BIT(0x3001)
- #define IMX290_XMSTA					IMX290_REG_8BIT(0x3002)
-+#define IMX290_ADBIT					IMX290_REG_8BIT(0x3005)
-+#define IMX290_ADBIT_10BIT				(0 << 0)
-+#define IMX290_ADBIT_12BIT				(1 << 0)
-+#define IMX290_CTRL_07					IMX290_REG_8BIT(0x3007)
-+#define IMX290_VREVERSE					BIT(0)
-+#define IMX290_HREVERSE					BIT(1)
-+#define IMX290_WINMODE_1080P				(0 << 4)
-+#define IMX290_WINMODE_720P				(1 << 4)
-+#define IMX290_WINMODE_CROP				(4 << 4)
- #define IMX290_FR_FDG_SEL				IMX290_REG_8BIT(0x3009)
- #define IMX290_BLKLEVEL					IMX290_REG_16BIT(0x300a)
- #define IMX290_GAIN					IMX290_REG_8BIT(0x3014)
-+#define IMX290_VMAX					IMX290_REG_24BIT(0x3018)
- #define IMX290_HMAX					IMX290_REG_16BIT(0x301c)
-+#define IMX290_SHS1					IMX290_REG_24BIT(0x3020)
-+#define IMX290_WINWV_OB					IMX290_REG_8BIT(0x303a)
-+#define IMX290_WINPV					IMX290_REG_16BIT(0x303c)
-+#define IMX290_WINWV					IMX290_REG_16BIT(0x303e)
-+#define IMX290_WINPH					IMX290_REG_16BIT(0x3040)
-+#define IMX290_WINWH					IMX290_REG_16BIT(0x3042)
-+#define IMX290_OUT_CTRL					IMX290_REG_8BIT(0x3046)
-+#define IMX290_ODBIT_10BIT				(0 << 0)
-+#define IMX290_ODBIT_12BIT				(1 << 0)
-+#define IMX290_OPORTSEL_PARALLEL			(0x0 << 4)
-+#define IMX290_OPORTSEL_LVDS_2CH			(0xd << 4)
-+#define IMX290_OPORTSEL_LVDS_4CH			(0xe << 4)
-+#define IMX290_OPORTSEL_LVDS_8CH			(0xf << 4)
-+#define IMX290_XSOUTSEL					IMX290_REG_8BIT(0x304b)
-+#define IMX290_XSOUTSEL_XVSOUTSEL_HIGH			(0 << 0)
-+#define IMX290_XSOUTSEL_XVSOUTSEL_VSYNC			(2 << 0)
-+#define IMX290_XSOUTSEL_XHSOUTSEL_HIGH			(0 << 2)
-+#define IMX290_XSOUTSEL_XHSOUTSEL_HSYNC			(2 << 2)
-+#define IMX290_INCKSEL1					IMX290_REG_8BIT(0x305c)
-+#define IMX290_INCKSEL2					IMX290_REG_8BIT(0x305d)
-+#define IMX290_INCKSEL3					IMX290_REG_8BIT(0x305e)
-+#define IMX290_INCKSEL4					IMX290_REG_8BIT(0x305f)
- #define IMX290_PGCTRL					IMX290_REG_8BIT(0x308c)
-+#define IMX290_ADBIT1					IMX290_REG_8BIT(0x3129)
-+#define IMX290_ADBIT1_10BIT				0x1d
-+#define IMX290_ADBIT1_12BIT				0x00
-+#define IMX290_INCKSEL5					IMX290_REG_8BIT(0x315e)
-+#define IMX290_INCKSEL6					IMX290_REG_8BIT(0x3164)
-+#define IMX290_ADBIT2					IMX290_REG_8BIT(0x317c)
-+#define IMX290_ADBIT2_10BIT				0x12
-+#define IMX290_ADBIT2_12BIT				0x00
- #define IMX290_CHIP_ID					IMX290_REG_16BIT(0x319a)
-+#define IMX290_ADBIT3					IMX290_REG_8BIT(0x31ec)
-+#define IMX290_ADBIT3_10BIT				0x37
-+#define IMX290_ADBIT3_12BIT				0x0e
-+#define IMX290_REPETITION				IMX290_REG_8BIT(0x3405)
- #define IMX290_PHY_LANE_NUM				IMX290_REG_8BIT(0x3407)
-+#define IMX290_OPB_SIZE_V				IMX290_REG_8BIT(0x3414)
-+#define IMX290_Y_OUT_SIZE				IMX290_REG_16BIT(0x3418)
-+#define IMX290_CSI_DT_FMT				IMX290_REG_16BIT(0x3441)
-+#define IMX290_CSI_DT_FMT_RAW10				0x0a0a
-+#define IMX290_CSI_DT_FMT_RAW12				0x0c0c
- #define IMX290_CSI_LANE_MODE				IMX290_REG_8BIT(0x3443)
-+#define IMX290_EXTCK_FREQ				IMX290_REG_16BIT(0x3444)
-+#define IMX290_TCLKPOST					IMX290_REG_16BIT(0x3446)
-+#define IMX290_THSZERO					IMX290_REG_16BIT(0x3448)
-+#define IMX290_THSPREPARE				IMX290_REG_16BIT(0x344a)
-+#define IMX290_TCLKTRAIL				IMX290_REG_16BIT(0x344c)
-+#define IMX290_THSTRAIL					IMX290_REG_16BIT(0x344e)
-+#define IMX290_TCLKZERO					IMX290_REG_16BIT(0x3450)
-+#define IMX290_TCLKPREPARE				IMX290_REG_16BIT(0x3452)
-+#define IMX290_TLPX					IMX290_REG_16BIT(0x3454)
-+#define IMX290_X_OUT_SIZE				IMX290_REG_16BIT(0x3472)
- 
- #define IMX290_PGCTRL_REGEN				BIT(0)
- #define IMX290_PGCTRL_THRU				BIT(1)
-@@ -54,7 +113,7 @@ static const char * const imx290_supply_
- 
- struct imx290_regval {
- 	u32 reg;
--	u8 val;
-+	u32 val;
- };
- 
- struct imx290_mode {
-@@ -116,22 +175,16 @@ static const char * const imx290_test_pa
- };
- 
- static const struct imx290_regval imx290_global_init_settings[] = {
--	{ IMX290_REG_8BIT(0x3007), 0x00 },
--	{ IMX290_REG_8BIT(0x3018), 0x65 },
--	{ IMX290_REG_8BIT(0x3019), 0x04 },
--	{ IMX290_REG_8BIT(0x301a), 0x00 },
--	{ IMX290_REG_8BIT(0x3444), 0x20 },
--	{ IMX290_REG_8BIT(0x3445), 0x25 },
--	{ IMX290_REG_8BIT(0x303a), 0x0c },
--	{ IMX290_REG_8BIT(0x3040), 0x00 },
--	{ IMX290_REG_8BIT(0x3041), 0x00 },
--	{ IMX290_REG_8BIT(0x303c), 0x00 },
--	{ IMX290_REG_8BIT(0x303d), 0x00 },
--	{ IMX290_REG_8BIT(0x3042), 0x9c },
--	{ IMX290_REG_8BIT(0x3043), 0x07 },
--	{ IMX290_REG_8BIT(0x303e), 0x49 },
--	{ IMX290_REG_8BIT(0x303f), 0x04 },
--	{ IMX290_REG_8BIT(0x304b), 0x0a },
-+	{ IMX290_CTRL_07, IMX290_WINMODE_1080P },
-+	{ IMX290_VMAX, 1125 },
-+	{ IMX290_EXTCK_FREQ, 0x2520 },
-+	{ IMX290_WINWV_OB, 12 },
-+	{ IMX290_WINPH, 0 },
-+	{ IMX290_WINPV, 0 },
-+	{ IMX290_WINWH, 1948 },
-+	{ IMX290_WINWV, 1097 },
-+	{ IMX290_XSOUTSEL, IMX290_XSOUTSEL_XVSOUTSEL_VSYNC |
-+			   IMX290_XSOUTSEL_XHSOUTSEL_HSYNC },
- 	{ IMX290_REG_8BIT(0x300f), 0x00 },
- 	{ IMX290_REG_8BIT(0x3010), 0x21 },
- 	{ IMX290_REG_8BIT(0x3012), 0x64 },
-@@ -177,102 +230,78 @@ static const struct imx290_regval imx290
- 
- static const struct imx290_regval imx290_1080p_settings[] = {
- 	/* mode settings */
--	{ IMX290_REG_8BIT(0x3007), 0x00 },
--	{ IMX290_REG_8BIT(0x303a), 0x0c },
--	{ IMX290_REG_8BIT(0x3414), 0x0a },
--	{ IMX290_REG_8BIT(0x3472), 0x80 },
--	{ IMX290_REG_8BIT(0x3473), 0x07 },
--	{ IMX290_REG_8BIT(0x3418), 0x38 },
--	{ IMX290_REG_8BIT(0x3419), 0x04 },
-+	{ IMX290_CTRL_07, IMX290_WINMODE_1080P },
-+	{ IMX290_WINWV_OB, 12 },
-+	{ IMX290_OPB_SIZE_V, 10 },
-+	{ IMX290_X_OUT_SIZE, 1920 },
-+	{ IMX290_Y_OUT_SIZE, 1080 },
- 	{ IMX290_REG_8BIT(0x3012), 0x64 },
- 	{ IMX290_REG_8BIT(0x3013), 0x00 },
--	{ IMX290_REG_8BIT(0x305c), 0x18 },
--	{ IMX290_REG_8BIT(0x305d), 0x03 },
--	{ IMX290_REG_8BIT(0x305e), 0x20 },
--	{ IMX290_REG_8BIT(0x305f), 0x01 },
--	{ IMX290_REG_8BIT(0x315e), 0x1a },
--	{ IMX290_REG_8BIT(0x3164), 0x1a },
-+	{ IMX290_INCKSEL1, 0x18 },
-+	{ IMX290_INCKSEL2, 0x03 },
-+	{ IMX290_INCKSEL3, 0x20 },
-+	{ IMX290_INCKSEL4, 0x01 },
-+	{ IMX290_INCKSEL5, 0x1a },
-+	{ IMX290_INCKSEL6, 0x1a },
- 	{ IMX290_REG_8BIT(0x3480), 0x49 },
- 	/* data rate settings */
--	{ IMX290_REG_8BIT(0x3405), 0x10 },
--	{ IMX290_REG_8BIT(0x3446), 0x57 },
--	{ IMX290_REG_8BIT(0x3447), 0x00 },
--	{ IMX290_REG_8BIT(0x3448), 0x37 },
--	{ IMX290_REG_8BIT(0x3449), 0x00 },
--	{ IMX290_REG_8BIT(0x344a), 0x1f },
--	{ IMX290_REG_8BIT(0x344b), 0x00 },
--	{ IMX290_REG_8BIT(0x344c), 0x1f },
--	{ IMX290_REG_8BIT(0x344d), 0x00 },
--	{ IMX290_REG_8BIT(0x344e), 0x1f },
--	{ IMX290_REG_8BIT(0x344f), 0x00 },
--	{ IMX290_REG_8BIT(0x3450), 0x77 },
--	{ IMX290_REG_8BIT(0x3451), 0x00 },
--	{ IMX290_REG_8BIT(0x3452), 0x1f },
--	{ IMX290_REG_8BIT(0x3453), 0x00 },
--	{ IMX290_REG_8BIT(0x3454), 0x17 },
--	{ IMX290_REG_8BIT(0x3455), 0x00 },
-+	{ IMX290_REPETITION, 0x10 },
-+	{ IMX290_TCLKPOST, 87 },
-+	{ IMX290_THSZERO, 55 },
-+	{ IMX290_THSPREPARE, 31 },
-+	{ IMX290_TCLKTRAIL, 31 },
-+	{ IMX290_THSTRAIL, 31 },
-+	{ IMX290_TCLKZERO, 119 },
-+	{ IMX290_TCLKPREPARE, 31 },
-+	{ IMX290_TLPX, 23 },
- };
- 
- static const struct imx290_regval imx290_720p_settings[] = {
- 	/* mode settings */
--	{ IMX290_REG_8BIT(0x3007), 0x10 },
--	{ IMX290_REG_8BIT(0x303a), 0x06 },
--	{ IMX290_REG_8BIT(0x3414), 0x04 },
--	{ IMX290_REG_8BIT(0x3472), 0x00 },
--	{ IMX290_REG_8BIT(0x3473), 0x05 },
--	{ IMX290_REG_8BIT(0x3418), 0xd0 },
--	{ IMX290_REG_8BIT(0x3419), 0x02 },
-+	{ IMX290_CTRL_07, IMX290_WINMODE_720P },
-+	{ IMX290_WINWV_OB, 6 },
-+	{ IMX290_OPB_SIZE_V, 4 },
-+	{ IMX290_X_OUT_SIZE, 1280 },
-+	{ IMX290_Y_OUT_SIZE, 720 },
- 	{ IMX290_REG_8BIT(0x3012), 0x64 },
- 	{ IMX290_REG_8BIT(0x3013), 0x00 },
--	{ IMX290_REG_8BIT(0x305c), 0x20 },
--	{ IMX290_REG_8BIT(0x305d), 0x00 },
--	{ IMX290_REG_8BIT(0x305e), 0x20 },
--	{ IMX290_REG_8BIT(0x305f), 0x01 },
--	{ IMX290_REG_8BIT(0x315e), 0x1a },
--	{ IMX290_REG_8BIT(0x3164), 0x1a },
-+	{ IMX290_INCKSEL1, 0x20 },
-+	{ IMX290_INCKSEL2, 0x00 },
-+	{ IMX290_INCKSEL3, 0x20 },
-+	{ IMX290_INCKSEL4, 0x01 },
-+	{ IMX290_INCKSEL5, 0x1a },
-+	{ IMX290_INCKSEL6, 0x1a },
- 	{ IMX290_REG_8BIT(0x3480), 0x49 },
- 	/* data rate settings */
--	{ IMX290_REG_8BIT(0x3405), 0x10 },
--	{ IMX290_REG_8BIT(0x3446), 0x4f },
--	{ IMX290_REG_8BIT(0x3447), 0x00 },
--	{ IMX290_REG_8BIT(0x3448), 0x2f },
--	{ IMX290_REG_8BIT(0x3449), 0x00 },
--	{ IMX290_REG_8BIT(0x344a), 0x17 },
--	{ IMX290_REG_8BIT(0x344b), 0x00 },
--	{ IMX290_REG_8BIT(0x344c), 0x17 },
--	{ IMX290_REG_8BIT(0x344d), 0x00 },
--	{ IMX290_REG_8BIT(0x344e), 0x17 },
--	{ IMX290_REG_8BIT(0x344f), 0x00 },
--	{ IMX290_REG_8BIT(0x3450), 0x57 },
--	{ IMX290_REG_8BIT(0x3451), 0x00 },
--	{ IMX290_REG_8BIT(0x3452), 0x17 },
--	{ IMX290_REG_8BIT(0x3453), 0x00 },
--	{ IMX290_REG_8BIT(0x3454), 0x17 },
--	{ IMX290_REG_8BIT(0x3455), 0x00 },
-+	{ IMX290_REPETITION, 0x10 },
-+	{ IMX290_TCLKPOST, 79 },
-+	{ IMX290_THSZERO, 47 },
-+	{ IMX290_THSPREPARE, 23 },
-+	{ IMX290_TCLKTRAIL, 23 },
-+	{ IMX290_THSTRAIL, 23 },
-+	{ IMX290_TCLKZERO, 87 },
-+	{ IMX290_TCLKPREPARE, 23 },
-+	{ IMX290_TLPX, 23 },
- };
- 
- static const struct imx290_regval imx290_10bit_settings[] = {
--	{ IMX290_REG_8BIT(0x3005), 0x00},
--	{ IMX290_REG_8BIT(0x3046), 0x00},
--	{ IMX290_REG_8BIT(0x3129), 0x1d},
--	{ IMX290_REG_8BIT(0x317c), 0x12},
--	{ IMX290_REG_8BIT(0x31ec), 0x37},
--	{ IMX290_REG_8BIT(0x3441), 0x0a},
--	{ IMX290_REG_8BIT(0x3442), 0x0a},
--	{ IMX290_REG_8BIT(0x300a), 0x3c},
--	{ IMX290_REG_8BIT(0x300b), 0x00},
-+	{ IMX290_ADBIT, IMX290_ADBIT_10BIT },
-+	{ IMX290_OUT_CTRL, IMX290_ODBIT_10BIT },
-+	{ IMX290_ADBIT1, IMX290_ADBIT1_10BIT },
-+	{ IMX290_ADBIT2, IMX290_ADBIT2_10BIT },
-+	{ IMX290_ADBIT3, IMX290_ADBIT3_10BIT },
-+	{ IMX290_CSI_DT_FMT, IMX290_CSI_DT_FMT_RAW10 },
-+	{ IMX290_BLKLEVEL, 60 },
- };
- 
- static const struct imx290_regval imx290_12bit_settings[] = {
--	{ IMX290_REG_8BIT(0x3005), 0x01 },
--	{ IMX290_REG_8BIT(0x3046), 0x01 },
--	{ IMX290_REG_8BIT(0x3129), 0x00 },
--	{ IMX290_REG_8BIT(0x317c), 0x00 },
--	{ IMX290_REG_8BIT(0x31ec), 0x0e },
--	{ IMX290_REG_8BIT(0x3441), 0x0c },
--	{ IMX290_REG_8BIT(0x3442), 0x0c },
--	{ IMX290_REG_8BIT(0x300a), 0xf0 },
--	{ IMX290_REG_8BIT(0x300b), 0x00 },
-+	{ IMX290_ADBIT, IMX290_ADBIT_12BIT },
-+	{ IMX290_OUT_CTRL, IMX290_ODBIT_12BIT },
-+	{ IMX290_ADBIT1, IMX290_ADBIT1_12BIT },
-+	{ IMX290_ADBIT2, IMX290_ADBIT2_12BIT },
-+	{ IMX290_ADBIT3, IMX290_ADBIT3_12BIT },
-+	{ IMX290_CSI_DT_FMT, IMX290_CSI_DT_FMT_RAW12 },
-+	{ IMX290_BLKLEVEL, 240 },
- };
- 
- /* supported link frequencies */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0622-media-i2c-imx290-Add-exposure-time-control.patch b/target/linux/bcm27xx/patches-6.1/950-0622-media-i2c-imx290-Add-exposure-time-control.patch
deleted file mode 100644
index 8bca0ae647..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0622-media-i2c-imx290-Add-exposure-time-control.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From ead4ef32c120f20ee9b1d8f9f0a4f75c2dc14af3 Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Sun, 16 Oct 2022 09:15:15 +0300
-Subject: [PATCH] media: i2c: imx290: Add exposure time control
-
-Upstream commit 827c7e69cb2d.
-
-Support configuring the exposure time, which is expressed as the
-complement of the exposure time (frame period minus integration time).
-The frame period is currently fixed.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Acked-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 16 ++++++++++++++--
- 1 file changed, 14 insertions(+), 2 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -103,6 +103,8 @@
- #define IMX290_PGCTRL_THRU				BIT(1)
- #define IMX290_PGCTRL_MODE(n)				((n) << 4)
- 
-+#define IMX290_VMAX_DEFAULT				1125
-+
- static const char * const imx290_supply_name[] = {
- 	"vdda",
- 	"vddd",
-@@ -176,7 +178,7 @@ static const char * const imx290_test_pa
- 
- static const struct imx290_regval imx290_global_init_settings[] = {
- 	{ IMX290_CTRL_07, IMX290_WINMODE_1080P },
--	{ IMX290_VMAX, 1125 },
-+	{ IMX290_VMAX, IMX290_VMAX_DEFAULT },
- 	{ IMX290_EXTCK_FREQ, 0x2520 },
- 	{ IMX290_WINWV_OB, 12 },
- 	{ IMX290_WINPH, 0 },
-@@ -480,6 +482,12 @@ static int imx290_set_ctrl(struct v4l2_c
- 	case V4L2_CID_GAIN:
- 		ret = imx290_write(imx290, IMX290_GAIN, ctrl->val, NULL);
- 		break;
-+
-+	case V4L2_CID_EXPOSURE:
-+		ret = imx290_write(imx290, IMX290_SHS1,
-+				   IMX290_VMAX_DEFAULT - ctrl->val - 1, NULL);
-+		break;
-+
- 	case V4L2_CID_TEST_PATTERN:
- 		if (ctrl->val) {
- 			imx290_write(imx290, IMX290_BLKLEVEL, 0, &ret);
-@@ -1008,12 +1016,16 @@ static int imx290_probe(struct i2c_clien
- 	 */
- 	imx290_entity_init_cfg(&imx290->sd, NULL);
- 
--	v4l2_ctrl_handler_init(&imx290->ctrls, 4);
-+	v4l2_ctrl_handler_init(&imx290->ctrls, 5);
- 	imx290->ctrls.lock = &imx290->lock;
- 
- 	v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
- 			  V4L2_CID_GAIN, 0, 72, 1, 0);
- 
-+	v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
-+			  V4L2_CID_EXPOSURE, 1, IMX290_VMAX_DEFAULT - 2, 1,
-+			  IMX290_VMAX_DEFAULT - 2);
-+
- 	imx290->link_freq =
- 		v4l2_ctrl_new_int_menu(&imx290->ctrls, &imx290_ctrl_ops,
- 				       V4L2_CID_LINK_FREQ,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0623-media-i2c-imx290-Fix-max-gain-value.patch b/target/linux/bcm27xx/patches-6.1/950-0623-media-i2c-imx290-Fix-max-gain-value.patch
deleted file mode 100644
index 2a5200f527..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0623-media-i2c-imx290-Fix-max-gain-value.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From cf16974cd2daa3ae3fa3faf7c12c8b2d44828950 Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Sun, 16 Oct 2022 09:15:16 +0300
-Subject: [PATCH] media: i2c: imx290: Fix max gain value
-
-Upstream commit 6d7a87f2d3a6.
-
-The gain is expressed in multiple of 0.3dB, as a value between 0.0dB
-and 72.0dB. Gains between 0.0dB and 30.0dB (included) apply analog gain
-only, higher gains from 30.3dB to 72dB apply additional digital gain.
-
-The maximum gain value is erroneously set to 72. Increase it to 100 to
-cover the whole analog gain range. Support for digital gain can be added
-separately if needed.
-
-The IMX327 and IMX462 are largely compatible with the IMX290, but have
-an analog gain range of 0.0dB to 29.4dB and 42dB of digital gain. When
-support for those sensors gets added to the driver, the gain control
-should be adjusted accordingly.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 15 ++++++++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -1019,8 +1019,21 @@ static int imx290_probe(struct i2c_clien
- 	v4l2_ctrl_handler_init(&imx290->ctrls, 5);
- 	imx290->ctrls.lock = &imx290->lock;
- 
-+	/*
-+	 * The sensor has an analog gain and a digital gain, both controlled
-+	 * through a single gain value, expressed in 0.3dB increments. Values
-+	 * from 0.0dB (0) to 30.0dB (100) apply analog gain only, higher values
-+	 * up to 72.0dB (240) add further digital gain. Limit the range to
-+	 * analog gain only, support for digital gain can be added separately
-+	 * if needed.
-+	 *
-+	 * The IMX327 and IMX462 are largely compatible with the IMX290, but
-+	 * have an analog gain range of 0.0dB to 29.4dB and 42dB of digital
-+	 * gain. When support for those sensors gets added to the driver, the
-+	 * gain control should be adjusted accordingly.
-+	 */
- 	v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
--			  V4L2_CID_GAIN, 0, 72, 1, 0);
-+			  V4L2_CID_GAIN, 0, 100, 1, 0);
- 
- 	v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
- 			  V4L2_CID_EXPOSURE, 1, IMX290_VMAX_DEFAULT - 2, 1,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0624-media-i2c-imx290-Split-control-initialization-to-sep.patch b/target/linux/bcm27xx/patches-6.1/950-0624-media-i2c-imx290-Split-control-initialization-to-sep.patch
deleted file mode 100644
index 5ce44ac638..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0624-media-i2c-imx290-Split-control-initialization-to-sep.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From 53bfa82420b36fb13c8efac38b7a334ea5e71a3c Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Sun, 16 Oct 2022 09:15:17 +0300
-Subject: [PATCH] media: i2c: imx290: Split control initialization to
- separate function
-
-Upstream commit 72c87b7ad560.
-
-The imx290_probe() function is too large. Split control initialzation to
-a dedicated function to increase code readability.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Acked-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 109 +++++++++++++++++++++----------------
- 1 file changed, 61 insertions(+), 48 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -878,6 +878,62 @@ static const struct media_entity_operati
- 	.link_validate = v4l2_subdev_link_validate,
- };
- 
-+static int imx290_ctrl_init(struct imx290 *imx290)
-+{
-+	int ret;
-+
-+	v4l2_ctrl_handler_init(&imx290->ctrls, 5);
-+	imx290->ctrls.lock = &imx290->lock;
-+
-+	/*
-+	 * The sensor has an analog gain and a digital gain, both controlled
-+	 * through a single gain value, expressed in 0.3dB increments. Values
-+	 * from 0.0dB (0) to 30.0dB (100) apply analog gain only, higher values
-+	 * up to 72.0dB (240) add further digital gain. Limit the range to
-+	 * analog gain only, support for digital gain can be added separately
-+	 * if needed.
-+	 *
-+	 * The IMX327 and IMX462 are largely compatible with the IMX290, but
-+	 * have an analog gain range of 0.0dB to 29.4dB and 42dB of digital
-+	 * gain. When support for those sensors gets added to the driver, the
-+	 * gain control should be adjusted accordingly.
-+	 */
-+	v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
-+			  V4L2_CID_GAIN, 0, 100, 1, 0);
-+
-+	v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
-+			  V4L2_CID_EXPOSURE, 1, IMX290_VMAX_DEFAULT - 2, 1,
-+			  IMX290_VMAX_DEFAULT - 2);
-+
-+	imx290->link_freq =
-+		v4l2_ctrl_new_int_menu(&imx290->ctrls, &imx290_ctrl_ops,
-+				       V4L2_CID_LINK_FREQ,
-+				       imx290_link_freqs_num(imx290) - 1, 0,
-+				       imx290_link_freqs_ptr(imx290));
-+	if (imx290->link_freq)
-+		imx290->link_freq->flags |= V4L2_CTRL_FLAG_READ_ONLY;
-+
-+	imx290->pixel_rate = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
-+					       V4L2_CID_PIXEL_RATE,
-+					       1, INT_MAX, 1,
-+					       imx290_calc_pixel_rate(imx290));
-+
-+	v4l2_ctrl_new_std_menu_items(&imx290->ctrls, &imx290_ctrl_ops,
-+				     V4L2_CID_TEST_PATTERN,
-+				     ARRAY_SIZE(imx290_test_pattern_menu) - 1,
-+				     0, 0, imx290_test_pattern_menu);
-+
-+	imx290->sd.ctrl_handler = &imx290->ctrls;
-+
-+	if (imx290->ctrls.error) {
-+		ret = imx290->ctrls.error;
-+		v4l2_ctrl_handler_free(&imx290->ctrls);
-+		return ret;
-+	}
-+
-+	return 0;
-+}
-+
- /*
-  * Returns 0 if all link frequencies used by the driver for the given number
-  * of MIPI data lanes are mentioned in the device tree, or the value of the
-@@ -1016,54 +1072,10 @@ static int imx290_probe(struct i2c_clien
- 	 */
- 	imx290_entity_init_cfg(&imx290->sd, NULL);
- 
--	v4l2_ctrl_handler_init(&imx290->ctrls, 5);
--	imx290->ctrls.lock = &imx290->lock;
--
--	/*
--	 * The sensor has an analog gain and a digital gain, both controlled
--	 * through a single gain value, expressed in 0.3dB increments. Values
--	 * from 0.0dB (0) to 30.0dB (100) apply analog gain only, higher values
--	 * up to 72.0dB (240) add further digital gain. Limit the range to
--	 * analog gain only, support for digital gain can be added separately
--	 * if needed.
--	 *
--	 * The IMX327 and IMX462 are largely compatible with the IMX290, but
--	 * have an analog gain range of 0.0dB to 29.4dB and 42dB of digital
--	 * gain. When support for those sensors gets added to the driver, the
--	 * gain control should be adjusted accordingly.
--	 */
--	v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
--			  V4L2_CID_GAIN, 0, 100, 1, 0);
--
--	v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
--			  V4L2_CID_EXPOSURE, 1, IMX290_VMAX_DEFAULT - 2, 1,
--			  IMX290_VMAX_DEFAULT - 2);
--
--	imx290->link_freq =
--		v4l2_ctrl_new_int_menu(&imx290->ctrls, &imx290_ctrl_ops,
--				       V4L2_CID_LINK_FREQ,
--				       imx290_link_freqs_num(imx290) - 1, 0,
--				       imx290_link_freqs_ptr(imx290));
--	if (imx290->link_freq)
--		imx290->link_freq->flags |= V4L2_CTRL_FLAG_READ_ONLY;
--
--	imx290->pixel_rate = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
--					       V4L2_CID_PIXEL_RATE,
--					       1, INT_MAX, 1,
--					       imx290_calc_pixel_rate(imx290));
--
--	v4l2_ctrl_new_std_menu_items(&imx290->ctrls, &imx290_ctrl_ops,
--				     V4L2_CID_TEST_PATTERN,
--				     ARRAY_SIZE(imx290_test_pattern_menu) - 1,
--				     0, 0, imx290_test_pattern_menu);
--
--	imx290->sd.ctrl_handler = &imx290->ctrls;
--
--	if (imx290->ctrls.error) {
--		dev_err(dev, "Control initialization error %d\n",
--			imx290->ctrls.error);
--		ret = imx290->ctrls.error;
--		goto free_ctrl;
-+	ret = imx290_ctrl_init(imx290);
-+	if (ret < 0) {
-+		dev_err(dev, "Control initialization error %d\n", ret);
-+		goto free_mutex;
- 	}
- 
- 	v4l2_i2c_subdev_init(&imx290->sd, client, &imx290_subdev_ops);
-@@ -1104,6 +1116,7 @@ free_entity:
- 	media_entity_cleanup(&imx290->sd.entity);
- free_ctrl:
- 	v4l2_ctrl_handler_free(&imx290->ctrls);
-+free_mutex:
- 	mutex_destroy(&imx290->lock);
- free_err:
- 	v4l2_fwnode_endpoint_free(&ep);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0625-media-i2c-imx290-Implement-HBLANK-and-VBLANK-control.patch b/target/linux/bcm27xx/patches-6.1/950-0625-media-i2c-imx290-Implement-HBLANK-and-VBLANK-control.patch
deleted file mode 100644
index cf076239bd..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0625-media-i2c-imx290-Implement-HBLANK-and-VBLANK-control.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From eefa9ce2af54be4a6fa33add2c3d0ddac2739622 Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Sun, 16 Oct 2022 09:15:18 +0300
-Subject: [PATCH] media: i2c: imx290: Implement HBLANK and VBLANK
- controls
-
-Upstream commit 0c3b56c905e3.
-
-Add support for the V4L2_CID_HBLANK and V4L2_CID_VBLANK controls to the
-imx290 driver. Make the controls read-only to start with, to report the
-values to userspace for timing calculation.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 33 ++++++++++++++++++++++++++++++++-
- 1 file changed, 32 insertions(+), 1 deletion(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -146,6 +146,8 @@ struct imx290 {
- 	struct v4l2_ctrl_handler ctrls;
- 	struct v4l2_ctrl *link_freq;
- 	struct v4l2_ctrl *pixel_rate;
-+	struct v4l2_ctrl *hblank;
-+	struct v4l2_ctrl *vblank;
- 
- 	struct mutex lock;
- };
-@@ -642,6 +644,20 @@ static int imx290_set_fmt(struct v4l2_su
- 		if (imx290->pixel_rate)
- 			__v4l2_ctrl_s_ctrl_int64(imx290->pixel_rate,
- 						 imx290_calc_pixel_rate(imx290));
-+
-+		if (imx290->hblank) {
-+			unsigned int hblank = mode->hmax - mode->width;
-+
-+			__v4l2_ctrl_modify_range(imx290->hblank, hblank, hblank,
-+						 1, hblank);
-+		}
-+
-+		if (imx290->vblank) {
-+			unsigned int vblank = IMX290_VMAX_DEFAULT - mode->height;
-+
-+			__v4l2_ctrl_modify_range(imx290->vblank, vblank, vblank,
-+						 1, vblank);
-+		}
- 	}
- 
- 	*format = fmt->format;
-@@ -880,9 +896,10 @@ static const struct media_entity_operati
- 
- static int imx290_ctrl_init(struct imx290 *imx290)
- {
-+	unsigned int blank;
- 	int ret;
- 
--	v4l2_ctrl_handler_init(&imx290->ctrls, 5);
-+	v4l2_ctrl_handler_init(&imx290->ctrls, 7);
- 	imx290->ctrls.lock = &imx290->lock;
- 
- 	/*
-@@ -923,6 +940,20 @@ static int imx290_ctrl_init(struct imx29
- 				     ARRAY_SIZE(imx290_test_pattern_menu) - 1,
- 				     0, 0, imx290_test_pattern_menu);
- 
-+	blank = imx290->current_mode->hmax - imx290->current_mode->width;
-+	imx290->hblank = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
-+					   V4L2_CID_HBLANK, blank, blank, 1,
-+					   blank);
-+	if (imx290->hblank)
-+		imx290->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
-+
-+	blank = IMX290_VMAX_DEFAULT - imx290->current_mode->height;
-+	imx290->vblank = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
-+					   V4L2_CID_VBLANK, blank, blank, 1,
-+					   blank);
-+	if (imx290->vblank)
-+		imx290->vblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
-+
- 	imx290->sd.ctrl_handler = &imx290->ctrls;
- 
- 	if (imx290->ctrls.error) {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0626-media-i2c-imx290-Create-controls-for-fwnode-properti.patch b/target/linux/bcm27xx/patches-6.1/950-0626-media-i2c-imx290-Create-controls-for-fwnode-properti.patch
deleted file mode 100644
index 13f0c4c6b3..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0626-media-i2c-imx290-Create-controls-for-fwnode-properti.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 10594f95e425d0eb7d36344cac5f276ab7e99658 Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Sun, 16 Oct 2022 09:15:19 +0300
-Subject: [PATCH] media: i2c: imx290: Create controls for fwnode
- properties
-
-Upstream commit 4c9c93cf8657.
-
-Create the V4L2_CID_ORIENTATION and V4L2_CID_ROTATION controls to
-expose the corresponding fwnode properties.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Acked-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -896,10 +896,15 @@ static const struct media_entity_operati
- 
- static int imx290_ctrl_init(struct imx290 *imx290)
- {
-+	struct v4l2_fwnode_device_properties props;
- 	unsigned int blank;
- 	int ret;
- 
--	v4l2_ctrl_handler_init(&imx290->ctrls, 7);
-+	ret = v4l2_fwnode_device_parse(imx290->dev, &props);
-+	if (ret < 0)
-+		return ret;
-+
-+	v4l2_ctrl_handler_init(&imx290->ctrls, 9);
- 	imx290->ctrls.lock = &imx290->lock;
- 
- 	/*
-@@ -954,6 +959,9 @@ static int imx290_ctrl_init(struct imx29
- 	if (imx290->vblank)
- 		imx290->vblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
- 
-+	v4l2_ctrl_new_fwnode_properties(&imx290->ctrls, &imx290_ctrl_ops,
-+					&props);
-+
- 	imx290->sd.ctrl_handler = &imx290->ctrls;
- 
- 	if (imx290->ctrls.error) {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0627-media-i2c-imx290-Move-registers-with-fixed-value-to-.patch b/target/linux/bcm27xx/patches-6.1/950-0627-media-i2c-imx290-Move-registers-with-fixed-value-to-.patch
deleted file mode 100644
index 560203ecfa..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0627-media-i2c-imx290-Move-registers-with-fixed-value-to-.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From a3fd80d2328aa8d2fd48a9bcf3db90d10a357529 Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Sun, 16 Oct 2022 09:15:20 +0300
-Subject: [PATCH] media: i2c: imx290: Move registers with fixed value
- to init array
-
-Upstream commit 0b274ef2208d.
-
-Registers 0x3012, 0x3013 and 0x3480 are not documented and are set in
-the per-mode register arrays with values indentical for all modes. Move
-them to the common array.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Acked-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -192,6 +192,7 @@ static const struct imx290_regval imx290
- 	{ IMX290_REG_8BIT(0x300f), 0x00 },
- 	{ IMX290_REG_8BIT(0x3010), 0x21 },
- 	{ IMX290_REG_8BIT(0x3012), 0x64 },
-+	{ IMX290_REG_8BIT(0x3013), 0x00 },
- 	{ IMX290_REG_8BIT(0x3016), 0x09 },
- 	{ IMX290_REG_8BIT(0x3070), 0x02 },
- 	{ IMX290_REG_8BIT(0x3071), 0x11 },
-@@ -230,6 +231,7 @@ static const struct imx290_regval imx290
- 	{ IMX290_REG_8BIT(0x33b0), 0x50 },
- 	{ IMX290_REG_8BIT(0x33b2), 0x1a },
- 	{ IMX290_REG_8BIT(0x33b3), 0x04 },
-+	{ IMX290_REG_8BIT(0x3480), 0x49 },
- };
- 
- static const struct imx290_regval imx290_1080p_settings[] = {
-@@ -239,15 +241,12 @@ static const struct imx290_regval imx290
- 	{ IMX290_OPB_SIZE_V, 10 },
- 	{ IMX290_X_OUT_SIZE, 1920 },
- 	{ IMX290_Y_OUT_SIZE, 1080 },
--	{ IMX290_REG_8BIT(0x3012), 0x64 },
--	{ IMX290_REG_8BIT(0x3013), 0x00 },
- 	{ IMX290_INCKSEL1, 0x18 },
- 	{ IMX290_INCKSEL2, 0x03 },
- 	{ IMX290_INCKSEL3, 0x20 },
- 	{ IMX290_INCKSEL4, 0x01 },
- 	{ IMX290_INCKSEL5, 0x1a },
- 	{ IMX290_INCKSEL6, 0x1a },
--	{ IMX290_REG_8BIT(0x3480), 0x49 },
- 	/* data rate settings */
- 	{ IMX290_REPETITION, 0x10 },
- 	{ IMX290_TCLKPOST, 87 },
-@@ -267,15 +266,12 @@ static const struct imx290_regval imx290
- 	{ IMX290_OPB_SIZE_V, 4 },
- 	{ IMX290_X_OUT_SIZE, 1280 },
- 	{ IMX290_Y_OUT_SIZE, 720 },
--	{ IMX290_REG_8BIT(0x3012), 0x64 },
--	{ IMX290_REG_8BIT(0x3013), 0x00 },
- 	{ IMX290_INCKSEL1, 0x20 },
- 	{ IMX290_INCKSEL2, 0x00 },
- 	{ IMX290_INCKSEL3, 0x20 },
- 	{ IMX290_INCKSEL4, 0x01 },
- 	{ IMX290_INCKSEL5, 0x1a },
- 	{ IMX290_INCKSEL6, 0x1a },
--	{ IMX290_REG_8BIT(0x3480), 0x49 },
- 	/* data rate settings */
- 	{ IMX290_REPETITION, 0x10 },
- 	{ IMX290_TCLKPOST, 79 },
diff --git a/target/linux/bcm27xx/patches-6.1/950-0628-media-i2c-imx290-Factor-out-format-retrieval-to-sepa.patch b/target/linux/bcm27xx/patches-6.1/950-0628-media-i2c-imx290-Factor-out-format-retrieval-to-sepa.patch
deleted file mode 100644
index 59c83e034e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0628-media-i2c-imx290-Factor-out-format-retrieval-to-sepa.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From f46108f6b967602e60505ae0198709467668dc83 Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Sun, 16 Oct 2022 09:15:21 +0300
-Subject: [PATCH] media: i2c: imx290: Factor out format retrieval to
- separate function
-
-Upstream commit b25537efeea9
-
-The driver duplicates the same pattern to access the try or active
-format in multiple locations. Factor it out to a separate function.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 24 ++++++++++++++----------
- 1 file changed, 14 insertions(+), 10 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -519,6 +519,16 @@ static const struct v4l2_ctrl_ops imx290
- 	.s_ctrl = imx290_set_ctrl,
- };
- 
-+static struct v4l2_mbus_framefmt *
-+imx290_get_pad_format(struct imx290 *imx290, struct v4l2_subdev_state *state,
-+		      u32 which)
-+{
-+	if (which == V4L2_SUBDEV_FORMAT_ACTIVE)
-+		return &imx290->current_format;
-+	else
-+		return v4l2_subdev_get_try_format(&imx290->sd, state, 0);
-+}
-+
- static int imx290_enum_mbus_code(struct v4l2_subdev *sd,
- 				 struct v4l2_subdev_state *sd_state,
- 				 struct v4l2_subdev_mbus_code_enum *code)
-@@ -562,12 +572,7 @@ static int imx290_get_fmt(struct v4l2_su
- 
- 	mutex_lock(&imx290->lock);
- 
--	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY)
--		framefmt = v4l2_subdev_get_try_format(&imx290->sd, sd_state,
--						      fmt->pad);
--	else
--		framefmt = &imx290->current_format;
--
-+	framefmt = imx290_get_pad_format(imx290, sd_state, fmt->which);
- 	fmt->format = *framefmt;
- 
- 	mutex_unlock(&imx290->lock);
-@@ -627,10 +632,9 @@ static int imx290_set_fmt(struct v4l2_su
- 	fmt->format.code = imx290_formats[i].code;
- 	fmt->format.field = V4L2_FIELD_NONE;
- 
--	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
--		format = v4l2_subdev_get_try_format(sd, sd_state, fmt->pad);
--	} else {
--		format = &imx290->current_format;
-+	format = imx290_get_pad_format(imx290, sd_state, fmt->which);
-+
-+	if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
- 		imx290->current_mode = mode;
- 		imx290->bpp = imx290_formats[i].bpp;
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0629-media-i2c-imx290-Add-crop-selection-targets-support.patch b/target/linux/bcm27xx/patches-6.1/950-0629-media-i2c-imx290-Add-crop-selection-targets-support.patch
deleted file mode 100644
index dccea7d570..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0629-media-i2c-imx290-Add-crop-selection-targets-support.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-From 663ffc173ab99d9cb9165cb91393783b7ac40c1f Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Sun, 16 Oct 2022 09:15:22 +0300
-Subject: [PATCH] media: i2c: imx290: Add crop selection targets
- support
-
-Upstream commit b4ab57b07c5b.
-
-Implement read-only access to crop selection rectangles to expose the
-analogue crop rectangle. The public (leaked) IMX290 documentation is not
-very clear on how cropping is implemented and configured exactly, so
-the margins may not be entirely accurate.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 94 ++++++++++++++++++++++++++++++++++++++
- 1 file changed, 94 insertions(+)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -105,6 +105,53 @@
- 
- #define IMX290_VMAX_DEFAULT				1125
- 
-+
-+/*
-+ * The IMX290 pixel array is organized as follows:
-+ *
-+ *     +------------------------------------+
-+ *     |           Optical Black            |     }  Vertical effective optical black (10)
-+ * +---+------------------------------------+---+
-+ * |   |                                    |   | }  Effective top margin (8)
-+ * |   |   +----------------------------+   |   | \
-+ * |   |   |                            |   |   |  |
-+ * |   |   |                            |   |   |  |
-+ * |   |   |                            |   |   |  |
-+ * |   |   |    Recording Pixel Area    |   |   |  | Recommended height (1080)
-+ * |   |   |                            |   |   |  |
-+ * |   |   |                            |   |   |  |
-+ * |   |   |                            |   |   |  |
-+ * |   |   +----------------------------+   |   | /
-+ * |   |                                    |   | }  Effective bottom margin (9)
-+ * +---+------------------------------------+---+
-+ *  <-> <-> <--------------------------> <-> <->
-+ *                                            \----  Ignored right margin (4)
-+ *                                        \--------  Effective right margin (9)
-+ *                       \-------------------------  Recommended width (1920)
-+ *       \-----------------------------------------  Effective left margin (8)
-+ *   \---------------------------------------------  Ignored left margin (4)
-+ *
-+ * The optical black lines are output over CSI-2 with a separate data type.
-+ *
-+ * The pixel array is meant to have 1920x1080 usable pixels after image
-+ * processing in an ISP. It has 8 (9) extra active pixels usable for color
-+ * processing in the ISP on the top and left (bottom and right) sides of the
-+ * image. In addition, 4 additional pixels are present on the left and right
-+ * sides of the image, documented as "ignored area".
-+ *
-+ * As far as is understood, all pixels of the pixel array (ignored area, color
-+ * processing margins and recording area) can be output by the sensor.
-+ */
-+
-+#define IMX290_PIXEL_ARRAY_WIDTH			1945
-+#define IMX290_PIXEL_ARRAY_HEIGHT			1097
-+#define IMX920_PIXEL_ARRAY_MARGIN_LEFT			12
-+#define IMX920_PIXEL_ARRAY_MARGIN_RIGHT			13
-+#define IMX920_PIXEL_ARRAY_MARGIN_TOP			8
-+#define IMX920_PIXEL_ARRAY_MARGIN_BOTTOM		9
-+#define IMX290_PIXEL_ARRAY_RECORDING_WIDTH		1920
-+#define IMX290_PIXEL_ARRAY_RECORDING_HEIGHT		1080
-+
- static const char * const imx290_supply_name[] = {
- 	"vdda",
- 	"vddd",
-@@ -667,6 +714,52 @@ static int imx290_set_fmt(struct v4l2_su
- 	return 0;
- }
- 
-+static int imx290_get_selection(struct v4l2_subdev *sd,
-+				struct v4l2_subdev_state *sd_state,
-+				struct v4l2_subdev_selection *sel)
-+{
-+	struct imx290 *imx290 = to_imx290(sd);
-+	struct v4l2_mbus_framefmt *format;
-+
-+	switch (sel->target) {
-+	case V4L2_SEL_TGT_CROP: {
-+		format = imx290_get_pad_format(imx290, sd_state, sel->which);
-+
-+		mutex_lock(&imx290->lock);
-+
-+		sel->r.top = IMX920_PIXEL_ARRAY_MARGIN_TOP
-+			   + (IMX290_PIXEL_ARRAY_RECORDING_HEIGHT - format->height) / 2;
-+		sel->r.left = IMX920_PIXEL_ARRAY_MARGIN_LEFT
-+			    + (IMX290_PIXEL_ARRAY_RECORDING_WIDTH - format->width) / 2;
-+		sel->r.width = format->width;
-+		sel->r.height = format->height;
-+
-+		mutex_unlock(&imx290->lock);
-+		return 0;
-+	}
-+
-+	case V4L2_SEL_TGT_NATIVE_SIZE:
-+	case V4L2_SEL_TGT_CROP_BOUNDS:
-+		sel->r.top = 0;
-+		sel->r.left = 0;
-+		sel->r.width = IMX290_PIXEL_ARRAY_WIDTH;
-+		sel->r.height = IMX290_PIXEL_ARRAY_HEIGHT;
-+
-+		return 0;
-+
-+	case V4L2_SEL_TGT_CROP_DEFAULT:
-+		sel->r.top = IMX920_PIXEL_ARRAY_MARGIN_TOP;
-+		sel->r.left = IMX920_PIXEL_ARRAY_MARGIN_LEFT;
-+		sel->r.width = IMX290_PIXEL_ARRAY_RECORDING_WIDTH;
-+		sel->r.height = IMX290_PIXEL_ARRAY_RECORDING_HEIGHT;
-+
-+		return 0;
-+
-+	default:
-+		return -EINVAL;
-+	}
-+}
-+
- static int imx290_entity_init_cfg(struct v4l2_subdev *subdev,
- 				  struct v4l2_subdev_state *sd_state)
- {
-@@ -883,6 +976,7 @@ static const struct v4l2_subdev_pad_ops
- 	.enum_frame_size = imx290_enum_frame_size,
- 	.get_fmt = imx290_get_fmt,
- 	.set_fmt = imx290_set_fmt,
-+	.get_selection = imx290_get_selection,
- };
- 
- static const struct v4l2_subdev_ops imx290_subdev_ops = {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0630-media-i2c-imx290-Replace-GAIN-control-with-ANALOGUE_.patch b/target/linux/bcm27xx/patches-6.1/950-0630-media-i2c-imx290-Replace-GAIN-control-with-ANALOGUE_.patch
deleted file mode 100644
index 0cd0ac8582..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0630-media-i2c-imx290-Replace-GAIN-control-with-ANALOGUE_.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 07e177363a8c2596740f22a049568cd448d923dd Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Sun, 16 Oct 2022 09:15:23 +0300
-Subject: [PATCH] media: i2c: imx290: Replace GAIN control with
- ANALOGUE_GAIN
-
-Upstream commit 3dd10515a1d9
-
-The IMX290 gain register controls the analogue gain. Replace the
-V4L2_CID_GAIN control with V4L2_CID_ANALOGUE_GAIN.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -524,7 +524,7 @@ static int imx290_set_ctrl(struct v4l2_c
- 		return 0;
- 
- 	switch (ctrl->id) {
--	case V4L2_CID_GAIN:
-+	case V4L2_CID_ANALOGUE_GAIN:
- 		ret = imx290_write(imx290, IMX290_GAIN, ctrl->val, NULL);
- 		break;
- 
-@@ -1015,7 +1015,7 @@ static int imx290_ctrl_init(struct imx29
- 	 * gain control should be adjusted accordingly.
- 	 */
- 	v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
--			  V4L2_CID_GAIN, 0, 100, 1, 0);
-+			  V4L2_CID_ANALOGUE_GAIN, 0, 100, 1, 0);
- 
- 	v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
- 			  V4L2_CID_EXPOSURE, 1, IMX290_VMAX_DEFAULT - 2, 1,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0631-media-i2c-imx290-Group-functions-in-sections.patch b/target/linux/bcm27xx/patches-6.1/950-0631-media-i2c-imx290-Group-functions-in-sections.patch
deleted file mode 100644
index ad0f8f52cf..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0631-media-i2c-imx290-Group-functions-in-sections.patch
+++ /dev/null
@@ -1,714 +0,0 @@
-From c4977346ac1a7e1a9175146e2fc20feca2f96703 Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Mon, 16 Jan 2023 15:44:38 +0100
-Subject: [PATCH] media: i2c: imx290: Group functions in sections
-
-Upstream commit cb7e1c8dbe60
-
-Move functions around to group them in logical sections, in order to
-improve readability. As a result, the IMX290_NUM_SUPPLIES macro has to
-be changed. No other code change is included, only moves.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
-Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
----
- drivers/media/i2c/imx290.c | 688 +++++++++++++++++++------------------
- 1 file changed, 356 insertions(+), 332 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -152,13 +152,7 @@
- #define IMX290_PIXEL_ARRAY_RECORDING_WIDTH		1920
- #define IMX290_PIXEL_ARRAY_RECORDING_HEIGHT		1080
- 
--static const char * const imx290_supply_name[] = {
--	"vdda",
--	"vddd",
--	"vdddo",
--};
--
--#define IMX290_NUM_SUPPLIES ARRAY_SIZE(imx290_supply_name)
-+#define IMX290_NUM_SUPPLIES				3
- 
- struct imx290_regval {
- 	u32 reg;
-@@ -199,31 +193,14 @@ struct imx290 {
- 	struct mutex lock;
- };
- 
--struct imx290_pixfmt {
--	u32 code;
--	u8 bpp;
--};
--
--static const struct imx290_pixfmt imx290_formats[] = {
--	{ MEDIA_BUS_FMT_SRGGB10_1X10, 10 },
--	{ MEDIA_BUS_FMT_SRGGB12_1X12, 12 },
--};
--
--static const struct regmap_config imx290_regmap_config = {
--	.reg_bits = 16,
--	.val_bits = 8,
--};
-+static inline struct imx290 *to_imx290(struct v4l2_subdev *_sd)
-+{
-+	return container_of(_sd, struct imx290, sd);
-+}
- 
--static const char * const imx290_test_pattern_menu[] = {
--	"Disabled",
--	"Sequence Pattern 1",
--	"Horizontal Color-bar Chart",
--	"Vertical Color-bar Chart",
--	"Sequence Pattern 2",
--	"Gradation Pattern 1",
--	"Gradation Pattern 2",
--	"000/555h Toggle Pattern",
--};
-+/* -----------------------------------------------------------------------------
-+ * Modes and formats
-+ */
- 
- static const struct imx290_regval imx290_global_init_settings[] = {
- 	{ IMX290_CTRL_07, IMX290_WINMODE_1080P },
-@@ -438,10 +415,19 @@ static inline int imx290_modes_num(const
- 		return ARRAY_SIZE(imx290_modes_4lanes);
- }
- 
--static inline struct imx290 *to_imx290(struct v4l2_subdev *_sd)
--{
--	return container_of(_sd, struct imx290, sd);
--}
-+struct imx290_pixfmt {
-+	u32 code;
-+	u8 bpp;
-+};
-+
-+static const struct imx290_pixfmt imx290_formats[] = {
-+	{ MEDIA_BUS_FMT_SRGGB10_1X10, 10 },
-+	{ MEDIA_BUS_FMT_SRGGB12_1X12, 12 },
-+};
-+
-+/* -----------------------------------------------------------------------------
-+ * Register access
-+ */
- 
- static int __always_unused imx290_read(struct imx290 *imx290, u32 addr, u32 *value)
- {
-@@ -501,18 +487,94 @@ static int imx290_set_register_array(str
- 	return 0;
- }
- 
--/* Stop streaming */
--static int imx290_stop_streaming(struct imx290 *imx290)
-+static int imx290_set_data_lanes(struct imx290 *imx290)
- {
--	int ret = 0;
-+	int ret = 0, laneval, frsel;
- 
--	imx290_write(imx290, IMX290_STANDBY, 0x01, &ret);
-+	switch (imx290->nlanes) {
-+	case 2:
-+		laneval = 0x01;
-+		frsel = 0x02;
-+		break;
-+	case 4:
-+		laneval = 0x03;
-+		frsel = 0x01;
-+		break;
-+	default:
-+		/*
-+		 * We should never hit this since the data lane count is
-+		 * validated in probe itself
-+		 */
-+		dev_err(imx290->dev, "Lane configuration not supported\n");
-+		return -EINVAL;
-+	}
- 
--	msleep(30);
-+	imx290_write(imx290, IMX290_PHY_LANE_NUM, laneval, &ret);
-+	imx290_write(imx290, IMX290_CSI_LANE_MODE, laneval, &ret);
-+	imx290_write(imx290, IMX290_FR_FDG_SEL, frsel, &ret);
- 
--	return imx290_write(imx290, IMX290_XMSTA, 0x01, &ret);
-+	return ret;
-+}
-+
-+static int imx290_write_current_format(struct imx290 *imx290)
-+{
-+	int ret;
-+
-+	switch (imx290->current_format.code) {
-+	case MEDIA_BUS_FMT_SRGGB10_1X10:
-+		ret = imx290_set_register_array(imx290, imx290_10bit_settings,
-+						ARRAY_SIZE(
-+							imx290_10bit_settings));
-+		if (ret < 0) {
-+			dev_err(imx290->dev, "Could not set format registers\n");
-+			return ret;
-+		}
-+		break;
-+	case MEDIA_BUS_FMT_SRGGB12_1X12:
-+		ret = imx290_set_register_array(imx290, imx290_12bit_settings,
-+						ARRAY_SIZE(
-+							imx290_12bit_settings));
-+		if (ret < 0) {
-+			dev_err(imx290->dev, "Could not set format registers\n");
-+			return ret;
-+		}
-+		break;
-+	default:
-+		dev_err(imx290->dev, "Unknown pixel format\n");
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
-+
-+static inline u8 imx290_get_link_freq_index(struct imx290 *imx290)
-+{
-+	return imx290->current_mode->link_freq_index;
- }
- 
-+static s64 imx290_get_link_freq(struct imx290 *imx290)
-+{
-+	u8 index = imx290_get_link_freq_index(imx290);
-+
-+	return *(imx290_link_freqs_ptr(imx290) + index);
-+}
-+
-+static u64 imx290_calc_pixel_rate(struct imx290 *imx290)
-+{
-+	s64 link_freq = imx290_get_link_freq(imx290);
-+	u8 nlanes = imx290->nlanes;
-+	u64 pixel_rate;
-+
-+	/* pixel rate = link_freq * 2 * nr_of_lanes / bits_per_sample */
-+	pixel_rate = link_freq * 2 * nlanes;
-+	do_div(pixel_rate, imx290->bpp);
-+	return pixel_rate;
-+}
-+
-+/* ----------------------------------------------------------------------------
-+ * Controls
-+ */
-+
- static int imx290_set_ctrl(struct v4l2_ctrl *ctrl)
- {
- 	struct imx290 *imx290 = container_of(ctrl->handler,
-@@ -566,6 +628,187 @@ static const struct v4l2_ctrl_ops imx290
- 	.s_ctrl = imx290_set_ctrl,
- };
- 
-+static const char * const imx290_test_pattern_menu[] = {
-+	"Disabled",
-+	"Sequence Pattern 1",
-+	"Horizontal Color-bar Chart",
-+	"Vertical Color-bar Chart",
-+	"Sequence Pattern 2",
-+	"Gradation Pattern 1",
-+	"Gradation Pattern 2",
-+	"000/555h Toggle Pattern",
-+};
-+
-+static int imx290_ctrl_init(struct imx290 *imx290)
-+{
-+	struct v4l2_fwnode_device_properties props;
-+	unsigned int blank;
-+	int ret;
-+
-+	ret = v4l2_fwnode_device_parse(imx290->dev, &props);
-+	if (ret < 0)
-+		return ret;
-+
-+	v4l2_ctrl_handler_init(&imx290->ctrls, 9);
-+	imx290->ctrls.lock = &imx290->lock;
-+
-+	/*
-+	 * The sensor has an analog gain and a digital gain, both controlled
-+	 * through a single gain value, expressed in 0.3dB increments. Values
-+	 * from 0.0dB (0) to 30.0dB (100) apply analog gain only, higher values
-+	 * up to 72.0dB (240) add further digital gain. Limit the range to
-+	 * analog gain only, support for digital gain can be added separately
-+	 * if needed.
-+	 *
-+	 * The IMX327 and IMX462 are largely compatible with the IMX290, but
-+	 * have an analog gain range of 0.0dB to 29.4dB and 42dB of digital
-+	 * gain. When support for those sensors gets added to the driver, the
-+	 * gain control should be adjusted accordingly.
-+	 */
-+	v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
-+			  V4L2_CID_ANALOGUE_GAIN, 0, 100, 1, 0);
-+
-+	v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
-+			  V4L2_CID_EXPOSURE, 1, IMX290_VMAX_DEFAULT - 2, 1,
-+			  IMX290_VMAX_DEFAULT - 2);
-+
-+	imx290->link_freq =
-+		v4l2_ctrl_new_int_menu(&imx290->ctrls, &imx290_ctrl_ops,
-+				       V4L2_CID_LINK_FREQ,
-+				       imx290_link_freqs_num(imx290) - 1, 0,
-+				       imx290_link_freqs_ptr(imx290));
-+	if (imx290->link_freq)
-+		imx290->link_freq->flags |= V4L2_CTRL_FLAG_READ_ONLY;
-+
-+	imx290->pixel_rate = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
-+					       V4L2_CID_PIXEL_RATE,
-+					       1, INT_MAX, 1,
-+					       imx290_calc_pixel_rate(imx290));
-+
-+	v4l2_ctrl_new_std_menu_items(&imx290->ctrls, &imx290_ctrl_ops,
-+				     V4L2_CID_TEST_PATTERN,
-+				     ARRAY_SIZE(imx290_test_pattern_menu) - 1,
-+				     0, 0, imx290_test_pattern_menu);
-+
-+	blank = imx290->current_mode->hmax - imx290->current_mode->width;
-+	imx290->hblank = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
-+					   V4L2_CID_HBLANK, blank, blank, 1,
-+					   blank);
-+	if (imx290->hblank)
-+		imx290->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
-+
-+	blank = IMX290_VMAX_DEFAULT - imx290->current_mode->height;
-+	imx290->vblank = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
-+					   V4L2_CID_VBLANK, blank, blank, 1,
-+					   blank);
-+	if (imx290->vblank)
-+		imx290->vblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
-+
-+	v4l2_ctrl_new_fwnode_properties(&imx290->ctrls, &imx290_ctrl_ops,
-+					&props);
-+
-+	imx290->sd.ctrl_handler = &imx290->ctrls;
-+
-+	if (imx290->ctrls.error) {
-+		ret = imx290->ctrls.error;
-+		v4l2_ctrl_handler_free(&imx290->ctrls);
-+		return ret;
-+	}
-+
-+	return 0;
-+}
-+
-+/* ----------------------------------------------------------------------------
-+ * Subdev operations
-+ */
-+
-+/* Start streaming */
-+static int imx290_start_streaming(struct imx290 *imx290)
-+{
-+	int ret;
-+
-+	/* Set init register settings */
-+	ret = imx290_set_register_array(imx290, imx290_global_init_settings,
-+					ARRAY_SIZE(
-+						imx290_global_init_settings));
-+	if (ret < 0) {
-+		dev_err(imx290->dev, "Could not set init registers\n");
-+		return ret;
-+	}
-+
-+	/* Apply the register values related to current frame format */
-+	ret = imx290_write_current_format(imx290);
-+	if (ret < 0) {
-+		dev_err(imx290->dev, "Could not set frame format\n");
-+		return ret;
-+	}
-+
-+	/* Apply default values of current mode */
-+	ret = imx290_set_register_array(imx290, imx290->current_mode->data,
-+					imx290->current_mode->data_size);
-+	if (ret < 0) {
-+		dev_err(imx290->dev, "Could not set current mode\n");
-+		return ret;
-+	}
-+
-+	ret = imx290_write(imx290, IMX290_HMAX, imx290->current_mode->hmax,
-+			   NULL);
-+	if (ret)
-+		return ret;
-+
-+	/* Apply customized values from user */
-+	ret = v4l2_ctrl_handler_setup(imx290->sd.ctrl_handler);
-+	if (ret) {
-+		dev_err(imx290->dev, "Could not sync v4l2 controls\n");
-+		return ret;
-+	}
-+
-+	imx290_write(imx290, IMX290_STANDBY, 0x00, &ret);
-+
-+	msleep(30);
-+
-+	/* Start streaming */
-+	return imx290_write(imx290, IMX290_XMSTA, 0x00, &ret);
-+}
-+
-+/* Stop streaming */
-+static int imx290_stop_streaming(struct imx290 *imx290)
-+{
-+	int ret = 0;
-+
-+	imx290_write(imx290, IMX290_STANDBY, 0x01, &ret);
-+
-+	msleep(30);
-+
-+	return imx290_write(imx290, IMX290_XMSTA, 0x01, &ret);
-+}
-+
-+static int imx290_set_stream(struct v4l2_subdev *sd, int enable)
-+{
-+	struct imx290 *imx290 = to_imx290(sd);
-+	int ret = 0;
-+
-+	if (enable) {
-+		ret = pm_runtime_resume_and_get(imx290->dev);
-+		if (ret < 0)
-+			goto unlock_and_return;
-+
-+		ret = imx290_start_streaming(imx290);
-+		if (ret) {
-+			dev_err(imx290->dev, "Start stream failed\n");
-+			pm_runtime_put(imx290->dev);
-+			goto unlock_and_return;
-+		}
-+	} else {
-+		imx290_stop_streaming(imx290);
-+		pm_runtime_put(imx290->dev);
-+	}
-+
-+unlock_and_return:
-+
-+	return ret;
-+}
-+
- static struct v4l2_mbus_framefmt *
- imx290_get_pad_format(struct imx290 *imx290, struct v4l2_subdev_state *state,
- 		      u32 which)
-@@ -627,30 +870,6 @@ static int imx290_get_fmt(struct v4l2_su
- 	return 0;
- }
- 
--static inline u8 imx290_get_link_freq_index(struct imx290 *imx290)
--{
--	return imx290->current_mode->link_freq_index;
--}
--
--static s64 imx290_get_link_freq(struct imx290 *imx290)
--{
--	u8 index = imx290_get_link_freq_index(imx290);
--
--	return *(imx290_link_freqs_ptr(imx290) + index);
--}
--
--static u64 imx290_calc_pixel_rate(struct imx290 *imx290)
--{
--	s64 link_freq = imx290_get_link_freq(imx290);
--	u8 nlanes = imx290->nlanes;
--	u64 pixel_rate;
--
--	/* pixel rate = link_freq * 2 * nr_of_lanes / bits_per_sample */
--	pixel_rate = link_freq * 2 * nlanes;
--	do_div(pixel_rate, imx290->bpp);
--	return pixel_rate;
--}
--
- static int imx290_set_fmt(struct v4l2_subdev *sd,
- 			  struct v4l2_subdev_state *sd_state,
- 			  struct v4l2_subdev_format *fmt)
-@@ -774,151 +993,31 @@ static int imx290_entity_init_cfg(struct
- 	return 0;
- }
- 
--static int imx290_write_current_format(struct imx290 *imx290)
--{
--	int ret;
--
--	switch (imx290->current_format.code) {
--	case MEDIA_BUS_FMT_SRGGB10_1X10:
--		ret = imx290_set_register_array(imx290, imx290_10bit_settings,
--						ARRAY_SIZE(
--							imx290_10bit_settings));
--		if (ret < 0) {
--			dev_err(imx290->dev, "Could not set format registers\n");
--			return ret;
--		}
--		break;
--	case MEDIA_BUS_FMT_SRGGB12_1X12:
--		ret = imx290_set_register_array(imx290, imx290_12bit_settings,
--						ARRAY_SIZE(
--							imx290_12bit_settings));
--		if (ret < 0) {
--			dev_err(imx290->dev, "Could not set format registers\n");
--			return ret;
--		}
--		break;
--	default:
--		dev_err(imx290->dev, "Unknown pixel format\n");
--		return -EINVAL;
--	}
--
--	return 0;
--}
--
--/* Start streaming */
--static int imx290_start_streaming(struct imx290 *imx290)
--{
--	int ret;
--
--	/* Set init register settings */
--	ret = imx290_set_register_array(imx290, imx290_global_init_settings,
--					ARRAY_SIZE(
--						imx290_global_init_settings));
--	if (ret < 0) {
--		dev_err(imx290->dev, "Could not set init registers\n");
--		return ret;
--	}
--
--	/* Apply the register values related to current frame format */
--	ret = imx290_write_current_format(imx290);
--	if (ret < 0) {
--		dev_err(imx290->dev, "Could not set frame format\n");
--		return ret;
--	}
--
--	/* Apply default values of current mode */
--	ret = imx290_set_register_array(imx290, imx290->current_mode->data,
--					imx290->current_mode->data_size);
--	if (ret < 0) {
--		dev_err(imx290->dev, "Could not set current mode\n");
--		return ret;
--	}
--
--	ret = imx290_write(imx290, IMX290_HMAX, imx290->current_mode->hmax,
--			   NULL);
--	if (ret)
--		return ret;
--
--	/* Apply customized values from user */
--	ret = v4l2_ctrl_handler_setup(imx290->sd.ctrl_handler);
--	if (ret) {
--		dev_err(imx290->dev, "Could not sync v4l2 controls\n");
--		return ret;
--	}
--
--	imx290_write(imx290, IMX290_STANDBY, 0x00, &ret);
--
--	msleep(30);
--
--	/* Start streaming */
--	return imx290_write(imx290, IMX290_XMSTA, 0x00, &ret);
--}
--
--static int imx290_set_stream(struct v4l2_subdev *sd, int enable)
--{
--	struct imx290 *imx290 = to_imx290(sd);
--	int ret = 0;
--
--	if (enable) {
--		ret = pm_runtime_resume_and_get(imx290->dev);
--		if (ret < 0)
--			goto unlock_and_return;
--
--		ret = imx290_start_streaming(imx290);
--		if (ret) {
--			dev_err(imx290->dev, "Start stream failed\n");
--			pm_runtime_put(imx290->dev);
--			goto unlock_and_return;
--		}
--	} else {
--		imx290_stop_streaming(imx290);
--		pm_runtime_put(imx290->dev);
--	}
--
--unlock_and_return:
--
--	return ret;
--}
--
--static int imx290_get_regulators(struct device *dev, struct imx290 *imx290)
--{
--	unsigned int i;
--
--	for (i = 0; i < ARRAY_SIZE(imx290->supplies); i++)
--		imx290->supplies[i].supply = imx290_supply_name[i];
--
--	return devm_regulator_bulk_get(dev, ARRAY_SIZE(imx290->supplies),
--				       imx290->supplies);
--}
-+static const struct v4l2_subdev_video_ops imx290_video_ops = {
-+	.s_stream = imx290_set_stream,
-+};
- 
--static int imx290_set_data_lanes(struct imx290 *imx290)
--{
--	int ret = 0, laneval, frsel;
-+static const struct v4l2_subdev_pad_ops imx290_pad_ops = {
-+	.init_cfg = imx290_entity_init_cfg,
-+	.enum_mbus_code = imx290_enum_mbus_code,
-+	.enum_frame_size = imx290_enum_frame_size,
-+	.get_fmt = imx290_get_fmt,
-+	.set_fmt = imx290_set_fmt,
-+	.get_selection = imx290_get_selection,
-+};
- 
--	switch (imx290->nlanes) {
--	case 2:
--		laneval = 0x01;
--		frsel = 0x02;
--		break;
--	case 4:
--		laneval = 0x03;
--		frsel = 0x01;
--		break;
--	default:
--		/*
--		 * We should never hit this since the data lane count is
--		 * validated in probe itself
--		 */
--		dev_err(imx290->dev, "Lane configuration not supported\n");
--		return -EINVAL;
--	}
-+static const struct v4l2_subdev_ops imx290_subdev_ops = {
-+	.video = &imx290_video_ops,
-+	.pad = &imx290_pad_ops,
-+};
- 
--	imx290_write(imx290, IMX290_PHY_LANE_NUM, laneval, &ret);
--	imx290_write(imx290, IMX290_CSI_LANE_MODE, laneval, &ret);
--	imx290_write(imx290, IMX290_FR_FDG_SEL, frsel, &ret);
-+static const struct media_entity_operations imx290_subdev_entity_ops = {
-+	.link_validate = v4l2_subdev_link_validate,
-+};
- 
--	return ret;
--}
-+/* ----------------------------------------------------------------------------
-+ * Power management
-+ */
- 
- static int imx290_power_on(struct device *dev)
- {
-@@ -966,105 +1065,30 @@ static const struct dev_pm_ops imx290_pm
- 	SET_RUNTIME_PM_OPS(imx290_power_off, imx290_power_on, NULL)
- };
- 
--static const struct v4l2_subdev_video_ops imx290_video_ops = {
--	.s_stream = imx290_set_stream,
--};
--
--static const struct v4l2_subdev_pad_ops imx290_pad_ops = {
--	.init_cfg = imx290_entity_init_cfg,
--	.enum_mbus_code = imx290_enum_mbus_code,
--	.enum_frame_size = imx290_enum_frame_size,
--	.get_fmt = imx290_get_fmt,
--	.set_fmt = imx290_set_fmt,
--	.get_selection = imx290_get_selection,
--};
-+/* ----------------------------------------------------------------------------
-+ * Probe & remove
-+ */
- 
--static const struct v4l2_subdev_ops imx290_subdev_ops = {
--	.video = &imx290_video_ops,
--	.pad = &imx290_pad_ops,
-+static const struct regmap_config imx290_regmap_config = {
-+	.reg_bits = 16,
-+	.val_bits = 8,
- };
- 
--static const struct media_entity_operations imx290_subdev_entity_ops = {
--	.link_validate = v4l2_subdev_link_validate,
-+static const char * const imx290_supply_name[IMX290_NUM_SUPPLIES] = {
-+	"vdda",
-+	"vddd",
-+	"vdddo",
- };
- 
--static int imx290_ctrl_init(struct imx290 *imx290)
-+static int imx290_get_regulators(struct device *dev, struct imx290 *imx290)
- {
--	struct v4l2_fwnode_device_properties props;
--	unsigned int blank;
--	int ret;
--
--	ret = v4l2_fwnode_device_parse(imx290->dev, &props);
--	if (ret < 0)
--		return ret;
--
--	v4l2_ctrl_handler_init(&imx290->ctrls, 9);
--	imx290->ctrls.lock = &imx290->lock;
--
--	/*
--	 * The sensor has an analog gain and a digital gain, both controlled
--	 * through a single gain value, expressed in 0.3dB increments. Values
--	 * from 0.0dB (0) to 30.0dB (100) apply analog gain only, higher values
--	 * up to 72.0dB (240) add further digital gain. Limit the range to
--	 * analog gain only, support for digital gain can be added separately
--	 * if needed.
--	 *
--	 * The IMX327 and IMX462 are largely compatible with the IMX290, but
--	 * have an analog gain range of 0.0dB to 29.4dB and 42dB of digital
--	 * gain. When support for those sensors gets added to the driver, the
--	 * gain control should be adjusted accordingly.
--	 */
--	v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
--			  V4L2_CID_ANALOGUE_GAIN, 0, 100, 1, 0);
--
--	v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
--			  V4L2_CID_EXPOSURE, 1, IMX290_VMAX_DEFAULT - 2, 1,
--			  IMX290_VMAX_DEFAULT - 2);
--
--	imx290->link_freq =
--		v4l2_ctrl_new_int_menu(&imx290->ctrls, &imx290_ctrl_ops,
--				       V4L2_CID_LINK_FREQ,
--				       imx290_link_freqs_num(imx290) - 1, 0,
--				       imx290_link_freqs_ptr(imx290));
--	if (imx290->link_freq)
--		imx290->link_freq->flags |= V4L2_CTRL_FLAG_READ_ONLY;
--
--	imx290->pixel_rate = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
--					       V4L2_CID_PIXEL_RATE,
--					       1, INT_MAX, 1,
--					       imx290_calc_pixel_rate(imx290));
--
--	v4l2_ctrl_new_std_menu_items(&imx290->ctrls, &imx290_ctrl_ops,
--				     V4L2_CID_TEST_PATTERN,
--				     ARRAY_SIZE(imx290_test_pattern_menu) - 1,
--				     0, 0, imx290_test_pattern_menu);
--
--	blank = imx290->current_mode->hmax - imx290->current_mode->width;
--	imx290->hblank = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
--					   V4L2_CID_HBLANK, blank, blank, 1,
--					   blank);
--	if (imx290->hblank)
--		imx290->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
--
--	blank = IMX290_VMAX_DEFAULT - imx290->current_mode->height;
--	imx290->vblank = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
--					   V4L2_CID_VBLANK, blank, blank, 1,
--					   blank);
--	if (imx290->vblank)
--		imx290->vblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
--
--	v4l2_ctrl_new_fwnode_properties(&imx290->ctrls, &imx290_ctrl_ops,
--					&props);
--
--	imx290->sd.ctrl_handler = &imx290->ctrls;
-+	unsigned int i;
- 
--	if (imx290->ctrls.error) {
--		ret = imx290->ctrls.error;
--		v4l2_ctrl_handler_free(&imx290->ctrls);
--		return ret;
--	}
-+	for (i = 0; i < ARRAY_SIZE(imx290->supplies); i++)
-+		imx290->supplies[i].supply = imx290_supply_name[i];
- 
--	return 0;
-+	return devm_regulator_bulk_get(dev, ARRAY_SIZE(imx290->supplies),
-+				       imx290->supplies);
- }
- 
- /*
diff --git a/target/linux/bcm27xx/patches-6.1/950-0632-media-i2c-imx290-Factor-out-subdev-init-and-cleanup-.patch b/target/linux/bcm27xx/patches-6.1/950-0632-media-i2c-imx290-Factor-out-subdev-init-and-cleanup-.patch
deleted file mode 100644
index fdd85f0cc5..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0632-media-i2c-imx290-Factor-out-subdev-init-and-cleanup-.patch
+++ /dev/null
@@ -1,235 +0,0 @@
-From bb459b1433e79fa048f6a904e90393f9f26ea52a Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Mon, 16 Jan 2023 15:44:39 +0100
-Subject: [PATCH] media: i2c: imx290: Factor out subdev init and
- cleanup to functions
-
-Upstream commit dfb704da8300.
-
-The probe() function is large. Make it more readable by factoring the
-subdev initialization code out. While at it, rename the error labels as
-the "free_" prefix isn't accurate.
-
-No functional change intended.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
-Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
----
- drivers/media/i2c/imx290.c | 108 +++++++++++++++++++++----------------
- 1 file changed, 62 insertions(+), 46 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -1015,6 +1015,47 @@ static const struct media_entity_operati
- 	.link_validate = v4l2_subdev_link_validate,
- };
- 
-+static int imx290_subdev_init(struct imx290 *imx290)
-+{
-+	struct i2c_client *client = to_i2c_client(imx290->dev);
-+	int ret;
-+
-+	/*
-+	 * Initialize the frame format. In particular, imx290->current_mode
-+	 * and imx290->bpp are set to defaults: imx290_calc_pixel_rate() call
-+	 * below relies on these fields.
-+	 */
-+	imx290_entity_init_cfg(&imx290->sd, NULL);
-+
-+	ret = imx290_ctrl_init(imx290);
-+	if (ret < 0) {
-+		dev_err(imx290->dev, "Control initialization error %d\n", ret);
-+		return ret;
-+	}
-+
-+	v4l2_i2c_subdev_init(&imx290->sd, client, &imx290_subdev_ops);
-+	imx290->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
-+	imx290->sd.dev = imx290->dev;
-+	imx290->sd.entity.ops = &imx290_subdev_entity_ops;
-+	imx290->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR;
-+
-+	imx290->pad.flags = MEDIA_PAD_FL_SOURCE;
-+	ret = media_entity_pads_init(&imx290->sd.entity, 1, &imx290->pad);
-+	if (ret < 0) {
-+		dev_err(imx290->dev, "Could not register media entity\n");
-+		v4l2_ctrl_handler_free(&imx290->ctrls);
-+		return ret;
-+	}
-+
-+	return 0;
-+}
-+
-+static void imx290_subdev_cleanup(struct imx290 *imx290)
-+{
-+	media_entity_cleanup(&imx290->sd.entity);
-+	v4l2_ctrl_handler_free(&imx290->ctrls);
-+}
-+
- /* ----------------------------------------------------------------------------
-  * Power management
-  */
-@@ -1147,10 +1188,10 @@ static int imx290_probe(struct i2c_clien
- 	fwnode_handle_put(endpoint);
- 	if (ret == -ENXIO) {
- 		dev_err(dev, "Unsupported bus type, should be CSI2\n");
--		goto free_err;
-+		goto err_endpoint;
- 	} else if (ret) {
- 		dev_err(dev, "Parsing endpoint node failed\n");
--		goto free_err;
-+		goto err_endpoint;
- 	}
- 
- 	/* Get number of data lanes */
-@@ -1158,7 +1199,7 @@ static int imx290_probe(struct i2c_clien
- 	if (imx290->nlanes != 2 && imx290->nlanes != 4) {
- 		dev_err(dev, "Invalid data lanes: %d\n", imx290->nlanes);
- 		ret = -EINVAL;
--		goto free_err;
-+		goto err_endpoint;
- 	}
- 
- 	dev_dbg(dev, "Using %u data lanes\n", imx290->nlanes);
-@@ -1166,7 +1207,7 @@ static int imx290_probe(struct i2c_clien
- 	if (!ep.nr_of_link_frequencies) {
- 		dev_err(dev, "link-frequency property not found in DT\n");
- 		ret = -EINVAL;
--		goto free_err;
-+		goto err_endpoint;
- 	}
- 
- 	/* Check that link frequences for all the modes are in device tree */
-@@ -1174,7 +1215,7 @@ static int imx290_probe(struct i2c_clien
- 	if (fq) {
- 		dev_err(dev, "Link frequency of %lld is not supported\n", fq);
- 		ret = -EINVAL;
--		goto free_err;
-+		goto err_endpoint;
- 	}
- 
- 	/* get system clock (xclk) */
-@@ -1182,14 +1223,14 @@ static int imx290_probe(struct i2c_clien
- 	if (IS_ERR(imx290->xclk)) {
- 		dev_err(dev, "Could not get xclk");
- 		ret = PTR_ERR(imx290->xclk);
--		goto free_err;
-+		goto err_endpoint;
- 	}
- 
- 	ret = fwnode_property_read_u32(dev_fwnode(dev), "clock-frequency",
- 				       &xclk_freq);
- 	if (ret) {
- 		dev_err(dev, "Could not get xclk frequency\n");
--		goto free_err;
-+		goto err_endpoint;
- 	}
- 
- 	/* external clock must be 37.125 MHz */
-@@ -1197,19 +1238,19 @@ static int imx290_probe(struct i2c_clien
- 		dev_err(dev, "External clock frequency %u is not supported\n",
- 			xclk_freq);
- 		ret = -EINVAL;
--		goto free_err;
-+		goto err_endpoint;
- 	}
- 
- 	ret = clk_set_rate(imx290->xclk, xclk_freq);
- 	if (ret) {
- 		dev_err(dev, "Could not set xclk frequency\n");
--		goto free_err;
-+		goto err_endpoint;
- 	}
- 
- 	ret = imx290_get_regulators(dev, imx290);
- 	if (ret < 0) {
- 		dev_err(dev, "Cannot get regulators\n");
--		goto free_err;
-+		goto err_endpoint;
- 	}
- 
- 	imx290->rst_gpio = devm_gpiod_get_optional(dev, "reset",
-@@ -1217,48 +1258,26 @@ static int imx290_probe(struct i2c_clien
- 	if (IS_ERR(imx290->rst_gpio)) {
- 		dev_err(dev, "Cannot get reset gpio\n");
- 		ret = PTR_ERR(imx290->rst_gpio);
--		goto free_err;
-+		goto err_endpoint;
- 	}
- 
- 	mutex_init(&imx290->lock);
- 
--	/*
--	 * Initialize the frame format. In particular, imx290->current_mode
--	 * and imx290->bpp are set to defaults: imx290_calc_pixel_rate() call
--	 * below relies on these fields.
--	 */
--	imx290_entity_init_cfg(&imx290->sd, NULL);
--
--	ret = imx290_ctrl_init(imx290);
--	if (ret < 0) {
--		dev_err(dev, "Control initialization error %d\n", ret);
--		goto free_mutex;
--	}
--
--	v4l2_i2c_subdev_init(&imx290->sd, client, &imx290_subdev_ops);
--	imx290->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
--	imx290->sd.dev = &client->dev;
--	imx290->sd.entity.ops = &imx290_subdev_entity_ops;
--	imx290->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR;
--
--	imx290->pad.flags = MEDIA_PAD_FL_SOURCE;
--	ret = media_entity_pads_init(&imx290->sd.entity, 1, &imx290->pad);
--	if (ret < 0) {
--		dev_err(dev, "Could not register media entity\n");
--		goto free_ctrl;
--	}
-+	ret = imx290_subdev_init(imx290);
-+	if (ret)
-+		goto err_mutex;
- 
- 	ret = v4l2_async_register_subdev(&imx290->sd);
- 	if (ret < 0) {
- 		dev_err(dev, "Could not register v4l2 device\n");
--		goto free_entity;
-+		goto err_subdev;
- 	}
- 
- 	/* Power on the device to match runtime PM state below */
- 	ret = imx290_power_on(dev);
- 	if (ret < 0) {
- 		dev_err(dev, "Could not power on the device\n");
--		goto free_entity;
-+		goto err_subdev;
- 	}
- 
- 	pm_runtime_set_active(dev);
-@@ -1269,13 +1288,11 @@ static int imx290_probe(struct i2c_clien
- 
- 	return 0;
- 
--free_entity:
--	media_entity_cleanup(&imx290->sd.entity);
--free_ctrl:
--	v4l2_ctrl_handler_free(&imx290->ctrls);
--free_mutex:
-+err_subdev:
-+	imx290_subdev_cleanup(imx290);
-+err_mutex:
- 	mutex_destroy(&imx290->lock);
--free_err:
-+err_endpoint:
- 	v4l2_fwnode_endpoint_free(&ep);
- 
- 	return ret;
-@@ -1287,8 +1304,7 @@ static void imx290_remove(struct i2c_cli
- 	struct imx290 *imx290 = to_imx290(sd);
- 
- 	v4l2_async_unregister_subdev(sd);
--	media_entity_cleanup(&sd->entity);
--	v4l2_ctrl_handler_free(sd->ctrl_handler);
-+	imx290_subdev_cleanup(imx290);
- 
- 	mutex_destroy(&imx290->lock);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0633-media-i2c-imx290-Factor-out-control-update-code-to-a.patch b/target/linux/bcm27xx/patches-6.1/950-0633-media-i2c-imx290-Factor-out-control-update-code-to-a.patch
deleted file mode 100644
index bae4bb59da..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0633-media-i2c-imx290-Factor-out-control-update-code-to-a.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From d28f7567b1043aec24558bd72dc10983db25f25c Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Mon, 16 Jan 2023 15:44:40 +0100
-Subject: [PATCH] media: i2c: imx290: Factor out control update code to
- a function
-
-Upstream commit a7941da37c43
-
-Move the control update code to a separate function to group it with all
-the control-related code and make imx290_set_fmt() more readable.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
-Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
----
- drivers/media/i2c/imx290.c | 43 ++++++++++++++++++++------------------
- 1 file changed, 23 insertions(+), 20 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -639,6 +639,28 @@ static const char * const imx290_test_pa
- 	"000/555h Toggle Pattern",
- };
- 
-+static void imx290_ctrl_update(struct imx290 *imx290,
-+			       const struct imx290_mode *mode)
-+{
-+	unsigned int hblank = mode->hmax - mode->width;
-+	unsigned int vblank = IMX290_VMAX_DEFAULT - mode->height;
-+
-+	/*
-+	 * This function may be called from imx290_set_fmt() before controls
-+	 * get created by imx290_ctrl_init(). Return immediately in that case.
-+	 */
-+	if (!imx290->ctrls.lock)
-+		return;
-+
-+	__v4l2_ctrl_s_ctrl(imx290->link_freq,
-+			   imx290_get_link_freq_index(imx290));
-+	__v4l2_ctrl_s_ctrl_int64(imx290->pixel_rate,
-+				 imx290_calc_pixel_rate(imx290));
-+
-+	__v4l2_ctrl_modify_range(imx290->hblank, hblank, hblank, 1, hblank);
-+	__v4l2_ctrl_modify_range(imx290->vblank, vblank, vblank, 1, vblank);
-+}
-+
- static int imx290_ctrl_init(struct imx290 *imx290)
- {
- 	struct v4l2_fwnode_device_properties props;
-@@ -904,26 +926,7 @@ static int imx290_set_fmt(struct v4l2_su
- 		imx290->current_mode = mode;
- 		imx290->bpp = imx290_formats[i].bpp;
- 
--		if (imx290->link_freq)
--			__v4l2_ctrl_s_ctrl(imx290->link_freq,
--					   imx290_get_link_freq_index(imx290));
--		if (imx290->pixel_rate)
--			__v4l2_ctrl_s_ctrl_int64(imx290->pixel_rate,
--						 imx290_calc_pixel_rate(imx290));
--
--		if (imx290->hblank) {
--			unsigned int hblank = mode->hmax - mode->width;
--
--			__v4l2_ctrl_modify_range(imx290->hblank, hblank, hblank,
--						 1, hblank);
--		}
--
--		if (imx290->vblank) {
--			unsigned int vblank = IMX290_VMAX_DEFAULT - mode->height;
--
--			__v4l2_ctrl_modify_range(imx290->vblank, vblank, vblank,
--						 1, vblank);
--		}
-+		imx290_ctrl_update(imx290, mode);
- 	}
- 
- 	*format = fmt->format;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0634-media-i2c-imx290-Access-link_freq_index-directly.patch b/target/linux/bcm27xx/patches-6.1/950-0634-media-i2c-imx290-Access-link_freq_index-directly.patch
deleted file mode 100644
index 8d5ce22209..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0634-media-i2c-imx290-Access-link_freq_index-directly.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 27404eb8c29cfe1e0d40925f6d628fad8cc5a977 Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Mon, 16 Jan 2023 15:44:41 +0100
-Subject: [PATCH] media: i2c: imx290: Access link_freq_index directly
-
-Upstream commit 70bbf56aa82c
-
-The imx290_get_link_freq_index() function hides the fact that it relies
-on the imx290 current_mode field, which obfuscates the code instead of
-making it more readable. Inline it in the callers, and use the mode
-pointer we already have in imx290_ctrl_update() instead of using the
-current_mode field.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
-Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
----
- drivers/media/i2c/imx290.c | 10 ++--------
- 1 file changed, 2 insertions(+), 8 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -547,14 +547,9 @@ static int imx290_write_current_format(s
- 	return 0;
- }
- 
--static inline u8 imx290_get_link_freq_index(struct imx290 *imx290)
--{
--	return imx290->current_mode->link_freq_index;
--}
--
- static s64 imx290_get_link_freq(struct imx290 *imx290)
- {
--	u8 index = imx290_get_link_freq_index(imx290);
-+	u8 index = imx290->current_mode->link_freq_index;
- 
- 	return *(imx290_link_freqs_ptr(imx290) + index);
- }
-@@ -652,8 +647,7 @@ static void imx290_ctrl_update(struct im
- 	if (!imx290->ctrls.lock)
- 		return;
- 
--	__v4l2_ctrl_s_ctrl(imx290->link_freq,
--			   imx290_get_link_freq_index(imx290));
-+	__v4l2_ctrl_s_ctrl(imx290->link_freq, mode->link_freq_index);
- 	__v4l2_ctrl_s_ctrl_int64(imx290->pixel_rate,
- 				 imx290_calc_pixel_rate(imx290));
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0635-media-i2c-imx290-Pass-format-and-mode-to-imx290_calc.patch b/target/linux/bcm27xx/patches-6.1/950-0635-media-i2c-imx290-Pass-format-and-mode-to-imx290_calc.patch
deleted file mode 100644
index 41fb54b535..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0635-media-i2c-imx290-Pass-format-and-mode-to-imx290_calc.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 58cb4180d3da2c3c096427ff77b967f217bd2f8d Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Mon, 16 Jan 2023 15:44:42 +0100
-Subject: [PATCH] media: i2c: imx290: Pass format and mode to
- imx290_calc_pixel_rate()
-
-Upstream commit 31b54a422b3f
-
-Avoid accessing the imx290 current_format and current_mode fields in
-imx290_calc_pixel_rate() to prepare for the removal of those fields.
-Among the two callers of the function, imx290_ctrl_update() has an
-explicit mode pointer already, and we can also give it a format pointer.
-Use those explicitly.
-
-While at it, inline the imx290_get_link_freq() function in
-imx290_calc_pixel_rate() as it is only called there.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
-Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
----
- drivers/media/i2c/imx290.c | 22 ++++++++--------------
- 1 file changed, 8 insertions(+), 14 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -547,21 +547,14 @@ static int imx290_write_current_format(s
- 	return 0;
- }
- 
--static s64 imx290_get_link_freq(struct imx290 *imx290)
-+static u64 imx290_calc_pixel_rate(struct imx290 *imx290,
-+				  const struct imx290_mode *mode)
- {
--	u8 index = imx290->current_mode->link_freq_index;
--
--	return *(imx290_link_freqs_ptr(imx290) + index);
--}
--
--static u64 imx290_calc_pixel_rate(struct imx290 *imx290)
--{
--	s64 link_freq = imx290_get_link_freq(imx290);
--	u8 nlanes = imx290->nlanes;
-+	s64 link_freq = imx290_link_freqs_ptr(imx290)[mode->link_freq_index];
- 	u64 pixel_rate;
- 
- 	/* pixel rate = link_freq * 2 * nr_of_lanes / bits_per_sample */
--	pixel_rate = link_freq * 2 * nlanes;
-+	pixel_rate = link_freq * 2 * imx290->nlanes;
- 	do_div(pixel_rate, imx290->bpp);
- 	return pixel_rate;
- }
-@@ -649,7 +642,7 @@ static void imx290_ctrl_update(struct im
- 
- 	__v4l2_ctrl_s_ctrl(imx290->link_freq, mode->link_freq_index);
- 	__v4l2_ctrl_s_ctrl_int64(imx290->pixel_rate,
--				 imx290_calc_pixel_rate(imx290));
-+				 imx290_calc_pixel_rate(imx290, mode));
- 
- 	__v4l2_ctrl_modify_range(imx290->hblank, hblank, hblank, 1, hblank);
- 	__v4l2_ctrl_modify_range(imx290->vblank, vblank, vblank, 1, vblank);
-@@ -659,6 +652,7 @@ static int imx290_ctrl_init(struct imx29
- {
- 	struct v4l2_fwnode_device_properties props;
- 	unsigned int blank;
-+	u64 pixel_rate;
- 	int ret;
- 
- 	ret = v4l2_fwnode_device_parse(imx290->dev, &props);
-@@ -696,10 +690,10 @@ static int imx290_ctrl_init(struct imx29
- 	if (imx290->link_freq)
- 		imx290->link_freq->flags |= V4L2_CTRL_FLAG_READ_ONLY;
- 
-+	pixel_rate = imx290_calc_pixel_rate(imx290, imx290->current_mode);
- 	imx290->pixel_rate = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
- 					       V4L2_CID_PIXEL_RATE,
--					       1, INT_MAX, 1,
--					       imx290_calc_pixel_rate(imx290));
-+					       1, INT_MAX, 1, pixel_rate);
- 
- 	v4l2_ctrl_new_std_menu_items(&imx290->ctrls, &imx290_ctrl_ops,
- 				     V4L2_CID_TEST_PATTERN,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0636-media-i2c-imx290-Compute-pixel-rate-and-blanking-in-.patch b/target/linux/bcm27xx/patches-6.1/950-0636-media-i2c-imx290-Compute-pixel-rate-and-blanking-in-.patch
deleted file mode 100644
index 293ff3dc96..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0636-media-i2c-imx290-Compute-pixel-rate-and-blanking-in-.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From 317b043056ef595bf7d4af2c807946afb405c117 Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Mon, 16 Jan 2023 15:44:43 +0100
-Subject: [PATCH] media: i2c: imx290: Compute pixel rate and blanking
- in one place
-
-Upstream commit 693b5cb598cc
-
-The hblank, vblank, pixel rate and link frequency values and limits are
-currently computed when creating controls, in imx290_ctrl_init(), and
-updated in imx290_ctrl_update(). This duplicates the logic in different
-places. Simplify the code by setting the control values and limits to
-hardcoded values when creating the controls, and call
-imx290_ctrl_update() to then update them.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Acked-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
-Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
----
- drivers/media/i2c/imx290.c | 43 +++++++++++++++++---------------------
- 1 file changed, 19 insertions(+), 24 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -547,18 +547,6 @@ static int imx290_write_current_format(s
- 	return 0;
- }
- 
--static u64 imx290_calc_pixel_rate(struct imx290 *imx290,
--				  const struct imx290_mode *mode)
--{
--	s64 link_freq = imx290_link_freqs_ptr(imx290)[mode->link_freq_index];
--	u64 pixel_rate;
--
--	/* pixel rate = link_freq * 2 * nr_of_lanes / bits_per_sample */
--	pixel_rate = link_freq * 2 * imx290->nlanes;
--	do_div(pixel_rate, imx290->bpp);
--	return pixel_rate;
--}
--
- /* ----------------------------------------------------------------------------
-  * Controls
-  */
-@@ -632,6 +620,8 @@ static void imx290_ctrl_update(struct im
- {
- 	unsigned int hblank = mode->hmax - mode->width;
- 	unsigned int vblank = IMX290_VMAX_DEFAULT - mode->height;
-+	s64 link_freq = imx290_link_freqs_ptr(imx290)[mode->link_freq_index];
-+	u64 pixel_rate;
- 
- 	/*
- 	 * This function may be called from imx290_set_fmt() before controls
-@@ -640,9 +630,12 @@ static void imx290_ctrl_update(struct im
- 	if (!imx290->ctrls.lock)
- 		return;
- 
-+	/* pixel rate = link_freq * 2 * nr_of_lanes / bits_per_sample */
-+	pixel_rate = link_freq * 2 * imx290->nlanes;
-+	do_div(pixel_rate, imx290->bpp);
-+
- 	__v4l2_ctrl_s_ctrl(imx290->link_freq, mode->link_freq_index);
--	__v4l2_ctrl_s_ctrl_int64(imx290->pixel_rate,
--				 imx290_calc_pixel_rate(imx290, mode));
-+	__v4l2_ctrl_s_ctrl_int64(imx290->pixel_rate, pixel_rate);
- 
- 	__v4l2_ctrl_modify_range(imx290->hblank, hblank, hblank, 1, hblank);
- 	__v4l2_ctrl_modify_range(imx290->vblank, vblank, vblank, 1, vblank);
-@@ -651,8 +644,6 @@ static void imx290_ctrl_update(struct im
- static int imx290_ctrl_init(struct imx290 *imx290)
- {
- 	struct v4l2_fwnode_device_properties props;
--	unsigned int blank;
--	u64 pixel_rate;
- 	int ret;
- 
- 	ret = v4l2_fwnode_device_parse(imx290->dev, &props);
-@@ -682,6 +673,11 @@ static int imx290_ctrl_init(struct imx29
- 			  V4L2_CID_EXPOSURE, 1, IMX290_VMAX_DEFAULT - 2, 1,
- 			  IMX290_VMAX_DEFAULT - 2);
- 
-+	/*
-+	 * Set the link frequency, pixel rate, horizontal blanking and vertical
-+	 * blanking to hardcoded values, they will be updated by
-+	 * imx290_ctrl_update().
-+	 */
- 	imx290->link_freq =
- 		v4l2_ctrl_new_int_menu(&imx290->ctrls, &imx290_ctrl_ops,
- 				       V4L2_CID_LINK_FREQ,
-@@ -690,27 +686,22 @@ static int imx290_ctrl_init(struct imx29
- 	if (imx290->link_freq)
- 		imx290->link_freq->flags |= V4L2_CTRL_FLAG_READ_ONLY;
- 
--	pixel_rate = imx290_calc_pixel_rate(imx290, imx290->current_mode);
- 	imx290->pixel_rate = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
- 					       V4L2_CID_PIXEL_RATE,
--					       1, INT_MAX, 1, pixel_rate);
-+					       1, INT_MAX, 1, 1);
- 
- 	v4l2_ctrl_new_std_menu_items(&imx290->ctrls, &imx290_ctrl_ops,
- 				     V4L2_CID_TEST_PATTERN,
- 				     ARRAY_SIZE(imx290_test_pattern_menu) - 1,
- 				     0, 0, imx290_test_pattern_menu);
- 
--	blank = imx290->current_mode->hmax - imx290->current_mode->width;
- 	imx290->hblank = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
--					   V4L2_CID_HBLANK, blank, blank, 1,
--					   blank);
-+					   V4L2_CID_HBLANK, 1, 1, 1, 1);
- 	if (imx290->hblank)
- 		imx290->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
- 
--	blank = IMX290_VMAX_DEFAULT - imx290->current_mode->height;
- 	imx290->vblank = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
--					   V4L2_CID_VBLANK, blank, blank, 1,
--					   blank);
-+					   V4L2_CID_VBLANK, 1, 1, 1, 1);
- 	if (imx290->vblank)
- 		imx290->vblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
- 
-@@ -725,6 +716,10 @@ static int imx290_ctrl_init(struct imx29
- 		return ret;
- 	}
- 
-+	mutex_lock(imx290->ctrls.lock);
-+	imx290_ctrl_update(imx290, imx290->current_mode);
-+	mutex_unlock(imx290->ctrls.lock);
-+
- 	return 0;
- }
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0637-media-i2c-imx290-Factor-out-black-level-setting-to-a.patch b/target/linux/bcm27xx/patches-6.1/950-0637-media-i2c-imx290-Factor-out-black-level-setting-to-a.patch
deleted file mode 100644
index dda5eba989..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0637-media-i2c-imx290-Factor-out-black-level-setting-to-a.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From d0f282c0afb570a286d6b8438ec0041ca2d2d6db Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Mon, 16 Jan 2023 15:44:44 +0100
-Subject: [PATCH] media: i2c: imx290: Factor out black level setting to
- a function
-
-Upstream commit ee4ce8936693
-
-The black level programmed in the BLKLEVEL register depends on the
-output format. The black level value computation is currently performed
-in imx290_set_ctrl(), in addition to having different black level values
-in the output-specific register value tables. Move it to a separate
-function to simplify the imx290_set_ctrl() code.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
-Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
----
- drivers/media/i2c/imx290.c | 50 ++++++++++++++++++++------------------
- 1 file changed, 26 insertions(+), 24 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -152,6 +152,9 @@
- #define IMX290_PIXEL_ARRAY_RECORDING_WIDTH		1920
- #define IMX290_PIXEL_ARRAY_RECORDING_HEIGHT		1080
- 
-+/* Equivalent value for 16bpp */
-+#define IMX290_BLACK_LEVEL_DEFAULT			3840
-+
- #define IMX290_NUM_SUPPLIES				3
- 
- struct imx290_regval {
-@@ -315,7 +318,6 @@ static const struct imx290_regval imx290
- 	{ IMX290_ADBIT2, IMX290_ADBIT2_10BIT },
- 	{ IMX290_ADBIT3, IMX290_ADBIT3_10BIT },
- 	{ IMX290_CSI_DT_FMT, IMX290_CSI_DT_FMT_RAW10 },
--	{ IMX290_BLKLEVEL, 60 },
- };
- 
- static const struct imx290_regval imx290_12bit_settings[] = {
-@@ -325,7 +327,6 @@ static const struct imx290_regval imx290
- 	{ IMX290_ADBIT2, IMX290_ADBIT2_12BIT },
- 	{ IMX290_ADBIT3, IMX290_ADBIT3_12BIT },
- 	{ IMX290_CSI_DT_FMT, IMX290_CSI_DT_FMT_RAW12 },
--	{ IMX290_BLKLEVEL, 240 },
- };
- 
- /* supported link frequencies */
-@@ -516,35 +517,40 @@ static int imx290_set_data_lanes(struct
- 	return ret;
- }
- 
-+static int imx290_set_black_level(struct imx290 *imx290,
-+				  unsigned int black_level, int *err)
-+{
-+	return imx290_write(imx290, IMX290_BLKLEVEL,
-+			    black_level >> (16 - imx290->bpp), err);
-+}
-+
- static int imx290_write_current_format(struct imx290 *imx290)
- {
-+	const struct imx290_regval *regs;
-+	unsigned int num_regs;
- 	int ret;
- 
- 	switch (imx290->current_format.code) {
- 	case MEDIA_BUS_FMT_SRGGB10_1X10:
--		ret = imx290_set_register_array(imx290, imx290_10bit_settings,
--						ARRAY_SIZE(
--							imx290_10bit_settings));
--		if (ret < 0) {
--			dev_err(imx290->dev, "Could not set format registers\n");
--			return ret;
--		}
-+		regs = imx290_10bit_settings;
-+		num_regs = ARRAY_SIZE(imx290_10bit_settings);
- 		break;
- 	case MEDIA_BUS_FMT_SRGGB12_1X12:
--		ret = imx290_set_register_array(imx290, imx290_12bit_settings,
--						ARRAY_SIZE(
--							imx290_12bit_settings));
--		if (ret < 0) {
--			dev_err(imx290->dev, "Could not set format registers\n");
--			return ret;
--		}
-+		regs = imx290_12bit_settings;
-+		num_regs = ARRAY_SIZE(imx290_12bit_settings);
- 		break;
- 	default:
- 		dev_err(imx290->dev, "Unknown pixel format\n");
- 		return -EINVAL;
- 	}
- 
--	return 0;
-+	ret = imx290_set_register_array(imx290, regs, num_regs);
-+	if (ret < 0) {
-+		dev_err(imx290->dev, "Could not set format registers\n");
-+		return ret;
-+	}
-+
-+	return imx290_set_black_level(imx290, IMX290_BLACK_LEVEL_DEFAULT, &ret);
- }
- 
- /* ----------------------------------------------------------------------------
-@@ -573,7 +579,7 @@ static int imx290_set_ctrl(struct v4l2_c
- 
- 	case V4L2_CID_TEST_PATTERN:
- 		if (ctrl->val) {
--			imx290_write(imx290, IMX290_BLKLEVEL, 0, &ret);
-+			imx290_set_black_level(imx290, 0, &ret);
- 			usleep_range(10000, 11000);
- 			imx290_write(imx290, IMX290_PGCTRL,
- 				     (u8)(IMX290_PGCTRL_REGEN |
-@@ -582,12 +588,8 @@ static int imx290_set_ctrl(struct v4l2_c
- 		} else {
- 			imx290_write(imx290, IMX290_PGCTRL, 0x00, &ret);
- 			usleep_range(10000, 11000);
--			if (imx290->bpp == 10)
--				imx290_write(imx290, IMX290_BLKLEVEL, 0x3c,
--					     &ret);
--			else /* 12 bits per pixel */
--				imx290_write(imx290, IMX290_BLKLEVEL, 0xf0,
--					     &ret);
-+			imx290_set_black_level(imx290, IMX290_BLACK_LEVEL_DEFAULT,
-+					       &ret);
- 		}
- 		break;
- 	default:
diff --git a/target/linux/bcm27xx/patches-6.1/950-0638-media-i2c-imx290-Factor-out-DT-parsing-to-separate-f.patch b/target/linux/bcm27xx/patches-6.1/950-0638-media-i2c-imx290-Factor-out-DT-parsing-to-separate-f.patch
deleted file mode 100644
index 79df9996af..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0638-media-i2c-imx290-Factor-out-DT-parsing-to-separate-f.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-From 4afc11ae3b786ad8425435b70ab0285fbf951b05 Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Mon, 16 Jan 2023 15:44:45 +0100
-Subject: [PATCH] media: i2c: imx290: Factor out DT parsing to separate
- function
-
-Upstream commit 6b69c52277ed
-
-Make the probe() function more readable by factoring out the DT parsing
-code to a separate function. No functional change intended.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
-Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
----
- drivers/media/i2c/imx290.c | 95 +++++++++++++++++++++-----------------
- 1 file changed, 52 insertions(+), 43 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -1142,111 +1142,124 @@ static s64 imx290_check_link_freqs(const
- 	return 0;
- }
- 
--static int imx290_probe(struct i2c_client *client)
-+static int imx290_parse_dt(struct imx290 *imx290)
- {
--	struct device *dev = &client->dev;
--	struct fwnode_handle *endpoint;
- 	/* Only CSI2 is supported for now: */
- 	struct v4l2_fwnode_endpoint ep = {
- 		.bus_type = V4L2_MBUS_CSI2_DPHY
- 	};
--	struct imx290 *imx290;
--	u32 xclk_freq;
--	s64 fq;
-+	struct fwnode_handle *endpoint;
- 	int ret;
-+	s64 fq;
- 
--	imx290 = devm_kzalloc(dev, sizeof(*imx290), GFP_KERNEL);
--	if (!imx290)
--		return -ENOMEM;
--
--	imx290->dev = dev;
--	imx290->regmap = devm_regmap_init_i2c(client, &imx290_regmap_config);
--	if (IS_ERR(imx290->regmap)) {
--		dev_err(dev, "Unable to initialize I2C\n");
--		return -ENODEV;
--	}
--
--	endpoint = fwnode_graph_get_next_endpoint(dev_fwnode(dev), NULL);
-+	endpoint = fwnode_graph_get_next_endpoint(dev_fwnode(imx290->dev), NULL);
- 	if (!endpoint) {
--		dev_err(dev, "Endpoint node not found\n");
-+		dev_err(imx290->dev, "Endpoint node not found\n");
- 		return -EINVAL;
- 	}
- 
- 	ret = v4l2_fwnode_endpoint_alloc_parse(endpoint, &ep);
- 	fwnode_handle_put(endpoint);
- 	if (ret == -ENXIO) {
--		dev_err(dev, "Unsupported bus type, should be CSI2\n");
--		goto err_endpoint;
-+		dev_err(imx290->dev, "Unsupported bus type, should be CSI2\n");
-+		goto done;
- 	} else if (ret) {
--		dev_err(dev, "Parsing endpoint node failed\n");
--		goto err_endpoint;
-+		dev_err(imx290->dev, "Parsing endpoint node failed\n");
-+		goto done;
- 	}
- 
- 	/* Get number of data lanes */
- 	imx290->nlanes = ep.bus.mipi_csi2.num_data_lanes;
- 	if (imx290->nlanes != 2 && imx290->nlanes != 4) {
--		dev_err(dev, "Invalid data lanes: %d\n", imx290->nlanes);
-+		dev_err(imx290->dev, "Invalid data lanes: %d\n", imx290->nlanes);
- 		ret = -EINVAL;
--		goto err_endpoint;
-+		goto done;
- 	}
- 
--	dev_dbg(dev, "Using %u data lanes\n", imx290->nlanes);
-+	dev_dbg(imx290->dev, "Using %u data lanes\n", imx290->nlanes);
- 
- 	if (!ep.nr_of_link_frequencies) {
--		dev_err(dev, "link-frequency property not found in DT\n");
-+		dev_err(imx290->dev, "link-frequency property not found in DT\n");
- 		ret = -EINVAL;
--		goto err_endpoint;
-+		goto done;
- 	}
- 
- 	/* Check that link frequences for all the modes are in device tree */
- 	fq = imx290_check_link_freqs(imx290, &ep);
- 	if (fq) {
--		dev_err(dev, "Link frequency of %lld is not supported\n", fq);
-+		dev_err(imx290->dev, "Link frequency of %lld is not supported\n",
-+			fq);
- 		ret = -EINVAL;
--		goto err_endpoint;
-+		goto done;
- 	}
- 
-+	ret = 0;
-+
-+done:
-+	v4l2_fwnode_endpoint_free(&ep);
-+	return ret;
-+}
-+
-+static int imx290_probe(struct i2c_client *client)
-+{
-+	struct device *dev = &client->dev;
-+	struct imx290 *imx290;
-+	u32 xclk_freq;
-+	int ret;
-+
-+	imx290 = devm_kzalloc(dev, sizeof(*imx290), GFP_KERNEL);
-+	if (!imx290)
-+		return -ENOMEM;
-+
-+	imx290->dev = dev;
-+	imx290->regmap = devm_regmap_init_i2c(client, &imx290_regmap_config);
-+	if (IS_ERR(imx290->regmap)) {
-+		dev_err(dev, "Unable to initialize I2C\n");
-+		return -ENODEV;
-+	}
-+
-+	ret = imx290_parse_dt(imx290);
-+	if (ret)
-+		return ret;
-+
- 	/* get system clock (xclk) */
- 	imx290->xclk = devm_clk_get(dev, "xclk");
- 	if (IS_ERR(imx290->xclk)) {
- 		dev_err(dev, "Could not get xclk");
--		ret = PTR_ERR(imx290->xclk);
--		goto err_endpoint;
-+		return PTR_ERR(imx290->xclk);
- 	}
- 
- 	ret = fwnode_property_read_u32(dev_fwnode(dev), "clock-frequency",
- 				       &xclk_freq);
- 	if (ret) {
- 		dev_err(dev, "Could not get xclk frequency\n");
--		goto err_endpoint;
-+		return ret;
- 	}
- 
- 	/* external clock must be 37.125 MHz */
- 	if (xclk_freq != 37125000) {
- 		dev_err(dev, "External clock frequency %u is not supported\n",
- 			xclk_freq);
--		ret = -EINVAL;
--		goto err_endpoint;
-+		return -EINVAL;
- 	}
- 
- 	ret = clk_set_rate(imx290->xclk, xclk_freq);
- 	if (ret) {
- 		dev_err(dev, "Could not set xclk frequency\n");
--		goto err_endpoint;
-+		return ret;
- 	}
- 
- 	ret = imx290_get_regulators(dev, imx290);
- 	if (ret < 0) {
- 		dev_err(dev, "Cannot get regulators\n");
--		goto err_endpoint;
-+		return ret;
- 	}
- 
- 	imx290->rst_gpio = devm_gpiod_get_optional(dev, "reset",
- 						   GPIOD_OUT_HIGH);
- 	if (IS_ERR(imx290->rst_gpio)) {
- 		dev_err(dev, "Cannot get reset gpio\n");
--		ret = PTR_ERR(imx290->rst_gpio);
--		goto err_endpoint;
-+		return PTR_ERR(imx290->rst_gpio);
- 	}
- 
- 	mutex_init(&imx290->lock);
-@@ -1272,16 +1285,12 @@ static int imx290_probe(struct i2c_clien
- 	pm_runtime_enable(dev);
- 	pm_runtime_idle(dev);
- 
--	v4l2_fwnode_endpoint_free(&ep);
--
- 	return 0;
- 
- err_subdev:
- 	imx290_subdev_cleanup(imx290);
- err_mutex:
- 	mutex_destroy(&imx290->lock);
--err_endpoint:
--	v4l2_fwnode_endpoint_free(&ep);
- 
- 	return ret;
- }
diff --git a/target/linux/bcm27xx/patches-6.1/950-0639-media-i2c-imx290-Use-dev_err_probe.patch b/target/linux/bcm27xx/patches-6.1/950-0639-media-i2c-imx290-Use-dev_err_probe.patch
deleted file mode 100644
index 044922b00a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0639-media-i2c-imx290-Use-dev_err_probe.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 5589814e868f5becefdb44d28c07cb39cbb7e9bd Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Mon, 16 Jan 2023 15:44:46 +0100
-Subject: [PATCH] media: i2c: imx290: Use dev_err_probe()
-
-Upstream commit 63127235bebd
-
-Improve error handling in the probe() function with dev_err_probe().
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
-Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
----
- drivers/media/i2c/imx290.c | 20 ++++++++------------
- 1 file changed, 8 insertions(+), 12 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -1224,10 +1224,9 @@ static int imx290_probe(struct i2c_clien
- 
- 	/* get system clock (xclk) */
- 	imx290->xclk = devm_clk_get(dev, "xclk");
--	if (IS_ERR(imx290->xclk)) {
--		dev_err(dev, "Could not get xclk");
--		return PTR_ERR(imx290->xclk);
--	}
-+	if (IS_ERR(imx290->xclk))
-+		return dev_err_probe(dev, PTR_ERR(imx290->xclk),
-+				     "Could not get xclk");
- 
- 	ret = fwnode_property_read_u32(dev_fwnode(dev), "clock-frequency",
- 				       &xclk_freq);
-@@ -1250,17 +1249,14 @@ static int imx290_probe(struct i2c_clien
- 	}
- 
- 	ret = imx290_get_regulators(dev, imx290);
--	if (ret < 0) {
--		dev_err(dev, "Cannot get regulators\n");
--		return ret;
--	}
-+	if (ret < 0)
-+		return dev_err_probe(dev, ret, "Cannot get regulators\n");
- 
- 	imx290->rst_gpio = devm_gpiod_get_optional(dev, "reset",
- 						   GPIOD_OUT_HIGH);
--	if (IS_ERR(imx290->rst_gpio)) {
--		dev_err(dev, "Cannot get reset gpio\n");
--		return PTR_ERR(imx290->rst_gpio);
--	}
-+	if (IS_ERR(imx290->rst_gpio))
-+		return dev_err_probe(dev, PTR_ERR(imx290->rst_gpio),
-+				     "Cannot get reset gpio\n");
- 
- 	mutex_init(&imx290->lock);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0640-media-i2c-imx290-Factor-out-clock-initialization-to-.patch b/target/linux/bcm27xx/patches-6.1/950-0640-media-i2c-imx290-Factor-out-clock-initialization-to-.patch
deleted file mode 100644
index b23d667d65..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0640-media-i2c-imx290-Factor-out-clock-initialization-to-.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 88c013f4c7e60431bca7bc6487971f671397e0fd Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Mon, 16 Jan 2023 15:44:47 +0100
-Subject: [PATCH] media: i2c: imx290: Factor out clock initialization
- to separate function
-
-Upstream commit e5d363ca82b9
-
-Move the external clock initialization code from probe() to a separate
-function to improve readability. No functional change intended.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
-Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
----
- drivers/media/i2c/imx290.c | 57 +++++++++++++++++++++++---------------
- 1 file changed, 35 insertions(+), 22 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -1120,6 +1120,34 @@ static int imx290_get_regulators(struct
- 				       imx290->supplies);
- }
- 
-+static int imx290_init_clk(struct imx290 *imx290)
-+{
-+	u32 xclk_freq;
-+	int ret;
-+
-+	ret = fwnode_property_read_u32(dev_fwnode(imx290->dev),
-+				       "clock-frequency", &xclk_freq);
-+	if (ret) {
-+		dev_err(imx290->dev, "Could not get xclk frequency\n");
-+		return ret;
-+	}
-+
-+	/* external clock must be 37.125 MHz */
-+	if (xclk_freq != 37125000) {
-+		dev_err(imx290->dev, "External clock frequency %u is not supported\n",
-+			xclk_freq);
-+		return -EINVAL;
-+	}
-+
-+	ret = clk_set_rate(imx290->xclk, xclk_freq);
-+	if (ret) {
-+		dev_err(imx290->dev, "Could not set xclk frequency\n");
-+		return ret;
-+	}
-+
-+	return 0;
-+}
-+
- /*
-  * Returns 0 if all link frequencies used by the driver for the given number
-  * of MIPI data lanes are mentioned in the device tree, or the value of the
-@@ -1204,7 +1232,6 @@ static int imx290_probe(struct i2c_clien
- {
- 	struct device *dev = &client->dev;
- 	struct imx290 *imx290;
--	u32 xclk_freq;
- 	int ret;
- 
- 	imx290 = devm_kzalloc(dev, sizeof(*imx290), GFP_KERNEL);
-@@ -1222,32 +1249,12 @@ static int imx290_probe(struct i2c_clien
- 	if (ret)
- 		return ret;
- 
--	/* get system clock (xclk) */
-+	/* Acquire resources. */
- 	imx290->xclk = devm_clk_get(dev, "xclk");
- 	if (IS_ERR(imx290->xclk))
- 		return dev_err_probe(dev, PTR_ERR(imx290->xclk),
- 				     "Could not get xclk");
- 
--	ret = fwnode_property_read_u32(dev_fwnode(dev), "clock-frequency",
--				       &xclk_freq);
--	if (ret) {
--		dev_err(dev, "Could not get xclk frequency\n");
--		return ret;
--	}
--
--	/* external clock must be 37.125 MHz */
--	if (xclk_freq != 37125000) {
--		dev_err(dev, "External clock frequency %u is not supported\n",
--			xclk_freq);
--		return -EINVAL;
--	}
--
--	ret = clk_set_rate(imx290->xclk, xclk_freq);
--	if (ret) {
--		dev_err(dev, "Could not set xclk frequency\n");
--		return ret;
--	}
--
- 	ret = imx290_get_regulators(dev, imx290);
- 	if (ret < 0)
- 		return dev_err_probe(dev, ret, "Cannot get regulators\n");
-@@ -1258,8 +1265,14 @@ static int imx290_probe(struct i2c_clien
- 		return dev_err_probe(dev, PTR_ERR(imx290->rst_gpio),
- 				     "Cannot get reset gpio\n");
- 
-+	/* Initialize external clock frequency. */
-+	ret = imx290_init_clk(imx290);
-+	if (ret)
-+		return ret;
-+
- 	mutex_init(&imx290->lock);
- 
-+	/* Initialize and register subdev. */
- 	ret = imx290_subdev_init(imx290);
- 	if (ret)
- 		goto err_mutex;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0641-media-i2c-imx290-Use-V4L2-subdev-active-state.patch b/target/linux/bcm27xx/patches-6.1/950-0641-media-i2c-imx290-Use-V4L2-subdev-active-state.patch
deleted file mode 100644
index 64db65641e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0641-media-i2c-imx290-Use-V4L2-subdev-active-state.patch
+++ /dev/null
@@ -1,398 +0,0 @@
-From 94caa6139edcfebd8934f362f562eac56b85b610 Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Mon, 17 Oct 2022 12:44:27 +0200
-Subject: [PATCH] media: i2c: imx290: Use V4L2 subdev active state
-
-Upstream commit a2514b9a634a
-
-Use the V4L2 subdev active state API to store the active format. This
-simplifies the driver not only by dropping the imx290 current_format
-field, but it also allows dropping the imx290 lock, replaced with the
-state lock.
-
-The lock check in imx290_ctrl_update() can be dropped as
-imx290_set_fmt() can't be called anywmore with which set to ACTIVE
-before controls are initialized.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
-Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
----
- drivers/media/i2c/imx290.c | 154 ++++++++++++++++---------------------
- 1 file changed, 65 insertions(+), 89 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -177,12 +177,12 @@ struct imx290 {
- 	struct clk *xclk;
- 	struct regmap *regmap;
- 	u8 nlanes;
--	u8 bpp;
- 
- 	struct v4l2_subdev sd;
- 	struct media_pad pad;
--	struct v4l2_mbus_framefmt current_format;
-+
- 	const struct imx290_mode *current_mode;
-+	u8 bpp;
- 
- 	struct regulator_bulk_data supplies[IMX290_NUM_SUPPLIES];
- 	struct gpio_desc *rst_gpio;
-@@ -192,8 +192,6 @@ struct imx290 {
- 	struct v4l2_ctrl *pixel_rate;
- 	struct v4l2_ctrl *hblank;
- 	struct v4l2_ctrl *vblank;
--
--	struct mutex lock;
- };
- 
- static inline struct imx290 *to_imx290(struct v4l2_subdev *_sd)
-@@ -524,13 +522,14 @@ static int imx290_set_black_level(struct
- 			    black_level >> (16 - imx290->bpp), err);
- }
- 
--static int imx290_write_current_format(struct imx290 *imx290)
-+static int imx290_setup_format(struct imx290 *imx290,
-+			       const struct v4l2_mbus_framefmt *format)
- {
- 	const struct imx290_regval *regs;
- 	unsigned int num_regs;
- 	int ret;
- 
--	switch (imx290->current_format.code) {
-+	switch (format->code) {
- 	case MEDIA_BUS_FMT_SRGGB10_1X10:
- 		regs = imx290_10bit_settings;
- 		num_regs = ARRAY_SIZE(imx290_10bit_settings);
-@@ -563,6 +562,15 @@ static int imx290_set_ctrl(struct v4l2_c
- 					     struct imx290, ctrls);
- 	int ret = 0;
- 
-+	/*
-+	 * Return immediately for controls that don't need to be applied to the
-+	 * device. Those controls are modified in imx290_ctrl_update(), which
-+	 * is called at probe time before runtime PM is initialized, so we
-+	 * can't proceed to the pm_runtime_get_if_in_use() call below.
-+	 */
-+	if (ctrl->flags & V4L2_CTRL_FLAG_READ_ONLY)
-+		return 0;
-+
- 	/* V4L2 controls values will be applied only when power is already up */
- 	if (!pm_runtime_get_if_in_use(imx290->dev))
- 		return 0;
-@@ -592,6 +600,7 @@ static int imx290_set_ctrl(struct v4l2_c
- 					       &ret);
- 		}
- 		break;
-+
- 	default:
- 		ret = -EINVAL;
- 		break;
-@@ -625,13 +634,6 @@ static void imx290_ctrl_update(struct im
- 	s64 link_freq = imx290_link_freqs_ptr(imx290)[mode->link_freq_index];
- 	u64 pixel_rate;
- 
--	/*
--	 * This function may be called from imx290_set_fmt() before controls
--	 * get created by imx290_ctrl_init(). Return immediately in that case.
--	 */
--	if (!imx290->ctrls.lock)
--		return;
--
- 	/* pixel rate = link_freq * 2 * nr_of_lanes / bits_per_sample */
- 	pixel_rate = link_freq * 2 * imx290->nlanes;
- 	do_div(pixel_rate, imx290->bpp);
-@@ -653,7 +655,6 @@ static int imx290_ctrl_init(struct imx29
- 		return ret;
- 
- 	v4l2_ctrl_handler_init(&imx290->ctrls, 9);
--	imx290->ctrls.lock = &imx290->lock;
- 
- 	/*
- 	 * The sensor has an analog gain and a digital gain, both controlled
-@@ -718,10 +719,6 @@ static int imx290_ctrl_init(struct imx29
- 		return ret;
- 	}
- 
--	mutex_lock(imx290->ctrls.lock);
--	imx290_ctrl_update(imx290, imx290->current_mode);
--	mutex_unlock(imx290->ctrls.lock);
--
- 	return 0;
- }
- 
-@@ -730,8 +727,10 @@ static int imx290_ctrl_init(struct imx29
-  */
- 
- /* Start streaming */
--static int imx290_start_streaming(struct imx290 *imx290)
-+static int imx290_start_streaming(struct imx290 *imx290,
-+				  struct v4l2_subdev_state *state)
- {
-+	const struct v4l2_mbus_framefmt *format;
- 	int ret;
- 
- 	/* Set init register settings */
-@@ -744,7 +743,8 @@ static int imx290_start_streaming(struct
- 	}
- 
- 	/* Apply the register values related to current frame format */
--	ret = imx290_write_current_format(imx290);
-+	format = v4l2_subdev_get_pad_format(&imx290->sd, state, 0);
-+	ret = imx290_setup_format(imx290, format);
- 	if (ret < 0) {
- 		dev_err(imx290->dev, "Could not set frame format\n");
- 		return ret;
-@@ -764,7 +764,7 @@ static int imx290_start_streaming(struct
- 		return ret;
- 
- 	/* Apply customized values from user */
--	ret = v4l2_ctrl_handler_setup(imx290->sd.ctrl_handler);
-+	ret = __v4l2_ctrl_handler_setup(imx290->sd.ctrl_handler);
- 	if (ret) {
- 		dev_err(imx290->dev, "Could not sync v4l2 controls\n");
- 		return ret;
-@@ -793,39 +793,32 @@ static int imx290_stop_streaming(struct
- static int imx290_set_stream(struct v4l2_subdev *sd, int enable)
- {
- 	struct imx290 *imx290 = to_imx290(sd);
-+	struct v4l2_subdev_state *state;
- 	int ret = 0;
- 
-+	state = v4l2_subdev_lock_and_get_active_state(sd);
-+
- 	if (enable) {
- 		ret = pm_runtime_resume_and_get(imx290->dev);
- 		if (ret < 0)
--			goto unlock_and_return;
-+			goto unlock;
- 
--		ret = imx290_start_streaming(imx290);
-+		ret = imx290_start_streaming(imx290, state);
- 		if (ret) {
- 			dev_err(imx290->dev, "Start stream failed\n");
- 			pm_runtime_put(imx290->dev);
--			goto unlock_and_return;
-+			goto unlock;
- 		}
- 	} else {
- 		imx290_stop_streaming(imx290);
- 		pm_runtime_put(imx290->dev);
- 	}
- 
--unlock_and_return:
--
-+unlock:
-+	v4l2_subdev_unlock_state(state);
- 	return ret;
- }
- 
--static struct v4l2_mbus_framefmt *
--imx290_get_pad_format(struct imx290 *imx290, struct v4l2_subdev_state *state,
--		      u32 which)
--{
--	if (which == V4L2_SUBDEV_FORMAT_ACTIVE)
--		return &imx290->current_format;
--	else
--		return v4l2_subdev_get_try_format(&imx290->sd, state, 0);
--}
--
- static int imx290_enum_mbus_code(struct v4l2_subdev *sd,
- 				 struct v4l2_subdev_state *sd_state,
- 				 struct v4l2_subdev_mbus_code_enum *code)
-@@ -860,23 +853,6 @@ static int imx290_enum_frame_size(struct
- 	return 0;
- }
- 
--static int imx290_get_fmt(struct v4l2_subdev *sd,
--			  struct v4l2_subdev_state *sd_state,
--			  struct v4l2_subdev_format *fmt)
--{
--	struct imx290 *imx290 = to_imx290(sd);
--	struct v4l2_mbus_framefmt *framefmt;
--
--	mutex_lock(&imx290->lock);
--
--	framefmt = imx290_get_pad_format(imx290, sd_state, fmt->which);
--	fmt->format = *framefmt;
--
--	mutex_unlock(&imx290->lock);
--
--	return 0;
--}
--
- static int imx290_set_fmt(struct v4l2_subdev *sd,
- 			  struct v4l2_subdev_state *sd_state,
- 			  struct v4l2_subdev_format *fmt)
-@@ -886,8 +862,6 @@ static int imx290_set_fmt(struct v4l2_su
- 	struct v4l2_mbus_framefmt *format;
- 	unsigned int i;
- 
--	mutex_lock(&imx290->lock);
--
- 	mode = v4l2_find_nearest_size(imx290_modes_ptr(imx290),
- 				      imx290_modes_num(imx290), width, height,
- 				      fmt->format.width, fmt->format.height);
-@@ -905,7 +879,7 @@ static int imx290_set_fmt(struct v4l2_su
- 	fmt->format.code = imx290_formats[i].code;
- 	fmt->format.field = V4L2_FIELD_NONE;
- 
--	format = imx290_get_pad_format(imx290, sd_state, fmt->which);
-+	format = v4l2_subdev_get_pad_format(sd, sd_state, 0);
- 
- 	if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
- 		imx290->current_mode = mode;
-@@ -916,8 +890,6 @@ static int imx290_set_fmt(struct v4l2_su
- 
- 	*format = fmt->format;
- 
--	mutex_unlock(&imx290->lock);
--
- 	return 0;
- }
- 
-@@ -925,14 +897,11 @@ static int imx290_get_selection(struct v
- 				struct v4l2_subdev_state *sd_state,
- 				struct v4l2_subdev_selection *sel)
- {
--	struct imx290 *imx290 = to_imx290(sd);
- 	struct v4l2_mbus_framefmt *format;
- 
- 	switch (sel->target) {
- 	case V4L2_SEL_TGT_CROP: {
--		format = imx290_get_pad_format(imx290, sd_state, sel->which);
--
--		mutex_lock(&imx290->lock);
-+		format = v4l2_subdev_get_pad_format(sd, sd_state, 0);
- 
- 		sel->r.top = IMX920_PIXEL_ARRAY_MARGIN_TOP
- 			   + (IMX290_PIXEL_ARRAY_RECORDING_HEIGHT - format->height) / 2;
-@@ -941,7 +910,6 @@ static int imx290_get_selection(struct v
- 		sel->r.width = format->width;
- 		sel->r.height = format->height;
- 
--		mutex_unlock(&imx290->lock);
- 		return 0;
- 	}
- 
-@@ -970,11 +938,13 @@ static int imx290_get_selection(struct v
- static int imx290_entity_init_cfg(struct v4l2_subdev *subdev,
- 				  struct v4l2_subdev_state *sd_state)
- {
--	struct v4l2_subdev_format fmt = { 0 };
--
--	fmt.which = sd_state ? V4L2_SUBDEV_FORMAT_TRY : V4L2_SUBDEV_FORMAT_ACTIVE;
--	fmt.format.width = 1920;
--	fmt.format.height = 1080;
-+	struct v4l2_subdev_format fmt = {
-+		.which = V4L2_SUBDEV_FORMAT_TRY,
-+		.format = {
-+			.width = 1920,
-+			.height = 1080,
-+		},
-+	};
- 
- 	imx290_set_fmt(subdev, sd_state, &fmt);
- 
-@@ -989,7 +959,7 @@ static const struct v4l2_subdev_pad_ops
- 	.init_cfg = imx290_entity_init_cfg,
- 	.enum_mbus_code = imx290_enum_mbus_code,
- 	.enum_frame_size = imx290_enum_frame_size,
--	.get_fmt = imx290_get_fmt,
-+	.get_fmt = v4l2_subdev_get_fmt,
- 	.set_fmt = imx290_set_fmt,
- 	.get_selection = imx290_get_selection,
- };
-@@ -1008,18 +978,8 @@ static int imx290_subdev_init(struct imx
- 	struct i2c_client *client = to_i2c_client(imx290->dev);
- 	int ret;
- 
--	/*
--	 * Initialize the frame format. In particular, imx290->current_mode
--	 * and imx290->bpp are set to defaults: imx290_calc_pixel_rate() call
--	 * below relies on these fields.
--	 */
--	imx290_entity_init_cfg(&imx290->sd, NULL);
--
--	ret = imx290_ctrl_init(imx290);
--	if (ret < 0) {
--		dev_err(imx290->dev, "Control initialization error %d\n", ret);
--		return ret;
--	}
-+	imx290->current_mode = &imx290_modes_ptr(imx290)[0];
-+	imx290->bpp = imx290_formats[0].bpp;
- 
- 	v4l2_i2c_subdev_init(&imx290->sd, client, &imx290_subdev_ops);
- 	imx290->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
-@@ -1031,15 +991,37 @@ static int imx290_subdev_init(struct imx
- 	ret = media_entity_pads_init(&imx290->sd.entity, 1, &imx290->pad);
- 	if (ret < 0) {
- 		dev_err(imx290->dev, "Could not register media entity\n");
--		v4l2_ctrl_handler_free(&imx290->ctrls);
- 		return ret;
- 	}
- 
-+	ret = imx290_ctrl_init(imx290);
-+	if (ret < 0) {
-+		dev_err(imx290->dev, "Control initialization error %d\n", ret);
-+		goto err_media;
-+	}
-+
-+	imx290->sd.state_lock = imx290->ctrls.lock;
-+
-+	ret = v4l2_subdev_init_finalize(&imx290->sd);
-+	if (ret < 0) {
-+		dev_err(imx290->dev, "subdev initialization error %d\n", ret);
-+		goto err_ctrls;
-+	}
-+
-+	imx290_ctrl_update(imx290, imx290->current_mode);
-+
- 	return 0;
-+
-+err_ctrls:
-+	v4l2_ctrl_handler_free(&imx290->ctrls);
-+err_media:
-+	media_entity_cleanup(&imx290->sd.entity);
-+	return ret;
- }
- 
- static void imx290_subdev_cleanup(struct imx290 *imx290)
- {
-+	v4l2_subdev_cleanup(&imx290->sd);
- 	media_entity_cleanup(&imx290->sd.entity);
- 	v4l2_ctrl_handler_free(&imx290->ctrls);
- }
-@@ -1270,12 +1252,10 @@ static int imx290_probe(struct i2c_clien
- 	if (ret)
- 		return ret;
- 
--	mutex_init(&imx290->lock);
--
- 	/* Initialize and register subdev. */
- 	ret = imx290_subdev_init(imx290);
- 	if (ret)
--		goto err_mutex;
-+		return ret;
- 
- 	ret = v4l2_async_register_subdev(&imx290->sd);
- 	if (ret < 0) {
-@@ -1298,8 +1278,6 @@ static int imx290_probe(struct i2c_clien
- 
- err_subdev:
- 	imx290_subdev_cleanup(imx290);
--err_mutex:
--	mutex_destroy(&imx290->lock);
- 
- 	return ret;
- }
-@@ -1312,8 +1290,6 @@ static void imx290_remove(struct i2c_cli
- 	v4l2_async_unregister_subdev(sd);
- 	imx290_subdev_cleanup(imx290);
- 
--	mutex_destroy(&imx290->lock);
--
- 	pm_runtime_disable(imx290->dev);
- 	if (!pm_runtime_status_suspended(imx290->dev))
- 		imx290_power_off(imx290->dev);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0642-media-i2c-imx290-Rename-extend-and-expand-usage-of-i.patch b/target/linux/bcm27xx/patches-6.1/950-0642-media-i2c-imx290-Rename-extend-and-expand-usage-of-i.patch
deleted file mode 100644
index 304fd5097f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0642-media-i2c-imx290-Rename-extend-and-expand-usage-of-i.patch
+++ /dev/null
@@ -1,258 +0,0 @@
-From fd31edb90963d91390b372153028fab79e7f060e Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Mon, 17 Oct 2022 12:44:27 +0200
-Subject: [PATCH] media: i2c: imx290: Rename, extend and expand usage
- of imx290_pixfmt
-
-Upstream commit 10591fe63691
-
-The imx290_pixfmt structure contains information about formats,
-currently limited to the bpp value. Extend it with the register settings
-for each format, and rename it to imx290_format_info to make its purpose
-clearer. Add a function named imx290_format_info() to look up format
-info for a media bus code, and use it through the code. This allows
-dropping the imx290 bpp field as the value is now looked up dynamically.
-
-The error handling in imx290_setup_format() can also be dropped, as the
-format is guaranteed by imx290_set_fmt() to be valid.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Acked-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
-Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
----
- drivers/media/i2c/imx290.c | 99 ++++++++++++++++++++++----------------
- 1 file changed, 58 insertions(+), 41 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -182,7 +182,6 @@ struct imx290 {
- 	struct media_pad pad;
- 
- 	const struct imx290_mode *current_mode;
--	u8 bpp;
- 
- 	struct regulator_bulk_data supplies[IMX290_NUM_SUPPLIES];
- 	struct gpio_desc *rst_gpio;
-@@ -414,16 +413,41 @@ static inline int imx290_modes_num(const
- 		return ARRAY_SIZE(imx290_modes_4lanes);
- }
- 
--struct imx290_pixfmt {
-+struct imx290_format_info {
- 	u32 code;
- 	u8 bpp;
-+	const struct imx290_regval *regs;
-+	unsigned int num_regs;
- };
- 
--static const struct imx290_pixfmt imx290_formats[] = {
--	{ MEDIA_BUS_FMT_SRGGB10_1X10, 10 },
--	{ MEDIA_BUS_FMT_SRGGB12_1X12, 12 },
-+static const struct imx290_format_info imx290_formats[] = {
-+	{
-+		.code = MEDIA_BUS_FMT_SRGGB10_1X10,
-+		.bpp = 10,
-+		.regs = imx290_10bit_settings,
-+		.num_regs = ARRAY_SIZE(imx290_10bit_settings),
-+	}, {
-+		.code = MEDIA_BUS_FMT_SRGGB12_1X12,
-+		.bpp = 12,
-+		.regs = imx290_12bit_settings,
-+		.num_regs = ARRAY_SIZE(imx290_12bit_settings),
-+	}
- };
- 
-+static const struct imx290_format_info *imx290_format_info(u32 code)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(imx290_formats); ++i) {
-+		const struct imx290_format_info *info = &imx290_formats[i];
-+
-+		if (info->code == code)
-+			return info;
-+	}
-+
-+	return NULL;
-+}
-+
- /* -----------------------------------------------------------------------------
-  * Register access
-  */
-@@ -516,40 +540,31 @@ static int imx290_set_data_lanes(struct
- }
- 
- static int imx290_set_black_level(struct imx290 *imx290,
-+				  const struct v4l2_mbus_framefmt *format,
- 				  unsigned int black_level, int *err)
- {
-+	unsigned int bpp = imx290_format_info(format->code)->bpp;
-+
- 	return imx290_write(imx290, IMX290_BLKLEVEL,
--			    black_level >> (16 - imx290->bpp), err);
-+			    black_level >> (16 - bpp), err);
- }
- 
- static int imx290_setup_format(struct imx290 *imx290,
- 			       const struct v4l2_mbus_framefmt *format)
- {
--	const struct imx290_regval *regs;
--	unsigned int num_regs;
-+	const struct imx290_format_info *info;
- 	int ret;
- 
--	switch (format->code) {
--	case MEDIA_BUS_FMT_SRGGB10_1X10:
--		regs = imx290_10bit_settings;
--		num_regs = ARRAY_SIZE(imx290_10bit_settings);
--		break;
--	case MEDIA_BUS_FMT_SRGGB12_1X12:
--		regs = imx290_12bit_settings;
--		num_regs = ARRAY_SIZE(imx290_12bit_settings);
--		break;
--	default:
--		dev_err(imx290->dev, "Unknown pixel format\n");
--		return -EINVAL;
--	}
-+	info = imx290_format_info(format->code);
- 
--	ret = imx290_set_register_array(imx290, regs, num_regs);
-+	ret = imx290_set_register_array(imx290, info->regs, info->num_regs);
- 	if (ret < 0) {
- 		dev_err(imx290->dev, "Could not set format registers\n");
- 		return ret;
- 	}
- 
--	return imx290_set_black_level(imx290, IMX290_BLACK_LEVEL_DEFAULT, &ret);
-+	return imx290_set_black_level(imx290, format,
-+				      IMX290_BLACK_LEVEL_DEFAULT, &ret);
- }
- 
- /* ----------------------------------------------------------------------------
-@@ -560,6 +575,8 @@ static int imx290_set_ctrl(struct v4l2_c
- {
- 	struct imx290 *imx290 = container_of(ctrl->handler,
- 					     struct imx290, ctrls);
-+	const struct v4l2_mbus_framefmt *format;
-+	struct v4l2_subdev_state *state;
- 	int ret = 0;
- 
- 	/*
-@@ -575,6 +592,9 @@ static int imx290_set_ctrl(struct v4l2_c
- 	if (!pm_runtime_get_if_in_use(imx290->dev))
- 		return 0;
- 
-+	state = v4l2_subdev_get_locked_active_state(&imx290->sd);
-+	format = v4l2_subdev_get_pad_format(&imx290->sd, state, 0);
-+
- 	switch (ctrl->id) {
- 	case V4L2_CID_ANALOGUE_GAIN:
- 		ret = imx290_write(imx290, IMX290_GAIN, ctrl->val, NULL);
-@@ -587,7 +607,7 @@ static int imx290_set_ctrl(struct v4l2_c
- 
- 	case V4L2_CID_TEST_PATTERN:
- 		if (ctrl->val) {
--			imx290_set_black_level(imx290, 0, &ret);
-+			imx290_set_black_level(imx290, format, 0, &ret);
- 			usleep_range(10000, 11000);
- 			imx290_write(imx290, IMX290_PGCTRL,
- 				     (u8)(IMX290_PGCTRL_REGEN |
-@@ -596,8 +616,8 @@ static int imx290_set_ctrl(struct v4l2_c
- 		} else {
- 			imx290_write(imx290, IMX290_PGCTRL, 0x00, &ret);
- 			usleep_range(10000, 11000);
--			imx290_set_black_level(imx290, IMX290_BLACK_LEVEL_DEFAULT,
--					       &ret);
-+			imx290_set_black_level(imx290, format,
-+					       IMX290_BLACK_LEVEL_DEFAULT, &ret);
- 		}
- 		break;
- 
-@@ -627,6 +647,7 @@ static const char * const imx290_test_pa
- };
- 
- static void imx290_ctrl_update(struct imx290 *imx290,
-+			       const struct v4l2_mbus_framefmt *format,
- 			       const struct imx290_mode *mode)
- {
- 	unsigned int hblank = mode->hmax - mode->width;
-@@ -636,7 +657,7 @@ static void imx290_ctrl_update(struct im
- 
- 	/* pixel rate = link_freq * 2 * nr_of_lanes / bits_per_sample */
- 	pixel_rate = link_freq * 2 * imx290->nlanes;
--	do_div(pixel_rate, imx290->bpp);
-+	do_div(pixel_rate, imx290_format_info(format->code)->bpp);
- 
- 	__v4l2_ctrl_s_ctrl(imx290->link_freq, mode->link_freq_index);
- 	__v4l2_ctrl_s_ctrl_int64(imx290->pixel_rate, pixel_rate);
-@@ -838,8 +859,7 @@ static int imx290_enum_frame_size(struct
- 	const struct imx290 *imx290 = to_imx290(sd);
- 	const struct imx290_mode *imx290_modes = imx290_modes_ptr(imx290);
- 
--	if ((fse->code != imx290_formats[0].code) &&
--	    (fse->code != imx290_formats[1].code))
-+	if (!imx290_format_info(fse->code))
- 		return -EINVAL;
- 
- 	if (fse->index >= imx290_modes_num(imx290))
-@@ -860,7 +880,6 @@ static int imx290_set_fmt(struct v4l2_su
- 	struct imx290 *imx290 = to_imx290(sd);
- 	const struct imx290_mode *mode;
- 	struct v4l2_mbus_framefmt *format;
--	unsigned int i;
- 
- 	mode = v4l2_find_nearest_size(imx290_modes_ptr(imx290),
- 				      imx290_modes_num(imx290), width, height,
-@@ -869,23 +888,17 @@ static int imx290_set_fmt(struct v4l2_su
- 	fmt->format.width = mode->width;
- 	fmt->format.height = mode->height;
- 
--	for (i = 0; i < ARRAY_SIZE(imx290_formats); i++)
--		if (imx290_formats[i].code == fmt->format.code)
--			break;
-+	if (!imx290_format_info(fmt->format.code))
-+		fmt->format.code = imx290_formats[0].code;
- 
--	if (i >= ARRAY_SIZE(imx290_formats))
--		i = 0;
--
--	fmt->format.code = imx290_formats[i].code;
- 	fmt->format.field = V4L2_FIELD_NONE;
- 
- 	format = v4l2_subdev_get_pad_format(sd, sd_state, 0);
- 
- 	if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
- 		imx290->current_mode = mode;
--		imx290->bpp = imx290_formats[i].bpp;
- 
--		imx290_ctrl_update(imx290, mode);
-+		imx290_ctrl_update(imx290, &fmt->format, mode);
- 	}
- 
- 	*format = fmt->format;
-@@ -976,10 +989,11 @@ static const struct media_entity_operati
- static int imx290_subdev_init(struct imx290 *imx290)
- {
- 	struct i2c_client *client = to_i2c_client(imx290->dev);
-+	const struct v4l2_mbus_framefmt *format;
-+	struct v4l2_subdev_state *state;
- 	int ret;
- 
- 	imx290->current_mode = &imx290_modes_ptr(imx290)[0];
--	imx290->bpp = imx290_formats[0].bpp;
- 
- 	v4l2_i2c_subdev_init(&imx290->sd, client, &imx290_subdev_ops);
- 	imx290->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
-@@ -1008,7 +1022,10 @@ static int imx290_subdev_init(struct imx
- 		goto err_ctrls;
- 	}
- 
--	imx290_ctrl_update(imx290, imx290->current_mode);
-+	state = v4l2_subdev_lock_and_get_active_state(&imx290->sd);
-+	format = v4l2_subdev_get_pad_format(&imx290->sd, state, 0);
-+	imx290_ctrl_update(imx290, format, imx290->current_mode);
-+	v4l2_subdev_unlock_state(state);
- 
- 	return 0;
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0643-media-i2c-imx290-Use-runtime-PM-autosuspend.patch b/target/linux/bcm27xx/patches-6.1/950-0643-media-i2c-imx290-Use-runtime-PM-autosuspend.patch
deleted file mode 100644
index 1abddcca37..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0643-media-i2c-imx290-Use-runtime-PM-autosuspend.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From 28725443a44ba4ed854195cd2916a0ae59c4259f Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Mon, 16 Jan 2023 15:44:50 +0100
-Subject: [PATCH] media: i2c: imx290: Use runtime PM autosuspend
-
-Upstream commit a8c3e0c1bf1e
-
-Use runtime PM autosuspend to avoid powering off the sensor during fast
-stop-reconfigure-restart cycles. This also fixes runtime PM handling in
-the probe function that didn't suspend the device, effectively leaving
-it resumed forever.
-
-While at it, improve documentation of power management in probe() and
-remove().
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Acked-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
-Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
----
- drivers/media/i2c/imx290.c | 58 +++++++++++++++++++++++++++++---------
- 1 file changed, 45 insertions(+), 13 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -626,7 +626,8 @@ static int imx290_set_ctrl(struct v4l2_c
- 		break;
- 	}
- 
--	pm_runtime_put(imx290->dev);
-+	pm_runtime_mark_last_busy(imx290->dev);
-+	pm_runtime_put_autosuspend(imx290->dev);
- 
- 	return ret;
- }
-@@ -827,12 +828,13 @@ static int imx290_set_stream(struct v4l2
- 		ret = imx290_start_streaming(imx290, state);
- 		if (ret) {
- 			dev_err(imx290->dev, "Start stream failed\n");
--			pm_runtime_put(imx290->dev);
-+			pm_runtime_put_sync(imx290->dev);
- 			goto unlock;
- 		}
- 	} else {
- 		imx290_stop_streaming(imx290);
--		pm_runtime_put(imx290->dev);
-+		pm_runtime_mark_last_busy(imx290->dev);
-+		pm_runtime_put_autosuspend(imx290->dev);
- 	}
- 
- unlock:
-@@ -1269,33 +1271,59 @@ static int imx290_probe(struct i2c_clien
- 	if (ret)
- 		return ret;
- 
--	/* Initialize and register subdev. */
-+	/* Initialize the V4L2 subdev. */
- 	ret = imx290_subdev_init(imx290);
- 	if (ret)
- 		return ret;
- 
--	ret = v4l2_async_register_subdev(&imx290->sd);
--	if (ret < 0) {
--		dev_err(dev, "Could not register v4l2 device\n");
--		goto err_subdev;
--	}
--
--	/* Power on the device to match runtime PM state below */
-+	/*
-+	 * Enable power management. The driver supports runtime PM, but needs to
-+	 * work when runtime PM is disabled in the kernel. To that end, power
-+	 * the sensor on manually here.
-+	 */
- 	ret = imx290_power_on(dev);
- 	if (ret < 0) {
- 		dev_err(dev, "Could not power on the device\n");
- 		goto err_subdev;
- 	}
- 
-+	/*
-+	 * Enable runtime PM with autosuspend. As the device has been powered
-+	 * manually, mark it as active, and increase the usage count without
-+	 * resuming the device.
-+	 */
- 	pm_runtime_set_active(dev);
-+	pm_runtime_get_noresume(dev);
- 	pm_runtime_enable(dev);
--	pm_runtime_idle(dev);
-+	pm_runtime_set_autosuspend_delay(dev, 1000);
-+	pm_runtime_use_autosuspend(dev);
-+
-+	/*
-+	 * Finally, register the V4L2 subdev. This must be done after
-+	 * initializing everything as the subdev can be used immediately after
-+	 * being registered.
-+	 */
-+	ret = v4l2_async_register_subdev(&imx290->sd);
-+	if (ret < 0) {
-+		dev_err(dev, "Could not register v4l2 device\n");
-+		goto err_pm;
-+	}
-+
-+	/*
-+	 * Decrease the PM usage count. The device will get suspended after the
-+	 * autosuspend delay, turning the power off.
-+	 */
-+	pm_runtime_mark_last_busy(dev);
-+	pm_runtime_put_autosuspend(dev);
- 
- 	return 0;
- 
-+err_pm:
-+	pm_runtime_disable(dev);
-+	pm_runtime_put_noidle(dev);
-+	imx290_power_off(dev);
- err_subdev:
- 	imx290_subdev_cleanup(imx290);
--
- 	return ret;
- }
- 
-@@ -1307,6 +1335,10 @@ static void imx290_remove(struct i2c_cli
- 	v4l2_async_unregister_subdev(sd);
- 	imx290_subdev_cleanup(imx290);
- 
-+	/*
-+	 * Disable runtime PM. In case runtime PM is disabled in the kernel,
-+	 * make sure to turn power off manually.
-+	 */
- 	pm_runtime_disable(imx290->dev);
- 	if (!pm_runtime_status_suspended(imx290->dev))
- 		imx290_power_off(imx290->dev);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0644-media-i2c-imx290-Initialize-runtime-PM-before-subdev.patch b/target/linux/bcm27xx/patches-6.1/950-0644-media-i2c-imx290-Initialize-runtime-PM-before-subdev.patch
deleted file mode 100644
index 32f8bd4cd2..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0644-media-i2c-imx290-Initialize-runtime-PM-before-subdev.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-From 42d779016414396fe047ef41af6bc8297f3cd6a4 Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Mon, 16 Jan 2023 15:44:51 +0100
-Subject: [PATCH] media: i2c: imx290: Initialize runtime PM before
- subdev
-
-Upstream commit 02852c01f654
-
-Initializing the subdev before runtime PM means that no subdev
-initialization can interact with the runtime PM framework. This can be
-problematic when modifying controls, as the .s_ctrl() handler commonly
-calls pm_runtime_get_if_in_use(). These code paths are not trivial,
-making the driver fragile and possibly causing subtle bugs.
-
-To make the subdev initialization more robust, initialize runtime PM
-first.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Acked-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
-Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
----
- drivers/media/i2c/imx290.c | 59 ++++++++++++++++++++++----------------
- 1 file changed, 34 insertions(+), 25 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -581,9 +581,7 @@ static int imx290_set_ctrl(struct v4l2_c
- 
- 	/*
- 	 * Return immediately for controls that don't need to be applied to the
--	 * device. Those controls are modified in imx290_ctrl_update(), which
--	 * is called at probe time before runtime PM is initialized, so we
--	 * can't proceed to the pm_runtime_get_if_in_use() call below.
-+	 * device.
- 	 */
- 	if (ctrl->flags & V4L2_CTRL_FLAG_READ_ONLY)
- 		return 0;
-@@ -1049,22 +1047,20 @@ static void imx290_subdev_cleanup(struct
-  * Power management
-  */
- 
--static int imx290_power_on(struct device *dev)
-+static int imx290_power_on(struct imx290 *imx290)
- {
--	struct v4l2_subdev *sd = dev_get_drvdata(dev);
--	struct imx290 *imx290 = to_imx290(sd);
- 	int ret;
- 
- 	ret = clk_prepare_enable(imx290->xclk);
- 	if (ret) {
--		dev_err(dev, "Failed to enable clock\n");
-+		dev_err(imx290->dev, "Failed to enable clock\n");
- 		return ret;
- 	}
- 
- 	ret = regulator_bulk_enable(ARRAY_SIZE(imx290->supplies),
- 				    imx290->supplies);
- 	if (ret) {
--		dev_err(dev, "Failed to enable regulators\n");
-+		dev_err(imx290->dev, "Failed to enable regulators\n");
- 		clk_disable_unprepare(imx290->xclk);
- 		return ret;
- 	}
-@@ -1079,20 +1075,33 @@ static int imx290_power_on(struct device
- 	return 0;
- }
- 
--static int imx290_power_off(struct device *dev)
-+static void imx290_power_off(struct imx290 *imx290)
- {
--	struct v4l2_subdev *sd = dev_get_drvdata(dev);
--	struct imx290 *imx290 = to_imx290(sd);
--
- 	clk_disable_unprepare(imx290->xclk);
- 	gpiod_set_value_cansleep(imx290->rst_gpio, 1);
- 	regulator_bulk_disable(ARRAY_SIZE(imx290->supplies), imx290->supplies);
-+}
-+
-+static int imx290_runtime_resume(struct device *dev)
-+{
-+	struct v4l2_subdev *sd = dev_get_drvdata(dev);
-+	struct imx290 *imx290 = to_imx290(sd);
-+
-+	return imx290_power_on(imx290);
-+}
-+
-+static int imx290_runtime_suspend(struct device *dev)
-+{
-+	struct v4l2_subdev *sd = dev_get_drvdata(dev);
-+	struct imx290 *imx290 = to_imx290(sd);
-+
-+	imx290_power_off(imx290);
- 
- 	return 0;
- }
- 
- static const struct dev_pm_ops imx290_pm_ops = {
--	SET_RUNTIME_PM_OPS(imx290_power_off, imx290_power_on, NULL)
-+	SET_RUNTIME_PM_OPS(imx290_runtime_suspend, imx290_runtime_resume, NULL)
- };
- 
- /* ----------------------------------------------------------------------------
-@@ -1271,20 +1280,15 @@ static int imx290_probe(struct i2c_clien
- 	if (ret)
- 		return ret;
- 
--	/* Initialize the V4L2 subdev. */
--	ret = imx290_subdev_init(imx290);
--	if (ret)
--		return ret;
--
- 	/*
- 	 * Enable power management. The driver supports runtime PM, but needs to
- 	 * work when runtime PM is disabled in the kernel. To that end, power
- 	 * the sensor on manually here.
- 	 */
--	ret = imx290_power_on(dev);
-+	ret = imx290_power_on(imx290);
- 	if (ret < 0) {
- 		dev_err(dev, "Could not power on the device\n");
--		goto err_subdev;
-+		return ret;
- 	}
- 
- 	/*
-@@ -1298,6 +1302,11 @@ static int imx290_probe(struct i2c_clien
- 	pm_runtime_set_autosuspend_delay(dev, 1000);
- 	pm_runtime_use_autosuspend(dev);
- 
-+	/* Initialize the V4L2 subdev. */
-+	ret = imx290_subdev_init(imx290);
-+	if (ret)
-+		goto err_pm;
-+
- 	/*
- 	 * Finally, register the V4L2 subdev. This must be done after
- 	 * initializing everything as the subdev can be used immediately after
-@@ -1306,7 +1315,7 @@ static int imx290_probe(struct i2c_clien
- 	ret = v4l2_async_register_subdev(&imx290->sd);
- 	if (ret < 0) {
- 		dev_err(dev, "Could not register v4l2 device\n");
--		goto err_pm;
-+		goto err_subdev;
- 	}
- 
- 	/*
-@@ -1318,12 +1327,12 @@ static int imx290_probe(struct i2c_clien
- 
- 	return 0;
- 
-+err_subdev:
-+	imx290_subdev_cleanup(imx290);
- err_pm:
- 	pm_runtime_disable(dev);
- 	pm_runtime_put_noidle(dev);
--	imx290_power_off(dev);
--err_subdev:
--	imx290_subdev_cleanup(imx290);
-+	imx290_power_off(imx290);
- 	return ret;
- }
- 
-@@ -1341,7 +1350,7 @@ static void imx290_remove(struct i2c_cli
- 	 */
- 	pm_runtime_disable(imx290->dev);
- 	if (!pm_runtime_status_suspended(imx290->dev))
--		imx290_power_off(imx290->dev);
-+		imx290_power_off(imx290);
- 	pm_runtime_set_suspended(imx290->dev);
- }
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0645-media-i2c-imx290-Configure-data-lanes-at-start-time.patch b/target/linux/bcm27xx/patches-6.1/950-0645-media-i2c-imx290-Configure-data-lanes-at-start-time.patch
deleted file mode 100644
index 57a7b1c7b9..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0645-media-i2c-imx290-Configure-data-lanes-at-start-time.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From f463515fa1c3d34eeff708d3c015d357049b4df1 Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Mon, 16 Jan 2023 15:44:52 +0100
-Subject: [PATCH] media: i2c: imx290: Configure data lanes at start
- time
-
-Upstream commit 7d399658f7c6
-
-There's no need to configure the data lanes in the runtime PM resume
-handler. Do so in imx290_start_streaming() instead.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
-Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
----
- drivers/media/i2c/imx290.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -762,6 +762,9 @@ static int imx290_start_streaming(struct
- 		return ret;
- 	}
- 
-+	/* Set data lane count */
-+	imx290_set_data_lanes(imx290);
-+
- 	/* Apply the register values related to current frame format */
- 	format = v4l2_subdev_get_pad_format(&imx290->sd, state, 0);
- 	ret = imx290_setup_format(imx290, format);
-@@ -1069,9 +1072,6 @@ static int imx290_power_on(struct imx290
- 	gpiod_set_value_cansleep(imx290->rst_gpio, 0);
- 	usleep_range(30000, 31000);
- 
--	/* Set data lane count */
--	imx290_set_data_lanes(imx290);
--
- 	return 0;
- }
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0646-media-i2c-imx290-Simplify-imx290_set_data_lanes.patch b/target/linux/bcm27xx/patches-6.1/950-0646-media-i2c-imx290-Simplify-imx290_set_data_lanes.patch
deleted file mode 100644
index 369dfeda62..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0646-media-i2c-imx290-Simplify-imx290_set_data_lanes.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 1551a08118c8e468b3afe0dd5ae0cfa47b7518e1 Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Mon, 16 Jan 2023 15:44:53 +0100
-Subject: [PATCH] media: i2c: imx290: Simplify imx290_set_data_lanes()
-
-Upstream commit 76c001287f6a
-
-There's no need to check for an incorrect number of data lanes in
-imx290_set_data_lanes() as the value is validated at probe() time. Drop
-the check.
-
-The PHY_LANE_NUM and CSI_LANE_MODE registers are programmed with a value
-equal to the number of lanes minus one. Compute it instead of handling
-it in the switch/case.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
-Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
----
- drivers/media/i2c/imx290.c | 17 +++++------------
- 1 file changed, 5 insertions(+), 12 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -512,28 +512,21 @@ static int imx290_set_register_array(str
- 
- static int imx290_set_data_lanes(struct imx290 *imx290)
- {
--	int ret = 0, laneval, frsel;
-+	int ret = 0;
-+	u32 frsel;
- 
- 	switch (imx290->nlanes) {
- 	case 2:
--		laneval = 0x01;
-+	default:
- 		frsel = 0x02;
- 		break;
- 	case 4:
--		laneval = 0x03;
- 		frsel = 0x01;
- 		break;
--	default:
--		/*
--		 * We should never hit this since the data lane count is
--		 * validated in probe itself
--		 */
--		dev_err(imx290->dev, "Lane configuration not supported\n");
--		return -EINVAL;
- 	}
- 
--	imx290_write(imx290, IMX290_PHY_LANE_NUM, laneval, &ret);
--	imx290_write(imx290, IMX290_CSI_LANE_MODE, laneval, &ret);
-+	imx290_write(imx290, IMX290_PHY_LANE_NUM, imx290->nlanes - 1, &ret);
-+	imx290_write(imx290, IMX290_CSI_LANE_MODE, imx290->nlanes - 1, &ret);
- 	imx290_write(imx290, IMX290_FR_FDG_SEL, frsel, &ret);
- 
- 	return ret;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0647-media-i2c-imx290-Handle-error-from-imx290_set_data_l.patch b/target/linux/bcm27xx/patches-6.1/950-0647-media-i2c-imx290-Handle-error-from-imx290_set_data_l.patch
deleted file mode 100644
index f624ff0a85..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0647-media-i2c-imx290-Handle-error-from-imx290_set_data_l.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 705b61d95a10db07cf60f6087e543c826fa53c28 Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Mon, 16 Jan 2023 15:44:54 +0100
-Subject: [PATCH] media: i2c: imx290: Handle error from
- imx290_set_data_lanes()
-
-Upstream commit 05ef7ec49d6b
-
-Check the error status returned by imx290_set_data_lanes() in its
-caller and propagate it.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
-Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
----
- drivers/media/i2c/imx290.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -756,7 +756,11 @@ static int imx290_start_streaming(struct
- 	}
- 
- 	/* Set data lane count */
--	imx290_set_data_lanes(imx290);
-+	ret = imx290_set_data_lanes(imx290);
-+	if (ret < 0) {
-+		dev_err(imx290->dev, "Could not set data lanes\n");
-+		return ret;
-+	}
- 
- 	/* Apply the register values related to current frame format */
- 	format = v4l2_subdev_get_pad_format(&imx290->sd, state, 0);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0648-dtbindings-Reset-imx290.txt-to-upstream.patch b/target/linux/bcm27xx/patches-6.1/950-0648-dtbindings-Reset-imx290.txt-to-upstream.patch
deleted file mode 100644
index 52d0dae225..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0648-dtbindings-Reset-imx290.txt-to-upstream.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 2c9a29b01ad8a5b9489f4713f12acf52e42b89cb Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 28 Mar 2023 14:49:41 +0100
-Subject: [PATCH] dtbindings: Reset imx290.txt to upstream
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- Documentation/devicetree/bindings/media/i2c/imx290.txt | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
---- a/Documentation/devicetree/bindings/media/i2c/imx290.txt
-+++ b/Documentation/devicetree/bindings/media/i2c/imx290.txt
-@@ -1,14 +1,13 @@
- * Sony IMX290 1/2.8-Inch CMOS Image Sensor
- 
- The Sony IMX290 is a 1/2.8-Inch CMOS Solid-state image sensor with
--Square Pixel for Color or Monochrome Cameras. It is programmable through I2C
--and 4-wire interfaces.
--The sensor output is available via CMOS logic parallel SDR output,
-+Square Pixel for Color Cameras. It is programmable through I2C and 4-wire
-+interfaces. The sensor output is available via CMOS logic parallel SDR output,
- Low voltage LVDS DDR output and CSI-2 serial data output. The CSI-2 bus is the
- default. No bindings have been defined for the other busses.
- 
- Required Properties:
--- compatible: Should be "sony,imx290", or "sony,imx290-mono"
-+- compatible: Should be "sony,imx290"
- - reg: I2C bus address of the device
- - clocks: Reference to the xclk clock.
- - clock-names: Should be "xclk".
diff --git a/target/linux/bcm27xx/patches-6.1/950-0649-media-dt-bindings-Convert-imx290.txt-to-YAML.patch b/target/linux/bcm27xx/patches-6.1/950-0649-media-dt-bindings-Convert-imx290.txt-to-YAML.patch
deleted file mode 100644
index b2417364c6..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0649-media-dt-bindings-Convert-imx290.txt-to-YAML.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-From 22774ebfc4073fd3c0fc729e2ae1e0e762ec127e Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Date: Sun, 16 Oct 2022 09:15:04 +0300
-Subject: [PATCH] media: dt-bindings: Convert imx290.txt to YAML
-
-Upstream commit a96dfea1df25
-
-Convert the Sony IMX290 DT binding from text to YAML. Add Manivannan as
-a maintainer given that he is listed in MAINTAINERS for the file, as
-volunteering myself.
-
-The name of the input clock, "xclk", is wrong as the hardware manual
-names it INCK. As the device has a single clock, the name could be
-omitted, but that would require a corresponding change to the driver and
-is thus a candidate for further patches.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- .../devicetree/bindings/media/i2c/imx290.txt  |  57 --------
- .../bindings/media/i2c/sony,imx290.yaml       | 129 ++++++++++++++++++
- MAINTAINERS                                   |   2 +-
- 3 files changed, 130 insertions(+), 58 deletions(-)
- delete mode 100644 Documentation/devicetree/bindings/media/i2c/imx290.txt
- create mode 100644 Documentation/devicetree/bindings/media/i2c/sony,imx290.yaml
-
---- a/Documentation/devicetree/bindings/media/i2c/imx290.txt
-+++ /dev/null
-@@ -1,57 +0,0 @@
--* Sony IMX290 1/2.8-Inch CMOS Image Sensor
--
--The Sony IMX290 is a 1/2.8-Inch CMOS Solid-state image sensor with
--Square Pixel for Color Cameras. It is programmable through I2C and 4-wire
--interfaces. The sensor output is available via CMOS logic parallel SDR output,
--Low voltage LVDS DDR output and CSI-2 serial data output. The CSI-2 bus is the
--default. No bindings have been defined for the other busses.
--
--Required Properties:
--- compatible: Should be "sony,imx290"
--- reg: I2C bus address of the device
--- clocks: Reference to the xclk clock.
--- clock-names: Should be "xclk".
--- clock-frequency: Frequency of the xclk clock in Hz.
--- vdddo-supply: Sensor digital IO regulator.
--- vdda-supply: Sensor analog regulator.
--- vddd-supply: Sensor digital core regulator.
--
--Optional Properties:
--- reset-gpios: Sensor reset GPIO
--
--The imx290 device node should contain one 'port' child node with
--an 'endpoint' subnode. For further reading on port node refer to
--Documentation/devicetree/bindings/media/video-interfaces.txt.
--
--Required Properties on endpoint:
--- data-lanes: check ../video-interfaces.txt
--- link-frequencies: check ../video-interfaces.txt
--- remote-endpoint: check ../video-interfaces.txt
--
--Example:
--	&i2c1 {
--		...
--		imx290: camera-sensor@1a {
--			compatible = "sony,imx290";
--			reg = <0x1a>;
--
--			reset-gpios = <&msmgpio 35 GPIO_ACTIVE_LOW>;
--			pinctrl-names = "default";
--			pinctrl-0 = <&camera_rear_default>;
--
--			clocks = <&gcc GCC_CAMSS_MCLK0_CLK>;
--			clock-names = "xclk";
--			clock-frequency = <37125000>;
--
--			vdddo-supply = <&camera_vdddo_1v8>;
--			vdda-supply = <&camera_vdda_2v8>;
--			vddd-supply = <&camera_vddd_1v5>;
--
--			port {
--				imx290_ep: endpoint {
--					data-lanes = <1 2 3 4>;
--					link-frequencies = /bits/ 64 <445500000>;
--					remote-endpoint = <&csiphy0_ep>;
--				};
--			};
--		};
---- /dev/null
-+++ b/Documentation/devicetree/bindings/media/i2c/sony,imx290.yaml
-@@ -0,0 +1,129 @@
-+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
-+%YAML 1.2
-+---
-+$id: http://devicetree.org/schemas/media/i2c/sony,imx290.yaml#
-+$schema: http://devicetree.org/meta-schemas/core.yaml#
-+
-+title: Sony IMX290 1/2.8-Inch CMOS Image Sensor
-+
-+maintainers:
-+  - Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-+  - Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-+
-+description: |-
-+  The Sony IMX290 is a 1/2.8-Inch CMOS Solid-state image sensor with Square
-+  Pixel for Color Cameras. It is programmable through I2C and 4-wire
-+  interfaces. The sensor output is available via CMOS logic parallel SDR
-+  output, Low voltage LVDS DDR output and CSI-2 serial data output. The CSI-2
-+  bus is the default. No bindings have been defined for the other busses.
-+
-+properties:
-+  compatible:
-+    enum:
-+      - sony,imx290
-+
-+  reg:
-+    maxItems: 1
-+
-+  clocks:
-+    maxItems: 1
-+
-+  clock-names:
-+    description: Input clock (37.125 MHz or 74.25 MHz)
-+    items:
-+      - const: xclk
-+
-+  clock-frequency:
-+    description: Frequency of the xclk clock in Hz
-+
-+  vdda-supply:
-+    description: Analog power supply (2.9V)
-+
-+  vddd-supply:
-+    description: Digital core power supply (1.2V)
-+
-+  vdddo-supply:
-+    description: Digital I/O power supply (1.8V)
-+
-+  reset-gpios:
-+    description: Sensor reset (XCLR) GPIO
-+    maxItems: 1
-+
-+  port:
-+    $ref: /schemas/graph.yaml#/$defs/port-base
-+    description: |
-+      Video output port
-+
-+    properties:
-+      endpoint:
-+        $ref: /schemas/media/video-interfaces.yaml#
-+        unevaluatedProperties: false
-+
-+        properties:
-+          data-lanes:
-+            anyOf:
-+              - items:
-+                  - const: 1
-+                  - const: 2
-+              - items:
-+                  - const: 1
-+                  - const: 2
-+                  - const: 3
-+                  - const: 4
-+
-+          link-frequencies: true
-+
-+        required:
-+          - data-lanes
-+          - link-frequencies
-+
-+    additionalProperties: false
-+
-+required:
-+  - compatible
-+  - reg
-+  - clocks
-+  - clock-names
-+  - clock-frequency
-+  - vdda-supply
-+  - vddd-supply
-+  - vdddo-supply
-+  - port
-+
-+additionalProperties: false
-+
-+examples:
-+  - |
-+    #include <dt-bindings/gpio/gpio.h>
-+
-+    i2c {
-+        #address-cells = <1>;
-+        #size-cells = <0>;
-+
-+        imx290: camera-sensor@1a {
-+            compatible = "sony,imx290";
-+            reg = <0x1a>;
-+
-+            pinctrl-names = "default";
-+            pinctrl-0 = <&camera_rear_default>;
-+
-+            clocks = <&gcc 90>;
-+            clock-names = "xclk";
-+            clock-frequency = <37125000>;
-+
-+            vdddo-supply = <&camera_vdddo_1v8>;
-+            vdda-supply = <&camera_vdda_2v8>;
-+            vddd-supply = <&camera_vddd_1v5>;
-+
-+            reset-gpios = <&msmgpio 35 GPIO_ACTIVE_LOW>;
-+
-+            port {
-+                imx290_ep: endpoint {
-+                    data-lanes = <1 2 3 4>;
-+                    link-frequencies = /bits/ 64 <445500000>;
-+                    remote-endpoint = <&csiphy0_ep>;
-+                };
-+            };
-+        };
-+    };
-+...
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -19278,7 +19278,7 @@ M:	Manivannan Sadhasivam <manivannan.sad
- L:	linux-media@vger.kernel.org
- S:	Maintained
- T:	git git://linuxtv.org/media_tree.git
--F:	Documentation/devicetree/bindings/media/i2c/imx290.txt
-+F:	Documentation/devicetree/bindings/media/i2c/sony,imx290.yaml
- F:	drivers/media/i2c/imx290.c
- 
- SONY IMX296 SENSOR DRIVER
diff --git a/target/linux/bcm27xx/patches-6.1/950-0650-media-dt-bindings-media-i2c-Add-mono-version-to-IMX2.patch b/target/linux/bcm27xx/patches-6.1/950-0650-media-dt-bindings-media-i2c-Add-mono-version-to-IMX2.patch
deleted file mode 100644
index f07cd8d44e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0650-media-dt-bindings-media-i2c-Add-mono-version-to-IMX2.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 695dadec7459162f4945320081c9c4d2712406a4 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 16 Feb 2023 00:29:49 +0200
-Subject: [PATCH] media: dt-bindings: media: i2c: Add mono version to
- IMX290 bindings
-
-Should be upstream commit f0c720ff2d21
-
-The IMX290 module is available as either monochrome or colour and
-the variant is not detectable at runtime.
-
-Add a new compatible string for the monochrome version, based on the
-full device name IMX290LLR. For consistency, add a new compatible string
-for the colour version based on the IMX290LQR full device name, and
-deprecate the current ambiguous compatible string.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Acked-by: Rob Herring <robh@kernel.org>
-Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Tested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- .../bindings/media/i2c/sony,imx290.yaml       | 24 +++++++++++++------
- 1 file changed, 17 insertions(+), 7 deletions(-)
-
---- a/Documentation/devicetree/bindings/media/i2c/sony,imx290.yaml
-+++ b/Documentation/devicetree/bindings/media/i2c/sony,imx290.yaml
-@@ -12,15 +12,25 @@ maintainers:
- 
- description: |-
-   The Sony IMX290 is a 1/2.8-Inch CMOS Solid-state image sensor with Square
--  Pixel for Color Cameras. It is programmable through I2C and 4-wire
--  interfaces. The sensor output is available via CMOS logic parallel SDR
--  output, Low voltage LVDS DDR output and CSI-2 serial data output. The CSI-2
--  bus is the default. No bindings have been defined for the other busses.
-+  Pixel, available in either mono or colour variants. It is programmable
-+  through I2C and 4-wire interfaces.
-+
-+  The sensor output is available via CMOS logic parallel SDR output, Low voltage
-+  LVDS DDR output and CSI-2 serial data output. The CSI-2 bus is the default.
-+  No bindings have been defined for the other busses.
-+
-+  imx290lqr is the full model identifier for the colour variant. "sony,imx290"
-+  is treated the same as this as it was the original compatible string.
-+  imx290llr is the mono version of the sensor.
- 
- properties:
-   compatible:
--    enum:
--      - sony,imx290
-+    oneOf:
-+      - enum:
-+          - sony,imx290lqr # Colour
-+          - sony,imx290llr # Monochrome
-+      - const: sony,imx290
-+        deprecated: true
- 
-   reg:
-     maxItems: 1
-@@ -101,7 +111,7 @@ examples:
-         #size-cells = <0>;
- 
-         imx290: camera-sensor@1a {
--            compatible = "sony,imx290";
-+            compatible = "sony,imx290lqr";
-             reg = <0x1a>;
- 
-             pinctrl-names = "default";
diff --git a/target/linux/bcm27xx/patches-6.1/950-0651-media-dt-bindings-media-i2c-Add-imx327-version-to-IM.patch b/target/linux/bcm27xx/patches-6.1/950-0651-media-dt-bindings-media-i2c-Add-imx327-version-to-IM.patch
deleted file mode 100644
index 2fdfd3e333..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0651-media-dt-bindings-media-i2c-Add-imx327-version-to-IM.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a78f785e776c674f8151a53243245890040be5e6 Mon Sep 17 00:00:00 2001
-From: Alexander Stein <alexander.stein@ew.tq-group.com>
-Date: Fri, 17 Feb 2023 10:52:20 +0100
-Subject: [PATCH] media: dt-bindings: media: i2c: Add imx327 version to
- IMX327 bindings
-
-Should be upstream commit 783ecfe5556a
-
-The imx290 driver can be used for both imx290 and imx327 as they have a
-similar register set and configuration. imx327 lacks 8 lanes LVDS and
-120 FPS support.
-
-Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- Documentation/devicetree/bindings/media/i2c/sony,imx290.yaml | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/Documentation/devicetree/bindings/media/i2c/sony,imx290.yaml
-+++ b/Documentation/devicetree/bindings/media/i2c/sony,imx290.yaml
-@@ -29,6 +29,7 @@ properties:
-       - enum:
-           - sony,imx290lqr # Colour
-           - sony,imx290llr # Monochrome
-+          - sony,imx327lqr # Colour
-       - const: sony,imx290
-         deprecated: true
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0652-media-i2c-imx290-Make-use-of-get_unaligned_le24-put_.patch b/target/linux/bcm27xx/patches-6.1/950-0652-media-i2c-imx290-Make-use-of-get_unaligned_le24-put_.patch
deleted file mode 100644
index 1e322e4f91..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0652-media-i2c-imx290-Make-use-of-get_unaligned_le24-put_.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From e6a7be26a288f293847b92fe6333bb981eb74ba3 Mon Sep 17 00:00:00 2001
-From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Date: Fri, 10 Feb 2023 00:12:05 +0200
-Subject: [PATCH] media: i2c: imx290: Make use of get_unaligned_le24(),
- put_unaligned_le24()
-
-Should be upstream commit 5d129c4539c3
-
-Since we have a proper endianness converters for LE 24-bit data use them.
-
-Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -16,6 +16,9 @@
- #include <linux/pm_runtime.h>
- #include <linux/regmap.h>
- #include <linux/regulator/consumer.h>
-+
-+#include <asm/unaligned.h>
-+
- #include <media/media-entity.h>
- #include <media/v4l2-ctrls.h>
- #include <media/v4l2-device.h>
-@@ -466,18 +469,20 @@ static int __always_unused imx290_read(s
- 		return ret;
- 	}
- 
--	*value = (data[2] << 16) | (data[1] << 8) | data[0];
-+	*value = get_unaligned_le24(data);
- 	return 0;
- }
- 
- static int imx290_write(struct imx290 *imx290, u32 addr, u32 value, int *err)
- {
--	u8 data[3] = { value & 0xff, (value >> 8) & 0xff, value >> 16 };
-+	u8 data[3];
- 	int ret;
- 
- 	if (err && *err)
- 		return *err;
- 
-+	put_unaligned_le24(value, data);
-+
- 	ret = regmap_raw_write(imx290->regmap, addr & IMX290_REG_ADDR_MASK,
- 			       data, (addr >> IMX290_REG_SIZE_SHIFT) & 3);
- 	if (ret < 0) {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0653-media-i2c-imx290-Use-device_property_read_u32-direct.patch b/target/linux/bcm27xx/patches-6.1/950-0653-media-i2c-imx290-Use-device_property_read_u32-direct.patch
deleted file mode 100644
index 593dab94f8..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0653-media-i2c-imx290-Use-device_property_read_u32-direct.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 6555dd4a687f121572a91ad9333a81991be8b266 Mon Sep 17 00:00:00 2001
-From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Date: Fri, 10 Feb 2023 00:09:54 +0200
-Subject: [PATCH] media: i2c: imx290: Use device_property_read_u32()
- directly
-
-Should be upstream commit 971458482809
-
-No need to call fwnode_property_read_u32(dev_fwnode()), when
-we have already existing helper. So use it.
-
-Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -1137,8 +1137,8 @@ static int imx290_init_clk(struct imx290
- 	u32 xclk_freq;
- 	int ret;
- 
--	ret = fwnode_property_read_u32(dev_fwnode(imx290->dev),
--				       "clock-frequency", &xclk_freq);
-+	ret = device_property_read_u32(imx290->dev, "clock-frequency",
-+				       &xclk_freq);
- 	if (ret) {
- 		dev_err(imx290->dev, "Could not get xclk frequency\n");
- 		return ret;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0654-media-i2c-imx290-Add-support-for-the-mono-sensor-var.patch b/target/linux/bcm27xx/patches-6.1/950-0654-media-i2c-imx290-Add-support-for-the-mono-sensor-var.patch
deleted file mode 100644
index 71b520eb8c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0654-media-i2c-imx290-Add-support-for-the-mono-sensor-var.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From d0cc0819d6750d39624741d9091ab3f73836f11b Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 16 Feb 2023 00:29:50 +0200
-Subject: [PATCH] media: i2c: imx290: Add support for the mono sensor
- variant
-
-Should be upstream commit 9bf52c7136d1
-
-The IMX290 module is available as either mono or colour (Bayer).
-
-Update the driver so that it can advertise the correct mono
-formats instead of the colour ones.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Tested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 75 +++++++++++++++++++++++++++++++-------
- 1 file changed, 61 insertions(+), 14 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -13,6 +13,7 @@
- #include <linux/gpio/consumer.h>
- #include <linux/i2c.h>
- #include <linux/module.h>
-+#include <linux/of_device.h>
- #include <linux/pm_runtime.h>
- #include <linux/regmap.h>
- #include <linux/regulator/consumer.h>
-@@ -160,6 +161,21 @@
- 
- #define IMX290_NUM_SUPPLIES				3
- 
-+enum imx290_colour_variant {
-+	IMX290_VARIANT_COLOUR,
-+	IMX290_VARIANT_MONO,
-+	IMX290_VARIANT_MAX
-+};
-+
-+enum imx290_model {
-+	IMX290_MODEL_IMX290LQR,
-+	IMX290_MODEL_IMX290LLR,
-+};
-+
-+struct imx290_model_info {
-+	enum imx290_colour_variant colour_variant;
-+};
-+
- struct imx290_regval {
- 	u32 reg;
- 	u32 val;
-@@ -180,6 +196,7 @@ struct imx290 {
- 	struct clk *xclk;
- 	struct regmap *regmap;
- 	u8 nlanes;
-+	const struct imx290_model_info *model;
- 
- 	struct v4l2_subdev sd;
- 	struct media_pad pad;
-@@ -417,7 +434,7 @@ static inline int imx290_modes_num(const
- }
- 
- struct imx290_format_info {
--	u32 code;
-+	u32 code[IMX290_VARIANT_MAX];
- 	u8 bpp;
- 	const struct imx290_regval *regs;
- 	unsigned int num_regs;
-@@ -425,26 +442,33 @@ struct imx290_format_info {
- 
- static const struct imx290_format_info imx290_formats[] = {
- 	{
--		.code = MEDIA_BUS_FMT_SRGGB10_1X10,
-+		.code = {
-+			[IMX290_VARIANT_COLOUR] = MEDIA_BUS_FMT_SRGGB10_1X10,
-+			[IMX290_VARIANT_MONO] = MEDIA_BUS_FMT_Y10_1X10
-+		},
- 		.bpp = 10,
- 		.regs = imx290_10bit_settings,
- 		.num_regs = ARRAY_SIZE(imx290_10bit_settings),
- 	}, {
--		.code = MEDIA_BUS_FMT_SRGGB12_1X12,
-+		.code = {
-+			[IMX290_VARIANT_COLOUR] = MEDIA_BUS_FMT_SRGGB12_1X12,
-+			[IMX290_VARIANT_MONO] = MEDIA_BUS_FMT_Y12_1X12
-+		},
- 		.bpp = 12,
- 		.regs = imx290_12bit_settings,
- 		.num_regs = ARRAY_SIZE(imx290_12bit_settings),
- 	}
- };
- 
--static const struct imx290_format_info *imx290_format_info(u32 code)
-+static const struct imx290_format_info *
-+imx290_format_info(const struct imx290 *imx290, u32 code)
- {
- 	unsigned int i;
- 
- 	for (i = 0; i < ARRAY_SIZE(imx290_formats); ++i) {
- 		const struct imx290_format_info *info = &imx290_formats[i];
- 
--		if (info->code == code)
-+		if (info->code[imx290->model->colour_variant] == code)
- 			return info;
- 	}
- 
-@@ -541,7 +565,7 @@ static int imx290_set_black_level(struct
- 				  const struct v4l2_mbus_framefmt *format,
- 				  unsigned int black_level, int *err)
- {
--	unsigned int bpp = imx290_format_info(format->code)->bpp;
-+	unsigned int bpp = imx290_format_info(imx290, format->code)->bpp;
- 
- 	return imx290_write(imx290, IMX290_BLKLEVEL,
- 			    black_level >> (16 - bpp), err);
-@@ -553,7 +577,7 @@ static int imx290_setup_format(struct im
- 	const struct imx290_format_info *info;
- 	int ret;
- 
--	info = imx290_format_info(format->code);
-+	info = imx290_format_info(imx290, format->code);
- 
- 	ret = imx290_set_register_array(imx290, info->regs, info->num_regs);
- 	if (ret < 0) {
-@@ -654,7 +678,7 @@ static void imx290_ctrl_update(struct im
- 
- 	/* pixel rate = link_freq * 2 * nr_of_lanes / bits_per_sample */
- 	pixel_rate = link_freq * 2 * imx290->nlanes;
--	do_div(pixel_rate, imx290_format_info(format->code)->bpp);
-+	do_div(pixel_rate, imx290_format_info(imx290, format->code)->bpp);
- 
- 	__v4l2_ctrl_s_ctrl(imx290->link_freq, mode->link_freq_index);
- 	__v4l2_ctrl_s_ctrl_int64(imx290->pixel_rate, pixel_rate);
-@@ -849,10 +873,12 @@ static int imx290_enum_mbus_code(struct
- 				 struct v4l2_subdev_state *sd_state,
- 				 struct v4l2_subdev_mbus_code_enum *code)
- {
-+	const struct imx290 *imx290 = to_imx290(sd);
-+
- 	if (code->index >= ARRAY_SIZE(imx290_formats))
- 		return -EINVAL;
- 
--	code->code = imx290_formats[code->index].code;
-+	code->code = imx290_formats[code->index].code[imx290->model->colour_variant];
- 
- 	return 0;
- }
-@@ -864,7 +890,7 @@ static int imx290_enum_frame_size(struct
- 	const struct imx290 *imx290 = to_imx290(sd);
- 	const struct imx290_mode *imx290_modes = imx290_modes_ptr(imx290);
- 
--	if (!imx290_format_info(fse->code))
-+	if (!imx290_format_info(imx290, fse->code))
- 		return -EINVAL;
- 
- 	if (fse->index >= imx290_modes_num(imx290))
-@@ -893,8 +919,8 @@ static int imx290_set_fmt(struct v4l2_su
- 	fmt->format.width = mode->width;
- 	fmt->format.height = mode->height;
- 
--	if (!imx290_format_info(fmt->format.code))
--		fmt->format.code = imx290_formats[0].code;
-+	if (!imx290_format_info(imx290, fmt->format.code))
-+		fmt->format.code = imx290_formats[0].code[imx290->model->colour_variant];
- 
- 	fmt->format.field = V4L2_FIELD_NONE;
- 
-@@ -1182,6 +1208,15 @@ static s64 imx290_check_link_freqs(const
- 	return 0;
- }
- 
-+static const struct imx290_model_info imx290_models[] = {
-+	[IMX290_MODEL_IMX290LQR] = {
-+		.colour_variant = IMX290_VARIANT_COLOUR,
-+	},
-+	[IMX290_MODEL_IMX290LLR] = {
-+		.colour_variant = IMX290_VARIANT_MONO,
-+	},
-+};
-+
- static int imx290_parse_dt(struct imx290 *imx290)
- {
- 	/* Only CSI2 is supported for now: */
-@@ -1192,6 +1227,8 @@ static int imx290_parse_dt(struct imx290
- 	int ret;
- 	s64 fq;
- 
-+	imx290->model = of_device_get_match_data(imx290->dev);
-+
- 	endpoint = fwnode_graph_get_next_endpoint(dev_fwnode(imx290->dev), NULL);
- 	if (!endpoint) {
- 		dev_err(imx290->dev, "Endpoint node not found\n");
-@@ -1357,8 +1394,18 @@ static void imx290_remove(struct i2c_cli
- }
- 
- static const struct of_device_id imx290_of_match[] = {
--	{ .compatible = "sony,imx290" },
--	{ /* sentinel */ }
-+	{
-+		/* Deprecated - synonym for "sony,imx290lqr" */
-+		.compatible = "sony,imx290",
-+		.data = &imx290_models[IMX290_MODEL_IMX290LQR],
-+	}, {
-+		.compatible = "sony,imx290lqr",
-+		.data = &imx290_models[IMX290_MODEL_IMX290LQR],
-+	}, {
-+		.compatible = "sony,imx290llr",
-+		.data = &imx290_models[IMX290_MODEL_IMX290LLR],
-+	},
-+	{ /* sentinel */ },
- };
- MODULE_DEVICE_TABLE(of, imx290_of_match);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0655-media-i2c-imx290-Match-kernel-coding-style-on-whites.patch b/target/linux/bcm27xx/patches-6.1/950-0655-media-i2c-imx290-Match-kernel-coding-style-on-whites.patch
deleted file mode 100644
index 42d8c2d382..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0655-media-i2c-imx290-Match-kernel-coding-style-on-whites.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From db282fbb46900d381eec2ef3d15cf84c5048b120 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 16 Feb 2023 00:29:51 +0200
-Subject: [PATCH] media: i2c: imx290: Match kernel coding style on
- whitespace
-
-Should be upstream commit 76d1bd4f0f45
-
-Fix up a couple of coding style issues regarding missing blank
-lines after declarations, double blank lines, and incorrect
-indentation.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -109,7 +109,6 @@
- 
- #define IMX290_VMAX_DEFAULT				1125
- 
--
- /*
-  * The IMX290 pixel array is organized as follows:
-  *
-@@ -353,6 +352,7 @@ static const s64 imx290_link_freq_2lanes
- 	[FREQ_INDEX_1080P] = 445500000,
- 	[FREQ_INDEX_720P] = 297000000,
- };
-+
- static const s64 imx290_link_freq_4lanes[] = {
- 	[FREQ_INDEX_1080P] = 222750000,
- 	[FREQ_INDEX_720P] = 148500000,
-@@ -488,7 +488,7 @@ static int __always_unused imx290_read(s
- 			      data, (addr >> IMX290_REG_SIZE_SHIFT) & 3);
- 	if (ret < 0) {
- 		dev_err(imx290->dev, "%u-bit read from 0x%04x failed: %d\n",
--			 ((addr >> IMX290_REG_SIZE_SHIFT) & 3) * 8,
-+			((addr >> IMX290_REG_SIZE_SHIFT) & 3) * 8,
- 			 addr & IMX290_REG_ADDR_MASK, ret);
- 		return ret;
- 	}
-@@ -511,7 +511,7 @@ static int imx290_write(struct imx290 *i
- 			       data, (addr >> IMX290_REG_SIZE_SHIFT) & 3);
- 	if (ret < 0) {
- 		dev_err(imx290->dev, "%u-bit write to 0x%04x failed: %d\n",
--			 ((addr >> IMX290_REG_SIZE_SHIFT) & 3) * 8,
-+			((addr >> IMX290_REG_SIZE_SHIFT) & 3) * 8,
- 			 addr & IMX290_REG_ADDR_MASK, ret);
- 		if (err)
- 			*err = ret;
-@@ -777,8 +777,7 @@ static int imx290_start_streaming(struct
- 
- 	/* Set init register settings */
- 	ret = imx290_set_register_array(imx290, imx290_global_init_settings,
--					ARRAY_SIZE(
--						imx290_global_init_settings));
-+					ARRAY_SIZE(imx290_global_init_settings));
- 	if (ret < 0) {
- 		dev_err(imx290->dev, "Could not set init registers\n");
- 		return ret;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0656-media-i2c-imx290-Set-the-colorspace-fields-in-the-fo.patch b/target/linux/bcm27xx/patches-6.1/950-0656-media-i2c-imx290-Set-the-colorspace-fields-in-the-fo.patch
deleted file mode 100644
index 6f5756e3c2..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0656-media-i2c-imx290-Set-the-colorspace-fields-in-the-fo.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From afa7161b9e5d42ca8efc5cf08e88f9dfc58b786c Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 16 Feb 2023 00:29:52 +0200
-Subject: [PATCH] media: i2c: imx290: Set the colorspace fields in the
- format
-
-Should be upstream commit 7843b2eb081b
-
-The colorspace fields were left untouched in imx290_set_fmt
-which lead to a v4l2-compliance failure.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -922,6 +922,10 @@ static int imx290_set_fmt(struct v4l2_su
- 		fmt->format.code = imx290_formats[0].code[imx290->model->colour_variant];
- 
- 	fmt->format.field = V4L2_FIELD_NONE;
-+	fmt->format.colorspace = V4L2_COLORSPACE_RAW;
-+	fmt->format.ycbcr_enc = V4L2_YCBCR_ENC_601;
-+	fmt->format.quantization = V4L2_QUANTIZATION_FULL_RANGE;
-+	fmt->format.xfer_func = V4L2_XFER_FUNC_NONE;
- 
- 	format = v4l2_subdev_get_pad_format(sd, sd_state, 0);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0657-media-i2c-imx290-Add-V4L2_SUBDEV_FL_HAS_EVENTS-and-s.patch b/target/linux/bcm27xx/patches-6.1/950-0657-media-i2c-imx290-Add-V4L2_SUBDEV_FL_HAS_EVENTS-and-s.patch
deleted file mode 100644
index 1fdd8c4662..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0657-media-i2c-imx290-Add-V4L2_SUBDEV_FL_HAS_EVENTS-and-s.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 418b65e7035604266a598945beebdc30f6d58458 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 16 Feb 2023 00:29:53 +0200
-Subject: [PATCH] media: i2c: imx290: Add V4L2_SUBDEV_FL_HAS_EVENTS and
- subscribe hooks
-
-Should be upstream commit 5f9dee39ab55
-
-Any V4L2 subdevice that implements controls and declares
-V4L2_SUBDEV_FL_HAS_DEVNODE should also declare V4L2_SUBDEV_FL_HAS_EVENTS
-and implement subscribe_event and unsubscribe_event hooks.
-
-This driver didn't and would therefore fail v4l2-compliance
-testing.
-
-Add the relevant hooks.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -23,6 +23,7 @@
- #include <media/media-entity.h>
- #include <media/v4l2-ctrls.h>
- #include <media/v4l2-device.h>
-+#include <media/v4l2-event.h>
- #include <media/v4l2-fwnode.h>
- #include <media/v4l2-subdev.h>
- 
-@@ -998,6 +999,11 @@ static int imx290_entity_init_cfg(struct
- 	return 0;
- }
- 
-+static const struct v4l2_subdev_core_ops imx290_core_ops = {
-+	.subscribe_event = v4l2_ctrl_subdev_subscribe_event,
-+	.unsubscribe_event = v4l2_event_subdev_unsubscribe,
-+};
-+
- static const struct v4l2_subdev_video_ops imx290_video_ops = {
- 	.s_stream = imx290_set_stream,
- };
-@@ -1012,6 +1018,7 @@ static const struct v4l2_subdev_pad_ops
- };
- 
- static const struct v4l2_subdev_ops imx290_subdev_ops = {
-+	.core = &imx290_core_ops,
- 	.video = &imx290_video_ops,
- 	.pad = &imx290_pad_ops,
- };
-@@ -1030,7 +1037,8 @@ static int imx290_subdev_init(struct imx
- 	imx290->current_mode = &imx290_modes_ptr(imx290)[0];
- 
- 	v4l2_i2c_subdev_init(&imx290->sd, client, &imx290_subdev_ops);
--	imx290->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
-+	imx290->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE |
-+			    V4L2_SUBDEV_FL_HAS_EVENTS;
- 	imx290->sd.dev = imx290->dev;
- 	imx290->sd.entity.ops = &imx290_subdev_entity_ops;
- 	imx290->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0658-media-i2c-imx290-Fix-the-pixel-rate-at-148.5Mpix-s.patch b/target/linux/bcm27xx/patches-6.1/950-0658-media-i2c-imx290-Fix-the-pixel-rate-at-148.5Mpix-s.patch
deleted file mode 100644
index b5f8bab194..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0658-media-i2c-imx290-Fix-the-pixel-rate-at-148.5Mpix-s.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 5003200e5b6e1485515fe18aa5031769930e465e Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 16 Feb 2023 00:29:54 +0200
-Subject: [PATCH] media: i2c: imx290: Fix the pixel rate at 148.5Mpix/s
-
-Should be upstream commit 4381df0c756f
-
-The datasheet lists the link frequency changes between
-1080p and 720p modes. This is correct that the link frequency
-changes as measured on an oscilloscope.
-
-Link frequency is not necessarily the same as pixel rate.
-
-The datasheet gives standard configurations for 1080p and 720p
-modes at a number of frame rates.
-Looking at the 1080p mode it gives:
-HMAX = 0x898 = 2200
-VMAX = 0x465 = 1125
-2200 * 1125 * 60fps = 148.5MPix/s
-
-Looking at the 720p mode it gives:
-HMAX = 0xce4 = 3300
-VMAX = 0x2ee = 750
-3300 * 750 * 60fps = 148.5Mpix/s
-
-This driver currently scales the pixel rate proportionally to the
-link frequency, however the above shows that this is not the
-correct thing to do, and currently all frame rate and exposure
-calculations give incorrect results.
-
-Correctly report the pixel rate as being 148.5MPix/s under any
-mode.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 16 +++++-----------
- 1 file changed, 5 insertions(+), 11 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -110,6 +110,8 @@
- 
- #define IMX290_VMAX_DEFAULT				1125
- 
-+#define IMX290_PIXEL_RATE				148500000
-+
- /*
-  * The IMX290 pixel array is organized as follows:
-  *
-@@ -208,7 +210,6 @@ struct imx290 {
- 
- 	struct v4l2_ctrl_handler ctrls;
- 	struct v4l2_ctrl *link_freq;
--	struct v4l2_ctrl *pixel_rate;
- 	struct v4l2_ctrl *hblank;
- 	struct v4l2_ctrl *vblank;
- };
-@@ -674,15 +675,8 @@ static void imx290_ctrl_update(struct im
- {
- 	unsigned int hblank = mode->hmax - mode->width;
- 	unsigned int vblank = IMX290_VMAX_DEFAULT - mode->height;
--	s64 link_freq = imx290_link_freqs_ptr(imx290)[mode->link_freq_index];
--	u64 pixel_rate;
--
--	/* pixel rate = link_freq * 2 * nr_of_lanes / bits_per_sample */
--	pixel_rate = link_freq * 2 * imx290->nlanes;
--	do_div(pixel_rate, imx290_format_info(imx290, format->code)->bpp);
- 
- 	__v4l2_ctrl_s_ctrl(imx290->link_freq, mode->link_freq_index);
--	__v4l2_ctrl_s_ctrl_int64(imx290->pixel_rate, pixel_rate);
- 
- 	__v4l2_ctrl_modify_range(imx290->hblank, hblank, hblank, 1, hblank);
- 	__v4l2_ctrl_modify_range(imx290->vblank, vblank, vblank, 1, vblank);
-@@ -732,9 +726,9 @@ static int imx290_ctrl_init(struct imx29
- 	if (imx290->link_freq)
- 		imx290->link_freq->flags |= V4L2_CTRL_FLAG_READ_ONLY;
- 
--	imx290->pixel_rate = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
--					       V4L2_CID_PIXEL_RATE,
--					       1, INT_MAX, 1, 1);
-+	v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops, V4L2_CID_PIXEL_RATE,
-+			  IMX290_PIXEL_RATE, IMX290_PIXEL_RATE, 1,
-+			  IMX290_PIXEL_RATE);
- 
- 	v4l2_ctrl_new_std_menu_items(&imx290->ctrls, &imx290_ctrl_ops,
- 				     V4L2_CID_TEST_PATTERN,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0659-media-i2c-imx290-Support-60fps-in-2-lane-operation.patch b/target/linux/bcm27xx/patches-6.1/950-0659-media-i2c-imx290-Support-60fps-in-2-lane-operation.patch
deleted file mode 100644
index 01e51faeaf..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0659-media-i2c-imx290-Support-60fps-in-2-lane-operation.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 9d6d7d83aacafc8b0bbf7b2b9b8a7622c4060bec Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 16 Feb 2023 00:29:55 +0200
-Subject: [PATCH] media: i2c: imx290: Support 60fps in 2 lane operation
-
-Should be upstream commit 7d4f22ba99cc
-
-Commit "97589ad61c73 media: i2c: imx290: Add support for 2 data lanes"
-added support for running in two lane mode (instead of 4), but
-without changing the link frequency that resulted in a max of 30fps.
-
-Commit "98e0500eadb7 media: i2c: imx290: Add configurable link frequency
-and pixel rate" then doubled the link frequency when in 2 lane mode,
-but didn't undo the correction for running at only 30fps, just extending
-horizontal blanking instead.
-
-Remove the 30fps limit on 2 lane by correcting the register config
-in accordance with the datasheet for 60fps operation over 2 lanes.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 17 +++--------------
- 1 file changed, 3 insertions(+), 14 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -385,7 +385,7 @@ static const struct imx290_mode imx290_m
- 	{
- 		.width = 1920,
- 		.height = 1080,
--		.hmax = 4400,
-+		.hmax = 2200,
- 		.link_freq_index = FREQ_INDEX_1080P,
- 		.data = imx290_1080p_settings,
- 		.data_size = ARRAY_SIZE(imx290_1080p_settings),
-@@ -393,7 +393,7 @@ static const struct imx290_mode imx290_m
- 	{
- 		.width = 1280,
- 		.height = 720,
--		.hmax = 6600,
-+		.hmax = 3300,
- 		.link_freq_index = FREQ_INDEX_720P,
- 		.data = imx290_720p_settings,
- 		.data_size = ARRAY_SIZE(imx290_720p_settings),
-@@ -544,21 +544,10 @@ static int imx290_set_register_array(str
- static int imx290_set_data_lanes(struct imx290 *imx290)
- {
- 	int ret = 0;
--	u32 frsel;
--
--	switch (imx290->nlanes) {
--	case 2:
--	default:
--		frsel = 0x02;
--		break;
--	case 4:
--		frsel = 0x01;
--		break;
--	}
- 
- 	imx290_write(imx290, IMX290_PHY_LANE_NUM, imx290->nlanes - 1, &ret);
- 	imx290_write(imx290, IMX290_CSI_LANE_MODE, imx290->nlanes - 1, &ret);
--	imx290_write(imx290, IMX290_FR_FDG_SEL, frsel, &ret);
-+	imx290_write(imx290, IMX290_FR_FDG_SEL, 0x01, &ret);
- 
- 	return ret;
- }
diff --git a/target/linux/bcm27xx/patches-6.1/950-0660-media-i2c-imx290-Use-CSI-timings-as-per-datasheet.patch b/target/linux/bcm27xx/patches-6.1/950-0660-media-i2c-imx290-Use-CSI-timings-as-per-datasheet.patch
deleted file mode 100644
index b431491ff5..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0660-media-i2c-imx290-Use-CSI-timings-as-per-datasheet.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-From e2f0a5c9cbd4945f715014069b7cc7041bba787b Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 16 Feb 2023 00:29:56 +0200
-Subject: [PATCH] media: i2c: imx290: Use CSI timings as per datasheet
-
-Should be upstream commit 34819ba0b450
-
-Commit "98e0500eadb7 media: i2c: imx290: Add configurable link frequency
-and pixel rate" added support for the increased link frequencies
-on 2 data lanes, but didn't update the CSI timing registers in
-accordance with the datasheet.
-
-Use the specified settings.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 126 +++++++++++++++++++++++++++++++------
- 1 file changed, 106 insertions(+), 20 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -193,6 +193,18 @@ struct imx290_mode {
- 	u32 data_size;
- };
- 
-+struct imx290_csi_cfg {
-+	u16 repetition;
-+	u16 tclkpost;
-+	u16 thszero;
-+	u16 thsprepare;
-+	u16 tclktrail;
-+	u16 thstrail;
-+	u16 tclkzero;
-+	u16 tclkprepare;
-+	u16 tlpx;
-+};
-+
- struct imx290 {
- 	struct device *dev;
- 	struct clk *xclk;
-@@ -292,16 +304,6 @@ static const struct imx290_regval imx290
- 	{ IMX290_INCKSEL4, 0x01 },
- 	{ IMX290_INCKSEL5, 0x1a },
- 	{ IMX290_INCKSEL6, 0x1a },
--	/* data rate settings */
--	{ IMX290_REPETITION, 0x10 },
--	{ IMX290_TCLKPOST, 87 },
--	{ IMX290_THSZERO, 55 },
--	{ IMX290_THSPREPARE, 31 },
--	{ IMX290_TCLKTRAIL, 31 },
--	{ IMX290_THSTRAIL, 31 },
--	{ IMX290_TCLKZERO, 119 },
--	{ IMX290_TCLKPREPARE, 31 },
--	{ IMX290_TLPX, 23 },
- };
- 
- static const struct imx290_regval imx290_720p_settings[] = {
-@@ -317,16 +319,6 @@ static const struct imx290_regval imx290
- 	{ IMX290_INCKSEL4, 0x01 },
- 	{ IMX290_INCKSEL5, 0x1a },
- 	{ IMX290_INCKSEL6, 0x1a },
--	/* data rate settings */
--	{ IMX290_REPETITION, 0x10 },
--	{ IMX290_TCLKPOST, 79 },
--	{ IMX290_THSZERO, 47 },
--	{ IMX290_THSPREPARE, 23 },
--	{ IMX290_TCLKTRAIL, 23 },
--	{ IMX290_THSTRAIL, 23 },
--	{ IMX290_TCLKZERO, 87 },
--	{ IMX290_TCLKPREPARE, 23 },
--	{ IMX290_TLPX, 23 },
- };
- 
- static const struct imx290_regval imx290_10bit_settings[] = {
-@@ -347,6 +339,58 @@ static const struct imx290_regval imx290
- 	{ IMX290_CSI_DT_FMT, IMX290_CSI_DT_FMT_RAW12 },
- };
- 
-+static const struct imx290_csi_cfg imx290_csi_222_75mhz = {
-+	/* 222.75MHz or 445.5Mbit/s per lane */
-+	.repetition = 0x10,
-+	.tclkpost = 87,
-+	.thszero = 55,
-+	.thsprepare = 31,
-+	.tclktrail = 31,
-+	.thstrail = 31,
-+	.tclkzero = 119,
-+	.tclkprepare = 31,
-+	.tlpx = 23,
-+};
-+
-+static const struct imx290_csi_cfg imx290_csi_445_5mhz = {
-+	/* 445.5MHz or 891Mbit/s per lane */
-+	.repetition = 0x00,
-+	.tclkpost = 119,
-+	.thszero = 103,
-+	.thsprepare = 71,
-+	.tclktrail = 55,
-+	.thstrail = 63,
-+	.tclkzero = 255,
-+	.tclkprepare = 63,
-+	.tlpx = 55,
-+};
-+
-+static const struct imx290_csi_cfg imx290_csi_148_5mhz = {
-+	/* 148.5MHz or 297Mbit/s per lane */
-+	.repetition = 0x10,
-+	.tclkpost = 79,
-+	.thszero = 47,
-+	.thsprepare = 23,
-+	.tclktrail = 23,
-+	.thstrail = 23,
-+	.tclkzero = 87,
-+	.tclkprepare = 23,
-+	.tlpx = 23,
-+};
-+
-+static const struct imx290_csi_cfg imx290_csi_297mhz = {
-+	/* 297MHz or 594Mbit/s per lane */
-+	.repetition = 0x00,
-+	.tclkpost = 103,
-+	.thszero = 87,
-+	.thsprepare = 47,
-+	.tclktrail = 39,
-+	.thstrail = 47,
-+	.tclkzero = 191,
-+	.tclkprepare = 47,
-+	.tlpx = 39,
-+};
-+
- /* supported link frequencies */
- #define FREQ_INDEX_1080P	0
- #define FREQ_INDEX_720P		1
-@@ -562,6 +606,42 @@ static int imx290_set_black_level(struct
- 			    black_level >> (16 - bpp), err);
- }
- 
-+static int imx290_set_csi_config(struct imx290 *imx290)
-+{
-+	const s64 *link_freqs = imx290_link_freqs_ptr(imx290);
-+	const struct imx290_csi_cfg *csi_cfg;
-+	int ret = 0;
-+
-+	switch (link_freqs[imx290->current_mode->link_freq_index]) {
-+	case 445500000:
-+		csi_cfg = &imx290_csi_445_5mhz;
-+		break;
-+	case 297000000:
-+		csi_cfg = &imx290_csi_297mhz;
-+		break;
-+	case 222750000:
-+		csi_cfg = &imx290_csi_222_75mhz;
-+		break;
-+	case 148500000:
-+		csi_cfg = &imx290_csi_148_5mhz;
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	imx290_write(imx290, IMX290_REPETITION, csi_cfg->repetition, &ret);
-+	imx290_write(imx290, IMX290_TCLKPOST, csi_cfg->tclkpost, &ret);
-+	imx290_write(imx290, IMX290_THSZERO, csi_cfg->thszero, &ret);
-+	imx290_write(imx290, IMX290_THSPREPARE, csi_cfg->thsprepare, &ret);
-+	imx290_write(imx290, IMX290_TCLKTRAIL, csi_cfg->tclktrail, &ret);
-+	imx290_write(imx290, IMX290_THSTRAIL, csi_cfg->thstrail, &ret);
-+	imx290_write(imx290, IMX290_TCLKZERO, csi_cfg->tclkzero, &ret);
-+	imx290_write(imx290, IMX290_TCLKPREPARE, csi_cfg->tclkprepare, &ret);
-+	imx290_write(imx290, IMX290_TLPX, csi_cfg->tlpx, &ret);
-+
-+	return ret;
-+}
-+
- static int imx290_setup_format(struct imx290 *imx290,
- 			       const struct v4l2_mbus_framefmt *format)
- {
-@@ -774,6 +854,12 @@ static int imx290_start_streaming(struct
- 		return ret;
- 	}
- 
-+	ret = imx290_set_csi_config(imx290);
-+	if (ret < 0) {
-+		dev_err(imx290->dev, "Could not set csi cfg\n");
-+		return ret;
-+	}
-+
- 	/* Apply the register values related to current frame format */
- 	format = v4l2_subdev_get_pad_format(&imx290->sd, state, 0);
- 	ret = imx290_setup_format(imx290, format);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0661-media-i2c-imx290-Convert-V4L2_CID_HBLANK-to-read-wri.patch b/target/linux/bcm27xx/patches-6.1/950-0661-media-i2c-imx290-Convert-V4L2_CID_HBLANK-to-read-wri.patch
deleted file mode 100644
index 28682d4574..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0661-media-i2c-imx290-Convert-V4L2_CID_HBLANK-to-read-wri.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From 98105970373a9e79dcaa4291f2802b1dd9fe909e Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 16 Feb 2023 00:29:57 +0200
-Subject: [PATCH] media: i2c: imx290: Convert V4L2_CID_HBLANK to
- read/write
-
-Should be upstream commit 8cab2bd86307
-
-The driver exposed V4L2_CID_HBLANK as a read only control to allow
-for exposure calculations and determination of the frame rate.
-
-Convert to a read/write control so that the frame rate can be
-controlled.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 33 +++++++++++++++++++--------------
- 1 file changed, 19 insertions(+), 14 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -50,6 +50,7 @@
- #define IMX290_GAIN					IMX290_REG_8BIT(0x3014)
- #define IMX290_VMAX					IMX290_REG_24BIT(0x3018)
- #define IMX290_HMAX					IMX290_REG_16BIT(0x301c)
-+#define IMX290_HMAX_MAX					0xffff
- #define IMX290_SHS1					IMX290_REG_24BIT(0x3020)
- #define IMX290_WINWV_OB					IMX290_REG_8BIT(0x303a)
- #define IMX290_WINPV					IMX290_REG_16BIT(0x303c)
-@@ -186,7 +187,7 @@ struct imx290_regval {
- struct imx290_mode {
- 	u32 width;
- 	u32 height;
--	u32 hmax;
-+	u32 hmax_min;
- 	u8 link_freq_index;
- 
- 	const struct imx290_regval *data;
-@@ -429,7 +430,7 @@ static const struct imx290_mode imx290_m
- 	{
- 		.width = 1920,
- 		.height = 1080,
--		.hmax = 2200,
-+		.hmax_min = 2200,
- 		.link_freq_index = FREQ_INDEX_1080P,
- 		.data = imx290_1080p_settings,
- 		.data_size = ARRAY_SIZE(imx290_1080p_settings),
-@@ -437,7 +438,7 @@ static const struct imx290_mode imx290_m
- 	{
- 		.width = 1280,
- 		.height = 720,
--		.hmax = 3300,
-+		.hmax_min = 3300,
- 		.link_freq_index = FREQ_INDEX_720P,
- 		.data = imx290_720p_settings,
- 		.data_size = ARRAY_SIZE(imx290_720p_settings),
-@@ -448,7 +449,7 @@ static const struct imx290_mode imx290_m
- 	{
- 		.width = 1920,
- 		.height = 1080,
--		.hmax = 2200,
-+		.hmax_min = 2200,
- 		.link_freq_index = FREQ_INDEX_1080P,
- 		.data = imx290_1080p_settings,
- 		.data_size = ARRAY_SIZE(imx290_1080p_settings),
-@@ -456,7 +457,7 @@ static const struct imx290_mode imx290_m
- 	{
- 		.width = 1280,
- 		.height = 720,
--		.hmax = 3300,
-+		.hmax_min = 3300,
- 		.link_freq_index = FREQ_INDEX_720P,
- 		.data = imx290_720p_settings,
- 		.data_size = ARRAY_SIZE(imx290_720p_settings),
-@@ -712,6 +713,12 @@ static int imx290_set_ctrl(struct v4l2_c
- 		}
- 		break;
- 
-+	case V4L2_CID_HBLANK:
-+		ret = imx290_write(imx290, IMX290_HMAX,
-+				   ctrl->val + imx290->current_mode->width,
-+				   NULL);
-+		break;
-+
- 	default:
- 		ret = -EINVAL;
- 		break;
-@@ -742,12 +749,14 @@ static void imx290_ctrl_update(struct im
- 			       const struct v4l2_mbus_framefmt *format,
- 			       const struct imx290_mode *mode)
- {
--	unsigned int hblank = mode->hmax - mode->width;
-+	unsigned int hblank_min = mode->hmax_min - mode->width;
-+	unsigned int hblank_max = IMX290_HMAX_MAX - mode->width;
- 	unsigned int vblank = IMX290_VMAX_DEFAULT - mode->height;
- 
- 	__v4l2_ctrl_s_ctrl(imx290->link_freq, mode->link_freq_index);
- 
--	__v4l2_ctrl_modify_range(imx290->hblank, hblank, hblank, 1, hblank);
-+	__v4l2_ctrl_modify_range(imx290->hblank, hblank_min, hblank_max, 1,
-+				 hblank_min);
- 	__v4l2_ctrl_modify_range(imx290->vblank, vblank, vblank, 1, vblank);
- }
- 
-@@ -804,10 +813,11 @@ static int imx290_ctrl_init(struct imx29
- 				     ARRAY_SIZE(imx290_test_pattern_menu) - 1,
- 				     0, 0, imx290_test_pattern_menu);
- 
-+	/*
-+	 * Actual range will be set from imx290_ctrl_update later in the probe.
-+	 */
- 	imx290->hblank = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
- 					   V4L2_CID_HBLANK, 1, 1, 1, 1);
--	if (imx290->hblank)
--		imx290->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
- 
- 	imx290->vblank = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
- 					   V4L2_CID_VBLANK, 1, 1, 1, 1);
-@@ -876,11 +886,6 @@ static int imx290_start_streaming(struct
- 		return ret;
- 	}
- 
--	ret = imx290_write(imx290, IMX290_HMAX, imx290->current_mode->hmax,
--			   NULL);
--	if (ret)
--		return ret;
--
- 	/* Apply customized values from user */
- 	ret = __v4l2_ctrl_handler_setup(imx290->sd.ctrl_handler);
- 	if (ret) {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0662-media-i2c-imx290-Convert-V4L2_CID_VBLANK-to-read-wri.patch b/target/linux/bcm27xx/patches-6.1/950-0662-media-i2c-imx290-Convert-V4L2_CID_VBLANK-to-read-wri.patch
deleted file mode 100644
index 71a625f260..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0662-media-i2c-imx290-Convert-V4L2_CID_VBLANK-to-read-wri.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-From 421e9f60f24504de605c7bc4ba98e51b73b2aa6d Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 16 Feb 2023 00:29:58 +0200
-Subject: [PATCH] media: i2c: imx290: Convert V4L2_CID_VBLANK to
- read/write
-
-Should be upstream commit 97792a11021b
-
-The driver exposed V4L2_CID_VBLANK as a read only control to allow
-for exposure calculations and determination of the frame rate.
-
-Convert to a read/write control so that the frame rate can be
-controlled.
-V4L2_CID_VBLANK also sets the limits for the exposure control,
-therefore exposure ranges have to be updated when vblank changes
-(either via s_ctrl, or via changing mode).
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Acked-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 58 +++++++++++++++++++++++++++++++-------
- 1 file changed, 48 insertions(+), 10 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -49,6 +49,7 @@
- #define IMX290_BLKLEVEL					IMX290_REG_16BIT(0x300a)
- #define IMX290_GAIN					IMX290_REG_8BIT(0x3014)
- #define IMX290_VMAX					IMX290_REG_24BIT(0x3018)
-+#define IMX290_VMAX_MAX					0x3ffff
- #define IMX290_HMAX					IMX290_REG_16BIT(0x301c)
- #define IMX290_HMAX_MAX					0xffff
- #define IMX290_SHS1					IMX290_REG_24BIT(0x3020)
-@@ -109,6 +110,9 @@
- #define IMX290_PGCTRL_THRU				BIT(1)
- #define IMX290_PGCTRL_MODE(n)				((n) << 4)
- 
-+/* Number of lines by which exposure must be less than VMAX */
-+#define IMX290_EXPOSURE_OFFSET				2
-+
- #define IMX290_VMAX_DEFAULT				1125
- 
- #define IMX290_PIXEL_RATE				148500000
-@@ -225,6 +229,7 @@ struct imx290 {
- 	struct v4l2_ctrl *link_freq;
- 	struct v4l2_ctrl *hblank;
- 	struct v4l2_ctrl *vblank;
-+	struct v4l2_ctrl *exposure;
- };
- 
- static inline struct imx290 *to_imx290(struct v4l2_subdev *_sd)
-@@ -238,7 +243,6 @@ static inline struct imx290 *to_imx290(s
- 
- static const struct imx290_regval imx290_global_init_settings[] = {
- 	{ IMX290_CTRL_07, IMX290_WINMODE_1080P },
--	{ IMX290_VMAX, IMX290_VMAX_DEFAULT },
- 	{ IMX290_EXTCK_FREQ, 0x2520 },
- 	{ IMX290_WINWV_OB, 12 },
- 	{ IMX290_WINPH, 0 },
-@@ -664,6 +668,16 @@ static int imx290_setup_format(struct im
- /* ----------------------------------------------------------------------------
-  * Controls
-  */
-+static void imx290_exposure_update(struct imx290 *imx290,
-+				   const struct imx290_mode *mode)
-+{
-+	unsigned int exposure_max;
-+
-+	exposure_max = imx290->vblank->val + mode->height -
-+		       IMX290_EXPOSURE_OFFSET;
-+	__v4l2_ctrl_modify_range(imx290->exposure, 1, exposure_max, 1,
-+				 exposure_max);
-+}
- 
- static int imx290_set_ctrl(struct v4l2_ctrl *ctrl)
- {
-@@ -671,7 +685,7 @@ static int imx290_set_ctrl(struct v4l2_c
- 					     struct imx290, ctrls);
- 	const struct v4l2_mbus_framefmt *format;
- 	struct v4l2_subdev_state *state;
--	int ret = 0;
-+	int ret = 0, vmax;
- 
- 	/*
- 	 * Return immediately for controls that don't need to be applied to the
-@@ -680,6 +694,11 @@ static int imx290_set_ctrl(struct v4l2_c
- 	if (ctrl->flags & V4L2_CTRL_FLAG_READ_ONLY)
- 		return 0;
- 
-+	if (ctrl->id == V4L2_CID_VBLANK) {
-+		/* Changing vblank changes the allowed range for exposure. */
-+		imx290_exposure_update(imx290, imx290->current_mode);
-+	}
-+
- 	/* V4L2 controls values will be applied only when power is already up */
- 	if (!pm_runtime_get_if_in_use(imx290->dev))
- 		return 0;
-@@ -692,9 +711,23 @@ static int imx290_set_ctrl(struct v4l2_c
- 		ret = imx290_write(imx290, IMX290_GAIN, ctrl->val, NULL);
- 		break;
- 
-+	case V4L2_CID_VBLANK:
-+		ret = imx290_write(imx290, IMX290_VMAX,
-+				   ctrl->val + imx290->current_mode->height,
-+				   NULL);
-+		/*
-+		 * Due to the way that exposure is programmed in this sensor in
-+		 * relation to VMAX, we have to reprogramme it whenever VMAX is
-+		 * changed.
-+		 * Update ctrl so that the V4L2_CID_EXPOSURE case can refer to
-+		 * it.
-+		 */
-+		ctrl = imx290->exposure;
-+		fallthrough;
- 	case V4L2_CID_EXPOSURE:
-+		vmax = imx290->vblank->val + imx290->current_mode->height;
- 		ret = imx290_write(imx290, IMX290_SHS1,
--				   IMX290_VMAX_DEFAULT - ctrl->val - 1, NULL);
-+				   vmax - ctrl->val - 1, NULL);
- 		break;
- 
- 	case V4L2_CID_TEST_PATTERN:
-@@ -751,13 +784,15 @@ static void imx290_ctrl_update(struct im
- {
- 	unsigned int hblank_min = mode->hmax_min - mode->width;
- 	unsigned int hblank_max = IMX290_HMAX_MAX - mode->width;
--	unsigned int vblank = IMX290_VMAX_DEFAULT - mode->height;
-+	unsigned int vblank_min = IMX290_VMAX_DEFAULT - mode->height;
-+	unsigned int vblank_max = IMX290_VMAX_MAX - mode->height;
- 
- 	__v4l2_ctrl_s_ctrl(imx290->link_freq, mode->link_freq_index);
- 
- 	__v4l2_ctrl_modify_range(imx290->hblank, hblank_min, hblank_max, 1,
- 				 hblank_min);
--	__v4l2_ctrl_modify_range(imx290->vblank, vblank, vblank, 1, vblank);
-+	__v4l2_ctrl_modify_range(imx290->vblank, vblank_min, vblank_max, 1,
-+				 vblank_min);
- }
- 
- static int imx290_ctrl_init(struct imx290 *imx290)
-@@ -787,9 +822,13 @@ static int imx290_ctrl_init(struct imx29
- 	v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
- 			  V4L2_CID_ANALOGUE_GAIN, 0, 100, 1, 0);
- 
--	v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
--			  V4L2_CID_EXPOSURE, 1, IMX290_VMAX_DEFAULT - 2, 1,
--			  IMX290_VMAX_DEFAULT - 2);
-+	/*
-+	 * Correct range will be determined through imx290_ctrl_update setting
-+	 * V4L2_CID_VBLANK.
-+	 */
-+	imx290->exposure = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
-+					     V4L2_CID_EXPOSURE, 1, 65535, 1,
-+					     65535);
- 
- 	/*
- 	 * Set the link frequency, pixel rate, horizontal blanking and vertical
-@@ -821,8 +860,6 @@ static int imx290_ctrl_init(struct imx29
- 
- 	imx290->vblank = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
- 					   V4L2_CID_VBLANK, 1, 1, 1, 1);
--	if (imx290->vblank)
--		imx290->vblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
- 
- 	v4l2_ctrl_new_fwnode_properties(&imx290->ctrls, &imx290_ctrl_ops,
- 					&props);
-@@ -1008,6 +1045,7 @@ static int imx290_set_fmt(struct v4l2_su
- 		imx290->current_mode = mode;
- 
- 		imx290_ctrl_update(imx290, &fmt->format, mode);
-+		imx290_exposure_update(imx290, mode);
- 	}
- 
- 	*format = fmt->format;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0663-media-i2c-imx290-VMAX-is-mode-dependent.patch b/target/linux/bcm27xx/patches-6.1/950-0663-media-i2c-imx290-VMAX-is-mode-dependent.patch
deleted file mode 100644
index 56d94855dd..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0663-media-i2c-imx290-VMAX-is-mode-dependent.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From ea3632a2047fe42351c806dddb3d42f96137876e Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 16 Feb 2023 00:29:59 +0200
-Subject: [PATCH] media: i2c: imx290: VMAX is mode dependent
-
-Should be upstream commit b3aa351ea88a
-
-The default VMAX for 60fps in 720p mode is 750 according to the
-datasheet, however the driver always left it at 1125 thereby stopping
-60fps being achieved.
-
-Make VMAX (and therefore V4L2_CID_VBLANK) mode dependent so that 720p60
-can be achieved.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -113,8 +113,6 @@
- /* Number of lines by which exposure must be less than VMAX */
- #define IMX290_EXPOSURE_OFFSET				2
- 
--#define IMX290_VMAX_DEFAULT				1125
--
- #define IMX290_PIXEL_RATE				148500000
- 
- /*
-@@ -192,6 +190,7 @@ struct imx290_mode {
- 	u32 width;
- 	u32 height;
- 	u32 hmax_min;
-+	u32 vmax_min;
- 	u8 link_freq_index;
- 
- 	const struct imx290_regval *data;
-@@ -435,6 +434,7 @@ static const struct imx290_mode imx290_m
- 		.width = 1920,
- 		.height = 1080,
- 		.hmax_min = 2200,
-+		.vmax_min = 1125,
- 		.link_freq_index = FREQ_INDEX_1080P,
- 		.data = imx290_1080p_settings,
- 		.data_size = ARRAY_SIZE(imx290_1080p_settings),
-@@ -443,6 +443,7 @@ static const struct imx290_mode imx290_m
- 		.width = 1280,
- 		.height = 720,
- 		.hmax_min = 3300,
-+		.vmax_min = 750,
- 		.link_freq_index = FREQ_INDEX_720P,
- 		.data = imx290_720p_settings,
- 		.data_size = ARRAY_SIZE(imx290_720p_settings),
-@@ -454,6 +455,7 @@ static const struct imx290_mode imx290_m
- 		.width = 1920,
- 		.height = 1080,
- 		.hmax_min = 2200,
-+		.vmax_min = 1125,
- 		.link_freq_index = FREQ_INDEX_1080P,
- 		.data = imx290_1080p_settings,
- 		.data_size = ARRAY_SIZE(imx290_1080p_settings),
-@@ -462,6 +464,7 @@ static const struct imx290_mode imx290_m
- 		.width = 1280,
- 		.height = 720,
- 		.hmax_min = 3300,
-+		.vmax_min = 750,
- 		.link_freq_index = FREQ_INDEX_720P,
- 		.data = imx290_720p_settings,
- 		.data_size = ARRAY_SIZE(imx290_720p_settings),
-@@ -784,7 +787,7 @@ static void imx290_ctrl_update(struct im
- {
- 	unsigned int hblank_min = mode->hmax_min - mode->width;
- 	unsigned int hblank_max = IMX290_HMAX_MAX - mode->width;
--	unsigned int vblank_min = IMX290_VMAX_DEFAULT - mode->height;
-+	unsigned int vblank_min = mode->vmax_min - mode->height;
- 	unsigned int vblank_max = IMX290_VMAX_MAX - mode->height;
- 
- 	__v4l2_ctrl_s_ctrl(imx290->link_freq, mode->link_freq_index);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0664-media-i2c-imx290-Remove-duplicated-write-to-IMX290_C.patch b/target/linux/bcm27xx/patches-6.1/950-0664-media-i2c-imx290-Remove-duplicated-write-to-IMX290_C.patch
deleted file mode 100644
index 477f8ebd6c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0664-media-i2c-imx290-Remove-duplicated-write-to-IMX290_C.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From e6d94416e7585b5c9b3f5ed0d8de86e57d8da3bb Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 16 Feb 2023 00:30:00 +0200
-Subject: [PATCH] media: i2c: imx290: Remove duplicated write to
- IMX290_CTRL_07
-
-Should be upstream commit 454ce4c6d77b
-
-IMX290_CTRL_07 was written from both imx290_global_init_settings
-and imx290_1080p_settings and imx290_720p_settings.
-
-Remove it from imx290_global_init_settings as the setting varies
-based on the mode.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 1 -
- 1 file changed, 1 deletion(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -241,7 +241,6 @@ static inline struct imx290 *to_imx290(s
-  */
- 
- static const struct imx290_regval imx290_global_init_settings[] = {
--	{ IMX290_CTRL_07, IMX290_WINMODE_1080P },
- 	{ IMX290_EXTCK_FREQ, 0x2520 },
- 	{ IMX290_WINWV_OB, 12 },
- 	{ IMX290_WINPH, 0 },
diff --git a/target/linux/bcm27xx/patches-6.1/950-0665-media-i2c-imx290-Add-support-for-74.25MHz-external-c.patch b/target/linux/bcm27xx/patches-6.1/950-0665-media-i2c-imx290-Add-support-for-74.25MHz-external-c.patch
deleted file mode 100644
index dfbc541c80..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0665-media-i2c-imx290-Add-support-for-74.25MHz-external-c.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-From dcef754861ddd47e88f722abefc768410f1a17d1 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 16 Feb 2023 00:30:01 +0200
-Subject: [PATCH] media: i2c: imx290: Add support for 74.25MHz external
- clock
-
-Should be upstream commit b8b86dfe1aee
-
-The sensor supports either a 37.125 or 74.25MHz external, but
-the driver only supported 37.125MHz.
-
-Add the relevant register configuration for either clock
-frequency option.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 132 ++++++++++++++++++++++++++++++++-----
- 1 file changed, 116 insertions(+), 16 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -105,6 +105,7 @@
- #define IMX290_TCLKPREPARE				IMX290_REG_16BIT(0x3452)
- #define IMX290_TLPX					IMX290_REG_16BIT(0x3454)
- #define IMX290_X_OUT_SIZE				IMX290_REG_16BIT(0x3472)
-+#define IMX290_INCKSEL7					IMX290_REG_8BIT(0x3480)
- 
- #define IMX290_PGCTRL_REGEN				BIT(0)
- #define IMX290_PGCTRL_THRU				BIT(1)
-@@ -181,11 +182,29 @@ struct imx290_model_info {
- 	enum imx290_colour_variant colour_variant;
- };
- 
-+enum imx290_clk_freq {
-+	IMX290_CLK_37_125,
-+	IMX290_CLK_74_25,
-+	IMX290_NUM_CLK
-+};
-+
- struct imx290_regval {
- 	u32 reg;
- 	u32 val;
- };
- 
-+/*
-+ * Clock configuration for registers INCKSEL1 to INCKSEL6.
-+ */
-+struct imx290_clk_cfg {
-+	u8 incksel1;
-+	u8 incksel2;
-+	u8 incksel3;
-+	u8 incksel4;
-+	u8 incksel5;
-+	u8 incksel6;
-+};
-+
- struct imx290_mode {
- 	u32 width;
- 	u32 height;
-@@ -195,6 +214,8 @@ struct imx290_mode {
- 
- 	const struct imx290_regval *data;
- 	u32 data_size;
-+
-+	const struct imx290_clk_cfg *clk_cfg;
- };
- 
- struct imx290_csi_cfg {
-@@ -213,6 +234,7 @@ struct imx290 {
- 	struct device *dev;
- 	struct clk *xclk;
- 	struct regmap *regmap;
-+	enum imx290_clk_freq xclk_idx;
- 	u8 nlanes;
- 	const struct imx290_model_info *model;
- 
-@@ -241,7 +263,6 @@ static inline struct imx290 *to_imx290(s
-  */
- 
- static const struct imx290_regval imx290_global_init_settings[] = {
--	{ IMX290_EXTCK_FREQ, 0x2520 },
- 	{ IMX290_WINWV_OB, 12 },
- 	{ IMX290_WINPH, 0 },
- 	{ IMX290_WINPV, 0 },
-@@ -291,7 +312,18 @@ static const struct imx290_regval imx290
- 	{ IMX290_REG_8BIT(0x33b0), 0x50 },
- 	{ IMX290_REG_8BIT(0x33b2), 0x1a },
- 	{ IMX290_REG_8BIT(0x33b3), 0x04 },
--	{ IMX290_REG_8BIT(0x3480), 0x49 },
-+};
-+
-+#define IMX290_NUM_CLK_REGS	2
-+static const struct imx290_regval xclk_regs[][IMX290_NUM_CLK_REGS] = {
-+	[IMX290_CLK_37_125] = {
-+		{ IMX290_EXTCK_FREQ, (37125 * 256) / 1000 },
-+		{ IMX290_INCKSEL7, 0x49 },
-+	},
-+	[IMX290_CLK_74_25] = {
-+		{ IMX290_EXTCK_FREQ, (74250 * 256) / 1000 },
-+		{ IMX290_INCKSEL7, 0x92 },
-+	},
- };
- 
- static const struct imx290_regval imx290_1080p_settings[] = {
-@@ -301,12 +333,6 @@ static const struct imx290_regval imx290
- 	{ IMX290_OPB_SIZE_V, 10 },
- 	{ IMX290_X_OUT_SIZE, 1920 },
- 	{ IMX290_Y_OUT_SIZE, 1080 },
--	{ IMX290_INCKSEL1, 0x18 },
--	{ IMX290_INCKSEL2, 0x03 },
--	{ IMX290_INCKSEL3, 0x20 },
--	{ IMX290_INCKSEL4, 0x01 },
--	{ IMX290_INCKSEL5, 0x1a },
--	{ IMX290_INCKSEL6, 0x1a },
- };
- 
- static const struct imx290_regval imx290_720p_settings[] = {
-@@ -316,12 +342,6 @@ static const struct imx290_regval imx290
- 	{ IMX290_OPB_SIZE_V, 4 },
- 	{ IMX290_X_OUT_SIZE, 1280 },
- 	{ IMX290_Y_OUT_SIZE, 720 },
--	{ IMX290_INCKSEL1, 0x20 },
--	{ IMX290_INCKSEL2, 0x00 },
--	{ IMX290_INCKSEL3, 0x20 },
--	{ IMX290_INCKSEL4, 0x01 },
--	{ IMX290_INCKSEL5, 0x1a },
--	{ IMX290_INCKSEL6, 0x1a },
- };
- 
- static const struct imx290_regval imx290_10bit_settings[] = {
-@@ -427,6 +447,48 @@ static inline int imx290_link_freqs_num(
- 		return ARRAY_SIZE(imx290_link_freq_4lanes);
- }
- 
-+static const struct imx290_clk_cfg imx290_1080p_clock_config[] = {
-+	[IMX290_CLK_37_125] = {
-+		/* 37.125MHz clock config */
-+		.incksel1 = 0x18,
-+		.incksel2 = 0x03,
-+		.incksel3 = 0x20,
-+		.incksel4 = 0x01,
-+		.incksel5 = 0x1a,
-+		.incksel6 = 0x1a,
-+	},
-+	[IMX290_CLK_74_25] = {
-+		/* 74.25MHz clock config */
-+		.incksel1 = 0x0c,
-+		.incksel2 = 0x03,
-+		.incksel3 = 0x10,
-+		.incksel4 = 0x01,
-+		.incksel5 = 0x1b,
-+		.incksel6 = 0x1b,
-+	},
-+};
-+
-+static const struct imx290_clk_cfg imx290_720p_clock_config[] = {
-+	[IMX290_CLK_37_125] = {
-+		/* 37.125MHz clock config */
-+		.incksel1 = 0x20,
-+		.incksel2 = 0x00,
-+		.incksel3 = 0x20,
-+		.incksel4 = 0x01,
-+		.incksel5 = 0x1a,
-+		.incksel6 = 0x1a,
-+	},
-+	[IMX290_CLK_74_25] = {
-+		/* 74.25MHz clock config */
-+		.incksel1 = 0x10,
-+		.incksel2 = 0x00,
-+		.incksel3 = 0x10,
-+		.incksel4 = 0x01,
-+		.incksel5 = 0x1b,
-+		.incksel6 = 0x1b,
-+	},
-+};
-+
- /* Mode configs */
- static const struct imx290_mode imx290_modes_2lanes[] = {
- 	{
-@@ -437,6 +499,7 @@ static const struct imx290_mode imx290_m
- 		.link_freq_index = FREQ_INDEX_1080P,
- 		.data = imx290_1080p_settings,
- 		.data_size = ARRAY_SIZE(imx290_1080p_settings),
-+		.clk_cfg = imx290_1080p_clock_config,
- 	},
- 	{
- 		.width = 1280,
-@@ -446,6 +509,7 @@ static const struct imx290_mode imx290_m
- 		.link_freq_index = FREQ_INDEX_720P,
- 		.data = imx290_720p_settings,
- 		.data_size = ARRAY_SIZE(imx290_720p_settings),
-+		.clk_cfg = imx290_720p_clock_config,
- 	},
- };
- 
-@@ -458,6 +522,7 @@ static const struct imx290_mode imx290_m
- 		.link_freq_index = FREQ_INDEX_1080P,
- 		.data = imx290_1080p_settings,
- 		.data_size = ARRAY_SIZE(imx290_1080p_settings),
-+		.clk_cfg = imx290_1080p_clock_config,
- 	},
- 	{
- 		.width = 1280,
-@@ -467,6 +532,7 @@ static const struct imx290_mode imx290_m
- 		.link_freq_index = FREQ_INDEX_720P,
- 		.data = imx290_720p_settings,
- 		.data_size = ARRAY_SIZE(imx290_720p_settings),
-+		.clk_cfg = imx290_720p_clock_config,
- 	},
- };
- 
-@@ -592,6 +658,26 @@ static int imx290_set_register_array(str
- 	return 0;
- }
- 
-+static int imx290_set_clock(struct imx290 *imx290)
-+{
-+	const struct imx290_mode *mode = imx290->current_mode;
-+	enum imx290_clk_freq clk_idx = imx290->xclk_idx;
-+	const struct imx290_clk_cfg *clk_cfg = &mode->clk_cfg[clk_idx];
-+	int ret;
-+
-+	ret = imx290_set_register_array(imx290, xclk_regs[clk_idx],
-+					IMX290_NUM_CLK_REGS);
-+
-+	imx290_write(imx290, IMX290_INCKSEL1, clk_cfg->incksel1, &ret);
-+	imx290_write(imx290, IMX290_INCKSEL2, clk_cfg->incksel2, &ret);
-+	imx290_write(imx290, IMX290_INCKSEL3, clk_cfg->incksel3, &ret);
-+	imx290_write(imx290, IMX290_INCKSEL4, clk_cfg->incksel4, &ret);
-+	imx290_write(imx290, IMX290_INCKSEL5, clk_cfg->incksel5, &ret);
-+	imx290_write(imx290, IMX290_INCKSEL6, clk_cfg->incksel6, &ret);
-+
-+	return ret;
-+}
-+
- static int imx290_set_data_lanes(struct imx290 *imx290)
- {
- 	int ret = 0;
-@@ -896,6 +982,13 @@ static int imx290_start_streaming(struct
- 		return ret;
- 	}
- 
-+	/* Set clock parameters based on mode and xclk */
-+	ret = imx290_set_clock(imx290);
-+	if (ret < 0) {
-+		dev_err(imx290->dev, "Could not set clocks\n");
-+		return ret;
-+	}
-+
- 	/* Set data lane count */
- 	ret = imx290_set_data_lanes(imx290);
- 	if (ret < 0) {
-@@ -1295,8 +1388,15 @@ static int imx290_init_clk(struct imx290
- 		return ret;
- 	}
- 
--	/* external clock must be 37.125 MHz */
--	if (xclk_freq != 37125000) {
-+	/* external clock must be 37.125 MHz or 74.25MHz */
-+	switch (xclk_freq) {
-+	case 37125000:
-+		imx290->xclk_idx = IMX290_CLK_37_125;
-+		break;
-+	case 74250000:
-+		imx290->xclk_idx = IMX290_CLK_74_25;
-+		break;
-+	default:
- 		dev_err(imx290->dev, "External clock frequency %u is not supported\n",
- 			xclk_freq);
- 		return -EINVAL;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0666-media-i2c-imx290-Add-support-for-H-V-Flips.patch b/target/linux/bcm27xx/patches-6.1/950-0666-media-i2c-imx290-Add-support-for-H-V-Flips.patch
deleted file mode 100644
index d3cf5de51d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0666-media-i2c-imx290-Add-support-for-H-V-Flips.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From bb0085733894a1292fb0ca4c397caec84a7c2502 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 16 Feb 2023 00:30:02 +0200
-Subject: [PATCH] media: i2c: imx290: Add support for H & V Flips
-
-Should be upstream commit 42765b80f8c6
-
-The sensor supports H & V flips, so add the relevant hooks for
-V4L2_CID_HFLIP and V4L2_CID_VFLIP to configure them.
-
-Note that the Bayer order is maintained as the readout area
-shifts by 1 pixel in the appropriate direction (note the
-comment about the top margin being 8 pixels whilst the bottom
-margin is 9). The V4L2_SEL_TGT_CROP region is therefore
-adjusted appropriately.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 51 ++++++++++++++++++++++++++++++++++----
- 1 file changed, 46 insertions(+), 5 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -211,6 +211,7 @@ struct imx290_mode {
- 	u32 hmax_min;
- 	u32 vmax_min;
- 	u8 link_freq_index;
-+	u8 ctrl_07;
- 
- 	const struct imx290_regval *data;
- 	u32 data_size;
-@@ -251,6 +252,10 @@ struct imx290 {
- 	struct v4l2_ctrl *hblank;
- 	struct v4l2_ctrl *vblank;
- 	struct v4l2_ctrl *exposure;
-+	struct {
-+		struct v4l2_ctrl *hflip;
-+		struct v4l2_ctrl *vflip;
-+	};
- };
- 
- static inline struct imx290 *to_imx290(struct v4l2_subdev *_sd)
-@@ -328,7 +333,6 @@ static const struct imx290_regval xclk_r
- 
- static const struct imx290_regval imx290_1080p_settings[] = {
- 	/* mode settings */
--	{ IMX290_CTRL_07, IMX290_WINMODE_1080P },
- 	{ IMX290_WINWV_OB, 12 },
- 	{ IMX290_OPB_SIZE_V, 10 },
- 	{ IMX290_X_OUT_SIZE, 1920 },
-@@ -337,7 +341,6 @@ static const struct imx290_regval imx290
- 
- static const struct imx290_regval imx290_720p_settings[] = {
- 	/* mode settings */
--	{ IMX290_CTRL_07, IMX290_WINMODE_720P },
- 	{ IMX290_WINWV_OB, 6 },
- 	{ IMX290_OPB_SIZE_V, 4 },
- 	{ IMX290_X_OUT_SIZE, 1280 },
-@@ -497,6 +500,7 @@ static const struct imx290_mode imx290_m
- 		.hmax_min = 2200,
- 		.vmax_min = 1125,
- 		.link_freq_index = FREQ_INDEX_1080P,
-+		.ctrl_07 = IMX290_WINMODE_1080P,
- 		.data = imx290_1080p_settings,
- 		.data_size = ARRAY_SIZE(imx290_1080p_settings),
- 		.clk_cfg = imx290_1080p_clock_config,
-@@ -507,6 +511,7 @@ static const struct imx290_mode imx290_m
- 		.hmax_min = 3300,
- 		.vmax_min = 750,
- 		.link_freq_index = FREQ_INDEX_720P,
-+		.ctrl_07 = IMX290_WINMODE_720P,
- 		.data = imx290_720p_settings,
- 		.data_size = ARRAY_SIZE(imx290_720p_settings),
- 		.clk_cfg = imx290_720p_clock_config,
-@@ -520,6 +525,7 @@ static const struct imx290_mode imx290_m
- 		.hmax_min = 2200,
- 		.vmax_min = 1125,
- 		.link_freq_index = FREQ_INDEX_1080P,
-+		.ctrl_07 = IMX290_WINMODE_1080P,
- 		.data = imx290_1080p_settings,
- 		.data_size = ARRAY_SIZE(imx290_1080p_settings),
- 		.clk_cfg = imx290_1080p_clock_config,
-@@ -530,6 +536,7 @@ static const struct imx290_mode imx290_m
- 		.hmax_min = 3300,
- 		.vmax_min = 750,
- 		.link_freq_index = FREQ_INDEX_720P,
-+		.ctrl_07 = IMX290_WINMODE_720P,
- 		.data = imx290_720p_settings,
- 		.data_size = ARRAY_SIZE(imx290_720p_settings),
- 		.clk_cfg = imx290_720p_clock_config,
-@@ -840,6 +847,20 @@ static int imx290_set_ctrl(struct v4l2_c
- 				   NULL);
- 		break;
- 
-+	case V4L2_CID_HFLIP:
-+	case V4L2_CID_VFLIP:
-+	{
-+		u32 reg;
-+
-+		reg = imx290->current_mode->ctrl_07;
-+		if (imx290->hflip->val)
-+			reg |= IMX290_HREVERSE;
-+		if (imx290->vflip->val)
-+			reg |= IMX290_VREVERSE;
-+		ret = imx290_write(imx290, IMX290_CTRL_07, reg, NULL);
-+		break;
-+	}
-+
- 	default:
- 		ret = -EINVAL;
- 		break;
-@@ -892,7 +913,7 @@ static int imx290_ctrl_init(struct imx29
- 	if (ret < 0)
- 		return ret;
- 
--	v4l2_ctrl_handler_init(&imx290->ctrls, 9);
-+	v4l2_ctrl_handler_init(&imx290->ctrls, 11);
- 
- 	/*
- 	 * The sensor has an analog gain and a digital gain, both controlled
-@@ -949,6 +970,12 @@ static int imx290_ctrl_init(struct imx29
- 	imx290->vblank = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
- 					   V4L2_CID_VBLANK, 1, 1, 1, 1);
- 
-+	imx290->hflip = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
-+					  V4L2_CID_HFLIP, 0, 1, 1, 0);
-+	imx290->vflip = v4l2_ctrl_new_std(&imx290->ctrls, &imx290_ctrl_ops,
-+					  V4L2_CID_VFLIP, 0, 1, 1, 0);
-+	v4l2_ctrl_cluster(2, &imx290->hflip);
-+
- 	v4l2_ctrl_new_fwnode_properties(&imx290->ctrls, &imx290_ctrl_ops,
- 					&props);
- 
-@@ -1070,6 +1097,13 @@ static int imx290_set_stream(struct v4l2
- 		pm_runtime_put_autosuspend(imx290->dev);
- 	}
- 
-+	/*
-+	 * vflip and hflip should not be changed during streaming as the sensor
-+	 * will produce an invalid frame.
-+	 */
-+	__v4l2_ctrl_grab(imx290->vflip, enable);
-+	__v4l2_ctrl_grab(imx290->hflip, enable);
-+
- unlock:
- 	v4l2_subdev_unlock_state(state);
- 	return ret;
-@@ -1152,16 +1186,23 @@ static int imx290_get_selection(struct v
- 				struct v4l2_subdev_state *sd_state,
- 				struct v4l2_subdev_selection *sel)
- {
-+	struct imx290 *imx290 = to_imx290(sd);
- 	struct v4l2_mbus_framefmt *format;
- 
- 	switch (sel->target) {
- 	case V4L2_SEL_TGT_CROP: {
- 		format = v4l2_subdev_get_pad_format(sd, sd_state, 0);
- 
-+		/*
-+		 * The sensor moves the readout by 1 pixel based on flips to
-+		 * keep the Bayer order the same.
-+		 */
- 		sel->r.top = IMX920_PIXEL_ARRAY_MARGIN_TOP
--			   + (IMX290_PIXEL_ARRAY_RECORDING_HEIGHT - format->height) / 2;
-+			   + (IMX290_PIXEL_ARRAY_RECORDING_HEIGHT - format->height) / 2
-+			   + imx290->vflip->val;
- 		sel->r.left = IMX920_PIXEL_ARRAY_MARGIN_LEFT
--			    + (IMX290_PIXEL_ARRAY_RECORDING_WIDTH - format->width) / 2;
-+			    + (IMX290_PIXEL_ARRAY_RECORDING_WIDTH - format->width) / 2
-+			    + imx290->hflip->val;
- 		sel->r.width = format->width;
- 		sel->r.height = format->height;
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0667-media-i2c-imx290-Add-the-error-code-to-logs-in-start.patch b/target/linux/bcm27xx/patches-6.1/950-0667-media-i2c-imx290-Add-the-error-code-to-logs-in-start.patch
deleted file mode 100644
index 9f4eed6111..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0667-media-i2c-imx290-Add-the-error-code-to-logs-in-start.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From ca2e3e4cb1704ae28a15e889165bf5f319dcb905 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 16 Feb 2023 00:30:03 +0200
-Subject: [PATCH] media: i2c: imx290: Add the error code to logs in
- start_streaming
-
-Should be upstream commit 5fcaecd6b5aa
-
-imx290_start_streaming logs what failed, but not the error
-code from that function. Add it into the log message.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -1012,20 +1012,20 @@ static int imx290_start_streaming(struct
- 	/* Set clock parameters based on mode and xclk */
- 	ret = imx290_set_clock(imx290);
- 	if (ret < 0) {
--		dev_err(imx290->dev, "Could not set clocks\n");
-+		dev_err(imx290->dev, "Could not set clocks - %d\n", ret);
- 		return ret;
- 	}
- 
- 	/* Set data lane count */
- 	ret = imx290_set_data_lanes(imx290);
- 	if (ret < 0) {
--		dev_err(imx290->dev, "Could not set data lanes\n");
-+		dev_err(imx290->dev, "Could not set data lanes - %d\n", ret);
- 		return ret;
- 	}
- 
- 	ret = imx290_set_csi_config(imx290);
- 	if (ret < 0) {
--		dev_err(imx290->dev, "Could not set csi cfg\n");
-+		dev_err(imx290->dev, "Could not set csi cfg - %d\n", ret);
- 		return ret;
- 	}
- 
-@@ -1033,7 +1033,7 @@ static int imx290_start_streaming(struct
- 	format = v4l2_subdev_get_pad_format(&imx290->sd, state, 0);
- 	ret = imx290_setup_format(imx290, format);
- 	if (ret < 0) {
--		dev_err(imx290->dev, "Could not set frame format\n");
-+		dev_err(imx290->dev, "Could not set frame format - %d\n", ret);
- 		return ret;
- 	}
- 
-@@ -1041,14 +1041,14 @@ static int imx290_start_streaming(struct
- 	ret = imx290_set_register_array(imx290, imx290->current_mode->data,
- 					imx290->current_mode->data_size);
- 	if (ret < 0) {
--		dev_err(imx290->dev, "Could not set current mode\n");
-+		dev_err(imx290->dev, "Could not set current mode - %d\n", ret);
- 		return ret;
- 	}
- 
- 	/* Apply customized values from user */
- 	ret = __v4l2_ctrl_handler_setup(imx290->sd.ctrl_handler);
- 	if (ret) {
--		dev_err(imx290->dev, "Could not sync v4l2 controls\n");
-+		dev_err(imx290->dev, "Could not sync v4l2 controls - %d\n", ret);
- 		return ret;
- 	}
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0668-media-i2c-imx290-Add-support-for-imx327-variant.patch b/target/linux/bcm27xx/patches-6.1/950-0668-media-i2c-imx290-Add-support-for-imx327-variant.patch
deleted file mode 100644
index eddee2a78c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0668-media-i2c-imx290-Add-support-for-imx327-variant.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 953826015a003f08f033d33e09799a5380c1b5ae Mon Sep 17 00:00:00 2001
-From: Alexander Stein <alexander.stein@ew.tq-group.com>
-Date: Fri, 17 Feb 2023 10:52:21 +0100
-Subject: [PATCH] media: i2c: imx290: Add support for imx327 variant
-
-Should be upstream commit 3c3f66b8125a
-
-Both sensors are quite similar. Their specs only differ regarding LVDS
-and parallel output but are identical regarding MIPI-CSI-2 interface.
-But they use a different init setting of hard-coded values, taken from
-the datasheet.
-
-Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
----
- drivers/media/i2c/imx290.c | 44 ++++++++++++++++++++++++++++++++++++--
- 1 file changed, 42 insertions(+), 2 deletions(-)
-
---- a/drivers/media/i2c/imx290.c
-+++ b/drivers/media/i2c/imx290.c
-@@ -176,10 +176,14 @@ enum imx290_colour_variant {
- enum imx290_model {
- 	IMX290_MODEL_IMX290LQR,
- 	IMX290_MODEL_IMX290LLR,
-+	IMX290_MODEL_IMX327LQR,
- };
- 
- struct imx290_model_info {
- 	enum imx290_colour_variant colour_variant;
-+	const struct imx290_regval *init_regs;
-+	size_t init_regs_num;
-+	const char *name;
- };
- 
- enum imx290_clk_freq {
-@@ -275,10 +279,14 @@ static const struct imx290_regval imx290
- 	{ IMX290_WINWV, 1097 },
- 	{ IMX290_XSOUTSEL, IMX290_XSOUTSEL_XVSOUTSEL_VSYNC |
- 			   IMX290_XSOUTSEL_XHSOUTSEL_HSYNC },
--	{ IMX290_REG_8BIT(0x300f), 0x00 },
--	{ IMX290_REG_8BIT(0x3010), 0x21 },
-+	{ IMX290_REG_8BIT(0x3011), 0x02 },
- 	{ IMX290_REG_8BIT(0x3012), 0x64 },
- 	{ IMX290_REG_8BIT(0x3013), 0x00 },
-+};
-+
-+static const struct imx290_regval imx290_global_init_settings_290[] = {
-+	{ IMX290_REG_8BIT(0x300f), 0x00 },
-+	{ IMX290_REG_8BIT(0x3010), 0x21 },
- 	{ IMX290_REG_8BIT(0x3016), 0x09 },
- 	{ IMX290_REG_8BIT(0x3070), 0x02 },
- 	{ IMX290_REG_8BIT(0x3071), 0x11 },
-@@ -331,6 +339,12 @@ static const struct imx290_regval xclk_r
- 	},
- };
- 
-+static const struct imx290_regval imx290_global_init_settings_327[] = {
-+	{ IMX290_REG_8BIT(0x309e), 0x4A },
-+	{ IMX290_REG_8BIT(0x309f), 0x4A },
-+	{ IMX290_REG_8BIT(0x313b), 0x61 },
-+};
-+
- static const struct imx290_regval imx290_1080p_settings[] = {
- 	/* mode settings */
- 	{ IMX290_WINWV_OB, 12 },
-@@ -1009,6 +1023,14 @@ static int imx290_start_streaming(struct
- 		return ret;
- 	}
- 
-+	/* Set mdel specific init register settings */
-+	ret = imx290_set_register_array(imx290, imx290->model->init_regs,
-+					imx290->model->init_regs_num);
-+	if (ret < 0) {
-+		dev_err(imx290->dev, "Could not set model specific init registers\n");
-+		return ret;
-+	}
-+
- 	/* Set clock parameters based on mode and xclk */
- 	ret = imx290_set_clock(imx290);
- 	if (ret < 0) {
-@@ -1477,9 +1499,21 @@ static s64 imx290_check_link_freqs(const
- static const struct imx290_model_info imx290_models[] = {
- 	[IMX290_MODEL_IMX290LQR] = {
- 		.colour_variant = IMX290_VARIANT_COLOUR,
-+		.init_regs = imx290_global_init_settings_290,
-+		.init_regs_num = ARRAY_SIZE(imx290_global_init_settings_290),
-+		.name = "imx290",
- 	},
- 	[IMX290_MODEL_IMX290LLR] = {
- 		.colour_variant = IMX290_VARIANT_MONO,
-+		.init_regs = imx290_global_init_settings_290,
-+		.init_regs_num = ARRAY_SIZE(imx290_global_init_settings_290),
-+		.name = "imx290",
-+	},
-+	[IMX290_MODEL_IMX327LQR] = {
-+		.colour_variant = IMX290_VARIANT_COLOUR,
-+		.init_regs = imx290_global_init_settings_327,
-+		.init_regs_num = ARRAY_SIZE(imx290_global_init_settings_327),
-+		.name = "imx327",
- 	},
- };
- 
-@@ -1612,6 +1646,9 @@ static int imx290_probe(struct i2c_clien
- 	if (ret)
- 		goto err_pm;
- 
-+	v4l2_i2c_subdev_set_name(&imx290->sd, client,
-+				 imx290->model->name, NULL);
-+
- 	/*
- 	 * Finally, register the V4L2 subdev. This must be done after
- 	 * initializing everything as the subdev can be used immediately after
-@@ -1670,6 +1707,9 @@ static const struct of_device_id imx290_
- 	}, {
- 		.compatible = "sony,imx290llr",
- 		.data = &imx290_models[IMX290_MODEL_IMX290LLR],
-+	}, {
-+		.compatible = "sony,imx327lqr",
-+		.data = &imx290_models[IMX290_MODEL_IMX327LQR],
- 	},
- 	{ /* sentinel */ },
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0669-dtoverlays-Update-compatible-strings-for-imx290-327-.patch b/target/linux/bcm27xx/patches-6.1/950-0669-dtoverlays-Update-compatible-strings-for-imx290-327-.patch
deleted file mode 100644
index 31e19be15e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0669-dtoverlays-Update-compatible-strings-for-imx290-327-.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 50b181819224c717a468ced24ec7106e87b02dcd Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 28 Mar 2023 15:16:57 +0100
-Subject: [PATCH] dtoverlays: Update compatible strings for
- imx290/327/462
-
-Now upstream have accepted patches adding a mono version of
-IMX290, and IMX327, update the compatible strings in the overlays
-to match.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/imx290-overlay.dts | 4 ++--
- arch/arm/boot/dts/overlays/imx290_327.dtsi    | 2 +-
- arch/arm/boot/dts/overlays/imx327-overlay.dts | 5 +++--
- arch/arm/boot/dts/overlays/imx462-overlay.dts | 6 ++++--
- 4 files changed, 10 insertions(+), 7 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/imx290-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/imx290-overlay.dts
-@@ -15,14 +15,14 @@
- 	fragment@101 {
- 		target = <&cam_node>;
- 		__overlay__ {
--			compatible = "sony,imx290";
-+			compatible = "sony,imx290lqr";
- 		};
- 	};
- 
- 	fragment@102 {
- 		target = <&cam_node>;
- 		__dormant__ {
--			compatible = "sony,imx290-mono";
-+			compatible = "sony,imx290llr";
- 		};
- 	};
- 
---- a/arch/arm/boot/dts/overlays/imx290_327.dtsi
-+++ b/arch/arm/boot/dts/overlays/imx290_327.dtsi
-@@ -1,7 +1,7 @@
- // Fragment to configure and IMX290 / IMX327 / IMX462 image sensor
- 
- cam_node: imx290@1a {
--	compatible = "sony,imx290";
-+	compatible = "sony,imx290lqr";
- 	reg = <0x1a>;
- 	status = "disabled";
- 
---- a/arch/arm/boot/dts/overlays/imx327-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/imx327-overlay.dts
-@@ -15,14 +15,15 @@
- 	fragment@101 {
- 		target = <&cam_node>;
- 		__overlay__ {
--			compatible = "sony,imx327";
-+			compatible = "sony,imx327lqr";
- 		};
- 	};
- 
- 	fragment@102 {
- 		target = <&cam_node>;
- 		__dormant__ {
--			compatible = "sony,imx327-mono";
-+			// IMX327 mono is undefined in the binding - use imx290
-+			compatible = "sony,imx290llr";
- 		};
- 	};
- 
---- a/arch/arm/boot/dts/overlays/imx462-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/imx462-overlay.dts
-@@ -12,17 +12,19 @@
- 	// Fragment numbers deliberately high to avoid conflicts with the
- 	// included imx290_327 overlay file.
- 
-+	//IMX462 is not defined in the bindings, so use IMX290 for now.
-+
- 	fragment@101 {
- 		target = <&cam_node>;
- 		__overlay__ {
--			compatible = "sony,imx462";
-+			compatible = "sony,imx290lqr";
- 		};
- 	};
- 
- 	fragment@102 {
- 		target = <&cam_node>;
- 		__dormant__ {
--			compatible = "sony,imx462-mono";
-+			compatible = "sony,imx290llr";
- 		};
- 	};
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0670-fbdev-Don-t-cancel-deferred-work-if-pagelist-empty.patch b/target/linux/bcm27xx/patches-6.1/950-0670-fbdev-Don-t-cancel-deferred-work-if-pagelist-empty.patch
deleted file mode 100644
index 31a34fee85..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0670-fbdev-Don-t-cancel-deferred-work-if-pagelist-empty.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From cf40d2d8c44a659d09d5c20189aab02f20263e81 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 29 Mar 2023 09:49:36 +0100
-Subject: [PATCH] fbdev: Don't cancel deferred work if pagelist empty
-
-Since [1], the fbdev deferred IO framework is careful to cancel
-pending updates on close to prevent dirty pages being accessed after
-they may have been reused. However, this is not necessary in the case
-that the pagelist is empty, and drivers that don't make use of the
-pagelist may have wanted updates cancelled for no good reason.
-
-Avoid penalising fbdev drivers that don't make use of the pagelist by
-making the cancelling of deferred IO on close conditional on there
-being a non-empty pagelist.
-
-See: https://github.com/raspberrypi/linux/issues/5398
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-[1] 3efc61d95259 ("fbdev: Fix invalid page access after closing deferred I/O devices")
----
- drivers/video/fbdev/core/fb_defio.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/video/fbdev/core/fb_defio.c
-+++ b/drivers/video/fbdev/core/fb_defio.c
-@@ -317,7 +317,8 @@ static void fb_deferred_io_lastclose(str
- 	struct page *page;
- 	int i;
- 
--	flush_delayed_work(&info->deferred_work);
-+	if (!list_empty(&info->fbdefio->pagereflist))
-+		flush_delayed_work(&info->deferred_work);
- 
- 	/* clear out the mapping that we setup */
- 	for (i = 0 ; i < info->fix.smem_len; i += PAGE_SIZE) {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0671-usb-xhci-drop-and-add-the-endpoint-context-in-xhci_f.patch b/target/linux/bcm27xx/patches-6.1/950-0671-usb-xhci-drop-and-add-the-endpoint-context-in-xhci_f.patch
deleted file mode 100644
index b852bad904..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0671-usb-xhci-drop-and-add-the-endpoint-context-in-xhci_f.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0103035be2b28a8dbb5ccc207c61043d5eb1bc18 Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.com>
-Date: Fri, 10 Mar 2023 14:21:42 +0000
-Subject: [PATCH] usb: xhci: drop and add the endpoint context in
- xhci_fixup_endpoint()
-
-Setting both the Drop and Add bits on the input context prevents the
-corruption of split transactions seen with the BCM2711 XHCI controller,
-which is a dwc3 variant.
-
-This is a downstream feature that allows usbhid to restrict polling
-intervals on mice and keyboards, and was only tested on a VL805 which
-didn't complain about the fact the endpoint got added twice.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- drivers/usb/host/xhci.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/usb/host/xhci.c
-+++ b/drivers/usb/host/xhci.c
-@@ -1732,7 +1732,7 @@ static void xhci_fixup_endpoint(struct u
- 		return;
- 	}
- 	ctrl_ctx->add_flags = xhci_get_endpoint_flag_from_index(ep_index);
--	ctrl_ctx->drop_flags = 0;
-+	ctrl_ctx->drop_flags = ctrl_ctx->add_flags;
- 
- 	spin_unlock_irqrestore(&xhci->lock, flags);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0672-drivers-media-imx708-Increase-usable-link-frequencie.patch b/target/linux/bcm27xx/patches-6.1/950-0672-drivers-media-imx708-Increase-usable-link-frequencie.patch
deleted file mode 100644
index 4682627945..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0672-drivers-media-imx708-Increase-usable-link-frequencie.patch
+++ /dev/null
@@ -1,224 +0,0 @@
-From 6efb946e6cb808c35e4fb620974c12244a95b4e7 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Fri, 31 Mar 2023 14:56:09 +0100
-Subject: [PATCH] drivers: media: imx708: Increase usable link
- frequencies
-
-Add support for three different usable link frequencies (default 450Mhz,
-447Mhz, and 453MHz) for the IMX708 camera sensor. The choice of
-frequency is handled thorugh the "link-frequency" overlay parameter.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/i2c/imx708.c | 94 +++++++++++++++++++++++++++++++-------
- 1 file changed, 78 insertions(+), 16 deletions(-)
-
---- a/drivers/media/i2c/imx708.c
-+++ b/drivers/media/i2c/imx708.c
-@@ -35,8 +35,6 @@
- 
- #define IMX708_XCLK_FREQ		24000000
- 
--#define IMX708_DEFAULT_LINK_FREQ	450000000
--
- /* Default initial pixel rate, will get updated for each mode. */
- #define IMX708_INITIAL_PIXEL_RATE	590000000
- 
-@@ -181,6 +179,50 @@ static const u8 pdaf_gains[2][9] = {
- 	{ 0x35, 0x35, 0x35, 0x38, 0x3e, 0x46, 0x4c, 0x4c, 0x4c }
- };
- 
-+/* Link frequency setup */
-+enum {
-+	IMX708_LINK_FREQ_450MHZ,
-+	IMX708_LINK_FREQ_447MHZ,
-+	IMX708_LINK_FREQ_453MHZ,
-+};
-+
-+static const s64 link_freqs[] = {
-+	[IMX708_LINK_FREQ_450MHZ] = 450000000,
-+	[IMX708_LINK_FREQ_447MHZ] = 447000000,
-+	[IMX708_LINK_FREQ_453MHZ] = 453000000,
-+};
-+
-+/* 450MHz is the nominal "default" link frequency */
-+static const struct imx708_reg link_450Mhz_regs[] = {
-+	{0x030E, 0x01},
-+	{0x030F, 0x2c},
-+};
-+
-+static const struct imx708_reg link_447Mhz_regs[] = {
-+	{0x030E, 0x01},
-+	{0x030F, 0x2a},
-+};
-+
-+static const struct imx708_reg link_453Mhz_regs[] = {
-+	{0x030E, 0x01},
-+	{0x030F, 0x2e},
-+};
-+
-+static const struct imx708_reg_list link_freq_regs[] = {
-+	[IMX708_LINK_FREQ_450MHZ] = {
-+		.regs = link_450Mhz_regs,
-+		.num_of_regs = ARRAY_SIZE(link_450Mhz_regs)
-+	},
-+	[IMX708_LINK_FREQ_447MHZ] = {
-+		.regs = link_447Mhz_regs,
-+		.num_of_regs = ARRAY_SIZE(link_447Mhz_regs)
-+	},
-+	[IMX708_LINK_FREQ_453MHZ] = {
-+		.regs = link_453Mhz_regs,
-+		.num_of_regs = ARRAY_SIZE(link_453Mhz_regs)
-+	},
-+};
-+
- static const struct imx708_reg mode_common_regs[] = {
- 	{0x0100, 0x00},
- 	{0x0136, 0x18},
-@@ -278,8 +320,6 @@ static const struct imx708_reg mode_4608
- 	{0x0307, 0x7C},
- 	{0x030B, 0x02},
- 	{0x030D, 0x04},
--	{0x030E, 0x01},
--	{0x030F, 0x2C},
- 	{0x0310, 0x01},
- 	{0x3CA0, 0x00},
- 	{0x3CA1, 0x64},
-@@ -376,8 +416,6 @@ static const struct imx708_reg mode_2x2b
- 	{0x0307, 0x7A},
- 	{0x030B, 0x02},
- 	{0x030D, 0x04},
--	{0x030E, 0x01},
--	{0x030F, 0x2C},
- 	{0x0310, 0x01},
- 	{0x3CA0, 0x00},
- 	{0x3CA1, 0x3C},
-@@ -472,8 +510,6 @@ static const struct imx708_reg mode_2x2b
- 	{0x0307, 0x76},
- 	{0x030B, 0x02},
- 	{0x030D, 0x04},
--	{0x030E, 0x01},
--	{0x030F, 0x2C},
- 	{0x0310, 0x01},
- 	{0x3CA0, 0x00},
- 	{0x3CA1, 0x3C},
-@@ -568,8 +604,6 @@ static const struct imx708_reg mode_hdr_
- 	{0x0307, 0xA2},
- 	{0x030B, 0x02},
- 	{0x030D, 0x04},
--	{0x030E, 0x01},
--	{0x030F, 0x2C},
- 	{0x0310, 0x01},
- 	{0x3CA0, 0x00},
- 	{0x3CA1, 0x00},
-@@ -795,6 +829,7 @@ struct imx708 {
- 	struct v4l2_ctrl *blue_balance;
- 	struct v4l2_ctrl *notify_gains;
- 	struct v4l2_ctrl *hdr_mode;
-+	struct v4l2_ctrl *link_freq;
- 
- 	/* Current mode */
- 	const struct imx708_mode *mode;
-@@ -813,6 +848,8 @@ struct imx708 {
- 
- 	/* Current long exposure factor in use. Set through V4L2_CID_VBLANK */
- 	unsigned int long_exp_shift;
-+
-+	unsigned int link_freq_idx;
- };
- 
- static inline struct imx708 *to_imx708(struct v4l2_subdev *_sd)
-@@ -1428,7 +1465,7 @@ static int imx708_get_selection(struct v
- static int imx708_start_streaming(struct imx708 *imx708)
- {
- 	struct i2c_client *client = v4l2_get_subdevdata(&imx708->sd);
--	const struct imx708_reg_list *reg_list;
-+	const struct imx708_reg_list *reg_list, *freq_regs;
- 	int i, ret;
- 	u32 val;
- 
-@@ -1474,6 +1511,16 @@ static int imx708_start_streaming(struct
- 		return ret;
- 	}
- 
-+	/* Update the link frequency registers */
-+	freq_regs = &link_freq_regs[imx708->link_freq_idx];
-+	ret = imx708_write_regs(imx708, freq_regs->regs,
-+				freq_regs->num_of_regs);
-+	if (ret) {
-+		dev_err(&client->dev, "%s failed to set link frequency registers\n",
-+			__func__);
-+		return ret;
-+	}
-+
- 	/* Apply customized values from user */
- 	ret =  __v4l2_ctrl_handler_setup(imx708->sd.ctrl_handler);
- 	if (ret)
-@@ -1720,6 +1767,7 @@ static int imx708_init_controls(struct i
- 	struct v4l2_ctrl_handler *ctrl_hdlr;
- 	struct i2c_client *client = v4l2_get_subdevdata(&imx708->sd);
- 	struct v4l2_fwnode_device_properties props;
-+	struct v4l2_ctrl *ctrl;
- 	unsigned int i;
- 	int ret;
- 
-@@ -1738,6 +1786,12 @@ static int imx708_init_controls(struct i
- 					       IMX708_INITIAL_PIXEL_RATE, 1,
- 					       IMX708_INITIAL_PIXEL_RATE);
- 
-+	ctrl = v4l2_ctrl_new_int_menu(ctrl_hdlr, &imx708_ctrl_ops,
-+				      V4L2_CID_LINK_FREQ, 0, 0,
-+				      &link_freqs[imx708->link_freq_idx]);
-+	if (ctrl)
-+		ctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY;
-+
- 	/*
- 	 * Create the controls here, but mode specific limits are setup
- 	 * in the imx708_set_framing_limits() call below.
-@@ -1833,13 +1887,14 @@ static void imx708_free_controls(struct
- 	mutex_destroy(&imx708->mutex);
- }
- 
--static int imx708_check_hwcfg(struct device *dev)
-+static int imx708_check_hwcfg(struct device *dev, struct imx708 *imx708)
- {
- 	struct fwnode_handle *endpoint;
- 	struct v4l2_fwnode_endpoint ep_cfg = {
- 		.bus_type = V4L2_MBUS_CSI2_DPHY
- 	};
- 	int ret = -EINVAL;
-+	int i;
- 
- 	endpoint = fwnode_graph_get_next_endpoint(dev_fwnode(dev), NULL);
- 	if (!endpoint) {
-@@ -1864,11 +1919,18 @@ static int imx708_check_hwcfg(struct dev
- 		goto error_out;
- 	}
- 
--	if (ep_cfg.nr_of_link_frequencies != 1 ||
--	    ep_cfg.link_frequencies[0] != IMX708_DEFAULT_LINK_FREQ) {
-+	for (i = 0; i < ARRAY_SIZE(link_freqs); i++) {
-+		if (link_freqs[i] == ep_cfg.link_frequencies[0]) {
-+			imx708->link_freq_idx = i;
-+			break;
-+		}
-+	}
-+
-+	if (i == ARRAY_SIZE(link_freqs)) {
- 		dev_err(dev, "Link frequency not supported: %lld\n",
- 			ep_cfg.link_frequencies[0]);
--		goto error_out;
-+			ret = -EINVAL;
-+			goto error_out;
- 	}
- 
- 	ret = 0;
-@@ -1893,7 +1955,7 @@ static int imx708_probe(struct i2c_clien
- 	v4l2_i2c_subdev_init(&imx708->sd, client, &imx708_subdev_ops);
- 
- 	/* Check the hardware configuration in device tree */
--	if (imx708_check_hwcfg(dev))
-+	if (imx708_check_hwcfg(dev, imx708))
- 		return -EINVAL;
- 
- 	/* Get system clock (xclk) */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0673-dtoverlays-Add-link-frequency-parameter-for-the-Sony.patch b/target/linux/bcm27xx/patches-6.1/950-0673-dtoverlays-Add-link-frequency-parameter-for-the-Sony.patch
deleted file mode 100644
index c263622a2a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0673-dtoverlays-Add-link-frequency-parameter-for-the-Sony.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 4137914f6648cdcf0fcea63bd08e4a3ec8e1e39b Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Fri, 31 Mar 2023 14:56:49 +0100
-Subject: [PATCH] dtoverlays: Add link-frequency parameter for the Sony
- IMX708 sensor
-
-Add a parameter to change the sensor device CSI-2 link frequency to
-one of the following values: 450Mhz (default), 447Mhz, or 453Mhz.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/README             | 2 ++
- arch/arm/boot/dts/overlays/imx708-overlay.dts | 1 +
- 2 files changed, 3 insertions(+)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -2417,6 +2417,8 @@ Params: rotation                Mounting
-                                 configuring the sensor (default on)
-         cam0                    Adopt the default configuration for CAM0 on a
-                                 Compute Module (CSI0, i2c_vc, and cam0_reg).
-+        link-frequency          Allowable link frequency values to use in Hz:
-+                                450000000 (default), 447000000, 453000000.
- 
- 
- Name:   iqaudio-codec
---- a/arch/arm/boot/dts/overlays/imx708-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/imx708-overlay.dts
-@@ -88,6 +88,7 @@
- 		       <&vcm_node>, "VDD-supply:0=",<&cam0_reg>;
- 		vcm = <&vcm_node>, "status",
- 		      <0>, "=4";
-+		link-frequency = <&cam_endpoint>,"link-frequencies#0";
- 	};
- };
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0674-drivers-media-imx708-Remove-unused-control-fields.patch b/target/linux/bcm27xx/patches-6.1/950-0674-drivers-media-imx708-Remove-unused-control-fields.patch
deleted file mode 100644
index e7bb3e98bc..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0674-drivers-media-imx708-Remove-unused-control-fields.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From efeb651a86570eae98d98c7d8a57560caf51d55c Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Fri, 31 Mar 2023 10:07:26 +0100
-Subject: [PATCH] drivers: media: imx708: Remove unused control fields
-
-Remove unused and redundant control fields from the state structure.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/i2c/imx708.c | 10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
-
---- a/drivers/media/i2c/imx708.c
-+++ b/drivers/media/i2c/imx708.c
-@@ -825,9 +825,6 @@ struct imx708 {
- 	struct v4l2_ctrl *hflip;
- 	struct v4l2_ctrl *vblank;
- 	struct v4l2_ctrl *hblank;
--	struct v4l2_ctrl *red_balance;
--	struct v4l2_ctrl *blue_balance;
--	struct v4l2_ctrl *notify_gains;
- 	struct v4l2_ctrl *hdr_mode;
- 	struct v4l2_ctrl *link_freq;
- 
-@@ -1205,12 +1202,12 @@ static int imx708_set_ctrl(struct v4l2_c
- 	case V4L2_CID_NOTIFY_GAINS:
- 		ret = imx708_write_reg(imx708, IMX708_REG_COLOUR_BALANCE_BLUE,
- 				       IMX708_REG_VALUE_16BIT,
--				       imx708->notify_gains->p_new.p_u32[0]);
-+				       ctrl->p_new.p_u32[0]);
- 		if (ret)
- 			break;
- 		ret = imx708_write_reg(imx708, IMX708_REG_COLOUR_BALANCE_RED,
- 				       IMX708_REG_VALUE_16BIT,
--				       imx708->notify_gains->p_new.p_u32[3]);
-+				       ctrl->p_new.p_u32[3]);
- 		break;
- 	case V4L2_CID_WIDE_DYNAMIC_RANGE:
- 		/* Already handled above. */
-@@ -1842,8 +1839,7 @@ static int imx708_init_controls(struct i
- 		/* The "Solid color" pattern is white by default */
- 	}
- 
--	imx708->notify_gains = v4l2_ctrl_new_custom(ctrl_hdlr,
--						    &imx708_notify_gains_ctrl, NULL);
-+	v4l2_ctrl_new_custom(ctrl_hdlr, &imx708_notify_gains_ctrl, NULL);
- 
- 	imx708->hdr_mode = v4l2_ctrl_new_std(ctrl_hdlr, &imx708_ctrl_ops,
- 					     V4L2_CID_WIDE_DYNAMIC_RANGE,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0675-drivers-media-imx708-Tidy-ups-to-address-upstream-re.patch b/target/linux/bcm27xx/patches-6.1/950-0675-drivers-media-imx708-Tidy-ups-to-address-upstream-re.patch
deleted file mode 100644
index 66ef16a7de..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0675-drivers-media-imx708-Tidy-ups-to-address-upstream-re.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-From 0b6b245f8fcff205f097ce1c1bba4760f8b4f859 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Fri, 31 Mar 2023 10:33:51 +0100
-Subject: [PATCH] drivers: media: imx708: Tidy-ups to address upstream
- review comments
-
-This commit addresses vaious tidy-ups requesed for upstreaming the
-IMX708 driver. Notably:
-
-- Remove #define IMX708_NUM_SUPPLIES and use ARRAY_SIZE() directly
-- Use dev_err_probe where possible in imx708_probe()
-- Fix error handling paths in imx708_probe()
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/i2c/imx708.c | 61 +++++++++++++++++---------------------
- 1 file changed, 28 insertions(+), 33 deletions(-)
-
---- a/drivers/media/i2c/imx708.c
-+++ b/drivers/media/i2c/imx708.c
-@@ -792,8 +792,6 @@ static const char * const imx708_supply_
- 	"VDDL",  /* IF (1.8V) supply */
- };
- 
--#define IMX708_NUM_SUPPLIES ARRAY_SIZE(imx708_supply_name)
--
- /*
-  * Initialisation delay between XCLR low->high and the moment when the sensor
-  * can start capture (i.e. can leave software standby), given by T7 in the
-@@ -815,7 +813,7 @@ struct imx708 {
- 	u32 xclk_freq;
- 
- 	struct gpio_desc *reset_gpio;
--	struct regulator_bulk_data supplies[IMX708_NUM_SUPPLIES];
-+	struct regulator_bulk_data supplies[ARRAY_SIZE(imx708_supply_name)];
- 
- 	struct v4l2_ctrl_handler ctrl_handler;
- 	/* V4L2 Controls */
-@@ -935,9 +933,10 @@ static int imx708_write_regs(struct imx7
- {
- 	struct i2c_client *client = v4l2_get_subdevdata(&imx708->sd);
- 	unsigned int i;
--	int ret;
- 
- 	for (i = 0; i < len; i++) {
-+		int ret;
-+
- 		ret = imx708_write_reg(imx708, regs[i].address, 1, regs[i].val);
- 		if (ret) {
- 			dev_err_ratelimited(&client->dev,
-@@ -1025,8 +1024,6 @@ static int imx708_open(struct v4l2_subde
- 
- static int imx708_set_exposure(struct imx708 *imx708, unsigned int val)
- {
--	int ret;
--
- 	val = max(val, imx708->mode->exposure_lines_min);
- 	val -= val % imx708->mode->exposure_lines_step;
- 
-@@ -1034,11 +1031,9 @@ static int imx708_set_exposure(struct im
- 	 * In HDR mode this will set the longest exposure. The sensor
- 	 * will automatically divide the medium and short ones by 4,16.
- 	 */
--	ret = imx708_write_reg(imx708, IMX708_REG_EXPOSURE,
--			       IMX708_REG_VALUE_16BIT,
--			       val >> imx708->long_exp_shift);
--
--	return ret;
-+	return imx708_write_reg(imx708, IMX708_REG_EXPOSURE,
-+				IMX708_REG_VALUE_16BIT,
-+				val >> imx708->long_exp_shift);
- }
- 
- static void imx708_adjust_exposure_range(struct imx708 *imx708,
-@@ -1071,7 +1066,7 @@ static int imx708_set_analogue_gain(stru
- 
- static int imx708_set_frame_length(struct imx708 *imx708, unsigned int val)
- {
--	int ret = 0;
-+	int ret;
- 
- 	imx708->long_exp_shift = 0;
- 
-@@ -1091,8 +1086,8 @@ static int imx708_set_frame_length(struc
- 
- static void imx708_set_framing_limits(struct imx708 *imx708)
- {
--	unsigned int hblank;
- 	const struct imx708_mode *mode = imx708->mode;
-+	unsigned int hblank;
- 
- 	__v4l2_ctrl_modify_range(imx708->pixel_rate,
- 				 mode->pixel_rate, mode->pixel_rate,
-@@ -1599,7 +1594,7 @@ static int imx708_power_on(struct device
- 	struct imx708 *imx708 = to_imx708(sd);
- 	int ret;
- 
--	ret = regulator_bulk_enable(IMX708_NUM_SUPPLIES,
-+	ret = regulator_bulk_enable(ARRAY_SIZE(imx708_supply_name),
- 				    imx708->supplies);
- 	if (ret) {
- 		dev_err(&client->dev, "%s: failed to enable regulators\n",
-@@ -1621,7 +1616,8 @@ static int imx708_power_on(struct device
- 	return 0;
- 
- reg_off:
--	regulator_bulk_disable(IMX708_NUM_SUPPLIES, imx708->supplies);
-+	regulator_bulk_disable(ARRAY_SIZE(imx708_supply_name),
-+			       imx708->supplies);
- 	return ret;
- }
- 
-@@ -1632,7 +1628,8 @@ static int imx708_power_off(struct devic
- 	struct imx708 *imx708 = to_imx708(sd);
- 
- 	gpiod_set_value_cansleep(imx708->reset_gpio, 0);
--	regulator_bulk_disable(IMX708_NUM_SUPPLIES, imx708->supplies);
-+	regulator_bulk_disable(ARRAY_SIZE(imx708_supply_name),
-+			       imx708->supplies);
- 	clk_disable_unprepare(imx708->xclk);
- 
- 	/* Force reprogramming of the common registers when powered up again. */
-@@ -1679,11 +1676,11 @@ static int imx708_get_regulators(struct
- 	struct i2c_client *client = v4l2_get_subdevdata(&imx708->sd);
- 	unsigned int i;
- 
--	for (i = 0; i < IMX708_NUM_SUPPLIES; i++)
-+	for (i = 0; i < ARRAY_SIZE(imx708_supply_name); i++)
- 		imx708->supplies[i].supply = imx708_supply_name[i];
- 
- 	return devm_regulator_bulk_get(&client->dev,
--				       IMX708_NUM_SUPPLIES,
-+				       ARRAY_SIZE(imx708_supply_name),
- 				       imx708->supplies);
- }
- 
-@@ -1956,23 +1953,19 @@ static int imx708_probe(struct i2c_clien
- 
- 	/* Get system clock (xclk) */
- 	imx708->xclk = devm_clk_get(dev, NULL);
--	if (IS_ERR(imx708->xclk)) {
--		dev_err(dev, "failed to get xclk\n");
--		return PTR_ERR(imx708->xclk);
--	}
-+	if (IS_ERR(imx708->xclk))
-+		return dev_err_probe(dev, PTR_ERR(imx708->xclk),
-+				     "failed to get xclk\n");
- 
- 	imx708->xclk_freq = clk_get_rate(imx708->xclk);
--	if (imx708->xclk_freq != IMX708_XCLK_FREQ) {
--		dev_err(dev, "xclk frequency not supported: %d Hz\n",
--			imx708->xclk_freq);
--		return -EINVAL;
--	}
-+	if (imx708->xclk_freq != IMX708_XCLK_FREQ)
-+		return dev_err_probe(dev, -EINVAL,
-+				     "xclk frequency not supported: %d Hz\n",
-+				     imx708->xclk_freq);
- 
- 	ret = imx708_get_regulators(imx708);
--	if (ret) {
--		dev_err(dev, "failed to get regulators\n");
--		return ret;
--	}
-+	if (ret)
-+		return dev_err_probe(dev, ret, "failed to get regulators\n");
- 
- 	/* Request optional enable pin */
- 	imx708->reset_gpio = devm_gpiod_get_optional(dev, "reset",
-@@ -2001,7 +1994,7 @@ static int imx708_probe(struct i2c_clien
- 	/* This needs the pm runtime to be registered. */
- 	ret = imx708_init_controls(imx708);
- 	if (ret)
--		goto error_power_off;
-+		goto error_pm_runtime;
- 
- 	/* Initialize subdev */
- 	imx708->sd.internal_ops = &imx708_internal_ops;
-@@ -2033,9 +2026,11 @@ error_media_entity:
- error_handler_free:
- 	imx708_free_controls(imx708);
- 
--error_power_off:
-+error_pm_runtime:
- 	pm_runtime_disable(&client->dev);
- 	pm_runtime_set_suspended(&client->dev);
-+
-+error_power_off:
- 	imx708_power_off(&client->dev);
- 
- 	return ret;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0676-dt-bindings-media-i2c-Replace-IMX708-sensor-binding-.patch b/target/linux/bcm27xx/patches-6.1/950-0676-dt-bindings-media-i2c-Replace-IMX708-sensor-binding-.patch
deleted file mode 100644
index cb016b3ca6..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0676-dt-bindings-media-i2c-Replace-IMX708-sensor-binding-.patch
+++ /dev/null
@@ -1,282 +0,0 @@
-From f3dbbaa2a6c8ddfc22feac62e1fea6310a4fd659 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Fri, 31 Mar 2023 11:52:25 +0100
-Subject: [PATCH] dt-bindings: media: i2c: Replace IMX708 sensor
- binding documentation file
-
-Replace the existing imx708.yaml file with sony,imx708.yaml that follows
-the latest devicetree conventions for camera sensors.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- .../devicetree/bindings/media/i2c/imx708.yaml | 119 ----------------
- .../bindings/media/i2c/sony,imx708.yaml       | 128 ++++++++++++++++++
- MAINTAINERS                                   |   2 +-
- 3 files changed, 129 insertions(+), 120 deletions(-)
- delete mode 100644 Documentation/devicetree/bindings/media/i2c/imx708.yaml
- create mode 100644 Documentation/devicetree/bindings/media/i2c/sony,imx708.yaml
-
---- a/Documentation/devicetree/bindings/media/i2c/imx708.yaml
-+++ /dev/null
-@@ -1,119 +0,0 @@
--# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
--%YAML 1.2
-----
--$id: http://devicetree.org/schemas/media/i2c/imx708.yaml#
--$schema: http://devicetree.org/meta-schemas/core.yaml#
--
--title: Sony 1/2.3-Inch 12Mpixel CMOS Digital Image Sensor
--
--maintainers:
--  - Naushir Patuck <naush@raspberypi.com>
--
--description: |-
--  The Sony IMX708 is a 1/2.3-inch CMOS active pixel digital image sensor
--  with an active array size of 4608H x 2592V. It is programmable through
--  I2C interface. The I2C address is fixed to 0x1A as per sensor data sheet.
--  Image data is sent through MIPI CSI-2, which is configured as either 2 or
--  4 data lanes.
--
--properties:
--  compatible:
--    const: sony,imx708
--
--  reg:
--    description: I2C device address
--    maxItems: 1
--
--  clocks:
--    maxItems: 1
--
--  VDIG-supply:
--    description:
--      Digital I/O voltage supply, 1.1 volts
--
--  VANA1-supply:
--    description:
--      Analog1 voltage supply, 2.8 volts
--
--  VANA2-supply:
--    description:
--      Analog2 voltage supply, 1.8 volts
--
--  VDDL-supply:
--    description:
--      Digital core voltage supply, 1.8 volts
--
--  reset-gpios:
--    description: |-
--      Reference to the GPIO connected to the xclr pin, if any.
--      Must be released (set high) after all supplies and INCK are applied.
--
--  # See ../video-interfaces.txt for more details
--  port:
--    type: object
--    properties:
--      endpoint:
--        type: object
--        properties:
--          data-lanes:
--            description: |-
--              The sensor supports either two-lane, or four-lane operation.
--              For two-lane operation the property must be set to <1 2>.
--            items:
--              - const: 1
--              - const: 2
--
--          clock-noncontinuous:
--            type: boolean
--            description: |-
--              MIPI CSI-2 clock is non-continuous if this property is present,
--              otherwise it's continuous.
--
--          link-frequencies:
--            allOf:
--              - $ref: /schemas/types.yaml#/definitions/uint64-array
--            description:
--              Allowed data bus frequencies.
--
--        required:
--          - link-frequencies
--
--required:
--  - compatible
--  - reg
--  - clocks
--  - VANA1-supply
--  - VANA2-supply
--  - VDIG-supply
--  - VDDL-supply
--  - port
--
--additionalProperties: false
--
--examples:
--  - |
--    i2c0 {
--        #address-cells = <1>;
--        #size-cells = <0>;
--
--        imx708: sensor@1a {
--            compatible = "sony,imx708";
--            reg = <0x1a>;
--            clocks = <&imx708_clk>;
--            VANA1-supply = <&imx708_vana1>; /* 1.8v */
--            VANA2-supply = <&imx708_vana2>; /* 2.8v */
--            VDIG-supply = <&imx708_vdig>;   /* 1.1v */
--            VDDL-supply = <&imx708_vddl>;   /* 1.8v */
--
--            port {
--                imx708_0: endpoint {
--                    remote-endpoint = <&csi1_ep>;
--                    data-lanes = <1 2>;
--                    clock-noncontinuous;
--                    link-frequencies = /bits/ 64 <450000000>;
--                };
--            };
--        };
--    };
--
--...
---- /dev/null
-+++ b/Documentation/devicetree/bindings/media/i2c/sony,imx708.yaml
-@@ -0,0 +1,128 @@
-+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
-+%YAML 1.2
-+---
-+$id: http://devicetree.org/schemas/media/i2c/sony,imx708.yaml#
-+$schema: http://devicetree.org/meta-schemas/core.yaml#
-+
-+title: Sony 1/2.3-Inch 12Mpixel CMOS Digital Image Sensor
-+
-+maintainers:
-+  - Raspberry Pi Kernel Maintenance <kernel-list@raspberrypi.com>
-+
-+description: |-
-+  The Sony IMX708 is a 1/2.3-inch CMOS active pixel digital image sensor
-+  with an active array size of 4608H x 2592V. It is programmable through
-+  I2C interface. The I2C address is fixed to 0x1A as per sensor data sheet.
-+  Image data is sent through MIPI CSI-2, which is configured as either 2 or
-+  4 data lanes.
-+
-+properties:
-+  compatible:
-+    const: sony,imx708
-+
-+  reg:
-+    maxItems: 1
-+
-+  clocks:
-+    maxItems: 1
-+
-+  clock-names:
-+    description: Input clock (6 to 27 MHz)
-+    items:
-+      - const: inck
-+
-+  vdig-supply:
-+    description:
-+      Digital I/O voltage supply, 1.1 volts
-+
-+  vana1-supply:
-+    description:
-+      Analog1 voltage supply, 2.8 volts
-+
-+  vana2-supply:
-+    description:
-+      Analog2 voltage supply, 1.8 volts
-+
-+  vddl-supply:
-+    description:
-+      Digital core voltage supply, 1.8 volts
-+
-+  reset-gpios:
-+    description: Sensor reset (XCLR) GPIO
-+    maxItems: 1
-+
-+  port:
-+    $ref: /schemas/graph.yaml#/$defs/port-base
-+    description: |
-+      Video output port
-+
-+    properties:
-+      endpoint:
-+        $ref: /schemas/media/video-interfaces.yaml#
-+        unevaluatedProperties: false
-+
-+        properties:
-+          data-lanes:
-+            anyOf:
-+              - items:
-+                  - const: 1
-+                  - const: 2
-+              - items:
-+                  - const: 1
-+                  - const: 2
-+                  - const: 3
-+                  - const: 4
-+
-+          link-frequencies: true
-+
-+        required:
-+          - data-lanes
-+          - link-frequencies
-+
-+    additionalProperties: false
-+
-+required:
-+  - compatible
-+  - reg
-+  - clocks
-+  - clock-names
-+  - vdig-supply
-+  - vana1-supply
-+  - vana2-supply
-+  - vddl-supply
-+  - port
-+
-+additionalProperties: false
-+
-+examples:
-+  - |
-+    #include <dt-bindings/gpio/gpio.h>
-+
-+    i2c {
-+        #address-cells = <1>;
-+        #size-cells = <0>;
-+
-+        imx708: camera-sensor@1a {
-+            compatible = "sony,imx708";
-+            reg = <0x1a>;
-+
-+            clocks = <&clk 90>;
-+            clock-names = "inck";
-+
-+            vdig-supply = <&camera_vdig>;
-+            vana1-supply = <&camera_vana1>;
-+            vana2-supply = <&camera_vana2>;
-+            vddl-supply = <&camera_vddl>;
-+
-+            reset-gpios = <&gpio 35 GPIO_ACTIVE_LOW>;
-+
-+            port {
-+                imx708_ep: endpoint {
-+                    data-lanes = <1 2>;
-+                    link-frequencies = /bits/ 64 <450000000>;
-+                    remote-endpoint = <&csi_ep>;
-+                };
-+            };
-+        };
-+    };
-+...
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -19353,7 +19353,7 @@ M:	Raspberry Pi Kernel Maintenance <kern
- L:	linux-media@vger.kernel.org
- S:	Maintained
- T:	git git://linuxtv.org/media_tree.git
--F:	Documentation/devicetree/bindings/media/i2c/imx708.yaml
-+F:	Documentation/devicetree/bindings/media/i2c/sony,imx708.yaml
- F:	drivers/media/i2c/imx708.c
- 
- SONY MEMORYSTICK SUBSYSTEM
diff --git a/target/linux/bcm27xx/patches-6.1/950-0677-dtoverlays-Follow-the-standard-devicetree-labels-for.patch b/target/linux/bcm27xx/patches-6.1/950-0677-dtoverlays-Follow-the-standard-devicetree-labels-for.patch
deleted file mode 100644
index 625b62dc6f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0677-dtoverlays-Follow-the-standard-devicetree-labels-for.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 08d38a30e843061fef8612fda72f8cc1da9e9481 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Fri, 31 Mar 2023 15:08:10 +0100
-Subject: [PATCH] dtoverlays: Follow the standard devicetree labels for
- IMX708
-
-Switch the system clock name from "xclk" to "inclk".
-Use lower case lables for all regulator names.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/imx708.dtsi | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/imx708.dtsi
-+++ b/arch/arm/boot/dts/overlays/imx708.dtsi
-@@ -6,12 +6,12 @@ cam_node: imx708@1a {
- 	status = "disabled";
- 
- 	clocks = <&cam1_clk>;
--	clock-names = "xclk";
-+	clock-names = "inclk";
- 
--	VANA1-supply = <&cam1_reg>;	/* 2.8v */
--	VANA2-supply = <&cam_dummy_reg>;/* 1.8v */
--	VDIG-supply = <&cam_dummy_reg>;	/* 1.1v */
--	VDDL-supply = <&cam_dummy_reg>;	/* 1.8v */
-+	vana1-supply = <&cam1_reg>;	/* 2.8v */
-+	vana2-supply = <&cam_dummy_reg>;/* 1.8v */
-+	vdig-supply = <&cam_dummy_reg>;	/* 1.1v */
-+	vddl-supply = <&cam_dummy_reg>;	/* 1.8v */
- 
- 	rotation = <180>;
- 	orientation = <2>;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0678-drivers-media-imx708-Follow-the-standard-devicetree-.patch b/target/linux/bcm27xx/patches-6.1/950-0678-drivers-media-imx708-Follow-the-standard-devicetree-.patch
deleted file mode 100644
index bc4dcc43c5..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0678-drivers-media-imx708-Follow-the-standard-devicetree-.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 6d6d0783a96c6a4eeeef42039bfd5ac23f2575f1 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Fri, 31 Mar 2023 15:05:33 +0100
-Subject: [PATCH] drivers: media: imx708: Follow the standard
- devicetree labels
-
-Switch the system clock name from "xclk" to "inclk".
-Use lower case lables for all regulator names.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/i2c/imx708.c | 36 ++++++++++++++++++------------------
- 1 file changed, 18 insertions(+), 18 deletions(-)
-
---- a/drivers/media/i2c/imx708.c
-+++ b/drivers/media/i2c/imx708.c
-@@ -33,7 +33,7 @@
- 
- #define IMX708_REG_ORIENTATION		0x101
- 
--#define IMX708_XCLK_FREQ		24000000
-+#define IMX708_INCLK_FREQ		24000000
- 
- /* Default initial pixel rate, will get updated for each mode. */
- #define IMX708_INITIAL_PIXEL_RATE	590000000
-@@ -786,10 +786,10 @@ static const int imx708_test_pattern_val
- /* regulator supplies */
- static const char * const imx708_supply_name[] = {
- 	/* Supplies can be enabled in any order */
--	"VANA1",  /* Analog1 (2.8V) supply */
--	"VANA2",  /* Analog2 (1.8V) supply */
--	"VDIG",  /* Digital Core (1.1V) supply */
--	"VDDL",  /* IF (1.8V) supply */
-+	"vana1",  /* Analog1 (2.8V) supply */
-+	"vana2",  /* Analog2 (1.8V) supply */
-+	"vdig",  /* Digital Core (1.1V) supply */
-+	"vddl",  /* IF (1.8V) supply */
- };
- 
- /*
-@@ -809,8 +809,8 @@ struct imx708 {
- 
- 	struct v4l2_mbus_framefmt fmt;
- 
--	struct clk *xclk;
--	u32 xclk_freq;
-+	struct clk *inclk;
-+	u32 inclk_freq;
- 
- 	struct gpio_desc *reset_gpio;
- 	struct regulator_bulk_data supplies[ARRAY_SIZE(imx708_supply_name)];
-@@ -1602,7 +1602,7 @@ static int imx708_power_on(struct device
- 		return ret;
- 	}
- 
--	ret = clk_prepare_enable(imx708->xclk);
-+	ret = clk_prepare_enable(imx708->inclk);
- 	if (ret) {
- 		dev_err(&client->dev, "%s: failed to enable clock\n",
- 			__func__);
-@@ -1630,7 +1630,7 @@ static int imx708_power_off(struct devic
- 	gpiod_set_value_cansleep(imx708->reset_gpio, 0);
- 	regulator_bulk_disable(ARRAY_SIZE(imx708_supply_name),
- 			       imx708->supplies);
--	clk_disable_unprepare(imx708->xclk);
-+	clk_disable_unprepare(imx708->inclk);
- 
- 	/* Force reprogramming of the common registers when powered up again. */
- 	imx708->common_regs_written = false;
-@@ -1951,17 +1951,17 @@ static int imx708_probe(struct i2c_clien
- 	if (imx708_check_hwcfg(dev, imx708))
- 		return -EINVAL;
- 
--	/* Get system clock (xclk) */
--	imx708->xclk = devm_clk_get(dev, NULL);
--	if (IS_ERR(imx708->xclk))
--		return dev_err_probe(dev, PTR_ERR(imx708->xclk),
--				     "failed to get xclk\n");
-+	/* Get system clock (inclk) */
-+	imx708->inclk = devm_clk_get(dev, "inclk");
-+	if (IS_ERR(imx708->inclk))
-+		return dev_err_probe(dev, PTR_ERR(imx708->inclk),
-+				     "failed to get inclk\n");
- 
--	imx708->xclk_freq = clk_get_rate(imx708->xclk);
--	if (imx708->xclk_freq != IMX708_XCLK_FREQ)
-+	imx708->inclk_freq = clk_get_rate(imx708->inclk);
-+	if (imx708->inclk_freq != IMX708_INCLK_FREQ)
- 		return dev_err_probe(dev, -EINVAL,
--				     "xclk frequency not supported: %d Hz\n",
--				     imx708->xclk_freq);
-+				     "inclk frequency not supported: %d Hz\n",
-+				     imx708->inclk_freq);
- 
- 	ret = imx708_get_regulators(imx708);
- 	if (ret)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0679-drives-media-imx708-Put-HFLIP-and-VFLIP-controls-in-.patch b/target/linux/bcm27xx/patches-6.1/950-0679-drives-media-imx708-Put-HFLIP-and-VFLIP-controls-in-.patch
deleted file mode 100644
index 22bbf8830c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0679-drives-media-imx708-Put-HFLIP-and-VFLIP-controls-in-.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From c14ac3e46f17ce0c1dd2f58ed1d24c1010f577f6 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Fri, 31 Mar 2023 12:02:09 +0100
-Subject: [PATCH] drives: media: imx708: Put HFLIP and VFLIP controls
- in a cluster
-
-Create a cluster for the HVLIP and VFLIP controls so they are treated
-as a single composite control.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/i2c/imx708.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
---- a/drivers/media/i2c/imx708.c
-+++ b/drivers/media/i2c/imx708.c
-@@ -819,12 +819,14 @@ struct imx708 {
- 	/* V4L2 Controls */
- 	struct v4l2_ctrl *pixel_rate;
- 	struct v4l2_ctrl *exposure;
--	struct v4l2_ctrl *vflip;
--	struct v4l2_ctrl *hflip;
- 	struct v4l2_ctrl *vblank;
- 	struct v4l2_ctrl *hblank;
- 	struct v4l2_ctrl *hdr_mode;
- 	struct v4l2_ctrl *link_freq;
-+	struct {
-+		struct v4l2_ctrl *hflip;
-+		struct v4l2_ctrl *vflip;
-+	};
- 
- 	/* Current mode */
- 	const struct imx708_mode *mode;
-@@ -1815,6 +1817,7 @@ static int imx708_init_controls(struct i
- 
- 	imx708->vflip = v4l2_ctrl_new_std(ctrl_hdlr, &imx708_ctrl_ops,
- 					  V4L2_CID_VFLIP, 0, 1, 1, 0);
-+	v4l2_ctrl_cluster(2, &imx708->hflip);
- 
- 	v4l2_ctrl_new_std_menu_items(ctrl_hdlr, &imx708_ctrl_ops,
- 				     V4L2_CID_TEST_PATTERN,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0680-media-bcm2835-unicam-Start-and-stop-media_pipeline-w.patch b/target/linux/bcm27xx/patches-6.1/950-0680-media-bcm2835-unicam-Start-and-stop-media_pipeline-w.patch
deleted file mode 100644
index 095bb71b52..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0680-media-bcm2835-unicam-Start-and-stop-media_pipeline-w.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From e43d09e8749afa7fdfdd83439690d304b5acc98d Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 28 Mar 2023 13:43:43 +0100
-Subject: [PATCH] media: bcm2835-unicam: Start and stop media_pipeline
- with same node
-
-media_pipeline_start and media_pipeline_stop now validate that
-the pipeline is being started and stopped with the same pipe
-and pad handles.
-When running with embedded metadata (eg imx477 and imx708), the
-start typically happens from the metadata pad, whilst stop is
-always from the image pad.
-
-Always pass the image pad to media_pipeline_start to ensure
-that the calls are balanced.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/platform/bcm2835/bcm2835-unicam.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
-+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -2524,7 +2524,8 @@ static int unicam_start_streaming(struct
- 		goto err_streaming;
- 	}
- 
--	ret = media_pipeline_start(node->video_dev.entity.pads, &node->pipe);
-+	ret = media_pipeline_start(dev->node[IMAGE_PAD].video_dev.entity.pads,
-+				   &dev->node[IMAGE_PAD].pipe);
- 	if (ret < 0) {
- 		unicam_err(dev, "Failed to start media pipeline: %d\n", ret);
- 		goto err_pm_put;
-@@ -2618,7 +2619,8 @@ err_vpu_clock:
- 		unicam_err(dev, "failed to reset the VPU clock\n");
- 	clk_disable_unprepare(dev->vpu_clock);
- error_pipeline:
--	media_pipeline_stop(node->video_dev.entity.pads);
-+	if (node->pad_id == IMAGE_PAD)
-+		media_pipeline_stop(dev->node[IMAGE_PAD].video_dev.entity.pads);
- err_pm_put:
- 	unicam_runtime_put(dev);
- err_streaming:
diff --git a/target/linux/bcm27xx/patches-6.1/950-0681-fixup-gpio-fsm-Avoid-truncation-of-delay-jiffies.patch b/target/linux/bcm27xx/patches-6.1/950-0681-fixup-gpio-fsm-Avoid-truncation-of-delay-jiffies.patch
deleted file mode 100644
index d1ff9389a5..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0681-fixup-gpio-fsm-Avoid-truncation-of-delay-jiffies.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0fcc2d8ccfb1a35da7ab3c34218865fd0ab240c0 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Sat, 1 Apr 2023 11:50:07 +0100
-Subject: [PATCH] fixup! gpio-fsm: Avoid truncation of delay jiffies
-
-The kernel's time unit of jiffies should be stored as an unsigned long
-value. Storing it as an unsigned int, as gpio-fsm did, leads to
-truncation and malfunction when the kernel is built for a 64-bit
-platform.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/gpio/gpio-fsm.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/gpio/gpio-fsm.c
-+++ b/drivers/gpio/gpio-fsm.c
-@@ -121,7 +121,7 @@ struct gpio_fsm {
- 	struct fsm_state *current_state;
- 	struct fsm_state *next_state;
- 	struct fsm_state *delay_target_state;
--	unsigned int delay_jiffies;
-+	unsigned long delay_jiffies;
- 	int delay_ms;
- 	unsigned int debug;
- 	bool shutting_down;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0682-staging-bcm2835-codec-Add-missing-alignment-for-V4L2.patch b/target/linux/bcm27xx/patches-6.1/950-0682-staging-bcm2835-codec-Add-missing-alignment-for-V4L2.patch
deleted file mode 100644
index 9d0462a74a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0682-staging-bcm2835-codec-Add-missing-alignment-for-V4L2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e9ec7b00d139fbfb37a57d3109b651809cc568cc Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 12 Apr 2023 17:28:11 +0100
-Subject: [PATCH] staging: bcm2835-codec: Add missing alignment for
- V4L2_PIX_FMT_RGBA32
-
-The patch adding image encode (JPEG) to the driver missed adding
-the alignment constraint for V4L2_PIX_FMT_RGBA32, which meant
-it ended up giving a stride and size of 0.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c    | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-+++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -263,7 +263,7 @@ static const struct bcm2835_codec_fmt su
- 	}, {
- 		.fourcc			= V4L2_PIX_FMT_RGBA32,
- 		.depth			= 32,
--		.bytesperline_align	= { 32, 32, 32, 32 },
-+		.bytesperline_align	= { 32, 32, 32, 32, 32 },
- 		.flags			= 0,
- 		.mmal_fmt		= MMAL_ENCODING_RGBA,
- 		.size_multiplier_x2	= 2,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0683-ARM-dts-bcm27xx-Add-i2c_arm-vc-and-friends.patch b/target/linux/bcm27xx/patches-6.1/950-0683-ARM-dts-bcm27xx-Add-i2c_arm-vc-and-friends.patch
deleted file mode 100644
index e2f9ee863c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0683-ARM-dts-bcm27xx-Add-i2c_arm-vc-and-friends.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-From 56a619cbaa22d536455de8e339747faa196615de Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 12 Apr 2023 16:11:40 +0100
-Subject: [PATCH] ARM: dts: bcm27xx: Add i2c_arm/vc and friends
-
-Since there is now a dedicated dts file for the rev1 Model B (the only
-Pi to drive the primary camera with i2c1), move the creation of the
-i2c_arm, i2c_vc and i2c labels, aliases and overrides into the base dts
-files.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2708-rpi-b-plus.dts |  6 ++++++
- arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts | 13 +++++++++++++
- arch/arm/boot/dts/bcm2708-rpi-b.dts      |  6 ++++++
- arch/arm/boot/dts/bcm2708-rpi-cm.dtsi    |  6 ++++++
- arch/arm/boot/dts/bcm2708-rpi-zero-w.dts |  3 +++
- arch/arm/boot/dts/bcm2708-rpi-zero.dts   |  3 +++
- arch/arm/boot/dts/bcm2709-rpi.dtsi       |  3 +++
- arch/arm/boot/dts/bcm270x-rpi.dtsi       |  7 +++++++
- arch/arm/boot/dts/bcm2711-rpi-ds.dtsi    |  3 +++
- 9 files changed, 50 insertions(+)
-
---- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
-+++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
-@@ -186,6 +186,12 @@
- cam0_reg: &cam_dummy_reg {
- };
- 
-+i2c_arm: &i2c1 {
-+};
-+
-+i2c_vc: &i2c0 {
-+};
-+
- / {
- 	__overrides__ {
- 		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_headphones=1 snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_headphones=0 snd_bcm2835.enable_hdmi=0'}";
---- a/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
-+++ b/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
-@@ -197,6 +197,12 @@ i2c_csi_dsi: &i2c1 {
- cam0_reg: &cam_dummy_reg {
- };
- 
-+i2c_arm: &i2c0 {
-+};
-+
-+i2c_vc: &i2c1 {
-+};
-+
- / {
- 	__overrides__ {
- 		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_headphones=1 snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_headphones=0 snd_bcm2835.enable_hdmi=0'}";
-@@ -204,5 +210,12 @@ cam0_reg: &cam_dummy_reg {
- 		act_led_gpio = <&act_led>,"gpios:4";
- 		act_led_activelow = <&act_led>,"gpios:8";
- 		act_led_trigger = <&act_led>,"linux,default-trigger";
-+
-+		i2c = <&i2c0>,"status";
-+		i2c_arm = <&i2c0>,"status";
-+		i2c_vc = <&i2c1>,"status";
-+		i2c_baudrate = <&i2c0>,"clock-frequency:0";
-+		i2c_arm_baudrate = <&i2c0>,"clock-frequency:0";
-+		i2c_vc_baudrate = <&i2c1>,"clock-frequency:0";
- 	};
- };
---- a/arch/arm/boot/dts/bcm2708-rpi-b.dts
-+++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts
-@@ -179,6 +179,12 @@
- cam0_reg: &cam_dummy_reg {
- };
- 
-+i2c_arm: &i2c1 {
-+};
-+
-+i2c_vc: &i2c0 {
-+};
-+
- / {
- 	__overrides__ {
- 		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_headphones=1 snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_headphones=0 snd_bcm2835.enable_hdmi=0'}";
---- a/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
-+++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
-@@ -9,6 +9,12 @@
- 	};
- };
- 
-+i2c_arm: &i2c1 {
-+};
-+
-+i2c_vc: &i2c0 {
-+};
-+
- / {
- 	__overrides__ {
- 		act_led_gpio = <&act_led>,"gpios:4";
---- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
-+++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
-@@ -235,6 +235,9 @@
- cam0_reg: &cam_dummy_reg {
- };
- 
-+i2c_arm: &i2c1 {};
-+i2c_vc: &i2c0 {};
-+
- / {
- 	__overrides__ {
- 		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_hdmi=0'}";
---- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts
-+++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
-@@ -176,6 +176,9 @@
- cam0_reg: &cam_dummy_reg {
- };
- 
-+i2c_arm: &i2c1 {};
-+i2c_vc: &i2c0 {};
-+
- / {
- 	__overrides__ {
- 		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_hdmi=0'}";
---- a/arch/arm/boot/dts/bcm2709-rpi.dtsi
-+++ b/arch/arm/boot/dts/bcm2709-rpi.dtsi
-@@ -3,3 +3,6 @@
- &vchiq {
- 	compatible = "brcm,bcm2836-vchiq", "brcm,bcm2835-vchiq";
- };
-+
-+i2c_arm: &i2c1 {};
-+i2c_vc: &i2c0 {};
---- a/arch/arm/boot/dts/bcm270x-rpi.dtsi
-+++ b/arch/arm/boot/dts/bcm270x-rpi.dtsi
-@@ -21,6 +21,7 @@
- 		i2c0 = &i2c0;
- 		i2c1 = &i2c1;
- 		i2c10 = &i2c_csi_dsi;
-+		i2c = &i2c_arm;
- 		spi0 = &spi0;
- 		spi1 = &spi1;
- 		spi2 = &spi2;
-@@ -79,8 +80,14 @@
- 		spi = <&spi0>,"status";
- 		i2c0 = <&i2c0if>,"status",<&i2c0mux>,"status";
- 		i2c1 = <&i2c1>,"status";
-+		i2c = <&i2c1>,"status";
-+		i2c_arm = <&i2c1>,"status";
-+		i2c_vc = <&i2c0if>,"status",<&i2c0mux>,"status";
- 		i2c0_baudrate = <&i2c0if>,"clock-frequency:0";
- 		i2c1_baudrate = <&i2c1>,"clock-frequency:0";
-+		i2c_baudrate = <&i2c1>,"clock-frequency:0";
-+		i2c_arm_baudrate = <&i2c1>,"clock-frequency:0";
-+		i2c_vc_baudrate = <&i2c0if>,"clock-frequency:0";
- 
- 		watchdog = <&watchdog>,"status";
- 		random = <&random>,"status";
---- a/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
-+++ b/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
-@@ -267,6 +267,9 @@
- 	interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
- };
- 
-+i2c_arm: &i2c1 {};
-+i2c_vc: &i2c0 {};
-+
- /delete-node/ &v3d;
- 
- / {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0684-overlays-Add-pcf857x-support.patch b/target/linux/bcm27xx/patches-6.1/950-0684-overlays-Add-pcf857x-support.patch
deleted file mode 100644
index e66f83cfee..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0684-overlays-Add-pcf857x-support.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From e0db80960019c296c47690dea9052dc4960f4f99 Mon Sep 17 00:00:00 2001
-From: Clarke X <1014930533@qq.com>
-Date: Sat, 8 Apr 2023 11:29:16 +0800
-Subject: [PATCH] overlays: Add pcf857x support
-
-Add pcf857x overlay with related documents.
-
-Signed-off-by: Clarke X <1014930533@qq.com>
----
- arch/arm/boot/dts/overlays/Makefile           |  1 +
- arch/arm/boot/dts/overlays/README             | 11 +++++++
- .../arm/boot/dts/overlays/pcf857x-overlay.dts | 32 +++++++++++++++++++
- 3 files changed, 44 insertions(+)
- create mode 100644 arch/arm/boot/dts/overlays/pcf857x-overlay.dts
-
---- a/arch/arm/boot/dts/overlays/Makefile
-+++ b/arch/arm/boot/dts/overlays/Makefile
-@@ -167,6 +167,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
- 	ov9281.dtbo \
- 	papirus.dtbo \
- 	pca953x.dtbo \
-+	pcf857x.dtbo \
- 	pcie-32bit-dma.dtbo \
- 	pibell.dtbo \
- 	pifacedigital.dtbo \
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -3065,6 +3065,17 @@ Params: addr                    I2C addr
-         xra1202                 Select the Exar XRA1202 (8 bit)
- 
- 
-+Name:   pcf857x
-+Info:   NXP PCF857x family of I2C GPIO expanders.
-+Load:   dtoverlay=pcf857x,<param>=<val>
-+Params: addr                    I2C address of expander. Default
-+                                depends on model selected.
-+        pcf8574                 Select the NXP PCF8574 (8 bit)
-+        pcf8574a                Select the NXP PCF8574A (8 bit)
-+        pcf8575                 Select the NXP PCF8575 (16 bit)
-+        pca8574                 Select the NXP PCA8574 (8 bit)
-+
-+
- Name:   pcie-32bit-dma
- Info:   Force PCIe config to support 32bit DMA addresses at the expense of
-         having to bounce buffers.
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/pcf857x-overlay.dts
-@@ -0,0 +1,32 @@
-+// Definitions for PCF857X GPIO Extender from NXP
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2c_arm>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			pcf857x: pcf857x@0 {
-+				compatible = "";
-+				reg = <0x00>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		pcf8574  = <&pcf857x>,"compatible=nxp,pcf8574",  <&pcf857x>,"reg:0=0x20";
-+		pcf8574a = <&pcf857x>,"compatible=nxp,pcf8574a", <&pcf857x>,"reg:0=0x38";
-+		pcf8575  = <&pcf857x>,"compatible=nxp,pcf8575",  <&pcf857x>,"reg:0=0x20";
-+		pca8574  = <&pcf857x>,"compatible=nxp,pca8574", <&pcf857x>,"reg:0=0x20";
-+		addr = <&pcf857x>,"reg:0";
-+	};
-+};
diff --git a/target/linux/bcm27xx/patches-6.1/950-0685-overlays-Add-gpio-charger-support.patch b/target/linux/bcm27xx/patches-6.1/950-0685-overlays-Add-gpio-charger-support.patch
deleted file mode 100644
index d98f76a1d7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0685-overlays-Add-gpio-charger-support.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 97fb20dfd682cf2748d1286322455cb8bf8b034d Mon Sep 17 00:00:00 2001
-From: Clarke X <1014930533@qq.com>
-Date: Sat, 8 Apr 2023 09:56:13 +0800
-Subject: [PATCH] overlays: Add gpio-charger support
-
-Add gpio-charger overlay for charger via gpio.
-
-Signed-off-by: Clarke X <1014930533@qq.com>
----
- arch/arm/boot/dts/overlays/Makefile           |  1 +
- arch/arm/boot/dts/overlays/README             | 14 +++++++
- .../dts/overlays/gpio-charger-overlay.dts     | 42 +++++++++++++++++++
- 3 files changed, 57 insertions(+)
- create mode 100644 arch/arm/boot/dts/overlays/gpio-charger-overlay.dts
-
---- a/arch/arm/boot/dts/overlays/Makefile
-+++ b/arch/arm/boot/dts/overlays/Makefile
-@@ -68,6 +68,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
- 	ghost-amp.dtbo \
- 	goodix.dtbo \
- 	googlevoicehat-soundcard.dtbo \
-+	gpio-charger.dtbo \
- 	gpio-fan.dtbo \
- 	gpio-hog.dtbo \
- 	gpio-ir.dtbo \
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -1248,6 +1248,20 @@ Load:   dtoverlay=googlevoicehat-soundca
- Params: <None>
- 
- 
-+Name:   gpio-charger
-+Info:   This is a generic overlay for detecting charger with GPIO.
-+Load:   dtoverlay=gpio-charger,<param>=<val>
-+Params: gpio                    GPIO pin to trigger on (default 4)
-+        active_low              When this is 1 (active low), a falling
-+                                edge generates a charging event and a
-+                                rising edge generates a discharging event.
-+                                When this is 0 (active high), this is
-+                                reversed. The default is 0 (active high)
-+        gpio_pull               Desired pull-up/down state (off, down, up)
-+                                Default is "down".
-+        type                    Set a charger type for the pin. (Default: mains)
-+
-+
- Name:   gpio-fan
- Info:   Configure a GPIO pin to control a cooling fan.
- Load:   dtoverlay=gpio-fan,<param>=<val>
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/gpio-charger-overlay.dts
-@@ -0,0 +1,42 @@
-+// Definitions for gpio-charger module
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		// Configure the gpio pin controller
-+		target = <&gpio>;
-+		__overlay__ {
-+			pin_state: charger_pins@0 {
-+				brcm,pins = <4>; // gpio number
-+				brcm,function = <0>; // 0 = input, 1 = output
-+				brcm,pull = <1>; // 0 = none, 1 = pull down, 2 = pull up
-+			};
-+		};
-+	};
-+	fragment@1 {
-+		target-path = "/";
-+		__overlay__ {
-+			charger: charger@0 {
-+				compatible = "gpio-charger";
-+				pinctrl-0 = <&pin_state>;
-+				status = "okay";
-+				gpios = <&gpio 4 0>;
-+				charger-type = "mains";
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		gpio =       <&charger>,"reg:0",
-+			     <&charger>,"gpios:4",
-+			     <&pin_state>,"reg:0",
-+			     <&pin_state>,"brcm,pins:0";
-+		type =       <&charger>,"charger-type";
-+		gpio_pull =  <&pin_state>,"brcm,pull:0";
-+		active_low = <&charger>,"gpios:8";
-+	};
-+
-+};
diff --git a/target/linux/bcm27xx/patches-6.1/950-0686-media-i2c-imx219-Scale-the-pixel-clock-rate-for-the-.patch b/target/linux/bcm27xx/patches-6.1/950-0686-media-i2c-imx219-Scale-the-pixel-clock-rate-for-the-.patch
deleted file mode 100644
index 35a859440a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0686-media-i2c-imx219-Scale-the-pixel-clock-rate-for-the-.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From e5390cad270d49f3b0dc0a03eccfef63ffa7520f Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Tue, 8 Feb 2022 13:49:11 +0000
-Subject: [PATCH] media: i2c: imx219: Scale the pixel clock rate for
- the 640x480 mode
-
-The 640x480 mode uses a special binning mode for high framerate operation where
-the pixel rate is effectively doubled. Account for this when setting up the
-pixel clock rate, and applying the vblank and exposure controls.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/i2c/imx219.c | 33 ++++++++++++++++++++++++++-------
- 1 file changed, 26 insertions(+), 7 deletions(-)
-
---- a/drivers/media/i2c/imx219.c
-+++ b/drivers/media/i2c/imx219.c
-@@ -164,6 +164,9 @@ struct imx219_mode {
- 
- 	/* 2x2 binning is used */
- 	bool binning;
-+
-+	/* Relative pixel clock rate factor for the mode. */
-+	unsigned int rate_factor;
- };
- 
- static const struct imx219_reg imx219_common_regs[] = {
-@@ -402,6 +405,7 @@ static const struct imx219_mode supporte
- 			.regs = mode_3280x2464_regs,
- 		},
- 		.binning = false,
-+		.rate_factor = 1,
- 	},
- 	{
- 		/* 1080P 30fps cropped */
-@@ -419,6 +423,7 @@ static const struct imx219_mode supporte
- 			.regs = mode_1920_1080_regs,
- 		},
- 		.binning = false,
-+		.rate_factor = 1,
- 	},
- 	{
- 		/* 2x2 binned 30fps mode */
-@@ -436,6 +441,7 @@ static const struct imx219_mode supporte
- 			.regs = mode_1640_1232_regs,
- 		},
- 		.binning = true,
-+		.rate_factor = 1,
- 	},
- 	{
- 		/* 640x480 30fps mode */
-@@ -453,6 +459,11 @@ static const struct imx219_mode supporte
- 			.regs = mode_640_480_regs,
- 		},
- 		.binning = true,
-+		/*
-+		 * This mode uses a special 2x2 binning that doubles the
-+		 * internal pixel clock rate.
-+		 */
-+		.rate_factor = 2,
- 	},
- };
- 
-@@ -675,7 +686,8 @@ static int imx219_set_ctrl(struct v4l2_c
- 		break;
- 	case V4L2_CID_EXPOSURE:
- 		ret = imx219_write_reg(imx219, IMX219_REG_EXPOSURE,
--				       IMX219_REG_VALUE_16BIT, ctrl->val);
-+				       IMX219_REG_VALUE_16BIT,
-+				       ctrl->val / imx219->mode->rate_factor);
- 		break;
- 	case V4L2_CID_DIGITAL_GAIN:
- 		ret = imx219_write_reg(imx219, IMX219_REG_DIGITAL_GAIN,
-@@ -695,7 +707,8 @@ static int imx219_set_ctrl(struct v4l2_c
- 	case V4L2_CID_VBLANK:
- 		ret = imx219_write_reg(imx219, IMX219_REG_VTS,
- 				       IMX219_REG_VALUE_16BIT,
--				       imx219->mode->height + ctrl->val);
-+				       (imx219->mode->height + ctrl->val) /
-+						imx219->mode->rate_factor);
- 		break;
- 	case V4L2_CID_HBLANK:
- 		ret = imx219_write_reg(imx219, IMX219_REG_HTS,
-@@ -877,7 +890,7 @@ static int imx219_set_pad_format(struct
- 	struct imx219 *imx219 = to_imx219(sd);
- 	const struct imx219_mode *mode;
- 	struct v4l2_mbus_framefmt *framefmt;
--	int exposure_max, exposure_def, hblank;
-+	int exposure_max, exposure_def, hblank, pixel_rate;
- 	unsigned int i;
- 
- 	if (fmt->pad >= NUM_PADS)
-@@ -942,6 +955,12 @@ static int imx219_set_pad_format(struct
- 						 1,
- 						 IMX219_PPL_MIN - mode->width);
- 			__v4l2_ctrl_s_ctrl(imx219->hblank, hblank);
-+
-+			/* Scale the pixel rate based on the mode specific factor */
-+			pixel_rate =
-+				IMX219_PIXEL_RATE * imx219->mode->rate_factor;
-+			__v4l2_ctrl_modify_range(imx219->pixel_rate, pixel_rate,
-+						 pixel_rate, 1, pixel_rate);
- 		}
- 	} else {
- 		if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
-@@ -1323,7 +1342,7 @@ static int imx219_init_controls(struct i
- 	struct v4l2_ctrl_handler *ctrl_hdlr;
- 	unsigned int height = imx219->mode->height;
- 	struct v4l2_fwnode_device_properties props;
--	int exposure_max, exposure_def, hblank;
-+	int exposure_max, exposure_def, hblank, pixel_rate;
- 	int i, ret;
- 
- 	ctrl_hdlr = &imx219->ctrl_handler;
-@@ -1335,11 +1354,11 @@ static int imx219_init_controls(struct i
- 	ctrl_hdlr->lock = &imx219->mutex;
- 
- 	/* By default, PIXEL_RATE is read only */
-+	pixel_rate = IMX219_PIXEL_RATE * imx219->mode->rate_factor;
- 	imx219->pixel_rate = v4l2_ctrl_new_std(ctrl_hdlr, &imx219_ctrl_ops,
- 					       V4L2_CID_PIXEL_RATE,
--					       IMX219_PIXEL_RATE,
--					       IMX219_PIXEL_RATE, 1,
--					       IMX219_PIXEL_RATE);
-+					       pixel_rate, pixel_rate,
-+					       1, pixel_rate);
- 
- 	imx219->link_freq =
- 		v4l2_ctrl_new_int_menu(ctrl_hdlr, &imx219_ctrl_ops,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0687-hwmon-emc2305-Add-calls-to-initialise-of-cooling-map.patch b/target/linux/bcm27xx/patches-6.1/950-0687-hwmon-emc2305-Add-calls-to-initialise-of-cooling-map.patch
deleted file mode 100644
index c08e041178..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0687-hwmon-emc2305-Add-calls-to-initialise-of-cooling-map.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 76f8210c9498983b492645ec2c90c5c547ae415b Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 21 Apr 2023 14:49:38 +0100
-Subject: [PATCH] hwmon: emc2305: Add calls to initialise of cooling
- maps
-
-Commit 46ef9d4ed26b ("hwmon: emc2305: fixups for driver submitted to
-mailing lists") missed adding the call to thermal_of_cooling_device_register
-required to configure any cooling maps for the device, hence stopping it
-from actually ever changing speed.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/hwmon/emc2305.c | 22 ++++++++++++++++------
- 1 file changed, 16 insertions(+), 6 deletions(-)
-
---- a/drivers/hwmon/emc2305.c
-+++ b/drivers/hwmon/emc2305.c
-@@ -348,9 +348,17 @@ static int emc2305_set_single_tz(struct
- 	cdev_idx = (idx) ? idx - 1 : 0;
- 	pwm = data->pwm_min[cdev_idx];
- 
--	data->cdev_data[cdev_idx].cdev =
--		thermal_cooling_device_register(emc2305_fan_name[idx], data,
--						&emc2305_cooling_ops);
-+	if (dev->of_node)
-+		data->cdev_data[cdev_idx].cdev =
-+			devm_thermal_of_cooling_device_register(dev, dev->of_node,
-+								emc2305_fan_name[idx],
-+								data,
-+								&emc2305_cooling_ops);
-+	else
-+		data->cdev_data[cdev_idx].cdev =
-+			thermal_cooling_device_register(emc2305_fan_name[idx],
-+							data,
-+							&emc2305_cooling_ops);
- 
- 	if (IS_ERR(data->cdev_data[cdev_idx].cdev)) {
- 		dev_err(dev, "Failed to register cooling device %s\n", emc2305_fan_name[idx]);
-@@ -403,9 +411,11 @@ static void emc2305_unset_tz(struct devi
- 	int i;
- 
- 	/* Unregister cooling device. */
--	for (i = 0; i < EMC2305_PWM_MAX; i++)
--		if (data->cdev_data[i].cdev)
--			thermal_cooling_device_unregister(data->cdev_data[i].cdev);
-+	if (!dev->of_node) {
-+		for (i = 0; i < EMC2305_PWM_MAX; i++)
-+			if (data->cdev_data[i].cdev)
-+				thermal_cooling_device_unregister(data->cdev_data[i].cdev);
-+	}
- }
- 
- static umode_t
diff --git a/target/linux/bcm27xx/patches-6.1/950-0688-drm-panel-Add-panel-driver-for-Waveshare-DSI-touchsc.patch b/target/linux/bcm27xx/patches-6.1/950-0688-drm-panel-Add-panel-driver-for-Waveshare-DSI-touchsc.patch
deleted file mode 100644
index 7c44509690..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0688-drm-panel-Add-panel-driver-for-Waveshare-DSI-touchsc.patch
+++ /dev/null
@@ -1,461 +0,0 @@
-From cd117c5e63682b561b29cac1794e2e4413ad6773 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 14 Apr 2023 13:50:08 +0100
-Subject: [PATCH] drm/panel: Add panel driver for Waveshare DSI
- touchscreens
-
-Waveshare sell a range of DSI panels of varying sizes, all
-using a common MCU to control the panel and backlight.
-
-Add a panel driver that supports these panels.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/panel/Kconfig               |  10 +
- drivers/gpu/drm/panel/Makefile              |   1 +
- drivers/gpu/drm/panel/panel-waveshare-dsi.c | 411 ++++++++++++++++++++
- 3 files changed, 422 insertions(+)
- create mode 100644 drivers/gpu/drm/panel/panel-waveshare-dsi.c
-
---- a/drivers/gpu/drm/panel/Kconfig
-+++ b/drivers/gpu/drm/panel/Kconfig
-@@ -720,6 +720,16 @@ config DRM_PANEL_VISIONOX_RM69299
- 	  Say Y here if you want to enable support for Visionox
- 	  RM69299  DSI Video Mode panel.
- 
-+config DRM_PANEL_WAVESHARE_TOUCHSCREEN
-+	tristate "Waveshare touchscreen panels"
-+	depends on DRM_MIPI_DSI
-+	depends on I2C
-+	depends on BACKLIGHT_CLASS_DEVICE
-+	help
-+	  Say Y here if you want to enable support for the Waveshare
-+	  DSI Touchscreens.  To compile this driver as a module,
-+	  choose M here.
-+
- config DRM_PANEL_WIDECHIPS_WS2401
- 	tristate "Widechips WS2401 DPI panel driver"
- 	depends on SPI && GPIOLIB
---- a/drivers/gpu/drm/panel/Makefile
-+++ b/drivers/gpu/drm/panel/Makefile
-@@ -73,5 +73,6 @@ obj-$(CONFIG_DRM_PANEL_TPO_TD043MTEA1) +
- obj-$(CONFIG_DRM_PANEL_TPO_TPG110) += panel-tpo-tpg110.o
- obj-$(CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA) += panel-truly-nt35597.o
- obj-$(CONFIG_DRM_PANEL_VISIONOX_RM69299) += panel-visionox-rm69299.o
-+obj-$(CONFIG_DRM_PANEL_WAVESHARE_TOUCHSCREEN) += panel-waveshare-dsi.o
- obj-$(CONFIG_DRM_PANEL_WIDECHIPS_WS2401) += panel-widechips-ws2401.o
- obj-$(CONFIG_DRM_PANEL_XINPENG_XPP055C272) += panel-xinpeng-xpp055c272.o
---- /dev/null
-+++ b/drivers/gpu/drm/panel/panel-waveshare-dsi.c
-@@ -0,0 +1,411 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Copyright © 2023 Raspberry Pi Ltd
-+ *
-+ * Based on panel-raspberrypi-touchscreen by Broadcom
-+ */
-+
-+#include <linux/backlight.h>
-+#include <linux/delay.h>
-+#include <linux/err.h>
-+#include <linux/fb.h>
-+#include <linux/i2c.h>
-+#include <linux/media-bus-format.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/of_device.h>
-+#include <linux/of_graph.h>
-+#include <linux/pm.h>
-+
-+#include <drm/drm_crtc.h>
-+#include <drm/drm_device.h>
-+#include <drm/drm_mipi_dsi.h>
-+#include <drm/drm_panel.h>
-+
-+#define WS_DSI_DRIVER_NAME "ws-ts-dsi"
-+
-+struct ws_panel {
-+	struct drm_panel base;
-+	struct mipi_dsi_device *dsi;
-+	struct i2c_client *i2c;
-+	const struct drm_display_mode *mode;
-+	enum drm_panel_orientation orientation;
-+};
-+
-+/* 2.8inch 480x640
-+ * https://www.waveshare.com/product/raspberry-pi/displays/2.8inch-dsi-lcd.htm
-+ */
-+static const struct drm_display_mode ws_panel_2_8_mode = {
-+	.clock = 50000,
-+	.hdisplay = 480,
-+	.hsync_start = 480 + 150,
-+	.hsync_end = 480 + 150 + 50,
-+	.htotal = 480 + 150 + 50 + 150,
-+	.vdisplay = 640,
-+	.vsync_start = 640 + 150,
-+	.vsync_end = 640 + 150 + 50,
-+	.vtotal = 640 + 150 + 50 + 150,
-+};
-+
-+/* 3.4inch 800x800 Round
-+ * https://www.waveshare.com/product/displays/lcd-oled/3.4inch-dsi-lcd-c.htm
-+ */
-+static const struct drm_display_mode ws_panel_3_4_mode = {
-+	.clock = 50000,
-+	.hdisplay = 800,
-+	.hsync_start = 800 + 32,
-+	.hsync_end = 800 + 32 + 6,
-+	.htotal = 800 + 32 + 6 + 120,
-+	.vdisplay = 800,
-+	.vsync_start = 800 + 8,
-+	.vsync_end = 800 + 8 + 4,
-+	.vtotal = 800 + 8 + 4 + 16,
-+};
-+
-+/* 4.0inch 480x800
-+ * https://www.waveshare.com/product/raspberry-pi/displays/4inch-dsi-lcd.htm
-+ */
-+static const struct drm_display_mode ws_panel_4_0_mode = {
-+	.clock = 50000,
-+	.hdisplay = 480,
-+	.hsync_start = 480 + 150,
-+	.hsync_end = 480 + 150 + 100,
-+	.htotal = 480 + 150 + 100 + 150,
-+	.vdisplay = 800,
-+	.vsync_start = 800 + 20,
-+	.vsync_end = 800 + 20 + 100,
-+	.vtotal = 800 + 20 + 100 + 20,
-+};
-+
-+/* 7.0inch C 1024x600
-+ * https://www.waveshare.com/product/raspberry-pi/displays/lcd-oled/7inch-dsi-lcd-c-with-case-a.htm
-+ */
-+static const struct drm_display_mode ws_panel_7_0_c_mode = {
-+	.clock = 50000,
-+	.hdisplay = 1024,
-+	.hsync_start = 1024 + 100,
-+	.hsync_end = 1024 + 100 + 100,
-+	.htotal = 1024 + 100 + 100 + 100,
-+	.vdisplay = 600,
-+	.vsync_start = 600 + 10,
-+	.vsync_end = 600 + 10 + 10,
-+	.vtotal = 600 + 10 + 10 + 10,
-+};
-+
-+/* 7.9inch 400x1280
-+ * https://www.waveshare.com/product/raspberry-pi/displays/7.9inch-dsi-lcd.htm
-+ */
-+static const struct drm_display_mode ws_panel_7_9_mode = {
-+	.clock = 50000,
-+	.hdisplay = 400,
-+	.hsync_start = 400 + 40,
-+	.hsync_end = 400 + 40 + 30,
-+	.htotal = 400 + 40 + 30 + 40,
-+	.vdisplay = 1280,
-+	.vsync_start = 1280 + 20,
-+	.vsync_end = 1280 + 20 + 10,
-+	.vtotal = 1280 + 20 + 10 + 20,
-+};
-+
-+/* 8.0inch or 10.1inch 1280x800
-+ * https://www.waveshare.com/product/raspberry-pi/displays/8inch-dsi-lcd-c.htm
-+ * https://www.waveshare.com/product/raspberry-pi/displays/10.1inch-dsi-lcd-c.htm
-+ */
-+static const struct drm_display_mode ws_panel_10_1_mode = {
-+	.clock = 76800,
-+	.hdisplay = 1280,
-+	.hsync_start = 1280 + 40,
-+	.hsync_end = 1280 + 40 + 20,
-+	.htotal = 1280 + 40 + 20 + 40,
-+	.vdisplay = 800,
-+	.vsync_start = 800 + 40,
-+	.vsync_end = 800 + 40 + 48,
-+	.vtotal = 800 + 40 + 48 + 40,
-+};
-+
-+/* 11.9inch 320x1480
-+ * https://www.waveshare.com/product/raspberry-pi/displays/11.9inch-dsi-lcd.htm
-+ */
-+static const struct drm_display_mode ws_panel_11_9_mode = {
-+	.clock = 50000,
-+	.hdisplay = 320,
-+	.hsync_start = 320 + 60,
-+	.hsync_end = 320 + 60 + 60,
-+	.htotal = 320 + 60 + 60 + 120,
-+	.vdisplay = 1480,
-+	.vsync_start = 1480 + 60,
-+	.vsync_end = 1480 + 60 + 60,
-+	.vtotal = 1480 + 60 + 60 + 60,
-+};
-+
-+static struct ws_panel *panel_to_ts(struct drm_panel *panel)
-+{
-+	return container_of(panel, struct ws_panel, base);
-+}
-+
-+static void ws_panel_i2c_write(struct ws_panel *ts, u8 reg, u8 val)
-+{
-+	int ret;
-+
-+	ret = i2c_smbus_write_byte_data(ts->i2c, reg, val);
-+	if (ret)
-+		dev_err(&ts->i2c->dev, "I2C write failed: %d\n", ret);
-+}
-+
-+static int ws_panel_disable(struct drm_panel *panel)
-+{
-+	struct ws_panel *ts = panel_to_ts(panel);
-+
-+	ws_panel_i2c_write(ts, 0xad, 0x00);
-+
-+	return 0;
-+}
-+
-+static int ws_panel_unprepare(struct drm_panel *panel)
-+{
-+	return 0;
-+}
-+
-+static int ws_panel_prepare(struct drm_panel *panel)
-+{
-+	return 0;
-+}
-+
-+static int ws_panel_enable(struct drm_panel *panel)
-+{
-+	struct ws_panel *ts = panel_to_ts(panel);
-+
-+	ws_panel_i2c_write(ts, 0xad, 0x01);
-+
-+	return 0;
-+}
-+
-+static int ws_panel_get_modes(struct drm_panel *panel,
-+			      struct drm_connector *connector)
-+{
-+	static const u32 bus_format = MEDIA_BUS_FMT_RGB888_1X24;
-+	struct ws_panel *ts = panel_to_ts(panel);
-+	struct drm_display_mode *mode;
-+
-+	mode = drm_mode_duplicate(connector->dev, ts->mode);
-+	if (!mode) {
-+		dev_err(panel->dev, "failed to add mode %ux%u@%u\n",
-+			ts->mode->hdisplay,
-+			ts->mode->vdisplay,
-+			drm_mode_vrefresh(ts->mode));
-+	}
-+
-+	mode->type |= DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED;
-+
-+	drm_mode_set_name(mode);
-+
-+	drm_mode_probed_add(connector, mode);
-+
-+	connector->display_info.bpc = 8;
-+	connector->display_info.width_mm = 154;
-+	connector->display_info.height_mm = 86;
-+	drm_display_info_set_bus_formats(&connector->display_info,
-+					 &bus_format, 1);
-+
-+	/*
-+	 * TODO: Remove once all drm drivers call
-+	 * drm_connector_set_orientation_from_panel()
-+	 */
-+	drm_connector_set_panel_orientation(connector, ts->orientation);
-+
-+	return 1;
-+}
-+
-+static enum drm_panel_orientation ws_panel_get_orientation(struct drm_panel *panel)
-+{
-+	struct ws_panel *ts = panel_to_ts(panel);
-+
-+	return ts->orientation;
-+}
-+
-+static const struct drm_panel_funcs ws_panel_funcs = {
-+	.disable = ws_panel_disable,
-+	.unprepare = ws_panel_unprepare,
-+	.prepare = ws_panel_prepare,
-+	.enable = ws_panel_enable,
-+	.get_modes = ws_panel_get_modes,
-+	.get_orientation = ws_panel_get_orientation,
-+};
-+
-+static int ws_panel_bl_update_status(struct backlight_device *bl)
-+{
-+	struct ws_panel *ts = bl_get_data(bl);
-+
-+	ws_panel_i2c_write(ts, 0xab, 0xff - backlight_get_brightness(bl));
-+	ws_panel_i2c_write(ts, 0xaa, 0x01);
-+
-+	return 0;
-+}
-+
-+static const struct backlight_ops ws_panel_bl_ops = {
-+	.update_status = ws_panel_bl_update_status,
-+};
-+
-+static struct backlight_device *
-+ws_panel_create_backlight(struct ws_panel *ts)
-+{
-+	struct device *dev = ts->base.dev;
-+	const struct backlight_properties props = {
-+		.type = BACKLIGHT_RAW,
-+		.brightness = 255,
-+		.max_brightness = 255,
-+	};
-+
-+	return devm_backlight_device_register(dev, dev_name(dev), dev, ts,
-+					      &ws_panel_bl_ops, &props);
-+}
-+
-+static int ws_panel_probe(struct i2c_client *i2c,
-+			  const struct i2c_device_id *id)
-+{
-+	struct device *dev = &i2c->dev;
-+	struct ws_panel *ts;
-+	struct device_node *endpoint, *dsi_host_node;
-+	struct mipi_dsi_host *host;
-+	struct mipi_dsi_device_info info = {
-+		.type = WS_DSI_DRIVER_NAME,
-+		.channel = 0,
-+		.node = NULL,
-+	};
-+	int ret;
-+
-+	ts = devm_kzalloc(dev, sizeof(*ts), GFP_KERNEL);
-+	if (!ts)
-+		return -ENOMEM;
-+
-+	ts->mode = of_device_get_match_data(dev);
-+	if (!ts->mode)
-+		return -EINVAL;
-+
-+	i2c_set_clientdata(i2c, ts);
-+
-+	ts->i2c = i2c;
-+
-+	ws_panel_i2c_write(ts, 0xc0, 0x01);
-+	ws_panel_i2c_write(ts, 0xc2, 0x01);
-+	ws_panel_i2c_write(ts, 0xac, 0x01);
-+
-+	ret = of_drm_get_panel_orientation(dev->of_node, &ts->orientation);
-+	if (ret) {
-+		dev_err(dev, "%pOF: failed to get orientation %d\n", dev->of_node, ret);
-+		return ret;
-+	}
-+
-+	/* Look up the DSI host.  It needs to probe before we do. */
-+	endpoint = of_graph_get_next_endpoint(dev->of_node, NULL);
-+	if (!endpoint)
-+		return -ENODEV;
-+
-+	dsi_host_node = of_graph_get_remote_port_parent(endpoint);
-+	if (!dsi_host_node)
-+		goto error;
-+
-+	host = of_find_mipi_dsi_host_by_node(dsi_host_node);
-+	of_node_put(dsi_host_node);
-+	if (!host) {
-+		of_node_put(endpoint);
-+		return -EPROBE_DEFER;
-+	}
-+
-+	info.node = of_graph_get_remote_port(endpoint);
-+	if (!info.node)
-+		goto error;
-+
-+	of_node_put(endpoint);
-+
-+	ts->dsi = devm_mipi_dsi_device_register_full(dev, host, &info);
-+	if (IS_ERR(ts->dsi)) {
-+		dev_err(dev, "DSI device registration failed: %ld\n",
-+			PTR_ERR(ts->dsi));
-+		return PTR_ERR(ts->dsi);
-+	}
-+
-+	drm_panel_init(&ts->base, dev, &ws_panel_funcs,
-+		       DRM_MODE_CONNECTOR_DSI);
-+
-+	ts->base.backlight = ws_panel_create_backlight(ts);
-+	if (IS_ERR(ts->base.backlight)) {
-+		ret = PTR_ERR(ts->base.backlight);
-+		dev_err(dev, "Failed to create backlight: %d\n", ret);
-+		return ret;
-+	}
-+
-+	/* This appears last, as it's what will unblock the DSI host
-+	 * driver's component bind function.
-+	 */
-+	drm_panel_add(&ts->base);
-+
-+	ts->dsi->mode_flags = (MIPI_DSI_MODE_VIDEO |
-+			   MIPI_DSI_MODE_VIDEO_SYNC_PULSE |
-+			   MIPI_DSI_MODE_LPM);
-+	ts->dsi->format = MIPI_DSI_FMT_RGB888;
-+	ts->dsi->lanes = 2;
-+
-+	ret = devm_mipi_dsi_attach(dev, ts->dsi);
-+
-+	if (ret)
-+		dev_err(dev, "failed to attach dsi to host: %d\n", ret);
-+
-+	return 0;
-+
-+error:
-+	of_node_put(endpoint);
-+	return -ENODEV;
-+}
-+
-+static void ws_panel_remove(struct i2c_client *i2c)
-+{
-+	struct ws_panel *ts = i2c_get_clientdata(i2c);
-+
-+	drm_panel_remove(&ts->base);
-+}
-+
-+static const struct of_device_id ws_panel_of_ids[] = {
-+	{
-+		.compatible = "waveshare,2.8inch-panel",
-+		.data = &ws_panel_2_8_mode,
-+	}, {
-+		.compatible = "waveshare,3.4inch-panel",
-+		.data = &ws_panel_3_4_mode,
-+	}, {
-+		.compatible = "waveshare,4.0inch-panel",
-+		.data = &ws_panel_4_0_mode,
-+	}, {
-+		.compatible = "waveshare,7.0inch-c-panel",
-+		.data = &ws_panel_7_0_c_mode,
-+	}, {
-+		.compatible = "waveshare,7.9inch-panel",
-+		.data = &ws_panel_7_9_mode,
-+	}, {
-+		.compatible = "waveshare,8.0inch-panel",
-+		.data = &ws_panel_10_1_mode,
-+	}, {
-+		.compatible = "waveshare,10.1inch-panel",
-+		.data = &ws_panel_10_1_mode,
-+	}, {
-+		.compatible = "waveshare,11.9inch-panel",
-+		.data = &ws_panel_11_9_mode,
-+	}, {
-+		/* sentinel */
-+	}
-+};
-+MODULE_DEVICE_TABLE(of, ws_panel_of_ids);
-+
-+static struct i2c_driver ws_panel_driver = {
-+	.driver = {
-+		.name = "ws_touchscreen",
-+		.of_match_table = ws_panel_of_ids,
-+	},
-+	.probe = ws_panel_probe,
-+	.remove = ws_panel_remove,
-+};
-+module_i2c_driver(ws_panel_driver);
-+
-+MODULE_AUTHOR("Dave Stevenson <dave.stevenson@raspberrypi.com>");
-+MODULE_DESCRIPTION("Waveshare DSI panel driver");
-+MODULE_LICENSE("GPL");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0689-input-goodix-Add-option-to-poll-instead-of-relying-o.patch b/target/linux/bcm27xx/patches-6.1/950-0689-input-goodix-Add-option-to-poll-instead-of-relying-o.patch
deleted file mode 100644
index bc119c1d3a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0689-input-goodix-Add-option-to-poll-instead-of-relying-o.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 13a9614267e7d8d4075144a7bf4dbebfcc565367 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Mon, 30 Jan 2023 14:46:16 +0000
-Subject: [PATCH] input: goodix: Add option to poll instead of relying
- on IRQ line
-
-The interrupt line from the touch controller is not necessarily
-connected to the SoC, so add the option to poll for touch info.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/input/touchscreen/goodix.c | 70 +++++++++++++++++++++++++++---
- drivers/input/touchscreen/goodix.h |  2 +
- 2 files changed, 66 insertions(+), 6 deletions(-)
-
---- a/drivers/input/touchscreen/goodix.c
-+++ b/drivers/input/touchscreen/goodix.c
-@@ -48,6 +48,8 @@
- #define MAX_CONTACTS_LOC	5
- #define TRIGGER_LOC		6
- 
-+#define POLL_INTERVAL_MS		17	/* 17ms = 60fps */
-+
- /* Our special handling for GPIO accesses through ACPI is x86 specific */
- #if defined CONFIG_X86 && defined CONFIG_ACPI
- #define ACPI_GPIO_SUPPORT
-@@ -513,16 +515,67 @@ static irqreturn_t goodix_ts_irq_handler
- 	return IRQ_HANDLED;
- }
- 
-+static void goodix_ts_irq_poll_timer(struct timer_list *t)
-+{
-+	struct goodix_ts_data *ts = from_timer(ts, t, timer);
-+
-+	schedule_work(&ts->work_i2c_poll);
-+	mod_timer(&ts->timer, jiffies + msecs_to_jiffies(POLL_INTERVAL_MS));
-+}
-+
-+static void goodix_ts_work_i2c_poll(struct work_struct *work)
-+{
-+	struct goodix_ts_data *ts = container_of(work,
-+			struct goodix_ts_data, work_i2c_poll);
-+
-+	goodix_process_events(ts);
-+	goodix_i2c_write_u8(ts->client, GOODIX_READ_COOR_ADDR, 0);
-+}
-+
-+static void goodix_enable_irq(struct goodix_ts_data *ts)
-+{
-+	if (ts->client->irq) {
-+		enable_irq(ts->client->irq);
-+	} else {
-+		ts->timer.expires = jiffies + msecs_to_jiffies(POLL_INTERVAL_MS);
-+		add_timer(&ts->timer);
-+	}
-+}
-+
-+static void goodix_disable_irq(struct goodix_ts_data *ts)
-+{
-+	if (ts->client->irq) {
-+		disable_irq(ts->client->irq);
-+	} else {
-+		del_timer(&ts->timer);
-+		cancel_work_sync(&ts->work_i2c_poll);
-+	}
-+}
-+
- static void goodix_free_irq(struct goodix_ts_data *ts)
- {
--	devm_free_irq(&ts->client->dev, ts->client->irq, ts);
-+	if (ts->client->irq) {
-+		devm_free_irq(&ts->client->dev, ts->client->irq, ts);
-+	} else {
-+		del_timer(&ts->timer);
-+		cancel_work_sync(&ts->work_i2c_poll);
-+	}
- }
- 
- static int goodix_request_irq(struct goodix_ts_data *ts)
- {
--	return devm_request_threaded_irq(&ts->client->dev, ts->client->irq,
--					 NULL, goodix_ts_irq_handler,
--					 ts->irq_flags, ts->client->name, ts);
-+	if (ts->client->irq) {
-+		return devm_request_threaded_irq(&ts->client->dev, ts->client->irq,
-+						 NULL, goodix_ts_irq_handler,
-+						 ts->irq_flags, ts->client->name, ts);
-+	} else {
-+		INIT_WORK(&ts->work_i2c_poll,
-+			  goodix_ts_work_i2c_poll);
-+		timer_setup(&ts->timer, goodix_ts_irq_poll_timer, 0);
-+		if (ts->irq_pin_access_method == IRQ_PIN_ACCESS_NONE)
-+			goodix_enable_irq(ts);
-+		return 0;
-+	}
- }
- 
- static int goodix_check_cfg_8(struct goodix_ts_data *ts, const u8 *cfg, int len)
-@@ -1426,6 +1479,11 @@ static void goodix_ts_remove(struct i2c_
- {
- 	struct goodix_ts_data *ts = i2c_get_clientdata(client);
- 
-+	if (!client->irq) {
-+		del_timer(&ts->timer);
-+		cancel_work_sync(&ts->work_i2c_poll);
-+	}
-+
- 	if (ts->load_cfg_from_disk)
- 		wait_for_completion(&ts->firmware_loading_complete);
- }
-@@ -1441,7 +1499,7 @@ static int __maybe_unused goodix_suspend
- 
- 	/* We need gpio pins to suspend/resume */
- 	if (ts->irq_pin_access_method == IRQ_PIN_ACCESS_NONE) {
--		disable_irq(client->irq);
-+		goodix_disable_irq(ts);
- 		return 0;
- 	}
- 
-@@ -1485,7 +1543,7 @@ static int __maybe_unused goodix_resume(
- 	int error;
- 
- 	if (ts->irq_pin_access_method == IRQ_PIN_ACCESS_NONE) {
--		enable_irq(client->irq);
-+		goodix_enable_irq(ts);
- 		return 0;
- 	}
- 
---- a/drivers/input/touchscreen/goodix.h
-+++ b/drivers/input/touchscreen/goodix.h
-@@ -104,6 +104,8 @@ struct goodix_ts_data {
- 	u8 main_clk[GOODIX_MAIN_CLK_LEN];
- 	int bak_ref_len;
- 	u8 *bak_ref;
-+	struct timer_list timer;
-+	struct work_struct work_i2c_poll;
- };
- 
- int goodix_i2c_read(struct i2c_client *client, u16 reg, u8 *buf, int len);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0690-dtoverlays-Add-an-overlay-for-the-Waveshare-DSI-scre.patch b/target/linux/bcm27xx/patches-6.1/950-0690-dtoverlays-Add-an-overlay-for-the-Waveshare-DSI-scre.patch
deleted file mode 100644
index 855ea9bd4c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0690-dtoverlays-Add-an-overlay-for-the-Waveshare-DSI-scre.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From 6e1ccf7cfe1b758963743b88fa1b078b011c77b3 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 14 Apr 2023 13:57:52 +0100
-Subject: [PATCH] dtoverlays: Add an overlay for the Waveshare DSI
- screens
-
-They come in varying sizes, but all have the same MCU for
-power control and touch controller.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/Makefile           |   1 +
- arch/arm/boot/dts/overlays/README             |  28 ++++
- .../vc4-kms-dsi-waveshare-panel-overlay.dts   | 123 ++++++++++++++++++
- 3 files changed, 152 insertions(+)
- create mode 100644 arch/arm/boot/dts/overlays/vc4-kms-dsi-waveshare-panel-overlay.dts
-
---- a/arch/arm/boot/dts/overlays/Makefile
-+++ b/arch/arm/boot/dts/overlays/Makefile
-@@ -272,6 +272,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
- 	vc4-kms-dsi-7inch.dtbo \
- 	vc4-kms-dsi-lt070me05000.dtbo \
- 	vc4-kms-dsi-lt070me05000-v2.dtbo \
-+	vc4-kms-dsi-waveshare-panel.dtbo \
- 	vc4-kms-kippah-7inch.dtbo \
- 	vc4-kms-v3d.dtbo \
- 	vc4-kms-v3d-pi4.dtbo \
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -4493,6 +4493,34 @@ Load:   dtoverlay=vc4-kms-dsi-lt070me050
- Params: <None>
- 
- 
-+Name:   vc4-kms-dsi-waveshare-panel
-+Info:   Enable a Waveshare DSI touchscreen
-+        Includes the Goodix driver for the touchscreen element.
-+        The default is for the display to be using the I2C0 option for control.
-+        Use the i2c1 override if using the I2C1 wiring with jumper wires from
-+        GPIOs 2&3 (pins 3&5).
-+        invx/invy/swapxy should be used with caution as the panel specifier will
-+        set the default inversions for that panel. Always use them after the
-+        panel specifier, and be aware that you may need to set them as =0, not
-+        just adding it.
-+        Requires vc4-kms-v3d to be loaded.
-+Load:   dtoverlay=vc4-kms-dsi-waveshare-panel,<param>=<val>
-+Params: 2_8_inch                2.8" 480x640
-+        3_4_inch                3.4" 800x800 round
-+        4_0_inch                4.0" 480x800
-+        7_0_inchC               7.0" C 1024x600
-+        7_9_inch                7.9" 400x1280
-+        8_0_inch                8.0" 1280x800
-+        10_1_inch               10.1" 1280x800
-+        11_9_inch               11.9" 320x1480
-+        i2c1                    Use i2c-1 with jumper wires from GPIOs 2&3
-+        disable_touch           Disable the touch controller
-+        rotation                Set the panel orientation property
-+        invx                    Touchscreen inverted x axis
-+        invy                    Touchscreen inverted y axis
-+        swapxy                  Touchscreen swapped x y axis
-+
-+
- Name:   vc4-kms-kippah-7inch
- Info:   This overlay is now deprecated - see vc4-kms-dpi-panel,kippah-7inch
- Load:   <Deprecated>
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/vc4-kms-dsi-waveshare-panel-overlay.dts
-@@ -0,0 +1,123 @@
-+/*
-+ * Device Tree overlay for Waveshare DSI Touchscreens
-+ *
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&dsi1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+			port {
-+				dsi_out: endpoint {
-+					remote-endpoint = <&panel_in>;
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target-path = "/";
-+		__overlay__ {
-+		};
-+	};
-+
-+	frag2: fragment@2 {
-+		target = <&i2c_csi_dsi>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			panel: panel_disp1@45 {
-+				reg = <0x45>;
-+				compatible = "waveshare,10.1inch-panel";
-+
-+				port {
-+					panel_in: endpoint {
-+						remote-endpoint = <&dsi_out>;
-+					};
-+				};
-+			};
-+
-+			touch: goodix@14 {
-+				reg = <0x14>;
-+				compatible = "goodix,gt911";
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&i2c0if>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&i2c0mux>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@5 {
-+		target = <&i2c_arm>;
-+		__dormant__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		2_8_inch = <&panel>, "compatible=waveshare,2.8inch-panel",
-+				   <&touch>, "touchscreen-size-x:0=640",
-+				   <&touch>, "touchscreen-size-y:0=480",
-+				   <&touch>, "touchscreen-inverted-y?",
-+				   <&touch>, "touchscreen-swapped-x-y?";
-+		3_4_inch = <&panel>, "compatible=waveshare,3.4inch-panel",
-+				   <&touch>, "touchscreen-size-x:0=800",
-+				   <&touch>, "touchscreen-size-y:0=800";
-+		4_0_inch = <&panel>, "compatible=waveshare,4.0inch-panel",
-+				   <&touch>, "touchscreen-size-x:0=800",
-+				   <&touch>, "touchscreen-size-y:0=480",
-+				   <&touch>, "touchscreen-inverted-x?",
-+				   <&touch>, "touchscreen-swapped-x-y?";
-+		7_0_inchC = <&panel>, "compatible=waveshare,7.0inch-c-panel",
-+				   <&touch>, "touchscreen-size-x:0=800",
-+				   <&touch>, "touchscreen-size-y:0=480";
-+		7_9_inch = <&panel>, "compatible=waveshare,7.9inch-panel",
-+				   <&touch>, "touchscreen-size-x:0=400",
-+				   <&touch>, "touchscreen-size-y:0=1280",
-+				   <&touch>, "touchscreen-inverted-x?",
-+				   <&touch>, "touchscreen-inverted-y?";
-+		8_0_inch = <&panel>, "compatible=waveshare,8.0inch-panel",
-+				   <&touch>, "touchscreen-size-x:0=800",
-+				   <&touch>, "touchscreen-size-y:0=1280",
-+				   <&touch>, "touchscreen-inverted-x?",
-+				   <&touch>, "touchscreen-swapped-x-y?";
-+		10_1_inch = <&panel>, "compatible=waveshare,10.1inch-panel",
-+				   <&touch>, "touchscreen-size-x:0=800",
-+				   <&touch>, "touchscreen-size-y:0=1280",
-+				   <&touch>, "touchscreen-inverted-x?",
-+				   <&touch>, "touchscreen-swapped-x-y?";
-+		11_9_inch = <&panel>, "compatible=waveshare,11.9inch-panel",
-+				   <&touch>, "touchscreen-size-x:0=320",
-+				   <&touch>, "touchscreen-size-y:0=1480",
-+				   <&touch>, "touchscreen-inverted-x?",
-+				   <&touch>, "touchscreen-swapped-x-y?";
-+		i2c1 = <&frag2>, "target:0=",<&i2c1>,
-+		       <0>, "-3-4+5";
-+		disable_touch = <&touch>, "status=disabled";
-+		rotation = <&panel>, "rotation:0";
-+		invx = <&touch>,"touchscreen-inverted-x?";
-+		invy = <&touch>,"touchscreen-inverted-y?";
-+		swapxy = <&touch>,"touchscreen-swapped-x-y?";
-+	};
-+};
diff --git a/target/linux/bcm27xx/patches-6.1/950-0691-arm-boot-dts-overlays-mipi-dbi-spi-fix-default-brigh.patch b/target/linux/bcm27xx/patches-6.1/950-0691-arm-boot-dts-overlays-mipi-dbi-spi-fix-default-brigh.patch
deleted file mode 100644
index 337a502f97..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0691-arm-boot-dts-overlays-mipi-dbi-spi-fix-default-brigh.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From d566473897f50c1531111f117d4a84fdf5729729 Mon Sep 17 00:00:00 2001
-From: David Lechner <david@lechnology.com>
-Date: Mon, 24 Apr 2023 10:15:59 -0500
-Subject: [PATCH] arm/boot/dts/overlays/mipi-dbi-spi: fix default
- brightness (#5442)
-
-There is an off-by-one error in the default brightness for the PWM backlight
-in the MIPI DBI SPI overlay that produces the following message in the
-kernel logs:
-
-    pwm-backlight backlight_pwm: invalid default brightness level: 16, using 15
-
-The value is 0-based, so the max brightness is 15, not 16.
-
-Signed-off-by: David Lechner <david@lechnology.com>
----
- arch/arm/boot/dts/overlays/mipi-dbi-spi-overlay.dts | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/arm/boot/dts/overlays/mipi-dbi-spi-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/mipi-dbi-spi-overlay.dts
-@@ -80,7 +80,7 @@
- 			backlight_pwm: backlight_pwm {
- 				compatible = "pwm-backlight";
- 				brightness-levels = <0 6 8 12 16 24 32 40 48 64 96 128 160 192 224 255>;
--				default-brightness-level = <16>;
-+				default-brightness-level = <15>;
- 				pwms = <&pwm 0 200000>;
- 			};
- 		};
diff --git a/target/linux/bcm27xx/patches-6.1/950-0692-dtoverlays-Add-overrides-for-alternate-i2c-buses-to-.patch b/target/linux/bcm27xx/patches-6.1/950-0692-dtoverlays-Add-overrides-for-alternate-i2c-buses-to-.patch
deleted file mode 100644
index 095e115fc7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0692-dtoverlays-Add-overrides-for-alternate-i2c-buses-to-.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 911dedf3f51adf8cfd6554af1c89c922c4453889 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Mon, 24 Apr 2023 16:27:57 +0100
-Subject: [PATCH] dtoverlays: Add overrides for alternate i2c buses to
- i2c-mux
-
-The i2c-mux overlay was fixed to i2c-1. Add overrides to allow
-it to be assigned to alternate buses.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/README             | 16 ++++++++
- .../arm/boot/dts/overlays/i2c-mux-overlay.dts | 40 +++++++++++++++++--
- 2 files changed, 53 insertions(+), 3 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -1833,6 +1833,22 @@ Params: pca9542                 Select t
- 
-         addr                    Change I2C address of the device (default 0x70)
- 
-+        i2c0                    Choose the I2C0 bus on GPIOs 0&1
-+
-+        i2c_csi_dsi             Choose the I2C0 bus on GPIOs 44&45
-+
-+        i2c3                    Choose the I2C3 bus (configure with the i2c3
-+                                overlay - BCM2711 only)
-+
-+        i2c4                    Choose the I2C3 bus (configure with the i2c3
-+                                overlay - BCM2711 only)
-+
-+        i2c5                    Choose the I2C5 bus (configure with the i2c4
-+                                overlay - BCM2711 only)
-+
-+        i2c6                    Choose the I2C6 bus (configure with the i2c6
-+                                overlay - BCM2711 only)
-+
- 
- [ The i2c-mux-pca9548a overlay has been deleted. See i2c-mux. ]
- 
---- a/arch/arm/boot/dts/overlays/i2c-mux-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/i2c-mux-overlay.dts
-@@ -7,7 +7,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2c_arm>;
-+		target = <&i2cbus>;
- 		__dormant__ {
- 			#address-cells = <1>;
- 			#size-cells = <0>;
-@@ -34,7 +34,7 @@
- 	};
- 
- 	fragment@1 {
--		target = <&i2c_arm>;
-+		target = <&i2cbus>;
- 		__dormant__ {
- 			#address-cells = <1>;
- 			#size-cells = <0>;
-@@ -71,7 +71,7 @@
- 	};
- 
- 	fragment@2 {
--		target = <&i2c_arm>;
-+		target = <&i2cbus>;
- 		__dormant__ {
- 			#address-cells = <1>;
- 			#size-cells = <0>;
-@@ -127,6 +127,27 @@
- 		};
- 	};
- 
-+	frag100: fragment@100 {
-+		target = <&i2c_arm>;
-+		i2cbus: __overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@101 {
-+		target = <&i2c0if>;
-+		__dormant__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@102 {
-+		target = <&i2c0mux>;
-+		__dormant__ {
-+			status = "okay";
-+		};
-+	};
-+
- 	__overrides__ {
- 		pca9542 = <0>, "+0";
- 		pca9545 = <0>, "+1";
-@@ -135,5 +156,18 @@
- 		addr =  <&pca9542>,"reg:0",
- 			<&pca9545>,"reg:0",
- 			<&pca9548>,"reg:0";
-+
-+		i2c0 = <&frag100>, "target:0=",<&i2c0>,
-+			      <0>,"+101+102";
-+		i2c_csi_dsi = <&frag100>, "target:0=",<&i2c_csi_dsi>,
-+			      <0>,"+101+102";
-+		i2c3 = <&frag100>, "target?=0",
-+		       <&frag100>, "target-path=i2c3";
-+		i2c4 = <&frag100>, "target?=0",
-+		       <&frag100>, "target-path=i2c4";
-+		i2c5 = <&frag100>, "target?=0",
-+		       <&frag100>, "target-path=i2c5";
-+		i2c6 = <&frag100>, "target?=0",
-+		       <&frag100>, "target-path=i2c6";
- 	};
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0693-dtoverlays-Add-overrides-for-alternate-i2c-buses-to-.patch b/target/linux/bcm27xx/patches-6.1/950-0693-dtoverlays-Add-overrides-for-alternate-i2c-buses-to-.patch
deleted file mode 100644
index 5e6b0d3161..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0693-dtoverlays-Add-overrides-for-alternate-i2c-buses-to-.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From aa985e8be1c2fe4600b68831808c0b70241a37a6 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Mon, 24 Apr 2023 16:30:07 +0100
-Subject: [PATCH] dtoverlays: Add overrides for alternate i2c buses to
- i2c-pwm-pva9685a
-
-The i2c-pwm-pca9685a overlay was fixed to i2c-1. Add overrides to allow
-it to be assigned to alternate buses.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/README             | 10 +++++
- .../dts/overlays/i2c-pwm-pca9685a-overlay.dts | 37 ++++++++++++++++++-
- 2 files changed, 46 insertions(+), 1 deletion(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -1857,6 +1857,16 @@ Name:   i2c-pwm-pca9685a
- Info:   Adds support for an NXP PCA9685A I2C PWM controller on i2c_arm
- Load:   dtoverlay=i2c-pwm-pca9685a,<param>=<val>
- Params: addr                    I2C address of PCA9685A (default 0x40)
-+        i2c0                    Choose the I2C0 bus on GPIOs 0&1
-+        i2c_csi_dsi             Choose the I2C0 bus on GPIOs 44&45
-+        i2c3                    Choose the I2C3 bus (configure with the i2c3
-+                                overlay - BCM2711 only)
-+        i2c4                    Choose the I2C3 bus (configure with the i2c3
-+                                overlay - BCM2711 only)
-+        i2c5                    Choose the I2C5 bus (configure with the i2c4
-+                                overlay - BCM2711 only)
-+        i2c6                    Choose the I2C6 bus (configure with the i2c6
-+                                overlay - BCM2711 only)
- 
- 
- Name:   i2c-rtc
---- a/arch/arm/boot/dts/overlays/i2c-pwm-pca9685a-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/i2c-pwm-pca9685a-overlay.dts
-@@ -6,7 +6,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2c_arm>;
-+		target = <&i2cbus>;
- 		__overlay__ {
- 			#address-cells = <1>;
- 			#size-cells = <0>;
-@@ -20,7 +20,42 @@
- 			};
- 		};
- 	};
-+
-+
-+	frag100: fragment@100 {
-+		target = <&i2c_arm>;
-+		i2cbus: __overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@101 {
-+		target = <&i2c0if>;
-+		__dormant__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@102 {
-+		target = <&i2c0mux>;
-+		__dormant__ {
-+			status = "okay";
-+		};
-+	};
-+
- 	__overrides__ {
- 		addr = <&pca>,"reg:0";
-+		i2c0 = <&frag100>, "target:0=",<&i2c0>,
-+			      <0>,"+101+102";
-+		i2c_csi_dsi = <&frag100>, "target:0=",<&i2c_csi_dsi>,
-+			      <0>,"+101+102";
-+		i2c3 = <&frag100>, "target?=0",
-+		       <&frag100>, "target-path=i2c3";
-+		i2c4 = <&frag100>, "target?=0",
-+		       <&frag100>, "target-path=i2c4";
-+		i2c5 = <&frag100>, "target?=0",
-+		       <&frag100>, "target-path=i2c5";
-+		i2c6 = <&frag100>, "target?=0",
-+		       <&frag100>, "target-path=i2c6";
- 	};
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0694-fixup-Export-optimised-__memcpy.patch b/target/linux/bcm27xx/patches-6.1/950-0694-fixup-Export-optimised-__memcpy.patch
deleted file mode 100644
index d4b7395a66..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0694-fixup-Export-optimised-__memcpy.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From b8b90753b5c70bfe57c460305e30992e027d0d7a Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 11 Apr 2023 08:55:49 +0100
-Subject: [PATCH] fixup! Export optimised __memcpy
-
-Sinc [1] uaccess_with_memcpy.c uses __memcpy instead of memcpy. Make
-the optimised memcpy available as __memcpy as well to avoid linkage
-failures.
-
-[1] ceac10c83b33 ("ARM: 9290/1: uaccess: Fix KASAN false-positives")
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/lib/memcpy_rpi.S | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/arch/arm/lib/memcpy_rpi.S
-+++ b/arch/arm/lib/memcpy_rpi.S
-@@ -58,6 +58,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
- 
- ENTRY(mmiocpy)
- ENTRY(memcpy)
-+ENTRY(__memcpy)
-         memcpy  0
-+ENDPROC(__memcpy)
- ENDPROC(memcpy)
- ENDPROC(mmiocpy)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0695-hwmon-emc2305-Change-OF-properties-pwm-min-pwm-max-t.patch b/target/linux/bcm27xx/patches-6.1/950-0695-hwmon-emc2305-Change-OF-properties-pwm-min-pwm-max-t.patch
deleted file mode 100644
index 6be34bf9b7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0695-hwmon-emc2305-Change-OF-properties-pwm-min-pwm-max-t.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From ab304fd0099444dc7535c81abbbc0077cd878d7e Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 21 Apr 2023 15:48:39 +0100
-Subject: [PATCH] hwmon: emc2305: Change OF properties pwm-min &
- pwm-max to u8
-
-There is no DT binding for emc2305 as mainline are still
-discussing how to do a generic fan binding.
-The 5.15 driver was reading the "emc2305," properties
-"cooling-levels", "pwm-max", "pwm-min", and "pwm-channel" as u8.
-The overlay was writing them as u16 (;) so it was working.
-
-The 6.1 driver was reading as u32, which failed as there is
-insufficient data.
-
-As this is all downstream only, revert to u8 to match 5.15.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/hwmon/emc2305.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
---- a/drivers/hwmon/emc2305.c
-+++ b/drivers/hwmon/emc2305.c
-@@ -301,36 +301,36 @@ static int emc2305_get_tz_of(struct devi
- 	struct device_node *np = dev->of_node;
- 	struct emc2305_data *data = dev_get_drvdata(dev);
- 	int ret = 0;
--	u32 val;
-+	u8 val;
- 	int i;
- 
- 	/* OF parameters are optional - overwrite default setting
- 	 * if some of them are provided.
- 	 */
- 
--	ret = of_property_read_u32(np, "emc2305,cooling-levels", &val);
-+	ret = of_property_read_u8(np, "emc2305,cooling-levels", &val);
- 	if (!ret)
--		data->max_state = (u8)val;
-+		data->max_state = val;
- 	else if (ret != -EINVAL)
- 		return ret;
- 
--	ret = of_property_read_u32(np, "emc2305,pwm-max", &val);
-+	ret = of_property_read_u8(np, "emc2305,pwm-max", &val);
- 	if (!ret)
--		data->pwm_max = (u8)val;
-+		data->pwm_max = val;
- 	else if (ret != -EINVAL)
- 		return ret;
- 
--	ret = of_property_read_u32(np, "emc2305,pwm-min", &val);
-+	ret = of_property_read_u8(np, "emc2305,pwm-min", &val);
- 	if (!ret)
- 		for (i = 0; i < EMC2305_PWM_MAX; i++)
--			data->pwm_min[i] = (u8)val;
-+			data->pwm_min[i] = val;
- 	else if (ret != -EINVAL)
- 		return ret;
- 
- 	/* Not defined or 0 means one thermal zone over all cooling devices.
- 	 * Otherwise - separated thermal zones for each PWM channel.
- 	 */
--	ret = of_property_read_u32(np, "emc2305,pwm-channel", &val);
-+	ret = of_property_read_u8(np, "emc2305,pwm-channel", &val);
- 	if (!ret)
- 		data->pwm_separate = (val != 0);
- 	else if (ret != -EINVAL)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0696-dtoverlays-Change-i2c-fan-pwm-max-min-overrides-to-u.patch b/target/linux/bcm27xx/patches-6.1/950-0696-dtoverlays-Change-i2c-fan-pwm-max-min-overrides-to-u.patch
deleted file mode 100644
index d042310d60..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0696-dtoverlays-Change-i2c-fan-pwm-max-min-overrides-to-u.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From dbddf5d0389a11cc403289fbb55eb5740ff3ea46 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 21 Apr 2023 15:51:56 +0100
-Subject: [PATCH] dtoverlays: Change i2c-fan pwm-max/min overrides to
- u8
-
-The driver is only reading a u8, so change the overlay to match.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/i2c-fan-overlay.dts | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/i2c-fan-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/i2c-fan-overlay.dts
-@@ -94,8 +94,8 @@
- 		i2c6 = <&frag100>, "target?=0",
- 		       <&frag100>, "target-path=i2c6";
- 		addr =		<&emc2301>,"reg:0";
--		minpwm =	<&emc2301>,"emc2305,pwm-min;0";
--		maxpwm =	<&emc2301>,"emc2305,pwm-max;0";
-+		minpwm =	<&emc2301>,"emc2305,pwm-min.0";
-+		maxpwm =	<&emc2301>,"emc2305,pwm-max.0";
- 		midtemp =	<&fanmid0>,"temperature:0";
- 		midtemp_hyst =	<&fanmid0>,"hysteresis:0";
- 		maxtemp =	<&fanmax0>,"temperature:0";
diff --git a/target/linux/bcm27xx/patches-6.1/950-0697-drm-vc4-Limit-max_bpc-to-8-on-Pi0-3.patch b/target/linux/bcm27xx/patches-6.1/950-0697-drm-vc4-Limit-max_bpc-to-8-on-Pi0-3.patch
deleted file mode 100644
index db13ad93d5..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0697-drm-vc4-Limit-max_bpc-to-8-on-Pi0-3.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d1e78bb6380ca89d0b00ab60d65d9f34f346b6fe Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Mon, 24 Apr 2023 18:32:45 +0100
-Subject: [PATCH] drm/vc4: Limit max_bpc to 8 on Pi0-3
-
-Pi 0-3 have no deep colour support and only 24bpp output,
-so max_bpc should remain as 8.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_hdmi.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hdmi.c
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -783,7 +783,6 @@ static int vc4_hdmi_connector_init(struc
- 
- 	drm_connector_attach_colorspace_property(connector);
- 	drm_connector_attach_tv_margin_properties(connector);
--	drm_connector_attach_max_bpc_property(connector, 8, 12);
- 
- 	connector->polled = (DRM_CONNECTOR_POLL_CONNECT |
- 			     DRM_CONNECTOR_POLL_DISCONNECT);
-@@ -792,8 +791,12 @@ static int vc4_hdmi_connector_init(struc
- 	connector->doublescan_allowed = 0;
- 	connector->stereo_allowed = 1;
- 
--	if (vc4_hdmi->variant->supports_hdr)
-+	if (vc4_hdmi->variant->supports_hdr) {
-+		drm_connector_attach_max_bpc_property(connector, 8, 12);
- 		drm_connector_attach_hdr_output_metadata_property(connector);
-+	} else {
-+		drm_connector_attach_max_bpc_property(connector, 8, 8);
-+	}
- 
- 	vc4_hdmi_attach_broadcast_rgb_property(dev, vc4_hdmi);
- 	vc4_hdmi_attach_output_format_property(dev, vc4_hdmi);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0698-serial-8250-Add-NOMSI-bug-for-bcm2835aux.patch b/target/linux/bcm27xx/patches-6.1/950-0698-serial-8250-Add-NOMSI-bug-for-bcm2835aux.patch
deleted file mode 100644
index 728e433fb8..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0698-serial-8250-Add-NOMSI-bug-for-bcm2835aux.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 501e87c5f421654e1bb6fd4a25de46420549cae8 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 24 Apr 2023 11:48:31 +0100
-Subject: [PATCH] serial: 8250: Add NOMSI bug for bcm2835aux
-
-The BCM2835 mini-UART has no modem status interrupt, causing all
-transmission to stop, never to use, if a speed change ever happens
-while the CTS signal is high.
-
-Add a simple polling mechanism in order to allow recovery in that
-situation.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/tty/serial/8250/8250.h            |  1 +
- drivers/tty/serial/8250/8250_bcm2835aux.c |  1 +
- drivers/tty/serial/8250/8250_core.c       | 15 +++++++++++++++
- drivers/tty/serial/8250/8250_port.c       |  9 +++++++++
- 4 files changed, 26 insertions(+)
-
---- a/drivers/tty/serial/8250/8250.h
-+++ b/drivers/tty/serial/8250/8250.h
-@@ -92,6 +92,7 @@ struct serial8250_config {
- #define UART_BUG_NOMSR	BIT(2)	/* UART has buggy MSR status bits (Au1x00) */
- #define UART_BUG_THRE	BIT(3)	/* UART has buggy THRE reassertion */
- #define UART_BUG_TXRACE	BIT(5)	/* UART Tx fails to set remote DR */
-+#define UART_BUG_NOMSI	BIT(6)	/* UART has no modem status interrupt */
- 
- 
- #ifdef CONFIG_SERIAL_8250_SHARE_IRQ
---- a/drivers/tty/serial/8250/8250_bcm2835aux.c
-+++ b/drivers/tty/serial/8250/8250_bcm2835aux.c
-@@ -109,6 +109,7 @@ static int bcm2835aux_serial_probe(struc
- 			UPF_SKIP_TEST | UPF_IOREMAP;
- 	up.port.rs485_config = serial8250_em485_config;
- 	up.port.rs485_supported = serial8250_em485_supported;
-+	up.bugs |= UART_BUG_NOMSI;
- 	up.rs485_start_tx = bcm2835aux_rs485_start_tx;
- 	up.rs485_stop_tx = bcm2835aux_rs485_stop_tx;
- 
---- a/drivers/tty/serial/8250/8250_core.c
-+++ b/drivers/tty/serial/8250/8250_core.c
-@@ -252,6 +252,18 @@ static void serial8250_timeout(struct ti
- 	mod_timer(&up->timer, jiffies + uart_poll_timeout(&up->port));
- }
- 
-+static void serial8250_cts_poll_timeout(struct timer_list *t)
-+{
-+	struct uart_8250_port *up = from_timer(up, t, timer);
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&up->port.lock, flags);
-+	serial8250_modem_status(up);
-+	spin_unlock_irqrestore(&up->port.lock, flags);
-+	if (up->port.hw_stopped)
-+		mod_timer(&up->timer, jiffies + 1);
-+}
-+
- static void serial8250_backup_timeout(struct timer_list *t)
- {
- 	struct uart_8250_port *up = from_timer(up, t, timer);
-@@ -314,6 +326,9 @@ static void univ8250_setup_timer(struct
- 			  uart_poll_timeout(port) + HZ / 5);
- 	}
- 
-+	if (up->bugs & UART_BUG_NOMSI)
-+		up->timer.function = serial8250_cts_poll_timeout;
-+
- 	/*
- 	 * If the "interrupt" for this port doesn't correspond with any
- 	 * hardware interrupt, we use a timer-based system.  The original
---- a/drivers/tty/serial/8250/8250_port.c
-+++ b/drivers/tty/serial/8250/8250_port.c
-@@ -1553,6 +1553,9 @@ static void serial8250_stop_tx(struct ua
- 		serial_icr_write(up, UART_ACR, up->acr);
- 	}
- 	serial8250_rpm_put(up);
-+
-+	if (port->hw_stopped && (up->bugs & UART_BUG_NOMSI))
-+		mod_timer(&up->timer, jiffies + 1);
- }
- 
- static inline void __start_tx(struct uart_port *port)
-@@ -1663,6 +1666,9 @@ static void serial8250_start_tx(struct u
- 	struct uart_8250_port *up = up_to_u8250p(port);
- 	struct uart_8250_em485 *em485 = up->em485;
- 
-+	if (up->bugs & UART_BUG_NOMSI)
-+		del_timer(&up->timer);
-+
- 	if (!port->x_char && uart_circ_empty(&port->state->xmit))
- 		return;
- 
-@@ -1883,6 +1889,9 @@ unsigned int serial8250_modem_status(str
- 			uart_handle_cts_change(port, status & UART_MSR_CTS);
- 
- 		wake_up_interruptible(&port->state->port.delta_msr_wait);
-+	} else if (up->bugs & UART_BUG_NOMSI &&	port->hw_stopped &&
-+		   status & UART_MSR_CTS) {
-+		uart_handle_cts_change(port, status & UART_MSR_CTS);
- 	}
- 
- 	return status;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0700-Bluetooth-hci_bcm-Add-more-invalid-BDADDRs.patch b/target/linux/bcm27xx/patches-6.1/950-0700-Bluetooth-hci_bcm-Add-more-invalid-BDADDRs.patch
deleted file mode 100644
index 97e53ad37f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0700-Bluetooth-hci_bcm-Add-more-invalid-BDADDRs.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 0b5ed6065e35da3e27a6ade1682ce0ba0fbc4ec0 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 6 Apr 2023 10:38:40 +0100
-Subject: [PATCH] Bluetooth: hci_bcm: Add more invalid BDADDRs
-
-The kernel needs to recognise the default BDADDRs used by the Bluetooth
-modems, so add a few more that we care about.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/bluetooth/btbcm.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/drivers/bluetooth/btbcm.c
-+++ b/drivers/bluetooth/btbcm.c
-@@ -24,11 +24,15 @@
- #define BDADDR_BCM20702A1 (&(bdaddr_t) {{0x00, 0x00, 0xa0, 0x02, 0x70, 0x20}})
- #define BDADDR_BCM2076B1 (&(bdaddr_t) {{0x79, 0x56, 0x00, 0xa0, 0x76, 0x20}})
- #define BDADDR_BCM43430A0 (&(bdaddr_t) {{0xac, 0x1f, 0x12, 0xa0, 0x43, 0x43}})
-+#define BDADDR_BCM43430A1 (&(bdaddr_t) {{0xac, 0x1f, 0x12, 0xa1, 0x43, 0x43}})
-+#define BDADDR_BCM43430B0 (&(bdaddr_t) {{0xac, 0x1f, 0x37, 0xb0, 0x43, 0x43}})
- #define BDADDR_BCM4324B3 (&(bdaddr_t) {{0x00, 0x00, 0x00, 0xb3, 0x24, 0x43}})
- #define BDADDR_BCM4330B1 (&(bdaddr_t) {{0x00, 0x00, 0x00, 0xb1, 0x30, 0x43}})
- #define BDADDR_BCM4334B0 (&(bdaddr_t) {{0x00, 0x00, 0x00, 0xb0, 0x34, 0x43}})
-+#define BDADDR_BCM4345C0 (&(bdaddr_t) {{0xac, 0x1f, 0x00, 0xc0, 0x45, 0x43}})
- #define BDADDR_BCM4345C5 (&(bdaddr_t) {{0xac, 0x1f, 0x00, 0xc5, 0x45, 0x43}})
- #define BDADDR_BCM43341B (&(bdaddr_t) {{0xac, 0x1f, 0x00, 0x1b, 0x34, 0x43}})
-+#define BDADDR_BCM43438 (&(bdaddr_t) {{0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa}})
- 
- #define BCM_FW_NAME_LEN			64
- #define BCM_FW_NAME_COUNT_MAX		4
-@@ -122,8 +126,12 @@ int btbcm_check_bdaddr(struct hci_dev *h
- 	    !bacmp(&bda->bdaddr, BDADDR_BCM4324B3) ||
- 	    !bacmp(&bda->bdaddr, BDADDR_BCM4330B1) ||
- 	    !bacmp(&bda->bdaddr, BDADDR_BCM4334B0) ||
-+	    !bacmp(&bda->bdaddr, BDADDR_BCM4345C0) ||
- 	    !bacmp(&bda->bdaddr, BDADDR_BCM4345C5) ||
- 	    !bacmp(&bda->bdaddr, BDADDR_BCM43430A0) ||
-+	    !bacmp(&bda->bdaddr, BDADDR_BCM43430A1) ||
-+	    !bacmp(&bda->bdaddr, BDADDR_BCM43430B0) ||
-+	    !bacmp(&bda->bdaddr, BDADDR_BCM43438) ||
- 	    !bacmp(&bda->bdaddr, BDADDR_BCM43341B)) {
- 		/* Try falling back to BDADDR EFI variable */
- 		if (btbcm_set_bdaddr_from_efi(hdev) != 0) {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0701-ARM-dts-bcm27xx-Enable-kernel-Bluetooth.patch b/target/linux/bcm27xx/patches-6.1/950-0701-ARM-dts-bcm27xx-Enable-kernel-Bluetooth.patch
deleted file mode 100644
index 0772b38c41..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0701-ARM-dts-bcm27xx-Enable-kernel-Bluetooth.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-From 2b704b4ac2202a3fae96c20125c78c4bd4b29064 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 14 Feb 2023 11:20:58 +0000
-Subject: [PATCH] ARM: dts: bcm27xx: Enable kernel Bluetooth
-
-Change the base Device Tree files so that by default the kernel is
-responsible for initialisation of the onboard Bluetooth modems.
-Use dtparam=krnbt=off to revert to the old behaviour.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2708-rpi-bt.dtsi         | 18 ++++++++++++++---
- arch/arm/boot/dts/bcm271x-rpi-bt.dtsi         | 18 ++++++++++++++---
- arch/arm/boot/dts/overlays/README             | 11 ++++++++--
- .../boot/dts/overlays/disable-bt-overlay.dts  |  7 +------
- .../boot/dts/overlays/miniuart-bt-overlay.dts | 20 ++++++-------------
- 5 files changed, 46 insertions(+), 28 deletions(-)
-
---- a/arch/arm/boot/dts/bcm2708-rpi-bt.dtsi
-+++ b/arch/arm/boot/dts/bcm2708-rpi-bt.dtsi
-@@ -5,22 +5,34 @@
- 		compatible = "brcm,bcm43438-bt";
- 		max-speed = <3000000>;
- 		shutdown-gpios = <&gpio 45 GPIO_ACTIVE_HIGH>;
--		status = "disabled";
-+		local-bd-address = [ 00 00 00 00 00 00 ];
-+		fallback-bd-address; // Don't override a valid address
-+		status = "okay";
- 	};
- };
- 
- &uart1 {
- 	minibt: bluetooth {
- 		compatible = "brcm,bcm43438-bt";
--		max-speed = <460800>;
-+		max-speed = <230400>;
- 		shutdown-gpios = <&gpio 45 GPIO_ACTIVE_HIGH>;
-+		local-bd-address = [ 00 00 00 00 00 00 ];
-+		fallback-bd-address; // Don't override a valid address
- 		status = "disabled";
- 	};
- };
- 
- / {
-+	aliases {
-+		bluetooth = &bt;
-+	};
-+
- 	__overrides__ {
-+		bdaddr = <&bt>,"local-bd-address[",
-+		       <&bt>,"fallback-bd-address?=0",
-+		       <&minibt>,"local-bd-address[",
-+		       <&minibt>,"fallback-bd-address?=0";
- 		krnbt = <&bt>,"status";
--		krnbt_baudrate = <&bt>,"max-speed:0";
-+		krnbt_baudrate = <&bt>,"max-speed:0", <&minibt>,"max-speed:0";
- 	};
- };
---- a/arch/arm/boot/dts/bcm271x-rpi-bt.dtsi
-+++ b/arch/arm/boot/dts/bcm271x-rpi-bt.dtsi
-@@ -5,22 +5,34 @@
- 		compatible = "brcm,bcm43438-bt";
- 		max-speed = <3000000>;
- 		shutdown-gpios = <&expgpio 0 GPIO_ACTIVE_HIGH>;
--		status = "disabled";
-+		local-bd-address = [ 00 00 00 00 00 00 ];
-+		fallback-bd-address; // Don't override a valid address
-+		status = "okay";
- 	};
- };
- 
- &uart1 {
- 	minibt: bluetooth {
- 		compatible = "brcm,bcm43438-bt";
--		max-speed = <460800>;
-+		max-speed = <230400>;
- 		shutdown-gpios = <&expgpio 0 GPIO_ACTIVE_HIGH>;
-+		local-bd-address = [ 00 00 00 00 00 00 ];
-+		fallback-bd-address; // Don't override a valid address
- 		status = "disabled";
- 	};
- };
- 
- / {
-+	aliases {
-+		bluetooth = &bt;
-+	};
-+
- 	__overrides__ {
-+		bdaddr = <&bt>,"local-bd-address[",
-+		       <&bt>,"fallback-bd-address?=0",
-+		       <&minibt>,"local-bd-address[",
-+		       <&minibt>,"fallback-bd-address?=0";
- 		krnbt = <&bt>,"status";
--		krnbt_baudrate = <&bt>,"max-speed:0";
-+		krnbt_baudrate = <&bt>,"max-speed:0", <&minibt>,"max-speed:0";
- 	};
- };
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -144,6 +144,13 @@ Params:
-                                 See /sys/kernel/debug/raspberrypi_axi_monitor
-                                 for the results.
- 
-+        bdaddr                  Set an alternative Bluetooth address (BDADDR).
-+                                The value should be a 6-byte hexadecimal value,
-+                                with or without colon separators, written least-
-+                                significant-byte first. For example,
-+                                bdaddr=06:05:04:03:02:01
-+                                will set the BDADDR to 01:02:03:04:05:06.
-+
-         cam0_reg                Enables CAM 0 regulator.
-                                 Only required on CM1 & 3.
- 
-@@ -219,9 +226,9 @@ Params:
-         i2s                     Set to "on" to enable the i2s interface
-                                 (default "off")
- 
--        krnbt                   Set to "on" to enable autoprobing of Bluetooth
-+        krnbt                   Set to "off" to disable autoprobing of Bluetooth
-                                 driver without need of hciattach/btattach
--                                (default "off")
-+                                (default "on")
- 
-         krnbt_baudrate          Set the baudrate of the PL011 UART when used
-                                 with krnbt=on
---- a/arch/arm/boot/dts/overlays/disable-bt-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/disable-bt-overlay.dts
-@@ -1,12 +1,7 @@
- /dts-v1/;
- /plugin/;
- 
--/* Disable Bluetooth and restore UART0/ttyAMA0 over GPIOs 14 & 15.
--   To disable the systemd service that initialises the modem so it doesn't use
--   the UART:
--
--       sudo systemctl disable hciuart
--*/
-+/* Disable Bluetooth and restore UART0/ttyAMA0 over GPIOs 14 & 15. */
- 
- #include <dt-bindings/gpio/gpio.h>
- 
---- a/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts
-@@ -40,7 +40,7 @@
- 		target = <&uart1>;
- 		__overlay__ {
- 			pinctrl-names = "default";
--			pinctrl-0 = <&uart1_pins &bt_pins &fake_bt_cts>;
-+			pinctrl-0 = <&uart1_pins>;
- 			status = "okay";
- 		};
- 	};
-@@ -57,23 +57,13 @@
- 	fragment@4 {
- 		target = <&uart1_pins>;
- 		__overlay__ {
--			brcm,pins = <32 33>;
-+			brcm,pins = <32 33 30 31>;
- 			brcm,function = <2>; /* alt5=UART1 */
--			brcm,pull = <0 2>;
-+			brcm,pull = <0 2 2 0>;
- 		};
- 	};
- 
- 	fragment@5 {
--		target = <&gpio>;
--		__overlay__ {
--			fake_bt_cts: fake_bt_cts {
--				brcm,pins = <31>;
--				brcm,function = <1>; /* output */
--			};
--		};
--	};
--
--	fragment@6 {
- 		target-path = "/aliases";
- 		__overlay__ {
- 			serial0 = "/soc/serial@7e201000";
-@@ -81,13 +71,15 @@
- 		};
- 	};
- 
--	fragment@7 {
-+	fragment@6 {
- 		target = <&minibt>;
- 		minibt_frag: __overlay__ {
-+			status = "okay";
- 		};
- 	};
- 
- 	__overrides__ {
- 		krnbt = <&minibt_frag>,"status";
-+		krnbt_baudrate = <&minibt_frag>,"max-speed:0";
- 	};
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0702-overlays-Update-miniuart-bt-now-krnbt-is-default.patch b/target/linux/bcm27xx/patches-6.1/950-0702-overlays-Update-miniuart-bt-now-krnbt-is-default.patch
deleted file mode 100644
index fa1469044f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0702-overlays-Update-miniuart-bt-now-krnbt-is-default.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-From 2da5974313a0580d948c760214a2ea6f4e59bebf Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 19 Apr 2023 15:13:48 +0100
-Subject: [PATCH] overlays: Update miniuart-bt now krnbt is default
-
-Now that the kernel controls the onboard Bluetooth initialisation by
-default, the miniuart-bt overlay needs updating to match.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2708-rpi-zero-w.dts           |  6 ++++++
- arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts         |  6 ++++++
- arch/arm/boot/dts/bcm2710-rpi-3-b.dts              |  6 ++++++
- arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts         |  6 ++++++
- arch/arm/boot/dts/bcm2711-rpi-4-b.dts              |  6 ++++++
- arch/arm/boot/dts/bcm2711-rpi-400.dts              |  6 ++++++
- arch/arm/boot/dts/bcm2711-rpi-cm4.dts              |  6 ++++++
- arch/arm/boot/dts/overlays/README                  | 13 ++++---------
- arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts |  8 +++-----
- 9 files changed, 49 insertions(+), 14 deletions(-)
-
---- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
-+++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
-@@ -138,6 +138,12 @@
- 		brcm,pull;
- 	};
- 
-+	uart1_bt_pins: uart1_bt_pins {
-+		brcm,pins = <32 33 30 31>;
-+		brcm,function = <BCM2835_FSEL_ALT5>; /* alt5=UART1 */
-+		brcm,pull = <0 2 2 0>;
-+	};
-+
- 	audio_pins: audio_pins {
- 		brcm,pins = <>;
- 		brcm,function = <>;
---- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
-+++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
-@@ -140,6 +140,12 @@
- 		brcm,pull;
- 	};
- 
-+	uart1_bt_pins: uart1_bt_pins {
-+		brcm,pins = <32 33 30 31>;
-+		brcm,function = <BCM2835_FSEL_ALT5>; /* alt5=UART1 */
-+		brcm,pull = <0 2 2 0>;
-+	};
-+
- 	audio_pins: audio_pins {
- 		brcm,pins = <40 41>;
- 		brcm,function = <4>;
---- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
-+++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
-@@ -140,6 +140,12 @@
- 		brcm,pull;
- 	};
- 
-+	uart1_bt_pins: uart1_bt_pins {
-+		brcm,pins = <32 33>;
-+		brcm,function = <BCM2835_FSEL_ALT5>; /* alt5=UART1 */
-+		brcm,pull = <0 2>;
-+	};
-+
- 	audio_pins: audio_pins {
- 		brcm,pins = <40 41>;
- 		brcm,function = <4>;
---- a/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
-+++ b/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
-@@ -138,6 +138,12 @@
- 		brcm,pull;
- 	};
- 
-+	uart1_bt_pins: uart1_bt_pins {
-+		brcm,pins = <32 33 30 31>;
-+		brcm,function = <BCM2835_FSEL_ALT5>; /* alt5=UART1 */
-+		brcm,pull = <0 2 2 0>;
-+	};
-+
- 	audio_pins: audio_pins {
- 		brcm,pins = <>;
- 		brcm,function = <>;
---- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-@@ -445,6 +445,12 @@
- 		brcm,pull;
- 	};
- 
-+	uart1_bt_pins: uart1_bt_pins {
-+		brcm,pins = <32 33 30 31>;
-+		brcm,function = <BCM2835_FSEL_ALT5>; /* alt5=UART1 */
-+		brcm,pull = <0 2 2 0>;
-+	};
-+
- 	uart2_pins: uart2_pins {
- 		brcm,pins = <0 1>;
- 		brcm,function = <BCM2835_FSEL_ALT4>;
---- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
-@@ -445,6 +445,12 @@
- 		brcm,pull;
- 	};
- 
-+	uart1_bt_pins: uart1_bt_pins {
-+		brcm,pins = <32 33 30 31>;
-+		brcm,function = <BCM2835_FSEL_ALT5>; /* alt5=UART1 */
-+		brcm,pull = <0 2 2 0>;
-+	};
-+
- 	uart2_pins: uart2_pins {
- 		brcm,pins = <0 1>;
- 		brcm,function = <BCM2835_FSEL_ALT4>;
---- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
-@@ -454,6 +454,12 @@
- 		brcm,pull;
- 	};
- 
-+	uart1_bt_pins: uart1_bt_pins {
-+		brcm,pins = <32 33 30 31>;
-+		brcm,function = <BCM2835_FSEL_ALT5>; /* alt5=UART1 */
-+		brcm,pull = <0 2 2 0>;
-+	};
-+
- 	uart2_pins: uart2_pins {
- 		brcm,pins = <0 1>;
- 		brcm,function = <BCM2835_FSEL_ALT4>;
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -2887,17 +2887,12 @@ Params: speed                   SPI bus
- 
- 
- Name:   miniuart-bt
--Info:   Switch the onboard Bluetooth function on Pi 3B, 3B+, 3A+, 4B and Zero W
-+Info:   Switch the onboard Bluetooth function of a BT-equipped Raspberry Pi
-         to use the mini-UART (ttyS0) and restore UART0/ttyAMA0 over GPIOs 14 &
--        15. Note that this may reduce the maximum usable baudrate.
--        N.B. It is also necessary to edit /lib/systemd/system/hciuart.service
--        and replace ttyAMA0 with ttyS0, unless using Raspbian or another
--        distribution with udev rules that create /dev/serial0 and /dev/serial1,
--        in which case use /dev/serial1 instead because it will always be
--        correct. Furthermore, you must also set core_freq and core_freq_min to
--        the same value in config.txt or the miniuart will not work.
-+        15. Note that this option uses a lower baudrate, and should only be used
-+        with low-bandwidth peripherals.
- Load:   dtoverlay=miniuart-bt,<param>=<val>
--Params: krnbt                   Set to "on" to enable autoprobing of Bluetooth
-+Params: krnbt                   Set to "off" to disable autoprobing of Bluetooth
-                                 driver without need of hciattach/btattach
- 
- 
---- a/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts
-@@ -55,11 +55,9 @@
- 	};
- 
- 	fragment@4 {
--		target = <&uart1_pins>;
-+		target = <&uart1>;
- 		__overlay__ {
--			brcm,pins = <32 33 30 31>;
--			brcm,function = <2>; /* alt5=UART1 */
--			brcm,pull = <0 2 2 0>;
-+			pinctrl-0 = <&uart1_bt_pins>;
- 		};
- 	};
- 
-@@ -68,6 +66,7 @@
- 		__overlay__ {
- 			serial0 = "/soc/serial@7e201000";
- 			serial1 = "/soc/serial@7e215040";
-+			bluetooth = "/soc/serial@7e215040/bluetooth";
- 		};
- 	};
- 
-@@ -80,6 +79,5 @@
- 
- 	__overrides__ {
- 		krnbt = <&minibt_frag>,"status";
--		krnbt_baudrate = <&minibt_frag>,"max-speed:0";
- 	};
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0703-ARM-dts-bcm2711-Add-extra-serial-aliases.patch b/target/linux/bcm27xx/patches-6.1/950-0703-ARM-dts-bcm2711-Add-extra-serial-aliases.patch
deleted file mode 100644
index 92f5a2f82e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0703-ARM-dts-bcm2711-Add-extra-serial-aliases.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From dfc14f5786f1613f398422c7567c7e0cdd60f021 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Fri, 24 Feb 2023 14:53:48 +0000
-Subject: [PATCH] ARM: dts: bcm2711: Add extra serial aliases
-
-With UART numbering from DT aliases re-enabled, add aliases for the
-additional BCM2711 UARTs. Also use the opportunity to remove some
-DTS duplication.
-
-See: https://forums.raspberrypi.com/viewtopic.php?t=347868
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2711-rpi-4-b.dts  | 19 ------------------
- arch/arm/boot/dts/bcm2711-rpi-400.dts  | 19 ------------------
- arch/arm/boot/dts/bcm2711-rpi-cm4.dts  | 19 ------------------
- arch/arm/boot/dts/bcm2711-rpi-cm4s.dts | 15 +++-----------
- arch/arm/boot/dts/bcm2711-rpi-ds.dtsi  | 27 ++++++++++++++++++++++++++
- 5 files changed, 30 insertions(+), 69 deletions(-)
-
---- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-@@ -268,25 +268,6 @@
- 		bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0";
- 	};
- 
--	aliases {
--		serial0 = &uart1;
--		serial1 = &uart0;
--		mmc0 = &emmc2;
--		mmc1 = &mmcnr;
--		mmc2 = &sdhost;
--		i2c3 = &i2c3;
--		i2c4 = &i2c4;
--		i2c5 = &i2c5;
--		i2c6 = &i2c6;
--		i2c20 = &ddc0;
--		i2c21 = &ddc1;
--		spi3 = &spi3;
--		spi4 = &spi4;
--		spi5 = &spi5;
--		spi6 = &spi6;
--		/delete-property/ intc;
--	};
--
- 	/delete-node/ wifi-pwrseq;
- };
- 
---- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
-@@ -268,25 +268,6 @@
- 		bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0";
- 	};
- 
--	aliases {
--		serial0 = &uart1;
--		serial1 = &uart0;
--		mmc0 = &emmc2;
--		mmc1 = &mmcnr;
--		mmc2 = &sdhost;
--		i2c3 = &i2c3;
--		i2c4 = &i2c4;
--		i2c5 = &i2c5;
--		i2c6 = &i2c6;
--		i2c20 = &ddc0;
--		i2c21 = &ddc1;
--		spi3 = &spi3;
--		spi4 = &spi4;
--		spi5 = &spi5;
--		spi6 = &spi6;
--		/delete-property/ intc;
--	};
--
- 	/delete-node/ wifi-pwrseq;
- };
- 
---- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
-@@ -277,25 +277,6 @@
- 		bootargs = "coherent_pool=1M 8250.nr_uarts=1 snd_bcm2835.enable_headphones=0";
- 	};
- 
--	aliases {
--		serial0 = &uart1;
--		serial1 = &uart0;
--		mmc0 = &emmc2;
--		mmc1 = &mmcnr;
--		mmc2 = &sdhost;
--		i2c3 = &i2c3;
--		i2c4 = &i2c4;
--		i2c5 = &i2c5;
--		i2c6 = &i2c6;
--		i2c20 = &ddc0;
--		i2c21 = &ddc1;
--		spi3 = &spi3;
--		spi4 = &spi4;
--		spi5 = &spi5;
--		spi6 = &spi6;
--		/delete-property/ intc;
--	};
--
- 	/delete-node/ wifi-pwrseq;
- };
- 
---- a/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
-@@ -163,18 +163,9 @@
- 
- 	aliases {
- 		serial0 = &uart0;
--		mmc0 = &emmc2;
--		mmc1 = &mmcnr;
--		mmc2 = &sdhost;
--		i2c3 = &i2c3;
--		i2c4 = &i2c4;
--		i2c5 = &i2c5;
--		i2c6 = &i2c6;
--		spi3 = &spi3;
--		spi4 = &spi4;
--		spi5 = &spi5;
--		spi6 = &spi6;
--		/delete-property/ intc;
-+		serial1 = &uart1;
-+		/delete-property/ i2c20;
-+		/delete-property/ i2c21;
- 	};
- 
- 	/delete-node/ wifi-pwrseq;
---- a/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
-+++ b/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
-@@ -26,6 +26,33 @@
- 	chosen {
- 		/delete-property/ stdout-path;
- 	};
-+
-+	aliases {
-+		uart2 = &uart2;
-+		uart3 = &uart3;
-+		uart4 = &uart4;
-+		uart5 = &uart5;
-+		serial0 = &uart1;
-+		serial1 = &uart0;
-+		serial2 = &uart2;
-+		serial3 = &uart3;
-+		serial4 = &uart4;
-+		serial5 = &uart5;
-+		mmc0 = &emmc2;
-+		mmc1 = &mmcnr;
-+		mmc2 = &sdhost;
-+		i2c3 = &i2c3;
-+		i2c4 = &i2c4;
-+		i2c5 = &i2c5;
-+		i2c6 = &i2c6;
-+		i2c20 = &ddc0;
-+		i2c21 = &ddc1;
-+		spi3 = &spi3;
-+		spi4 = &spi4;
-+		spi5 = &spi5;
-+		spi6 = &spi6;
-+		/delete-property/ intc;
-+	};
- };
- 
- &vc4 {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0704-pinctrl-bcm2835-Workaround-for-edge-IRQ-loss.patch b/target/linux/bcm27xx/patches-6.1/950-0704-pinctrl-bcm2835-Workaround-for-edge-IRQ-loss.patch
deleted file mode 100644
index 16028b897c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0704-pinctrl-bcm2835-Workaround-for-edge-IRQ-loss.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From dcb717bc899cd55a969fb4f1f8526f313efe148c Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Fri, 5 May 2023 11:25:48 +0100
-Subject: [PATCH] pinctrl: bcm2835: Workaround for edge IRQ loss
-
-It has been observed that edge events can be lost when GPIO edges occur
-close to each other. Investigation suggests this is due to a hardware
-bug, although no mechanism has been identified.
-
-Work around the event loss by moving the IRQ acknowledgement into the
-main ISR, adding missing events by explicit level-change detection.
-
-See: https://forums.raspberrypi.com/viewtopic.php?t=350295
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/pinctrl/bcm/pinctrl-bcm2835.c | 23 ++++++++++++++++++-----
- 1 file changed, 18 insertions(+), 5 deletions(-)
-
---- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
-+++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
-@@ -420,15 +420,32 @@ static void bcm2835_gpio_irq_handle_bank
- 	unsigned long events;
- 	unsigned offset;
- 	unsigned gpio;
-+	u32 levs, levs2;
- 
- 	events = bcm2835_gpio_rd(pc, GPEDS0 + bank * 4);
-+	levs = bcm2835_gpio_rd(pc, GPLEV0 + bank * 4);
- 	events &= mask;
- 	events &= pc->enabled_irq_map[bank];
-+	bcm2835_gpio_wr(pc, GPEDS0 + bank * 4, events);
-+
-+retry:
- 	for_each_set_bit(offset, &events, 32) {
- 		gpio = (32 * bank) + offset;
- 		generic_handle_domain_irq(pc->gpio_chip.irq.domain,
- 					  gpio);
- 	}
-+	events = bcm2835_gpio_rd(pc, GPEDS0 + bank * 4);
-+	levs2 = bcm2835_gpio_rd(pc, GPLEV0 + bank * 4);
-+
-+	events |= levs2 & ~levs & bcm2835_gpio_rd(pc, GPREN0 + bank * 4);
-+	events |= ~levs2 & levs & bcm2835_gpio_rd(pc, GPFEN0 + bank * 4);
-+	events &= mask;
-+	events &= pc->enabled_irq_map[bank];
-+	if (events) {
-+		bcm2835_gpio_wr(pc, GPEDS0 + bank * 4, events);
-+		levs = levs2;
-+		goto retry;
-+	}
- }
- 
- static void bcm2835_gpio_irq_handler(struct irq_desc *desc)
-@@ -668,11 +685,7 @@ static int bcm2835_gpio_irq_set_type(str
- 
- static void bcm2835_gpio_irq_ack(struct irq_data *data)
- {
--	struct gpio_chip *chip = irq_data_get_irq_chip_data(data);
--	struct bcm2835_pinctrl *pc = gpiochip_get_data(chip);
--	unsigned gpio = irqd_to_hwirq(data);
--
--	bcm2835_gpio_set_bit(pc, GPEDS0, gpio);
-+	/* Nothing to do - the main interrupt handler includes the ACK */
- }
- 
- static int bcm2835_gpio_irq_set_wake(struct irq_data *data, unsigned int on)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0705-drm-v3d-New-debugfs-end-points-to-query-GPU-usage-st.patch b/target/linux/bcm27xx/patches-6.1/950-0705-drm-v3d-New-debugfs-end-points-to-query-GPU-usage-st.patch
deleted file mode 100644
index 193b40081b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0705-drm-v3d-New-debugfs-end-points-to-query-GPU-usage-st.patch
+++ /dev/null
@@ -1,493 +0,0 @@
-From 2725d86da22e2d2e46d970f0b2f2193a0b8e653b Mon Sep 17 00:00:00 2001
-From: Jose Maria Casanova Crespo <jmcasanova@igalia.com>
-Date: Tue, 7 Feb 2023 13:54:02 +0100
-Subject: [PATCH] drm/v3d: New debugfs end-points to query GPU usage
- stats.
-
-Two new debugfs interfaces are implemented:
-
-- gpu_usage: exposes the total runtime since boot of each
-of the 5 scheduling queues available at V3D (BIN, RENDER,
-CSD, TFU, CACHE_CLEAN). So if the interface is queried at
-two different points of time the usage percentage of each
-of the queues can be calculated.
-
-- gpu_pid_usage: exposes the same information but to the
-level of detail of each process using the V3D driver. The
-runtime for process using the driver is stored. So the
-percentages of usage by PID can be calculated with
-measures at different timestamps.
-
-The storage of gpu_pid_usage stats is only done if
-the debugfs interface is polled during the last 70 seconds.
-If a process does not submit a GPU job during last 70
-seconds its stats will also be purged.
-
-Signed-off-by: Jose Maria Casanova Crespo <jmcasanova@igalia.com>
----
- drivers/gpu/drm/v3d/v3d_debugfs.c |  79 +++++++++++++++++
- drivers/gpu/drm/v3d/v3d_drv.h     |  59 +++++++++++++
- drivers/gpu/drm/v3d/v3d_gem.c     |   1 +
- drivers/gpu/drm/v3d/v3d_irq.c     |   5 ++
- drivers/gpu/drm/v3d/v3d_sched.c   | 139 +++++++++++++++++++++++++++++-
- 5 files changed, 282 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/v3d/v3d_debugfs.c
-+++ b/drivers/gpu/drm/v3d/v3d_debugfs.c
-@@ -6,6 +6,7 @@
- #include <linux/debugfs.h>
- #include <linux/seq_file.h>
- #include <linux/string_helpers.h>
-+#include <linux/sched/clock.h>
- 
- #include <drm/drm_debugfs.h>
- 
-@@ -202,6 +203,82 @@ static int v3d_debugfs_bo_stats(struct s
- 	return 0;
- }
- 
-+static int v3d_debugfs_gpu_usage(struct seq_file *m, void *unused)
-+{
-+	struct drm_info_node *node = (struct drm_info_node *)m->private;
-+	struct drm_device *dev = node->minor->dev;
-+	struct v3d_dev *v3d = to_v3d_dev(dev);
-+	struct v3d_queue_stats *queue_stats;
-+	enum v3d_queue queue;
-+	u64 timestamp = local_clock();
-+	u64 active_runtime;
-+
-+	seq_printf(m, "timestamp;%llu;\n", local_clock());
-+	seq_printf(m, "\"QUEUE\";\"JOBS\";\"RUNTIME\";\"ACTIVE\";\n");
-+	for (queue = 0; queue < V3D_MAX_QUEUES; queue++) {
-+		if (!v3d->queue[queue].sched.ready)
-+			continue;
-+
-+		queue_stats = &v3d->gpu_queue_stats[queue];
-+		mutex_lock(&queue_stats->lock);
-+		v3d_sched_stats_update(queue_stats);
-+		if (queue_stats->last_pid)
-+			active_runtime = timestamp - queue_stats->last_exec_start;
-+		else
-+			active_runtime = 0;
-+
-+		seq_printf(m, "%s;%d;%llu;%c;\n",
-+			   v3d_queue_to_string(queue),
-+			   queue_stats->jobs_sent,
-+			   queue_stats->runtime + active_runtime,
-+			   queue_stats->last_pid?'1':'0');
-+		mutex_unlock(&queue_stats->lock);
-+	}
-+
-+	return 0;
-+}
-+
-+static int v3d_debugfs_gpu_pid_usage(struct seq_file *m, void *unused)
-+{
-+	struct drm_info_node *node = (struct drm_info_node *)m->private;
-+	struct drm_device *dev = node->minor->dev;
-+	struct v3d_dev *v3d = to_v3d_dev(dev);
-+	struct v3d_queue_stats *queue_stats;
-+	struct v3d_queue_pid_stats *cur;
-+	enum v3d_queue queue;
-+	u64 active_runtime;
-+	u64 timestamp = local_clock();
-+
-+	seq_printf(m, "timestamp;%llu;\n", timestamp);
-+	seq_printf(m, "\"QUEUE\";\"PID\",\"JOBS\";\"RUNTIME\";\"ACTIVE\";\n");
-+	for (queue = 0; queue < V3D_MAX_QUEUES; queue++) {
-+
-+		if (!v3d->queue[queue].sched.ready)
-+			continue;
-+
-+		queue_stats = &v3d->gpu_queue_stats[queue];
-+		mutex_lock(&queue_stats->lock);
-+		queue_stats->gpu_pid_stats_timeout = jiffies + V3D_QUEUE_STATS_TIMEOUT;
-+		v3d_sched_stats_update(queue_stats);
-+		list_for_each_entry(cur, &queue_stats->pid_stats_list, list) {
-+
-+			if (cur->pid == queue_stats->last_pid)
-+				active_runtime = timestamp - queue_stats->last_exec_start;
-+			else
-+				active_runtime = 0;
-+
-+			seq_printf(m, "%s;%d;%d;%llu;%c;\n",
-+				   v3d_queue_to_string(queue),
-+				   cur->pid, cur->jobs_sent,
-+				   cur->runtime + active_runtime,
-+				   cur->pid == queue_stats->last_pid ? '1' : '0');
-+		}
-+		mutex_unlock(&queue_stats->lock);
-+	}
-+
-+	return 0;
-+}
-+
- static int v3d_measure_clock(struct seq_file *m, void *unused)
- {
- 	struct drm_info_node *node = (struct drm_info_node *)m->private;
-@@ -241,6 +318,8 @@ static const struct drm_info_list v3d_de
- 	{"v3d_regs", v3d_v3d_debugfs_regs, 0},
- 	{"measure_clock", v3d_measure_clock, 0},
- 	{"bo_stats", v3d_debugfs_bo_stats, 0},
-+	{"gpu_usage", v3d_debugfs_gpu_usage, 0},
-+	{"gpu_pid_usage", v3d_debugfs_gpu_pid_usage, 0},
- };
- 
- void
---- a/drivers/gpu/drm/v3d/v3d_drv.h
-+++ b/drivers/gpu/drm/v3d/v3d_drv.h
-@@ -21,6 +21,19 @@ struct reset_control;
- 
- #define V3D_MAX_QUEUES (V3D_CACHE_CLEAN + 1)
- 
-+static inline char *
-+v3d_queue_to_string(enum v3d_queue queue)
-+{
-+	switch (queue) {
-+	case V3D_BIN: return "v3d_bin";
-+	case V3D_RENDER: return "v3d_render";
-+	case V3D_TFU: return "v3d_tfu";
-+	case V3D_CSD: return "v3d_csd";
-+	case V3D_CACHE_CLEAN: return "v3d_cache_clean";
-+	}
-+	return "UNKNOWN";
-+}
-+
- struct v3d_queue_state {
- 	struct drm_gpu_scheduler sched;
- 
-@@ -28,6 +41,44 @@ struct v3d_queue_state {
- 	u64 emit_seqno;
- };
- 
-+struct v3d_queue_pid_stats {
-+	struct	list_head list;
-+	u64	runtime;
-+	/* Time in jiffes.to purge the stats of this process. Every time a
-+	 * process sends a new job to the queue, this timeout is delayed by
-+	 * V3D_QUEUE_STATS_TIMEOUT while the gpu_pid_stats_timeout of the
-+	 * queue is not reached.
-+	 */
-+	unsigned long timeout_purge;
-+	u32	jobs_sent;
-+	pid_t	pid;
-+};
-+
-+struct v3d_queue_stats {
-+	struct mutex lock;
-+	u64	last_exec_start;
-+	u64	last_exec_end;
-+	u64	runtime;
-+	u32	jobs_sent;
-+	/* Time in jiffes to stop collecting gpu stats by process. This is
-+	 * increased by every access to*the debugfs interface gpu_pid_usage.
-+	 * If the debugfs is not used stats are not collected.
-+	 */
-+	unsigned long gpu_pid_stats_timeout;
-+	pid_t	last_pid;
-+	struct list_head pid_stats_list;
-+};
-+
-+/* pid_stats by process (v3d_queue_pid_stats) are recorded if there is an
-+ * access to the gpu_pid_usageare debugfs interface for the last
-+ * V3D_QUEUE_STATS_TIMEOUT (70s).
-+ *
-+ * The same timeout is used to purge the stats by process for those process
-+ * that have not sent jobs this period.
-+ */
-+#define V3D_QUEUE_STATS_TIMEOUT (70 * HZ)
-+
-+
- /* Performance monitor object. The perform lifetime is controlled by userspace
-  * using perfmon related ioctls. A perfmon can be attached to a submit_cl
-  * request, and when this is the case, HW perf counters will be activated just
-@@ -147,6 +198,8 @@ struct v3d_dev {
- 		u32 num_allocated;
- 		u32 pages_allocated;
- 	} bo_stats;
-+
-+	struct v3d_queue_stats gpu_queue_stats[V3D_MAX_QUEUES];
- };
- 
- static inline struct v3d_dev *
-@@ -244,6 +297,11 @@ struct v3d_job {
- 	 */
- 	struct v3d_perfmon *perfmon;
- 
-+	/* PID of the process that submitted the job that could be used to
-+	 * for collecting stats by process of gpu usage.
-+	 */
-+	pid_t client_pid;
-+
- 	/* Callback for the freeing of the job on refcount going to 0. */
- 	void (*free)(struct kref *ref);
- };
-@@ -408,6 +466,7 @@ void v3d_mmu_remove_ptes(struct v3d_bo *
- /* v3d_sched.c */
- int v3d_sched_init(struct v3d_dev *v3d);
- void v3d_sched_fini(struct v3d_dev *v3d);
-+void v3d_sched_stats_update(struct v3d_queue_stats *queue_stats);
- 
- /* v3d_perfmon.c */
- void v3d_perfmon_get(struct v3d_perfmon *perfmon);
---- a/drivers/gpu/drm/v3d/v3d_gem.c
-+++ b/drivers/gpu/drm/v3d/v3d_gem.c
-@@ -516,6 +516,7 @@ v3d_job_init(struct v3d_dev *v3d, struct
- 	job = *container;
- 	job->v3d = v3d;
- 	job->free = free;
-+	job->client_pid = current->pid;
- 
- 	ret = drm_sched_job_init(&job->base, &v3d_priv->sched_entity[queue],
- 				 v3d_priv);
---- a/drivers/gpu/drm/v3d/v3d_irq.c
-+++ b/drivers/gpu/drm/v3d/v3d_irq.c
-@@ -14,6 +14,7 @@
-  */
- 
- #include <linux/platform_device.h>
-+#include <linux/sched/clock.h>
- 
- #include "v3d_drv.h"
- #include "v3d_regs.h"
-@@ -100,6 +101,7 @@ v3d_irq(int irq, void *arg)
- 	if (intsts & V3D_INT_FLDONE) {
- 		struct v3d_fence *fence =
- 			to_v3d_fence(v3d->bin_job->base.irq_fence);
-+		v3d->gpu_queue_stats[V3D_BIN].last_exec_end = local_clock();
- 
- 		trace_v3d_bcl_irq(&v3d->drm, fence->seqno);
- 		dma_fence_signal(&fence->base);
-@@ -109,6 +111,7 @@ v3d_irq(int irq, void *arg)
- 	if (intsts & V3D_INT_FRDONE) {
- 		struct v3d_fence *fence =
- 			to_v3d_fence(v3d->render_job->base.irq_fence);
-+		v3d->gpu_queue_stats[V3D_RENDER].last_exec_end = local_clock();
- 
- 		trace_v3d_rcl_irq(&v3d->drm, fence->seqno);
- 		dma_fence_signal(&fence->base);
-@@ -118,6 +121,7 @@ v3d_irq(int irq, void *arg)
- 	if (intsts & V3D_INT_CSDDONE) {
- 		struct v3d_fence *fence =
- 			to_v3d_fence(v3d->csd_job->base.irq_fence);
-+		v3d->gpu_queue_stats[V3D_CSD].last_exec_end = local_clock();
- 
- 		trace_v3d_csd_irq(&v3d->drm, fence->seqno);
- 		dma_fence_signal(&fence->base);
-@@ -154,6 +158,7 @@ v3d_hub_irq(int irq, void *arg)
- 	if (intsts & V3D_HUB_INT_TFUC) {
- 		struct v3d_fence *fence =
- 			to_v3d_fence(v3d->tfu_job->base.irq_fence);
-+		v3d->gpu_queue_stats[V3D_TFU].last_exec_end = local_clock();
- 
- 		trace_v3d_tfu_irq(&v3d->drm, fence->seqno);
- 		dma_fence_signal(&fence->base);
---- a/drivers/gpu/drm/v3d/v3d_sched.c
-+++ b/drivers/gpu/drm/v3d/v3d_sched.c
-@@ -19,6 +19,7 @@
-  */
- 
- #include <linux/kthread.h>
-+#include <linux/sched/clock.h>
- 
- #include "v3d_drv.h"
- #include "v3d_regs.h"
-@@ -72,6 +73,114 @@ v3d_switch_perfmon(struct v3d_dev *v3d,
- 		v3d_perfmon_start(v3d, job->perfmon);
- }
- 
-+/*
-+ * Updates the scheduling stats of the gpu queues runtime for completed jobs.
-+ *
-+ * It should be called before any new job submission to the queue or before
-+ * accessing the stats from the debugfs interface.
-+ *
-+ * It is expected that calls to this function are done with queue_stats->lock
-+ * locked.
-+ */
-+void
-+v3d_sched_stats_update(struct v3d_queue_stats *queue_stats)
-+{
-+	struct list_head *pid_stats_list = &queue_stats->pid_stats_list;
-+	struct v3d_queue_pid_stats *cur, *tmp;
-+	u64 runtime = 0;
-+	bool store_pid_stats =
-+		time_is_after_jiffies(queue_stats->gpu_pid_stats_timeout);
-+
-+	/* If debugfs stats gpu_pid_usage has not been polled for a period,
-+	 * the pid stats collection is stopped and we purge any existing
-+	 * pid_stats.
-+	 *
-+	 * pid_stats are also purged for clients that have reached the
-+	 * timeout_purge because the process probably does not exist anymore.
-+	 */
-+	list_for_each_entry_safe_reverse(cur, tmp, pid_stats_list, list) {
-+		if (!store_pid_stats || time_is_before_jiffies(cur->timeout_purge)) {
-+			list_del(&cur->list);
-+			kfree(cur);
-+		} else {
-+			break;
-+		}
-+	}
-+	/* If a job has finished its stats are updated. */
-+	if (queue_stats->last_pid && queue_stats->last_exec_end) {
-+		runtime = queue_stats->last_exec_end -
-+			  queue_stats->last_exec_start;
-+		queue_stats->runtime += runtime;
-+
-+		if (store_pid_stats) {
-+			struct v3d_queue_pid_stats *pid_stats;
-+			/* Last job info is always at the head of the list */
-+			pid_stats = list_first_entry_or_null(pid_stats_list,
-+				struct v3d_queue_pid_stats, list);
-+			if (pid_stats &&
-+			    pid_stats->pid == queue_stats->last_pid) {
-+				pid_stats->runtime += runtime;
-+			}
-+		}
-+		queue_stats->last_pid = 0;
-+	}
-+}
-+
-+/*
-+ * Updates the queue usage adding the information of a new job that is
-+ * about to be sent to the GPU to be executed.
-+ */
-+int
-+v3d_sched_stats_add_job(struct v3d_queue_stats *queue_stats,
-+			struct drm_sched_job *sched_job)
-+{
-+
-+	struct v3d_queue_pid_stats *pid_stats = NULL;
-+	struct v3d_job *job = sched_job?to_v3d_job(sched_job):NULL;
-+	struct v3d_queue_pid_stats *cur;
-+	struct list_head *pid_stats_list = &queue_stats->pid_stats_list;
-+	int ret = 0;
-+
-+	mutex_lock(&queue_stats->lock);
-+
-+	/* Completion of previous job requires an update of its runtime stats */
-+	v3d_sched_stats_update(queue_stats);
-+
-+	queue_stats->last_exec_start = local_clock();
-+	queue_stats->last_exec_end = 0;
-+	queue_stats->jobs_sent++;
-+	queue_stats->last_pid = job->client_pid;
-+
-+	/* gpu usage stats by process are being collected */
-+	if (time_is_after_jiffies(queue_stats->gpu_pid_stats_timeout)) {
-+		list_for_each_entry(cur, pid_stats_list, list) {
-+			if (cur->pid == job->client_pid) {
-+				pid_stats = cur;
-+				break;
-+			}
-+		}
-+		/* pid_stats of this client is moved to the head of the list. */
-+		if (pid_stats) {
-+			list_move(&pid_stats->list, pid_stats_list);
-+		} else {
-+			pid_stats = kzalloc(sizeof(struct v3d_queue_pid_stats),
-+					    GFP_KERNEL);
-+			if (!pid_stats) {
-+				ret = -ENOMEM;
-+				goto err_mem;
-+			}
-+			pid_stats->pid = job->client_pid;
-+			list_add(&pid_stats->list, pid_stats_list);
-+		}
-+		pid_stats->jobs_sent++;
-+		pid_stats->timeout_purge = jiffies + V3D_QUEUE_STATS_TIMEOUT;
-+	}
-+
-+err_mem:
-+	mutex_unlock(&queue_stats->lock);
-+	return ret;
-+}
-+
- static struct dma_fence *v3d_bin_job_run(struct drm_sched_job *sched_job)
- {
- 	struct v3d_bin_job *job = to_bin_job(sched_job);
-@@ -107,6 +216,7 @@ static struct dma_fence *v3d_bin_job_run
- 	trace_v3d_submit_cl(dev, false, to_v3d_fence(fence)->seqno,
- 			    job->start, job->end);
- 
-+	v3d_sched_stats_add_job(&v3d->gpu_queue_stats[V3D_BIN], sched_job);
- 	v3d_switch_perfmon(v3d, &job->base);
- 
- 	/* Set the current and end address of the control list.
-@@ -158,6 +268,7 @@ static struct dma_fence *v3d_render_job_
- 	trace_v3d_submit_cl(dev, true, to_v3d_fence(fence)->seqno,
- 			    job->start, job->end);
- 
-+	v3d_sched_stats_add_job(&v3d->gpu_queue_stats[V3D_RENDER], sched_job);
- 	v3d_switch_perfmon(v3d, &job->base);
- 
- 	/* XXX: Set the QCFG */
-@@ -190,6 +301,7 @@ v3d_tfu_job_run(struct drm_sched_job *sc
- 
- 	trace_v3d_submit_tfu(dev, to_v3d_fence(fence)->seqno);
- 
-+	v3d_sched_stats_add_job(&v3d->gpu_queue_stats[V3D_TFU], sched_job);
- 	V3D_WRITE(V3D_TFU_IIA, job->args.iia);
- 	V3D_WRITE(V3D_TFU_IIS, job->args.iis);
- 	V3D_WRITE(V3D_TFU_ICA, job->args.ica);
-@@ -231,6 +343,7 @@ v3d_csd_job_run(struct drm_sched_job *sc
- 
- 	trace_v3d_submit_csd(dev, to_v3d_fence(fence)->seqno);
- 
-+	v3d_sched_stats_add_job(&v3d->gpu_queue_stats[V3D_CSD], sched_job);
- 	v3d_switch_perfmon(v3d, &job->base);
- 
- 	for (i = 1; i <= 6; i++)
-@@ -247,7 +360,10 @@ v3d_cache_clean_job_run(struct drm_sched
- 	struct v3d_job *job = to_v3d_job(sched_job);
- 	struct v3d_dev *v3d = job->v3d;
- 
-+	v3d_sched_stats_add_job(&v3d->gpu_queue_stats[V3D_CACHE_CLEAN],
-+				sched_job);
- 	v3d_clean_caches(v3d);
-+	v3d->gpu_queue_stats[V3D_CACHE_CLEAN].last_exec_end = local_clock();
- 
- 	return NULL;
- }
-@@ -385,8 +501,18 @@ v3d_sched_init(struct v3d_dev *v3d)
- 	int hw_jobs_limit = 1;
- 	int job_hang_limit = 0;
- 	int hang_limit_ms = 500;
-+	enum v3d_queue q;
- 	int ret;
- 
-+	for (q = 0; q < V3D_MAX_QUEUES; q++) {
-+		INIT_LIST_HEAD(&v3d->gpu_queue_stats[q].pid_stats_list);
-+		/* Setting timeout before current jiffies disables collecting
-+		 * pid_stats on scheduling init.
-+		 */
-+		v3d->gpu_queue_stats[q].gpu_pid_stats_timeout = jiffies - 1;
-+		mutex_init(&v3d->gpu_queue_stats[q].lock);
-+	}
-+
- 	ret = drm_sched_init(&v3d->queue[V3D_BIN].sched,
- 			     &v3d_bin_sched_ops,
- 			     hw_jobs_limit, job_hang_limit,
-@@ -440,9 +566,20 @@ void
- v3d_sched_fini(struct v3d_dev *v3d)
- {
- 	enum v3d_queue q;
-+	struct v3d_queue_stats *queue_stats;
- 
- 	for (q = 0; q < V3D_MAX_QUEUES; q++) {
--		if (v3d->queue[q].sched.ready)
-+		if (v3d->queue[q].sched.ready) {
-+			queue_stats = &v3d->gpu_queue_stats[q];
-+			mutex_lock(&queue_stats->lock);
-+			/* Setting gpu_pid_stats_timeout to jiffies-1 will
-+			 * make v3d_sched_stats_update to purge all
-+			 * allocated pid_stats.
-+			 */
-+			queue_stats->gpu_pid_stats_timeout = jiffies - 1;
-+			v3d_sched_stats_update(queue_stats);
-+			mutex_unlock(&queue_stats->lock);
- 			drm_sched_fini(&v3d->queue[q].sched);
-+		}
- 	}
- }
diff --git a/target/linux/bcm27xx/patches-6.1/950-0706-ARM-dts-bcm2711-rpi-ds-Group-the-common-pins.patch b/target/linux/bcm27xx/patches-6.1/950-0706-ARM-dts-bcm2711-rpi-ds-Group-the-common-pins.patch
deleted file mode 100644
index 806c06292b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0706-ARM-dts-bcm2711-rpi-ds-Group-the-common-pins.patch
+++ /dev/null
@@ -1,693 +0,0 @@
-From d06fdceb579a5dcdb1bc864ec7ca4f8a94bc3cab Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 9 May 2023 13:52:39 +0100
-Subject: [PATCH] ARM: dts: bcm2711-rpi-ds: Group the common pins
-
-Move common pin group declarations into the shared bcm2711-rpi-ds.dtsi.
-No functional change.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2711-rpi-4-b.dts  | 121 -------------------------
- arch/arm/boot/dts/bcm2711-rpi-400.dts  | 121 -------------------------
- arch/arm/boot/dts/bcm2711-rpi-cm4.dts  | 121 -------------------------
- arch/arm/boot/dts/bcm2711-rpi-cm4s.dts | 121 -------------------------
- arch/arm/boot/dts/bcm2711-rpi-ds.dtsi  | 121 +++++++++++++++++++++++++
- 5 files changed, 121 insertions(+), 484 deletions(-)
-
---- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-@@ -310,103 +310,6 @@
- };
- 
- &gpio {
--	spi0_pins: spi0_pins {
--		brcm,pins = <9 10 11>;
--		brcm,function = <BCM2835_FSEL_ALT0>;
--	};
--
--	spi0_cs_pins: spi0_cs_pins {
--		brcm,pins = <8 7>;
--		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
--	};
--
--	spi3_pins: spi3_pins {
--		brcm,pins = <1 2 3>;
--		brcm,function = <BCM2835_FSEL_ALT3>;
--	};
--
--	spi3_cs_pins: spi3_cs_pins {
--		brcm,pins = <0 24>;
--		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
--	};
--
--	spi4_pins: spi4_pins {
--		brcm,pins = <5 6 7>;
--		brcm,function = <BCM2835_FSEL_ALT3>;
--	};
--
--	spi4_cs_pins: spi4_cs_pins {
--		brcm,pins = <4 25>;
--		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
--	};
--
--	spi5_pins: spi5_pins {
--		brcm,pins = <13 14 15>;
--		brcm,function = <BCM2835_FSEL_ALT3>;
--	};
--
--	spi5_cs_pins: spi5_cs_pins {
--		brcm,pins = <12 26>;
--		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
--	};
--
--	spi6_pins: spi6_pins {
--		brcm,pins = <19 20 21>;
--		brcm,function = <BCM2835_FSEL_ALT3>;
--	};
--
--	spi6_cs_pins: spi6_cs_pins {
--		brcm,pins = <18 27>;
--		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
--	};
--
--	i2c0_pins: i2c0 {
--		brcm,pins = <0 1>;
--		brcm,function = <BCM2835_FSEL_ALT0>;
--		brcm,pull = <BCM2835_PUD_UP>;
--	};
--
--	i2c1_pins: i2c1 {
--		brcm,pins = <2 3>;
--		brcm,function = <BCM2835_FSEL_ALT0>;
--		brcm,pull = <BCM2835_PUD_UP>;
--	};
--
--	i2c3_pins: i2c3 {
--		brcm,pins = <4 5>;
--		brcm,function = <BCM2835_FSEL_ALT5>;
--		brcm,pull = <BCM2835_PUD_UP>;
--	};
--
--	i2c4_pins: i2c4 {
--		brcm,pins = <8 9>;
--		brcm,function = <BCM2835_FSEL_ALT5>;
--		brcm,pull = <BCM2835_PUD_UP>;
--	};
--
--	i2c5_pins: i2c5 {
--		brcm,pins = <12 13>;
--		brcm,function = <BCM2835_FSEL_ALT5>;
--		brcm,pull = <BCM2835_PUD_UP>;
--	};
--
--	i2c6_pins: i2c6 {
--		brcm,pins = <22 23>;
--		brcm,function = <BCM2835_FSEL_ALT5>;
--		brcm,pull = <BCM2835_PUD_UP>;
--	};
--
--	i2s_pins: i2s {
--		brcm,pins = <18 19 20 21>;
--		brcm,function = <BCM2835_FSEL_ALT0>;
--	};
--
--	sdio_pins: sdio_pins {
--		brcm,pins =     <34 35 36 37 38 39>;
--		brcm,function = <BCM2835_FSEL_ALT3>; // alt3 = SD1
--		brcm,pull =     <0 2 2 2 2 2>;
--	};
--
- 	bt_pins: bt_pins {
- 		brcm,pins = "-"; // non-empty to keep btuart happy, //4 = 0
- 				 // to fool pinctrl
-@@ -431,30 +334,6 @@
- 		brcm,function = <BCM2835_FSEL_ALT5>; /* alt5=UART1 */
- 		brcm,pull = <0 2 2 0>;
- 	};
--
--	uart2_pins: uart2_pins {
--		brcm,pins = <0 1>;
--		brcm,function = <BCM2835_FSEL_ALT4>;
--		brcm,pull = <0 2>;
--	};
--
--	uart3_pins: uart3_pins {
--		brcm,pins = <4 5>;
--		brcm,function = <BCM2835_FSEL_ALT4>;
--		brcm,pull = <0 2>;
--	};
--
--	uart4_pins: uart4_pins {
--		brcm,pins = <8 9>;
--		brcm,function = <BCM2835_FSEL_ALT4>;
--		brcm,pull = <0 2>;
--	};
--
--	uart5_pins: uart5_pins {
--		brcm,pins = <12 13>;
--		brcm,function = <BCM2835_FSEL_ALT4>;
--		brcm,pull = <0 2>;
--	};
- };
- 
- &i2c0if {
---- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
-@@ -310,103 +310,6 @@
- };
- 
- &gpio {
--	spi0_pins: spi0_pins {
--		brcm,pins = <9 10 11>;
--		brcm,function = <BCM2835_FSEL_ALT0>;
--	};
--
--	spi0_cs_pins: spi0_cs_pins {
--		brcm,pins = <8 7>;
--		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
--	};
--
--	spi3_pins: spi3_pins {
--		brcm,pins = <1 2 3>;
--		brcm,function = <BCM2835_FSEL_ALT3>;
--	};
--
--	spi3_cs_pins: spi3_cs_pins {
--		brcm,pins = <0 24>;
--		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
--	};
--
--	spi4_pins: spi4_pins {
--		brcm,pins = <5 6 7>;
--		brcm,function = <BCM2835_FSEL_ALT3>;
--	};
--
--	spi4_cs_pins: spi4_cs_pins {
--		brcm,pins = <4 25>;
--		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
--	};
--
--	spi5_pins: spi5_pins {
--		brcm,pins = <13 14 15>;
--		brcm,function = <BCM2835_FSEL_ALT3>;
--	};
--
--	spi5_cs_pins: spi5_cs_pins {
--		brcm,pins = <12 26>;
--		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
--	};
--
--	spi6_pins: spi6_pins {
--		brcm,pins = <19 20 21>;
--		brcm,function = <BCM2835_FSEL_ALT3>;
--	};
--
--	spi6_cs_pins: spi6_cs_pins {
--		brcm,pins = <18 27>;
--		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
--	};
--
--	i2c0_pins: i2c0 {
--		brcm,pins = <0 1>;
--		brcm,function = <BCM2835_FSEL_ALT0>;
--		brcm,pull = <BCM2835_PUD_UP>;
--	};
--
--	i2c1_pins: i2c1 {
--		brcm,pins = <2 3>;
--		brcm,function = <BCM2835_FSEL_ALT0>;
--		brcm,pull = <BCM2835_PUD_UP>;
--	};
--
--	i2c3_pins: i2c3 {
--		brcm,pins = <4 5>;
--		brcm,function = <BCM2835_FSEL_ALT5>;
--		brcm,pull = <BCM2835_PUD_UP>;
--	};
--
--	i2c4_pins: i2c4 {
--		brcm,pins = <8 9>;
--		brcm,function = <BCM2835_FSEL_ALT5>;
--		brcm,pull = <BCM2835_PUD_UP>;
--	};
--
--	i2c5_pins: i2c5 {
--		brcm,pins = <12 13>;
--		brcm,function = <BCM2835_FSEL_ALT5>;
--		brcm,pull = <BCM2835_PUD_UP>;
--	};
--
--	i2c6_pins: i2c6 {
--		brcm,pins = <22 23>;
--		brcm,function = <BCM2835_FSEL_ALT5>;
--		brcm,pull = <BCM2835_PUD_UP>;
--	};
--
--	i2s_pins: i2s {
--		brcm,pins = <18 19 20 21>;
--		brcm,function = <BCM2835_FSEL_ALT0>;
--	};
--
--	sdio_pins: sdio_pins {
--		brcm,pins =     <34 35 36 37 38 39>;
--		brcm,function = <BCM2835_FSEL_ALT3>; // alt3 = SD1
--		brcm,pull =     <0 2 2 2 2 2>;
--	};
--
- 	bt_pins: bt_pins {
- 		brcm,pins = "-"; // non-empty to keep btuart happy, //4 = 0
- 				 // to fool pinctrl
-@@ -431,30 +334,6 @@
- 		brcm,function = <BCM2835_FSEL_ALT5>; /* alt5=UART1 */
- 		brcm,pull = <0 2 2 0>;
- 	};
--
--	uart2_pins: uart2_pins {
--		brcm,pins = <0 1>;
--		brcm,function = <BCM2835_FSEL_ALT4>;
--		brcm,pull = <0 2>;
--	};
--
--	uart3_pins: uart3_pins {
--		brcm,pins = <4 5>;
--		brcm,function = <BCM2835_FSEL_ALT4>;
--		brcm,pull = <0 2>;
--	};
--
--	uart4_pins: uart4_pins {
--		brcm,pins = <8 9>;
--		brcm,function = <BCM2835_FSEL_ALT4>;
--		brcm,pull = <0 2>;
--	};
--
--	uart5_pins: uart5_pins {
--		brcm,pins = <12 13>;
--		brcm,function = <BCM2835_FSEL_ALT4>;
--		brcm,pull = <0 2>;
--	};
- };
- 
- &i2c0if {
---- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
-@@ -319,103 +319,6 @@
- };
- 
- &gpio {
--	spi0_pins: spi0_pins {
--		brcm,pins = <9 10 11>;
--		brcm,function = <BCM2835_FSEL_ALT0>;
--	};
--
--	spi0_cs_pins: spi0_cs_pins {
--		brcm,pins = <8 7>;
--		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
--	};
--
--	spi3_pins: spi3_pins {
--		brcm,pins = <1 2 3>;
--		brcm,function = <BCM2835_FSEL_ALT3>;
--	};
--
--	spi3_cs_pins: spi3_cs_pins {
--		brcm,pins = <0 24>;
--		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
--	};
--
--	spi4_pins: spi4_pins {
--		brcm,pins = <5 6 7>;
--		brcm,function = <BCM2835_FSEL_ALT3>;
--	};
--
--	spi4_cs_pins: spi4_cs_pins {
--		brcm,pins = <4 25>;
--		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
--	};
--
--	spi5_pins: spi5_pins {
--		brcm,pins = <13 14 15>;
--		brcm,function = <BCM2835_FSEL_ALT3>;
--	};
--
--	spi5_cs_pins: spi5_cs_pins {
--		brcm,pins = <12 26>;
--		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
--	};
--
--	spi6_pins: spi6_pins {
--		brcm,pins = <19 20 21>;
--		brcm,function = <BCM2835_FSEL_ALT3>;
--	};
--
--	spi6_cs_pins: spi6_cs_pins {
--		brcm,pins = <18 27>;
--		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
--	};
--
--	i2c0_pins: i2c0 {
--		brcm,pins = <0 1>;
--		brcm,function = <BCM2835_FSEL_ALT0>;
--		brcm,pull = <BCM2835_PUD_UP>;
--	};
--
--	i2c1_pins: i2c1 {
--		brcm,pins = <2 3>;
--		brcm,function = <BCM2835_FSEL_ALT0>;
--		brcm,pull = <BCM2835_PUD_UP>;
--	};
--
--	i2c3_pins: i2c3 {
--		brcm,pins = <4 5>;
--		brcm,function = <BCM2835_FSEL_ALT5>;
--		brcm,pull = <BCM2835_PUD_UP>;
--	};
--
--	i2c4_pins: i2c4 {
--		brcm,pins = <8 9>;
--		brcm,function = <BCM2835_FSEL_ALT5>;
--		brcm,pull = <BCM2835_PUD_UP>;
--	};
--
--	i2c5_pins: i2c5 {
--		brcm,pins = <12 13>;
--		brcm,function = <BCM2835_FSEL_ALT5>;
--		brcm,pull = <BCM2835_PUD_UP>;
--	};
--
--	i2c6_pins: i2c6 {
--		brcm,pins = <22 23>;
--		brcm,function = <BCM2835_FSEL_ALT5>;
--		brcm,pull = <BCM2835_PUD_UP>;
--	};
--
--	i2s_pins: i2s {
--		brcm,pins = <18 19 20 21>;
--		brcm,function = <BCM2835_FSEL_ALT0>;
--	};
--
--	sdio_pins: sdio_pins {
--		brcm,pins =     <34 35 36 37 38 39>;
--		brcm,function = <BCM2835_FSEL_ALT3>; // alt3 = SD1
--		brcm,pull =     <0 2 2 2 2 2>;
--	};
--
- 	bt_pins: bt_pins {
- 		brcm,pins = "-"; // non-empty to keep btuart happy, //4 = 0
- 				 // to fool pinctrl
-@@ -440,30 +343,6 @@
- 		brcm,function = <BCM2835_FSEL_ALT5>; /* alt5=UART1 */
- 		brcm,pull = <0 2 2 0>;
- 	};
--
--	uart2_pins: uart2_pins {
--		brcm,pins = <0 1>;
--		brcm,function = <BCM2835_FSEL_ALT4>;
--		brcm,pull = <0 2>;
--	};
--
--	uart3_pins: uart3_pins {
--		brcm,pins = <4 5>;
--		brcm,function = <BCM2835_FSEL_ALT4>;
--		brcm,pull = <0 2>;
--	};
--
--	uart4_pins: uart4_pins {
--		brcm,pins = <8 9>;
--		brcm,function = <BCM2835_FSEL_ALT4>;
--		brcm,pull = <0 2>;
--	};
--
--	uart5_pins: uart5_pins {
--		brcm,pins = <12 13>;
--		brcm,function = <BCM2835_FSEL_ALT4>;
--		brcm,pull = <0 2>;
--	};
- };
- 
- &i2c0if {
---- a/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
-@@ -200,132 +200,11 @@
- };
- 
- &gpio {
--	spi0_pins: spi0_pins {
--		brcm,pins = <9 10 11>;
--		brcm,function = <BCM2835_FSEL_ALT0>;
--	};
--
--	spi0_cs_pins: spi0_cs_pins {
--		brcm,pins = <8 7>;
--		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
--	};
--
--	spi3_pins: spi3_pins {
--		brcm,pins = <1 2 3>;
--		brcm,function = <BCM2835_FSEL_ALT3>;
--	};
--
--	spi3_cs_pins: spi3_cs_pins {
--		brcm,pins = <0 24>;
--		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
--	};
--
--	spi4_pins: spi4_pins {
--		brcm,pins = <5 6 7>;
--		brcm,function = <BCM2835_FSEL_ALT3>;
--	};
--
--	spi4_cs_pins: spi4_cs_pins {
--		brcm,pins = <4 25>;
--		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
--	};
--
--	spi5_pins: spi5_pins {
--		brcm,pins = <13 14 15>;
--		brcm,function = <BCM2835_FSEL_ALT3>;
--	};
--
--	spi5_cs_pins: spi5_cs_pins {
--		brcm,pins = <12 26>;
--		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
--	};
--
--	spi6_pins: spi6_pins {
--		brcm,pins = <19 20 21>;
--		brcm,function = <BCM2835_FSEL_ALT3>;
--	};
--
--	spi6_cs_pins: spi6_cs_pins {
--		brcm,pins = <18 27>;
--		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
--	};
--
--	i2c0_pins: i2c0 {
--		brcm,pins = <0 1>;
--		brcm,function = <BCM2835_FSEL_ALT0>;
--		brcm,pull = <BCM2835_PUD_UP>;
--	};
--
--	i2c1_pins: i2c1 {
--		brcm,pins = <2 3>;
--		brcm,function = <BCM2835_FSEL_ALT0>;
--		brcm,pull = <BCM2835_PUD_UP>;
--	};
--
--	i2c3_pins: i2c3 {
--		brcm,pins = <4 5>;
--		brcm,function = <BCM2835_FSEL_ALT5>;
--		brcm,pull = <BCM2835_PUD_UP>;
--	};
--
--	i2c4_pins: i2c4 {
--		brcm,pins = <8 9>;
--		brcm,function = <BCM2835_FSEL_ALT5>;
--		brcm,pull = <BCM2835_PUD_UP>;
--	};
--
--	i2c5_pins: i2c5 {
--		brcm,pins = <12 13>;
--		brcm,function = <BCM2835_FSEL_ALT5>;
--		brcm,pull = <BCM2835_PUD_UP>;
--	};
--
--	i2c6_pins: i2c6 {
--		brcm,pins = <22 23>;
--		brcm,function = <BCM2835_FSEL_ALT5>;
--		brcm,pull = <BCM2835_PUD_UP>;
--	};
--
--	i2s_pins: i2s {
--		brcm,pins = <18 19 20 21>;
--		brcm,function = <BCM2835_FSEL_ALT0>;
--	};
--
--	sdio_pins: sdio_pins {
--		brcm,pins =     <34 35 36 37 38 39>;
--		brcm,function = <BCM2835_FSEL_ALT3>; // alt3 = SD1
--		brcm,pull =     <0 2 2 2 2 2>;
--	};
--
- 	uart0_pins: uart0_pins {
- 		brcm,pins;
- 		brcm,function;
- 		brcm,pull;
- 	};
--
--	uart2_pins: uart2_pins {
--		brcm,pins = <0 1>;
--		brcm,function = <BCM2835_FSEL_ALT4>;
--		brcm,pull = <0 2>;
--	};
--
--	uart3_pins: uart3_pins {
--		brcm,pins = <4 5>;
--		brcm,function = <BCM2835_FSEL_ALT4>;
--		brcm,pull = <0 2>;
--	};
--
--	uart4_pins: uart4_pins {
--		brcm,pins = <8 9>;
--		brcm,function = <BCM2835_FSEL_ALT4>;
--		brcm,pull = <0 2>;
--	};
--
--	uart5_pins: uart5_pins {
--		brcm,pins = <12 13>;
--		brcm,function = <BCM2835_FSEL_ALT4>;
--		brcm,pull = <0 2>;
--	};
- };
- 
- &i2c0if {
---- a/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
-+++ b/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
-@@ -171,6 +171,127 @@
- &gpio {
- 	interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,
- 		     <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
-+
-+	spi0_pins: spi0_pins {
-+		brcm,pins = <9 10 11>;
-+		brcm,function = <BCM2835_FSEL_ALT0>;
-+	};
-+
-+	spi0_cs_pins: spi0_cs_pins {
-+		brcm,pins = <8 7>;
-+		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
-+	};
-+
-+	spi3_pins: spi3_pins {
-+		brcm,pins = <1 2 3>;
-+		brcm,function = <BCM2835_FSEL_ALT3>;
-+	};
-+
-+	spi3_cs_pins: spi3_cs_pins {
-+		brcm,pins = <0 24>;
-+		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
-+	};
-+
-+	spi4_pins: spi4_pins {
-+		brcm,pins = <5 6 7>;
-+		brcm,function = <BCM2835_FSEL_ALT3>;
-+	};
-+
-+	spi4_cs_pins: spi4_cs_pins {
-+		brcm,pins = <4 25>;
-+		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
-+	};
-+
-+	spi5_pins: spi5_pins {
-+		brcm,pins = <13 14 15>;
-+		brcm,function = <BCM2835_FSEL_ALT3>;
-+	};
-+
-+	spi5_cs_pins: spi5_cs_pins {
-+		brcm,pins = <12 26>;
-+		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
-+	};
-+
-+	spi6_pins: spi6_pins {
-+		brcm,pins = <19 20 21>;
-+		brcm,function = <BCM2835_FSEL_ALT3>;
-+	};
-+
-+	spi6_cs_pins: spi6_cs_pins {
-+		brcm,pins = <18 27>;
-+		brcm,function = <BCM2835_FSEL_GPIO_OUT>;
-+	};
-+
-+	i2c0_pins: i2c0 {
-+		brcm,pins = <0 1>;
-+		brcm,function = <BCM2835_FSEL_ALT0>;
-+		brcm,pull = <BCM2835_PUD_UP>;
-+	};
-+
-+	i2c1_pins: i2c1 {
-+		brcm,pins = <2 3>;
-+		brcm,function = <BCM2835_FSEL_ALT0>;
-+		brcm,pull = <BCM2835_PUD_UP>;
-+	};
-+
-+	i2c3_pins: i2c3 {
-+		brcm,pins = <4 5>;
-+		brcm,function = <BCM2835_FSEL_ALT5>;
-+		brcm,pull = <BCM2835_PUD_UP>;
-+	};
-+
-+	i2c4_pins: i2c4 {
-+		brcm,pins = <8 9>;
-+		brcm,function = <BCM2835_FSEL_ALT5>;
-+		brcm,pull = <BCM2835_PUD_UP>;
-+	};
-+
-+	i2c5_pins: i2c5 {
-+		brcm,pins = <12 13>;
-+		brcm,function = <BCM2835_FSEL_ALT5>;
-+		brcm,pull = <BCM2835_PUD_UP>;
-+	};
-+
-+	i2c6_pins: i2c6 {
-+		brcm,pins = <22 23>;
-+		brcm,function = <BCM2835_FSEL_ALT5>;
-+		brcm,pull = <BCM2835_PUD_UP>;
-+	};
-+
-+	i2s_pins: i2s {
-+		brcm,pins = <18 19 20 21>;
-+		brcm,function = <BCM2835_FSEL_ALT0>;
-+	};
-+
-+	sdio_pins: sdio_pins {
-+		brcm,pins =     <34 35 36 37 38 39>;
-+		brcm,function = <BCM2835_FSEL_ALT3>; // alt3 = SD1
-+		brcm,pull =     <0 2 2 2 2 2>;
-+	};
-+
-+	uart2_pins: uart2_pins {
-+		brcm,pins = <0 1>;
-+		brcm,function = <BCM2835_FSEL_ALT4>;
-+		brcm,pull = <0 2>;
-+	};
-+
-+	uart3_pins: uart3_pins {
-+		brcm,pins = <4 5>;
-+		brcm,function = <BCM2835_FSEL_ALT4>;
-+		brcm,pull = <0 2>;
-+	};
-+
-+	uart4_pins: uart4_pins {
-+		brcm,pins = <8 9>;
-+		brcm,function = <BCM2835_FSEL_ALT4>;
-+		brcm,pull = <0 2>;
-+	};
-+
-+	uart5_pins: uart5_pins {
-+		brcm,pins = <12 13>;
-+		brcm,function = <BCM2835_FSEL_ALT4>;
-+		brcm,pull = <0 2>;
-+	};
- };
- 
- &emmc2 {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0707-ARM-dts-bcm2711-rpi-ds-Set-default-I-O-pins.patch b/target/linux/bcm27xx/patches-6.1/950-0707-ARM-dts-bcm2711-rpi-ds-Set-default-I-O-pins.patch
deleted file mode 100644
index caeba6f71f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0707-ARM-dts-bcm2711-rpi-ds-Set-default-I-O-pins.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 4dda6d4ab43c8628066b0c0f72107249cfb86d39 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 9 May 2023 14:20:58 +0100
-Subject: [PATCH] ARM: dts: bcm2711-rpi-ds: Set default I/O pins
-
-Give all the extended I/O interfaces - I2C3-6, SPI3-6 and UART2-5 -
-sensible default pinctrl references.
-
-See: https://github.com/raspberrypi/linux/pull/5443
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2711-rpi-ds.dtsi | 60 +++++++++++++++++++++++++++
- 1 file changed, 60 insertions(+)
-
---- a/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
-+++ b/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
-@@ -418,6 +418,66 @@
- i2c_arm: &i2c1 {};
- i2c_vc: &i2c0 {};
- 
-+&i2c3 {
-+	pinctrl-0 = <&i2c3_pins>;
-+	pinctrl-names = "default";
-+};
-+
-+&i2c4 {
-+	pinctrl-0 = <&i2c4_pins>;
-+	pinctrl-names = "default";
-+};
-+
-+&i2c5 {
-+	pinctrl-0 = <&i2c5_pins>;
-+	pinctrl-names = "default";
-+};
-+
-+&i2c6 {
-+	pinctrl-0 = <&i2c6_pins>;
-+	pinctrl-names = "default";
-+};
-+
-+&spi3 {
-+	pinctrl-0 = <&spi3_pins &spi3_cs_pins>;
-+	pinctrl-names = "default";
-+};
-+
-+&spi4 {
-+	pinctrl-0 = <&spi4_pins &spi4_cs_pins>;
-+	pinctrl-names = "default";
-+};
-+
-+&spi5 {
-+	pinctrl-0 = <&spi5_pins &spi5_cs_pins>;
-+	pinctrl-names = "default";
-+};
-+
-+&spi6 {
-+	pinctrl-0 = <&spi6_pins &spi6_cs_pins>;
-+	pinctrl-names = "default";
-+};
-+
-+&uart2 {
-+	pinctrl-0 = <&uart2_pins>;
-+	pinctrl-names = "default";
-+};
-+
-+&uart3 {
-+	pinctrl-0 = <&uart3_pins>;
-+	pinctrl-names = "default";
-+};
-+
-+&uart4 {
-+	pinctrl-0 = <&uart4_pins>;
-+	pinctrl-names = "default";
-+};
-+
-+&uart5 {
-+	pinctrl-0 = <&uart5_pins>;
-+	pinctrl-names = "default";
-+};
-+
- /delete-node/ &v3d;
- 
- / {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0708-overlays-bcm2711-Remove-I-O-pinctrl-references.patch b/target/linux/bcm27xx/patches-6.1/950-0708-overlays-bcm2711-Remove-I-O-pinctrl-references.patch
deleted file mode 100644
index 2694e82d62..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0708-overlays-bcm2711-Remove-I-O-pinctrl-references.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-From 9cd4f409e6d78aad4b70ef16810526ebc6bc24de Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 9 May 2023 14:25:10 +0100
-Subject: [PATCH] overlays: bcm2711: Remove I/O pinctrl references
-
-Now that the base bcm2711 base dts files give the added I/O interfaces
-references to the default pinctrl nodes, remove the same from their
-respective overlays.
-
-See: https://github.com/raspberrypi/linux/pull/5443
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/i2c3-overlay.dts     | 2 --
- arch/arm/boot/dts/overlays/i2c4-overlay.dts     | 2 --
- arch/arm/boot/dts/overlays/i2c5-overlay.dts     | 2 --
- arch/arm/boot/dts/overlays/i2c6-overlay.dts     | 2 --
- arch/arm/boot/dts/overlays/spi3-1cs-overlay.dts | 2 --
- arch/arm/boot/dts/overlays/spi3-2cs-overlay.dts | 2 --
- arch/arm/boot/dts/overlays/spi4-1cs-overlay.dts | 2 --
- arch/arm/boot/dts/overlays/spi4-2cs-overlay.dts | 2 --
- arch/arm/boot/dts/overlays/spi5-1cs-overlay.dts | 2 --
- arch/arm/boot/dts/overlays/spi5-2cs-overlay.dts | 2 --
- arch/arm/boot/dts/overlays/spi6-1cs-overlay.dts | 2 --
- arch/arm/boot/dts/overlays/spi6-2cs-overlay.dts | 2 --
- arch/arm/boot/dts/overlays/uart2-overlay.dts    | 2 --
- arch/arm/boot/dts/overlays/uart3-overlay.dts    | 2 --
- arch/arm/boot/dts/overlays/uart4-overlay.dts    | 2 --
- arch/arm/boot/dts/overlays/uart5-overlay.dts    | 2 --
- 16 files changed, 32 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/i2c3-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/i2c3-overlay.dts
-@@ -8,8 +8,6 @@
- 		target = <&i2c3>;
- 		frag0: __overlay__ {
- 			status = "okay";
--			pinctrl-names = "default";
--			pinctrl-0 = <&i2c3_pins>;
- 			clock-frequency = <100000>;
- 		};
- 	};
---- a/arch/arm/boot/dts/overlays/i2c4-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/i2c4-overlay.dts
-@@ -8,8 +8,6 @@
- 		target = <&i2c4>;
- 		frag0: __overlay__ {
- 			status = "okay";
--			pinctrl-names = "default";
--			pinctrl-0 = <&i2c4_pins>;
- 			clock-frequency = <100000>;
- 		};
- 	};
---- a/arch/arm/boot/dts/overlays/i2c5-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/i2c5-overlay.dts
-@@ -8,8 +8,6 @@
- 		target = <&i2c5>;
- 		frag0: __overlay__ {
- 			status = "okay";
--			pinctrl-names = "default";
--			pinctrl-0 = <&i2c5_pins>;
- 			clock-frequency = <100000>;
- 		};
- 	};
---- a/arch/arm/boot/dts/overlays/i2c6-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/i2c6-overlay.dts
-@@ -8,8 +8,6 @@
- 		target = <&i2c6>;
- 		frag0: __overlay__ {
- 			status = "okay";
--			pinctrl-names = "default";
--			pinctrl-0 = <&i2c6_pins>;
- 			clock-frequency = <100000>;
- 		};
- 	};
---- a/arch/arm/boot/dts/overlays/spi3-1cs-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/spi3-1cs-overlay.dts
-@@ -20,8 +20,6 @@
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 
--			pinctrl-names = "default";
--		        pinctrl-0 = <&spi3_pins &spi3_cs_pins>;
- 			cs-gpios = <&gpio 0 1>;
- 			status = "okay";
- 
---- a/arch/arm/boot/dts/overlays/spi3-2cs-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/spi3-2cs-overlay.dts
-@@ -20,8 +20,6 @@
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 
--			pinctrl-names = "default";
--		        pinctrl-0 = <&spi3_pins &spi3_cs_pins>;
- 			cs-gpios = <&gpio 0 1>, <&gpio 24 1>;
- 			status = "okay";
- 
---- a/arch/arm/boot/dts/overlays/spi4-1cs-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/spi4-1cs-overlay.dts
-@@ -20,8 +20,6 @@
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 
--			pinctrl-names = "default";
--		        pinctrl-0 = <&spi4_pins &spi4_cs_pins>;
- 			cs-gpios = <&gpio 4 1>;
- 			status = "okay";
- 
---- a/arch/arm/boot/dts/overlays/spi4-2cs-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/spi4-2cs-overlay.dts
-@@ -20,8 +20,6 @@
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 
--			pinctrl-names = "default";
--		        pinctrl-0 = <&spi4_pins &spi4_cs_pins>;
- 			cs-gpios = <&gpio 4 1>, <&gpio 25 1>;
- 			status = "okay";
- 
---- a/arch/arm/boot/dts/overlays/spi5-1cs-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/spi5-1cs-overlay.dts
-@@ -20,8 +20,6 @@
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 
--			pinctrl-names = "default";
--		        pinctrl-0 = <&spi5_pins &spi5_cs_pins>;
- 			cs-gpios = <&gpio 12 1>;
- 			status = "okay";
- 
---- a/arch/arm/boot/dts/overlays/spi5-2cs-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/spi5-2cs-overlay.dts
-@@ -20,8 +20,6 @@
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 
--			pinctrl-names = "default";
--		        pinctrl-0 = <&spi5_pins &spi5_cs_pins>;
- 			cs-gpios = <&gpio 12 1>, <&gpio 26 1>;
- 			status = "okay";
- 
---- a/arch/arm/boot/dts/overlays/spi6-1cs-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/spi6-1cs-overlay.dts
-@@ -20,8 +20,6 @@
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 
--			pinctrl-names = "default";
--		        pinctrl-0 = <&spi6_pins &spi6_cs_pins>;
- 			cs-gpios = <&gpio 18 1>;
- 			status = "okay";
- 
---- a/arch/arm/boot/dts/overlays/spi6-2cs-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/spi6-2cs-overlay.dts
-@@ -20,8 +20,6 @@
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 
--			pinctrl-names = "default";
--		        pinctrl-0 = <&spi6_pins &spi6_cs_pins>;
- 			cs-gpios = <&gpio 18 1>, <&gpio 27 1>;
- 			status = "okay";
- 
---- a/arch/arm/boot/dts/overlays/uart2-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/uart2-overlay.dts
-@@ -7,8 +7,6 @@
- 	fragment@0 {
- 		target = <&uart2>;
- 		__overlay__ {
--			pinctrl-names = "default";
--			pinctrl-0 = <&uart2_pins>;
- 			status = "okay";
- 		};
- 	};
---- a/arch/arm/boot/dts/overlays/uart3-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/uart3-overlay.dts
-@@ -7,8 +7,6 @@
- 	fragment@0 {
- 		target = <&uart3>;
- 		__overlay__ {
--			pinctrl-names = "default";
--			pinctrl-0 = <&uart3_pins>;
- 			status = "okay";
- 		};
- 	};
---- a/arch/arm/boot/dts/overlays/uart4-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/uart4-overlay.dts
-@@ -7,8 +7,6 @@
- 	fragment@0 {
- 		target = <&uart4>;
- 		__overlay__ {
--			pinctrl-names = "default";
--			pinctrl-0 = <&uart4_pins>;
- 			status = "okay";
- 		};
- 	};
---- a/arch/arm/boot/dts/overlays/uart5-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/uart5-overlay.dts
-@@ -7,8 +7,6 @@
- 	fragment@0 {
- 		target = <&uart5>;
- 		__overlay__ {
--			pinctrl-names = "default";
--			pinctrl-0 = <&uart5_pins>;
- 			status = "okay";
- 		};
- 	};
diff --git a/target/linux/bcm27xx/patches-6.1/950-0709-ARM-dts-bcm27xx-Correct-the-dma-ranges.patch b/target/linux/bcm27xx/patches-6.1/950-0709-ARM-dts-bcm27xx-Correct-the-dma-ranges.patch
deleted file mode 100644
index 88be17f62e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0709-ARM-dts-bcm27xx-Correct-the-dma-ranges.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 96c1d3649471109b3da9fc04797fa84f8cab4c81 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 11 May 2023 09:59:04 +0100
-Subject: [PATCH] ARM: dts: bcm27xx: Correct the dma-ranges
-
-Step one of using DMA addresses the intended way is to make sure that
-the mapping between CPU physical addresses and DMA addresses in Device
-Tree is complete and correct.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2708.dtsi        |  3 ++-
- arch/arm/boot/dts/bcm2709.dtsi        |  3 +++
- arch/arm/boot/dts/bcm2710.dtsi        |  3 +++
- arch/arm/boot/dts/bcm2711-rpi-ds.dtsi | 13 ++++++++++++-
- 4 files changed, 20 insertions(+), 2 deletions(-)
-
---- a/arch/arm/boot/dts/bcm2708.dtsi
-+++ b/arch/arm/boot/dts/bcm2708.dtsi
-@@ -10,7 +10,8 @@
- };
- 
- &soc {
--	dma-ranges = <0x80000000 0x00000000 0x20000000>;
-+	dma-ranges = <0x80000000 0x00000000 0x20000000>,
-+		     <0x7e000000 0x20000000 0x02000000>;
- };
- 
- &vc4 {
---- a/arch/arm/boot/dts/bcm2709.dtsi
-+++ b/arch/arm/boot/dts/bcm2709.dtsi
-@@ -8,6 +8,9 @@
- 		ranges = <0x7e000000 0x3f000000 0x01000000>,
- 		         <0x40000000 0x40000000 0x00040000>;
- 
-+		dma-ranges = <0xc0000000 0x00000000 0x3f000000>,
-+			     <0x7e000000 0x3f000000 0x01000000>;
-+
- 		/delete-node/ timer@7e003000;
- 	};
- 
---- a/arch/arm/boot/dts/bcm2710.dtsi
-+++ b/arch/arm/boot/dts/bcm2710.dtsi
-@@ -11,6 +11,9 @@
- 	};
- 
- 	soc {
-+		dma-ranges = <0xc0000000 0x00000000 0x3f000000>,
-+			     <0x7e000000 0x3f000000 0x01000000>;
-+
- 		/delete-node/ timer@7e003000;
- 	};
- 
---- a/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
-+++ b/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
-@@ -18,6 +18,10 @@
- 	     /* Add a label */
- 	};
- 
-+	soc: soc {
-+	     /* Add a label */
-+	};
-+
- 	arm-pmu {
- 		compatible = "arm,cortex-a72-pmu", "arm,armv8-pmuv3", "arm,cortex-a7-pmu";
- 
-@@ -64,6 +68,12 @@
- 	alloc-ranges = <0x0 0x00000000 0x30000000>;
- };
- 
-+&soc {
-+	/* Add the physical <-> DMA mapping for the I/O space */
-+	dma-ranges = <0xc0000000  0x0 0x00000000  0x40000000>,
-+		     <0x7c000000  0x0 0xfc000000  0x03800000>;
-+};
-+
- &scb {
- 	#size-cells = <2>;
- 
-@@ -71,7 +81,8 @@
- 		 <0x0 0x40000000  0x0 0xff800000  0x0 0x00800000>,
- 		 <0x6 0x00000000  0x6 0x00000000  0x0 0x40000000>,
- 		 <0x0 0x00000000  0x0 0x00000000  0x0 0xfc000000>;
--	dma-ranges = <0x0 0x00000000  0x0 0x00000000  0x4 0x00000000>;
-+	dma-ranges = <0x4 0x7c000000  0x0 0xfc000000  0x0 0x03800000>,
-+		     <0x0 0x00000000  0x0 0x00000000  0x4 0x00000000>;
- 
- 	dma40: dma@7e007b00 {
- 		compatible = "brcm,bcm2711-dma";
diff --git a/target/linux/bcm27xx/patches-6.1/950-0710-bcm2835-dma-Derive-slave-DMA-addresses-correctly.patch b/target/linux/bcm27xx/patches-6.1/950-0710-bcm2835-dma-Derive-slave-DMA-addresses-correctly.patch
deleted file mode 100644
index 548f8c1145..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0710-bcm2835-dma-Derive-slave-DMA-addresses-correctly.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 6d317d92627736a94e6c1c4b49c3f63cc33c28aa Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 11 May 2023 10:00:01 +0100
-Subject: [PATCH] bcm2835-dma: Derive slave DMA addresses correctly
-
-Slave addresses for DMA are meant to be supplied as physical addresses
-(contrary to what struct snd_dmaengine_dai_dma_data does). It is up to
-the DMA controller driver to perform the translation based on its own
-view of the world, as described in Device Tree.
-
-Now that the Pi Device Trees have the correct peripheral mappings,
-replace the hacky address munging with phys_to_dma().
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/dma/bcm2835-dma.c | 23 +++++------------------
- 1 file changed, 5 insertions(+), 18 deletions(-)
-
---- a/drivers/dma/bcm2835-dma.c
-+++ b/drivers/dma/bcm2835-dma.c
-@@ -18,6 +18,7 @@
-  *	Copyright 2012 Marvell International Ltd.
-  */
- #include <linux/dmaengine.h>
-+#include <linux/dma-direct.h>
- #include <linux/dma-mapping.h>
- #include <linux/dmapool.h>
- #include <linux/err.h>
-@@ -910,22 +911,12 @@ static struct dma_async_tx_descriptor *b
- 	if (direction == DMA_DEV_TO_MEM) {
- 		if (c->cfg.src_addr_width != DMA_SLAVE_BUSWIDTH_4_BYTES)
- 			return NULL;
--		src = c->cfg.src_addr;
--		/*
--		 * One would think it ought to be possible to get the physical
--		 * to dma address mapping information from the dma-ranges DT
--		 * property, but I've not found a way yet that doesn't involve
--		 * open-coding the whole thing.
--		 */
--		if (c->is_40bit_channel)
--		    src |= 0x400000000ull;
-+		src = phys_to_dma(chan->device->dev, c->cfg.src_addr);
- 		info |= BCM2835_DMA_S_DREQ | BCM2835_DMA_D_INC;
- 	} else {
- 		if (c->cfg.dst_addr_width != DMA_SLAVE_BUSWIDTH_4_BYTES)
- 			return NULL;
--		dst = c->cfg.dst_addr;
--		if (c->is_40bit_channel)
--		    dst |= 0x400000000ull;
-+		dst = phys_to_dma(chan->device->dev, c->cfg.dst_addr);
- 		info |= BCM2835_DMA_D_DREQ | BCM2835_DMA_S_INC;
- 	}
- 
-@@ -994,17 +985,13 @@ static struct dma_async_tx_descriptor *b
- 	if (direction == DMA_DEV_TO_MEM) {
- 		if (c->cfg.src_addr_width != DMA_SLAVE_BUSWIDTH_4_BYTES)
- 			return NULL;
--		src = c->cfg.src_addr;
--		if (c->is_40bit_channel)
--		    src |= 0x400000000ull;
-+		src = phys_to_dma(chan->device->dev, c->cfg.src_addr);
- 		dst = buf_addr;
- 		info |= BCM2835_DMA_S_DREQ | BCM2835_DMA_D_INC;
- 	} else {
- 		if (c->cfg.dst_addr_width != DMA_SLAVE_BUSWIDTH_4_BYTES)
- 			return NULL;
--		dst = c->cfg.dst_addr;
--		if (c->is_40bit_channel)
--		    dst |= 0x400000000ull;
-+		dst = phys_to_dma(chan->device->dev, c->cfg.dst_addr);
- 		src = buf_addr;
- 		info |= BCM2835_DMA_D_DREQ | BCM2835_DMA_S_INC;
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0711-ASoC-bcm2835-i2s-Use-phys-addresses-for-DAI-DMA.patch b/target/linux/bcm27xx/patches-6.1/950-0711-ASoC-bcm2835-i2s-Use-phys-addresses-for-DAI-DMA.patch
deleted file mode 100644
index fd4917b023..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0711-ASoC-bcm2835-i2s-Use-phys-addresses-for-DAI-DMA.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 6ecbde16d1e4f1ffd8e7e7e535f01942df8963f4 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 11 May 2023 10:07:45 +0100
-Subject: [PATCH] ASoC: bcm2835-i2s: Use phys addresses for DAI DMA
-
-Contrary to what struct snd_dmaengine_dai_dma_data suggests, the
-configuration of addresses of DMA slave interfaces should be done in
-CPU physical addresses.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- sound/soc/bcm/bcm2835-i2s.c | 18 ++++--------------
- 1 file changed, 4 insertions(+), 14 deletions(-)
-
---- a/sound/soc/bcm/bcm2835-i2s.c
-+++ b/sound/soc/bcm/bcm2835-i2s.c
-@@ -30,7 +30,6 @@
- #include <linux/init.h>
- #include <linux/io.h>
- #include <linux/module.h>
--#include <linux/of_address.h>
- #include <linux/slab.h>
- 
- #include <sound/core.h>
-@@ -830,8 +829,7 @@ static int bcm2835_i2s_probe(struct plat
- 	struct bcm2835_i2s_dev *dev;
- 	int ret;
- 	void __iomem *base;
--	const __be32 *addr;
--	dma_addr_t dma_base;
-+	struct resource *res;
- 
- 	dev = devm_kzalloc(&pdev->dev, sizeof(*dev),
- 			   GFP_KERNEL);
-@@ -846,7 +844,7 @@ static int bcm2835_i2s_probe(struct plat
- 				     "could not get clk\n");
- 
- 	/* Request ioarea */
--	base = devm_platform_ioremap_resource(pdev, 0);
-+	base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
- 	if (IS_ERR(base))
- 		return PTR_ERR(base);
- 
-@@ -855,19 +853,11 @@ static int bcm2835_i2s_probe(struct plat
- 	if (IS_ERR(dev->i2s_regmap))
- 		return PTR_ERR(dev->i2s_regmap);
- 
--	/* Set the DMA address - we have to parse DT ourselves */
--	addr = of_get_address(pdev->dev.of_node, 0, NULL, NULL);
--	if (!addr) {
--		dev_err(&pdev->dev, "could not get DMA-register address\n");
--		return -EINVAL;
--	}
--	dma_base = be32_to_cpup(addr);
--
- 	dev->dma_data[SNDRV_PCM_STREAM_PLAYBACK].addr =
--		dma_base + BCM2835_I2S_FIFO_A_REG;
-+		res->start + BCM2835_I2S_FIFO_A_REG;
- 
- 	dev->dma_data[SNDRV_PCM_STREAM_CAPTURE].addr =
--		dma_base + BCM2835_I2S_FIFO_A_REG;
-+		res->start + BCM2835_I2S_FIFO_A_REG;
- 
- 	/* Set the bus width */
- 	dev->dma_data[SNDRV_PCM_STREAM_PLAYBACK].addr_width =
diff --git a/target/linux/bcm27xx/patches-6.1/950-0712-drm-vc4-Use-phys-addresses-for-slave-DMA-config.patch b/target/linux/bcm27xx/patches-6.1/950-0712-drm-vc4-Use-phys-addresses-for-slave-DMA-config.patch
deleted file mode 100644
index 04967b5294..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0712-drm-vc4-Use-phys-addresses-for-slave-DMA-config.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From ae6d666715a795257698f97caf1891d90a6a50e4 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 11 May 2023 16:08:15 +0100
-Subject: [PATCH] drm/vc4: Use phys addresses for slave DMA config
-
-Slave addresses for DMA are meant to be supplied as physical addresses
-(contrary to what struct snd_dmaengine_dai_dma_data does).
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_hdmi.c | 15 ++++-----------
- 1 file changed, 4 insertions(+), 11 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hdmi.c
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -2719,7 +2719,7 @@ static int vc4_hdmi_audio_init(struct vc
- 	struct snd_soc_card *card = &vc4_hdmi->audio.card;
- 	struct device *dev = &vc4_hdmi->pdev->dev;
- 	struct platform_device *codec_pdev;
--	const __be32 *addr;
-+	struct resource *iomem;
- 	int index, len;
- 	int ret;
- 
-@@ -2755,22 +2755,15 @@ static int vc4_hdmi_audio_init(struct vc
- 	}
- 
- 	/*
--	 * Get the physical address of VC4_HD_MAI_DATA. We need to retrieve
--	 * the bus address specified in the DT, because the physical address
--	 * (the one returned by platform_get_resource()) is not appropriate
--	 * for DMA transfers.
--	 * This VC/MMU should probably be exposed to avoid this kind of hacks.
-+	 * Get the physical address of VC4_HD_MAI_DATA.
- 	 */
- 	index = of_property_match_string(dev->of_node, "reg-names", "hd");
- 	/* Before BCM2711, we don't have a named register range */
- 	if (index < 0)
- 		index = 1;
-+	iomem = platform_get_resource(vc4_hdmi->pdev, IORESOURCE_MEM, index);
- 
--	addr = of_get_address(dev->of_node, index, NULL, NULL);
--	if (!addr)
--		return -EINVAL;
--
--	vc4_hdmi->audio.dma_data.addr = be32_to_cpup(addr) + mai_data->offset;
-+	vc4_hdmi->audio.dma_data.addr = iomem->start + mai_data->offset;
- 	vc4_hdmi->audio.dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
- 	vc4_hdmi->audio.dma_data.maxburst = 2;
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0713-bcm2835-smi-Use-phys-addresses-for-slave-DMA-config.patch b/target/linux/bcm27xx/patches-6.1/950-0713-bcm2835-smi-Use-phys-addresses-for-slave-DMA-config.patch
deleted file mode 100644
index 382821a193..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0713-bcm2835-smi-Use-phys-addresses-for-slave-DMA-config.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From a226d75cbc55d5cf6b433565af2de1dbf89c9232 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 11 May 2023 16:10:52 +0100
-Subject: [PATCH] bcm2835-smi: Use phys addresses for slave DMA config
-
-Contrary to what struct snd_dmaengine_dai_dma_data suggests, the
-configuration of addresses of DMA slave interfaces should be done in
-CPU physical addresses.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/misc/bcm2835_smi.c | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
---- a/drivers/misc/bcm2835_smi.c
-+++ b/drivers/misc/bcm2835_smi.c
-@@ -64,7 +64,7 @@ struct bcm2835_smi_instance {
- 	struct device *dev;
- 	struct smi_settings settings;
- 	__iomem void *smi_regs_ptr;
--	dma_addr_t smi_regs_busaddr;
-+	phys_addr_t smi_regs_busaddr;
- 
- 	struct dma_chan *dma_chan;
- 	struct dma_slave_config dma_config;
-@@ -858,7 +858,6 @@ static int bcm2835_smi_probe(struct plat
- 	struct device_node *node = dev->of_node;
- 	struct resource *ioresource;
- 	struct bcm2835_smi_instance *inst;
--	const __be32 *addr;
- 
- 	/* We require device tree support */
- 	if (!node)
-@@ -872,14 +871,13 @@ static int bcm2835_smi_probe(struct plat
- 	inst->dev = dev;
- 	spin_lock_init(&inst->transaction_lock);
- 
--	ioresource = platform_get_resource(pdev, IORESOURCE_MEM, 0);
--	inst->smi_regs_ptr = devm_ioremap_resource(dev, ioresource);
-+	inst->smi_regs_ptr = devm_platform_get_and_ioremap_resource(pdev, 0,
-+								    &ioresource);
- 	if (IS_ERR(inst->smi_regs_ptr)) {
- 		err = PTR_ERR(inst->smi_regs_ptr);
- 		goto err;
- 	}
--	addr = of_get_address(node, 0, NULL, NULL);
--	inst->smi_regs_busaddr = be32_to_cpu(*addr);
-+	inst->smi_regs_busaddr = ioresource->start;
- 
- 	err = bcm2835_smi_dma_setup(inst);
- 	if (err)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0714-bcm2835-mmc-Use-phys-addresses-for-slave-DMA-config.patch b/target/linux/bcm27xx/patches-6.1/950-0714-bcm2835-mmc-Use-phys-addresses-for-slave-DMA-config.patch
deleted file mode 100644
index f52e9438f0..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0714-bcm2835-mmc-Use-phys-addresses-for-slave-DMA-config.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From b4c2f9c2f928b8481d85569ebd4efa419d29cfdb Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 11 May 2023 16:19:57 +0100
-Subject: [PATCH] bcm2835-mmc: Use phys addresses for slave DMA config
-
-Contrary to what struct snd_dmaengine_dai_dma_data suggests, the
-configuration of addresses of DMA slave interfaces should be done in
-CPU physical addresses.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/mmc/host/bcm2835-mmc.c | 16 +---------------
- 1 file changed, 1 insertion(+), 15 deletions(-)
-
---- a/drivers/mmc/host/bcm2835-mmc.c
-+++ b/drivers/mmc/host/bcm2835-mmc.c
-@@ -1404,7 +1404,6 @@ static int bcm2835_mmc_probe(struct plat
- 	struct resource *iomem;
- 	struct bcm2835_host *host;
- 	struct mmc_host *mmc;
--	const __be32 *addr;
- 	int ret;
- 
- 	mmc = mmc_alloc_host(sizeof(*host), dev);
-@@ -1417,25 +1416,12 @@ static int bcm2835_mmc_probe(struct plat
- 	host->timeout = msecs_to_jiffies(1000);
- 	spin_lock_init(&host->lock);
- 
--	iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
--	host->ioaddr = devm_ioremap_resource(dev, iomem);
-+	host->ioaddr = devm_platform_get_and_ioremap_resource(pdev, 0, &iomem);
- 	if (IS_ERR(host->ioaddr)) {
- 		ret = PTR_ERR(host->ioaddr);
- 		goto err;
- 	}
- 
--	addr = of_get_address(node, 0, NULL, NULL);
--	if (!addr) {
--		dev_err(dev, "could not get DMA-register address\n");
--		ret = -ENODEV;
--		goto err;
--	}
--	host->bus_addr = be32_to_cpup(addr);
--	pr_debug(" - ioaddr %lx, iomem->start %lx, bus_addr %lx\n",
--		 (unsigned long)host->ioaddr,
--		 (unsigned long)iomem->start,
--		 (unsigned long)host->bus_addr);
--
- #ifndef FORCE_PIO
- 	if (node) {
- 		host->dma_chan_rxtx = dma_request_slave_channel(dev, "rx-tx");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0715-ARM-dts-bcm2709-10-Retain-the-system-timer-node.patch b/target/linux/bcm27xx/patches-6.1/950-0715-ARM-dts-bcm2709-10-Retain-the-system-timer-node.patch
deleted file mode 100644
index 5d88fae1c4..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0715-ARM-dts-bcm2709-10-Retain-the-system-timer-node.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 39b579459fd42703731f833057d49ef120400c5f Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 11 May 2023 15:44:18 +0100
-Subject: [PATCH] ARM: dts: bcm2709/10: Retain the system-timer node
-
-Although the system timer is largely ignored in favour of the ARM local
-timers, retain the DT node so that the bcm2835-sdhost logging can find
-the timer in a cleaner fashion.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2709.dtsi | 6 ++++--
- arch/arm/boot/dts/bcm2710.dtsi | 6 ++++--
- 2 files changed, 8 insertions(+), 4 deletions(-)
-
---- a/arch/arm/boot/dts/bcm2709.dtsi
-+++ b/arch/arm/boot/dts/bcm2709.dtsi
-@@ -10,8 +10,6 @@
- 
- 		dma-ranges = <0xc0000000 0x00000000 0x3f000000>,
- 			     <0x7e000000 0x3f000000 0x01000000>;
--
--		/delete-node/ timer@7e003000;
- 	};
- 
- 	__overrides__ {
-@@ -22,6 +20,10 @@
- 	};
- };
- 
-+&system_timer {
-+	status = "disabled";
-+};
-+
- &vc4 {
- 	status = "disabled";
- };
---- a/arch/arm/boot/dts/bcm2710.dtsi
-+++ b/arch/arm/boot/dts/bcm2710.dtsi
-@@ -13,8 +13,6 @@
- 	soc {
- 		dma-ranges = <0xc0000000 0x00000000 0x3f000000>,
- 			     <0x7e000000 0x3f000000 0x01000000>;
--
--		/delete-node/ timer@7e003000;
- 	};
- 
- 	__overrides__ {
-@@ -25,6 +23,10 @@
- 	};
- };
- 
-+&system_timer {
-+	status = "disabled";
-+};
-+
- &vc4 {
- 	status = "disabled";
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0716-bcm2835-sdhost-Use-DT-to-configure-logging.patch b/target/linux/bcm27xx/patches-6.1/950-0716-bcm2835-sdhost-Use-DT-to-configure-logging.patch
deleted file mode 100644
index 6227a9031a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0716-bcm2835-sdhost-Use-DT-to-configure-logging.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From ff2217b2d7f964250dbb9feae94caec8adf3d124 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 11 May 2023 16:23:13 +0100
-Subject: [PATCH] bcm2835-sdhost: Use DT to configure logging
-
-Retrieve the system timer base address directly from DT.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/mmc/host/bcm2835-sdhost.c | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
---- a/drivers/mmc/host/bcm2835-sdhost.c
-+++ b/drivers/mmc/host/bcm2835-sdhost.c
-@@ -242,15 +242,19 @@ static void __iomem *timer_base;
- #define LOG_ENTRIES (256*1)
- #define LOG_SIZE (sizeof(LOG_ENTRY_T)*LOG_ENTRIES)
- 
--static void log_init(struct device *dev, u32 bus_to_phys)
-+static void log_init(struct device *dev)
- {
-+	struct device_node *np;
-+
- 	spin_lock_init(&log_lock);
- 	sdhost_log_buf = dma_alloc_coherent(dev, LOG_SIZE, &sdhost_log_addr,
- 					     GFP_KERNEL);
- 	if (sdhost_log_buf) {
-+		np = of_find_compatible_node(NULL, NULL,
-+					     "brcm,bcm2835-system-timer");
- 		pr_info("sdhost: log_buf @ %p (%llx)\n",
- 			sdhost_log_buf, (u64)sdhost_log_addr);
--		timer_base = ioremap(bus_to_phys + 0x7e003000, SZ_4K);
-+		timer_base = of_iomap(np, 0);
- 		if (!timer_base)
- 			pr_err("sdhost: failed to remap timer\n");
- 	}
-@@ -2123,7 +2127,7 @@ static int bcm2835_sdhost_probe(struct p
- 		 (unsigned long)host->max_clk,
- 		 (int)host->irq);
- 
--	log_init(dev, iomem->start - host->bus_addr);
-+	log_init(dev);
- 
- 	if (node)
- 		mmc_of_parse(mmc);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0717-bcm2835-sdhost-Use-phys-addresses-for-slave-DMA-conf.patch b/target/linux/bcm27xx/patches-6.1/950-0717-bcm2835-sdhost-Use-phys-addresses-for-slave-DMA-conf.patch
deleted file mode 100644
index 4fee7efa22..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0717-bcm2835-sdhost-Use-phys-addresses-for-slave-DMA-conf.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 975bb6f620418ffcfa101561583d6cadc8025a1d Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 11 May 2023 16:24:26 +0100
-Subject: [PATCH] bcm2835-sdhost: Use phys addresses for slave DMA
- config
-
-Contrary to what struct snd_dmaengine_dai_dma_data suggests, the
-configuration of addresses of DMA slave interfaces should be done in
-CPU physical addresses.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/mmc/host/bcm2835-sdhost.c | 17 ++---------------
- 1 file changed, 2 insertions(+), 15 deletions(-)
-
---- a/drivers/mmc/host/bcm2835-sdhost.c
-+++ b/drivers/mmc/host/bcm2835-sdhost.c
-@@ -2015,9 +2015,7 @@ static int bcm2835_sdhost_probe(struct p
- 	struct resource *iomem;
- 	struct bcm2835_host *host;
- 	struct mmc_host *mmc;
--	const __be32 *addr;
- 	u32 msg[3];
--	int na;
- 	int ret;
- 
- 	pr_debug("bcm2835_sdhost_probe\n");
-@@ -2034,24 +2032,13 @@ static int bcm2835_sdhost_probe(struct p
- 	host->allow_dma = 1;
- 	spin_lock_init(&host->lock);
- 
--	iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
--	host->ioaddr = devm_ioremap_resource(dev, iomem);
-+	host->ioaddr = devm_platform_get_and_ioremap_resource(pdev, 0, &iomem);
- 	if (IS_ERR(host->ioaddr)) {
- 		ret = PTR_ERR(host->ioaddr);
- 		goto err;
- 	}
- 
--	na = of_n_addr_cells(node);
--	addr = of_get_address(node, 0, NULL, NULL);
--	if (!addr) {
--		dev_err(dev, "could not get DMA-register address\n");
--		return -ENODEV;
--	}
--	host->bus_addr = (phys_addr_t)of_read_number(addr, na);
--	pr_debug(" - ioaddr %lx, iomem->start %lx, bus_addr %lx\n",
--		 (unsigned long)host->ioaddr,
--		 (unsigned long)iomem->start,
--		 (unsigned long)host->bus_addr);
-+	host->bus_addr = iomem->start;
- 
- 	if (node) {
- 		/* Read any custom properties */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0718-mmc-bcm2835-Use-phys-addresses-for-slave-DMA-config.patch b/target/linux/bcm27xx/patches-6.1/950-0718-mmc-bcm2835-Use-phys-addresses-for-slave-DMA-config.patch
deleted file mode 100644
index 7dae4532d9..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0718-mmc-bcm2835-Use-phys-addresses-for-slave-DMA-config.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 69939eb84658f25f2300a34c3f7719ac05c86dec Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 11 May 2023 16:25:46 +0100
-Subject: [PATCH] mmc: bcm2835: Use phys addresses for slave DMA config
-
-Contrary to what struct snd_dmaengine_dai_dma_data suggests, the
-configuration of addresses of DMA slave interfaces should be done in
-CPU physical addresses.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/mmc/host/bcm2835.c | 17 +++--------------
- 1 file changed, 3 insertions(+), 14 deletions(-)
-
---- a/drivers/mmc/host/bcm2835.c
-+++ b/drivers/mmc/host/bcm2835.c
-@@ -38,7 +38,6 @@
- #include <linux/io.h>
- #include <linux/iopoll.h>
- #include <linux/module.h>
--#include <linux/of_address.h>
- #include <linux/of_irq.h>
- #include <linux/platform_device.h>
- #include <linux/scatterlist.h>
-@@ -1355,8 +1354,8 @@ static int bcm2835_probe(struct platform
- 	struct device *dev = &pdev->dev;
- 	struct clk *clk;
- 	struct bcm2835_host *host;
-+	struct resource *iomem;
- 	struct mmc_host *mmc;
--	const __be32 *regaddr_p;
- 	int ret;
- 
- 	dev_dbg(dev, "%s\n", __func__);
-@@ -1369,23 +1368,13 @@ static int bcm2835_probe(struct platform
- 	host->pdev = pdev;
- 	spin_lock_init(&host->lock);
- 
--	host->ioaddr = devm_platform_ioremap_resource(pdev, 0);
-+	host->ioaddr = devm_platform_get_and_ioremap_resource(pdev, 0, &iomem);
- 	if (IS_ERR(host->ioaddr)) {
- 		ret = PTR_ERR(host->ioaddr);
- 		goto err;
- 	}
- 
--	/* Parse OF address directly to get the physical address for
--	 * DMA to our registers.
--	 */
--	regaddr_p = of_get_address(pdev->dev.of_node, 0, NULL, NULL);
--	if (!regaddr_p) {
--		dev_err(dev, "Can't get phys address\n");
--		ret = -EINVAL;
--		goto err;
--	}
--
--	host->phys_addr = be32_to_cpup(regaddr_p);
-+	host->phys_addr = iomem->start;
- 
- 	host->dma_chan = NULL;
- 	host->dma_desc = NULL;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0719-spi-bcm2835-Use-phys-addresses-for-slave-DMA-config.patch b/target/linux/bcm27xx/patches-6.1/950-0719-spi-bcm2835-Use-phys-addresses-for-slave-DMA-config.patch
deleted file mode 100644
index 8b734c23bd..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0719-spi-bcm2835-Use-phys-addresses-for-slave-DMA-config.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From b71cfec520b128ce190e70b1c32df8bfc2492d9a Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 11 May 2023 16:27:06 +0100
-Subject: [PATCH] spi: bcm2835: Use phys addresses for slave DMA config
-
-Contrary to what struct snd_dmaengine_dai_dma_data suggests, the
-configuration of addresses of DMA slave interfaces should be done in
-CPU physical addresses.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/spi/spi-bcm2835.c | 22 +++++++---------------
- 1 file changed, 7 insertions(+), 15 deletions(-)
-
---- a/drivers/spi/spi-bcm2835.c
-+++ b/drivers/spi/spi-bcm2835.c
-@@ -116,6 +116,7 @@ MODULE_PARM_DESC(polling_limit_us,
-  */
- struct bcm2835_spi {
- 	void __iomem *regs;
-+	phys_addr_t phys_addr;
- 	struct clk *clk;
- 	unsigned long clk_hz;
- 	int irq;
-@@ -887,19 +888,8 @@ static int bcm2835_dma_init(struct spi_c
- 			    struct bcm2835_spi *bs)
- {
- 	struct dma_slave_config slave_config;
--	const __be32 *addr;
--	dma_addr_t dma_reg_base;
- 	int ret;
- 
--	/* base address in dma-space */
--	addr = of_get_address(ctlr->dev.of_node, 0, NULL, NULL);
--	if (!addr) {
--		dev_err(dev, "could not get DMA-register address - not using dma mode\n");
--		/* Fall back to interrupt mode */
--		return 0;
--	}
--	dma_reg_base = be32_to_cpup(addr);
--
- 	/* get tx/rx dma */
- 	ctlr->dma_tx = dma_request_chan(dev, "tx");
- 	if (IS_ERR(ctlr->dma_tx)) {
-@@ -921,7 +911,7 @@ static int bcm2835_dma_init(struct spi_c
- 	 * or, in case of an RX-only transfer, cyclically copies from the zero
- 	 * page to the FIFO using a preallocated, reusable descriptor.
- 	 */
--	slave_config.dst_addr = (u32)(dma_reg_base + BCM2835_SPI_FIFO);
-+	slave_config.dst_addr = bs->phys_addr + BCM2835_SPI_FIFO;
- 	slave_config.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
- 
- 	ret = dmaengine_slave_config(ctlr->dma_tx, &slave_config);
-@@ -960,9 +950,9 @@ static int bcm2835_dma_init(struct spi_c
- 	 * RX FIFO or, in case of a TX-only transfer, cyclically writes a
- 	 * precalculated value to the CS register to clear the RX FIFO.
- 	 */
--	slave_config.src_addr = (u32)(dma_reg_base + BCM2835_SPI_FIFO);
-+	slave_config.src_addr = bs->phys_addr + BCM2835_SPI_FIFO;
- 	slave_config.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
--	slave_config.dst_addr = (u32)(dma_reg_base + BCM2835_SPI_CS);
-+	slave_config.dst_addr = bs->phys_addr + BCM2835_SPI_CS;
- 	slave_config.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
- 
- 	ret = dmaengine_slave_config(ctlr->dma_rx, &slave_config);
-@@ -1335,6 +1325,7 @@ static int bcm2835_spi_probe(struct plat
- {
- 	struct spi_controller *ctlr;
- 	struct bcm2835_spi *bs;
-+	struct resource *iomem;
- 	int err;
- 
- 	ctlr = devm_spi_alloc_master(&pdev->dev, sizeof(*bs));
-@@ -1357,10 +1348,11 @@ static int bcm2835_spi_probe(struct plat
- 	bs = spi_controller_get_devdata(ctlr);
- 	bs->ctlr = ctlr;
- 
--	bs->regs = devm_platform_ioremap_resource(pdev, 0);
-+	bs->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &iomem);
- 	if (IS_ERR(bs->regs))
- 		return PTR_ERR(bs->regs);
- 
-+	bs->phys_addr = iomem->start;
- 	bs->clk = devm_clk_get(&pdev->dev, NULL);
- 	if (IS_ERR(bs->clk))
- 		return dev_err_probe(&pdev->dev, PTR_ERR(bs->clk),
diff --git a/target/linux/bcm27xx/patches-6.1/950-0720-ARM-dts-bcm2711-rpi-Add-i2s_dma4.patch b/target/linux/bcm27xx/patches-6.1/950-0720-ARM-dts-bcm2711-rpi-Add-i2s_dma4.patch
deleted file mode 100644
index a025145ef7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0720-ARM-dts-bcm2711-rpi-Add-i2s_dma4.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 358b2d553762030d3e7e66eb4c0bb7140d348c43 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 11 May 2023 11:50:57 +0100
-Subject: [PATCH] ARM: dts: bcm2711-rpi: Add i2s_dma4
-
-Add an i2s_dma4 parameter to make the I2S interface use 40-bit DMA
-channels, taking the opportunity to remove some duplication.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2711-rpi-4-b.dts  | 4 ----
- arch/arm/boot/dts/bcm2711-rpi-400.dts  | 4 ----
- arch/arm/boot/dts/bcm2711-rpi-cm4.dts  | 4 ----
- arch/arm/boot/dts/bcm2711-rpi-cm4s.dts | 4 ----
- arch/arm/boot/dts/bcm2711-rpi-ds.dtsi  | 6 ++++++
- arch/arm/boot/dts/overlays/README      | 4 ++++
- 6 files changed, 10 insertions(+), 16 deletions(-)
-
---- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-@@ -414,9 +414,5 @@ cam0_reg: &cam_dummy_reg {
- 
- 		eth_led0 = <&phy1>,"led-modes:0";
- 		eth_led1 = <&phy1>,"led-modes:4";
--
--		sd_poll_once = <&emmc2>, "non-removable?";
--		spi_dma4 = <&spi0>, "dmas:0=", <&dma40>,
--			   <&spi0>, "dmas:8=", <&dma40>;
- 	};
- };
---- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
-@@ -425,9 +425,5 @@ cam0_reg: &cam_dummy_reg {
- 
- 		eth_led0 = <&phy1>,"led-modes:0";
- 		eth_led1 = <&phy1>,"led-modes:4";
--
--		sd_poll_once = <&emmc2>, "non-removable?";
--		spi_dma4 = <&spi0>, "dmas:0=", <&dma40>,
--			   <&spi0>, "dmas:8=", <&dma40>;
- 	};
- };
---- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
-@@ -437,10 +437,6 @@ cam0_reg: &cam1_reg {
- 			<&ant2>, "output-high?=off",
- 			<&ant2>, "output-low?=on";
- 
--		sd_poll_once = <&emmc2>, "non-removable?";
--		spi_dma4 = <&spi0>, "dmas:0=", <&dma40>,
--			   <&spi0>, "dmas:8=", <&dma40>;
--
- 		cam0_reg = <&cam0_reg>,"status";
- 		cam0_reg_gpio = <&cam0_reg>,"gpio:4",
- 				  <&cam0_reg>,"gpio:0=", <&gpio>;
---- a/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
-@@ -290,10 +290,6 @@ cam0_reg: &cam0_regulator {
- 		act_led_activelow = <&act_led>,"gpios:8";
- 		act_led_trigger = <&act_led>,"linux,default-trigger";
- 
--		sd_poll_once = <&emmc2>, "non-removable?";
--		spi_dma4 = <&spi0>, "dmas:0=", <&dma40>,
--			   <&spi0>, "dmas:8=", <&dma40>;
--
- 		cam0_reg = <&cam0_reg>,"status";
- 		cam0_reg_gpio = <&cam0_reg>,"gpio:4";
- 		cam1_reg = <&cam1_reg>,"status";
---- a/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
-+++ b/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
-@@ -12,6 +12,12 @@
- 		       <&hdmi1>,"status";
- 		pcie = <&pcie0>,"status";
- 		sd = <&emmc2>,"status";
-+
-+		sd_poll_once = <&emmc2>, "non-removable?";
-+		spi_dma4 = <&spi0>, "dmas:0=", <&dma40>,
-+			   <&spi0>, "dmas:8=", <&dma40>;
-+		i2s_dma4 = <&i2s>, "dmas:0=", <&dma40>,
-+			   <&i2s>, "dmas:8=", <&dma40>;
- 	};
- 
- 	scb: scb {
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -226,6 +226,10 @@ Params:
-         i2s                     Set to "on" to enable the i2s interface
-                                 (default "off")
- 
-+        i2s_dma4                Use to enable 40-bit DMA on the i2s interface
-+                                (the assigned value doesn't matter)
-+                                (2711 only)
-+
-         krnbt                   Set to "off" to disable autoprobing of Bluetooth
-                                 driver without need of hciattach/btattach
-                                 (default "on")
diff --git a/target/linux/bcm27xx/patches-6.1/950-0721-fixup-bcm2835-mmc-Really-use-phys-addresses.patch b/target/linux/bcm27xx/patches-6.1/950-0721-fixup-bcm2835-mmc-Really-use-phys-addresses.patch
deleted file mode 100644
index 9d5491ec4e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0721-fixup-bcm2835-mmc-Really-use-phys-addresses.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0f38c137279dd32e865956aa95aa3787fef11b1a Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 15 May 2023 09:15:56 +0100
-Subject: [PATCH] fixup! bcm2835-mmc: Really use phys addresses
-
-Commit [1] is missing a vital line - add it.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/mmc/host/bcm2835-mmc.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/mmc/host/bcm2835-mmc.c
-+++ b/drivers/mmc/host/bcm2835-mmc.c
-@@ -1422,6 +1422,8 @@ static int bcm2835_mmc_probe(struct plat
- 		goto err;
- 	}
- 
-+	host->bus_addr = iomem->start;
-+
- #ifndef FORCE_PIO
- 	if (node) {
- 		host->dma_chan_rxtx = dma_request_slave_channel(dev, "rx-tx");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0722-dmaengine-bcm2835-Fix-position-reporting-for-40-bits.patch b/target/linux/bcm27xx/patches-6.1/950-0722-dmaengine-bcm2835-Fix-position-reporting-for-40-bits.patch
deleted file mode 100644
index 35d7342ef6..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0722-dmaengine-bcm2835-Fix-position-reporting-for-40-bits.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 95d4bdad3bf5340b0bf1e53e28fcd487d9253315 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Mon, 27 Mar 2023 17:10:07 +0200
-Subject: [PATCH] dmaengine: bcm2835: Fix position reporting for 40
- bits channels
-
-For 40 bits channels, the position is reported by reading the upper byte
-in the SRCI/DESTI registers. However the driver adds that upper byte
-with an 8-bits left shift, while it should be 32.
-
-Fixes: 9a52a9918306 ("bcm2835-dma: Add proper 40-bit DMA support")
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/dma/bcm2835-dma.c | 27 ++++++++++++++++-----------
- 1 file changed, 16 insertions(+), 11 deletions(-)
-
---- a/drivers/dma/bcm2835-dma.c
-+++ b/drivers/dma/bcm2835-dma.c
-@@ -819,20 +819,25 @@ static enum dma_status bcm2835_dma_tx_st
- 		struct bcm2835_desc *d = c->desc;
- 		dma_addr_t pos;
- 
--		if (d->dir == DMA_MEM_TO_DEV && c->is_40bit_channel)
--			pos = readl(c->chan_base + BCM2711_DMA40_SRC) +
--				((readl(c->chan_base + BCM2711_DMA40_SRCI) &
--				  0xff) << 8);
--		else if (d->dir == DMA_MEM_TO_DEV && !c->is_40bit_channel)
-+		if (d->dir == DMA_MEM_TO_DEV && c->is_40bit_channel) {
-+			u64 lo_bits, hi_bits;
-+
-+			lo_bits = readl(c->chan_base + BCM2711_DMA40_SRC);
-+			hi_bits = readl(c->chan_base + BCM2711_DMA40_SRCI) & 0xff;
-+			pos = (hi_bits << 32) | lo_bits;
-+		} else if (d->dir == DMA_MEM_TO_DEV && !c->is_40bit_channel) {
- 			pos = readl(c->chan_base + BCM2835_DMA_SOURCE_AD);
--		else if (d->dir == DMA_DEV_TO_MEM && c->is_40bit_channel)
--			pos = readl(c->chan_base + BCM2711_DMA40_DEST) +
--				((readl(c->chan_base + BCM2711_DMA40_DESTI) &
--				  0xff) << 8);
--		else if (d->dir == DMA_DEV_TO_MEM && !c->is_40bit_channel)
-+		} else if (d->dir == DMA_DEV_TO_MEM && c->is_40bit_channel) {
-+			u64 lo_bits, hi_bits;
-+
-+			lo_bits = readl(c->chan_base + BCM2711_DMA40_DEST);
-+			hi_bits = readl(c->chan_base + BCM2711_DMA40_DESTI) & 0xff;
-+			pos = (hi_bits << 32) | lo_bits;
-+		} else if (d->dir == DMA_DEV_TO_MEM && !c->is_40bit_channel) {
- 			pos = readl(c->chan_base + BCM2835_DMA_DEST_AD);
--		else
-+		} else {
- 			pos = 0;
-+		}
- 
- 		txstate->residue = bcm2835_dma_desc_size_pos(d, pos);
- 	} else {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0723-dmaengine-bcm2835-Use-to_bcm2711_cbaddr-where-releva.patch b/target/linux/bcm27xx/patches-6.1/950-0723-dmaengine-bcm2835-Use-to_bcm2711_cbaddr-where-releva.patch
deleted file mode 100644
index d069778b2d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0723-dmaengine-bcm2835-Use-to_bcm2711_cbaddr-where-releva.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4176c964cd42c43d90fc1b60ff8266613462ebe8 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Thu, 13 Apr 2023 16:44:21 +0200
-Subject: [PATCH] dmaengine: bcm2835: Use to_bcm2711_cbaddr where
- relevant
-
-bcm2711_dma40_memcpy has some code strictly equivalent to the
-to_bcm2711_cbaddr() function. Let's use it instead.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/dma/bcm2835-dma.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/dma/bcm2835-dma.c
-+++ b/drivers/dma/bcm2835-dma.c
-@@ -1149,7 +1149,7 @@ void bcm2711_dma40_memcpy(dma_addr_t dst
- 	scb->len = size;
- 	scb->next_cb = 0;
- 
--	writel((u32)(memcpy_scb_dma >> 5), memcpy_chan + BCM2711_DMA40_CB);
-+	writel(to_bcm2711_cbaddr(memcpy_scb_dma), memcpy_chan + BCM2711_DMA40_CB);
- 	writel(BCM2711_DMA40_MEMCPY_FLAGS + BCM2711_DMA40_ACTIVE,
- 	       memcpy_chan + BCM2711_DMA40_CS);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0724-dmaengine-bcm2835-Fix-descriptors-usage-for-40-bits-.patch b/target/linux/bcm27xx/patches-6.1/950-0724-dmaengine-bcm2835-Fix-descriptors-usage-for-40-bits-.patch
deleted file mode 100644
index 1532b783ce..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0724-dmaengine-bcm2835-Fix-descriptors-usage-for-40-bits-.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From 793023dc148830c18c437b58d88a118a72091038 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Thu, 13 Apr 2023 16:47:10 +0200
-Subject: [PATCH] dmaengine: bcm2835: Fix descriptors usage for 40-bits
- channels
-
-The bcm2835_dma_create_cb_chain() function is in charge of building up
-the descriptors chain for a given transfer.
-
-It was initially supporting only the BCM2835-style DMA controller, and
-was later expanded to support controllers with 40-bits channels that use
-a different descriptor layout.
-
-However, some part of the function only use the old style descriptor,
-even when building a chain of new-style descriptors, resulting in weird
-bugs.
-
-Fixes: 9a52a9918306 ("bcm2835-dma: Add proper 40-bit DMA support")
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/dma/bcm2835-dma.c | 69 ++++++++++++++++++++++++++++-----------
- 1 file changed, 50 insertions(+), 19 deletions(-)
-
---- a/drivers/dma/bcm2835-dma.c
-+++ b/drivers/dma/bcm2835-dma.c
-@@ -543,7 +543,10 @@ static struct bcm2835_desc *bcm2835_dma_
- 				cyclic ? finalextrainfo : 0);
- 
- 			/* calculate new remaining length */
--			len -= control_block->length;
-+			if (c->is_40bit_channel)
-+				len -= ((struct bcm2711_dma40_scb *)control_block)->len;
-+			else
-+				len -= control_block->length;
- 		}
- 
- 		/* link this the last controlblock */
-@@ -555,10 +558,19 @@ static struct bcm2835_desc *bcm2835_dma_
- 			d->cb_list[frame - 1].cb->next = cb_entry->paddr;
- 
- 		/* update src and dst and length */
--		if (src && (info & BCM2835_DMA_S_INC))
--			src += control_block->length;
--		if (dst && (info & BCM2835_DMA_D_INC))
--			dst += control_block->length;
-+		if (src && (info & BCM2835_DMA_S_INC)) {
-+			if (c->is_40bit_channel)
-+				src += ((struct bcm2711_dma40_scb *)control_block)->len;
-+			else
-+				src += control_block->length;
-+		}
-+
-+		if (dst && (info & BCM2835_DMA_D_INC)) {
-+			if (c->is_40bit_channel)
-+				dst += ((struct bcm2711_dma40_scb *)control_block)->len;
-+			else
-+				dst += control_block->length;
-+		}
- 
- 		/* Length of total transfer */
- 		if (c->is_40bit_channel)
-@@ -779,20 +791,39 @@ static size_t bcm2835_dma_desc_size_pos(
- 	unsigned int i;
- 	size_t size;
- 
--	for (size = i = 0; i < d->frames; i++) {
--		struct bcm2835_dma_cb *control_block = d->cb_list[i].cb;
--		size_t this_size = control_block->length;
--		dma_addr_t dma;
--
--		if (d->dir == DMA_DEV_TO_MEM)
--			dma = control_block->dst;
--		else
--			dma = control_block->src;
--
--		if (size)
--			size += this_size;
--		else if (addr >= dma && addr < dma + this_size)
--			size += dma + this_size - addr;
-+	if (d->c->is_40bit_channel) {
-+		for (size = i = 0; i < d->frames; i++) {
-+			struct bcm2711_dma40_scb *control_block =
-+				(struct bcm2711_dma40_scb *)d->cb_list[i].cb;
-+			size_t this_size = control_block->len;
-+			dma_addr_t dma;
-+
-+			if (d->dir == DMA_DEV_TO_MEM)
-+				dma = control_block->dst;
-+			else
-+				dma = control_block->src;
-+
-+			if (size)
-+				size += this_size;
-+			else if (addr >= dma && addr < dma + this_size)
-+				size += dma + this_size - addr;
-+		}
-+	} else {
-+		for (size = i = 0; i < d->frames; i++) {
-+			struct bcm2835_dma_cb *control_block = d->cb_list[i].cb;
-+			size_t this_size = control_block->length;
-+			dma_addr_t dma;
-+
-+			if (d->dir == DMA_DEV_TO_MEM)
-+				dma = control_block->dst;
-+			else
-+				dma = control_block->src;
-+
-+			if (size)
-+				size += this_size;
-+			else if (addr >= dma && addr < dma + this_size)
-+				size += dma + this_size - addr;
-+		}
- 	}
- 
- 	return size;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0725-bcm2835-dma-Fix-WAIT_RESP-on-memcpy.patch b/target/linux/bcm27xx/patches-6.1/950-0725-bcm2835-dma-Fix-WAIT_RESP-on-memcpy.patch
deleted file mode 100644
index 34f9fb9843..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0725-bcm2835-dma-Fix-WAIT_RESP-on-memcpy.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8c9492ba95ee874a745d0556da4377798bb0a606 Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Fri, 21 Apr 2023 16:00:51 +0100
-Subject: [PATCH] bcm2835-dma: Fix WAIT_RESP on memcpy
-
-It goes in info not extra
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/dma/bcm2835-dma.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/dma/bcm2835-dma.c
-+++ b/drivers/dma/bcm2835-dma.c
-@@ -899,8 +899,8 @@ static struct dma_async_tx_descriptor *b
- 	struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);
- 	struct bcm2835_desc *d;
- 	u32 info = BCM2835_DMA_D_INC | BCM2835_DMA_S_INC |
--		   WIDE_SOURCE(c->dreq) | WIDE_DEST(c->dreq);
--	u32 extra = BCM2835_DMA_INT_EN | WAIT_RESP(c->dreq);
-+		   WAIT_RESP(c->dreq) | WIDE_SOURCE(c->dreq) | WIDE_DEST(c->dreq);
-+	u32 extra = BCM2835_DMA_INT_EN;
- 	size_t max_len = bcm2835_dma_max_frame_length(c);
- 	size_t frames;
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0726-bcm2835-dma-Fix-dma_abort-for-40-bit-channels.patch b/target/linux/bcm27xx/patches-6.1/950-0726-bcm2835-dma-Fix-dma_abort-for-40-bit-channels.patch
deleted file mode 100644
index 07fd80ff37..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0726-bcm2835-dma-Fix-dma_abort-for-40-bit-channels.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 160cee9f3b24ef830fdf3abbe56f4de94eeea812 Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Fri, 21 Apr 2023 20:23:42 +0100
-Subject: [PATCH] bcm2835-dma: Fix dma_abort for 40-bit channels
-
-It wasn't aborting the transfer and caused stop/start
-of hdmi audio dma to be unreliable.
-
-New sequence approved by Broadcom.
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/dma/bcm2835-dma.c | 42 ++++++++++++++++++++++++++-------------
- 1 file changed, 28 insertions(+), 14 deletions(-)
-
---- a/drivers/dma/bcm2835-dma.c
-+++ b/drivers/dma/bcm2835-dma.c
-@@ -651,10 +651,6 @@ static void bcm2835_dma_abort(struct bcm
- {
- 	void __iomem *chan_base = c->chan_base;
- 	long int timeout = 10000;
--	u32 wait_mask = BCM2835_DMA_WAITING_FOR_WRITES;
--
--	if (c->is_40bit_channel)
--		wait_mask = BCM2711_DMA40_WAITING_FOR_WRITES;
- 
- 	/*
- 	 * A zero control block address means the channel is idle.
-@@ -663,19 +659,37 @@ static void bcm2835_dma_abort(struct bcm
- 	if (!readl(chan_base + BCM2835_DMA_ADDR))
- 		return;
- 
--	/* Write 0 to the active bit - Pause the DMA */
--	writel(0, chan_base + BCM2835_DMA_CS);
--
--	/* Wait for any current AXI transfer to complete */
--	while ((readl(chan_base + BCM2835_DMA_CS) & wait_mask) && --timeout)
--		cpu_relax();
--
--	/* Peripheral might be stuck and fail to signal AXI write responses */
--	if (!timeout)
--		dev_err(c->vc.chan.device->dev,
--			"failed to complete outstanding writes\n");
-+	if (c->is_40bit_channel) {
-+		/* Halt the current DMA */
-+		writel(readl(chan_base + BCM2711_DMA40_CS) | BCM2711_DMA40_HALT,
-+			     chan_base + BCM2711_DMA40_CS);
-+
-+		while ((readl(chan_base + BCM2711_DMA40_CS) & BCM2711_DMA40_HALT) && --timeout)
-+			cpu_relax();
-+
-+		/* Peripheral might be stuck and fail to halt */
-+		if (!timeout)
-+			dev_err(c->vc.chan.device->dev,
-+				"failed to halt dma\n");
-+
-+		writel(0, chan_base + BCM2711_DMA40_CS);
-+		writel(0, chan_base + BCM2711_DMA40_CB);
-+	} else {
-+		/* Write 0 to the active bit - Pause the DMA */
-+		writel(0, chan_base + BCM2835_DMA_CS);
-+
-+		/* Wait for any current AXI transfer to complete */
-+		while ((readl(chan_base + BCM2835_DMA_CS) & BCM2835_DMA_WAITING_FOR_WRITES)
-+		       && --timeout)
-+			cpu_relax();
-+
-+		/* Peripheral might be stuck and fail to signal AXI write responses */
-+		if (!timeout)
-+			dev_err(c->vc.chan.device->dev,
-+				"failed to complete outstanding writes\n");
- 
--	writel(BCM2835_DMA_RESET, chan_base + BCM2835_DMA_CS);
-+		writel(BCM2835_DMA_RESET, chan_base + BCM2835_DMA_CS);
-+	}
- }
- 
- static void bcm2835_dma_start_desc(struct bcm2835_chan *c)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0727-bcm2835-dma-Fix-dma_abort-for-non-40bit-channels.patch b/target/linux/bcm27xx/patches-6.1/950-0727-bcm2835-dma-Fix-dma_abort-for-non-40bit-channels.patch
deleted file mode 100644
index 188c286337..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0727-bcm2835-dma-Fix-dma_abort-for-non-40bit-channels.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 6609cb1bb479d833d11703b711cd12ade9bf8750 Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Wed, 26 Apr 2023 13:40:34 +0100
-Subject: [PATCH] bcm2835-dma: Fix dma_abort for non-40bit channels
-
-The sequence we were doing was not safe.
-
-Clearing CS meant BCM2835_DMA_WAIT_FOR_WRITES was cleared
-and so polling BCM2835_DMA_WAITING_FOR_WRITES has no benefit
-
-Broadcom have provided a recommended sequence to abort
-a dma lite channel, so switch to that.
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/dma/bcm2835-dma.c | 31 +++++++++++++++++++++++++++----
- 1 file changed, 27 insertions(+), 4 deletions(-)
-
---- a/drivers/dma/bcm2835-dma.c
-+++ b/drivers/dma/bcm2835-dma.c
-@@ -675,10 +675,18 @@ static void bcm2835_dma_abort(struct bcm
- 		writel(0, chan_base + BCM2711_DMA40_CS);
- 		writel(0, chan_base + BCM2711_DMA40_CB);
- 	} else {
-+		/*
-+		 * A zero control block address means the channel is idle.
-+		 * (The ACTIVE flag in the CS register is not a reliable indicator.)
-+		 */
-+		if (!readl(chan_base + BCM2835_DMA_ADDR))
-+			return;
-+
- 		/* Write 0 to the active bit - Pause the DMA */
--		writel(0, chan_base + BCM2835_DMA_CS);
-+		writel(readl(chan_base + BCM2835_DMA_CS) & ~BCM2835_DMA_ACTIVE,
-+		       chan_base + BCM2835_DMA_CS);
- 
--		/* Wait for any current AXI transfer to complete */
-+		/* wait for DMA to be paused */
- 		while ((readl(chan_base + BCM2835_DMA_CS) & BCM2835_DMA_WAITING_FOR_WRITES)
- 		       && --timeout)
- 			cpu_relax();
-@@ -686,9 +694,24 @@ static void bcm2835_dma_abort(struct bcm
- 		/* Peripheral might be stuck and fail to signal AXI write responses */
- 		if (!timeout)
- 			dev_err(c->vc.chan.device->dev,
--				"failed to complete outstanding writes\n");
-+				"failed to pause dma\n");
-+
-+		/* We need to clear the next DMA block pending */
-+		writel(0, chan_base + BCM2835_DMA_NEXTCB);
-+
-+		/* Abort the DMA, which needs to be enabled to complete */
-+		writel(readl(chan_base + BCM2835_DMA_CS) | BCM2835_DMA_ABORT | BCM2835_DMA_ACTIVE,
-+		chan_base + BCM2835_DMA_CS);
-+
-+		/* wait for DMA to have been aborted */
-+		timeout = 10000;
-+		while ((readl(chan_base + BCM2835_DMA_CS) & BCM2835_DMA_ABORT) && --timeout)
-+			cpu_relax();
- 
--		writel(BCM2835_DMA_RESET, chan_base + BCM2835_DMA_CS);
-+		/* Peripheral might be stuck and fail to signal AXI write responses */
-+		if (!timeout)
-+			dev_err(c->vc.chan.device->dev,
-+				"failed to abort dma\n");
- 	}
- }
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0728-bcm2835-dma-Support-dma-flags-for-multi-beat-burst.patch b/target/linux/bcm27xx/patches-6.1/950-0728-bcm2835-dma-Support-dma-flags-for-multi-beat-burst.patch
deleted file mode 100644
index c3c33746cc..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0728-bcm2835-dma-Support-dma-flags-for-multi-beat-burst.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 8c5a3ead40c1778595be768db284c66c03546e2d Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Fri, 21 Apr 2023 20:24:54 +0100
-Subject: [PATCH] bcm2835-dma: Support dma flags for multi-beat burst
-
-Add a control bit to enable a multi-beat burst on a DMA.
-This improves DMA performance and is required for HDMI audio.
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/dma/bcm2835-dma.c | 28 ++++++++++++++++++++--------
- 1 file changed, 20 insertions(+), 8 deletions(-)
-
---- a/drivers/dma/bcm2835-dma.c
-+++ b/drivers/dma/bcm2835-dma.c
-@@ -158,7 +158,8 @@ struct bcm2835_desc {
- #define BCM2835_DMA_S_WIDTH	BIT(9) /* 128bit writes if set */
- #define BCM2835_DMA_S_DREQ	BIT(10) /* enable SREQ for source */
- #define BCM2835_DMA_S_IGNORE	BIT(11) /* ignore source reads - read 0 */
--#define BCM2835_DMA_BURST_LENGTH(x) ((x & 15) << 12)
-+#define BCM2835_DMA_BURST_LENGTH(x) (((x) & 15) << 12)
-+#define BCM2835_DMA_GET_BURST_LENGTH(x) (((x) >> 12) & 15)
- #define BCM2835_DMA_CS_FLAGS(x) (x & (BCM2835_DMA_PRIORITY(15) | \
- 				      BCM2835_DMA_PANIC_PRIORITY(15) | \
- 				      BCM2835_DMA_WAIT_FOR_WRITES | \
-@@ -182,6 +183,11 @@ struct bcm2835_desc {
- #define WIDE_DEST(x) ((x & BCM2835_DMA_WIDE_DEST) ? \
- 		      BCM2835_DMA_D_WIDTH : 0)
- 
-+/* A fake bit to request that the driver requires multi-beat burst */
-+#define BCM2835_DMA_BURST BIT(30)
-+#define BURST_LENGTH(x) ((x & BCM2835_DMA_BURST) ? \
-+		      BCM2835_DMA_BURST_LENGTH(3) : 0)
-+
- 
- /* debug register bits */
- #define BCM2835_DMA_DEBUG_LAST_NOT_SET_ERR	BIT(0)
-@@ -285,7 +291,7 @@ struct bcm2835_desc {
- /* the max dma length for different channels */
- #define MAX_DMA40_LEN SZ_1G
- 
--#define BCM2711_DMA40_BURST_LEN(x)	((min(x,16) - 1) << 8)
-+#define BCM2711_DMA40_BURST_LEN(x)	(((x) & 15) << 8)
- #define BCM2711_DMA40_INC		BIT(12)
- #define BCM2711_DMA40_SIZE_32		(0 << 13)
- #define BCM2711_DMA40_SIZE_64		(1 << 13)
-@@ -362,12 +368,16 @@ static inline uint32_t to_bcm2711_ti(uin
- 
- static inline uint32_t to_bcm2711_srci(uint32_t info)
- {
--	return ((info & BCM2835_DMA_S_INC) ? BCM2711_DMA40_INC : 0);
-+	return ((info & BCM2835_DMA_S_INC) ? BCM2711_DMA40_INC : 0) |
-+	       ((info & BCM2835_DMA_S_WIDTH) ? BCM2711_DMA40_SIZE_128 : 0) |
-+	       BCM2711_DMA40_BURST_LEN(BCM2835_DMA_GET_BURST_LENGTH(info));
- }
- 
- static inline uint32_t to_bcm2711_dsti(uint32_t info)
- {
--	return ((info & BCM2835_DMA_D_INC) ? BCM2711_DMA40_INC : 0);
-+	return ((info & BCM2835_DMA_D_INC) ? BCM2711_DMA40_INC : 0) |
-+	       ((info & BCM2835_DMA_D_WIDTH) ? BCM2711_DMA40_SIZE_128 : 0) |
-+	       BCM2711_DMA40_BURST_LEN(BCM2835_DMA_GET_BURST_LENGTH(info));
- }
- 
- static inline uint32_t to_bcm2711_cbaddr(dma_addr_t addr)
-@@ -936,7 +946,8 @@ static struct dma_async_tx_descriptor *b
- 	struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);
- 	struct bcm2835_desc *d;
- 	u32 info = BCM2835_DMA_D_INC | BCM2835_DMA_S_INC |
--		   WAIT_RESP(c->dreq) | WIDE_SOURCE(c->dreq) | WIDE_DEST(c->dreq);
-+		   WAIT_RESP(c->dreq) | WIDE_SOURCE(c->dreq) |
-+		   WIDE_DEST(c->dreq) | BURST_LENGTH(c->dreq);
- 	u32 extra = BCM2835_DMA_INT_EN;
- 	size_t max_len = bcm2835_dma_max_frame_length(c);
- 	size_t frames;
-@@ -967,8 +978,8 @@ static struct dma_async_tx_descriptor *b
- 	struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);
- 	struct bcm2835_desc *d;
- 	dma_addr_t src = 0, dst = 0;
--	u32 info = WAIT_RESP(c->dreq) |
--		   WIDE_SOURCE(c->dreq) | WIDE_DEST(c->dreq);
-+	u32 info = WAIT_RESP(c->dreq) | WIDE_SOURCE(c->dreq) |
-+		   WIDE_DEST(c->dreq) | BURST_LENGTH(c->dreq);
- 	u32 extra = BCM2835_DMA_INT_EN;
- 	size_t frames;
- 
-@@ -1020,7 +1031,8 @@ static struct dma_async_tx_descriptor *b
- 	struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);
- 	struct bcm2835_desc *d;
- 	dma_addr_t src, dst;
--	u32 info = WAIT_RESP(c->dreq) | WIDE_SOURCE(c->dreq) | WIDE_DEST(c->dreq);
-+	u32 info = WAIT_RESP(c->dreq) | WIDE_SOURCE(c->dreq) |
-+		   WIDE_DEST(c->dreq) | BURST_LENGTH(c->dreq);
- 	u32 extra = 0;
- 	size_t max_len = bcm2835_dma_max_frame_length(c);
- 	size_t frames;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0729-bcm2835-dma-Need-to-keep-PROT-bits-set-in-CS-on-40bi.patch b/target/linux/bcm27xx/patches-6.1/950-0729-bcm2835-dma-Need-to-keep-PROT-bits-set-in-CS-on-40bi.patch
deleted file mode 100644
index 637f4562dd..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0729-bcm2835-dma-Need-to-keep-PROT-bits-set-in-CS-on-40bi.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 132f5d41c2da9f7292f1495fd30cf04a3de8d196 Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Fri, 5 May 2023 11:23:50 +0100
-Subject: [PATCH] bcm2835-dma: Need to keep PROT bits set in CS on
- 40bit controller
-
-Resetting them to zero puts DMA channel into secure mode
-which makes further accesses impossible
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/dma/bcm2835-dma.c | 20 ++++++++++++++------
- 1 file changed, 14 insertions(+), 6 deletions(-)
-
---- a/drivers/dma/bcm2835-dma.c
-+++ b/drivers/dma/bcm2835-dma.c
-@@ -249,6 +249,9 @@ struct bcm2835_desc {
- #define BCM2711_DMA40_DISDEBUG		BIT(29)
- #define BCM2711_DMA40_ABORT		BIT(30)
- #define BCM2711_DMA40_HALT		BIT(31)
-+// we always want to run in supervisor mode
-+#define BCM2711_DMA40_PROT		(BIT(8)|BIT(9))
-+
- #define BCM2711_DMA40_CS_FLAGS(x) (x & (BCM2711_DMA40_QOS(15) | \
- 					BCM2711_DMA40_PANIC_QOS(15) | \
- 					BCM2711_DMA40_WAIT_FOR_WRITES |	\
-@@ -682,7 +685,7 @@ static void bcm2835_dma_abort(struct bcm
- 			dev_err(c->vc.chan.device->dev,
- 				"failed to halt dma\n");
- 
--		writel(0, chan_base + BCM2711_DMA40_CS);
-+		writel(BCM2711_DMA40_PROT, chan_base + BCM2711_DMA40_CS);
- 		writel(0, chan_base + BCM2711_DMA40_CB);
- 	} else {
- 		/*
-@@ -742,7 +745,7 @@ static void bcm2835_dma_start_desc(struc
- 	if (c->is_40bit_channel) {
- 		writel(to_bcm2711_cbaddr(d->cb_list[0].paddr),
- 		       c->chan_base + BCM2711_DMA40_CB);
--		writel(BCM2711_DMA40_ACTIVE | BCM2711_DMA40_CS_FLAGS(c->dreq),
-+		writel(BCM2711_DMA40_ACTIVE | BCM2711_DMA40_PROT | BCM2711_DMA40_CS_FLAGS(c->dreq),
- 		       c->chan_base + BCM2711_DMA40_CS);
- 	} else {
- 		writel(d->cb_list[0].paddr, c->chan_base + BCM2835_DMA_ADDR);
-@@ -775,8 +778,13 @@ static irqreturn_t bcm2835_dma_callback(
- 	 * if this IRQ handler is threaded.) If the channel is finished, it
- 	 * will remain idle despite the ACTIVE flag being set.
- 	 */
--	writel(BCM2835_DMA_INT | BCM2835_DMA_ACTIVE | BCM2835_DMA_CS_FLAGS(c->dreq),
--	       c->chan_base + BCM2835_DMA_CS);
-+	if (c->is_40bit_channel)
-+		writel(BCM2835_DMA_INT | BCM2711_DMA40_ACTIVE | BCM2711_DMA40_PROT |
-+		       BCM2711_DMA40_CS_FLAGS(c->dreq),
-+		       c->chan_base + BCM2711_DMA40_CS);
-+	else
-+		writel(BCM2835_DMA_INT | BCM2835_DMA_ACTIVE | BCM2835_DMA_CS_FLAGS(c->dreq),
-+		       c->chan_base + BCM2835_DMA_CS);
- 
- 	d = c->desc;
- 
-@@ -1230,14 +1238,14 @@ void bcm2711_dma40_memcpy(dma_addr_t dst
- 	scb->next_cb = 0;
- 
- 	writel(to_bcm2711_cbaddr(memcpy_scb_dma), memcpy_chan + BCM2711_DMA40_CB);
--	writel(BCM2711_DMA40_MEMCPY_FLAGS + BCM2711_DMA40_ACTIVE,
-+	writel(BCM2711_DMA40_MEMCPY_FLAGS | BCM2711_DMA40_ACTIVE | BCM2711_DMA40_PROT,
- 	       memcpy_chan + BCM2711_DMA40_CS);
- 
- 	/* Poll for completion */
- 	while (!(readl(memcpy_chan + BCM2711_DMA40_CS) & BCM2711_DMA40_END))
- 		cpu_relax();
- 
--	writel(BCM2711_DMA40_END, memcpy_chan + BCM2711_DMA40_CS);
-+	writel(BCM2711_DMA40_END | BCM2711_DMA40_PROT, memcpy_chan + BCM2711_DMA40_CS);
- 
- 	spin_unlock_irqrestore(&memcpy_lock, flags);
- }
diff --git a/target/linux/bcm27xx/patches-6.1/950-0730-bcm2711-rpi-ds-Switch-to-dma40-channel-for-hdmi-audi.patch b/target/linux/bcm27xx/patches-6.1/950-0730-bcm2711-rpi-ds-Switch-to-dma40-channel-for-hdmi-audi.patch
deleted file mode 100644
index f5545ea5cc..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0730-bcm2711-rpi-ds-Switch-to-dma40-channel-for-hdmi-audi.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From e73d889889d4795cc1640ec0a6f813bfe585b838 Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Thu, 4 May 2023 16:09:49 +0100
-Subject: [PATCH] bcm2711-rpi-ds: Switch to dma40 channel for hdmi
- audio
-
-Also tweak the flags:
-Remove NO_WAIT_RESP (27)
-Add BURST_LENGTH (30)
-
-The AXI path from DMA controller to HDMI audio fifo
-is long, and may have considerable delay.
-
-When using DMA without waiting for responses it is
-very easy to overfill the fifo as when the fifo
-removes DREQ there may be large numbers of writes
-in flight.
-
-This means the DREQ fifo threshold must be set low
-enough to accommodate the maximum number of in flight
-writes (unknown by something like 24),
-which means the 32 element fifo only requests data
-when it contains fewer than 8 entries, making it
-susceptable to underflow.
-
-If we wait for write responses we can set the DREQ
-fifo threshold much higher as there are a controlled
-number of writes in flight.
-
-However the overall bandwidth is reduced by setting
-this, so also enable a burstsize of 4 to improve
-bandwidth.
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- arch/arm/boot/dts/bcm2711-rpi-ds.dtsi | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
-+++ b/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
-@@ -364,7 +364,7 @@
- 		 <&firmware_clocks 14>,
- 		 <&dvp 0>,
- 		 <&clk_27MHz>;
--	dmas = <&dma (10|(1<<27)|(1<<24)|(10<<16)|(15<<20))>;
-+	dmas = <&dma40 (10|(1<<30)|(1<<24)|(10<<16)|(15<<20))>;
- 	status = "disabled";
- };
- 
-@@ -397,7 +397,7 @@
- 		 <&firmware_clocks 14>,
- 		 <&dvp 1>,
- 		 <&clk_27MHz>;
--	dmas = <&dma (17|(1<<27)|(1<<24)|(10<<16)|(15<<20))>;
-+	dmas = <&dma40 (17|(1<<30)|(1<<24)|(10<<16)|(15<<20))>;
- 	status = "disabled";
- };
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0731-drm-vc4-hdmi-Increase-MAI-fifo-dreq-threshold.patch b/target/linux/bcm27xx/patches-6.1/950-0731-drm-vc4-hdmi-Increase-MAI-fifo-dreq-threshold.patch
deleted file mode 100644
index ce2aec7f31..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0731-drm-vc4-hdmi-Increase-MAI-fifo-dreq-threshold.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 7b3d872d5cb43e85da3c9a6406d784ccfdd59845 Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Fri, 21 Apr 2023 22:00:16 +0100
-Subject: [PATCH] drm/vc4: hdmi: Increase MAI fifo dreq threshold
-
-Now we wait for write responses and have a burst
-size of 4, we can set the fifo threshold much higher.
-
-Set it to 28 (of the 32 entry size) to keep fifo
-fuller and reduce chance of underflow.
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +++++++++++++-----
- 1 file changed, 13 insertions(+), 5 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hdmi.c
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -2555,6 +2555,7 @@ static int vc4_hdmi_audio_prepare(struct
- {
- 	struct vc4_hdmi *vc4_hdmi = dev_get_drvdata(dev);
- 	struct drm_device *drm = vc4_hdmi->connector.dev;
-+	struct vc4_dev *vc4 = to_vc4_dev(drm);
- 	struct drm_encoder *encoder = &vc4_hdmi->encoder.base;
- 	unsigned int sample_rate = params->sample_rate;
- 	unsigned int channels = params->channels;
-@@ -2613,11 +2614,18 @@ static int vc4_hdmi_audio_prepare(struct
- 					     VC4_HDMI_AUDIO_PACKET_CEA_MASK);
- 
- 	/* Set the MAI threshold */
--	HDMI_WRITE(HDMI_MAI_THR,
--		   VC4_SET_FIELD(0x08, VC4_HD_MAI_THR_PANICHIGH) |
--		   VC4_SET_FIELD(0x08, VC4_HD_MAI_THR_PANICLOW) |
--		   VC4_SET_FIELD(0x06, VC4_HD_MAI_THR_DREQHIGH) |
--		   VC4_SET_FIELD(0x08, VC4_HD_MAI_THR_DREQLOW));
-+	if (vc4->is_vc5)
-+		HDMI_WRITE(HDMI_MAI_THR,
-+			VC4_SET_FIELD(0x10, VC4_HD_MAI_THR_PANICHIGH) |
-+			VC4_SET_FIELD(0x10, VC4_HD_MAI_THR_PANICLOW) |
-+			VC4_SET_FIELD(0x1c, VC4_HD_MAI_THR_DREQHIGH) |
-+			VC4_SET_FIELD(0x1c, VC4_HD_MAI_THR_DREQLOW));
-+	else
-+		HDMI_WRITE(HDMI_MAI_THR,
-+			VC4_SET_FIELD(0x8, VC4_HD_MAI_THR_PANICHIGH) |
-+			VC4_SET_FIELD(0x8, VC4_HD_MAI_THR_PANICLOW) |
-+			VC4_SET_FIELD(0x6, VC4_HD_MAI_THR_DREQHIGH) |
-+			VC4_SET_FIELD(0x8, VC4_HD_MAI_THR_DREQLOW));
- 
- 	HDMI_WRITE(HDMI_MAI_CONFIG,
- 		   VC4_HDMI_MAI_CONFIG_BIT_REVERSE |
diff --git a/target/linux/bcm27xx/patches-6.1/950-0732-ARM-dts-bcm2711-rpi-Set-a-1GB-ZONE_DMA-limit.patch b/target/linux/bcm27xx/patches-6.1/950-0732-ARM-dts-bcm2711-rpi-Set-a-1GB-ZONE_DMA-limit.patch
deleted file mode 100644
index e0083b8c63..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0732-ARM-dts-bcm2711-rpi-Set-a-1GB-ZONE_DMA-limit.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From f3e5f85353153a6941fc9e32871b5037e875d1ae Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 17 May 2023 13:39:18 +0100
-Subject: [PATCH] ARM: dts: bcm2711-rpi: Set a 1GB ZONE_DMA limit
-
-The arm64 initialisation uses the physical address reachable by all
-DMA controllers to set the size of ZONE_DMA. This fails on BCM2711
-with the current dts files because the declaration of the I/O space
-fools it into thinking the legacy 30-bit DMA channels can see most
-of the 32-bit space.
-
-Take advantage of the simple nature of the implementation by adding
-a node with a restricted dma-ranges property solely so to act as the
-limiting factor in the calculation.
-
-See: https://github.com/raspberrypi/linux/issues/5470
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2711-rpi-ds.dtsi | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
-+++ b/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
-@@ -63,6 +63,16 @@
- 		spi6 = &spi6;
- 		/delete-property/ intc;
- 	};
-+
-+	/*
-+	 * Add a node with a dma-ranges value that exists only to be found
-+	 * by of_dma_get_max_cpu_address, and hence limit the DMA zone.
-+	 */
-+	zone_dma {
-+		#address-cells = <1>;
-+		#size-cells = <1>;
-+		dma-ranges = <0x0  0x0 0x0  0x40000000>;
-+	};
- };
- 
- &vc4 {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0733-ARM-dts-bcm27xx-Add-stdout-path-to-serial0.patch b/target/linux/bcm27xx/patches-6.1/950-0733-ARM-dts-bcm27xx-Add-stdout-path-to-serial0.patch
deleted file mode 100644
index 3fe7b4ea2a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0733-ARM-dts-bcm27xx-Add-stdout-path-to-serial0.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d703aa3db7a3f6db81c6dcd03a8f462864e19144 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 17 May 2023 16:53:24 +0100
-Subject: [PATCH] ARM: dts: bcm27xx: Add stdout-path to serial0
-
-Rather than deleting the upstream stdout-path declaration, overwrite
-it with one selecting serial0, which will always be the UART mapped
-to the 40-pin header (provided enable_uart=1 is specified). Doing
-so has the advantage that earlycon can be configured just by adding
-"earlycon" to the command line.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/bcm270x.dtsi        | 2 +-
- arch/arm/boot/dts/bcm2711-rpi-ds.dtsi | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/arch/arm/boot/dts/bcm270x.dtsi
-+++ b/arch/arm/boot/dts/bcm270x.dtsi
-@@ -5,7 +5,7 @@
- 	chosen: chosen {
- 		// Disable audio by default
- 		bootargs = "coherent_pool=1M snd_bcm2835.enable_headphones=0";
--		/delete-property/ stdout-path;
-+		stdout-path = "serial0:115200n8";
- 	};
- 
- 	soc: soc {
---- a/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
-+++ b/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
-@@ -34,7 +34,7 @@
- 	};
- 
- 	chosen {
--		/delete-property/ stdout-path;
-+		stdout-path = "serial0:115200n8";
- 	};
- 
- 	aliases {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0734-input-edt-ft5x06-Only-read-data-for-number-of-points.patch b/target/linux/bcm27xx/patches-6.1/950-0734-input-edt-ft5x06-Only-read-data-for-number-of-points.patch
deleted file mode 100644
index 6b2442ce9a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0734-input-edt-ft5x06-Only-read-data-for-number-of-points.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 4c2cec3cfad183400f191413e4867f3f07273ed6 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 19 May 2023 18:16:58 +0100
-Subject: [PATCH] input: edt-ft5x06: Only read data for number of
- points reported
-
-Rather than always reading the maximum number of points supported
-by the chip (which may be as high as 10), read the number of
-active points first, and read data for just those.
-In most cases this will result in less data on the I2C bus,
-with only the maximum touch points taking more due to a second
-read that has to configure the start address.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/input/touchscreen/edt-ft5x06.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
---- a/drivers/input/touchscreen/edt-ft5x06.c
-+++ b/drivers/input/touchscreen/edt-ft5x06.c
-@@ -220,6 +220,7 @@ static irqreturn_t edt_ft5x06_ts_isr(int
- 		offset = 5; /* where the actual touch data starts */
- 		tplen = 4;  /* data comes in so called frames */
- 		crclen = 1; /* length of the crc data */
-+		datalen = tplen * tsdata->max_support_points + offset + crclen;
- 		break;
- 
- 	case EDT_M09:
-@@ -230,6 +231,7 @@ static irqreturn_t edt_ft5x06_ts_isr(int
- 		offset = 3;
- 		tplen = 6;
- 		crclen = 0;
-+		datalen = 3;
- 		break;
- 
- 	default:
-@@ -237,7 +239,6 @@ static irqreturn_t edt_ft5x06_ts_isr(int
- 	}
- 
- 	memset(rdbuf, 0, sizeof(rdbuf));
--	datalen = tplen * tsdata->max_support_points + offset + crclen;
- 
- 	error = edt_ft5x06_ts_readwrite(tsdata->client,
- 					sizeof(cmd), &cmd,
-@@ -267,6 +268,13 @@ static irqreturn_t edt_ft5x06_ts_isr(int
- 		 * points.
- 		 */
- 		num_points = min(rdbuf[2] & 0xf, tsdata->max_support_points);
-+		if (num_points) {
-+			datalen = tplen * num_points + crclen;
-+			cmd = offset;
-+			error = edt_ft5x06_ts_readwrite(tsdata->client,
-+							sizeof(cmd), &cmd,
-+							datalen, &rdbuf[offset]);
-+		}
- 	}
- 
- 	for (i = 0; i < num_points; i++) {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0735-i2c-bcm2835-Flush-FIFOs-cleanly-on-error.patch b/target/linux/bcm27xx/patches-6.1/950-0735-i2c-bcm2835-Flush-FIFOs-cleanly-on-error.patch
deleted file mode 100644
index 1c9e721fe4..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0735-i2c-bcm2835-Flush-FIFOs-cleanly-on-error.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From a563176190609097f9efa312a09f7a9b527c9a68 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 23 May 2023 14:11:52 +0100
-Subject: [PATCH] i2c-bcm2835: Flush FIFOs cleanly on error
-
-On error condition, note the error return code, but still
-handle the FIFOs in the normal way rather than relying on
-C_CLEAR flushing everything cleanly.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/i2c/busses/i2c-bcm2835.c | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
---- a/drivers/i2c/busses/i2c-bcm2835.c
-+++ b/drivers/i2c/busses/i2c-bcm2835.c
-@@ -385,10 +385,8 @@ static irqreturn_t bcm2835_i2c_isr(int t
- 	bcm2835_debug_add(i2c_dev, val);
- 
- 	err = val & (BCM2835_I2C_S_CLKT | BCM2835_I2C_S_ERR);
--	if (err) {
-+	if (err)
- 		i2c_dev->msg_err = err;
--		goto complete;
--	}
- 
- 	if (val & BCM2835_I2C_S_DONE) {
- 		if (!i2c_dev->curr_msg) {
-@@ -400,8 +398,6 @@ static irqreturn_t bcm2835_i2c_isr(int t
- 
- 		if ((val & BCM2835_I2C_S_RXD) || i2c_dev->msg_buf_remaining)
- 			i2c_dev->msg_err = BCM2835_I2C_S_LEN;
--		else
--			i2c_dev->msg_err = 0;
- 		goto complete;
- 	}
- 
-@@ -465,6 +461,7 @@ static int bcm2835_i2c_xfer(struct i2c_a
- 
- 	i2c_dev->curr_msg = msgs;
- 	i2c_dev->num_msgs = num;
-+	i2c_dev->msg_err = 0;
- 	reinit_completion(&i2c_dev->completion);
- 
- 	bcm2835_i2c_start_transfer(i2c_dev);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0736-i2c-bcm2835-Do-not-abort-transfers-on-ERR-if-still-a.patch b/target/linux/bcm27xx/patches-6.1/950-0736-i2c-bcm2835-Do-not-abort-transfers-on-ERR-if-still-a.patch
deleted file mode 100644
index 37375675bb..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0736-i2c-bcm2835-Do-not-abort-transfers-on-ERR-if-still-a.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f14a14edf12354103e28e8b0336614385766b30a Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 23 May 2023 14:14:05 +0100
-Subject: [PATCH] i2c-bcm2835: Do not abort transfers on ERR if still
- active
-
-If a transaction is aborted immediately on ERR being reported,
-then the bus is not returned to the STOP condition, and devices
-generally get very upset.
-
-Handle the ERR and CLKT conditions only when TA is not set.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/i2c/busses/i2c-bcm2835.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/i2c/busses/i2c-bcm2835.c
-+++ b/drivers/i2c/busses/i2c-bcm2835.c
-@@ -385,7 +385,7 @@ static irqreturn_t bcm2835_i2c_isr(int t
- 	bcm2835_debug_add(i2c_dev, val);
- 
- 	err = val & (BCM2835_I2C_S_CLKT | BCM2835_I2C_S_ERR);
--	if (err)
-+	if (err && !(val & BCM2835_I2C_S_TA))
- 		i2c_dev->msg_err = err;
- 
- 	if (val & BCM2835_I2C_S_DONE) {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0737-i2c-bcm2835-Implement-I2C_M_IGNORE_NAK.patch b/target/linux/bcm27xx/patches-6.1/950-0737-i2c-bcm2835-Implement-I2C_M_IGNORE_NAK.patch
deleted file mode 100644
index 7238b0293d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0737-i2c-bcm2835-Implement-I2C_M_IGNORE_NAK.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 5faad0781d619f13723886e36dfed3ea7eeff00f Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 23 May 2023 14:31:03 +0100
-Subject: [PATCH] i2c-bcm2835: Implement I2C_M_IGNORE_NAK
-
-Now that transfers aren't aborted immediately (and uncleanly) on
-errors, and the FIFOs are always drained after all transfers, we
-can implement I2C_M_IGNORE_NAK by ignoring the returned error
-value.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/i2c/busses/i2c-bcm2835.c | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
---- a/drivers/i2c/busses/i2c-bcm2835.c
-+++ b/drivers/i2c/busses/i2c-bcm2835.c
-@@ -443,6 +443,7 @@ static int bcm2835_i2c_xfer(struct i2c_a
- {
- 	struct bcm2835_i2c_dev *i2c_dev = i2c_get_adapdata(adap);
- 	unsigned long time_left;
-+	bool ignore_nak = false;
- 	int i;
- 
- 	if (debug)
-@@ -452,12 +453,15 @@ static int bcm2835_i2c_xfer(struct i2c_a
- 		for (i = 0; i < num; i++)
- 			bcm2835_debug_print_msg(i2c_dev, &msgs[i], i + 1, num, __func__);
- 
--	for (i = 0; i < (num - 1); i++)
-+	for (i = 0; i < (num - 1); i++) {
- 		if (msgs[i].flags & I2C_M_RD) {
- 			dev_warn_once(i2c_dev->dev,
- 				      "only one read message supported, has to be last\n");
- 			return -EOPNOTSUPP;
- 		}
-+		if (msgs[i].flags & I2C_M_IGNORE_NAK)
-+			ignore_nak = true;
-+	}
- 
- 	i2c_dev->curr_msg = msgs;
- 	i2c_dev->num_msgs = num;
-@@ -471,6 +475,9 @@ static int bcm2835_i2c_xfer(struct i2c_a
- 
- 	bcm2835_i2c_finish_transfer(i2c_dev);
- 
-+	if (ignore_nak)
-+		i2c_dev->msg_err &= ~BCM2835_I2C_S_ERR;
-+
- 	if (debug > 1 || (debug && (!time_left || i2c_dev->msg_err)))
- 		bcm2835_debug_print(i2c_dev);
- 	i2c_dev->debug_num_msgs = 0;
-@@ -497,7 +504,7 @@ static int bcm2835_i2c_xfer(struct i2c_a
- 
- static u32 bcm2835_i2c_func(struct i2c_adapter *adap)
- {
--	return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
-+	return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | I2C_FUNC_PROTOCOL_MANGLING;
- }
- 
- static const struct i2c_algorithm bcm2835_i2c_algo = {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0738-pps-Compatibility-hack-should-be-X86-specific.patch b/target/linux/bcm27xx/patches-6.1/950-0738-pps-Compatibility-hack-should-be-X86-specific.patch
deleted file mode 100644
index df24ee7607..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0738-pps-Compatibility-hack-should-be-X86-specific.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 138d22ae4abf49d9694a4398857fb4be5114f103 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 22 May 2023 14:22:55 +0100
-Subject: [PATCH] pps: Compatibility hack should be X86-specific
-
-As of [1], using PPS_FETCH on a 64-bit ARM kernel with a 32-bit userland
-is broken, returning a timeout. This is because the requested 4-byte
-alignment for struct pps_ktime_compat (illegal on arm64) results in the
-timeout flags field being uninitialised.
-
-Make the hack specific to X86_64 builds with CONFIG_COMPAT defined.
-
-[1] commit c2a49fe8eeef ("pps: fix padding issue with PPS_FETCH for
-    ioctl_compat")
-
-See: https://github.com/raspberrypi/linux/issues/5430
-Fixes: c2a49fe8eeef ("pps: fix padding issue with PPS_FETCH for ioctl_compat")
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/pps/pps.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/drivers/pps/pps.c
-+++ b/drivers/pps/pps.c
-@@ -249,12 +249,13 @@ static long pps_cdev_ioctl(struct file *
- static long pps_cdev_compat_ioctl(struct file *file,
- 		unsigned int cmd, unsigned long arg)
- {
--	struct pps_device *pps = file->private_data;
--	void __user *uarg = (void __user *) arg;
- 
- 	cmd = _IOC(_IOC_DIR(cmd), _IOC_TYPE(cmd), _IOC_NR(cmd), sizeof(void *));
- 
-+#ifdef CONFIG_X86_64
- 	if (cmd == PPS_FETCH) {
-+		struct pps_device *pps = file->private_data;
-+		void __user *uarg = (void __user *) arg;
- 		struct pps_fdata_compat compat;
- 		struct pps_fdata fdata;
- 		int err;
-@@ -289,6 +290,7 @@ static long pps_cdev_compat_ioctl(struct
- 		return copy_to_user(uarg, &compat,
- 				sizeof(struct pps_fdata_compat)) ? -EFAULT : 0;
- 	}
-+#endif
- 
- 	return pps_cdev_ioctl(file, cmd, arg);
- }
diff --git a/target/linux/bcm27xx/patches-6.1/950-0739-bcm2835-dma-Fixes-for-dma_abort.patch b/target/linux/bcm27xx/patches-6.1/950-0739-bcm2835-dma-Fixes-for-dma_abort.patch
deleted file mode 100644
index 9314cd73c7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0739-bcm2835-dma-Fixes-for-dma_abort.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-From 4db71468da38668b1b2b5ad3d8bf120f702b6387 Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Thu, 25 May 2023 17:04:20 +0100
-Subject: [PATCH] bcm2835-dma: Fixes for dma_abort
-
-There is a problem with the current abort scheme
-when dma is blocked on a DREQ which prevents halting.
-
-This is triggered by SPI driver which aborts dma
-in this state and so leads to a halt timeout.
-
-Discussion with Broadcom suggests the sequence:
-
-CS.ACTIVE=0
-while (CS.OUTSTANDING_TRANSACTIONS == 0)
-  wait()
-DEBUG.RESET=1
-
-should be safe on a dma40 channel.
-
-Unfortunately the non-dma40 channels don't have
-OUTSTANDING_TRANSACTIONS, so we need a more
-complicated scheme.
-
-We attempt to abort the channel, which will work
-if there is no blocked DREQ.
-
-It it times out, we can assume there is no AXI
-transfer in progress and reset anyway.
-
-The length of the timeout is observed at ~20us.
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/dma/bcm2835-dma.c | 74 +++++++++++++++++++++------------------
- 1 file changed, 40 insertions(+), 34 deletions(-)
-
---- a/drivers/dma/bcm2835-dma.c
-+++ b/drivers/dma/bcm2835-dma.c
-@@ -245,6 +245,7 @@ struct bcm2835_desc {
- #define BCM2711_DMA40_ERR		BIT(10)
- #define BCM2711_DMA40_QOS(x)		(((x) & 0x1f) << 16)
- #define BCM2711_DMA40_PANIC_QOS(x)	(((x) & 0x1f) << 20)
-+#define BCM2711_DMA40_TRANSACTIONS	BIT(25)
- #define BCM2711_DMA40_WAIT_FOR_WRITES	BIT(28)
- #define BCM2711_DMA40_DISDEBUG		BIT(29)
- #define BCM2711_DMA40_ABORT		BIT(30)
-@@ -663,30 +664,37 @@ static void bcm2835_dma_fill_cb_chain_wi
- static void bcm2835_dma_abort(struct bcm2835_chan *c)
- {
- 	void __iomem *chan_base = c->chan_base;
--	long int timeout = 10000;
--
--	/*
--	 * A zero control block address means the channel is idle.
--	 * (The ACTIVE flag in the CS register is not a reliable indicator.)
--	 */
--	if (!readl(chan_base + BCM2835_DMA_ADDR))
--		return;
-+	long timeout = 100;
- 
- 	if (c->is_40bit_channel) {
--		/* Halt the current DMA */
--		writel(readl(chan_base + BCM2711_DMA40_CS) | BCM2711_DMA40_HALT,
-+		/*
-+		 * A zero control block address means the channel is idle.
-+		 * (The ACTIVE flag in the CS register is not a reliable indicator.)
-+		 */
-+		if (!readl(chan_base + BCM2711_DMA40_CB))
-+			return;
-+
-+		/* Pause the current DMA */
-+		writel(readl(chan_base + BCM2711_DMA40_CS) & ~BCM2711_DMA40_ACTIVE,
- 			     chan_base + BCM2711_DMA40_CS);
- 
--		while ((readl(chan_base + BCM2711_DMA40_CS) & BCM2711_DMA40_HALT) && --timeout)
-+		/* wait for outstanding transactions to complete */
-+		while ((readl(chan_base + BCM2711_DMA40_CS) & BCM2711_DMA40_TRANSACTIONS) &&
-+			--timeout)
- 			cpu_relax();
- 
--		/* Peripheral might be stuck and fail to halt */
-+		/* Peripheral might be stuck and fail to complete */
- 		if (!timeout)
- 			dev_err(c->vc.chan.device->dev,
--				"failed to halt dma\n");
-+				"failed to complete pause on dma %d (CS:%08x)\n", c->ch,
-+				readl(chan_base + BCM2711_DMA40_CS));
- 
-+		/* Set CS back to default state */
- 		writel(BCM2711_DMA40_PROT, chan_base + BCM2711_DMA40_CS);
--		writel(0, chan_base + BCM2711_DMA40_CB);
-+
-+		/* Reset the DMA */
-+		writel(readl(chan_base + BCM2711_DMA40_DEBUG) | BCM2711_DMA40_DEBUG_RESET,
-+		       chan_base + BCM2711_DMA40_DEBUG);
- 	} else {
- 		/*
- 		 * A zero control block address means the channel is idle.
-@@ -695,36 +703,34 @@ static void bcm2835_dma_abort(struct bcm
- 		if (!readl(chan_base + BCM2835_DMA_ADDR))
- 			return;
- 
--		/* Write 0 to the active bit - Pause the DMA */
--		writel(readl(chan_base + BCM2835_DMA_CS) & ~BCM2835_DMA_ACTIVE,
--		       chan_base + BCM2835_DMA_CS);
--
--		/* wait for DMA to be paused */
--		while ((readl(chan_base + BCM2835_DMA_CS) & BCM2835_DMA_WAITING_FOR_WRITES)
--		       && --timeout)
--			cpu_relax();
--
--		/* Peripheral might be stuck and fail to signal AXI write responses */
--		if (!timeout)
--			dev_err(c->vc.chan.device->dev,
--				"failed to pause dma\n");
--
- 		/* We need to clear the next DMA block pending */
- 		writel(0, chan_base + BCM2835_DMA_NEXTCB);
- 
- 		/* Abort the DMA, which needs to be enabled to complete */
- 		writel(readl(chan_base + BCM2835_DMA_CS) | BCM2835_DMA_ABORT | BCM2835_DMA_ACTIVE,
--		chan_base + BCM2835_DMA_CS);
-+		      chan_base + BCM2835_DMA_CS);
- 
--		/* wait for DMA to have been aborted */
--		timeout = 10000;
-+		/* wait for DMA to be aborted */
- 		while ((readl(chan_base + BCM2835_DMA_CS) & BCM2835_DMA_ABORT) && --timeout)
- 			cpu_relax();
- 
--		/* Peripheral might be stuck and fail to signal AXI write responses */
--		if (!timeout)
-+		/* Write 0 to the active bit - Pause the DMA */
-+		writel(readl(chan_base + BCM2835_DMA_CS) & ~BCM2835_DMA_ACTIVE,
-+		       chan_base + BCM2835_DMA_CS);
-+
-+		/*
-+		 * Peripheral might be stuck and fail to complete
-+		 * This is expected when dreqs are enabled but not asserted
-+		 * so only report error in non dreq case
-+		 */
-+		if (!timeout && !(readl(chan_base + BCM2835_DMA_TI) &
-+		   (BCM2835_DMA_S_DREQ | BCM2835_DMA_D_DREQ)))
- 			dev_err(c->vc.chan.device->dev,
--				"failed to abort dma\n");
-+				"failed to complete pause on dma %d (CS:%08x)\n", c->ch,
-+				readl(chan_base + BCM2835_DMA_CS));
-+
-+		/* Set CS back to default state and reset the DMA */
-+		writel(BCM2835_DMA_RESET, chan_base + BCM2835_DMA_CS);
- 	}
- }
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0740-bcm2835-dma-Move-definition-of-PROT-bits-to-expected.patch b/target/linux/bcm27xx/patches-6.1/950-0740-bcm2835-dma-Move-definition-of-PROT-bits-to-expected.patch
deleted file mode 100644
index b5f287f3c3..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0740-bcm2835-dma-Move-definition-of-PROT-bits-to-expected.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 432d271f831a8182efa9a6ae9769fb81c32370da Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Tue, 30 May 2023 15:51:48 +0100
-Subject: [PATCH] bcm2835-dma: Move definition of PROT bits to expected
- place
-
-Fixes: 654368fe848c ("bcm2835-dma: Need to keep PROT bits set in CS on 40bit controller")
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/dma/bcm2835-dma.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/dma/bcm2835-dma.c
-+++ b/drivers/dma/bcm2835-dma.c
-@@ -242,6 +242,8 @@ struct bcm2835_desc {
- #define BCM2711_DMA40_WR_PAUSED		BIT(5)  /* Writing is paused */
- #define BCM2711_DMA40_DREQ_PAUSED	BIT(6)  /* Is paused by DREQ flow control */
- #define BCM2711_DMA40_WAITING_FOR_WRITES BIT(7)  /* Waiting for last write */
-+// we always want to run in supervisor mode
-+#define BCM2711_DMA40_PROT		(BIT(8)|BIT(9))
- #define BCM2711_DMA40_ERR		BIT(10)
- #define BCM2711_DMA40_QOS(x)		(((x) & 0x1f) << 16)
- #define BCM2711_DMA40_PANIC_QOS(x)	(((x) & 0x1f) << 20)
-@@ -250,8 +252,6 @@ struct bcm2835_desc {
- #define BCM2711_DMA40_DISDEBUG		BIT(29)
- #define BCM2711_DMA40_ABORT		BIT(30)
- #define BCM2711_DMA40_HALT		BIT(31)
--// we always want to run in supervisor mode
--#define BCM2711_DMA40_PROT		(BIT(8)|BIT(9))
- 
- #define BCM2711_DMA40_CS_FLAGS(x) (x & (BCM2711_DMA40_QOS(15) | \
- 					BCM2711_DMA40_PANIC_QOS(15) | \
diff --git a/target/linux/bcm27xx/patches-6.1/950-0741-drivers-media-imx296-Disable-2x2-binned-mode.patch b/target/linux/bcm27xx/patches-6.1/950-0741-drivers-media-imx296-Disable-2x2-binned-mode.patch
deleted file mode 100644
index eb1e8f303e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0741-drivers-media-imx296-Disable-2x2-binned-mode.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 9af77c3135bd68fc825cb2aaaae2d5d58aa56ad8 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Wed, 31 May 2023 15:51:58 +0100
-Subject: [PATCH] drivers: media: imx296: Disable 2x2 binned mode
-
-Disable enumerating and setting of the 2x2 binned mode entirely as it
-does not seem to work for either mono or colour sensor variants.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/i2c/imx296.c | 36 +++++++-----------------------------
- 1 file changed, 7 insertions(+), 29 deletions(-)
-
---- a/drivers/media/i2c/imx296.c
-+++ b/drivers/media/i2c/imx296.c
-@@ -745,12 +745,14 @@ static int imx296_enum_frame_size(struct
- {
- 	const struct imx296 *sensor = to_imx296(sd);
- 	const struct v4l2_mbus_framefmt *format;
--	/* Binning only works on the mono sensor variant */
--	unsigned int max_index = sensor->mono ? 2 : 1;
- 
- 	format = v4l2_subdev_get_pad_format(sd, state, fse->pad);
- 
--	if (fse->index >= max_index || fse->code != imx296_mbus_code(sensor))
-+	/*
-+	 * Binning does not seem to work on either mono or colour sensor
-+	 * variants. Disable enumerating the binned frame size for now.
-+	 */
-+	if (fse->index >= 1 || fse->code != imx296_mbus_code(sensor))
- 		return -EINVAL;
- 
- 	fse->min_width = IMX296_PIXEL_ARRAY_WIDTH / (fse->index + 1);
-@@ -781,32 +783,8 @@ static int imx296_set_format(struct v4l2
- 	crop = v4l2_subdev_get_pad_crop(sd, state, fmt->pad);
- 	format = v4l2_subdev_get_pad_format(sd, state, fmt->pad);
- 
--	/*
--	 * Binning is only allowed when cropping is disabled according to the
--	 * documentation. This should be double-checked.
--	 */
--	if (crop->width == IMX296_PIXEL_ARRAY_WIDTH &&
--	    crop->height == IMX296_PIXEL_ARRAY_HEIGHT) {
--		unsigned int width;
--		unsigned int height;
--		unsigned int hratio;
--		unsigned int vratio;
--
--		/* Clamp the width and height to avoid dividing by zero. */
--		width = clamp_t(unsigned int, fmt->format.width,
--				crop->width / 2, crop->width);
--		height = clamp_t(unsigned int, fmt->format.height,
--				 crop->height / 2, crop->height);
--
--		hratio = DIV_ROUND_CLOSEST(crop->width, width);
--		vratio = DIV_ROUND_CLOSEST(crop->height, height);
--
--		format->width = crop->width / hratio;
--		format->height = crop->height / vratio;
--	} else {
--		format->width = crop->width;
--		format->height = crop->height;
--	}
-+	format->width = crop->width;
-+	format->height = crop->height;
- 
- 	imx296_setup_hblank(sensor, format->width);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0742-panel-sitronix-st7701-Fix-panel-prepare-over-SPI.patch b/target/linux/bcm27xx/patches-6.1/950-0742-panel-sitronix-st7701-Fix-panel-prepare-over-SPI.patch
deleted file mode 100644
index eccffec4e1..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0742-panel-sitronix-st7701-Fix-panel-prepare-over-SPI.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 162aedd492c420bbfe3d44dae1770c60a6c367bb Mon Sep 17 00:00:00 2001
-From: Jack Andersen <jackoalan@gmail.com>
-Date: Fri, 26 May 2023 12:19:19 -0700
-Subject: [PATCH] panel-sitronix-st7701: Fix panel prepare over SPI
-
-A DSI write is issued in st7701_prepare even when the probed panel
-runs on SPI. In practice, this results in a panic with the
-vc4-kms-dpi-hyperpixel2r overlay active.
-
-Perform the equivalent write over SPI in this case.
-
-Signed-off-by: Jack Andersen <jackoalan@gmail.com>
----
- drivers/gpu/drm/panel/panel-sitronix-st7701.c | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
---- a/drivers/gpu/drm/panel/panel-sitronix-st7701.c
-+++ b/drivers/gpu/drm/panel/panel-sitronix-st7701.c
-@@ -571,8 +571,16 @@ static int st7701_prepare(struct drm_pan
- 		st7701->desc->gip_sequence(st7701);
- 
- 	/* Disable Command2 */
--	ST7701_DSI(st7701, DSI_CMD2BKX_SEL,
--		   0x77, 0x01, 0x00, 0x00, DSI_CMD2BKX_SEL_NONE);
-+	switch (st7701->desc->interface) {
-+	case ST7701_CTRL_DSI:
-+		ST7701_DSI(st7701, DSI_CMD2BKX_SEL,
-+			   0x77, 0x01, 0x00, 0x00, DSI_CMD2BKX_SEL_NONE);
-+		break;
-+	case ST7701_CTRL_SPI:
-+		ST7701_SPI(st7701, DSI_CMD2BKX_SEL,
-+			   0x177, 0x101, 0x100, 0x100, SPI_CMD2BKX_SEL_NONE);
-+		break;
-+	}
- 
- 	return 0;
- }
diff --git a/target/linux/bcm27xx/patches-6.1/950-0790-media-i2c-imx219-fix-binning-and-rate_factor-for-480.patch b/target/linux/bcm27xx/patches-6.1/950-0790-media-i2c-imx219-fix-binning-and-rate_factor-for-480.patch
deleted file mode 100644
index 276e51d2d9..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0790-media-i2c-imx219-fix-binning-and-rate_factor-for-480.patch
+++ /dev/null
@@ -1,306 +0,0 @@
-From 3ad8e28669e0058e3cec482a47215e50e33f2574 Mon Sep 17 00:00:00 2001
-From: Vinay Varma <varmavinaym@gmail.com>
-Date: Sun, 11 Jun 2023 23:45:03 +0800
-Subject: [PATCH] media: i2c: imx219: fix binning and rate_factor for 480p and
- 1232p
-
-At a high FPS with RAW10, there is frame corruption for 480p because the
-rate_factor of 2 is used with the normal 2x2 bining [1]. This commit
-ties the rate_factor to the selected binning mode. For the 480p mode,
-analog 2x2 binning mode with a rate_factor of 2 is always used. For the
-1232p mode the normal 2x2 binning mode is used for RAW10 while analog
-2x2 binning mode is used for RAW8.
-
-[1] https://github.com/raspberrypi/linux/issues/5493
-
-Signed-off-by: Vinay Varma <varmavinaym@gmail.com>
----
- drivers/media/i2c/imx219.c | 143 ++++++++++++++++++++++++++-----------
- 1 file changed, 100 insertions(+), 43 deletions(-)
-
---- a/drivers/media/i2c/imx219.c
-+++ b/drivers/media/i2c/imx219.c
-@@ -136,6 +136,18 @@ enum pad_types {
- 	NUM_PADS
- };
- 
-+enum binning_mode {
-+	BINNING_NONE,
-+	BINNING_DIGITAL_2x2,
-+	BINNING_ANALOG_2x2,
-+};
-+
-+enum binning_bit_depths {
-+	BINNING_IDX_8_BIT,
-+	BINNING_IDX_10_BIT,
-+	BINNING_IDX_MAX
-+};
-+
- struct imx219_reg {
- 	u16 address;
- 	u8 val;
-@@ -162,11 +174,8 @@ struct imx219_mode {
- 	/* Default register values */
- 	struct imx219_reg_list reg_list;
- 
--	/* 2x2 binning is used */
--	bool binning;
--
--	/* Relative pixel clock rate factor for the mode. */
--	unsigned int rate_factor;
-+	/* binning mode based on format code */
-+	enum binning_mode binning[BINNING_IDX_MAX];
- };
- 
- static const struct imx219_reg imx219_common_regs[] = {
-@@ -404,8 +413,10 @@ static const struct imx219_mode supporte
- 			.num_of_regs = ARRAY_SIZE(mode_3280x2464_regs),
- 			.regs = mode_3280x2464_regs,
- 		},
--		.binning = false,
--		.rate_factor = 1,
-+		.binning = {
-+			[BINNING_IDX_8_BIT] = BINNING_NONE,
-+			[BINNING_IDX_10_BIT] = BINNING_NONE,
-+		},
- 	},
- 	{
- 		/* 1080P 30fps cropped */
-@@ -422,8 +433,10 @@ static const struct imx219_mode supporte
- 			.num_of_regs = ARRAY_SIZE(mode_1920_1080_regs),
- 			.regs = mode_1920_1080_regs,
- 		},
--		.binning = false,
--		.rate_factor = 1,
-+		.binning = {
-+			[BINNING_IDX_8_BIT] = BINNING_NONE,
-+			[BINNING_IDX_10_BIT] = BINNING_NONE,
-+		},
- 	},
- 	{
- 		/* 2x2 binned 30fps mode */
-@@ -440,8 +453,10 @@ static const struct imx219_mode supporte
- 			.num_of_regs = ARRAY_SIZE(mode_1640_1232_regs),
- 			.regs = mode_1640_1232_regs,
- 		},
--		.binning = true,
--		.rate_factor = 1,
-+		.binning = {
-+			[BINNING_IDX_8_BIT] = BINNING_ANALOG_2x2,
-+			[BINNING_IDX_10_BIT] = BINNING_DIGITAL_2x2,
-+		},
- 	},
- 	{
- 		/* 640x480 30fps mode */
-@@ -458,12 +473,10 @@ static const struct imx219_mode supporte
- 			.num_of_regs = ARRAY_SIZE(mode_640_480_regs),
- 			.regs = mode_640_480_regs,
- 		},
--		.binning = true,
--		/*
--		 * This mode uses a special 2x2 binning that doubles the
--		 * internal pixel clock rate.
--		 */
--		.rate_factor = 2,
-+		.binning = {
-+			[BINNING_IDX_8_BIT] = BINNING_ANALOG_2x2,
-+			[BINNING_IDX_10_BIT] = BINNING_ANALOG_2x2,
-+		},
- 	},
- };
- 
-@@ -652,12 +665,51 @@ static int imx219_open(struct v4l2_subde
- 	return 0;
- }
- 
-+static int imx219_resolve_binning(struct imx219 *imx219,
-+				  enum binning_mode *binning)
-+{
-+	switch (imx219->fmt.code) {
-+	case MEDIA_BUS_FMT_SRGGB8_1X8:
-+	case MEDIA_BUS_FMT_SGRBG8_1X8:
-+	case MEDIA_BUS_FMT_SGBRG8_1X8:
-+	case MEDIA_BUS_FMT_SBGGR8_1X8:
-+		*binning = imx219->mode->binning[BINNING_IDX_8_BIT];
-+		return 0;
-+
-+	case MEDIA_BUS_FMT_SRGGB10_1X10:
-+	case MEDIA_BUS_FMT_SGRBG10_1X10:
-+	case MEDIA_BUS_FMT_SGBRG10_1X10:
-+	case MEDIA_BUS_FMT_SBGGR10_1X10:
-+		*binning = imx219->mode->binning[BINNING_IDX_10_BIT];
-+		return 0;
-+	}
-+	return -EINVAL;
-+}
-+
-+static int imx219_get_rate_factor(struct imx219 *imx219)
-+{
-+	enum binning_mode binning = BINNING_NONE;
-+	int ret = imx219_resolve_binning(imx219, &binning);
-+
-+	if (ret < 0)
-+		return ret;
-+	switch (binning) {
-+	case BINNING_NONE:
-+	case BINNING_DIGITAL_2x2:
-+		return 1;
-+	case BINNING_ANALOG_2x2:
-+		return 2;
-+	}
-+	return -EINVAL;
-+}
-+
- static int imx219_set_ctrl(struct v4l2_ctrl *ctrl)
- {
- 	struct imx219 *imx219 =
- 		container_of(ctrl->handler, struct imx219, ctrl_handler);
- 	struct i2c_client *client = v4l2_get_subdevdata(&imx219->sd);
- 	int ret;
-+	int rate_factor;
- 
- 	if (ctrl->id == V4L2_CID_VBLANK) {
- 		int exposure_max, exposure_def;
-@@ -679,6 +731,10 @@ static int imx219_set_ctrl(struct v4l2_c
- 	if (pm_runtime_get_if_in_use(&client->dev) == 0)
- 		return 0;
- 
-+	rate_factor = imx219_get_rate_factor(imx219);
-+	if (rate_factor < 0)
-+		return rate_factor;
-+
- 	switch (ctrl->id) {
- 	case V4L2_CID_ANALOGUE_GAIN:
- 		ret = imx219_write_reg(imx219, IMX219_REG_ANALOG_GAIN,
-@@ -687,7 +743,7 @@ static int imx219_set_ctrl(struct v4l2_c
- 	case V4L2_CID_EXPOSURE:
- 		ret = imx219_write_reg(imx219, IMX219_REG_EXPOSURE,
- 				       IMX219_REG_VALUE_16BIT,
--				       ctrl->val / imx219->mode->rate_factor);
-+				       ctrl->val / rate_factor);
- 		break;
- 	case V4L2_CID_DIGITAL_GAIN:
- 		ret = imx219_write_reg(imx219, IMX219_REG_DIGITAL_GAIN,
-@@ -708,7 +764,7 @@ static int imx219_set_ctrl(struct v4l2_c
- 		ret = imx219_write_reg(imx219, IMX219_REG_VTS,
- 				       IMX219_REG_VALUE_16BIT,
- 				       (imx219->mode->height + ctrl->val) /
--						imx219->mode->rate_factor);
-+						rate_factor);
- 		break;
- 	case V4L2_CID_HBLANK:
- 		ret = imx219_write_reg(imx219, IMX219_REG_HTS,
-@@ -890,7 +946,7 @@ static int imx219_set_pad_format(struct
- 	struct imx219 *imx219 = to_imx219(sd);
- 	const struct imx219_mode *mode;
- 	struct v4l2_mbus_framefmt *framefmt;
--	int exposure_max, exposure_def, hblank, pixel_rate;
-+	int exposure_max, exposure_def, hblank, pixel_rate, rate_factor;
- 	unsigned int i;
- 
- 	if (fmt->pad >= NUM_PADS)
-@@ -924,6 +980,9 @@ static int imx219_set_pad_format(struct
- 
- 			imx219->fmt = fmt->format;
- 			imx219->mode = mode;
-+			rate_factor = imx219_get_rate_factor(imx219);
-+			if (rate_factor < 0)
-+				return rate_factor;
- 			/* Update limits and set FPS to default */
- 			__v4l2_ctrl_modify_range(imx219->vblank,
- 						 IMX219_VBLANK_MIN,
-@@ -957,8 +1016,7 @@ static int imx219_set_pad_format(struct
- 			__v4l2_ctrl_s_ctrl(imx219->hblank, hblank);
- 
- 			/* Scale the pixel rate based on the mode specific factor */
--			pixel_rate =
--				IMX219_PIXEL_RATE * imx219->mode->rate_factor;
-+			pixel_rate = IMX219_PIXEL_RATE * rate_factor;
- 			__v4l2_ctrl_modify_range(imx219->pixel_rate, pixel_rate,
- 						 pixel_rate, 1, pixel_rate);
- 		}
-@@ -1001,30 +1059,25 @@ static int imx219_set_framefmt(struct im
- 
- static int imx219_set_binning(struct imx219 *imx219)
- {
--	if (!imx219->mode->binning) {
-+	enum binning_mode binning = BINNING_NONE;
-+	int ret = imx219_resolve_binning(imx219, &binning);
-+
-+	if (ret < 0)
-+		return ret;
-+	switch (binning) {
-+	case BINNING_NONE:
- 		return imx219_write_reg(imx219, IMX219_REG_BINNING_MODE,
- 					IMX219_REG_VALUE_16BIT,
- 					IMX219_BINNING_NONE);
--	}
--
--	switch (imx219->fmt.code) {
--	case MEDIA_BUS_FMT_SRGGB8_1X8:
--	case MEDIA_BUS_FMT_SGRBG8_1X8:
--	case MEDIA_BUS_FMT_SGBRG8_1X8:
--	case MEDIA_BUS_FMT_SBGGR8_1X8:
-+	case BINNING_DIGITAL_2x2:
- 		return imx219_write_reg(imx219, IMX219_REG_BINNING_MODE,
- 					IMX219_REG_VALUE_16BIT,
--					IMX219_BINNING_2X2_ANALOG);
--
--	case MEDIA_BUS_FMT_SRGGB10_1X10:
--	case MEDIA_BUS_FMT_SGRBG10_1X10:
--	case MEDIA_BUS_FMT_SGBRG10_1X10:
--	case MEDIA_BUS_FMT_SBGGR10_1X10:
-+					IMX219_BINNING_2X2);
-+	case BINNING_ANALOG_2x2:
- 		return imx219_write_reg(imx219, IMX219_REG_BINNING_MODE,
- 					IMX219_REG_VALUE_16BIT,
--					IMX219_BINNING_2X2);
-+					IMX219_BINNING_2X2_ANALOG);
- 	}
--
- 	return -EINVAL;
- }
- 
-@@ -1342,7 +1395,7 @@ static int imx219_init_controls(struct i
- 	struct v4l2_ctrl_handler *ctrl_hdlr;
- 	unsigned int height = imx219->mode->height;
- 	struct v4l2_fwnode_device_properties props;
--	int exposure_max, exposure_def, hblank, pixel_rate;
-+	int exposure_max, exposure_def, hblank, pixel_rate, rate_factor;
- 	int i, ret;
- 
- 	ctrl_hdlr = &imx219->ctrl_handler;
-@@ -1353,8 +1406,12 @@ static int imx219_init_controls(struct i
- 	mutex_init(&imx219->mutex);
- 	ctrl_hdlr->lock = &imx219->mutex;
- 
-+	rate_factor = imx219_get_rate_factor(imx219);
-+	if (rate_factor < 0)
-+		return rate_factor;
-+
- 	/* By default, PIXEL_RATE is read only */
--	pixel_rate = IMX219_PIXEL_RATE * imx219->mode->rate_factor;
-+	pixel_rate = IMX219_PIXEL_RATE * rate_factor;
- 	imx219->pixel_rate = v4l2_ctrl_new_std(ctrl_hdlr, &imx219_ctrl_ops,
- 					       V4L2_CID_PIXEL_RATE,
- 					       pixel_rate, pixel_rate,
-@@ -1576,6 +1633,9 @@ static int imx219_probe(struct i2c_clien
- 		goto error_power_off;
- 	usleep_range(100, 110);
- 
-+	/* Initialize default format */
-+	imx219_set_default_format(imx219);
-+
- 	ret = imx219_init_controls(imx219);
- 	if (ret)
- 		goto error_power_off;
-@@ -1590,9 +1650,6 @@ static int imx219_probe(struct i2c_clien
- 	imx219->pad[IMAGE_PAD].flags = MEDIA_PAD_FL_SOURCE;
- 	imx219->pad[METADATA_PAD].flags = MEDIA_PAD_FL_SOURCE;
- 
--	/* Initialize default format */
--	imx219_set_default_format(imx219);
--
- 	ret = media_entity_pads_init(&imx219->sd.entity, NUM_PADS, imx219->pad);
- 	if (ret) {
- 		dev_err(dev, "failed to init entity pads: %d\n", ret);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0791-serial-sc16is7xx-Read-modem-line-state-at-startup.patch b/target/linux/bcm27xx/patches-6.1/950-0791-serial-sc16is7xx-Read-modem-line-state-at-startup.patch
deleted file mode 100644
index 291302306c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0791-serial-sc16is7xx-Read-modem-line-state-at-startup.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 52039b6ffb6e78c2f77319b167dceab9aa51d13f Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 13 Jun 2023 16:12:54 +0100
-Subject: [PATCH] serial: sc16is7xx: Read modem line state at startup
-
-This patch sets the driver modem line state to the actual line state
-at driver startup.
-
-See: https://github.com/raspberrypi/linux/issues/5501
-
-Signed-off-by: Earl Schmidt <schmidt.earl.f@gmail.com>
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/tty/serial/sc16is7xx.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/tty/serial/sc16is7xx.c
-+++ b/drivers/tty/serial/sc16is7xx.c
-@@ -1193,6 +1193,9 @@ static int sc16is7xx_startup(struct uart
- 	      SC16IS7XX_IER_MSI_BIT;
- 	sc16is7xx_port_write(port, SC16IS7XX_IER_REG, val);
- 
-+	/* Initialize the Modem Control signals to current status */
-+	one->old_mctrl = sc16is7xx_get_hwmctrl(port);
-+
- 	/* Enable modem status polling */
- 	uart_port_lock_irqsave(port, &flags);
- 	sc16is7xx_enable_ms(port);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0792-drivers-media-bcm2835_unicam-Improve-frame-sequence-.patch b/target/linux/bcm27xx/patches-6.1/950-0792-drivers-media-bcm2835_unicam-Improve-frame-sequence-.patch
deleted file mode 100644
index 6de340c2a9..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0792-drivers-media-bcm2835_unicam-Improve-frame-sequence-.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 6ef818eed60db70e9caf6bdf74cc1f9943994226 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Fri, 16 Jun 2023 16:24:19 +0100
-Subject: [PATCH] drivers: media: bcm2835_unicam: Improve frame sequence count
- handling
-
-Ensure that the frame sequence counter is incremented only if a previous
-frame start interrupt has occurred, or a frame start + frame end has
-occurred simultaneously.
-
-This corresponds the sequence number with the actual number of frames
-produced by the sensor, not the number of frame buffers dequeued back
-to userland.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- .../media/platform/bcm2835/bcm2835-unicam.c   | 19 ++++++++++++++++++-
- 1 file changed, 18 insertions(+), 1 deletion(-)
-
---- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
-+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-@@ -522,6 +522,7 @@ struct unicam_device {
- 	/* subdevice async Notifier */
- 	struct v4l2_async_notifier notifier;
- 	unsigned int sequence;
-+	bool frame_started;
- 
- 	/* ptr to  sub device */
- 	struct v4l2_subdev *sensor;
-@@ -914,6 +915,8 @@ static irqreturn_t unicam_isr(int irq, v
- 	 * buffer forever.
- 	 */
- 	if (fe) {
-+		bool inc_seq = unicam->frame_started;
-+
- 		/*
- 		 * Ensure we have swapped buffers already as we can't
- 		 * stop the peripheral. If no buffer is available, use a
-@@ -949,11 +952,23 @@ static irqreturn_t unicam_isr(int irq, v
- 				unicam_process_buffer_complete(node, sequence);
- 				node->cur_frm = node->next_frm;
- 				node->next_frm = NULL;
-+				inc_seq = true;
- 			} else {
- 				node->cur_frm = node->next_frm;
- 			}
- 		}
--		unicam->sequence++;
-+
-+		/*
-+		 * Increment the sequence number conditionally on either a FS
-+		 * having already occurred, or in the FE + FS condition as
-+		 * caught in the FE handler above. This ensures the sequence
-+		 * number corresponds to the frames generated by the sensor, not
-+		 * the frames dequeued to userland.
-+		 */
-+		if (inc_seq) {
-+			unicam->sequence++;
-+			unicam->frame_started = false;
-+		}
- 	}
- 
- 	if (ista & UNICAM_FSI) {
-@@ -996,6 +1011,7 @@ static irqreturn_t unicam_isr(int irq, v
- 		}
- 
- 		unicam_queue_event_sof(unicam);
-+		unicam->frame_started = true;
- 	}
- 
- 	/*
-@@ -2600,6 +2616,7 @@ static int unicam_start_streaming(struct
- 			vb2_dma_contig_plane_dma_addr(&buf->vb.vb2_buf, 0);
- 	}
- 
-+	dev->frame_started = false;
- 	unicam_start_rx(dev, buffer_addr);
- 
- 	ret = v4l2_subdev_call(dev->sensor, video, s_stream, 1);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0793-dtoverlays-Fix-pitft-28-35-overlays-for-6.1-driver-c.patch b/target/linux/bcm27xx/patches-6.1/950-0793-dtoverlays-Fix-pitft-28-35-overlays-for-6.1-driver-c.patch
deleted file mode 100644
index d8307f9009..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0793-dtoverlays-Fix-pitft-28-35-overlays-for-6.1-driver-c.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From bd8e59b0456870997fb917bcd3b3b696e78d4ac2 Mon Sep 17 00:00:00 2001
-From: 6by9 <6by9@users.noreply.github.com>
-Date: Mon, 19 Jun 2023 16:02:36 +0100
-Subject: [PATCH] dtoverlays: Fix pitft[28|35] overlays for 6.1 driver change.
- (#5508)
-
-The overlays configured both irq-gpio and an interrupts/
-interrupt-parent configuration for the stmpe MFD device.
-
-irq-gpio was reworked in 6.1 and has issues with the configuration
-as provided. Removing it and using the interrupts/interrupt-parent
-configuration works fine, so do that.
-
-See: https://forums.raspberrypi.com/viewtopic.php?t=351394
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts | 1 -
- arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts | 1 -
- 2 files changed, 2 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts
-@@ -68,7 +68,6 @@
- 				reg = <1>;
- 
- 				spi-max-frequency = <500000>;
--				irq-gpio = <&gpio 24 0x2>; /* IRQF_TRIGGER_FALLING */
- 				interrupts = <24 2>; /* high-to-low edge triggered */
- 				interrupt-parent = <&gpio>;
- 				interrupt-controller;
---- a/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts
-@@ -68,7 +68,6 @@
- 				reg = <1>;
- 
- 				spi-max-frequency = <500000>;
--				irq-gpio = <&gpio 24 0x2>; /* IRQF_TRIGGER_FALLING */
- 				interrupts = <24 2>; /* high-to-low edge triggered */
- 				interrupt-parent = <&gpio>;
- 				interrupt-controller;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0795-driver-media-i2c-imx477-Re-enable-temperature-sensor.patch b/target/linux/bcm27xx/patches-6.1/950-0795-driver-media-i2c-imx477-Re-enable-temperature-sensor.patch
deleted file mode 100644
index 2255efd988..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0795-driver-media-i2c-imx477-Re-enable-temperature-sensor.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 713a7ef9d73fca0f7fed122cb854d930b7a6ba5a Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Wed, 21 Jun 2023 08:45:02 +0100
-Subject: [PATCH] driver: media: i2c: imx477: Re-enable temperature sensor
-
-The temperature sensor enable register write got lost at some point.
-Re-enable it.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/i2c/imx477.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/media/i2c/imx477.c
-+++ b/drivers/media/i2c/imx477.c
-@@ -167,6 +167,7 @@ struct imx477_mode {
- static const struct imx477_reg mode_common_regs[] = {
- 	{0x0136, 0x18},
- 	{0x0137, 0x00},
-+	{0x0138, 0x01},
- 	{0xe000, 0x00},
- 	{0xe07a, 0x01},
- 	{0x0808, 0x02},
diff --git a/target/linux/bcm27xx/patches-6.1/950-0796-overlays-allo-katana-dac-audio-Reduce-I2C-clock.patch b/target/linux/bcm27xx/patches-6.1/950-0796-overlays-allo-katana-dac-audio-Reduce-I2C-clock.patch
deleted file mode 100644
index 43f63a1c63..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0796-overlays-allo-katana-dac-audio-Reduce-I2C-clock.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d4c3133378b377ee519ea50247339cd61221fc47 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 21 Jun 2023 09:20:36 +0100
-Subject: [PATCH] overlays: allo-katana-dac-audio: Reduce I2C clock
-
-Higher speeds have been shown to cause data corruption on a Pi 4,
-possibly due to clock-stretching.
-
-See: https://github.com/raspberrypi/linux/issues/5511
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/allo-katana-dac-audio-overlay.dts | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/arch/arm/boot/dts/overlays/allo-katana-dac-audio-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/allo-katana-dac-audio-overlay.dts
-@@ -30,6 +30,7 @@
- 			#address-cells = <1>;
- 			#size-cells = <0>;
- 			status = "okay";
-+			clock-frequency = <50000>;
- 
- 			allo-katana-codec@30 {
- 				#sound-dai-cells = <0>;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0797-overlays-jedec-spi-nor-Add-speed-parameter.patch b/target/linux/bcm27xx/patches-6.1/950-0797-overlays-jedec-spi-nor-Add-speed-parameter.patch
deleted file mode 100644
index 66c147837d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0797-overlays-jedec-spi-nor-Add-speed-parameter.patch
+++ /dev/null
@@ -1,308 +0,0 @@
-From 76c457e7e2920342637b1955fbaadf2aae282f05 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Fri, 23 Jun 2023 09:48:59 +0100
-Subject: [PATCH] overlays: jedec-spi-nor: Add speed parameter
-
-Add a speed parameter to the jedec-spi-nor overlay to allow much
-faster accesses, taking the opportunity to simplify the internals.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/README             |   8 +-
- .../dts/overlays/jedec-spi-nor-overlay.dts    | 245 +++---------------
- 2 files changed, 41 insertions(+), 212 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -2557,9 +2557,11 @@ Name:   jedec-spi-nor
- Info:   Adds support for JEDEC-compliant SPI NOR flash devices.  (Note: The
-         "jedec,spi-nor" kernel driver was formerly known as "m25p80".)
- Load:   dtoverlay=jedec-spi-nor,<param>=<val>
--Params: flash-spi<n>-<m>        Enables flash device on SPI<n>, CS#<m>.
--        flash-fastr-spi<n>-<m>  Enables flash device with fast read capability
--                                on SPI<n>, CS#<m>.
-+Params: spi<n>-<m>              Enable flash device on SPI<n>, CS#<m>
-+        fastr                   Add fast read capability to the flash device
-+        speed                   Maximum SPI frequency (Hz)
-+        flash-spi<n>-<m>        Same as spi<n>-<m> (deprecated)
-+        flash-fastr-spi<n>-<m>  Same as spi<n>->m>,fastr (deprecated)
- 
- 
- Name:   justboom-both
---- a/arch/arm/boot/dts/overlays/jedec-spi-nor-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/jedec-spi-nor-overlay.dts
-@@ -3,6 +3,7 @@
- // dtparams:
- //     flash-spi<n>-<m>        - Enables flash device on SPI<n>, CS#<m>.
- //     flash-fastr-spi<n>-<m>  - Enables flash device with fast read capability on SPI<n>, CS#<m>.
-+//     speed                   - Set the SPI clock speed in Hz
- //
- // If devices are present on SPI1 or SPI2, those interfaces must be enabled with one of the spi1-1/2/3cs and/or spi2-1/2/3cs overlays.
- //
-@@ -79,50 +80,23 @@
- 		};
- 	};
- 
--	// enable flash on spi0.0
-+	// Enable fast read for device
-+	// Use default active low interrupt signalling.
- 	fragment@8 {
--		target = <&spi0>;
-+		target = <&spi_nor>;
- 		__dormant__ {
--			status = "okay";
--                        #address-cells = <1>;
--                        #size-cells = <0>;
--			spi_nor_00: spi_nor@0 {
--				#address-cells = <1>;
--				#size-cells = <1>;
--				compatible = "jedec,spi-nor";
--				reg = <0>;
--				spi-max-frequency = <500000>;
--			};
-+			m25p,fast-read;
- 		};
- 	};
- 
--	// enable flash on spi0.1
--	fragment@9 {
-+	payload: fragment@100 {
- 		target = <&spi0>;
--		__dormant__ {
-+		__overlay__ {
- 			status = "okay";
--                        #address-cells = <1>;
--                        #size-cells = <0>;
--			spi_nor_01: spi_nor@1 {
--				#address-cells = <1>;
--				#size-cells = <1>;
--				compatible = "jedec,spi-nor";
--				reg = <1>;
--				spi-max-frequency = <500000>;
--			};
--		};
--	};
-+			#address-cells = <1>;
-+			#size-cells = <0>;
- 
--	// enable flash on spi1.0
--	fragment@10 {
--		target = <&spi1>;
--		__dormant__ {
--			status = "okay";
--                        #address-cells = <1>;
--                        #size-cells = <0>;
--			spi_nor_10: spi_nor@0 {
--				#address-cells = <1>;
--				#size-cells = <1>;
-+			spi_nor: spi_nor@0 {
- 				compatible = "jedec,spi-nor";
- 				reg = <0>;
- 				spi-max-frequency = <500000>;
-@@ -130,180 +104,33 @@
- 		};
- 	};
- 
--	// enable flash on spi1.1
--	fragment@11 {
--		target = <&spi1>;
--		__dormant__ {
--			status = "okay";
--                        #address-cells = <1>;
--                        #size-cells = <0>;
--			spi_nor_11: spi_nor@1 {
--				#address-cells = <1>;
--				#size-cells = <1>;
--				compatible = "jedec,spi-nor";
--				reg = <1>;
--				spi-max-frequency = <500000>;
--			};
--		};
--	};
--
--	// enable flash on spi1.2
--	fragment@12 {
--		target = <&spi1>;
--		__dormant__ {
--			status = "okay";
--                        #address-cells = <1>;
--                        #size-cells = <0>;
--			spi_nor_12: spi_nor@2 {
--				#address-cells = <1>;
--				#size-cells = <1>;
--				compatible = "jedec,spi-nor";
--				reg = <2>;
--				spi-max-frequency = <500000>;
--			};
--		};
--	};
--
--	// enable flash on spi2.0
--	fragment@13 {
--		target = <&spi2>;
--		__dormant__ {
--			status = "okay";
--                        #address-cells = <1>;
--                        #size-cells = <0>;
--			spi_nor_20: spi_nor@0 {
--				#address-cells = <1>;
--				#size-cells = <1>;
--				compatible = "jedec,spi-nor";
--				reg = <0>;
--				spi-max-frequency = <500000>;
--			};
--		};
--	};
--
--	// enable flash on spi2.1
--	fragment@14 {
--		target = <&spi2>;
--		__dormant__ {
--			status = "okay";
--                        #address-cells = <1>;
--                        #size-cells = <0>;
--			spi_nor_21: spi_nor@1 {
--				#address-cells = <1>;
--				#size-cells = <1>;
--				compatible = "jedec,spi-nor";
--				reg = <1>;
--				spi-max-frequency = <500000>;
--			};
--		};
--	};
--
--	// enable flash on spi2.2
--	fragment@15 {
--		target = <&spi2>;
--		__dormant__ {
--			status = "okay";
--                        #address-cells = <1>;
--                        #size-cells = <0>;
--			spi_nor_22: spi_nor@2 {
--				#address-cells = <1>;
--				#size-cells = <1>;
--				compatible = "jedec,spi-nor";
--				reg = <2>;
--				spi-max-frequency = <500000>;
--			};
--		};
--	};
--
--	// Enable fast read for device on spi0.0.
--	// Use default active low interrupt signalling.
--	fragment@16 {
--		target = <&spi_nor_00>;
--		__dormant__ {
--			m25p,fast-read;
--		};
--	};
--
--	// Enable fast read for device on spi0.1.
--	// Use default active low interrupt signalling.
--	fragment@17 {
--		target = <&spi_nor_01>;
--		__dormant__ {
--			m25p,fast-read;
--		};
--	};
--
--	// Enable fast read for device on spi1.0.
--	// Use default active low interrupt signalling.
--	fragment@18 {
--		target = <&spi_nor_10>;
--		__dormant__ {
--			m25p,fast-read;
--		};
--	};
--
--	// Enable fast read for device on spi1.1.
--	// Use default active low interrupt signalling.
--	fragment@19 {
--		target = <&spi_nor_11>;
--		__dormant__ {
--			m25p,fast-read;
--		};
--	};
--
--	// Enable fast read for device on spi1.2.
--	// Use default active low interrupt signalling.
--	fragment@20 {
--		target = <&spi_nor_12>;
--		__dormant__ {
--			m25p,fast-read;
--		};
--	};
--
--	// Enable fast read for device on spi2.0.
--	// Use default active low interrupt signalling.
--	fragment@21 {
--		target = <&spi_nor_20>;
--		__dormant__ {
--			m25p,fast-read;
--		};
--	};
--
--	// Enable fast read for device on spi2.1.
--	// Use default active low interrupt signalling.
--	fragment@22 {
--		target = <&spi_nor_21>;
--		__dormant__ {
--			m25p,fast-read;
--		};
--	};
--
--	// Enable fast read for device on spi2.2.
--	// Use default active low interrupt signalling.
--	fragment@23 {
--		target = <&spi_nor_22>;
--		__dormant__ {
--			m25p,fast-read;
--		};
--	};
--
- 	__overrides__ {
--		flash-spi0-0       = <0>,"+0+8";
--		flash-spi0-1       = <0>,"+1+9";
--		flash-spi1-0       = <0>,"+2+10";
--		flash-spi1-1       = <0>,"+3+11";
--		flash-spi1-2       = <0>,"+4+12";
--		flash-spi2-0       = <0>,"+5+13";
--		flash-spi2-1       = <0>,"+6+14";
--		flash-spi2-2       = <0>,"+7+15";
--		flash-fastr-spi0-0 = <0>,"+0+8+16";
--		flash-fastr-spi0-1 = <0>,"+1+9+17";
--		flash-fastr-spi1-0 = <0>,"+2+10+18";
--		flash-fastr-spi1-1 = <0>,"+3+11+19";
--		flash-fastr-spi1-2 = <0>,"+4+12+20";
--		flash-fastr-spi2-0 = <0>,"+5+13+21";
--		flash-fastr-spi2-1 = <0>,"+6+14+22";
--		flash-fastr-spi2-2 = <0>,"+7+15+23";
-+		spi0-0             = <0>,"+0", <&payload>,"target:0=",<&spi0>, <&spi_nor>,"reg:0=0";
-+		spi0-1             = <0>,"+1", <&payload>,"target:0=",<&spi0>, <&spi_nor>,"reg:0=1";
-+		spi1-0             = <0>,"+2", <&payload>,"target:0=",<&spi1>, <&spi_nor>,"reg:0=0";
-+		spi1-1             = <0>,"+3", <&payload>,"target:0=",<&spi1>, <&spi_nor>,"reg:0=1";
-+		spi1-2             = <0>,"+4", <&payload>,"target:0=",<&spi1>, <&spi_nor>,"reg:0=2";
-+		spi2-0             = <0>,"+5", <&payload>,"target:0=",<&spi2>, <&spi_nor>,"reg:0=0";
-+		spi2-1             = <0>,"+6", <&payload>,"target:0=",<&spi2>, <&spi_nor>,"reg:0=1";
-+		spi2-2             = <0>,"+7", <&payload>,"target:0=",<&spi2>, <&spi_nor>,"reg:0=2";
-+		flash-spi0-0       = <0>,"+0", <&payload>,"target:0=",<&spi0>, <&spi_nor>,"reg:0=0";
-+		flash-spi0-1       = <0>,"+1", <&payload>,"target:0=",<&spi0>, <&spi_nor>,"reg:0=1";
-+		flash-spi1-0       = <0>,"+2", <&payload>,"target:0=",<&spi1>, <&spi_nor>,"reg:0=0";
-+		flash-spi1-1       = <0>,"+3", <&payload>,"target:0=",<&spi1>, <&spi_nor>,"reg:0=1";
-+		flash-spi1-2       = <0>,"+4", <&payload>,"target:0=",<&spi1>, <&spi_nor>,"reg:0=2";
-+		flash-spi2-0       = <0>,"+5", <&payload>,"target:0=",<&spi2>, <&spi_nor>,"reg:0=0";
-+		flash-spi2-1       = <0>,"+6", <&payload>,"target:0=",<&spi2>, <&spi_nor>,"reg:0=1";
-+		flash-spi2-2       = <0>,"+7", <&payload>,"target:0=",<&spi2>, <&spi_nor>,"reg:0=2";
-+		flash-fastr-spi0-0 = <0>,"+0+8", <&payload>,"target:0=",<&spi0>, <&spi_nor>,"reg:0=0";
-+		flash-fastr-spi0-1 = <0>,"+1+8", <&payload>,"target:0=",<&spi0>, <&spi_nor>,"reg:0=1";
-+		flash-fastr-spi1-0 = <0>,"+2+8", <&payload>,"target:0=",<&spi1>, <&spi_nor>,"reg:0=0";
-+		flash-fastr-spi1-1 = <0>,"+3+8", <&payload>,"target:0=",<&spi1>, <&spi_nor>,"reg:0=1";
-+		flash-fastr-spi1-2 = <0>,"+4+8", <&payload>,"target:0=",<&spi1>, <&spi_nor>,"reg:0=2";
-+		flash-fastr-spi2-0 = <0>,"+5+8", <&payload>,"target:0=",<&spi2>, <&spi_nor>,"reg:0=0";
-+		flash-fastr-spi2-1 = <0>,"+6+8", <&payload>,"target:0=",<&spi2>, <&spi_nor>,"reg:0=1";
-+		flash-fastr-spi2-2 = <0>,"+7+8", <&payload>,"target:0=",<&spi2>, <&spi_nor>,"reg:0=2";
-+		fastr              = <0>,"+8";
-+		speed              = <&spi_nor>, "spi-max-frequency:0";
- 	};
- };
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0798-ALSA-pcm-fix-ELD-constraints-for-E-AC3-DTS-HD-and-ML.patch b/target/linux/bcm27xx/patches-6.1/950-0798-ALSA-pcm-fix-ELD-constraints-for-E-AC3-DTS-HD-and-ML.patch
deleted file mode 100644
index a35e7f4d1b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0798-ALSA-pcm-fix-ELD-constraints-for-E-AC3-DTS-HD-and-ML.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From e866f9fc7c6dd6af1e74ce6fa50db9ba21acae5e Mon Sep 17 00:00:00 2001
-From: Matthias Reichl <hias@horus.com>
-Date: Sat, 24 Jun 2023 18:52:16 +0200
-Subject: [PATCH] ALSA: pcm: fix ELD constraints for (E)AC3, DTS(-HD) and MLP
- formats
-
-commit 04b49b90caeed0b5544ff616d654900d27d403b6 upstream.
-
-The SADs of compressed formats contain the channel and sample rate
-info of the audio data inside the compressed stream, but when
-building constraints we must use the rates and channels used to
-transport the compressed streams.
-
-eg 48kHz 6ch EAC3 needs to be transmitted as a 2ch 192kHz stream.
-
-This patch fixes the constraints for the common AC3 and DTS formats,
-the constraints for the less common MPEG, DSD etc formats are copied
-directly from the info in the SADs as before as I don't have the specs
-and equipment to test those.
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
-Link: https://lore.kernel.org/r/20230624165216.5719-1-hias@horus.com
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- sound/core/pcm_drm_eld.c | 73 ++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 70 insertions(+), 3 deletions(-)
-
---- a/sound/core/pcm_drm_eld.c
-+++ b/sound/core/pcm_drm_eld.c
-@@ -2,11 +2,25 @@
- /*
-  *  PCM DRM helpers
-  */
-+#include <linux/bitfield.h>
- #include <linux/export.h>
-+#include <linux/hdmi.h>
- #include <drm/drm_edid.h>
- #include <sound/pcm.h>
- #include <sound/pcm_drm_eld.h>
- 
-+#define SAD0_CHANNELS_MASK	GENMASK(2, 0) /* max number of channels - 1 */
-+#define SAD0_FORMAT_MASK	GENMASK(6, 3) /* audio format */
-+
-+#define SAD1_RATE_MASK		GENMASK(6, 0) /* bitfield of supported rates */
-+#define SAD1_RATE_32000_MASK	BIT(0)
-+#define SAD1_RATE_44100_MASK	BIT(1)
-+#define SAD1_RATE_48000_MASK	BIT(2)
-+#define SAD1_RATE_88200_MASK	BIT(3)
-+#define SAD1_RATE_96000_MASK	BIT(4)
-+#define SAD1_RATE_176400_MASK	BIT(5)
-+#define SAD1_RATE_192000_MASK	BIT(6)
-+
- static const unsigned int eld_rates[] = {
- 	32000,
- 	44100,
-@@ -17,9 +31,62 @@ static const unsigned int eld_rates[] =
- 	192000,
- };
- 
-+static unsigned int map_rate_families(const u8 *sad,
-+				      unsigned int mask_32000,
-+				      unsigned int mask_44100,
-+				      unsigned int mask_48000)
-+{
-+	unsigned int rate_mask = 0;
-+
-+	if (sad[1] & SAD1_RATE_32000_MASK)
-+		rate_mask |= mask_32000;
-+	if (sad[1] & (SAD1_RATE_44100_MASK | SAD1_RATE_88200_MASK | SAD1_RATE_176400_MASK))
-+		rate_mask |= mask_44100;
-+	if (sad[1] & (SAD1_RATE_48000_MASK | SAD1_RATE_96000_MASK | SAD1_RATE_192000_MASK))
-+		rate_mask |= mask_48000;
-+	return rate_mask;
-+}
-+
-+static unsigned int sad_rate_mask(const u8 *sad)
-+{
-+	switch (FIELD_GET(SAD0_FORMAT_MASK, sad[0])) {
-+	case HDMI_AUDIO_CODING_TYPE_PCM:
-+		return sad[1] & SAD1_RATE_MASK;
-+	case HDMI_AUDIO_CODING_TYPE_AC3:
-+	case HDMI_AUDIO_CODING_TYPE_DTS:
-+		return map_rate_families(sad,
-+					 SAD1_RATE_32000_MASK,
-+					 SAD1_RATE_44100_MASK,
-+					 SAD1_RATE_48000_MASK);
-+	case HDMI_AUDIO_CODING_TYPE_EAC3:
-+	case HDMI_AUDIO_CODING_TYPE_DTS_HD:
-+	case HDMI_AUDIO_CODING_TYPE_MLP:
-+		return map_rate_families(sad,
-+					 0,
-+					 SAD1_RATE_176400_MASK,
-+					 SAD1_RATE_192000_MASK);
-+	default:
-+		/* TODO adjust for other compressed formats as well */
-+		return sad[1] & SAD1_RATE_MASK;
-+	}
-+}
-+
- static unsigned int sad_max_channels(const u8 *sad)
- {
--	return 1 + (sad[0] & 7);
-+	switch (FIELD_GET(SAD0_FORMAT_MASK, sad[0])) {
-+	case HDMI_AUDIO_CODING_TYPE_PCM:
-+		return 1 + FIELD_GET(SAD0_CHANNELS_MASK, sad[0]);
-+	case HDMI_AUDIO_CODING_TYPE_AC3:
-+	case HDMI_AUDIO_CODING_TYPE_DTS:
-+	case HDMI_AUDIO_CODING_TYPE_EAC3:
-+		return 2;
-+	case HDMI_AUDIO_CODING_TYPE_DTS_HD:
-+	case HDMI_AUDIO_CODING_TYPE_MLP:
-+		return 8;
-+	default:
-+		/* TODO adjust for other compressed formats as well */
-+		return 1 + FIELD_GET(SAD0_CHANNELS_MASK, sad[0]);
-+	}
- }
- 
- static int eld_limit_rates(struct snd_pcm_hw_params *params,
-@@ -42,7 +109,7 @@ static int eld_limit_rates(struct snd_pc
- 			 * requested number of channels.
- 			 */
- 			if (c->min <= max_channels)
--				rate_mask |= sad[1];
-+				rate_mask |= sad_rate_mask(sad);
- 		}
- 	}
- 
-@@ -70,7 +137,7 @@ static int eld_limit_channels(struct snd
- 				rate_mask |= BIT(i);
- 
- 		for (i = drm_eld_sad_count(eld); i > 0; i--, sad += 3)
--			if (rate_mask & sad[1])
-+			if (rate_mask & sad_rate_mask(sad))
- 				t.max = max(t.max, sad_max_channels(sad));
- 	}
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0799-ASoC-hdmi-codec-fix-channel-info-for-compressed-form.patch b/target/linux/bcm27xx/patches-6.1/950-0799-ASoC-hdmi-codec-fix-channel-info-for-compressed-form.patch
deleted file mode 100644
index 31a351a4e8..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0799-ASoC-hdmi-codec-fix-channel-info-for-compressed-form.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 3f388718331b5ce2acd34730448db001759868aa Mon Sep 17 00:00:00 2001
-From: Matthias Reichl <hias@horus.com>
-Date: Sat, 24 Jun 2023 18:52:32 +0200
-Subject: [PATCH] ASoC: hdmi-codec: fix channel info for compressed formats
-
-commit 4e0871333661d2ec0ed3dc00a945c2160eccae77 upstream.
-
-According to CTA 861 the channel/speaker allocation info in the
-audio infoframe only applies to uncompressed (PCM) audio streams.
-
-The channel count info should indicate the number of channels
-in the transmitted audio, which usually won't match the number of
-channels used to transmit the compressed bitstream.
-
-Some devices (eg some Sony TVs) will refuse to decode compressed
-audio if these values are not set correctly.
-
-To fix this we can simply set the channel count to 0 (which means
-"refer to stream header") and set the channel/speaker allocation to 0
-as well (which would mean stereo FL/FR for PCM, a safe value all sinks
-will support) when transmitting compressed audio.
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
-Link: https://lore.kernel.org/r/20230624165232.5751-1-hias@horus.com
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- sound/soc/codecs/hdmi-codec.c | 36 +++++++++++++++++++++++------------
- 1 file changed, 24 insertions(+), 12 deletions(-)
-
---- a/sound/soc/codecs/hdmi-codec.c
-+++ b/sound/soc/codecs/hdmi-codec.c
-@@ -484,31 +484,43 @@ static int hdmi_codec_fill_codec_params(
- 					struct hdmi_codec_params *hp)
- {
- 	struct hdmi_codec_priv *hcp = snd_soc_dai_get_drvdata(dai);
--	int idx;
-+	int idx = HDMI_CODEC_CHMAP_IDX_UNKNOWN;
-+	u8 ca_id = 0;
-+	bool pcm_audio = !(hcp->iec_status[0] & IEC958_AES0_NONAUDIO);
-+
-+	if (pcm_audio) {
-+		/* Select a channel allocation that matches with ELD and pcm channels */
-+		idx = hdmi_codec_get_ch_alloc_table_idx(hcp, channels);
-+
-+		if (idx < 0) {
-+			dev_err(dai->dev, "Not able to map channels to speakers (%d)\n",
-+				idx);
-+			hcp->chmap_idx = HDMI_CODEC_CHMAP_IDX_UNKNOWN;
-+			return idx;
-+		}
- 
--	/* Select a channel allocation that matches with ELD and pcm channels */
--	idx = hdmi_codec_get_ch_alloc_table_idx(hcp, channels);
--	if (idx < 0) {
--		dev_err(dai->dev, "Not able to map channels to speakers (%d)\n",
--			idx);
--		hcp->chmap_idx = HDMI_CODEC_CHMAP_IDX_UNKNOWN;
--		return idx;
-+		ca_id = hdmi_codec_channel_alloc[idx].ca_id;
- 	}
- 
- 	memset(hp, 0, sizeof(*hp));
- 
- 	hdmi_audio_infoframe_init(&hp->cea);
--	hp->cea.channels = channels;
-+
-+	if (pcm_audio)
-+		hp->cea.channels = channels;
-+	else
-+		hp->cea.channels = 0;
-+
- 	hp->cea.coding_type = HDMI_AUDIO_CODING_TYPE_STREAM;
- 	hp->cea.sample_size = HDMI_AUDIO_SAMPLE_SIZE_STREAM;
- 	hp->cea.sample_frequency = HDMI_AUDIO_SAMPLE_FREQUENCY_STREAM;
--	hp->cea.channel_allocation = hdmi_codec_channel_alloc[idx].ca_id;
-+	hp->cea.channel_allocation = ca_id;
- 
- 	hp->sample_width = sample_width;
- 	hp->sample_rate = sample_rate;
- 	hp->channels = channels;
- 
--	hcp->chmap_idx = hdmi_codec_channel_alloc[idx].ca_id;
-+	hcp->chmap_idx = idx;
- 
- 	return 0;
- }
diff --git a/target/linux/bcm27xx/patches-6.1/950-0800-media-i2c-arducam_64mp-Modify-the-line-length-of-128.patch b/target/linux/bcm27xx/patches-6.1/950-0800-media-i2c-arducam_64mp-Modify-the-line-length-of-128.patch
deleted file mode 100644
index a423b8061b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0800-media-i2c-arducam_64mp-Modify-the-line-length-of-128.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 9c5a7f04cab6b020389d7c5af155b1ee7f46537d Mon Sep 17 00:00:00 2001
-From: Lee Jackson <lee.jackson@arducam.com>
-Date: Thu, 4 May 2023 11:14:04 +0800
-Subject: [PATCH] media: i2c: arducam_64mp: Modify the line length of 1280x720
- resolution
-
-Arducam 64MP has specific requirements for the line length, and if these
-conditions are not met, the camera will not function properly. Under the
-previous configuration, once a stream off operation is performed, the
-camera will not output any data, even if a stream on operation is
-performed. This prevents us from switching from 1280x720 to another
-resolution.
-
-Signed-off-by: Lee Jackson <lee.jackson@arducam.com>
----
- drivers/media/i2c/arducam_64mp.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
---- a/drivers/media/i2c/arducam_64mp.c
-+++ b/drivers/media/i2c/arducam_64mp.c
-@@ -1063,10 +1063,10 @@ static const struct arducam_64mp_reg mod
- 
- /* 720p 120fps mode */
- static const struct arducam_64mp_reg mode_1280x720_regs[] = {
--	{0x0342, 0x1d},
--	{0x0343, 0xc4},
--	{0x0340, 0x03},
--	{0x0341, 0xd8},
-+	{0x0342, 0x1b},
-+	{0x0343, 0x08},
-+	{0x0340, 0x04},
-+	{0x0341, 0x3b},
- 	{0x0344, 0x08},
- 	{0x0345, 0x10},
- 	{0x0346, 0x07},
-@@ -1209,7 +1209,7 @@ static const struct arducam_64mp_mode su
- 	}, {
- 		.width = 1280,
- 		.height = 720,
--		.line_length_pix = 0x1dc4,
-+		.line_length_pix = 0x1b08,
- 		.crop = {
- 			.left = ARDUCAM_64MP_PIXEL_ARRAY_LEFT + 2064,
- 			.top = ARDUCAM_64MP_PIXEL_ARRAY_TOP + 2032,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0801-media-i2c-arducam_64mp-Add-8000x6000-resolution.patch b/target/linux/bcm27xx/patches-6.1/950-0801-media-i2c-arducam_64mp-Add-8000x6000-resolution.patch
deleted file mode 100644
index 475ae634ad..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0801-media-i2c-arducam_64mp-Add-8000x6000-resolution.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 7b3d0124c5cf462d5be0b0d4e558002b74750911 Mon Sep 17 00:00:00 2001
-From: Lee Jackson <lee.jackson@arducam.com>
-Date: Fri, 5 May 2023 14:36:15 +0800
-Subject: [PATCH] media: i2c: arducam_64mp: Add 8000x6000 resolution
-
-Added 8000x6000 10-bit (cropped) @ 3fps mode for Arducam 64MP
-
-Signed-off-by: Lee Jackson <lee.jackson@arducam.com>
----
- drivers/media/i2c/arducam_64mp.c | 77 ++++++++++++++++++++++++++++++++
- 1 file changed, 77 insertions(+)
-
---- a/drivers/media/i2c/arducam_64mp.c
-+++ b/drivers/media/i2c/arducam_64mp.c
-@@ -849,6 +849,65 @@ static const struct arducam_64mp_reg mod
- 	{0x020f, 0x00},
- };
- 
-+/* 48 mpix 3.0fps */
-+static const struct arducam_64mp_reg mode_8000x6000_regs[] = {
-+	{0x0342, 0xb6},
-+	{0x0343, 0xb2},
-+	{0x0340, 0x19},
-+	{0x0341, 0x0e},
-+	{0x0344, 0x02},
-+	{0x0345, 0x70},
-+	{0x0346, 0x01},
-+	{0x0347, 0xd8},
-+	{0x0348, 0x21},
-+	{0x0349, 0xaf},
-+	{0x034a, 0x19},
-+	{0x034b, 0x47},
-+	{0x0900, 0x00},
-+	{0x0901, 0x11},
-+	{0x0902, 0x0a},
-+	{0x30d8, 0x00},
-+	{0x3200, 0x01},
-+	{0x3201, 0x01},
-+	{0x0408, 0x00},
-+	{0x0409, 0x00},
-+	{0x040a, 0x00},
-+	{0x040b, 0x00},
-+	{0x040c, 0x1f},
-+	{0x040d, 0x40},
-+	{0x040e, 0x17},
-+	{0x040f, 0x70},
-+	{0x034c, 0x1f},
-+	{0x034d, 0x40},
-+	{0x034e, 0x17},
-+	{0x034f, 0x70},
-+	{0x30d9, 0x01},
-+	{0x32d5, 0x01},
-+	{0x32d6, 0x00},
-+	{0x401e, 0x00},
-+	{0x40b8, 0x04},
-+	{0x40b9, 0x20},
-+	{0x40bc, 0x02},
-+	{0x40bd, 0x58},
-+	{0x40be, 0x02},
-+	{0x40bf, 0x58},
-+	{0x41a4, 0x00},
-+	{0x5a09, 0x01},
-+	{0x5a17, 0x01},
-+	{0x5a25, 0x01},
-+	{0x5a33, 0x01},
-+	{0x98d7, 0x14},
-+	{0x98d8, 0x14},
-+	{0x98d9, 0x00},
-+	{0x99c4, 0x00},
-+	{0x0202, 0x03},
-+	{0x0203, 0xe8},
-+	{0x0204, 0x00},
-+	{0x0205, 0x00},
-+	{0x020e, 0x01},
-+	{0x020f, 0x00},
-+};
-+
- /* 16 mpix 10fps */
- static const struct arducam_64mp_reg mode_4624x3472_regs[] = {
- 	{0x0342, 0x63},
-@@ -1135,6 +1194,24 @@ static const struct arducam_64mp_mode su
- 			.regs = mode_9152x6944_regs,
- 		}
- 	}, {
-+		.width = 8000,
-+		.height = 6000,
-+		.line_length_pix = 0xb6b2,
-+		.crop = {
-+			.left = ARDUCAM_64MP_PIXEL_ARRAY_LEFT + 624,
-+			.top = ARDUCAM_64MP_PIXEL_ARRAY_TOP + 472,
-+			.width = 9248,
-+			.height = 6944,
-+		},
-+		.timeperframe_default = {
-+			.numerator = 100,
-+			.denominator = 300
-+		},
-+		.reg_list = {
-+			.num_of_regs = ARRAY_SIZE(mode_8000x6000_regs),
-+			.regs = mode_8000x6000_regs,
-+		}
-+	}, {
- 		.width = 4624,
- 		.height = 3472,
- 		.line_length_pix = 0x6397,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0802-media-i2c-arducam_64mp-Add-PDAF-support.patch b/target/linux/bcm27xx/patches-6.1/950-0802-media-i2c-arducam_64mp-Add-PDAF-support.patch
deleted file mode 100644
index 8f96b33baa..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0802-media-i2c-arducam_64mp-Add-PDAF-support.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From b9d2d1862aa5b798cecb87a95d970ad34a4aebc0 Mon Sep 17 00:00:00 2001
-From: Lee Jackson <lee.jackson@arducam.com>
-Date: Tue, 30 May 2023 15:50:05 +0800
-Subject: [PATCH] media: i2c: arducam_64mp: Add PDAF support
-
-Enable PDAF output for all modes, and also need to modify Embedded Line
-Width to 11560 * 3 (two lines of Embedded Data + one line of PDAF).
-
-Signed-off-by: Lee Jackson <lee.jackson@arducam.com>
----
- drivers/media/i2c/arducam_64mp.c | 64 ++++++++++++++++++++++++++++++--
- 1 file changed, 61 insertions(+), 3 deletions(-)
-
---- a/drivers/media/i2c/arducam_64mp.c
-+++ b/drivers/media/i2c/arducam_64mp.c
-@@ -95,7 +95,7 @@
- #define ARDUCAM_64MP_TEST_PATTERN_GB_DEFAULT	0
- 
- /* Embedded metadata stream structure */
--#define ARDUCAM_64MP_EMBEDDED_LINE_WIDTH 16384
-+#define ARDUCAM_64MP_EMBEDDED_LINE_WIDTH (11560 * 3)
- #define ARDUCAM_64MP_NUM_EMBEDDED_LINES 1
- 
- enum pad_types {
-@@ -144,6 +144,7 @@ struct arducam_64mp_mode {
- };
- 
- static const struct arducam_64mp_reg mode_common_regs[] = {
-+	{0x0100, 0x00},
- 	{0x0136, 0x18},
- 	{0x0137, 0x00},
- 	{0x33F0, 0x01},
-@@ -788,6 +789,7 @@ static const struct arducam_64mp_reg mod
- 	{0x3092, 0x01},
- 	{0x3093, 0x00},
- 	{0x0350, 0x00},
-+	{0x3419, 0x00},
- };
- 
- /* 64 mpix 2.7fps */
-@@ -847,6 +849,14 @@ static const struct arducam_64mp_reg mod
- 	{0x0205, 0x00},
- 	{0x020e, 0x01},
- 	{0x020f, 0x00},
-+	{0x341a, 0x00},
-+	{0x341b, 0x00},
-+	{0x341c, 0x00},
-+	{0x341d, 0x00},
-+	{0x341e, 0x02},
-+	{0x341f, 0x3c},
-+	{0x3420, 0x02},
-+	{0x3421, 0x42},
- };
- 
- /* 48 mpix 3.0fps */
-@@ -906,6 +916,14 @@ static const struct arducam_64mp_reg mod
- 	{0x0205, 0x00},
- 	{0x020e, 0x01},
- 	{0x020f, 0x00},
-+	{0x341a, 0x00},
-+	{0x341b, 0x00},
-+	{0x341c, 0x00},
-+	{0x341d, 0x00},
-+	{0x341e, 0x01},
-+	{0x341f, 0xf4},
-+	{0x3420, 0x01},
-+	{0x3421, 0xf4},
- };
- 
- /* 16 mpix 10fps */
-@@ -959,6 +977,14 @@ static const struct arducam_64mp_reg mod
- 	{0x98d8, 0x8c},
- 	{0x98d9, 0x0a},
- 	{0x99c4, 0x16},
-+	{0x341a, 0x00},
-+	{0x341b, 0x00},
-+	{0x341c, 0x00},
-+	{0x341d, 0x00},
-+	{0x341e, 0x01},
-+	{0x341f, 0x21},
-+	{0x3420, 0x01},
-+	{0x3421, 0x21},
- };
- 
- /* 4k 20fps mode */
-@@ -1012,6 +1038,14 @@ static const struct arducam_64mp_reg mod
- 	{0x98d8, 0x8c},
- 	{0x98d9, 0x0a},
- 	{0x99c4, 0x16},
-+	{0x341a, 0x00},
-+	{0x341b, 0x00},
-+	{0x341c, 0x00},
-+	{0x341d, 0x00},
-+	{0x341e, 0x00},
-+	{0x341f, 0xf0},
-+	{0x3420, 0x00},
-+	{0x3421, 0xb4},
- };
- 
- /* 4x4 binned 30fps mode */
-@@ -1031,7 +1065,7 @@ static const struct arducam_64mp_reg mod
- 	{0x0900, 0x01},
- 	{0x0901, 0x44},
- 	{0x0902, 0x08},
--	{0x30d8, 0x00},
-+	{0x30d8, 0x04},
- 	{0x3200, 0x43},
- 	{0x3201, 0x43},
- 	{0x0408, 0x00},
-@@ -1046,7 +1080,7 @@ static const struct arducam_64mp_reg mod
- 	{0x034d, 0x08},
- 	{0x034e, 0x06},
- 	{0x034f, 0xc8},
--	{0x30d9, 0x01},
-+	{0x30d9, 0x00},
- 	{0x32d5, 0x00},
- 	{0x32d6, 0x00},
- 	{0x401e, 0x00},
-@@ -1065,6 +1099,14 @@ static const struct arducam_64mp_reg mod
- 	{0x98d8, 0x8c},
- 	{0x98d9, 0x0a},
- 	{0x99c4, 0x16},
-+	{0x341a, 0x00},
-+	{0x341b, 0x00},
-+	{0x341c, 0x00},
-+	{0x341d, 0x00},
-+	{0x341e, 0x00},
-+	{0x341f, 0x90},
-+	{0x3420, 0x00},
-+	{0x3421, 0x90},
- };
- 
- /* 1080p 60fps mode */
-@@ -1118,6 +1160,14 @@ static const struct arducam_64mp_reg mod
- 	{0x98d8, 0x8c},
- 	{0x98d9, 0x0a},
- 	{0x99c4, 0x16},
-+	{0x341a, 0x00},
-+	{0x341b, 0x00},
-+	{0x341c, 0x00},
-+	{0x341d, 0x00},
-+	{0x341e, 0x00},
-+	{0x341f, 0x78},
-+	{0x3420, 0x00},
-+	{0x3421, 0x5a},
- };
- 
- /* 720p 120fps mode */
-@@ -1171,6 +1221,14 @@ static const struct arducam_64mp_reg mod
- 	{0x98d8, 0x8c},
- 	{0x98d9, 0x0a},
- 	{0x99c4, 0x16},
-+	{0x341a, 0x00},
-+	{0x341b, 0x00},
-+	{0x341c, 0x00},
-+	{0x341d, 0x00},
-+	{0x341e, 0x00},
-+	{0x341f, 0x50},
-+	{0x3420, 0x00},
-+	{0x3421, 0x3c},
- };
- 
- /* Mode configs */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0803-overlays-audremap-Document-CM4-40-41-restriction.patch b/target/linux/bcm27xx/patches-6.1/950-0803-overlays-audremap-Document-CM4-40-41-restriction.patch
deleted file mode 100644
index bf1646322b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0803-overlays-audremap-Document-CM4-40-41-restriction.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 6f4106f7a7fdcbc03290008713915b4122988c90 Mon Sep 17 00:00:00 2001
-From: James Hughes <JamesH65@users.noreply.github.com>
-Date: Wed, 5 Jul 2023 15:43:30 +0100
-Subject: [PATCH] overlays: audremap: Document CM4 40&41 restriction
-
-Update audremap information to state pins 40,41 are not available on the CM4.
-
-Signed-off-by: James Hughes (james.hughes@raspberrypi.com)
----
- arch/arm/boot/dts/overlays/README | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -703,7 +703,8 @@ Params: swap_lr                 Reverse
-                                 nothing on BCM2711 (default off)
-         pins_12_13              Select GPIOs 12 & 13 (default)
-         pins_18_19              Select GPIOs 18 & 19
--        pins_40_41              Select GPIOs 40 & 41
-+        pins_40_41              Select GPIOs 40 & 41 (not available on CM4, used
-+                                for other purposes)
-         pins_40_45              Select GPIOs 40 & 45 (don't use on BCM2711 - the
-                                 pins are on different controllers)
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0804-fixup-Allow-mac-address-to-be-set-in-smsc95xx.patch b/target/linux/bcm27xx/patches-6.1/950-0804-fixup-Allow-mac-address-to-be-set-in-smsc95xx.patch
deleted file mode 100644
index 7dc9ee9af7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0804-fixup-Allow-mac-address-to-be-set-in-smsc95xx.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From 1d15e6a34222cc8d8eb1050e7a3e276b0348be41 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 3 Jul 2023 11:04:56 +0100
-Subject: [PATCH] fixup! Allow mac address to be set in smsc95xx
-
-usbnet: smsc95xx: Fix indentation of smsc95xx_is_macaddr_param()
-
-smsc95xx_is_macaddr_param() is incorrectly indented, it uses 7 spaces
-instead of tabs.  Fix it.
-
-Fixes: aac7b105788e ("Allow mac address to be set in smsc95xx")
-Signed-off-by: Philipp Rosenberger <p.rosenberger@kunbus.com>
-[lukas: fix netif_dbg() indentation as well, wordsmith commit message]
-Signed-off-by: Lukas Wunner <lukas@wunner.de>
-
-usbnet: smsc95xx: Simplify MAC address parsing
-
-Parsing the MAC address provided on the kernel command line can be
-simplified quite a bit by taking advantage of the kernel's built-in
-mac_pton() helper.
-
-Likewise emitting the MAC address can be simplified with the %pM
-format string conversion.
-
-Signed-off-by: Lukas Wunner <lukas@wunner.de>
-
-usbnet: smsc95xx: Fix style issues in smsc95xx_is_macaddr_param()
-
-It is bad practice to have a function named ..._is_...() which has side
-effects.  So drop the 'is' from the name.
-
-Per kernel convention return 0 on success and a negative errno on
-failure.
-
-Validate the MAC address retrieved from the command line.
-
-Signed-off-by: Philipp Rosenberger <p.rosenberger@kunbus.com>
-[lukas: leave 2nd function parameter unchanged, wordsmith commit message]
-Signed-off-by: Lukas Wunner <lukas@wunner.de>
----
- drivers/net/usb/smsc95xx.c | 61 +++++++++++---------------------------
- 1 file changed, 17 insertions(+), 44 deletions(-)
-
---- a/drivers/net/usb/smsc95xx.c
-+++ b/drivers/net/usb/smsc95xx.c
-@@ -810,49 +810,18 @@ static int smsc95xx_ioctl(struct net_dev
- }
- 
- /* Check the macaddr module parameter for a MAC address */
--static int smsc95xx_is_macaddr_param(struct usbnet *dev, struct net_device *nd)
-+static int smsc95xx_macaddr_param(struct usbnet *dev, struct net_device *nd)
- {
--       int i, j, got_num, num;
--       u8 mtbl[ETH_ALEN];
-+	u8 mtbl[ETH_ALEN];
- 
--       if (macaddr[0] == ':')
--               return 0;
--
--       i = 0;
--       j = 0;
--       num = 0;
--       got_num = 0;
--       while (j < ETH_ALEN) {
--               if (macaddr[i] && macaddr[i] != ':') {
--                       got_num++;
--                       if ('0' <= macaddr[i] && macaddr[i] <= '9')
--                               num = num * 16 + macaddr[i] - '0';
--                       else if ('A' <= macaddr[i] && macaddr[i] <= 'F')
--                               num = num * 16 + 10 + macaddr[i] - 'A';
--                       else if ('a' <= macaddr[i] && macaddr[i] <= 'f')
--                               num = num * 16 + 10 + macaddr[i] - 'a';
--                       else
--                               break;
--                       i++;
--               } else if (got_num == 2) {
--                       mtbl[j++] = (u8) num;
--                       num = 0;
--                       got_num = 0;
--                       i++;
--               } else {
--                       break;
--               }
--       }
--
--       if (j == ETH_ALEN) {
--               netif_dbg(dev, ifup, dev->net, "Overriding MAC address with: "
--               "%02x:%02x:%02x:%02x:%02x:%02x\n", mtbl[0], mtbl[1], mtbl[2],
--                                               mtbl[3], mtbl[4], mtbl[5]);
--	       dev_addr_mod(nd, 0, mtbl, ETH_ALEN);
--               return 1;
--       } else {
--               return 0;
--       }
-+	if (mac_pton(macaddr, mtbl)) {
-+		netif_dbg(dev, ifup, dev->net,
-+			  "Overriding MAC address with: %pM\n", mtbl);
-+		dev_addr_mod(nd, 0, mtbl, ETH_ALEN);
-+		return 0;
-+	} else {
-+		return -EINVAL;
-+	}
- }
- 
- static void smsc95xx_init_mac_address(struct usbnet *dev)
-@@ -879,8 +848,12 @@ static void smsc95xx_init_mac_address(st
- 	}
- 
- 	/* Check module parameters */
--	if (smsc95xx_is_macaddr_param(dev, dev->net))
--		return;
-+	if (smsc95xx_macaddr_param(dev, dev->net) == 0) {
-+		if (is_valid_ether_addr(dev->net->dev_addr)) {
-+			netif_dbg(dev, ifup, dev->net, "MAC address read from module parameter\n");
-+			return;
-+		}
-+	}
- 
- 	/* no useful static MAC address found. generate a random one */
- 	eth_hw_addr_random(dev->net);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0809-cfg80211-ship-debian-certificates-as-hex-files.patch b/target/linux/bcm27xx/patches-6.1/950-0809-cfg80211-ship-debian-certificates-as-hex-files.patch
deleted file mode 100644
index 593c95e2a2..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0809-cfg80211-ship-debian-certificates-as-hex-files.patch
+++ /dev/null
@@ -1,1455 +0,0 @@
-From a2d2745c311baa588fb0fffbe38076294f06b7c0 Mon Sep 17 00:00:00 2001
-From: Nicolai Buchwitz <n.buchwitz@kunbus.com>
-Date: Wed, 12 Jul 2023 11:30:42 +0200
-Subject: [PATCH] cfg80211: ship debian certificates as hex files
-
-Loading the regulatory database from the debian files fails with
-
-"loaded regulatory.db is malformed or signature is missing/invalid"
-
-due to missing certificates.  Add these debian-specific certificates
-from upstream to fix this error. See #5536 for details.
-
-The certificates have been imported as following:
-
-patch -p1 <<<$(
-curl https://salsa.debian.org/kernel-team/linux/-/raw/\
-master/debian/patches/debian/\
-wireless-add-debian-wireless-regdb-certificates.patch
-)
-
-Signed-off-by: Nicolai Buchwitz <n.buchwitz@kunbus.com>
----
- net/wireless/certs/debian.hex | 1426 +++++++++++++++++++++++++++++++++
- 1 file changed, 1426 insertions(+)
- create mode 100644 net/wireless/certs/debian.hex
-
---- /dev/null
-+++ b/net/wireless/certs/debian.hex
-@@ -0,0 +1,1426 @@
-+0x30,
-+0x82,
-+0x02,
-+0xbd,
-+0x30,
-+0x82,
-+0x01,
-+0xa5,
-+0x02,
-+0x14,
-+0x57,
-+0x7e,
-+0x02,
-+0x1c,
-+0xb9,
-+0x80,
-+0xe0,
-+0xe8,
-+0x20,
-+0x82,
-+0x1b,
-+0xa7,
-+0xb5,
-+0x4b,
-+0x49,
-+0x61,
-+0xb8,
-+0xb4,
-+0xfa,
-+0xdf,
-+0x30,
-+0x0d,
-+0x06,
-+0x09,
-+0x2a,
-+0x86,
-+0x48,
-+0x86,
-+0xf7,
-+0x0d,
-+0x01,
-+0x01,
-+0x0b,
-+0x05,
-+0x00,
-+0x30,
-+0x1a,
-+0x31,
-+0x18,
-+0x30,
-+0x16,
-+0x06,
-+0x03,
-+0x55,
-+0x04,
-+0x03,
-+0x0c,
-+0x0f,
-+0x62,
-+0x65,
-+0x6e,
-+0x68,
-+0x40,
-+0x64,
-+0x65,
-+0x62,
-+0x69,
-+0x61,
-+0x6e,
-+0x2e,
-+0x6f,
-+0x72,
-+0x67,
-+0x30,
-+0x20,
-+0x17,
-+0x0d,
-+0x32,
-+0x30,
-+0x30,
-+0x31,
-+0x33,
-+0x30,
-+0x31,
-+0x33,
-+0x32,
-+0x36,
-+0x31,
-+0x33,
-+0x5a,
-+0x18,
-+0x0f,
-+0x32,
-+0x31,
-+0x32,
-+0x30,
-+0x30,
-+0x31,
-+0x30,
-+0x36,
-+0x31,
-+0x33,
-+0x32,
-+0x36,
-+0x31,
-+0x33,
-+0x5a,
-+0x30,
-+0x1a,
-+0x31,
-+0x18,
-+0x30,
-+0x16,
-+0x06,
-+0x03,
-+0x55,
-+0x04,
-+0x03,
-+0x0c,
-+0x0f,
-+0x62,
-+0x65,
-+0x6e,
-+0x68,
-+0x40,
-+0x64,
-+0x65,
-+0x62,
-+0x69,
-+0x61,
-+0x6e,
-+0x2e,
-+0x6f,
-+0x72,
-+0x67,
-+0x30,
-+0x82,
-+0x01,
-+0x22,
-+0x30,
-+0x0d,
-+0x06,
-+0x09,
-+0x2a,
-+0x86,
-+0x48,
-+0x86,
-+0xf7,
-+0x0d,
-+0x01,
-+0x01,
-+0x01,
-+0x05,
-+0x00,
-+0x03,
-+0x82,
-+0x01,
-+0x0f,
-+0x00,
-+0x30,
-+0x82,
-+0x01,
-+0x0a,
-+0x02,
-+0x82,
-+0x01,
-+0x01,
-+0x00,
-+0x9d,
-+0xe1,
-+0x77,
-+0xa0,
-+0x24,
-+0xa0,
-+0xd5,
-+0x79,
-+0x65,
-+0x3a,
-+0x07,
-+0x90,
-+0xc9,
-+0xf6,
-+0xa5,
-+0xa6,
-+0x1f,
-+0x84,
-+0x1c,
-+0x23,
-+0x07,
-+0x4b,
-+0x4f,
-+0xa5,
-+0x03,
-+0xc6,
-+0x0f,
-+0xf7,
-+0x54,
-+0xd5,
-+0x8b,
-+0x7e,
-+0x79,
-+0x81,
-+0x00,
-+0xd2,
-+0xe9,
-+0x3d,
-+0xf4,
-+0x97,
-+0xfe,
-+0x84,
-+0xcd,
-+0x55,
-+0xbd,
-+0xc9,
-+0x8f,
-+0x21,
-+0x57,
-+0x88,
-+0x06,
-+0x39,
-+0x90,
-+0x66,
-+0x41,
-+0x26,
-+0x79,
-+0x2c,
-+0xca,
-+0x3f,
-+0x95,
-+0x87,
-+0x01,
-+0x11,
-+0x2f,
-+0x2f,
-+0xb0,
-+0xe1,
-+0x0b,
-+0x43,
-+0xfc,
-+0x5f,
-+0x2f,
-+0x4f,
-+0x67,
-+0x04,
-+0xdb,
-+0x4d,
-+0xb7,
-+0x72,
-+0x4d,
-+0xd1,
-+0xc5,
-+0x76,
-+0x73,
-+0x4d,
-+0x91,
-+0x69,
-+0xb0,
-+0x71,
-+0x17,
-+0x36,
-+0xea,
-+0xab,
-+0x0a,
-+0x3a,
-+0xcd,
-+0x95,
-+0x9b,
-+0x76,
-+0x1b,
-+0x8e,
-+0x21,
-+0x17,
-+0x8f,
-+0xc5,
-+0x02,
-+0xbf,
-+0x24,
-+0xc7,
-+0xc0,
-+0x40,
-+0xb1,
-+0x3b,
-+0xc4,
-+0x80,
-+0x7c,
-+0x71,
-+0xa5,
-+0x51,
-+0xdc,
-+0xf7,
-+0x3a,
-+0x58,
-+0x7f,
-+0xb1,
-+0x07,
-+0x81,
-+0x8a,
-+0x10,
-+0xd1,
-+0xf6,
-+0x93,
-+0x17,
-+0x71,
-+0xe0,
-+0xfa,
-+0x51,
-+0x79,
-+0x15,
-+0xd4,
-+0xd7,
-+0x8f,
-+0xad,
-+0xbd,
-+0x6f,
-+0x38,
-+0xe1,
-+0x26,
-+0x7d,
-+0xbc,
-+0xf0,
-+0x3e,
-+0x80,
-+0x89,
-+0xb4,
-+0xec,
-+0x8e,
-+0x69,
-+0x90,
-+0xdb,
-+0x97,
-+0x8a,
-+0xf0,
-+0x23,
-+0x23,
-+0x83,
-+0x82,
-+0x3b,
-+0x6a,
-+0xb1,
-+0xac,
-+0xeb,
-+0xe7,
-+0x99,
-+0x74,
-+0x2a,
-+0x35,
-+0x8e,
-+0xa9,
-+0x64,
-+0xfd,
-+0x46,
-+0x9e,
-+0xe8,
-+0xe5,
-+0x48,
-+0x61,
-+0x31,
-+0x6e,
-+0xe6,
-+0xfc,
-+0x19,
-+0x18,
-+0x54,
-+0xc3,
-+0x1b,
-+0x4f,
-+0xd6,
-+0x00,
-+0x44,
-+0x87,
-+0x1c,
-+0x37,
-+0x45,
-+0xea,
-+0xf5,
-+0xc9,
-+0xcb,
-+0x0f,
-+0x0c,
-+0x55,
-+0xec,
-+0xcf,
-+0x6a,
-+0xc2,
-+0x45,
-+0x26,
-+0x23,
-+0xa2,
-+0x31,
-+0x52,
-+0x4d,
-+0xee,
-+0x21,
-+0x7d,
-+0xfd,
-+0x58,
-+0x72,
-+0xc2,
-+0x28,
-+0xc5,
-+0x8e,
-+0xa9,
-+0xd0,
-+0xee,
-+0x01,
-+0x77,
-+0x08,
-+0xa5,
-+0xf0,
-+0x22,
-+0x2b,
-+0x47,
-+0x79,
-+0x2b,
-+0xcf,
-+0x9a,
-+0x46,
-+0xb5,
-+0x8f,
-+0xfd,
-+0x64,
-+0xa2,
-+0xb5,
-+0xed,
-+0x02,
-+0x03,
-+0x01,
-+0x00,
-+0x01,
-+0x30,
-+0x0d,
-+0x06,
-+0x09,
-+0x2a,
-+0x86,
-+0x48,
-+0x86,
-+0xf7,
-+0x0d,
-+0x01,
-+0x01,
-+0x0b,
-+0x05,
-+0x00,
-+0x03,
-+0x82,
-+0x01,
-+0x01,
-+0x00,
-+0x20,
-+0x44,
-+0xfe,
-+0xa9,
-+0x9e,
-+0xdd,
-+0x9b,
-+0xea,
-+0xce,
-+0x25,
-+0x75,
-+0x08,
-+0xf0,
-+0x2b,
-+0x53,
-+0xf7,
-+0x5a,
-+0x36,
-+0x1c,
-+0x4a,
-+0x23,
-+0x7f,
-+0xd0,
-+0x41,
-+0x3c,
-+0x12,
-+0x2b,
-+0xb9,
-+0x80,
-+0x4e,
-+0x8a,
-+0x15,
-+0x5d,
-+0x1f,
-+0x40,
-+0xa7,
-+0x26,
-+0x28,
-+0x32,
-+0xc3,
-+0x5b,
-+0x06,
-+0x28,
-+0x2d,
-+0x3d,
-+0x08,
-+0x09,
-+0x1e,
-+0x01,
-+0xe9,
-+0x67,
-+0xe3,
-+0x33,
-+0xe6,
-+0x15,
-+0x45,
-+0x39,
-+0xee,
-+0x17,
-+0x83,
-+0xdb,
-+0x42,
-+0xff,
-+0x7f,
-+0x35,
-+0xf4,
-+0xac,
-+0x16,
-+0xdb,
-+0xba,
-+0xb8,
-+0x1a,
-+0x20,
-+0x21,
-+0x41,
-+0xff,
-+0xf3,
-+0x92,
-+0xff,
-+0x65,
-+0x6e,
-+0x29,
-+0x16,
-+0xd0,
-+0xbf,
-+0x8d,
-+0xdf,
-+0x48,
-+0x2c,
-+0x73,
-+0x36,
-+0x7f,
-+0x22,
-+0xe6,
-+0xee,
-+0x78,
-+0xb4,
-+0x63,
-+0x83,
-+0x0e,
-+0x39,
-+0xeb,
-+0xaf,
-+0x10,
-+0x2a,
-+0x90,
-+0xd3,
-+0xfc,
-+0xe6,
-+0xc3,
-+0x8f,
-+0x97,
-+0x5b,
-+0x76,
-+0xbf,
-+0x9b,
-+0xf5,
-+0x98,
-+0xd2,
-+0x53,
-+0x06,
-+0x8b,
-+0xf8,
-+0xa4,
-+0x04,
-+0x9b,
-+0x1b,
-+0x62,
-+0x6a,
-+0x9d,
-+0xac,
-+0xe6,
-+0x4b,
-+0x0d,
-+0xc9,
-+0xd7,
-+0x56,
-+0x63,
-+0x15,
-+0x01,
-+0x38,
-+0x8c,
-+0xbe,
-+0xf1,
-+0x44,
-+0xc4,
-+0x38,
-+0x27,
-+0xe0,
-+0xcf,
-+0x72,
-+0xd6,
-+0x3d,
-+0xe4,
-+0xf7,
-+0x4b,
-+0x3b,
-+0xd2,
-+0xb1,
-+0x0c,
-+0xd5,
-+0x83,
-+0x6d,
-+0x1e,
-+0x10,
-+0x04,
-+0x69,
-+0x29,
-+0x88,
-+0x69,
-+0xe0,
-+0x7d,
-+0xd7,
-+0xdb,
-+0xb4,
-+0x59,
-+0x72,
-+0x8d,
-+0x9d,
-+0x3c,
-+0x43,
-+0xaf,
-+0xc6,
-+0x7d,
-+0xb7,
-+0x21,
-+0x15,
-+0x52,
-+0x8a,
-+0xe9,
-+0x9b,
-+0x6b,
-+0x2e,
-+0xe8,
-+0x27,
-+0x3c,
-+0x3f,
-+0x2d,
-+0x84,
-+0xfb,
-+0x9a,
-+0x22,
-+0x0a,
-+0x9f,
-+0x6a,
-+0x25,
-+0xe6,
-+0x39,
-+0xe4,
-+0x74,
-+0x73,
-+0xb6,
-+0x2a,
-+0x70,
-+0xaa,
-+0x1d,
-+0xcb,
-+0xcc,
-+0xd4,
-+0xa0,
-+0x1b,
-+0x26,
-+0x71,
-+0x63,
-+0x04,
-+0xc5,
-+0x12,
-+0x21,
-+0x48,
-+0xba,
-+0x92,
-+0x27,
-+0x06,
-+0xa8,
-+0x3e,
-+0x6d,
-+0xa1,
-+0x43,
-+0xa5,
-+0xd2,
-+0x2a,
-+0xf7,
-+0xca,
-+0xc4,
-+0x26,
-+0xe8,
-+0x5b,
-+0x1f,
-+0xe4,
-+0xdc,
-+0x89,
-+0xdc,
-+0x1f,
-+0x04,
-+0x79,
-+0x3f,
-+0x30,
-+0x82,
-+0x02,
-+0xcd,
-+0x30,
-+0x82,
-+0x01,
-+0xb5,
-+0x02,
-+0x14,
-+0x3a,
-+0xbb,
-+0xc6,
-+0xec,
-+0x14,
-+0x6e,
-+0x09,
-+0xd1,
-+0xb6,
-+0x01,
-+0x6a,
-+0xb9,
-+0xd6,
-+0xcf,
-+0x71,
-+0xdd,
-+0x23,
-+0x3f,
-+0x03,
-+0x28,
-+0x30,
-+0x0d,
-+0x06,
-+0x09,
-+0x2a,
-+0x86,
-+0x48,
-+0x86,
-+0xf7,
-+0x0d,
-+0x01,
-+0x01,
-+0x0b,
-+0x05,
-+0x00,
-+0x30,
-+0x22,
-+0x31,
-+0x20,
-+0x30,
-+0x1e,
-+0x06,
-+0x03,
-+0x55,
-+0x04,
-+0x03,
-+0x0c,
-+0x17,
-+0x72,
-+0x6f,
-+0x6d,
-+0x61,
-+0x69,
-+0x6e,
-+0x2e,
-+0x70,
-+0x65,
-+0x72,
-+0x69,
-+0x65,
-+0x72,
-+0x40,
-+0x67,
-+0x6d,
-+0x61,
-+0x69,
-+0x6c,
-+0x2e,
-+0x63,
-+0x6f,
-+0x6d,
-+0x30,
-+0x20,
-+0x17,
-+0x0d,
-+0x32,
-+0x30,
-+0x30,
-+0x32,
-+0x32,
-+0x34,
-+0x31,
-+0x39,
-+0x30,
-+0x31,
-+0x34,
-+0x34,
-+0x5a,
-+0x18,
-+0x0f,
-+0x32,
-+0x31,
-+0x32,
-+0x30,
-+0x30,
-+0x31,
-+0x33,
-+0x31,
-+0x31,
-+0x39,
-+0x30,
-+0x31,
-+0x34,
-+0x34,
-+0x5a,
-+0x30,
-+0x22,
-+0x31,
-+0x20,
-+0x30,
-+0x1e,
-+0x06,
-+0x03,
-+0x55,
-+0x04,
-+0x03,
-+0x0c,
-+0x17,
-+0x72,
-+0x6f,
-+0x6d,
-+0x61,
-+0x69,
-+0x6e,
-+0x2e,
-+0x70,
-+0x65,
-+0x72,
-+0x69,
-+0x65,
-+0x72,
-+0x40,
-+0x67,
-+0x6d,
-+0x61,
-+0x69,
-+0x6c,
-+0x2e,
-+0x63,
-+0x6f,
-+0x6d,
-+0x30,
-+0x82,
-+0x01,
-+0x22,
-+0x30,
-+0x0d,
-+0x06,
-+0x09,
-+0x2a,
-+0x86,
-+0x48,
-+0x86,
-+0xf7,
-+0x0d,
-+0x01,
-+0x01,
-+0x01,
-+0x05,
-+0x00,
-+0x03,
-+0x82,
-+0x01,
-+0x0f,
-+0x00,
-+0x30,
-+0x82,
-+0x01,
-+0x0a,
-+0x02,
-+0x82,
-+0x01,
-+0x01,
-+0x00,
-+0xf0,
-+0xb8,
-+0x4f,
-+0x3f,
-+0x70,
-+0x78,
-+0xf8,
-+0x74,
-+0x45,
-+0xa2,
-+0x28,
-+0xaf,
-+0x04,
-+0x75,
-+0x04,
-+0xa3,
-+0xf3,
-+0xa7,
-+0xc7,
-+0x04,
-+0xac,
-+0xb6,
-+0xe1,
-+0xfc,
-+0xe1,
-+0xc0,
-+0x3d,
-+0xe0,
-+0x26,
-+0x90,
-+0x8a,
-+0x45,
-+0x60,
-+0xc4,
-+0x75,
-+0xf3,
-+0x1a,
-+0x33,
-+0x37,
-+0x56,
-+0x7d,
-+0x30,
-+0x07,
-+0x75,
-+0x0e,
-+0xa6,
-+0x79,
-+0x06,
-+0x95,
-+0x9d,
-+0x17,
-+0x3c,
-+0x09,
-+0xa9,
-+0x7f,
-+0xab,
-+0x95,
-+0x5d,
-+0xed,
-+0xe0,
-+0x75,
-+0x26,
-+0x2f,
-+0x65,
-+0x65,
-+0xcd,
-+0x61,
-+0xb1,
-+0x33,
-+0x27,
-+0x67,
-+0x41,
-+0xa1,
-+0x01,
-+0x13,
-+0xe9,
-+0x13,
-+0x6a,
-+0x6d,
-+0x4e,
-+0x98,
-+0xe1,
-+0x9e,
-+0x7b,
-+0x0b,
-+0x5b,
-+0x44,
-+0xef,
-+0x68,
-+0x5a,
-+0x6f,
-+0x7d,
-+0x97,
-+0xa1,
-+0x33,
-+0x22,
-+0x97,
-+0x12,
-+0x21,
-+0x09,
-+0x8f,
-+0x90,
-+0xe0,
-+0x25,
-+0x94,
-+0xdd,
-+0x8a,
-+0x3a,
-+0xf7,
-+0x4a,
-+0x60,
-+0x04,
-+0x26,
-+0x6d,
-+0x00,
-+0x82,
-+0xe4,
-+0xcf,
-+0x64,
-+0x1c,
-+0x79,
-+0x15,
-+0x24,
-+0xf2,
-+0x42,
-+0x86,
-+0xf5,
-+0x10,
-+0x86,
-+0xac,
-+0x20,
-+0x88,
-+0x90,
-+0x87,
-+0xdf,
-+0x8c,
-+0x37,
-+0x7c,
-+0xbf,
-+0x35,
-+0xd5,
-+0x6f,
-+0x9f,
-+0x77,
-+0xc3,
-+0xcd,
-+0x69,
-+0x25,
-+0x06,
-+0xc2,
-+0x65,
-+0x51,
-+0x71,
-+0x89,
-+0x7f,
-+0x6e,
-+0x4d,
-+0xe5,
-+0xd5,
-+0x8a,
-+0x36,
-+0x1a,
-+0xad,
-+0xc1,
-+0x18,
-+0xd6,
-+0x14,
-+0x42,
-+0x87,
-+0xf0,
-+0x93,
-+0x83,
-+0xf1,
-+0x99,
-+0x74,
-+0xc4,
-+0x13,
-+0xaa,
-+0x3b,
-+0x66,
-+0x85,
-+0x6f,
-+0xe0,
-+0xbc,
-+0x5f,
-+0xb6,
-+0x40,
-+0xa6,
-+0x41,
-+0x06,
-+0x0a,
-+0xba,
-+0x0e,
-+0xe9,
-+0x32,
-+0x44,
-+0x10,
-+0x39,
-+0x53,
-+0xcd,
-+0xbf,
-+0xf3,
-+0xd3,
-+0x26,
-+0xf6,
-+0xb6,
-+0x2b,
-+0x40,
-+0x2e,
-+0xb9,
-+0x88,
-+0xc1,
-+0xf4,
-+0xe3,
-+0xa0,
-+0x28,
-+0x77,
-+0x4f,
-+0xba,
-+0xa8,
-+0xca,
-+0x9c,
-+0x05,
-+0xba,
-+0x88,
-+0x96,
-+0x99,
-+0x54,
-+0x89,
-+0xa2,
-+0x8d,
-+0xf3,
-+0x73,
-+0xa1,
-+0x8c,
-+0x4a,
-+0xa8,
-+0x71,
-+0xee,
-+0x2e,
-+0xd2,
-+0x83,
-+0x14,
-+0x48,
-+0xbd,
-+0x98,
-+0xc6,
-+0xce,
-+0xdc,
-+0xa8,
-+0xa3,
-+0x97,
-+0x2e,
-+0x40,
-+0x16,
-+0x2f,
-+0x02,
-+0x03,
-+0x01,
-+0x00,
-+0x01,
-+0x30,
-+0x0d,
-+0x06,
-+0x09,
-+0x2a,
-+0x86,
-+0x48,
-+0x86,
-+0xf7,
-+0x0d,
-+0x01,
-+0x01,
-+0x0b,
-+0x05,
-+0x00,
-+0x03,
-+0x82,
-+0x01,
-+0x01,
-+0x00,
-+0x76,
-+0x5d,
-+0x03,
-+0x3d,
-+0xb6,
-+0x96,
-+0x00,
-+0x1b,
-+0x6e,
-+0x0c,
-+0xdd,
-+0xbb,
-+0xc8,
-+0xdf,
-+0xbc,
-+0xeb,
-+0x6c,
-+0x01,
-+0x40,
-+0x1a,
-+0x2b,
-+0x07,
-+0x60,
-+0xa1,
-+0x1a,
-+0xe1,
-+0x43,
-+0x57,
-+0xfa,
-+0xbe,
-+0xde,
-+0xbb,
-+0x8f,
-+0x73,
-+0xf3,
-+0x92,
-+0xa2,
-+0xaa,
-+0x83,
-+0x01,
-+0xc1,
-+0x17,
-+0xe4,
-+0x9d,
-+0x09,
-+0x41,
-+0xe0,
-+0x32,
-+0x33,
-+0x97,
-+0x4b,
-+0xf2,
-+0xdc,
-+0x0f,
-+0x8b,
-+0xa8,
-+0xb8,
-+0x5a,
-+0x04,
-+0x86,
-+0xf6,
-+0x71,
-+0xa1,
-+0x97,
-+0xd0,
-+0x54,
-+0x56,
-+0x10,
-+0x8e,
-+0x54,
-+0x99,
-+0x0d,
-+0x2a,
-+0xa9,
-+0xaf,
-+0x1b,
-+0x55,
-+0x59,
-+0x06,
-+0x2b,
-+0xa4,
-+0x5f,
-+0xb1,
-+0x54,
-+0xa6,
-+0xec,
-+0xc7,
-+0xd6,
-+0x43,
-+0xee,
-+0x86,
-+0x2c,
-+0x9b,
-+0x18,
-+0x9d,
-+0x8f,
-+0x00,
-+0x82,
-+0xc1,
-+0x88,
-+0x61,
-+0x16,
-+0x85,
-+0x3c,
-+0x17,
-+0x56,
-+0xfe,
-+0x6a,
-+0xa0,
-+0x7a,
-+0x68,
-+0xc5,
-+0x7b,
-+0x3d,
-+0x3c,
-+0xb6,
-+0x13,
-+0x18,
-+0x99,
-+0x6d,
-+0x74,
-+0x65,
-+0x13,
-+0x67,
-+0xb7,
-+0xfc,
-+0x5a,
-+0x44,
-+0x48,
-+0x72,
-+0xa0,
-+0x73,
-+0xb8,
-+0xff,
-+0x02,
-+0x9d,
-+0x7c,
-+0x5b,
-+0xf9,
-+0x7c,
-+0x75,
-+0x0a,
-+0x3c,
-+0x81,
-+0x80,
-+0x3c,
-+0x41,
-+0xf2,
-+0xd5,
-+0xfa,
-+0x3d,
-+0x1f,
-+0xe3,
-+0xda,
-+0x8c,
-+0xa5,
-+0x17,
-+0x1f,
-+0x53,
-+0x1a,
-+0x75,
-+0xad,
-+0x4e,
-+0x11,
-+0x1c,
-+0x07,
-+0xec,
-+0x0a,
-+0x69,
-+0xfd,
-+0x33,
-+0xfa,
-+0x32,
-+0x7e,
-+0x66,
-+0xf5,
-+0x29,
-+0xe8,
-+0x4d,
-+0x8a,
-+0xfa,
-+0x0d,
-+0x4b,
-+0x68,
-+0xc3,
-+0x95,
-+0x11,
-+0xba,
-+0x6f,
-+0x1e,
-+0x07,
-+0x8c,
-+0x85,
-+0xc7,
-+0xc7,
-+0xc9,
-+0xc1,
-+0x30,
-+0xa3,
-+0x70,
-+0xb0,
-+0xa1,
-+0xe0,
-+0xd5,
-+0x85,
-+0x15,
-+0x94,
-+0x77,
-+0xc1,
-+0x1c,
-+0x91,
-+0xf1,
-+0x5f,
-+0x50,
-+0xcd,
-+0x2c,
-+0x57,
-+0x4b,
-+0x22,
-+0x4f,
-+0xee,
-+0x95,
-+0xd7,
-+0xa7,
-+0xa4,
-+0x59,
-+0x62,
-+0xae,
-+0xb9,
-+0xbf,
-+0xd7,
-+0x63,
-+0x5a,
-+0x04,
-+0xfc,
-+0x24,
-+0x11,
-+0xae,
-+0x34,
-+0x4b,
-+0xf4,
-+0x0c,
-+0x9f,
-+0x0b,
-+0x59,
-+0x7d,
-+0x27,
-+0x39,
-+0x54,
-+0x69,
-+0x4f,
-+0xfd,
-+0x6e,
-+0x44,
-+0x9f,
-+0x21,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0810-fixup-Add-support-for-all-the-downstream-rpi-sound-c.patch b/target/linux/bcm27xx/patches-6.1/950-0810-fixup-Add-support-for-all-the-downstream-rpi-sound-c.patch
deleted file mode 100644
index 87097d2bbf..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0810-fixup-Add-support-for-all-the-downstream-rpi-sound-c.patch
+++ /dev/null
@@ -1,329 +0,0 @@
-From 3ece03b1575b0c3a0989e372aaaa4557ae74dc89 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 20 Jul 2023 11:28:20 +0100
-Subject: [PATCH] fixup! Add support for all the downstream rpi sound card
- drivers
-
-Replace the Allo Dac clock driver with an extension of the
-HiFiBerry clock driver that it cloned.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/clk/Makefile               |   1 -
- drivers/clk/clk-allo-dac.c         | 161 -----------------------------
- drivers/clk/clk-hifiberry-dacpro.c |  57 ++++++----
- sound/soc/bcm/Kconfig              |   1 +
- 4 files changed, 40 insertions(+), 180 deletions(-)
- delete mode 100644 drivers/clk/clk-allo-dac.c
-
---- a/drivers/clk/Makefile
-+++ b/drivers/clk/Makefile
-@@ -19,7 +19,6 @@ endif
- 
- # hardware specific clock types
- # please keep this section sorted lexicographically by file path name
--obj-$(CONFIG_SND_BCM2708_SOC_ALLO_BOSS_DAC)	+= clk-allo-dac.o
- obj-$(CONFIG_COMMON_CLK_APPLE_NCO)  	+= clk-apple-nco.o
- obj-$(CONFIG_MACH_ASM9260)		+= clk-asm9260.o
- obj-$(CONFIG_COMMON_CLK_AXI_CLKGEN)	+= clk-axi-clkgen.o
---- a/drivers/clk/clk-allo-dac.c
-+++ /dev/null
-@@ -1,161 +0,0 @@
--/*
-- * Clock Driver for Allo DAC
-- *
-- * Author:	Baswaraj K <jaikumar@cem-solutions.net>
-- *		Copyright 2016
-- *		based on code by Stuart MacLean
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License
-- * version 2 as published by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * General Public License for more details.
-- */
--
--#include <linux/clk-provider.h>
--#include <linux/clkdev.h>
--#include <linux/kernel.h>
--#include <linux/module.h>
--#include <linux/of.h>
--#include <linux/slab.h>
--#include <linux/platform_device.h>
--
--/* Clock rate of CLK44EN attached to GPIO6 pin */
--#define CLK_44EN_RATE 45158400UL
--/* Clock rate of CLK48EN attached to GPIO3 pin */
--#define CLK_48EN_RATE 49152000UL
--
--/**
-- * struct allo_dac_clk - Common struct to the Allo DAC
-- * @hw: clk_hw for the common clk framework
-- * @mode: 0 => CLK44EN, 1 => CLK48EN
-- */
--struct clk_allo_hw {
--	struct clk_hw hw;
--	uint8_t mode;
--};
--
--#define to_allo_clk(_hw) container_of(_hw, struct clk_allo_hw, hw)
--
--static const struct of_device_id clk_allo_dac_dt_ids[] = {
--	{ .compatible = "allo,dac-clk",},
--	{ }
--};
--MODULE_DEVICE_TABLE(of, clk_allo_dac_dt_ids);
--
--static unsigned long clk_allo_dac_recalc_rate(struct clk_hw *hw,
--	unsigned long parent_rate)
--{
--	return (to_allo_clk(hw)->mode == 0) ? CLK_44EN_RATE :
--		CLK_48EN_RATE;
--}
--
--static long clk_allo_dac_round_rate(struct clk_hw *hw,
--	unsigned long rate, unsigned long *parent_rate)
--{
--	long actual_rate;
--
--	if (rate <= CLK_44EN_RATE) {
--		actual_rate = (long)CLK_44EN_RATE;
--	} else if (rate >= CLK_48EN_RATE) {
--		actual_rate = (long)CLK_48EN_RATE;
--	} else {
--		long diff44Rate = (long)(rate - CLK_44EN_RATE);
--		long diff48Rate = (long)(CLK_48EN_RATE - rate);
--
--		if (diff44Rate < diff48Rate)
--			actual_rate = (long)CLK_44EN_RATE;
--		else
--			actual_rate = (long)CLK_48EN_RATE;
--	}
--	return actual_rate;
--}
--
--
--static int clk_allo_dac_set_rate(struct clk_hw *hw,
--	unsigned long rate, unsigned long parent_rate)
--{
--	unsigned long actual_rate;
--	struct clk_allo_hw *clk = to_allo_clk(hw);
--
--	actual_rate = (unsigned long)clk_allo_dac_round_rate(hw, rate,
--		&parent_rate);
--	clk->mode = (actual_rate == CLK_44EN_RATE) ? 0 : 1;
--	return 0;
--}
--
--
--const struct clk_ops clk_allo_dac_rate_ops = {
--	.recalc_rate = clk_allo_dac_recalc_rate,
--	.round_rate = clk_allo_dac_round_rate,
--	.set_rate = clk_allo_dac_set_rate,
--};
--
--static int clk_allo_dac_probe(struct platform_device *pdev)
--{
--	int ret;
--	struct clk_allo_hw *proclk;
--	struct clk *clk;
--	struct device *dev;
--	struct clk_init_data init;
--
--	dev = &pdev->dev;
--
--	proclk = kzalloc(sizeof(struct clk_allo_hw), GFP_KERNEL);
--	if (!proclk)
--		return -ENOMEM;
--
--	init.name = "clk-allo-dac";
--	init.ops = &clk_allo_dac_rate_ops;
--	init.flags = 0;
--	init.parent_names = NULL;
--	init.num_parents = 0;
--
--	proclk->mode = 0;
--	proclk->hw.init = &init;
--
--	clk = devm_clk_register(dev, &proclk->hw);
--	if (!IS_ERR(clk)) {
--		ret = of_clk_add_provider(dev->of_node, of_clk_src_simple_get,
--			clk);
--	} else {
--		dev_err(dev, "Fail to register clock driver\n");
--		kfree(proclk);
--		ret = PTR_ERR(clk);
--	}
--	return ret;
--}
--
--static int clk_allo_dac_remove(struct platform_device *pdev)
--{
--	of_clk_del_provider(pdev->dev.of_node);
--	return 0;
--}
--
--static struct platform_driver clk_allo_dac_driver = {
--	.probe = clk_allo_dac_probe,
--	.remove = clk_allo_dac_remove,
--	.driver = {
--		.name = "clk-allo-dac",
--		.of_match_table = clk_allo_dac_dt_ids,
--	},
--};
--
--static int __init clk_allo_dac_init(void)
--{
--	return platform_driver_register(&clk_allo_dac_driver);
--}
--core_initcall(clk_allo_dac_init);
--
--static void __exit clk_allo_dac_exit(void)
--{
--	platform_driver_unregister(&clk_allo_dac_driver);
--}
--module_exit(clk_allo_dac_exit);
--
--MODULE_DESCRIPTION("Allo DAC clock driver");
--MODULE_LICENSE("GPL v2");
--MODULE_ALIAS("platform:clk-allo-dac");
---- a/drivers/clk/clk-hifiberry-dacpro.c
-+++ b/drivers/clk/clk-hifiberry-dacpro.c
-@@ -22,10 +22,12 @@
- #include <linux/slab.h>
- #include <linux/platform_device.h>
- 
--/* Clock rate of CLK44EN attached to GPIO6 pin */
--#define CLK_44EN_RATE 22579200UL
--/* Clock rate of CLK48EN attached to GPIO3 pin */
--#define CLK_48EN_RATE 24576000UL
-+struct ext_clk_rates {
-+	/* Clock rate of CLK44EN attached to GPIO6 pin */
-+	unsigned long clk_44en;
-+	/* Clock rate of CLK48EN attached to GPIO3 pin */
-+	unsigned long clk_48en;
-+};
- 
- /**
-  * struct hifiberry_dacpro_clk - Common struct to the HiFiBerry DAC Pro
-@@ -35,12 +37,24 @@
- struct clk_hifiberry_hw {
- 	struct clk_hw hw;
- 	uint8_t mode;
-+	struct ext_clk_rates clk_rates;
- };
- 
- #define to_hifiberry_clk(_hw) container_of(_hw, struct clk_hifiberry_hw, hw)
- 
-+static const struct ext_clk_rates hifiberry_dacpro_clks = {
-+	.clk_44en = 22579200UL,
-+	.clk_48en = 24576000UL,
-+};
-+
-+static const struct ext_clk_rates allo_dac_clks = {
-+	.clk_44en = 45158400UL,
-+	.clk_48en = 49152000UL,
-+};
-+
- static const struct of_device_id clk_hifiberry_dacpro_dt_ids[] = {
--	{ .compatible = "hifiberry,dacpro-clk",},
-+	{ .compatible = "hifiberry,dacpro-clk", &hifiberry_dacpro_clks },
-+	{ .compatible = "allo,dac-clk", &allo_dac_clks },
- 	{ }
- };
- MODULE_DEVICE_TABLE(of, clk_hifiberry_dacpro_dt_ids);
-@@ -48,27 +62,29 @@ MODULE_DEVICE_TABLE(of, clk_hifiberry_da
- static unsigned long clk_hifiberry_dacpro_recalc_rate(struct clk_hw *hw,
- 	unsigned long parent_rate)
- {
--	return (to_hifiberry_clk(hw)->mode == 0) ? CLK_44EN_RATE :
--		CLK_48EN_RATE;
-+	struct clk_hifiberry_hw *clk = to_hifiberry_clk(hw);
-+	return (clk->mode == 0) ? clk->clk_rates.clk_44en :
-+		clk->clk_rates.clk_48en;
- }
- 
- static long clk_hifiberry_dacpro_round_rate(struct clk_hw *hw,
- 	unsigned long rate, unsigned long *parent_rate)
- {
-+	struct clk_hifiberry_hw *clk = to_hifiberry_clk(hw);
- 	long actual_rate;
- 
--	if (rate <= CLK_44EN_RATE) {
--		actual_rate = (long)CLK_44EN_RATE;
--	} else if (rate >= CLK_48EN_RATE) {
--		actual_rate = (long)CLK_48EN_RATE;
-+	if (rate <= clk->clk_rates.clk_44en) {
-+		actual_rate = (long)clk->clk_rates.clk_44en;
-+	} else if (rate >= clk->clk_rates.clk_48en) {
-+		actual_rate = (long)clk->clk_rates.clk_48en;
- 	} else {
--		long diff44Rate = (long)(rate - CLK_44EN_RATE);
--		long diff48Rate = (long)(CLK_48EN_RATE - rate);
-+		long diff44Rate = (long)(rate - clk->clk_rates.clk_44en);
-+		long diff48Rate = (long)(clk->clk_rates.clk_48en - rate);
- 
- 		if (diff44Rate < diff48Rate)
--			actual_rate = (long)CLK_44EN_RATE;
-+			actual_rate = (long)clk->clk_rates.clk_44en;
- 		else
--			actual_rate = (long)CLK_48EN_RATE;
-+			actual_rate = (long)clk->clk_rates.clk_48en;
- 	}
- 	return actual_rate;
- }
-@@ -77,12 +93,12 @@ static long clk_hifiberry_dacpro_round_r
- static int clk_hifiberry_dacpro_set_rate(struct clk_hw *hw,
- 	unsigned long rate, unsigned long parent_rate)
- {
--	unsigned long actual_rate;
- 	struct clk_hifiberry_hw *clk = to_hifiberry_clk(hw);
-+	unsigned long actual_rate;
- 
- 	actual_rate = (unsigned long)clk_hifiberry_dacpro_round_rate(hw, rate,
- 		&parent_rate);
--	clk->mode = (actual_rate == CLK_44EN_RATE) ? 0 : 1;
-+	clk->mode = (actual_rate == clk->clk_rates.clk_44en) ? 0 : 1;
- 	return 0;
- }
- 
-@@ -95,13 +111,17 @@ const struct clk_ops clk_hifiberry_dacpr
- 
- static int clk_hifiberry_dacpro_probe(struct platform_device *pdev)
- {
--	int ret;
-+	const struct of_device_id *of_id;
- 	struct clk_hifiberry_hw *proclk;
- 	struct clk *clk;
- 	struct device *dev;
- 	struct clk_init_data init;
-+	int ret;
- 
- 	dev = &pdev->dev;
-+	of_id = of_match_node(clk_hifiberry_dacpro_dt_ids, dev->of_node);
-+	if (!of_id)
-+		return -EINVAL;
- 
- 	proclk = kzalloc(sizeof(struct clk_hifiberry_hw), GFP_KERNEL);
- 	if (!proclk)
-@@ -115,6 +135,7 @@ static int clk_hifiberry_dacpro_probe(st
- 
- 	proclk->mode = 0;
- 	proclk->hw.init = &init;
-+	memcpy(&proclk->clk_rates, of_id->data, sizeof(proclk->clk_rates));
- 
- 	clk = devm_clk_register(dev, &proclk->hw);
- 	if (!IS_ERR(clk)) {
---- a/sound/soc/bcm/Kconfig
-+++ b/sound/soc/bcm/Kconfig
-@@ -271,6 +271,7 @@ config SND_BCM2708_SOC_ALLO_BOSS_DAC
- 	tristate "Support for Allo Boss DAC"
- 	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
- 	select SND_SOC_PCM512x_I2C
-+	select COMMON_CLK_HIFIBERRY_DACPRO
- 	help
- 	  Say Y or M if you want to add support for Allo Boss DAC.
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0815-fixup-drm-tc358762-Set-the-pre_enable_upstream_first.patch b/target/linux/bcm27xx/patches-6.1/950-0815-fixup-drm-tc358762-Set-the-pre_enable_upstream_first.patch
deleted file mode 100644
index 22bca6c7f4..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0815-fixup-drm-tc358762-Set-the-pre_enable_upstream_first.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 2addf7045f2b4866ab819f48e4d32f5734a32134 Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Thu, 20 Jul 2023 15:15:27 +0100
-Subject: [PATCH] fixup! drm/tc358762: Set the pre_enable_upstream_first flag
- to configure DSI host
-
----
- drivers/gpu/drm/bridge/tc358762.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/bridge/tc358762.c
-+++ b/drivers/gpu/drm/bridge/tc358762.c
-@@ -229,7 +229,7 @@ static int tc358762_probe(struct mipi_ds
- 	ctx->bridge.funcs = &tc358762_bridge_funcs;
- 	ctx->bridge.type = DRM_MODE_CONNECTOR_DPI;
- 	ctx->bridge.of_node = dev->of_node;
--	ctx->bridge.pre_enable_upstream_first = true;
-+	ctx->bridge.pre_enable_prev_first = true;
- 
- 	drm_bridge_add(&ctx->bridge);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0816-rpi-sound-cards-Fix-Codec-Zero-rate-switching.patch b/target/linux/bcm27xx/patches-6.1/950-0816-rpi-sound-cards-Fix-Codec-Zero-rate-switching.patch
deleted file mode 100644
index 82a3c9ea5b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0816-rpi-sound-cards-Fix-Codec-Zero-rate-switching.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From b84b8a9ad2046a855a7044b6368def01ddd5de6e Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Fri, 21 Jul 2023 16:50:56 +0100
-Subject: [PATCH] rpi sound cards: Fix Codec Zero rate switching
-
-The Raspberry Pi Codec Zero (and IQaudIO Codec) don't notify the DA7213
-codec when it needs to change PLL frequencies. As a result, audio can
-be played at the wrong rate - play a 48kHz sound immediately after a
-44.1kHz sound to see the effect, but in some configurations the codec
-can lock into the wrong state and always get some rates wrong.
-
-Add the necessary notification to fix the issue.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- sound/soc/bcm/iqaudio-codec.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
---- a/sound/soc/bcm/iqaudio-codec.c
-+++ b/sound/soc/bcm/iqaudio-codec.c
-@@ -143,6 +143,7 @@ static int snd_rpi_iqaudio_codec_hw_para
- 					   struct snd_pcm_hw_params *params)
- {
- 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
- 	unsigned int samplerate = params_rate(params);
- 
- 	switch (samplerate) {
-@@ -152,15 +153,17 @@ static int snd_rpi_iqaudio_codec_hw_para
- 	case 48000:
- 	case 96000:
- 		pll_out = DA7213_PLL_FREQ_OUT_98304000;
--		return 0;
-+		break;
- 	case 44100:
- 	case 88200:
- 		pll_out = DA7213_PLL_FREQ_OUT_90316800;
--		return 0;
-+		break;
- 	default:
- 		dev_err(rtd->dev,"Unsupported samplerate %d\n", samplerate);
- 		return -EINVAL;
- 	}
-+
-+	return snd_soc_dai_set_pll(codec_dai, 0, DA7213_SYSCLK_PLL, 0, pll_out);
- }
- 
- static const struct snd_soc_ops snd_rpi_iqaudio_codec_ops = {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0818-overlays-Add-trickle-voltage-mv-parameter-to-RTCs.patch b/target/linux/bcm27xx/patches-6.1/950-0818-overlays-Add-trickle-voltage-mv-parameter-to-RTCs.patch
deleted file mode 100644
index 0539b19cf5..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0818-overlays-Add-trickle-voltage-mv-parameter-to-RTCs.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 31822340129e3c4030500d7f30ce4d19bbf9dd40 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 24 Jul 2023 17:34:47 +0100
-Subject: [PATCH] overlays: Add trickle-voltage-mv parameter to RTCs
-
-The RV3032 RTC requires an additional DT property to enable trickle
-charging. Add a parameter - trickle-voltage-mv - to the i2c-rtc
-and i2c-rtc-gpio overlays to set it.
-
-See: https://github.com/raspberrypi/linux/issues/5547
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/README              | 12 ++++++++----
- arch/arm/boot/dts/overlays/i2c-rtc-common.dtsi |  2 ++
- 2 files changed, 10 insertions(+), 4 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -1957,13 +1957,15 @@ Params: abx80x                  Select o
-                                 "schottky" (ABx80x and RV1805 only)
- 
-         trickle-resistor-ohms   Resistor value for trickle charge (DS1339,
--                                ABx80x, RV1805, RV3028)
-+                                ABx80x, BQ32000, RV1805, RV3028, RV3032)
-+
-+        trickle-voltage-mv      Charge pump voltage for trickle charge (RV3032)
- 
-         wakeup-source           Specify that the RTC can be used as a wakeup
-                                 source
- 
-         backup-switchover-mode  Backup power supply switch mode. Must be 0 for
--                                off or 1 for Vdd < VBackup (RV3028 only)
-+                                off or 1 for Vdd < VBackup (RV3028, RV3032)
- 
- 
- Name:   i2c-rtc-gpio
-@@ -2027,13 +2029,15 @@ Params: abx80x                  Select o
-                                 "schottky" (ABx80x and RV1805 only)
- 
-         trickle-resistor-ohms   Resistor value for trickle charge (DS1339,
--                                ABx80x, RV1805, RV3028)
-+                                ABx80x, BQ32000, RV1805, RV3028, RV3032)
-+
-+        trickle-voltage-mv      Charge pump voltage for trickle charge (RV3032)
- 
-         wakeup-source           Specify that the RTC can be used as a wakeup
-                                 source
- 
-         backup-switchover-mode  Backup power supply switch mode. Must be 0 for
--                                off or 1 for Vdd < VBackup (RV3028 only)
-+                                off or 1 for Vdd < VBackup (RV3028, RV3032)
- 
-         i2c_gpio_sda            GPIO used for I2C data (default "23")
- 
---- a/arch/arm/boot/dts/overlays/i2c-rtc-common.dtsi
-+++ b/arch/arm/boot/dts/overlays/i2c-rtc-common.dtsi
-@@ -339,8 +339,10 @@
- 					<&ds1340>,"trickle-resistor-ohms:0",
- 					<&abx80x>,"abracon,tc-resistor:0",
- 					<&rv3028>,"trickle-resistor-ohms:0",
-+					<&rv3032>,"trickle-resistor-ohms:0",
- 					<&rv1805>,"abracon,tc-resistor:0",
- 					<&bq32000>,"abracon,tc-resistor:0";
-+		trickle-voltage-mv = <&rv3032>,"trickle-voltage-millivolts:0";
- 		backup-switchover-mode = <&rv3028>,"backup-switchover-mode:0";
- 		wakeup-source = <&ds1339>,"wakeup-source?",
- 				<&ds3231>,"wakeup-source?",
diff --git a/target/linux/bcm27xx/patches-6.1/950-0819-drivers-media-imx296-Add-standby-delay-during-probe.patch b/target/linux/bcm27xx/patches-6.1/950-0819-drivers-media-imx296-Add-standby-delay-during-probe.patch
deleted file mode 100644
index f10c0f03b5..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0819-drivers-media-imx296-Add-standby-delay-during-probe.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5fb3b300557d6a6902e7321f42fdabb8c09eef54 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Fri, 28 Jul 2023 12:00:40 +0100
-Subject: [PATCH] drivers: media: imx296: Add standby delay during probe
-
-Add a 2-5ms delay when coming out of standby and before reading the
-sensor info register durning probe, as instructed by the datasheet. This
-standby delay is already present when the sensor starts streaming.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/i2c/imx296.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/media/i2c/imx296.c
-+++ b/drivers/media/i2c/imx296.c
-@@ -1022,6 +1022,8 @@ static int imx296_identify_model(struct
- 		return ret;
- 	}
- 
-+	usleep_range(2000, 5000);
-+
- 	ret = imx296_read(sensor, IMX296_SENSOR_INFO);
- 	if (ret < 0) {
- 		dev_err(sensor->dev, "failed to read sensor information (%d)\n",
diff --git a/target/linux/bcm27xx/patches-6.1/950-0820-overlays-Add-bmp380-to-i2c-sensor-overlay.patch b/target/linux/bcm27xx/patches-6.1/950-0820-overlays-Add-bmp380-to-i2c-sensor-overlay.patch
deleted file mode 100644
index 535511eb93..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0820-overlays-Add-bmp380-to-i2c-sensor-overlay.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From e1016d61e3dcb058932e8ec5072f2c4bbb05fcb7 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Sun, 30 Jul 2023 18:27:03 +0100
-Subject: [PATCH] overlays: Add bmp380 to i2c-sensor overlay
-
-Add support for the BMP380 pressor sensor to the i2c-sensor overlay.
-
-See: https://github.com/raspberrypi/linux/issues/5558
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/README             |  7 +++++--
- .../boot/dts/overlays/i2c-sensor-common.dtsi  | 19 ++++++++++++++++++-
- 2 files changed, 23 insertions(+), 3 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -2052,8 +2052,8 @@ Info:   Adds support for a number of I2C
-         light level and chemical sensors on i2c_arm
- Load:   dtoverlay=i2c-sensor,<param>=<val>
- Params: addr                    Set the address for the BH1750, BME280, BME680,
--                                BMP280, CCS811, DS1621, HDC100X, JC42, LM75,
--                                MCP980x, MPU6050, MPU9250, MS5637, MS5803,
-+                                BMP280, BMP380, CCS811, DS1621, HDC100X, JC42,
-+                                LM75, MCP980x, MPU6050, MPU9250, MS5637, MS5803,
-                                 MS5805, MS5837, MS8607, SHT3x or TMP102
- 
-         aht10                   Select the Aosong AHT10 temperature and humidity
-@@ -2075,6 +2075,9 @@ Params: addr                    Set the
-         bmp280                  Select the Bosch Sensortronic BMP280
-                                 Valid addresses 0x76-0x77, default 0x76
- 
-+        bmp380                  Select the Bosch Sensortronic BMP380
-+                                Valid addresses 0x76-0x77, default 0x76
-+
-         bno055                  Select the Bosch Sensortronic BNO055 IMU
-                                 Valid address 0x28-0x29, default 0x29
- 
---- a/arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi
-+++ b/arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi
-@@ -493,11 +493,27 @@
- 		};
- 	};
- 
-+	fragment@33 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			bmp380: bmp380@76 {
-+				compatible = "bosch,bmp380";
-+				reg = <0x76>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
- 	__overrides__ {
- 		bme280 = <0>,"+0";
- 		bmp085 = <0>,"+1";
- 		bmp180 = <0>,"+2";
- 		bmp280 = <0>,"+3";
-+		bmp380 = <0>,"+33";
- 		htu21 = <0>,"+4";
- 		lm75 = <0>,"+5";
- 		lm75addr = <&lm75>,"reg:0";
-@@ -535,7 +551,8 @@
- 			<&ms5637>,"reg:0", <&ms5803>,"reg:0", <&ms5805>,"reg:0",
- 			<&ms5837>,"reg:0", <&ms8607>,"reg:0",
- 			<&mpu6050>,"reg:0", <&mpu9250>,"reg:0",
--			<&bno055>,"reg:0", <&sht4x>,"reg:0";
-+			<&bno055>,"reg:0", <&sht4x>,"reg:0",
-+			<&bmp380>,"reg:0";
- 		int_pin = <&max30102>, "interrupts:0",
- 			<&mpu6050>, "interrupts:0",
- 			<&mpu9250>, "interrupts:0";
diff --git a/target/linux/bcm27xx/patches-6.1/950-0821-can-isotp-add-module-parameter-for-maximum-pdu-size.patch b/target/linux/bcm27xx/patches-6.1/950-0821-can-isotp-add-module-parameter-for-maximum-pdu-size.patch
deleted file mode 100644
index d5cce9a433..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0821-can-isotp-add-module-parameter-for-maximum-pdu-size.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From 4b729a06b15fc5ee3694dcc62346dcb718ae4290 Mon Sep 17 00:00:00 2001
-From: Oliver Hartkopp <socketcan@hartkopp.net>
-Date: Sun, 26 Mar 2023 13:59:11 +0200
-Subject: [PATCH] can: isotp: add module parameter for maximum pdu size
-
-commit 96d1c81e6a0478535342dff6c730adb076cd84e8 upstream.
-
-With ISO 15765-2:2016 the PDU size is not limited to 2^12 - 1 (4095)
-bytes but can be represented as a 32 bit unsigned integer value which
-allows 2^32 - 1 bytes (~4GB). The use-cases like automotive unified
-diagnostic services (UDS) and flashing of ECUs still use the small
-static buffers which are provided at socket creation time.
-
-When a use-case requires to transfer PDUs up to 1025 kByte the maximum
-PDU size can now be extended by setting the module parameter
-max_pdu_size. The extended size buffers are only allocated on a
-per-socket/connection base when needed at run-time.
-
-changes since v2: https://lore.kernel.org/all/20230313172510.3851-1-socketcan@hartkopp.net
-- use ARRAY_SIZE() to reference DEFAULT_MAX_PDU_SIZE only at one place
-
-changes since v1: https://lore.kernel.org/all/20230311143446.3183-1-socketcan@hartkopp.net
-- limit the minimum 'max_pdu_size' to 4095 to maintain the classic
-  behavior before ISO 15765-2:2016
-
-Link: https://github.com/raspberrypi/linux/issues/5371
-Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
-Link: https://lore.kernel.org/all/20230326115911.15094-1-socketcan@hartkopp.net
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- net/can/isotp.c | 65 ++++++++++++++++++++++++++++++++++++++++++-------
- 1 file changed, 56 insertions(+), 9 deletions(-)
-
---- a/net/can/isotp.c
-+++ b/net/can/isotp.c
-@@ -85,10 +85,21 @@ MODULE_ALIAS("can-proto-6");
- 
- /* ISO 15765-2:2016 supports more than 4095 byte per ISO PDU as the FF_DL can
-  * take full 32 bit values (4 Gbyte). We would need some good concept to handle
-- * this between user space and kernel space. For now increase the static buffer
-- * to something about 64 kbyte to be able to test this new functionality.
-+ * this between user space and kernel space. For now set the static buffer to
-+ * something about 8 kbyte to be able to test this new functionality.
-  */
--#define MAX_MSG_LENGTH 66000
-+#define DEFAULT_MAX_PDU_SIZE 8300
-+
-+/* maximum PDU size before ISO 15765-2:2016 extension was 4095 */
-+#define MAX_12BIT_PDU_SIZE 4095
-+
-+/* limit the isotp pdu size from the optional module parameter to 1MByte */
-+#define MAX_PDU_SIZE (1025 * 1024U)
-+
-+static unsigned int max_pdu_size __read_mostly = DEFAULT_MAX_PDU_SIZE;
-+module_param(max_pdu_size, uint, 0444);
-+MODULE_PARM_DESC(max_pdu_size, "maximum isotp pdu size (default "
-+		 __stringify(DEFAULT_MAX_PDU_SIZE) ")");
- 
- /* N_PCI type values in bits 7-4 of N_PCI bytes */
- #define N_PCI_SF 0x00	/* single frame */
-@@ -124,13 +135,15 @@ enum {
- };
- 
- struct tpcon {
--	unsigned int idx;
-+	u8 *buf;
-+	unsigned int buflen;
- 	unsigned int len;
-+	unsigned int idx;
- 	u32 state;
- 	u8 bs;
- 	u8 sn;
- 	u8 ll_dl;
--	u8 buf[MAX_MSG_LENGTH + 1];
-+	u8 sbuf[DEFAULT_MAX_PDU_SIZE];
- };
- 
- struct isotp_sock {
-@@ -498,7 +511,17 @@ static int isotp_rcv_ff(struct sock *sk,
- 	if (so->rx.len + ae + off + ff_pci_sz < so->rx.ll_dl)
- 		return 1;
- 
--	if (so->rx.len > MAX_MSG_LENGTH) {
-+	/* PDU size > default => try max_pdu_size */
-+	if (so->rx.len > so->rx.buflen && so->rx.buflen < max_pdu_size) {
-+		u8 *newbuf = kmalloc(max_pdu_size, GFP_ATOMIC);
-+
-+		if (newbuf) {
-+			so->rx.buf = newbuf;
-+			so->rx.buflen = max_pdu_size;
-+		}
-+	}
-+
-+	if (so->rx.len > so->rx.buflen) {
- 		/* send FC frame with overflow status */
- 		isotp_send_fc(sk, ae, ISOTP_FC_OVFLW);
- 		return 1;
-@@ -802,7 +825,7 @@ static void isotp_create_fframe(struct c
- 		cf->data[0] = so->opt.ext_address;
- 
- 	/* create N_PCI bytes with 12/32 bit FF_DL data length */
--	if (so->tx.len > 4095) {
-+	if (so->tx.len > MAX_12BIT_PDU_SIZE) {
- 		/* use 32 bit FF_DL notation */
- 		cf->data[ae] = N_PCI_FF;
- 		cf->data[ae + 1] = 0;
-@@ -939,7 +962,17 @@ static int isotp_sendmsg(struct socket *
- 			goto err_event_drop;
- 	}
- 
--	if (!size || size > MAX_MSG_LENGTH) {
-+	/* PDU size > default => try max_pdu_size */
-+	if (size > so->tx.buflen && so->tx.buflen < max_pdu_size) {
-+		u8 *newbuf = kmalloc(max_pdu_size, GFP_KERNEL);
-+
-+		if (newbuf) {
-+			so->tx.buf = newbuf;
-+			so->tx.buflen = max_pdu_size;
-+		}
-+	}
-+
-+	if (!size || size > so->tx.buflen) {
- 		err = -EINVAL;
- 		goto err_out_drop;
- 	}
-@@ -1194,6 +1227,12 @@ static int isotp_release(struct socket *
- 	so->ifindex = 0;
- 	so->bound = 0;
- 
-+	if (so->rx.buf != so->rx.sbuf)
-+		kfree(so->rx.buf);
-+
-+	if (so->tx.buf != so->tx.sbuf)
-+		kfree(so->tx.buf);
-+
- 	sock_orphan(sk);
- 	sock->sk = NULL;
- 
-@@ -1588,6 +1627,11 @@ static int isotp_init(struct sock *sk)
- 	so->rx.state = ISOTP_IDLE;
- 	so->tx.state = ISOTP_IDLE;
- 
-+	so->rx.buf = so->rx.sbuf;
-+	so->tx.buf = so->tx.sbuf;
-+	so->rx.buflen = ARRAY_SIZE(so->rx.sbuf);
-+	so->tx.buflen = ARRAY_SIZE(so->tx.sbuf);
-+
- 	hrtimer_init(&so->rxtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_SOFT);
- 	so->rxtimer.function = isotp_rx_timer_handler;
- 	hrtimer_init(&so->txtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_SOFT);
-@@ -1670,7 +1714,10 @@ static __init int isotp_module_init(void
- {
- 	int err;
- 
--	pr_info("can: isotp protocol\n");
-+	max_pdu_size = max_t(unsigned int, max_pdu_size, MAX_12BIT_PDU_SIZE);
-+	max_pdu_size = min_t(unsigned int, max_pdu_size, MAX_PDU_SIZE);
-+
-+	pr_info("can: isotp protocol (max_pdu_size %d)\n", max_pdu_size);
- 
- 	err = can_proto_register(&isotp_can_proto);
- 	if (err < 0)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0822-drivers-media-imx296-Updated-imx296-driver-for-exter.patch b/target/linux/bcm27xx/patches-6.1/950-0822-drivers-media-imx296-Updated-imx296-driver-for-exter.patch
deleted file mode 100644
index ee4079cd64..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0822-drivers-media-imx296-Updated-imx296-driver-for-exter.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From e1b03ea9e84320e6bf36a1486abaebbceadd7fc7 Mon Sep 17 00:00:00 2001
-From: Ben Benson <ben.benson@raspberrypi.com>
-Date: Fri, 21 Jul 2023 15:59:51 +0100
-Subject: [PATCH] drivers: media: imx296: Updated imx296 driver for external
- trigger
-
-Updated imx296 driver to support external trigger mode via XTR pin.
-Added module parameter to control this mode.
-
-Signed-off-by: Ben Benson <ben.benson@raspberrypi.com>
----
- drivers/media/i2c/imx296.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/drivers/media/i2c/imx296.c
-+++ b/drivers/media/i2c/imx296.c
-@@ -20,6 +20,10 @@
- #include <media/v4l2-fwnode.h>
- #include <media/v4l2-subdev.h>
- 
-+static int trigger_mode;
-+module_param(trigger_mode, int, 0644);
-+MODULE_PARM_DESC(trigger_mode, "Set trigger mode: 0=default, 1=XTRIG");
-+
- #define IMX296_PIXEL_ARRAY_WIDTH			1456
- #define IMX296_PIXEL_ARRAY_HEIGHT			1088
- 
-@@ -645,6 +649,12 @@ static int imx296_stream_on(struct imx29
- 
- 	imx296_write(sensor, IMX296_CTRL00, 0, &ret);
- 	usleep_range(2000, 5000);
-+
-+	if (trigger_mode == 1) {
-+		imx296_write(sensor, IMX296_CTRL0B, IMX296_CTRL0B_TRIGEN, &ret);
-+		imx296_write(sensor, IMX296_LOWLAGTRG,  IMX296_LOWLAGTRG_FAST, &ret);
-+	}
-+
- 	imx296_write(sensor, IMX296_CTRL0A, 0, &ret);
- 
- 	/* vflip and hflip cannot change during streaming */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0823-media-dt-bindings-imx258-Fix-alternate-compatible-st.patch b/target/linux/bcm27xx/patches-6.1/950-0823-media-dt-bindings-imx258-Fix-alternate-compatible-st.patch
deleted file mode 100644
index f45b68f154..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0823-media-dt-bindings-imx258-Fix-alternate-compatible-st.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 74bc238e86e62109c74d8f229dc105bf3818b4a7 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 2 Aug 2023 14:35:32 +0100
-Subject: [PATCH] media: dt-bindings: imx258: Fix alternate compatible strings
-
-Multiple compatible strings must appear as an enum.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- Documentation/devicetree/bindings/media/i2c/imx258.yaml | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
---- a/Documentation/devicetree/bindings/media/i2c/imx258.yaml
-+++ b/Documentation/devicetree/bindings/media/i2c/imx258.yaml
-@@ -19,8 +19,9 @@ description: |-
- 
- properties:
-   compatible:
--    const: sony,imx258
--    const: sony,imx258-pdaf
-+    enum:
-+      - sony,imx258
-+      - sony,imx258-pdaf
- 
-   assigned-clocks: true
-   assigned-clock-parents: true
diff --git a/target/linux/bcm27xx/patches-6.1/950-0825-char-broadcom-vc_mem-Fix-preprocessor-conditional.patch b/target/linux/bcm27xx/patches-6.1/950-0825-char-broadcom-vc_mem-Fix-preprocessor-conditional.patch
deleted file mode 100644
index 43283784dd..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0825-char-broadcom-vc_mem-Fix-preprocessor-conditional.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 282819aead0166af415b780241dc2def4caee7f4 Mon Sep 17 00:00:00 2001
-From: Alexander Winkowski <dereference23@outlook.com>
-Date: Mon, 3 Jul 2023 18:12:01 +0000
-Subject: [PATCH] char: broadcom: vc_mem: Fix preprocessor conditional
-
-Signed-off-by: Alexander Winkowski <dereference23@outlook.com>
----
- drivers/char/broadcom/vc_mem.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/char/broadcom/vc_mem.c
-+++ b/drivers/char/broadcom/vc_mem.c
-@@ -353,7 +353,7 @@ vc_mem_exit(void)
- 	pr_debug("%s: called\n", __func__);
- 
- 	if (vc_mem_inited) {
--#if CONFIG_DEBUG_FS
-+#ifdef CONFIG_DEBUG_FS
- 		vc_mem_debugfs_deinit();
- #endif
- 		device_destroy(vc_mem_class, vc_mem_devnum);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0826-drivers-dwc_otg-Fix-fallthrough-warnings.patch b/target/linux/bcm27xx/patches-6.1/950-0826-drivers-dwc_otg-Fix-fallthrough-warnings.patch
deleted file mode 100644
index fe74c75e07..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0826-drivers-dwc_otg-Fix-fallthrough-warnings.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From ec61075a786c455444a1d5df338a41bacfce0bb1 Mon Sep 17 00:00:00 2001
-From: Alexander Winkowski <dereference23@outlook.com>
-Date: Mon, 3 Jul 2023 18:23:02 +0000
-Subject: [PATCH] drivers: dwc_otg: Fix fallthrough warnings
-
-Signed-off-by: Alexander Winkowski <dereference23@outlook.com>
----
- drivers/usb/host/dwc_otg/dwc_otg_hcd.c      | 1 +
- drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
-@@ -2049,6 +2049,7 @@ int fiq_fsm_queue_split_transaction(dwc_
- 			} else {
- 				st->fsm = FIQ_PER_SSPLIT_QUEUED;
- 			}
-+			break;
- 		default:
- 			break;
- 	}
---- a/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c
-+++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c
-@@ -402,7 +402,7 @@ int32_t dwc_otg_hcd_handle_rx_status_q_l
- 			hc->xfer_count += grxsts.b.bcnt;
- 			hc->xfer_buff += grxsts.b.bcnt;
- 		}
--
-+		break;
- 	case DWC_GRXSTS_PKTSTS_IN_XFER_COMP:
- 	case DWC_GRXSTS_PKTSTS_DATA_TOGGLE_ERR:
- 	case DWC_GRXSTS_PKTSTS_CH_HALTED:
diff --git a/target/linux/bcm27xx/patches-6.1/950-0827-vc04_services-vc-sm-cma-Switch-one-bit-bitfields-to-.patch b/target/linux/bcm27xx/patches-6.1/950-0827-vc04_services-vc-sm-cma-Switch-one-bit-bitfields-to-.patch
deleted file mode 100644
index edd117c9b5..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0827-vc04_services-vc-sm-cma-Switch-one-bit-bitfields-to-.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 2dd2f36d10961e3819ff0525ae2567e601973826 Mon Sep 17 00:00:00 2001
-From: Alexander Winkowski <dereference23@outlook.com>
-Date: Mon, 3 Jul 2023 18:29:37 +0000
-Subject: [PATCH] vc04_services/vc-sm-cma: Switch one-bit bitfields to bool
-
-Clang 16 warns:
-
-../drivers/staging/vc04_services/vc-sm-cma/vc_sm.c:816:19: warning: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Wsingle-bit-bitfield-constant-conversion]
-        buffer->imported = 1;
-                         ^ ~
-../drivers/staging/vc04_services/vc-sm-cma/vc_sm.c:822:17: warning: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Wsingle-bit-bitfield-constant-conversion]
-        buffer->in_use = 1;
-                       ^ ~
-2 warnings generated.
-
-Signed-off-by: Alexander Winkowski <dereference23@outlook.com>
----
- drivers/staging/vc04_services/vc-sm-cma/vc_sm.c | 6 +++---
- drivers/staging/vc04_services/vc-sm-cma/vc_sm.h | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
---- a/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c
-+++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c
-@@ -533,7 +533,7 @@ static void vc_sm_dma_buf_release(struct
- 
- 	pr_debug("%s dmabuf %p, buffer %p\n", __func__, dmabuf, buffer);
- 
--	buffer->in_use = 0;
-+	buffer->in_use = false;
- 
- 	/* Unmap on the VPU */
- 	vc_sm_vpu_free(buffer);
-@@ -813,13 +813,13 @@ vc_sm_cma_import_dmabuf_internal(struct
- 	buffer->size = import.size;
- 	buffer->vpu_state = VPU_MAPPED;
- 
--	buffer->imported = 1;
-+	buffer->imported = true;
- 	buffer->import.dma_buf = dma_buf;
- 
- 	buffer->import.attach = attach;
- 	buffer->import.sgt = sgt;
- 	buffer->dma_addr = dma_addr;
--	buffer->in_use = 1;
-+	buffer->in_use = true;
- 	buffer->kernel_id = import.kernel_id;
- 
- 	/*
---- a/drivers/staging/vc04_services/vc-sm-cma/vc_sm.h
-+++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.h
-@@ -57,8 +57,8 @@ struct vc_sm_buffer {
- 
- 	char name[VC_SM_MAX_NAME_LEN];
- 
--	int in_use:1;	/* Kernel is still using this resource */
--	int imported:1;	/* Imported dmabuf */
-+	bool in_use:1;   /* Kernel is still using this resource */
-+	bool imported:1; /* Imported dmabuf */
- 
- 	enum vc_sm_vpu_mapping_state vpu_state;
- 	u32 vc_handle;	/* VideoCore handle for this buffer */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0828-media-i2c-ov2311-Fix-uninitialized-variable-usage.patch b/target/linux/bcm27xx/patches-6.1/950-0828-media-i2c-ov2311-Fix-uninitialized-variable-usage.patch
deleted file mode 100644
index d6fd3a9f92..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0828-media-i2c-ov2311-Fix-uninitialized-variable-usage.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 3333d45347d313ea589b8b8da1193d342060a946 Mon Sep 17 00:00:00 2001
-From: Alexander Winkowski <dereference23@outlook.com>
-Date: Mon, 3 Jul 2023 18:36:45 +0000
-Subject: [PATCH] media: i2c: ov2311: Fix uninitialized variable usage
-
-Signed-off-by: Alexander Winkowski <dereference23@outlook.com>
----
- drivers/media/i2c/ov2311.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/media/i2c/ov2311.c
-+++ b/drivers/media/i2c/ov2311.c
-@@ -1018,7 +1018,7 @@ static int ov2311_check_sensor_id(struct
- 				  struct i2c_client *client)
- {
- 	struct device *dev = &ov2311->client->dev;
--	u32 id = 0, id_msb;
-+	u32 id = 0, id_msb = 0;
- 	int ret;
- 
- 	ret = ov2311_read_reg(client, OV2311_REG_CHIP_ID + 1,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0830-drm-panel-Fix-default-values-for-Waveshare-7.9-inch-.patch b/target/linux/bcm27xx/patches-6.1/950-0830-drm-panel-Fix-default-values-for-Waveshare-7.9-inch-.patch
deleted file mode 100644
index 035b5b0049..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0830-drm-panel-Fix-default-values-for-Waveshare-7.9-inch-.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e89e7655a197d28df49da2be7e2003436cf52197 Mon Sep 17 00:00:00 2001
-From: Ignacio Larrain <ilarrain@gmail.com>
-Date: Tue, 22 Aug 2023 11:11:56 -0400
-Subject: [PATCH] drm/panel: Fix default values for Waveshare 7.9 inch DSI
- touchscreen (#5565)
-
-This fixes touchscreen calibration, axis swapping and inversion.
-
-As referenced in https://github.com/raspberrypi/linux/issues/5550
----
- .../dts/overlays/vc4-kms-dsi-waveshare-panel-overlay.dts    | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/vc4-kms-dsi-waveshare-panel-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/vc4-kms-dsi-waveshare-panel-overlay.dts
-@@ -93,10 +93,10 @@
- 				   <&touch>, "touchscreen-size-x:0=800",
- 				   <&touch>, "touchscreen-size-y:0=480";
- 		7_9_inch = <&panel>, "compatible=waveshare,7.9inch-panel",
--				   <&touch>, "touchscreen-size-x:0=400",
--				   <&touch>, "touchscreen-size-y:0=1280",
-+				   <&touch>, "touchscreen-size-x:0=4096",
-+				   <&touch>, "touchscreen-size-y:0=4096",
- 				   <&touch>, "touchscreen-inverted-x?",
--				   <&touch>, "touchscreen-inverted-y?";
-+				   <&touch>, "touchscreen-swapped-x-y?";
- 		8_0_inch = <&panel>, "compatible=waveshare,8.0inch-panel",
- 				   <&touch>, "touchscreen-size-x:0=800",
- 				   <&touch>, "touchscreen-size-y:0=1280",
diff --git a/target/linux/bcm27xx/patches-6.1/950-0831-dtoverlays-Add-i2c-bus-overrides-to-edt-ft5406-overl.patch b/target/linux/bcm27xx/patches-6.1/950-0831-dtoverlays-Add-i2c-bus-overrides-to-edt-ft5406-overl.patch
deleted file mode 100644
index cf703b0029..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0831-dtoverlays-Add-i2c-bus-overrides-to-edt-ft5406-overl.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 3fa2fbb7f6e60b85086e454403c5eab1af63b1aa Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 14 Jun 2023 13:43:58 +0100
-Subject: [PATCH] dtoverlays: Add i2c bus overrides to edt-ft5406 overlay
-
-Adds the option for the touch controller to be connected to any
-of the I2C ports.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/README             | 17 +++++++++++++++-
- .../boot/dts/overlays/edt-ft5406-overlay.dts  | 20 +++++++++++++++++++
- arch/arm/boot/dts/overlays/edt-ft5406.dtsi    |  9 ++++++++-
- 3 files changed, 44 insertions(+), 2 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -1040,9 +1040,11 @@ Params: dr_mode                 Dual rol
- 
- 
- Name:   edt-ft5406
--Info:   Overlay for the EDT FT5406 touchscreen on the CSI/DSI I2C interface.
-+Info:   Overlay for the EDT FT5406 touchscreen.
-         This works with the Raspberry Pi 7" touchscreen when not being polled
-         by the firmware.
-+        By default the overlay uses the i2c_csi_dsi I2C interface, but this
-+        can be overridden
-         You MUST use either "disable_touchscreen=1" or "ignore_lcd=1" in
-         config.txt to stop the firmware polling the touchscreen.
- Load:   dtoverlay=edt-ft5406,<param>=<val>
-@@ -1051,6 +1053,19 @@ Params: sizex                   Touchscr
-         invx                    Touchscreen inverted x axis
-         invy                    Touchscreen inverted y axis
-         swapxy                  Touchscreen swapped x y axis
-+        i2c0                    Choose the I2C0 bus on GPIOs 0&1
-+        i2c1                    Choose the I2C1 bus on GPIOs 2&3
-+        i2c3                    Choose the I2C3 bus (configure with the i2c3
-+                                overlay - BCM2711 only)
-+        i2c4                    Choose the I2C4 bus (configure with the i2c4
-+                                overlay - BCM2711 only)
-+        i2c5                    Choose the I2C5 bus (configure with the i2c5
-+                                overlay - BCM2711 only)
-+        i2c6                    Choose the I2C6 bus (configure with the i2c6
-+                                overlay - BCM2711 only)
-+        addr                    Sets the address for the touch controller. Note
-+                                that the device must be configured to use the
-+                                specified address.
- 
- 
- Name:   enc28j60
---- a/arch/arm/boot/dts/overlays/edt-ft5406-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/edt-ft5406-overlay.dts
-@@ -23,4 +23,24 @@
- 			status = "okay";
- 		};
- 	};
-+
-+	__overrides__ {
-+		i2c0 = <&frag13>,"target:0=",<&i2c0>;
-+		i2c1 = <&frag13>, "target?=0",
-+		       <&frag13>, "target-path=i2c1",
-+		       <0>,"-0-1";
-+		i2c3 = <&frag13>, "target?=0",
-+		       <&frag13>, "target-path=i2c3",
-+		       <0>,"-0-1";
-+		i2c4 = <&frag13>, "target?=0",
-+		       <&frag13>, "target-path=i2c4",
-+		       <0>,"-0-1";
-+		i2c5 = <&frag13>, "target?=0",
-+		       <&frag13>, "target-path=i2c5",
-+		       <0>,"-0-1";
-+		i2c6 = <&frag13>, "target?=0",
-+		       <&frag13>, "target-path=i2c6",
-+		       <0>,"-0-1";
-+		addr = <&ft5406>,"reg:0";
-+	};
- };
---- a/arch/arm/boot/dts/overlays/edt-ft5406.dtsi
-+++ b/arch/arm/boot/dts/overlays/edt-ft5406.dtsi
-@@ -23,7 +23,7 @@
- 	};
- 
- 	fragment@12 {
--		target = <&i2c_csi_dsi>;
-+		target = <&i2cbus>;
- 		__overlay__ {
- 			#address-cells = <1>;
- 			#size-cells = <0>;
-@@ -37,6 +37,13 @@
- 		};
- 	};
- 
-+	frag13: fragment@13 {
-+		target = <&i2c_csi_dsi>;
-+		i2cbus: __overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
- 	__overrides__ {
- 		sizex = <&ft5406>,"touchscreen-size-x:0";
- 		sizey = <&ft5406>,"touchscreen-size-y:0";
diff --git a/target/linux/bcm27xx/patches-6.1/950-0832-dtoverlays-Fix-README-text-for-i2c-fan.patch b/target/linux/bcm27xx/patches-6.1/950-0832-dtoverlays-Fix-README-text-for-i2c-fan.patch
deleted file mode 100644
index 23953c9636..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0832-dtoverlays-Fix-README-text-for-i2c-fan.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9d9586dc0c0deecb90675bd70862fe262f7376ab Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 14 Jun 2023 14:25:21 +0100
-Subject: [PATCH] dtoverlays: Fix README text for i2c-fan
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/README | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -1800,10 +1800,10 @@ Params: addr                    Sets the
-         i2c3                    Choose the I2C3 bus (configure with the i2c3
-                                 overlay - BCM2711 only)
- 
--        i2c4                    Choose the I2C3 bus (configure with the i2c3
-+        i2c4                    Choose the I2C4 bus (configure with the i2c4
-                                 overlay - BCM2711 only)
- 
--        i2c5                    Choose the I2C5 bus (configure with the i2c4
-+        i2c5                    Choose the I2C5 bus (configure with the i2c5
-                                 overlay - BCM2711 only)
- 
-         i2c6                    Choose the I2C6 bus (configure with the i2c6
diff --git a/target/linux/bcm27xx/patches-6.1/950-0833-drivers-irqchip-irq-bcm2835-Concurrency-fix.patch b/target/linux/bcm27xx/patches-6.1/950-0833-drivers-irqchip-irq-bcm2835-Concurrency-fix.patch
deleted file mode 100644
index 48e2fcdc74..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0833-drivers-irqchip-irq-bcm2835-Concurrency-fix.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From e804bd1843236a63815e9acfb1a38ebf9a28ef5b Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 31 Aug 2023 16:45:44 +0100
-Subject: [PATCH] drivers: irqchip: irq-bcm2835: Concurrency fix
-
-The commit shown in Fixes: aims to improve interrupt throughput by
-getting the handlers invoked on different CPU cores. It does so (*) by
-using an irq_ack hook to change the interrupt routing.
-
-Unfortunately, the IRQ status bits must be cleared at source, which only
-happens once the interrupt handler has run - there is no easy way for
-one core to claim one of the IRQs before sending the remainder to the
-next core on the list, so waking another core immediately results in a
-race with a chance of both cores handling the same IRQ. It is probably
-for this reason that the routing change is deferred to irq_ack, but that
-doesn't guarantee no clashes - after irq_ack is called, control returns
-to bcm2836_chained_handler_irq which proceeds to check for other pending
-IRQs at a time when the next core is probably doing the same thing.
-
-Since the whole point of the original commit is to distribute the IRQ
-handling, there is no reason to attempt to handle multiple IRQs in one
-interrupt callback, so the problem can be solved (or at least made much
-harder to reproduce) by changing a "while" into an "if", so that each
-invocation only handles one IRQ.
-
-(*) I'm not convinced it's as effective as claimed since irq_ack is
-called _after_ the interrupt handler, but the author thought it made a
-difference.
-
-See: https://github.com/raspberrypi/linux/issues/5214
-     https://github.com/raspberrypi/linux/pull/1794
-
-Fixes: fd4c9785bde8 ("ARM64: Round-Robin dispatch IRQs between CPUs.")
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/irqchip/irq-bcm2835.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/irqchip/irq-bcm2835.c
-+++ b/drivers/irqchip/irq-bcm2835.c
-@@ -343,7 +343,8 @@ static void bcm2836_chained_handle_irq(s
- {
- 	u32 hwirq;
- 
--	while ((hwirq = get_next_armctrl_hwirq()) != ~0)
-+	hwirq = get_next_armctrl_hwirq();
-+	if (hwirq != ~0)
- 		generic_handle_domain_irq(intc.domain, hwirq);
- }
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0835-dtoverlays-Add-drm-option-to-piscreen-overlay.patch b/target/linux/bcm27xx/patches-6.1/950-0835-dtoverlays-Add-drm-option-to-piscreen-overlay.patch
deleted file mode 100644
index 10b1f15d2c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0835-dtoverlays-Add-drm-option-to-piscreen-overlay.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 5e54398e1b61335883dff1be46a6c8b3ca973926 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 30 Aug 2023 18:03:37 +0100
-Subject: [PATCH] dtoverlays: Add drm option to piscreen overlay
-
-Adds the option of selecting the DRM/KMS TinyDRM driver for
-this panel, rather than the deprecated FBTFT one.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/README               |  3 +++
- arch/arm/boot/dts/overlays/piscreen-overlay.dts | 10 +++++++---
- 2 files changed, 10 insertions(+), 3 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -3245,6 +3245,9 @@ Params: speed                   Display
- 
-         xohms                   Touchpanel sensitivity (X-plate resistance)
- 
-+        drm                     Select the DRM/KMS driver instead of the FBTFT
-+                                one
-+
- 
- Name:   piscreen2r
- Info:   PiScreen 2 with resistive TP display by OzzMaker.com
---- a/arch/arm/boot/dts/overlays/piscreen-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/piscreen-overlay.dts
-@@ -6,6 +6,8 @@
- /dts-v1/;
- /plugin/;
- 
-+#include <dt-bindings/gpio/gpio.h>
-+
- / {
- 	compatible = "brcm,bcm2835";
- 
-@@ -59,9 +61,9 @@
- 				fps = <30>;
- 				buswidth = <8>;
- 				regwidth = <16>;
--				reset-gpios = <&gpio 25 1>;
--				dc-gpios = <&gpio 24 0>;
--				led-gpios = <&gpio 22 0>;
-+				reset-gpios = <&gpio 25 GPIO_ACTIVE_LOW>;
-+				dc-gpios = <&gpio 24 GPIO_ACTIVE_HIGH>;
-+				led-gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
- 				debug = <0>;
- 
- 				init = <0x10000b0 0x00
-@@ -98,5 +100,7 @@
- 		fps =		<&piscreen>,"fps:0";
- 		debug =		<&piscreen>,"debug:0";
- 		xohms =		<&piscreen_ts>,"ti,x-plate-ohms;0";
-+		drm =		<&piscreen>,"compatible=waveshare,rpi-lcd-35",
-+				<&piscreen>,"reset-gpios:8=",<GPIO_ACTIVE_HIGH>;
- 	};
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0836-drm-ili9486-Resolve-clash-in-spi_device_id-names.patch b/target/linux/bcm27xx/patches-6.1/950-0836-drm-ili9486-Resolve-clash-in-spi_device_id-names.patch
deleted file mode 100644
index 0bce9f9e78..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0836-drm-ili9486-Resolve-clash-in-spi_device_id-names.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From f59fe2d1bd056af117eb512bb0e9210a943c6d47 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 1 Sep 2023 12:17:38 +0100
-Subject: [PATCH] drm/ili9486: Resolve clash in spi_device_id names
-
-For "Really Good Reasons" [1] the SPI core requires a match
-between compatible device strings and the name in spi_device_id.
-
-The ili9486 driver uses compatible strings "waveshare,rpi-lcd-35"
-and "ozzmaker,piscreen", but "rpi-lcd-35" and "piscreen" are missing,
-so add them.
-
-Compatible string "ilitek,ili9486" is already used by
-staging/fbtft/fb_ili9486, therefore leaving it present in ili9486 as an
-spi_device_id causes the incorrect module to be loaded, therefore remove
-this id.
-
-[1] https://elixir.bootlin.com/linux/latest/source/drivers/spi/spi.c#L487
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/tiny/ili9486.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/tiny/ili9486.c
-+++ b/drivers/gpu/drm/tiny/ili9486.c
-@@ -187,7 +187,8 @@ static const struct of_device_id ili9486
- MODULE_DEVICE_TABLE(of, ili9486_of_match);
- 
- static const struct spi_device_id ili9486_id[] = {
--	{ "ili9486", 0 },
-+	{ "rpi-lcd-35", 0 },
-+	{ "piscreen", 0 },
- 	{ }
- };
- MODULE_DEVICE_TABLE(spi, ili9486_id);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0837-input-ads7846-Add-missing-spi_device_id-strings.patch b/target/linux/bcm27xx/patches-6.1/950-0837-input-ads7846-Add-missing-spi_device_id-strings.patch
deleted file mode 100644
index 71f1063986..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0837-input-ads7846-Add-missing-spi_device_id-strings.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 50c5a8558f4aaa54a3c4f5a8c2b6053f641d94eb Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 1 Sep 2023 12:23:30 +0100
-Subject: [PATCH] input: ads7846: Add missing spi_device_id strings
-
-The SPI core logs error messages if a compatible string device
-name is not also present as an spi_device_id.
-
-No spi_device_id values are specified by the driver, therefore
-we get 4 log lines every time it is loaded:
-SPI driver ads7846 has no spi_device_id for ti,tsc2046
-SPI driver ads7846 has no spi_device_id for ti,ads7843
-SPI driver ads7846 has no spi_device_id for ti,ads7845
-SPI driver ads7846 has no spi_device_id for ti,ads7873
-
-Add the spi_device_id values for these devices.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/input/touchscreen/ads7846.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
---- a/drivers/input/touchscreen/ads7846.c
-+++ b/drivers/input/touchscreen/ads7846.c
-@@ -1127,6 +1127,17 @@ static const struct of_device_id ads7846
- };
- MODULE_DEVICE_TABLE(of, ads7846_dt_ids);
- 
-+static const struct spi_device_id ads7846_spi_ids[] = {
-+	{ "tsc2046", 0 },
-+	{ "ads7843", 0 },
-+	{ "ads7843", 0 },
-+	{ "ads7845", 0 },
-+	{ "ads7846", 0 },
-+	{ "ads7873", 0 },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(spi, ads7846_spi_ids);
-+
- static const struct ads7846_platform_data *ads7846_probe_dt(struct device *dev)
- {
- 	struct ads7846_platform_data *pdata;
-@@ -1424,6 +1435,7 @@ static struct spi_driver ads7846_driver
- 		.pm	= &ads7846_pm,
- 		.of_match_table = of_match_ptr(ads7846_dt_ids),
- 	},
-+	.id_table	= ads7846_spi_ids,
- 	.probe		= ads7846_probe,
- 	.remove		= ads7846_remove,
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0838-staging-bcm2835-codec-Downgrade-the-level-for-a-debu.patch b/target/linux/bcm27xx/patches-6.1/950-0838-staging-bcm2835-codec-Downgrade-the-level-for-a-debu.patch
deleted file mode 100644
index 5af23821a8..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0838-staging-bcm2835-codec-Downgrade-the-level-for-a-debu.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 65742d7116e89b08858fcd7d67bd521ee19ee837 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 30 Aug 2023 18:05:43 +0100
-Subject: [PATCH] staging: bcm2835-codec: Downgrade the level for a debug
- message
-
-The debug message from bcm2835_codec_buf_prepare when the buffer
-size is incorrect can be a little spammy if the application isn't
-careful on how it drives it, therefore drop the priority of the
-message.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c    | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-+++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -2883,7 +2883,7 @@ static int bcm2835_codec_buf_prepare(str
- 	}
- 
- 	if (vb2_plane_size(vb, 0) < q_data->sizeimage) {
--		v4l2_err(&ctx->dev->v4l2_dev, "%s data will not fit into plane (%lu < %lu)\n",
-+		v4l2_dbg(1, debug, &ctx->dev->v4l2_dev, "%s data will not fit into plane (%lu < %lu)\n",
- 			 __func__, vb2_plane_size(vb, 0),
- 			 (long)q_data->sizeimage);
- 		return -EINVAL;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0840-gpio-fsm-Sort-functions-into-a-more-logical-order.patch b/target/linux/bcm27xx/patches-6.1/950-0840-gpio-fsm-Sort-functions-into-a-more-logical-order.patch
deleted file mode 100644
index 873077f51c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0840-gpio-fsm-Sort-functions-into-a-more-logical-order.patch
+++ /dev/null
@@ -1,286 +0,0 @@
-From cee471c3ada3215d6dfc53fb0f1b97548444dea7 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 5 Sep 2023 11:56:19 +0100
-Subject: [PATCH] gpio-fsm: Sort functions into a more logical order
-
-Move some functions into a more logical ordering. This change causes
-no functional change and is essentially cosmetic.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/gpio/gpio-fsm.c | 245 ++++++++++++++++++++--------------------
- 1 file changed, 125 insertions(+), 120 deletions(-)
-
---- a/drivers/gpio/gpio-fsm.c
-+++ b/drivers/gpio/gpio-fsm.c
-@@ -193,131 +193,14 @@ static void free_symbols(struct symtab_e
- 	}
- }
- 
--static int gpio_fsm_get_direction(struct gpio_chip *gc, unsigned int off)
--{
--	struct gpio_fsm *gf = gpiochip_get_data(gc);
--	struct soft_gpio *sg;
--
--	if (off >= gf->num_soft_gpios)
--		return -EINVAL;
--	sg = &gf->soft_gpios[off];
--
--	return sg->dir;
--}
--
--static int gpio_fsm_get(struct gpio_chip *gc, unsigned int off)
--{
--	struct gpio_fsm *gf = gpiochip_get_data(gc);
--	struct soft_gpio *sg;
--
--	if (off >= gf->num_soft_gpios)
--		return -EINVAL;
--	sg = &gf->soft_gpios[off];
--
--	return sg->value;
--}
--
- static void gpio_fsm_go_to_state(struct gpio_fsm *gf,
--				   struct fsm_state *new_state)
--{
--	struct input_gpio_state *inp_state;
--	struct gpio_event *gp_ev;
--	struct fsm_state *state;
--	int i;
--
--	dev_dbg(gf->dev, "go_to_state(%s)\n",
--		  new_state ? new_state->name : "<unset>");
--
--	spin_lock(&gf->spinlock);
--
--	if (gf->next_state) {
--		/* Something else has already requested a transition */
--		spin_unlock(&gf->spinlock);
--		return;
--	}
--
--	gf->next_state = new_state;
--	state = gf->current_state;
--	gf->delay_target_state = NULL;
--
--	if (state) {
--		/* Disarm any GPIO IRQs */
--		for (i = 0; i < state->num_gpio_events; i++) {
--			gp_ev = &state->gpio_events[i];
--			inp_state = &gf->input_gpio_states[gp_ev->index];
--			inp_state->target = NULL;
--		}
--	}
--
--	spin_unlock(&gf->spinlock);
--
--	if (new_state)
--		schedule_work(&gf->work);
--}
-+				 struct fsm_state *new_state);
- 
- static void gpio_fsm_set_soft(struct gpio_fsm *gf,
--				unsigned int off, int val)
--{
--	struct soft_gpio *sg = &gf->soft_gpios[off];
--	struct gpio_event *gp_ev;
--	struct fsm_state *state;
--	int i;
--
--	dev_dbg(gf->dev, "set(%d,%d)\n", off, val);
--	state = gf->current_state;
--	sg->value = val;
--	for (i = 0; i < state->num_soft_events; i++) {
--		gp_ev = &state->soft_events[i];
--		if (gp_ev->index == off && gp_ev->value == val) {
--			if (gf->debug)
--				dev_info(gf->dev,
--					 "GF_SOFT %d->%d -> %s\n", gp_ev->index,
--					 gp_ev->value, gp_ev->target->name);
--			gpio_fsm_go_to_state(gf, gp_ev->target);
--			break;
--		}
--	}
--}
--
--static int gpio_fsm_direction_input(struct gpio_chip *gc, unsigned int off)
--{
--	struct gpio_fsm *gf = gpiochip_get_data(gc);
--	struct soft_gpio *sg;
--
--	if (off >= gf->num_soft_gpios)
--		return -EINVAL;
--	sg = &gf->soft_gpios[off];
--	sg->dir = GPIOF_DIR_IN;
--
--	return 0;
--}
--
--static int gpio_fsm_direction_output(struct gpio_chip *gc, unsigned int off,
--				       int value)
--{
--	struct gpio_fsm *gf = gpiochip_get_data(gc);
--	struct soft_gpio *sg;
--
--	if (off >= gf->num_soft_gpios)
--		return -EINVAL;
--	sg = &gf->soft_gpios[off];
--	sg->dir = GPIOF_DIR_OUT;
--	gpio_fsm_set_soft(gf, off, value);
--
--	return 0;
--}
--
--static void gpio_fsm_set(struct gpio_chip *gc, unsigned int off, int val)
--{
--	struct gpio_fsm *gf;
--
--	gf = gpiochip_get_data(gc);
--	if (off < gf->num_soft_gpios)
--		gpio_fsm_set_soft(gf, off, val);
--}
-+			      unsigned int off, int val);
- 
- static void gpio_fsm_enter_state(struct gpio_fsm *gf,
--				   struct fsm_state *state)
-+				 struct fsm_state *state)
- {
- 	struct input_gpio_state *inp_state;
- 	struct output_signal *signal;
-@@ -431,6 +314,44 @@ static void gpio_fsm_enter_state(struct
- 	}
- }
- 
-+static void gpio_fsm_go_to_state(struct gpio_fsm *gf,
-+				 struct fsm_state *new_state)
-+{
-+	struct input_gpio_state *inp_state;
-+	struct gpio_event *gp_ev;
-+	struct fsm_state *state;
-+	int i;
-+
-+	dev_dbg(gf->dev, "go_to_state(%s)\n",
-+		  new_state ? new_state->name : "<unset>");
-+
-+	spin_lock(&gf->spinlock);
-+
-+	if (gf->next_state) {
-+		/* Something else has already requested a transition */
-+		spin_unlock(&gf->spinlock);
-+		return;
-+	}
-+
-+	gf->next_state = new_state;
-+	state = gf->current_state;
-+	gf->delay_target_state = NULL;
-+
-+	if (state) {
-+		/* Disarm any GPIO IRQs */
-+		for (i = 0; i < state->num_gpio_events; i++) {
-+			gp_ev = &state->gpio_events[i];
-+			inp_state = &gf->input_gpio_states[gp_ev->index];
-+			inp_state->target = NULL;
-+		}
-+	}
-+
-+	spin_unlock(&gf->spinlock);
-+
-+	if (new_state)
-+		schedule_work(&gf->work);
-+}
-+
- static void gpio_fsm_work(struct work_struct *work)
- {
- 	struct input_gpio_state *inp_state;
-@@ -851,6 +772,90 @@ static int resolve_sym_to_state(struct g
- 	return 0;
- }
- 
-+static void gpio_fsm_set_soft(struct gpio_fsm *gf,
-+			      unsigned int off, int val)
-+{
-+	struct soft_gpio *sg = &gf->soft_gpios[off];
-+	struct gpio_event *gp_ev;
-+	struct fsm_state *state;
-+	int i;
-+
-+	dev_dbg(gf->dev, "set(%d,%d)\n", off, val);
-+	state = gf->current_state;
-+	sg->value = val;
-+	for (i = 0; i < state->num_soft_events; i++) {
-+		gp_ev = &state->soft_events[i];
-+		if (gp_ev->index == off && gp_ev->value == val) {
-+			if (gf->debug)
-+				dev_info(gf->dev,
-+					 "GF_SOFT %d->%d -> %s\n", gp_ev->index,
-+					 gp_ev->value, gp_ev->target->name);
-+			gpio_fsm_go_to_state(gf, gp_ev->target);
-+			break;
-+		}
-+	}
-+}
-+
-+static int gpio_fsm_get(struct gpio_chip *gc, unsigned int off)
-+{
-+	struct gpio_fsm *gf = gpiochip_get_data(gc);
-+	struct soft_gpio *sg;
-+
-+	if (off >= gf->num_soft_gpios)
-+		return -EINVAL;
-+	sg = &gf->soft_gpios[off];
-+
-+	return sg->value;
-+}
-+
-+static void gpio_fsm_set(struct gpio_chip *gc, unsigned int off, int val)
-+{
-+	struct gpio_fsm *gf;
-+
-+	gf = gpiochip_get_data(gc);
-+	if (off < gf->num_soft_gpios)
-+		gpio_fsm_set_soft(gf, off, val);
-+}
-+
-+static int gpio_fsm_get_direction(struct gpio_chip *gc, unsigned int off)
-+{
-+	struct gpio_fsm *gf = gpiochip_get_data(gc);
-+	struct soft_gpio *sg;
-+
-+	if (off >= gf->num_soft_gpios)
-+		return -EINVAL;
-+	sg = &gf->soft_gpios[off];
-+
-+	return sg->dir;
-+}
-+
-+static int gpio_fsm_direction_input(struct gpio_chip *gc, unsigned int off)
-+{
-+	struct gpio_fsm *gf = gpiochip_get_data(gc);
-+	struct soft_gpio *sg;
-+
-+	if (off >= gf->num_soft_gpios)
-+		return -EINVAL;
-+	sg = &gf->soft_gpios[off];
-+	sg->dir = GPIOF_DIR_IN;
-+
-+	return 0;
-+}
-+
-+static int gpio_fsm_direction_output(struct gpio_chip *gc, unsigned int off,
-+				       int value)
-+{
-+	struct gpio_fsm *gf = gpiochip_get_data(gc);
-+	struct soft_gpio *sg;
-+
-+	if (off >= gf->num_soft_gpios)
-+		return -EINVAL;
-+	sg = &gf->soft_gpios[off];
-+	sg->dir = GPIOF_DIR_OUT;
-+	gpio_fsm_set_soft(gf, off, value);
-+
-+	return 0;
-+}
- 
- /*
-  * /sys/class/gpio-fsm/<fsm-name>/
diff --git a/target/linux/bcm27xx/patches-6.1/950-0841-gpio_fsm-Rework-the-atomic-vs-non-atomic-split.patch b/target/linux/bcm27xx/patches-6.1/950-0841-gpio_fsm-Rework-the-atomic-vs-non-atomic-split.patch
deleted file mode 100644
index ae3c019e25..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0841-gpio_fsm-Rework-the-atomic-vs-non-atomic-split.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-From f0061ffc98c6e027c5774e2a24ceadcfee4167ea Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 5 Sep 2023 12:01:13 +0100
-Subject: [PATCH] gpio_fsm: Rework the atomic-vs-non-atomic split
-
-Partition the code to separate atomic and non-atomic methods so that
-none of them have to handle both cases. The result avoids using deferred
-work unless necessary, and should be easier to understand.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/gpio/gpio-fsm.c | 84 ++++++++++++++++++++---------------------
- 1 file changed, 41 insertions(+), 43 deletions(-)
-
---- a/drivers/gpio/gpio-fsm.c
-+++ b/drivers/gpio/gpio-fsm.c
-@@ -193,9 +193,6 @@ static void free_symbols(struct symtab_e
- 	}
- }
- 
--static void gpio_fsm_go_to_state(struct gpio_fsm *gf,
--				 struct fsm_state *new_state);
--
- static void gpio_fsm_set_soft(struct gpio_fsm *gf,
- 			      unsigned int off, int val);
- 
-@@ -213,6 +210,7 @@ static void gpio_fsm_enter_state(struct
- 	dev_dbg(gf->dev, "enter_state(%s)\n", state->name);
- 
- 	gf->current_state = state;
-+	gf->delay_target_state = NULL;
- 
- 	// 1. Apply any listed signals
- 	for (i = 0; i < state->num_signals; i++) {
-@@ -271,7 +269,7 @@ static void gpio_fsm_enter_state(struct
- 				dev_info(gf->dev,
- 					 "GF_SOFT %d=%d -> %s\n", event->index,
- 					 event->value, event->target->name);
--			gpio_fsm_go_to_state(gf, event->target);
-+			gpio_fsm_enter_state(gf, event->target);
- 			return;
- 		}
- 	}
-@@ -284,7 +282,7 @@ static void gpio_fsm_enter_state(struct
- 		inp_state->value = event->value;
- 		inp_state->enabled = true;
- 
--		value = gpiod_get_value(gf->input_gpios->desc[event->index]);
-+		value = gpiod_get_value_cansleep(gf->input_gpios->desc[event->index]);
- 
- 		// Clear stale event state
- 		disable_irq(inp_state->irq);
-@@ -299,7 +297,7 @@ static void gpio_fsm_enter_state(struct
- 				dev_info(gf->dev,
- 					 "GF_IN %d=%d -> %s\n", event->index,
- 					 event->value, event->target->name);
--			gpio_fsm_go_to_state(gf, event->target);
-+			gpio_fsm_enter_state(gf, event->target);
- 			return;
- 		}
- 	}
-@@ -325,6 +323,33 @@ static void gpio_fsm_go_to_state(struct
- 	dev_dbg(gf->dev, "go_to_state(%s)\n",
- 		  new_state ? new_state->name : "<unset>");
- 
-+	state = gf->current_state;
-+
-+	/* Disable any enabled GPIO IRQs */
-+	for (i = 0; i < state->num_gpio_events; i++) {
-+		gp_ev = &state->gpio_events[i];
-+		inp_state = &gf->input_gpio_states[gp_ev->index];
-+		if (inp_state->enabled) {
-+			inp_state->enabled = false;
-+			irq_set_irq_type(inp_state->irq,
-+					 IRQF_TRIGGER_NONE);
-+		}
-+	}
-+
-+	gpio_fsm_enter_state(gf, new_state);
-+}
-+
-+static void gpio_fsm_go_to_state_deferred(struct gpio_fsm *gf,
-+					  struct fsm_state *new_state)
-+{
-+	struct input_gpio_state *inp_state;
-+	struct gpio_event *gp_ev;
-+	struct fsm_state *state;
-+	int i;
-+
-+	dev_dbg(gf->dev, "go_to_state_deferred(%s)\n",
-+		  new_state ? new_state->name : "<unset>");
-+
- 	spin_lock(&gf->spinlock);
- 
- 	if (gf->next_state) {
-@@ -335,57 +360,31 @@ static void gpio_fsm_go_to_state(struct
- 
- 	gf->next_state = new_state;
- 	state = gf->current_state;
--	gf->delay_target_state = NULL;
- 
--	if (state) {
--		/* Disarm any GPIO IRQs */
--		for (i = 0; i < state->num_gpio_events; i++) {
--			gp_ev = &state->gpio_events[i];
--			inp_state = &gf->input_gpio_states[gp_ev->index];
--			inp_state->target = NULL;
--		}
-+	/* Disarm any GPIO IRQs */
-+	for (i = 0; i < state->num_gpio_events; i++) {
-+		gp_ev = &state->gpio_events[i];
-+		inp_state = &gf->input_gpio_states[gp_ev->index];
-+		inp_state->target = NULL;
- 	}
- 
- 	spin_unlock(&gf->spinlock);
- 
--	if (new_state)
--		schedule_work(&gf->work);
-+	schedule_work(&gf->work);
- }
- 
- static void gpio_fsm_work(struct work_struct *work)
- {
--	struct input_gpio_state *inp_state;
- 	struct fsm_state *new_state;
--	struct fsm_state *state;
--	struct gpio_event *gp_ev;
- 	struct gpio_fsm *gf;
--	int i;
- 
- 	gf = container_of(work, struct gpio_fsm, work);
- 	spin_lock(&gf->spinlock);
--	state = gf->current_state;
- 	new_state = gf->next_state;
--	if (!new_state)
--		new_state = gf->delay_target_state;
- 	gf->next_state = NULL;
--	gf->delay_target_state = NULL;
- 	spin_unlock(&gf->spinlock);
- 
--	if (state) {
--		/* Disable any enabled GPIO IRQs */
--		for (i = 0; i < state->num_gpio_events; i++) {
--			gp_ev = &state->gpio_events[i];
--			inp_state = &gf->input_gpio_states[gp_ev->index];
--			if (inp_state->enabled) {
--				inp_state->enabled = false;
--				irq_set_irq_type(inp_state->irq,
--						 IRQF_TRIGGER_NONE);
--			}
--		}
--	}
--
--	if (new_state)
--		gpio_fsm_enter_state(gf, new_state);
-+	gpio_fsm_go_to_state(gf, new_state);
- }
- 
- static irqreturn_t gpio_fsm_gpio_irq_handler(int irq, void *dev_id)
-@@ -404,7 +403,7 @@ static irqreturn_t gpio_fsm_gpio_irq_han
- 	if (gf->debug)
- 		dev_info(gf->dev, "GF_IN %d->%d -> %s\n",
- 			 inp_state->index, inp_state->value, target->name);
--	gpio_fsm_go_to_state(gf, target);
-+	gpio_fsm_go_to_state_deferred(gf, target);
- 	return IRQ_HANDLED;
- }
- 
-@@ -416,12 +415,11 @@ static void gpio_fsm_timer(struct timer_
- 	target = gf->delay_target_state;
- 	if (!target)
- 		return;
--
- 	if (gf->debug)
- 		dev_info(gf->dev, "GF_DELAY %d -> %s\n", gf->delay_ms,
- 			 target->name);
- 
--	gpio_fsm_go_to_state(gf, target);
-+	gpio_fsm_go_to_state_deferred(gf, target);
- }
- 
- int gpio_fsm_parse_signals(struct gpio_fsm *gf, struct fsm_state *state,
-@@ -1119,7 +1117,7 @@ static int gpio_fsm_probe(struct platfor
- 	if (gf->debug)
- 		dev_info(gf->dev, "Start -> %s\n", gf->start_state->name);
- 
--	gpio_fsm_go_to_state(gf, gf->start_state);
-+	gpio_fsm_enter_state(gf, gf->start_state);
- 
- 	return devm_gpiochip_add_data(dev, &gf->gc, gf);
- }
diff --git a/target/linux/bcm27xx/patches-6.1/950-0842-f2fs-fix-to-avoid-NULL-pointer-dereference-in-f2fs_i.patch b/target/linux/bcm27xx/patches-6.1/950-0842-f2fs-fix-to-avoid-NULL-pointer-dereference-in-f2fs_i.patch
deleted file mode 100644
index 1e2119c88c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0842-f2fs-fix-to-avoid-NULL-pointer-dereference-in-f2fs_i.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From bf9fb25f3265605572f04e5c7836bb83ee345236 Mon Sep 17 00:00:00 2001
-From: Chao Yu <chao@kernel.org>
-Date: Fri, 30 Dec 2022 23:43:32 +0800
-Subject: [PATCH] f2fs: fix to avoid NULL pointer dereference in
- f2fs_issue_flush()
-
-commit b3d83066cbebc76dbac8a5fca931f64b4c6fff34 upstream.
-
-With below two cases, it will cause NULL pointer dereference when
-accessing SM_I(sbi)->fcc_info in f2fs_issue_flush().
-
-a) If kthread_run() fails in f2fs_create_flush_cmd_control(), it will
-release SM_I(sbi)->fcc_info,
-
-- mount -o noflush_merge /dev/vda /mnt/f2fs
-- mount -o remount,flush_merge /dev/vda /mnt/f2fs  -- kthread_run() fails
-- dd if=/dev/zero of=/mnt/f2fs/file bs=4k count=1 conv=fsync
-
-b) we will never allocate memory for SM_I(sbi)->fcc_info w/ below
-testcase,
-
-- mount -o ro /dev/vda /mnt/f2fs
-- mount -o rw,remount /dev/vda /mnt/f2fs
-- dd if=/dev/zero of=/mnt/f2fs/file bs=4k count=1 conv=fsync
-
-In order to fix this issue, let change as below:
-- fix error path handling in f2fs_create_flush_cmd_control().
-- allocate SM_I(sbi)->fcc_info even if readonly is on.
-
-Signed-off-by: Chao Yu <chao@kernel.org>
-Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
----
- fs/f2fs/segment.c | 12 ++++--------
- 1 file changed, 4 insertions(+), 8 deletions(-)
-
---- a/fs/f2fs/segment.c
-+++ b/fs/f2fs/segment.c
-@@ -665,9 +665,7 @@ init_thread:
- 				"f2fs_flush-%u:%u", MAJOR(dev), MINOR(dev));
- 	if (IS_ERR(fcc->f2fs_issue_flush)) {
- 		err = PTR_ERR(fcc->f2fs_issue_flush);
--		kfree(fcc);
--		SM_I(sbi)->fcc_info = NULL;
--		return err;
-+		fcc->f2fs_issue_flush = NULL;
- 	}
- 
- 	return err;
-@@ -5064,11 +5062,9 @@ int f2fs_build_segment_manager(struct f2
- 
- 	init_f2fs_rwsem(&sm_info->curseg_lock);
- 
--	if (!f2fs_readonly(sbi->sb)) {
--		err = f2fs_create_flush_cmd_control(sbi);
--		if (err)
--			return err;
--	}
-+	err = f2fs_create_flush_cmd_control(sbi);
-+	if (err)
-+		return err;
- 
- 	err = create_discard_cmd_control(sbi);
- 	if (err)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0846-hwrng-iproc-rng200-Add-BCM2838-support.patch b/target/linux/bcm27xx/patches-6.1/950-0846-hwrng-iproc-rng200-Add-BCM2838-support.patch
deleted file mode 100644
index a179d930df..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0846-hwrng-iproc-rng200-Add-BCM2838-support.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From e079555a4c68356e58249cfc041b28f6eb455bd5 Mon Sep 17 00:00:00 2001
-From: Stefan Wahren <wahrenst@gmx.net>
-Date: Sat, 4 May 2019 17:06:15 +0200
-Subject: [PATCH] hwrng: iproc-rng200: Add BCM2838 support
-
-The HWRNG on the BCM2838 is compatible to iproc-rng200, so add the
-support to this driver instead of bcm2835-rng.
-
-Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
-
-hwrng: iproc-rng200: Correct SoC name
-
-The Pi 4 SoC is called BCM2711, not BCM2838.
-
-Fixes: "hwrng: iproc-rng200: Add BCM2838 support"
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/char/hw_random/Kconfig        |  2 +-
- drivers/char/hw_random/iproc-rng200.c | 79 ++++++++++++++++++++++++++-
- 2 files changed, 77 insertions(+), 4 deletions(-)
-
---- a/drivers/char/hw_random/Kconfig
-+++ b/drivers/char/hw_random/Kconfig
-@@ -104,7 +104,7 @@ config HW_RANDOM_IPROC_RNG200
- 	default HW_RANDOM
- 	help
- 	  This driver provides kernel-side support for the RNG200
--	  hardware found on the Broadcom iProc and STB SoCs.
-+	  hardware found on the Broadcom iProc, BCM2711 and STB SoCs.
- 
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called iproc-rng200
---- a/drivers/char/hw_random/iproc-rng200.c
-+++ b/drivers/char/hw_random/iproc-rng200.c
-@@ -14,6 +14,7 @@
- #include <linux/module.h>
- #include <linux/of_address.h>
- #include <linux/of_platform.h>
-+#include <linux/of.h>
- #include <linux/platform_device.h>
- #include <linux/delay.h>
- 
-@@ -21,6 +22,7 @@
- #define RNG_CTRL_OFFSET					0x00
- #define RNG_CTRL_RNG_RBGEN_MASK				0x00001FFF
- #define RNG_CTRL_RNG_RBGEN_ENABLE			0x00000001
-+#define RNG_CTRL_RNG_DIV_CTRL_SHIFT			13
- 
- #define RNG_SOFT_RESET_OFFSET				0x04
- #define RNG_SOFT_RESET					0x00000001
-@@ -28,16 +30,23 @@
- #define RBG_SOFT_RESET_OFFSET				0x08
- #define RBG_SOFT_RESET					0x00000001
- 
-+#define RNG_TOTAL_BIT_COUNT_OFFSET			0x0C
-+
-+#define RNG_TOTAL_BIT_COUNT_THRESHOLD_OFFSET		0x10
-+
- #define RNG_INT_STATUS_OFFSET				0x18
- #define RNG_INT_STATUS_MASTER_FAIL_LOCKOUT_IRQ_MASK	0x80000000
- #define RNG_INT_STATUS_STARTUP_TRANSITIONS_MET_IRQ_MASK	0x00020000
- #define RNG_INT_STATUS_NIST_FAIL_IRQ_MASK		0x00000020
- #define RNG_INT_STATUS_TOTAL_BITS_COUNT_IRQ_MASK	0x00000001
- 
-+#define RNG_INT_ENABLE_OFFSET				0x1C
-+
- #define RNG_FIFO_DATA_OFFSET				0x20
- 
- #define RNG_FIFO_COUNT_OFFSET				0x24
- #define RNG_FIFO_COUNT_RNG_FIFO_COUNT_MASK		0x000000FF
-+#define RNG_FIFO_COUNT_RNG_FIFO_THRESHOLD_SHIFT		8
- 
- struct iproc_rng200_dev {
- 	struct hwrng rng;
-@@ -158,6 +167,64 @@ static int iproc_rng200_init(struct hwrn
- 	return 0;
- }
- 
-+static int bcm2711_rng200_read(struct hwrng *rng, void *buf, size_t max,
-+			       bool wait)
-+{
-+	struct iproc_rng200_dev *priv = to_rng_priv(rng);
-+	u32 max_words = max / sizeof(u32);
-+	u32 num_words, count, val;
-+
-+	/* ensure warm up period has elapsed */
-+	while (1) {
-+		val = ioread32(priv->base + RNG_TOTAL_BIT_COUNT_OFFSET);
-+		if (val > 16)
-+			break;
-+		cpu_relax();
-+	}
-+
-+	/* ensure fifo is not empty */
-+	while (1) {
-+		num_words = ioread32(priv->base + RNG_FIFO_COUNT_OFFSET) &
-+			    RNG_FIFO_COUNT_RNG_FIFO_COUNT_MASK;
-+		if (num_words)
-+			break;
-+		if (!wait)
-+			return 0;
-+		cpu_relax();
-+	}
-+
-+	if (num_words > max_words)
-+		num_words = max_words;
-+
-+	for (count = 0; count < num_words; count++) {
-+		((u32 *)buf)[count] = ioread32(priv->base +
-+					       RNG_FIFO_DATA_OFFSET);
-+	}
-+
-+	return num_words * sizeof(u32);
-+}
-+
-+static int bcm2711_rng200_init(struct hwrng *rng)
-+{
-+	struct iproc_rng200_dev *priv = to_rng_priv(rng);
-+	uint32_t val;
-+
-+	if (ioread32(priv->base + RNG_CTRL_OFFSET) & RNG_CTRL_RNG_RBGEN_MASK)
-+		return 0;
-+
-+	/* initial numbers generated are "less random" so will be discarded */
-+	val = 0x40000;
-+	iowrite32(val, priv->base + RNG_TOTAL_BIT_COUNT_THRESHOLD_OFFSET);
-+	/* min fifo count to generate full interrupt */
-+	val = 2 << RNG_FIFO_COUNT_RNG_FIFO_THRESHOLD_SHIFT;
-+	iowrite32(val, priv->base + RNG_FIFO_COUNT_OFFSET);
-+	/* enable the rng - 1Mhz sample rate */
-+	val = (0x3 << RNG_CTRL_RNG_DIV_CTRL_SHIFT) | RNG_CTRL_RNG_RBGEN_MASK;
-+	iowrite32(val, priv->base + RNG_CTRL_OFFSET);
-+
-+	return 0;
-+}
-+
- static void iproc_rng200_cleanup(struct hwrng *rng)
- {
- 	struct iproc_rng200_dev *priv = to_rng_priv(rng);
-@@ -184,11 +251,17 @@ static int iproc_rng200_probe(struct pla
- 
- 	dev_set_drvdata(dev, priv);
- 
--	priv->rng.name = "iproc-rng200";
--	priv->rng.read = iproc_rng200_read;
--	priv->rng.init = iproc_rng200_init;
-+	priv->rng.name = pdev->name;
- 	priv->rng.cleanup = iproc_rng200_cleanup;
- 
-+	if (of_device_is_compatible(dev->of_node, "brcm,bcm2711-rng200")) {
-+		priv->rng.init = bcm2711_rng200_init;
-+		priv->rng.read = bcm2711_rng200_read;
-+	} else {
-+		priv->rng.init = iproc_rng200_init;
-+		priv->rng.read = iproc_rng200_read;
-+	}
-+
- 	/* Register driver */
- 	ret = devm_hwrng_register(dev, &priv->rng);
- 	if (ret) {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0847-PCI-brcmstb-Wait-for-100ms-following-PERST-deassert.patch b/target/linux/bcm27xx/patches-6.1/950-0847-PCI-brcmstb-Wait-for-100ms-following-PERST-deassert.patch
deleted file mode 100644
index b08676253e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0847-PCI-brcmstb-Wait-for-100ms-following-PERST-deassert.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 6f634d7efb8876e5953c30c0a613aaa5f575fe05 Mon Sep 17 00:00:00 2001
-From: Jim Quinlan <jim2101024@gmail.com>
-Date: Tue, 11 Oct 2022 14:42:07 -0400
-Subject: [PATCH] PCI: brcmstb: Wait for 100ms following PERST# deassert
-
-commit 3ae140ad827b359bc4fa7c7985691c4c1e3ca8f4 upstream.
-
-Be prudent and give some time for power and clocks to become stable.  As
-described in the PCIe CEM specification sections 2.2 and 2.2.1; as well as
-PCIe r5.0, 6.6.1.
-
-Link: https://lore.kernel.org/r/20221011184211.18128-3-jim2101024@gmail.com
-Signed-off-by: Jim Quinlan <jim2101024@gmail.com>
-Signed-off-by: Lorenzo Pieralisi <lpieralisi@kernel.org>
-Acked-by: Florian Fainelli <f.fainelli@gmail.com>
----
- drivers/pci/controller/pcie-brcmstb.c | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
---- a/drivers/pci/controller/pcie-brcmstb.c
-+++ b/drivers/pci/controller/pcie-brcmstb.c
-@@ -1038,8 +1038,15 @@ static int brcm_pcie_start_link(struct b
- 	pcie->perst_set(pcie, 0);
- 
- 	/*
--	 * Give the RC/EP time to wake up, before trying to configure RC.
--	 * Intermittently check status for link-up, up to a total of 100ms.
-+	 * Wait for 100ms after PERST# deassertion; see PCIe CEM specification
-+	 * sections 2.2, PCIe r5.0, 6.6.1.
-+	 */
-+	msleep(100);
-+
-+	/*
-+	 * Give the RC/EP even more time to wake up, before trying to
-+	 * configure RC.  Intermittently check status for link-up, up to a
-+	 * total of 100ms.
- 	 */
- 	for (i = 0; i < 100 && !brcm_pcie_link_up(pcie); i += 5)
- 		msleep(5);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0850-overlays-Add-a-sample-hat_map.patch b/target/linux/bcm27xx/patches-6.1/950-0850-overlays-Add-a-sample-hat_map.patch
deleted file mode 100644
index 19550b6fd5..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0850-overlays-Add-a-sample-hat_map.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From cc08810f89e52337a99cc6ae5f53f08588357c5f Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 19 Sep 2023 20:31:34 +0100
-Subject: [PATCH] overlays: Add a sample hat_map
-
-The HAT map is way of associating named overlays with HATs whose
-EEPROMs were programmed with the contents of the overlay.
-Unfortunately, change in the DT and kernel drivers has meant that some
-of these embedded overlays no longer function, or even don't apply.
-
-The HAT map is a mapping from HAT UUIDs to overlay names. If a HAT with
-a listed UUID is detected, the embedded overlay is ignored and the
-overlay named in the mapping is loaded in its place.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/Makefile    |  2 +-
- arch/arm/boot/dts/overlays/hat_map.dts | 13 +++++++++++++
- 2 files changed, 14 insertions(+), 1 deletion(-)
- create mode 100644 arch/arm/boot/dts/overlays/hat_map.dts
-
---- a/arch/arm/boot/dts/overlays/Makefile
-+++ b/arch/arm/boot/dts/overlays/Makefile
-@@ -1,6 +1,6 @@
- # Overlays for the Raspberry Pi platform
- 
--dtb-$(CONFIG_ARCH_BCM2835) += overlay_map.dtb
-+dtb-$(CONFIG_ARCH_BCM2835) += overlay_map.dtb hat_map.dtb
- 
- dtbo-$(CONFIG_ARCH_BCM2835) += \
- 	act-led.dtbo \
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/hat_map.dts
-@@ -0,0 +1,13 @@
-+/dts-v1/;
-+
-+/ {
-+	iqaudio-pi-codecplus {
-+		uuid = [ dc1c9594 c1ab 4c6c acda a88dc59a3c5b ];
-+		overlay = "iqaudio-codec";
-+	};
-+
-+	recalbox-rgbdual {
-+		uuid = [ 1c955808 681f 4bbc a2ef b7ea47cd388e ];
-+		overlay = "recalboxrgbdual";
-+	};
-+};
diff --git a/target/linux/bcm27xx/patches-6.1/950-0851-Revert-usb-phy-generic-Get-the-vbus-supply.patch b/target/linux/bcm27xx/patches-6.1/950-0851-Revert-usb-phy-generic-Get-the-vbus-supply.patch
deleted file mode 100644
index aaf49e6a7c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0851-Revert-usb-phy-generic-Get-the-vbus-supply.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 406e7dc82be6ce1b81c88b418640daeef6c2be42 Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Mon, 23 May 2022 16:56:44 +0100
-Subject: [PATCH] Revert "usb: phy: generic: Get the vbus supply"
-
-This reverts commit c0ea202fbc855d60bc4a0603ca52a9e80654b327.
----
- drivers/usb/phy/phy-generic.c | 7 -------
- 1 file changed, 7 deletions(-)
-
---- a/drivers/usb/phy/phy-generic.c
-+++ b/drivers/usb/phy/phy-generic.c
-@@ -265,13 +265,6 @@ int usb_phy_gen_create_phy(struct device
- 			return -EPROBE_DEFER;
- 	}
- 
--	nop->vbus_draw = devm_regulator_get_exclusive(dev, "vbus");
--	if (PTR_ERR(nop->vbus_draw) == -ENODEV)
--		nop->vbus_draw = NULL;
--	if (IS_ERR(nop->vbus_draw))
--		return dev_err_probe(dev, PTR_ERR(nop->vbus_draw),
--				     "could not get vbus regulator\n");
--
- 	nop->dev		= dev;
- 	nop->phy.dev		= nop->dev;
- 	nop->phy.label		= "nop-xceiv";
diff --git a/target/linux/bcm27xx/patches-6.1/950-0853-dts-2712-Update-for-device-tree.patch b/target/linux/bcm27xx/patches-6.1/950-0853-dts-2712-Update-for-device-tree.patch
deleted file mode 100644
index 6a5c40ef4e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0853-dts-2712-Update-for-device-tree.patch
+++ /dev/null
@@ -1,7672 +0,0 @@
-From 1196bf1a7736ff0ab79f5012fa84082e298031a7 Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Tue, 19 Sep 2023 15:55:00 +0100
-Subject: [PATCH] dts: 2712: Update for device tree
-
-dtoverlays: Fix up edt5406 entries to match with vc4-kms-dsi-7inch
-
-vc4-kms-dsi-7inch expects the touch fragment to be named ts_i2c_frag,
-but edt5406 didn't do this.
-
-Fixes: 736d601fb38c ("dts: 2712: Update for device tree")
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- arch/arm/boot/dts/Makefile                    |    3 +-
- arch/arm/boot/dts/bcm2708-rpi-b-plus.dts      |    3 +
- arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts      |    3 +
- arch/arm/boot/dts/bcm2708-rpi-b.dts           |    3 +
- arch/arm/boot/dts/bcm2708-rpi-cm.dts          |    3 +
- arch/arm/boot/dts/bcm2708-rpi-zero-w.dts      |    1 +
- arch/arm/boot/dts/bcm2708-rpi-zero.dts        |    1 +
- arch/arm/boot/dts/bcm2709-rpi-2-b.dts         |    3 +
- arch/arm/boot/dts/bcm2709-rpi-cm2.dts         |    3 +
- arch/arm/boot/dts/bcm270x-rpi.dtsi            |    3 +
- arch/arm/boot/dts/bcm2710-rpi-2-b.dts         |    3 +
- arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts    |    3 +
- arch/arm/boot/dts/bcm2710-rpi-3-b.dts         |    3 +
- arch/arm/boot/dts/bcm2710-rpi-cm3.dts         |    3 +
- arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts    |    3 +
- arch/arm/boot/dts/bcm2711-rpi-4-b.dts         |    3 +
- arch/arm/boot/dts/bcm2711-rpi-cm4.dts         |    3 +
- arch/arm/boot/dts/bcm2711-rpi-cm4s.dts        |    3 +
- arch/arm/boot/dts/bcm2712-rpi-5-b.dts         |  824 +++++++++++
- arch/arm/boot/dts/bcm2712-rpi.dtsi            |  281 ++++
- arch/arm/boot/dts/bcm2712.dtsi                | 1287 +++++++++++++++++
- arch/arm/boot/dts/overlays/Makefile           |   23 +
- arch/arm/boot/dts/overlays/README             |  360 ++++-
- .../dts/overlays/adau1977-adc-overlay.dts     |    4 +-
- .../dts/overlays/adau7002-simple-overlay.dts  |    4 +-
- .../overlays/akkordion-iqdacplus-overlay.dts  |    4 +-
- .../allo-boss-dac-pcm512x-audio-overlay.dts   |   10 +-
- .../overlays/allo-boss2-dac-audio-overlay.dts |    2 +-
- .../dts/overlays/allo-digione-overlay.dts     |    4 +-
- .../allo-katana-dac-audio-overlay.dts         |    2 +-
- .../allo-piano-dac-pcm512x-audio-overlay.dts  |    4 +-
- ...o-piano-dac-plus-pcm512x-audio-overlay.dts |    4 +-
- .../boot/dts/overlays/applepi-dac-overlay.dts |    4 +-
- .../dts/overlays/arducam-64mp-overlay.dts     |    2 +-
- .../overlays/arducam-pivariety-overlay.dts    |    2 +-
- .../overlays/audioinjector-addons-overlay.dts |    4 +-
- .../audioinjector-bare-i2s-overlay.dts        |    6 +-
- ...dioinjector-isolated-soundcard-overlay.dts |    4 +-
- .../overlays/audioinjector-ultra-overlay.dts  |    6 +-
- .../audioinjector-wm8731-audio-overlay.dts    |    4 +-
- .../dts/overlays/audiosense-pi-overlay.dts    |    4 +-
- .../boot/dts/overlays/chipdip-dac-overlay.dts |    4 +-
- .../dts/overlays/cirrus-wm5102-overlay.dts    |    4 +-
- .../boot/dts/overlays/dacberry400-overlay.dts |    4 +-
- .../dts/overlays/dionaudio-kiwi-overlay.dts   |    4 +-
- .../dts/overlays/dionaudio-loco-overlay.dts   |    4 +-
- .../overlays/dionaudio-loco-v2-overlay.dts    |    4 +-
- .../dts/overlays/disable-bt-pi5-overlay.dts   |   17 +
- .../dts/overlays/disable-wifi-pi5-overlay.dts |   13 +
- arch/arm/boot/dts/overlays/draws-overlay.dts  |    6 +-
- .../boot/dts/overlays/edt-ft5406-overlay.dts  |   22 +-
- arch/arm/boot/dts/overlays/edt-ft5406.dtsi    |    2 +-
- .../boot/dts/overlays/fe-pi-audio-overlay.dts |    4 +-
- .../boot/dts/overlays/ghost-amp-overlay.dts   |    4 +-
- .../googlevoicehat-soundcard-overlay.dts      |    4 +-
- .../dts/overlays/hifiberry-amp-overlay.dts    |    4 +-
- .../dts/overlays/hifiberry-amp100-overlay.dts |   11 +-
- .../dts/overlays/hifiberry-amp3-overlay.dts   |    4 +-
- .../dts/overlays/hifiberry-dac-overlay.dts    |    4 +-
- .../overlays/hifiberry-dacplus-overlay.dts    |   11 +-
- .../overlays/hifiberry-dacplusadc-overlay.dts |   10 +-
- .../hifiberry-dacplusadcpro-overlay.dts       |   10 +-
- .../overlays/hifiberry-dacplusdsp-overlay.dts |    4 +-
- .../overlays/hifiberry-dacplushd-overlay.dts  |    4 +-
- .../dts/overlays/hifiberry-digi-overlay.dts   |    4 +-
- .../overlays/hifiberry-digi-pro-overlay.dts   |    4 +-
- .../boot/dts/overlays/i-sabre-q2m-overlay.dts |    4 +-
- .../boot/dts/overlays/i2c0-pi5-overlay.dts    |   34 +
- .../boot/dts/overlays/i2c1-pi5-overlay.dts    |   34 +
- .../boot/dts/overlays/i2c2-pi5-overlay.dts    |   21 +
- .../boot/dts/overlays/i2c3-pi5-overlay.dts    |   22 +
- .../arm/boot/dts/overlays/i2s-dac-overlay.dts |    4 +-
- arch/arm/boot/dts/overlays/imx219-overlay.dts |    2 +-
- arch/arm/boot/dts/overlays/imx258-overlay.dts |    2 +-
- .../boot/dts/overlays/imx290_327-overlay.dtsi |    2 +-
- arch/arm/boot/dts/overlays/imx296-overlay.dts |    2 +-
- .../boot/dts/overlays/imx477_378-overlay.dtsi |    2 +-
- arch/arm/boot/dts/overlays/imx519-overlay.dts |    2 +-
- arch/arm/boot/dts/overlays/imx708-overlay.dts |    4 +-
- .../dts/overlays/iqaudio-codec-overlay.dts    |    4 +-
- .../boot/dts/overlays/iqaudio-dac-overlay.dts |    4 +-
- .../dts/overlays/iqaudio-dacplus-overlay.dts  |    4 +-
- .../iqaudio-digi-wm8804-audio-overlay.dts     |    4 +-
- .../arm/boot/dts/overlays/irs1125-overlay.dts |    2 +-
- .../dts/overlays/justboom-both-overlay.dts    |    4 +-
- .../dts/overlays/justboom-dac-overlay.dts     |    4 +-
- .../dts/overlays/justboom-digi-overlay.dts    |    4 +-
- .../boot/dts/overlays/max98357a-overlay.dts   |    6 +-
- .../boot/dts/overlays/mbed-dac-overlay.dts    |    6 +-
- .../boot/dts/overlays/merus-amp-overlay.dts   |    4 +-
- .../dts/overlays/midi-uart0-pi5-overlay.dts   |   35 +
- .../dts/overlays/midi-uart1-pi5-overlay.dts   |   35 +
- .../dts/overlays/midi-uart2-pi5-overlay.dts   |   35 +
- .../dts/overlays/midi-uart3-pi5-overlay.dts   |   35 +
- .../dts/overlays/midi-uart4-pi5-overlay.dts   |   35 +
- arch/arm/boot/dts/overlays/ov2311-overlay.dts |    2 +-
- arch/arm/boot/dts/overlays/ov5647-overlay.dts |    2 +-
- arch/arm/boot/dts/overlays/ov7251-overlay.dts |    2 +-
- arch/arm/boot/dts/overlays/ov9281-overlay.dts |    2 +-
- arch/arm/boot/dts/overlays/overlay_map.dts    |  226 +++
- arch/arm/boot/dts/overlays/pibell-overlay.dts |    6 +-
- .../arm/boot/dts/overlays/pifi-40-overlay.dts |    4 +-
- .../boot/dts/overlays/pifi-dac-hd-overlay.dts |    4 +-
- .../dts/overlays/pifi-dac-zero-overlay.dts    |    4 +-
- .../dts/overlays/pifi-mini-210-overlay.dts    |    4 +-
- .../arm/boot/dts/overlays/pisound-overlay.dts |    4 +-
- .../boot/dts/overlays/proto-codec-overlay.dts |    4 +-
- .../rra-digidac1-wm8741-audio-overlay.dts     |    4 +-
- .../dts/overlays/spi2-1cs-pi5-overlay.dts     |   33 +
- .../dts/overlays/spi2-2cs-pi5-overlay.dts     |   44 +
- .../dts/overlays/spi3-1cs-pi5-overlay.dts     |   33 +
- .../dts/overlays/spi3-2cs-pi5-overlay.dts     |   44 +
- .../dts/overlays/spi5-1cs-pi5-overlay.dts     |   33 +
- .../dts/overlays/spi5-2cs-pi5-overlay.dts     |   44 +
- .../dts/overlays/superaudioboard-overlay.dts  |    6 +-
- .../dts/overlays/tc358743-audio-overlay.dts   |   10 +-
- .../boot/dts/overlays/tc358743-overlay.dts    |    2 +-
- .../boot/dts/overlays/uart0-pi5-overlay.dts   |   17 +
- .../boot/dts/overlays/uart1-pi5-overlay.dts   |   17 +
- .../boot/dts/overlays/uart2-pi5-overlay.dts   |   17 +
- .../boot/dts/overlays/uart3-pi5-overlay.dts   |   17 +
- .../boot/dts/overlays/uart4-pi5-overlay.dts   |   17 +
- arch/arm/boot/dts/overlays/udrc-overlay.dts   |    6 +-
- .../dts/overlays/ugreen-dabboard-overlay.dts  |   10 +-
- .../dts/overlays/vc4-fkms-v3d-overlay.dts     |    6 +
- .../dts/overlays/vc4-fkms-v3d-pi4-overlay.dts |    6 +
- .../overlays/vc4-kms-dsi-7inch-overlay.dts    |   18 +-
- .../vc4-kms-dsi-waveshare-panel-overlay.dts   |    8 +-
- .../dts/overlays/vc4-kms-v3d-pi5-overlay.dts  |  147 ++
- .../dts/overlays/vc4-kms-vga666-overlay.dts   |    9 +-
- .../dts/overlays/wm8960-soundcard-overlay.dts |    4 +-
- arch/arm/boot/dts/rp1.dtsi                    | 1168 +++++++++++++++
- arch/arm64/boot/dts/broadcom/Makefile         |    1 +
- .../boot/dts/broadcom/bcm2712-rpi-5-b.dts     |    1 +
- 134 files changed, 5143 insertions(+), 264 deletions(-)
- create mode 100644 arch/arm/boot/dts/bcm2712-rpi-5-b.dts
- create mode 100644 arch/arm/boot/dts/bcm2712-rpi.dtsi
- create mode 100644 arch/arm/boot/dts/bcm2712.dtsi
- create mode 100644 arch/arm/boot/dts/overlays/disable-bt-pi5-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/disable-wifi-pi5-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/i2c0-pi5-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/i2c1-pi5-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/i2c2-pi5-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/i2c3-pi5-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/midi-uart0-pi5-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/midi-uart1-pi5-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/midi-uart2-pi5-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/midi-uart3-pi5-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/midi-uart4-pi5-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/spi2-1cs-pi5-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/spi2-2cs-pi5-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/spi3-1cs-pi5-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/spi3-2cs-pi5-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/spi5-1cs-pi5-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/spi5-2cs-pi5-overlay.dts
- create mode 100755 arch/arm/boot/dts/overlays/uart0-pi5-overlay.dts
- create mode 100755 arch/arm/boot/dts/overlays/uart1-pi5-overlay.dts
- create mode 100755 arch/arm/boot/dts/overlays/uart2-pi5-overlay.dts
- create mode 100755 arch/arm/boot/dts/overlays/uart3-pi5-overlay.dts
- create mode 100755 arch/arm/boot/dts/overlays/uart4-pi5-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/vc4-kms-v3d-pi5-overlay.dts
- create mode 100644 arch/arm/boot/dts/rp1.dtsi
- create mode 100644 arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts
-
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -18,7 +18,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
- 	bcm2709-rpi-cm2.dtb \
- 	bcm2710-rpi-cm3.dtb \
- 	bcm2711-rpi-cm4.dtb \
--	bcm2711-rpi-cm4s.dtb
-+	bcm2711-rpi-cm4s.dtb \
-+	bcm2712-rpi-5-b.dtb
- 
- dtb-$(CONFIG_ARCH_ALPINE) += \
- 	alpine-db.dtb
---- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
-+++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
-@@ -192,6 +192,9 @@ i2c_arm: &i2c1 {
- i2c_vc: &i2c0 {
- };
- 
-+i2c_csi_dsi0: &i2c0 {
-+};
-+
- / {
- 	__overrides__ {
- 		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_headphones=1 snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_headphones=0 snd_bcm2835.enable_hdmi=0'}";
---- a/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
-+++ b/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
-@@ -203,6 +203,9 @@ i2c_arm: &i2c0 {
- i2c_vc: &i2c1 {
- };
- 
-+i2c_csi_dsi0: &i2c0 {
-+};
-+
- / {
- 	__overrides__ {
- 		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_headphones=1 snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_headphones=0 snd_bcm2835.enable_hdmi=0'}";
---- a/arch/arm/boot/dts/bcm2708-rpi-b.dts
-+++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts
-@@ -185,6 +185,9 @@ i2c_arm: &i2c1 {
- i2c_vc: &i2c0 {
- };
- 
-+i2c_csi_dsi0: &i2c0 {
-+};
-+
- / {
- 	__overrides__ {
- 		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_headphones=1 snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_headphones=0 snd_bcm2835.enable_hdmi=0'}";
---- a/arch/arm/boot/dts/bcm2708-rpi-cm.dts
-+++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dts
-@@ -19,6 +19,9 @@ cam0_reg: &cam0_regulator {
- 	gpio = <&gpio 31 GPIO_ACTIVE_HIGH>;
- };
- 
-+i2c_csi_dsi0: &i2c0 {
-+};
-+
- &uart0 {
- 	status = "okay";
- };
---- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
-+++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
-@@ -243,6 +243,7 @@ cam0_reg: &cam_dummy_reg {
- 
- i2c_arm: &i2c1 {};
- i2c_vc: &i2c0 {};
-+i2c_csi_dsi0: &i2c0 {};
- 
- / {
- 	__overrides__ {
---- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts
-+++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
-@@ -178,6 +178,7 @@ cam0_reg: &cam_dummy_reg {
- 
- i2c_arm: &i2c1 {};
- i2c_vc: &i2c0 {};
-+i2c_csi_dsi0: &i2c0 {};
- 
- / {
- 	__overrides__ {
---- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
-+++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
-@@ -186,6 +186,9 @@
- cam0_reg: &cam_dummy_reg {
- };
- 
-+i2c_csi_dsi0: &i2c0 {
-+};
-+
- / {
- 	__overrides__ {
- 		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_headphones=1 snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_headphones=0 snd_bcm2835.enable_hdmi=0'}";
---- a/arch/arm/boot/dts/bcm2709-rpi-cm2.dts
-+++ b/arch/arm/boot/dts/bcm2709-rpi-cm2.dts
-@@ -20,6 +20,9 @@ cam0_reg: &cam0_regulator {
- 	gpio = <&gpio 30 GPIO_ACTIVE_HIGH>;
- };
- 
-+i2c_csi_dsi0: &i2c0 {
-+};
-+
- &uart0 {
- 	status = "okay";
- };
---- a/arch/arm/boot/dts/bcm270x-rpi.dtsi
-+++ b/arch/arm/boot/dts/bcm270x-rpi.dtsi
-@@ -127,6 +127,9 @@
- 	status = "disabled";
- };
- 
-+i2s_clk_producer: &i2s {};
-+i2s_clk_consumer: &i2s {};
-+
- &clocks {
- 	firmware = <&firmware>;
- };
---- a/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
-+++ b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
-@@ -186,6 +186,9 @@
- cam0_reg: &cam_dummy_reg {
- };
- 
-+i2c_csi_dsi0: &i2c0 {
-+};
-+
- / {
- 	__overrides__ {
- 		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_headphones=1 snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_headphones=0 snd_bcm2835.enable_hdmi=0'}";
---- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
-+++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
-@@ -274,6 +274,9 @@
- cam0_reg: &cam_dummy_reg {
- };
- 
-+i2c_csi_dsi0: &i2c0 {
-+};
-+
- / {
- 	__overrides__ {
- 		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_headphones=1 snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_headphones=0 snd_bcm2835.enable_hdmi=0'}";
---- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
-+++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
-@@ -283,6 +283,9 @@
- cam0_reg: &cam_dummy_reg {
- };
- 
-+i2c_csi_dsi0: &i2c0 {
-+};
-+
- / {
- 	__overrides__ {
- 		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_headphones=1 snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_headphones=0 snd_bcm2835.enable_hdmi=0'}";
---- a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
-+++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
-@@ -19,6 +19,9 @@ cam0_reg: &cam0_regulator {
- 	gpio = <&gpio 31 GPIO_ACTIVE_HIGH>;
- };
- 
-+i2c_csi_dsi0: &i2c0 {
-+};
-+
- &uart0 {
- 	status = "okay";
- };
---- a/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
-+++ b/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
-@@ -262,6 +262,9 @@
- cam0_reg: &cam_dummy_reg {
- };
- 
-+i2c_csi_dsi0: &i2c0 {
-+};
-+
- / {
- 	__overrides__ {
- 		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_hdmi=0'}";
---- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-@@ -400,6 +400,9 @@
- cam0_reg: &cam_dummy_reg {
- };
- 
-+i2c_csi_dsi0: &i2c0 {
-+};
-+
- / {
- 	__overrides__ {
- 		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_headphones=1 snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_headphones=0 snd_bcm2835.enable_hdmi=0'}";
---- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
-@@ -409,6 +409,9 @@ cam0_reg: &cam1_reg {
- 	gpio = <&expgpio 5 GPIO_ACTIVE_HIGH>;
- };
- 
-+i2c_csi_dsi0: &i2c0 {
-+};
-+
- / {
- 	__overrides__ {
- 		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_hdmi=0'}";
---- a/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
-@@ -282,6 +282,9 @@ cam0_reg: &cam0_regulator {
- 	status = "disabled";
- };
- 
-+i2c_csi_dsi0: &i2c0 {
-+};
-+
- / {
- 	__overrides__ {
- 		audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_hdmi=0'}";
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm2712-rpi-5-b.dts
-@@ -0,0 +1,824 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/dts-v1/;
-+
-+#include <dt-bindings/gpio/gpio.h>
-+#include <dt-bindings/clock/rp1.h>
-+#include <dt-bindings/interrupt-controller/irq.h>
-+#include <dt-bindings/mfd/rp1.h>
-+#include <dt-bindings/pwm/pwm.h>
-+#include <dt-bindings/reset/raspberrypi,firmware-reset.h>
-+
-+#define i2c0 _i2c0
-+#define i2c3 _i2c3
-+#define i2c4 _i2c4
-+#define i2c5 _i2c5
-+#define i2c6 _i2c6
-+#define i2c8 _i2c8
-+#define i2s _i2s
-+#define pwm0 _pwm0
-+#define pwm1 _pwm1
-+#define spi0 _spi0
-+#define spi3 _spi3
-+#define spi4 _spi4
-+#define spi5 _spi5
-+#define spi6 _spi6
-+#define uart0 _uart0
-+#define uart2 _uart2
-+#define uart3 _uart3
-+#define uart4 _uart4
-+#define uart5 _uart5
-+
-+#include "bcm2712.dtsi"
-+
-+#undef i2c0
-+#undef i2c3
-+#undef i2c4
-+#undef i2c5
-+#undef i2c6
-+#undef i2c8
-+#undef i2s
-+#undef pwm0
-+#undef pwm1
-+#undef spi0
-+#undef spi3
-+#undef spi4
-+#undef spi5
-+#undef spi6
-+#undef uart0
-+#undef uart2
-+#undef uart3
-+#undef uart4
-+#undef uart5
-+
-+/ {
-+	compatible = "raspberrypi,5-model-b", "brcm,bcm2712";
-+	model = "Raspberry Pi 5 Model B";
-+
-+	/* Will be filled by the bootloader */
-+	memory@0 {
-+		device_type = "memory";
-+		reg = <0 0 0x28000000>;
-+	};
-+
-+	leds: leds {
-+		compatible = "gpio-leds";
-+
-+		pwr_led: led-pwr {
-+			label = "PWR";
-+			gpios = <&rp1_gpio 44 GPIO_ACTIVE_LOW>;
-+			default-state = "off";
-+			linux,default-trigger = "none";
-+		};
-+
-+		act_led: led-act {
-+			label = "ACT";
-+			gpios = <&gio_aon 9 GPIO_ACTIVE_LOW>;
-+			default-state = "off";
-+			linux,default-trigger = "mmc0";
-+		};
-+	};
-+
-+	sd_io_1v8_reg: sd_io_1v8_reg {
-+		compatible = "regulator-gpio";
-+		regulator-name = "vdd-sd-io";
-+		regulator-min-microvolt = <1800000>;
-+		regulator-max-microvolt = <3300000>;
-+		regulator-boot-on;
-+		regulator-always-on;
-+		regulator-settling-time-us = <5000>;
-+		gpios = <&gio_aon 3 GPIO_ACTIVE_HIGH>;
-+		states = <1800000 0x1
-+			  3300000 0x0>;
-+		status = "okay";
-+	};
-+
-+	sd_vcc_reg: sd_vcc_reg {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc-sd";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		regulator-boot-on;
-+		enable-active-high;
-+		gpios = <&gio_aon 4 GPIO_ACTIVE_HIGH>;
-+		status = "okay";
-+	};
-+
-+	wl_on_reg: wl_on_reg {
-+		compatible = "regulator-fixed";
-+		regulator-name = "wl-on-regulator";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		pinctrl-0 = <&wl_on_pins>;
-+		pinctrl-names = "default";
-+
-+		gpio = <&gio 28 GPIO_ACTIVE_HIGH>;
-+
-+		startup-delay-us = <150000>;
-+		enable-active-high;
-+	};
-+
-+	clocks: clocks {
-+	};
-+
-+	cam1_clk: cam1_clk {
-+		compatible = "fixed-clock";
-+		#clock-cells = <0>;
-+		status = "disabled";
-+	};
-+
-+	cam0_clk: cam0_clk {
-+		compatible = "fixed-clock";
-+		#clock-cells = <0>;
-+		status = "disabled";
-+	};
-+
-+	cam0_reg: cam0_reg {
-+		compatible = "regulator-fixed";
-+		regulator-name = "cam0_reg";
-+		enable-active-high;
-+		status = "okay";
-+		gpio = <&rp1_gpio 34 0>;  // CD0_IO0_MICCLK, to MIPI 0 connector
-+	};
-+
-+	cam1_reg: cam1_reg {
-+		compatible = "regulator-fixed";
-+		regulator-name = "cam1_reg";
-+		enable-active-high;
-+		status = "okay";
-+		gpio = <&rp1_gpio 46 0>;  // CD1_IO0_MICCLK, to MIPI 1 connector
-+	};
-+
-+	cam_dummy_reg: cam_dummy_reg {
-+		compatible = "regulator-fixed";
-+		regulator-name = "cam-dummy-reg";
-+		status = "okay";
-+	};
-+
-+	dummy: dummy {
-+		// A target for unwanted overlay fragments
-+	};
-+};
-+
-+rp1_target: &pcie2 {
-+	brcm,vdm-qos-map = <0xbbaa9888>;
-+	aspm-no-l0s;
-+	status = "okay";
-+};
-+
-+// Add some labels to 2712 device
-+
-+// The system UART
-+uart10: &_uart0 { status = "okay"; };
-+
-+// The system SPI for the bootloader EEPROM
-+spi10: &_spi0 { status = "okay"; };
-+
-+i2c_rp1boot: &_i2c3 { };
-+
-+#include "rp1.dtsi"
-+
-+&rp1 {
-+	// PCIe address space layout:
-+	// 00_00000000-00_00xxxxxx = RP1 peripherals
-+	// 10_00000000-1x_xxxxxxxx = up to 64GB system RAM
-+
-+	// outbound access aimed at PCIe 0_00xxxxxx -> RP1 c0_40xxxxxx
-+	// This is the RP1 peripheral space
-+	ranges = <0xc0 0x40000000
-+		  0x02000000 0x00 0x00000000
-+		  0x00 0x00400000>;
-+
-+	dma-ranges =
-+	// inbound RP1 1x_xxxxxxxx -> PCIe 1x_xxxxxxxx
-+		     <0x10 0x00000000
-+		      0x43000000 0x10 0x00000000
-+		      0x10 0x00000000>,
-+
-+	// inbound RP1 c0_40xxxxxx -> PCIe 00_00xxxxxx
-+	// This allows the RP1 DMA controller to address RP1 hardware
-+		     <0xc0 0x40000000
-+		      0x02000000 0x0 0x00000000
-+		      0x0 0x00400000>,
-+
-+	// inbound RP1 0x_xxxxxxxx -> PCIe 1x_xxxxxxxx
-+		     <0x00 0x00000000
-+		      0x02000000 0x10 0x00000000
-+		      0x10 0x00000000>;
-+};
-+
-+// Expose RP1 nodes as system nodes with labels
-+
-+&rp1_dma  {
-+	status = "okay";
-+};
-+
-+&rp1_eth {
-+	status = "okay";
-+	phy-handle = <&phy1>;
-+	phy-reset-gpios = <&rp1_gpio 32 GPIO_ACTIVE_LOW>;
-+	phy-reset-duration = <5>;
-+
-+	phy1: ethernet-phy@1 {
-+		reg = <0x1>;
-+		brcm,powerdown-enable;
-+	};
-+};
-+
-+gpio: &rp1_gpio {
-+	status = "okay";
-+};
-+
-+aux: &dummy {};
-+
-+&rp1_usb0 {
-+	pinctrl-0 = <&usb_vbus_pins>;
-+	pinctrl-names = "default";
-+	status = "okay";
-+};
-+
-+&rp1_usb1 {
-+	status = "okay";
-+};
-+
-+#include "bcm2712-rpi.dtsi"
-+
-+// A few extra labels to keep overlays happy
-+
-+i2c0if: &rp1_gpio {};
-+i2c0mux: &rp1_gpio {};
-+
-+i2c_csi_dsi0: &i2c6 { // Note: This is for MIPI0 connector only
-+	pinctrl-0 = <&rp1_i2c6_38_39>;
-+	pinctrl-names = "default";
-+};
-+
-+i2c_csi_dsi1: &i2c4 { // Note: This is for MIPI1 connector only
-+	pinctrl-0 = <&rp1_i2c4_40_41>;
-+	pinctrl-names = "default";
-+};
-+
-+i2c_csi_dsi: &i2c_csi_dsi1 { }; // An alias for compatibility
-+
-+csi0: &rp1_csi0 { };
-+csi1: &rp1_csi1 { };
-+dsi0: &rp1_dsi0 { };
-+dsi1: &rp1_dsi1 { };
-+dpi: &rp1_dpi { };
-+vec: &rp1_vec { };
-+dpi_gpio0:              &rp1_dpi_24bit_gpio0        { };
-+dpi_gpio1:              &rp1_dpi_24bit_gpio2        { };
-+dpi_18bit_cpadhi_gpio0: &rp1_dpi_18bit_cpadhi_gpio0 { };
-+dpi_18bit_cpadhi_gpio2: &rp1_dpi_18bit_cpadhi_gpio2 { };
-+dpi_18bit_gpio0:        &rp1_dpi_18bit_gpio0        { };
-+dpi_18bit_gpio2:        &rp1_dpi_18bit_gpio2        { };
-+dpi_16bit_cpadhi_gpio0: &rp1_dpi_16bit_cpadhi_gpio0 { };
-+dpi_16bit_cpadhi_gpio2: &rp1_dpi_16bit_cpadhi_gpio2 { };
-+dpi_16bit_gpio0:        &rp1_dpi_16bit_gpio0        { };
-+dpi_16bit_gpio2:        &rp1_dpi_16bit_gpio2        { };
-+
-+/* Add the IOMMUs for some RP1 bus masters */
-+
-+&csi0 {
-+	iommus = <&iommu5>;
-+};
-+
-+&csi1 {
-+	iommus = <&iommu5>;
-+};
-+
-+&dsi0 {
-+	iommus = <&iommu5>;
-+};
-+
-+&dsi1 {
-+	iommus = <&iommu5>;
-+};
-+
-+&dpi {
-+	iommus = <&iommu5>;
-+};
-+
-+&vec {
-+	iommus = <&iommu5>;
-+};
-+
-+&ddc0 {
-+	status = "disabled";
-+};
-+
-+&ddc1 {
-+	status = "disabled";
-+};
-+
-+&hdmi0 {
-+	clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 0>, <&clk_27MHz>;
-+	clock-names = "hdmi", "bvb", "audio", "cec";
-+	status = "disabled";
-+};
-+
-+&hdmi1 {
-+	clocks = <&firmware_clocks 13>, <&firmware_clocks 14>, <&dvp 1>, <&clk_27MHz>;
-+	clock-names = "hdmi", "bvb", "audio", "cec";
-+	status = "disabled";
-+};
-+
-+&hvs {
-+	clocks = <&firmware_clocks 4>, <&firmware_clocks 16>;
-+	clock-names = "core", "disp";
-+};
-+
-+&mop {
-+	status = "disabled";
-+};
-+
-+&moplet {
-+	status = "disabled";
-+};
-+
-+&pixelvalve0 {
-+	status = "disabled";
-+};
-+
-+&pixelvalve1 {
-+	status = "disabled";
-+};
-+
-+&disp_intr {
-+	status = "disabled";
-+};
-+
-+/* SDIO1 is used to drive the SD card */
-+&sdio1 {
-+	pinctrl-0 = <&emmc_sd_pulls>, <&emmc_aon_cd_pins>;
-+	pinctrl-names = "default";
-+	vqmmc-supply = <&sd_io_1v8_reg>;
-+	vmmc-supply = <&sd_vcc_reg>;
-+	bus-width = <4>;
-+	sd-uhs-sdr50;
-+	sd-uhs-ddr50;
-+	sd-uhs-sdr104;
-+	//broken-cd;
-+	//no-1-8-v;
-+	status = "okay";
-+};
-+
-+&pinctrl_aon {
-+	emmc_aon_cd_pins: emmc_aon_cd_pins {
-+		function = "sd_card_g";
-+		pins = "aon_gpio5";
-+		bias-pull-up;
-+	};
-+
-+	/* Slight hack - only one PWM pin (status LED) is usable */
-+	aon_pwm_1pin: aon_pwm_1pin {
-+		function = "aon_pwm";
-+		pins = "aon_gpio9";
-+	};
-+};
-+
-+&pinctrl {
-+	pwr_button_pins: pwr_button_pins {
-+		function = "gpio";
-+		pins = "gpio20";
-+		bias-pull-up;
-+	};
-+
-+	wl_on_pins: wl_on_pins {
-+		function = "gpio";
-+		pins = "gpio28";
-+	};
-+
-+	bt_shutdown_pins: bt_shutdown_pins {
-+		function = "gpio";
-+		pins = "gpio29";
-+	};
-+
-+	emmc_sd_pulls: emmc_sd_pulls {
-+		function = "emmc_dat0", "emmc_dat1", "emmc_dat2", "emmc_dat3";
-+		bias-pull-up;
-+	};
-+};
-+
-+/* uarta communicates with the BT module */
-+&uarta {
-+	uart-has-rtscts;
-+	auto-flow-control;
-+	status = "okay";
-+	clock-frequency = <96000000>;
-+	pinctrl-0 = <&uarta_24_pins &bt_shutdown_pins>;
-+	pinctrl-names = "default";
-+
-+	bluetooth: bluetooth {
-+		compatible = "brcm,bcm43438-bt";
-+		max-speed = <3000000>;
-+		shutdown-gpios = <&gio 29 GPIO_ACTIVE_HIGH>;
-+		local-bd-address = [ 00 00 00 00 00 00 ];
-+	};
-+};
-+
-+&i2c_rp1boot {
-+	clock-frequency = <400000>;
-+	pinctrl-0 = <&i2c3_m4_agpio0_pins>;
-+	pinctrl-names = "default";
-+};
-+
-+/ {
-+	chosen: chosen {
-+		bootargs = "coherent_pool=1M 8250.nr_uarts=1 pci=pcie_bus_safe snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1";
-+		stdout-path = "serial10:115200n8";
-+	};
-+
-+	fan: cooling_fan {
-+		status = "disabled";
-+		compatible = "pwm-fan";
-+		#cooling-cells = <2>;
-+		cooling-min-state = <0>;
-+		cooling-max-state = <3>;
-+		cooling-levels = <0 75 125 175 250>;
-+		pwms = <&rp1_pwm1 3 41566 PWM_POLARITY_INVERTED>;
-+		rpm-regmap = <&rp1_pwm1>;
-+		rpm-offset = <0x3c>;
-+	};
-+
-+	pwr_button {
-+		compatible = "gpio-keys";
-+
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&pwr_button_pins>;
-+		status = "okay";
-+
-+		pwr_key: pwr {
-+			label = "pwr_button";
-+			// linux,code = <205>; // KEY_SUSPEND
-+			linux,code = <116>; // KEY_POWER
-+			gpios = <&gio 20 GPIO_ACTIVE_LOW>;
-+			debounce-interval = <50>; // ms
-+		};
-+	};
-+};
-+
-+&usb {
-+	power-domains = <&power RPI_POWER_DOMAIN_USB>;
-+};
-+
-+/* SDIO2 drives the WLAN interface */
-+&sdio2 {
-+	pinctrl-0 = <&sdio2_30_pins>;
-+	pinctrl-names = "default";
-+	bus-width = <4>;
-+	vmmc-supply = <&wl_on_reg>;
-+	sd-uhs-ddr50;
-+	non-removable;
-+	status = "okay";
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+
-+	wifi: wifi@1 {
-+		reg = <1>;
-+		compatible = "brcm,bcm4329-fmac";
-+		local-mac-address = [00 00 00 00 00 00];
-+	};
-+};
-+
-+&rpivid {
-+	status = "okay";
-+};
-+
-+&pinctrl {
-+	spi10_gpio2: spi10_gpio2 {
-+		function = "vc_spi0";
-+		pins = "gpio2", "gpio3", "gpio4";
-+		bias-disable;
-+	};
-+
-+	spi10_cs_gpio1: spi10_cs_gpio1 {
-+		function = "gpio";
-+		pins = "gpio1";
-+		bias-pull-up;
-+	};
-+};
-+
-+spi10_pins: &spi10_gpio2 {};
-+spi10_cs_pins: &spi10_cs_gpio1 {};
-+
-+&spi10 {
-+	pinctrl-names = "default";
-+	cs-gpios = <&gio 1 1>;
-+	pinctrl-0 = <&spi10_pins &spi10_cs_pins>;
-+
-+	spidev10: spidev@0 {
-+		compatible = "spidev";
-+		reg = <0>;	/* CE0 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <20000000>;
-+		status = "okay";
-+	};
-+};
-+
-+// =============================================
-+// Board specific stuff here
-+
-+&gio_aon {
-+	// Don't use GIO_AON as an interrupt controller because it will
-+	// clash with the firmware monitoring the PMIC interrupt via the VPU.
-+
-+	/delete-property/ interrupt-controller;
-+};
-+
-+&main_aon_irq {
-+	// Don't use the MAIN_AON_IRQ interrupt controller because it will
-+	// clash with the firmware monitoring the PMIC interrupt via the VPU.
-+
-+	status = "disabled";
-+};
-+
-+&rp1_pwm1 {
-+	status = "disabled";
-+	pinctrl-0 = <&rp1_pwm1_gpio45>;
-+	pinctrl-names = "default";
-+};
-+
-+&thermal_trips {
-+	cpu_tepid: cpu-tepid {
-+		temperature = <50000>;
-+		hysteresis = <5000>;
-+		type = "active";
-+	};
-+
-+	cpu_warm: cpu-warm {
-+		temperature = <60000>;
-+		hysteresis = <5000>;
-+		type = "active";
-+	};
-+
-+	cpu_hot: cpu-hot {
-+		temperature = <67500>;
-+		hysteresis = <5000>;
-+		type = "active";
-+	};
-+
-+	cpu_vhot: cpu-vhot {
-+		temperature = <75000>;
-+		hysteresis = <5000>;
-+		type = "active";
-+	};
-+};
-+
-+&cooling_maps {
-+	tepid {
-+		trip = <&cpu_tepid>;
-+		cooling-device = <&fan 1 1>;
-+	};
-+
-+	warm {
-+		trip = <&cpu_warm>;
-+		cooling-device = <&fan 2 2>;
-+	};
-+
-+	hot {
-+		trip = <&cpu_hot>;
-+		cooling-device = <&fan 3 3>;
-+	};
-+
-+	vhot {
-+		trip = <&cpu_vhot>;
-+		cooling-device = <&fan 4 4>;
-+	};
-+
-+	melt {
-+		trip = <&cpu_crit>;
-+		cooling-device = <&fan 4 4>;
-+	};
-+};
-+
-+&gio {
-+	// The GPIOs above 35 are not used on Pi 5, so shrink the upper bank
-+	// to reduce the clutter in gpioinfo/pinctrl
-+	brcm,gpio-bank-widths = <32 4>;
-+
-+	gpio-line-names =
-+		"-", // GPIO_000
-+		"2712_BOOT_CS_N", // GPIO_001
-+		"2712_BOOT_MISO", // GPIO_002
-+		"2712_BOOT_MOSI", // GPIO_003
-+		"2712_BOOT_SCLK", // GPIO_004
-+		"-", // GPIO_005
-+		"-", // GPIO_006
-+		"-", // GPIO_007
-+		"-", // GPIO_008
-+		"-", // GPIO_009
-+		"-", // GPIO_010
-+		"-", // GPIO_011
-+		"-", // GPIO_012
-+		"-", // GPIO_013
-+		"PCIE_SDA", // GPIO_014
-+		"PCIE_SCL", // GPIO_015
-+		"-", // GPIO_016
-+		"-", // GPIO_017
-+		"-", // GPIO_018
-+		"-", // GPIO_019
-+		"PWR_GPIO", // GPIO_020
-+		"2712_G21_FS", // GPIO_021
-+		"-", // GPIO_022
-+		"-", // GPIO_023
-+		"BT_RTS", // GPIO_024
-+		"BT_CTS", // GPIO_025
-+		"BT_TXD", // GPIO_026
-+		"BT_RXD", // GPIO_027
-+		"WL_ON", // GPIO_028
-+		"BT_ON", // GPIO_029
-+		"WIFI_SDIO_CLK", // GPIO_030
-+		"WIFI_SDIO_CMD", // GPIO_031
-+		"WIFI_SDIO_D0", // GPIO_032
-+		"WIFI_SDIO_D1", // GPIO_033
-+		"WIFI_SDIO_D2", // GPIO_034
-+		"WIFI_SDIO_D3"; // GPIO_035
-+};
-+
-+&gio_aon {
-+	gpio-line-names =
-+		"RP1_SDA", // AON_GPIO_00
-+		"RP1_SCL", // AON_GPIO_01
-+		"RP1_RUN", // AON_GPIO_02
-+		"SD_IOVDD_SEL", // AON_GPIO_03
-+		"SD_PWR_ON", // AON_GPIO_04
-+		"SD_CDET_N", // AON_GPIO_05
-+		"SD_FLG_N", // AON_GPIO_06
-+		"-", // AON_GPIO_07
-+		"2712_WAKE", // AON_GPIO_08
-+		"2712_STAT_LED", // AON_GPIO_09
-+		"-", // AON_GPIO_10
-+		"-", // AON_GPIO_11
-+		"PMIC_INT", // AON_GPIO_12
-+		"UART_TX_FS", // AON_GPIO_13
-+		"UART_RX_FS", // AON_GPIO_14
-+		"-", // AON_GPIO_15
-+		"-", // AON_GPIO_16
-+
-+		// Pad bank0 out to 32 entries
-+		"", "", "", "", "", "", "", "", "", "", "", "", "", "", "",
-+
-+		"HDMI0_SCL", // AON_SGPIO_00
-+		"HDMI0_SDA", // AON_SGPIO_01
-+		"HDMI1_SCL", // AON_SGPIO_02
-+		"HDMI1_SDA", // AON_SGPIO_03
-+		"PMIC_SCL", // AON_SGPIO_04
-+		"PMIC_SDA"; // AON_SGPIO_05
-+
-+	rp1_run_hog {
-+		gpio-hog;
-+		gpios = <2 GPIO_ACTIVE_HIGH>;
-+		output-high;
-+		line-name = "RP1 RUN pin";
-+	};
-+};
-+
-+&rp1_gpio {
-+	gpio-line-names =
-+		"ID_SD", // GPIO0
-+		"ID_SC", // GPIO1
-+		"PIN3", // GPIO2
-+		"PIN5", // GPIO3
-+		"PIN7", // GPIO4
-+		"PIN29", // GPIO5
-+		"PIN31", // GPIO6
-+		"PIN26", // GPIO7
-+		"PIN24", // GPIO8
-+		"PIN21", // GPIO9
-+		"PIN19", // GPIO10
-+		"PIN23", // GPIO11
-+		"PIN32", // GPIO12
-+		"PIN33", // GPIO13
-+		"PIN8", // GPIO14
-+		"PIN10", // GPIO15
-+		"PIN36", // GPIO16
-+		"PIN11", // GPIO17
-+		"PIN12", // GPIO18
-+		"PIN35", // GPIO19
-+		"PIN38", // GPIO20
-+		"PIN40", // GPIO21
-+		"PIN15", // GPIO22
-+		"PIN16", // GPIO23
-+		"PIN18", // GPIO24
-+		"PIN22", // GPIO25
-+		"PIN37", // GPIO26
-+		"PIN13", // GPIO27
-+
-+		"PCIE_RP1_WAKE", // GPIO28
-+		"FAN_TACH", // GPIO29
-+		"HOST_SDA", // GPIO30
-+		"HOST_SCL", // GPIO31
-+		"ETH_RST_N", // GPIO32
-+		"-", // GPIO33
-+
-+		"CD0_IO0_MICCLK", // GPIO34
-+		"CD0_IO0_MICDAT0", // GPIO35
-+		"RP1_PCIE_CLKREQ_N", // GPIO36
-+		"-", // GPIO37
-+		"CD0_SDA", // GPIO38
-+		"CD0_SCL", // GPIO39
-+		"CD1_SDA", // GPIO40
-+		"CD1_SCL", // GPIO41
-+		"USB_VBUS_EN", // GPIO42
-+		"USB_OC_N", // GPIO43
-+		"RP1_STAT_LED", // GPIO44
-+		"FAN_PWM", // GPIO45
-+		"CD1_IO0_MICCLK", // GPIO46
-+		"2712_WAKE", // GPIO47
-+		"CD1_IO1_MICDAT1", // GPIO48
-+		"EN_MAX_USB_CUR", // GPIO49
-+		"-", // GPIO50
-+		"-", // GPIO51
-+		"-", // GPIO52
-+		"-"; // GPIO53
-+
-+	usb_vbus_pins: usb_vbus_pins {
-+		function = "vbus1";
-+		pins = "gpio42", "gpio43";
-+	};
-+};
-+
-+/ {
-+	aliases: aliases {
-+		blconfig = &blconfig;
-+		bluetooth = &bluetooth;
-+		console = &uart10;
-+		ethernet0 = &rp1_eth;
-+		wifi0 = &wifi;
-+		fb = &fb;
-+		mailbox = &mailbox;
-+		mmc0 = &sdio1;
-+		uart0 = &uart0;
-+		uart1 = &uart1;
-+		uart2 = &uart2;
-+		uart3 = &uart3;
-+		uart4 = &uart4;
-+		uart10 = &uart10;
-+		serial0 = &uart0;
-+		serial1 = &uart1;
-+		serial2 = &uart2;
-+		serial3 = &uart3;
-+		serial4 = &uart4;
-+		serial10 = &uart10;
-+		i2c = &i2c_arm;
-+		i2c0 = &i2c0;
-+		i2c1 = &i2c1;
-+		i2c2 = &i2c2;
-+		i2c3 = &i2c3;
-+		i2c4 = &i2c4;
-+		i2c5 = &i2c5;
-+		i2c6 = &i2c6;
-+		i2c10 = &i2c_rp1boot;
-+		// Bit-bashed i2c_gpios start at 10
-+		spi0 = &spi0;
-+		spi1 = &spi1;
-+		spi2 = &spi2;
-+		spi3 = &spi3;
-+		spi4 = &spi4;
-+		spi5 = &spi5;
-+		spi10 = &spi10;
-+		gpio0 = &gpio;
-+		gpio1 = &gio;
-+		gpio2 = &gio_aon;
-+		gpio3 = &pinctrl;
-+		gpio4 = &pinctrl_aon;
-+		usb0 = &rp1_usb0;
-+		usb1 = &rp1_usb1;
-+	};
-+
-+	__overrides__ {
-+		bdaddr = <&bluetooth>, "local-bd-address[";
-+		button_debounce = <&pwr_key>, "debounce-interval:0";
-+		cooling_fan = <&fan>, "status", <&rp1_pwm1>, "status";
-+		uart0_console = <&uart0>,"status", <&aliases>, "console=",&uart0;
-+		i2c0 = <&i2c0>, "status";
-+		i2c1 = <&i2c1>, "status";
-+		i2c = <&i2c1>, "status";
-+		i2c_arm = <&i2c_arm>, "status";
-+		i2c_vc = <&i2c_vc>, "status";
-+		i2c_csi_dsi = <&i2c_csi_dsi>, "status";
-+		i2c_csi_dsi0 = <&i2c_csi_dsi0>, "status";
-+		i2c_csi_dsi1 = <&i2c_csi_dsi1>, "status";
-+		i2c0_baudrate = <&i2c0>, "clock-frequency:0";
-+		i2c1_baudrate = <&i2c1>, "clock-frequency:0";
-+		i2c_baudrate = <&i2c_arm>, "clock-frequency:0";
-+		i2c_arm_baudrate = <&i2c_arm>, "clock-frequency:0";
-+		i2c_vc_baudrate = <&i2c_vc>, "clock-frequency:0";
-+		nvme = <&pciex1>, "status";
-+		pciex1 = <&pciex1>, "status";
-+		pciex1_gen = <&pciex1> , "max-link-speed:0";
-+		pciex1_no_l0s = <&pciex1>, "aspm-no-l0s?";
-+		random = <&random>, "status";
-+		rtc_bbat_vchg = <&rpi_rtc>, "trickle-charge-microvolt:0";
-+		spi = <&spi0>, "status";
-+		suspend = <&pwr_key>, "linux,code:0=205";
-+		uart0 = <&uart0>, "status";
-+		wifiaddr = <&wifi>, "local-mac-address[";
-+
-+		act_led_activelow = <&act_led>, "active-low?";
-+		act_led_trigger = <&act_led>, "linux,default-trigger";
-+		pwr_led_activelow = <&pwr_led>, "gpios:8";
-+		pwr_led_trigger = <&pwr_led>, "linux,default-trigger";
-+	};
-+};
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm2712-rpi.dtsi
-@@ -0,0 +1,281 @@
-+// SPDX-License-Identifier: GPL-2.0
-+
-+#include <dt-bindings/power/raspberrypi-power.h>
-+
-+&soc {
-+	firmware: firmware {
-+		compatible = "raspberrypi,bcm2835-firmware", "simple-mfd";
-+		#address-cells = <1>;
-+		#size-cells = <1>;
-+
-+		mboxes = <&mailbox>;
-+		dma-ranges;
-+
-+		firmware_clocks: clocks {
-+			compatible = "raspberrypi,firmware-clocks";
-+			#clock-cells = <1>;
-+		};
-+
-+		reset: reset {
-+			compatible = "raspberrypi,firmware-reset";
-+			#reset-cells = <1>;
-+		};
-+
-+		vcio: vcio {
-+			compatible = "raspberrypi,vcio";
-+		};
-+	};
-+
-+	power: power {
-+		compatible = "raspberrypi,bcm2835-power";
-+		firmware = <&firmware>;
-+		#power-domain-cells = <1>;
-+	};
-+
-+	fb: fb {
-+		compatible = "brcm,bcm2708-fb";
-+		firmware = <&firmware>;
-+		status = "okay";
-+	};
-+
-+	rpi_rtc: rpi_rtc {
-+		compatible = "raspberrypi,rpi-rtc";
-+		firmware = <&firmware>;
-+		status = "okay";
-+		trickle-charge-microvolt = <0>;
-+	};
-+
-+	/* Define these notional regulators for use by overlays, etc. */
-+	vdd_3v3_reg: fixedregulator_3v3 {
-+		compatible = "regulator-fixed";
-+		regulator-always-on;
-+		regulator-max-microvolt = <3300000>;
-+		regulator-min-microvolt = <3300000>;
-+		regulator-name = "3v3";
-+	};
-+
-+	vdd_5v0_reg: fixedregulator_5v0 {
-+		compatible = "regulator-fixed";
-+		regulator-always-on;
-+		regulator-max-microvolt = <5000000>;
-+		regulator-min-microvolt = <5000000>;
-+		regulator-name = "5v0";
-+	};
-+};
-+
-+/ {
-+	__overrides__ {
-+		arm_freq;
-+	};
-+};
-+
-+pciex1: &pcie1 { };
-+pciex4: &pcie2 { };
-+
-+&dma32 {
-+	/* The VPU firmware uses DMA channel 11 for VCHIQ */
-+	brcm,dma-channel-mask = <0x03f>;
-+};
-+
-+&dma40 {
-+	/* The VPU firmware DMA channel 11 for VCHIQ */
-+	brcm,dma-channel-mask = <0x07c0>;
-+};
-+
-+&hdmi0 {
-+	dmas = <&dma40 (10|(1<<30)|(1<<24)|(10<<16)|(15<<20))>;
-+};
-+
-+&hdmi1 {
-+	dmas = <&dma40 (17|(1<<30)|(1<<24)|(10<<16)|(15<<20))>;
-+};
-+
-+&spi10 {
-+	dmas = <&dma40 6>, <&dma40 7>;
-+	dma-names = "tx", "rx";
-+};
-+
-+&usb {
-+	power-domains = <&power RPI_POWER_DOMAIN_USB>;
-+};
-+
-+&rmem {
-+	/*
-+	 * RPi4's co-processor will copy the board's bootloader configuration
-+	 * into memory for the OS to consume. It'll also update this node with
-+	 * its placement information.
-+	 */
-+	blconfig: nvram@0 {
-+		compatible = "raspberrypi,bootloader-config", "nvmem-rmem";
-+		#address-cells = <1>;
-+		#size-cells = <1>;
-+		reg = <0x0 0x0 0x0>;
-+		no-map;
-+		status = "disabled";
-+	};
-+};
-+
-+&rp1_adc {
-+	status = "okay";
-+};
-+
-+/* Add some gpiomem nodes to make the devices accessible to userspace.
-+ * /dev/gpiomem<n> should expose the registers for the interface with DT alias
-+ * gpio<n>.
-+ */
-+
-+&rp1 {
-+	gpiomem@d0000 {
-+		/* Export IO_BANKs, RIO_BANKs and PADS_BANKs to userspace */
-+		compatible = "raspberrypi,gpiomem";
-+		reg = <0xc0 0x400d0000  0x0 0x30000>;
-+		chardev-name = "gpiomem0";
-+	};
-+};
-+
-+&soc {
-+	gpiomem@7d508500 {
-+		compatible = "raspberrypi,gpiomem";
-+		reg = <0x7d508500 0x40>;
-+		chardev-name = "gpiomem1";
-+	};
-+
-+	gpiomem@7d517c00 {
-+		compatible = "raspberrypi,gpiomem";
-+		reg = <0x7d517c00 0x40>;
-+		chardev-name = "gpiomem2";
-+	};
-+
-+	gpiomem@7d504100 {
-+		compatible = "raspberrypi,gpiomem";
-+		reg = <0x7d504100 0x20>;
-+		chardev-name = "gpiomem3";
-+	};
-+
-+	gpiomem@7d510700 {
-+		compatible = "raspberrypi,gpiomem";
-+		reg = <0x7d510700 0x20>;
-+		chardev-name = "gpiomem4";
-+	};
-+};
-+
-+i2c0: &rp1_i2c0 { };
-+i2c1: &rp1_i2c1 { };
-+i2c2: &rp1_i2c2 { };
-+i2c3: &rp1_i2c3 { };
-+i2c4: &rp1_i2c4 { };
-+i2c5: &rp1_i2c5 { };
-+i2c6: &rp1_i2c6 { };
-+i2s:  &rp1_i2s0 { };
-+i2s_clk_producer: &rp1_i2s0 { };
-+i2s_clk_consumer: &rp1_i2s1 { };
-+pwm0: &rp1_pwm0 { };
-+pwm1: &rp1_pwm1 { };
-+pwm: &pwm0 { };
-+spi0: &rp1_spi0 { };
-+spi1: &rp1_spi1 { };
-+spi2: &rp1_spi2 { };
-+spi3: &rp1_spi3 { };
-+spi4: &rp1_spi4 { };
-+spi5: &rp1_spi5 { };
-+
-+uart0_pins: &rp1_uart0_14_15 {};
-+uart0_ctsrts_pins: &rp1_uart0_ctsrts_16_17 {};
-+uart0: &rp1_uart0 {
-+	pinctrl-0 = <&uart0_pins>;
-+};
-+
-+uart1_pins: &rp1_uart1_0_1 {};
-+uart1_ctsrts_pins: &rp1_uart1_ctsrts_2_3 {};
-+uart1: &rp1_uart1 { };
-+
-+uart2_pins: &rp1_uart2_4_5 {};
-+uart2_ctsrts_pins: &rp1_uart2_ctsrts_6_7 {};
-+uart2: &rp1_uart2 { };
-+
-+uart3_pins: &rp1_uart3_8_9 {};
-+uart3_ctsrts_pins: &rp1_uart3_ctsrts_10_11 {};
-+uart3: &rp1_uart3 { };
-+
-+uart4_pins: &rp1_uart4_12_13 {};
-+uart4_ctsrts_pins: &rp1_uart4_ctsrts_14_15 {};
-+uart4: &rp1_uart4 { };
-+
-+i2c_vc: &i2c0 {      // This is pins 27,28 on the header (not MIPI)
-+	pinctrl-0 = <&rp1_i2c0_0_1>;
-+	pinctrl-names = "default";
-+};
-+
-+i2c_arm: &i2c1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&rp1_i2c1_2_3>;
-+};
-+
-+&i2c2 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&rp1_i2c2_4_5>;
-+};
-+
-+&i2c3 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&rp1_i2c3_6_7>;
-+};
-+
-+&i2s_clk_producer {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&rp1_i2s0_18_21>;
-+};
-+
-+&i2s_clk_consumer {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&rp1_i2s1_18_21>;
-+};
-+
-+spi0_pins: &rp1_spi0_gpio9 {};
-+spi0_cs_pins: &rp1_spi0_cs_gpio7 {};
-+
-+&spi0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi0_pins &spi0_cs_pins>;
-+	cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
-+
-+	spidev0: spidev@0 {
-+		compatible = "spidev";
-+		reg = <0>;	/* CE0 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+
-+	spidev1: spidev@1 {
-+		compatible = "spidev";
-+		reg = <1>;	/* CE1 */
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		spi-max-frequency = <125000000>;
-+	};
-+};
-+
-+spi2_pins: &rp1_spi2_gpio1 {};
-+&spi2 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi2_pins>;
-+};
-+
-+spi3_pins: &rp1_spi3_gpio5 {};
-+&spi3 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi3_pins>;
-+};
-+
-+spi4_pins: &rp1_spi4_gpio9 {};
-+&spi4 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi4_pins>;
-+};
-+
-+spi5_pins: &rp1_spi5_gpio13 {};
-+&spi5 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi5_pins>;
-+};
---- /dev/null
-+++ b/arch/arm/boot/dts/bcm2712.dtsi
-@@ -0,0 +1,1287 @@
-+// SPDX-License-Identifier: GPL-2.0
-+#include <dt-bindings/interrupt-controller/arm-gic.h>
-+#include <dt-bindings/soc/bcm2835-pm.h>
-+#include <dt-bindings/phy/phy.h>
-+
-+/ {
-+	compatible = "brcm,bcm2712", "brcm,bcm2711";
-+	model = "BCM2712";
-+
-+	#address-cells = <2>;
-+	#size-cells = <1>;
-+
-+	interrupt-parent = <&gicv2>;
-+
-+	rmem: reserved-memory {
-+		#address-cells = <2>;
-+		#size-cells = <1>;
-+		ranges;
-+
-+		atf@0 {
-+			reg = <0x0 0x0 0x80000>;
-+			no-map;
-+		};
-+
-+		cma: linux,cma {
-+			compatible = "shared-dma-pool";
-+			size = <0x4000000>; /* 64MB */
-+			reusable;
-+			linux,cma-default;
-+
-+			/*
-+			 * arm64 reserves the CMA by default somewhere in
-+			 * ZONE_DMA32, that's not good enough for the BCM2711
-+			 * as some devices can only address the lower 1G of
-+			 * memory (ZONE_DMA).
-+			 */
-+			alloc-ranges = <0x0 0x00000000 0x40000000>;
-+		};
-+	};
-+
-+	thermal-zones {
-+		cpu_thermal: cpu-thermal {
-+			polling-delay-passive = <2000>;
-+			polling-delay = <1000>;
-+			coefficients = <(-550) 450000>;
-+			thermal-sensors = <&thermal>;
-+
-+			thermal_trips: trips {
-+				cpu_crit: cpu-crit {
-+					temperature	= <110000>;
-+					hysteresis	= <0>;
-+					type		= "critical";
-+				};
-+			};
-+
-+			cooling_maps: cooling-maps {
-+			};
-+		};
-+	};
-+
-+	clk_27MHz: clk-27M {
-+		#clock-cells = <0>;
-+		compatible = "fixed-clock";
-+		clock-frequency = <27000000>;
-+		clock-output-names = "27MHz-clock";
-+	};
-+
-+	clk_108MHz: clk-108M {
-+		#clock-cells = <0>;
-+		compatible = "fixed-clock";
-+		clock-frequency = <108000000>;
-+		clock-output-names = "108MHz-clock";
-+	};
-+
-+	hvs: hvs@107c580000 {
-+		compatible = "brcm,bcm2712-hvs";
-+		reg = <0x10 0x7c580000 0x1a000>;
-+		interrupt-parent = <&disp_intr>;
-+		interrupts = <2>, <9>, <16>;
-+		interrupt-names = "ch0-eof", "ch1-eof", "ch2-eof";
-+		//iommus = <&iommu4>;
-+		status = "disabled";
-+	};
-+
-+	soc: soc {
-+		compatible = "simple-bus";
-+		#address-cells = <1>;
-+		#size-cells = <1>;
-+
-+		ranges     = <0x7c000000  0x10 0x7c000000  0x04000000>;
-+		/* Emulate a contiguous 30-bit address range for DMA */
-+		dma-ranges = <0xc0000000  0x00 0x00000000  0x40000000>,
-+			     <0x7c000000  0x10 0x7c000000  0x04000000>;
-+
-+		system_timer: timer@7c003000 {
-+			compatible = "brcm,bcm2835-system-timer";
-+			reg = <0x7c003000 0x1000>;
-+			interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>,
-+				     <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>,
-+		     		     <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>,
-+		     		     <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
-+			clock-frequency = <1000000>;
-+		};
-+
-+		firmwarekms: firmwarekms@7d503000 {
-+			compatible = "raspberrypi,rpi-firmware-kms";
-+			/* SUN_L2 interrupt reg */
-+			reg = <0x7d503000 0x18>;
-+			interrupt-parent = <&cpu_l2_irq>;
-+			interrupts = <19>;
-+			brcm,firmware = <&firmware>;
-+			status = "disabled";
-+		};
-+
-+		mailbox: mailbox@7c013880 {
-+			compatible = "brcm,bcm2835-mbox";
-+			reg = <0x7c013880 0x40>;
-+			interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
-+			#mbox-cells = <0>;
-+		};
-+
-+		pixelvalve0: pixelvalve@7c410000 {
-+			compatible = "brcm,bcm2712-pixelvalve0";
-+			reg = <0x7c410000 0x100>;
-+			interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
-+			status = "disabled";
-+		};
-+
-+		pixelvalve1: pixelvalve@7c411000 {
-+			compatible = "brcm,bcm2712-pixelvalve1";
-+			reg = <0x7c411000 0x100>;
-+			interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
-+			status = "disabled";
-+		};
-+
-+		usb: usb@7c480000 {
-+			compatible = "brcm,bcm2835-usb";
-+			reg = <0x7c480000 0x10000>;
-+			interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			clocks = <&clk_usb>;
-+			clock-names = "otg";
-+			phys = <&usbphy>;
-+			phy-names = "usb2-phy";
-+			status = "disabled";
-+		};
-+
-+		mop: mop@7c500000 {
-+			compatible = "brcm,bcm2712-mop";
-+			reg = <0x7c500000 0x20>;
-+			interrupt-parent = <&disp_intr>;
-+			interrupts = <1>;
-+			status = "disabled";
-+		};
-+
-+		moplet: moplet@7c501000 {
-+			compatible = "brcm,bcm2712-moplet";
-+			reg = <0x7c501000 0x20>;
-+			interrupt-parent = <&disp_intr>;
-+			interrupts = <0>;
-+			status = "disabled";
-+		};
-+
-+		disp_intr: interrupt-controller@7c502000 {
-+			compatible = "brcm,bcm2711-l2-intc", "brcm,l2-intc";
-+			reg = <0x7c502000 0x30>;
-+			interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
-+			interrupt-controller;
-+			#interrupt-cells = <1>;
-+			status = "disabled";
-+		};
-+
-+		dvp: clock@7c700000 {
-+			compatible = "brcm,brcm2711-dvp";
-+			reg = <0x7c700000 0x10>;
-+			clocks = <&clk_108MHz>;
-+			#clock-cells = <1>;
-+			#reset-cells = <1>;
-+		};
-+
-+		/*
-+		 * This node is the provider for the enable-method for
-+		 * bringing up secondary cores.
-+		 */
-+		local_intc: local_intc@7cd00000 {
-+			compatible = "brcm,bcm2836-l1-intc";
-+			reg = <0x7cd00000 0x100>;
-+		};
-+
-+		uart0: serial@7d001000 {
-+			compatible = "arm,pl011", "arm,primecell";
-+			reg = <0x7d001000 0x200>;
-+			interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&clk_uart>,
-+				 <&clk_vpu>;
-+			clock-names = "uartclk", "apb_pclk";
-+			arm,primecell-periphid = <0x00241011>;
-+			status = "disabled";
-+		};
-+
-+		uart2: serial@7d001400 {
-+			compatible = "arm,pl011", "arm,primecell";
-+			reg = <0x7d001400 0x200>;
-+			interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&clk_uart>,
-+				 <&clk_vpu>;
-+			clock-names = "uartclk", "apb_pclk";
-+			arm,primecell-periphid = <0x00241011>;
-+			status = "disabled";
-+		};
-+
-+		uart3: serial@7d001600 {
-+			compatible = "arm,pl011", "arm,primecell";
-+			reg = <0x7d001600 0x200>;
-+			interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&clk_uart>,
-+				 <&clk_vpu>;
-+			clock-names = "uartclk", "apb_pclk";
-+			arm,primecell-periphid = <0x00241011>;
-+			status = "disabled";
-+		};
-+
-+		uart4: serial@7d001800 {
-+			compatible = "arm,pl011", "arm,primecell";
-+			reg = <0x7d001800 0x200>;
-+			interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&clk_uart>,
-+				 <&clk_vpu>;
-+			clock-names = "uartclk", "apb_pclk";
-+			arm,primecell-periphid = <0x00241011>;
-+			status = "disabled";
-+		};
-+
-+		uart5: serial@7d001a00 {
-+			compatible = "arm,pl011", "arm,primecell";
-+			reg = <0x7d001a00 0x200>;
-+			interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&clk_uart>,
-+				 <&clk_vpu>;
-+			clock-names = "uartclk", "apb_pclk";
-+			arm,primecell-periphid = <0x00241011>;
-+			status = "disabled";
-+		};
-+
-+		sdhost: mmc@7d002000 {
-+			compatible = "brcm,bcm2835-sdhost";
-+			reg = <0x7d002000 0x100>;
-+			//interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&clk_vpu>;
-+			status = "disabled";
-+		};
-+
-+		i2s: i2s@7d003000 {
-+			compatible = "brcm,bcm2835-i2s";
-+			reg = <0x7d003000 0x24>;
-+			//clocks = <&cprman BCM2835_CLOCK_PCM>;
-+			status = "disabled";
-+		};
-+
-+		spi0: spi@7d004000 {
-+			compatible = "brcm,bcm2835-spi";
-+			reg = <0x7d004000 0x200>;
-+			interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&clk_vpu>;
-+			num-cs = <1>;
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "disabled";
-+		};
-+
-+		spi3: spi@7d004600 {
-+			compatible = "brcm,bcm2835-spi";
-+			reg = <0x7d004600 0x0200>;
-+			interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&clk_vpu>;
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "disabled";
-+		};
-+
-+		spi4: spi@7d004800 {
-+			compatible = "brcm,bcm2835-spi";
-+			reg = <0x7d004800 0x0200>;
-+			interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&clk_vpu>;
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "disabled";
-+		};
-+
-+		spi5: spi@7d004a00 {
-+			compatible = "brcm,bcm2835-spi";
-+			reg = <0x7d004a00 0x0200>;
-+			interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&clk_vpu>;
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "disabled";
-+		};
-+
-+		spi6: spi@7d004c00 {
-+			compatible = "brcm,bcm2835-spi";
-+			reg = <0x7d004c00 0x0200>;
-+			interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&clk_vpu>;
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "disabled";
-+		};
-+
-+		i2c0: i2c@7d005000 {
-+			compatible = "brcm,bcm2711-i2c", "brcm,bcm2835-i2c";
-+			reg = <0x7d005000 0x20>;
-+			interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&clk_vpu>;
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "disabled";
-+		};
-+
-+		i2c3: i2c@7d005600 {
-+			compatible = "brcm,bcm2711-i2c", "brcm,bcm2835-i2c";
-+			reg = <0x7d005600 0x20>;
-+			interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&clk_vpu>;
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "disabled";
-+		};
-+
-+		i2c4: i2c@7d005800 {
-+			compatible = "brcm,bcm2711-i2c", "brcm,bcm2835-i2c";
-+			reg = <0x7d005800 0x20>;
-+			interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&clk_vpu>;
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "disabled";
-+		};
-+
-+		i2c5: i2c@7d005a00 {
-+			compatible = "brcm,bcm2711-i2c", "brcm,bcm2835-i2c";
-+			reg = <0x7d005a00 0x20>;
-+			interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&clk_vpu>;
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "disabled";
-+		};
-+
-+		i2c6: i2c@7d005c00 {
-+			compatible = "brcm,bcm2711-i2c", "brcm,bcm2835-i2c";
-+			reg = <0x7d005c00 0x20>;
-+			interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&clk_vpu>;
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "disabled";
-+		};
-+
-+		i2c8: i2c@7d005e00 {
-+			compatible = "brcm,bcm2711-i2c", "brcm,bcm2835-i2c";
-+			reg = <0x7d005e00 0x20>;
-+			interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&clk_vpu>;
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "disabled";
-+		};
-+
-+		pwm0: pwm@7d00c000 {
-+			compatible = "brcm,bcm2835-pwm";
-+			reg = <0x7d00c000 0x28>;
-+			assigned-clock-rates = <10000000>;
-+			#pwm-cells = <2>;
-+			status = "disabled";
-+		};
-+
-+		pwm1: pwm@7d00c800 {
-+			compatible = "brcm,bcm2835-pwm";
-+			reg = <0x7d00c800 0x28>;
-+			assigned-clock-rates = <10000000>;
-+			#pwm-cells = <2>;
-+			status = "disabled";
-+		};
-+
-+		pm: watchdog@7d200000 {
-+			compatible = "brcm,bcm2712-pm";
-+			reg = <0x7d200000 0x308>;
-+			reg-names = "pm";
-+			#power-domain-cells = <1>;
-+			#reset-cells = <1>;
-+			//clocks = <&cprman BCM2835_CLOCK_V3D>,
-+			//	 <&cprman BCM2835_CLOCK_PERI_IMAGE>,
-+			//	 <&cprman BCM2835_CLOCK_H264>,
-+			//	 <&cprman BCM2835_CLOCK_ISP>;
-+			clock-names = "v3d", "peri_image", "h264", "isp";
-+			system-power-controller;
-+		};
-+
-+		cprman: cprman@7d202000 {
-+			compatible = "brcm,bcm2711-cprman";
-+			reg = <0x7d202000 0x2000>;
-+			#clock-cells = <1>;
-+
-+			/* CPRMAN derives almost everything from the
-+			 * platform's oscillator.  However, the DSI
-+			 * pixel clocks come from the DSI analog PHY.
-+			 */
-+			clocks = <&clk_osc>;
-+			status = "disabled";
-+		};
-+
-+		random: rng@7d208000 {
-+			compatible = "brcm,bcm2711-rng200";
-+			reg = <0x7d208000 0x28>;
-+			status = "okay";
-+		};
-+
-+		cpu_l2_irq: intc@7d503000 {
-+			compatible = "brcm,l2-intc";
-+			reg = <0x7d503000 0x18>;
-+			interrupts = <GIC_SPI 238 IRQ_TYPE_LEVEL_HIGH>;
-+			interrupt-controller;
-+			#interrupt-cells = <1>;
-+		};
-+
-+		pinctrl: pinctrl@7d504100 {
-+			compatible = "brcm,bcm2712-pinctrl";
-+			reg = <0x7d504100 0x30>;
-+
-+			uarta_24_pins: uarta_24_pins {
-+				pin_rts {
-+					function = "uart0";
-+					pins = "gpio24";
-+					bias-disable;
-+				};
-+				pin_cts {
-+					function = "uart0";
-+					pins = "gpio25";
-+					bias-pull-up;
-+				};
-+				pin_txd {
-+					function = "uart0";
-+					pins = "gpio26";
-+					bias-disable;
-+				};
-+				pin_rxd {
-+					function = "uart0";
-+					pins = "gpio27";
-+					bias-pull-up;
-+				};
-+			};
-+
-+			sdio2_30_pins: sdio2_30_pins {
-+				pin_clk {
-+					function = "sd2";
-+					pins = "gpio30";
-+					bias-disable;
-+				};
-+				pin_cmd {
-+					function = "sd2";
-+					pins = "gpio31";
-+					bias-pull-up;
-+				};
-+				pins_dat {
-+					function = "sd2";
-+					pins = "gpio32", "gpio33", "gpio34", "gpio35";
-+					bias-pull-up;
-+				};
-+			};
-+		};
-+
-+		ddc0: i2c@7d508200 {
-+			compatible = "brcm,brcmstb-i2c";
-+			reg = <0x7d508200 0x58>;
-+			interrupt-parent = <&bsc_irq>;
-+			interrupts = <1>;
-+			clock-frequency = <200000>;
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "disabled";
-+		};
-+
-+		ddc1: i2c@7d508280 {
-+			compatible = "brcm,brcmstb-i2c";
-+			reg = <0x7d508280 0x58>;
-+			interrupt-parent = <&bsc_irq>;
-+			interrupts = <2>;
-+			clock-frequency = <200000>;
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "disabled";
-+		};
-+
-+		bscd: i2c@7d508300 {
-+			compatible = "brcm,brcmstb-i2c";
-+			reg = <0x7d508300 0x58>;
-+			interrupt-parent = <&bsc_irq>;
-+			interrupts = <0>;
-+			clock-frequency = <200000>;
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "disabled";
-+		};
-+
-+		bsc_irq: intc@7d508380 {
-+			compatible = "brcm,bcm7271-l2-intc";
-+			reg = <0x7d508380 0x10>;
-+			interrupts = <GIC_SPI 242 IRQ_TYPE_LEVEL_HIGH>;
-+			interrupt-controller;
-+			#interrupt-cells = <1>;
-+		};
-+
-+		main_irq: intc@7d508400 {
-+			compatible = "brcm,bcm7271-l2-intc";
-+			reg = <0x7d508400 0x10>;
-+			interrupts = <GIC_SPI 244 IRQ_TYPE_LEVEL_HIGH>;
-+			interrupt-controller;
-+			#interrupt-cells = <1>;
-+		};
-+
-+		gio: gpio@7d508500 {
-+			compatible = "brcm,brcmstb-gpio";
-+			reg = <0x7d508500 0x40>;
-+			interrupt-parent = <&main_irq>;
-+			interrupts = <0>;
-+			gpio-controller;
-+			#gpio-cells = <2>;
-+			interrupt-controller;
-+			#interrupt-cells = <2>;
-+			brcm,gpio-bank-widths = <32 22>;
-+			brcm,gpio-direct;
-+		};
-+
-+		uarta: serial@7d50c000 {
-+			compatible = "brcm,bcm7271-uart";
-+			reg = <0x7d50c000 0x20>;
-+			reg-names = "uart";
-+			reg-shift = <2>;
-+			reg-io-width = <4>;
-+			interrupts = <GIC_SPI 276 IRQ_TYPE_LEVEL_HIGH>;
-+			skip-init;
-+			status = "disabled";
-+		};
-+
-+		uartb: serial@7d50d000 {
-+			compatible = "brcm,bcm7271-uart";
-+			reg = <0x7d50d000 0x20>;
-+			reg-names = "uart";
-+			reg-shift = <2>;
-+			reg-io-width = <4>;
-+			interrupts = <GIC_SPI 277 IRQ_TYPE_LEVEL_HIGH>;
-+			skip-init;
-+			status = "disabled";
-+		};
-+
-+		uartc: serial@7d50e000 {
-+			compatible = "brcm,bcm7271-uart";
-+			reg = <0x7d50e000 0x20>;
-+			reg-names = "uart";
-+			reg-shift = <2>;
-+			reg-io-width = <4>;
-+			interrupts = <GIC_SPI 278 IRQ_TYPE_LEVEL_HIGH>;
-+			skip-init;
-+			status = "disabled";
-+		};
-+
-+		aon_intr: interrupt-controller@7d510600 {
-+			compatible = "brcm,bcm2711-l2-intc", "brcm,l2-intc";
-+			reg = <0x7d510600 0x30>;
-+			interrupts = <GIC_SPI 239 IRQ_TYPE_LEVEL_HIGH>;
-+			interrupt-controller;
-+			#interrupt-cells = <1>;
-+			status = "disabled";
-+		};
-+
-+		pinctrl_aon: pinctrl@7d510700 {
-+			compatible = "brcm,bcm2712-aon-pinctrl";
-+			reg = <0x7d510700 0x20>;
-+
-+			i2c3_m4_agpio0_pins: i2c3_m4_agpio0_pins {
-+				function = "vc_i2c3";
-+				pins = "aon_gpio0", "aon_gpio1";
-+				bias-pull-up;
-+			};
-+
-+			bsc_m1_agpio13_pins: bsc_m1_agpio13_pins {
-+				function = "bsc_m1";
-+				pins = "aon_gpio13", "aon_gpio14";
-+				bias-pull-up;
-+			};
-+
-+			bsc_pmu_sgpio4_pins: bsc_pmu_sgpio4_pins {
-+				function = "avs_pmu_bsc";
-+				pins = "aon_sgpio4", "aon_sgpio5";
-+			};
-+
-+			bsc_m2_sgpio4_pins: bsc_m2_sgpio4_pins {
-+				function = "bsc_m2";
-+				pins = "aon_sgpio4", "aon_sgpio5";
-+			};
-+
-+			pwm_aon_agpio1_pins: pwm_aon_agpio1_pins {
-+				function = "aon_pwm";
-+				pins = "aon_gpio1", "aon_gpio2";
-+			};
-+
-+			pwm_aon_agpio4_pins: pwm_aon_agpio4_pins {
-+				function = "vc_pwm0";
-+				pins = "aon_gpio4", "aon_gpio5";
-+			};
-+
-+			pwm_aon_agpio7_pins: pwm_aon_agpio7_pins {
-+				function = "aon_pwm";
-+				pins = "aon_gpio7", "aon_gpio9";
-+			};
-+		};
-+
-+		intc@7d517000 {
-+			compatible = "brcm,bcm7271-l2-intc";
-+			reg = <0x7d517000 0x10>;
-+			interrupts = <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>;
-+			interrupt-controller;
-+			#interrupt-cells = <1>;
-+			status = "disabled";
-+		};
-+
-+		bscc: i2c@7d517a00 {
-+			compatible = "brcm,brcmstb-i2c";
-+			reg = <0x7d517a00 0x58>;
-+			interrupt-parent = <&bsc_aon_irq>;
-+			interrupts = <0>;
-+			clock-frequency = <200000>;
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "disabled";
-+		};
-+
-+		pwm_aon: pwm@7d517a80 {
-+			compatible = "brcm,bcm7038-pwm";
-+			reg = <0x7d517a80 0x28>;
-+			#pwm-cells = <2>;
-+			clocks = <&clk_27MHz>;
-+		};
-+
-+		main_aon_irq: intc@7d517ac0 {
-+			compatible = "brcm,bcm7271-l2-intc";
-+			reg = <0x7d517ac0 0x10>;
-+			interrupts = <GIC_SPI 245 IRQ_TYPE_LEVEL_HIGH>;
-+			interrupt-controller;
-+			#interrupt-cells = <1>;
-+		};
-+
-+		bsc_aon_irq: intc@7d517b00 {
-+			compatible = "brcm,bcm7271-l2-intc";
-+			reg = <0x7d517b00 0x10>;
-+			interrupts = <GIC_SPI 243 IRQ_TYPE_LEVEL_HIGH>;
-+			interrupt-controller;
-+			#interrupt-cells = <1>;
-+		};
-+
-+		gio_aon: gpio@7d517c00 {
-+			compatible = "brcm,brcmstb-gpio";
-+			reg = <0x7d517c00 0x40>;
-+			interrupt-parent = <&main_aon_irq>;
-+			interrupts = <0>;
-+			gpio-controller;
-+			#gpio-cells = <2>;
-+			interrupt-controller;
-+			#interrupt-cells = <2>;
-+			brcm,gpio-bank-widths = <17 6>;
-+			brcm,gpio-direct;
-+		};
-+
-+		avs_monitor: avs-monitor@7d542000 {
-+			compatible = "brcm,bcm2711-avs-monitor",
-+				     "syscon", "simple-mfd";
-+			reg = <0x7d542000 0xf00>;
-+			status = "okay";
-+
-+			thermal: thermal {
-+				compatible = "brcm,bcm2711-thermal";
-+				#thermal-sensor-cells = <0>;
-+			};
-+		};
-+
-+		bsc_pmu: i2c@7d544000 {
-+			compatible = "brcm,brcmstb-i2c";
-+			reg = <0x7d544000 0x58>;
-+			interrupt-parent = <&bsc_aon_irq>;
-+			interrupts = <1>;
-+			clock-frequency = <200000>;
-+			status = "disabled";
-+		};
-+
-+		hdmi0: hdmi@7ef00700 {
-+			compatible = "brcm,bcm2712-hdmi0";
-+			reg = <0x7c701400 0x300>,
-+			      <0x7c701000 0x200>,
-+			      <0x7c701d00 0x300>,
-+			      <0x7c702000 0x80>,
-+			      <0x7c703800 0x200>,
-+			      <0x7c704000 0x800>,
-+			      <0x7c700100 0x80>,
-+			      <0x7d510800 0x100>,
-+			      <0x7c720000 0x100>;
-+			reg-names = "hdmi",
-+				    "dvp",
-+				    "phy",
-+				    "rm",
-+				    "packet",
-+				    "metadata",
-+				    "csc",
-+				    "cec",
-+				    "hd";
-+			resets = <&dvp 1>;
-+			interrupt-parent = <&aon_intr>;
-+			interrupts = <1>, <2>, <3>,
-+				     <7>, <8>;
-+			interrupt-names = "cec-tx", "cec-rx", "cec-low",
-+					  "hpd-connected", "hpd-removed";
-+			ddc = <&ddc0>;
-+			dmas = <&dma32 10>;
-+			dma-names = "audio-rx";
-+			status = "disabled";
-+		};
-+
-+		hdmi1: hdmi@7ef05700 {
-+			compatible = "brcm,bcm2712-hdmi1";
-+			reg = <0x7c706400 0x300>,
-+			      <0x7c706000 0x200>,
-+			      <0x7c706d00 0x300>,
-+			      <0x7c707000 0x80>,
-+			      <0x7c708800 0x200>,
-+			      <0x7c709000 0x800>,
-+			      <0x7c700180 0x80>,
-+			      <0x7d511000 0x100>,
-+			      <0x7c720000 0x100>;
-+			reg-names = "hdmi",
-+				    "dvp",
-+				    "phy",
-+				    "rm",
-+				    "packet",
-+				    "metadata",
-+				    "csc",
-+				    "cec",
-+				    "hd";
-+			ddc = <&ddc1>;
-+			resets = <&dvp 2>;
-+			interrupt-parent = <&aon_intr>;
-+			interrupts = <11>, <12>, <13>,
-+				     <14>, <15>;
-+			interrupt-names = "cec-tx", "cec-rx", "cec-low",
-+					  "hpd-connected", "hpd-removed";
-+			dmas = <&dma32 17>;
-+			dma-names = "audio-rx";
-+			status = "disabled";
-+		};
-+
-+		sound: sound {
-+		};
-+	};
-+
-+	arm-pmu {
-+		compatible = "arm,cortex-a76-pmu";
-+		interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
-+			<GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>,
-+			<GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
-+			<GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
-+		interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>;
-+	};
-+
-+	timer {
-+		compatible = "arm,armv8-timer";
-+		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) |
-+					  IRQ_TYPE_LEVEL_LOW)>,
-+			     <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) |
-+					  IRQ_TYPE_LEVEL_LOW)>,
-+			     <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) |
-+					  IRQ_TYPE_LEVEL_LOW)>,
-+			     <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) |
-+					  IRQ_TYPE_LEVEL_LOW)>;
-+		/* This only applies to the ARMv7 stub */
-+		arm,cpu-registers-not-fw-configured;
-+	};
-+
-+	cpus: cpus {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		enable-method = "brcm,bcm2836-smp"; // for ARM 32-bit
-+
-+		cpu0: cpu@0 {
-+			device_type = "cpu";
-+			compatible = "arm,cortex-a76";
-+			reg = <0x000>;
-+			enable-method = "psci";
-+			next-level-cache = <&l2_cache>;
-+		};
-+
-+		cpu1: cpu@1 {
-+			device_type = "cpu";
-+			compatible = "arm,cortex-a76";
-+			reg = <0x100>;
-+			enable-method = "psci";
-+			next-level-cache = <&l2_cache>;
-+		};
-+
-+		cpu2: cpu@2 {
-+			device_type = "cpu";
-+			compatible = "arm,cortex-a76";
-+			reg = <0x200>;
-+			enable-method = "psci";
-+			next-level-cache = <&l2_cache>;
-+		};
-+
-+		cpu3: cpu@3 {
-+			device_type = "cpu";
-+			compatible = "arm,cortex-a76";
-+			reg = <0x300>;
-+			enable-method = "psci";
-+			next-level-cache = <&l2_cache>;
-+		};
-+
-+		l2_cache: l2-cache {
-+			compatible = "cache";
-+			next-level-cache = <&l3_cache>;
-+		};
-+
-+		l3_cache: l3-cache {
-+			compatible = "cache";
-+		};
-+	};
-+
-+	psci {
-+		method = "smc";
-+		compatible = "arm,psci-1.0", "arm,psci-0.2", "arm,psci";
-+		cpu_on = <0xc4000003>;
-+		cpu_suspend = <0xc4000001>;
-+		cpu_off = <0x84000002>;
-+	};
-+
-+	axi: axi {
-+		compatible = "simple-bus";
-+		#address-cells = <2>;
-+		#size-cells = <2>;
-+
-+		ranges = <0x00 0x00000000  0x00 0x00000000  0x10 0x00000000>,
-+			 <0x10 0x00000000  0x10 0x00000000  0x01 0x00000000>,
-+			 <0x14 0x00000000  0x14 0x00000000  0x04 0x00000000>,
-+			 <0x18 0x00000000  0x18 0x00000000  0x04 0x00000000>,
-+			 <0x1c 0x00000000  0x1c 0x00000000  0x04 0x00000000>;
-+
-+		dma-ranges = <0x00 0x00000000  0x00 0x00000000  0x10 0x00000000>,
-+			     <0x10 0x00000000  0x10 0x00000000  0x01 0x00000000>,
-+			     <0x14 0x00000000  0x14 0x00000000  0x04 0x00000000>,
-+			     <0x18 0x00000000  0x18 0x00000000  0x04 0x00000000>,
-+			     <0x1c 0x00000000  0x1c 0x00000000  0x04 0x00000000>;
-+
-+		vc4: gpu {
-+			compatible = "brcm,bcm2712-vc6";
-+		};
-+
-+		iommu2: iommu@5100 {
-+			/* IOMMU2 for PISP-BE, HEVC; and (unused) H264 accelerators */
-+			compatible = "brcm,bcm2712-iommu";
-+			reg = <0x10 0x5100  0x0 0x80>;
-+			cache = <&iommuc>;
-+			#iommu-cells = <0>;
-+		};
-+
-+		iommu4: iommu@5200 {
-+			/* IOMMU4 for HVS, MPL/TXP; and (unused) Unicam, PISP-FE, MiniBVN */
-+			compatible = "brcm,bcm2712-iommu";
-+			reg = <0x10 0x5200  0x0 0x80>;
-+			cache = <&iommuc>;
-+			#iommu-cells = <0>;
-+			#interconnect-cells = <0>;
-+		};
-+
-+		iommu5: iommu@5280 {
-+			/* IOMMU5 for PCIe2 (RP1); and (unused) BSTM */
-+			compatible = "brcm,bcm2712-iommu";
-+			reg = <0x10 0x5280  0x0 0x80>;
-+			cache = <&iommuc>;
-+			#iommu-cells = <0>;
-+			dma-iova-offset = <0x10 0x00000000>; // HACK for RP1 masters over PCIe
-+		};
-+
-+		iommuc: iommuc@5b00 {
-+			compatible = "brcm,bcm2712-iommuc";
-+			reg = <0x10 0x5b00  0x0 0x80>;
-+		};
-+
-+		dma32: dma@10000 {
-+			compatible = "brcm,bcm2712-dma";
-+			reg = <0x10 0x00010000 0 0x600>;
-+			interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>,
-+				     <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>,
-+				     <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>,
-+				     <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>,
-+				     <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>,
-+				     <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
-+			interrupt-names = "dma0",
-+					  "dma1",
-+					  "dma2",
-+					  "dma3",
-+					  "dma4",
-+					  "dma5";
-+			#dma-cells = <1>;
-+			brcm,dma-channel-mask = <0x0035>;
-+		};
-+
-+		dma40: dma@10600 {
-+			compatible = "brcm,bcm2712-dma";
-+			reg = <0x10 0x00010600 0 0x600>;
-+			interrupts =
-+				<GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>, /* dma4 6 */
-+				<GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>, /* dma4 7 */
-+				<GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>, /* dma4 8 */
-+				<GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>, /* dma4 9 */
-+				<GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>, /* dma4 10 */
-+				<GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>; /* dma4 11 */
-+			interrupt-names = "dma6",
-+					  "dma7",
-+					  "dma8",
-+					  "dma9",
-+					  "dma10",
-+					  "dma11";
-+			#dma-cells = <1>;
-+			brcm,dma-channel-mask = <0x0fc0>;
-+		};
-+
-+		// Single-lane Gen3 PCIe
-+		// Outbound window at 0x14_000000-0x17_ffffff
-+		pcie0: pcie@100000 {
-+			compatible = "brcm,bcm2712-pcie";
-+			reg = <0x10 0x00100000  0x0 0x9310>;
-+			device_type = "pci";
-+			max-link-speed = <2>;
-+			#address-cells = <3>;
-+			#interrupt-cells = <1>;
-+			#size-cells = <2>;
-+			/*
-+			 * Unused interrupts:
-+			 * 208: AER
-+			 * 215: NMI
-+			 * 216: PME
-+			 */
-+			interrupt-parent = <&gicv2>;
-+			interrupts = <GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH>,
-+				     <GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>;
-+			interrupt-names = "pcie", "msi";
-+			interrupt-map-mask = <0x0 0x0 0x0 0x7>;
-+			interrupt-map = <0 0 0 1 &gicv2 GIC_SPI 209
-+							IRQ_TYPE_LEVEL_HIGH>,
-+					<0 0 0 2 &gicv2 GIC_SPI 210
-+							IRQ_TYPE_LEVEL_HIGH>,
-+					<0 0 0 3 &gicv2 GIC_SPI 211
-+							IRQ_TYPE_LEVEL_HIGH>,
-+					<0 0 0 4 &gicv2 GIC_SPI 212
-+							IRQ_TYPE_LEVEL_HIGH>;
-+			resets = <&bcm_reset 5>, <&bcm_reset 42>, <&pcie_rescal>;
-+			reset-names = "swinit", "bridge", "rescal";
-+			msi-controller;
-+			msi-parent = <&pcie0>;
-+
-+			ranges = <0x02000000 0x00 0x00000000
-+				  0x17 0x00000000
-+				  0x0 0xfffffffc>,
-+				 <0x43000000 0x04 0x00000000
-+				  0x14 0x00000000
-+				  0x3 0x00000000>;
-+
-+			dma-ranges = <0x43000000 0x10 0x00000000
-+				      0x00 0x00000000
-+				      0x10 0x00000000>;
-+
-+			status = "disabled";
-+		};
-+
-+		// Single-lane Gen3 PCIe
-+		// Outbound window at 0x18_000000-0x1b_ffffff
-+		pcie1: pcie@110000 {
-+			compatible = "brcm,bcm2712-pcie";
-+			reg = <0x10 0x00110000  0x0 0x9310>;
-+			device_type = "pci";
-+			max-link-speed = <2>;
-+			#address-cells = <3>;
-+			#interrupt-cells = <1>;
-+			#size-cells = <2>;
-+			/*
-+			 * Unused interrupts:
-+			 * 218: AER
-+			 * 225: NMI
-+			 * 226: PME
-+			 */
-+			interrupt-parent = <&gicv2>;
-+			interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>,
-+				     <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>;
-+			interrupt-names = "pcie", "msi";
-+			interrupt-map-mask = <0x0 0x0 0x0 0x7>;
-+			interrupt-map = <0 0 0 1 &gicv2 GIC_SPI 219
-+							IRQ_TYPE_LEVEL_HIGH>,
-+					<0 0 0 2 &gicv2 GIC_SPI 220
-+							IRQ_TYPE_LEVEL_HIGH>,
-+					<0 0 0 3 &gicv2 GIC_SPI 221
-+							IRQ_TYPE_LEVEL_HIGH>,
-+					<0 0 0 4 &gicv2 GIC_SPI 222
-+							IRQ_TYPE_LEVEL_HIGH>;
-+			resets = <&bcm_reset 7>, <&bcm_reset 43>, <&pcie_rescal>;
-+			reset-names = "swinit", "bridge", "rescal";
-+			msi-controller;
-+			msi-parent = <&mip1>;
-+
-+			ranges = <0x02000000 0x00 0x00000000
-+				  0x1b 0x00000000
-+				  0x00 0xfffffffc>,
-+				 <0x43000000 0x04 0x00000000
-+				  0x18 0x00000000
-+				  0x03 0x00000000>;
-+
-+			dma-ranges = <0x03000000 0x10 0x00000000
-+				      0x00 0x00000000
-+				      0x10 0x00000000>;
-+
-+			brcm,enable-l1ss;
-+			status = "disabled";
-+		};
-+
-+		pcie_rescal: reset-controller@119500 {
-+			compatible = "brcm,bcm7216-pcie-sata-rescal";
-+			reg = <0x10 0x00119500  0x0 0x10>;
-+			#reset-cells = <0>;
-+		};
-+
-+		// Quad-lane Gen3 PCIe
-+		// Outbound window at 0x1c_000000-0x1f_ffffff
-+		pcie2: pcie@120000 {
-+			compatible = "brcm,bcm2712-pcie";
-+			reg = <0x10 0x00120000  0x0 0x9310>;
-+			device_type = "pci";
-+			max-link-speed = <2>;
-+			#address-cells = <3>;
-+			#interrupt-cells = <1>;
-+			#size-cells = <2>;
-+			/*
-+			 * Unused interrupts:
-+			 * 228: AER
-+			 * 235: NMI
-+			 * 236: PME
-+			 */
-+			interrupt-parent = <&gicv2>;
-+			interrupts = <GIC_SPI 233 IRQ_TYPE_LEVEL_HIGH>,
-+				     <GIC_SPI 234 IRQ_TYPE_LEVEL_HIGH>;
-+			interrupt-names = "pcie", "msi";
-+			interrupt-map-mask = <0x0 0x0 0x0 0x7>;
-+			interrupt-map = <0 0 0 1 &gicv2 GIC_SPI 229
-+							IRQ_TYPE_LEVEL_HIGH>,
-+					<0 0 0 2 &gicv2 GIC_SPI 230
-+							IRQ_TYPE_LEVEL_HIGH>,
-+					<0 0 0 3 &gicv2 GIC_SPI 231
-+							IRQ_TYPE_LEVEL_HIGH>,
-+					<0 0 0 4 &gicv2 GIC_SPI 232
-+							IRQ_TYPE_LEVEL_HIGH>;
-+			resets = <&bcm_reset 32>, <&bcm_reset 44>, <&pcie_rescal>;
-+			reset-names = "swinit", "bridge", "rescal";
-+			msi-controller;
-+			msi-parent = <&mip0>;
-+
-+			// ~4GB, 32-bit, not-prefetchable at PCIe 00_00000000
-+			ranges = <0x02000000 0x00 0x00000000
-+				  0x1f 0x00000000
-+				  0x0 0xfffffffc>,
-+			// 12GB, 64-bit, prefetchable at PCIe 04_00000000
-+				 <0x43000000 0x04 0x00000000
-+				  0x1c 0x00000000
-+				  0x03 0x00000000>;
-+
-+			// 64GB system RAM space at PCIe 10_00000000
-+			dma-ranges = <0x02000000 0x00 0x00000000
-+				      0x1f 0x00000000
-+				      0x00 0x00400000>,
-+				     <0x43000000 0x10 0x00000000
-+				      0x00 0x00000000
-+				      0x10 0x00000000>;
-+
-+			brcm,enable-mps-rcb;
-+			brcm,enable-l1ss;
-+			status = "disabled";
-+		};
-+
-+		mip0: msi-controller@130000 {
-+			compatible = "brcm,bcm2712-mip-intc";
-+			reg = <0x10 0x00130000  0x0 0xc0>;
-+			msi-controller;
-+			interrupt-controller;
-+			#interrupt-cells = <2>;
-+			brcm,msi-base-spi = <128>;
-+			brcm,msi-num-spis = <64>;
-+			brcm,msi-offset = <0>;
-+			brcm,msi-pci-addr = <0xff 0xfffff000>;
-+		};
-+
-+		mip1: msi-controller@131000 {
-+			compatible = "brcm,bcm2712-mip-intc";
-+			reg = <0x10 0x00131000  0x0 0xc0>;
-+			msi-controller;
-+			interrupt-controller;
-+			#interrupt-cells = <2>;
-+			brcm,msi-base-spi = <247>;
-+			/* Actually 20 total, but the others are
-+			 * both sparse and non-consecutive */
-+			brcm,msi-num-spis = <8>;
-+			brcm,msi-offset = <8>;
-+			brcm,msi-pci-addr = <0xff 0xffffe000>;
-+		};
-+
-+		genet: ethernet@1300000 {
-+			compatible = "brcm,bcm2711-genet-v5";
-+			reg = <0x10 0x01300000  0x0 0x20010>;
-+			#address-cells = <0x1>;
-+			#size-cells = <0x0>;
-+			interrupts = <GIC_SPI 265 IRQ_TYPE_LEVEL_HIGH>,
-+				     <GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH>;
-+			status = "disabled";
-+			phy-mode = "rgmii";
-+			fixed-link = <0x0 0x1 0x3e8 0x0 0x0>;
-+	                  phy-speed = <0x3e8>;
-+	                  phy-id = <0x101>;
-+	                  phy-type = <0x6>;
-+	                  local-mac-address = [ 00 10 18 d8 45 de ];
-+	                  device_type = "network";
-+
-+			genet_mdio: mdio@e14 {
-+				compatible = "brcm,genet-mdio-v5";
-+				reg = <0xe14 0x8>;
-+				#address-cells = <0x1>;
-+				#size-cells = <0x0>;
-+			};
-+		};
-+
-+		syscon_piarbctl: syscon@400018 {
-+			compatible = "brcm,syscon-piarbctl", "syscon", "simple-mfd";
-+			reg = <0x10 0x00400018  0x0 0x18>;
-+		};
-+
-+		rpivid: codec@800000 {
-+			compatible = "raspberrypi,rpivid-vid-decoder";
-+			reg = <0x10 0x00800000  0x0 0x10000>, /* HEVC */
-+			      <0x10 0x00840000  0x0 0x1000>;  /* INTC */
-+			reg-names = "hevc",
-+				    "intc";
-+
-+			interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
-+
-+			clocks = <&firmware_clocks 11>;
-+			clock-names = "hevc";
-+			status = "disabled";
-+		};
-+
-+		sdio1: mmc@fff000 {
-+			compatible = "brcm,bcm2712-sdhci";
-+			reg = <0x10 0x00fff000  0x0 0x260>,
-+			      <0x10 0x00fff400  0x0 0x200>,
-+			      <0x10 0x015040b0  0x0 0x4>,  // Bus isolation control
-+			      <0x10 0x015200f0  0x0 0x24>; // LCPLL control misc0-8
-+			reg-names = "host", "cfg", "busisol", "lcpll";
-+			interrupts = <GIC_SPI 273 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&clk_emmc2>;
-+			sdhci-caps-mask = <0x0000C000 0x0>;
-+			sdhci-caps = <0x0 0x0>;
-+			supports-cqe;
-+			mmc-ddr-3_3v;
-+		};
-+
-+		sdio2: mmc@1100000 {
-+			compatible = "brcm,bcm2712-sdhci";
-+			reg = <0x10 0x01100000  0x0 0x260>,
-+			      <0x10 0x01100400  0x0 0x200>;
-+			reg-names = "host", "cfg";
-+			interrupts = <GIC_SPI 274 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&clk_emmc2>;
-+			sdhci-caps-mask = <0x0000C000 0x0>;
-+			sdhci-caps = <0x0 0x0>;
-+			supports-cqe;
-+			mmc-ddr-3_3v;
-+			status = "disabled";
-+		};
-+
-+		sdio0: mmc@1108000 {
-+			compatible = "brcm,bcm2711-emmc2";
-+			reg = <0x10 0x01108000  0x0 0x100>;
-+			interrupts = <GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&clk_emmc2>;
-+			mmc-ddr-3_3v;
-+			status = "disabled";
-+		};
-+
-+		bcm_reset: reset-controller@1504318 {
-+			compatible = "brcm,brcmstb-reset";
-+			reg = <0x10 0x01504318  0x0 0x30>;
-+			#reset-cells = <1>;
-+		};
-+
-+		v3d: v3d@2000000 {
-+			compatible = "brcm,2712-v3d";
-+			reg = <0x10 0x02000000  0x0 0x4000>,
-+			      <0x10 0x02008000  0x0 0x6000>;
-+			reg-names = "hub", "core0";
-+
-+			power-domains = <&pm BCM2835_POWER_DOMAIN_GRAFX_V3D>;
-+			resets = <&pm BCM2835_RESET_V3D>;
-+			clocks = <&firmware_clocks 5>;
-+			clocks-names = "v3d";
-+			interrupts = <GIC_SPI 250 IRQ_TYPE_LEVEL_HIGH>,
-+				     <GIC_SPI 249 IRQ_TYPE_LEVEL_HIGH>;
-+			status = "disabled";
-+		};
-+
-+		gicv2: interrupt-controller@7fff9000 {
-+			interrupt-controller;
-+			#interrupt-cells = <3>;
-+			compatible = "arm,gic-400";
-+			reg =	<0x10 0x7fff9000  0x0 0x1000>,
-+				<0x10 0x7fffa000  0x0 0x2000>,
-+				<0x10 0x7fffc000  0x0 0x2000>,
-+				<0x10 0x7fffe000  0x0 0x2000>;
-+			interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) |
-+						 IRQ_TYPE_LEVEL_HIGH)>;
-+		};
-+
-+		pisp_be: pisp_be@880000  {
-+			compatible = "raspberrypi,pispbe";
-+			reg = <0x10 0x00880000  0x0 0x4000>;
-+			interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&firmware_clocks 7>;
-+			clocks-names = "isp_be";
-+			status = "okay";
-+			iommus = <&iommu2>;
-+		};
-+	};
-+
-+	clocks {
-+		/* The oscillator is the root of the clock tree. */
-+		clk_osc: clk-osc {
-+			compatible = "fixed-clock";
-+			#clock-cells = <0>;
-+			clock-output-names = "osc";
-+			clock-frequency = <54000000>;
-+		};
-+
-+		clk_usb: clk-usb {
-+			compatible = "fixed-clock";
-+			#clock-cells = <0>;
-+			clock-output-names = "otg";
-+			clock-frequency = <480000000>;
-+		};
-+
-+		clk_vpu: clk_vpu {
-+			#clock-cells = <0>;
-+			compatible = "fixed-clock";
-+			clock-frequency = <750000000>;
-+			clock-output-names = "vpu-clock";
-+		};
-+
-+		clk_uart: clk_uart {
-+			#clock-cells = <0>;
-+			compatible = "fixed-clock";
-+			clock-frequency = <9216000>;
-+			clock-output-names = "uart-clock";
-+		};
-+
-+		clk_emmc2: clk_emmc2 {
-+			#clock-cells = <0>;
-+			compatible = "fixed-clock";
-+			clock-frequency = <54000000>;
-+			clock-output-names = "emmc2-clock";
-+		};
-+	};
-+
-+	usbphy: phy {
-+		compatible = "usb-nop-xceiv";
-+		#phy-cells = <0>;
-+	};
-+};
---- a/arch/arm/boot/dts/overlays/Makefile
-+++ b/arch/arm/boot/dts/overlays/Makefile
-@@ -49,8 +49,10 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
- 	dionaudio-loco.dtbo \
- 	dionaudio-loco-v2.dtbo \
- 	disable-bt.dtbo \
-+	disable-bt-pi5.dtbo \
- 	disable-emmc2.dtbo \
- 	disable-wifi.dtbo \
-+	disable-wifi-pi5.dtbo \
- 	dpi18.dtbo \
- 	dpi18cpadhi.dtbo \
- 	dpi24.dtbo \
-@@ -106,8 +108,12 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
- 	i2c-rtc-gpio.dtbo \
- 	i2c-sensor.dtbo \
- 	i2c0.dtbo \
-+	i2c0-pi5.dtbo \
- 	i2c1.dtbo \
-+	i2c1-pi5.dtbo \
-+	i2c2-pi5.dtbo \
- 	i2c3.dtbo \
-+	i2c3-pi5.dtbo \
- 	i2c4.dtbo \
- 	i2c5.dtbo \
- 	i2c6.dtbo \
-@@ -150,10 +156,15 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
- 	media-center.dtbo \
- 	merus-amp.dtbo \
- 	midi-uart0.dtbo \
-+	midi-uart0-pi5.dtbo \
- 	midi-uart1.dtbo \
-+	midi-uart1-pi5.dtbo \
- 	midi-uart2.dtbo \
-+	midi-uart2-pi5.dtbo \
- 	midi-uart3.dtbo \
-+	midi-uart3-pi5.dtbo \
- 	midi-uart4.dtbo \
-+	midi-uart4-pi5.dtbo \
- 	midi-uart5.dtbo \
- 	minipitft13.dtbo \
- 	miniuart-bt.dtbo \
-@@ -231,14 +242,20 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
- 	spi1-2cs.dtbo \
- 	spi1-3cs.dtbo \
- 	spi2-1cs.dtbo \
-+	spi2-1cs-pi5.dtbo \
- 	spi2-2cs.dtbo \
-+	spi2-2cs-pi5.dtbo \
- 	spi2-3cs.dtbo \
- 	spi3-1cs.dtbo \
-+	spi3-1cs-pi5.dtbo \
- 	spi3-2cs.dtbo \
-+	spi3-2cs-pi5.dtbo \
- 	spi4-1cs.dtbo \
- 	spi4-2cs.dtbo \
- 	spi5-1cs.dtbo \
-+	spi5-1cs-pi5.dtbo \
- 	spi5-2cs.dtbo \
-+	spi5-2cs-pi5.dtbo \
- 	spi6-1cs.dtbo \
- 	spi6-2cs.dtbo \
- 	ssd1306.dtbo \
-@@ -253,10 +270,15 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
- 	tpm-slb9670.dtbo \
- 	tpm-slb9673.dtbo \
- 	uart0.dtbo \
-+	uart0-pi5.dtbo \
- 	uart1.dtbo \
-+	uart1-pi5.dtbo \
- 	uart2.dtbo \
-+	uart2-pi5.dtbo \
- 	uart3.dtbo \
-+	uart3-pi5.dtbo \
- 	uart4.dtbo \
-+	uart4-pi5.dtbo \
- 	uart5.dtbo \
- 	udrc.dtbo \
- 	ugreen-dabboard.dtbo \
-@@ -276,6 +298,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
- 	vc4-kms-kippah-7inch.dtbo \
- 	vc4-kms-v3d.dtbo \
- 	vc4-kms-v3d-pi4.dtbo \
-+	vc4-kms-v3d-pi5.dtbo \
- 	vc4-kms-vga666.dtbo \
- 	vga666.dtbo \
- 	vl805.dtbo \
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -151,6 +151,9 @@ Params:
-                                 bdaddr=06:05:04:03:02:01
-                                 will set the BDADDR to 01:02:03:04:05:06.
- 
-+        button_debounce         Set the debounce delay (in ms) on the power/
-+                                shutdown button (default 50ms)
-+
-         cam0_reg                Enables CAM 0 regulator.
-                                 Only required on CM1 & 3.
- 
-@@ -167,6 +170,9 @@ Params:
-                                 Default of GPIO expander 5 on CM4, but override
-                                 switches to normal GPIO.
- 
-+        cooling_fan             Enables the Pi 5 cooling fan (enabled
-+                                automatically by the firmware)
-+
-         eee                     Enable Energy Efficient Ethernet support for
-                                 compatible devices (default "on"). See also
-                                 "tx_lpi_timer". Pi3B+ only.
-@@ -206,23 +212,29 @@ Params:
-         hdmi                    Set to "off" to disable the HDMI interface
-                                 (default "on")
- 
-+        i2c                     An alias for i2c_arm
-+
-         i2c_arm                 Set to "on" to enable the ARM's i2c interface
-                                 (default "off")
- 
-+        i2c_arm_baudrate        Set the baudrate of the ARM's i2c interface
-+                                (default "100000")
-+
-+        i2c_baudrate            An alias for i2c_arm_baudrate
-+
-+        i2c_csi_dsi             Set to "on" to enable the i2c_csi_dsi interface
-+
-+        i2c_csi_dsi0            Set to "on" to enable the i2c_csi_dsi0 interface
-+
-+        i2c_csi_dsi1            Set to "on" to enable the i2c_csi_dsi1 interface
-+
-         i2c_vc                  Set to "on" to enable the i2c interface
-                                 usually reserved for the VideoCore processor
-                                 (default "off")
- 
--        i2c                     An alias for i2c_arm
--
--        i2c_arm_baudrate        Set the baudrate of the ARM's i2c interface
--                                (default "100000")
--
-         i2c_vc_baudrate         Set the baudrate of the VideoCore i2c interface
-                                 (default "100000")
- 
--        i2c_baudrate            An alias for i2c_arm_baudrate
--
-         i2s                     Set to "on" to enable the i2s interface
-                                 (default "off")
- 
-@@ -237,11 +249,23 @@ Params:
-         krnbt_baudrate          Set the baudrate of the PL011 UART when used
-                                 with krnbt=on
- 
-+        nvme                    Alias for "pciex1" (2712 only)
-+
-         pcie                    Set to "off" to disable the PCIe interface
-                                 (default "on")
-                                 (2711 only, but not applicable on CM4S)
-                                 N.B. USB-A ports on 4B are subsequently disabled
- 
-+        pciex1                  Set to "on" to enable the external PCIe link
-+                                (2712 only, default "off")
-+
-+        pciex1_gen              Sets the PCIe "GEN"/speed for the external PCIe
-+                                link (2712 only, default "2")
-+
-+        pciex1_no_l0s           Set to "on" to disable ASPM L0s on the external
-+                                PCIe link for devices that have broken
-+                                implementations (2712 only, default "off")
-+
-         spi                     Set to "on" to enable the spi interfaces
-                                 (default "off")
- 
-@@ -252,6 +276,11 @@ Params:
-         random                  Set to "on" to enable the hardware random
-                                 number generator (default "on")
- 
-+        rtc_bbat_vchg           Set the RTC backup battery charging voltage in
-+                                microvolts. If set to 0 or not specified, the
-+                                trickle charger is disabled.
-+                                (2712 only, default "0")
-+
-         sd                      Set to "off" to disable the SD card (or eMMC on
-                                 non-lite SKU of CM4).
-                                 (default "on")
-@@ -276,18 +305,30 @@ Params:
-         sdio_overclock          Clock (in MHz) to use when the MMC framework
-                                 requests 50MHz for the SDIO/WLAN interface.
- 
-+        suspend                 Make the power button trigger a suspend rather
-+                                than a power-off (2712 only, default "off")
-+
-         tx_lpi_timer            Set the delay in microseconds between going idle
-                                 and entering the low power state (default 600).
-                                 Requires EEE to be enabled - see "eee".
- 
-         uart0                   Set to "off" to disable uart0 (default "on")
- 
-+        uart0_console           Move the kernel boot console to UART0 on pins
-+                                6, 8 and 10 of the 40-way header (2712 only,
-+                                default "off")
-+
-         uart1                   Set to "on" or "off" to enable or disable uart1
-                                 (default varies)
- 
-         watchdog                Set to "on" to enable the hardware watchdog
-                                 (default "off")
- 
-+        wifiaddr                Set an alternative WiFi MAC address.
-+                                The value should be a 6-byte hexadecimal value,
-+                                with or without colon separators, written in the
-+                                natural (big-endian) order.
-+
-         act_led_trigger         Choose which activity the LED tracks.
-                                 Use "heartbeat" for a nice load indicator.
-                                 (default "mmc")
-@@ -919,14 +960,16 @@ Params: 24db_digital_gain       Allow ga
- 
- 
- Name:   disable-bt
--Info:   Disable onboard Bluetooth on Pi 3B, 3B+, 3A+, 4B and Zero W, restoring
--        UART0/ttyAMA0 over GPIOs 14 & 15.
--        N.B. To disable the systemd service that initialises the modem so it
--        doesn't use the UART, use 'sudo systemctl disable hciuart'.
-+Info:   Disable onboard Bluetooth on Bluetooth-capable Raspberry Pis. On Pis
-+        prior to Pi 5 this restores UART0/ttyAMA0 over GPIOs 14 & 15.
- Load:   dtoverlay=disable-bt
- Params: <None>
- 
- 
-+Name:   disable-bt-pi5
-+Info:   See disable-bt
-+
-+
- Name:   disable-emmc2
- Info:   Disable EMMC2 controller on BCM2711.
-         The allows the onboard EMMC storage on Compute Module 4 to be disabled
-@@ -936,11 +979,15 @@ Params: <None>
- 
- 
- Name:   disable-wifi
--Info:   Disable onboard WLAN on Pi 3B, 3B+, 3A+, 4B and Zero W.
-+Info:   Disable onboard WLAN on WiFi-capable Raspberry Pis.
- Load:   dtoverlay=disable-wifi
- Params: <None>
- 
- 
-+Name:   disable-wifi-pi5
-+Info:   See disable-wifi
-+
-+
- Name:   dpi18
- Info:   Overlay for a generic 18-bit DPI display
-         This uses GPIOs 0-21 (so no I2C, uart etc.), and activates the output
-@@ -2233,6 +2280,15 @@ Info:   Deprecated, legacy version of i2
- Load:   <Deprecated>
- 
- 
-+Name:   i2c0-pi5
-+Info:   Enable i2c0 (Pi 5 only)
-+Load:   dtoverlay=i2c0-pi5,<param>=<val>
-+Params: pins_0_1                Use GPIOs 0 and 1 (default)
-+        pins_8_9                Use GPIOs 8 and 9
-+        baudrate                Set the baudrate for the interface (default
-+                                "100000")
-+
-+
- Name:   i2c1
- Info:   Change i2c1 pin usage. Not all pin combinations are usable on all
-         platforms - platforms other then Compute Modules can only use this
-@@ -2249,6 +2305,24 @@ Info:   Deprecated, legacy version of i2
- Load:   <Deprecated>
- 
- 
-+Name:   i2c1-pi5
-+Info:   Enable i2c1 (Pi 5 only)
-+Load:   dtoverlay=i2c1-pi5,<param>=<val>
-+Params: pins_2_3                Use GPIOs 2 and 3 (default)
-+        pins_10_11              Use GPIOs 10 and 11
-+        baudrate                Set the baudrate for the interface (default
-+                                "100000")
-+
-+
-+Name:   i2c2-pi5
-+Info:   Enable i2c2 (Pi 5 only)
-+Load:   dtoverlay=i2c2-pi5,<param>=<val>
-+Params: pins_4_5                Use GPIOs 4 and 5 (default)
-+        pins_12_13              Use GPIOs 12 and 13
-+        baudrate                Set the baudrate for the interface (default
-+                                "100000")
-+
-+
- Name:   i2c3
- Info:   Enable the i2c3 bus. BCM2711 only.
- Load:   dtoverlay=i2c3,<param>
-@@ -2258,6 +2332,16 @@ Params: pins_2_3                Use GPIO
-                                 "100000")
- 
- 
-+Name:   i2c3-pi5
-+Info:   Enable i2c3 (Pi 5 only)
-+Load:   dtoverlay=i2c3-pi5,<param>=<val>
-+Params: pins_6_7                Use GPIOs 6 and 7 (default)
-+        pins_14_15              Use GPIOs 14 and 15
-+        pins_22_23              Use GPIOs 22 and 23
-+        baudrate                Set the baudrate for the interface (default
-+                                "100000")
-+
-+
- Name:   i2c4
- Info:   Enable the i2c4 bus. BCM2711 only.
- Load:   dtoverlay=i2c4,<param>
-@@ -2869,6 +2953,10 @@ Load:   dtoverlay=midi-uart0
- Params: <None>
- 
- 
-+Name:   midi-uart0-pi5
-+Info:   See midi-uart0 (this is the Pi 5 version)
-+
-+
- Name:   midi-uart1
- Info:   Configures UART1 (ttyS0) so that a requested 38.4kbaud actually gets
-         31.25kbaud, the frequency required for MIDI
-@@ -2876,29 +2964,45 @@ Load:   dtoverlay=midi-uart1
- Params: <None>
- 
- 
-+Name:   midi-uart1-pi5
-+Info:   See midi-uart1 (this is the Pi 5 version)
-+
-+
- Name:   midi-uart2
--Info:   Configures UART2 (ttyAMA1) so that a requested 38.4kbaud actually gets
-+Info:   Configures UART2 (ttyAMA2) so that a requested 38.4kbaud actually gets
-         31.25kbaud, the frequency required for MIDI
- Load:   dtoverlay=midi-uart2
- Params: <None>
- 
- 
-+Name:   midi-uart2-pi5
-+Info:   See midi-uart2 (this is the Pi 5 version)
-+
-+
- Name:   midi-uart3
--Info:   Configures UART3 (ttyAMA2) so that a requested 38.4kbaud actually gets
-+Info:   Configures UART3 (ttyAMA3) so that a requested 38.4kbaud actually gets
-         31.25kbaud, the frequency required for MIDI
- Load:   dtoverlay=midi-uart3
- Params: <None>
- 
- 
-+Name:   midi-uart3-pi5
-+Info:   See midi-uart3 (this is the Pi 5 version)
-+
-+
- Name:   midi-uart4
--Info:   Configures UART4 (ttyAMA3) so that a requested 38.4kbaud actually gets
-+Info:   Configures UART4 (ttyAMA4) so that a requested 38.4kbaud actually gets
-         31.25kbaud, the frequency required for MIDI
- Load:   dtoverlay=midi-uart4
- Params: <None>
- 
- 
-+Name:   midi-uart4-pi5
-+Info:   See midi-uart4 (this is the Pi 5 version)
-+
-+
- Name:   midi-uart5
--Info:   Configures UART5 (ttyAMA4) so that a requested 38.4kbaud actually gets
-+Info:   Configures UART5 (ttyAMA5) so that a requested 38.4kbaud actually gets
-         31.25kbaud, the frequency required for MIDI
- Load:   dtoverlay=midi-uart5
- Params: <None>
-@@ -3921,105 +4025,131 @@ Name:   spi1-1cs
- Info:   Enables spi1 with a single chip select (CS) line and associated spidev
-         dev node. The gpio pin number for the CS line and spidev device node
-         creation are configurable.
--        N.B.: spi1 is only accessible on devices with a 40pin header, eg:
--              A+, B+, Zero and PI2 B; as well as the Compute Module.
-+        N.B.: spi1 is not accessible on old Pis without a 40-pin header.
- Load:   dtoverlay=spi1-1cs,<param>=<val>
- Params: cs0_pin                 GPIO pin for CS0 (default 18 - BCM SPI1_CE0).
--        cs0_spidev              Set to 'disabled' to stop the creation of a
-+        cs0_spidev              Set to 'off' to stop the creation of a
-                                 userspace device node /dev/spidev1.0 (default
--                                is 'okay' or enabled).
-+                                is 'on' or enabled).
- 
- 
- Name:   spi1-2cs
- Info:   Enables spi1 with two chip select (CS) lines and associated spidev
-         dev nodes. The gpio pin numbers for the CS lines and spidev device node
-         creation are configurable.
--        N.B.: spi1 is only accessible on devices with a 40pin header, eg:
--              A+, B+, Zero and PI2 B; as well as the Compute Module.
-+        N.B.: spi1 is not accessible on old Pis without a 40-pin header.
- Load:   dtoverlay=spi1-2cs,<param>=<val>
- Params: cs0_pin                 GPIO pin for CS0 (default 18 - BCM SPI1_CE0).
-         cs1_pin                 GPIO pin for CS1 (default 17 - BCM SPI1_CE1).
--        cs0_spidev              Set to 'disabled' to stop the creation of a
-+        cs0_spidev              Set to 'off' to stop the creation of a
-                                 userspace device node /dev/spidev1.0 (default
--                                is 'okay' or enabled).
--        cs1_spidev              Set to 'disabled' to stop the creation of a
-+                                is 'on' or enabled).
-+        cs1_spidev              Set to 'off' to stop the creation of a
-                                 userspace device node /dev/spidev1.1 (default
--                                is 'okay' or enabled).
-+                                is 'on' or enabled).
- 
- 
- Name:   spi1-3cs
- Info:   Enables spi1 with three chip select (CS) lines and associated spidev
-         dev nodes. The gpio pin numbers for the CS lines and spidev device node
-         creation are configurable.
--        N.B.: spi1 is only accessible on devices with a 40pin header, eg:
--              A+, B+, Zero and PI2 B; as well as the Compute Module.
-+        N.B.: spi1 is not accessible on old Pis without a 40-pin header.
- Load:   dtoverlay=spi1-3cs,<param>=<val>
- Params: cs0_pin                 GPIO pin for CS0 (default 18 - BCM SPI1_CE0).
-         cs1_pin                 GPIO pin for CS1 (default 17 - BCM SPI1_CE1).
-         cs2_pin                 GPIO pin for CS2 (default 16 - BCM SPI1_CE2).
--        cs0_spidev              Set to 'disabled' to stop the creation of a
-+        cs0_spidev              Set to 'off' to stop the creation of a
-                                 userspace device node /dev/spidev1.0 (default
--                                is 'okay' or enabled).
--        cs1_spidev              Set to 'disabled' to stop the creation of a
-+                                is 'on' or enabled).
-+        cs1_spidev              Set to 'off' to stop the creation of a
-                                 userspace device node /dev/spidev1.1 (default
--                                is 'okay' or enabled).
--        cs2_spidev              Set to 'disabled' to stop the creation of a
-+                                is 'on' or enabled).
-+        cs2_spidev              Set to 'off' to stop the creation of a
-                                 userspace device node /dev/spidev1.2 (default
--                                is 'okay' or enabled).
-+                                is 'on' or enabled).
- 
- 
- Name:   spi2-1cs
--Info:   Enables spi2 with a single chip select (CS) line and associated spidev
--        dev node. The gpio pin number for the CS line and spidev device node
--        creation are configurable.
--        N.B.: spi2 is only accessible with the Compute Module.
-+Info:   Enables spi2 on GPIOs 40-42 with a single chip select (CS) line and
-+        associated spidev dev node. The gpio pin number for the CS line and
-+        spidev device node creation are configurable. spi2-2cs-pi5 is
-+        substituted on a Pi 5.
-+        N.B.: spi2 is only accessible with the Compute Module or Pi 5.
- Load:   dtoverlay=spi2-1cs,<param>=<val>
- Params: cs0_pin                 GPIO pin for CS0 (default 43 - BCM SPI2_CE0).
--        cs0_spidev              Set to 'disabled' to stop the creation of a
-+        cs0_spidev              Set to 'off' to stop the creation of a
-                                 userspace device node /dev/spidev2.0 (default
--                                is 'okay' or enabled).
-+                                is 'on' or enabled).
-+
-+
-+Name:   spi2-1cs-pi5
-+Info:   Enables spi2 on GPIOs 1-3 with a single chip select (CS) line and
-+        associated spidev dev node. The gpio pin number for the CS line and
-+        spidev device node creation are configurable. Pi 5 only.
-+Load:   dtoverlay=spi2-1cs-pi5,<param>=<val>
-+Params: cs0_pin                 GPIO pin for CS0 (default 0).
-+        cs0_spidev              Set to 'off' to stop the creation of a
-+                                userspace device node /dev/spidev2.0 (default
-+                                is 'on' or enabled).
- 
- 
- Name:   spi2-2cs
--Info:   Enables spi2 with two chip select (CS) lines and associated spidev
--        dev nodes. The gpio pin numbers for the CS lines and spidev device node
--        creation are configurable.
--        N.B.: spi2 is only accessible with the Compute Module.
-+Info:   Enables spi2 on GPIOs 40-42 with two chip select (CS) lines and
-+        associated spidev dev nodes. The gpio pin numbers for the CS lines and
-+        spidev device node creation are configurable. spi2-2cs-pi5 is
-+        substituted on a Pi 5.
-+        N.B.: spi2 is only accessible with the Compute Module or Pi 5.
- Load:   dtoverlay=spi2-2cs,<param>=<val>
- Params: cs0_pin                 GPIO pin for CS0 (default 43 - BCM SPI2_CE0).
-         cs1_pin                 GPIO pin for CS1 (default 44 - BCM SPI2_CE1).
--        cs0_spidev              Set to 'disabled' to stop the creation of a
-+        cs0_spidev              Set to 'off' to stop the creation of a
-+                                userspace device node /dev/spidev2.0 (default
-+                                is 'on' or enabled).
-+        cs1_spidev              Set to 'off' to stop the creation of a
-+                                userspace device node /dev/spidev2.1 (default
-+                                is 'on' or enabled).
-+
-+
-+Name:   spi2-2cs-pi5
-+Info:   Enables spi2 on GPIOs 1-3 with two chip select (CS) lines and
-+        associated spidev dev nodes. The gpio pin numbers for the CS lines and
-+        spidev device node creation are configurable. Pi 5 only.
-+Load:   dtoverlay=spi2-2cs-pi5,<param>=<val>
-+Params: cs0_pin                 GPIO pin for CS0 (default 0).
-+        cs1_pin                 GPIO pin for CS1 (default 24).
-+        cs0_spidev              Set to 'off' to stop the creation of a
-                                 userspace device node /dev/spidev2.0 (default
--                                is 'okay' or enabled).
--        cs1_spidev              Set to 'disabled' to stop the creation of a
-+                                is 'on' or enabled).
-+        cs1_spidev              Set to 'off' to stop the creation of a
-                                 userspace device node /dev/spidev2.1 (default
--                                is 'okay' or enabled).
-+                                is 'on' or enabled).
- 
- 
- Name:   spi2-3cs
--Info:   Enables spi2 with three chip select (CS) lines and associated spidev
--        dev nodes. The gpio pin numbers for the CS lines and spidev device node
--        creation are configurable.
--        N.B.: spi2 is only accessible with the Compute Module.
-+Info:   Enables spi2 on GPIOs 40-42 with three chip select (CS) lines and
-+        associated spidev dev nodes. The gpio pin numbers for the CS lines and
-+        spidev device node creation are configurable.
-+        N.B.: spi2 is only accessible with the Compute Module or Pi 5.
- Load:   dtoverlay=spi2-3cs,<param>=<val>
- Params: cs0_pin                 GPIO pin for CS0 (default 43 - BCM SPI2_CE0).
-         cs1_pin                 GPIO pin for CS1 (default 44 - BCM SPI2_CE1).
-         cs2_pin                 GPIO pin for CS2 (default 45 - BCM SPI2_CE2).
--        cs0_spidev              Set to 'disabled' to stop the creation of a
-+        cs0_spidev              Set to 'off' to stop the creation of a
-                                 userspace device node /dev/spidev2.0 (default
--                                is 'okay' or enabled).
--        cs1_spidev              Set to 'disabled' to stop the creation of a
-+                                is 'on' or enabled).
-+        cs1_spidev              Set to 'off' to stop the creation of a
-                                 userspace device node /dev/spidev2.1 (default
--                                is 'okay' or enabled).
--        cs2_spidev              Set to 'disabled' to stop the creation of a
-+                                is 'on' or enabled).
-+        cs2_spidev              Set to 'off' to stop the creation of a
-                                 userspace device node /dev/spidev2.2 (default
--                                is 'okay' or enabled).
-+                                is 'on' or enabled).
- 
- 
- Name:   spi3-1cs
--Info:   Enables spi3 with a single chip select (CS) line and associated spidev
--        dev node. The gpio pin number for the CS line and spidev device node
--        creation are configurable. BCM2711 only.
-+Info:   Enables spi3 on GPIOs 1-3 with a single chip select (CS) line and
-+        associated spidev dev node. The gpio pin number for the CS line and
-+        spidev device node creation are configurable. BCM2711 only,
-+        spi3-1cs-pi5 is substituted on Pi 5.
- Load:   dtoverlay=spi3-1cs,<param>=<val>
- Params: cs0_pin                 GPIO pin for CS0 (default 0 - BCM SPI3_CE0).
-         cs0_spidev              Set to 'off' to prevent the creation of a
-@@ -4027,10 +4157,22 @@ Params: cs0_pin                 GPIO pin
-                                 is 'on' or enabled).
- 
- 
-+Name:   spi3-1cs-pi5
-+Info:   Enables spi3 on GPIOs 5-7 with a single chip select (CS) line and
-+        associated spidev dev node. The gpio pin number for the CS line and
-+        spidev device node creation are configurable. Pi 5 only.
-+Load:   dtoverlay=spi3-1cs-pi5,<param>=<val>
-+Params: cs0_pin                 GPIO pin for CS0 (default 4).
-+        cs0_spidev              Set to 'off' to prevent the creation of a
-+                                userspace device node /dev/spidev3.0 (default
-+                                is 'on' or enabled).
-+
-+
- Name:   spi3-2cs
--Info:   Enables spi3 with two chip select (CS) lines and associated spidev
--        dev nodes. The gpio pin numbers for the CS lines and spidev device node
--        creation are configurable. BCM2711 only.
-+Info:   Enables spi3 on GPIO2 1-3 with two chip select (CS) lines and
-+        associated spidev dev nodes. The gpio pin numbers for the CS lines and
-+        spidev device node creation are configurable. BCM2711 only,
-+        spi3-2cs-pi5 is substituted on Pi 5.
- Load:   dtoverlay=spi3-2cs,<param>=<val>
- Params: cs0_pin                 GPIO pin for CS0 (default 0 - BCM SPI3_CE0).
-         cs1_pin                 GPIO pin for CS1 (default 24 - BCM SPI3_CE1).
-@@ -4042,10 +4184,25 @@ Params: cs0_pin                 GPIO pin
-                                 is 'on' or enabled).
- 
- 
-+Name:   spi3-2cs-pi5
-+Info:   Enables spi3 on GPIOs 5-7 with two chip select (CS) lines and
-+        associated spidev dev nodes. The gpio pin numbers for the CS lines and
-+        spidev device node creation are configurable. Pi 5 only.
-+Load:   dtoverlay=spi3-2cs-pi5,<param>=<val>
-+Params: cs0_pin                 GPIO pin for CS0 (default 4).
-+        cs1_pin                 GPIO pin for CS1 (default 25).
-+        cs0_spidev              Set to 'off' to prevent the creation of a
-+                                userspace device node /dev/spidev3.0 (default
-+                                is 'on' or enabled).
-+        cs1_spidev              Set to 'off' to prevent the creation of a
-+                                userspace device node /dev/spidev3.1 (default
-+                                is 'on' or enabled).
-+
-+
- Name:   spi4-1cs
--Info:   Enables spi4 with a single chip select (CS) line and associated spidev
--        dev node. The gpio pin number for the CS line and spidev device node
--        creation are configurable. BCM2711 only.
-+Info:   Enables spi4 on GPIOs 5-7 with a single chip select (CS) line and
-+        associated spidev dev node. The gpio pin number for the CS line and
-+        spidev device node creation are configurable. BCM2711 only.
- Load:   dtoverlay=spi4-1cs,<param>=<val>
- Params: cs0_pin                 GPIO pin for CS0 (default 4 - BCM SPI4_CE0).
-         cs0_spidev              Set to 'off' to prevent the creation of a
-@@ -4054,9 +4211,9 @@ Params: cs0_pin                 GPIO pin
- 
- 
- Name:   spi4-2cs
--Info:   Enables spi4 with two chip select (CS) lines and associated spidev
--        dev nodes. The gpio pin numbers for the CS lines and spidev device node
--        creation are configurable. BCM2711 only.
-+Info:   Enables spi4 on GPIOs 5-6 with two chip select (CS) lines and
-+        associated spidev dev nodes. The gpio pin numbers for the CS lines and
-+        spidev device node creation are configurable. BCM2711 only.
- Load:   dtoverlay=spi4-2cs,<param>=<val>
- Params: cs0_pin                 GPIO pin for CS0 (default 4 - BCM SPI4_CE0).
-         cs1_pin                 GPIO pin for CS1 (default 25 - BCM SPI4_CE1).
-@@ -4069,23 +4226,27 @@ Params: cs0_pin                 GPIO pin
- 
- 
- Name:   spi5-1cs
--Info:   Enables spi5 with a single chip select (CS) line and associated spidev
--        dev node. The gpio pin numbers for the CS lines and spidev device node
--        creation are configurable. BCM2711 only.
-+Info:   Enables spi5 on GPIOs 13-15 with a single chip select (CS) line and
-+        associated spidev dev node. The gpio pin numbers for the CS lines and
-+        spidev device node creation are configurable. BCM2711 and Pi 5.
- Load:   dtoverlay=spi5-1cs,<param>=<val>
--Params: cs0_pin                 GPIO pin for CS0 (default 12 - BCM SPI5_CE0).
-+Params: cs0_pin                 GPIO pin for CS0 (default 12).
-         cs0_spidev              Set to 'off' to prevent the creation of a
-                                 userspace device node /dev/spidev5.0 (default
-                                 is 'on' or enabled).
- 
- 
-+Name:   spi5-1cs-pi5
-+Info:   See spi5-1cs
-+
-+
- Name:   spi5-2cs
--Info:   Enables spi5 with two chip select (CS) lines and associated spidev
--        dev nodes. The gpio pin numbers for the CS lines and spidev device node
--        creation are configurable. BCM2711 only.
-+Info:   Enables spi5 on GPIOs 13-15 with two chip select (CS) lines and
-+        associated spidev dev nodes. The gpio pin numbers for the CS lines and
-+        spidev device node creation are configurable. BCM2711 and Pi 5.
- Load:   dtoverlay=spi5-2cs,<param>=<val>
--Params: cs0_pin                 GPIO pin for CS0 (default 12 - BCM SPI5_CE0).
--        cs1_pin                 GPIO pin for CS1 (default 26 - BCM SPI5_CE1).
-+Params: cs0_pin                 GPIO pin for CS0 (default 12).
-+        cs1_pin                 GPIO pin for CS1 (default 26).
-         cs0_spidev              Set to 'off' to prevent the creation of a
-                                 userspace device node /dev/spidev5.0 (default
-                                 is 'on' or enabled).
-@@ -4094,6 +4255,10 @@ Params: cs0_pin                 GPIO pin
-                                 is 'on' or enabled).
- 
- 
-+Name:   spi5-2cs-pi5
-+Info:   See spi5-2cs
-+
-+
- Name:   spi6-1cs
- Info:   Enables spi6 with a single chip select (CS) line and associated spidev
-         dev node. The gpio pin number for the CS line and spidev device node
-@@ -4296,6 +4461,12 @@ Params: txd0_pin                GPIO pin
-                                 7(Alt3) for 32&33, 6(Alt2) for 36&37
- 
- 
-+Name:   uart0-pi5
-+Info:   Enable uart 0 on GPIOs 14-15. Pi 5 only.
-+Load:   dtoverlay=uart0-pi5,<param>
-+Params: ctsrts                  Enable CTS/RTS on GPIOs 16-17 (default off)
-+
-+
- Name:   uart1
- Info:   Change the pin usage of uart1
- Load:   dtoverlay=uart1,<param>=<val>
-@@ -4304,24 +4475,48 @@ Params: txd1_pin                GPIO pin
-         rxd1_pin                GPIO pin for RXD1 (15, 33 or 41 - default 15)
- 
- 
-+Name:   uart1-pi5
-+Info:   Enable uart 1 on GPIOs 0-1. Pi 5 only.
-+Load:   dtoverlay=uart1-pi5,<param>
-+Params: ctsrts                  Enable CTS/RTS on GPIOs 2-3 (default off)
-+
-+
- Name:   uart2
- Info:   Enable uart 2 on GPIOs 0-3. BCM2711 only.
- Load:   dtoverlay=uart2,<param>
- Params: ctsrts                  Enable CTS/RTS on GPIOs 2-3 (default off)
- 
- 
-+Name:   uart2-pi5
-+Info:   Enable uart 2 on GPIOs 4-5. Pi 5 only.
-+Load:   dtoverlay=uart2-pi5,<param>
-+Params: ctsrts                  Enable CTS/RTS on GPIOs 6-7 (default off)
-+
-+
- Name:   uart3
- Info:   Enable uart 3 on GPIOs 4-7. BCM2711 only.
- Load:   dtoverlay=uart3,<param>
- Params: ctsrts                  Enable CTS/RTS on GPIOs 6-7 (default off)
- 
- 
-+Name:   uart3-pi5
-+Info:   Enable uart 3 on GPIOs 8-9. Pi 5 only.
-+Load:   dtoverlay=uart3-pi5,<param>
-+Params: ctsrts                  Enable CTS/RTS on GPIOs 10-11 (default off)
-+
-+
- Name:   uart4
- Info:   Enable uart 4 on GPIOs 8-11. BCM2711 only.
- Load:   dtoverlay=uart4,<param>
- Params: ctsrts                  Enable CTS/RTS on GPIOs 10-11 (default off)
- 
- 
-+Name:   uart4-pi5
-+Info:   Enable uart 4 on GPIOs 12-13. Pi 5 only.
-+Load:   dtoverlay=uart4-pi5,<param>
-+Params: ctsrts                  Enable CTS/RTS on GPIOs 14-15 (default off)
-+
-+
- Name:   uart5
- Info:   Enable uart 5 on GPIOs 12-15. BCM2711 only.
- Load:   dtoverlay=uart5,<param>
-@@ -4530,6 +4725,8 @@ Params: sizex                   Touchscr
-         invy                    Touchscreen inverted y axis
-         swapxy                  Touchscreen swapped x y axis
-         disable_touch           Disables the touch screen overlay driver
-+        dsi0                    Use DSI0 and i2c_csi_dsi0 (rather than
-+                                the default DSI1 and i2c_csi_dsi).
- 
- 
- Name:   vc4-kms-dsi-lt070me05000
-@@ -4579,6 +4776,8 @@ Params: 2_8_inch                2.8" 480
-         invx                    Touchscreen inverted x axis
-         invy                    Touchscreen inverted y axis
-         swapxy                  Touchscreen swapped x y axis
-+        dsi0                    Use DSI0 and i2c_csi_dsi0 (rather than
-+                                the default DSI1 and i2c_csi_dsi).
- 
- 
- Name:   vc4-kms-kippah-7inch
-@@ -4633,6 +4832,9 @@ Params: cma-512                 CMA is 5
-         nohdmi1                 Disable HDMI 1 output
- 
- 
-+Name:   vc4-kms-v3d-pi5
-+Info:   See vc4-kms-v3d-pi4 (this is the Pi 5 version)
-+
- 
- Name:   vc4-kms-vga666
- Info:   Enable the VGA666 (resistor ladder ADC) for the vc4-kms-v3d driver.
---- a/arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts
-@@ -23,7 +23,7 @@
- 	};
- 
- 	fragment@1 {
--		target = <&i2s>;
-+		target = <&i2s_clk_consumer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -33,7 +33,7 @@
- 		target = <&sound>;
- 		__overlay__ {
- 			compatible = "adi,adau1977-adc";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_consumer>;
- 			status = "okay";
- 		};
- 	};
---- a/arch/arm/boot/dts/overlays/adau7002-simple-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/adau7002-simple-overlay.dts
-@@ -5,7 +5,7 @@
-     compatible = "brcm,bcm2835";
- 
-     fragment@0 {
--        target = <&i2s>;
-+        target = <&i2s_clk_producer>;
-         __overlay__ {
-             status = "okay";
-         };
-@@ -37,7 +37,7 @@
-                     "PDM_DAT", "Microphone Jack";
-             status = "okay";
-             simple-audio-card,cpu {
--                sound-dai = <&i2s>;
-+                sound-dai = <&i2s_clk_producer>;
-             };
-             dailink0_slave: simple-audio-card,codec {
-                 sound-dai = <&adau7002_codec>;
---- a/arch/arm/boot/dts/overlays/akkordion-iqdacplus-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/akkordion-iqdacplus-overlay.dts
-@@ -6,7 +6,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_producer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -38,7 +38,7 @@
- 			card_name = "Akkordion";
- 			dai_name = "IQaudIO DAC";
- 			dai_stream_name = "IQaudIO DAC HiFi";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_producer>;
- 			status = "okay";
- 		};
- 	};
---- a/arch/arm/boot/dts/overlays/allo-boss-dac-pcm512x-audio-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/allo-boss-dac-pcm512x-audio-overlay.dts
-@@ -18,8 +18,8 @@
- 		};
- 	};
- 
--	fragment@1 {
--		target = <&i2s>;
-+	frag1: fragment@1 {
-+		target = <&i2s_clk_consumer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -46,7 +46,7 @@
- 		target = <&sound>;
- 		boss_dac: __overlay__ {
- 			compatible = "allo,boss-dac";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_consumer>;
- 			mute-gpios = <&gpio 6 1>;
- 			status = "okay";
- 		};
-@@ -54,6 +54,8 @@
- 
- 	__overrides__ {
- 		24db_digital_gain = <&boss_dac>,"allo,24db_digital_gain?";
--		slave = <&boss_dac>,"allo,slave?";
-+		slave = <&boss_dac>,"allo,slave?",
-+			<&frag1>,"target:0=",<&i2s_clk_producer>,
-+			<&boss_dac>,"i2s-controller:0=",<&i2s_clk_producer>;
- 	};
- };
---- a/arch/arm/boot/dts/overlays/allo-boss2-dac-audio-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/allo-boss2-dac-audio-overlay.dts
-@@ -8,7 +8,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_consumer>;
- 		__overlay__ {
- 			#sound-dai-cells = <0>;
- 			status = "okay";
---- a/arch/arm/boot/dts/overlays/allo-digione-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/allo-digione-overlay.dts
-@@ -6,7 +6,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_consumer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -35,7 +35,7 @@
- 		target = <&sound>;
- 		__overlay__ {
- 			compatible = "allo,allo-digione";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_consumer>;
- 			status = "okay";
- 			clock44-gpio = <&gpio 5 0>;
- 			clock48-gpio = <&gpio 6 0>;
---- a/arch/arm/boot/dts/overlays/allo-katana-dac-audio-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/allo-katana-dac-audio-overlay.dts
-@@ -9,7 +9,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_consumer>;
- 		__overlay__ {
- 			#sound-dai-cells = <0>;
- 			status = "okay";
---- a/arch/arm/boot/dts/overlays/allo-piano-dac-pcm512x-audio-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/allo-piano-dac-pcm512x-audio-overlay.dts
-@@ -16,7 +16,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_producer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -42,7 +42,7 @@
- 		target = <&sound>;
- 		piano_dac: __overlay__ {
- 			compatible = "allo,piano-dac";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_producer>;
- 			status = "okay";
- 		};
- 	};
---- a/arch/arm/boot/dts/overlays/allo-piano-dac-plus-pcm512x-audio-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/allo-piano-dac-plus-pcm512x-audio-overlay.dts
-@@ -6,7 +6,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_producer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -41,7 +41,7 @@
- 		piano_dac: __overlay__ {
- 			compatible = "allo,piano-dac-plus";
- 			audio-codec = <&allo_pcm5122_4c &allo_pcm5122_4d>;
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_producer>;
- 			mute1-gpios = <&gpio 6 1>;
- 			mute2-gpios = <&gpio 25 1>;
- 			status = "okay";
---- a/arch/arm/boot/dts/overlays/applepi-dac-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/applepi-dac-overlay.dts
-@@ -16,7 +16,7 @@
-                 format = "i2s";
- 
-                 p_cpu_dai: cpu {
--                    sound-dai = <&i2s>;
-+                    sound-dai = <&i2s_clk_producer>;
-                     dai-tdm-slot-num = <2>;
-                     dai-tdm-slot-width = <32>;
-                 };
-@@ -40,7 +40,7 @@
-     };
- 
-     fragment@2 {
--        target = <&i2s>;
-+        target = <&i2s_clk_producer>;
-         __overlay__ {
-             #sound-dai-cells = <0>;
-             status = "okay";
---- a/arch/arm/boot/dts/overlays/arducam-64mp-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/arducam-64mp-overlay.dts
-@@ -67,7 +67,7 @@
- 		rotation = <&cam_node>,"rotation:0";
- 		orientation = <&cam_node>,"orientation:0";
- 		media-controller = <&csi>,"brcm,media-controller?";
--		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_csi_dsi0>,
- 		       <&csi_frag>, "target:0=",<&csi0>,
- 		       <&clk_frag>, "target:0=",<&cam0_clk>,
- 		       <&cam_node>, "clocks:0=",<&cam0_clk>,
---- a/arch/arm/boot/dts/overlays/arducam-pivariety-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/arducam-pivariety-overlay.dts
-@@ -85,7 +85,7 @@
- 		rotation = <&arducam_pivariety>,"rotation:0";
- 		orientation = <&arducam_pivariety>,"orientation:0";
- 		media-controller = <&csi>,"brcm,media-controller?";
--		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_csi_dsi0>,
- 		       <&csi_frag>, "target:0=",<&csi0>,
- 		       <&clk_frag>, "target:0=",<&cam0_clk>,
- 		       <&arducam_pivariety>, "clocks:0=",<&cam0_clk>,
---- a/arch/arm/boot/dts/overlays/audioinjector-addons-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/audioinjector-addons-overlay.dts
-@@ -6,7 +6,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_producer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -48,7 +48,7 @@
- 			mult-gpios = <&gpio 27 0>, <&gpio 22 0>, <&gpio 23 0>,
- 				     <&gpio 24 0>;
- 			reset-gpios = <&gpio 5 0>;
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_producer>;
- 			codec = <&cs42448>;
- 			status = "okay";
- 		};
---- a/arch/arm/boot/dts/overlays/audioinjector-bare-i2s-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/audioinjector-bare-i2s-overlay.dts
-@@ -6,7 +6,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_producer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -27,7 +27,7 @@
- 		target = <&sound>;
- 		__overlay__ {
- 			compatible = "simple-audio-card";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_producer>;
- 			status = "okay";
- 
- 			simple-audio-card,name = "audioinjector-bare";
-@@ -37,7 +37,7 @@
- 			simple-audio-card,frame-master = <&dailink0_master>;
- 
- 			dailink0_master: simple-audio-card,cpu {
--				sound-dai = <&i2s>;
-+				sound-dai = <&i2s_clk_producer>;
- 				dai-tdm-slot-num = <2>;
- 				dai-tdm-slot-width = <32>;
- 			};
---- a/arch/arm/boot/dts/overlays/audioinjector-isolated-soundcard-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/audioinjector-isolated-soundcard-overlay.dts
-@@ -6,7 +6,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_consumer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -47,7 +47,7 @@
- 		snd: __overlay__ {
- 			compatible = "ai,audioinjector-isolated-soundcard";
- 			mute-gpios = <&gpio 17 0>;
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_consumer>;
- 			codec = <&cs4272>;
- 			status = "okay";
- 		};
---- a/arch/arm/boot/dts/overlays/audioinjector-ultra-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/audioinjector-ultra-overlay.dts
-@@ -6,7 +6,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_consumer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -33,7 +33,7 @@
- 		target = <&sound>;
- 		__overlay__ {
- 			compatible = "simple-audio-card";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_consumer>;
- 			status = "okay";
- 
- 			simple-audio-card,name = "audioinjector-ultra";
-@@ -57,7 +57,7 @@
- 			simple-audio-card,frame-master = <&sound_master>;
- 
- 			simple-audio-card,cpu {
--				sound-dai = <&i2s>;
-+				sound-dai = <&i2s_clk_consumer>;
- 				dai-tdm-slot-num = <2>;
- 				dai-tdm-slot-width = <32>;
- 			};
---- a/arch/arm/boot/dts/overlays/audioinjector-wm8731-audio-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/audioinjector-wm8731-audio-overlay.dts
-@@ -6,7 +6,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_consumer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -32,7 +32,7 @@
- 		target = <&sound>;
- 		__overlay__ {
- 			compatible = "ai,audioinjector-pi-soundcard";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_consumer>;
- 			status = "okay";
- 		};
- 	};
---- a/arch/arm/boot/dts/overlays/audiosense-pi-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/audiosense-pi-overlay.dts
-@@ -8,7 +8,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_consumer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -75,7 +75,7 @@
- 		target = <&sound>;
- 		__overlay__ {
- 			compatible = "as,audiosense-pi";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_consumer>;
- 			status = "okay";
- 		};
- 	};
---- a/arch/arm/boot/dts/overlays/chipdip-dac-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/chipdip-dac-overlay.dts
-@@ -9,7 +9,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_consumer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -32,7 +32,7 @@
- 		target = <&sound>;
- 		__overlay__ {
- 			compatible = "chipdip,chipdip-dac";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_consumer>;
- 			sr0-gpios = <&gpio 5 0>;
- 			sr1-gpios = <&gpio 6 0>;
- 			sr2-gpios = <&gpio 12 0>;
---- a/arch/arm/boot/dts/overlays/cirrus-wm5102-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/cirrus-wm5102-overlay.dts
-@@ -9,7 +9,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_consumer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -165,7 +165,7 @@
- 		target = <&sound>;
- 		__overlay__ {
- 			compatible = "wlf,rpi-cirrus";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_consumer>;
- 			status = "okay";
- 		};
- 	};
---- a/arch/arm/boot/dts/overlays/dacberry400-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/dacberry400-overlay.dts
-@@ -5,7 +5,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_producer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -62,7 +62,7 @@
- 		target = <&sound>;
- 		__overlay__ {
- 			compatible = "osaelectronics,dacberry400";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_producer>;
- 			status = "okay";
- 		};
- 	};
---- a/arch/arm/boot/dts/overlays/dionaudio-kiwi-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/dionaudio-kiwi-overlay.dts
-@@ -11,7 +11,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_producer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -32,7 +32,7 @@
- 		target = <&sound>;
- 		__overlay__ {
- 			compatible = "dionaudio,dionaudio-kiwi";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_producer>;
- 			status = "okay";
- 		};
- 	};
---- a/arch/arm/boot/dts/overlays/dionaudio-loco-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/dionaudio-loco-overlay.dts
-@@ -11,7 +11,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_producer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -32,7 +32,7 @@
- 		target = <&sound>;
- 		__overlay__ {
- 			compatible = "dionaudio,loco-pcm5242-tpa3118";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_producer>;
- 			status = "okay";
- 		};
- 	};
---- a/arch/arm/boot/dts/overlays/dionaudio-loco-v2-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/dionaudio-loco-v2-overlay.dts
-@@ -15,13 +15,13 @@
- 		target = <&sound>;
- 		frag0: __overlay__ {
- 			compatible = "dionaudio,dionaudio-loco-v2";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_producer>;
- 			status = "okay";
- 		};
- 	};
- 
- 	fragment@1 {
--		target = <&i2s>;
-+		target = <&i2s_clk_producer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/disable-bt-pi5-overlay.dts
-@@ -0,0 +1,17 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/* Disable Bluetooth */
-+
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/{
-+	compatible = "brcm,bcm2712";
-+
-+	fragment@0 {
-+		target = <&bluetooth>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+};
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/disable-wifi-pi5-overlay.dts
-@@ -0,0 +1,13 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2712";
-+
-+	fragment@0 {
-+		target = <&sdio2>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+};
---- a/arch/arm/boot/dts/overlays/draws-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/draws-overlay.dts
-@@ -9,7 +9,7 @@
- / {
-     compatible = "brcm,bcm2835";
-     fragment@0 {
--        target = <&i2s>;
-+        target = <&i2s_clk_producer>;
-         __overlay__ {
-             status = "okay";
-         };
-@@ -131,7 +131,7 @@
-         target = <&sound>;
-         snd: __overlay__ {
-             compatible = "simple-audio-card";
--            i2s-controller = <&i2s>;
-+            i2s-controller = <&i2s_clk_producer>;
-             status = "okay";
- 
-             simple-audio-card,name = "draws";
-@@ -153,7 +153,7 @@
-                 "Line Out", "LOL";
- 
-             dailink0_master: simple-audio-card,cpu {
--                sound-dai = <&i2s>;
-+                sound-dai = <&i2s_clk_producer>;
-             };
- 
-             simple-audio-card,codec {
---- a/arch/arm/boot/dts/overlays/edt-ft5406-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/edt-ft5406-overlay.dts
-@@ -25,21 +25,21 @@
- 	};
- 
- 	__overrides__ {
--		i2c0 = <&frag13>,"target:0=",<&i2c0>;
--		i2c1 = <&frag13>, "target?=0",
--		       <&frag13>, "target-path=i2c1",
-+		i2c0 = <&ts_i2c_frag>,"target:0=",<&i2c0>;
-+		i2c1 = <&ts_i2c_frag>, "target?=0",
-+		       <&ts_i2c_frag>, "target-path=i2c1",
- 		       <0>,"-0-1";
--		i2c3 = <&frag13>, "target?=0",
--		       <&frag13>, "target-path=i2c3",
-+		i2c3 = <&ts_i2c_frag>, "target?=0",
-+		       <&ts_i2c_frag>, "target-path=i2c3",
- 		       <0>,"-0-1";
--		i2c4 = <&frag13>, "target?=0",
--		       <&frag13>, "target-path=i2c4",
-+		i2c4 = <&ts_i2c_frag>, "target?=0",
-+		       <&ts_i2c_frag>, "target-path=i2c4",
- 		       <0>,"-0-1";
--		i2c5 = <&frag13>, "target?=0",
--		       <&frag13>, "target-path=i2c5",
-+		i2c5 = <&ts_i2c_frag>, "target?=0",
-+		       <&ts_i2c_frag>, "target-path=i2c5",
- 		       <0>,"-0-1";
--		i2c6 = <&frag13>, "target?=0",
--		       <&frag13>, "target-path=i2c6",
-+		i2c6 = <&ts_i2c_frag>, "target?=0",
-+		       <&ts_i2c_frag>, "target-path=i2c6",
- 		       <0>,"-0-1";
- 		addr = <&ft5406>,"reg:0";
- 	};
---- a/arch/arm/boot/dts/overlays/edt-ft5406.dtsi
-+++ b/arch/arm/boot/dts/overlays/edt-ft5406.dtsi
-@@ -37,7 +37,7 @@
- 		};
- 	};
- 
--	frag13: fragment@13 {
-+	ts_i2c_frag: fragment@13 {
- 		target = <&i2c_csi_dsi>;
- 		i2cbus: __overlay__ {
- 			status = "okay";
---- a/arch/arm/boot/dts/overlays/fe-pi-audio-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/fe-pi-audio-overlay.dts
-@@ -53,7 +53,7 @@
- 	};
- 
- 	fragment@3 {
--		target = <&i2s>;
-+		target = <&i2s_clk_consumer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -63,7 +63,7 @@
- 		target = <&sound>;
- 		__overlay__ {
- 			compatible = "fe-pi,fe-pi-audio";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_consumer>;
- 			status = "okay";
- 		};
- 	};
---- a/arch/arm/boot/dts/overlays/ghost-amp-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/ghost-amp-overlay.dts
-@@ -14,7 +14,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_producer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -43,7 +43,7 @@
- 		target = <&sound>;
- 		iqaudio_dac: __overlay__ {
- 			compatible = "iqaudio,iqaudio-dac";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_producer>;
- 			mute-gpios = <&amp 0 0>;
- 			iqaudio-dac,auto-mute-amp;
- 			status = "okay";
---- a/arch/arm/boot/dts/overlays/googlevoicehat-soundcard-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/googlevoicehat-soundcard-overlay.dts
-@@ -6,7 +6,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_producer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -42,7 +42,7 @@
- 		target = <&sound>;
- 		__overlay__ {
- 			compatible = "googlevoicehat,googlevoicehat-soundcard";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_producer>;
- 			status = "okay";
- 		};
- 	};
---- a/arch/arm/boot/dts/overlays/hifiberry-amp-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/hifiberry-amp-overlay.dts
-@@ -6,7 +6,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_producer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -32,7 +32,7 @@
- 		target = <&sound>;
- 		__overlay__ {
- 			compatible = "hifiberry,hifiberry-amp";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_producer>;
- 			status = "okay";
- 		};
- 	};
---- a/arch/arm/boot/dts/overlays/hifiberry-amp100-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/hifiberry-amp100-overlay.dts
-@@ -15,8 +15,8 @@
- 		};
- 	};
- 
--	fragment@1 {
--		target = <&i2s>;
-+	frag1: fragment@1 {
-+		target = <&i2s_clk_consumer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -46,7 +46,7 @@
- 		target = <&sound>;
- 		hifiberry_dacplus: __overlay__ {
- 			compatible = "hifiberry,hifiberry-dacplus";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_consumer>;
- 			status = "okay";
- 			mute-gpio = <&gpio 4 0>;
- 			reset-gpio = <&gpio 17 0x11>;
-@@ -56,7 +56,10 @@
- 	__overrides__ {
- 		24db_digital_gain =
- 			<&hifiberry_dacplus>,"hifiberry,24db_digital_gain?";
--		slave = <&hifiberry_dacplus>,"hifiberry-dacplus,slave?";
-+		slave = <&hifiberry_dacplus>,"hifiberry-dacplus,slave?",
-+			<&frag1>,"target:0=",<&i2s_clk_producer>,
-+			<&hifiberry_dacplus>,"i2s-controller:0=",<&i2s_clk_producer>;
-+
- 		leds_off = <&hifiberry_dacplus>,"hifiberry-dacplus,leds_off?";
- 		mute_ext_ctl = <&hifiberry_dacplus>,"hifiberry-dacplus,mute_ext_ctl:0";
- 		auto_mute = <&hifiberry_dacplus>,"hifiberry-dacplus,auto_mute?";
---- a/arch/arm/boot/dts/overlays/hifiberry-amp3-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/hifiberry-amp3-overlay.dts
-@@ -10,7 +10,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_producer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -50,7 +50,7 @@
- 		target = <&sound>;
- 		__overlay__ {
- 			compatible = "hifiberry,hifiberry-amp3";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_producer>;
- 			status = "okay";
- 		};
- 	};
---- a/arch/arm/boot/dts/overlays/hifiberry-dac-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/hifiberry-dac-overlay.dts
-@@ -6,7 +6,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_producer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -27,7 +27,7 @@
- 		target = <&sound>;
- 		__overlay__ {
- 			compatible = "hifiberry,hifiberry-dac";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_producer>;
- 			status = "okay";
- 		};
- 	};
---- a/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts
-@@ -15,8 +15,8 @@
- 		};
- 	};
- 
--	fragment@1 {
--		target = <&i2s>;
-+	frag1: fragment@1 {
-+		target = <&i2s_clk_consumer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -51,7 +51,7 @@
- 		target = <&sound>;
- 		hifiberry_dacplus: __overlay__ {
- 			compatible = "hifiberry,hifiberry-dacplus";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_consumer>;
- 			status = "okay";
- 		};
- 	};
-@@ -59,7 +59,10 @@
- 	__overrides__ {
- 		24db_digital_gain =
- 			<&hifiberry_dacplus>,"hifiberry,24db_digital_gain?";
--		slave = <&hifiberry_dacplus>,"hifiberry-dacplus,slave?";
-+		slave = <&hifiberry_dacplus>,"hifiberry-dacplus,slave?",
-+			<&frag1>,"target:0=",<&i2s_clk_producer>,
-+			<&hifiberry_dacplus>,"i2s-controller:0=",<&i2s_clk_producer>;
-+
- 		leds_off = <&hifiberry_dacplus>,"hifiberry-dacplus,leds_off?";
- 	};
- };
---- a/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts
-@@ -15,8 +15,8 @@
- 		};
- 	};
- 
--	fragment@1 {
--		target = <&i2s>;
-+	frag1: fragment@1 {
-+		target = <&i2s_clk_consumer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -58,7 +58,7 @@
- 		target = <&sound>;
- 		hifiberry_dacplusadc: __overlay__ {
- 			compatible = "hifiberry,hifiberry-dacplusadc";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_consumer>;
- 			status = "okay";
- 		};
- 	};
-@@ -66,7 +66,9 @@
- 	__overrides__ {
- 		24db_digital_gain =
- 			<&hifiberry_dacplusadc>,"hifiberry,24db_digital_gain?";
--		slave = <&hifiberry_dacplusadc>,"hifiberry-dacplusadc,slave?";
-+		slave = <&hifiberry_dacplusadc>,"hifiberry-dacplusadc,slave?",
-+			<&frag1>,"target:0=",<&i2s_clk_producer>,
-+			<&hifiberry_dacplusadc>,"i2s-controller:0=",<&i2s_clk_producer>;
- 		leds_off = <&hifiberry_dacplusadc>,"hifiberry-dacplusadc,leds_off?";
- 	};
- };
---- a/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts
-@@ -15,8 +15,8 @@
- 		};
- 	};
- 
--	fragment@1 {
--		target = <&i2s>;
-+	frag1: fragment@1 {
-+		target = <&i2s_clk_consumer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -56,7 +56,7 @@
- 		hifiberry_dacplusadcpro: __overlay__ {
- 			compatible = "hifiberry,hifiberry-dacplusadcpro";
- 			audio-codec = <&hb_dac &hb_adc>;
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_consumer>;
- 			status = "okay";
- 		};
- 	};
-@@ -64,7 +64,9 @@
- 	__overrides__ {
- 		24db_digital_gain =
- 			<&hifiberry_dacplusadcpro>,"hifiberry-dacplusadcpro,24db_digital_gain?";
--		slave = <&hifiberry_dacplusadcpro>,"hifiberry-dacplusadcpro,slave?";
-+		slave = <&hifiberry_dacplusadcpro>,"hifiberry-dacplusadcpro,slave?",
-+			<&frag1>,"target:0=",<&i2s_clk_producer>,
-+			<&hifiberry_dacplusadcpro>,"i2s-controller:0=",<&i2s_clk_producer>;
- 		leds_off = <&hifiberry_dacplusadcpro>,"hifiberry-dacplusadcpro,leds_off?";
- 	};
- };
---- a/arch/arm/boot/dts/overlays/hifiberry-dacplusdsp-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusdsp-overlay.dts
-@@ -6,7 +6,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_producer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -27,7 +27,7 @@
- 		target = <&sound>;
- 		__overlay__ {
- 			compatible = "hifiberrydacplusdsp,hifiberrydacplusdsp-soundcard";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_producer>;
- 			status = "okay";
- 		};
- 	};
---- a/arch/arm/boot/dts/overlays/hifiberry-dacplushd-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/hifiberry-dacplushd-overlay.dts
-@@ -8,7 +8,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_consumer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -84,7 +84,7 @@
- 		target = <&sound>;
- 		__overlay__ {
- 			compatible = "hifiberry,hifiberry-dacplushd";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_consumer>;
- 			clocks = <&pll 0>;
- 			reset-gpio = <&gpio 16 GPIO_ACTIVE_LOW>;
- 			status = "okay";
---- a/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts
-@@ -6,7 +6,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_consumer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -34,7 +34,7 @@
- 		target = <&sound>;
- 		__overlay__ {
- 			compatible = "hifiberry,hifiberry-digi";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_consumer>;
- 			status = "okay";
- 		};
- 	};
---- a/arch/arm/boot/dts/overlays/hifiberry-digi-pro-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/hifiberry-digi-pro-overlay.dts
-@@ -6,7 +6,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_consumer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -34,7 +34,7 @@
- 		target = <&sound>;
- 		__overlay__ {
- 			compatible = "hifiberry,hifiberry-digi";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_consumer>;
- 			status = "okay";
- 			clock44-gpio = <&gpio 5 0>;
- 			clock48-gpio = <&gpio 6 0>;
---- a/arch/arm/boot/dts/overlays/i-sabre-q2m-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/i-sabre-q2m-overlay.dts
-@@ -9,13 +9,13 @@
- 		target = <&sound>;
- 		frag0: __overlay__ {
- 			compatible = "audiophonics,i-sabre-q2m";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_producer>;
- 			status = "okay";
- 		};
- 	};
- 
- 	fragment@1 {
--		target = <&i2s>;
-+		target = <&i2s_clk_producer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/i2c0-pi5-overlay.dts
-@@ -0,0 +1,34 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2712";
-+
-+	fragment@0 {
-+		target = <&i2c0>;
-+		frag0: __overlay__ {
-+			status = "okay";
-+			clock-frequency = <100000>;
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&frag0>;
-+		__overlay__ {
-+			pinctrl-0 = <&rp1_i2c0_0_1>;
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&frag0>;
-+		__dormant__ {
-+			pinctrl-0 = <&rp1_i2c0_8_9>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		pins_0_1 = <0>,"+1-2";
-+		pins_8_9 = <0>,"-1+2";
-+		baudrate = <&frag0>, "clock-frequency:0";
-+	};
-+};
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/i2c1-pi5-overlay.dts
-@@ -0,0 +1,34 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2712";
-+
-+	fragment@0 {
-+		target = <&i2c1>;
-+		frag0: __overlay__ {
-+			status = "okay";
-+			clock-frequency = <100000>;
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&frag0>;
-+		__overlay__ {
-+			pinctrl-0 = <&rp1_i2c1_2_3>;
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&frag0>;
-+		__dormant__ {
-+			pinctrl-0 = <&rp1_i2c1_10_11>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		pins_2_3 = <0>,"+1-2";
-+		pins_10_11 = <0>,"-1+2";
-+		baudrate = <&frag0>, "clock-frequency:0";
-+	};
-+};
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/i2c2-pi5-overlay.dts
-@@ -0,0 +1,21 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2712";
-+
-+	fragment@0 {
-+		target = <&i2c2>;
-+		frag0: __overlay__ {
-+			status = "okay";
-+			clock-frequency = <100000>;
-+			pinctrl-0 = <&rp1_i2c2_4_5>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		pins_4_5 = <&frag0>,"pinctrl-0:0=", <&rp1_i2c2_4_5>;
-+		pins_12_13 = <&frag0>,"pinctrl-0:0=", <&rp1_i2c2_12_13>;
-+		baudrate = <&frag0>, "clock-frequency:0";
-+	};
-+};
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/i2c3-pi5-overlay.dts
-@@ -0,0 +1,22 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2712";
-+
-+	fragment@0 {
-+		target = <&i2c3>;
-+		frag0: __overlay__ {
-+			status = "okay";
-+			clock-frequency = <100000>;
-+			pinctrl-0 = <&rp1_i2c3_6_7>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		pins_6_7 = <&frag0>,"pinctrl-0:0=", <&rp1_i2c3_6_7>;
-+		pins_14_15 = <&frag0>,"pinctrl-0:0=", <&rp1_i2c3_14_15>;
-+		pins_22_23 = <&frag0>,"pinctrl-0:0=", <&rp1_i2c3_22_23>;
-+		baudrate = <&frag0>, "clock-frequency:0";
-+	};
-+};
---- a/arch/arm/boot/dts/overlays/i2s-dac-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/i2s-dac-overlay.dts
-@@ -6,7 +6,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_producer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -27,7 +27,7 @@
- 		target = <&sound>;
- 		__overlay__ {
- 			compatible = "rpi,rpi-dac";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_producer>;
- 			status = "okay";
- 		};
- 	};
---- a/arch/arm/boot/dts/overlays/imx219-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/imx219-overlay.dts
-@@ -69,7 +69,7 @@
- 		rotation = <&cam_node>,"rotation:0";
- 		orientation = <&cam_node>,"orientation:0";
- 		media-controller = <&csi>,"brcm,media-controller?";
--		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_csi_dsi0>,
- 		       <&csi_frag>, "target:0=",<&csi0>,
- 		       <&clk_frag>, "target:0=",<&cam0_clk>,
- 		       <&cam_node>, "clocks:0=",<&cam0_clk>,
---- a/arch/arm/boot/dts/overlays/imx258-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/imx258-overlay.dts
-@@ -110,7 +110,7 @@
- 		rotation = <&cam_node>,"rotation:0";
- 		orientation = <&cam_node>,"orientation:0";
- 		media-controller = <&csi>,"brcm,media-controller?";
--		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_csi_dsi0>,
- 		       <&csi_frag>, "target:0=",<&csi0>,
- 		       <&clk_frag>, "target:0=",<&cam0_clk>,
- 		       <&reg_frag>, "target:0=",<&cam0_reg>,
---- a/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi
-+++ b/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi
-@@ -95,7 +95,7 @@
- 		rotation = <&cam_node>,"rotation:0";
- 		orientation = <&cam_node>,"orientation:0";
- 		media-controller = <&csi>,"brcm,media-controller?";
--		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_csi_dsi0>,
- 		       <&csi_frag>, "target:0=",<&csi0>,
- 		       <&clk_frag>, "target:0=",<&cam0_clk>,
- 		       <&cam_node>, "clocks:0=",<&cam0_clk>,
---- a/arch/arm/boot/dts/overlays/imx296-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/imx296-overlay.dts
-@@ -94,7 +94,7 @@
- 		rotation = <&imx296>,"rotation:0";
- 		orientation = <&imx296>,"orientation:0";
- 		media-controller = <&csi>,"brcm,media-controller?";
--		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_csi_dsi0>,
- 		       <&csi_frag>, "target:0=",<&csi0>,
- 		       <&clk_frag>, "target:0=",<&cam0_clk>,
- 		       <&imx296>, "clocks:0=",<&cam0_clk>,
---- a/arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi
-+++ b/arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi
-@@ -65,7 +65,7 @@
- 		rotation = <&cam_node>,"rotation:0";
- 		orientation = <&cam_node>,"orientation:0";
- 		media-controller = <&csi>,"brcm,media-controller?";
--		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_csi_dsi0>,
- 		       <&csi_frag>, "target:0=",<&csi0>,
- 		       <&clk_frag>, "target:0=",<&cam0_clk>,
- 		       <&reg_frag>, "target:0=",<&cam0_reg>,
---- a/arch/arm/boot/dts/overlays/imx519-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/imx519-overlay.dts
-@@ -69,7 +69,7 @@
- 		rotation = <&cam_node>,"rotation:0";
- 		orientation = <&cam_node>,"orientation:0";
- 		media-controller = <&csi>,"brcm,media-controller?";
--		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_csi_dsi0>,
- 		       <&csi_frag>, "target:0=",<&csi0>,
- 		       <&clk_frag>, "target:0=",<&cam0_clk>,
- 		       <&cam_node>, "clocks:0=",<&cam0_clk>,
---- a/arch/arm/boot/dts/overlays/imx708-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/imx708-overlay.dts
-@@ -79,12 +79,12 @@
- 		rotation = <&cam_node>,"rotation:0";
- 		orientation = <&cam_node>,"orientation:0";
- 		media-controller = <&csi>,"brcm,media-controller?";
--		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_csi_dsi0>,
- 		       <&csi_frag>, "target:0=",<&csi0>,
- 		       <&clk_frag>, "target:0=",<&cam0_clk>,
- 		       <&reg_frag>, "target:0=",<&cam0_reg>,
- 		       <&cam_node>, "clocks:0=",<&cam0_clk>,
--		       <&cam_node>, "VANA1-supply:0=",<&cam0_reg>,
-+		       <&cam_node>, "vana1-supply:0=",<&cam0_reg>,
- 		       <&vcm_node>, "VDD-supply:0=",<&cam0_reg>;
- 		vcm = <&vcm_node>, "status",
- 		      <0>, "=4";
---- a/arch/arm/boot/dts/overlays/iqaudio-codec-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/iqaudio-codec-overlay.dts
-@@ -6,7 +6,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_consumer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -32,7 +32,7 @@
- 		target = <&sound>;
- 		iqaudio_dac: __overlay__ {
- 			compatible = "iqaudio,iqaudio-codec";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_consumer>;
- 			status = "okay";
- 		};
- 	};
---- a/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts
-@@ -6,7 +6,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_producer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -35,7 +35,7 @@
- 		target = <&sound>;
- 		frag2: __overlay__ {
- 			compatible = "iqaudio,iqaudio-dac";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_producer>;
- 			status = "okay";
- 		};
- 	};
---- a/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts
-@@ -6,7 +6,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_producer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -35,7 +35,7 @@
- 		target = <&sound>;
- 		iqaudio_dac: __overlay__ {
- 			compatible = "iqaudio,iqaudio-dac";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_producer>;
- 			mute-gpios = <&gpio 22 0>;
- 			status = "okay";
- 		};
---- a/arch/arm/boot/dts/overlays/iqaudio-digi-wm8804-audio-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/iqaudio-digi-wm8804-audio-overlay.dts
-@@ -6,7 +6,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_consumer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -34,7 +34,7 @@
- 		target = <&sound>;
- 		wm8804_digi: __overlay__ {
- 			compatible = "iqaudio,wm8804-digi";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_consumer>;
- 			status = "okay";
- 		};
- 	};
---- a/arch/arm/boot/dts/overlays/irs1125-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/irs1125-overlay.dts
-@@ -82,7 +82,7 @@
- 
- 	__overrides__ {
- 		media-controller = <&csi>,"brcm,media-controller?";
--		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_csi_dsi0>,
- 		       <&csi_frag>, "target:0=",<&csi0>,
- 		       <&clk_frag>, "target:0=",<&cam0_clk>,
- 		       <&irs1125>, "clocks:0=",<&cam0_clk>;
---- a/arch/arm/boot/dts/overlays/justboom-both-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/justboom-both-overlay.dts
-@@ -7,7 +7,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_consumer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -54,7 +54,7 @@
- 		target = <&sound>;
- 		frag3: __overlay__ {
- 			compatible = "justboom,justboom-both";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_consumer>;
- 			status = "okay";
- 		};
- 	};
---- a/arch/arm/boot/dts/overlays/justboom-dac-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/justboom-dac-overlay.dts
-@@ -6,7 +6,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_producer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -35,7 +35,7 @@
- 		target = <&sound>;
- 		frag2: __overlay__ {
- 			compatible = "justboom,justboom-dac";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_producer>;
- 			status = "okay";
- 		};
- 	};
---- a/arch/arm/boot/dts/overlays/justboom-digi-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/justboom-digi-overlay.dts
-@@ -6,7 +6,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_consumer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -34,7 +34,7 @@
- 		target = <&sound>;
- 		__overlay__ {
- 			compatible = "justboom,justboom-digi";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_consumer>;
- 			status = "okay";
- 		};
- 	};
---- a/arch/arm/boot/dts/overlays/max98357a-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/max98357a-overlay.dts
-@@ -12,7 +12,7 @@
- 
- 	/* Enable I2S */
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_producer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -52,7 +52,7 @@
- 			simple-audio-card,name = "MAX98357A";
- 			status = "okay";
- 			simple-audio-card,cpu {
--				sound-dai = <&i2s>;
-+				sound-dai = <&i2s_clk_producer>;
- 			};
- 			simple-audio-card,codec {
- 				sound-dai = <&max98357a_dac>;
-@@ -69,7 +69,7 @@
- 			simple-audio-card,name = "MAX98357A";
- 			status = "okay";
- 			simple-audio-card,cpu {
--				sound-dai = <&i2s>;
-+				sound-dai = <&i2s_clk_producer>;
- 			};
- 			simple-audio-card,codec {
- 				sound-dai = <&max98357a_nsd>;
---- a/arch/arm/boot/dts/overlays/mbed-dac-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/mbed-dac-overlay.dts
-@@ -6,7 +6,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_producer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -32,7 +32,7 @@
- 		target = <&sound>;
- 		__overlay__ {
- 			compatible = "simple-audio-card";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_producer>;
- 			status = "okay";
- 
- 			simple-audio-card,name = "mbed-DAC";
-@@ -52,7 +52,7 @@
- 			simple-audio-card,format = "i2s";
- 
- 			simple-audio-card,cpu {
--				sound-dai = <&i2s>;
-+				sound-dai = <&i2s_clk_producer>;
- 			};
- 
- 			sound_master: simple-audio-card,codec {
---- a/arch/arm/boot/dts/overlays/merus-amp-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/merus-amp-overlay.dts
-@@ -9,7 +9,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_producer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -52,7 +52,7 @@
- 		target = <&sound>;
- 		__overlay__ {
- 			compatible = "merus,merus-amp";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_producer>;
- 			status = "okay";
- 		};
- 	};
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/midi-uart0-pi5-overlay.dts
-@@ -0,0 +1,35 @@
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/clock/rp1.h>
-+
-+/*
-+ * Fake a higher clock rate to get a larger divisor, and thereby a lower
-+ * baudrate. The real clock is 100MHz, which we scale so that requesting
-+ * 38.4kHz results in an actual 31.25kHz.
-+ *
-+ *   100000000*38400/31250 = 122880000
-+ */
-+
-+/{
-+	compatible = "brcm,bcm2712";
-+
-+	fragment@0 {
-+		target-path = "/";
-+		__overlay__ {
-+			midi_clk: midi_clk0 {
-+				compatible = "fixed-clock";
-+				#clock-cells = <0>;
-+				clock-output-names = "uart0_pclk";
-+				clock-frequency = <122880000>;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&uart0>;
-+		__overlay__ {
-+			clocks = <&midi_clk &rp1_clocks RP1_PLL_SYS_PRI_PH>;
-+		};
-+	};
-+};
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/midi-uart1-pi5-overlay.dts
-@@ -0,0 +1,35 @@
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/clock/rp1.h>
-+
-+/*
-+ * Fake a higher clock rate to get a larger divisor, and thereby a lower
-+ * baudrate. The real clock is 100MHz, which we scale so that requesting
-+ * 38.4kHz results in an actual 31.25kHz.
-+ *
-+ *   100000000*38400/31250 = 122880000
-+ */
-+
-+/{
-+	compatible = "brcm,bcm2712";
-+
-+	fragment@0 {
-+		target-path = "/";
-+		__overlay__ {
-+			midi_clk: midi_clk1 {
-+				compatible = "fixed-clock";
-+				#clock-cells = <0>;
-+				clock-output-names = "uart1_pclk";
-+				clock-frequency = <122880000>;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&uart1>;
-+		__overlay__ {
-+			clocks = <&midi_clk &rp1_clocks RP1_PLL_SYS_PRI_PH>;
-+		};
-+	};
-+};
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/midi-uart2-pi5-overlay.dts
-@@ -0,0 +1,35 @@
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/clock/rp1.h>
-+
-+/*
-+ * Fake a higher clock rate to get a larger divisor, and thereby a lower
-+ * baudrate. The real clock is 100MHz, which we scale so that requesting
-+ * 38.4kHz results in an actual 31.25kHz.
-+ *
-+ *   100000000*38400/31250 = 122880000
-+ */
-+
-+/{
-+	compatible = "brcm,bcm2712";
-+
-+	fragment@0 {
-+		target-path = "/";
-+		__overlay__ {
-+			midi_clk: midi_clk2 {
-+				compatible = "fixed-clock";
-+				#clock-cells = <0>;
-+				clock-output-names = "uart2_pclk";
-+				clock-frequency = <122880000>;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&uart2>;
-+		__overlay__ {
-+			clocks = <&midi_clk &rp1_clocks RP1_PLL_SYS_PRI_PH>;
-+		};
-+	};
-+};
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/midi-uart3-pi5-overlay.dts
-@@ -0,0 +1,35 @@
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/clock/rp1.h>
-+
-+/*
-+ * Fake a higher clock rate to get a larger divisor, and thereby a lower
-+ * baudrate. The real clock is 100MHz, which we scale so that requesting
-+ * 38.4kHz results in an actual 31.25kHz.
-+ *
-+ *   100000000*38400/31250 = 122880000
-+ */
-+
-+/{
-+	compatible = "brcm,bcm2712";
-+
-+	fragment@0 {
-+		target-path = "/";
-+		__overlay__ {
-+			midi_clk: midi_clk3 {
-+				compatible = "fixed-clock";
-+				#clock-cells = <0>;
-+				clock-output-names = "uart3_pclk";
-+				clock-frequency = <122880000>;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&uart3>;
-+		__overlay__ {
-+			clocks = <&midi_clk &rp1_clocks RP1_PLL_SYS_PRI_PH>;
-+		};
-+	};
-+};
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/midi-uart4-pi5-overlay.dts
-@@ -0,0 +1,35 @@
-+/dts-v1/;
-+/plugin/;
-+
-+#include <dt-bindings/clock/rp1.h>
-+
-+/*
-+ * Fake a higher clock rate to get a larger divisor, and thereby a lower
-+ * baudrate. The real clock is 100MHz, which we scale so that requesting
-+ * 38.4kHz results in an actual 31.25kHz.
-+ *
-+ *   100000000*38400/31250 = 122880000
-+ */
-+
-+/{
-+	compatible = "brcm,bcm2712";
-+
-+	fragment@0 {
-+		target-path = "/";
-+		__overlay__ {
-+			midi_clk: midi_clk4 {
-+				compatible = "fixed-clock";
-+				#clock-cells = <0>;
-+				clock-output-names = "uart4_pclk";
-+				clock-frequency = <122880000>;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&uart4>;
-+		__overlay__ {
-+			clocks = <&midi_clk &rp1_clocks RP1_PLL_SYS_PRI_PH>;
-+		};
-+	};
-+};
---- a/arch/arm/boot/dts/overlays/ov2311-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/ov2311-overlay.dts
-@@ -60,7 +60,7 @@
- 		rotation = <&cam_node>,"rotation:0";
- 		orientation = <&cam_node>,"orientation:0";
- 		media-controller = <&csi>,"brcm,media-controller?";
--		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_csi_dsi0>,
- 		       <&csi_frag>, "target:0=",<&csi0>,
- 		       <&clk_frag>, "target:0=",<&cam0_clk>,
- 		       <&cam_node>, "clocks:0=",<&cam0_clk>,
---- a/arch/arm/boot/dts/overlays/ov5647-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/ov5647-overlay.dts
-@@ -72,7 +72,7 @@
- 		rotation = <&cam_node>,"rotation:0";
- 		orientation = <&cam_node>,"orientation:0";
- 		media-controller = <&csi>,"brcm,media-controller?";
--		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_csi_dsi0>,
- 		       <&csi_frag>, "target:0=",<&csi0>,
- 		       <&reg_frag>, "target:0=",<&cam0_reg>,
- 		       <&clk_frag>, "target:0=",<&cam0_clk>,
---- a/arch/arm/boot/dts/overlays/ov7251-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/ov7251-overlay.dts
-@@ -60,7 +60,7 @@
- 		rotation = <&cam_node>,"rotation:0";
- 		orientation = <&cam_node>,"orientation:0";
- 		media-controller = <&csi>,"brcm,media-controller?";
--		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_csi_dsi0>,
- 		       <&csi_frag>, "target:0=",<&csi0>,
- 		       <&clk_frag>, "target:0=",<&cam0_clk>,
- 		       <&cam_node>, "clocks:0=",<&cam0_clk>,
---- a/arch/arm/boot/dts/overlays/ov9281-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/ov9281-overlay.dts
-@@ -61,7 +61,7 @@
- 		rotation = <&cam_node>,"rotation:0";
- 		orientation = <&cam_node>,"orientation:0";
- 		media-controller = <&csi>,"brcm,media-controller?";
--		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_csi_dsi0>,
- 		       <&csi_frag>, "target:0=",<&csi0>,
- 		       <&clk_frag>, "target:0=",<&cam0_clk>,
- 		       <&cam_node>, "clocks:0=",<&cam0_clk>,
---- a/arch/arm/boot/dts/overlays/overlay_map.dts
-+++ b/arch/arm/boot/dts/overlays/overlay_map.dts
-@@ -1,32 +1,100 @@
- /dts-v1/;
- 
- / {
-+	audremap {
-+		bcm2835;
-+		bcm2711;
-+	};
-+
-+	balena-fin {
-+		bcm2835;
-+		bcm2711;
-+	};
-+
- 	bmp085_i2c-sensor {
- 		deprecated = "use i2c-sensor,bmp085";
- 	};
- 
-+	cm-swap-i2c0 {
-+		bcm2835;
-+		bcm2711;
-+	};
-+
- 	cutiepi-panel {
- 		bcm2711;
- 	};
- 
-+	disable-bt {
-+		bcm2835;
-+		bcm2711;
-+		bcm2712 = "disable-bt-pi5";
-+	};
-+
-+	disable-bt-pi5 {
-+		bcm2712;
-+	};
-+
- 	disable-emmc2 {
- 		bcm2711;
- 	};
- 
-+	disable-wifi {
-+		bcm2835;
-+		bcm2711;
-+		bcm2712 = "disable-wifi-pi5";
-+	};
-+
-+	disable-wifi-pi5 {
-+		bcm2712;
-+	};
-+
- 	highperi {
- 		bcm2711;
- 	};
- 
-+	i2c0 {
-+		bcm2835;
-+		bcm2711;
-+		bcm2712 = "i2c0-pi5";
-+	};
-+
- 	i2c0-bcm2708 {
- 		deprecated = "use i2c0";
- 	};
- 
-+	i2c0-pi5 {
-+		bcm2712;
-+	};
-+
-+	i2c1 {
-+		bcm2835;
-+		bcm2711;
-+		bcm2712 = "i2c1-pi5";
-+	};
-+
- 	i2c1-bcm2708 {
- 		deprecated = "use i2c1";
- 	};
- 
-+	i2c1-pi5 {
-+		bcm2712;
-+	};
-+
-+	i2c2 {
-+		bcm2712 = "i2c2-pi5";
-+	};
-+
-+	i2c2-pi5 {
-+		bcm2712;
-+	};
-+
- 	i2c3 {
- 		bcm2711;
-+		bcm2712 = "i2c3-pi5";
-+	};
-+
-+	i2c3-pi5 {
-+		bcm2712;
- 	};
- 
- 	i2c4 {
-@@ -41,26 +109,76 @@
- 		bcm2711;
- 	};
- 
-+	i2s-gpio28-31 {
-+		bcm2835;
-+		bcm2711;
-+	};
-+
- 	lirc-rpi {
- 		deprecated = "use gpio-ir";
- 	};
- 
-+	midi-uart0 {
-+		bcm2835;
-+		bcm2711;
-+		bcm2712 = "midi-uart0-pi5";
-+	};
-+
-+	midi-uart0-pi5 {
-+		bcm2712;
-+	};
-+
-+	midi-uart1 {
-+		bcm2835;
-+		bcm2711;
-+		bcm2712 = "midi-uart1-pi5";
-+	};
-+
-+	midi-uart1-pi5 {
-+		bcm2712;
-+	};
-+
- 	midi-uart2 {
- 		bcm2711;
-+		bcm2712 = "midi-uart2-pi5";
-+	};
-+
-+	midi-uart2-pi5 {
-+		bcm2712;
- 	};
- 
- 	midi-uart3 {
- 		bcm2711;
-+		bcm2712 = "midi-uart3-pi5";
-+	};
-+
-+	midi-uart3-pi5 {
-+		bcm2712;
- 	};
- 
- 	midi-uart4 {
- 		bcm2711;
-+		bcm2712 = "midi-uart4-pi5";
-+	};
-+
-+	midi-uart4-pi5 {
-+		bcm2712;
- 	};
- 
- 	midi-uart5 {
- 		bcm2711;
- 	};
- 
-+	miniuart-bt {
-+		bcm2835;
-+		bcm2711;
-+	};
-+
-+	mmc {
-+		bcm2835;
-+		bcm2711;
-+	};
-+
- 	mpu6050 {
- 		deprecated = "use i2c-sensor,mpu6050";
- 	};
-@@ -118,6 +236,16 @@
- 		deprecated = "no longer necessary";
- 	};
- 
-+	sdhost {
-+		bcm2835;
-+		bcm2711;
-+	};
-+
-+	sdio {
-+		bcm2835;
-+		bcm2711;
-+	};
-+
- 	sdio-1bit {
- 		deprecated = "use sdio,bus_width=1,gpios_22_25";
- 	};
-@@ -126,6 +254,21 @@
- 		deprecated = "use 'dtparam=sd_poll_once' etc.";
- 	};
- 
-+	smi {
-+		bcm2835;
-+		bcm2711;
-+	};
-+
-+	smi-dev {
-+		bcm2835;
-+		bcm2711;
-+	};
-+
-+	smi-nand {
-+		bcm2835;
-+		bcm2711;
-+	};
-+
- 	spi0-cs {
- 		renamed = "spi0-2cs";
- 	};
-@@ -134,12 +277,42 @@
- 		deprecated = "no longer necessary";
- 	};
- 
-+	spi2-1cs {
-+		bcm2835;
-+		bcm2711;
-+		bcm2712 = "spi2-1cs-pi5";
-+	};
-+
-+	spi2-1cs-pi5 {
-+		bcm2712;
-+	};
-+
-+	spi2-2cs {
-+		bcm2835;
-+		bcm2711;
-+		bcm2712 = "spi2-2cs-pi5";
-+	};
-+
-+	spi2-2cs-pi5 {
-+		bcm2712;
-+	};
-+
- 	spi3-1cs {
- 		bcm2711;
-+		bcm2712 = "spi3-1cs-pi5";
-+	};
-+
-+	spi3-1cs-pi5 {
-+		bcm2712;
- 	};
- 
- 	spi3-2cs {
- 		bcm2711;
-+		bcm2712 = "spi3-2cs-pi5";
-+	};
-+
-+	spi3-2cs-pi5 {
-+		bcm2712;
- 	};
- 
- 	spi4-1cs {
-@@ -152,10 +325,20 @@
- 
- 	spi5-1cs {
- 		bcm2711;
-+		bcm2712 = "spi5-1cs-pi5";
-+	};
-+
-+	spi5-1cs-pi5 {
-+		bcm2712;
- 	};
- 
- 	spi5-2cs {
- 		bcm2711;
-+		bcm2712 = "spi5-2cs-pi5";
-+	};
-+
-+	spi5-2cs-pi5 {
-+		bcm2712;
- 	};
- 
- 	spi6-1cs {
-@@ -166,16 +349,51 @@
- 		bcm2711;
- 	};
- 
-+	uart0 {
-+		bcm2835;
-+		bcm2711;
-+		bcm2712 = "uart0-pi5";
-+	};
-+
-+	uart0-pi5 {
-+		bcm2712;
-+	};
-+
-+	uart1 {
-+		bcm2835;
-+		bcm2711;
-+		bcm2712 = "uart1-pi5";
-+	};
-+
-+	uart1-pi5 {
-+		bcm2712;
-+	};
-+
- 	uart2 {
- 		bcm2711;
-+		bcm2712 = "uart2-pi5";
-+	};
-+
-+	uart2-pi5 {
-+		bcm2712;
- 	};
- 
- 	uart3 {
- 		bcm2711;
-+		bcm2712 = "uart3-pi5";
-+	};
-+
-+	uart3-pi5 {
-+		bcm2712;
- 	};
- 
- 	uart4 {
- 		bcm2711;
-+		bcm2712 = "uart4-pi5";
-+	};
-+
-+	uart4-pi5 {
-+		bcm2712;
- 	};
- 
- 	uart5 {
-@@ -198,10 +416,12 @@
- 	vc4-fkms-v3d {
- 		bcm2835;
- 		bcm2711 = "vc4-fkms-v3d-pi4";
-+		bcm2712 = "vc4-fkms-v3d-pi4";
- 	};
- 
- 	vc4-fkms-v3d-pi4 {
- 		bcm2711;
-+		bcm2712;
- 	};
- 
- 	vc4-kms-dpi-at056tn53v1 {
-@@ -211,10 +431,16 @@
- 	vc4-kms-v3d {
- 		bcm2835;
- 		bcm2711 = "vc4-kms-v3d-pi4";
-+		bcm2712 = "vc4-kms-v3d-pi5";
- 	};
- 
- 	vc4-kms-v3d-pi4 {
- 		bcm2711;
-+		bcm2712 = "vc4-kms-v3d-pi5";
-+	};
-+
-+	vc4-kms-v3d-pi5 {
-+		bcm2712;
- 	};
- 
- 	vl805 {
---- a/arch/arm/boot/dts/overlays/pibell-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/pibell-overlay.dts
-@@ -24,7 +24,7 @@
-     };
- 
-     fragment@1 {
--        target = <&i2s>;
-+        target = <&i2s_clk_producer>;
-         __overlay__ {
-             #sound-dai-cells = <0>;
-             status = "okay";
-@@ -43,7 +43,7 @@
-                 format = "i2s";
- 
-                 r_cpu_dai: cpu {
--                    sound-dai = <&i2s>;
-+                    sound-dai = <&i2s_clk_producer>;
- 
- /* example TDM slot configuration
-                     dai-tdm-slot-num = <2>;
-@@ -60,7 +60,7 @@
-                 format = "i2s";
- 
-                 p_cpu_dai: cpu {
--                    sound-dai = <&i2s>;
-+                    sound-dai = <&i2s_clk_producer>;
- 
- /* example TDM slot configuration
-                     dai-tdm-slot-num = <2>;
---- a/arch/arm/boot/dts/overlays/pifi-40-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/pifi-40-overlay.dts
-@@ -6,7 +6,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_producer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -42,7 +42,7 @@
- 		pifi_40: __overlay__ {
- 			compatible = "pifi,pifi-40";
- 			audio-codec = <&tas5711l &tas5711r>;
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_producer>;
- 			pdn-gpios = <&gpio 23 1>;
- 			status = "okay";
- 		};
---- a/arch/arm/boot/dts/overlays/pifi-dac-hd-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/pifi-dac-hd-overlay.dts
-@@ -6,7 +6,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_producer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -38,7 +38,7 @@
- 			simple-audio-card,dai-link@1 {
- 				format = "i2s";
- 				cpu {
--					sound-dai = <&i2s>;
-+					sound-dai = <&i2s_clk_producer>;
- 				};
- 				codec {
- 					sound-dai = <&pcm5142>;
---- a/arch/arm/boot/dts/overlays/pifi-dac-zero-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/pifi-dac-zero-overlay.dts
-@@ -16,7 +16,7 @@
- 				format = "i2s";
- 
- 				cpu {
--					sound-dai = <&i2s>;
-+					sound-dai = <&i2s_clk_producer>;
- 					dai-tdm-slot-num = <2>;
- 					dai-tdm-slot-width = <32>;
- 				};
-@@ -40,7 +40,7 @@
- 	};
- 
- 	fragment@2 {
--		target = <&i2s>;
-+		target = <&i2s_clk_producer>;
- 		__overlay__ {
- 			#sound-dai-cells = <0>;
- 			status = "okay";
---- a/arch/arm/boot/dts/overlays/pifi-mini-210-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/pifi-mini-210-overlay.dts
-@@ -6,7 +6,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_producer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -34,7 +34,7 @@
- 		target = <&sound>;
- 		__overlay__ {
- 			compatible = "pifi,pifi-mini-210";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_producer>;
- 
- 			status = "okay";
- 		};
---- a/arch/arm/boot/dts/overlays/pisound-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/pisound-overlay.dts
-@@ -75,7 +75,7 @@
- 		target = <&sound>;
- 		__overlay__ {
- 			compatible = "blokaslabs,pisound";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_consumer>;
- 			status = "okay";
- 
- 			pinctrl-names = "default";
-@@ -108,7 +108,7 @@
- 	};
- 
- 	fragment@7 {
--		target = <&i2s>;
-+		target = <&i2s_clk_consumer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
---- a/arch/arm/boot/dts/overlays/proto-codec-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/proto-codec-overlay.dts
-@@ -6,7 +6,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_consumer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -32,7 +32,7 @@
- 		target = <&sound>;
- 		__overlay__ {
- 			compatible = "rpi,rpi-proto";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_consumer>;
- 			status = "okay";
- 		};
- 	};
---- a/arch/arm/boot/dts/overlays/rra-digidac1-wm8741-audio-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/rra-digidac1-wm8741-audio-overlay.dts
-@@ -6,7 +6,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_consumer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -42,7 +42,7 @@
- 		target = <&sound>;
- 		__overlay__ {
- 			compatible = "rra,digidac1-soundcard";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_consumer>;
- 			status = "okay";
- 		};
- 	};
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/spi2-1cs-pi5-overlay.dts
-@@ -0,0 +1,33 @@
-+/dts-v1/;
-+/plugin/;
-+
-+
-+/ {
-+	compatible = "brcm,bcm2712";
-+
-+	fragment@0 {
-+		target = <&spi2>;
-+		frag1: __overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			cs-gpios = <&gpio 0 1>;
-+			status = "okay";
-+
-+			spidev2_0: spidev@0 {
-+				compatible = "spidev";
-+				reg = <0>;      /* CE0 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		cs0_pin  = <&frag1>,"cs-gpios:4";
-+		cs0_spidev = <&spidev2_0>,"status";
-+	};
-+};
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/spi2-2cs-pi5-overlay.dts
-@@ -0,0 +1,44 @@
-+/dts-v1/;
-+/plugin/;
-+
-+
-+/ {
-+	compatible = "brcm,bcm2712";
-+
-+	fragment@0 {
-+		target = <&spi2>;
-+		frag1: __overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			cs-gpios = <&gpio 0 1>, <&gpio 24 1>;
-+			status = "okay";
-+
-+			spidev2_0: spidev@0 {
-+				compatible = "spidev";
-+				reg = <0>;      /* CE0 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+
-+			spidev2_1: spidev@1 {
-+				compatible = "spidev";
-+				reg = <1>;      /* CE1 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		cs0_pin  = <&frag1>,"cs-gpios:4";
-+		cs1_pin  = <&frag1>,"cs-gpios:16";
-+		cs0_spidev = <&spidev2_0>,"status";
-+		cs1_spidev = <&spidev2_1>,"status";
-+	};
-+};
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/spi3-1cs-pi5-overlay.dts
-@@ -0,0 +1,33 @@
-+/dts-v1/;
-+/plugin/;
-+
-+
-+/ {
-+	compatible = "brcm,bcm2712";
-+
-+	fragment@0 {
-+		target = <&spi3>;
-+		frag1: __overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			cs-gpios = <&gpio 4 1>;
-+			status = "okay";
-+
-+			spidev3_0: spidev@0 {
-+				compatible = "spidev";
-+				reg = <0>;      /* CE0 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		cs0_pin  = <&frag1>,"cs-gpios:4";
-+		cs0_spidev = <&spidev3_0>,"status";
-+	};
-+};
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/spi3-2cs-pi5-overlay.dts
-@@ -0,0 +1,44 @@
-+/dts-v1/;
-+/plugin/;
-+
-+
-+/ {
-+	compatible = "brcm,bcm2712";
-+
-+	fragment@0 {
-+		target = <&spi3>;
-+		frag1: __overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			cs-gpios = <&gpio 4 1>, <&gpio 25 1>;
-+			status = "okay";
-+
-+			spidev3_0: spidev@0 {
-+				compatible = "spidev";
-+				reg = <0>;      /* CE0 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+
-+			spidev3_1: spidev@1 {
-+				compatible = "spidev";
-+				reg = <1>;      /* CE1 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		cs0_pin  = <&frag1>,"cs-gpios:4";
-+		cs1_pin  = <&frag1>,"cs-gpios:16";
-+		cs0_spidev = <&spidev3_0>,"status";
-+		cs1_spidev = <&spidev3_1>,"status";
-+	};
-+};
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/spi5-1cs-pi5-overlay.dts
-@@ -0,0 +1,33 @@
-+/dts-v1/;
-+/plugin/;
-+
-+
-+/ {
-+	compatible = "brcm,bcm2712";
-+
-+	fragment@0 {
-+		target = <&spi5>;
-+		frag1: __overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			cs-gpios = <&gpio 12 1>;
-+			status = "okay";
-+
-+			spidev5_0: spidev@0 {
-+				compatible = "spidev";
-+				reg = <0>;      /* CE0 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		cs0_pin  = <&frag1>,"cs-gpios:4";
-+		cs0_spidev = <&spidev5_0>,"status";
-+	};
-+};
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/spi5-2cs-pi5-overlay.dts
-@@ -0,0 +1,44 @@
-+/dts-v1/;
-+/plugin/;
-+
-+
-+/ {
-+	compatible = "brcm,bcm2712";
-+
-+	fragment@0 {
-+		target = <&spi5>;
-+		frag1: __overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			cs-gpios = <&gpio 12 1>, <&gpio 26 1>;
-+			status = "okay";
-+
-+			spidev5_0: spidev@0 {
-+				compatible = "spidev";
-+				reg = <0>;      /* CE0 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+
-+			spidev5_1: spidev@1 {
-+				compatible = "spidev";
-+				reg = <1>;      /* CE1 */
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				spi-max-frequency = <125000000>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		cs0_pin  = <&frag1>,"cs-gpios:4";
-+		cs1_pin  = <&frag1>,"cs-gpios:16";
-+		cs0_spidev = <&spidev5_0>,"status";
-+		cs1_spidev = <&spidev5_1>,"status";
-+	};
-+};
---- a/arch/arm/boot/dts/overlays/superaudioboard-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/superaudioboard-overlay.dts
-@@ -9,7 +9,7 @@
- 		target = <&sound>;
- 		__overlay__ {
- 			compatible = "simple-audio-card";
--			i2s-controller = <&i2s>;
-+			i2s-controller = <&i2s_clk_consumer>;
- 			status = "okay";
- 
- 			simple-audio-card,name = "SuperAudioBoard";
-@@ -32,7 +32,7 @@
- 			simple-audio-card,frame-master = <&sound_master>;
- 
- 			simple-audio-card,cpu {
--				sound-dai = <&i2s>;
-+				sound-dai = <&i2s_clk_consumer>;
- 				dai-tdm-slot-num = <2>;
- 				dai-tdm-slot-width = <32>;
- 			};
-@@ -45,7 +45,7 @@
- 	};
- 
- 	fragment@1 {
--		target = <&i2s>;
-+		target = <&i2s_clk_consumer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
---- a/arch/arm/boot/dts/overlays/tc358743-audio-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/tc358743-audio-overlay.dts
-@@ -8,7 +8,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_consumer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -31,16 +31,16 @@
- 			compatible = "simple-audio-card";
- 			simple-audio-card,format = "i2s";
- 			simple-audio-card,name = "tc358743";
--			simple-audio-card,bitclock-master = <&dailink0_slave>;
--			simple-audio-card,frame-master = <&dailink0_slave>;
-+			simple-audio-card,bitclock-master = <&dailink0_master>;
-+			simple-audio-card,frame-master = <&dailink0_master>;
- 			status = "okay";
- 
- 			simple-audio-card,cpu {
--				sound-dai = <&i2s>;
-+				sound-dai = <&i2s_clk_consumer>;
- 				dai-tdm-slot-num = <2>;
- 				dai-tdm-slot-width = <32>;
- 			};
--			dailink0_slave: simple-audio-card,codec {
-+			dailink0_master: simple-audio-card,codec {
- 				sound-dai = <&tc358743_codec>;
- 			};
- 		};
---- a/arch/arm/boot/dts/overlays/tc358743-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/tc358743-overlay.dts
-@@ -101,7 +101,7 @@
- 		4lane = <0>, "-2+3-7+8";
- 		link-frequency = <&tc358743_0>,"link-frequencies#0";
- 		media-controller = <&csi>,"brcm,media-controller?";
--		cam0 = <&i2c_frag>, "target:0=",<&i2c_vc>,
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_csi_dsi0>,
- 		       <&csi_frag>, "target:0=",<&csi0>,
- 		       <&clk_frag>, "target:0=",<&cam0_clk>,
- 		       <&tc358743>, "clocks:0=",<&cam0_clk>;
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/uart0-pi5-overlay.dts
-@@ -0,0 +1,17 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2712";
-+
-+	fragment@0 {
-+		target = <&uart0>;
-+		frag0: __overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		ctsrts = <&frag0>,"pinctrl-0:4=",<&uart0_ctsrts_pins>;
-+	};
-+};
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/uart1-pi5-overlay.dts
-@@ -0,0 +1,17 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2712";
-+
-+	fragment@0 {
-+		target = <&uart1>;
-+		frag0: __overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		ctsrts = <&frag0>,"pinctrl-0:4=",<&uart1_ctsrts_pins>;
-+	};
-+};
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/uart2-pi5-overlay.dts
-@@ -0,0 +1,17 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2712";
-+
-+	fragment@0 {
-+		target = <&uart2>;
-+		frag0: __overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		ctsrts = <&frag0>,"pinctrl-0:4=",<&uart2_ctsrts_pins>;
-+	};
-+};
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/uart3-pi5-overlay.dts
-@@ -0,0 +1,17 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2712";
-+
-+	fragment@0 {
-+		target = <&uart3>;
-+		frag0: __overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		ctsrts = <&frag0>,"pinctrl-0:4=",<&uart3_ctsrts_pins>;
-+	};
-+};
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/uart4-pi5-overlay.dts
-@@ -0,0 +1,17 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2712";
-+
-+	fragment@0 {
-+		target = <&uart4>;
-+		frag0: __overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		ctsrts = <&frag0>,"pinctrl-0:4=",<&uart4_ctsrts_pins>;
-+	};
-+};
---- a/arch/arm/boot/dts/overlays/udrc-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/udrc-overlay.dts
-@@ -9,7 +9,7 @@
- / {
-     compatible = "brcm,bcm2835";
-     fragment@0 {
--        target = <&i2s>;
-+        target = <&i2s_clk_producer>;
-         __overlay__ {
-             clocks = <&clocks BCM2835_CLOCK_PCM>;
-             clock-names = "pcm";
-@@ -71,7 +71,7 @@
-         target = <&sound>;
-         snd: __overlay__ {
-             compatible = "simple-audio-card";
--            i2s-controller = <&i2s>;
-+            i2s-controller = <&i2s_clk_producer>;
-             status = "okay";
- 
-             simple-audio-card,name = "udrc";
-@@ -93,7 +93,7 @@
-                 "Line Out", "LOL";
- 
-             dailink0_master: simple-audio-card,cpu {
--                sound-dai = <&i2s>;
-+                sound-dai = <&i2s_clk_producer>;
-             };
- 
-             simple-audio-card,codec {
---- a/arch/arm/boot/dts/overlays/ugreen-dabboard-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/ugreen-dabboard-overlay.dts
-@@ -6,7 +6,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_consumer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -29,14 +29,14 @@
- 			compatible = "simple-audio-card";
- 			simple-audio-card,format = "i2s";
- 			simple-audio-card,name = "dabboard";
--			simple-audio-card,bitclock-master = <&dailink0_slave>;
--			simple-audio-card,frame-master = <&dailink0_slave>;
-+			simple-audio-card,bitclock-master = <&dailink0_master>;
-+			simple-audio-card,frame-master = <&dailink0_master>;
- 			simple-audio-card,widgets = "Microphone", "Microphone Jack";
- 			status = "okay";
- 			simple-audio-card,cpu {
--				sound-dai = <&i2s>;
-+				sound-dai = <&i2s_clk_consumer>;
- 			};
--			dailink0_slave: simple-audio-card,codec {
-+			dailink0_master: simple-audio-card,codec {
- 				#sound-dai-cells = <0>;
- 				sound-dai = <&dmic_codec>;
- 			};
---- a/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts
-@@ -37,4 +37,10 @@
- 			status = "okay";
- 		};
- 	};
-+	fragment@5 {
-+		target-path = "/chosen";
-+		__overlay__  {
-+			bootargs = "clk_ignore_unused";
-+		};
-+	};
- };
---- a/arch/arm/boot/dts/overlays/vc4-fkms-v3d-pi4-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-pi4-overlay.dts
-@@ -41,4 +41,10 @@
- 			status = "okay";
- 		};
- 	};
-+	fragment@5 {
-+		target-path = "/chosen";
-+		__overlay__  {
-+			bootargs = "clk_ignore_unused";
-+		};
-+	};
- };
---- a/arch/arm/boot/dts/overlays/vc4-kms-dsi-7inch-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/vc4-kms-dsi-7inch-overlay.dts
-@@ -11,7 +11,7 @@
- / {
- 	/* No compatible as it will have come from edt-ft5406.dtsi */
- 
--	fragment@0 {
-+	dsi_frag: fragment@0 {
- 		target = <&dsi1>;
- 		__overlay__ {
- 			#address-cells = <1>;
-@@ -51,8 +51,8 @@
- 	fragment@1 {
- 		target-path = "/";
- 		__overlay__ {
--			panel_disp1: panel_disp1@0 {
--				reg = <0>;
-+			panel_disp: panel_disp@1 {
-+				reg = <1>;
- 				compatible = "raspberrypi,7inch-dsi", "simple-panel";
- 				backlight = <&reg_display>;
- 				power-supply = <&reg_display>;
-@@ -64,8 +64,8 @@
- 				};
- 			};
- 
--			reg_bridge: reg_bridge@0 {
--				reg = <0>;
-+			reg_bridge: reg_bridge@1 {
-+				reg = <1>;
- 				compatible = "regulator-fixed";
- 				regulator-name = "bridge_reg";
- 				gpio = <&reg_display 0 0>;
-@@ -75,7 +75,7 @@
- 		};
- 	};
- 
--	fragment@2 {
-+	i2c_frag: fragment@2 {
- 		target = <&i2c_csi_dsi>;
- 		__overlay__ {
- 			#address-cells = <1>;
-@@ -113,6 +113,12 @@
- 	};
- 
- 	__overrides__ {
-+		dsi0 = <&dsi_frag>, "target:0=",<&dsi0>,
-+		       <&i2c_frag>, "target:0=",<&i2c_csi_dsi0>,
-+		       <&ts_i2c_frag>, "target:0=",<&i2c_csi_dsi0>,
-+		       <&panel_disp>, "reg:0=0",
-+		       <&reg_bridge>, "reg:0=0",
-+		       <&reg_bridge>, "regulator-name=bridge_reg_0";
- 		disable_touch = <0>, "-10-11-12";
- 	};
- };
---- a/arch/arm/boot/dts/overlays/vc4-kms-dsi-waveshare-panel-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/vc4-kms-dsi-waveshare-panel-overlay.dts
-@@ -9,7 +9,7 @@
- / {
- 	compatible = "brcm,bcm2835";
- 
--	fragment@0 {
-+	dsi_frag: fragment@0 {
- 		target = <&dsi1>;
- 		__overlay__ {
- 			#address-cells = <1>;
-@@ -29,7 +29,7 @@
- 		};
- 	};
- 
--	frag2: fragment@2 {
-+	i2c_frag: fragment@2 {
- 		target = <&i2c_csi_dsi>;
- 		__overlay__ {
- 			#address-cells = <1>;
-@@ -112,12 +112,14 @@
- 				   <&touch>, "touchscreen-size-y:0=1480",
- 				   <&touch>, "touchscreen-inverted-x?",
- 				   <&touch>, "touchscreen-swapped-x-y?";
--		i2c1 = <&frag2>, "target:0=",<&i2c1>,
-+		i2c1 = <&i2c_frag>, "target:0=",<&i2c1>,
- 		       <0>, "-3-4+5";
- 		disable_touch = <&touch>, "status=disabled";
- 		rotation = <&panel>, "rotation:0";
- 		invx = <&touch>,"touchscreen-inverted-x?";
- 		invy = <&touch>,"touchscreen-inverted-y?";
- 		swapxy = <&touch>,"touchscreen-swapped-x-y?";
-+		dsi0 = <&dsi_frag>, "target:0=",<&dsi0>,
-+		       <&i2c_frag>, "target:0=",<&i2c_csi_dsi0>;
- 	};
- };
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi5-overlay.dts
-@@ -0,0 +1,147 @@
-+// SPDX-License-Identifier: GPL-2.0
-+
-+#include "cma-overlay.dts"
-+
-+&frag0 {
-+	size = <((320-4)*1024*1024)>;
-+};
-+
-+/ {
-+	compatible = "brcm,bcm2712";
-+
-+	fragment@1 {
-+		target = <&fb>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&aon_intr>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&ddc0>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&ddc1>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@5 {
-+		target = <&hdmi0>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@6 {
-+		target = <&hdmi1>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@7 {
-+		target = <&hvs>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@8 {
-+		target = <&mop>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@9 {
-+		target = <&moplet>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@10 {
-+		target = <&pixelvalve0>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@11 {
-+		target = <&pixelvalve1>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@12 {
-+		target = <&v3d>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@13 {
-+		target = <&vec>;
-+		frag13: __overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@14 {
-+		target = <&hdmi0>;
-+		__dormant__  {
-+			dmas;
-+		};
-+	};
-+
-+	fragment@15 {
-+		target = <&hdmi1>;
-+		__dormant__  {
-+			dmas;
-+		};
-+	};
-+
-+	fragment@16 {
-+		target = <&disp_intr>;
-+		__overlay__  {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@17 {
-+		target = <&vc4>;
-+		__overlay__  {
-+			/* IOMMU attaches here, where we allocate DMA buffers */
-+			iommus = <&iommu4>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		audio   = <0>,"!14";
-+		audio1   = <0>,"!15";
-+		noaudio = <0>,"=14", <0>,"=15";
-+		composite = <0>, "!3",
-+			    <0>, "!4",
-+			    <0>, "!5",
-+			    <0>, "!6",
-+			    <0>, "!10",
-+			    <0>, "!11",
-+			    <&frag13>, "status";
-+		nohdmi0 =   <0>, "-3-5-10";
-+		nohdmi1 =   <0>, "-4-6-11";
-+		nohdmi =    <0>, "-3-4-5-6-10-11";
-+	};
-+};
---- a/arch/arm/boot/dts/overlays/vc4-kms-vga666-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/vc4-kms-vga666-overlay.dts
-@@ -94,7 +94,14 @@
- 		};
- 	};
- 
-+	fragment@5 {
-+		target = <&i2c_vc>;
-+		__dormant__ {
-+			status = "okay";
-+		};
-+	};
-+
- 	__overrides__ {
--		ddc = <0>,"=2", <0>,"=3", <0>,"=4";
-+		ddc = <0>,"=2", <0>,"=3", <0>,"=4", <0>,"=5";
- 	};
- };
---- a/arch/arm/boot/dts/overlays/wm8960-soundcard-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/wm8960-soundcard-overlay.dts
-@@ -6,7 +6,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2s>;
-+		target = <&i2s_clk_producer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -65,7 +65,7 @@
- 				"RINPUT2", "Mic Jack";
- 
- 			simple-audio-card,cpu {
--				sound-dai = <&i2s>;
-+				sound-dai = <&i2s_clk_producer>;
- 			};
- 			dailink0_slave: simple-audio-card,codec {
- 				sound-dai = <&wm8960>;
---- /dev/null
-+++ b/arch/arm/boot/dts/rp1.dtsi
-@@ -0,0 +1,1168 @@
-+#include <dt-bindings/clock/rp1.h>
-+#include <dt-bindings/interrupt-controller/irq.h>
-+#include <dt-bindings/mfd/rp1.h>
-+
-+&rp1_target {
-+	rp1: rp1 {
-+		compatible = "simple-bus";
-+		#address-cells = <2>;
-+		#size-cells = <2>;
-+		#interrupt-cells = <2>;
-+		interrupt-controller;
-+		interrupt-parent = <&rp1>;
-+
-+		// ranges and dma-ranges must be provided by the includer
-+
-+		rp1_clocks: clocks@18000 {
-+			compatible = "raspberrypi,rp1-clocks";
-+			#clock-cells = <1>;
-+			reg = <0xc0 0x40018000 0x0 0x10038>;
-+			clocks = <&clk_xosc>;
-+
-+			assigned-clocks = <&rp1_clocks RP1_PLL_SYS_CORE>,
-+					  <&rp1_clocks RP1_PLL_AUDIO_CORE>,
-+					  // RP1_PLL_VIDEO_CORE and dividers are now managed by VEC,DPI drivers
-+					  <&rp1_clocks RP1_PLL_SYS>,
-+					  <&rp1_clocks RP1_PLL_SYS_SEC>,
-+					  <&rp1_clocks RP1_PLL_AUDIO>,
-+					  <&rp1_clocks RP1_PLL_AUDIO_SEC>,
-+					  <&rp1_clocks RP1_CLK_SYS>,
-+					  <&rp1_clocks RP1_PLL_SYS_PRI_PH>,
-+					  // RP1_CLK_SLOW_SYS is used for the frequency counter (FC0)
-+					  <&rp1_clocks RP1_CLK_SLOW_SYS>,
-+					  <&rp1_clocks RP1_CLK_SDIO_TIMER>,
-+					  <&rp1_clocks RP1_CLK_SDIO_ALT_SRC>,
-+					  <&rp1_clocks RP1_CLK_ETH_TSU>;
-+
-+			assigned-clock-rates = <1000000000>, // RP1_PLL_SYS_CORE
-+					       <1536000000>, // RP1_PLL_AUDIO_CORE
-+					       <200000000>,  // RP1_PLL_SYS
-+					       <125000000>,  // RP1_PLL_SYS_SEC
-+					       <61440000>,   // RP1_PLL_AUDIO
-+					       <192000000>,  // RP1_PLL_AUDIO_SEC
-+					       <200000000>,  // RP1_CLK_SYS
-+					       <100000000>,  // RP1_PLL_SYS_PRI_PH
-+					       // Must match the XOSC frequency
-+					       <50000000>, // RP1_CLK_SLOW_SYS
-+					       <1000000>, // RP1_CLK_SDIO_TIMER
-+					       <200000000>, // RP1_CLK_SDIO_ALT_SRC
-+					       <50000000>; // RP1_CLK_ETH_TSU
-+		};
-+
-+		rp1_uart0: serial@30000 {
-+			compatible = "arm,pl011-axi";
-+			reg = <0xc0 0x40030000  0x0 0x100>;
-+			interrupts = <RP1_INT_UART0 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&rp1_clocks RP1_CLK_UART &rp1_clocks RP1_PLL_SYS_PRI_PH>;
-+			clock-names = "uartclk", "apb_pclk";
-+			dmas = <&rp1_dma RP1_DMA_UART0_TX>,
-+			       <&rp1_dma RP1_DMA_UART0_RX>;
-+			dma-names = "tx", "rx";
-+			pinctrl-names = "default";
-+			arm,primecell-periphid = <0x00541011>;
-+			uart-has-rtscts;
-+			cts-event-workaround;
-+			skip-init;
-+			status = "disabled";
-+		};
-+
-+		rp1_uart1: serial@34000 {
-+			compatible = "arm,pl011-axi";
-+			reg = <0xc0 0x40034000  0x0 0x100>;
-+			interrupts = <RP1_INT_UART1 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&rp1_clocks RP1_CLK_UART &rp1_clocks RP1_PLL_SYS_PRI_PH>;
-+			clock-names = "uartclk", "apb_pclk";
-+			// dmas = <&rp1_dma RP1_DMA_UART1_TX>,
-+			//        <&rp1_dma RP1_DMA_UART1_RX>;
-+			// dma-names = "tx", "rx";
-+			pinctrl-names = "default";
-+			arm,primecell-periphid = <0x00541011>;
-+			uart-has-rtscts;
-+			cts-event-workaround;
-+			skip-init;
-+			status = "disabled";
-+		};
-+
-+		rp1_uart2: serial@38000 {
-+			compatible = "arm,pl011-axi";
-+			reg = <0xc0 0x40038000  0x0 0x100>;
-+			interrupts = <RP1_INT_UART2 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&rp1_clocks RP1_CLK_UART &rp1_clocks RP1_PLL_SYS_PRI_PH>;
-+			clock-names = "uartclk", "apb_pclk";
-+			// dmas = <&rp1_dma RP1_DMA_UART2_TX>,
-+			//        <&rp1_dma RP1_DMA_UART2_RX>;
-+			// dma-names = "tx", "rx";
-+			pinctrl-names = "default";
-+			arm,primecell-periphid = <0x00541011>;
-+			uart-has-rtscts;
-+			cts-event-workaround;
-+			skip-init;
-+			status = "disabled";
-+		};
-+
-+		rp1_uart3: serial@3c000 {
-+			compatible = "arm,pl011-axi";
-+			reg = <0xc0 0x4003c000  0x0 0x100>;
-+			interrupts = <RP1_INT_UART3 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&rp1_clocks RP1_CLK_UART &rp1_clocks RP1_PLL_SYS_PRI_PH>;
-+			clock-names = "uartclk", "apb_pclk";
-+			// dmas = <&rp1_dma RP1_DMA_UART3_TX>,
-+			//        <&rp1_dma RP1_DMA_UART3_RX>;
-+			// dma-names = "tx", "rx";
-+			pinctrl-names = "default";
-+			arm,primecell-periphid = <0x00541011>;
-+			uart-has-rtscts;
-+			cts-event-workaround;
-+			skip-init;
-+			status = "disabled";
-+		};
-+
-+		rp1_uart4: serial@40000 {
-+			compatible = "arm,pl011-axi";
-+			reg = <0xc0 0x40040000  0x0 0x100>;
-+			interrupts = <RP1_INT_UART4 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&rp1_clocks RP1_CLK_UART &rp1_clocks RP1_PLL_SYS_PRI_PH>;
-+			clock-names = "uartclk", "apb_pclk";
-+			// dmas = <&rp1_dma RP1_DMA_UART4_TX>,
-+			//        <&rp1_dma RP1_DMA_UART4_RX>;
-+			// dma-names = "tx", "rx";
-+			pinctrl-names = "default";
-+			arm,primecell-periphid = <0x00541011>;
-+			uart-has-rtscts;
-+			cts-event-workaround;
-+			skip-init;
-+			status = "disabled";
-+		};
-+
-+		rp1_uart5: serial@44000 {
-+			compatible = "arm,pl011-axi";
-+			reg = <0xc0 0x40044000  0x0 0x100>;
-+			interrupts = <RP1_INT_UART5 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&rp1_clocks RP1_CLK_UART &rp1_clocks RP1_PLL_SYS_PRI_PH>;
-+			clock-names = "uartclk", "apb_pclk";
-+			// dmas = <&rp1_dma RP1_DMA_UART5_TX>,
-+			//        <&rp1_dma RP1_DMA_UART5_RX>;
-+			// dma-names = "tx", "rx";
-+			pinctrl-names = "default";
-+			arm,primecell-periphid = <0x00541011>;
-+			uart-has-rtscts;
-+			cts-event-workaround;
-+			skip-init;
-+			status = "disabled";
-+		};
-+
-+		rp1_spi8: spi@4c000 {
-+			reg = <0xc0 0x4004c000  0x0 0x130>;
-+			compatible = "snps,dw-apb-ssi";
-+			interrupts = <RP1_INT_SPI8 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&rp1_clocks RP1_CLK_SYS>;
-+			clock-names = "ssi_clk";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			num-cs = <2>;
-+			dmas = <&rp1_dma RP1_DMA_SPI8_TX>,
-+			       <&rp1_dma RP1_DMA_SPI8_RX>;
-+			dma-names = "tx", "rx";
-+			status = "disabled";
-+		};
-+
-+		rp1_spi0: spi@50000 {
-+			reg = <0xc0 0x40050000  0x0 0x130>;
-+			compatible = "snps,dw-apb-ssi";
-+			interrupts = <RP1_INT_SPI0 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&rp1_clocks RP1_CLK_SYS>;
-+			clock-names = "ssi_clk";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			num-cs = <2>;
-+			dmas = <&rp1_dma RP1_DMA_SPI0_TX>,
-+			       <&rp1_dma RP1_DMA_SPI0_RX>;
-+			dma-names = "tx", "rx";
-+			status = "disabled";
-+		};
-+
-+		rp1_spi1: spi@54000 {
-+			reg = <0xc0 0x40054000  0x0 0x130>;
-+			compatible = "snps,dw-apb-ssi";
-+			interrupts = <RP1_INT_SPI1 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&rp1_clocks RP1_CLK_SYS>;
-+			clock-names = "ssi_clk";
-+			#address-cells = <0>;
-+			#size-cells = <0>;
-+			num-cs = <2>;
-+			dmas = <&rp1_dma RP1_DMA_SPI1_TX>,
-+			       <&rp1_dma RP1_DMA_SPI1_RX>;
-+			dma-names = "tx", "rx";
-+			status = "disabled";
-+		};
-+
-+		rp1_spi2: spi@58000 {
-+			reg = <0xc0 0x40058000  0x0 0x130>;
-+			compatible = "snps,dw-apb-ssi";
-+			interrupts = <RP1_INT_SPI2 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&rp1_clocks RP1_CLK_SYS>;
-+			clock-names = "ssi_clk";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			num-cs = <2>;
-+			dmas = <&rp1_dma RP1_DMA_SPI2_TX>,
-+			       <&rp1_dma RP1_DMA_SPI2_RX>;
-+			dma-names = "tx", "rx";
-+			status = "disabled";
-+		};
-+
-+		rp1_spi3: spi@5c000 {
-+			reg = <0xc0 0x4005c000  0x0 0x130>;
-+			compatible = "snps,dw-apb-ssi";
-+			interrupts = <RP1_INT_SPI3 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&rp1_clocks RP1_CLK_SYS>;
-+			clock-names = "ssi_clk";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			num-cs = <2>;
-+			dmas = <&rp1_dma RP1_DMA_SPI3_TX>,
-+			       <&rp1_dma RP1_DMA_SPI3_RX>;
-+			dma-names = "tx", "rx";
-+			status = "disabled";
-+		};
-+
-+		// SPI4 is a target/slave interface
-+		rp1_spi4: spi@60000 {
-+			reg = <0xc0 0x40060000  0x0 0x130>;
-+			compatible = "snps,dw-apb-ssi";
-+			interrupts = <RP1_INT_SPI4 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&rp1_clocks RP1_CLK_SYS>;
-+			clock-names = "ssi_clk";
-+			#address-cells = <0>;
-+			#size-cells = <0>;
-+			num-cs = <1>;
-+			spi-slave;
-+			dmas = <&rp1_dma RP1_DMA_SPI4_TX>,
-+			       <&rp1_dma RP1_DMA_SPI4_RX>;
-+			dma-names = "tx", "rx";
-+			status = "disabled";
-+
-+			slave {
-+				compatible = "spidev";
-+				spi-max-frequency = <1000000>;
-+			};
-+		};
-+
-+		rp1_spi5: spi@64000 {
-+			reg = <0xc0 0x40064000  0x0 0x130>;
-+			compatible = "snps,dw-apb-ssi";
-+			interrupts = <RP1_INT_SPI5 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&rp1_clocks RP1_CLK_SYS>;
-+			clock-names = "ssi_clk";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			num-cs = <2>;
-+			dmas = <&rp1_dma RP1_DMA_SPI5_TX>,
-+			       <&rp1_dma RP1_DMA_SPI5_RX>;
-+			dma-names = "tx", "rx";
-+			status = "disabled";
-+		};
-+
-+		// SPI7 is a target/slave interface
-+		rp1_spi7: spi@6c000 {
-+			reg = <0xc0 0x4006c000  0x0 0x130>;
-+			compatible = "snps,dw-apb-ssi";
-+			interrupts = <RP1_INT_SPI7 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&rp1_clocks RP1_CLK_SYS>;
-+			clock-names = "ssi_clk";
-+			#address-cells = <0>;
-+			#size-cells = <0>;
-+			num-cs = <1>;
-+			spi-slave;
-+			dmas = <&rp1_dma RP1_DMA_SPI7_TX>,
-+			       <&rp1_dma RP1_DMA_SPI7_RX>;
-+			dma-names = "tx", "rx";
-+			status = "disabled";
-+
-+			slave {
-+				compatible = "spidev";
-+				spi-max-frequency = <1000000>;
-+			};
-+		};
-+
-+		rp1_i2c0: i2c@70000 {
-+			reg = <0xc0 0x40070000  0x0 0x1000>;
-+			compatible = "snps,designware-i2c";
-+			interrupts = <RP1_INT_I2C0 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&rp1_clocks RP1_CLK_SYS>;
-+			status = "disabled";
-+		};
-+
-+		rp1_i2c1: i2c@74000 {
-+			reg = <0xc0 0x40074000  0x0 0x1000>;
-+			compatible = "snps,designware-i2c";
-+			interrupts = <RP1_INT_I2C1 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&rp1_clocks RP1_CLK_SYS>;
-+			status = "disabled";
-+		};
-+
-+		rp1_i2c2: i2c@78000 {
-+			reg = <0xc0 0x40078000  0x0 0x1000>;
-+			compatible = "snps,designware-i2c";
-+			interrupts = <RP1_INT_I2C2 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&rp1_clocks RP1_CLK_SYS>;
-+			status = "disabled";
-+		};
-+
-+		rp1_i2c3: i2c@7c000 {
-+			reg = <0xc0 0x4007c000  0x0 0x1000>;
-+			compatible = "snps,designware-i2c";
-+			interrupts = <RP1_INT_I2C3 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&rp1_clocks RP1_CLK_SYS>;
-+			status = "disabled";
-+		};
-+
-+		rp1_i2c4: i2c@80000 {
-+			reg = <0xc0 0x40080000  0x0 0x1000>;
-+			compatible = "snps,designware-i2c";
-+			interrupts = <RP1_INT_I2C4 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&rp1_clocks RP1_CLK_SYS>;
-+			status = "disabled";
-+		};
-+
-+		rp1_i2c5: i2c@84000 {
-+			reg = <0xc0 0x40084000  0x0 0x1000>;
-+			compatible = "snps,designware-i2c";
-+			interrupts = <RP1_INT_I2C5 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&rp1_clocks RP1_CLK_SYS>;
-+			status = "disabled";
-+		};
-+
-+		rp1_i2c6: i2c@88000 {
-+			reg = <0xc0 0x40088000  0x0 0x1000>;
-+			compatible = "snps,designware-i2c";
-+			interrupts = <RP1_INT_I2C6 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&rp1_clocks RP1_CLK_SYS>;
-+			status = "disabled";
-+		};
-+
-+		rp1_pwm0: pwm@98000 {
-+			compatible = "raspberrypi,rp1-pwm";
-+			reg = <0xc0 0x40098000  0x0 0x100>;
-+			#pwm-cells = <3>;
-+			clocks = <&rp1_clocks RP1_CLK_PWM0>;
-+			assigned-clocks = <&rp1_clocks RP1_CLK_PWM0>;
-+			assigned-clock-rates = <6144000>;
-+			status = "disabled";
-+		};
-+
-+		rp1_pwm1: pwm@9c000 {
-+			compatible = "raspberrypi,rp1-pwm";
-+			reg = <0xc0 0x4009c000  0x0 0x100>;
-+			#pwm-cells = <3>;
-+			clocks = <&rp1_clocks RP1_CLK_PWM1>;
-+			assigned-clocks = <&rp1_clocks RP1_CLK_PWM1>;
-+			assigned-clock-rates = <6144000>;
-+			status = "disabled";
-+		};
-+
-+		rp1_i2s0: i2s@a0000 {
-+			reg = <0xc0 0x400a0000  0x0 0x1000>;
-+			compatible = "snps,designware-i2s";
-+			// Providing an interrupt disables DMA
-+			// interrupts = <RP1_INT_I2S0 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&rp1_clocks RP1_CLK_I2S>;
-+			clock-names = "i2sclk";
-+			#sound-dai-cells = <0>;
-+			dmas = <&rp1_dma RP1_DMA_I2S0_TX>,<&rp1_dma RP1_DMA_I2S0_RX>;
-+			dma-names = "tx", "rx";
-+			status = "disabled";
-+		};
-+
-+		rp1_i2s1: i2s@a4000 {
-+			reg = <0xc0 0x400a4000  0x0 0x1000>;
-+			compatible = "snps,designware-i2s";
-+			// Providing an interrupt disables DMA
-+			// interrupts = <RP1_INT_I2S1 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&rp1_clocks RP1_CLK_I2S>;
-+			clock-names = "i2sclk";
-+			#sound-dai-cells = <0>;
-+			dmas = <&rp1_dma RP1_DMA_I2S1_TX>,<&rp1_dma RP1_DMA_I2S1_RX>;
-+			dma-names = "tx", "rx";
-+			status = "disabled";
-+		};
-+
-+		rp1_i2s2: i2s@a8000 {
-+			reg = <0xc0 0x400a8000  0x0 0x1000>;
-+			compatible = "snps,designware-i2s";
-+			// Providing an interrupt disables DMA
-+			// interrupts = <RP1_INT_I2S2 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&rp1_clocks RP1_CLK_I2S>;
-+			status = "disabled";
-+		};
-+
-+		rp1_sdio_clk0: sdio_clk0@b0004 {
-+			compatible = "raspberrypi,rp1-sdio-clk";
-+			reg = <0xc0 0x400b0004 0x0 0x1c>;
-+			clocks = <&sdio_src &sdhci_core>;
-+			clock-names = "src", "base";
-+			#clock-cells = <0>;
-+			status = "disabled";
-+		};
-+
-+		rp1_sdio_clk1: sdio_clk1@b4004 {
-+			compatible = "raspberrypi,rp1-sdio-clk";
-+			reg = <0xc0 0x400b4004 0x0 0x1c>;
-+			clocks = <&sdio_src &sdhci_core>;
-+			clock-names = "src", "base";
-+			#clock-cells = <0>;
-+			status = "disabled";
-+		};
-+
-+		rp1_adc: adc@c8000 {
-+			compatible = "raspberrypi,rp1-adc";
-+			reg = <0xc0 0x400c8000 0x0 0x4000>;
-+			clocks = <&rp1_clocks RP1_CLK_ADC>;
-+			clock-names = "adcclk";
-+			#clock-cells = <0>;
-+			vref-supply = <&rp1_vdd_3v3>;
-+			status = "disabled";
-+		};
-+
-+		rp1_gpio: gpio@d0000 {
-+			reg = <0xc0 0x400d0000  0x0 0xc000>,
-+			      <0xc0 0x400e0000  0x0 0xc000>,
-+			      <0xc0 0x400f0000  0x0 0xc000>;
-+			compatible = "raspberrypi,rp1-gpio";
-+			interrupts = <RP1_INT_IO_BANK0 IRQ_TYPE_LEVEL_HIGH>,
-+				     <RP1_INT_IO_BANK1 IRQ_TYPE_LEVEL_HIGH>,
-+			             <RP1_INT_IO_BANK2 IRQ_TYPE_LEVEL_HIGH>;
-+			gpio-controller;
-+			#gpio-cells = <2>;
-+			interrupt-controller;
-+			#interrupt-cells = <2>;
-+
-+			rp1_uart0_14_15: rp1_uart0_14_15 {
-+				pin_txd {
-+					function = "uart0";
-+					pins = "gpio14";
-+					bias-disable;
-+				};
-+				pin_rxd {
-+					function = "uart0";
-+					pins = "gpio15";
-+					bias-pull-up;
-+				};
-+			};
-+			rp1_uart0_ctsrts_16_17: rp1_uart0_ctsrts_16_17 {
-+				pin_cts {
-+					function = "uart0";
-+					pins = "gpio16";
-+					bias-pull-up;
-+				};
-+				pin_rts {
-+					function = "uart0";
-+					pins = "gpio17";
-+					bias-disable;
-+				};
-+			};
-+			rp1_uart1_0_1: rp1_uart1_0_1 {
-+				pin_txd {
-+					function = "uart1";
-+					pins = "gpio0";
-+					bias-disable;
-+				};
-+				pin_rxd {
-+					function = "uart1";
-+					pins = "gpio1";
-+					bias-pull-up;
-+				};
-+			};
-+			rp1_uart1_ctsrts_2_3: rp1_uart1_ctsrts_2_3 {
-+				pin_cts {
-+					function = "uart1";
-+					pins = "gpio2";
-+					bias-pull-up;
-+				};
-+				pin_rts {
-+					function = "uart1";
-+					pins = "gpio3";
-+					bias-disable;
-+				};
-+			};
-+			rp1_uart2_4_5: rp1_uart2_4_5 {
-+				pin_txd {
-+					function = "uart2";
-+					pins = "gpio4";
-+					bias-disable;
-+				};
-+				pin_rxd {
-+					function = "uart2";
-+					pins = "gpio5";
-+					bias-pull-up;
-+				};
-+			};
-+			rp1_uart2_ctsrts_6_7: rp1_uart2_ctsrts_6_7 {
-+				pin_cts {
-+					function = "uart2";
-+					pins = "gpio6";
-+					bias-pull-up;
-+				};
-+				pin_rts {
-+					function = "uart2";
-+					pins = "gpio7";
-+					bias-disable;
-+				};
-+			};
-+			rp1_uart3_8_9: rp1_uart3_8_9 {
-+				pin_txd {
-+					function = "uart3";
-+					pins = "gpio8";
-+					bias-disable;
-+				};
-+				pin_rxd {
-+					function = "uart3";
-+					pins = "gpio9";
-+					bias-pull-up;
-+				};
-+			};
-+			rp1_uart3_ctsrts_10_11: rp1_uart3_ctsrts_10_11 {
-+				pin_cts {
-+					function = "uart3";
-+					pins = "gpio10";
-+					bias-pull-up;
-+				};
-+				pin_rts {
-+					function = "uart3";
-+					pins = "gpio11";
-+					bias-disable;
-+				};
-+			};
-+			rp1_uart4_12_13: rp1_uart4_12_13 {
-+				pin_txd {
-+					function = "uart4";
-+					pins = "gpio12";
-+					bias-disable;
-+				};
-+				pin_rxd {
-+					function = "uart4";
-+					pins = "gpio13";
-+					bias-pull-up;
-+				};
-+			};
-+			rp1_uart4_ctsrts_14_15: rp1_uart4_ctsrts_14_15 {
-+				pin_cts {
-+					function = "uart4";
-+					pins = "gpio14";
-+					bias-pull-up;
-+				};
-+				pin_rts {
-+					function = "uart4";
-+					pins = "gpio15";
-+					bias-disable;
-+				};
-+			};
-+
-+			rp1_sdio0_22_27: rp1_sdio0_22_27 {
-+				pin_clk {
-+					function = "sd0";
-+					pins = "gpio22";
-+					bias-disable;
-+					drive-strength = <12>;
-+					slew-rate = <1>;
-+				};
-+				pin_cmd {
-+					function = "sd0";
-+					pins = "gpio23";
-+					bias-pull-up;
-+					drive-strength = <12>;
-+					slew-rate = <1>;
-+				};
-+				pins_dat {
-+					function = "sd0";
-+					pins = "gpio24", "gpio25", "gpio26", "gpio27";
-+					bias-pull-up;
-+					drive-strength = <12>;
-+					slew-rate = <1>;
-+				};
-+			};
-+
-+			rp1_sdio1_28_33: rp1_sdio1_28_33 {
-+				pin_clk {
-+					function = "sd1";
-+					pins = "gpio28";
-+					bias-disable;
-+					drive-strength = <12>;
-+					slew-rate = <1>;
-+				};
-+				pin_cmd {
-+					function = "sd1";
-+					pins = "gpio29";
-+					bias-pull-up;
-+					drive-strength = <12>;
-+					slew-rate = <1>;
-+				};
-+				pins_dat {
-+					function = "sd1";
-+					pins = "gpio30", "gpio31", "gpio32", "gpio33";
-+					bias-pull-up;
-+					drive-strength = <12>;
-+					slew-rate = <1>;
-+				};
-+			};
-+
-+			rp1_i2s0_18_21: rp1_i2s0_18_21 {
-+				function = "i2s0";
-+				pins = "gpio18", "gpio19", "gpio20", "gpio21";
-+				bias-disable;
-+			};
-+
-+			rp1_i2s1_18_21: rp1_i2s1_18_21 {
-+				function = "i2s1";
-+				pins = "gpio18", "gpio19", "gpio20", "gpio21";
-+				bias-disable;
-+			};
-+
-+			rp1_i2c4_34_35: rp1_i2c4_34_35 {
-+				function = "i2c4";
-+				pins = "gpio34", "gpio35";
-+				bias-pull-up;
-+			};
-+			rp1_i2c6_38_39: rp1_i2c6_38_39 {
-+				function = "i2c6";
-+				pins = "gpio38", "gpio39";
-+				bias-pull-up;
-+			};
-+			rp1_i2c4_40_41: rp1_i2c4_40_41 {
-+				function = "i2c4";
-+				pins = "gpio40", "gpio41";
-+				bias-pull-up;
-+			};
-+			rp1_i2c5_44_45: rp1_i2c5_44_45 {
-+				function = "i2c5";
-+				pins = "gpio44", "gpio45";
-+				bias-pull-up;
-+			};
-+			rp1_i2c0_0_1: rp1_i2c0_0_1 {
-+				function = "i2c0";
-+				pins = "gpio0", "gpio1";
-+				bias-pull-up;
-+			};
-+			rp1_i2c0_8_9: rp1_i2c0_8_9 {
-+				function = "i2c0";
-+				pins = "gpio8", "gpio9";
-+				bias-pull-up;
-+			};
-+			rp1_i2c1_2_3: rp1_i2c1_2_3 {
-+				function = "i2c1";
-+				pins = "gpio2", "gpio3";
-+				bias-pull-up;
-+			};
-+			rp1_i2c1_10_11: rp1_i2c1_10_11 {
-+				function = "i2c1";
-+				pins = "gpio10", "gpio11";
-+				bias-pull-up;
-+			};
-+			rp1_i2c2_4_5: rp1_i2c2_4_5 {
-+				function = "i2c2";
-+				pins = "gpio4", "gpio5";
-+				bias-pull-up;
-+			};
-+			rp1_i2c2_12_13: rp1_i2c2_12_13 {
-+				function = "i2c2";
-+				pins = "gpio12", "gpio13";
-+				bias-pull-up;
-+			};
-+			rp1_i2c3_6_7: rp1_i2c3_6_7 {
-+				function = "i2c3";
-+				pins = "gpio6", "gpio7";
-+				bias-pull-up;
-+			};
-+			rp1_i2c3_14_15: rp1_i2c3_14_15 {
-+				function = "i2c3";
-+				pins = "gpio14", "gpio15";
-+				bias-pull-up;
-+			};
-+			rp1_i2c3_22_23: rp1_i2c3_22_23 {
-+				function = "i2c3";
-+				pins = "gpio22", "gpio23";
-+				bias-pull-up;
-+			};
-+
-+			// DPI mappings with HSYNC,VSYNC but without PIXCLK,DE
-+			rp1_dpi_16bit_gpio2: rp1_dpi_16bit_gpio2 { /* Mode 2, not fully supported by RP1 */
-+				function = "dpi";
-+				pins = "gpio2", "gpio3", "gpio4", "gpio5",
-+				       "gpio6", "gpio7", "gpio8", "gpio9",
-+				       "gpio10", "gpio11", "gpio12", "gpio13",
-+				       "gpio14", "gpio15", "gpio16", "gpio17",
-+				       "gpio18", "gpio19";
-+				bias-disable;
-+			};
-+			rp1_dpi_16bit_cpadhi_gpio2: rp1_dpi_16bit_cpadhi_gpio2 { /* Mode 3 */
-+				function = "dpi";
-+				pins = "gpio2", "gpio3", "gpio4", "gpio5",
-+				       "gpio6", "gpio7", "gpio8",
-+				       "gpio12", "gpio13", "gpio14", "gpio15",
-+				       "gpio16", "gpio17",
-+				       "gpio20", "gpio21", "gpio22", "gpio23",
-+				       "gpio24";
-+				bias-disable;
-+			};
-+			rp1_dpi_16bit_pad666_gpio2: rp1_dpi_16bit_pad666_gpio2 { /* Mode 4 */
-+				function = "dpi";
-+				pins = "gpio2", "gpio3",
-+				       "gpio5", "gpio6", "gpio7", "gpio8",
-+				       "gpio9",
-+				       "gpio12", "gpio13", "gpio14", "gpio15",
-+				       "gpio16", "gpio17",
-+				       "gpio21", "gpio22", "gpio23", "gpio24",
-+				       "gpio25";
-+				bias-disable;
-+			};
-+			rp1_dpi_18bit_gpio2: rp1_dpi_18bit_gpio2 { /* Mode 5, not fully supported by RP1 */
-+				function = "dpi";
-+				pins = "gpio2", "gpio3", "gpio4", "gpio5",
-+				       "gpio6", "gpio7", "gpio8", "gpio9",
-+				       "gpio10", "gpio11", "gpio12", "gpio13",
-+				       "gpio14", "gpio15", "gpio16", "gpio17",
-+				       "gpio18", "gpio19", "gpio20", "gpio21";
-+				bias-disable;
-+			};
-+			rp1_dpi_18bit_cpadhi_gpio2: rp1_dpi_18bit_cpadhi_gpio2 { /* Mode 6 */
-+				function = "dpi";
-+				pins = "gpio2", "gpio3", "gpio4", "gpio5",
-+				       "gpio6", "gpio7", "gpio8", "gpio9",
-+				       "gpio12", "gpio13", "gpio14", "gpio15",
-+				       "gpio16", "gpio17",
-+				       "gpio20", "gpio21", "gpio22", "gpio23",
-+				       "gpio24", "gpio25";
-+				bias-disable;
-+			};
-+			rp1_dpi_24bit_gpio2: rp1_dpi_24bit_gpio2 { /* Mode 7 */
-+				function = "dpi";
-+				pins = "gpio2", "gpio3", "gpio4", "gpio5",
-+				       "gpio6", "gpio7", "gpio8", "gpio9",
-+				       "gpio10", "gpio11", "gpio12", "gpio13",
-+				       "gpio14", "gpio15", "gpio16", "gpio17",
-+				       "gpio18", "gpio19", "gpio20", "gpio21",
-+				       "gpio22", "gpio23", "gpio24", "gpio25",
-+				       "gpio26", "gpio27";
-+				bias-disable;
-+			};
-+			rp1_dpi_hvsync: rp1_dpi_hvsync { /* Sync only, for use with int VDAC */
-+				function = "dpi";
-+				pins = "gpio2", "gpio3";
-+				bias-disable;
-+			};
-+
-+			// More DPI mappings, including PIXCLK,DE on GPIOs 0,1
-+			rp1_dpi_16bit_gpio0: rp1_dpi_16bit_gpio0 { /* Mode 2, not fully supported by RP1 */
-+				function = "dpi";
-+				pins = "gpio0", "gpio1", "gpio2", "gpio3",
-+				       "gpio4", "gpio5", "gpio6", "gpio7",
-+				       "gpio8", "gpio9", "gpio10", "gpio11",
-+				       "gpio12", "gpio13", "gpio14", "gpio15",
-+				       "gpio16", "gpio17", "gpio18", "gpio19";
-+				bias-disable;
-+			};
-+			rp1_dpi_16bit_cpadhi_gpio0: rp1_dpi_16bit_cpadhi_gpio0 { /* Mode 3 */
-+				function = "dpi";
-+				pins = "gpio0", "gpio1", "gpio2", "gpio3",
-+				       "gpio4", "gpio5", "gpio6", "gpio7",
-+				       "gpio8",
-+				       "gpio12", "gpio13", "gpio14", "gpio15",
-+				       "gpio16", "gpio17",
-+				       "gpio20", "gpio21", "gpio22", "gpio23",
-+				       "gpio24";
-+				bias-disable;
-+			};
-+			rp1_dpi_16bit_pad666_gpio0: rp1_dpi_16bit_pad666_gpio0 { /* Mode 4 */
-+				function = "dpi";
-+				pins = "gpio0", "gpio1", "gpio2", "gpio3",
-+				       "gpio5", "gpio6", "gpio7", "gpio8",
-+				       "gpio9",
-+				       "gpio12", "gpio13", "gpio14", "gpio15",
-+				       "gpio16", "gpio17",
-+				       "gpio21", "gpio22", "gpio23", "gpio24",
-+				       "gpio25";
-+				bias-disable;
-+			};
-+			rp1_dpi_18bit_gpio0: rp1_dpi_18bit_gpio0 { /* Mode 5, not fully supported by RP1 */
-+				function = "dpi";
-+				pins = "gpio0", "gpio1", "gpio2", "gpio3",
-+				       "gpio4", "gpio5", "gpio6", "gpio7",
-+				       "gpio8", "gpio9", "gpio10", "gpio11",
-+				       "gpio12", "gpio13", "gpio14", "gpio15",
-+				       "gpio16", "gpio17", "gpio18", "gpio19",
-+				       "gpio20", "gpio21";
-+				bias-disable;
-+			};
-+			rp1_dpi_18bit_cpadhi_gpio0: rp1_dpi_18bit_cpadhi_gpio0 { /* Mode 6 */
-+				function = "dpi";
-+				pins = "gpio0", "gpio1", "gpio2", "gpio3",
-+				       "gpio4", "gpio5", "gpio6", "gpio7",
-+				       "gpio8", "gpio9",
-+				       "gpio12", "gpio13", "gpio14", "gpio15",
-+				       "gpio16", "gpio17",
-+				       "gpio20", "gpio21", "gpio22", "gpio23",
-+				       "gpio24", "gpio25";
-+				bias-disable;
-+			};
-+			rp1_dpi_24bit_gpio0: rp1_dpi_24bit_gpio0 { /* Mode 7 -- All GPIOs used! */
-+				function = "dpi";
-+				pins = "gpio0", "gpio1", "gpio2", "gpio3",
-+				       "gpio4", "gpio5", "gpio6", "gpio7",
-+				       "gpio8", "gpio9", "gpio10", "gpio11",
-+				       "gpio12", "gpio13", "gpio14", "gpio15",
-+				       "gpio16", "gpio17", "gpio18", "gpio19",
-+				       "gpio20", "gpio21", "gpio22", "gpio23",
-+				       "gpio24", "gpio25", "gpio26", "gpio27";
-+				bias-disable;
-+			};
-+
-+			rp1_pwm1_gpio45: rp1_pwm1_gpio45 {
-+				function = "pwm1";
-+				pins = "gpio45";
-+				bias-pull-down;
-+			};
-+
-+			rp1_spi0_gpio9: rp1_spi0_gpio9 {
-+				function = "spi0";
-+				pins = "gpio9", "gpio10", "gpio11";
-+				bias-disable;
-+				drive-strength = <12>;
-+				slew-rate = <1>;
-+			};
-+
-+			rp1_spi0_cs_gpio7: rp1_spi0_cs_gpio7 {
-+				function = "spi0";
-+				pins = "gpio7", "gpio8";
-+				bias-pull-up;
-+			};
-+
-+			rp1_spi1_gpio19: rp1_spi1_gpio19 {
-+				function = "spi1";
-+				pins = "gpio19", "gpio20", "gpio21";
-+				bias-disable;
-+				drive-strength = <12>;
-+				slew-rate = <1>;
-+			};
-+
-+			rp1_spi2_gpio1: rp1_spi2_gpio1 {
-+				function = "spi2";
-+				pins = "gpio1", "gpio2", "gpio3";
-+				bias-disable;
-+				drive-strength = <12>;
-+				slew-rate = <1>;
-+			};
-+
-+			rp1_spi3_gpio5: rp1_spi3_gpio5 {
-+				function = "spi3";
-+				pins = "gpio5", "gpio6", "gpio7";
-+				bias-disable;
-+				drive-strength = <12>;
-+				slew-rate = <1>;
-+			};
-+
-+			rp1_spi4_gpio9: rp1_spi4_gpio9 {
-+				function = "spi4";
-+				pins = "gpio9", "gpio10", "gpio11";
-+				bias-disable;
-+				drive-strength = <12>;
-+				slew-rate = <1>;
-+			};
-+
-+			rp1_spi5_gpio13: rp1_spi5_gpio13 {
-+				function = "spi5";
-+				pins = "gpio13", "gpio14", "gpio15";
-+				bias-disable;
-+				drive-strength = <12>;
-+				slew-rate = <1>;
-+			};
-+
-+			rp1_spi8_gpio49: rp1_spi8_gpio49 {
-+				function = "spi8";
-+				pins = "gpio49", "gpio50", "gpio51";
-+				bias-disable;
-+				drive-strength = <12>;
-+				slew-rate = <1>;
-+			};
-+
-+			rp1_spi8_cs_gpio52: rp1_spi8_cs_gpio52 {
-+				function = "spi0";
-+				pins = "gpio52", "gpio53";
-+				bias-pull-up;
-+			};
-+		};
-+
-+		rp1_eth: ethernet@100000 {
-+			reg = <0xc0 0x40100000  0x0 0x4000>;
-+			compatible = "cdns,macb";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			interrupts = <RP1_INT_ETH IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&macb_pclk &macb_hclk &rp1_clocks RP1_CLK_ETH_TSU>;
-+			clock-names = "pclk", "hclk", "tsu_clk";
-+			phy-mode = "rgmii-id";
-+			cdns,aw2w-max-pipe = /bits/ 8 <8>;
-+			cdns,ar2r-max-pipe = /bits/ 8 <8>;
-+			cdns,use-aw2b-fill;
-+			local-mac-address = [00 00 00 00 00 00];
-+			status = "disabled";
-+		};
-+
-+		rp1_csi0: csi@110000 {
-+			compatible = "raspberrypi,rp1-cfe";
-+			reg = <0xc0 0x40110000  0x0 0x100>, // CSI2 DMA address
-+			      <0xc0 0x40114000  0x0 0x100>, // PHY/CSI Host address
-+			      <0xc0 0x40120000  0x0 0x100>, // MIPI CFG address
-+			      <0xc0 0x40124000  0x0 0x1000>; // PiSP FE address
-+
-+			// interrupts must match rp1_pisp_fe setup
-+			interrupts = <RP1_INT_MIPI0 IRQ_TYPE_LEVEL_HIGH>;
-+
-+			clocks = <&rp1_clocks RP1_CLK_MIPI0_CFG>;
-+			assigned-clocks = <&rp1_clocks RP1_CLK_MIPI0_CFG>;
-+			assigned-clock-rates = <25000000>;
-+
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "disabled";
-+		};
-+
-+		rp1_csi1: csi@128000 {
-+			compatible = "raspberrypi,rp1-cfe";
-+			reg = <0xc0 0x40128000  0x0 0x100>, // CSI2 DMA address
-+			      <0xc0 0x4012c000  0x0 0x100>, // PHY/CSI Host address
-+			      <0xc0 0x40138000  0x0 0x100>, // MIPI CFG address
-+			      <0xc0 0x4013c000  0x0 0x1000>; // PiSP FE address
-+
-+			// interrupts must match rp1_pisp_fe setup
-+			interrupts = <RP1_INT_MIPI1 IRQ_TYPE_LEVEL_HIGH>;
-+
-+			clocks = <&rp1_clocks RP1_CLK_MIPI1_CFG>;
-+			assigned-clocks = <&rp1_clocks RP1_CLK_MIPI1_CFG>;
-+			assigned-clock-rates = <25000000>;
-+
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "disabled";
-+		};
-+
-+		rp1_mmc0: mmc@180000 {
-+			reg = <0xc0 0x40180000  0x0 0x100>;
-+			compatible = "snps,dwcmshc-sdhci";
-+			interrupts = <RP1_INT_SDIO0 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&rp1_clocks RP1_CLK_SYS &sdhci_core
-+			          &rp1_clocks RP1_CLK_SDIO_TIMER
-+			          &rp1_sdio_clk0>;
-+			clock-names = "bus", "core", "timeout", "sdio";
-+			/* Bank 0 VDDIO is fixed */
-+			no-1-8-v;
-+			bus-width = <4>;
-+			vmmc-supply = <&rp1_vdd_3v3>;
-+			broken-cd;
-+			status = "disabled";
-+		};
-+
-+		rp1_mmc1: mmc@184000 {
-+			reg = <0xc0 0x40184000  0x0 0x100>;
-+			compatible = "snps,dwcmshc-sdhci";
-+			interrupts = <RP1_INT_SDIO1 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&rp1_clocks RP1_CLK_SYS &sdhci_core
-+			          &rp1_clocks RP1_CLK_SDIO_TIMER
-+			          &rp1_sdio_clk1>;
-+			clock-names = "bus", "core", "timeout", "sdio";
-+			bus-width = <4>;
-+			vmmc-supply = <&rp1_vdd_3v3>;
-+			/* Nerf SDR speeds */
-+			sdhci-caps-mask = <0x3 0x0>;
-+			broken-cd;
-+			status = "disabled";
-+		};
-+
-+		rp1_dma: dma@188000 {
-+			reg = <0xc0 0x40188000  0x0 0x1000>;
-+			compatible = "snps,axi-dma-1.01a";
-+			interrupts = <RP1_INT_DMA IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&sdhci_core &rp1_clocks RP1_CLK_SYS>;
-+			clock-names = "core-clk", "cfgr-clk";
-+
-+			#dma-cells = <1>;
-+			dma-channels = <8>;
-+			snps,dma-masters = <1>;
-+			snps,dma-targets = <64>;
-+			snps,data-width = <4>; // (8 << 4) == 128 bits
-+			snps,block-size = <0x40000 0x40000 0x40000 0x40000 0x40000 0x40000 0x40000 0x40000>;
-+			snps,priority = <0 1 2 3 4 5 6 7>;
-+			snps,axi-max-burst-len = <8>;
-+			status = "disabled";
-+		};
-+
-+		rp1_usb0: usb@200000 {
-+			reg = <0xc0 0x40200000  0x0 0x100000>;
-+			compatible = "snps,dwc3";
-+			dr_mode = "host";
-+			usb3-lpm-capable;
-+			snps,axi-pipe-limit = /bits/ 8 <8>;
-+			snps,dis_rxdet_inp3_quirk;
-+			snps,tx-max-burst-prd = <8>;
-+			snps,tx-thr-num-pkt-prd = <2>;
-+			interrupts = <RP1_INT_USBHOST0_0 IRQ_TYPE_EDGE_RISING>;
-+			status = "disabled";
-+		};
-+
-+		rp1_usb1: usb@300000 {
-+			reg = <0xc0 0x40300000  0x0 0x100000>;
-+			compatible = "snps,dwc3";
-+			dr_mode = "host";
-+			usb3-lpm-capable;
-+			snps,axi-pipe-limit = /bits/ 8 <8>;
-+			snps,dis_rxdet_inp3_quirk;
-+			snps,tx-max-burst-prd = <8>;
-+			snps,tx-thr-num-pkt-prd = <2>;
-+			interrupts = <RP1_INT_USBHOST1_0 IRQ_TYPE_EDGE_RISING>;
-+			status = "disabled";
-+		};
-+
-+		rp1_dsi0: dsi@110000 {
-+			compatible = "raspberrypi,rp1dsi";
-+			status = "disabled";
-+			reg = <0xc0 0x40118000  0x0 0x1000>,  // MIPI0 DSI DMA (ArgonDPI)
-+			      <0xc0 0x4011c000  0x0 0x1000>,  // MIPI0 DSI Host (SNPS)
-+			      <0xc0 0x40120000  0x0 0x1000>;  // MIPI0 CFG
-+
-+			interrupts = <RP1_INT_MIPI0 IRQ_TYPE_LEVEL_HIGH>;
-+
-+			clocks = <&rp1_clocks RP1_CLK_MIPI0_CFG>,  // required, config bus clock
-+				 <&rp1_clocks RP1_CLK_MIPI0_DPI>,  // required, pixel clock
-+				 <&clksrc_mipi0_dsi_byteclk>,    // internal, parent for divide
-+				 <&clk_xosc>;                    // hardwired to DSI "refclk"
-+			clock-names = "cfgclk", "dpiclk", "byteclk", "refclk";
-+
-+			assigned-clocks = <&rp1_clocks RP1_CLK_MIPI0_CFG>,
-+					  <&rp1_clocks RP1_CLK_MIPI0_DPI>;
-+			assigned-clock-rates = <25000000>;
-+			assigned-clock-parents = <0>, <&clksrc_mipi0_dsi_byteclk>;
-+		};
-+
-+		rp1_dsi1: dsi@128000 {
-+			compatible = "raspberrypi,rp1dsi";
-+			status = "disabled";
-+			reg = <0xc0 0x40130000  0x0 0x1000>,  // MIPI1 DSI DMA (ArgonDPI)
-+		              <0xc0 0x40134000  0x0 0x1000>,  // MIPI1 DSI Host (SNPS)
-+		              <0xc0 0x40138000  0x0 0x1000>;  // MIPI1 CFG
-+
-+			interrupts = <RP1_INT_MIPI1 IRQ_TYPE_LEVEL_HIGH>;
-+
-+			clocks = <&rp1_clocks RP1_CLK_MIPI1_CFG>,  // required, config bus clock
-+				 <&rp1_clocks RP1_CLK_MIPI1_DPI>,  // required, pixel clock
-+				 <&clksrc_mipi1_dsi_byteclk>,    // internal, parent for divide
-+				 <&clk_xosc>;                    // hardwired to DSI "refclk"
-+			clock-names = "cfgclk", "dpiclk", "byteclk", "refclk";
-+
-+			assigned-clocks = <&rp1_clocks RP1_CLK_MIPI1_CFG>,
-+					  <&rp1_clocks RP1_CLK_MIPI1_DPI>;
-+			assigned-clock-rates = <25000000>;
-+			assigned-clock-parents = <0>, <&clksrc_mipi1_dsi_byteclk>;
-+		};
-+
-+		/* VEC and DPI both need to control PLL_VIDEO and cannot work together;   */
-+		/* config.txt should enable one or other using dtparam=vec or an overlay. */
-+		rp1_vec: vec@144000 {
-+			compatible = "raspberrypi,rp1vec";
-+			status = "disabled";
-+			reg = <0xc0 0x40144000  0x0 0x1000>, // VIDEO_OUT_VEC
-+			      <0xc0 0x40140000  0x0 0x1000>; // VIDEO_OUT_CFG
-+
-+			interrupts = <RP1_INT_VIDEO_OUT IRQ_TYPE_LEVEL_HIGH>;
-+
-+			clocks = <&rp1_clocks RP1_CLK_VEC>;
-+
-+			assigned-clocks = <&rp1_clocks RP1_PLL_VIDEO_CORE>,
-+					  <&rp1_clocks RP1_PLL_VIDEO_SEC>,
-+					  <&rp1_clocks RP1_CLK_VEC>;
-+			assigned-clock-rates = <1188000000>,
-+					       <108000000>,
-+					       <108000000>;
-+			assigned-clock-parents = <0>,
-+						 <&rp1_clocks RP1_PLL_VIDEO_CORE>,
-+						 <&rp1_clocks RP1_PLL_VIDEO_SEC>;
-+		};
-+
-+		rp1_dpi: dpi@148000 {
-+			compatible = "raspberrypi,rp1dpi";
-+			status = "disabled";
-+			reg = <0xc0 0x40148000  0x0 0x1000>, // VIDEO_OUT DPI
-+			      <0xc0 0x40140000  0x0 0x1000>; // VIDEO_OUT_CFG
-+
-+			interrupts = <RP1_INT_VIDEO_OUT IRQ_TYPE_LEVEL_HIGH>;
-+
-+			clocks = <&rp1_clocks RP1_CLK_DPI>,        // DPI pixel clock
-+				 <&rp1_clocks RP1_PLL_VIDEO>,      // PLL primary divider, and
-+				 <&rp1_clocks RP1_PLL_VIDEO_CORE>; // VCO, which we also control
-+			clock-names = "dpiclk", "plldiv", "pllcore";
-+
-+			assigned-clocks        = <&rp1_clocks RP1_CLK_DPI>;
-+			assigned-clock-parents = <&rp1_clocks RP1_PLL_VIDEO>;
-+		};
-+	};
-+};
-+
-+&clocks {
-+	clk_xosc: clk_xosc {
-+		compatible = "fixed-clock";
-+		#clock-cells = <0>;
-+		clock-output-names = "xosc";
-+		clock-frequency = <50000000>;
-+	};
-+	macb_pclk: macb_pclk {
-+		compatible = "fixed-clock";
-+		#clock-cells = <0>;
-+		clock-output-names = "pclk";
-+		clock-frequency = <200000000>;
-+	};
-+	macb_hclk: macb_hclk {
-+		compatible = "fixed-clock";
-+		#clock-cells = <0>;
-+		clock-output-names = "hclk";
-+		clock-frequency = <200000000>;
-+	};
-+	sdio_src: sdio_src {
-+		// 400 MHz on FPGA. PLL sys VCO on asic
-+		compatible = "fixed-clock";
-+		#clock-cells = <0>;
-+		clock-output-names = "src";
-+		clock-frequency = <1000000000>;
-+	};
-+	sdhci_core: sdhci_core {
-+		compatible = "fixed-clock";
-+		#clock-cells = <0>;
-+		clock-output-names = "core";
-+		clock-frequency = <50000000>;
-+	};
-+	clksrc_mipi0_dsi_byteclk: clksrc_mipi0_dsi_byteclk {
-+		// This clock is synthesized by MIPI0 D-PHY, when DSI is running.
-+		// Its frequency is not known a priori (until a panel driver attaches)
-+		// so assign a made-up frequency of 72MHz so it can be divided for DPI.
-+		compatible = "fixed-clock";
-+		#clock-cells = <0>;
-+		clock-output-names = "clksrc_mipi0_dsi_byteclk";
-+		clock-frequency = <72000000>;
-+	};
-+	clksrc_mipi1_dsi_byteclk: clksrc_mipi1_dsi_byteclk {
-+		// This clock is synthesized by MIPI1 D-PHY, when DSI is running.
-+		// Its frequency is not known a priori (until a panel driver attaches)
-+		// so assign a made-up frequency of 72MHz so it can be divided for DPI.
-+		compatible = "fixed-clock";
-+		#clock-cells = <0>;
-+		clock-output-names = "clksrc_mipi1_dsi_byteclk";
-+		clock-frequency = <72000000>;
-+	};
-+};
-+
-+/ {
-+	rp1_vdd_3v3: rp1_vdd_3v3 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vdd-3v3";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		regulator-always-on;
-+	};
-+};
---- a/arch/arm64/boot/dts/broadcom/Makefile
-+++ b/arch/arm64/boot/dts/broadcom/Makefile
-@@ -16,6 +16,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rp
- dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-cm3.dtb
- dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-cm4.dtb
- dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-cm4s.dtb
-+dtb-$(CONFIG_ARCH_BCM2835) += bcm2712-rpi-5-b.dtb
- 
- subdir-y	+= bcmbca
- subdir-y	+= northstar2
---- /dev/null
-+++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts
-@@ -0,0 +1 @@
-+#include "../../../../arm/boot/dts/bcm2712-rpi-5-b.dts"
diff --git a/target/linux/bcm27xx/patches-6.1/950-0855-gpio_brcmstb-Allow-to-build-for-ARCH_BCM2835.patch b/target/linux/bcm27xx/patches-6.1/950-0855-gpio_brcmstb-Allow-to-build-for-ARCH_BCM2835.patch
deleted file mode 100644
index 7e39ac8abf..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0855-gpio_brcmstb-Allow-to-build-for-ARCH_BCM2835.patch
+++ /dev/null
@@ -1,282 +0,0 @@
-From fa18902ee1e53ad391a455a01be3ab2ea1c5af5f Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Fri, 21 May 2021 12:33:38 +0100
-Subject: [PATCH] gpio_brcmstb: Allow to build for ARCH_BCM2835
-
-gpio-brcmstb: Report the correct bank width
-
-gpio: brcmstb: Use bank address as gpiochip label
-
-If the path to the device node is used as gpiochip label then
-gpio-brcmstb instances with multiple banks end up with duplicated
-names. Instead, use a combination of the driver name with the physical
-address of the bank, which is both unique and helpful for devmem
-debugging.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-gpio: mmio: Add DIRECT mode for shared access
-
-The generic MMIO GPIO library uses shadow registers for efficiency,
-but this breaks attempts by raspi-gpio to change other GPIOs in the
-same bank. Add a DIRECT mode that makes fewer assumptions about the
-existing register contents, but note that genuinely simultaneous
-accesses are likely to lose updates.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-gpio: brcmstb: Don't always clear interrupt mask
-
-If the GPIO controller is not being used as an interrupt source
-leave the interrupt mask register alone. On BCM2712 it might be used
-to generate interrupts to the VPU firmware, and on other devices it
-doesn't matter since no interrupts will be generated.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/gpio/Kconfig        |   2 +-
- drivers/gpio/gpio-brcmstb.c |  14 ++--
- drivers/gpio/gpio-mmio.c    | 124 ++++++++++++++++++++++++++++++++++--
- include/linux/gpio/driver.h |   1 +
- 4 files changed, 131 insertions(+), 10 deletions(-)
-
---- a/drivers/gpio/Kconfig
-+++ b/drivers/gpio/Kconfig
-@@ -203,7 +203,7 @@ config GPIO_BCM_VIRT
- config GPIO_BRCMSTB
- 	tristate "BRCMSTB GPIO support"
- 	default y if (ARCH_BRCMSTB || BMIPS_GENERIC)
--	depends on OF_GPIO && (ARCH_BRCMSTB || BMIPS_GENERIC || COMPILE_TEST)
-+	depends on OF_GPIO && (ARCH_BRCMSTB || BMIPS_GENERIC || ARCH_BCM2835 || COMPILE_TEST)
- 	select GPIO_GENERIC
- 	select IRQ_DOMAIN
- 	help
---- a/drivers/gpio/gpio-brcmstb.c
-+++ b/drivers/gpio/gpio-brcmstb.c
-@@ -640,6 +640,8 @@ static int brcmstb_gpio_probe(struct pla
- #if defined(CONFIG_MIPS) && defined(__BIG_ENDIAN)
- 	flags = BGPIOF_BIG_ENDIAN_BYTE_ORDER;
- #endif
-+	if (of_property_read_bool(np, "brcm,gpio-direct"))
-+	    flags |= BGPIOF_REG_DIRECT;
- 
- 	of_property_for_each_u32(np, "brcm,gpio-bank-widths", prop, p,
- 			bank_width) {
-@@ -689,7 +691,9 @@ static int brcmstb_gpio_probe(struct pla
- 		}
- 
- 		gc->owner = THIS_MODULE;
--		gc->label = devm_kasprintf(dev, GFP_KERNEL, "%pOF", np);
-+		gc->label = devm_kasprintf(dev, GFP_KERNEL, "gpio-brcmstb@%zx",
-+					   (size_t)res->start +
-+					   GIO_BANK_OFF(bank->id, 0));
- 		if (!gc->label) {
- 			err = -ENOMEM;
- 			goto fail;
-@@ -698,7 +702,7 @@ static int brcmstb_gpio_probe(struct pla
- 		gc->of_gpio_n_cells = 2;
- 		gc->of_xlate = brcmstb_gpio_of_xlate;
- 		/* not all ngpio lines are valid, will use bank width later */
--		gc->ngpio = MAX_GPIO_PER_BANK;
-+		gc->ngpio = bank_width;
- 		gc->offset = bank->id * MAX_GPIO_PER_BANK;
- 		if (priv->parent_irq > 0)
- 			gc->to_irq = brcmstb_gpio_to_irq;
-@@ -707,8 +711,10 @@ static int brcmstb_gpio_probe(struct pla
- 		 * Mask all interrupts by default, since wakeup interrupts may
- 		 * be retained from S5 cold boot
- 		 */
--		need_wakeup_event |= !!__brcmstb_gpio_get_active_irqs(bank);
--		gc->write_reg(reg_base + GIO_MASK(bank->id), 0);
-+		if (priv->parent_irq > 0) {
-+			need_wakeup_event |= !!__brcmstb_gpio_get_active_irqs(bank);
-+			gc->write_reg(reg_base + GIO_MASK(bank->id), 0);
-+		}
- 
- 		err = gpiochip_add_data(gc, bank);
- 		if (err) {
---- a/drivers/gpio/gpio-mmio.c
-+++ b/drivers/gpio/gpio-mmio.c
-@@ -232,6 +232,25 @@ static void bgpio_set(struct gpio_chip *
- 	raw_spin_unlock_irqrestore(&gc->bgpio_lock, flags);
- }
- 
-+static void bgpio_set_direct(struct gpio_chip *gc, unsigned int gpio, int val)
-+{
-+	unsigned long mask = bgpio_line2mask(gc, gpio);
-+	unsigned long flags;
-+
-+	raw_spin_lock_irqsave(&gc->bgpio_lock, flags);
-+
-+	gc->bgpio_data = gc->read_reg(gc->reg_dat);
-+
-+	if (val)
-+		gc->bgpio_data |= mask;
-+	else
-+		gc->bgpio_data &= ~mask;
-+
-+	gc->write_reg(gc->reg_dat, gc->bgpio_data);
-+
-+	raw_spin_unlock_irqrestore(&gc->bgpio_lock, flags);
-+}
-+
- static void bgpio_set_with_clear(struct gpio_chip *gc, unsigned int gpio,
- 				 int val)
- {
-@@ -324,6 +343,27 @@ static void bgpio_set_multiple_with_clea
- 		gc->write_reg(gc->reg_clr, clear_mask);
- }
- 
-+static void bgpio_set_multiple_direct(struct gpio_chip *gc,
-+				      unsigned long *mask,
-+				      unsigned long *bits)
-+{
-+	unsigned long flags;
-+	unsigned long set_mask, clear_mask;
-+
-+	raw_spin_lock_irqsave(&gc->bgpio_lock, flags);
-+
-+	bgpio_multiple_get_masks(gc, mask, bits, &set_mask, &clear_mask);
-+
-+	gc->bgpio_data = gc->read_reg(gc->reg_dat);
-+
-+	gc->bgpio_data |= set_mask;
-+	gc->bgpio_data &= ~clear_mask;
-+
-+	gc->write_reg(gc->reg_dat, gc->bgpio_data);
-+
-+	raw_spin_unlock_irqrestore(&gc->bgpio_lock, flags);
-+}
-+
- static int bgpio_simple_dir_in(struct gpio_chip *gc, unsigned int gpio)
- {
- 	return 0;
-@@ -361,6 +401,29 @@ static int bgpio_dir_in(struct gpio_chip
- 	return 0;
- }
- 
-+static int bgpio_dir_in_direct(struct gpio_chip *gc, unsigned int gpio)
-+{
-+	unsigned long flags;
-+
-+	raw_spin_lock_irqsave(&gc->bgpio_lock, flags);
-+
-+	if (gc->reg_dir_in)
-+		gc->bgpio_dir = ~gc->read_reg(gc->reg_dir_in);
-+	if (gc->reg_dir_out)
-+		gc->bgpio_dir = gc->read_reg(gc->reg_dir_out);
-+
-+	gc->bgpio_dir &= ~bgpio_line2mask(gc, gpio);
-+
-+	if (gc->reg_dir_in)
-+		gc->write_reg(gc->reg_dir_in, ~gc->bgpio_dir);
-+	if (gc->reg_dir_out)
-+		gc->write_reg(gc->reg_dir_out, gc->bgpio_dir);
-+
-+	raw_spin_unlock_irqrestore(&gc->bgpio_lock, flags);
-+
-+	return 0;
-+}
-+
- static int bgpio_get_dir(struct gpio_chip *gc, unsigned int gpio)
- {
- 	/* Return 0 if output, 1 if input */
-@@ -399,6 +462,28 @@ static void bgpio_dir_out(struct gpio_ch
- 	raw_spin_unlock_irqrestore(&gc->bgpio_lock, flags);
- }
- 
-+static void bgpio_dir_out_direct(struct gpio_chip *gc, unsigned int gpio,
-+				 int val)
-+{
-+	unsigned long flags;
-+
-+	raw_spin_lock_irqsave(&gc->bgpio_lock, flags);
-+
-+	if (gc->reg_dir_in)
-+		gc->bgpio_dir = ~gc->read_reg(gc->reg_dir_in);
-+	if (gc->reg_dir_out)
-+		gc->bgpio_dir = gc->read_reg(gc->reg_dir_out);
-+
-+	gc->bgpio_dir |= bgpio_line2mask(gc, gpio);
-+
-+	if (gc->reg_dir_in)
-+		gc->write_reg(gc->reg_dir_in, ~gc->bgpio_dir);
-+	if (gc->reg_dir_out)
-+		gc->write_reg(gc->reg_dir_out, gc->bgpio_dir);
-+
-+	raw_spin_unlock_irqrestore(&gc->bgpio_lock, flags);
-+}
-+
- static int bgpio_dir_out_dir_first(struct gpio_chip *gc, unsigned int gpio,
- 				   int val)
- {
-@@ -415,6 +500,22 @@ static int bgpio_dir_out_val_first(struc
- 	return 0;
- }
- 
-+static int bgpio_dir_out_dir_first_direct(struct gpio_chip *gc,
-+					  unsigned int gpio, int val)
-+{
-+	bgpio_dir_out_direct(gc, gpio, val);
-+	gc->set(gc, gpio, val);
-+	return 0;
-+}
-+
-+static int bgpio_dir_out_val_first_direct(struct gpio_chip *gc,
-+					  unsigned int gpio, int val)
-+{
-+	gc->set(gc, gpio, val);
-+	bgpio_dir_out_direct(gc, gpio, val);
-+	return 0;
-+}
-+
- static int bgpio_setup_accessors(struct device *dev,
- 				 struct gpio_chip *gc,
- 				 bool byte_be)
-@@ -508,6 +609,9 @@ static int bgpio_setup_io(struct gpio_ch
- 	} else if (flags & BGPIOF_NO_OUTPUT) {
- 		gc->set = bgpio_set_none;
- 		gc->set_multiple = NULL;
-+	} else if (flags & BGPIOF_REG_DIRECT) {
-+		gc->set = bgpio_set_direct;
-+		gc->set_multiple = bgpio_set_multiple_direct;
- 	} else {
- 		gc->set = bgpio_set;
- 		gc->set_multiple = bgpio_set_multiple;
-@@ -544,11 +648,21 @@ static int bgpio_setup_direction(struct
- 	if (dirout || dirin) {
- 		gc->reg_dir_out = dirout;
- 		gc->reg_dir_in = dirin;
--		if (flags & BGPIOF_NO_SET_ON_INPUT)
--			gc->direction_output = bgpio_dir_out_dir_first;
--		else
--			gc->direction_output = bgpio_dir_out_val_first;
--		gc->direction_input = bgpio_dir_in;
-+		if (flags & BGPIOF_REG_DIRECT) {
-+			if (flags & BGPIOF_NO_SET_ON_INPUT)
-+				gc->direction_output =
-+					bgpio_dir_out_dir_first_direct;
-+			else
-+				gc->direction_output =
-+					bgpio_dir_out_val_first_direct;
-+			gc->direction_input = bgpio_dir_in_direct;
-+		} else {
-+			if (flags & BGPIOF_NO_SET_ON_INPUT)
-+				gc->direction_output = bgpio_dir_out_dir_first;
-+			else
-+				gc->direction_output = bgpio_dir_out_val_first;
-+			gc->direction_input = bgpio_dir_in;
-+		}
- 		gc->get_direction = bgpio_get_dir;
- 	} else {
- 		if (flags & BGPIOF_NO_OUTPUT)
---- a/include/linux/gpio/driver.h
-+++ b/include/linux/gpio/driver.h
-@@ -690,6 +690,7 @@ int bgpio_init(struct gpio_chip *gc, str
- #define BGPIOF_READ_OUTPUT_REG_SET	BIT(4) /* reg_set stores output value */
- #define BGPIOF_NO_OUTPUT		BIT(5) /* only input */
- #define BGPIOF_NO_SET_ON_INPUT		BIT(6)
-+#define BGPIOF_REG_DIRECT		BIT(7) /* ignore shadow registers */
- 
- int gpiochip_irq_map(struct irq_domain *d, unsigned int irq,
- 		     irq_hw_number_t hwirq);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0856-Allow-RESET_BRCMSTB-on-ARCH_BCM2835.patch b/target/linux/bcm27xx/patches-6.1/950-0856-Allow-RESET_BRCMSTB-on-ARCH_BCM2835.patch
deleted file mode 100644
index 7e0886d7e6..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0856-Allow-RESET_BRCMSTB-on-ARCH_BCM2835.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 22ae3b2ee3293278e647877b269a5aebad3f077d Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 27 May 2021 11:46:30 +0100
-Subject: [PATCH] Allow RESET_BRCMSTB on ARCH_BCM2835
-
----
- drivers/reset/Kconfig | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/reset/Kconfig
-+++ b/drivers/reset/Kconfig
-@@ -51,7 +51,7 @@ config RESET_BERLIN
- 
- config RESET_BRCMSTB
- 	tristate "Broadcom STB reset controller"
--	depends on ARCH_BRCMSTB || COMPILE_TEST
-+	depends on ARCH_BRCMSTB || ARCH_BCM2835 || COMPILE_TEST
- 	default ARCH_BRCMSTB
- 	help
- 	  This enables the reset controller driver for Broadcom STB SoCs using
diff --git a/target/linux/bcm27xx/patches-6.1/950-0857-pinctrl-bcm2712-pinctrl-pinconf-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0857-pinctrl-bcm2712-pinctrl-pinconf-driver.patch
deleted file mode 100644
index 429c3e2fd2..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0857-pinctrl-bcm2712-pinctrl-pinconf-driver.patch
+++ /dev/null
@@ -1,1324 +0,0 @@
-From af7e60a33f0b5ce84bffb69ba084ba1edd180195 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 9 Jun 2021 15:48:28 +0100
-Subject: [PATCH] pinctrl: bcm2712 pinctrl/pinconf driver
-
-pinctrl: bcm2712: Reject invalid pulls
-
-Reject attempts to set pulls on aon-sgpios, and fix pull shift
-values.
-
-pinctrl: bcm2712: Add 7712 support, fix 2712 count
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-pinctrl-bcm2712: add EMMC pins so pulls can be set
-
-These pins have pad controls but not mux controls. They look enough like
-GPIOs to squeeze in at the end of the list though.
-
-pinctrl: bcm2712: correct BCM2712C0 AON_GPIO pad pull control offset
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
-
-pinctrl: bcm2712: on C0 the regular GPIO pad control register moves too
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
-
-pinctrl: bcm2712: Implement (partially) pinconf_get
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-pinctrl: bcm2712: Convert to generic pinconf
-
-Remove the legacy brcm,* pin configuration support and replace it with
-a proper generic pinconf interface, using named functions instead of
-alt function numbers. This is nicer for users, less error-prone, and
-immune to some of the C0->D0 changes.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-pinctrl: bcm2712: Remove vestigial pull parameter
-
-Now the legacy brcm, pinconf parameters are no longer supported, this
-custom pin config parameter is not needed.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-pinctrl: bcm2712: Guard against bad func numbers
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-pinctrl: bcm2712: A better attempt at D0 support
-
-The BCM2712D0 sparse pinctrl maps play havoc with the old GPIO_REGS
-macro, so make the bit positions explicit. And delete the unwanted
-GPIO and pinmux declarations on D0.
-
-Note that a Pi 5 with D0 requires a separate DTS file with "bcm2712d0"
-compatible strings.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-pinctrl: bcm2712: Delete base register constants
-
-BCM2712D0 deletes many GPIOs and their associated mux and pad bits,
-so much so that the offsets to the start of the pad control registers
-changes. Remove the constant offsets from the *GPIO_REGS macros,
-compensating by adjusting the per-GPIO values.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/pinctrl/bcm/Kconfig           |    9 +
- drivers/pinctrl/bcm/Makefile          |    1 +
- drivers/pinctrl/bcm/pinctrl-bcm2712.c | 1216 +++++++++++++++++++++++++
- 3 files changed, 1226 insertions(+)
- create mode 100644 drivers/pinctrl/bcm/pinctrl-bcm2712.c
-
---- a/drivers/pinctrl/bcm/Kconfig
-+++ b/drivers/pinctrl/bcm/Kconfig
-@@ -3,6 +3,15 @@
- # Broadcom pinctrl drivers
- #
- 
-+config PINCTRL_BCM2712
-+	bool "Broadcom BCM2712 PINCONF driver"
-+	depends on OF && (ARCH_BCM2835 || ARCH_BRCMSTB || COMPILE_TEST)
-+	select PINMUX
-+	select PINCONF
-+	select GENERIC_PINCONF
-+	help
-+	   Say Y here to enable the Broadcom BCM2835 GPIO driver.
-+
- config PINCTRL_BCM281XX
- 	bool "Broadcom BCM281xx pinctrl driver"
- 	depends on OF && (ARCH_BCM_MOBILE || COMPILE_TEST)
---- a/drivers/pinctrl/bcm/Makefile
-+++ b/drivers/pinctrl/bcm/Makefile
-@@ -1,6 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0
- # Broadcom pinctrl support
- 
-+obj-$(CONFIG_PINCTRL_BCM2712)		+= pinctrl-bcm2712.o
- obj-$(CONFIG_PINCTRL_BCM281XX)		+= pinctrl-bcm281xx.o
- obj-$(CONFIG_PINCTRL_BCM2835)		+= pinctrl-bcm2835.o
- obj-$(CONFIG_PINCTRL_BCM4908)		+= pinctrl-bcm4908.o
---- /dev/null
-+++ b/drivers/pinctrl/bcm/pinctrl-bcm2712.c
-@@ -0,0 +1,1216 @@
-+// SPDX-License-Identifier: GPL-2.0+
-+/*
-+ * Driver for Broadcom BCM2712 GPIO units (pinctrl only)
-+ *
-+ * Copyright (C) 2021-3 Raspberry Pi Ltd.
-+ * Copyright (C) 2012 Chris Boot, Simon Arlott, Stephen Warren
-+ *
-+ * Based heavily on the BCM2835 GPIO & pinctrl driver, which was inspired by:
-+ * pinctrl-nomadik.c, please see original file for copyright information
-+ * pinctrl-tegra.c, please see original file for copyright information
-+ */
-+
-+#include <linux/bitmap.h>
-+#include <linux/bug.h>
-+#include <linux/delay.h>
-+#include <linux/device.h>
-+#include <linux/err.h>
-+#include <linux/io.h>
-+#include <linux/init.h>
-+#include <linux/interrupt.h>
-+#include <linux/of_address.h>
-+#include <linux/of.h>
-+#include <linux/pinctrl/consumer.h>
-+#include <linux/pinctrl/machine.h>
-+#include <linux/pinctrl/pinconf.h>
-+#include <linux/pinctrl/pinctrl.h>
-+#include <linux/pinctrl/pinmux.h>
-+#include <linux/pinctrl/pinconf-generic.h>
-+#include <linux/platform_device.h>
-+#include <linux/seq_file.h>
-+#include <linux/slab.h>
-+#include <linux/spinlock.h>
-+#include <linux/types.h>
-+
-+#define MODULE_NAME "pinctrl-bcm2712"
-+
-+/* Register offsets */
-+
-+#define BCM2712_PULL_NONE	0
-+#define BCM2712_PULL_DOWN	1
-+#define BCM2712_PULL_UP		2
-+#define BCM2712_PULL_MASK	0x3
-+
-+#define BCM2712_FSEL_COUNT 9
-+#define BCM2712_FSEL_MASK  0xf
-+
-+#define FUNC(f) \
-+	[func_##f] = #f
-+#define PIN(i, f1, f2, f3, f4, f5, f6, f7, f8) \
-+	[i] = { \
-+		.funcs = { \
-+			func_##f1, \
-+			func_##f2, \
-+			func_##f3, \
-+			func_##f4, \
-+			func_##f5, \
-+			func_##f6, \
-+			func_##f7, \
-+			func_##f8, \
-+		}, \
-+	}
-+
-+#define REG_BIT_INVALID 0xffff
-+
-+#define BIT_TO_REG(b) (((b) >> 5) << 2)
-+#define BIT_TO_SHIFT(b) ((b) & 0x1f)
-+
-+#define GPIO_REGS(n, mr, mb, pr, pb) \
-+	[n] = { ((mr)*4)*8 + (mb)*4, ((pr)*4)*8 + (pb)*2 }
-+
-+#define EMMC_REGS(n, r, b) \
-+	[n] = { 0, ((r)*4)*8 + (b)*2 }
-+
-+#define AGPIO_REGS(n, mr, mb, pr, pb) \
-+	[n] = { ((mr)*4)*8 + (mb)*4, ((pr)*4)*8 + (pb)*2 }
-+
-+#define SGPIO_REGS(n, mr, mb) \
-+	[n+32] = { ((mr)*4)*8 + (mb)*4, REG_BIT_INVALID }
-+
-+#define GPIO_PIN(a) PINCTRL_PIN(a, "gpio" #a)
-+#define AGPIO_PIN(a) PINCTRL_PIN(a, "aon_gpio" #a)
-+#define SGPIO_PIN(a) PINCTRL_PIN(a+32, "aon_sgpio" #a)
-+
-+struct pin_regs {
-+	u16 mux_bit;
-+	u16 pad_bit;
-+};
-+
-+struct bcm2712_pinctrl {
-+	struct device *dev;
-+	void __iomem *base;
-+	struct pinctrl_dev *pctl_dev;
-+	struct pinctrl_desc pctl_desc;
-+	const struct pin_regs *pin_regs;
-+	const struct bcm2712_pin_funcs *pin_funcs;
-+	const char *const *gpio_groups;
-+	struct pinctrl_gpio_range gpio_range;
-+	spinlock_t lock;
-+};
-+
-+struct bcm_plat_data {
-+	const struct pinctrl_desc *pctl_desc;
-+	const struct pinctrl_gpio_range *gpio_range;
-+	const struct pin_regs *pin_regs;
-+	const struct bcm2712_pin_funcs *pin_funcs;
-+};
-+
-+struct bcm2712_pin_funcs {
-+	u8 funcs[BCM2712_FSEL_COUNT - 1];
-+};
-+
-+enum bcm2712_funcs {
-+	func_gpio,
-+	func_alt1,
-+	func_alt2,
-+	func_alt3,
-+	func_alt4,
-+	func_alt5,
-+	func_alt6,
-+	func_alt7,
-+	func_alt8,
-+	func_aon_cpu_standbyb,
-+	func_aon_fp_4sec_resetb,
-+	func_aon_gpclk,
-+	func_aon_pwm,
-+	func_arm_jtag,
-+	func_aud_fs_clk0,
-+	func_avs_pmu_bsc,
-+	func_bsc_m0,
-+	func_bsc_m1,
-+	func_bsc_m2,
-+	func_bsc_m3,
-+	func_clk_observe,
-+	func_ctl_hdmi_5v,
-+	func_enet0,
-+	func_enet0_mii,
-+	func_enet0_rgmii,
-+	func_ext_sc_clk,
-+	func_fl0,
-+	func_fl1,
-+	func_gpclk0,
-+	func_gpclk1,
-+	func_gpclk2,
-+	func_hdmi_tx0_auto_i2c,
-+	func_hdmi_tx0_bsc,
-+	func_hdmi_tx1_auto_i2c,
-+	func_hdmi_tx1_bsc,
-+	func_i2s_in,
-+	func_i2s_out,
-+	func_ir_in,
-+	func_mtsif,
-+	func_mtsif_alt,
-+	func_mtsif_alt1,
-+	func_pdm,
-+	func_pkt,
-+	func_pm_led_out,
-+	func_sc0,
-+	func_sd0,
-+	func_sd2,
-+	func_sd_card_a,
-+	func_sd_card_b,
-+	func_sd_card_c,
-+	func_sd_card_d,
-+	func_sd_card_e,
-+	func_sd_card_f,
-+	func_sd_card_g,
-+	func_spdif_out,
-+	func_spi_m,
-+	func_spi_s,
-+	func_sr_edm_sense,
-+	func_te0,
-+	func_te1,
-+	func_tsio,
-+	func_uart0,
-+	func_uart1,
-+	func_uart2,
-+	func_usb_pwr,
-+	func_usb_vbus,
-+	func_uui,
-+	func_vc_i2c0,
-+	func_vc_i2c3,
-+	func_vc_i2c4,
-+	func_vc_i2c5,
-+	func_vc_i2csl,
-+	func_vc_pcm,
-+	func_vc_pwm0,
-+	func_vc_pwm1,
-+	func_vc_spi0,
-+	func_vc_spi3,
-+	func_vc_spi4,
-+	func_vc_spi5,
-+	func_vc_uart0,
-+	func_vc_uart2,
-+	func_vc_uart3,
-+	func_vc_uart4,
-+	func__,
-+	func_count = func__
-+};
-+
-+static const struct pin_regs bcm2712_c0_gpio_pin_regs[] = {
-+	GPIO_REGS(0, 0, 0, 7, 7),
-+	GPIO_REGS(1, 0, 1, 7, 8),
-+	GPIO_REGS(2, 0, 2, 7, 9),
-+	GPIO_REGS(3, 0, 3, 7, 10),
-+	GPIO_REGS(4, 0, 4, 7, 11),
-+	GPIO_REGS(5, 0, 5, 7, 12),
-+	GPIO_REGS(6, 0, 6, 7, 13),
-+	GPIO_REGS(7, 0, 7, 7, 14),
-+	GPIO_REGS(8, 1, 0, 8, 0),
-+	GPIO_REGS(9, 1, 1, 8, 1),
-+	GPIO_REGS(10, 1, 2, 8, 2),
-+	GPIO_REGS(11, 1, 3, 8, 3),
-+	GPIO_REGS(12, 1, 4, 8, 4),
-+	GPIO_REGS(13, 1, 5, 8, 5),
-+	GPIO_REGS(14, 1, 6, 8, 6),
-+	GPIO_REGS(15, 1, 7, 8, 7),
-+	GPIO_REGS(16, 2, 0, 8, 8),
-+	GPIO_REGS(17, 2, 1, 8, 9),
-+	GPIO_REGS(18, 2, 2, 8, 10),
-+	GPIO_REGS(19, 2, 3, 8, 11),
-+	GPIO_REGS(20, 2, 4, 8, 12),
-+	GPIO_REGS(21, 2, 5, 8, 13),
-+	GPIO_REGS(22, 2, 6, 8, 14),
-+	GPIO_REGS(23, 2, 7, 9, 0),
-+	GPIO_REGS(24, 3, 0, 9, 1),
-+	GPIO_REGS(25, 3, 1, 9, 2),
-+	GPIO_REGS(26, 3, 2, 9, 3),
-+	GPIO_REGS(27, 3, 3, 9, 4),
-+	GPIO_REGS(28, 3, 4, 9, 5),
-+	GPIO_REGS(29, 3, 5, 9, 6),
-+	GPIO_REGS(30, 3, 6, 9, 7),
-+	GPIO_REGS(31, 3, 7, 9, 8),
-+	GPIO_REGS(32, 4, 0, 9, 9),
-+	GPIO_REGS(33, 4, 1, 9, 10),
-+	GPIO_REGS(34, 4, 2, 9, 11),
-+	GPIO_REGS(35, 4, 3, 9, 12),
-+	GPIO_REGS(36, 4, 4, 9, 13),
-+	GPIO_REGS(37, 4, 5, 9, 14),
-+	GPIO_REGS(38, 4, 6, 10, 0),
-+	GPIO_REGS(39, 4, 7, 10, 1),
-+	GPIO_REGS(40, 5, 0, 10, 2),
-+	GPIO_REGS(41, 5, 1, 10, 3),
-+	GPIO_REGS(42, 5, 2, 10, 4),
-+	GPIO_REGS(43, 5, 3, 10, 5),
-+	GPIO_REGS(44, 5, 4, 10, 6),
-+	GPIO_REGS(45, 5, 5, 10, 7),
-+	GPIO_REGS(46, 5, 6, 10, 8),
-+	GPIO_REGS(47, 5, 7, 10, 9),
-+	GPIO_REGS(48, 6, 0, 10, 10),
-+	GPIO_REGS(49, 6, 1, 10, 11),
-+	GPIO_REGS(50, 6, 2, 10, 12),
-+	GPIO_REGS(51, 6, 3, 10, 13),
-+	GPIO_REGS(52, 6, 4, 10, 14),
-+	GPIO_REGS(53, 6, 5, 11, 0),
-+	EMMC_REGS(54, 11, 1), /* EMMC_CMD */
-+	EMMC_REGS(55, 11, 2), /* EMMC_DS */
-+	EMMC_REGS(56, 11, 3), /* EMMC_CLK */
-+	EMMC_REGS(57, 11, 4), /* EMMC_DAT0 */
-+	EMMC_REGS(58, 11, 5), /* EMMC_DAT1 */
-+	EMMC_REGS(59, 11, 6), /* EMMC_DAT2 */
-+	EMMC_REGS(60, 11, 7), /* EMMC_DAT3 */
-+	EMMC_REGS(61, 11, 8), /* EMMC_DAT4 */
-+	EMMC_REGS(62, 11, 9), /* EMMC_DAT5 */
-+	EMMC_REGS(63, 11, 10), /* EMMC_DAT6 */
-+	EMMC_REGS(64, 11, 11), /* EMMC_DAT7 */
-+};
-+
-+static struct pin_regs bcm2712_c0_aon_gpio_pin_regs[] = {
-+	AGPIO_REGS(0, 3, 0, 6, 10),
-+	AGPIO_REGS(1, 3, 1, 6, 11),
-+	AGPIO_REGS(2, 3, 2, 6, 12),
-+	AGPIO_REGS(3, 3, 3, 6, 13),
-+	AGPIO_REGS(4, 3, 4, 6, 14),
-+	AGPIO_REGS(5, 3, 5, 7, 0),
-+	AGPIO_REGS(6, 3, 6, 7, 1),
-+	AGPIO_REGS(7, 3, 7, 7, 2),
-+	AGPIO_REGS(8, 4, 0, 7, 3),
-+	AGPIO_REGS(9, 4, 1, 7, 4),
-+	AGPIO_REGS(10, 4, 2, 7, 5),
-+	AGPIO_REGS(11, 4, 3, 7, 6),
-+	AGPIO_REGS(12, 4, 4, 7, 7),
-+	AGPIO_REGS(13, 4, 5, 7, 8),
-+	AGPIO_REGS(14, 4, 6, 7, 9),
-+	AGPIO_REGS(15, 4, 7, 7, 10),
-+	AGPIO_REGS(16, 5, 0, 7, 11),
-+	SGPIO_REGS(0, 0, 0),
-+	SGPIO_REGS(1, 0, 1),
-+	SGPIO_REGS(2, 0, 2),
-+	SGPIO_REGS(3, 0, 3),
-+	SGPIO_REGS(4, 1, 0),
-+	SGPIO_REGS(5, 2, 0),
-+};
-+
-+static const struct pinctrl_pin_desc bcm2712_c0_gpio_pins[] = {
-+	GPIO_PIN(0),
-+	GPIO_PIN(1),
-+	GPIO_PIN(2),
-+	GPIO_PIN(3),
-+	GPIO_PIN(4),
-+	GPIO_PIN(5),
-+	GPIO_PIN(6),
-+	GPIO_PIN(7),
-+	GPIO_PIN(8),
-+	GPIO_PIN(9),
-+	GPIO_PIN(10),
-+	GPIO_PIN(11),
-+	GPIO_PIN(12),
-+	GPIO_PIN(13),
-+	GPIO_PIN(14),
-+	GPIO_PIN(15),
-+	GPIO_PIN(16),
-+	GPIO_PIN(17),
-+	GPIO_PIN(18),
-+	GPIO_PIN(19),
-+	GPIO_PIN(20),
-+	GPIO_PIN(21),
-+	GPIO_PIN(22),
-+	GPIO_PIN(23),
-+	GPIO_PIN(24),
-+	GPIO_PIN(25),
-+	GPIO_PIN(26),
-+	GPIO_PIN(27),
-+	GPIO_PIN(28),
-+	GPIO_PIN(29),
-+	GPIO_PIN(30),
-+	GPIO_PIN(31),
-+	GPIO_PIN(32),
-+	GPIO_PIN(33),
-+	GPIO_PIN(34),
-+	GPIO_PIN(35),
-+	GPIO_PIN(36),
-+	GPIO_PIN(37),
-+	GPIO_PIN(38),
-+	GPIO_PIN(39),
-+	GPIO_PIN(40),
-+	GPIO_PIN(41),
-+	GPIO_PIN(42),
-+	GPIO_PIN(43),
-+	GPIO_PIN(44),
-+	GPIO_PIN(45),
-+	GPIO_PIN(46),
-+	GPIO_PIN(47),
-+	GPIO_PIN(48),
-+	GPIO_PIN(49),
-+	GPIO_PIN(50),
-+	GPIO_PIN(51),
-+	GPIO_PIN(52),
-+	GPIO_PIN(53),
-+	PINCTRL_PIN(54, "emmc_cmd"),
-+	PINCTRL_PIN(55, "emmc_ds"),
-+	PINCTRL_PIN(56, "emmc_clk"),
-+	PINCTRL_PIN(57, "emmc_dat0"),
-+	PINCTRL_PIN(58, "emmc_dat1"),
-+	PINCTRL_PIN(59, "emmc_dat2"),
-+	PINCTRL_PIN(60, "emmc_dat3"),
-+	PINCTRL_PIN(61, "emmc_dat4"),
-+	PINCTRL_PIN(62, "emmc_dat5"),
-+	PINCTRL_PIN(63, "emmc_dat6"),
-+	PINCTRL_PIN(64, "emmc_dat7"),
-+};
-+
-+static struct pinctrl_pin_desc bcm2712_c0_aon_gpio_pins[] = {
-+	AGPIO_PIN(0),
-+	AGPIO_PIN(1),
-+	AGPIO_PIN(2),
-+	AGPIO_PIN(3),
-+	AGPIO_PIN(4),
-+	AGPIO_PIN(5),
-+	AGPIO_PIN(6),
-+	AGPIO_PIN(7),
-+	AGPIO_PIN(8),
-+	AGPIO_PIN(9),
-+	AGPIO_PIN(10),
-+	AGPIO_PIN(11),
-+	AGPIO_PIN(12),
-+	AGPIO_PIN(13),
-+	AGPIO_PIN(14),
-+	AGPIO_PIN(15),
-+	AGPIO_PIN(16),
-+	SGPIO_PIN(0),
-+	SGPIO_PIN(1),
-+	SGPIO_PIN(2),
-+	SGPIO_PIN(3),
-+	SGPIO_PIN(4),
-+	SGPIO_PIN(5),
-+};
-+
-+static const struct pin_regs bcm2712_d0_gpio_pin_regs[] = {
-+	GPIO_REGS(1, 0, 0, 4, 5),
-+	GPIO_REGS(2, 0, 1, 4, 6),
-+	GPIO_REGS(3, 0, 2, 4, 7),
-+	GPIO_REGS(4, 0, 3, 4, 8),
-+	GPIO_REGS(10, 0, 4, 4, 9),
-+	GPIO_REGS(11, 0, 5, 4, 10),
-+	GPIO_REGS(12, 0, 6, 4, 11),
-+	GPIO_REGS(13, 0, 7, 4, 12),
-+	GPIO_REGS(14, 1, 0, 4, 13),
-+	GPIO_REGS(15, 1, 1, 4, 14),
-+	GPIO_REGS(18, 1, 2, 5, 0),
-+	GPIO_REGS(19, 1, 3, 5, 1),
-+	GPIO_REGS(20, 1, 4, 5, 2),
-+	GPIO_REGS(21, 1, 5, 5, 3),
-+	GPIO_REGS(22, 1, 6, 5, 4),
-+	GPIO_REGS(23, 1, 7, 5, 5),
-+	GPIO_REGS(24, 2, 0, 5, 6),
-+	GPIO_REGS(25, 2, 1, 5, 7),
-+	GPIO_REGS(26, 2, 2, 5, 8),
-+	GPIO_REGS(27, 2, 3, 5, 9),
-+	GPIO_REGS(28, 2, 4, 5, 10),
-+	GPIO_REGS(29, 2, 5, 5, 11),
-+	GPIO_REGS(30, 2, 6, 5, 12),
-+	GPIO_REGS(31, 2, 7, 5, 13),
-+	GPIO_REGS(32, 3, 0, 5, 14),
-+	GPIO_REGS(33, 3, 1, 6, 0),
-+	GPIO_REGS(34, 3, 2, 6, 1),
-+	GPIO_REGS(35, 3, 3, 6, 2),
-+};
-+
-+static struct pin_regs bcm2712_d0_aon_gpio_pin_regs[] = {
-+	AGPIO_REGS(0, 3, 0, 5, 9),
-+	AGPIO_REGS(1, 3, 1, 5, 10),
-+	AGPIO_REGS(2, 3, 2, 5, 11),
-+	AGPIO_REGS(3, 3, 3, 5, 12),
-+	AGPIO_REGS(4, 3, 4, 5, 13),
-+	AGPIO_REGS(5, 3, 5, 5, 14),
-+	AGPIO_REGS(6, 3, 6, 6, 0),
-+	AGPIO_REGS(8, 3, 7, 6, 1),
-+	AGPIO_REGS(9, 4, 0, 6, 2),
-+	AGPIO_REGS(12, 4, 1, 6, 3),
-+	AGPIO_REGS(13, 4, 2, 6, 4),
-+	AGPIO_REGS(14, 4, 3, 6, 5),
-+	SGPIO_REGS(0, 0, 0),
-+	SGPIO_REGS(1, 0, 1),
-+	SGPIO_REGS(2, 0, 2),
-+	SGPIO_REGS(3, 0, 3),
-+	SGPIO_REGS(4, 1, 0),
-+	SGPIO_REGS(5, 2, 0),
-+};
-+
-+static const struct pinctrl_pin_desc bcm2712_d0_gpio_pins[] = {
-+	GPIO_PIN(1),
-+	GPIO_PIN(2),
-+	GPIO_PIN(3),
-+	GPIO_PIN(4),
-+	GPIO_PIN(10),
-+	GPIO_PIN(11),
-+	GPIO_PIN(12),
-+	GPIO_PIN(13),
-+	GPIO_PIN(14),
-+	GPIO_PIN(15),
-+	GPIO_PIN(18),
-+	GPIO_PIN(19),
-+	GPIO_PIN(20),
-+	GPIO_PIN(21),
-+	GPIO_PIN(22),
-+	GPIO_PIN(23),
-+	GPIO_PIN(24),
-+	GPIO_PIN(25),
-+	GPIO_PIN(26),
-+	GPIO_PIN(27),
-+	GPIO_PIN(28),
-+	GPIO_PIN(29),
-+	GPIO_PIN(30),
-+	GPIO_PIN(31),
-+	GPIO_PIN(32),
-+	GPIO_PIN(33),
-+	GPIO_PIN(34),
-+	GPIO_PIN(35),
-+};
-+
-+static struct pinctrl_pin_desc bcm2712_d0_aon_gpio_pins[] = {
-+	AGPIO_PIN(0),
-+	AGPIO_PIN(1),
-+	AGPIO_PIN(2),
-+	AGPIO_PIN(3),
-+	AGPIO_PIN(4),
-+	AGPIO_PIN(5),
-+	AGPIO_PIN(6),
-+	AGPIO_PIN(8),
-+	AGPIO_PIN(9),
-+	AGPIO_PIN(12),
-+	AGPIO_PIN(13),
-+	AGPIO_PIN(14),
-+	SGPIO_PIN(0),
-+	SGPIO_PIN(1),
-+	SGPIO_PIN(2),
-+	SGPIO_PIN(3),
-+	SGPIO_PIN(4),
-+	SGPIO_PIN(5),
-+};
-+
-+static const char * const bcm2712_func_names[] = {
-+	FUNC(gpio),
-+	FUNC(alt1),
-+	FUNC(alt2),
-+	FUNC(alt3),
-+	FUNC(alt4),
-+	FUNC(alt5),
-+	FUNC(alt6),
-+	FUNC(alt7),
-+	FUNC(alt8),
-+	FUNC(aon_cpu_standbyb),
-+	FUNC(aon_fp_4sec_resetb),
-+	FUNC(aon_gpclk),
-+	FUNC(aon_pwm),
-+	FUNC(arm_jtag),
-+	FUNC(aud_fs_clk0),
-+	FUNC(avs_pmu_bsc),
-+	FUNC(bsc_m0),
-+	FUNC(bsc_m1),
-+	FUNC(bsc_m2),
-+	FUNC(bsc_m3),
-+	FUNC(clk_observe),
-+	FUNC(ctl_hdmi_5v),
-+	FUNC(enet0),
-+	FUNC(enet0_mii),
-+	FUNC(enet0_rgmii),
-+	FUNC(ext_sc_clk),
-+	FUNC(fl0),
-+	FUNC(fl1),
-+	FUNC(gpclk0),
-+	FUNC(gpclk1),
-+	FUNC(gpclk2),
-+	FUNC(hdmi_tx0_auto_i2c),
-+	FUNC(hdmi_tx0_bsc),
-+	FUNC(hdmi_tx1_auto_i2c),
-+	FUNC(hdmi_tx1_bsc),
-+	FUNC(i2s_in),
-+	FUNC(i2s_out),
-+	FUNC(ir_in),
-+	FUNC(mtsif),
-+	FUNC(mtsif_alt),
-+	FUNC(mtsif_alt1),
-+	FUNC(pdm),
-+	FUNC(pkt),
-+	FUNC(pm_led_out),
-+	FUNC(sc0),
-+	FUNC(sd0),
-+	FUNC(sd2),
-+	FUNC(sd_card_a),
-+	FUNC(sd_card_b),
-+	FUNC(sd_card_c),
-+	FUNC(sd_card_d),
-+	FUNC(sd_card_e),
-+	FUNC(sd_card_f),
-+	FUNC(sd_card_g),
-+	FUNC(spdif_out),
-+	FUNC(spi_m),
-+	FUNC(spi_s),
-+	FUNC(sr_edm_sense),
-+	FUNC(te0),
-+	FUNC(te1),
-+	FUNC(tsio),
-+	FUNC(uart0),
-+	FUNC(uart1),
-+	FUNC(uart2),
-+	FUNC(usb_pwr),
-+	FUNC(usb_vbus),
-+	FUNC(uui),
-+	FUNC(vc_i2c0),
-+	FUNC(vc_i2c3),
-+	FUNC(vc_i2c4),
-+	FUNC(vc_i2c5),
-+	FUNC(vc_i2csl),
-+	FUNC(vc_pcm),
-+	FUNC(vc_pwm0),
-+	FUNC(vc_pwm1),
-+	FUNC(vc_spi0),
-+	FUNC(vc_spi3),
-+	FUNC(vc_spi4),
-+	FUNC(vc_spi5),
-+	FUNC(vc_uart0),
-+	FUNC(vc_uart2),
-+	FUNC(vc_uart3),
-+	FUNC(vc_uart4),
-+};
-+
-+static const struct bcm2712_pin_funcs bcm2712_c0_aon_gpio_pin_funcs[] = {
-+	PIN(0, ir_in, vc_spi0, vc_uart3, vc_i2c3, te0, vc_i2c0, _, _),
-+	PIN(1, vc_pwm0, vc_spi0, vc_uart3, vc_i2c3, te1, aon_pwm, vc_i2c0, vc_pwm1),
-+	PIN(2, vc_pwm0, vc_spi0, vc_uart3, ctl_hdmi_5v, fl0, aon_pwm, ir_in, vc_pwm1),
-+	PIN(3, ir_in, vc_spi0, vc_uart3, aon_fp_4sec_resetb, fl1, sd_card_g, aon_gpclk, _),
-+	PIN(4, gpclk0, vc_spi0, vc_i2csl, aon_gpclk, pm_led_out, aon_pwm, sd_card_g, vc_pwm0),
-+	PIN(5, gpclk1, ir_in, vc_i2csl, clk_observe, aon_pwm, sd_card_g, vc_pwm0, _),
-+	PIN(6, uart1, vc_uart4, gpclk2, ctl_hdmi_5v, vc_uart0, vc_spi3, _, _),
-+	PIN(7, uart1, vc_uart4, gpclk0, aon_pwm, vc_uart0, vc_spi3, _, _),
-+	PIN(8, uart1, vc_uart4, vc_i2csl, ctl_hdmi_5v, vc_uart0, vc_spi3, _, _),
-+	PIN(9, uart1, vc_uart4, vc_i2csl, aon_pwm, vc_uart0, vc_spi3, _, _),
-+	PIN(10, tsio, ctl_hdmi_5v, sc0, spdif_out, vc_spi5, usb_pwr, aon_gpclk, sd_card_f),
-+	PIN(11, tsio, uart0, sc0, aud_fs_clk0, vc_spi5, usb_vbus, vc_uart2, sd_card_f),
-+	PIN(12, tsio, uart0, vc_uart0, tsio, vc_spi5, usb_pwr, vc_uart2, sd_card_f),
-+	PIN(13, bsc_m1, uart0, vc_uart0, uui, vc_spi5, arm_jtag, vc_uart2, vc_i2c3),
-+	PIN(14, bsc_m1, uart0, vc_uart0, uui, vc_spi5, arm_jtag, vc_uart2, vc_i2c3),
-+	PIN(15, ir_in, aon_fp_4sec_resetb, vc_uart0, pm_led_out, ctl_hdmi_5v, aon_pwm, aon_gpclk, _),
-+	PIN(16, aon_cpu_standbyb, gpclk0, pm_led_out, ctl_hdmi_5v, vc_pwm0, usb_pwr, aud_fs_clk0, _),
-+};
-+
-+static const struct bcm2712_pin_funcs bcm2712_c0_aon_sgpio_pin_funcs[] = {
-+	PIN(0, hdmi_tx0_bsc, hdmi_tx0_auto_i2c, bsc_m0, vc_i2c0, _, _, _, _),
-+	PIN(1, hdmi_tx0_bsc, hdmi_tx0_auto_i2c, bsc_m0, vc_i2c0, _, _, _, _),
-+	PIN(2, hdmi_tx1_bsc, hdmi_tx1_auto_i2c, bsc_m1, vc_i2c4, ctl_hdmi_5v, _, _, _),
-+	PIN(3, hdmi_tx1_bsc, hdmi_tx1_auto_i2c, bsc_m1, vc_i2c4, _, _, _, _),
-+	PIN(4, avs_pmu_bsc, bsc_m2, vc_i2c5, ctl_hdmi_5v, _, _, _, _),
-+	PIN(5, avs_pmu_bsc, bsc_m2, vc_i2c5, _, _, _, _, _),
-+};
-+
-+static const struct bcm2712_pin_funcs bcm2712_c0_gpio_pin_funcs[] = {
-+	PIN(0, bsc_m3, vc_i2c0, gpclk0, enet0, vc_pwm1, vc_spi0, ir_in, _),
-+	PIN(1, bsc_m3, vc_i2c0, gpclk1, enet0, vc_pwm1, sr_edm_sense, vc_spi0, vc_uart3),
-+	PIN(2, pdm, i2s_in, gpclk2, vc_spi4, pkt, vc_spi0, vc_uart3, _),
-+	PIN(3, pdm, i2s_in, vc_spi4, pkt, vc_spi0, vc_uart3, _, _),
-+	PIN(4, pdm, i2s_in, arm_jtag, vc_spi4, pkt, vc_spi0, vc_uart3, _),
-+	PIN(5, pdm, vc_i2c3, arm_jtag, sd_card_e, vc_spi4, pkt, vc_pcm, vc_i2c5),
-+	PIN(6, pdm, vc_i2c3, arm_jtag, sd_card_e, vc_spi4, pkt, vc_pcm, vc_i2c5),
-+	PIN(7, i2s_out, spdif_out, arm_jtag, sd_card_e, vc_i2c3, enet0_rgmii, vc_pcm, vc_spi4),
-+	PIN(8, i2s_out, aud_fs_clk0, arm_jtag, sd_card_e, vc_i2c3, enet0_mii, vc_pcm, vc_spi4),
-+	PIN(9, i2s_out, aud_fs_clk0, arm_jtag, sd_card_e, enet0_mii, sd_card_c, vc_spi4, _),
-+	PIN(10, bsc_m3, mtsif_alt1, i2s_in, i2s_out, vc_spi5, enet0_mii, sd_card_c, vc_spi4),
-+	PIN(11, bsc_m3, mtsif_alt1, i2s_in, i2s_out, vc_spi5, enet0_mii, sd_card_c, vc_spi4),
-+	PIN(12, spi_s, mtsif_alt1, i2s_in, i2s_out, vc_spi5, vc_i2csl, sd0, sd_card_d),
-+	PIN(13, spi_s, mtsif_alt1, i2s_out, usb_vbus, vc_spi5, vc_i2csl, sd0, sd_card_d),
-+	PIN(14, spi_s, vc_i2csl, enet0_rgmii, arm_jtag, vc_spi5, vc_pwm0, vc_i2c4, sd_card_d),
-+	PIN(15, spi_s, vc_i2csl, vc_spi3, arm_jtag, vc_pwm0, vc_i2c4, gpclk0, _),
-+	PIN(16, sd_card_b, i2s_out, vc_spi3, i2s_in, sd0, enet0_rgmii, gpclk1, _),
-+	PIN(17, sd_card_b, i2s_out, vc_spi3, i2s_in, ext_sc_clk, sd0, enet0_rgmii, gpclk2),
-+	PIN(18, sd_card_b, i2s_out, vc_spi3, i2s_in, sd0, enet0_rgmii, vc_pwm1, _),
-+	PIN(19, sd_card_b, usb_pwr, vc_spi3, pkt, spdif_out, sd0, ir_in, vc_pwm1),
-+	PIN(20, sd_card_b, uui, vc_uart0, arm_jtag, uart2, usb_pwr, vc_pcm, vc_uart4),
-+	PIN(21, usb_pwr, uui, vc_uart0, arm_jtag, uart2, sd_card_b, vc_pcm, vc_uart4),
-+	PIN(22, usb_pwr, enet0, vc_uart0, mtsif, uart2, usb_vbus, vc_pcm, vc_i2c5),
-+	PIN(23, usb_vbus, enet0, vc_uart0, mtsif, uart2, i2s_out, vc_pcm, vc_i2c5),
-+	PIN(24, mtsif, pkt, uart0, enet0_rgmii, enet0_rgmii, vc_i2c4, vc_uart3, _),
-+	PIN(25, mtsif, pkt, sc0, uart0, enet0_rgmii, enet0_rgmii, vc_i2c4, vc_uart3),
-+	PIN(26, mtsif, pkt, sc0, uart0, enet0_rgmii, vc_uart4, vc_spi5, _),
-+	PIN(27, mtsif, pkt, sc0, uart0, enet0_rgmii, vc_uart4, vc_spi5, _),
-+	PIN(28, mtsif, pkt, sc0, enet0_rgmii, vc_uart4, vc_spi5, _, _),
-+	PIN(29, mtsif, pkt, sc0, enet0_rgmii, vc_uart4, vc_spi5, _, _),
-+	PIN(30, mtsif, pkt, sc0, sd2, enet0_rgmii, gpclk0, vc_pwm0, _),
-+	PIN(31, mtsif, pkt, sc0, sd2, enet0_rgmii, vc_spi3, vc_pwm0, _),
-+	PIN(32, mtsif, pkt, sc0, sd2, enet0_rgmii, vc_spi3, vc_uart3, _),
-+	PIN(33, mtsif, pkt, sd2, enet0_rgmii, vc_spi3, vc_uart3, _, _),
-+	PIN(34, mtsif, pkt, ext_sc_clk, sd2, enet0_rgmii, vc_spi3, vc_i2c5, _),
-+	PIN(35, mtsif, pkt, sd2, enet0_rgmii, vc_spi3, vc_i2c5, _, _),
-+	PIN(36, sd0, mtsif, sc0, i2s_in, vc_uart3, vc_uart2, _, _),
-+	PIN(37, sd0, mtsif, sc0, vc_spi0, i2s_in, vc_uart3, vc_uart2, _),
-+	PIN(38, sd0, mtsif_alt, sc0, vc_spi0, i2s_in, vc_uart3, vc_uart2, _),
-+	PIN(39, sd0, mtsif_alt, sc0, vc_spi0, vc_uart3, vc_uart2, _, _),
-+	PIN(40, sd0, mtsif_alt, sc0, vc_spi0, bsc_m3, _, _, _),
-+	PIN(41, sd0, mtsif_alt, sc0, vc_spi0, bsc_m3, _, _, _),
-+	PIN(42, vc_spi0, mtsif_alt, vc_i2c0, sd_card_a, mtsif_alt1, arm_jtag, pdm, spi_m),
-+	PIN(43, vc_spi0, mtsif_alt, vc_i2c0, sd_card_a, mtsif_alt1, arm_jtag, pdm, spi_m),
-+	PIN(44, vc_spi0, mtsif_alt, enet0, sd_card_a, mtsif_alt1, arm_jtag, pdm, spi_m),
-+	PIN(45, vc_spi0, mtsif_alt, enet0, sd_card_a, mtsif_alt1, arm_jtag, pdm, spi_m),
-+	PIN(46, vc_spi0, mtsif_alt, sd_card_a, mtsif_alt1, arm_jtag, pdm, spi_m, _),
-+	PIN(47, enet0, mtsif_alt, i2s_out, mtsif_alt1, arm_jtag, _, _, _),
-+	PIN(48, sc0, usb_pwr, spdif_out, mtsif, _, _, _, _),
-+	PIN(49, sc0, usb_pwr, aud_fs_clk0, mtsif, _, _, _, _),
-+	PIN(50, sc0, usb_vbus, sc0, _, _, _, _, _),
-+	PIN(51, sc0, enet0, sc0, sr_edm_sense, _, _, _, _),
-+	PIN(52, sc0, enet0, vc_pwm1, _, _, _, _, _),
-+	PIN(53, sc0, enet0_rgmii, ext_sc_clk, _, _, _, _, _),
-+};
-+
-+static const struct bcm2712_pin_funcs bcm2712_d0_aon_gpio_pin_funcs[] = {
-+	PIN(0, ir_in, vc_spi0, vc_uart0, vc_i2c3, uart0, vc_i2c0, _, _),
-+	PIN(1, vc_pwm0, vc_spi0, vc_uart0, vc_i2c3, uart0, aon_pwm, vc_i2c0, vc_pwm1),
-+	PIN(2, vc_pwm0, vc_spi0, vc_uart0, ctl_hdmi_5v, uart0, aon_pwm, ir_in, vc_pwm1),
-+	PIN(3, ir_in, vc_spi0, vc_uart0, uart0, sd_card_g, aon_gpclk, _, _),
-+	PIN(4, gpclk0, vc_spi0, pm_led_out, aon_pwm, sd_card_g, vc_pwm0, _, _),
-+	PIN(5, gpclk1, ir_in, aon_pwm, sd_card_g, vc_pwm0, _, _, _),
-+	PIN(6, uart1, vc_uart2, ctl_hdmi_5v, gpclk2, vc_spi3, _, _, _),
-+	PIN(7, _, _, _, _, _, _, _, _),
-+	PIN(8, uart1, vc_uart2, ctl_hdmi_5v, vc_spi0, vc_spi3, _, _, _),
-+	PIN(9, uart1, vc_uart2, vc_uart0, aon_pwm, vc_spi0, vc_uart2, vc_spi3, _),
-+	PIN(10, _, _, _, _, _, _, _, _),
-+	PIN(11, _, _, _, _, _, _, _, _),
-+	PIN(12, uart1, vc_uart2, vc_uart0, vc_spi0, usb_pwr, vc_uart2, vc_spi3, _),
-+	PIN(13, bsc_m1, vc_uart0, uui, vc_spi0, arm_jtag, vc_uart2, vc_i2c3, _),
-+	PIN(14, bsc_m1, aon_gpclk, vc_uart0, uui, vc_spi0, arm_jtag, vc_uart2, vc_i2c3),
-+};
-+
-+static const struct bcm2712_pin_funcs bcm2712_d0_aon_sgpio_pin_funcs[] = {
-+	PIN(0, hdmi_tx0_bsc, hdmi_tx0_auto_i2c, bsc_m0, vc_i2c0, _, _, _, _),
-+	PIN(1, hdmi_tx0_bsc, hdmi_tx0_auto_i2c, bsc_m0, vc_i2c0, _, _, _, _),
-+	PIN(2, hdmi_tx1_bsc, hdmi_tx1_auto_i2c, bsc_m1, vc_i2c0, ctl_hdmi_5v, _, _, _),
-+	PIN(3, hdmi_tx1_bsc, hdmi_tx1_auto_i2c, bsc_m1, vc_i2c0, _, _, _, _),
-+	PIN(4, avs_pmu_bsc, bsc_m2, vc_i2c3, ctl_hdmi_5v, _, _, _, _),
-+	PIN(5, avs_pmu_bsc, bsc_m2, vc_i2c3, _, _, _, _, _),
-+};
-+
-+static const struct bcm2712_pin_funcs bcm2712_d0_gpio_pin_funcs[] = {
-+	PIN(1, vc_i2c0, usb_pwr, gpclk0, sd_card_e, vc_spi3, sr_edm_sense, vc_spi0, vc_uart0),
-+	PIN(2, vc_i2c0, usb_pwr, gpclk1, sd_card_e, vc_spi3, clk_observe, vc_spi0, vc_uart0),
-+	PIN(3, vc_i2c3, usb_vbus, gpclk2, sd_card_e, vc_spi3, vc_spi0, vc_uart0, _),
-+	PIN(4, vc_i2c3, vc_pwm1, vc_spi3, sd_card_e, vc_spi3, vc_spi0, vc_uart0, _),
-+	PIN(10, bsc_m3, vc_pwm1, vc_spi3, sd_card_e, vc_spi3, gpclk0, _, _),
-+	PIN(11, bsc_m3, vc_spi3, clk_observe, sd_card_c, gpclk1, _, _, _),
-+	PIN(12, spi_s, vc_spi3, sd_card_c, sd_card_d, _, _, _, _),
-+	PIN(13, spi_s, vc_spi3, sd_card_c, sd_card_d, _, _, _, _),
-+	PIN(14, spi_s, uui, arm_jtag, vc_pwm0, vc_i2c0, sd_card_d, _, _),
-+	PIN(15, spi_s, uui, arm_jtag, vc_pwm0, vc_i2c0, gpclk0, _, _),
-+	PIN(18, sd_card_f, vc_pwm1, _, _, _, _, _, _),
-+	PIN(19, sd_card_f, usb_pwr, vc_pwm1, _, _, _, _, _),
-+	PIN(20, vc_i2c3, uui, vc_uart0, arm_jtag, vc_uart2, _, _, _),
-+	PIN(21, vc_i2c3, uui, vc_uart0, arm_jtag, vc_uart2, _, _, _),
-+	PIN(22, sd_card_f, vc_uart0, vc_i2c3, _, _, _, _, _),
-+	PIN(23, vc_uart0, vc_i2c3, _, _, _, _, _, _),
-+	PIN(24, sd_card_b, vc_spi0, arm_jtag, uart0, usb_pwr, vc_uart2, vc_uart0, _),
-+	PIN(25, sd_card_b, vc_spi0, arm_jtag, uart0, usb_pwr, vc_uart2, vc_uart0, _),
-+	PIN(26, sd_card_b, vc_spi0, arm_jtag, uart0, usb_vbus, vc_uart2, vc_spi0, _),
-+	PIN(27, sd_card_b, vc_spi0, arm_jtag, uart0, vc_uart2, vc_spi0, _, _),
-+	PIN(28, sd_card_b, vc_spi0, arm_jtag, vc_i2c0, vc_spi0, _, _, _),
-+	PIN(29, arm_jtag, vc_i2c0, vc_spi0, _, _, _, _, _),
-+	PIN(30, sd2, gpclk0, vc_pwm0, _, _, _, _, _),
-+	PIN(31, sd2, vc_spi3, vc_pwm0, _, _, _, _, _),
-+	PIN(32, sd2, vc_spi3, vc_uart3, _, _, _, _, _),
-+	PIN(33, sd2, vc_spi3, vc_uart3, _, _, _, _, _),
-+	PIN(34, sd2, vc_spi3, vc_i2c5, _, _, _, _, _),
-+	PIN(35, sd2, vc_spi3, vc_i2c5, _, _, _, _, _),
-+};
-+
-+static inline u32 bcm2712_reg_rd(struct bcm2712_pinctrl *pc, unsigned reg)
-+{
-+	return readl(pc->base + reg);
-+}
-+
-+static inline void bcm2712_reg_wr(struct bcm2712_pinctrl *pc, unsigned reg,
-+		u32 val)
-+{
-+	writel(val, pc->base + reg);
-+}
-+
-+static enum bcm2712_funcs bcm2712_pinctrl_fsel_get(
-+	struct bcm2712_pinctrl *pc, unsigned pin)
-+{
-+	u32 bit = pc->pin_regs[pin].mux_bit;
-+	enum bcm2712_funcs func;
-+	int fsel;
-+	u32 val;
-+
-+	if (!bit)
-+		return func_gpio;
-+
-+	val = bcm2712_reg_rd(pc, BIT_TO_REG(bit));
-+	fsel = (val >> BIT_TO_SHIFT(bit)) & BCM2712_FSEL_MASK;
-+	func = pc->pin_funcs[pin].funcs[fsel];
-+	if (func >= func_count)
-+		func = (enum bcm2712_funcs)fsel;
-+
-+	dev_dbg(pc->dev, "get %04x: %08x (%u => %s)\n",
-+		BIT_TO_REG(bit), val, pin,
-+		bcm2712_func_names[func]);
-+
-+	return func;
-+}
-+
-+static void bcm2712_pinctrl_fsel_set(
-+	struct bcm2712_pinctrl *pc, unsigned pin,
-+	enum bcm2712_funcs func)
-+{
-+	u32 bit = pc->pin_regs[pin].mux_bit, val;
-+	const u8 *pin_funcs;
-+	unsigned long flags;
-+	int fsel;
-+	int cur;
-+	int i;
-+
-+	if (!bit || func >= func_count)
-+		return;
-+
-+	fsel = BCM2712_FSEL_COUNT;
-+
-+	if (func >= BCM2712_FSEL_COUNT) {
-+		/* Convert to an fsel number */
-+		pin_funcs = pc->pin_funcs[pin].funcs;
-+		for (i = 1; i < BCM2712_FSEL_COUNT; i++) {
-+			if (pin_funcs[i - 1] == func) {
-+				fsel = i;
-+				break;
-+			}
-+		}
-+	} else {
-+		fsel = (enum bcm2712_funcs)func;
-+	}
-+	if (fsel >= BCM2712_FSEL_COUNT)
-+		return;
-+
-+	spin_lock_irqsave(&pc->lock, flags);
-+
-+	val = bcm2712_reg_rd(pc, BIT_TO_REG(bit));
-+	cur = (val >> BIT_TO_SHIFT(bit)) & BCM2712_FSEL_MASK;
-+
-+	dev_dbg(pc->dev, "read %04x: %08x (%u => %s)\n",
-+		BIT_TO_REG(bit), val, pin,
-+		bcm2712_func_names[cur]);
-+
-+	if (cur != fsel) {
-+		val &= ~(BCM2712_FSEL_MASK << BIT_TO_SHIFT(bit));
-+		val |= fsel << BIT_TO_SHIFT(bit);
-+
-+		dev_dbg(pc->dev, "write %04x: %08x (%u <= %s)\n",
-+			BIT_TO_REG(bit), val, pin,
-+			bcm2712_func_names[fsel]);
-+		bcm2712_reg_wr(pc, BIT_TO_REG(bit), val);
-+	}
-+
-+	spin_unlock_irqrestore(&pc->lock, flags);
-+}
-+
-+static int bcm2712_pctl_get_groups_count(struct pinctrl_dev *pctldev)
-+{
-+	struct bcm2712_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
-+
-+	return pc->pctl_desc.npins;
-+}
-+
-+static const char *bcm2712_pctl_get_group_name(struct pinctrl_dev *pctldev,
-+		unsigned selector)
-+{
-+	struct bcm2712_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
-+
-+	return pc->gpio_groups[selector];
-+}
-+
-+static int bcm2712_pctl_get_group_pins(struct pinctrl_dev *pctldev,
-+		unsigned selector,
-+		const unsigned **pins,
-+		unsigned *num_pins)
-+{
-+	struct bcm2712_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
-+
-+	*pins = &pc->pctl_desc.pins[selector].number;
-+	*num_pins = 1;
-+
-+	return 0;
-+}
-+
-+static void bcm2712_pctl_pin_dbg_show(struct pinctrl_dev *pctldev,
-+		struct seq_file *s,
-+		unsigned offset)
-+{
-+	struct bcm2712_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
-+	enum bcm2712_funcs fsel = bcm2712_pinctrl_fsel_get(pc, offset);
-+	const char *fname = bcm2712_func_names[fsel];
-+
-+	seq_printf(s, "function %s", fname);
-+}
-+
-+static void bcm2712_pctl_dt_free_map(struct pinctrl_dev *pctldev,
-+		struct pinctrl_map *maps, unsigned num_maps)
-+{
-+	int i;
-+
-+	for (i = 0; i < num_maps; i++)
-+		if (maps[i].type == PIN_MAP_TYPE_CONFIGS_PIN)
-+			kfree(maps[i].data.configs.configs);
-+
-+	kfree(maps);
-+}
-+
-+static const struct pinctrl_ops bcm2712_pctl_ops = {
-+	.get_groups_count = bcm2712_pctl_get_groups_count,
-+	.get_group_name = bcm2712_pctl_get_group_name,
-+	.get_group_pins = bcm2712_pctl_get_group_pins,
-+	.pin_dbg_show = bcm2712_pctl_pin_dbg_show,
-+	.dt_node_to_map = pinconf_generic_dt_node_to_map_all,
-+	.dt_free_map = bcm2712_pctl_dt_free_map,
-+};
-+
-+static int bcm2712_pmx_free(struct pinctrl_dev *pctldev,
-+		unsigned offset)
-+{
-+	struct bcm2712_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
-+
-+	/* disable by setting to GPIO */
-+	bcm2712_pinctrl_fsel_set(pc, offset, func_gpio);
-+	return 0;
-+}
-+
-+static int bcm2712_pmx_get_functions_count(struct pinctrl_dev *pctldev)
-+{
-+	return func_count;
-+}
-+
-+static const char *bcm2712_pmx_get_function_name(struct pinctrl_dev *pctldev,
-+		unsigned selector)
-+{
-+	return (selector < func_count) ? bcm2712_func_names[selector] : NULL;
-+}
-+
-+static int bcm2712_pmx_get_function_groups(struct pinctrl_dev *pctldev,
-+		unsigned selector,
-+		const char * const **groups,
-+		unsigned * const num_groups)
-+{
-+	struct bcm2712_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
-+	/* every pin can do every function */
-+	*groups = pc->gpio_groups;
-+	*num_groups = pc->pctl_desc.npins;
-+
-+	return 0;
-+}
-+
-+static int bcm2712_pmx_set(struct pinctrl_dev *pctldev,
-+		unsigned func_selector,
-+		unsigned group_selector)
-+{
-+	struct bcm2712_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
-+
-+	bcm2712_pinctrl_fsel_set(pc, group_selector, func_selector);
-+
-+	return 0;
-+}
-+static int bcm2712_pmx_gpio_request_enable(struct pinctrl_dev *pctldev,
-+					   struct pinctrl_gpio_range *range,
-+					   unsigned pin)
-+{
-+	struct bcm2712_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
-+
-+	bcm2712_pinctrl_fsel_set(pc, pin, func_gpio);
-+
-+	return 0;
-+}
-+
-+static void bcm2712_pmx_gpio_disable_free(struct pinctrl_dev *pctldev,
-+		struct pinctrl_gpio_range *range,
-+		unsigned offset)
-+{
-+	struct bcm2712_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
-+
-+	/* disable by setting to GPIO */
-+	bcm2712_pinctrl_fsel_set(pc, offset, func_gpio);
-+}
-+
-+static const struct pinmux_ops bcm2712_pmx_ops = {
-+	.free = bcm2712_pmx_free,
-+	.get_functions_count = bcm2712_pmx_get_functions_count,
-+	.get_function_name = bcm2712_pmx_get_function_name,
-+	.get_function_groups = bcm2712_pmx_get_function_groups,
-+	.set_mux = bcm2712_pmx_set,
-+	.gpio_request_enable = bcm2712_pmx_gpio_request_enable,
-+	.gpio_disable_free = bcm2712_pmx_gpio_disable_free,
-+};
-+
-+static unsigned int bcm2712_pull_config_get(struct bcm2712_pinctrl *pc,
-+					    unsigned int pin)
-+{
-+	u32 bit = pc->pin_regs[pin].pad_bit, val;
-+
-+	if (unlikely(bit == REG_BIT_INVALID))
-+	    return BCM2712_PULL_NONE;
-+
-+	val = bcm2712_reg_rd(pc, BIT_TO_REG(bit));
-+	return (val >> BIT_TO_SHIFT(bit)) & BCM2712_PULL_MASK;
-+}
-+
-+static void bcm2712_pull_config_set(struct bcm2712_pinctrl *pc,
-+				    unsigned int pin, unsigned int arg)
-+{
-+	u32 bit = pc->pin_regs[pin].pad_bit, val;
-+	unsigned long flags;
-+
-+	if (unlikely(bit == REG_BIT_INVALID)) {
-+	    dev_warn(pc->dev, "can't set pulls for %s\n", pc->gpio_groups[pin]);
-+	    return;
-+	}
-+
-+	spin_lock_irqsave(&pc->lock, flags);
-+
-+	val = bcm2712_reg_rd(pc, BIT_TO_REG(bit));
-+	val &= ~(BCM2712_PULL_MASK << BIT_TO_SHIFT(bit));
-+	val |= (arg << BIT_TO_SHIFT(bit));
-+	bcm2712_reg_wr(pc, BIT_TO_REG(bit), val);
-+
-+	spin_unlock_irqrestore(&pc->lock, flags);
-+}
-+
-+static int bcm2712_pinconf_get(struct pinctrl_dev *pctldev,
-+			unsigned pin, unsigned long *config)
-+{
-+	struct bcm2712_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
-+	enum pin_config_param param = pinconf_to_config_param(*config);
-+	u32 arg;
-+
-+	switch (param) {
-+	case PIN_CONFIG_BIAS_DISABLE:
-+		arg = (bcm2712_pull_config_get(pc, pin) == BCM2712_PULL_NONE);
-+		break;
-+	case PIN_CONFIG_BIAS_PULL_DOWN:
-+		arg = (bcm2712_pull_config_get(pc, pin) == BCM2712_PULL_DOWN);
-+		break;
-+	case PIN_CONFIG_BIAS_PULL_UP:
-+		arg = (bcm2712_pull_config_get(pc, pin) == BCM2712_PULL_UP);
-+		break;
-+	default:
-+		return -ENOTSUPP;
-+	}
-+
-+	*config = pinconf_to_config_packed(param, arg);
-+
-+	return -ENOTSUPP;
-+}
-+
-+static int bcm2712_pinconf_set(struct pinctrl_dev *pctldev,
-+			       unsigned int pin, unsigned long *configs,
-+			       unsigned int num_configs)
-+{
-+	struct bcm2712_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
-+	u32 param, arg;
-+	int i;
-+
-+	for (i = 0; i < num_configs; i++) {
-+		param = pinconf_to_config_param(configs[i]);
-+		arg = pinconf_to_config_argument(configs[i]);
-+
-+		switch (param) {
-+		case PIN_CONFIG_BIAS_DISABLE:
-+			bcm2712_pull_config_set(pc, pin, BCM2712_PULL_NONE);
-+			break;
-+		case PIN_CONFIG_BIAS_PULL_DOWN:
-+			bcm2712_pull_config_set(pc, pin, BCM2712_PULL_DOWN);
-+			break;
-+		case PIN_CONFIG_BIAS_PULL_UP:
-+			bcm2712_pull_config_set(pc, pin, BCM2712_PULL_UP);
-+			break;
-+		default:
-+			return -ENOTSUPP;
-+		}
-+	} /* for each config */
-+
-+	return 0;
-+}
-+
-+static const struct pinconf_ops bcm2712_pinconf_ops = {
-+	.is_generic = true,
-+	.pin_config_get = bcm2712_pinconf_get,
-+	.pin_config_set = bcm2712_pinconf_set,
-+};
-+
-+static const struct pinctrl_desc bcm2712_c0_pinctrl_desc = {
-+	.name = "pinctrl-bcm2712",
-+	.pins = bcm2712_c0_gpio_pins,
-+	.npins = ARRAY_SIZE(bcm2712_c0_gpio_pins),
-+	.pctlops = &bcm2712_pctl_ops,
-+	.pmxops = &bcm2712_pmx_ops,
-+	.confops = &bcm2712_pinconf_ops,
-+	.owner = THIS_MODULE,
-+};
-+
-+static const struct pinctrl_desc bcm2712_c0_aon_pinctrl_desc = {
-+	.name = "aon-pinctrl-bcm2712",
-+	.pins = bcm2712_c0_aon_gpio_pins,
-+	.npins = ARRAY_SIZE(bcm2712_c0_aon_gpio_pins),
-+	.pctlops = &bcm2712_pctl_ops,
-+	.pmxops = &bcm2712_pmx_ops,
-+	.confops = &bcm2712_pinconf_ops,
-+	.owner = THIS_MODULE,
-+};
-+
-+static const struct pinctrl_desc bcm2712_d0_pinctrl_desc = {
-+	.name = "pinctrl-bcm2712",
-+	.pins = bcm2712_d0_gpio_pins,
-+	.npins = ARRAY_SIZE(bcm2712_d0_gpio_pins),
-+	.pctlops = &bcm2712_pctl_ops,
-+	.pmxops = &bcm2712_pmx_ops,
-+	.confops = &bcm2712_pinconf_ops,
-+	.owner = THIS_MODULE,
-+};
-+
-+static const struct pinctrl_desc bcm2712_d0_aon_pinctrl_desc = {
-+	.name = "aon-pinctrl-bcm2712",
-+	.pins = bcm2712_d0_aon_gpio_pins,
-+	.npins = ARRAY_SIZE(bcm2712_d0_aon_gpio_pins),
-+	.pctlops = &bcm2712_pctl_ops,
-+	.pmxops = &bcm2712_pmx_ops,
-+	.confops = &bcm2712_pinconf_ops,
-+	.owner = THIS_MODULE,
-+};
-+
-+static const struct pinctrl_gpio_range bcm2712_c0_pinctrl_gpio_range = {
-+	.name = "pinctrl-bcm2712",
-+	.npins = ARRAY_SIZE(bcm2712_c0_gpio_pins),
-+};
-+
-+static const struct pinctrl_gpio_range bcm2712_c0_aon_pinctrl_gpio_range = {
-+	.name = "aon-pinctrl-bcm2712",
-+	.npins = ARRAY_SIZE(bcm2712_c0_aon_gpio_pins),
-+};
-+
-+static const struct pinctrl_gpio_range bcm2712_d0_pinctrl_gpio_range = {
-+	.name = "pinctrl-bcm2712",
-+	.npins = ARRAY_SIZE(bcm2712_d0_gpio_pins),
-+};
-+
-+static const struct pinctrl_gpio_range bcm2712_d0_aon_pinctrl_gpio_range = {
-+	.name = "aon-pinctrl-bcm2712",
-+	.npins = ARRAY_SIZE(bcm2712_d0_aon_gpio_pins),
-+};
-+
-+static const struct bcm_plat_data bcm2712_c0_plat_data = {
-+	.pctl_desc = &bcm2712_c0_pinctrl_desc,
-+	.gpio_range = &bcm2712_c0_pinctrl_gpio_range,
-+	.pin_regs = bcm2712_c0_gpio_pin_regs,
-+	.pin_funcs = bcm2712_c0_gpio_pin_funcs,
-+};
-+
-+static const struct bcm_plat_data bcm2712_c0_aon_plat_data = {
-+	.pctl_desc = &bcm2712_c0_aon_pinctrl_desc,
-+	.gpio_range = &bcm2712_c0_aon_pinctrl_gpio_range,
-+	.pin_regs = bcm2712_c0_aon_gpio_pin_regs,
-+	.pin_funcs = bcm2712_c0_aon_gpio_pin_funcs,
-+};
-+
-+static const struct bcm_plat_data bcm2712_d0_plat_data = {
-+	.pctl_desc = &bcm2712_d0_pinctrl_desc,
-+	.gpio_range = &bcm2712_d0_pinctrl_gpio_range,
-+	.pin_regs = bcm2712_d0_gpio_pin_regs,
-+	.pin_funcs = bcm2712_d0_gpio_pin_funcs,
-+};
-+
-+static const struct bcm_plat_data bcm2712_d0_aon_plat_data = {
-+	.pctl_desc = &bcm2712_d0_aon_pinctrl_desc,
-+	.gpio_range = &bcm2712_d0_aon_pinctrl_gpio_range,
-+	.pin_regs = bcm2712_d0_aon_gpio_pin_regs,
-+	.pin_funcs = bcm2712_d0_aon_gpio_pin_funcs,
-+};
-+
-+static const struct of_device_id bcm2712_pinctrl_match[] = {
-+	{
-+		.compatible = "brcm,bcm2712-pinctrl",
-+		.data = &bcm2712_c0_plat_data,
-+	},
-+	{
-+		.compatible = "brcm,bcm2712-aon-pinctrl",
-+		.data = &bcm2712_c0_aon_plat_data,
-+	},
-+
-+	{
-+		.compatible = "brcm,bcm2712c0-pinctrl",
-+		.data = &bcm2712_c0_plat_data,
-+	},
-+	{
-+		.compatible = "brcm,bcm2712c0-aon-pinctrl",
-+		.data = &bcm2712_c0_aon_plat_data,
-+	},
-+
-+	{
-+		.compatible = "brcm,bcm2712d0-pinctrl",
-+		.data = &bcm2712_d0_plat_data,
-+	},
-+	{
-+		.compatible = "brcm,bcm2712d0-aon-pinctrl",
-+		.data = &bcm2712_d0_aon_plat_data,
-+	},
-+	{}
-+};
-+
-+static int bcm2712_pinctrl_probe(struct platform_device *pdev)
-+{
-+	struct device *dev = &pdev->dev;
-+	struct device_node *np = dev->of_node;
-+	const struct bcm_plat_data *pdata;
-+	const struct of_device_id *match;
-+	struct bcm2712_pinctrl *pc;
-+	const char **names;
-+	int num_pins, i;
-+
-+	match = of_match_node(bcm2712_pinctrl_match, np);
-+	if (!match)
-+		return -EINVAL;
-+	pdata = match->data;
-+
-+	pc = devm_kzalloc(dev, sizeof(*pc), GFP_KERNEL);
-+	if (!pc)
-+		return -ENOMEM;
-+
-+	platform_set_drvdata(pdev, pc);
-+	pc->dev = dev;
-+	spin_lock_init(&pc->lock);
-+
-+	pc->base = devm_of_iomap(dev, np, 0, NULL);
-+	if (IS_ERR(pc->base)) {
-+		dev_err(dev, "could not get IO memory\n");
-+		return PTR_ERR(pc->base);
-+	}
-+
-+	pc->pctl_desc = *pdata->pctl_desc;
-+	num_pins = pc->pctl_desc.npins;
-+	names = devm_kmalloc_array(dev, num_pins, sizeof(const char *),
-+				   GFP_KERNEL);
-+	if (!names)
-+		return -ENOMEM;
-+	for (i = 0; i < num_pins; i++)
-+		names[i] = pc->pctl_desc.pins[i].name;
-+	pc->gpio_groups = names;
-+	pc->pin_regs = pdata->pin_regs;
-+	pc->pin_funcs = pdata->pin_funcs;
-+	pc->pctl_dev = devm_pinctrl_register(dev, &pc->pctl_desc, pc);
-+	if (IS_ERR(pc->pctl_dev))
-+		return PTR_ERR(pc->pctl_dev);
-+
-+	pc->gpio_range = *pdata->gpio_range;
-+	pinctrl_add_gpio_range(pc->pctl_dev, &pc->gpio_range);
-+
-+	return 0;
-+}
-+
-+static struct platform_driver bcm2712_pinctrl_driver = {
-+	.probe = bcm2712_pinctrl_probe,
-+	.driver = {
-+		.name = MODULE_NAME,
-+		.of_match_table = bcm2712_pinctrl_match,
-+		.suppress_bind_attrs = true,
-+	},
-+};
-+builtin_platform_driver(bcm2712_pinctrl_driver);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0859-mmc-brcmstb-add-support-for-BCM2712.patch b/target/linux/bcm27xx/patches-6.1/950-0859-mmc-brcmstb-add-support-for-BCM2712.patch
deleted file mode 100644
index 05d403a63e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0859-mmc-brcmstb-add-support-for-BCM2712.patch
+++ /dev/null
@@ -1,498 +0,0 @@
-From b627647c4500d39cb026924b608841fdf4d4d7e9 Mon Sep 17 00:00:00 2001
-From: Ulf Hansson <ulf.hansson@linaro.org>
-Date: Thu, 29 Oct 2020 09:57:16 +0800
-Subject: [PATCH] mmc: brcmstb: add support for BCM2712
-
-BCM2712 has an SD Express capable SDHCI implementation and uses
-the SDIO CFG register block present on other STB chips.
-
-Add plumbing for SD Express handover and BCM2712-specific functions.
-
-Due to the common bus infrastructure between BCM2711 and BCM2712,
-the driver also needs to implement 32-bit IO accessors.
-
-mmc: brcmstb: override card presence if broken-cd is set
-
-Not just if the card is declared as nonremovable.
-
-sdhci: brcmstb: align SD express switchover with SD spec v8.00
-
-Part 1 of the Physical specification, figure 3-24, details the switch
-sequence for cards initially probed as SD. Add a missing check for DAT2
-level after switching VDD2 on.
-
-sdhci: brcmstb: clean up SD Express probe and error handling
-
-Refactor to avoid spurious error messages in dmesg if the requisite SD
-Express DT nodes aren't present.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
-
-mmc: sdhci-brcmstb: only use the delay line PHY for tuneable speeds
-
-The MMC core has a 200MHz core clock which allows the use of DDR50 and
-below without incremental phase tuning. SDR50/SDR104 and the EMMC HS200
-speeds require tuning.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- drivers/mmc/host/Kconfig         |   2 +
- drivers/mmc/host/sdhci-brcmstb.c | 356 +++++++++++++++++++++++++++++++
- 2 files changed, 358 insertions(+)
-
---- a/drivers/mmc/host/Kconfig
-+++ b/drivers/mmc/host/Kconfig
-@@ -1082,7 +1082,9 @@ config MMC_SDHCI_BRCMSTB
- 	tristate "Broadcom SDIO/SD/MMC support"
- 	depends on ARCH_BRCMSTB || BMIPS_GENERIC
- 	depends on MMC_SDHCI_PLTFM
-+	select MMC_SDHCI_IO_ACCESSORS
- 	select MMC_CQHCI
-+	select OF_DYNAMIC
- 	default y
- 	help
- 	  This selects support for the SDIO/SD/MMC Host Controller on
---- a/drivers/mmc/host/sdhci-brcmstb.c
-+++ b/drivers/mmc/host/sdhci-brcmstb.c
-@@ -11,6 +11,8 @@
- #include <linux/of.h>
- #include <linux/bitops.h>
- #include <linux/delay.h>
-+#include <linux/pinctrl/consumer.h>
-+#include <linux/regulator/consumer.h>
- 
- #include "sdhci-cqhci.h"
- #include "sdhci-pltfm.h"
-@@ -26,18 +28,43 @@
- 
- #define BRCMSTB_PRIV_FLAGS_HAS_CQE		BIT(0)
- #define BRCMSTB_PRIV_FLAGS_GATE_CLOCK		BIT(1)
-+#define BRCMSTB_PRIV_FLAGS_HAS_SD_EXPRESS	BIT(2)
- 
- #define SDHCI_ARASAN_CQE_BASE_ADDR		0x200
- 
-+#define SDIO_CFG_CTRL				0x0
-+#define  SDIO_CFG_CTRL_SDCD_N_TEST_EN		BIT(31)
-+#define  SDIO_CFG_CTRL_SDCD_N_TEST_LEV		BIT(30)
-+
-+#define SDIO_CFG_SD_PIN_SEL			0x44
-+#define  SDIO_CFG_SD_PIN_SEL_MASK		0x3
-+#define  SDIO_CFG_SD_PIN_SEL_CARD		BIT(1)
-+
-+#define SDIO_CFG_MAX_50MHZ_MODE			0x1ac
-+#define  SDIO_CFG_MAX_50MHZ_MODE_STRAP_OVERRIDE	BIT(31)
-+#define  SDIO_CFG_MAX_50MHZ_MODE_ENABLE		BIT(0)
-+
- struct sdhci_brcmstb_priv {
- 	void __iomem *cfg_regs;
- 	unsigned int flags;
- 	struct clk *base_clk;
- 	u32 base_freq_hz;
-+	u32 shadow_cmd;
-+	u32 shadow_blk;
-+	bool is_cmd_shadowed;
-+	bool is_blk_shadowed;
-+	struct regulator *sde_1v8;
-+	struct device_node *sde_pcie;
-+	void *__iomem sde_ioaddr;
-+	void *__iomem sde_ioaddr2;
-+	struct pinctrl *pinctrl;
-+	struct pinctrl_state *pins_default;
-+	struct pinctrl_state *pins_sdex;
- };
- 
- struct brcmstb_match_priv {
- 	void (*hs400es)(struct mmc_host *mmc, struct mmc_ios *ios);
-+	void (*cfginit)(struct sdhci_host *host);
- 	struct sdhci_ops *ops;
- 	const unsigned int flags;
- };
-@@ -94,6 +121,124 @@ static void sdhci_brcmstb_set_clock(stru
- 	sdhci_enable_clk(host, clk);
- }
- 
-+#define REG_OFFSET_IN_BITS(reg) ((reg) << 3 & 0x18)
-+
-+static inline u32 sdhci_brcmstb_32only_readl(struct sdhci_host *host, int reg)
-+{
-+	u32 val = readl(host->ioaddr + reg);
-+
-+	pr_debug("%s: readl [0x%02x] 0x%08x\n",
-+		 mmc_hostname(host->mmc), reg, val);
-+	return val;
-+}
-+
-+static u16 sdhci_brcmstb_32only_readw(struct sdhci_host *host, int reg)
-+{
-+	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
-+	struct sdhci_brcmstb_priv *brcmstb_priv = sdhci_pltfm_priv(pltfm_host);
-+	u32 val;
-+	u16 word;
-+
-+	if ((reg == SDHCI_TRANSFER_MODE) && brcmstb_priv->is_cmd_shadowed) {
-+		/* Get the saved transfer mode */
-+		val = brcmstb_priv->shadow_cmd;
-+	} else if ((reg == SDHCI_BLOCK_SIZE || reg == SDHCI_BLOCK_COUNT) &&
-+		   brcmstb_priv->is_blk_shadowed) {
-+		/* Get the saved block info */
-+		val = brcmstb_priv->shadow_blk;
-+	} else {
-+		val = sdhci_brcmstb_32only_readl(host, (reg & ~3));
-+	}
-+	word = val >> REG_OFFSET_IN_BITS(reg) & 0xffff;
-+	return word;
-+}
-+
-+static u8 sdhci_brcmstb_32only_readb(struct sdhci_host *host, int reg)
-+{
-+	u32 val = sdhci_brcmstb_32only_readl(host, (reg & ~3));
-+	u8 byte = val >> REG_OFFSET_IN_BITS(reg) & 0xff;
-+	return byte;
-+}
-+
-+static inline void sdhci_brcmstb_32only_writel(struct sdhci_host *host, u32 val, int reg)
-+{
-+	pr_debug("%s: writel [0x%02x] 0x%08x\n",
-+		 mmc_hostname(host->mmc), reg, val);
-+
-+	writel(val, host->ioaddr + reg);
-+}
-+
-+/*
-+ * BCM2712 unfortunately carries with it a perennial bug with the SD controller
-+ * register interface present on previous chips (2711/2709/2708). Accesses must
-+ * be dword-sized and a read-modify-write cycle to the 32-bit registers
-+ * containing the COMMAND, TRANSFER_MODE, BLOCK_SIZE and BLOCK_COUNT registers
-+ * tramples the upper/lower 16 bits of data written. BCM2712 does not seem to
-+ * need the extreme delay between each write as on previous chips, just the
-+ * serialisation of writes to these registers in a single 32-bit operation.
-+ */
-+static void sdhci_brcmstb_32only_writew(struct sdhci_host *host, u16 val, int reg)
-+{
-+	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
-+	struct sdhci_brcmstb_priv *brcmstb_priv = sdhci_pltfm_priv(pltfm_host);
-+	u32 word_shift = REG_OFFSET_IN_BITS(reg);
-+	u32 mask = 0xffff << word_shift;
-+	u32 oldval, newval;
-+
-+	if (reg == SDHCI_COMMAND) {
-+		/* Write the block now as we are issuing a command */
-+		if (brcmstb_priv->is_blk_shadowed) {
-+			sdhci_brcmstb_32only_writel(host, brcmstb_priv->shadow_blk,
-+				SDHCI_BLOCK_SIZE);
-+			brcmstb_priv->is_blk_shadowed = false;
-+		}
-+		oldval = brcmstb_priv->shadow_cmd;
-+		brcmstb_priv->is_cmd_shadowed = false;
-+	} else if ((reg == SDHCI_BLOCK_SIZE || reg == SDHCI_BLOCK_COUNT) &&
-+		   brcmstb_priv->is_blk_shadowed) {
-+		/* Block size and count are stored in shadow reg */
-+		oldval = brcmstb_priv->shadow_blk;
-+	} else {
-+		/* Read reg, all other registers are not shadowed */
-+		oldval = sdhci_brcmstb_32only_readl(host, (reg & ~3));
-+	}
-+	newval = (oldval & ~mask) | (val << word_shift);
-+
-+	if (reg == SDHCI_TRANSFER_MODE) {
-+		/* Save the transfer mode until the command is issued */
-+		brcmstb_priv->shadow_cmd = newval;
-+		brcmstb_priv->is_cmd_shadowed = true;
-+	} else if (reg == SDHCI_BLOCK_SIZE || reg == SDHCI_BLOCK_COUNT) {
-+		/* Save the block info until the command is issued */
-+		brcmstb_priv->shadow_blk = newval;
-+		brcmstb_priv->is_blk_shadowed = true;
-+	} else {
-+		/* Command or other regular 32-bit write */
-+		sdhci_brcmstb_32only_writel(host, newval, reg & ~3);
-+	}
-+}
-+
-+static void sdhci_brcmstb_32only_writeb(struct sdhci_host *host, u8 val, int reg)
-+{
-+	u32 oldval = sdhci_brcmstb_32only_readl(host, (reg & ~3));
-+	u32 byte_shift = REG_OFFSET_IN_BITS(reg);
-+	u32 mask = 0xff << byte_shift;
-+	u32 newval = (oldval & ~mask) | (val << byte_shift);
-+
-+	sdhci_brcmstb_32only_writel(host, newval, reg & ~3);
-+}
-+
-+static void sdhci_brcmstb_set_power(struct sdhci_host *host, unsigned char mode,
-+				  unsigned short vdd)
-+{
-+	if (!IS_ERR(host->mmc->supply.vmmc)) {
-+		struct mmc_host *mmc = host->mmc;
-+
-+		mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd);
-+	}
-+	sdhci_set_power_noreg(host, mode, vdd);
-+}
-+
- static void sdhci_brcmstb_set_uhs_signaling(struct sdhci_host *host,
- 					    unsigned int timing)
- {
-@@ -123,6 +268,146 @@ static void sdhci_brcmstb_set_uhs_signal
- 	sdhci_writew(host, ctrl_2, SDHCI_HOST_CONTROL2);
- }
- 
-+static void sdhci_brcmstb_cfginit_2712(struct sdhci_host *host)
-+{
-+	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
-+	struct sdhci_brcmstb_priv *brcmstb_priv = sdhci_pltfm_priv(pltfm_host);
-+	bool want_dll = false;
-+	u32 uhs_mask = (MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_SDR104);
-+	u32 hsemmc_mask = (MMC_CAP2_HS200_1_8V_SDR | MMC_CAP2_HS200_1_2V_SDR |
-+			   MMC_CAP2_HS400_1_8V | MMC_CAP2_HS400_1_2V);
-+	u32 reg;
-+
-+	if (!(host->quirks2 & SDHCI_QUIRK2_NO_1_8_V)) {
-+	    if((host->mmc->caps & uhs_mask) || (host->mmc->caps2 & hsemmc_mask))
-+		want_dll = true;
-+	}
-+
-+	/*
-+	 * If we want a speed that requires tuning,
-+	 * then select the delay line PHY as the clock source.
-+	 */
-+	if (want_dll) {
-+		reg = readl(brcmstb_priv->cfg_regs + SDIO_CFG_MAX_50MHZ_MODE);
-+		reg &= ~SDIO_CFG_MAX_50MHZ_MODE_ENABLE;
-+		reg |= SDIO_CFG_MAX_50MHZ_MODE_STRAP_OVERRIDE;
-+		writel(reg, brcmstb_priv->cfg_regs + SDIO_CFG_MAX_50MHZ_MODE);
-+	}
-+
-+	if ((host->mmc->caps & MMC_CAP_NONREMOVABLE) ||
-+	    (host->mmc->caps & MMC_CAP_NEEDS_POLL)) {
-+		/* Force presence */
-+		reg = readl(brcmstb_priv->cfg_regs + SDIO_CFG_CTRL);
-+		reg &= ~SDIO_CFG_CTRL_SDCD_N_TEST_LEV;
-+		reg |= SDIO_CFG_CTRL_SDCD_N_TEST_EN;
-+		writel(reg, brcmstb_priv->cfg_regs + SDIO_CFG_CTRL);
-+	} else {
-+		/* Enable card detection line */
-+		reg = readl(brcmstb_priv->cfg_regs + SDIO_CFG_SD_PIN_SEL);
-+		reg &= ~SDIO_CFG_SD_PIN_SEL_MASK;
-+		reg |= SDIO_CFG_SD_PIN_SEL_CARD;
-+		writel(reg, brcmstb_priv->cfg_regs + SDIO_CFG_SD_PIN_SEL);
-+	}
-+}
-+
-+static int bcm2712_init_sd_express(struct sdhci_host *host, struct mmc_ios *ios)
-+{
-+	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
-+	struct sdhci_brcmstb_priv *brcmstb_priv = sdhci_pltfm_priv(pltfm_host);
-+	struct device *dev = host->mmc->parent;
-+	u32 ctrl_val;
-+	u32 present_state;
-+	int ret;
-+
-+	if (!brcmstb_priv->sde_ioaddr || !brcmstb_priv->sde_ioaddr2)
-+		return -EINVAL;
-+
-+	if (!brcmstb_priv->pinctrl)
-+		return -EINVAL;
-+
-+	/* Turn off the SD clock first */
-+	sdhci_set_clock(host, 0);
-+
-+	/* Disable SD DAT0-3 pulls */
-+	pinctrl_select_state(brcmstb_priv->pinctrl, brcmstb_priv->pins_sdex);
-+
-+	ctrl_val = readl(brcmstb_priv->sde_ioaddr);
-+	dev_dbg(dev, "ctrl_val 1 %08x\n", ctrl_val);
-+
-+	/* Tri-state the SD pins */
-+	ctrl_val |= 0x1ff8;
-+	writel(ctrl_val, brcmstb_priv->sde_ioaddr);
-+	dev_dbg(dev, "ctrl_val 1->%08x (%08x)\n", ctrl_val, readl(brcmstb_priv->sde_ioaddr));
-+	/* Let voltages settle */
-+	udelay(100);
-+
-+	/* Enable the PCIe sideband pins */
-+	ctrl_val &= ~0x6000;
-+	writel(ctrl_val, brcmstb_priv->sde_ioaddr);
-+	dev_dbg(dev, "ctrl_val 1->%08x (%08x)\n", ctrl_val, readl(brcmstb_priv->sde_ioaddr));
-+	/* Let voltages settle */
-+	udelay(100);
-+
-+	/* Turn on the 1v8 VDD2 regulator */
-+	ret = regulator_enable(brcmstb_priv->sde_1v8);
-+	if (ret)
-+		return ret;
-+
-+	/* Wait for Tpvcrl */
-+	msleep(1);
-+
-+	/* Sample DAT2 (CLKREQ#) - if low, card is in PCIe mode */
-+	present_state = sdhci_readl(host, SDHCI_PRESENT_STATE);
-+	present_state = (present_state & SDHCI_DATA_LVL_MASK) >> SDHCI_DATA_LVL_SHIFT;
-+	dev_dbg(dev, "state = 0x%08x\n", present_state);
-+
-+	if (present_state & BIT(2)) {
-+		dev_err(dev, "DAT2 still high, abandoning SDex switch\n");
-+		return -ENODEV;
-+	}
-+
-+	/* Turn on the LCPLL PTEST mux */
-+	ctrl_val = readl(brcmstb_priv->sde_ioaddr2 + 20); // misc5
-+	ctrl_val &= ~(0x7 << 7);
-+	ctrl_val |= 3 << 7;
-+	writel(ctrl_val, brcmstb_priv->sde_ioaddr2 + 20);
-+	dev_dbg(dev, "misc 5->%08x (%08x)\n", ctrl_val, readl(brcmstb_priv->sde_ioaddr2 + 20));
-+
-+	/* PTEST diff driver enable */
-+	ctrl_val = readl(brcmstb_priv->sde_ioaddr2);
-+	ctrl_val |= BIT(21);
-+	writel(ctrl_val, brcmstb_priv->sde_ioaddr2);
-+
-+	dev_dbg(dev, "misc 0->%08x (%08x)\n", ctrl_val, readl(brcmstb_priv->sde_ioaddr2));
-+
-+	/* Wait for more than the minimum Tpvpgl time */
-+	msleep(100);
-+
-+	if (brcmstb_priv->sde_pcie) {
-+		struct of_changeset changeset;
-+		static struct property okay_property = {
-+			.name = "status",
-+			.value = "okay",
-+			.length = 5,
-+		};
-+
-+		/* Enable the pcie controller */
-+		of_changeset_init(&changeset);
-+		ret = of_changeset_update_property(&changeset,
-+						   brcmstb_priv->sde_pcie,
-+						   &okay_property);
-+		if (ret) {
-+			dev_err(dev, "%s: failed to update property - %d\n", __func__,
-+			       ret);
-+			return -ENODEV;
-+		}
-+		ret = of_changeset_apply(&changeset);
-+	}
-+
-+	dev_dbg(dev, "%s -> %d\n", __func__, ret);
-+	return ret;
-+}
-+
- static void sdhci_brcmstb_dumpregs(struct mmc_host *mmc)
- {
- 	sdhci_dumpregs(mmc_priv(mmc));
-@@ -155,6 +440,21 @@ static struct sdhci_ops sdhci_brcmstb_op
- 	.set_uhs_signaling = sdhci_set_uhs_signaling,
- };
- 
-+static struct sdhci_ops sdhci_brcmstb_ops_2712 = {
-+	.read_l = sdhci_brcmstb_32only_readl,
-+	.read_w = sdhci_brcmstb_32only_readw,
-+	.read_b = sdhci_brcmstb_32only_readb,
-+	.write_l = sdhci_brcmstb_32only_writel,
-+	.write_w = sdhci_brcmstb_32only_writew,
-+	.write_b = sdhci_brcmstb_32only_writeb,
-+	.set_clock = sdhci_set_clock,
-+	.set_power = sdhci_brcmstb_set_power,
-+	.set_bus_width = sdhci_set_bus_width,
-+	.reset = sdhci_reset,
-+	.set_uhs_signaling = sdhci_set_uhs_signaling,
-+	.init_sd_express = bcm2712_init_sd_express,
-+};
-+
- static struct sdhci_ops sdhci_brcmstb_ops_7216 = {
- 	.set_clock = sdhci_brcmstb_set_clock,
- 	.set_bus_width = sdhci_set_bus_width,
-@@ -179,10 +479,16 @@ static const struct brcmstb_match_priv m
- 	.ops = &sdhci_brcmstb_ops_7216,
- };
- 
-+static const struct brcmstb_match_priv match_priv_2712 = {
-+	.cfginit = sdhci_brcmstb_cfginit_2712,
-+	.ops = &sdhci_brcmstb_ops_2712,
-+};
-+
- static const struct of_device_id sdhci_brcm_of_match[] = {
- 	{ .compatible = "brcm,bcm7425-sdhci", .data = &match_priv_7425 },
- 	{ .compatible = "brcm,bcm7445-sdhci", .data = &match_priv_7445 },
- 	{ .compatible = "brcm,bcm7216-sdhci", .data = &match_priv_7216 },
-+	{ .compatible = "brcm,bcm2712-sdhci", .data = &match_priv_2712 },
- 	{},
- };
- 
-@@ -256,6 +562,7 @@ static int sdhci_brcmstb_probe(struct pl
- 	u32 actual_clock_mhz;
- 	struct sdhci_host *host;
- 	struct resource *iomem;
-+	bool no_pinctrl = false;
- 	struct clk *clk;
- 	struct clk *base_clk = NULL;
- 	int res;
-@@ -290,6 +597,11 @@ static int sdhci_brcmstb_probe(struct pl
- 		match_priv->ops->irq = sdhci_brcmstb_cqhci_irq;
- 	}
- 
-+	priv->sde_pcie = of_parse_phandle(pdev->dev.of_node,
-+					  "sde-pcie", 0);
-+	if (priv->sde_pcie)
-+		priv->flags |= BRCMSTB_PRIV_FLAGS_HAS_SD_EXPRESS;
-+
- 	/* Map in the non-standard CFG registers */
- 	iomem = platform_get_resource(pdev, IORESOURCE_MEM, 1);
- 	priv->cfg_regs = devm_ioremap_resource(&pdev->dev, iomem);
-@@ -303,6 +615,43 @@ static int sdhci_brcmstb_probe(struct pl
- 	if (res)
- 		goto err;
- 
-+	priv->sde_1v8 = devm_regulator_get_optional(&pdev->dev, "sde-1v8");
-+	if (IS_ERR(priv->sde_1v8))
-+		priv->flags &= ~BRCMSTB_PRIV_FLAGS_HAS_SD_EXPRESS;
-+
-+	iomem = platform_get_resource(pdev, IORESOURCE_MEM, 2);
-+	if (iomem) {
-+		priv->sde_ioaddr = devm_ioremap_resource(&pdev->dev, iomem);
-+		if (IS_ERR(priv->sde_ioaddr))
-+			priv->sde_ioaddr = NULL;
-+	}
-+
-+	iomem = platform_get_resource(pdev, IORESOURCE_MEM, 3);
-+	if (iomem) {
-+		priv->sde_ioaddr2 = devm_ioremap_resource(&pdev->dev, iomem);
-+		if (IS_ERR(priv->sde_ioaddr2))
-+			priv->sde_ioaddr = NULL;
-+	}
-+
-+	priv->pinctrl = devm_pinctrl_get(&pdev->dev);
-+	if (IS_ERR(priv->pinctrl)) {
-+			no_pinctrl = true;
-+	}
-+	priv->pins_default = pinctrl_lookup_state(priv->pinctrl, "default");
-+	if (IS_ERR(priv->pins_default)) {
-+			dev_dbg(&pdev->dev, "No pinctrl default state\n");
-+			no_pinctrl = true;
-+	}
-+	priv->pins_sdex = pinctrl_lookup_state(priv->pinctrl, "sd-express");
-+	if (IS_ERR(priv->pins_sdex)) {
-+			dev_dbg(&pdev->dev, "No pinctrl sd-express state\n");
-+			no_pinctrl = true;
-+	}
-+	if (no_pinctrl || !priv->sde_ioaddr || !priv->sde_ioaddr2) {
-+		priv->pinctrl = NULL;
-+		priv->flags &= ~BRCMSTB_PRIV_FLAGS_HAS_SD_EXPRESS;
-+	}
-+
- 	/*
- 	 * Automatic clock gating does not work for SD cards that may
- 	 * voltage switch so only enable it for non-removable devices.
-@@ -319,6 +668,13 @@ static int sdhci_brcmstb_probe(struct pl
- 	    (host->mmc->caps2 & MMC_CAP2_HS400_ES))
- 		host->mmc_host_ops.hs400_enhanced_strobe = match_priv->hs400es;
- 
-+	if (host->ops->init_sd_express &&
-+	    (priv->flags & BRCMSTB_PRIV_FLAGS_HAS_SD_EXPRESS))
-+		host->mmc->caps2 |= MMC_CAP2_SD_EXP;
-+
-+	if(match_priv->cfginit)
-+		match_priv->cfginit(host);
-+
- 	/*
- 	 * Supply the existing CAPS, but clear the UHS modes. This
- 	 * will allow these modes to be specified by device tree
diff --git a/target/linux/bcm27xx/patches-6.1/950-0860-sdhci-Add-SD-Express-hook.patch b/target/linux/bcm27xx/patches-6.1/950-0860-sdhci-Add-SD-Express-hook.patch
deleted file mode 100644
index 1aea0b3bcd..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0860-sdhci-Add-SD-Express-hook.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 9564939f1a92e5f9807461539de28c50e5bee440 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 6 Jul 2021 09:45:36 +0100
-Subject: [PATCH] sdhci: Add SD Express hook
-
-sdhci: remove PYA0_INTR_BUG quirk. Add quirks to disable some of the higher SDR speeds at 1.8v.
----
- drivers/mmc/host/sdhci-of-dwcmshc.c |  5 ++++-
- drivers/mmc/host/sdhci.c            | 19 +++++++++++++++++++
- drivers/mmc/host/sdhci.h            |  6 ++++++
- 3 files changed, 29 insertions(+), 1 deletion(-)
-
---- a/drivers/mmc/host/sdhci-of-dwcmshc.c
-+++ b/drivers/mmc/host/sdhci-of-dwcmshc.c
-@@ -363,7 +363,10 @@ static const struct sdhci_pltfm_data sdh
- 	.quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN |
- 		  SDHCI_QUIRK_BROKEN_TIMEOUT_VAL,
- 	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
--		   SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN,
-+		   SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN |
-+	            SDHCI_QUIRK2_NO_SDR50 |
-+	            SDHCI_QUIRK2_NO_SDR104 |
-+	            SDHCI_QUIRK2_NO_SDR25,
- };
- 
- static int dwcmshc_rk35xx_init(struct sdhci_host *host, struct dwcmshc_priv *dwc_priv)
---- a/drivers/mmc/host/sdhci.c
-+++ b/drivers/mmc/host/sdhci.c
-@@ -3071,6 +3071,15 @@ static void sdhci_card_event(struct mmc_
- 	spin_unlock_irqrestore(&host->lock, flags);
- }
- 
-+static int sdhci_init_sd_express(struct mmc_host *mmc, struct mmc_ios *ios)
-+{
-+	struct sdhci_host *host = mmc_priv(mmc);
-+
-+	if (!host->ops->init_sd_express)
-+		return -EOPNOTSUPP;
-+	return host->ops->init_sd_express(host, ios);
-+}
-+
- static const struct mmc_host_ops sdhci_ops = {
- 	.request	= sdhci_request,
- 	.post_req	= sdhci_post_req,
-@@ -3086,6 +3095,7 @@ static const struct mmc_host_ops sdhci_o
- 	.execute_tuning			= sdhci_execute_tuning,
- 	.card_event			= sdhci_card_event,
- 	.card_busy	= sdhci_card_busy,
-+	.init_sd_express = sdhci_init_sd_express,
- };
- 
- /*****************************************************************************\
-@@ -4605,6 +4615,15 @@ int sdhci_setup_host(struct sdhci_host *
- 	    !(host->quirks2 & SDHCI_QUIRK2_BROKEN_DDR50))
- 		mmc->caps |= MMC_CAP_UHS_DDR50;
- 
-+	if (host->quirks2 & SDHCI_QUIRK2_NO_SDR25)
-+		mmc->caps &= ~MMC_CAP_UHS_SDR25;
-+
-+	if (host->quirks2 & SDHCI_QUIRK2_NO_SDR50)
-+		mmc->caps &= ~MMC_CAP_UHS_SDR50;
-+
-+	if (host->quirks2 & SDHCI_QUIRK2_NO_SDR104)
-+		mmc->caps &= ~MMC_CAP_UHS_SDR104;
-+
- 	/* Does the host need tuning for SDR50? */
- 	if (host->caps1 & SDHCI_USE_SDR50_TUNING)
- 		host->flags |= SDHCI_SDR50_NEEDS_TUNING;
---- a/drivers/mmc/host/sdhci.h
-+++ b/drivers/mmc/host/sdhci.h
-@@ -481,6 +481,11 @@ struct sdhci_host {
- /* Issue CMD and DATA reset together */
- #define SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER	(1<<19)
- 
-+/* Quirks to ignore a speed if a that speed is unreliable */
-+#define SDHCI_QUIRK2_NO_SDR25	(1<<19)
-+#define SDHCI_QUIRK2_NO_SDR50  (1<<20)
-+#define SDHCI_QUIRK2_NO_SDR104	(1<<21)
-+
- 	int irq;		/* Device IRQ */
- 	void __iomem *ioaddr;	/* Mapped address */
- 	phys_addr_t mapbase;	/* physical address base */
-@@ -663,6 +668,7 @@ struct sdhci_ops {
- 	void	(*request_done)(struct sdhci_host *host,
- 				struct mmc_request *mrq);
- 	void    (*dump_vendor_regs)(struct sdhci_host *host);
-+	int	(*init_sd_express)(struct sdhci_host *host, struct mmc_ios *ios);
- };
- 
- #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS
diff --git a/target/linux/bcm27xx/patches-6.1/950-0861-Add-new-pispbe-driver-though-not-yet-the-Makesfiles-.patch b/target/linux/bcm27xx/patches-6.1/950-0861-Add-new-pispbe-driver-though-not-yet-the-Makesfiles-.patch
deleted file mode 100644
index 2ac7b7830c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0861-Add-new-pispbe-driver-though-not-yet-the-Makesfiles-.patch
+++ /dev/null
@@ -1,3788 +0,0 @@
-From ce14be51d71bf39893786d380cbb82e81d2a10d5 Mon Sep 17 00:00:00 2001
-From: Nick Hollinghurst <nick.hollinghurst@raspberrypi.org>
-Date: Wed, 14 Jul 2021 09:32:49 +0100
-Subject: [PATCH] Add new "pispbe" driver (though not yet the Makesfiles or DT
- required to use it)
-
-media: bcm2712: Initial commit of the PiSP BE driver
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-media: bcm2712_pisp_be: PiSP driver updates.
-
-- Start registering video nodes from /dev/video20
-- Formatting fixes
-- Define MODULE_DEVICE_TABLE() to probe correctly
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-media: pisp_be: Improve image format support
-
-Add a new format table that lists the V4L2 format enums and their properties.
-Keep the exising 'RPBP' format to support the userland verification tools.
-This format requires userland to fill all plane properties. Standard V4L2
-formats will derive these properties from the format table.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-media: pisp_be: Advertise the meta output format explictily.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-drivers: pisp_be: Various updates and cleanups
-
-- Switch to a single node group for now.
-- Add a node description table to simplify node handling.
-- Switch HoG output to V4L2_CAP_META_CAPTURE type.
-- Use string descriptions for node names in logging messages.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-pisp_be: Updates for libcamera usage:
-
-- Remove indexes from device entity names
-- Add enumframesize and enumfmts ioctls
-- Add default format to all nodes.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-v4l2: pisp_be: Move format definitions into v4l2 core
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-media: raspberrypi: Move PiSP common headers to a single location
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-media: raspberrypi: Remove old pispbe driver.
-
-This is now supersede by the driver in drivers/media/platform/raspberrypi/
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-PISP-BE Driver: Automate buffer-cycling for TDN and Stitch state.
-Remove "tdn-input" and "stitch-input" nodes altogether (the output
-nodes must still be opened and REQBUFS called with 1 or 2 buffers).
-Also, a bit of tidying of buffer address handling and locking.
-
-PISP-BE driver: Turn debug level right down to reduce overly-chatty messages
-
-media: bcm2712: Depend on CONFIG_PM
-
-Depend on CONFIG_PM as the driver uses the runtime_pm infrastructure.
-
-Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
-
-drivers: media: pisp_be: Move BE driver to a raspberrypi directory
-
-Move the pisp_be driver from drivers/media/platform/raspberrypi/ to
-drivers/media/platform/raspberrypi/pisp_be/. This seems the accepted
-convention in the drivers/media/platform/ directory structure.
-
-Also rename the driver module from bcm2712_pisp_be to pisp_be.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-pisp_be: Updates for libcamera streaming:
-
-- Add some required v4l2 formats
-- Add buf_prepare ioctl
-- Set plane offsets correctly before reprogramming
-
-pisp_be: Reduce logging verbosity
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-pisp_be: Add buffer timestamps
-
-While at it, remove duplicate code when checking if the HW has completed
-multiple jobs.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-pisp_be: Remove queue size allocation constraint
-
-PISP-BE driver: Fix ISR to handle multiple done/start events.
-
-PISP-BE: Fix variable-name shadowing bugette
-
-PISP-BE: Support for two node groups. Reorganize the driver.
-
-To support 2 concurrent libcamera applications, we need 2 node groups,
-need to allow multiple opens of each node (because libcamera does this)
-and create a separate media device per group (to support file-locking).
-
-This triggered significant rearrangement of the driver. Some calls
-that we formerly intercepted have been delegated back to v4l2/vb2.
-Logging changes arising from multiple v4l2_dev. Refactored probe()
-and initialization. Avoid dynamically-allocated entity name strings.
-
-drivers: media: pisp_be: Add vidioc_enum_fmt_meta_out
-
-This was missing in the struct v4l2_ioctl_ops definition.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-drivers: media: pispe_be: Add Bayer compressed formats
-
-Add PiSP Bayer compressed formats to the list of supported pixel formats
-for the PiSP backend driver.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-drivers: meida: pisp_be: Fix overflow in plane size calculations
-
-The calculations for buffer plane sizes can overflow because of the
-plane factor shift. Fix this by using u64 integers for the calculations.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-drivers: media: pisp_be: Use 0P3 for plane factors
-
-Use less precision for the plane factors to avoid any nasty overflows.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-media: pisp: Checkpatch and coding style fixups
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
-
-media: pisp_be: More coding style fixups
-
-media: platform: bcm2712: pisp_be: Fix crash when buffer format not set
-
-Signed-off-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
-
-media: platform: bcm2712: pisp_be: Allow non-SRGB colour spaces on RGB outputs
-
-Allow colour spaces other than SRGB when the output format in question
-is an RGB output. This commit merely ports over existing changes from
-the vc4 ISP driver.
-
-Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
-
-media: platform: bcm2712: Tweak list of BE supported image formats
-
-Remove RGB565 and 10- and 12-bit packed raw formats, which ISP-BE
-can't support for input or output. Add NV12M and NV21M which it can.
-(I didn't bother adding YUV422P, which apparently is not widely used.)
-
-Signed-off-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
-
-pisp_be: Fill the hardware revision in the media entity struct
-
-This can be used by userland to determine the hardware capabilities.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-bcm2712: Use BIT() macro
-
-Use the BIT() macro instead of plain bit shifting.
-
-Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
-
-bcm2712: Invert condition in pispbe_schedule_internal()
-
-Return earlier and save one indentation level
-
-Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
-
-bcm2712: Invert condition in for loop
-
-Save one indentation level by continuing if the node is not streaming.
-
-Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
-
-bcm2712: Do not declare a local variable
-
-There already is a truct pispbe_node *node in the function scope.
-
-Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
-
-bcm21712: Siplify pispbe_schedule_one()
-
-A little more verbose but easier to follow ?
-
-Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
-
-bcm2712: Rename pispbe_schedule_all() to pispbe_schedule_any()
-
-The pispbe_schedule_all() function name is misleading, as the function
-schedule a single job from any of the node groups. Rename it.
-
-Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
-
-media: platform: bcm2712: Remove buffer auto-cycling from ISP-BE
-
-Previously, the ISP-BE driver tried to automate "ping pong" buffers
-for TDN and HDR state, but did not fully conceal them from users.
-
-The automation has been removed: there are now separate output and
-capture queues for each of TDN and Stitch, which must be managed by
-user code (DMABUFs may be used to circulate buffers between queues).
-
-Signed-off-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
-
-drivers: media: pisp_be: Cache BE config buffer vaddr
-
-When programming a new job, we access at the config buffer, possibly
-from ISR context. So fetch and the virtual address when queuing the
-buffer.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-drivers: media: pisp_be: Remove all traces of ctrls and request API
-
-These APIs are not (and will not) be used by the driver, so remove them.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-media: bcm2712: Replace v4l2_dbg with dev_dbg
-
-Replace the v4l2 debug helpers with the device debug once, which are
-preferred.
-
-Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
-
-media: bcm2712: Remove of_match_ptr()
-
-The of_match_ptr() usage could cause a compiler warning if
-CONFIG_OF is not enabled, as the pispbe_of_match variable would
-result unused.
-
-As the of_match_table field of struct platform_driver exists
-unconditionally, drop of_match_ptr() to avoid a warning.
-
-Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
-
-drivers: media: pispbe: Add local config buffer DMA allocation
-
-When initialiasing the driver, allocate a number of tiles + config
-structures used for storing hardware config internally in the driver.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-drivers: media: pispbe: Use local config buffers
-
-Store a copy of the config + tiles buffer locally when the buffer gets
-queued. This resolves the security issue where a userland process may
-modify the config buffer after it has been queued.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-drivers: media: pispbe: Validate config buffers
-
-Perform a basic config validation on the device output nodes to ensure
-the buffer size and stride values do not result in a buffer overrun.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-media: bcm2712: Rework probe sequence order
-
-Rework the probe sequence to:
-1) Use dev_err_probe() when failing to get clocks
-2) Disable clock on error path
-3) Disable the node groups if they have been enabled and
-   propagate the error up
-
-Also disable clocks in the remove() function.
-
-Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
-
-media: bcm2712: Use pm_runtime_ops
-
-Introduce usage of runtime resume and suspend operations.
-
-The diver only uses a single clock source which is enable/disabled
-at resume and suspend time.
-
-Implement file open and release operations to control enablement of
-the clock provider.
-
-Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
-
-media: bcm2712: Demote info message
-
-Demote info message about clock enablement to dev_dbg()
-
-Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
-
-media: bcm2712: Move pm_runtime calls to streamon/streamoff
-
-Move the calls to pm_runtime_resume_and_get() and pm_runtime_put()
-to the streamon and streamoff ioctl handlers.
-
-Remove custom handlers for the open and close file operations and use
-the framework provided helpers.
-
-Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
-
-media: bcm2712: Use pm_runtime_autosuspend()
-
-Use the _autosuspend() version of runtime_pm_put() in order to avoid
-resuming and suspending the peripheral in between streaming sessions
-closely apart one from the other.
-
-Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
-
-drivers: media: pisp_be: Conditionally check buffers when preparing jobs
-
-When preparing a job, check the global enables in the config structure
-to see if the Output0/1, Tdn and Stitch blocks are enabled, and only
-test for a buffer queued if they are.
-
-This will allow userland to control the outputs selectively without
-disabling/re-enabling the respective device nodes.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-media: bcm2712: Rework media controller registration
-
-The current implementation register the v4l2_device and the video
-devices first, then creates the media controller and manually registers
-entities there.
-
-Rework the registration procedure to first create the v4l2_device and
-register the media_device with it. Then create the video nodes which
-gets automatically registered in the media graph by the core.
-
-Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
-
-media: bcm2712: Create v4l2_subdev for ISP entity
-
-Create a v4l2 subdevice to represent the PISPBE ISP entity.
-
-Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
-
-media: bcm2712: Fix v4l2-compliance warn on QUERYCAP
-
-Fix:
-
-warn: v4l2-compliance.cpp(669): media bus_info
-'platform:1000880000.pisp_be' differs from V4L2 bus_info
-'platform:pispbe'
-
-by populating the driver caps bus_info by using dev_name().
-
-Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
-
-media: bcm2712: Fix v4l2-compliance warn on invalid pixfmt
-
-The V4L2 API for the TRY_FMT/S_FMT ioctl allows the ioctl handler to
-return an error code only in specific conditions. If an invalid pixel
-format is supplied it should be adjusted instead of an error being
-returned.
-
-Albeit, v4l2-compliance treats this situation as a warning and not as
-an error because the behaviour has been discussed in length in the past.
-
-warn: v4l2-test-formats.cpp(794): TRY_FMT cannot handle an invalid pixelformat.
-warn: v4l2-test-formats.cpp(795): This may or may not be a problem. For more information see:
-warn: v4l2-test-formats.cpp(796): http://www.mail-archive.com/linux-media@vger.kernel.org/msg56550.html
-VIDIOC_TRY_FMT returned -1 (Invalid argument)
-
-Regardless of the warning vs failure decision, adjust the try_format()
-function implementation to use V4L2_PIX_FMT_YUV420M as default pixel
-format if the supplied one is invalid.
-
-Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
-
-media: bcm2712: Fix v4l2-compliance warn on HOG pix format
-
-The try_format() implementation for the HOG video device node returns
-an error if the supplied pixel format is not correct.
-
-As per the video device output and capture video nodes, this contradicts
-the V4L2 specification even if it is treated as a warning by
-v4l2-compliance.
-
-Fix this by forcing the buffer pixel format and size to the default
-supported one. While at here, use the BIT() macro in the format
-initialization function.
-
-Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
-
-media: bcm2712: Fix formats enumeration
-
-Right now a single implementation of enum_fmt() is used for all nodes
-in a group. This means that all the BE supported formats are listed for
-all the nodes. This is incorrect as the meta capture and output node
-formats should be restricted, and the meta formats should not be
-enumerated for video output and capture devices.
-
-Fix this by restricting the enumeration of META formats to the config
-and hog nodes. Split out from the list of supported_formats the
-V4L2_META_FMT_RPI_BE_CFG which is only used for the meta_out node, while
-V4L2_PIX_FMT_RPI_BE is kept in the list of supported_formats as it can
-be used as an opaque format for both meta_cap, video_cap and video_out
-nodes.
-
-Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
-
-media: bcm2712: Minor fixes to support PiSP regression tests
-
-Allow RGB input, not just Bayer (but only of those at once);
-Allow Wallpaper image formats. XXX They are not yet size-checked;
-Set "chicken bits" to test BURST_TRIM and AXI AWID/BID variation.
-Convert some v4l2_err() to dev_err()
-
-Signed-off-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
-
-drivers: media: pisp_be: Use the maximum number of config buffers
-
-Set PISP_BE_NUM_CONFIG_BUFFERS the the maximum number of possible
-buffers.  In the worst case, this overallocates config buffers, but
-given their size, it's not too much of a problem.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
-
-media: pisp_be: Fix extra PM runtime put
-
-vidioc_streamoff callback can be called even if vidioc_streamon was
-never called. The driver currently does PM runtime get/put in these
-callbacks, which may lead to a put without a matching get.
-
-Fix this by moving the PM runtime get/put to vb2_ops's start_streaming &
-stop_streaming, which the framework makes sure won't get extra calls.
-
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
-
-drivers: media: pisp_be: Don't report V4L2_PIX_FMT_RPI_BE format
-
-This is an internal opaque format, not to be reported in enum_fmt.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/platform/Kconfig                |    1 +
- drivers/media/platform/Makefile               |    1 +
- drivers/media/platform/raspberrypi/Kconfig    |    5 +
- drivers/media/platform/raspberrypi/Makefile   |    3 +
- .../platform/raspberrypi/pisp_be/Kconfig      |   12 +
- .../platform/raspberrypi/pisp_be/Makefile     |    6 +
- .../platform/raspberrypi/pisp_be/pisp_be.c    | 1985 +++++++++++++++++
- .../raspberrypi/pisp_be/pisp_be_config.h      |  533 +++++
- .../raspberrypi/pisp_be/pisp_be_formats.h     |  469 ++++
- drivers/media/v4l2-core/v4l2-ioctl.c          |    2 +
- include/media/raspberrypi/pisp_common.h       |   65 +
- include/media/raspberrypi/pisp_types.h        |  144 ++
- include/uapi/linux/videodev2.h                |    6 +
- 13 files changed, 3232 insertions(+)
- create mode 100644 drivers/media/platform/raspberrypi/Kconfig
- create mode 100644 drivers/media/platform/raspberrypi/Makefile
- create mode 100644 drivers/media/platform/raspberrypi/pisp_be/Kconfig
- create mode 100644 drivers/media/platform/raspberrypi/pisp_be/Makefile
- create mode 100644 drivers/media/platform/raspberrypi/pisp_be/pisp_be.c
- create mode 100644 drivers/media/platform/raspberrypi/pisp_be/pisp_be_config.h
- create mode 100644 drivers/media/platform/raspberrypi/pisp_be/pisp_be_formats.h
- create mode 100644 include/media/raspberrypi/pisp_common.h
- create mode 100644 include/media/raspberrypi/pisp_types.h
-
---- a/drivers/media/platform/Kconfig
-+++ b/drivers/media/platform/Kconfig
-@@ -76,6 +76,7 @@ source "drivers/media/platform/mediatek/
- source "drivers/media/platform/nvidia/Kconfig"
- source "drivers/media/platform/nxp/Kconfig"
- source "drivers/media/platform/qcom/Kconfig"
-+source "drivers/media/platform/raspberrypi/Kconfig"
- source "drivers/media/platform/renesas/Kconfig"
- source "drivers/media/platform/rockchip/Kconfig"
- source "drivers/media/platform/samsung/Kconfig"
---- a/drivers/media/platform/Makefile
-+++ b/drivers/media/platform/Makefile
-@@ -19,6 +19,7 @@ obj-y += mediatek/
- obj-y += nvidia/
- obj-y += nxp/
- obj-y += qcom/
-+obj-y += raspberrypi/
- obj-y += renesas/
- obj-y += rockchip/
- obj-y += samsung/
---- /dev/null
-+++ b/drivers/media/platform/raspberrypi/Kconfig
-@@ -0,0 +1,5 @@
-+# SPDX-License-Identifier: GPL-2.0-only
-+
-+comment "Raspberry Pi media platform drivers"
-+
-+source "drivers/media/platform/raspberrypi/pisp_be/Kconfig"
---- /dev/null
-+++ b/drivers/media/platform/raspberrypi/Makefile
-@@ -0,0 +1,3 @@
-+# SPDX-License-Identifier: GPL-2.0
-+
-+obj-y += pisp_be/
---- /dev/null
-+++ b/drivers/media/platform/raspberrypi/pisp_be/Kconfig
-@@ -0,0 +1,12 @@
-+config VIDEO_RASPBERRYPI_PISP_BE
-+	tristate "Raspberry Pi PiSP Backend (BE) ISP driver"
-+	depends on VIDEO_DEV && PM
-+	select VIDEO_V4L2_SUBDEV_API
-+	select MEDIA_CONTROLLER
-+	select VIDEOBUF2_DMA_CONTIG
-+	select V4L2_FWNODE
-+	help
-+	  Say Y here to enable support for the PiSP Backend (BE) ISP driver.
-+
-+	  To compile this driver as a module, choose M here. The module will be
-+	  called pisp-be.
---- /dev/null
-+++ b/drivers/media/platform/raspberrypi/pisp_be/Makefile
-@@ -0,0 +1,6 @@
-+# SPDX-License-Identifier: GPL-2.0
-+#
-+# Makefile for Raspberry Pi PiSP Backend driver
-+#
-+pisp-be-objs := pisp_be.o
-+obj-$(CONFIG_VIDEO_RASPBERRYPI_PISP_BE) += pisp-be.o
---- /dev/null
-+++ b/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c
-@@ -0,0 +1,1985 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * PiSP Back End driver.
-+ * Copyright (c) 2021-2022 Raspberry Pi Limited.
-+ *
-+ */
-+#include <linux/clk.h>
-+#include <linux/interrupt.h>
-+#include <linux/io.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/pm_runtime.h>
-+#include <media/v4l2-device.h>
-+#include <media/v4l2-ioctl.h>
-+#include <media/videobuf2-dma-contig.h>
-+#include <media/videobuf2-vmalloc.h>
-+
-+#include "pisp_be_config.h"
-+#include "pisp_be_formats.h"
-+
-+MODULE_DESCRIPTION("PiSP Back End driver");
-+MODULE_AUTHOR("David Plowman <david.plowman@raspberrypi.com>");
-+MODULE_AUTHOR("Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>");
-+MODULE_LICENSE("GPL v2");
-+
-+/* Offset to use when registering the /dev/videoX node */
-+#define PISPBE_VIDEO_NODE_OFFSET 20
-+
-+/* Maximum number of config buffers possible */
-+#define PISP_BE_NUM_CONFIG_BUFFERS VB2_MAX_FRAME
-+
-+/*
-+ * We want to support 2 independent instances allowing 2 simultaneous users
-+ * of the ISP-BE (of course they share hardware, platform resources and mutex).
-+ * Each such instance comprises a group of device nodes representing input
-+ * and output queues, and a media controller device node to describe them.
-+ */
-+#define PISPBE_NUM_NODE_GROUPS 2
-+
-+#define PISPBE_NAME "pispbe"
-+
-+/* Some ISP-BE registers */
-+#define PISP_BE_VERSION_OFFSET (0x0)
-+#define PISP_BE_CONTROL_OFFSET (0x4)
-+#define PISP_BE_TILE_ADDR_LO_OFFSET (0x8)
-+#define PISP_BE_TILE_ADDR_HI_OFFSET (0xc)
-+#define PISP_BE_STATUS_OFFSET (0x10)
-+#define PISP_BE_BATCH_STATUS_OFFSET (0x14)
-+#define PISP_BE_INTERRUPT_EN_OFFSET (0x18)
-+#define PISP_BE_INTERRUPT_STATUS_OFFSET (0x1c)
-+#define PISP_BE_AXI_OFFSET (0x20)
-+#define PISP_BE_CONFIG_BASE_OFFSET (0x40)
-+#define PISP_BE_IO_INPUT_ADDR0_LO_OFFSET (PISP_BE_CONFIG_BASE_OFFSET)
-+#define PISP_BE_GLOBAL_BAYER_ENABLE_OFFSET (PISP_BE_CONFIG_BASE_OFFSET + 0x70)
-+#define PISP_BE_GLOBAL_RGB_ENABLE_OFFSET (PISP_BE_CONFIG_BASE_OFFSET + 0x74)
-+#define N_HW_ADDRESSES 14
-+#define N_HW_ENABLES 2
-+
-+#define PISP_BE_VERSION_2712C1 0x02252700
-+#define PISP_BE_VERSION_MINOR_BITS 0xF
-+
-+/*
-+ * This maps our nodes onto the inputs/outputs of the actual PiSP Back End.
-+ * Be wary of the word "OUTPUT" which is used ambiguously here. In a V4L2
-+ * context it means an input to the hardware (source image or metadata).
-+ * Elsewhere it means an output from the hardware.
-+ */
-+enum node_ids {
-+	MAIN_INPUT_NODE,
-+	TDN_INPUT_NODE,
-+	STITCH_INPUT_NODE,
-+	HOG_OUTPUT_NODE,
-+	OUTPUT0_NODE,
-+	OUTPUT1_NODE,
-+	TDN_OUTPUT_NODE,
-+	STITCH_OUTPUT_NODE,
-+	CONFIG_NODE,
-+	PISPBE_NUM_NODES
-+};
-+
-+struct node_description {
-+	const char *ent_name;
-+	enum v4l2_buf_type buf_type;
-+	unsigned int caps;
-+};
-+
-+static const struct node_description node_desc[PISPBE_NUM_NODES] = {
-+	/* MAIN_INPUT_NODE */
-+	{
-+		.ent_name = PISPBE_NAME "-input",
-+		.buf_type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
-+		.caps = V4L2_CAP_VIDEO_OUTPUT_MPLANE,
-+	},
-+	/* TDN_INPUT_NODE */
-+	{
-+		.ent_name = PISPBE_NAME "-tdn_input",
-+		.buf_type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
-+		.caps = V4L2_CAP_VIDEO_OUTPUT_MPLANE,
-+	},
-+	/* STITCH_INPUT_NODE */
-+	{
-+		.ent_name = PISPBE_NAME "-stitch_input",
-+		.buf_type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
-+		.caps = V4L2_CAP_VIDEO_OUTPUT_MPLANE,
-+	},
-+	/* HOG_OUTPUT_NODE */
-+	{
-+		.ent_name = PISPBE_NAME "-hog_output",
-+		.buf_type = V4L2_BUF_TYPE_META_CAPTURE,
-+		.caps = V4L2_CAP_META_CAPTURE,
-+	},
-+	/* OUTPUT0_NODE */
-+	{
-+		.ent_name = PISPBE_NAME "-output0",
-+		.buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE,
-+		.caps = V4L2_CAP_VIDEO_CAPTURE_MPLANE,
-+	},
-+	/* OUTPUT1_NODE */
-+	{
-+		.ent_name = PISPBE_NAME "-output1",
-+		.buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE,
-+		.caps = V4L2_CAP_VIDEO_CAPTURE_MPLANE,
-+	},
-+	/* TDN_OUTPUT_NODE */
-+	{
-+		.ent_name = PISPBE_NAME "-tdn_output",
-+		.buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE,
-+		.caps = V4L2_CAP_VIDEO_CAPTURE_MPLANE,
-+	},
-+	/* STITCH_OUTPUT_NODE */
-+	{
-+		.ent_name = PISPBE_NAME "-stitch_output",
-+		.buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE,
-+		.caps = V4L2_CAP_VIDEO_CAPTURE_MPLANE,
-+	},
-+	/* CONFIG_NODE */
-+	{
-+		.ent_name = PISPBE_NAME "-config",
-+		.buf_type = V4L2_BUF_TYPE_META_OUTPUT,
-+		.caps = V4L2_CAP_META_OUTPUT,
-+	}
-+};
-+
-+#define NODE_DESC_IS_OUTPUT(desc) ( \
-+	((desc)->buf_type == V4L2_BUF_TYPE_META_OUTPUT) || \
-+	((desc)->buf_type == V4L2_BUF_TYPE_VIDEO_OUTPUT) || \
-+	((desc)->buf_type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE))
-+
-+#define NODE_IS_META(node) ( \
-+	((node)->buf_type == V4L2_BUF_TYPE_META_OUTPUT) || \
-+	((node)->buf_type == V4L2_BUF_TYPE_META_CAPTURE))
-+#define NODE_IS_OUTPUT(node) ( \
-+	((node)->buf_type == V4L2_BUF_TYPE_META_OUTPUT) || \
-+	((node)->buf_type == V4L2_BUF_TYPE_VIDEO_OUTPUT) || \
-+	((node)->buf_type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE))
-+#define NODE_IS_CAPTURE(node) ( \
-+	((node)->buf_type == V4L2_BUF_TYPE_META_CAPTURE) || \
-+	((node)->buf_type == V4L2_BUF_TYPE_VIDEO_CAPTURE) || \
-+	((node)->buf_type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE))
-+#define NODE_IS_MPLANE(node) ( \
-+	((node)->buf_type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) || \
-+	((node)->buf_type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE))
-+
-+/*
-+ * Structure to describe a single node /dev/video<N> which represents a single
-+ * input or output queue to the PiSP Back End device.
-+ */
-+struct pispbe_node {
-+	unsigned int id;
-+	int vfl_dir;
-+	enum v4l2_buf_type buf_type;
-+	struct video_device vfd;
-+	struct media_pad pad;
-+	struct media_intf_devnode *intf_devnode;
-+	struct media_link *intf_link;
-+	struct pispbe_node_group *node_group;
-+	struct mutex node_lock;
-+	struct mutex queue_lock;
-+	spinlock_t ready_lock;
-+	struct list_head ready_queue;
-+	struct vb2_queue queue;
-+	struct v4l2_format format;
-+	const struct pisp_be_format *pisp_format;
-+};
-+
-+/* For logging only, use the entity name with "pispbe" and separator removed */
-+#define NODE_NAME(node) \
-+		(node_desc[(node)->id].ent_name + sizeof(PISPBE_NAME))
-+#define NODE_GET_V4L2(node) ((node)->node_group->v4l2_dev)
-+
-+/*
-+ * Node group structure, which comprises all the input and output nodes that a
-+ * single PiSP client will need, along with its own v4l2 and media devices.
-+ */
-+struct pispbe_node_group {
-+	unsigned int id;
-+	struct v4l2_device v4l2_dev;
-+	struct v4l2_subdev sd;
-+	struct pispbe_dev *pispbe;
-+	struct media_device mdev;
-+	struct pispbe_node node[PISPBE_NUM_NODES];
-+	u32 streaming_map; /* bitmap of which nodes are streaming */
-+	struct media_pad pad[PISPBE_NUM_NODES]; /* output pads first */
-+	struct pisp_be_tiles_config *config;
-+	dma_addr_t config_dma_addr;
-+};
-+
-+/* Records details of the jobs currently running or queued on the h/w. */
-+struct pispbe_job {
-+	struct pispbe_node_group *node_group;
-+	/*
-+	 * An array of buffer pointers - remember it's source buffers first,
-+	 * then captures, then metadata last.
-+	 */
-+	struct pispbe_buffer *buf[PISPBE_NUM_NODES];
-+};
-+
-+/*
-+ * Structure representing the entire PiSP Back End device, comprising several
-+ * node groups which share platform resources and a mutex for the actual HW.
-+ */
-+struct pispbe_dev {
-+	struct device *dev;
-+	struct pispbe_node_group node_group[PISPBE_NUM_NODE_GROUPS];
-+	int hw_busy; /* non-zero if a job is queued or is being started */
-+	struct pispbe_job queued_job, running_job;
-+	void __iomem *be_reg_base;
-+	struct clk *clk;
-+	int irq;
-+	u32 hw_version;
-+	u8 done, started;
-+	spinlock_t hw_lock; /* protects "hw_busy" flag and streaming_map */
-+};
-+
-+static inline u32 read_reg(struct pispbe_dev *pispbe, unsigned int offset)
-+{
-+	return readl(pispbe->be_reg_base + offset);
-+}
-+
-+static inline void write_reg(struct pispbe_dev *pispbe, unsigned int offset,
-+			     u32 val)
-+{
-+	writel(val, pispbe->be_reg_base + offset);
-+}
-+
-+/* Check and initialize hardware. */
-+static int hw_init(struct pispbe_dev *pispbe)
-+{
-+	u32 u;
-+
-+	/* Check the HW is present and has a known version */
-+	u = read_reg(pispbe, PISP_BE_VERSION_OFFSET);
-+	dev_info(pispbe->dev, "pispbe_probe: HW version:  0x%08x", u);
-+	pispbe->hw_version = u;
-+	if ((u & ~PISP_BE_VERSION_MINOR_BITS) != PISP_BE_VERSION_2712C1)
-+		return -ENODEV;
-+
-+	/* Clear leftover interrupts */
-+	write_reg(pispbe, PISP_BE_INTERRUPT_STATUS_OFFSET, 0xFFFFFFFFu);
-+	u = read_reg(pispbe, PISP_BE_BATCH_STATUS_OFFSET);
-+	dev_info(pispbe->dev, "pispbe_probe: BatchStatus: 0x%08x", u);
-+	pispbe->done = (uint8_t)u;
-+	pispbe->started = (uint8_t)(u >> 8);
-+	u = read_reg(pispbe, PISP_BE_STATUS_OFFSET);
-+	dev_info(pispbe->dev, "pispbe_probe: Status:      0x%08x", u);
-+	if (u != 0 || pispbe->done != pispbe->started) {
-+		dev_err(pispbe->dev, "pispbe_probe: HW is stuck or busy\n");
-+		return -EBUSY;
-+	}
-+	/*
-+	 * AXI QOS=0, CACHE=4'b0010, PROT=3'b011
-+	 * Also set "chicken bits" 22:20 which enable sub-64-byte bursts
-+	 * and AXI AWID/BID variability (on versions which support this).
-+	 */
-+	write_reg(pispbe, PISP_BE_AXI_OFFSET, 0x32703200u);
-+
-+	/* Enable both interrupt flags */
-+	write_reg(pispbe, PISP_BE_INTERRUPT_EN_OFFSET, 0x00000003u);
-+	return 0;
-+}
-+
-+/*
-+ * Queue a job to the h/w. If the h/w is idle it will begin immediately.
-+ * Caller must ensure it is "safe to queue", i.e. we don't already have a
-+ * queued, unstarted job.
-+ */
-+static void hw_queue_job(struct pispbe_dev *pispbe,
-+			 dma_addr_t hw_dma_addrs[N_HW_ADDRESSES],
-+			 u32 hw_enables[N_HW_ENABLES],
-+			 struct pisp_be_config *config, dma_addr_t tiles,
-+			 unsigned int num_tiles)
-+{
-+	unsigned int begin, end;
-+	unsigned int u;
-+
-+	if (read_reg(pispbe, PISP_BE_STATUS_OFFSET) & 1)
-+		dev_err(pispbe->dev, "ERROR: not safe to queue new job!\n");
-+
-+	/*
-+	 * Write configuration to hardware. DMA addresses and enable flags
-+	 * are passed separately, because the driver needs to sanitize them,
-+	 * and we don't want to modify (or be vulnerable to modifications of)
-+	 * the mmap'd buffer.
-+	 */
-+	for (u = 0; u < N_HW_ADDRESSES; ++u) {
-+		write_reg(pispbe, PISP_BE_IO_INPUT_ADDR0_LO_OFFSET + 8 * u,
-+			  (u32)(hw_dma_addrs[u]));
-+		write_reg(pispbe, PISP_BE_IO_INPUT_ADDR0_LO_OFFSET + 8 * u + 4,
-+			  (u32)(hw_dma_addrs[u] >> 32));
-+	}
-+	write_reg(pispbe, PISP_BE_GLOBAL_BAYER_ENABLE_OFFSET, hw_enables[0]);
-+	write_reg(pispbe, PISP_BE_GLOBAL_RGB_ENABLE_OFFSET, hw_enables[1]);
-+
-+	/*
-+	 * Everything else is as supplied by the user. XXX Buffer sizes not
-+	 * checked!
-+	 */
-+	begin =	offsetof(struct pisp_be_config, global.bayer_order) /
-+								sizeof(u32);
-+	end = offsetof(struct pisp_be_config, axi) / sizeof(u32);
-+	for (u = begin; u < end; u++) {
-+		unsigned int val = ((u32 *)config)[u];
-+
-+		write_reg(pispbe, PISP_BE_CONFIG_BASE_OFFSET + 4 * u, val);
-+	}
-+
-+	/* Read back the addresses -- an error here could be fatal */
-+	for (u = 0; u < N_HW_ADDRESSES; ++u) {
-+		unsigned int offset = PISP_BE_IO_INPUT_ADDR0_LO_OFFSET + 8 * u;
-+		u64 along = read_reg(pispbe, offset);
-+
-+		along += ((u64)read_reg(pispbe, offset + 4)) << 32;
-+		if (along != (u64)(hw_dma_addrs[u])) {
-+			dev_err(pispbe->dev,
-+				"ISP BE config error: check if ISP RAMs enabled?\n");
-+			return;
-+		}
-+	}
-+
-+	/*
-+	 * Write tile pointer to hardware. XXX Tile offsets and sizes not
-+	 * checked (and even if checked, the user could subsequently modify
-+	 * them)!
-+	 */
-+	write_reg(pispbe, PISP_BE_TILE_ADDR_LO_OFFSET, (u32)tiles);
-+	write_reg(pispbe, PISP_BE_TILE_ADDR_HI_OFFSET, (u32)(tiles >> 32));
-+
-+	/* Enqueue the job */
-+	write_reg(pispbe, PISP_BE_CONTROL_OFFSET, 3 + 65536 * num_tiles);
-+}
-+
-+struct pispbe_buffer {
-+	struct vb2_v4l2_buffer vb;
-+	struct list_head ready_list;
-+	unsigned int config_index;
-+};
-+
-+static int get_addr_3(dma_addr_t addr[3], struct pispbe_buffer *buf,
-+		      struct pispbe_node *node)
-+{
-+	unsigned int num_planes = node->format.fmt.pix_mp.num_planes;
-+	unsigned int plane_factor = 0;
-+	unsigned int size;
-+	unsigned int p;
-+
-+	if (!buf || !node->pisp_format)
-+		return 0;
-+
-+	WARN_ON(!NODE_IS_MPLANE(node));
-+
-+	/*
-+	 * Determine the base plane size. This will not be the same
-+	 * as node->format.fmt.pix_mp.plane_fmt[0].sizeimage for a single
-+	 * plane buffer in an mplane format.
-+	 */
-+	size = node->format.fmt.pix_mp.plane_fmt[0].bytesperline *
-+					node->format.fmt.pix_mp.height;
-+
-+	for (p = 0; p < num_planes && p < 3; p++) {
-+		addr[p] = vb2_dma_contig_plane_dma_addr(&buf->vb.vb2_buf, p);
-+		plane_factor += node->pisp_format->plane_factor[p];
-+	}
-+
-+	for (; p < MAX_PLANES && node->pisp_format->plane_factor[p]; p++) {
-+		/*
-+		 * Calculate the address offset of this plane as needed
-+		 * by the hardware. This is specifically for non-mplane
-+		 * buffer formats, where there are 3 image planes, e.g.
-+		 * for the V4L2_PIX_FMT_YUV420 format.
-+		 */
-+		addr[p] = addr[0] + ((size * plane_factor) >> 3);
-+		plane_factor += node->pisp_format->plane_factor[p];
-+	}
-+
-+	return num_planes;
-+}
-+
-+static dma_addr_t get_addr(struct pispbe_buffer *buf)
-+{
-+	if (buf)
-+		return vb2_dma_contig_plane_dma_addr(&buf->vb.vb2_buf, 0);
-+	return 0;
-+}
-+
-+static void
-+fixup_addrs_enables(dma_addr_t addrs[N_HW_ADDRESSES],
-+		    u32 hw_enables[N_HW_ENABLES],
-+		    struct pisp_be_tiles_config *config,
-+		    struct pispbe_buffer *buf[PISPBE_NUM_NODES],
-+		    struct pispbe_node_group *node_group)
-+{
-+	int ret, i;
-+
-+	/* Take a copy of the "enable" bitmaps so we can modify them. */
-+	hw_enables[0] = config->config.global.bayer_enables;
-+	hw_enables[1] = config->config.global.rgb_enables;
-+
-+	/*
-+	 * Main input first. There are 3 address pointers, corresponding to up
-+	 * to 3 planes.
-+	 */
-+	ret = get_addr_3(addrs, buf[MAIN_INPUT_NODE],
-+			 &node_group->node[MAIN_INPUT_NODE]);
-+	if (ret <= 0) {
-+		/*
-+		 * This shouldn't happen; pispbe_schedule_internal should insist
-+		 * on an input.
-+		 */
-+		dev_warn(node_group->pispbe->dev,
-+			"ISP-BE missing input\n");
-+		hw_enables[0] = 0;
-+		hw_enables[1] = 0;
-+		return;
-+	}
-+
-+	/*
-+	 * Now TDN/Stitch inputs and outputs. These are single-plane and only
-+	 * used with Bayer input. Input enables must match the requirements
-+	 * of the processing stages, otherwise the hardware can lock up!
-+	 */
-+	if (hw_enables[0] & PISP_BE_BAYER_ENABLE_INPUT) {
-+		addrs[3] = get_addr(buf[TDN_INPUT_NODE]);
-+		if (addrs[3] == 0 ||
-+		    !(hw_enables[0] & PISP_BE_BAYER_ENABLE_TDN_INPUT) ||
-+		    !(hw_enables[0] & PISP_BE_BAYER_ENABLE_TDN) ||
-+		    (config->config.tdn.reset & 1)) {
-+			hw_enables[0] &= ~(PISP_BE_BAYER_ENABLE_TDN_INPUT |
-+					   PISP_BE_BAYER_ENABLE_TDN_DECOMPRESS);
-+			if (!(config->config.tdn.reset & 1))
-+				hw_enables[0] &= ~PISP_BE_BAYER_ENABLE_TDN;
-+		}
-+
-+		addrs[4] = get_addr(buf[STITCH_INPUT_NODE]);
-+		if (addrs[4] == 0 ||
-+		    !(hw_enables[0] & PISP_BE_BAYER_ENABLE_STITCH_INPUT) ||
-+		    !(hw_enables[0] & PISP_BE_BAYER_ENABLE_STITCH)) {
-+			hw_enables[0] &=
-+				~(PISP_BE_BAYER_ENABLE_STITCH_INPUT |
-+				  PISP_BE_BAYER_ENABLE_STITCH_DECOMPRESS |
-+				  PISP_BE_BAYER_ENABLE_STITCH);
-+		}
-+
-+		addrs[5] = get_addr(buf[TDN_OUTPUT_NODE]);
-+		if (addrs[5] == 0)
-+			hw_enables[0] &= ~(PISP_BE_BAYER_ENABLE_TDN_COMPRESS |
-+					   PISP_BE_BAYER_ENABLE_TDN_OUTPUT);
-+
-+		addrs[6] = get_addr(buf[STITCH_OUTPUT_NODE]);
-+		if (addrs[6] == 0)
-+			hw_enables[0] &=
-+				~(PISP_BE_BAYER_ENABLE_STITCH_COMPRESS |
-+				  PISP_BE_BAYER_ENABLE_STITCH_OUTPUT);
-+	} else {
-+		/* No Bayer input? Disable entire Bayer pipe (else lockup) */
-+		hw_enables[0] = 0;
-+	}
-+
-+	/* Main image output channels. */
-+	for (i = 0; i < PISP_BACK_END_NUM_OUTPUTS; i++) {
-+		ret = get_addr_3(addrs + 7 + 3 * i, buf[OUTPUT0_NODE + i],
-+				 &node_group->node[OUTPUT0_NODE + i]);
-+		if (ret <= 0)
-+			hw_enables[1] &= ~(PISP_BE_RGB_ENABLE_OUTPUT0 << i);
-+	}
-+
-+	/* HoG output (always single plane). */
-+	addrs[13] = get_addr(buf[HOG_OUTPUT_NODE]);
-+	if (addrs[13] == 0)
-+		hw_enables[1] &= ~PISP_BE_RGB_ENABLE_HOG;
-+}
-+
-+/*
-+ * Internal function. Called from pispbe_schedule_one/all. Returns non-zero if
-+ * we started a job.
-+ *
-+ * Warning: needs to be called with hw_lock taken, and releases it if it
-+ * schedules a job.
-+ */
-+static int pispbe_schedule_internal(struct pispbe_node_group *node_group,
-+				    unsigned long flags)
-+{
-+	struct pisp_be_tiles_config *config_tiles_buffer;
-+	struct pispbe_dev *pispbe = node_group->pispbe;
-+	struct pispbe_buffer *buf[PISPBE_NUM_NODES];
-+	dma_addr_t hw_dma_addrs[N_HW_ADDRESSES];
-+	dma_addr_t tiles;
-+	u32 hw_enables[N_HW_ENABLES];
-+	struct pispbe_node *node;
-+	unsigned long flags1;
-+	unsigned int config_index;
-+	int i;
-+
-+	/*
-+	 * To schedule a job, we need all streaming nodes (apart from Output0,
-+	 * Output1, Tdn and Stitch) to have a buffer ready, which must
-+	 * include at least a config buffer and a main input image.
-+	 *
-+	 * For Output0, Output1, Tdn and Stitch, a buffer only needs to be
-+	 * available if the blocks are enabled in the config.
-+	 *
-+	 * (Note that streaming_map is protected by hw_lock, which is held.)
-+	 */
-+	if (((BIT(CONFIG_NODE) | BIT(MAIN_INPUT_NODE)) &
-+		node_group->streaming_map) !=
-+			(BIT(CONFIG_NODE) | BIT(MAIN_INPUT_NODE))) {
-+		dev_dbg(pispbe->dev, "Nothing to do\n");
-+		return 0;
-+	}
-+
-+	node = &node_group->node[CONFIG_NODE];
-+	spin_lock_irqsave(&node->ready_lock, flags1);
-+	buf[CONFIG_NODE] =
-+	   list_first_entry_or_null(&node->ready_queue, struct pispbe_buffer,
-+				    ready_list);
-+	spin_unlock_irqrestore(&node->ready_lock, flags1);
-+
-+	/* Exit early if no config buffer has been queued. */
-+	if (!buf[CONFIG_NODE])
-+		return 0;
-+
-+	config_index = buf[CONFIG_NODE]->vb.vb2_buf.index;
-+	config_tiles_buffer = &node_group->config[config_index];
-+	tiles = (dma_addr_t)node_group->config_dma_addr +
-+			config_index * sizeof(struct pisp_be_tiles_config) +
-+			offsetof(struct pisp_be_tiles_config, tiles);
-+
-+	/* remember: srcimages, captures then metadata */
-+	for (i = 0; i < PISPBE_NUM_NODES; i++) {
-+		unsigned int bayer_en =
-+			config_tiles_buffer->config.global.bayer_enables;
-+		unsigned int rgb_en =
-+			config_tiles_buffer->config.global.rgb_enables;
-+		bool ignore_buffers = false;
-+
-+		/* Config node is handled outside the loop above. */
-+		if (i == CONFIG_NODE)
-+			continue;
-+
-+		buf[i] = NULL;
-+		if (!(node_group->streaming_map & BIT(i)))
-+			continue;
-+
-+		if ((!(rgb_en & PISP_BE_RGB_ENABLE_OUTPUT0) &&
-+		     i == OUTPUT0_NODE) ||
-+		    (!(rgb_en & PISP_BE_RGB_ENABLE_OUTPUT1) &&
-+		     i == OUTPUT1_NODE) ||
-+		    (!(bayer_en & PISP_BE_BAYER_ENABLE_TDN_INPUT) &&
-+		     i == TDN_INPUT_NODE) ||
-+		    (!(bayer_en & PISP_BE_BAYER_ENABLE_TDN_OUTPUT) &&
-+		     i == TDN_OUTPUT_NODE) ||
-+		    (!(bayer_en & PISP_BE_BAYER_ENABLE_STITCH_INPUT) &&
-+		     i == STITCH_INPUT_NODE) ||
-+		    (!(bayer_en & PISP_BE_BAYER_ENABLE_STITCH_OUTPUT) &&
-+		     i == STITCH_OUTPUT_NODE)) {
-+			/*
-+			 * Ignore Output0/Output1/Tdn/Stitch buffer check if the
-+			 * global enables aren't set for these blocks. If a
-+			 * buffer has been provided, we dequeue it back to the
-+			 * user with the other in-use buffers.
-+			 *
-+			 */
-+			ignore_buffers = true;
-+		}
-+
-+		node = &node_group->node[i];
-+
-+		spin_lock_irqsave(&node->ready_lock, flags1);
-+		buf[i] = list_first_entry_or_null(&node->ready_queue,
-+						  struct pispbe_buffer,
-+						  ready_list);
-+		spin_unlock_irqrestore(&node->ready_lock, flags1);
-+		if (!buf[i] && !ignore_buffers) {
-+			dev_dbg(pispbe->dev, "Nothing to do\n");
-+			return 0;
-+		}
-+	}
-+
-+	/* Pull a buffer from each V4L2 queue to form the queued job */
-+	for (i = 0; i < PISPBE_NUM_NODES; i++) {
-+		if (buf[i]) {
-+			node = &node_group->node[i];
-+
-+			spin_lock_irqsave(&node->ready_lock, flags1);
-+			list_del(&buf[i]->ready_list);
-+			spin_unlock_irqrestore(&node->ready_lock,
-+					       flags1);
-+		}
-+		pispbe->queued_job.buf[i] = buf[i];
-+	}
-+
-+	pispbe->queued_job.node_group = node_group;
-+	pispbe->hw_busy = 1;
-+	spin_unlock_irqrestore(&pispbe->hw_lock, flags);
-+
-+	/*
-+	 * We can kick the job off without the hw_lock, as this can
-+	 * never run again until hw_busy is cleared, which will happen
-+	 * only when the following job has been queued.
-+	 */
-+	dev_dbg(pispbe->dev, "Have buffers - starting hardware\n");
-+
-+	/* Convert buffers to DMA addresses for the hardware */
-+	fixup_addrs_enables(hw_dma_addrs, hw_enables,
-+			    config_tiles_buffer, buf, node_group);
-+	/*
-+	 * This could be a spot to fill in the
-+	 * buf[i]->vb.vb2_buf.planes[j].bytesused fields?
-+	 */
-+	i = config_tiles_buffer->num_tiles;
-+	if (i <= 0 || i > PISP_BACK_END_NUM_TILES ||
-+	    !((hw_enables[0] | hw_enables[1]) &
-+	      PISP_BE_BAYER_ENABLE_INPUT)) {
-+		/*
-+		 * Bad job. We can't let it proceed as it could lock up
-+		 * the hardware, or worse!
-+		 *
-+		 * XXX How to deal with this most cleanly? For now, just
-+		 * force num_tiles to 0, which causes the H/W to do
-+		 * something bizarre but survivable. It increments
-+		 * (started,done) counters by more than 1, but we seem
-+		 * to survive...
-+		 */
-+		dev_err(pispbe->dev, "PROBLEM: Bad job");
-+		i = 0;
-+	}
-+	hw_queue_job(pispbe, hw_dma_addrs, hw_enables,
-+		     &config_tiles_buffer->config, tiles, i);
-+
-+	return 1;
-+}
-+
-+/* Try and schedule a job for just a single node group. */
-+static void pispbe_schedule_one(struct pispbe_node_group *node_group)
-+{
-+	struct pispbe_dev *pispbe = node_group->pispbe;
-+	unsigned long flags;
-+	int ret;
-+
-+	spin_lock_irqsave(&pispbe->hw_lock, flags);
-+	if (pispbe->hw_busy) {
-+		spin_unlock_irqrestore(&pispbe->hw_lock, flags);
-+		return;
-+	}
-+
-+	/* A non-zero return means the lock was released. */
-+	ret = pispbe_schedule_internal(node_group, flags);
-+	if (!ret)
-+		spin_unlock_irqrestore(&pispbe->hw_lock, flags);
-+}
-+
-+/* Try and schedule a job for any of the node groups. */
-+static void pispbe_schedule_any(struct pispbe_dev *pispbe, int clear_hw_busy)
-+{
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&pispbe->hw_lock, flags);
-+
-+	if (clear_hw_busy)
-+		pispbe->hw_busy = 0;
-+	if (pispbe->hw_busy == 0) {
-+		unsigned int i;
-+
-+		for (i = 0; i < PISPBE_NUM_NODE_GROUPS; i++) {
-+			/*
-+			 * A non-zero return from pispbe_schedule_internal means
-+			 * the lock was released.
-+			 */
-+			if (pispbe_schedule_internal(&pispbe->node_group[i],
-+						     flags))
-+				return;
-+		}
-+	}
-+	spin_unlock_irqrestore(&pispbe->hw_lock, flags);
-+}
-+
-+static void pispbe_isr_jobdone(struct pispbe_dev *pispbe,
-+			       struct pispbe_job *job)
-+{
-+	struct pispbe_buffer **buf = job->buf;
-+	u64 ts = ktime_get_ns();
-+	int i;
-+
-+	for (i = 0; i < PISPBE_NUM_NODES; i++) {
-+		if (buf[i]) {
-+			buf[i]->vb.vb2_buf.timestamp = ts;
-+			vb2_buffer_done(&buf[i]->vb.vb2_buf,
-+					VB2_BUF_STATE_DONE);
-+		}
-+	}
-+}
-+
-+static irqreturn_t pispbe_isr(int irq, void *dev)
-+{
-+	struct pispbe_dev *pispbe = (struct pispbe_dev *)dev;
-+	u8 started, done;
-+	int can_queue_another = 0;
-+	u32 u;
-+
-+	u = read_reg(pispbe, PISP_BE_INTERRUPT_STATUS_OFFSET);
-+	if (u == 0)
-+		return IRQ_NONE;
-+
-+	write_reg(pispbe, PISP_BE_INTERRUPT_STATUS_OFFSET, u);
-+	dev_dbg(pispbe->dev, "Hardware interrupt\n");
-+	u = read_reg(pispbe, PISP_BE_BATCH_STATUS_OFFSET);
-+	done = (uint8_t)u;
-+	started = (uint8_t)(u >> 8);
-+	dev_dbg(pispbe->dev,
-+		"H/W started %d done %d, previously started %d done %d\n",
-+		(int)started, (int)done, (int)pispbe->started,
-+		(int)pispbe->done);
-+
-+	/*
-+	 * Be aware that done can go up by 2 and started by 1 when: a job that
-+	 * we previously saw "start" now finishes, and we then queued a new job
-+	 * which we see both start and finish "simultaneously".
-+	 */
-+	if (pispbe->running_job.node_group && pispbe->done != done) {
-+		pispbe_isr_jobdone(pispbe, &pispbe->running_job);
-+		memset(&pispbe->running_job, 0, sizeof(pispbe->running_job));
-+		pispbe->done++;
-+		dev_dbg(pispbe->dev, "Job done (1)\n");
-+	}
-+
-+	if (pispbe->started != started) {
-+		pispbe->started++;
-+		can_queue_another = 1;
-+		dev_dbg(pispbe->dev, "Job started\n");
-+
-+		if (pispbe->done != done && pispbe->queued_job.node_group) {
-+			pispbe_isr_jobdone(pispbe, &pispbe->queued_job);
-+			pispbe->done++;
-+			dev_dbg(pispbe->dev, "Job done (2)\n");
-+		} else {
-+			pispbe->running_job = pispbe->queued_job;
-+		}
-+
-+		memset(&pispbe->queued_job, 0, sizeof(pispbe->queued_job));
-+	}
-+
-+	if (pispbe->done != done || pispbe->started != started) {
-+		dev_err(pispbe->dev, "PROBLEM: counters not matching!\n");
-+		pispbe->started = started;
-+		pispbe->done = done;
-+	}
-+
-+	/* check if there's more to do before going to sleep */
-+	pispbe_schedule_any(pispbe, can_queue_another);
-+
-+	return IRQ_HANDLED;
-+}
-+
-+static int pisp_be_validate_config(struct pispbe_node_group *node_group,
-+				   struct pisp_be_tiles_config *config)
-+{
-+	u32 bayer_enables = config->config.global.bayer_enables;
-+	u32 rgb_enables = config->config.global.rgb_enables;
-+	struct device *dev = node_group->pispbe->dev;
-+	struct v4l2_format *fmt;
-+	unsigned int bpl, size, i, j;
-+
-+	if (!(bayer_enables & PISP_BE_BAYER_ENABLE_INPUT) ==
-+	    !(rgb_enables & PISP_BE_RGB_ENABLE_INPUT)) {
-+		dev_err(dev, "%s: Not one input enabled\n", __func__);
-+		return -EIO;
-+	}
-+
-+	/* Ensure output config strides and buffer sizes match the V4L2 formats. */
-+	fmt = &node_group->node[TDN_OUTPUT_NODE].format;
-+	if (bayer_enables & PISP_BE_BAYER_ENABLE_TDN_OUTPUT) {
-+		bpl = config->config.tdn_output_format.stride;
-+		size = bpl * config->config.tdn_output_format.height;
-+		if (fmt->fmt.pix_mp.plane_fmt[0].bytesperline < bpl) {
-+			dev_err(dev, "%s: bpl mismatch on tdn_output\n",
-+				__func__);
-+			return -EINVAL;
-+		}
-+		if (fmt->fmt.pix_mp.plane_fmt[0].sizeimage < size) {
-+			dev_err(dev, "%s: size mismatch on tdn_output\n",
-+				__func__);
-+			return -EINVAL;
-+		}
-+	}
-+
-+	fmt = &node_group->node[STITCH_OUTPUT_NODE].format;
-+	if (bayer_enables & PISP_BE_BAYER_ENABLE_STITCH_OUTPUT) {
-+		bpl = config->config.stitch_output_format.stride;
-+		size = bpl * config->config.stitch_output_format.height;
-+		if (fmt->fmt.pix_mp.plane_fmt[0].bytesperline < bpl) {
-+			dev_err(dev, "%s: bpl mismatch on stitch_output\n",
-+				__func__);
-+			return -EINVAL;
-+		}
-+		if (fmt->fmt.pix_mp.plane_fmt[0].sizeimage < size) {
-+			dev_err(dev, "%s: size mismatch on stitch_output\n",
-+				__func__);
-+			return -EINVAL;
-+		}
-+	}
-+
-+	for (j = 0; j < PISP_BACK_END_NUM_OUTPUTS; j++) {
-+		if (!(rgb_enables & PISP_BE_RGB_ENABLE_OUTPUT(j)))
-+			continue;
-+		if (config->config.output_format[j].image.format &
-+		    PISP_IMAGE_FORMAT_WALLPAPER_ROLL)
-+			continue; /* TODO: Size checks for wallpaper formats */
-+
-+		fmt = &node_group->node[OUTPUT0_NODE + j].format;
-+		for (i = 0; i < fmt->fmt.pix_mp.num_planes; i++) {
-+			bpl = !i ? config->config.output_format[j].image.stride
-+			    : config->config.output_format[j].image.stride2;
-+			size = bpl * config->config.output_format[j].image.height;
-+
-+			if (config->config.output_format[j].image.format &
-+						PISP_IMAGE_FORMAT_SAMPLING_420)
-+				size >>= 1;
-+			if (fmt->fmt.pix_mp.plane_fmt[i].bytesperline < bpl) {
-+				dev_err(dev, "%s: bpl mismatch on output %d\n",
-+					__func__, j);
-+				return -EINVAL;
-+			}
-+			if (fmt->fmt.pix_mp.plane_fmt[i].sizeimage < size) {
-+				dev_err(dev, "%s: size mismatch on output\n",
-+					__func__);
-+				return -EINVAL;
-+			}
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+static int pispbe_node_queue_setup(struct vb2_queue *q, unsigned int *nbuffers,
-+				   unsigned int *nplanes, unsigned int sizes[],
-+				   struct device *alloc_devs[])
-+{
-+	struct pispbe_node *node = vb2_get_drv_priv(q);
-+	struct pispbe_dev *pispbe = node->node_group->pispbe;
-+
-+	*nplanes = 1;
-+	if (NODE_IS_MPLANE(node)) {
-+		unsigned int i;
-+
-+		*nplanes = node->format.fmt.pix_mp.num_planes;
-+		for (i = 0; i < *nplanes; i++) {
-+			unsigned int size =
-+				node->format.fmt.pix_mp.plane_fmt[i].sizeimage;
-+			if (sizes[i] && sizes[i] < size) {
-+				dev_err(pispbe->dev, "%s: size %u < %u\n",
-+					__func__, sizes[i], size);
-+				return -EINVAL;
-+			}
-+			sizes[i] = size;
-+		}
-+	} else if (NODE_IS_META(node)) {
-+		sizes[0] = node->format.fmt.meta.buffersize;
-+		/*
-+		 * Limit the config node buffer count to the number of internal
-+		 * buffers allocated.
-+		 */
-+		if (node->id == CONFIG_NODE)
-+			*nbuffers = min_t(unsigned int, *nbuffers,
-+					  PISP_BE_NUM_CONFIG_BUFFERS);
-+	}
-+
-+	dev_dbg(pispbe->dev,
-+		"Image (or metadata) size %u, nbuffers %u for node %s\n",
-+		sizes[0], *nbuffers, NODE_NAME(node));
-+
-+	return 0;
-+}
-+
-+static int pispbe_node_buffer_prepare(struct vb2_buffer *vb)
-+{
-+	struct pispbe_node *node = vb2_get_drv_priv(vb->vb2_queue);
-+	struct pispbe_dev *pispbe = node->node_group->pispbe;
-+	unsigned long size = 0;
-+	unsigned int num_planes = NODE_IS_MPLANE(node) ?
-+					node->format.fmt.pix_mp.num_planes : 1;
-+	unsigned int i;
-+
-+	for (i = 0; i < num_planes; i++) {
-+		size = NODE_IS_MPLANE(node)
-+			? node->format.fmt.pix_mp.plane_fmt[i].sizeimage
-+			: node->format.fmt.meta.buffersize;
-+
-+		if (vb2_plane_size(vb, i) < size) {
-+			dev_err(pispbe->dev,
-+				"data will not fit into plane %d (%lu < %lu)\n",
-+				i, vb2_plane_size(vb, i), size);
-+			return -EINVAL;
-+		}
-+
-+		vb2_set_plane_payload(vb, i, size);
-+	}
-+
-+	if (node->id == CONFIG_NODE) {
-+		void *dst = &node->node_group->config[vb->index];
-+		void *src = vb2_plane_vaddr(vb, 0);
-+
-+		memcpy(dst, src, sizeof(struct pisp_be_tiles_config));
-+		return pisp_be_validate_config(node->node_group, dst);
-+	}
-+
-+	return 0;
-+}
-+
-+static void pispbe_node_buffer_queue(struct vb2_buffer *buf)
-+{
-+	struct vb2_v4l2_buffer *vbuf =
-+		container_of(buf, struct vb2_v4l2_buffer, vb2_buf);
-+	struct pispbe_buffer *buffer =
-+		container_of(vbuf, struct pispbe_buffer, vb);
-+	struct pispbe_node *node = vb2_get_drv_priv(buf->vb2_queue);
-+	struct pispbe_node_group *node_group = node->node_group;
-+	struct pispbe_dev *pispbe = node->node_group->pispbe;
-+	unsigned long flags;
-+
-+	dev_dbg(pispbe->dev, "%s: for node %s\n", __func__, NODE_NAME(node));
-+	spin_lock_irqsave(&node->ready_lock, flags);
-+	list_add_tail(&buffer->ready_list, &node->ready_queue);
-+	spin_unlock_irqrestore(&node->ready_lock, flags);
-+
-+	/*
-+	 * Every time we add a buffer, check if there's now some work for the hw
-+	 * to do, but only for this client.
-+	 */
-+	pispbe_schedule_one(node_group);
-+}
-+
-+static int pispbe_node_start_streaming(struct vb2_queue *q, unsigned int count)
-+{
-+	unsigned long flags;
-+	struct pispbe_node *node = vb2_get_drv_priv(q);
-+	struct pispbe_node_group *node_group = node->node_group;
-+	struct pispbe_dev *pispbe = node_group->pispbe;
-+	int ret;
-+
-+	ret = pm_runtime_resume_and_get(pispbe->dev);
-+	if (ret < 0)
-+		return ret;
-+
-+	spin_lock_irqsave(&pispbe->hw_lock, flags);
-+	node->node_group->streaming_map |=  BIT(node->id);
-+	spin_unlock_irqrestore(&pispbe->hw_lock, flags);
-+
-+	dev_dbg(pispbe->dev, "%s: for node %s (count %u)\n",
-+		__func__, NODE_NAME(node), count);
-+	dev_dbg(pispbe->dev, "Nodes streaming for this group now 0x%x\n",
-+		node->node_group->streaming_map);
-+
-+	/* Maybe we're ready to run. */
-+	pispbe_schedule_one(node_group);
-+
-+	return 0;
-+}
-+
-+static void pispbe_node_stop_streaming(struct vb2_queue *q)
-+{
-+	struct pispbe_node *node = vb2_get_drv_priv(q);
-+	struct pispbe_node_group *node_group = node->node_group;
-+	struct pispbe_dev *pispbe = node_group->pispbe;
-+	struct pispbe_buffer *buf;
-+	unsigned long flags;
-+
-+	/*
-+	 * Now this is a bit awkward. In a simple M2M device we could just wait
-+	 * for all queued jobs to complete, but here there's a risk that a
-+	 * partial set of buffers was queued and cannot be run. For now, just
-+	 * cancel all buffers stuck in the "ready queue", then wait for any
-+	 * running job.
-+	 * XXX This may return buffers out of order.
-+	 */
-+	dev_dbg(pispbe->dev, "%s: for node %s\n", __func__, NODE_NAME(node));
-+	spin_lock_irqsave(&pispbe->hw_lock, flags);
-+	do {
-+		unsigned long flags1;
-+
-+		spin_lock_irqsave(&node->ready_lock, flags1);
-+		buf = list_first_entry_or_null(&node->ready_queue,
-+					       struct pispbe_buffer,
-+					       ready_list);
-+		if (buf) {
-+			list_del(&buf->ready_list);
-+			vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
-+		}
-+		spin_unlock_irqrestore(&node->ready_lock, flags1);
-+	} while (buf);
-+	spin_unlock_irqrestore(&pispbe->hw_lock, flags);
-+
-+	vb2_wait_for_all_buffers(&node->queue);
-+
-+	spin_lock_irqsave(&pispbe->hw_lock, flags);
-+	node_group->streaming_map &= ~BIT(node->id);
-+	spin_unlock_irqrestore(&pispbe->hw_lock, flags);
-+
-+	pm_runtime_mark_last_busy(pispbe->dev);
-+	pm_runtime_put_autosuspend(pispbe->dev);
-+
-+	dev_dbg(pispbe->dev, "Nodes streaming for this group now 0x%x\n",
-+		node_group->streaming_map);
-+}
-+
-+static const struct vb2_ops pispbe_node_queue_ops = {
-+	.queue_setup = pispbe_node_queue_setup,
-+	.buf_prepare = pispbe_node_buffer_prepare,
-+	.buf_queue = pispbe_node_buffer_queue,
-+	.start_streaming = pispbe_node_start_streaming,
-+	.stop_streaming = pispbe_node_stop_streaming,
-+};
-+
-+static const struct v4l2_file_operations pispbe_fops = {
-+	.owner          = THIS_MODULE,
-+	.open           = v4l2_fh_open,
-+	.release        = vb2_fop_release,
-+	.poll           = vb2_fop_poll,
-+	.unlocked_ioctl = video_ioctl2,
-+	.mmap           = vb2_fop_mmap
-+};
-+
-+static int pispbe_node_querycap(struct file *file, void *priv,
-+				struct v4l2_capability *cap)
-+{
-+	struct pispbe_node *node = video_drvdata(file);
-+	struct pispbe_dev *pispbe = node->node_group->pispbe;
-+
-+	strscpy(cap->driver, PISPBE_NAME, sizeof(cap->driver));
-+	strscpy(cap->card, PISPBE_NAME, sizeof(cap->card));
-+	snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:%s",
-+		 dev_name(pispbe->dev));
-+
-+	cap->capabilities = V4L2_CAP_VIDEO_CAPTURE_MPLANE |
-+			    V4L2_CAP_VIDEO_OUTPUT_MPLANE |
-+			    V4L2_CAP_STREAMING | V4L2_CAP_DEVICE_CAPS |
-+			    V4L2_CAP_META_OUTPUT | V4L2_CAP_META_CAPTURE;
-+	cap->device_caps = node->vfd.device_caps;
-+
-+	dev_dbg(pispbe->dev, "Caps for node %s: %x and %x (dev %x)\n",
-+		NODE_NAME(node), cap->capabilities, cap->device_caps,
-+		node->vfd.device_caps);
-+	return 0;
-+}
-+
-+static int pispbe_node_g_fmt_vid_cap(struct file *file, void *priv,
-+				     struct v4l2_format *f)
-+{
-+	struct pispbe_node *node = video_drvdata(file);
-+	struct pispbe_dev *pispbe = node->node_group->pispbe;
-+
-+	if (!NODE_IS_CAPTURE(node) || NODE_IS_META(node)) {
-+		dev_err(pispbe->dev,
-+			"Cannot get capture fmt for output node %s\n",
-+			NODE_NAME(node));
-+		return -EINVAL;
-+	}
-+	*f = node->format;
-+	dev_dbg(pispbe->dev, "Get capture format for node %s\n",
-+		NODE_NAME(node));
-+	return 0;
-+}
-+
-+static int pispbe_node_g_fmt_vid_out(struct file *file, void *priv,
-+				     struct v4l2_format *f)
-+{
-+	struct pispbe_node *node = video_drvdata(file);
-+	struct pispbe_dev *pispbe = node->node_group->pispbe;
-+
-+	if (NODE_IS_CAPTURE(node) || NODE_IS_META(node)) {
-+		dev_err(pispbe->dev,
-+			"Cannot get capture fmt for output node %s\n",
-+			 NODE_NAME(node));
-+		return -EINVAL;
-+	}
-+	*f = node->format;
-+	dev_dbg(pispbe->dev, "Get output format for node %s\n",
-+		NODE_NAME(node));
-+	return 0;
-+}
-+
-+static int pispbe_node_g_fmt_meta_out(struct file *file, void *priv,
-+				      struct v4l2_format *f)
-+{
-+	struct pispbe_node *node = video_drvdata(file);
-+	struct pispbe_dev *pispbe = node->node_group->pispbe;
-+
-+	if (!NODE_IS_META(node) || NODE_IS_CAPTURE(node)) {
-+		dev_err(pispbe->dev,
-+			"Cannot get capture fmt for meta output node %s\n",
-+			NODE_NAME(node));
-+		return -EINVAL;
-+	}
-+	*f = node->format;
-+	dev_dbg(pispbe->dev, "Get output format for meta node %s\n",
-+		NODE_NAME(node));
-+	return 0;
-+}
-+
-+static int pispbe_node_g_fmt_meta_cap(struct file *file, void *priv,
-+				      struct v4l2_format *f)
-+{
-+	struct pispbe_node *node = video_drvdata(file);
-+	struct pispbe_dev *pispbe = node->node_group->pispbe;
-+
-+	if (!NODE_IS_META(node) || NODE_IS_OUTPUT(node)) {
-+		dev_err(pispbe->dev,
-+			"Cannot get capture fmt for meta output node %s\n",
-+			NODE_NAME(node));
-+		return -EINVAL;
-+	}
-+	*f = node->format;
-+	dev_dbg(pispbe->dev, "Get output format for meta node %s\n",
-+		NODE_NAME(node));
-+	return 0;
-+}
-+
-+static int verify_be_pix_format(const struct v4l2_format *f,
-+				struct pispbe_node *node)
-+{
-+	struct pispbe_dev *pispbe = node->node_group->pispbe;
-+	unsigned int nplanes = f->fmt.pix_mp.num_planes;
-+	unsigned int i;
-+
-+	if (f->fmt.pix_mp.width == 0 || f->fmt.pix_mp.height == 0) {
-+		dev_err(pispbe->dev, "Details incorrect for output node %s\n",
-+			NODE_NAME(node));
-+		return -EINVAL;
-+	}
-+
-+	if (nplanes == 0 || nplanes > MAX_PLANES) {
-+		dev_err(pispbe->dev,
-+			"Bad number of planes for output node %s, req =%d\n",
-+			NODE_NAME(node), nplanes);
-+		return -EINVAL;
-+	}
-+
-+	for (i = 0; i < nplanes; i++) {
-+		const struct v4l2_plane_pix_format *p;
-+
-+		p = &f->fmt.pix_mp.plane_fmt[i];
-+		if (p->bytesperline == 0 || p->sizeimage == 0) {
-+			dev_err(pispbe->dev,
-+				"Invalid plane %d for output node %s\n",
-+				i, NODE_NAME(node));
-+			return -EINVAL;
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+static const struct pisp_be_format *find_format(unsigned int fourcc)
-+{
-+	const struct pisp_be_format *fmt;
-+	unsigned int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(supported_formats); i++) {
-+		fmt = &supported_formats[i];
-+		if (fmt->fourcc == fourcc)
-+			return fmt;
-+	}
-+
-+	return NULL;
-+}
-+
-+static void set_plane_params(struct v4l2_format *f,
-+			     const struct pisp_be_format *fmt)
-+{
-+	unsigned int nplanes = f->fmt.pix_mp.num_planes;
-+	unsigned int total_plane_factor = 0;
-+	unsigned int i;
-+
-+	for (i = 0; i < MAX_PLANES; i++)
-+		total_plane_factor += fmt->plane_factor[i];
-+
-+	for (i = 0; i < nplanes; i++) {
-+		struct v4l2_plane_pix_format *p = &f->fmt.pix_mp.plane_fmt[i];
-+		unsigned int bpl, plane_size;
-+
-+		bpl = (f->fmt.pix_mp.width * fmt->bit_depth) >> 3;
-+		bpl = ALIGN(max(p->bytesperline, bpl), fmt->align);
-+
-+		plane_size = bpl * f->fmt.pix_mp.height *
-+		      (nplanes > 1 ? fmt->plane_factor[i] : total_plane_factor);
-+		/*
-+		 * The shift is to divide out the plane_factor fixed point
-+		 * scaling of 8.
-+		 */
-+		plane_size = max(p->sizeimage, plane_size >> 3);
-+
-+		p->bytesperline = bpl;
-+		p->sizeimage = plane_size;
-+	}
-+}
-+
-+static int try_format(struct v4l2_format *f, struct pispbe_node *node)
-+{
-+	struct pispbe_dev *pispbe = node->node_group->pispbe;
-+	const struct pisp_be_format *fmt;
-+	unsigned int i;
-+	bool is_rgb;
-+	u32 pixfmt = f->fmt.pix_mp.pixelformat;
-+
-+	dev_dbg(pispbe->dev,
-+		"%s: [%s] req %ux%u " V4L2_FOURCC_CONV ", planes %d\n",
-+		__func__, NODE_NAME(node), f->fmt.pix_mp.width,
-+		f->fmt.pix_mp.height, V4L2_FOURCC_CONV_ARGS(pixfmt),
-+		f->fmt.pix_mp.num_planes);
-+
-+	if (pixfmt == V4L2_PIX_FMT_RPI_BE)
-+		return verify_be_pix_format(f, node);
-+
-+	fmt = find_format(pixfmt);
-+	if (!fmt)
-+		fmt = find_format(V4L2_PIX_FMT_YUV420M);
-+
-+	f->fmt.pix_mp.pixelformat = fmt->fourcc;
-+	f->fmt.pix_mp.num_planes = fmt->num_planes;
-+	f->fmt.pix_mp.field = V4L2_FIELD_NONE;
-+	f->fmt.pix_mp.width = max(min(f->fmt.pix_mp.width, 65536u),
-+				  PISP_BACK_END_MIN_TILE_WIDTH);
-+	f->fmt.pix_mp.height = max(min(f->fmt.pix_mp.height, 65536u),
-+				   PISP_BACK_END_MIN_TILE_HEIGHT);
-+
-+	/*
-+	 * Fill in the actual colour space when the requested one was
-+	 * not supported. This also catches the case when the "default"
-+	 * colour space was requested (as that's never in the mask).
-+	 */
-+	if (!(V4L2_COLORSPACE_MASK(f->fmt.pix_mp.colorspace) & fmt->colorspace_mask))
-+		f->fmt.pix_mp.colorspace = fmt->colorspace_default;
-+
-+	/* In all cases, we only support the defaults for these: */
-+	f->fmt.pix_mp.ycbcr_enc =
-+		V4L2_MAP_YCBCR_ENC_DEFAULT(f->fmt.pix_mp.colorspace);
-+	f->fmt.pix_mp.xfer_func =
-+		V4L2_MAP_XFER_FUNC_DEFAULT(f->fmt.pix_mp.colorspace);
-+
-+	is_rgb = f->fmt.pix_mp.colorspace == V4L2_COLORSPACE_SRGB;
-+	f->fmt.pix_mp.quantization =
-+		V4L2_MAP_QUANTIZATION_DEFAULT(is_rgb, f->fmt.pix_mp.colorspace,
-+					      f->fmt.pix_mp.ycbcr_enc);
-+
-+	/* Set plane size and bytes/line for each plane. */
-+	set_plane_params(f, fmt);
-+
-+	for (i = 0; i < f->fmt.pix_mp.num_planes; i++) {
-+		dev_dbg(pispbe->dev,
-+			"%s: [%s] calc plane %d, %ux%u, depth %u, bpl %u size %u\n",
-+			__func__, NODE_NAME(node), i, f->fmt.pix_mp.width,
-+			f->fmt.pix_mp.height, fmt->bit_depth,
-+			f->fmt.pix_mp.plane_fmt[i].bytesperline,
-+			f->fmt.pix_mp.plane_fmt[i].sizeimage);
-+	}
-+
-+	return 0;
-+}
-+
-+static int pispbe_node_try_fmt_vid_cap(struct file *file, void *priv,
-+				       struct v4l2_format *f)
-+{
-+	struct pispbe_node *node = video_drvdata(file);
-+	struct pispbe_dev *pispbe = node->node_group->pispbe;
-+	int ret;
-+
-+	if (!NODE_IS_CAPTURE(node) || NODE_IS_META(node)) {
-+		dev_err(pispbe->dev,
-+			"Cannot set capture fmt for output node %s\n",
-+			NODE_NAME(node));
-+		return -EINVAL;
-+	}
-+
-+	ret = try_format(f, node);
-+	if (ret < 0)
-+		return ret;
-+
-+	return 0;
-+}
-+
-+static int pispbe_node_try_fmt_vid_out(struct file *file, void *priv,
-+				       struct v4l2_format *f)
-+{
-+	struct pispbe_node *node = video_drvdata(file);
-+	struct pispbe_dev *pispbe = node->node_group->pispbe;
-+	int ret;
-+
-+	if (!NODE_IS_OUTPUT(node) || NODE_IS_META(node)) {
-+		dev_err(pispbe->dev,
-+			"Cannot set capture fmt for output node %s\n",
-+			NODE_NAME(node));
-+		return -EINVAL;
-+	}
-+
-+	ret = try_format(f, node);
-+	if (ret < 0)
-+		return ret;
-+
-+	return 0;
-+}
-+
-+static int pispbe_node_try_fmt_meta_out(struct file *file, void *priv,
-+					struct v4l2_format *f)
-+{
-+	struct pispbe_node *node = video_drvdata(file);
-+	struct pispbe_dev *pispbe = node->node_group->pispbe;
-+
-+	if (!NODE_IS_META(node) || NODE_IS_CAPTURE(node)) {
-+		dev_err(pispbe->dev,
-+			"Cannot set capture fmt for meta output node %s\n",
-+			NODE_NAME(node));
-+		return -EINVAL;
-+	}
-+
-+	f->fmt.meta.dataformat = V4L2_META_FMT_RPI_BE_CFG;
-+	f->fmt.meta.buffersize = sizeof(struct pisp_be_tiles_config);
-+
-+	return 0;
-+}
-+
-+static int pispbe_node_try_fmt_meta_cap(struct file *file, void *priv,
-+					struct v4l2_format *f)
-+{
-+	struct pispbe_node *node = video_drvdata(file);
-+	struct pispbe_dev *pispbe = node->node_group->pispbe;
-+
-+	if (!NODE_IS_META(node) || NODE_IS_OUTPUT(node)) {
-+		dev_err(pispbe->dev,
-+			"Cannot set capture fmt for meta output node %s\n",
-+			NODE_NAME(node));
-+		return -EINVAL;
-+	}
-+
-+	f->fmt.meta.dataformat = V4L2_PIX_FMT_RPI_BE;
-+	if (!f->fmt.meta.buffersize)
-+		f->fmt.meta.buffersize = BIT(20);
-+
-+	return 0;
-+}
-+
-+static int pispbe_node_s_fmt_vid_cap(struct file *file, void *priv,
-+				     struct v4l2_format *f)
-+{
-+	struct pispbe_node *node = video_drvdata(file);
-+	struct pispbe_dev *pispbe = node->node_group->pispbe;
-+	int ret = pispbe_node_try_fmt_vid_cap(file, priv, f);
-+
-+	if (ret < 0)
-+		return ret;
-+
-+	node->format = *f;
-+	node->pisp_format = find_format(f->fmt.pix_mp.pixelformat);
-+
-+	dev_dbg(pispbe->dev,
-+		"Set capture format for node %s to " V4L2_FOURCC_CONV "\n",
-+		NODE_NAME(node),
-+		V4L2_FOURCC_CONV_ARGS(f->fmt.pix_mp.pixelformat));
-+	return 0;
-+}
-+
-+static int pispbe_node_s_fmt_vid_out(struct file *file, void *priv,
-+				     struct v4l2_format *f)
-+{
-+	struct pispbe_node *node = video_drvdata(file);
-+	struct pispbe_dev *pispbe = node->node_group->pispbe;
-+	int ret = pispbe_node_try_fmt_vid_out(file, priv, f);
-+
-+	if (ret < 0)
-+		return ret;
-+
-+	node->format = *f;
-+	node->pisp_format = find_format(f->fmt.pix_mp.pixelformat);
-+
-+	dev_dbg(pispbe->dev,
-+		"Set output format for node %s to " V4L2_FOURCC_CONV "\n",
-+		NODE_NAME(node),
-+		V4L2_FOURCC_CONV_ARGS(f->fmt.pix_mp.pixelformat));
-+	return 0;
-+}
-+
-+static int pispbe_node_s_fmt_meta_out(struct file *file, void *priv,
-+				      struct v4l2_format *f)
-+{
-+	struct pispbe_node *node = video_drvdata(file);
-+	struct pispbe_dev *pispbe = node->node_group->pispbe;
-+	int ret = pispbe_node_try_fmt_meta_out(file, priv, f);
-+
-+	if (ret < 0)
-+		return ret;
-+
-+	node->format = *f;
-+	node->pisp_format = &meta_out_supported_formats[0];
-+
-+	dev_dbg(pispbe->dev,
-+		"Set output format for meta node %s to " V4L2_FOURCC_CONV "\n",
-+		NODE_NAME(node),
-+		V4L2_FOURCC_CONV_ARGS(f->fmt.meta.dataformat));
-+	return 0;
-+}
-+
-+static int pispbe_node_s_fmt_meta_cap(struct file *file, void *priv,
-+				      struct v4l2_format *f)
-+{
-+	struct pispbe_node *node = video_drvdata(file);
-+	struct pispbe_dev *pispbe = node->node_group->pispbe;
-+	int ret = pispbe_node_try_fmt_meta_cap(file, priv, f);
-+
-+	if (ret < 0)
-+		return ret;
-+
-+	node->format = *f;
-+	node->pisp_format = find_format(f->fmt.meta.dataformat);
-+
-+	dev_dbg(pispbe->dev,
-+		"Set capture format for meta node %s to " V4L2_FOURCC_CONV "\n",
-+		NODE_NAME(node),
-+		V4L2_FOURCC_CONV_ARGS(f->fmt.meta.dataformat));
-+	return 0;
-+}
-+
-+static int pispbe_node_enum_fmt(struct file *file, void  *priv,
-+				struct v4l2_fmtdesc *f)
-+{
-+	struct pispbe_node *node = video_drvdata(file);
-+
-+	if (f->type != node->queue.type)
-+		return -EINVAL;
-+
-+	if (NODE_IS_META(node)) {
-+		if (f->index)
-+			return -EINVAL;
-+
-+		if (NODE_IS_OUTPUT(node))
-+			f->pixelformat = V4L2_META_FMT_RPI_BE_CFG;
-+		else
-+			f->pixelformat = V4L2_PIX_FMT_RPI_BE;
-+		f->flags = 0;
-+		return 0;
-+	}
-+
-+	if (f->index >= ARRAY_SIZE(supported_formats))
-+		return -EINVAL;
-+
-+	f->pixelformat = supported_formats[f->index].fourcc;
-+	f->flags = 0;
-+
-+	return 0;
-+}
-+
-+static int pispbe_enum_framesizes(struct file *file, void *priv,
-+				  struct v4l2_frmsizeenum *fsize)
-+{
-+	struct pispbe_node *node = video_drvdata(file);
-+	struct pispbe_dev *pispbe = node->node_group->pispbe;
-+
-+	if (NODE_IS_META(node) || fsize->index)
-+		return -EINVAL;
-+
-+	if (!find_format(fsize->pixel_format)) {
-+		dev_err(pispbe->dev, "Invalid pixel code: %x\n",
-+			fsize->pixel_format);
-+		return -EINVAL;
-+	}
-+
-+	fsize->type = V4L2_FRMSIZE_TYPE_STEPWISE;
-+	fsize->stepwise.min_width = 32;
-+	fsize->stepwise.max_width = 65535;
-+	fsize->stepwise.step_width = 2;
-+
-+	fsize->stepwise.min_height = 32;
-+	fsize->stepwise.max_height = 65535;
-+	fsize->stepwise.step_height = 2;
-+
-+	return 0;
-+}
-+
-+static int pispbe_node_streamon(struct file *file, void *priv,
-+				enum v4l2_buf_type type)
-+{
-+	struct pispbe_node *node = video_drvdata(file);
-+	struct pispbe_dev *pispbe = node->node_group->pispbe;
-+
-+	/* Do we need a node->stream_lock mutex? */
-+
-+	dev_dbg(pispbe->dev, "Stream on for node %s\n", NODE_NAME(node));
-+
-+	/* Do we care about the type? Each node has only one queue. */
-+
-+	INIT_LIST_HEAD(&node->ready_queue);
-+
-+	/* locking should be handled by the queue->lock? */
-+	return vb2_streamon(&node->queue, type);
-+}
-+
-+static int pispbe_node_streamoff(struct file *file, void *priv,
-+				 enum v4l2_buf_type type)
-+{
-+	struct pispbe_node *node = video_drvdata(file);
-+
-+	return vb2_streamoff(&node->queue, type);
-+}
-+
-+static const struct v4l2_ioctl_ops pispbe_node_ioctl_ops = {
-+	.vidioc_querycap = pispbe_node_querycap,
-+	.vidioc_g_fmt_vid_cap_mplane = pispbe_node_g_fmt_vid_cap,
-+	.vidioc_g_fmt_vid_out_mplane = pispbe_node_g_fmt_vid_out,
-+	.vidioc_g_fmt_meta_out = pispbe_node_g_fmt_meta_out,
-+	.vidioc_g_fmt_meta_cap = pispbe_node_g_fmt_meta_cap,
-+	.vidioc_try_fmt_vid_cap_mplane = pispbe_node_try_fmt_vid_cap,
-+	.vidioc_try_fmt_vid_out_mplane = pispbe_node_try_fmt_vid_out,
-+	.vidioc_try_fmt_meta_out = pispbe_node_try_fmt_meta_out,
-+	.vidioc_try_fmt_meta_cap = pispbe_node_try_fmt_meta_cap,
-+	.vidioc_s_fmt_vid_cap_mplane = pispbe_node_s_fmt_vid_cap,
-+	.vidioc_s_fmt_vid_out_mplane = pispbe_node_s_fmt_vid_out,
-+	.vidioc_s_fmt_meta_out = pispbe_node_s_fmt_meta_out,
-+	.vidioc_s_fmt_meta_cap = pispbe_node_s_fmt_meta_cap,
-+	.vidioc_enum_fmt_vid_cap = pispbe_node_enum_fmt,
-+	.vidioc_enum_fmt_vid_out = pispbe_node_enum_fmt,
-+	.vidioc_enum_fmt_meta_cap = pispbe_node_enum_fmt,
-+	.vidioc_enum_fmt_meta_out = pispbe_node_enum_fmt,
-+	.vidioc_enum_framesizes = pispbe_enum_framesizes,
-+	.vidioc_create_bufs = vb2_ioctl_create_bufs,
-+	.vidioc_prepare_buf = vb2_ioctl_prepare_buf,
-+	.vidioc_querybuf = vb2_ioctl_querybuf,
-+	.vidioc_qbuf = vb2_ioctl_qbuf,
-+	.vidioc_dqbuf = vb2_ioctl_dqbuf,
-+	.vidioc_expbuf = vb2_ioctl_expbuf,
-+	.vidioc_reqbufs = vb2_ioctl_reqbufs,
-+	.vidioc_streamon = pispbe_node_streamon,
-+	.vidioc_streamoff = pispbe_node_streamoff,
-+};
-+
-+static const struct video_device pispbe_videodev = {
-+	.name = PISPBE_NAME,
-+	.vfl_dir = VFL_DIR_M2M, /* gets overwritten */
-+	.fops = &pispbe_fops,
-+	.ioctl_ops = &pispbe_node_ioctl_ops,
-+	.minor = -1,
-+	.release = video_device_release_empty,
-+};
-+
-+static void node_set_default_format(struct pispbe_node *node)
-+{
-+	if (NODE_IS_META(node) && NODE_IS_OUTPUT(node)) {
-+		/* Config node */
-+		struct v4l2_format *f = &node->format;
-+
-+		f->fmt.meta.dataformat = V4L2_META_FMT_RPI_BE_CFG;
-+		f->fmt.meta.buffersize = sizeof(struct pisp_be_tiles_config);
-+		f->type = node->buf_type;
-+	} else if (NODE_IS_META(node) && NODE_IS_CAPTURE(node)) {
-+		/* HOG output node */
-+		struct v4l2_format *f = &node->format;
-+
-+		f->fmt.meta.dataformat = V4L2_PIX_FMT_RPI_BE;
-+		f->fmt.meta.buffersize = BIT(20);
-+		f->type = node->buf_type;
-+	} else {
-+		struct v4l2_format f = {0};
-+
-+		f.fmt.pix_mp.pixelformat = V4L2_PIX_FMT_YUV420M;
-+		f.fmt.pix_mp.width = 1920;
-+		f.fmt.pix_mp.height = 1080;
-+		f.type = node->buf_type;
-+		try_format(&f, node);
-+		node->format = f;
-+	}
-+
-+	node->pisp_format = find_format(node->format.fmt.pix_mp.pixelformat);
-+}
-+
-+/*
-+ * Initialise a struct pispbe_node and register it as /dev/video<N>
-+ * to represent one of the PiSP Back End's input or output streams.
-+ */
-+static int
-+pispbe_init_node(struct pispbe_node_group *node_group, unsigned int id)
-+{
-+	bool output = NODE_DESC_IS_OUTPUT(&node_desc[id]);
-+	struct pispbe_node *node = &node_group->node[id];
-+	struct pispbe_dev *pispbe = node_group->pispbe;
-+	struct media_entity *entity = &node->vfd.entity;
-+	struct video_device *vdev = &node->vfd;
-+	struct vb2_queue *q = &node->queue;
-+	int ret;
-+
-+	node->id = id;
-+	node->node_group = node_group;
-+	node->buf_type = node_desc[id].buf_type;
-+
-+	mutex_init(&node->node_lock);
-+	mutex_init(&node->queue_lock);
-+	INIT_LIST_HEAD(&node->ready_queue);
-+	spin_lock_init(&node->ready_lock);
-+
-+	node->format.type = node->buf_type;
-+	node_set_default_format(node);
-+
-+	q->type = node->buf_type;
-+	q->io_modes = VB2_MMAP | VB2_DMABUF;
-+	q->mem_ops = &vb2_dma_contig_memops;
-+	q->drv_priv = node;
-+	q->ops = &pispbe_node_queue_ops;
-+	q->buf_struct_size = sizeof(struct pispbe_buffer);
-+	q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
-+	q->dev = node->node_group->pispbe->dev;
-+	/* get V4L2 to handle node->queue locking */
-+	q->lock = &node->queue_lock;
-+
-+	ret = vb2_queue_init(q);
-+	if (ret < 0) {
-+		dev_err(pispbe->dev, "vb2_queue_init failed\n");
-+		return ret;
-+	}
-+
-+	*vdev = pispbe_videodev; /* default initialization */
-+	strscpy(vdev->name, node_desc[id].ent_name, sizeof(vdev->name));
-+	vdev->v4l2_dev = &node_group->v4l2_dev;
-+	vdev->vfl_dir = output ? VFL_DIR_TX : VFL_DIR_RX;
-+	/* get V4L2 to serialise our ioctls */
-+	vdev->lock = &node->node_lock;
-+	vdev->queue = &node->queue;
-+	vdev->device_caps = V4L2_CAP_STREAMING | node_desc[id].caps;
-+
-+	node->pad.flags = output ? MEDIA_PAD_FL_SOURCE : MEDIA_PAD_FL_SINK;
-+	ret = media_entity_pads_init(entity, 1, &node->pad);
-+	if (ret) {
-+		dev_err(pispbe->dev,
-+			"Failed to register media pads for %s device node\n",
-+			NODE_NAME(node));
-+		goto err_unregister_queue;
-+	}
-+
-+	ret = video_register_device(vdev, VFL_TYPE_VIDEO,
-+				    PISPBE_VIDEO_NODE_OFFSET);
-+	if (ret) {
-+		dev_err(pispbe->dev,
-+			"Failed to register video %s device node\n",
-+			NODE_NAME(node));
-+		goto err_unregister_queue;
-+	}
-+	video_set_drvdata(vdev, node);
-+
-+	if (output)
-+		ret = media_create_pad_link(entity, 0, &node_group->sd.entity,
-+					    id, MEDIA_LNK_FL_IMMUTABLE |
-+					    MEDIA_LNK_FL_ENABLED);
-+	else
-+		ret = media_create_pad_link(&node_group->sd.entity, id, entity,
-+					    0, MEDIA_LNK_FL_IMMUTABLE |
-+					    MEDIA_LNK_FL_ENABLED);
-+	if (ret)
-+		goto err_unregister_video_dev;
-+
-+	dev_info(pispbe->dev,
-+		 "%s device node registered as /dev/video%d\n",
-+		 NODE_NAME(node), node->vfd.num);
-+	return 0;
-+
-+err_unregister_video_dev:
-+	video_unregister_device(&node->vfd);
-+err_unregister_queue:
-+	vb2_queue_release(&node->queue);
-+	return ret;
-+}
-+
-+static const struct v4l2_subdev_pad_ops pispbe_pad_ops = {
-+	.link_validate = v4l2_subdev_link_validate_default,
-+};
-+
-+static const struct v4l2_subdev_ops pispbe_sd_ops = {
-+	.pad = &pispbe_pad_ops,
-+};
-+
-+static int pispbe_init_subdev(struct pispbe_node_group *node_group)
-+{
-+	struct pispbe_dev *pispbe = node_group->pispbe;
-+	struct v4l2_subdev *sd = &node_group->sd;
-+	unsigned int i;
-+	int ret;
-+
-+	v4l2_subdev_init(sd, &pispbe_sd_ops);
-+	sd->entity.function = MEDIA_ENT_F_PROC_VIDEO_PIXEL_FORMATTER;
-+	sd->owner = THIS_MODULE;
-+	sd->dev = pispbe->dev;
-+	strscpy(sd->name, PISPBE_NAME, sizeof(sd->name));
-+
-+	for (i = 0; i < PISPBE_NUM_NODES; i++)
-+		node_group->pad[i].flags =
-+			NODE_DESC_IS_OUTPUT(&node_desc[i]) ?
-+			MEDIA_PAD_FL_SINK : MEDIA_PAD_FL_SOURCE;
-+
-+	ret = media_entity_pads_init(&sd->entity, PISPBE_NUM_NODES,
-+				     node_group->pad);
-+	if (ret)
-+		goto error;
-+
-+	ret = v4l2_device_register_subdev(&node_group->v4l2_dev, sd);
-+	if (ret)
-+		goto error;
-+
-+	return 0;
-+
-+error:
-+	media_entity_cleanup(&sd->entity);
-+	return ret;
-+}
-+
-+static int pispbe_init_group(struct pispbe_dev *pispbe, unsigned int id)
-+{
-+	struct pispbe_node_group *node_group = &pispbe->node_group[id];
-+	struct v4l2_device *v4l2_dev;
-+	struct media_device *mdev;
-+	unsigned int num_registered = 0;
-+	int ret;
-+
-+	node_group->id = id;
-+	node_group->pispbe = pispbe;
-+	node_group->streaming_map = 0;
-+
-+	dev_info(pispbe->dev, "Register nodes for group %u\n", id);
-+
-+	/* Register v4l2_device and media_device */
-+	mdev = &node_group->mdev;
-+	mdev->hw_revision = node_group->pispbe->hw_version;
-+	mdev->dev = node_group->pispbe->dev;
-+	strscpy(mdev->model, PISPBE_NAME, sizeof(mdev->model));
-+	snprintf(mdev->bus_info, sizeof(mdev->bus_info),
-+		 "platform:%s", dev_name(node_group->pispbe->dev));
-+	media_device_init(mdev);
-+
-+	v4l2_dev = &node_group->v4l2_dev;
-+	v4l2_dev->mdev = &node_group->mdev;
-+	strscpy(v4l2_dev->name, PISPBE_NAME, sizeof(v4l2_dev->name));
-+
-+	ret = v4l2_device_register(pispbe->dev, &node_group->v4l2_dev);
-+	if (ret)
-+		goto err_media_dev_cleanup;
-+
-+	/* Register the PISPBE subdevice. */
-+	ret = pispbe_init_subdev(node_group);
-+	if (ret)
-+		goto err_unregister_v4l2;
-+
-+	/* Create device video nodes */
-+	for (; num_registered < PISPBE_NUM_NODES; num_registered++) {
-+		ret = pispbe_init_node(node_group, num_registered);
-+		if (ret)
-+			goto err_unregister_nodes;
-+	}
-+
-+	ret = media_device_register(mdev);
-+	if (ret)
-+		goto err_unregister_nodes;
-+
-+	node_group->config =
-+		dma_alloc_coherent(pispbe->dev,
-+				   sizeof(struct pisp_be_tiles_config) *
-+					PISP_BE_NUM_CONFIG_BUFFERS,
-+				   &node_group->config_dma_addr, GFP_KERNEL);
-+	if (!node_group->config) {
-+		dev_err(pispbe->dev, "Unable to allocate cached config buffers.\n");
-+		ret = -ENOMEM;
-+		goto err_unregister_mdev;
-+	}
-+
-+	return 0;
-+
-+err_unregister_mdev:
-+	media_device_unregister(mdev);
-+err_unregister_nodes:
-+	while (num_registered-- > 0) {
-+		video_unregister_device(&node_group->node[num_registered].vfd);
-+		vb2_queue_release(&node_group->node[num_registered].queue);
-+	}
-+	v4l2_device_unregister_subdev(&node_group->sd);
-+	media_entity_cleanup(&node_group->sd.entity);
-+err_unregister_v4l2:
-+	v4l2_device_unregister(v4l2_dev);
-+err_media_dev_cleanup:
-+	media_device_cleanup(mdev);
-+	return ret;
-+}
-+
-+static void pispbe_destroy_node_group(struct pispbe_node_group *node_group)
-+{
-+	struct pispbe_dev *pispbe = node_group->pispbe;
-+	int i;
-+
-+	if (node_group->config) {
-+		dma_free_coherent(node_group->pispbe->dev,
-+				  sizeof(struct pisp_be_tiles_config) *
-+					PISP_BE_NUM_CONFIG_BUFFERS,
-+				  node_group->config,
-+				  node_group->config_dma_addr);
-+	}
-+
-+	dev_info(pispbe->dev, "Unregister from media controller\n");
-+
-+	v4l2_device_unregister_subdev(&node_group->sd);
-+	media_entity_cleanup(&node_group->sd.entity);
-+	media_device_unregister(&node_group->mdev);
-+
-+	for (i = PISPBE_NUM_NODES - 1; i >= 0; i--) {
-+		video_unregister_device(&node_group->node[i].vfd);
-+		vb2_queue_release(&node_group->node[i].queue);
-+	}
-+
-+	media_device_cleanup(&node_group->mdev);
-+	v4l2_device_unregister(&node_group->v4l2_dev);
-+}
-+
-+static int pispbe_runtime_suspend(struct device *dev)
-+{
-+	struct pispbe_dev *pispbe = dev_get_drvdata(dev);
-+
-+	clk_disable_unprepare(pispbe->clk);
-+
-+	return 0;
-+}
-+
-+static int pispbe_runtime_resume(struct device *dev)
-+{
-+	struct pispbe_dev *pispbe = dev_get_drvdata(dev);
-+	int ret;
-+
-+	ret = clk_prepare_enable(pispbe->clk);
-+	if (ret) {
-+		dev_err(dev, "Unable to enable clock\n");
-+		return ret;
-+	}
-+
-+	dev_dbg(dev, "%s: Enabled clock, rate=%lu\n",
-+		__func__, clk_get_rate(pispbe->clk));
-+
-+	return 0;
-+}
-+
-+/*
-+ * Probe the ISP-BE hardware block, as a single platform device.
-+ * This will instantiate multiple "node groups" each with many device nodes.
-+ */
-+static int pispbe_probe(struct platform_device *pdev)
-+{
-+	unsigned int num_groups = 0;
-+	struct pispbe_dev *pispbe;
-+	int ret;
-+
-+	pispbe = devm_kzalloc(&pdev->dev, sizeof(*pispbe), GFP_KERNEL);
-+	if (!pispbe)
-+		return -ENOMEM;
-+
-+	dev_set_drvdata(&pdev->dev, pispbe);
-+	pispbe->dev = &pdev->dev;
-+	platform_set_drvdata(pdev, pispbe);
-+
-+	pispbe->be_reg_base = devm_platform_ioremap_resource(pdev, 0);
-+	if (IS_ERR(pispbe->be_reg_base)) {
-+		dev_err(&pdev->dev, "Failed to get ISP-BE registers address\n");
-+		return PTR_ERR(pispbe->be_reg_base);
-+	}
-+
-+	pispbe->irq = platform_get_irq(pdev, 0);
-+	if (pispbe->irq <= 0) {
-+		dev_err(&pdev->dev, "No IRQ resource\n");
-+		return -EINVAL;
-+	}
-+
-+	ret = devm_request_irq(&pdev->dev, pispbe->irq, pispbe_isr, 0,
-+			       PISPBE_NAME, pispbe);
-+	if (ret) {
-+		dev_err(&pdev->dev, "Unable to request interrupt\n");
-+		return ret;
-+	}
-+
-+	ret = dma_set_mask_and_coherent(pispbe->dev, DMA_BIT_MASK(36));
-+	if (ret)
-+		return ret;
-+
-+	pispbe->clk = devm_clk_get(&pdev->dev, NULL);
-+	if (IS_ERR(pispbe->clk))
-+		return dev_err_probe(&pdev->dev, PTR_ERR(pispbe->clk),
-+				     "Failed to get clock");
-+
-+	/* Hardware initialisation */
-+	pm_runtime_set_autosuspend_delay(pispbe->dev, 200);
-+	pm_runtime_use_autosuspend(pispbe->dev);
-+	pm_runtime_enable(pispbe->dev);
-+
-+	ret = pm_runtime_resume_and_get(pispbe->dev);
-+	if (ret)
-+		goto pm_runtime_disable_err;
-+
-+	pispbe->hw_busy = 0;
-+	spin_lock_init(&pispbe->hw_lock);
-+	ret = hw_init(pispbe);
-+	if (ret)
-+		goto pm_runtime_put_err;
-+
-+	/*
-+	 * Initialise and register devices for each node_group, including media
-+	 * device
-+	 */
-+	for (num_groups = 0;
-+	     num_groups < PISPBE_NUM_NODE_GROUPS;
-+	     num_groups++) {
-+		ret = pispbe_init_group(pispbe, num_groups);
-+		if (ret)
-+			goto disable_nodes_err;
-+	}
-+
-+	pm_runtime_mark_last_busy(pispbe->dev);
-+	pm_runtime_put_autosuspend(pispbe->dev);
-+
-+	return 0;
-+
-+disable_nodes_err:
-+	while (num_groups-- > 0)
-+		pispbe_destroy_node_group(&pispbe->node_group[num_groups]);
-+pm_runtime_put_err:
-+	pm_runtime_put(pispbe->dev);
-+pm_runtime_disable_err:
-+	pm_runtime_dont_use_autosuspend(pispbe->dev);
-+	pm_runtime_disable(pispbe->dev);
-+
-+	dev_err(&pdev->dev, "%s: returning %d", __func__, ret);
-+
-+	return ret;
-+}
-+
-+static int pispbe_remove(struct platform_device *pdev)
-+{
-+	struct pispbe_dev *pispbe = platform_get_drvdata(pdev);
-+	int i;
-+
-+	for (i = PISPBE_NUM_NODE_GROUPS - 1; i >= 0; i--)
-+		pispbe_destroy_node_group(&pispbe->node_group[i]);
-+
-+	pm_runtime_dont_use_autosuspend(pispbe->dev);
-+	pm_runtime_disable(pispbe->dev);
-+
-+	return 0;
-+}
-+
-+static const struct dev_pm_ops pispbe_pm_ops = {
-+	SET_RUNTIME_PM_OPS(pispbe_runtime_suspend, pispbe_runtime_resume, NULL)
-+};
-+
-+static const struct of_device_id pispbe_of_match[] = {
-+	{
-+		.compatible = "raspberrypi,pispbe",
-+	},
-+	{ /* sentinel */ },
-+};
-+MODULE_DEVICE_TABLE(of, pispbe_of_match);
-+
-+static struct platform_driver pispbe_pdrv = {
-+	.probe		= pispbe_probe,
-+	.remove		= pispbe_remove,
-+	.driver		= {
-+		.name	= PISPBE_NAME,
-+		.of_match_table = pispbe_of_match,
-+		.pm = &pispbe_pm_ops,
-+	},
-+};
-+
-+module_platform_driver(pispbe_pdrv);
---- /dev/null
-+++ b/drivers/media/platform/raspberrypi/pisp_be/pisp_be_config.h
-@@ -0,0 +1,533 @@
-+/* SPDX-License-Identifier: GPL-2.0-only */
-+/*
-+ * PiSP Back End configuration definitions.
-+ *
-+ * Copyright (C) 2021 - Raspberry Pi Ltd
-+ *
-+ */
-+#ifndef _PISP_BE_CONFIG_H_
-+#define _PISP_BE_CONFIG_H_
-+
-+#include <linux/types.h>
-+
-+#include <media/raspberrypi/pisp_common.h>
-+
-+/* byte alignment for inputs */
-+#define PISP_BACK_END_INPUT_ALIGN 4u
-+/* alignment for compressed inputs */
-+#define PISP_BACK_END_COMPRESSED_ALIGN 8u
-+/* minimum required byte alignment for outputs */
-+#define PISP_BACK_END_OUTPUT_MIN_ALIGN 16u
-+/* preferred byte alignment for outputs */
-+#define PISP_BACK_END_OUTPUT_MAX_ALIGN 64u
-+
-+/* minimum allowed tile width anywhere in the pipeline */
-+#define PISP_BACK_END_MIN_TILE_WIDTH 16u
-+/* minimum allowed tile width anywhere in the pipeline */
-+#define PISP_BACK_END_MIN_TILE_HEIGHT 16u
-+
-+#define PISP_BACK_END_NUM_OUTPUTS 2
-+#define PISP_BACK_END_HOG_OUTPUT 1
-+
-+#define PISP_BACK_END_NUM_TILES 64
-+
-+enum pisp_be_bayer_enable {
-+	PISP_BE_BAYER_ENABLE_INPUT = 0x000001,
-+	PISP_BE_BAYER_ENABLE_DECOMPRESS = 0x000002,
-+	PISP_BE_BAYER_ENABLE_DPC = 0x000004,
-+	PISP_BE_BAYER_ENABLE_GEQ = 0x000008,
-+	PISP_BE_BAYER_ENABLE_TDN_INPUT = 0x000010,
-+	PISP_BE_BAYER_ENABLE_TDN_DECOMPRESS = 0x000020,
-+	PISP_BE_BAYER_ENABLE_TDN = 0x000040,
-+	PISP_BE_BAYER_ENABLE_TDN_COMPRESS = 0x000080,
-+	PISP_BE_BAYER_ENABLE_TDN_OUTPUT = 0x000100,
-+	PISP_BE_BAYER_ENABLE_SDN = 0x000200,
-+	PISP_BE_BAYER_ENABLE_BLC = 0x000400,
-+	PISP_BE_BAYER_ENABLE_STITCH_INPUT = 0x000800,
-+	PISP_BE_BAYER_ENABLE_STITCH_DECOMPRESS = 0x001000,
-+	PISP_BE_BAYER_ENABLE_STITCH = 0x002000,
-+	PISP_BE_BAYER_ENABLE_STITCH_COMPRESS = 0x004000,
-+	PISP_BE_BAYER_ENABLE_STITCH_OUTPUT = 0x008000,
-+	PISP_BE_BAYER_ENABLE_WBG = 0x010000,
-+	PISP_BE_BAYER_ENABLE_CDN = 0x020000,
-+	PISP_BE_BAYER_ENABLE_LSC = 0x040000,
-+	PISP_BE_BAYER_ENABLE_TONEMAP = 0x080000,
-+	PISP_BE_BAYER_ENABLE_CAC = 0x100000,
-+	PISP_BE_BAYER_ENABLE_DEBIN = 0x200000,
-+	PISP_BE_BAYER_ENABLE_DEMOSAIC = 0x400000,
-+};
-+
-+enum pisp_be_rgb_enable {
-+	PISP_BE_RGB_ENABLE_INPUT = 0x000001,
-+	PISP_BE_RGB_ENABLE_CCM = 0x000002,
-+	PISP_BE_RGB_ENABLE_SAT_CONTROL = 0x000004,
-+	PISP_BE_RGB_ENABLE_YCBCR = 0x000008,
-+	PISP_BE_RGB_ENABLE_FALSE_COLOUR = 0x000010,
-+	PISP_BE_RGB_ENABLE_SHARPEN = 0x000020,
-+	/* Preferred colours would occupy 0x000040 */
-+	PISP_BE_RGB_ENABLE_YCBCR_INVERSE = 0x000080,
-+	PISP_BE_RGB_ENABLE_GAMMA = 0x000100,
-+	PISP_BE_RGB_ENABLE_CSC0 = 0x000200,
-+	PISP_BE_RGB_ENABLE_CSC1 = 0x000400,
-+	PISP_BE_RGB_ENABLE_DOWNSCALE0 = 0x001000,
-+	PISP_BE_RGB_ENABLE_DOWNSCALE1 = 0x002000,
-+	PISP_BE_RGB_ENABLE_RESAMPLE0 = 0x008000,
-+	PISP_BE_RGB_ENABLE_RESAMPLE1 = 0x010000,
-+	PISP_BE_RGB_ENABLE_OUTPUT0 = 0x040000,
-+	PISP_BE_RGB_ENABLE_OUTPUT1 = 0x080000,
-+	PISP_BE_RGB_ENABLE_HOG = 0x200000
-+};
-+
-+#define PISP_BE_RGB_ENABLE_CSC(i) (PISP_BE_RGB_ENABLE_CSC0 << (i))
-+#define PISP_BE_RGB_ENABLE_DOWNSCALE(i) (PISP_BE_RGB_ENABLE_DOWNSCALE0 << (i))
-+#define PISP_BE_RGB_ENABLE_RESAMPLE(i) (PISP_BE_RGB_ENABLE_RESAMPLE0 << (i))
-+#define PISP_BE_RGB_ENABLE_OUTPUT(i) (PISP_BE_RGB_ENABLE_OUTPUT0 << (i))
-+
-+/*
-+ * We use the enable flags to show when blocks are "dirty", but we need some
-+ * extra ones too.
-+ */
-+enum pisp_be_dirty {
-+	PISP_BE_DIRTY_GLOBAL = 0x0001,
-+	PISP_BE_DIRTY_SH_FC_COMBINE = 0x0002,
-+	PISP_BE_DIRTY_CROP = 0x0004
-+};
-+
-+struct pisp_be_global_config {
-+	u32 bayer_enables;
-+	u32 rgb_enables;
-+	u8 bayer_order;
-+	u8 pad[3];
-+};
-+
-+struct pisp_be_input_buffer_config {
-+	/* low 32 bits followed by high 32 bits (for each of up to 3 planes) */
-+	u32 addr[3][2];
-+};
-+
-+struct pisp_be_dpc_config {
-+	u8 coeff_level;
-+	u8 coeff_range;
-+	u8 pad;
-+#define PISP_BE_DPC_FLAG_FOLDBACK 1
-+	u8 flags;
-+};
-+
-+struct pisp_be_geq_config {
-+	u16 offset;
-+#define PISP_BE_GEQ_SHARPER BIT(15)
-+#define PISP_BE_GEQ_SLOPE ((1 << 10) - 1)
-+	/* top bit is the "sharper" flag, slope value is bottom 10 bits */
-+	u16 slope_sharper;
-+	u16 min;
-+	u16 max;
-+};
-+
-+struct pisp_be_tdn_input_buffer_config {
-+	/* low 32 bits followed by high 32 bits */
-+	u32 addr[2];
-+};
-+
-+struct pisp_be_tdn_config {
-+	u16 black_level;
-+	u16 ratio;
-+	u16 noise_constant;
-+	u16 noise_slope;
-+	u16 threshold;
-+	u8 reset;
-+	u8 pad;
-+};
-+
-+struct pisp_be_tdn_output_buffer_config {
-+	/* low 32 bits followed by high 32 bits */
-+	u32 addr[2];
-+};
-+
-+struct pisp_be_sdn_config {
-+	u16 black_level;
-+	u8 leakage;
-+	u8 pad;
-+	u16 noise_constant;
-+	u16 noise_slope;
-+	u16 noise_constant2;
-+	u16 noise_slope2;
-+};
-+
-+struct pisp_be_stitch_input_buffer_config {
-+	/* low 32 bits followed by high 32 bits */
-+	u32 addr[2];
-+};
-+
-+#define PISP_BE_STITCH_STREAMING_LONG 0x8000
-+#define PISP_BE_STITCH_EXPOSURE_RATIO_MASK 0x7fff
-+
-+struct pisp_be_stitch_config {
-+	u16 threshold_lo;
-+	u8 threshold_diff_power;
-+	u8 pad;
-+
-+	/* top bit indicates whether streaming input is the long exposure */
-+	u16 exposure_ratio;
-+
-+	u8 motion_threshold_256;
-+	u8 motion_threshold_recip;
-+};
-+
-+struct pisp_be_stitch_output_buffer_config {
-+	/* low 32 bits followed by high 32 bits */
-+	u32 addr[2];
-+};
-+
-+struct pisp_be_cdn_config {
-+	u16 thresh;
-+	u8 iir_strength;
-+	u8 g_adjust;
-+};
-+
-+#define PISP_BE_LSC_LOG_GRID_SIZE 5
-+#define PISP_BE_LSC_GRID_SIZE (1 << PISP_BE_LSC_LOG_GRID_SIZE)
-+#define PISP_BE_LSC_STEP_PRECISION 18
-+
-+struct pisp_be_lsc_config {
-+	/* (1<<18) / grid_cell_width */
-+	u16 grid_step_x;
-+	/* (1<<18) / grid_cell_height */
-+	u16 grid_step_y;
-+	/* RGB gains jointly encoded in 32 bits */
-+	u32 lut_packed[PISP_BE_LSC_GRID_SIZE + 1]
-+			   [PISP_BE_LSC_GRID_SIZE + 1];
-+};
-+
-+struct pisp_be_lsc_extra {
-+	u16 offset_x;
-+	u16 offset_y;
-+};
-+
-+#define PISP_BE_CAC_LOG_GRID_SIZE 3
-+#define PISP_BE_CAC_GRID_SIZE (1 << PISP_BE_CAC_LOG_GRID_SIZE)
-+#define PISP_BE_CAC_STEP_PRECISION 20
-+
-+struct pisp_be_cac_config {
-+	/* (1<<20) / grid_cell_width */
-+	u16 grid_step_x;
-+	/* (1<<20) / grid_cell_height */
-+	u16 grid_step_y;
-+	/* [gridy][gridx][rb][xy] */
-+	s8 lut[PISP_BE_CAC_GRID_SIZE + 1][PISP_BE_CAC_GRID_SIZE + 1][2][2];
-+};
-+
-+struct pisp_be_cac_extra {
-+	u16 offset_x;
-+	u16 offset_y;
-+};
-+
-+#define PISP_BE_DEBIN_NUM_COEFFS 4
-+
-+struct pisp_be_debin_config {
-+	s8 coeffs[PISP_BE_DEBIN_NUM_COEFFS];
-+	s8 h_enable;
-+	s8 v_enable;
-+	s8 pad[2];
-+};
-+
-+#define PISP_BE_TONEMAP_LUT_SIZE 64
-+
-+struct pisp_be_tonemap_config {
-+	u16 detail_constant;
-+	u16 detail_slope;
-+	u16 iir_strength;
-+	u16 strength;
-+	u32 lut[PISP_BE_TONEMAP_LUT_SIZE];
-+};
-+
-+struct pisp_be_demosaic_config {
-+	u8 sharper;
-+	u8 fc_mode;
-+	u8 pad[2];
-+};
-+
-+struct pisp_be_ccm_config {
-+	s16 coeffs[9];
-+	u8 pad[2];
-+	s32 offsets[3];
-+};
-+
-+struct pisp_be_sat_control_config {
-+	u8 shift_r;
-+	u8 shift_g;
-+	u8 shift_b;
-+	u8 pad;
-+};
-+
-+struct pisp_be_false_colour_config {
-+	u8 distance;
-+	u8 pad[3];
-+};
-+
-+#define PISP_BE_SHARPEN_SIZE 5
-+#define PISP_BE_SHARPEN_FUNC_NUM_POINTS 9
-+
-+struct pisp_be_sharpen_config {
-+	s8 kernel0[PISP_BE_SHARPEN_SIZE * PISP_BE_SHARPEN_SIZE];
-+	s8 pad0[3];
-+	s8 kernel1[PISP_BE_SHARPEN_SIZE * PISP_BE_SHARPEN_SIZE];
-+	s8 pad1[3];
-+	s8 kernel2[PISP_BE_SHARPEN_SIZE * PISP_BE_SHARPEN_SIZE];
-+	s8 pad2[3];
-+	s8 kernel3[PISP_BE_SHARPEN_SIZE * PISP_BE_SHARPEN_SIZE];
-+	s8 pad3[3];
-+	s8 kernel4[PISP_BE_SHARPEN_SIZE * PISP_BE_SHARPEN_SIZE];
-+	s8 pad4[3];
-+	u16 threshold_offset0;
-+	u16 threshold_slope0;
-+	u16 scale0;
-+	u16 pad5;
-+	u16 threshold_offset1;
-+	u16 threshold_slope1;
-+	u16 scale1;
-+	u16 pad6;
-+	u16 threshold_offset2;
-+	u16 threshold_slope2;
-+	u16 scale2;
-+	u16 pad7;
-+	u16 threshold_offset3;
-+	u16 threshold_slope3;
-+	u16 scale3;
-+	u16 pad8;
-+	u16 threshold_offset4;
-+	u16 threshold_slope4;
-+	u16 scale4;
-+	u16 pad9;
-+	u16 positive_strength;
-+	u16 positive_pre_limit;
-+	u16 positive_func[PISP_BE_SHARPEN_FUNC_NUM_POINTS];
-+	u16 positive_limit;
-+	u16 negative_strength;
-+	u16 negative_pre_limit;
-+	u16 negative_func[PISP_BE_SHARPEN_FUNC_NUM_POINTS];
-+	u16 negative_limit;
-+	u8 enables;
-+	u8 white;
-+	u8 black;
-+	u8 grey;
-+};
-+
-+struct pisp_be_sh_fc_combine_config {
-+	u8 y_factor;
-+	u8 c1_factor;
-+	u8 c2_factor;
-+	u8 pad;
-+};
-+
-+#define PISP_BE_GAMMA_LUT_SIZE 64
-+
-+struct pisp_be_gamma_config {
-+	u32 lut[PISP_BE_GAMMA_LUT_SIZE];
-+};
-+
-+struct pisp_be_crop_config {
-+	u16 offset_x, offset_y;
-+	u16 width, height;
-+};
-+
-+#define PISP_BE_RESAMPLE_FILTER_SIZE 96
-+
-+struct pisp_be_resample_config {
-+	u16 scale_factor_h, scale_factor_v;
-+	s16 coef[PISP_BE_RESAMPLE_FILTER_SIZE];
-+};
-+
-+struct pisp_be_resample_extra {
-+	u16 scaled_width;
-+	u16 scaled_height;
-+	s16 initial_phase_h[3];
-+	s16 initial_phase_v[3];
-+};
-+
-+struct pisp_be_downscale_config {
-+	u16 scale_factor_h;
-+	u16 scale_factor_v;
-+	u16 scale_recip_h;
-+	u16 scale_recip_v;
-+};
-+
-+struct pisp_be_downscale_extra {
-+	u16 scaled_width;
-+	u16 scaled_height;
-+};
-+
-+struct pisp_be_hog_config {
-+	u8 compute_signed;
-+	u8 channel_mix[3];
-+	u32 stride;
-+};
-+
-+struct pisp_be_axi_config {
-+	u8 r_qos; /* Read QoS */
-+	u8 r_cache_prot; /* Read { prot[2:0], cache[3:0] } */
-+	u8 w_qos; /* Write QoS */
-+	u8 w_cache_prot; /* Write { prot[2:0], cache[3:0] } */
-+};
-+
-+enum pisp_be_transform {
-+	PISP_BE_TRANSFORM_NONE = 0x0,
-+	PISP_BE_TRANSFORM_HFLIP = 0x1,
-+	PISP_BE_TRANSFORM_VFLIP = 0x2,
-+	PISP_BE_TRANSFORM_ROT180 =
-+		(PISP_BE_TRANSFORM_HFLIP | PISP_BE_TRANSFORM_VFLIP)
-+};
-+
-+struct pisp_be_output_format_config {
-+	struct pisp_image_format_config image;
-+	u8 transform;
-+	u8 pad[3];
-+	u16 lo;
-+	u16 hi;
-+	u16 lo2;
-+	u16 hi2;
-+};
-+
-+struct pisp_be_output_buffer_config {
-+	/* low 32 bits followed by high 32 bits (for each of 3 planes) */
-+	u32 addr[3][2];
-+};
-+
-+struct pisp_be_hog_buffer_config {
-+	/* low 32 bits followed by high 32 bits */
-+	u32 addr[2];
-+};
-+
-+struct pisp_be_config {
-+	/* I/O configuration: */
-+	struct pisp_be_input_buffer_config input_buffer;
-+	struct pisp_be_tdn_input_buffer_config tdn_input_buffer;
-+	struct pisp_be_stitch_input_buffer_config stitch_input_buffer;
-+	struct pisp_be_tdn_output_buffer_config tdn_output_buffer;
-+	struct pisp_be_stitch_output_buffer_config stitch_output_buffer;
-+	struct pisp_be_output_buffer_config
-+				output_buffer[PISP_BACK_END_NUM_OUTPUTS];
-+	struct pisp_be_hog_buffer_config hog_buffer;
-+	/* Processing configuration: */
-+	struct pisp_be_global_config global;
-+	struct pisp_image_format_config input_format;
-+	struct pisp_decompress_config decompress;
-+	struct pisp_be_dpc_config dpc;
-+	struct pisp_be_geq_config geq;
-+	struct pisp_image_format_config tdn_input_format;
-+	struct pisp_decompress_config tdn_decompress;
-+	struct pisp_be_tdn_config tdn;
-+	struct pisp_compress_config tdn_compress;
-+	struct pisp_image_format_config tdn_output_format;
-+	struct pisp_be_sdn_config sdn;
-+	struct pisp_bla_config blc;
-+	struct pisp_compress_config stitch_compress;
-+	struct pisp_image_format_config stitch_output_format;
-+	struct pisp_image_format_config stitch_input_format;
-+	struct pisp_decompress_config stitch_decompress;
-+	struct pisp_be_stitch_config stitch;
-+	struct pisp_be_lsc_config lsc;
-+	struct pisp_wbg_config wbg;
-+	struct pisp_be_cdn_config cdn;
-+	struct pisp_be_cac_config cac;
-+	struct pisp_be_debin_config debin;
-+	struct pisp_be_tonemap_config tonemap;
-+	struct pisp_be_demosaic_config demosaic;
-+	struct pisp_be_ccm_config ccm;
-+	struct pisp_be_sat_control_config sat_control;
-+	struct pisp_be_ccm_config ycbcr;
-+	struct pisp_be_sharpen_config sharpen;
-+	struct pisp_be_false_colour_config false_colour;
-+	struct pisp_be_sh_fc_combine_config sh_fc_combine;
-+	struct pisp_be_ccm_config ycbcr_inverse;
-+	struct pisp_be_gamma_config gamma;
-+	struct pisp_be_ccm_config csc[PISP_BACK_END_NUM_OUTPUTS];
-+	struct pisp_be_downscale_config downscale[PISP_BACK_END_NUM_OUTPUTS];
-+	struct pisp_be_resample_config resample[PISP_BACK_END_NUM_OUTPUTS];
-+	struct pisp_be_output_format_config
-+				output_format[PISP_BACK_END_NUM_OUTPUTS];
-+	struct pisp_be_hog_config hog;
-+	struct pisp_be_axi_config axi;
-+	/* Non-register fields: */
-+	struct pisp_be_lsc_extra lsc_extra;
-+	struct pisp_be_cac_extra cac_extra;
-+	struct pisp_be_downscale_extra
-+				downscale_extra[PISP_BACK_END_NUM_OUTPUTS];
-+	struct pisp_be_resample_extra resample_extra[PISP_BACK_END_NUM_OUTPUTS];
-+	struct pisp_be_crop_config crop;
-+	struct pisp_image_format_config hog_format;
-+	u32 dirty_flags_bayer; /* these use pisp_be_bayer_enable */
-+	u32 dirty_flags_rgb; /* use pisp_be_rgb_enable */
-+	u32 dirty_flags_extra; /* these use pisp_be_dirty_t */
-+};
-+
-+/*
-+ * We also need a tile structure to describe the size of the tiles going
-+ * through the pipeline.
-+ */
-+
-+enum pisp_tile_edge {
-+	PISP_LEFT_EDGE = (1 << 0),
-+	PISP_RIGHT_EDGE = (1 << 1),
-+	PISP_TOP_EDGE = (1 << 2),
-+	PISP_BOTTOM_EDGE = (1 << 3)
-+};
-+
-+struct pisp_tile {
-+	u8 edge; // enum pisp_tile_edge
-+	u8 pad0[3];
-+	// 4 bytes
-+	u32 input_addr_offset;
-+	u32 input_addr_offset2;
-+	u16 input_offset_x;
-+	u16 input_offset_y;
-+	u16 input_width;
-+	u16 input_height;
-+	// 20 bytes
-+	u32 tdn_input_addr_offset;
-+	u32 tdn_output_addr_offset;
-+	u32 stitch_input_addr_offset;
-+	u32 stitch_output_addr_offset;
-+	// 36 bytes
-+	u32 lsc_grid_offset_x;
-+	u32 lsc_grid_offset_y;
-+	// 44 bytes
-+	u32 cac_grid_offset_x;
-+	u32 cac_grid_offset_y;
-+	// 52 bytes
-+	u16 crop_x_start[PISP_BACK_END_NUM_OUTPUTS];
-+	u16 crop_x_end[PISP_BACK_END_NUM_OUTPUTS];
-+	u16 crop_y_start[PISP_BACK_END_NUM_OUTPUTS];
-+	u16 crop_y_end[PISP_BACK_END_NUM_OUTPUTS];
-+	// 68 bytes
-+	/* Ordering is planes then branches */
-+	u16 downscale_phase_x[3 * PISP_BACK_END_NUM_OUTPUTS];
-+	u16 downscale_phase_y[3 * PISP_BACK_END_NUM_OUTPUTS];
-+	// 92 bytes
-+	u16 resample_in_width[PISP_BACK_END_NUM_OUTPUTS];
-+	u16 resample_in_height[PISP_BACK_END_NUM_OUTPUTS];
-+	// 100 bytes
-+	/* Ordering is planes then branches */
-+	u16 resample_phase_x[3 * PISP_BACK_END_NUM_OUTPUTS];
-+	u16 resample_phase_y[3 * PISP_BACK_END_NUM_OUTPUTS];
-+	// 124 bytes
-+	u16 output_offset_x[PISP_BACK_END_NUM_OUTPUTS];
-+	u16 output_offset_y[PISP_BACK_END_NUM_OUTPUTS];
-+	u16 output_width[PISP_BACK_END_NUM_OUTPUTS];
-+	u16 output_height[PISP_BACK_END_NUM_OUTPUTS];
-+	// 140 bytes
-+	u32 output_addr_offset[PISP_BACK_END_NUM_OUTPUTS];
-+	u32 output_addr_offset2[PISP_BACK_END_NUM_OUTPUTS];
-+	// 156 bytes
-+	u32 output_hog_addr_offset;
-+	// 160 bytes
-+};
-+
-+static_assert(sizeof(struct pisp_tile) == 160);
-+
-+struct pisp_be_tiles_config {
-+	struct pisp_be_config config;
-+	struct pisp_tile tiles[PISP_BACK_END_NUM_TILES];
-+	int num_tiles;
-+};
-+
-+#endif /* _PISP_BE_CONFIG_H_ */
---- /dev/null
-+++ b/drivers/media/platform/raspberrypi/pisp_be/pisp_be_formats.h
-@@ -0,0 +1,469 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * PiSP Back End driver image format definitions.
-+ *
-+ * Copyright (c) 2021 Raspberry Pi Ltd
-+ */
-+
-+#ifndef _PISP_BE_FORMATS_
-+#define _PISP_BE_FORMATS_
-+
-+#include <linux/bits.h>
-+#include <linux/videodev2.h>
-+
-+#define MAX_PLANES 3
-+#define P3(x) ((x) * 8)
-+
-+struct pisp_be_format {
-+	unsigned int fourcc;
-+	unsigned int align;
-+	unsigned int bit_depth;
-+	/* 0P3 factor for plane sizing */
-+	unsigned int plane_factor[MAX_PLANES];
-+	unsigned int num_planes;
-+	unsigned int colorspace_mask;
-+	enum v4l2_colorspace colorspace_default;
-+};
-+
-+#define V4L2_COLORSPACE_MASK(colorspace) BIT(colorspace)
-+
-+#define V4L2_COLORSPACE_MASK_JPEG V4L2_COLORSPACE_MASK(V4L2_COLORSPACE_JPEG)
-+#define V4L2_COLORSPACE_MASK_SMPTE170M V4L2_COLORSPACE_MASK(V4L2_COLORSPACE_SMPTE170M)
-+#define V4L2_COLORSPACE_MASK_REC709 V4L2_COLORSPACE_MASK(V4L2_COLORSPACE_REC709)
-+#define V4L2_COLORSPACE_MASK_SRGB V4L2_COLORSPACE_MASK(V4L2_COLORSPACE_SRGB)
-+#define V4L2_COLORSPACE_MASK_RAW V4L2_COLORSPACE_MASK(V4L2_COLORSPACE_RAW)
-+
-+/*
-+ * All three colour spaces JPEG, SMPTE170M and REC709 are fundamentally sRGB
-+ * underneath (as near as makes no difference to us), just with different YCbCr
-+ * encodings. Therefore the ISP can generate sRGB on its main output and any of
-+ * the others on its low resolution output. Applications should, when using both
-+ * outputs, program the colour spaces on them to be the same, matching whatever
-+ * is requested for the low resolution output, even if the main output is
-+ * producing an RGB format. In turn this requires us to allow all these colour
-+ * spaces for every YUV/RGB output format.
-+ */
-+#define V4L2_COLORSPACE_MASK_ALL_SRGB (V4L2_COLORSPACE_MASK_JPEG |	\
-+				       V4L2_COLORSPACE_MASK_SRGB |	\
-+				       V4L2_COLORSPACE_MASK_SMPTE170M |	\
-+				       V4L2_COLORSPACE_MASK_REC709)
-+
-+static const struct pisp_be_format supported_formats[] = {
-+	/* Single plane YUV formats */
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_YUV420,
-+		/* 128 alignment to ensure U/V planes are 64 byte aligned. */
-+		.align		    = 128,
-+		.bit_depth	    = 8,
-+		.plane_factor	    = { P3(1), P3(0.25), P3(0.25) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
-+		.colorspace_default = V4L2_COLORSPACE_JPEG,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_YVU420,
-+		/* 128 alignment to ensure U/V planes are 64 byte aligned. */
-+		.align		    = 128,
-+		.bit_depth	    = 8,
-+		.plane_factor	    = { P3(1), P3(0.25), P3(0.25) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
-+		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_NV12,
-+		.align		    = 32,
-+		.bit_depth	    = 8,
-+		.plane_factor	    = { P3(1), P3(0.5) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
-+		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_NV21,
-+		.align		    = 32,
-+		.bit_depth	    = 8,
-+		.plane_factor	    = { P3(1), P3(0.5) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
-+		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_YUYV,
-+		.align		    = 64,
-+		.bit_depth	    = 16,
-+		.plane_factor	    = { P3(1) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
-+		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_UYVY,
-+		.align		    = 64,
-+		.bit_depth	    = 16,
-+		.plane_factor	    = { P3(1) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
-+		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_YVYU,
-+		.align		    = 64,
-+		.bit_depth	    = 16,
-+		.plane_factor	    = { P3(1) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
-+		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_VYUY,
-+		.align		    = 64,
-+		.bit_depth	    = 16,
-+		.plane_factor	    = { P3(1) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
-+		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
-+	},
-+	/* Multiplane YUV formats */
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_YUV420M,
-+		.align		    = 64,
-+		.bit_depth	    = 8,
-+		.plane_factor	    = { P3(1), P3(0.25), P3(0.25) },
-+		.num_planes	    = 3,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
-+		.colorspace_default = V4L2_COLORSPACE_JPEG,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_NV12M,
-+		.align		    = 32,
-+		.bit_depth	    = 8,
-+		.plane_factor	    = { P3(1), P3(0.5) },
-+		.num_planes	    = 2,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
-+		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_NV21M,
-+		.align		    = 32,
-+		.bit_depth	    = 8,
-+		.plane_factor	    = { P3(1), P3(0.5) },
-+		.num_planes	    = 2,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
-+		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_YVU420M,
-+		.align		    = 64,
-+		.bit_depth	    = 8,
-+		.plane_factor	    = { P3(1), P3(0.25), P3(0.25) },
-+		.num_planes	    = 3,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
-+		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_YUV422M,
-+		.align		    = 64,
-+		.bit_depth	    = 8,
-+		.plane_factor	    = { P3(1), P3(0.5), P3(0.5) },
-+		.num_planes	    = 3,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
-+		.colorspace_default = V4L2_COLORSPACE_JPEG,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_YVU422M,
-+		.align		    = 64,
-+		.bit_depth	    = 8,
-+		.plane_factor	    = { P3(1), P3(0.5), P3(0.5) },
-+		.num_planes	    = 3,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
-+		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_YUV444M,
-+		.align		    = 64,
-+		.bit_depth	    = 8,
-+		.plane_factor	    = { P3(1), P3(1), P3(1) },
-+		.num_planes	    = 3,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
-+		.colorspace_default = V4L2_COLORSPACE_JPEG,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_YVU444M,
-+		.align		    = 64,
-+		.bit_depth	    = 8,
-+		.plane_factor	    = { P3(1), P3(1), P3(1) },
-+		.num_planes	    = 3,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
-+		.colorspace_default = V4L2_COLORSPACE_SMPTE170M,
-+	},
-+	/* RGB formats */
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_RGB24,
-+		.align		    = 32,
-+		.bit_depth	    = 24,
-+		.plane_factor	    = { P3(1.0) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
-+		.colorspace_default = V4L2_COLORSPACE_SRGB,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_BGR24,
-+		.align		    = 32,
-+		.bit_depth	    = 24,
-+		.plane_factor	    = { P3(1.0) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
-+		.colorspace_default = V4L2_COLORSPACE_SRGB,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_XBGR32,
-+		.align		    = 64,
-+		.bit_depth	    = 32,
-+		.plane_factor	    = { P3(1.0) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
-+		.colorspace_default = V4L2_COLORSPACE_SRGB,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_RGBX32,
-+		.align		    = 64,
-+		.bit_depth	    = 32,
-+		.plane_factor	    = { P3(1.0) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
-+		.colorspace_default = V4L2_COLORSPACE_SRGB,
-+	},
-+	/* Bayer formats - 8-bit */
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_SRGGB8,
-+		.bit_depth	    = 8,
-+		.align		    = 32,
-+		.plane_factor	    = { P3(1.0) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_SBGGR8,
-+		.bit_depth	    = 8,
-+		.align		    = 32,
-+		.plane_factor	    = { P3(1.0) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_SGRBG8,
-+		.bit_depth	    = 8,
-+		.align		    = 32,
-+		.plane_factor	    = { P3(1.0) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_SGBRG8,
-+		.bit_depth	    = 8,
-+		.align		    = 32,
-+		.plane_factor	    = { P3(1.0) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
-+	},
-+	/* Bayer formats - 16-bit */
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_SRGGB16,
-+		.bit_depth	    = 16,
-+		.align		    = 32,
-+		.plane_factor	    = { P3(1.0) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_SBGGR16,
-+		.bit_depth	    = 16,
-+		.align		    = 32,
-+		.plane_factor	    = { P3(1.0) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_SGRBG16,
-+		.bit_depth	    = 16,
-+		.align		    = 32,
-+		.plane_factor	    = { P3(1.0) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_SGBRG16,
-+		.bit_depth	    = 16,
-+		.align		    = 32,
-+		.plane_factor	    = { P3(1.0) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
-+	},
-+	{
-+		/* Bayer formats unpacked to 16bpp */
-+		/* 10 bit */
-+		.fourcc		    = V4L2_PIX_FMT_SRGGB10,
-+		.bit_depth	    = 16,
-+		.align		    = 32,
-+		.plane_factor	    = { P3(1.0) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_SBGGR10,
-+		.bit_depth	    = 16,
-+		.align		    = 32,
-+		.plane_factor	    = { P3(1.0) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_SGRBG10,
-+		.bit_depth	    = 16,
-+		.align		    = 32,
-+		.plane_factor	    = { P3(1.0) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_SGBRG10,
-+		.bit_depth	    = 16,
-+		.align		    = 32,
-+		.plane_factor	    = { P3(1.0) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
-+	},
-+	{
-+		/* 12 bit */
-+		.fourcc		    = V4L2_PIX_FMT_SRGGB12,
-+		.bit_depth	    = 16,
-+		.align		    = 32,
-+		.plane_factor	    = { P3(1.0) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_SBGGR12,
-+		.bit_depth	    = 16,
-+		.align		    = 32,
-+		.plane_factor	    = { P3(1.0) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_SGRBG12,
-+		.bit_depth	    = 16,
-+		.align		    = 32,
-+		.plane_factor	    = { P3(1.0) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_SGBRG12,
-+		.bit_depth	    = 16,
-+		.align		    = 32,
-+		.plane_factor	    = { P3(1.0) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
-+	},
-+	{
-+		/* 14 bit */
-+		.fourcc		    = V4L2_PIX_FMT_SRGGB14,
-+		.bit_depth	    = 16,
-+		.align		    = 32,
-+		.plane_factor	    = { P3(1.0) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_SBGGR14,
-+		.bit_depth	    = 16,
-+		.align		    = 32,
-+		.plane_factor	    = { P3(1.0) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_SGRBG14,
-+		.bit_depth	    = 16,
-+		.align		    = 32,
-+		.plane_factor	    = { P3(1.0) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_SGBRG14,
-+		.bit_depth	    = 16,
-+		.align		    = 32,
-+		.plane_factor	    = { P3(1.0) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
-+	},
-+	/* Bayer formats - 16-bit PiSP Compressed */
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_PISP_COMP1_BGGR,
-+		.bit_depth	    = 8,
-+		.align		    = 32,
-+		.plane_factor	    = { P3(1.0) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_PISP_COMP1_RGGB,
-+		.bit_depth	    = 8,
-+		.align		    = 32,
-+		.plane_factor	    = { P3(1.0) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_PISP_COMP1_GRBG,
-+		.bit_depth	    = 8,
-+		.align		    = 32,
-+		.plane_factor	    = { P3(1.0) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_PISP_COMP1_GBRG,
-+		.bit_depth	    = 8,
-+		.align		    = 32,
-+		.plane_factor	    = { P3(1.0) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
-+	},
-+};
-+
-+static const struct pisp_be_format meta_out_supported_formats[] = {
-+	/* Configuration buffer format. */
-+	{
-+		.fourcc		    = V4L2_META_FMT_RPI_BE_CFG,
-+	},
-+};
-+
-+#endif /* _PISP_BE_FORMATS_ */
---- a/drivers/media/v4l2-core/v4l2-ioctl.c
-+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
-@@ -1452,6 +1452,7 @@ static void v4l_fill_fmtdesc(struct v4l2
- 	case V4L2_PIX_FMT_NV12M_10BE_8L128:	descr = "10-bit NV12M (8x128 Linear, BE)"; break;
- 	case V4L2_META_FMT_SENSOR_DATA:	descr = "Sensor Ancillary Metadata"; break;
- 	case V4L2_META_FMT_BCM2835_ISP_STATS: descr = "BCM2835 ISP Image Statistics"; break;
-+	case V4L2_META_FMT_RPI_BE_CFG: descr = "PiSP Config format"; break;
- 
- 	default:
- 		/* Compressed formats */
-@@ -1503,6 +1504,7 @@ static void v4l_fill_fmtdesc(struct v4l2
- 		case V4L2_PIX_FMT_MT21C:	descr = "Mediatek Compressed Format"; break;
- 		case V4L2_PIX_FMT_QC08C:	descr = "QCOM Compressed 8-bit Format"; break;
- 		case V4L2_PIX_FMT_QC10C:	descr = "QCOM Compressed 10-bit Format"; break;
-+		case V4L2_PIX_FMT_RPI_BE: descr = "PiSP Opaque Format"; break;
- 		default:
- 			if (fmt->description[0])
- 				return;
---- /dev/null
-+++ b/include/media/raspberrypi/pisp_common.h
-@@ -0,0 +1,65 @@
-+/* SPDX-License-Identifier: GPL-2.0-only */
-+/*
-+ * Raspberry Pi PiSP common configuration definitions.
-+ *
-+ * Copyright (C) 2021 - Raspberry Pi (Trading) Ltd.
-+ *
-+ */
-+#ifndef _PISP_COMMON_H_
-+#define _PISP_COMMON_H_
-+
-+#include <linux/types.h>
-+
-+#include "pisp_types.h"
-+
-+struct pisp_bla_config {
-+	uint16_t black_level_r;
-+	uint16_t black_level_gr;
-+	uint16_t black_level_gb;
-+	uint16_t black_level_b;
-+	uint16_t output_black_level;
-+	uint8_t pad[2];
-+};
-+
-+struct pisp_wbg_config {
-+	uint16_t gain_r;
-+	uint16_t gain_g;
-+	uint16_t gain_b;
-+	uint8_t pad[2];
-+};
-+
-+struct pisp_compress_config {
-+	/* value subtracted from incoming data */
-+	uint16_t offset;
-+	uint8_t pad;
-+	/* 1 => Companding; 2 => Delta (recommended); 3 => Combined (for HDR) */
-+	uint8_t mode;
-+};
-+
-+struct pisp_decompress_config {
-+	/* value added to reconstructed data */
-+	uint16_t offset;
-+	uint8_t pad;
-+	/* 1 => Companding; 2 => Delta (recommended); 3 => Combined (for HDR) */
-+	uint8_t mode;
-+};
-+
-+enum pisp_axi_flags {
-+	/* round down bursts to end at a 32-byte boundary, to align following bursts */
-+	PISP_AXI_FLAG_ALIGN = 128,
-+	 /* for FE writer: force WSTRB high, to pad output to 16-byte boundary */
-+	PISP_AXI_FLAG_PAD = 64,
-+	/* for FE writer: Use Output FIFO level to trigger "panic" */
-+	PISP_AXI_FLAG_PANIC = 32
-+};
-+
-+struct pisp_axi_config {
-+	/* burst length minus one, which must be in the range 0:15; OR'd with flags */
-+	uint8_t maxlen_flags;
-+	/* { prot[2:0], cache[3:0] } fields, echoed on AXI bus */
-+	uint8_t cache_prot;
-+	/* QoS field(s) (4x4 bits for FE writer; 4 bits for other masters) */
-+	uint16_t qos;
-+};
-+
-+#endif /* _PISP_COMMON_H_ */
---- /dev/null
-+++ b/include/media/raspberrypi/pisp_types.h
-@@ -0,0 +1,144 @@
-+/* SPDX-License-Identifier: GPL-2.0-only */
-+/*
-+ * Raspberry Pi PiSP common types.
-+ *
-+ * Copyright (C) 2021 - Raspberry Pi (Trading) Ltd.
-+ *
-+ */
-+#ifndef _PISP_TYPES_H_
-+#define _PISP_TYPES_H_
-+
-+/* This definition must match the format description in the hardware exactly! */
-+struct pisp_image_format_config {
-+	/* size in pixels */
-+	uint16_t width, height;
-+	/* must match struct pisp_image_format below */
-+	uint32_t format;
-+	int32_t stride;
-+	/* some planar image formats will need a second stride */
-+	int32_t stride2;
-+};
-+
-+static_assert(sizeof(struct pisp_image_format_config) == 16);
-+
-+enum pisp_bayer_order {
-+	/*
-+	 * Note how bayer_order&1 tells you if G is on the even pixels of the
-+	 * checkerboard or not, and bayer_order&2 tells you if R is on the even
-+	 * rows or is swapped with B. Note that if the top (of the 8) bits is
-+	 * set, this denotes a monochrome or greyscale image, and the lower bits
-+	 * should all be ignored.
-+	 */
-+	PISP_BAYER_ORDER_RGGB = 0,
-+	PISP_BAYER_ORDER_GBRG = 1,
-+	PISP_BAYER_ORDER_BGGR = 2,
-+	PISP_BAYER_ORDER_GRBG = 3,
-+	PISP_BAYER_ORDER_GREYSCALE = 128
-+};
-+
-+enum pisp_image_format {
-+	/*
-+	 * Precise values are mostly tbd. Generally these will be portmanteau
-+	 * values comprising bit fields and flags. This format must be shared
-+	 * throughout the PiSP.
-+	 */
-+	PISP_IMAGE_FORMAT_BPS_8 = 0x00000000,
-+	PISP_IMAGE_FORMAT_BPS_10 = 0x00000001,
-+	PISP_IMAGE_FORMAT_BPS_12 = 0x00000002,
-+	PISP_IMAGE_FORMAT_BPS_16 = 0x00000003,
-+	PISP_IMAGE_FORMAT_BPS_MASK = 0x00000003,
-+
-+	PISP_IMAGE_FORMAT_PLANARITY_INTERLEAVED = 0x00000000,
-+	PISP_IMAGE_FORMAT_PLANARITY_SEMI_PLANAR = 0x00000010,
-+	PISP_IMAGE_FORMAT_PLANARITY_PLANAR = 0x00000020,
-+	PISP_IMAGE_FORMAT_PLANARITY_MASK = 0x00000030,
-+
-+	PISP_IMAGE_FORMAT_SAMPLING_444 = 0x00000000,
-+	PISP_IMAGE_FORMAT_SAMPLING_422 = 0x00000100,
-+	PISP_IMAGE_FORMAT_SAMPLING_420 = 0x00000200,
-+	PISP_IMAGE_FORMAT_SAMPLING_MASK = 0x00000300,
-+
-+	PISP_IMAGE_FORMAT_ORDER_NORMAL = 0x00000000,
-+	PISP_IMAGE_FORMAT_ORDER_SWAPPED = 0x00001000,
-+
-+	PISP_IMAGE_FORMAT_SHIFT_0 = 0x00000000,
-+	PISP_IMAGE_FORMAT_SHIFT_1 = 0x00010000,
-+	PISP_IMAGE_FORMAT_SHIFT_2 = 0x00020000,
-+	PISP_IMAGE_FORMAT_SHIFT_3 = 0x00030000,
-+	PISP_IMAGE_FORMAT_SHIFT_4 = 0x00040000,
-+	PISP_IMAGE_FORMAT_SHIFT_5 = 0x00050000,
-+	PISP_IMAGE_FORMAT_SHIFT_6 = 0x00060000,
-+	PISP_IMAGE_FORMAT_SHIFT_7 = 0x00070000,
-+	PISP_IMAGE_FORMAT_SHIFT_8 = 0x00080000,
-+	PISP_IMAGE_FORMAT_SHIFT_MASK = 0x000f0000,
-+
-+	PISP_IMAGE_FORMAT_UNCOMPRESSED = 0x00000000,
-+	PISP_IMAGE_FORMAT_COMPRESSION_MODE_1 = 0x01000000,
-+	PISP_IMAGE_FORMAT_COMPRESSION_MODE_2 = 0x02000000,
-+	PISP_IMAGE_FORMAT_COMPRESSION_MODE_3 = 0x03000000,
-+	PISP_IMAGE_FORMAT_COMPRESSION_MASK = 0x03000000,
-+
-+	PISP_IMAGE_FORMAT_HOG_SIGNED = 0x04000000,
-+	PISP_IMAGE_FORMAT_HOG_UNSIGNED = 0x08000000,
-+	PISP_IMAGE_FORMAT_INTEGRAL_IMAGE = 0x10000000,
-+	PISP_IMAGE_FORMAT_WALLPAPER_ROLL = 0x20000000,
-+	PISP_IMAGE_FORMAT_THREE_CHANNEL = 0x40000000,
-+
-+	/* Lastly a few specific instantiations of the above. */
-+	PISP_IMAGE_FORMAT_SINGLE_16 = PISP_IMAGE_FORMAT_BPS_16,
-+	PISP_IMAGE_FORMAT_THREE_16 =
-+		PISP_IMAGE_FORMAT_BPS_16 | PISP_IMAGE_FORMAT_THREE_CHANNEL
-+};
-+
-+#define PISP_IMAGE_FORMAT_bps_8(fmt)                                           \
-+	(((fmt)&PISP_IMAGE_FORMAT_BPS_MASK) == PISP_IMAGE_FORMAT_BPS_8)
-+#define PISP_IMAGE_FORMAT_bps_10(fmt)                                          \
-+	(((fmt)&PISP_IMAGE_FORMAT_BPS_MASK) == PISP_IMAGE_FORMAT_BPS_10)
-+#define PISP_IMAGE_FORMAT_bps_12(fmt)                                          \
-+	(((fmt)&PISP_IMAGE_FORMAT_BPS_MASK) == PISP_IMAGE_FORMAT_BPS_12)
-+#define PISP_IMAGE_FORMAT_bps_16(fmt)                                          \
-+	(((fmt)&PISP_IMAGE_FORMAT_BPS_MASK) == PISP_IMAGE_FORMAT_BPS_16)
-+#define PISP_IMAGE_FORMAT_bps(fmt)                                             \
-+	(((fmt)&PISP_IMAGE_FORMAT_BPS_MASK) ?                                  \
-+		       8 + (2 << (((fmt)&PISP_IMAGE_FORMAT_BPS_MASK) - 1)) :   \
-+		       8)
-+#define PISP_IMAGE_FORMAT_shift(fmt)                                           \
-+	(((fmt)&PISP_IMAGE_FORMAT_SHIFT_MASK) / PISP_IMAGE_FORMAT_SHIFT_1)
-+#define PISP_IMAGE_FORMAT_three_channel(fmt)                                   \
-+	((fmt)&PISP_IMAGE_FORMAT_THREE_CHANNEL)
-+#define PISP_IMAGE_FORMAT_single_channel(fmt)                                  \
-+	(!((fmt)&PISP_IMAGE_FORMAT_THREE_CHANNEL))
-+#define PISP_IMAGE_FORMAT_compressed(fmt)                                      \
-+	(((fmt)&PISP_IMAGE_FORMAT_COMPRESSION_MASK) !=                         \
-+	 PISP_IMAGE_FORMAT_UNCOMPRESSED)
-+#define PISP_IMAGE_FORMAT_sampling_444(fmt)                                    \
-+	(((fmt)&PISP_IMAGE_FORMAT_SAMPLING_MASK) ==                            \
-+	 PISP_IMAGE_FORMAT_SAMPLING_444)
-+#define PISP_IMAGE_FORMAT_sampling_422(fmt)                                    \
-+	(((fmt)&PISP_IMAGE_FORMAT_SAMPLING_MASK) ==                            \
-+	 PISP_IMAGE_FORMAT_SAMPLING_422)
-+#define PISP_IMAGE_FORMAT_sampling_420(fmt)                                    \
-+	(((fmt)&PISP_IMAGE_FORMAT_SAMPLING_MASK) ==                            \
-+	 PISP_IMAGE_FORMAT_SAMPLING_420)
-+#define PISP_IMAGE_FORMAT_order_normal(fmt)                                    \
-+	(!((fmt)&PISP_IMAGE_FORMAT_ORDER_SWAPPED))
-+#define PISP_IMAGE_FORMAT_order_swapped(fmt)                                   \
-+	((fmt)&PISP_IMAGE_FORMAT_ORDER_SWAPPED)
-+#define PISP_IMAGE_FORMAT_interleaved(fmt)                                     \
-+	(((fmt)&PISP_IMAGE_FORMAT_PLANARITY_MASK) ==                           \
-+	 PISP_IMAGE_FORMAT_PLANARITY_INTERLEAVED)
-+#define PISP_IMAGE_FORMAT_semiplanar(fmt)                                      \
-+	(((fmt)&PISP_IMAGE_FORMAT_PLANARITY_MASK) ==                           \
-+	 PISP_IMAGE_FORMAT_PLANARITY_SEMI_PLANAR)
-+#define PISP_IMAGE_FORMAT_planar(fmt)                                          \
-+	(((fmt)&PISP_IMAGE_FORMAT_PLANARITY_MASK) ==                           \
-+	 PISP_IMAGE_FORMAT_PLANARITY_PLANAR)
-+#define PISP_IMAGE_FORMAT_wallpaper(fmt)                                       \
-+	((fmt)&PISP_IMAGE_FORMAT_WALLPAPER_ROLL)
-+#define PISP_IMAGE_FORMAT_HOG(fmt)                                             \
-+	((fmt) &                                                               \
-+	 (PISP_IMAGE_FORMAT_HOG_SIGNED | PISP_IMAGE_FORMAT_HOG_UNSIGNED))
-+
-+#define PISP_WALLPAPER_WIDTH 128 // in bytes
-+
-+#endif /* _PISP_TYPES_H_ */
---- a/include/uapi/linux/videodev2.h
-+++ b/include/uapi/linux/videodev2.h
-@@ -793,6 +793,9 @@ struct v4l2_pix_format {
- #define V4L2_PIX_FMT_IPU3_SGRBG10	v4l2_fourcc('i', 'p', '3', 'G') /* IPU3 packed 10-bit GRBG bayer */
- #define V4L2_PIX_FMT_IPU3_SRGGB10	v4l2_fourcc('i', 'p', '3', 'r') /* IPU3 packed 10-bit RGGB bayer */
- 
-+/* The pixel format for all our buffers (the precise format is found in the config buffer). */
-+#define V4L2_PIX_FMT_RPI_BE v4l2_fourcc('R', 'P', 'B', 'P')
-+
- /* SDR formats - used only for Software Defined Radio devices */
- #define V4L2_SDR_FMT_CU8          v4l2_fourcc('C', 'U', '0', '8') /* IQ u8 */
- #define V4L2_SDR_FMT_CU16LE       v4l2_fourcc('C', 'U', '1', '6') /* IQ u16le */
-@@ -822,6 +825,9 @@ struct v4l2_pix_format {
- #define V4L2_META_FMT_RK_ISP1_PARAMS	v4l2_fourcc('R', 'K', '1', 'P') /* Rockchip ISP1 3A Parameters */
- #define V4L2_META_FMT_RK_ISP1_STAT_3A	v4l2_fourcc('R', 'K', '1', 'S') /* Rockchip ISP1 3A Statistics */
- 
-+/* The metadata format identifier for our configuration buffers. */
-+#define V4L2_META_FMT_RPI_BE_CFG v4l2_fourcc('R', 'P', 'B', 'C')
-+
- /* priv field value to indicates that subsequent fields are valid. */
- #define V4L2_PIX_FMT_PRIV_MAGIC		0xfeedcafe
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0862-irqchip-irq-bcm2712-mip-Support-for-2712-s-MIP.patch b/target/linux/bcm27xx/patches-6.1/950-0862-irqchip-irq-bcm2712-mip-Support-for-2712-s-MIP.patch
deleted file mode 100644
index 022a94af1c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0862-irqchip-irq-bcm2712-mip-Support-for-2712-s-MIP.patch
+++ /dev/null
@@ -1,386 +0,0 @@
-From 89b748416358e4e04765b9a4f20e1c3d256b9d9e Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 28 Jul 2021 11:13:39 +0100
-Subject: [PATCH] irqchip: irq-bcm2712-mip: Support for 2712's MIP
-
-irqchip: irq-bcm2712-mip: specify bitmap search size as ilog2(N) not N
-
-Freeing also has the same interface.
-
-irqchip: irq-bcm2712-mip: Fix build warnings
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-irqchip: bcm2712-mip: add a quick hack to optionally shift MSI vectors
-
-There are two MIP peripherals in bcm2712, the first gets a first-class
-treatment where 64 consecutive GIC SPIs are assigned to all 64 output
-vectors. The second gets an agglomeration of 17 GIC SPIs, but only 8 of
-these are consecutive starting at the 8th output vector.
-
-For now, allow the use of this smaller contiguous range within a larger
-whole.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- drivers/irqchip/Kconfig           |   8 +
- drivers/irqchip/Makefile          |   1 +
- drivers/irqchip/irq-bcm2712-mip.c | 325 ++++++++++++++++++++++++++++++
- 3 files changed, 334 insertions(+)
- create mode 100644 drivers/irqchip/irq-bcm2712-mip.c
-
---- a/drivers/irqchip/Kconfig
-+++ b/drivers/irqchip/Kconfig
-@@ -109,6 +109,14 @@ config I8259
- 	bool
- 	select IRQ_DOMAIN
- 
-+config BCM2712_MIP
-+	bool "Broadcom 2712 MSI-X Interrupt Peripheral support"
-+	depends on ARM_GIC
-+	select GENERIC_IRQ_CHIP
-+	select IRQ_DOMAIN
-+	help
-+	  Enable support for the Broadcom BCM2712 MSI-X target peripheral.
-+
- config BCM6345_L1_IRQ
- 	bool
- 	select GENERIC_IRQ_CHIP
---- a/drivers/irqchip/Makefile
-+++ b/drivers/irqchip/Makefile
-@@ -63,6 +63,7 @@ obj-$(CONFIG_XTENSA_MX)			+= irq-xtensa-
- obj-$(CONFIG_XILINX_INTC)		+= irq-xilinx-intc.o
- obj-$(CONFIG_IRQ_CROSSBAR)		+= irq-crossbar.o
- obj-$(CONFIG_SOC_VF610)			+= irq-vf610-mscm-ir.o
-+obj-$(CONFIG_BCM2712_MIP)		+= irq-bcm2712-mip.o
- obj-$(CONFIG_BCM6345_L1_IRQ)		+= irq-bcm6345-l1.o
- obj-$(CONFIG_BCM7038_L1_IRQ)		+= irq-bcm7038-l1.o
- obj-$(CONFIG_BCM7120_L2_IRQ)		+= irq-bcm7120-l2.o
---- /dev/null
-+++ b/drivers/irqchip/irq-bcm2712-mip.c
-@@ -0,0 +1,325 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+/*
-+ * Copyright (C) 2021 Raspberry Pi Ltd., All Rights Reserved.
-+ */
-+
-+#include <linux/pci.h>
-+#include <linux/msi.h>
-+#include <linux/of.h>
-+#include <linux/of_address.h>
-+#include <linux/of_irq.h>
-+#include <linux/of_pci.h>
-+
-+#include <linux/irqchip.h>
-+
-+#define MIP_INT_RAISED		0x00
-+#define MIP_INT_CLEARED		0x10
-+#define MIP_INT_CFGL_HOST	0x20
-+#define MIP_INT_CFGH_HOST	0x30
-+#define MIP_INT_MASKL_HOST	0x40
-+#define MIP_INT_MASKH_HOST	0x50
-+#define MIP_INT_MASKL_VPU	0x60
-+#define MIP_INT_MASKH_VPU	0x70
-+#define MIP_INT_STATUSL_HOST	0x80
-+#define MIP_INT_STATUSH_HOST	0x90
-+#define MIP_INT_STATUSL_VPU	0xa0
-+#define MIP_INT_STATUSH_VPU	0xb0
-+
-+struct mip_priv {
-+	spinlock_t msi_map_lock;
-+	spinlock_t hw_lock;
-+	void * __iomem base;
-+	phys_addr_t msg_addr;
-+	u32 msi_base;		/* The SGI number that MSIs start */
-+	u32 num_msis;		/* The number of SGIs for MSIs */
-+	u32 msi_offset;		/* Shift the allocated msi up by N */
-+	unsigned long *msi_map;
-+};
-+
-+static void mip_mask_msi_irq(struct irq_data *d)
-+{
-+	pci_msi_mask_irq(d);
-+	irq_chip_mask_parent(d);
-+}
-+
-+static void mip_unmask_msi_irq(struct irq_data *d)
-+{
-+	pci_msi_unmask_irq(d);
-+	irq_chip_unmask_parent(d);
-+}
-+
-+static void mip_compose_msi_msg(struct irq_data *d, struct msi_msg *msg)
-+{
-+	struct mip_priv *priv = irq_data_get_irq_chip_data(d);
-+
-+	msg->address_hi = upper_32_bits(priv->msg_addr);
-+	msg->address_lo = lower_32_bits(priv->msg_addr);
-+	msg->data = d->hwirq;
-+}
-+
-+// The "bus-specific" irq_chip (the MIP doesn't _have_ to be used with PCIe)
-+
-+static struct irq_chip mip_msi_irq_chip = {
-+	.name			= "MIP-MSI",
-+	.irq_unmask		= mip_unmask_msi_irq,
-+	.irq_mask		= mip_mask_msi_irq,
-+	.irq_eoi		= irq_chip_eoi_parent,
-+	.irq_set_affinity	= irq_chip_set_affinity_parent,
-+};
-+
-+static struct msi_domain_info mip_msi_domain_info = {
-+	.flags	= (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS |
-+		   MSI_FLAG_PCI_MSIX),
-+	.chip	= &mip_msi_irq_chip,
-+};
-+
-+// The "middle" irq_chip (the hardware control part)
-+
-+static struct irq_chip mip_irq_chip = {
-+	.name			= "MIP",
-+	.irq_mask		= irq_chip_mask_parent,
-+	.irq_unmask		= irq_chip_unmask_parent,
-+	.irq_eoi		= irq_chip_eoi_parent,
-+	.irq_set_affinity	= irq_chip_set_affinity_parent,
-+	.irq_set_type		= irq_chip_set_type_parent,
-+	.irq_compose_msi_msg	= mip_compose_msi_msg,
-+};
-+
-+
-+// And a domain to connect it to its parent (the GIC)
-+
-+static int mip_irq_domain_alloc(struct irq_domain *domain,
-+				unsigned int virq, unsigned int nr_irqs,
-+				void *args)
-+{
-+	struct mip_priv *priv = domain->host_data;
-+	struct irq_fwspec fwspec;
-+	struct irq_data *irqd;
-+	int hwirq, ret, i;
-+
-+	spin_lock(&priv->msi_map_lock);
-+
-+	hwirq = bitmap_find_free_region(priv->msi_map, priv->num_msis, ilog2(nr_irqs));
-+
-+	spin_unlock(&priv->msi_map_lock);
-+
-+	if (hwirq < 0)
-+		return -ENOSPC;
-+
-+	hwirq += priv->msi_offset;
-+	fwspec.fwnode = domain->parent->fwnode;
-+	fwspec.param_count = 3;
-+	fwspec.param[0] = 0;
-+	fwspec.param[1] = hwirq + priv->msi_base;
-+	fwspec.param[2] = IRQ_TYPE_EDGE_RISING;
-+
-+	ret = irq_domain_alloc_irqs_parent(domain, virq, nr_irqs, &fwspec);
-+	if (ret)
-+	    return ret;
-+
-+	for (i = 0; i < nr_irqs; i++) {
-+		irqd = irq_domain_get_irq_data(domain->parent, virq + i);
-+		irqd->chip->irq_set_type(irqd, IRQ_TYPE_EDGE_RISING);
-+
-+		irq_domain_set_hwirq_and_chip(domain, virq + i, hwirq + i,
-+					      &mip_irq_chip, priv);
-+		irqd = irq_get_irq_data(virq + i);
-+		irqd_set_single_target(irqd);
-+		irqd_set_affinity_on_activate(irqd);
-+	}
-+
-+	return 0;
-+}
-+
-+static void mip_irq_domain_free(struct irq_domain *domain,
-+				unsigned int virq, unsigned int nr_irqs)
-+{
-+	struct irq_data *d = irq_domain_get_irq_data(domain, virq);
-+	struct mip_priv *priv = irq_data_get_irq_chip_data(d);
-+
-+	irq_domain_free_irqs_parent(domain, virq, nr_irqs);
-+	d->hwirq -= priv->msi_offset;
-+
-+	spin_lock(&priv->msi_map_lock);
-+
-+	bitmap_release_region(priv->msi_map, d->hwirq, ilog2(nr_irqs));
-+
-+	spin_unlock(&priv->msi_map_lock);
-+}
-+
-+#if 0
-+static int mip_irq_domain_activate(struct irq_domain *domain,
-+				   struct irq_data *d, bool reserve)
-+{
-+	struct mip_priv *priv = irq_data_get_irq_chip_data(d);
-+	unsigned long flags;
-+	unsigned int irq = d->hwirq;
-+	void *__iomem reg = priv->base +
-+		((irq < 32) ? MIP_INT_MASKL_HOST : MIP_INT_MASKH_HOST);
-+	u32 val;
-+
-+	spin_lock_irqsave(&priv->hw_lock, flags);
-+	val = readl(reg);
-+	val &= ~(1 << (irq % 32)); // Clear the mask
-+	writel(val, reg);
-+	spin_unlock_irqrestore(&priv->hw_lock, flags);
-+	return 0;
-+}
-+
-+static void mip_irq_domain_deactivate(struct irq_domain *domain,
-+				      struct irq_data *d)
-+{
-+	struct mip_priv *priv = irq_data_get_irq_chip_data(d);
-+	unsigned long flags;
-+	unsigned int irq = d->hwirq - priv->msi_base;
-+	void *__iomem reg = priv->base +
-+		((irq < 32) ? MIP_INT_MASKL_HOST : MIP_INT_MASKH_HOST);
-+	u32 val;
-+
-+	spin_lock_irqsave(&priv->hw_lock, flags);
-+	val = readl(reg);
-+	val |= (1 << (irq % 32)); // Mask it out
-+	writel(val, reg);
-+	spin_unlock_irqrestore(&priv->hw_lock, flags);
-+}
-+#endif
-+
-+static const struct irq_domain_ops mip_irq_domain_ops = {
-+	.alloc		= mip_irq_domain_alloc,
-+	.free		= mip_irq_domain_free,
-+	//.activate	= mip_irq_domain_activate,
-+	//.deactivate	= mip_irq_domain_deactivate,
-+};
-+
-+static int mip_init_domains(struct mip_priv *priv,
-+			    struct device_node *node)
-+{
-+	struct irq_domain *middle_domain, *msi_domain, *gic_domain;
-+	struct device_node *gic_node;
-+
-+	gic_node = of_irq_find_parent(node);
-+	if (!gic_node) {
-+		pr_err("Failed to find the GIC node\n");
-+		return -ENODEV;
-+	}
-+
-+	gic_domain = irq_find_host(gic_node);
-+	if (!gic_domain) {
-+		pr_err("Failed to find the GIC domain\n");
-+		return -ENXIO;
-+	}
-+
-+	middle_domain = irq_domain_add_tree(NULL,
-+					    &mip_irq_domain_ops,
-+					    priv);
-+	if (!middle_domain) {
-+		pr_err("Failed to create the MIP middle domain\n");
-+		return -ENOMEM;
-+	}
-+
-+	middle_domain->parent = gic_domain;
-+
-+	msi_domain = pci_msi_create_irq_domain(of_node_to_fwnode(node),
-+					       &mip_msi_domain_info,
-+					       middle_domain);
-+	if (!msi_domain) {
-+		pr_err("Failed to create MSI domain\n");
-+		irq_domain_remove(middle_domain);
-+		return -ENOMEM;
-+	}
-+
-+	return 0;
-+}
-+
-+static int __init mip_of_msi_init(struct device_node *node,
-+				  struct device_node *parent)
-+{
-+	struct mip_priv *priv;
-+	struct resource res;
-+	int ret;
-+
-+	priv = kzalloc(sizeof(*priv), GFP_KERNEL);
-+	if (!priv)
-+		return -ENOMEM;
-+
-+	spin_lock_init(&priv->msi_map_lock);
-+	spin_lock_init(&priv->hw_lock);
-+
-+	ret = of_address_to_resource(node, 0, &res);
-+	if (ret) {
-+		pr_err("Failed to allocate resource\n");
-+		goto err_priv;
-+	}
-+
-+	if (of_property_read_u32(node, "brcm,msi-base-spi", &priv->msi_base)) {
-+		pr_err("Unable to parse MSI base\n");
-+		ret = -EINVAL;
-+		goto err_priv;
-+	}
-+
-+	if (of_property_read_u32(node, "brcm,msi-num-spis", &priv->num_msis)) {
-+		pr_err("Unable to parse MSI numbers\n");
-+		ret = -EINVAL;
-+		goto err_priv;
-+	}
-+
-+	if (of_property_read_u32(node, "brcm,msi-offset", &priv->msi_offset))
-+		priv->msi_offset = 0;
-+
-+	if (of_property_read_u64(node, "brcm,msi-pci-addr", &priv->msg_addr)) {
-+		pr_err("Unable to parse MSI address\n");
-+		ret = -EINVAL;
-+		goto err_priv;
-+	}
-+
-+	priv->base = ioremap(res.start, resource_size(&res));
-+	if (!priv->base) {
-+		pr_err("Failed to ioremap regs\n");
-+		ret = -ENOMEM;
-+		goto err_priv;
-+	}
-+
-+	priv->msi_map = kcalloc(BITS_TO_LONGS(priv->num_msis),
-+				sizeof(*priv->msi_map),
-+				GFP_KERNEL);
-+	if (!priv->msi_map) {
-+		ret = -ENOMEM;
-+		goto err_base;
-+	}
-+
-+	pr_debug("Registering %d msixs, starting at %d\n",
-+		 priv->num_msis, priv->msi_base);
-+
-+	/*
-+	 * Begin with all MSI-Xs masked in for the host, masked out for the
-+	 * VPU, and edge-triggered.
-+	 */
-+	writel(0, priv->base + MIP_INT_MASKL_HOST);
-+	writel(0, priv->base + MIP_INT_MASKH_HOST);
-+	writel(~0, priv->base + MIP_INT_MASKL_VPU);
-+	writel(~0, priv->base + MIP_INT_MASKH_VPU);
-+	writel(~0, priv->base + MIP_INT_CFGL_HOST);
-+	writel(~0, priv->base + MIP_INT_CFGH_HOST);
-+
-+	ret = mip_init_domains(priv, node);
-+	if (ret) {
-+		pr_err("Failed to allocate msi_map\n");
-+		goto err_map;
-+	}
-+
-+	return 0;
-+
-+err_map:
-+	kfree(priv->msi_map);
-+
-+err_base:
-+	iounmap(priv->base);
-+
-+err_priv:
-+	kfree(priv);
-+
-+	pr_err("%s: failed - err %d\n", __func__, ret);
-+
-+	return ret;
-+}
-+IRQCHIP_DECLARE(bcm_mip, "brcm,bcm2712-mip-intc", mip_of_msi_init);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0863-reset-reset-brcmstb-rescal-Support-shared-use.patch b/target/linux/bcm27xx/patches-6.1/950-0863-reset-reset-brcmstb-rescal-Support-shared-use.patch
deleted file mode 100644
index a4328e5bc7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0863-reset-reset-brcmstb-rescal-Support-shared-use.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 87b1126181f79fb2558652af0d7fafd9deaab5f3 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 7 Sep 2021 14:49:00 +0100
-Subject: [PATCH] reset: reset-brcmstb-rescal: Support shared use
-
-reset_control_reset should not be used with shared reset controllers.
-Add support for reset_control_assert and _deassert to get the desired
-behaviour and avoid ugly warnings in the kernel log.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/reset/reset-brcmstb-rescal.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/drivers/reset/reset-brcmstb-rescal.c
-+++ b/drivers/reset/reset-brcmstb-rescal.c
-@@ -20,6 +20,7 @@ struct brcm_rescal_reset {
- 	struct reset_controller_dev rcdev;
- };
- 
-+/* Also doubles a deassert */
- static int brcm_rescal_reset_set(struct reset_controller_dev *rcdev,
- 				 unsigned long id)
- {
-@@ -52,6 +53,13 @@ static int brcm_rescal_reset_set(struct
- 	return 0;
- }
- 
-+/* A dummy function - deassert/reset does all the work */
-+static int brcm_rescal_reset_assert(struct reset_controller_dev *rcdev,
-+				    unsigned long id)
-+{
-+	return 0;
-+}
-+
- static int brcm_rescal_reset_xlate(struct reset_controller_dev *rcdev,
- 				   const struct of_phandle_args *reset_spec)
- {
-@@ -61,6 +69,8 @@ static int brcm_rescal_reset_xlate(struc
- 
- static const struct reset_control_ops brcm_rescal_reset_ops = {
- 	.reset = brcm_rescal_reset_set,
-+	.deassert = brcm_rescal_reset_set,
-+	.assert = brcm_rescal_reset_assert,
- };
- 
- static int brcm_rescal_reset_probe(struct platform_device *pdev)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0864-net-macb-Also-set-DMA-coherent-mask.patch b/target/linux/bcm27xx/patches-6.1/950-0864-net-macb-Also-set-DMA-coherent-mask.patch
deleted file mode 100644
index 7c8c49a3b5..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0864-net-macb-Also-set-DMA-coherent-mask.patch
+++ /dev/null
@@ -1,418 +0,0 @@
-From bd36586dd9e05bde8e23dc3d99771269b48b65f8 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Fri, 10 Sep 2021 17:20:45 +0100
-Subject: [PATCH] net: macb: Also set DMA coherent mask
-
-macb: Add device tree properties that allow configuration of the AXI max pipeline register
-
-net: macb: add support for ethtool interrupt moderation configuration
-
-Only global throttling of rx or tx by time quanta is supported.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
-
-macb: add platform device shutdown function. Prevents AXI master over PCIE from hanging when the host is rebooted.
-
-net: macb: increase polling interval for MDIO completion
-
-MDIO is a slow bus (single-digit MHz). Polling at 1us intervals
-is a bit aggressive, so increase to 100us as the transaction
-usually takes 100-200us to complete.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
-
-net: macb: Several patches for RP1
-
-64-bit RX fix
-
-Also set DMA coherent mask
-
-Add device tree properties that allow configuration of the AXI max
-pipeline register
-
-Add support for ethtool interrupt moderation configuration
-
-Only global throttling of rx or tx by time quanta is supported.
-
-Add platform device shutdown function. Prevents AXI master over PCIE
-from hanging when the host is rebooted.
-
-Increase polling interval for MDIO completion
-
-MDIO is a slow bus (single-digit MHz). Polling at 1us intervals
-is a bit aggressive, so increase to 100us as the transaction
-usually takes 100-200us to complete.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
-
-net: macb: Support the phy-reset-gpios property
-
-Allow a PHY to be reset with an optional GPIO. The reset duration can
-be specified in milliseconds - the default is 10ms.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-drivers: net: macb: close device on driver shutdown
-
-Fix some suspicious locking and instead call into macb_close, which
-deregisters and frees all resources the corresponding macb_open
-claimed.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
-
-net: macb: add hack to prevent TX stalls in a quiet system
-
-See https://github.com/raspberrypi/linux-2712/issues/89
-
-There is some critical window during TX where a further write to the
-TSTART bit while TX is active does not cause newly queued TX descriptors
-to be consumed.
-
-For now "wait a bit, then try anyway" seems to work.
-
-Requires further investigation, but this unsticks NFS reliably.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
-
-net: macb: set default interrupt moderation for GEM hardware
-
-Defaulting to intmod = 0 is antisocial, as the MAC can generate over
-130,000 interrupts per second. 50us is a sensible default.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- drivers/net/ethernet/cadence/macb.h      |  25 ++++
- drivers/net/ethernet/cadence/macb_main.c | 151 ++++++++++++++++++++++-
- 2 files changed, 174 insertions(+), 2 deletions(-)
-
---- a/drivers/net/ethernet/cadence/macb.h
-+++ b/drivers/net/ethernet/cadence/macb.h
-@@ -84,6 +84,8 @@
- #define GEM_DMACFG		0x0010 /* DMA Configuration */
- #define GEM_JML			0x0048 /* Jumbo Max Length */
- #define GEM_HS_MAC_CONFIG	0x0050 /* GEM high speed config */
-+#define GEM_AMP			0x0054 /* AXI Max Pipeline */
-+#define GEM_INTMOD		0x005c /* Interrupt moderation */
- #define GEM_HRB			0x0080 /* Hash Bottom */
- #define GEM_HRT			0x0084 /* Hash Top */
- #define GEM_SA1B		0x0088 /* Specific1 Bottom */
-@@ -346,6 +348,21 @@
- #define GEM_ADDR64_OFFSET	30 /* Address bus width - 64b or 32b */
- #define GEM_ADDR64_SIZE		1
- 
-+/* Bitfields in AMP */
-+#define GEM_AR2R_MAX_PIPE_OFFSET	0  /* Maximum number of outstanding AXI read requests */
-+#define GEM_AR2R_MAX_PIPE_SIZE		8
-+#define GEM_AW2W_MAX_PIPE_OFFSET	8  /* Maximum number of outstanding AXI write requests */
-+#define GEM_AW2W_MAX_PIPE_SIZE		8
-+#define GEM_AW2B_FILL_OFFSET		16 /* Select wether the max AW2W transactions operates between: */
-+#define GEM_AW2B_FILL_AW2W		0  /*   0: the AW to W AXI channel */
-+#define GEM_AW2B_FILL_AW2B		1  /*   1: AW to B channel */
-+#define GEM_AW2B_FILL_SIZE              1
-+
-+/* Bitfields in INTMOD */
-+#define GEM_RX_MODERATION_OFFSET	0  /* RX interrupt moderation */
-+#define GEM_RX_MODERATION_SIZE		8
-+#define GEM_TX_MODERATION_OFFSET	16 /* TX interrupt moderation */
-+#define GEM_TX_MODERATION_SIZE		8
- 
- /* Bitfields in NSR */
- #define MACB_NSR_LINK_OFFSET	0 /* pcs_link_state */
-@@ -798,6 +815,7 @@
- 	})
- 
- #define MACB_READ_NSR(bp)	macb_readl(bp, NSR)
-+#define MACB_READ_TSR(bp)	macb_readl(bp, TSR)
- 
- /* struct macb_dma_desc - Hardware DMA descriptor
-  * @addr: DMA address of data buffer
-@@ -1217,6 +1235,7 @@ struct macb_queue {
- 	dma_addr_t		tx_ring_dma;
- 	struct work_struct	tx_error_task;
- 	bool			txubr_pending;
-+	bool			tx_pending;
- 	struct napi_struct	napi_tx;
- 
- 	dma_addr_t		rx_ring_dma;
-@@ -1286,9 +1305,15 @@ struct macb {
- 
- 	u32			caps;
- 	unsigned int		dma_burst_length;
-+	u8			aw2w_max_pipe;
-+	u8			ar2r_max_pipe;
-+	bool			use_aw2b_fill;
- 
- 	phy_interface_t		phy_interface;
- 
-+	struct gpio_desc	*phy_reset_gpio;
-+	int			phy_reset_ms;
-+
- 	/* AT91RM9200 transmit queue (1 on wire + 1 queued) */
- 	struct macb_tx_skb	rm9200_txq[2];
- 	unsigned int		max_tx_length;
---- a/drivers/net/ethernet/cadence/macb_main.c
-+++ b/drivers/net/ethernet/cadence/macb_main.c
-@@ -41,6 +41,9 @@
- #include <linux/firmware/xlnx-zynqmp.h>
- #include "macb.h"
- 
-+static unsigned int txdelay = 35;
-+module_param(txdelay, uint, 0644);
-+
- /* This structure is only used for MACB on SiFive FU540 devices */
- struct sifive_fu540_macb_mgmt {
- 	void __iomem *reg;
-@@ -336,7 +339,7 @@ static int macb_mdio_wait_for_idle(struc
- 	u32 val;
- 
- 	return readx_poll_timeout(MACB_READ_NSR, bp, val, val & MACB_BIT(IDLE),
--				  1, MACB_MDIO_TIMEOUT);
-+				  100, MACB_MDIO_TIMEOUT);
- }
- 
- static int macb_mdio_read(struct mii_bus *bus, int mii_id, int regnum)
-@@ -442,6 +445,19 @@ mdio_pm_exit:
- 	return status;
- }
- 
-+static int macb_mdio_reset(struct mii_bus *bus)
-+{
-+	struct macb *bp = bus->priv;
-+
-+	if (bp->phy_reset_gpio) {
-+		gpiod_set_value_cansleep(bp->phy_reset_gpio, 1);
-+		msleep(bp->phy_reset_ms);
-+		gpiod_set_value_cansleep(bp->phy_reset_gpio, 0);
-+	}
-+
-+	return 0;
-+}
-+
- static void macb_init_buffers(struct macb *bp)
- {
- 	struct macb_queue *queue;
-@@ -914,6 +930,7 @@ static int macb_mii_init(struct macb *bp
- 	bp->mii_bus->name = "MACB_mii_bus";
- 	bp->mii_bus->read = &macb_mdio_read;
- 	bp->mii_bus->write = &macb_mdio_write;
-+	bp->mii_bus->reset = &macb_mdio_reset;
- 	snprintf(bp->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",
- 		 bp->pdev->name, bp->pdev->id);
- 	bp->mii_bus->priv = bp;
-@@ -1583,6 +1600,11 @@ static int macb_rx(struct macb_queue *qu
- 
- 		macb_init_rx_ring(queue);
- 		queue_writel(queue, RBQP, queue->rx_ring_dma);
-+#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
-+		if (bp->hw_dma_cap & HW_DMA_CAP_64B)
-+			macb_writel(bp, RBQPH,
-+				    upper_32_bits(queue->rx_ring_dma));
-+#endif
- 
- 		macb_writel(bp, NCR, ctrl | MACB_BIT(RE));
- 
-@@ -1883,8 +1905,9 @@ static irqreturn_t macb_interrupt(int ir
- 				queue_writel(queue, ISR, MACB_BIT(TCOMP) |
- 							 MACB_BIT(TXUBR));
- 
--			if (status & MACB_BIT(TXUBR)) {
-+			if (status & MACB_BIT(TXUBR) || queue->tx_pending) {
- 				queue->txubr_pending = true;
-+				queue->tx_pending = 0;
- 				wmb(); // ensure softirq can see update
- 			}
- 
-@@ -2331,6 +2354,11 @@ static netdev_tx_t macb_start_xmit(struc
- 	skb_tx_timestamp(skb);
- 
- 	spin_lock_irq(&bp->lock);
-+
-+	/* TSTART write might get dropped, so make the IRQ retrigger a buffer read */
-+	if (macb_readl(bp, TSR) & MACB_BIT(TGO))
-+		queue->tx_pending = 1;
-+
- 	macb_writel(bp, NCR, macb_readl(bp, NCR) | MACB_BIT(TSTART));
- 	spin_unlock_irq(&bp->lock);
- 
-@@ -2698,6 +2726,37 @@ static void macb_configure_dma(struct ma
- 	}
- }
- 
-+static void gem_init_axi(struct macb *bp)
-+{
-+	u32 amp;
-+
-+	/* AXI pipeline setup - don't touch values unless specified in device
-+	 * tree. Some hardware could have reset values > 1.
-+	 */
-+	amp = gem_readl(bp, AMP);
-+
-+	if (bp->use_aw2b_fill)
-+		amp = GEM_BFINS(AW2B_FILL, bp->use_aw2b_fill, amp);
-+	if (bp->aw2w_max_pipe)
-+		amp = GEM_BFINS(AW2W_MAX_PIPE, bp->aw2w_max_pipe, amp);
-+	if (bp->ar2r_max_pipe)
-+		amp = GEM_BFINS(AR2R_MAX_PIPE, bp->ar2r_max_pipe, amp);
-+
-+	gem_writel(bp, AMP, amp);
-+}
-+
-+static void gem_init_intmod(struct macb *bp)
-+{
-+	unsigned int throttle;
-+	u32 intmod = 0;
-+
-+	/* Use sensible interrupt moderation thresholds (50us rx and tx) */
-+	throttle = (1000 * 50) / 800;
-+	intmod = GEM_BFINS(TX_MODERATION, throttle, intmod);
-+	intmod = GEM_BFINS(RX_MODERATION, throttle, intmod);
-+	gem_writel(bp, INTMOD, intmod);
-+}
-+
- static void macb_init_hw(struct macb *bp)
- {
- 	u32 config;
-@@ -2726,6 +2785,11 @@ static void macb_init_hw(struct macb *bp
- 	if (bp->caps & MACB_CAPS_JUMBO)
- 		bp->rx_frm_len_mask = MACB_RX_JFRMLEN_MASK;
- 
-+	if (macb_is_gem(bp)) {
-+		gem_init_axi(bp);
-+		gem_init_intmod(bp);
-+	}
-+
- 	macb_configure_dma(bp);
- }
- 
-@@ -3071,6 +3135,52 @@ static void gem_get_ethtool_strings(stru
- 	}
- }
- 
-+static int gem_set_coalesce(struct net_device *dev,
-+			    struct ethtool_coalesce *ec,
-+			    struct kernel_ethtool_coalesce *kernel_coal,
-+			    struct netlink_ext_ack *extack)
-+{
-+	struct macb *bp = netdev_priv(dev);
-+	unsigned int tx_throttle;
-+	unsigned int rx_throttle;
-+	u32 intmod = 0;
-+
-+	/* GEM has simple IRQ throttling support. RX and TX interrupts
-+	 * are separately moderated on 800ns quantums, with no support
-+	 * for frame coalescing.
-+	 */
-+
-+	/* Max is 255 * 0.8us = 204us. Zero implies no moderation. */
-+	if (ec->rx_coalesce_usecs > 204 || ec->tx_coalesce_usecs > 204)
-+		return -EINVAL;
-+
-+	tx_throttle = (1000 * ec->tx_coalesce_usecs) / 800;
-+	rx_throttle = (1000 * ec->rx_coalesce_usecs) / 800;
-+
-+	intmod = GEM_BFINS(TX_MODERATION, tx_throttle, intmod);
-+	intmod = GEM_BFINS(RX_MODERATION, rx_throttle, intmod);
-+
-+	gem_writel(bp, INTMOD, intmod);
-+
-+	return 0;
-+}
-+
-+static int gem_get_coalesce(struct net_device *dev,
-+			    struct ethtool_coalesce *ec,
-+			    struct kernel_ethtool_coalesce *kernel_coal,
-+			    struct netlink_ext_ack *extack)
-+{
-+	struct macb *bp = netdev_priv(dev);
-+	u32 intmod;
-+
-+	intmod = gem_readl(bp, INTMOD);
-+
-+	ec->tx_coalesce_usecs = (GEM_BFEXT(TX_MODERATION, intmod) * 800) / 1000;
-+	ec->rx_coalesce_usecs = (GEM_BFEXT(RX_MODERATION, intmod) * 800) / 1000;
-+
-+	return 0;
-+}
-+
- static struct net_device_stats *macb_get_stats(struct net_device *dev)
- {
- 	struct macb *bp = netdev_priv(dev);
-@@ -3663,6 +3773,8 @@ static const struct ethtool_ops macb_eth
- };
- 
- static const struct ethtool_ops gem_ethtool_ops = {
-+	.supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS |
-+				     ETHTOOL_COALESCE_TX_USECS,
- 	.get_regs_len		= macb_get_regs_len,
- 	.get_regs		= macb_get_regs,
- 	.get_wol		= macb_get_wol,
-@@ -3672,6 +3784,8 @@ static const struct ethtool_ops gem_etht
- 	.get_ethtool_stats	= gem_get_ethtool_stats,
- 	.get_strings		= gem_get_ethtool_strings,
- 	.get_sset_count		= gem_get_sset_count,
-+	.get_coalesce		= gem_get_coalesce,
-+	.set_coalesce		= gem_set_coalesce,
- 	.get_link_ksettings     = macb_get_link_ksettings,
- 	.set_link_ksettings     = macb_set_link_ksettings,
- 	.get_ringparam		= macb_get_ringparam,
-@@ -4939,6 +5053,10 @@ static int macb_probe(struct platform_de
- 
- 	bp->usrio = macb_config->usrio;
- 
-+	device_property_read_u8(&pdev->dev, "cdns,aw2w-max-pipe", &bp->aw2w_max_pipe);
-+	device_property_read_u8(&pdev->dev, "cdns,ar2r-max-pipe", &bp->ar2r_max_pipe);
-+	bp->use_aw2b_fill = device_property_read_bool(&pdev->dev, "cdns,use-aw2b-fill");
-+
- 	spin_lock_init(&bp->lock);
- 
- 	/* setup capabilities */
-@@ -4994,6 +5112,21 @@ static int macb_probe(struct platform_de
- 	else
- 		bp->phy_interface = interface;
- 
-+	/* optional PHY reset-related properties */
-+	bp->phy_reset_gpio = devm_gpiod_get_optional(&pdev->dev, "phy-reset",
-+						     GPIOD_OUT_LOW);
-+	if (IS_ERR(bp->phy_reset_gpio)) {
-+		dev_err(&pdev->dev, "Failed to obtain phy-reset gpio\n");
-+		err = PTR_ERR(bp->phy_reset_gpio);
-+		goto err_out_free_netdev;
-+	}
-+
-+	bp->phy_reset_ms = 10;
-+	of_property_read_u32(np, "phy-reset-duration", &bp->phy_reset_ms);
-+	/* A sane reset duration should not be longer than 1s */
-+	if (bp->phy_reset_ms > 1000)
-+		bp->phy_reset_ms = 1000;
-+
- 	/* IP specific init */
- 	err = init(pdev);
- 	if (err)
-@@ -5070,6 +5203,19 @@ static int macb_remove(struct platform_d
- 	return 0;
- }
- 
-+static void macb_shutdown(struct platform_device *pdev)
-+{
-+	struct net_device *dev;
-+
-+	dev = platform_get_drvdata(pdev);
-+
-+	rtnl_lock();
-+	netif_device_detach(dev);
-+	if (netif_running(dev))
-+		dev_close(dev);
-+	rtnl_unlock();
-+}
-+
- static int __maybe_unused macb_suspend(struct device *dev)
- {
- 	struct net_device *netdev = dev_get_drvdata(dev);
-@@ -5284,6 +5430,7 @@ static const struct dev_pm_ops macb_pm_o
- static struct platform_driver macb_driver = {
- 	.probe		= macb_probe,
- 	.remove		= macb_remove,
-+	.shutdown	= macb_shutdown,
- 	.driver		= {
- 		.name		= "macb",
- 		.of_match_table	= of_match_ptr(macb_dt_ids),
diff --git a/target/linux/bcm27xx/patches-6.1/950-0865-usb-dwc3-Set-DMA-and-coherent-masks-early.patch b/target/linux/bcm27xx/patches-6.1/950-0865-usb-dwc3-Set-DMA-and-coherent-masks-early.patch
deleted file mode 100644
index cf92da67a8..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0865-usb-dwc3-Set-DMA-and-coherent-masks-early.patch
+++ /dev/null
@@ -1,384 +0,0 @@
-From 4ffa5f2c5fc7854683964bb2f2bf23907c18213f Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.com>
-Date: Mon, 13 Sep 2021 11:14:32 +0100
-Subject: [PATCH] usb: dwc3: Set DMA and coherent masks early
-
-dwc3 allocates scratch and event buffers in the top-level driver. Hack the
-probe function to set the DMA mask before trying to allocate these.
-
-I think the event buffers are only used in device mode, but the scratch
-buffers may be used if core hibernation is enabled.
-
-usb: dwc3: add support for new DT quirks
-
-Apply the optional axi-pipe-limit and dis-in-autoretry-quirk properties
-during driver probe.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
-
-phy: phy-brcm-usb: Add 2712 support
-
-usb: dwc3: if the host controller instance number is present in DT, use it
-
-If two instances of a dwc3 host controller are specified in devicetree,
-then the probe order may be arbitrary which results in the device names
-swapping on a per-boot basis.
-
-If a "usb" alias with the instance number is specified, then use
-that to construct the device name instead of autogenerating one.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
-
-rp1 dwc3 changes
-
-drivers: usb: dwc3: allow setting GTXTHRCFG on dwc_usb3.0 hardware
-
-Equivalent register fields exist in the SuperSpeed Host version of the
-hardware, so allow the use of TX thresholds if specified in devicetree.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
-
-drivers: usb: dwc3: remove downstream quirk dis-in-autoretry
-
-Upstream have unilaterally disabled the feature.
-
-Partially reverts 6e9142a26ee0fdc3a5adc49ed6cedc0b16ec2ed1 (downstream)
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- drivers/phy/broadcom/Kconfig                  |  2 +-
- .../phy/broadcom/phy-brcm-usb-init-synopsys.c | 59 +++++++++++++++++++
- drivers/phy/broadcom/phy-brcm-usb-init.h      |  2 +
- drivers/phy/broadcom/phy-brcm-usb.c           | 18 +++++-
- drivers/usb/dwc3/core.c                       | 52 ++++++++++++++++
- drivers/usb/dwc3/core.h                       | 10 ++++
- drivers/usb/dwc3/host.c                       | 17 ++++--
- 7 files changed, 153 insertions(+), 7 deletions(-)
-
---- a/drivers/phy/broadcom/Kconfig
-+++ b/drivers/phy/broadcom/Kconfig
-@@ -93,7 +93,7 @@ config PHY_BRCM_SATA
- 
- config PHY_BRCM_USB
- 	tristate "Broadcom STB USB PHY driver"
--	depends on ARCH_BCMBCA || ARCH_BRCMSTB || COMPILE_TEST
-+	depends on ARCH_BCMBCA || ARCH_BRCMSTB || ARCH_BCM2835 || COMPILE_TEST
- 	depends on OF
- 	select GENERIC_PHY
- 	select SOC_BRCMSTB if ARCH_BRCMSTB
---- a/drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c
-+++ b/drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c
-@@ -318,6 +318,36 @@ static void usb_init_common_7216(struct
- 	usb_init_common(params);
- }
- 
-+static void usb_init_common_2712(struct brcm_usb_init_params *params)
-+{
-+	void __iomem *ctrl = params->regs[BRCM_REGS_CTRL];
-+	void __iomem *bdc_ec = params->regs[BRCM_REGS_BDC_EC];
-+	u32 reg;
-+
-+	if (params->syscon_piarbctl)
-+		syscon_piarbctl_init(params->syscon_piarbctl);
-+
-+	USB_CTRL_UNSET(ctrl, USB_PM, USB_PWRDN);
-+
-+	usb_wake_enable_7211b0(params, false);
-+
-+	usb_init_common(params);
-+
-+	/*
-+	 * The BDC controller will get occasional failures with
-+	 * the default "Read Transaction Size" of 6 (1024 bytes).
-+	 * Set it to 4 (256 bytes).
-+	 */
-+	if ((params->mode != USB_CTLR_MODE_HOST) && bdc_ec) {
-+		reg = brcm_usb_readl(bdc_ec + BDC_EC_AXIRDA);
-+		reg &= ~BDC_EC_AXIRDA_RTS_MASK;
-+		reg |= (0x4 << BDC_EC_AXIRDA_RTS_SHIFT);
-+		brcm_usb_writel(reg, bdc_ec + BDC_EC_AXIRDA);
-+	}
-+
-+	usb2_eye_fix_7211b0(params);
-+}
-+
- static void usb_init_xhci(struct brcm_usb_init_params *params)
- {
- 	pr_debug("%s\n", __func__);
-@@ -363,6 +393,18 @@ static void usb_uninit_common_7211b0(str
- 
- }
- 
-+static void usb_uninit_common_2712(struct brcm_usb_init_params *params)
-+{
-+	void __iomem *ctrl = params->regs[BRCM_REGS_CTRL];
-+
-+	if (params->wake_enabled) {
-+		USB_CTRL_SET(ctrl, TEST_PORT_CTL, TPOUT_SEL_PME_GEN);
-+		usb_wake_enable_7211b0(params, true);
-+	} else {
-+		USB_CTRL_SET(ctrl, USB_PM, USB_PWRDN);
-+	}
-+}
-+
- static void usb_uninit_xhci(struct brcm_usb_init_params *params)
- {
- 
-@@ -417,6 +459,16 @@ static const struct brcm_usb_init_ops bc
- 	.set_dual_select = usb_set_dual_select,
- };
- 
-+static const struct brcm_usb_init_ops bcm2712_ops = {
-+	.init_ipp = usb_init_ipp,
-+	.init_common = usb_init_common_2712,
-+	.init_xhci = usb_init_xhci,
-+	.uninit_common = usb_uninit_common_2712,
-+	.uninit_xhci = usb_uninit_xhci,
-+	.get_dual_select = usb_get_dual_select,
-+	.set_dual_select = usb_set_dual_select,
-+};
-+
- void brcm_usb_dvr_init_7216(struct brcm_usb_init_params *params)
- {
- 
-@@ -434,3 +486,10 @@ void brcm_usb_dvr_init_7211b0(struct brc
- 	params->family_name = "7211";
- 	params->ops = &bcm7211b0_ops;
- }
-+
-+void brcm_usb_dvr_init_2712(struct brcm_usb_init_params *params)
-+{
-+	params->family_name = "2712";
-+	params->ops = &bcm2712_ops;
-+	params->suspend_with_clocks = true;
-+}
---- a/drivers/phy/broadcom/phy-brcm-usb-init.h
-+++ b/drivers/phy/broadcom/phy-brcm-usb-init.h
-@@ -61,12 +61,14 @@ struct  brcm_usb_init_params {
- 	const struct brcm_usb_init_ops *ops;
- 	struct regmap *syscon_piarbctl;
- 	bool wake_enabled;
-+	bool suspend_with_clocks;
- };
- 
- void brcm_usb_dvr_init_4908(struct brcm_usb_init_params *params);
- void brcm_usb_dvr_init_7445(struct brcm_usb_init_params *params);
- void brcm_usb_dvr_init_7216(struct brcm_usb_init_params *params);
- void brcm_usb_dvr_init_7211b0(struct brcm_usb_init_params *params);
-+void brcm_usb_dvr_init_2712(struct brcm_usb_init_params *params);
- 
- static inline u32 brcm_usb_readl(void __iomem *addr)
- {
---- a/drivers/phy/broadcom/phy-brcm-usb.c
-+++ b/drivers/phy/broadcom/phy-brcm-usb.c
-@@ -76,7 +76,7 @@ struct brcm_usb_phy_data {
- };
- 
- static s8 *node_reg_names[BRCM_REGS_MAX] = {
--	"crtl", "xhci_ec", "xhci_gbl", "usb_phy", "usb_mdio", "bdc_ec"
-+	"ctrl", "xhci_ec", "xhci_gbl", "usb_phy", "usb_mdio", "bdc_ec"
- };
- 
- static int brcm_pm_notifier(struct notifier_block *notifier,
-@@ -315,6 +315,18 @@ static const struct match_chip_info chip
- 	.optional_reg = BRCM_REGS_BDC_EC,
- };
- 
-+static const struct match_chip_info chip_info_2712 = {
-+	.init_func = &brcm_usb_dvr_init_2712,
-+	.required_regs = {
-+		BRCM_REGS_CTRL,
-+		BRCM_REGS_XHCI_EC,
-+		BRCM_REGS_XHCI_GBL,
-+		BRCM_REGS_USB_MDIO,
-+		-1,
-+	},
-+	.optional_reg = BRCM_REGS_BDC_EC,
-+};
-+
- static const struct match_chip_info chip_info_7445 = {
- 	.init_func = &brcm_usb_dvr_init_7445,
- 	.required_regs = {
-@@ -338,6 +350,10 @@ static const struct of_device_id brcm_us
- 		.data = &chip_info_7211b0,
- 	},
- 	{
-+		.compatible = "brcm,bcm2712-usb-phy",
-+		.data = &chip_info_2712,
-+	},
-+	{
- 		.compatible = "brcm,brcmstb-usb-phy",
- 		.data = &chip_info_7445,
- 	},
---- a/drivers/usb/dwc3/core.c
-+++ b/drivers/usb/dwc3/core.c
-@@ -1180,6 +1180,24 @@ static void dwc3_config_threshold(struct
- 	}
- }
- 
-+static void dwc3_set_axi_pipe_limit(struct dwc3 *dwc)
-+{
-+	struct device *dev = dwc->dev;
-+	u32 cfg;
-+
-+	if (!dwc->axi_pipe_limit)
-+		return;
-+	if (dwc->axi_pipe_limit > 16) {
-+		dev_err(dev, "Invalid axi_pipe_limit property\n");
-+		return;
-+	}
-+	cfg = dwc3_readl(dwc->regs, DWC3_GSBUSCFG1);
-+	cfg &= ~DWC3_GSBUSCFG1_PIPETRANSLIMIT(15);
-+	cfg |= DWC3_GSBUSCFG1_PIPETRANSLIMIT(dwc->axi_pipe_limit - 1);
-+
-+	dwc3_writel(dwc->regs, DWC3_GSBUSCFG1, cfg);
-+}
-+
- /**
-  * dwc3_core_init - Low-level initialization of DWC3 Core
-  * @dwc: Pointer to our controller context structure
-@@ -1257,6 +1275,8 @@ static int dwc3_core_init(struct dwc3 *d
- 
- 	dwc3_set_incr_burst_type(dwc);
- 
-+	dwc3_set_axi_pipe_limit(dwc);
-+
- 	usb_phy_set_suspend(dwc->usb2_phy, 0);
- 	usb_phy_set_suspend(dwc->usb3_phy, 0);
- 	ret = phy_power_on(dwc->usb2_generic_phy);
-@@ -1490,6 +1510,7 @@ static void dwc3_get_properties(struct d
- 	u8			tx_thr_num_pkt_prd = 0;
- 	u8			tx_max_burst_prd = 0;
- 	u8			tx_fifo_resize_max_num;
-+	u8			axi_pipe_limit;
- 	const char		*usb_psy_name;
- 	int			ret;
- 
-@@ -1512,6 +1533,9 @@ static void dwc3_get_properties(struct d
- 	 */
- 	tx_fifo_resize_max_num = 6;
- 
-+	/* Default to 0 (don't override hardware defaults) */
-+	axi_pipe_limit = 0;
-+
- 	dwc->maximum_speed = usb_get_maximum_speed(dev);
- 	dwc->max_ssp_rate = usb_get_maximum_ssp_rate(dev);
- 	dwc->dr_mode = usb_get_dr_mode(dev);
-@@ -1627,6 +1651,9 @@ static void dwc3_get_properties(struct d
- 	dwc->dis_split_quirk = device_property_read_bool(dev,
- 				"snps,dis-split-quirk");
- 
-+	device_property_read_u8(dev, "snps,axi-pipe-limit",
-+				   &axi_pipe_limit);
-+
- 	dwc->lpm_nyet_threshold = lpm_nyet_threshold;
- 	dwc->tx_de_emphasis = tx_de_emphasis;
- 
-@@ -1644,6 +1671,8 @@ static void dwc3_get_properties(struct d
- 	dwc->tx_thr_num_pkt_prd = tx_thr_num_pkt_prd;
- 	dwc->tx_max_burst_prd = tx_max_burst_prd;
- 
-+	dwc->axi_pipe_limit = axi_pipe_limit;
-+
- 	dwc->imod_interval = 0;
- 
- 	dwc->tx_fifo_resize_max_num = tx_fifo_resize_max_num;
-@@ -1852,6 +1881,12 @@ static int dwc3_probe(struct platform_de
- 
- 	dwc3_get_properties(dwc);
- 
-+	if (!dwc->sysdev_is_parent) {
-+		ret = dma_set_mask_and_coherent(dwc->sysdev, DMA_BIT_MASK(64));
-+		if (ret)
-+			return ret;
-+	}
-+
- 	dwc->reset = devm_reset_control_array_get_optional_shared(dev);
- 	if (IS_ERR(dwc->reset)) {
- 		ret = PTR_ERR(dwc->reset);
---- a/drivers/usb/dwc3/core.h
-+++ b/drivers/usb/dwc3/core.h
-@@ -183,6 +183,9 @@
- #define DWC3_GSBUSCFG0_INCRBRSTENA	(1 << 0) /* undefined length enable */
- #define DWC3_GSBUSCFG0_INCRBRST_MASK	0xff
- 
-+/* Global SoC Bus Configuration Register 1 */
-+#define DWC3_GSBUSCFG1_PIPETRANSLIMIT(n)	(((n) & 0xf) << 8)
-+
- /* Global Debug LSP MUX Select */
- #define DWC3_GDBGLSPMUX_ENDBC		BIT(15)	/* Host only */
- #define DWC3_GDBGLSPMUX_HOSTSELECT(n)	((n) & 0x3fff)
-@@ -1056,6 +1059,7 @@ struct dwc3_scratchpad_array {
-  * @tx_max_burst_prd: max periodic ESS transmit burst size
-  * @tx_fifo_resize_max_num: max number of fifos allocated during txfifo resize
-  * @clear_stall_protocol: endpoint number that requires a delayed status phase
-+ * @axi_max_pipe: set to override the maximum number of pipelined AXI transfers
-  * @hsphy_interface: "utmi" or "ulpi"
-  * @connected: true when we're connected to a host, false otherwise
-  * @softconnect: true when gadget connect is called, false when disconnect runs
-@@ -1287,6 +1291,7 @@ struct dwc3 {
- 	u8			tx_max_burst_prd;
- 	u8			tx_fifo_resize_max_num;
- 	u8			clear_stall_protocol;
-+	u8			axi_pipe_limit;
- 
- 	const char		*hsphy_interface;
- 
---- a/drivers/usb/dwc3/host.c
-+++ b/drivers/usb/dwc3/host.c
-@@ -51,10 +51,10 @@ static void dwc3_host_fill_xhci_irq_res(
- 
- static int dwc3_host_get_irq(struct dwc3 *dwc)
- {
--	struct platform_device	*dwc3_pdev = to_platform_device(dwc->dev);
-+	struct platform_device	*pdev = to_platform_device(dwc->dev);
- 	int irq;
- 
--	irq = platform_get_irq_byname_optional(dwc3_pdev, "host");
-+	irq = platform_get_irq_byname_optional(pdev, "host");
- 	if (irq > 0) {
- 		dwc3_host_fill_xhci_irq_res(dwc, irq, "host");
- 		goto out;
-@@ -63,7 +63,7 @@ static int dwc3_host_get_irq(struct dwc3
- 	if (irq == -EPROBE_DEFER)
- 		goto out;
- 
--	irq = platform_get_irq_byname_optional(dwc3_pdev, "dwc_usb3");
-+	irq = platform_get_irq_byname_optional(pdev, "dwc_usb3");
- 	if (irq > 0) {
- 		dwc3_host_fill_xhci_irq_res(dwc, irq, "dwc_usb3");
- 		goto out;
-@@ -72,7 +72,7 @@ static int dwc3_host_get_irq(struct dwc3
- 	if (irq == -EPROBE_DEFER)
- 		goto out;
- 
--	irq = platform_get_irq(dwc3_pdev, 0);
-+	irq = platform_get_irq(pdev, 0);
- 	if (irq > 0) {
- 		dwc3_host_fill_xhci_irq_res(dwc, irq, NULL);
- 		goto out;
-@@ -87,16 +87,23 @@ out:
- 
- int dwc3_host_init(struct dwc3 *dwc)
- {
-+	struct platform_device	*pdev = to_platform_device(dwc->dev);
- 	struct property_entry	props[5];
- 	struct platform_device	*xhci;
- 	int			ret, irq;
- 	int			prop_idx = 0;
-+	int			id;
- 
- 	irq = dwc3_host_get_irq(dwc);
- 	if (irq < 0)
- 		return irq;
- 
--	xhci = platform_device_alloc("xhci-hcd", PLATFORM_DEVID_AUTO);
-+	id = of_alias_get_id(pdev->dev.of_node, "usb");
-+	if (id >= 0)
-+		xhci = platform_device_alloc("xhci-hcd", id);
-+	else
-+		xhci = platform_device_alloc("xhci-hcd", PLATFORM_DEVID_AUTO);
-+
- 	if (!xhci) {
- 		dev_err(dwc->dev, "couldn't allocate xHCI device\n");
- 		return -ENOMEM;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0866-drm-panel-raspberrypi-touchscreen-Insert-more-delays.patch b/target/linux/bcm27xx/patches-6.1/950-0866-drm-panel-raspberrypi-touchscreen-Insert-more-delays.patch
deleted file mode 100644
index a6f0c1961c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0866-drm-panel-raspberrypi-touchscreen-Insert-more-delays.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 480c8e9f48f8a96c457eb3dc0079a73598fb7477 Mon Sep 17 00:00:00 2001
-From: Nick Hollinghurst <nick.hollinghurst@raspberrypi.org>
-Date: Wed, 1 Dec 2021 19:43:08 +0000
-Subject: [PATCH] drm/panel/raspberrypi-touchscreen: Insert more delays.
-
-This avoids failures in cases where the panel is enabled
-or re-probed very soon after being disabled or probed.
-These can occur because the Atmel device can mis-behave
-over I2C for a few ms after any write to the POWERON register.
----
- drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
-+++ b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c
-@@ -299,6 +299,13 @@ static int rpi_touchscreen_prepare(struc
- 	struct rpi_touchscreen *ts = panel_to_ts(panel);
- 	int i, data;
- 
-+	/*
-+	 * Power up the Toshiba bridge. The Atmel device can misbehave
-+	 * over I2C for a few ms after writes to REG_POWERON (including the
-+	 * write in rpi_touchscreen_disable()), so sleep before and after.
-+	 * Also to ensure that the bridge has been off for at least 100ms.
-+	 */
-+	msleep(100);
- 	rpi_touchscreen_i2c_write(ts, REG_POWERON, 1);
- 	usleep_range(20000, 25000);
- 	/* Wait for nPWRDWN to go low to indicate poweron is done. */
-@@ -431,6 +438,7 @@ static int rpi_touchscreen_probe(struct
- 
- 	/* Turn off at boot, so we can cleanly sequence powering on. */
- 	rpi_touchscreen_i2c_write(ts, REG_POWERON, 0);
-+	usleep_range(20000, 25000);
- 
- 	/* Look up the DSI host.  It needs to probe before we do. */
- 	endpoint = of_graph_get_next_endpoint(dev->of_node, NULL);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0867-PCI-brcmstb-Add-BCM2712-support.patch b/target/linux/bcm27xx/patches-6.1/950-0867-PCI-brcmstb-Add-BCM2712-support.patch
deleted file mode 100644
index 179d03733e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0867-PCI-brcmstb-Add-BCM2712-support.patch
+++ /dev/null
@@ -1,1108 +0,0 @@
-From 29702857d1ab71243ea6c247dfe9b5bc43dd422f Mon Sep 17 00:00:00 2001
-From: Jim Quinlan <james.quinlan@broadcom.com>
-Date: Fri, 23 Jun 2023 10:40:57 -0400
-Subject: [PATCH] PCI: brcmstb: Add BCM2712 support
-
-PCI: brcmstb: differing register offsets on 2712
-
-pcie-brcmstb: Add 2712 bridge reset support
-
-pcie: 2712 PORT_MASK and rescal support
-
-pcie-brcmstb: don't alter the L1SS debug register
-
-For reasons unknown, this disables the reference clock
-
-pcie-brcmstb: fix BAR2 enable and window decode
-
-Set UBUS ACCESS_EN to let inbound DMA work. Also BCM2712 has grown
-an index in the inbound window size decode register.
-
-PCIe: brcmstb: Enable support for 64 MSI-Xs
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-pcie-brcmstb: Suppress read error responses
-
-If the link is down or the EP fails to return a read completion, the
-RC's default behaviour is to return an AXI error. This causes fatal
-exceptions on A76, so it's better to respond with all 1s instead.
-
-pcie-brcmstb: increase UBUS timeout to cater for link retrain events
-
-pcie-brcmstb: Handle additional inbound regions
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-pcie-brcmstb: Add support for external MSI controller
-
-pcie-brcmstb: add a reasonable default traffic class to priority map
-
-BCM2712 supports multiple traffic classes (TCs) with independent
-maximally sized transfer queues for each TC. Traffic classes have no
-transaction ordering requirements between them, which facilitates
-out-of-order completions and arbitration between posted writes for
-data streams that have no dependence on each other.
-
-In addition to the above benefits of splitting endpoint traffic into
-individual queues, priorities can be assigned to traffic classes by
-a heuristic or deterministic mechanism. The heuristic elevates AXI
-QOS priority in accordance with the number of pending transfers in
-each TC's queue, but for true priority signalling a forwarding
-mechanism using vendor-defined messages is implemented.
-
-Receipt of a 3 DWORD VDM assigns a priority tag to a TC on-the-fly,
-and this tag corresponds to a configurable AXI QOS value.
-
-As a simple baseline, assign a linear map of AXI QOS to each tag.
-
-pcie: brcmstb: set up the VDM forwarding interface when setting up QoS
-
-pcie-brcmstb: add DT bindings for MPS-size Read Completion Mode
-
-This controller has an optional feature that allows read completion
-TLPs to be sized up to the Maximum Packet Size of a configured link.
-
-This can exceed the Read Completion Boundary of 128B specified in
-the PCIe specification, but depending on endpoint support may increase
-link read bandwidth significantly.
-
-pcie-brcmstb: clean up debug messages
-
-pcie-brcmstb: fix BCM2712A0 PHY PM errata
-
-The power management clock is 54MHz not 50MHz, so adjust the PM clock period
-to suit. Powering off the PHY PLL in L1.2 is unsafe, so force it on.
-
-pcie-brcmstb: set CLKREQ functionality according to link partner support
-
-The RC supports either L1 with clock PM or L1 sub-state control, not both
-at the same time. Examine the link partner's capabilities to determine
-which is the most suitable scheme to use.
-
-pcie: brcmstb: don't reset block bridges in suspend or removal cases
-
-BCM2712 has a single rescal block for all three root complexes, and
-holding PCIE1's bridge in reset will hang the chip if a different
-RC wants to access any of the rescal registers.
-
-pcie: brcmstb: guard 2712-specific setup with a RC type check
-
-BCM2711 doesn't implement the UBUS control registers.
-
-pcie: brcmstb: On 2712 keeping the PLL powered in L1.x is not required
-
-A separate misconfiguration when enabling SSC (the MDIO registers no
-longer do the same thing on BCM2712) had the side-effect of breaking
-PLL powerdown and resume sequencing.
-
-Allow entry into a true L1.2 state where analogue is depowered.
-
-pcie: brcmstb: Fix reset warning on probe failure
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-bcm2712: pcie: adjust PHY PLL setup to use a 54MHz input refclk
-
-Use canned MDIO writes from Broadcom that switch the ref_clk output
-pair to run from the internal fractional PLL, and set the internal PLL
-to expect a 54MHz input reference clock.
-
-Gen3 operation is not guaranteed to be stable in this setup, so default
-to gen2.
-
-This only works if the LCPLL is bypassed (requires latest bootloader).
-
-pcie: brcmstb: add missing register writes
-
-drivers: pcie: brcmstb: cater for BCM2712C0 bug dropping QoS on the floor
-
-The AXI QoS value extracted from the request fifo ends up as zero forever.
-Disabling this means that "panic" signalling doesn't do anything useful,
-but static priorites do work.
-
-Also align the selected TC:QoS map with RP1's expectations of service.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
-
-drivers: pcie: brcmstb: shuffle TC priorities up to 8
-
-Use the range 8-11 which puts the highest below HVS but leaves space
-below for other 2712 masters.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
-
-drivers: pcie: brcmstb: optionally enable QoS features by DT for BCM2712
-
-It's a bad idea to universally enable "realtime" priorities for TCs
-across all the RC instances on the chip. Endpoints other than RP1 may
-make use of these, so you don't want e.g. NVMe descriptor fetches getting
-higher priority than your remote display.
-
-Add two optional DT properties controlling the behaviour - FIFO-based
-backpressure QoS or "message-based". Message-based signalling is
-fundamentally broken due to a chip bug, so it collapses into a set of
-static assignments that RP1 needs.
-
-The default if neither property is specified is to assign everything a
-QoS of 0.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
-
-drivers: pcie: brcmstb: adjust completion timeouts for bcm2712
-
-Setting the RC config retry timeout makes CRS auto-polling work, but
-the UBUS timeout will override the config retry. Both need to be large.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- drivers/pci/controller/pcie-brcmstb.c | 507 +++++++++++++++++++++++---
- 1 file changed, 458 insertions(+), 49 deletions(-)
-
---- a/drivers/pci/controller/pcie-brcmstb.c
-+++ b/drivers/pci/controller/pcie-brcmstb.c
-@@ -13,6 +13,7 @@
- #include <linux/irqchip/chained_irq.h>
- #include <linux/irqdomain.h>
- #include <linux/kernel.h>
-+#include <linux/kthread.h>
- #include <linux/list.h>
- #include <linux/log2.h>
- #include <linux/module.h>
-@@ -47,11 +48,25 @@
- #define PCIE_RC_CFG_PRIV1_LINK_CAPABILITY			0x04dc
- #define  PCIE_RC_CFG_PRIV1_LINK_CAPABILITY_ASPM_SUPPORT_MASK	0xc00
- 
-+#define PCIE_RC_TL_VDM_CTL0				0x0a20
-+#define  PCIE_RC_TL_VDM_CTL0_VDM_ENABLED_MASK		0x10000
-+#define  PCIE_RC_TL_VDM_CTL0_VDM_IGNORETAG_MASK		0x20000
-+#define  PCIE_RC_TL_VDM_CTL0_VDM_IGNOREVNDRID_MASK	0x40000
-+
-+#define PCIE_RC_TL_VDM_CTL1				0x0a0c
-+#define  PCIE_RC_TL_VDM_CTL1_VDM_VNDRID0_MASK		0x0000ffff
-+#define  PCIE_RC_TL_VDM_CTL1_VDM_VNDRID1_MASK		0xffff0000
-+
- #define PCIE_RC_DL_MDIO_ADDR				0x1100
- #define PCIE_RC_DL_MDIO_WR_DATA				0x1104
- #define PCIE_RC_DL_MDIO_RD_DATA				0x1108
- 
-+#define PCIE_RC_PL_PHY_CTL_15				0x184c
-+#define  PCIE_RC_PL_PHY_CTL_15_DIS_PLL_PD_MASK		0x400000
-+#define  PCIE_RC_PL_PHY_CTL_15_PM_CLK_PERIOD_MASK	0xff
-+
- #define PCIE_MISC_MISC_CTRL				0x4008
-+#define  PCIE_MISC_MISC_CTRL_RCB_MPS_MODE_MASK		0x400
- #define  PCIE_MISC_MISC_CTRL_SCB_ACCESS_EN_MASK		0x1000
- #define  PCIE_MISC_MISC_CTRL_CFG_READ_UR_MODE_MASK	0x2000
- #define  PCIE_MISC_MISC_CTRL_MAX_BURST_SIZE_MASK	0x300000
-@@ -71,6 +86,7 @@
- 
- #define PCIE_MISC_RC_BAR1_CONFIG_LO			0x402c
- #define  PCIE_MISC_RC_BAR1_CONFIG_LO_SIZE_MASK		0x1f
-+#define PCIE_MISC_RC_BAR1_CONFIG_HI			0x4030
- 
- #define PCIE_MISC_RC_BAR2_CONFIG_LO			0x4034
- #define  PCIE_MISC_RC_BAR2_CONFIG_LO_SIZE_MASK		0x1f
-@@ -78,6 +94,7 @@
- 
- #define PCIE_MISC_RC_BAR3_CONFIG_LO			0x403c
- #define  PCIE_MISC_RC_BAR3_CONFIG_LO_SIZE_MASK		0x1f
-+#define PCIE_MISC_RC_BAR3_CONFIG_HI			0x4040
- 
- #define PCIE_MISC_MSI_BAR_CONFIG_LO			0x4044
- #define PCIE_MISC_MSI_BAR_CONFIG_HI			0x4048
-@@ -86,12 +103,15 @@
- #define  PCIE_MISC_MSI_DATA_CONFIG_VAL_32		0xffe06540
- #define  PCIE_MISC_MSI_DATA_CONFIG_VAL_8		0xfff86540
- 
-+#define PCIE_MISC_RC_CONFIG_RETRY_TIMEOUT		0x405c
-+
- #define PCIE_MISC_PCIE_CTRL				0x4064
- #define  PCIE_MISC_PCIE_CTRL_PCIE_L23_REQUEST_MASK	0x1
- #define PCIE_MISC_PCIE_CTRL_PCIE_PERSTB_MASK		0x4
- 
- #define PCIE_MISC_PCIE_STATUS				0x4068
- #define  PCIE_MISC_PCIE_STATUS_PCIE_PORT_MASK		0x80
-+#define  PCIE_MISC_PCIE_STATUS_PCIE_PORT_MASK_2712	0x40
- #define  PCIE_MISC_PCIE_STATUS_PCIE_DL_ACTIVE_MASK	0x20
- #define  PCIE_MISC_PCIE_STATUS_PCIE_PHYLINKUP_MASK	0x10
- #define  PCIE_MISC_PCIE_STATUS_PCIE_LINK_IN_L23_MASK	0x40
-@@ -116,14 +136,73 @@
- #define PCIE_MEM_WIN0_LIMIT_HI(win)	\
- 		PCIE_MISC_CPU_2_PCIE_MEM_WIN0_LIMIT_HI + ((win) * 8)
- 
--#define PCIE_MISC_HARD_PCIE_HARD_DEBUG					0x4204
-+#define PCIE_MISC_HARD_PCIE_HARD_DEBUG	pcie->reg_offsets[PCIE_HARD_DEBUG]
- #define  PCIE_MISC_HARD_PCIE_HARD_DEBUG_CLKREQ_DEBUG_ENABLE_MASK	0x2
- #define  PCIE_MISC_HARD_PCIE_HARD_DEBUG_SERDES_IDDQ_MASK		0x08000000
- #define  PCIE_BMIPS_MISC_HARD_PCIE_HARD_DEBUG_SERDES_IDDQ_MASK		0x00800000
- #define  PCIE_MISC_HARD_PCIE_HARD_DEBUG_CLKREQ_L1SS_ENABLE_MASK		0x00200000
- 
-+#define PCIE_MISC_CTRL_1					0x40A0
-+#define  PCIE_MISC_CTRL_1_OUTBOUND_TC_MASK			0xf
-+#define  PCIE_MISC_CTRL_1_OUTBOUND_NO_SNOOP_MASK		BIT(3)
-+#define  PCIE_MISC_CTRL_1_OUTBOUND_RO_MASK			BIT(4)
-+#define  PCIE_MISC_CTRL_1_EN_VDM_QOS_CONTROL_MASK		BIT(5)
-+
-+#define PCIE_MISC_UBUS_CTRL	0x40a4
-+#define  PCIE_MISC_UBUS_CTRL_UBUS_PCIE_REPLY_ERR_DIS_MASK	BIT(13)
-+#define  PCIE_MISC_UBUS_CTRL_UBUS_PCIE_REPLY_DECERR_DIS_MASK	BIT(19)
-+
-+#define PCIE_MISC_UBUS_TIMEOUT	0x40A8
-+
-+#define PCIE_MISC_UBUS_BAR1_CONFIG_REMAP	0x40ac
-+#define  PCIE_MISC_UBUS_BAR1_CONFIG_REMAP_ACCESS_ENABLE_MASK	BIT(0)
-+#define PCIE_MISC_UBUS_BAR1_CONFIG_REMAP_HI	0x40b0
-+
-+#define PCIE_MISC_UBUS_BAR2_CONFIG_REMAP	0x40b4
-+#define  PCIE_MISC_UBUS_BAR2_CONFIG_REMAP_ACCESS_ENABLE_MASK	BIT(0)
-+
-+/* Additional RC BARs */
-+#define  PCIE_MISC_RC_BAR_CONFIG_LO_SIZE_MASK		0x1f
-+#define PCIE_MISC_RC_BAR4_CONFIG_LO			0x40d4
-+#define PCIE_MISC_RC_BAR4_CONFIG_HI			0x40d8
-+/* ... */
-+#define PCIE_MISC_RC_BAR10_CONFIG_LO			0x4104
-+#define PCIE_MISC_RC_BAR10_CONFIG_HI			0x4108
-+
-+#define PCIE_MISC_UBUS_BAR_CONFIG_REMAP_ENABLE		0x1
-+#define PCIE_MISC_UBUS_BAR_CONFIG_REMAP_LO_MASK		0xfffff000
-+#define PCIE_MISC_UBUS_BAR_CONFIG_REMAP_HI_MASK		0xff
-+#define PCIE_MISC_UBUS_BAR4_CONFIG_REMAP_LO		0x410c
-+#define PCIE_MISC_UBUS_BAR4_CONFIG_REMAP_HI		0x4110
-+/* ... */
-+#define PCIE_MISC_UBUS_BAR10_CONFIG_REMAP_LO		0x413c
-+#define PCIE_MISC_UBUS_BAR10_CONFIG_REMAP_HI		0x4140
-+
-+/* AXI priority forwarding - automatic level-based */
-+#define PCIE_MISC_TC_QUEUE_TO_QOS_MAP(x)		(0x4160 - (x) * 4)
-+/* Defined in quarter-fullness */
-+#define  QUEUE_THRESHOLD_34_TO_QOS_MAP_SHIFT		12
-+#define  QUEUE_THRESHOLD_23_TO_QOS_MAP_SHIFT		8
-+#define  QUEUE_THRESHOLD_12_TO_QOS_MAP_SHIFT		4
-+#define  QUEUE_THRESHOLD_01_TO_QOS_MAP_SHIFT		0
-+#define  QUEUE_THRESHOLD_MASK				0xf
-+
-+/* VDM messages indexing TCs to AXI priorities */
-+/* Indexes 8-15 */
-+#define PCIE_MISC_VDM_PRIORITY_TO_QOS_MAP_HI		0x4164
-+/* Indexes 0-7 */
-+#define PCIE_MISC_VDM_PRIORITY_TO_QOS_MAP_LO		0x4168
-+#define  VDM_PRIORITY_TO_QOS_MAP_SHIFT(x)		(4 * (x))
-+#define  VDM_PRIORITY_TO_QOS_MAP_MASK			0xf
-+
-+#define PCIE_MISC_AXI_INTF_CTRL 0x416C
-+#define  AXI_REQFIFO_EN_QOS_PROPAGATION			BIT(7)
-+#define  AXI_BRIDGE_LOW_LATENCY_MODE			BIT(6)
-+#define  AXI_MASTER_MAX_OUTSTANDING_REQUESTS_MASK	0x3f
- 
--#define PCIE_INTR2_CPU_BASE		0x4300
-+#define PCIE_MISC_AXI_READ_ERROR_DATA	0x4170
-+
-+#define PCIE_INTR2_CPU_BASE		(pcie->reg_offsets[INTR2_CPU])
- #define PCIE_MSI_INTR2_BASE		0x4500
- /* Offsets from PCIE_INTR2_CPU_BASE and PCIE_MSI_INTR2_BASE */
- #define  MSI_INT_STATUS			0x0
-@@ -197,6 +276,8 @@ enum {
- 	RGR1_SW_INIT_1,
- 	EXT_CFG_INDEX,
- 	EXT_CFG_DATA,
-+	PCIE_HARD_DEBUG,
-+	INTR2_CPU,
- };
- 
- enum {
-@@ -211,6 +292,7 @@ enum pcie_type {
- 	BCM4908,
- 	BCM7278,
- 	BCM2711,
-+	BCM2712,
- };
- 
- struct pcie_cfg_data {
-@@ -218,6 +300,7 @@ struct pcie_cfg_data {
- 	const enum pcie_type type;
- 	void (*perst_set)(struct brcm_pcie *pcie, u32 val);
- 	void (*bridge_sw_init_set)(struct brcm_pcie *pcie, u32 val);
-+	bool (*rc_mode)(struct brcm_pcie *pcie);
- };
- 
- struct subdev_regulators {
-@@ -234,7 +317,7 @@ struct brcm_msi {
- 	struct mutex		lock; /* guards the alloc/free operations */
- 	u64			target_addr;
- 	int			irq;
--	DECLARE_BITMAP(used, BRCM_INT_PCI_MSI_NR);
-+	DECLARE_BITMAP(used, 64);
- 	bool			legacy;
- 	/* Some chips have MSIs in bits [31..24] of a shared register. */
- 	int			legacy_shift;
-@@ -251,6 +334,7 @@ struct brcm_pcie {
- 	struct device_node	*np;
- 	bool			ssc;
- 	bool			l1ss;
-+	bool			rcb_mps_mode;
- 	int			gen;
- 	u64			msi_target_addr;
- 	struct brcm_msi		*msi;
-@@ -258,11 +342,14 @@ struct brcm_pcie {
- 	enum pcie_type		type;
- 	struct reset_control	*rescal;
- 	struct reset_control	*perst_reset;
-+	struct reset_control	*bridge_reset;
- 	int			num_memc;
- 	u64			memc_size[PCIE_BRCM_MAX_MEMC];
- 	u32			hw_rev;
-+	u32			qos_map;
- 	void			(*perst_set)(struct brcm_pcie *pcie, u32 val);
- 	void			(*bridge_sw_init_set)(struct brcm_pcie *pcie, u32 val);
-+	bool			(*rc_mode)(struct brcm_pcie *pcie);
- 	struct subdev_regulators *sr;
- 	bool			ep_wakeup_capable;
- };
-@@ -283,8 +370,8 @@ static int brcm_pcie_encode_ibar_size(u6
- 	if (log2_in >= 12 && log2_in <= 15)
- 		/* Covers 4KB to 32KB (inclusive) */
- 		return (log2_in - 12) + 0x1c;
--	else if (log2_in >= 16 && log2_in <= 35)
--		/* Covers 64KB to 32GB, (inclusive) */
-+	else if (log2_in >= 16 && log2_in <= 36)
-+		/* Covers 64KB to 64GB, (inclusive) */
- 		return log2_in - 15;
- 	/* Something is awry so disable */
- 	return 0;
-@@ -381,6 +468,35 @@ static int brcm_pcie_set_ssc(struct brcm
- 	return ssc && pll ? 0 : -EIO;
- }
- 
-+static void brcm_pcie_munge_pll(struct brcm_pcie *pcie)
-+{
-+	//print "MDIO block 0x1600 written per Dannys instruction"
-+	//tmp = pcie_mdio_write(phyad, &h16&, &h50b9&)
-+	//tmp = pcie_mdio_write(phyad, &h17&, &hbd1a&)
-+	//tmp = pcie_mdio_write(phyad, &h1b&, &h5030&)
-+	//tmp = pcie_mdio_write(phyad, &h1e&, &h0007&)
-+
-+	u32 tmp;
-+	int ret, i;
-+	u8 regs[] =  { 0x16,   0x17,   0x18,   0x19,   0x1b,   0x1c,   0x1e };
-+	u16 data[] = { 0x50b9, 0xbda1, 0x0094, 0x97b4, 0x5030, 0x5030, 0x0007 };
-+
-+	ret = brcm_pcie_mdio_write(pcie->base, MDIO_PORT0, SET_ADDR_OFFSET,
-+				0x1600);
-+	for (i = 0; i < ARRAY_SIZE(regs); i++) {
-+		brcm_pcie_mdio_read(pcie->base, MDIO_PORT0, regs[i], &tmp);
-+		dev_dbg(pcie->dev, "PCIE MDIO pre_refclk 0x%02x = 0x%04x\n",
-+			regs[i], tmp);
-+	}
-+	for (i = 0; i < ARRAY_SIZE(regs); i++) {
-+		brcm_pcie_mdio_write(pcie->base, MDIO_PORT0, regs[i], data[i]);
-+		brcm_pcie_mdio_read(pcie->base, MDIO_PORT0, regs[i], &tmp);
-+		dev_dbg(pcie->dev, "PCIE MDIO post_refclk 0x%02x = 0x%04x\n",
-+			regs[i], tmp);
-+	}
-+	usleep_range(100, 200);
-+}
-+
- /* Limits operation to a specific generation (1, 2, or 3) */
- static void brcm_pcie_set_gen(struct brcm_pcie *pcie, int gen)
- {
-@@ -438,6 +554,97 @@ static void brcm_pcie_set_outbound_win(s
- 	writel(tmp, pcie->base + PCIE_MEM_WIN0_LIMIT_HI(win));
- }
- 
-+static void brcm_pcie_set_tc_qos(struct brcm_pcie *pcie)
-+{
-+	int i;
-+	u32 reg;
-+
-+	if (pcie->type != BCM2712)
-+		return;
-+
-+	/* XXX: BCM2712C0 is broken, disable the forwarding search */
-+	reg = readl(pcie->base + PCIE_MISC_AXI_INTF_CTRL);
-+	reg &= ~AXI_REQFIFO_EN_QOS_PROPAGATION;
-+	writel(reg, pcie->base + PCIE_MISC_AXI_INTF_CTRL);
-+
-+	/* Disable VDM reception by default - QoS map defaults to 0 */
-+	reg = readl(pcie->base + PCIE_MISC_CTRL_1);
-+	reg &= ~PCIE_MISC_CTRL_1_EN_VDM_QOS_CONTROL_MASK;
-+	writel(reg, pcie->base + PCIE_MISC_CTRL_1);
-+
-+	if (!of_property_read_u32(pcie->np, "brcm,fifo-qos-map", &pcie->qos_map)) {
-+		/*
-+		 * Backpressure mode - bottom 4 nibbles are QoS for each
-+		 * quartile of FIFO level. Each TC gets the same map, because
-+		 * this mode is intended for nonrealtime EPs.
-+		 */
-+
-+		pcie->qos_map &= 0x0000ffff;
-+		for (i = 0; i < 8; i++)
-+			writel(pcie->qos_map, pcie->base + PCIE_MISC_TC_QUEUE_TO_QOS_MAP(i));
-+
-+		return;
-+	}
-+
-+	if (!of_property_read_u32(pcie->np, "brcm,vdm-qos-map", &pcie->qos_map)) {
-+
-+		reg = readl(pcie->base + PCIE_MISC_CTRL_1);
-+		reg |= PCIE_MISC_CTRL_1_EN_VDM_QOS_CONTROL_MASK;
-+		writel(reg, pcie->base + PCIE_MISC_CTRL_1);
-+
-+		/* No forwarding means no point separating panic priorities from normal */
-+		writel(pcie->qos_map, pcie->base + PCIE_MISC_VDM_PRIORITY_TO_QOS_MAP_LO);
-+		writel(pcie->qos_map, pcie->base + PCIE_MISC_VDM_PRIORITY_TO_QOS_MAP_HI);
-+
-+		/* Match Vendor ID of 0 */
-+		writel(0, pcie->base + PCIE_RC_TL_VDM_CTL1);
-+		/* Forward VDMs to priority interface - at least the rx counters work */
-+		reg = readl(pcie->base + PCIE_RC_TL_VDM_CTL0);
-+		reg |= PCIE_RC_TL_VDM_CTL0_VDM_ENABLED_MASK |
-+			PCIE_RC_TL_VDM_CTL0_VDM_IGNORETAG_MASK |
-+			PCIE_RC_TL_VDM_CTL0_VDM_IGNOREVNDRID_MASK;
-+		writel(reg, pcie->base + PCIE_RC_TL_VDM_CTL0);
-+	}
-+}
-+
-+static void brcm_pcie_config_clkreq(struct brcm_pcie *pcie)
-+{
-+	void __iomem *base = pcie->base;
-+	struct pci_host_bridge *bridge = pci_host_bridge_from_priv(pcie);
-+	int domain = pci_domain_nr(bridge->bus);
-+	const struct pci_bus *bus = pci_find_bus(domain, 1);
-+	struct pci_dev *pdev = (struct pci_dev *)bus->devices.next;
-+	u32 tmp, link_cap = 0;
-+	u16 link_ctl = 0;
-+	int clkpm = 0;
-+	int substates = 0;
-+
-+	pcie_capability_read_dword(pdev, PCI_EXP_LNKCAP, &link_cap);
-+	if ((link_cap & PCI_EXP_LNKCAP_CLKPM))
-+		clkpm = 1;
-+
-+	pcie_capability_read_word(pdev, PCI_EXP_LNKCTL, &link_ctl);
-+	if (!(link_ctl & PCI_EXP_LNKCTL_CLKREQ_EN))
-+		clkpm = 0;
-+
-+	if (pcie->l1ss && pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_L1SS))
-+		substates = 1;
-+
-+	tmp = readl(base + PCIE_MISC_HARD_PCIE_HARD_DEBUG);
-+	tmp &= ~PCIE_MISC_HARD_PCIE_HARD_DEBUG_CLKREQ_DEBUG_ENABLE_MASK;
-+	tmp &= ~PCIE_MISC_HARD_PCIE_HARD_DEBUG_CLKREQ_L1SS_ENABLE_MASK;
-+
-+	if (substates)
-+		tmp |= PCIE_MISC_HARD_PCIE_HARD_DEBUG_CLKREQ_L1SS_ENABLE_MASK;
-+	else if (clkpm)
-+		tmp |= PCIE_MISC_HARD_PCIE_HARD_DEBUG_CLKREQ_DEBUG_ENABLE_MASK;
-+
-+	writel(tmp, base + PCIE_MISC_HARD_PCIE_HARD_DEBUG);
-+
-+	if (substates || clkpm)
-+		dev_info(pcie->dev, "clkreq control enabled\n");
-+}
-+
- static struct irq_chip brcm_msi_irq_chip = {
- 	.name            = "BRCM STB PCIe MSI",
- 	.irq_ack         = irq_chip_ack_parent,
-@@ -455,7 +662,7 @@ static struct msi_domain_info brcm_msi_d
- static void brcm_pcie_msi_isr(struct irq_desc *desc)
- {
- 	struct irq_chip *chip = irq_desc_get_chip(desc);
--	unsigned long status;
-+	unsigned long status, virq;
- 	struct brcm_msi *msi;
- 	struct device *dev;
- 	u32 bit;
-@@ -467,10 +674,22 @@ static void brcm_pcie_msi_isr(struct irq
- 	status = readl(msi->intr_base + MSI_INT_STATUS);
- 	status >>= msi->legacy_shift;
- 
--	for_each_set_bit(bit, &status, msi->nr) {
--		int ret;
--		ret = generic_handle_domain_irq(msi->inner_domain, bit);
--		if (ret)
-+	for_each_set_bit(bit, &status, BRCM_INT_PCI_MSI_NR/*msi->nr*/) {
-+		bool found = false;
-+
-+		virq = irq_find_mapping(msi->inner_domain, bit);
-+		if (virq) {
-+			found = true;
-+			dev_dbg(dev, "MSI -> %ld\n", virq);
-+			generic_handle_irq(virq);
-+		}
-+		virq = irq_find_mapping(msi->inner_domain, bit + 32);
-+		if (virq) {
-+			found = true;
-+			dev_dbg(dev, "MSI -> %ld\n", virq);
-+			generic_handle_irq(virq);
-+		}
-+		if (!found)
- 			dev_dbg(dev, "unexpected MSI\n");
- 	}
- 
-@@ -483,7 +702,7 @@ static void brcm_msi_compose_msi_msg(str
- 
- 	msg->address_lo = lower_32_bits(msi->target_addr);
- 	msg->address_hi = upper_32_bits(msi->target_addr);
--	msg->data = (0xffff & PCIE_MISC_MSI_DATA_CONFIG_VAL_32) | data->hwirq;
-+	msg->data = (0xffff & PCIE_MISC_MSI_DATA_CONFIG_VAL_32) | (data->hwirq & 0x1f);
- }
- 
- static int brcm_msi_set_affinity(struct irq_data *irq_data,
-@@ -495,7 +714,7 @@ static int brcm_msi_set_affinity(struct
- static void brcm_msi_ack_irq(struct irq_data *data)
- {
- 	struct brcm_msi *msi = irq_data_get_irq_chip_data(data);
--	const int shift_amt = data->hwirq + msi->legacy_shift;
-+	const int shift_amt = (data->hwirq & 0x1f) + msi->legacy_shift;
- 
- 	writel(1 << shift_amt, msi->intr_base + MSI_INT_CLR);
- }
-@@ -653,7 +872,7 @@ static int brcm_pcie_enable_msi(struct b
- 		msi->legacy_shift = 24;
- 	} else {
- 		msi->intr_base = msi->base + PCIE_MSI_INTR2_BASE;
--		msi->nr = BRCM_INT_PCI_MSI_NR;
-+		msi->nr = 64; //BRCM_INT_PCI_MSI_NR;
- 		msi->legacy_shift = 0;
- 	}
- 
-@@ -670,7 +889,7 @@ static int brcm_pcie_enable_msi(struct b
- }
- 
- /* The controller is capable of serving in both RC and EP roles */
--static bool brcm_pcie_rc_mode(struct brcm_pcie *pcie)
-+static bool brcm_pcie_rc_mode_generic(struct brcm_pcie *pcie)
- {
- 	void __iomem *base = pcie->base;
- 	u32 val = readl(base + PCIE_MISC_PCIE_STATUS);
-@@ -678,6 +897,14 @@ static bool brcm_pcie_rc_mode(struct brc
- 	return !!FIELD_GET(PCIE_MISC_PCIE_STATUS_PCIE_PORT_MASK, val);
- }
- 
-+static bool brcm_pcie_rc_mode_2712(struct brcm_pcie *pcie)
-+{
-+	void __iomem *base = pcie->base;
-+	u32 val = readl(base + PCIE_MISC_PCIE_STATUS);
-+
-+	return !!FIELD_GET(PCIE_MISC_PCIE_STATUS_PCIE_PORT_MASK_2712, val) | 1; //XXX
-+}
-+
- static bool brcm_pcie_link_up(struct brcm_pcie *pcie)
- {
- 	u32 val = readl(pcie->base + PCIE_MISC_PCIE_STATUS);
-@@ -749,6 +976,18 @@ static inline void brcm_pcie_bridge_sw_i
- 	writel(tmp, pcie->base + PCIE_RGR1_SW_INIT_1(pcie));
- }
- 
-+static inline void brcm_pcie_bridge_sw_init_set_2712(struct brcm_pcie *pcie, u32 val)
-+{
-+	if (WARN_ONCE(!pcie->bridge_reset,
-+		      "missing bridge reset controller\n"))
-+		return;
-+
-+	if (val)
-+		reset_control_assert(pcie->bridge_reset);
-+	else
-+		reset_control_deassert(pcie->bridge_reset);
-+}
-+
- static inline void brcm_pcie_perst_set_4908(struct brcm_pcie *pcie, u32 val)
- {
- 	if (WARN_ONCE(!pcie->perst_reset, "missing PERST# reset controller\n"))
-@@ -770,6 +1009,16 @@ static inline void brcm_pcie_perst_set_7
- 	writel(tmp, pcie->base +  PCIE_MISC_PCIE_CTRL);
- }
- 
-+static inline void brcm_pcie_perst_set_2712(struct brcm_pcie *pcie, u32 val)
-+{
-+	u32 tmp;
-+
-+	/* Perst bit has moved and assert value is 0 */
-+	tmp = readl(pcie->base + PCIE_MISC_PCIE_CTRL);
-+	u32p_replace_bits(&tmp, !val, PCIE_MISC_PCIE_CTRL_PCIE_PERSTB_MASK);
-+	writel(tmp, pcie->base +  PCIE_MISC_PCIE_CTRL);
-+}
-+
- static inline void brcm_pcie_perst_set_generic(struct brcm_pcie *pcie, u32 val)
- {
- 	u32 tmp;
-@@ -796,6 +1045,8 @@ static inline int brcm_pcie_get_rc_bar2_
- 		size += entry->res->end - entry->res->start + 1;
- 		if (pcie_beg < lowest_pcie_addr)
- 			lowest_pcie_addr = pcie_beg;
-+		if (pcie->type == BCM2711 || pcie->type == BCM2712)
-+			break; // Only consider the first entry
- 	}
- 
- 	if (lowest_pcie_addr == ~(u64)0) {
-@@ -866,6 +1117,30 @@ static inline int brcm_pcie_get_rc_bar2_
- 	return 0;
- }
- 
-+static int brcm_pcie_get_rc_bar_n(struct brcm_pcie *pcie,
-+				  int idx,
-+				  u64 *rc_bar_cpu,
-+				  u64 *rc_bar_size,
-+				  u64 *rc_bar_pci)
-+{
-+	struct pci_host_bridge *bridge = pci_host_bridge_from_priv(pcie);
-+	struct resource_entry *entry;
-+	int i = 0;
-+
-+	resource_list_for_each_entry(entry, &bridge->dma_ranges) {
-+		if (i == idx) {
-+			*rc_bar_cpu  = entry->res->start;
-+			*rc_bar_size = entry->res->end - entry->res->start + 1;
-+			*rc_bar_pci = entry->res->start - entry->offset;
-+			return 0;
-+		}
-+
-+		i++;
-+	}
-+
-+	return -EINVAL;
-+}
-+
- static int brcm_pcie_setup(struct brcm_pcie *pcie)
- {
- 	u64 rc_bar2_offset, rc_bar2_size;
-@@ -874,11 +1149,14 @@ static int brcm_pcie_setup(struct brcm_p
- 	struct resource_entry *entry;
- 	u32 tmp, burst, aspm_support;
- 	int num_out_wins = 0;
--	int ret, memc;
-+	int ret, memc, count, i;
- 
- 	/* Reset the bridge */
- 	pcie->bridge_sw_init_set(pcie, 1);
--	pcie->perst_set(pcie, 1);
-+
-+	/* Ensure that PERST# is asserted; some bootloaders may deassert it. */
-+	if (pcie->type == BCM2711)
-+		pcie->perst_set(pcie, 1);
- 
- 	usleep_range(100, 200);
- 
-@@ -894,6 +1172,17 @@ static int brcm_pcie_setup(struct brcm_p
- 	/* Wait for SerDes to be stable */
- 	usleep_range(100, 200);
- 
-+	if (pcie->type == BCM2712) {
-+		/* Allow a 54MHz (xosc) refclk source */
-+		brcm_pcie_munge_pll(pcie);
-+		/* Fix for L1SS errata */
-+		tmp = readl(base + PCIE_RC_PL_PHY_CTL_15);
-+		tmp &= ~PCIE_RC_PL_PHY_CTL_15_PM_CLK_PERIOD_MASK;
-+		/* PM clock period is 18.52ns (round down) */
-+		tmp |= 0x12;
-+		writel(tmp, base + PCIE_RC_PL_PHY_CTL_15);
-+	}
-+
- 	/*
- 	 * SCB_MAX_BURST_SIZE is a two bit field.  For GENERIC chips it
- 	 * is encoded as 0=128, 1=256, 2=512, 3=Rsvd, for BCM7278 it
-@@ -903,18 +1192,25 @@ static int brcm_pcie_setup(struct brcm_p
- 		burst = 0x1; /* 256 bytes */
- 	else if (pcie->type == BCM2711)
- 		burst = 0x0; /* 128 bytes */
-+	else if (pcie->type == BCM2712)
-+		burst = 0x1; /* 128 bytes */
- 	else if (pcie->type == BCM7278)
- 		burst = 0x3; /* 512 bytes */
- 	else
- 		burst = 0x2; /* 512 bytes */
- 
--	/* Set SCB_MAX_BURST_SIZE, CFG_READ_UR_MODE, SCB_ACCESS_EN */
-+	/* Set SCB_MAX_BURST_SIZE, CFG_READ_UR_MODE, SCB_ACCESS_EN, RCB_MPS_MODE */
- 	tmp = readl(base + PCIE_MISC_MISC_CTRL);
- 	u32p_replace_bits(&tmp, 1, PCIE_MISC_MISC_CTRL_SCB_ACCESS_EN_MASK);
- 	u32p_replace_bits(&tmp, 1, PCIE_MISC_MISC_CTRL_CFG_READ_UR_MODE_MASK);
- 	u32p_replace_bits(&tmp, burst, PCIE_MISC_MISC_CTRL_MAX_BURST_SIZE_MASK);
-+	if (pcie->rcb_mps_mode)
-+		u32p_replace_bits(&tmp, 1, PCIE_MISC_MISC_CTRL_RCB_MPS_MODE_MASK);
-+	dev_info(pcie->dev, "setting SCB_ACCESS_EN, READ_UR_MODE, MAX_BURST_SIZE\n");
- 	writel(tmp, base + PCIE_MISC_MISC_CTRL);
- 
-+	brcm_pcie_set_tc_qos(pcie);
-+
- 	ret = brcm_pcie_get_rc_bar2_size_and_offset(pcie, &rc_bar2_size,
- 						    &rc_bar2_offset);
- 	if (ret)
-@@ -927,7 +1223,11 @@ static int brcm_pcie_setup(struct brcm_p
- 	writel(upper_32_bits(rc_bar2_offset),
- 	       base + PCIE_MISC_RC_BAR2_CONFIG_HI);
- 
-+	tmp = readl(base + PCIE_MISC_UBUS_BAR2_CONFIG_REMAP);
-+	u32p_replace_bits(&tmp, 1, PCIE_MISC_UBUS_BAR2_CONFIG_REMAP_ACCESS_ENABLE_MASK);
-+	writel(tmp, base + PCIE_MISC_UBUS_BAR2_CONFIG_REMAP);
- 	tmp = readl(base + PCIE_MISC_MISC_CTRL);
-+
- 	for (memc = 0; memc < pcie->num_memc; memc++) {
- 		u32 scb_size_val = ilog2(pcie->memc_size[memc]) - 15;
- 
-@@ -938,8 +1238,32 @@ static int brcm_pcie_setup(struct brcm_p
- 		else if (memc == 2)
- 			u32p_replace_bits(&tmp, scb_size_val, SCB_SIZE_MASK(2));
- 	}
-+
- 	writel(tmp, base + PCIE_MISC_MISC_CTRL);
- 
-+	if (pcie->type == BCM2712) {
-+		/* Suppress AXI error responses and return 1s for read failures */
-+		tmp = readl(base + PCIE_MISC_UBUS_CTRL);
-+		u32p_replace_bits(&tmp, 1, PCIE_MISC_UBUS_CTRL_UBUS_PCIE_REPLY_ERR_DIS_MASK);
-+		u32p_replace_bits(&tmp, 1, PCIE_MISC_UBUS_CTRL_UBUS_PCIE_REPLY_DECERR_DIS_MASK);
-+		writel(tmp, base + PCIE_MISC_UBUS_CTRL);
-+		writel(0xffffffff, base + PCIE_MISC_AXI_READ_ERROR_DATA);
-+
-+		/*
-+		 * Adjust timeouts. The UBUS timeout also affects CRS
-+		 * completion retries, as the request will get terminated if
-+		 * either timeout expires, so both have to be a large value
-+		 * (in clocks of 750MHz).
-+		 * Set UBUS timeout to 250ms, then set RC config retry timeout
-+		 * to be ~240ms.
-+		 *
-+		 * Setting CRSVis=1 will stop the core from blocking on a CRS
-+		 * response, but does require the device to be well-behaved...
-+		 */
-+		writel(0xB2D0000, base + PCIE_MISC_UBUS_TIMEOUT);
-+		writel(0xABA0000, base + PCIE_MISC_RC_CONFIG_RETRY_TIMEOUT);
-+	}
-+
- 	/*
- 	 * We ideally want the MSI target address to be located in the 32bit
- 	 * addressable memory area. Some devices might depend on it. This is
-@@ -952,7 +1276,7 @@ static int brcm_pcie_setup(struct brcm_p
- 	else
- 		pcie->msi_target_addr = BRCM_MSI_TARGET_ADDR_GT_4GB;
- 
--	if (!brcm_pcie_rc_mode(pcie)) {
-+	if (!pcie->rc_mode(pcie)) {
- 		dev_err(pcie->dev, "PCIe RC controller misconfigured as Endpoint\n");
- 		return -EINVAL;
- 	}
-@@ -976,6 +1300,38 @@ static int brcm_pcie_setup(struct brcm_p
- 		PCIE_RC_CFG_PRIV1_LINK_CAPABILITY_ASPM_SUPPORT_MASK);
- 	writel(tmp, base + PCIE_RC_CFG_PRIV1_LINK_CAPABILITY);
- 
-+	/* program additional inbound windows (RC_BAR4..RC_BAR10) */
-+	count = (pcie->type == BCM2712) ? 7 : 0;
-+	for (i = 0; i < count; i++) {
-+		u64 bar_cpu, bar_size, bar_pci;
-+
-+		ret = brcm_pcie_get_rc_bar_n(pcie, 1 + i, &bar_cpu, &bar_size,
-+					     &bar_pci);
-+		if (ret)
-+			break;
-+
-+		tmp = lower_32_bits(bar_pci);
-+		u32p_replace_bits(&tmp, brcm_pcie_encode_ibar_size(bar_size),
-+				  PCIE_MISC_RC_BAR_CONFIG_LO_SIZE_MASK);
-+		writel(tmp, base + PCIE_MISC_RC_BAR4_CONFIG_LO + i * 8);
-+		writel(upper_32_bits(bar_pci),
-+		       base + PCIE_MISC_RC_BAR4_CONFIG_HI + i * 8);
-+
-+		tmp = upper_32_bits(bar_cpu) &
-+			PCIE_MISC_UBUS_BAR_CONFIG_REMAP_HI_MASK;
-+		writel(tmp,
-+		       base + PCIE_MISC_UBUS_BAR4_CONFIG_REMAP_HI + i * 8);
-+		tmp = lower_32_bits(bar_cpu) &
-+			PCIE_MISC_UBUS_BAR_CONFIG_REMAP_LO_MASK;
-+		writel(tmp | PCIE_MISC_UBUS_BAR_CONFIG_REMAP_ENABLE,
-+		       base + PCIE_MISC_UBUS_BAR4_CONFIG_REMAP_LO + i * 8);
-+	}
-+
-+	if (pcie->gen) {
-+		dev_info(pcie->dev, "Forcing gen %d\n", pcie->gen);
-+		brcm_pcie_set_gen(pcie, pcie->gen);
-+	}
-+
- 	/*
- 	 * For config space accesses on the RC, show the right class for
- 	 * a PCIe-PCIe bridge (the default setting is to be EP mode).
-@@ -1031,7 +1387,6 @@ static int brcm_pcie_start_link(struct b
- 	void __iomem *base = pcie->base;
- 	u16 nlw, cls, lnksta;
- 	bool ssc_good = false;
--	u32 tmp;
- 	int ret, i;
- 
- 	/* Unassert the fundamental reset */
-@@ -1067,6 +1422,7 @@ static int brcm_pcie_start_link(struct b
- 			dev_err(dev, "failed attempt to enter ssc mode\n");
- 	}
- 
-+
- 	lnksta = readw(base + BRCM_PCIE_CAP_REGS + PCI_EXP_LNKSTA);
- 	cls = FIELD_GET(PCI_EXP_LNKSTA_CLS, lnksta);
- 	nlw = FIELD_GET(PCI_EXP_LNKSTA_NLW, lnksta);
-@@ -1074,27 +1430,6 @@ static int brcm_pcie_start_link(struct b
- 		 pci_speed_string(pcie_link_speed[cls]), nlw,
- 		 ssc_good ? "(SSC)" : "(!SSC)");
- 
--	tmp = readl(base + PCIE_MISC_HARD_PCIE_HARD_DEBUG);
--	if (pcie->l1ss) {
--		/*
--		 * Enable CLKREQ# signalling include L1 Substate control of
--		 * the CLKREQ# signal and the external reference clock buffer.
--		 * meet requirement for Endpoints that require CLKREQ#
--		 * assertion to clock active within 400ns.
--		 */
--		tmp &= ~PCIE_MISC_HARD_PCIE_HARD_DEBUG_CLKREQ_DEBUG_ENABLE_MASK;
--		tmp |= PCIE_MISC_HARD_PCIE_HARD_DEBUG_CLKREQ_L1SS_ENABLE_MASK;
--	} else {
--		/*
--		 * Refclk from RC should be gated with CLKREQ# input when
--		 * ASPM L0s,L1 is enabled => setting the CLKREQ_DEBUG_ENABLE
--		 * field to 1.
--		 */
--		tmp &= ~PCIE_MISC_HARD_PCIE_HARD_DEBUG_CLKREQ_L1SS_ENABLE_MASK;
--		tmp |= PCIE_MISC_HARD_PCIE_HARD_DEBUG_CLKREQ_DEBUG_ENABLE_MASK;
--	}
--	writel(tmp, base + PCIE_MISC_HARD_PCIE_HARD_DEBUG);
--
- 	return 0;
- }
- 
-@@ -1202,6 +1537,7 @@ static void brcm_pcie_enter_l23(struct b
- 
- static int brcm_phy_cntl(struct brcm_pcie *pcie, const int start)
- {
-+#if 0
- 	static const u32 shifts[PCIE_DVT_PMU_PCIE_PHY_CTRL_DAST_NFLDS] = {
- 		PCIE_DVT_PMU_PCIE_PHY_CTRL_DAST_PWRDN_SHIFT,
- 		PCIE_DVT_PMU_PCIE_PHY_CTRL_DAST_RESET_SHIFT,
-@@ -1234,6 +1570,9 @@ static int brcm_phy_cntl(struct brcm_pci
- 		dev_err(pcie->dev, "failed to %s phy\n", (start ? "start" : "stop"));
- 
- 	return ret;
-+#else
-+	return 0;
-+#endif
- }
- 
- static inline int brcm_phy_start(struct brcm_pcie *pcie)
-@@ -1266,6 +1605,12 @@ static void brcm_pcie_turn_off(struct br
- 	u32p_replace_bits(&tmp, 1, PCIE_MISC_HARD_PCIE_HARD_DEBUG_SERDES_IDDQ_MASK);
- 	writel(tmp, base + PCIE_MISC_HARD_PCIE_HARD_DEBUG);
- 
-+	/*
-+	 * Shutting down this bridge on pcie1 means accesses to rescal block
-+	 * will hang the chip if another RC wants to assert/deassert rescal.
-+	 */
-+	if (pcie->type == BCM2712)
-+		return;
- 	/* Shutdown PCIe bridge */
- 	pcie->bridge_sw_init_set(pcie, 1);
- }
-@@ -1296,9 +1641,9 @@ static int brcm_pcie_suspend_noirq(struc
- 	if (brcm_phy_stop(pcie))
- 		dev_err(dev, "Could not stop phy for suspend\n");
- 
--	ret = reset_control_rearm(pcie->rescal);
-+	ret = reset_control_assert(pcie->rescal);
- 	if (ret) {
--		dev_err(dev, "Could not rearm rescal reset\n");
-+		dev_err(dev, "Could not assert rescal reset\n");
- 		return ret;
- 	}
- 
-@@ -1393,7 +1738,7 @@ err_regulator:
- 	if (pcie->sr)
- 		regulator_bulk_disable(pcie->sr->num_supplies, pcie->sr->supplies);
- err_reset:
--	reset_control_rearm(pcie->rescal);
-+	reset_control_assert(pcie->rescal);
- err_disable_clk:
- 	clk_disable_unprepare(pcie->clk);
- 	return ret;
-@@ -1405,8 +1750,8 @@ static void __brcm_pcie_remove(struct br
- 	brcm_pcie_turn_off(pcie);
- 	if (brcm_phy_stop(pcie))
- 		dev_err(pcie->dev, "Could not stop phy\n");
--	if (reset_control_rearm(pcie->rescal))
--		dev_err(pcie->dev, "Could not rearm rescal reset\n");
-+	if (reset_control_assert(pcie->rescal))
-+		dev_err(pcie->dev, "Could not assert rescal reset\n");
- 	clk_disable_unprepare(pcie->clk);
- }
- 
-@@ -1426,12 +1771,16 @@ static const int pcie_offsets[] = {
- 	[RGR1_SW_INIT_1] = 0x9210,
- 	[EXT_CFG_INDEX]  = 0x9000,
- 	[EXT_CFG_DATA]   = 0x9004,
-+	[PCIE_HARD_DEBUG] = 0x4204,
-+	[INTR2_CPU]      = 0x4300,
- };
- 
- static const int pcie_offsets_bmips_7425[] = {
- 	[RGR1_SW_INIT_1] = 0x8010,
- 	[EXT_CFG_INDEX]  = 0x8300,
- 	[EXT_CFG_DATA]   = 0x8304,
-+	[PCIE_HARD_DEBUG] = 0x4204,
-+	[INTR2_CPU]      = 0x4300,
- };
- 
- static const struct pcie_cfg_data generic_cfg = {
-@@ -1439,6 +1788,7 @@ static const struct pcie_cfg_data generi
- 	.type		= GENERIC,
- 	.perst_set	= brcm_pcie_perst_set_generic,
- 	.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic,
-+	.rc_mode	= brcm_pcie_rc_mode_generic,
- };
- 
- static const struct pcie_cfg_data bcm7425_cfg = {
-@@ -1446,6 +1796,7 @@ static const struct pcie_cfg_data bcm742
- 	.type		= BCM7425,
- 	.perst_set	= brcm_pcie_perst_set_generic,
- 	.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic,
-+	.rc_mode	= brcm_pcie_rc_mode_generic,
- };
- 
- static const struct pcie_cfg_data bcm7435_cfg = {
-@@ -1460,12 +1811,15 @@ static const struct pcie_cfg_data bcm490
- 	.type		= BCM4908,
- 	.perst_set	= brcm_pcie_perst_set_4908,
- 	.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic,
-+	.rc_mode	= brcm_pcie_rc_mode_generic,
- };
- 
- static const int pcie_offset_bcm7278[] = {
- 	[RGR1_SW_INIT_1] = 0xc010,
- 	[EXT_CFG_INDEX] = 0x9000,
- 	[EXT_CFG_DATA] = 0x9004,
-+	[PCIE_HARD_DEBUG] = 0x4204,
-+	[INTR2_CPU]      = 0x4300,
- };
- 
- static const struct pcie_cfg_data bcm7278_cfg = {
-@@ -1473,6 +1827,7 @@ static const struct pcie_cfg_data bcm727
- 	.type		= BCM7278,
- 	.perst_set	= brcm_pcie_perst_set_7278,
- 	.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_7278,
-+	.rc_mode	= brcm_pcie_rc_mode_generic,
- };
- 
- static const struct pcie_cfg_data bcm2711_cfg = {
-@@ -1480,10 +1835,27 @@ static const struct pcie_cfg_data bcm271
- 	.type		= BCM2711,
- 	.perst_set	= brcm_pcie_perst_set_generic,
- 	.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic,
-+	.rc_mode	= brcm_pcie_rc_mode_generic,
-+};
-+
-+static const int pcie_offsets_bcm2712[] = {
-+	[EXT_CFG_INDEX] = 0x9000,
-+	[EXT_CFG_DATA] = 0x9004,
-+	[PCIE_HARD_DEBUG] = 0x4304,
-+	[INTR2_CPU] = 0x4400,
-+};
-+
-+static const struct pcie_cfg_data bcm2712_cfg = {
-+	.offsets	= pcie_offsets_bcm2712,
-+	.type		= BCM2712,
-+	.perst_set	= brcm_pcie_perst_set_2712,
-+	.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_2712,
-+	.rc_mode	= brcm_pcie_rc_mode_2712,
- };
- 
- static const struct of_device_id brcm_pcie_match[] = {
- 	{ .compatible = "brcm,bcm2711-pcie", .data = &bcm2711_cfg },
-+	{ .compatible = "brcm,bcm2712-pcie", .data = &bcm2712_cfg },
- 	{ .compatible = "brcm,bcm4908-pcie", .data = &bcm4908_cfg },
- 	{ .compatible = "brcm,bcm7211-pcie", .data = &generic_cfg },
- 	{ .compatible = "brcm,bcm7278-pcie", .data = &bcm7278_cfg },
-@@ -1524,7 +1896,7 @@ static int brcm_pcie_probe(struct platfo
- 
- 	data = of_device_get_match_data(&pdev->dev);
- 	if (!data) {
--		pr_err("failed to look up compatible string\n");
-+		dev_err(&pdev->dev, "failed to look up compatible string\n");
- 		return -EINVAL;
- 	}
- 
-@@ -1535,6 +1907,7 @@ static int brcm_pcie_probe(struct platfo
- 	pcie->type = data->type;
- 	pcie->perst_set = data->perst_set;
- 	pcie->bridge_sw_init_set = data->bridge_sw_init_set;
-+	pcie->rc_mode = data->rc_mode;
- 
- 	pcie->base = devm_platform_ioremap_resource(pdev, 0);
- 	if (IS_ERR(pcie->base))
-@@ -1549,6 +1922,7 @@ static int brcm_pcie_probe(struct platfo
- 
- 	pcie->ssc = of_property_read_bool(np, "brcm,enable-ssc");
- 	pcie->l1ss = of_property_read_bool(np, "brcm,enable-l1ss");
-+	pcie->rcb_mps_mode = of_property_read_bool(np, "brcm,enable-mps-rcb");
- 
- 	ret = clk_prepare_enable(pcie->clk);
- 	if (ret) {
-@@ -1565,14 +1939,20 @@ static int brcm_pcie_probe(struct platfo
- 		clk_disable_unprepare(pcie->clk);
- 		return PTR_ERR(pcie->perst_reset);
- 	}
-+	pcie->bridge_reset =
-+		devm_reset_control_get_optional_exclusive(&pdev->dev, "bridge");
-+	if (IS_ERR(pcie->bridge_reset)) {
-+		clk_disable_unprepare(pcie->clk);
-+		return PTR_ERR(pcie->bridge_reset);
-+	}
- 
--	ret = reset_control_reset(pcie->rescal);
-+	ret = reset_control_deassert(pcie->rescal);
- 	if (ret)
- 		dev_err(&pdev->dev, "failed to deassert 'rescal'\n");
- 
- 	ret = brcm_phy_start(pcie);
- 	if (ret) {
--		reset_control_rearm(pcie->rescal);
-+		reset_control_assert(pcie->rescal);
- 		clk_disable_unprepare(pcie->clk);
- 		return ret;
- 	}
-@@ -1595,6 +1975,33 @@ static int brcm_pcie_probe(struct platfo
- 			dev_err(pcie->dev, "probe of internal MSI failed");
- 			goto fail;
- 		}
-+	} else if (pci_msi_enabled() && msi_np != pcie->np) {
-+		/* Use RC_BAR1 for MIP access */
-+		u64 msi_pci_addr;
-+		u64 msi_phys_addr;
-+
-+		if (of_property_read_u64(msi_np, "brcm,msi-pci-addr", &msi_pci_addr)) {
-+			dev_err(pcie->dev, "Unable to find MSI PCI address\n");
-+			ret = -EINVAL;
-+			goto fail;
-+		}
-+
-+		if (of_property_read_u64(msi_np, "reg", &msi_phys_addr)) {
-+			dev_err(pcie->dev, "Unable to find MSI physical address\n");
-+			ret = -EINVAL;
-+			goto fail;
-+		}
-+
-+		writel(lower_32_bits(msi_pci_addr) | brcm_pcie_encode_ibar_size(0x1000),
-+		       pcie->base + PCIE_MISC_RC_BAR1_CONFIG_LO);
-+		writel(upper_32_bits(msi_pci_addr),
-+		       pcie->base + PCIE_MISC_RC_BAR1_CONFIG_HI);
-+
-+		writel(lower_32_bits(msi_phys_addr) |
-+		       PCIE_MISC_UBUS_BAR1_CONFIG_REMAP_ACCESS_ENABLE_MASK,
-+		       pcie->base + PCIE_MISC_UBUS_BAR1_CONFIG_REMAP);
-+		writel(upper_32_bits(msi_phys_addr),
-+		       pcie->base + PCIE_MISC_UBUS_BAR1_CONFIG_REMAP_HI);
- 	}
- 
- 	bridge->ops = pcie->type == BCM7425 ? &brcm7425_pcie_ops : &brcm_pcie_ops;
-@@ -1611,6 +2018,8 @@ static int brcm_pcie_probe(struct platfo
- 		return ret;
- 	}
- 
-+	brcm_pcie_config_clkreq(pcie);
-+
- 	return 0;
- 
- fail:
diff --git a/target/linux/bcm27xx/patches-6.1/950-0868-V4L2-Add-PiSP-opaque-formats-to-V4L2.patch b/target/linux/bcm27xx/patches-6.1/950-0868-V4L2-Add-PiSP-opaque-formats-to-V4L2.patch
deleted file mode 100644
index 3b50329ab1..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0868-V4L2-Add-PiSP-opaque-formats-to-V4L2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 9a11300e46344917226b986a8740e7581d66adf3 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Mon, 7 Feb 2022 09:20:49 +0000
-Subject: [PATCH] V4L2: Add PiSP opaque formats to V4L2
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/v4l2-core/v4l2-ioctl.c | 4 +++-
- include/uapi/linux/videodev2.h       | 7 +++++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
-
---- a/drivers/media/v4l2-core/v4l2-ioctl.c
-+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
-@@ -1452,7 +1452,9 @@ static void v4l_fill_fmtdesc(struct v4l2
- 	case V4L2_PIX_FMT_NV12M_10BE_8L128:	descr = "10-bit NV12M (8x128 Linear, BE)"; break;
- 	case V4L2_META_FMT_SENSOR_DATA:	descr = "Sensor Ancillary Metadata"; break;
- 	case V4L2_META_FMT_BCM2835_ISP_STATS: descr = "BCM2835 ISP Image Statistics"; break;
--	case V4L2_META_FMT_RPI_BE_CFG: descr = "PiSP Config format"; break;
-+	case V4L2_META_FMT_RPI_BE_CFG: descr = "PiSP BE Config format"; break;
-+	case V4L2_META_FMT_RPI_FE_CFG: descr = "PiSP FE Config format"; break;
-+	case V4L2_META_FMT_RPI_FE_STATS: descr = "PiSP FE Statistics format"; break;
- 
- 	default:
- 		/* Compressed formats */
---- a/include/uapi/linux/videodev2.h
-+++ b/include/uapi/linux/videodev2.h
-@@ -826,8 +826,15 @@ struct v4l2_pix_format {
- #define V4L2_META_FMT_RK_ISP1_STAT_3A	v4l2_fourcc('R', 'K', '1', 'S') /* Rockchip ISP1 3A Statistics */
- 
- /* The metadata format identifier for our configuration buffers. */
-+/* The metadata format identifier for BE configuration buffers. */
- #define V4L2_META_FMT_RPI_BE_CFG v4l2_fourcc('R', 'P', 'B', 'C')
- 
-+/* The metadata format identifier for FE configuration buffers. */
-+#define V4L2_META_FMT_RPI_FE_CFG v4l2_fourcc('R', 'P', 'F', 'C')
-+
-+/* The metadata format identifier for FE configuration buffers. */
-+#define V4L2_META_FMT_RPI_FE_STATS v4l2_fourcc('R', 'P', 'F', 'S')
-+
- /* priv field value to indicates that subsequent fields are valid. */
- #define V4L2_PIX_FMT_PRIV_MAGIC		0xfeedcafe
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0869-V4L2-Add-PiSP-compressed-formats-to-V4L2.patch b/target/linux/bcm27xx/patches-6.1/950-0869-V4L2-Add-PiSP-compressed-formats-to-V4L2.patch
deleted file mode 100644
index 6836922b7c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0869-V4L2-Add-PiSP-compressed-formats-to-V4L2.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 01f31f4145d49a30eb553c65ea755dde8dba1de0 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Wed, 2 Mar 2022 16:10:50 +0000
-Subject: [PATCH] V4L2: Add PiSP compressed formats to V4L2
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/v4l2-core/v4l2-ioctl.c | 4 ++++
- include/uapi/linux/videodev2.h       | 6 +++++-
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
---- a/drivers/media/v4l2-core/v4l2-ioctl.c
-+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
-@@ -1507,6 +1507,10 @@ static void v4l_fill_fmtdesc(struct v4l2
- 		case V4L2_PIX_FMT_QC08C:	descr = "QCOM Compressed 8-bit Format"; break;
- 		case V4L2_PIX_FMT_QC10C:	descr = "QCOM Compressed 10-bit Format"; break;
- 		case V4L2_PIX_FMT_RPI_BE: descr = "PiSP Opaque Format"; break;
-+		case V4L2_PIX_FMT_PISP_COMP_RGGB:
-+		case V4L2_PIX_FMT_PISP_COMP_GRBG:
-+		case V4L2_PIX_FMT_PISP_COMP_GBRG:
-+		case V4L2_PIX_FMT_PISP_COMP_BGGR: descr = "PiSP Bayer Compressed Format"; break;
- 		default:
- 			if (fmt->description[0])
- 				return;
---- a/include/uapi/linux/videodev2.h
-+++ b/include/uapi/linux/videodev2.h
-@@ -794,7 +794,11 @@ struct v4l2_pix_format {
- #define V4L2_PIX_FMT_IPU3_SRGGB10	v4l2_fourcc('i', 'p', '3', 'r') /* IPU3 packed 10-bit RGGB bayer */
- 
- /* The pixel format for all our buffers (the precise format is found in the config buffer). */
--#define V4L2_PIX_FMT_RPI_BE v4l2_fourcc('R', 'P', 'B', 'P')
-+#define V4L2_PIX_FMT_RPI_BE		v4l2_fourcc('R', 'P', 'B', 'P')
-+#define V4L2_PIX_FMT_PISP_COMP_RGGB	v4l2_fourcc('P', 'C', 'R', 'G')
-+#define V4L2_PIX_FMT_PISP_COMP_GRBG	v4l2_fourcc('P', 'C', 'G', 'R')
-+#define V4L2_PIX_FMT_PISP_COMP_GBRG	v4l2_fourcc('P', 'C', 'G', 'B')
-+#define V4L2_PIX_FMT_PISP_COMP_BGGR	v4l2_fourcc('P', 'C', 'B', 'G')
- 
- /* SDR formats - used only for Software Defined Radio devices */
- #define V4L2_SDR_FMT_CU8          v4l2_fourcc('C', 'U', '0', '8') /* IQ u8 */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0871-dt-binding-mfd-Add-binding-for-Raspberry-Pi-RP1.patch b/target/linux/bcm27xx/patches-6.1/950-0871-dt-binding-mfd-Add-binding-for-Raspberry-Pi-RP1.patch
deleted file mode 100644
index 9e98dd0345..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0871-dt-binding-mfd-Add-binding-for-Raspberry-Pi-RP1.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-From c93f469dabdbed822e5abeb5283d79fc9faa858c Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Fri, 28 Oct 2022 14:10:34 +0100
-Subject: [PATCH] dt-binding: mfd: Add binding for Raspberry Pi RP1
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- include/dt-bindings/mfd/rp1.h | 235 ++++++++++++++++++++++++++++++++++
- 1 file changed, 235 insertions(+)
- create mode 100644 include/dt-bindings/mfd/rp1.h
-
---- /dev/null
-+++ b/include/dt-bindings/mfd/rp1.h
-@@ -0,0 +1,235 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * This header provides constants for the PY MFD.
-+ */
-+
-+#ifndef _RP1_H
-+#define _RP1_H
-+
-+/* Address map */
-+#define RP1_SYSINFO_BASE 0x000000
-+#define RP1_TBMAN_BASE 0x004000
-+#define RP1_SYSCFG_BASE 0x008000
-+#define RP1_OTP_BASE 0x00c000
-+#define RP1_POWER_BASE 0x010000
-+#define RP1_RESETS_BASE 0x014000
-+#define RP1_CLOCKS_BANK_DEFAULT_BASE 0x018000
-+#define RP1_CLOCKS_BANK_VIDEO_BASE 0x01c000
-+#define RP1_PLL_SYS_BASE 0x020000
-+#define RP1_PLL_AUDIO_BASE 0x024000
-+#define RP1_PLL_VIDEO_BASE 0x028000
-+#define RP1_UART0_BASE 0x030000
-+#define RP1_UART1_BASE 0x034000
-+#define RP1_UART2_BASE 0x038000
-+#define RP1_UART3_BASE 0x03c000
-+#define RP1_UART4_BASE 0x040000
-+#define RP1_UART5_BASE 0x044000
-+#define RP1_SPI8_BASE 0x04c000
-+#define RP1_SPI0_BASE 0x050000
-+#define RP1_SPI1_BASE 0x054000
-+#define RP1_SPI2_BASE 0x058000
-+#define RP1_SPI3_BASE 0x05c000
-+#define RP1_SPI4_BASE 0x060000
-+#define RP1_SPI5_BASE 0x064000
-+#define RP1_SPI6_BASE 0x068000
-+#define RP1_SPI7_BASE 0x06c000
-+#define RP1_I2C0_BASE 0x070000
-+#define RP1_I2C1_BASE 0x074000
-+#define RP1_I2C2_BASE 0x078000
-+#define RP1_I2C3_BASE 0x07c000
-+#define RP1_I2C4_BASE 0x080000
-+#define RP1_I2C5_BASE 0x084000
-+#define RP1_I2C6_BASE 0x088000
-+#define RP1_AUDIO_IN_BASE 0x090000
-+#define RP1_AUDIO_OUT_BASE 0x094000
-+#define RP1_PWM0_BASE 0x098000
-+#define RP1_PWM1_BASE 0x09c000
-+#define RP1_I2S0_BASE 0x0a0000
-+#define RP1_I2S1_BASE 0x0a4000
-+#define RP1_I2S2_BASE 0x0a8000
-+#define RP1_TIMER_BASE 0x0ac000
-+#define RP1_SDIO0_APBS_BASE 0x0b0000
-+#define RP1_SDIO1_APBS_BASE 0x0b4000
-+#define RP1_BUSFABRIC_MONITOR_BASE 0x0c0000
-+#define RP1_BUSFABRIC_AXISHIM_BASE 0x0c4000
-+#define RP1_ADC_BASE 0x0c8000
-+#define RP1_IO_BANK0_BASE 0x0d0000
-+#define RP1_IO_BANK1_BASE 0x0d4000
-+#define RP1_IO_BANK2_BASE 0x0d8000
-+#define RP1_SYS_RIO0_BASE 0x0e0000
-+#define RP1_SYS_RIO1_BASE 0x0e4000
-+#define RP1_SYS_RIO2_BASE 0x0e8000
-+#define RP1_PADS_BANK0_BASE 0x0f0000
-+#define RP1_PADS_BANK1_BASE 0x0f4000
-+#define RP1_PADS_BANK2_BASE 0x0f8000
-+#define RP1_PADS_ETH_BASE 0x0fc000
-+#define RP1_ETH_IP_BASE 0x100000
-+#define RP1_ETH_CFG_BASE 0x104000
-+#define RP1_PCIE_APBS_BASE 0x108000
-+#define RP1_MIPI0_CSIDMA_BASE 0x110000
-+#define RP1_MIPI0_CSIHOST_BASE 0x114000
-+#define RP1_MIPI0_DSIDMA_BASE 0x118000
-+#define RP1_MIPI0_DSIHOST_BASE 0x11c000
-+#define RP1_MIPI0_MIPICFG_BASE 0x120000
-+#define RP1_MIPI0_ISP_BASE 0x124000
-+#define RP1_MIPI1_CSIDMA_BASE 0x128000
-+#define RP1_MIPI1_CSIHOST_BASE 0x12c000
-+#define RP1_MIPI1_DSIDMA_BASE 0x130000
-+#define RP1_MIPI1_DSIHOST_BASE 0x134000
-+#define RP1_MIPI1_MIPICFG_BASE 0x138000
-+#define RP1_MIPI1_ISP_BASE 0x13c000
-+#define RP1_VIDEO_OUT_CFG_BASE 0x140000
-+#define RP1_VIDEO_OUT_VEC_BASE 0x144000
-+#define RP1_VIDEO_OUT_DPI_BASE 0x148000
-+#define RP1_XOSC_BASE 0x150000
-+#define RP1_WATCHDOG_BASE 0x154000
-+#define RP1_DMA_TICK_BASE 0x158000
-+#define RP1_SDIO_CLOCKS_BASE 0x15c000
-+#define RP1_USBHOST0_APBS_BASE 0x160000
-+#define RP1_USBHOST1_APBS_BASE 0x164000
-+#define RP1_ROSC0_BASE 0x168000
-+#define RP1_ROSC1_BASE 0x16c000
-+#define RP1_VBUSCTRL_BASE 0x170000
-+#define RP1_TICKS_BASE 0x174000
-+#define RP1_PIO_APBS_BASE 0x178000
-+#define RP1_SDIO0_AHBLS_BASE 0x180000
-+#define RP1_SDIO1_AHBLS_BASE 0x184000
-+#define RP1_DMA_BASE 0x188000
-+#define RP1_RAM_BASE 0x1c0000
-+#define RP1_RAM_SIZE 0x020000
-+#define RP1_USBHOST0_AXIS_BASE 0x200000
-+#define RP1_USBHOST1_AXIS_BASE 0x300000
-+#define RP1_EXAC_BASE 0x400000
-+
-+/* Interrupts */
-+
-+#define RP1_INT_IO_BANK0 0
-+#define RP1_INT_IO_BANK1 1
-+#define RP1_INT_IO_BANK2 2
-+#define RP1_INT_AUDIO_IN 3
-+#define RP1_INT_AUDIO_OUT 4
-+#define RP1_INT_PWM0 5
-+#define RP1_INT_ETH 6
-+#define RP1_INT_I2C0 7
-+#define RP1_INT_I2C1 8
-+#define RP1_INT_I2C2 9
-+#define RP1_INT_I2C3 10
-+#define RP1_INT_I2C4 11
-+#define RP1_INT_I2C5 12
-+#define RP1_INT_I2C6 13
-+#define RP1_INT_I2S0 14
-+#define RP1_INT_I2S1 15
-+#define RP1_INT_I2S2 16
-+#define RP1_INT_SDIO0 17
-+#define RP1_INT_SDIO1 18
-+#define RP1_INT_SPI0 19
-+#define RP1_INT_SPI1 20
-+#define RP1_INT_SPI2 21
-+#define RP1_INT_SPI3 22
-+#define RP1_INT_SPI4 23
-+#define RP1_INT_SPI5 24
-+#define RP1_INT_UART0 25
-+#define RP1_INT_TIMER_0 26
-+#define RP1_INT_TIMER_1 27
-+#define RP1_INT_TIMER_2 28
-+#define RP1_INT_TIMER_3 29
-+#define RP1_INT_USBHOST0 30
-+#define RP1_INT_USBHOST0_0 31
-+#define RP1_INT_USBHOST0_1 32
-+#define RP1_INT_USBHOST0_2 33
-+#define RP1_INT_USBHOST0_3 34
-+#define RP1_INT_USBHOST1 35
-+#define RP1_INT_USBHOST1_0 36
-+#define RP1_INT_USBHOST1_1 37
-+#define RP1_INT_USBHOST1_2 38
-+#define RP1_INT_USBHOST1_3 39
-+#define RP1_INT_DMA 40
-+#define RP1_INT_PWM1 41
-+#define RP1_INT_UART1 42
-+#define RP1_INT_UART2 43
-+#define RP1_INT_UART3 44
-+#define RP1_INT_UART4 45
-+#define RP1_INT_UART5 46
-+#define RP1_INT_MIPI0 47
-+#define RP1_INT_MIPI1 48
-+#define RP1_INT_VIDEO_OUT 49
-+#define RP1_INT_PIO_0 50
-+#define RP1_INT_PIO_1 51
-+#define RP1_INT_ADC_FIFO 52
-+#define RP1_INT_PCIE_OUT 53
-+#define RP1_INT_SPI6 54
-+#define RP1_INT_SPI7 55
-+#define RP1_INT_SPI8 56
-+#define RP1_INT_SYSCFG 58
-+#define RP1_INT_CLOCKS_DEFAULT 59
-+#define RP1_INT_VBUSCTRL 60
-+#define RP1_INT_PROC_MISC 57
-+#define RP1_INT_END 61
-+
-+/* DMA peripherals (for pacing) */
-+#define RP1_DMA_I2C0_RX 0x0
-+#define RP1_DMA_I2C0_TX 0x1
-+#define RP1_DMA_I2C1_RX 0x2
-+#define RP1_DMA_I2C1_TX 0x3
-+#define RP1_DMA_I2C2_RX 0x4
-+#define RP1_DMA_I2C2_TX 0x5
-+#define RP1_DMA_I2C3_RX 0x6
-+#define RP1_DMA_I2C3_TX 0x7
-+#define RP1_DMA_I2C4_RX 0x8
-+#define RP1_DMA_I2C4_TX 0x9
-+#define RP1_DMA_I2C5_RX 0xa
-+#define RP1_DMA_I2C5_TX 0xb
-+#define RP1_DMA_SPI0_RX 0xc
-+#define RP1_DMA_SPI0_TX 0xd
-+#define RP1_DMA_SPI1_RX 0xe
-+#define RP1_DMA_SPI1_TX 0xf
-+#define RP1_DMA_SPI2_RX 0x10
-+#define RP1_DMA_SPI2_TX 0x11
-+#define RP1_DMA_SPI3_RX 0x12
-+#define RP1_DMA_SPI3_TX 0x13
-+#define RP1_DMA_SPI4_RX 0x14
-+#define RP1_DMA_SPI4_TX 0x15
-+#define RP1_DMA_SPI5_RX 0x16
-+#define RP1_DMA_SPI5_TX 0x17
-+#define RP1_DMA_PWM0 0x18
-+#define RP1_DMA_UART0_RX 0x19
-+#define RP1_DMA_UART0_TX 0x1a
-+#define RP1_DMA_AUDIO_IN_CH0 0x1b
-+#define RP1_DMA_AUDIO_IN_CH1 0x1c
-+#define RP1_DMA_AUDIO_OUT 0x1d
-+#define RP1_DMA_PWM1 0x1e
-+#define RP1_DMA_I2S0_RX 0x1f
-+#define RP1_DMA_I2S0_TX 0x20
-+#define RP1_DMA_I2S1_RX 0x21
-+#define RP1_DMA_I2S1_TX 0x22
-+#define RP1_DMA_I2S2_RX 0x23
-+#define RP1_DMA_I2S2_TX 0x24
-+#define RP1_DMA_UART1_RX 0x25
-+#define RP1_DMA_UART1_TX 0x26
-+#define RP1_DMA_UART2_RX 0x27
-+#define RP1_DMA_UART2_TX 0x28
-+#define RP1_DMA_UART3_RX 0x29
-+#define RP1_DMA_UART3_TX 0x2a
-+#define RP1_DMA_UART4_RX 0x2b
-+#define RP1_DMA_UART4_TX 0x2c
-+#define RP1_DMA_UART5_RX 0x2d
-+#define RP1_DMA_UART5_TX 0x2e
-+#define RP1_DMA_ADC 0x2f
-+#define RP1_DMA_DMA_TICK_TICK0 0x30
-+#define RP1_DMA_DMA_TICK_TICK1 0x31
-+#define RP1_DMA_SPI6_RX 0x32
-+#define RP1_DMA_SPI6_TX 0x33
-+#define RP1_DMA_SPI7_RX 0x34
-+#define RP1_DMA_SPI7_TX 0x35
-+#define RP1_DMA_SPI8_RX 0x36
-+#define RP1_DMA_SPI8_TX 0x37
-+#define RP1_DMA_PIO_CH0_TX 0x38
-+#define RP1_DMA_PIO_CH0_RX 0x39
-+#define RP1_DMA_PIO_CH1_TX 0x3a
-+#define RP1_DMA_PIO_CH1_RX 0x3b
-+#define RP1_DMA_PIO_CH2_TX 0x3c
-+#define RP1_DMA_PIO_CH2_RX 0x3d
-+#define RP1_DMA_PIO_CH3_TX 0x3e
-+#define RP1_DMA_PIO_CH3_RX 0x3f
-+
-+#endif
diff --git a/target/linux/bcm27xx/patches-6.1/950-0872-mfd-Add-rp1-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0872-mfd-Add-rp1-driver.patch
deleted file mode 100644
index c2044753f9..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0872-mfd-Add-rp1-driver.patch
+++ /dev/null
@@ -1,442 +0,0 @@
-From 7196a12b94e90225686e6c34cdf65a583214f7a5 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 10 Oct 2022 14:21:50 +0100
-Subject: [PATCH] mfd: Add rp1 driver
-
-RP1 is a multifunction PCIe device that exposes a range of
-peripherals.
-Add the parent driver to manage these.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/mfd/Kconfig          |  11 ++
- drivers/mfd/Makefile         |   1 +
- drivers/mfd/rp1.c            | 367 +++++++++++++++++++++++++++++++++++
- include/linux/rp1_platform.h |  20 ++
- 4 files changed, 399 insertions(+)
- create mode 100644 drivers/mfd/rp1.c
- create mode 100644 include/linux/rp1_platform.h
-
---- a/drivers/mfd/Kconfig
-+++ b/drivers/mfd/Kconfig
-@@ -2253,6 +2253,17 @@ config MFD_INTEL_M10_BMC
- 	  additional drivers must be enabled in order to use the functionality
- 	  of the device.
- 
-+config MFD_RP1
-+	tristate "RP1 MFD driver"
-+	depends on PCI
-+	select MFD_CORE
-+	help
-+	  Support for the RP1 peripheral chip.
-+
-+	  This driver provides support for the Raspberry Pi RP1 peripheral chip.
-+	  It is responsible for enabling the Device Tree node once the PCIe endpoint
-+	  has been configured, and handling interrupts.
-+
- config MFD_RSMU_I2C
- 	tristate "Renesas Synchronization Management Unit with I2C"
- 	depends on I2C && OF
---- a/drivers/mfd/Makefile
-+++ b/drivers/mfd/Makefile
-@@ -273,6 +273,7 @@ obj-$(CONFIG_MFD_RPISENSE_CORE)	+= rpise
- obj-$(CONFIG_SGI_MFD_IOC3)	+= ioc3.o
- obj-$(CONFIG_MFD_SIMPLE_MFD_I2C)	+= simple-mfd-i2c.o
- obj-$(CONFIG_MFD_INTEL_M10_BMC)   += intel-m10-bmc.o
-+obj-$(CONFIG_MFD_RP1)		+= rp1.o
- 
- obj-$(CONFIG_MFD_ATC260X)	+= atc260x-core.o
- obj-$(CONFIG_MFD_ATC260X_I2C)	+= atc260x-i2c.o
---- /dev/null
-+++ b/drivers/mfd/rp1.c
-@@ -0,0 +1,367 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Copyright (c) 2018-22 Raspberry Pi Ltd.
-+ * All rights reserved.
-+ */
-+
-+#include <linux/clk.h>
-+#include <linux/clkdev.h>
-+#include <linux/clk-provider.h>
-+#include <linux/completion.h>
-+#include <linux/etherdevice.h>
-+#include <linux/err.h>
-+#include <linux/interrupt.h>
-+#include <linux/io.h>
-+#include <linux/irq.h>
-+#include <linux/irqchip/chained_irq.h>
-+#include <linux/irqdomain.h>
-+#include <linux/mfd/core.h>
-+#include <linux/mmc/host.h>
-+#include <linux/module.h>
-+#include <linux/msi.h>
-+#include <linux/of_platform.h>
-+#include <linux/pci.h>
-+#include <linux/platform_device.h>
-+#include <linux/rp1_platform.h>
-+#include <linux/reset.h>
-+#include <linux/slab.h>
-+
-+#include <dt-bindings/mfd/rp1.h>
-+
-+/* TO DO:
-+ * 1. Occasional shutdown crash - RP1 being closed before its children?
-+ * 2. DT mode interrupt handling.
-+ */
-+
-+#define RP1_DRIVER_NAME "rp1"
-+
-+#define PCI_VENDOR_ID_RPI 0x1de4
-+#define PCI_DEVICE_ID_RP1_C0 0x0001
-+#define PCI_DEVICE_REV_RP1_C0 2
-+
-+#define RP1_ACTUAL_IRQS		RP1_INT_END
-+#define RP1_IRQS		RP1_ACTUAL_IRQS
-+
-+#define RP1_SYSCLK_RATE		200000000
-+#define RP1_SYSCLK_FPGA_RATE	60000000
-+
-+// Don't want to include the whole sysinfo reg header
-+#define SYSINFO_CHIP_ID_OFFSET	0x00000000
-+#define SYSINFO_PLATFORM_OFFSET	0x00000004
-+
-+#define REG_RW          0x000
-+#define REG_SET         0x800
-+#define REG_CLR         0xc00
-+
-+// MSIX CFG registers start at 0x8
-+#define MSIX_CFG(x) (0x8 + (4 * (x)))
-+
-+#define MSIX_CFG_IACK_EN        BIT(3)
-+#define MSIX_CFG_IACK           BIT(2)
-+#define MSIX_CFG_TEST           BIT(1)
-+#define MSIX_CFG_ENABLE         BIT(0)
-+
-+#define INTSTATL		0x108
-+#define INTSTATH		0x10c
-+
-+struct rp1_dev {
-+	struct pci_dev *pdev;
-+	struct device *dev;
-+	resource_size_t bar_start;
-+	resource_size_t bar_end;
-+	struct clk *sys_clk;
-+	struct irq_domain *domain;
-+	struct irq_data *pcie_irqds[64];
-+	void __iomem *msix_cfg_regs;
-+};
-+
-+static bool rp1_level_triggered_irq[RP1_ACTUAL_IRQS] = { 0 };
-+
-+static struct rp1_dev *g_rp1;
-+static u32 g_chip_id, g_platform;
-+
-+static void dump_bar(struct pci_dev *pdev, unsigned int bar)
-+{
-+	dev_info(&pdev->dev,
-+		 "bar%d len 0x%llx, start 0x%llx, end 0x%llx, flags, 0x%lx\n",
-+		 bar,
-+		 pci_resource_len(pdev, bar),
-+		 pci_resource_start(pdev, bar),
-+		 pci_resource_end(pdev, bar),
-+		 pci_resource_flags(pdev, bar));
-+}
-+
-+static void msix_cfg_set(struct rp1_dev *rp1, unsigned int hwirq, u32 value)
-+{
-+	writel(value, rp1->msix_cfg_regs + REG_SET + MSIX_CFG(hwirq));
-+}
-+
-+static void msix_cfg_clr(struct rp1_dev *rp1, unsigned int hwirq, u32 value)
-+{
-+	writel(value, rp1->msix_cfg_regs + REG_CLR + MSIX_CFG(hwirq));
-+}
-+
-+static void rp1_mask_irq(struct irq_data *irqd)
-+{
-+	struct rp1_dev *rp1 = irqd->domain->host_data;
-+	struct irq_data *pcie_irqd = rp1->pcie_irqds[irqd->hwirq];
-+
-+	pci_msi_mask_irq(pcie_irqd);
-+}
-+
-+static void rp1_unmask_irq(struct irq_data *irqd)
-+{
-+	struct rp1_dev *rp1 = irqd->domain->host_data;
-+	struct irq_data *pcie_irqd = rp1->pcie_irqds[irqd->hwirq];
-+
-+	pci_msi_unmask_irq(pcie_irqd);
-+}
-+
-+static int rp1_irq_set_type(struct irq_data *irqd, unsigned int type)
-+{
-+	struct rp1_dev *rp1 = irqd->domain->host_data;
-+	unsigned int hwirq = (unsigned int)irqd->hwirq;
-+	int ret = 0;
-+
-+	switch (type) {
-+	case IRQ_TYPE_LEVEL_HIGH:
-+		dev_dbg(rp1->dev, "MSIX IACK EN for irq %d\n", hwirq);
-+		msix_cfg_set(rp1, hwirq, MSIX_CFG_IACK_EN);
-+		rp1_level_triggered_irq[hwirq] = true;
-+	break;
-+	case IRQ_TYPE_EDGE_RISING:
-+		msix_cfg_clr(rp1, hwirq, MSIX_CFG_IACK_EN);
-+		rp1_level_triggered_irq[hwirq] = false;
-+		break;
-+	default:
-+		ret = -EINVAL;
-+		break;
-+	}
-+
-+	return ret;
-+}
-+
-+static struct irq_chip rp1_irq_chip = {
-+	.name            = "rp1_irq_chip",
-+	.irq_mask        = rp1_mask_irq,
-+	.irq_unmask      = rp1_unmask_irq,
-+	.irq_set_type    = rp1_irq_set_type,
-+};
-+
-+static void rp1_chained_handle_irq(struct irq_desc *desc)
-+{
-+	struct irq_chip *chip = irq_desc_get_chip(desc);
-+	struct rp1_dev *rp1 = desc->irq_data.chip_data;
-+	unsigned int hwirq = desc->irq_data.hwirq & 0x3f;
-+	int new_irq;
-+
-+	rp1 = g_rp1;
-+
-+	chained_irq_enter(chip, desc);
-+
-+	new_irq = irq_linear_revmap(rp1->domain, hwirq);
-+	generic_handle_irq(new_irq);
-+	if (rp1_level_triggered_irq[hwirq])
-+		msix_cfg_set(rp1, hwirq, MSIX_CFG_IACK);
-+
-+	chained_irq_exit(chip, desc);
-+}
-+
-+static int rp1_irq_xlate(struct irq_domain *d, struct device_node *node,
-+			 const u32 *intspec, unsigned int intsize,
-+			 unsigned long *out_hwirq, unsigned int *out_type)
-+{
-+	struct rp1_dev *rp1 = d->host_data;
-+	struct irq_data *pcie_irqd;
-+	unsigned long hwirq;
-+	int pcie_irq;
-+	int ret;
-+
-+	ret = irq_domain_xlate_twocell(d, node, intspec, intsize,
-+				       &hwirq, out_type);
-+	if (!ret) {
-+		pcie_irq = pci_irq_vector(rp1->pdev, hwirq);
-+		pcie_irqd = irq_get_irq_data(pcie_irq);
-+		rp1->pcie_irqds[hwirq] = pcie_irqd;
-+		*out_hwirq = hwirq;
-+	}
-+	return ret;
-+}
-+
-+static int rp1_irq_activate(struct irq_domain *d, struct irq_data *irqd,
-+			    bool reserve)
-+{
-+	struct rp1_dev *rp1 = d->host_data;
-+	struct irq_data *pcie_irqd;
-+
-+	pcie_irqd = rp1->pcie_irqds[irqd->hwirq];
-+	msix_cfg_set(rp1, (unsigned int)irqd->hwirq, MSIX_CFG_ENABLE);
-+	return irq_domain_activate_irq(pcie_irqd, reserve);
-+}
-+
-+static void rp1_irq_deactivate(struct irq_domain *d, struct irq_data *irqd)
-+{
-+	struct rp1_dev *rp1 = d->host_data;
-+	struct irq_data *pcie_irqd;
-+
-+	pcie_irqd = rp1->pcie_irqds[irqd->hwirq];
-+	msix_cfg_clr(rp1, (unsigned int)irqd->hwirq, MSIX_CFG_ENABLE);
-+	return irq_domain_deactivate_irq(pcie_irqd);
-+}
-+
-+static const struct irq_domain_ops rp1_domain_ops = {
-+	.xlate      = rp1_irq_xlate,
-+	.activate   = rp1_irq_activate,
-+	.deactivate = rp1_irq_deactivate,
-+};
-+
-+static inline dma_addr_t rp1_io_to_phys(struct rp1_dev *rp1, unsigned int offset)
-+{
-+	return rp1->bar_start + offset;
-+}
-+
-+static u32 rp1_reg_read(struct rp1_dev *rp1, unsigned int base_addr, u32 offset)
-+{
-+	dma_addr_t phys = rp1_io_to_phys(rp1, base_addr);
-+	void __iomem *regblock = ioremap(phys, 0x1000);
-+	u32 value = readl(regblock + offset);
-+
-+	iounmap(regblock);
-+	return value;
-+}
-+
-+void rp1_get_platform(u32 *chip_id, u32 *platform)
-+{
-+	if (chip_id)
-+		*chip_id = g_chip_id;
-+	if (platform)
-+		*platform = g_platform;
-+}
-+EXPORT_SYMBOL_GPL(rp1_get_platform);
-+
-+static int rp1_probe(struct pci_dev *pdev, const struct pci_device_id *id)
-+{
-+	struct reset_control *reset;
-+	struct platform_device *pcie_pdev;
-+	struct device_node *rp1_node;
-+	struct rp1_dev *rp1;
-+	int err  = 0;
-+	int i;
-+
-+	reset = devm_reset_control_get_optional_exclusive(&pdev->dev, NULL);
-+	if (IS_ERR(reset))
-+		return PTR_ERR(reset);
-+	reset_control_reset(reset);
-+
-+	dump_bar(pdev, 0);
-+	dump_bar(pdev, 1);
-+
-+	if (pci_resource_len(pdev, 1) <= 0x10000) {
-+		dev_err(&pdev->dev,
-+			"Not initialised - is the firmware running?\n");
-+		return -EINVAL;
-+	}
-+
-+	/* enable pci device */
-+	err = pcim_enable_device(pdev);
-+	if (err < 0) {
-+		dev_err(&pdev->dev, "Enabling PCI device has failed: %d",
-+			err);
-+		return err;
-+	}
-+
-+	pci_set_master(pdev);
-+
-+	err = pci_alloc_irq_vectors(pdev, RP1_IRQS, RP1_IRQS,
-+				    PCI_IRQ_MSIX);
-+	if (err != RP1_IRQS) {
-+		dev_err(&pdev->dev, "pci_alloc_irq_vectors failed - %d\n", err);
-+		return err;
-+	}
-+
-+	rp1 = devm_kzalloc(&pdev->dev, sizeof(*rp1), GFP_KERNEL);
-+	if (!rp1)
-+		return -ENOMEM;
-+
-+	rp1->pdev = pdev;
-+	rp1->dev = &pdev->dev;
-+
-+	pci_set_drvdata(pdev, rp1);
-+
-+	rp1->bar_start = pci_resource_start(pdev, 1);
-+	rp1->bar_end = pci_resource_end(pdev, 1);
-+
-+	// Get chip id
-+	g_chip_id = rp1_reg_read(rp1, RP1_SYSINFO_BASE, SYSINFO_CHIP_ID_OFFSET);
-+	g_platform = rp1_reg_read(rp1, RP1_SYSINFO_BASE, SYSINFO_PLATFORM_OFFSET);
-+	dev_info(&pdev->dev, "chip_id 0x%x%s\n", g_chip_id,
-+		 (g_platform & RP1_PLATFORM_FPGA) ? " FPGA" : "");
-+	if (g_chip_id != RP1_C0_CHIP_ID) {
-+		dev_err(&pdev->dev, "wrong chip id (%x)\n", g_chip_id);
-+		return -EINVAL;
-+	}
-+
-+	rp1_node = of_find_node_by_name(NULL, "rp1");
-+	if (!rp1_node) {
-+		dev_err(&pdev->dev, "failed to find RP1 DT node\n");
-+		return -EINVAL;
-+	}
-+
-+	pcie_pdev = of_find_device_by_node(rp1_node->parent);
-+	rp1->domain = irq_domain_add_linear(rp1_node, RP1_IRQS,
-+					    &rp1_domain_ops, rp1);
-+
-+	g_rp1 = rp1;
-+
-+	/* TODO can this go in the rp1 device tree entry? */
-+	rp1->msix_cfg_regs = ioremap(rp1_io_to_phys(rp1, RP1_PCIE_APBS_BASE), 0x1000);
-+
-+	for (i = 0; i < RP1_IRQS; i++) {
-+		int irq = irq_create_mapping(rp1->domain, i);
-+
-+		if (irq < 0) {
-+			dev_err(&pdev->dev, "failed to create irq mapping\n");
-+			return irq;
-+		}
-+
-+		irq_set_chip_data(irq, rp1);
-+		irq_set_chip_and_handler(irq, &rp1_irq_chip, handle_level_irq);
-+		irq_set_probe(irq);
-+		irq_set_chained_handler(pci_irq_vector(pdev, i),
-+					rp1_chained_handle_irq);
-+	}
-+
-+	if (rp1_node)
-+		of_platform_populate(rp1_node, NULL, NULL, &pcie_pdev->dev);
-+
-+	of_node_put(rp1_node);
-+
-+	return 0;
-+}
-+
-+static void rp1_remove(struct pci_dev *pdev)
-+{
-+	struct rp1_dev *rp1 = pci_get_drvdata(pdev);
-+
-+	mfd_remove_devices(&pdev->dev);
-+
-+	clk_unregister(rp1->sys_clk);
-+}
-+
-+static const struct pci_device_id dev_id_table[] = {
-+	{ PCI_DEVICE(PCI_VENDOR_ID_RPI, PCI_DEVICE_ID_RP1_C0), },
-+	{ 0, }
-+};
-+
-+static struct pci_driver rp1_driver = {
-+	.name		= RP1_DRIVER_NAME,
-+	.id_table	= dev_id_table,
-+	.probe		= rp1_probe,
-+	.remove		= rp1_remove,
-+};
-+
-+module_pci_driver(rp1_driver);
-+
-+MODULE_AUTHOR("Phil Elwell <phil@raspberrypi.com>");
-+MODULE_DESCRIPTION("RP1 wrapper");
-+MODULE_LICENSE("GPL");
---- /dev/null
-+++ b/include/linux/rp1_platform.h
-@@ -0,0 +1,20 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * Copyright (c) 2021-2022 Raspberry Pi Ltd.
-+ * All rights reserved.
-+ */
-+
-+#ifndef _RP1_PLATFORM_H
-+#define _RP1_PLATFORM_H
-+
-+#include <vdso/bits.h>
-+
-+#define RP1_B0_CHIP_ID 0x10001927
-+#define RP1_C0_CHIP_ID 0x20001927
-+
-+#define RP1_PLATFORM_ASIC BIT(1)
-+#define RP1_PLATFORM_FPGA BIT(0)
-+
-+void rp1_get_platform(u32 *chip_id, u32 *platform);
-+
-+#endif
diff --git a/target/linux/bcm27xx/patches-6.1/950-0873-dt-bindings-clock-Add-bindings-for-Raspberry-Pi-RP1.patch b/target/linux/bcm27xx/patches-6.1/950-0873-dt-bindings-clock-Add-bindings-for-Raspberry-Pi-RP1.patch
deleted file mode 100644
index f94782438b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0873-dt-bindings-clock-Add-bindings-for-Raspberry-Pi-RP1.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 00ff2819eb852b54fe22e7181646e40d560576dc Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Fri, 28 Oct 2022 14:12:18 +0100
-Subject: [PATCH] dt-bindings: clock: Add bindings for Raspberry Pi RP1
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- include/dt-bindings/clock/rp1.h | 51 +++++++++++++++++++++++++++++++++
- 1 file changed, 51 insertions(+)
- create mode 100644 include/dt-bindings/clock/rp1.h
-
---- /dev/null
-+++ b/include/dt-bindings/clock/rp1.h
-@@ -0,0 +1,51 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * Copyright (C) 2021 Raspberry Pi Ltd.
-+ */
-+
-+#define RP1_PLL_SYS_CORE		0
-+#define RP1_PLL_AUDIO_CORE		1
-+#define RP1_PLL_VIDEO_CORE		2
-+
-+#define RP1_PLL_SYS			3
-+#define RP1_PLL_AUDIO			4
-+#define RP1_PLL_VIDEO			5
-+
-+#define RP1_PLL_SYS_PRI_PH		6
-+#define RP1_PLL_SYS_SEC_PH		7
-+
-+#define RP1_PLL_SYS_SEC			8
-+#define RP1_PLL_AUDIO_SEC		9
-+#define RP1_PLL_VIDEO_SEC		10
-+
-+#define RP1_CLK_SYS			11
-+#define RP1_CLK_SLOW_SYS		12
-+#define RP1_CLK_DMA			13
-+#define RP1_CLK_UART			14
-+#define RP1_CLK_ETH			15
-+#define RP1_CLK_PWM0			16
-+#define RP1_CLK_PWM1			17
-+#define RP1_CLK_AUDIO_IN		18
-+#define RP1_CLK_AUDIO_OUT		19
-+#define RP1_CLK_I2S			20
-+#define RP1_CLK_MIPI0_CFG		21
-+#define RP1_CLK_MIPI1_CFG		22
-+#define RP1_CLK_PCIE_AUX		23
-+#define RP1_CLK_USBH0_MICROFRAME	24
-+#define RP1_CLK_USBH1_MICROFRAME	25
-+#define RP1_CLK_USBH0_SUSPEND		26
-+#define RP1_CLK_USBH1_SUSPEND		27
-+#define RP1_CLK_ETH_TSU			28
-+#define RP1_CLK_ADC			29
-+#define RP1_CLK_SDIO_TIMER		30
-+#define RP1_CLK_SDIO_ALT_SRC		31
-+#define RP1_CLK_GP0			32
-+#define RP1_CLK_GP1			33
-+#define RP1_CLK_GP2			34
-+#define RP1_CLK_GP3			35
-+#define RP1_CLK_GP4			36
-+#define RP1_CLK_GP5			37
-+#define RP1_CLK_VEC			38
-+#define RP1_CLK_DPI			39
-+#define RP1_CLK_MIPI0_DPI		40
-+#define RP1_CLK_MIPI1_DPI		41
diff --git a/target/linux/bcm27xx/patches-6.1/950-0874-clk-Add-rp1-clock-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0874-clk-Add-rp1-clock-driver.patch
deleted file mode 100644
index 2a861d18c7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0874-clk-Add-rp1-clock-driver.patch
+++ /dev/null
@@ -1,2208 +0,0 @@
-From 66517cdfea750b89d86f78af55ef773cbd3e005f Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 10 Oct 2022 14:25:38 +0100
-Subject: [PATCH] clk: Add rp1 clock driver
-
-RP1 contains various PLLs and clocks for driving the hardware
-blocks, so add a driver to configure these.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/clk/Kconfig             |    7 +
- drivers/clk/Makefile            |    1 +
- drivers/clk/clk-rp1.c           | 2085 +++++++++++++++++++++++++++++++
- include/dt-bindings/clock/rp1.h |   69 +-
- 4 files changed, 2128 insertions(+), 34 deletions(-)
- create mode 100644 drivers/clk/clk-rp1.c
-
---- a/drivers/clk/Kconfig
-+++ b/drivers/clk/Kconfig
-@@ -89,6 +89,13 @@ config COMMON_CLK_RK808
- 	  These multi-function devices have two fixed-rate oscillators, clocked at 32KHz each.
- 	  Clkout1 is always on, Clkout2 can off by control register.
- 
-+config COMMON_CLK_RP1
-+	tristate "Raspberry Pi RP1-based clock support"
-+	depends on PCI || COMPILE_TEST
-+	depends on COMMON_CLK
-+	help
-+	  Enable common clock framework support for Raspberry Pi RP1
-+
- config COMMON_CLK_HI655X
- 	tristate "Clock driver for Hi655x" if EXPERT
- 	depends on (MFD_HI655X_PMIC || COMPILE_TEST)
---- a/drivers/clk/Makefile
-+++ b/drivers/clk/Makefile
-@@ -58,6 +58,7 @@ obj-$(CONFIG_CLK_LS1028A_PLLDIG)	+= clk-
- obj-$(CONFIG_COMMON_CLK_PWM)		+= clk-pwm.o
- obj-$(CONFIG_CLK_QORIQ)			+= clk-qoriq.o
- obj-$(CONFIG_COMMON_CLK_RK808)		+= clk-rk808.o
-+obj-$(CONFIG_COMMON_CLK_RP1)		+= clk-rp1.o
- obj-$(CONFIG_COMMON_CLK_HI655X)		+= clk-hi655x.o
- obj-$(CONFIG_COMMON_CLK_S2MPS11)	+= clk-s2mps11.o
- obj-$(CONFIG_COMMON_CLK_SCMI)           += clk-scmi.o
---- /dev/null
-+++ b/drivers/clk/clk-rp1.c
-@@ -0,0 +1,2085 @@
-+// SPDX-License-Identifier: GPL-2.0+
-+/*
-+ * Copyright (C) 2023 Raspberry Pi Ltd.
-+ *
-+ * Clock driver for RP1 PCIe multifunction chip.
-+ */
-+
-+#include <linux/clk-provider.h>
-+#include <linux/clkdev.h>
-+#include <linux/clk.h>
-+#include <linux/debugfs.h>
-+#include <linux/delay.h>
-+#include <linux/io.h>
-+#include <linux/math64.h>
-+#include <linux/module.h>
-+#include <linux/of_device.h>
-+#include <linux/platform_device.h>
-+#include <linux/rp1_platform.h>
-+#include <linux/slab.h>
-+
-+#include <asm/div64.h>
-+
-+#include <dt-bindings/clock/rp1.h>
-+
-+#define PLL_SYS_CS			0x08000
-+#define PLL_SYS_PWR			0x08004
-+#define PLL_SYS_FBDIV_INT		0x08008
-+#define PLL_SYS_FBDIV_FRAC		0x0800c
-+#define PLL_SYS_PRIM			0x08010
-+#define PLL_SYS_SEC			0x08014
-+
-+#define PLL_AUDIO_CS			0x0c000
-+#define PLL_AUDIO_PWR			0x0c004
-+#define PLL_AUDIO_FBDIV_INT		0x0c008
-+#define PLL_AUDIO_FBDIV_FRAC		0x0c00c
-+#define PLL_AUDIO_PRIM			0x0c010
-+#define PLL_AUDIO_SEC			0x0c014
-+
-+#define PLL_VIDEO_CS			0x10000
-+#define PLL_VIDEO_PWR			0x10004
-+#define PLL_VIDEO_FBDIV_INT		0x10008
-+#define PLL_VIDEO_FBDIV_FRAC		0x1000c
-+#define PLL_VIDEO_PRIM			0x10010
-+#define PLL_VIDEO_SEC			0x10014
-+
-+#define CLK_SYS_CTRL			0x00014
-+#define CLK_SYS_DIV_INT			0x00018
-+#define CLK_SYS_SEL			0x00020
-+
-+#define CLK_SLOW_SYS_CTRL		0x00024
-+#define CLK_SLOW_SYS_DIV_INT		0x00028
-+#define CLK_SLOW_SYS_SEL		0x00030
-+
-+#define CLK_DMA_CTRL			0x00044
-+#define CLK_DMA_DIV_INT			0x00048
-+#define CLK_DMA_SEL			0x00050
-+
-+#define CLK_UART_CTRL			0x00054
-+#define CLK_UART_DIV_INT		0x00058
-+#define CLK_UART_SEL			0x00060
-+
-+#define CLK_ETH_CTRL			0x00064
-+#define CLK_ETH_DIV_INT			0x00068
-+#define CLK_ETH_SEL			0x00070
-+
-+#define CLK_PWM0_CTRL			0x00074
-+#define CLK_PWM0_DIV_INT		0x00078
-+#define CLK_PWM0_DIV_FRAC		0x0007c
-+#define CLK_PWM0_SEL			0x00080
-+
-+#define CLK_PWM1_CTRL			0x00084
-+#define CLK_PWM1_DIV_INT		0x00088
-+#define CLK_PWM1_DIV_FRAC		0x0008c
-+#define CLK_PWM1_SEL			0x00090
-+
-+#define CLK_AUDIO_IN_CTRL		0x00094
-+#define CLK_AUDIO_IN_DIV_INT		0x00098
-+#define CLK_AUDIO_IN_SEL		0x000a0
-+
-+#define CLK_AUDIO_OUT_CTRL		0x000a4
-+#define CLK_AUDIO_OUT_DIV_INT		0x000a8
-+#define CLK_AUDIO_OUT_SEL		0x000b0
-+
-+#define CLK_I2S_CTRL			0x000b4
-+#define CLK_I2S_DIV_INT			0x000b8
-+#define CLK_I2S_SEL			0x000c0
-+
-+#define CLK_MIPI0_CFG_CTRL		0x000c4
-+#define CLK_MIPI0_CFG_DIV_INT		0x000c8
-+#define CLK_MIPI0_CFG_SEL		0x000d0
-+
-+#define CLK_MIPI1_CFG_CTRL		0x000d4
-+#define CLK_MIPI1_CFG_DIV_INT		0x000d8
-+#define CLK_MIPI1_CFG_SEL		0x000e0
-+
-+#define CLK_PCIE_AUX_CTRL		0x000e4
-+#define CLK_PCIE_AUX_DIV_INT		0x000e8
-+#define CLK_PCIE_AUX_SEL		0x000f0
-+
-+#define CLK_USBH0_MICROFRAME_CTRL	0x000f4
-+#define CLK_USBH0_MICROFRAME_DIV_INT	0x000f8
-+#define CLK_USBH0_MICROFRAME_SEL	0x00100
-+
-+#define CLK_USBH1_MICROFRAME_CTRL	0x00104
-+#define CLK_USBH1_MICROFRAME_DIV_INT	0x00108
-+#define CLK_USBH1_MICROFRAME_SEL	0x00110
-+
-+#define CLK_USBH0_SUSPEND_CTRL		0x00114
-+#define CLK_USBH0_SUSPEND_DIV_INT	0x00118
-+#define CLK_USBH0_SUSPEND_SEL		0x00120
-+
-+#define CLK_USBH1_SUSPEND_CTRL		0x00124
-+#define CLK_USBH1_SUSPEND_DIV_INT	0x00128
-+#define CLK_USBH1_SUSPEND_SEL		0x00130
-+
-+#define CLK_ETH_TSU_CTRL		0x00134
-+#define CLK_ETH_TSU_DIV_INT		0x00138
-+#define CLK_ETH_TSU_SEL			0x00140
-+
-+#define CLK_ADC_CTRL			0x00144
-+#define CLK_ADC_DIV_INT			0x00148
-+#define CLK_ADC_SEL			0x00150
-+
-+#define CLK_SDIO_TIMER_CTRL		0x00154
-+#define CLK_SDIO_TIMER_DIV_INT		0x00158
-+#define CLK_SDIO_TIMER_SEL		0x00160
-+
-+#define CLK_SDIO_ALT_SRC_CTRL		0x00164
-+#define CLK_SDIO_ALT_SRC_DIV_INT	0x00168
-+#define CLK_SDIO_ALT_SRC_SEL		0x00170
-+
-+#define CLK_GP0_CTRL			0x00174
-+#define CLK_GP0_DIV_INT			0x00178
-+#define CLK_GP0_DIV_FRAC		0x0017c
-+#define CLK_GP0_SEL			0x00180
-+
-+#define CLK_GP1_CTRL			0x00184
-+#define CLK_GP1_DIV_INT			0x00188
-+#define CLK_GP1_DIV_FRAC		0x0018c
-+#define CLK_GP1_SEL			0x00190
-+
-+#define CLK_GP2_CTRL			0x00194
-+#define CLK_GP2_DIV_INT			0x00198
-+#define CLK_GP2_DIV_FRAC		0x0019c
-+#define CLK_GP2_SEL			0x001a0
-+
-+#define CLK_GP3_CTRL			0x001a4
-+#define CLK_GP3_DIV_INT			0x001a8
-+#define CLK_GP3_DIV_FRAC		0x001ac
-+#define CLK_GP3_SEL			0x001b0
-+
-+#define CLK_GP4_CTRL			0x001b4
-+#define CLK_GP4_DIV_INT			0x001b8
-+#define CLK_GP4_DIV_FRAC		0x001bc
-+#define CLK_GP4_SEL			0x001c0
-+
-+#define CLK_GP5_CTRL			0x001c4
-+#define CLK_GP5_DIV_INT			0x001c8
-+#define CLK_GP5_DIV_FRAC		0x001cc
-+#define CLK_GP5_SEL			0x001d0
-+
-+#define CLK_SYS_RESUS_CTRL		0x0020c
-+
-+#define CLK_SLOW_SYS_RESUS_CTRL		0x00214
-+
-+#define FC0_REF_KHZ			0x0021c
-+#define FC0_MIN_KHZ			0x00220
-+#define FC0_MAX_KHZ			0x00224
-+#define FC0_DELAY			0x00228
-+#define FC0_INTERVAL			0x0022c
-+#define FC0_SRC				0x00230
-+#define FC0_STATUS			0x00234
-+#define FC0_RESULT			0x00238
-+#define FC_SIZE				0x20
-+#define FC_COUNT			8
-+#define FC_NUM(idx, off)		((idx) * 32 + (off))
-+
-+#define AUX_SEL				1
-+
-+#define VIDEO_CLOCKS_OFFSET		0x4000
-+#define VIDEO_CLK_VEC_CTRL		(VIDEO_CLOCKS_OFFSET + 0x0000)
-+#define VIDEO_CLK_VEC_DIV_INT		(VIDEO_CLOCKS_OFFSET + 0x0004)
-+#define VIDEO_CLK_VEC_SEL		(VIDEO_CLOCKS_OFFSET + 0x000c)
-+#define VIDEO_CLK_DPI_CTRL		(VIDEO_CLOCKS_OFFSET + 0x0010)
-+#define VIDEO_CLK_DPI_DIV_INT		(VIDEO_CLOCKS_OFFSET + 0x0014)
-+#define VIDEO_CLK_DPI_SEL		(VIDEO_CLOCKS_OFFSET + 0x001c)
-+#define VIDEO_CLK_MIPI0_DPI_CTRL	(VIDEO_CLOCKS_OFFSET + 0x0020)
-+#define VIDEO_CLK_MIPI0_DPI_DIV_INT	(VIDEO_CLOCKS_OFFSET + 0x0024)
-+#define VIDEO_CLK_MIPI0_DPI_DIV_FRAC	(VIDEO_CLOCKS_OFFSET + 0x0028)
-+#define VIDEO_CLK_MIPI0_DPI_SEL		(VIDEO_CLOCKS_OFFSET + 0x002c)
-+#define VIDEO_CLK_MIPI1_DPI_CTRL	(VIDEO_CLOCKS_OFFSET + 0x0030)
-+#define VIDEO_CLK_MIPI1_DPI_DIV_INT	(VIDEO_CLOCKS_OFFSET + 0x0034)
-+#define VIDEO_CLK_MIPI1_DPI_DIV_FRAC	(VIDEO_CLOCKS_OFFSET + 0x0038)
-+#define VIDEO_CLK_MIPI1_DPI_SEL		(VIDEO_CLOCKS_OFFSET + 0x003c)
-+
-+#define DIV_INT_8BIT_MAX		0x000000ffu /* max divide for most clocks */
-+#define DIV_INT_16BIT_MAX		0x0000ffffu /* max divide for GPx, PWM */
-+#define DIV_INT_24BIT_MAX               0x00ffffffu /* max divide for CLK_SYS */
-+
-+#define FC0_STATUS_DONE			BIT(4)
-+#define FC0_STATUS_RUNNING		BIT(8)
-+#define FC0_RESULT_FRAC_SHIFT		5
-+
-+#define PLL_PRIM_DIV1_SHIFT		16
-+#define PLL_PRIM_DIV1_MASK		0x00070000
-+#define PLL_PRIM_DIV2_SHIFT		12
-+#define PLL_PRIM_DIV2_MASK		0x00007000
-+
-+#define PLL_SEC_DIV_SHIFT		8
-+#define PLL_SEC_DIV_WIDTH		5
-+#define PLL_SEC_DIV_MASK		0x00001f00
-+
-+#define PLL_CS_LOCK			BIT(31)
-+#define PLL_CS_REFDIV_SHIFT		0
-+
-+#define PLL_PWR_PD			BIT(0)
-+#define PLL_PWR_DACPD			BIT(1)
-+#define PLL_PWR_DSMPD			BIT(2)
-+#define PLL_PWR_POSTDIVPD		BIT(3)
-+#define PLL_PWR_4PHASEPD		BIT(4)
-+#define PLL_PWR_VCOPD			BIT(5)
-+#define PLL_PWR_MASK			0x0000003f
-+
-+#define PLL_SEC_RST			BIT(16)
-+#define PLL_SEC_IMPL			BIT(31)
-+
-+/* PLL phase output for both PRI and SEC */
-+#define PLL_PH_EN			BIT(4)
-+#define PLL_PH_PHASE_SHIFT		0
-+
-+#define RP1_PLL_PHASE_0			0
-+#define RP1_PLL_PHASE_90		1
-+#define RP1_PLL_PHASE_180		2
-+#define RP1_PLL_PHASE_270		3
-+
-+/* Clock fields for all clocks */
-+#define CLK_CTRL_ENABLE			BIT(11)
-+#define CLK_CTRL_AUXSRC_MASK		0x000003e0
-+#define CLK_CTRL_AUXSRC_SHIFT		5
-+#define CLK_CTRL_SRC_SHIFT		0
-+#define CLK_DIV_FRAC_BITS		16
-+
-+#define KHz				1000
-+#define MHz				(KHz * KHz)
-+#define LOCK_TIMEOUT_NS			100000000
-+#define FC_TIMEOUT_NS			100000000
-+
-+#define MAX_CLK_PARENTS	8
-+
-+#define MEASURE_CLOCK_RATE
-+const char * const fc0_ref_clk_name = "clk_slow_sys";
-+
-+#define ABS_DIFF(a, b) ((a) > (b) ? (a) - (b) : (b) - (a))
-+#define DIV_U64_NEAREST(a, b) div_u64(((a) + ((b) >> 1)), (b))
-+
-+/*
-+ * Names of the reference clock for the pll cores.  This name must match
-+ * the DT reference clock-output-name.
-+ */
-+static const char *const ref_clock = "xosc";
-+
-+/*
-+ * Secondary PLL channel output divider table.
-+ * Divider values range from 8 to 19.
-+ * Invalid values default to 19
-+ */
-+static const struct clk_div_table pll_sec_div_table[] = {
-+	{ 0x00, 19 },
-+	{ 0x01, 19 },
-+	{ 0x02, 19 },
-+	{ 0x03, 19 },
-+	{ 0x04, 19 },
-+	{ 0x05, 19 },
-+	{ 0x06, 19 },
-+	{ 0x07, 19 },
-+	{ 0x08,  8 },
-+	{ 0x09,  9 },
-+	{ 0x0a, 10 },
-+	{ 0x0b, 11 },
-+	{ 0x0c, 12 },
-+	{ 0x0d, 13 },
-+	{ 0x0e, 14 },
-+	{ 0x0f, 15 },
-+	{ 0x10, 16 },
-+	{ 0x11, 17 },
-+	{ 0x12, 18 },
-+	{ 0x13, 19 },
-+	{ 0x14, 19 },
-+	{ 0x15, 19 },
-+	{ 0x16, 19 },
-+	{ 0x17, 19 },
-+	{ 0x18, 19 },
-+	{ 0x19, 19 },
-+	{ 0x1a, 19 },
-+	{ 0x1b, 19 },
-+	{ 0x1c, 19 },
-+	{ 0x1d, 19 },
-+	{ 0x1e, 19 },
-+	{ 0x1f, 19 },
-+	{ 0 }
-+};
-+
-+struct rp1_clockman {
-+	struct device *dev;
-+	void __iomem *regs;
-+	spinlock_t regs_lock; /* spinlock for all clocks */
-+
-+	/* Must be last */
-+	struct clk_hw_onecell_data onecell;
-+};
-+
-+struct rp1_pll_core_data {
-+	const char *name;
-+	u32 cs_reg;
-+	u32 pwr_reg;
-+	u32 fbdiv_int_reg;
-+	u32 fbdiv_frac_reg;
-+	unsigned long flags;
-+	u32 fc0_src;
-+};
-+
-+struct rp1_pll_data {
-+	const char *name;
-+	const char *source_pll;
-+	u32 ctrl_reg;
-+	unsigned long flags;
-+	u32 fc0_src;
-+};
-+
-+struct rp1_pll_ph_data {
-+	const char *name;
-+	const char *source_pll;
-+	unsigned int phase;
-+	unsigned int fixed_divider;
-+	u32 ph_reg;
-+	unsigned long flags;
-+	u32 fc0_src;
-+};
-+
-+struct rp1_pll_divider_data {
-+	const char *name;
-+	const char *source_pll;
-+	u32 sec_reg;
-+	unsigned long flags;
-+	u32 fc0_src;
-+};
-+
-+struct rp1_clock_data {
-+	const char *name;
-+	const char *const parents[MAX_CLK_PARENTS];
-+	int num_std_parents;
-+	int num_aux_parents;
-+	unsigned long flags;
-+	u32 clk_src_mask;
-+	u32 ctrl_reg;
-+	u32 div_int_reg;
-+	u32 div_frac_reg;
-+	u32 sel_reg;
-+	u32 div_int_max;
-+	u32 fc0_src;
-+};
-+
-+struct rp1_pll_core {
-+	struct clk_hw hw;
-+	struct rp1_clockman *clockman;
-+	const struct rp1_pll_core_data *data;
-+	unsigned long cached_rate;
-+};
-+
-+struct rp1_pll {
-+	struct clk_hw hw;
-+	struct clk_divider div;
-+	struct rp1_clockman *clockman;
-+	const struct rp1_pll_data *data;
-+	unsigned long cached_rate;
-+};
-+
-+struct rp1_pll_ph {
-+	struct clk_hw hw;
-+	struct rp1_clockman *clockman;
-+	const struct rp1_pll_ph_data *data;
-+};
-+
-+struct rp1_clock {
-+	struct clk_hw hw;
-+	struct rp1_clockman *clockman;
-+	const struct rp1_clock_data *data;
-+	unsigned long cached_rate;
-+};
-+
-+static void rp1_debugfs_regset(struct rp1_clockman *clockman, u32 base,
-+			       const struct debugfs_reg32 *regs,
-+			       size_t nregs, struct dentry *dentry)
-+{
-+	struct debugfs_regset32 *regset;
-+
-+	regset = devm_kzalloc(clockman->dev, sizeof(*regset), GFP_KERNEL);
-+	if (!regset)
-+		return;
-+
-+	regset->regs = regs;
-+	regset->nregs = nregs;
-+	regset->base = clockman->regs + base;
-+
-+	debugfs_create_regset32("regdump", 0444, dentry, regset);
-+}
-+
-+static inline u32 set_register_field(u32 reg, u32 val, u32 mask, u32 shift)
-+{
-+	reg &= ~mask;
-+	reg |= (val << shift) & mask;
-+	return reg;
-+}
-+
-+static inline
-+void clockman_write(struct rp1_clockman *clockman, u32 reg, u32 val)
-+{
-+	writel(val, clockman->regs + reg);
-+}
-+
-+static inline u32 clockman_read(struct rp1_clockman *clockman, u32 reg)
-+{
-+	return readl(clockman->regs + reg);
-+}
-+
-+#ifdef MEASURE_CLOCK_RATE
-+static unsigned long clockman_measure_clock(struct rp1_clockman *clockman,
-+					    const char *clk_name,
-+					    unsigned int fc0_src)
-+{
-+	struct clk *ref_clk = __clk_lookup(fc0_ref_clk_name);
-+	unsigned long result;
-+	ktime_t timeout;
-+	unsigned int fc_idx, fc_offset, fc_src;
-+
-+	fc_idx = fc0_src / 32;
-+	fc_src = fc0_src % 32;
-+
-+	/* fc_src == 0 is invalid. */
-+	if (!fc_src || fc_idx >= FC_COUNT)
-+		return 0;
-+
-+	fc_offset = fc_idx * FC_SIZE;
-+
-+	/* Ensure the frequency counter is idle. */
-+	timeout = ktime_add_ns(ktime_get(), FC_TIMEOUT_NS);
-+	while (clockman_read(clockman, fc_offset + FC0_STATUS) & FC0_STATUS_RUNNING) {
-+		if (ktime_after(ktime_get(), timeout)) {
-+			dev_err(clockman->dev, "%s: FC0 busy timeout\n",
-+				clk_name);
-+			return 0;
-+		}
-+		cpu_relax();
-+	}
-+
-+	spin_lock(&clockman->regs_lock);
-+	clockman_write(clockman, fc_offset + FC0_REF_KHZ,
-+		       clk_get_rate(ref_clk) / KHz);
-+	clockman_write(clockman, fc_offset + FC0_MIN_KHZ, 0);
-+	clockman_write(clockman, fc_offset + FC0_MAX_KHZ, 0x1ffffff);
-+	clockman_write(clockman, fc_offset + FC0_INTERVAL, 8);
-+	clockman_write(clockman, fc_offset + FC0_DELAY, 7);
-+	clockman_write(clockman, fc_offset + FC0_SRC, fc_src);
-+	spin_unlock(&clockman->regs_lock);
-+
-+	/* Ensure the frequency counter is idle. */
-+	timeout = ktime_add_ns(ktime_get(), FC_TIMEOUT_NS);
-+	while (!(clockman_read(clockman, fc_offset + FC0_STATUS) & FC0_STATUS_DONE)) {
-+		if (ktime_after(ktime_get(), timeout)) {
-+			dev_err(clockman->dev, "%s: FC0 wait timeout\n",
-+				clk_name);
-+			return 0;
-+		}
-+		cpu_relax();
-+	}
-+
-+	result = clockman_read(clockman, fc_offset + FC0_RESULT);
-+
-+	/* Disable FC0 */
-+	spin_lock(&clockman->regs_lock);
-+	clockman_write(clockman, fc_offset + FC0_SRC, 0);
-+	spin_unlock(&clockman->regs_lock);
-+
-+	return result;
-+}
-+#endif
-+
-+static int rp1_pll_core_is_on(struct clk_hw *hw)
-+{
-+	struct rp1_pll_core *pll_core = container_of(hw, struct rp1_pll_core, hw);
-+	struct rp1_clockman *clockman = pll_core->clockman;
-+	const struct rp1_pll_core_data *data = pll_core->data;
-+	u32 pwr = clockman_read(clockman, data->pwr_reg);
-+
-+	return (pwr & PLL_PWR_PD) || (pwr & PLL_PWR_POSTDIVPD);
-+}
-+
-+static int rp1_pll_core_on(struct clk_hw *hw)
-+{
-+	struct rp1_pll_core *pll_core = container_of(hw, struct rp1_pll_core, hw);
-+	struct rp1_clockman *clockman = pll_core->clockman;
-+	const struct rp1_pll_core_data *data = pll_core->data;
-+	u32 fbdiv_frac;
-+	ktime_t timeout;
-+
-+	spin_lock(&clockman->regs_lock);
-+
-+	if (!(clockman_read(clockman, data->cs_reg) & PLL_CS_LOCK)) {
-+		/* Reset to a known state. */
-+		clockman_write(clockman, data->pwr_reg, PLL_PWR_MASK);
-+		clockman_write(clockman, data->fbdiv_int_reg, 20);
-+		clockman_write(clockman, data->fbdiv_frac_reg, 0);
-+		clockman_write(clockman, data->cs_reg, 1 << PLL_CS_REFDIV_SHIFT);
-+	}
-+
-+	/* Come out of reset. */
-+	fbdiv_frac = clockman_read(clockman, data->fbdiv_frac_reg);
-+	clockman_write(clockman, data->pwr_reg, fbdiv_frac ? 0 : PLL_PWR_DSMPD);
-+	spin_unlock(&clockman->regs_lock);
-+
-+	/* Wait for the PLL to lock. */
-+	timeout = ktime_add_ns(ktime_get(), LOCK_TIMEOUT_NS);
-+	while (!(clockman_read(clockman, data->cs_reg) & PLL_CS_LOCK)) {
-+		if (ktime_after(ktime_get(), timeout)) {
-+			dev_err(clockman->dev, "%s: can't lock PLL\n",
-+				clk_hw_get_name(hw));
-+			return -ETIMEDOUT;
-+		}
-+		cpu_relax();
-+	}
-+
-+	return 0;
-+}
-+
-+static void rp1_pll_core_off(struct clk_hw *hw)
-+{
-+	struct rp1_pll_core *pll_core = container_of(hw, struct rp1_pll_core, hw);
-+	struct rp1_clockman *clockman = pll_core->clockman;
-+	const struct rp1_pll_core_data *data = pll_core->data;
-+
-+	spin_lock(&clockman->regs_lock);
-+	clockman_write(clockman, data->pwr_reg, 0);
-+	spin_unlock(&clockman->regs_lock);
-+}
-+
-+static inline unsigned long get_pll_core_divider(struct clk_hw *hw,
-+						 unsigned long rate,
-+						 unsigned long parent_rate,
-+						 u32 *div_int, u32 *div_frac)
-+{
-+	unsigned long calc_rate;
-+	u32 fbdiv_int, fbdiv_frac;
-+	u64 div_fp64; /* 32.32 fixed point fraction. */
-+
-+	/* Factor of reference clock to VCO frequency. */
-+	div_fp64 = (u64)(rate) << 32;
-+	div_fp64 = DIV_U64_NEAREST(div_fp64, parent_rate);
-+
-+	/* Round the fractional component at 24 bits. */
-+	div_fp64 += 1 << (32 - 24 - 1);
-+
-+	fbdiv_int = div_fp64 >> 32;
-+	fbdiv_frac = (div_fp64 >> (32 - 24)) & 0xffffff;
-+
-+	calc_rate =
-+		((u64)parent_rate * (((u64)fbdiv_int << 24) + fbdiv_frac) + (1 << 23)) >> 24;
-+
-+	*div_int = fbdiv_int;
-+	*div_frac = fbdiv_frac;
-+
-+	return calc_rate;
-+}
-+
-+static int rp1_pll_core_set_rate(struct clk_hw *hw,
-+				 unsigned long rate, unsigned long parent_rate)
-+{
-+	struct rp1_pll_core *pll_core = container_of(hw, struct rp1_pll_core, hw);
-+	struct rp1_clockman *clockman = pll_core->clockman;
-+	const struct rp1_pll_core_data *data = pll_core->data;
-+	unsigned long calc_rate;
-+	u32 fbdiv_int, fbdiv_frac;
-+
-+	// todo: is this needed??
-+	//rp1_pll_off(hw);
-+
-+	/* Disable dividers to start with. */
-+	spin_lock(&clockman->regs_lock);
-+	clockman_write(clockman, data->fbdiv_int_reg, 0);
-+	clockman_write(clockman, data->fbdiv_frac_reg, 0);
-+	spin_unlock(&clockman->regs_lock);
-+
-+	calc_rate = get_pll_core_divider(hw, rate, parent_rate,
-+					 &fbdiv_int, &fbdiv_frac);
-+
-+	spin_lock(&clockman->regs_lock);
-+	clockman_write(clockman, data->pwr_reg, fbdiv_frac ? 0 : PLL_PWR_DSMPD);
-+	clockman_write(clockman, data->fbdiv_int_reg, fbdiv_int);
-+	clockman_write(clockman, data->fbdiv_frac_reg, fbdiv_frac);
-+	spin_unlock(&clockman->regs_lock);
-+
-+	/* Check that reference frequency is no greater than VCO / 16. */
-+	BUG_ON(parent_rate > (rate / 16));
-+
-+	pll_core->cached_rate = calc_rate;
-+
-+	spin_lock(&clockman->regs_lock);
-+	/* Don't need to divide ref unless parent_rate > (output freq / 16) */
-+	clockman_write(clockman, data->cs_reg,
-+		       clockman_read(clockman, data->cs_reg) |
-+				     (1 << PLL_CS_REFDIV_SHIFT));
-+	spin_unlock(&clockman->regs_lock);
-+
-+	return 0;
-+}
-+
-+static unsigned long rp1_pll_core_recalc_rate(struct clk_hw *hw,
-+					      unsigned long parent_rate)
-+{
-+	struct rp1_pll_core *pll_core = container_of(hw, struct rp1_pll_core, hw);
-+	struct rp1_clockman *clockman = pll_core->clockman;
-+	const struct rp1_pll_core_data *data = pll_core->data;
-+	u32 fbdiv_int, fbdiv_frac;
-+	unsigned long calc_rate;
-+
-+	fbdiv_int = clockman_read(clockman, data->fbdiv_int_reg);
-+	fbdiv_frac = clockman_read(clockman, data->fbdiv_frac_reg);
-+	calc_rate =
-+		((u64)parent_rate * (((u64)fbdiv_int << 24) + fbdiv_frac) + (1 << 23)) >> 24;
-+
-+	return calc_rate;
-+}
-+
-+static long rp1_pll_core_round_rate(struct clk_hw *hw, unsigned long rate,
-+				    unsigned long *parent_rate)
-+{
-+	u32 fbdiv_int, fbdiv_frac;
-+	long calc_rate;
-+
-+	calc_rate = get_pll_core_divider(hw, rate, *parent_rate,
-+					 &fbdiv_int, &fbdiv_frac);
-+	return calc_rate;
-+}
-+
-+static void rp1_pll_core_debug_init(struct clk_hw *hw, struct dentry *dentry)
-+{
-+	struct rp1_pll_core *pll_core = container_of(hw, struct rp1_pll_core, hw);
-+	struct rp1_clockman *clockman = pll_core->clockman;
-+	const struct rp1_pll_core_data *data = pll_core->data;
-+	struct debugfs_reg32 *regs;
-+
-+	regs = devm_kcalloc(clockman->dev, 4, sizeof(*regs), GFP_KERNEL);
-+	if (!regs)
-+		return;
-+
-+	regs[0].name = "cs";
-+	regs[0].offset = data->cs_reg;
-+	regs[1].name = "pwr";
-+	regs[1].offset = data->pwr_reg;
-+	regs[2].name = "fbdiv_int";
-+	regs[2].offset = data->fbdiv_int_reg;
-+	regs[3].name = "fbdiv_frac";
-+	regs[3].offset = data->fbdiv_frac_reg;
-+
-+	rp1_debugfs_regset(clockman, 0, regs, 4, dentry);
-+}
-+
-+static void get_pll_prim_dividers(unsigned long rate, unsigned long parent_rate,
-+				  u32 *divider1, u32 *divider2)
-+{
-+	unsigned int div1, div2;
-+	unsigned int best_div1 = 7, best_div2 = 7;
-+	unsigned long best_rate_diff =
-+		ABS_DIFF(DIV_ROUND_CLOSEST(parent_rate, best_div1 * best_div2), rate);
-+	long rate_diff, calc_rate;
-+
-+	for (div1 = 1; div1 <= 7; div1++) {
-+		for (div2 = 1; div2 <= div1; div2++) {
-+			calc_rate = DIV_ROUND_CLOSEST(parent_rate, div1 * div2);
-+			rate_diff = ABS_DIFF(calc_rate, rate);
-+
-+			if (calc_rate == rate) {
-+				best_div1 = div1;
-+				best_div2 = div2;
-+				goto done;
-+			} else if (rate_diff < best_rate_diff) {
-+				best_div1 = div1;
-+				best_div2 = div2;
-+				best_rate_diff = rate_diff;
-+			}
-+		}
-+	}
-+
-+done:
-+	*divider1 = best_div1;
-+	*divider2 = best_div2;
-+}
-+
-+static int rp1_pll_set_rate(struct clk_hw *hw,
-+			    unsigned long rate, unsigned long parent_rate)
-+{
-+	struct rp1_pll *pll = container_of(hw, struct rp1_pll, hw);
-+	struct rp1_clockman *clockman = pll->clockman;
-+	const struct rp1_pll_data *data = pll->data;
-+	u32 prim, prim_div1, prim_div2;
-+
-+	get_pll_prim_dividers(rate, parent_rate, &prim_div1, &prim_div2);
-+
-+	spin_lock(&clockman->regs_lock);
-+	prim = clockman_read(clockman, data->ctrl_reg);
-+	prim = set_register_field(prim, prim_div1, PLL_PRIM_DIV1_MASK,
-+				  PLL_PRIM_DIV1_SHIFT);
-+	prim = set_register_field(prim, prim_div2, PLL_PRIM_DIV2_MASK,
-+				  PLL_PRIM_DIV2_SHIFT);
-+	clockman_write(clockman, data->ctrl_reg, prim);
-+	spin_unlock(&clockman->regs_lock);
-+
-+#ifdef MEASURE_CLOCK_RATE
-+	clockman_measure_clock(clockman, data->name, data->fc0_src);
-+#endif
-+	return 0;
-+}
-+
-+static unsigned long rp1_pll_recalc_rate(struct clk_hw *hw,
-+					 unsigned long parent_rate)
-+{
-+	struct rp1_pll *pll = container_of(hw, struct rp1_pll, hw);
-+	struct rp1_clockman *clockman = pll->clockman;
-+	const struct rp1_pll_data *data = pll->data;
-+	u32 prim, prim_div1, prim_div2;
-+
-+	prim = clockman_read(clockman, data->ctrl_reg);
-+	prim_div1 = (prim & PLL_PRIM_DIV1_MASK) >> PLL_PRIM_DIV1_SHIFT;
-+	prim_div2 = (prim & PLL_PRIM_DIV2_MASK) >> PLL_PRIM_DIV2_SHIFT;
-+
-+	if (!prim_div1 || !prim_div2) {
-+		dev_err(clockman->dev, "%s: (%s) zero divider value\n",
-+			__func__, data->name);
-+		return 0;
-+	}
-+
-+	return DIV_ROUND_CLOSEST(parent_rate, prim_div1 * prim_div2);
-+}
-+
-+static long rp1_pll_round_rate(struct clk_hw *hw, unsigned long rate,
-+			       unsigned long *parent_rate)
-+{
-+	u32 div1, div2;
-+
-+	get_pll_prim_dividers(rate, *parent_rate, &div1, &div2);
-+
-+	return DIV_ROUND_CLOSEST(*parent_rate, div1 * div2);
-+}
-+
-+static void rp1_pll_debug_init(struct clk_hw *hw,
-+			       struct dentry *dentry)
-+{
-+	struct rp1_pll *pll = container_of(hw, struct rp1_pll, hw);
-+	struct rp1_clockman *clockman = pll->clockman;
-+	const struct rp1_pll_data *data = pll->data;
-+	struct debugfs_reg32 *regs;
-+
-+	regs = devm_kcalloc(clockman->dev, 1, sizeof(*regs), GFP_KERNEL);
-+	if (!regs)
-+		return;
-+
-+	regs[0].name = "prim";
-+	regs[0].offset = data->ctrl_reg;
-+
-+	rp1_debugfs_regset(clockman, 0, regs, 1, dentry);
-+}
-+
-+static int rp1_pll_ph_is_on(struct clk_hw *hw)
-+{
-+	struct rp1_pll_ph *pll = container_of(hw, struct rp1_pll_ph, hw);
-+	struct rp1_clockman *clockman = pll->clockman;
-+	const struct rp1_pll_ph_data *data = pll->data;
-+
-+	return !!(clockman_read(clockman, data->ph_reg) & PLL_PH_EN);
-+}
-+
-+static int rp1_pll_ph_on(struct clk_hw *hw)
-+{
-+	struct rp1_pll_ph *pll_ph = container_of(hw, struct rp1_pll_ph, hw);
-+	struct rp1_clockman *clockman = pll_ph->clockman;
-+	const struct rp1_pll_ph_data *data = pll_ph->data;
-+	u32 ph_reg;
-+
-+	/* todo: ensure pri/sec is enabled! */
-+	spin_lock(&clockman->regs_lock);
-+	ph_reg = clockman_read(clockman, data->ph_reg);
-+	ph_reg |= data->phase << PLL_PH_PHASE_SHIFT;
-+	ph_reg |= PLL_PH_EN;
-+	clockman_write(clockman, data->ph_reg, ph_reg);
-+	spin_unlock(&clockman->regs_lock);
-+
-+#ifdef MEASURE_CLOCK_RATE
-+	clockman_measure_clock(clockman, data->name, data->fc0_src);
-+#endif
-+	return 0;
-+}
-+
-+static void rp1_pll_ph_off(struct clk_hw *hw)
-+{
-+	struct rp1_pll_ph *pll_ph = container_of(hw, struct rp1_pll_ph, hw);
-+	struct rp1_clockman *clockman = pll_ph->clockman;
-+	const struct rp1_pll_ph_data *data = pll_ph->data;
-+
-+	spin_lock(&clockman->regs_lock);
-+	clockman_write(clockman, data->ph_reg,
-+		       clockman_read(clockman, data->ph_reg) & ~PLL_PH_EN);
-+	spin_unlock(&clockman->regs_lock);
-+}
-+
-+static int rp1_pll_ph_set_rate(struct clk_hw *hw,
-+			       unsigned long rate, unsigned long parent_rate)
-+{
-+	struct rp1_pll_ph *pll_ph = container_of(hw, struct rp1_pll_ph, hw);
-+	const struct rp1_pll_ph_data *data = pll_ph->data;
-+	struct rp1_clockman *clockman = pll_ph->clockman;
-+
-+	/* Nothing really to do here! */
-+	WARN_ON(data->fixed_divider != 1 && data->fixed_divider != 2);
-+	WARN_ON(rate != parent_rate / data->fixed_divider);
-+
-+#ifdef MEASURE_CLOCK_RATE
-+	if (rp1_pll_ph_is_on(hw))
-+		clockman_measure_clock(clockman, data->name, data->fc0_src);
-+#endif
-+	return 0;
-+}
-+
-+static unsigned long rp1_pll_ph_recalc_rate(struct clk_hw *hw,
-+					    unsigned long parent_rate)
-+{
-+	struct rp1_pll_ph *pll_ph = container_of(hw, struct rp1_pll_ph, hw);
-+	const struct rp1_pll_ph_data *data = pll_ph->data;
-+
-+	return parent_rate / data->fixed_divider;
-+}
-+
-+static long rp1_pll_ph_round_rate(struct clk_hw *hw, unsigned long rate,
-+				  unsigned long *parent_rate)
-+{
-+	struct rp1_pll_ph *pll_ph = container_of(hw, struct rp1_pll_ph, hw);
-+	const struct rp1_pll_ph_data *data = pll_ph->data;
-+
-+	return *parent_rate / data->fixed_divider;
-+}
-+
-+static void rp1_pll_ph_debug_init(struct clk_hw *hw,
-+				  struct dentry *dentry)
-+{
-+	struct rp1_pll_ph *pll_ph = container_of(hw, struct rp1_pll_ph, hw);
-+	const struct rp1_pll_ph_data *data = pll_ph->data;
-+	struct rp1_clockman *clockman = pll_ph->clockman;
-+	struct debugfs_reg32 *regs;
-+
-+	regs = devm_kcalloc(clockman->dev, 1, sizeof(*regs), GFP_KERNEL);
-+	if (!regs)
-+		return;
-+
-+	regs[0].name = "ph_reg";
-+	regs[0].offset = data->ph_reg;
-+
-+	rp1_debugfs_regset(clockman, 0, regs, 1, dentry);
-+}
-+
-+static int rp1_pll_divider_is_on(struct clk_hw *hw)
-+{
-+	struct rp1_pll *divider = container_of(hw, struct rp1_pll, div.hw);
-+	struct rp1_clockman *clockman = divider->clockman;
-+	const struct rp1_pll_data *data = divider->data;
-+
-+	return !(clockman_read(clockman, data->ctrl_reg) & PLL_SEC_RST);
-+}
-+
-+static int rp1_pll_divider_on(struct clk_hw *hw)
-+{
-+	struct rp1_pll *divider = container_of(hw, struct rp1_pll, div.hw);
-+	struct rp1_clockman *clockman = divider->clockman;
-+	const struct rp1_pll_data *data = divider->data;
-+
-+	spin_lock(&clockman->regs_lock);
-+	/* Check the implementation bit is set! */
-+	WARN_ON(!(clockman_read(clockman, data->ctrl_reg) & PLL_SEC_IMPL));
-+	clockman_write(clockman, data->ctrl_reg,
-+		       clockman_read(clockman, data->ctrl_reg) & ~PLL_SEC_RST);
-+	spin_unlock(&clockman->regs_lock);
-+
-+#ifdef MEASURE_CLOCK_RATE
-+	clockman_measure_clock(clockman, data->name, data->fc0_src);
-+#endif
-+	return 0;
-+}
-+
-+static void rp1_pll_divider_off(struct clk_hw *hw)
-+{
-+	struct rp1_pll *divider = container_of(hw, struct rp1_pll, div.hw);
-+	struct rp1_clockman *clockman = divider->clockman;
-+	const struct rp1_pll_data *data = divider->data;
-+
-+	spin_lock(&clockman->regs_lock);
-+	clockman_write(clockman, data->ctrl_reg, PLL_SEC_RST);
-+	spin_unlock(&clockman->regs_lock);
-+}
-+
-+static int rp1_pll_divider_set_rate(struct clk_hw *hw,
-+				    unsigned long rate,
-+				    unsigned long parent_rate)
-+{
-+	struct rp1_pll *divider = container_of(hw, struct rp1_pll, div.hw);
-+	struct rp1_clockman *clockman = divider->clockman;
-+	const struct rp1_pll_data *data = divider->data;
-+	u32 div, sec;
-+
-+	div = DIV_ROUND_UP_ULL(parent_rate, rate);
-+	div = clamp(div, 8u, 19u);
-+
-+	spin_lock(&clockman->regs_lock);
-+	sec = clockman_read(clockman, data->ctrl_reg);
-+	sec = set_register_field(sec, div, PLL_SEC_DIV_MASK, PLL_SEC_DIV_SHIFT);
-+
-+	/* Must keep the divider in reset to change the value. */
-+	sec |= PLL_SEC_RST;
-+	clockman_write(clockman, data->ctrl_reg, sec);
-+
-+	// todo: must sleep 10 pll vco cycles
-+	sec &= ~PLL_SEC_RST;
-+	clockman_write(clockman, data->ctrl_reg, sec);
-+	spin_unlock(&clockman->regs_lock);
-+
-+#ifdef MEASURE_CLOCK_RATE
-+	if (rp1_pll_divider_is_on(hw))
-+		clockman_measure_clock(clockman, data->name, data->fc0_src);
-+#endif
-+	return 0;
-+}
-+
-+static unsigned long rp1_pll_divider_recalc_rate(struct clk_hw *hw,
-+						 unsigned long parent_rate)
-+{
-+	return clk_divider_ops.recalc_rate(hw, parent_rate);
-+}
-+
-+static long rp1_pll_divider_round_rate(struct clk_hw *hw,
-+				       unsigned long rate,
-+				       unsigned long *parent_rate)
-+{
-+	return clk_divider_ops.round_rate(hw, rate, parent_rate);
-+}
-+
-+static void rp1_pll_divider_debug_init(struct clk_hw *hw, struct dentry *dentry)
-+{
-+	struct rp1_pll *divider = container_of(hw, struct rp1_pll, div.hw);
-+	struct rp1_clockman *clockman = divider->clockman;
-+	const struct rp1_pll_data *data = divider->data;
-+	struct debugfs_reg32 *regs;
-+
-+	regs = devm_kcalloc(clockman->dev, 1, sizeof(*regs), GFP_KERNEL);
-+	if (!regs)
-+		return;
-+
-+	regs[0].name = "sec";
-+	regs[0].offset = data->ctrl_reg;
-+
-+	rp1_debugfs_regset(clockman, 0, regs, 1, dentry);
-+}
-+
-+static int rp1_clock_is_on(struct clk_hw *hw)
-+{
-+	struct rp1_clock *clock = container_of(hw, struct rp1_clock, hw);
-+	struct rp1_clockman *clockman = clock->clockman;
-+	const struct rp1_clock_data *data = clock->data;
-+
-+	return !!(clockman_read(clockman, data->ctrl_reg) & CLK_CTRL_ENABLE);
-+}
-+
-+static unsigned long rp1_clock_recalc_rate(struct clk_hw *hw,
-+					   unsigned long parent_rate)
-+{
-+	struct rp1_clock *clock = container_of(hw, struct rp1_clock, hw);
-+	struct rp1_clockman *clockman = clock->clockman;
-+	const struct rp1_clock_data *data = clock->data;
-+	u64 calc_rate;
-+	u64 div;
-+
-+	u32 frac;
-+
-+	div = clockman_read(clockman, data->div_int_reg);
-+	frac = (data->div_frac_reg != 0) ?
-+		clockman_read(clockman, data->div_frac_reg) : 0;
-+
-+	/* If the integer portion of the divider is 0, treat it as 2^16 */
-+	if (!div)
-+		div = 1 << 16;
-+
-+	div = (div << CLK_DIV_FRAC_BITS) | (frac >> (32 - CLK_DIV_FRAC_BITS));
-+
-+	calc_rate = (u64)parent_rate << CLK_DIV_FRAC_BITS;
-+	calc_rate = div64_u64(calc_rate, div);
-+
-+	return calc_rate;
-+}
-+
-+static int rp1_clock_on(struct clk_hw *hw)
-+{
-+	struct rp1_clock *clock = container_of(hw, struct rp1_clock, hw);
-+	struct rp1_clockman *clockman = clock->clockman;
-+	const struct rp1_clock_data *data = clock->data;
-+
-+	spin_lock(&clockman->regs_lock);
-+	clockman_write(clockman, data->ctrl_reg,
-+		       clockman_read(clockman, data->ctrl_reg) | CLK_CTRL_ENABLE);
-+	spin_unlock(&clockman->regs_lock);
-+
-+#ifdef MEASURE_CLOCK_RATE
-+	clockman_measure_clock(clockman, data->name, data->fc0_src);
-+#endif
-+	return 0;
-+}
-+
-+static void rp1_clock_off(struct clk_hw *hw)
-+{
-+	struct rp1_clock *clock = container_of(hw, struct rp1_clock, hw);
-+	struct rp1_clockman *clockman = clock->clockman;
-+	const struct rp1_clock_data *data = clock->data;
-+
-+	spin_lock(&clockman->regs_lock);
-+	clockman_write(clockman, data->ctrl_reg,
-+		       clockman_read(clockman, data->ctrl_reg) & ~CLK_CTRL_ENABLE);
-+	spin_unlock(&clockman->regs_lock);
-+}
-+
-+static u32 rp1_clock_choose_div(unsigned long rate, unsigned long parent_rate,
-+				const struct rp1_clock_data *data)
-+{
-+	u64 div;
-+
-+	/*
-+	 * Due to earlier rounding, calculated parent_rate may differ from
-+	 * expected value. Don't fail on a small discrepancy near unity divide.
-+	 */
-+	if (!rate || rate > parent_rate + (parent_rate >> CLK_DIV_FRAC_BITS))
-+		return 0;
-+
-+	/*
-+	 * Always express div in fixed-point format for fractional division;
-+	 * If no fractional divider is present, the fraction part will be zero.
-+	 */
-+	if (data->div_frac_reg) {
-+		div = (u64)parent_rate << CLK_DIV_FRAC_BITS;
-+		div = DIV_U64_NEAREST(div, rate);
-+	} else {
-+		div = DIV_U64_NEAREST(parent_rate, rate);
-+		div <<= CLK_DIV_FRAC_BITS;
-+	}
-+
-+	div = clamp(div,
-+		    1ull << CLK_DIV_FRAC_BITS,
-+		    (u64)data->div_int_max << CLK_DIV_FRAC_BITS);
-+
-+	return div;
-+}
-+
-+static u8 rp1_clock_get_parent(struct clk_hw *hw)
-+{
-+	struct rp1_clock *clock = container_of(hw, struct rp1_clock, hw);
-+	struct rp1_clockman *clockman = clock->clockman;
-+	const struct rp1_clock_data *data = clock->data;
-+	u32 sel, ctrl;
-+	u8 parent;
-+
-+	/* Sel is one-hot, so find the first bit set */
-+	sel = clockman_read(clockman, data->sel_reg);
-+	parent = ffs(sel) - 1;
-+
-+	/* sel == 0 implies the parent clock is not enabled yet. */
-+	if (!sel) {
-+		/* Read the clock src from the CTRL register instead */
-+		ctrl = clockman_read(clockman, data->ctrl_reg);
-+		parent = (ctrl & data->clk_src_mask) >> CLK_CTRL_SRC_SHIFT;
-+	}
-+
-+	if (parent >= data->num_std_parents)
-+		parent = AUX_SEL;
-+
-+	if (parent == AUX_SEL) {
-+		/*
-+		 * Clock parent is an auxiliary source, so get the parent from
-+		 * the AUXSRC register field.
-+		 */
-+		ctrl = clockman_read(clockman, data->ctrl_reg);
-+		parent = (ctrl & CLK_CTRL_AUXSRC_MASK) >> CLK_CTRL_AUXSRC_SHIFT;
-+		parent += data->num_std_parents;
-+	}
-+
-+	return parent;
-+}
-+
-+static int rp1_clock_set_parent(struct clk_hw *hw, u8 index)
-+{
-+	struct rp1_clock *clock = container_of(hw, struct rp1_clock, hw);
-+	struct rp1_clockman *clockman = clock->clockman;
-+	const struct rp1_clock_data *data = clock->data;
-+	u32 ctrl, sel;
-+
-+	spin_lock(&clockman->regs_lock);
-+	ctrl = clockman_read(clockman, data->ctrl_reg);
-+
-+	if (index >= data->num_std_parents) {
-+		/* This is an aux source request */
-+		if (index >= data->num_std_parents + data->num_aux_parents)
-+			return -EINVAL;
-+
-+		/* Select parent from aux list */
-+		ctrl = set_register_field(ctrl, index - data->num_std_parents,
-+					  CLK_CTRL_AUXSRC_MASK,
-+					  CLK_CTRL_AUXSRC_SHIFT);
-+		/* Set src to aux list */
-+		ctrl = set_register_field(ctrl, AUX_SEL, data->clk_src_mask,
-+					  CLK_CTRL_SRC_SHIFT);
-+	} else {
-+		ctrl = set_register_field(ctrl, index, data->clk_src_mask,
-+					  CLK_CTRL_SRC_SHIFT);
-+	}
-+
-+	clockman_write(clockman, data->ctrl_reg, ctrl);
-+	spin_unlock(&clockman->regs_lock);
-+
-+	sel = rp1_clock_get_parent(hw);
-+	WARN(sel != index, "(%s): Parent index req %u returned back %u\n",
-+	     data->name, index, sel);
-+
-+	return 0;
-+}
-+
-+static int rp1_clock_set_rate_and_parent(struct clk_hw *hw,
-+					 unsigned long rate,
-+					 unsigned long parent_rate,
-+					 u8 parent)
-+{
-+	struct rp1_clock *clock = container_of(hw, struct rp1_clock, hw);
-+	struct rp1_clockman *clockman = clock->clockman;
-+	const struct rp1_clock_data *data = clock->data;
-+	u32 div = rp1_clock_choose_div(rate, parent_rate, data);
-+
-+	WARN(rate > 4000000000ll, "rate is -ve (%d)\n", (int)rate);
-+
-+	if (WARN(!div,
-+		 "clk divider calculated as 0! (%s, rate %ld, parent rate %ld)\n",
-+		 data->name, rate, parent_rate))
-+		div = 1 << CLK_DIV_FRAC_BITS;
-+
-+	spin_lock(&clockman->regs_lock);
-+
-+	clockman_write(clockman, data->div_int_reg, div >> CLK_DIV_FRAC_BITS);
-+	if (data->div_frac_reg)
-+		clockman_write(clockman, data->div_frac_reg, div << (32 - CLK_DIV_FRAC_BITS));
-+
-+	spin_unlock(&clockman->regs_lock);
-+
-+	if (parent != 0xff)
-+		rp1_clock_set_parent(hw, parent);
-+
-+#ifdef MEASURE_CLOCK_RATE
-+	if (rp1_clock_is_on(hw))
-+		clockman_measure_clock(clockman, data->name, data->fc0_src);
-+#endif
-+	return 0;
-+}
-+
-+static int rp1_clock_set_rate(struct clk_hw *hw, unsigned long rate,
-+			      unsigned long parent_rate)
-+{
-+	return rp1_clock_set_rate_and_parent(hw, rate, parent_rate, 0xff);
-+}
-+
-+static void rp1_clock_choose_div_and_prate(struct clk_hw *hw,
-+					   int parent_idx,
-+					   unsigned long rate,
-+					   unsigned long *prate,
-+					   unsigned long *calc_rate)
-+{
-+	struct rp1_clock *clock = container_of(hw, struct rp1_clock, hw);
-+	const struct rp1_clock_data *data = clock->data;
-+	struct clk_hw *parent;
-+	u32 div;
-+	u64 tmp;
-+
-+	parent = clk_hw_get_parent_by_index(hw, parent_idx);
-+	*prate = clk_hw_get_rate(parent);
-+	div = rp1_clock_choose_div(rate, *prate, data);
-+
-+	if (!div) {
-+		*calc_rate = 0;
-+		return;
-+	}
-+
-+	/* Recalculate to account for rounding errors */
-+	tmp = (u64)*prate << CLK_DIV_FRAC_BITS;
-+	tmp = div_u64(tmp, div);
-+	*calc_rate = tmp;
-+}
-+
-+static int rp1_clock_determine_rate(struct clk_hw *hw,
-+				    struct clk_rate_request *req)
-+{
-+	struct clk_hw *parent, *best_parent = NULL;
-+	unsigned long best_rate = 0;
-+	unsigned long best_prate = 0;
-+	unsigned long best_rate_diff = ULONG_MAX;
-+	unsigned long prate, calc_rate;
-+	size_t i;
-+
-+	/*
-+	 * If the NO_REPARENT flag is set, try to use existing parent.
-+	 */
-+	if ((clk_hw_get_flags(hw) & CLK_SET_RATE_NO_REPARENT)) {
-+		i = rp1_clock_get_parent(hw);
-+		parent = clk_hw_get_parent_by_index(hw, i);
-+		if (parent) {
-+			rp1_clock_choose_div_and_prate(hw, i, req->rate, &prate,
-+						       &calc_rate);
-+			if (calc_rate > 0) {
-+				req->best_parent_hw = parent;
-+				req->best_parent_rate = prate;
-+				req->rate = calc_rate;
-+				return 0;
-+			}
-+		}
-+	}
-+
-+	/*
-+	 * Select parent clock that results in the closest rate (lower or
-+	 * higher)
-+	 */
-+	for (i = 0; i < clk_hw_get_num_parents(hw); i++) {
-+		parent = clk_hw_get_parent_by_index(hw, i);
-+		if (!parent)
-+			continue;
-+
-+		rp1_clock_choose_div_and_prate(hw, i, req->rate, &prate,
-+					       &calc_rate);
-+
-+		if (ABS_DIFF(calc_rate, req->rate) < best_rate_diff) {
-+			best_parent = parent;
-+			best_prate = prate;
-+			best_rate = calc_rate;
-+			best_rate_diff = ABS_DIFF(calc_rate, req->rate);
-+
-+			if (best_rate_diff == 0)
-+				break;
-+		}
-+	}
-+
-+	if (best_rate == 0)
-+		return -EINVAL;
-+
-+	req->best_parent_hw = best_parent;
-+	req->best_parent_rate = best_prate;
-+	req->rate = best_rate;
-+
-+	return 0;
-+}
-+
-+static void rp1_clk_debug_init(struct clk_hw *hw, struct dentry *dentry)
-+{
-+	struct rp1_clock *clock = container_of(hw, struct rp1_clock, hw);
-+	struct rp1_clockman *clockman = clock->clockman;
-+	const struct rp1_clock_data *data = clock->data;
-+	struct debugfs_reg32 *regs;
-+	int i;
-+
-+	regs = devm_kcalloc(clockman->dev, 4, sizeof(*regs), GFP_KERNEL);
-+	if (!regs)
-+		return;
-+
-+	i = 0;
-+	regs[i].name = "ctrl";
-+	regs[i++].offset = data->ctrl_reg;
-+	regs[i].name = "div_int";
-+	regs[i++].offset = data->div_int_reg;
-+	regs[i].name = "div_frac";
-+	regs[i++].offset = data->div_frac_reg;
-+	regs[i].name = "sel";
-+	regs[i++].offset = data->sel_reg;
-+
-+	rp1_debugfs_regset(clockman, 0, regs, i, dentry);
-+}
-+
-+static const struct clk_ops rp1_pll_core_ops = {
-+	.is_prepared = rp1_pll_core_is_on,
-+	.prepare = rp1_pll_core_on,
-+	.unprepare = rp1_pll_core_off,
-+	.set_rate = rp1_pll_core_set_rate,
-+	.recalc_rate = rp1_pll_core_recalc_rate,
-+	.round_rate = rp1_pll_core_round_rate,
-+	.debug_init = rp1_pll_core_debug_init,
-+};
-+
-+static const struct clk_ops rp1_pll_ops = {
-+	.set_rate = rp1_pll_set_rate,
-+	.recalc_rate = rp1_pll_recalc_rate,
-+	.round_rate = rp1_pll_round_rate,
-+	.debug_init = rp1_pll_debug_init,
-+};
-+
-+static const struct clk_ops rp1_pll_ph_ops = {
-+	.is_prepared = rp1_pll_ph_is_on,
-+	.prepare = rp1_pll_ph_on,
-+	.unprepare = rp1_pll_ph_off,
-+	.set_rate = rp1_pll_ph_set_rate,
-+	.recalc_rate = rp1_pll_ph_recalc_rate,
-+	.round_rate = rp1_pll_ph_round_rate,
-+	.debug_init = rp1_pll_ph_debug_init,
-+};
-+
-+static const struct clk_ops rp1_pll_divider_ops = {
-+	.is_prepared = rp1_pll_divider_is_on,
-+	.prepare = rp1_pll_divider_on,
-+	.unprepare = rp1_pll_divider_off,
-+	.set_rate = rp1_pll_divider_set_rate,
-+	.recalc_rate = rp1_pll_divider_recalc_rate,
-+	.round_rate = rp1_pll_divider_round_rate,
-+	.debug_init = rp1_pll_divider_debug_init,
-+};
-+
-+static const struct clk_ops rp1_clk_ops = {
-+	.is_prepared = rp1_clock_is_on,
-+	.prepare = rp1_clock_on,
-+	.unprepare = rp1_clock_off,
-+	.recalc_rate = rp1_clock_recalc_rate,
-+	.get_parent = rp1_clock_get_parent,
-+	.set_parent = rp1_clock_set_parent,
-+	.set_rate_and_parent = rp1_clock_set_rate_and_parent,
-+	.set_rate = rp1_clock_set_rate,
-+	.determine_rate = rp1_clock_determine_rate,
-+	.debug_init = rp1_clk_debug_init,
-+};
-+
-+static bool rp1_clk_is_claimed(const char *name);
-+
-+static struct clk_hw *rp1_register_pll_core(struct rp1_clockman *clockman,
-+					    const void *data)
-+{
-+	const struct rp1_pll_core_data *pll_core_data = data;
-+	struct rp1_pll_core *pll_core;
-+	struct clk_init_data init;
-+	int ret;
-+
-+	memset(&init, 0, sizeof(init));
-+
-+	/* All of the PLL cores derive from the external oscillator. */
-+	init.parent_names = &ref_clock;
-+	init.num_parents = 1;
-+	init.name = pll_core_data->name;
-+	init.ops = &rp1_pll_core_ops;
-+	init.flags = pll_core_data->flags | CLK_IGNORE_UNUSED | CLK_IS_CRITICAL;
-+
-+	pll_core = kzalloc(sizeof(*pll_core), GFP_KERNEL);
-+	if (!pll_core)
-+		return NULL;
-+
-+	pll_core->clockman = clockman;
-+	pll_core->data = pll_core_data;
-+	pll_core->hw.init = &init;
-+
-+	ret = devm_clk_hw_register(clockman->dev, &pll_core->hw);
-+	if (ret) {
-+		kfree(pll_core);
-+		return NULL;
-+	}
-+
-+	return &pll_core->hw;
-+}
-+
-+static struct clk_hw *rp1_register_pll(struct rp1_clockman *clockman,
-+				       const void *data)
-+{
-+	const struct rp1_pll_data *pll_data = data;
-+	struct rp1_pll *pll;
-+	struct clk_init_data init;
-+	int ret;
-+
-+	memset(&init, 0, sizeof(init));
-+
-+	init.parent_names = &pll_data->source_pll;
-+	init.num_parents = 1;
-+	init.name = pll_data->name;
-+	init.ops = &rp1_pll_ops;
-+	init.flags = pll_data->flags | CLK_IGNORE_UNUSED | CLK_IS_CRITICAL;
-+
-+	pll = kzalloc(sizeof(*pll), GFP_KERNEL);
-+	if (!pll)
-+		return NULL;
-+
-+	pll->clockman = clockman;
-+	pll->data = pll_data;
-+	pll->hw.init = &init;
-+
-+	ret = devm_clk_hw_register(clockman->dev, &pll->hw);
-+	if (ret) {
-+		kfree(pll);
-+		return NULL;
-+	}
-+
-+	return &pll->hw;
-+}
-+
-+static struct clk_hw *rp1_register_pll_ph(struct rp1_clockman *clockman,
-+					  const void *data)
-+{
-+	const struct rp1_pll_ph_data *ph_data = data;
-+	struct rp1_pll_ph *ph;
-+	struct clk_init_data init;
-+	int ret;
-+
-+	memset(&init, 0, sizeof(init));
-+
-+	/* All of the PLLs derive from the external oscillator. */
-+	init.parent_names = &ph_data->source_pll;
-+	init.num_parents = 1;
-+	init.name = ph_data->name;
-+	init.ops = &rp1_pll_ph_ops;
-+	init.flags = ph_data->flags | CLK_IGNORE_UNUSED;
-+
-+	ph = kzalloc(sizeof(*ph), GFP_KERNEL);
-+	if (!ph)
-+		return NULL;
-+
-+	ph->clockman = clockman;
-+	ph->data = ph_data;
-+	ph->hw.init = &init;
-+
-+	ret = devm_clk_hw_register(clockman->dev, &ph->hw);
-+	if (ret) {
-+		kfree(ph);
-+		return NULL;
-+	}
-+
-+	return &ph->hw;
-+}
-+
-+static struct clk_hw *rp1_register_pll_divider(struct rp1_clockman *clockman,
-+					       const void *data)
-+{
-+	const struct rp1_pll_data *divider_data = data;
-+	struct rp1_pll *divider;
-+	struct clk_init_data init;
-+	int ret;
-+
-+	memset(&init, 0, sizeof(init));
-+
-+	init.parent_names = &divider_data->source_pll;
-+	init.num_parents = 1;
-+	init.name = divider_data->name;
-+	init.ops = &rp1_pll_divider_ops;
-+	init.flags = divider_data->flags | CLK_IGNORE_UNUSED;
-+
-+	divider = devm_kzalloc(clockman->dev, sizeof(*divider), GFP_KERNEL);
-+	if (!divider)
-+		return NULL;
-+
-+	divider->div.reg = clockman->regs + divider_data->ctrl_reg;
-+	divider->div.shift = PLL_SEC_DIV_SHIFT;
-+	divider->div.width = PLL_SEC_DIV_WIDTH;
-+	divider->div.flags = CLK_DIVIDER_ROUND_CLOSEST;
-+	divider->div.lock = &clockman->regs_lock;
-+	divider->div.hw.init = &init;
-+	divider->div.table = pll_sec_div_table;
-+
-+	if (!rp1_clk_is_claimed(divider_data->source_pll))
-+		init.flags |= CLK_IS_CRITICAL;
-+	if (!rp1_clk_is_claimed(divider_data->name))
-+		divider->div.flags |= CLK_IS_CRITICAL;
-+
-+	divider->clockman = clockman;
-+	divider->data = divider_data;
-+
-+	ret = devm_clk_hw_register(clockman->dev, &divider->div.hw);
-+	if (ret)
-+		return ERR_PTR(ret);
-+
-+	return &divider->div.hw;
-+}
-+
-+static struct clk_hw *rp1_register_clock(struct rp1_clockman *clockman,
-+					 const void *data)
-+{
-+	const struct rp1_clock_data *clock_data = data;
-+	struct rp1_clock *clock;
-+	struct clk_init_data init;
-+	int ret;
-+
-+	BUG_ON(MAX_CLK_PARENTS <
-+	       clock_data->num_std_parents + clock_data->num_aux_parents);
-+	/* There must be a gap for the AUX selector */
-+	BUG_ON((clock_data->num_std_parents > AUX_SEL) &&
-+	       strcmp("-", clock_data->parents[AUX_SEL]));
-+
-+	memset(&init, 0, sizeof(init));
-+	init.parent_names = clock_data->parents;
-+	init.num_parents =
-+		clock_data->num_std_parents + clock_data->num_aux_parents;
-+	init.name = clock_data->name;
-+	init.flags = clock_data->flags | CLK_IGNORE_UNUSED;
-+	init.ops = &rp1_clk_ops;
-+
-+	clock = devm_kzalloc(clockman->dev, sizeof(*clock), GFP_KERNEL);
-+	if (!clock)
-+		return NULL;
-+
-+	clock->clockman = clockman;
-+	clock->data = clock_data;
-+	clock->hw.init = &init;
-+
-+	ret = devm_clk_hw_register(clockman->dev, &clock->hw);
-+	if (ret)
-+		return ERR_PTR(ret);
-+
-+	return &clock->hw;
-+}
-+
-+struct rp1_clk_desc {
-+	struct clk_hw *(*clk_register)(struct rp1_clockman *clockman,
-+				       const void *data);
-+	const void *data;
-+};
-+
-+/* Assignment helper macros for different clock types. */
-+#define _REGISTER(f, ...) { .clk_register = f, .data = __VA_ARGS__ }
-+
-+#define REGISTER_PLL_CORE(...)	_REGISTER(&rp1_register_pll_core,	\
-+					  &(struct rp1_pll_core_data)	\
-+					  {__VA_ARGS__})
-+
-+#define REGISTER_PLL(...)	_REGISTER(&rp1_register_pll,		\
-+					  &(struct rp1_pll_data)		\
-+					  {__VA_ARGS__})
-+
-+#define REGISTER_PLL_PH(...)	_REGISTER(&rp1_register_pll_ph,		\
-+					  &(struct rp1_pll_ph_data)	\
-+					  {__VA_ARGS__})
-+
-+#define REGISTER_PLL_DIV(...)	_REGISTER(&rp1_register_pll_divider,	\
-+					  &(struct rp1_pll_data)	\
-+					  {__VA_ARGS__})
-+
-+#define REGISTER_CLK(...)	_REGISTER(&rp1_register_clock,		\
-+					  &(struct rp1_clock_data)	\
-+					  {__VA_ARGS__})
-+
-+static const struct rp1_clk_desc clk_desc_array[] = {
-+	[RP1_PLL_SYS_CORE] = REGISTER_PLL_CORE(
-+				.name = "pll_sys_core",
-+				.cs_reg = PLL_SYS_CS,
-+				.pwr_reg = PLL_SYS_PWR,
-+				.fbdiv_int_reg = PLL_SYS_FBDIV_INT,
-+				.fbdiv_frac_reg = PLL_SYS_FBDIV_FRAC,
-+				),
-+
-+	[RP1_PLL_AUDIO_CORE] = REGISTER_PLL_CORE(
-+				.name = "pll_audio_core",
-+				.cs_reg = PLL_AUDIO_CS,
-+				.pwr_reg = PLL_AUDIO_PWR,
-+				.fbdiv_int_reg = PLL_AUDIO_FBDIV_INT,
-+				.fbdiv_frac_reg = PLL_AUDIO_FBDIV_FRAC,
-+				),
-+
-+	[RP1_PLL_VIDEO_CORE] = REGISTER_PLL_CORE(
-+				.name = "pll_video_core",
-+				.cs_reg = PLL_VIDEO_CS,
-+				.pwr_reg = PLL_VIDEO_PWR,
-+				.fbdiv_int_reg = PLL_VIDEO_FBDIV_INT,
-+				.fbdiv_frac_reg = PLL_VIDEO_FBDIV_FRAC,
-+				),
-+
-+	[RP1_PLL_SYS] = REGISTER_PLL(
-+				.name = "pll_sys",
-+				.source_pll = "pll_sys_core",
-+				.ctrl_reg = PLL_SYS_PRIM,
-+				.fc0_src = FC_NUM(0, 2),
-+				),
-+
-+	[RP1_PLL_AUDIO] = REGISTER_PLL(
-+				.name = "pll_audio",
-+				.source_pll = "pll_audio_core",
-+				.ctrl_reg = PLL_AUDIO_PRIM,
-+				.fc0_src = FC_NUM(4, 2),
-+				),
-+
-+	[RP1_PLL_VIDEO] = REGISTER_PLL(
-+				.name = "pll_video",
-+				.source_pll = "pll_video_core",
-+				.ctrl_reg = PLL_VIDEO_PRIM,
-+				.fc0_src = FC_NUM(3, 2),
-+				),
-+
-+	[RP1_PLL_SYS_PRI_PH] = REGISTER_PLL_PH(
-+				.name = "pll_sys_pri_ph",
-+				.source_pll = "pll_sys",
-+				.ph_reg = PLL_SYS_PRIM,
-+				.fixed_divider = 2,
-+				.phase = RP1_PLL_PHASE_0,
-+				.fc0_src = FC_NUM(1, 2),
-+				),
-+
-+	[RP1_PLL_AUDIO_PRI_PH] = REGISTER_PLL_PH(
-+				.name = "pll_audio_pri_ph",
-+				.source_pll = "pll_audio",
-+				.ph_reg = PLL_AUDIO_PRIM,
-+				.fixed_divider = 2,
-+				.phase = RP1_PLL_PHASE_0,
-+				.fc0_src = FC_NUM(5, 1),
-+				),
-+
-+	[RP1_PLL_SYS_SEC] = REGISTER_PLL_DIV(
-+				.name = "pll_sys_sec",
-+				.source_pll = "pll_sys_core",
-+				.ctrl_reg = PLL_SYS_SEC,
-+				.fc0_src = FC_NUM(2, 2),
-+				),
-+
-+	[RP1_PLL_AUDIO_SEC] = REGISTER_PLL_DIV(
-+				.name = "pll_audio_sec",
-+				.source_pll = "pll_audio_core",
-+				.ctrl_reg = PLL_AUDIO_SEC,
-+				.fc0_src = FC_NUM(6, 2),
-+				),
-+
-+	[RP1_PLL_VIDEO_SEC] = REGISTER_PLL_DIV(
-+				.name = "pll_video_sec",
-+				.source_pll = "pll_video_core",
-+				.ctrl_reg = PLL_VIDEO_SEC,
-+				.fc0_src = FC_NUM(5, 3),
-+				),
-+
-+	[RP1_CLK_SYS] = REGISTER_CLK(
-+				.name = "clk_sys",
-+				.parents = {"xosc", "-", "pll_sys"},
-+				.num_std_parents = 3,
-+				.num_aux_parents = 0,
-+				.ctrl_reg = CLK_SYS_CTRL,
-+				.div_int_reg = CLK_SYS_DIV_INT,
-+				.sel_reg = CLK_SYS_SEL,
-+				.div_int_max = DIV_INT_24BIT_MAX,
-+				.fc0_src = FC_NUM(0, 4),
-+				.clk_src_mask = 0x3,
-+				),
-+
-+	[RP1_CLK_SLOW_SYS] = REGISTER_CLK(
-+				.name = "clk_slow_sys",
-+				.parents = {"xosc"},
-+				.num_std_parents = 1,
-+				.num_aux_parents = 0,
-+				.ctrl_reg = CLK_SLOW_SYS_CTRL,
-+				.div_int_reg = CLK_SLOW_SYS_DIV_INT,
-+				.sel_reg = CLK_SLOW_SYS_SEL,
-+				.div_int_max = DIV_INT_8BIT_MAX,
-+				.fc0_src = FC_NUM(1, 4),
-+				.clk_src_mask = 0x1,
-+				),
-+
-+	[RP1_CLK_UART] = REGISTER_CLK(
-+				.name = "clk_uart",
-+				.parents = {"pll_sys_pri_ph",
-+					    "pll_video",
-+					    "xosc"},
-+				.num_std_parents = 0,
-+				.num_aux_parents = 3,
-+				.ctrl_reg = CLK_UART_CTRL,
-+				.div_int_reg = CLK_UART_DIV_INT,
-+				.sel_reg = CLK_UART_SEL,
-+				.div_int_max = DIV_INT_8BIT_MAX,
-+				.fc0_src = FC_NUM(6, 7),
-+				),
-+
-+	[RP1_CLK_ETH] = REGISTER_CLK(
-+				.name = "clk_eth",
-+				.parents = {"-"},
-+				.num_std_parents = 1,
-+				.num_aux_parents = 0,
-+				.ctrl_reg = CLK_ETH_CTRL,
-+				.div_int_reg = CLK_ETH_DIV_INT,
-+				.sel_reg = CLK_ETH_SEL,
-+				.div_int_max = DIV_INT_8BIT_MAX,
-+				.fc0_src = FC_NUM(4, 6),
-+				),
-+
-+	[RP1_CLK_PWM0] = REGISTER_CLK(
-+				.name = "clk_pwm0",
-+				.parents = {"pll_audio_pri_ph",
-+					    "pll_video_sec",
-+					    "xosc"},
-+				.num_std_parents = 0,
-+				.num_aux_parents = 3,
-+				.ctrl_reg = CLK_PWM0_CTRL,
-+				.div_int_reg = CLK_PWM0_DIV_INT,
-+				.div_frac_reg = CLK_PWM0_DIV_FRAC,
-+				.sel_reg = CLK_PWM0_SEL,
-+				.div_int_max = DIV_INT_16BIT_MAX,
-+				.fc0_src = FC_NUM(0, 5),
-+				),
-+
-+	[RP1_CLK_PWM1] = REGISTER_CLK(
-+				.name = "clk_pwm1",
-+				.parents = {"pll_audio_pri_ph",
-+					    "pll_video_sec",
-+					    "xosc"},
-+				.num_std_parents = 0,
-+				.num_aux_parents = 3,
-+				.ctrl_reg = CLK_PWM1_CTRL,
-+				.div_int_reg = CLK_PWM1_DIV_INT,
-+				.div_frac_reg = CLK_PWM1_DIV_FRAC,
-+				.sel_reg = CLK_PWM1_SEL,
-+				.div_int_max = DIV_INT_16BIT_MAX,
-+				.fc0_src = FC_NUM(1, 5),
-+				),
-+
-+	[RP1_CLK_AUDIO_IN] = REGISTER_CLK(
-+				.name = "clk_audio_in",
-+				.parents = {"-"},
-+				.num_std_parents = 1,
-+				.num_aux_parents = 0,
-+				.ctrl_reg = CLK_AUDIO_IN_CTRL,
-+				.div_int_reg = CLK_AUDIO_IN_DIV_INT,
-+				.sel_reg = CLK_AUDIO_IN_SEL,
-+				.div_int_max = DIV_INT_8BIT_MAX,
-+				.fc0_src = FC_NUM(2, 5),
-+				),
-+
-+	[RP1_CLK_AUDIO_OUT] = REGISTER_CLK(
-+				.name = "clk_audio_out",
-+				.parents = {"-"},
-+				.num_std_parents = 1,
-+				.num_aux_parents = 0,
-+				.ctrl_reg = CLK_AUDIO_OUT_CTRL,
-+				.div_int_reg = CLK_AUDIO_OUT_DIV_INT,
-+				.sel_reg = CLK_AUDIO_OUT_SEL,
-+				.div_int_max = DIV_INT_8BIT_MAX,
-+				.fc0_src = FC_NUM(3, 5),
-+				),
-+
-+	[RP1_CLK_I2S] = REGISTER_CLK(
-+				.name = "clk_i2s",
-+				.parents = {"xosc",
-+					    "pll_audio",
-+					    "pll_audio_sec"},
-+				.num_std_parents = 0,
-+				.num_aux_parents = 3,
-+				.ctrl_reg = CLK_I2S_CTRL,
-+				.div_int_reg = CLK_I2S_DIV_INT,
-+				.sel_reg = CLK_I2S_SEL,
-+				.div_int_max = DIV_INT_8BIT_MAX,
-+				.fc0_src = FC_NUM(4, 4),
-+				),
-+
-+	[RP1_CLK_MIPI0_CFG] = REGISTER_CLK(
-+				.name = "clk_mipi0_cfg",
-+				.parents = {"xosc"},
-+				.num_std_parents = 0,
-+				.num_aux_parents = 1,
-+				.ctrl_reg = CLK_MIPI0_CFG_CTRL,
-+				.div_int_reg = CLK_MIPI0_CFG_DIV_INT,
-+				.sel_reg = CLK_MIPI0_CFG_SEL,
-+				.div_int_max = DIV_INT_8BIT_MAX,
-+				.fc0_src = FC_NUM(4, 5),
-+				),
-+
-+	[RP1_CLK_MIPI1_CFG] = REGISTER_CLK(
-+				.name = "clk_mipi1_cfg",
-+				.parents = {"xosc"},
-+				.num_std_parents = 0,
-+				.num_aux_parents = 1,
-+				.ctrl_reg = CLK_MIPI1_CFG_CTRL,
-+				.div_int_reg = CLK_MIPI1_CFG_DIV_INT,
-+				.sel_reg = CLK_MIPI1_CFG_SEL,
-+				.clk_src_mask = 1,
-+				.div_int_max = DIV_INT_8BIT_MAX,
-+				.fc0_src = FC_NUM(5, 6),
-+				),
-+
-+	[RP1_CLK_ETH_TSU] = REGISTER_CLK(
-+				.name = "clk_eth_tsu",
-+				.parents = {"xosc"},
-+				.num_std_parents = 0,
-+				.num_aux_parents = 1,
-+				.ctrl_reg = CLK_ETH_TSU_CTRL,
-+				.div_int_reg = CLK_ETH_TSU_DIV_INT,
-+				.sel_reg = CLK_ETH_TSU_SEL,
-+				.div_int_max = DIV_INT_8BIT_MAX,
-+				.fc0_src = FC_NUM(5, 7),
-+				),
-+
-+	[RP1_CLK_ADC] = REGISTER_CLK(
-+				.name = "clk_adc",
-+				.parents = {"xosc"},
-+				.num_std_parents = 0,
-+				.num_aux_parents = 1,
-+				.ctrl_reg = CLK_ADC_CTRL,
-+				.div_int_reg = CLK_ADC_DIV_INT,
-+				.sel_reg = CLK_ADC_SEL,
-+				.div_int_max = DIV_INT_8BIT_MAX,
-+				.fc0_src = FC_NUM(5, 5),
-+				),
-+
-+	[RP1_CLK_SDIO_TIMER] = REGISTER_CLK(
-+				.name = "clk_sdio_timer",
-+				.parents = {"xosc"},
-+				.num_std_parents = 0,
-+				.num_aux_parents = 1,
-+				.ctrl_reg = CLK_SDIO_TIMER_CTRL,
-+				.div_int_reg = CLK_SDIO_TIMER_DIV_INT,
-+				.sel_reg = CLK_SDIO_TIMER_SEL,
-+				.div_int_max = DIV_INT_8BIT_MAX,
-+				.fc0_src = FC_NUM(3, 4),
-+				),
-+
-+	[RP1_CLK_SDIO_ALT_SRC] = REGISTER_CLK(
-+				.name = "clk_sdio_alt_src",
-+				.parents = {"pll_sys"},
-+				.num_std_parents = 0,
-+				.num_aux_parents = 1,
-+				.ctrl_reg = CLK_SDIO_ALT_SRC_CTRL,
-+				.div_int_reg = CLK_SDIO_ALT_SRC_DIV_INT,
-+				.sel_reg = CLK_SDIO_ALT_SRC_SEL,
-+				.div_int_max = DIV_INT_8BIT_MAX,
-+				.fc0_src = FC_NUM(5, 4),
-+				),
-+
-+	[RP1_CLK_GP0] = REGISTER_CLK(
-+				.name = "clk_gp0",
-+				.parents = {"xosc"},
-+				.num_std_parents = 0,
-+				.num_aux_parents = 1,
-+				.ctrl_reg = CLK_GP0_CTRL,
-+				.div_int_reg = CLK_GP0_DIV_INT,
-+				.div_frac_reg = CLK_GP0_DIV_FRAC,
-+				.sel_reg = CLK_GP0_SEL,
-+				.div_int_max = DIV_INT_16BIT_MAX,
-+				.fc0_src = FC_NUM(0, 1),
-+				),
-+
-+	[RP1_CLK_GP1] = REGISTER_CLK(
-+				.name = "clk_gp1",
-+				.parents = {"xosc"},
-+				.num_std_parents = 0,
-+				.num_aux_parents = 1,
-+				.ctrl_reg = CLK_GP1_CTRL,
-+				.div_int_reg = CLK_GP1_DIV_INT,
-+				.div_frac_reg = CLK_GP1_DIV_FRAC,
-+				.sel_reg = CLK_GP1_SEL,
-+				.div_int_max = DIV_INT_16BIT_MAX,
-+				.fc0_src = FC_NUM(1, 1),
-+				),
-+
-+	[RP1_CLK_GP2] = REGISTER_CLK(
-+				.name = "clk_gp2",
-+				.parents = {"xosc"},
-+				.num_std_parents = 0,
-+				.num_aux_parents = 1,
-+				.ctrl_reg = CLK_GP2_CTRL,
-+				.div_int_reg = CLK_GP2_DIV_INT,
-+				.div_frac_reg = CLK_GP2_DIV_FRAC,
-+				.sel_reg = CLK_GP2_SEL,
-+				.div_int_max = DIV_INT_16BIT_MAX,
-+				.fc0_src = FC_NUM(2, 1),
-+				),
-+
-+	[RP1_CLK_GP3] = REGISTER_CLK(
-+				.name = "clk_gp3",
-+				.parents = {"xosc"},
-+				.num_std_parents = 0,
-+				.num_aux_parents = 1,
-+				.ctrl_reg = CLK_GP3_CTRL,
-+				.div_int_reg = CLK_GP3_DIV_INT,
-+				.div_frac_reg = CLK_GP3_DIV_FRAC,
-+				.sel_reg = CLK_GP3_SEL,
-+				.div_int_max = DIV_INT_16BIT_MAX,
-+				.fc0_src = FC_NUM(3, 1),
-+				),
-+
-+	[RP1_CLK_GP4] = REGISTER_CLK(
-+				.name = "clk_gp4",
-+				.parents = {"xosc"},
-+				.num_std_parents = 0,
-+				.num_aux_parents = 1,
-+				.ctrl_reg = CLK_GP4_CTRL,
-+				.div_int_reg = CLK_GP4_DIV_INT,
-+				.div_frac_reg = CLK_GP4_DIV_FRAC,
-+				.sel_reg = CLK_GP4_SEL,
-+				.div_int_max = DIV_INT_16BIT_MAX,
-+				.fc0_src = FC_NUM(4, 1),
-+				),
-+
-+	[RP1_CLK_GP5] = REGISTER_CLK(
-+				.name = "clk_gp5",
-+				.parents = {"xosc"},
-+				.num_std_parents = 0,
-+				.num_aux_parents = 1,
-+				.ctrl_reg = CLK_GP5_CTRL,
-+				.div_int_reg = CLK_GP5_DIV_INT,
-+				.div_frac_reg = CLK_GP5_DIV_FRAC,
-+				.sel_reg = CLK_GP5_SEL,
-+				.div_int_max = DIV_INT_16BIT_MAX,
-+				.fc0_src = FC_NUM(5, 1),
-+				),
-+
-+	[RP1_CLK_VEC] = REGISTER_CLK(
-+				.name = "clk_vec",
-+				.parents = {"pll_sys_pri_ph",
-+					    "pll_video_sec",
-+					    "pll_video",
-+					    "clk_gp0",
-+					    "clk_gp1",
-+					    "clk_gp2",
-+					    "clk_gp3",
-+					    "clk_gp4"},
-+				.num_std_parents = 0,
-+				.num_aux_parents = 8, /* XXX in fact there are more than 8 */
-+				.ctrl_reg = VIDEO_CLK_VEC_CTRL,
-+				.div_int_reg = VIDEO_CLK_VEC_DIV_INT,
-+				.sel_reg = VIDEO_CLK_VEC_SEL,
-+				.flags = CLK_SET_RATE_NO_REPARENT, /* Let VEC driver set parent */
-+				.div_int_max = DIV_INT_8BIT_MAX,
-+				.fc0_src = FC_NUM(0, 6),
-+				),
-+
-+	[RP1_CLK_DPI] = REGISTER_CLK(
-+				.name = "clk_dpi",
-+				.parents = {"pll_sys",
-+					    "pll_video_sec",
-+					    "pll_video",
-+					    "clk_gp0",
-+					    "clk_gp1",
-+					    "clk_gp2",
-+					    "clk_gp3",
-+					    "clk_gp4"},
-+				.num_std_parents = 0,
-+				.num_aux_parents = 8, /* XXX in fact there are more than 8 */
-+				.ctrl_reg = VIDEO_CLK_DPI_CTRL,
-+				.div_int_reg = VIDEO_CLK_DPI_DIV_INT,
-+				.sel_reg = VIDEO_CLK_DPI_SEL,
-+				.flags = CLK_SET_RATE_NO_REPARENT, /* Let DPI driver set parent */
-+				.div_int_max = DIV_INT_8BIT_MAX,
-+				.fc0_src = FC_NUM(1, 6),
-+				),
-+
-+	[RP1_CLK_MIPI0_DPI] = REGISTER_CLK(
-+				.name = "clk_mipi0_dpi",
-+				.parents = {"pll_sys",
-+					    "pll_video_sec",
-+					    "pll_video",
-+					    "clksrc_mipi0_dsi_byteclk",
-+					    "clk_gp0",
-+					    "clk_gp1",
-+					    "clk_gp2",
-+					    "clk_gp3"},
-+				.num_std_parents = 0,
-+				.num_aux_parents = 8, /* XXX in fact there are more than 8 */
-+				.ctrl_reg = VIDEO_CLK_MIPI0_DPI_CTRL,
-+				.div_int_reg = VIDEO_CLK_MIPI0_DPI_DIV_INT,
-+				.div_frac_reg = VIDEO_CLK_MIPI0_DPI_DIV_FRAC,
-+				.sel_reg = VIDEO_CLK_MIPI0_DPI_SEL,
-+				.flags = CLK_SET_RATE_NO_REPARENT, /* Let DSI driver set parent */
-+				.div_int_max = DIV_INT_8BIT_MAX,
-+				.fc0_src = FC_NUM(2, 6),
-+				),
-+
-+	[RP1_CLK_MIPI1_DPI] = REGISTER_CLK(
-+				.name = "clk_mipi1_dpi",
-+				.parents = {"pll_sys",
-+					    "pll_video_sec",
-+					    "pll_video",
-+					    "clksrc_mipi1_dsi_byteclk",
-+					    "clk_gp0",
-+					    "clk_gp1",
-+					    "clk_gp2",
-+					    "clk_gp3"},
-+				.num_std_parents = 0,
-+				.num_aux_parents = 8, /* XXX in fact there are more than 8 */
-+				.ctrl_reg = VIDEO_CLK_MIPI1_DPI_CTRL,
-+				.div_int_reg = VIDEO_CLK_MIPI1_DPI_DIV_INT,
-+				.div_frac_reg = VIDEO_CLK_MIPI1_DPI_DIV_FRAC,
-+				.sel_reg = VIDEO_CLK_MIPI1_DPI_SEL,
-+				.flags = CLK_SET_RATE_NO_REPARENT, /* Let DSI driver set parent */
-+				.div_int_max = DIV_INT_8BIT_MAX,
-+				.fc0_src = FC_NUM(3, 6),
-+				),
-+};
-+
-+static bool rp1_clk_claimed[ARRAY_SIZE(clk_desc_array)];
-+
-+static bool rp1_clk_is_claimed(const char *name)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(clk_desc_array); i++) {
-+		if (clk_desc_array[i].data) {
-+			const char *clk_name = *(const char **)(clk_desc_array[i].data);
-+
-+			if (!strcmp(name, clk_name))
-+				return rp1_clk_claimed[i];
-+		}
-+	}
-+
-+	return false;
-+}
-+
-+static int rp1_clk_probe(struct platform_device *pdev)
-+{
-+	const struct rp1_clk_desc *desc;
-+	struct device *dev = &pdev->dev;
-+	struct rp1_clockman *clockman;
-+	struct resource *res;
-+	struct clk_hw **hws;
-+	const size_t asize = ARRAY_SIZE(clk_desc_array);
-+	u32 chip_id, platform;
-+	unsigned int i;
-+	u32 clk_id;
-+	int ret;
-+
-+	clockman = devm_kzalloc(dev, struct_size(clockman, onecell.hws, asize),
-+				GFP_KERNEL);
-+	if (!clockman)
-+		return -ENOMEM;
-+
-+	rp1_get_platform(&chip_id, &platform);
-+
-+	spin_lock_init(&clockman->regs_lock);
-+	clockman->dev = dev;
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	clockman->regs = devm_ioremap_resource(&pdev->dev, res);
-+	if (IS_ERR(clockman->regs))
-+		return PTR_ERR(clockman->regs);
-+
-+	memset(rp1_clk_claimed, 0, sizeof(rp1_clk_claimed));
-+	for (i = 0;
-+	     !of_property_read_u32_index(pdev->dev.of_node, "claim-clocks",
-+					 i, &clk_id);
-+	     i++)
-+		rp1_clk_claimed[clk_id] = true;
-+
-+	platform_set_drvdata(pdev, clockman);
-+
-+	clockman->onecell.num = asize;
-+	hws = clockman->onecell.hws;
-+
-+	for (i = 0; i < asize; i++) {
-+		desc = &clk_desc_array[i];
-+		if (desc->clk_register && desc->data)
-+			hws[i] = desc->clk_register(clockman, desc->data);
-+	}
-+
-+	ret = of_clk_add_hw_provider(dev->of_node, of_clk_hw_onecell_get,
-+				     &clockman->onecell);
-+	if (ret)
-+		return ret;
-+
-+	return 0;
-+}
-+
-+static const struct of_device_id rp1_clk_of_match[] = {
-+	{ .compatible = "raspberrypi,rp1-clocks" },
-+	{}
-+};
-+MODULE_DEVICE_TABLE(of, rp1_clk_of_match);
-+
-+static struct platform_driver rp1_clk_driver = {
-+	.driver = {
-+		.name = "rp1-clk",
-+		.of_match_table = rp1_clk_of_match,
-+	},
-+	.probe = rp1_clk_probe,
-+};
-+
-+static int __init __rp1_clk_driver_init(void)
-+{
-+	return platform_driver_register(&rp1_clk_driver);
-+}
-+postcore_initcall(__rp1_clk_driver_init);
-+
-+MODULE_AUTHOR("Naushir Patuck <naush@raspberrypi.com>");
-+MODULE_DESCRIPTION("RP1 clock driver");
-+MODULE_LICENSE("GPL");
---- a/include/dt-bindings/clock/rp1.h
-+++ b/include/dt-bindings/clock/rp1.h
-@@ -13,39 +13,40 @@
- 
- #define RP1_PLL_SYS_PRI_PH		6
- #define RP1_PLL_SYS_SEC_PH		7
-+#define RP1_PLL_AUDIO_PRI_PH		8
- 
--#define RP1_PLL_SYS_SEC			8
--#define RP1_PLL_AUDIO_SEC		9
--#define RP1_PLL_VIDEO_SEC		10
-+#define RP1_PLL_SYS_SEC			9
-+#define RP1_PLL_AUDIO_SEC		10
-+#define RP1_PLL_VIDEO_SEC		11
- 
--#define RP1_CLK_SYS			11
--#define RP1_CLK_SLOW_SYS		12
--#define RP1_CLK_DMA			13
--#define RP1_CLK_UART			14
--#define RP1_CLK_ETH			15
--#define RP1_CLK_PWM0			16
--#define RP1_CLK_PWM1			17
--#define RP1_CLK_AUDIO_IN		18
--#define RP1_CLK_AUDIO_OUT		19
--#define RP1_CLK_I2S			20
--#define RP1_CLK_MIPI0_CFG		21
--#define RP1_CLK_MIPI1_CFG		22
--#define RP1_CLK_PCIE_AUX		23
--#define RP1_CLK_USBH0_MICROFRAME	24
--#define RP1_CLK_USBH1_MICROFRAME	25
--#define RP1_CLK_USBH0_SUSPEND		26
--#define RP1_CLK_USBH1_SUSPEND		27
--#define RP1_CLK_ETH_TSU			28
--#define RP1_CLK_ADC			29
--#define RP1_CLK_SDIO_TIMER		30
--#define RP1_CLK_SDIO_ALT_SRC		31
--#define RP1_CLK_GP0			32
--#define RP1_CLK_GP1			33
--#define RP1_CLK_GP2			34
--#define RP1_CLK_GP3			35
--#define RP1_CLK_GP4			36
--#define RP1_CLK_GP5			37
--#define RP1_CLK_VEC			38
--#define RP1_CLK_DPI			39
--#define RP1_CLK_MIPI0_DPI		40
--#define RP1_CLK_MIPI1_DPI		41
-+#define RP1_CLK_SYS			12
-+#define RP1_CLK_SLOW_SYS		13
-+#define RP1_CLK_DMA			14
-+#define RP1_CLK_UART			15
-+#define RP1_CLK_ETH			16
-+#define RP1_CLK_PWM0			17
-+#define RP1_CLK_PWM1			18
-+#define RP1_CLK_AUDIO_IN		19
-+#define RP1_CLK_AUDIO_OUT		20
-+#define RP1_CLK_I2S			21
-+#define RP1_CLK_MIPI0_CFG		22
-+#define RP1_CLK_MIPI1_CFG		23
-+#define RP1_CLK_PCIE_AUX		24
-+#define RP1_CLK_USBH0_MICROFRAME	25
-+#define RP1_CLK_USBH1_MICROFRAME	26
-+#define RP1_CLK_USBH0_SUSPEND		27
-+#define RP1_CLK_USBH1_SUSPEND		28
-+#define RP1_CLK_ETH_TSU			29
-+#define RP1_CLK_ADC			30
-+#define RP1_CLK_SDIO_TIMER		31
-+#define RP1_CLK_SDIO_ALT_SRC		32
-+#define RP1_CLK_GP0			33
-+#define RP1_CLK_GP1			34
-+#define RP1_CLK_GP2			35
-+#define RP1_CLK_GP3			36
-+#define RP1_CLK_GP4			37
-+#define RP1_CLK_GP5			38
-+#define RP1_CLK_VEC			39
-+#define RP1_CLK_DPI			40
-+#define RP1_CLK_MIPI0_DPI		41
-+#define RP1_CLK_MIPI1_DPI		42
diff --git a/target/linux/bcm27xx/patches-6.1/950-0875-dt-bindings-pinctrl-Add-bindings-for-Raspberry-Pi-RP.patch b/target/linux/bcm27xx/patches-6.1/950-0875-dt-bindings-pinctrl-Add-bindings-for-Raspberry-Pi-RP.patch
deleted file mode 100644
index d0180a65ba..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0875-dt-bindings-pinctrl-Add-bindings-for-Raspberry-Pi-RP.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 19b934ce3763c9465c5c80302f7c142d30b75869 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Fri, 28 Oct 2022 14:13:30 +0100
-Subject: [PATCH] dt-bindings: pinctrl: Add bindings for Raspberry Pi RP1
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- include/dt-bindings/pinctrl/rp1.h | 46 +++++++++++++++++++++++++++++++
- 1 file changed, 46 insertions(+)
- create mode 100644 include/dt-bindings/pinctrl/rp1.h
-
---- /dev/null
-+++ b/include/dt-bindings/pinctrl/rp1.h
-@@ -0,0 +1,46 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * Header providing constants for RP1 pinctrl bindings.
-+ *
-+ * Copyright (C) 2019-2022 Raspberry Pi Ltd.
-+ */
-+
-+#ifndef __DT_BINDINGS_PINCTRL_RP1_H__
-+#define __DT_BINDINGS_PINCTRL_RP1_H__
-+
-+/* brcm,function property */
-+#define RP1_FSEL_GPIO_IN	0
-+#define RP1_FSEL_GPIO_OUT	1
-+#define RP1_FSEL_ALT0_LEGACY	4
-+#define RP1_FSEL_ALT1_LEGACY	5
-+#define RP1_FSEL_ALT2_LEGACY	6
-+#define RP1_FSEL_ALT3_LEGACY	7
-+#define RP1_FSEL_ALT4_LEGACY	3
-+#define RP1_FSEL_ALT5_LEGACY	2
-+#define RP1_FSEL_ALT0		0x08
-+#define RP1_FSEL_ALT0INV	0x09
-+#define RP1_FSEL_ALT1		0x0a
-+#define RP1_FSEL_ALT1INV	0x0b
-+#define RP1_FSEL_ALT2		0x0c
-+#define RP1_FSEL_ALT2INV	0x0d
-+#define RP1_FSEL_ALT3		0x0e
-+#define RP1_FSEL_ALT3INV	0x0f
-+#define RP1_FSEL_ALT4		0x10
-+#define RP1_FSEL_ALT4INV	0x11
-+#define RP1_FSEL_ALT5		0x12
-+#define RP1_FSEL_ALT5INV	0x13
-+#define RP1_FSEL_ALT6		0x14
-+#define RP1_FSEL_ALT6INV	0x15
-+#define RP1_FSEL_ALT7		0x16
-+#define RP1_FSEL_ALT7INV	0x17
-+#define RP1_FSEL_ALT8		0x18
-+#define RP1_FSEL_ALT8INV	0x19
-+#define RP1_FSEL_NONE		0x1a
-+
-+/* brcm,pull property */
-+#define RP1_PUD_OFF		0
-+#define RP1_PUD_DOWN		1
-+#define RP1_PUD_UP		2
-+#define RP1_PUD_KEEP		3
-+
-+#endif /* __DT_BINDINGS_PINCTRL_RP1_H__ */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0876-pinctrl-Add-rp1-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0876-pinctrl-Add-rp1-driver.patch
deleted file mode 100644
index c824cddb51..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0876-pinctrl-Add-rp1-driver.patch
+++ /dev/null
@@ -1,1666 +0,0 @@
-From 4d4cc5be473a7767052122a87393a83d10f9ed41 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 10 Oct 2022 14:21:11 +0100
-Subject: [PATCH] pinctrl: Add rp1 driver
-
-RP1 exposes GPIOs. Add a pinctrl driver to allow control of those.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/pinctrl/Kconfig           |    7 +
- drivers/pinctrl/Makefile          |    1 +
- drivers/pinctrl/pinctrl-rp1.c     | 1571 +++++++++++++++++++++++++++++
- include/dt-bindings/pinctrl/rp1.h |   46 -
- 4 files changed, 1579 insertions(+), 46 deletions(-)
- create mode 100644 drivers/pinctrl/pinctrl-rp1.c
- delete mode 100644 include/dt-bindings/pinctrl/rp1.h
-
---- a/drivers/pinctrl/Kconfig
-+++ b/drivers/pinctrl/Kconfig
-@@ -512,6 +512,13 @@ config PINCTRL_ZYNQMP
- 	  This driver can also be built as a module. If so, the module
- 	  will be called pinctrl-zynqmp.
- 
-+config PINCTRL_RP1
-+	bool "Pinctrl driver for RP1"
-+	select PINMUX
-+	select PINCONF
-+	select GENERIC_PINCONF
-+	select GPIOLIB_IRQCHIP
-+
- source "drivers/pinctrl/actions/Kconfig"
- source "drivers/pinctrl/aspeed/Kconfig"
- source "drivers/pinctrl/bcm/Kconfig"
---- a/drivers/pinctrl/Makefile
-+++ b/drivers/pinctrl/Makefile
-@@ -42,6 +42,7 @@ obj-$(CONFIG_PINCTRL_PIC32)	+= pinctrl-p
- obj-$(CONFIG_PINCTRL_PISTACHIO)	+= pinctrl-pistachio.o
- obj-$(CONFIG_PINCTRL_RK805)	+= pinctrl-rk805.o
- obj-$(CONFIG_PINCTRL_ROCKCHIP)	+= pinctrl-rockchip.o
-+obj-$(CONFIG_PINCTRL_RP1)	+= pinctrl-rp1.o
- obj-$(CONFIG_PINCTRL_SINGLE)	+= pinctrl-single.o
- obj-$(CONFIG_PINCTRL_ST) 	+= pinctrl-st.o
- obj-$(CONFIG_PINCTRL_STMFX) 	+= pinctrl-stmfx.o
---- /dev/null
-+++ b/drivers/pinctrl/pinctrl-rp1.c
-@@ -0,0 +1,1571 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Driver for Raspberry Pi RP1 GPIO unit (pinctrl + GPIO)
-+ *
-+ * Copyright (C) 2023 Raspberry Pi Ltd.
-+ *
-+ * This driver is inspired by:
-+ * pinctrl-bcm2835.c, please see original file for copyright information
-+ */
-+
-+#include <linux/bitmap.h>
-+#include <linux/bitops.h>
-+#include <linux/bug.h>
-+#include <linux/delay.h>
-+#include <linux/device.h>
-+#include <linux/err.h>
-+#include <linux/gpio/driver.h>
-+#include <linux/io.h>
-+#include <linux/irq.h>
-+#include <linux/irqdesc.h>
-+#include <linux/init.h>
-+#include <linux/of_address.h>
-+#include <linux/of.h>
-+#include <linux/of_irq.h>
-+#include <linux/pinctrl/consumer.h>
-+#include <linux/pinctrl/machine.h>
-+#include <linux/pinctrl/pinconf.h>
-+#include <linux/pinctrl/pinctrl.h>
-+#include <linux/pinctrl/pinmux.h>
-+#include <linux/pinctrl/pinconf-generic.h>
-+#include <linux/platform_device.h>
-+#include <linux/seq_file.h>
-+#include <linux/spinlock.h>
-+#include <linux/types.h>
-+#include "core.h"
-+#include "pinconf.h"
-+#include "pinctrl-utils.h"
-+
-+#define MODULE_NAME "pinctrl-rp1"
-+#define RP1_NUM_GPIOS	54
-+#define RP1_NUM_BANKS	3
-+
-+#define RP1_RW_OFFSET			0x0000
-+#define RP1_XOR_OFFSET			0x1000
-+#define RP1_SET_OFFSET			0x2000
-+#define RP1_CLR_OFFSET			0x3000
-+
-+#define RP1_GPIO_STATUS			0x0000
-+#define RP1_GPIO_CTRL			0x0004
-+
-+#define RP1_GPIO_PCIE_INTE		0x011c
-+#define RP1_GPIO_PCIE_INTS		0x0124
-+
-+#define RP1_GPIO_EVENTS_SHIFT_RAW	20
-+#define RP1_GPIO_STATUS_FALLING		BIT(20)
-+#define RP1_GPIO_STATUS_RISING		BIT(21)
-+#define RP1_GPIO_STATUS_LOW		BIT(22)
-+#define RP1_GPIO_STATUS_HIGH		BIT(23)
-+
-+#define RP1_GPIO_EVENTS_SHIFT_FILTERED	24
-+#define RP1_GPIO_STATUS_F_FALLING	BIT(24)
-+#define RP1_GPIO_STATUS_F_RISING	BIT(25)
-+#define RP1_GPIO_STATUS_F_LOW		BIT(26)
-+#define RP1_GPIO_STATUS_F_HIGH		BIT(27)
-+
-+#define RP1_GPIO_CTRL_FUNCSEL_LSB	0
-+#define RP1_GPIO_CTRL_FUNCSEL_MASK	0x0000001f
-+#define RP1_GPIO_CTRL_OUTOVER_LSB	12
-+#define RP1_GPIO_CTRL_OUTOVER_MASK	0x00003000
-+#define RP1_GPIO_CTRL_OEOVER_LSB	14
-+#define RP1_GPIO_CTRL_OEOVER_MASK	0x0000c000
-+#define RP1_GPIO_CTRL_INOVER_LSB	16
-+#define RP1_GPIO_CTRL_INOVER_MASK	0x00030000
-+#define RP1_GPIO_CTRL_IRQEN_FALLING	BIT(20)
-+#define RP1_GPIO_CTRL_IRQEN_RISING	BIT(21)
-+#define RP1_GPIO_CTRL_IRQEN_LOW		BIT(22)
-+#define RP1_GPIO_CTRL_IRQEN_HIGH	BIT(23)
-+#define RP1_GPIO_CTRL_IRQEN_F_FALLING	BIT(24)
-+#define RP1_GPIO_CTRL_IRQEN_F_RISING	BIT(25)
-+#define RP1_GPIO_CTRL_IRQEN_F_LOW	BIT(26)
-+#define RP1_GPIO_CTRL_IRQEN_F_HIGH	BIT(27)
-+#define RP1_GPIO_CTRL_IRQRESET		BIT(28)
-+#define RP1_GPIO_CTRL_IRQOVER_LSB	30
-+#define RP1_GPIO_CTRL_IRQOVER_MASK	0xc0000000
-+
-+#define RP1_INT_EDGE_FALLING		BIT(0)
-+#define RP1_INT_EDGE_RISING		BIT(1)
-+#define RP1_INT_LEVEL_LOW		BIT(2)
-+#define RP1_INT_LEVEL_HIGH		BIT(3)
-+#define RP1_INT_MASK			0xf
-+
-+#define RP1_INT_EDGE_BOTH		(RP1_INT_EDGE_FALLING |	\
-+					 RP1_INT_EDGE_RISING)
-+#define RP1_PUD_OFF			0
-+#define RP1_PUD_DOWN			1
-+#define RP1_PUD_UP			2
-+
-+#define RP1_FSEL_COUNT			9
-+
-+#define RP1_FSEL_ALT0			0x00
-+#define RP1_FSEL_GPIO			0x05
-+#define RP1_FSEL_NONE			0x09
-+#define RP1_FSEL_NONE_HW		0x1f
-+
-+#define RP1_DIR_OUTPUT			0
-+#define RP1_DIR_INPUT			1
-+
-+#define RP1_OUTOVER_PERI		0
-+#define RP1_OUTOVER_INVPERI		1
-+#define RP1_OUTOVER_LOW			2
-+#define RP1_OUTOVER_HIGH		3
-+
-+#define RP1_OEOVER_PERI			0
-+#define RP1_OEOVER_INVPERI		1
-+#define RP1_OEOVER_DISABLE		2
-+#define RP1_OEOVER_ENABLE		3
-+
-+#define RP1_INOVER_PERI			0
-+#define RP1_INOVER_INVPERI		1
-+#define RP1_INOVER_LOW			2
-+#define RP1_INOVER_HIGH			3
-+
-+#define RP1_RIO_OUT			0x00
-+#define RP1_RIO_OE			0x04
-+#define RP1_RIO_IN			0x08
-+
-+#define RP1_PAD_SLEWFAST_MASK		0x00000001
-+#define RP1_PAD_SLEWFAST_LSB		0
-+#define RP1_PAD_SCHMITT_MASK		0x00000002
-+#define RP1_PAD_SCHMITT_LSB		1
-+#define RP1_PAD_PULL_MASK		0x0000000c
-+#define RP1_PAD_PULL_LSB		2
-+#define RP1_PAD_DRIVE_MASK		0x00000030
-+#define RP1_PAD_DRIVE_LSB		4
-+#define RP1_PAD_IN_ENABLE_MASK		0x00000040
-+#define RP1_PAD_IN_ENABLE_LSB		6
-+#define RP1_PAD_OUT_DISABLE_MASK	0x00000080
-+#define RP1_PAD_OUT_DISABLE_LSB		7
-+
-+#define RP1_PAD_DRIVE_2MA		0x00000000
-+#define RP1_PAD_DRIVE_4MA		0x00000010
-+#define RP1_PAD_DRIVE_8MA		0x00000020
-+#define RP1_PAD_DRIVE_12MA		0x00000030
-+
-+#define FLD_GET(r, f) (((r) & (f ## _MASK)) >> (f ## _LSB))
-+#define FLD_SET(r, f, v) r = (((r) & ~(f ## _MASK)) | ((v) << (f ## _LSB)))
-+
-+#define FUNC(f) \
-+	[func_##f] = #f
-+#define RP1_MAX_FSEL 8
-+#define PIN(i, f0, f1, f2, f3, f4, f5, f6, f7, f8) \
-+	[i] = { \
-+		.funcs = { \
-+			func_##f0, \
-+			func_##f1, \
-+			func_##f2, \
-+			func_##f3, \
-+			func_##f4, \
-+			func_##f5, \
-+			func_##f6, \
-+			func_##f7, \
-+			func_##f8, \
-+		}, \
-+	}
-+
-+#define LEGACY_MAP(n, f0, f1, f2, f3, f4, f5) \
-+	[n] = { \
-+		func_gpio, \
-+		func_gpio, \
-+		func_##f5, \
-+		func_##f4, \
-+		func_##f0, \
-+		func_##f1, \
-+		func_##f2, \
-+		func_##f3, \
-+	}
-+
-+struct rp1_iobank_desc {
-+	int min_gpio;
-+	int num_gpios;
-+	int gpio_offset;
-+	int inte_offset;
-+	int ints_offset;
-+	int rio_offset;
-+	int pads_offset;
-+};
-+
-+struct rp1_pin_info {
-+	u8 num;
-+	u8 bank;
-+	u8 offset;
-+	u8 fsel;
-+	u8 irq_type;
-+
-+	void __iomem *gpio;
-+	void __iomem *rio;
-+	void __iomem *inte;
-+	void __iomem *ints;
-+	void __iomem *pad;
-+};
-+
-+enum funcs {
-+	func_alt0,
-+	func_alt1,
-+	func_alt2,
-+	func_alt3,
-+	func_alt4,
-+	func_gpio,
-+	func_alt6,
-+	func_alt7,
-+	func_alt8,
-+	func_none,
-+	func_aaud,
-+	func_dcd0,
-+	func_dpi,
-+	func_dsi0_te_ext,
-+	func_dsi1_te_ext,
-+	func_dsr0,
-+	func_dtr0,
-+	func_gpclk0,
-+	func_gpclk1,
-+	func_gpclk2,
-+	func_gpclk3,
-+	func_gpclk4,
-+	func_gpclk5,
-+	func_i2c0,
-+	func_i2c1,
-+	func_i2c2,
-+	func_i2c3,
-+	func_i2c4,
-+	func_i2c5,
-+	func_i2c6,
-+	func_i2s0,
-+	func_i2s1,
-+	func_i2s2,
-+	func_ir,
-+	func_mic,
-+	func_pcie_clkreq_n,
-+	func_pio,
-+	func_proc_rio,
-+	func_pwm0,
-+	func_pwm1,
-+	func_ri0,
-+	func_sd0,
-+	func_sd1,
-+	func_spi0,
-+	func_spi1,
-+	func_spi2,
-+	func_spi3,
-+	func_spi4,
-+	func_spi5,
-+	func_spi6,
-+	func_spi7,
-+	func_spi8,
-+	func_uart0,
-+	func_uart1,
-+	func_uart2,
-+	func_uart3,
-+	func_uart4,
-+	func_uart5,
-+	func_vbus0,
-+	func_vbus1,
-+	func_vbus2,
-+	func_vbus3,
-+	func__,
-+	func_count = func__,
-+	func_invalid = func__,
-+};
-+
-+struct rp1_pin_funcs {
-+	u8 funcs[RP1_FSEL_COUNT];
-+};
-+
-+struct rp1_pinctrl {
-+	struct device *dev;
-+	void __iomem *gpio_base;
-+	void __iomem *rio_base;
-+	void __iomem *pads_base;
-+	int irq[RP1_NUM_BANKS];
-+	struct rp1_pin_info pins[RP1_NUM_GPIOS];
-+
-+	struct pinctrl_dev *pctl_dev;
-+	struct gpio_chip gpio_chip;
-+	struct pinctrl_gpio_range gpio_range;
-+
-+	raw_spinlock_t irq_lock[RP1_NUM_BANKS];
-+};
-+
-+const struct rp1_iobank_desc rp1_iobanks[RP1_NUM_BANKS] = {
-+	/*         gpio   inte    ints     rio    pads */
-+	{  0, 28, 0x0000, 0x011c, 0x0124, 0x0000, 0x0004 },
-+	{ 28,  6, 0x4000, 0x411c, 0x4124, 0x4000, 0x4004 },
-+	{ 34, 20, 0x8000, 0x811c, 0x8124, 0x8000, 0x8004 },
-+};
-+
-+/* pins are just named GPIO0..GPIO53 */
-+#define RP1_GPIO_PIN(a) PINCTRL_PIN(a, "gpio" #a)
-+static struct pinctrl_pin_desc rp1_gpio_pins[] = {
-+	RP1_GPIO_PIN(0),
-+	RP1_GPIO_PIN(1),
-+	RP1_GPIO_PIN(2),
-+	RP1_GPIO_PIN(3),
-+	RP1_GPIO_PIN(4),
-+	RP1_GPIO_PIN(5),
-+	RP1_GPIO_PIN(6),
-+	RP1_GPIO_PIN(7),
-+	RP1_GPIO_PIN(8),
-+	RP1_GPIO_PIN(9),
-+	RP1_GPIO_PIN(10),
-+	RP1_GPIO_PIN(11),
-+	RP1_GPIO_PIN(12),
-+	RP1_GPIO_PIN(13),
-+	RP1_GPIO_PIN(14),
-+	RP1_GPIO_PIN(15),
-+	RP1_GPIO_PIN(16),
-+	RP1_GPIO_PIN(17),
-+	RP1_GPIO_PIN(18),
-+	RP1_GPIO_PIN(19),
-+	RP1_GPIO_PIN(20),
-+	RP1_GPIO_PIN(21),
-+	RP1_GPIO_PIN(22),
-+	RP1_GPIO_PIN(23),
-+	RP1_GPIO_PIN(24),
-+	RP1_GPIO_PIN(25),
-+	RP1_GPIO_PIN(26),
-+	RP1_GPIO_PIN(27),
-+	RP1_GPIO_PIN(28),
-+	RP1_GPIO_PIN(29),
-+	RP1_GPIO_PIN(30),
-+	RP1_GPIO_PIN(31),
-+	RP1_GPIO_PIN(32),
-+	RP1_GPIO_PIN(33),
-+	RP1_GPIO_PIN(34),
-+	RP1_GPIO_PIN(35),
-+	RP1_GPIO_PIN(36),
-+	RP1_GPIO_PIN(37),
-+	RP1_GPIO_PIN(38),
-+	RP1_GPIO_PIN(39),
-+	RP1_GPIO_PIN(40),
-+	RP1_GPIO_PIN(41),
-+	RP1_GPIO_PIN(42),
-+	RP1_GPIO_PIN(43),
-+	RP1_GPIO_PIN(44),
-+	RP1_GPIO_PIN(45),
-+	RP1_GPIO_PIN(46),
-+	RP1_GPIO_PIN(47),
-+	RP1_GPIO_PIN(48),
-+	RP1_GPIO_PIN(49),
-+	RP1_GPIO_PIN(50),
-+	RP1_GPIO_PIN(51),
-+	RP1_GPIO_PIN(52),
-+	RP1_GPIO_PIN(53),
-+};
-+
-+/* one pin per group */
-+static const char * const rp1_gpio_groups[] = {
-+	"gpio0",
-+	"gpio1",
-+	"gpio2",
-+	"gpio3",
-+	"gpio4",
-+	"gpio5",
-+	"gpio6",
-+	"gpio7",
-+	"gpio8",
-+	"gpio9",
-+	"gpio10",
-+	"gpio11",
-+	"gpio12",
-+	"gpio13",
-+	"gpio14",
-+	"gpio15",
-+	"gpio16",
-+	"gpio17",
-+	"gpio18",
-+	"gpio19",
-+	"gpio20",
-+	"gpio21",
-+	"gpio22",
-+	"gpio23",
-+	"gpio24",
-+	"gpio25",
-+	"gpio26",
-+	"gpio27",
-+	"gpio28",
-+	"gpio29",
-+	"gpio30",
-+	"gpio31",
-+	"gpio32",
-+	"gpio33",
-+	"gpio34",
-+	"gpio35",
-+	"gpio36",
-+	"gpio37",
-+	"gpio38",
-+	"gpio39",
-+	"gpio40",
-+	"gpio41",
-+	"gpio42",
-+	"gpio43",
-+	"gpio44",
-+	"gpio45",
-+	"gpio46",
-+	"gpio47",
-+	"gpio48",
-+	"gpio49",
-+	"gpio50",
-+	"gpio51",
-+	"gpio52",
-+	"gpio53",
-+};
-+
-+static const char * const rp1_func_names[] = {
-+	FUNC(alt0),
-+	FUNC(alt1),
-+	FUNC(alt2),
-+	FUNC(alt3),
-+	FUNC(alt4),
-+	FUNC(gpio),
-+	FUNC(alt6),
-+	FUNC(alt7),
-+	FUNC(alt8),
-+	FUNC(none),
-+	FUNC(aaud),
-+	FUNC(dcd0),
-+	FUNC(dpi),
-+	FUNC(dsi0_te_ext),
-+	FUNC(dsi1_te_ext),
-+	FUNC(dsr0),
-+	FUNC(dtr0),
-+	FUNC(gpclk0),
-+	FUNC(gpclk1),
-+	FUNC(gpclk2),
-+	FUNC(gpclk3),
-+	FUNC(gpclk4),
-+	FUNC(gpclk5),
-+	FUNC(i2c0),
-+	FUNC(i2c1),
-+	FUNC(i2c2),
-+	FUNC(i2c3),
-+	FUNC(i2c4),
-+	FUNC(i2c5),
-+	FUNC(i2c6),
-+	FUNC(i2s0),
-+	FUNC(i2s1),
-+	FUNC(i2s2),
-+	FUNC(ir),
-+	FUNC(mic),
-+	FUNC(pcie_clkreq_n),
-+	FUNC(pio),
-+	FUNC(proc_rio),
-+	FUNC(pwm0),
-+	FUNC(pwm1),
-+	FUNC(ri0),
-+	FUNC(sd0),
-+	FUNC(sd1),
-+	FUNC(spi0),
-+	FUNC(spi1),
-+	FUNC(spi2),
-+	FUNC(spi3),
-+	FUNC(spi4),
-+	FUNC(spi5),
-+	FUNC(spi6),
-+	FUNC(spi7),
-+	FUNC(spi8),
-+	FUNC(uart0),
-+	FUNC(uart1),
-+	FUNC(uart2),
-+	FUNC(uart3),
-+	FUNC(uart4),
-+	FUNC(uart5),
-+	FUNC(vbus0),
-+	FUNC(vbus1),
-+	FUNC(vbus2),
-+	FUNC(vbus3),
-+	[func_invalid] = "?"
-+};
-+
-+static const struct rp1_pin_funcs rp1_gpio_pin_funcs[] = {
-+	PIN(0, spi0, dpi, uart1, i2c0, _, gpio, proc_rio, pio, spi2),
-+	PIN(1, spi0, dpi, uart1, i2c0, _, gpio, proc_rio, pio, spi2),
-+	PIN(2, spi0, dpi, uart1, i2c1, ir, gpio, proc_rio, pio, spi2),
-+	PIN(3, spi0, dpi, uart1, i2c1, ir, gpio, proc_rio, pio, spi2),
-+	PIN(4, gpclk0, dpi, uart2, i2c2, ri0, gpio, proc_rio, pio, spi3),
-+	PIN(5, gpclk1, dpi, uart2, i2c2, dtr0, gpio, proc_rio, pio, spi3),
-+	PIN(6, gpclk2, dpi, uart2, i2c3, dcd0, gpio, proc_rio, pio, spi3),
-+	PIN(7, spi0, dpi, uart2, i2c3, dsr0, gpio, proc_rio, pio, spi3),
-+	PIN(8, spi0, dpi, uart3, i2c0, _, gpio, proc_rio, pio, spi4),
-+	PIN(9, spi0, dpi, uart3, i2c0, _, gpio, proc_rio, pio, spi4),
-+	PIN(10, spi0, dpi, uart3, i2c1, _, gpio, proc_rio, pio, spi4),
-+	PIN(11, spi0, dpi, uart3, i2c1, _, gpio, proc_rio, pio, spi4),
-+	PIN(12, pwm0, dpi, uart4, i2c2, aaud, gpio, proc_rio, pio, spi5),
-+	PIN(13, pwm0, dpi, uart4, i2c2, aaud, gpio, proc_rio, pio, spi5),
-+	PIN(14, pwm0, dpi, uart4, i2c3, uart0, gpio, proc_rio, pio, spi5),
-+	PIN(15, pwm0, dpi, uart4, i2c3, uart0, gpio, proc_rio, pio, spi5),
-+	PIN(16, spi1, dpi, dsi0_te_ext, _, uart0, gpio, proc_rio, pio, _),
-+	PIN(17, spi1, dpi, dsi1_te_ext, _, uart0, gpio, proc_rio, pio, _),
-+	PIN(18, spi1, dpi, i2s0, pwm0, i2s1, gpio, proc_rio, pio, gpclk1),
-+	PIN(19, spi1, dpi, i2s0, pwm0, i2s1, gpio, proc_rio, pio, _),
-+	PIN(20, spi1, dpi, i2s0, gpclk0, i2s1, gpio, proc_rio, pio, _),
-+	PIN(21, spi1, dpi, i2s0, gpclk1, i2s1, gpio, proc_rio, pio, _),
-+	PIN(22, sd0, dpi, i2s0, i2c3, i2s1, gpio, proc_rio, pio, _),
-+	PIN(23, sd0, dpi, i2s0, i2c3, i2s1, gpio, proc_rio, pio, _),
-+	PIN(24, sd0, dpi, i2s0, _, i2s1, gpio, proc_rio, pio, spi2),
-+	PIN(25, sd0, dpi, i2s0, mic, i2s1, gpio, proc_rio, pio, spi3),
-+	PIN(26, sd0, dpi, i2s0, mic, i2s1, gpio, proc_rio, pio, spi5),
-+	PIN(27, sd0, dpi, i2s0, mic, i2s1, gpio, proc_rio, pio, spi1),
-+	PIN(28, sd1, i2c4, i2s2, spi6, vbus0, gpio, proc_rio, _, _),
-+	PIN(29, sd1, i2c4, i2s2, spi6, vbus0, gpio, proc_rio, _, _),
-+	PIN(30, sd1, i2c5, i2s2, spi6, uart5, gpio, proc_rio, _, _),
-+	PIN(31, sd1, i2c5, i2s2, spi6, uart5, gpio, proc_rio, _, _),
-+	PIN(32, sd1, gpclk3, i2s2, spi6, uart5, gpio, proc_rio, _, _),
-+	PIN(33, sd1, gpclk4, i2s2, spi6, uart5, gpio, proc_rio, _, _),
-+	PIN(34, pwm1, gpclk3, vbus0, i2c4, mic, gpio, proc_rio, _, _),
-+	PIN(35, spi8, pwm1, vbus0, i2c4, mic, gpio, proc_rio, _, _),
-+	PIN(36, spi8, uart5, pcie_clkreq_n, i2c5, mic, gpio, proc_rio, _, _),
-+	PIN(37, spi8, uart5, mic, i2c5, pcie_clkreq_n, gpio, proc_rio, _, _),
-+	PIN(38, spi8, uart5, mic, i2c6, aaud, gpio, proc_rio, dsi0_te_ext, _),
-+	PIN(39, spi8, uart5, mic, i2c6, aaud, gpio, proc_rio, dsi1_te_ext, _),
-+	PIN(40, pwm1, uart5, i2c4, spi6, aaud, gpio, proc_rio, _, _),
-+	PIN(41, pwm1, uart5, i2c4, spi6, aaud, gpio, proc_rio, _, _),
-+	PIN(42, gpclk5, uart5, vbus1, spi6, i2s2, gpio, proc_rio, _, _),
-+	PIN(43, gpclk4, uart5, vbus1, spi6, i2s2, gpio, proc_rio, _, _),
-+	PIN(44, gpclk5, i2c5, pwm1, spi6, i2s2, gpio, proc_rio, _, _),
-+	PIN(45, pwm1, i2c5, spi7, spi6, i2s2, gpio, proc_rio, _, _),
-+	PIN(46, gpclk3, i2c4, spi7, mic, i2s2, gpio, proc_rio, dsi0_te_ext, _),
-+	PIN(47, gpclk5, i2c4, spi7, mic, i2s2, gpio, proc_rio, dsi1_te_ext, _),
-+	PIN(48, pwm1, pcie_clkreq_n, spi7, mic, uart5, gpio, proc_rio, _, _),
-+	PIN(49, spi8, spi7, i2c5, aaud, uart5, gpio, proc_rio, _, _),
-+	PIN(50, spi8, spi7, i2c5, aaud, vbus2, gpio, proc_rio, _, _),
-+	PIN(51, spi8, spi7, i2c6, aaud, vbus2, gpio, proc_rio, _, _),
-+	PIN(52, spi8, _, i2c6, aaud, vbus3, gpio, proc_rio, _, _),
-+	PIN(53, spi8, spi7, _, pcie_clkreq_n, vbus3, gpio, proc_rio, _, _),
-+};
-+
-+static const u8 legacy_fsel_map[][8] = {
-+	LEGACY_MAP(0, i2c0, _, dpi, spi2, uart1, _),
-+	LEGACY_MAP(1, i2c0, _, dpi, spi2, uart1, _),
-+	LEGACY_MAP(2, i2c1, _, dpi, spi2, uart1, _),
-+	LEGACY_MAP(3, i2c1, _, dpi, spi2, uart1, _),
-+	LEGACY_MAP(4, gpclk0, _, dpi, spi3, uart2, i2c2),
-+	LEGACY_MAP(5, gpclk1, _, dpi, spi3, uart2, i2c2),
-+	LEGACY_MAP(6, gpclk2, _, dpi, spi3, uart2, i2c3),
-+	LEGACY_MAP(7, spi0, _, dpi, spi3, uart2, i2c3),
-+	LEGACY_MAP(8, spi0, _, dpi, _, uart3, i2c0),
-+	LEGACY_MAP(9, spi0, _, dpi, _, uart3, i2c0),
-+	LEGACY_MAP(10, spi0, _, dpi, _, uart3, i2c1),
-+	LEGACY_MAP(11, spi0, _, dpi, _, uart3, i2c1),
-+	LEGACY_MAP(12, pwm0, _, dpi, spi5, uart4, i2c2),
-+	LEGACY_MAP(13, pwm0, _, dpi, spi5, uart4, i2c2),
-+	LEGACY_MAP(14, uart0, _, dpi, spi5, uart4, _),
-+	LEGACY_MAP(15, uart0, _, dpi, spi5, uart4, _),
-+	LEGACY_MAP(16, _, _, dpi, uart0, spi1, _),
-+	LEGACY_MAP(17, _, _, dpi, uart0, spi1, _),
-+	LEGACY_MAP(18, i2s0, _, dpi, _, spi1, pwm0),
-+	LEGACY_MAP(19, i2s0, _, dpi, _, spi1, pwm0),
-+	LEGACY_MAP(20, i2s0, _, dpi, _, spi1, gpclk0),
-+	LEGACY_MAP(21, i2s0, _, dpi, _, spi1, gpclk1),
-+	LEGACY_MAP(22, sd0, _, dpi, _, _, i2c3),
-+	LEGACY_MAP(23, sd0, _, dpi, _, _, i2c3),
-+	LEGACY_MAP(24, sd0, _, dpi, _, _, spi2),
-+	LEGACY_MAP(25, sd0, _, dpi, _, _, spi3),
-+	LEGACY_MAP(26, sd0, _, dpi, _, _, spi5),
-+	LEGACY_MAP(27, sd0, _, dpi, _, _, _),
-+};
-+
-+static const char * const irq_type_names[] = {
-+	[IRQ_TYPE_NONE] = "none",
-+	[IRQ_TYPE_EDGE_RISING] = "edge-rising",
-+	[IRQ_TYPE_EDGE_FALLING] = "edge-falling",
-+	[IRQ_TYPE_EDGE_BOTH] = "edge-both",
-+	[IRQ_TYPE_LEVEL_HIGH] = "level-high",
-+	[IRQ_TYPE_LEVEL_LOW] = "level-low",
-+};
-+
-+static int rp1_pinconf_set(struct pinctrl_dev *pctldev,
-+			   unsigned int offset, unsigned long *configs,
-+			   unsigned int num_configs);
-+
-+static struct rp1_pin_info *rp1_get_pin(struct gpio_chip *chip,
-+					unsigned int offset)
-+{
-+	struct rp1_pinctrl *pc = gpiochip_get_data(chip);
-+
-+	if (pc && offset < RP1_NUM_GPIOS)
-+		return &pc->pins[offset];
-+	return NULL;
-+}
-+
-+static struct rp1_pin_info *rp1_get_pin_pctl(struct pinctrl_dev *pctldev,
-+					     unsigned int offset)
-+{
-+	struct rp1_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
-+
-+	if (pc && offset < RP1_NUM_GPIOS)
-+		return &pc->pins[offset];
-+	return NULL;
-+}
-+
-+static void rp1_pad_update(struct rp1_pin_info *pin, u32 clr, u32 set)
-+{
-+	u32 padctrl = readl(pin->pad);
-+
-+	padctrl &= ~clr;
-+	padctrl |= set;
-+
-+	writel(padctrl, pin->pad);
-+}
-+
-+static void rp1_input_enable(struct rp1_pin_info *pin, int value)
-+{
-+	rp1_pad_update(pin, RP1_PAD_IN_ENABLE_MASK,
-+		       value ? RP1_PAD_IN_ENABLE_MASK : 0);
-+}
-+
-+static void rp1_output_enable(struct rp1_pin_info *pin, int value)
-+{
-+	rp1_pad_update(pin, RP1_PAD_OUT_DISABLE_MASK,
-+		       value ? 0 : RP1_PAD_OUT_DISABLE_MASK);
-+}
-+
-+static u32 rp1_get_fsel(struct rp1_pin_info *pin)
-+{
-+	u32 ctrl = readl(pin->gpio + RP1_GPIO_CTRL);
-+	u32 oeover = FLD_GET(ctrl, RP1_GPIO_CTRL_OEOVER);
-+	u32 fsel = FLD_GET(ctrl, RP1_GPIO_CTRL_FUNCSEL);
-+
-+	if (oeover != RP1_OEOVER_PERI || fsel >= RP1_FSEL_COUNT)
-+		fsel = RP1_FSEL_NONE;
-+
-+	return fsel;
-+}
-+
-+static void rp1_set_fsel(struct rp1_pin_info *pin, u32 fsel)
-+{
-+	u32 ctrl = readl(pin->gpio + RP1_GPIO_CTRL);
-+
-+	if (fsel >= RP1_FSEL_COUNT)
-+		fsel = RP1_FSEL_NONE_HW;
-+
-+	rp1_input_enable(pin, 1);
-+	rp1_output_enable(pin, 1);
-+
-+	if (fsel == RP1_FSEL_NONE) {
-+		FLD_SET(ctrl, RP1_GPIO_CTRL_OEOVER, RP1_OEOVER_DISABLE);
-+	} else {
-+		FLD_SET(ctrl, RP1_GPIO_CTRL_OUTOVER, RP1_OUTOVER_PERI);
-+		FLD_SET(ctrl, RP1_GPIO_CTRL_OEOVER, RP1_OEOVER_PERI);
-+	}
-+	FLD_SET(ctrl, RP1_GPIO_CTRL_FUNCSEL, fsel);
-+	writel(ctrl, pin->gpio + RP1_GPIO_CTRL);
-+}
-+
-+static int rp1_get_dir(struct rp1_pin_info *pin)
-+{
-+	return !(readl(pin->rio + RP1_RIO_OE) & (1 << pin->offset)) ?
-+		RP1_DIR_INPUT : RP1_DIR_OUTPUT;
-+}
-+
-+static void rp1_set_dir(struct rp1_pin_info *pin, bool is_input)
-+{
-+	int offset = is_input ? RP1_CLR_OFFSET : RP1_SET_OFFSET;
-+
-+	writel(1 << pin->offset, pin->rio + RP1_RIO_OE + offset);
-+}
-+
-+static int rp1_get_value(struct rp1_pin_info *pin)
-+{
-+	return !!(readl(pin->rio + RP1_RIO_IN) & (1 << pin->offset));
-+}
-+
-+static void rp1_set_value(struct rp1_pin_info *pin, int value)
-+{
-+	/* Assume the pin is already an output */
-+	writel(1 << pin->offset,
-+	       pin->rio + RP1_RIO_OUT + (value ? RP1_SET_OFFSET : RP1_CLR_OFFSET));
-+}
-+
-+static int rp1_gpio_get(struct gpio_chip *chip, unsigned offset)
-+{
-+	struct rp1_pin_info *pin = rp1_get_pin(chip, offset);
-+	int ret;
-+
-+	if (!pin)
-+		return -EINVAL;
-+	ret = rp1_get_value(pin);
-+	return ret;
-+}
-+
-+static void rp1_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
-+{
-+	struct rp1_pin_info *pin = rp1_get_pin(chip, offset);
-+
-+	if (pin)
-+		rp1_set_value(pin, value);
-+}
-+
-+static int rp1_gpio_get_direction(struct gpio_chip *chip, unsigned int offset)
-+{
-+	struct rp1_pin_info *pin = rp1_get_pin(chip, offset);
-+	u32 fsel;
-+
-+	if (!pin)
-+		return -EINVAL;
-+	fsel = rp1_get_fsel(pin);
-+	if (fsel != RP1_FSEL_GPIO)
-+		return -EINVAL;
-+	return (rp1_get_dir(pin) == RP1_DIR_OUTPUT) ?
-+		GPIO_LINE_DIRECTION_OUT :
-+		GPIO_LINE_DIRECTION_IN;
-+}
-+
-+static int rp1_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
-+{
-+	struct rp1_pin_info *pin = rp1_get_pin(chip, offset);
-+
-+	if (!pin)
-+		return -EINVAL;
-+	rp1_set_dir(pin, RP1_DIR_INPUT);
-+	rp1_set_fsel(pin, RP1_FSEL_GPIO);
-+	return 0;
-+}
-+
-+static int rp1_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
-+				     int value)
-+{
-+	struct rp1_pin_info *pin = rp1_get_pin(chip, offset);
-+
-+	if (!pin)
-+		return -EINVAL;
-+	rp1_set_value(pin, value);
-+	rp1_set_dir(pin, RP1_DIR_OUTPUT);
-+	rp1_set_fsel(pin, RP1_FSEL_GPIO);
-+	return 0;
-+}
-+
-+static int rp1_gpio_set_config(struct gpio_chip *gc, unsigned offset,
-+			       unsigned long config)
-+{
-+	struct rp1_pinctrl *pc = gpiochip_get_data(gc);
-+	unsigned long configs[] = { config };
-+
-+	return rp1_pinconf_set(pc->pctl_dev, offset, configs,
-+			      ARRAY_SIZE(configs));
-+}
-+
-+static const struct gpio_chip rp1_gpio_chip = {
-+	.label = MODULE_NAME,
-+	.owner = THIS_MODULE,
-+	.request = gpiochip_generic_request,
-+	.free = gpiochip_generic_free,
-+	.direction_input = rp1_gpio_direction_input,
-+	.direction_output = rp1_gpio_direction_output,
-+	.get_direction = rp1_gpio_get_direction,
-+	.get = rp1_gpio_get,
-+	.set = rp1_gpio_set,
-+	.base = -1,
-+	.set_config = rp1_gpio_set_config,
-+	.ngpio = RP1_NUM_GPIOS,
-+	.can_sleep = false,
-+};
-+
-+static void rp1_gpio_irq_handler(struct irq_desc *desc)
-+{
-+	struct gpio_chip *chip = irq_desc_get_handler_data(desc);
-+	struct rp1_pinctrl *pc = gpiochip_get_data(chip);
-+	struct irq_chip *host_chip = irq_desc_get_chip(desc);
-+	const struct rp1_iobank_desc *bank;
-+	int irq = irq_desc_get_irq(desc);
-+	unsigned long ints;
-+	int b;
-+
-+	if (pc->irq[0] == irq)
-+		bank = &rp1_iobanks[0];
-+	else if (pc->irq[1] == irq)
-+		bank = &rp1_iobanks[1];
-+	else
-+		bank = &rp1_iobanks[2];
-+
-+	chained_irq_enter(host_chip, desc);
-+
-+	ints = readl(pc->gpio_base + bank->ints_offset);
-+	for_each_set_bit(b, &ints, 32) {
-+		struct rp1_pin_info *pin = rp1_get_pin(chip, b);
-+
-+		writel(RP1_GPIO_CTRL_IRQRESET,
-+		       pin->gpio + RP1_SET_OFFSET + RP1_GPIO_CTRL);
-+		generic_handle_irq(irq_linear_revmap(pc->gpio_chip.irq.domain,
-+						     bank->gpio_offset + b));
-+	}
-+
-+	chained_irq_exit(host_chip, desc);
-+}
-+
-+static void rp1_gpio_irq_config(struct rp1_pin_info *pin, bool enable)
-+{
-+	writel(1 << pin->offset,
-+	       pin->inte + (enable ? RP1_SET_OFFSET : RP1_CLR_OFFSET));
-+	if (!enable)
-+		/* Clear any latched events */
-+		writel(RP1_GPIO_CTRL_IRQRESET,
-+		       pin->gpio + RP1_SET_OFFSET + RP1_GPIO_CTRL);
-+}
-+
-+static void rp1_gpio_irq_enable(struct irq_data *data)
-+{
-+	struct gpio_chip *chip = irq_data_get_irq_chip_data(data);
-+	unsigned gpio = irqd_to_hwirq(data);
-+	struct rp1_pin_info *pin = rp1_get_pin(chip, gpio);
-+
-+	rp1_gpio_irq_config(pin, true);
-+}
-+
-+static void rp1_gpio_irq_disable(struct irq_data *data)
-+{
-+	struct gpio_chip *chip = irq_data_get_irq_chip_data(data);
-+	unsigned gpio = irqd_to_hwirq(data);
-+	struct rp1_pin_info *pin = rp1_get_pin(chip, gpio);
-+
-+	rp1_gpio_irq_config(pin, false);
-+}
-+
-+static int rp1_irq_set_type(struct rp1_pin_info *pin, unsigned int type)
-+{
-+	u32 irq_flags;
-+
-+	switch (type) {
-+	case IRQ_TYPE_NONE:
-+		irq_flags = 0;
-+		break;
-+	case IRQ_TYPE_EDGE_RISING:
-+		irq_flags = RP1_INT_EDGE_RISING;
-+		break;
-+	case IRQ_TYPE_EDGE_FALLING:
-+		irq_flags = RP1_INT_EDGE_FALLING;
-+		break;
-+	case IRQ_TYPE_EDGE_BOTH:
-+		irq_flags = RP1_INT_EDGE_RISING | RP1_INT_EDGE_FALLING;
-+		break;
-+	case IRQ_TYPE_LEVEL_HIGH:
-+		irq_flags = RP1_INT_LEVEL_HIGH;
-+		break;
-+	case IRQ_TYPE_LEVEL_LOW:
-+		irq_flags = RP1_INT_LEVEL_LOW;
-+		break;
-+
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	/* Clear them all */
-+	writel(RP1_INT_MASK << RP1_GPIO_EVENTS_SHIFT_RAW,
-+	       pin->gpio + RP1_CLR_OFFSET + RP1_GPIO_CTRL);
-+	/* Set those that are needed */
-+	writel(irq_flags << RP1_GPIO_EVENTS_SHIFT_RAW,
-+	       pin->gpio + RP1_SET_OFFSET + RP1_GPIO_CTRL);
-+	pin->irq_type = type;
-+
-+	return 0;
-+}
-+
-+static int rp1_gpio_irq_set_type(struct irq_data *data, unsigned int type)
-+{
-+	struct gpio_chip *chip = irq_data_get_irq_chip_data(data);
-+	struct rp1_pinctrl *pc = gpiochip_get_data(chip);
-+	unsigned gpio = irqd_to_hwirq(data);
-+	struct rp1_pin_info *pin = rp1_get_pin(chip, gpio);
-+	int bank = pin->bank;
-+	unsigned long flags;
-+	int ret;
-+
-+	raw_spin_lock_irqsave(&pc->irq_lock[bank], flags);
-+
-+	ret = rp1_irq_set_type(pin, type);
-+	if (!ret) {
-+		if (type & IRQ_TYPE_EDGE_BOTH)
-+			irq_set_handler_locked(data, handle_edge_irq);
-+		else
-+			irq_set_handler_locked(data, handle_level_irq);
-+	}
-+
-+	raw_spin_unlock_irqrestore(&pc->irq_lock[bank], flags);
-+
-+	return ret;
-+}
-+
-+static void rp1_gpio_irq_ack(struct irq_data *data)
-+{
-+	struct gpio_chip *chip = irq_data_get_irq_chip_data(data);
-+	unsigned gpio = irqd_to_hwirq(data);
-+	struct rp1_pin_info *pin = rp1_get_pin(chip, gpio);
-+
-+	/* Clear any latched events */
-+	writel(RP1_GPIO_CTRL_IRQRESET, pin->gpio + RP1_SET_OFFSET + RP1_GPIO_CTRL);
-+}
-+
-+static struct irq_chip rp1_gpio_irq_chip = {
-+	.name = MODULE_NAME,
-+	.irq_enable = rp1_gpio_irq_enable,
-+	.irq_disable = rp1_gpio_irq_disable,
-+	.irq_set_type = rp1_gpio_irq_set_type,
-+	.irq_ack = rp1_gpio_irq_ack,
-+	.irq_mask = rp1_gpio_irq_disable,
-+	.irq_unmask = rp1_gpio_irq_enable,
-+	.flags = IRQCHIP_IMMUTABLE,
-+};
-+
-+static int rp1_pctl_get_groups_count(struct pinctrl_dev *pctldev)
-+{
-+	return ARRAY_SIZE(rp1_gpio_groups);
-+}
-+
-+static const char *rp1_pctl_get_group_name(struct pinctrl_dev *pctldev,
-+					   unsigned selector)
-+{
-+	return rp1_gpio_groups[selector];
-+}
-+
-+static enum funcs rp1_get_fsel_func(unsigned pin, unsigned fsel)
-+{
-+	if (pin < RP1_NUM_GPIOS) {
-+		if (fsel < RP1_FSEL_COUNT)
-+			return rp1_gpio_pin_funcs[pin].funcs[fsel];
-+		else if (fsel == RP1_FSEL_NONE)
-+			return func_none;
-+	}
-+	return func_invalid;
-+}
-+
-+static int rp1_pctl_get_group_pins(struct pinctrl_dev *pctldev,
-+				   unsigned selector,
-+				   const unsigned **pins,
-+				   unsigned *num_pins)
-+{
-+	*pins = &rp1_gpio_pins[selector].number;
-+	*num_pins = 1;
-+
-+	return 0;
-+}
-+
-+static void rp1_pctl_pin_dbg_show(struct pinctrl_dev *pctldev,
-+				  struct seq_file *s,
-+				  unsigned offset)
-+{
-+	struct rp1_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
-+	struct gpio_chip *chip = &pc->gpio_chip;
-+	struct rp1_pin_info *pin = rp1_get_pin_pctl(pctldev, offset);
-+	u32 fsel = rp1_get_fsel(pin);
-+	enum funcs func = rp1_get_fsel_func(offset, fsel);
-+	int value = rp1_get_value(pin);
-+	int irq = irq_find_mapping(chip->irq.domain, offset);
-+
-+	seq_printf(s, "function %s (%s) in %s; irq %d (%s)",
-+		   rp1_func_names[fsel], rp1_func_names[func],
-+		   value ? "hi" : "lo",
-+		   irq, irq_type_names[pin->irq_type]);
-+}
-+
-+static void rp1_pctl_dt_free_map(struct pinctrl_dev *pctldev,
-+				 struct pinctrl_map *maps, unsigned num_maps)
-+{
-+	int i;
-+
-+	for (i = 0; i < num_maps; i++)
-+		if (maps[i].type == PIN_MAP_TYPE_CONFIGS_PIN)
-+			kfree(maps[i].data.configs.configs);
-+
-+	kfree(maps);
-+}
-+
-+static int rp1_pctl_legacy_map_func(struct rp1_pinctrl *pc,
-+				    struct device_node *np, u32 pin, u32 fnum,
-+				    struct pinctrl_map *maps,
-+				    unsigned int *num_maps)
-+{
-+	struct pinctrl_map *map = &maps[*num_maps];
-+	enum funcs func;
-+
-+	if (fnum >= ARRAY_SIZE(legacy_fsel_map[0])) {
-+		dev_err(pc->dev, "%pOF: invalid brcm,function %d\n", np, fnum);
-+		return -EINVAL;
-+	}
-+
-+	func = legacy_fsel_map[pin][fnum];
-+	if (func == func_invalid) {
-+		dev_err(pc->dev, "%pOF: brcm,function %d not supported on pin %d\n",
-+			np, fnum, pin);
-+	}
-+
-+	map->type = PIN_MAP_TYPE_MUX_GROUP;
-+	map->data.mux.group = rp1_gpio_groups[pin];
-+	map->data.mux.function = rp1_func_names[func];
-+	(*num_maps)++;
-+
-+	return 0;
-+}
-+
-+static int rp1_pctl_legacy_map_pull(struct rp1_pinctrl *pc,
-+				    struct device_node *np, u32 pin, u32 pull,
-+				    struct pinctrl_map *maps,
-+				    unsigned int *num_maps)
-+{
-+	struct pinctrl_map *map = &maps[*num_maps];
-+	enum pin_config_param param;
-+	unsigned long *configs;
-+
-+	switch (pull) {
-+	case RP1_PUD_OFF:
-+		param = PIN_CONFIG_BIAS_DISABLE;
-+		break;
-+	case RP1_PUD_DOWN:
-+		param = PIN_CONFIG_BIAS_PULL_DOWN;
-+		break;
-+	case RP1_PUD_UP:
-+		param = PIN_CONFIG_BIAS_PULL_UP;
-+		break;
-+	default:
-+		dev_err(pc->dev, "%pOF: invalid brcm,pull %d\n", np, pull);
-+		return -EINVAL;
-+	}
-+
-+	configs = kzalloc(sizeof(*configs), GFP_KERNEL);
-+	if (!configs)
-+		return -ENOMEM;
-+
-+	configs[0] = pinconf_to_config_packed(param, 0);
-+	map->type = PIN_MAP_TYPE_CONFIGS_PIN;
-+	map->data.configs.group_or_pin = rp1_gpio_pins[pin].name;
-+	map->data.configs.configs = configs;
-+	map->data.configs.num_configs = 1;
-+	(*num_maps)++;
-+
-+	return 0;
-+}
-+
-+static int rp1_pctl_dt_node_to_map(struct pinctrl_dev *pctldev,
-+				   struct device_node *np,
-+				   struct pinctrl_map **map,
-+				   unsigned int *num_maps)
-+{
-+	struct rp1_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
-+	struct property *pins, *funcs, *pulls;
-+	int num_pins, num_funcs, num_pulls, maps_per_pin;
-+	struct pinctrl_map *maps;
-+	unsigned long *configs = NULL;
-+	const char *function = NULL;
-+	unsigned int reserved_maps;
-+	int num_configs = 0;
-+	int i, err;
-+	u32 pin, func, pull;
-+
-+	/* Check for legacy pin declaration */
-+	pins = of_find_property(np, "brcm,pins", NULL);
-+
-+	if (!pins) /* Assume generic bindings in this node */
-+		return pinconf_generic_dt_node_to_map_all(pctldev, np, map, num_maps);
-+
-+	funcs = of_find_property(np, "brcm,function", NULL);
-+	if (!funcs)
-+		of_property_read_string(np, "function", &function);
-+
-+	pulls = of_find_property(np, "brcm,pull", NULL);
-+	if (!pulls)
-+		pinconf_generic_parse_dt_config(np, pctldev, &configs, &num_configs);
-+
-+	if (!function && !funcs && !num_configs && !pulls) {
-+		dev_err(pc->dev,
-+			"%pOF: no function, brcm,function, brcm,pull, etc.\n",
-+			np);
-+		return -EINVAL;
-+	}
-+
-+	num_pins = pins->length / 4;
-+	num_funcs = funcs ? (funcs->length / 4) : 0;
-+	num_pulls = pulls ? (pulls->length / 4) : 0;
-+
-+	if (num_funcs > 1 && num_funcs != num_pins) {
-+		dev_err(pc->dev,
-+			"%pOF: brcm,function must have 1 or %d entries\n",
-+			np, num_pins);
-+		return -EINVAL;
-+	}
-+
-+	if (num_pulls > 1 && num_pulls != num_pins) {
-+		dev_err(pc->dev,
-+			"%pOF: brcm,pull must have 1 or %d entries\n",
-+			np, num_pins);
-+		return -EINVAL;
-+	}
-+
-+	maps_per_pin = 0;
-+	if (function || num_funcs)
-+		maps_per_pin++;
-+	if (num_configs || num_pulls)
-+		maps_per_pin++;
-+	reserved_maps = num_pins * maps_per_pin;
-+	maps = kcalloc(reserved_maps, sizeof(*maps), GFP_KERNEL);
-+	if (!maps)
-+		return -ENOMEM;
-+
-+	*num_maps = 0;
-+
-+	for (i = 0; i < num_pins; i++) {
-+		err = of_property_read_u32_index(np, "brcm,pins", i, &pin);
-+		if (err)
-+			goto out;
-+		if (pin >= ARRAY_SIZE(legacy_fsel_map)) {
-+			dev_err(pc->dev, "%pOF: invalid brcm,pins value %d\n",
-+				np, pin);
-+			err = -EINVAL;
-+			goto out;
-+		}
-+
-+		if (num_funcs) {
-+			err = of_property_read_u32_index(np, "brcm,function",
-+							 (num_funcs > 1) ? i : 0,
-+							 &func);
-+			if (err)
-+				goto out;
-+			err = rp1_pctl_legacy_map_func(pc, np, pin, func,
-+						       maps, num_maps);
-+		} else if (function) {
-+			err = pinctrl_utils_add_map_mux(pctldev, &maps,
-+							&reserved_maps, num_maps,
-+							rp1_gpio_groups[pin],
-+							function);
-+		}
-+
-+		if (err)
-+			goto out;
-+
-+		if (num_pulls) {
-+			err = of_property_read_u32_index(np, "brcm,pull",
-+							 (num_pulls > 1) ? i : 0,
-+							 &pull);
-+			if (err)
-+				goto out;
-+			err = rp1_pctl_legacy_map_pull(pc, np, pin, pull,
-+						       maps, num_maps);
-+		} else if (num_configs) {
-+			err = pinctrl_utils_add_map_configs(pctldev, &maps,
-+							    &reserved_maps, num_maps,
-+							    rp1_gpio_groups[pin],
-+							    configs, num_configs,
-+							    PIN_MAP_TYPE_CONFIGS_PIN);
-+		}
-+
-+		if (err)
-+			goto out;
-+	}
-+
-+	*map = maps;
-+
-+	return 0;
-+
-+out:
-+	rp1_pctl_dt_free_map(pctldev, maps, reserved_maps);
-+	return err;
-+}
-+
-+static const struct pinctrl_ops rp1_pctl_ops = {
-+	.get_groups_count = rp1_pctl_get_groups_count,
-+	.get_group_name = rp1_pctl_get_group_name,
-+	.get_group_pins = rp1_pctl_get_group_pins,
-+	.pin_dbg_show = rp1_pctl_pin_dbg_show,
-+	.dt_node_to_map = rp1_pctl_dt_node_to_map,
-+	.dt_free_map = rp1_pctl_dt_free_map,
-+};
-+
-+static int rp1_pmx_free(struct pinctrl_dev *pctldev, unsigned offset)
-+{
-+	struct rp1_pin_info *pin = rp1_get_pin_pctl(pctldev, offset);
-+	u32 fsel = rp1_get_fsel(pin);
-+
-+	/* Return non-GPIOs to GPIO_IN */
-+	if (fsel != RP1_FSEL_GPIO) {
-+		rp1_set_dir(pin, RP1_DIR_INPUT);
-+		rp1_set_fsel(pin, RP1_FSEL_GPIO);
-+	}
-+
-+	return 0;
-+}
-+
-+static int rp1_pmx_get_functions_count(struct pinctrl_dev *pctldev)
-+{
-+	return func_count;
-+}
-+
-+static const char *rp1_pmx_get_function_name(struct pinctrl_dev *pctldev,
-+					     unsigned selector)
-+{
-+	return (selector < func_count) ? rp1_func_names[selector] : NULL;
-+}
-+
-+static int rp1_pmx_get_function_groups(struct pinctrl_dev *pctldev,
-+				       unsigned selector,
-+				       const char * const **groups,
-+				       unsigned * const num_groups)
-+{
-+	/* every pin can do every function */
-+	*groups = rp1_gpio_groups;
-+	*num_groups = ARRAY_SIZE(rp1_gpio_groups);
-+
-+	return 0;
-+}
-+
-+static int rp1_pmx_set(struct pinctrl_dev *pctldev, unsigned func_selector,
-+		       unsigned group_selector)
-+{
-+	struct rp1_pin_info *pin = rp1_get_pin_pctl(pctldev, group_selector);
-+	const u8 *pin_funcs;
-+	int fsel;
-+
-+	/* func_selector is an enum funcs, so needs translation */
-+
-+	if (func_selector >= RP1_FSEL_COUNT) {
-+		/* Convert to an fsel number */
-+		pin_funcs = rp1_gpio_pin_funcs[pin->num].funcs;
-+		for (fsel = 0; fsel < RP1_FSEL_COUNT; fsel++) {
-+			if (pin_funcs[fsel] == func_selector)
-+				break;
-+		}
-+	} else {
-+		fsel = (int)func_selector;
-+	}
-+
-+	if (fsel >= RP1_FSEL_COUNT && fsel != RP1_FSEL_NONE)
-+		return -EINVAL;
-+
-+	rp1_set_fsel(pin, fsel);
-+
-+	return 0;
-+}
-+
-+static void rp1_pmx_gpio_disable_free(struct pinctrl_dev *pctldev,
-+				      struct pinctrl_gpio_range *range,
-+				      unsigned offset)
-+{
-+	(void)rp1_pmx_free(pctldev, offset);
-+}
-+
-+static int rp1_pmx_gpio_set_direction(struct pinctrl_dev *pctldev,
-+				      struct pinctrl_gpio_range *range,
-+				      unsigned offset,
-+				      bool input)
-+{
-+	struct rp1_pin_info *pin = rp1_get_pin_pctl(pctldev, offset);
-+
-+	rp1_set_dir(pin, input);
-+	rp1_set_fsel(pin, RP1_FSEL_GPIO);
-+
-+	return 0;
-+}
-+
-+static const struct pinmux_ops rp1_pmx_ops = {
-+	.free = rp1_pmx_free,
-+	.get_functions_count = rp1_pmx_get_functions_count,
-+	.get_function_name = rp1_pmx_get_function_name,
-+	.get_function_groups = rp1_pmx_get_function_groups,
-+	.set_mux = rp1_pmx_set,
-+	.gpio_disable_free = rp1_pmx_gpio_disable_free,
-+	.gpio_set_direction = rp1_pmx_gpio_set_direction,
-+};
-+
-+static void rp1_pull_config_set(struct rp1_pin_info *pin, unsigned int arg)
-+{
-+	u32 padctrl = readl(pin->pad);
-+
-+	FLD_SET(padctrl, RP1_PAD_PULL, arg & 0x3);
-+
-+	writel(padctrl, pin->pad);
-+}
-+
-+/* Generic pinconf methods */
-+
-+static int rp1_pinconf_set(struct pinctrl_dev *pctldev, unsigned int offset,
-+			   unsigned long *configs, unsigned int num_configs)
-+{
-+	struct rp1_pin_info *pin = rp1_get_pin_pctl(pctldev, offset);
-+	u32 param, arg;
-+	int i;
-+
-+	if (!pin)
-+		return -EINVAL;
-+
-+	for (i = 0; i < num_configs; i++) {
-+		param = pinconf_to_config_param(configs[i]);
-+		arg = pinconf_to_config_argument(configs[i]);
-+
-+		switch (param) {
-+		case PIN_CONFIG_BIAS_DISABLE:
-+			rp1_pull_config_set(pin, RP1_PUD_OFF);
-+			break;
-+
-+		case PIN_CONFIG_BIAS_PULL_DOWN:
-+			rp1_pull_config_set(pin, RP1_PUD_DOWN);
-+			break;
-+
-+		case PIN_CONFIG_BIAS_PULL_UP:
-+			rp1_pull_config_set(pin, RP1_PUD_UP);
-+			break;
-+
-+		case PIN_CONFIG_INPUT_ENABLE:
-+			rp1_input_enable(pin, arg);
-+			break;
-+
-+		case PIN_CONFIG_OUTPUT_ENABLE:
-+			rp1_output_enable(pin, arg);
-+			break;
-+
-+		case PIN_CONFIG_OUTPUT:
-+			rp1_set_value(pin, arg);
-+			rp1_set_dir(pin, RP1_DIR_OUTPUT);
-+			rp1_set_fsel(pin, RP1_FSEL_GPIO);
-+			break;
-+
-+		case PIN_CONFIG_INPUT_SCHMITT_ENABLE:
-+			rp1_pad_update(pin, RP1_PAD_SCHMITT_MASK,
-+				       arg ? RP1_PAD_SCHMITT_MASK : 0);
-+			break;
-+
-+		case PIN_CONFIG_SLEW_RATE:
-+			rp1_pad_update(pin, RP1_PAD_SLEWFAST_MASK,
-+				       arg ? RP1_PAD_SLEWFAST_MASK : 0);
-+			break;
-+
-+		case PIN_CONFIG_DRIVE_STRENGTH:
-+			switch (arg) {
-+			case 2:
-+				arg = RP1_PAD_DRIVE_2MA;
-+				break;
-+			case 4:
-+				arg = RP1_PAD_DRIVE_4MA;
-+				break;
-+			case 8:
-+				arg = RP1_PAD_DRIVE_8MA;
-+				break;
-+			case 12:
-+				arg = RP1_PAD_DRIVE_12MA;
-+				break;
-+			default:
-+				return -ENOTSUPP;
-+			}
-+			rp1_pad_update(pin, RP1_PAD_DRIVE_MASK, arg);
-+			break;
-+
-+		default:
-+			return -ENOTSUPP;
-+
-+		} /* switch param type */
-+	} /* for each config */
-+
-+	return 0;
-+}
-+
-+static int rp1_pinconf_get(struct pinctrl_dev *pctldev, unsigned offset,
-+			   unsigned long *config)
-+{
-+	struct rp1_pin_info *pin = rp1_get_pin_pctl(pctldev, offset);
-+	enum pin_config_param param = pinconf_to_config_param(*config);
-+	u32 padctrl;
-+	u32 arg;
-+
-+	if (!pin)
-+		return -EINVAL;
-+
-+	padctrl = readl(pin->pad);
-+
-+	switch (param) {
-+	case PIN_CONFIG_INPUT_ENABLE:
-+		arg = !!(padctrl & RP1_PAD_IN_ENABLE_MASK);
-+		break;
-+	case PIN_CONFIG_OUTPUT_ENABLE:
-+		arg = !(padctrl & RP1_PAD_OUT_DISABLE_MASK);
-+		break;
-+	case PIN_CONFIG_INPUT_SCHMITT_ENABLE:
-+		arg = !!(padctrl & RP1_PAD_SCHMITT_MASK);
-+		break;
-+	case PIN_CONFIG_SLEW_RATE:
-+		arg = !!(padctrl & RP1_PAD_SLEWFAST_MASK);
-+		break;
-+	case PIN_CONFIG_DRIVE_STRENGTH:
-+		switch (padctrl & RP1_PAD_DRIVE_MASK) {
-+		case RP1_PAD_DRIVE_2MA:
-+			arg = 2;
-+			break;
-+		case RP1_PAD_DRIVE_4MA:
-+			arg = 4;
-+			break;
-+		case RP1_PAD_DRIVE_8MA:
-+			arg = 8;
-+			break;
-+		case RP1_PAD_DRIVE_12MA:
-+			arg = 12;
-+			break;
-+		}
-+		break;
-+	case PIN_CONFIG_BIAS_DISABLE:
-+		arg = ((padctrl & RP1_PAD_PULL_MASK) == (RP1_PUD_OFF << RP1_PAD_PULL_LSB));
-+		break;
-+	case PIN_CONFIG_BIAS_PULL_DOWN:
-+		arg = ((padctrl & RP1_PAD_PULL_MASK) == (RP1_PUD_DOWN << RP1_PAD_PULL_LSB));
-+		break;
-+
-+	case PIN_CONFIG_BIAS_PULL_UP:
-+		arg = ((padctrl & RP1_PAD_PULL_MASK) == (RP1_PUD_UP << RP1_PAD_PULL_LSB));
-+		break;
-+	default:
-+		return -ENOTSUPP;
-+	}
-+
-+	*config = pinconf_to_config_packed(param, arg);
-+
-+	return 0;
-+}
-+
-+static const struct pinconf_ops rp1_pinconf_ops = {
-+	.is_generic = true,
-+	.pin_config_get = rp1_pinconf_get,
-+	.pin_config_set = rp1_pinconf_set,
-+};
-+
-+static struct pinctrl_desc rp1_pinctrl_desc = {
-+	.name = MODULE_NAME,
-+	.pins = rp1_gpio_pins,
-+	.npins = ARRAY_SIZE(rp1_gpio_pins),
-+	.pctlops = &rp1_pctl_ops,
-+	.pmxops = &rp1_pmx_ops,
-+	.confops = &rp1_pinconf_ops,
-+	.owner = THIS_MODULE,
-+};
-+
-+static struct pinctrl_gpio_range rp1_pinctrl_gpio_range = {
-+	.name = MODULE_NAME,
-+	.npins = RP1_NUM_GPIOS,
-+};
-+
-+static const struct of_device_id rp1_pinctrl_match[] = {
-+	{
-+		.compatible = "raspberrypi,rp1-gpio",
-+		.data = &rp1_pinconf_ops,
-+	},
-+	{}
-+};
-+
-+static inline void __iomem *devm_auto_iomap(struct platform_device *pdev,
-+					    unsigned int index)
-+{
-+	struct device *dev = &pdev->dev;
-+	struct device_node *np = dev->of_node;
-+
-+	if (np)
-+		return devm_of_iomap(dev, np, (int)index, NULL);
-+	else
-+		return devm_platform_ioremap_resource(pdev, index);
-+}
-+
-+static int rp1_pinctrl_probe(struct platform_device *pdev)
-+{
-+	struct device *dev = &pdev->dev;
-+	struct device_node *np = dev->of_node;
-+	struct rp1_pinctrl *pc;
-+	struct gpio_irq_chip *girq;
-+	int err, i;
-+
-+	BUILD_BUG_ON(ARRAY_SIZE(rp1_gpio_pins) != RP1_NUM_GPIOS);
-+	BUILD_BUG_ON(ARRAY_SIZE(rp1_gpio_groups) != RP1_NUM_GPIOS);
-+
-+	pc = devm_kzalloc(dev, sizeof(*pc), GFP_KERNEL);
-+	if (!pc)
-+		return -ENOMEM;
-+
-+	platform_set_drvdata(pdev, pc);
-+	pc->dev = dev;
-+
-+	pc->gpio_base = devm_auto_iomap(pdev, 0);
-+	if (IS_ERR(pc->gpio_base)) {
-+		dev_err(dev, "could not get GPIO IO memory\n");
-+		return PTR_ERR(pc->gpio_base);
-+	}
-+
-+	pc->rio_base = devm_auto_iomap(pdev, 1);
-+	if (IS_ERR(pc->rio_base)) {
-+		dev_err(dev, "could not get RIO IO memory\n");
-+		return PTR_ERR(pc->rio_base);
-+	}
-+
-+	pc->pads_base = devm_auto_iomap(pdev, 2);
-+	if (IS_ERR(pc->pads_base)) {
-+		dev_err(dev, "could not get PADS IO memory\n");
-+		return PTR_ERR(pc->pads_base);
-+	}
-+
-+	pc->gpio_chip = rp1_gpio_chip;
-+	pc->gpio_chip.parent = dev;
-+
-+	for (i = 0; i < RP1_NUM_BANKS; i++) {
-+		const struct rp1_iobank_desc *bank = &rp1_iobanks[i];
-+		int j;
-+
-+		for (j = 0; j < bank->num_gpios; j++) {
-+			struct rp1_pin_info *pin =
-+				&pc->pins[bank->min_gpio + j];
-+
-+			pin->num = bank->min_gpio + j;
-+			pin->bank = i;
-+			pin->offset = j;
-+
-+			pin->gpio = pc->gpio_base + bank->gpio_offset +
-+				    j * sizeof(u32) * 2;
-+			pin->inte = pc->gpio_base + bank->inte_offset;
-+			pin->ints = pc->gpio_base + bank->ints_offset;
-+			pin->rio  = pc->rio_base + bank->rio_offset;
-+			pin->pad  = pc->pads_base + bank->pads_offset +
-+				    j * sizeof(u32);
-+		}
-+
-+		raw_spin_lock_init(&pc->irq_lock[i]);
-+	}
-+
-+	pc->pctl_dev = devm_pinctrl_register(dev, &rp1_pinctrl_desc, pc);
-+	if (IS_ERR(pc->pctl_dev))
-+		return PTR_ERR(pc->pctl_dev);
-+
-+	girq = &pc->gpio_chip.irq;
-+	girq->chip = &rp1_gpio_irq_chip;
-+	girq->parent_handler = rp1_gpio_irq_handler;
-+	girq->num_parents = RP1_NUM_BANKS;
-+	girq->parents = pc->irq;
-+
-+	/*
-+	 * Use the same handler for all groups: this is necessary
-+	 * since we use one gpiochip to cover all lines - the
-+	 * irq handler then needs to figure out which group and
-+	 * bank that was firing the IRQ and look up the per-group
-+	 * and bank data.
-+	 */
-+	for (i = 0; i < RP1_NUM_BANKS; i++) {
-+		pc->irq[i] = irq_of_parse_and_map(np, i);
-+		if (!pc->irq[i]) {
-+			girq->num_parents = i;
-+			break;
-+		}
-+	}
-+
-+	girq->default_type = IRQ_TYPE_NONE;
-+	girq->handler = handle_level_irq;
-+
-+	err = devm_gpiochip_add_data(dev, &pc->gpio_chip, pc);
-+	if (err) {
-+		dev_err(dev, "could not add GPIO chip\n");
-+		return err;
-+	}
-+
-+	pc->gpio_range = rp1_pinctrl_gpio_range;
-+	pc->gpio_range.base = pc->gpio_chip.base;
-+	pc->gpio_range.gc = &pc->gpio_chip;
-+	pinctrl_add_gpio_range(pc->pctl_dev, &pc->gpio_range);
-+
-+	return 0;
-+}
-+
-+static struct platform_driver rp1_pinctrl_driver = {
-+	.probe = rp1_pinctrl_probe,
-+	.driver = {
-+		.name = MODULE_NAME,
-+		.of_match_table = rp1_pinctrl_match,
-+		.suppress_bind_attrs = true,
-+	},
-+};
-+builtin_platform_driver(rp1_pinctrl_driver);
---- a/include/dt-bindings/pinctrl/rp1.h
-+++ /dev/null
-@@ -1,46 +0,0 @@
--/* SPDX-License-Identifier: GPL-2.0 */
--/*
-- * Header providing constants for RP1 pinctrl bindings.
-- *
-- * Copyright (C) 2019-2022 Raspberry Pi Ltd.
-- */
--
--#ifndef __DT_BINDINGS_PINCTRL_RP1_H__
--#define __DT_BINDINGS_PINCTRL_RP1_H__
--
--/* brcm,function property */
--#define RP1_FSEL_GPIO_IN	0
--#define RP1_FSEL_GPIO_OUT	1
--#define RP1_FSEL_ALT0_LEGACY	4
--#define RP1_FSEL_ALT1_LEGACY	5
--#define RP1_FSEL_ALT2_LEGACY	6
--#define RP1_FSEL_ALT3_LEGACY	7
--#define RP1_FSEL_ALT4_LEGACY	3
--#define RP1_FSEL_ALT5_LEGACY	2
--#define RP1_FSEL_ALT0		0x08
--#define RP1_FSEL_ALT0INV	0x09
--#define RP1_FSEL_ALT1		0x0a
--#define RP1_FSEL_ALT1INV	0x0b
--#define RP1_FSEL_ALT2		0x0c
--#define RP1_FSEL_ALT2INV	0x0d
--#define RP1_FSEL_ALT3		0x0e
--#define RP1_FSEL_ALT3INV	0x0f
--#define RP1_FSEL_ALT4		0x10
--#define RP1_FSEL_ALT4INV	0x11
--#define RP1_FSEL_ALT5		0x12
--#define RP1_FSEL_ALT5INV	0x13
--#define RP1_FSEL_ALT6		0x14
--#define RP1_FSEL_ALT6INV	0x15
--#define RP1_FSEL_ALT7		0x16
--#define RP1_FSEL_ALT7INV	0x17
--#define RP1_FSEL_ALT8		0x18
--#define RP1_FSEL_ALT8INV	0x19
--#define RP1_FSEL_NONE		0x1a
--
--/* brcm,pull property */
--#define RP1_PUD_OFF		0
--#define RP1_PUD_DOWN		1
--#define RP1_PUD_UP		2
--#define RP1_PUD_KEEP		3
--
--#endif /* __DT_BINDINGS_PINCTRL_RP1_H__ */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0877-serial-pl011-rp1-uart-support.patch b/target/linux/bcm27xx/patches-6.1/950-0877-serial-pl011-rp1-uart-support.patch
deleted file mode 100644
index b0b9897e89..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0877-serial-pl011-rp1-uart-support.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From f88da9e21d8eff58eeb9280ae96bf9593121d8eb Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 12 Oct 2022 13:24:51 +0100
-Subject: [PATCH] serial: pl011: rp1 uart support
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/tty/serial/amba-pl011.c | 96 +++++++++++++++++++++++++++++++++
- 1 file changed, 96 insertions(+)
-
---- a/drivers/tty/serial/amba-pl011.c
-+++ b/drivers/tty/serial/amba-pl011.c
-@@ -152,6 +152,20 @@ static const struct vendor_data vendor_s
- 	.fixed_options		= true,
- };
- 
-+static struct vendor_data vendor_arm_axi = {
-+	.reg_offset		= pl011_std_offsets,
-+	.ifls			= UART011_IFLS_RX4_8 | UART011_IFLS_TX4_8,
-+	.fr_busy		= UART01x_FR_BUSY,
-+	.fr_dsr			= UART01x_FR_DSR,
-+	.fr_cts			= UART01x_FR_CTS,
-+	.fr_ri			= UART011_FR_RI,
-+	.oversampling		= false,
-+	.dma_threshold		= false,
-+	.cts_event_workaround	= false,
-+	.always_enabled		= false,
-+	.fixed_options		= false,
-+};
-+
- #ifdef CONFIG_ACPI_SPCR_TABLE
- static const struct vendor_data vendor_qdt_qdf2400_e44 = {
- 	.reg_offset		= pl011_std_offsets,
-@@ -2972,6 +2986,86 @@ static struct platform_driver arm_sbsa_u
- 	},
- };
- 
-+static int pl011_axi_probe(struct platform_device *pdev)
-+{
-+	struct uart_amba_port *uap;
-+	struct vendor_data *vendor =  &vendor_arm_axi;
-+	struct resource *r;
-+	unsigned int periphid;
-+	int portnr, ret, irq;
-+
-+	portnr = pl011_find_free_port();
-+	if (portnr < 0)
-+		return portnr;
-+
-+	uap = devm_kzalloc(&pdev->dev, sizeof(struct uart_amba_port),
-+			   GFP_KERNEL);
-+	if (!uap)
-+		return -ENOMEM;
-+
-+	uap->clk = devm_clk_get(&pdev->dev, NULL);
-+	if (IS_ERR(uap->clk))
-+		return PTR_ERR(uap->clk);
-+
-+	if (of_property_read_bool(pdev->dev.of_node, "cts-event-workaround")) {
-+		vendor->cts_event_workaround = true;
-+		dev_info(&pdev->dev, "cts_event_workaround enabled\n");
-+	}
-+
-+	irq = platform_get_irq(pdev, 0);
-+	if (irq < 0)
-+		return irq;
-+
-+	periphid = 0x00241011; /* A safe default */
-+	of_property_read_u32(pdev->dev.of_node, "arm,primecell-periphid",
-+			     &periphid);
-+
-+	uap->reg_offset = vendor->reg_offset;
-+	uap->vendor = vendor;
-+	uap->fifosize = (AMBA_REV_BITS(periphid) < 3) ? 16 : 32;
-+	uap->port.iotype = vendor->access_32b ? UPIO_MEM32 : UPIO_MEM;
-+	uap->port.irq = irq;
-+	uap->port.ops = &amba_pl011_pops;
-+
-+	snprintf(uap->type, sizeof(uap->type), "PL011 AXI");
-+
-+	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+
-+	ret = pl011_setup_port(&pdev->dev, uap, r, portnr);
-+	if (ret)
-+		return ret;
-+
-+	platform_set_drvdata(pdev, uap);
-+
-+	return pl011_register_port(uap);
-+}
-+
-+static int pl011_axi_remove(struct platform_device *pdev)
-+{
-+	struct uart_amba_port *uap = platform_get_drvdata(pdev);
-+
-+	uart_remove_one_port(&amba_reg, &uap->port);
-+	pl011_unregister_port(uap);
-+	return 0;
-+}
-+
-+static const struct of_device_id pl011_axi_of_match[] = {
-+	{ .compatible = "arm,pl011-axi" },
-+	{},
-+};
-+MODULE_DEVICE_TABLE(of, pl011_axi_of_match);
-+
-+static struct platform_driver pl011_axi_platform_driver = {
-+	.probe		= pl011_axi_probe,
-+	.remove		= pl011_axi_remove,
-+	.driver	= {
-+		.name	= "pl011-axi",
-+		.pm	= &pl011_dev_pm_ops,
-+		.of_match_table = of_match_ptr(pl011_axi_of_match),
-+		.suppress_bind_attrs = IS_BUILTIN(CONFIG_SERIAL_AMBA_PL011),
-+	},
-+};
-+
- static const struct amba_id pl011_ids[] = {
- 	{
- 		.id	= 0x00041011,
-@@ -3005,6 +3099,8 @@ static int __init pl011_init(void)
- 
- 	if (platform_driver_register(&arm_sbsa_uart_platform_driver))
- 		pr_warn("could not register SBSA UART platform driver\n");
-+	if (platform_driver_register(&pl011_axi_platform_driver))
-+		pr_warn("could not register PL011 AXI platform driver\n");
- 	return amba_driver_register(&pl011_driver);
- }
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0878-mmc-sdhci-of-dwcmshc-define-sdio-timeout-clocks.patch b/target/linux/bcm27xx/patches-6.1/950-0878-mmc-sdhci-of-dwcmshc-define-sdio-timeout-clocks.patch
deleted file mode 100644
index 6bc21a6a57..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0878-mmc-sdhci-of-dwcmshc-define-sdio-timeout-clocks.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 4a5ac516ca0a820e7c006ae408872009e37e114b Mon Sep 17 00:00:00 2001
-From: Liam Fraser <liam@raspberrypi.com>
-Date: Thu, 14 Mar 2019 16:01:26 +0000
-Subject: [PATCH] mmc: sdhci-of-dwcmshc: define sdio timeout clocks
-
-Signed-off-by: Liam Fraser <liam@raspberrypi.com>
----
- drivers/mmc/host/sdhci-of-dwcmshc.c | 12 ++++++++++++
- drivers/mmc/host/sdhci-pltfm.c      |  8 ++++++++
- drivers/mmc/host/sdhci-pltfm.h      |  3 +++
- 3 files changed, 23 insertions(+)
-
---- a/drivers/mmc/host/sdhci-of-dwcmshc.c
-+++ b/drivers/mmc/host/sdhci-of-dwcmshc.c
-@@ -330,6 +330,7 @@ static const struct sdhci_ops sdhci_dwcm
- 	.set_bus_width		= sdhci_set_bus_width,
- 	.set_uhs_signaling	= dwcmshc_set_uhs_signaling,
- 	.get_max_clock		= dwcmshc_get_max_clock,
-+	.get_timeout_clock	= sdhci_pltfm_clk_get_timeout_clock,
- 	.reset			= sdhci_reset,
- 	.adma_write_desc	= dwcmshc_adma_write_desc,
- };
-@@ -500,6 +501,16 @@ static int dwcmshc_probe(struct platform
- 			clk_prepare_enable(priv->bus_clk);
- 	}
- 
-+	pltfm_host->timeout_clk = devm_clk_get(&pdev->dev, "timeout");
-+	if (IS_ERR(pltfm_host->timeout_clk)) {
-+		err = PTR_ERR(pltfm_host->timeout_clk);
-+		dev_err(&pdev->dev, "failed to get timeout clk: %d\n", err);
-+		goto free_pltfm;
-+	}
-+	err = clk_prepare_enable(pltfm_host->timeout_clk);
-+	if (err)
-+		goto free_pltfm;
-+
- 	err = mmc_of_parse(host->mmc);
- 	if (err)
- 		goto err_clk;
-@@ -550,6 +561,7 @@ err_setup_host:
- 	sdhci_cleanup_host(host);
- err_clk:
- 	clk_disable_unprepare(pltfm_host->clk);
-+	clk_disable_unprepare(pltfm_host->timeout_clk);
- 	clk_disable_unprepare(priv->bus_clk);
- 	if (rk_priv)
- 		clk_bulk_disable_unprepare(RK35xx_MAX_CLKS,
---- a/drivers/mmc/host/sdhci-pltfm.c
-+++ b/drivers/mmc/host/sdhci-pltfm.c
-@@ -33,6 +33,14 @@ unsigned int sdhci_pltfm_clk_get_max_clo
- }
- EXPORT_SYMBOL_GPL(sdhci_pltfm_clk_get_max_clock);
- 
-+unsigned int sdhci_pltfm_clk_get_timeout_clock(struct sdhci_host *host)
-+{
-+	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
-+
-+	return clk_get_rate(pltfm_host->timeout_clk);
-+}
-+EXPORT_SYMBOL_GPL(sdhci_pltfm_clk_get_timeout_clock);
-+
- static const struct sdhci_ops sdhci_pltfm_ops = {
- 	.set_clock = sdhci_set_clock,
- 	.set_bus_width = sdhci_set_bus_width,
---- a/drivers/mmc/host/sdhci-pltfm.h
-+++ b/drivers/mmc/host/sdhci-pltfm.h
-@@ -20,6 +20,7 @@ struct sdhci_pltfm_data {
- 
- struct sdhci_pltfm_host {
- 	struct clk *clk;
-+	struct clk *timeout_clk;
- 
- 	/* migrate from sdhci_of_host */
- 	unsigned int clock;
-@@ -106,6 +107,8 @@ extern int sdhci_pltfm_unregister(struct
- 
- extern unsigned int sdhci_pltfm_clk_get_max_clock(struct sdhci_host *host);
- 
-+extern unsigned int sdhci_pltfm_clk_get_timeout_clock(struct sdhci_host *host);
-+
- static inline void *sdhci_pltfm_priv(struct sdhci_pltfm_host *host)
- {
- 	return host->private;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0879-mmc-sdhci-of-dwcmshc-rp1-sdio-changes.patch b/target/linux/bcm27xx/patches-6.1/950-0879-mmc-sdhci-of-dwcmshc-rp1-sdio-changes.patch
deleted file mode 100644
index 12d614fd94..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0879-mmc-sdhci-of-dwcmshc-rp1-sdio-changes.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 14a43b3fd43bf9b230f93d1eba276d40aac969ba Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 12 Oct 2022 14:07:32 +0100
-Subject: [PATCH] mmc: sdhci-of-dwcmshc: rp1 sdio changes
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/mmc/host/sdhci-of-dwcmshc.c | 29 ++++++++++++++++++++++++++---
- 1 file changed, 26 insertions(+), 3 deletions(-)
-
---- a/drivers/mmc/host/sdhci-of-dwcmshc.c
-+++ b/drivers/mmc/host/sdhci-of-dwcmshc.c
-@@ -87,6 +87,7 @@ struct rk35xx_priv {
- 
- struct dwcmshc_priv {
- 	struct clk	*bus_clk;
-+	struct clk	*sdio_clk;
- 	int vendor_specific_area1; /* P_VENDOR_SPECIFIC_AREA reg */
- 	void *priv; /* pointer to SoC private stuff */
- };
-@@ -114,6 +115,17 @@ static void dwcmshc_adma_write_desc(stru
- 	sdhci_adma_write_desc(host, desc, addr, len, cmd);
- }
- 
-+static void dwcmshc_set_clock(struct sdhci_host *host, unsigned int clock)
-+{
-+	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
-+	struct dwcmshc_priv *priv = sdhci_pltfm_priv(pltfm_host);
-+
-+	if (priv->sdio_clk)
-+		clk_set_rate(priv->sdio_clk, clock);
-+
-+	sdhci_set_clock(host, clock);
-+}
-+
- static unsigned int dwcmshc_get_max_clock(struct sdhci_host *host)
- {
- 	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
-@@ -326,7 +338,7 @@ static void rk35xx_sdhci_reset(struct sd
- }
- 
- static const struct sdhci_ops sdhci_dwcmshc_ops = {
--	.set_clock		= sdhci_set_clock,
-+	.set_clock		= dwcmshc_set_clock,
- 	.set_bus_width		= sdhci_set_bus_width,
- 	.set_uhs_signaling	= dwcmshc_set_uhs_signaling,
- 	.get_max_clock		= dwcmshc_get_max_clock,
-@@ -346,8 +358,10 @@ static const struct sdhci_ops sdhci_dwcm
- 
- static const struct sdhci_pltfm_data sdhci_dwcmshc_pdata = {
- 	.ops = &sdhci_dwcmshc_ops,
--	.quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN,
--	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
-+	.quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN |
-+		  SDHCI_QUIRK_BROKEN_CARD_DETECTION,
-+	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
-+		   SDHCI_QUIRK2_BROKEN_HS200,
- };
- 
- #ifdef CONFIG_ACPI
-@@ -499,6 +513,14 @@ static int dwcmshc_probe(struct platform
- 		priv->bus_clk = devm_clk_get(dev, "bus");
- 		if (!IS_ERR(priv->bus_clk))
- 			clk_prepare_enable(priv->bus_clk);
-+
-+		pltfm_host->timeout_clk = devm_clk_get(dev, "timeout");
-+		if (!IS_ERR(pltfm_host->timeout_clk))
-+			err = clk_prepare_enable(pltfm_host->timeout_clk);
-+		if (err)
-+			goto free_pltfm;
-+
-+		priv->sdio_clk = devm_clk_get_optional(&pdev->dev, "sdio");
- 	}
- 
- 	pltfm_host->timeout_clk = devm_clk_get(&pdev->dev, "timeout");
-@@ -516,6 +538,7 @@ static int dwcmshc_probe(struct platform
- 		goto err_clk;
- 
- 	sdhci_get_of_property(pdev);
-+	sdhci_enable_v4_mode(host);
- 
- 	priv->vendor_specific_area1 =
- 		sdhci_readl(host, DWCMSHC_P_VENDOR_AREA1) & DWCMSHC_AREA1_MASK;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0880-clk-rp1-Add-sdio-clk-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0880-clk-rp1-Add-sdio-clk-driver.patch
deleted file mode 100644
index 7db5202ae4..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0880-clk-rp1-Add-sdio-clk-driver.patch
+++ /dev/null
@@ -1,641 +0,0 @@
-From b427cc1a83404f48b12dec2efbef076b38df6218 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 12 Oct 2022 14:20:07 +0100
-Subject: [PATCH] clk: rp1: Add sdio-clk driver
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/clk/Kconfig        |   6 +
- drivers/clk/Makefile       |   1 +
- drivers/clk/clk-rp1-sdio.c | 600 +++++++++++++++++++++++++++++++++++++
- 3 files changed, 607 insertions(+)
- create mode 100644 drivers/clk/clk-rp1-sdio.c
-
---- a/drivers/clk/Kconfig
-+++ b/drivers/clk/Kconfig
-@@ -96,6 +96,12 @@ config COMMON_CLK_RP1
- 	help
- 	  Enable common clock framework support for Raspberry Pi RP1
- 
-+config COMMON_CLK_RP1_SDIO
-+	tristate "Clock driver for the RP1 SDIO interfaces"
-+	depends on MFD_RP1
-+	help
-+	  SDIO clock driver for the RP1 support chip
-+
- config COMMON_CLK_HI655X
- 	tristate "Clock driver for Hi655x" if EXPERT
- 	depends on (MFD_HI655X_PMIC || COMPILE_TEST)
---- a/drivers/clk/Makefile
-+++ b/drivers/clk/Makefile
-@@ -59,6 +59,7 @@ obj-$(CONFIG_COMMON_CLK_PWM)		+= clk-pwm
- obj-$(CONFIG_CLK_QORIQ)			+= clk-qoriq.o
- obj-$(CONFIG_COMMON_CLK_RK808)		+= clk-rk808.o
- obj-$(CONFIG_COMMON_CLK_RP1)		+= clk-rp1.o
-+obj-$(CONFIG_COMMON_CLK_RP1_SDIO)	+= clk-rp1-sdio.o
- obj-$(CONFIG_COMMON_CLK_HI655X)		+= clk-hi655x.o
- obj-$(CONFIG_COMMON_CLK_S2MPS11)	+= clk-s2mps11.o
- obj-$(CONFIG_COMMON_CLK_SCMI)           += clk-scmi.o
---- /dev/null
-+++ b/drivers/clk/clk-rp1-sdio.c
-@@ -0,0 +1,600 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later
-+/*
-+ * SDIO clock driver for RP1
-+ *
-+ * Copyright (C) 2023 Raspberry Pi Ltd.
-+ */
-+
-+#include <linux/io.h>
-+#include <linux/clk.h>
-+#include <linux/clk-provider.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+
-+// Register    : MODE
-+#define MODE        0x00000000
-+#define MODE_BITS   0x70030000
-+#define MODE_RESET  0x00000000
-+// Field       : MODE_STEPS_PER_CYCLE
-+#define MODE_STEPS_PER_CYCLE_RESET          0x0
-+#define MODE_STEPS_PER_CYCLE_BITS           0x70000000
-+#define MODE_STEPS_PER_CYCLE_MSB            30
-+#define MODE_STEPS_PER_CYCLE_LSB            28
-+#define MODE_STEPS_PER_CYCLE_VALUE_STEPS_20 0x0
-+#define MODE_STEPS_PER_CYCLE_VALUE_STEPS_10 0x1
-+#define MODE_STEPS_PER_CYCLE_VALUE_STEPS_16 0x2
-+#define MODE_STEPS_PER_CYCLE_VALUE_STEPS_8  0x3
-+#define MODE_STEPS_PER_CYCLE_VALUE_STEPS_12 0x4
-+#define MODE_STEPS_PER_CYCLE_VALUE_STEPS_6  0x5
-+#define MODE_STEPS_PER_CYCLE_VALUE_STEPS_5  0x6
-+#define MODE_STEPS_PER_CYCLE_VALUE_STEPS_4  0x7
-+// Field       : MODE_SRC_SEL
-+#define MODE_SRC_SEL_RESET                   0x0
-+#define MODE_SRC_SEL_BITS                    0x00030000
-+#define MODE_SRC_SEL_MSB                     17
-+#define MODE_SRC_SEL_LSB                     16
-+#define MODE_SRC_SEL_VALUE_STOP              0x0
-+#define MODE_SRC_SEL_VALUE_CLK_ALT_SRC       0x1
-+#define MODE_SRC_SEL_VALUE_PLL_SYS_VCO       0x2
-+#define MODE_SRC_SEL_VALUE_PLL_SYS_VCO_AGAIN 0x3
-+// Register    : FROMIP
-+#define FROMIP        0x00000004
-+#define FROMIP_BITS   0x0f9713ff
-+#define FROMIP_RESET  0x00000000
-+// Field       : FROMIP_TUNING_CCLK_SEL
-+#define FROMIP_TUNING_CCLK_SEL_RESET  0x0
-+#define FROMIP_TUNING_CCLK_SEL_BITS   0x0f000000
-+#define FROMIP_TUNING_CCLK_SEL_MSB    27
-+#define FROMIP_TUNING_CCLK_SEL_LSB    24
-+// Field       : FROMIP_TUNING_CCLK_UPDATE
-+#define FROMIP_TUNING_CCLK_UPDATE_RESET  0x0
-+#define FROMIP_TUNING_CCLK_UPDATE_BITS   0x00800000
-+#define FROMIP_TUNING_CCLK_UPDATE_MSB    23
-+#define FROMIP_TUNING_CCLK_UPDATE_LSB    23
-+// Field       : FROMIP_SAMPLE_CCLK_SEL
-+#define FROMIP_SAMPLE_CCLK_SEL_RESET  0x0
-+#define FROMIP_SAMPLE_CCLK_SEL_BITS   0x00100000
-+#define FROMIP_SAMPLE_CCLK_SEL_MSB    20
-+#define FROMIP_SAMPLE_CCLK_SEL_LSB    20
-+// Field       : FROMIP_CLK2CARD_ON
-+#define FROMIP_CLK2CARD_ON_RESET  0x0
-+#define FROMIP_CLK2CARD_ON_BITS   0x00040000
-+#define FROMIP_CLK2CARD_ON_MSB    18
-+#define FROMIP_CLK2CARD_ON_LSB    18
-+// Field       : FROMIP_CARD_CLK_STABLE
-+#define FROMIP_CARD_CLK_STABLE_RESET  0x0
-+#define FROMIP_CARD_CLK_STABLE_BITS   0x00020000
-+#define FROMIP_CARD_CLK_STABLE_MSB    17
-+#define FROMIP_CARD_CLK_STABLE_LSB    17
-+// Field       : FROMIP_CARD_CLK_EN
-+#define FROMIP_CARD_CLK_EN_RESET  0x0
-+#define FROMIP_CARD_CLK_EN_BITS   0x00010000
-+#define FROMIP_CARD_CLK_EN_MSB    16
-+#define FROMIP_CARD_CLK_EN_LSB    16
-+// Field       : FROMIP_CLK_GEN_SEL
-+#define FROMIP_CLK_GEN_SEL_RESET  0x0
-+#define FROMIP_CLK_GEN_SEL_BITS   0x00001000
-+#define FROMIP_CLK_GEN_SEL_MSB    12
-+#define FROMIP_CLK_GEN_SEL_LSB    12
-+// Field       : FROMIP_FREQ_SEL
-+#define FROMIP_FREQ_SEL_RESET  0x000
-+#define FROMIP_FREQ_SEL_BITS   0x000003ff
-+#define FROMIP_FREQ_SEL_MSB    9
-+#define FROMIP_FREQ_SEL_LSB    0
-+// Register    : LOCAL
-+#define LOCAL        0x00000008
-+#define LOCAL_BITS   0x1f9713ff
-+#define LOCAL_RESET  0x00000000
-+// Field       : LOCAL_TUNING_CCLK_SEL
-+#define LOCAL_TUNING_CCLK_SEL_RESET  0x00
-+#define LOCAL_TUNING_CCLK_SEL_BITS   0x1f000000
-+#define LOCAL_TUNING_CCLK_SEL_MSB    28
-+#define LOCAL_TUNING_CCLK_SEL_LSB    24
-+// Field       : LOCAL_TUNING_CCLK_UPDATE
-+#define LOCAL_TUNING_CCLK_UPDATE_RESET  0x0
-+#define LOCAL_TUNING_CCLK_UPDATE_BITS   0x00800000
-+#define LOCAL_TUNING_CCLK_UPDATE_MSB    23
-+#define LOCAL_TUNING_CCLK_UPDATE_LSB    23
-+// Field       : LOCAL_SAMPLE_CCLK_SEL
-+#define LOCAL_SAMPLE_CCLK_SEL_RESET  0x0
-+#define LOCAL_SAMPLE_CCLK_SEL_BITS   0x00100000
-+#define LOCAL_SAMPLE_CCLK_SEL_MSB    20
-+#define LOCAL_SAMPLE_CCLK_SEL_LSB    20
-+// Field       : LOCAL_CLK2CARD_ON
-+#define LOCAL_CLK2CARD_ON_RESET  0x0
-+#define LOCAL_CLK2CARD_ON_BITS   0x00040000
-+#define LOCAL_CLK2CARD_ON_MSB    18
-+#define LOCAL_CLK2CARD_ON_LSB    18
-+// Field       : LOCAL_CARD_CLK_STABLE
-+#define LOCAL_CARD_CLK_STABLE_RESET  0x0
-+#define LOCAL_CARD_CLK_STABLE_BITS   0x00020000
-+#define LOCAL_CARD_CLK_STABLE_MSB    17
-+#define LOCAL_CARD_CLK_STABLE_LSB    17
-+// Field       : LOCAL_CARD_CLK_EN
-+#define LOCAL_CARD_CLK_EN_RESET  0x0
-+#define LOCAL_CARD_CLK_EN_BITS   0x00010000
-+#define LOCAL_CARD_CLK_EN_MSB    16
-+#define LOCAL_CARD_CLK_EN_LSB    16
-+// Field       : LOCAL_CLK_GEN_SEL
-+#define LOCAL_CLK_GEN_SEL_RESET               0x0
-+#define LOCAL_CLK_GEN_SEL_BITS                0x00001000
-+#define LOCAL_CLK_GEN_SEL_MSB                 12
-+#define LOCAL_CLK_GEN_SEL_LSB                 12
-+#define LOCAL_CLK_GEN_SEL_VALUE_PROGCLOCKMODE 0x0
-+#define LOCAL_CLK_GEN_SEL_VALUE_DIVCLOCKMODE  0x1
-+// Field       : LOCAL_FREQ_SEL
-+#define LOCAL_FREQ_SEL_RESET  0x000
-+#define LOCAL_FREQ_SEL_BITS   0x000003ff
-+#define LOCAL_FREQ_SEL_MSB    9
-+#define LOCAL_FREQ_SEL_LSB    0
-+// Register    : USE_LOCAL
-+#define USE_LOCAL        0x0000000c
-+#define USE_LOCAL_BITS   0x01951001
-+#define USE_LOCAL_RESET  0x00000000
-+// Field       : USE_LOCAL_TUNING_CCLK_SEL
-+#define USE_LOCAL_TUNING_CCLK_SEL_RESET  0x0
-+#define USE_LOCAL_TUNING_CCLK_SEL_BITS   0x01000000
-+#define USE_LOCAL_TUNING_CCLK_SEL_MSB    24
-+#define USE_LOCAL_TUNING_CCLK_SEL_LSB    24
-+// Field       : USE_LOCAL_TUNING_CCLK_UPDATE
-+#define USE_LOCAL_TUNING_CCLK_UPDATE_RESET  0x0
-+#define USE_LOCAL_TUNING_CCLK_UPDATE_BITS   0x00800000
-+#define USE_LOCAL_TUNING_CCLK_UPDATE_MSB    23
-+#define USE_LOCAL_TUNING_CCLK_UPDATE_LSB    23
-+// Field       : USE_LOCAL_SAMPLE_CCLK_SEL
-+#define USE_LOCAL_SAMPLE_CCLK_SEL_RESET  0x0
-+#define USE_LOCAL_SAMPLE_CCLK_SEL_BITS   0x00100000
-+#define USE_LOCAL_SAMPLE_CCLK_SEL_MSB    20
-+#define USE_LOCAL_SAMPLE_CCLK_SEL_LSB    20
-+// Field       : USE_LOCAL_CLK2CARD_ON
-+#define USE_LOCAL_CLK2CARD_ON_RESET  0x0
-+#define USE_LOCAL_CLK2CARD_ON_BITS   0x00040000
-+#define USE_LOCAL_CLK2CARD_ON_MSB    18
-+#define USE_LOCAL_CLK2CARD_ON_LSB    18
-+// Field       : USE_LOCAL_CARD_CLK_EN
-+#define USE_LOCAL_CARD_CLK_EN_RESET  0x0
-+#define USE_LOCAL_CARD_CLK_EN_BITS   0x00010000
-+#define USE_LOCAL_CARD_CLK_EN_MSB    16
-+#define USE_LOCAL_CARD_CLK_EN_LSB    16
-+// Field       : USE_LOCAL_CLK_GEN_SEL
-+#define USE_LOCAL_CLK_GEN_SEL_RESET  0x0
-+#define USE_LOCAL_CLK_GEN_SEL_BITS   0x00001000
-+#define USE_LOCAL_CLK_GEN_SEL_MSB    12
-+#define USE_LOCAL_CLK_GEN_SEL_LSB    12
-+// Field       : USE_LOCAL_FREQ_SEL
-+#define USE_LOCAL_FREQ_SEL_RESET  0x0
-+#define USE_LOCAL_FREQ_SEL_BITS   0x00000001
-+#define USE_LOCAL_FREQ_SEL_MSB    0
-+#define USE_LOCAL_FREQ_SEL_LSB    0
-+// Register    : SD_DELAY
-+#define SD_DELAY        0x00000010
-+#define SD_DELAY_BITS   0x0000001f
-+#define SD_DELAY_RESET  0x00000000
-+// Field       : SD_DELAY_STEPS
-+#define SD_DELAY_STEPS_RESET  0x00
-+#define SD_DELAY_STEPS_BITS   0x0000001f
-+#define SD_DELAY_STEPS_MSB    4
-+#define SD_DELAY_STEPS_LSB    0
-+// Register    : RX_DELAY
-+#define RX_DELAY        0x00000014
-+#define RX_DELAY_BITS   0x19f3331f
-+#define RX_DELAY_RESET  0x00000000
-+// Field       : RX_DELAY_BYPASS
-+#define RX_DELAY_BYPASS_RESET  0x0
-+#define RX_DELAY_BYPASS_BITS   0x10000000
-+#define RX_DELAY_BYPASS_MSB    28
-+#define RX_DELAY_BYPASS_LSB    28
-+// Field       : RX_DELAY_FAIL_ACTUAL
-+#define RX_DELAY_FAIL_ACTUAL_RESET  0x0
-+#define RX_DELAY_FAIL_ACTUAL_BITS   0x08000000
-+#define RX_DELAY_FAIL_ACTUAL_MSB    27
-+#define RX_DELAY_FAIL_ACTUAL_LSB    27
-+// Field       : RX_DELAY_ACTUAL
-+#define RX_DELAY_ACTUAL_RESET  0x00
-+#define RX_DELAY_ACTUAL_BITS   0x01f00000
-+#define RX_DELAY_ACTUAL_MSB    24
-+#define RX_DELAY_ACTUAL_LSB    20
-+// Field       : RX_DELAY_OFFSET
-+#define RX_DELAY_OFFSET_RESET  0x0
-+#define RX_DELAY_OFFSET_BITS   0x00030000
-+#define RX_DELAY_OFFSET_MSB    17
-+#define RX_DELAY_OFFSET_LSB    16
-+// Field       : RX_DELAY_OVERFLOW
-+#define RX_DELAY_OVERFLOW_RESET       0x0
-+#define RX_DELAY_OVERFLOW_BITS        0x00003000
-+#define RX_DELAY_OVERFLOW_MSB         13
-+#define RX_DELAY_OVERFLOW_LSB         12
-+#define RX_DELAY_OVERFLOW_VALUE_ALLOW 0x0
-+#define RX_DELAY_OVERFLOW_VALUE_CLAMP 0x1
-+#define RX_DELAY_OVERFLOW_VALUE_FAIL  0x2
-+// Field       : RX_DELAY_MAP
-+#define RX_DELAY_MAP_RESET         0x0
-+#define RX_DELAY_MAP_BITS          0x00000300
-+#define RX_DELAY_MAP_MSB           9
-+#define RX_DELAY_MAP_LSB           8
-+#define RX_DELAY_MAP_VALUE_DIRECT  0x0
-+#define RX_DELAY_MAP_VALUE         0x1
-+#define RX_DELAY_MAP_VALUE_STRETCH 0x2
-+// Field       : RX_DELAY_FIXED
-+#define RX_DELAY_FIXED_RESET  0x00
-+#define RX_DELAY_FIXED_BITS   0x0000001f
-+#define RX_DELAY_FIXED_MSB    4
-+#define RX_DELAY_FIXED_LSB    0
-+// Register    : NDIV
-+#define NDIV        0x00000018
-+#define NDIV_BITS   0x1fff0000
-+#define NDIV_RESET  0x00110000
-+// Field       : NDIV_DIVB
-+#define NDIV_DIVB_RESET  0x001
-+#define NDIV_DIVB_BITS   0x1ff00000
-+#define NDIV_DIVB_MSB    28
-+#define NDIV_DIVB_LSB    20
-+// Field       : NDIV_DIVA
-+#define NDIV_DIVA_RESET  0x1
-+#define NDIV_DIVA_BITS   0x000f0000
-+#define NDIV_DIVA_MSB    19
-+#define NDIV_DIVA_LSB    16
-+// Register    : CS
-+#define CS        0x0000001c
-+#define CS_BITS   0x00111101
-+#define CS_RESET  0x00000001
-+// Field       : CS_RX_DEL_UPDATED
-+#define CS_RX_DEL_UPDATED_RESET  0x0
-+#define CS_RX_DEL_UPDATED_BITS   0x00100000
-+#define CS_RX_DEL_UPDATED_MSB    20
-+#define CS_RX_DEL_UPDATED_LSB    20
-+// Field       : CS_RX_CLK_RUNNING
-+#define CS_RX_CLK_RUNNING_RESET  0x0
-+#define CS_RX_CLK_RUNNING_BITS   0x00010000
-+#define CS_RX_CLK_RUNNING_MSB    16
-+#define CS_RX_CLK_RUNNING_LSB    16
-+// Field       : CS_SD_CLK_RUNNING
-+#define CS_SD_CLK_RUNNING_RESET  0x0
-+#define CS_SD_CLK_RUNNING_BITS   0x00001000
-+#define CS_SD_CLK_RUNNING_MSB    12
-+#define CS_SD_CLK_RUNNING_LSB    12
-+// Field       : CS_TX_CLK_RUNNING
-+#define CS_TX_CLK_RUNNING_RESET  0x0
-+#define CS_TX_CLK_RUNNING_BITS   0x00000100
-+#define CS_TX_CLK_RUNNING_MSB    8
-+#define CS_TX_CLK_RUNNING_LSB    8
-+// Field       : CS_RESET
-+#define CS_RESET_RESET  0x1
-+#define CS_RESET_BITS   0x00000001
-+#define CS_RESET_MSB    0
-+#define CS_RESET_LSB    0
-+
-+#define FPGA_SRC_RATE 400000000
-+
-+/* Base number of steps to delay in relation to tx clk.
-+ * The relationship of the 3 clocks are as follows:
-+ * tx_clk: This clock is provided to the controller. Data is sent out
-+ * to the pads using this clock.
-+ * sd_clk: This clock is sent out to the card.
-+ * rx_clk: This clock is used to sample the data coming back from the card.
-+ * This may need to be several steps ahead of the tx_clk. The default rx delay
-+ * is used as a base delay, and can be further adjusted by the sd host
-+ * controller during the tuning process if using a DDR50 or faster SD card
-+ */
-+/*
-+ * PRJY-1813 - the default SD clock delay needs to be set to ~60% of the total
-+ * number of steps to meet tISU (>6ns) and tIH (>2ns) in high-speed mode.
-+ * On FPGA this means delay SDCLK by 5, and sample RX with a delay of 6.
-+ */
-+#define DEFAULT_RX_DELAY 6
-+#define DEFAULT_SD_DELAY 5
-+
-+struct rp1_sdio_clkgen {
-+	struct device *dev;
-+
-+	/* Source clock. Either PLL VCO or fixed freq on FPGA */
-+	struct clk *src_clk;
-+	/* Desired base frequency. Max freq card can go */
-+	struct clk *base_clk;
-+
-+	struct clk_hw hw;
-+	void __iomem *regs;
-+
-+	/* Starting value of local register before changing freq */
-+	u32 local_base;
-+};
-+
-+static inline void clkgen_write(struct rp1_sdio_clkgen *clkgen, u32 reg, u32 val)
-+{
-+	dev_dbg(clkgen->dev, "%s: write reg 0x%x: 0x%x\n", __func__, reg, val);
-+	writel(val, clkgen->regs + reg);
-+}
-+
-+static inline u32 clkgen_read(struct rp1_sdio_clkgen *clkgen, u32 reg)
-+{
-+	u32 val = readl(clkgen->regs + reg);
-+
-+	dev_dbg(clkgen->dev, "%s: read reg 0x%x: 0x%x\n", __func__, reg, val);
-+	return val;
-+}
-+
-+static int get_steps(unsigned int steps)
-+{
-+	int ret = -1;
-+
-+	if (steps == 4)
-+		ret = MODE_STEPS_PER_CYCLE_VALUE_STEPS_4;
-+	else if (steps == 5)
-+		ret = MODE_STEPS_PER_CYCLE_VALUE_STEPS_5;
-+	else if (steps == 6)
-+		ret = MODE_STEPS_PER_CYCLE_VALUE_STEPS_6;
-+	else if (steps == 8)
-+		ret = MODE_STEPS_PER_CYCLE_VALUE_STEPS_8;
-+	else if (steps == 10)
-+		ret = MODE_STEPS_PER_CYCLE_VALUE_STEPS_10;
-+	else if (steps == 12)
-+		ret = MODE_STEPS_PER_CYCLE_VALUE_STEPS_12;
-+	else if (steps == 16)
-+		ret = MODE_STEPS_PER_CYCLE_VALUE_STEPS_16;
-+	else if (steps == 20)
-+		ret = MODE_STEPS_PER_CYCLE_VALUE_STEPS_20;
-+	return ret;
-+}
-+
-+static int rp1_sdio_clk_init(struct rp1_sdio_clkgen *clkgen)
-+{
-+	unsigned long src_rate = clk_get_rate(clkgen->src_clk);
-+	unsigned long base_rate = clk_get_rate(clkgen->base_clk);
-+	unsigned int steps = src_rate / base_rate;
-+	u32 reg = 0;
-+	int steps_value = 0;
-+
-+	dev_dbg(clkgen->dev, "init: src_rate %lu, base_rate %lu, steps %d\n",
-+		src_rate, base_rate, steps);
-+
-+	/* Assert reset while we set up clkgen */
-+	clkgen_write(clkgen, CS, CS_RESET_BITS);
-+
-+	/* Pick clock source */
-+	if (src_rate == FPGA_SRC_RATE) {
-+		/* Using ALT SRC */
-+		reg |= MODE_SRC_SEL_VALUE_CLK_ALT_SRC << MODE_SRC_SEL_LSB;
-+	} else {
-+		/* Assume we are using PLL SYS VCO */
-+		reg |= MODE_SRC_SEL_VALUE_PLL_SYS_VCO << MODE_SRC_SEL_LSB;
-+	}
-+
-+	/* How many delay steps are available in one cycle for this source */
-+	steps_value = get_steps(steps);
-+	if (steps_value < 0) {
-+		dev_err(clkgen->dev, "Invalid step value: %d\n", steps);
-+		return -EINVAL;
-+	}
-+	reg |= steps_value << MODE_STEPS_PER_CYCLE_LSB;
-+
-+	/* Mode register is done now*/
-+	clkgen_write(clkgen, MODE, reg);
-+
-+	/* Now set delay mode */
-+	/* Clamp value if out of range rx delay is used */
-+	reg = RX_DELAY_OVERFLOW_VALUE_CLAMP << RX_DELAY_OVERFLOW_LSB;
-+	/* SD tuning bus goes from 0x0 to 0xf but we don't necessarily have that
-+	 * many steps available depending on the source so map 0x0 -> 0xf to one
-+	 * cycle of rx delay
-+	 */
-+	reg |= RX_DELAY_MAP_VALUE_STRETCH << RX_DELAY_MAP_LSB;
-+
-+	/* Default RX delay */
-+	dev_dbg(clkgen->dev, "default rx delay %d\n", DEFAULT_RX_DELAY);
-+	reg |= (DEFAULT_RX_DELAY & RX_DELAY_FIXED_BITS) << RX_DELAY_FIXED_LSB;
-+	clkgen_write(clkgen, RX_DELAY, reg);
-+
-+	/* Default SD delay */
-+	dev_dbg(clkgen->dev, "default sd delay %d\n", DEFAULT_SD_DELAY);
-+	reg = (DEFAULT_SD_DELAY & SD_DELAY_STEPS_BITS) << SD_DELAY_STEPS_LSB;
-+	clkgen_write(clkgen, SD_DELAY, reg);
-+
-+	/* We select freq, we turn on tx clock, we turn on sd clk,
-+	 * we pick clock generator mode
-+	 */
-+	reg = USE_LOCAL_FREQ_SEL_BITS | USE_LOCAL_CARD_CLK_EN_BITS |
-+	      USE_LOCAL_CLK2CARD_ON_BITS | USE_LOCAL_CLK_GEN_SEL_BITS;
-+	clkgen_write(clkgen, USE_LOCAL, reg);
-+
-+	/* Deassert reset. Reset bit is only writable bit of CS
-+	 * reg so fine to write a 0.
-+	 */
-+	clkgen_write(clkgen, CS, 0);
-+
-+	return 0;
-+}
-+
-+#define RUNNING	\
-+	(CS_TX_CLK_RUNNING_BITS | CS_RX_CLK_RUNNING_BITS | \
-+	 CS_SD_CLK_RUNNING_BITS)
-+static int rp1_sdio_clk_is_prepared(struct clk_hw *hw)
-+{
-+	struct rp1_sdio_clkgen *clkgen =
-+		container_of(hw, struct rp1_sdio_clkgen, hw);
-+	u32 status;
-+
-+	dev_dbg(clkgen->dev, "is_prepared\n");
-+	status = clkgen_read(clkgen, CS);
-+	return ((status & RUNNING) == RUNNING);
-+}
-+
-+/* Can define an additional divider if an sd card isn't working at full speed */
-+/* #define SLOWDOWN 3 */
-+
-+static unsigned long rp1_sdio_clk_get_rate(struct clk_hw *hw,
-+					   unsigned long parent_rate)
-+{
-+	/* Get the current rate */
-+	struct rp1_sdio_clkgen *clkgen =
-+		container_of(hw, struct rp1_sdio_clkgen, hw);
-+	unsigned long actual_rate = 0;
-+	u32 ndiv_diva;
-+	u32 ndiv_divb;
-+	u32 tmp;
-+	u32 div;
-+
-+	tmp = clkgen_read(clkgen, LOCAL);
-+	if ((tmp & LOCAL_CLK2CARD_ON_BITS) == 0) {
-+		dev_dbg(clkgen->dev, "get_rate 0\n");
-+		return 0;
-+	}
-+
-+	tmp = clkgen_read(clkgen, NDIV);
-+	ndiv_diva = (tmp & NDIV_DIVA_BITS) >> NDIV_DIVA_LSB;
-+	ndiv_divb = (tmp & NDIV_DIVB_BITS) >> NDIV_DIVB_LSB;
-+	div = ndiv_diva * ndiv_divb;
-+	actual_rate = (clk_get_rate(clkgen->base_clk) / div);
-+
-+#ifdef SLOWDOWN
-+	actual_rate *= SLOWDOWN;
-+#endif
-+
-+	dev_dbg(clkgen->dev, "get_rate. ndiv_diva %d, ndiv_divb %d = %lu\n",
-+		ndiv_diva, ndiv_divb, actual_rate);
-+
-+	return actual_rate;
-+}
-+
-+static int rp1_sdio_clk_set_rate(struct clk_hw *hw, unsigned long rate,
-+				 unsigned long parent_rate)
-+{
-+	struct rp1_sdio_clkgen *clkgen =
-+		container_of(hw, struct rp1_sdio_clkgen, hw);
-+	u32 div;
-+	u32 reg;
-+
-+	dev_dbg(clkgen->dev, "set_rate %lu\n", rate);
-+
-+	if (rate == 0) {
-+		/* Keep tx clock running */
-+		clkgen_write(clkgen, LOCAL, LOCAL_CARD_CLK_EN_BITS);
-+		return 0;
-+	}
-+
-+#ifdef SLOWDOWN
-+	rate /= SLOWDOWN;
-+#endif
-+
-+	div = (clk_get_rate(clkgen->base_clk) / rate) - 1;
-+	reg = LOCAL_CLK_GEN_SEL_BITS | LOCAL_CARD_CLK_EN_BITS |
-+	      LOCAL_CLK2CARD_ON_BITS | (div << LOCAL_FREQ_SEL_LSB);
-+	clkgen_write(clkgen, LOCAL, reg);
-+
-+	return 0;
-+}
-+
-+#define MAX_NDIV (256 * 8)
-+static int rp1_sdio_clk_determine_rate(struct clk_hw *hw,
-+				       struct clk_rate_request *req)
-+{
-+	unsigned long rate;
-+	struct rp1_sdio_clkgen *clkgen =
-+		container_of(hw, struct rp1_sdio_clkgen, hw);
-+	unsigned long base_rate = clk_get_rate(clkgen->base_clk);
-+	u32 div;
-+
-+	/* What is the actual rate I can get if I request xyz */
-+	if (req->rate) {
-+		div = min((u32)(base_rate / req->rate), (u32)MAX_NDIV);
-+		rate = base_rate / div;
-+		req->rate = rate;
-+		dev_dbg(clkgen->dev, "determine_rate %lu: %lu / %d = %lu\n",
-+			req->rate, base_rate, div, rate);
-+	} else {
-+		rate = 0;
-+		dev_dbg(clkgen->dev, "determine_rate %lu: %lu\n", req->rate,
-+			rate);
-+	}
-+
-+	return 0;
-+}
-+
-+static const struct clk_ops rp1_sdio_clk_ops = {
-+	.is_prepared    = rp1_sdio_clk_is_prepared,
-+	.recalc_rate    = rp1_sdio_clk_get_rate,
-+	.set_rate       = rp1_sdio_clk_set_rate,
-+	.determine_rate = rp1_sdio_clk_determine_rate,
-+};
-+
-+static int rp1_sdio_clk_probe(struct platform_device *pdev)
-+{
-+	struct device_node *node = pdev->dev.of_node;
-+	struct rp1_sdio_clkgen *clkgen;
-+	void __iomem *regs;
-+	struct clk_init_data init = {};
-+	int ret;
-+
-+	clkgen = devm_kzalloc(&pdev->dev, sizeof(*clkgen), GFP_KERNEL);
-+	if (!clkgen)
-+		return -ENOMEM;
-+	platform_set_drvdata(pdev, clkgen);
-+
-+	clkgen->dev = &pdev->dev;
-+
-+	/* Source freq */
-+	clkgen->src_clk = devm_clk_get(&pdev->dev, "src");
-+	if (IS_ERR(clkgen->src_clk)) {
-+		int err = PTR_ERR(clkgen->src_clk);
-+
-+		dev_err(&pdev->dev, "failed to get src clk: %d\n", err);
-+		return err;
-+	}
-+
-+	/* Desired maximum output freq (i.e. base freq) */
-+	clkgen->base_clk = devm_clk_get(&pdev->dev, "base");
-+	if (IS_ERR(clkgen->base_clk)) {
-+		int err = PTR_ERR(clkgen->base_clk);
-+
-+		dev_err(&pdev->dev, "failed to get base clk: %d\n", err);
-+		return err;
-+	}
-+
-+	regs = devm_platform_ioremap_resource(pdev, 0);
-+	if (IS_ERR(regs))
-+		return PTR_ERR(regs);
-+
-+	init.name = node->name;
-+	init.ops = &rp1_sdio_clk_ops;
-+	init.flags = CLK_GET_RATE_NOCACHE;
-+
-+	clkgen->hw.init = &init;
-+	clkgen->regs = regs;
-+
-+	dev_info(&pdev->dev, "loaded %s\n", init.name);
-+
-+	ret = devm_clk_hw_register(&pdev->dev, &clkgen->hw);
-+	if (ret)
-+		return ret;
-+
-+	ret = of_clk_add_hw_provider(node, of_clk_hw_simple_get, &clkgen->hw);
-+	if (ret)
-+		return ret;
-+
-+	ret = rp1_sdio_clk_init(clkgen);
-+	return ret;
-+}
-+
-+static int rp1_sdio_clk_remove(struct platform_device *pdev)
-+{
-+	return 0;
-+}
-+
-+static const struct of_device_id rp1_sdio_clk_dt_ids[] = {
-+	{ .compatible = "raspberrypi,rp1-sdio-clk", },
-+	{ /* sentinel */ }
-+};
-+MODULE_DEVICE_TABLE(of, rp1_sdio_clk_dt_ids);
-+
-+static struct platform_driver rp1_sdio_clk_driver = {
-+	.probe	= rp1_sdio_clk_probe,
-+	.remove	= rp1_sdio_clk_remove,
-+	.driver	= {
-+		.name		= "rp1-sdio-clk",
-+		.of_match_table	= rp1_sdio_clk_dt_ids,
-+	},
-+};
-+module_platform_driver(rp1_sdio_clk_driver);
-+
-+MODULE_AUTHOR("Liam Fraser <liam@raspberrypi.com>");
-+MODULE_DESCRIPTION("RP1 SDIO clock driver");
-+MODULE_LICENSE("GPL");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0881-i2c-designware-Add-SMBUS-quick-command-support.patch b/target/linux/bcm27xx/patches-6.1/950-0881-i2c-designware-Add-SMBUS-quick-command-support.patch
deleted file mode 100644
index ea3b315501..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0881-i2c-designware-Add-SMBUS-quick-command-support.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 50adadfaf324ed5cbb59ce2b85eda59de4e3801a Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Fri, 4 Dec 2020 15:20:36 +0000
-Subject: [PATCH] i2c: designware: Add SMBUS quick command support
-
-The SMBUS emulation code turns an SMBUS quick command into a zero-
-length read. This controller can't do zero length accesses, but it
-can do quick commands, so reverse the emulation. The alternative
-would be to properly implement the SMBUS support but that is a lot
-more work, and unnecessary just to get i2cdetect working.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/i2c/busses/i2c-designware-core.h   |  2 ++
- drivers/i2c/busses/i2c-designware-master.c | 17 +++++++++++++++--
- 2 files changed, 17 insertions(+), 2 deletions(-)
-
---- a/drivers/i2c/busses/i2c-designware-core.h
-+++ b/drivers/i2c/busses/i2c-designware-core.h
-@@ -117,7 +117,9 @@
- 
- #define DW_IC_ERR_TX_ABRT	0x1
- 
-+#define DW_IC_TAR_SPECIAL		BIT(11)
- #define DW_IC_TAR_10BITADDR_MASTER	BIT(12)
-+#define DW_IC_TAR_SMBUS_QUICK_CMD	BIT(16)
- 
- #define DW_IC_COMP_PARAM_1_SPEED_MODE_HIGH	(BIT(2) | BIT(3))
- #define DW_IC_COMP_PARAM_1_SPEED_MODE_MASK	GENMASK(3, 2)
---- a/drivers/i2c/busses/i2c-designware-master.c
-+++ b/drivers/i2c/busses/i2c-designware-master.c
-@@ -228,6 +228,10 @@ static void i2c_dw_xfer_init(struct dw_i
- 		ic_tar = DW_IC_TAR_10BITADDR_MASTER;
- 	}
- 
-+	/* Convert a zero-length read into an SMBUS quick command */
-+	if (!msgs[dev->msg_write_idx].len)
-+		ic_tar = DW_IC_TAR_SPECIAL | DW_IC_TAR_SMBUS_QUICK_CMD;
-+
- 	regmap_update_bits(dev->map, DW_IC_CON, DW_IC_CON_10BITADDR_MASTER,
- 			   ic_con);
- 
-@@ -409,6 +413,14 @@ i2c_dw_xfer_msg(struct dw_i2c_dev *dev)
- 		regmap_read(dev->map, DW_IC_RXFLR, &flr);
- 		rx_limit = dev->rx_fifo_depth - flr;
- 
-+		/* Handle SMBUS quick commands */
-+		if (!buf_len) {
-+			if (msgs[dev->msg_write_idx].flags & I2C_M_RD)
-+				regmap_write(dev->map, DW_IC_DATA_CMD, 0x300);
-+			else
-+				regmap_write(dev->map, DW_IC_DATA_CMD, 0x200);
-+		}
-+
- 		while (buf_len > 0 && tx_limit > 0 && rx_limit > 0) {
- 			u32 cmd = 0;
- 
-@@ -673,7 +685,7 @@ static const struct i2c_algorithm i2c_dw
- };
- 
- static const struct i2c_adapter_quirks i2c_dw_quirks = {
--	.flags = I2C_AQ_NO_ZERO_LEN,
-+	.flags = 0,
- };
- 
- static u32 i2c_dw_read_clear_intrbits(struct dw_i2c_dev *dev)
-@@ -813,7 +825,8 @@ void i2c_dw_configure_master(struct dw_i
- {
- 	struct i2c_timings *t = &dev->timings;
- 
--	dev->functionality = I2C_FUNC_10BIT_ADDR | DW_IC_DEFAULT_FUNCTIONALITY;
-+	dev->functionality = I2C_FUNC_10BIT_ADDR | I2C_FUNC_SMBUS_QUICK |
-+			     DW_IC_DEFAULT_FUNCTIONALITY;
- 
- 	dev->master_cfg = DW_IC_CON_MASTER | DW_IC_CON_SLAVE_DISABLE |
- 			  DW_IC_CON_RESTART_EN;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0882-dmaengine-dw-axi-dmac-Fixes-for-RP1.patch b/target/linux/bcm27xx/patches-6.1/950-0882-dmaengine-dw-axi-dmac-Fixes-for-RP1.patch
deleted file mode 100644
index fff6cfdeb4..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0882-dmaengine-dw-axi-dmac-Fixes-for-RP1.patch
+++ /dev/null
@@ -1,355 +0,0 @@
-From 0a1cd70189daec3baf4b4a233dd8e25ffbb9d512 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 28 Apr 2021 17:46:01 +0100
-Subject: [PATCH] dmaengine: dw-axi-dmac: Fixes for RP1
-
-Don't assume that DMA addresses of devices are the same as their
-physical addresses - convert correctly.
-
-The CFG2 register layout is used when there are more than 8 channels,
-but also when configured for more than 16 target peripheral devices
-because the index of the handshake signal has to be made wider.
-
-Reset the DMAC on probe
-
-The driver goes to the trouble of tracking when transfers have been
-paused, but then doesn't report that state when queried.
-
-Not having APB registers is not an error - for most use cases it's
-not even of interest, it's expected. Demote the message to debug level,
-which is disabled by default.
-
-Each channel has a descriptor pool, which is shared between transfers.
-It is unsafe to treat the total number of descriptors allocated from a
-pool as the number allocated to a specific transfer; doing so leads
-to releasing buffers that shouldn't be released and walking off the
-ends of descriptor lists. Instead, give each transfer descriptor its
-own count.
-
-Support partial transfers:
-Some use cases involve streaming from a device where the transfer only
-proceeds when the device's FIFO occupancy exceeds a certain threshold.
-In such cases (e.g. when pulling data from a UART) it is important to
-know how much data has been transferred so far, in order that remaining
-bytes can be read from the FIFO directly by software.
-
-Add the necessary code to provide this "residue" value with a finer,
-sub-transfer granularity.
-
-In order to prevent the occasional byte getting stuck in the DMA
-controller's internal buffers, restrict the destination memory width
-to the source register width.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- .../dma/dw-axi-dmac/dw-axi-dmac-platform.c    | 136 +++++++++++++++---
- drivers/dma/dw-axi-dmac/dw-axi-dmac.h         |   3 +
- 2 files changed, 118 insertions(+), 21 deletions(-)
-
---- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
-+++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
-@@ -12,6 +12,7 @@
- #include <linux/device.h>
- #include <linux/dmaengine.h>
- #include <linux/dmapool.h>
-+#include <linux/dma-direct.h>
- #include <linux/dma-mapping.h>
- #include <linux/err.h>
- #include <linux/interrupt.h>
-@@ -79,6 +80,17 @@ axi_chan_iowrite64(struct axi_dma_chan *
- 	iowrite32(upper_32_bits(val), chan->chan_regs + reg + 4);
- }
- 
-+static inline u64
-+axi_chan_ioread64(struct axi_dma_chan *chan, u32 reg)
-+{
-+	/*
-+	 * We split one 64 bit read into two 32 bit reads as some HW doesn't
-+	 * support 64 bit access.
-+	 */
-+	return ((u64)ioread32(chan->chan_regs + reg + 4) << 32) +
-+		ioread32(chan->chan_regs + reg);
-+}
-+
- static inline void axi_chan_config_write(struct axi_dma_chan *chan,
- 					 struct axi_dma_chan_config *config)
- {
-@@ -86,7 +98,7 @@ static inline void axi_chan_config_write
- 
- 	cfg_lo = (config->dst_multblk_type << CH_CFG_L_DST_MULTBLK_TYPE_POS |
- 		  config->src_multblk_type << CH_CFG_L_SRC_MULTBLK_TYPE_POS);
--	if (chan->chip->dw->hdata->reg_map_8_channels) {
-+	if (!chan->chip->dw->hdata->reg_map_cfg2) {
- 		cfg_hi = config->tt_fc << CH_CFG_H_TT_FC_POS |
- 			 config->hs_sel_src << CH_CFG_H_HS_SEL_SRC_POS |
- 			 config->hs_sel_dst << CH_CFG_H_HS_SEL_DST_POS |
-@@ -214,7 +226,18 @@ static void axi_dma_hw_init(struct axi_d
- {
- 	int ret;
- 	u32 i;
-+	int retries = 1000;
- 
-+	axi_dma_iowrite32(chip, DMAC_RESET, 1);
-+	while (axi_dma_ioread32(chip, DMAC_RESET)) {
-+		retries--;
-+		if (!retries) {
-+			dev_err(chip->dev, "%s: DMAC failed to reset\n",
-+				__func__);
-+			return;
-+		}
-+		cpu_relax();
-+	}
- 	for (i = 0; i < chip->dw->hdata->nr_channels; i++) {
- 		axi_chan_irq_disable(&chip->dw->chan[i], DWAXIDMAC_IRQ_ALL);
- 		axi_chan_disable(&chip->dw->chan[i]);
-@@ -276,7 +299,7 @@ static struct axi_dma_lli *axi_desc_get(
- static void axi_desc_put(struct axi_dma_desc *desc)
- {
- 	struct axi_dma_chan *chan = desc->chan;
--	int count = atomic_read(&chan->descs_allocated);
-+	u32 count = desc->hw_desc_count;
- 	struct axi_dma_hw_desc *hw_desc;
- 	int descs_put;
- 
-@@ -298,6 +321,48 @@ static void vchan_desc_put(struct virt_d
- 	axi_desc_put(vd_to_axi_desc(vdesc));
- }
- 
-+static u32 axi_dma_desc_src_pos(struct axi_dma_desc *desc, dma_addr_t addr)
-+{
-+	unsigned int idx = 0;
-+	u32 pos = 0;
-+
-+	while (pos < desc->length) {
-+		struct axi_dma_hw_desc *hw_desc = &desc->hw_desc[idx++];
-+		u32 len = hw_desc->len;
-+		dma_addr_t start = le64_to_cpu(hw_desc->lli->sar);
-+
-+		if (addr >= start && addr <= (start + len)) {
-+			pos += addr - start;
-+			break;
-+		}
-+
-+		pos += len;
-+	}
-+
-+	return pos;
-+}
-+
-+static u32 axi_dma_desc_dst_pos(struct axi_dma_desc *desc, dma_addr_t addr)
-+{
-+	unsigned int idx = 0;
-+	u32 pos = 0;
-+
-+	while (pos < desc->length) {
-+		struct axi_dma_hw_desc *hw_desc = &desc->hw_desc[idx++];
-+		u32 len = hw_desc->len;
-+		dma_addr_t start = le64_to_cpu(hw_desc->lli->dar);
-+
-+		if (addr >= start && addr <= (start + len)) {
-+			pos += addr - start;
-+			break;
-+		}
-+
-+		pos += len;
-+	}
-+
-+	return pos;
-+}
-+
- static enum dma_status
- dma_chan_tx_status(struct dma_chan *dchan, dma_cookie_t cookie,
- 		  struct dma_tx_state *txstate)
-@@ -307,10 +372,7 @@ dma_chan_tx_status(struct dma_chan *dcha
- 	enum dma_status status;
- 	u32 completed_length;
- 	unsigned long flags;
--	u32 completed_blocks;
- 	size_t bytes = 0;
--	u32 length;
--	u32 len;
- 
- 	status = dma_cookie_status(dchan, cookie, txstate);
- 	if (status == DMA_COMPLETE || !txstate)
-@@ -319,16 +381,31 @@ dma_chan_tx_status(struct dma_chan *dcha
- 	spin_lock_irqsave(&chan->vc.lock, flags);
- 
- 	vdesc = vchan_find_desc(&chan->vc, cookie);
--	if (vdesc) {
--		length = vd_to_axi_desc(vdesc)->length;
--		completed_blocks = vd_to_axi_desc(vdesc)->completed_blocks;
--		len = vd_to_axi_desc(vdesc)->hw_desc[0].len;
--		completed_length = completed_blocks * len;
--		bytes = length - completed_length;
-+	if (vdesc && vdesc == vchan_next_desc(&chan->vc)) {
-+		/* This descriptor is in-progress */
-+		struct axi_dma_desc *desc = vd_to_axi_desc(vdesc);
-+		dma_addr_t addr;
-+
-+		if (chan->direction == DMA_MEM_TO_DEV) {
-+			addr = axi_chan_ioread64(chan, CH_SAR);
-+			completed_length = axi_dma_desc_src_pos(desc, addr);
-+		} else if (chan->direction == DMA_DEV_TO_MEM) {
-+			addr = axi_chan_ioread64(chan, CH_DAR);
-+			completed_length = axi_dma_desc_dst_pos(desc, addr);
-+		} else {
-+			completed_length = 0;
-+		}
-+		bytes = desc->length - completed_length;
-+	} else if (vdesc) {
-+		/* Still in the queue so not started */
-+		bytes = vd_to_axi_desc(vdesc)->length;
- 	}
- 
--	spin_unlock_irqrestore(&chan->vc.lock, flags);
-+	if (chan->is_paused && status == DMA_IN_PROGRESS)
-+		status = DMA_PAUSED;
-+
- 	dma_set_residue(txstate, bytes);
-+	spin_unlock_irqrestore(&chan->vc.lock, flags);
- 
- 	return status;
- }
-@@ -516,7 +593,7 @@ static void dw_axi_dma_set_hw_channel(st
- 	unsigned long reg_value, val;
- 
- 	if (!chip->apb_regs) {
--		dev_err(chip->dev, "apb_regs not initialized\n");
-+		dev_dbg(chip->dev, "apb_regs not initialized\n");
- 		return;
- 	}
- 
-@@ -620,18 +697,25 @@ static int dw_axi_dma_set_hw_desc(struct
- 	switch (chan->direction) {
- 	case DMA_MEM_TO_DEV:
- 		reg_width = __ffs(chan->config.dst_addr_width);
--		device_addr = chan->config.dst_addr;
-+		device_addr = phys_to_dma(chan->chip->dev, chan->config.dst_addr);
- 		ctllo = reg_width << CH_CTL_L_DST_WIDTH_POS |
- 			mem_width << CH_CTL_L_SRC_WIDTH_POS |
-+			DWAXIDMAC_BURST_TRANS_LEN_1 << CH_CTL_L_DST_MSIZE_POS |
-+			DWAXIDMAC_BURST_TRANS_LEN_4 << CH_CTL_L_SRC_MSIZE_POS |
- 			DWAXIDMAC_CH_CTL_L_NOINC << CH_CTL_L_DST_INC_POS |
- 			DWAXIDMAC_CH_CTL_L_INC << CH_CTL_L_SRC_INC_POS;
- 		block_ts = len >> mem_width;
- 		break;
- 	case DMA_DEV_TO_MEM:
- 		reg_width = __ffs(chan->config.src_addr_width);
--		device_addr = chan->config.src_addr;
-+		/* Prevent partial access units getting lost */
-+		if (mem_width > reg_width)
-+			mem_width = reg_width;
-+		device_addr = phys_to_dma(chan->chip->dev, chan->config.src_addr);
- 		ctllo = reg_width << CH_CTL_L_SRC_WIDTH_POS |
- 			mem_width << CH_CTL_L_DST_WIDTH_POS |
-+			DWAXIDMAC_BURST_TRANS_LEN_4 << CH_CTL_L_DST_MSIZE_POS |
-+			DWAXIDMAC_BURST_TRANS_LEN_1 << CH_CTL_L_SRC_MSIZE_POS |
- 			DWAXIDMAC_CH_CTL_L_INC << CH_CTL_L_DST_INC_POS |
- 			DWAXIDMAC_CH_CTL_L_NOINC << CH_CTL_L_SRC_INC_POS;
- 		block_ts = len >> reg_width;
-@@ -667,9 +751,6 @@ static int dw_axi_dma_set_hw_desc(struct
- 	}
- 
- 	hw_desc->lli->block_ts_lo = cpu_to_le32(block_ts - 1);
--
--	ctllo |= DWAXIDMAC_BURST_TRANS_LEN_4 << CH_CTL_L_DST_MSIZE_POS |
--		 DWAXIDMAC_BURST_TRANS_LEN_4 << CH_CTL_L_SRC_MSIZE_POS;
- 	hw_desc->lli->ctl_lo = cpu_to_le32(ctllo);
- 
- 	set_desc_src_master(hw_desc);
-@@ -764,6 +845,8 @@ dw_axi_dma_chan_prep_cyclic(struct dma_c
- 		src_addr += segment_len;
- 	}
- 
-+	desc->hw_desc_count = total_segments;
-+
- 	llp = desc->hw_desc[0].llp;
- 
- 	/* Managed transfer list */
-@@ -843,6 +926,8 @@ dw_axi_dma_chan_prep_slave_sg(struct dma
- 		} while (len >= segment_len);
- 	}
- 
-+	desc->hw_desc_count = loop;
-+
- 	/* Set end-of-link to the last link descriptor of list */
- 	set_desc_last(&desc->hw_desc[num_sgs - 1]);
- 
-@@ -950,6 +1035,8 @@ dma_chan_prep_dma_memcpy(struct dma_chan
- 		num++;
- 	}
- 
-+	desc->hw_desc_count = num;
-+
- 	/* Set end-of-link to the last link descriptor of list */
- 	set_desc_last(&desc->hw_desc[num - 1]);
- 	/* Managed transfer list */
-@@ -998,7 +1085,7 @@ static void axi_chan_dump_lli(struct axi
- static void axi_chan_list_dump_lli(struct axi_dma_chan *chan,
- 				   struct axi_dma_desc *desc_head)
- {
--	int count = atomic_read(&chan->descs_allocated);
-+	u32 count = desc_head->hw_desc_count;
- 	int i;
- 
- 	for (i = 0; i < count; i++)
-@@ -1041,11 +1128,11 @@ out:
- 
- static void axi_chan_block_xfer_complete(struct axi_dma_chan *chan)
- {
--	int count = atomic_read(&chan->descs_allocated);
- 	struct axi_dma_hw_desc *hw_desc;
- 	struct axi_dma_desc *desc;
- 	struct virt_dma_desc *vd;
- 	unsigned long flags;
-+	u32 count;
- 	u64 llp;
- 	int i;
- 
-@@ -1067,6 +1154,7 @@ static void axi_chan_block_xfer_complete
- 	if (chan->cyclic) {
- 		desc = vd_to_axi_desc(vd);
- 		if (desc) {
-+			count = desc->hw_desc_count;
- 			llp = lo_hi_readq(chan->chan_regs + CH_LLP);
- 			for (i = 0; i < count; i++) {
- 				hw_desc = &desc->hw_desc[i];
-@@ -1310,6 +1398,8 @@ static int parse_device_properties(struc
- 	chip->dw->hdata->nr_channels = tmp;
- 	if (tmp <= DMA_REG_MAP_CH_REF)
- 		chip->dw->hdata->reg_map_8_channels = true;
-+	else
-+		chip->dw->hdata->reg_map_cfg2 = true;
- 
- 	ret = device_property_read_u32(dev, "snps,dma-masters", &tmp);
- 	if (ret)
-@@ -1319,6 +1409,10 @@ static int parse_device_properties(struc
- 
- 	chip->dw->hdata->nr_masters = tmp;
- 
-+	ret = device_property_read_u32(dev, "snps,dma-targets", &tmp);
-+	if (!ret && tmp > 16)
-+		chip->dw->hdata->reg_map_cfg2 = true;
-+
- 	ret = device_property_read_u32(dev, "snps,data-width", &tmp);
- 	if (ret)
- 		return ret;
---- a/drivers/dma/dw-axi-dmac/dw-axi-dmac.h
-+++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac.h
-@@ -32,6 +32,8 @@ struct dw_axi_dma_hcfg {
- 	u32	axi_rw_burst_len;
- 	/* Register map for DMAX_NUM_CHANNELS <= 8 */
- 	bool	reg_map_8_channels;
-+	/* Register map for DMAX_NUM_CHANNELS > 8 || DMAX_NUM_HS_IF > 16*/
-+	bool	reg_map_cfg2;
- 	bool	restrict_axi_burst_len;
- };
- 
-@@ -100,6 +102,7 @@ struct axi_dma_desc {
- 
- 	struct virt_dma_desc		vd;
- 	struct axi_dma_chan		*chan;
-+	u32				hw_desc_count;
- 	u32				completed_blocks;
- 	u32				length;
- 	u32				period_len;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0883-spi-dw-Handle-combined-tx-and-rx-messages.patch b/target/linux/bcm27xx/patches-6.1/950-0883-spi-dw-Handle-combined-tx-and-rx-messages.patch
deleted file mode 100644
index 68eca7961f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0883-spi-dw-Handle-combined-tx-and-rx-messages.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 8a9c0607ce0daa91c48faefd70ea73bda54ed0ae Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 29 Nov 2022 10:09:54 +0000
-Subject: [PATCH] spi: dw: Handle combined tx and rx messages
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/spi/spi-dw-core.c | 12 +++++++++---
- drivers/spi/spi-dw-mmio.c |  8 ++++++--
- 2 files changed, 15 insertions(+), 5 deletions(-)
-
---- a/drivers/spi/spi-dw-core.c
-+++ b/drivers/spi/spi-dw-core.c
-@@ -244,8 +244,11 @@ static irqreturn_t dw_spi_transfer_handl
- 	 */
- 	if (irq_status & DW_SPI_INT_TXEI) {
- 		dw_writer(dws);
--		if (!dws->tx_len)
-+		if (!dws->tx_len) {
- 			dw_spi_mask_intr(dws, DW_SPI_INT_TXEI);
-+			if (!dws->rx_len)
-+				spi_finalize_current_transfer(dws->master);
-+		}
- 	}
- 
- 	return IRQ_HANDLED;
-@@ -372,8 +375,11 @@ static void dw_spi_irq_setup(struct dw_s
- 
- 	dws->transfer_handler = dw_spi_transfer_handler;
- 
--	imask = DW_SPI_INT_TXEI | DW_SPI_INT_TXOI |
--		DW_SPI_INT_RXUI | DW_SPI_INT_RXOI | DW_SPI_INT_RXFI;
-+	imask = 0;
-+	if (dws->tx_len)
-+		imask |= DW_SPI_INT_TXEI | DW_SPI_INT_TXOI;
-+	if (dws->rx_len)
-+		imask |= DW_SPI_INT_RXUI | DW_SPI_INT_RXOI | DW_SPI_INT_RXFI;
- 	dw_spi_umask_intr(dws, imask);
- }
- 
---- a/drivers/spi/spi-dw-mmio.c
-+++ b/drivers/spi/spi-dw-mmio.c
-@@ -20,6 +20,7 @@
- #include <linux/property.h>
- #include <linux/regmap.h>
- #include <linux/reset.h>
-+#include <linux/interrupt.h>
- 
- #include "spi-dw.h"
- 
-@@ -280,8 +281,11 @@ static int dw_spi_mmio_probe(struct plat
- 	dws->paddr = mem->start;
- 
- 	dws->irq = platform_get_irq(pdev, 0);
--	if (dws->irq < 0)
--		return dws->irq; /* -ENXIO */
-+	if (dws->irq < 0) {
-+		if (dws->irq != -ENXIO)
-+			return dws->irq; /* -ENXIO */
-+		dws->irq = IRQ_NOTCONNECTED;
-+	}
- 
- 	dwsmmio->clk = devm_clk_get(&pdev->dev, NULL);
- 	if (IS_ERR(dwsmmio->clk))
diff --git a/target/linux/bcm27xx/patches-6.1/950-0884-pwm-Add-support-for-RP1-PWM.patch b/target/linux/bcm27xx/patches-6.1/950-0884-pwm-Add-support-for-RP1-PWM.patch
deleted file mode 100644
index 241d6c49db..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0884-pwm-Add-support-for-RP1-PWM.patch
+++ /dev/null
@@ -1,292 +0,0 @@
-From 824f18efc8ad59e2783570ae2df83e2cd16b9f04 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 14 Feb 2023 14:03:54 +0000
-Subject: [PATCH] pwm: Add support for RP1 PWM
-
-Add a driver for the RP1 PWM block.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- .../devicetree/bindings/pwm/pwm-rp1.yaml      |  38 ++++
- drivers/pwm/Kconfig                           |   9 +
- drivers/pwm/Makefile                          |   1 +
- drivers/pwm/pwm-rp1.c                         | 203 ++++++++++++++++++
- 4 files changed, 251 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/pwm/pwm-rp1.yaml
- create mode 100644 drivers/pwm/pwm-rp1.c
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/pwm/pwm-rp1.yaml
-@@ -0,0 +1,38 @@
-+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
-+%YAML 1.2
-+---
-+$id: http://devicetree.org/schemas/pwm/pwm-rp1.yaml#
-+$schema: http://devicetree.org/meta-schemas/core.yaml#
-+
-+title: Raspberry Pi RP1 PWM controller
-+
-+maintainers:
-+  - Naushir Patuck <naush@raspberrypi.com>
-+
-+properties:
-+  compatible:
-+    enum:
-+      - raspberrypi,rp1-pwm
-+
-+  reg:
-+    maxItems: 1
-+
-+  "#pwm-cells":
-+    const: 3
-+
-+required:
-+  - compatible
-+  - reg
-+  - clocks
-+  - "#pwm-cells"
-+
-+additionalProperties: false
-+
-+examples:
-+  - |
-+    pwm0: pwm@98000 {
-+      compatible = "raspberrypi,rp1-pwm";
-+      reg = <0x0 0x98000  0x0 0x100>;
-+      clocks = <&rp1_sys>;
-+      #pwm-cells = <3>;
-+    };
---- a/drivers/pwm/Kconfig
-+++ b/drivers/pwm/Kconfig
-@@ -451,6 +451,15 @@ config PWM_RASPBERRYPI_POE
- 	  Enable Raspberry Pi firmware controller PWM bus used to control the
- 	  official RPI PoE hat
- 
-+config PWM_RP1
-+	tristate "RP1 PWM support"
-+	depends on ARCH_BCM2835 || COMPILE_TEST
-+	help
-+	  PWM framework driver for Raspberry Pi RP1 controller
-+
-+	  To compile this driver as a module, choose M here: the module
-+	  will be called pwm-rp1.
-+
- config PWM_RCAR
- 	tristate "Renesas R-Car PWM support"
- 	depends on ARCH_RENESAS || COMPILE_TEST
---- a/drivers/pwm/Makefile
-+++ b/drivers/pwm/Makefile
-@@ -41,6 +41,7 @@ obj-$(CONFIG_PWM_OMAP_DMTIMER)	+= pwm-om
- obj-$(CONFIG_PWM_PCA9685)	+= pwm-pca9685.o
- obj-$(CONFIG_PWM_PXA)		+= pwm-pxa.o
- obj-$(CONFIG_PWM_RASPBERRYPI_POE)	+= pwm-raspberrypi-poe.o
-+obj-$(CONFIG_PWM_RP1)		+= pwm-rp1.o
- obj-$(CONFIG_PWM_RCAR)		+= pwm-rcar.o
- obj-$(CONFIG_PWM_RENESAS_TPU)	+= pwm-renesas-tpu.o
- obj-$(CONFIG_PWM_ROCKCHIP)	+= pwm-rockchip.o
---- /dev/null
-+++ b/drivers/pwm/pwm-rp1.c
-@@ -0,0 +1,203 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * pwm-rp1.c
-+ *
-+ * Raspberry Pi RP1 PWM.
-+ *
-+ * Copyright © 2023 Raspberry Pi Ltd.
-+ *
-+ * Author: Naushir Patuck (naush@raspberrypi.com)
-+ *
-+ * Based on the pwm-bcm2835 driver by:
-+ * Bart Tanghe <bart.tanghe@thomasmore.be>
-+ */
-+
-+#include <linux/bitops.h>
-+#include <linux/clk.h>
-+#include <linux/err.h>
-+#include <linux/io.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/platform_device.h>
-+#include <linux/pwm.h>
-+
-+#define PWM_GLOBAL_CTRL		0x000
-+#define PWM_CHANNEL_CTRL(x)	(0x014 + ((x) * 16))
-+#define PWM_RANGE(x)		(0x018 + ((x) * 16))
-+#define PWM_DUTY(x)		(0x020 + ((x) * 16))
-+
-+/* 8:FIFO_POP_MASK + 0:Trailing edge M/S modulation */
-+#define PWM_CHANNEL_DEFAULT	(BIT(8) + BIT(0))
-+#define PWM_CHANNEL_ENABLE(x)	BIT(x)
-+#define PWM_POLARITY		BIT(3)
-+#define SET_UPDATE		BIT(31)
-+#define PWM_MODE_MASK		GENMASK(1, 0)
-+
-+struct rp1_pwm {
-+	struct pwm_chip chip;
-+	struct device *dev;
-+	void __iomem *base;
-+	struct clk *clk;
-+};
-+
-+static inline struct rp1_pwm *to_rp1_pwm(struct pwm_chip *chip)
-+{
-+	return container_of(chip, struct rp1_pwm, chip);
-+}
-+
-+static void rp1_pwm_apply_config(struct pwm_chip *chip, struct pwm_device *pwm)
-+{
-+	struct rp1_pwm *pc = to_rp1_pwm(chip);
-+	u32 value;
-+
-+	value = readl(pc->base + PWM_GLOBAL_CTRL);
-+	value |= SET_UPDATE;
-+	writel(value, pc->base + PWM_GLOBAL_CTRL);
-+}
-+
-+static int rp1_pwm_request(struct pwm_chip *chip, struct pwm_device *pwm)
-+{
-+	struct rp1_pwm *pc = to_rp1_pwm(chip);
-+
-+	writel(PWM_CHANNEL_DEFAULT, pc->base + PWM_CHANNEL_CTRL(pwm->hwpwm));
-+	return 0;
-+}
-+
-+static void rp1_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm)
-+{
-+	struct rp1_pwm *pc = to_rp1_pwm(chip);
-+	u32 value;
-+
-+	value = readl(pc->base + PWM_CHANNEL_CTRL(pwm->hwpwm));
-+	value &= ~PWM_MODE_MASK;
-+	writel(value, pc->base + PWM_CHANNEL_CTRL(pwm->hwpwm));
-+	rp1_pwm_apply_config(chip, pwm);
-+}
-+
-+static int rp1_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
-+			 const struct pwm_state *state)
-+{
-+	struct rp1_pwm *pc = to_rp1_pwm(chip);
-+	unsigned long clk_rate = clk_get_rate(pc->clk);
-+	unsigned long clk_period;
-+	u32 value;
-+
-+	if (!clk_rate) {
-+		dev_err(pc->dev, "failed to get clock rate\n");
-+		return -EINVAL;
-+	}
-+
-+	/* set period */
-+	clk_period = DIV_ROUND_CLOSEST(NSEC_PER_SEC, clk_rate);
-+
-+	writel(DIV_ROUND_CLOSEST(state->duty_cycle, clk_period),
-+	       pc->base + PWM_DUTY(pwm->hwpwm));
-+
-+	/* set duty cycle */
-+	writel(DIV_ROUND_CLOSEST(state->period, clk_period),
-+	       pc->base + PWM_RANGE(pwm->hwpwm));
-+
-+	/* set polarity */
-+	value = readl(pc->base + PWM_CHANNEL_CTRL(pwm->hwpwm));
-+	if (state->polarity == PWM_POLARITY_NORMAL)
-+		value &= ~PWM_POLARITY;
-+	else
-+		value |= PWM_POLARITY;
-+	writel(value, pc->base + PWM_CHANNEL_CTRL(pwm->hwpwm));
-+
-+	/* enable/disable */
-+	value = readl(pc->base + PWM_GLOBAL_CTRL);
-+	if (state->enabled)
-+		value |= PWM_CHANNEL_ENABLE(pwm->hwpwm);
-+	else
-+		value &= ~PWM_CHANNEL_ENABLE(pwm->hwpwm);
-+	writel(value, pc->base + PWM_GLOBAL_CTRL);
-+
-+	rp1_pwm_apply_config(chip, pwm);
-+
-+	return 0;
-+}
-+
-+static const struct pwm_ops rp1_pwm_ops = {
-+	.request = rp1_pwm_request,
-+	.free = rp1_pwm_free,
-+	.apply = rp1_pwm_apply,
-+	.owner = THIS_MODULE,
-+};
-+
-+static int rp1_pwm_probe(struct platform_device *pdev)
-+{
-+	struct rp1_pwm *pc;
-+	struct resource *res;
-+	int ret;
-+
-+	pc = devm_kzalloc(&pdev->dev, sizeof(*pc), GFP_KERNEL);
-+	if (!pc)
-+		return -ENOMEM;
-+
-+	pc->dev = &pdev->dev;
-+
-+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	pc->base = devm_ioremap_resource(&pdev->dev, res);
-+	if (IS_ERR(pc->base))
-+		return PTR_ERR(pc->base);
-+
-+	pc->clk = devm_clk_get(&pdev->dev, NULL);
-+	if (IS_ERR(pc->clk))
-+		return dev_err_probe(&pdev->dev, PTR_ERR(pc->clk),
-+				     "clock not found\n");
-+
-+	ret = clk_prepare_enable(pc->clk);
-+	if (ret)
-+		return ret;
-+
-+	pc->chip.dev = &pdev->dev;
-+	pc->chip.ops = &rp1_pwm_ops;
-+	pc->chip.base = -1;
-+	pc->chip.npwm = 4;
-+	pc->chip.of_xlate = of_pwm_xlate_with_flags;
-+	pc->chip.of_pwm_n_cells = 3;
-+
-+	platform_set_drvdata(pdev, pc);
-+
-+	ret = pwmchip_add(&pc->chip);
-+	if (ret < 0)
-+		goto add_fail;
-+
-+	return 0;
-+
-+add_fail:
-+	clk_disable_unprepare(pc->clk);
-+	return ret;
-+}
-+
-+static int rp1_pwm_remove(struct platform_device *pdev)
-+{
-+	struct rp1_pwm *pc = platform_get_drvdata(pdev);
-+
-+	clk_disable_unprepare(pc->clk);
-+
-+	pwmchip_remove(&pc->chip);
-+
-+	return 0;
-+}
-+
-+static const struct of_device_id rp1_pwm_of_match[] = {
-+	{ .compatible = "raspberrypi,rp1-pwm" },
-+	{ /* sentinel */ }
-+};
-+MODULE_DEVICE_TABLE(of, rp1_pwm_of_match);
-+
-+static struct platform_driver rp1_pwm_driver = {
-+	.driver = {
-+		.name = "rpi-pwm",
-+		.of_match_table = rp1_pwm_of_match,
-+	},
-+	.probe = rp1_pwm_probe,
-+	.remove = rp1_pwm_remove,
-+};
-+module_platform_driver(rp1_pwm_driver);
-+
-+MODULE_AUTHOR("Naushir Patuck <naush@raspberrypi.com");
-+MODULE_DESCRIPTION("RP1 PWM driver");
-+MODULE_LICENSE("GPL");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0885-drm-Add-RP1-DSI-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0885-drm-Add-RP1-DSI-driver.patch
deleted file mode 100644
index b82d53e080..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0885-drm-Add-RP1-DSI-driver.patch
+++ /dev/null
@@ -1,2678 +0,0 @@
-From f93caa69a9af6476cd4d93944a83acd227e68fd4 Mon Sep 17 00:00:00 2001
-From: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
-Date: Tue, 14 Feb 2023 14:58:33 +0000
-Subject: [PATCH] drm: Add RP1 DSI driver
-
-Add support for the RP1 DSI hardware.
-
-Signed-off-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
----
- drivers/gpu/drm/Kconfig                   |    2 +
- drivers/gpu/drm/Makefile                  |    1 +
- drivers/gpu/drm/rp1/Kconfig               |    5 +
- drivers/gpu/drm/rp1/Makefile              |    4 +
- drivers/gpu/drm/rp1/rp1-dsi/Kconfig       |   15 +
- drivers/gpu/drm/rp1/rp1-dsi/Makefile      |    5 +
- drivers/gpu/drm/rp1/rp1-dsi/rp1_dsi.c     |  537 ++++++++
- drivers/gpu/drm/rp1/rp1-dsi/rp1_dsi.h     |   94 ++
- drivers/gpu/drm/rp1/rp1-dsi/rp1_dsi_dma.c |  443 ++++++
- drivers/gpu/drm/rp1/rp1-dsi/rp1_dsi_dsi.c | 1504 +++++++++++++++++++++
- 10 files changed, 2610 insertions(+)
- create mode 100644 drivers/gpu/drm/rp1/Kconfig
- create mode 100644 drivers/gpu/drm/rp1/Makefile
- create mode 100644 drivers/gpu/drm/rp1/rp1-dsi/Kconfig
- create mode 100644 drivers/gpu/drm/rp1/rp1-dsi/Makefile
- create mode 100644 drivers/gpu/drm/rp1/rp1-dsi/rp1_dsi.c
- create mode 100644 drivers/gpu/drm/rp1/rp1-dsi/rp1_dsi.h
- create mode 100644 drivers/gpu/drm/rp1/rp1-dsi/rp1_dsi_dma.c
- create mode 100644 drivers/gpu/drm/rp1/rp1-dsi/rp1_dsi_dsi.c
-
---- a/drivers/gpu/drm/Kconfig
-+++ b/drivers/gpu/drm/Kconfig
-@@ -384,6 +384,8 @@ source "drivers/gpu/drm/v3d/Kconfig"
- 
- source "drivers/gpu/drm/vc4/Kconfig"
- 
-+source "drivers/gpu/drm/rp1/Kconfig"
-+
- source "drivers/gpu/drm/etnaviv/Kconfig"
- 
- source "drivers/gpu/drm/hisilicon/Kconfig"
---- a/drivers/gpu/drm/Makefile
-+++ b/drivers/gpu/drm/Makefile
-@@ -148,3 +148,4 @@ obj-y			+= gud/
- obj-$(CONFIG_DRM_HYPERV) += hyperv/
- obj-y			+= solomon/
- obj-$(CONFIG_DRM_SPRD) += sprd/
-+obj-y += rp1/
---- /dev/null
-+++ b/drivers/gpu/drm/rp1/Kconfig
-@@ -0,0 +1,5 @@
-+source "drivers/gpu/drm/rp1/rp1-dsi/Kconfig"
-+
-+source "drivers/gpu/drm/rp1/rp1-dpi/Kconfig"
-+
-+source "drivers/gpu/drm/rp1/rp1-vec/Kconfig"
---- /dev/null
-+++ b/drivers/gpu/drm/rp1/Makefile
-@@ -0,0 +1,4 @@
-+obj-$(CONFIG_DRM_RP1_DSI) += rp1-dsi/
-+obj-$(CONFIG_DRM_RP1_DPI) += rp1-dpi/
-+obj-$(CONFIG_DRM_RP1_VEC) += rp1-vec/
-+
---- /dev/null
-+++ b/drivers/gpu/drm/rp1/rp1-dsi/Kconfig
-@@ -0,0 +1,15 @@
-+# SPDX-License-Identifier: GPL-2.0-only
-+config DRM_RP1_DSI
-+	tristate "DRM Support for RP1 DSI"
-+	depends on DRM
-+	select MFD_RP1
-+	select DRM_GEM_DMA_HELPER
-+	select DRM_KMS_HELPER
-+	select DRM_MIPI_DSI
-+	select DRM_VRAM_HELPER
-+	select DRM_TTM
-+	select DRM_TTM_HELPER
-+	select GENERIC_PHY
-+	select GENERIC_PHY_MIPI_DPHY
-+	help
-+	  Choose this option to enable DSI display on RP1
---- /dev/null
-+++ b/drivers/gpu/drm/rp1/rp1-dsi/Makefile
-@@ -0,0 +1,5 @@
-+# SPDX-License-Identifier: GPL-2.0-only
-+
-+drm-rp1-dsi-y := rp1_dsi.o rp1_dsi_dma.o rp1_dsi_dsi.o
-+
-+obj-$(CONFIG_DRM_RP1_DSI) += drm-rp1-dsi.o
---- /dev/null
-+++ b/drivers/gpu/drm/rp1/rp1-dsi/rp1_dsi.c
-@@ -0,0 +1,537 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later
-+/*
-+ * DRM Driver for DSI output on Raspberry Pi RP1
-+ *
-+ * Copyright (c) 2023 Raspberry Pi Limited.
-+ */
-+
-+#include <linux/clk.h>
-+#include <linux/component.h>
-+#include <linux/delay.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/errno.h>
-+#include <linux/init.h>
-+#include <linux/interrupt.h>
-+#include <linux/io.h>
-+#include <linux/list.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/phy/phy-mipi-dphy.h>
-+#include <linux/string.h>
-+
-+#include <drm/drm_atomic_helper.h>
-+#include <drm/drm_crtc.h>
-+#include <drm/drm_crtc_helper.h>
-+#include <drm/drm_drv.h>
-+#include <drm/drm_encoder.h>
-+#include <drm/drm_fourcc.h>
-+#include <drm/drm_fb_helper.h>
-+#include <drm/drm_framebuffer.h>
-+#include <drm/drm_gem.h>
-+#include <drm/drm_gem_atomic_helper.h>
-+#include <drm/drm_gem_dma_helper.h>
-+#include <drm/drm_gem_framebuffer_helper.h>
-+#include <drm/drm_managed.h>
-+#include <drm/drm_modeset_helper_vtables.h>
-+#include <drm/drm_of.h>
-+#include <drm/drm_print.h>
-+#include <drm/drm_probe_helper.h>
-+#include <drm/drm_simple_kms_helper.h>
-+#include <drm/drm_vblank.h>
-+
-+#include "rp1_dsi.h"
-+
-+static inline struct rp1_dsi *
-+bridge_to_rp1_dsi(struct drm_bridge *bridge)
-+{
-+	return container_of(bridge, struct rp1_dsi, bridge);
-+}
-+
-+static void rp1_dsi_bridge_pre_enable(struct drm_bridge *bridge,
-+				      struct drm_bridge_state *old_state)
-+{
-+	struct rp1_dsi *dsi = bridge_to_rp1_dsi(bridge);
-+
-+	rp1dsi_dsi_setup(dsi, &dsi->pipe.crtc.state->adjusted_mode);
-+}
-+
-+static void rp1_dsi_bridge_enable(struct drm_bridge *bridge,
-+				  struct drm_bridge_state *old_state)
-+{
-+}
-+
-+static void rp1_dsi_bridge_disable(struct drm_bridge *bridge,
-+				   struct drm_bridge_state *state)
-+{
-+}
-+
-+static void rp1_dsi_bridge_post_disable(struct drm_bridge *bridge,
-+					struct drm_bridge_state *state)
-+{
-+	struct rp1_dsi *dsi = bridge_to_rp1_dsi(bridge);
-+
-+	if (dsi->dsi_running) {
-+		rp1dsi_dsi_stop(dsi);
-+		dsi->dsi_running = false;
-+	}
-+}
-+
-+static int rp1_dsi_bridge_attach(struct drm_bridge *bridge,
-+				 enum drm_bridge_attach_flags flags)
-+{
-+	struct rp1_dsi *dsi = bridge_to_rp1_dsi(bridge);
-+
-+	/* Attach the panel or bridge to the dsi bridge */
-+	return drm_bridge_attach(bridge->encoder, dsi->out_bridge,
-+				 &dsi->bridge, flags);
-+	return 0;
-+}
-+
-+static const struct drm_bridge_funcs rp1_dsi_bridge_funcs = {
-+	.atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state,
-+	.atomic_destroy_state = drm_atomic_helper_bridge_destroy_state,
-+	.atomic_reset = drm_atomic_helper_bridge_reset,
-+	.atomic_pre_enable = rp1_dsi_bridge_pre_enable,
-+	.atomic_enable = rp1_dsi_bridge_enable,
-+	.atomic_disable = rp1_dsi_bridge_disable,
-+	.atomic_post_disable = rp1_dsi_bridge_post_disable,
-+	.attach = rp1_dsi_bridge_attach,
-+};
-+
-+static void rp1dsi_pipe_update(struct drm_simple_display_pipe *pipe,
-+			       struct drm_plane_state *old_state)
-+{
-+	struct drm_pending_vblank_event *event;
-+	unsigned long flags;
-+	struct drm_framebuffer *fb = pipe->plane.state->fb;
-+	struct rp1_dsi *dsi = pipe->crtc.dev->dev_private;
-+	struct drm_gem_object *gem = fb ? drm_gem_fb_get_obj(fb, 0) : NULL;
-+	struct drm_gem_dma_object *dma_obj = gem ? to_drm_gem_dma_obj(gem) : NULL;
-+	bool can_update = fb && dma_obj && dsi && dsi->pipe_enabled;
-+
-+	/* (Re-)start DSI,DMA where required; and update FB address */
-+	if (can_update) {
-+		if (!dsi->dma_running || fb->format->format != dsi->cur_fmt) {
-+			if (dsi->dma_running && fb->format->format != dsi->cur_fmt) {
-+				rp1dsi_dma_stop(dsi);
-+				dsi->dma_running = false;
-+			}
-+			if (!dsi->dma_running) {
-+				rp1dsi_dma_setup(dsi,
-+						 fb->format->format, dsi->display_format,
-+						&pipe->crtc.state->adjusted_mode);
-+				dsi->dma_running = true;
-+			}
-+			dsi->cur_fmt  = fb->format->format;
-+			drm_crtc_vblank_on(&pipe->crtc);
-+		}
-+		rp1dsi_dma_update(dsi, dma_obj->dma_addr, fb->offsets[0], fb->pitches[0]);
-+	}
-+
-+	/* Arm VBLANK event (or call it immediately in some error cases) */
-+	spin_lock_irqsave(&pipe->crtc.dev->event_lock, flags);
-+	event = pipe->crtc.state->event;
-+	if (event) {
-+		pipe->crtc.state->event = NULL;
-+		if (can_update && drm_crtc_vblank_get(&pipe->crtc) == 0)
-+			drm_crtc_arm_vblank_event(&pipe->crtc, event);
-+		else
-+			drm_crtc_send_vblank_event(&pipe->crtc, event);
-+	}
-+	spin_unlock_irqrestore(&pipe->crtc.dev->event_lock, flags);
-+}
-+
-+static inline struct rp1_dsi *
-+encoder_to_rp1_dsi(struct drm_encoder *encoder)
-+{
-+	struct drm_simple_display_pipe *pipe =
-+		container_of(encoder, struct drm_simple_display_pipe, encoder);
-+	return container_of(pipe, struct rp1_dsi, pipe);
-+}
-+
-+static void rp1dsi_encoder_enable(struct drm_encoder *encoder)
-+{
-+	struct rp1_dsi *dsi = encoder_to_rp1_dsi(encoder);
-+
-+	/* Put DSI into video mode before starting video */
-+	rp1dsi_dsi_set_cmdmode(dsi, 0);
-+
-+	/* Start DMA -> DPI */
-+	dsi->pipe_enabled = true;
-+	dsi->cur_fmt = 0xdeadbeef;
-+	rp1dsi_pipe_update(&dsi->pipe, 0);
-+}
-+
-+static void rp1dsi_encoder_disable(struct drm_encoder *encoder)
-+{
-+	struct rp1_dsi *dsi = encoder_to_rp1_dsi(encoder);
-+
-+	drm_crtc_vblank_off(&dsi->pipe.crtc);
-+	if (dsi->dma_running) {
-+		rp1dsi_dma_stop(dsi);
-+		dsi->dma_running = false;
-+	}
-+	dsi->pipe_enabled = false;
-+
-+	/* Return to command mode after stopping video */
-+	rp1dsi_dsi_set_cmdmode(dsi, 1);
-+}
-+
-+static const struct drm_encoder_helper_funcs rp1_dsi_encoder_funcs = {
-+	.enable = rp1dsi_encoder_enable,
-+	.disable = rp1dsi_encoder_disable,
-+};
-+
-+static void rp1dsi_pipe_enable(struct drm_simple_display_pipe *pipe,
-+			       struct drm_crtc_state *crtc_state,
-+			       struct drm_plane_state *plane_state)
-+{
-+}
-+
-+static void rp1dsi_pipe_disable(struct drm_simple_display_pipe *pipe)
-+{
-+}
-+
-+static int rp1dsi_pipe_enable_vblank(struct drm_simple_display_pipe *pipe)
-+{
-+	struct rp1_dsi *dsi = pipe->crtc.dev->dev_private;
-+
-+	if (dsi)
-+		rp1dsi_dma_vblank_ctrl(dsi, 1);
-+
-+	return 0;
-+}
-+
-+static void rp1dsi_pipe_disable_vblank(struct drm_simple_display_pipe *pipe)
-+{
-+	struct rp1_dsi *dsi = pipe->crtc.dev->dev_private;
-+
-+	if (dsi)
-+		rp1dsi_dma_vblank_ctrl(dsi, 0);
-+}
-+
-+static const struct drm_simple_display_pipe_funcs rp1dsi_pipe_funcs = {
-+	.enable	    = rp1dsi_pipe_enable,
-+	.update	    = rp1dsi_pipe_update,
-+	.disable    = rp1dsi_pipe_disable,
-+	.prepare_fb = drm_gem_simple_display_pipe_prepare_fb,
-+	.enable_vblank  = rp1dsi_pipe_enable_vblank,
-+	.disable_vblank = rp1dsi_pipe_disable_vblank,
-+};
-+
-+static const struct drm_mode_config_funcs rp1dsi_mode_funcs = {
-+	.fb_create = drm_gem_fb_create,
-+	.atomic_check = drm_atomic_helper_check,
-+	.atomic_commit = drm_atomic_helper_commit,
-+};
-+
-+static const u32 rp1dsi_formats[] = {
-+	DRM_FORMAT_XRGB8888,
-+	DRM_FORMAT_XBGR8888,
-+	DRM_FORMAT_RGB888,
-+	DRM_FORMAT_BGR888,
-+	DRM_FORMAT_RGB565
-+};
-+
-+static void rp1dsi_stopall(struct drm_device *drm)
-+{
-+	if (drm->dev_private) {
-+		struct rp1_dsi *dsi = drm->dev_private;
-+
-+		if (dsi->dma_running || rp1dsi_dma_busy(dsi)) {
-+			rp1dsi_dma_stop(dsi);
-+			dsi->dma_running = false;
-+		}
-+		if (dsi->dsi_running) {
-+			rp1dsi_dsi_stop(dsi);
-+			dsi->dsi_running = false;
-+		}
-+		if (dsi->clocks[RP1DSI_CLOCK_CFG])
-+			clk_disable_unprepare(dsi->clocks[RP1DSI_CLOCK_CFG]);
-+	}
-+}
-+
-+DEFINE_DRM_GEM_DMA_FOPS(rp1dsi_fops);
-+
-+static struct drm_driver rp1dsi_driver = {
-+	.driver_features	= DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
-+	.fops			= &rp1dsi_fops,
-+	.name			= "drm-rp1-dsi",
-+	.desc			= "drm-rp1-dsi",
-+	.date			= "0",
-+	.major			= 1,
-+	.minor			= 0,
-+	DRM_GEM_DMA_DRIVER_OPS,
-+	.release		= rp1dsi_stopall,
-+};
-+
-+static int rp1dsi_bind(struct rp1_dsi *dsi)
-+{
-+	struct platform_device *pdev = dsi->pdev;
-+	struct drm_device *drm = dsi->drm;
-+	int ret;
-+
-+	dsi->out_bridge = drmm_of_get_bridge(drm, pdev->dev.of_node, 0, 0);
-+	if (IS_ERR(dsi->out_bridge))
-+		return PTR_ERR(dsi->out_bridge);
-+
-+	ret = drmm_mode_config_init(drm);
-+	if (ret)
-+		goto rtn;
-+
-+	drm->mode_config.max_width  = 4096;
-+	drm->mode_config.max_height = 4096;
-+	drm->mode_config.fb_base    = 0;
-+	drm->mode_config.preferred_depth = 32;
-+	drm->mode_config.prefer_shadow	 = 0;
-+	drm->mode_config.prefer_shadow_fbdev = 1;
-+	drm->mode_config.quirk_addfb_prefer_host_byte_order = true;
-+	drm->mode_config.funcs = &rp1dsi_mode_funcs;
-+	drm_vblank_init(drm, 1);
-+
-+	ret = drm_simple_display_pipe_init(drm,
-+					   &dsi->pipe,
-+					   &rp1dsi_pipe_funcs,
-+					   rp1dsi_formats,
-+					   ARRAY_SIZE(rp1dsi_formats),
-+					   NULL, NULL);
-+	if (ret)
-+		goto rtn;
-+
-+	/* We need slightly more complex encoder handling (enabling/disabling
-+	 * video mode), so add encoder helper functions.
-+	 */
-+	drm_encoder_helper_add(&dsi->pipe.encoder, &rp1_dsi_encoder_funcs);
-+
-+	ret = drm_simple_display_pipe_attach_bridge(&dsi->pipe, &dsi->bridge);
-+	if (ret)
-+		goto rtn;
-+
-+	drm_bridge_add(&dsi->bridge);
-+
-+	drm_mode_config_reset(drm);
-+
-+	if (dsi->clocks[RP1DSI_CLOCK_CFG])
-+		clk_prepare_enable(dsi->clocks[RP1DSI_CLOCK_CFG]);
-+
-+	ret = drm_dev_register(drm, 0);
-+
-+	if (ret == 0)
-+		drm_fbdev_generic_setup(drm, 32);
-+
-+rtn:
-+	if (ret)
-+		dev_err(&pdev->dev, "%s returned %d\n", __func__, ret);
-+	else
-+		dev_info(&pdev->dev, "%s succeeded", __func__);
-+
-+	return ret;
-+}
-+
-+static void rp1dsi_unbind(struct rp1_dsi *dsi)
-+{
-+	struct drm_device *drm = dsi->drm;
-+
-+	rp1dsi_stopall(drm);
-+	drm_dev_unregister(drm);
-+	drm_atomic_helper_shutdown(drm);
-+}
-+
-+int rp1dsi_host_attach(struct mipi_dsi_host *host, struct mipi_dsi_device *dsi_dev)
-+{
-+	struct rp1_dsi *dsi = container_of(host, struct rp1_dsi, dsi_host);
-+
-+	dev_info(&dsi->pdev->dev, "%s: Attach DSI device name=%s channel=%d lanes=%d format=%d flags=0x%lx hs_rate=%lu lp_rate=%lu",
-+		 __func__, dsi_dev->name, dsi_dev->channel, dsi_dev->lanes,
-+		 dsi_dev->format, dsi_dev->mode_flags, dsi_dev->hs_rate,
-+		 dsi_dev->lp_rate);
-+	dsi->vc              = dsi_dev->channel & 3;
-+	dsi->lanes           = dsi_dev->lanes;
-+
-+	switch (dsi_dev->format) {
-+	case MIPI_DSI_FMT_RGB666:
-+	case MIPI_DSI_FMT_RGB666_PACKED:
-+	case MIPI_DSI_FMT_RGB565:
-+	case MIPI_DSI_FMT_RGB888:
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+	dsi->display_format  = dsi_dev->format;
-+	dsi->display_flags   = dsi_dev->mode_flags;
-+	dsi->display_hs_rate = dsi_dev->hs_rate;
-+	dsi->display_lp_rate = dsi_dev->lp_rate;
-+
-+	/*
-+	 * Previously, we added a separate component to handle panel/bridge
-+	 * discovery and DRM registration, but now it's just a function call.
-+	 * The downstream/attaching device should deal with -EPROBE_DEFER
-+	 */
-+	return rp1dsi_bind(dsi);
-+}
-+
-+int rp1dsi_host_detach(struct mipi_dsi_host *host, struct mipi_dsi_device *dsi_dev)
-+{
-+	struct rp1_dsi *dsi = container_of(host, struct rp1_dsi, dsi_host);
-+
-+	/*
-+	 * Unregister the DRM driver.
-+	 * TODO: Check we are cleaning up correctly and not doing things multiple times!
-+	 */
-+	rp1dsi_unbind(dsi);
-+	return 0;
-+}
-+
-+ssize_t rp1dsi_host_transfer(struct mipi_dsi_host *host, const struct mipi_dsi_msg *msg)
-+{
-+	struct rp1_dsi *dsi = container_of(host, struct rp1_dsi, dsi_host);
-+	struct mipi_dsi_packet packet;
-+	int ret = 0;
-+
-+	/* Write */
-+	ret = mipi_dsi_create_packet(&packet, msg);
-+	if (ret) {
-+		dev_err(dsi->drm->dev, "RP1DSI: failed to create packet: %d\n", ret);
-+		return ret;
-+	}
-+
-+	rp1dsi_dsi_send(dsi, *(u32 *)(&packet.header), packet.payload_length, packet.payload);
-+
-+	/* Optional read back */
-+	if (msg->rx_len && msg->rx_buf)
-+		ret = rp1dsi_dsi_recv(dsi, msg->rx_len, msg->rx_buf);
-+
-+	return (ssize_t)ret;
-+}
-+
-+static const struct mipi_dsi_host_ops rp1dsi_mipi_dsi_host_ops = {
-+	.attach = rp1dsi_host_attach,
-+	.detach = rp1dsi_host_detach,
-+	.transfer = rp1dsi_host_transfer
-+};
-+
-+static int rp1dsi_platform_probe(struct platform_device *pdev)
-+{
-+	struct device *dev = &pdev->dev;
-+	struct drm_device *drm;
-+	struct rp1_dsi *dsi;
-+	int i, ret;
-+
-+	drm = drm_dev_alloc(&rp1dsi_driver, dev);
-+	if (IS_ERR(drm)) {
-+		ret = PTR_ERR(drm);
-+		return ret;
-+	}
-+	dsi = drmm_kzalloc(drm, sizeof(*dsi), GFP_KERNEL);
-+	if (!dsi) {
-+		ret = -ENOMEM;
-+		goto err_free_drm;
-+	}
-+	init_completion(&dsi->finished);
-+	dsi->drm = drm;
-+	dsi->pdev = pdev;
-+	drm->dev_private = dsi;
-+	platform_set_drvdata(pdev, drm);
-+
-+	dsi->bridge.funcs = &rp1_dsi_bridge_funcs;
-+	dsi->bridge.of_node = dev->of_node;
-+	dsi->bridge.type = DRM_MODE_CONNECTOR_DSI;
-+
-+	/* Safe default values for DSI mode */
-+	dsi->lanes = 1;
-+	dsi->display_format = MIPI_DSI_FMT_RGB888;
-+	dsi->display_flags  = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_LPM;
-+
-+	/* Hardware resources */
-+	for (i = 0; i < RP1DSI_NUM_CLOCKS; i++) {
-+		static const char * const myclocknames[RP1DSI_NUM_CLOCKS] = {
-+			"cfgclk", "dpiclk", "byteclk", "refclk"
-+		};
-+		dsi->clocks[i] = devm_clk_get(dev, myclocknames[i]);
-+		if (IS_ERR(dsi->clocks[i])) {
-+			ret = PTR_ERR(dsi->clocks[i]);
-+			dev_err(dev, "Error getting clocks[%d]\n", i);
-+			goto err_free_drm;
-+		}
-+	}
-+
-+	for (i = 0; i < RP1DSI_NUM_HW_BLOCKS; i++) {
-+		dsi->hw_base[i] =
-+			devm_ioremap_resource(dev,
-+					      platform_get_resource(dsi->pdev,
-+								    IORESOURCE_MEM,
-+								    i));
-+		if (IS_ERR(dsi->hw_base[i])) {
-+			ret = PTR_ERR(dsi->hw_base[i]);
-+			dev_err(dev, "Error memory mapping regs[%d]\n", i);
-+			goto err_free_drm;
-+		}
-+	}
-+	ret = platform_get_irq(dsi->pdev, 0);
-+	if (ret > 0)
-+		ret = devm_request_irq(dev, ret, rp1dsi_dma_isr,
-+				       IRQF_SHARED, "rp1-dsi", dsi);
-+	if (ret) {
-+		dev_err(dev, "Unable to request interrupt\n");
-+		ret = -EINVAL;
-+		goto err_free_drm;
-+	}
-+	rp1dsi_mipicfg_setup(dsi);
-+	dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64));
-+
-+	/* Create the MIPI DSI Host and wait for the panel/bridge to attach to it */
-+	dsi->dsi_host.ops = &rp1dsi_mipi_dsi_host_ops;
-+	dsi->dsi_host.dev = dev;
-+	ret = mipi_dsi_host_register(&dsi->dsi_host);
-+	if (ret)
-+		goto err_free_drm;
-+
-+	return ret;
-+
-+err_free_drm:
-+	dev_err(dev, "%s fail %d\n", __func__, ret);
-+	drm_dev_put(drm);
-+	return ret;
-+}
-+
-+static int rp1dsi_platform_remove(struct platform_device *pdev)
-+{
-+	struct drm_device *drm = platform_get_drvdata(pdev);
-+	struct rp1_dsi *dsi = drm->dev_private;
-+
-+	mipi_dsi_host_unregister(&dsi->dsi_host);
-+	return 0;
-+}
-+
-+static void rp1dsi_platform_shutdown(struct platform_device *pdev)
-+{
-+	struct drm_device *drm = platform_get_drvdata(pdev);
-+
-+	rp1dsi_stopall(drm);
-+}
-+
-+static const struct of_device_id rp1dsi_of_match[] = {
-+	{
-+		.compatible = "raspberrypi,rp1dsi",
-+	},
-+	{ /* sentinel */ },
-+};
-+
-+MODULE_DEVICE_TABLE(of, rp1dsi_of_match);
-+
-+static struct platform_driver rp1dsi_platform_driver = {
-+	.probe		= rp1dsi_platform_probe,
-+	.remove		= rp1dsi_platform_remove,
-+	.shutdown       = rp1dsi_platform_shutdown,
-+	.driver		= {
-+		.name	= DRIVER_NAME,
-+		.owner  = THIS_MODULE,
-+		.of_match_table = rp1dsi_of_match,
-+	},
-+};
-+
-+module_platform_driver(rp1dsi_platform_driver);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_DESCRIPTION("MIPI DSI driver for Raspberry Pi RP1");
-+MODULE_AUTHOR("Nick Hollinghurst");
---- /dev/null
-+++ b/drivers/gpu/drm/rp1/rp1-dsi/rp1_dsi.h
-@@ -0,0 +1,94 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * DRM Driver for DSI output on Raspberry Pi RP1
-+ *
-+ * Copyright (c) 2023 Raspberry Pi Limited.
-+ */
-+#ifndef _RP1_DSI_H_
-+#define _RP1_DSI_H_
-+
-+#include <linux/clk.h>
-+#include <linux/io.h>
-+#include <linux/types.h>
-+
-+#include <drm/drm_bridge.h>
-+#include <drm/drm_device.h>
-+#include <drm/drm_mipi_dsi.h>
-+#include <drm/drm_simple_kms_helper.h>
-+
-+#define MODULE_NAME "drm-rp1-dsi"
-+#define DRIVER_NAME "drm-rp1-dsi"
-+
-+/* ---------------------------------------------------------------------- */
-+
-+#define RP1DSI_HW_BLOCK_DMA   0
-+#define RP1DSI_HW_BLOCK_DSI   1
-+#define RP1DSI_HW_BLOCK_CFG   2
-+#define RP1DSI_NUM_HW_BLOCKS  3
-+
-+#define RP1DSI_CLOCK_CFG     0
-+#define RP1DSI_CLOCK_DPI     1
-+#define RP1DSI_CLOCK_BYTE    2
-+#define RP1DSI_CLOCK_REF     3
-+#define RP1DSI_NUM_CLOCKS    4
-+
-+/* ---------------------------------------------------------------------- */
-+
-+struct rp1_dsi {
-+	/* DRM and platform device pointers */
-+	struct drm_device *drm;
-+	struct platform_device *pdev;
-+
-+	/* Framework and helper objects */
-+	struct drm_simple_display_pipe pipe;
-+	struct drm_bridge bridge;
-+	struct drm_bridge *out_bridge;
-+	struct mipi_dsi_host dsi_host;
-+
-+	/* Clocks. We need DPI clock; the others are frequency references */
-+	struct clk *clocks[RP1DSI_NUM_CLOCKS];
-+
-+	/* Block (DSI DMA, DSI Host) base addresses, and current state */
-+	void __iomem *hw_base[RP1DSI_NUM_HW_BLOCKS];
-+	u32 cur_fmt;
-+	bool dsi_running, dma_running, pipe_enabled;
-+	struct completion finished;
-+
-+	/* Attached display parameters (from mipi_dsi_device) */
-+	unsigned long display_flags, display_hs_rate, display_lp_rate;
-+	enum mipi_dsi_pixel_format display_format;
-+	u8 vc;
-+	u8 lanes;
-+
-+	/* DPHY */
-+	u8 hsfreq_index;
-+};
-+
-+/* ---------------------------------------------------------------------- */
-+/* Functions to control the DSI/DPI/DMA block				  */
-+
-+void rp1dsi_dma_setup(struct rp1_dsi *dsi,
-+		      u32 in_format, enum mipi_dsi_pixel_format out_format,
-+		      struct drm_display_mode const *mode);
-+void rp1dsi_dma_update(struct rp1_dsi *dsi, dma_addr_t addr, u32 offset, u32 stride);
-+void rp1dsi_dma_stop(struct rp1_dsi *dsi);
-+int rp1dsi_dma_busy(struct rp1_dsi *dsi);
-+irqreturn_t rp1dsi_dma_isr(int irq, void *dev);
-+void rp1dsi_dma_vblank_ctrl(struct rp1_dsi *dsi, int enable);
-+
-+/* ---------------------------------------------------------------------- */
-+/* Functions to control the MIPICFG block and check RP1 platform		  */
-+
-+void rp1dsi_mipicfg_setup(struct rp1_dsi *dsi);
-+
-+/* ---------------------------------------------------------------------- */
-+/* Functions to control the SNPS D-PHY and DSI block setup		  */
-+
-+void rp1dsi_dsi_setup(struct rp1_dsi *dsi, struct drm_display_mode const *mode);
-+void rp1dsi_dsi_send(struct rp1_dsi *dsi, u32 header, int len, const u8 *buf);
-+int  rp1dsi_dsi_recv(struct rp1_dsi *dsi, int len, u8 *buf);
-+void rp1dsi_dsi_set_cmdmode(struct rp1_dsi *dsi, int cmd_mode);
-+void rp1dsi_dsi_stop(struct rp1_dsi *dsi);
-+
-+#endif
-+
---- /dev/null
-+++ b/drivers/gpu/drm/rp1/rp1-dsi/rp1_dsi_dma.c
-@@ -0,0 +1,443 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later
-+/*
-+ * DRM Driver for DSI output on Raspberry Pi RP1
-+ *
-+ * Copyright (c) 2023 Raspberry Pi Limited.
-+ */
-+
-+#include <linux/interrupt.h>
-+#include <linux/platform_device.h>
-+
-+#include <drm/drm_fourcc.h>
-+#include <drm/drm_print.h>
-+#include <drm/drm_vblank.h>
-+
-+#include "rp1_dsi.h"
-+
-+// --- DPI DMA REGISTERS (derived from Argon firmware, via RP1 drivers/mipi, with corrections) ---
-+
-+// Control
-+#define DPI_DMA_CONTROL				      0x0
-+#define DPI_DMA_CONTROL_ARM_SHIFT		      0
-+#define DPI_DMA_CONTROL_ARM_MASK		      BIT(DPI_DMA_CONTROL_ARM_SHIFT)
-+#define DPI_DMA_CONTROL_ALIGN16_SHIFT		      2
-+#define DPI_DMA_CONTROL_ALIGN16_MASK		      BIT(DPI_DMA_CONTROL_ALIGN16_SHIFT)
-+#define DPI_DMA_CONTROL_AUTO_REPEAT_SHIFT	      1
-+#define DPI_DMA_CONTROL_AUTO_REPEAT_MASK	      BIT(DPI_DMA_CONTROL_AUTO_REPEAT_SHIFT)
-+#define DPI_DMA_CONTROL_HIGH_WATER_SHIFT	      3
-+#define DPI_DMA_CONTROL_HIGH_WATER_MASK		      (0x1FF << DPI_DMA_CONTROL_HIGH_WATER_SHIFT)
-+#define DPI_DMA_CONTROL_DEN_POL_SHIFT		      12
-+#define DPI_DMA_CONTROL_DEN_POL_MASK		      BIT(DPI_DMA_CONTROL_DEN_POL_SHIFT)
-+#define DPI_DMA_CONTROL_HSYNC_POL_SHIFT		      13
-+#define DPI_DMA_CONTROL_HSYNC_POL_MASK		      BIT(DPI_DMA_CONTROL_HSYNC_POL_SHIFT)
-+#define DPI_DMA_CONTROL_VSYNC_POL_SHIFT		      14
-+#define DPI_DMA_CONTROL_VSYNC_POL_MASK		      BIT(DPI_DMA_CONTROL_VSYNC_POL_SHIFT)
-+#define DPI_DMA_CONTROL_COLORM_SHIFT		      15
-+#define DPI_DMA_CONTROL_COLORM_MASK		      BIT(DPI_DMA_CONTROL_COLORM_SHIFT)
-+#define DPI_DMA_CONTROL_SHUTDN_SHIFT		      16
-+#define DPI_DMA_CONTROL_SHUTDN_MASK		      BIT(DPI_DMA_CONTROL_SHUTDN_SHIFT)
-+#define DPI_DMA_CONTROL_HBP_EN_SHIFT		      17
-+#define DPI_DMA_CONTROL_HBP_EN_MASK		      BIT(DPI_DMA_CONTROL_HBP_EN_SHIFT)
-+#define DPI_DMA_CONTROL_HFP_EN_SHIFT		      18
-+#define DPI_DMA_CONTROL_HFP_EN_MASK		      BIT(DPI_DMA_CONTROL_HFP_EN_SHIFT)
-+#define DPI_DMA_CONTROL_VBP_EN_SHIFT		      19
-+#define DPI_DMA_CONTROL_VBP_EN_MASK		      BIT(DPI_DMA_CONTROL_VBP_EN_SHIFT)
-+#define DPI_DMA_CONTROL_VFP_EN_SHIFT		      20
-+#define DPI_DMA_CONTROL_VFP_EN_MASK		      BIT(DPI_DMA_CONTROL_VFP_EN_SHIFT)
-+#define DPI_DMA_CONTROL_HSYNC_EN_SHIFT		      21
-+#define DPI_DMA_CONTROL_HSYNC_EN_MASK		      BIT(DPI_DMA_CONTROL_HSYNC_EN_SHIFT)
-+#define DPI_DMA_CONTROL_VSYNC_EN_SHIFT		      22
-+#define DPI_DMA_CONTROL_VSYNC_EN_MASK		      BIT(DPI_DMA_CONTROL_VSYNC_EN_SHIFT)
-+#define DPI_DMA_CONTROL_FORCE_IMMED_SHIFT	      23
-+#define DPI_DMA_CONTROL_FORCE_IMMED_MASK	      BIT(DPI_DMA_CONTROL_FORCE_IMMED_SHIFT)
-+#define DPI_DMA_CONTROL_FORCE_DRAIN_SHIFT	      24
-+#define DPI_DMA_CONTROL_FORCE_DRAIN_MASK	      BIT(DPI_DMA_CONTROL_FORCE_DRAIN_SHIFT)
-+#define DPI_DMA_CONTROL_FORCE_EMPTY_SHIFT	      25
-+#define DPI_DMA_CONTROL_FORCE_EMPTY_MASK	      BIT(DPI_DMA_CONTROL_FORCE_EMPTY_SHIFT)
-+
-+// IRQ_ENABLES
-+#define DPI_DMA_IRQ_EN				      0x04
-+#define DPI_DMA_IRQ_EN_DMA_READY_SHIFT		      0
-+#define DPI_DMA_IRQ_EN_DMA_READY_MASK		      BIT(DPI_DMA_IRQ_EN_DMA_READY_SHIFT)
-+#define DPI_DMA_IRQ_EN_UNDERFLOW_SHIFT		      1
-+#define DPI_DMA_IRQ_EN_UNDERFLOW_MASK		      BIT(DPI_DMA_IRQ_EN_UNDERFLOW_SHIFT)
-+#define DPI_DMA_IRQ_EN_FRAME_START_SHIFT	      2
-+#define DPI_DMA_IRQ_EN_FRAME_START_MASK		      BIT(DPI_DMA_IRQ_EN_FRAME_START_SHIFT)
-+#define DPI_DMA_IRQ_EN_AFIFO_EMPTY_SHIFT	      3
-+#define DPI_DMA_IRQ_EN_AFIFO_EMPTY_MASK		      BIT(DPI_DMA_IRQ_EN_AFIFO_EMPTY_SHIFT)
-+#define DPI_DMA_IRQ_EN_TE_SHIFT			      4
-+#define DPI_DMA_IRQ_EN_TE_MASK			      BIT(DPI_DMA_IRQ_EN_TE_SHIFT)
-+#define DPI_DMA_IRQ_EN_ERROR_SHIFT		      5
-+#define DPI_DMA_IRQ_EN_ERROR_MASK		      BIT(DPI_DMA_IRQ_EN_ERROR_SHIFT)
-+#define DPI_DMA_IRQ_EN_MATCH_SHIFT		      6
-+#define DPI_DMA_IRQ_EN_MATCH_MASK		      BIT(DPI_DMA_IRQ_EN_MATCH_SHIFT)
-+#define DPI_DMA_IRQ_EN_MATCH_LINE_SHIFT		      16
-+#define DPI_DMA_IRQ_EN_MATCH_LINE_MASK		      (0xFFF << DPI_DMA_IRQ_EN_MATCH_LINE_SHIFT)
-+
-+// IRQ_FLAGS
-+#define DPI_DMA_IRQ_FLAGS			      0x08
-+#define DPI_DMA_IRQ_FLAGS_DMA_READY_SHIFT	      0
-+#define DPI_DMA_IRQ_FLAGS_DMA_READY_MASK	      BIT(DPI_DMA_IRQ_FLAGS_DMA_READY_SHIFT)
-+#define DPI_DMA_IRQ_FLAGS_UNDERFLOW_SHIFT	      1
-+#define DPI_DMA_IRQ_FLAGS_UNDERFLOW_MASK	      BIT(DPI_DMA_IRQ_FLAGS_UNDERFLOW_SHIFT)
-+#define DPI_DMA_IRQ_FLAGS_FRAME_START_SHIFT	      2
-+#define DPI_DMA_IRQ_FLAGS_FRAME_START_MASK	      BIT(DPI_DMA_IRQ_FLAGS_FRAME_START_SHIFT)
-+#define DPI_DMA_IRQ_FLAGS_AFIFO_EMPTY_SHIFT	      3
-+#define DPI_DMA_IRQ_FLAGS_AFIFO_EMPTY_MASK	      BIT(DPI_DMA_IRQ_FLAGS_AFIFO_EMPTY_SHIFT)
-+#define DPI_DMA_IRQ_FLAGS_TE_SHIFT		      4
-+#define DPI_DMA_IRQ_FLAGS_TE_MASK		      BIT(DPI_DMA_IRQ_FLAGS_TE_SHIFT)
-+#define DPI_DMA_IRQ_FLAGS_ERROR_SHIFT		      5
-+#define DPI_DMA_IRQ_FLAGS_ERROR_MASK		      BIT(DPI_DMA_IRQ_FLAGS_ERROR_SHIFT)
-+#define DPI_DMA_IRQ_FLAGS_MATCH_SHIFT		      6
-+#define DPI_DMA_IRQ_FLAGS_MATCH_MASK		      BIT(DPI_DMA_IRQ_FLAGS_MATCH_SHIFT)
-+
-+// QOS
-+#define DPI_DMA_QOS				      0xC
-+#define DPI_DMA_QOS_DQOS_SHIFT			      0
-+#define DPI_DMA_QOS_DQOS_MASK			      (0xF << DPI_DMA_QOS_DQOS_SHIFT)
-+#define DPI_DMA_QOS_ULEV_SHIFT			      4
-+#define DPI_DMA_QOS_ULEV_MASK			      (0xF << DPI_DMA_QOS_ULEV_SHIFT)
-+#define DPI_DMA_QOS_UQOS_SHIFT			      8
-+#define DPI_DMA_QOS_UQOS_MASK			      (0xF << DPI_DMA_QOS_UQOS_SHIFT)
-+#define DPI_DMA_QOS_LLEV_SHIFT			      12
-+#define DPI_DMA_QOS_LLEV_MASK			      (0xF << DPI_DMA_QOS_LLEV_SHIFT)
-+#define DPI_DMA_QOS_LQOS_SHIFT			      16
-+#define DPI_DMA_QOS_LQOS_MASK			      (0xF << DPI_DMA_QOS_LQOS_SHIFT)
-+
-+// Panics
-+#define DPI_DMA_PANICS				     0x38
-+#define DPI_DMA_PANICS_UPPER_COUNT_SHIFT	     0
-+#define DPI_DMA_PANICS_UPPER_COUNT_MASK		     \
-+				(0x0000FFFF << DPI_DMA_PANICS_UPPER_COUNT_SHIFT)
-+#define DPI_DMA_PANICS_LOWER_COUNT_SHIFT	     16
-+#define DPI_DMA_PANICS_LOWER_COUNT_MASK		     \
-+				(0x0000FFFF << DPI_DMA_PANICS_LOWER_COUNT_SHIFT)
-+
-+// DMA Address Lower:
-+#define DPI_DMA_DMA_ADDR_L			     0x10
-+
-+// DMA Address Upper:
-+#define DPI_DMA_DMA_ADDR_H			     0x40
-+
-+// DMA stride
-+#define DPI_DMA_DMA_STRIDE			     0x14
-+
-+// Visible Area
-+#define DPI_DMA_VISIBLE_AREA			     0x18
-+#define DPI_DMA_VISIBLE_AREA_ROWSM1_SHIFT     0
-+#define DPI_DMA_VISIBLE_AREA_ROWSM1_MASK     (0x0FFF << DPI_DMA_VISIBLE_AREA_ROWSM1_SHIFT)
-+#define DPI_DMA_VISIBLE_AREA_COLSM1_SHIFT    16
-+#define DPI_DMA_VISIBLE_AREA_COLSM1_MASK     (0x0FFF << DPI_DMA_VISIBLE_AREA_COLSM1_SHIFT)
-+
-+// Sync width
-+#define DPI_DMA_SYNC_WIDTH   0x1C
-+#define DPI_DMA_SYNC_WIDTH_ROWSM1_SHIFT	 0
-+#define DPI_DMA_SYNC_WIDTH_ROWSM1_MASK	 (0x0FFF << DPI_DMA_SYNC_WIDTH_ROWSM1_SHIFT)
-+#define DPI_DMA_SYNC_WIDTH_COLSM1_SHIFT	 16
-+#define DPI_DMA_SYNC_WIDTH_COLSM1_MASK	 (0x0FFF << DPI_DMA_SYNC_WIDTH_COLSM1_SHIFT)
-+
-+// Back porch
-+#define DPI_DMA_BACK_PORCH   0x20
-+#define DPI_DMA_BACK_PORCH_ROWSM1_SHIFT	 0
-+#define DPI_DMA_BACK_PORCH_ROWSM1_MASK	 (0x0FFF << DPI_DMA_BACK_PORCH_ROWSM1_SHIFT)
-+#define DPI_DMA_BACK_PORCH_COLSM1_SHIFT	 16
-+#define DPI_DMA_BACK_PORCH_COLSM1_MASK	 (0x0FFF << DPI_DMA_BACK_PORCH_COLSM1_SHIFT)
-+
-+// Front porch
-+#define DPI_DMA_FRONT_PORCH  0x24
-+#define DPI_DMA_FRONT_PORCH_ROWSM1_SHIFT     0
-+#define DPI_DMA_FRONT_PORCH_ROWSM1_MASK	 (0x0FFF << DPI_DMA_FRONT_PORCH_ROWSM1_SHIFT)
-+#define DPI_DMA_FRONT_PORCH_COLSM1_SHIFT     16
-+#define DPI_DMA_FRONT_PORCH_COLSM1_MASK	 (0x0FFF << DPI_DMA_FRONT_PORCH_COLSM1_SHIFT)
-+
-+// Input masks
-+#define DPI_DMA_IMASK	 0x2C
-+#define DPI_DMA_IMASK_R_SHIFT	 0
-+#define DPI_DMA_IMASK_R_MASK	 (0x3FF << DPI_DMA_IMASK_R_SHIFT)
-+#define DPI_DMA_IMASK_G_SHIFT	 10
-+#define DPI_DMA_IMASK_G_MASK	 (0x3FF << DPI_DMA_IMASK_G_SHIFT)
-+#define DPI_DMA_IMASK_B_SHIFT	 20
-+#define DPI_DMA_IMASK_B_MASK	 (0x3FF << DPI_DMA_IMASK_B_SHIFT)
-+
-+// Output Masks
-+#define DPI_DMA_OMASK	 0x30
-+#define DPI_DMA_OMASK_R_SHIFT	 0
-+#define DPI_DMA_OMASK_R_MASK	 (0x3FF << DPI_DMA_OMASK_R_SHIFT)
-+#define DPI_DMA_OMASK_G_SHIFT	 10
-+#define DPI_DMA_OMASK_G_MASK	 (0x3FF << DPI_DMA_OMASK_G_SHIFT)
-+#define DPI_DMA_OMASK_B_SHIFT	 20
-+#define DPI_DMA_OMASK_B_MASK	 (0x3FF << DPI_DMA_OMASK_B_SHIFT)
-+
-+// Shifts
-+#define DPI_DMA_SHIFT	 0x28
-+#define DPI_DMA_SHIFT_IR_SHIFT	 0
-+#define DPI_DMA_SHIFT_IR_MASK	 (0x1F << DPI_DMA_SHIFT_IR_SHIFT)
-+#define DPI_DMA_SHIFT_IG_SHIFT	 5
-+#define DPI_DMA_SHIFT_IG_MASK	 (0x1F << DPI_DMA_SHIFT_IG_SHIFT)
-+#define DPI_DMA_SHIFT_IB_SHIFT	 10
-+#define DPI_DMA_SHIFT_IB_MASK	 (0x1F << DPI_DMA_SHIFT_IB_SHIFT)
-+#define DPI_DMA_SHIFT_OR_SHIFT	 15
-+#define DPI_DMA_SHIFT_OR_MASK	 (0x1F << DPI_DMA_SHIFT_OR_SHIFT)
-+#define DPI_DMA_SHIFT_OG_SHIFT	 20
-+#define DPI_DMA_SHIFT_OG_MASK	 (0x1F << DPI_DMA_SHIFT_OG_SHIFT)
-+#define DPI_DMA_SHIFT_OB_SHIFT	 25
-+#define DPI_DMA_SHIFT_OB_MASK	 (0x1F << DPI_DMA_SHIFT_OB_SHIFT)
-+
-+// Scaling
-+#define DPI_DMA_RGBSZ	 0x34
-+#define DPI_DMA_RGBSZ_BPP_SHIFT	 16
-+#define DPI_DMA_RGBSZ_BPP_MASK	 (0x3 << DPI_DMA_RGBSZ_BPP_SHIFT)
-+#define DPI_DMA_RGBSZ_R_SHIFT	 0
-+#define DPI_DMA_RGBSZ_R_MASK	 (0xF << DPI_DMA_RGBSZ_R_SHIFT)
-+#define DPI_DMA_RGBSZ_G_SHIFT	 4
-+#define DPI_DMA_RGBSZ_G_MASK	 (0xF << DPI_DMA_RGBSZ_G_SHIFT)
-+#define DPI_DMA_RGBSZ_B_SHIFT	 8
-+#define DPI_DMA_RGBSZ_B_MASK	 (0xF << DPI_DMA_RGBSZ_B_SHIFT)
-+
-+// Status
-+#define DPI_DMA_STATUS  0x3c
-+
-+#define BITS(field, val) (((val) << (field ## _SHIFT)) & (field ## _MASK))
-+
-+static unsigned int rp1dsi_dma_read(struct rp1_dsi *dsi, unsigned int reg)
-+{
-+	void __iomem *addr = dsi->hw_base[RP1DSI_HW_BLOCK_DMA] + reg;
-+
-+	return readl(addr);
-+}
-+
-+static void rp1dsi_dma_write(struct rp1_dsi *dsi, unsigned int reg, unsigned int val)
-+{
-+	void __iomem *addr = dsi->hw_base[RP1DSI_HW_BLOCK_DMA] + reg;
-+
-+	writel(val, addr);
-+}
-+
-+int rp1dsi_dma_busy(struct rp1_dsi *dsi)
-+{
-+	return (rp1dsi_dma_read(dsi, DPI_DMA_STATUS) & 0xF8F) ? 1 : 0;
-+}
-+
-+/* Table of supported input (in-memory/DMA) pixel formats. */
-+struct rp1dsi_ipixfmt {
-+	u32 format; /* DRM format code                           */
-+	u32 mask;   /* RGB masks (10 bits each, left justified)  */
-+	u32 shift;  /* RGB MSB positions in the memory word      */
-+	u32 rgbsz;  /* Shifts used for scaling; also (BPP/8-1)   */
-+};
-+
-+#define IMASK_RGB(r, g, b)	(BITS(DPI_DMA_IMASK_R, r) | \
-+				 BITS(DPI_DMA_IMASK_G, g) |  \
-+				 BITS(DPI_DMA_IMASK_B, b))
-+#define ISHIFT_RGB(r, g, b)	(BITS(DPI_DMA_SHIFT_IR, r) | \
-+				 BITS(DPI_DMA_SHIFT_IG, g) | \
-+				 BITS(DPI_DMA_SHIFT_IB, b))
-+
-+static const struct rp1dsi_ipixfmt my_formats[] = {
-+	{
-+		.format = DRM_FORMAT_XRGB8888,
-+		.mask   = IMASK_RGB(0x3fc, 0x3fc, 0x3fc),
-+		.shift  = ISHIFT_RGB(23, 15, 7),
-+		.rgbsz  = BITS(DPI_DMA_RGBSZ_BPP, 3),
-+	},
-+	{
-+		.format = DRM_FORMAT_XBGR8888,
-+		.mask   = IMASK_RGB(0x3fc, 0x3fc, 0x3fc),
-+		.shift  = ISHIFT_RGB(7, 15, 23),
-+		.rgbsz  = BITS(DPI_DMA_RGBSZ_BPP, 3),
-+	},
-+	{
-+		.format = DRM_FORMAT_RGB888,
-+		.mask   = IMASK_RGB(0x3fc, 0x3fc, 0x3fc),
-+		.shift  = ISHIFT_RGB(23, 15, 7),
-+		.rgbsz  = BITS(DPI_DMA_RGBSZ_BPP, 2),
-+	},
-+	{
-+		.format = DRM_FORMAT_BGR888,
-+		.mask   = IMASK_RGB(0x3fc, 0x3fc, 0x3fc),
-+		.shift  = ISHIFT_RGB(7, 15, 23),
-+		.rgbsz  = BITS(DPI_DMA_RGBSZ_BPP, 2),
-+	},
-+	{
-+		.format = DRM_FORMAT_RGB565,
-+		.mask   = IMASK_RGB(0x3e0, 0x3f0, 0x3e0),
-+		.shift  = ISHIFT_RGB(15, 10, 4),
-+		.rgbsz  = BITS(DPI_DMA_RGBSZ_R, 5) | BITS(DPI_DMA_RGBSZ_G, 6) |
-+			  BITS(DPI_DMA_RGBSZ_B, 5) | BITS(DPI_DMA_RGBSZ_BPP, 1),
-+	}
-+};
-+
-+/* Choose the internal on-the-bus DPI format as expected by DSI Host. */
-+static u32 get_omask_oshift(enum mipi_dsi_pixel_format fmt, u32 *oshift)
-+{
-+	switch (fmt) {
-+	case MIPI_DSI_FMT_RGB565:
-+		*oshift = BITS(DPI_DMA_SHIFT_OR, 15) |
-+			  BITS(DPI_DMA_SHIFT_OG, 10) |
-+			  BITS(DPI_DMA_SHIFT_OB, 4);
-+		return BITS(DPI_DMA_OMASK_R, 0x3e0) |
-+		       BITS(DPI_DMA_OMASK_G, 0x3f0) |
-+		       BITS(DPI_DMA_OMASK_B, 0x3e0);
-+	case MIPI_DSI_FMT_RGB666_PACKED:
-+		*oshift = BITS(DPI_DMA_SHIFT_OR, 17) |
-+			  BITS(DPI_DMA_SHIFT_OG, 11) |
-+			  BITS(DPI_DMA_SHIFT_OB, 5);
-+		return BITS(DPI_DMA_OMASK_R, 0x3f0) |
-+		       BITS(DPI_DMA_OMASK_G, 0x3f0) |
-+		       BITS(DPI_DMA_OMASK_B, 0x3f0);
-+	case MIPI_DSI_FMT_RGB666:
-+		*oshift = BITS(DPI_DMA_SHIFT_OR, 21) |
-+			  BITS(DPI_DMA_SHIFT_OG, 13) |
-+			  BITS(DPI_DMA_SHIFT_OB, 5);
-+		return BITS(DPI_DMA_OMASK_R, 0x3f0) |
-+		       BITS(DPI_DMA_OMASK_G, 0x3f0) |
-+		       BITS(DPI_DMA_OMASK_B, 0x3f0);
-+	default:
-+		*oshift = BITS(DPI_DMA_SHIFT_OR, 23) |
-+			  BITS(DPI_DMA_SHIFT_OG, 15) |
-+			  BITS(DPI_DMA_SHIFT_OB, 7);
-+		return BITS(DPI_DMA_OMASK_R, 0x3fc) |
-+		       BITS(DPI_DMA_OMASK_G, 0x3fc) |
-+		       BITS(DPI_DMA_OMASK_B, 0x3fc);
-+	}
-+}
-+
-+void rp1dsi_dma_setup(struct rp1_dsi *dsi,
-+		      u32 in_format, enum mipi_dsi_pixel_format out_format,
-+		     struct drm_display_mode const *mode)
-+{
-+	u32 oshift;
-+	int i;
-+
-+	/*
-+	 * Configure all DSI/DPI/DMA block registers, except base address.
-+	 * DMA will not actually start until a FB base address is specified
-+	 * using rp1dsi_dma_update().
-+	 */
-+
-+	rp1dsi_dma_write(dsi, DPI_DMA_VISIBLE_AREA,
-+			 BITS(DPI_DMA_VISIBLE_AREA_ROWSM1, mode->vdisplay - 1) |
-+			 BITS(DPI_DMA_VISIBLE_AREA_COLSM1, mode->hdisplay - 1));
-+
-+	rp1dsi_dma_write(dsi, DPI_DMA_SYNC_WIDTH,
-+			 BITS(DPI_DMA_SYNC_WIDTH_ROWSM1, mode->vsync_end - mode->vsync_start - 1) |
-+			 BITS(DPI_DMA_SYNC_WIDTH_COLSM1, mode->hsync_end - mode->hsync_start - 1));
-+
-+	/* In the DPIDMA registers, "back porch" time includes sync width */
-+	rp1dsi_dma_write(dsi, DPI_DMA_BACK_PORCH,
-+			 BITS(DPI_DMA_BACK_PORCH_ROWSM1, mode->vtotal - mode->vsync_start - 1) |
-+			 BITS(DPI_DMA_BACK_PORCH_COLSM1, mode->htotal - mode->hsync_start - 1));
-+
-+	rp1dsi_dma_write(dsi, DPI_DMA_FRONT_PORCH,
-+			 BITS(DPI_DMA_FRONT_PORCH_ROWSM1, mode->vsync_start - mode->vdisplay - 1) |
-+			 BITS(DPI_DMA_FRONT_PORCH_COLSM1, mode->hsync_start - mode->hdisplay - 1));
-+
-+	/* Input to output pixel format conversion */
-+	for (i = 0; i < ARRAY_SIZE(my_formats); ++i) {
-+		if (my_formats[i].format == in_format)
-+			break;
-+	}
-+	if (i >= ARRAY_SIZE(my_formats)) {
-+		drm_err(dsi->drm, "%s: bad input format\n", __func__);
-+		i = 0;
-+	}
-+	rp1dsi_dma_write(dsi, DPI_DMA_IMASK, my_formats[i].mask);
-+	rp1dsi_dma_write(dsi, DPI_DMA_OMASK, get_omask_oshift(out_format, &oshift));
-+	rp1dsi_dma_write(dsi, DPI_DMA_SHIFT, my_formats[i].shift | oshift);
-+	if (out_format == MIPI_DSI_FMT_RGB888)
-+		rp1dsi_dma_write(dsi, DPI_DMA_RGBSZ, my_formats[i].rgbsz);
-+	else
-+		rp1dsi_dma_write(dsi, DPI_DMA_RGBSZ, my_formats[i].rgbsz & DPI_DMA_RGBSZ_BPP_MASK);
-+
-+	rp1dsi_dma_write(dsi, DPI_DMA_QOS,
-+			 BITS(DPI_DMA_QOS_DQOS, 0x0) |
-+			 BITS(DPI_DMA_QOS_ULEV, 0xb) |
-+			 BITS(DPI_DMA_QOS_UQOS, 0x2) |
-+			 BITS(DPI_DMA_QOS_LLEV, 0x8) |
-+			 BITS(DPI_DMA_QOS_LQOS, 0x7));
-+
-+	rp1dsi_dma_write(dsi, DPI_DMA_IRQ_FLAGS, -1);
-+	rp1dsi_dma_vblank_ctrl(dsi, 1);
-+
-+	i = rp1dsi_dma_busy(dsi);
-+	if (i)
-+		drm_err(dsi->drm, "RP1DSI: Unexpectedly busy at start!");
-+
-+	rp1dsi_dma_write(dsi, DPI_DMA_CONTROL,
-+			 BITS(DPI_DMA_CONTROL_ARM, (i == 0)) |
-+			 BITS(DPI_DMA_CONTROL_AUTO_REPEAT, 1) |
-+			 BITS(DPI_DMA_CONTROL_HIGH_WATER, 448) |
-+			 BITS(DPI_DMA_CONTROL_DEN_POL, 0) |
-+			 BITS(DPI_DMA_CONTROL_HSYNC_POL, 0) |
-+			 BITS(DPI_DMA_CONTROL_VSYNC_POL, 0) |
-+			 BITS(DPI_DMA_CONTROL_COLORM, 0) |
-+			 BITS(DPI_DMA_CONTROL_SHUTDN, 0) |
-+			 BITS(DPI_DMA_CONTROL_HBP_EN, 1) |
-+			 BITS(DPI_DMA_CONTROL_HFP_EN, 1) |
-+			 BITS(DPI_DMA_CONTROL_VBP_EN, 1) |
-+			 BITS(DPI_DMA_CONTROL_VFP_EN, 1) |
-+			 BITS(DPI_DMA_CONTROL_HSYNC_EN, 1) |
-+			 BITS(DPI_DMA_CONTROL_VSYNC_EN, 1));
-+}
-+
-+void rp1dsi_dma_update(struct rp1_dsi *dsi, dma_addr_t addr, u32 offset, u32 stride)
-+{
-+	/*
-+	 * Update STRIDE, DMAH and DMAL only. When called after rp1dsi_dma_setup(),
-+	 * DMA starts immediately; if already running, the buffer will flip at
-+	 * the next vertical sync event.
-+	 */
-+	u64 a = addr + offset;
-+
-+	rp1dsi_dma_write(dsi, DPI_DMA_DMA_STRIDE, stride);
-+	rp1dsi_dma_write(dsi, DPI_DMA_DMA_ADDR_H, a >> 32);
-+	rp1dsi_dma_write(dsi, DPI_DMA_DMA_ADDR_L, a & 0xFFFFFFFFu);
-+}
-+
-+void rp1dsi_dma_stop(struct rp1_dsi *dsi)
-+{
-+	/*
-+	 * Stop DMA by turning off the Auto-Repeat flag, and wait up to 100ms for
-+	 * the current and any queued frame to end. "Force drain" flags are not used,
-+	 * as they seem to prevent DMA from re-starting properly; it's safer to wait.
-+	 */
-+	u32 ctrl;
-+
-+	reinit_completion(&dsi->finished);
-+	ctrl = rp1dsi_dma_read(dsi, DPI_DMA_CONTROL);
-+	ctrl &= ~(DPI_DMA_CONTROL_ARM_MASK | DPI_DMA_CONTROL_AUTO_REPEAT_MASK);
-+	rp1dsi_dma_write(dsi, DPI_DMA_CONTROL, ctrl);
-+	if (!wait_for_completion_timeout(&dsi->finished, HZ / 10))
-+		drm_err(dsi->drm, "%s: timed out waiting for idle\n", __func__);
-+	rp1dsi_dma_write(dsi, DPI_DMA_IRQ_EN, 0);
-+}
-+
-+void rp1dsi_dma_vblank_ctrl(struct rp1_dsi *dsi, int enable)
-+{
-+	rp1dsi_dma_write(dsi, DPI_DMA_IRQ_EN,
-+			 BITS(DPI_DMA_IRQ_EN_AFIFO_EMPTY, 1)      |
-+			 BITS(DPI_DMA_IRQ_EN_UNDERFLOW, 1)        |
-+			 BITS(DPI_DMA_IRQ_EN_DMA_READY, !!enable) |
-+			 BITS(DPI_DMA_IRQ_EN_MATCH_LINE, 4095));
-+}
-+
-+irqreturn_t rp1dsi_dma_isr(int irq, void *dev)
-+{
-+	struct rp1_dsi *dsi = dev;
-+	u32 u = rp1dsi_dma_read(dsi, DPI_DMA_IRQ_FLAGS);
-+
-+	if (u) {
-+		rp1dsi_dma_write(dsi, DPI_DMA_IRQ_FLAGS, u);
-+		if (dsi) {
-+			if (u & DPI_DMA_IRQ_FLAGS_UNDERFLOW_MASK)
-+				drm_err_ratelimited(dsi->drm,
-+						    "Underflow! (panics=0x%08x)\n",
-+						    rp1dsi_dma_read(dsi, DPI_DMA_PANICS));
-+			if (u & DPI_DMA_IRQ_FLAGS_DMA_READY_MASK)
-+				drm_crtc_handle_vblank(&dsi->pipe.crtc);
-+			if (u & DPI_DMA_IRQ_FLAGS_AFIFO_EMPTY_MASK)
-+				complete(&dsi->finished);
-+		}
-+	}
-+	return u ? IRQ_HANDLED : IRQ_NONE;
-+}
---- /dev/null
-+++ b/drivers/gpu/drm/rp1/rp1-dsi/rp1_dsi_dsi.c
-@@ -0,0 +1,1504 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later
-+/*
-+ * DRM Driver for DSI output on Raspberry Pi RP1
-+ *
-+ * Copyright (c) 2023 Raspberry Pi Limited.
-+ */
-+
-+#include <linux/delay.h>
-+#include <linux/errno.h>
-+#include <linux/platform_device.h>
-+#include <linux/rp1_platform.h>
-+#include "drm/drm_print.h"
-+
-+#include "rp1_dsi.h"
-+
-+/* ------------------------------- Synopsis DSI ------------------------ */
-+#define     DSI_VERSION_CFG                       0x000
-+#define     DSI_PWR_UP                            0x004
-+#define     DSI_CLKMGR_CFG                        0x008
-+#define     DSI_DPI_VCID                          0x00C
-+#define     DSI_DPI_COLOR_CODING                  0x010
-+#define     DSI_DPI_CFG_POL                       0x014
-+#define     DSI_DPI_LP_CMD_TIM                    0x018
-+#define     DSI_DBI_VCID                          0x01C
-+#define     DSI_DBI_CFG                           0x020
-+#define     DSI_DBI_PARTITIONING_EN               0x024
-+#define     DSI_DBI_CMDSIZE                       0x028
-+#define     DSI_PCKHDL_CFG                        0x02C
-+#define     DSI_GEN_VCID                          0x030
-+#define     DSI_MODE_CFG                          0x034
-+#define     DSI_VID_MODE_CFG                      0x038
-+#define     DSI_VID_PKT_SIZE                      0x03C
-+#define     DSI_VID_NUM_CHUNKS                    0x040
-+#define     DSI_VID_NULL_SIZE                     0x044
-+#define     DSI_VID_HSA_TIME                      0x048
-+#define     DSI_VID_HBP_TIME                      0x04C
-+#define     DSI_VID_HLINE_TIME                    0x050
-+#define     DSI_VID_VSA_LINES                     0x054
-+#define     DSI_VID_VBP_LINES                     0x058
-+#define     DSI_VID_VFP_LINES                     0x05C
-+#define     DSI_VID_VACTIVE_LINES                 0x060
-+#define     DSI_EDPI_CMD_SIZE                     0x064
-+#define     DSI_CMD_MODE_CFG                      0x068
-+#define     DSI_GEN_HDR                           0x06C
-+#define     DSI_GEN_PLD_DATA                      0x070
-+#define     DSI_CMD_PKT_STATUS                    0x074
-+#define     DSI_TO_CNT_CFG                        0x078
-+#define     DSI_HS_RD_TO_CNT                      0x07C
-+#define     DSI_LP_RD_TO_CNT                      0x080
-+#define     DSI_HS_WR_TO_CNT                      0x084
-+#define     DSI_LP_WR_TO_CNT                      0x088
-+#define     DSI_BTA_TO_CNT                        0x08C
-+#define     DSI_SDF_3D                            0x090
-+#define     DSI_LPCLK_CTRL                        0x094
-+#define     DSI_PHY_TMR_LPCLK_CFG                 0x098
-+#define     DSI_PHY_TMR_HS2LP_LSB       16
-+#define     DSI_PHY_TMR_LP2HS_LSB       0
-+#define     DSI_PHY_TMR_CFG                       0x09C
-+#define     DSI_PHY_TMR_RD_CFG                    0x0F4
-+#define     DSI_PHYRSTZ                           0x0A0
-+#define     DSI_PHY_IF_CFG                        0x0A4
-+#define     DSI_PHY_ULPS_CTRL                     0x0A8
-+#define     DSI_PHY_TX_TRIGGERS                   0x0AC
-+#define     DSI_PHY_STATUS                        0x0B0
-+
-+#define     DSI_PHY_TST_CTRL0                     0x0B4
-+#define     DSI_PHY_TST_CTRL1                     0x0B8
-+#define     DSI_INT_ST0                           0x0BC
-+#define     DSI_INT_ST1                           0x0C0
-+#define     DSI_INT_MASK0_CFG                     0x0C4
-+#define     DSI_INT_MASK1_CFG                     0x0C8
-+#define     DSI_PHY_CAL                           0x0CC
-+#define     DSI_HEXP_NPKT_CLR                     0x104
-+#define     DSI_HEXP_NPKT_SIZE                    0x108
-+#define     DSI_VID_SHADOW_CTRL                   0x100
-+
-+#define     DSI_DPI_VCID_ACT                      0x10C
-+#define     DSI_DPI_COLOR_CODING_ACT              0x110
-+#define     DSI_DPI_LP_CMD_TIM_ACT                0x118
-+#define     DSI_VID_MODE_CFG_ACT                  0x138
-+#define     DSI_VID_PKT_SIZE_ACT                  0x13C
-+#define     DSI_VID_NUM_CHUNKS_ACT                0x140
-+#define     DSI_VID_NULL_SIZE_ACT                 0x144
-+#define     DSI_VID_HSA_TIME_ACT                  0x148
-+#define     DSI_VID_HBP_TIME_ACT                  0x14C
-+#define     DSI_VID_HLINE_TIME_ACT                0x150
-+#define     DSI_VID_VSA_LINES_ACT                 0x154
-+#define     DSI_VID_VBP_LINES_ACT                 0x158
-+#define     DSI_VID_VFP_LINES_ACT                 0x15C
-+#define     DSI_VID_VACTIVE_LINES_ACT             0x160
-+#define     DSI_SDF_3D_CFG_ACT                    0x190
-+
-+#define     DSI_INT_FORCE0                        0x0D8
-+#define     DSI_INT_FORCE1                        0x0DC
-+
-+#define     DSI_AUTO_ULPS_MODE                    0x0E0
-+#define     DSI_AUTO_ULPS_ENTRY_DELAY             0x0E4
-+#define     DSI_AUTO_ULPS_WAKEUP_TIME             0x0E8
-+#define     DSI_EDPI_ADV_FEATURES                 0x0EC
-+
-+#define     DSI_DSC_PARAMETER                     0x0F0
-+
-+/* And some bitfield definitions */
-+
-+#define DPHY_PWR_UP_SHUTDOWNZ_LSB 0
-+#define DPHY_PWR_UP_SHUTDOWNZ_BITS BIT(DPHY_PWR_UP_SHUTDOWNZ_LSB)
-+
-+#define DPHY_CTRL0_PHY_TESTCLK_LSB 1
-+#define DPHY_CTRL0_PHY_TESTCLK_BITS BIT(DPHY_CTRL0_PHY_TESTCLK_LSB)
-+#define DPHY_CTRL0_PHY_TESTCLR_LSB 0
-+#define DPHY_CTRL0_PHY_TESTCLR_BITS BIT(DPHY_CTRL0_PHY_TESTCLR_LSB)
-+
-+#define DPHY_CTRL1_PHY_TESTDIN_LSB  0
-+#define DPHY_CTRL1_PHY_TESTDIN_BITS  (0xff << DPHY_CTRL1_PHY_TESTDIN_LSB)
-+#define DPHY_CTRL1_PHY_TESTDOUT_LSB 8
-+#define DPHY_CTRL1_PHY_TESTDOUT_BITS (0xff << DPHY_CTRL1_PHY_TESTDOUT_LSB)
-+#define DPHY_CTRL1_PHY_TESTEN_LSB 16
-+#define DPHY_CTRL1_PHY_TESTEN_BITS BIT(DPHY_CTRL1_PHY_TESTEN_LSB)
-+
-+#define DSI_PHYRSTZ_SHUTDOWNZ_LSB  0
-+#define DSI_PHYRSTZ_SHUTDOWNZ_BITS BIT(DSI_PHYRSTZ_SHUTDOWNZ_LSB)
-+#define DSI_PHYRSTZ_RSTZ_LSB  1
-+#define DSI_PHYRSTZ_RSTZ_BITS BIT(DSI_PHYRSTZ_RSTZ_LSB)
-+#define DSI_PHYRSTZ_ENABLECLK_LSB 2
-+#define DSI_PHYRSTZ_ENABLECLK_BITS BIT(DSI_PHYRSTZ_ENABLECLK_LSB)
-+#define DSI_PHYRSTZ_FORCEPLL_LSB 3
-+#define DSI_PHYRSTZ_FORCEPLL_BITS  BIT(DSI_PHYRSTZ_FORCEPLL_LSB)
-+
-+#define DPHY_HS_RX_CTRL_LANE0_OFFSET  0x44
-+#define DPHY_PLL_INPUT_DIV_OFFSET 0x17
-+#define DPHY_PLL_LOOP_DIV_OFFSET 0x18
-+#define DPHY_PLL_DIV_CTRL_OFFSET 0x19
-+
-+#define DPHY_PLL_BIAS_OFFSET 0x10
-+#define DPHY_PLL_BIAS_VCO_RANGE_LSB 3
-+#define DPHY_PLL_BIAS_USE_PROGRAMMED_VCO_RANGE BIT(7)
-+
-+#define DPHY_PLL_CHARGE_PUMP_OFFSET 0x11
-+#define DPHY_PLL_LPF_OFFSET 0x12
-+
-+#define DSI_WRITE(reg, val)  writel((val),  dsi->hw_base[RP1DSI_HW_BLOCK_DSI] + (reg))
-+#define DSI_READ(reg)        readl(dsi->hw_base[RP1DSI_HW_BLOCK_DSI] + (reg))
-+
-+// ================================================================================
-+// Register block : RPI_MIPICFG
-+// Version        : 1
-+// Bus type       : apb
-+// Description    : Register block to control mipi DPHY
-+// ================================================================================
-+#define RPI_MIPICFG_REGS_RWTYPE_MSB 13
-+#define RPI_MIPICFG_REGS_RWTYPE_LSB 12
-+// ================================================================================
-+// Register    : RPI_MIPICFG_CLK2FC
-+// JTAG access : synchronous
-+// Description : None
-+#define RPI_MIPICFG_CLK2FC_OFFSET 0x00000000
-+#define RPI_MIPICFG_CLK2FC_BITS   0x00000007
-+#define RPI_MIPICFG_CLK2FC_RESET  0x00000000
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_CLK2FC_SEL
-+// Description : select a clock to be sent to the frequency counter
-+//               7 = none
-+//               6 = none
-+//               5 = none
-+//               4 = rxbyteclkhs (187.5MHz)
-+//               3 = rxclkesc0 (20MHz)
-+//               2 = txbyteclkhs (187.5MHz)
-+//               1 = txclkesc (125MHz)
-+//               0 = none
-+#define RPI_MIPICFG_CLK2FC_SEL_RESET  0x0
-+#define RPI_MIPICFG_CLK2FC_SEL_BITS   0x00000007
-+#define RPI_MIPICFG_CLK2FC_SEL_MSB    2
-+#define RPI_MIPICFG_CLK2FC_SEL_LSB    0
-+#define RPI_MIPICFG_CLK2FC_SEL_ACCESS "RW"
-+// ================================================================================
-+// Register    : RPI_MIPICFG_CFG
-+// JTAG access : asynchronous
-+// Description : Top level configuration
-+#define RPI_MIPICFG_CFG_OFFSET 0x00000004
-+#define RPI_MIPICFG_CFG_BITS   0x00000111
-+#define RPI_MIPICFG_CFG_RESET  0x00000001
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_CFG_DPIUPDATE
-+// Description : Indicate the DSI block that the next frame will have a new video configuration
-+#define RPI_MIPICFG_CFG_DPIUPDATE_RESET  0x0
-+#define RPI_MIPICFG_CFG_DPIUPDATE_BITS   0x00000100
-+#define RPI_MIPICFG_CFG_DPIUPDATE_MSB    8
-+#define RPI_MIPICFG_CFG_DPIUPDATE_LSB    8
-+#define RPI_MIPICFG_CFG_DPIUPDATE_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_CFG_SEL_TE_EXT
-+// Description : Select the TE source: 1 - ext, 0 - int
-+#define RPI_MIPICFG_CFG_SEL_TE_EXT_RESET  0x0
-+#define RPI_MIPICFG_CFG_SEL_TE_EXT_BITS   0x00000010
-+#define RPI_MIPICFG_CFG_SEL_TE_EXT_MSB    4
-+#define RPI_MIPICFG_CFG_SEL_TE_EXT_LSB    4
-+#define RPI_MIPICFG_CFG_SEL_TE_EXT_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_CFG_SEL_CSI_DSI_N
-+// Description : Select PHY direction: input to CSI, output from DSI. CSI 1 DSI 0
-+#define RPI_MIPICFG_CFG_SEL_CSI_DSI_N_RESET  0x1
-+#define RPI_MIPICFG_CFG_SEL_CSI_DSI_N_BITS   0x00000001
-+#define RPI_MIPICFG_CFG_SEL_CSI_DSI_N_MSB    0
-+#define RPI_MIPICFG_CFG_SEL_CSI_DSI_N_LSB    0
-+#define RPI_MIPICFG_CFG_SEL_CSI_DSI_N_ACCESS "RW"
-+// ================================================================================
-+// Register    : RPI_MIPICFG_TE
-+// JTAG access : synchronous
-+// Description : Tearing effect processing
-+#define RPI_MIPICFG_TE_OFFSET 0x00000008
-+#define RPI_MIPICFG_TE_BITS   0x10ffffff
-+#define RPI_MIPICFG_TE_RESET  0x00000000
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_TE_ARM
-+// Description : Tearing effect arm
-+#define RPI_MIPICFG_TE_ARM_RESET  0x0
-+#define RPI_MIPICFG_TE_ARM_BITS   0x10000000
-+#define RPI_MIPICFG_TE_ARM_MSB    28
-+#define RPI_MIPICFG_TE_ARM_LSB    28
-+#define RPI_MIPICFG_TE_ARM_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_TE_HALT_CYC
-+// Description : When arm pulse has been seen, wait for te; then halt the dpi block
-+//		 for this many clk_dpi cycles
-+#define RPI_MIPICFG_TE_HALT_CYC_RESET  0x000000
-+#define RPI_MIPICFG_TE_HALT_CYC_BITS   0x00ffffff
-+#define RPI_MIPICFG_TE_HALT_CYC_MSB    23
-+#define RPI_MIPICFG_TE_HALT_CYC_LSB    0
-+#define RPI_MIPICFG_TE_HALT_CYC_ACCESS "RW"
-+// ================================================================================
-+// Register    : RPI_MIPICFG_DPHY_MONITOR
-+// JTAG access : asynchronous
-+// Description : DPHY status monitors for analog DFT
-+#define RPI_MIPICFG_DPHY_MONITOR_OFFSET 0x00000010
-+#define RPI_MIPICFG_DPHY_MONITOR_BITS   0x00111fff
-+#define RPI_MIPICFG_DPHY_MONITOR_RESET  0x00000000
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_MONITOR_LOCK
-+// Description : None
-+#define RPI_MIPICFG_DPHY_MONITOR_LOCK_RESET  0x0
-+#define RPI_MIPICFG_DPHY_MONITOR_LOCK_BITS   0x00100000
-+#define RPI_MIPICFG_DPHY_MONITOR_LOCK_MSB    20
-+#define RPI_MIPICFG_DPHY_MONITOR_LOCK_LSB    20
-+#define RPI_MIPICFG_DPHY_MONITOR_LOCK_ACCESS "RO"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_MONITOR_BISTOK
-+// Description : None
-+#define RPI_MIPICFG_DPHY_MONITOR_BISTOK_RESET  0x0
-+#define RPI_MIPICFG_DPHY_MONITOR_BISTOK_BITS   0x00010000
-+#define RPI_MIPICFG_DPHY_MONITOR_BISTOK_MSB    16
-+#define RPI_MIPICFG_DPHY_MONITOR_BISTOK_LSB    16
-+#define RPI_MIPICFG_DPHY_MONITOR_BISTOK_ACCESS "RO"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_MONITOR_STOPSTATECLK
-+// Description : None
-+#define RPI_MIPICFG_DPHY_MONITOR_STOPSTATECLK_RESET  0x0
-+#define RPI_MIPICFG_DPHY_MONITOR_STOPSTATECLK_BITS   0x00001000
-+#define RPI_MIPICFG_DPHY_MONITOR_STOPSTATECLK_MSB    12
-+#define RPI_MIPICFG_DPHY_MONITOR_STOPSTATECLK_LSB    12
-+#define RPI_MIPICFG_DPHY_MONITOR_STOPSTATECLK_ACCESS "RO"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_MONITOR_STOPSTATEDATA
-+// Description : None
-+#define RPI_MIPICFG_DPHY_MONITOR_STOPSTATEDATA_RESET  0x0
-+#define RPI_MIPICFG_DPHY_MONITOR_STOPSTATEDATA_BITS   0x00000f00
-+#define RPI_MIPICFG_DPHY_MONITOR_STOPSTATEDATA_MSB    11
-+#define RPI_MIPICFG_DPHY_MONITOR_STOPSTATEDATA_LSB    8
-+#define RPI_MIPICFG_DPHY_MONITOR_STOPSTATEDATA_ACCESS "RO"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_MONITOR_TESTDOUT
-+// Description : None
-+#define RPI_MIPICFG_DPHY_MONITOR_TESTDOUT_RESET  0x00
-+#define RPI_MIPICFG_DPHY_MONITOR_TESTDOUT_BITS   0x000000ff
-+#define RPI_MIPICFG_DPHY_MONITOR_TESTDOUT_MSB    7
-+#define RPI_MIPICFG_DPHY_MONITOR_TESTDOUT_LSB    0
-+#define RPI_MIPICFG_DPHY_MONITOR_TESTDOUT_ACCESS "RO"
-+// ================================================================================
-+// Register    : RPI_MIPICFG_DPHY_CTRL_0
-+// JTAG access : asynchronous
-+// Description : DPHY control for analog DFT
-+#define RPI_MIPICFG_DPHY_CTRL_0_OFFSET 0x00000014
-+#define RPI_MIPICFG_DPHY_CTRL_0_BITS   0x0000003f
-+#define RPI_MIPICFG_DPHY_CTRL_0_RESET  0x00000000
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_0_TEST_LPMODE
-+// Description : When set in lpmode, TXCLKESC is driven from clk_vec(driven from clocks block)
-+#define RPI_MIPICFG_DPHY_CTRL_0_TEST_LPMODE_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_0_TEST_LPMODE_BITS   0x00000020
-+#define RPI_MIPICFG_DPHY_CTRL_0_TEST_LPMODE_MSB    5
-+#define RPI_MIPICFG_DPHY_CTRL_0_TEST_LPMODE_LSB    5
-+#define RPI_MIPICFG_DPHY_CTRL_0_TEST_LPMODE_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_0_TEST_ENA
-+// Description : When set, drive the DPHY from the test registers
-+#define RPI_MIPICFG_DPHY_CTRL_0_TEST_ENA_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_0_TEST_ENA_BITS   0x00000010
-+#define RPI_MIPICFG_DPHY_CTRL_0_TEST_ENA_MSB    4
-+#define RPI_MIPICFG_DPHY_CTRL_0_TEST_ENA_LSB    4
-+#define RPI_MIPICFG_DPHY_CTRL_0_TEST_ENA_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_0_CFG_CLK_DIS
-+// Description : When test_ena is set, disable cfg_clk
-+#define RPI_MIPICFG_DPHY_CTRL_0_CFG_CLK_DIS_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_0_CFG_CLK_DIS_BITS   0x00000008
-+#define RPI_MIPICFG_DPHY_CTRL_0_CFG_CLK_DIS_MSB    3
-+#define RPI_MIPICFG_DPHY_CTRL_0_CFG_CLK_DIS_LSB    3
-+#define RPI_MIPICFG_DPHY_CTRL_0_CFG_CLK_DIS_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_0_REFCLK_DIS
-+// Description : When test_ena is set, disable refclk
-+#define RPI_MIPICFG_DPHY_CTRL_0_REFCLK_DIS_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_0_REFCLK_DIS_BITS   0x00000004
-+#define RPI_MIPICFG_DPHY_CTRL_0_REFCLK_DIS_MSB    2
-+#define RPI_MIPICFG_DPHY_CTRL_0_REFCLK_DIS_LSB    2
-+#define RPI_MIPICFG_DPHY_CTRL_0_REFCLK_DIS_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_0_TXCLKESC_DIS
-+// Description : When test_ena is set, disable txclkesc
-+#define RPI_MIPICFG_DPHY_CTRL_0_TXCLKESC_DIS_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_0_TXCLKESC_DIS_BITS   0x00000002
-+#define RPI_MIPICFG_DPHY_CTRL_0_TXCLKESC_DIS_MSB    1
-+#define RPI_MIPICFG_DPHY_CTRL_0_TXCLKESC_DIS_LSB    1
-+#define RPI_MIPICFG_DPHY_CTRL_0_TXCLKESC_DIS_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_0_TXBYTECLKHS_DIS
-+// Description : When test_ena is set, disable txbyteclkhs
-+#define RPI_MIPICFG_DPHY_CTRL_0_TXBYTECLKHS_DIS_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_0_TXBYTECLKHS_DIS_BITS   0x00000001
-+#define RPI_MIPICFG_DPHY_CTRL_0_TXBYTECLKHS_DIS_MSB    0
-+#define RPI_MIPICFG_DPHY_CTRL_0_TXBYTECLKHS_DIS_LSB    0
-+#define RPI_MIPICFG_DPHY_CTRL_0_TXBYTECLKHS_DIS_ACCESS "RW"
-+// ================================================================================
-+// Register    : RPI_MIPICFG_DPHY_CTRL_1
-+// JTAG access : asynchronous
-+// Description : DPHY control for analog DFT
-+#define RPI_MIPICFG_DPHY_CTRL_1_OFFSET 0x00000018
-+#define RPI_MIPICFG_DPHY_CTRL_1_BITS   0x7fffffff
-+#define RPI_MIPICFG_DPHY_CTRL_1_RESET  0x00000000
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_1_FORCEPLL
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_1_FORCEPLL_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_1_FORCEPLL_BITS   0x40000000
-+#define RPI_MIPICFG_DPHY_CTRL_1_FORCEPLL_MSB    30
-+#define RPI_MIPICFG_DPHY_CTRL_1_FORCEPLL_LSB    30
-+#define RPI_MIPICFG_DPHY_CTRL_1_FORCEPLL_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_1_SHUTDOWNZ
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_1_SHUTDOWNZ_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_1_SHUTDOWNZ_BITS   0x20000000
-+#define RPI_MIPICFG_DPHY_CTRL_1_SHUTDOWNZ_MSB    29
-+#define RPI_MIPICFG_DPHY_CTRL_1_SHUTDOWNZ_LSB    29
-+#define RPI_MIPICFG_DPHY_CTRL_1_SHUTDOWNZ_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_1_RSTZ
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_1_RSTZ_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_1_RSTZ_BITS   0x10000000
-+#define RPI_MIPICFG_DPHY_CTRL_1_RSTZ_MSB    28
-+#define RPI_MIPICFG_DPHY_CTRL_1_RSTZ_LSB    28
-+#define RPI_MIPICFG_DPHY_CTRL_1_RSTZ_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_1_MASTERSLAVEZ
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_1_MASTERSLAVEZ_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_1_MASTERSLAVEZ_BITS   0x08000000
-+#define RPI_MIPICFG_DPHY_CTRL_1_MASTERSLAVEZ_MSB    27
-+#define RPI_MIPICFG_DPHY_CTRL_1_MASTERSLAVEZ_LSB    27
-+#define RPI_MIPICFG_DPHY_CTRL_1_MASTERSLAVEZ_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_1_BISTON
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_1_BISTON_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_1_BISTON_BITS   0x04000000
-+#define RPI_MIPICFG_DPHY_CTRL_1_BISTON_MSB    26
-+#define RPI_MIPICFG_DPHY_CTRL_1_BISTON_LSB    26
-+#define RPI_MIPICFG_DPHY_CTRL_1_BISTON_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTHSCLK
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTHSCLK_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTHSCLK_BITS   0x02000000
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTHSCLK_MSB    25
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTHSCLK_LSB    25
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTHSCLK_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_1_ENABLECLK
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_1_ENABLECLK_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_1_ENABLECLK_BITS   0x01000000
-+#define RPI_MIPICFG_DPHY_CTRL_1_ENABLECLK_MSB    24
-+#define RPI_MIPICFG_DPHY_CTRL_1_ENABLECLK_LSB    24
-+#define RPI_MIPICFG_DPHY_CTRL_1_ENABLECLK_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_1_ENABLE_3
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_1_ENABLE_3_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_1_ENABLE_3_BITS   0x00800000
-+#define RPI_MIPICFG_DPHY_CTRL_1_ENABLE_3_MSB    23
-+#define RPI_MIPICFG_DPHY_CTRL_1_ENABLE_3_LSB    23
-+#define RPI_MIPICFG_DPHY_CTRL_1_ENABLE_3_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_1_ENABLE_2
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_1_ENABLE_2_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_1_ENABLE_2_BITS   0x00400000
-+#define RPI_MIPICFG_DPHY_CTRL_1_ENABLE_2_MSB    22
-+#define RPI_MIPICFG_DPHY_CTRL_1_ENABLE_2_LSB    22
-+#define RPI_MIPICFG_DPHY_CTRL_1_ENABLE_2_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_1_ENABLE_1
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_1_ENABLE_1_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_1_ENABLE_1_BITS   0x00200000
-+#define RPI_MIPICFG_DPHY_CTRL_1_ENABLE_1_MSB    21
-+#define RPI_MIPICFG_DPHY_CTRL_1_ENABLE_1_LSB    21
-+#define RPI_MIPICFG_DPHY_CTRL_1_ENABLE_1_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_1_ENABLE_0
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_1_ENABLE_0_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_1_ENABLE_0_BITS   0x00100000
-+#define RPI_MIPICFG_DPHY_CTRL_1_ENABLE_0_MSB    20
-+#define RPI_MIPICFG_DPHY_CTRL_1_ENABLE_0_LSB    20
-+#define RPI_MIPICFG_DPHY_CTRL_1_ENABLE_0_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_1_BASEDIR_3
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_1_BASEDIR_3_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_1_BASEDIR_3_BITS   0x00080000
-+#define RPI_MIPICFG_DPHY_CTRL_1_BASEDIR_3_MSB    19
-+#define RPI_MIPICFG_DPHY_CTRL_1_BASEDIR_3_LSB    19
-+#define RPI_MIPICFG_DPHY_CTRL_1_BASEDIR_3_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_1_BASEDIR_2
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_1_BASEDIR_2_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_1_BASEDIR_2_BITS   0x00040000
-+#define RPI_MIPICFG_DPHY_CTRL_1_BASEDIR_2_MSB    18
-+#define RPI_MIPICFG_DPHY_CTRL_1_BASEDIR_2_LSB    18
-+#define RPI_MIPICFG_DPHY_CTRL_1_BASEDIR_2_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_1_BASEDIR_1
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_1_BASEDIR_1_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_1_BASEDIR_1_BITS   0x00020000
-+#define RPI_MIPICFG_DPHY_CTRL_1_BASEDIR_1_MSB    17
-+#define RPI_MIPICFG_DPHY_CTRL_1_BASEDIR_1_LSB    17
-+#define RPI_MIPICFG_DPHY_CTRL_1_BASEDIR_1_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_1_BASEDIR_0
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_1_BASEDIR_0_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_1_BASEDIR_0_BITS   0x00010000
-+#define RPI_MIPICFG_DPHY_CTRL_1_BASEDIR_0_MSB    16
-+#define RPI_MIPICFG_DPHY_CTRL_1_BASEDIR_0_LSB    16
-+#define RPI_MIPICFG_DPHY_CTRL_1_BASEDIR_0_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_1_TXLPDTESC_3
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXLPDTESC_3_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXLPDTESC_3_BITS   0x00008000
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXLPDTESC_3_MSB    15
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXLPDTESC_3_LSB    15
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXLPDTESC_3_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_1_TXLPDTESC_2
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXLPDTESC_2_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXLPDTESC_2_BITS   0x00004000
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXLPDTESC_2_MSB    14
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXLPDTESC_2_LSB    14
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXLPDTESC_2_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_1_TXLPDTESC_1
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXLPDTESC_1_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXLPDTESC_1_BITS   0x00002000
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXLPDTESC_1_MSB    13
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXLPDTESC_1_LSB    13
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXLPDTESC_1_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_1_TXLPDTESC_0
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXLPDTESC_0_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXLPDTESC_0_BITS   0x00001000
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXLPDTESC_0_MSB    12
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXLPDTESC_0_LSB    12
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXLPDTESC_0_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_1_TXVALIDESC_3
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXVALIDESC_3_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXVALIDESC_3_BITS   0x00000800
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXVALIDESC_3_MSB    11
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXVALIDESC_3_LSB    11
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXVALIDESC_3_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_1_TXVALIDESC_2
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXVALIDESC_2_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXVALIDESC_2_BITS   0x00000400
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXVALIDESC_2_MSB    10
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXVALIDESC_2_LSB    10
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXVALIDESC_2_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_1_TXVALIDESC_1
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXVALIDESC_1_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXVALIDESC_1_BITS   0x00000200
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXVALIDESC_1_MSB    9
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXVALIDESC_1_LSB    9
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXVALIDESC_1_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_1_TXVALIDESC_0
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXVALIDESC_0_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXVALIDESC_0_BITS   0x00000100
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXVALIDESC_0_MSB    8
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXVALIDESC_0_LSB    8
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXVALIDESC_0_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTESC_3
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTESC_3_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTESC_3_BITS   0x00000080
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTESC_3_MSB    7
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTESC_3_LSB    7
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTESC_3_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTESC_2
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTESC_2_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTESC_2_BITS   0x00000040
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTESC_2_MSB    6
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTESC_2_LSB    6
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTESC_2_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTESC_1
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTESC_1_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTESC_1_BITS   0x00000020
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTESC_1_MSB    5
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTESC_1_LSB    5
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTESC_1_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTESC_0
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTESC_0_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTESC_0_BITS   0x00000010
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTESC_0_MSB    4
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTESC_0_LSB    4
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTESC_0_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTDATAHS_3
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTDATAHS_3_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTDATAHS_3_BITS   0x00000008
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTDATAHS_3_MSB    3
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTDATAHS_3_LSB    3
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTDATAHS_3_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTDATAHS_2
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTDATAHS_2_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTDATAHS_2_BITS   0x00000004
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTDATAHS_2_MSB    2
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTDATAHS_2_LSB    2
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTDATAHS_2_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTDATAHS_1
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTDATAHS_1_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTDATAHS_1_BITS   0x00000002
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTDATAHS_1_MSB    1
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTDATAHS_1_LSB    1
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTDATAHS_1_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTDATAHS_0
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTDATAHS_0_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTDATAHS_0_BITS   0x00000001
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTDATAHS_0_MSB    0
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTDATAHS_0_LSB    0
-+#define RPI_MIPICFG_DPHY_CTRL_1_TXREQUESTDATAHS_0_ACCESS "RW"
-+// ================================================================================
-+// Register    : RPI_MIPICFG_DPHY_CTRL_2
-+// JTAG access : asynchronous
-+// Description : DPHY control for analog DFT
-+#define RPI_MIPICFG_DPHY_CTRL_2_OFFSET 0x0000001c
-+#define RPI_MIPICFG_DPHY_CTRL_2_BITS   0x000007ff
-+#define RPI_MIPICFG_DPHY_CTRL_2_RESET  0x00000000
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_2_TESTCLK
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_2_TESTCLK_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_2_TESTCLK_BITS   0x00000400
-+#define RPI_MIPICFG_DPHY_CTRL_2_TESTCLK_MSB    10
-+#define RPI_MIPICFG_DPHY_CTRL_2_TESTCLK_LSB    10
-+#define RPI_MIPICFG_DPHY_CTRL_2_TESTCLK_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_2_TESTEN
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_2_TESTEN_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_2_TESTEN_BITS   0x00000200
-+#define RPI_MIPICFG_DPHY_CTRL_2_TESTEN_MSB    9
-+#define RPI_MIPICFG_DPHY_CTRL_2_TESTEN_LSB    9
-+#define RPI_MIPICFG_DPHY_CTRL_2_TESTEN_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_2_TESTCLR
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_2_TESTCLR_RESET  0x0
-+#define RPI_MIPICFG_DPHY_CTRL_2_TESTCLR_BITS   0x00000100
-+#define RPI_MIPICFG_DPHY_CTRL_2_TESTCLR_MSB    8
-+#define RPI_MIPICFG_DPHY_CTRL_2_TESTCLR_LSB    8
-+#define RPI_MIPICFG_DPHY_CTRL_2_TESTCLR_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_2_TESTDIN
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_2_TESTDIN_RESET  0x00
-+#define RPI_MIPICFG_DPHY_CTRL_2_TESTDIN_BITS   0x000000ff
-+#define RPI_MIPICFG_DPHY_CTRL_2_TESTDIN_MSB    7
-+#define RPI_MIPICFG_DPHY_CTRL_2_TESTDIN_LSB    0
-+#define RPI_MIPICFG_DPHY_CTRL_2_TESTDIN_ACCESS "RW"
-+// ================================================================================
-+// Register    : RPI_MIPICFG_DPHY_CTRL_3
-+// JTAG access : asynchronous
-+// Description : DPHY control for analog DFT
-+#define RPI_MIPICFG_DPHY_CTRL_3_OFFSET 0x00000020
-+#define RPI_MIPICFG_DPHY_CTRL_3_BITS   0xffffffff
-+#define RPI_MIPICFG_DPHY_CTRL_3_RESET  0x00000000
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_3_TXDATAESC_3
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_3_TXDATAESC_3_RESET  0x00
-+#define RPI_MIPICFG_DPHY_CTRL_3_TXDATAESC_3_BITS   0xff000000
-+#define RPI_MIPICFG_DPHY_CTRL_3_TXDATAESC_3_MSB    31
-+#define RPI_MIPICFG_DPHY_CTRL_3_TXDATAESC_3_LSB    24
-+#define RPI_MIPICFG_DPHY_CTRL_3_TXDATAESC_3_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_3_TXDATAESC_2
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_3_TXDATAESC_2_RESET  0x00
-+#define RPI_MIPICFG_DPHY_CTRL_3_TXDATAESC_2_BITS   0x00ff0000
-+#define RPI_MIPICFG_DPHY_CTRL_3_TXDATAESC_2_MSB    23
-+#define RPI_MIPICFG_DPHY_CTRL_3_TXDATAESC_2_LSB    16
-+#define RPI_MIPICFG_DPHY_CTRL_3_TXDATAESC_2_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_3_TXDATAESC_1
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_3_TXDATAESC_1_RESET  0x00
-+#define RPI_MIPICFG_DPHY_CTRL_3_TXDATAESC_1_BITS   0x0000ff00
-+#define RPI_MIPICFG_DPHY_CTRL_3_TXDATAESC_1_MSB    15
-+#define RPI_MIPICFG_DPHY_CTRL_3_TXDATAESC_1_LSB    8
-+#define RPI_MIPICFG_DPHY_CTRL_3_TXDATAESC_1_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_3_TXDATAESC_0
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_3_TXDATAESC_0_RESET  0x00
-+#define RPI_MIPICFG_DPHY_CTRL_3_TXDATAESC_0_BITS   0x000000ff
-+#define RPI_MIPICFG_DPHY_CTRL_3_TXDATAESC_0_MSB    7
-+#define RPI_MIPICFG_DPHY_CTRL_3_TXDATAESC_0_LSB    0
-+#define RPI_MIPICFG_DPHY_CTRL_3_TXDATAESC_0_ACCESS "RW"
-+// ================================================================================
-+// Register    : RPI_MIPICFG_DPHY_CTRL_4
-+// JTAG access : asynchronous
-+// Description : DPHY control for analog DFT
-+#define RPI_MIPICFG_DPHY_CTRL_4_OFFSET 0x00000024
-+#define RPI_MIPICFG_DPHY_CTRL_4_BITS   0xffffffff
-+#define RPI_MIPICFG_DPHY_CTRL_4_RESET  0x00000000
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_4_TXDATAHS_3
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_4_TXDATAHS_3_RESET  0x00
-+#define RPI_MIPICFG_DPHY_CTRL_4_TXDATAHS_3_BITS   0xff000000
-+#define RPI_MIPICFG_DPHY_CTRL_4_TXDATAHS_3_MSB    31
-+#define RPI_MIPICFG_DPHY_CTRL_4_TXDATAHS_3_LSB    24
-+#define RPI_MIPICFG_DPHY_CTRL_4_TXDATAHS_3_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_4_TXDATAHS_2
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_4_TXDATAHS_2_RESET  0x00
-+#define RPI_MIPICFG_DPHY_CTRL_4_TXDATAHS_2_BITS   0x00ff0000
-+#define RPI_MIPICFG_DPHY_CTRL_4_TXDATAHS_2_MSB    23
-+#define RPI_MIPICFG_DPHY_CTRL_4_TXDATAHS_2_LSB    16
-+#define RPI_MIPICFG_DPHY_CTRL_4_TXDATAHS_2_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_4_TXDATAHS_1
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_4_TXDATAHS_1_RESET  0x00
-+#define RPI_MIPICFG_DPHY_CTRL_4_TXDATAHS_1_BITS   0x0000ff00
-+#define RPI_MIPICFG_DPHY_CTRL_4_TXDATAHS_1_MSB    15
-+#define RPI_MIPICFG_DPHY_CTRL_4_TXDATAHS_1_LSB    8
-+#define RPI_MIPICFG_DPHY_CTRL_4_TXDATAHS_1_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DPHY_CTRL_4_TXDATAHS_0
-+// Description : None
-+#define RPI_MIPICFG_DPHY_CTRL_4_TXDATAHS_0_RESET  0x00
-+#define RPI_MIPICFG_DPHY_CTRL_4_TXDATAHS_0_BITS   0x000000ff
-+#define RPI_MIPICFG_DPHY_CTRL_4_TXDATAHS_0_MSB    7
-+#define RPI_MIPICFG_DPHY_CTRL_4_TXDATAHS_0_LSB    0
-+#define RPI_MIPICFG_DPHY_CTRL_4_TXDATAHS_0_ACCESS "RW"
-+// ================================================================================
-+// Register    : RPI_MIPICFG_INTR
-+// JTAG access : synchronous
-+// Description : Raw Interrupts
-+#define RPI_MIPICFG_INTR_OFFSET 0x00000028
-+#define RPI_MIPICFG_INTR_BITS   0x0000000f
-+#define RPI_MIPICFG_INTR_RESET  0x00000000
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_INTR_DSI_HOST
-+// Description : None
-+#define RPI_MIPICFG_INTR_DSI_HOST_RESET  0x0
-+#define RPI_MIPICFG_INTR_DSI_HOST_BITS   0x00000008
-+#define RPI_MIPICFG_INTR_DSI_HOST_MSB    3
-+#define RPI_MIPICFG_INTR_DSI_HOST_LSB    3
-+#define RPI_MIPICFG_INTR_DSI_HOST_ACCESS "RO"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_INTR_CSI_HOST
-+// Description : None
-+#define RPI_MIPICFG_INTR_CSI_HOST_RESET  0x0
-+#define RPI_MIPICFG_INTR_CSI_HOST_BITS   0x00000004
-+#define RPI_MIPICFG_INTR_CSI_HOST_MSB    2
-+#define RPI_MIPICFG_INTR_CSI_HOST_LSB    2
-+#define RPI_MIPICFG_INTR_CSI_HOST_ACCESS "RO"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_INTR_DSI_DMA
-+// Description : None
-+#define RPI_MIPICFG_INTR_DSI_DMA_RESET  0x0
-+#define RPI_MIPICFG_INTR_DSI_DMA_BITS   0x00000002
-+#define RPI_MIPICFG_INTR_DSI_DMA_MSB    1
-+#define RPI_MIPICFG_INTR_DSI_DMA_LSB    1
-+#define RPI_MIPICFG_INTR_DSI_DMA_ACCESS "RO"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_INTR_CSI_DMA
-+// Description : None
-+#define RPI_MIPICFG_INTR_CSI_DMA_RESET  0x0
-+#define RPI_MIPICFG_INTR_CSI_DMA_BITS   0x00000001
-+#define RPI_MIPICFG_INTR_CSI_DMA_MSB    0
-+#define RPI_MIPICFG_INTR_CSI_DMA_LSB    0
-+#define RPI_MIPICFG_INTR_CSI_DMA_ACCESS "RO"
-+// ================================================================================
-+// Register    : RPI_MIPICFG_INTE
-+// JTAG access : synchronous
-+// Description : Interrupt Enable
-+#define RPI_MIPICFG_INTE_OFFSET 0x0000002c
-+#define RPI_MIPICFG_INTE_BITS   0x0000000f
-+#define RPI_MIPICFG_INTE_RESET  0x00000000
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_INTE_DSI_HOST
-+// Description : None
-+#define RPI_MIPICFG_INTE_DSI_HOST_RESET  0x0
-+#define RPI_MIPICFG_INTE_DSI_HOST_BITS   0x00000008
-+#define RPI_MIPICFG_INTE_DSI_HOST_MSB    3
-+#define RPI_MIPICFG_INTE_DSI_HOST_LSB    3
-+#define RPI_MIPICFG_INTE_DSI_HOST_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_INTE_CSI_HOST
-+// Description : None
-+#define RPI_MIPICFG_INTE_CSI_HOST_RESET  0x0
-+#define RPI_MIPICFG_INTE_CSI_HOST_BITS   0x00000004
-+#define RPI_MIPICFG_INTE_CSI_HOST_MSB    2
-+#define RPI_MIPICFG_INTE_CSI_HOST_LSB    2
-+#define RPI_MIPICFG_INTE_CSI_HOST_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_INTE_DSI_DMA
-+// Description : None
-+#define RPI_MIPICFG_INTE_DSI_DMA_RESET  0x0
-+#define RPI_MIPICFG_INTE_DSI_DMA_BITS   0x00000002
-+#define RPI_MIPICFG_INTE_DSI_DMA_MSB    1
-+#define RPI_MIPICFG_INTE_DSI_DMA_LSB    1
-+#define RPI_MIPICFG_INTE_DSI_DMA_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_INTE_CSI_DMA
-+// Description : None
-+#define RPI_MIPICFG_INTE_CSI_DMA_RESET  0x0
-+#define RPI_MIPICFG_INTE_CSI_DMA_BITS   0x00000001
-+#define RPI_MIPICFG_INTE_CSI_DMA_MSB    0
-+#define RPI_MIPICFG_INTE_CSI_DMA_LSB    0
-+#define RPI_MIPICFG_INTE_CSI_DMA_ACCESS "RW"
-+// ================================================================================
-+// Register    : RPI_MIPICFG_INTF
-+// JTAG access : synchronous
-+// Description : Interrupt Force
-+#define RPI_MIPICFG_INTF_OFFSET 0x00000030
-+#define RPI_MIPICFG_INTF_BITS   0x0000000f
-+#define RPI_MIPICFG_INTF_RESET  0x00000000
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_INTF_DSI_HOST
-+// Description : None
-+#define RPI_MIPICFG_INTF_DSI_HOST_RESET  0x0
-+#define RPI_MIPICFG_INTF_DSI_HOST_BITS   0x00000008
-+#define RPI_MIPICFG_INTF_DSI_HOST_MSB    3
-+#define RPI_MIPICFG_INTF_DSI_HOST_LSB    3
-+#define RPI_MIPICFG_INTF_DSI_HOST_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_INTF_CSI_HOST
-+// Description : None
-+#define RPI_MIPICFG_INTF_CSI_HOST_RESET  0x0
-+#define RPI_MIPICFG_INTF_CSI_HOST_BITS   0x00000004
-+#define RPI_MIPICFG_INTF_CSI_HOST_MSB    2
-+#define RPI_MIPICFG_INTF_CSI_HOST_LSB    2
-+#define RPI_MIPICFG_INTF_CSI_HOST_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_INTF_DSI_DMA
-+// Description : None
-+#define RPI_MIPICFG_INTF_DSI_DMA_RESET  0x0
-+#define RPI_MIPICFG_INTF_DSI_DMA_BITS   0x00000002
-+#define RPI_MIPICFG_INTF_DSI_DMA_MSB    1
-+#define RPI_MIPICFG_INTF_DSI_DMA_LSB    1
-+#define RPI_MIPICFG_INTF_DSI_DMA_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_INTF_CSI_DMA
-+// Description : None
-+#define RPI_MIPICFG_INTF_CSI_DMA_RESET  0x0
-+#define RPI_MIPICFG_INTF_CSI_DMA_BITS   0x00000001
-+#define RPI_MIPICFG_INTF_CSI_DMA_MSB    0
-+#define RPI_MIPICFG_INTF_CSI_DMA_LSB    0
-+#define RPI_MIPICFG_INTF_CSI_DMA_ACCESS "RW"
-+// ================================================================================
-+// Register    : RPI_MIPICFG_INTS
-+// JTAG access : synchronous
-+// Description : Interrupt status after masking & forcing
-+#define RPI_MIPICFG_INTS_OFFSET 0x00000034
-+#define RPI_MIPICFG_INTS_BITS   0x0000000f
-+#define RPI_MIPICFG_INTS_RESET  0x00000000
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_INTS_DSI_HOST
-+// Description : None
-+#define RPI_MIPICFG_INTS_DSI_HOST_RESET  0x0
-+#define RPI_MIPICFG_INTS_DSI_HOST_BITS   0x00000008
-+#define RPI_MIPICFG_INTS_DSI_HOST_MSB    3
-+#define RPI_MIPICFG_INTS_DSI_HOST_LSB    3
-+#define RPI_MIPICFG_INTS_DSI_HOST_ACCESS "RO"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_INTS_CSI_HOST
-+// Description : None
-+#define RPI_MIPICFG_INTS_CSI_HOST_RESET  0x0
-+#define RPI_MIPICFG_INTS_CSI_HOST_BITS   0x00000004
-+#define RPI_MIPICFG_INTS_CSI_HOST_MSB    2
-+#define RPI_MIPICFG_INTS_CSI_HOST_LSB    2
-+#define RPI_MIPICFG_INTS_CSI_HOST_ACCESS "RO"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_INTS_DSI_DMA
-+// Description : None
-+#define RPI_MIPICFG_INTS_DSI_DMA_RESET  0x0
-+#define RPI_MIPICFG_INTS_DSI_DMA_BITS   0x00000002
-+#define RPI_MIPICFG_INTS_DSI_DMA_MSB    1
-+#define RPI_MIPICFG_INTS_DSI_DMA_LSB    1
-+#define RPI_MIPICFG_INTS_DSI_DMA_ACCESS "RO"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_INTS_CSI_DMA
-+// Description : None
-+#define RPI_MIPICFG_INTS_CSI_DMA_RESET  0x0
-+#define RPI_MIPICFG_INTS_CSI_DMA_BITS   0x00000001
-+#define RPI_MIPICFG_INTS_CSI_DMA_MSB    0
-+#define RPI_MIPICFG_INTS_CSI_DMA_LSB    0
-+#define RPI_MIPICFG_INTS_CSI_DMA_ACCESS "RO"
-+// ================================================================================
-+// Register    : RPI_MIPICFG_BLOCK_ID
-+// JTAG access : asynchronous
-+// Description : Block Identifier
-+#define RPI_MIPICFG_BLOCK_ID_OFFSET 0x00000038
-+#define RPI_MIPICFG_BLOCK_ID_BITS   0xffffffff
-+#define RPI_MIPICFG_BLOCK_ID_RESET  0x4d495049
-+#define RPI_MIPICFG_BLOCK_ID_MSB    31
-+#define RPI_MIPICFG_BLOCK_ID_LSB    0
-+#define RPI_MIPICFG_BLOCK_ID_ACCESS "RO"
-+// ================================================================================
-+// Register    : RPI_MIPICFG_INSTANCE_ID
-+// JTAG access : asynchronous
-+// Description : Block Instance Identifier
-+#define RPI_MIPICFG_INSTANCE_ID_OFFSET 0x0000003c
-+#define RPI_MIPICFG_INSTANCE_ID_BITS   0x0000000f
-+#define RPI_MIPICFG_INSTANCE_ID_RESET  0x00000000
-+#define RPI_MIPICFG_INSTANCE_ID_MSB    3
-+#define RPI_MIPICFG_INSTANCE_ID_LSB    0
-+#define RPI_MIPICFG_INSTANCE_ID_ACCESS "RO"
-+// ================================================================================
-+// Register    : RPI_MIPICFG_RSTSEQ_AUTO
-+// JTAG access : synchronous
-+// Description : None
-+#define RPI_MIPICFG_RSTSEQ_AUTO_OFFSET 0x00000040
-+#define RPI_MIPICFG_RSTSEQ_AUTO_BITS   0x00000007
-+#define RPI_MIPICFG_RSTSEQ_AUTO_RESET  0x00000007
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_RSTSEQ_AUTO_CSI
-+// Description : 1 = reset is controlled by the sequencer
-+//               0 = reset is controlled by rstseq_ctrl
-+#define RPI_MIPICFG_RSTSEQ_AUTO_CSI_RESET  0x1
-+#define RPI_MIPICFG_RSTSEQ_AUTO_CSI_BITS   0x00000004
-+#define RPI_MIPICFG_RSTSEQ_AUTO_CSI_MSB    2
-+#define RPI_MIPICFG_RSTSEQ_AUTO_CSI_LSB    2
-+#define RPI_MIPICFG_RSTSEQ_AUTO_CSI_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_RSTSEQ_AUTO_DPI
-+// Description : 1 = reset is controlled by the sequencer
-+//               0 = reset is controlled by rstseq_ctrl
-+#define RPI_MIPICFG_RSTSEQ_AUTO_DPI_RESET  0x1
-+#define RPI_MIPICFG_RSTSEQ_AUTO_DPI_BITS   0x00000002
-+#define RPI_MIPICFG_RSTSEQ_AUTO_DPI_MSB    1
-+#define RPI_MIPICFG_RSTSEQ_AUTO_DPI_LSB    1
-+#define RPI_MIPICFG_RSTSEQ_AUTO_DPI_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_RSTSEQ_AUTO_BUSADAPTER
-+// Description : 1 = reset is controlled by the sequencer
-+//               0 = reset is controlled by rstseq_ctrl
-+#define RPI_MIPICFG_RSTSEQ_AUTO_BUSADAPTER_RESET  0x1
-+#define RPI_MIPICFG_RSTSEQ_AUTO_BUSADAPTER_BITS   0x00000001
-+#define RPI_MIPICFG_RSTSEQ_AUTO_BUSADAPTER_MSB    0
-+#define RPI_MIPICFG_RSTSEQ_AUTO_BUSADAPTER_LSB    0
-+#define RPI_MIPICFG_RSTSEQ_AUTO_BUSADAPTER_ACCESS "RW"
-+// ================================================================================
-+// Register    : RPI_MIPICFG_RSTSEQ_PARALLEL
-+// JTAG access : synchronous
-+// Description : None
-+#define RPI_MIPICFG_RSTSEQ_PARALLEL_OFFSET 0x00000044
-+#define RPI_MIPICFG_RSTSEQ_PARALLEL_BITS   0x00000007
-+#define RPI_MIPICFG_RSTSEQ_PARALLEL_RESET  0x00000006
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_RSTSEQ_PARALLEL_CSI
-+// Description : Is this reset parallel (i.e. not part of the sequence)
-+#define RPI_MIPICFG_RSTSEQ_PARALLEL_CSI_RESET  0x1
-+#define RPI_MIPICFG_RSTSEQ_PARALLEL_CSI_BITS   0x00000004
-+#define RPI_MIPICFG_RSTSEQ_PARALLEL_CSI_MSB    2
-+#define RPI_MIPICFG_RSTSEQ_PARALLEL_CSI_LSB    2
-+#define RPI_MIPICFG_RSTSEQ_PARALLEL_CSI_ACCESS "RO"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_RSTSEQ_PARALLEL_DPI
-+// Description : Is this reset parallel (i.e. not part of the sequence)
-+#define RPI_MIPICFG_RSTSEQ_PARALLEL_DPI_RESET  0x1
-+#define RPI_MIPICFG_RSTSEQ_PARALLEL_DPI_BITS   0x00000002
-+#define RPI_MIPICFG_RSTSEQ_PARALLEL_DPI_MSB    1
-+#define RPI_MIPICFG_RSTSEQ_PARALLEL_DPI_LSB    1
-+#define RPI_MIPICFG_RSTSEQ_PARALLEL_DPI_ACCESS "RO"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_RSTSEQ_PARALLEL_BUSADAPTER
-+// Description : Is this reset parallel (i.e. not part of the sequence)
-+#define RPI_MIPICFG_RSTSEQ_PARALLEL_BUSADAPTER_RESET  0x0
-+#define RPI_MIPICFG_RSTSEQ_PARALLEL_BUSADAPTER_BITS   0x00000001
-+#define RPI_MIPICFG_RSTSEQ_PARALLEL_BUSADAPTER_MSB    0
-+#define RPI_MIPICFG_RSTSEQ_PARALLEL_BUSADAPTER_LSB    0
-+#define RPI_MIPICFG_RSTSEQ_PARALLEL_BUSADAPTER_ACCESS "RO"
-+// ================================================================================
-+// Register    : RPI_MIPICFG_RSTSEQ_CTRL
-+// JTAG access : synchronous
-+// Description : None
-+#define RPI_MIPICFG_RSTSEQ_CTRL_OFFSET 0x00000048
-+#define RPI_MIPICFG_RSTSEQ_CTRL_BITS   0x00000007
-+#define RPI_MIPICFG_RSTSEQ_CTRL_RESET  0x00000000
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_RSTSEQ_CTRL_CSI
-+// Description : 1 = keep the reset asserted
-+//               0 = keep the reset deasserted
-+//               This is ignored if rstseq_auto=1
-+#define RPI_MIPICFG_RSTSEQ_CTRL_CSI_RESET  0x0
-+#define RPI_MIPICFG_RSTSEQ_CTRL_CSI_BITS   0x00000004
-+#define RPI_MIPICFG_RSTSEQ_CTRL_CSI_MSB    2
-+#define RPI_MIPICFG_RSTSEQ_CTRL_CSI_LSB    2
-+#define RPI_MIPICFG_RSTSEQ_CTRL_CSI_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_RSTSEQ_CTRL_DPI
-+// Description : 1 = keep the reset asserted
-+//               0 = keep the reset deasserted
-+//               This is ignored if rstseq_auto=1
-+#define RPI_MIPICFG_RSTSEQ_CTRL_DPI_RESET  0x0
-+#define RPI_MIPICFG_RSTSEQ_CTRL_DPI_BITS   0x00000002
-+#define RPI_MIPICFG_RSTSEQ_CTRL_DPI_MSB    1
-+#define RPI_MIPICFG_RSTSEQ_CTRL_DPI_LSB    1
-+#define RPI_MIPICFG_RSTSEQ_CTRL_DPI_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_RSTSEQ_CTRL_BUSADAPTER
-+// Description : 1 = keep the reset asserted
-+//               0 = keep the reset deasserted
-+//               This is ignored if rstseq_auto=1
-+#define RPI_MIPICFG_RSTSEQ_CTRL_BUSADAPTER_RESET  0x0
-+#define RPI_MIPICFG_RSTSEQ_CTRL_BUSADAPTER_BITS   0x00000001
-+#define RPI_MIPICFG_RSTSEQ_CTRL_BUSADAPTER_MSB    0
-+#define RPI_MIPICFG_RSTSEQ_CTRL_BUSADAPTER_LSB    0
-+#define RPI_MIPICFG_RSTSEQ_CTRL_BUSADAPTER_ACCESS "RW"
-+// ================================================================================
-+// Register    : RPI_MIPICFG_RSTSEQ_TRIG
-+// JTAG access : synchronous
-+// Description : None
-+#define RPI_MIPICFG_RSTSEQ_TRIG_OFFSET 0x0000004c
-+#define RPI_MIPICFG_RSTSEQ_TRIG_BITS   0x00000007
-+#define RPI_MIPICFG_RSTSEQ_TRIG_RESET  0x00000000
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_RSTSEQ_TRIG_CSI
-+// Description : Pulses the reset output
-+#define RPI_MIPICFG_RSTSEQ_TRIG_CSI_RESET  0x0
-+#define RPI_MIPICFG_RSTSEQ_TRIG_CSI_BITS   0x00000004
-+#define RPI_MIPICFG_RSTSEQ_TRIG_CSI_MSB    2
-+#define RPI_MIPICFG_RSTSEQ_TRIG_CSI_LSB    2
-+#define RPI_MIPICFG_RSTSEQ_TRIG_CSI_ACCESS "SC"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_RSTSEQ_TRIG_DPI
-+// Description : Pulses the reset output
-+#define RPI_MIPICFG_RSTSEQ_TRIG_DPI_RESET  0x0
-+#define RPI_MIPICFG_RSTSEQ_TRIG_DPI_BITS   0x00000002
-+#define RPI_MIPICFG_RSTSEQ_TRIG_DPI_MSB    1
-+#define RPI_MIPICFG_RSTSEQ_TRIG_DPI_LSB    1
-+#define RPI_MIPICFG_RSTSEQ_TRIG_DPI_ACCESS "SC"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_RSTSEQ_TRIG_BUSADAPTER
-+// Description : Pulses the reset output
-+#define RPI_MIPICFG_RSTSEQ_TRIG_BUSADAPTER_RESET  0x0
-+#define RPI_MIPICFG_RSTSEQ_TRIG_BUSADAPTER_BITS   0x00000001
-+#define RPI_MIPICFG_RSTSEQ_TRIG_BUSADAPTER_MSB    0
-+#define RPI_MIPICFG_RSTSEQ_TRIG_BUSADAPTER_LSB    0
-+#define RPI_MIPICFG_RSTSEQ_TRIG_BUSADAPTER_ACCESS "SC"
-+// ================================================================================
-+// Register    : RPI_MIPICFG_RSTSEQ_DONE
-+// JTAG access : synchronous
-+// Description : None
-+#define RPI_MIPICFG_RSTSEQ_DONE_OFFSET 0x00000050
-+#define RPI_MIPICFG_RSTSEQ_DONE_BITS   0x00000007
-+#define RPI_MIPICFG_RSTSEQ_DONE_RESET  0x00000000
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_RSTSEQ_DONE_CSI
-+// Description : Indicates the current state of the reset
-+#define RPI_MIPICFG_RSTSEQ_DONE_CSI_RESET  0x0
-+#define RPI_MIPICFG_RSTSEQ_DONE_CSI_BITS   0x00000004
-+#define RPI_MIPICFG_RSTSEQ_DONE_CSI_MSB    2
-+#define RPI_MIPICFG_RSTSEQ_DONE_CSI_LSB    2
-+#define RPI_MIPICFG_RSTSEQ_DONE_CSI_ACCESS "RO"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_RSTSEQ_DONE_DPI
-+// Description : Indicates the current state of the reset
-+#define RPI_MIPICFG_RSTSEQ_DONE_DPI_RESET  0x0
-+#define RPI_MIPICFG_RSTSEQ_DONE_DPI_BITS   0x00000002
-+#define RPI_MIPICFG_RSTSEQ_DONE_DPI_MSB    1
-+#define RPI_MIPICFG_RSTSEQ_DONE_DPI_LSB    1
-+#define RPI_MIPICFG_RSTSEQ_DONE_DPI_ACCESS "RO"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_RSTSEQ_DONE_BUSADAPTER
-+// Description : Indicates the current state of the reset
-+#define RPI_MIPICFG_RSTSEQ_DONE_BUSADAPTER_RESET  0x0
-+#define RPI_MIPICFG_RSTSEQ_DONE_BUSADAPTER_BITS   0x00000001
-+#define RPI_MIPICFG_RSTSEQ_DONE_BUSADAPTER_MSB    0
-+#define RPI_MIPICFG_RSTSEQ_DONE_BUSADAPTER_LSB    0
-+#define RPI_MIPICFG_RSTSEQ_DONE_BUSADAPTER_ACCESS "RO"
-+// ================================================================================
-+// Register    : RPI_MIPICFG_DFTSS
-+// JTAG access : asynchronous
-+// Description : None
-+#define RPI_MIPICFG_DFTSS_OFFSET 0x00000054
-+#define RPI_MIPICFG_DFTSS_BITS   0x0000001f
-+#define RPI_MIPICFG_DFTSS_RESET  0x00000000
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DFTSS_JTAG_COPY
-+// Description : None
-+#define RPI_MIPICFG_DFTSS_JTAG_COPY_RESET  0x0
-+#define RPI_MIPICFG_DFTSS_JTAG_COPY_BITS   0x00000010
-+#define RPI_MIPICFG_DFTSS_JTAG_COPY_MSB    4
-+#define RPI_MIPICFG_DFTSS_JTAG_COPY_LSB    4
-+#define RPI_MIPICFG_DFTSS_JTAG_COPY_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DFTSS_JTAG_ACCESS_ONLY
-+// Description : None
-+#define RPI_MIPICFG_DFTSS_JTAG_ACCESS_ONLY_RESET  0x0
-+#define RPI_MIPICFG_DFTSS_JTAG_ACCESS_ONLY_BITS   0x00000008
-+#define RPI_MIPICFG_DFTSS_JTAG_ACCESS_ONLY_MSB    3
-+#define RPI_MIPICFG_DFTSS_JTAG_ACCESS_ONLY_LSB    3
-+#define RPI_MIPICFG_DFTSS_JTAG_ACCESS_ONLY_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DFTSS_BYPASS_OUTSYNCS
-+// Description : None
-+#define RPI_MIPICFG_DFTSS_BYPASS_OUTSYNCS_RESET  0x0
-+#define RPI_MIPICFG_DFTSS_BYPASS_OUTSYNCS_BITS   0x00000004
-+#define RPI_MIPICFG_DFTSS_BYPASS_OUTSYNCS_MSB    2
-+#define RPI_MIPICFG_DFTSS_BYPASS_OUTSYNCS_LSB    2
-+#define RPI_MIPICFG_DFTSS_BYPASS_OUTSYNCS_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DFTSS_BYPASS_INSYNCS
-+// Description : None
-+#define RPI_MIPICFG_DFTSS_BYPASS_INSYNCS_RESET  0x0
-+#define RPI_MIPICFG_DFTSS_BYPASS_INSYNCS_BITS   0x00000002
-+#define RPI_MIPICFG_DFTSS_BYPASS_INSYNCS_MSB    1
-+#define RPI_MIPICFG_DFTSS_BYPASS_INSYNCS_LSB    1
-+#define RPI_MIPICFG_DFTSS_BYPASS_INSYNCS_ACCESS "RW"
-+// --------------------------------------------------------------------------------
-+// Field       : RPI_MIPICFG_DFTSS_BYPASS_RESETSYNCS
-+// Description : None
-+#define RPI_MIPICFG_DFTSS_BYPASS_RESETSYNCS_RESET  0x0
-+#define RPI_MIPICFG_DFTSS_BYPASS_RESETSYNCS_BITS   0x00000001
-+#define RPI_MIPICFG_DFTSS_BYPASS_RESETSYNCS_MSB    0
-+#define RPI_MIPICFG_DFTSS_BYPASS_RESETSYNCS_LSB    0
-+#define RPI_MIPICFG_DFTSS_BYPASS_RESETSYNCS_ACCESS "RW"
-+
-+#define CFG_WRITE(reg, val)  writel((val),  dsi->hw_base[RP1DSI_HW_BLOCK_CFG] + (reg ## _OFFSET))
-+#define CFG_READ(reg)        readl(dsi->hw_base[RP1DSI_HW_BLOCK_CFG] + (reg ## _OFFSET))
-+
-+/* ------------------------------- DPHY setup stuff ------------------------ */
-+
-+static void dphy_transaction(struct rp1_dsi *dsi, uint8_t test_code, uint8_t test_data)
-+{
-+	/*
-+	 * See pg 101 of mipi dphy bidir databook
-+	 * Assume we start with testclk high.
-+	 * Each APB write takes at least 10ns and we ignore TESTDOUT
-+	 * so there is no need for extra delays between the transitions.
-+	 */
-+	u32 tmp;
-+
-+	DSI_WRITE(DSI_PHY_TST_CTRL1, test_code | DPHY_CTRL1_PHY_TESTEN_BITS);
-+	DSI_WRITE(DSI_PHY_TST_CTRL0, 0);
-+	tmp = (DSI_READ(DSI_PHY_TST_CTRL1) >> DPHY_CTRL1_PHY_TESTDOUT_LSB) & 0xFF;
-+	DSI_WRITE(DSI_PHY_TST_CTRL1, test_data);
-+	DSI_WRITE(DSI_PHY_TST_CTRL0, DPHY_CTRL0_PHY_TESTCLK_BITS);
-+}
-+
-+static uint8_t dphy_get_div(u32 refclk_khz, u32 vco_freq_khz, u32 *ptr_m, u32 *ptr_n)
-+{
-+	/*
-+	 * See pg 77-78 of dphy databook
-+	 * fvco = m/n * refclk
-+	 * with the limit
-+	 * 40MHz >= fREFCLK / N >= 5MHz
-+	 * M (multiplier) must be an even number between 2 and 300
-+	 * N (input divider) must be an integer between 1 and 100
-+	 *
-+	 * In practice, given a 50MHz reference clock, it can produce any
-+	 * multiple of 10MHz, 11.1111MHz, 12.5MHz, 14.286MHz or 16.667MHz
-+	 * with < 1% error for all frequencies above 495MHz.
-+	 */
-+
-+	static const u32 REF_DIVN_MAX = 40000u;
-+	static const u32 REF_DIVN_MIN =  5000u;
-+	u32 best_n, best_m, best_err = 0x7fffffff;
-+	unsigned int n;
-+
-+	for (n = 1 + refclk_khz / REF_DIVN_MAX; n * REF_DIVN_MIN <= refclk_khz && n < 100; ++n) {
-+		u32 half_m = (n * vco_freq_khz + refclk_khz) / (2 * refclk_khz);
-+
-+		if (half_m < 150) {
-+			u32 f = (2 * half_m * refclk_khz) / n;
-+			u32 err = (f > vco_freq_khz) ? f - vco_freq_khz : vco_freq_khz - f;
-+
-+			if (err < best_err) {
-+				best_n = n;
-+				best_m = 2 * half_m;
-+				best_err = err;
-+				if (err == 0)
-+					break;
-+			}
-+		}
-+	}
-+
-+	if (64 * best_err < vco_freq_khz) { /* tolerate small error */
-+		*ptr_n = best_n;
-+		*ptr_m = best_m;
-+		return 1;
-+	}
-+	return 0;
-+}
-+
-+struct hsfreq_range {
-+	u16 mhz_max;
-+	u8  hsfreqrange;
-+	u8  clk_lp2hs;
-+	u8  clk_hs2lp;
-+	u8  data_lp2hs; /* excluding clk lane entry */
-+	u8  data_hs2lp;
-+};
-+
-+/* See Table A-3 on page 258 of dphy databook */
-+static const struct hsfreq_range hsfreq_table[] = {
-+	{   89, 0b000000, 32, 20, 26, 13 },
-+	{   99, 0b010000, 35, 23, 28, 14 },
-+	{  109, 0b100000, 32, 22, 26, 13 },
-+	{  129, 0b000001, 31, 20, 27, 13 },
-+	{  139, 0b010001, 33, 22, 26, 14 },
-+	{  149, 0b100001, 33, 21, 26, 14 },
-+	{  169, 0b000010, 32, 20, 27, 13 },
-+	{  179, 0b010010, 36, 23, 30, 15 },
-+	{  199, 0b100010, 40, 22, 33, 15 },
-+	{  219, 0b000011, 40, 22, 33, 15 },
-+	{  239, 0b010011, 44, 24, 36, 16 },
-+	{  249, 0b100011, 48, 24, 38, 17 },
-+	{  269, 0b000100, 48, 24, 38, 17 },
-+	{  299, 0b010100, 50, 27, 41, 18 },
-+	{  329, 0b000101, 56, 28, 45, 18 },
-+	{  359, 0b010101, 59, 28, 48, 19 },
-+	{  399, 0b100101, 61, 30, 50, 20 },
-+	{  449, 0b000110, 67, 31, 55, 21 },
-+	{  499, 0b010110, 73, 31, 59, 22 },
-+	{  549, 0b000111, 79, 36, 63, 24 },
-+	{  599, 0b010111, 83, 37, 68, 25 },
-+	{  649, 0b001000, 90, 38, 73, 27 },
-+	{  699, 0b011000, 95, 40, 77, 28 },
-+	{  749, 0b001001, 102, 40, 84, 28 },
-+	{  799, 0b011001, 106, 42, 87, 30 },
-+	{  849, 0b101001, 113, 44, 93, 31 },
-+	{  899, 0b111001, 118, 47, 98, 32 },
-+	{  949, 0b001010, 124, 47, 102, 34 },
-+	{  999, 0b011010, 130, 49, 107, 35 },
-+	{ 1049, 0b101010, 135, 51, 111, 37 },
-+	{ 1099, 0b111010, 139, 51, 114, 38 },
-+	{ 1149, 0b001011, 146, 54, 120, 40 },
-+	{ 1199, 0b011011, 153, 57, 125, 41 },
-+	{ 1249, 0b101011, 158, 58, 130, 42 },
-+	{ 1299, 0b111011, 163, 58, 135, 44 },
-+	{ 1349, 0b001100, 168, 60, 140, 45 },
-+	{ 1399, 0b011100, 172, 64, 144, 47 },
-+	{ 1449, 0b101100, 176, 65, 148, 48 },
-+	{ 1500, 0b111100, 181, 66, 153, 50 },
-+};
-+
-+static void dphy_set_hsfreqrange(struct rp1_dsi *dsi, u32 freq_mhz)
-+{
-+	unsigned int i;
-+
-+	if (freq_mhz < 80 || freq_mhz > 1500)
-+		drm_err(dsi->drm, "DPHY: Frequency %u MHz out of range\n",
-+			freq_mhz);
-+
-+	for (i = 0; i < ARRAY_SIZE(hsfreq_table) - 1; i++) {
-+		if (freq_mhz <= hsfreq_table[i].mhz_max)
-+			break;
-+	}
-+
-+	dsi->hsfreq_index = i;
-+	dphy_transaction(dsi, DPHY_HS_RX_CTRL_LANE0_OFFSET,
-+			 hsfreq_table[i].hsfreqrange << 1);
-+}
-+
-+static void dphy_configure_pll(struct rp1_dsi *dsi, u32 refclk_khz, u32 vco_freq_khz)
-+{
-+	u32 m = 0;
-+	u32 n = 0;
-+
-+	if (dphy_get_div(refclk_khz, vco_freq_khz, &m, &n)) {
-+		dphy_set_hsfreqrange(dsi, vco_freq_khz / 1000);
-+		/* Program m,n from registers */
-+		dphy_transaction(dsi, DPHY_PLL_DIV_CTRL_OFFSET, 0x30);
-+		/* N (program N-1) */
-+		dphy_transaction(dsi, DPHY_PLL_INPUT_DIV_OFFSET, n - 1);
-+		/* M[8:5] ?? */
-+		dphy_transaction(dsi, DPHY_PLL_LOOP_DIV_OFFSET, 0x80 | ((m - 1) >> 5));
-+		/* M[4:0] (program M-1) */
-+		dphy_transaction(dsi, DPHY_PLL_LOOP_DIV_OFFSET, ((m - 1) & 0x1F));
-+		drm_dbg_driver(dsi->drm,
-+			       "DPHY: vco freq want %dkHz got %dkHz = %d * (%dkHz / %d), hsfreqrange = 0x%02x\r\n",
-+			       vco_freq_khz, refclk_khz * m / n, m, refclk_khz,
-+			       n, hsfreq_table[dsi->hsfreq_index].hsfreqrange);
-+	} else {
-+		drm_info(dsi->drm,
-+			 "rp1dsi: Error configuring DPHY PLL! %dkHz = %d * (%dkHz / %d)\r\n",
-+			 vco_freq_khz, m, refclk_khz, n);
-+	}
-+}
-+
-+static void dphy_init_khz(struct rp1_dsi *dsi, u32 ref_freq, u32 vco_freq)
-+{
-+	/* Reset the PHY */
-+	DSI_WRITE(DSI_PHYRSTZ, 0);
-+	DSI_WRITE(DSI_PHY_TST_CTRL0, DPHY_CTRL0_PHY_TESTCLK_BITS);
-+	DSI_WRITE(DSI_PHY_TST_CTRL1, 0);
-+	DSI_WRITE(DSI_PHY_TST_CTRL0, (DPHY_CTRL0_PHY_TESTCLK_BITS | DPHY_CTRL0_PHY_TESTCLR_BITS));
-+	udelay(1);
-+	DSI_WRITE(DSI_PHY_TST_CTRL0, DPHY_CTRL0_PHY_TESTCLK_BITS);
-+	udelay(1);
-+	/* Since we are in DSI (not CSI2) mode here, start the PLL */
-+	dphy_configure_pll(dsi, ref_freq, vco_freq);
-+	udelay(1);
-+	/* Unreset */
-+	DSI_WRITE(DSI_PHYRSTZ, DSI_PHYRSTZ_SHUTDOWNZ_BITS);
-+	udelay(1);
-+	DSI_WRITE(DSI_PHYRSTZ, (DSI_PHYRSTZ_SHUTDOWNZ_BITS | DSI_PHYRSTZ_RSTZ_BITS));
-+	udelay(1); /* so we can see PLL coming up? */
-+}
-+
-+void rp1dsi_mipicfg_setup(struct rp1_dsi *dsi)
-+{
-+	/* Select DSI rather than CSI-2 */
-+	CFG_WRITE(RPI_MIPICFG_CFG, 0);
-+	/* Enable DSIDMA interrupt only */
-+	CFG_WRITE(RPI_MIPICFG_INTE, RPI_MIPICFG_INTE_DSI_DMA_BITS);
-+}
-+
-+static unsigned long rp1dsi_refclk_freq(struct rp1_dsi *dsi)
-+{
-+	unsigned long u;
-+
-+	u = (dsi->clocks[RP1DSI_CLOCK_REF]) ? clk_get_rate(dsi->clocks[RP1DSI_CLOCK_REF]) : 0;
-+	if (u < 1 || u >= (1ul << 30))
-+		u = 50000000ul; /* default XOSC frequency */
-+	return u;
-+}
-+
-+static void rp1dsi_dpiclk_start(struct rp1_dsi *dsi, unsigned int bpp, unsigned int lanes)
-+{
-+	unsigned long u;
-+
-+	if (dsi->clocks[RP1DSI_CLOCK_DPI]) {
-+		u = (dsi->clocks[RP1DSI_CLOCK_BYTE]) ?
-+				clk_get_rate(dsi->clocks[RP1DSI_CLOCK_BYTE]) : 0;
-+		drm_info(dsi->drm,
-+			 "rp1dsi: Nominal byte clock %lu; scale by %u/%u",
-+			 u, 4 * lanes, (bpp >> 1));
-+		if (u < 1 || u >= (1ul << 28))
-+			u = 72000000ul; /* default DUMMY frequency for byteclock */
-+
-+		clk_set_parent(dsi->clocks[RP1DSI_CLOCK_DPI], dsi->clocks[RP1DSI_CLOCK_BYTE]);
-+		clk_set_rate(dsi->clocks[RP1DSI_CLOCK_DPI], (4 * lanes * u) / (bpp >> 1));
-+		clk_prepare_enable(dsi->clocks[RP1DSI_CLOCK_DPI]);
-+	}
-+}
-+
-+static void rp1dsi_dpiclk_stop(struct rp1_dsi *dsi)
-+{
-+	if (dsi->clocks[RP1DSI_CLOCK_DPI])
-+		clk_disable_unprepare(dsi->clocks[RP1DSI_CLOCK_DPI]);
-+}
-+
-+/* Choose the internal on-the-bus DPI format, and DSI packing flag. */
-+static u32 get_colorcode(enum mipi_dsi_pixel_format fmt)
-+{
-+	switch (fmt) {
-+	case MIPI_DSI_FMT_RGB666:
-+		return 0x104;
-+	case MIPI_DSI_FMT_RGB666_PACKED:
-+		return 0x003;
-+	case MIPI_DSI_FMT_RGB565:
-+		return 0x000;
-+	case MIPI_DSI_FMT_RGB888:
-+		return 0x005;
-+	}
-+
-+	/* This should be impossible as the format is validated in
-+	 * rp1dsi_host_attach
-+	 */
-+	WARN_ONCE(1, "Invalid colour format configured for DSI");
-+	return 0x005;
-+}
-+
-+void rp1dsi_dsi_setup(struct rp1_dsi *dsi, struct drm_display_mode const *mode)
-+{
-+	u32 timeout, mask, vid_mode_cfg;
-+	u32 freq_khz;
-+	unsigned int bpp = mipi_dsi_pixel_format_to_bpp(dsi->display_format);
-+
-+	DSI_WRITE(DSI_PHY_IF_CFG, dsi->lanes - 1);
-+	DSI_WRITE(DSI_DPI_CFG_POL, 0);
-+	DSI_WRITE(DSI_GEN_VCID, dsi->vc);
-+	DSI_WRITE(DSI_DPI_COLOR_CODING, get_colorcode(dsi->display_format));
-+	/* a conservative guess (LP escape is slow!) */
-+	DSI_WRITE(DSI_DPI_LP_CMD_TIM, 0x00100000);
-+
-+	/* Drop to LP where possible */
-+	vid_mode_cfg = 0xbf00;
-+	if (!(dsi->display_flags & MIPI_DSI_MODE_VIDEO_SYNC_PULSE))
-+		vid_mode_cfg |= 0x01;
-+	if (dsi->display_flags & MIPI_DSI_MODE_VIDEO_BURST)
-+		vid_mode_cfg |= 0x02;
-+	DSI_WRITE(DSI_VID_MODE_CFG, vid_mode_cfg);
-+
-+	/* Use LP Escape Data signalling for all commands */
-+	DSI_WRITE(DSI_CMD_MODE_CFG, 0x10F7F00);
-+	/* Select Command Mode */
-+	DSI_WRITE(DSI_MODE_CFG, 1);
-+	/* XXX magic number */
-+	DSI_WRITE(DSI_TO_CNT_CFG, 0x02000200);
-+	/* XXX magic number */
-+	DSI_WRITE(DSI_BTA_TO_CNT, 0x800);
-+
-+	DSI_WRITE(DSI_VID_PKT_SIZE, mode->hdisplay);
-+	DSI_WRITE(DSI_VID_NUM_CHUNKS, 0);
-+	DSI_WRITE(DSI_VID_NULL_SIZE, 0);
-+
-+	/* Note, unlike Argon firmware, here we DON'T consider sync to be concurrent with porch */
-+	DSI_WRITE(DSI_VID_HSA_TIME,
-+		  (bpp * (mode->hsync_end - mode->hsync_start)) / (8 * dsi->lanes));
-+	DSI_WRITE(DSI_VID_HBP_TIME,
-+		  (bpp * (mode->htotal - mode->hsync_end)) / (8 * dsi->lanes));
-+	DSI_WRITE(DSI_VID_HLINE_TIME, (bpp * mode->htotal) / (8 * dsi->lanes));
-+	DSI_WRITE(DSI_VID_VSA_LINES, (mode->vsync_end - mode->vsync_start));
-+	DSI_WRITE(DSI_VID_VBP_LINES, (mode->vtotal - mode->vsync_end));
-+	DSI_WRITE(DSI_VID_VFP_LINES, (mode->vsync_start - mode->vdisplay));
-+	DSI_WRITE(DSI_VID_VACTIVE_LINES, mode->vdisplay);
-+
-+	freq_khz = (bpp *  mode->clock) / dsi->lanes;
-+
-+	dphy_init_khz(dsi, rp1dsi_refclk_freq(dsi) / 1000, freq_khz);
-+
-+	DSI_WRITE(DSI_PHY_TMR_LPCLK_CFG,
-+		  (hsfreq_table[dsi->hsfreq_index].clk_lp2hs << DSI_PHY_TMR_LP2HS_LSB) |
-+		  (hsfreq_table[dsi->hsfreq_index].clk_hs2lp << DSI_PHY_TMR_HS2LP_LSB));
-+	DSI_WRITE(DSI_PHY_TMR_CFG,
-+		  (hsfreq_table[dsi->hsfreq_index].data_lp2hs << DSI_PHY_TMR_LP2HS_LSB) |
-+		  (hsfreq_table[dsi->hsfreq_index].data_hs2lp << DSI_PHY_TMR_HS2LP_LSB));
-+
-+	DSI_WRITE(DSI_CLKMGR_CFG, 0x00000505);
-+
-+	/* Wait for PLL lock */
-+	for (timeout = (1 << 14); timeout != 0; --timeout) {
-+		usleep_range(10, 50);
-+		if (DSI_READ(DSI_PHY_STATUS) & (1 << 0))
-+			break;
-+	}
-+	if (timeout == 0)
-+		drm_err(dsi->drm, "RP1DSI: Time out waiting for PLL\n");
-+
-+	DSI_WRITE(DSI_LPCLK_CTRL, 0x1);		/* configure the requesthsclk */
-+	DSI_WRITE(DSI_PHY_TST_CTRL0, 0x2);
-+	DSI_WRITE(DSI_PCKHDL_CFG, 1 << 2);	/* allow bus turnaround */
-+	DSI_WRITE(DSI_PWR_UP, 0x1);		/* power up */
-+
-+	/* Now it should be safe to start the external DPI clock divider */
-+	rp1dsi_dpiclk_start(dsi, bpp, dsi->lanes);
-+
-+	/* Wait for all lane(s) to be in Stopstate */
-+	mask = (1 << 4);
-+	if (dsi->lanes >= 2)
-+		mask |= (1 << 7);
-+	if (dsi->lanes >= 3)
-+		mask |= (1 << 9);
-+	if (dsi->lanes >= 4)
-+		mask |= (1 << 11);
-+	for (timeout = (1 << 10); timeout != 0; --timeout) {
-+		usleep_range(10, 50);
-+		if ((DSI_READ(DSI_PHY_STATUS) & mask) == mask)
-+			break;
-+	}
-+	if (timeout == 0)
-+		drm_err(dsi->drm, "RP1DSI: Time out waiting for lanes (%x %x)\n",
-+			mask, DSI_READ(DSI_PHY_STATUS));
-+}
-+
-+void rp1dsi_dsi_send(struct rp1_dsi *dsi, u32 hdr, int len, const u8 *buf)
-+{
-+	u32 val;
-+
-+	/* Wait for both FIFOs empty */
-+	for (val = 256; val > 0; --val) {
-+		if ((DSI_READ(DSI_CMD_PKT_STATUS) & 0xF) == 0x5)
-+			break;
-+		usleep_range(100, 150);
-+	}
-+
-+	/* Write payload (in 32-bit words) and header */
-+	for (; len > 0; len -= 4) {
-+		val = *buf++;
-+		if (len > 1)
-+			val |= (*buf++) << 8;
-+		if (len > 2)
-+			val |= (*buf++) << 16;
-+		if (len > 3)
-+			val |= (*buf++) << 24;
-+		DSI_WRITE(DSI_GEN_PLD_DATA, val);
-+	}
-+	DSI_WRITE(DSI_GEN_HDR, hdr);
-+
-+	/* Wait for both FIFOs empty */
-+	for (val = 256; val > 0; --val) {
-+		if ((DSI_READ(DSI_CMD_PKT_STATUS) & 0xF) == 0x5)
-+			break;
-+		usleep_range(100, 150);
-+	}
-+}
-+
-+int rp1dsi_dsi_recv(struct rp1_dsi *dsi, int len, u8 *buf)
-+{
-+	int i, j;
-+	u32 val;
-+
-+	/* Wait until not busy and FIFO not empty */
-+	for (i = 1024; i > 0; --i) {
-+		val = DSI_READ(DSI_CMD_PKT_STATUS);
-+		if ((val & ((1 << 6) | (1 << 4))) == 0)
-+			break;
-+		usleep_range(100, 150);
-+	}
-+	if (i == 0)
-+		return -EIO;
-+
-+	for (i = 0; i < len; i += 4) {
-+		/* Read fifo must not be empty before all bytes are read */
-+		if (DSI_READ(DSI_CMD_PKT_STATUS) & (1 << 4))
-+			break;
-+
-+		val = DSI_READ(DSI_GEN_PLD_DATA);
-+		for (j = 0; j < 4 && j + i < len; j++)
-+			*buf++ = val >> (8 * j);
-+	}
-+
-+	return (i >= len) ? len : (i > 0) ? i : -EIO;
-+}
-+
-+void rp1dsi_dsi_stop(struct rp1_dsi *dsi)
-+{
-+	DSI_WRITE(DSI_MODE_CFG, 1);	/* Return to Command Mode */
-+	DSI_WRITE(DSI_LPCLK_CTRL, 2);	/* Stop the HS clock */
-+	DSI_WRITE(DSI_PWR_UP, 0x0);     /* Power down host controller */
-+	DSI_WRITE(DSI_PHYRSTZ, 0);      /* PHY into reset. */
-+	rp1dsi_dpiclk_stop(dsi);
-+}
-+
-+void rp1dsi_dsi_set_cmdmode(struct rp1_dsi *dsi, int mode)
-+{
-+	DSI_WRITE(DSI_MODE_CFG, mode);
-+}
diff --git a/target/linux/bcm27xx/patches-6.1/950-0886-drm-Add-RP1-DPI-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0886-drm-Add-RP1-DPI-driver.patch
deleted file mode 100644
index 2023bf73e8..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0886-drm-Add-RP1-DPI-driver.patch
+++ /dev/null
@@ -1,1552 +0,0 @@
-From 61c3065f89d4447c7e4cf61a466ebc3c4a834ad2 Mon Sep 17 00:00:00 2001
-From: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
-Date: Tue, 19 Sep 2023 17:51:49 +0100
-Subject: [PATCH] drm: Add RP1 DPI driver
-
-Add support for the RP1 DPI hardware.
-
-Signed-off-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
----
- drivers/gpu/drm/rp1/rp1-dpi/Kconfig       |  12 +
- drivers/gpu/drm/rp1/rp1-dpi/Makefile      |   5 +
- drivers/gpu/drm/rp1/rp1-dpi/rp1_dpi.c     | 429 ++++++++++++++++++
- drivers/gpu/drm/rp1/rp1-dpi/rp1_dpi.h     |  69 +++
- drivers/gpu/drm/rp1/rp1-dpi/rp1_dpi_cfg.c | 510 ++++++++++++++++++++++
- drivers/gpu/drm/rp1/rp1-dpi/rp1_dpi_hw.c  | 486 +++++++++++++++++++++
- 6 files changed, 1511 insertions(+)
- create mode 100644 drivers/gpu/drm/rp1/rp1-dpi/Kconfig
- create mode 100644 drivers/gpu/drm/rp1/rp1-dpi/Makefile
- create mode 100644 drivers/gpu/drm/rp1/rp1-dpi/rp1_dpi.c
- create mode 100644 drivers/gpu/drm/rp1/rp1-dpi/rp1_dpi.h
- create mode 100644 drivers/gpu/drm/rp1/rp1-dpi/rp1_dpi_cfg.c
- create mode 100644 drivers/gpu/drm/rp1/rp1-dpi/rp1_dpi_hw.c
-
---- /dev/null
-+++ b/drivers/gpu/drm/rp1/rp1-dpi/Kconfig
-@@ -0,0 +1,12 @@
-+# SPDX-License-Identifier: GPL-2.0-only
-+config DRM_RP1_DPI
-+	tristate "DRM Support for RP1 DPI"
-+	depends on DRM
-+	select MFD_RP1
-+	select DRM_GEM_DMA_HELPER
-+	select DRM_KMS_HELPER
-+	select DRM_VRAM_HELPER
-+	select DRM_TTM
-+	select DRM_TTM_HELPER
-+	help
-+	  Choose this option to enable Video Out on RP1
---- /dev/null
-+++ b/drivers/gpu/drm/rp1/rp1-dpi/Makefile
-@@ -0,0 +1,5 @@
-+# SPDX-License-Identifier: GPL-2.0-only
-+
-+drm-rp1-dpi-y := rp1_dpi.o rp1_dpi_hw.o rp1_dpi_cfg.o
-+
-+obj-$(CONFIG_DRM_RP1_DPI) += drm-rp1-dpi.o
---- /dev/null
-+++ b/drivers/gpu/drm/rp1/rp1-dpi/rp1_dpi.c
-@@ -0,0 +1,429 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later
-+/*
-+ * DRM Driver for DPI output on Raspberry Pi RP1
-+ *
-+ * Copyright (c) 2023 Raspberry Pi Limited.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/errno.h>
-+#include <linux/string.h>
-+#include <linux/slab.h>
-+#include <linux/mm.h>
-+#include <linux/fb.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+#include <linux/interrupt.h>
-+#include <linux/ioport.h>
-+#include <linux/list.h>
-+#include <linux/platform_device.h>
-+#include <linux/clk.h>
-+#include <linux/printk.h>
-+#include <linux/console.h>
-+#include <linux/debugfs.h>
-+#include <linux/uaccess.h>
-+#include <linux/io.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/cred.h>
-+#include <linux/media-bus-format.h>
-+#include <linux/pinctrl/consumer.h>
-+#include <drm/drm_drv.h>
-+#include <drm/drm_mm.h>
-+#include <drm/drm_fourcc.h>
-+#include <drm/drm_gem_atomic_helper.h>
-+#include <drm/drm_gem_dma_helper.h>
-+#include <drm/drm_atomic_helper.h>
-+#include <drm/drm_managed.h>
-+#include <drm/drm_crtc.h>
-+#include <drm/drm_crtc_helper.h>
-+#include <drm/drm_encoder.h>
-+#include <drm/drm_fb_helper.h>
-+#include <drm/drm_framebuffer.h>
-+#include <drm/drm_gem.h>
-+#include <drm/drm_gem_framebuffer_helper.h>
-+#include <drm/drm_simple_kms_helper.h>
-+#include <drm/drm_probe_helper.h>
-+#include <drm/drm_modeset_helper_vtables.h>
-+#include <drm/drm_vblank.h>
-+#include <drm/drm_of.h>
-+
-+#include "rp1_dpi.h"
-+
-+/*
-+ * Default bus format, where not specified by a connector/bridge
-+ * and not overridden by the OF property "default_bus_fmt".
-+ * This value is for compatibility with vc4 and VGA666-style boards,
-+ * even though RP1 hardware cannot achieve the full 18-bit depth
-+ * with that pinout (MEDIA_BUS_FMT_RGB666_1X24_CPADHI is preferred).
-+ */
-+static unsigned int default_bus_fmt = MEDIA_BUS_FMT_RGB666_1X18;
-+module_param(default_bus_fmt, uint, 0644);
-+
-+/* -------------------------------------------------------------- */
-+
-+static void rp1dpi_pipe_update(struct drm_simple_display_pipe *pipe,
-+			       struct drm_plane_state *old_state)
-+{
-+	struct drm_pending_vblank_event *event;
-+	unsigned long flags;
-+	struct drm_framebuffer *fb = pipe->plane.state->fb;
-+	struct rp1_dpi *dpi = pipe->crtc.dev->dev_private;
-+	struct drm_gem_object *gem = fb ? drm_gem_fb_get_obj(fb, 0) : NULL;
-+	struct drm_gem_dma_object *dma_obj = gem ? to_drm_gem_dma_obj(gem) : NULL;
-+	bool can_update = fb && dma_obj && dpi && dpi->pipe_enabled;
-+
-+	/* (Re-)start DPI-DMA where required; and update FB address */
-+	if (can_update) {
-+		if (!dpi->dpi_running || fb->format->format != dpi->cur_fmt) {
-+			if (dpi->dpi_running &&
-+			    fb->format->format != dpi->cur_fmt) {
-+				rp1dpi_hw_stop(dpi);
-+				dpi->dpi_running = false;
-+			}
-+			if (!dpi->dpi_running) {
-+				rp1dpi_hw_setup(dpi,
-+						fb->format->format,
-+						dpi->bus_fmt,
-+						dpi->de_inv,
-+						&pipe->crtc.state->mode);
-+				dpi->dpi_running = true;
-+			}
-+			dpi->cur_fmt = fb->format->format;
-+			drm_crtc_vblank_on(&pipe->crtc);
-+		}
-+		rp1dpi_hw_update(dpi, dma_obj->dma_addr, fb->offsets[0], fb->pitches[0]);
-+	}
-+
-+	/* Arm VBLANK event (or call it immediately in some error cases) */
-+	spin_lock_irqsave(&pipe->crtc.dev->event_lock, flags);
-+	event = pipe->crtc.state->event;
-+	if (event) {
-+		pipe->crtc.state->event = NULL;
-+		if (can_update && drm_crtc_vblank_get(&pipe->crtc) == 0)
-+			drm_crtc_arm_vblank_event(&pipe->crtc, event);
-+		else
-+			drm_crtc_send_vblank_event(&pipe->crtc, event);
-+	}
-+	spin_unlock_irqrestore(&pipe->crtc.dev->event_lock, flags);
-+}
-+
-+static void rp1dpi_pipe_enable(struct drm_simple_display_pipe *pipe,
-+			       struct drm_crtc_state *crtc_state,
-+			      struct drm_plane_state *plane_state)
-+{
-+	static const unsigned int M = 1000000;
-+	struct rp1_dpi *dpi = pipe->crtc.dev->dev_private;
-+	struct drm_connector *conn;
-+	struct drm_connector_list_iter conn_iter;
-+	unsigned int fpix, fdiv, fvco;
-+	int ret;
-+
-+	/* Look up the connector attached to DPI so we can get the
-+	 * bus_format.  Ideally the bridge would tell us the
-+	 * bus_format we want, but it doesn't yet, so assume that it's
-+	 * uniform throughout the bridge chain.
-+	 */
-+	dev_info(&dpi->pdev->dev, __func__);
-+	drm_connector_list_iter_begin(pipe->encoder.dev, &conn_iter);
-+	drm_for_each_connector_iter(conn, &conn_iter) {
-+		if (conn->encoder == &pipe->encoder) {
-+			dpi->de_inv = !!(conn->display_info.bus_flags &
-+							DRM_BUS_FLAG_DE_LOW);
-+			dpi->clk_inv = !!(conn->display_info.bus_flags &
-+						DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE);
-+			if (conn->display_info.num_bus_formats)
-+				dpi->bus_fmt = conn->display_info.bus_formats[0];
-+			break;
-+		}
-+	}
-+	drm_connector_list_iter_end(&conn_iter);
-+
-+	/* Set DPI clock to desired frequency. Currently (experimentally)
-+	 * we take control of the VideoPLL, to ensure we can generate it
-+	 * accurately. NB: this prevents concurrent use of DPI and VEC!
-+	 * Magic numbers ensure the parent clock is within [100MHz, 200MHz]
-+	 * with VCO in [1GHz, 1.33GHz]. The initial divide is by 6, 8 or 10.
-+	 */
-+	fpix = 1000 * pipe->crtc.state->mode.clock;
-+	fpix = clamp(fpix, 1 * M, 200 * M);
-+	fdiv = fpix;
-+	while (fdiv < 100 * M)
-+		fdiv *= 2;
-+	fvco = fdiv * 2 * DIV_ROUND_UP(500 * M, fdiv);
-+	ret = clk_set_rate(dpi->clocks[RP1DPI_CLK_PLLCORE], fvco);
-+	if (ret)
-+		dev_err(&dpi->pdev->dev, "Failed to set PLL VCO to %u (%d)", fvco, ret);
-+	ret = clk_set_rate(dpi->clocks[RP1DPI_CLK_PLLDIV], fdiv);
-+	if (ret)
-+		dev_err(&dpi->pdev->dev, "Failed to set PLL output to %u (%d)", fdiv, ret);
-+	ret = clk_set_rate(dpi->clocks[RP1DPI_CLK_DPI], fpix);
-+	if (ret)
-+		dev_err(&dpi->pdev->dev, "Failed to set DPI clock to %u (%d)", fpix, ret);
-+
-+	rp1dpi_vidout_setup(dpi, dpi->clk_inv);
-+	clk_prepare_enable(dpi->clocks[RP1DPI_CLK_PLLCORE]);
-+	clk_prepare_enable(dpi->clocks[RP1DPI_CLK_PLLDIV]);
-+	pinctrl_pm_select_default_state(&dpi->pdev->dev);
-+	clk_prepare_enable(dpi->clocks[RP1DPI_CLK_DPI]);
-+	dev_info(&dpi->pdev->dev, "Want %u /%u %u /%u %u; got VCO=%lu DIV=%lu DPI=%lu",
-+		 fvco, fvco / fdiv, fdiv, fdiv / fpix, fpix,
-+		 clk_get_rate(dpi->clocks[RP1DPI_CLK_PLLCORE]),
-+		 clk_get_rate(dpi->clocks[RP1DPI_CLK_PLLDIV]),
-+		 clk_get_rate(dpi->clocks[RP1DPI_CLK_DPI]));
-+
-+	/* Start DPI-DMA. pipe already has the new crtc and plane state. */
-+	dpi->pipe_enabled = true;
-+	dpi->cur_fmt = 0xdeadbeef;
-+	rp1dpi_pipe_update(pipe, 0);
-+}
-+
-+static void rp1dpi_pipe_disable(struct drm_simple_display_pipe *pipe)
-+{
-+	struct rp1_dpi *dpi = pipe->crtc.dev->dev_private;
-+
-+	dev_info(&dpi->pdev->dev, __func__);
-+	drm_crtc_vblank_off(&pipe->crtc);
-+	if (dpi->dpi_running) {
-+		rp1dpi_hw_stop(dpi);
-+		dpi->dpi_running = false;
-+	}
-+	clk_disable_unprepare(dpi->clocks[RP1DPI_CLK_DPI]);
-+	pinctrl_pm_select_sleep_state(&dpi->pdev->dev);
-+	clk_disable_unprepare(dpi->clocks[RP1DPI_CLK_PLLDIV]);
-+	clk_disable_unprepare(dpi->clocks[RP1DPI_CLK_PLLCORE]);
-+	dpi->pipe_enabled = false;
-+}
-+
-+static int rp1dpi_pipe_enable_vblank(struct drm_simple_display_pipe *pipe)
-+{
-+	struct rp1_dpi *dpi = pipe->crtc.dev->dev_private;
-+
-+	if (dpi)
-+		rp1dpi_hw_vblank_ctrl(dpi, 1);
-+
-+	return 0;
-+}
-+
-+static void rp1dpi_pipe_disable_vblank(struct drm_simple_display_pipe *pipe)
-+{
-+	struct rp1_dpi *dpi = pipe->crtc.dev->dev_private;
-+
-+	if (dpi)
-+		rp1dpi_hw_vblank_ctrl(dpi, 0);
-+}
-+
-+static const struct drm_simple_display_pipe_funcs rp1dpi_pipe_funcs = {
-+	.enable	    = rp1dpi_pipe_enable,
-+	.update	    = rp1dpi_pipe_update,
-+	.disable    = rp1dpi_pipe_disable,
-+	.prepare_fb = drm_gem_simple_display_pipe_prepare_fb,
-+	.enable_vblank	= rp1dpi_pipe_enable_vblank,
-+	.disable_vblank = rp1dpi_pipe_disable_vblank,
-+};
-+
-+static const struct drm_mode_config_funcs rp1dpi_mode_funcs = {
-+	.fb_create = drm_gem_fb_create,
-+	.atomic_check = drm_atomic_helper_check,
-+	.atomic_commit = drm_atomic_helper_commit,
-+};
-+
-+static void rp1dpi_stopall(struct drm_device *drm)
-+{
-+	if (drm->dev_private) {
-+		struct rp1_dpi *dpi = drm->dev_private;
-+
-+		if (dpi->dpi_running || rp1dpi_hw_busy(dpi)) {
-+			rp1dpi_hw_stop(dpi);
-+			clk_disable_unprepare(dpi->clocks[RP1DPI_CLK_DPI]);
-+			dpi->dpi_running = false;
-+		}
-+		rp1dpi_vidout_poweroff(dpi);
-+		pinctrl_pm_select_sleep_state(&dpi->pdev->dev);
-+	}
-+}
-+
-+DEFINE_DRM_GEM_DMA_FOPS(rp1dpi_fops);
-+
-+static struct drm_driver rp1dpi_driver = {
-+	.driver_features	= DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
-+	.fops			= &rp1dpi_fops,
-+	.name			= "drm-rp1-dpi",
-+	.desc			= "drm-rp1-dpi",
-+	.date			= "0",
-+	.major			= 1,
-+	.minor			= 0,
-+	DRM_GEM_DMA_DRIVER_OPS,
-+	.release		= rp1dpi_stopall,
-+};
-+
-+static const u32 rp1dpi_formats[] = {
-+	DRM_FORMAT_XRGB8888,
-+	DRM_FORMAT_XBGR8888,
-+	DRM_FORMAT_RGB888,
-+	DRM_FORMAT_BGR888,
-+	DRM_FORMAT_RGB565
-+};
-+
-+static int rp1dpi_platform_probe(struct platform_device *pdev)
-+{
-+	struct device *dev = &pdev->dev;
-+	struct drm_device *drm;
-+	struct rp1_dpi *dpi;
-+	struct drm_bridge *bridge = NULL;
-+	struct drm_panel *panel;
-+	int i, ret;
-+
-+	dev_info(dev, __func__);
-+	ret = drm_of_find_panel_or_bridge(pdev->dev.of_node, 0, 0,
-+					  &panel, &bridge);
-+	if (ret) {
-+		dev_info(dev, "%s: bridge not found\n", __func__);
-+		return -EPROBE_DEFER;
-+	}
-+	if (panel) {
-+		bridge = devm_drm_panel_bridge_add(dev, panel);
-+		if (IS_ERR(bridge))
-+			return PTR_ERR(bridge);
-+	}
-+
-+	drm = drm_dev_alloc(&rp1dpi_driver, dev);
-+	if (IS_ERR(drm)) {
-+		dev_info(dev, "%s %d", __func__, (int)__LINE__);
-+		ret = PTR_ERR(drm);
-+		return ret;
-+	}
-+	dpi = drmm_kzalloc(drm, sizeof(*dpi), GFP_KERNEL);
-+	if (!dpi) {
-+		dev_info(dev, "%s %d", __func__, (int)__LINE__);
-+		drm_dev_put(drm);
-+		return -ENOMEM;
-+	}
-+
-+	init_completion(&dpi->finished);
-+	dpi->drm = drm;
-+	dpi->pdev = pdev;
-+	drm->dev_private = dpi;
-+	platform_set_drvdata(pdev, drm);
-+
-+	dpi->bus_fmt = default_bus_fmt;
-+	ret = of_property_read_u32(dev->of_node, "default_bus_fmt", &dpi->bus_fmt);
-+
-+	for (i = 0; i < RP1DPI_NUM_HW_BLOCKS; i++) {
-+		dpi->hw_base[i] =
-+			devm_ioremap_resource(dev,
-+					      platform_get_resource(dpi->pdev, IORESOURCE_MEM, i));
-+		if (IS_ERR(dpi->hw_base[i])) {
-+			ret = PTR_ERR(dpi->hw_base[i]);
-+			dev_err(dev, "Error memory mapping regs[%d]\n", i);
-+			goto err_free_drm;
-+		}
-+	}
-+	ret = platform_get_irq(dpi->pdev, 0);
-+	if (ret > 0)
-+		ret = devm_request_irq(dev, ret, rp1dpi_hw_isr,
-+				       IRQF_SHARED, "rp1-dpi", dpi);
-+	if (ret) {
-+		dev_err(dev, "Unable to request interrupt\n");
-+		ret = -EINVAL;
-+		goto err_free_drm;
-+	}
-+	dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64));
-+
-+	for (i = 0; i < RP1DPI_NUM_CLOCKS; i++) {
-+		static const char * const myclocknames[RP1DPI_NUM_CLOCKS] = {
-+			"dpiclk", "plldiv", "pllcore"
-+		};
-+		dpi->clocks[i] = devm_clk_get(dev, myclocknames[i]);
-+		if (IS_ERR(dpi->clocks[i])) {
-+			ret = PTR_ERR(dpi->clocks[i]);
-+			goto err_free_drm;
-+		}
-+	}
-+
-+	ret = drmm_mode_config_init(drm);
-+	if (ret)
-+		goto err_free_drm;
-+
-+	drm->mode_config.max_width  = 4096;
-+	drm->mode_config.max_height = 4096;
-+	drm->mode_config.fb_base    = 0;
-+	drm->mode_config.preferred_depth = 32;
-+	drm->mode_config.prefer_shadow	 = 0;
-+	drm->mode_config.prefer_shadow_fbdev = 1;
-+	drm->mode_config.quirk_addfb_prefer_host_byte_order = true;
-+	drm->mode_config.funcs = &rp1dpi_mode_funcs;
-+	drm_vblank_init(drm, 1);
-+
-+	ret = drm_simple_display_pipe_init(drm,
-+					   &dpi->pipe,
-+					   &rp1dpi_pipe_funcs,
-+					   rp1dpi_formats,
-+					   ARRAY_SIZE(rp1dpi_formats),
-+					   NULL, NULL);
-+	if (!ret)
-+		ret = drm_simple_display_pipe_attach_bridge(&dpi->pipe, bridge);
-+	if (ret)
-+		goto err_free_drm;
-+
-+	drm_mode_config_reset(drm);
-+
-+	ret = drm_dev_register(drm, 0);
-+	if (ret)
-+		goto err_free_drm;
-+
-+	drm_fbdev_generic_setup(drm, 32);
-+
-+	dev_info(dev, "%s success\n", __func__);
-+	return ret;
-+
-+err_free_drm:
-+	dev_err(dev, "%s fail %d\n", __func__, ret);
-+	drm_dev_put(drm);
-+	return ret;
-+}
-+
-+static int rp1dpi_platform_remove(struct platform_device *pdev)
-+{
-+	struct drm_device *drm = platform_get_drvdata(pdev);
-+
-+	rp1dpi_stopall(drm);
-+	drm_dev_unregister(drm);
-+	drm_atomic_helper_shutdown(drm);
-+	drm_dev_put(drm);
-+
-+	return 0;
-+}
-+
-+static void rp1dpi_platform_shutdown(struct platform_device *pdev)
-+{
-+	struct drm_device *drm = platform_get_drvdata(pdev);
-+
-+	rp1dpi_stopall(drm);
-+}
-+
-+static const struct of_device_id rp1dpi_of_match[] = {
-+	{
-+		.compatible = "raspberrypi,rp1dpi",
-+	},
-+	{ /* sentinel */ },
-+};
-+
-+MODULE_DEVICE_TABLE(of, rp1dpi_of_match);
-+
-+static struct platform_driver rp1dpi_platform_driver = {
-+	.probe		= rp1dpi_platform_probe,
-+	.remove		= rp1dpi_platform_remove,
-+	.shutdown	= rp1dpi_platform_shutdown,
-+	.driver		= {
-+		.name	= DRIVER_NAME,
-+		.owner	= THIS_MODULE,
-+		.of_match_table = rp1dpi_of_match,
-+	},
-+};
-+
-+module_platform_driver(rp1dpi_platform_driver);
-+
-+MODULE_AUTHOR("Nick Hollinghurst");
-+MODULE_DESCRIPTION("DRM driver for DPI output on Raspberry Pi RP1");
-+MODULE_LICENSE("GPL");
---- /dev/null
-+++ b/drivers/gpu/drm/rp1/rp1-dpi/rp1_dpi.h
-@@ -0,0 +1,69 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * DRM Driver for DSI output on Raspberry Pi RP1
-+ *
-+ * Copyright (c) 2023 Raspberry Pi Limited.
-+ */
-+
-+#include <linux/types.h>
-+#include <linux/io.h>
-+#include <linux/clk.h>
-+#include <drm/drm_device.h>
-+#include <drm/drm_simple_kms_helper.h>
-+
-+#define MODULE_NAME "drm-rp1-dpi"
-+#define DRIVER_NAME "drm-rp1-dpi"
-+
-+/* ---------------------------------------------------------------------- */
-+
-+#define RP1DPI_HW_BLOCK_DPI   0
-+#define RP1DPI_HW_BLOCK_CFG   1
-+#define RP1DPI_NUM_HW_BLOCKS  2
-+
-+#define RP1DPI_CLK_DPI      0
-+#define RP1DPI_CLK_PLLDIV   1
-+#define RP1DPI_CLK_PLLCORE  2
-+#define RP1DPI_NUM_CLOCKS   3
-+
-+/* ---------------------------------------------------------------------- */
-+
-+struct rp1_dpi {
-+	/* DRM and platform device pointers */
-+	struct drm_device *drm;
-+	struct platform_device *pdev;
-+
-+	/* Framework and helper objects */
-+	struct drm_simple_display_pipe pipe;
-+	struct drm_connector connector;
-+
-+	/* Clocks: Video PLL, its primary divider, and DPI clock. */
-+	struct clk *clocks[RP1DPI_NUM_CLOCKS];
-+
-+	/* Block (DPI, VOCFG) base addresses, and current state */
-+	void __iomem *hw_base[RP1DPI_NUM_HW_BLOCKS];
-+	u32 cur_fmt;
-+	u32 bus_fmt;
-+	bool de_inv, clk_inv;
-+	bool dpi_running, pipe_enabled;
-+	struct completion finished;
-+};
-+
-+/* ---------------------------------------------------------------------- */
-+/* Functions to control the DPI/DMA block				  */
-+
-+void rp1dpi_hw_setup(struct rp1_dpi *dpi,
-+		     u32 in_format,
-+		     u32 bus_format,
-+		     bool de_inv,
-+		     struct drm_display_mode const *mode);
-+void rp1dpi_hw_update(struct rp1_dpi *dpi, dma_addr_t addr, u32 offset, u32 stride);
-+void rp1dpi_hw_stop(struct rp1_dpi *dpi);
-+int rp1dpi_hw_busy(struct rp1_dpi *dpi);
-+irqreturn_t rp1dpi_hw_isr(int irq, void *dev);
-+void rp1dpi_hw_vblank_ctrl(struct rp1_dpi *dpi, int enable);
-+
-+/* ---------------------------------------------------------------------- */
-+/* Functions to control the VIDEO OUT CFG block and check RP1 platform	  */
-+
-+void rp1dpi_vidout_setup(struct rp1_dpi *dpi, bool drive_negedge);
-+void rp1dpi_vidout_poweroff(struct rp1_dpi *dpi);
---- /dev/null
-+++ b/drivers/gpu/drm/rp1/rp1-dpi/rp1_dpi_cfg.c
-@@ -0,0 +1,510 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later
-+/*
-+ * DRM Driver for DPI output on Raspberry Pi RP1
-+ *
-+ * Copyright (c) 2023 Raspberry Pi Limited.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/errno.h>
-+#include <linux/mm.h>
-+#include <linux/delay.h>
-+#include <linux/interrupt.h>
-+#include <linux/platform_device.h>
-+#include <linux/printk.h>
-+#include <linux/rp1_platform.h>
-+
-+#include "rp1_dpi.h"
-+
-+// =============================================================================
-+// Register    : VIDEO_OUT_CFG_SEL
-+// JTAG access : synchronous
-+// Description : Selects source: VEC or DPI
-+#define VIDEO_OUT_CFG_SEL_OFFSET 0x00000000
-+#define VIDEO_OUT_CFG_SEL_BITS	 0x00000013
-+#define VIDEO_OUT_CFG_SEL_RESET	 0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_SEL_PCLK_INV
-+// Description : Select dpi_pclk output port polarity inversion.
-+#define VIDEO_OUT_CFG_SEL_PCLK_INV_RESET  0x0
-+#define VIDEO_OUT_CFG_SEL_PCLK_INV_BITS	  0x00000010
-+#define VIDEO_OUT_CFG_SEL_PCLK_INV_MSB	  4
-+#define VIDEO_OUT_CFG_SEL_PCLK_INV_LSB	  4
-+#define VIDEO_OUT_CFG_SEL_PCLK_INV_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_SEL_PAD_MUX
-+// Description : VEC 1 DPI 0
-+#define VIDEO_OUT_CFG_SEL_PAD_MUX_RESET	 0x0
-+#define VIDEO_OUT_CFG_SEL_PAD_MUX_BITS	 0x00000002
-+#define VIDEO_OUT_CFG_SEL_PAD_MUX_MSB	 1
-+#define VIDEO_OUT_CFG_SEL_PAD_MUX_LSB	 1
-+#define VIDEO_OUT_CFG_SEL_PAD_MUX_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_SEL_VDAC_MUX
-+// Description : VEC 1 DPI 0
-+#define VIDEO_OUT_CFG_SEL_VDAC_MUX_RESET  0x0
-+#define VIDEO_OUT_CFG_SEL_VDAC_MUX_BITS	  0x00000001
-+#define VIDEO_OUT_CFG_SEL_VDAC_MUX_MSB	  0
-+#define VIDEO_OUT_CFG_SEL_VDAC_MUX_LSB	  0
-+#define VIDEO_OUT_CFG_SEL_VDAC_MUX_ACCESS "RW"
-+// =============================================================================
-+// Register    : VIDEO_OUT_CFG_VDAC_CFG
-+// JTAG access : synchronous
-+// Description : Configure SNPS VDAC
-+#define VIDEO_OUT_CFG_VDAC_CFG_OFFSET 0x00000004
-+#define VIDEO_OUT_CFG_VDAC_CFG_BITS   0x1fffffff
-+#define VIDEO_OUT_CFG_VDAC_CFG_RESET  0x0003ffff
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_VDAC_CFG_ENCTR
-+// Description : None
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENCTR_RESET  0x0
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENCTR_BITS   0x1c000000
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENCTR_MSB    28
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENCTR_LSB    26
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENCTR_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_VDAC_CFG_ENSC
-+// Description : None
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENSC_RESET  0x0
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENSC_BITS   0x03800000
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENSC_MSB	   25
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENSC_LSB	   23
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENSC_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_VDAC_CFG_ENDAC
-+// Description : None
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENDAC_RESET  0x0
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENDAC_BITS   0x00700000
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENDAC_MSB    22
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENDAC_LSB    20
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENDAC_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_VDAC_CFG_ENVBG
-+// Description : None
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENVBG_RESET  0x0
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENVBG_BITS   0x00080000
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENVBG_MSB    19
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENVBG_LSB    19
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENVBG_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_VDAC_CFG_ENEXTREF
-+// Description : None
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENEXTREF_RESET  0x0
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENEXTREF_BITS   0x00040000
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENEXTREF_MSB    18
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENEXTREF_LSB    18
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENEXTREF_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_VDAC_CFG_DAC2GC
-+// Description : dac2 gain control
-+#define VIDEO_OUT_CFG_VDAC_CFG_DAC2GC_RESET  0x3f
-+#define VIDEO_OUT_CFG_VDAC_CFG_DAC2GC_BITS   0x0003f000
-+#define VIDEO_OUT_CFG_VDAC_CFG_DAC2GC_MSB    17
-+#define VIDEO_OUT_CFG_VDAC_CFG_DAC2GC_LSB    12
-+#define VIDEO_OUT_CFG_VDAC_CFG_DAC2GC_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_VDAC_CFG_DAC1GC
-+// Description : dac1 gain control
-+#define VIDEO_OUT_CFG_VDAC_CFG_DAC1GC_RESET  0x3f
-+#define VIDEO_OUT_CFG_VDAC_CFG_DAC1GC_BITS   0x00000fc0
-+#define VIDEO_OUT_CFG_VDAC_CFG_DAC1GC_MSB    11
-+#define VIDEO_OUT_CFG_VDAC_CFG_DAC1GC_LSB    6
-+#define VIDEO_OUT_CFG_VDAC_CFG_DAC1GC_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_VDAC_CFG_DAC0GC
-+// Description : dac0 gain control
-+#define VIDEO_OUT_CFG_VDAC_CFG_DAC0GC_RESET  0x3f
-+#define VIDEO_OUT_CFG_VDAC_CFG_DAC0GC_BITS   0x0000003f
-+#define VIDEO_OUT_CFG_VDAC_CFG_DAC0GC_MSB    5
-+#define VIDEO_OUT_CFG_VDAC_CFG_DAC0GC_LSB    0
-+#define VIDEO_OUT_CFG_VDAC_CFG_DAC0GC_ACCESS "RW"
-+// =============================================================================
-+// Register    : VIDEO_OUT_CFG_VDAC_STATUS
-+// JTAG access : synchronous
-+// Description : Read VDAC status
-+#define VIDEO_OUT_CFG_VDAC_STATUS_OFFSET 0x00000008
-+#define VIDEO_OUT_CFG_VDAC_STATUS_BITS	 0x00000017
-+#define VIDEO_OUT_CFG_VDAC_STATUS_RESET	 0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_VDAC_STATUS_ENCTR3
-+// Description : None
-+#define VIDEO_OUT_CFG_VDAC_STATUS_ENCTR3_RESET	0x0
-+#define VIDEO_OUT_CFG_VDAC_STATUS_ENCTR3_BITS	0x00000010
-+#define VIDEO_OUT_CFG_VDAC_STATUS_ENCTR3_MSB	4
-+#define VIDEO_OUT_CFG_VDAC_STATUS_ENCTR3_LSB	4
-+#define VIDEO_OUT_CFG_VDAC_STATUS_ENCTR3_ACCESS "RO"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_VDAC_STATUS_CABLEOUT
-+// Description : None
-+#define VIDEO_OUT_CFG_VDAC_STATUS_CABLEOUT_RESET  "-"
-+#define VIDEO_OUT_CFG_VDAC_STATUS_CABLEOUT_BITS	  0x00000007
-+#define VIDEO_OUT_CFG_VDAC_STATUS_CABLEOUT_MSB	  2
-+#define VIDEO_OUT_CFG_VDAC_STATUS_CABLEOUT_LSB	  0
-+#define VIDEO_OUT_CFG_VDAC_STATUS_CABLEOUT_ACCESS "RO"
-+// =============================================================================
-+// Register    : VIDEO_OUT_CFG_MEM_PD
-+// JTAG access : synchronous
-+// Description : Control memory power down
-+#define VIDEO_OUT_CFG_MEM_PD_OFFSET 0x0000000c
-+#define VIDEO_OUT_CFG_MEM_PD_BITS   0x00000003
-+#define VIDEO_OUT_CFG_MEM_PD_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_MEM_PD_VEC
-+// Description : None
-+#define VIDEO_OUT_CFG_MEM_PD_VEC_RESET	0x0
-+#define VIDEO_OUT_CFG_MEM_PD_VEC_BITS	0x00000002
-+#define VIDEO_OUT_CFG_MEM_PD_VEC_MSB	1
-+#define VIDEO_OUT_CFG_MEM_PD_VEC_LSB	1
-+#define VIDEO_OUT_CFG_MEM_PD_VEC_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_MEM_PD_DPI
-+// Description : None
-+#define VIDEO_OUT_CFG_MEM_PD_DPI_RESET	0x0
-+#define VIDEO_OUT_CFG_MEM_PD_DPI_BITS	0x00000001
-+#define VIDEO_OUT_CFG_MEM_PD_DPI_MSB	0
-+#define VIDEO_OUT_CFG_MEM_PD_DPI_LSB	0
-+#define VIDEO_OUT_CFG_MEM_PD_DPI_ACCESS "RW"
-+// =============================================================================
-+// Register    : VIDEO_OUT_CFG_TEST_OVERRIDE
-+// JTAG access : synchronous
-+// Description : None
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_OFFSET 0x00000010
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_BITS   0xffffffff
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_TEST_OVERRIDE_PAD
-+// Description : None
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_PAD_RESET  0x0
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_PAD_BITS   0x80000000
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_PAD_MSB    31
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_PAD_LSB    31
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_PAD_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_TEST_OVERRIDE_VDAC
-+// Description : None
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_VDAC_RESET	0x0
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_VDAC_BITS	0x40000000
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_VDAC_MSB	30
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_VDAC_LSB	30
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_VDAC_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_TEST_OVERRIDE_RGBVAL
-+// Description : None
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_RGBVAL_RESET  0x00000000
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_RGBVAL_BITS	  0x3fffffff
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_RGBVAL_MSB	  29
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_RGBVAL_LSB	  0
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_RGBVAL_ACCESS "RW"
-+// =============================================================================
-+// Register    : VIDEO_OUT_CFG_INTR
-+// JTAG access : synchronous
-+// Description : Raw Interrupts
-+#define VIDEO_OUT_CFG_INTR_OFFSET 0x00000014
-+#define VIDEO_OUT_CFG_INTR_BITS	  0x00000003
-+#define VIDEO_OUT_CFG_INTR_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_INTR_DPI
-+// Description : None
-+#define VIDEO_OUT_CFG_INTR_DPI_RESET  0x0
-+#define VIDEO_OUT_CFG_INTR_DPI_BITS   0x00000002
-+#define VIDEO_OUT_CFG_INTR_DPI_MSB    1
-+#define VIDEO_OUT_CFG_INTR_DPI_LSB    1
-+#define VIDEO_OUT_CFG_INTR_DPI_ACCESS "RO"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_INTR_VEC
-+// Description : None
-+#define VIDEO_OUT_CFG_INTR_VEC_RESET  0x0
-+#define VIDEO_OUT_CFG_INTR_VEC_BITS   0x00000001
-+#define VIDEO_OUT_CFG_INTR_VEC_MSB    0
-+#define VIDEO_OUT_CFG_INTR_VEC_LSB    0
-+#define VIDEO_OUT_CFG_INTR_VEC_ACCESS "RO"
-+// =============================================================================
-+// Register    : VIDEO_OUT_CFG_INTE
-+// JTAG access : synchronous
-+// Description : Interrupt Enable
-+#define VIDEO_OUT_CFG_INTE_OFFSET 0x00000018
-+#define VIDEO_OUT_CFG_INTE_BITS	  0x00000003
-+#define VIDEO_OUT_CFG_INTE_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_INTE_DPI
-+// Description : None
-+#define VIDEO_OUT_CFG_INTE_DPI_RESET  0x0
-+#define VIDEO_OUT_CFG_INTE_DPI_BITS   0x00000002
-+#define VIDEO_OUT_CFG_INTE_DPI_MSB    1
-+#define VIDEO_OUT_CFG_INTE_DPI_LSB    1
-+#define VIDEO_OUT_CFG_INTE_DPI_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_INTE_VEC
-+// Description : None
-+#define VIDEO_OUT_CFG_INTE_VEC_RESET  0x0
-+#define VIDEO_OUT_CFG_INTE_VEC_BITS   0x00000001
-+#define VIDEO_OUT_CFG_INTE_VEC_MSB    0
-+#define VIDEO_OUT_CFG_INTE_VEC_LSB    0
-+#define VIDEO_OUT_CFG_INTE_VEC_ACCESS "RW"
-+// =============================================================================
-+// Register    : VIDEO_OUT_CFG_INTF
-+// JTAG access : synchronous
-+// Description : Interrupt Force
-+#define VIDEO_OUT_CFG_INTF_OFFSET 0x0000001c
-+#define VIDEO_OUT_CFG_INTF_BITS	  0x00000003
-+#define VIDEO_OUT_CFG_INTF_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_INTF_DPI
-+// Description : None
-+#define VIDEO_OUT_CFG_INTF_DPI_RESET  0x0
-+#define VIDEO_OUT_CFG_INTF_DPI_BITS   0x00000002
-+#define VIDEO_OUT_CFG_INTF_DPI_MSB    1
-+#define VIDEO_OUT_CFG_INTF_DPI_LSB    1
-+#define VIDEO_OUT_CFG_INTF_DPI_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_INTF_VEC
-+// Description : None
-+#define VIDEO_OUT_CFG_INTF_VEC_RESET  0x0
-+#define VIDEO_OUT_CFG_INTF_VEC_BITS   0x00000001
-+#define VIDEO_OUT_CFG_INTF_VEC_MSB    0
-+#define VIDEO_OUT_CFG_INTF_VEC_LSB    0
-+#define VIDEO_OUT_CFG_INTF_VEC_ACCESS "RW"
-+// =============================================================================
-+// Register    : VIDEO_OUT_CFG_INTS
-+// JTAG access : synchronous
-+// Description : Interrupt status after masking & forcing
-+#define VIDEO_OUT_CFG_INTS_OFFSET 0x00000020
-+#define VIDEO_OUT_CFG_INTS_BITS	  0x00000003
-+#define VIDEO_OUT_CFG_INTS_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_INTS_DPI
-+// Description : None
-+#define VIDEO_OUT_CFG_INTS_DPI_RESET  0x0
-+#define VIDEO_OUT_CFG_INTS_DPI_BITS   0x00000002
-+#define VIDEO_OUT_CFG_INTS_DPI_MSB    1
-+#define VIDEO_OUT_CFG_INTS_DPI_LSB    1
-+#define VIDEO_OUT_CFG_INTS_DPI_ACCESS "RO"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_INTS_VEC
-+// Description : None
-+#define VIDEO_OUT_CFG_INTS_VEC_RESET  0x0
-+#define VIDEO_OUT_CFG_INTS_VEC_BITS   0x00000001
-+#define VIDEO_OUT_CFG_INTS_VEC_MSB    0
-+#define VIDEO_OUT_CFG_INTS_VEC_LSB    0
-+#define VIDEO_OUT_CFG_INTS_VEC_ACCESS "RO"
-+// =============================================================================
-+// Register    : VIDEO_OUT_CFG_BLOCK_ID
-+// JTAG access : synchronous
-+// Description : Block Identifier
-+//		 Hexadecimal representation of "VOCF"
-+#define VIDEO_OUT_CFG_BLOCK_ID_OFFSET 0x00000024
-+#define VIDEO_OUT_CFG_BLOCK_ID_BITS   0xffffffff
-+#define VIDEO_OUT_CFG_BLOCK_ID_RESET  0x564f4346
-+#define VIDEO_OUT_CFG_BLOCK_ID_MSB    31
-+#define VIDEO_OUT_CFG_BLOCK_ID_LSB    0
-+#define VIDEO_OUT_CFG_BLOCK_ID_ACCESS "RO"
-+// =============================================================================
-+// Register    : VIDEO_OUT_CFG_INSTANCE_ID
-+// JTAG access : synchronous
-+// Description : Block Instance Identifier
-+#define VIDEO_OUT_CFG_INSTANCE_ID_OFFSET 0x00000028
-+#define VIDEO_OUT_CFG_INSTANCE_ID_BITS	 0x0000000f
-+#define VIDEO_OUT_CFG_INSTANCE_ID_RESET	 0x00000000
-+#define VIDEO_OUT_CFG_INSTANCE_ID_MSB	 3
-+#define VIDEO_OUT_CFG_INSTANCE_ID_LSB	 0
-+#define VIDEO_OUT_CFG_INSTANCE_ID_ACCESS "RO"
-+// =============================================================================
-+// Register    : VIDEO_OUT_CFG_RSTSEQ_AUTO
-+// JTAG access : synchronous
-+// Description : None
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_OFFSET 0x0000002c
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_BITS	 0x00000007
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_RESET	 0x00000007
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_RSTSEQ_AUTO_VEC
-+// Description : 1 = reset is controlled by the sequencer
-+//		 0 = reset is controlled by rstseq_ctrl
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_VEC_RESET  0x1
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_VEC_BITS   0x00000004
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_VEC_MSB    2
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_VEC_LSB    2
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_VEC_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_RSTSEQ_AUTO_DPI
-+// Description : 1 = reset is controlled by the sequencer
-+//		 0 = reset is controlled by rstseq_ctrl
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_DPI_RESET  0x1
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_DPI_BITS   0x00000002
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_DPI_MSB    1
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_DPI_LSB    1
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_DPI_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_RSTSEQ_AUTO_BUSADAPTER
-+// Description : 1 = reset is controlled by the sequencer
-+//		 0 = reset is controlled by rstseq_ctrl
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_BUSADAPTER_RESET  0x1
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_BUSADAPTER_BITS   0x00000001
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_BUSADAPTER_MSB    0
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_BUSADAPTER_LSB    0
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_BUSADAPTER_ACCESS "RW"
-+// =============================================================================
-+// Register    : VIDEO_OUT_CFG_RSTSEQ_PARALLEL
-+// JTAG access : synchronous
-+// Description : None
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_OFFSET 0x00000030
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_BITS   0x00000007
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_RESET  0x00000006
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_RSTSEQ_PARALLEL_VEC
-+// Description : Is this reset parallel (i.e. not part of the sequence)
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_VEC_RESET	 0x1
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_VEC_BITS	 0x00000004
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_VEC_MSB	 2
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_VEC_LSB	 2
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_VEC_ACCESS "RO"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_RSTSEQ_PARALLEL_DPI
-+// Description : Is this reset parallel (i.e. not part of the sequence)
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_DPI_RESET	 0x1
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_DPI_BITS	 0x00000002
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_DPI_MSB	 1
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_DPI_LSB	 1
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_DPI_ACCESS "RO"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_RSTSEQ_PARALLEL_BUSADAPTER
-+// Description : Is this reset parallel (i.e. not part of the sequence)
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_BUSADAPTER_RESET	0x0
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_BUSADAPTER_BITS	0x00000001
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_BUSADAPTER_MSB	0
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_BUSADAPTER_LSB	0
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_BUSADAPTER_ACCESS "RO"
-+// =============================================================================
-+// Register    : VIDEO_OUT_CFG_RSTSEQ_CTRL
-+// JTAG access : synchronous
-+// Description : None
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_OFFSET 0x00000034
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_BITS	 0x00000007
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_RESET	 0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_RSTSEQ_CTRL_VEC
-+// Description : 1 = keep the reset asserted
-+//		 0 = keep the reset deasserted
-+//		 This is ignored if rstseq_auto=1
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_VEC_RESET  0x0
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_VEC_BITS   0x00000004
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_VEC_MSB    2
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_VEC_LSB    2
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_VEC_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_RSTSEQ_CTRL_DPI
-+// Description : 1 = keep the reset asserted
-+//		 0 = keep the reset deasserted
-+//		 This is ignored if rstseq_auto=1
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_DPI_RESET  0x0
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_DPI_BITS   0x00000002
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_DPI_MSB    1
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_DPI_LSB    1
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_DPI_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_RSTSEQ_CTRL_BUSADAPTER
-+// Description : 1 = keep the reset asserted
-+//		 0 = keep the reset deasserted
-+//		 This is ignored if rstseq_auto=1
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_BUSADAPTER_RESET  0x0
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_BUSADAPTER_BITS   0x00000001
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_BUSADAPTER_MSB    0
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_BUSADAPTER_LSB    0
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_BUSADAPTER_ACCESS "RW"
-+// =============================================================================
-+// Register    : VIDEO_OUT_CFG_RSTSEQ_TRIG
-+// JTAG access : synchronous
-+// Description : None
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_OFFSET 0x00000038
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_BITS	 0x00000007
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_RESET	 0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_RSTSEQ_TRIG_VEC
-+// Description : Pulses the reset output
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_VEC_RESET  0x0
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_VEC_BITS   0x00000004
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_VEC_MSB    2
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_VEC_LSB    2
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_VEC_ACCESS "SC"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_RSTSEQ_TRIG_DPI
-+// Description : Pulses the reset output
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_DPI_RESET  0x0
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_DPI_BITS   0x00000002
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_DPI_MSB    1
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_DPI_LSB    1
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_DPI_ACCESS "SC"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_RSTSEQ_TRIG_BUSADAPTER
-+// Description : Pulses the reset output
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_BUSADAPTER_RESET  0x0
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_BUSADAPTER_BITS   0x00000001
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_BUSADAPTER_MSB    0
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_BUSADAPTER_LSB    0
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_BUSADAPTER_ACCESS "SC"
-+// =============================================================================
-+// Register    : VIDEO_OUT_CFG_RSTSEQ_DONE
-+// JTAG access : synchronous
-+// Description : None
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_OFFSET 0x0000003c
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_BITS	 0x00000007
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_RESET	 0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_RSTSEQ_DONE_VEC
-+// Description : Indicates the current state of the reset
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_VEC_RESET  0x0
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_VEC_BITS   0x00000004
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_VEC_MSB    2
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_VEC_LSB    2
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_VEC_ACCESS "RO"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_RSTSEQ_DONE_DPI
-+// Description : Indicates the current state of the reset
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_DPI_RESET  0x0
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_DPI_BITS   0x00000002
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_DPI_MSB    1
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_DPI_LSB    1
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_DPI_ACCESS "RO"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_RSTSEQ_DONE_BUSADAPTER
-+// Description : Indicates the current state of the reset
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_BUSADAPTER_RESET  0x0
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_BUSADAPTER_BITS   0x00000001
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_BUSADAPTER_MSB    0
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_BUSADAPTER_LSB    0
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_BUSADAPTER_ACCESS "RO"
-+// =============================================================================
-+
-+#define CFG_WRITE(reg, val)  writel((val),  dpi->hw_base[RP1DPI_HW_BLOCK_CFG] + (reg ## _OFFSET))
-+#define CFG_READ(reg)	     readl(dpi->hw_base[RP1DPI_HW_BLOCK_CFG] + (reg ## _OFFSET))
-+
-+void rp1dpi_vidout_setup(struct rp1_dpi *dpi, bool drive_negedge)
-+{
-+	/*
-+	 * We assume DPI and VEC can't be used at the same time (due to
-+	 * clashing requirements for PLL_VIDEO, and potentially for VDAC).
-+	 * We therefore leave VEC memories powered down.
-+	 */
-+	CFG_WRITE(VIDEO_OUT_CFG_MEM_PD, VIDEO_OUT_CFG_MEM_PD_VEC_BITS);
-+	CFG_WRITE(VIDEO_OUT_CFG_TEST_OVERRIDE,
-+		  VIDEO_OUT_CFG_TEST_OVERRIDE_VDAC_BITS);
-+
-+	/* DPI->Pads; DPI->VDAC; optionally flip PCLK polarity */
-+	CFG_WRITE(VIDEO_OUT_CFG_SEL,
-+		  drive_negedge ? VIDEO_OUT_CFG_SEL_PCLK_INV_BITS : 0);
-+
-+	/* configure VDAC for 3 channels, bandgap on, 710mV swing */
-+	CFG_WRITE(VIDEO_OUT_CFG_VDAC_CFG, 0);
-+
-+	/* enable DPI interrupt */
-+	CFG_WRITE(VIDEO_OUT_CFG_INTE, VIDEO_OUT_CFG_INTE_DPI_BITS);
-+}
-+
-+void rp1dpi_vidout_poweroff(struct rp1_dpi *dpi)
-+{
-+	/* disable DPI interrupt */
-+	CFG_WRITE(VIDEO_OUT_CFG_INTE, 0);
-+
-+	/* Ensure VDAC is turned off; power down DPI,VEC memories */
-+	CFG_WRITE(VIDEO_OUT_CFG_VDAC_CFG, 0);
-+	CFG_WRITE(VIDEO_OUT_CFG_MEM_PD, VIDEO_OUT_CFG_MEM_PD_BITS);
-+}
---- /dev/null
-+++ b/drivers/gpu/drm/rp1/rp1-dpi/rp1_dpi_hw.c
-@@ -0,0 +1,486 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later
-+/*
-+ * DRM Driver for DPI output on Raspberry Pi RP1
-+ *
-+ * Copyright (c) 2023 Raspberry Pi Limited.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/errno.h>
-+#include <linux/mm.h>
-+#include <linux/delay.h>
-+#include <linux/interrupt.h>
-+#include <linux/media-bus-format.h>
-+#include <linux/platform_device.h>
-+#include <linux/printk.h>
-+#include <drm/drm_fourcc.h>
-+#include <drm/drm_print.h>
-+#include <drm/drm_vblank.h>
-+
-+#include "rp1_dpi.h"
-+
-+// --- DPI DMA REGISTERS ---
-+
-+// Control
-+#define DPI_DMA_CONTROL				      0x0
-+#define DPI_DMA_CONTROL_ARM_SHIFT		      0
-+#define DPI_DMA_CONTROL_ARM_MASK		      BIT(DPI_DMA_CONTROL_ARM_SHIFT)
-+#define DPI_DMA_CONTROL_ALIGN16_SHIFT		      2
-+#define DPI_DMA_CONTROL_ALIGN16_MASK		      BIT(DPI_DMA_CONTROL_ALIGN16_SHIFT)
-+#define DPI_DMA_CONTROL_AUTO_REPEAT_SHIFT	      1
-+#define DPI_DMA_CONTROL_AUTO_REPEAT_MASK	      BIT(DPI_DMA_CONTROL_AUTO_REPEAT_SHIFT)
-+#define DPI_DMA_CONTROL_HIGH_WATER_SHIFT	      3
-+#define DPI_DMA_CONTROL_HIGH_WATER_MASK		      (0x1FF << DPI_DMA_CONTROL_HIGH_WATER_SHIFT)
-+#define DPI_DMA_CONTROL_DEN_POL_SHIFT		      12
-+#define DPI_DMA_CONTROL_DEN_POL_MASK		      BIT(DPI_DMA_CONTROL_DEN_POL_SHIFT)
-+#define DPI_DMA_CONTROL_HSYNC_POL_SHIFT		      13
-+#define DPI_DMA_CONTROL_HSYNC_POL_MASK		      BIT(DPI_DMA_CONTROL_HSYNC_POL_SHIFT)
-+#define DPI_DMA_CONTROL_VSYNC_POL_SHIFT		      14
-+#define DPI_DMA_CONTROL_VSYNC_POL_MASK		      BIT(DPI_DMA_CONTROL_VSYNC_POL_SHIFT)
-+#define DPI_DMA_CONTROL_COLORM_SHIFT		      15
-+#define DPI_DMA_CONTROL_COLORM_MASK		      BIT(DPI_DMA_CONTROL_COLORM_SHIFT)
-+#define DPI_DMA_CONTROL_SHUTDN_SHIFT		      16
-+#define DPI_DMA_CONTROL_SHUTDN_MASK		      BIT(DPI_DMA_CONTROL_SHUTDN_SHIFT)
-+#define DPI_DMA_CONTROL_HBP_EN_SHIFT		      17
-+#define DPI_DMA_CONTROL_HBP_EN_MASK		      BIT(DPI_DMA_CONTROL_HBP_EN_SHIFT)
-+#define DPI_DMA_CONTROL_HFP_EN_SHIFT		      18
-+#define DPI_DMA_CONTROL_HFP_EN_MASK		      BIT(DPI_DMA_CONTROL_HFP_EN_SHIFT)
-+#define DPI_DMA_CONTROL_VBP_EN_SHIFT		      19
-+#define DPI_DMA_CONTROL_VBP_EN_MASK		      BIT(DPI_DMA_CONTROL_VBP_EN_SHIFT)
-+#define DPI_DMA_CONTROL_VFP_EN_SHIFT		      20
-+#define DPI_DMA_CONTROL_VFP_EN_MASK		      BIT(DPI_DMA_CONTROL_VFP_EN_SHIFT)
-+#define DPI_DMA_CONTROL_HSYNC_EN_SHIFT		      21
-+#define DPI_DMA_CONTROL_HSYNC_EN_MASK		      BIT(DPI_DMA_CONTROL_HSYNC_EN_SHIFT)
-+#define DPI_DMA_CONTROL_VSYNC_EN_SHIFT		      22
-+#define DPI_DMA_CONTROL_VSYNC_EN_MASK		      BIT(DPI_DMA_CONTROL_VSYNC_EN_SHIFT)
-+#define DPI_DMA_CONTROL_FORCE_IMMED_SHIFT	      23
-+#define DPI_DMA_CONTROL_FORCE_IMMED_MASK	      BIT(DPI_DMA_CONTROL_FORCE_IMMED_SHIFT)
-+#define DPI_DMA_CONTROL_FORCE_DRAIN_SHIFT	      24
-+#define DPI_DMA_CONTROL_FORCE_DRAIN_MASK	      BIT(DPI_DMA_CONTROL_FORCE_DRAIN_SHIFT)
-+#define DPI_DMA_CONTROL_FORCE_EMPTY_SHIFT	      25
-+#define DPI_DMA_CONTROL_FORCE_EMPTY_MASK	      BIT(DPI_DMA_CONTROL_FORCE_EMPTY_SHIFT)
-+
-+// IRQ_ENABLES
-+#define DPI_DMA_IRQ_EN				      0x04
-+#define DPI_DMA_IRQ_EN_DMA_READY_SHIFT		      0
-+#define DPI_DMA_IRQ_EN_DMA_READY_MASK		      BIT(DPI_DMA_IRQ_EN_DMA_READY_SHIFT)
-+#define DPI_DMA_IRQ_EN_UNDERFLOW_SHIFT		      1
-+#define DPI_DMA_IRQ_EN_UNDERFLOW_MASK		      BIT(DPI_DMA_IRQ_EN_UNDERFLOW_SHIFT)
-+#define DPI_DMA_IRQ_EN_FRAME_START_SHIFT	      2
-+#define DPI_DMA_IRQ_EN_FRAME_START_MASK		      BIT(DPI_DMA_IRQ_EN_FRAME_START_SHIFT)
-+#define DPI_DMA_IRQ_EN_AFIFO_EMPTY_SHIFT	      3
-+#define DPI_DMA_IRQ_EN_AFIFO_EMPTY_MASK		      BIT(DPI_DMA_IRQ_EN_AFIFO_EMPTY_SHIFT)
-+#define DPI_DMA_IRQ_EN_TE_SHIFT			      4
-+#define DPI_DMA_IRQ_EN_TE_MASK			      BIT(DPI_DMA_IRQ_EN_TE_SHIFT)
-+#define DPI_DMA_IRQ_EN_ERROR_SHIFT		      5
-+#define DPI_DMA_IRQ_EN_ERROR_MASK		      BIT(DPI_DMA_IRQ_EN_ERROR_SHIFT)
-+#define DPI_DMA_IRQ_EN_MATCH_SHIFT		      6
-+#define DPI_DMA_IRQ_EN_MATCH_MASK		      BIT(DPI_DMA_IRQ_EN_MATCH_SHIFT)
-+#define DPI_DMA_IRQ_EN_MATCH_LINE_SHIFT		      16
-+#define DPI_DMA_IRQ_EN_MATCH_LINE_MASK		      (0xFFF << DPI_DMA_IRQ_EN_MATCH_LINE_SHIFT)
-+
-+// IRQ_FLAGS
-+#define DPI_DMA_IRQ_FLAGS			      0x08
-+#define DPI_DMA_IRQ_FLAGS_DMA_READY_SHIFT	      0
-+#define DPI_DMA_IRQ_FLAGS_DMA_READY_MASK	      BIT(DPI_DMA_IRQ_FLAGS_DMA_READY_SHIFT)
-+#define DPI_DMA_IRQ_FLAGS_UNDERFLOW_SHIFT	      1
-+#define DPI_DMA_IRQ_FLAGS_UNDERFLOW_MASK	      BIT(DPI_DMA_IRQ_FLAGS_UNDERFLOW_SHIFT)
-+#define DPI_DMA_IRQ_FLAGS_FRAME_START_SHIFT	      2
-+#define DPI_DMA_IRQ_FLAGS_FRAME_START_MASK	      BIT(DPI_DMA_IRQ_FLAGS_FRAME_START_SHIFT)
-+#define DPI_DMA_IRQ_FLAGS_AFIFO_EMPTY_SHIFT	      3
-+#define DPI_DMA_IRQ_FLAGS_AFIFO_EMPTY_MASK	      BIT(DPI_DMA_IRQ_FLAGS_AFIFO_EMPTY_SHIFT)
-+#define DPI_DMA_IRQ_FLAGS_TE_SHIFT		      4
-+#define DPI_DMA_IRQ_FLAGS_TE_MASK		      BIT(DPI_DMA_IRQ_FLAGS_TE_SHIFT)
-+#define DPI_DMA_IRQ_FLAGS_ERROR_SHIFT		      5
-+#define DPI_DMA_IRQ_FLAGS_ERROR_MASK		      BIT(DPI_DMA_IRQ_FLAGS_ERROR_SHIFT)
-+#define DPI_DMA_IRQ_FLAGS_MATCH_SHIFT		      6
-+#define DPI_DMA_IRQ_FLAGS_MATCH_MASK		      BIT(DPI_DMA_IRQ_FLAGS_MATCH_SHIFT)
-+
-+// QOS
-+#define DPI_DMA_QOS				      0xC
-+#define DPI_DMA_QOS_DQOS_SHIFT			      0
-+#define DPI_DMA_QOS_DQOS_MASK			      (0xF << DPI_DMA_QOS_DQOS_SHIFT)
-+#define DPI_DMA_QOS_ULEV_SHIFT			      4
-+#define DPI_DMA_QOS_ULEV_MASK			      (0xF << DPI_DMA_QOS_ULEV_SHIFT)
-+#define DPI_DMA_QOS_UQOS_SHIFT			      8
-+#define DPI_DMA_QOS_UQOS_MASK			      (0xF << DPI_DMA_QOS_UQOS_SHIFT)
-+#define DPI_DMA_QOS_LLEV_SHIFT			      12
-+#define DPI_DMA_QOS_LLEV_MASK			      (0xF << DPI_DMA_QOS_LLEV_SHIFT)
-+#define DPI_DMA_QOS_LQOS_SHIFT			      16
-+#define DPI_DMA_QOS_LQOS_MASK			      (0xF << DPI_DMA_QOS_LQOS_SHIFT)
-+
-+// Panics
-+#define DPI_DMA_PANICS				     0x38
-+#define DPI_DMA_PANICS_UPPER_COUNT_SHIFT	     0
-+#define DPI_DMA_PANICS_UPPER_COUNT_MASK		     \
-+				(0x0000FFFF << DPI_DMA_PANICS_UPPER_COUNT_SHIFT)
-+#define DPI_DMA_PANICS_LOWER_COUNT_SHIFT	     16
-+#define DPI_DMA_PANICS_LOWER_COUNT_MASK		     \
-+				(0x0000FFFF << DPI_DMA_PANICS_LOWER_COUNT_SHIFT)
-+
-+// DMA Address Lower:
-+#define DPI_DMA_DMA_ADDR_L			     0x10
-+
-+// DMA Address Upper:
-+#define DPI_DMA_DMA_ADDR_H			     0x40
-+
-+// DMA stride
-+#define DPI_DMA_DMA_STRIDE			     0x14
-+
-+// Visible Area
-+#define DPI_DMA_VISIBLE_AREA			     0x18
-+#define DPI_DMA_VISIBLE_AREA_ROWSM1_SHIFT     0
-+#define DPI_DMA_VISIBLE_AREA_ROWSM1_MASK     (0x0FFF << DPI_DMA_VISIBLE_AREA_ROWSM1_SHIFT)
-+#define DPI_DMA_VISIBLE_AREA_COLSM1_SHIFT    16
-+#define DPI_DMA_VISIBLE_AREA_COLSM1_MASK     (0x0FFF << DPI_DMA_VISIBLE_AREA_COLSM1_SHIFT)
-+
-+// Sync width
-+#define DPI_DMA_SYNC_WIDTH   0x1C
-+#define DPI_DMA_SYNC_WIDTH_ROWSM1_SHIFT	 0
-+#define DPI_DMA_SYNC_WIDTH_ROWSM1_MASK	 (0x0FFF << DPI_DMA_SYNC_WIDTH_ROWSM1_SHIFT)
-+#define DPI_DMA_SYNC_WIDTH_COLSM1_SHIFT	 16
-+#define DPI_DMA_SYNC_WIDTH_COLSM1_MASK	 (0x0FFF << DPI_DMA_SYNC_WIDTH_COLSM1_SHIFT)
-+
-+// Back porch
-+#define DPI_DMA_BACK_PORCH   0x20
-+#define DPI_DMA_BACK_PORCH_ROWSM1_SHIFT	 0
-+#define DPI_DMA_BACK_PORCH_ROWSM1_MASK	 (0x0FFF << DPI_DMA_BACK_PORCH_ROWSM1_SHIFT)
-+#define DPI_DMA_BACK_PORCH_COLSM1_SHIFT	 16
-+#define DPI_DMA_BACK_PORCH_COLSM1_MASK	 (0x0FFF << DPI_DMA_BACK_PORCH_COLSM1_SHIFT)
-+
-+// Front porch
-+#define DPI_DMA_FRONT_PORCH  0x24
-+#define DPI_DMA_FRONT_PORCH_ROWSM1_SHIFT     0
-+#define DPI_DMA_FRONT_PORCH_ROWSM1_MASK	 (0x0FFF << DPI_DMA_FRONT_PORCH_ROWSM1_SHIFT)
-+#define DPI_DMA_FRONT_PORCH_COLSM1_SHIFT     16
-+#define DPI_DMA_FRONT_PORCH_COLSM1_MASK	 (0x0FFF << DPI_DMA_FRONT_PORCH_COLSM1_SHIFT)
-+
-+// Input masks
-+#define DPI_DMA_IMASK	 0x2C
-+#define DPI_DMA_IMASK_R_SHIFT	 0
-+#define DPI_DMA_IMASK_R_MASK	 (0x3FF << DPI_DMA_IMASK_R_SHIFT)
-+#define DPI_DMA_IMASK_G_SHIFT	 10
-+#define DPI_DMA_IMASK_G_MASK	 (0x3FF << DPI_DMA_IMASK_G_SHIFT)
-+#define DPI_DMA_IMASK_B_SHIFT	 20
-+#define DPI_DMA_IMASK_B_MASK	 (0x3FF << DPI_DMA_IMASK_B_SHIFT)
-+
-+// Output Masks
-+#define DPI_DMA_OMASK	 0x30
-+#define DPI_DMA_OMASK_R_SHIFT	 0
-+#define DPI_DMA_OMASK_R_MASK	 (0x3FF << DPI_DMA_OMASK_R_SHIFT)
-+#define DPI_DMA_OMASK_G_SHIFT	 10
-+#define DPI_DMA_OMASK_G_MASK	 (0x3FF << DPI_DMA_OMASK_G_SHIFT)
-+#define DPI_DMA_OMASK_B_SHIFT	 20
-+#define DPI_DMA_OMASK_B_MASK	 (0x3FF << DPI_DMA_OMASK_B_SHIFT)
-+
-+// Shifts
-+#define DPI_DMA_SHIFT	 0x28
-+#define DPI_DMA_SHIFT_IR_SHIFT	 0
-+#define DPI_DMA_SHIFT_IR_MASK	 (0x1F << DPI_DMA_SHIFT_IR_SHIFT)
-+#define DPI_DMA_SHIFT_IG_SHIFT	 5
-+#define DPI_DMA_SHIFT_IG_MASK	 (0x1F << DPI_DMA_SHIFT_IG_SHIFT)
-+#define DPI_DMA_SHIFT_IB_SHIFT	 10
-+#define DPI_DMA_SHIFT_IB_MASK	 (0x1F << DPI_DMA_SHIFT_IB_SHIFT)
-+#define DPI_DMA_SHIFT_OR_SHIFT	 15
-+#define DPI_DMA_SHIFT_OR_MASK	 (0x1F << DPI_DMA_SHIFT_OR_SHIFT)
-+#define DPI_DMA_SHIFT_OG_SHIFT	 20
-+#define DPI_DMA_SHIFT_OG_MASK	 (0x1F << DPI_DMA_SHIFT_OG_SHIFT)
-+#define DPI_DMA_SHIFT_OB_SHIFT	 25
-+#define DPI_DMA_SHIFT_OB_MASK	 (0x1F << DPI_DMA_SHIFT_OB_SHIFT)
-+
-+// Scaling
-+#define DPI_DMA_RGBSZ	 0x34
-+#define DPI_DMA_RGBSZ_BPP_SHIFT	 16
-+#define DPI_DMA_RGBSZ_BPP_MASK	 (0x3 << DPI_DMA_RGBSZ_BPP_SHIFT)
-+#define DPI_DMA_RGBSZ_R_SHIFT	 0
-+#define DPI_DMA_RGBSZ_R_MASK	 (0xF << DPI_DMA_RGBSZ_R_SHIFT)
-+#define DPI_DMA_RGBSZ_G_SHIFT	 4
-+#define DPI_DMA_RGBSZ_G_MASK	 (0xF << DPI_DMA_RGBSZ_G_SHIFT)
-+#define DPI_DMA_RGBSZ_B_SHIFT	 8
-+#define DPI_DMA_RGBSZ_B_MASK	 (0xF << DPI_DMA_RGBSZ_B_SHIFT)
-+
-+// Status
-+#define DPI_DMA_STATUS  0x3c
-+
-+#define BITS(field, val) (((val) << (field ## _SHIFT)) & (field ## _MASK))
-+
-+static unsigned int rp1dpi_hw_read(struct rp1_dpi *dpi, unsigned int reg)
-+{
-+	void __iomem *addr = dpi->hw_base[RP1DPI_HW_BLOCK_DPI] + reg;
-+
-+	return readl(addr);
-+}
-+
-+static void rp1dpi_hw_write(struct rp1_dpi *dpi, unsigned int reg, unsigned int val)
-+{
-+	void __iomem *addr = dpi->hw_base[RP1DPI_HW_BLOCK_DPI] + reg;
-+
-+	writel(val, addr);
-+}
-+
-+int rp1dpi_hw_busy(struct rp1_dpi *dpi)
-+{
-+	return (rp1dpi_hw_read(dpi, DPI_DMA_STATUS) & 0xF8F) ? 1 : 0;
-+}
-+
-+/* Table of supported input (in-memory/DMA) pixel formats. */
-+struct rp1dpi_ipixfmt {
-+	u32 format; /* DRM format code                           */
-+	u32 mask;   /* RGB masks (10 bits each, left justified)  */
-+	u32 shift;  /* RGB MSB positions in the memory word      */
-+	u32 rgbsz;  /* Shifts used for scaling; also (BPP/8-1)   */
-+};
-+
-+#define IMASK_RGB(r, g, b)	(BITS(DPI_DMA_IMASK_R, r)  | \
-+				 BITS(DPI_DMA_IMASK_G, g)  | \
-+				 BITS(DPI_DMA_IMASK_B, b))
-+#define OMASK_RGB(r, g, b)	(BITS(DPI_DMA_OMASK_R, r)  | \
-+				 BITS(DPI_DMA_OMASK_G, g)  | \
-+				 BITS(DPI_DMA_OMASK_B, b))
-+#define ISHIFT_RGB(r, g, b)	(BITS(DPI_DMA_SHIFT_IR, r) | \
-+				 BITS(DPI_DMA_SHIFT_IG, g) | \
-+				 BITS(DPI_DMA_SHIFT_IB, b))
-+#define OSHIFT_RGB(r, g, b)	(BITS(DPI_DMA_SHIFT_OR, r) | \
-+				 BITS(DPI_DMA_SHIFT_OG, g) | \
-+				 BITS(DPI_DMA_SHIFT_OB, b))
-+
-+static const struct rp1dpi_ipixfmt my_formats[] = {
-+	{
-+	  .format = DRM_FORMAT_XRGB8888,
-+	  .mask	  = IMASK_RGB(0x3fc, 0x3fc, 0x3fc),
-+	  .shift  = ISHIFT_RGB(23, 15, 7),
-+	  .rgbsz  = BITS(DPI_DMA_RGBSZ_BPP, 3),
-+	},
-+	{
-+	  .format = DRM_FORMAT_XBGR8888,
-+	  .mask	  = IMASK_RGB(0x3fc, 0x3fc, 0x3fc),
-+	  .shift  = ISHIFT_RGB(7, 15, 23),
-+	  .rgbsz  = BITS(DPI_DMA_RGBSZ_BPP, 3),
-+	},
-+	{
-+	  .format = DRM_FORMAT_RGB888,
-+	  .mask	  = IMASK_RGB(0x3fc, 0x3fc, 0x3fc),
-+	  .shift  = ISHIFT_RGB(23, 15, 7),
-+	  .rgbsz  = BITS(DPI_DMA_RGBSZ_BPP, 2),
-+	},
-+	{
-+	  .format = DRM_FORMAT_BGR888,
-+	  .mask	  = IMASK_RGB(0x3fc, 0x3fc, 0x3fc),
-+	  .shift  = ISHIFT_RGB(7, 15, 23),
-+	  .rgbsz  = BITS(DPI_DMA_RGBSZ_BPP, 2),
-+	},
-+	{
-+	  .format = DRM_FORMAT_RGB565,
-+	  .mask	  = IMASK_RGB(0x3e0, 0x3f0, 0x3e0),
-+	  .shift  = ISHIFT_RGB(15, 10, 4),
-+	  .rgbsz  = BITS(DPI_DMA_RGBSZ_R, 5) | BITS(DPI_DMA_RGBSZ_G, 6) |
-+		    BITS(DPI_DMA_RGBSZ_B, 5) | BITS(DPI_DMA_RGBSZ_BPP, 1),
-+	},
-+	{
-+	  .format = DRM_FORMAT_BGR565,
-+	  .mask	  = IMASK_RGB(0x3e0, 0x3f0, 0x3e0),
-+	  .shift  = ISHIFT_RGB(4, 10, 15),
-+	  .rgbsz  = BITS(DPI_DMA_RGBSZ_R, 5) | BITS(DPI_DMA_RGBSZ_G, 6) |
-+		    BITS(DPI_DMA_RGBSZ_B, 5) | BITS(DPI_DMA_RGBSZ_BPP, 1),
-+	}
-+};
-+
-+static u32 set_output_format(u32 bus_format, u32 *shift, u32 *imask, u32 *rgbsz)
-+{
-+	switch (bus_format) {
-+	case MEDIA_BUS_FMT_RGB565_1X16:
-+		if (*shift == ISHIFT_RGB(15, 10, 4)) {
-+			/* When framebuffer is RGB565, we can output RGB565 */
-+			*shift = ISHIFT_RGB(15, 7, 0) | OSHIFT_RGB(19, 9, 0);
-+			*rgbsz &= DPI_DMA_RGBSZ_BPP_MASK;
-+			return OMASK_RGB(0x3fc, 0x3fc, 0);
-+		}
-+
-+		/* due to a HW limitation, bit-depth is effectively RGB535 */
-+		*shift |= OSHIFT_RGB(19, 14, 6);
-+		*imask &= IMASK_RGB(0x3e0, 0x380, 0x3e0);
-+		*rgbsz = BITS(DPI_DMA_RGBSZ_G, 5) | (*rgbsz & DPI_DMA_RGBSZ_BPP_MASK);
-+		return OMASK_RGB(0x3e0, 0x39c, 0x3e0);
-+
-+	case MEDIA_BUS_FMT_RGB666_1X18:
-+	case MEDIA_BUS_FMT_BGR666_1X18:
-+		/* due to a HW limitation, bit-depth is effectively RGB444 */
-+		*shift |= OSHIFT_RGB(23, 15, 7);
-+		*imask &= IMASK_RGB(0x3c0, 0x3c0, 0x3c0);
-+		*rgbsz = BITS(DPI_DMA_RGBSZ_R, 2) | (*rgbsz & DPI_DMA_RGBSZ_BPP_MASK);
-+		return OMASK_RGB(0x330, 0x3c0, 0x3c0);
-+
-+	case MEDIA_BUS_FMT_RGB888_1X24:
-+	case MEDIA_BUS_FMT_BGR888_1X24:
-+	case MEDIA_BUS_FMT_RGB101010_1X30:
-+		/* The full 24 bits can be output. Note that RP1's internal wiring means
-+		 * that 8.8.8 to GPIO pads can share with 10.10.10 to the onboard VDAC.
-+		 */
-+		*shift |= OSHIFT_RGB(29, 19, 9);
-+		return OMASK_RGB(0x3fc, 0x3fc, 0x3fc);
-+
-+	default:
-+		/* RGB666_1x24_CPADHI, BGR666_1X24_CPADHI and "RGB565_666" formats */
-+		*shift |= OSHIFT_RGB(27, 17, 7);
-+		*rgbsz &= DPI_DMA_RGBSZ_BPP_MASK;
-+		return OMASK_RGB(0x3f0, 0x3f0, 0x3f0);
-+	}
-+}
-+
-+#define BUS_FMT_IS_BGR(fmt) (				       \
-+		((fmt) == MEDIA_BUS_FMT_BGR666_1X18)        || \
-+		((fmt) == MEDIA_BUS_FMT_BGR666_1X24_CPADHI) || \
-+		((fmt) == MEDIA_BUS_FMT_BGR888_1X24))
-+
-+void rp1dpi_hw_setup(struct rp1_dpi *dpi,
-+		     u32 in_format, u32 bus_format, bool de_inv,
-+		    struct drm_display_mode const *mode)
-+{
-+	u32 shift, imask, omask, rgbsz;
-+	int i;
-+
-+	pr_info("%s: in_fmt=\'%c%c%c%c\' bus_fmt=0x%x mode=%dx%d total=%dx%d %dkHz %cH%cV%cD%cC",
-+		__func__, in_format, in_format >> 8, in_format >> 16, in_format >> 24, bus_format,
-+		mode->hdisplay, mode->vdisplay,
-+		mode->htotal, mode->vtotal,
-+		mode->clock,
-+		(mode->flags & DRM_MODE_FLAG_NHSYNC) ? '-' : '+',
-+		(mode->flags & DRM_MODE_FLAG_NVSYNC) ? '-' : '+',
-+		de_inv ? '-' : '+',
-+		dpi->clk_inv ? '-' : '+');
-+
-+	/*
-+	 * Configure all DPI/DMA block registers, except base address.
-+	 * DMA will not actually start until a FB base address is specified
-+	 * using rp1dpi_hw_update().
-+	 */
-+	rp1dpi_hw_write(dpi, DPI_DMA_VISIBLE_AREA,
-+			BITS(DPI_DMA_VISIBLE_AREA_ROWSM1, mode->vdisplay - 1) |
-+			BITS(DPI_DMA_VISIBLE_AREA_COLSM1, mode->hdisplay - 1));
-+
-+	rp1dpi_hw_write(dpi, DPI_DMA_SYNC_WIDTH,
-+			BITS(DPI_DMA_SYNC_WIDTH_ROWSM1, mode->vsync_end - mode->vsync_start - 1) |
-+			BITS(DPI_DMA_SYNC_WIDTH_COLSM1, mode->hsync_end - mode->hsync_start - 1));
-+
-+	/* In these registers, "back porch" time includes sync width */
-+	rp1dpi_hw_write(dpi, DPI_DMA_BACK_PORCH,
-+			BITS(DPI_DMA_BACK_PORCH_ROWSM1, mode->vtotal - mode->vsync_start - 1) |
-+			BITS(DPI_DMA_BACK_PORCH_COLSM1, mode->htotal - mode->hsync_start - 1));
-+
-+	rp1dpi_hw_write(dpi, DPI_DMA_FRONT_PORCH,
-+			BITS(DPI_DMA_FRONT_PORCH_ROWSM1, mode->vsync_start - mode->vdisplay - 1) |
-+			BITS(DPI_DMA_FRONT_PORCH_COLSM1, mode->hsync_start - mode->hdisplay - 1));
-+
-+	/* Input to output pixel format conversion */
-+	for (i = 0; i < ARRAY_SIZE(my_formats); ++i) {
-+		if (my_formats[i].format == in_format)
-+			break;
-+	}
-+	if (i >= ARRAY_SIZE(my_formats)) {
-+		pr_err("%s: bad input format\n", __func__);
-+		i = 4;
-+	}
-+	if (BUS_FMT_IS_BGR(bus_format))
-+		i ^= 1;
-+	shift = my_formats[i].shift;
-+	imask = my_formats[i].mask;
-+	rgbsz = my_formats[i].rgbsz;
-+	omask = set_output_format(bus_format, &shift, &imask, &rgbsz);
-+
-+	rp1dpi_hw_write(dpi, DPI_DMA_IMASK, imask);
-+	rp1dpi_hw_write(dpi, DPI_DMA_OMASK, omask);
-+	rp1dpi_hw_write(dpi, DPI_DMA_SHIFT, shift);
-+	rp1dpi_hw_write(dpi, DPI_DMA_RGBSZ, rgbsz);
-+
-+	rp1dpi_hw_write(dpi, DPI_DMA_QOS,
-+			BITS(DPI_DMA_QOS_DQOS, 0x0) |
-+			BITS(DPI_DMA_QOS_ULEV, 0xb) |
-+			BITS(DPI_DMA_QOS_UQOS, 0x2) |
-+			BITS(DPI_DMA_QOS_LLEV, 0x8) |
-+			BITS(DPI_DMA_QOS_LQOS, 0x7));
-+
-+	rp1dpi_hw_write(dpi, DPI_DMA_IRQ_FLAGS, -1);
-+	rp1dpi_hw_vblank_ctrl(dpi, 1);
-+
-+	i = rp1dpi_hw_busy(dpi);
-+	if (i)
-+		pr_warn("%s: Unexpectedly busy at start!", __func__);
-+
-+	rp1dpi_hw_write(dpi, DPI_DMA_CONTROL,
-+			BITS(DPI_DMA_CONTROL_ARM,          !i) |
-+			BITS(DPI_DMA_CONTROL_AUTO_REPEAT,   1) |
-+			BITS(DPI_DMA_CONTROL_HIGH_WATER,  448) |
-+			BITS(DPI_DMA_CONTROL_DEN_POL,  de_inv) |
-+			BITS(DPI_DMA_CONTROL_HSYNC_POL, !!(mode->flags & DRM_MODE_FLAG_NHSYNC)) |
-+			BITS(DPI_DMA_CONTROL_VSYNC_POL, !!(mode->flags & DRM_MODE_FLAG_NVSYNC)) |
-+			BITS(DPI_DMA_CONTROL_COLORM,	   0) |
-+			BITS(DPI_DMA_CONTROL_SHUTDN,	   0) |
-+			BITS(DPI_DMA_CONTROL_HBP_EN,    (mode->htotal != mode->hsync_end))      |
-+			BITS(DPI_DMA_CONTROL_HFP_EN,    (mode->hsync_start != mode->hdisplay))  |
-+			BITS(DPI_DMA_CONTROL_VBP_EN,    (mode->vtotal != mode->vsync_end))      |
-+			BITS(DPI_DMA_CONTROL_VFP_EN,    (mode->vsync_start != mode->vdisplay))  |
-+			BITS(DPI_DMA_CONTROL_HSYNC_EN,  (mode->hsync_end != mode->hsync_start)) |
-+			BITS(DPI_DMA_CONTROL_VSYNC_EN,  (mode->vsync_end != mode->vsync_start)));
-+}
-+
-+void rp1dpi_hw_update(struct rp1_dpi *dpi, dma_addr_t addr, u32 offset, u32 stride)
-+{
-+	u64 a = addr + offset;
-+
-+	/*
-+	 * Update STRIDE, DMAH and DMAL only. When called after rp1dpi_hw_setup(),
-+	 * DMA starts immediately; if already running, the buffer will flip at
-+	 * the next vertical sync event.
-+	 */
-+	rp1dpi_hw_write(dpi, DPI_DMA_DMA_STRIDE, stride);
-+	rp1dpi_hw_write(dpi, DPI_DMA_DMA_ADDR_H, a >> 32);
-+	rp1dpi_hw_write(dpi, DPI_DMA_DMA_ADDR_L, a & 0xFFFFFFFFu);
-+}
-+
-+void rp1dpi_hw_stop(struct rp1_dpi *dpi)
-+{
-+	u32 ctrl;
-+
-+	/*
-+	 * Stop DMA by turning off the Auto-Repeat flag, and wait up to 100ms for
-+	 * the current and any queued frame to end. "Force drain" flags are not used,
-+	 * as they seem to prevent DMA from re-starting properly; it's safer to wait.
-+	 */
-+	reinit_completion(&dpi->finished);
-+	ctrl = rp1dpi_hw_read(dpi, DPI_DMA_CONTROL);
-+	ctrl &= ~(DPI_DMA_CONTROL_ARM_MASK | DPI_DMA_CONTROL_AUTO_REPEAT_MASK);
-+	rp1dpi_hw_write(dpi, DPI_DMA_CONTROL, ctrl);
-+	if (!wait_for_completion_timeout(&dpi->finished, HZ / 10))
-+		drm_err(dpi->drm, "%s: timed out waiting for idle\n", __func__);
-+	rp1dpi_hw_write(dpi, DPI_DMA_IRQ_EN, 0);
-+}
-+
-+void rp1dpi_hw_vblank_ctrl(struct rp1_dpi *dpi, int enable)
-+{
-+	rp1dpi_hw_write(dpi, DPI_DMA_IRQ_EN,
-+			BITS(DPI_DMA_IRQ_EN_AFIFO_EMPTY, 1)      |
-+			BITS(DPI_DMA_IRQ_EN_UNDERFLOW, 1)        |
-+			BITS(DPI_DMA_IRQ_EN_DMA_READY, !!enable) |
-+			BITS(DPI_DMA_IRQ_EN_MATCH_LINE, 4095));
-+}
-+
-+irqreturn_t rp1dpi_hw_isr(int irq, void *dev)
-+{
-+	struct rp1_dpi *dpi = dev;
-+	u32 u = rp1dpi_hw_read(dpi, DPI_DMA_IRQ_FLAGS);
-+
-+	if (u) {
-+		rp1dpi_hw_write(dpi, DPI_DMA_IRQ_FLAGS, u);
-+		if (dpi) {
-+			if (u & DPI_DMA_IRQ_FLAGS_UNDERFLOW_MASK)
-+				drm_err_ratelimited(dpi->drm,
-+						    "Underflow! (panics=0x%08x)\n",
-+						    rp1dpi_hw_read(dpi, DPI_DMA_PANICS));
-+			if (u & DPI_DMA_IRQ_FLAGS_DMA_READY_MASK)
-+				drm_crtc_handle_vblank(&dpi->pipe.crtc);
-+			if (u & DPI_DMA_IRQ_FLAGS_AFIFO_EMPTY_MASK)
-+				complete(&dpi->finished);
-+		}
-+	}
-+	return u ? IRQ_HANDLED : IRQ_NONE;
-+}
diff --git a/target/linux/bcm27xx/patches-6.1/950-0887-drm-Add-RP1-VEC-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0887-drm-Add-RP1-VEC-driver.patch
deleted file mode 100644
index 5bf657ab24..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0887-drm-Add-RP1-VEC-driver.patch
+++ /dev/null
@@ -1,3078 +0,0 @@
-From 09c2c6aad0fed44182defecd274579770feb0ae2 Mon Sep 17 00:00:00 2001
-From: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
-Date: Tue, 19 Sep 2023 17:54:41 +0100
-Subject: [PATCH] drm: Add RP1 VEC driver
-
-Add support for the RP1 VEC hardware.
-
-Signed-off-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
----
- drivers/gpu/drm/rp1/rp1-vec/Kconfig       |   12 +
- drivers/gpu/drm/rp1/rp1-vec/Makefile      |    5 +
- drivers/gpu/drm/rp1/rp1-vec/rp1_vec.c     |  539 ++++++++
- drivers/gpu/drm/rp1/rp1-vec/rp1_vec.h     |   79 ++
- drivers/gpu/drm/rp1/rp1-vec/rp1_vec_cfg.c |  508 ++++++++
- drivers/gpu/drm/rp1/rp1-vec/rp1_vec_hw.c  |  469 +++++++
- drivers/gpu/drm/rp1/rp1-vec/vec_regs.h    | 1420 +++++++++++++++++++++
- 7 files changed, 3032 insertions(+)
- create mode 100644 drivers/gpu/drm/rp1/rp1-vec/Kconfig
- create mode 100644 drivers/gpu/drm/rp1/rp1-vec/Makefile
- create mode 100644 drivers/gpu/drm/rp1/rp1-vec/rp1_vec.c
- create mode 100644 drivers/gpu/drm/rp1/rp1-vec/rp1_vec.h
- create mode 100644 drivers/gpu/drm/rp1/rp1-vec/rp1_vec_cfg.c
- create mode 100644 drivers/gpu/drm/rp1/rp1-vec/rp1_vec_hw.c
- create mode 100644 drivers/gpu/drm/rp1/rp1-vec/vec_regs.h
-
---- /dev/null
-+++ b/drivers/gpu/drm/rp1/rp1-vec/Kconfig
-@@ -0,0 +1,12 @@
-+# SPDX-License-Identifier: GPL-2.0-only
-+config DRM_RP1_VEC
-+	tristate "DRM Support for RP1 VEC"
-+	depends on DRM
-+	select MFD_RP1
-+	select DRM_GEM_DMA_HELPER
-+	select DRM_KMS_HELPER
-+	select DRM_VRAM_HELPER
-+	select DRM_TTM
-+	select DRM_TTM_HELPER
-+	help
-+	  Choose this option to enable Video Out on RP1
---- /dev/null
-+++ b/drivers/gpu/drm/rp1/rp1-vec/Makefile
-@@ -0,0 +1,5 @@
-+# SPDX-License-Identifier: GPL-2.0-only
-+
-+drm-rp1-vec-y := rp1_vec.o rp1_vec_hw.o rp1_vec_cfg.o
-+
-+obj-$(CONFIG_DRM_RP1_VEC) += drm-rp1-vec.o
---- /dev/null
-+++ b/drivers/gpu/drm/rp1/rp1-vec/rp1_vec.c
-@@ -0,0 +1,539 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later
-+/*
-+ * DRM Driver for VEC output on Raspberry Pi RP1
-+ *
-+ * Copyright (c) 2023 Raspberry Pi Limited.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/errno.h>
-+#include <linux/string.h>
-+#include <linux/slab.h>
-+#include <linux/mm.h>
-+#include <linux/fb.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+#include <linux/interrupt.h>
-+#include <linux/ioport.h>
-+#include <linux/list.h>
-+#include <linux/platform_device.h>
-+#include <linux/clk.h>
-+#include <linux/printk.h>
-+#include <linux/console.h>
-+#include <linux/debugfs.h>
-+#include <linux/uaccess.h>
-+#include <linux/io.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/cred.h>
-+#include <drm/drm_drv.h>
-+#include <drm/drm_mm.h>
-+#include <drm/drm_fourcc.h>
-+#include <drm/drm_atomic_helper.h>
-+#include <drm/drm_managed.h>
-+#include <drm/drm_crtc.h>
-+#include <drm/drm_crtc_helper.h>
-+#include <drm/drm_encoder.h>
-+#include <drm/drm_fb_helper.h>
-+#include <drm/drm_framebuffer.h>
-+#include <drm/drm_gem.h>
-+#include <drm/drm_gem_atomic_helper.h>
-+#include <drm/drm_gem_dma_helper.h>
-+#include <drm/drm_gem_framebuffer_helper.h>
-+#include <drm/drm_simple_kms_helper.h>
-+#include <drm/drm_probe_helper.h>
-+#include <drm/drm_modeset_helper_vtables.h>
-+#include <drm/drm_vblank.h>
-+#include <drm/drm_of.h>
-+
-+#include "rp1_vec.h"
-+
-+/*
-+ * Default TV standard parameter; it may be overridden by the OF
-+ * property "tv_norm" (which should be one of the strings below).
-+ *
-+ * The default (empty string) supports various 60Hz and 50Hz modes,
-+ * and will automatically select NTSC[-M] or PAL[-BDGHIKL]; the two
-+ * "fake" 60Hz standards NTSC-443 and PAL60 also support 50Hz PAL.
-+ * Other values will restrict the set of video modes offered.
-+ *
-+ * Finally, the DRM connector property "mode" (which is an integer)
-+ * can be used to override this value, but it does not prevent the
-+ * selection of an inapplicable video mode.
-+ */
-+
-+static char *rp1vec_tv_norm_str;
-+module_param_named(tv_norm, rp1vec_tv_norm_str, charp, 0600);
-+MODULE_PARM_DESC(tv_norm, "Default TV norm.\n"
-+		 "\t\tSupported: NTSC, NTSC-J, NTSC-443, PAL, PAL-M, PAL-N,\n"
-+		 "\t\t\tPAL60.\n"
-+		 "\t\tDefault: empty string: infer PAL for a 50 Hz mode,\n"
-+		 "\t\t\tNTSC otherwise");
-+
-+const char * const rp1vec_tvstd_names[] = {
-+	[RP1VEC_TVSTD_NTSC]     = "NTSC",
-+	[RP1VEC_TVSTD_NTSC_J]   = "NTSC-J",
-+	[RP1VEC_TVSTD_NTSC_443] = "NTSC-443",
-+	[RP1VEC_TVSTD_PAL]      = "PAL",
-+	[RP1VEC_TVSTD_PAL_M]    = "PAL-M",
-+	[RP1VEC_TVSTD_PAL_N]    = "PAL-N",
-+	[RP1VEC_TVSTD_PAL60]    = "PAL60",
-+	[RP1VEC_TVSTD_DEFAULT]  = "",
-+};
-+
-+static int rp1vec_parse_tv_norm(const char *str)
-+{
-+	int i;
-+
-+	if (str && *str) {
-+		for (i = 0; i < ARRAY_SIZE(rp1vec_tvstd_names); ++i) {
-+			if (strcasecmp(str, rp1vec_tvstd_names[i]) == 0)
-+				return i;
-+		}
-+	}
-+	return RP1VEC_TVSTD_DEFAULT;
-+}
-+
-+static void rp1vec_pipe_update(struct drm_simple_display_pipe *pipe,
-+			       struct drm_plane_state *old_state)
-+{
-+	struct drm_pending_vblank_event *event;
-+	unsigned long flags;
-+	struct drm_framebuffer *fb = pipe->plane.state->fb;
-+	struct rp1_vec *vec = pipe->crtc.dev->dev_private;
-+	struct drm_gem_object *gem = fb ? drm_gem_fb_get_obj(fb, 0) : NULL;
-+	struct drm_gem_dma_object *dma_obj = gem ? to_drm_gem_dma_obj(gem) : NULL;
-+	bool can_update = fb && dma_obj && vec && vec->pipe_enabled;
-+
-+	/* (Re-)start VEC where required; and update FB address */
-+	if (can_update) {
-+		if (!vec->vec_running || fb->format->format != vec->cur_fmt) {
-+			if (vec->vec_running && fb->format->format != vec->cur_fmt) {
-+				rp1vec_hw_stop(vec);
-+				vec->vec_running = false;
-+			}
-+			if (!vec->vec_running) {
-+				rp1vec_hw_setup(vec,
-+						fb->format->format,
-+						&pipe->crtc.state->mode,
-+						vec->connector.state->tv.mode);
-+				vec->vec_running = true;
-+			}
-+			vec->cur_fmt  = fb->format->format;
-+			drm_crtc_vblank_on(&pipe->crtc);
-+		}
-+		rp1vec_hw_update(vec, dma_obj->dma_addr, fb->offsets[0], fb->pitches[0]);
-+	}
-+
-+	/* Check if VBLANK callback needs to be armed (or sent immediately in some error cases).
-+	 * Note there is a tiny probability of a race between rp1vec_dma_update() and IRQ;
-+	 * ordering it this way around is safe, but theoretically might delay an extra frame.
-+	 */
-+	spin_lock_irqsave(&pipe->crtc.dev->event_lock, flags);
-+	event = pipe->crtc.state->event;
-+	if (event) {
-+		pipe->crtc.state->event = NULL;
-+		if (can_update && drm_crtc_vblank_get(&pipe->crtc) == 0)
-+			drm_crtc_arm_vblank_event(&pipe->crtc, event);
-+		else
-+			drm_crtc_send_vblank_event(&pipe->crtc, event);
-+	}
-+	spin_unlock_irqrestore(&pipe->crtc.dev->event_lock, flags);
-+}
-+
-+static void rp1vec_pipe_enable(struct drm_simple_display_pipe *pipe,
-+			       struct drm_crtc_state *crtc_state,
-+			      struct drm_plane_state *plane_state)
-+{
-+	struct rp1_vec *vec = pipe->crtc.dev->dev_private;
-+
-+	dev_info(&vec->pdev->dev, __func__);
-+	vec->pipe_enabled = true;
-+	vec->cur_fmt = 0xdeadbeef;
-+	rp1vec_vidout_setup(vec);
-+	rp1vec_pipe_update(pipe, 0);
-+}
-+
-+static void rp1vec_pipe_disable(struct drm_simple_display_pipe *pipe)
-+{
-+	struct rp1_vec *vec = pipe->crtc.dev->dev_private;
-+
-+	dev_info(&vec->pdev->dev, __func__);
-+	drm_crtc_vblank_off(&pipe->crtc);
-+	if (vec) {
-+		if (vec->vec_running) {
-+			rp1vec_hw_stop(vec);
-+			vec->vec_running = false;
-+		}
-+		vec->pipe_enabled = false;
-+	}
-+}
-+
-+static int rp1vec_pipe_enable_vblank(struct drm_simple_display_pipe *pipe)
-+{
-+	if (pipe && pipe->crtc.dev) {
-+		struct rp1_vec *vec = pipe->crtc.dev->dev_private;
-+
-+		if (vec)
-+			rp1vec_hw_vblank_ctrl(vec, 1);
-+	}
-+	return 0;
-+}
-+
-+static void rp1vec_pipe_disable_vblank(struct drm_simple_display_pipe *pipe)
-+{
-+	if (pipe && pipe->crtc.dev) {
-+		struct rp1_vec *vec = pipe->crtc.dev->dev_private;
-+
-+		if (vec)
-+			rp1vec_hw_vblank_ctrl(vec, 0);
-+	}
-+}
-+
-+static const struct drm_simple_display_pipe_funcs rp1vec_pipe_funcs = {
-+	.enable	    = rp1vec_pipe_enable,
-+	.update	    = rp1vec_pipe_update,
-+	.disable    = rp1vec_pipe_disable,
-+	.prepare_fb = drm_gem_simple_display_pipe_prepare_fb,
-+	.enable_vblank	= rp1vec_pipe_enable_vblank,
-+	.disable_vblank = rp1vec_pipe_disable_vblank,
-+};
-+
-+static void rp1vec_connector_destroy(struct drm_connector *connector)
-+{
-+	drm_connector_unregister(connector);
-+	drm_connector_cleanup(connector);
-+}
-+
-+static const struct drm_display_mode rp1vec_modes[4] = {
-+	{ /* Full size 525/60i with Rec.601 pixel rate */
-+		DRM_MODE("720x480i", DRM_MODE_TYPE_DRIVER, 13500,
-+			 720, 720 + 14, 720 + 14 + 64, 858, 0,
-+			 480, 480 + 7, 480 + 7 + 6, 525, 0,
-+			 DRM_MODE_FLAG_INTERLACE)
-+	},
-+	{ /* Cropped and horizontally squashed to be TV-safe */
-+		DRM_MODE("704x432i", DRM_MODE_TYPE_DRIVER, 15429,
-+			 704, 704 + 72, 704 + 72 + 72, 980, 0,
-+			 432, 432 + 31, 432 + 31 + 6, 525, 0,
-+			 DRM_MODE_FLAG_INTERLACE)
-+	},
-+	{ /* Full size 625/50i with Rec.601 pixel rate */
-+		DRM_MODE("720x576i", DRM_MODE_TYPE_DRIVER, 13500,
-+			 720, 720 + 20, 720 + 20 + 64, 864, 0,
-+			 576, 576 + 4, 576 + 4 + 6, 625, 0,
-+			 DRM_MODE_FLAG_INTERLACE)
-+	},
-+	{ /* Cropped and squashed, for square(ish) pixels */
-+		DRM_MODE("704x512i", DRM_MODE_TYPE_DRIVER, 15429,
-+			 704, 704 + 80, 704 + 80 + 72, 987, 0,
-+			 512, 512 + 36, 512 + 36 + 6, 625, 0,
-+			 DRM_MODE_FLAG_INTERLACE)
-+	}
-+};
-+
-+static int rp1vec_connector_get_modes(struct drm_connector *connector)
-+{
-+	struct rp1_vec *vec = container_of(connector, struct rp1_vec, connector);
-+	bool ok525 = RP1VEC_TVSTD_SUPPORT_525(vec->tv_norm);
-+	bool ok625 = RP1VEC_TVSTD_SUPPORT_625(vec->tv_norm);
-+	int i, prog, n = 0;
-+
-+	for (i = 0; i < ARRAY_SIZE(rp1vec_modes); i++) {
-+		if ((rp1vec_modes[i].vtotal == 625) ? ok625 : ok525) {
-+			for (prog = 0; prog < 2; prog++) {
-+				struct drm_display_mode *mode =
-+					drm_mode_duplicate(connector->dev,
-+							   &rp1vec_modes[i]);
-+
-+				if (prog) {
-+					mode->flags &= ~DRM_MODE_FLAG_INTERLACE;
-+					mode->vdisplay	  >>= 1;
-+					mode->vsync_start >>= 1;
-+					mode->vsync_end	  >>= 1;
-+					mode->vtotal	  >>= 1;
-+				}
-+
-+				if (mode->hdisplay == 704 &&
-+				    mode->vtotal == ((ok525) ? 525 : 625))
-+					mode->type |= DRM_MODE_TYPE_PREFERRED;
-+
-+				drm_mode_set_name(mode);
-+				drm_mode_probed_add(connector, mode);
-+				n++;
-+			}
-+		}
-+	}
-+
-+	return n;
-+}
-+
-+static void rp1vec_connector_reset(struct drm_connector *connector)
-+{
-+	struct rp1_vec *vec = container_of(connector, struct rp1_vec, connector);
-+
-+	drm_atomic_helper_connector_reset(connector);
-+	if (connector->state)
-+		connector->state->tv.mode = vec->tv_norm;
-+}
-+
-+static int rp1vec_connector_atomic_check(struct drm_connector *conn,
-+					 struct drm_atomic_state *state)
-+{	struct drm_connector_state *old_state =
-+		drm_atomic_get_old_connector_state(state, conn);
-+	struct drm_connector_state *new_state =
-+		drm_atomic_get_new_connector_state(state, conn);
-+
-+	if (new_state->crtc && old_state->tv.mode != new_state->tv.mode) {
-+		struct drm_crtc_state *crtc_state =
-+			drm_atomic_get_new_crtc_state(state, new_state->crtc);
-+
-+		crtc_state->mode_changed = true;
-+	}
-+
-+	return 0;
-+}
-+
-+static enum drm_mode_status rp1vec_mode_valid(struct drm_device *dev,
-+					      const struct drm_display_mode *mode)
-+{
-+	/*
-+	 * Check the mode roughly matches one of our standard modes
-+	 * (optionally half-height and progressive). Ignore H/V sync
-+	 * timings which for interlaced TV are approximate at best.
-+	 */
-+	int i, prog;
-+
-+	prog = !(mode->flags & DRM_MODE_FLAG_INTERLACE);
-+
-+	for (i = 0; i < ARRAY_SIZE(rp1vec_modes); i++) {
-+		const struct drm_display_mode *ref = rp1vec_modes + i;
-+
-+		if (mode->hdisplay == ref->hdisplay           &&
-+		    mode->vdisplay == (ref->vdisplay >> prog) &&
-+		    mode->clock + 2 >= ref->clock             &&
-+		    mode->clock <= ref->clock + 2             &&
-+		    mode->htotal + 2 >= ref->htotal           &&
-+		    mode->htotal <= ref->htotal + 2           &&
-+		    mode->vtotal + 2 >= (ref->vtotal >> prog) &&
-+		    mode->vtotal <= (ref->vtotal >> prog) + 2)
-+			return MODE_OK;
-+	}
-+	return MODE_BAD;
-+}
-+
-+static const struct drm_connector_helper_funcs rp1vec_connector_helper_funcs = {
-+	.get_modes = rp1vec_connector_get_modes,
-+	.atomic_check = rp1vec_connector_atomic_check,
-+};
-+
-+static const struct drm_connector_funcs rp1vec_connector_funcs = {
-+	.fill_modes = drm_helper_probe_single_connector_modes,
-+	.destroy = rp1vec_connector_destroy,
-+	.reset = rp1vec_connector_reset,
-+	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
-+	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
-+};
-+
-+static const struct drm_mode_config_funcs rp1vec_mode_funcs = {
-+	.fb_create = drm_gem_fb_create,
-+	.atomic_check = drm_atomic_helper_check,
-+	.atomic_commit = drm_atomic_helper_commit,
-+	.mode_valid = rp1vec_mode_valid,
-+};
-+
-+static const u32 rp1vec_formats[] = {
-+	DRM_FORMAT_XRGB8888,
-+	DRM_FORMAT_XBGR8888,
-+	DRM_FORMAT_RGB888,
-+	DRM_FORMAT_BGR888,
-+	DRM_FORMAT_RGB565
-+};
-+
-+static void rp1vec_stopall(struct drm_device *drm)
-+{
-+	if (drm->dev_private) {
-+		struct rp1_vec *vec = drm->dev_private;
-+
-+		if (vec->vec_running || rp1vec_hw_busy(vec)) {
-+			rp1vec_hw_stop(vec);
-+			vec->vec_running = false;
-+		}
-+		rp1vec_vidout_poweroff(vec);
-+	}
-+}
-+
-+DEFINE_DRM_GEM_DMA_FOPS(rp1vec_fops);
-+
-+static struct drm_driver rp1vec_driver = {
-+	.driver_features	= DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
-+	.fops			= &rp1vec_fops,
-+	.name			= "drm-rp1-vec",
-+	.desc			= "drm-rp1-vec",
-+	.date			= "0",
-+	.major			= 1,
-+	.minor			= 0,
-+	DRM_GEM_DMA_DRIVER_OPS,
-+	.release		= rp1vec_stopall,
-+};
-+
-+static int rp1vec_platform_probe(struct platform_device *pdev)
-+{
-+	struct device *dev = &pdev->dev;
-+	struct drm_device *drm;
-+	struct rp1_vec *vec;
-+	const char *str;
-+	int i, ret;
-+
-+	dev_info(dev, __func__);
-+	drm = drm_dev_alloc(&rp1vec_driver, dev);
-+	if (IS_ERR(drm)) {
-+		ret = PTR_ERR(drm);
-+		dev_err(dev, "%s drm_dev_alloc %d", __func__, ret);
-+		return ret;
-+	}
-+
-+	vec = drmm_kzalloc(drm, sizeof(*vec), GFP_KERNEL);
-+	if (!vec) {
-+		dev_err(dev, "%s drmm_kzalloc failed", __func__);
-+		ret = -ENOMEM;
-+		goto err_free_drm;
-+	}
-+	init_completion(&vec->finished);
-+	vec->drm = drm;
-+	vec->pdev = pdev;
-+	drm->dev_private = vec;
-+	platform_set_drvdata(pdev, drm);
-+
-+	str = rp1vec_tv_norm_str;
-+	of_property_read_string(dev->of_node, "tv_norm", &str);
-+	vec->tv_norm = rp1vec_parse_tv_norm(str);
-+
-+	for (i = 0; i < RP1VEC_NUM_HW_BLOCKS; i++) {
-+		vec->hw_base[i] =
-+			devm_ioremap_resource(dev,
-+					      platform_get_resource(vec->pdev, IORESOURCE_MEM, i));
-+		if (IS_ERR(vec->hw_base[i])) {
-+			ret = PTR_ERR(vec->hw_base[i]);
-+			dev_err(dev, "Error memory mapping regs[%d]\n", i);
-+			goto err_free_drm;
-+		}
-+	}
-+	ret = platform_get_irq(vec->pdev, 0);
-+	if (ret > 0)
-+		ret = devm_request_irq(dev, ret, rp1vec_hw_isr,
-+				       IRQF_SHARED, "rp1-vec", vec);
-+	if (ret) {
-+		dev_err(dev, "Unable to request interrupt\n");
-+		ret = -EINVAL;
-+		goto err_free_drm;
-+	}
-+	dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64));
-+
-+	vec->vec_clock = devm_clk_get(dev, NULL);
-+	if (IS_ERR(vec->vec_clock)) {
-+		ret = PTR_ERR(vec->vec_clock);
-+		goto err_free_drm;
-+	}
-+	ret = clk_prepare_enable(vec->vec_clock);
-+
-+	ret = drmm_mode_config_init(drm);
-+	if (ret)
-+		goto err_free_drm;
-+	drm->mode_config.max_width  = 768;
-+	drm->mode_config.max_height = 576;
-+	drm->mode_config.fb_base    = 0;
-+	drm->mode_config.preferred_depth = 32;
-+	drm->mode_config.prefer_shadow	 = 0;
-+	drm->mode_config.prefer_shadow_fbdev = 1;
-+	//drm->mode_config.fbdev_use_iomem = false;
-+	drm->mode_config.quirk_addfb_prefer_host_byte_order = true;
-+	drm->mode_config.funcs = &rp1vec_mode_funcs;
-+	drm_vblank_init(drm, 1);
-+
-+	ret = drm_mode_create_tv_properties(drm, ARRAY_SIZE(rp1vec_tvstd_names),
-+					    rp1vec_tvstd_names);
-+	if (ret)
-+		goto err_free_drm;
-+
-+	drm_connector_init(drm, &vec->connector, &rp1vec_connector_funcs,
-+			   DRM_MODE_CONNECTOR_Composite);
-+	if (ret)
-+		goto err_free_drm;
-+
-+	vec->connector.interlace_allowed = true;
-+	drm_connector_helper_add(&vec->connector, &rp1vec_connector_helper_funcs);
-+
-+	drm_object_attach_property(&vec->connector.base,
-+				   drm->mode_config.tv_mode_property,
-+				   vec->tv_norm);
-+
-+	ret = drm_simple_display_pipe_init(drm,
-+					   &vec->pipe,
-+					   &rp1vec_pipe_funcs,
-+					   rp1vec_formats,
-+					   ARRAY_SIZE(rp1vec_formats),
-+					   NULL,
-+					   &vec->connector);
-+	if (ret)
-+		goto err_free_drm;
-+
-+	drm_mode_config_reset(drm);
-+
-+	ret = drm_dev_register(drm, 0);
-+	if (ret)
-+		goto err_free_drm;
-+
-+	drm_fbdev_generic_setup(drm, 32); /* the "32" is preferred BPP */
-+	return ret;
-+
-+err_free_drm:
-+	dev_info(dev, "%s fail %d", __func__, ret);
-+	drm_dev_put(drm);
-+	return ret;
-+}
-+
-+static int rp1vec_platform_remove(struct platform_device *pdev)
-+{
-+	struct drm_device *drm = platform_get_drvdata(pdev);
-+
-+	rp1vec_stopall(drm);
-+	drm_dev_unregister(drm);
-+	drm_atomic_helper_shutdown(drm);
-+	drm_dev_put(drm);
-+
-+	return 0;
-+}
-+
-+static void rp1vec_platform_shutdown(struct platform_device *pdev)
-+{
-+	struct drm_device *drm = platform_get_drvdata(pdev);
-+
-+	rp1vec_stopall(drm);
-+}
-+
-+static const struct of_device_id rp1vec_of_match[] = {
-+	{
-+		.compatible = "raspberrypi,rp1vec",
-+	},
-+	{ /* sentinel */ },
-+};
-+
-+MODULE_DEVICE_TABLE(of, rp1vec_of_match);
-+
-+static struct platform_driver rp1vec_platform_driver = {
-+	.probe		= rp1vec_platform_probe,
-+	.remove		= rp1vec_platform_remove,
-+	.shutdown	= rp1vec_platform_shutdown,
-+	.driver		= {
-+		.name	= DRIVER_NAME,
-+		.owner	= THIS_MODULE,
-+		.of_match_table = rp1vec_of_match,
-+	},
-+};
-+
-+module_platform_driver(rp1vec_platform_driver);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_DESCRIPTION("DRM driver for Composite Video on Raspberry Pi RP1");
-+MODULE_AUTHOR("Nick Hollinghurst");
---- /dev/null
-+++ b/drivers/gpu/drm/rp1/rp1-vec/rp1_vec.h
-@@ -0,0 +1,79 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * DRM Driver for DSI output on Raspberry Pi RP1
-+ *
-+ * Copyright (c) 2023 Raspberry Pi Limited.
-+ */
-+
-+#include <linux/types.h>
-+#include <linux/io.h>
-+#include <linux/clk.h>
-+#include <drm/drm_device.h>
-+#include <drm/drm_simple_kms_helper.h>
-+
-+#define MODULE_NAME "drm-rp1-vec"
-+#define DRIVER_NAME "drm-rp1-vec"
-+
-+/* ---------------------------------------------------------------------- */
-+
-+#define RP1VEC_HW_BLOCK_VEC   0
-+#define RP1VEC_HW_BLOCK_CFG   1
-+#define RP1VEC_NUM_HW_BLOCKS  2
-+
-+enum {
-+	RP1VEC_TVSTD_NTSC = 0,	/* +525 => NTSC       625 => PAL   */
-+	RP1VEC_TVSTD_NTSC_J,	/* +525 => NTSC-J     625 => PAL   */
-+	RP1VEC_TVSTD_NTSC_443,	/* +525 => NTSC-443  +625 => PAL   */
-+	RP1VEC_TVSTD_PAL,	/*  525 => NTSC      +625 => PAL   */
-+	RP1VEC_TVSTD_PAL_M,	/* +525 => PAL-M      625 => PAL   */
-+	RP1VEC_TVSTD_PAL_N,	/*  525 => NTSC      +625 => PAL-N */
-+	RP1VEC_TVSTD_PAL60,	/* +525 => PAL60     +625 => PAL   */
-+	RP1VEC_TVSTD_DEFAULT,	/* +525 => NTSC      +625 => PAL   */
-+};
-+
-+/* Which standards support which modes? Those marked with + above */
-+#define RP1VEC_TVSTD_SUPPORT_525(n) ((0xD7 >> (n)) & 1)
-+#define RP1VEC_TVSTD_SUPPORT_625(n) ((0xEC >> (n)) & 1)
-+
-+/* ---------------------------------------------------------------------- */
-+
-+struct rp1_vec {
-+	/* DRM and platform device pointers */
-+	struct drm_device *drm;
-+	struct platform_device *pdev;
-+
-+	/* Framework and helper objects */
-+	struct drm_simple_display_pipe pipe;
-+	struct drm_connector connector;
-+
-+	/* Clock. We assume this is always at 108 MHz. */
-+	struct clk *vec_clock;
-+
-+	/* Block (VCC, CFG) base addresses, and current state */
-+	void __iomem *hw_base[RP1VEC_NUM_HW_BLOCKS];
-+	u32 cur_fmt;
-+	int tv_norm;
-+	bool vec_running, pipe_enabled;
-+	struct completion finished;
-+};
-+
-+extern const char * const rp1vec_tvstd_names[];
-+
-+/* ---------------------------------------------------------------------- */
-+/* Functions to control the VEC/DMA block				  */
-+
-+void rp1vec_hw_setup(struct rp1_vec *vec,
-+		     u32 in_format,
-+		struct drm_display_mode const *mode,
-+		int tvstd);
-+void rp1vec_hw_update(struct rp1_vec *vec, dma_addr_t addr, u32 offset, u32 stride);
-+void rp1vec_hw_stop(struct rp1_vec *vec);
-+int rp1vec_hw_busy(struct rp1_vec *vec);
-+irqreturn_t rp1vec_hw_isr(int irq, void *dev);
-+void rp1vec_hw_vblank_ctrl(struct rp1_vec *vec, int enable);
-+
-+/* ---------------------------------------------------------------------- */
-+/* Functions to control the VIDEO OUT CFG block and check RP1 platform	  */
-+
-+void rp1vec_vidout_setup(struct rp1_vec *vec);
-+void rp1vec_vidout_poweroff(struct rp1_vec *vec);
---- /dev/null
-+++ b/drivers/gpu/drm/rp1/rp1-vec/rp1_vec_cfg.c
-@@ -0,0 +1,508 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later
-+/*
-+ * DRM Driver for DSI output on Raspberry Pi RP1
-+ *
-+ * Copyright (c) 2023 Raspberry Pi Limited.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/errno.h>
-+#include <linux/mm.h>
-+#include <linux/delay.h>
-+#include <linux/interrupt.h>
-+#include <linux/platform_device.h>
-+#include <linux/printk.h>
-+#include <linux/rp1_platform.h>
-+
-+#include "rp1_vec.h"
-+
-+// =============================================================================
-+// Register    : VIDEO_OUT_CFG_SEL
-+// JTAG access : synchronous
-+// Description : Selects source: VEC or DPI
-+#define VIDEO_OUT_CFG_SEL_OFFSET 0x00000000
-+#define VIDEO_OUT_CFG_SEL_BITS	 0x00000013
-+#define VIDEO_OUT_CFG_SEL_RESET	 0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_SEL_PCLK_INV
-+// Description : Select dpi_pclk output port polarity inversion.
-+#define VIDEO_OUT_CFG_SEL_PCLK_INV_RESET  0x0
-+#define VIDEO_OUT_CFG_SEL_PCLK_INV_BITS	  0x00000010
-+#define VIDEO_OUT_CFG_SEL_PCLK_INV_MSB	  4
-+#define VIDEO_OUT_CFG_SEL_PCLK_INV_LSB	  4
-+#define VIDEO_OUT_CFG_SEL_PCLK_INV_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_SEL_PAD_MUX
-+// Description : VEC 1 DPI 0
-+#define VIDEO_OUT_CFG_SEL_PAD_MUX_RESET	 0x0
-+#define VIDEO_OUT_CFG_SEL_PAD_MUX_BITS	 0x00000002
-+#define VIDEO_OUT_CFG_SEL_PAD_MUX_MSB	 1
-+#define VIDEO_OUT_CFG_SEL_PAD_MUX_LSB	 1
-+#define VIDEO_OUT_CFG_SEL_PAD_MUX_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_SEL_VDAC_MUX
-+// Description : VEC 1 DPI 0
-+#define VIDEO_OUT_CFG_SEL_VDAC_MUX_RESET  0x0
-+#define VIDEO_OUT_CFG_SEL_VDAC_MUX_BITS	  0x00000001
-+#define VIDEO_OUT_CFG_SEL_VDAC_MUX_MSB	  0
-+#define VIDEO_OUT_CFG_SEL_VDAC_MUX_LSB	  0
-+#define VIDEO_OUT_CFG_SEL_VDAC_MUX_ACCESS "RW"
-+// =============================================================================
-+// Register    : VIDEO_OUT_CFG_VDAC_CFG
-+// JTAG access : synchronous
-+// Description : Configure SNPS VDAC
-+#define VIDEO_OUT_CFG_VDAC_CFG_OFFSET 0x00000004
-+#define VIDEO_OUT_CFG_VDAC_CFG_BITS   0x1fffffff
-+#define VIDEO_OUT_CFG_VDAC_CFG_RESET  0x0003ffff
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_VDAC_CFG_ENCTR
-+// Description : None
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENCTR_RESET  0x0
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENCTR_BITS   0x1c000000
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENCTR_MSB    28
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENCTR_LSB    26
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENCTR_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_VDAC_CFG_ENSC
-+// Description : None
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENSC_RESET  0x0
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENSC_BITS   0x03800000
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENSC_MSB	   25
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENSC_LSB	   23
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENSC_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_VDAC_CFG_ENDAC
-+// Description : None
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENDAC_RESET  0x0
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENDAC_BITS   0x00700000
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENDAC_MSB    22
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENDAC_LSB    20
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENDAC_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_VDAC_CFG_ENVBG
-+// Description : None
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENVBG_RESET  0x0
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENVBG_BITS   0x00080000
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENVBG_MSB    19
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENVBG_LSB    19
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENVBG_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_VDAC_CFG_ENEXTREF
-+// Description : None
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENEXTREF_RESET  0x0
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENEXTREF_BITS   0x00040000
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENEXTREF_MSB    18
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENEXTREF_LSB    18
-+#define VIDEO_OUT_CFG_VDAC_CFG_ENEXTREF_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_VDAC_CFG_DAC2GC
-+// Description : dac2 gain control
-+#define VIDEO_OUT_CFG_VDAC_CFG_DAC2GC_RESET  0x3f
-+#define VIDEO_OUT_CFG_VDAC_CFG_DAC2GC_BITS   0x0003f000
-+#define VIDEO_OUT_CFG_VDAC_CFG_DAC2GC_MSB    17
-+#define VIDEO_OUT_CFG_VDAC_CFG_DAC2GC_LSB    12
-+#define VIDEO_OUT_CFG_VDAC_CFG_DAC2GC_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_VDAC_CFG_DAC1GC
-+// Description : dac1 gain control
-+#define VIDEO_OUT_CFG_VDAC_CFG_DAC1GC_RESET  0x3f
-+#define VIDEO_OUT_CFG_VDAC_CFG_DAC1GC_BITS   0x00000fc0
-+#define VIDEO_OUT_CFG_VDAC_CFG_DAC1GC_MSB    11
-+#define VIDEO_OUT_CFG_VDAC_CFG_DAC1GC_LSB    6
-+#define VIDEO_OUT_CFG_VDAC_CFG_DAC1GC_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_VDAC_CFG_DAC0GC
-+// Description : dac0 gain control
-+#define VIDEO_OUT_CFG_VDAC_CFG_DAC0GC_RESET  0x3f
-+#define VIDEO_OUT_CFG_VDAC_CFG_DAC0GC_BITS   0x0000003f
-+#define VIDEO_OUT_CFG_VDAC_CFG_DAC0GC_MSB    5
-+#define VIDEO_OUT_CFG_VDAC_CFG_DAC0GC_LSB    0
-+#define VIDEO_OUT_CFG_VDAC_CFG_DAC0GC_ACCESS "RW"
-+// =============================================================================
-+// Register    : VIDEO_OUT_CFG_VDAC_STATUS
-+// JTAG access : synchronous
-+// Description : Read VDAC status
-+#define VIDEO_OUT_CFG_VDAC_STATUS_OFFSET 0x00000008
-+#define VIDEO_OUT_CFG_VDAC_STATUS_BITS	 0x00000017
-+#define VIDEO_OUT_CFG_VDAC_STATUS_RESET	 0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_VDAC_STATUS_ENCTR3
-+// Description : None
-+#define VIDEO_OUT_CFG_VDAC_STATUS_ENCTR3_RESET	0x0
-+#define VIDEO_OUT_CFG_VDAC_STATUS_ENCTR3_BITS	0x00000010
-+#define VIDEO_OUT_CFG_VDAC_STATUS_ENCTR3_MSB	4
-+#define VIDEO_OUT_CFG_VDAC_STATUS_ENCTR3_LSB	4
-+#define VIDEO_OUT_CFG_VDAC_STATUS_ENCTR3_ACCESS "RO"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_VDAC_STATUS_CABLEOUT
-+// Description : None
-+#define VIDEO_OUT_CFG_VDAC_STATUS_CABLEOUT_RESET  "-"
-+#define VIDEO_OUT_CFG_VDAC_STATUS_CABLEOUT_BITS	  0x00000007
-+#define VIDEO_OUT_CFG_VDAC_STATUS_CABLEOUT_MSB	  2
-+#define VIDEO_OUT_CFG_VDAC_STATUS_CABLEOUT_LSB	  0
-+#define VIDEO_OUT_CFG_VDAC_STATUS_CABLEOUT_ACCESS "RO"
-+// =============================================================================
-+// Register    : VIDEO_OUT_CFG_MEM_PD
-+// JTAG access : synchronous
-+// Description : Control memory power down
-+#define VIDEO_OUT_CFG_MEM_PD_OFFSET 0x0000000c
-+#define VIDEO_OUT_CFG_MEM_PD_BITS   0x00000003
-+#define VIDEO_OUT_CFG_MEM_PD_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_MEM_PD_VEC
-+// Description : None
-+#define VIDEO_OUT_CFG_MEM_PD_VEC_RESET	0x0
-+#define VIDEO_OUT_CFG_MEM_PD_VEC_BITS	0x00000002
-+#define VIDEO_OUT_CFG_MEM_PD_VEC_MSB	1
-+#define VIDEO_OUT_CFG_MEM_PD_VEC_LSB	1
-+#define VIDEO_OUT_CFG_MEM_PD_VEC_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_MEM_PD_DPI
-+// Description : None
-+#define VIDEO_OUT_CFG_MEM_PD_DPI_RESET	0x0
-+#define VIDEO_OUT_CFG_MEM_PD_DPI_BITS	0x00000001
-+#define VIDEO_OUT_CFG_MEM_PD_DPI_MSB	0
-+#define VIDEO_OUT_CFG_MEM_PD_DPI_LSB	0
-+#define VIDEO_OUT_CFG_MEM_PD_DPI_ACCESS "RW"
-+// =============================================================================
-+// Register    : VIDEO_OUT_CFG_TEST_OVERRIDE
-+// JTAG access : synchronous
-+// Description : None
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_OFFSET 0x00000010
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_BITS   0xffffffff
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_TEST_OVERRIDE_PAD
-+// Description : None
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_PAD_RESET  0x0
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_PAD_BITS   0x80000000
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_PAD_MSB    31
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_PAD_LSB    31
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_PAD_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_TEST_OVERRIDE_VDAC
-+// Description : None
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_VDAC_RESET	0x0
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_VDAC_BITS	0x40000000
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_VDAC_MSB	30
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_VDAC_LSB	30
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_VDAC_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_TEST_OVERRIDE_RGBVAL
-+// Description : None
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_RGBVAL_RESET  0x00000000
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_RGBVAL_BITS	  0x3fffffff
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_RGBVAL_MSB	  29
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_RGBVAL_LSB	  0
-+#define VIDEO_OUT_CFG_TEST_OVERRIDE_RGBVAL_ACCESS "RW"
-+// =============================================================================
-+// Register    : VIDEO_OUT_CFG_INTR
-+// JTAG access : synchronous
-+// Description : Raw Interrupts
-+#define VIDEO_OUT_CFG_INTR_OFFSET 0x00000014
-+#define VIDEO_OUT_CFG_INTR_BITS	  0x00000003
-+#define VIDEO_OUT_CFG_INTR_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_INTR_DPI
-+// Description : None
-+#define VIDEO_OUT_CFG_INTR_DPI_RESET  0x0
-+#define VIDEO_OUT_CFG_INTR_DPI_BITS   0x00000002
-+#define VIDEO_OUT_CFG_INTR_DPI_MSB    1
-+#define VIDEO_OUT_CFG_INTR_DPI_LSB    1
-+#define VIDEO_OUT_CFG_INTR_DPI_ACCESS "RO"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_INTR_VEC
-+// Description : None
-+#define VIDEO_OUT_CFG_INTR_VEC_RESET  0x0
-+#define VIDEO_OUT_CFG_INTR_VEC_BITS   0x00000001
-+#define VIDEO_OUT_CFG_INTR_VEC_MSB    0
-+#define VIDEO_OUT_CFG_INTR_VEC_LSB    0
-+#define VIDEO_OUT_CFG_INTR_VEC_ACCESS "RO"
-+// =============================================================================
-+// Register    : VIDEO_OUT_CFG_INTE
-+// JTAG access : synchronous
-+// Description : Interrupt Enable
-+#define VIDEO_OUT_CFG_INTE_OFFSET 0x00000018
-+#define VIDEO_OUT_CFG_INTE_BITS	  0x00000003
-+#define VIDEO_OUT_CFG_INTE_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_INTE_DPI
-+// Description : None
-+#define VIDEO_OUT_CFG_INTE_DPI_RESET  0x0
-+#define VIDEO_OUT_CFG_INTE_DPI_BITS   0x00000002
-+#define VIDEO_OUT_CFG_INTE_DPI_MSB    1
-+#define VIDEO_OUT_CFG_INTE_DPI_LSB    1
-+#define VIDEO_OUT_CFG_INTE_DPI_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_INTE_VEC
-+// Description : None
-+#define VIDEO_OUT_CFG_INTE_VEC_RESET  0x0
-+#define VIDEO_OUT_CFG_INTE_VEC_BITS   0x00000001
-+#define VIDEO_OUT_CFG_INTE_VEC_MSB    0
-+#define VIDEO_OUT_CFG_INTE_VEC_LSB    0
-+#define VIDEO_OUT_CFG_INTE_VEC_ACCESS "RW"
-+// =============================================================================
-+// Register    : VIDEO_OUT_CFG_INTF
-+// JTAG access : synchronous
-+// Description : Interrupt Force
-+#define VIDEO_OUT_CFG_INTF_OFFSET 0x0000001c
-+#define VIDEO_OUT_CFG_INTF_BITS	  0x00000003
-+#define VIDEO_OUT_CFG_INTF_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_INTF_DPI
-+// Description : None
-+#define VIDEO_OUT_CFG_INTF_DPI_RESET  0x0
-+#define VIDEO_OUT_CFG_INTF_DPI_BITS   0x00000002
-+#define VIDEO_OUT_CFG_INTF_DPI_MSB    1
-+#define VIDEO_OUT_CFG_INTF_DPI_LSB    1
-+#define VIDEO_OUT_CFG_INTF_DPI_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_INTF_VEC
-+// Description : None
-+#define VIDEO_OUT_CFG_INTF_VEC_RESET  0x0
-+#define VIDEO_OUT_CFG_INTF_VEC_BITS   0x00000001
-+#define VIDEO_OUT_CFG_INTF_VEC_MSB    0
-+#define VIDEO_OUT_CFG_INTF_VEC_LSB    0
-+#define VIDEO_OUT_CFG_INTF_VEC_ACCESS "RW"
-+// =============================================================================
-+// Register    : VIDEO_OUT_CFG_INTS
-+// JTAG access : synchronous
-+// Description : Interrupt status after masking & forcing
-+#define VIDEO_OUT_CFG_INTS_OFFSET 0x00000020
-+#define VIDEO_OUT_CFG_INTS_BITS	  0x00000003
-+#define VIDEO_OUT_CFG_INTS_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_INTS_DPI
-+// Description : None
-+#define VIDEO_OUT_CFG_INTS_DPI_RESET  0x0
-+#define VIDEO_OUT_CFG_INTS_DPI_BITS   0x00000002
-+#define VIDEO_OUT_CFG_INTS_DPI_MSB    1
-+#define VIDEO_OUT_CFG_INTS_DPI_LSB    1
-+#define VIDEO_OUT_CFG_INTS_DPI_ACCESS "RO"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_INTS_VEC
-+// Description : None
-+#define VIDEO_OUT_CFG_INTS_VEC_RESET  0x0
-+#define VIDEO_OUT_CFG_INTS_VEC_BITS   0x00000001
-+#define VIDEO_OUT_CFG_INTS_VEC_MSB    0
-+#define VIDEO_OUT_CFG_INTS_VEC_LSB    0
-+#define VIDEO_OUT_CFG_INTS_VEC_ACCESS "RO"
-+// =============================================================================
-+// Register    : VIDEO_OUT_CFG_BLOCK_ID
-+// JTAG access : synchronous
-+// Description : Block Identifier
-+//		 Hexadecimal representation of "VOCF"
-+#define VIDEO_OUT_CFG_BLOCK_ID_OFFSET 0x00000024
-+#define VIDEO_OUT_CFG_BLOCK_ID_BITS   0xffffffff
-+#define VIDEO_OUT_CFG_BLOCK_ID_RESET  0x564f4346
-+#define VIDEO_OUT_CFG_BLOCK_ID_MSB    31
-+#define VIDEO_OUT_CFG_BLOCK_ID_LSB    0
-+#define VIDEO_OUT_CFG_BLOCK_ID_ACCESS "RO"
-+// =============================================================================
-+// Register    : VIDEO_OUT_CFG_INSTANCE_ID
-+// JTAG access : synchronous
-+// Description : Block Instance Identifier
-+#define VIDEO_OUT_CFG_INSTANCE_ID_OFFSET 0x00000028
-+#define VIDEO_OUT_CFG_INSTANCE_ID_BITS	 0x0000000f
-+#define VIDEO_OUT_CFG_INSTANCE_ID_RESET	 0x00000000
-+#define VIDEO_OUT_CFG_INSTANCE_ID_MSB	 3
-+#define VIDEO_OUT_CFG_INSTANCE_ID_LSB	 0
-+#define VIDEO_OUT_CFG_INSTANCE_ID_ACCESS "RO"
-+// =============================================================================
-+// Register    : VIDEO_OUT_CFG_RSTSEQ_AUTO
-+// JTAG access : synchronous
-+// Description : None
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_OFFSET 0x0000002c
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_BITS	 0x00000007
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_RESET	 0x00000007
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_RSTSEQ_AUTO_VEC
-+// Description : 1 = reset is controlled by the sequencer
-+//		 0 = reset is controlled by rstseq_ctrl
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_VEC_RESET  0x1
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_VEC_BITS   0x00000004
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_VEC_MSB    2
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_VEC_LSB    2
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_VEC_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_RSTSEQ_AUTO_DPI
-+// Description : 1 = reset is controlled by the sequencer
-+//		 0 = reset is controlled by rstseq_ctrl
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_DPI_RESET  0x1
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_DPI_BITS   0x00000002
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_DPI_MSB    1
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_DPI_LSB    1
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_DPI_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_RSTSEQ_AUTO_BUSADAPTER
-+// Description : 1 = reset is controlled by the sequencer
-+//		 0 = reset is controlled by rstseq_ctrl
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_BUSADAPTER_RESET  0x1
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_BUSADAPTER_BITS   0x00000001
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_BUSADAPTER_MSB    0
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_BUSADAPTER_LSB    0
-+#define VIDEO_OUT_CFG_RSTSEQ_AUTO_BUSADAPTER_ACCESS "RW"
-+// =============================================================================
-+// Register    : VIDEO_OUT_CFG_RSTSEQ_PARALLEL
-+// JTAG access : synchronous
-+// Description : None
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_OFFSET 0x00000030
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_BITS   0x00000007
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_RESET  0x00000006
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_RSTSEQ_PARALLEL_VEC
-+// Description : Is this reset parallel (i.e. not part of the sequence)
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_VEC_RESET	 0x1
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_VEC_BITS	 0x00000004
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_VEC_MSB	 2
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_VEC_LSB	 2
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_VEC_ACCESS "RO"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_RSTSEQ_PARALLEL_DPI
-+// Description : Is this reset parallel (i.e. not part of the sequence)
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_DPI_RESET	 0x1
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_DPI_BITS	 0x00000002
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_DPI_MSB	 1
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_DPI_LSB	 1
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_DPI_ACCESS "RO"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_RSTSEQ_PARALLEL_BUSADAPTER
-+// Description : Is this reset parallel (i.e. not part of the sequence)
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_BUSADAPTER_RESET	0x0
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_BUSADAPTER_BITS	0x00000001
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_BUSADAPTER_MSB	0
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_BUSADAPTER_LSB	0
-+#define VIDEO_OUT_CFG_RSTSEQ_PARALLEL_BUSADAPTER_ACCESS "RO"
-+// =============================================================================
-+// Register    : VIDEO_OUT_CFG_RSTSEQ_CTRL
-+// JTAG access : synchronous
-+// Description : None
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_OFFSET 0x00000034
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_BITS	 0x00000007
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_RESET	 0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_RSTSEQ_CTRL_VEC
-+// Description : 1 = keep the reset asserted
-+//		 0 = keep the reset deasserted
-+//		 This is ignored if rstseq_auto=1
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_VEC_RESET  0x0
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_VEC_BITS   0x00000004
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_VEC_MSB    2
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_VEC_LSB    2
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_VEC_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_RSTSEQ_CTRL_DPI
-+// Description : 1 = keep the reset asserted
-+//		 0 = keep the reset deasserted
-+//		 This is ignored if rstseq_auto=1
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_DPI_RESET  0x0
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_DPI_BITS   0x00000002
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_DPI_MSB    1
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_DPI_LSB    1
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_DPI_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_RSTSEQ_CTRL_BUSADAPTER
-+// Description : 1 = keep the reset asserted
-+//		 0 = keep the reset deasserted
-+//		 This is ignored if rstseq_auto=1
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_BUSADAPTER_RESET  0x0
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_BUSADAPTER_BITS   0x00000001
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_BUSADAPTER_MSB    0
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_BUSADAPTER_LSB    0
-+#define VIDEO_OUT_CFG_RSTSEQ_CTRL_BUSADAPTER_ACCESS "RW"
-+// =============================================================================
-+// Register    : VIDEO_OUT_CFG_RSTSEQ_TRIG
-+// JTAG access : synchronous
-+// Description : None
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_OFFSET 0x00000038
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_BITS	 0x00000007
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_RESET	 0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_RSTSEQ_TRIG_VEC
-+// Description : Pulses the reset output
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_VEC_RESET  0x0
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_VEC_BITS   0x00000004
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_VEC_MSB    2
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_VEC_LSB    2
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_VEC_ACCESS "SC"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_RSTSEQ_TRIG_DPI
-+// Description : Pulses the reset output
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_DPI_RESET  0x0
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_DPI_BITS   0x00000002
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_DPI_MSB    1
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_DPI_LSB    1
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_DPI_ACCESS "SC"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_RSTSEQ_TRIG_BUSADAPTER
-+// Description : Pulses the reset output
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_BUSADAPTER_RESET  0x0
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_BUSADAPTER_BITS   0x00000001
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_BUSADAPTER_MSB    0
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_BUSADAPTER_LSB    0
-+#define VIDEO_OUT_CFG_RSTSEQ_TRIG_BUSADAPTER_ACCESS "SC"
-+// =============================================================================
-+// Register    : VIDEO_OUT_CFG_RSTSEQ_DONE
-+// JTAG access : synchronous
-+// Description : None
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_OFFSET 0x0000003c
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_BITS	 0x00000007
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_RESET	 0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_RSTSEQ_DONE_VEC
-+// Description : Indicates the current state of the reset
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_VEC_RESET  0x0
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_VEC_BITS   0x00000004
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_VEC_MSB    2
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_VEC_LSB    2
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_VEC_ACCESS "RO"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_RSTSEQ_DONE_DPI
-+// Description : Indicates the current state of the reset
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_DPI_RESET  0x0
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_DPI_BITS   0x00000002
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_DPI_MSB    1
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_DPI_LSB    1
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_DPI_ACCESS "RO"
-+// -----------------------------------------------------------------------------
-+// Field       : VIDEO_OUT_CFG_RSTSEQ_DONE_BUSADAPTER
-+// Description : Indicates the current state of the reset
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_BUSADAPTER_RESET  0x0
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_BUSADAPTER_BITS   0x00000001
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_BUSADAPTER_MSB    0
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_BUSADAPTER_LSB    0
-+#define VIDEO_OUT_CFG_RSTSEQ_DONE_BUSADAPTER_ACCESS "RO"
-+// =============================================================================
-+
-+#define CFG_WRITE(reg, val)  writel((val),  vec->hw_base[RP1VEC_HW_BLOCK_CFG] + (reg ## _OFFSET))
-+#define CFG_READ(reg)	     readl(vec->hw_base[RP1VEC_HW_BLOCK_CFG] + (reg ## _OFFSET))
-+
-+void rp1vec_vidout_setup(struct rp1_vec *vec)
-+{
-+	/*
-+	 * We assume DPI and VEC can't be used at the same time (due to
-+	 * clashing requirements for PLL_VIDEO, and potentially for VDAC).
-+	 * We therefore leave DPI memories powered down.
-+	 */
-+	CFG_WRITE(VIDEO_OUT_CFG_MEM_PD, VIDEO_OUT_CFG_MEM_PD_DPI_BITS);
-+	CFG_WRITE(VIDEO_OUT_CFG_TEST_OVERRIDE, 0x00000000);
-+
-+	/* DPI->Pads; VEC->VDAC */
-+	CFG_WRITE(VIDEO_OUT_CFG_SEL, VIDEO_OUT_CFG_SEL_VDAC_MUX_BITS);
-+
-+	/* configure VDAC for 1 channel, bandgap on, 1.28V swing */
-+	CFG_WRITE(VIDEO_OUT_CFG_VDAC_CFG, 0x0019ffff);
-+
-+	/* enable VEC interrupt */
-+	CFG_WRITE(VIDEO_OUT_CFG_INTE, VIDEO_OUT_CFG_INTE_VEC_BITS);
-+}
-+
-+void rp1vec_vidout_poweroff(struct rp1_vec *vec)
-+{
-+	/* disable VEC interrupt */
-+	CFG_WRITE(VIDEO_OUT_CFG_INTE, 0);
-+
-+	/* Ensure VDAC is turned off; power down DPI,VEC memories */
-+	CFG_WRITE(VIDEO_OUT_CFG_VDAC_CFG, 0);
-+	CFG_WRITE(VIDEO_OUT_CFG_MEM_PD, VIDEO_OUT_CFG_MEM_PD_BITS);
-+}
---- /dev/null
-+++ b/drivers/gpu/drm/rp1/rp1-vec/rp1_vec_hw.c
-@@ -0,0 +1,469 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later
-+/*
-+ * DRM Driver for VEC output on Raspberry Pi RP1
-+ *
-+ * Copyright (c) 2023 Raspberry Pi Limited.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/errno.h>
-+#include <linux/mm.h>
-+#include <linux/delay.h>
-+#include <linux/interrupt.h>
-+#include <linux/platform_device.h>
-+#include <linux/printk.h>
-+#include <drm/drm_fourcc.h>
-+#include <drm/drm_print.h>
-+#include <drm/drm_vblank.h>
-+
-+#include "rp1_vec.h"
-+#include "vec_regs.h"
-+
-+#define BITS(field, val) (((val) << (field ## _LSB)) & (field ## _BITS))
-+
-+#define VEC_WRITE(reg, val) writel((val), vec->hw_base[RP1VEC_HW_BLOCK_VEC] + (reg ## _OFFSET))
-+#define VEC_READ(reg)	    readl(vec->hw_base[RP1VEC_HW_BLOCK_VEC] + (reg ## _OFFSET))
-+
-+int rp1vec_hw_busy(struct rp1_vec *vec)
-+{
-+	/* Read the undocumented "pline_busy" flag */
-+	return VEC_READ(VEC_STATUS) & 1;
-+}
-+
-+/* Table of supported input (in-memory/DMA) pixel formats. */
-+struct rp1vec_ipixfmt {
-+	u32 format; /* DRM format code				 */
-+	u32 mask;   /* RGB masks (10 bits each, left justified)	 */
-+	u32 shift;  /* RGB MSB positions in the memory word	 */
-+	u32 rgbsz;  /* Shifts used for scaling; also (BPP/8-1)	 */
-+};
-+
-+#define MASK_RGB(r, g, b) \
-+	(BITS(VEC_IMASK_MASK_R, r) | BITS(VEC_IMASK_MASK_G, g) | BITS(VEC_IMASK_MASK_B, b))
-+#define SHIFT_RGB(r, g, b) \
-+	(BITS(VEC_SHIFT_SHIFT_R, r) | BITS(VEC_SHIFT_SHIFT_G, g) | BITS(VEC_SHIFT_SHIFT_B, b))
-+
-+static const struct rp1vec_ipixfmt my_formats[] = {
-+	{
-+		.format = DRM_FORMAT_XRGB8888,
-+		.mask	= MASK_RGB(0x3fc, 0x3fc, 0x3fc),
-+		.shift  = SHIFT_RGB(23, 15, 7),
-+		.rgbsz  = BITS(VEC_RGBSZ_BYTES_PER_PIXEL_MINUS1, 3),
-+	},
-+	{
-+		.format = DRM_FORMAT_XBGR8888,
-+		.mask	= MASK_RGB(0x3fc, 0x3fc, 0x3fc),
-+		.shift  = SHIFT_RGB(7, 15, 23),
-+		.rgbsz  = BITS(VEC_RGBSZ_BYTES_PER_PIXEL_MINUS1, 3),
-+	},
-+	{
-+		.format = DRM_FORMAT_RGB888,
-+		.mask	= MASK_RGB(0x3fc, 0x3fc, 0x3fc),
-+		.shift  = SHIFT_RGB(23, 15, 7),
-+		.rgbsz  = BITS(VEC_RGBSZ_BYTES_PER_PIXEL_MINUS1, 2),
-+	},
-+	{
-+		.format = DRM_FORMAT_BGR888,
-+		.mask	= MASK_RGB(0x3fc, 0x3fc, 0x3fc),
-+		.shift  = SHIFT_RGB(7, 15, 23),
-+		.rgbsz  = BITS(VEC_RGBSZ_BYTES_PER_PIXEL_MINUS1, 2),
-+	},
-+	{
-+		.format = DRM_FORMAT_RGB565,
-+		.mask	= MASK_RGB(0x3e0, 0x3f0, 0x3e0),
-+		.shift  = SHIFT_RGB(15, 10, 4),
-+		.rgbsz  = BITS(VEC_RGBSZ_SCALE_R, 5) |
-+			  BITS(VEC_RGBSZ_SCALE_G, 6) |
-+			  BITS(VEC_RGBSZ_SCALE_B, 5) |
-+			  BITS(VEC_RGBSZ_BYTES_PER_PIXEL_MINUS1, 1),
-+	}
-+};
-+
-+/*
-+ * Hardware mode descriptions (@ 108 MHz clock rate).
-+ * These rely largely on "canned" register settings.
-+ * TODO: Port the generating software from FP to integer,
-+ * or better factorize the differences between modes.
-+ */
-+
-+struct rp1vec_hwmode {
-+	u16  total_cols;	/* active columns, plus padding for filter context  */
-+	u16  rows_per_field;	/* active lines per field (including partial ones)  */
-+	bool interlaced;	/* set for interlaced				    */
-+	bool first_field_odd;	/* set for interlaced and 30fps			    */
-+	u32  yuv_scaling;	/* three 10-bit fields {Y, U, V} in 2.8 format	    */
-+	u32  back_end_regs[28]; /* All registers 0x80 .. 0xEC			    */
-+};
-+
-+/* { NTSC, PAL, PAL-M } x { progressive, interlaced } x { 13.5 MHz, 15.428571 MHz } */
-+static const struct rp1vec_hwmode rp1vec_hwmodes[3][2][2] = {
-+	{
-+		/* NTSC */
-+		{
-+			{
-+				.total_cols = 724,
-+				.rows_per_field = 240,
-+				.interlaced = false,
-+				.first_field_odd = false,
-+				.yuv_scaling = 0x1071d0cf,
-+				.back_end_regs = {
-+					0x039f1a3f, 0x03e10cc6, 0x0d6801fb, 0x023d034c,
-+					0x00f80b6d, 0x00000005, 0x0006000b, 0x000c0011,
-+					0x000a0106, 0x00000000, 0x00000000, 0x00000000,
-+					0x00000000, 0x00170106, 0x00000000, 0x004c020e,
-+					0x00000000, 0x007bffff, 0x38518c9a, 0x11195561,
-+					0x02000200, 0xc1f07c1f, 0x087c1f07, 0x00000000,
-+					0x0be20200, 0x20f0f800, 0x265c7f00, 0x000801ec,
-+				},
-+			}, {
-+				.total_cols = 815,
-+				.rows_per_field = 240,
-+				.interlaced = false,
-+				.first_field_odd = false,
-+				.yuv_scaling = 0x1c131962,
-+				.back_end_regs = {
-+					0x03ce1a17, 0x03e10cc6, 0x0d6801fb, 0x023d034c,
-+					0x00f80b6d, 0x00000005, 0x0006000b, 0x000c0011,
-+					0x000a0106, 0x00000000, 0x00000000, 0x00000000,
-+					0x00000000, 0x00170106, 0x00000000, 0x004c020e,
-+					0x00000000, 0x007bffff, 0x38518c9a, 0x11195561,
-+					0x02000200, 0xc1f07c1f, 0x087c1f07, 0x00000000,
-+					0x0be20200, 0x20f0f800, 0x265c7f00, 0x000801ac,
-+				},
-+			},
-+		}, {
-+			{
-+				.total_cols = 724,
-+				.rows_per_field = 243,
-+				.interlaced = true,
-+				.first_field_odd = true,
-+				.yuv_scaling = 0x1071d0cf,
-+				.back_end_regs = {
-+					0x039f1a3f, 0x03e10cc6, 0x0d6801fb, 0x023d034c,
-+					0x00f80b6d, 0x00000005, 0x0006000b, 0x000c0011,
-+					0x000a0107, 0x0111020d, 0x00000000, 0x00000000,
-+					0x011c020d, 0x00150106, 0x0107011b, 0x004c020d,
-+					0x00000000, 0x007bffff, 0x38518c9a, 0x11195561,
-+					0x02000200, 0xc1f07c1f, 0x087c1f07, 0x00000000,
-+					0x0be20200, 0x20f0f800, 0x265c7f00, 0x00094dee,
-+				},
-+			}, {
-+				.total_cols = 815,
-+				.rows_per_field = 243,
-+				.interlaced = true,
-+				.first_field_odd = true,
-+				.yuv_scaling = 0x1c131962,
-+				.back_end_regs = {
-+					0x03ce1a17, 0x03e10cc6, 0x0d6801fb, 0x023d034c,
-+					0x00f80b6d, 0x00000005, 0x0006000b, 0x000c0011,
-+					0x000a0107, 0x0111020d, 0x00000000, 0x00000000,
-+					0x011c020d, 0x00150106, 0x0107011b, 0x004c020d,
-+					0x00000000, 0x007bffff, 0x38518c9a, 0x11195561,
-+					0x02000200, 0xc1f07c1f, 0x087c1f07, 0x00000000,
-+					0x0be20200, 0x20f0f800, 0x265c7f00, 0x00094dae,
-+				},
-+			},
-+		},
-+	}, {
-+		/* PAL */
-+		{
-+			{
-+				.total_cols = 724,
-+				.rows_per_field = 288,
-+				.interlaced = false,
-+				.first_field_odd = false,
-+				.yuv_scaling = 0x11c1f8e0,
-+				.back_end_regs = {
-+					0x04061aa6, 0x046e0cee, 0x0d8001fb, 0x025c034f,
-+					0x00fd0b84, 0x026c0270, 0x00000004, 0x00050009,
-+					0x00070135, 0x00000000, 0x00000000, 0x00000000,
-+					0x00000000, 0x00170136, 0x00000000, 0x000a0270,
-+					0x00000000, 0x007bffff, 0x3b1389d8, 0x0caf53b5,
-+					0x02000200, 0xcc48c1d1, 0x0a8262b2, 0x00000000,
-+					0x0be20200, 0x20f0f800, 0x265c7f00, 0x000801ed,
-+				},
-+			}, {
-+				.total_cols = 804,
-+				.rows_per_field = 288,
-+				.interlaced = false,
-+				.first_field_odd = false,
-+				.yuv_scaling = 0x1e635d7f,
-+				.back_end_regs = {
-+					0x045b1a57, 0x046e0cee, 0x0d8001fb, 0x025c034f,
-+					0x00fd0b84, 0x026c0270, 0x00000004, 0x00050009,
-+					0x00070135, 0x00000000, 0x00000000, 0x00000000,
-+					0x00000000, 0x00170136, 0x00000000, 0x000a0270,
-+					0x00000000, 0x007bffff, 0x3b1389d8, 0x0caf53b5,
-+					0x02000200, 0xcc48c1d1, 0x0a8262b2, 0x00000000,
-+					0x0be20200, 0x20f0f800, 0x265c7f00, 0x000801ad,
-+				},
-+			},
-+		}, {
-+			{
-+				.total_cols = 724,
-+				.rows_per_field = 288,
-+				.interlaced = true,
-+				.first_field_odd = false,
-+				.yuv_scaling = 0x11c1f8e0,
-+				.back_end_regs = {
-+					0x04061aa6, 0x046e0cee, 0x0d8001fb, 0x025c034f,
-+					0x00fd0b84, 0x026c0270, 0x00000004, 0x00050009,
-+					0x00070135, 0x013f026d, 0x00060136, 0x0140026e,
-+					0x0150026e, 0x00180136, 0x026f0017, 0x000a0271,
-+					0x00000000, 0x007bffff, 0x3b1389d8, 0x0caf53b5,
-+					0x02000200, 0xcc48c1d1, 0x0a8262b2, 0x00000000,
-+					0x0be20200, 0x20f0f800, 0x265c7f00, 0x0009ddef,
-+				},
-+			}, {
-+				.total_cols = 804,
-+				.rows_per_field = 288,
-+				.interlaced = true,
-+				.first_field_odd = false,
-+				.yuv_scaling = 0x1e635d7f,
-+				.back_end_regs = {
-+					0x045b1a57, 0x046e0cee, 0x0d8001fb, 0x025c034f,
-+					0x00fd0b84, 0x026c0270, 0x00000004, 0x00050009,
-+					0x00070135, 0x013f026d, 0x00060136, 0x0140026e,
-+					0x0150026e, 0x00180136, 0x026f0017, 0x000a0271,
-+					0x00000000, 0x007bffff, 0x3b1389d8, 0x0caf53b5,
-+					0x02000200, 0xcc48c1d1, 0x0a8262b2, 0x00000000,
-+					0x0be20200, 0x20f0f800, 0x265c7f00, 0x0009ddaf,
-+				},
-+			},
-+		},
-+	}, {
-+		/* PAL-M */
-+		{
-+			{
-+				.total_cols = 724,
-+				.rows_per_field = 240,
-+				.interlaced = false,
-+				.first_field_odd = false,
-+				.yuv_scaling = 0x11c1f8e0,
-+				.back_end_regs = {
-+					0x039f1a3f, 0x03e10cc6, 0x0d6801fb, 0x023c034c,
-+					0x00f80b6e, 0x00000005, 0x0006000b, 0x000c0011,
-+					0x000a0106, 0x00000000, 0x00000000, 0x00000000,
-+					0x00000000, 0x00170106, 0x00000000, 0x000a020c,
-+					0x00000000, 0x007bffff, 0x385189d8, 0x0d5c53b5,
-+					0x02000200, 0xd6d33ea8, 0x0879bbf8, 0x00000000,
-+					0x0be20200, 0x20f0f800, 0x265c7f00, 0x000801ed,
-+				},
-+			}, {
-+				.total_cols = 815,
-+				.rows_per_field = 240,
-+				.interlaced = false,
-+				.first_field_odd = false,
-+				.yuv_scaling = 0x1e635d7f,
-+				.back_end_regs = {
-+					0x03ce1a17, 0x03e10cc6, 0x0d6801fb, 0x023c034c,
-+					0x00f80b6e, 0x00000005, 0x0006000b, 0x000c0011,
-+					0x000a0106, 0x00000000, 0x00000000, 0x00000000,
-+					0x00000000, 0x00170106, 0x00000000, 0x000a020c,
-+					0x00000000, 0x007bffff, 0x385189d8, 0x0d5c53b5,
-+					0x02000200, 0xd6d33ea8, 0x0879bbf8, 0x00000000,
-+					0x0be20200, 0x20f0f800, 0x265c7f00, 0x000801ad,
-+				},
-+			},
-+		}, {
-+			{
-+				.total_cols = 724,
-+				.rows_per_field = 243,
-+				.interlaced = true,
-+				.first_field_odd = true,
-+				.yuv_scaling = 0x11c1f8e0,
-+				.back_end_regs = {
-+					0x039f1a3f, 0x03e10cc6, 0x0d6801fb, 0x023c034c,
-+					0x00f80b6e, 0x00140019, 0x00000005, 0x0006000b,
-+					0x00090103, 0x010f0209, 0x00080102, 0x010e020a,
-+					0x0119020a, 0x00120103, 0x01040118, 0x000a020d,
-+					0x00000000, 0x007bffff, 0x385189d8, 0x0d5c53b5,
-+					0x02000200, 0xd6d33ea8, 0x0879bbf8, 0x00000000,
-+					0x0be20200, 0x20f0f800, 0x265c7f00, 0x0009ddef,
-+				},
-+			}, {
-+				.total_cols = 815,
-+				.rows_per_field = 243,
-+				.interlaced = true,
-+				.first_field_odd = true,
-+				.yuv_scaling = 0x1e635d7f,
-+				.back_end_regs = {
-+					0x03ce1a17, 0x03e10cc6, 0x0d6801fb, 0x023c034c,
-+					0x00f80b6e, 0x00140019, 0x00000005, 0x0006000b,
-+					0x00090103, 0x010f0209, 0x00080102, 0x010e020a,
-+					0x0119020a, 0x00120103, 0x01040118, 0x000a020d,
-+					0x00000000, 0x007bffff, 0x385189d8, 0x0d5c53b5,
-+					0x02000200, 0xd6d33ea8, 0x0879bbf8, 0x00000000,
-+					0x0be20200, 0x20f0f800, 0x265c7f00, 0x0009ddaf,
-+				},
-+			},
-+		},
-+	},
-+};
-+
-+void rp1vec_hw_setup(struct rp1_vec *vec,
-+		     u32 in_format,
-+		     struct drm_display_mode const *mode,
-+		     int tvstd)
-+{
-+	unsigned int i, mode_family, mode_ilaced, mode_narrow;
-+	const struct rp1vec_hwmode *hwm;
-+	unsigned int w, h;
-+
-+	/* Pick the appropriate "base" mode, which we may modify */
-+	mode_ilaced = !!(mode->flags & DRM_MODE_FLAG_INTERLACE);
-+	if (mode->vtotal > 263 * (1 + mode_ilaced))
-+		mode_family = 1;
-+	else
-+		mode_family = (tvstd == RP1VEC_TVSTD_PAL_M || tvstd == RP1VEC_TVSTD_PAL60) ? 2 : 0;
-+	mode_narrow = (mode->clock >= 14336);
-+	hwm = &rp1vec_hwmodes[mode_family][mode_ilaced][mode_narrow];
-+	dev_info(&vec->pdev->dev,
-+		 "%s: in_fmt=\'%c%c%c%c\' mode=%dx%d%s [%d%d%d] tvstd=%d (%s)",
-+		__func__, in_format, in_format >> 8, in_format >> 16, in_format >> 24,
-+		mode->hdisplay, mode->vdisplay, (mode_ilaced) ? "i" : "",
-+		mode_family, mode_ilaced, mode_narrow,
-+		tvstd, rp1vec_tvstd_names[tvstd]);
-+
-+	w = mode->hdisplay;
-+	h = mode->vdisplay;
-+	if (mode_ilaced)
-+		h >>= 1;
-+	if (w > hwm->total_cols)
-+		w = hwm->total_cols;
-+	if (h > hwm->rows_per_field)
-+		w = hwm->rows_per_field;
-+
-+	/* Configure the hardware */
-+	VEC_WRITE(VEC_APB_TIMEOUT, 0x38);
-+	VEC_WRITE(VEC_QOS,
-+		  BITS(VEC_QOS_DQOS, 0x0) |
-+		  BITS(VEC_QOS_ULEV, 0x8) |
-+		  BITS(VEC_QOS_UQOS, 0x2) |
-+		  BITS(VEC_QOS_LLEV, 0x4) |
-+		  BITS(VEC_QOS_LQOS, 0x7));
-+	VEC_WRITE(VEC_DMA_AREA,
-+		  BITS(VEC_DMA_AREA_COLS_MINUS1, w - 1) |
-+		  BITS(VEC_DMA_AREA_ROWS_PER_FIELD_MINUS1, h - 1));
-+	VEC_WRITE(VEC_YUV_SCALING, hwm->yuv_scaling);
-+	VEC_WRITE(VEC_BACK_PORCH,
-+		  BITS(VEC_BACK_PORCH_HBP_MINUS1, (hwm->total_cols - w - 1) >> 1) |
-+		  BITS(VEC_BACK_PORCH_VBP_MINUS1, (hwm->rows_per_field - h - 1) >> 1));
-+	VEC_WRITE(VEC_FRONT_PORCH,
-+		  BITS(VEC_FRONT_PORCH_HFP_MINUS1, (hwm->total_cols - w - 2) >> 1) |
-+		  BITS(VEC_FRONT_PORCH_VFP_MINUS1, (hwm->rows_per_field - h - 2) >> 1));
-+	VEC_WRITE(VEC_MODE,
-+		  BITS(VEC_MODE_HIGH_WATER, 0xE0)			  |
-+		  BITS(VEC_MODE_ALIGN16, !((w | mode->hdisplay) & 15))	  |
-+		  BITS(VEC_MODE_VFP_EN, (hwm->rows_per_field > h + 1))	  |
-+		  BITS(VEC_MODE_VBP_EN, (hwm->rows_per_field > h))	  |
-+		  BITS(VEC_MODE_HFP_EN, (hwm->total_cols > w + 1))          |
-+		  BITS(VEC_MODE_HBP_EN, (hwm->total_cols > w))		  |
-+		  BITS(VEC_MODE_FIELDS_PER_FRAME_MINUS1, hwm->interlaced) |
-+		  BITS(VEC_MODE_FIRST_FIELD_ODD, hwm->first_field_odd));
-+	for (i = 0; i < ARRAY_SIZE(hwm->back_end_regs); ++i) {
-+		writel(hwm->back_end_regs[i],
-+		       vec->hw_base[RP1VEC_HW_BLOCK_VEC] + 0x80 + 4 * i);
-+	}
-+
-+	/* Apply modifications */
-+	if (tvstd == RP1VEC_TVSTD_NTSC_J && mode_family == 0) {
-+		/* Reduce pedestal (not quite to zero, for FIR overshoot); increase gain */
-+		VEC_WRITE(VEC_DAC_BC,
-+			  BITS(VEC_DAC_BC_S11_PEDESTAL, 10) |
-+			  (hwm->back_end_regs[(0xBC - 0x80) / 4] & ~VEC_DAC_BC_S11_PEDESTAL_BITS));
-+		VEC_WRITE(VEC_DAC_C8,
-+			  BITS(VEC_DAC_C8_U16_SCALE_LUMA, 0x9400) |
-+			  (hwm->back_end_regs[(0xC8 - 0x80) / 4] &
-+							~VEC_DAC_C8_U16_SCALE_LUMA_BITS));
-+	} else if ((tvstd == RP1VEC_TVSTD_NTSC_443 || tvstd == RP1VEC_TVSTD_PAL60) &&
-+		   mode_family != 1) {
-+		/* Change colour carrier frequency to 4433618.75 Hz; disable hard sync */
-+		VEC_WRITE(VEC_DAC_D4, 0xcc48c1d1);
-+		VEC_WRITE(VEC_DAC_D8, 0x0a8262b2);
-+		VEC_WRITE(VEC_DAC_EC,
-+			  hwm->back_end_regs[(0xEC - 0x80) / 4] & ~VEC_DAC_EC_SEQ_EN_BITS);
-+	} else if (tvstd == RP1VEC_TVSTD_PAL_N && mode_family == 1) {
-+		/* Change colour carrier frequency to 3582056.25 Hz */
-+		VEC_WRITE(VEC_DAC_D4, 0x9ce075f7);
-+		VEC_WRITE(VEC_DAC_D8, 0x087da511);
-+	}
-+
-+	/* Input pixel format conversion */
-+	for (i = 0; i < ARRAY_SIZE(my_formats); ++i) {
-+		if (my_formats[i].format == in_format)
-+			break;
-+	}
-+	if (i >= ARRAY_SIZE(my_formats)) {
-+		dev_err(&vec->pdev->dev, "%s: bad input format\n", __func__);
-+		i = 0;
-+	}
-+	VEC_WRITE(VEC_IMASK, my_formats[i].mask);
-+	VEC_WRITE(VEC_SHIFT, my_formats[i].shift);
-+	VEC_WRITE(VEC_RGBSZ, my_formats[i].rgbsz);
-+
-+	VEC_WRITE(VEC_IRQ_FLAGS, 0xffffffff);
-+	rp1vec_hw_vblank_ctrl(vec, 1);
-+
-+	i = rp1vec_hw_busy(vec);
-+	if (i)
-+		dev_warn(&vec->pdev->dev,
-+			 "%s: VEC unexpectedly busy at start (0x%08x)",
-+			__func__, VEC_READ(VEC_STATUS));
-+
-+	VEC_WRITE(VEC_CONTROL,
-+		  BITS(VEC_CONTROL_START_ARM, (!i)) |
-+		  BITS(VEC_CONTROL_AUTO_REPEAT, 1));
-+}
-+
-+void rp1vec_hw_update(struct rp1_vec *vec, dma_addr_t addr, u32 offset, u32 stride)
-+{
-+	/*
-+	 * Update STRIDE, DMAH and DMAL only. When called after rp1vec_hw_setup(),
-+	 * DMA starts immediately; if already running, the buffer will flip at
-+	 * the next vertical sync event.
-+	 */
-+	u64 a = addr + offset;
-+
-+	VEC_WRITE(VEC_DMA_STRIDE, stride);
-+	VEC_WRITE(VEC_DMA_ADDR_H, a >> 32);
-+	VEC_WRITE(VEC_DMA_ADDR_L, a & 0xFFFFFFFFu);
-+}
-+
-+void rp1vec_hw_stop(struct rp1_vec *vec)
-+{
-+	/*
-+	 * Stop DMA by turning off the Auto-Repeat flag, and wait up to 100ms for
-+	 * the current and any queued frame to end. "Force drain" flags are not used,
-+	 * as they seem to prevent DMA from re-starting properly; it's safer to wait.
-+	 */
-+
-+	reinit_completion(&vec->finished);
-+	VEC_WRITE(VEC_CONTROL, 0);
-+	if (!wait_for_completion_timeout(&vec->finished, HZ / 10))
-+		drm_err(vec->drm, "%s: timed out waiting for idle\n", __func__);
-+	VEC_WRITE(VEC_IRQ_ENABLES, 0);
-+}
-+
-+void rp1vec_hw_vblank_ctrl(struct rp1_vec *vec, int enable)
-+{
-+	VEC_WRITE(VEC_IRQ_ENABLES,
-+		  BITS(VEC_IRQ_ENABLES_DONE, 1) |
-+		  BITS(VEC_IRQ_ENABLES_DMA, (enable ? 1 : 0)) |
-+		  BITS(VEC_IRQ_ENABLES_MATCH_ROW, 1023));
-+}
-+
-+irqreturn_t rp1vec_hw_isr(int irq, void *dev)
-+{
-+	struct rp1_vec *vec = dev;
-+	u32 u = VEC_READ(VEC_IRQ_FLAGS);
-+
-+	if (u) {
-+		VEC_WRITE(VEC_IRQ_FLAGS, u);
-+		if (u & VEC_IRQ_FLAGS_DMA_BITS)
-+			drm_crtc_handle_vblank(&vec->pipe.crtc);
-+		if (u & VEC_IRQ_FLAGS_DONE_BITS)
-+			complete(&vec->finished);
-+	}
-+	return u ? IRQ_HANDLED : IRQ_NONE;
-+}
---- /dev/null
-+++ b/drivers/gpu/drm/rp1/rp1-vec/vec_regs.h
-@@ -0,0 +1,1420 @@
-+/* SPDX-License-Identifier: GPL-2.0-or-later */
-+// =============================================================================
-+// Copyright Raspberry Pi Ltd. 2023
-+// vrbuild version: 56aac1a23c016cbbd229108f3b6efc1343842156-clean
-+// THIS FILE IS GENERATED BY VRBUILD - DO NOT EDIT
-+// =============================================================================
-+// Register block : VEC
-+// Version        : 1
-+// Bus type       : apb
-+// Description    : None
-+// =============================================================================
-+#ifndef VEC_REGS_DEFINED
-+#define VEC_REGS_DEFINED
-+#define VEC_REGS_RWTYPE_MSB 13
-+#define VEC_REGS_RWTYPE_LSB 12
-+// =============================================================================
-+// Register    : VEC_CONTROL
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_CONTROL_OFFSET 0x00000000
-+#define VEC_CONTROL_BITS   0x00000007
-+#define VEC_CONTROL_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_CONTROL_BARS
-+// Description : Write '1' to display colour bar test pattern
-+#define VEC_CONTROL_BARS_RESET  0x0
-+#define VEC_CONTROL_BARS_BITS   0x00000004
-+#define VEC_CONTROL_BARS_MSB    2
-+#define VEC_CONTROL_BARS_LSB    2
-+#define VEC_CONTROL_BARS_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_CONTROL_AUTO_REPEAT
-+// Description : Write '1' to re-display same frame continuously
-+#define VEC_CONTROL_AUTO_REPEAT_RESET  0x0
-+#define VEC_CONTROL_AUTO_REPEAT_BITS   0x00000002
-+#define VEC_CONTROL_AUTO_REPEAT_MSB    1
-+#define VEC_CONTROL_AUTO_REPEAT_LSB    1
-+#define VEC_CONTROL_AUTO_REPEAT_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_CONTROL_START_ARM
-+// Description : Write '1' before first DMA address is written This bit always
-+//               reads back as '0'
-+#define VEC_CONTROL_START_ARM_RESET  0x0
-+#define VEC_CONTROL_START_ARM_BITS   0x00000001
-+#define VEC_CONTROL_START_ARM_MSB    0
-+#define VEC_CONTROL_START_ARM_LSB    0
-+#define VEC_CONTROL_START_ARM_ACCESS "SC"
-+// =============================================================================
-+// Register    : VEC_IRQ_ENABLES
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_IRQ_ENABLES_OFFSET 0x00000004
-+#define VEC_IRQ_ENABLES_BITS   0x03ff003f
-+#define VEC_IRQ_ENABLES_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_IRQ_ENABLES_MATCH_ROW
-+// Description : Raster line at which MATCH interrupt is signalled
-+#define VEC_IRQ_ENABLES_MATCH_ROW_RESET  0x000
-+#define VEC_IRQ_ENABLES_MATCH_ROW_BITS   0x03ff0000
-+#define VEC_IRQ_ENABLES_MATCH_ROW_MSB    25
-+#define VEC_IRQ_ENABLES_MATCH_ROW_LSB    16
-+#define VEC_IRQ_ENABLES_MATCH_ROW_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_IRQ_ENABLES_MATCH
-+// Description : Output raster == match_row reached
-+#define VEC_IRQ_ENABLES_MATCH_RESET  0x0
-+#define VEC_IRQ_ENABLES_MATCH_BITS   0x00000020
-+#define VEC_IRQ_ENABLES_MATCH_MSB    5
-+#define VEC_IRQ_ENABLES_MATCH_LSB    5
-+#define VEC_IRQ_ENABLES_MATCH_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_IRQ_ENABLES_ERROR
-+// Description : DMA address overwritten before it was taken
-+#define VEC_IRQ_ENABLES_ERROR_RESET  0x0
-+#define VEC_IRQ_ENABLES_ERROR_BITS   0x00000010
-+#define VEC_IRQ_ENABLES_ERROR_MSB    4
-+#define VEC_IRQ_ENABLES_ERROR_LSB    4
-+#define VEC_IRQ_ENABLES_ERROR_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_IRQ_ENABLES_DONE
-+// Description : Last word sent to DAC after end of video (= all clear)
-+#define VEC_IRQ_ENABLES_DONE_RESET  0x0
-+#define VEC_IRQ_ENABLES_DONE_BITS   0x00000008
-+#define VEC_IRQ_ENABLES_DONE_MSB    3
-+#define VEC_IRQ_ENABLES_DONE_LSB    3
-+#define VEC_IRQ_ENABLES_DONE_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_IRQ_ENABLES_FRAME
-+// Description : Start of frame
-+#define VEC_IRQ_ENABLES_FRAME_RESET  0x0
-+#define VEC_IRQ_ENABLES_FRAME_BITS   0x00000004
-+#define VEC_IRQ_ENABLES_FRAME_MSB    2
-+#define VEC_IRQ_ENABLES_FRAME_LSB    2
-+#define VEC_IRQ_ENABLES_FRAME_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_IRQ_ENABLES_UNDERFLOW
-+// Description : Underflow has occurred
-+#define VEC_IRQ_ENABLES_UNDERFLOW_RESET  0x0
-+#define VEC_IRQ_ENABLES_UNDERFLOW_BITS   0x00000002
-+#define VEC_IRQ_ENABLES_UNDERFLOW_MSB    1
-+#define VEC_IRQ_ENABLES_UNDERFLOW_LSB    1
-+#define VEC_IRQ_ENABLES_UNDERFLOW_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_IRQ_ENABLES_DMA
-+// Description : DMA ready to accept next frame start address
-+#define VEC_IRQ_ENABLES_DMA_RESET  0x0
-+#define VEC_IRQ_ENABLES_DMA_BITS   0x00000001
-+#define VEC_IRQ_ENABLES_DMA_MSB    0
-+#define VEC_IRQ_ENABLES_DMA_LSB    0
-+#define VEC_IRQ_ENABLES_DMA_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_IRQ_FLAGS
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_IRQ_FLAGS_OFFSET 0x00000008
-+#define VEC_IRQ_FLAGS_BITS   0x0000003f
-+#define VEC_IRQ_FLAGS_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_IRQ_FLAGS_MATCH
-+// Description : Output raster == match_row reached
-+#define VEC_IRQ_FLAGS_MATCH_RESET  0x0
-+#define VEC_IRQ_FLAGS_MATCH_BITS   0x00000020
-+#define VEC_IRQ_FLAGS_MATCH_MSB    5
-+#define VEC_IRQ_FLAGS_MATCH_LSB    5
-+#define VEC_IRQ_FLAGS_MATCH_ACCESS "WC"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_IRQ_FLAGS_ERROR
-+// Description : DMA address overwritten before it was taken
-+#define VEC_IRQ_FLAGS_ERROR_RESET  0x0
-+#define VEC_IRQ_FLAGS_ERROR_BITS   0x00000010
-+#define VEC_IRQ_FLAGS_ERROR_MSB    4
-+#define VEC_IRQ_FLAGS_ERROR_LSB    4
-+#define VEC_IRQ_FLAGS_ERROR_ACCESS "WC"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_IRQ_FLAGS_DONE
-+// Description : Last word sent to DAC after end of video (= all clear)
-+#define VEC_IRQ_FLAGS_DONE_RESET  0x0
-+#define VEC_IRQ_FLAGS_DONE_BITS   0x00000008
-+#define VEC_IRQ_FLAGS_DONE_MSB    3
-+#define VEC_IRQ_FLAGS_DONE_LSB    3
-+#define VEC_IRQ_FLAGS_DONE_ACCESS "WC"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_IRQ_FLAGS_FRAME
-+// Description : Start of frame
-+#define VEC_IRQ_FLAGS_FRAME_RESET  0x0
-+#define VEC_IRQ_FLAGS_FRAME_BITS   0x00000004
-+#define VEC_IRQ_FLAGS_FRAME_MSB    2
-+#define VEC_IRQ_FLAGS_FRAME_LSB    2
-+#define VEC_IRQ_FLAGS_FRAME_ACCESS "WC"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_IRQ_FLAGS_UNDERFLOW
-+// Description : Underflow has occurred
-+#define VEC_IRQ_FLAGS_UNDERFLOW_RESET  0x0
-+#define VEC_IRQ_FLAGS_UNDERFLOW_BITS   0x00000002
-+#define VEC_IRQ_FLAGS_UNDERFLOW_MSB    1
-+#define VEC_IRQ_FLAGS_UNDERFLOW_LSB    1
-+#define VEC_IRQ_FLAGS_UNDERFLOW_ACCESS "WC"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_IRQ_FLAGS_DMA
-+// Description : DMA ready to accept next frame start address
-+#define VEC_IRQ_FLAGS_DMA_RESET  0x0
-+#define VEC_IRQ_FLAGS_DMA_BITS   0x00000001
-+#define VEC_IRQ_FLAGS_DMA_MSB    0
-+#define VEC_IRQ_FLAGS_DMA_LSB    0
-+#define VEC_IRQ_FLAGS_DMA_ACCESS "WC"
-+// =============================================================================
-+// Register    : VEC_QOS
-+// JTAG access : synchronous
-+// Description : This register configures panic levels for the AXI ar_qos
-+//               quality of service field. Panic status is driven by the number
-+//               of rows held in the SRAM cache:
-+#define VEC_QOS_OFFSET 0x0000000c
-+#define VEC_QOS_BITS   0x000fffff
-+#define VEC_QOS_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_QOS_UQOS
-+// Description : Upper AXI QOS
-+#define VEC_QOS_UQOS_RESET  0x0
-+#define VEC_QOS_UQOS_BITS   0x000f0000
-+#define VEC_QOS_UQOS_MSB    19
-+#define VEC_QOS_UQOS_LSB    16
-+#define VEC_QOS_UQOS_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_QOS_ULEV
-+// Description : Upper trip level (resolution = 1 / 16 of cache size)
-+#define VEC_QOS_ULEV_RESET  0x0
-+#define VEC_QOS_ULEV_BITS   0x0000f000
-+#define VEC_QOS_ULEV_MSB    15
-+#define VEC_QOS_ULEV_LSB    12
-+#define VEC_QOS_ULEV_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_QOS_LQOS
-+// Description : Lower AXI QOS
-+#define VEC_QOS_LQOS_RESET  0x0
-+#define VEC_QOS_LQOS_BITS   0x00000f00
-+#define VEC_QOS_LQOS_MSB    11
-+#define VEC_QOS_LQOS_LSB    8
-+#define VEC_QOS_LQOS_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_QOS_LLEV
-+// Description : Lower trip level (resolution = 1 / 16 of cache size)
-+#define VEC_QOS_LLEV_RESET  0x0
-+#define VEC_QOS_LLEV_BITS   0x000000f0
-+#define VEC_QOS_LLEV_MSB    7
-+#define VEC_QOS_LLEV_LSB    4
-+#define VEC_QOS_LLEV_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_QOS_DQOS
-+// Description : Default QOS
-+#define VEC_QOS_DQOS_RESET  0x0
-+#define VEC_QOS_DQOS_BITS   0x0000000f
-+#define VEC_QOS_DQOS_MSB    3
-+#define VEC_QOS_DQOS_LSB    0
-+#define VEC_QOS_DQOS_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_DMA_ADDR_L
-+// JTAG access : synchronous
-+// Description : Lower 32-bits
-+#define VEC_DMA_ADDR_L_OFFSET 0x00000010
-+#define VEC_DMA_ADDR_L_BITS   0xffffffff
-+#define VEC_DMA_ADDR_L_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DMA_ADDR_L_AXI_ADDR
-+// Description : Byte address of DMA transfer frame buffer.
-+#define VEC_DMA_ADDR_L_AXI_ADDR_RESET  0x00000000
-+#define VEC_DMA_ADDR_L_AXI_ADDR_BITS   0xffffffff
-+#define VEC_DMA_ADDR_L_AXI_ADDR_MSB    31
-+#define VEC_DMA_ADDR_L_AXI_ADDR_LSB    0
-+#define VEC_DMA_ADDR_L_AXI_ADDR_ACCESS "RWF"
-+// =============================================================================
-+// Register    : VEC_DMA_STRIDE
-+// JTAG access : synchronous
-+// Description : This register sets the line byte stride.
-+#define VEC_DMA_STRIDE_OFFSET 0x00000014
-+#define VEC_DMA_STRIDE_BITS   0xffffffff
-+#define VEC_DMA_STRIDE_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DMA_STRIDE_STRIDE
-+// Description : Byte stride
-+#define VEC_DMA_STRIDE_STRIDE_RESET  0x00000000
-+#define VEC_DMA_STRIDE_STRIDE_BITS   0xffffffff
-+#define VEC_DMA_STRIDE_STRIDE_MSB    31
-+#define VEC_DMA_STRIDE_STRIDE_LSB    0
-+#define VEC_DMA_STRIDE_STRIDE_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_DMA_AREA
-+// JTAG access : synchronous
-+// Description : Interlaced pixel area. See example driver code.
-+#define VEC_DMA_AREA_OFFSET 0x00000018
-+#define VEC_DMA_AREA_BITS   0x03ff03ff
-+#define VEC_DMA_AREA_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DMA_AREA_COLS_MINUS1
-+// Description : Width
-+#define VEC_DMA_AREA_COLS_MINUS1_RESET  0x000
-+#define VEC_DMA_AREA_COLS_MINUS1_BITS   0x03ff0000
-+#define VEC_DMA_AREA_COLS_MINUS1_MSB    25
-+#define VEC_DMA_AREA_COLS_MINUS1_LSB    16
-+#define VEC_DMA_AREA_COLS_MINUS1_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DMA_AREA_ROWS_PER_FIELD_MINUS1
-+// Description : Lines per field = half of lines per interlaced frame
-+#define VEC_DMA_AREA_ROWS_PER_FIELD_MINUS1_RESET  0x000
-+#define VEC_DMA_AREA_ROWS_PER_FIELD_MINUS1_BITS   0x000003ff
-+#define VEC_DMA_AREA_ROWS_PER_FIELD_MINUS1_MSB    9
-+#define VEC_DMA_AREA_ROWS_PER_FIELD_MINUS1_LSB    0
-+#define VEC_DMA_AREA_ROWS_PER_FIELD_MINUS1_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_YUV_SCALING
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_YUV_SCALING_OFFSET 0x0000001c
-+#define VEC_YUV_SCALING_BITS   0x3fffffff
-+#define VEC_YUV_SCALING_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_YUV_SCALING_U10_SCALE_Y
-+// Description : Y unsigned scaling factor - 8 binary places
-+#define VEC_YUV_SCALING_U10_SCALE_Y_RESET  0x000
-+#define VEC_YUV_SCALING_U10_SCALE_Y_BITS   0x3ff00000
-+#define VEC_YUV_SCALING_U10_SCALE_Y_MSB    29
-+#define VEC_YUV_SCALING_U10_SCALE_Y_LSB    20
-+#define VEC_YUV_SCALING_U10_SCALE_Y_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_YUV_SCALING_S10_SCALE_U
-+// Description : U signed scaling factor - 8 binary places
-+#define VEC_YUV_SCALING_S10_SCALE_U_RESET  0x000
-+#define VEC_YUV_SCALING_S10_SCALE_U_BITS   0x000ffc00
-+#define VEC_YUV_SCALING_S10_SCALE_U_MSB    19
-+#define VEC_YUV_SCALING_S10_SCALE_U_LSB    10
-+#define VEC_YUV_SCALING_S10_SCALE_U_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_YUV_SCALING_S10_SCALE_V
-+// Description : V signed scaling factor - 8 binary please
-+#define VEC_YUV_SCALING_S10_SCALE_V_RESET  0x000
-+#define VEC_YUV_SCALING_S10_SCALE_V_BITS   0x000003ff
-+#define VEC_YUV_SCALING_S10_SCALE_V_MSB    9
-+#define VEC_YUV_SCALING_S10_SCALE_V_LSB    0
-+#define VEC_YUV_SCALING_S10_SCALE_V_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_BACK_PORCH
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_BACK_PORCH_OFFSET 0x00000020
-+#define VEC_BACK_PORCH_BITS   0x03ff03ff
-+#define VEC_BACK_PORCH_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_BACK_PORCH_HBP_MINUS1
-+// Description : Horizontal back porch
-+#define VEC_BACK_PORCH_HBP_MINUS1_RESET  0x000
-+#define VEC_BACK_PORCH_HBP_MINUS1_BITS   0x03ff0000
-+#define VEC_BACK_PORCH_HBP_MINUS1_MSB    25
-+#define VEC_BACK_PORCH_HBP_MINUS1_LSB    16
-+#define VEC_BACK_PORCH_HBP_MINUS1_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_BACK_PORCH_VBP_MINUS1
-+// Description : Vertical back porch
-+#define VEC_BACK_PORCH_VBP_MINUS1_RESET  0x000
-+#define VEC_BACK_PORCH_VBP_MINUS1_BITS   0x000003ff
-+#define VEC_BACK_PORCH_VBP_MINUS1_MSB    9
-+#define VEC_BACK_PORCH_VBP_MINUS1_LSB    0
-+#define VEC_BACK_PORCH_VBP_MINUS1_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_FRONT_PORCH
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_FRONT_PORCH_OFFSET 0x00000024
-+#define VEC_FRONT_PORCH_BITS   0x03ff03ff
-+#define VEC_FRONT_PORCH_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_FRONT_PORCH_HFP_MINUS1
-+// Description : Horizontal front porch
-+#define VEC_FRONT_PORCH_HFP_MINUS1_RESET  0x000
-+#define VEC_FRONT_PORCH_HFP_MINUS1_BITS   0x03ff0000
-+#define VEC_FRONT_PORCH_HFP_MINUS1_MSB    25
-+#define VEC_FRONT_PORCH_HFP_MINUS1_LSB    16
-+#define VEC_FRONT_PORCH_HFP_MINUS1_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_FRONT_PORCH_VFP_MINUS1
-+// Description : Vertical front porch
-+#define VEC_FRONT_PORCH_VFP_MINUS1_RESET  0x000
-+#define VEC_FRONT_PORCH_VFP_MINUS1_BITS   0x000003ff
-+#define VEC_FRONT_PORCH_VFP_MINUS1_MSB    9
-+#define VEC_FRONT_PORCH_VFP_MINUS1_LSB    0
-+#define VEC_FRONT_PORCH_VFP_MINUS1_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_SHIFT
-+// JTAG access : synchronous
-+// Description : Positions of R,G,B MS bits in the memory word. Note: due to an
-+//               unintended red/blue swap, these fields have been renamed since
-+//               a previous version. There is no functional change.
-+#define VEC_SHIFT_OFFSET 0x00000028
-+#define VEC_SHIFT_BITS   0x00007fff
-+#define VEC_SHIFT_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_SHIFT_SHIFT_R
-+// Description : Red MSB
-+#define VEC_SHIFT_SHIFT_R_RESET  0x00
-+#define VEC_SHIFT_SHIFT_R_BITS   0x00007c00
-+#define VEC_SHIFT_SHIFT_R_MSB    14
-+#define VEC_SHIFT_SHIFT_R_LSB    10
-+#define VEC_SHIFT_SHIFT_R_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_SHIFT_SHIFT_G
-+// Description : Green MSB
-+#define VEC_SHIFT_SHIFT_G_RESET  0x00
-+#define VEC_SHIFT_SHIFT_G_BITS   0x000003e0
-+#define VEC_SHIFT_SHIFT_G_MSB    9
-+#define VEC_SHIFT_SHIFT_G_LSB    5
-+#define VEC_SHIFT_SHIFT_G_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_SHIFT_SHIFT_B
-+// Description : Blue MSB
-+#define VEC_SHIFT_SHIFT_B_RESET  0x00
-+#define VEC_SHIFT_SHIFT_B_BITS   0x0000001f
-+#define VEC_SHIFT_SHIFT_B_MSB    4
-+#define VEC_SHIFT_SHIFT_B_LSB    0
-+#define VEC_SHIFT_SHIFT_B_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_IMASK
-+// JTAG access : synchronous
-+// Description : Masks for R,G,B significant bits, left-justified within 10-bit
-+//               fields.
-+#define VEC_IMASK_OFFSET 0x0000002c
-+#define VEC_IMASK_BITS   0x3fffffff
-+#define VEC_IMASK_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_IMASK_MASK_R
-+// Description : Red mask
-+#define VEC_IMASK_MASK_R_RESET  0x000
-+#define VEC_IMASK_MASK_R_BITS   0x3ff00000
-+#define VEC_IMASK_MASK_R_MSB    29
-+#define VEC_IMASK_MASK_R_LSB    20
-+#define VEC_IMASK_MASK_R_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_IMASK_MASK_G
-+// Description : Green mask
-+#define VEC_IMASK_MASK_G_RESET  0x000
-+#define VEC_IMASK_MASK_G_BITS   0x000ffc00
-+#define VEC_IMASK_MASK_G_MSB    19
-+#define VEC_IMASK_MASK_G_LSB    10
-+#define VEC_IMASK_MASK_G_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_IMASK_MASK_B
-+// Description : Blue mask
-+#define VEC_IMASK_MASK_B_RESET  0x000
-+#define VEC_IMASK_MASK_B_BITS   0x000003ff
-+#define VEC_IMASK_MASK_B_MSB    9
-+#define VEC_IMASK_MASK_B_LSB    0
-+#define VEC_IMASK_MASK_B_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_MODE
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_MODE_OFFSET 0x00000030
-+#define VEC_MODE_BITS   0x01ff003f
-+#define VEC_MODE_RESET  0x01c00000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_MODE_HIGH_WATER
-+// Description : ALWAYS WRITE 8'hE0
-+#define VEC_MODE_HIGH_WATER_RESET  0xe0
-+#define VEC_MODE_HIGH_WATER_BITS   0x01fe0000
-+#define VEC_MODE_HIGH_WATER_MSB    24
-+#define VEC_MODE_HIGH_WATER_LSB    17
-+#define VEC_MODE_HIGH_WATER_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_MODE_ALIGN16
-+// Description : Data: 0=BYTE aligned; 1=BEAT aligned
-+#define VEC_MODE_ALIGN16_RESET  0x0
-+#define VEC_MODE_ALIGN16_BITS   0x00010000
-+#define VEC_MODE_ALIGN16_MSB    16
-+#define VEC_MODE_ALIGN16_LSB    16
-+#define VEC_MODE_ALIGN16_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_MODE_VFP_EN
-+// Description : Enable vertical front porch
-+#define VEC_MODE_VFP_EN_RESET  0x0
-+#define VEC_MODE_VFP_EN_BITS   0x00000020
-+#define VEC_MODE_VFP_EN_MSB    5
-+#define VEC_MODE_VFP_EN_LSB    5
-+#define VEC_MODE_VFP_EN_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_MODE_VBP_EN
-+// Description : Enable vertical back porch
-+#define VEC_MODE_VBP_EN_RESET  0x0
-+#define VEC_MODE_VBP_EN_BITS   0x00000010
-+#define VEC_MODE_VBP_EN_MSB    4
-+#define VEC_MODE_VBP_EN_LSB    4
-+#define VEC_MODE_VBP_EN_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_MODE_HFP_EN
-+// Description : Enable horizontal front porch
-+#define VEC_MODE_HFP_EN_RESET  0x0
-+#define VEC_MODE_HFP_EN_BITS   0x00000008
-+#define VEC_MODE_HFP_EN_MSB    3
-+#define VEC_MODE_HFP_EN_LSB    3
-+#define VEC_MODE_HFP_EN_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_MODE_HBP_EN
-+// Description : Enable horizontal back porch
-+#define VEC_MODE_HBP_EN_RESET  0x0
-+#define VEC_MODE_HBP_EN_BITS   0x00000004
-+#define VEC_MODE_HBP_EN_MSB    2
-+#define VEC_MODE_HBP_EN_LSB    2
-+#define VEC_MODE_HBP_EN_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_MODE_FIELDS_PER_FRAME_MINUS1
-+// Description : Interlaced / progressive
-+#define VEC_MODE_FIELDS_PER_FRAME_MINUS1_RESET  0x0
-+#define VEC_MODE_FIELDS_PER_FRAME_MINUS1_BITS   0x00000002
-+#define VEC_MODE_FIELDS_PER_FRAME_MINUS1_MSB    1
-+#define VEC_MODE_FIELDS_PER_FRAME_MINUS1_LSB    1
-+#define VEC_MODE_FIELDS_PER_FRAME_MINUS1_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_MODE_FIRST_FIELD_ODD
-+// Description : Interlacing order: odd/even or even/odd
-+#define VEC_MODE_FIRST_FIELD_ODD_RESET  0x0
-+#define VEC_MODE_FIRST_FIELD_ODD_BITS   0x00000001
-+#define VEC_MODE_FIRST_FIELD_ODD_MSB    0
-+#define VEC_MODE_FIRST_FIELD_ODD_LSB    0
-+#define VEC_MODE_FIRST_FIELD_ODD_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_RGBSZ
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_RGBSZ_OFFSET 0x00000034
-+#define VEC_RGBSZ_BITS   0x00030fff
-+#define VEC_RGBSZ_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_RGBSZ_BYTES_PER_PIXEL_MINUS1
-+// Description : Pixel stride
-+#define VEC_RGBSZ_BYTES_PER_PIXEL_MINUS1_RESET  0x0
-+#define VEC_RGBSZ_BYTES_PER_PIXEL_MINUS1_BITS   0x00030000
-+#define VEC_RGBSZ_BYTES_PER_PIXEL_MINUS1_MSB    17
-+#define VEC_RGBSZ_BYTES_PER_PIXEL_MINUS1_LSB    16
-+#define VEC_RGBSZ_BYTES_PER_PIXEL_MINUS1_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_RGBSZ_SCALE_R
-+// Description : Red number of bits for shift-and-OR scaling
-+#define VEC_RGBSZ_SCALE_R_RESET  0x0
-+#define VEC_RGBSZ_SCALE_R_BITS   0x00000f00
-+#define VEC_RGBSZ_SCALE_R_MSB    11
-+#define VEC_RGBSZ_SCALE_R_LSB    8
-+#define VEC_RGBSZ_SCALE_R_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_RGBSZ_SCALE_G
-+// Description : Green number of bits for shift-and-OR scaling
-+#define VEC_RGBSZ_SCALE_G_RESET  0x0
-+#define VEC_RGBSZ_SCALE_G_BITS   0x000000f0
-+#define VEC_RGBSZ_SCALE_G_MSB    7
-+#define VEC_RGBSZ_SCALE_G_LSB    4
-+#define VEC_RGBSZ_SCALE_G_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_RGBSZ_SCALE_B
-+// Description : Blue number of bits for shift-and-OR scaling
-+#define VEC_RGBSZ_SCALE_B_RESET  0x0
-+#define VEC_RGBSZ_SCALE_B_BITS   0x0000000f
-+#define VEC_RGBSZ_SCALE_B_MSB    3
-+#define VEC_RGBSZ_SCALE_B_LSB    0
-+#define VEC_RGBSZ_SCALE_B_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_PANICS
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_PANICS_OFFSET 0x00000038
-+#define VEC_PANICS_BITS   0xffffffff
-+#define VEC_PANICS_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_PANICS_UCOUNT
-+// Description : Upper panic count
-+#define VEC_PANICS_UCOUNT_RESET  0x0000
-+#define VEC_PANICS_UCOUNT_BITS   0xffff0000
-+#define VEC_PANICS_UCOUNT_MSB    31
-+#define VEC_PANICS_UCOUNT_LSB    16
-+#define VEC_PANICS_UCOUNT_ACCESS "WC"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_PANICS_LCOUNT
-+// Description : Lower panic count
-+#define VEC_PANICS_LCOUNT_RESET  0x0000
-+#define VEC_PANICS_LCOUNT_BITS   0x0000ffff
-+#define VEC_PANICS_LCOUNT_MSB    15
-+#define VEC_PANICS_LCOUNT_LSB    0
-+#define VEC_PANICS_LCOUNT_ACCESS "WC"
-+// =============================================================================
-+// Register    : VEC_STATUS
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_STATUS_OFFSET 0x0000003c
-+#define VEC_STATUS_BITS   0xff000000
-+#define VEC_STATUS_RESET  0x0d000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_STATUS_VERSION
-+// Description : VEC module version code
-+#define VEC_STATUS_VERSION_RESET  0x0d
-+#define VEC_STATUS_VERSION_BITS   0xff000000
-+#define VEC_STATUS_VERSION_MSB    31
-+#define VEC_STATUS_VERSION_LSB    24
-+#define VEC_STATUS_VERSION_ACCESS "RO"
-+// =============================================================================
-+// Register    : VEC_DMA_ADDR_H
-+// JTAG access : synchronous
-+// Description : Upper 32-bits
-+#define VEC_DMA_ADDR_H_OFFSET 0x00000040
-+#define VEC_DMA_ADDR_H_BITS   0xffffffff
-+#define VEC_DMA_ADDR_H_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DMA_ADDR_H_AXI_ADDR
-+// Description : Byte address of DMA transfer frame buffer.
-+#define VEC_DMA_ADDR_H_AXI_ADDR_RESET  0x00000000
-+#define VEC_DMA_ADDR_H_AXI_ADDR_BITS   0xffffffff
-+#define VEC_DMA_ADDR_H_AXI_ADDR_MSB    31
-+#define VEC_DMA_ADDR_H_AXI_ADDR_LSB    0
-+#define VEC_DMA_ADDR_H_AXI_ADDR_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_BURST_ADDR_L
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_BURST_ADDR_L_OFFSET 0x00000044
-+#define VEC_BURST_ADDR_L_BITS   0xffffffff
-+#define VEC_BURST_ADDR_L_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_BURST_ADDR_L_BURST_ADDR
-+// Description : the lower 32-bits of the most recent read request sent to AXI
-+//               memory.
-+#define VEC_BURST_ADDR_L_BURST_ADDR_RESET  0x00000000
-+#define VEC_BURST_ADDR_L_BURST_ADDR_BITS   0xffffffff
-+#define VEC_BURST_ADDR_L_BURST_ADDR_MSB    31
-+#define VEC_BURST_ADDR_L_BURST_ADDR_LSB    0
-+#define VEC_BURST_ADDR_L_BURST_ADDR_ACCESS "RO"
-+// =============================================================================
-+// Register    : VEC_APB_TIMEOUT
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_APB_TIMEOUT_OFFSET 0x00000048
-+#define VEC_APB_TIMEOUT_BITS   0x000103ff
-+#define VEC_APB_TIMEOUT_RESET  0x00000014
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_APB_TIMEOUT_SLVERR_EN
-+// Description : 1 = Assert PREADY and PSLVERR on timeout 0 = Assert PREADY only
-+#define VEC_APB_TIMEOUT_SLVERR_EN_RESET  0x0
-+#define VEC_APB_TIMEOUT_SLVERR_EN_BITS   0x00010000
-+#define VEC_APB_TIMEOUT_SLVERR_EN_MSB    16
-+#define VEC_APB_TIMEOUT_SLVERR_EN_LSB    16
-+#define VEC_APB_TIMEOUT_SLVERR_EN_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_APB_TIMEOUT_TIMEOUT
-+// Description : Maximum AXI clock cycles to wait for responses from DAC clock
-+//               domain APB block
-+#define VEC_APB_TIMEOUT_TIMEOUT_RESET  0x014
-+#define VEC_APB_TIMEOUT_TIMEOUT_BITS   0x000003ff
-+#define VEC_APB_TIMEOUT_TIMEOUT_MSB    9
-+#define VEC_APB_TIMEOUT_TIMEOUT_LSB    0
-+#define VEC_APB_TIMEOUT_TIMEOUT_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_DAC_80
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_DAC_80_OFFSET 0x00000080
-+#define VEC_DAC_80_BITS   0x3fff3fff
-+#define VEC_DAC_80_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_80_U14_DE_BGN
-+// Description : Beginning of active data enable within each visible line
-+#define VEC_DAC_80_U14_DE_BGN_RESET  0x0000
-+#define VEC_DAC_80_U14_DE_BGN_BITS   0x3fff0000
-+#define VEC_DAC_80_U14_DE_BGN_MSB    29
-+#define VEC_DAC_80_U14_DE_BGN_LSB    16
-+#define VEC_DAC_80_U14_DE_BGN_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_80_U14_DE_END
-+// Description : End of active data enable within each visible line
-+#define VEC_DAC_80_U14_DE_END_RESET  0x0000
-+#define VEC_DAC_80_U14_DE_END_BITS   0x00003fff
-+#define VEC_DAC_80_U14_DE_END_MSB    13
-+#define VEC_DAC_80_U14_DE_END_LSB    0
-+#define VEC_DAC_80_U14_DE_END_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_DAC_84
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_DAC_84_OFFSET 0x00000084
-+#define VEC_DAC_84_BITS   0x1fff1fff
-+#define VEC_DAC_84_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_84_U13_ACTIVE_RISE
-+// Description : Horizontal blanking interval
-+#define VEC_DAC_84_U13_ACTIVE_RISE_RESET  0x0000
-+#define VEC_DAC_84_U13_ACTIVE_RISE_BITS   0x1fff0000
-+#define VEC_DAC_84_U13_ACTIVE_RISE_MSB    28
-+#define VEC_DAC_84_U13_ACTIVE_RISE_LSB    16
-+#define VEC_DAC_84_U13_ACTIVE_RISE_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_84_U13_ACTIVE_FALL
-+// Description : Horizontal blanking interval
-+#define VEC_DAC_84_U13_ACTIVE_FALL_RESET  0x0000
-+#define VEC_DAC_84_U13_ACTIVE_FALL_BITS   0x00001fff
-+#define VEC_DAC_84_U13_ACTIVE_FALL_MSB    12
-+#define VEC_DAC_84_U13_ACTIVE_FALL_LSB    0
-+#define VEC_DAC_84_U13_ACTIVE_FALL_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_DAC_88
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_DAC_88_OFFSET 0x00000088
-+#define VEC_DAC_88_BITS   0x1fff1fff
-+#define VEC_DAC_88_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_88_U13_HALF_LINE_PERIOD
-+// Description : Ratio of DAC clock to horizontal line rate, halved
-+#define VEC_DAC_88_U13_HALF_LINE_PERIOD_RESET  0x0000
-+#define VEC_DAC_88_U13_HALF_LINE_PERIOD_BITS   0x1fff0000
-+#define VEC_DAC_88_U13_HALF_LINE_PERIOD_MSB    28
-+#define VEC_DAC_88_U13_HALF_LINE_PERIOD_LSB    16
-+#define VEC_DAC_88_U13_HALF_LINE_PERIOD_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_88_U13_HORZ_SYNC
-+// Description : Width of horizontal sync pulses
-+#define VEC_DAC_88_U13_HORZ_SYNC_RESET  0x0000
-+#define VEC_DAC_88_U13_HORZ_SYNC_BITS   0x00001fff
-+#define VEC_DAC_88_U13_HORZ_SYNC_MSB    12
-+#define VEC_DAC_88_U13_HORZ_SYNC_LSB    0
-+#define VEC_DAC_88_U13_HORZ_SYNC_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_DAC_8C
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_DAC_8C_OFFSET 0x0000008c
-+#define VEC_DAC_8C_BITS   0x1fff1fff
-+#define VEC_DAC_8C_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_8C_U13_BURST_RISE
-+// Description : Start of raised-cosine colour burst envelope
-+#define VEC_DAC_8C_U13_BURST_RISE_RESET  0x0000
-+#define VEC_DAC_8C_U13_BURST_RISE_BITS   0x1fff0000
-+#define VEC_DAC_8C_U13_BURST_RISE_MSB    28
-+#define VEC_DAC_8C_U13_BURST_RISE_LSB    16
-+#define VEC_DAC_8C_U13_BURST_RISE_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_8C_U13_BURST_FALL
-+// Description : End of raised-cosine colour burst envelope
-+#define VEC_DAC_8C_U13_BURST_FALL_RESET  0x0000
-+#define VEC_DAC_8C_U13_BURST_FALL_BITS   0x00001fff
-+#define VEC_DAC_8C_U13_BURST_FALL_MSB    12
-+#define VEC_DAC_8C_U13_BURST_FALL_LSB    0
-+#define VEC_DAC_8C_U13_BURST_FALL_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_DAC_90
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_DAC_90_OFFSET 0x00000090
-+#define VEC_DAC_90_BITS   0x1fff3fff
-+#define VEC_DAC_90_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_90_U13_VERT_EQ
-+// Description : Width of vertical equalisation pulses (= half line minus
-+//               serration)
-+#define VEC_DAC_90_U13_VERT_EQ_RESET  0x0000
-+#define VEC_DAC_90_U13_VERT_EQ_BITS   0x1fff0000
-+#define VEC_DAC_90_U13_VERT_EQ_MSB    28
-+#define VEC_DAC_90_U13_VERT_EQ_LSB    16
-+#define VEC_DAC_90_U13_VERT_EQ_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_90_U14_VERT_SYNC
-+// Description : Width of vertical sync pulses
-+#define VEC_DAC_90_U14_VERT_SYNC_RESET  0x0000
-+#define VEC_DAC_90_U14_VERT_SYNC_BITS   0x00003fff
-+#define VEC_DAC_90_U14_VERT_SYNC_MSB    13
-+#define VEC_DAC_90_U14_VERT_SYNC_LSB    0
-+#define VEC_DAC_90_U14_VERT_SYNC_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_DAC_94
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_DAC_94_OFFSET 0x00000094
-+#define VEC_DAC_94_BITS   0x03ff03ff
-+#define VEC_DAC_94_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_94_U10_PRE_EQ_BGN
-+// Description : Half-lines, inclusive, relative to field datum, where vertical
-+//               pre-equalisation pulses start
-+#define VEC_DAC_94_U10_PRE_EQ_BGN_RESET  0x000
-+#define VEC_DAC_94_U10_PRE_EQ_BGN_BITS   0x03ff0000
-+#define VEC_DAC_94_U10_PRE_EQ_BGN_MSB    25
-+#define VEC_DAC_94_U10_PRE_EQ_BGN_LSB    16
-+#define VEC_DAC_94_U10_PRE_EQ_BGN_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_94_U10_PRE_EQ_END
-+// Description : Half-lines, inclusive, relative to field datum, where vertical
-+//               pre-equalisation pulses end
-+#define VEC_DAC_94_U10_PRE_EQ_END_RESET  0x000
-+#define VEC_DAC_94_U10_PRE_EQ_END_BITS   0x000003ff
-+#define VEC_DAC_94_U10_PRE_EQ_END_MSB    9
-+#define VEC_DAC_94_U10_PRE_EQ_END_LSB    0
-+#define VEC_DAC_94_U10_PRE_EQ_END_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_DAC_98
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_DAC_98_OFFSET 0x00000098
-+#define VEC_DAC_98_BITS   0x03ff03ff
-+#define VEC_DAC_98_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_98_U10_FIELD_SYNC_BGN
-+// Description : Half-lines containing vertical sync pulses (inclusive)
-+#define VEC_DAC_98_U10_FIELD_SYNC_BGN_RESET  0x000
-+#define VEC_DAC_98_U10_FIELD_SYNC_BGN_BITS   0x03ff0000
-+#define VEC_DAC_98_U10_FIELD_SYNC_BGN_MSB    25
-+#define VEC_DAC_98_U10_FIELD_SYNC_BGN_LSB    16
-+#define VEC_DAC_98_U10_FIELD_SYNC_BGN_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_98_U10_FIELD_SYNC_END
-+// Description : Half-lines containing vertical sync pulses (inclusive)
-+#define VEC_DAC_98_U10_FIELD_SYNC_END_RESET  0x000
-+#define VEC_DAC_98_U10_FIELD_SYNC_END_BITS   0x000003ff
-+#define VEC_DAC_98_U10_FIELD_SYNC_END_MSB    9
-+#define VEC_DAC_98_U10_FIELD_SYNC_END_LSB    0
-+#define VEC_DAC_98_U10_FIELD_SYNC_END_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_DAC_9C
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_DAC_9C_OFFSET 0x0000009c
-+#define VEC_DAC_9C_BITS   0x03ff03ff
-+#define VEC_DAC_9C_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_9C_U10_POST_EQ_BGN
-+// Description : Half-lines containing vertical post-equalisation pulses
-+#define VEC_DAC_9C_U10_POST_EQ_BGN_RESET  0x000
-+#define VEC_DAC_9C_U10_POST_EQ_BGN_BITS   0x03ff0000
-+#define VEC_DAC_9C_U10_POST_EQ_BGN_MSB    25
-+#define VEC_DAC_9C_U10_POST_EQ_BGN_LSB    16
-+#define VEC_DAC_9C_U10_POST_EQ_BGN_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_9C_U10_POST_EQ_END
-+// Description : Half-lines containing vertical post-equalisation pulses
-+#define VEC_DAC_9C_U10_POST_EQ_END_RESET  0x000
-+#define VEC_DAC_9C_U10_POST_EQ_END_BITS   0x000003ff
-+#define VEC_DAC_9C_U10_POST_EQ_END_MSB    9
-+#define VEC_DAC_9C_U10_POST_EQ_END_LSB    0
-+#define VEC_DAC_9C_U10_POST_EQ_END_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_DAC_A0
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_DAC_A0_OFFSET 0x000000a0
-+#define VEC_DAC_A0_BITS   0x03ff03ff
-+#define VEC_DAC_A0_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_A0_U10_FLD1_BURST_BGN
-+// Description : First and last full frame lines (1-based numbering) within the
-+//               PAL/NTSC four field sequence which require a colour burst
-+#define VEC_DAC_A0_U10_FLD1_BURST_BGN_RESET  0x000
-+#define VEC_DAC_A0_U10_FLD1_BURST_BGN_BITS   0x03ff0000
-+#define VEC_DAC_A0_U10_FLD1_BURST_BGN_MSB    25
-+#define VEC_DAC_A0_U10_FLD1_BURST_BGN_LSB    16
-+#define VEC_DAC_A0_U10_FLD1_BURST_BGN_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_A0_U10_FLD1_BURST_END
-+// Description : First and last full frame lines (1-based numbering) within the
-+//               PAL/NTSC four field sequence which require a colour burst
-+#define VEC_DAC_A0_U10_FLD1_BURST_END_RESET  0x000
-+#define VEC_DAC_A0_U10_FLD1_BURST_END_BITS   0x000003ff
-+#define VEC_DAC_A0_U10_FLD1_BURST_END_MSB    9
-+#define VEC_DAC_A0_U10_FLD1_BURST_END_LSB    0
-+#define VEC_DAC_A0_U10_FLD1_BURST_END_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_DAC_A4
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_DAC_A4_OFFSET 0x000000a4
-+#define VEC_DAC_A4_BITS   0x03ff03ff
-+#define VEC_DAC_A4_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_A4_U10_FLD2_BURST_BGN
-+// Description : First and last full frame lines (1-based numbering) within the
-+//               PAL/NTSC four field sequence which require a colour burst
-+#define VEC_DAC_A4_U10_FLD2_BURST_BGN_RESET  0x000
-+#define VEC_DAC_A4_U10_FLD2_BURST_BGN_BITS   0x03ff0000
-+#define VEC_DAC_A4_U10_FLD2_BURST_BGN_MSB    25
-+#define VEC_DAC_A4_U10_FLD2_BURST_BGN_LSB    16
-+#define VEC_DAC_A4_U10_FLD2_BURST_BGN_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_A4_U10_FLD2_BURST_END
-+// Description : First and last full frame lines (1-based numbering) within the
-+//               PAL/NTSC four field sequence which require a colour burst
-+#define VEC_DAC_A4_U10_FLD2_BURST_END_RESET  0x000
-+#define VEC_DAC_A4_U10_FLD2_BURST_END_BITS   0x000003ff
-+#define VEC_DAC_A4_U10_FLD2_BURST_END_MSB    9
-+#define VEC_DAC_A4_U10_FLD2_BURST_END_LSB    0
-+#define VEC_DAC_A4_U10_FLD2_BURST_END_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_DAC_A8
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_DAC_A8_OFFSET 0x000000a8
-+#define VEC_DAC_A8_BITS   0x03ff03ff
-+#define VEC_DAC_A8_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_A8_U10_FLD3_BURST_BGN
-+// Description : First and last full frame lines (1-based numbering) within the
-+//               PAL/NTSC four field sequence which require a colour burst
-+#define VEC_DAC_A8_U10_FLD3_BURST_BGN_RESET  0x000
-+#define VEC_DAC_A8_U10_FLD3_BURST_BGN_BITS   0x03ff0000
-+#define VEC_DAC_A8_U10_FLD3_BURST_BGN_MSB    25
-+#define VEC_DAC_A8_U10_FLD3_BURST_BGN_LSB    16
-+#define VEC_DAC_A8_U10_FLD3_BURST_BGN_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_A8_U10_FLD3_BURST_END
-+// Description : First and last full frame lines (1-based numbering) within the
-+//               PAL/NTSC four field sequence which require a colour burst
-+#define VEC_DAC_A8_U10_FLD3_BURST_END_RESET  0x000
-+#define VEC_DAC_A8_U10_FLD3_BURST_END_BITS   0x000003ff
-+#define VEC_DAC_A8_U10_FLD3_BURST_END_MSB    9
-+#define VEC_DAC_A8_U10_FLD3_BURST_END_LSB    0
-+#define VEC_DAC_A8_U10_FLD3_BURST_END_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_DAC_AC
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_DAC_AC_OFFSET 0x000000ac
-+#define VEC_DAC_AC_BITS   0x03ff03ff
-+#define VEC_DAC_AC_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_AC_U10_FLD4_BURST_BGN
-+// Description : First and last full frame lines (1-based numbering) within the
-+//               PAL/NTSC four field sequence which require a colour burst
-+#define VEC_DAC_AC_U10_FLD4_BURST_BGN_RESET  0x000
-+#define VEC_DAC_AC_U10_FLD4_BURST_BGN_BITS   0x03ff0000
-+#define VEC_DAC_AC_U10_FLD4_BURST_BGN_MSB    25
-+#define VEC_DAC_AC_U10_FLD4_BURST_BGN_LSB    16
-+#define VEC_DAC_AC_U10_FLD4_BURST_BGN_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_AC_U10_FLD4_BURST_END
-+// Description : First and last full frame lines (1-based numbering) within the
-+//               PAL/NTSC four field sequence which require a colour burst
-+#define VEC_DAC_AC_U10_FLD4_BURST_END_RESET  0x000
-+#define VEC_DAC_AC_U10_FLD4_BURST_END_BITS   0x000003ff
-+#define VEC_DAC_AC_U10_FLD4_BURST_END_MSB    9
-+#define VEC_DAC_AC_U10_FLD4_BURST_END_LSB    0
-+#define VEC_DAC_AC_U10_FLD4_BURST_END_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_DAC_B0
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_DAC_B0_OFFSET 0x000000b0
-+#define VEC_DAC_B0_BITS   0x03ff03ff
-+#define VEC_DAC_B0_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_B0_U10_FLD24_FULL_LINE_BGN
-+// Description : First and last full visible lines (1-based numbering) in the
-+//               PAL/NTSC four field sequence
-+#define VEC_DAC_B0_U10_FLD24_FULL_LINE_BGN_RESET  0x000
-+#define VEC_DAC_B0_U10_FLD24_FULL_LINE_BGN_BITS   0x03ff0000
-+#define VEC_DAC_B0_U10_FLD24_FULL_LINE_BGN_MSB    25
-+#define VEC_DAC_B0_U10_FLD24_FULL_LINE_BGN_LSB    16
-+#define VEC_DAC_B0_U10_FLD24_FULL_LINE_BGN_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_B0_U10_FLD24_FULL_LINE_END
-+// Description : First and last full visible lines (1-based numbering) in the
-+//               PAL/NTSC four field sequence
-+#define VEC_DAC_B0_U10_FLD24_FULL_LINE_END_RESET  0x000
-+#define VEC_DAC_B0_U10_FLD24_FULL_LINE_END_BITS   0x000003ff
-+#define VEC_DAC_B0_U10_FLD24_FULL_LINE_END_MSB    9
-+#define VEC_DAC_B0_U10_FLD24_FULL_LINE_END_LSB    0
-+#define VEC_DAC_B0_U10_FLD24_FULL_LINE_END_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_DAC_B4
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_DAC_B4_OFFSET 0x000000b4
-+#define VEC_DAC_B4_BITS   0x03ff03ff
-+#define VEC_DAC_B4_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_B4_U10_FLD13_FULL_LINE_BGN
-+// Description : First and last full visible lines (1-based numbering) in the
-+//               PAL/NTSC four field sequence
-+#define VEC_DAC_B4_U10_FLD13_FULL_LINE_BGN_RESET  0x000
-+#define VEC_DAC_B4_U10_FLD13_FULL_LINE_BGN_BITS   0x03ff0000
-+#define VEC_DAC_B4_U10_FLD13_FULL_LINE_BGN_MSB    25
-+#define VEC_DAC_B4_U10_FLD13_FULL_LINE_BGN_LSB    16
-+#define VEC_DAC_B4_U10_FLD13_FULL_LINE_BGN_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_B4_U10_FLD13_FULL_LINE_END
-+// Description : First and last full visible lines (1-based numbering) in the
-+//               PAL/NTSC four field sequence
-+#define VEC_DAC_B4_U10_FLD13_FULL_LINE_END_RESET  0x000
-+#define VEC_DAC_B4_U10_FLD13_FULL_LINE_END_BITS   0x000003ff
-+#define VEC_DAC_B4_U10_FLD13_FULL_LINE_END_MSB    9
-+#define VEC_DAC_B4_U10_FLD13_FULL_LINE_END_LSB    0
-+#define VEC_DAC_B4_U10_FLD13_FULL_LINE_END_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_DAC_B8
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_DAC_B8_OFFSET 0x000000b8
-+#define VEC_DAC_B8_BITS   0x03ff03ff
-+#define VEC_DAC_B8_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_B8_U10_BOT_HALF_LINE
-+// Description : Top and bottom visible half-lines in 1-based standard full
-+//               frame numbering, for interlaced modes. Set to zero to disable.
-+#define VEC_DAC_B8_U10_BOT_HALF_LINE_RESET  0x000
-+#define VEC_DAC_B8_U10_BOT_HALF_LINE_BITS   0x03ff0000
-+#define VEC_DAC_B8_U10_BOT_HALF_LINE_MSB    25
-+#define VEC_DAC_B8_U10_BOT_HALF_LINE_LSB    16
-+#define VEC_DAC_B8_U10_BOT_HALF_LINE_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_B8_U10_TOP_HALF_LINE
-+// Description : Top and bottom visible half-lines in 1-based standard full
-+//               frame numbering, for interlaced modes. Set to zero to disable.
-+#define VEC_DAC_B8_U10_TOP_HALF_LINE_RESET  0x000
-+#define VEC_DAC_B8_U10_TOP_HALF_LINE_BITS   0x000003ff
-+#define VEC_DAC_B8_U10_TOP_HALF_LINE_MSB    9
-+#define VEC_DAC_B8_U10_TOP_HALF_LINE_LSB    0
-+#define VEC_DAC_B8_U10_TOP_HALF_LINE_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_DAC_BC
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_DAC_BC_OFFSET 0x000000bc
-+#define VEC_DAC_BC_BITS   0x07ff07ff
-+#define VEC_DAC_BC_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_BC_S11_PEDESTAL
-+// Description : NTSC pedestal. For 7.5 IRE, this field is 1024 * 7.5/100. For
-+//               PAL, or Japanese NTSC, this field should be zero.
-+#define VEC_DAC_BC_S11_PEDESTAL_RESET  0x000
-+#define VEC_DAC_BC_S11_PEDESTAL_BITS   0x07ff0000
-+#define VEC_DAC_BC_S11_PEDESTAL_MSB    26
-+#define VEC_DAC_BC_S11_PEDESTAL_LSB    16
-+#define VEC_DAC_BC_S11_PEDESTAL_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_BC_U11_HALF_LINES_PER_FIELD
-+// Description : Mode = 625 PAL, Lines per field = 312.5,
-+//               u11_half_lines_per_field = 1+2*312 Mode = 525 NTSC, Lines per
-+//               field = 262.5, u11_half_lines_per_field = 1+2*262
-+#define VEC_DAC_BC_U11_HALF_LINES_PER_FIELD_RESET  0x000
-+#define VEC_DAC_BC_U11_HALF_LINES_PER_FIELD_BITS   0x000007ff
-+#define VEC_DAC_BC_U11_HALF_LINES_PER_FIELD_MSB    10
-+#define VEC_DAC_BC_U11_HALF_LINES_PER_FIELD_LSB    0
-+#define VEC_DAC_BC_U11_HALF_LINES_PER_FIELD_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_DAC_C0
-+// JTAG access : synchronous
-+// Description : Synopsis DesignWare control
-+#define VEC_DAC_C0_OFFSET 0x000000c0
-+#define VEC_DAC_C0_BITS   0x000fffff
-+#define VEC_DAC_C0_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_C0_DWC_CABLE_ENCTR3
-+// Description : Synopsis test input
-+#define VEC_DAC_C0_DWC_CABLE_ENCTR3_RESET  0x0
-+#define VEC_DAC_C0_DWC_CABLE_ENCTR3_BITS   0x00080000
-+#define VEC_DAC_C0_DWC_CABLE_ENCTR3_MSB    19
-+#define VEC_DAC_C0_DWC_CABLE_ENCTR3_LSB    19
-+#define VEC_DAC_C0_DWC_CABLE_ENCTR3_ACCESS "RO"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_C0_DWC_CABLE_CABLEOUT
-+// Description : cable detect state
-+#define VEC_DAC_C0_DWC_CABLE_CABLEOUT_RESET  0x0
-+#define VEC_DAC_C0_DWC_CABLE_CABLEOUT_BITS   0x00070000
-+#define VEC_DAC_C0_DWC_CABLE_CABLEOUT_MSB    18
-+#define VEC_DAC_C0_DWC_CABLE_CABLEOUT_LSB    16
-+#define VEC_DAC_C0_DWC_CABLE_CABLEOUT_ACCESS "RO"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_C0_DWC_MUX_2
-+// Description : Select DAC channel 2 output
-+#define VEC_DAC_C0_DWC_MUX_2_RESET  0x0
-+#define VEC_DAC_C0_DWC_MUX_2_BITS   0x0000c000
-+#define VEC_DAC_C0_DWC_MUX_2_MSB    15
-+#define VEC_DAC_C0_DWC_MUX_2_LSB    14
-+#define VEC_DAC_C0_DWC_MUX_2_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_C0_DWC_MUX_1
-+// Description : Select DAC channel 1 output
-+#define VEC_DAC_C0_DWC_MUX_1_RESET  0x0
-+#define VEC_DAC_C0_DWC_MUX_1_BITS   0x00003000
-+#define VEC_DAC_C0_DWC_MUX_1_MSB    13
-+#define VEC_DAC_C0_DWC_MUX_1_LSB    12
-+#define VEC_DAC_C0_DWC_MUX_1_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_C0_DWC_MUX_0
-+// Description : Select DAC channel 0 output
-+#define VEC_DAC_C0_DWC_MUX_0_RESET  0x0
-+#define VEC_DAC_C0_DWC_MUX_0_BITS   0x00000c00
-+#define VEC_DAC_C0_DWC_MUX_0_MSB    11
-+#define VEC_DAC_C0_DWC_MUX_0_LSB    10
-+#define VEC_DAC_C0_DWC_MUX_0_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_C0_DWC_TEST
-+// Description : Fixed DAC command word
-+#define VEC_DAC_C0_DWC_TEST_RESET  0x000
-+#define VEC_DAC_C0_DWC_TEST_BITS   0x000003ff
-+#define VEC_DAC_C0_DWC_TEST_MSB    9
-+#define VEC_DAC_C0_DWC_TEST_LSB    0
-+#define VEC_DAC_C0_DWC_TEST_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_DAC_C4
-+// JTAG access : synchronous
-+// Description : Synopsis DAC control
-+#define VEC_DAC_C4_OFFSET 0x000000c4
-+#define VEC_DAC_C4_BITS   0x1fffffff
-+#define VEC_DAC_C4_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_C4_ENCTR
-+// Description : Always write3'b000
-+#define VEC_DAC_C4_ENCTR_RESET  0x0
-+#define VEC_DAC_C4_ENCTR_BITS   0x1c000000
-+#define VEC_DAC_C4_ENCTR_MSB    28
-+#define VEC_DAC_C4_ENCTR_LSB    26
-+#define VEC_DAC_C4_ENCTR_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_C4_ENSC
-+// Description : Enable cable detect - write 3'b000
-+#define VEC_DAC_C4_ENSC_RESET  0x0
-+#define VEC_DAC_C4_ENSC_BITS   0x03800000
-+#define VEC_DAC_C4_ENSC_MSB    25
-+#define VEC_DAC_C4_ENSC_LSB    23
-+#define VEC_DAC_C4_ENSC_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_C4_ENDAC
-+// Description : Enable DAC channel
-+#define VEC_DAC_C4_ENDAC_RESET  0x0
-+#define VEC_DAC_C4_ENDAC_BITS   0x00700000
-+#define VEC_DAC_C4_ENDAC_MSB    22
-+#define VEC_DAC_C4_ENDAC_LSB    20
-+#define VEC_DAC_C4_ENDAC_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_C4_ENVBG
-+// Description : Enable internal bandgap reference - write '1'
-+#define VEC_DAC_C4_ENVBG_RESET  0x0
-+#define VEC_DAC_C4_ENVBG_BITS   0x00080000
-+#define VEC_DAC_C4_ENVBG_MSB    19
-+#define VEC_DAC_C4_ENVBG_LSB    19
-+#define VEC_DAC_C4_ENVBG_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_C4_ENEXTREF
-+// Description : Enable external reference - write '0'
-+#define VEC_DAC_C4_ENEXTREF_RESET  0x0
-+#define VEC_DAC_C4_ENEXTREF_BITS   0x00040000
-+#define VEC_DAC_C4_ENEXTREF_MSB    18
-+#define VEC_DAC_C4_ENEXTREF_LSB    18
-+#define VEC_DAC_C4_ENEXTREF_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_C4_DAC2GC
-+// Description : DAC channel 2 gain control - write 6'd63
-+#define VEC_DAC_C4_DAC2GC_RESET  0x00
-+#define VEC_DAC_C4_DAC2GC_BITS   0x0003f000
-+#define VEC_DAC_C4_DAC2GC_MSB    17
-+#define VEC_DAC_C4_DAC2GC_LSB    12
-+#define VEC_DAC_C4_DAC2GC_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_C4_DAC1GC
-+// Description : DAC channel 1 gain control - write 6'd63
-+#define VEC_DAC_C4_DAC1GC_RESET  0x00
-+#define VEC_DAC_C4_DAC1GC_BITS   0x00000fc0
-+#define VEC_DAC_C4_DAC1GC_MSB    11
-+#define VEC_DAC_C4_DAC1GC_LSB    6
-+#define VEC_DAC_C4_DAC1GC_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_C4_DAC0GC
-+// Description : DAC channel 0 gain control - write 6'd63
-+#define VEC_DAC_C4_DAC0GC_RESET  0x00
-+#define VEC_DAC_C4_DAC0GC_BITS   0x0000003f
-+#define VEC_DAC_C4_DAC0GC_MSB    5
-+#define VEC_DAC_C4_DAC0GC_LSB    0
-+#define VEC_DAC_C4_DAC0GC_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_DAC_C8
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_DAC_C8_OFFSET 0x000000c8
-+#define VEC_DAC_C8_BITS   0xffffffff
-+#define VEC_DAC_C8_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_C8_U16_SCALE_SYNC
-+// Description : Scaling applied prior to final summation to form the DAC
-+//               command word(s)
-+#define VEC_DAC_C8_U16_SCALE_SYNC_RESET  0x0000
-+#define VEC_DAC_C8_U16_SCALE_SYNC_BITS   0xffff0000
-+#define VEC_DAC_C8_U16_SCALE_SYNC_MSB    31
-+#define VEC_DAC_C8_U16_SCALE_SYNC_LSB    16
-+#define VEC_DAC_C8_U16_SCALE_SYNC_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_C8_U16_SCALE_LUMA
-+// Description : Scaling applied prior to final summation to form the DAC
-+//               command word(s)
-+#define VEC_DAC_C8_U16_SCALE_LUMA_RESET  0x0000
-+#define VEC_DAC_C8_U16_SCALE_LUMA_BITS   0x0000ffff
-+#define VEC_DAC_C8_U16_SCALE_LUMA_MSB    15
-+#define VEC_DAC_C8_U16_SCALE_LUMA_LSB    0
-+#define VEC_DAC_C8_U16_SCALE_LUMA_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_DAC_CC
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_DAC_CC_OFFSET 0x000000cc
-+#define VEC_DAC_CC_BITS   0xffffffff
-+#define VEC_DAC_CC_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_CC_S16_SCALE_BURST
-+// Description : Scaling applied prior to final summation to form the DAC
-+//               command word(s)
-+#define VEC_DAC_CC_S16_SCALE_BURST_RESET  0x0000
-+#define VEC_DAC_CC_S16_SCALE_BURST_BITS   0xffff0000
-+#define VEC_DAC_CC_S16_SCALE_BURST_MSB    31
-+#define VEC_DAC_CC_S16_SCALE_BURST_LSB    16
-+#define VEC_DAC_CC_S16_SCALE_BURST_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_CC_S16_SCALE_CHROMA
-+// Description : Scaling applied prior to final summation to form the DAC
-+//               command word(s)
-+#define VEC_DAC_CC_S16_SCALE_CHROMA_RESET  0x0000
-+#define VEC_DAC_CC_S16_SCALE_CHROMA_BITS   0x0000ffff
-+#define VEC_DAC_CC_S16_SCALE_CHROMA_MSB    15
-+#define VEC_DAC_CC_S16_SCALE_CHROMA_LSB    0
-+#define VEC_DAC_CC_S16_SCALE_CHROMA_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_DAC_D0
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_DAC_D0_OFFSET 0x000000d0
-+#define VEC_DAC_D0_BITS   0xffffffff
-+#define VEC_DAC_D0_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_D0_S16_OFFSET_LUMA
-+// Description : These offsets are applied to the chroma and luma channels
-+//               before the final MUX
-+#define VEC_DAC_D0_S16_OFFSET_LUMA_RESET  0x0000
-+#define VEC_DAC_D0_S16_OFFSET_LUMA_BITS   0xffff0000
-+#define VEC_DAC_D0_S16_OFFSET_LUMA_MSB    31
-+#define VEC_DAC_D0_S16_OFFSET_LUMA_LSB    16
-+#define VEC_DAC_D0_S16_OFFSET_LUMA_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_D0_S16_OFFSET_CHRO
-+// Description : These offsets are applied to the chroma and luma channels
-+//               before the final MUX
-+#define VEC_DAC_D0_S16_OFFSET_CHRO_RESET  0x0000
-+#define VEC_DAC_D0_S16_OFFSET_CHRO_BITS   0x0000ffff
-+#define VEC_DAC_D0_S16_OFFSET_CHRO_MSB    15
-+#define VEC_DAC_D0_S16_OFFSET_CHRO_LSB    0
-+#define VEC_DAC_D0_S16_OFFSET_CHRO_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_DAC_D4
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_DAC_D4_OFFSET 0x000000d4
-+#define VEC_DAC_D4_BITS   0xffffffff
-+#define VEC_DAC_D4_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_D4_NCO_FREQ
-+// Description : This 64-bit frequency command is applied to the phase
-+//               accumulator of the NCO (numerically controlled oscillator)
-+//               which generates the colour sub-carrier. This value is computed
-+//               as ratio of sub-carrier frequency to DAC clock multiplied by
-+//               2^64.
-+#define VEC_DAC_D4_NCO_FREQ_RESET  0x00000000
-+#define VEC_DAC_D4_NCO_FREQ_BITS   0xffffffff
-+#define VEC_DAC_D4_NCO_FREQ_MSB    31
-+#define VEC_DAC_D4_NCO_FREQ_LSB    0
-+#define VEC_DAC_D4_NCO_FREQ_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_DAC_D8
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_DAC_D8_OFFSET 0x000000d8
-+#define VEC_DAC_D8_BITS   0xffffffff
-+#define VEC_DAC_D8_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_D8_NCO_FREQ
-+// Description : This 64-bit frequency command is applied to the phase
-+//               accumulator of the NCO (numerically controlled oscillator)
-+//               which generates the colour sub-carrier. This value is computed
-+//               as ratio of sub-carrier frequency to DAC clock multiplied by
-+//               2^64.
-+#define VEC_DAC_D8_NCO_FREQ_RESET  0x00000000
-+#define VEC_DAC_D8_NCO_FREQ_BITS   0xffffffff
-+#define VEC_DAC_D8_NCO_FREQ_MSB    31
-+#define VEC_DAC_D8_NCO_FREQ_LSB    0
-+#define VEC_DAC_D8_NCO_FREQ_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_DAC_DC
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_DAC_DC_OFFSET 0x000000dc
-+#define VEC_DAC_DC_BITS   0xffffffff
-+#define VEC_DAC_DC_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_DC_FIR_COEFF_CHROMA_0_6
-+// Description : FIR filter coefficients
-+#define VEC_DAC_DC_FIR_COEFF_CHROMA_0_6_RESET  0x0000
-+#define VEC_DAC_DC_FIR_COEFF_CHROMA_0_6_BITS   0xffff0000
-+#define VEC_DAC_DC_FIR_COEFF_CHROMA_0_6_MSB    31
-+#define VEC_DAC_DC_FIR_COEFF_CHROMA_0_6_LSB    16
-+#define VEC_DAC_DC_FIR_COEFF_CHROMA_0_6_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_DC_FIR_COEFF_LUMA_0_6
-+// Description : FIR filter coefficients
-+#define VEC_DAC_DC_FIR_COEFF_LUMA_0_6_RESET  0x0000
-+#define VEC_DAC_DC_FIR_COEFF_LUMA_0_6_BITS   0x0000ffff
-+#define VEC_DAC_DC_FIR_COEFF_LUMA_0_6_MSB    15
-+#define VEC_DAC_DC_FIR_COEFF_LUMA_0_6_LSB    0
-+#define VEC_DAC_DC_FIR_COEFF_LUMA_0_6_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_DAC_E0
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_DAC_E0_OFFSET 0x000000e0
-+#define VEC_DAC_E0_BITS   0xffffffff
-+#define VEC_DAC_E0_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_E0_FIR_COEFF_CHROMA_1_5
-+// Description : FIR filter coefficients
-+#define VEC_DAC_E0_FIR_COEFF_CHROMA_1_5_RESET  0x0000
-+#define VEC_DAC_E0_FIR_COEFF_CHROMA_1_5_BITS   0xffff0000
-+#define VEC_DAC_E0_FIR_COEFF_CHROMA_1_5_MSB    31
-+#define VEC_DAC_E0_FIR_COEFF_CHROMA_1_5_LSB    16
-+#define VEC_DAC_E0_FIR_COEFF_CHROMA_1_5_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_E0_FIR_COEFF_LUMA_1_5
-+// Description : FIR filter coefficients
-+#define VEC_DAC_E0_FIR_COEFF_LUMA_1_5_RESET  0x0000
-+#define VEC_DAC_E0_FIR_COEFF_LUMA_1_5_BITS   0x0000ffff
-+#define VEC_DAC_E0_FIR_COEFF_LUMA_1_5_MSB    15
-+#define VEC_DAC_E0_FIR_COEFF_LUMA_1_5_LSB    0
-+#define VEC_DAC_E0_FIR_COEFF_LUMA_1_5_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_DAC_E4
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_DAC_E4_OFFSET 0x000000e4
-+#define VEC_DAC_E4_BITS   0xffffffff
-+#define VEC_DAC_E4_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_E4_FIR_COEFF_CHROMA_2_4
-+// Description : FIR filter coefficients
-+#define VEC_DAC_E4_FIR_COEFF_CHROMA_2_4_RESET  0x0000
-+#define VEC_DAC_E4_FIR_COEFF_CHROMA_2_4_BITS   0xffff0000
-+#define VEC_DAC_E4_FIR_COEFF_CHROMA_2_4_MSB    31
-+#define VEC_DAC_E4_FIR_COEFF_CHROMA_2_4_LSB    16
-+#define VEC_DAC_E4_FIR_COEFF_CHROMA_2_4_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_E4_FIR_COEFF_LUMA_2_4
-+// Description : FIR filter coefficients
-+#define VEC_DAC_E4_FIR_COEFF_LUMA_2_4_RESET  0x0000
-+#define VEC_DAC_E4_FIR_COEFF_LUMA_2_4_BITS   0x0000ffff
-+#define VEC_DAC_E4_FIR_COEFF_LUMA_2_4_MSB    15
-+#define VEC_DAC_E4_FIR_COEFF_LUMA_2_4_LSB    0
-+#define VEC_DAC_E4_FIR_COEFF_LUMA_2_4_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_DAC_E8
-+// JTAG access : synchronous
-+// Description : None
-+#define VEC_DAC_E8_OFFSET 0x000000e8
-+#define VEC_DAC_E8_BITS   0xffffffff
-+#define VEC_DAC_E8_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_E8_FIR_COEFF_CHROMA_3
-+// Description : FIR filter coefficients
-+#define VEC_DAC_E8_FIR_COEFF_CHROMA_3_RESET  0x0000
-+#define VEC_DAC_E8_FIR_COEFF_CHROMA_3_BITS   0xffff0000
-+#define VEC_DAC_E8_FIR_COEFF_CHROMA_3_MSB    31
-+#define VEC_DAC_E8_FIR_COEFF_CHROMA_3_LSB    16
-+#define VEC_DAC_E8_FIR_COEFF_CHROMA_3_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_E8_FIR_COEFF_LUMA_3
-+// Description : FIR filter coefficients
-+#define VEC_DAC_E8_FIR_COEFF_LUMA_3_RESET  0x0000
-+#define VEC_DAC_E8_FIR_COEFF_LUMA_3_BITS   0x0000ffff
-+#define VEC_DAC_E8_FIR_COEFF_LUMA_3_MSB    15
-+#define VEC_DAC_E8_FIR_COEFF_LUMA_3_LSB    0
-+#define VEC_DAC_E8_FIR_COEFF_LUMA_3_ACCESS "RW"
-+// =============================================================================
-+// Register    : VEC_DAC_EC
-+// JTAG access : synchronous
-+// Description : Misc. control
-+#define VEC_DAC_EC_OFFSET 0x000000ec
-+#define VEC_DAC_EC_BITS   0x001fffff
-+#define VEC_DAC_EC_RESET  0x00000000
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_EC_SLOW_CLOCK
-+// Description : Doubles the raised-cosine rate
-+#define VEC_DAC_EC_SLOW_CLOCK_RESET  0x0
-+#define VEC_DAC_EC_SLOW_CLOCK_BITS   0x00100000
-+#define VEC_DAC_EC_SLOW_CLOCK_MSB    20
-+#define VEC_DAC_EC_SLOW_CLOCK_LSB    20
-+#define VEC_DAC_EC_SLOW_CLOCK_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_EC_FIR_RMINUS1
-+// Description : Select 1, 3, 5 or 7 FIR taps
-+#define VEC_DAC_EC_FIR_RMINUS1_RESET  0x0
-+#define VEC_DAC_EC_FIR_RMINUS1_BITS   0x000c0000
-+#define VEC_DAC_EC_FIR_RMINUS1_MSB    19
-+#define VEC_DAC_EC_FIR_RMINUS1_LSB    18
-+#define VEC_DAC_EC_FIR_RMINUS1_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_EC_VERT_FULL_NOT_HALF
-+// Description : Disable half-line pulses during VBI
-+#define VEC_DAC_EC_VERT_FULL_NOT_HALF_RESET  0x0
-+#define VEC_DAC_EC_VERT_FULL_NOT_HALF_BITS   0x00020000
-+#define VEC_DAC_EC_VERT_FULL_NOT_HALF_MSB    17
-+#define VEC_DAC_EC_VERT_FULL_NOT_HALF_LSB    17
-+#define VEC_DAC_EC_VERT_FULL_NOT_HALF_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_EC_SEQ_EN
-+// Description : Enable NCO reset
-+#define VEC_DAC_EC_SEQ_EN_RESET  0x0
-+#define VEC_DAC_EC_SEQ_EN_BITS   0x00010000
-+#define VEC_DAC_EC_SEQ_EN_MSB    16
-+#define VEC_DAC_EC_SEQ_EN_LSB    16
-+#define VEC_DAC_EC_SEQ_EN_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_EC_U2_FLD_MASK
-+// Description : Field sequence
-+#define VEC_DAC_EC_U2_FLD_MASK_RESET  0x0
-+#define VEC_DAC_EC_U2_FLD_MASK_BITS   0x0000c000
-+#define VEC_DAC_EC_U2_FLD_MASK_MSB    15
-+#define VEC_DAC_EC_U2_FLD_MASK_LSB    14
-+#define VEC_DAC_EC_U2_FLD_MASK_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_EC_U4_SEQ_MASK
-+// Description : NCO reset sequence
-+#define VEC_DAC_EC_U4_SEQ_MASK_RESET  0x0
-+#define VEC_DAC_EC_U4_SEQ_MASK_BITS   0x00003c00
-+#define VEC_DAC_EC_U4_SEQ_MASK_MSB    13
-+#define VEC_DAC_EC_U4_SEQ_MASK_LSB    10
-+#define VEC_DAC_EC_U4_SEQ_MASK_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_EC_INTERP_RATE_MINUS1
-+// Description : Interpolation rate 2<=R<=16
-+#define VEC_DAC_EC_INTERP_RATE_MINUS1_RESET  0x0
-+#define VEC_DAC_EC_INTERP_RATE_MINUS1_BITS   0x000003c0
-+#define VEC_DAC_EC_INTERP_RATE_MINUS1_MSB    9
-+#define VEC_DAC_EC_INTERP_RATE_MINUS1_LSB    6
-+#define VEC_DAC_EC_INTERP_RATE_MINUS1_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_EC_INTERP_SHIFT_MINUS1
-+// Description : Power-of-2 scaling after interpolation
-+#define VEC_DAC_EC_INTERP_SHIFT_MINUS1_RESET  0x0
-+#define VEC_DAC_EC_INTERP_SHIFT_MINUS1_BITS   0x0000003c
-+#define VEC_DAC_EC_INTERP_SHIFT_MINUS1_MSB    5
-+#define VEC_DAC_EC_INTERP_SHIFT_MINUS1_LSB    2
-+#define VEC_DAC_EC_INTERP_SHIFT_MINUS1_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_EC_FIELDS_PER_FRAME_MINUS1
-+// Description : Interlaced / progressive
-+#define VEC_DAC_EC_FIELDS_PER_FRAME_MINUS1_RESET  0x0
-+#define VEC_DAC_EC_FIELDS_PER_FRAME_MINUS1_BITS   0x00000002
-+#define VEC_DAC_EC_FIELDS_PER_FRAME_MINUS1_MSB    1
-+#define VEC_DAC_EC_FIELDS_PER_FRAME_MINUS1_LSB    1
-+#define VEC_DAC_EC_FIELDS_PER_FRAME_MINUS1_ACCESS "RW"
-+// -----------------------------------------------------------------------------
-+// Field       : VEC_DAC_EC_PAL_EN
-+// Description : Enable phase alternate line (PAL) mode
-+#define VEC_DAC_EC_PAL_EN_RESET  0x0
-+#define VEC_DAC_EC_PAL_EN_BITS   0x00000001
-+#define VEC_DAC_EC_PAL_EN_MSB    0
-+#define VEC_DAC_EC_PAL_EN_LSB    0
-+#define VEC_DAC_EC_PAL_EN_ACCESS "RW"
-+// =============================================================================
-+#endif // VEC_REGS_DEFINED
diff --git a/target/linux/bcm27xx/patches-6.1/950-0888-v4l2-Add-pisp-compression-format-support-to-v4l2.patch b/target/linux/bcm27xx/patches-6.1/950-0888-v4l2-Add-pisp-compression-format-support-to-v4l2.patch
deleted file mode 100644
index cf0b02c64b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0888-v4l2-Add-pisp-compression-format-support-to-v4l2.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 3a419974ba02d32795a5ecfaf3c020f23173b6a1 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Tue, 14 Feb 2023 20:58:59 +0000
-Subject: [PATCH] v4l2: Add pisp compression format support to v4l2
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/v4l2-core/v4l2-ioctl.c  | 12 ++++++++----
- include/uapi/linux/media-bus-format.h | 14 ++++++++++++++
- include/uapi/linux/videodev2.h        | 12 ++++++++----
- 3 files changed, 30 insertions(+), 8 deletions(-)
-
---- a/drivers/media/v4l2-core/v4l2-ioctl.c
-+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
-@@ -1507,10 +1507,14 @@ static void v4l_fill_fmtdesc(struct v4l2
- 		case V4L2_PIX_FMT_QC08C:	descr = "QCOM Compressed 8-bit Format"; break;
- 		case V4L2_PIX_FMT_QC10C:	descr = "QCOM Compressed 10-bit Format"; break;
- 		case V4L2_PIX_FMT_RPI_BE: descr = "PiSP Opaque Format"; break;
--		case V4L2_PIX_FMT_PISP_COMP_RGGB:
--		case V4L2_PIX_FMT_PISP_COMP_GRBG:
--		case V4L2_PIX_FMT_PISP_COMP_GBRG:
--		case V4L2_PIX_FMT_PISP_COMP_BGGR: descr = "PiSP Bayer Compressed Format"; break;
-+		case V4L2_PIX_FMT_PISP_COMP1_RGGB:
-+		case V4L2_PIX_FMT_PISP_COMP1_GRBG:
-+		case V4L2_PIX_FMT_PISP_COMP1_GBRG:
-+		case V4L2_PIX_FMT_PISP_COMP1_BGGR: descr = "PiSP Bayer Comp 1"; break;
-+		case V4L2_PIX_FMT_PISP_COMP2_RGGB:
-+		case V4L2_PIX_FMT_PISP_COMP2_GRBG:
-+		case V4L2_PIX_FMT_PISP_COMP2_GBRG:
-+		case V4L2_PIX_FMT_PISP_COMP2_BGGR: descr = "PiSP Bayer Comp 2"; break;
- 		default:
- 			if (fmt->description[0])
- 				return;
---- a/include/uapi/linux/media-bus-format.h
-+++ b/include/uapi/linux/media-bus-format.h
-@@ -175,4 +175,18 @@
- /* Sensor ancillary metadata formats - next is 0x7002 */
- #define MEDIA_BUS_FMT_SENSOR_DATA		0x7002
- 
-+/* PiSP Formats */
-+#define MEDIA_BUS_FMT_PISP_COMP1_RGGB		0x8001
-+#define MEDIA_BUS_FMT_PISP_COMP1_GRBG		0x8002
-+#define MEDIA_BUS_FMT_PISP_COMP1_GBRG		0x8003
-+#define MEDIA_BUS_FMT_PISP_COMP1_BGGR		0x8004
-+#define MEDIA_BUS_FMT_PISP_COMP2_RGGB		0x8005
-+#define MEDIA_BUS_FMT_PISP_COMP2_GRBG		0x8006
-+#define MEDIA_BUS_FMT_PISP_COMP2_GBRG		0x8007
-+#define MEDIA_BUS_FMT_PISP_COMP2_BGGR		0x8008
-+
-+#define MEDIA_BUS_FMT_PISP_FE_CONFIG		0x8100
-+#define MEDIA_BUS_FMT_PISP_FE_STATS		0x8101
-+#define MEDIA_BUS_FMT_PISP_BE_CONFIG		0x8200
-+
- #endif /* __LINUX_MEDIA_BUS_FORMAT_H */
---- a/include/uapi/linux/videodev2.h
-+++ b/include/uapi/linux/videodev2.h
-@@ -795,10 +795,14 @@ struct v4l2_pix_format {
- 
- /* The pixel format for all our buffers (the precise format is found in the config buffer). */
- #define V4L2_PIX_FMT_RPI_BE		v4l2_fourcc('R', 'P', 'B', 'P')
--#define V4L2_PIX_FMT_PISP_COMP_RGGB	v4l2_fourcc('P', 'C', 'R', 'G')
--#define V4L2_PIX_FMT_PISP_COMP_GRBG	v4l2_fourcc('P', 'C', 'G', 'R')
--#define V4L2_PIX_FMT_PISP_COMP_GBRG	v4l2_fourcc('P', 'C', 'G', 'B')
--#define V4L2_PIX_FMT_PISP_COMP_BGGR	v4l2_fourcc('P', 'C', 'B', 'G')
-+#define V4L2_PIX_FMT_PISP_COMP1_RGGB	v4l2_fourcc('P', 'C', '1', 'R')
-+#define V4L2_PIX_FMT_PISP_COMP1_GRBG	v4l2_fourcc('P', 'C', '1', 'G')
-+#define V4L2_PIX_FMT_PISP_COMP1_GBRG	v4l2_fourcc('P', 'C', '1', 'g')
-+#define V4L2_PIX_FMT_PISP_COMP1_BGGR	v4l2_fourcc('P', 'C', '1', 'B')
-+#define V4L2_PIX_FMT_PISP_COMP2_RGGB	v4l2_fourcc('P', 'C', '2', 'R')
-+#define V4L2_PIX_FMT_PISP_COMP2_GRBG	v4l2_fourcc('P', 'C', '2', 'G')
-+#define V4L2_PIX_FMT_PISP_COMP2_GBRG	v4l2_fourcc('P', 'C', '2', 'g')
-+#define V4L2_PIX_FMT_PISP_COMP2_BGGR	v4l2_fourcc('P', 'C', '2', 'B')
- 
- /* SDR formats - used only for Software Defined Radio devices */
- #define V4L2_SDR_FMT_CU8          v4l2_fourcc('C', 'U', '0', '8') /* IQ u8 */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0889-media-rp1-Add-CFE-Camera-Front-End-support.patch b/target/linux/bcm27xx/patches-6.1/950-0889-media-rp1-Add-CFE-Camera-Front-End-support.patch
deleted file mode 100644
index 038633b74e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0889-media-rp1-Add-CFE-Camera-Front-End-support.patch
+++ /dev/null
@@ -1,4527 +0,0 @@
-From 8a31623de7f034f6521b348e9a510e78a6e7e493 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Tue, 14 Feb 2023 17:30:12 +0000
-Subject: [PATCH] media: rp1: Add CFE (Camera Front End) support
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/platform/raspberrypi/Kconfig    |    1 +
- drivers/media/platform/raspberrypi/Makefile   |    1 +
- .../platform/raspberrypi/rp1_cfe/Kconfig      |   14 +
- .../platform/raspberrypi/rp1_cfe/Makefile     |    6 +
- .../media/platform/raspberrypi/rp1_cfe/cfe.c  | 2186 +++++++++++++++++
- .../media/platform/raspberrypi/rp1_cfe/cfe.h  |   40 +
- .../platform/raspberrypi/rp1_cfe/cfe_fmts.h   |  294 +++
- .../media/platform/raspberrypi/rp1_cfe/csi2.c |  446 ++++
- .../media/platform/raspberrypi/rp1_cfe/csi2.h |   75 +
- .../media/platform/raspberrypi/rp1_cfe/dphy.c |  177 ++
- .../media/platform/raspberrypi/rp1_cfe/dphy.h |   26 +
- .../raspberrypi/rp1_cfe/pisp_common.h         |   69 +
- .../platform/raspberrypi/rp1_cfe/pisp_fe.c    |  563 +++++
- .../platform/raspberrypi/rp1_cfe/pisp_fe.h    |   53 +
- .../raspberrypi/rp1_cfe/pisp_fe_config.h      |  272 ++
- .../raspberrypi/rp1_cfe/pisp_statistics.h     |   62 +
- .../platform/raspberrypi/rp1_cfe/pisp_types.h |  144 ++
- 17 files changed, 4429 insertions(+)
- create mode 100644 drivers/media/platform/raspberrypi/rp1_cfe/Kconfig
- create mode 100644 drivers/media/platform/raspberrypi/rp1_cfe/Makefile
- create mode 100644 drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
- create mode 100644 drivers/media/platform/raspberrypi/rp1_cfe/cfe.h
- create mode 100644 drivers/media/platform/raspberrypi/rp1_cfe/cfe_fmts.h
- create mode 100644 drivers/media/platform/raspberrypi/rp1_cfe/csi2.c
- create mode 100644 drivers/media/platform/raspberrypi/rp1_cfe/csi2.h
- create mode 100644 drivers/media/platform/raspberrypi/rp1_cfe/dphy.c
- create mode 100644 drivers/media/platform/raspberrypi/rp1_cfe/dphy.h
- create mode 100644 drivers/media/platform/raspberrypi/rp1_cfe/pisp_common.h
- create mode 100644 drivers/media/platform/raspberrypi/rp1_cfe/pisp_fe.c
- create mode 100644 drivers/media/platform/raspberrypi/rp1_cfe/pisp_fe.h
- create mode 100644 drivers/media/platform/raspberrypi/rp1_cfe/pisp_fe_config.h
- create mode 100644 drivers/media/platform/raspberrypi/rp1_cfe/pisp_statistics.h
- create mode 100644 drivers/media/platform/raspberrypi/rp1_cfe/pisp_types.h
-
---- a/drivers/media/platform/raspberrypi/Kconfig
-+++ b/drivers/media/platform/raspberrypi/Kconfig
-@@ -3,3 +3,4 @@
- comment "Raspberry Pi media platform drivers"
- 
- source "drivers/media/platform/raspberrypi/pisp_be/Kconfig"
-+source "drivers/media/platform/raspberrypi/rp1_cfe/Kconfig"
---- a/drivers/media/platform/raspberrypi/Makefile
-+++ b/drivers/media/platform/raspberrypi/Makefile
-@@ -1,3 +1,4 @@
- # SPDX-License-Identifier: GPL-2.0
- 
- obj-y += pisp_be/
-+obj-y += rp1_cfe/
---- /dev/null
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/Kconfig
-@@ -0,0 +1,14 @@
-+# RP1 V4L2 camera support
-+
-+config VIDEO_RP1_CFE
-+	tristate "RP1 Camera Frond End (CFE) video capture driver"
-+	depends on VIDEO_DEV
-+	select VIDEO_V4L2_SUBDEV_API
-+	select MEDIA_CONTROLLER
-+	select VIDEOBUF2_DMA_CONTIG
-+	select V4L2_FWNODE
-+	help
-+	  Say Y here to enable support for the RP1 Camera Front End.
-+
-+	  To compile this driver as a module, choose M here. The module will be
-+	  called rp1-cfe.
---- /dev/null
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/Makefile
-@@ -0,0 +1,6 @@
-+# SPDX-License-Identifier: GPL-2.0
-+#
-+# Makefile for RP1 Camera Front End driver
-+#
-+rp1-cfe-objs := cfe.o csi2.o pisp_fe.o dphy.o
-+obj-$(CONFIG_VIDEO_RP1_CFE) += rp1-cfe.o
---- /dev/null
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-@@ -0,0 +1,2186 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+/*
-+ * RP1 Camera Front End Driver
-+ *
-+ * Copyright (C) 2021-2022 - Raspberry Pi Ltd.
-+ *
-+ */
-+
-+#include <linux/atomic.h>
-+#include <linux/clk.h>
-+#include <linux/debugfs.h>
-+#include <linux/delay.h>
-+#include <linux/device.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/err.h>
-+#include <linux/init.h>
-+#include <linux/interrupt.h>
-+#include <linux/io.h>
-+#include <linux/module.h>
-+#include <linux/of_device.h>
-+#include <linux/of_graph.h>
-+#include <linux/phy/phy.h>
-+#include <linux/pinctrl/consumer.h>
-+#include <linux/platform_device.h>
-+#include <linux/pm_runtime.h>
-+#include <linux/seq_file.h>
-+#include <linux/slab.h>
-+#include <linux/uaccess.h>
-+#include <linux/videodev2.h>
-+
-+#include <media/v4l2-async.h>
-+#include <media/v4l2-common.h>
-+#include <media/v4l2-ctrls.h>
-+#include <media/v4l2-dev.h>
-+#include <media/v4l2-device.h>
-+#include <media/v4l2-dv-timings.h>
-+#include <media/v4l2-event.h>
-+#include <media/v4l2-fwnode.h>
-+#include <media/v4l2-ioctl.h>
-+#include <media/videobuf2-dma-contig.h>
-+
-+#include "cfe.h"
-+#include "cfe_fmts.h"
-+#include "csi2.h"
-+#include "pisp_fe.h"
-+#include "pisp_fe_config.h"
-+#include "pisp_statistics.h"
-+
-+#define CFE_MODULE_NAME	"rp1-cfe"
-+#define CFE_VERSION	"1.0"
-+
-+bool cfe_debug_irq;
-+
-+#define cfe_dbg_irq(fmt, arg...)                              \
-+	do {                                                  \
-+		if (cfe_debug_irq)                            \
-+			dev_dbg(&cfe->pdev->dev, fmt, ##arg); \
-+	} while (0)
-+#define cfe_dbg(fmt, arg...) dev_dbg(&cfe->pdev->dev, fmt, ##arg)
-+#define cfe_info(fmt, arg...) dev_info(&cfe->pdev->dev, fmt, ##arg)
-+#define cfe_err(fmt, arg...) dev_err(&cfe->pdev->dev, fmt, ##arg)
-+
-+/* MIPICFG registers */
-+#define MIPICFG_CFG		0x004
-+#define MIPICFG_INTR		0x028
-+#define MIPICFG_INTE		0x02c
-+#define MIPICFG_INTF		0x030
-+#define MIPICFG_INTS		0x034
-+
-+#define MIPICFG_CFG_SEL_CSI	BIT(0)
-+
-+#define MIPICFG_INT_CSI_DMA	BIT(0)
-+#define MIPICFG_INT_CSI_HOST	BIT(2)
-+#define MIPICFG_INT_PISP_FE	BIT(4)
-+
-+#define BPL_ALIGNMENT 16
-+#define MAX_BYTESPERLINE 0xffffff00
-+#define MAX_BUFFER_SIZE  0xffffff00
-+/*
-+ * Max width is therefore determined by the max stride divided by the number of
-+ * bits per pixel.
-+ *
-+ * However, to avoid overflow issues let's use a 16k maximum. This lets us
-+ * calculate 16k * 16k * 4 with 32bits. If we need higher maximums, a careful
-+ * review and adjustment of the code is needed so that it will deal with
-+ * overflows correctly.
-+ */
-+#define MAX_WIDTH 16384
-+#define MAX_HEIGHT MAX_WIDTH
-+/* Define a nominal minimum image size */
-+#define MIN_WIDTH 16
-+#define MIN_HEIGHT 16
-+/* Default size of the embedded buffer */
-+#define DEFAULT_EMBEDDED_SIZE 8192
-+
-+const struct v4l2_mbus_framefmt cfe_default_format = {
-+	.width = 640,
-+	.height = 480,
-+	.code = MEDIA_BUS_FMT_SRGGB10_1X10,
-+	.field = V4L2_FIELD_NONE,
-+	.colorspace = V4L2_COLORSPACE_RAW,
-+	.ycbcr_enc = V4L2_YCBCR_ENC_601,
-+	.quantization = V4L2_QUANTIZATION_FULL_RANGE,
-+	.xfer_func = V4L2_XFER_FUNC_NONE,
-+};
-+
-+const struct v4l2_mbus_framefmt cfe_default_meta_format = {
-+	.width = 8192,
-+	.height = 1,
-+	.code = MEDIA_BUS_FMT_SENSOR_DATA,
-+};
-+
-+enum node_ids {
-+	/* CSI2 HW output nodes first. */
-+	CSI2_CH0,
-+	CSI2_CH1_EMBEDDED,
-+	CSI2_CH2,
-+	CSI2_CH3,
-+	/* FE only nodes from here on. */
-+	FE_OUT0,
-+	FE_OUT1,
-+	FE_STATS,
-+	FE_CONFIG,
-+	NUM_NODES
-+};
-+
-+struct node_description {
-+	unsigned int id;
-+	const char *name;
-+	enum v4l2_buf_type buf_type;
-+	unsigned int cap;
-+	unsigned int pad_flags;
-+	unsigned int link_pad;
-+};
-+
-+/* Must match the ordering of enum ids */
-+static const struct node_description node_desc[NUM_NODES] = {
-+	[CSI2_CH0] = {
-+		.name = "csi2_ch0",
-+		.buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
-+		.cap = V4L2_CAP_VIDEO_CAPTURE,
-+		.pad_flags = MEDIA_PAD_FL_SINK | MEDIA_PAD_FL_MUST_CONNECT,
-+		.link_pad = CSI2_NUM_CHANNELS + 0
-+	},
-+	/* This node is assigned for the embedded data channel! */
-+	[CSI2_CH1_EMBEDDED] = {
-+		.name = "embedded",
-+		.buf_type = V4L2_BUF_TYPE_META_CAPTURE,
-+		.cap = V4L2_CAP_META_CAPTURE,
-+		.pad_flags = MEDIA_PAD_FL_SINK | MEDIA_PAD_FL_MUST_CONNECT,
-+		.link_pad = CSI2_NUM_CHANNELS + 1
-+	},
-+	[CSI2_CH2] = {
-+		.name = "csi2_ch2",
-+		.buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
-+		.cap = V4L2_CAP_META_CAPTURE,
-+		.pad_flags = MEDIA_PAD_FL_SINK | MEDIA_PAD_FL_MUST_CONNECT,
-+		.link_pad = CSI2_NUM_CHANNELS + 2
-+	},
-+	[CSI2_CH3] = {
-+		.name = "csi2_ch3",
-+		.buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
-+		.cap = V4L2_CAP_META_CAPTURE,
-+		.pad_flags = MEDIA_PAD_FL_SINK | MEDIA_PAD_FL_MUST_CONNECT,
-+		.link_pad = CSI2_NUM_CHANNELS + 3
-+	},
-+	[FE_OUT0] = {
-+		.name = "fe_image0",
-+		.buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
-+		.cap = V4L2_CAP_VIDEO_CAPTURE,
-+		.pad_flags = MEDIA_PAD_FL_SINK | MEDIA_PAD_FL_MUST_CONNECT,
-+		.link_pad = FE_OUTPUT0_PAD
-+	},
-+	[FE_OUT1] = {
-+		.name = "fe_image1",
-+		.buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
-+		.cap = V4L2_CAP_VIDEO_CAPTURE,
-+		.pad_flags = MEDIA_PAD_FL_SINK | MEDIA_PAD_FL_MUST_CONNECT,
-+		.link_pad = FE_OUTPUT1_PAD
-+	},
-+	[FE_STATS] = {
-+		.name = "fe_stats",
-+		.buf_type = V4L2_BUF_TYPE_META_CAPTURE,
-+		.cap = V4L2_CAP_META_CAPTURE,
-+		.pad_flags = MEDIA_PAD_FL_SINK | MEDIA_PAD_FL_MUST_CONNECT,
-+		.link_pad = FE_STATS_PAD
-+	},
-+	[FE_CONFIG] = {
-+		.name = "fe_config",
-+		.buf_type = V4L2_BUF_TYPE_META_OUTPUT,
-+		.cap = V4L2_CAP_META_OUTPUT,
-+		.pad_flags = MEDIA_PAD_FL_SOURCE | MEDIA_PAD_FL_MUST_CONNECT,
-+		.link_pad = FE_CONFIG_PAD
-+	},
-+};
-+
-+#define is_fe_node(node) (((node)->id) >= FE_OUT0)
-+#define is_csi2_node(node) (!is_fe_node(node))
-+#define is_image_output_node(node)                                               \
-+	(node_desc[(node)->id].buf_type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
-+#define is_meta_output_node(node)                                                \
-+	(node_desc[(node)->id].buf_type == V4L2_BUF_TYPE_META_CAPTURE)
-+#define is_meta_input_node(node)                                                 \
-+	(node_desc[(node)->id].buf_type == V4L2_BUF_TYPE_META_OUTPUT)
-+#define is_meta_node(node) (is_meta_output_node(node) || is_meta_input_node(node))
-+
-+/* To track state across all nodes. */
-+#define NUM_STATES		5
-+#define NODE_REGISTERED		BIT(0)
-+#define NODE_ENABLED		BIT(1)
-+#define NODE_STREAMING		BIT(2)
-+#define FS_INT			BIT(3)
-+#define FE_INT			BIT(4)
-+
-+struct cfe_buffer {
-+	struct vb2_v4l2_buffer vb;
-+	struct list_head list;
-+};
-+
-+struct cfe_config_buffer {
-+	struct cfe_buffer buf;
-+	struct pisp_fe_config config;
-+};
-+
-+static inline struct cfe_buffer *to_cfe_buffer(struct vb2_buffer *vb)
-+{
-+	return container_of(vb, struct cfe_buffer, vb.vb2_buf);
-+}
-+
-+static inline
-+struct cfe_config_buffer *to_cfe_config_buffer(struct cfe_buffer *buf)
-+{
-+	return container_of(buf, struct cfe_config_buffer, buf);
-+}
-+
-+struct cfe_node {
-+	unsigned int id;
-+	/* Pointer pointing to current v4l2_buffer */
-+	struct cfe_buffer *cur_frm;
-+	/* Pointer pointing to next v4l2_buffer */
-+	struct cfe_buffer *next_frm;
-+	/* Used to store current pixel format */
-+	struct v4l2_format fmt;
-+	/* Buffer queue used in video-buf */
-+	struct vb2_queue buffer_queue;
-+	/* Queue of filled frames */
-+	struct list_head dma_queue;
-+	/* lock used to access this structure */
-+	struct mutex lock;
-+	/* Identifies video device for this channel */
-+	struct video_device video_dev;
-+	/* Pointer to the parent handle */
-+	struct cfe_device *cfe;
-+	struct media_pad pad;
-+};
-+
-+struct cfe_device {
-+	struct dentry *debugfs;
-+	struct kref kref;
-+
-+	/* V4l2 specific parameters */
-+	struct v4l2_async_subdev asd;
-+
-+	/* peripheral base address */
-+	void __iomem *mipi_cfg_base;
-+
-+	struct clk *clk;
-+
-+	/* V4l2 device */
-+	struct v4l2_device v4l2_dev;
-+	struct media_device mdev;
-+	struct media_pipeline pipe;
-+
-+	/* IRQ lock for node state and DMA queues */
-+	spinlock_t state_lock;
-+	bool job_ready;
-+	bool job_queued;
-+
-+	/* parent device */
-+	struct platform_device *pdev;
-+	/* subdevice async Notifier */
-+	struct v4l2_async_notifier notifier;
-+
-+	/* ptr to sub device */
-+	struct v4l2_subdev *sensor;
-+
-+	struct cfe_node node[NUM_NODES];
-+	DECLARE_BITMAP(node_flags, NUM_STATES * NUM_NODES);
-+
-+	struct csi2_device csi2;
-+	struct pisp_fe_device fe;
-+
-+	bool sensor_embedded_data;
-+	int fe_csi2_channel;
-+
-+	unsigned int sequence;
-+	u64 ts;
-+};
-+
-+static inline bool is_fe_enabled(struct cfe_device *cfe)
-+{
-+	return cfe->fe_csi2_channel != -1;
-+}
-+
-+static inline struct cfe_device *to_cfe_device(struct v4l2_device *v4l2_dev)
-+{
-+	return container_of(v4l2_dev, struct cfe_device, v4l2_dev);
-+}
-+
-+static inline u32 cfg_reg_read(struct cfe_device *cfe, u32 offset)
-+{
-+	return readl(cfe->mipi_cfg_base + offset);
-+}
-+
-+static inline void cfg_reg_write(struct cfe_device *cfe, u32 offset, u32 val)
-+{
-+	writel(val, cfe->mipi_cfg_base + offset);
-+}
-+
-+static bool check_state(struct cfe_device *cfe, unsigned long state,
-+			unsigned int node_id)
-+{
-+	unsigned long bit;
-+
-+	for_each_set_bit(bit, &state, sizeof(state)) {
-+		if (!test_bit(bit + (node_id * NUM_STATES), cfe->node_flags))
-+			return false;
-+	}
-+	return true;
-+}
-+
-+static void set_state(struct cfe_device *cfe, unsigned long state,
-+		      unsigned int node_id)
-+{
-+	unsigned long bit;
-+
-+	for_each_set_bit(bit, &state, sizeof(state))
-+		set_bit(bit + (node_id * NUM_STATES), cfe->node_flags);
-+}
-+
-+static void clear_state(struct cfe_device *cfe, unsigned long state,
-+			unsigned int node_id)
-+{
-+	unsigned long bit;
-+
-+	for_each_set_bit(bit, &state, sizeof(state))
-+		clear_bit(bit + (node_id * NUM_STATES), cfe->node_flags);
-+}
-+
-+static bool test_any_node(struct cfe_device *cfe, unsigned long cond)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < NUM_NODES; i++) {
-+		if (check_state(cfe, cond, i))
-+			return true;
-+	}
-+
-+	return false;
-+}
-+
-+static bool test_all_nodes(struct cfe_device *cfe, unsigned long precond,
-+			   unsigned long cond)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < NUM_NODES; i++) {
-+		if (check_state(cfe, precond, i)) {
-+			if (!check_state(cfe, cond, i))
-+				return false;
-+		}
-+	}
-+
-+	return true;
-+}
-+
-+static void clear_all_nodes(struct cfe_device *cfe, unsigned long precond,
-+			    unsigned long state)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < NUM_NODES; i++) {
-+		if (check_state(cfe, precond, i))
-+			clear_state(cfe, state, i);
-+	}
-+}
-+
-+static int mipi_cfg_regs_show(struct seq_file *s, void *data)
-+{
-+	struct cfe_device *cfe = s->private;
-+	int ret;
-+
-+	ret = pm_runtime_resume_and_get(&cfe->pdev->dev);
-+	if (ret)
-+		return ret;
-+
-+#define DUMP(reg) seq_printf(s, #reg " \t0x%08x\n", cfg_reg_read(cfe, reg))
-+	DUMP(MIPICFG_CFG);
-+	DUMP(MIPICFG_INTR);
-+	DUMP(MIPICFG_INTE);
-+	DUMP(MIPICFG_INTF);
-+	DUMP(MIPICFG_INTS);
-+#undef DUMP
-+
-+	pm_runtime_put(&cfe->pdev->dev);
-+
-+	return 0;
-+}
-+
-+static int format_show(struct seq_file *s, void *data)
-+{
-+	struct cfe_device *cfe = s->private;
-+	unsigned int i;
-+
-+	for (i = 0; i < NUM_NODES; i++) {
-+		struct cfe_node *node = &cfe->node[i];
-+		unsigned long sb, state = 0;
-+
-+		for (sb = 0; sb < NUM_STATES; sb++) {
-+			if (check_state(cfe, BIT(sb), i))
-+				state |= BIT(sb);
-+		}
-+
-+		seq_printf(s, "\nNode %u (%s) state: 0x%lx\n", i,
-+			   node_desc[i].name, state);
-+
-+		if (is_image_output_node(node))
-+			seq_printf(s, "format: " V4L2_FOURCC_CONV " 0x%x\n"
-+				      "resolution: %ux%u\nbpl: %u\nsize: %u\n",
-+				   V4L2_FOURCC_CONV_ARGS(node->fmt.fmt.pix.pixelformat),
-+				   node->fmt.fmt.pix.pixelformat,
-+				   node->fmt.fmt.pix.width,
-+				   node->fmt.fmt.pix.height,
-+				   node->fmt.fmt.pix.bytesperline,
-+				   node->fmt.fmt.pix.sizeimage);
-+		else
-+			seq_printf(s, "format: " V4L2_FOURCC_CONV " 0x%x\nsize: %u\n",
-+				   V4L2_FOURCC_CONV_ARGS(node->fmt.fmt.meta.dataformat),
-+				   node->fmt.fmt.meta.dataformat,
-+				   node->fmt.fmt.meta.buffersize);
-+	}
-+
-+	return 0;
-+}
-+
-+DEFINE_SHOW_ATTRIBUTE(mipi_cfg_regs);
-+DEFINE_SHOW_ATTRIBUTE(format);
-+
-+/* Format setup functions */
-+const struct cfe_fmt *find_format_by_code(u32 code)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(formats); i++) {
-+		if (formats[i].code == code)
-+			return &formats[i];
-+	}
-+
-+	return NULL;
-+}
-+
-+static const struct cfe_fmt *find_format_by_pix(u32 pixelformat)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(formats); i++) {
-+		if (formats[i].fourcc == pixelformat)
-+			return &formats[i];
-+	}
-+
-+	return NULL;
-+}
-+
-+static int cfe_calc_format_size_bpl(struct cfe_device *cfe,
-+				    const struct cfe_fmt *fmt,
-+				    struct v4l2_format *f)
-+{
-+	unsigned int min_bytesperline;
-+
-+	v4l_bound_align_image(&f->fmt.pix.width, MIN_WIDTH, MAX_WIDTH, 2,
-+			      &f->fmt.pix.height, MIN_HEIGHT, MAX_HEIGHT, 0, 0);
-+
-+	min_bytesperline =
-+		ALIGN((f->fmt.pix.width * fmt->depth) >> 3, BPL_ALIGNMENT);
-+
-+	if (f->fmt.pix.bytesperline > min_bytesperline &&
-+	    f->fmt.pix.bytesperline <= MAX_BYTESPERLINE)
-+		f->fmt.pix.bytesperline =
-+			ALIGN(f->fmt.pix.bytesperline, BPL_ALIGNMENT);
-+	else
-+		f->fmt.pix.bytesperline = min_bytesperline;
-+
-+	f->fmt.pix.sizeimage = f->fmt.pix.height * f->fmt.pix.bytesperline;
-+
-+	cfe_dbg("%s: " V4L2_FOURCC_CONV " size: %ux%u bpl:%u img_size:%u\n",
-+		__func__, V4L2_FOURCC_CONV_ARGS(f->fmt.pix.pixelformat),
-+		f->fmt.pix.width, f->fmt.pix.height,
-+		f->fmt.pix.bytesperline, f->fmt.pix.sizeimage);
-+
-+	return 0;
-+}
-+
-+static void cfe_schedule_next_csi2_job(struct cfe_device *cfe)
-+{
-+	struct cfe_buffer *buf;
-+	unsigned int i;
-+	dma_addr_t addr;
-+
-+	for (i = 0; i < CSI2_NUM_CHANNELS; i++) {
-+		struct cfe_node *node = &cfe->node[i];
-+		unsigned int stride, size;
-+
-+		if (!check_state(cfe, NODE_STREAMING, i))
-+			continue;
-+
-+		buf = list_first_entry(&node->dma_queue, struct cfe_buffer,
-+				       list);
-+		node->next_frm = buf;
-+		list_del(&buf->list);
-+
-+		cfe_dbg("%s: [%s] buffer:%p\n",
-+			__func__, node_desc[node->id].name, &buf->vb.vb2_buf);
-+
-+		if (is_meta_node(node)) {
-+			size = node->fmt.fmt.meta.buffersize;
-+			stride = 0;
-+		} else {
-+			size = node->fmt.fmt.pix.sizeimage;
-+			stride = node->fmt.fmt.pix.bytesperline;
-+		}
-+
-+		addr = vb2_dma_contig_plane_dma_addr(&buf->vb.vb2_buf, 0);
-+		csi2_set_buffer(&cfe->csi2, node->id, addr, stride, size);
-+	}
-+}
-+
-+static void cfe_schedule_next_pisp_job(struct cfe_device *cfe)
-+{
-+	struct vb2_buffer *vb2_bufs[FE_NUM_PADS] = { 0 };
-+	struct cfe_config_buffer *config_buf;
-+	struct cfe_buffer *buf;
-+	unsigned int i;
-+
-+	for (i = CSI2_NUM_CHANNELS; i < NUM_NODES; i++) {
-+		struct cfe_node *node = &cfe->node[i];
-+
-+		if (!check_state(cfe, NODE_STREAMING, i))
-+			continue;
-+
-+		buf = list_first_entry(&node->dma_queue, struct cfe_buffer,
-+				       list);
-+
-+		cfe_dbg_irq("%s: [%s] buffer:%p\n", __func__,
-+			    node_desc[node->id].name, &buf->vb.vb2_buf);
-+
-+		node->next_frm = buf;
-+		vb2_bufs[node_desc[i].link_pad] = &buf->vb.vb2_buf;
-+		list_del(&buf->list);
-+	}
-+
-+	config_buf = to_cfe_config_buffer(cfe->node[FE_CONFIG].next_frm);
-+	pisp_fe_submit_job(&cfe->fe, vb2_bufs, &config_buf->config);
-+}
-+
-+static bool cfe_check_job_ready(struct cfe_device *cfe)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < NUM_NODES; i++) {
-+		struct cfe_node *node = &cfe->node[i];
-+
-+		if (!check_state(cfe, NODE_ENABLED, i))
-+			continue;
-+
-+		if (list_empty(&node->dma_queue)) {
-+			cfe_dbg_irq("%s: [%s] has no buffer, unable to schedule job\n",
-+				    __func__, node_desc[i].name);
-+			return false;
-+		}
-+	}
-+
-+	return true;
-+}
-+
-+static void cfe_prepare_next_job(struct cfe_device *cfe)
-+{
-+	cfe->job_queued = true;
-+	cfe_schedule_next_csi2_job(cfe);
-+	if (is_fe_enabled(cfe))
-+		cfe_schedule_next_pisp_job(cfe);
-+
-+	/* Flag if another job is ready after this. */
-+	cfe->job_ready = cfe_check_job_ready(cfe);
-+
-+	cfe_dbg_irq("%s: end with scheduled job\n", __func__);
-+}
-+
-+static void cfe_process_buffer_complete(struct cfe_node *node,
-+					unsigned int sequence)
-+{
-+	struct cfe_device *cfe = node->cfe;
-+
-+	cfe_dbg_irq("%s: [%s] buffer:%p\n", __func__, node_desc[node->id].name,
-+		    &node->cur_frm->vb.vb2_buf);
-+
-+	node->cur_frm->vb.sequence = sequence;
-+	vb2_buffer_done(&node->cur_frm->vb.vb2_buf, VB2_BUF_STATE_DONE);
-+}
-+
-+static void cfe_queue_event_sof(struct cfe_node *node)
-+{
-+	struct v4l2_event event = {
-+		.type = V4L2_EVENT_FRAME_SYNC,
-+		.u.frame_sync.frame_sequence = node->cfe->sequence,
-+	};
-+
-+	v4l2_event_queue(&node->video_dev, &event);
-+}
-+
-+static void cfe_sof_isr_handler(struct cfe_node *node)
-+{
-+	struct cfe_device *cfe = node->cfe;
-+
-+	cfe_dbg_irq("%s: [%s] seq %u\n", __func__, node_desc[node->id].name,
-+		    cfe->sequence);
-+
-+	node->cur_frm = node->next_frm;
-+	node->next_frm = NULL;
-+
-+	/*
-+	 * If this is the first node to see a frame start,  sample the
-+	 * timestamp to use for all frames across all channels.
-+	 */
-+	if (!test_any_node(cfe, NODE_STREAMING | FS_INT))
-+		cfe->ts = ktime_get_ns();
-+
-+	set_state(cfe, FS_INT, node->id);
-+
-+	/* If all nodes have seen a frame start, we can queue another job. */
-+	if (test_all_nodes(cfe, NODE_STREAMING, FS_INT))
-+		cfe->job_queued = false;
-+
-+	if (node->cur_frm)
-+		node->cur_frm->vb.vb2_buf.timestamp = cfe->ts;
-+
-+	if (is_image_output_node(node))
-+		cfe_queue_event_sof(node);
-+}
-+
-+static void cfe_eof_isr_handler(struct cfe_node *node)
-+{
-+	struct cfe_device *cfe = node->cfe;
-+
-+	cfe_dbg_irq("%s: [%s] seq %u\n", __func__, node_desc[node->id].name,
-+		    cfe->sequence);
-+
-+	if (node->cur_frm)
-+		cfe_process_buffer_complete(node, cfe->sequence);
-+
-+	node->cur_frm = NULL;
-+	set_state(cfe, FE_INT, node->id);
-+
-+	/*
-+	 * If all nodes have seen a frame end, we can increment
-+	 * the sequence counter now.
-+	 */
-+	if (test_all_nodes(cfe, NODE_STREAMING, FE_INT)) {
-+		cfe->sequence++;
-+		clear_all_nodes(cfe, NODE_STREAMING, FE_INT | FS_INT);
-+	}
-+}
-+
-+static irqreturn_t cfe_isr(int irq, void *dev)
-+{
-+	struct cfe_device *cfe = dev;
-+	unsigned int i;
-+	bool sof[NUM_NODES] = {0}, eof[NUM_NODES] = {0}, lci[NUM_NODES] = {0};
-+	u32 sts;
-+
-+	sts = cfg_reg_read(cfe, MIPICFG_INTS);
-+
-+	if (sts & MIPICFG_INT_CSI_DMA)
-+		csi2_isr(&cfe->csi2, sof, eof, lci);
-+
-+	if (sts & MIPICFG_INT_PISP_FE)
-+		pisp_fe_isr(&cfe->fe, sof + CSI2_NUM_CHANNELS,
-+			    eof + CSI2_NUM_CHANNELS);
-+
-+	spin_lock(&cfe->state_lock);
-+
-+	for (i = 0; i < NUM_NODES; i++) {
-+		struct cfe_node *node = &cfe->node[i];
-+
-+		/*
-+		 * The check_state(NODE_STREAMING) is to ensure we do not loop
-+		 * over the CSI2_CHx nodes when the FE is active since they
-+		 * generate interrupts even though the node is not streaming.
-+		 */
-+		if (!check_state(cfe, NODE_STREAMING, i) ||
-+		    !(sof[i] || eof[i] || lci[i]))
-+			continue;
-+
-+		/*
-+		 * There are 3 cases where we could get FS + FE_ACK at
-+		 * the same time:
-+		 * 1) FE of the current frame, and FS of the next frame.
-+		 * 2) FS + FE of the same frame.
-+		 * 3) FE of the current frame, and FS + FE of the next
-+		 *    frame. To handle this, see the sof handler below.
-+		 *
-+		 * (1) is handled implicitly by the ordering of the FE and FS
-+		 * handlers below.
-+		 */
-+		if (eof[i]) {
-+			/*
-+			 * The condition below tests for (2). Run the FS handler
-+			 * first before the FE handler, both for the current
-+			 * frame.
-+			 */
-+			if (sof[i] && !check_state(cfe, FS_INT, i)) {
-+				cfe_sof_isr_handler(node);
-+				sof[i] = false;
-+			}
-+
-+			cfe_eof_isr_handler(node);
-+		}
-+
-+		if (sof[i]) {
-+			/*
-+			 * The condition below tests for (3). In such cases, we
-+			 * come in here with FS flag set in the node state from
-+			 * the previous frame since it only gets cleared in
-+			 * eof_isr_handler(). Handle the FE for the previous
-+			 * frame first before the FS handler for the current
-+			 * frame.
-+			 */
-+			if (check_state(cfe, FS_INT, node->id)) {
-+				cfe_dbg("%s: [%s] Handling missing previous FE interrupt\n",
-+					__func__, node_desc[node->id].name);
-+				cfe_eof_isr_handler(node);
-+			}
-+
-+			cfe_sof_isr_handler(node);
-+		}
-+
-+		if (!cfe->job_queued && cfe->job_ready)
-+			cfe_prepare_next_job(cfe);
-+	}
-+
-+	spin_unlock(&cfe->state_lock);
-+
-+	return IRQ_HANDLED;
-+}
-+
-+/*
-+ * Stream helpers
-+ */
-+
-+static void cfe_start_channel(struct cfe_node *node)
-+{
-+	struct cfe_device *cfe = node->cfe;
-+	struct v4l2_subdev_state *state;
-+	struct v4l2_mbus_framefmt *source_fmt;
-+	const struct cfe_fmt *fmt;
-+	unsigned long flags;
-+	unsigned int width = 0, height = 0;
-+	bool start_fe = is_fe_enabled(cfe) &&
-+			test_all_nodes(cfe, NODE_ENABLED, NODE_STREAMING);
-+
-+	cfe_dbg("%s: [%s]\n", __func__, node_desc[node->id].name);
-+
-+	if (start_fe || is_image_output_node(node)) {
-+		width = node->fmt.fmt.pix.width;
-+		height = node->fmt.fmt.pix.height;
-+	}
-+
-+	state = v4l2_subdev_lock_and_get_active_state(&cfe->csi2.sd);
-+
-+	if (start_fe) {
-+		WARN_ON(!is_fe_enabled(cfe));
-+		cfe_dbg("%s: %s using csi2 channel %d\n",
-+			__func__, node_desc[FE_OUT0].name,
-+			cfe->fe_csi2_channel);
-+
-+		source_fmt = v4l2_subdev_get_pad_format(&cfe->csi2.sd, state, cfe->fe_csi2_channel);
-+		fmt = find_format_by_code(source_fmt->code);
-+
-+		/*
-+		 * Start the associated CSI2 Channel as well.
-+		 *
-+		 * Must write to the ADDR register to latch the ctrl values
-+		 * even if we are connected to the front end. Once running,
-+		 * this is handled by the CSI2 AUTO_ARM mode.
-+		 */
-+		csi2_start_channel(&cfe->csi2, cfe->fe_csi2_channel,
-+				   fmt->csi_dt, CSI2_MODE_FE_STREAMING,
-+				   true, false, width, height);
-+		csi2_set_buffer(&cfe->csi2, cfe->fe_csi2_channel, 0, 0, -1);
-+		pisp_fe_start(&cfe->fe);
-+	}
-+
-+	if (is_csi2_node(node)) {
-+		u32 mode = CSI2_MODE_NORMAL;
-+
-+		source_fmt = v4l2_subdev_get_pad_format(&cfe->csi2.sd, state,
-+			node_desc[node->id].link_pad - CSI2_NUM_CHANNELS);
-+		fmt = find_format_by_code(source_fmt->code);
-+
-+		if (is_image_output_node(node)) {
-+			if (node->fmt.fmt.pix.pixelformat ==
-+					fmt->remap[CFE_REMAP_16BIT])
-+				mode = CSI2_MODE_REMAP;
-+			else if (node->fmt.fmt.pix.pixelformat ==
-+					fmt->remap[CFE_REMAP_COMPRESSED]) {
-+				mode = CSI2_MODE_COMPRESSED;
-+				csi2_set_compression(&cfe->csi2, node->id,
-+						     CSI2_COMPRESSION_DELTA, 0,
-+						     0);
-+			}
-+		}
-+		/* Unconditionally start this CSI2 channel. */
-+		csi2_start_channel(&cfe->csi2, node->id, fmt->csi_dt,
-+				   mode,
-+				   /* Auto arm */
-+				   false,
-+				   /* Pack bytes */
-+				   node->id == CSI2_CH1_EMBEDDED ? true : false,
-+				   width, height);
-+	}
-+
-+	v4l2_subdev_unlock_state(state);
-+
-+	spin_lock_irqsave(&cfe->state_lock, flags);
-+	if (cfe->job_ready && test_all_nodes(cfe, NODE_ENABLED, NODE_STREAMING))
-+		cfe_prepare_next_job(cfe);
-+	spin_unlock_irqrestore(&cfe->state_lock, flags);
-+}
-+
-+static void cfe_stop_channel(struct cfe_node *node, bool fe_stop)
-+{
-+	struct cfe_device *cfe = node->cfe;
-+
-+	cfe_dbg("%s: [%s] fe_stop %u\n", __func__,
-+		node_desc[node->id].name, fe_stop);
-+
-+	if (fe_stop) {
-+		csi2_stop_channel(&cfe->csi2, cfe->fe_csi2_channel);
-+		pisp_fe_stop(&cfe->fe);
-+	}
-+
-+	if (is_csi2_node(node))
-+		csi2_stop_channel(&cfe->csi2, node->id);
-+}
-+
-+static void cfe_return_buffers(struct cfe_node *node,
-+			       enum vb2_buffer_state state)
-+{
-+	struct cfe_device *cfe = node->cfe;
-+	struct cfe_buffer *buf, *tmp;
-+	unsigned long flags;
-+
-+	cfe_dbg("%s: [%s]\n", __func__, node_desc[node->id].name);
-+
-+	spin_lock_irqsave(&cfe->state_lock, flags);
-+	list_for_each_entry_safe(buf, tmp, &node->dma_queue, list) {
-+		list_del(&buf->list);
-+		vb2_buffer_done(&buf->vb.vb2_buf, state);
-+	}
-+
-+	if (node->cur_frm)
-+		vb2_buffer_done(&node->cur_frm->vb.vb2_buf, state);
-+	if (node->next_frm && node->cur_frm != node->next_frm)
-+		vb2_buffer_done(&node->next_frm->vb.vb2_buf, state);
-+
-+	node->cur_frm = NULL;
-+	node->next_frm = NULL;
-+	spin_unlock_irqrestore(&cfe->state_lock, flags);
-+}
-+
-+/*
-+ * vb2 ops
-+ */
-+
-+static int cfe_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,
-+			   unsigned int *nplanes, unsigned int sizes[],
-+			   struct device *alloc_devs[])
-+{
-+	struct cfe_node *node = vb2_get_drv_priv(vq);
-+	struct cfe_device *cfe = node->cfe;
-+	unsigned int size = is_image_output_node(node) ?
-+					  node->fmt.fmt.pix.sizeimage :
-+					  node->fmt.fmt.meta.buffersize;
-+
-+	cfe_dbg("%s: [%s]\n", __func__, node_desc[node->id].name);
-+
-+	if (vq->num_buffers + *nbuffers < 3)
-+		*nbuffers = 3 - vq->num_buffers;
-+
-+	if (*nplanes) {
-+		if (sizes[0] < size) {
-+			cfe_err("sizes[0] %i < size %u\n", sizes[0], size);
-+			return -EINVAL;
-+		}
-+		size = sizes[0];
-+	}
-+
-+	*nplanes = 1;
-+	sizes[0] = size;
-+
-+	return 0;
-+}
-+
-+static int cfe_buffer_prepare(struct vb2_buffer *vb)
-+{
-+	struct cfe_node *node = vb2_get_drv_priv(vb->vb2_queue);
-+	struct cfe_device *cfe = node->cfe;
-+	struct cfe_buffer *buf = to_cfe_buffer(vb);
-+	unsigned long size;
-+
-+	cfe_dbg_irq("%s: [%s] buffer:%p\n", __func__, node_desc[node->id].name,
-+		    vb);
-+
-+	size = is_image_output_node(node) ? node->fmt.fmt.pix.sizeimage :
-+					    node->fmt.fmt.meta.buffersize;
-+	if (vb2_plane_size(vb, 0) < size) {
-+		cfe_err("data will not fit into plane (%lu < %lu)\n",
-+			vb2_plane_size(vb, 0), size);
-+		return -EINVAL;
-+	}
-+
-+	vb2_set_plane_payload(&buf->vb.vb2_buf, 0, size);
-+
-+	if (node->id == FE_CONFIG) {
-+		struct cfe_config_buffer *b = to_cfe_config_buffer(buf);
-+		void *addr = vb2_plane_vaddr(vb, 0);
-+
-+		memcpy(&b->config, addr, sizeof(struct pisp_fe_config));
-+		return pisp_fe_validate_config(&cfe->fe, &b->config,
-+					       &cfe->node[FE_OUT0].fmt,
-+					       &cfe->node[FE_OUT1].fmt);
-+	}
-+
-+	return 0;
-+}
-+
-+static void cfe_buffer_queue(struct vb2_buffer *vb)
-+{
-+	struct cfe_node *node = vb2_get_drv_priv(vb->vb2_queue);
-+	struct cfe_device *cfe = node->cfe;
-+	struct cfe_buffer *buf = to_cfe_buffer(vb);
-+	unsigned long flags;
-+
-+	cfe_dbg_irq("%s: [%s] buffer:%p\n", __func__, node_desc[node->id].name,
-+		    vb);
-+
-+	spin_lock_irqsave(&cfe->state_lock, flags);
-+
-+	list_add_tail(&buf->list, &node->dma_queue);
-+
-+	if (!cfe->job_ready)
-+		cfe->job_ready = cfe_check_job_ready(cfe);
-+
-+	if (!cfe->job_queued && cfe->job_ready &&
-+	    test_all_nodes(cfe, NODE_ENABLED, NODE_STREAMING)) {
-+		cfe_dbg("Preparing job immediately for channel %u\n",
-+			node->id);
-+		cfe_prepare_next_job(cfe);
-+	}
-+
-+	spin_unlock_irqrestore(&cfe->state_lock, flags);
-+}
-+
-+static int cfe_start_streaming(struct vb2_queue *vq, unsigned int count)
-+{
-+	struct v4l2_mbus_config mbus_config = { 0 };
-+	struct cfe_node *node = vb2_get_drv_priv(vq);
-+	struct cfe_device *cfe = node->cfe;
-+	int ret;
-+
-+	cfe_dbg("%s: [%s] begin.\n", __func__, node_desc[node->id].name);
-+
-+	if (!check_state(cfe, NODE_ENABLED, node->id)) {
-+		cfe_err("%s node link is not enabled.\n",
-+			node_desc[node->id].name);
-+		return -EINVAL;
-+	}
-+
-+	ret = pm_runtime_resume_and_get(&cfe->pdev->dev);
-+	if (ret < 0) {
-+		cfe_err("pm_runtime_resume_and_get failed\n");
-+		goto err_streaming;
-+	}
-+
-+	ret = media_pipeline_start(&node->pad, &cfe->pipe);
-+	if (ret < 0) {
-+		cfe_err("Failed to start media pipeline: %d\n", ret);
-+		goto err_pm_put;
-+	}
-+
-+	clear_state(cfe, FS_INT | FE_INT, node->id);
-+	set_state(cfe, NODE_STREAMING, node->id);
-+	cfe_start_channel(node);
-+
-+	if (!test_all_nodes(cfe, NODE_ENABLED, NODE_STREAMING)) {
-+		cfe_dbg("Not all nodes are set to streaming yet!\n");
-+		return 0;
-+	}
-+
-+	cfg_reg_write(cfe, MIPICFG_CFG, MIPICFG_CFG_SEL_CSI);
-+	cfg_reg_write(cfe, MIPICFG_INTE, MIPICFG_INT_CSI_DMA | MIPICFG_INT_PISP_FE);
-+
-+	cfe->csi2.active_data_lanes = cfe->csi2.dphy.num_lanes;
-+	cfe_dbg("Running with %u data lanes\n", cfe->csi2.active_data_lanes);
-+
-+	ret = v4l2_subdev_call(cfe->sensor, pad, get_mbus_config, 0,
-+			       &mbus_config);
-+	if (ret < 0 && ret != -ENOIOCTLCMD) {
-+		cfe_err("g_mbus_config failed\n");
-+		goto err_pm_put;
-+	}
-+
-+	cfe->csi2.active_data_lanes = mbus_config.bus.mipi_csi2.num_data_lanes;
-+	if (!cfe->csi2.active_data_lanes)
-+		cfe->csi2.active_data_lanes = cfe->csi2.dphy.num_lanes;
-+	if (cfe->csi2.active_data_lanes > cfe->csi2.dphy.num_lanes) {
-+		cfe_err("Device has requested %u data lanes, which is >%u configured in DT\n",
-+			cfe->csi2.active_data_lanes, cfe->csi2.dphy.num_lanes);
-+		ret = -EINVAL;
-+		goto err_disable_cfe;
-+	}
-+
-+	cfe_dbg("Starting sensor streaming\n");
-+
-+	csi2_open_rx(&cfe->csi2);
-+
-+	cfe->sequence = 0;
-+	ret = v4l2_subdev_call(cfe->sensor, video, s_stream, 1);
-+	if (ret < 0) {
-+		cfe_err("stream on failed in subdev\n");
-+		goto err_disable_cfe;
-+	}
-+
-+	cfe_dbg("%s: [%s] end.\n", __func__, node_desc[node->id].name);
-+
-+	return 0;
-+
-+err_disable_cfe:
-+	csi2_close_rx(&cfe->csi2);
-+	cfe_stop_channel(node, true);
-+	media_pipeline_stop(&node->pad);
-+err_pm_put:
-+	pm_runtime_put(&cfe->pdev->dev);
-+err_streaming:
-+	cfe_return_buffers(node, VB2_BUF_STATE_QUEUED);
-+	clear_state(cfe, NODE_STREAMING, node->id);
-+
-+	return ret;
-+}
-+
-+static void cfe_stop_streaming(struct vb2_queue *vq)
-+{
-+	struct cfe_node *node = vb2_get_drv_priv(vq);
-+	struct cfe_device *cfe = node->cfe;
-+	unsigned long flags;
-+	bool fe_stop;
-+
-+	cfe_dbg("%s: [%s] begin.\n", __func__, node_desc[node->id].name);
-+
-+	spin_lock_irqsave(&cfe->state_lock, flags);
-+	fe_stop = is_fe_enabled(cfe) &&
-+		  test_all_nodes(cfe, NODE_ENABLED, NODE_STREAMING);
-+
-+	cfe->job_ready = false;
-+	clear_state(cfe, NODE_STREAMING, node->id);
-+	spin_unlock_irqrestore(&cfe->state_lock, flags);
-+
-+	cfe_stop_channel(node, fe_stop);
-+
-+	if (!test_any_node(cfe, NODE_STREAMING)) {
-+		/* Stop streaming the sensor and disable the peripheral. */
-+		if (v4l2_subdev_call(cfe->sensor, video, s_stream, 0) < 0)
-+			cfe_err("stream off failed in subdev\n");
-+
-+		csi2_close_rx(&cfe->csi2);
-+
-+		cfg_reg_write(cfe, MIPICFG_INTE, 0);
-+	}
-+
-+	media_pipeline_stop(&node->pad);
-+
-+	/* Clear all queued buffers for the node */
-+	cfe_return_buffers(node, VB2_BUF_STATE_ERROR);
-+
-+	pm_runtime_put(&cfe->pdev->dev);
-+
-+	cfe_dbg("%s: [%s] end.\n", __func__, node_desc[node->id].name);
-+}
-+
-+static const struct vb2_ops cfe_video_qops = {
-+	.wait_prepare = vb2_ops_wait_prepare,
-+	.wait_finish = vb2_ops_wait_finish,
-+	.queue_setup = cfe_queue_setup,
-+	.buf_prepare = cfe_buffer_prepare,
-+	.buf_queue = cfe_buffer_queue,
-+	.start_streaming = cfe_start_streaming,
-+	.stop_streaming = cfe_stop_streaming,
-+};
-+
-+/*
-+ * v4l2 ioctl ops
-+ */
-+
-+static int cfe_querycap(struct file *file, void *priv,
-+			struct v4l2_capability *cap)
-+{
-+	struct cfe_node *node = video_drvdata(file);
-+	struct cfe_device *cfe = node->cfe;
-+
-+	strscpy(cap->driver, CFE_MODULE_NAME, sizeof(cap->driver));
-+	strscpy(cap->card, CFE_MODULE_NAME, sizeof(cap->card));
-+
-+	snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:%s",
-+		 dev_name(&cfe->pdev->dev));
-+
-+	cap->capabilities |= V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_META_CAPTURE |
-+			     V4L2_CAP_META_OUTPUT;
-+
-+	return 0;
-+}
-+
-+static int cfe_enum_fmt_vid_cap(struct file *file, void *priv,
-+				struct v4l2_fmtdesc *f)
-+{
-+	struct cfe_node *node = video_drvdata(file);
-+	struct cfe_device *cfe = node->cfe;
-+	unsigned int i, j;
-+
-+	if (!is_image_output_node(node))
-+		return -EINVAL;
-+
-+	cfe_dbg("%s: [%s]\n", __func__, node_desc[node->id].name);
-+
-+	for (i = 0, j = 0; i < ARRAY_SIZE(formats); i++) {
-+		if (f->mbus_code && formats[i].code != f->mbus_code)
-+			continue;
-+
-+		if (formats[i].flags & CFE_FORMAT_FLAG_META_OUT ||
-+		    formats[i].flags & CFE_FORMAT_FLAG_META_CAP)
-+			continue;
-+
-+		if (is_fe_node(node) &&
-+		    !(formats[i].flags & CFE_FORMAT_FLAG_FE_OUT))
-+			continue;
-+
-+		if (j == f->index) {
-+			f->pixelformat = formats[i].fourcc;
-+			f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+			return 0;
-+		}
-+		j++;
-+	}
-+
-+	return -EINVAL;
-+}
-+
-+static int cfe_g_fmt(struct file *file, void *priv,
-+		     struct v4l2_format *f)
-+{
-+	struct cfe_node *node = video_drvdata(file);
-+	struct cfe_device *cfe = node->cfe;
-+
-+	cfe_dbg("%s: [%s]\n", __func__, node_desc[node->id].name);
-+
-+	if (f->type != node->buffer_queue.type)
-+		return -EINVAL;
-+
-+	*f = node->fmt;
-+
-+	return 0;
-+}
-+
-+static int try_fmt_vid_cap(struct cfe_node *node, struct v4l2_format *f)
-+{
-+	struct cfe_device *cfe = node->cfe;
-+	const struct cfe_fmt *fmt;
-+
-+	cfe_dbg("%s: [%s] %ux%u, V4L2 pix " V4L2_FOURCC_CONV "\n",
-+		__func__, node_desc[node->id].name,
-+		f->fmt.pix.width, f->fmt.pix.height,
-+		V4L2_FOURCC_CONV_ARGS(f->fmt.pix.pixelformat));
-+
-+	if (!is_image_output_node(node))
-+		return -EINVAL;
-+
-+	/*
-+	 * Default to a format that works for both CSI2 and FE.
-+	 */
-+	fmt = find_format_by_pix(f->fmt.pix.pixelformat);
-+	if (!fmt)
-+		fmt = find_format_by_code(MEDIA_BUS_FMT_SBGGR10_1X10);
-+
-+	f->fmt.pix.pixelformat = fmt->fourcc;
-+
-+	if (is_fe_node(node) && fmt->remap[CFE_REMAP_16BIT]) {
-+		f->fmt.pix.pixelformat = fmt->remap[CFE_REMAP_16BIT];
-+		fmt = find_format_by_pix(f->fmt.pix.pixelformat);
-+	}
-+
-+	f->fmt.pix.field = V4L2_FIELD_NONE;
-+
-+	cfe_calc_format_size_bpl(cfe, fmt, f);
-+
-+	return 0;
-+}
-+
-+static int cfe_s_fmt_vid_cap(struct file *file, void *priv,
-+			     struct v4l2_format *f)
-+{
-+	struct cfe_node *node = video_drvdata(file);
-+	struct cfe_device *cfe = node->cfe;
-+	struct vb2_queue *q = &node->buffer_queue;
-+	int ret;
-+
-+	cfe_dbg("%s: [%s]\n", __func__, node_desc[node->id].name);
-+
-+	if (vb2_is_busy(q))
-+		return -EBUSY;
-+
-+	ret = try_fmt_vid_cap(node, f);
-+	if (ret)
-+		return ret;
-+
-+	node->fmt = *f;
-+
-+	cfe_dbg("%s: Set %ux%u, V4L2 pix " V4L2_FOURCC_CONV "\n", __func__,
-+		node->fmt.fmt.pix.width, node->fmt.fmt.pix.height,
-+		V4L2_FOURCC_CONV_ARGS(node->fmt.fmt.pix.pixelformat));
-+
-+	return 0;
-+}
-+
-+static int cfe_try_fmt_vid_cap(struct file *file, void *priv,
-+			       struct v4l2_format *f)
-+{
-+	struct cfe_node *node = video_drvdata(file);
-+	struct cfe_device *cfe = node->cfe;
-+
-+	cfe_dbg("%s: [%s]\n", __func__, node_desc[node->id].name);
-+
-+	return try_fmt_vid_cap(node, f);
-+}
-+
-+static int cfe_enum_fmt_meta(struct file *file, void *priv,
-+			     struct v4l2_fmtdesc *f)
-+{
-+	struct cfe_node *node = video_drvdata(file);
-+	struct cfe_device *cfe = node->cfe;
-+
-+	cfe_dbg("%s: [%s]\n", __func__, node_desc[node->id].name);
-+
-+	if (!is_meta_node(node) || f->index != 0)
-+		return -EINVAL;
-+
-+	switch (node->id) {
-+	case CSI2_CH1_EMBEDDED:
-+		f->pixelformat = V4L2_META_FMT_SENSOR_DATA;
-+		return 0;
-+	case FE_STATS:
-+		f->pixelformat = V4L2_META_FMT_RPI_FE_STATS;
-+		return 0;
-+	case FE_CONFIG:
-+		f->pixelformat = V4L2_META_FMT_RPI_FE_CFG;
-+		return 0;
-+	}
-+
-+	return -EINVAL;
-+}
-+
-+static int try_fmt_meta(struct cfe_node *node, struct v4l2_format *f)
-+{
-+	switch (node->id) {
-+	case CSI2_CH1_EMBEDDED:
-+		f->fmt.meta.dataformat = V4L2_META_FMT_SENSOR_DATA;
-+		if (!f->fmt.meta.buffersize)
-+			f->fmt.meta.buffersize = DEFAULT_EMBEDDED_SIZE;
-+		f->fmt.meta.buffersize =
-+			min_t(u32, f->fmt.meta.buffersize, MAX_BUFFER_SIZE);
-+		f->fmt.meta.buffersize =
-+			ALIGN(f->fmt.meta.buffersize, BPL_ALIGNMENT);
-+		return 0;
-+	case FE_STATS:
-+		f->fmt.meta.dataformat = V4L2_META_FMT_RPI_FE_STATS;
-+		f->fmt.meta.buffersize = sizeof(struct pisp_statistics);
-+		return 0;
-+	case FE_CONFIG:
-+		f->fmt.meta.dataformat = V4L2_META_FMT_RPI_FE_CFG;
-+		f->fmt.meta.buffersize = sizeof(struct pisp_fe_config);
-+		return 0;
-+	}
-+
-+	return -EINVAL;
-+}
-+
-+static int cfe_s_fmt_meta(struct file *file, void *priv, struct v4l2_format *f)
-+{
-+	struct cfe_node *node = video_drvdata(file);
-+	struct cfe_device *cfe = node->cfe;
-+	struct vb2_queue *q = &node->buffer_queue;
-+	int ret;
-+
-+	cfe_dbg("%s: [%s]\n", __func__, node_desc[node->id].name);
-+
-+	if (vb2_is_busy(q))
-+		return -EBUSY;
-+
-+	if (f->type != node->buffer_queue.type)
-+		return -EINVAL;
-+
-+	ret = try_fmt_meta(node, f);
-+	if (ret)
-+		return ret;
-+
-+	node->fmt = *f;
-+
-+	cfe_dbg("%s: Set " V4L2_FOURCC_CONV "\n", __func__,
-+		V4L2_FOURCC_CONV_ARGS(node->fmt.fmt.meta.dataformat));
-+
-+	return 0;
-+}
-+
-+static int cfe_try_fmt_meta(struct file *file, void *priv,
-+			    struct v4l2_format *f)
-+{
-+	struct cfe_node *node = video_drvdata(file);
-+	struct cfe_device *cfe = node->cfe;
-+
-+	cfe_dbg("%s: [%s]\n", __func__, node_desc[node->id].name);
-+	return try_fmt_meta(node, f);
-+}
-+
-+static int cfe_enum_framesizes(struct file *file, void *priv,
-+			       struct v4l2_frmsizeenum *fsize)
-+{
-+	struct cfe_node *node = video_drvdata(file);
-+	struct cfe_device *cfe = node->cfe;
-+	const struct cfe_fmt *fmt;
-+
-+	cfe_dbg("%s [%s]\n", __func__, node_desc[node->id].name);
-+
-+	if (fsize->index > 0)
-+		return -EINVAL;
-+
-+	/* check for valid format */
-+	fmt = find_format_by_pix(fsize->pixel_format);
-+	if (!fmt) {
-+		cfe_dbg("Invalid pixel code: %x\n", fsize->pixel_format);
-+		return -EINVAL;
-+	}
-+
-+	/* TODO: Do we have limits on the step_width? */
-+
-+	fsize->type = V4L2_FRMSIZE_TYPE_STEPWISE;
-+	fsize->stepwise.min_width = MIN_WIDTH;
-+	fsize->stepwise.max_width = MAX_WIDTH;
-+	fsize->stepwise.step_width = 2;
-+	fsize->stepwise.min_height = MIN_HEIGHT;
-+	fsize->stepwise.max_height = MAX_HEIGHT;
-+	fsize->stepwise.step_height = 1;
-+
-+	return 0;
-+}
-+
-+static int cfe_subscribe_event(struct v4l2_fh *fh,
-+			       const struct v4l2_event_subscription *sub)
-+{
-+	struct cfe_node *node = video_get_drvdata(fh->vdev);
-+
-+	switch (sub->type) {
-+	case V4L2_EVENT_FRAME_SYNC:
-+		if (!is_image_output_node(node))
-+			break;
-+
-+		return v4l2_event_subscribe(fh, sub, 2, NULL);
-+	case V4L2_EVENT_SOURCE_CHANGE:
-+		if (is_meta_input_node(node))
-+			break;
-+
-+		return v4l2_event_subscribe(fh, sub, 4, NULL);
-+	}
-+
-+	return v4l2_ctrl_subscribe_event(fh, sub);
-+}
-+
-+static const struct v4l2_ioctl_ops cfe_ioctl_ops = {
-+	.vidioc_querycap = cfe_querycap,
-+	.vidioc_enum_fmt_vid_cap = cfe_enum_fmt_vid_cap,
-+	.vidioc_g_fmt_vid_cap = cfe_g_fmt,
-+	.vidioc_s_fmt_vid_cap = cfe_s_fmt_vid_cap,
-+	.vidioc_try_fmt_vid_cap = cfe_try_fmt_vid_cap,
-+
-+	.vidioc_enum_fmt_meta_cap = cfe_enum_fmt_meta,
-+	.vidioc_g_fmt_meta_cap = cfe_g_fmt,
-+	.vidioc_s_fmt_meta_cap = cfe_s_fmt_meta,
-+	.vidioc_try_fmt_meta_cap = cfe_try_fmt_meta,
-+
-+	.vidioc_enum_fmt_meta_out = cfe_enum_fmt_meta,
-+	.vidioc_g_fmt_meta_out = cfe_g_fmt,
-+	.vidioc_s_fmt_meta_out = cfe_s_fmt_meta,
-+	.vidioc_try_fmt_meta_out = cfe_try_fmt_meta,
-+
-+	.vidioc_enum_framesizes = cfe_enum_framesizes,
-+
-+	.vidioc_reqbufs = vb2_ioctl_reqbufs,
-+	.vidioc_create_bufs = vb2_ioctl_create_bufs,
-+	.vidioc_prepare_buf = vb2_ioctl_prepare_buf,
-+	.vidioc_querybuf = vb2_ioctl_querybuf,
-+	.vidioc_qbuf = vb2_ioctl_qbuf,
-+	.vidioc_dqbuf = vb2_ioctl_dqbuf,
-+	.vidioc_expbuf = vb2_ioctl_expbuf,
-+	.vidioc_streamon = vb2_ioctl_streamon,
-+	.vidioc_streamoff = vb2_ioctl_streamoff,
-+
-+	.vidioc_subscribe_event = cfe_subscribe_event,
-+	.vidioc_unsubscribe_event = v4l2_event_unsubscribe,
-+};
-+
-+static void cfe_notify(struct v4l2_subdev *sd, unsigned int notification,
-+		       void *arg)
-+{
-+	struct cfe_device *cfe = to_cfe_device(sd->v4l2_dev);
-+	unsigned int i;
-+
-+	switch (notification) {
-+	case V4L2_DEVICE_NOTIFY_EVENT:
-+		for (i = 0; i < NUM_NODES; i++) {
-+			struct cfe_node *node = &cfe->node[i];
-+
-+			if (check_state(cfe, NODE_REGISTERED, i))
-+				continue;
-+
-+			v4l2_event_queue(&node->video_dev, arg);
-+		}
-+		break;
-+	default:
-+		break;
-+	}
-+}
-+
-+/* cfe capture driver file operations */
-+static const struct v4l2_file_operations cfe_fops = {
-+	.owner = THIS_MODULE,
-+	.open = v4l2_fh_open,
-+	.release = vb2_fop_release,
-+	.poll = vb2_fop_poll,
-+	.unlocked_ioctl = video_ioctl2,
-+	.mmap = vb2_fop_mmap,
-+};
-+
-+static int cfe_video_link_validate(struct media_link *link)
-+{
-+	struct video_device *vd = container_of(link->sink->entity,
-+					       struct video_device, entity);
-+	struct cfe_node *node = container_of(vd, struct cfe_node, video_dev);
-+	struct cfe_device *cfe = node->cfe;
-+	struct v4l2_mbus_framefmt *source_fmt;
-+	struct v4l2_subdev_state *state;
-+	struct v4l2_subdev *source_sd;
-+	int ret = 0;
-+
-+	cfe_dbg("%s: [%s] link \"%s\":%u -> \"%s\":%u\n", __func__,
-+		node_desc[node->id].name,
-+		link->source->entity->name, link->source->index,
-+		link->sink->entity->name, link->sink->index);
-+
-+	if (!media_entity_remote_source_pad_unique(link->sink->entity)) {
-+		cfe_err("video node %s pad not connected\n", vd->name);
-+		return -ENOTCONN;
-+	}
-+
-+	source_sd = media_entity_to_v4l2_subdev(link->source->entity);
-+
-+	state = v4l2_subdev_lock_and_get_active_state(source_sd);
-+
-+	source_fmt = v4l2_subdev_get_pad_format(source_sd, state,
-+						link->source->index);
-+	if (!source_fmt) {
-+		ret = -EINVAL;
-+		goto out;
-+	}
-+
-+	if (is_image_output_node(node)) {
-+		struct v4l2_pix_format *pix_fmt = &node->fmt.fmt.pix;
-+		const struct cfe_fmt *fmt;
-+
-+		if (source_fmt->width != pix_fmt->width ||
-+		    source_fmt->height != pix_fmt->height) {
-+			cfe_err("Wrong width or height %ux%u (remote pad set to %ux%u)\n",
-+				pix_fmt->width, pix_fmt->height,
-+				source_fmt->width,
-+				source_fmt->height);
-+			ret = -EINVAL;
-+			goto out;
-+		}
-+
-+		fmt = find_format_by_code(source_fmt->code);
-+		if (!fmt || fmt->fourcc != pix_fmt->pixelformat) {
-+			cfe_err("Format mismatch!\n");
-+			ret = -EINVAL;
-+			goto out;
-+		}
-+	} else if (node->id == CSI2_CH1_EMBEDDED) {
-+		struct v4l2_meta_format *meta_fmt = &node->fmt.fmt.meta;
-+
-+		if (source_fmt->width * source_fmt->height !=
-+							meta_fmt->buffersize ||
-+		    source_fmt->code != MEDIA_BUS_FMT_SENSOR_DATA) {
-+			cfe_err("WARNING: Wrong metadata width/height/code %ux%u %08x (remote pad set to %ux%u %08x)\n",
-+				meta_fmt->buffersize, 1,
-+				MEDIA_BUS_FMT_SENSOR_DATA,
-+				source_fmt->width,
-+				source_fmt->height,
-+				source_fmt->code);
-+			/* TODO: this should throw an error eventually */
-+		}
-+	}
-+
-+out:
-+	v4l2_subdev_unlock_state(state);
-+
-+	return ret;
-+}
-+
-+static const struct media_entity_operations cfe_media_entity_ops = {
-+	.link_validate = cfe_video_link_validate,
-+};
-+
-+static int cfe_video_link_notify(struct media_link *link, u32 flags,
-+				 unsigned int notification)
-+{
-+	struct media_device *mdev = link->graph_obj.mdev;
-+	struct cfe_device *cfe = container_of(mdev, struct cfe_device, mdev);
-+	struct media_entity *fe = &cfe->fe.sd.entity;
-+	struct media_entity *csi2 = &cfe->csi2.sd.entity;
-+	unsigned long lock_flags;
-+	unsigned int i;
-+
-+	if (notification != MEDIA_DEV_NOTIFY_POST_LINK_CH)
-+		return 0;
-+
-+	cfe_dbg("%s: %s[%u] -> %s[%u] 0x%x", __func__,
-+		link->source->entity->name, link->source->index,
-+		link->sink->entity->name, link->sink->index, flags);
-+
-+	spin_lock_irqsave(&cfe->state_lock, lock_flags);
-+
-+	for (i = 0; i < NUM_NODES; i++) {
-+		if (link->sink->entity != &cfe->node[i].video_dev.entity &&
-+		    link->source->entity != &cfe->node[i].video_dev.entity)
-+			continue;
-+
-+		if (link->flags & MEDIA_LNK_FL_ENABLED)
-+			set_state(cfe, NODE_ENABLED, i);
-+		else
-+			clear_state(cfe, NODE_ENABLED, i);
-+
-+		break;
-+	}
-+
-+	spin_unlock_irqrestore(&cfe->state_lock, lock_flags);
-+
-+	if (link->source->entity != csi2)
-+		return 0;
-+	if (link->sink->index != 0)
-+		return 0;
-+	if (link->source->index == node_desc[CSI2_CH1_EMBEDDED].link_pad)
-+		return 0;
-+
-+	cfe->fe_csi2_channel = -1;
-+	if (link->sink->entity == fe && (link->flags & MEDIA_LNK_FL_ENABLED)) {
-+		if (link->source->index == node_desc[CSI2_CH0].link_pad)
-+			cfe->fe_csi2_channel = CSI2_CH0;
-+		else if (link->source->index == node_desc[CSI2_CH2].link_pad)
-+			cfe->fe_csi2_channel = CSI2_CH2;
-+		else if (link->source->index == node_desc[CSI2_CH3].link_pad)
-+			cfe->fe_csi2_channel = CSI2_CH3;
-+	}
-+
-+	if (is_fe_enabled(cfe))
-+		cfe_dbg("%s: Found CSI2:%d -> FE:0 link\n", __func__,
-+			cfe->fe_csi2_channel);
-+	else
-+		cfe_dbg("%s: Unable to find CSI2:x -> FE:0 link\n", __func__);
-+
-+	return 0;
-+}
-+
-+static const struct media_device_ops cfe_media_device_ops = {
-+	.link_notify = cfe_video_link_notify,
-+};
-+
-+static void cfe_release(struct kref *kref)
-+{
-+	struct cfe_device *cfe = container_of(kref, struct cfe_device, kref);
-+
-+	media_device_cleanup(&cfe->mdev);
-+
-+	kfree(cfe);
-+}
-+
-+static void cfe_put(struct cfe_device *cfe)
-+{
-+	kref_put(&cfe->kref, cfe_release);
-+}
-+
-+static void cfe_get(struct cfe_device *cfe)
-+{
-+	kref_get(&cfe->kref);
-+}
-+
-+static void cfe_node_release(struct video_device *vdev)
-+{
-+	struct cfe_node *node = video_get_drvdata(vdev);
-+
-+	cfe_put(node->cfe);
-+}
-+
-+static int cfe_register_node(struct cfe_device *cfe, int id)
-+{
-+	struct video_device *vdev;
-+	const struct cfe_fmt *fmt;
-+	struct vb2_queue *q;
-+	struct cfe_node *node = &cfe->node[id];
-+	int ret;
-+
-+	node->cfe = cfe;
-+	node->id = id;
-+
-+	if (is_image_output_node(node)) {
-+		fmt = find_format_by_code(cfe_default_format.code);
-+		if (!fmt) {
-+			cfe_err("Failed to find format code\n");
-+			return -EINVAL;
-+		}
-+
-+		node->fmt.fmt.pix.pixelformat = fmt->fourcc;
-+		v4l2_fill_pix_format(&node->fmt.fmt.pix, &cfe_default_format);
-+
-+		ret = try_fmt_vid_cap(node, &node->fmt);
-+		if (ret)
-+			return ret;
-+	} else {
-+		ret = try_fmt_meta(node, &node->fmt);
-+		if (ret)
-+			return ret;
-+	}
-+	node->fmt.type = node_desc[id].buf_type;
-+
-+	mutex_init(&node->lock);
-+
-+	q = &node->buffer_queue;
-+	q->type = node_desc[id].buf_type;
-+	q->io_modes = VB2_MMAP | VB2_DMABUF;
-+	q->drv_priv = node;
-+	q->ops = &cfe_video_qops;
-+	q->mem_ops = &vb2_dma_contig_memops;
-+	q->buf_struct_size = id == FE_CONFIG ? sizeof(struct cfe_config_buffer)
-+					     : sizeof(struct cfe_buffer);
-+	q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
-+	q->lock = &node->lock;
-+	q->min_buffers_needed = 1;
-+	q->dev = &cfe->pdev->dev;
-+
-+	ret = vb2_queue_init(q);
-+	if (ret) {
-+		cfe_err("vb2_queue_init() failed\n");
-+		return ret;
-+	}
-+
-+	INIT_LIST_HEAD(&node->dma_queue);
-+
-+	vdev = &node->video_dev;
-+	vdev->release = cfe_node_release;
-+	vdev->fops = &cfe_fops;
-+	vdev->ioctl_ops = &cfe_ioctl_ops;
-+	vdev->entity.ops = &cfe_media_entity_ops;
-+	vdev->v4l2_dev = &cfe->v4l2_dev;
-+	vdev->vfl_dir = (is_image_output_node(node) || is_meta_output_node(node))
-+				? VFL_DIR_RX : VFL_DIR_TX;
-+	vdev->queue = q;
-+	vdev->lock = &node->lock;
-+	vdev->device_caps = node_desc[id].cap;
-+	vdev->device_caps |= V4L2_CAP_STREAMING | V4L2_CAP_IO_MC;
-+
-+	/* Define the device names */
-+	snprintf(vdev->name, sizeof(vdev->name), "%s-%s", CFE_MODULE_NAME,
-+		 node_desc[id].name);
-+
-+	video_set_drvdata(vdev, node);
-+	if (node->id == FE_OUT0)
-+		vdev->entity.flags |= MEDIA_ENT_FL_DEFAULT;
-+	node->pad.flags = node_desc[id].pad_flags;
-+	media_entity_pads_init(&vdev->entity, 1, &node->pad);
-+
-+	if (is_meta_node(node)) {
-+		v4l2_disable_ioctl(&node->video_dev,
-+				   VIDIOC_ENUM_FRAMEINTERVALS);
-+		v4l2_disable_ioctl(&node->video_dev,
-+				   VIDIOC_ENUM_FRAMESIZES);
-+	}
-+
-+	ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
-+	if (ret) {
-+		cfe_err("Unable to register video device %s\n", vdev->name);
-+		return ret;
-+	}
-+
-+	cfe_info("Registered [%s] node id %d successfully as /dev/video%u\n",
-+		 vdev->name, id, vdev->num);
-+
-+	/*
-+	 * Acquire a reference to cfe, which will be released when the video
-+	 * device will be unregistered and userspace will have closed all open
-+	 * file handles.
-+	 */
-+	cfe_get(cfe);
-+	set_state(cfe, NODE_REGISTERED, id);
-+
-+	return 0;
-+}
-+
-+static void cfe_unregister_nodes(struct cfe_device *cfe)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i < NUM_NODES; i++) {
-+		struct cfe_node *node = &cfe->node[i];
-+
-+		if (check_state(cfe, NODE_REGISTERED, i)) {
-+			clear_state(cfe, NODE_REGISTERED, i);
-+			video_unregister_device(&node->video_dev);
-+		}
-+	}
-+}
-+
-+static int cfe_link_node_pads(struct cfe_device *cfe)
-+{
-+	unsigned int i;
-+	int ret;
-+
-+	for (i = 0; i < CSI2_NUM_CHANNELS; i++) {
-+		struct cfe_node *node = &cfe->node[i];
-+
-+		if (!check_state(cfe, NODE_REGISTERED, i))
-+			continue;
-+
-+		if (i < cfe->sensor->entity.num_pads) {
-+			/* Sensor -> CSI2 */
-+			ret = media_create_pad_link(&cfe->sensor->entity, i,
-+						    &cfe->csi2.sd.entity, i,
-+						    MEDIA_LNK_FL_IMMUTABLE |
-+						    MEDIA_LNK_FL_ENABLED);
-+			if (ret)
-+				return ret;
-+		}
-+
-+		/* CSI2 channel # -> /dev/video# */
-+		ret = media_create_pad_link(&cfe->csi2.sd.entity,
-+					    node_desc[i].link_pad,
-+					    &node->video_dev.entity, 0, 0);
-+		if (ret)
-+			return ret;
-+
-+		if (node->id != CSI2_CH1_EMBEDDED) {
-+			/* CSI2 channel # -> FE Input */
-+			ret = media_create_pad_link(&cfe->csi2.sd.entity,
-+						    node_desc[i].link_pad,
-+						    &cfe->fe.sd.entity,
-+						    FE_STREAM_PAD, 0);
-+			if (ret)
-+				return ret;
-+		}
-+	}
-+
-+	for (; i < NUM_NODES; i++) {
-+		struct cfe_node *node = &cfe->node[i];
-+		struct media_entity *src, *dst;
-+		unsigned int src_pad, dst_pad;
-+
-+		if (node_desc[i].pad_flags & MEDIA_PAD_FL_SINK) {
-+			/* FE -> /dev/video# */
-+			src = &cfe->fe.sd.entity;
-+			src_pad = node_desc[i].link_pad;
-+			dst = &node->video_dev.entity;
-+			dst_pad = 0;
-+		} else {
-+			/* /dev/video# -> FE */
-+			dst = &cfe->fe.sd.entity;
-+			dst_pad = node_desc[i].link_pad;
-+			src = &node->video_dev.entity;
-+			src_pad = 0;
-+		}
-+
-+		ret = media_create_pad_link(src, src_pad, dst, dst_pad, 0);
-+		if (ret)
-+			return ret;
-+	}
-+
-+	return 0;
-+}
-+
-+static int cfe_probe_complete(struct cfe_device *cfe)
-+{
-+	unsigned int i;
-+	int ret;
-+
-+	cfe->v4l2_dev.notify = cfe_notify;
-+
-+	cfe->sensor_embedded_data = (cfe->sensor->entity.num_pads >= 2);
-+
-+	for (i = 0; i < NUM_NODES; i++) {
-+		ret = cfe_register_node(cfe, i);
-+		if (ret) {
-+			cfe_err("Unable to register video node %u.\n", i);
-+			goto unregister;
-+		}
-+	}
-+
-+	ret = cfe_link_node_pads(cfe);
-+	if (ret) {
-+		cfe_err("Unable to link node pads.\n");
-+		goto unregister;
-+	}
-+
-+	ret = v4l2_device_register_subdev_nodes(&cfe->v4l2_dev);
-+	if (ret) {
-+		cfe_err("Unable to register subdev nodes.\n");
-+		goto unregister;
-+	}
-+
-+	/*
-+	 * Release the initial reference, all references are now owned by the
-+	 * video devices.
-+	 */
-+	cfe_put(cfe);
-+	return 0;
-+
-+unregister:
-+	cfe_unregister_nodes(cfe);
-+	cfe_put(cfe);
-+
-+	return ret;
-+}
-+
-+static int cfe_async_bound(struct v4l2_async_notifier *notifier,
-+			   struct v4l2_subdev *subdev,
-+			   struct v4l2_async_subdev *asd)
-+{
-+	struct cfe_device *cfe = to_cfe_device(notifier->v4l2_dev);
-+
-+	if (cfe->sensor) {
-+		cfe_info("Rejecting subdev %s (Already set!!)", subdev->name);
-+		return 0;
-+	}
-+
-+	cfe->sensor = subdev;
-+	cfe_info("Using sensor %s for capture\n", subdev->name);
-+
-+	return 0;
-+}
-+
-+static int cfe_async_complete(struct v4l2_async_notifier *notifier)
-+{
-+	struct cfe_device *cfe = to_cfe_device(notifier->v4l2_dev);
-+
-+	return cfe_probe_complete(cfe);
-+}
-+
-+static const struct v4l2_async_notifier_operations cfe_async_ops = {
-+	.bound = cfe_async_bound,
-+	.complete = cfe_async_complete,
-+};
-+
-+static int of_cfe_connect_subdevs(struct cfe_device *cfe)
-+{
-+	struct platform_device *pdev = cfe->pdev;
-+	struct v4l2_fwnode_endpoint ep = { .bus_type = V4L2_MBUS_CSI2_DPHY };
-+	struct device_node *node = pdev->dev.of_node;
-+	struct device_node *ep_node;
-+	struct device_node *sensor_node;
-+	unsigned int lane;
-+	int ret = -EINVAL;
-+
-+	/* Get the local endpoint and remote device. */
-+	ep_node = of_graph_get_next_endpoint(node, NULL);
-+	if (!ep_node) {
-+		cfe_err("can't get next endpoint\n");
-+		return -EINVAL;
-+	}
-+
-+	cfe_dbg("ep_node is %pOF\n", ep_node);
-+
-+	sensor_node = of_graph_get_remote_port_parent(ep_node);
-+	if (!sensor_node) {
-+		cfe_err("can't get remote parent\n");
-+		goto cleanup_exit;
-+	}
-+
-+	cfe_info("found subdevice %pOF\n", sensor_node);
-+
-+	/* Parse the local endpoint and validate its configuration. */
-+	v4l2_fwnode_endpoint_parse(of_fwnode_handle(ep_node), &ep);
-+
-+	cfe->csi2.multipacket_line =
-+		fwnode_property_present(of_fwnode_handle(ep_node),
-+					"multipacket-line");
-+
-+	if (ep.bus_type != V4L2_MBUS_CSI2_DPHY) {
-+		cfe_err("endpoint node type != CSI2\n");
-+		return -EINVAL;
-+	}
-+
-+	for (lane = 0; lane < ep.bus.mipi_csi2.num_data_lanes; lane++) {
-+		if (ep.bus.mipi_csi2.data_lanes[lane] != lane + 1) {
-+			cfe_err("subdevice %pOF: data lanes reordering not supported\n",
-+				sensor_node);
-+			goto cleanup_exit;
-+		}
-+	}
-+
-+	/* TODO: Get the frequency from devicetree */
-+	cfe->csi2.dphy.dphy_freq = 999;
-+	cfe->csi2.dphy.num_lanes = ep.bus.mipi_csi2.num_data_lanes;
-+	cfe->csi2.bus_flags = ep.bus.mipi_csi2.flags;
-+
-+	cfe_dbg("subdevice %pOF: %u data lanes, flags=0x%08x, multipacket_line=%u\n",
-+		sensor_node, cfe->csi2.dphy.num_lanes, cfe->csi2.bus_flags,
-+		cfe->csi2.multipacket_line);
-+
-+	/* Initialize and register the async notifier. */
-+	v4l2_async_nf_init(&cfe->notifier);
-+	cfe->notifier.ops = &cfe_async_ops;
-+
-+	cfe->asd.match_type = V4L2_ASYNC_MATCH_FWNODE;
-+	cfe->asd.match.fwnode = of_fwnode_handle(sensor_node);
-+	ret = __v4l2_async_nf_add_subdev(&cfe->notifier, &cfe->asd);
-+	if (ret) {
-+		cfe_err("Error adding subdevice: %d\n", ret);
-+		goto cleanup_exit;
-+	}
-+
-+	ret = v4l2_async_nf_register(&cfe->v4l2_dev, &cfe->notifier);
-+	if (ret) {
-+		cfe_err("Error registering async notifier: %d\n", ret);
-+		ret = -EINVAL;
-+	}
-+
-+cleanup_exit:
-+	of_node_put(sensor_node);
-+	of_node_put(ep_node);
-+
-+	return ret;
-+}
-+
-+static int cfe_probe(struct platform_device *pdev)
-+{
-+	struct cfe_device *cfe;
-+	char debugfs_name[32];
-+	int ret;
-+
-+	cfe = kzalloc(sizeof(*cfe), GFP_KERNEL);
-+	if (!cfe)
-+		return -ENOMEM;
-+
-+	platform_set_drvdata(pdev, cfe);
-+
-+	kref_init(&cfe->kref);
-+	cfe->pdev = pdev;
-+	cfe->fe_csi2_channel = -1;
-+	spin_lock_init(&cfe->state_lock);
-+
-+	cfe->csi2.base = devm_platform_ioremap_resource(pdev, 0);
-+	if (IS_ERR(cfe->csi2.base)) {
-+		dev_err(&pdev->dev, "Failed to get dma io block\n");
-+		ret = PTR_ERR(cfe->csi2.base);
-+		goto err_cfe_put;
-+	}
-+
-+	cfe->csi2.dphy.base = devm_platform_ioremap_resource(pdev, 1);
-+	if (IS_ERR(cfe->csi2.dphy.base)) {
-+		dev_err(&pdev->dev, "Failed to get host io block\n");
-+		ret = PTR_ERR(cfe->csi2.dphy.base);
-+		goto err_cfe_put;
-+	}
-+
-+	cfe->mipi_cfg_base = devm_platform_ioremap_resource(pdev, 2);
-+	if (IS_ERR(cfe->mipi_cfg_base)) {
-+		dev_err(&pdev->dev, "Failed to get mipi cfg io block\n");
-+		ret = PTR_ERR(cfe->mipi_cfg_base);
-+		goto err_cfe_put;
-+	}
-+
-+	cfe->fe.base = devm_platform_ioremap_resource(pdev, 3);
-+	if (IS_ERR(cfe->fe.base)) {
-+		dev_err(&pdev->dev, "Failed to get pisp fe io block\n");
-+		ret = PTR_ERR(cfe->fe.base);
-+		goto err_cfe_put;
-+	}
-+
-+	ret = platform_get_irq(pdev, 0);
-+	if (ret <= 0) {
-+		dev_err(&pdev->dev, "No IRQ resource\n");
-+		ret = -EINVAL;
-+		goto err_cfe_put;
-+	}
-+
-+	ret = devm_request_irq(&pdev->dev, ret, cfe_isr, 0, "rp1-cfe", cfe);
-+	if (ret) {
-+		dev_err(&pdev->dev, "Unable to request interrupt\n");
-+		ret = -EINVAL;
-+		goto err_cfe_put;
-+	}
-+
-+	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
-+	if (ret) {
-+		dev_err(&pdev->dev, "DMA enable failed\n");
-+		goto err_cfe_put;
-+	}
-+
-+	/* TODO: Enable clock only when running. */
-+	cfe->clk = devm_clk_get(&pdev->dev, NULL);
-+	if (IS_ERR(cfe->clk))
-+		return dev_err_probe(&pdev->dev, PTR_ERR(cfe->clk),
-+				     "clock not found\n");
-+
-+	cfe->mdev.dev = &pdev->dev;
-+	cfe->mdev.ops = &cfe_media_device_ops;
-+	strscpy(cfe->mdev.model, CFE_MODULE_NAME, sizeof(cfe->mdev.model));
-+	strscpy(cfe->mdev.serial, "", sizeof(cfe->mdev.serial));
-+	snprintf(cfe->mdev.bus_info, sizeof(cfe->mdev.bus_info), "platform:%s",
-+		 dev_name(&pdev->dev));
-+
-+	media_device_init(&cfe->mdev);
-+
-+	cfe->v4l2_dev.mdev = &cfe->mdev;
-+
-+	ret = v4l2_device_register(&pdev->dev, &cfe->v4l2_dev);
-+	if (ret) {
-+		cfe_err("Unable to register v4l2 device.\n");
-+		goto err_cfe_put;
-+	}
-+
-+	snprintf(debugfs_name, sizeof(debugfs_name), "rp1-cfe:%s",
-+		 dev_name(&pdev->dev));
-+	cfe->debugfs = debugfs_create_dir(debugfs_name, NULL);
-+	debugfs_create_file("format", 0444, cfe->debugfs, cfe, &format_fops);
-+	debugfs_create_file("regs", 0444, cfe->debugfs, cfe,
-+			    &mipi_cfg_regs_fops);
-+
-+	/* Enable the block power domain */
-+	pm_runtime_enable(&pdev->dev);
-+
-+	ret = pm_runtime_resume_and_get(&cfe->pdev->dev);
-+	if (ret)
-+		goto err_runtime_disable;
-+
-+	cfe->csi2.v4l2_dev = &cfe->v4l2_dev;
-+	ret = csi2_init(&cfe->csi2, cfe->debugfs);
-+	if (ret) {
-+		cfe_err("Failed to init csi2 (%d)\n", ret);
-+		goto err_runtime_put;
-+	}
-+
-+	cfe->fe.v4l2_dev = &cfe->v4l2_dev;
-+	ret = pisp_fe_init(&cfe->fe, cfe->debugfs);
-+	if (ret) {
-+		cfe_err("Failed to init pisp fe (%d)\n", ret);
-+		goto err_csi2_uninit;
-+	}
-+
-+	cfe->mdev.hw_revision = cfe->fe.hw_revision;
-+	ret = media_device_register(&cfe->mdev);
-+	if (ret < 0) {
-+		cfe_err("Unable to register media-controller device.\n");
-+		goto err_pisp_fe_uninit;
-+	}
-+
-+	ret = of_cfe_connect_subdevs(cfe);
-+	if (ret) {
-+		cfe_err("Failed to connect subdevs\n");
-+		goto err_media_unregister;
-+	}
-+
-+	pm_runtime_put(&cfe->pdev->dev);
-+
-+	return 0;
-+
-+err_media_unregister:
-+	media_device_unregister(&cfe->mdev);
-+err_pisp_fe_uninit:
-+	pisp_fe_uninit(&cfe->fe);
-+err_csi2_uninit:
-+	csi2_uninit(&cfe->csi2);
-+err_runtime_put:
-+	pm_runtime_put(&cfe->pdev->dev);
-+err_runtime_disable:
-+	pm_runtime_disable(&pdev->dev);
-+	debugfs_remove(cfe->debugfs);
-+	v4l2_device_unregister(&cfe->v4l2_dev);
-+err_cfe_put:
-+	cfe_put(cfe);
-+
-+	return ret;
-+}
-+
-+static int cfe_remove(struct platform_device *pdev)
-+{
-+	struct cfe_device *cfe = platform_get_drvdata(pdev);
-+
-+	debugfs_remove(cfe->debugfs);
-+
-+	v4l2_async_nf_unregister(&cfe->notifier);
-+	media_device_unregister(&cfe->mdev);
-+	cfe_unregister_nodes(cfe);
-+
-+	pisp_fe_uninit(&cfe->fe);
-+	csi2_uninit(&cfe->csi2);
-+
-+	pm_runtime_disable(&pdev->dev);
-+
-+	v4l2_device_unregister(&cfe->v4l2_dev);
-+
-+	return 0;
-+}
-+
-+static int cfe_runtime_suspend(struct device *dev)
-+{
-+	struct platform_device *pdev = to_platform_device(dev);
-+	struct cfe_device *cfe = platform_get_drvdata(pdev);
-+
-+	clk_disable_unprepare(cfe->clk);
-+
-+	return 0;
-+}
-+
-+static int cfe_runtime_resume(struct device *dev)
-+{
-+	struct platform_device *pdev = to_platform_device(dev);
-+	struct cfe_device *cfe = platform_get_drvdata(pdev);
-+	int ret;
-+
-+	ret = clk_prepare_enable(cfe->clk);
-+	if (ret) {
-+		dev_err(dev, "Unable to enable clock\n");
-+		return ret;
-+	}
-+
-+	return 0;
-+}
-+
-+static const struct dev_pm_ops cfe_pm_ops = {
-+	SET_RUNTIME_PM_OPS(cfe_runtime_suspend, cfe_runtime_resume, NULL)
-+	SET_LATE_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume)
-+};
-+
-+static const struct of_device_id cfe_of_match[] = {
-+	{ .compatible = "raspberrypi,rp1-cfe" },
-+	{ /* sentinel */ },
-+};
-+MODULE_DEVICE_TABLE(of, cfe_of_match);
-+
-+static struct platform_driver cfe_driver = {
-+	.probe		= cfe_probe,
-+	.remove		= cfe_remove,
-+	.driver = {
-+		.name	= CFE_MODULE_NAME,
-+		.of_match_table = cfe_of_match,
-+		.pm = &cfe_pm_ops,
-+	},
-+};
-+
-+module_platform_driver(cfe_driver);
-+
-+MODULE_AUTHOR("Naushir Patuck <naush@raspberrypi.com>");
-+MODULE_DESCRIPTION("RP1 Camera Front End driver");
-+MODULE_LICENSE("GPL");
-+MODULE_VERSION(CFE_VERSION);
---- /dev/null
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe.h
-@@ -0,0 +1,40 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * RP1 CFE driver.
-+ * Copyright (c) 2021 Raspberry Pi Ltd.
-+ *
-+ */
-+#ifndef _RP1_CFE_
-+#define _RP1_CFE_
-+
-+#include <linux/types.h>
-+#include <linux/media-bus-format.h>
-+#include <linux/videodev2.h>
-+
-+extern bool cfe_debug_irq;
-+
-+enum cfe_remap_types {
-+	CFE_REMAP_16BIT,
-+	CFE_REMAP_COMPRESSED,
-+	CFE_NUM_REMAP,
-+};
-+
-+#define CFE_FORMAT_FLAG_META_OUT	BIT(0)
-+#define CFE_FORMAT_FLAG_META_CAP	BIT(1)
-+#define CFE_FORMAT_FLAG_FE_OUT		BIT(2)
-+
-+struct cfe_fmt {
-+	u32 fourcc;
-+	u32 code;
-+	u8 depth;
-+	u8 csi_dt;
-+	u32 remap[CFE_NUM_REMAP];
-+	u32 flags;
-+};
-+
-+extern const struct v4l2_mbus_framefmt cfe_default_format;
-+extern const struct v4l2_mbus_framefmt cfe_default_meta_format;
-+
-+const struct cfe_fmt *find_format_by_code(u32 code);
-+
-+#endif
---- /dev/null
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe_fmts.h
-@@ -0,0 +1,294 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * RP1 Camera Front End formats definition
-+ *
-+ * Copyright (C) 2021 - Raspberry Pi Ltd.
-+ *
-+ */
-+#ifndef _CFE_FMTS_H_
-+#define _CFE_FMTS_H_
-+
-+#include "cfe.h"
-+
-+static const struct cfe_fmt formats[] = {
-+	/* YUV Formats */
-+	{
-+		.fourcc = V4L2_PIX_FMT_YUYV,
-+		.code = MEDIA_BUS_FMT_YUYV8_1X16,
-+		.depth = 16,
-+		.csi_dt = 0x1e,
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_UYVY,
-+		.code = MEDIA_BUS_FMT_UYVY8_1X16,
-+		.depth = 16,
-+		.csi_dt = 0x1e,
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_YVYU,
-+		.code = MEDIA_BUS_FMT_YVYU8_1X16,
-+		.depth = 16,
-+		.csi_dt = 0x1e,
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_VYUY,
-+		.code = MEDIA_BUS_FMT_VYUY8_1X16,
-+		.depth = 16,
-+		.csi_dt = 0x1e,
-+	},
-+	{
-+		/* RGB Formats */
-+		.fourcc = V4L2_PIX_FMT_RGB565, /* gggbbbbb rrrrrggg */
-+		.code = MEDIA_BUS_FMT_RGB565_2X8_LE,
-+		.depth = 16,
-+		.csi_dt = 0x22,
-+	},
-+	{	.fourcc = V4L2_PIX_FMT_RGB565X, /* rrrrrggg gggbbbbb */
-+		.code = MEDIA_BUS_FMT_RGB565_2X8_BE,
-+		.depth = 16,
-+		.csi_dt = 0x22
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_RGB555, /* gggbbbbb arrrrrgg */
-+		.code = MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE,
-+		.depth = 16,
-+		.csi_dt = 0x21,
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_RGB555X, /* arrrrrgg gggbbbbb */
-+		.code = MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE,
-+		.depth = 16,
-+		.csi_dt = 0x21,
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_RGB24, /* rgb */
-+		.code = MEDIA_BUS_FMT_RGB888_1X24,
-+		.depth = 24,
-+		.csi_dt = 0x24,
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_BGR24, /* bgr */
-+		.code = MEDIA_BUS_FMT_BGR888_1X24,
-+		.depth = 24,
-+		.csi_dt = 0x24,
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_RGB32, /* argb */
-+		.code = MEDIA_BUS_FMT_ARGB8888_1X32,
-+		.depth = 32,
-+		.csi_dt = 0x0,
-+	},
-+
-+	/* Bayer Formats */
-+	{
-+		.fourcc = V4L2_PIX_FMT_SBGGR8,
-+		.code = MEDIA_BUS_FMT_SBGGR8_1X8,
-+		.depth = 8,
-+		.csi_dt = 0x2a,
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_SGBRG8,
-+		.code = MEDIA_BUS_FMT_SGBRG8_1X8,
-+		.depth = 8,
-+		.csi_dt = 0x2a,
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_SGRBG8,
-+		.code = MEDIA_BUS_FMT_SGRBG8_1X8,
-+		.depth = 8,
-+		.csi_dt = 0x2a,
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_SRGGB8,
-+		.code = MEDIA_BUS_FMT_SRGGB8_1X8,
-+		.depth = 8,
-+		.csi_dt = 0x2a,
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_SBGGR10P,
-+		.code = MEDIA_BUS_FMT_SBGGR10_1X10,
-+		.depth = 10,
-+		.csi_dt = 0x2b,
-+		.remap = { V4L2_PIX_FMT_SBGGR16, V4L2_PIX_FMT_PISP_COMP1_BGGR },
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_SGBRG10P,
-+		.code = MEDIA_BUS_FMT_SGBRG10_1X10,
-+		.depth = 10,
-+		.csi_dt = 0x2b,
-+		.remap = { V4L2_PIX_FMT_SGBRG16, V4L2_PIX_FMT_PISP_COMP1_GBRG },
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_SGRBG10P,
-+		.code = MEDIA_BUS_FMT_SGRBG10_1X10,
-+		.depth = 10,
-+		.csi_dt = 0x2b,
-+		.remap = { V4L2_PIX_FMT_SGRBG16, V4L2_PIX_FMT_PISP_COMP1_GRBG },
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_SRGGB10P,
-+		.code = MEDIA_BUS_FMT_SRGGB10_1X10,
-+		.depth = 10,
-+		.csi_dt = 0x2b,
-+		.remap = { V4L2_PIX_FMT_SRGGB16, V4L2_PIX_FMT_PISP_COMP1_RGGB },
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_SBGGR12P,
-+		.code = MEDIA_BUS_FMT_SBGGR12_1X12,
-+		.depth = 12,
-+		.csi_dt = 0x2c,
-+		.remap = { V4L2_PIX_FMT_SBGGR16, V4L2_PIX_FMT_PISP_COMP1_BGGR },
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_SGBRG12P,
-+		.code = MEDIA_BUS_FMT_SGBRG12_1X12,
-+		.depth = 12,
-+		.csi_dt = 0x2c,
-+		.remap = { V4L2_PIX_FMT_SGBRG16, V4L2_PIX_FMT_PISP_COMP1_GBRG },
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_SGRBG12P,
-+		.code = MEDIA_BUS_FMT_SGRBG12_1X12,
-+		.depth = 12,
-+		.csi_dt = 0x2c,
-+		.remap = { V4L2_PIX_FMT_SGRBG16, V4L2_PIX_FMT_PISP_COMP1_GRBG },
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_SRGGB12P,
-+		.code = MEDIA_BUS_FMT_SRGGB12_1X12,
-+		.depth = 12,
-+		.csi_dt = 0x2c,
-+		.remap = { V4L2_PIX_FMT_SRGGB16, V4L2_PIX_FMT_PISP_COMP1_RGGB },
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_SBGGR14P,
-+		.code = MEDIA_BUS_FMT_SBGGR14_1X14,
-+		.depth = 14,
-+		.csi_dt = 0x2d,
-+		.remap = { V4L2_PIX_FMT_SBGGR16, V4L2_PIX_FMT_PISP_COMP1_BGGR },
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_SGBRG14P,
-+		.code = MEDIA_BUS_FMT_SGBRG14_1X14,
-+		.depth = 14,
-+		.csi_dt = 0x2d,
-+		.remap = { V4L2_PIX_FMT_SGBRG16, V4L2_PIX_FMT_PISP_COMP1_GBRG },
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_SGRBG14P,
-+		.code = MEDIA_BUS_FMT_SGRBG14_1X14,
-+		.depth = 14,
-+		.csi_dt = 0x2d,
-+		.remap = { V4L2_PIX_FMT_SGRBG16, V4L2_PIX_FMT_PISP_COMP1_GRBG },
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_SRGGB14P,
-+		.code = MEDIA_BUS_FMT_SRGGB14_1X14,
-+		.depth = 14,
-+		.csi_dt = 0x2d,
-+		.remap = { V4L2_PIX_FMT_SRGGB16, V4L2_PIX_FMT_PISP_COMP1_RGGB },
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_SBGGR16,
-+		.code = MEDIA_BUS_FMT_SBGGR16_1X16,
-+		.depth = 16,
-+		.flags = CFE_FORMAT_FLAG_FE_OUT,
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_SGBRG16,
-+		.code = MEDIA_BUS_FMT_SGBRG16_1X16,
-+		.depth = 16,
-+		.flags = CFE_FORMAT_FLAG_FE_OUT,
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_SGRBG16,
-+		.code = MEDIA_BUS_FMT_SGRBG16_1X16,
-+		.depth = 16,
-+		.flags = CFE_FORMAT_FLAG_FE_OUT,
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_SRGGB16,
-+		.code = MEDIA_BUS_FMT_SRGGB16_1X16,
-+		.depth = 16,
-+		.flags = CFE_FORMAT_FLAG_FE_OUT,
-+	},
-+	/* PiSP Compressed Mode 1 */
-+	{
-+		.fourcc = V4L2_PIX_FMT_PISP_COMP1_RGGB,
-+		.code = MEDIA_BUS_FMT_PISP_COMP1_RGGB,
-+		.depth = 8,
-+		.flags = CFE_FORMAT_FLAG_FE_OUT,
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_PISP_COMP1_BGGR,
-+		.code = MEDIA_BUS_FMT_PISP_COMP1_BGGR,
-+		.depth = 8,
-+		.flags = CFE_FORMAT_FLAG_FE_OUT,
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_PISP_COMP1_GBRG,
-+		.code = MEDIA_BUS_FMT_PISP_COMP1_GBRG,
-+		.depth = 8,
-+		.flags = CFE_FORMAT_FLAG_FE_OUT,
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_PISP_COMP1_GRBG,
-+		.code = MEDIA_BUS_FMT_PISP_COMP1_GRBG,
-+		.depth = 8,
-+		.flags = CFE_FORMAT_FLAG_FE_OUT,
-+	},
-+	/* Greyscale format */
-+	{
-+		.fourcc = V4L2_PIX_FMT_GREY,
-+		.code = MEDIA_BUS_FMT_Y8_1X8,
-+		.depth = 8,
-+		.csi_dt = 0x2a,
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_Y10P,
-+		.code = MEDIA_BUS_FMT_Y10_1X10,
-+		.depth = 10,
-+		.csi_dt = 0x2b,
-+		.remap = { V4L2_PIX_FMT_Y16 },
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_Y12P,
-+		.code = MEDIA_BUS_FMT_Y12_1X12,
-+		.depth = 12,
-+		.csi_dt = 0x2c,
-+		.remap = { V4L2_PIX_FMT_Y16 },
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_Y14P,
-+		.code = MEDIA_BUS_FMT_Y14_1X14,
-+		.depth = 14,
-+		.csi_dt = 0x2d,
-+		.remap = { V4L2_PIX_FMT_Y16 },
-+	},
-+	{
-+		.fourcc = V4L2_PIX_FMT_Y16,
-+		.depth = 16,
-+		.flags = CFE_FORMAT_FLAG_FE_OUT,
-+	},
-+
-+	/* Embedded data format */
-+	{
-+		.fourcc = V4L2_META_FMT_SENSOR_DATA,
-+		.code = MEDIA_BUS_FMT_SENSOR_DATA,
-+		.depth = 8,
-+		.csi_dt = 0x12,
-+		.flags = CFE_FORMAT_FLAG_META_CAP,
-+	},
-+
-+	/* Frontend formats */
-+	{
-+		.fourcc = V4L2_META_FMT_RPI_FE_CFG,
-+		.flags = CFE_FORMAT_FLAG_META_OUT,
-+	},
-+	{
-+		.fourcc = V4L2_META_FMT_RPI_FE_STATS,
-+		.flags = CFE_FORMAT_FLAG_META_CAP,
-+	},
-+};
-+
-+#endif /* _CFE_FMTS_H_ */
---- /dev/null
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/csi2.c
-@@ -0,0 +1,446 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+/*
-+ * RP1 CSI-2 Driver
-+ *
-+ * Copyright (C) 2021 - Raspberry Pi Ltd.
-+ *
-+ */
-+
-+#include <linux/delay.h>
-+#include <linux/moduleparam.h>
-+#include <linux/pm_runtime.h>
-+#include <linux/seq_file.h>
-+
-+#include <media/videobuf2-dma-contig.h>
-+
-+#include "csi2.h"
-+#include "cfe.h"
-+
-+#define csi2_dbg_irq(fmt, arg...)                                 \
-+	do {                                                      \
-+		if (cfe_debug_irq)                                \
-+			dev_dbg(csi2->v4l2_dev->dev, fmt, ##arg); \
-+	} while (0)
-+#define csi2_dbg(fmt, arg...) dev_dbg(csi2->v4l2_dev->dev, fmt, ##arg)
-+#define csi2_info(fmt, arg...) dev_info(csi2->v4l2_dev->dev, fmt, ##arg)
-+#define csi2_err(fmt, arg...) dev_err(csi2->v4l2_dev->dev, fmt, ##arg)
-+
-+/* CSI2-DMA registers */
-+#define CSI2_STATUS		0x000
-+#define CSI2_QOS		0x004
-+#define CSI2_DISCARDS_OVERFLOW	0x008
-+#define CSI2_DISCARDS_INACTIVE	0x00c
-+#define CSI2_DISCARDS_UNMATCHED	0x010
-+#define CSI2_DISCARDS_LEN_LIMIT	0x014
-+#define CSI2_LLEV_PANICS	0x018
-+#define CSI2_ULEV_PANICS	0x01c
-+#define CSI2_IRQ_MASK		0x020
-+#define CSI2_CTRL		0x024
-+#define CSI2_CH_CTRL(x)		((x) * 0x40 + 0x28)
-+#define CSI2_CH_ADDR0(x)	((x) * 0x40 + 0x2c)
-+#define CSI2_CH_ADDR1(x)	((x) * 0x40 + 0x3c)
-+#define CSI2_CH_STRIDE(x)	((x) * 0x40 + 0x30)
-+#define CSI2_CH_LENGTH(x)	((x) * 0x40 + 0x34)
-+#define CSI2_CH_DEBUG(x)	((x) * 0x40 + 0x38)
-+#define CSI2_CH_FRAME_SIZE(x)	((x) * 0x40 + 0x40)
-+#define CSI2_CH_COMP_CTRL(x)	((x) * 0x40 + 0x44)
-+#define CSI2_CH_FE_FRAME_ID(x)	((x) * 0x40 + 0x48)
-+
-+/* CSI2_STATUS */
-+#define IRQ_FS(x)		(BIT(0) << (x))
-+#define IRQ_FE(x)		(BIT(4) << (x))
-+#define IRQ_FE_ACK(x)		(BIT(8) << (x))
-+#define IRQ_LE(x)		(BIT(12) << (x))
-+#define IRQ_LE_ACK(x)		(BIT(16) << (x))
-+#define IRQ_CH_MASK(x)		(IRQ_FS(x) | IRQ_FE(x) | IRQ_FE_ACK(x) | IRQ_LE(x) | IRQ_LE_ACK(x))
-+#define IRQ_OVERFLOW		BIT(20)
-+#define IRQ_DISCARD_OVERFLOW	BIT(21)
-+#define IRQ_DISCARD_LEN_LIMIT	BIT(22)
-+#define IRQ_DISCARD_UNMATCHED	BIT(23)
-+#define IRQ_DISCARD_INACTIVE	BIT(24)
-+
-+/* CSI2_CTRL */
-+#define EOP_IS_EOL		BIT(0)
-+
-+/* CSI2_CH_CTRL */
-+#define DMA_EN			BIT(0)
-+#define FORCE			BIT(3)
-+#define AUTO_ARM		BIT(4)
-+#define IRQ_EN_FS		BIT(13)
-+#define IRQ_EN_FE		BIT(14)
-+#define IRQ_EN_FE_ACK		BIT(15)
-+#define IRQ_EN_LE		BIT(16)
-+#define IRQ_EN_LE_ACK		BIT(17)
-+#define FLUSH_FE		BIT(28)
-+#define PACK_LINE		BIT(29)
-+#define PACK_BYTES		BIT(30)
-+#define CH_MODE_MASK		GENMASK(2, 1)
-+#define VC_MASK			GENMASK(6, 5)
-+#define DT_MASK			GENMASK(12, 7)
-+#define LC_MASK			GENMASK(27, 18)
-+
-+/* CHx_COMPRESSION_CONTROL */
-+#define COMP_OFFSET_MASK	GENMASK(15, 0)
-+#define COMP_SHIFT_MASK		GENMASK(19, 16)
-+#define COMP_MODE_MASK		GENMASK(25, 24)
-+
-+static inline u32 csi2_reg_read(struct csi2_device *csi2, u32 offset)
-+{
-+	return readl(csi2->base + offset);
-+}
-+
-+static inline void csi2_reg_write(struct csi2_device *csi2, u32 offset, u32 val)
-+{
-+	writel(val, csi2->base + offset);
-+}
-+
-+static inline void set_field(u32 *valp, u32 field, u32 mask)
-+{
-+	u32 val = *valp;
-+
-+	val &= ~mask;
-+	val |= (field << __ffs(mask)) & mask;
-+	*valp = val;
-+}
-+
-+static int csi2_regs_show(struct seq_file *s, void *data)
-+{
-+	struct csi2_device *csi2 = s->private;
-+	unsigned int i;
-+	int ret;
-+
-+	ret = pm_runtime_resume_and_get(csi2->v4l2_dev->dev);
-+	if (ret)
-+		return ret;
-+
-+#define DUMP(reg) seq_printf(s, #reg " \t0x%08x\n", csi2_reg_read(csi2, reg))
-+#define DUMP_CH(idx, reg) seq_printf(s, #reg "(%u) \t0x%08x\n", idx, csi2_reg_read(csi2, reg(idx)))
-+
-+	DUMP(CSI2_STATUS);
-+	DUMP(CSI2_DISCARDS_OVERFLOW);
-+	DUMP(CSI2_DISCARDS_INACTIVE);
-+	DUMP(CSI2_DISCARDS_UNMATCHED);
-+	DUMP(CSI2_DISCARDS_LEN_LIMIT);
-+	DUMP(CSI2_LLEV_PANICS);
-+	DUMP(CSI2_ULEV_PANICS);
-+	DUMP(CSI2_IRQ_MASK);
-+	DUMP(CSI2_CTRL);
-+
-+	for (i = 0; i < CSI2_NUM_CHANNELS; ++i) {
-+		DUMP_CH(i, CSI2_CH_CTRL);
-+		DUMP_CH(i, CSI2_CH_ADDR0);
-+		DUMP_CH(i, CSI2_CH_ADDR1);
-+		DUMP_CH(i, CSI2_CH_STRIDE);
-+		DUMP_CH(i, CSI2_CH_LENGTH);
-+		DUMP_CH(i, CSI2_CH_DEBUG);
-+		DUMP_CH(i, CSI2_CH_FRAME_SIZE);
-+		DUMP_CH(i, CSI2_CH_COMP_CTRL);
-+		DUMP_CH(i, CSI2_CH_FE_FRAME_ID);
-+	}
-+
-+#undef DUMP
-+#undef DUMP_CH
-+
-+	pm_runtime_put(csi2->v4l2_dev->dev);
-+
-+	return 0;
-+}
-+
-+DEFINE_SHOW_ATTRIBUTE(csi2_regs);
-+
-+void csi2_isr(struct csi2_device *csi2, bool *sof, bool *eof, bool *lci)
-+{
-+	unsigned int i;
-+	u32 status;
-+
-+	status = csi2_reg_read(csi2, CSI2_STATUS);
-+	csi2_dbg_irq("ISR: STA: 0x%x\n", status);
-+
-+	/* Write value back to clear the interrupts */
-+	csi2_reg_write(csi2, CSI2_STATUS, status);
-+
-+	for (i = 0; i < CSI2_NUM_CHANNELS; i++) {
-+		u32 dbg;
-+
-+		if ((status & IRQ_CH_MASK(i)) == 0)
-+			continue;
-+
-+		dbg = csi2_reg_read(csi2, CSI2_CH_DEBUG(i));
-+
-+		csi2_dbg_irq("ISR: [%u], %s%s%s%s%s frame: %u line: %u\n", i,
-+			     (status & IRQ_FS(i)) ? "FS " : "",
-+			     (status & IRQ_FE(i)) ? "FE " : "",
-+			     (status & IRQ_FE_ACK(i)) ? "FE_ACK " : "",
-+			     (status & IRQ_LE(i)) ? "LE " : "",
-+			     (status & IRQ_LE_ACK(i)) ? "LE_ACK " : "",
-+			     dbg >> 16,
-+			     csi2->num_lines[i] ?
-+				     ((dbg & 0xffff) % csi2->num_lines[i]) :
-+				     0);
-+
-+		sof[i] = !!(status & IRQ_FS(i));
-+		eof[i] = !!(status & IRQ_FE_ACK(i));
-+		lci[i] = !!(status & IRQ_LE_ACK(i));
-+	}
-+}
-+
-+void csi2_set_buffer(struct csi2_device *csi2, unsigned int channel,
-+		     dma_addr_t dmaaddr, unsigned int stride, unsigned int size)
-+{
-+	u64 addr = dmaaddr;
-+	/*
-+	 * ADDRESS0 must be written last as it triggers the double buffering
-+	 * mechanism for all buffer registers within the hardware.
-+	 */
-+	addr >>= 4;
-+	csi2_reg_write(csi2, CSI2_CH_LENGTH(channel), size >> 4);
-+	csi2_reg_write(csi2, CSI2_CH_STRIDE(channel), stride >> 4);
-+	csi2_reg_write(csi2, CSI2_CH_ADDR1(channel), addr >> 32);
-+	csi2_reg_write(csi2, CSI2_CH_ADDR0(channel), addr & 0xffffffff);
-+}
-+
-+void csi2_set_compression(struct csi2_device *csi2, unsigned int channel,
-+			  enum csi2_compression_mode mode, unsigned int shift,
-+			  unsigned int offset)
-+{
-+	u32 compression = 0;
-+
-+	set_field(&compression, COMP_OFFSET_MASK, offset);
-+	set_field(&compression, COMP_SHIFT_MASK, shift);
-+	set_field(&compression, COMP_MODE_MASK, mode);
-+	csi2_reg_write(csi2, CSI2_CH_COMP_CTRL(channel), compression);
-+}
-+
-+void csi2_start_channel(struct csi2_device *csi2, unsigned int channel,
-+			u16 dt, enum csi2_mode mode, bool auto_arm,
-+			bool pack_bytes, unsigned int width,
-+			unsigned int height)
-+{
-+	u32 ctrl;
-+
-+	csi2_dbg("%s [%u]\n", __func__, channel);
-+
-+	/*
-+	 * Disable the channel, but ensure N != 0!  Otherwise we end up with a
-+	 * spurious LE + LE_ACK interrupt when re-enabling the channel.
-+	 */
-+	csi2_reg_write(csi2, CSI2_CH_CTRL(channel), 0x100 << __ffs(LC_MASK));
-+	csi2_reg_write(csi2, CSI2_CH_DEBUG(channel), 0);
-+	csi2_reg_write(csi2, CSI2_STATUS, IRQ_CH_MASK(channel));
-+
-+	/* Enable channel and FS/FE/LE interrupts. */
-+	ctrl = DMA_EN | IRQ_EN_FS | IRQ_EN_FE_ACK | IRQ_EN_LE_ACK | PACK_LINE;
-+	/* PACK_BYTES ensures no striding for embedded data. */
-+	if (pack_bytes)
-+		ctrl |= PACK_BYTES;
-+
-+	if (auto_arm)
-+		ctrl |= AUTO_ARM;
-+
-+	if (width && height) {
-+		int line_int_freq = height >> 2;
-+
-+		line_int_freq = min(max(0x80, line_int_freq), 0x3ff);
-+		set_field(&ctrl, line_int_freq, LC_MASK);
-+		set_field(&ctrl, mode, CH_MODE_MASK);
-+		csi2_reg_write(csi2, CSI2_CH_FRAME_SIZE(channel),
-+			       (height << 16) | width);
-+	} else {
-+		/*
-+		 * Do not disable line interrupts for the embedded data channel,
-+		 * set it to the maximum value.  This avoids spamming the ISR
-+		 * with spurious line interrupts.
-+		 */
-+		set_field(&ctrl, 0x3ff, LC_MASK);
-+		set_field(&ctrl, 0x00, CH_MODE_MASK);
-+	}
-+
-+	set_field(&ctrl, dt, DT_MASK);
-+	csi2_reg_write(csi2, CSI2_CH_CTRL(channel), ctrl);
-+	csi2->num_lines[channel] = height;
-+}
-+
-+void csi2_stop_channel(struct csi2_device *csi2, unsigned int channel)
-+{
-+	csi2_dbg("%s [%u]\n", __func__, channel);
-+
-+	/* Channel disable.  Use FORCE to allow stopping mid-frame. */
-+	csi2_reg_write(csi2, CSI2_CH_CTRL(channel),
-+		       (0x100 << __ffs(LC_MASK)) | FORCE);
-+	/* Latch the above change by writing to the ADDR0 register. */
-+	csi2_reg_write(csi2, CSI2_CH_ADDR0(channel), 0);
-+	/* Write this again, the HW needs it! */
-+	csi2_reg_write(csi2, CSI2_CH_ADDR0(channel), 0);
-+}
-+
-+void csi2_open_rx(struct csi2_device *csi2)
-+{
-+	dphy_start(&csi2->dphy);
-+
-+	if (!csi2->multipacket_line)
-+		csi2_reg_write(csi2, CSI2_CTRL, EOP_IS_EOL);
-+}
-+
-+void csi2_close_rx(struct csi2_device *csi2)
-+{
-+	dphy_stop(&csi2->dphy);
-+}
-+
-+static struct csi2_device *to_csi2_device(struct v4l2_subdev *subdev)
-+{
-+	return container_of(subdev, struct csi2_device, sd);
-+}
-+
-+static int csi2_init_cfg(struct v4l2_subdev *sd,
-+			 struct v4l2_subdev_state *state)
-+{
-+	struct v4l2_mbus_framefmt *fmt;
-+
-+	for (unsigned int i = 0; i < CSI2_NUM_CHANNELS; ++i) {
-+		const struct v4l2_mbus_framefmt *def_fmt;
-+
-+		/* CSI2_CH1_EMBEDDED */
-+		if (i == 1)
-+			def_fmt = &cfe_default_meta_format;
-+		else
-+			def_fmt = &cfe_default_format;
-+
-+		fmt = v4l2_subdev_get_pad_format(sd, state, i);
-+		*fmt = *def_fmt;
-+
-+		fmt = v4l2_subdev_get_pad_format(sd, state, i + CSI2_NUM_CHANNELS);
-+		*fmt = *def_fmt;
-+	}
-+
-+	return 0;
-+}
-+
-+static int csi2_pad_set_fmt(struct v4l2_subdev *sd,
-+			    struct v4l2_subdev_state *state,
-+			    struct v4l2_subdev_format *format)
-+{
-+	struct v4l2_mbus_framefmt *fmt;
-+	const struct cfe_fmt *cfe_fmt;
-+
-+	/* TODO: format validation */
-+
-+	cfe_fmt = find_format_by_code(format->format.code);
-+	if (!cfe_fmt)
-+		cfe_fmt = find_format_by_code(MEDIA_BUS_FMT_SBGGR10_1X10);
-+
-+	format->format.code = cfe_fmt->code;
-+
-+	fmt = v4l2_subdev_get_pad_format(sd, state, format->pad);
-+	*fmt = format->format;
-+
-+	if (format->pad < CSI2_NUM_CHANNELS) {
-+		/* Propagate to the source pad */
-+		fmt = v4l2_subdev_get_pad_format(sd, state,
-+						 format->pad + CSI2_NUM_CHANNELS);
-+		*fmt = format->format;
-+	}
-+
-+	return 0;
-+}
-+
-+static int csi2_link_validate(struct v4l2_subdev *sd, struct media_link *link,
-+			      struct v4l2_subdev_format *source_fmt,
-+			      struct v4l2_subdev_format *sink_fmt)
-+{
-+	struct csi2_device *csi2 = to_csi2_device(sd);
-+
-+	csi2_dbg("%s: link \"%s\":%u -> \"%s\":%u\n", __func__,
-+		 link->source->entity->name, link->source->index,
-+		 link->sink->entity->name, link->sink->index);
-+
-+	if ((link->source->entity == &csi2->sd.entity &&
-+	     link->source->index == 1) ||
-+	    (link->sink->entity == &csi2->sd.entity &&
-+	     link->sink->index == 1)) {
-+		csi2_dbg("Ignore metadata pad for now\n");
-+		return 0;
-+	}
-+
-+	/* The width, height and code must match. */
-+	if (source_fmt->format.width != sink_fmt->format.width ||
-+	    source_fmt->format.width != sink_fmt->format.width ||
-+	    source_fmt->format.code != sink_fmt->format.code) {
-+		csi2_err("%s: format does not match (source %ux%u 0x%x, sink %ux%u 0x%x)\n",
-+			 __func__,
-+			 source_fmt->format.width, source_fmt->format.height,
-+			 source_fmt->format.code,
-+			 sink_fmt->format.width, sink_fmt->format.height,
-+			 sink_fmt->format.code);
-+		return -EPIPE;
-+	}
-+
-+	return 0;
-+}
-+
-+static const struct v4l2_subdev_pad_ops csi2_subdev_pad_ops = {
-+	.init_cfg = csi2_init_cfg,
-+	.get_fmt = v4l2_subdev_get_fmt,
-+	.set_fmt = csi2_pad_set_fmt,
-+	.link_validate = csi2_link_validate,
-+};
-+
-+static const struct media_entity_operations csi2_entity_ops = {
-+	.link_validate = v4l2_subdev_link_validate,
-+};
-+
-+static const struct v4l2_subdev_ops csi2_subdev_ops = {
-+	.pad = &csi2_subdev_pad_ops,
-+};
-+
-+int csi2_init(struct csi2_device *csi2, struct dentry *debugfs)
-+{
-+	unsigned int i, ret;
-+
-+	csi2->dphy.dev = csi2->v4l2_dev->dev;
-+	dphy_probe(&csi2->dphy);
-+
-+	debugfs_create_file("csi2_regs", 0444, debugfs, csi2, &csi2_regs_fops);
-+
-+	for (i = 0; i < CSI2_NUM_CHANNELS * 2; i++)
-+		csi2->pad[i].flags = i < CSI2_NUM_CHANNELS ?
-+				     MEDIA_PAD_FL_SINK : MEDIA_PAD_FL_SOURCE;
-+
-+	ret = media_entity_pads_init(&csi2->sd.entity, ARRAY_SIZE(csi2->pad),
-+				     csi2->pad);
-+	if (ret)
-+		return ret;
-+
-+	/* Initialize subdev */
-+	v4l2_subdev_init(&csi2->sd, &csi2_subdev_ops);
-+	csi2->sd.entity.function = MEDIA_ENT_F_VID_IF_BRIDGE;
-+	csi2->sd.entity.ops = &csi2_entity_ops;
-+	csi2->sd.flags = V4L2_SUBDEV_FL_HAS_DEVNODE;
-+	csi2->sd.owner = THIS_MODULE;
-+	snprintf(csi2->sd.name, sizeof(csi2->sd.name), "csi2");
-+
-+	ret = v4l2_subdev_init_finalize(&csi2->sd);
-+	if (ret)
-+		goto err_entity_cleanup;
-+
-+	ret = v4l2_device_register_subdev(csi2->v4l2_dev, &csi2->sd);
-+	if (ret) {
-+		csi2_err("Failed register csi2 subdev (%d)\n", ret);
-+		goto err_subdev_cleanup;
-+	}
-+
-+	return 0;
-+
-+err_subdev_cleanup:
-+	v4l2_subdev_cleanup(&csi2->sd);
-+err_entity_cleanup:
-+	media_entity_cleanup(&csi2->sd.entity);
-+
-+	return ret;
-+}
-+
-+void csi2_uninit(struct csi2_device *csi2)
-+{
-+	v4l2_device_unregister_subdev(&csi2->sd);
-+	v4l2_subdev_cleanup(&csi2->sd);
-+	media_entity_cleanup(&csi2->sd.entity);
-+}
---- /dev/null
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/csi2.h
-@@ -0,0 +1,75 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * RP1 CSI-2 driver.
-+ * Copyright (c) 2021 Raspberry Pi Ltd.
-+ *
-+ */
-+#ifndef _RP1_CSI2_
-+#define _RP1_CSI2_
-+
-+#include <linux/debugfs.h>
-+#include <linux/io.h>
-+#include <linux/types.h>
-+#include <media/v4l2-device.h>
-+#include <media/v4l2-subdev.h>
-+
-+#include "dphy.h"
-+
-+#define CSI2_NUM_CHANNELS 4
-+
-+enum csi2_mode {
-+	CSI2_MODE_NORMAL,
-+	CSI2_MODE_REMAP,
-+	CSI2_MODE_COMPRESSED,
-+	CSI2_MODE_FE_STREAMING
-+};
-+
-+enum csi2_compression_mode {
-+	CSI2_COMPRESSION_DELTA = 1,
-+	CSI2_COMPRESSION_SIMPLE = 2,
-+	CSI2_COMPRESSION_COMBINED = 3,
-+};
-+
-+struct csi2_cfg {
-+	u16 width;
-+	u16 height;
-+	u32 stride;
-+	u32 buffer_size;
-+};
-+
-+struct csi2_device {
-+	/* Parent V4l2 device */
-+	struct v4l2_device *v4l2_dev;
-+
-+	void __iomem *base;
-+
-+	struct dphy_data dphy;
-+
-+	enum v4l2_mbus_type bus_type;
-+	unsigned int bus_flags;
-+	u32 active_data_lanes;
-+	bool multipacket_line;
-+	unsigned int num_lines[CSI2_NUM_CHANNELS];
-+
-+	struct media_pad pad[CSI2_NUM_CHANNELS * 2];
-+	struct v4l2_subdev sd;
-+};
-+
-+void csi2_isr(struct csi2_device *csi2, bool *sof, bool *eof, bool *lci);
-+void csi2_set_buffer(struct csi2_device *csi2, unsigned int channel,
-+		     dma_addr_t dmaaddr, unsigned int stride,
-+		     unsigned int size);
-+void csi2_set_compression(struct csi2_device *csi2, unsigned int channel,
-+			  enum csi2_compression_mode mode, unsigned int shift,
-+			  unsigned int offset);
-+void csi2_start_channel(struct csi2_device *csi2, unsigned int channel,
-+			u16 dt, enum csi2_mode mode, bool auto_arm,
-+			bool pack_bytes, unsigned int width,
-+			unsigned int height);
-+void csi2_stop_channel(struct csi2_device *csi2, unsigned int channel);
-+void csi2_open_rx(struct csi2_device *csi2);
-+void csi2_close_rx(struct csi2_device *csi2);
-+int csi2_init(struct csi2_device *csi2, struct dentry *debugfs);
-+void csi2_uninit(struct csi2_device *csi2);
-+
-+#endif
---- /dev/null
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/dphy.c
-@@ -0,0 +1,177 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+/*
-+ * RP1 CSI-2 Driver
-+ *
-+ * Copyright (C) 2021 - Raspberry Pi Ltd.
-+ *
-+ */
-+
-+#include <linux/delay.h>
-+#include <linux/dev_printk.h>
-+#include <linux/pm_runtime.h>
-+
-+#include "dphy.h"
-+
-+#define dphy_dbg(fmt, arg...) dev_dbg(dphy->dev, fmt, ##arg)
-+#define dphy_info(fmt, arg...) dev_info(dphy->dev, fmt, ##arg)
-+#define dphy_err(fmt, arg...) dev_err(dphy->dev, fmt, ##arg)
-+
-+/* DW dphy Host registers */
-+#define VERSION		0x000
-+#define N_LANES		0x004
-+#define RESETN		0x008
-+#define PHY_SHUTDOWNZ	0x040
-+#define PHY_RSTZ	0x044
-+#define PHY_RX		0x048
-+#define	PHY_STOPSTATE	0x04c
-+#define PHY_TST_CTRL0	0x050
-+#define PHY_TST_CTRL1	0x054
-+#define PHY2_TST_CTRL0	0x058
-+#define PHY2_TST_CTRL1	0x05c
-+
-+/* DW dphy Host Transactions */
-+#define DPHY_HS_RX_CTRL_LANE0_OFFSET	0x44
-+#define DPHY_PLL_INPUT_DIV_OFFSET	0x17
-+#define DPHY_PLL_LOOP_DIV_OFFSET	0x18
-+#define DPHY_PLL_DIV_CTRL_OFFSET	0x19
-+
-+static u32 dw_csi2_host_read(struct dphy_data *dphy, u32 offset)
-+{
-+	return readl(dphy->base + offset);
-+}
-+
-+static void dw_csi2_host_write(struct dphy_data *dphy, u32 offset, u32 data)
-+{
-+	writel(data, dphy->base + offset);
-+}
-+
-+static void set_tstclr(struct dphy_data *dphy, u32 val)
-+{
-+	u32 ctrl0 = dw_csi2_host_read(dphy, PHY_TST_CTRL0);
-+
-+	dw_csi2_host_write(dphy, PHY_TST_CTRL0, (ctrl0 & ~1) | val);
-+}
-+
-+static void set_tstclk(struct dphy_data *dphy, u32 val)
-+{
-+	u32 ctrl0 = dw_csi2_host_read(dphy, PHY_TST_CTRL0);
-+
-+	dw_csi2_host_write(dphy, PHY_TST_CTRL0, (ctrl0 & ~2) | (val << 1));
-+}
-+
-+static uint8_t get_tstdout(struct dphy_data *dphy)
-+{
-+	u32 ctrl1 = dw_csi2_host_read(dphy, PHY_TST_CTRL1);
-+
-+	return ((ctrl1 >> 8) & 0xff);
-+}
-+
-+static void set_testen(struct dphy_data *dphy, u32 val)
-+{
-+	u32 ctrl1 = dw_csi2_host_read(dphy, PHY_TST_CTRL1);
-+
-+	dw_csi2_host_write(dphy, PHY_TST_CTRL1,
-+			   (ctrl1 & ~(1 << 16)) | (val << 16));
-+}
-+
-+static void set_testdin(struct dphy_data *dphy, u32 val)
-+{
-+	u32 ctrl1 = dw_csi2_host_read(dphy, PHY_TST_CTRL1);
-+
-+	dw_csi2_host_write(dphy, PHY_TST_CTRL1, (ctrl1 & ~0xff) | val);
-+}
-+
-+static uint8_t dphy_transaction(struct dphy_data *dphy, u8 test_code,
-+				uint8_t test_data)
-+{
-+	/* See page 101 of the MIPI DPHY databook. */
-+	set_tstclk(dphy, 1);
-+	set_testen(dphy, 0);
-+	set_testdin(dphy, test_code);
-+	set_testen(dphy, 1);
-+	set_tstclk(dphy, 0);
-+	set_testen(dphy, 0);
-+	set_testdin(dphy, test_data);
-+	set_tstclk(dphy, 1);
-+	return get_tstdout(dphy);
-+}
-+
-+static void dphy_set_hsfreqrange(struct dphy_data *dphy, uint32_t freq_mhz)
-+{
-+	/* See Table 5-1 on page 65 of dphy databook */
-+	static const u16 hsfreqrange_table[][2] = {
-+		{ 89, 0b000000 },   { 99, 0b010000 },	{ 109, 0b100000 },
-+		{ 129, 0b000001 },  { 139, 0b010001 },	{ 149, 0b100001 },
-+		{ 169, 0b000010 },  { 179, 0b010010 },	{ 199, 0b100010 },
-+		{ 219, 0b000011 },  { 239, 0b010011 },	{ 249, 0b100011 },
-+		{ 269, 0b000100 },  { 299, 0b010100 },	{ 329, 0b000101 },
-+		{ 359, 0b010101 },  { 399, 0b100101 },	{ 449, 0b000110 },
-+		{ 499, 0b010110 },  { 549, 0b000111 },	{ 599, 0b010111 },
-+		{ 649, 0b001000 },  { 699, 0b011000 },	{ 749, 0b001001 },
-+		{ 799, 0b011001 },  { 849, 0b101001 },	{ 899, 0b111001 },
-+		{ 949, 0b001010 },  { 999, 0b011010 },	{ 1049, 0b101010 },
-+		{ 1099, 0b111010 }, { 1149, 0b001011 }, { 1199, 0b011011 },
-+		{ 1249, 0b101011 }, { 1299, 0b111011 }, { 1349, 0b001100 },
-+		{ 1399, 0b011100 }, { 1449, 0b101100 }, { 1500, 0b111100 },
-+	};
-+	unsigned int i;
-+
-+	if (freq_mhz < 80 || freq_mhz > 1500)
-+		dphy_err("DPHY: Frequency %u MHz out of range\n", freq_mhz);
-+
-+	for (i = 0; i < ARRAY_SIZE(hsfreqrange_table) - 1; i++) {
-+		if (freq_mhz <= hsfreqrange_table[i][0])
-+			break;
-+	}
-+
-+	dphy_transaction(dphy, DPHY_HS_RX_CTRL_LANE0_OFFSET,
-+			 hsfreqrange_table[i][1] << 1);
-+}
-+
-+static void dphy_init(struct dphy_data *dphy)
-+{
-+	dw_csi2_host_write(dphy, PHY_RSTZ, 0);
-+	dw_csi2_host_write(dphy, PHY_SHUTDOWNZ, 0);
-+	set_tstclk(dphy, 1);
-+	set_testen(dphy, 0);
-+	set_tstclr(dphy, 1);
-+	usleep_range(15, 20);
-+	set_tstclr(dphy, 0);
-+	usleep_range(15, 20);
-+
-+	dphy_set_hsfreqrange(dphy, dphy->dphy_freq);
-+
-+	usleep_range(5, 10);
-+	dw_csi2_host_write(dphy, PHY_SHUTDOWNZ, 1);
-+	usleep_range(5, 10);
-+	dw_csi2_host_write(dphy, PHY_RSTZ, 1);
-+}
-+
-+void dphy_start(struct dphy_data *dphy)
-+{
-+	dw_csi2_host_write(dphy, N_LANES, (dphy->num_lanes - 1));
-+	dphy_init(dphy);
-+	dw_csi2_host_write(dphy, RESETN, 0xffffffff);
-+	usleep_range(10, 50);
-+}
-+
-+void dphy_stop(struct dphy_data *dphy)
-+{
-+	/* Set only one lane (lane 0) as active (ON) */
-+	dw_csi2_host_write(dphy, N_LANES, 0);
-+	dw_csi2_host_write(dphy, RESETN, 0);
-+}
-+
-+void dphy_probe(struct dphy_data *dphy)
-+{
-+	u32 host_ver;
-+	u8 host_ver_major, host_ver_minor;
-+
-+	host_ver = dw_csi2_host_read(dphy, VERSION);
-+	host_ver_major = (u8)((host_ver >> 24) - '0');
-+	host_ver_minor = (u8)((host_ver >> 16) - '0');
-+	host_ver_minor = host_ver_minor * 10;
-+	host_ver_minor += (u8)((host_ver >> 8) - '0');
-+
-+	dphy_info("DW dphy Host HW v%u.%u\n", host_ver_major, host_ver_minor);
-+}
---- /dev/null
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/dphy.h
-@@ -0,0 +1,26 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * Copyright (c) 2021 Raspberry Pi Ltd.
-+ *
-+ */
-+
-+#ifndef _RP1_DPHY_
-+#define _RP1_DPHY_
-+
-+#include <linux/io.h>
-+#include <linux/types.h>
-+
-+struct dphy_data {
-+	struct device *dev;
-+
-+	void __iomem *base;
-+
-+	u32 dphy_freq;
-+	u32 num_lanes;
-+};
-+
-+void dphy_probe(struct dphy_data *dphy);
-+void dphy_start(struct dphy_data *dphy);
-+void dphy_stop(struct dphy_data *dphy);
-+
-+#endif
---- /dev/null
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/pisp_common.h
-@@ -0,0 +1,69 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * RP1 PiSP common definitions.
-+ *
-+ * Copyright (C) 2021 - Raspberry Pi Ltd.
-+ *
-+ */
-+#ifndef _PISP_COMMON_H_
-+#define _PISP_COMMON_H_
-+
-+#include "pisp_types.h"
-+
-+struct pisp_bla_config {
-+	u16 black_level_r;
-+	u16 black_level_gr;
-+	u16 black_level_gb;
-+	u16 black_level_b;
-+	u16 output_black_level;
-+	u8 pad[2];
-+};
-+
-+struct pisp_wbg_config {
-+	u16 gain_r;
-+	u16 gain_g;
-+	u16 gain_b;
-+	u8 pad[2];
-+};
-+
-+struct pisp_compress_config {
-+	/* value subtracted from incoming data */
-+	u16 offset;
-+	u8 pad;
-+	/* 1 => Companding; 2 => Delta (recommended); 3 => Combined (for HDR) */
-+	u8 mode;
-+};
-+
-+struct pisp_decompress_config {
-+	/* value added to reconstructed data */
-+	u16 offset;
-+	u8 pad;
-+	/* 1 => Companding; 2 => Delta (recommended); 3 => Combined (for HDR) */
-+	u8 mode;
-+};
-+
-+enum pisp_axi_flags {
-+	/*
-+	 * round down bursts to end at a 32-byte boundary, to align following
-+	 * bursts
-+	 */
-+	PISP_AXI_FLAG_ALIGN = 128,
-+	/* for FE writer: force WSTRB high, to pad output to 16-byte boundary */
-+	PISP_AXI_FLAG_PAD = 64,
-+	/* for FE writer: Use Output FIFO level to trigger "panic" */
-+	PISP_AXI_FLAG_PANIC = 32,
-+};
-+
-+struct pisp_axi_config {
-+	/*
-+	 * burst length minus one, which must be in the range 0:15; OR'd with
-+	 * flags
-+	 */
-+	u8 maxlen_flags;
-+	/* { prot[2:0], cache[3:0] } fields, echoed on AXI bus */
-+	u8 cache_prot;
-+	/* QoS field(s) (4x4 bits for FE writer; 4 bits for other masters) */
-+	u16 qos;
-+};
-+
-+#endif /* _PISP_COMMON_H_ */
---- /dev/null
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/pisp_fe.c
-@@ -0,0 +1,563 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * PiSP Front End driver.
-+ * Copyright (c) 2021 Raspberry Pi Ltd.
-+ *
-+ */
-+
-+#include <linux/bitops.h>
-+#include <linux/delay.h>
-+#include <linux/moduleparam.h>
-+#include <linux/pm_runtime.h>
-+#include <linux/seq_file.h>
-+
-+#include <media/videobuf2-dma-contig.h>
-+
-+#include "pisp_fe.h"
-+#include "cfe.h"
-+
-+#define FE_VERSION		0x000
-+#define FE_CONTROL		0x004
-+#define FE_STATUS		0x008
-+#define FE_FRAME_STATUS		0x00c
-+#define FE_ERROR_STATUS		0x010
-+#define FE_OUTPUT_STATUS	0x014
-+#define FE_INT_EN		0x018
-+#define FE_INT_STATUS		0x01c
-+
-+/* CONTROL */
-+#define FE_CONTROL_QUEUE	BIT(0)
-+#define FE_CONTROL_ABORT	BIT(1)
-+#define FE_CONTROL_RESET	BIT(2)
-+#define FE_CONTROL_LATCH_REGS	BIT(3)
-+
-+/* INT_EN / INT_STATUS */
-+#define FE_INT_EOF		BIT(0)
-+#define FE_INT_SOF		BIT(1)
-+#define FE_INT_LINES0		BIT(8)
-+#define FE_INT_LINES1		BIT(9)
-+#define FE_INT_STATS		BIT(16)
-+#define FE_INT_QREADY		BIT(24)
-+
-+/* STATUS */
-+#define FE_STATUS_QUEUED	BIT(0)
-+#define FE_STATUS_WAITING	BIT(1)
-+#define FE_STATUS_ACTIVE	BIT(2)
-+
-+#define PISP_FE_CONFIG_BASE_OFFSET	0x0040
-+
-+#define PISP_FE_ENABLE_STATS_CLUSTER \
-+	(PISP_FE_ENABLE_STATS_CROP | PISP_FE_ENABLE_DECIMATE    | \
-+	 PISP_FE_ENABLE_BLC        | PISP_FE_ENABLE_CDAF_STATS  | \
-+	 PISP_FE_ENABLE_AWB_STATS  | PISP_FE_ENABLE_RGBY        | \
-+	 PISP_FE_ENABLE_LSC        | PISP_FE_ENABLE_AGC_STATS)
-+
-+#define PISP_FE_ENABLE_OUTPUT_CLUSTER(i)				\
-+	((PISP_FE_ENABLE_CROP0     | PISP_FE_ENABLE_DOWNSCALE0 |	\
-+	  PISP_FE_ENABLE_COMPRESS0 | PISP_FE_ENABLE_OUTPUT0) << (4 * (i)))
-+
-+struct pisp_fe_config_param {
-+	u32 dirty_flags;
-+	u32 dirty_flags_extra;
-+	size_t offset;
-+	size_t size;
-+};
-+
-+static const struct pisp_fe_config_param pisp_fe_config_map[] = {
-+	/* *_dirty_flag_extra types */
-+	{ 0, PISP_FE_DIRTY_GLOBAL,     offsetof(struct pisp_fe_config, global),
-+					sizeof(struct pisp_fe_global_config)         },
-+	{ 0, PISP_FE_DIRTY_FLOATING,   offsetof(struct pisp_fe_config, floating_stats),
-+					sizeof(struct pisp_fe_floating_stats_config) },
-+	{ 0, PISP_FE_DIRTY_OUTPUT_AXI, offsetof(struct pisp_fe_config, output_axi),
-+					sizeof(struct pisp_fe_output_axi_config)     },
-+	/* *_dirty_flag types */
-+	{ PISP_FE_ENABLE_INPUT,      0, offsetof(struct pisp_fe_config, input),
-+					sizeof(struct pisp_fe_input_config)          },
-+	{ PISP_FE_ENABLE_DECOMPRESS, 0, offsetof(struct pisp_fe_config, decompress),
-+					sizeof(struct pisp_decompress_config)        },
-+	{ PISP_FE_ENABLE_DECOMPAND,  0, offsetof(struct pisp_fe_config, decompand),
-+					sizeof(struct pisp_fe_decompand_config)      },
-+	{ PISP_FE_ENABLE_BLA,        0, offsetof(struct pisp_fe_config, bla),
-+					sizeof(struct pisp_bla_config)               },
-+	{ PISP_FE_ENABLE_DPC,        0, offsetof(struct pisp_fe_config, dpc),
-+					sizeof(struct pisp_fe_dpc_config)            },
-+	{ PISP_FE_ENABLE_STATS_CROP, 0, offsetof(struct pisp_fe_config, stats_crop),
-+					sizeof(struct pisp_fe_crop_config)           },
-+	{ PISP_FE_ENABLE_BLC,	     0, offsetof(struct pisp_fe_config, blc),
-+					sizeof(struct pisp_bla_config)               },
-+	{ PISP_FE_ENABLE_CDAF_STATS, 0, offsetof(struct pisp_fe_config, cdaf_stats),
-+					sizeof(struct pisp_fe_cdaf_stats_config)     },
-+	{ PISP_FE_ENABLE_AWB_STATS,  0, offsetof(struct pisp_fe_config, awb_stats),
-+					sizeof(struct pisp_fe_awb_stats_config)      },
-+	{ PISP_FE_ENABLE_RGBY,       0, offsetof(struct pisp_fe_config, rgby),
-+					sizeof(struct pisp_fe_rgby_config)           },
-+	{ PISP_FE_ENABLE_LSC,        0, offsetof(struct pisp_fe_config, lsc),
-+					sizeof(struct pisp_fe_lsc_config)            },
-+	{ PISP_FE_ENABLE_AGC_STATS,  0, offsetof(struct pisp_fe_config, agc_stats),
-+					sizeof(struct pisp_agc_statistics)           },
-+	{ PISP_FE_ENABLE_CROP0,      0, offsetof(struct pisp_fe_config, ch[0].crop),
-+					sizeof(struct pisp_fe_crop_config)           },
-+	{ PISP_FE_ENABLE_DOWNSCALE0, 0, offsetof(struct pisp_fe_config, ch[0].downscale),
-+					sizeof(struct pisp_fe_downscale_config)      },
-+	{ PISP_FE_ENABLE_COMPRESS0,  0, offsetof(struct pisp_fe_config, ch[0].compress),
-+					sizeof(struct pisp_compress_config)          },
-+	{ PISP_FE_ENABLE_OUTPUT0,    0, offsetof(struct pisp_fe_config, ch[0].output),
-+					sizeof(struct pisp_fe_output_config)         },
-+	{ PISP_FE_ENABLE_CROP1,      0, offsetof(struct pisp_fe_config, ch[1].crop),
-+					sizeof(struct pisp_fe_crop_config)           },
-+	{ PISP_FE_ENABLE_DOWNSCALE1, 0, offsetof(struct pisp_fe_config, ch[1].downscale),
-+					sizeof(struct pisp_fe_downscale_config)      },
-+	{ PISP_FE_ENABLE_COMPRESS1,  0, offsetof(struct pisp_fe_config, ch[1].compress),
-+					sizeof(struct pisp_compress_config)          },
-+	{ PISP_FE_ENABLE_OUTPUT1,    0, offsetof(struct pisp_fe_config, ch[1].output),
-+					sizeof(struct pisp_fe_output_config)         },
-+};
-+
-+#define pisp_fe_dbg_irq(fmt, arg...)                            \
-+	do {                                                    \
-+		if (cfe_debug_irq)                              \
-+			dev_dbg(fe->v4l2_dev->dev, fmt, ##arg); \
-+	} while (0)
-+#define pisp_fe_dbg(fmt, arg...) dev_dbg(fe->v4l2_dev->dev, fmt, ##arg)
-+#define pisp_fe_info(fmt, arg...) dev_info(fe->v4l2_dev->dev, fmt, ##arg)
-+#define pisp_fe_err(fmt, arg...) dev_err(fe->v4l2_dev->dev, fmt, ##arg)
-+
-+static inline u32 pisp_fe_reg_read(struct pisp_fe_device *fe, u32 offset)
-+{
-+	return readl(fe->base + offset);
-+}
-+
-+static inline void pisp_fe_reg_write(struct pisp_fe_device *fe, u32 offset,
-+				     u32 val)
-+{
-+	writel(val, fe->base + offset);
-+}
-+
-+static inline void pisp_fe_reg_write_relaxed(struct pisp_fe_device *fe, u32 offset,
-+					     u32 val)
-+{
-+	writel_relaxed(val, fe->base + offset);
-+}
-+
-+static int pisp_regs_show(struct seq_file *s, void *data)
-+{
-+	struct pisp_fe_device *fe = s->private;
-+	int ret;
-+
-+	ret = pm_runtime_resume_and_get(fe->v4l2_dev->dev);
-+	if (ret)
-+		return ret;
-+
-+	pisp_fe_reg_write(fe, FE_CONTROL, FE_CONTROL_LATCH_REGS);
-+
-+#define DUMP(reg) seq_printf(s, #reg " \t0x%08x\n", pisp_fe_reg_read(fe, reg))
-+	DUMP(FE_VERSION);
-+	DUMP(FE_CONTROL);
-+	DUMP(FE_STATUS);
-+	DUMP(FE_FRAME_STATUS);
-+	DUMP(FE_ERROR_STATUS);
-+	DUMP(FE_OUTPUT_STATUS);
-+	DUMP(FE_INT_EN);
-+	DUMP(FE_INT_STATUS);
-+#undef DUMP
-+
-+	pm_runtime_put(fe->v4l2_dev->dev);
-+
-+	return 0;
-+}
-+
-+DEFINE_SHOW_ATTRIBUTE(pisp_regs);
-+
-+static void pisp_config_write(struct pisp_fe_device *fe,
-+			      struct pisp_fe_config *config,
-+			      unsigned int start_offset,
-+			      unsigned int size)
-+{
-+	const unsigned int max_offset =
-+		offsetof(struct pisp_fe_config, ch[PISP_FE_NUM_OUTPUTS]);
-+	unsigned int i, end_offset;
-+	u32 *cfg = (u32 *)config;
-+
-+	start_offset = min(start_offset, max_offset);
-+	end_offset = min(start_offset + size, max_offset);
-+
-+	cfg += start_offset >> 2;
-+	for (i = start_offset; i < end_offset; i += 4, cfg++)
-+		pisp_fe_reg_write_relaxed(fe, PISP_FE_CONFIG_BASE_OFFSET + i,
-+					  *cfg);
-+}
-+
-+void pisp_fe_isr(struct pisp_fe_device *fe, bool *sof, bool *eof)
-+{
-+	u32 status, int_status, out_status, frame_status, error_status;
-+	unsigned int i;
-+
-+	pisp_fe_reg_write(fe, FE_CONTROL, FE_CONTROL_LATCH_REGS);
-+	status = pisp_fe_reg_read(fe, FE_STATUS);
-+	out_status = pisp_fe_reg_read(fe, FE_OUTPUT_STATUS);
-+	frame_status = pisp_fe_reg_read(fe, FE_FRAME_STATUS);
-+	error_status = pisp_fe_reg_read(fe, FE_ERROR_STATUS);
-+
-+	int_status = pisp_fe_reg_read(fe, FE_INT_STATUS);
-+	pisp_fe_reg_write(fe, FE_INT_STATUS, int_status);
-+
-+	pisp_fe_dbg_irq("%s: status 0x%x out 0x%x frame 0x%x error 0x%x int 0x%x\n",
-+			__func__, status, out_status, frame_status, error_status,
-+			int_status);
-+
-+	/* We do not report interrupts for the input/stream pad. */
-+	for (i = 0; i < FE_NUM_PADS - 1; i++) {
-+		sof[i] = !!(int_status & FE_INT_SOF);
-+		eof[i] = !!(int_status & FE_INT_EOF);
-+	}
-+}
-+
-+static bool pisp_fe_validate_output(struct pisp_fe_config const *cfg,
-+				    unsigned int c, struct v4l2_format const *f)
-+{
-+	unsigned int wbytes;
-+
-+	wbytes = cfg->ch[c].output.format.width;
-+	if (cfg->ch[c].output.format.format & PISP_IMAGE_FORMAT_BPS_MASK)
-+		wbytes *= 2;
-+
-+	/* Check output image dimensions are nonzero and not too big */
-+	if (cfg->ch[c].output.format.width < 2 ||
-+	    cfg->ch[c].output.format.height < 2 ||
-+	    cfg->ch[c].output.format.height > f->fmt.pix.height ||
-+	    cfg->ch[c].output.format.stride > f->fmt.pix.bytesperline ||
-+	    wbytes > f->fmt.pix.bytesperline)
-+		return false;
-+
-+	/* Check for zero-sized crops, which could cause lockup */
-+	if ((cfg->global.enables & PISP_FE_ENABLE_CROP(c)) &&
-+	    ((cfg->ch[c].crop.offset_x >= (cfg->input.format.width & ~1) ||
-+	      cfg->ch[c].crop.offset_y >= cfg->input.format.height ||
-+	      cfg->ch[c].crop.width < 2 ||
-+	      cfg->ch[c].crop.height < 2)))
-+		return false;
-+
-+	if ((cfg->global.enables & PISP_FE_ENABLE_DOWNSCALE(c)) &&
-+	    (cfg->ch[c].downscale.output_width < 2 ||
-+	     cfg->ch[c].downscale.output_height < 2))
-+		return false;
-+
-+	return true;
-+}
-+
-+static bool pisp_fe_validate_stats(struct pisp_fe_config const *cfg)
-+{
-+	/* Check for zero-sized crop, which could cause lockup */
-+	return (!(cfg->global.enables & PISP_FE_ENABLE_STATS_CROP) ||
-+		(cfg->stats_crop.offset_x < (cfg->input.format.width & ~1) &&
-+		 cfg->stats_crop.offset_y < cfg->input.format.height &&
-+		 cfg->stats_crop.width >= 2 &&
-+		 cfg->stats_crop.height >= 2));
-+}
-+
-+int pisp_fe_validate_config(struct pisp_fe_device *fe,
-+			    struct pisp_fe_config *cfg,
-+			    struct v4l2_format const *f0,
-+			    struct v4l2_format const *f1)
-+{
-+	unsigned int i;
-+
-+	/*
-+	 * Check the input is enabled, streaming and has nonzero size;
-+	 * to avoid cases where the hardware might lock up or try to
-+	 * read inputs from memory (which this driver doesn't support).
-+	 */
-+	if (!(cfg->global.enables & PISP_FE_ENABLE_INPUT) ||
-+	    cfg->input.streaming != 1 || cfg->input.format.width < 2 ||
-+	    cfg->input.format.height < 2) {
-+		pisp_fe_err("%s: Input config not valid", __func__);
-+		return -EINVAL;
-+	}
-+
-+	for (i = 0; i < PISP_FE_NUM_OUTPUTS; i++) {
-+		if (!(cfg->global.enables & PISP_FE_ENABLE_OUTPUT(i))) {
-+			if (cfg->global.enables &
-+					PISP_FE_ENABLE_OUTPUT_CLUSTER(i)) {
-+				pisp_fe_err("%s: Output %u not valid",
-+					    __func__, i);
-+				return -EINVAL;
-+			}
-+			continue;
-+		}
-+
-+		if (!pisp_fe_validate_output(cfg, i, i ? f1 : f0))
-+			return -EINVAL;
-+	}
-+
-+	if ((cfg->global.enables & PISP_FE_ENABLE_STATS_CLUSTER) &&
-+	    !pisp_fe_validate_stats(cfg)) {
-+		pisp_fe_err("%s: Stats config not valid", __func__);
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
-+
-+void pisp_fe_submit_job(struct pisp_fe_device *fe, struct vb2_buffer **vb2_bufs,
-+			struct pisp_fe_config *cfg)
-+{
-+	unsigned int i;
-+	u64 addr;
-+	u32 status;
-+
-+	/*
-+	 * Check output buffers exist and outputs are correctly configured.
-+	 * If valid, set the buffer's DMA address; otherwise disable.
-+	 */
-+	for (i = 0; i < PISP_FE_NUM_OUTPUTS; i++) {
-+		struct vb2_buffer *buf = vb2_bufs[FE_OUTPUT0_PAD + i];
-+
-+		if (!(cfg->global.enables & PISP_FE_ENABLE_OUTPUT(i)))
-+			continue;
-+
-+		addr = vb2_dma_contig_plane_dma_addr(buf, 0);
-+		cfg->output_buffer[i].addr_lo = addr & 0xffffffff;
-+		cfg->output_buffer[i].addr_hi = addr >> 32;
-+	}
-+
-+	if (vb2_bufs[FE_STATS_PAD]) {
-+		addr = vb2_dma_contig_plane_dma_addr(vb2_bufs[FE_STATS_PAD], 0);
-+		cfg->stats_buffer.addr_lo = addr & 0xffffffff;
-+		cfg->stats_buffer.addr_hi = addr >> 32;
-+	}
-+
-+	/* Set up ILINES interrupts 3/4 of the way down each output */
-+	cfg->ch[0].output.ilines =
-+		max(0x80u, (3u * cfg->ch[0].output.format.height) >> 2);
-+	cfg->ch[1].output.ilines =
-+		max(0x80u, (3u * cfg->ch[1].output.format.height) >> 2);
-+
-+	/*
-+	 * The hardware must have consumed the previous config by now.
-+	 * This read of status also serves as a memory barrier before the
-+	 * sequence of relaxed writes which follow.
-+	 */
-+	status = pisp_fe_reg_read(fe, FE_STATUS);
-+	pisp_fe_dbg_irq("%s: status = 0x%x\n", __func__, status);
-+	if (WARN_ON(status & FE_STATUS_QUEUED))
-+		return;
-+
-+	/*
-+	 * Unconditionally write buffers, global and input parameters.
-+	 * Write cropping and output parameters whenever they are enabled.
-+	 * Selectively write other parameters that have been marked as
-+	 * changed through the dirty flags.
-+	 */
-+	pisp_config_write(fe, cfg, 0,
-+			  offsetof(struct pisp_fe_config, decompress));
-+	cfg->dirty_flags_extra &= ~PISP_FE_DIRTY_GLOBAL;
-+	cfg->dirty_flags &= ~PISP_FE_ENABLE_INPUT;
-+	cfg->dirty_flags |= (cfg->global.enables &
-+			     (PISP_FE_ENABLE_STATS_CROP        |
-+			      PISP_FE_ENABLE_OUTPUT_CLUSTER(0) |
-+			      PISP_FE_ENABLE_OUTPUT_CLUSTER(1)));
-+	for (i = 0; i < ARRAY_SIZE(pisp_fe_config_map); i++) {
-+		const struct pisp_fe_config_param *p = &pisp_fe_config_map[i];
-+
-+		if (cfg->dirty_flags & p->dirty_flags ||
-+		    cfg->dirty_flags_extra & p->dirty_flags_extra)
-+			pisp_config_write(fe, cfg, p->offset, p->size);
-+	}
-+
-+	/* This final non-relaxed write serves as a memory barrier */
-+	pisp_fe_reg_write(fe, FE_CONTROL, FE_CONTROL_QUEUE);
-+}
-+
-+void pisp_fe_start(struct pisp_fe_device *fe)
-+{
-+	pisp_fe_reg_write(fe, FE_CONTROL, FE_CONTROL_RESET);
-+	pisp_fe_reg_write(fe, FE_INT_STATUS, -1);
-+	pisp_fe_reg_write(fe, FE_INT_EN, FE_INT_EOF | FE_INT_SOF | FE_INT_LINES0 | FE_INT_LINES1);
-+	fe->inframe_count = 0;
-+}
-+
-+void pisp_fe_stop(struct pisp_fe_device *fe)
-+{
-+	pisp_fe_reg_write(fe, FE_INT_EN, 0);
-+	pisp_fe_reg_write(fe, FE_CONTROL, FE_CONTROL_ABORT);
-+	usleep_range(1000, 2000);
-+	WARN_ON(pisp_fe_reg_read(fe, FE_STATUS));
-+	pisp_fe_reg_write(fe, FE_INT_STATUS, -1);
-+}
-+
-+static struct pisp_fe_device *to_pisp_fe_device(struct v4l2_subdev *subdev)
-+{
-+	return container_of(subdev, struct pisp_fe_device, sd);
-+}
-+
-+static int pisp_fe_init_cfg(struct v4l2_subdev *sd,
-+			    struct v4l2_subdev_state *state)
-+{
-+	struct v4l2_mbus_framefmt *fmt;
-+
-+	fmt = v4l2_subdev_get_pad_format(sd, state, FE_STREAM_PAD);
-+	*fmt = cfe_default_format;
-+	fmt->code = MEDIA_BUS_FMT_SRGGB16_1X16;
-+
-+	fmt = v4l2_subdev_get_pad_format(sd, state, FE_CONFIG_PAD);
-+	*fmt = cfe_default_meta_format;
-+	fmt->code = MEDIA_BUS_FMT_PISP_FE_CONFIG;
-+
-+	fmt = v4l2_subdev_get_pad_format(sd, state, FE_OUTPUT0_PAD);
-+	*fmt = cfe_default_format;
-+	fmt->code = MEDIA_BUS_FMT_SRGGB16_1X16;
-+
-+	fmt = v4l2_subdev_get_pad_format(sd, state, FE_OUTPUT1_PAD);
-+	*fmt = cfe_default_format;
-+	fmt->code = MEDIA_BUS_FMT_SRGGB16_1X16;
-+
-+	fmt = v4l2_subdev_get_pad_format(sd, state, FE_STATS_PAD);
-+	*fmt = cfe_default_meta_format;
-+	fmt->code = MEDIA_BUS_FMT_PISP_FE_STATS;
-+
-+	return 0;
-+}
-+
-+static int pisp_fe_pad_set_fmt(struct v4l2_subdev *sd,
-+			       struct v4l2_subdev_state *state,
-+			       struct v4l2_subdev_format *format)
-+{
-+	struct v4l2_mbus_framefmt *fmt;
-+	const struct cfe_fmt *cfe_fmt;
-+
-+	/* TODO: format propagation to source pads */
-+	/* TODO: format validation */
-+
-+	switch (format->pad) {
-+	case FE_STREAM_PAD:
-+	case FE_OUTPUT0_PAD:
-+	case FE_OUTPUT1_PAD:
-+		cfe_fmt = find_format_by_code(format->format.code);
-+		if (!cfe_fmt || !(cfe_fmt->flags & CFE_FORMAT_FLAG_FE_OUT))
-+			cfe_fmt = find_format_by_code(MEDIA_BUS_FMT_SBGGR10_1X10);
-+
-+		format->format.code = cfe_fmt->code;
-+
-+		break;
-+
-+	case FE_CONFIG_PAD:
-+		format->format.code = MEDIA_BUS_FMT_PISP_FE_CONFIG;
-+		break;
-+
-+	case FE_STATS_PAD:
-+		format->format.code = MEDIA_BUS_FMT_PISP_FE_STATS;
-+		break;
-+	}
-+
-+	fmt = v4l2_subdev_get_pad_format(sd, state, format->pad);
-+	*fmt = format->format;
-+
-+	return 0;
-+}
-+
-+static int pisp_fe_link_validate(struct v4l2_subdev *sd,
-+				 struct media_link *link,
-+				 struct v4l2_subdev_format *source_fmt,
-+				 struct v4l2_subdev_format *sink_fmt)
-+{
-+	struct pisp_fe_device *fe = to_pisp_fe_device(sd);
-+
-+	pisp_fe_dbg("%s: link \"%s\":%u -> \"%s\":%u\n", __func__,
-+		    link->source->entity->name, link->source->index,
-+		    link->sink->entity->name, link->sink->index);
-+
-+	/* The width, height and code must match. */
-+	if (source_fmt->format.width != sink_fmt->format.width ||
-+	    source_fmt->format.width != sink_fmt->format.width ||
-+	    source_fmt->format.code != sink_fmt->format.code) {
-+		pisp_fe_err("%s: format does not match (source %ux%u 0x%x, sink %ux%u 0x%x)\n",
-+			    __func__,
-+			     source_fmt->format.width,
-+			     source_fmt->format.height,
-+			     source_fmt->format.code,
-+			     sink_fmt->format.width,
-+			     sink_fmt->format.height,
-+			     sink_fmt->format.code);
-+		return -EPIPE;
-+	}
-+
-+	return 0;
-+}
-+
-+static const struct v4l2_subdev_pad_ops pisp_fe_subdev_pad_ops = {
-+	.init_cfg = pisp_fe_init_cfg,
-+	.get_fmt = v4l2_subdev_get_fmt,
-+	.set_fmt = pisp_fe_pad_set_fmt,
-+	.link_validate = pisp_fe_link_validate,
-+};
-+
-+static const struct media_entity_operations pisp_fe_entity_ops = {
-+	.link_validate = v4l2_subdev_link_validate,
-+};
-+
-+static const struct v4l2_subdev_ops pisp_fe_subdev_ops = {
-+	.pad = &pisp_fe_subdev_pad_ops,
-+};
-+
-+int pisp_fe_init(struct pisp_fe_device *fe, struct dentry *debugfs)
-+{
-+	int ret;
-+
-+	debugfs_create_file("pisp_regs", 0444, debugfs, fe, &pisp_regs_fops);
-+
-+	fe->hw_revision = pisp_fe_reg_read(fe, FE_VERSION);
-+	pisp_fe_info("PiSP FE HW v%u.%u\n",
-+		     (fe->hw_revision >> 24) & 0xff,
-+		     (fe->hw_revision >> 20) & 0x0f);
-+
-+	fe->pad[FE_STREAM_PAD].flags =
-+		MEDIA_PAD_FL_SINK | MEDIA_PAD_FL_MUST_CONNECT;
-+	fe->pad[FE_CONFIG_PAD].flags = MEDIA_PAD_FL_SINK;
-+	fe->pad[FE_OUTPUT0_PAD].flags = MEDIA_PAD_FL_SOURCE;
-+	fe->pad[FE_OUTPUT1_PAD].flags = MEDIA_PAD_FL_SOURCE;
-+	fe->pad[FE_STATS_PAD].flags = MEDIA_PAD_FL_SOURCE;
-+
-+	ret = media_entity_pads_init(&fe->sd.entity, ARRAY_SIZE(fe->pad),
-+				     fe->pad);
-+	if (ret)
-+		return ret;
-+
-+	/* Initialize subdev */
-+	v4l2_subdev_init(&fe->sd, &pisp_fe_subdev_ops);
-+	fe->sd.entity.function = MEDIA_ENT_F_PROC_VIDEO_SCALER;
-+	fe->sd.entity.ops = &pisp_fe_entity_ops;
-+	fe->sd.entity.name = "pisp-fe";
-+	fe->sd.flags = V4L2_SUBDEV_FL_HAS_DEVNODE;
-+	fe->sd.owner = THIS_MODULE;
-+	snprintf(fe->sd.name, sizeof(fe->sd.name), "pisp-fe");
-+
-+	ret = v4l2_subdev_init_finalize(&fe->sd);
-+	if (ret)
-+		goto err_entity_cleanup;
-+
-+	ret = v4l2_device_register_subdev(fe->v4l2_dev, &fe->sd);
-+	if (ret) {
-+		pisp_fe_err("Failed register pisp fe subdev (%d)\n", ret);
-+		goto err_subdev_cleanup;
-+	}
-+
-+	/* Must be in IDLE state (STATUS == 0) here. */
-+	WARN_ON(pisp_fe_reg_read(fe, FE_STATUS));
-+
-+	return 0;
-+
-+err_subdev_cleanup:
-+	v4l2_subdev_cleanup(&fe->sd);
-+err_entity_cleanup:
-+	media_entity_cleanup(&fe->sd.entity);
-+
-+	return ret;
-+}
-+
-+void pisp_fe_uninit(struct pisp_fe_device *fe)
-+{
-+	v4l2_device_unregister_subdev(&fe->sd);
-+	v4l2_subdev_cleanup(&fe->sd);
-+	media_entity_cleanup(&fe->sd.entity);
-+}
---- /dev/null
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/pisp_fe.h
-@@ -0,0 +1,53 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * PiSP Front End driver.
-+ * Copyright (c) 2021 Raspberry Pi Ltd.
-+ *
-+ */
-+#ifndef _PISP_FE_H_
-+#define _PISP_FE_H_
-+
-+#include <linux/debugfs.h>
-+#include <linux/io.h>
-+#include <linux/types.h>
-+#include <linux/videodev2.h>
-+
-+#include <media/media-device.h>
-+#include <media/v4l2-device.h>
-+#include <media/v4l2-subdev.h>
-+
-+#include "pisp_fe_config.h"
-+
-+enum pisp_fe_pads {
-+	FE_STREAM_PAD,
-+	FE_CONFIG_PAD,
-+	FE_OUTPUT0_PAD,
-+	FE_OUTPUT1_PAD,
-+	FE_STATS_PAD,
-+	FE_NUM_PADS
-+};
-+
-+struct pisp_fe_device {
-+	/* Parent V4l2 device */
-+	struct v4l2_device *v4l2_dev;
-+	void __iomem *base;
-+	u32 hw_revision;
-+
-+	u16 inframe_count;
-+	struct media_pad pad[FE_NUM_PADS];
-+	struct v4l2_subdev sd;
-+};
-+
-+void pisp_fe_isr(struct pisp_fe_device *fe, bool *sof, bool *eof);
-+int pisp_fe_validate_config(struct pisp_fe_device *fe,
-+			    struct pisp_fe_config *cfg,
-+			    struct v4l2_format const *f0,
-+			    struct v4l2_format const *f1);
-+void pisp_fe_submit_job(struct pisp_fe_device *fe, struct vb2_buffer **vb2_bufs,
-+			struct pisp_fe_config *cfg);
-+void pisp_fe_start(struct pisp_fe_device *fe);
-+void pisp_fe_stop(struct pisp_fe_device *fe);
-+int pisp_fe_init(struct pisp_fe_device *fe, struct dentry *debugfs);
-+void pisp_fe_uninit(struct pisp_fe_device *fe);
-+
-+#endif
---- /dev/null
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/pisp_fe_config.h
-@@ -0,0 +1,272 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * RP1 PiSP Front End Driver Configuration structures
-+ *
-+ * Copyright (C) 2021 - Raspberry Pi Ltd.
-+ *
-+ */
-+#ifndef _PISP_FE_CONFIG_
-+#define _PISP_FE_CONFIG_
-+
-+#include <media/raspberrypi/pisp_common.h>
-+
-+#include "pisp_statistics.h"
-+
-+#define PISP_FE_NUM_OUTPUTS 2
-+
-+enum pisp_fe_enable {
-+	PISP_FE_ENABLE_INPUT = 0x000001,
-+	PISP_FE_ENABLE_DECOMPRESS = 0x000002,
-+	PISP_FE_ENABLE_DECOMPAND = 0x000004,
-+	PISP_FE_ENABLE_BLA = 0x000008,
-+	PISP_FE_ENABLE_DPC = 0x000010,
-+	PISP_FE_ENABLE_STATS_CROP = 0x000020,
-+	PISP_FE_ENABLE_DECIMATE = 0x000040,
-+	PISP_FE_ENABLE_BLC = 0x000080,
-+	PISP_FE_ENABLE_CDAF_STATS = 0x000100,
-+	PISP_FE_ENABLE_AWB_STATS = 0x000200,
-+	PISP_FE_ENABLE_RGBY = 0x000400,
-+	PISP_FE_ENABLE_LSC = 0x000800,
-+	PISP_FE_ENABLE_AGC_STATS = 0x001000,
-+	PISP_FE_ENABLE_CROP0 = 0x010000,
-+	PISP_FE_ENABLE_DOWNSCALE0 = 0x020000,
-+	PISP_FE_ENABLE_COMPRESS0 = 0x040000,
-+	PISP_FE_ENABLE_OUTPUT0 = 0x080000,
-+	PISP_FE_ENABLE_CROP1 = 0x100000,
-+	PISP_FE_ENABLE_DOWNSCALE1 = 0x200000,
-+	PISP_FE_ENABLE_COMPRESS1 = 0x400000,
-+	PISP_FE_ENABLE_OUTPUT1 = 0x800000
-+};
-+
-+#define PISP_FE_ENABLE_CROP(i) (PISP_FE_ENABLE_CROP0 << (4 * (i)))
-+#define PISP_FE_ENABLE_DOWNSCALE(i) (PISP_FE_ENABLE_DOWNSCALE0 << (4 * (i)))
-+#define PISP_FE_ENABLE_COMPRESS(i) (PISP_FE_ENABLE_COMPRESS0 << (4 * (i)))
-+#define PISP_FE_ENABLE_OUTPUT(i) (PISP_FE_ENABLE_OUTPUT0 << (4 * (i)))
-+
-+/*
-+ * We use the enable flags to show when blocks are "dirty", but we need some
-+ * extra ones too.
-+ */
-+enum pisp_fe_dirty {
-+	PISP_FE_DIRTY_GLOBAL = 0x0001,
-+	PISP_FE_DIRTY_FLOATING = 0x0002,
-+	PISP_FE_DIRTY_OUTPUT_AXI = 0x0004
-+};
-+
-+struct pisp_fe_global_config {
-+	u32 enables;
-+	u8 bayer_order;
-+	u8 pad[3];
-+};
-+
-+struct pisp_fe_input_axi_config {
-+	/* burst length minus one, in the range 0..15; OR'd with flags */
-+	u8 maxlen_flags;
-+	/* { prot[2:0], cache[3:0] } fields */
-+	u8 cache_prot;
-+	/* QoS (only 4 LS bits are used) */
-+	u16 qos;
-+};
-+
-+struct pisp_fe_output_axi_config {
-+	/* burst length minus one, in the range 0..15; OR'd with flags */
-+	u8 maxlen_flags;
-+	/* { prot[2:0], cache[3:0] } fields */
-+	u8 cache_prot;
-+	/* QoS (4 bitfields of 4 bits each for different panic levels) */
-+	u16 qos;
-+	/*  For Panic mode: Output FIFO panic threshold */
-+	u16 thresh;
-+	/*  For Panic mode: Output FIFO statistics throttle threshold */
-+	u16 throttle;
-+};
-+
-+struct pisp_fe_input_config {
-+	u8 streaming;
-+	u8 pad[3];
-+	struct pisp_image_format_config format;
-+	struct pisp_fe_input_axi_config axi;
-+	/* Extra cycles delay before issuing each burst request */
-+	u8 holdoff;
-+	u8 pad2[3];
-+};
-+
-+struct pisp_fe_output_config {
-+	struct pisp_image_format_config format;
-+	u16 ilines;
-+	u8 pad[2];
-+};
-+
-+struct pisp_fe_input_buffer_config {
-+	u32 addr_lo;
-+	u32 addr_hi;
-+	u16 frame_id;
-+	u16 pad;
-+};
-+
-+#define PISP_FE_DECOMPAND_LUT_SIZE 65
-+
-+struct pisp_fe_decompand_config {
-+	u16 lut[PISP_FE_DECOMPAND_LUT_SIZE];
-+	u16 pad;
-+};
-+
-+struct pisp_fe_dpc_config {
-+	u8 coeff_level;
-+	u8 coeff_range;
-+	u8 coeff_range2;
-+#define PISP_FE_DPC_FLAG_FOLDBACK 1
-+#define PISP_FE_DPC_FLAG_VFLAG 2
-+	u8 flags;
-+};
-+
-+#define PISP_FE_LSC_LUT_SIZE 16
-+
-+struct pisp_fe_lsc_config {
-+	u8 shift;
-+	u8 pad0;
-+	u16 scale;
-+	u16 centre_x;
-+	u16 centre_y;
-+	u16 lut[PISP_FE_LSC_LUT_SIZE];
-+};
-+
-+struct pisp_fe_rgby_config {
-+	u16 gain_r;
-+	u16 gain_g;
-+	u16 gain_b;
-+	u8 maxflag;
-+	u8 pad;
-+};
-+
-+struct pisp_fe_agc_stats_config {
-+	u16 offset_x;
-+	u16 offset_y;
-+	u16 size_x;
-+	u16 size_y;
-+	/* each weight only 4 bits */
-+	u8 weights[PISP_AGC_STATS_NUM_ZONES / 2];
-+	u16 row_offset_x;
-+	u16 row_offset_y;
-+	u16 row_size_x;
-+	u16 row_size_y;
-+	u8 row_shift;
-+	u8 float_shift;
-+	u8 pad1[2];
-+};
-+
-+struct pisp_fe_awb_stats_config {
-+	u16 offset_x;
-+	u16 offset_y;
-+	u16 size_x;
-+	u16 size_y;
-+	u8 shift;
-+	u8 pad[3];
-+	u16 r_lo;
-+	u16 r_hi;
-+	u16 g_lo;
-+	u16 g_hi;
-+	u16 b_lo;
-+	u16 b_hi;
-+};
-+
-+struct pisp_fe_floating_stats_region {
-+	u16 offset_x;
-+	u16 offset_y;
-+	u16 size_x;
-+	u16 size_y;
-+};
-+
-+struct pisp_fe_floating_stats_config {
-+	struct pisp_fe_floating_stats_region
-+					regions[PISP_FLOATING_STATS_NUM_ZONES];
-+};
-+
-+#define PISP_FE_CDAF_NUM_WEIGHTS 8
-+
-+struct pisp_fe_cdaf_stats_config {
-+	u16 noise_constant;
-+	u16 noise_slope;
-+	u16 offset_x;
-+	u16 offset_y;
-+	u16 size_x;
-+	u16 size_y;
-+	u16 skip_x;
-+	u16 skip_y;
-+	u32 mode;
-+};
-+
-+struct pisp_fe_stats_buffer_config {
-+	u32 addr_lo;
-+	u32 addr_hi;
-+};
-+
-+struct pisp_fe_crop_config {
-+	u16 offset_x;
-+	u16 offset_y;
-+	u16 width;
-+	u16 height;
-+};
-+
-+enum pisp_fe_downscale_flags {
-+	DOWNSCALE_BAYER =
-+		1, /* downscale the four Bayer components independently... */
-+	DOWNSCALE_BIN =
-+		2 /* ...without trying to preserve their spatial relationship */
-+};
-+
-+struct pisp_fe_downscale_config {
-+	u8 xin;
-+	u8 xout;
-+	u8 yin;
-+	u8 yout;
-+	u8 flags; /* enum pisp_fe_downscale_flags */
-+	u8 pad[3];
-+	u16 output_width;
-+	u16 output_height;
-+};
-+
-+struct pisp_fe_output_buffer_config {
-+	u32 addr_lo;
-+	u32 addr_hi;
-+};
-+
-+/* Each of the two output channels/branches: */
-+struct pisp_fe_output_branch_config {
-+	struct pisp_fe_crop_config crop;
-+	struct pisp_fe_downscale_config downscale;
-+	struct pisp_compress_config compress;
-+	struct pisp_fe_output_config output;
-+	u32 pad;
-+};
-+
-+/* And finally one to rule them all: */
-+struct pisp_fe_config {
-+	/* I/O configuration: */
-+	struct pisp_fe_stats_buffer_config stats_buffer;
-+	struct pisp_fe_output_buffer_config output_buffer[PISP_FE_NUM_OUTPUTS];
-+	struct pisp_fe_input_buffer_config input_buffer;
-+	/* processing configuration: */
-+	struct pisp_fe_global_config global;
-+	struct pisp_fe_input_config input;
-+	struct pisp_decompress_config decompress;
-+	struct pisp_fe_decompand_config decompand;
-+	struct pisp_bla_config bla;
-+	struct pisp_fe_dpc_config dpc;
-+	struct pisp_fe_crop_config stats_crop;
-+	u32 spare1; /* placeholder for future decimate configuration */
-+	struct pisp_bla_config blc;
-+	struct pisp_fe_rgby_config rgby;
-+	struct pisp_fe_lsc_config lsc;
-+	struct pisp_fe_agc_stats_config agc_stats;
-+	struct pisp_fe_awb_stats_config awb_stats;
-+	struct pisp_fe_cdaf_stats_config cdaf_stats;
-+	struct pisp_fe_floating_stats_config floating_stats;
-+	struct pisp_fe_output_axi_config output_axi;
-+	struct pisp_fe_output_branch_config ch[PISP_FE_NUM_OUTPUTS];
-+	/* non-register fields: */
-+	u32 dirty_flags; /* these use pisp_fe_enable */
-+	u32 dirty_flags_extra; /* these use pisp_fe_dirty */
-+};
-+
-+#endif /* _PISP_FE_CONFIG_ */
---- /dev/null
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/pisp_statistics.h
-@@ -0,0 +1,62 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * RP1 PiSP Front End statistics definitions
-+ *
-+ * Copyright (C) 2021 - Raspberry Pi Ltd.
-+ *
-+ */
-+#ifndef _PISP_FE_STATISTICS_H_
-+#define _PISP_FE_STATISTICS_H_
-+
-+#define PISP_FLOATING_STATS_NUM_ZONES 4
-+#define PISP_AGC_STATS_NUM_BINS 1024
-+#define PISP_AGC_STATS_SIZE 16
-+#define PISP_AGC_STATS_NUM_ZONES (PISP_AGC_STATS_SIZE * PISP_AGC_STATS_SIZE)
-+#define PISP_AGC_STATS_NUM_ROW_SUMS 512
-+
-+struct pisp_agc_statistics_zone {
-+	u64 Y_sum;
-+	u32 counted;
-+	u32 pad;
-+};
-+
-+struct pisp_agc_statistics {
-+	u32 row_sums[PISP_AGC_STATS_NUM_ROW_SUMS];
-+	/*
-+	 * 32-bits per bin means an image (just less than) 16384x16384 pixels
-+	 * in size can weight every pixel from 0 to 15.
-+	 */
-+	u32 histogram[PISP_AGC_STATS_NUM_BINS];
-+	struct pisp_agc_statistics_zone floating[PISP_FLOATING_STATS_NUM_ZONES];
-+};
-+
-+#define PISP_AWB_STATS_SIZE 32
-+#define PISP_AWB_STATS_NUM_ZONES (PISP_AWB_STATS_SIZE * PISP_AWB_STATS_SIZE)
-+
-+struct pisp_awb_statistics_zone {
-+	u32 R_sum;
-+	u32 G_sum;
-+	u32 B_sum;
-+	u32 counted;
-+};
-+
-+struct pisp_awb_statistics {
-+	struct pisp_awb_statistics_zone zones[PISP_AWB_STATS_NUM_ZONES];
-+	struct pisp_awb_statistics_zone floating[PISP_FLOATING_STATS_NUM_ZONES];
-+};
-+
-+#define PISP_CDAF_STATS_SIZE 8
-+#define PISP_CDAF_STATS_NUM_FOMS (PISP_CDAF_STATS_SIZE * PISP_CDAF_STATS_SIZE)
-+
-+struct pisp_cdaf_statistics {
-+	u64 foms[PISP_CDAF_STATS_NUM_FOMS];
-+	u64 floating[PISP_FLOATING_STATS_NUM_ZONES];
-+};
-+
-+struct pisp_statistics {
-+	struct pisp_awb_statistics awb;
-+	struct pisp_agc_statistics agc;
-+	struct pisp_cdaf_statistics cdaf;
-+};
-+
-+#endif /* _PISP_FE_STATISTICS_H_ */
---- /dev/null
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/pisp_types.h
-@@ -0,0 +1,144 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * RP1 PiSP Front End image definitions.
-+ *
-+ * Copyright (C) 2021 - Raspberry Pi Ltd.
-+ *
-+ */
-+#ifndef _PISP_FE_TYPES_H_
-+#define _PISP_FE_TYPES_H_
-+
-+/* This definition must match the format description in the hardware exactly! */
-+struct pisp_image_format_config {
-+	/* size in pixels */
-+	u16 width, height;
-+	/* must match struct pisp_image_format below */
-+	u32 format;
-+	s32 stride;
-+	/* some planar image formats will need a second stride */
-+	s32 stride2;
-+};
-+
-+static_assert(sizeof(struct pisp_image_format_config) == 16);
-+
-+enum pisp_bayer_order {
-+	/*
-+	 * Note how bayer_order&1 tells you if G is on the even pixels of the
-+	 * checkerboard or not, and bayer_order&2 tells you if R is on the even
-+	 * rows or is swapped with B. Note that if the top (of the 8) bits is
-+	 * set, this denotes a monochrome or greyscale image, and the lower bits
-+	 * should all be ignored.
-+	 */
-+	PISP_BAYER_ORDER_RGGB = 0,
-+	PISP_BAYER_ORDER_GBRG = 1,
-+	PISP_BAYER_ORDER_BGGR = 2,
-+	PISP_BAYER_ORDER_GRBG = 3,
-+	PISP_BAYER_ORDER_GREYSCALE = 128
-+};
-+
-+enum pisp_image_format {
-+	/*
-+	 * Precise values are mostly tbd. Generally these will be portmanteau
-+	 * values comprising bit fields and flags. This format must be shared
-+	 * throughout the PiSP.
-+	 */
-+	PISP_IMAGE_FORMAT_BPS_8 = 0x00000000,
-+	PISP_IMAGE_FORMAT_BPS_10 = 0x00000001,
-+	PISP_IMAGE_FORMAT_BPS_12 = 0x00000002,
-+	PISP_IMAGE_FORMAT_BPS_16 = 0x00000003,
-+	PISP_IMAGE_FORMAT_BPS_MASK = 0x00000003,
-+
-+	PISP_IMAGE_FORMAT_PLANARITY_INTERLEAVED = 0x00000000,
-+	PISP_IMAGE_FORMAT_PLANARITY_SEMI_PLANAR = 0x00000010,
-+	PISP_IMAGE_FORMAT_PLANARITY_PLANAR = 0x00000020,
-+	PISP_IMAGE_FORMAT_PLANARITY_MASK = 0x00000030,
-+
-+	PISP_IMAGE_FORMAT_SAMPLING_444 = 0x00000000,
-+	PISP_IMAGE_FORMAT_SAMPLING_422 = 0x00000100,
-+	PISP_IMAGE_FORMAT_SAMPLING_420 = 0x00000200,
-+	PISP_IMAGE_FORMAT_SAMPLING_MASK = 0x00000300,
-+
-+	PISP_IMAGE_FORMAT_ORDER_NORMAL = 0x00000000,
-+	PISP_IMAGE_FORMAT_ORDER_SWAPPED = 0x00001000,
-+
-+	PISP_IMAGE_FORMAT_SHIFT_0 = 0x00000000,
-+	PISP_IMAGE_FORMAT_SHIFT_1 = 0x00010000,
-+	PISP_IMAGE_FORMAT_SHIFT_2 = 0x00020000,
-+	PISP_IMAGE_FORMAT_SHIFT_3 = 0x00030000,
-+	PISP_IMAGE_FORMAT_SHIFT_4 = 0x00040000,
-+	PISP_IMAGE_FORMAT_SHIFT_5 = 0x00050000,
-+	PISP_IMAGE_FORMAT_SHIFT_6 = 0x00060000,
-+	PISP_IMAGE_FORMAT_SHIFT_7 = 0x00070000,
-+	PISP_IMAGE_FORMAT_SHIFT_8 = 0x00080000,
-+	PISP_IMAGE_FORMAT_SHIFT_MASK = 0x000f0000,
-+
-+	PISP_IMAGE_FORMAT_UNCOMPRESSED = 0x00000000,
-+	PISP_IMAGE_FORMAT_COMPRESSION_MODE_1 = 0x01000000,
-+	PISP_IMAGE_FORMAT_COMPRESSION_MODE_2 = 0x02000000,
-+	PISP_IMAGE_FORMAT_COMPRESSION_MODE_3 = 0x03000000,
-+	PISP_IMAGE_FORMAT_COMPRESSION_MASK = 0x03000000,
-+
-+	PISP_IMAGE_FORMAT_HOG_SIGNED = 0x04000000,
-+	PISP_IMAGE_FORMAT_HOG_UNSIGNED = 0x08000000,
-+	PISP_IMAGE_FORMAT_INTEGRAL_IMAGE = 0x10000000,
-+	PISP_IMAGE_FORMAT_WALLPAPER_ROLL = 0x20000000,
-+	PISP_IMAGE_FORMAT_THREE_CHANNEL = 0x40000000,
-+
-+	/* Lastly a few specific instantiations of the above. */
-+	PISP_IMAGE_FORMAT_SINGLE_16 = PISP_IMAGE_FORMAT_BPS_16,
-+	PISP_IMAGE_FORMAT_THREE_16 =
-+		PISP_IMAGE_FORMAT_BPS_16 | PISP_IMAGE_FORMAT_THREE_CHANNEL
-+};
-+
-+#define PISP_IMAGE_FORMAT_bps_8(fmt)                                           \
-+	(((fmt) & PISP_IMAGE_FORMAT_BPS_MASK) == PISP_IMAGE_FORMAT_BPS_8)
-+#define PISP_IMAGE_FORMAT_bps_10(fmt)                                          \
-+	(((fmt) & PISP_IMAGE_FORMAT_BPS_MASK) == PISP_IMAGE_FORMAT_BPS_10)
-+#define PISP_IMAGE_FORMAT_bps_12(fmt)                                          \
-+	(((fmt) & PISP_IMAGE_FORMAT_BPS_MASK) == PISP_IMAGE_FORMAT_BPS_12)
-+#define PISP_IMAGE_FORMAT_bps_16(fmt)                                          \
-+	(((fmt) & PISP_IMAGE_FORMAT_BPS_MASK) == PISP_IMAGE_FORMAT_BPS_16)
-+#define PISP_IMAGE_FORMAT_bps(fmt)                                             \
-+	(((fmt) & PISP_IMAGE_FORMAT_BPS_MASK) ?                                \
-+		       8 + (2 << (((fmt) & PISP_IMAGE_FORMAT_BPS_MASK) - 1)) : \
-+		       8)
-+#define PISP_IMAGE_FORMAT_shift(fmt)                                           \
-+	(((fmt) & PISP_IMAGE_FORMAT_SHIFT_MASK) / PISP_IMAGE_FORMAT_SHIFT_1)
-+#define PISP_IMAGE_FORMAT_three_channel(fmt)                                   \
-+	((fmt) & PISP_IMAGE_FORMAT_THREE_CHANNEL)
-+#define PISP_IMAGE_FORMAT_single_channel(fmt)                                  \
-+	(!((fmt) & PISP_IMAGE_FORMAT_THREE_CHANNEL))
-+#define PISP_IMAGE_FORMAT_compressed(fmt)                                      \
-+	(((fmt) & PISP_IMAGE_FORMAT_COMPRESSION_MASK) !=                       \
-+	 PISP_IMAGE_FORMAT_UNCOMPRESSED)
-+#define PISP_IMAGE_FORMAT_sampling_444(fmt)                                    \
-+	(((fmt) & PISP_IMAGE_FORMAT_SAMPLING_MASK) ==                          \
-+	 PISP_IMAGE_FORMAT_SAMPLING_444)
-+#define PISP_IMAGE_FORMAT_sampling_422(fmt)                                    \
-+	(((fmt) & PISP_IMAGE_FORMAT_SAMPLING_MASK) ==                          \
-+	 PISP_IMAGE_FORMAT_SAMPLING_422)
-+#define PISP_IMAGE_FORMAT_sampling_420(fmt)                                    \
-+	(((fmt) & PISP_IMAGE_FORMAT_SAMPLING_MASK) ==                          \
-+	 PISP_IMAGE_FORMAT_SAMPLING_420)
-+#define PISP_IMAGE_FORMAT_order_normal(fmt)                                    \
-+	(!((fmt) & PISP_IMAGE_FORMAT_ORDER_SWAPPED))
-+#define PISP_IMAGE_FORMAT_order_swapped(fmt)                                   \
-+	((fmt) & PISP_IMAGE_FORMAT_ORDER_SWAPPED)
-+#define PISP_IMAGE_FORMAT_interleaved(fmt)                                     \
-+	(((fmt) & PISP_IMAGE_FORMAT_PLANARITY_MASK) ==                         \
-+	 PISP_IMAGE_FORMAT_PLANARITY_INTERLEAVED)
-+#define PISP_IMAGE_FORMAT_semiplanar(fmt)                                      \
-+	(((fmt) & PISP_IMAGE_FORMAT_PLANARITY_MASK) ==                         \
-+	 PISP_IMAGE_FORMAT_PLANARITY_SEMI_PLANAR)
-+#define PISP_IMAGE_FORMAT_planar(fmt)                                          \
-+	(((fmt) & PISP_IMAGE_FORMAT_PLANARITY_MASK) ==                         \
-+	 PISP_IMAGE_FORMAT_PLANARITY_PLANAR)
-+#define PISP_IMAGE_FORMAT_wallpaper(fmt)                                       \
-+	((fmt) & PISP_IMAGE_FORMAT_WALLPAPER_ROLL)
-+#define PISP_IMAGE_FORMAT_HOG(fmt)                                             \
-+	((fmt) &                                                               \
-+	 (PISP_IMAGE_FORMAT_HOG_SIGNED | PISP_IMAGE_FORMAT_HOG_UNSIGNED))
-+
-+#define PISP_WALLPAPER_WIDTH 128 // in bytes
-+
-+#endif /* _PISP_FE_TYPES_H_ */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0890-dt-bindings-net-cdns-macb-AXI-tuning-properties.patch b/target/linux/bcm27xx/patches-6.1/950-0890-dt-bindings-net-cdns-macb-AXI-tuning-properties.patch
deleted file mode 100644
index 7d81e03429..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0890-dt-bindings-net-cdns-macb-AXI-tuning-properties.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 2be65d1fd1f7d3cf6f59b58b53e285400f04a160 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 15 Feb 2023 09:46:35 +0000
-Subject: [PATCH] dt-bindings: net: cdns,macb: AXI tuning properties
-
-Add optional properties to tune the AXI interface -
-cdns,aw2w-max-pipe, cdns,ar2r-max-pipe and cdns,use-aw2b-fill.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- .../devicetree/bindings/net/cdns,macb.yaml       | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
---- a/Documentation/devicetree/bindings/net/cdns,macb.yaml
-+++ b/Documentation/devicetree/bindings/net/cdns,macb.yaml
-@@ -121,6 +121,22 @@ properties:
-       Node containing PHY children. If this node is not present, then PHYs will
-       be direct children.
- 
-+  cdns,aw2w-max-pipe:
-+    $ref: /schemas/types.yaml#/definitions/uint32
-+    description:
-+      Maximum number of outstanding AXI write requests
-+
-+  cdns,ar2r-max-pipe:
-+    $ref: /schemas/types.yaml#/definitions/uint32
-+    description:
-+      Maximum number of outstanding AXI read requests
-+
-+  cdns,use-aw2b-fill:
-+    type: boolean
-+    description:
-+      If set, the maximum number of outstanding write transactions operates
-+      between the AW to B AXI channel, instead of the AW to W AXI channel.
-+
- patternProperties:
-   "^ethernet-phy@[0-9a-f]$":
-     type: object
diff --git a/target/linux/bcm27xx/patches-6.1/950-0891-ASoC-dwc-list-all-supported-sample-sizes.patch b/target/linux/bcm27xx/patches-6.1/950-0891-ASoC-dwc-list-all-supported-sample-sizes.patch
deleted file mode 100644
index 06d69c7c4c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0891-ASoC-dwc-list-all-supported-sample-sizes.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9ef0615a5c5f93cb72af8df3a2dae6d23b106eb5 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 21 Feb 2023 21:26:16 +0000
-Subject: [PATCH] ASoC: dwc: list all supported sample sizes
-
-The hardware configuration determines the maximum-supported sample size
-for each channel, but TCRx allows smaller sizes to be specified at run
-time. Include the smaller supported sizes in the formats array.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- sound/soc/dwc/dwc-i2s.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/sound/soc/dwc/dwc-i2s.c
-+++ b/sound/soc/dwc/dwc-i2s.c
-@@ -448,9 +448,9 @@ static const u32 bus_widths[COMP_MAX_DAT
- static const u32 formats[COMP_MAX_WORDSIZE] = {
- 	SNDRV_PCM_FMTBIT_S16_LE,
- 	SNDRV_PCM_FMTBIT_S16_LE,
--	SNDRV_PCM_FMTBIT_S24_LE,
--	SNDRV_PCM_FMTBIT_S24_LE,
--	SNDRV_PCM_FMTBIT_S32_LE,
-+	SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S16_LE,
-+	SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S16_LE,
-+	SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S16_LE,
- 	0,
- 	0,
- 	0
diff --git a/target/linux/bcm27xx/patches-6.1/950-0892-ASoC-dwc-Support-set_bclk_ratio.patch b/target/linux/bcm27xx/patches-6.1/950-0892-ASoC-dwc-Support-set_bclk_ratio.patch
deleted file mode 100644
index b18e5f888f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0892-ASoC-dwc-Support-set_bclk_ratio.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 06f794e8cb227249e03893e4b4923ff58556eb60 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 4 Mar 2021 14:49:23 +0000
-Subject: [PATCH] ASoC: dwc: Support set_bclk_ratio
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- sound/soc/dwc/dwc-i2s.c | 35 +++++++++++++++++++++++++++++++++++
- 1 file changed, 35 insertions(+)
-
---- a/sound/soc/dwc/dwc-i2s.c
-+++ b/sound/soc/dwc/dwc-i2s.c
-@@ -351,11 +351,46 @@ static int dw_i2s_set_fmt(struct snd_soc
- 	return ret;
- }
- 
-+static int dw_i2s_set_bclk_ratio(struct snd_soc_dai *cpu_dai,
-+				 unsigned int ratio)
-+{
-+	struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(cpu_dai);
-+	struct i2s_clk_config_data *config = &dev->config;
-+
-+	dev_err(dev->dev, "%s(%d)\n", __func__, ratio);
-+	switch (ratio) {
-+	case 32:
-+		config->data_width = 16;
-+		dev->ccr = 0x00;
-+		dev->xfer_resolution = 0x02;
-+		break;
-+
-+	case 48:
-+		config->data_width = 24;
-+		dev->ccr = 0x08;
-+		dev->xfer_resolution = 0x04;
-+		break;
-+
-+	case 64:
-+		config->data_width = 32;
-+		dev->ccr = 0x10;
-+		dev->xfer_resolution = 0x05;
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	i2s_write_reg(dev->i2s_base, CCR, dev->ccr);
-+
-+	return 0;
-+}
-+
- static const struct snd_soc_dai_ops dw_i2s_dai_ops = {
- 	.hw_params	= dw_i2s_hw_params,
- 	.prepare	= dw_i2s_prepare,
- 	.trigger	= dw_i2s_trigger,
- 	.set_fmt	= dw_i2s_set_fmt,
-+	.set_bclk_ratio	= dw_i2s_set_bclk_ratio,
- };
- 
- #ifdef CONFIG_PM
diff --git a/target/linux/bcm27xx/patches-6.1/950-0893-ASoC-dwc-Add-DMACR-handling.patch b/target/linux/bcm27xx/patches-6.1/950-0893-ASoC-dwc-Add-DMACR-handling.patch
deleted file mode 100644
index 474903c327..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0893-ASoC-dwc-Add-DMACR-handling.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From b3b1177092d4d2ba6df74042d39aa42c5055f687 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 3 Jul 2023 09:08:16 +0100
-Subject: [PATCH] ASoC: dwc: Add DMACR handling
-
-Add control of the DMACR register, which is required for paced DMA
-(i.e. DREQ) support.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- sound/soc/dwc/dwc-i2s.c | 13 ++++++++++---
- sound/soc/dwc/local.h   | 13 +++++++++++++
- 2 files changed, 23 insertions(+), 3 deletions(-)
-
---- a/sound/soc/dwc/dwc-i2s.c
-+++ b/sound/soc/dwc/dwc-i2s.c
-@@ -185,9 +185,9 @@ static void i2s_stop(struct dw_i2s_dev *
- 
- static void dw_i2s_config(struct dw_i2s_dev *dev, int stream)
- {
--	u32 ch_reg;
- 	struct i2s_clk_config_data *config = &dev->config;
--
-+	u32 ch_reg;
-+	u32 dmacr = 0;
- 
- 	i2s_disable_channels(dev, stream);
- 
-@@ -198,15 +198,22 @@ static void dw_i2s_config(struct dw_i2s_
- 			i2s_write_reg(dev->i2s_base, TFCR(ch_reg),
- 				      dev->fifo_th - 1);
- 			i2s_write_reg(dev->i2s_base, TER(ch_reg), 1);
-+			dmacr |= (DMACR_DMAEN_TXCH0 << ch_reg);
- 		} else {
- 			i2s_write_reg(dev->i2s_base, RCR(ch_reg),
- 				      dev->xfer_resolution);
- 			i2s_write_reg(dev->i2s_base, RFCR(ch_reg),
- 				      dev->fifo_th - 1);
- 			i2s_write_reg(dev->i2s_base, RER(ch_reg), 1);
-+			dmacr |= (DMACR_DMAEN_RXCH0 << ch_reg);
- 		}
--
- 	}
-+	if (stream == SNDRV_PCM_STREAM_PLAYBACK)
-+		dmacr |= DMACR_DMAEN_TX;
-+	else if (stream == SNDRV_PCM_STREAM_CAPTURE)
-+		dmacr |= DMACR_DMAEN_RX;
-+
-+	i2s_write_reg(dev->i2s_base, DMACR, dmacr);
- }
- 
- static int dw_i2s_hw_params(struct snd_pcm_substream *substream,
---- a/sound/soc/dwc/local.h
-+++ b/sound/soc/dwc/local.h
-@@ -25,6 +25,8 @@
- #define RXFFR		0x014
- #define TXFFR		0x018
- 
-+#define DMACR   0x200
-+
- /* Interrupt status register fields */
- #define ISR_TXFO	BIT(5)
- #define ISR_TXFE	BIT(4)
-@@ -47,6 +49,17 @@
- #define RFF(x)		(0x40 * x + 0x050)
- #define TFF(x)		(0x40 * x + 0x054)
- 
-+#define DMACR_DMAEN_TX		BIT(17)
-+#define DMACR_DMAEN_RX		BIT(16)
-+#define DMACR_DMAEN_TXCH3	BIT(11)
-+#define DMACR_DMAEN_TXCH2	BIT(10)
-+#define DMACR_DMAEN_TXCH1	BIT(9)
-+#define DMACR_DMAEN_TXCH0	BIT(8)
-+#define DMACR_DMAEN_RXCH3	BIT(3)
-+#define DMACR_DMAEN_RXCH2	BIT(2)
-+#define DMACR_DMAEN_RXCH1	BIT(1)
-+#define DMACR_DMAEN_RXCH0	BIT(0)
-+
- /* I2SCOMPRegisters */
- #define I2S_COMP_PARAM_2	0x01F0
- #define I2S_COMP_PARAM_1	0x01F4
diff --git a/target/linux/bcm27xx/patches-6.1/950-0894-ASOC-dwc-Improve-DMA-shutdown.patch b/target/linux/bcm27xx/patches-6.1/950-0894-ASOC-dwc-Improve-DMA-shutdown.patch
deleted file mode 100644
index 73704a8be3..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0894-ASOC-dwc-Improve-DMA-shutdown.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From e6baee4502c0228c79408b047096a1259a84353f Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 3 Jul 2023 10:14:43 +0100
-Subject: [PATCH] ASOC: dwc: Improve DMA shutdown
-
-Disabling the I2S interface with outstanding transfers prevents the
-DMAC from shutting down, so keep it partially active after a stop.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- sound/soc/dwc/dwc-i2s.c | 72 ++++++++++++++++++++++++++++++++++++-----
- 1 file changed, 64 insertions(+), 8 deletions(-)
-
---- a/sound/soc/dwc/dwc-i2s.c
-+++ b/sound/soc/dwc/dwc-i2s.c
-@@ -165,24 +165,26 @@ static void i2s_start(struct dw_i2s_dev
- 	i2s_write_reg(dev->i2s_base, CER, 1);
- }
- 
--static void i2s_stop(struct dw_i2s_dev *dev,
--		struct snd_pcm_substream *substream)
-+static void i2s_pause(struct dw_i2s_dev *dev, struct snd_pcm_substream *substream)
- {
- 
- 	i2s_clear_irqs(dev, substream->stream);
--	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
--		i2s_write_reg(dev->i2s_base, ITER, 0);
--	else
--		i2s_write_reg(dev->i2s_base, IRER, 0);
- 
- 	i2s_disable_irqs(dev, substream->stream, 8);
- 
- 	if (!dev->active) {
- 		i2s_write_reg(dev->i2s_base, CER, 0);
--		i2s_write_reg(dev->i2s_base, IER, 0);
-+		/* Keep the device enabled until the shutdown - do not clear IER */
- 	}
- }
- 
-+static void i2s_stop(struct dw_i2s_dev *dev, struct snd_pcm_substream *substream)
-+{
-+	i2s_clear_irqs(dev, substream->stream);
-+
-+	i2s_disable_irqs(dev, substream->stream, 8);
-+}
-+
- static void dw_i2s_config(struct dw_i2s_dev *dev, int stream)
- {
- 	struct i2s_clk_config_data *config = &dev->config;
-@@ -288,6 +290,55 @@ static int dw_i2s_hw_params(struct snd_p
- 	return 0;
- }
- 
-+static int dw_i2s_startup(struct snd_pcm_substream *substream,
-+			  struct snd_soc_dai *cpu_dai)
-+{
-+	struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(cpu_dai);
-+	union dw_i2s_snd_dma_data *dma_data = NULL;
-+	u32 dmacr;
-+
-+	dev_dbg(dev->dev, "%s(%s)\n", __func__, substream->name);
-+	if (!(dev->capability & DWC_I2S_RECORD) &&
-+	    substream->stream == SNDRV_PCM_STREAM_CAPTURE)
-+		return -EINVAL;
-+
-+	if (!(dev->capability & DWC_I2S_PLAY) &&
-+	    substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-+		return -EINVAL;
-+
-+	dw_i2s_config(dev, substream->stream);
-+	dmacr = i2s_read_reg(dev->i2s_base, DMACR);
-+	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-+		dma_data = &dev->play_dma_data;
-+	else if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
-+		dma_data = &dev->capture_dma_data;
-+
-+	snd_soc_dai_set_dma_data(cpu_dai, substream, (void *)dma_data);
-+	i2s_write_reg(dev->i2s_base, DMACR, dmacr);
-+
-+	return 0;
-+}
-+
-+static void dw_i2s_shutdown(struct snd_pcm_substream *substream,
-+			    struct snd_soc_dai *dai)
-+{
-+	struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(dai);
-+
-+	dev_dbg(dev->dev, "%s(%s)\n", __func__, substream->name);
-+	i2s_disable_channels(dev, substream->stream);
-+	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-+		i2s_write_reg(dev->i2s_base, ITER, 0);
-+	else
-+		i2s_write_reg(dev->i2s_base, IRER, 0);
-+
-+	i2s_disable_irqs(dev, substream->stream, 8);
-+
-+	if (!dev->active) {
-+		i2s_write_reg(dev->i2s_base, CER, 0);
-+		i2s_write_reg(dev->i2s_base, IER, 0);
-+	}
-+}
-+
- static int dw_i2s_prepare(struct snd_pcm_substream *substream,
- 			  struct snd_soc_dai *dai)
- {
-@@ -315,9 +366,12 @@ static int dw_i2s_trigger(struct snd_pcm
- 		i2s_start(dev, substream);
- 		break;
- 
-+	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-+		dev->active--;
-+		i2s_pause(dev, substream);
-+		break;
- 	case SNDRV_PCM_TRIGGER_STOP:
- 	case SNDRV_PCM_TRIGGER_SUSPEND:
--	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
- 		dev->active--;
- 		i2s_stop(dev, substream);
- 		break;
-@@ -394,6 +448,8 @@ static int dw_i2s_set_bclk_ratio(struct
- 
- static const struct snd_soc_dai_ops dw_i2s_dai_ops = {
- 	.hw_params	= dw_i2s_hw_params,
-+	.startup	= dw_i2s_startup,
-+	.shutdown	= dw_i2s_shutdown,
- 	.prepare	= dw_i2s_prepare,
- 	.trigger	= dw_i2s_trigger,
- 	.set_fmt	= dw_i2s_set_fmt,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0895-ASOC-dwc-Fix-16-bit-audio-handling.patch b/target/linux/bcm27xx/patches-6.1/950-0895-ASOC-dwc-Fix-16-bit-audio-handling.patch
deleted file mode 100644
index fa5eb61044..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0895-ASOC-dwc-Fix-16-bit-audio-handling.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 9c6694c24f26ea435165431d41c72451fadbd753 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Fri, 21 Jul 2023 12:07:16 +0100
-Subject: [PATCH] ASOC: dwc: Fix 16-bit audio handling
-
-IMO the Synopsys datasheet could be clearer in this area, but it seems
-that the DMA data ports (DMATX and DMARX) expect left and right samples
-in alternate writes; if a stereo pair is pushed in a single 32-bit
-write, the upper half is ignored, leading to double speed audio with a
-confused stereo image. Make sure the necessary changes happen by
-updating the DMA configuration data in the hw_params method.
-
-The set_bclk_ratio change was made at a time when it looked like it
-could be causing an error, but I think the division of responsibilities
-is clearer this way (and the kernel log clearer without the info-level
-message).
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- sound/soc/dwc/dwc-i2s.c | 22 +++++++++++++++-------
- 1 file changed, 15 insertions(+), 7 deletions(-)
-
---- a/sound/soc/dwc/dwc-i2s.c
-+++ b/sound/soc/dwc/dwc-i2s.c
-@@ -223,23 +223,34 @@ static int dw_i2s_hw_params(struct snd_p
- {
- 	struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(dai);
- 	struct i2s_clk_config_data *config = &dev->config;
-+	union dw_i2s_snd_dma_data *dma_data = NULL;
- 	int ret;
- 
-+	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-+		dma_data = &dev->play_dma_data;
-+	else if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
-+		dma_data = &dev->capture_dma_data;
-+	else
-+		return -1;
-+
- 	switch (params_format(params)) {
- 	case SNDRV_PCM_FORMAT_S16_LE:
- 		config->data_width = 16;
-+		dma_data->dt.addr_width = 2;
- 		dev->ccr = 0x00;
- 		dev->xfer_resolution = 0x02;
- 		break;
- 
- 	case SNDRV_PCM_FORMAT_S24_LE:
- 		config->data_width = 24;
-+		dma_data->dt.addr_width = 4;
- 		dev->ccr = 0x08;
- 		dev->xfer_resolution = 0x04;
- 		break;
- 
- 	case SNDRV_PCM_FORMAT_S32_LE:
- 		config->data_width = 32;
-+		dma_data->dt.addr_width = 4;
- 		dev->ccr = 0x10;
- 		dev->xfer_resolution = 0x05;
- 		break;
-@@ -418,24 +429,21 @@ static int dw_i2s_set_bclk_ratio(struct
- 	struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(cpu_dai);
- 	struct i2s_clk_config_data *config = &dev->config;
- 
--	dev_err(dev->dev, "%s(%d)\n", __func__, ratio);
-+	dev_dbg(dev->dev, "%s(%d)\n", __func__, ratio);
-+	if (ratio < config->data_width * 2)
-+		return -EINVAL;
-+
- 	switch (ratio) {
- 	case 32:
--		config->data_width = 16;
- 		dev->ccr = 0x00;
--		dev->xfer_resolution = 0x02;
- 		break;
- 
- 	case 48:
--		config->data_width = 24;
- 		dev->ccr = 0x08;
--		dev->xfer_resolution = 0x04;
- 		break;
- 
- 	case 64:
--		config->data_width = 32;
- 		dev->ccr = 0x10;
--		dev->xfer_resolution = 0x05;
- 		break;
- 	default:
- 		return -EINVAL;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0896-ASoC-bcm-Remove-dependency-on-BCM2835-I2S.patch b/target/linux/bcm27xx/patches-6.1/950-0896-ASoC-bcm-Remove-dependency-on-BCM2835-I2S.patch
deleted file mode 100644
index 9f4f7a0c9a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0896-ASoC-bcm-Remove-dependency-on-BCM2835-I2S.patch
+++ /dev/null
@@ -1,304 +0,0 @@
-From f476db1b71e8b82e5299168f963a2fefb7a395e2 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Fri, 1 Sep 2023 14:07:48 +0100
-Subject: [PATCH] ASoC: bcm: Remove dependency on BCM2835 I2S
-
-These soundcard drivers don't rely on a specific I2S interface, so
-remove the dependency declarations.
-
-See: https://github.com/raspberrypi/linux-2712/issues/111
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- sound/soc/bcm/Kconfig | 40 +---------------------------------------
- 1 file changed, 1 insertion(+), 39 deletions(-)
-
---- a/sound/soc/bcm/Kconfig
-+++ b/sound/soc/bcm/Kconfig
-@@ -29,13 +29,11 @@ config SND_BCM63XX_I2S_WHISTLER
- 
- config SND_BCM2708_SOC_CHIPDIP_DAC
-          tristate "Support for the ChipDip DAC"
--         depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-          help
-           Say Y or M if you want to add support for the ChipDip DAC soundcard
- 
- config SND_BCM2708_SOC_GOOGLEVOICEHAT_SOUNDCARD
- 	tristate "Support for Google voiceHAT soundcard"
--	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
- 	select SND_SOC_VOICEHAT
- 	select SND_RPI_SIMPLE_SOUNDCARD
- 	help
-@@ -43,7 +41,6 @@ config SND_BCM2708_SOC_GOOGLEVOICEHAT_SO
- 
- config SND_BCM2708_SOC_HIFIBERRY_DAC
-         tristate "Support for HifiBerry DAC"
--        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-         select SND_SOC_PCM5102A
-         select SND_RPI_SIMPLE_SOUNDCARD
-         help
-@@ -51,7 +48,6 @@ config SND_BCM2708_SOC_HIFIBERRY_DAC
- 
- config SND_BCM2708_SOC_HIFIBERRY_DACPLUS
-         tristate "Support for HifiBerry DAC+"
--        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-         select SND_SOC_PCM512x
-         select SND_SOC_TPA6130A2
-         select COMMON_CLK_HIFIBERRY_DACPRO
-@@ -60,7 +56,6 @@ config SND_BCM2708_SOC_HIFIBERRY_DACPLUS
- 
- config SND_BCM2708_SOC_HIFIBERRY_DACPLUSHD
-         tristate "Support for HifiBerry DAC+ HD"
--        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-         select SND_SOC_PCM179X_I2C
-         select COMMON_CLK_HIFIBERRY_DACPLUSHD
-         help
-@@ -68,7 +63,6 @@ config SND_BCM2708_SOC_HIFIBERRY_DACPLUS
- 
- config SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC
-         tristate "Support for HifiBerry DAC+ADC"
--        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-         select SND_SOC_PCM512x_I2C
- 	select SND_SOC_DMIC
-         select COMMON_CLK_HIFIBERRY_DACPRO
-@@ -77,7 +71,6 @@ config SND_BCM2708_SOC_HIFIBERRY_DACPLUS
- 
- config SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO
-         tristate "Support for HifiBerry DAC+ADC PRO"
--        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-         select SND_SOC_PCM512x_I2C
-         select SND_SOC_PCM186X_I2C
-         select SND_SOC_TPA6130A2
-@@ -87,29 +80,25 @@ config SND_BCM2708_SOC_HIFIBERRY_DACPLUS
- 
- config SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP
-         tristate "Support for HifiBerry DAC+DSP"
--        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
- 	select SND_RPI_SIMPLE_SOUNDCARD
-         help
-          Say Y or M if you want to add support for HifiBerry DSP-DAC.
- 
- config SND_BCM2708_SOC_HIFIBERRY_DIGI
-         tristate "Support for HifiBerry Digi"
--        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-         select SND_SOC_WM8804
-         help
-          Say Y or M if you want to add support for HifiBerry Digi S/PDIF output board.
- 
- config SND_BCM2708_SOC_HIFIBERRY_AMP
-         tristate "Support for the HifiBerry Amp"
--        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-         select SND_SOC_TAS5713
-         select SND_RPI_SIMPLE_SOUNDCARD
-         help
-          Say Y or M if you want to add support for the HifiBerry Amp amplifier board.
- 
-- config SND_BCM2708_SOC_PIFI_40
-+config SND_BCM2708_SOC_PIFI_40
-          tristate "Support for the PiFi-40 amp"
--         depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-          select SND_SOC_TAS571X
-          select SND_PIFI_40
-          help
-@@ -117,7 +106,6 @@ config SND_BCM2708_SOC_HIFIBERRY_AMP
- 
- config SND_BCM2708_SOC_RPI_CIRRUS
-         tristate "Support for Cirrus Logic Audio Card"
--        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-         select SND_SOC_WM5102
-         select SND_SOC_WM8804
-         help
-@@ -126,7 +114,6 @@ config SND_BCM2708_SOC_RPI_CIRRUS
- 
- config SND_BCM2708_SOC_RPI_DAC
-         tristate "Support for RPi-DAC"
--        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-         select SND_SOC_PCM1794A
-         select SND_RPI_SIMPLE_SOUNDCARD
-         help
-@@ -134,14 +121,12 @@ config SND_BCM2708_SOC_RPI_DAC
- 
- config SND_BCM2708_SOC_RPI_PROTO
- 	tristate "Support for Rpi-PROTO"
--	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
- 	select SND_SOC_WM8731_I2C
- 	help
- 	  Say Y or M if you want to add support for Audio Codec Board PROTO (WM8731).
- 
- config SND_BCM2708_SOC_JUSTBOOM_BOTH
- 	tristate "Support for simultaneous JustBoom Digi and JustBoom DAC"
--	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
- 	select SND_SOC_WM8804
- 	select SND_SOC_PCM512x
- 	help
-@@ -153,14 +138,12 @@ config SND_BCM2708_SOC_JUSTBOOM_BOTH
- 
- config SND_BCM2708_SOC_JUSTBOOM_DAC
- 	tristate "Support for JustBoom DAC"
--	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
- 	select SND_SOC_PCM512x
- 	help
- 	  Say Y or M if you want to add support for JustBoom DAC.
- 
- config SND_BCM2708_SOC_JUSTBOOM_DIGI
- 	tristate "Support for JustBoom Digi"
--	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
- 	select SND_SOC_WM8804
-         select SND_RPI_WM8804_SOUNDCARD
- 	help
-@@ -168,21 +151,18 @@ config SND_BCM2708_SOC_JUSTBOOM_DIGI
- 
- config SND_BCM2708_SOC_IQAUDIO_CODEC
- 	tristate "Support for IQaudIO-CODEC"
--	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
- 	select SND_SOC_DA7213
- 	help
- 	  Say Y or M if you want to add support for IQaudIO-CODEC.
- 
- config SND_BCM2708_SOC_IQAUDIO_DAC
- 	tristate "Support for IQaudIO-DAC"
--	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
- 	select SND_SOC_PCM512x_I2C
- 	help
- 	  Say Y or M if you want to add support for IQaudIO-DAC.
- 
- config SND_BCM2708_SOC_IQAUDIO_DIGI
- 	tristate "Support for IQAudIO Digi"
--	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
- 	select SND_SOC_WM8804
- 	select SND_RPI_WM8804_SOUNDCARD
- 	help
-@@ -190,14 +170,12 @@ config SND_BCM2708_SOC_IQAUDIO_DIGI
- 
- config SND_BCM2708_SOC_I_SABRE_Q2M
-         tristate "Support for Audiophonics I-Sabre Q2M DAC"
--        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-         select SND_SOC_I_SABRE_CODEC
-         help
-         Say Y or M if you want to add support for Audiophonics I-SABRE Q2M DAC
- 
- config SND_BCM2708_SOC_ADAU1977_ADC
- 	tristate "Support for ADAU1977 ADC"
--	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
- 	select SND_SOC_ADAU1977_I2C
- 	select SND_RPI_SIMPLE_SOUNDCARD
- 	help
-@@ -205,35 +183,30 @@ config SND_BCM2708_SOC_ADAU1977_ADC
- 
- config SND_AUDIOINJECTOR_PI_SOUNDCARD
- 	tristate "Support for audioinjector.net Pi add on soundcard"
--	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
- 	select SND_SOC_WM8731_I2C
- 	help
- 	  Say Y or M if you want to add support for audioinjector.net Pi Hat
- 
- config SND_AUDIOINJECTOR_OCTO_SOUNDCARD
- 	tristate "Support for audioinjector.net Octo channel (Hat) soundcard"
--	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
- 	select SND_SOC_CS42XX8_I2C
- 	help
- 	  Say Y or M if you want to add support for audioinjector.net octo add on
- 
- config SND_AUDIOINJECTOR_ISOLATED_SOUNDCARD
- 	tristate "Support for audioinjector.net isolated DAC and ADC soundcard"
--	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
- 	select SND_SOC_CS4271_I2C
- 	help
- 	  Say Y or M if you want to add support for audioinjector.net isolated soundcard
- 
- config SND_AUDIOSENSE_PI
- 	tristate "Support for AudioSense Add-On Soundcard"
--	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
- 	select SND_SOC_TLV320AIC32X4_I2C
- 	help
- 	  Say Y or M if you want to add support for tlv320aic32x4 add-on
- 
- config SND_DIGIDAC1_SOUNDCARD
-         tristate "Support for Red Rocks Audio DigiDAC1"
--        depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-         select SND_SOC_WM8804
-         select SND_SOC_WM8741
-         help
-@@ -241,35 +214,30 @@ config SND_DIGIDAC1_SOUNDCARD
- 
- config SND_BCM2708_SOC_DIONAUDIO_LOCO
- 	tristate "Support for Dion Audio LOCO DAC-AMP"
--	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
- 	select SND_SOC_PCM5102a
- 	help
- 	  Say Y or M if you want to add support for Dion Audio LOCO.
- 
- config SND_BCM2708_SOC_DIONAUDIO_LOCO_V2
- 	tristate "Support for Dion Audio LOCO-V2 DAC-AMP"
--	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
- 	select SND_SOC_PCM5122
- 	help
- 	  Say Y or M if you want to add support for Dion Audio LOCO-V2.
- 
- config SND_BCM2708_SOC_ALLO_PIANO_DAC
- 	tristate "Support for Allo Piano DAC"
--	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
- 	select SND_SOC_PCM512x_I2C
- 	help
- 	  Say Y or M if you want to add support for Allo Piano DAC.
- 
- config SND_BCM2708_SOC_ALLO_PIANO_DAC_PLUS
- 	tristate "Support for Allo Piano DAC Plus"
--	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
- 	select SND_SOC_PCM512x_I2C
- 	help
- 	  Say Y or M if you want to add support for Allo Piano DAC Plus.
- 
- config SND_BCM2708_SOC_ALLO_BOSS_DAC
- 	tristate "Support for Allo Boss DAC"
--	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
- 	select SND_SOC_PCM512x_I2C
- 	select COMMON_CLK_HIFIBERRY_DACPRO
- 	help
-@@ -277,7 +245,6 @@ config SND_BCM2708_SOC_ALLO_BOSS_DAC
- 
- config SND_BCM2708_SOC_ALLO_BOSS2_DAC
- 	tristate "Support for Allo Boss2 DAC"
--	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
- 	depends on I2C
- 	select REGMAP_I2C
- 	select SND_AUDIO_GRAPH_CARD
-@@ -286,7 +253,6 @@ config SND_BCM2708_SOC_ALLO_BOSS2_DAC
- 
- config SND_BCM2708_SOC_ALLO_DIGIONE
- 	tristate "Support for Allo DigiOne"
--	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
- 	select SND_SOC_WM8804
- 	select SND_RPI_WM8804_SOUNDCARD
- 	help
-@@ -294,7 +260,6 @@ config SND_BCM2708_SOC_ALLO_DIGIONE
- 
- config SND_BCM2708_SOC_ALLO_KATANA_DAC
- 	tristate "Support for Allo Katana DAC"
--	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
- 	depends on I2C
- 	select REGMAP_I2C
- 	select SND_AUDIO_GRAPH_CARD
-@@ -303,14 +268,12 @@ config SND_BCM2708_SOC_ALLO_KATANA_DAC
- 
- config SND_BCM2708_SOC_FE_PI_AUDIO
- 	tristate "Support for Fe-Pi-Audio"
--	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
- 	select SND_SOC_SGTL5000
- 	help
- 	  Say Y or M if you want to add support for Fe-Pi-Audio.
- 
- config SND_PISOUND
- 	tristate "Support for Blokas Labs pisound"
--	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
- 	select SND_RAWMIDI
- 	help
- 	  Say Y or M if you want to add support for Blokas Labs pisound.
-@@ -328,7 +291,6 @@ config SND_RPI_WM8804_SOUNDCARD
- 
- config SND_DACBERRY400
- 	tristate "Support for DACBERRY400 Soundcard"
--	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
- 	select SND_SOC_TLV320AIC3X_I2C
- 	help
- 	  Say Y or M if you want to add support for tlv320aic3x add-on
diff --git a/target/linux/bcm27xx/patches-6.1/950-0897-hwmon-Add-RP1-ADC-and-temperature-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0897-hwmon-Add-RP1-ADC-and-temperature-driver.patch
deleted file mode 100644
index c3cf21455b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0897-hwmon-Add-RP1-ADC-and-temperature-driver.patch
+++ /dev/null
@@ -1,343 +0,0 @@
-From cad3c92ff0c1a5fa539d08b695b0f6b326924890 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 2 Mar 2023 18:04:42 +0000
-Subject: [PATCH] hwmon: Add RP1 ADC and temperature driver
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/hwmon/Kconfig   |   7 +
- drivers/hwmon/Makefile  |   1 +
- drivers/hwmon/rp1-adc.c | 301 ++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 309 insertions(+)
- create mode 100644 drivers/hwmon/rp1-adc.c
-
---- a/drivers/hwmon/Kconfig
-+++ b/drivers/hwmon/Kconfig
-@@ -2331,6 +2331,13 @@ config SENSORS_INTEL_M10_BMC_HWMON
- 	  sensors monitor various telemetry data of different components on the
- 	  card, e.g. board temperature, FPGA core temperature/voltage/current.
- 
-+config SENSORS_RP1_ADC
-+	tristate "RP1 ADC and temperature sensor driver"
-+	depends on MFD_RP1
-+	help
-+	  Say yes here to enable support for the voltage and temperature
-+	  sensors of the Raspberry Pi RP1 peripheral chip.
-+
- if ACPI
- 
- comment "ACPI drivers"
---- a/drivers/hwmon/Makefile
-+++ b/drivers/hwmon/Makefile
-@@ -173,6 +173,7 @@ obj-$(CONFIG_SENSORS_PCF8591)	+= pcf8591
- obj-$(CONFIG_SENSORS_POWR1220)  += powr1220.o
- obj-$(CONFIG_SENSORS_PWM_FAN)	+= pwm-fan.o
- obj-$(CONFIG_SENSORS_RASPBERRYPI_HWMON)	+= raspberrypi-hwmon.o
-+obj-$(CONFIG_SENSORS_RP1_ADC)	+= rp1-adc.o
- obj-$(CONFIG_SENSORS_S3C)	+= s3c-hwmon.o
- obj-$(CONFIG_SENSORS_SBTSI)	+= sbtsi_temp.o
- obj-$(CONFIG_SENSORS_SBRMI)	+= sbrmi.o
---- /dev/null
-+++ b/drivers/hwmon/rp1-adc.c
-@@ -0,0 +1,301 @@
-+// SPDX-License-Identifier: GPL-2.0+
-+/*
-+ * Driver for the RP1 ADC and temperature sensor
-+ * Copyright (C) 2023 Raspberry Pi Ltd.
-+ */
-+
-+#include <linux/clk.h>
-+#include <linux/err.h>
-+#include <linux/hwmon.h>
-+#include <linux/hwmon-sysfs.h>
-+#include <linux/io.h>
-+#include <linux/module.h>
-+#include <linux/mod_devicetable.h>
-+#include <linux/platform_device.h>
-+#include <linux/regulator/consumer.h>
-+
-+#define MODULE_NAME	"rp1-adc"
-+
-+#define RP1_ADC_CS		0x00
-+#define RP1_ADC_RESULT		0x04
-+#define RP1_ADC_FCS		0x08
-+#define RP1_ADC_FIFO		0x0c
-+#define RP1_ADC_DIV		0x10
-+
-+#define RP1_ADC_INTR		0x14
-+#define RP1_ADC_INTE		0x18
-+#define RP1_ADC_INTF		0x1c
-+#define RP1_ADC_INTS		0x20
-+
-+#define RP1_ADC_RWTYPE_SET	0x2000
-+#define RP1_ADC_RWTYPE_CLR	0x3000
-+
-+#define RP1_ADC_CS_RROBIN_MASK	0x1f
-+#define RP1_ADC_CS_RROBIN_SHIFT	16
-+#define RP1_ADC_CS_AINSEL_MASK	0x7
-+#define RP1_ADC_CS_AINSEL_SHIFT	12
-+#define RP1_ADC_CS_ERR_STICKY	0x400
-+#define RP1_ADC_CS_ERR		0x200
-+#define RP1_ADC_CS_READY	0x100
-+#define RP1_ADC_CS_START_MANY	0x8
-+#define RP1_ADC_CS_START_ONCE	0x4
-+#define RP1_ADC_CS_TS_EN	0x2
-+#define RP1_ADC_CS_EN		0x1
-+
-+#define RP1_ADC_FCS_THRESH_MASK	0xf
-+#define RP1_ADC_FCS_THRESH_SHIFT	24
-+#define RP1_ADC_FCS_LEVEL_MASK	0xf
-+#define RP1_ADC_FCS_LEVEL_SHIFT	16
-+#define RP1_ADC_FCS_OVER	0x800
-+#define RP1_ADC_FCS_UNDER	0x400
-+#define RP1_ADC_FCS_FULL	0x200
-+#define RP1_ADC_FCS_EMPTY	0x100
-+#define RP1_ADC_FCS_DREQ_EN	0x8
-+#define RP1_ADC_FCS_ERR		0x4
-+#define RP1_ADC_FCS_SHIFR	0x2
-+#define RP1_ADC_FCS_EN		0x1
-+
-+#define RP1_ADC_FIFO_ERR	0x8000
-+#define RP1_ADC_FIFO_VAL_MASK	0xfff
-+
-+#define RP1_ADC_DIV_INT_MASK	0xffff
-+#define RP1_ADC_DIV_INT_SHIFT	8
-+#define RP1_ADC_DIV_FRAC_MASK	0xff
-+#define RP1_ADC_DIV_FRAC_SHIFT	0
-+
-+struct rp1_adc_data {
-+	void __iomem *base;
-+	spinlock_t lock;
-+	struct device *hwmon_dev;
-+	int vref_mv;
-+};
-+
-+static int rp1_adc_ready_wait(struct rp1_adc_data *data)
-+{
-+	int retries = 10;
-+
-+	while (retries && !(readl(data->base + RP1_ADC_CS) & RP1_ADC_CS_READY))
-+		retries--;
-+
-+	return retries ? 0 : -EIO;
-+}
-+
-+static int rp1_adc_read(struct rp1_adc_data *data,
-+			struct device_attribute *devattr, unsigned int *val)
-+{
-+	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
-+	int channel = attr->index;
-+	int ret;
-+
-+	spin_lock(&data->lock);
-+
-+	writel(RP1_ADC_CS_AINSEL_MASK << RP1_ADC_CS_AINSEL_SHIFT,
-+	       data->base + RP1_ADC_RWTYPE_CLR + RP1_ADC_CS);
-+	writel(channel << RP1_ADC_CS_AINSEL_SHIFT,
-+	       data->base + RP1_ADC_RWTYPE_SET + RP1_ADC_CS);
-+	writel(RP1_ADC_CS_START_ONCE,
-+	       data->base + RP1_ADC_RWTYPE_SET + RP1_ADC_CS);
-+
-+	ret = rp1_adc_ready_wait(data);
-+	if (!ret)
-+		*val = readl(data->base + RP1_ADC_RESULT);
-+
-+	spin_unlock(&data->lock);
-+
-+	return ret;
-+}
-+
-+static int rp1_adc_to_mv(struct rp1_adc_data *data, unsigned int val)
-+{
-+	return ((u64)data->vref_mv * val) / 0xfff;
-+}
-+
-+static ssize_t rp1_adc_show(struct device *dev,
-+			    struct device_attribute *devattr,
-+			    char *buf)
-+{
-+	struct rp1_adc_data *data = dev_get_drvdata(dev);
-+	unsigned int val;
-+	int ret;
-+
-+	ret = rp1_adc_read(data, devattr, &val);
-+	if (ret)
-+		return ret;
-+
-+	return sprintf(buf, "%d\n", rp1_adc_to_mv(data, val));
-+}
-+
-+static ssize_t rp1_adc_temp_show(struct device *dev,
-+				 struct device_attribute *devattr,
-+				 char *buf)
-+{
-+	struct rp1_adc_data *data = dev_get_drvdata(dev);
-+	unsigned int val;
-+	int ret, mv, mc;
-+
-+	writel(RP1_ADC_CS_TS_EN,
-+	       data->base + RP1_ADC_RWTYPE_SET + RP1_ADC_CS);
-+	ret = rp1_adc_read(data, devattr, &val);
-+	if (ret)
-+		return ret;
-+
-+	mv = rp1_adc_to_mv(data, val);
-+
-+	/* T = 27 - (ADC_voltage - 0.706)/0.001721 */
-+
-+	mc = 27000 - DIV_ROUND_CLOSEST((mv - 706) * (s64)1000000, 1721);
-+
-+	return sprintf(buf, "%d\n", mc);
-+}
-+
-+static ssize_t rp1_adc_raw_show(struct device *dev,
-+				struct device_attribute *devattr,
-+				char *buf)
-+{
-+	struct rp1_adc_data *data = dev_get_drvdata(dev);
-+	unsigned int val;
-+	int ret = rp1_adc_read(data, devattr, &val);
-+
-+	if (ret)
-+		return ret;
-+
-+	return sprintf(buf, "%u\n", val);
-+}
-+
-+static ssize_t rp1_adc_temp_raw_show(struct device *dev,
-+				     struct device_attribute *devattr,
-+				     char *buf)
-+{
-+	struct rp1_adc_data *data = dev_get_drvdata(dev);
-+	unsigned int val;
-+	int ret = rp1_adc_read(data, devattr, &val);
-+
-+	if (ret)
-+		return ret;
-+
-+	return sprintf(buf, "%u\n", val);
-+}
-+
-+static SENSOR_DEVICE_ATTR_RO(in1_input, rp1_adc, 0);
-+static SENSOR_DEVICE_ATTR_RO(in2_input, rp1_adc, 1);
-+static SENSOR_DEVICE_ATTR_RO(in3_input, rp1_adc, 2);
-+static SENSOR_DEVICE_ATTR_RO(in4_input, rp1_adc, 3);
-+static SENSOR_DEVICE_ATTR_RO(temp1_input, rp1_adc_temp, 4);
-+static SENSOR_DEVICE_ATTR_RO(in1_raw, rp1_adc_raw, 0);
-+static SENSOR_DEVICE_ATTR_RO(in2_raw, rp1_adc_raw, 1);
-+static SENSOR_DEVICE_ATTR_RO(in3_raw, rp1_adc_raw, 2);
-+static SENSOR_DEVICE_ATTR_RO(in4_raw, rp1_adc_raw, 3);
-+static SENSOR_DEVICE_ATTR_RO(temp1_raw, rp1_adc_temp_raw, 4);
-+
-+static struct attribute *rp1_adc_attrs[] = {
-+	&sensor_dev_attr_in1_input.dev_attr.attr,
-+	&sensor_dev_attr_in2_input.dev_attr.attr,
-+	&sensor_dev_attr_in3_input.dev_attr.attr,
-+	&sensor_dev_attr_in4_input.dev_attr.attr,
-+	&sensor_dev_attr_temp1_input.dev_attr.attr,
-+	&sensor_dev_attr_in1_raw.dev_attr.attr,
-+	&sensor_dev_attr_in2_raw.dev_attr.attr,
-+	&sensor_dev_attr_in3_raw.dev_attr.attr,
-+	&sensor_dev_attr_in4_raw.dev_attr.attr,
-+	&sensor_dev_attr_temp1_raw.dev_attr.attr,
-+	NULL
-+};
-+
-+static umode_t rp1_adc_is_visible(struct kobject *kobj,
-+				  struct attribute *attr, int index)
-+{
-+	return 0444;
-+}
-+
-+static const struct attribute_group rp1_adc_group = {
-+	.attrs = rp1_adc_attrs,
-+	.is_visible = rp1_adc_is_visible,
-+};
-+__ATTRIBUTE_GROUPS(rp1_adc);
-+
-+static int __init rp1_adc_probe(struct platform_device *pdev)
-+{
-+	struct rp1_adc_data *data;
-+	struct regulator *reg;
-+	struct clk *clk;
-+	int vref_uv, ret;
-+
-+	data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
-+	if (!data)
-+		return -ENOMEM;
-+
-+	spin_lock_init(&data->lock);
-+
-+	data->base = devm_platform_ioremap_resource(pdev, 0);
-+	if (IS_ERR(data->base))
-+		return PTR_ERR(data->base);
-+
-+	platform_set_drvdata(pdev, data);
-+
-+	clk = devm_clk_get(&pdev->dev, NULL);
-+	if (IS_ERR(clk))
-+		return -ENODEV;
-+
-+	clk_set_rate(clk, 50000000);
-+	clk_prepare_enable(clk);
-+
-+	reg = devm_regulator_get(&pdev->dev, "vref");
-+	if (IS_ERR(reg))
-+		return PTR_ERR(reg);
-+
-+	vref_uv = regulator_get_voltage(reg);
-+	data->vref_mv = DIV_ROUND_CLOSEST(vref_uv, 1000);
-+
-+	data->hwmon_dev =
-+	    devm_hwmon_device_register_with_groups(&pdev->dev,
-+						   "rp1_adc",
-+						   data,
-+						   rp1_adc_groups);
-+	if (IS_ERR(data->hwmon_dev)) {
-+		ret = PTR_ERR(data->hwmon_dev);
-+		dev_err(&pdev->dev, "hwmon_device_register failed with %d.\n", ret);
-+		goto err_register;
-+	}
-+
-+	/* Disable interrupts */
-+	writel(0, data->base + RP1_ADC_INTE);
-+
-+	/* Enable the block, clearing any sticky error */
-+	writel(RP1_ADC_CS_EN | RP1_ADC_CS_ERR_STICKY, data->base + RP1_ADC_CS);
-+
-+	return 0;
-+
-+err_register:
-+	sysfs_remove_group(&pdev->dev.kobj, &rp1_adc_group);
-+
-+	return ret;
-+}
-+
-+static int rp1_adc_remove(struct platform_device *pdev)
-+{
-+	struct rp1_adc_data *data = platform_get_drvdata(pdev);
-+
-+	hwmon_device_unregister(data->hwmon_dev);
-+
-+	return 0;
-+}
-+
-+static const struct of_device_id rp1_adc_dt_ids[] = {
-+	{ .compatible = "raspberrypi,rp1-adc", },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(of, rp1_adc_dt_ids);
-+
-+static struct platform_driver rp1_adc_driver = {
-+	.remove		= rp1_adc_remove,
-+	.driver		= {
-+		.name	= MODULE_NAME,
-+		.of_match_table = rp1_adc_dt_ids,
-+	},
-+};
-+
-+module_platform_driver_probe(rp1_adc_driver, rp1_adc_probe);
-+
-+MODULE_DESCRIPTION("RP1 ADC driver");
-+MODULE_AUTHOR("Phil Elwell <phil@raspberrypi.com>");
-+MODULE_LICENSE("GPL");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0898-mfd-bcm2835-pm-Add-support-for-BCM2712.patch b/target/linux/bcm27xx/patches-6.1/950-0898-mfd-bcm2835-pm-Add-support-for-BCM2712.patch
deleted file mode 100644
index 37210173db..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0898-mfd-bcm2835-pm-Add-support-for-BCM2712.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 0c7aeb96fd3ab68011ba6c24239c501190890308 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 8 Mar 2023 14:27:58 +0000
-Subject: [PATCH] mfd: bcm2835-pm: Add support for BCM2712
-
-BCM2712 lacks the "asb" and "rpivid_asb" register ranges, but still
-requires the use of the bcm2835-power driver to reset the V3D block.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/mfd/bcm2835-pm.c | 28 +++++++++++++++++++---------
- 1 file changed, 19 insertions(+), 9 deletions(-)
-
---- a/drivers/mfd/bcm2835-pm.c
-+++ b/drivers/mfd/bcm2835-pm.c
-@@ -69,12 +69,30 @@ static int bcm2835_pm_get_pdata(struct p
- 	return 0;
- }
- 
-+static const struct of_device_id bcm2835_pm_of_match[] = {
-+	{ .compatible = "brcm,bcm2835-pm-wdt", },
-+	{ .compatible = "brcm,bcm2835-pm", },
-+	{ .compatible = "brcm,bcm2711-pm", },
-+	{ .compatible = "brcm,bcm2712-pm", .data = (const void *)1},
-+	{},
-+};
-+MODULE_DEVICE_TABLE(of, bcm2835_pm_of_match);
-+
- static int bcm2835_pm_probe(struct platform_device *pdev)
- {
-+	const struct of_device_id *of_id;
- 	struct device *dev = &pdev->dev;
- 	struct bcm2835_pm *pm;
-+	bool is_2712;
- 	int ret;
- 
-+	of_id = of_match_node(bcm2835_pm_of_match, pdev->dev.of_node);
-+	if (!of_id) {
-+		dev_err(&pdev->dev, "Failed to match compatible string\n");
-+		return -EINVAL;
-+	}
-+	is_2712 = !!of_id->data;
-+
- 	pm = devm_kzalloc(dev, sizeof(*pm), GFP_KERNEL);
- 	if (!pm)
- 		return -ENOMEM;
-@@ -97,21 +115,13 @@ static int bcm2835_pm_probe(struct platf
- 	 * bcm2835-pm binding as the key for whether we can reference
- 	 * the full PM register range and support power domains.
- 	 */
--	if (pm->asb)
-+	if (pm->asb || is_2712)
- 		return devm_mfd_add_devices(dev, -1, bcm2835_power_devs,
- 					    ARRAY_SIZE(bcm2835_power_devs),
- 					    NULL, 0, NULL);
- 	return 0;
- }
- 
--static const struct of_device_id bcm2835_pm_of_match[] = {
--	{ .compatible = "brcm,bcm2835-pm-wdt", },
--	{ .compatible = "brcm,bcm2835-pm", },
--	{ .compatible = "brcm,bcm2711-pm", },
--	{},
--};
--MODULE_DEVICE_TABLE(of, bcm2835_pm_of_match);
--
- static struct platform_driver bcm2835_pm_driver = {
- 	.probe		= bcm2835_pm_probe,
- 	.driver = {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0899-soc-bcm-bcm2835-power-Add-support-for-BCM2712.patch b/target/linux/bcm27xx/patches-6.1/950-0899-soc-bcm-bcm2835-power-Add-support-for-BCM2712.patch
deleted file mode 100644
index e7e3652d91..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0899-soc-bcm-bcm2835-power-Add-support-for-BCM2712.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 9cf85a95eeb239a079a3485bd1d0447431bdc7f1 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 8 Mar 2023 14:42:48 +0000
-Subject: [PATCH] soc: bcm: bcm2835-power: Add support for BCM2712
-
-BCM2712 has a PM block but neither ASB nor RPIVID_ASB. Use the absence
-of the "asb" register range to indicate BCM2712 and its different PM
-register range.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/soc/bcm/bcm2835-power.c | 29 +++++++++++++++++++----------
- 1 file changed, 19 insertions(+), 10 deletions(-)
-
---- a/drivers/soc/bcm/bcm2835-power.c
-+++ b/drivers/soc/bcm/bcm2835-power.c
-@@ -79,6 +79,7 @@
- #define PM_IMAGE			0x108
- #define PM_GRAFX			0x10c
- #define PM_PROC				0x110
-+#define PM_GRAFX_2712			0x304
- #define PM_ENAB				BIT(12)
- #define PM_ISPRSTN			BIT(8)
- #define PM_H264RSTN			BIT(7)
-@@ -381,6 +382,9 @@ static int bcm2835_power_pd_power_on(str
- 		return bcm2835_power_power_on(pd, PM_GRAFX);
- 
- 	case BCM2835_POWER_DOMAIN_GRAFX_V3D:
-+		if (!power->asb)
-+			return bcm2835_asb_power_on(pd, PM_GRAFX_2712,
-+						    0, 0, PM_V3DRSTN);
- 		return bcm2835_asb_power_on(pd, PM_GRAFX,
- 					    ASB_V3D_M_CTRL, ASB_V3D_S_CTRL,
- 					    PM_V3DRSTN);
-@@ -447,6 +451,9 @@ static int bcm2835_power_pd_power_off(st
- 		return bcm2835_power_power_off(pd, PM_GRAFX);
- 
- 	case BCM2835_POWER_DOMAIN_GRAFX_V3D:
-+		if (!power->asb)
-+			return bcm2835_asb_power_off(pd, PM_GRAFX_2712,
-+						    0, 0, PM_V3DRSTN);
- 		return bcm2835_asb_power_off(pd, PM_GRAFX,
- 					     ASB_V3D_M_CTRL, ASB_V3D_S_CTRL,
- 					     PM_V3DRSTN);
-@@ -642,19 +649,21 @@ static int bcm2835_power_probe(struct pl
- 	power->asb = pm->asb;
- 	power->rpivid_asb = pm->rpivid_asb;
- 
--	id = readl(power->asb + ASB_AXI_BRDG_ID);
--	if (id != BCM2835_BRDG_ID /* "BRDG" */) {
--		dev_err(dev, "ASB register ID returned 0x%08x\n", id);
--		return -ENODEV;
--	}
--
--	if (power->rpivid_asb) {
--		id = readl(power->rpivid_asb + ASB_AXI_BRDG_ID);
-+	if (power->asb) {
-+		id = readl(power->asb + ASB_AXI_BRDG_ID);
- 		if (id != BCM2835_BRDG_ID /* "BRDG" */) {
--			dev_err(dev, "RPiVid ASB register ID returned 0x%08x\n",
--				     id);
-+			dev_err(dev, "ASB register ID returned 0x%08x\n", id);
- 			return -ENODEV;
- 		}
-+
-+		if (power->rpivid_asb) {
-+			id = readl(power->rpivid_asb + ASB_AXI_BRDG_ID);
-+			if (id != BCM2835_BRDG_ID /* "BRDG" */) {
-+				dev_err(dev, "RPiVid ASB register ID returned 0x%08x\n",
-+					id);
-+				return -ENODEV;
-+			}
-+		}
- 	}
- 
- 	power->pd_xlate.domains = devm_kcalloc(dev,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0900-drivers-spi-Fix-spi-gpio-to-correctly-implement-sck-.patch b/target/linux/bcm27xx/patches-6.1/950-0900-drivers-spi-Fix-spi-gpio-to-correctly-implement-sck-.patch
deleted file mode 100644
index ff8471411f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0900-drivers-spi-Fix-spi-gpio-to-correctly-implement-sck-.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From 380c336af070edf85826abbb0057bf92a03ec466 Mon Sep 17 00:00:00 2001
-From: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
-Date: Wed, 1 Mar 2023 17:57:11 +0000
-Subject: [PATCH] drivers: spi: Fix spi-gpio to correctly implement
- sck-idle-input
-
-Formerly, if configured using DT, CS GPIOs were driven from spi.c
-and it was possible for CS to be asserted (low) *before* starting
-to drive SCK. CS GPIOs have been brought under control of this
-driver in both ACPI and DT cases, with a fixup for GPIO polarity.
-
-Signed-off-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
----
- drivers/spi/spi-gpio.c | 74 +++++++++++++++++++++++++++++-------------
- 1 file changed, 51 insertions(+), 23 deletions(-)
-
---- a/drivers/spi/spi-gpio.c
-+++ b/drivers/spi/spi-gpio.c
-@@ -37,6 +37,7 @@ struct spi_gpio {
- 	struct gpio_desc		*mosi;
- 	bool				sck_idle_input;
- 	struct gpio_desc		**cs_gpios;
-+	bool                            cs_dont_invert;
- };
- 
- /*----------------------------------------------------------------------*/
-@@ -233,12 +234,18 @@ static void spi_gpio_chipselect(struct s
- 			gpiod_set_value_cansleep(spi_gpio->sck, spi->mode & SPI_CPOL);
- 	}
- 
--	/* Drive chip select line, if we have one */
-+	/*
-+	 * Drive chip select line, if we have one.
-+	 * SPI chip selects are normally active-low, but when
-+	 * cs_dont_invert is set, we assume their polarity is
-+	 * controlled by the GPIO, and write '1' to assert.
-+	 */
- 	if (spi_gpio->cs_gpios) {
- 		struct gpio_desc *cs = spi_gpio->cs_gpios[spi->chip_select];
-+		int val = ((spi->mode & SPI_CS_HIGH) || spi_gpio->cs_dont_invert) ?
-+			is_active : !is_active;
- 
--		/* SPI chip selects are normally active-low */
--		gpiod_set_value_cansleep(cs, (spi->mode & SPI_CS_HIGH) ? is_active : !is_active);
-+		gpiod_set_value_cansleep(cs, val);
- 	}
- 
- 	if (spi_gpio->sck_idle_input && !is_active)
-@@ -254,12 +261,14 @@ static int spi_gpio_setup(struct spi_dev
- 	/*
- 	 * The CS GPIOs have already been
- 	 * initialized from the descriptor lookup.
-+	 * Here we set them to the non-asserted state.
- 	 */
- 	if (spi_gpio->cs_gpios) {
- 		cs = spi_gpio->cs_gpios[spi->chip_select];
- 		if (!spi->controller_state && cs)
- 			status = gpiod_direction_output(cs,
--						  !(spi->mode & SPI_CS_HIGH));
-+							!((spi->mode & SPI_CS_HIGH) ||
-+							   spi_gpio->cs_dont_invert));
- 	}
- 
- 	if (!status)
-@@ -336,6 +345,38 @@ static int spi_gpio_request(struct devic
- 	return PTR_ERR_OR_ZERO(spi_gpio->sck);
- }
- 
-+/*
-+ * In order to implement "sck-idle-input" (which requires SCK
-+ * direction and CS level to be switched in a particular order),
-+ * we need to control GPIO chip selects from within this driver.
-+ */
-+
-+static int spi_gpio_probe_get_cs_gpios(struct device *dev,
-+				       struct spi_master *master,
-+				       bool gpio_defines_polarity)
-+{
-+	int i;
-+	struct spi_gpio *spi_gpio = spi_master_get_devdata(master);
-+
-+	spi_gpio->cs_dont_invert = gpio_defines_polarity;
-+	spi_gpio->cs_gpios = devm_kcalloc(dev, master->num_chipselect,
-+					  sizeof(*spi_gpio->cs_gpios),
-+					  GFP_KERNEL);
-+	if (!spi_gpio->cs_gpios)
-+		return -ENOMEM;
-+
-+	for (i = 0; i < master->num_chipselect; i++) {
-+		spi_gpio->cs_gpios[i] =
-+			devm_gpiod_get_index(dev, "cs", i,
-+					     gpio_defines_polarity ?
-+						GPIOD_OUT_LOW : GPIOD_OUT_HIGH);
-+		if (IS_ERR(spi_gpio->cs_gpios[i]))
-+			return PTR_ERR(spi_gpio->cs_gpios[i]);
-+	}
-+
-+	return 0;
-+}
-+
- #ifdef CONFIG_OF
- static const struct of_device_id spi_gpio_dt_ids[] = {
- 	{ .compatible = "spi-gpio" },
-@@ -346,10 +387,12 @@ MODULE_DEVICE_TABLE(of, spi_gpio_dt_ids)
- static int spi_gpio_probe_dt(struct platform_device *pdev,
- 			     struct spi_master *master)
- {
--	master->dev.of_node = pdev->dev.of_node;
--	master->use_gpio_descriptors = true;
-+	struct device *dev = &pdev->dev;
- 
--	return 0;
-+	master->dev.of_node = dev->of_node;
-+	master->num_chipselect = gpiod_count(dev, "cs");
-+
-+	return spi_gpio_probe_get_cs_gpios(dev, master, true);
- }
- #else
- static inline int spi_gpio_probe_dt(struct platform_device *pdev,
-@@ -364,8 +407,6 @@ static int spi_gpio_probe_pdata(struct p
- {
- 	struct device *dev = &pdev->dev;
- 	struct spi_gpio_platform_data *pdata = dev_get_platdata(dev);
--	struct spi_gpio *spi_gpio = spi_master_get_devdata(master);
--	int i;
- 
- #ifdef GENERIC_BITBANG
- 	if (!pdata || !pdata->num_chipselect)
-@@ -377,20 +418,7 @@ static int spi_gpio_probe_pdata(struct p
- 	 */
- 	master->num_chipselect = pdata->num_chipselect ?: 1;
- 
--	spi_gpio->cs_gpios = devm_kcalloc(dev, master->num_chipselect,
--					  sizeof(*spi_gpio->cs_gpios),
--					  GFP_KERNEL);
--	if (!spi_gpio->cs_gpios)
--		return -ENOMEM;
--
--	for (i = 0; i < master->num_chipselect; i++) {
--		spi_gpio->cs_gpios[i] = devm_gpiod_get_index(dev, "cs", i,
--							     GPIOD_OUT_HIGH);
--		if (IS_ERR(spi_gpio->cs_gpios[i]))
--			return PTR_ERR(spi_gpio->cs_gpios[i]);
--	}
--
--	return 0;
-+	return spi_gpio_probe_get_cs_gpios(dev, master, false);
- }
- 
- static int spi_gpio_probe(struct platform_device *pdev)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0901-spi-spi-gpio-Implement-spidelay-when-requested-bit-r.patch b/target/linux/bcm27xx/patches-6.1/950-0901-spi-spi-gpio-Implement-spidelay-when-requested-bit-r.patch
deleted file mode 100644
index 1b7952ab18..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0901-spi-spi-gpio-Implement-spidelay-when-requested-bit-r.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 586f87307e75552292cfc6c76b81cd38d5ec31e2 Mon Sep 17 00:00:00 2001
-From: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
-Date: Mon, 4 Sep 2023 10:57:47 +0100
-Subject: [PATCH] spi: spi-gpio: Implement spidelay when requested bit rate <=
- 1 Mbps
-
-Formerly the delay was omitted as bit-banged SPI seldom achieved
-even one Mbit/s; but some modern platforms can run faster, and
-some SPI devices may need to be clocked slower.
-
-Signed-off-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
----
- drivers/spi/spi-gpio.c | 18 ++++++++++++------
- 1 file changed, 12 insertions(+), 6 deletions(-)
-
---- a/drivers/spi/spi-gpio.c
-+++ b/drivers/spi/spi-gpio.c
-@@ -11,12 +11,12 @@
- #include <linux/gpio/consumer.h>
- #include <linux/of.h>
- #include <linux/of_device.h>
-+#include <linux/delay.h>
- 
- #include <linux/spi/spi.h>
- #include <linux/spi/spi_bitbang.h>
- #include <linux/spi/spi_gpio.h>
- 
--
- /*
-  * This bitbanging SPI master driver should help make systems usable
-  * when a native hardware SPI engine is not available, perhaps because
-@@ -111,12 +111,18 @@ static inline int getmiso(const struct s
- }
- 
- /*
-- * NOTE:  this clocks "as fast as we can".  It "should" be a function of the
-- * requested device clock.  Software overhead means we usually have trouble
-- * reaching even one Mbit/sec (except when we can inline bitops), so for now
-- * we'll just assume we never need additional per-bit slowdowns.
-+ * Generic bit-banged GPIO SPI might free-run at something in the range
-+ * 1Mbps ~ 10Mbps (depending on the platform), and some SPI devices may
-+ * need to be clocked at a lower rate. ndelay() is often implemented by
-+ * udelay() with rounding up, so do the delay only for nsecs >= 500
-+ * (<= 1Mbps). The conditional test adds a small overhead.
-  */
--#define spidelay(nsecs)	do {} while (0)
-+
-+static inline void spidelay(unsigned long nsecs)
-+{
-+	if (nsecs >= 500)
-+		ndelay(nsecs);
-+}
- 
- #include "spi-bitbang-txrx.h"
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0902-drm-v3d-fix-up-register-addresses-for-V3D-7.x.patch b/target/linux/bcm27xx/patches-6.1/950-0902-drm-v3d-fix-up-register-addresses-for-V3D-7.x.patch
deleted file mode 100644
index 1a51a85660..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0902-drm-v3d-fix-up-register-addresses-for-V3D-7.x.patch
+++ /dev/null
@@ -1,672 +0,0 @@
-From 3f949caeef21269afc67dd62ae9826204f215934 Mon Sep 17 00:00:00 2001
-From: Iago Toral Quiroga <itoral@igalia.com>
-Date: Thu, 2 Mar 2023 11:49:46 +0100
-Subject: [PATCH] drm/v3d: fix up register addresses for V3D 7.x
-
-v2: fix kernel panic with debug-fs interface to list registers
----
- drivers/gpu/drm/v3d/v3d_debugfs.c | 177 +++++++++++++++++-------------
- drivers/gpu/drm/v3d/v3d_gem.c     |   3 +
- drivers/gpu/drm/v3d/v3d_irq.c     |  47 ++++----
- drivers/gpu/drm/v3d/v3d_regs.h    |  51 ++++++++-
- drivers/gpu/drm/v3d/v3d_sched.c   |  41 ++++---
- 5 files changed, 204 insertions(+), 115 deletions(-)
-
---- a/drivers/gpu/drm/v3d/v3d_debugfs.c
-+++ b/drivers/gpu/drm/v3d/v3d_debugfs.c
-@@ -13,69 +13,83 @@
- #include "v3d_drv.h"
- #include "v3d_regs.h"
- 
--#define REGDEF(reg) { reg, #reg }
-+#define REGDEF(min_ver, max_ver, reg) { min_ver, max_ver, reg, #reg }
- struct v3d_reg_def {
-+	u32 min_ver;
-+	u32 max_ver;
- 	u32 reg;
- 	const char *name;
- };
- 
- static const struct v3d_reg_def v3d_hub_reg_defs[] = {
--	REGDEF(V3D_HUB_AXICFG),
--	REGDEF(V3D_HUB_UIFCFG),
--	REGDEF(V3D_HUB_IDENT0),
--	REGDEF(V3D_HUB_IDENT1),
--	REGDEF(V3D_HUB_IDENT2),
--	REGDEF(V3D_HUB_IDENT3),
--	REGDEF(V3D_HUB_INT_STS),
--	REGDEF(V3D_HUB_INT_MSK_STS),
--
--	REGDEF(V3D_MMU_CTL),
--	REGDEF(V3D_MMU_VIO_ADDR),
--	REGDEF(V3D_MMU_VIO_ID),
--	REGDEF(V3D_MMU_DEBUG_INFO),
-+	REGDEF(33, 42, V3D_HUB_AXICFG),
-+	REGDEF(33, 71, V3D_HUB_UIFCFG),
-+	REGDEF(33, 71, V3D_HUB_IDENT0),
-+	REGDEF(33, 71, V3D_HUB_IDENT1),
-+	REGDEF(33, 71, V3D_HUB_IDENT2),
-+	REGDEF(33, 71, V3D_HUB_IDENT3),
-+	REGDEF(33, 71, V3D_HUB_INT_STS),
-+	REGDEF(33, 71, V3D_HUB_INT_MSK_STS),
-+
-+	REGDEF(33, 71, V3D_MMU_CTL),
-+	REGDEF(33, 71, V3D_MMU_VIO_ADDR),
-+	REGDEF(33, 71, V3D_MMU_VIO_ID),
-+	REGDEF(33, 71, V3D_MMU_DEBUG_INFO),
-+
-+	REGDEF(71, 71, V3D_V7_GMP_STATUS),
-+	REGDEF(71, 71, V3D_V7_GMP_CFG),
-+	REGDEF(71, 71, V3D_V7_GMP_VIO_ADDR),
- };
- 
- static const struct v3d_reg_def v3d_gca_reg_defs[] = {
--	REGDEF(V3D_GCA_SAFE_SHUTDOWN),
--	REGDEF(V3D_GCA_SAFE_SHUTDOWN_ACK),
-+	REGDEF(33, 33, V3D_GCA_SAFE_SHUTDOWN),
-+	REGDEF(33, 33, V3D_GCA_SAFE_SHUTDOWN_ACK),
- };
- 
- static const struct v3d_reg_def v3d_core_reg_defs[] = {
--	REGDEF(V3D_CTL_IDENT0),
--	REGDEF(V3D_CTL_IDENT1),
--	REGDEF(V3D_CTL_IDENT2),
--	REGDEF(V3D_CTL_MISCCFG),
--	REGDEF(V3D_CTL_INT_STS),
--	REGDEF(V3D_CTL_INT_MSK_STS),
--	REGDEF(V3D_CLE_CT0CS),
--	REGDEF(V3D_CLE_CT0CA),
--	REGDEF(V3D_CLE_CT0EA),
--	REGDEF(V3D_CLE_CT1CS),
--	REGDEF(V3D_CLE_CT1CA),
--	REGDEF(V3D_CLE_CT1EA),
--
--	REGDEF(V3D_PTB_BPCA),
--	REGDEF(V3D_PTB_BPCS),
--
--	REGDEF(V3D_GMP_STATUS),
--	REGDEF(V3D_GMP_CFG),
--	REGDEF(V3D_GMP_VIO_ADDR),
--
--	REGDEF(V3D_ERR_FDBGO),
--	REGDEF(V3D_ERR_FDBGB),
--	REGDEF(V3D_ERR_FDBGS),
--	REGDEF(V3D_ERR_STAT),
-+	REGDEF(33, 71, V3D_CTL_IDENT0),
-+	REGDEF(33, 71, V3D_CTL_IDENT1),
-+	REGDEF(33, 71, V3D_CTL_IDENT2),
-+	REGDEF(33, 71, V3D_CTL_MISCCFG),
-+	REGDEF(33, 71, V3D_CTL_INT_STS),
-+	REGDEF(33, 71, V3D_CTL_INT_MSK_STS),
-+	REGDEF(33, 71, V3D_CLE_CT0CS),
-+	REGDEF(33, 71, V3D_CLE_CT0CA),
-+	REGDEF(33, 71, V3D_CLE_CT0EA),
-+	REGDEF(33, 71, V3D_CLE_CT1CS),
-+	REGDEF(33, 71, V3D_CLE_CT1CA),
-+	REGDEF(33, 71, V3D_CLE_CT1EA),
-+
-+	REGDEF(33, 71, V3D_PTB_BPCA),
-+	REGDEF(33, 71, V3D_PTB_BPCS),
-+
-+	REGDEF(33, 41, V3D_GMP_STATUS),
-+	REGDEF(33, 41, V3D_GMP_CFG),
-+	REGDEF(33, 41, V3D_GMP_VIO_ADDR),
-+
-+	REGDEF(33, 71, V3D_ERR_FDBGO),
-+	REGDEF(33, 71, V3D_ERR_FDBGB),
-+	REGDEF(33, 71, V3D_ERR_FDBGS),
-+	REGDEF(33, 71, V3D_ERR_STAT),
- };
- 
- static const struct v3d_reg_def v3d_csd_reg_defs[] = {
--	REGDEF(V3D_CSD_STATUS),
--	REGDEF(V3D_CSD_CURRENT_CFG0),
--	REGDEF(V3D_CSD_CURRENT_CFG1),
--	REGDEF(V3D_CSD_CURRENT_CFG2),
--	REGDEF(V3D_CSD_CURRENT_CFG3),
--	REGDEF(V3D_CSD_CURRENT_CFG4),
--	REGDEF(V3D_CSD_CURRENT_CFG5),
--	REGDEF(V3D_CSD_CURRENT_CFG6),
-+	REGDEF(41, 71, V3D_CSD_STATUS),
-+	REGDEF(41, 41, V3D_CSD_CURRENT_CFG0),
-+	REGDEF(41, 41, V3D_CSD_CURRENT_CFG1),
-+	REGDEF(41, 41, V3D_CSD_CURRENT_CFG2),
-+	REGDEF(41, 41, V3D_CSD_CURRENT_CFG3),
-+	REGDEF(41, 41, V3D_CSD_CURRENT_CFG4),
-+	REGDEF(41, 41, V3D_CSD_CURRENT_CFG5),
-+	REGDEF(41, 41, V3D_CSD_CURRENT_CFG6),
-+	REGDEF(71, 71, V3D_V7_CSD_CURRENT_CFG0),
-+	REGDEF(71, 71, V3D_V7_CSD_CURRENT_CFG1),
-+	REGDEF(71, 71, V3D_V7_CSD_CURRENT_CFG2),
-+	REGDEF(71, 71, V3D_V7_CSD_CURRENT_CFG3),
-+	REGDEF(71, 71, V3D_V7_CSD_CURRENT_CFG4),
-+	REGDEF(71, 71, V3D_V7_CSD_CURRENT_CFG5),
-+	REGDEF(71, 71, V3D_V7_CSD_CURRENT_CFG6),
-+	REGDEF(71, 71, V3D_V7_CSD_CURRENT_CFG7),
- };
- 
- static int v3d_v3d_debugfs_regs(struct seq_file *m, void *unused)
-@@ -86,38 +100,41 @@ static int v3d_v3d_debugfs_regs(struct s
- 	int i, core;
- 
- 	for (i = 0; i < ARRAY_SIZE(v3d_hub_reg_defs); i++) {
--		seq_printf(m, "%s (0x%04x): 0x%08x\n",
--			   v3d_hub_reg_defs[i].name, v3d_hub_reg_defs[i].reg,
--			   V3D_READ(v3d_hub_reg_defs[i].reg));
-+		const struct v3d_reg_def *def = &v3d_hub_reg_defs[i];
-+
-+		if (v3d->ver >= def->min_ver && v3d->ver <= def->max_ver) {
-+			seq_printf(m, "%s (0x%04x): 0x%08x\n",
-+				   def->name, def->reg, V3D_READ(def->reg));
-+		}
- 	}
- 
--	if (v3d->ver < 41) {
--		for (i = 0; i < ARRAY_SIZE(v3d_gca_reg_defs); i++) {
-+	for (i = 0; i < ARRAY_SIZE(v3d_gca_reg_defs); i++) {
-+		const struct v3d_reg_def *def = &v3d_gca_reg_defs[i];
-+
-+		if (v3d->ver >= def->min_ver && v3d->ver <= def->max_ver) {
- 			seq_printf(m, "%s (0x%04x): 0x%08x\n",
--				   v3d_gca_reg_defs[i].name,
--				   v3d_gca_reg_defs[i].reg,
--				   V3D_GCA_READ(v3d_gca_reg_defs[i].reg));
-+				   def->name, def->reg, V3D_GCA_READ(def->reg));
- 		}
- 	}
- 
- 	for (core = 0; core < v3d->cores; core++) {
- 		for (i = 0; i < ARRAY_SIZE(v3d_core_reg_defs); i++) {
--			seq_printf(m, "core %d %s (0x%04x): 0x%08x\n",
--				   core,
--				   v3d_core_reg_defs[i].name,
--				   v3d_core_reg_defs[i].reg,
--				   V3D_CORE_READ(core,
--						 v3d_core_reg_defs[i].reg));
-+			const struct v3d_reg_def *def = &v3d_core_reg_defs[i];
-+
-+			if (v3d->ver >= def->min_ver && v3d->ver <= def->max_ver) {
-+				seq_printf(m, "core %d %s (0x%04x): 0x%08x\n",
-+					   core, def->name, def->reg,
-+					   V3D_CORE_READ(core, def->reg));
-+			}
- 		}
- 
--		if (v3d_has_csd(v3d)) {
--			for (i = 0; i < ARRAY_SIZE(v3d_csd_reg_defs); i++) {
-+		for (i = 0; i < ARRAY_SIZE(v3d_csd_reg_defs); i++) {
-+			const struct v3d_reg_def *def = &v3d_csd_reg_defs[i];
-+
-+			if (v3d->ver >= def->min_ver && v3d->ver <= def->max_ver) {
- 				seq_printf(m, "core %d %s (0x%04x): 0x%08x\n",
--					   core,
--					   v3d_csd_reg_defs[i].name,
--					   v3d_csd_reg_defs[i].reg,
--					   V3D_CORE_READ(core,
--							 v3d_csd_reg_defs[i].reg));
-+					   core, def->name, def->reg,
-+					   V3D_CORE_READ(core, def->reg));
- 			}
- 		}
- 	}
-@@ -148,8 +165,10 @@ static int v3d_v3d_debugfs_ident(struct
- 		   str_yes_no(ident2 & V3D_HUB_IDENT2_WITH_MMU));
- 	seq_printf(m, "TFU:        %s\n",
- 		   str_yes_no(ident1 & V3D_HUB_IDENT1_WITH_TFU));
--	seq_printf(m, "TSY:        %s\n",
--		   str_yes_no(ident1 & V3D_HUB_IDENT1_WITH_TSY));
-+	if (v3d->ver <= 42) {
-+		seq_printf(m, "TSY:        %s\n",
-+			   str_yes_no(ident1 & V3D_HUB_IDENT1_WITH_TSY));
-+	}
- 	seq_printf(m, "MSO:        %s\n",
- 		   str_yes_no(ident1 & V3D_HUB_IDENT1_WITH_MSO));
- 	seq_printf(m, "L3C:        %s (%dkb)\n",
-@@ -178,10 +197,14 @@ static int v3d_v3d_debugfs_ident(struct
- 		seq_printf(m, "  QPUs:         %d\n", nslc * qups);
- 		seq_printf(m, "  Semaphores:   %d\n",
- 			   V3D_GET_FIELD(ident1, V3D_IDENT1_NSEM));
--		seq_printf(m, "  BCG int:      %d\n",
--			   (ident2 & V3D_IDENT2_BCG_INT) != 0);
--		seq_printf(m, "  Override TMU: %d\n",
--			   (misccfg & V3D_MISCCFG_OVRTMUOUT) != 0);
-+		if (v3d->ver <= 42) {
-+			seq_printf(m, "  BCG int:      %d\n",
-+				   (ident2 & V3D_IDENT2_BCG_INT) != 0);
-+		}
-+		if (v3d->ver < 40) {
-+			seq_printf(m, "  Override TMU: %d\n",
-+				   (misccfg & V3D_MISCCFG_OVRTMUOUT) != 0);
-+		}
- 	}
- 
- 	return 0;
-@@ -289,8 +312,10 @@ static int v3d_measure_clock(struct seq_
- 	int measure_ms = 1000;
- 
- 	if (v3d->ver >= 40) {
-+		int cycle_count_reg = v3d->ver < 71 ?
-+			V3D_PCTR_CYCLE_COUNT : V3D_V7_PCTR_CYCLE_COUNT;
- 		V3D_CORE_WRITE(core, V3D_V4_PCTR_0_SRC_0_3,
--			       V3D_SET_FIELD(V3D_PCTR_CYCLE_COUNT,
-+			       V3D_SET_FIELD(cycle_count_reg,
- 					     V3D_PCTR_S0));
- 		V3D_CORE_WRITE(core, V3D_V4_PCTR_0_CLR, 1);
- 		V3D_CORE_WRITE(core, V3D_V4_PCTR_0_EN, 1);
---- a/drivers/gpu/drm/v3d/v3d_gem.c
-+++ b/drivers/gpu/drm/v3d/v3d_gem.c
-@@ -88,6 +88,9 @@ v3d_init_hw_state(struct v3d_dev *v3d)
- static void
- v3d_idle_axi(struct v3d_dev *v3d, int core)
- {
-+	if (v3d->ver >= 71)
-+		return;
-+
- 	V3D_CORE_WRITE(core, V3D_GMP_CFG, V3D_GMP_CFG_STOP_REQ);
- 
- 	if (wait_for((V3D_CORE_READ(core, V3D_GMP_STATUS) &
---- a/drivers/gpu/drm/v3d/v3d_irq.c
-+++ b/drivers/gpu/drm/v3d/v3d_irq.c
-@@ -20,16 +20,17 @@
- #include "v3d_regs.h"
- #include "v3d_trace.h"
- 
--#define V3D_CORE_IRQS ((u32)(V3D_INT_OUTOMEM |	\
--			     V3D_INT_FLDONE |	\
--			     V3D_INT_FRDONE |	\
--			     V3D_INT_CSDDONE |	\
--			     V3D_INT_GMPV))
--
--#define V3D_HUB_IRQS ((u32)(V3D_HUB_INT_MMU_WRV |	\
--			    V3D_HUB_INT_MMU_PTI |	\
--			    V3D_HUB_INT_MMU_CAP |	\
--			    V3D_HUB_INT_TFUC))
-+#define V3D_CORE_IRQS(ver) ((u32)(V3D_INT_OUTOMEM |	\
-+				  V3D_INT_FLDONE |	\
-+				  V3D_INT_FRDONE |	\
-+				  (ver < 71 ? V3D_INT_CSDDONE : V3D_V7_INT_CSDDONE) |	\
-+				  (ver < 71 ? V3D_INT_GMPV : 0)))
-+
-+#define V3D_HUB_IRQS(ver) ((u32)(V3D_HUB_INT_MMU_WRV |	\
-+				 V3D_HUB_INT_MMU_PTI |	\
-+				 V3D_HUB_INT_MMU_CAP |	\
-+				 V3D_HUB_INT_TFUC |		\
-+				 (ver >= 71 ? V3D_V7_HUB_INT_GMPV : 0)))
- 
- static irqreturn_t
- v3d_hub_irq(int irq, void *arg);
-@@ -118,7 +119,8 @@ v3d_irq(int irq, void *arg)
- 		status = IRQ_HANDLED;
- 	}
- 
--	if (intsts & V3D_INT_CSDDONE) {
-+	if ((v3d->ver < 71 && (intsts & V3D_INT_CSDDONE)) ||
-+	    (v3d->ver >= 71 && (intsts & V3D_V7_INT_CSDDONE))) {
- 		struct v3d_fence *fence =
- 			to_v3d_fence(v3d->csd_job->base.irq_fence);
- 		v3d->gpu_queue_stats[V3D_CSD].last_exec_end = local_clock();
-@@ -131,7 +133,7 @@ v3d_irq(int irq, void *arg)
- 	/* We shouldn't be triggering these if we have GMP in
- 	 * always-allowed mode.
- 	 */
--	if (intsts & V3D_INT_GMPV)
-+	if (v3d->ver < 71 && (intsts & V3D_INT_GMPV))
- 		dev_err(v3d->drm.dev, "GMP violation\n");
- 
- 	/* V3D 4.2 wires the hub and core IRQs together, so if we &
-@@ -205,6 +207,11 @@ v3d_hub_irq(int irq, void *arg)
- 		status = IRQ_HANDLED;
- 	}
- 
-+	if (v3d->ver >= 71 && intsts & V3D_V7_HUB_INT_GMPV) {
-+		dev_err(v3d->drm.dev, "GMP Violation\n");
-+		status = IRQ_HANDLED;
-+	}
-+
- 	return status;
- }
- 
-@@ -219,8 +226,8 @@ v3d_irq_init(struct v3d_dev *v3d)
- 	 * for us.
- 	 */
- 	for (core = 0; core < v3d->cores; core++)
--		V3D_CORE_WRITE(core, V3D_CTL_INT_CLR, V3D_CORE_IRQS);
--	V3D_WRITE(V3D_HUB_INT_CLR, V3D_HUB_IRQS);
-+		V3D_CORE_WRITE(core, V3D_CTL_INT_CLR, V3D_CORE_IRQS(v3d->ver));
-+	V3D_WRITE(V3D_HUB_INT_CLR, V3D_HUB_IRQS(v3d->ver));
- 
- 	irq1 = platform_get_irq_optional(v3d_to_pdev(v3d), 1);
- 	if (irq1 == -EPROBE_DEFER)
-@@ -264,12 +271,12 @@ v3d_irq_enable(struct v3d_dev *v3d)
- 
- 	/* Enable our set of interrupts, masking out any others. */
- 	for (core = 0; core < v3d->cores; core++) {
--		V3D_CORE_WRITE(core, V3D_CTL_INT_MSK_SET, ~V3D_CORE_IRQS);
--		V3D_CORE_WRITE(core, V3D_CTL_INT_MSK_CLR, V3D_CORE_IRQS);
-+		V3D_CORE_WRITE(core, V3D_CTL_INT_MSK_SET, ~V3D_CORE_IRQS(v3d->ver));
-+		V3D_CORE_WRITE(core, V3D_CTL_INT_MSK_CLR, V3D_CORE_IRQS(v3d->ver));
- 	}
- 
--	V3D_WRITE(V3D_HUB_INT_MSK_SET, ~V3D_HUB_IRQS);
--	V3D_WRITE(V3D_HUB_INT_MSK_CLR, V3D_HUB_IRQS);
-+	V3D_WRITE(V3D_HUB_INT_MSK_SET, ~V3D_HUB_IRQS(v3d->ver));
-+	V3D_WRITE(V3D_HUB_INT_MSK_CLR, V3D_HUB_IRQS(v3d->ver));
- }
- 
- void
-@@ -284,8 +291,8 @@ v3d_irq_disable(struct v3d_dev *v3d)
- 
- 	/* Clear any pending interrupts we might have left. */
- 	for (core = 0; core < v3d->cores; core++)
--		V3D_CORE_WRITE(core, V3D_CTL_INT_CLR, V3D_CORE_IRQS);
--	V3D_WRITE(V3D_HUB_INT_CLR, V3D_HUB_IRQS);
-+		V3D_CORE_WRITE(core, V3D_CTL_INT_CLR, V3D_CORE_IRQS(v3d->ver));
-+	V3D_WRITE(V3D_HUB_INT_CLR, V3D_HUB_IRQS(v3d->ver));
- 
- 	cancel_work_sync(&v3d->overflow_mem_work);
- }
---- a/drivers/gpu/drm/v3d/v3d_regs.h
-+++ b/drivers/gpu/drm/v3d/v3d_regs.h
-@@ -57,6 +57,7 @@
- #define V3D_HUB_INT_MSK_STS                            0x0005c
- #define V3D_HUB_INT_MSK_SET                            0x00060
- #define V3D_HUB_INT_MSK_CLR                            0x00064
-+# define V3D_V7_HUB_INT_GMPV                           BIT(6)
- # define V3D_HUB_INT_MMU_WRV                           BIT(5)
- # define V3D_HUB_INT_MMU_PTI                           BIT(4)
- # define V3D_HUB_INT_MMU_CAP                           BIT(3)
-@@ -64,6 +65,7 @@
- # define V3D_HUB_INT_TFUC                              BIT(1)
- # define V3D_HUB_INT_TFUF                              BIT(0)
- 
-+/* GCA registers only exist in V3D < 41 */
- #define V3D_GCA_CACHE_CTRL                             0x0000c
- # define V3D_GCA_CACHE_CTRL_FLUSH                      BIT(0)
- 
-@@ -87,6 +89,7 @@
- # define V3D_TOP_GR_BRIDGE_SW_INIT_1_V3D_CLK_108_SW_INIT BIT(0)
- 
- #define V3D_TFU_CS                                     0x00400
-+#define V3D_V7_TFU_CS                                  0x00700
- /* Stops current job, empties input fifo. */
- # define V3D_TFU_CS_TFURST                             BIT(31)
- # define V3D_TFU_CS_CVTCT_MASK                         V3D_MASK(23, 16)
-@@ -96,6 +99,7 @@
- # define V3D_TFU_CS_BUSY                               BIT(0)
- 
- #define V3D_TFU_SU                                     0x00404
-+#define V3D_V7_TFU_SU                                  0x00704
- /* Interrupt when FINTTHR input slots are free (0 = disabled) */
- # define V3D_TFU_SU_FINTTHR_MASK                       V3D_MASK(13, 8)
- # define V3D_TFU_SU_FINTTHR_SHIFT                      8
-@@ -107,38 +111,53 @@
- # define V3D_TFU_SU_THROTTLE_SHIFT                     0
- 
- #define V3D_TFU_ICFG                                   0x00408
-+#define V3D_V7_TFU_ICFG                                0x00708
- /* Interrupt when the conversion is complete. */
- # define V3D_TFU_ICFG_IOC                              BIT(0)
- 
- /* Input Image Address */
- #define V3D_TFU_IIA                                    0x0040c
-+#define V3D_V7_TFU_IIA                                 0x0070c
- /* Input Chroma Address */
- #define V3D_TFU_ICA                                    0x00410
-+#define V3D_V7_TFU_ICA                                 0x00710
- /* Input Image Stride */
- #define V3D_TFU_IIS                                    0x00414
-+#define V3D_V7_TFU_IIS                                 0x00714
- /* Input Image U-Plane Address */
- #define V3D_TFU_IUA                                    0x00418
-+#define V3D_V7_TFU_IUA                                 0x00718
-+/* Image output config (VD 7.x only) */
-+#define V3D_V7_TFU_IOC                                 0x0071c
- /* Output Image Address */
- #define V3D_TFU_IOA                                    0x0041c
-+#define V3D_V7_TFU_IOA                                 0x00720
- /* Image Output Size */
- #define V3D_TFU_IOS                                    0x00420
-+#define V3D_V7_TFU_IOS                                 0x00724
- /* TFU YUV Coefficient 0 */
- #define V3D_TFU_COEF0                                  0x00424
--/* Use these regs instead of the defaults. */
-+#define V3D_V7_TFU_COEF0                               0x00728
-+/* Use these regs instead of the defaults (V3D 4.x only) */
- # define V3D_TFU_COEF0_USECOEF                         BIT(31)
- /* TFU YUV Coefficient 1 */
- #define V3D_TFU_COEF1                                  0x00428
-+#define V3D_V7_TFU_COEF1                               0x0072c
- /* TFU YUV Coefficient 2 */
- #define V3D_TFU_COEF2                                  0x0042c
-+#define V3D_V7_TFU_COEF2                               0x00730
- /* TFU YUV Coefficient 3 */
- #define V3D_TFU_COEF3                                  0x00430
-+#define V3D_V7_TFU_COEF3                               0x00734
- 
-+/* V3D 4.x only */
- #define V3D_TFU_CRC                                    0x00434
- 
- /* Per-MMU registers. */
- 
- #define V3D_MMUC_CONTROL                               0x01000
- # define V3D_MMUC_CONTROL_CLEAR                        BIT(3)
-+# define V3D_V7_MMUC_CONTROL_CLEAR                     BIT(11)
- # define V3D_MMUC_CONTROL_FLUSHING                     BIT(2)
- # define V3D_MMUC_CONTROL_FLUSH                        BIT(1)
- # define V3D_MMUC_CONTROL_ENABLE                       BIT(0)
-@@ -246,7 +265,6 @@
- 
- #define V3D_CTL_L2TCACTL                               0x00030
- # define V3D_L2TCACTL_TMUWCF                           BIT(8)
--# define V3D_L2TCACTL_L2T_NO_WM                        BIT(4)
- /* Invalidates cache lines. */
- # define V3D_L2TCACTL_FLM_FLUSH                        0
- /* Removes cachelines without writing dirty lines back. */
-@@ -268,7 +286,9 @@
- # define V3D_INT_QPU_MASK                              V3D_MASK(27, 16)
- # define V3D_INT_QPU_SHIFT                             16
- # define V3D_INT_CSDDONE                               BIT(7)
-+# define V3D_V7_INT_CSDDONE                            BIT(6)
- # define V3D_INT_PCTR                                  BIT(6)
-+# define V3D_V7_INT_PCTR                               BIT(5)
- # define V3D_INT_GMPV                                  BIT(5)
- # define V3D_INT_TRFB                                  BIT(4)
- # define V3D_INT_SPILLUSE                              BIT(3)
-@@ -350,14 +370,19 @@
- #define V3D_V4_PCTR_0_SRC_X(x)                         (V3D_V4_PCTR_0_SRC_0_3 + \
- 							4 * (x))
- # define V3D_PCTR_S0_MASK                              V3D_MASK(6, 0)
-+# define V3D_V7_PCTR_S0_MASK                           V3D_MASK(7, 0)
- # define V3D_PCTR_S0_SHIFT                             0
- # define V3D_PCTR_S1_MASK                              V3D_MASK(14, 8)
-+# define V3D_V7_PCTR_S1_MASK                           V3D_MASK(15, 8)
- # define V3D_PCTR_S1_SHIFT                             8
- # define V3D_PCTR_S2_MASK                              V3D_MASK(22, 16)
-+# define V3D_V7_PCTR_S2_MASK                           V3D_MASK(23, 16)
- # define V3D_PCTR_S2_SHIFT                             16
- # define V3D_PCTR_S3_MASK                              V3D_MASK(30, 24)
-+# define V3D_V7_PCTR_S3_MASK                           V3D_MASK(31, 24)
- # define V3D_PCTR_S3_SHIFT                             24
- # define V3D_PCTR_CYCLE_COUNT                          32
-+# define V3D_V7_PCTR_CYCLE_COUNT                       0
- 
- /* Output values of the counters. */
- #define V3D_PCTR_0_PCTR0                               0x00680
-@@ -365,6 +390,7 @@
- #define V3D_PCTR_0_PCTRX(x)                            (V3D_PCTR_0_PCTR0 + \
- 							4 * (x))
- #define V3D_GMP_STATUS                                 0x00800
-+#define V3D_V7_GMP_STATUS                              0x00600
- # define V3D_GMP_STATUS_GMPRST                         BIT(31)
- # define V3D_GMP_STATUS_WR_COUNT_MASK                  V3D_MASK(30, 24)
- # define V3D_GMP_STATUS_WR_COUNT_SHIFT                 24
-@@ -378,12 +404,14 @@
- # define V3D_GMP_STATUS_VIO                            BIT(0)
- 
- #define V3D_GMP_CFG                                    0x00804
-+#define V3D_V7_GMP_CFG                                 0x00604
- # define V3D_GMP_CFG_LBURSTEN                          BIT(3)
- # define V3D_GMP_CFG_PGCRSEN                           BIT()
- # define V3D_GMP_CFG_STOP_REQ                          BIT(1)
- # define V3D_GMP_CFG_PROT_ENABLE                       BIT(0)
- 
- #define V3D_GMP_VIO_ADDR                               0x00808
-+#define V3D_V7_GMP_VIO_ADDR                            0x00608
- #define V3D_GMP_VIO_TYPE                               0x0080c
- #define V3D_GMP_TABLE_ADDR                             0x00810
- #define V3D_GMP_CLEAR_LOAD                             0x00814
-@@ -399,24 +427,28 @@
- # define V3D_CSD_STATUS_HAVE_QUEUED_DISPATCH           BIT(0)
- 
- #define V3D_CSD_QUEUED_CFG0                            0x00904
-+#define V3D_V7_CSD_QUEUED_CFG0                         0x00930
- # define V3D_CSD_QUEUED_CFG0_NUM_WGS_X_MASK            V3D_MASK(31, 16)
- # define V3D_CSD_QUEUED_CFG0_NUM_WGS_X_SHIFT           16
- # define V3D_CSD_QUEUED_CFG0_WG_X_OFFSET_MASK          V3D_MASK(15, 0)
- # define V3D_CSD_QUEUED_CFG0_WG_X_OFFSET_SHIFT         0
- 
- #define V3D_CSD_QUEUED_CFG1                            0x00908
-+#define V3D_V7_CSD_QUEUED_CFG1                         0x00934
- # define V3D_CSD_QUEUED_CFG1_NUM_WGS_Y_MASK            V3D_MASK(31, 16)
- # define V3D_CSD_QUEUED_CFG1_NUM_WGS_Y_SHIFT           16
- # define V3D_CSD_QUEUED_CFG1_WG_Y_OFFSET_MASK          V3D_MASK(15, 0)
- # define V3D_CSD_QUEUED_CFG1_WG_Y_OFFSET_SHIFT         0
- 
- #define V3D_CSD_QUEUED_CFG2                            0x0090c
-+#define V3D_V7_CSD_QUEUED_CFG2                         0x00938
- # define V3D_CSD_QUEUED_CFG2_NUM_WGS_Z_MASK            V3D_MASK(31, 16)
- # define V3D_CSD_QUEUED_CFG2_NUM_WGS_Z_SHIFT           16
- # define V3D_CSD_QUEUED_CFG2_WG_Z_OFFSET_MASK          V3D_MASK(15, 0)
- # define V3D_CSD_QUEUED_CFG2_WG_Z_OFFSET_SHIFT         0
- 
- #define V3D_CSD_QUEUED_CFG3                            0x00910
-+#define V3D_V7_CSD_QUEUED_CFG3                         0x0093c
- # define V3D_CSD_QUEUED_CFG3_OVERLAP_WITH_PREV         BIT(26)
- # define V3D_CSD_QUEUED_CFG3_MAX_SG_ID_MASK            V3D_MASK(25, 20)
- # define V3D_CSD_QUEUED_CFG3_MAX_SG_ID_SHIFT           20
-@@ -429,22 +461,36 @@
- 
- /* Number of batches, minus 1 */
- #define V3D_CSD_QUEUED_CFG4                            0x00914
-+#define V3D_V7_CSD_QUEUED_CFG4                         0x00940
- 
- /* Shader address, pnan, singleseg, threading, like a shader record. */
- #define V3D_CSD_QUEUED_CFG5                            0x00918
-+#define V3D_V7_CSD_QUEUED_CFG5                         0x00944
- 
- /* Uniforms address (4 byte aligned) */
- #define V3D_CSD_QUEUED_CFG6                            0x0091c
-+#define V3D_V7_CSD_QUEUED_CFG6                         0x00948
-+
-+#define V3D_V7_CSD_QUEUED_CFG7                         0x0094c
- 
- #define V3D_CSD_CURRENT_CFG0                          0x00920
-+#define V3D_V7_CSD_CURRENT_CFG0                       0x00958
- #define V3D_CSD_CURRENT_CFG1                          0x00924
-+#define V3D_V7_CSD_CURRENT_CFG1                       0x0095c
- #define V3D_CSD_CURRENT_CFG2                          0x00928
-+#define V3D_V7_CSD_CURRENT_CFG2                       0x00960
- #define V3D_CSD_CURRENT_CFG3                          0x0092c
-+#define V3D_V7_CSD_CURRENT_CFG3                       0x00964
- #define V3D_CSD_CURRENT_CFG4                          0x00930
-+#define V3D_V7_CSD_CURRENT_CFG4                       0x00968
- #define V3D_CSD_CURRENT_CFG5                          0x00934
-+#define V3D_V7_CSD_CURRENT_CFG5                       0x0096c
- #define V3D_CSD_CURRENT_CFG6                          0x00938
-+#define V3D_V7_CSD_CURRENT_CFG6                       0x00970
-+#define V3D_V7_CSD_CURRENT_CFG7                       0x00974
- 
- #define V3D_CSD_CURRENT_ID0                            0x0093c
-+#define V3D_V7_CSD_CURRENT_ID0                         0x00978
- # define V3D_CSD_CURRENT_ID0_WG_X_MASK                 V3D_MASK(31, 16)
- # define V3D_CSD_CURRENT_ID0_WG_X_SHIFT                16
- # define V3D_CSD_CURRENT_ID0_WG_IN_SG_MASK             V3D_MASK(11, 8)
-@@ -453,6 +499,7 @@
- # define V3D_CSD_CURRENT_ID0_L_IDX_SHIFT               0
- 
- #define V3D_CSD_CURRENT_ID1                            0x00940
-+#define V3D_V7_CSD_CURRENT_ID1                         0x0097c
- # define V3D_CSD_CURRENT_ID0_WG_Z_MASK                 V3D_MASK(31, 16)
- # define V3D_CSD_CURRENT_ID0_WG_Z_SHIFT                16
- # define V3D_CSD_CURRENT_ID0_WG_Y_MASK                 V3D_MASK(15, 0)
---- a/drivers/gpu/drm/v3d/v3d_sched.c
-+++ b/drivers/gpu/drm/v3d/v3d_sched.c
-@@ -282,6 +282,8 @@ static struct dma_fence *v3d_render_job_
- 	return fence;
- }
- 
-+#define V3D_TFU_REG(name) ((v3d->ver < 71) ? V3D_TFU_ ## name : V3D_V7_TFU_ ## name)
-+
- static struct dma_fence *
- v3d_tfu_job_run(struct drm_sched_job *sched_job)
- {
-@@ -302,20 +304,22 @@ v3d_tfu_job_run(struct drm_sched_job *sc
- 	trace_v3d_submit_tfu(dev, to_v3d_fence(fence)->seqno);
- 
- 	v3d_sched_stats_add_job(&v3d->gpu_queue_stats[V3D_TFU], sched_job);
--	V3D_WRITE(V3D_TFU_IIA, job->args.iia);
--	V3D_WRITE(V3D_TFU_IIS, job->args.iis);
--	V3D_WRITE(V3D_TFU_ICA, job->args.ica);
--	V3D_WRITE(V3D_TFU_IUA, job->args.iua);
--	V3D_WRITE(V3D_TFU_IOA, job->args.ioa);
--	V3D_WRITE(V3D_TFU_IOS, job->args.ios);
--	V3D_WRITE(V3D_TFU_COEF0, job->args.coef[0]);
--	if (job->args.coef[0] & V3D_TFU_COEF0_USECOEF) {
--		V3D_WRITE(V3D_TFU_COEF1, job->args.coef[1]);
--		V3D_WRITE(V3D_TFU_COEF2, job->args.coef[2]);
--		V3D_WRITE(V3D_TFU_COEF3, job->args.coef[3]);
-+	V3D_WRITE(V3D_TFU_REG(IIA), job->args.iia);
-+	V3D_WRITE(V3D_TFU_REG(IIS), job->args.iis);
-+	V3D_WRITE(V3D_TFU_REG(ICA), job->args.ica);
-+	V3D_WRITE(V3D_TFU_REG(IUA), job->args.iua);
-+	V3D_WRITE(V3D_TFU_REG(IOA), job->args.ioa);
-+	if (v3d->ver >= 71)
-+		V3D_WRITE(V3D_V7_TFU_IOC, job->args.v71.ioc);
-+	V3D_WRITE(V3D_TFU_REG(IOS), job->args.ios);
-+	V3D_WRITE(V3D_TFU_REG(COEF0), job->args.coef[0]);
-+	if (v3d->ver >= 71 || (job->args.coef[0] & V3D_TFU_COEF0_USECOEF)) {
-+		V3D_WRITE(V3D_TFU_REG(COEF1), job->args.coef[1]);
-+		V3D_WRITE(V3D_TFU_REG(COEF2), job->args.coef[2]);
-+		V3D_WRITE(V3D_TFU_REG(COEF3), job->args.coef[3]);
- 	}
- 	/* ICFG kicks off the job. */
--	V3D_WRITE(V3D_TFU_ICFG, job->args.icfg | V3D_TFU_ICFG_IOC);
-+	V3D_WRITE(V3D_TFU_REG(ICFG), job->args.icfg | V3D_TFU_ICFG_IOC);
- 
- 	return fence;
- }
-@@ -327,7 +331,7 @@ v3d_csd_job_run(struct drm_sched_job *sc
- 	struct v3d_dev *v3d = job->base.v3d;
- 	struct drm_device *dev = &v3d->drm;
- 	struct dma_fence *fence;
--	int i;
-+	int i, csd_cfg0_reg, csd_cfg_reg_count;
- 
- 	v3d->csd_job = job;
- 
-@@ -346,10 +350,12 @@ v3d_csd_job_run(struct drm_sched_job *sc
- 	v3d_sched_stats_add_job(&v3d->gpu_queue_stats[V3D_CSD], sched_job);
- 	v3d_switch_perfmon(v3d, &job->base);
- 
--	for (i = 1; i <= 6; i++)
--		V3D_CORE_WRITE(0, V3D_CSD_QUEUED_CFG0 + 4 * i, job->args.cfg[i]);
-+	csd_cfg0_reg = v3d->ver < 71 ? V3D_CSD_QUEUED_CFG0 : V3D_V7_CSD_QUEUED_CFG0;
-+	csd_cfg_reg_count = v3d->ver < 71 ? 6 : 7;
-+	for (i = 1; i <= csd_cfg_reg_count; i++)
-+		V3D_CORE_WRITE(0, csd_cfg0_reg + 4 * i, job->args.cfg[i]);
- 	/* CFG0 write kicks off the job. */
--	V3D_CORE_WRITE(0, V3D_CSD_QUEUED_CFG0, job->args.cfg[0]);
-+	V3D_CORE_WRITE(0, csd_cfg0_reg, job->args.cfg[0]);
- 
- 	return fence;
- }
-@@ -452,7 +458,8 @@ v3d_csd_job_timedout(struct drm_sched_jo
- {
- 	struct v3d_csd_job *job = to_csd_job(sched_job);
- 	struct v3d_dev *v3d = job->base.v3d;
--	u32 batches = V3D_CORE_READ(0, V3D_CSD_CURRENT_CFG4);
-+	u32 batches = V3D_CORE_READ(0, (v3d->ver < 71 ? V3D_CSD_CURRENT_CFG4 :
-+							V3D_V7_CSD_CURRENT_CFG4));
- 
- 	/* If we've made progress, skip reset and let the timer get
- 	 * rearmed.
diff --git a/target/linux/bcm27xx/patches-6.1/950-0903-drm-v3d-update-UAPI-to-match-user-space-for-V3D-7.x.patch b/target/linux/bcm27xx/patches-6.1/950-0903-drm-v3d-update-UAPI-to-match-user-space-for-V3D-7.x.patch
deleted file mode 100644
index ed1d5f05df..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0903-drm-v3d-update-UAPI-to-match-user-space-for-V3D-7.x.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 22fb30936524ae96151789741885edbc45efb53d Mon Sep 17 00:00:00 2001
-From: Iago Toral Quiroga <itoral@igalia.com>
-Date: Thu, 2 Mar 2023 11:52:08 +0100
-Subject: [PATCH] drm/v3d: update UAPI to match user-space for V3D 7.x
-
-V3D t.x takes a new parameter to configure TFU jobs that needs
-to be provided by user space.
----
- include/uapi/drm/v3d_drm.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/include/uapi/drm/v3d_drm.h
-+++ b/include/uapi/drm/v3d_drm.h
-@@ -319,6 +319,10 @@ struct drm_v3d_submit_tfu {
- 
- 	/* Pointer to an array of ioctl extensions*/
- 	__u64 extensions;
-+
-+	struct {
-+		__u32 ioc;
-+	} v71;
- };
- 
- /* Submits a compute shader for dispatch.  This job will block on any
diff --git a/target/linux/bcm27xx/patches-6.1/950-0904-drm-v3d-add-brcm-2712-v3d-as-a-compatible-V3D-device.patch b/target/linux/bcm27xx/patches-6.1/950-0904-drm-v3d-add-brcm-2712-v3d-as-a-compatible-V3D-device.patch
deleted file mode 100644
index 64189338e6..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0904-drm-v3d-add-brcm-2712-v3d-as-a-compatible-V3D-device.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 18bc419d38eda06ded78c7b702c0e21e5af8f24c Mon Sep 17 00:00:00 2001
-From: Iago Toral Quiroga <itoral@igalia.com>
-Date: Thu, 2 Mar 2023 11:54:45 +0100
-Subject: [PATCH] drm/v3d: add brcm,2712-v3d as a compatible V3D device
-
----
- drivers/gpu/drm/v3d/v3d_drv.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/gpu/drm/v3d/v3d_drv.c
-+++ b/drivers/gpu/drm/v3d/v3d_drv.c
-@@ -193,6 +193,7 @@ static const struct drm_driver v3d_drm_d
- };
- 
- static const struct of_device_id v3d_of_match[] = {
-+	{ .compatible = "brcm,2712-v3d" },
- 	{ .compatible = "brcm,2711-v3d" },
- 	{ .compatible = "brcm,7268-v3d" },
- 	{ .compatible = "brcm,7278-v3d" },
diff --git a/target/linux/bcm27xx/patches-6.1/950-0906-dt-bindings-gpu-v3d-Add-BCM2712-to-compatibility-lis.patch b/target/linux/bcm27xx/patches-6.1/950-0906-dt-bindings-gpu-v3d-Add-BCM2712-to-compatibility-lis.patch
deleted file mode 100644
index 43c5c395c9..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0906-dt-bindings-gpu-v3d-Add-BCM2712-to-compatibility-lis.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 5970fa51663511d7f773db7109ff6fa2504f186a Mon Sep 17 00:00:00 2001
-From: Iago Toral Quiroga <itoral@igalia.com>
-Date: Thu, 2 Mar 2023 11:56:52 +0100
-Subject: [PATCH] dt-bindings: gpu: v3d: Add BCM2712 to compatibility list
-
----
- Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml
-+++ b/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml
-@@ -16,6 +16,7 @@ properties:
- 
-   compatible:
-     enum:
-+      - brcm,2712-v3d
-       - brcm,2711-v3d
-       - brcm,7268-v3d
-       - brcm,7278-v3d
diff --git a/target/linux/bcm27xx/patches-6.1/950-0907-drivers-char-add-generic-gpiomem-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0907-drivers-char-add-generic-gpiomem-driver.patch
deleted file mode 100644
index 14e6b0a9e4..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0907-drivers-char-add-generic-gpiomem-driver.patch
+++ /dev/null
@@ -1,328 +0,0 @@
-From fdf9cab5eaa849e90b12e17718bc47130a91433c Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.com>
-Date: Tue, 25 Apr 2023 15:52:13 +0100
-Subject: [PATCH] drivers: char: add generic gpiomem driver
-
-Based on bcm2835-gpiomem.
-
-We allow export of the "GPIO registers" to userspace via a chardev as
-this allows for finer access control (e.g. users must be group gpio, root
-not required).
-
-This driver allows access to either rp1-gpiomem or gpiomem, depending on
-which nodes are populated in devicetree.
-
-RP1 has a different look-and-feel to BCM283x SoCs as it has split ranges
-for IO controls and the parallel registered OE/IN/OUT access. To handle
-this, the driver concatenates the ranges for an IO bank and the
-corresponding RIO instance into a contiguous buffer.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- drivers/char/Kconfig               |   8 +
- drivers/char/Makefile              |   1 +
- drivers/char/raspberrypi-gpiomem.c | 276 +++++++++++++++++++++++++++++
- 3 files changed, 285 insertions(+)
- create mode 100644 drivers/char/raspberrypi-gpiomem.c
-
---- a/drivers/char/Kconfig
-+++ b/drivers/char/Kconfig
-@@ -461,4 +461,12 @@ config RANDOM_TRUST_BOOTLOADER
- 	  believe its RNG facilities may be faulty. This may also be configured
- 	  at boot time with "random.trust_bootloader=on/off".
- 
-+config RASPBERRYPI_GPIOMEM
-+        tristate "Rootless GPIO access via mmap() on Raspberry Pi boards"
-+        default n
-+        help
-+                Provides users with root-free access to the GPIO registers
-+                on the board. Calling mmap(/dev/gpiomem) will map the GPIO
-+                register page to the user's pointer.
-+
- endmenu
---- a/drivers/char/Makefile
-+++ b/drivers/char/Makefile
-@@ -46,3 +46,4 @@ obj-$(CONFIG_XILLYBUS_CLASS)	+= xillybus
- obj-$(CONFIG_POWERNV_OP_PANEL)	+= powernv-op-panel.o
- obj-$(CONFIG_ADI)		+= adi.o
- obj-$(CONFIG_BRCM_CHAR_DRIVERS) += broadcom/
-+obj-$(CONFIG_RASPBERRYPI_GPIOMEM) += raspberrypi-gpiomem.o
---- /dev/null
-+++ b/drivers/char/raspberrypi-gpiomem.c
-@@ -0,0 +1,276 @@
-+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
-+/**
-+ * raspberrypi-gpiomem.c
-+ *
-+ * Provides MMIO access to discontiguous section of Device memory as a linear
-+ * user mapping. Successor to bcm2835-gpiomem.c.
-+ *
-+ * Copyright (c) 2023, Raspberry Pi Ltd.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/of_device.h>
-+#include <linux/platform_device.h>
-+#include <linux/mm.h>
-+#include <linux/slab.h>
-+#include <linux/cdev.h>
-+#include <linux/pagemap.h>
-+#include <linux/io.h>
-+
-+#define DRIVER_NAME "rpi-gpiomem"
-+#define DEVICE_MINOR 0
-+
-+/*
-+ * Sensible max for a hypothetical "gpio" controller that splits pads,
-+ * IO controls, GPIO in/out/enable, and function selection into different
-+ * ranges. Most use only one or two.
-+ */
-+#define MAX_RANGES 4
-+
-+struct io_windows {
-+	unsigned long phys_base;
-+	unsigned long len;
-+};
-+
-+struct rpi_gpiomem_priv {
-+	dev_t devid;
-+	struct class *class;
-+	struct cdev rpi_gpiomem_cdev;
-+	struct device *dev;
-+	const char *name;
-+	unsigned int nr_wins;
-+	struct io_windows iowins[4];
-+};
-+
-+static int rpi_gpiomem_open(struct inode *inode, struct file *file)
-+{
-+	int dev = iminor(inode);
-+	int ret = 0;
-+	struct rpi_gpiomem_priv *priv;
-+
-+	if (dev != DEVICE_MINOR)
-+		ret = -ENXIO;
-+
-+	priv = container_of(inode->i_cdev, struct rpi_gpiomem_priv,
-+				rpi_gpiomem_cdev);
-+	if (!priv)
-+		return -EINVAL;
-+	file->private_data = priv;
-+	return ret;
-+}
-+
-+static int rpi_gpiomem_release(struct inode *inode, struct file *file)
-+{
-+	int dev = iminor(inode);
-+	int ret = 0;
-+
-+	if (dev != DEVICE_MINOR)
-+		ret = -ENXIO;
-+
-+	return ret;
-+}
-+
-+static const struct vm_operations_struct rpi_gpiomem_vm_ops = {
-+#ifdef CONFIG_HAVE_IOREMAP_PROT
-+	.access = generic_access_phys
-+#endif
-+};
-+
-+static int rpi_gpiomem_mmap(struct file *file, struct vm_area_struct *vma)
-+{
-+	int i;
-+	struct rpi_gpiomem_priv *priv;
-+	unsigned long base;
-+	unsigned long len = 0;
-+	unsigned long offset;
-+
-+	priv = file->private_data;
-+	/*
-+	 * Userspace must provide a virtual address space at least
-+	 * the size of the concatenated ranges.
-+	 */
-+	for (i = 0; i < priv->nr_wins; i++)
-+		len += priv->iowins[i].len;
-+	if (len > vma->vm_end - vma->vm_start + 1)
-+		return -EINVAL;
-+
-+	vma->vm_ops = &rpi_gpiomem_vm_ops;
-+	offset = vma->vm_start;
-+	for (i = 0; i < priv->nr_wins; i++) {
-+		base = priv->iowins[i].phys_base >> PAGE_SHIFT;
-+		len = priv->iowins[i].len;
-+		vma->vm_page_prot = phys_mem_access_prot(file, base, len,
-+							 vma->vm_page_prot);
-+		if (remap_pfn_range(vma, offset,
-+			    base, len,
-+			    vma->vm_page_prot))
-+			break;
-+		offset += len;
-+	}
-+
-+	if (i < priv->nr_wins)
-+		return -EAGAIN;
-+
-+	return 0;
-+}
-+
-+static const struct file_operations rpi_gpiomem_fops = {
-+	.owner = THIS_MODULE,
-+	.open = rpi_gpiomem_open,
-+	.release = rpi_gpiomem_release,
-+	.mmap = rpi_gpiomem_mmap,
-+};
-+
-+static const struct of_device_id rpi_gpiomem_of_match[];
-+
-+static int rpi_gpiomem_probe(struct platform_device *pdev)
-+{
-+	int err, i;
-+	const struct of_device_id *id;
-+	struct device *dev = &pdev->dev;
-+	struct device_node *node = dev->of_node;
-+	struct resource *ioresource;
-+	struct rpi_gpiomem_priv *priv;
-+
-+	/* Allocate buffers and instance data */
-+
-+	priv = kzalloc(sizeof(struct rpi_gpiomem_priv), GFP_KERNEL);
-+
-+	if (!priv) {
-+		err = -ENOMEM;
-+		goto failed_inst_alloc;
-+	}
-+	platform_set_drvdata(pdev, priv);
-+
-+	priv->dev = dev;
-+	id = of_match_device(rpi_gpiomem_of_match, dev);
-+	if (!id)
-+		return -EINVAL;
-+
-+	/*
-+	 * Device node naming - for legacy (bcm2835) DT bindings, the driver
-+	 * created the node based on a hardcoded name - for new bindings,
-+	 * take the node name from DT.
-+	 */
-+	if (id == &rpi_gpiomem_of_match[0]) {
-+		priv->name = "gpiomem";
-+	} else {
-+		err = of_property_read_string(node, "chardev-name", &priv->name);
-+		if (err)
-+			return -EINVAL;
-+	}
-+
-+	/*
-+	 * Go find the register ranges associated with this instance
-+	 */
-+	for (i = 0; i < MAX_RANGES; i++) {
-+		ioresource = platform_get_resource(pdev, IORESOURCE_MEM, i);
-+		if (!ioresource && i == 0) {
-+			dev_err(priv->dev, "failed to get IO resource - no ranges available\n");
-+			err = -ENOENT;
-+			goto failed_get_resource;
-+		}
-+		if (!ioresource)
-+			break;
-+
-+		priv->iowins[i].phys_base = ioresource->start;
-+		priv->iowins[i].len = (ioresource->end + 1) - ioresource->start;
-+		dev_info(&pdev->dev, "window base 0x%08lx size 0x%08lx\n",
-+			 priv->iowins[i].phys_base, priv->iowins[i].len);
-+		priv->nr_wins++;
-+	}
-+
-+	/* Create character device entries */
-+
-+	err = alloc_chrdev_region(&priv->devid,
-+				  DEVICE_MINOR, 1, priv->name);
-+	if (err != 0) {
-+		dev_err(priv->dev, "unable to allocate device number");
-+		goto failed_alloc_chrdev;
-+	}
-+	cdev_init(&priv->rpi_gpiomem_cdev, &rpi_gpiomem_fops);
-+	priv->rpi_gpiomem_cdev.owner = THIS_MODULE;
-+	err = cdev_add(&priv->rpi_gpiomem_cdev, priv->devid, 1);
-+	if (err != 0) {
-+		dev_err(priv->dev, "unable to register device");
-+		goto failed_cdev_add;
-+	}
-+
-+	/* Create sysfs entries */
-+
-+	priv->class = class_create(THIS_MODULE, priv->name);
-+	if (IS_ERR(priv->class)) {
-+		err = PTR_ERR(priv->class);
-+		goto failed_class_create;
-+	}
-+
-+	dev = device_create(priv->class, NULL, priv->devid, NULL, priv->name);
-+	if (IS_ERR(dev)) {
-+		err = PTR_ERR(dev);
-+		goto failed_device_create;
-+	}
-+
-+	dev_info(priv->dev, "initialised %u regions as /dev/%s\n",
-+		 priv->nr_wins, priv->name);
-+
-+	return 0;
-+
-+failed_device_create:
-+	class_destroy(priv->class);
-+failed_class_create:
-+	cdev_del(&priv->rpi_gpiomem_cdev);
-+failed_cdev_add:
-+	unregister_chrdev_region(priv->devid, 1);
-+failed_alloc_chrdev:
-+failed_get_resource:
-+	kfree(priv);
-+failed_inst_alloc:
-+	dev_err(&pdev->dev, "could not load rpi_gpiomem");
-+	return err;
-+}
-+
-+static int rpi_gpiomem_remove(struct platform_device *pdev)
-+{
-+	struct device *dev = &pdev->dev;
-+	struct rpi_gpiomem_priv *priv = platform_get_drvdata(pdev);
-+
-+	device_destroy(priv->class, priv->devid);
-+	class_destroy(priv->class);
-+	cdev_del(&priv->rpi_gpiomem_cdev);
-+	unregister_chrdev_region(priv->devid, 1);
-+	kfree(priv);
-+
-+	dev_info(dev, "%s driver removed - OK", priv->name);
-+	return 0;
-+}
-+
-+static const struct of_device_id rpi_gpiomem_of_match[] = {
-+	{
-+		.compatible = "brcm,bcm2835-gpiomem",
-+	},
-+	{
-+		.compatible = "raspberrypi,gpiomem",
-+	},
-+	{ /* sentinel */ },
-+};
-+
-+MODULE_DEVICE_TABLE(of, rpi_gpiomem_of_match);
-+
-+static struct platform_driver rpi_gpiomem_driver = {
-+	.probe = rpi_gpiomem_probe,
-+	.remove = rpi_gpiomem_remove,
-+	.driver = {
-+		   .name = DRIVER_NAME,
-+		   .owner = THIS_MODULE,
-+		   .of_match_table = rpi_gpiomem_of_match,
-+		   },
-+};
-+
-+module_platform_driver(rpi_gpiomem_driver);
-+
-+MODULE_ALIAS("platform:rpi-gpiomem");
-+MODULE_LICENSE("Dual BSD/GPL");
-+MODULE_DESCRIPTION("Driver for accessing GPIOs from userspace");
-+MODULE_AUTHOR("Jonathan Bell <jonathan@raspberrypi.com>");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0909-drivers-char-delete-bcm2835-gpiomem.patch b/target/linux/bcm27xx/patches-6.1/950-0909-drivers-char-delete-bcm2835-gpiomem.patch
deleted file mode 100644
index 5d6eb16fb2..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0909-drivers-char-delete-bcm2835-gpiomem.patch
+++ /dev/null
@@ -1,301 +0,0 @@
-From 27bda80061b46e18fe83be11228df5365363b377 Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.com>
-Date: Wed, 26 Apr 2023 13:44:15 +0100
-Subject: [PATCH] drivers: char: delete bcm2835-gpiomem
-
-This functionality is now provided by raspberrypi-gpiomem.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- drivers/char/broadcom/Kconfig           |   8 -
- drivers/char/broadcom/Makefile          |   1 -
- drivers/char/broadcom/bcm2835-gpiomem.c | 258 ------------------------
- 3 files changed, 267 deletions(-)
- delete mode 100644 drivers/char/broadcom/bcm2835-gpiomem.c
-
---- a/drivers/char/broadcom/Kconfig
-+++ b/drivers/char/broadcom/Kconfig
-@@ -23,14 +23,6 @@ config BCM_VCIO
- 
- endif
- 
--config BCM2835_DEVGPIOMEM
--	tristate "/dev/gpiomem rootless GPIO access via mmap() on the BCM2835"
--	default m
--	help
--		Provides users with root-free access to the GPIO registers
--		on the 2835. Calling mmap(/dev/gpiomem) will map the GPIO
--		register page to the user's pointer.
--
- config BCM2835_SMI_DEV
- 	tristate "Character device driver for BCM2835 Secondary Memory Interface"
- 	depends on BCM2835_SMI
---- a/drivers/char/broadcom/Makefile
-+++ b/drivers/char/broadcom/Makefile
-@@ -1,5 +1,4 @@
- obj-$(CONFIG_BCM2708_VCMEM)	+= vc_mem.o
- obj-$(CONFIG_BCM_VCIO)		+= vcio.o
--obj-$(CONFIG_BCM2835_DEVGPIOMEM)+= bcm2835-gpiomem.o
- obj-$(CONFIG_BCM2835_SMI_DEV)	+= bcm2835_smi_dev.o
- obj-$(CONFIG_RPIVID_MEM)	+= rpivid-mem.o
---- a/drivers/char/broadcom/bcm2835-gpiomem.c
-+++ /dev/null
-@@ -1,258 +0,0 @@
--/**
-- * GPIO memory device driver
-- *
-- * Creates a chardev /dev/gpiomem which will provide user access to
-- * the BCM2835's GPIO registers when it is mmap()'d.
-- * No longer need root for user GPIO access, but without relaxing permissions
-- * on /dev/mem.
-- *
-- * Written by Luke Wren <luke@raspberrypi.org>
-- * Copyright (c) 2015, Raspberry Pi (Trading) Ltd.
-- *
-- * Redistribution and use in source and binary forms, with or without
-- * modification, are permitted provided that the following conditions
-- * are met:
-- * 1. Redistributions of source code must retain the above copyright
-- *    notice, this list of conditions, and the following disclaimer,
-- *    without modification.
-- * 2. Redistributions in binary form must reproduce the above copyright
-- *    notice, this list of conditions and the following disclaimer in the
-- *    documentation and/or other materials provided with the distribution.
-- * 3. The names of the above-listed copyright holders may not be used
-- *    to endorse or promote products derived from this software without
-- *    specific prior written permission.
-- *
-- * ALTERNATIVELY, this software may be distributed under the terms of the
-- * GNU General Public License ("GPL") version 2, as published by the Free
-- * Software Foundation.
-- *
-- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-- */
--
--#include <linux/kernel.h>
--#include <linux/module.h>
--#include <linux/of.h>
--#include <linux/platform_device.h>
--#include <linux/mm.h>
--#include <linux/slab.h>
--#include <linux/cdev.h>
--#include <linux/pagemap.h>
--#include <linux/io.h>
--
--#define DEVICE_NAME "bcm2835-gpiomem"
--#define DRIVER_NAME "gpiomem-bcm2835"
--#define DEVICE_MINOR 0
--
--struct bcm2835_gpiomem_instance {
--	unsigned long gpio_regs_phys;
--	struct device *dev;
--};
--
--static struct cdev bcm2835_gpiomem_cdev;
--static dev_t bcm2835_gpiomem_devid;
--static struct class *bcm2835_gpiomem_class;
--static struct device *bcm2835_gpiomem_dev;
--static struct bcm2835_gpiomem_instance *inst;
--
--
--/****************************************************************************
--*
--*   GPIO mem chardev file ops
--*
--***************************************************************************/
--
--static int bcm2835_gpiomem_open(struct inode *inode, struct file *file)
--{
--	int dev = iminor(inode);
--	int ret = 0;
--
--	if (dev != DEVICE_MINOR) {
--		dev_err(inst->dev, "Unknown minor device: %d", dev);
--		ret = -ENXIO;
--	}
--	return ret;
--}
--
--static int bcm2835_gpiomem_release(struct inode *inode, struct file *file)
--{
--	int dev = iminor(inode);
--	int ret = 0;
--
--	if (dev != DEVICE_MINOR) {
--		dev_err(inst->dev, "Unknown minor device %d", dev);
--		ret = -ENXIO;
--	}
--	return ret;
--}
--
--static const struct vm_operations_struct bcm2835_gpiomem_vm_ops = {
--#ifdef CONFIG_HAVE_IOREMAP_PROT
--	.access = generic_access_phys
--#endif
--};
--
--static int bcm2835_gpiomem_mmap(struct file *file, struct vm_area_struct *vma)
--{
--	/* Ignore what the user says - they're getting the GPIO regs
--	   whether they like it or not! */
--	unsigned long gpio_page = inst->gpio_regs_phys >> PAGE_SHIFT;
--
--	vma->vm_page_prot = phys_mem_access_prot(file, gpio_page,
--						 PAGE_SIZE,
--						 vma->vm_page_prot);
--	vma->vm_ops = &bcm2835_gpiomem_vm_ops;
--	if (remap_pfn_range(vma, vma->vm_start,
--			gpio_page,
--			PAGE_SIZE,
--			vma->vm_page_prot)) {
--		return -EAGAIN;
--	}
--	return 0;
--}
--
--static const struct file_operations
--bcm2835_gpiomem_fops = {
--	.owner = THIS_MODULE,
--	.open = bcm2835_gpiomem_open,
--	.release = bcm2835_gpiomem_release,
--	.mmap = bcm2835_gpiomem_mmap,
--};
--
--
-- /****************************************************************************
--*
--*   Probe and remove functions
--*
--***************************************************************************/
--
--
--static int bcm2835_gpiomem_probe(struct platform_device *pdev)
--{
--	int err;
--	void *ptr_err;
--	struct device *dev = &pdev->dev;
--	struct resource *ioresource;
--
--	/* Allocate buffers and instance data */
--
--	inst = kzalloc(sizeof(struct bcm2835_gpiomem_instance), GFP_KERNEL);
--
--	if (!inst) {
--		err = -ENOMEM;
--		goto failed_inst_alloc;
--	}
--
--	inst->dev = dev;
--
--	ioresource = platform_get_resource(pdev, IORESOURCE_MEM, 0);
--	if (ioresource) {
--		inst->gpio_regs_phys = ioresource->start;
--	} else {
--		dev_err(inst->dev, "failed to get IO resource");
--		err = -ENOENT;
--		goto failed_get_resource;
--	}
--
--	/* Create character device entries */
--
--	err = alloc_chrdev_region(&bcm2835_gpiomem_devid,
--				  DEVICE_MINOR, 1, DEVICE_NAME);
--	if (err != 0) {
--		dev_err(inst->dev, "unable to allocate device number");
--		goto failed_alloc_chrdev;
--	}
--	cdev_init(&bcm2835_gpiomem_cdev, &bcm2835_gpiomem_fops);
--	bcm2835_gpiomem_cdev.owner = THIS_MODULE;
--	err = cdev_add(&bcm2835_gpiomem_cdev, bcm2835_gpiomem_devid, 1);
--	if (err != 0) {
--		dev_err(inst->dev, "unable to register device");
--		goto failed_cdev_add;
--	}
--
--	/* Create sysfs entries */
--
--	bcm2835_gpiomem_class = class_create(THIS_MODULE, DEVICE_NAME);
--	ptr_err = bcm2835_gpiomem_class;
--	if (IS_ERR(ptr_err))
--		goto failed_class_create;
--
--	bcm2835_gpiomem_dev = device_create(bcm2835_gpiomem_class, NULL,
--					bcm2835_gpiomem_devid, NULL,
--					"gpiomem");
--	ptr_err = bcm2835_gpiomem_dev;
--	if (IS_ERR(ptr_err))
--		goto failed_device_create;
--
--	dev_info(inst->dev, "Initialised: Registers at 0x%08lx",
--		inst->gpio_regs_phys);
--
--	return 0;
--
--failed_device_create:
--	class_destroy(bcm2835_gpiomem_class);
--failed_class_create:
--	cdev_del(&bcm2835_gpiomem_cdev);
--	err = PTR_ERR(ptr_err);
--failed_cdev_add:
--	unregister_chrdev_region(bcm2835_gpiomem_devid, 1);
--failed_alloc_chrdev:
--failed_get_resource:
--	kfree(inst);
--failed_inst_alloc:
--	dev_err(inst->dev, "could not load bcm2835_gpiomem");
--	return err;
--}
--
--static int bcm2835_gpiomem_remove(struct platform_device *pdev)
--{
--	struct device *dev = inst->dev;
--
--	kfree(inst);
--	device_destroy(bcm2835_gpiomem_class, bcm2835_gpiomem_devid);
--	class_destroy(bcm2835_gpiomem_class);
--	cdev_del(&bcm2835_gpiomem_cdev);
--	unregister_chrdev_region(bcm2835_gpiomem_devid, 1);
--
--	dev_info(dev, "GPIO mem driver removed - OK");
--	return 0;
--}
--
-- /****************************************************************************
--*
--*   Register the driver with device tree
--*
--***************************************************************************/
--
--static const struct of_device_id bcm2835_gpiomem_of_match[] = {
--	{.compatible = "brcm,bcm2835-gpiomem",},
--	{ /* sentinel */ },
--};
--
--MODULE_DEVICE_TABLE(of, bcm2835_gpiomem_of_match);
--
--static struct platform_driver bcm2835_gpiomem_driver = {
--	.probe = bcm2835_gpiomem_probe,
--	.remove = bcm2835_gpiomem_remove,
--	.driver = {
--		   .name = DRIVER_NAME,
--		   .owner = THIS_MODULE,
--		   .of_match_table = bcm2835_gpiomem_of_match,
--		   },
--};
--
--module_platform_driver(bcm2835_gpiomem_driver);
--
--MODULE_ALIAS("platform:gpiomem-bcm2835");
--MODULE_LICENSE("GPL");
--MODULE_DESCRIPTION("gpiomem driver for accessing GPIO from userspace");
--MODULE_AUTHOR("Luke Wren <luke@raspberrypi.org>");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0910-drivers-hwmon-rp1-adc-check-conversion-validity-befo.patch b/target/linux/bcm27xx/patches-6.1/950-0910-drivers-hwmon-rp1-adc-check-conversion-validity-befo.patch
deleted file mode 100644
index 557b7ac406..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0910-drivers-hwmon-rp1-adc-check-conversion-validity-befo.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 3cafcfbab9b5f3f1357b415b6ca09911eeb405d6 Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.com>
-Date: Thu, 4 May 2023 15:48:53 +0100
-Subject: [PATCH] drivers: hwmon: rp1-adc: check conversion validity before
- supplying value
-
-The SAR ADC architecture may complete a conversion but instability in the
-comparator can corrupt the result. Such corruption is signalled in the CS
-ERR bit, asserted alongside each conversion result.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- drivers/hwmon/rp1-adc.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
---- a/drivers/hwmon/rp1-adc.c
-+++ b/drivers/hwmon/rp1-adc.c
-@@ -97,8 +97,14 @@ static int rp1_adc_read(struct rp1_adc_d
- 	       data->base + RP1_ADC_RWTYPE_SET + RP1_ADC_CS);
- 
- 	ret = rp1_adc_ready_wait(data);
--	if (!ret)
--		*val = readl(data->base + RP1_ADC_RESULT);
-+	if (ret)
-+		return ret;
-+
-+	/* Asserted if the completed conversion had a convergence error */
-+	if (readl(data->base + RP1_ADC_CS) & RP1_ADC_CS_ERR)
-+		return -EIO;
-+
-+	*val = readl(data->base + RP1_ADC_RESULT);
- 
- 	spin_unlock(&data->lock);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0911-dmaengine-bcm2835-Add-BCM2712-support.patch b/target/linux/bcm27xx/patches-6.1/950-0911-dmaengine-bcm2835-Add-BCM2712-support.patch
deleted file mode 100644
index 58095cf8fd..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0911-dmaengine-bcm2835-Add-BCM2712-support.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 87c5545f9a66984894384da5f8c2eeb60983732a Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 8 Mar 2023 16:53:38 +0000
-Subject: [PATCH] dmaengine: bcm2835: Add BCM2712 support
-
-BCM2712 has 6 40-bit channels - DMA6 to DMA11. Add a new compatible
-string to indicate that the current platform is BCM2712.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/dma/bcm2835-dma.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/drivers/dma/bcm2835-dma.c
-+++ b/drivers/dma/bcm2835-dma.c
-@@ -331,6 +331,12 @@ static const struct bcm2835_dma_cfg_data
- 	.dma_mask = DMA_BIT_MASK(36),
- };
- 
-+static const struct bcm2835_dma_cfg_data bcm2712_dma_cfg = {
-+	.chan_40bit_mask = BIT(6) | BIT(7) | BIT(8) | BIT(9) |
-+				 BIT(10) | BIT(11),
-+	.dma_mask = DMA_BIT_MASK(40),
-+};
-+
- static inline size_t bcm2835_dma_max_frame_length(struct bcm2835_chan *c)
- {
- 	/* lite and normal channels have different max frame length */
-@@ -1260,6 +1266,7 @@ EXPORT_SYMBOL(bcm2711_dma40_memcpy);
- static const struct of_device_id bcm2835_dma_of_match[] = {
- 	{ .compatible = "brcm,bcm2835-dma", .data = &bcm2835_dma_cfg },
- 	{ .compatible = "brcm,bcm2711-dma", .data = &bcm2711_dma_cfg },
-+	{ .compatible = "brcm,bcm2712-dma", .data = &bcm2712_dma_cfg },
- 	{},
- };
- MODULE_DEVICE_TABLE(of, bcm2835_dma_of_match);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0912-dmaengine-bcm2835-HACK-Support-DMA-Lite-channels.patch b/target/linux/bcm27xx/patches-6.1/950-0912-dmaengine-bcm2835-HACK-Support-DMA-Lite-channels.patch
deleted file mode 100644
index 6f651a65f6..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0912-dmaengine-bcm2835-HACK-Support-DMA-Lite-channels.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From a671a2774cb3bcfb144622149757f6821aa0604c Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Thu, 13 Apr 2023 16:52:19 +0200
-Subject: [PATCH] dmaengine: bcm2835: HACK: Support DMA-Lite channels
-
-The BCM2712 has a DMA-Lite controller that is basically a BCM2835-style
-DMA controller that supports 40 bits DMA addresses.
-
-We need it for HDMI audio to work, but this breaks BCM2835-38 so we
-should rework this later.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/dma/bcm2835-dma.c | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
---- a/drivers/dma/bcm2835-dma.c
-+++ b/drivers/dma/bcm2835-dma.c
-@@ -550,7 +550,7 @@ static struct bcm2835_desc *bcm2835_dma_
- 			control_block->info = info;
- 			control_block->src = src;
- 			control_block->dst = dst;
--			control_block->stride = 0;
-+			control_block->stride = (upper_32_bits(dst) << 8) | upper_32_bits(src);
- 			control_block->next = 0;
- 		}
- 
-@@ -575,7 +575,7 @@ static struct bcm2835_desc *bcm2835_dma_
- 			 d->cb_list[frame - 1].cb)->next_cb =
- 				to_bcm2711_cbaddr(cb_entry->paddr);
- 		if (frame && !c->is_40bit_channel)
--			d->cb_list[frame - 1].cb->next = cb_entry->paddr;
-+			d->cb_list[frame - 1].cb->next = to_bcm2711_cbaddr(cb_entry->paddr);
- 
- 		/* update src and dst and length */
- 		if (src && (info & BCM2835_DMA_S_INC)) {
-@@ -760,7 +760,10 @@ static void bcm2835_dma_start_desc(struc
- 		writel(BCM2711_DMA40_ACTIVE | BCM2711_DMA40_PROT | BCM2711_DMA40_CS_FLAGS(c->dreq),
- 		       c->chan_base + BCM2711_DMA40_CS);
- 	} else {
--		writel(d->cb_list[0].paddr, c->chan_base + BCM2835_DMA_ADDR);
-+		writel(BIT(31), c->chan_base + BCM2835_DMA_CS);
-+
-+		writel(to_bcm2711_cbaddr(d->cb_list[0].paddr),
-+		       c->chan_base + BCM2835_DMA_ADDR);
- 		writel(BCM2835_DMA_ACTIVE | BCM2835_DMA_CS_FLAGS(c->dreq),
- 		       c->chan_base + BCM2835_DMA_CS);
- 	}
-@@ -1129,7 +1132,7 @@ static struct dma_async_tx_descriptor *b
- 		 d->cb_list[frames - 1].cb)->next_cb =
- 			to_bcm2711_cbaddr(d->cb_list[0].paddr);
- 	else
--		d->cb_list[d->frames - 1].cb->next = d->cb_list[0].paddr;
-+		d->cb_list[d->frames - 1].cb->next = to_bcm2711_cbaddr(d->cb_list[0].paddr);
- 
- 	return vchan_tx_prep(&c->vc, &d->vd, flags);
- }
diff --git a/target/linux/bcm27xx/patches-6.1/950-0913-clk-bcm-rpi-Add-disp-clock.patch b/target/linux/bcm27xx/patches-6.1/950-0913-clk-bcm-rpi-Add-disp-clock.patch
deleted file mode 100644
index 6f5e55d956..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0913-clk-bcm-rpi-Add-disp-clock.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From c8fd69c6f567bd43ba084b95a987532940465ef5 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 24 Feb 2023 14:12:50 +0100
-Subject: [PATCH] clk: bcm: rpi: Add disp clock
-
-BCM2712 has an extra clock exposed by the firmware called DISP, and used
-by (at least) the HVS. Let's add it to the list of clocks to register in
-Linux.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/clk/bcm/clk-raspberrypi.c          | 5 +++++
- include/soc/bcm2835/raspberrypi-firmware.h | 1 +
- 2 files changed, 6 insertions(+)
-
---- a/drivers/clk/bcm/clk-raspberrypi.c
-+++ b/drivers/clk/bcm/clk-raspberrypi.c
-@@ -34,6 +34,7 @@ static char *rpi_firmware_clk_names[] =
- 	[RPI_FIRMWARE_M2MC_CLK_ID]	= "m2mc",
- 	[RPI_FIRMWARE_PIXEL_BVB_CLK_ID]	= "pixel-bvb",
- 	[RPI_FIRMWARE_VEC_CLK_ID]	= "vec",
-+	[RPI_FIRMWARE_DISP_CLK_ID]	= "disp",
- };
- 
- #define RPI_FIRMWARE_STATE_ENABLE_BIT	BIT(0)
-@@ -139,6 +140,10 @@ raspberrypi_clk_variants[RPI_FIRMWARE_NU
- 		.export = true,
- 		.minimize = true,
- 	},
-+	[RPI_FIRMWARE_DISP_CLK_ID] = {
-+		.export = true,
-+		.minimize = true,
-+	},
- };
- 
- /*
---- a/include/soc/bcm2835/raspberrypi-firmware.h
-+++ b/include/soc/bcm2835/raspberrypi-firmware.h
-@@ -176,6 +176,7 @@ enum rpi_firmware_clk_id {
- 	RPI_FIRMWARE_M2MC_CLK_ID,
- 	RPI_FIRMWARE_PIXEL_BVB_CLK_ID,
- 	RPI_FIRMWARE_VEC_CLK_ID,
-+	RPI_FIRMWARE_DISP_CLK_ID,
- 	RPI_FIRMWARE_NUM_CLK_ID,
- };
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0914-net-phy-broadcom-optionally-enable-link-down-powersa.patch b/target/linux/bcm27xx/patches-6.1/950-0914-net-phy-broadcom-optionally-enable-link-down-powersa.patch
deleted file mode 100644
index 2df48297b5..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0914-net-phy-broadcom-optionally-enable-link-down-powersa.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6370a6cd16a5aa9726bf209c0f0a3179f4011cb1 Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.com>
-Date: Mon, 22 May 2023 15:31:17 +0100
-Subject: [PATCH] net: phy: broadcom: optionally enable link-down powersave
- based on DT
-
-It's really a function of the board whether or not to use this feature
-as it may require MAC compatibility as well as interop testing.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- drivers/net/phy/broadcom.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/net/phy/broadcom.c
-+++ b/drivers/net/phy/broadcom.c
-@@ -370,6 +370,9 @@ static int bcm54xx_config_init(struct ph
- 	    (phydev->dev_flags & PHY_BRCM_CLEAR_RGMII_MODE))
- 		bcm_phy_write_shadow(phydev, BCM54XX_SHD_RGMII_MODE, 0);
- 
-+	if (of_property_read_bool(np, "brcm,powerdown-enable"))
-+		phydev->dev_flags |= PHY_BRCM_AUTO_PWRDWN_ENABLE;
-+
- 	bcm54xx_adjust_rxrefclk(phydev);
- 
- 	switch (BRCM_PHY_MODEL(phydev)) {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0915-dmaengine-bcm2835-Rename-to_bcm2711_cbaddr-to-to_40b.patch b/target/linux/bcm27xx/patches-6.1/950-0915-dmaengine-bcm2835-Rename-to_bcm2711_cbaddr-to-to_40b.patch
deleted file mode 100644
index ce59f6072b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0915-dmaengine-bcm2835-Rename-to_bcm2711_cbaddr-to-to_40b.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From cfad3f71fc450639fc259d576d0903e9132fe34a Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Thu, 25 May 2023 14:48:28 +0100
-Subject: [PATCH] dmaengine: bcm2835: Rename to_bcm2711_cbaddr to
- to_40bit_cbaddr
-
-As the shifted address also applies to bcm2712,
-give the function a more specific name.
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/dma/bcm2835-dma.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
---- a/drivers/dma/bcm2835-dma.c
-+++ b/drivers/dma/bcm2835-dma.c
-@@ -390,7 +390,7 @@ static inline uint32_t to_bcm2711_dsti(u
- 	       BCM2711_DMA40_BURST_LEN(BCM2835_DMA_GET_BURST_LENGTH(info));
- }
- 
--static inline uint32_t to_bcm2711_cbaddr(dma_addr_t addr)
-+static inline uint32_t to_40bit_cbaddr(dma_addr_t addr)
- {
- 	BUG_ON(addr & 0x1f);
- 	return (addr >> 5);
-@@ -573,9 +573,9 @@ static struct bcm2835_desc *bcm2835_dma_
- 		if (frame && c->is_40bit_channel)
- 			((struct bcm2711_dma40_scb *)
- 			 d->cb_list[frame - 1].cb)->next_cb =
--				to_bcm2711_cbaddr(cb_entry->paddr);
-+				to_40bit_cbaddr(cb_entry->paddr);
- 		if (frame && !c->is_40bit_channel)
--			d->cb_list[frame - 1].cb->next = to_bcm2711_cbaddr(cb_entry->paddr);
-+			d->cb_list[frame - 1].cb->next = to_40bit_cbaddr(cb_entry->paddr);
- 
- 		/* update src and dst and length */
- 		if (src && (info & BCM2835_DMA_S_INC)) {
-@@ -755,14 +755,14 @@ static void bcm2835_dma_start_desc(struc
- 	c->desc = d = to_bcm2835_dma_desc(&vd->tx);
- 
- 	if (c->is_40bit_channel) {
--		writel(to_bcm2711_cbaddr(d->cb_list[0].paddr),
-+		writel(to_40bit_cbaddr(d->cb_list[0].paddr),
- 		       c->chan_base + BCM2711_DMA40_CB);
- 		writel(BCM2711_DMA40_ACTIVE | BCM2711_DMA40_PROT | BCM2711_DMA40_CS_FLAGS(c->dreq),
- 		       c->chan_base + BCM2711_DMA40_CS);
- 	} else {
- 		writel(BIT(31), c->chan_base + BCM2835_DMA_CS);
- 
--		writel(to_bcm2711_cbaddr(d->cb_list[0].paddr),
-+		writel(to_40bit_cbaddr(d->cb_list[0].paddr),
- 		       c->chan_base + BCM2835_DMA_ADDR);
- 		writel(BCM2835_DMA_ACTIVE | BCM2835_DMA_CS_FLAGS(c->dreq),
- 		       c->chan_base + BCM2835_DMA_CS);
-@@ -1130,9 +1130,9 @@ static struct dma_async_tx_descriptor *b
- 	if (c->is_40bit_channel)
- 		((struct bcm2711_dma40_scb *)
- 		 d->cb_list[frames - 1].cb)->next_cb =
--			to_bcm2711_cbaddr(d->cb_list[0].paddr);
-+			to_40bit_cbaddr(d->cb_list[0].paddr);
- 	else
--		d->cb_list[d->frames - 1].cb->next = to_bcm2711_cbaddr(d->cb_list[0].paddr);
-+		d->cb_list[d->frames - 1].cb->next = to_40bit_cbaddr(d->cb_list[0].paddr);
- 
- 	return vchan_tx_prep(&c->vc, &d->vd, flags);
- }
-@@ -1252,7 +1252,7 @@ void bcm2711_dma40_memcpy(dma_addr_t dst
- 	scb->len = size;
- 	scb->next_cb = 0;
- 
--	writel(to_bcm2711_cbaddr(memcpy_scb_dma), memcpy_chan + BCM2711_DMA40_CB);
-+	writel(to_40bit_cbaddr(memcpy_scb_dma), memcpy_chan + BCM2711_DMA40_CB);
- 	writel(BCM2711_DMA40_MEMCPY_FLAGS | BCM2711_DMA40_ACTIVE | BCM2711_DMA40_PROT,
- 	       memcpy_chan + BCM2711_DMA40_CS);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0916-dmaengine-bcm2835-Fix-dma-driver-for-BCM2835-38.patch b/target/linux/bcm27xx/patches-6.1/950-0916-dmaengine-bcm2835-Fix-dma-driver-for-BCM2835-38.patch
deleted file mode 100644
index a2ff2a6bb0..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0916-dmaengine-bcm2835-Fix-dma-driver-for-BCM2835-38.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 75f44d1416c5de17865247d6d012c37f7650437c Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Wed, 24 May 2023 19:32:16 +0100
-Subject: [PATCH] dmaengine: bcm2835: Fix dma driver for BCM2835-38
-
-The previous commit broke support on older devices.
-Make the breaking parts of patch conditional on
-the device being used.
-
-Fixes: 6e1856ac7c39 ("dmaengine: bcm2835: HACK: Support DMA-Lite channels")
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/dma/bcm2835-dma.c | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
---- a/drivers/dma/bcm2835-dma.c
-+++ b/drivers/dma/bcm2835-dma.c
-@@ -102,6 +102,7 @@ struct bcm2835_chan {
- 
- 	bool is_lite_channel;
- 	bool is_40bit_channel;
-+	bool is_2712;
- };
- 
- struct bcm2835_desc {
-@@ -550,7 +551,11 @@ static struct bcm2835_desc *bcm2835_dma_
- 			control_block->info = info;
- 			control_block->src = src;
- 			control_block->dst = dst;
--			control_block->stride = (upper_32_bits(dst) << 8) | upper_32_bits(src);
-+			if (c->is_2712)
-+				control_block->stride = (upper_32_bits(dst) << 8) |
-+							upper_32_bits(src);
-+			else
-+				control_block->stride = 0;
- 			control_block->next = 0;
- 		}
- 
-@@ -575,7 +580,8 @@ static struct bcm2835_desc *bcm2835_dma_
- 			 d->cb_list[frame - 1].cb)->next_cb =
- 				to_40bit_cbaddr(cb_entry->paddr);
- 		if (frame && !c->is_40bit_channel)
--			d->cb_list[frame - 1].cb->next = to_40bit_cbaddr(cb_entry->paddr);
-+			d->cb_list[frame - 1].cb->next = c->is_2712 ?
-+			to_40bit_cbaddr(cb_entry->paddr) : cb_entry->paddr;
- 
- 		/* update src and dst and length */
- 		if (src && (info & BCM2835_DMA_S_INC)) {
-@@ -762,7 +768,7 @@ static void bcm2835_dma_start_desc(struc
- 	} else {
- 		writel(BIT(31), c->chan_base + BCM2835_DMA_CS);
- 
--		writel(to_40bit_cbaddr(d->cb_list[0].paddr),
-+		writel(c->is_2712 ? to_40bit_cbaddr(d->cb_list[0].paddr) : d->cb_list[0].paddr,
- 		       c->chan_base + BCM2835_DMA_ADDR);
- 		writel(BCM2835_DMA_ACTIVE | BCM2835_DMA_CS_FLAGS(c->dreq),
- 		       c->chan_base + BCM2835_DMA_CS);
-@@ -1132,7 +1138,8 @@ static struct dma_async_tx_descriptor *b
- 		 d->cb_list[frames - 1].cb)->next_cb =
- 			to_40bit_cbaddr(d->cb_list[0].paddr);
- 	else
--		d->cb_list[d->frames - 1].cb->next = to_40bit_cbaddr(d->cb_list[0].paddr);
-+		d->cb_list[d->frames - 1].cb->next = c->is_2712 ?
-+		to_40bit_cbaddr(d->cb_list[0].paddr) : d->cb_list[0].paddr;
- 
- 	return vchan_tx_prep(&c->vc, &d->vd, flags);
- }
-@@ -1199,6 +1206,8 @@ static int bcm2835_dma_chan_init(struct
- 	else if (readl(c->chan_base + BCM2835_DMA_DEBUG) &
- 		 BCM2835_DMA_DEBUG_LITE)
- 		c->is_lite_channel = true;
-+	if (d->cfg_data->dma_mask == DMA_BIT_MASK(40))
-+		c->is_2712 = true;
- 
- 	return 0;
- }
diff --git a/target/linux/bcm27xx/patches-6.1/950-0917-drivers-iommu-Add-BCM2712-IOMMU.patch b/target/linux/bcm27xx/patches-6.1/950-0917-drivers-iommu-Add-BCM2712-IOMMU.patch
deleted file mode 100644
index 92f43fa71b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0917-drivers-iommu-Add-BCM2712-IOMMU.patch
+++ /dev/null
@@ -1,855 +0,0 @@
-From 5fd6ee7fd084838e09d4e463ae53cd9aaa7fce70 Mon Sep 17 00:00:00 2001
-From: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
-Date: Thu, 11 May 2023 16:37:34 +0100
-Subject: [PATCH] drivers: iommu: Add BCM2712 IOMMU
-
-Add a driver for BCM2712 IOMMUs.
-There is a small driver for the Shared IOMMU TLB Cache.
-Each IOMMU instance is a separate device.
-
-IOMMUs are set up with a "pass-through" range covering
-the lowest 40BGytes (which should cover all of SDRAM)
-for the benefit of non-IOMMU-aware devices that share
-a physical IOMMU; and translation for addresses in the
-range 40GB to 42GB.
-
-An optional parameter adds a DMA offset (which otherwise
-would be lost?) to virtual addresses for DMA masters on a
-bus such as PCIe.
-
-Signed-off-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
----
- drivers/iommu/Kconfig               |   7 +
- drivers/iommu/Makefile              |   1 +
- drivers/iommu/bcm2712-iommu-cache.c |  77 ++++
- drivers/iommu/bcm2712-iommu.c       | 672 ++++++++++++++++++++++++++++
- drivers/iommu/bcm2712-iommu.h       |  45 ++
- 5 files changed, 802 insertions(+)
- create mode 100644 drivers/iommu/bcm2712-iommu-cache.c
- create mode 100644 drivers/iommu/bcm2712-iommu.c
- create mode 100644 drivers/iommu/bcm2712-iommu.h
-
---- a/drivers/iommu/Kconfig
-+++ b/drivers/iommu/Kconfig
-@@ -506,4 +506,11 @@ config SPRD_IOMMU
- 
- 	  Say Y here if you want to use the multimedia devices listed above.
- 
-+config BCM2712_IOMMU
-+       tristate "BCM2712 IOMMU driver"
-+       depends on ARM64 && ARCH_BCM
-+       select IOMMU_API
-+       help
-+	 IOMMU driver for BCM2712
-+
- endif # IOMMU_SUPPORT
---- a/drivers/iommu/Makefile
-+++ b/drivers/iommu/Makefile
-@@ -31,3 +31,4 @@ obj-$(CONFIG_VIRTIO_IOMMU) += virtio-iom
- obj-$(CONFIG_IOMMU_SVA) += iommu-sva-lib.o io-pgfault.o
- obj-$(CONFIG_SPRD_IOMMU) += sprd-iommu.o
- obj-$(CONFIG_APPLE_DART) += apple-dart.o
-+obj-$(CONFIG_BCM2712_IOMMU) += bcm2712-iommu.o bcm2712-iommu-cache.o
---- /dev/null
-+++ b/drivers/iommu/bcm2712-iommu-cache.c
-@@ -0,0 +1,77 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+/*
-+ * IOMMU driver for BCM2712
-+ *
-+ * Copyright (c) 2023 Raspberry Pi Ltd.
-+ */
-+
-+#include "bcm2712-iommu.h"
-+
-+#include <linux/err.h>
-+#include <linux/of_platform.h>
-+#include <linux/platform_device.h>
-+#include <linux/spinlock.h>
-+
-+#define MMUC_CONTROL_ENABLE   1
-+#define MMUC_CONTROL_FLUSH    2
-+#define MMUC_CONTROL_FLUSHING 4
-+
-+void bcm2712_iommu_cache_flush(struct bcm2712_iommu_cache *cache)
-+{
-+	unsigned long flags;
-+	int i;
-+
-+	spin_lock_irqsave(&cache->hw_lock, flags);
-+	if (cache->reg_base) {
-+		/* Enable and flush the TLB cache */
-+		writel(MMUC_CONTROL_ENABLE | MMUC_CONTROL_FLUSH,
-+		       cache->reg_base);
-+
-+		/* Wait for flush to complete: it should be very quick */
-+		for (i = 0; i < 1024; i++) {
-+			if (!(MMUC_CONTROL_FLUSHING & readl(cache->reg_base)))
-+				break;
-+			cpu_relax();
-+		}
-+	}
-+	spin_unlock_irqrestore(&cache->hw_lock, flags);
-+}
-+
-+static int bcm2712_iommu_cache_probe(struct platform_device *pdev)
-+{
-+	struct bcm2712_iommu_cache *cache;
-+
-+	dev_info(&pdev->dev, __func__);
-+	cache = devm_kzalloc(&pdev->dev, sizeof(*cache), GFP_KERNEL);
-+	if (!cache)
-+		return -ENOMEM;
-+
-+	cache->dev = &pdev->dev;
-+	platform_set_drvdata(pdev, cache);
-+	spin_lock_init(&cache->hw_lock);
-+
-+	/* Get IOMMUC registers; we only use the first register (IOMMUC_CTRL) */
-+	cache->reg_base = devm_platform_ioremap_resource(pdev, 0);
-+	if (IS_ERR(cache->reg_base)) {
-+		dev_err(&pdev->dev, "Failed to get IOMMU Cache registers address\n");
-+		cache->reg_base = NULL;
-+	}
-+	return 0;
-+}
-+
-+static const struct of_device_id bcm2712_iommu_cache_of_match[] = {
-+	{
-+		. compatible = "brcm,bcm2712-iommuc"
-+	},
-+	{ /* sentinel */ },
-+};
-+
-+static struct platform_driver bcm2712_iommu_cache_driver = {
-+	.probe = bcm2712_iommu_cache_probe,
-+	.driver = {
-+		.name = "bcm2712-iommu-cache",
-+		.of_match_table = bcm2712_iommu_cache_of_match
-+	},
-+};
-+
-+builtin_platform_driver(bcm2712_iommu_cache_driver);
---- /dev/null
-+++ b/drivers/iommu/bcm2712-iommu.c
-@@ -0,0 +1,672 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+/*
-+ * IOMMU driver for BCM2712
-+ *
-+ * Copyright (c) 2023 Raspberry Pi Ltd.
-+ */
-+
-+#include "bcm2712-iommu.h"
-+
-+#include <linux/dma-mapping.h>
-+#include <linux/err.h>
-+#include <linux/iommu.h>
-+#include <linux/of_platform.h>
-+#include <linux/platform_device.h>
-+#include <linux/spinlock.h>
-+
-+#define MMU_WR(off, val)   writel(val, mmu->reg_base + (off))
-+#define MMU_RD(off)        readl(mmu->reg_base + (off))
-+
-+#define domain_to_mmu(d) (container_of(d, struct bcm2712_iommu_domain, base)->mmu)
-+
-+#define MMMU_CTRL_OFFSET                       0x00
-+#define MMMU_CTRL_CAP_EXCEEDED                 BIT(27)
-+#define MMMU_CTRL_CAP_EXCEEDED_ABORT_EN        BIT(26)
-+#define MMMU_CTRL_CAP_EXCEEDED_INT_EN          BIT(25)
-+#define MMMU_CTRL_CAP_EXCEEDED_EXCEPTION_EN    BIT(24)
-+#define MMMU_CTRL_PT_INVALID                   BIT(20)
-+#define MMMU_CTRL_PT_INVALID_ABORT_EN          BIT(19)
-+#define MMMU_CTRL_PT_INVALID_EXCEPTION_EN      BIT(18)
-+#define MMMU_CTRL_PT_INVALID_EN                BIT(17)
-+#define MMMU_CTRL_WRITE_VIOLATION              BIT(12)
-+#define MMMU_CTRL_WRITE_VIOLATION_ABORT_EN     BIT(11)
-+#define MMMU_CTRL_WRITE_VIOLATION_INT_EN       BIT(10)
-+#define MMMU_CTRL_WRITE_VIOLATION_EXCEPTION_EN BIT(9)
-+#define MMMU_CTRL_BYPASS                       BIT(8)
-+#define MMMU_CTRL_TLB_CLEARING                 BIT(7)
-+#define MMMU_CTRL_STATS_CLEAR                  BIT(3)
-+#define MMMU_CTRL_TLB_CLEAR                    BIT(2)
-+#define MMMU_CTRL_STATS_ENABLE                 BIT(1)
-+#define MMMU_CTRL_ENABLE                       BIT(0)
-+
-+#define MMMU_PT_PA_BASE_OFFSET                 0x04
-+
-+#define MMMU_HIT_OFFSET                        0x08
-+#define MMMU_MISS_OFFSET                       0x0C
-+#define MMMU_STALL_OFFSET                      0x10
-+
-+#define MMMU_ADDR_CAP_OFFSET                   0x14
-+#define MMMU_ADDR_CAP_ENABLE                   BIT(31)
-+#define ADDR_CAP_SHIFT 28 /* ADDR_CAP is defined to be in 256 MByte units */
-+
-+#define MMMU_SHOOT_DOWN_OFFSET                 0x18
-+#define MMMU_SHOOT_DOWN_SHOOTING               BIT(31)
-+#define MMMU_SHOOT_DOWN_SHOOT                  BIT(30)
-+
-+#define MMMU_BYPASS_START_OFFSET               0x1C
-+#define MMMU_BYPASS_START_ENABLE               BIT(31)
-+#define MMMU_BYPASS_START_INVERT               BIT(30)
-+
-+#define MMMU_BYPASS_END_OFFSET                 0x20
-+#define MMMU_BYPASS_END_ENABLE                 BIT(31)
-+
-+#define MMMU_MISC_OFFSET                       0x24
-+#define MMMU_MISC_SINGLE_TABLE                 BIT(31)
-+
-+#define MMMU_ILLEGAL_ADR_OFFSET                0x30
-+#define MMMU_ILLEGAL_ADR_ENABLE                BIT(31)
-+
-+#define MMMU_DEBUG_INFO_OFFSET                 0x38
-+#define MMMU_DEBUG_INFO_VERSION_MASK           0x0000000Fu
-+#define MMMU_DEBUG_INFO_VA_WIDTH_MASK          0x000000F0u
-+#define MMMU_DEBUG_INFO_PA_WIDTH_MASK          0x00000F00u
-+#define MMMU_DEBUG_INFO_BIGPAGE_WIDTH_MASK     0x000FF000u
-+#define MMMU_DEBUG_INFO_SUPERPAGE_WIDTH_MASK   0x0FF00000u
-+#define MMMU_DEBUG_INFO_BYPASS_4M              BIT(28)
-+#define MMMU_DEBUG_INFO_BYPASS                 BIT(29)
-+
-+#define MMMU_PTE_PAGESIZE_MASK                 0xC0000000u
-+#define MMMU_PTE_WRITEABLE                     BIT(29)
-+#define MMMU_PTE_VALID                         BIT(28)
-+
-+/*
-+ * BCM2712 IOMMU is organized around 4Kbyte pages (MMU_PAGE_SIZE).
-+ * Linux PAGE_SIZE must not be smaller but may be larger (e.g. 4K, 16K).
-+ *
-+ * Unlike many larger MMUs, this one uses a 4-byte word size, allowing
-+ * 1024 entries within each 4K table page, and two-level translation.
-+ *
-+ * Let's allocate enough table space for 2GB of translated memory (IOVA).
-+ * This requires 512 4K pages (2MB) of level-2 tables, one page of
-+ * top-level table (only half-filled in this particular configuration),
-+ * plus one "default" page to catch illegal requests.
-+ *
-+ * The translated virtual address region is between 40GB and 42GB;
-+ * addresses below this range pass straight through to the SDRAM.
-+ *
-+ * Currently we assume a 1:1:1 correspondence of IOMMU, group and domain.
-+ */
-+
-+#define MMU_PAGE_SHIFT    12
-+#define MMU_PAGE_SIZE     BIT(MMU_PAGE_SHIFT)
-+
-+#define PAGEWORDS_SHIFT   (MMU_PAGE_SHIFT - 2)
-+#define HUGEPAGE_SHIFT    (MMU_PAGE_SHIFT + PAGEWORDS_SHIFT)
-+#define L1_CHUNK_SHIFT    (MMU_PAGE_SHIFT + 2 * PAGEWORDS_SHIFT)
-+
-+#define APERTURE_BASE     (40ul << 30)
-+#define APERTURE_SIZE     (2ul << 30)
-+#define APERTURE_TOP      (APERTURE_BASE + APERTURE_SIZE)
-+#define TRANSLATED_PAGES  (APERTURE_SIZE >> MMU_PAGE_SHIFT)
-+#define L2_PAGES          (TRANSLATED_PAGES >> PAGEWORDS_SHIFT)
-+#define TABLES_ALLOC_SIZE (L2_PAGES * MMU_PAGE_SIZE + 2 * PAGE_SIZE)
-+
-+static void bcm2712_iommu_init(struct bcm2712_iommu *mmu)
-+{
-+	unsigned int i, bypass_shift;
-+	struct sg_dma_page_iter it;
-+	u32 u = MMU_RD(MMMU_DEBUG_INFO_OFFSET);
-+
-+	/*
-+	 * Check IOMMU version and hardware configuration.
-+	 * This driver is for VC IOMMU version >= 4 (with 2-level tables)
-+	 * and assumes at least 36 bits of virtual and physical address space.
-+	 * Bigpage and superpage sizes are typically 64K and 1M, but may vary
-+	 * (hugepage size is fixed at 4M, the range covered by an L2 page).
-+	 */
-+	dev_info(mmu->dev, "%s: DEBUG_INFO = 0x%08x\n", __func__, u);
-+	WARN_ON(FIELD_GET(MMMU_DEBUG_INFO_VERSION_MASK, u) < 4 ||
-+		FIELD_GET(MMMU_DEBUG_INFO_VA_WIDTH_MASK, u) < 6 ||
-+		FIELD_GET(MMMU_DEBUG_INFO_PA_WIDTH_MASK, u) < 6 ||
-+		!(u & MMMU_DEBUG_INFO_BYPASS));
-+
-+	mmu->bigpage_mask =
-+		((1u << FIELD_GET(MMMU_DEBUG_INFO_BIGPAGE_WIDTH_MASK, u)) - 1u) << MMU_PAGE_SHIFT;
-+	mmu->superpage_mask =
-+		((1u << FIELD_GET(MMMU_DEBUG_INFO_SUPERPAGE_WIDTH_MASK, u)) - 1u) << MMU_PAGE_SHIFT;
-+	bypass_shift = (u & MMMU_DEBUG_INFO_BYPASS_4M) ?
-+		HUGEPAGE_SHIFT : ADDR_CAP_SHIFT;
-+
-+	/* Disable MMU and clear sticky flags; meanwhile flush the TLB */
-+	MMU_WR(MMMU_CTRL_OFFSET,
-+	       MMMU_CTRL_CAP_EXCEEDED    |
-+	       MMMU_CTRL_PT_INVALID      |
-+	       MMMU_CTRL_WRITE_VIOLATION |
-+	       MMMU_CTRL_STATS_CLEAR     |
-+	       MMMU_CTRL_TLB_CLEAR);
-+
-+	/*
-+	 * Put MMU into 2-level mode; set address cap and "bypass" range
-+	 * (note that some of these registers have unintuitive off-by-ones).
-+	 * Addresses below APERTURE_BASE are passed unchanged: this is
-+	 * useful for blocks which share an IOMMU with other blocks
-+	 * whose drivers are not IOMMU-aware.
-+	 */
-+	MMU_WR(MMMU_MISC_OFFSET,
-+	       MMU_RD(MMMU_MISC_OFFSET) & ~MMMU_MISC_SINGLE_TABLE);
-+	MMU_WR(MMMU_ADDR_CAP_OFFSET,
-+	       MMMU_ADDR_CAP_ENABLE +
-+	       (APERTURE_TOP >> ADDR_CAP_SHIFT) - 1);
-+	if (APERTURE_BASE > 0) {
-+		MMU_WR(MMMU_BYPASS_START_OFFSET,
-+		       MMMU_BYPASS_START_ENABLE + MMMU_BYPASS_START_INVERT +
-+		       (APERTURE_BASE >> bypass_shift) - 1);
-+		MMU_WR(MMMU_BYPASS_END_OFFSET,
-+		       MMMU_BYPASS_END_ENABLE +
-+		       (APERTURE_TOP >> bypass_shift));
-+	} else {
-+		MMU_WR(MMMU_BYPASS_START_OFFSET, 0);
-+		MMU_WR(MMMU_BYPASS_END_OFFSET, 0);
-+	}
-+
-+	/* Ensure tables are zeroed (which marks all pages as invalid) */
-+	dma_sync_sgtable_for_cpu(mmu->dev, mmu->sgt, DMA_TO_DEVICE);
-+	memset(mmu->tables, 0, TABLES_ALLOC_SIZE);
-+	mmu->nmapped_pages = 0;
-+
-+	/* Initialize the high-level table to point to the low-level pages */
-+	__sg_page_iter_start(&it.base, mmu->sgt->sgl, mmu->sgt->nents, 0);
-+	for (i = 0; i < L2_PAGES; i++) {
-+		if (!(i % (PAGE_SIZE / MMU_PAGE_SIZE))) {
-+			__sg_page_iter_dma_next(&it);
-+			u = (sg_page_iter_dma_address(&it) >> MMU_PAGE_SHIFT);
-+		} else {
-+			u++;
-+		}
-+		mmu->tables[TRANSLATED_PAGES + i] = MMMU_PTE_VALID + u;
-+	}
-+
-+	/*
-+	 * Configure the addresses of the top-level table (offset because
-+	 * the aperture does not start from zero), and of the default page.
-+	 * For simplicity, both these regions are whole Linux pages.
-+	 */
-+	__sg_page_iter_dma_next(&it);
-+	u = (sg_page_iter_dma_address(&it) >> MMU_PAGE_SHIFT);
-+	MMU_WR(MMMU_PT_PA_BASE_OFFSET, u - (APERTURE_BASE >> L1_CHUNK_SHIFT));
-+	__sg_page_iter_dma_next(&it);
-+	u = (sg_page_iter_dma_address(&it) >> MMU_PAGE_SHIFT);
-+	MMU_WR(MMMU_ILLEGAL_ADR_OFFSET, MMMU_ILLEGAL_ADR_ENABLE + u);
-+	dma_sync_sgtable_for_device(mmu->dev, mmu->sgt, DMA_TO_DEVICE);
-+	mmu->dirty = false;
-+
-+	/* Flush (and enable) the shared TLB cache; enable this MMU. */
-+	if (mmu->cache)
-+		bcm2712_iommu_cache_flush(mmu->cache);
-+	MMU_WR(MMMU_CTRL_OFFSET,
-+	       MMMU_CTRL_CAP_EXCEEDED_ABORT_EN    |
-+	       MMMU_CTRL_PT_INVALID_ABORT_EN      |
-+	       MMMU_CTRL_WRITE_VIOLATION_ABORT_EN |
-+	       MMMU_CTRL_STATS_ENABLE             |
-+	       MMMU_CTRL_ENABLE);
-+}
-+
-+static int bcm2712_iommu_attach_dev(struct iommu_domain *domain, struct device *dev)
-+{
-+	struct bcm2712_iommu *mmu = dev ? dev_iommu_priv_get(dev) : 0;
-+	struct bcm2712_iommu_domain *mydomain =
-+		container_of(domain, struct bcm2712_iommu_domain, base);
-+
-+	dev_info(dev, "%s: MMU %s\n",
-+		 __func__, mmu ? dev_name(mmu->dev) : "");
-+
-+	if (mmu) {
-+		mydomain->mmu = mmu;
-+		mmu->domain = mydomain;
-+
-+		if (mmu->dma_iova_offset) {
-+			domain->geometry.aperture_start =
-+				mmu->dma_iova_offset + APERTURE_BASE;
-+			domain->geometry.aperture_end =
-+				mmu->dma_iova_offset + APERTURE_TOP - 1ul;
-+		}
-+
-+		return 0;
-+	}
-+	return -EINVAL;
-+}
-+
-+static void bcm2712_iommu_detach_dev(struct iommu_domain *domain, struct device *dev)
-+{
-+	(void)domain;
-+	(void)dev;
-+}
-+
-+static int bcm2712_iommu_map(struct iommu_domain *domain, unsigned long iova,
-+			     phys_addr_t pa, size_t bytes, int prot, gfp_t gfp)
-+{
-+	struct bcm2712_iommu *mmu = domain_to_mmu(domain);
-+
-+	(void)gfp;
-+	iova -= mmu->dma_iova_offset;
-+	if (iova >= APERTURE_BASE && iova + bytes <= APERTURE_TOP) {
-+		unsigned int p;
-+		u32 entry = MMMU_PTE_VALID | (pa >> MMU_PAGE_SHIFT);
-+		u32 align = (u32)(iova | pa | bytes);
-+
-+		/* large page and write enable flags */
-+		if (!(align & ((1 << HUGEPAGE_SHIFT) - 1)))
-+			entry |= FIELD_PREP(MMMU_PTE_PAGESIZE_MASK, 3);
-+		else if (!(align & mmu->superpage_mask) && mmu->superpage_mask)
-+			entry |= FIELD_PREP(MMMU_PTE_PAGESIZE_MASK, 2);
-+		else if (!(align &  mmu->bigpage_mask) && mmu->bigpage_mask)
-+			entry |= FIELD_PREP(MMMU_PTE_PAGESIZE_MASK, 1);
-+		if (prot & IOMMU_WRITE)
-+			entry |= MMMU_PTE_WRITEABLE;
-+
-+		/* Ensure tables are cache-coherent with CPU */
-+		if (!mmu->dirty) {
-+			dma_sync_sgtable_for_cpu(mmu->dev, mmu->sgt, DMA_TO_DEVICE);
-+			mmu->dirty = true;
-+		}
-+
-+		iova -= APERTURE_BASE;
-+		for (p = iova >> MMU_PAGE_SHIFT;
-+		     p < (iova + bytes) >> MMU_PAGE_SHIFT; p++) {
-+			mmu->nmapped_pages += !(mmu->tables[p]);
-+			mmu->tables[p] = entry++;
-+		}
-+	} else if (iova + bytes > APERTURE_BASE || iova != pa) {
-+		dev_warn(mmu->dev, "%s: iova=0x%lx pa=0x%llx size=0x%llx OUT OF RANGE!\n",
-+			 __func__, iova,
-+			 (unsigned long long)pa, (unsigned long long)bytes);
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
-+
-+static size_t bcm2712_iommu_unmap(struct iommu_domain *domain, unsigned long iova,
-+				  size_t bytes, struct iommu_iotlb_gather *gather)
-+{
-+	struct bcm2712_iommu *mmu = domain_to_mmu(domain);
-+
-+	if (iova >= mmu->dma_iova_offset + APERTURE_BASE &&
-+	    iova + bytes <= mmu->dma_iova_offset + APERTURE_TOP) {
-+		unsigned int p;
-+
-+		/* Record just the lower and upper bounds in "gather" */
-+		if (gather) {
-+			bool empty = (gather->end <= gather->start);
-+
-+			if (empty || gather->start < iova)
-+				gather->start = iova;
-+			if (empty || gather->end < iova + bytes)
-+				gather->end = iova + bytes;
-+		}
-+
-+		/* Ensure tables are cache-coherent with CPU */
-+		if (!mmu->dirty) {
-+			dma_sync_sgtable_for_cpu(mmu->dev, mmu->sgt, DMA_TO_DEVICE);
-+			mmu->dirty = true;
-+		}
-+
-+		/* Clear table entries, this marks the addresses as illegal */
-+		iova -= (mmu->dma_iova_offset + APERTURE_BASE);
-+		for (p = iova >> MMU_PAGE_SHIFT;
-+		     p < (iova + bytes) >> MMU_PAGE_SHIFT;
-+		     p++) {
-+			mmu->nmapped_pages -= !!(mmu->tables[p]);
-+			mmu->tables[p] = 0;
-+		}
-+	}
-+
-+	return bytes;
-+}
-+
-+static void bcm2712_iommu_sync_range(struct iommu_domain *domain,
-+				     unsigned long iova, size_t size)
-+{
-+	struct bcm2712_iommu *mmu = domain_to_mmu(domain);
-+	unsigned long iova_end;
-+	unsigned int i, p4;
-+
-+	if (!mmu || !mmu->dirty)
-+		return;
-+
-+	/* Ensure tables are cleaned from CPU cache or write-buffer */
-+	dma_sync_sgtable_for_device(mmu->dev, mmu->sgt, DMA_TO_DEVICE);
-+	mmu->dirty = false;
-+
-+	/* Flush the shared TLB cache */
-+	if (mmu->cache)
-+		bcm2712_iommu_cache_flush(mmu->cache);
-+
-+	/*
-+	 * When flushing a large range or when nothing needs to be kept,
-+	 * it's quicker to use the"TLB_CLEAR" flag. Otherwise, invalidate
-+	 * TLB entries in lines of 4 words each. Each flush/clear operation
-+	 * should complete almost instantaneously.
-+	 */
-+	iova -= mmu->dma_iova_offset;
-+	iova_end = min(APERTURE_TOP, iova + size);
-+	iova = max(APERTURE_BASE, iova);
-+	if (mmu->nmapped_pages == 0 || iova_end - iova >= APERTURE_SIZE / 8) {
-+		MMU_WR(MMMU_CTRL_OFFSET,
-+		       MMMU_CTRL_CAP_EXCEEDED_ABORT_EN    |
-+		       MMMU_CTRL_PT_INVALID_ABORT_EN      |
-+		       MMMU_CTRL_WRITE_VIOLATION_ABORT_EN |
-+		       MMMU_CTRL_TLB_CLEAR                |
-+		       MMMU_CTRL_STATS_ENABLE             |
-+		       MMMU_CTRL_ENABLE);
-+		for (i = 0; i < 1024; i++) {
-+			if (!(MMMU_CTRL_TLB_CLEARING & MMU_RD(MMMU_CTRL_OFFSET)))
-+				break;
-+			cpu_relax();
-+		}
-+	} else {
-+		for (p4 = iova >> (MMU_PAGE_SHIFT + 2);
-+		     p4 < (iova_end + 3 * MMU_PAGE_SIZE) >> (MMU_PAGE_SHIFT + 2);
-+		     p4++) {
-+			MMU_WR(MMMU_SHOOT_DOWN_OFFSET,
-+			       MMMU_SHOOT_DOWN_SHOOT + (p4 << 2));
-+			for (i = 0; i < 1024; i++) {
-+				if (!(MMMU_SHOOT_DOWN_SHOOTING & MMU_RD(MMMU_SHOOT_DOWN_OFFSET)))
-+					break;
-+				cpu_relax();
-+			}
-+		}
-+	}
-+}
-+
-+static void bcm2712_iommu_sync(struct iommu_domain *domain,
-+			       struct iommu_iotlb_gather *gather)
-+{
-+	bcm2712_iommu_sync_range(domain, gather->start,
-+				 gather->end - gather->start);
-+}
-+
-+static void bcm2712_iommu_sync_all(struct iommu_domain *domain)
-+{
-+	bcm2712_iommu_sync_range(domain, APERTURE_BASE, APERTURE_SIZE);
-+}
-+
-+static phys_addr_t bcm2712_iommu_iova_to_phys(struct iommu_domain *domain, dma_addr_t iova)
-+{
-+	struct bcm2712_iommu *mmu = domain_to_mmu(domain);
-+	u32 p;
-+
-+	iova -= mmu->dma_iova_offset;
-+	if (iova  >= APERTURE_BASE && iova < APERTURE_TOP) {
-+		p = (iova - APERTURE_BASE) >> MMU_PAGE_SHIFT;
-+		p = mmu->tables[p] & 0x0FFFFFFFu;
-+		return (((phys_addr_t)p) << MMU_PAGE_SHIFT) + (iova & (MMU_PAGE_SIZE - 1u));
-+	} else if (iova < APERTURE_BASE) {
-+		return (phys_addr_t)iova;
-+	} else {
-+		return (phys_addr_t)-EINVAL;
-+	}
-+}
-+
-+static void bcm2712_iommu_domain_free(struct iommu_domain *domain)
-+{
-+	struct bcm2712_iommu_domain *mydomain =
-+		container_of(domain, struct bcm2712_iommu_domain, base);
-+
-+	kfree(mydomain);
-+}
-+
-+static const struct iommu_domain_ops bcm2712_iommu_domain_ops = {
-+	.attach_dev	 = bcm2712_iommu_attach_dev,
-+	.detach_dev	 = bcm2712_iommu_detach_dev,
-+	.map		 = bcm2712_iommu_map,
-+	.unmap		 = bcm2712_iommu_unmap,
-+	.iotlb_sync      = bcm2712_iommu_sync,
-+	.iotlb_sync_map  = bcm2712_iommu_sync_range,
-+	.flush_iotlb_all = bcm2712_iommu_sync_all,
-+	.iova_to_phys	 = bcm2712_iommu_iova_to_phys,
-+	.free		 = bcm2712_iommu_domain_free,
-+};
-+
-+static struct iommu_domain *bcm2712_iommu_domain_alloc(unsigned int type)
-+{
-+	struct bcm2712_iommu_domain *domain;
-+
-+	if (type != IOMMU_DOMAIN_UNMANAGED && type != IOMMU_DOMAIN_DMA)
-+		return NULL;
-+
-+	domain = kzalloc(sizeof(*domain), GFP_KERNEL);
-+	if (!domain)
-+		return NULL;
-+
-+	domain->base.type = type;
-+	domain->base.ops  = &bcm2712_iommu_domain_ops;
-+	domain->base.geometry.aperture_start = APERTURE_BASE;
-+	domain->base.geometry.aperture_end   = APERTURE_TOP - 1ul;
-+	domain->base.geometry.force_aperture = true;
-+	return &domain->base;
-+}
-+
-+static struct iommu_device *bcm2712_iommu_probe_device(struct device *dev)
-+{
-+	struct bcm2712_iommu *mmu;
-+
-+	/*
-+	 * For reasons I don't fully understand, we need to try both
-+	 * cases (dev_iommu_priv_get() and platform_get_drvdata())
-+	 * in order to get both GPU and ISP-BE to probe successfully.
-+	 */
-+	mmu = dev_iommu_priv_get(dev);
-+	if (!mmu) {
-+		struct device_node *np;
-+		struct platform_device *pdev;
-+
-+		/* Ignore devices that don't have an "iommus" property with exactly one phandle */
-+		if (!dev->of_node ||
-+		    of_property_count_elems_of_size(dev->of_node, "iommus", sizeof(phandle)) != 1)
-+			return ERR_PTR(-ENODEV);
-+
-+		np = of_parse_phandle(dev->of_node, "iommus", 0);
-+		if (!np)
-+			return ERR_PTR(-EINVAL);
-+
-+		pdev = of_find_device_by_node(np);
-+		of_node_put(np);
-+		if (pdev)
-+			mmu = platform_get_drvdata(pdev);
-+
-+		if (!mmu)
-+			return ERR_PTR(-ENODEV);
-+	}
-+
-+	dev_info(dev, "%s: MMU %s\n", __func__, dev_name(mmu->dev));
-+	dev_iommu_priv_set(dev, mmu);
-+	return &mmu->iommu;
-+}
-+
-+static void bcm2712_iommu_release_device(struct device *dev)
-+{
-+	dev_iommu_priv_set(dev, NULL);
-+}
-+
-+static struct iommu_group *bcm2712_iommu_device_group(struct device *dev)
-+{
-+	struct bcm2712_iommu *mmu = dev_iommu_priv_get(dev);
-+
-+	if (!mmu || !mmu->group)
-+		return ERR_PTR(-EINVAL);
-+
-+	dev_info(dev, "%s: MMU %s\n", __func__, dev_name(mmu->dev));
-+	return iommu_group_ref_get(mmu->group);
-+}
-+
-+static int bcm2712_iommu_of_xlate(struct device *dev,
-+				  struct of_phandle_args *args)
-+{
-+	struct platform_device *iommu_dev;
-+	struct bcm2712_iommu *mmu;
-+
-+	iommu_dev = of_find_device_by_node(args->np);
-+	mmu = platform_get_drvdata(iommu_dev);
-+	dev_iommu_priv_set(dev, mmu);
-+	dev_info(dev, "%s: MMU %s\n", __func__, dev_name(mmu->dev));
-+
-+	return 0;
-+}
-+
-+static bool bcm2712_iommu_capable(struct device *dev, enum iommu_cap cap)
-+{
-+	return false;
-+}
-+
-+static const struct iommu_ops bcm2712_iommu_ops = {
-+	.capable        = bcm2712_iommu_capable,
-+	.domain_alloc	= bcm2712_iommu_domain_alloc,
-+	.probe_device	= bcm2712_iommu_probe_device,
-+	.release_device	= bcm2712_iommu_release_device,
-+	.device_group	= bcm2712_iommu_device_group,
-+	/* Advertise native page sizes as well as 2M, 16K which Linux may prefer */
-+	.pgsize_bitmap	= (SZ_4M | SZ_2M | SZ_1M | SZ_64K | SZ_16K | SZ_4K),
-+	.default_domain_ops = &bcm2712_iommu_domain_ops,
-+	.of_xlate = bcm2712_iommu_of_xlate,
-+};
-+
-+static int bcm2712_iommu_probe(struct platform_device *pdev)
-+{
-+	struct bcm2712_iommu *mmu;
-+	struct bcm2712_iommu_cache *cache = NULL;
-+	int ret;
-+
-+	/* First of all, check for an IOMMU shared cache */
-+	if (pdev->dev.of_node) {
-+		struct device_node *cache_np;
-+		struct platform_device *cache_pdev;
-+
-+		cache_np = of_parse_phandle(pdev->dev.of_node, "cache", 0);
-+		if (cache_np) {
-+			cache_pdev = of_find_device_by_node(cache_np);
-+			of_node_put(cache_np);
-+			if (cache_pdev && !IS_ERR(cache_pdev))
-+				cache = platform_get_drvdata(cache_pdev);
-+			if (!cache)
-+				return -EPROBE_DEFER;
-+		}
-+	}
-+
-+	/* Allocate private data */
-+	mmu = devm_kzalloc(&pdev->dev, sizeof(*mmu), GFP_KERNEL);
-+	if (!mmu)
-+		return -ENOMEM;
-+
-+	mmu->name = dev_name(&pdev->dev);
-+	mmu->dev = &pdev->dev;
-+	mmu->cache = cache;
-+	platform_set_drvdata(pdev, mmu);
-+	spin_lock_init(&mmu->hw_lock);
-+
-+	/*
-+	 * XXX When an IOMMU is downstream of a PCIe RC or some other chip/bus
-+	 * and serves some of the masters thereon (others using pass-through),
-+	 * we seem to fumble and lose the "dma-ranges" address offset for
-+	 * masters using IOMMU. This property restores it, where needed.
-+	 */
-+	if (!pdev->dev.of_node ||
-+	    of_property_read_u64(pdev->dev.of_node, "dma-iova-offset",
-+				 &mmu->dma_iova_offset))
-+		mmu->dma_iova_offset = 0;
-+
-+	/*
-+	 * The IOMMU is itself a device that allocates DMA-able memory
-+	 * to hold its translation tables. Provided the IOVA aperture
-+	 * is no larger than 4 GBytes (so that the L1 table fits within
-+	 * a single 4K page), we don't need the tables to be contiguous.
-+	 * Assume we can address at least 36 bits (64 GB).
-+	 */
-+	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(36));
-+	WARN_ON(ret);
-+	mmu->sgt = dma_alloc_noncontiguous(&pdev->dev, TABLES_ALLOC_SIZE,
-+					   DMA_TO_DEVICE, GFP_KERNEL,
-+					   DMA_ATTR_ALLOC_SINGLE_PAGES);
-+	if (!mmu->sgt) {
-+		ret = -ENOMEM;
-+		goto done_err;
-+	}
-+	mmu->tables = dma_vmap_noncontiguous(&pdev->dev, TABLES_ALLOC_SIZE,
-+					     mmu->sgt);
-+	if (!mmu->tables) {
-+		ret = -ENOMEM;
-+		goto done_err;
-+	}
-+
-+	/* Get IOMMU registers */
-+	mmu->reg_base = devm_platform_ioremap_resource(pdev, 0);
-+	if (IS_ERR(mmu->reg_base)) {
-+		dev_err(&pdev->dev, "Failed to get IOMMU registers address\n");
-+		ret = PTR_ERR(mmu->reg_base);
-+		goto done_err;
-+	}
-+
-+	/* Stuff */
-+	mmu->group = iommu_group_alloc();
-+	if (IS_ERR(mmu->group)) {
-+		ret = PTR_ERR(mmu->group);
-+		mmu->group = NULL;
-+		goto done_err;
-+	}
-+	ret = iommu_device_sysfs_add(&mmu->iommu, mmu->dev, NULL, mmu->name);
-+	if (ret)
-+		goto done_err;
-+
-+	/* Initialize table and hardware */
-+	bcm2712_iommu_init(mmu);
-+	ret = iommu_device_register(&mmu->iommu, &bcm2712_iommu_ops, &pdev->dev);
-+
-+	dev_info(&pdev->dev, "%s: Success\n", __func__);
-+	return 0;
-+
-+done_err:
-+	dev_info(&pdev->dev, "%s: Failure %d\n", __func__, ret);
-+	if (mmu->group)
-+		iommu_group_put(mmu->group);
-+	if (mmu->tables)
-+		dma_vunmap_noncontiguous(&pdev->dev,
-+					 (void *)(mmu->tables));
-+	mmu->tables = NULL;
-+	if (mmu->sgt)
-+		dma_free_noncontiguous(&pdev->dev, TABLES_ALLOC_SIZE,
-+				       mmu->sgt, DMA_TO_DEVICE);
-+	mmu->sgt = NULL;
-+	kfree(mmu);
-+	return ret;
-+}
-+
-+static int bcm2712_iommu_remove(struct platform_device *pdev)
-+{
-+	struct bcm2712_iommu *mmu = platform_get_drvdata(pdev);
-+
-+	if (mmu->reg_base)
-+		MMU_WR(MMMU_CTRL_OFFSET, 0); /* disable the MMU */
-+	if (mmu->sgt)
-+		dma_free_noncontiguous(&pdev->dev, TABLES_ALLOC_SIZE,
-+				       mmu->sgt, DMA_TO_DEVICE);
-+
-+	return 0;
-+}
-+
-+static const struct of_device_id bcm2712_iommu_of_match[] = {
-+	{
-+		. compatible = "brcm,bcm2712-iommu"
-+	},
-+	{ /* sentinel */ },
-+};
-+
-+static struct platform_driver bcm2712_iommu_driver = {
-+	.probe = bcm2712_iommu_probe,
-+	.remove = bcm2712_iommu_remove,
-+	.driver = {
-+		.name = "bcm2712-iommu",
-+		.of_match_table = bcm2712_iommu_of_match
-+	},
-+};
-+
-+builtin_platform_driver(bcm2712_iommu_driver);
---- /dev/null
-+++ b/drivers/iommu/bcm2712-iommu.h
-@@ -0,0 +1,45 @@
-+/* SPDX-License-Identifier: GPL-2.0-only */
-+/*
-+ * IOMMU driver for BCM2712
-+ *
-+ * Copyright (c) 2023 Raspberry Pi Ltd.
-+ */
-+
-+#ifndef _BCM2712_IOMMU_H
-+#define _BCM2712_IOMMU_H
-+
-+#include <linux/iommu.h>
-+#include <linux/scatterlist.h>
-+
-+struct bcm2712_iommu_cache {
-+	struct device *dev;
-+	spinlock_t hw_lock; /* to protect HW registers */
-+	void __iomem *reg_base;
-+};
-+
-+void bcm2712_iommu_cache_flush(struct bcm2712_iommu_cache *cache);
-+
-+struct bcm2712_iommu {
-+	struct device *dev;
-+	struct iommu_device iommu;
-+	struct iommu_group *group;
-+	struct bcm2712_iommu_domain *domain;
-+	char const *name;
-+	struct sg_table *sgt; /* allocated memory for page tables */
-+	u32 *tables;          /* kernel mapping for page tables */
-+	struct bcm2712_iommu_cache *cache;
-+	spinlock_t hw_lock;   /* to protect HW registers */
-+	void __iomem *reg_base;
-+	u64 dma_iova_offset; /* Hack for IOMMU attached to PCIe RC */
-+	u32 bigpage_mask;
-+	u32 superpage_mask;
-+	unsigned int nmapped_pages;
-+	bool dirty; /* true when tables are oriented towards CPU */
-+};
-+
-+struct bcm2712_iommu_domain {
-+	struct iommu_domain base;
-+	struct bcm2712_iommu *mmu;
-+};
-+
-+#endif
diff --git a/target/linux/bcm27xx/patches-6.1/950-0918-irqchip-irq-brcmstb-l2-Add-config-for-2711-controlle.patch b/target/linux/bcm27xx/patches-6.1/950-0918-irqchip-irq-brcmstb-l2-Add-config-for-2711-controlle.patch
deleted file mode 100644
index 039c5fd74f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0918-irqchip-irq-brcmstb-l2-Add-config-for-2711-controlle.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From fa4d4ed28c92cf4470e518f1a7362dc7941632d7 Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Wed, 28 Jun 2023 16:24:29 +0100
-Subject: [PATCH] irqchip/irq-brcmstb-l2: Add config for 2711 controller
-
-We currently see these regularly:
-[   25.157560] irq 31, desc: 00000000c15e6d2c, depth: 0, count: 0, unhandled: 0
-[   25.164658] ->handle_irq():  00000000b1775675, brcmstb_l2_intc_irq_handle+0x0/0x1a8
-[   25.172352] ->irq_data.chip(): 00000000fea59f1c, gic_chip_mode1+0x0/0x108
-[   25.179166] ->action(): 000000003eda6d6f
-[   25.183096] ->action->handler(): 000000002c09e646, bad_chained_irq+0x0/0x58
-[   25.190084]      IRQ_LEVEL set
-[   25.193142]    IRQ_NOPROBE set
-[   25.196198]  IRQ_NOREQUEST set
-[   25.199255]   IRQ_NOTHREAD set
-
-with:
-$ cat /proc/interrupts  | grep 31:
- 31:          1          0          0          0     GICv2 129 Level     (null)
-
-The interrupt is described in DT with IRQ_TYPE_LEVEL_HIGH
-
-But the current compatible string uses the controller in edge triggered mode
-(as that config matches our register layout).
-
-Add a new compatible structure for level driven interrupt with our register layout.
-
-We had already been using this compatible string in device tree, so no change needed
-there.
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/irqchip/irq-brcmstb-l2.c | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
---- a/drivers/irqchip/irq-brcmstb-l2.c
-+++ b/drivers/irqchip/irq-brcmstb-l2.c
-@@ -52,6 +52,16 @@ static const struct brcmstb_intc_init_pa
- 	.cpu_mask_clear		= 0x0C
- };
- 
-+/* Register offsets in the 2711 L2 level interrupt controller */
-+static const struct brcmstb_intc_init_params l2_2711_lvl_intc_init = {
-+	.handler		= handle_level_irq,
-+	.cpu_status		= 0x00,
-+	.cpu_clear		= 0x08,
-+	.cpu_mask_status	= 0x0c,
-+	.cpu_mask_set		= 0x10,
-+	.cpu_mask_clear		= 0x14
-+};
-+
- /* L2 intc private data structure */
- struct brcmstb_l2_intc_data {
- 	struct irq_domain *domain;
-@@ -289,11 +299,18 @@ static int __init brcmstb_l2_lvl_intc_of
- 	return brcmstb_l2_intc_of_init(np, parent, &l2_lvl_intc_init);
- }
- 
-+static int __init brcmstb_l2_2711_lvl_intc_of_init(struct device_node *np,
-+	struct device_node *parent)
-+{
-+	return brcmstb_l2_intc_of_init(np, parent, &l2_2711_lvl_intc_init);
-+}
-+
- IRQCHIP_PLATFORM_DRIVER_BEGIN(brcmstb_l2)
- IRQCHIP_MATCH("brcm,l2-intc", brcmstb_l2_edge_intc_of_init)
- IRQCHIP_MATCH("brcm,hif-spi-l2-intc", brcmstb_l2_edge_intc_of_init)
- IRQCHIP_MATCH("brcm,upg-aux-aon-l2-intc", brcmstb_l2_edge_intc_of_init)
- IRQCHIP_MATCH("brcm,bcm7271-l2-intc", brcmstb_l2_lvl_intc_of_init)
-+IRQCHIP_MATCH("brcm,bcm2711-l2-intc", brcmstb_l2_2711_lvl_intc_of_init)
- IRQCHIP_PLATFORM_DRIVER_END(brcmstb_l2)
- MODULE_DESCRIPTION("Broadcom STB generic L2 interrupt controller");
- MODULE_LICENSE("GPL v2");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0919-rtc-rtc-rpi-Add-simple-RTC-driver-for-Raspberry-Pi.patch b/target/linux/bcm27xx/patches-6.1/950-0919-rtc-rtc-rpi-Add-simple-RTC-driver-for-Raspberry-Pi.patch
deleted file mode 100644
index e2b8c6c6a1..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0919-rtc-rtc-rpi-Add-simple-RTC-driver-for-Raspberry-Pi.patch
+++ /dev/null
@@ -1,237 +0,0 @@
-From 222dedcdc09247126d39364a614ff2019789f52a Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Fri, 7 Jul 2023 20:00:45 +0100
-Subject: [PATCH] rtc: rtc-rpi: Add simple RTC driver for Raspberry Pi
-
-This supports setting and reading the real time clock
-and supports wakeup alarms.
-
-To support wake up alarms you want this bootloader config:
- POWER_OFF_ON_HALT=1
- WAKE_ON_GPIO=0
-
-You can test with:
-  echo +600 | sudo tee /sys/class/rtc/rtc0/wakealarm
-  sudo halt
-
-That will halt (in an almost no power state),
-then wake and restart after 10 minutes.
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/rtc/Kconfig   |  11 +++
- drivers/rtc/Makefile  |   1 +
- drivers/rtc/rtc-rpi.c | 177 ++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 189 insertions(+)
- create mode 100644 drivers/rtc/rtc-rpi.c
-
---- a/drivers/rtc/Kconfig
-+++ b/drivers/rtc/Kconfig
-@@ -223,6 +223,17 @@ config RTC_DRV_AC100
- 	  This driver can also be built as a module. If so, the module
- 	  will be called rtc-ac100.
- 
-+config RTC_DRV_RPI
-+	tristate "Raspberry Pi RTC"
-+	depends on ARCH_BRCMSTB || COMPILE_TEST
-+	default ARCH_BRCMSTB
-+	help
-+	  If you say yes here you get support for the RTC found on
-+	  Raspberry Pi devices.
-+
-+	  This driver can also be built as a module. If so, the module
-+	  will be called rtc-rpi.
-+
- config RTC_DRV_BRCMSTB
- 	tristate "Broadcom STB wake-timer"
- 	depends on ARCH_BRCMSTB || BMIPS_GENERIC || COMPILE_TEST
---- a/drivers/rtc/Makefile
-+++ b/drivers/rtc/Makefile
-@@ -140,6 +140,7 @@ obj-$(CONFIG_RTC_DRV_RC5T583)	+= rtc-rc5
- obj-$(CONFIG_RTC_DRV_RC5T619)	+= rtc-rc5t619.o
- obj-$(CONFIG_RTC_DRV_RK808)	+= rtc-rk808.o
- obj-$(CONFIG_RTC_DRV_RP5C01)	+= rtc-rp5c01.o
-+obj-$(CONFIG_RTC_DRV_RPI)	+= rtc-rpi.o
- obj-$(CONFIG_RTC_DRV_RS5C313)	+= rtc-rs5c313.o
- obj-$(CONFIG_RTC_DRV_RS5C348)	+= rtc-rs5c348.o
- obj-$(CONFIG_RTC_DRV_RS5C372)	+= rtc-rs5c372.o
---- /dev/null
-+++ b/drivers/rtc/rtc-rpi.c
-@@ -0,0 +1,177 @@
-+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
-+/**
-+ * rtc-rpi.c
-+ *
-+ * RTC driver using firmware mailbox
-+ * Supports battery backed RTC and wake alarms
-+ *
-+ * Based on rtc-meson-vrtc by Neil Armstrong
-+ *
-+ * Copyright (c) 2023, Raspberry Pi Ltd.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/rtc.h>
-+#include <linux/of.h>
-+#include <soc/bcm2835/raspberrypi-firmware.h>
-+
-+struct rpi_rtc_data {
-+	struct rtc_device *rtc;
-+	struct rpi_firmware *fw;
-+};
-+
-+#define RPI_FIRMWARE_GET_RTC_REG 0x00030087
-+#define RPI_FIRMWARE_SET_RTC_REG 0x00038087
-+enum {RTC_TIME, RTC_ALARM, RTC_ALARM_PENDING, RTC_ALARM_ENABLE};
-+
-+static int rpi_rtc_read_time(struct device *dev, struct rtc_time *tm)
-+{
-+	struct rpi_rtc_data *vrtc = dev_get_drvdata(dev);
-+	u32 data[2] = {RTC_TIME};
-+	int err;
-+
-+	err = rpi_firmware_property(vrtc->fw, RPI_FIRMWARE_GET_RTC_REG,
-+				    &data, sizeof(data));
-+	rtc_time64_to_tm(data[1], tm);
-+	return err;
-+}
-+
-+static int rpi_rtc_set_time(struct device *dev, struct rtc_time *tm)
-+{
-+	struct rpi_rtc_data *vrtc = dev_get_drvdata(dev);
-+	u32 data[2] = {RTC_TIME, rtc_tm_to_time64(tm)};
-+
-+	return rpi_firmware_property(vrtc->fw, RPI_FIRMWARE_SET_RTC_REG,
-+				     &data, sizeof(data));
-+}
-+
-+static int rpi_rtc_alarm_irq_is_enabled(struct device *dev, unsigned char *enabled)
-+{
-+	struct rpi_rtc_data *vrtc = dev_get_drvdata(dev);
-+	u32 data[2] = {RTC_ALARM_ENABLE};
-+	s32 err = 0;
-+
-+	err = rpi_firmware_property(vrtc->fw, RPI_FIRMWARE_GET_RTC_REG,
-+				    &data, sizeof(data));
-+	*enabled = data[1] & 0x1;
-+	return err;
-+}
-+
-+static int rpi_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
-+{
-+	struct rpi_rtc_data *vrtc = dev_get_drvdata(dev);
-+	u32 data[2] = {RTC_ALARM_ENABLE, enabled};
-+
-+	return rpi_firmware_property(vrtc->fw, RPI_FIRMWARE_SET_RTC_REG,
-+				     &data, sizeof(data));
-+}
-+
-+static int rpi_rtc_alarm_clear_pending(struct device *dev)
-+{
-+	struct rpi_rtc_data *vrtc = dev_get_drvdata(dev);
-+	u32 data[2] = {RTC_ALARM_PENDING, 1};
-+
-+	return rpi_firmware_property(vrtc->fw, RPI_FIRMWARE_SET_RTC_REG,
-+				     &data, sizeof(data));
-+}
-+
-+static int rpi_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
-+{
-+	struct rpi_rtc_data *vrtc = dev_get_drvdata(dev);
-+	u32 data[2] = {RTC_ALARM};
-+	s32 err = 0;
-+
-+	err = rpi_rtc_alarm_irq_is_enabled(dev, &alarm->enabled);
-+	if (!err)
-+		err = rpi_firmware_property(vrtc->fw, RPI_FIRMWARE_GET_RTC_REG,
-+					    &data, sizeof(data));
-+	rtc_time64_to_tm(data[1], &alarm->time);
-+
-+	return err;
-+}
-+
-+static int rpi_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
-+{
-+	struct rpi_rtc_data *vrtc = dev_get_drvdata(dev);
-+	u32 data[2] = {RTC_ALARM, rtc_tm_to_time64(&alarm->time)};
-+	int err;
-+
-+	err = rpi_firmware_property(vrtc->fw, RPI_FIRMWARE_SET_RTC_REG,
-+				    &data, sizeof(data));
-+
-+	if (err == 0)
-+		err = rpi_rtc_alarm_irq_enable(dev, alarm->enabled);
-+
-+	return err;
-+}
-+
-+static const struct rtc_class_ops rpi_rtc_ops = {
-+	.read_time = rpi_rtc_read_time,
-+	.set_time = rpi_rtc_set_time,
-+	.read_alarm = rpi_rtc_read_alarm,
-+	.set_alarm = rpi_rtc_set_alarm,
-+	.alarm_irq_enable = rpi_rtc_alarm_irq_enable,
-+};
-+
-+static int rpi_rtc_probe(struct platform_device *pdev)
-+{
-+	struct rpi_rtc_data *vrtc;
-+	struct device *dev = &pdev->dev;
-+	struct device_node *np = dev->of_node;
-+	struct device_node *fw_node;
-+	struct rpi_firmware *fw;
-+	int ret;
-+
-+	fw_node = of_parse_phandle(np, "firmware", 0);
-+	if (!fw_node) {
-+		dev_err(dev, "Missing firmware node\n");
-+		return -ENOENT;
-+	}
-+
-+	fw = rpi_firmware_get(fw_node);
-+	if (!fw)
-+		return -EPROBE_DEFER;
-+
-+	vrtc = devm_kzalloc(&pdev->dev, sizeof(*vrtc), GFP_KERNEL);
-+	if (!vrtc)
-+		return -ENOMEM;
-+
-+	vrtc->fw = fw;
-+
-+	device_init_wakeup(&pdev->dev, 1);
-+
-+	platform_set_drvdata(pdev, vrtc);
-+
-+	vrtc->rtc = devm_rtc_allocate_device(&pdev->dev);
-+	if (IS_ERR(vrtc->rtc))
-+		return PTR_ERR(vrtc->rtc);
-+
-+	set_bit(RTC_FEATURE_ALARM_WAKEUP_ONLY, vrtc->rtc->features);
-+	clear_bit(RTC_FEATURE_UPDATE_INTERRUPT, vrtc->rtc->features);
-+
-+	vrtc->rtc->ops = &rpi_rtc_ops;
-+	ret = devm_rtc_register_device(vrtc->rtc);
-+
-+	rpi_rtc_alarm_clear_pending(dev);
-+	return ret;
-+}
-+
-+static const struct of_device_id rpi_rtc_dt_match[] = {
-+	{ .compatible = "raspberrypi,rpi-rtc"},
-+	{},
-+};
-+MODULE_DEVICE_TABLE(of, rpi_rtc_dt_match);
-+
-+static struct platform_driver rpi_rtc_driver = {
-+	.probe = rpi_rtc_probe,
-+	.driver = {
-+		.name = "rpi-rtc",
-+		.of_match_table = rpi_rtc_dt_match,
-+	},
-+};
-+
-+module_platform_driver(rpi_rtc_driver);
-+
-+MODULE_DESCRIPTION("Raspberry Pi RTC driver");
-+MODULE_LICENSE("GPL");
diff --git a/target/linux/bcm27xx/patches-6.1/950-0920-dt-bindings-rtc-new-binding-for-Raspberry-Pi-RTC-dri.patch b/target/linux/bcm27xx/patches-6.1/950-0920-dt-bindings-rtc-new-binding-for-Raspberry-Pi-RTC-dri.patch
deleted file mode 100644
index f4c630cf09..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0920-dt-bindings-rtc-new-binding-for-Raspberry-Pi-RTC-dri.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From ff2c2f67689e10ad66c1e33ae6a7552d82ac983c Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Fri, 7 Jul 2023 20:16:06 +0100
-Subject: [PATCH] dt-bindings: rtc: new binding for Raspberry Pi RTC driver
-
-Add binding for the new RTC driver for Raspberry Pi.
-This platform has an RTC managed by firmware, and this RTC
-driver provides the simple mailbox interface to access it.
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- .../devicetree/bindings/rtc/rtc-rpi.txt         | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/rtc/rtc-rpi.txt
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/rtc/rtc-rpi.txt
-@@ -0,0 +1,17 @@
-+* Raspberry Pi RTC
-+
-+This is a Linux interface to an RTC managed by firmware, hence it's
-+virtual from a Linux perspective.
-+
-+The interface uses the firmware mailbox api to access the RTC registers.
-+
-+Required properties:
-+compatible: should be "raspberrypi,rpi-rtc"
-+firmware:   Reference to the RPi firmware device node.
-+
-+Example:
-+
-+	rpi_rtc: rpi_rtc {
-+		compatible = "raspberrypi,rpi-rtc";
-+		firmware = <&firmware>;
-+	};
diff --git a/target/linux/bcm27xx/patches-6.1/950-0921-hwmon-pwm-fan-Add-fan-speed-register-support.patch b/target/linux/bcm27xx/patches-6.1/950-0921-hwmon-pwm-fan-Add-fan-speed-register-support.patch
deleted file mode 100644
index 205806cdfd..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0921-hwmon-pwm-fan-Add-fan-speed-register-support.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From 96a8a4776cb142f5d2bb7f6379df9af40e727c0b Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 11 Jul 2023 10:17:29 +0100
-Subject: [PATCH] hwmon: (pwm-fan) Add fan speed register support
-
-Some platforms include a fan-speed register that reports RPM directly
-as an alternative to counting interrupts from the fan tachometer input.
-Add support for reading a register at a given offset (rpm-offset) within
-a block declared in another node (rpm-regmap). This indirection allows
-the usual address mapping to be performed, and for address sharing with
-another driver.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/hwmon/pwm-fan.c | 59 ++++++++++++++++++++++++++++++++++++-----
- 1 file changed, 52 insertions(+), 7 deletions(-)
-
---- a/drivers/hwmon/pwm-fan.c
-+++ b/drivers/hwmon/pwm-fan.c
-@@ -12,6 +12,7 @@
- #include <linux/module.h>
- #include <linux/mutex.h>
- #include <linux/of.h>
-+#include <linux/of_address.h>
- #include <linux/platform_device.h>
- #include <linux/pwm.h>
- #include <linux/regulator/consumer.h>
-@@ -51,6 +52,9 @@ struct pwm_fan_ctx {
- 	ktime_t sample_start;
- 	struct timer_list rpm_timer;
- 
-+	void __iomem *rpm_regbase;
-+	unsigned int rpm_offset;
-+
- 	unsigned int pwm_value;
- 	unsigned int pwm_fan_state;
- 	unsigned int pwm_fan_max_state;
-@@ -61,6 +65,10 @@ struct pwm_fan_ctx {
- 	struct hwmon_channel_info fan_channel;
- };
- 
-+static const u32 rpm_reg_channel_config[] = {
-+	HWMON_F_INPUT, 0
-+};
-+
- /* This handler assumes self resetting edge triggered interrupt. */
- static irqreturn_t pulse_handler(int irq, void *dev_id)
- {
-@@ -335,7 +343,10 @@ static int pwm_fan_read(struct device *d
- 		}
- 		return -EOPNOTSUPP;
- 	case hwmon_fan:
--		*val = ctx->tachs[channel].rpm;
-+		if (ctx->rpm_regbase)
-+			*val = (long)readl(ctx->rpm_regbase + ctx->rpm_offset);
-+		else
-+			*val = ctx->tachs[channel].rpm;
- 		return 0;
- 
- 	default:
-@@ -470,6 +481,7 @@ static void pwm_fan_cleanup(void *__ctx)
- 	/* Switch off everything */
- 	ctx->enable_mode = pwm_disable_reg_disable;
- 	pwm_fan_power_off(ctx);
-+	iounmap(ctx->rpm_regbase);
- }
- 
- static int pwm_fan_probe(struct platform_device *pdev)
-@@ -534,10 +546,23 @@ static int pwm_fan_probe(struct platform
- 		return ret;
- 
- 	ctx->tach_count = platform_irq_count(pdev);
-+	if (ctx->tach_count == 0) {
-+		struct device_node *rpm_node;
-+
-+		rpm_node = of_parse_phandle(dev->of_node, "rpm-regmap", 0);
-+		if (rpm_node)
-+			ctx->rpm_regbase = of_iomap(rpm_node, 0);
-+	}
-+
- 	if (ctx->tach_count < 0)
- 		return dev_err_probe(dev, ctx->tach_count,
- 				     "Could not get number of fan tachometer inputs\n");
--	dev_dbg(dev, "%d fan tachometer inputs\n", ctx->tach_count);
-+	if (IS_ERR(ctx->rpm_regbase))
-+		return dev_err_probe(dev, PTR_ERR(ctx->rpm_regbase),
-+				     "Could not get rpm reg\n");
-+
-+	dev_dbg(dev, "%d fan tachometer inputs, %d rpm regmap\n", ctx->tach_count,
-+		!!ctx->rpm_regbase);
- 
- 	if (ctx->tach_count) {
- 		channel_count++;	/* We also have a FAN channel. */
-@@ -554,12 +579,24 @@ static int pwm_fan_probe(struct platform
- 		if (!fan_channel_config)
- 			return -ENOMEM;
- 		ctx->fan_channel.config = fan_channel_config;
-+	} else if (ctx->rpm_regbase) {
-+		channel_count++;	/* We also have a FAN channel. */
-+		ctx->fan_channel.type = hwmon_fan;
-+		ctx->fan_channel.config = rpm_reg_channel_config;
-+
-+		if (of_property_read_u32(pdev->dev.of_node, "rpm-offset", &ctx->rpm_offset)) {
-+			dev_err(&pdev->dev, "unable to read 'rpm-offset'");
-+			ret = -EINVAL;
-+			goto error;
-+		}
- 	}
- 
- 	channels = devm_kcalloc(dev, channel_count + 1,
- 				sizeof(struct hwmon_channel_info *), GFP_KERNEL);
--	if (!channels)
--		return -ENOMEM;
-+	if (!channels) {
-+		ret = -ENOMEM;
-+		goto error;
-+	}
- 
- 	channels[0] = HWMON_CHANNEL_INFO(pwm, HWMON_PWM_INPUT | HWMON_PWM_ENABLE);
- 
-@@ -602,6 +639,8 @@ static int pwm_fan_probe(struct platform
- 		mod_timer(&ctx->rpm_timer, jiffies + HZ);
- 
- 		channels[1] = &ctx->fan_channel;
-+	} else if (ctx->rpm_regbase) {
-+		channels[1] = &ctx->fan_channel;
- 	}
- 
- 	ctx->info.ops = &pwm_fan_hwmon_ops;
-@@ -611,12 +650,13 @@ static int pwm_fan_probe(struct platform
- 						     ctx, &ctx->info, NULL);
- 	if (IS_ERR(hwmon)) {
- 		dev_err(dev, "Failed to register hwmon device\n");
--		return PTR_ERR(hwmon);
-+		ret = PTR_ERR(hwmon);
-+		goto error;
- 	}
- 
- 	ret = pwm_fan_of_get_cooling_data(dev, ctx);
- 	if (ret)
--		return ret;
-+		goto error;
- 
- 	ctx->pwm_fan_state = ctx->pwm_fan_max_state;
- 	if (IS_ENABLED(CONFIG_THERMAL)) {
-@@ -627,12 +667,17 @@ static int pwm_fan_probe(struct platform
- 			dev_err(dev,
- 				"Failed to register pwm-fan as cooling device: %d\n",
- 				ret);
--			return ret;
-+			goto error;
- 		}
- 		ctx->cdev = cdev;
- 	}
- 
- 	return 0;
-+
-+error:
-+	if (ctx->rpm_regbase)
-+		iounmap(ctx->rpm_regbase);
-+	return ret;
- }
- 
- static void pwm_fan_shutdown(struct platform_device *pdev)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0923-dt-bindings-input-Add-bindings-for-raspberrypi-butto.patch b/target/linux/bcm27xx/patches-6.1/950-0923-dt-bindings-input-Add-bindings-for-raspberrypi-butto.patch
deleted file mode 100644
index 2972c57fd7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0923-dt-bindings-input-Add-bindings-for-raspberrypi-butto.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 07419175fdb507be2c9d3aaf4b7d18306a336348 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 2 Aug 2023 11:38:03 +0100
-Subject: [PATCH] dt-bindings: input: Add bindings for raspberrypi-button
-
-Add bindings for the firmware-based button driver.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- .../input/raspberrypi,firmware-button.yaml    | 47 +++++++++++++++++++
- 1 file changed, 47 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/input/raspberrypi,firmware-button.yaml
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/input/raspberrypi,firmware-button.yaml
-@@ -0,0 +1,47 @@
-+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
-+%YAML 1.2
-+---
-+$id: http://devicetree.org/schemas/input/raspberrypi,firmware-button.yaml#
-+$schema: http://devicetree.org/meta-schemas/core.yaml#
-+
-+title: Raspberry Pi firmware buttons
-+
-+maintainers:
-+  - Phil Elwell <phil@raspberrypi.com>
-+
-+description: >
-+  The Raspberry Pi 5 firmware exposes the state of the power button. The
-+  raspberrypi-button driver generates a keycode when it is pressed.
-+
-+properties:
-+  compatible:
-+    enum:
-+      - raspberrypi,firmware-button
-+
-+  id:
-+    description: A numeric identifier of the button
-+
-+  label:
-+    description: Descriptive name of the button.
-+
-+  linux,code:
-+    description: Key code to emit.
-+
-+required:
-+  - compatible
-+  - linux,code
-+
-+additionalProperties: false
-+
-+examples:
-+  - |
-+    #include <dt-bindings/input/raspberrypi-button.h>
-+
-+    pwr_button: pwr_button {
-+        compatible = "raspberrypi,firmware-button";
-+        id = <RASPBERRYPI_BUTTON_POWER>;
-+        label = "pwr_button";
-+        linux,code = <116>; // KEY_POWER
-+    };
-+
-+...
diff --git a/target/linux/bcm27xx/patches-6.1/950-0924-dt-bindings-input-Add-bindings-for-raspberrypi-butto.patch b/target/linux/bcm27xx/patches-6.1/950-0924-dt-bindings-input-Add-bindings-for-raspberrypi-butto.patch
deleted file mode 100644
index e8fea23ce8..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0924-dt-bindings-input-Add-bindings-for-raspberrypi-butto.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 93c8947bc7813b49fe27a5251eef97c6df1e14c6 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 2 Aug 2023 15:01:29 +0100
-Subject: [PATCH] dt-bindings: input: Add bindings for raspberrypi-button
-
-Add bindings for the firmware-based button driver.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- include/dt-bindings/input/raspberrypi-button.h | 11 +++++++++++
- 1 file changed, 11 insertions(+)
- create mode 100644 include/dt-bindings/input/raspberrypi-button.h
-
---- /dev/null
-+++ b/include/dt-bindings/input/raspberrypi-button.h
-@@ -0,0 +1,11 @@
-+/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 */
-+/*
-+ * This header provides constants the raspberrypi-button driver.
-+ */
-+
-+#ifndef _DT_BINDINGS_RASPBERRYPI_BUTTON_H
-+#define _DT_BINDINGS_RASPBERRYPI_BUTTON_H
-+
-+#define RASPBERRYPI_BUTTON_POWER 0
-+
-+#endif
diff --git a/target/linux/bcm27xx/patches-6.1/950-0925-Input-Add-raspberrypi-button-firmware-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0925-Input-Add-raspberrypi-button-firmware-driver.patch
deleted file mode 100644
index 76a9261a68..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0925-Input-Add-raspberrypi-button-firmware-driver.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-From 7c0d40384b0648030d5202114d90239b8db7d4e0 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 2 Aug 2023 11:30:48 +0100
-Subject: [PATCH] Input: Add raspberrypi-button firmware driver
-
-Raspberry Pi 5s have a power/suspend button that is only accessible to
-the firmware. Add a driver to read it and generate key events.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/input/misc/Kconfig                 |  10 ++
- drivers/input/misc/Makefile                |   1 +
- drivers/input/misc/raspberrypi-button.c    | 138 +++++++++++++++++++++
- include/soc/bcm2835/raspberrypi-firmware.h |   1 +
- 4 files changed, 150 insertions(+)
- create mode 100644 drivers/input/misc/raspberrypi-button.c
-
---- a/drivers/input/misc/Kconfig
-+++ b/drivers/input/misc/Kconfig
-@@ -918,6 +918,16 @@ config INPUT_RT5120_PWRKEY
- 	  To compile this driver as a module, choose M here. the module will
- 	  be called rt5120-pwrkey.
- 
-+config INPUT_RASPBERRYPI_BUTTON
-+	tristate "Raspberry Pi button support"
-+	depends on RASPBERRYPI_FIRMWARE || (COMPILE_TEST && !RASPBERRYPI_FIRMWARE)
-+	help
-+	  This enables support for firmware-controlled buttons on Raspberry
-+	  Pi devices.
-+
-+	  To compile this driver as a module, choose M here. the module will
-+	  be called raspberrypi-button.
-+
- config INPUT_STPMIC1_ONKEY
- 	tristate "STPMIC1 PMIC Onkey support"
- 	depends on MFD_STPMIC1
---- a/drivers/input/misc/Makefile
-+++ b/drivers/input/misc/Makefile
-@@ -70,6 +70,7 @@ obj-$(CONFIG_INPUT_RAVE_SP_PWRBUTTON)	+=
- obj-$(CONFIG_INPUT_RB532_BUTTON)	+= rb532_button.o
- obj-$(CONFIG_INPUT_REGULATOR_HAPTIC)	+= regulator-haptic.o
- obj-$(CONFIG_INPUT_RETU_PWRBUTTON)	+= retu-pwrbutton.o
-+obj-$(CONFIG_INPUT_RASPBERRYPI_BUTTON)	+= raspberrypi-button.o
- obj-$(CONFIG_INPUT_RT5120_PWRKEY)	+= rt5120-pwrkey.o
- obj-$(CONFIG_INPUT_AXP20X_PEK)		+= axp20x-pek.o
- obj-$(CONFIG_INPUT_GPIO_ROTARY_ENCODER)	+= rotary_encoder.o
---- /dev/null
-+++ b/drivers/input/misc/raspberrypi-button.c
-@@ -0,0 +1,138 @@
-+// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0
-+/*
-+ * Driver for Raspberry Pi power button
-+ *
-+ * Copyright (C) 2023 Raspberry Pi Ltd.
-+ *
-+ * This driver is based on drivers/hwmon/raspberrypi-hwmon.c and
-+ * input/misc/pm8941-pwrkey.c/ - see original files for copyright information
-+ */
-+
-+#include <linux/delay.h>
-+#include <linux/devm-helpers.h>
-+#include <dt-bindings/input/raspberrypi-button.h>
-+#include <linux/errno.h>
-+#include <linux/input.h>
-+#include <linux/kernel.h>
-+#include <linux/ktime.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/of_address.h>
-+#include <linux/of_device.h>
-+#include <linux/platform_device.h>
-+#include <linux/workqueue.h>
-+#include <soc/bcm2835/raspberrypi-firmware.h>
-+
-+struct rpi_button {
-+	struct device *dev;
-+	struct rpi_firmware *fw;
-+	struct input_dev *input;
-+	struct delayed_work poll_work;
-+	unsigned long poll_rate;
-+	const char *name;
-+	u32 id;
-+	u32 code;
-+};
-+
-+static void button_poll(struct work_struct *work)
-+{
-+	struct rpi_button *button;
-+	u32 value;
-+	int err;
-+
-+	button = container_of(work, struct rpi_button,
-+			      poll_work.work);
-+
-+	value = BIT(button->id);
-+	err = rpi_firmware_property(button->fw, RPI_FIRMWARE_GET_BUTTONS_PRESSED,
-+				    &value, sizeof(value));
-+	if (err) {
-+		dev_err_once(button->dev, "GET_BUTTON_PRESSED not implemented?\n");
-+		return;
-+	}
-+
-+	if (value & BIT(button->id)) {
-+		input_event(button->input, EV_KEY, button->code, 1);
-+		input_sync(button->input);
-+		input_event(button->input, EV_KEY, button->code, 0);
-+		input_sync(button->input);
-+	}
-+
-+	schedule_delayed_work(&button->poll_work, button->poll_rate);
-+}
-+
-+static int rpi_button_probe(struct platform_device *pdev)
-+{
-+	struct device *dev = &pdev->dev;
-+	struct rpi_button *button;
-+	int err;
-+
-+	button = devm_kzalloc(dev, sizeof(*button), GFP_KERNEL);
-+	if (!button)
-+		return -ENOMEM;
-+
-+	button->dev = dev;
-+
-+	/* Get the firmware pointer from our parent */
-+	button->fw = dev_get_drvdata(dev->parent);
-+
-+	if (device_property_read_u32(dev, "id", &button->id))
-+		button->id = RASPBERRYPI_BUTTON_POWER;
-+
-+	if (device_property_read_string(dev, "label", &button->name))
-+		button->name = "raspberrypi-button";
-+
-+	if (device_property_read_u32(dev, "linux,code", &button->code)) {
-+		dev_err(&pdev->dev, "no linux,code property\n");
-+		return -EINVAL;
-+	}
-+
-+	button->input = devm_input_allocate_device(dev);
-+	if (!button->input) {
-+		dev_dbg(&pdev->dev, "unable to allocate input device\n");
-+		return -ENOMEM;
-+	}
-+
-+	input_set_capability(button->input, EV_KEY, button->code);
-+
-+	button->input->name = button->name;
-+	button->input->phys = "raspberrypi-button/input0";
-+	button->input->dev.parent = dev;
-+	button->poll_rate = HZ;
-+
-+	err = input_register_device(button->input);
-+	if (err) {
-+		dev_err(&pdev->dev, "failed to register input device: %d\n",
-+			err);
-+		return err;
-+	}
-+
-+	err = devm_delayed_work_autocancel(dev, &button->poll_work,
-+					   button_poll);
-+	if (err)
-+		return err;
-+
-+	platform_set_drvdata(pdev, button);
-+	schedule_delayed_work(&button->poll_work, button->poll_rate);
-+
-+	return 0;
-+}
-+
-+static const struct of_device_id rpi_button_match[] = {
-+	{ .compatible = "raspberrypi,firmware-button", },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(of, rpi_button_match);
-+
-+static struct platform_driver rpi_button_driver = {
-+	.probe = rpi_button_probe,
-+	.driver = {
-+		.name = "raspberrypi-button",
-+		.of_match_table = of_match_ptr(rpi_button_match),
-+	},
-+};
-+module_platform_driver(rpi_button_driver);
-+
-+MODULE_AUTHOR("Phil Elwell <phil@raspberrypi.com>");
-+MODULE_DESCRIPTION("Raspberry Pi button driver");
-+MODULE_LICENSE("Dual BSD/GPL");
---- a/include/soc/bcm2835/raspberrypi-firmware.h
-+++ b/include/soc/bcm2835/raspberrypi-firmware.h
-@@ -98,6 +98,7 @@ enum rpi_firmware_property_tag {
- 	RPI_FIRMWARE_GET_REBOOT_FLAGS =                       0x00030064,
- 	RPI_FIRMWARE_SET_REBOOT_FLAGS =                       0x00038064,
- 	RPI_FIRMWARE_NOTIFY_DISPLAY_DONE =                    0x00030066,
-+	RPI_FIRMWARE_GET_BUTTONS_PRESSED =                    0x00030088,
- 
- 	/* Dispmanx TAGS */
- 	RPI_FIRMWARE_FRAMEBUFFER_ALLOCATE =                   0x00040001,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0926-dt-bindings-update-rpi-rtc-binding.patch b/target/linux/bcm27xx/patches-6.1/950-0926-dt-bindings-update-rpi-rtc-binding.patch
deleted file mode 100644
index ffc5cc1a9d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0926-dt-bindings-update-rpi-rtc-binding.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a7a3679a148e40879f1ce77580d9edf64cb5b51c Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.com>
-Date: Mon, 18 Sep 2023 16:33:06 +0100
-Subject: [PATCH] dt: bindings: update rpi-rtc binding
-
-Add property for bcm2712 firmware RTC driver charger control
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- Documentation/devicetree/bindings/rtc/rtc-rpi.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/Documentation/devicetree/bindings/rtc/rtc-rpi.txt
-+++ b/Documentation/devicetree/bindings/rtc/rtc-rpi.txt
-@@ -9,9 +9,14 @@ Required properties:
- compatible: should be "raspberrypi,rpi-rtc"
- firmware:   Reference to the RPi firmware device node.
- 
-+Optional property:
-+trickle-charge-microvolt: specify a trickle charge voltage for the backup
-+                          battery in microvolts.
-+
- Example:
- 
- 	rpi_rtc: rpi_rtc {
- 		compatible = "raspberrypi,rpi-rtc";
- 		firmware = <&firmware>;
-+		trickle-charge-microvolt = <3000000>;
- 	};
diff --git a/target/linux/bcm27xx/patches-6.1/950-0927-drivers-rtc-rpi-add-battery-charge-circuit-control-a.patch b/target/linux/bcm27xx/patches-6.1/950-0927-drivers-rtc-rpi-add-battery-charge-circuit-control-a.patch
deleted file mode 100644
index dae0a1cbff..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0927-drivers-rtc-rpi-add-battery-charge-circuit-control-a.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-From 33b514cb16dbf13395a0becf7442d19676ae4224 Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.com>
-Date: Fri, 15 Sep 2023 17:33:03 +0100
-Subject: [PATCH] drivers: rtc-rpi: add battery charge circuit control and
- readback
-
-Parse devicetree for a charger voltage and apply it. If nonzero and a
-valid voltage, the firmware will enable charging, otherwise the charger
-circuit is disabled.
-
-Add sysfs attributes to read back the supported charge voltage range,
-the measured battery voltage, and the charger setpoint.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- drivers/rtc/rtc-rpi.c | 106 ++++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 103 insertions(+), 3 deletions(-)
-
---- a/drivers/rtc/rtc-rpi.c
-+++ b/drivers/rtc/rtc-rpi.c
-@@ -19,11 +19,22 @@
- struct rpi_rtc_data {
- 	struct rtc_device *rtc;
- 	struct rpi_firmware *fw;
-+	u32 bbat_vchg_microvolts;
- };
- 
- #define RPI_FIRMWARE_GET_RTC_REG 0x00030087
- #define RPI_FIRMWARE_SET_RTC_REG 0x00038087
--enum {RTC_TIME, RTC_ALARM, RTC_ALARM_PENDING, RTC_ALARM_ENABLE};
-+
-+enum {
-+	RTC_TIME,
-+	RTC_ALARM,
-+	RTC_ALARM_PENDING,
-+	RTC_ALARM_ENABLE,
-+	RTC_BBAT_CHG_VOLTS,
-+	RTC_BBAT_CHG_VOLTS_MIN,
-+	RTC_BBAT_CHG_VOLTS_MAX,
-+	RTC_BBAT_VOLTS
-+};
- 
- static int rpi_rtc_read_time(struct device *dev, struct rtc_time *tm)
- {
-@@ -114,6 +125,83 @@ static const struct rtc_class_ops rpi_rt
- 	.alarm_irq_enable = rpi_rtc_alarm_irq_enable,
- };
- 
-+static int rpi_rtc_set_charge_voltage(struct device *dev)
-+{
-+	struct rpi_rtc_data *vrtc = dev_get_drvdata(dev);
-+	u32 data[2] = {RTC_BBAT_CHG_VOLTS, vrtc->bbat_vchg_microvolts};
-+	int err;
-+
-+	err = rpi_firmware_property(vrtc->fw, RPI_FIRMWARE_SET_RTC_REG,
-+				    &data, sizeof(data));
-+
-+	if (err)
-+		dev_err(dev, "failed to set trickle charge voltage to %uuV: %d\n",
-+			vrtc->bbat_vchg_microvolts, err);
-+	else if (vrtc->bbat_vchg_microvolts)
-+		dev_info(dev, "trickle charging enabled at %uuV\n",
-+			 vrtc->bbat_vchg_microvolts);
-+
-+	return err;
-+}
-+
-+static ssize_t rpi_rtc_print_uint_reg(struct device *dev, char *buf, u32 reg)
-+{
-+	struct rpi_rtc_data *vrtc = dev_get_drvdata(dev->parent);
-+	u32 data[2] = {reg, 0};
-+	int ret = 0;
-+
-+	ret = rpi_firmware_property(vrtc->fw, RPI_FIRMWARE_GET_RTC_REG,
-+				    &data, sizeof(data));
-+	if (ret < 0)
-+		return ret;
-+
-+	return sprintf(buf, "%u\n", data[1]);
-+}
-+
-+static ssize_t charging_voltage_show(struct device *dev,
-+				     struct device_attribute *attr,
-+				     char *buf)
-+{
-+	return rpi_rtc_print_uint_reg(dev, buf, RTC_BBAT_CHG_VOLTS);
-+}
-+static DEVICE_ATTR_RO(charging_voltage);
-+
-+static ssize_t charging_voltage_min_show(struct device *dev,
-+					 struct device_attribute *attr,
-+					 char *buf)
-+{
-+	return rpi_rtc_print_uint_reg(dev, buf, RTC_BBAT_CHG_VOLTS_MIN);
-+}
-+static DEVICE_ATTR_RO(charging_voltage_min);
-+
-+static ssize_t charging_voltage_max_show(struct device *dev,
-+					 struct device_attribute *attr,
-+					 char *buf)
-+{
-+	return rpi_rtc_print_uint_reg(dev, buf, RTC_BBAT_CHG_VOLTS_MAX);
-+}
-+static DEVICE_ATTR_RO(charging_voltage_max);
-+
-+static ssize_t battery_voltage_show(struct device *dev,
-+				    struct device_attribute *attr,
-+				    char *buf)
-+{
-+	return rpi_rtc_print_uint_reg(dev, buf, RTC_BBAT_VOLTS);
-+}
-+static DEVICE_ATTR_RO(battery_voltage);
-+
-+static struct attribute *rpi_rtc_attrs[] = {
-+	&dev_attr_charging_voltage.attr,
-+	&dev_attr_charging_voltage_min.attr,
-+	&dev_attr_charging_voltage_max.attr,
-+	&dev_attr_battery_voltage.attr,
-+	NULL
-+};
-+
-+static const struct attribute_group rpi_rtc_sysfs_files = {
-+	.attrs = rpi_rtc_attrs,
-+};
-+
- static int rpi_rtc_probe(struct platform_device *pdev)
- {
- 	struct rpi_rtc_data *vrtc;
-@@ -151,10 +239,22 @@ static int rpi_rtc_probe(struct platform
- 	clear_bit(RTC_FEATURE_UPDATE_INTERRUPT, vrtc->rtc->features);
- 
- 	vrtc->rtc->ops = &rpi_rtc_ops;
--	ret = devm_rtc_register_device(vrtc->rtc);
-+	ret = rtc_add_group(vrtc->rtc, &rpi_rtc_sysfs_files);
-+	if (ret)
-+		return ret;
- 
- 	rpi_rtc_alarm_clear_pending(dev);
--	return ret;
-+
-+	/*
-+	 * Optionally enable trickle charging - if the property isn't
-+	 * present (or set to zero), trickle charging is disabled.
-+	 */
-+	of_property_read_u32(np, "trickle-charge-microvolt",
-+			     &vrtc->bbat_vchg_microvolts);
-+
-+	rpi_rtc_set_charge_voltage(dev);
-+
-+	return devm_rtc_register_device(vrtc->rtc);
- }
- 
- static const struct of_device_id rpi_rtc_dt_match[] = {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0928-vc4_drv-Avoid-panic-when-booted-with-no-kms.patch b/target/linux/bcm27xx/patches-6.1/950-0928-vc4_drv-Avoid-panic-when-booted-with-no-kms.patch
deleted file mode 100644
index 8aae09c81a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0928-vc4_drv-Avoid-panic-when-booted-with-no-kms.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0f5fd4538774aa6c936bb8fc78611c3113bf19d7 Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Mon, 17 Apr 2023 15:21:41 +0100
-Subject: [PATCH] vc4_drv: Avoid panic when booted with no kms
-
-If kms/fkms overlay is not present we have no matching drivers
-and so match is NULL.
-
-It is not safe to call component_master_add_with_match with a null match argument.
-
-So don't do that
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/gpu/drm/vc4/vc4_drv.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/gpu/drm/vc4/vc4_drv.c
-+++ b/drivers/gpu/drm/vc4/vc4_drv.c
-@@ -456,6 +456,9 @@ static int vc4_platform_drm_probe(struct
- 	vc4_match_add_drivers(dev, &match,
- 			      component_drivers, ARRAY_SIZE(component_drivers));
- 
-+	if (!match)
-+		return -ENODEV;
-+
- 	return component_master_add_with_match(dev, &vc4_drm_ops, match);
- }
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0929-drm-vc4-Treat-zero-sized-destination-as-full-screen.patch b/target/linux/bcm27xx/patches-6.1/950-0929-drm-vc4-Treat-zero-sized-destination-as-full-screen.patch
deleted file mode 100644
index 70a11df293..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0929-drm-vc4-Treat-zero-sized-destination-as-full-screen.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 2c987545a88507acdd8a572a3bd23a4ca0124d14 Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Thu, 13 Apr 2023 17:41:11 +0100
-Subject: [PATCH] drm/vc4: Treat zero sized destination as full screen
-
-Kodi video planes come through with all zeros for fullscreen
-Without this check, we WARN when writing width-1, height-1
-to destination dlist
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/gpu/drm/vc4/vc4_plane.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/drivers/gpu/drm/vc4/vc4_plane.c
-+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -484,6 +484,11 @@ static int vc4_plane_setup_clipping_and_
- 	vc4_state->crtc_w = state->dst.x2 - state->dst.x1;
- 	vc4_state->crtc_h = state->dst.y2 - state->dst.y1;
- 
-+	if (!vc4_state->crtc_w)
-+		vc4_state->crtc_w = state->crtc->mode.hdisplay;
-+	if (!vc4_state->crtc_h)
-+		vc4_state->crtc_h = state->crtc->mode.vdisplay;
-+
- 	ret = vc4_plane_margins_adj(state);
- 	if (ret)
- 		return ret;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0930-drm-vc4-Fix-FKMS-for-when-the-YUV-chroma-planes-are-.patch b/target/linux/bcm27xx/patches-6.1/950-0930-drm-vc4-Fix-FKMS-for-when-the-YUV-chroma-planes-are-.patch
deleted file mode 100644
index 9182194403..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0930-drm-vc4-Fix-FKMS-for-when-the-YUV-chroma-planes-are-.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From bb1ee75de382c7a5218750476aa2a5792309cc70 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 30 Mar 2023 17:18:36 +0100
-Subject: [PATCH] drm/vc4: Fix FKMS for when the YUV chroma planes are
- different buffers
-
-The code was assuming that it was a single buffer with offsets,
-when kmstest uses separate buffers and 0 offsets for each plane.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_firmware_kms.c | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-+++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-@@ -528,7 +528,7 @@ static int vc4_plane_to_mb(struct drm_pl
- 			   struct drm_plane_state *state)
- {
- 	struct drm_framebuffer *fb = state->fb;
--	struct drm_gem_dma_object *bo = drm_fb_dma_get_gem_obj(fb, 0);
-+	struct drm_gem_dma_object *bo;
- 	const struct drm_format_info *drm_fmt = fb->format;
- 	const struct vc_image_format *vc_fmt =
- 					vc4_get_vc_image_fmt(drm_fmt->format);
-@@ -552,6 +552,7 @@ static int vc4_plane_to_mb(struct drm_pl
- 					state->normalized_zpos : -127;
- 	mb->plane.num_planes = num_planes;
- 	mb->plane.is_vu = vc_fmt->is_vu;
-+	bo = drm_fb_dma_get_gem_obj(fb, 0);
- 	mb->plane.planes[0] = bo->dma_addr + fb->offsets[0];
- 
- 	rotation = drm_rotation_simplify(state->rotation,
-@@ -572,11 +573,14 @@ static int vc4_plane_to_mb(struct drm_pl
- 		/* Makes assumptions on the stride for the chroma planes as we
- 		 * can't easily plumb in non-standard pitches.
- 		 */
-+		bo = drm_fb_dma_get_gem_obj(fb, 1);
- 		mb->plane.planes[1] = bo->dma_addr + fb->offsets[1];
--		if (num_planes > 2)
-+		if (num_planes > 2) {
-+			bo = drm_fb_dma_get_gem_obj(fb, 2);
- 			mb->plane.planes[2] = bo->dma_addr + fb->offsets[2];
--		else
-+		} else {
- 			mb->plane.planes[2] = 0;
-+		}
- 
- 		/* Special case the YUV420 with U and V as line interleaved
- 		 * planes as we have special handling for that case.
diff --git a/target/linux/bcm27xx/patches-6.1/950-0931-drm-vc4-hdmi-Enable-the-audio-clock.patch b/target/linux/bcm27xx/patches-6.1/950-0931-drm-vc4-hdmi-Enable-the-audio-clock.patch
deleted file mode 100644
index f228dca9d5..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0931-drm-vc4-hdmi-Enable-the-audio-clock.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0da58dfbd2cc2cfa14a629787b9ba6fa10b5f666 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Wed, 29 Mar 2023 15:26:52 +0100
-Subject: [PATCH] drm/vc4: hdmi: Enable the audio clock
-
-The audio clock is used by the HDMI controller driver and we were using
-it to get its audio rate and compute the dividers needed to reach a
-given audio sample rate.
-
-However, we were never enabling it, which was resulting in lockups on
-the BCM2712.
-
-Fixes: 632ee3aa8786 ("drm/vc4: hdmi: Add audio-related callbacks")
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_hdmi.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/drivers/gpu/drm/vc4/vc4_hdmi.c
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -3625,6 +3625,7 @@ static int vc4_hdmi_runtime_suspend(stru
- {
- 	struct vc4_hdmi *vc4_hdmi = dev_get_drvdata(dev);
- 
-+	clk_disable_unprepare(vc4_hdmi->audio_clock);
- 	clk_disable_unprepare(vc4_hdmi->hsm_rpm_clock);
- 
- 	return 0;
-@@ -3666,6 +3667,10 @@ static int vc4_hdmi_runtime_resume(struc
- 		goto err_disable_clk;
- 	}
- 
-+	ret = clk_prepare_enable(vc4_hdmi->audio_clock);
-+	if (ret)
-+		goto err_disable_clk;
-+
- 	if (vc4_hdmi->variant->reset)
- 		vc4_hdmi->variant->reset(vc4_hdmi);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0932-drm-vc4-hdmi-Warn-if-writing-to-an-unknown-HDMI-regi.patch b/target/linux/bcm27xx/patches-6.1/950-0932-drm-vc4-hdmi-Warn-if-writing-to-an-unknown-HDMI-regi.patch
deleted file mode 100644
index fa6a399dae..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0932-drm-vc4-hdmi-Warn-if-writing-to-an-unknown-HDMI-regi.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From cdbebb3a92aca7327c88c6dc6ef5d4cd470d49fc Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Thu, 23 Feb 2023 19:44:32 +0100
-Subject: [PATCH] drm/vc4: hdmi: Warn if writing to an unknown HDMI register
-
-The VC4 HDMI driver has a bunch of accessors to read from a register.
-The read accessor was warning when accessing an unknown register, but
-the write one was just returning silently.
-
-Let's make sure we warn also when writing to an unknown register.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
-@@ -498,8 +498,11 @@ static inline void vc4_hdmi_write(struct
- 
- 	field = &variant->registers[reg];
- 	base = __vc4_hdmi_get_field_base(hdmi, field->reg);
--	if (!base)
-+	if (!base) {
-+		dev_warn(&hdmi->pdev->dev,
-+			 "Unknown register ID %u\n", reg);
- 		return;
-+	}
- 
- 	writel(value, base + field->offset);
- }
diff --git a/target/linux/bcm27xx/patches-6.1/950-0933-drm-vc4-hvs-More-logging-for-dlist-generation.patch b/target/linux/bcm27xx/patches-6.1/950-0933-drm-vc4-hvs-More-logging-for-dlist-generation.patch
deleted file mode 100644
index dee2fc0d66..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0933-drm-vc4-hvs-More-logging-for-dlist-generation.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 4ebd8283403daf5507e5aafb42fe3e4c7612eb14 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Wed, 22 Mar 2023 09:51:51 +0100
-Subject: [PATCH] drm/vc4: hvs: More logging for dlist generation
-
-DLIST generation can get pretty tricky and there's not a lot of debug in
-the driver to help. Let's add a few more to track the generated DLIST
-size.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_hvs.c | 15 +++++++++++++--
- 1 file changed, 13 insertions(+), 2 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -826,11 +826,22 @@ int vc4_hvs_atomic_check(struct drm_crtc
- 	if (hweight32(crtc_state->connector_mask) > 1)
- 		return -EINVAL;
- 
--	drm_atomic_crtc_state_for_each_plane_state(plane, plane_state, crtc_state)
--		dlist_count += vc4_plane_dlist_size(plane_state);
-+	drm_atomic_crtc_state_for_each_plane_state(plane, plane_state, crtc_state) {
-+		u32 plane_dlist_count = vc4_plane_dlist_size(plane_state);
-+
-+		drm_dbg_driver(dev, "[CRTC:%d:%s] Found [PLANE:%d:%s] with DLIST size: %u\n",
-+			       crtc->base.id, crtc->name,
-+			       plane->base.id, plane->name,
-+			       plane_dlist_count);
-+
-+		dlist_count += plane_dlist_count;
-+	}
- 
- 	dlist_count++; /* Account for SCALER_CTL0_END. */
- 
-+	drm_dbg_driver(dev, "[CRTC:%d:%s] Allocating DLIST block with size: %u\n",
-+		       crtc->base.id, crtc->name, dlist_count);
-+
- 	alloc = vc4_hvs_alloc_dlist_entry(vc4->hvs, vc4_state->assigned_channel, dlist_count);
- 	if (IS_ERR(alloc))
- 		return PTR_ERR(alloc);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0934-drm-vc4-hvs-Print-error-if-we-fail-an-allocation.patch b/target/linux/bcm27xx/patches-6.1/950-0934-drm-vc4-hvs-Print-error-if-we-fail-an-allocation.patch
deleted file mode 100644
index 7c7bbb4822..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0934-drm-vc4-hvs-Print-error-if-we-fail-an-allocation.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From c0af63193bd307f281211e7fb32a02a52c2869b2 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Wed, 22 Mar 2023 09:53:17 +0100
-Subject: [PATCH] drm/vc4: hvs: Print error if we fail an allocation
-
-We need to allocate a few additional structures when checking our
-atomic_state, especially related to hardware SRAM that will hold the
-plane descriptors (DLIST) and the current line context (LBM) during
-composition.
-
-Since those allocation can fail, let's add some error message in that
-case to help debug what goes wrong.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_hvs.c   | 6 +++++-
- drivers/gpu/drm/vc4/vc4_plane.c | 7 +++++--
- 2 files changed, 10 insertions(+), 3 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -441,6 +441,8 @@ vc4_hvs_alloc_dlist_entry(struct vc4_hvs
- 			  unsigned int channel,
- 			  size_t dlist_count)
- {
-+	struct vc4_dev *vc4 = hvs->vc4;
-+	struct drm_device *dev = &vc4->base;
- 	struct vc4_hvs_dlist_allocation *alloc;
- 	unsigned long flags;
- 	int ret;
-@@ -458,8 +460,10 @@ vc4_hvs_alloc_dlist_entry(struct vc4_hvs
- 	ret = drm_mm_insert_node(&hvs->dlist_mm, &alloc->mm_node,
- 				 dlist_count);
- 	spin_unlock_irqrestore(&hvs->mm_lock, flags);
--	if (ret)
-+	if (ret) {
-+		drm_err(dev, "Failed to allocate DLIST entry: %d\n", ret);
- 		return ERR_PTR(ret);
-+	}
- 
- 	alloc->channel = channel;
- 
---- a/drivers/gpu/drm/vc4/vc4_plane.c
-+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -733,7 +733,8 @@ static void vc4_plane_calc_load(struct d
- 
- static int vc4_plane_allocate_lbm(struct drm_plane_state *state)
- {
--	struct vc4_dev *vc4 = to_vc4_dev(state->plane->dev);
-+	struct drm_device *drm = state->plane->dev;
-+	struct vc4_dev *vc4 = to_vc4_dev(drm);
- 	struct vc4_plane_state *vc4_state = to_vc4_plane_state(state);
- 	unsigned long irqflags;
- 	u32 lbm_size;
-@@ -759,8 +760,10 @@ static int vc4_plane_allocate_lbm(struct
- 						 0, 0);
- 		spin_unlock_irqrestore(&vc4->hvs->mm_lock, irqflags);
- 
--		if (ret)
-+		if (ret) {
-+			drm_err(drm, "Failed to allocate LBM entry: %d\n", ret);
- 			return ret;
-+		}
- 	} else {
- 		WARN_ON_ONCE(lbm_size != vc4_state->lbm.size);
- 	}
diff --git a/target/linux/bcm27xx/patches-6.1/950-0935-drm-vc4-plane-Add-more-debugging-for-LBM-allocation.patch b/target/linux/bcm27xx/patches-6.1/950-0935-drm-vc4-plane-Add-more-debugging-for-LBM-allocation.patch
deleted file mode 100644
index d8d68e79aa..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0935-drm-vc4-plane-Add-more-debugging-for-LBM-allocation.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 164f7e94da446984f275be1c082b93243beadfba Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Wed, 22 Mar 2023 16:17:57 +0100
-Subject: [PATCH] drm/vc4: plane: Add more debugging for LBM allocation
-
-LBM allocations need a different size depending on the line length,
-format, etc.
-
-This can get tricky, and fail. Let's add some more prints to ease the
-debugging when it does.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_plane.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/gpu/drm/vc4/vc4_plane.c
-+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -735,6 +735,7 @@ static int vc4_plane_allocate_lbm(struct
- {
- 	struct drm_device *drm = state->plane->dev;
- 	struct vc4_dev *vc4 = to_vc4_dev(drm);
-+	struct drm_plane *plane = state->plane;
- 	struct vc4_plane_state *vc4_state = to_vc4_plane_state(state);
- 	unsigned long irqflags;
- 	u32 lbm_size;
-@@ -743,6 +744,9 @@ static int vc4_plane_allocate_lbm(struct
- 	if (!lbm_size)
- 		return 0;
- 
-+	drm_dbg_driver(drm, "[PLANE:%d:%s] LBM Allocation Size: %u\n",
-+		       plane->base.id, plane->name, lbm_size);
-+
- 	if (WARN_ON(!vc4_state->lbm_offset))
- 		return -EINVAL;
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0936-drm-vc4-plane-Use-return-variable-in-atomic_check.patch b/target/linux/bcm27xx/patches-6.1/950-0936-drm-vc4-plane-Use-return-variable-in-atomic_check.patch
deleted file mode 100644
index 220245c351..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0936-drm-vc4-plane-Use-return-variable-in-atomic_check.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 950394a39f659746e5933cbc203a8bedef8246b7 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 17 Feb 2023 14:26:44 +0100
-Subject: [PATCH] drm/vc4: plane: Use return variable in atomic_check
-
-The vc4_plane_atomic_check() directly returns the result of the final
-function it calls.
-
-Using the already defined ret variable to check its content on error,
-and a separate return 0 on success, makes it easier to extend.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_plane.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/vc4/vc4_plane.c
-+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -1378,7 +1378,11 @@ static int vc4_plane_atomic_check(struct
- 	if (ret)
- 		return ret;
- 
--	return vc4_plane_allocate_lbm(new_plane_state);
-+	ret = vc4_plane_allocate_lbm(new_plane_state);
-+	if (ret)
-+		return ret;
-+
-+	return 0;
- }
- 
- static void vc4_plane_atomic_update(struct drm_plane *plane,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0937-drm-vc4-crtc-Move-assigned_channel-to-a-variable.patch b/target/linux/bcm27xx/patches-6.1/950-0937-drm-vc4-crtc-Move-assigned_channel-to-a-variable.patch
deleted file mode 100644
index 3476f548c4..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0937-drm-vc4-crtc-Move-assigned_channel-to-a-variable.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From f3c6acc345113c57011f2b1c8421e6cf78f0bc30 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 17 Feb 2023 13:39:13 +0100
-Subject: [PATCH] drm/vc4: crtc: Move assigned_channel to a variable
-
-We access multiple times the vc4_crtc_state->assigned_channel variable
-in the vc4_crtc_get_scanout_position() function, so let's store it in a
-local variable.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_crtc.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_crtc.c
-+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
-@@ -104,6 +104,7 @@ static bool vc4_crtc_get_scanout_positio
- 	struct vc4_hvs *hvs = vc4->hvs;
- 	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
- 	struct vc4_crtc_state *vc4_crtc_state = to_vc4_crtc_state(crtc->state);
-+	unsigned int channel = vc4_crtc_state->assigned_channel;
- 	unsigned int cob_size;
- 	u32 val;
- 	int fifo_lines;
-@@ -120,7 +121,7 @@ static bool vc4_crtc_get_scanout_positio
- 	 * Read vertical scanline which is currently composed for our
- 	 * pixelvalve by the HVS, and also the scaler status.
- 	 */
--	val = HVS_READ(SCALER_DISPSTATX(vc4_crtc_state->assigned_channel));
-+	val = HVS_READ(SCALER_DISPSTATX(channel));
- 
- 	/* Get optional system timestamp after query. */
- 	if (etime)
-@@ -136,11 +137,11 @@ static bool vc4_crtc_get_scanout_positio
- 		*vpos /= 2;
- 
- 		/* Use hpos to correct for field offset in interlaced mode. */
--		if (vc4_hvs_get_fifo_frame_count(hvs, vc4_crtc_state->assigned_channel) % 2)
-+		if (vc4_hvs_get_fifo_frame_count(hvs, channel) % 2)
- 			*hpos += mode->crtc_htotal / 2;
- 	}
- 
--	cob_size = vc4_crtc_get_cob_allocation(vc4, vc4_crtc_state->assigned_channel);
-+	cob_size = vc4_crtc_get_cob_allocation(vc4, channel);
- 	/* This is the offset we need for translating hvs -> pv scanout pos. */
- 	fifo_lines = cob_size / mode->crtc_hdisplay;
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0938-drm-vc4-Introduce-generation-number-enum.patch b/target/linux/bcm27xx/patches-6.1/950-0938-drm-vc4-Introduce-generation-number-enum.patch
deleted file mode 100644
index d904c3d78d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0938-drm-vc4-Introduce-generation-number-enum.patch
+++ /dev/null
@@ -1,1029 +0,0 @@
-From fa2571d625bb53b642cd9f29a7cfc3434e1cf576 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 17 Feb 2023 13:07:36 +0100
-Subject: [PATCH] drm/vc4: Introduce generation number enum
-
-With the introduction of the BCM2712 support, we will get yet another
-generation of display engine to support.
-
-The binary check of whether it's VC5 or not thus doesn't work anymore,
-especially since some parts of the driver will have changed with BCM2711,
-and some others with BCM2712.
-
-Let's introduce an enum to store the generation the driver is running
-on, which should provide more flexibility.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/tests/vc4_mock.c       | 12 +++---
- drivers/gpu/drm/vc4/vc4_bo.c               | 28 ++++++------
- drivers/gpu/drm/vc4/vc4_crtc.c             | 14 +++---
- drivers/gpu/drm/vc4/vc4_drv.c              | 22 ++++++----
- drivers/gpu/drm/vc4/vc4_drv.h              |  7 ++-
- drivers/gpu/drm/vc4/vc4_gem.c              | 24 +++++------
- drivers/gpu/drm/vc4/vc4_hdmi.c             |  2 +-
- drivers/gpu/drm/vc4/vc4_hvs.c              | 50 ++++++++++++----------
- drivers/gpu/drm/vc4/vc4_irq.c              | 10 ++---
- drivers/gpu/drm/vc4/vc4_kms.c              | 14 +++---
- drivers/gpu/drm/vc4/vc4_perfmon.c          | 20 ++++-----
- drivers/gpu/drm/vc4/vc4_plane.c            | 12 +++---
- drivers/gpu/drm/vc4/vc4_render_cl.c        |  2 +-
- drivers/gpu/drm/vc4/vc4_v3d.c              | 10 ++---
- drivers/gpu/drm/vc4/vc4_validate.c         |  8 ++--
- drivers/gpu/drm/vc4/vc4_validate_shaders.c |  2 +-
- 16 files changed, 126 insertions(+), 111 deletions(-)
-
---- a/drivers/gpu/drm/vc4/tests/vc4_mock.c
-+++ b/drivers/gpu/drm/vc4/tests/vc4_mock.c
-@@ -153,11 +153,11 @@ static int __build_mock(struct kunit *te
- 	return 0;
- }
- 
--static struct vc4_dev *__mock_device(struct kunit *test, bool is_vc5)
-+static struct vc4_dev *__mock_device(struct kunit *test, enum vc4_gen gen)
- {
- 	struct drm_device *drm;
--	const struct drm_driver *drv = is_vc5 ? &vc5_drm_driver : &vc4_drm_driver;
--	const struct vc4_mock_desc *desc = is_vc5 ? &vc5_mock : &vc4_mock;
-+	const struct drm_driver *drv = (gen == VC4_GEN_5) ? &vc5_drm_driver : &vc4_drm_driver;
-+	const struct vc4_mock_desc *desc = (gen == VC4_GEN_5) ? &vc5_mock : &vc4_mock;
- 	struct vc4_dev *vc4;
- 	struct device *dev;
- 	int ret;
-@@ -171,7 +171,7 @@ static struct vc4_dev *__mock_device(str
- 	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, vc4);
- 
- 	vc4->dev = dev;
--	vc4->is_vc5 = is_vc5;
-+	vc4->gen = gen;
- 
- 	vc4->hvs = __vc4_hvs_alloc(vc4, NULL);
- 	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, vc4->hvs);
-@@ -191,10 +191,10 @@ static struct vc4_dev *__mock_device(str
- 
- struct vc4_dev *vc4_mock_device(struct kunit *test)
- {
--	return __mock_device(test, false);
-+	return __mock_device(test, VC4_GEN_4);
- }
- 
- struct vc4_dev *vc5_mock_device(struct kunit *test)
- {
--	return __mock_device(test, true);
-+	return __mock_device(test, VC4_GEN_5);
- }
---- a/drivers/gpu/drm/vc4/vc4_bo.c
-+++ b/drivers/gpu/drm/vc4/vc4_bo.c
-@@ -251,7 +251,7 @@ void vc4_bo_add_to_purgeable_pool(struct
- {
- 	struct vc4_dev *vc4 = to_vc4_dev(bo->base.base.dev);
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return;
- 
- 	mutex_lock(&vc4->purgeable.lock);
-@@ -265,7 +265,7 @@ static void vc4_bo_remove_from_purgeable
- {
- 	struct vc4_dev *vc4 = to_vc4_dev(bo->base.base.dev);
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return;
- 
- 	/* list_del_init() is used here because the caller might release
-@@ -396,7 +396,7 @@ struct drm_gem_object *vc4_create_object
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 	struct vc4_bo *bo;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return ERR_PTR(-ENODEV);
- 
- 	bo = kzalloc(sizeof(*bo), GFP_KERNEL);
-@@ -427,7 +427,7 @@ struct vc4_bo *vc4_bo_create(struct drm_
- 	struct drm_gem_dma_object *dma_obj;
- 	struct vc4_bo *bo;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return ERR_PTR(-ENODEV);
- 
- 	if (size == 0)
-@@ -496,7 +496,7 @@ int vc4_bo_dumb_create(struct drm_file *
- 	struct vc4_bo *bo = NULL;
- 	int ret;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return -ENODEV;
- 
- 	ret = vc4_dumb_fixup_args(args);
-@@ -622,7 +622,7 @@ int vc4_bo_inc_usecnt(struct vc4_bo *bo)
- 	struct vc4_dev *vc4 = to_vc4_dev(bo->base.base.dev);
- 	int ret;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return -ENODEV;
- 
- 	/* Fast path: if the BO is already retained by someone, no need to
-@@ -661,7 +661,7 @@ void vc4_bo_dec_usecnt(struct vc4_bo *bo
- {
- 	struct vc4_dev *vc4 = to_vc4_dev(bo->base.base.dev);
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return;
- 
- 	/* Fast path: if the BO is still retained by someone, no need to test
-@@ -783,7 +783,7 @@ int vc4_create_bo_ioctl(struct drm_devic
- 	struct vc4_bo *bo = NULL;
- 	int ret;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return -ENODEV;
- 
- 	ret = vc4_grab_bin_bo(vc4, vc4file);
-@@ -813,7 +813,7 @@ int vc4_mmap_bo_ioctl(struct drm_device
- 	struct drm_vc4_mmap_bo *args = data;
- 	struct drm_gem_object *gem_obj;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return -ENODEV;
- 
- 	gem_obj = drm_gem_object_lookup(file_priv, args->handle);
-@@ -839,7 +839,7 @@ vc4_create_shader_bo_ioctl(struct drm_de
- 	struct vc4_bo *bo = NULL;
- 	int ret;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return -ENODEV;
- 
- 	if (args->size == 0)
-@@ -918,7 +918,7 @@ int vc4_set_tiling_ioctl(struct drm_devi
- 	struct vc4_bo *bo;
- 	bool t_format;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return -ENODEV;
- 
- 	if (args->flags != 0)
-@@ -964,7 +964,7 @@ int vc4_get_tiling_ioctl(struct drm_devi
- 	struct drm_gem_object *gem_obj;
- 	struct vc4_bo *bo;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return -ENODEV;
- 
- 	if (args->flags != 0 || args->modifier != 0)
-@@ -1011,7 +1011,7 @@ int vc4_bo_cache_init(struct drm_device
- 	int ret;
- 	int i;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return -ENODEV;
- 
- 	/* Create the initial set of BO labels that the kernel will
-@@ -1075,7 +1075,7 @@ int vc4_label_bo_ioctl(struct drm_device
- 	struct drm_gem_object *gem_obj;
- 	int ret = 0, label;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return -ENODEV;
- 
- 	if (!args->len)
---- a/drivers/gpu/drm/vc4/vc4_crtc.c
-+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
-@@ -263,7 +263,7 @@ static u32 vc4_get_fifo_full_level(struc
- 		 * Removing 1 from the FIFO full level however
- 		 * seems to completely remove that issue.
- 		 */
--		if (!vc4->is_vc5)
-+		if (vc4->gen == VC4_GEN_4)
- 			return fifo_len_bytes - 3 * HVS_FIFO_LATENCY_PIX - 1;
- 
- 		return fifo_len_bytes - 3 * HVS_FIFO_LATENCY_PIX;
-@@ -445,7 +445,7 @@ static void vc4_crtc_config_pv(struct dr
- 	if (is_dsi)
- 		CRTC_WRITE(PV_HACT_ACT, mode->hdisplay * pixel_rep);
- 
--	if (vc4->is_vc5)
-+	if (vc4->gen == VC4_GEN_5)
- 		CRTC_WRITE(PV_MUX_CFG,
- 			   VC4_SET_FIELD(PV_MUX_CFG_RGB_PIXEL_MUX_MODE_NO_SWAP,
- 					 PV_MUX_CFG_RGB_PIXEL_MUX_MODE));
-@@ -936,7 +936,7 @@ static int vc4_async_set_fence_cb(struct
- 	struct dma_fence *fence;
- 	int ret;
- 
--	if (!vc4->is_vc5) {
-+	if (vc4->gen == VC4_GEN_4) {
- 		struct vc4_bo *bo = to_vc4_bo(&dma_bo->base);
- 
- 		return vc4_queue_seqno_cb(dev, &flip_state->cb.seqno, bo->seqno,
-@@ -1023,7 +1023,7 @@ static int vc4_async_page_flip(struct dr
- 	struct vc4_bo *bo = to_vc4_bo(&dma_bo->base);
- 	int ret;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return -ENODEV;
- 
- 	/*
-@@ -1066,7 +1066,7 @@ int vc4_page_flip(struct drm_crtc *crtc,
- 		struct drm_device *dev = crtc->dev;
- 		struct vc4_dev *vc4 = to_vc4_dev(dev);
- 
--		if (vc4->is_vc5)
-+		if (vc4->gen == VC4_GEN_5)
- 			return vc5_async_page_flip(crtc, fb, event, flags);
- 		else
- 			return vc4_async_page_flip(crtc, fb, event, flags);
-@@ -1358,13 +1358,13 @@ int __vc4_crtc_init(struct drm_device *d
- 
- 	drm_crtc_helper_add(crtc, crtc_helper_funcs);
- 
--	if (!vc4->is_vc5) {
-+	if (vc4->gen == VC4_GEN_4) {
- 		drm_mode_crtc_set_gamma_size(crtc, ARRAY_SIZE(vc4_crtc->lut_r));
- 		drm_crtc_enable_color_mgmt(crtc, 0, false, crtc->gamma_size);
- 	}
- 
- 
--	if (!vc4->is_vc5) {
-+	if (vc4->gen == VC4_GEN_4) {
- 		/* We support CTM, but only for one CRTC at a time. It's therefore
- 		 * implemented as private driver state in vc4_kms, not here.
- 		 */
---- a/drivers/gpu/drm/vc4/vc4_drv.c
-+++ b/drivers/gpu/drm/vc4/vc4_drv.c
-@@ -98,7 +98,7 @@ static int vc4_get_param_ioctl(struct dr
- 	if (args->pad != 0)
- 		return -EINVAL;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return -ENODEV;
- 
- 	if (!vc4->v3d)
-@@ -147,7 +147,7 @@ static int vc4_open(struct drm_device *d
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 	struct vc4_file *vc4file;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return -ENODEV;
- 
- 	vc4file = kzalloc(sizeof(*vc4file), GFP_KERNEL);
-@@ -165,7 +165,7 @@ static void vc4_close(struct drm_device
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 	struct vc4_file *vc4file = file->driver_priv;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return;
- 
- 	if (vc4file->bin_bo_used)
-@@ -305,13 +305,17 @@ static int vc4_drm_bind(struct device *d
- 	struct vc4_dev *vc4;
- 	struct device_node *node;
- 	struct drm_crtc *crtc;
--	bool is_vc5;
-+	enum vc4_gen gen;
- 	int ret = 0;
- 
- 	dev->coherent_dma_mask = DMA_BIT_MASK(32);
- 
--	is_vc5 = of_device_is_compatible(dev->of_node, "brcm,bcm2711-vc5");
--	if (is_vc5)
-+	if (of_device_is_compatible(dev->of_node, "brcm,bcm2711-vc5"))
-+		gen = VC4_GEN_5;
-+	else
-+		gen = VC4_GEN_4;
-+
-+	if (gen == VC4_GEN_5)
- 		driver = &vc5_drm_driver;
- 	else
- 		driver = &vc4_drm_driver;
-@@ -329,14 +333,14 @@ static int vc4_drm_bind(struct device *d
- 	vc4 = devm_drm_dev_alloc(dev, driver, struct vc4_dev, base);
- 	if (IS_ERR(vc4))
- 		return PTR_ERR(vc4);
--	vc4->is_vc5 = is_vc5;
-+	vc4->gen = gen;
- 	vc4->dev = dev;
- 
- 	drm = &vc4->base;
- 	platform_set_drvdata(pdev, drm);
- 	INIT_LIST_HEAD(&vc4->debugfs_list);
- 
--	if (!is_vc5) {
-+	if (gen == VC4_GEN_4) {
- 		ret = drmm_mutex_init(drm, &vc4->bin_bo_lock);
- 		if (ret)
- 			return ret;
-@@ -350,7 +354,7 @@ static int vc4_drm_bind(struct device *d
- 	if (ret)
- 		return ret;
- 
--	if (!is_vc5) {
-+	if (gen == VC4_GEN_4) {
- 		ret = vc4_gem_init(drm);
- 		if (ret)
- 			return ret;
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -80,11 +80,16 @@ struct vc4_perfmon {
- 	u64 counters[];
- };
- 
-+enum vc4_gen {
-+	VC4_GEN_4,
-+	VC4_GEN_5,
-+};
-+
- struct vc4_dev {
- 	struct drm_device base;
- 	struct device *dev;
- 
--	bool is_vc5;
-+	enum vc4_gen gen;
- 
- 	unsigned int irq;
- 
---- a/drivers/gpu/drm/vc4/vc4_gem.c
-+++ b/drivers/gpu/drm/vc4/vc4_gem.c
-@@ -76,7 +76,7 @@ vc4_get_hang_state_ioctl(struct drm_devi
- 	u32 i;
- 	int ret = 0;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return -ENODEV;
- 
- 	if (!vc4->v3d) {
-@@ -389,7 +389,7 @@ vc4_wait_for_seqno(struct drm_device *de
- 	unsigned long timeout_expire;
- 	DEFINE_WAIT(wait);
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return -ENODEV;
- 
- 	if (vc4->finished_seqno >= seqno)
-@@ -474,7 +474,7 @@ vc4_submit_next_bin_job(struct drm_devic
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 	struct vc4_exec_info *exec;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return;
- 
- again:
-@@ -522,7 +522,7 @@ vc4_submit_next_render_job(struct drm_de
- 	if (!exec)
- 		return;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return;
- 
- 	/* A previous RCL may have written to one of our textures, and
-@@ -543,7 +543,7 @@ vc4_move_job_to_render(struct drm_device
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 	bool was_empty = list_empty(&vc4->render_job_list);
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return;
- 
- 	list_move_tail(&exec->head, &vc4->render_job_list);
-@@ -1012,7 +1012,7 @@ vc4_job_handle_completed(struct vc4_dev
- 	unsigned long irqflags;
- 	struct vc4_seqno_cb *cb, *cb_temp;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return;
- 
- 	spin_lock_irqsave(&vc4->job_lock, irqflags);
-@@ -1051,7 +1051,7 @@ int vc4_queue_seqno_cb(struct drm_device
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 	unsigned long irqflags;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return -ENODEV;
- 
- 	cb->func = func;
-@@ -1107,7 +1107,7 @@ vc4_wait_seqno_ioctl(struct drm_device *
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 	struct drm_vc4_wait_seqno *args = data;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return -ENODEV;
- 
- 	return vc4_wait_for_seqno_ioctl_helper(dev, args->seqno,
-@@ -1124,7 +1124,7 @@ vc4_wait_bo_ioctl(struct drm_device *dev
- 	struct drm_gem_object *gem_obj;
- 	struct vc4_bo *bo;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return -ENODEV;
- 
- 	if (args->pad != 0)
-@@ -1173,7 +1173,7 @@ vc4_submit_cl_ioctl(struct drm_device *d
- 				  args->shader_rec_size,
- 				  args->bo_handle_count);
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return -ENODEV;
- 
- 	if (!vc4->v3d) {
-@@ -1310,7 +1310,7 @@ int vc4_gem_init(struct drm_device *dev)
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 	int ret;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return -ENODEV;
- 
- 	vc4->dma_fence_context = dma_fence_context_alloc(1);
-@@ -1369,7 +1369,7 @@ int vc4_gem_madvise_ioctl(struct drm_dev
- 	struct vc4_bo *bo;
- 	int ret;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return -ENODEV;
- 
- 	switch (args->madv) {
---- a/drivers/gpu/drm/vc4/vc4_hdmi.c
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -2614,7 +2614,7 @@ static int vc4_hdmi_audio_prepare(struct
- 					     VC4_HDMI_AUDIO_PACKET_CEA_MASK);
- 
- 	/* Set the MAI threshold */
--	if (vc4->is_vc5)
-+	if (vc4->gen >= VC4_GEN_5)
- 		HDMI_WRITE(HDMI_MAI_THR,
- 			VC4_SET_FIELD(0x10, VC4_HD_MAI_THR_PANICHIGH) |
- 			VC4_SET_FIELD(0x10, VC4_HD_MAI_THR_PANICLOW) |
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -416,7 +416,7 @@ static void vc4_hvs_irq_enable_eof(const
- 				   unsigned int channel)
- {
- 	struct vc4_dev *vc4 = hvs->vc4;
--	u32 irq_mask = vc4->is_vc5 ?
-+	u32 irq_mask = vc4->gen == VC4_GEN_5 ?
- 		SCALER5_DISPCTRL_DSPEIEOF(channel) :
- 		SCALER_DISPCTRL_DSPEIEOF(channel);
- 
-@@ -428,7 +428,7 @@ static void vc4_hvs_irq_clear_eof(const
- 				  unsigned int channel)
- {
- 	struct vc4_dev *vc4 = hvs->vc4;
--	u32 irq_mask = vc4->is_vc5 ?
-+	u32 irq_mask = vc4->gen == VC4_GEN_5 ?
- 		SCALER5_DISPCTRL_DSPEIEOF(channel) :
- 		SCALER_DISPCTRL_DSPEIEOF(channel);
- 
-@@ -620,7 +620,7 @@ int vc4_hvs_get_fifo_from_output(struct
- 	u32 reg;
- 	int ret;
- 
--	if (!vc4->is_vc5)
-+	if (vc4->gen == VC4_GEN_4)
- 		return output;
- 
- 	/*
-@@ -701,7 +701,7 @@ static int vc4_hvs_init_channel(struct v
- 	dispctrl = SCALER_DISPCTRLX_ENABLE;
- 	dispbkgndx = HVS_READ(SCALER_DISPBKGNDX(chan));
- 
--	if (!vc4->is_vc5) {
-+	if (vc4->gen == VC4_GEN_4) {
- 		dispctrl |= VC4_SET_FIELD(mode->hdisplay,
- 					  SCALER_DISPCTRLX_WIDTH) |
- 			    VC4_SET_FIELD(mode->vdisplay,
-@@ -732,7 +732,7 @@ static int vc4_hvs_init_channel(struct v
- 	/* Reload the LUT, since the SRAMs would have been disabled if
- 	 * all CRTCs had SCALER_DISPBKGND_GAMMA unset at once.
- 	 */
--	if (!vc4->is_vc5)
-+	if (vc4->gen == VC4_GEN_4)
- 		vc4_hvs_lut_load(hvs, vc4_crtc);
- 	else
- 		vc5_hvs_lut_load(hvs, vc4_crtc);
-@@ -782,7 +782,7 @@ static int vc4_hvs_gamma_check(struct dr
- 	struct drm_device *dev = crtc->dev;
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 
--	if (!vc4->is_vc5)
-+	if (vc4->gen == VC4_GEN_4)
- 		return 0;
- 
- 	if (!crtc_state->color_mgmt_changed)
-@@ -1036,7 +1036,7 @@ void vc4_hvs_atomic_flush(struct drm_crt
- 		u32 dispbkgndx = HVS_READ(SCALER_DISPBKGNDX(channel));
- 
- 		if (crtc->state->gamma_lut) {
--			if (!vc4->is_vc5) {
-+			if (vc4->gen == VC4_GEN_4) {
- 				vc4_hvs_update_gamma_lut(hvs, vc4_crtc);
- 				dispbkgndx |= SCALER_DISPBKGND_GAMMA;
- 			} else {
-@@ -1053,7 +1053,7 @@ void vc4_hvs_atomic_flush(struct drm_crt
- 			 * should already be disabling/enabling the pipeline
- 			 * when gamma changes.
- 			 */
--			if (!vc4->is_vc5)
-+			if (vc4->gen == VC4_GEN_4)
- 				dispbkgndx &= ~SCALER_DISPBKGND_GAMMA;
- 		}
- 		HVS_WRITE(SCALER_DISPBKGNDX(channel), dispbkgndx);
-@@ -1069,7 +1069,8 @@ void vc4_hvs_atomic_flush(struct drm_crt
- 
- void vc4_hvs_mask_underrun(struct vc4_hvs *hvs, int channel)
- {
--	struct drm_device *drm = &hvs->vc4->base;
-+	struct vc4_dev *vc4 = hvs->vc4;
-+	struct drm_device *drm = &vc4->base;
- 	u32 dispctrl;
- 	int idx;
- 
-@@ -1077,8 +1078,9 @@ void vc4_hvs_mask_underrun(struct vc4_hv
- 		return;
- 
- 	dispctrl = HVS_READ(SCALER_DISPCTRL);
--	dispctrl &= ~(hvs->vc4->is_vc5 ? SCALER5_DISPCTRL_DSPEISLUR(channel) :
--					 SCALER_DISPCTRL_DSPEISLUR(channel));
-+	dispctrl &= ~((vc4->gen == VC4_GEN_5) ?
-+		      SCALER5_DISPCTRL_DSPEISLUR(channel) :
-+		      SCALER_DISPCTRL_DSPEISLUR(channel));
- 
- 	HVS_WRITE(SCALER_DISPCTRL, dispctrl);
- 
-@@ -1087,7 +1089,8 @@ void vc4_hvs_mask_underrun(struct vc4_hv
- 
- void vc4_hvs_unmask_underrun(struct vc4_hvs *hvs, int channel)
- {
--	struct drm_device *drm = &hvs->vc4->base;
-+	struct vc4_dev *vc4 = hvs->vc4;
-+	struct drm_device *drm = &vc4->base;
- 	u32 dispctrl;
- 	int idx;
- 
-@@ -1095,8 +1098,9 @@ void vc4_hvs_unmask_underrun(struct vc4_
- 		return;
- 
- 	dispctrl = HVS_READ(SCALER_DISPCTRL);
--	dispctrl |= (hvs->vc4->is_vc5 ? SCALER5_DISPCTRL_DSPEISLUR(channel) :
--					SCALER_DISPCTRL_DSPEISLUR(channel));
-+	dispctrl |= ((vc4->gen == VC4_GEN_5) ?
-+		     SCALER5_DISPCTRL_DSPEISLUR(channel) :
-+		     SCALER_DISPCTRL_DSPEISLUR(channel));
- 
- 	HVS_WRITE(SCALER_DISPSTAT,
- 		  SCALER_DISPSTAT_EUFLOW(channel));
-@@ -1139,8 +1143,10 @@ static irqreturn_t vc4_hvs_irq_handler(i
- 	control = HVS_READ(SCALER_DISPCTRL);
- 
- 	for (channel = 0; channel < SCALER_CHANNELS_COUNT; channel++) {
--		dspeislur = vc4->is_vc5 ? SCALER5_DISPCTRL_DSPEISLUR(channel) :
--					  SCALER_DISPCTRL_DSPEISLUR(channel);
-+		dspeislur = (vc4->gen == VC4_GEN_5) ?
-+			SCALER5_DISPCTRL_DSPEISLUR(channel) :
-+			SCALER_DISPCTRL_DSPEISLUR(channel);
-+
- 		/* Interrupt masking is not always honored, so check it here. */
- 		if (status & SCALER_DISPSTAT_EUFLOW(channel) &&
- 		    control & dspeislur) {
-@@ -1177,7 +1183,7 @@ int vc4_hvs_debugfs_init(struct drm_mino
- 	if (!vc4->hvs)
- 		return -ENODEV;
- 
--	if (!vc4->is_vc5) {
-+	if (vc4->gen == VC4_GEN_4) {
- 		debugfs_create_bool("hvs_load_tracker", S_IRUGO | S_IWUSR,
- 				    minor->debugfs_root,
- 				    &vc4->load_tracker_enabled);
-@@ -1235,7 +1241,7 @@ struct vc4_hvs *__vc4_hvs_alloc(struct v
- 	 * between planes when they don't overlap on the screen, but
- 	 * for now we just allocate globally.
- 	 */
--	if (!vc4->is_vc5)
-+	if (vc4->gen == VC4_GEN_4)
- 		/* 48k words of 2x12-bit pixels */
- 		drm_mm_init(&hvs->lbm_mm, 0, 48 * 1024);
- 	else
-@@ -1269,7 +1275,7 @@ static int vc4_hvs_bind(struct device *d
- 	hvs->regset.regs = hvs_regs;
- 	hvs->regset.nregs = ARRAY_SIZE(hvs_regs);
- 
--	if (vc4->is_vc5) {
-+	if (vc4->gen == VC4_GEN_5) {
- 		struct rpi_firmware *firmware;
- 		struct device_node *node;
- 		unsigned int max_rate;
-@@ -1307,7 +1313,7 @@ static int vc4_hvs_bind(struct device *d
- 		}
- 	}
- 
--	if (!vc4->is_vc5)
-+	if (vc4->gen == VC4_GEN_4)
- 		hvs->dlist = hvs->regs + SCALER_DLIST_START;
- 	else
- 		hvs->dlist = hvs->regs + SCALER5_DLIST_START;
-@@ -1348,7 +1354,7 @@ static int vc4_hvs_bind(struct device *d
- 		    SCALER_DISPCTRL_DISPEIRQ(1) |
- 		    SCALER_DISPCTRL_DISPEIRQ(2);
- 
--	if (!vc4->is_vc5)
-+	if (vc4->gen == VC4_GEN_4)
- 		dispctrl &= ~(SCALER_DISPCTRL_DMAEIRQ |
- 			      SCALER_DISPCTRL_SLVWREIRQ |
- 			      SCALER_DISPCTRL_SLVRDEIRQ |
-@@ -1403,7 +1409,7 @@ static int vc4_hvs_bind(struct device *d
- 
- 	/* Recompute Composite Output Buffer (COB) allocations for the displays
- 	 */
--	if (!vc4->is_vc5) {
-+	if (vc4->gen == VC4_GEN_4) {
- 		/* The COB is 20736 pixels, or just over 10 lines at 2048 wide.
- 		 * The bottom 2048 pixels are full 32bpp RGBA (intended for the
- 		 * TXP composing RGBA to memory), whilst the remainder are only
---- a/drivers/gpu/drm/vc4/vc4_irq.c
-+++ b/drivers/gpu/drm/vc4/vc4_irq.c
-@@ -265,7 +265,7 @@ vc4_irq_enable(struct drm_device *dev)
- {
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return;
- 
- 	if (!vc4->v3d)
-@@ -282,7 +282,7 @@ vc4_irq_disable(struct drm_device *dev)
- {
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return;
- 
- 	if (!vc4->v3d)
-@@ -305,7 +305,7 @@ int vc4_irq_install(struct drm_device *d
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 	int ret;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return -ENODEV;
- 
- 	if (irq == IRQ_NOTCONNECTED)
-@@ -326,7 +326,7 @@ void vc4_irq_uninstall(struct drm_device
- {
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return;
- 
- 	vc4_irq_disable(dev);
-@@ -339,7 +339,7 @@ void vc4_irq_reset(struct drm_device *de
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 	unsigned long irqflags;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return;
- 
- 	/* Acknowledge any stale IRQs. */
---- a/drivers/gpu/drm/vc4/vc4_kms.c
-+++ b/drivers/gpu/drm/vc4/vc4_kms.c
-@@ -378,7 +378,7 @@ static void vc4_atomic_commit_tail(struc
- 		old_hvs_state->fifo_state[channel].pending_commit = NULL;
- 	}
- 
--	if (vc4->is_vc5 && !vc4->firmware_kms) {
-+	if (vc4->gen == VC4_GEN_5 && !vc4->firmware_kms) {
- 		unsigned long state_rate = max(old_hvs_state->core_clock_rate,
- 					       new_hvs_state->core_clock_rate);
- 		unsigned long core_rate = clamp_t(unsigned long, state_rate,
-@@ -398,7 +398,7 @@ static void vc4_atomic_commit_tail(struc
- 	vc4_ctm_commit(vc4, state);
- 
- 	if (!vc4->firmware_kms) {
--		if (vc4->is_vc5)
-+		if (vc4->gen == VC4_GEN_5)
- 			vc5_hvs_pv_muxing_commit(vc4, state);
- 		else
- 			vc4_hvs_pv_muxing_commit(vc4, state);
-@@ -417,7 +417,7 @@ static void vc4_atomic_commit_tail(struc
- 
- 	drm_atomic_helper_cleanup_planes(dev, state);
- 
--	if (vc4->is_vc5 && !vc4->firmware_kms) {
-+	if (vc4->gen == VC4_GEN_5 && !vc4->firmware_kms) {
- 		unsigned long core_rate = min_t(unsigned long,
- 						hvs->max_core_rate,
- 						new_hvs_state->core_clock_rate);
-@@ -482,7 +482,7 @@ static struct drm_framebuffer *vc4_fb_cr
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 	struct drm_mode_fb_cmd2 mode_cmd_local;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return ERR_PTR(-ENODEV);
- 
- 	/* If the user didn't specify a modifier, use the
-@@ -1065,7 +1065,7 @@ int vc4_kms_load(struct drm_device *dev)
- 	 * the BCM2711, but the load tracker computations are used for
- 	 * the core clock rate calculation.
- 	 */
--	if (!vc4->is_vc5) {
-+	if (vc4->gen == VC4_GEN_4) {
- 		/* Start with the load tracker enabled. Can be
- 		 * disabled through the debugfs load_tracker file.
- 		 */
-@@ -1081,7 +1081,7 @@ int vc4_kms_load(struct drm_device *dev)
- 		return ret;
- 	}
- 
--	if (vc4->is_vc5) {
-+	if (vc4->gen == VC4_GEN_5) {
- 		dev->mode_config.max_width = 7680;
- 		dev->mode_config.max_height = 7680;
- 	} else {
-@@ -1089,7 +1089,7 @@ int vc4_kms_load(struct drm_device *dev)
- 		dev->mode_config.max_height = 2048;
- 	}
- 
--	dev->mode_config.funcs = vc4->is_vc5 ? &vc5_mode_funcs : &vc4_mode_funcs;
-+	dev->mode_config.funcs = (vc4->gen > VC4_GEN_4) ? &vc5_mode_funcs : &vc4_mode_funcs;
- 	dev->mode_config.helper_private = &vc4_mode_config_helpers;
- 	dev->mode_config.preferred_depth = 24;
- 	dev->mode_config.async_page_flip = true;
---- a/drivers/gpu/drm/vc4/vc4_perfmon.c
-+++ b/drivers/gpu/drm/vc4/vc4_perfmon.c
-@@ -23,7 +23,7 @@ void vc4_perfmon_get(struct vc4_perfmon
- 		return;
- 
- 	vc4 = perfmon->dev;
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return;
- 
- 	refcount_inc(&perfmon->refcnt);
-@@ -37,7 +37,7 @@ void vc4_perfmon_put(struct vc4_perfmon
- 		return;
- 
- 	vc4 = perfmon->dev;
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return;
- 
- 	if (refcount_dec_and_test(&perfmon->refcnt))
-@@ -49,7 +49,7 @@ void vc4_perfmon_start(struct vc4_dev *v
- 	unsigned int i;
- 	u32 mask;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return;
- 
- 	if (WARN_ON_ONCE(!perfmon || vc4->active_perfmon))
-@@ -69,7 +69,7 @@ void vc4_perfmon_stop(struct vc4_dev *vc
- {
- 	unsigned int i;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return;
- 
- 	if (WARN_ON_ONCE(!vc4->active_perfmon ||
-@@ -90,7 +90,7 @@ struct vc4_perfmon *vc4_perfmon_find(str
- 	struct vc4_dev *vc4 = vc4file->dev;
- 	struct vc4_perfmon *perfmon;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return NULL;
- 
- 	mutex_lock(&vc4file->perfmon.lock);
-@@ -105,7 +105,7 @@ void vc4_perfmon_open_file(struct vc4_fi
- {
- 	struct vc4_dev *vc4 = vc4file->dev;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return;
- 
- 	mutex_init(&vc4file->perfmon.lock);
-@@ -126,7 +126,7 @@ void vc4_perfmon_close_file(struct vc4_f
- {
- 	struct vc4_dev *vc4 = vc4file->dev;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return;
- 
- 	mutex_lock(&vc4file->perfmon.lock);
-@@ -146,7 +146,7 @@ int vc4_perfmon_create_ioctl(struct drm_
- 	unsigned int i;
- 	int ret;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return -ENODEV;
- 
- 	if (!vc4->v3d) {
-@@ -200,7 +200,7 @@ int vc4_perfmon_destroy_ioctl(struct drm
- 	struct drm_vc4_perfmon_destroy *req = data;
- 	struct vc4_perfmon *perfmon;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return -ENODEV;
- 
- 	if (!vc4->v3d) {
-@@ -228,7 +228,7 @@ int vc4_perfmon_get_values_ioctl(struct
- 	struct vc4_perfmon *perfmon;
- 	int ret;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return -ENODEV;
- 
- 	if (!vc4->v3d) {
---- a/drivers/gpu/drm/vc4/vc4_plane.c
-+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -633,10 +633,10 @@ static u32 vc4_lbm_size(struct drm_plane
- 	}
- 
- 	/* Align it to 64 or 128 (hvs5) bytes */
--	lbm = roundup(lbm, vc4->is_vc5 ? 128 : 64);
-+	lbm = roundup(lbm, vc4->gen == VC4_GEN_5 ? 128 : 64);
- 
- 	/* Each "word" of the LBM memory contains 2 or 4 (hvs5) pixels */
--	lbm /= vc4->is_vc5 ? 4 : 2;
-+	lbm /= vc4->gen == VC4_GEN_5 ? 4 : 2;
- 
- 	return lbm;
- }
-@@ -760,7 +760,7 @@ static int vc4_plane_allocate_lbm(struct
- 		ret = drm_mm_insert_node_generic(&vc4->hvs->lbm_mm,
- 						 &vc4_state->lbm,
- 						 lbm_size,
--						 vc4->is_vc5 ? 64 : 32,
-+						 vc4->gen == VC4_GEN_5 ? 64 : 32,
- 						 0, 0);
- 		spin_unlock_irqrestore(&vc4->hvs->mm_lock, irqflags);
- 
-@@ -1141,7 +1141,7 @@ static int vc4_plane_mode_set(struct drm
- 	mix_plane_alpha = state->alpha != DRM_BLEND_ALPHA_OPAQUE &&
- 			  fb->format->has_alpha;
- 
--	if (!vc4->is_vc5) {
-+	if (vc4->gen == VC4_GEN_4) {
- 	/* Control word */
- 		vc4_dlist_write(vc4_state,
- 				SCALER_CTL0_VALID |
-@@ -1714,7 +1714,7 @@ struct drm_plane *vc4_plane_init(struct
- 	};
- 
- 	for (i = 0; i < ARRAY_SIZE(hvs_formats); i++) {
--		if (!hvs_formats[i].hvs5_only || vc4->is_vc5) {
-+		if (!hvs_formats[i].hvs5_only || vc4->gen == VC4_GEN_5) {
- 			formats[num_formats] = hvs_formats[i].drm;
- 			num_formats++;
- 		}
-@@ -1729,7 +1729,7 @@ struct drm_plane *vc4_plane_init(struct
- 		return ERR_CAST(vc4_plane);
- 	plane = &vc4_plane->base;
- 
--	if (vc4->is_vc5)
-+	if (vc4->gen == VC4_GEN_5)
- 		drm_plane_helper_add(plane, &vc5_plane_helper_funcs);
- 	else
- 		drm_plane_helper_add(plane, &vc4_plane_helper_funcs);
---- a/drivers/gpu/drm/vc4/vc4_render_cl.c
-+++ b/drivers/gpu/drm/vc4/vc4_render_cl.c
-@@ -599,7 +599,7 @@ int vc4_get_rcl(struct drm_device *dev,
- 	bool has_bin = args->bin_cl_size != 0;
- 	int ret;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return -ENODEV;
- 
- 	if (args->min_x_tile > args->max_x_tile ||
---- a/drivers/gpu/drm/vc4/vc4_v3d.c
-+++ b/drivers/gpu/drm/vc4/vc4_v3d.c
-@@ -127,7 +127,7 @@ static int vc4_v3d_debugfs_ident(struct
- int
- vc4_v3d_pm_get(struct vc4_dev *vc4)
- {
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return -ENODEV;
- 
- 	mutex_lock(&vc4->power_lock);
-@@ -148,7 +148,7 @@ vc4_v3d_pm_get(struct vc4_dev *vc4)
- void
- vc4_v3d_pm_put(struct vc4_dev *vc4)
- {
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return;
- 
- 	mutex_lock(&vc4->power_lock);
-@@ -178,7 +178,7 @@ int vc4_v3d_get_bin_slot(struct vc4_dev
- 	uint64_t seqno = 0;
- 	struct vc4_exec_info *exec;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return -ENODEV;
- 
- try_again:
-@@ -325,7 +325,7 @@ int vc4_v3d_bin_bo_get(struct vc4_dev *v
- {
- 	int ret = 0;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return -ENODEV;
- 
- 	mutex_lock(&vc4->bin_bo_lock);
-@@ -360,7 +360,7 @@ static void bin_bo_release(struct kref *
- 
- void vc4_v3d_bin_bo_put(struct vc4_dev *vc4)
- {
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return;
- 
- 	mutex_lock(&vc4->bin_bo_lock);
---- a/drivers/gpu/drm/vc4/vc4_validate.c
-+++ b/drivers/gpu/drm/vc4/vc4_validate.c
-@@ -109,7 +109,7 @@ vc4_use_bo(struct vc4_exec_info *exec, u
- 	struct drm_gem_dma_object *obj;
- 	struct vc4_bo *bo;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return NULL;
- 
- 	if (hindex >= exec->bo_count) {
-@@ -169,7 +169,7 @@ vc4_check_tex_size(struct vc4_exec_info
- 	uint32_t utile_w = utile_width(cpp);
- 	uint32_t utile_h = utile_height(cpp);
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return false;
- 
- 	/* The shaded vertex format stores signed 12.4 fixed point
-@@ -495,7 +495,7 @@ vc4_validate_bin_cl(struct drm_device *d
- 	uint32_t dst_offset = 0;
- 	uint32_t src_offset = 0;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return -ENODEV;
- 
- 	while (src_offset < len) {
-@@ -942,7 +942,7 @@ vc4_validate_shader_recs(struct drm_devi
- 	uint32_t i;
- 	int ret = 0;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return -ENODEV;
- 
- 	for (i = 0; i < exec->shader_state_count; i++) {
---- a/drivers/gpu/drm/vc4/vc4_validate_shaders.c
-+++ b/drivers/gpu/drm/vc4/vc4_validate_shaders.c
-@@ -786,7 +786,7 @@ vc4_validate_shader(struct drm_gem_dma_o
- 	struct vc4_validated_shader_info *validated_shader = NULL;
- 	struct vc4_shader_validation_state validation_state;
- 
--	if (WARN_ON_ONCE(vc4->is_vc5))
-+	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
- 		return NULL;
- 
- 	memset(&validation_state, 0, sizeof(validation_state));
diff --git a/target/linux/bcm27xx/patches-6.1/950-0939-drm-vc4-Make-v3d-paths-unavailable-on-any-generation.patch b/target/linux/bcm27xx/patches-6.1/950-0939-drm-vc4-Make-v3d-paths-unavailable-on-any-generation.patch
deleted file mode 100644
index 699db05e0c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0939-drm-vc4-Make-v3d-paths-unavailable-on-any-generation.patch
+++ /dev/null
@@ -1,577 +0,0 @@
-From c382ea6b0457027b6ad883ee4348e03df515a785 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 17 Feb 2023 13:29:27 +0100
-Subject: [PATCH] drm/vc4: Make v3d paths unavailable on any generation newer
- than vc4
-
-The V3D IP has been separate since BCM2711, so let's make sure we issue
-a WARN if we're running not only on BCM2711, but also anything newer.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_bo.c               | 28 +++++++++++-----------
- drivers/gpu/drm/vc4/vc4_crtc.c             |  4 ++--
- drivers/gpu/drm/vc4/vc4_drv.c              |  8 +++----
- drivers/gpu/drm/vc4/vc4_gem.c              | 24 +++++++++----------
- drivers/gpu/drm/vc4/vc4_irq.c              | 10 ++++----
- drivers/gpu/drm/vc4/vc4_kms.c              |  2 +-
- drivers/gpu/drm/vc4/vc4_perfmon.c          | 20 ++++++++--------
- drivers/gpu/drm/vc4/vc4_render_cl.c        |  2 +-
- drivers/gpu/drm/vc4/vc4_v3d.c              | 10 ++++----
- drivers/gpu/drm/vc4/vc4_validate.c         |  8 +++----
- drivers/gpu/drm/vc4/vc4_validate_shaders.c |  2 +-
- 11 files changed, 59 insertions(+), 59 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_bo.c
-+++ b/drivers/gpu/drm/vc4/vc4_bo.c
-@@ -251,7 +251,7 @@ void vc4_bo_add_to_purgeable_pool(struct
- {
- 	struct vc4_dev *vc4 = to_vc4_dev(bo->base.base.dev);
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return;
- 
- 	mutex_lock(&vc4->purgeable.lock);
-@@ -265,7 +265,7 @@ static void vc4_bo_remove_from_purgeable
- {
- 	struct vc4_dev *vc4 = to_vc4_dev(bo->base.base.dev);
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return;
- 
- 	/* list_del_init() is used here because the caller might release
-@@ -396,7 +396,7 @@ struct drm_gem_object *vc4_create_object
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 	struct vc4_bo *bo;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return ERR_PTR(-ENODEV);
- 
- 	bo = kzalloc(sizeof(*bo), GFP_KERNEL);
-@@ -427,7 +427,7 @@ struct vc4_bo *vc4_bo_create(struct drm_
- 	struct drm_gem_dma_object *dma_obj;
- 	struct vc4_bo *bo;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return ERR_PTR(-ENODEV);
- 
- 	if (size == 0)
-@@ -496,7 +496,7 @@ int vc4_bo_dumb_create(struct drm_file *
- 	struct vc4_bo *bo = NULL;
- 	int ret;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return -ENODEV;
- 
- 	ret = vc4_dumb_fixup_args(args);
-@@ -622,7 +622,7 @@ int vc4_bo_inc_usecnt(struct vc4_bo *bo)
- 	struct vc4_dev *vc4 = to_vc4_dev(bo->base.base.dev);
- 	int ret;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return -ENODEV;
- 
- 	/* Fast path: if the BO is already retained by someone, no need to
-@@ -661,7 +661,7 @@ void vc4_bo_dec_usecnt(struct vc4_bo *bo
- {
- 	struct vc4_dev *vc4 = to_vc4_dev(bo->base.base.dev);
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return;
- 
- 	/* Fast path: if the BO is still retained by someone, no need to test
-@@ -783,7 +783,7 @@ int vc4_create_bo_ioctl(struct drm_devic
- 	struct vc4_bo *bo = NULL;
- 	int ret;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return -ENODEV;
- 
- 	ret = vc4_grab_bin_bo(vc4, vc4file);
-@@ -813,7 +813,7 @@ int vc4_mmap_bo_ioctl(struct drm_device
- 	struct drm_vc4_mmap_bo *args = data;
- 	struct drm_gem_object *gem_obj;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return -ENODEV;
- 
- 	gem_obj = drm_gem_object_lookup(file_priv, args->handle);
-@@ -839,7 +839,7 @@ vc4_create_shader_bo_ioctl(struct drm_de
- 	struct vc4_bo *bo = NULL;
- 	int ret;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return -ENODEV;
- 
- 	if (args->size == 0)
-@@ -918,7 +918,7 @@ int vc4_set_tiling_ioctl(struct drm_devi
- 	struct vc4_bo *bo;
- 	bool t_format;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return -ENODEV;
- 
- 	if (args->flags != 0)
-@@ -964,7 +964,7 @@ int vc4_get_tiling_ioctl(struct drm_devi
- 	struct drm_gem_object *gem_obj;
- 	struct vc4_bo *bo;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return -ENODEV;
- 
- 	if (args->flags != 0 || args->modifier != 0)
-@@ -1011,7 +1011,7 @@ int vc4_bo_cache_init(struct drm_device
- 	int ret;
- 	int i;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return -ENODEV;
- 
- 	/* Create the initial set of BO labels that the kernel will
-@@ -1075,7 +1075,7 @@ int vc4_label_bo_ioctl(struct drm_device
- 	struct drm_gem_object *gem_obj;
- 	int ret = 0, label;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return -ENODEV;
- 
- 	if (!args->len)
---- a/drivers/gpu/drm/vc4/vc4_crtc.c
-+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
-@@ -1023,7 +1023,7 @@ static int vc4_async_page_flip(struct dr
- 	struct vc4_bo *bo = to_vc4_bo(&dma_bo->base);
- 	int ret;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return -ENODEV;
- 
- 	/*
-@@ -1066,7 +1066,7 @@ int vc4_page_flip(struct drm_crtc *crtc,
- 		struct drm_device *dev = crtc->dev;
- 		struct vc4_dev *vc4 = to_vc4_dev(dev);
- 
--		if (vc4->gen == VC4_GEN_5)
-+		if (vc4->gen > VC4_GEN_4)
- 			return vc5_async_page_flip(crtc, fb, event, flags);
- 		else
- 			return vc4_async_page_flip(crtc, fb, event, flags);
---- a/drivers/gpu/drm/vc4/vc4_drv.c
-+++ b/drivers/gpu/drm/vc4/vc4_drv.c
-@@ -98,7 +98,7 @@ static int vc4_get_param_ioctl(struct dr
- 	if (args->pad != 0)
- 		return -EINVAL;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return -ENODEV;
- 
- 	if (!vc4->v3d)
-@@ -147,7 +147,7 @@ static int vc4_open(struct drm_device *d
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 	struct vc4_file *vc4file;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return -ENODEV;
- 
- 	vc4file = kzalloc(sizeof(*vc4file), GFP_KERNEL);
-@@ -165,7 +165,7 @@ static void vc4_close(struct drm_device
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 	struct vc4_file *vc4file = file->driver_priv;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return;
- 
- 	if (vc4file->bin_bo_used)
-@@ -315,7 +315,7 @@ static int vc4_drm_bind(struct device *d
- 	else
- 		gen = VC4_GEN_4;
- 
--	if (gen == VC4_GEN_5)
-+	if (gen > VC4_GEN_4)
- 		driver = &vc5_drm_driver;
- 	else
- 		driver = &vc4_drm_driver;
---- a/drivers/gpu/drm/vc4/vc4_gem.c
-+++ b/drivers/gpu/drm/vc4/vc4_gem.c
-@@ -76,7 +76,7 @@ vc4_get_hang_state_ioctl(struct drm_devi
- 	u32 i;
- 	int ret = 0;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return -ENODEV;
- 
- 	if (!vc4->v3d) {
-@@ -389,7 +389,7 @@ vc4_wait_for_seqno(struct drm_device *de
- 	unsigned long timeout_expire;
- 	DEFINE_WAIT(wait);
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return -ENODEV;
- 
- 	if (vc4->finished_seqno >= seqno)
-@@ -474,7 +474,7 @@ vc4_submit_next_bin_job(struct drm_devic
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 	struct vc4_exec_info *exec;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return;
- 
- again:
-@@ -522,7 +522,7 @@ vc4_submit_next_render_job(struct drm_de
- 	if (!exec)
- 		return;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return;
- 
- 	/* A previous RCL may have written to one of our textures, and
-@@ -543,7 +543,7 @@ vc4_move_job_to_render(struct drm_device
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 	bool was_empty = list_empty(&vc4->render_job_list);
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return;
- 
- 	list_move_tail(&exec->head, &vc4->render_job_list);
-@@ -1012,7 +1012,7 @@ vc4_job_handle_completed(struct vc4_dev
- 	unsigned long irqflags;
- 	struct vc4_seqno_cb *cb, *cb_temp;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return;
- 
- 	spin_lock_irqsave(&vc4->job_lock, irqflags);
-@@ -1051,7 +1051,7 @@ int vc4_queue_seqno_cb(struct drm_device
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 	unsigned long irqflags;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return -ENODEV;
- 
- 	cb->func = func;
-@@ -1107,7 +1107,7 @@ vc4_wait_seqno_ioctl(struct drm_device *
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 	struct drm_vc4_wait_seqno *args = data;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return -ENODEV;
- 
- 	return vc4_wait_for_seqno_ioctl_helper(dev, args->seqno,
-@@ -1124,7 +1124,7 @@ vc4_wait_bo_ioctl(struct drm_device *dev
- 	struct drm_gem_object *gem_obj;
- 	struct vc4_bo *bo;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return -ENODEV;
- 
- 	if (args->pad != 0)
-@@ -1173,7 +1173,7 @@ vc4_submit_cl_ioctl(struct drm_device *d
- 				  args->shader_rec_size,
- 				  args->bo_handle_count);
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return -ENODEV;
- 
- 	if (!vc4->v3d) {
-@@ -1310,7 +1310,7 @@ int vc4_gem_init(struct drm_device *dev)
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 	int ret;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return -ENODEV;
- 
- 	vc4->dma_fence_context = dma_fence_context_alloc(1);
-@@ -1369,7 +1369,7 @@ int vc4_gem_madvise_ioctl(struct drm_dev
- 	struct vc4_bo *bo;
- 	int ret;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return -ENODEV;
- 
- 	switch (args->madv) {
---- a/drivers/gpu/drm/vc4/vc4_irq.c
-+++ b/drivers/gpu/drm/vc4/vc4_irq.c
-@@ -265,7 +265,7 @@ vc4_irq_enable(struct drm_device *dev)
- {
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return;
- 
- 	if (!vc4->v3d)
-@@ -282,7 +282,7 @@ vc4_irq_disable(struct drm_device *dev)
- {
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return;
- 
- 	if (!vc4->v3d)
-@@ -305,7 +305,7 @@ int vc4_irq_install(struct drm_device *d
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 	int ret;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return -ENODEV;
- 
- 	if (irq == IRQ_NOTCONNECTED)
-@@ -326,7 +326,7 @@ void vc4_irq_uninstall(struct drm_device
- {
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return;
- 
- 	vc4_irq_disable(dev);
-@@ -339,7 +339,7 @@ void vc4_irq_reset(struct drm_device *de
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 	unsigned long irqflags;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return;
- 
- 	/* Acknowledge any stale IRQs. */
---- a/drivers/gpu/drm/vc4/vc4_kms.c
-+++ b/drivers/gpu/drm/vc4/vc4_kms.c
-@@ -482,7 +482,7 @@ static struct drm_framebuffer *vc4_fb_cr
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 	struct drm_mode_fb_cmd2 mode_cmd_local;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return ERR_PTR(-ENODEV);
- 
- 	/* If the user didn't specify a modifier, use the
---- a/drivers/gpu/drm/vc4/vc4_perfmon.c
-+++ b/drivers/gpu/drm/vc4/vc4_perfmon.c
-@@ -23,7 +23,7 @@ void vc4_perfmon_get(struct vc4_perfmon
- 		return;
- 
- 	vc4 = perfmon->dev;
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return;
- 
- 	refcount_inc(&perfmon->refcnt);
-@@ -37,7 +37,7 @@ void vc4_perfmon_put(struct vc4_perfmon
- 		return;
- 
- 	vc4 = perfmon->dev;
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return;
- 
- 	if (refcount_dec_and_test(&perfmon->refcnt))
-@@ -49,7 +49,7 @@ void vc4_perfmon_start(struct vc4_dev *v
- 	unsigned int i;
- 	u32 mask;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return;
- 
- 	if (WARN_ON_ONCE(!perfmon || vc4->active_perfmon))
-@@ -69,7 +69,7 @@ void vc4_perfmon_stop(struct vc4_dev *vc
- {
- 	unsigned int i;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return;
- 
- 	if (WARN_ON_ONCE(!vc4->active_perfmon ||
-@@ -90,7 +90,7 @@ struct vc4_perfmon *vc4_perfmon_find(str
- 	struct vc4_dev *vc4 = vc4file->dev;
- 	struct vc4_perfmon *perfmon;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return NULL;
- 
- 	mutex_lock(&vc4file->perfmon.lock);
-@@ -105,7 +105,7 @@ void vc4_perfmon_open_file(struct vc4_fi
- {
- 	struct vc4_dev *vc4 = vc4file->dev;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return;
- 
- 	mutex_init(&vc4file->perfmon.lock);
-@@ -126,7 +126,7 @@ void vc4_perfmon_close_file(struct vc4_f
- {
- 	struct vc4_dev *vc4 = vc4file->dev;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return;
- 
- 	mutex_lock(&vc4file->perfmon.lock);
-@@ -146,7 +146,7 @@ int vc4_perfmon_create_ioctl(struct drm_
- 	unsigned int i;
- 	int ret;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return -ENODEV;
- 
- 	if (!vc4->v3d) {
-@@ -200,7 +200,7 @@ int vc4_perfmon_destroy_ioctl(struct drm
- 	struct drm_vc4_perfmon_destroy *req = data;
- 	struct vc4_perfmon *perfmon;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return -ENODEV;
- 
- 	if (!vc4->v3d) {
-@@ -228,7 +228,7 @@ int vc4_perfmon_get_values_ioctl(struct
- 	struct vc4_perfmon *perfmon;
- 	int ret;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return -ENODEV;
- 
- 	if (!vc4->v3d) {
---- a/drivers/gpu/drm/vc4/vc4_render_cl.c
-+++ b/drivers/gpu/drm/vc4/vc4_render_cl.c
-@@ -599,7 +599,7 @@ int vc4_get_rcl(struct drm_device *dev,
- 	bool has_bin = args->bin_cl_size != 0;
- 	int ret;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return -ENODEV;
- 
- 	if (args->min_x_tile > args->max_x_tile ||
---- a/drivers/gpu/drm/vc4/vc4_v3d.c
-+++ b/drivers/gpu/drm/vc4/vc4_v3d.c
-@@ -127,7 +127,7 @@ static int vc4_v3d_debugfs_ident(struct
- int
- vc4_v3d_pm_get(struct vc4_dev *vc4)
- {
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return -ENODEV;
- 
- 	mutex_lock(&vc4->power_lock);
-@@ -148,7 +148,7 @@ vc4_v3d_pm_get(struct vc4_dev *vc4)
- void
- vc4_v3d_pm_put(struct vc4_dev *vc4)
- {
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return;
- 
- 	mutex_lock(&vc4->power_lock);
-@@ -178,7 +178,7 @@ int vc4_v3d_get_bin_slot(struct vc4_dev
- 	uint64_t seqno = 0;
- 	struct vc4_exec_info *exec;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return -ENODEV;
- 
- try_again:
-@@ -325,7 +325,7 @@ int vc4_v3d_bin_bo_get(struct vc4_dev *v
- {
- 	int ret = 0;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return -ENODEV;
- 
- 	mutex_lock(&vc4->bin_bo_lock);
-@@ -360,7 +360,7 @@ static void bin_bo_release(struct kref *
- 
- void vc4_v3d_bin_bo_put(struct vc4_dev *vc4)
- {
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return;
- 
- 	mutex_lock(&vc4->bin_bo_lock);
---- a/drivers/gpu/drm/vc4/vc4_validate.c
-+++ b/drivers/gpu/drm/vc4/vc4_validate.c
-@@ -109,7 +109,7 @@ vc4_use_bo(struct vc4_exec_info *exec, u
- 	struct drm_gem_dma_object *obj;
- 	struct vc4_bo *bo;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return NULL;
- 
- 	if (hindex >= exec->bo_count) {
-@@ -169,7 +169,7 @@ vc4_check_tex_size(struct vc4_exec_info
- 	uint32_t utile_w = utile_width(cpp);
- 	uint32_t utile_h = utile_height(cpp);
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return false;
- 
- 	/* The shaded vertex format stores signed 12.4 fixed point
-@@ -495,7 +495,7 @@ vc4_validate_bin_cl(struct drm_device *d
- 	uint32_t dst_offset = 0;
- 	uint32_t src_offset = 0;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return -ENODEV;
- 
- 	while (src_offset < len) {
-@@ -942,7 +942,7 @@ vc4_validate_shader_recs(struct drm_devi
- 	uint32_t i;
- 	int ret = 0;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return -ENODEV;
- 
- 	for (i = 0; i < exec->shader_state_count; i++) {
---- a/drivers/gpu/drm/vc4/vc4_validate_shaders.c
-+++ b/drivers/gpu/drm/vc4/vc4_validate_shaders.c
-@@ -786,7 +786,7 @@ vc4_validate_shader(struct drm_gem_dma_o
- 	struct vc4_validated_shader_info *validated_shader = NULL;
- 	struct vc4_shader_validation_state validation_state;
- 
--	if (WARN_ON_ONCE(vc4->gen == VC4_GEN_5))
-+	if (WARN_ON_ONCE(vc4->gen > VC4_GEN_4))
- 		return NULL;
- 
- 	memset(&validation_state, 0, sizeof(validation_state));
diff --git a/target/linux/bcm27xx/patches-6.1/950-0940-drm-vc4-hvs-Use-switch-statement-to-simplify-vc4_hvs.patch b/target/linux/bcm27xx/patches-6.1/950-0940-drm-vc4-hvs-Use-switch-statement-to-simplify-vc4_hvs.patch
deleted file mode 100644
index 048b5d3222..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0940-drm-vc4-hvs-Use-switch-statement-to-simplify-vc4_hvs.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From 72e5eb3d9511af2f056911d70c4d033d4fc674b2 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 17 Feb 2023 15:07:29 +0100
-Subject: [PATCH] drm/vc4: hvs: Use switch statement to simplify
- vc4_hvs_get_fifo_from_output
-
-Since we'll support BCM2712 soon, let's move the logic behind
-vc4_hvs_get_fifo_from_output() to a switch to extend it more easily.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_hvs.c | 80 +++++++++++++++++++----------------
- 1 file changed, 43 insertions(+), 37 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -620,57 +620,63 @@ int vc4_hvs_get_fifo_from_output(struct
- 	u32 reg;
- 	int ret;
- 
--	if (vc4->gen == VC4_GEN_4)
-+	switch (vc4->gen) {
-+	case VC4_GEN_4:
- 		return output;
- 
--	/*
--	 * NOTE: We should probably use drm_dev_enter()/drm_dev_exit()
--	 * here, but this function is only used during the DRM device
--	 * initialization, so we should be fine.
--	 */
--
--	switch (output) {
--	case 0:
--		return 0;
--
--	case 1:
--		return 1;
--
--	case 2:
--		reg = HVS_READ(SCALER_DISPECTRL);
--		ret = FIELD_GET(SCALER_DISPECTRL_DSP2_MUX_MASK, reg);
--		if (ret == 0)
--			return 2;
--
--		return 0;
--
--	case 3:
--		reg = HVS_READ(SCALER_DISPCTRL);
--		ret = FIELD_GET(SCALER_DISPCTRL_DSP3_MUX_MASK, reg);
--		if (ret == 3)
--			return -EPIPE;
--
--		return ret;
--
--	case 4:
--		reg = HVS_READ(SCALER_DISPEOLN);
--		ret = FIELD_GET(SCALER_DISPEOLN_DSP4_MUX_MASK, reg);
--		if (ret == 3)
--			return -EPIPE;
-+	case VC4_GEN_5:
-+		/*
-+		 * NOTE: We should probably use
-+		 * drm_dev_enter()/drm_dev_exit() here, but this
-+		 * function is only used during the DRM device
-+		 * initialization, so we should be fine.
-+		 */
-+
-+		switch (output) {
-+		case 0:
-+			return 0;
-+
-+		case 1:
-+			return 1;
-+
-+		case 2:
-+			reg = HVS_READ(SCALER_DISPECTRL);
-+			ret = FIELD_GET(SCALER_DISPECTRL_DSP2_MUX_MASK, reg);
-+			if (ret == 0)
-+				return 2;
-+
-+			return 0;
-+
-+		case 3:
-+			reg = HVS_READ(SCALER_DISPCTRL);
-+			ret = FIELD_GET(SCALER_DISPCTRL_DSP3_MUX_MASK, reg);
-+			if (ret == 3)
-+				return -EPIPE;
-+
-+			return ret;
-+
-+		case 4:
-+			reg = HVS_READ(SCALER_DISPEOLN);
-+			ret = FIELD_GET(SCALER_DISPEOLN_DSP4_MUX_MASK, reg);
-+			if (ret == 3)
-+				return -EPIPE;
-+
-+			return ret;
-+
-+		case 5:
-+			reg = HVS_READ(SCALER_DISPDITHER);
-+			ret = FIELD_GET(SCALER_DISPDITHER_DSP5_MUX_MASK, reg);
-+			if (ret == 3)
-+				return -EPIPE;
- 
--		return ret;
-+			return ret;
- 
--	case 5:
--		reg = HVS_READ(SCALER_DISPDITHER);
--		ret = FIELD_GET(SCALER_DISPDITHER_DSP5_MUX_MASK, reg);
--		if (ret == 3)
-+		default:
- 			return -EPIPE;
--
--		return ret;
--
--	default:
--		return -EPIPE;
-+		}
- 	}
-+
-+	return -EPIPE;
- }
- 
- static int vc4_hvs_init_channel(struct vc4_hvs *hvs, struct drm_crtc *crtc,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0941-drm-vc4-hvs-Use-switch-statement-to-simplify-enablin.patch b/target/linux/bcm27xx/patches-6.1/950-0941-drm-vc4-hvs-Use-switch-statement-to-simplify-enablin.patch
deleted file mode 100644
index 984b329fb4..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0941-drm-vc4-hvs-Use-switch-statement-to-simplify-enablin.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 72bfb10c9393688d00e4e0b00d416e23c2753318 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 17 Feb 2023 15:07:29 +0100
-Subject: [PATCH] drm/vc4: hvs: Use switch statement to simplify
- enabling/disabling irq
-
-Since we'll support BCM2712 soon, let's move the logic to enable and
-disable the end-of-frame interrupts to a switch to extend it more
-easily.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_hvs.c | 42 ++++++++++++++++++++++++++---------
- 1 file changed, 32 insertions(+), 10 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -416,24 +416,46 @@ static void vc4_hvs_irq_enable_eof(const
- 				   unsigned int channel)
- {
- 	struct vc4_dev *vc4 = hvs->vc4;
--	u32 irq_mask = vc4->gen == VC4_GEN_5 ?
--		SCALER5_DISPCTRL_DSPEIEOF(channel) :
--		SCALER_DISPCTRL_DSPEIEOF(channel);
- 
--	HVS_WRITE(SCALER_DISPCTRL,
--		  HVS_READ(SCALER_DISPCTRL) | irq_mask);
-+	switch (vc4->gen) {
-+	case VC4_GEN_4:
-+		HVS_WRITE(SCALER_DISPCTRL,
-+			  HVS_READ(SCALER_DISPCTRL) |
-+			  SCALER_DISPCTRL_DSPEIEOF(channel));
-+		break;
-+
-+	case VC4_GEN_5:
-+		HVS_WRITE(SCALER_DISPCTRL,
-+			  HVS_READ(SCALER_DISPCTRL) |
-+			  SCALER5_DISPCTRL_DSPEIEOF(channel));
-+		break;
-+
-+	default:
-+		break;
-+	}
- }
- 
- static void vc4_hvs_irq_clear_eof(const struct vc4_hvs *hvs,
- 				  unsigned int channel)
- {
- 	struct vc4_dev *vc4 = hvs->vc4;
--	u32 irq_mask = vc4->gen == VC4_GEN_5 ?
--		SCALER5_DISPCTRL_DSPEIEOF(channel) :
--		SCALER_DISPCTRL_DSPEIEOF(channel);
- 
--	HVS_WRITE(SCALER_DISPCTRL,
--		  HVS_READ(SCALER_DISPCTRL) & ~irq_mask);
-+	switch (vc4->gen) {
-+	case VC4_GEN_4:
-+		HVS_WRITE(SCALER_DISPCTRL,
-+			  HVS_READ(SCALER_DISPCTRL) &
-+			  ~SCALER_DISPCTRL_DSPEIEOF(channel));
-+		break;
-+
-+	case VC4_GEN_5:
-+		HVS_WRITE(SCALER_DISPCTRL,
-+			  HVS_READ(SCALER_DISPCTRL) &
-+			  ~SCALER5_DISPCTRL_DSPEIEOF(channel));
-+		break;
-+
-+	default:
-+		break;
-+	}
- }
- 
- static struct vc4_hvs_dlist_allocation *
diff --git a/target/linux/bcm27xx/patches-6.1/950-0942-drm-vc4-hvs-Test-if-the-EOF-interrupts-are-enabled.patch b/target/linux/bcm27xx/patches-6.1/950-0942-drm-vc4-hvs-Test-if-the-EOF-interrupts-are-enabled.patch
deleted file mode 100644
index 704468b90e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0942-drm-vc4-hvs-Test-if-the-EOF-interrupts-are-enabled.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From bcf02f6ac0d429a425e8409f140bd875a1feed2e Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Thu, 27 Apr 2023 13:46:53 +0200
-Subject: [PATCH] drm/vc4: hvs: Test if the EOF interrupts are enabled
-
-We currently enable the EOF interrupts through the CRTC destroy_state
-implementation.
-
-However, nothing guarantees that we can't call destroy_state multiple
-times in a row, and therefore before the EOF interrupt even happens.
-
-This means we would enable the interrupt multiple times but disable it
-only once. It wasn't an issue so far since the interrupts were only
-enabled by setting a bit in a register, but with BCM2712 we will use an
-external interrupt controller, with a refcounted interrupt.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_drv.h |  8 ++++++--
- drivers/gpu/drm/vc4/vc4_hvs.c | 14 ++++++++++++--
- 2 files changed, 18 insertions(+), 4 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -333,6 +333,8 @@ struct vc4_v3d {
- 	struct debugfs_regset32 regset;
- };
- 
-+#define HVS_NUM_CHANNELS 3
-+
- struct vc4_hvs {
- 	struct vc4_dev *vc4;
- 	struct platform_device *pdev;
-@@ -341,6 +343,10 @@ struct vc4_hvs {
- 
- 	struct clk *core_clk;
- 
-+	struct {
-+		unsigned int enabled: 1;
-+	} eof_irq[HVS_NUM_CHANNELS];
-+
- 	unsigned long max_core_rate;
- 
- 	/* Memory manager for CRTCs to allocate space in the display
-@@ -373,8 +379,6 @@ struct vc4_hvs {
- 	bool vc5_hdmi_enable_4096by2160;
- };
- 
--#define HVS_NUM_CHANNELS 3
--
- struct vc4_hvs_state {
- 	struct drm_private_state base;
- 	unsigned long core_clock_rate;
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -412,11 +412,14 @@ static void vc5_hvs_update_gamma_lut(str
- 	vc5_hvs_lut_load(hvs, vc4_crtc);
- }
- 
--static void vc4_hvs_irq_enable_eof(const struct vc4_hvs *hvs,
-+static void vc4_hvs_irq_enable_eof(struct vc4_hvs *hvs,
- 				   unsigned int channel)
- {
- 	struct vc4_dev *vc4 = hvs->vc4;
- 
-+	if (hvs->eof_irq[channel].enabled)
-+		return;
-+
- 	switch (vc4->gen) {
- 	case VC4_GEN_4:
- 		HVS_WRITE(SCALER_DISPCTRL,
-@@ -433,13 +436,18 @@ static void vc4_hvs_irq_enable_eof(const
- 	default:
- 		break;
- 	}
-+
-+	hvs->eof_irq[channel].enabled = true;
- }
- 
--static void vc4_hvs_irq_clear_eof(const struct vc4_hvs *hvs,
-+static void vc4_hvs_irq_clear_eof(struct vc4_hvs *hvs,
- 				  unsigned int channel)
- {
- 	struct vc4_dev *vc4 = hvs->vc4;
- 
-+	if (!hvs->eof_irq[channel].enabled)
-+		return;
-+
- 	switch (vc4->gen) {
- 	case VC4_GEN_4:
- 		HVS_WRITE(SCALER_DISPCTRL,
-@@ -456,6 +464,8 @@ static void vc4_hvs_irq_clear_eof(const
- 	default:
- 		break;
- 	}
-+
-+	hvs->eof_irq[channel].enabled = false;
- }
- 
- static struct vc4_hvs_dlist_allocation *
diff --git a/target/linux/bcm27xx/patches-6.1/950-0943-drm-vc4-hvs-Create-hw_init-function.patch b/target/linux/bcm27xx/patches-6.1/950-0943-drm-vc4-hvs-Create-hw_init-function.patch
deleted file mode 100644
index 5b748b5e94..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0943-drm-vc4-hvs-Create-hw_init-function.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-From f3c84bb53107cef0009347d071c1a188ce24b8a3 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 17 Feb 2023 14:36:28 +0100
-Subject: [PATCH] drm/vc4: hvs: Create hw_init function
-
-Since the BCM2712 will feature a significantly different HVS, let's move
-the hardware initialisation part of our bind function into a separate
-function.
-
-That way, it will be easier to extend in the future.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_hvs.c | 155 ++++++++++++++++++----------------
- 1 file changed, 83 insertions(+), 72 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -1291,79 +1291,10 @@ struct vc4_hvs *__vc4_hvs_alloc(struct v
- 	return hvs;
- }
- 
--static int vc4_hvs_bind(struct device *dev, struct device *master, void *data)
-+static int vc4_hvs_hw_init(struct vc4_hvs *hvs)
- {
--	struct platform_device *pdev = to_platform_device(dev);
--	struct drm_device *drm = dev_get_drvdata(master);
--	struct vc4_dev *vc4 = to_vc4_dev(drm);
--	struct vc4_hvs *hvs = NULL;
--	int ret;
--	u32 dispctrl;
--	u32 reg, top;
--
--	hvs = __vc4_hvs_alloc(vc4, NULL);
--	if (IS_ERR(hvs))
--		return PTR_ERR(hvs);
--
--	hvs->regs = vc4_ioremap_regs(pdev, 0);
--	if (IS_ERR(hvs->regs))
--		return PTR_ERR(hvs->regs);
--
--	hvs->regset.base = hvs->regs;
--	hvs->regset.regs = hvs_regs;
--	hvs->regset.nregs = ARRAY_SIZE(hvs_regs);
--
--	if (vc4->gen == VC4_GEN_5) {
--		struct rpi_firmware *firmware;
--		struct device_node *node;
--		unsigned int max_rate;
--
--		node = rpi_firmware_find_node();
--		if (!node)
--			return -EINVAL;
--
--		firmware = rpi_firmware_get(node);
--		of_node_put(node);
--		if (!firmware)
--			return -EPROBE_DEFER;
--
--		hvs->core_clk = devm_clk_get(&pdev->dev, NULL);
--		if (IS_ERR(hvs->core_clk)) {
--			dev_err(&pdev->dev, "Couldn't get core clock\n");
--			return PTR_ERR(hvs->core_clk);
--		}
--
--		max_rate = rpi_firmware_clk_get_max_rate(firmware,
--							 RPI_FIRMWARE_CORE_CLK_ID);
--		rpi_firmware_put(firmware);
--		if (max_rate >= 550000000)
--			hvs->vc5_hdmi_enable_hdmi_20 = true;
--
--		if (max_rate >= 600000000)
--			hvs->vc5_hdmi_enable_4096by2160 = true;
--
--		hvs->max_core_rate = max_rate;
--
--		ret = clk_prepare_enable(hvs->core_clk);
--		if (ret) {
--			dev_err(&pdev->dev, "Couldn't enable the core clock\n");
--			return ret;
--		}
--	}
--
--	if (vc4->gen == VC4_GEN_4)
--		hvs->dlist = hvs->regs + SCALER_DLIST_START;
--	else
--		hvs->dlist = hvs->regs + SCALER5_DLIST_START;
--
--	/* Upload filter kernels.  We only have the one for now, so we
--	 * keep it around for the lifetime of the driver.
--	 */
--	ret = vc4_hvs_upload_linear_kernel(hvs,
--					   &hvs->mitchell_netravali_filter,
--					   mitchell_netravali_1_3_1_3_kernel);
--	if (ret)
--		return ret;
-+	struct vc4_dev *vc4 = hvs->vc4;
-+	u32 dispctrl, reg;
- 
- 	reg = HVS_READ(SCALER_DISPECTRL);
- 	reg &= ~SCALER_DISPECTRL_DSP2_MUX_MASK;
-@@ -1445,6 +1376,86 @@ static int vc4_hvs_bind(struct device *d
- 
- 	HVS_WRITE(SCALER_DISPCTRL, dispctrl);
- 
-+	return 0;
-+}
-+
-+static int vc4_hvs_bind(struct device *dev, struct device *master, void *data)
-+{
-+	struct platform_device *pdev = to_platform_device(dev);
-+	struct drm_device *drm = dev_get_drvdata(master);
-+	struct vc4_dev *vc4 = to_vc4_dev(drm);
-+	struct vc4_hvs *hvs = NULL;
-+	int ret;
-+	u32 reg, top;
-+
-+	hvs = __vc4_hvs_alloc(vc4, NULL);
-+	if (IS_ERR(hvs))
-+		return PTR_ERR(hvs);
-+
-+	hvs->regs = vc4_ioremap_regs(pdev, 0);
-+	if (IS_ERR(hvs->regs))
-+		return PTR_ERR(hvs->regs);
-+
-+	hvs->regset.base = hvs->regs;
-+	hvs->regset.regs = hvs_regs;
-+	hvs->regset.nregs = ARRAY_SIZE(hvs_regs);
-+
-+	if (vc4->gen == VC4_GEN_5) {
-+		struct rpi_firmware *firmware;
-+		struct device_node *node;
-+		unsigned int max_rate;
-+
-+		node = rpi_firmware_find_node();
-+		if (!node)
-+			return -EINVAL;
-+
-+		firmware = rpi_firmware_get(node);
-+		of_node_put(node);
-+		if (!firmware)
-+			return -EPROBE_DEFER;
-+
-+		hvs->core_clk = devm_clk_get(&pdev->dev, NULL);
-+		if (IS_ERR(hvs->core_clk)) {
-+			dev_err(&pdev->dev, "Couldn't get core clock\n");
-+			return PTR_ERR(hvs->core_clk);
-+		}
-+
-+		max_rate = rpi_firmware_clk_get_max_rate(firmware,
-+							 RPI_FIRMWARE_CORE_CLK_ID);
-+		rpi_firmware_put(firmware);
-+		if (max_rate >= 550000000)
-+			hvs->vc5_hdmi_enable_hdmi_20 = true;
-+
-+		if (max_rate >= 600000000)
-+			hvs->vc5_hdmi_enable_4096by2160 = true;
-+
-+		hvs->max_core_rate = max_rate;
-+
-+		ret = clk_prepare_enable(hvs->core_clk);
-+		if (ret) {
-+			dev_err(&pdev->dev, "Couldn't enable the core clock\n");
-+			return ret;
-+		}
-+	}
-+
-+	if (vc4->gen == VC4_GEN_4)
-+		hvs->dlist = hvs->regs + SCALER_DLIST_START;
-+	else
-+		hvs->dlist = hvs->regs + SCALER5_DLIST_START;
-+
-+	/* Upload filter kernels.  We only have the one for now, so we
-+	 * keep it around for the lifetime of the driver.
-+	 */
-+	ret = vc4_hvs_upload_linear_kernel(hvs,
-+					   &hvs->mitchell_netravali_filter,
-+					   mitchell_netravali_1_3_1_3_kernel);
-+	if (ret)
-+		return ret;
-+
-+	ret = vc4_hvs_hw_init(hvs);
-+	if (ret)
-+		return ret;
-+
- 	/* Recompute Composite Output Buffer (COB) allocations for the displays
- 	 */
- 	if (vc4->gen == VC4_GEN_4) {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0944-drm-vc4-hvs-Create-cob_init-function.patch b/target/linux/bcm27xx/patches-6.1/950-0944-drm-vc4-hvs-Create-cob_init-function.patch
deleted file mode 100644
index 5b2e9745e9..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0944-drm-vc4-hvs-Create-cob_init-function.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-From 99a13ce3a12303dfb54815637972627a7d207086 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 17 Feb 2023 15:14:55 +0100
-Subject: [PATCH] drm/vc4: hvs: Create cob_init function
-
-Just like the HVS itself, the COB parameters will be fairly different in
-the BCM2712.
-
-Let's move the COB parameters computation and its initialisation to a
-separate function that will be easier to extend in the future.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_hvs.c | 128 ++++++++++++++++++++--------------
- 1 file changed, 74 insertions(+), 54 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -1379,6 +1379,77 @@ static int vc4_hvs_hw_init(struct vc4_hv
- 	return 0;
- }
- 
-+static int vc4_hvs_cob_init(struct vc4_hvs *hvs)
-+{
-+	struct vc4_dev *vc4 = hvs->vc4;
-+	u32 reg, top;
-+
-+	/*
-+	 * Recompute Composite Output Buffer (COB) allocations for the
-+	 * displays
-+	 */
-+	switch (vc4->gen) {
-+	case VC4_GEN_4:
-+		/* The COB is 20736 pixels, or just over 10 lines at 2048 wide.
-+		 * The bottom 2048 pixels are full 32bpp RGBA (intended for the
-+		 * TXP composing RGBA to memory), whilst the remainder are only
-+		 * 24bpp RGB.
-+		 *
-+		 * Assign 3 lines to channels 1 & 2, and just over 4 lines to
-+		 * channel 0.
-+		 */
-+		#define VC4_COB_SIZE		20736
-+		#define VC4_COB_LINE_WIDTH	2048
-+		#define VC4_COB_NUM_LINES	3
-+		reg = 0;
-+		top = VC4_COB_LINE_WIDTH * VC4_COB_NUM_LINES;
-+		reg |= (top - 1) << 16;
-+		HVS_WRITE(SCALER_DISPBASE2, reg);
-+		reg = top;
-+		top += VC4_COB_LINE_WIDTH * VC4_COB_NUM_LINES;
-+		reg |= (top - 1) << 16;
-+		HVS_WRITE(SCALER_DISPBASE1, reg);
-+		reg = top;
-+		top = VC4_COB_SIZE;
-+		reg |= (top - 1) << 16;
-+		HVS_WRITE(SCALER_DISPBASE0, reg);
-+		break;
-+
-+	case VC4_GEN_5:
-+		/* The COB is 44416 pixels, or 10.8 lines at 4096 wide.
-+		 * The bottom 4096 pixels are full RGBA (intended for the TXP
-+		 * composing RGBA to memory), whilst the remainder are only
-+		 * RGB. Addressing is always pixel wide.
-+		 *
-+		 * Assign 3 lines of 4096 to channels 1 & 2, and just over 4
-+		 * lines. to channel 0.
-+		 */
-+		#define VC5_COB_SIZE		44416
-+		#define VC5_COB_LINE_WIDTH	4096
-+		#define VC5_COB_NUM_LINES	3
-+		reg = 0;
-+		top = VC5_COB_LINE_WIDTH * VC5_COB_NUM_LINES;
-+		reg |= top << 16;
-+		HVS_WRITE(SCALER_DISPBASE2, reg);
-+		top += 16;
-+		reg = top;
-+		top += VC5_COB_LINE_WIDTH * VC5_COB_NUM_LINES;
-+		reg |= top << 16;
-+		HVS_WRITE(SCALER_DISPBASE1, reg);
-+		top += 16;
-+		reg = top;
-+		top = VC5_COB_SIZE;
-+		reg |= top << 16;
-+		HVS_WRITE(SCALER_DISPBASE0, reg);
-+		break;
-+
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
-+
- static int vc4_hvs_bind(struct device *dev, struct device *master, void *data)
- {
- 	struct platform_device *pdev = to_platform_device(dev);
-@@ -1386,7 +1457,6 @@ static int vc4_hvs_bind(struct device *d
- 	struct vc4_dev *vc4 = to_vc4_dev(drm);
- 	struct vc4_hvs *hvs = NULL;
- 	int ret;
--	u32 reg, top;
- 
- 	hvs = __vc4_hvs_alloc(vc4, NULL);
- 	if (IS_ERR(hvs))
-@@ -1456,59 +1526,9 @@ static int vc4_hvs_bind(struct device *d
- 	if (ret)
- 		return ret;
- 
--	/* Recompute Composite Output Buffer (COB) allocations for the displays
--	 */
--	if (vc4->gen == VC4_GEN_4) {
--		/* The COB is 20736 pixels, or just over 10 lines at 2048 wide.
--		 * The bottom 2048 pixels are full 32bpp RGBA (intended for the
--		 * TXP composing RGBA to memory), whilst the remainder are only
--		 * 24bpp RGB.
--		 *
--		 * Assign 3 lines to channels 1 & 2, and just over 4 lines to
--		 * channel 0.
--		 */
--		#define VC4_COB_SIZE		20736
--		#define VC4_COB_LINE_WIDTH	2048
--		#define VC4_COB_NUM_LINES	3
--		reg = 0;
--		top = VC4_COB_LINE_WIDTH * VC4_COB_NUM_LINES;
--		reg |= (top - 1) << 16;
--		HVS_WRITE(SCALER_DISPBASE2, reg);
--		reg = top;
--		top += VC4_COB_LINE_WIDTH * VC4_COB_NUM_LINES;
--		reg |= (top - 1) << 16;
--		HVS_WRITE(SCALER_DISPBASE1, reg);
--		reg = top;
--		top = VC4_COB_SIZE;
--		reg |= (top - 1) << 16;
--		HVS_WRITE(SCALER_DISPBASE0, reg);
--	} else {
--		/* The COB is 44416 pixels, or 10.8 lines at 4096 wide.
--		 * The bottom 4096 pixels are full RGBA (intended for the TXP
--		 * composing RGBA to memory), whilst the remainder are only
--		 * RGB. Addressing is always pixel wide.
--		 *
--		 * Assign 3 lines of 4096 to channels 1 & 2, and just over 4
--		 * lines. to channel 0.
--		 */
--		#define VC5_COB_SIZE		44416
--		#define VC5_COB_LINE_WIDTH	4096
--		#define VC5_COB_NUM_LINES	3
--		reg = 0;
--		top = VC5_COB_LINE_WIDTH * VC5_COB_NUM_LINES;
--		reg |= top << 16;
--		HVS_WRITE(SCALER_DISPBASE2, reg);
--		top += 16;
--		reg = top;
--		top += VC5_COB_LINE_WIDTH * VC5_COB_NUM_LINES;
--		reg |= top << 16;
--		HVS_WRITE(SCALER_DISPBASE1, reg);
--		top += 16;
--		reg = top;
--		top = VC5_COB_SIZE;
--		reg |= top << 16;
--		HVS_WRITE(SCALER_DISPBASE0, reg);
--	}
-+	ret = vc4_hvs_cob_init(hvs);
-+	if (ret)
-+		return ret;
- 
- 	ret = devm_request_irq(dev, platform_get_irq(pdev, 0),
- 			       vc4_hvs_irq_handler, 0, "vc4 hvs", drm);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0945-drm-vc4-hvs-Rename-hvs_regs-list.patch b/target/linux/bcm27xx/patches-6.1/950-0945-drm-vc4-hvs-Rename-hvs_regs-list.patch
deleted file mode 100644
index 4139d79f02..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0945-drm-vc4-hvs-Rename-hvs_regs-list.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 7a1c157ac856384c47df38e1de2995f55a111b85 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 17 Feb 2023 13:41:59 +0100
-Subject: [PATCH] drm/vc4: hvs: Rename hvs_regs list
-
-The HVS register set has been heavily modified in the BCM2712, and we'll
-thus need a separate debugfs_reg32 array for it.
-
-The name hvs_regs is thus a bit too generic, so let's rename it to
-something more specific.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_hvs.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -33,7 +33,7 @@
- #include "vc4_drv.h"
- #include "vc4_regs.h"
- 
--static const struct debugfs_reg32 hvs_regs[] = {
-+static const struct debugfs_reg32 vc4_hvs_regs[] = {
- 	VC4_REG32(SCALER_DISPCTRL),
- 	VC4_REG32(SCALER_DISPSTAT),
- 	VC4_REG32(SCALER_DISPID),
-@@ -1467,8 +1467,8 @@ static int vc4_hvs_bind(struct device *d
- 		return PTR_ERR(hvs->regs);
- 
- 	hvs->regset.base = hvs->regs;
--	hvs->regset.regs = hvs_regs;
--	hvs->regset.nregs = ARRAY_SIZE(hvs_regs);
-+	hvs->regset.regs = vc4_hvs_regs;
-+	hvs->regset.nregs = ARRAY_SIZE(vc4_hvs_regs);
- 
- 	if (vc4->gen == VC4_GEN_5) {
- 		struct rpi_firmware *firmware;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0946-drm-vc4-plane-Change-ptr0_offset-to-an-array.patch b/target/linux/bcm27xx/patches-6.1/950-0946-drm-vc4-plane-Change-ptr0_offset-to-an-array.patch
deleted file mode 100644
index ed55f53fad..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0946-drm-vc4-plane-Change-ptr0_offset-to-an-array.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 531f66804eb95323f807d240273087fbe162aeee Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 24 Mar 2023 09:56:31 +0100
-Subject: [PATCH] drm/vc4: plane: Change ptr0_offset to an array
-
-The BCM2712 will have a fairly different dlist, that will feature one
-Pointer 0 word for each plane.
-
-Let's prepare by changing the ptr0_offset variable that holds the offset
-in a dlist of the pointer 0 word to an array.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_drv.h   |  3 ++-
- drivers/gpu/drm/vc4/vc4_plane.c | 18 +++++++++---------
- 2 files changed, 11 insertions(+), 10 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -14,6 +14,7 @@
- #include <drm/drm_debugfs.h>
- #include <drm/drm_device.h>
- #include <drm/drm_encoder.h>
-+#include <drm/drm_fourcc.h>
- #include <drm/drm_gem_dma_helper.h>
- #include <drm/drm_managed.h>
- #include <drm/drm_mm.h>
-@@ -430,7 +431,7 @@ struct vc4_plane_state {
- 	 */
- 	u32 pos0_offset;
- 	u32 pos2_offset;
--	u32 ptr0_offset;
-+	u32 ptr0_offset[DRM_FORMAT_MAX_PLANES];
- 	u32 lbm_offset;
- 
- 	/* Offset where the plane's dlist was last stored in the
---- a/drivers/gpu/drm/vc4/vc4_plane.c
-+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -1242,7 +1242,7 @@ static int vc4_plane_mode_set(struct drm
- 	 *
- 	 * The pointers may be any byte address.
- 	 */
--	vc4_state->ptr0_offset = vc4_state->dlist_count;
-+	vc4_state->ptr0_offset[0] = vc4_state->dlist_count;
- 	for (i = 0; i < num_planes; i++)
- 		vc4_dlist_write(vc4_state, vc4_state->offsets[i]);
- 
-@@ -1447,13 +1447,13 @@ void vc4_plane_async_set_fb(struct drm_p
- 	 * scanout will start from this address as soon as the FIFO
- 	 * needs to refill with pixels.
- 	 */
--	writel(addr, &vc4_state->hw_dlist[vc4_state->ptr0_offset]);
-+	writel(addr, &vc4_state->hw_dlist[vc4_state->ptr0_offset[0]]);
- 
- 	/* Also update the CPU-side dlist copy, so that any later
- 	 * atomic updates that don't do a new modeset on our plane
- 	 * also use our updated address.
- 	 */
--	vc4_state->dlist[vc4_state->ptr0_offset] = addr;
-+	vc4_state->dlist[vc4_state->ptr0_offset[0]] = addr;
- 
- 	drm_dev_exit(idx);
- }
-@@ -1517,8 +1517,8 @@ static void vc4_plane_atomic_async_updat
- 		new_vc4_state->dlist[vc4_state->pos0_offset];
- 	vc4_state->dlist[vc4_state->pos2_offset] =
- 		new_vc4_state->dlist[vc4_state->pos2_offset];
--	vc4_state->dlist[vc4_state->ptr0_offset] =
--		new_vc4_state->dlist[vc4_state->ptr0_offset];
-+	vc4_state->dlist[vc4_state->ptr0_offset[0]] =
-+		new_vc4_state->dlist[vc4_state->ptr0_offset[0]];
- 
- 	/* Note that we can't just call vc4_plane_write_dlist()
- 	 * because that would smash the context data that the HVS is
-@@ -1528,8 +1528,8 @@ static void vc4_plane_atomic_async_updat
- 	       &vc4_state->hw_dlist[vc4_state->pos0_offset]);
- 	writel(vc4_state->dlist[vc4_state->pos2_offset],
- 	       &vc4_state->hw_dlist[vc4_state->pos2_offset]);
--	writel(vc4_state->dlist[vc4_state->ptr0_offset],
--	       &vc4_state->hw_dlist[vc4_state->ptr0_offset]);
-+	writel(vc4_state->dlist[vc4_state->ptr0_offset[0]],
-+	       &vc4_state->hw_dlist[vc4_state->ptr0_offset[0]]);
- 
- 	drm_dev_exit(idx);
- }
-@@ -1556,7 +1556,7 @@ static int vc4_plane_atomic_async_check(
- 	if (old_vc4_state->dlist_count != new_vc4_state->dlist_count ||
- 	    old_vc4_state->pos0_offset != new_vc4_state->pos0_offset ||
- 	    old_vc4_state->pos2_offset != new_vc4_state->pos2_offset ||
--	    old_vc4_state->ptr0_offset != new_vc4_state->ptr0_offset ||
-+	    old_vc4_state->ptr0_offset[0] != new_vc4_state->ptr0_offset[0] ||
- 	    vc4_lbm_size(plane->state) != vc4_lbm_size(new_plane_state))
- 		return -EINVAL;
- 
-@@ -1566,7 +1566,7 @@ static int vc4_plane_atomic_async_check(
- 	for (i = 0; i < new_vc4_state->dlist_count; i++) {
- 		if (i == new_vc4_state->pos0_offset ||
- 		    i == new_vc4_state->pos2_offset ||
--		    i == new_vc4_state->ptr0_offset ||
-+		    i == new_vc4_state->ptr0_offset[0] ||
- 		    (new_vc4_state->lbm_offset &&
- 		     i == new_vc4_state->lbm_offset))
- 			continue;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0947-drm-vc4-hvs-Rework-LBM-alignment.patch b/target/linux/bcm27xx/patches-6.1/950-0947-drm-vc4-hvs-Rework-LBM-alignment.patch
deleted file mode 100644
index 3a30b9ca85..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0947-drm-vc4-hvs-Rework-LBM-alignment.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 2834b58a3b58198e551d8461a0786b75d3d76823 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Thu, 13 Apr 2023 10:12:19 +0200
-Subject: [PATCH] drm/vc4: hvs: Rework LBM alignment
-
-With the introduction of the support for BCM2712, the check of whether
-we're running on vc5 or not to compute the LBM alignment requirement
-doesn't work anymore.
-
-Moreover, the LBM size will need to be computed in words for the
-BCM2712, while we've had sizes in bytes so far.
-
-Aligning on either 64 or 32 words is thus fairly harmful on BCM2712, so
-let's just explicitly align the size when needed, and then call
-drm_mm_insert_node_generic() with an alignment of 1.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_plane.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_plane.c
-+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -744,6 +744,11 @@ static int vc4_plane_allocate_lbm(struct
- 	if (!lbm_size)
- 		return 0;
- 
-+	if (vc4->gen == VC4_GEN_5)
-+		lbm_size = ALIGN(lbm_size, 64);
-+	else if (vc4->gen == VC4_GEN_4)
-+		lbm_size = ALIGN(lbm_size, 32);
-+
- 	drm_dbg_driver(drm, "[PLANE:%d:%s] LBM Allocation Size: %u\n",
- 		       plane->base.id, plane->name, lbm_size);
- 
-@@ -759,8 +764,7 @@ static int vc4_plane_allocate_lbm(struct
- 		spin_lock_irqsave(&vc4->hvs->mm_lock, irqflags);
- 		ret = drm_mm_insert_node_generic(&vc4->hvs->lbm_mm,
- 						 &vc4_state->lbm,
--						 lbm_size,
--						 vc4->gen == VC4_GEN_5 ? 64 : 32,
-+						 lbm_size, 1,
- 						 0, 0);
- 		spin_unlock_irqrestore(&vc4->hvs->mm_lock, irqflags);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0948-drm-vc4-hvs-Change-prototype-of-__vc4_hvs_alloc-to-p.patch b/target/linux/bcm27xx/patches-6.1/950-0948-drm-vc4-hvs-Change-prototype-of-__vc4_hvs_alloc-to-p.patch
deleted file mode 100644
index 2927a3e04e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0948-drm-vc4-hvs-Change-prototype-of-__vc4_hvs_alloc-to-p.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 23cba2abd5ffbb7337e3f381c4724eaaf01cf5a1 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 24 Mar 2023 15:45:50 +0100
-Subject: [PATCH] drm/vc4: hvs: Change prototype of __vc4_hvs_alloc to pass
- registers
-
-The BCM2712 HVS has registers to report the size of the various SRAM the
-driver uses, and their size actually differ depending on the stepping.
-
-The initialisation of the memory pools happen in the __vc4_hvs_alloc()
-function that also allocates the main HVS structure, that will then hold
-the pointer to the memory mapping of the registers.
-
-This creates some kind of circular dependency that we can break by
-passing the mapping pointer as an argument for __vc4_hvs_alloc() to use
-to query to get the SRAM sizes and initialise the memory pools
-accordingly.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/tests/vc4_mock.c |  2 +-
- drivers/gpu/drm/vc4/vc4_drv.h        |  4 +++-
- drivers/gpu/drm/vc4/vc4_hvs.c        | 16 ++++++++++------
- 3 files changed, 14 insertions(+), 8 deletions(-)
-
---- a/drivers/gpu/drm/vc4/tests/vc4_mock.c
-+++ b/drivers/gpu/drm/vc4/tests/vc4_mock.c
-@@ -173,7 +173,7 @@ static struct vc4_dev *__mock_device(str
- 	vc4->dev = dev;
- 	vc4->gen = gen;
- 
--	vc4->hvs = __vc4_hvs_alloc(vc4, NULL);
-+	vc4->hvs = __vc4_hvs_alloc(vc4, NULL, NULL);
- 	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, vc4->hvs);
- 
- 	drm = &vc4->base;
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -1092,7 +1092,9 @@ void vc4_irq_reset(struct drm_device *de
- 
- /* vc4_hvs.c */
- extern struct platform_driver vc4_hvs_driver;
--struct vc4_hvs *__vc4_hvs_alloc(struct vc4_dev *vc4, struct platform_device *pdev);
-+struct vc4_hvs *__vc4_hvs_alloc(struct vc4_dev *vc4,
-+				void __iomem *regs,
-+				struct platform_device *pdev);
- void vc4_hvs_stop_channel(struct vc4_hvs *hvs, unsigned int output);
- int vc4_hvs_get_fifo_from_output(struct vc4_hvs *hvs, unsigned int output);
- u8 vc4_hvs_get_fifo_frame_count(struct vc4_hvs *hvs, unsigned int fifo);
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -1248,7 +1248,9 @@ int vc4_hvs_debugfs_init(struct drm_mino
- 	return 0;
- }
- 
--struct vc4_hvs *__vc4_hvs_alloc(struct vc4_dev *vc4, struct platform_device *pdev)
-+struct vc4_hvs *__vc4_hvs_alloc(struct vc4_dev *vc4,
-+				void __iomem *regs,
-+				struct platform_device *pdev)
- {
- 	struct drm_device *drm = &vc4->base;
- 	struct vc4_hvs *hvs;
-@@ -1258,6 +1260,7 @@ struct vc4_hvs *__vc4_hvs_alloc(struct v
- 		return ERR_PTR(-ENOMEM);
- 
- 	hvs->vc4 = vc4;
-+	hvs->regs = regs;
- 	hvs->pdev = pdev;
- 
- 	spin_lock_init(&hvs->mm_lock);
-@@ -1456,16 +1459,17 @@ static int vc4_hvs_bind(struct device *d
- 	struct drm_device *drm = dev_get_drvdata(master);
- 	struct vc4_dev *vc4 = to_vc4_dev(drm);
- 	struct vc4_hvs *hvs = NULL;
-+	void __iomem *regs;
- 	int ret;
- 
--	hvs = __vc4_hvs_alloc(vc4, NULL);
-+	regs = vc4_ioremap_regs(pdev, 0);
-+	if (IS_ERR(regs))
-+		return PTR_ERR(regs);
-+
-+	hvs = __vc4_hvs_alloc(vc4, regs, pdev);
- 	if (IS_ERR(hvs))
- 		return PTR_ERR(hvs);
- 
--	hvs->regs = vc4_ioremap_regs(pdev, 0);
--	if (IS_ERR(hvs->regs))
--		return PTR_ERR(hvs->regs);
--
- 	hvs->regset.base = hvs->regs;
- 	hvs->regset.regs = vc4_hvs_regs;
- 	hvs->regset.nregs = ARRAY_SIZE(vc4_hvs_regs);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0949-drm-vc4-UV-planes-vertical-scaling-must-always-be-en.patch b/target/linux/bcm27xx/patches-6.1/950-0949-drm-vc4-UV-planes-vertical-scaling-must-always-be-en.patch
deleted file mode 100644
index 4a51862487..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0949-drm-vc4-UV-planes-vertical-scaling-must-always-be-en.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 03e0e348df7b685439f2db61ec2d8c8da25d1217 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 23 Aug 2023 17:48:23 +0100
-Subject: [PATCH] drm/vc4: UV planes vertical scaling must always be enabled
-
-It has been observed that a YUV422 unity scaled plane isn't displayed.
-Enabling vertical scaling on the UV planes solves this. There is
-already a similar clause to always enable horizontal scaling on the
-UV planes.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_plane.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/drivers/gpu/drm/vc4/vc4_plane.c
-+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -522,6 +522,12 @@ static int vc4_plane_setup_clipping_and_
- 		 */
- 		if (vc4_state->x_scaling[1] == VC4_SCALING_NONE)
- 			vc4_state->x_scaling[1] = VC4_SCALING_PPF;
-+
-+		/* Similarly UV needs vertical scaling to be enabled.
-+		 * Without this a 1:1 scaled YUV422 plane isn't rendered.
-+		 */
-+		if (vc4_state->y_scaling[1] == VC4_SCALING_NONE)
-+			vc4_state->y_scaling[1] = VC4_SCALING_PPF;
- 	} else {
- 		vc4_state->is_yuv = false;
- 		vc4_state->x_scaling[1] = VC4_SCALING_NONE;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0950-drm-vc4-hdmi-Avoid-hang-with-debug-registers-when-su.patch b/target/linux/bcm27xx/patches-6.1/950-0950-drm-vc4-hdmi-Avoid-hang-with-debug-registers-when-su.patch
deleted file mode 100644
index 8e36b79794..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0950-drm-vc4-hdmi-Avoid-hang-with-debug-registers-when-su.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From e5e7679d634b10e88df340c85cd8368c9f9989eb Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Tue, 5 Sep 2023 19:38:24 +0100
-Subject: [PATCH] drm/vc4: hdmi: Avoid hang with debug registers when suspended
-
-Trying to read /sys/kernel/debug/dri/1/hdmi1_regs
-when the hdmi is disconnected results in a fatal system hang.
-
-This is due to the pm suspend code disabling the dvp clock.
-That is just a gate of the 108MHz clock in DVP_HT_RPI_MISC_CONFIG,
-which results in accesses hanging AXI bus.
-
-Protect against this.
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/gpu/drm/vc4/vc4_hdmi.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/gpu/drm/vc4/vc4_hdmi.c
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -193,6 +193,8 @@ static int vc4_hdmi_debugfs_regs(struct
- 	if (!drm_dev_enter(drm, &idx))
- 		return -ENODEV;
- 
-+	WARN_ON(pm_runtime_resume_and_get(&vc4_hdmi->pdev->dev));
-+
- 	drm_print_regset32(&p, &vc4_hdmi->hdmi_regset);
- 	drm_print_regset32(&p, &vc4_hdmi->hd_regset);
- 	drm_print_regset32(&p, &vc4_hdmi->cec_regset);
-@@ -202,6 +204,8 @@ static int vc4_hdmi_debugfs_regs(struct
- 	drm_print_regset32(&p, &vc4_hdmi->ram_regset);
- 	drm_print_regset32(&p, &vc4_hdmi->rm_regset);
- 
-+	pm_runtime_put(&vc4_hdmi->pdev->dev);
-+
- 	drm_dev_exit(idx);
- 
- 	return 0;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0951-drm-vc4-Move-the-buffer-offset-out-of-the-vc4_plane_.patch b/target/linux/bcm27xx/patches-6.1/950-0951-drm-vc4-Move-the-buffer-offset-out-of-the-vc4_plane_.patch
deleted file mode 100644
index eeb2a93b5c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0951-drm-vc4-Move-the-buffer-offset-out-of-the-vc4_plane_.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-From 11cf37e741b439b26fe932750bde841a16a96828 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Mon, 25 Sep 2023 16:57:07 +0100
-Subject: [PATCH] drm/vc4: Move the buffer offset out of the vc4_plane_state
-
-The offset fields in vc4_plane_state are described as being
-the offset for each buffer in the bo, however it is used to
-store the complete DMA address that is then written into the
-register.
-
-The DMA address including the fb ofset  can be retrieved
-using drm_fb_dma_get_gem_addr, and the offset adjustment due to
-clipping is local to vc4_plane_mode_set.
-Drop the offset field from the state, and compute the complete
-DMA address in vc4_plane_mode_set.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_drv.h   |  5 ----
- drivers/gpu/drm/vc4/vc4_plane.c | 51 +++++++++++++--------------------
- 2 files changed, 20 insertions(+), 36 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -451,11 +451,6 @@ struct vc4_plane_state {
- 	bool is_unity;
- 	bool is_yuv;
- 
--	/* Offset to start scanning out from the start of the plane's
--	 * BO.
--	 */
--	u32 offsets[3];
--
- 	/* Our allocation in LBM for temporary storage during scaling. */
- 	struct drm_mm_node lbm;
- 
---- a/drivers/gpu/drm/vc4/vc4_plane.c
-+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -450,12 +450,11 @@ static int vc4_plane_setup_clipping_and_
- {
- 	struct vc4_plane_state *vc4_state = to_vc4_plane_state(state);
- 	struct drm_framebuffer *fb = state->fb;
--	struct drm_gem_dma_object *bo;
- 	int num_planes = fb->format->num_planes;
- 	struct drm_crtc_state *crtc_state;
- 	u32 h_subsample = fb->format->hsub;
- 	u32 v_subsample = fb->format->vsub;
--	int i, ret;
-+	int ret;
- 
- 	crtc_state = drm_atomic_get_existing_crtc_state(state->state,
- 							state->crtc);
-@@ -469,11 +468,6 @@ static int vc4_plane_setup_clipping_and_
- 	if (ret)
- 		return ret;
- 
--	for (i = 0; i < num_planes; i++) {
--		bo = drm_fb_dma_get_gem_obj(fb, i);
--		vc4_state->offsets[i] = bo->dma_addr + fb->offsets[i];
--	}
--
- 	vc4_state->src_x = state->src.x1;
- 	vc4_state->src_y = state->src.y1;
- 	vc4_state->src_w[0] = state->src.x2 - vc4_state->src_x;
-@@ -896,6 +890,7 @@ static int vc4_plane_mode_set(struct drm
- 	u32 width, height;
- 	u32 hvs_format = format->hvs;
- 	unsigned int rotation;
-+	u32 offsets[3] = { 0 };
- 	int ret, i;
- 
- 	if (vc4_state->dlist_initialized)
-@@ -943,13 +938,8 @@ static int vc4_plane_mode_set(struct drm
- 		 * out.
- 		 */
- 		for (i = 0; i < num_planes; i++) {
--			vc4_state->offsets[i] += src_y /
--						 (i ? v_subsample : 1) *
--						 fb->pitches[i];
--
--			vc4_state->offsets[i] += src_x /
--						 (i ? h_subsample : 1) *
--						 fb->format->cpp[i];
-+			offsets[i] += src_y / (i ? v_subsample : 1) * fb->pitches[i];
-+			offsets[i] += src_x / (i ? h_subsample : 1) * fb->format->cpp[i];
- 		}
- 
- 		break;
-@@ -1004,19 +994,18 @@ static int vc4_plane_mode_set(struct drm
- 			   VC4_SET_FIELD(y_off, SCALER_PITCH0_TILE_Y_OFFSET) |
- 			   VC4_SET_FIELD(tiles_l, SCALER_PITCH0_TILE_WIDTH_L) |
- 			   VC4_SET_FIELD(tiles_r, SCALER_PITCH0_TILE_WIDTH_R));
--		vc4_state->offsets[0] += tiles_t * (tiles_w << tile_size_shift);
--		vc4_state->offsets[0] += subtile_y << 8;
--		vc4_state->offsets[0] += utile_y << 4;
-+		offsets[0] += tiles_t * (tiles_w << tile_size_shift);
-+		offsets[0] += subtile_y << 8;
-+		offsets[0] += utile_y << 4;
- 
- 		/* Rows of tiles alternate left-to-right and right-to-left. */
- 		if (tiles_t & 1) {
- 			pitch0 |= SCALER_PITCH0_TILE_INITIAL_LINE_DIR;
--			vc4_state->offsets[0] += (tiles_w - tiles_l) <<
--						 tile_size_shift;
--			vc4_state->offsets[0] -= (1 + !tile_y) << 10;
-+			offsets[0] += (tiles_w - tiles_l) << tile_size_shift;
-+			offsets[0] -= (1 + !tile_y) << 10;
- 		} else {
--			vc4_state->offsets[0] += tiles_l << tile_size_shift;
--			vc4_state->offsets[0] += tile_y << 10;
-+			offsets[0] += tiles_l << tile_size_shift;
-+			offsets[0] += tile_y << 10;
- 		}
- 
- 		break;
-@@ -1105,11 +1094,9 @@ static int vc4_plane_mode_set(struct drm
- 
- 			tile = src_x / pix_per_tile;
- 
--			vc4_state->offsets[i] += param * tile_w * tile;
--			vc4_state->offsets[i] += src_y /
--						 (i ? v_subsample : 1) *
--						 tile_w;
--			vc4_state->offsets[i] += x_off & ~(i ? 1 : 0);
-+			offsets[i] += param * tile_w * tile;
-+			offsets[i] += src_y / (i ? v_subsample : 1) * tile_w;
-+			offsets[i] += x_off & ~(i ? 1 : 0);
- 		}
- 
- 		pitch0 = VC4_SET_FIELD(param, SCALER_TILE_HEIGHT);
-@@ -1253,8 +1240,12 @@ static int vc4_plane_mode_set(struct drm
- 	 * The pointers may be any byte address.
- 	 */
- 	vc4_state->ptr0_offset[0] = vc4_state->dlist_count;
--	for (i = 0; i < num_planes; i++)
--		vc4_dlist_write(vc4_state, vc4_state->offsets[i]);
-+
-+	for (i = 0; i < num_planes; i++) {
-+		dma_addr_t paddr = drm_fb_dma_get_gem_addr(fb, state, i);
-+
-+		vc4_dlist_write(vc4_state, paddr + offsets[i]);
-+	}
- 
- 	/* Pointer Context Word 0/1/2: Written by the HVS */
- 	for (i = 0; i < num_planes; i++)
-@@ -1518,8 +1509,6 @@ static void vc4_plane_atomic_async_updat
- 	       sizeof(vc4_state->y_scaling));
- 	vc4_state->is_unity = new_vc4_state->is_unity;
- 	vc4_state->is_yuv = new_vc4_state->is_yuv;
--	memcpy(vc4_state->offsets, new_vc4_state->offsets,
--	       sizeof(vc4_state->offsets));
- 	vc4_state->needs_bg_fill = new_vc4_state->needs_bg_fill;
- 
- 	/* Update the current vc4_state pos0, pos2 and ptr0 dlist entries. */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0952-drm-vc4-Fix-dlist-debug-not-resetting-the-next-entry.patch b/target/linux/bcm27xx/patches-6.1/950-0952-drm-vc4-Fix-dlist-debug-not-resetting-the-next-entry.patch
deleted file mode 100644
index 01ad932415..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0952-drm-vc4-Fix-dlist-debug-not-resetting-the-next-entry.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 3660abb4a8523e988f1345985e89149804e50ebe Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 24 Aug 2023 15:36:21 +0100
-Subject: [PATCH] drm/vc4: Fix dlist debug not resetting the next entry pointer
-
-The debug function to display the dlists didn't reset next_entry_start
-when starting each display, so resulting in not stopping the
-list at the correct place.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_hvs.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -110,7 +110,7 @@ static int vc4_hvs_debugfs_dlist(struct
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 	struct vc4_hvs *hvs = vc4->hvs;
- 	struct drm_printer p = drm_seq_file_printer(m);
--	unsigned int next_entry_start = 0;
-+	unsigned int next_entry_start;
- 	unsigned int i, j;
- 	u32 dlist_word, dispstat;
- 
-@@ -124,6 +124,7 @@ static int vc4_hvs_debugfs_dlist(struct
- 		}
- 
- 		drm_printf(&p, "HVS chan %u:\n", i);
-+		next_entry_start = 0;
- 
- 		for (j = HVS_READ(SCALER_DISPLISTX(i)); j < 256; j++) {
- 			dlist_word = readl((u32 __iomem *)vc4->hvs->dlist + j);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0953-drm-vc4-Remove-incorrect-limit-from-hvs_dlist-debugf.patch b/target/linux/bcm27xx/patches-6.1/950-0953-drm-vc4-Remove-incorrect-limit-from-hvs_dlist-debugf.patch
deleted file mode 100644
index d41d53ecbe..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0953-drm-vc4-Remove-incorrect-limit-from-hvs_dlist-debugf.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From ebf11a4cfd9f1236fb9eeb7e32e87b18f5f56f16 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 1 Sep 2023 13:45:08 +0100
-Subject: [PATCH] drm: vc4: Remove incorrect limit from hvs_dlist debugfs
- function
-
-The debugfs function to dump dlists aborted at 256 bytes,
-when actually the dlist memory is generally significantly
-larger but varies based on SoC.
-
-We already have the correct limit in __vc4_hvs_alloc, so
-store it for use in the debugfs dlist function.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_drv.h | 1 +
- drivers/gpu/drm/vc4/vc4_hvs.c | 5 ++++-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -341,6 +341,7 @@ struct vc4_hvs {
- 	struct platform_device *pdev;
- 	void __iomem *regs;
- 	u32 __iomem *dlist;
-+	unsigned int dlist_mem_size;
- 
- 	struct clk *core_clk;
- 
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -110,6 +110,7 @@ static int vc4_hvs_debugfs_dlist(struct
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 	struct vc4_hvs *hvs = vc4->hvs;
- 	struct drm_printer p = drm_seq_file_printer(m);
-+	unsigned int dlist_mem_size = hvs->dlist_mem_size;
- 	unsigned int next_entry_start;
- 	unsigned int i, j;
- 	u32 dlist_word, dispstat;
-@@ -126,7 +127,7 @@ static int vc4_hvs_debugfs_dlist(struct
- 		drm_printf(&p, "HVS chan %u:\n", i);
- 		next_entry_start = 0;
- 
--		for (j = HVS_READ(SCALER_DISPLISTX(i)); j < 256; j++) {
-+		for (j = HVS_READ(SCALER_DISPLISTX(i)); j < dlist_mem_size; j++) {
- 			dlist_word = readl((u32 __iomem *)vc4->hvs->dlist + j);
- 			drm_printf(&p, "dlist: %02d: 0x%08x\n", j,
- 				   dlist_word);
-@@ -1278,6 +1279,8 @@ struct vc4_hvs *__vc4_hvs_alloc(struct v
- 		    HVS_BOOTLOADER_DLIST_END,
- 		    (SCALER_DLIST_SIZE >> 2) - HVS_BOOTLOADER_DLIST_END);
- 
-+	hvs->dlist_mem_size = dlist_size;
-+
- 	/* Set up the HVS LBM memory manager.  We could have some more
- 	 * complicated data structure that allowed reuse of LBM areas
- 	 * between planes when they don't overlap on the screen, but
diff --git a/target/linux/bcm27xx/patches-6.1/950-0954-drm-vc4-hvs-Remove-ABORT_ON_EMPTY-flag.patch b/target/linux/bcm27xx/patches-6.1/950-0954-drm-vc4-hvs-Remove-ABORT_ON_EMPTY-flag.patch
deleted file mode 100644
index 640b0ea757..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0954-drm-vc4-hvs-Remove-ABORT_ON_EMPTY-flag.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 712bccec241e84e28ccb725fae87d3255d039f42 Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Thu, 22 Jun 2023 14:06:40 +0100
-Subject: [PATCH] drm/vc4: hvs: Remove ABORT_ON_EMPTY flag
-
-ABORT_ON_EMPTY chooses whether the HVS abandons the current frame
-when it experiences an underflow, or attempts to continue.
-
-In theory the frame should be black from the point of underflow,
-compared to a shift of sebsequent pixels to the left.
-
-Unfortunately it seems to put the HVS is a bad state where it is not
-possible to recover simply. This typically requires a reboot
-following the 'flip done timed out message'.
-
-Discussion with Broadcom has suggested we don't use this flag.
-All their testing is done with it disabled.
-
-Additionally setting BLANK_INSERT_EN causes the HDMI to output
-blank pixels on an underflow which avoids it losing sync.
-
-After this change a 'flip done timed out' due to sdram bandwidth
-starvation or too low a clock is recoverable once the situation improves.
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/gpu/drm/vc4/vc4_hdmi.c | 1 +
- drivers/gpu/drm/vc4/vc4_regs.h | 1 +
- 2 files changed, 2 insertions(+)
-
---- a/drivers/gpu/drm/vc4/vc4_hdmi.c
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -1866,6 +1866,7 @@ static void vc4_hdmi_encoder_post_crtc_e
- 		   VC4_HD_VID_CTL_CLRRGB |
- 		   VC4_HD_VID_CTL_UNDERFLOW_ENABLE |
- 		   VC4_HD_VID_CTL_FRAME_COUNTER_RESET |
-+		   VC4_HD_VID_CTL_BLANK_INSERT_EN |
- 		   (vsync_pos ? 0 : VC4_HD_VID_CTL_VSYNC_LOW) |
- 		   (hsync_pos ? 0 : VC4_HD_VID_CTL_HSYNC_LOW));
- 
---- a/drivers/gpu/drm/vc4/vc4_regs.h
-+++ b/drivers/gpu/drm/vc4/vc4_regs.h
-@@ -799,6 +799,7 @@ enum {
- # define VC4_HD_VID_CTL_CLRSYNC			BIT(24)
- # define VC4_HD_VID_CTL_CLRRGB			BIT(23)
- # define VC4_HD_VID_CTL_BLANKPIX		BIT(18)
-+# define VC4_HD_VID_CTL_BLANK_INSERT_EN		BIT(16)
- 
- # define VC4_HD_CSC_CTL_ORDER_MASK		VC4_MASK(7, 5)
- # define VC4_HD_CSC_CTL_ORDER_SHIFT		5
diff --git a/target/linux/bcm27xx/patches-6.1/950-0955-drm-vc4-Enable-SCALER_CONTROL-early-in-HVS-init.patch b/target/linux/bcm27xx/patches-6.1/950-0955-drm-vc4-Enable-SCALER_CONTROL-early-in-HVS-init.patch
deleted file mode 100644
index 3060c0201f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0955-drm-vc4-Enable-SCALER_CONTROL-early-in-HVS-init.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 542ba979b4fa1e07ff2ad2dabbdc12e92b80ed46 Mon Sep 17 00:00:00 2001
-From: Tim Gover <tim.gover@raspberrypi.com>
-Date: Thu, 13 Jul 2023 17:47:22 +0100
-Subject: [PATCH] drm/vc4: Enable SCALER_CONTROL early in HVS init
-
-Always enable SCALER_CONTROL before attempting other HVS
-operations. It's safe to write to some parts of the HVS but
-in general it's dangerous to do this because it can cause bus
-lockups.
-
-Signed-off-by: Tim Gover <tim.gover@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_hvs.c | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -1303,6 +1303,10 @@ static int vc4_hvs_hw_init(struct vc4_hv
- 	struct vc4_dev *vc4 = hvs->vc4;
- 	u32 dispctrl, reg;
- 
-+	dispctrl = HVS_READ(SCALER_DISPCTRL);
-+	dispctrl |= SCALER_DISPCTRL_ENABLE;
-+	HVS_WRITE(SCALER_DISPCTRL, dispctrl);
-+
- 	reg = HVS_READ(SCALER_DISPECTRL);
- 	reg &= ~SCALER_DISPECTRL_DSP2_MUX_MASK;
- 	HVS_WRITE(SCALER_DISPECTRL,
-@@ -1324,8 +1328,6 @@ static int vc4_hvs_hw_init(struct vc4_hv
- 		  reg | VC4_SET_FIELD(3, SCALER_DISPDITHER_DSP5_MUX));
- 
- 	dispctrl = HVS_READ(SCALER_DISPCTRL);
--
--	dispctrl |= SCALER_DISPCTRL_ENABLE;
- 	dispctrl |= SCALER_DISPCTRL_DISPEIRQ(0) |
- 		    SCALER_DISPCTRL_DISPEIRQ(1) |
- 		    SCALER_DISPCTRL_DISPEIRQ(2);
-@@ -1521,6 +1523,10 @@ static int vc4_hvs_bind(struct device *d
- 	else
- 		hvs->dlist = hvs->regs + SCALER5_DLIST_START;
- 
-+	ret = vc4_hvs_hw_init(hvs);
-+	if (ret)
-+		return ret;
-+
- 	/* Upload filter kernels.  We only have the one for now, so we
- 	 * keep it around for the lifetime of the driver.
- 	 */
-@@ -1530,10 +1536,6 @@ static int vc4_hvs_bind(struct device *d
- 	if (ret)
- 		return ret;
- 
--	ret = vc4_hvs_hw_init(hvs);
--	if (ret)
--		return ret;
--
- 	ret = vc4_hvs_cob_init(hvs);
- 	if (ret)
- 		return ret;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0956-dt-bindings-display-Add-BCM2712-HDMI-bindings.patch b/target/linux/bcm27xx/patches-6.1/950-0956-dt-bindings-display-Add-BCM2712-HDMI-bindings.patch
deleted file mode 100644
index dab1fff2e3..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0956-dt-bindings-display-Add-BCM2712-HDMI-bindings.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From aed3dadaa6fb4c38275b264ecc0ff5ebe0408b82 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 17 Feb 2023 13:36:02 +0100
-Subject: [PATCH] dt-bindings: display: Add BCM2712 HDMI bindings
-
-The BCM2712 HDMI controller uses a slightly different HDMI controller
-than the BCM2711, and a completely different PHY.
-
-Let's introduce a new compatible for it.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- .../devicetree/bindings/display/brcm,bcm2711-hdmi.yaml          | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/Documentation/devicetree/bindings/display/brcm,bcm2711-hdmi.yaml
-+++ b/Documentation/devicetree/bindings/display/brcm,bcm2711-hdmi.yaml
-@@ -14,6 +14,8 @@ properties:
-     enum:
-       - brcm,bcm2711-hdmi0
-       - brcm,bcm2711-hdmi1
-+      - brcm,bcm2712-hdmi0
-+      - brcm,bcm2712-hdmi1
- 
-   reg:
-     items:
diff --git a/target/linux/bcm27xx/patches-6.1/950-0957-dt-bindings-display-Add-BCM2712-HVS-bindings.patch b/target/linux/bcm27xx/patches-6.1/950-0957-dt-bindings-display-Add-BCM2712-HVS-bindings.patch
deleted file mode 100644
index e28100734f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0957-dt-bindings-display-Add-BCM2712-HVS-bindings.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2f5a75f9687553d6e91fcc09b233f5f6176b3681 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 17 Feb 2023 13:36:14 +0100
-Subject: [PATCH] dt-bindings: display: Add BCM2712 HVS bindings
-
-The BCM2712 has a completely different HVS than the previous
-generations, so let's add a new compatible for it.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- .../devicetree/bindings/display/brcm,bcm2835-hvs.yaml        | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
---- a/Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml
-+++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml
-@@ -13,6 +13,7 @@ properties:
-   compatible:
-     enum:
-       - brcm,bcm2711-hvs
-+      - brcm,bcm2712-hvs
-       - brcm,bcm2835-hvs
- 
-   reg:
-@@ -36,7 +37,9 @@ if:
-   properties:
-     compatible:
-       contains:
--        const: brcm,bcm2711-hvs
-+        enum:
-+          - brcm,bcm2711-hvs
-+          - brcm,bcm2712-hvs
- 
- then:
-   required:
diff --git a/target/linux/bcm27xx/patches-6.1/950-0958-dt-bindings-display-Add-BCM2712-PixelValve-bindings.patch b/target/linux/bcm27xx/patches-6.1/950-0958-dt-bindings-display-Add-BCM2712-PixelValve-bindings.patch
deleted file mode 100644
index b37c1274ae..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0958-dt-bindings-display-Add-BCM2712-PixelValve-bindings.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 9f26d5827745df2c59e5559fd59a5045a4ad7ce0 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 17 Feb 2023 13:36:27 +0100
-Subject: [PATCH] dt-bindings: display: Add BCM2712 PixelValve bindings
-
-The BCM2712 has 3 different pixelvalves that are similar to the ones
-found in the previous generations but with slightly different
-capabilities.
-
-Express that using a new set of compatibles.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- .../devicetree/bindings/display/brcm,bcm2835-pixelvalve0.yaml  | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/Documentation/devicetree/bindings/display/brcm,bcm2835-pixelvalve0.yaml
-+++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-pixelvalve0.yaml
-@@ -20,6 +20,9 @@ properties:
-       - brcm,bcm2711-pixelvalve2
-       - brcm,bcm2711-pixelvalve3
-       - brcm,bcm2711-pixelvalve4
-+      - brcm,bcm2712-pixelvalve0
-+      - brcm,bcm2712-pixelvalve1
-+      - brcm,bcm2712-pixelvalve2
- 
-   reg:
-     maxItems: 1
diff --git a/target/linux/bcm27xx/patches-6.1/950-0959-dt-bindings-display-Add-BCM2712-MOP-bindings.patch b/target/linux/bcm27xx/patches-6.1/950-0959-dt-bindings-display-Add-BCM2712-MOP-bindings.patch
deleted file mode 100644
index ea537522cc..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0959-dt-bindings-display-Add-BCM2712-MOP-bindings.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 07f90ad6a81d9ed923ee0da05541718baf49fb3c Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 17 Feb 2023 13:36:36 +0100
-Subject: [PATCH] dt-bindings: display: Add BCM2712 MOP bindings
-
-The BCM2712 has a MOP controller which is basically a new revision of
-the TXP.
-
-Express that by adding a new compatible for it.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- .../devicetree/bindings/display/brcm,bcm2835-txp.yaml         | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/Documentation/devicetree/bindings/display/brcm,bcm2835-txp.yaml
-+++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-txp.yaml
-@@ -11,7 +11,9 @@ maintainers:
- 
- properties:
-   compatible:
--    const: brcm,bcm2835-txp
-+    enum:
-+      - brcm,bcm2712-mop
-+      - brcm,bcm2835-txp
- 
-   reg:
-     maxItems: 1
diff --git a/target/linux/bcm27xx/patches-6.1/950-0960-dt-bindings-display-Add-BCM2712-MOPLET-bindings.patch b/target/linux/bcm27xx/patches-6.1/950-0960-dt-bindings-display-Add-BCM2712-MOPLET-bindings.patch
deleted file mode 100644
index 97aaf5bb7a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0960-dt-bindings-display-Add-BCM2712-MOPLET-bindings.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e4a3722d08c723f1212bfbdcb52710de8340720a Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 17 Feb 2023 13:36:36 +0100
-Subject: [PATCH] dt-bindings: display: Add BCM2712 MOPLET bindings
-
-The BCM2712 has a MOPLET controller which is basically a TXP without the
-transpose feature.
-
-Express that by adding a new compatible for it.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- Documentation/devicetree/bindings/display/brcm,bcm2835-txp.yaml | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/Documentation/devicetree/bindings/display/brcm,bcm2835-txp.yaml
-+++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-txp.yaml
-@@ -13,6 +13,7 @@ properties:
-   compatible:
-     enum:
-       - brcm,bcm2712-mop
-+      - brcm,bcm2712-moplet
-       - brcm,bcm2835-txp
- 
-   reg:
diff --git a/target/linux/bcm27xx/patches-6.1/950-0961-dt-bindings-display-Add-BCM2712-KMS-driver-bindings.patch b/target/linux/bcm27xx/patches-6.1/950-0961-dt-bindings-display-Add-BCM2712-KMS-driver-bindings.patch
deleted file mode 100644
index 420c66ce66..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0961-dt-bindings-display-Add-BCM2712-KMS-driver-bindings.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From e66d4b49a027257c347fa57ce6972f08747c0917 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 17 Feb 2023 13:36:51 +0100
-Subject: [PATCH] dt-bindings: display: Add BCM2712 KMS driver bindings
-
-The BCM2712 SoC comes with a new variation of the videocore display
-pipeline. Let's create a new compatible for it.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- Documentation/devicetree/bindings/display/brcm,bcm2835-vc4.yaml | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/Documentation/devicetree/bindings/display/brcm,bcm2835-vc4.yaml
-+++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-vc4.yaml
-@@ -18,6 +18,7 @@ properties:
-   compatible:
-     enum:
-       - brcm,bcm2711-vc5
-+      - brcm,bcm2712-vc6
-       - brcm,bcm2835-vc4
-       - brcm,cygnus-vc4
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0962-drm-vc4-drv-Support-BCM2712.patch b/target/linux/bcm27xx/patches-6.1/950-0962-drm-vc4-drv-Support-BCM2712.patch
deleted file mode 100644
index 57a797ce18..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0962-drm-vc4-drv-Support-BCM2712.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 847ec495822ad512dd9f1a58a85dabea01534855 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 17 Feb 2023 15:29:52 +0100
-Subject: [PATCH] drm/vc4: drv: Support BCM2712
-
-The BCM2712 has an improved display pipeline, most notably with a
-different HVS and only HDMI and writeback outputs.
-
-Let's introduce it as a new VideoCore generation and compatible.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_drv.c | 5 ++++-
- drivers/gpu/drm/vc4/vc4_drv.h | 1 +
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/vc4/vc4_drv.c
-+++ b/drivers/gpu/drm/vc4/vc4_drv.c
-@@ -310,7 +310,9 @@ static int vc4_drm_bind(struct device *d
- 
- 	dev->coherent_dma_mask = DMA_BIT_MASK(32);
- 
--	if (of_device_is_compatible(dev->of_node, "brcm,bcm2711-vc5"))
-+	if (of_device_is_compatible(dev->of_node, "brcm,bcm2712-vc6"))
-+		gen = VC4_GEN_6;
-+	else if (of_device_is_compatible(dev->of_node, "brcm,bcm2711-vc5"))
- 		gen = VC4_GEN_5;
- 	else
- 		gen = VC4_GEN_4;
-@@ -475,6 +477,7 @@ static int vc4_platform_drm_remove(struc
- 
- static const struct of_device_id vc4_of_match[] = {
- 	{ .compatible = "brcm,bcm2711-vc5", },
-+	{ .compatible = "brcm,bcm2712-vc6", },
- 	{ .compatible = "brcm,bcm2835-vc4", },
- 	{ .compatible = "brcm,cygnus-vc4", },
- 	{},
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -84,6 +84,7 @@ struct vc4_perfmon {
- enum vc4_gen {
- 	VC4_GEN_4,
- 	VC4_GEN_5,
-+	VC4_GEN_6,
- };
- 
- struct vc4_dev {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0963-drm-vc4-hvs-Support-BCM2712-HVS.patch b/target/linux/bcm27xx/patches-6.1/950-0963-drm-vc4-hvs-Support-BCM2712-HVS.patch
deleted file mode 100644
index 5cbc304615..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0963-drm-vc4-hvs-Support-BCM2712-HVS.patch
+++ /dev/null
@@ -1,2139 +0,0 @@
-From e84da235223d0209165183c430692dde5c69854c Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 17 Feb 2023 15:25:16 +0100
-Subject: [PATCH] drm/vc4: hvs: Support BCM2712 HVS
-
-The HVS found in the BCM2712, while having a similar role, is very
-different from the one found in the previous SoCs. Indeed, the register
-layout is fairly different, and the DLIST format is new as well.
-
-Let's introduce the needed functions to support the new HVS.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_crtc.c  |  47 ++-
- drivers/gpu/drm/vc4/vc4_drv.c   |   8 +-
- drivers/gpu/drm/vc4/vc4_drv.h   |  18 +
- drivers/gpu/drm/vc4/vc4_hvs.c   | 626 ++++++++++++++++++++++++++++---
- drivers/gpu/drm/vc4/vc4_kms.c   | 102 ++++-
- drivers/gpu/drm/vc4/vc4_plane.c | 641 +++++++++++++++++++++++++++++++-
- drivers/gpu/drm/vc4/vc4_regs.h  | 181 +++++++++
- 7 files changed, 1540 insertions(+), 83 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_crtc.c
-+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
-@@ -82,13 +82,22 @@ static unsigned int
- vc4_crtc_get_cob_allocation(struct vc4_dev *vc4, unsigned int channel)
- {
- 	struct vc4_hvs *hvs = vc4->hvs;
--	u32 dispbase = HVS_READ(SCALER_DISPBASEX(channel));
-+	u32 dispbase, top, base;
-+
- 	/* Top/base are supposed to be 4-pixel aligned, but the
- 	 * Raspberry Pi firmware fills the low bits (which are
- 	 * presumably ignored).
- 	 */
--	u32 top = VC4_GET_FIELD(dispbase, SCALER_DISPBASEX_TOP) & ~3;
--	u32 base = VC4_GET_FIELD(dispbase, SCALER_DISPBASEX_BASE) & ~3;
-+
-+	if (vc4->gen >= VC4_GEN_6) {
-+		dispbase = HVS_READ(SCALER6_DISPX_COB(channel));
-+		top = VC4_GET_FIELD(dispbase, SCALER6_DISPX_COB_TOP) & ~3;
-+		base = VC4_GET_FIELD(dispbase, SCALER6_DISPX_COB_BASE) & ~3;
-+	} else {
-+		dispbase = HVS_READ(SCALER_DISPBASEX(channel));
-+		top = VC4_GET_FIELD(dispbase, SCALER_DISPBASEX_TOP) & ~3;
-+		base = VC4_GET_FIELD(dispbase, SCALER_DISPBASEX_BASE) & ~3;
-+	}
- 
- 	return top - base + 4;
- }
-@@ -121,7 +130,10 @@ static bool vc4_crtc_get_scanout_positio
- 	 * Read vertical scanline which is currently composed for our
- 	 * pixelvalve by the HVS, and also the scaler status.
- 	 */
--	val = HVS_READ(SCALER_DISPSTATX(channel));
-+	if (vc4->gen >= VC4_GEN_6)
-+		val = HVS_READ(SCALER6_DISPX_STATUS(channel));
-+	else
-+		val = HVS_READ(SCALER_DISPSTATX(channel));
- 
- 	/* Get optional system timestamp after query. */
- 	if (etime)
-@@ -130,7 +142,12 @@ static bool vc4_crtc_get_scanout_positio
- 	/* preempt_enable_rt() should go right here in PREEMPT_RT patchset. */
- 
- 	/* Vertical position of hvs composed scanline. */
--	*vpos = VC4_GET_FIELD(val, SCALER_DISPSTATX_LINE);
-+
-+	if (vc4->gen >= VC4_GEN_6)
-+		*vpos = VC4_GET_FIELD(val, SCALER6_DISPX_STATUS_YLINE);
-+	else
-+		*vpos = VC4_GET_FIELD(val, SCALER_DISPSTATX_LINE);
-+
- 	*hpos = 0;
- 
- 	if (mode->flags & DRM_MODE_FLAG_INTERLACE) {
-@@ -475,8 +492,10 @@ static void require_hvs_enabled(struct d
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 	struct vc4_hvs *hvs = vc4->hvs;
- 
--	WARN_ON_ONCE((HVS_READ(SCALER_DISPCTRL) & SCALER_DISPCTRL_ENABLE) !=
--		     SCALER_DISPCTRL_ENABLE);
-+	if (vc4->gen >= VC4_GEN_6)
-+		WARN_ON_ONCE(!(HVS_READ(SCALER6_CONTROL) & SCALER6_CONTROL_HVS_EN));
-+	else
-+		WARN_ON_ONCE(!(HVS_READ(SCALER_DISPCTRL) & SCALER_DISPCTRL_ENABLE));
- }
- 
- static int vc4_crtc_disable(struct drm_crtc *crtc,
-@@ -804,14 +823,21 @@ static void vc4_crtc_handle_page_flip(st
- 	struct drm_device *dev = crtc->dev;
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 	struct vc4_hvs *hvs = vc4->hvs;
-+	unsigned int current_dlist;
- 	u32 chan = vc4_crtc->current_hvs_channel;
- 	unsigned long flags;
- 
- 	spin_lock_irqsave(&dev->event_lock, flags);
- 	spin_lock(&vc4_crtc->irq_lock);
-+
-+	if (vc4->gen >= VC4_GEN_6)
-+		current_dlist = VC4_GET_FIELD(HVS_READ(SCALER6_DISPX_DL(chan)),
-+					      SCALER6_DISPX_DL_LACT);
-+	else
-+		current_dlist = HVS_READ(SCALER_DISPLACTX(chan));
-+
- 	if (vc4_crtc->event &&
--	    (vc4_crtc->current_dlist == HVS_READ(SCALER_DISPLACTX(chan)) ||
--	     vc4_crtc->feeds_txp)) {
-+	    (vc4_crtc->current_dlist == current_dlist || vc4_crtc->feeds_txp)) {
- 		drm_crtc_send_vblank_event(crtc, vc4_crtc->event);
- 		vc4_crtc->event = NULL;
- 		drm_crtc_vblank_put(crtc);
-@@ -822,7 +848,8 @@ static void vc4_crtc_handle_page_flip(st
- 		 * the CRTC and encoder already reconfigured, leading to
- 		 * underruns. This can be seen when reconfiguring the CRTC.
- 		 */
--		vc4_hvs_unmask_underrun(hvs, chan);
-+		if (vc4->gen < VC4_GEN_6)
-+			vc4_hvs_unmask_underrun(hvs, chan);
- 	}
- 	spin_unlock(&vc4_crtc->irq_lock);
- 	spin_unlock_irqrestore(&dev->event_lock, flags);
---- a/drivers/gpu/drm/vc4/vc4_drv.c
-+++ b/drivers/gpu/drm/vc4/vc4_drv.c
-@@ -277,6 +277,7 @@ static const struct of_device_id vc4_dma
- 	{ .compatible = "brcm,bcm2711-hvs" },
- 	{ .compatible = "brcm,bcm2835-hvs" },
- 	{ .compatible = "brcm,bcm2711-hvs" },
-+	{ .compatible = "brcm,bcm2712-hvs" },
- 	{ .compatible = "raspberrypi,rpi-firmware-kms" },
- 	{ .compatible = "brcm,bcm2835-v3d" },
- 	{ .compatible = "brcm,cygnus-v3d" },
-@@ -308,8 +309,6 @@ static int vc4_drm_bind(struct device *d
- 	enum vc4_gen gen;
- 	int ret = 0;
- 
--	dev->coherent_dma_mask = DMA_BIT_MASK(32);
--
- 	if (of_device_is_compatible(dev->of_node, "brcm,bcm2712-vc6"))
- 		gen = VC4_GEN_6;
- 	else if (of_device_is_compatible(dev->of_node, "brcm,bcm2711-vc5"))
-@@ -322,6 +321,11 @@ static int vc4_drm_bind(struct device *d
- 	else
- 		driver = &vc4_drm_driver;
- 
-+	if (gen >= VC4_GEN_6)
-+		dma_set_mask_and_coherent(dev, DMA_BIT_MASK(36));
-+	else
-+		dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
-+
- 	node = of_find_matching_node_and_match(NULL, vc4_dma_range_matches,
- 					       NULL);
- 	if (node) {
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -345,8 +345,10 @@ struct vc4_hvs {
- 	unsigned int dlist_mem_size;
- 
- 	struct clk *core_clk;
-+	struct clk *disp_clk;
- 
- 	struct {
-+		unsigned int desc;
- 		unsigned int enabled: 1;
- 	} eof_irq[HVS_NUM_CHANNELS];
- 
-@@ -358,6 +360,11 @@ struct vc4_hvs {
- 	struct drm_mm dlist_mm;
- 	/* Memory manager for the LBM memory used by HVS scaling. */
- 	struct drm_mm lbm_mm;
-+
-+	/* Memory manager for the UPM memory used for prefetching. */
-+	struct drm_mm upm_mm;
-+	struct ida upm_handles;
-+
- 	spinlock_t mm_lock;
- 
- 	struct list_head stale_dlist_entries;
-@@ -382,6 +389,8 @@ struct vc4_hvs {
- 	bool vc5_hdmi_enable_4096by2160;
- };
- 
-+#define HVS_UBM_WORD_SIZE 256
-+
- struct vc4_hvs_state {
- 	struct drm_private_state base;
- 	unsigned long core_clock_rate;
-@@ -456,6 +465,15 @@ struct vc4_plane_state {
- 	/* Our allocation in LBM for temporary storage during scaling. */
- 	struct drm_mm_node lbm;
- 
-+	/* Our allocation in UPM for prefetching. */
-+	struct drm_mm_node upm[DRM_FORMAT_MAX_PLANES];
-+
-+	/* The Unified Pre-Fetcher Handle */
-+	unsigned int upm_handle[DRM_FORMAT_MAX_PLANES];
-+
-+	/* Number of lines to pre-fetch */
-+	unsigned int upm_buffer_lines;
-+
- 	/* Set when the plane has per-pixel alpha content or does not cover
- 	 * the entire screen. This is a hint to the CRTC that it might need
- 	 * to enable background color fill.
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -67,6 +67,80 @@ static const struct debugfs_reg32 vc4_hv
- 	VC4_REG32(SCALER_OLEDCOEF2),
- };
- 
-+static const struct debugfs_reg32 vc6_hvs_regs[] = {
-+	VC4_REG32(SCALER6_VERSION),
-+	VC4_REG32(SCALER6_CXM_SIZE),
-+	VC4_REG32(SCALER6_LBM_SIZE),
-+	VC4_REG32(SCALER6_UBM_SIZE),
-+	VC4_REG32(SCALER6_COBA_SIZE),
-+	VC4_REG32(SCALER6_COB_SIZE),
-+	VC4_REG32(SCALER6_CONTROL),
-+	VC4_REG32(SCALER6_FETCHER_STATUS),
-+	VC4_REG32(SCALER6_FETCH_STATUS),
-+	VC4_REG32(SCALER6_HANDLE_ERROR),
-+	VC4_REG32(SCALER6_DISP0_CTRL0),
-+	VC4_REG32(SCALER6_DISP0_CTRL1),
-+	VC4_REG32(SCALER6_DISP0_BGND),
-+	VC4_REG32(SCALER6_DISP0_LPTRS),
-+	VC4_REG32(SCALER6_DISP0_COB),
-+	VC4_REG32(SCALER6_DISP0_STATUS),
-+	VC4_REG32(SCALER6_DISP0_DL),
-+	VC4_REG32(SCALER6_DISP0_RUN),
-+	VC4_REG32(SCALER6_DISP1_CTRL0),
-+	VC4_REG32(SCALER6_DISP1_CTRL1),
-+	VC4_REG32(SCALER6_DISP1_BGND),
-+	VC4_REG32(SCALER6_DISP1_LPTRS),
-+	VC4_REG32(SCALER6_DISP1_COB),
-+	VC4_REG32(SCALER6_DISP1_STATUS),
-+	VC4_REG32(SCALER6_DISP1_DL),
-+	VC4_REG32(SCALER6_DISP1_RUN),
-+	VC4_REG32(SCALER6_DISP2_CTRL0),
-+	VC4_REG32(SCALER6_DISP2_CTRL1),
-+	VC4_REG32(SCALER6_DISP2_BGND),
-+	VC4_REG32(SCALER6_DISP2_LPTRS),
-+	VC4_REG32(SCALER6_DISP2_COB),
-+	VC4_REG32(SCALER6_DISP2_STATUS),
-+	VC4_REG32(SCALER6_DISP2_DL),
-+	VC4_REG32(SCALER6_DISP2_RUN),
-+	VC4_REG32(SCALER6_EOLN),
-+	VC4_REG32(SCALER6_DL_STATUS),
-+	VC4_REG32(SCALER6_BFG_MISC),
-+	VC4_REG32(SCALER6_QOS0),
-+	VC4_REG32(SCALER6_PROF0),
-+	VC4_REG32(SCALER6_QOS1),
-+	VC4_REG32(SCALER6_PROF1),
-+	VC4_REG32(SCALER6_QOS2),
-+	VC4_REG32(SCALER6_PROF2),
-+	VC4_REG32(SCALER6_PRI_MAP0),
-+	VC4_REG32(SCALER6_PRI_MAP1),
-+	VC4_REG32(SCALER6_HISTCTRL),
-+	VC4_REG32(SCALER6_HISTBIN0),
-+	VC4_REG32(SCALER6_HISTBIN1),
-+	VC4_REG32(SCALER6_HISTBIN2),
-+	VC4_REG32(SCALER6_HISTBIN3),
-+	VC4_REG32(SCALER6_HISTBIN4),
-+	VC4_REG32(SCALER6_HISTBIN5),
-+	VC4_REG32(SCALER6_HISTBIN6),
-+	VC4_REG32(SCALER6_HISTBIN7),
-+	VC4_REG32(SCALER6_HDR_CFG_REMAP),
-+	VC4_REG32(SCALER6_COL_SPACE),
-+	VC4_REG32(SCALER6_HVS_ID),
-+	VC4_REG32(SCALER6_CFC1),
-+	VC4_REG32(SCALER6_DISP_UPM_ISO0),
-+	VC4_REG32(SCALER6_DISP_UPM_ISO1),
-+	VC4_REG32(SCALER6_DISP_UPM_ISO2),
-+	VC4_REG32(SCALER6_DISP_LBM_ISO0),
-+	VC4_REG32(SCALER6_DISP_LBM_ISO1),
-+	VC4_REG32(SCALER6_DISP_LBM_ISO2),
-+	VC4_REG32(SCALER6_DISP_COB_ISO0),
-+	VC4_REG32(SCALER6_DISP_COB_ISO1),
-+	VC4_REG32(SCALER6_DISP_COB_ISO2),
-+	VC4_REG32(SCALER6_BAD_COB),
-+	VC4_REG32(SCALER6_BAD_LBM),
-+	VC4_REG32(SCALER6_BAD_UPM),
-+	VC4_REG32(SCALER6_BAD_AXI),
-+};
-+
- void vc4_hvs_dump_state(struct vc4_hvs *hvs)
- {
- 	struct drm_device *drm = &hvs->vc4->base;
-@@ -145,6 +219,55 @@ static int vc4_hvs_debugfs_dlist(struct
- 	return 0;
- }
- 
-+static int vc6_hvs_debugfs_dlist(struct seq_file *m, void *data)
-+{
-+	struct drm_info_node *node = m->private;
-+	struct drm_device *dev = node->minor->dev;
-+	struct vc4_dev *vc4 = to_vc4_dev(dev);
-+	struct vc4_hvs *hvs = vc4->hvs;
-+	struct drm_printer p = drm_seq_file_printer(m);
-+	unsigned int dlist_mem_size = hvs->dlist_mem_size;
-+	unsigned int next_entry_start;
-+	unsigned int i;
-+
-+	for (i = 0; i < SCALER_CHANNELS_COUNT; i++) {
-+		unsigned int active_dlist, dispstat;
-+		unsigned int j;
-+
-+		dispstat = VC4_GET_FIELD(HVS_READ(SCALER6_DISPX_STATUS(i)),
-+					 SCALER6_DISPX_STATUS_MODE);
-+		if (dispstat == SCALER6_DISPX_STATUS_MODE_DISABLED ||
-+		    dispstat == SCALER6_DISPX_STATUS_MODE_EOF) {
-+			drm_printf(&p, "HVS chan %u disabled\n", i);
-+			continue;
-+		}
-+
-+		drm_printf(&p, "HVS chan %u:\n", i);
-+
-+		active_dlist = VC4_GET_FIELD(HVS_READ(SCALER6_DISPX_DL(i)),
-+					     SCALER6_DISPX_DL_LACT);
-+		next_entry_start = 0;
-+
-+		for (j = active_dlist; j < dlist_mem_size; j++) {
-+			u32 dlist_word;
-+
-+			dlist_word = readl((u32 __iomem *)vc4->hvs->dlist + j);
-+			drm_printf(&p, "dlist: %02d: 0x%08x\n", j,
-+				   dlist_word);
-+			if (!next_entry_start ||
-+			    next_entry_start == j) {
-+				if (dlist_word & SCALER_CTL0_END)
-+					break;
-+				next_entry_start = j +
-+					VC4_GET_FIELD(dlist_word,
-+						      SCALER_CTL0_SIZE);
-+			}
-+		}
-+	}
-+
-+	return 0;
-+}
-+
- static int vc5_hvs_debugfs_gamma(struct seq_file *m, void *data)
- {
- 	struct drm_info_node *node = m->private;
-@@ -435,6 +558,10 @@ static void vc4_hvs_irq_enable_eof(struc
- 			  SCALER5_DISPCTRL_DSPEIEOF(channel));
- 		break;
- 
-+	case VC4_GEN_6:
-+		enable_irq(hvs->eof_irq[channel].desc);
-+		break;
-+
- 	default:
- 		break;
- 	}
-@@ -463,6 +590,10 @@ static void vc4_hvs_irq_clear_eof(struct
- 			  ~SCALER5_DISPCTRL_DSPEIEOF(channel));
- 		break;
- 
-+	case VC4_GEN_6:
-+		disable_irq_nosync(hvs->eof_irq[channel].desc);
-+		break;
-+
- 	default:
- 		break;
- 	}
-@@ -622,26 +753,32 @@ static void vc4_hvs_dlist_free_work(stru
- 
- u8 vc4_hvs_get_fifo_frame_count(struct vc4_hvs *hvs, unsigned int fifo)
- {
--	struct drm_device *drm = &hvs->vc4->base;
-+	struct vc4_dev *vc4 = hvs->vc4;
-+	struct drm_device *drm = &vc4->base;
- 	u8 field = 0;
- 	int idx;
- 
- 	if (!drm_dev_enter(drm, &idx))
- 		return 0;
- 
--	switch (fifo) {
--	case 0:
--		field = VC4_GET_FIELD(HVS_READ(SCALER_DISPSTAT1),
--				      SCALER_DISPSTAT1_FRCNT0);
--		break;
--	case 1:
--		field = VC4_GET_FIELD(HVS_READ(SCALER_DISPSTAT1),
--				      SCALER_DISPSTAT1_FRCNT1);
--		break;
--	case 2:
--		field = VC4_GET_FIELD(HVS_READ(SCALER_DISPSTAT2),
--				      SCALER_DISPSTAT2_FRCNT2);
--		break;
-+	if (vc4->gen >= VC4_GEN_6) {
-+		field = VC4_GET_FIELD(HVS_READ(SCALER6_DISPX_STATUS(fifo)),
-+				      SCALER6_DISPX_STATUS_FRCNT);
-+	} else {
-+		switch (fifo) {
-+		case 0:
-+			field = VC4_GET_FIELD(HVS_READ(SCALER_DISPSTAT1),
-+					      SCALER_DISPSTAT1_FRCNT0);
-+			break;
-+		case 1:
-+			field = VC4_GET_FIELD(HVS_READ(SCALER_DISPSTAT1),
-+					      SCALER_DISPSTAT1_FRCNT1);
-+			break;
-+		case 2:
-+			field = VC4_GET_FIELD(HVS_READ(SCALER_DISPSTAT2),
-+					      SCALER_DISPSTAT2_FRCNT2);
-+			break;
-+		}
- 	}
- 
- 	drm_dev_exit(idx);
-@@ -708,6 +845,23 @@ int vc4_hvs_get_fifo_from_output(struct
- 		default:
- 			return -EPIPE;
- 		}
-+
-+	case VC4_GEN_6:
-+		switch (output) {
-+		case 0:
-+			return 0;
-+
-+		case 2:
-+			return 2;
-+
-+		case 1:
-+		case 3:
-+		case 4:
-+			return 1;
-+
-+		default:
-+			return -EPIPE;
-+		}
- 	}
- 
- 	return -EPIPE;
-@@ -782,7 +936,41 @@ static int vc4_hvs_init_channel(struct v
- 	return 0;
- }
- 
--void vc4_hvs_stop_channel(struct vc4_hvs *hvs, unsigned int chan)
-+static int vc6_hvs_init_channel(struct vc4_hvs *hvs, struct drm_crtc *crtc,
-+				struct drm_display_mode *mode, bool oneshot)
-+{
-+	struct vc4_dev *vc4 = hvs->vc4;
-+	struct drm_device *drm = &vc4->base;
-+	struct vc4_crtc_state *vc4_crtc_state = to_vc4_crtc_state(crtc->state);
-+	unsigned int chan = vc4_crtc_state->assigned_channel;
-+	bool interlace = mode->flags & DRM_MODE_FLAG_INTERLACE;
-+	u32 disp_ctrl1;
-+	int idx;
-+
-+	if (!drm_dev_enter(drm, &idx))
-+		return -ENODEV;
-+
-+	HVS_WRITE(SCALER6_DISPX_CTRL0(chan), SCALER6_DISPX_CTRL0_RESET);
-+
-+	disp_ctrl1 = HVS_READ(SCALER6_DISPX_CTRL1(chan));
-+	disp_ctrl1 &= ~SCALER6_DISPX_CTRL1_INTLACE;
-+	HVS_WRITE(SCALER6_DISPX_CTRL1(chan),
-+		  disp_ctrl1 | (interlace ? SCALER6_DISPX_CTRL1_INTLACE : 0));
-+
-+	HVS_WRITE(SCALER6_DISPX_CTRL0(chan),
-+		  SCALER6_DISPX_CTRL0_ENB |
-+		  VC4_SET_FIELD(mode->hdisplay - 1,
-+				SCALER6_DISPX_CTRL0_FWIDTH) |
-+		  (oneshot ? SCALER6_DISPX_CTRL0_ONESHOT : 0) |
-+		  VC4_SET_FIELD(mode->vdisplay - 1,
-+				SCALER6_DISPX_CTRL0_LINES));
-+
-+	drm_dev_exit(idx);
-+
-+	return 0;
-+}
-+
-+static void __vc4_hvs_stop_channel(struct vc4_hvs *hvs, unsigned int chan)
- {
- 	struct drm_device *drm = &hvs->vc4->base;
- 	int idx;
-@@ -813,6 +1001,42 @@ out:
- 	drm_dev_exit(idx);
- }
- 
-+static void __vc6_hvs_stop_channel(struct vc4_hvs *hvs, unsigned int chan)
-+{
-+	struct vc4_dev *vc4 = hvs->vc4;
-+	struct drm_device *drm = &vc4->base;
-+	int idx;
-+
-+	if (!drm_dev_enter(drm, &idx))
-+		return;
-+
-+	if (HVS_READ(SCALER6_DISPX_CTRL0(chan)) & SCALER6_DISPX_CTRL0_ENB)
-+		goto out;
-+
-+	HVS_WRITE(SCALER6_DISPX_CTRL0(chan),
-+		  HVS_READ(SCALER6_DISPX_CTRL0(chan)) | SCALER6_DISPX_CTRL0_RESET);
-+
-+	HVS_WRITE(SCALER6_DISPX_CTRL0(chan),
-+		  HVS_READ(SCALER6_DISPX_CTRL0(chan)) & ~SCALER6_DISPX_CTRL0_ENB);
-+
-+	WARN_ON_ONCE(VC4_GET_FIELD(HVS_READ(SCALER6_DISPX_STATUS(chan)),
-+				   SCALER6_DISPX_STATUS_MODE) !=
-+		     SCALER6_DISPX_STATUS_MODE_DISABLED);
-+
-+out:
-+	drm_dev_exit(idx);
-+}
-+
-+void vc4_hvs_stop_channel(struct vc4_hvs *hvs, unsigned int chan)
-+{
-+	struct vc4_dev *vc4 = hvs->vc4;
-+
-+	if (vc4->gen >= VC4_GEN_6)
-+		__vc6_hvs_stop_channel(hvs, chan);
-+	else
-+		__vc4_hvs_stop_channel(hvs, chan);
-+}
-+
- static int vc4_hvs_gamma_check(struct drm_crtc *crtc,
- 			       struct drm_atomic_state *state)
- {
-@@ -907,8 +1131,14 @@ static void vc4_hvs_install_dlist(struct
- 		return;
- 
- 	WARN_ON(!vc4_state->mm);
--	HVS_WRITE(SCALER_DISPLISTX(vc4_state->assigned_channel),
--		  vc4_state->mm->mm_node.start);
-+
-+	if (vc4->gen >= VC4_GEN_6)
-+		HVS_WRITE(SCALER6_DISPX_LPTRS(vc4_state->assigned_channel),
-+			  VC4_SET_FIELD(vc4_state->mm->mm_node.start,
-+					SCALER6_DISPX_LPTRS_HEADE));
-+	else
-+		HVS_WRITE(SCALER_DISPLISTX(vc4_state->assigned_channel),
-+			  vc4_state->mm->mm_node.start);
- 
- 	drm_dev_exit(idx);
- }
-@@ -965,7 +1195,11 @@ void vc4_hvs_atomic_enable(struct drm_cr
- 
- 	vc4_hvs_install_dlist(crtc);
- 	vc4_hvs_update_dlist(crtc);
--	vc4_hvs_init_channel(vc4->hvs, crtc, mode, oneshot);
-+
-+	if (vc4->gen >= VC4_GEN_6)
-+		vc6_hvs_init_channel(vc4->hvs, crtc, mode, oneshot);
-+	else
-+		vc4_hvs_init_channel(vc4->hvs, crtc, mode, oneshot);
- }
- 
- void vc4_hvs_atomic_disable(struct drm_crtc *crtc,
-@@ -1052,13 +1286,28 @@ void vc4_hvs_atomic_flush(struct drm_crt
- 	WARN_ON(!vc4_state->mm);
- 	WARN_ON_ONCE(dlist_next - dlist_start != vc4_state->mm->mm_node.size);
- 
--	if (enable_bg_fill)
-+	if (enable_bg_fill) {
- 		/* This sets a black background color fill, as is the case
- 		 * with other DRM drivers.
- 		 */
--		HVS_WRITE(SCALER_DISPBKGNDX(channel),
--			  HVS_READ(SCALER_DISPBKGNDX(channel)) |
--			  SCALER_DISPBKGND_FILL);
-+		if (vc4->gen >= VC4_GEN_6)
-+			HVS_WRITE(SCALER6_DISPX_CTRL1(channel),
-+				  HVS_READ(SCALER6_DISPX_CTRL1(channel)) |
-+				  SCALER6_DISPX_CTRL1_BGENB);
-+		else
-+			HVS_WRITE(SCALER_DISPBKGNDX(channel),
-+				  HVS_READ(SCALER_DISPBKGNDX(channel)) |
-+				  SCALER_DISPBKGND_FILL);
-+	} else {
-+		if (vc4->gen >= VC4_GEN_6)
-+			HVS_WRITE(SCALER6_DISPX_CTRL1(channel),
-+				  HVS_READ(SCALER6_DISPX_CTRL1(channel)) &
-+				  ~SCALER6_DISPX_CTRL1_BGENB);
-+		else
-+			HVS_WRITE(SCALER_DISPBKGNDX(channel),
-+				  HVS_READ(SCALER_DISPBKGNDX(channel)) &
-+				  ~SCALER_DISPBKGND_FILL);
-+	}
- 
- 	/* Only update DISPLIST if the CRTC was already running and is not
- 	 * being disabled.
-@@ -1210,6 +1459,27 @@ static irqreturn_t vc4_hvs_irq_handler(i
- 	return irqret;
- }
- 
-+static irqreturn_t vc6_hvs_eof_irq_handler(int irq, void *data)
-+{
-+	struct drm_device *dev = data;
-+	struct vc4_dev *vc4 = to_vc4_dev(dev);
-+	struct vc4_hvs *hvs = vc4->hvs;
-+	unsigned int i;
-+
-+	for (i = 0; i < HVS_NUM_CHANNELS; i++) {
-+		if (!hvs->eof_irq[i].enabled)
-+			continue;
-+
-+		if (hvs->eof_irq[i].desc != irq)
-+			continue;
-+
-+		vc4_hvs_schedule_dlist_sweep(hvs, i);
-+		return IRQ_HANDLED;
-+	}
-+
-+	return IRQ_NONE;
-+}
-+
- int vc4_hvs_debugfs_init(struct drm_minor *minor)
- {
- 	struct drm_device *drm = minor->dev;
-@@ -1232,8 +1502,10 @@ int vc4_hvs_debugfs_init(struct drm_mino
- 				     NULL);
- 	}
- 
--	ret = vc4_debugfs_add_file(minor, "hvs_dlists",
--				   vc4_hvs_debugfs_dlist, NULL);
-+	if (vc4->gen >= VC4_GEN_6)
-+		ret = vc4_debugfs_add_file(minor, "hvs_dlists", vc6_hvs_debugfs_dlist, NULL);
-+	else
-+		ret = vc4_debugfs_add_file(minor, "hvs_dlists", vc4_hvs_debugfs_dlist, NULL);
- 	if (ret)
- 		return ret;
- 
-@@ -1256,6 +1528,9 @@ struct vc4_hvs *__vc4_hvs_alloc(struct v
- {
- 	struct drm_device *drm = &vc4->base;
- 	struct vc4_hvs *hvs;
-+	unsigned int dlist_start;
-+	size_t dlist_size;
-+	size_t lbm_size;
- 
- 	hvs = drmm_kzalloc(drm, sizeof(*hvs), GFP_KERNEL);
- 	if (!hvs)
-@@ -1270,14 +1545,39 @@ struct vc4_hvs *__vc4_hvs_alloc(struct v
- 	INIT_LIST_HEAD(&hvs->stale_dlist_entries);
- 	INIT_WORK(&hvs->free_dlist_work, vc4_hvs_dlist_free_work);
- 
--	/* Set up the HVS display list memory manager.  We never
--	 * overwrite the setup from the bootloader (just 128b out of
--	 * our 16K), since we don't want to scramble the screen when
--	 * transitioning from the firmware's boot setup to runtime.
--	 */
--	drm_mm_init(&hvs->dlist_mm,
--		    HVS_BOOTLOADER_DLIST_END,
--		    (SCALER_DLIST_SIZE >> 2) - HVS_BOOTLOADER_DLIST_END);
-+	switch (vc4->gen) {
-+	case VC4_GEN_4:
-+	case VC4_GEN_5:
-+		/* Set up the HVS display list memory manager. We never
-+		 * overwrite the setup from the bootloader (just 128b
-+		 * out of our 16K), since we don't want to scramble the
-+		 * screen when transitioning from the firmware's boot
-+		 * setup to runtime.
-+		 */
-+		dlist_start = HVS_BOOTLOADER_DLIST_END;
-+		dlist_size = (SCALER_DLIST_SIZE >> 2) - HVS_BOOTLOADER_DLIST_END;
-+		break;
-+
-+	case VC4_GEN_6:
-+		dlist_start = HVS_BOOTLOADER_DLIST_END;
-+
-+		/*
-+		 * If we are running a test, it means that we can't
-+		 * access a register. Use a plausible size then.
-+		 */
-+		if (!kunit_get_current_test())
-+			dlist_size = HVS_READ(SCALER6_CXM_SIZE);
-+		else
-+			dlist_size = 4096;
-+
-+		break;
-+
-+	default:
-+		drm_err(drm, "Unknown VC4 generation: %d", vc4->gen);
-+		return ERR_PTR(-ENODEV);
-+	}
-+
-+	drm_mm_init(&hvs->dlist_mm, dlist_start, dlist_size);
- 
- 	hvs->dlist_mem_size = dlist_size;
- 
-@@ -1286,12 +1586,46 @@ struct vc4_hvs *__vc4_hvs_alloc(struct v
- 	 * between planes when they don't overlap on the screen, but
- 	 * for now we just allocate globally.
- 	 */
--	if (vc4->gen == VC4_GEN_4)
-+
-+	switch (vc4->gen) {
-+	case VC4_GEN_4:
- 		/* 48k words of 2x12-bit pixels */
--		drm_mm_init(&hvs->lbm_mm, 0, 48 * 1024);
--	else
-+		lbm_size = 48 * SZ_1K;
-+		break;
-+
-+	case VC4_GEN_5:
- 		/* 60k words of 4x12-bit pixels */
--		drm_mm_init(&hvs->lbm_mm, 0, 60 * 1024);
-+		lbm_size = 60 * SZ_1K;
-+		break;
-+
-+	case VC4_GEN_6:
-+		/*
-+		 * If we are running a test, it means that we can't
-+		 * access a register. Use a plausible size then.
-+		 */
-+		lbm_size = 1024;
-+		break;
-+
-+	default:
-+		drm_err(drm, "Unknown VC4 generation: %d", vc4->gen);
-+		return ERR_PTR(-ENODEV);
-+	}
-+
-+	drm_mm_init(&hvs->lbm_mm, 0, lbm_size);
-+
-+	if (vc4->gen >= VC4_GEN_6) {
-+		ida_init(&hvs->upm_handles);
-+
-+		/*
-+		 * NOTE: On BCM2712, the size can also be read through
-+		 * the SCALER_UBM_SIZE register. We would need to do a
-+		 * register access though, which we can't do with kunit
-+		 * that also uses this function to create its mock
-+		 * device.
-+		 */
-+		drm_mm_init(&hvs->upm_mm, 0, 1024 * HVS_UBM_WORD_SIZE);
-+	}
-+
- 
- 	vc4->hvs = hvs;
- 
-@@ -1388,10 +1722,124 @@ static int vc4_hvs_hw_init(struct vc4_hv
- 	return 0;
- }
- 
-+#define CFC1_N_NL_CSC_CTRL(x)		(0xa000 + ((x) * 0x3000))
-+#define CFC1_N_MA_CSC_COEFF_C00(x)	(0xa008 + ((x) * 0x3000))
-+#define CFC1_N_MA_CSC_COEFF_C01(x)	(0xa00c + ((x) * 0x3000))
-+#define CFC1_N_MA_CSC_COEFF_C02(x)	(0xa010 + ((x) * 0x3000))
-+#define CFC1_N_MA_CSC_COEFF_C03(x)	(0xa014 + ((x) * 0x3000))
-+#define CFC1_N_MA_CSC_COEFF_C04(x)	(0xa018 + ((x) * 0x3000))
-+#define CFC1_N_MA_CSC_COEFF_C10(x)	(0xa01c + ((x) * 0x3000))
-+#define CFC1_N_MA_CSC_COEFF_C11(x)	(0xa020 + ((x) * 0x3000))
-+#define CFC1_N_MA_CSC_COEFF_C12(x)	(0xa024 + ((x) * 0x3000))
-+#define CFC1_N_MA_CSC_COEFF_C13(x)	(0xa028 + ((x) * 0x3000))
-+#define CFC1_N_MA_CSC_COEFF_C14(x)	(0xa02c + ((x) * 0x3000))
-+#define CFC1_N_MA_CSC_COEFF_C20(x)	(0xa030 + ((x) * 0x3000))
-+#define CFC1_N_MA_CSC_COEFF_C21(x)	(0xa034 + ((x) * 0x3000))
-+#define CFC1_N_MA_CSC_COEFF_C22(x)	(0xa038 + ((x) * 0x3000))
-+#define CFC1_N_MA_CSC_COEFF_C23(x)	(0xa03c + ((x) * 0x3000))
-+#define CFC1_N_MA_CSC_COEFF_C24(x)	(0xa040 + ((x) * 0x3000))
-+
-+/* 4 S2.22 multiplication factors, and 1 S9.15 addititive element for each of 3
-+ * output components
-+ */
-+struct vc6_csc_coeff_entry {
-+	u32 csc[3][5];
-+};
-+
-+static const struct vc6_csc_coeff_entry csc_coeffs[2][3] = {
-+	[DRM_COLOR_YCBCR_LIMITED_RANGE] = {
-+		[DRM_COLOR_YCBCR_BT601] = {
-+			.csc = {
-+				{ 0x004A8542, 0x0, 0x0066254A, 0x0, 0xFF908A0D },
-+				{ 0x004A8542, 0xFFE6ED5D, 0xFFCBF856, 0x0, 0x0043C9A3 },
-+				{ 0x004A8542, 0x00811A54, 0x0, 0x0, 0xFF759502 }
-+			}
-+		},
-+		[DRM_COLOR_YCBCR_BT709] = {
-+			.csc = {
-+				{ 0x004A8542, 0x0, 0x0072BC44, 0x0, 0xFF83F312 },
-+				{ 0x004A8542, 0xFFF25A22, 0xFFDDE4D0, 0x0, 0x00267064 },
-+				{ 0x004A8542, 0x00873197, 0x0, 0x0, 0xFF6F7DC0 }
-+			}
-+		},
-+		[DRM_COLOR_YCBCR_BT2020] = {
-+			.csc = {
-+				{ 0x004A8542, 0x0, 0x006B4A17, 0x0, 0xFF8B653F },
-+				{ 0x004A8542, 0xFFF402D9, 0xFFDDE4D0, 0x0, 0x0024C7AE },
-+				{ 0x004A8542, 0x008912CC, 0x0, 0x0, 0xFF6D9C8B }
-+			}
-+		}
-+	},
-+	[DRM_COLOR_YCBCR_FULL_RANGE] = {
-+		[DRM_COLOR_YCBCR_BT601] = {
-+			.csc = {
-+				{ 0x00400000, 0x0, 0x0059BA5E, 0x0, 0xFFA645A1 },
-+				{ 0x00400000, 0xFFE9F9AC, 0xFFD24B97, 0x0, 0x0043BABB },
-+				{ 0x00400000, 0x00716872, 0x0, 0x0, 0xFF8E978D }
-+			}
-+		},
-+		[DRM_COLOR_YCBCR_BT709] = {
-+			.csc = {
-+				{ 0x00400000, 0x0, 0x0064C985, 0x0, 0xFF9B367A },
-+				{ 0x00400000, 0xFFF402E1, 0xFFE20A40, 0x0, 0x0029F2DE },
-+				{ 0x00400000, 0x0076C226, 0x0, 0x0, 0xFF893DD9 }
-+			}
-+		},
-+		[DRM_COLOR_YCBCR_BT2020] = {
-+			.csc = {
-+				{ 0x00400000, 0x0, 0x005E3F14, 0x0, 0xFFA1C0EB },
-+				{ 0x00400000, 0xFFF577F6, 0xFFDB580F, 0x0, 0x002F2FFA },
-+				{ 0x00400000, 0x007868DB, 0x0, 0x0, 0xFF879724 }
-+			}
-+		}
-+	}
-+};
-+
-+static int vc6_hvs_hw_init(struct vc4_hvs *hvs)
-+{
-+	const struct vc6_csc_coeff_entry *coeffs;
-+	unsigned int i;
-+
-+	HVS_WRITE(SCALER6_CONTROL,
-+		  SCALER6_CONTROL_HVS_EN |
-+		  VC4_SET_FIELD(8, SCALER6_CONTROL_PF_LINES) |
-+		  VC4_SET_FIELD(15, SCALER6_CONTROL_MAX_REQS));
-+
-+	/* Set HVS arbiter priority to max */
-+	HVS_WRITE(SCALER6_PRI_MAP0, 0xffffffff);
-+	HVS_WRITE(SCALER6_PRI_MAP1, 0xffffffff);
-+
-+	for (i = 0; i < 6; i++) {
-+		coeffs = &csc_coeffs[i / 3][i % 3];
-+
-+		HVS_WRITE(CFC1_N_MA_CSC_COEFF_C00(i), coeffs->csc[0][0]);
-+		HVS_WRITE(CFC1_N_MA_CSC_COEFF_C01(i), coeffs->csc[0][1]);
-+		HVS_WRITE(CFC1_N_MA_CSC_COEFF_C02(i), coeffs->csc[0][2]);
-+		HVS_WRITE(CFC1_N_MA_CSC_COEFF_C03(i), coeffs->csc[0][3]);
-+		HVS_WRITE(CFC1_N_MA_CSC_COEFF_C04(i), coeffs->csc[0][4]);
-+
-+		HVS_WRITE(CFC1_N_MA_CSC_COEFF_C10(i), coeffs->csc[1][0]);
-+		HVS_WRITE(CFC1_N_MA_CSC_COEFF_C11(i), coeffs->csc[1][1]);
-+		HVS_WRITE(CFC1_N_MA_CSC_COEFF_C12(i), coeffs->csc[1][2]);
-+		HVS_WRITE(CFC1_N_MA_CSC_COEFF_C13(i), coeffs->csc[1][3]);
-+		HVS_WRITE(CFC1_N_MA_CSC_COEFF_C14(i), coeffs->csc[1][4]);
-+
-+		HVS_WRITE(CFC1_N_MA_CSC_COEFF_C20(i), coeffs->csc[2][0]);
-+		HVS_WRITE(CFC1_N_MA_CSC_COEFF_C21(i), coeffs->csc[2][1]);
-+		HVS_WRITE(CFC1_N_MA_CSC_COEFF_C22(i), coeffs->csc[2][2]);
-+		HVS_WRITE(CFC1_N_MA_CSC_COEFF_C23(i), coeffs->csc[2][3]);
-+		HVS_WRITE(CFC1_N_MA_CSC_COEFF_C24(i), coeffs->csc[2][4]);
-+
-+		HVS_WRITE(CFC1_N_NL_CSC_CTRL(i), BIT(15));
-+	}
-+
-+	return 0;
-+}
-+
- static int vc4_hvs_cob_init(struct vc4_hvs *hvs)
- {
- 	struct vc4_dev *vc4 = hvs->vc4;
--	u32 reg, top;
-+	u32 reg, top, base;
- 
- 	/*
- 	 * Recompute Composite Output Buffer (COB) allocations for the
-@@ -1452,6 +1900,31 @@ static int vc4_hvs_cob_init(struct vc4_h
- 		HVS_WRITE(SCALER_DISPBASE0, reg);
- 		break;
- 
-+	case VC4_GEN_6:
-+		#define VC6_COB_LINE_WIDTH	3840
-+		#define VC6_COB_NUM_LINES	4
-+		reg = 0;
-+		top = 3840;
-+
-+		HVS_WRITE(SCALER6_DISP2_COB,
-+			  VC4_SET_FIELD(top, SCALER6_DISPX_COB_TOP) |
-+			  VC4_SET_FIELD(base, SCALER6_DISPX_COB_BASE));
-+
-+		base = top + 16;
-+		top += VC6_COB_LINE_WIDTH * VC6_COB_NUM_LINES;
-+
-+		HVS_WRITE(SCALER6_DISP1_COB,
-+			  VC4_SET_FIELD(top, SCALER6_DISPX_COB_TOP) |
-+			  VC4_SET_FIELD(base, SCALER6_DISPX_COB_BASE));
-+
-+		base = top + 16;
-+		top += VC6_COB_LINE_WIDTH * VC6_COB_NUM_LINES;
-+
-+		HVS_WRITE(SCALER6_DISP0_COB,
-+			  VC4_SET_FIELD(top, SCALER6_DISPX_COB_TOP) |
-+			  VC4_SET_FIELD(base, SCALER6_DISPX_COB_BASE));
-+		break;
-+
- 	default:
- 		return -EINVAL;
- 	}
-@@ -1477,10 +1950,16 @@ static int vc4_hvs_bind(struct device *d
- 		return PTR_ERR(hvs);
- 
- 	hvs->regset.base = hvs->regs;
--	hvs->regset.regs = vc4_hvs_regs;
--	hvs->regset.nregs = ARRAY_SIZE(vc4_hvs_regs);
- 
--	if (vc4->gen == VC4_GEN_5) {
-+	if (vc4->gen >= VC4_GEN_6) {
-+		hvs->regset.regs = vc6_hvs_regs;
-+		hvs->regset.nregs = ARRAY_SIZE(vc6_hvs_regs);
-+	} else {
-+		hvs->regset.regs = vc4_hvs_regs;
-+		hvs->regset.nregs = ARRAY_SIZE(vc4_hvs_regs);
-+	}
-+
-+	if (vc4->gen >= VC4_GEN_5) {
- 		struct rpi_firmware *firmware;
- 		struct device_node *node;
- 		unsigned int max_rate;
-@@ -1494,12 +1973,20 @@ static int vc4_hvs_bind(struct device *d
- 		if (!firmware)
- 			return -EPROBE_DEFER;
- 
--		hvs->core_clk = devm_clk_get(&pdev->dev, NULL);
-+		hvs->core_clk = devm_clk_get(&pdev->dev,
-+					     (vc4->gen >= VC4_GEN_6) ? "core" : NULL);
- 		if (IS_ERR(hvs->core_clk)) {
- 			dev_err(&pdev->dev, "Couldn't get core clock\n");
- 			return PTR_ERR(hvs->core_clk);
- 		}
- 
-+		hvs->disp_clk = devm_clk_get(&pdev->dev,
-+					     (vc4->gen >= VC4_GEN_6) ? "disp" : NULL);
-+		if (IS_ERR(hvs->disp_clk)) {
-+			dev_err(&pdev->dev, "Couldn't get disp clock\n");
-+			return PTR_ERR(hvs->disp_clk);
-+		}
-+
- 		max_rate = rpi_firmware_clk_get_max_rate(firmware,
- 							 RPI_FIRMWARE_CORE_CLK_ID);
- 		rpi_firmware_put(firmware);
-@@ -1516,14 +2003,51 @@ static int vc4_hvs_bind(struct device *d
- 			dev_err(&pdev->dev, "Couldn't enable the core clock\n");
- 			return ret;
- 		}
-+
-+		ret = clk_prepare_enable(hvs->disp_clk);
-+		if (ret) {
-+			dev_err(&pdev->dev, "Couldn't enable the disp clock\n");
-+			return ret;
-+		}
- 	}
- 
--	if (vc4->gen == VC4_GEN_4)
--		hvs->dlist = hvs->regs + SCALER_DLIST_START;
--	else
-+	if (vc4->gen >= VC4_GEN_6) {
-+		unsigned int i;
-+
-+		for (i = 0; i < HVS_NUM_CHANNELS; i++) {
-+			char irq_name[16];
-+			int irq;
-+
-+			snprintf(irq_name, sizeof(irq_name), "ch%u-eof", i);
-+
-+			irq = platform_get_irq_byname(pdev, irq_name);
-+			if (irq < 0) {
-+				dev_err(&pdev->dev,
-+					"Couldn't get %s interrupt: %d\n",
-+					irq_name, irq);
-+				return irq;
-+			}
-+
-+			ret = devm_request_irq(&pdev->dev,
-+					       irq,
-+					       vc6_hvs_eof_irq_handler,
-+					       IRQF_NO_AUTOEN,
-+					       dev_name(&pdev->dev),
-+					       drm);
-+
-+			hvs->eof_irq[i].desc = irq;
-+		}
-+	}
-+
-+	if (vc4->gen >= VC4_GEN_5)
- 		hvs->dlist = hvs->regs + SCALER5_DLIST_START;
-+	else
-+		hvs->dlist = hvs->regs + SCALER_DLIST_START;
- 
--	ret = vc4_hvs_hw_init(hvs);
-+	if (vc4->gen >= VC4_GEN_6)
-+		ret = vc6_hvs_hw_init(hvs);
-+	else
-+		ret = vc4_hvs_hw_init(hvs);
- 	if (ret)
- 		return ret;
- 
-@@ -1540,10 +2064,12 @@ static int vc4_hvs_bind(struct device *d
- 	if (ret)
- 		return ret;
- 
--	ret = devm_request_irq(dev, platform_get_irq(pdev, 0),
--			       vc4_hvs_irq_handler, 0, "vc4 hvs", drm);
--	if (ret)
--		return ret;
-+	if (vc4->gen < VC4_GEN_6) {
-+		ret = devm_request_irq(dev, platform_get_irq(pdev, 0),
-+				       vc4_hvs_irq_handler, 0, "vc4 hvs", drm);
-+		if (ret)
-+			return ret;
-+	}
- 
- 	return 0;
- }
-@@ -1568,6 +2094,7 @@ static void vc4_hvs_unbind(struct device
- 		drm_mm_remove_node(node);
- 	drm_mm_takedown(&vc4->hvs->lbm_mm);
- 
-+	clk_disable_unprepare(hvs->disp_clk);
- 	clk_disable_unprepare(hvs->core_clk);
- 
- 	vc4->hvs = NULL;
-@@ -1591,6 +2118,7 @@ static int vc4_hvs_dev_remove(struct pla
- 
- static const struct of_device_id vc4_hvs_dt_match[] = {
- 	{ .compatible = "brcm,bcm2711-hvs" },
-+	{ .compatible = "brcm,bcm2712-hvs" },
- 	{ .compatible = "brcm,bcm2835-hvs" },
- 	{}
- };
---- a/drivers/gpu/drm/vc4/vc4_kms.c
-+++ b/drivers/gpu/drm/vc4/vc4_kms.c
-@@ -329,17 +329,59 @@ static void vc5_hvs_pv_muxing_commit(str
- 	}
- }
- 
-+static void vc6_hvs_pv_muxing_commit(struct vc4_dev *vc4,
-+				     struct drm_atomic_state *state)
-+{
-+	struct vc4_hvs *hvs = vc4->hvs;
-+	struct drm_crtc_state *crtc_state;
-+	struct drm_crtc *crtc;
-+	unsigned int i;
-+
-+	WARN_ON_ONCE(vc4->gen != VC4_GEN_6);
-+
-+	for_each_new_crtc_in_state(state, crtc, crtc_state, i) {
-+		struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc_state);
-+		struct vc4_encoder *vc4_encoder;
-+		struct drm_encoder *encoder;
-+		unsigned char mux;
-+		u32 reg;
-+
-+		if (!vc4_state->update_muxing)
-+			continue;
-+
-+		if (vc4_state->assigned_channel != 1)
-+			continue;
-+
-+		encoder = vc4_get_crtc_encoder(crtc, crtc_state);
-+		vc4_encoder = to_vc4_encoder(encoder);
-+		switch (vc4_encoder->type) {
-+		case VC4_ENCODER_TYPE_HDMI1:
-+			mux = 0;
-+			break;
-+
-+		case VC4_ENCODER_TYPE_TXP:
-+			mux = 2;
-+			break;
-+
-+		default:
-+			break;
-+		}
-+
-+		reg = HVS_READ(SCALER6_CONTROL);
-+		HVS_WRITE(SCALER6_CONTROL,
-+			  (reg & ~SCALER6_CONTROL_DSP1_TARGET_MASK) |
-+			  VC4_SET_FIELD(mux, SCALER6_CONTROL_DSP1_TARGET));
-+	}
-+}
-+
- static void vc4_atomic_commit_tail(struct drm_atomic_state *state)
- {
- 	struct drm_device *dev = state->dev;
- 	struct vc4_dev *vc4 = to_vc4_dev(dev);
- 	struct vc4_hvs *hvs = vc4->hvs;
--	struct drm_crtc_state *new_crtc_state;
- 	struct vc4_hvs_state *new_hvs_state;
--	struct drm_crtc *crtc;
- 	struct vc4_hvs_state *old_hvs_state;
- 	unsigned int channel;
--	int i;
- 
- 	old_hvs_state = vc4_hvs_get_old_global_state(state);
- 	if (WARN_ON(IS_ERR(old_hvs_state)))
-@@ -349,14 +391,23 @@ static void vc4_atomic_commit_tail(struc
- 	if (WARN_ON(IS_ERR(new_hvs_state)))
- 		return;
- 
--	for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) {
--		struct vc4_crtc_state *vc4_crtc_state;
-+	if (vc4->gen < VC4_GEN_6) {
-+		struct drm_crtc_state *new_crtc_state;
-+		struct drm_crtc *crtc;
-+		int i;
-+
-+		for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) {
-+			struct vc4_crtc_state *vc4_crtc_state;
- 
--		if (!new_crtc_state->commit || vc4->firmware_kms)
--			continue;
-+			if (vc4->firmware_kms)
-+				continue;
- 
--		vc4_crtc_state = to_vc4_crtc_state(new_crtc_state);
--		vc4_hvs_mask_underrun(hvs, vc4_crtc_state->assigned_channel);
-+			if (!new_crtc_state->commit)
-+				continue;
-+
-+			vc4_crtc_state = to_vc4_crtc_state(new_crtc_state);
-+			vc4_hvs_mask_underrun(hvs, vc4_crtc_state->assigned_channel);
-+		}
- 	}
- 
- 	for (channel = 0; channel < HVS_NUM_CHANNELS; channel++) {
-@@ -378,7 +429,7 @@ static void vc4_atomic_commit_tail(struc
- 		old_hvs_state->fifo_state[channel].pending_commit = NULL;
- 	}
- 
--	if (vc4->gen == VC4_GEN_5 && !vc4->firmware_kms) {
-+	if (vc4->gen >= VC4_GEN_5 && !vc4->firmware_kms) {
- 		unsigned long state_rate = max(old_hvs_state->core_clock_rate,
- 					       new_hvs_state->core_clock_rate);
- 		unsigned long core_rate = clamp_t(unsigned long, state_rate,
-@@ -391,17 +442,32 @@ static void vc4_atomic_commit_tail(struc
- 		 * modeset.
- 		 */
- 		WARN_ON(clk_set_min_rate(hvs->core_clk, core_rate));
-+		WARN_ON(clk_set_min_rate(hvs->disp_clk, core_rate));
- 	}
- 
- 	drm_atomic_helper_commit_modeset_disables(dev, state);
- 
--	vc4_ctm_commit(vc4, state);
-+	if (vc4->gen <= VC4_GEN_5)
-+		vc4_ctm_commit(vc4, state);
- 
- 	if (!vc4->firmware_kms) {
--		if (vc4->gen == VC4_GEN_5)
--			vc5_hvs_pv_muxing_commit(vc4, state);
--		else
-+		switch (vc4->gen) {
-+		case VC4_GEN_4:
- 			vc4_hvs_pv_muxing_commit(vc4, state);
-+			break;
-+
-+		case VC4_GEN_5:
-+			vc5_hvs_pv_muxing_commit(vc4, state);
-+			break;
-+
-+		case VC4_GEN_6:
-+			vc6_hvs_pv_muxing_commit(vc4, state);
-+			break;
-+
-+		default:
-+			drm_err(dev, "Unknown VC4 generation: %d", vc4->gen);
-+			break;
-+		}
- 	}
- 
- 	drm_atomic_helper_commit_planes(dev, state,
-@@ -417,7 +483,7 @@ static void vc4_atomic_commit_tail(struc
- 
- 	drm_atomic_helper_cleanup_planes(dev, state);
- 
--	if (vc4->gen == VC4_GEN_5 && !vc4->firmware_kms) {
-+	if (vc4->gen >= VC4_GEN_5 && !vc4->firmware_kms) {
- 		unsigned long core_rate = min_t(unsigned long,
- 						hvs->max_core_rate,
- 						new_hvs_state->core_clock_rate);
-@@ -429,6 +495,7 @@ static void vc4_atomic_commit_tail(struc
- 		 * requirements.
- 		 */
- 		WARN_ON(clk_set_min_rate(hvs->core_clk, core_rate));
-+		WARN_ON(clk_set_min_rate(hvs->disp_clk, core_rate));
- 
- 		drm_dbg(dev, "Core clock actual rate: %lu Hz\n",
- 			clk_get_rate(hvs->core_clk));
-@@ -1081,7 +1148,10 @@ int vc4_kms_load(struct drm_device *dev)
- 		return ret;
- 	}
- 
--	if (vc4->gen == VC4_GEN_5) {
-+	if (vc4->gen >= VC4_GEN_6) {
-+		dev->mode_config.max_width = 8192;
-+		dev->mode_config.max_height = 8192;
-+	} else if (vc4->gen >= VC4_GEN_5) {
- 		dev->mode_config.max_width = 7680;
- 		dev->mode_config.max_height = 7680;
- 	} else {
---- a/drivers/gpu/drm/vc4/vc4_plane.c
-+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -279,6 +279,7 @@ static bool plane_enabled(struct drm_pla
- static struct drm_plane_state *vc4_plane_duplicate_state(struct drm_plane *plane)
- {
- 	struct vc4_plane_state *vc4_state;
-+	unsigned int i;
- 
- 	if (WARN_ON(!plane->state))
- 		return NULL;
-@@ -288,6 +289,11 @@ static struct drm_plane_state *vc4_plane
- 		return NULL;
- 
- 	memset(&vc4_state->lbm, 0, sizeof(vc4_state->lbm));
-+	memset(&vc4_state->upm, 0, sizeof(vc4_state->upm));
-+
-+	for (i = 0; i < DRM_FORMAT_MAX_PLANES; i++)
-+		vc4_state->upm_handle[i] = 0;
-+
- 	vc4_state->dlist_initialized = 0;
- 
- 	__drm_atomic_helper_plane_duplicate_state(plane, &vc4_state->base);
-@@ -310,14 +316,30 @@ static void vc4_plane_destroy_state(stru
- 				    struct drm_plane_state *state)
- {
- 	struct vc4_dev *vc4 = to_vc4_dev(plane->dev);
-+	struct vc4_hvs *hvs = vc4->hvs;
- 	struct vc4_plane_state *vc4_state = to_vc4_plane_state(state);
-+	unsigned int i;
- 
- 	if (drm_mm_node_allocated(&vc4_state->lbm)) {
- 		unsigned long irqflags;
- 
--		spin_lock_irqsave(&vc4->hvs->mm_lock, irqflags);
-+		spin_lock_irqsave(&hvs->mm_lock, irqflags);
- 		drm_mm_remove_node(&vc4_state->lbm);
--		spin_unlock_irqrestore(&vc4->hvs->mm_lock, irqflags);
-+		spin_unlock_irqrestore(&hvs->mm_lock, irqflags);
-+	}
-+
-+	for (i = 0; i < DRM_FORMAT_MAX_PLANES; i++) {
-+		unsigned long irqflags;
-+
-+		if (!drm_mm_node_allocated(&vc4_state->upm[i]))
-+			continue;
-+
-+		spin_lock_irqsave(&hvs->mm_lock, irqflags);
-+		drm_mm_remove_node(&vc4_state->upm[i]);
-+		spin_unlock_irqrestore(&hvs->mm_lock, irqflags);
-+
-+		if (vc4_state->upm_handle[i] > 0)
-+			ida_free(&hvs->upm_handles, vc4_state->upm_handle[i]);
- 	}
- 
- 	kfree(vc4_state->dlist);
-@@ -543,6 +565,11 @@ static void vc4_write_tpz(struct vc4_pla
- 	recip = ~0 / scale;
- 
- 	vc4_dlist_write(vc4_state,
-+			/*
-+			 * The BCM2712 is lacking BIT(31) compared to
-+			 * the previous generations, but we don't use
-+			 * it.
-+			 */
- 			VC4_SET_FIELD(scale, SCALER_TPZ0_SCALE) |
- 			VC4_SET_FIELD(0, SCALER_TPZ0_IPHASE));
- 	vc4_dlist_write(vc4_state,
-@@ -590,10 +617,15 @@ static void vc4_write_ppf(struct vc4_pla
- 	vc4_dlist_write(vc4_state,
- 			SCALER_PPF_AGC |
- 			VC4_SET_FIELD(scale, SCALER_PPF_SCALE) |
-+			/*
-+			 * The register layout documentation is slightly
-+			 * different to setup the phase in the BCM2712,
-+			 * but they seem equivalent.
-+			 */
- 			VC4_SET_FIELD(phase, SCALER_PPF_IPHASE));
- }
- 
--static u32 vc4_lbm_size(struct drm_plane_state *state)
-+static u32 __vc4_lbm_size(struct drm_plane_state *state)
- {
- 	struct vc4_plane_state *vc4_state = to_vc4_plane_state(state);
- 	struct vc4_dev *vc4 = to_vc4_dev(state->plane->dev);
-@@ -641,6 +673,131 @@ static u32 vc4_lbm_size(struct drm_plane
- 	return lbm;
- }
- 
-+static unsigned int vc4_lbm_words_per_component(const struct drm_plane_state *state,
-+						unsigned int channel)
-+{
-+	struct vc4_plane_state *vc4_state = to_vc4_plane_state(state);
-+
-+	switch (vc4_state->y_scaling[channel]) {
-+	case VC4_SCALING_PPF:
-+		return 4;
-+
-+	case VC4_SCALING_TPZ:
-+		return 2;
-+
-+	default:
-+		return 0;
-+	}
-+}
-+
-+static unsigned int vc4_lbm_components(const struct drm_plane_state *state,
-+				       unsigned int channel)
-+{
-+	const struct drm_format_info *info = state->fb->format;
-+	struct vc4_plane_state *vc4_state = to_vc4_plane_state(state);
-+
-+	if (vc4_state->y_scaling[channel] == VC4_SCALING_NONE)
-+		return 0;
-+
-+	if (info->is_yuv)
-+		return channel ? 2 : 1;
-+
-+	if (info->has_alpha)
-+		return 4;
-+
-+	return 3;
-+}
-+
-+static unsigned int vc4_lbm_channel_size(const struct drm_plane_state *state,
-+					 unsigned int channel)
-+{
-+	const struct drm_format_info *info = state->fb->format;
-+	struct vc4_plane_state *vc4_state = to_vc4_plane_state(state);
-+	unsigned int channels_scaled = 0;
-+	unsigned int components, words, wpc;
-+	unsigned int width, lines;
-+	unsigned int i;
-+
-+	/* LBM is meant to use the smaller of source or dest width, but there
-+	 * is a issue with UV scaling that the size required for the second
-+	 * channel is based on the source width only.
-+	 */
-+	if (info->hsub > 1 && channel == 1)
-+		width = state->src_w >> 16;
-+	else
-+		width = min(state->src_w >> 16, state->crtc_w);
-+	width = round_up(width / info->hsub, 4);
-+
-+	wpc = vc4_lbm_words_per_component(state, channel);
-+	if (!wpc)
-+		return 0;
-+
-+	components = vc4_lbm_components(state, channel);
-+	if (!components)
-+		return 0;
-+
-+	if (state->alpha != DRM_BLEND_ALPHA_OPAQUE)
-+		components -= 1;
-+
-+	words = width * wpc * components;
-+
-+	lines = DIV_ROUND_UP(words, 128 / info->hsub);
-+
-+	for (i = 0; i < 2; i++)
-+		if (vc4_state->y_scaling[channel] != VC4_SCALING_NONE)
-+			channels_scaled++;
-+
-+	if (channels_scaled == 1)
-+		lines = lines / 2;
-+
-+	return lines;
-+}
-+
-+static unsigned int __vc6_lbm_size(const struct drm_plane_state *state)
-+{
-+	const struct drm_format_info *info = state->fb->format;
-+
-+	if (info->hsub > 1)
-+		return max(vc4_lbm_channel_size(state, 0),
-+			   vc4_lbm_channel_size(state, 1));
-+	else
-+		return vc4_lbm_channel_size(state, 0);
-+}
-+
-+u32 vc4_lbm_size(struct drm_plane_state *state)
-+{
-+	struct vc4_plane_state *vc4_state = to_vc4_plane_state(state);
-+	struct vc4_dev *vc4 = to_vc4_dev(state->plane->dev);
-+
-+	/* LBM is not needed when there's no vertical scaling. */
-+	if (vc4_state->y_scaling[0] == VC4_SCALING_NONE &&
-+	    vc4_state->y_scaling[1] == VC4_SCALING_NONE)
-+		return 0;
-+
-+	if (vc4->gen >= VC4_GEN_6)
-+		return __vc6_lbm_size(state);
-+	else
-+		return __vc4_lbm_size(state);
-+}
-+
-+static size_t vc6_upm_size(const struct drm_plane_state *state,
-+			   unsigned int plane)
-+{
-+	struct vc4_plane_state *vc4_state = to_vc4_plane_state(state);
-+	unsigned int stride = state->fb->pitches[plane];
-+
-+	/*
-+	 * TODO: This only works for raster formats, and is sub-optimal
-+	 * for buffers with a stride aligned on 32 bytes.
-+	 */
-+	unsigned int words_per_line = (stride + 62) / 32;
-+	unsigned int fetch_region_size = words_per_line * 32;
-+	unsigned int buffer_lines = 2 << vc4_state->upm_buffer_lines;
-+	unsigned int buffer_size = fetch_region_size * buffer_lines;
-+
-+	return ALIGN(buffer_size, HVS_UBM_WORD_SIZE);
-+}
-+
- static void vc4_write_scaling_parameters(struct drm_plane_state *state,
- 					 int channel)
- {
-@@ -744,6 +901,10 @@ static int vc4_plane_allocate_lbm(struct
- 	if (!lbm_size)
- 		return 0;
- 
-+	/*
-+	 * NOTE: BCM2712 doesn't need to be aligned, since the size
-+	 * returned by vc4_lbm_size() is in words already.
-+	 */
- 	if (vc4->gen == VC4_GEN_5)
- 		lbm_size = ALIGN(lbm_size, 64);
- 	else if (vc4->gen == VC4_GEN_4)
-@@ -781,6 +942,57 @@ static int vc4_plane_allocate_lbm(struct
- 	return 0;
- }
- 
-+static int vc6_plane_allocate_upm(struct drm_plane_state *state)
-+{
-+	const struct drm_format_info *info = state->fb->format;
-+	struct drm_device *drm = state->plane->dev;
-+	struct vc4_dev *vc4 = to_vc4_dev(drm);
-+	struct vc4_hvs *hvs = vc4->hvs;
-+	struct vc4_plane_state *vc4_state = to_vc4_plane_state(state);
-+	unsigned int i;
-+	int ret;
-+
-+	WARN_ON_ONCE(vc4->gen < VC4_GEN_6);
-+
-+	vc4_state->upm_buffer_lines = SCALER6_PTR0_UPM_BUFF_SIZE_2_LINES;
-+
-+	for (i = 0; i < info->num_planes; i++) {
-+		unsigned long irqflags;
-+		size_t upm_size;
-+
-+		upm_size = vc6_upm_size(state, i);
-+		if (!upm_size)
-+			return -EINVAL;
-+
-+		spin_lock_irqsave(&hvs->mm_lock, irqflags);
-+		ret = drm_mm_insert_node_generic(&hvs->upm_mm,
-+						 &vc4_state->upm[i],
-+						 upm_size, HVS_UBM_WORD_SIZE,
-+						 0, 0);
-+		spin_unlock_irqrestore(&hvs->mm_lock, irqflags);
-+		if (ret) {
-+			drm_err(drm, "Failed to allocate UPM entry: %d\n", ret);
-+			return ret;
-+		}
-+
-+		ret = ida_alloc_range(&hvs->upm_handles, 1, 32, GFP_KERNEL);
-+		if (ret < 0)
-+			return ret;
-+
-+		vc4_state->upm_handle[i] = ret;
-+
-+		vc4_state->dlist[vc4_state->ptr0_offset[i]] |=
-+			VC4_SET_FIELD(vc4_state->upm[i].start / HVS_UBM_WORD_SIZE,
-+				      SCALER6_PTR0_UPM_BASE) |
-+			VC4_SET_FIELD(vc4_state->upm_handle[i] - 1,
-+				      SCALER6_PTR0_UPM_HANDLE) |
-+			VC4_SET_FIELD(vc4_state->upm_buffer_lines,
-+				      SCALER6_PTR0_UPM_BUFF_SIZE);
-+	}
-+
-+	return 0;
-+}
-+
- /*
-  * The colorspace conversion matrices are held in 3 entries in the dlist.
-  * Create an array of them, with entries for each full and limited mode, and
-@@ -1355,6 +1567,413 @@ static int vc4_plane_mode_set(struct drm
- 	return 0;
- }
- 
-+static u32 vc6_plane_get_csc_mode(struct vc4_plane_state *vc4_state)
-+{
-+	struct drm_plane_state *state = &vc4_state->base;
-+	u32 ret = 0;
-+
-+	if (vc4_state->is_yuv) {
-+		enum drm_color_encoding color_encoding = state->color_encoding;
-+		enum drm_color_range color_range = state->color_range;
-+
-+		ret |= SCALER6_CTL2_CSC_ENABLE;
-+
-+		/* CSC pre-loaded with:
-+		 * 0 = BT601 limited range
-+		 * 1 = BT709 limited range
-+		 * 2 = BT2020 limited range
-+		 * 3 = BT601 full range
-+		 * 4 = BT709 full range
-+		 * 5 = BT2020 full range
-+		 */
-+		if (color_encoding > DRM_COLOR_YCBCR_BT2020)
-+			color_encoding = DRM_COLOR_YCBCR_BT601;
-+		if (color_range > DRM_COLOR_YCBCR_FULL_RANGE)
-+			color_range = DRM_COLOR_YCBCR_LIMITED_RANGE;
-+
-+		ret |= VC4_SET_FIELD(color_encoding + (color_range * 3),
-+				     SCALER6_CTL2_BRCM_CFC_CONTROL);
-+	}
-+
-+	return ret;
-+}
-+
-+static int vc6_plane_mode_set(struct drm_plane *plane,
-+			      struct drm_plane_state *state)
-+{
-+	struct drm_device *drm = plane->dev;
-+	struct vc4_dev *vc4 = to_vc4_dev(drm);
-+	struct vc4_plane_state *vc4_state = to_vc4_plane_state(state);
-+	struct drm_framebuffer *fb = state->fb;
-+	const struct hvs_format *format = vc4_get_hvs_format(fb->format->format);
-+	u64 base_format_mod = fourcc_mod_broadcom_mod(fb->modifier);
-+	int num_planes = fb->format->num_planes;
-+	u32 h_subsample = fb->format->hsub;
-+	u32 v_subsample = fb->format->vsub;
-+	bool mix_plane_alpha;
-+	bool covers_screen;
-+	u32 scl0, scl1, pitch0;
-+	u32 tiling, src_x, src_y;
-+	u32 width, height;
-+	u32 hvs_format = format->hvs;
-+	u32 offsets[3] = { 0 };
-+	unsigned int rotation;
-+	int ret, i;
-+
-+	if (vc4_state->dlist_initialized)
-+		return 0;
-+
-+	ret = vc4_plane_setup_clipping_and_scaling(state);
-+	if (ret)
-+		return ret;
-+
-+	width = vc4_state->src_w[0] >> 16;
-+	height = vc4_state->src_h[0] >> 16;
-+
-+	/* SCL1 is used for Cb/Cr scaling of planar formats.  For RGB
-+	 * and 4:4:4, scl1 should be set to scl0 so both channels of
-+	 * the scaler do the same thing.  For YUV, the Y plane needs
-+	 * to be put in channel 1 and Cb/Cr in channel 0, so we swap
-+	 * the scl fields here.
-+	 */
-+	if (num_planes == 1) {
-+		scl0 = vc4_get_scl_field(state, 0);
-+		scl1 = scl0;
-+	} else {
-+		scl0 = vc4_get_scl_field(state, 1);
-+		scl1 = vc4_get_scl_field(state, 0);
-+	}
-+
-+	rotation = drm_rotation_simplify(state->rotation,
-+					 DRM_MODE_ROTATE_0 |
-+					 DRM_MODE_REFLECT_X |
-+					 DRM_MODE_REFLECT_Y);
-+
-+	/* We must point to the last line when Y reflection is enabled. */
-+	src_y = vc4_state->src_y >> 16;
-+	if (rotation & DRM_MODE_REFLECT_Y)
-+		src_y += height - 1;
-+
-+	src_x = vc4_state->src_x >> 16;
-+
-+	switch (base_format_mod) {
-+	case DRM_FORMAT_MOD_LINEAR:
-+		tiling = SCALER6_CTL0_ADDR_MODE_LINEAR;
-+
-+		/* Adjust the base pointer to the first pixel to be scanned
-+		 * out.
-+		 */
-+		for (i = 0; i < num_planes; i++) {
-+			offsets[i] += src_y / (i ? v_subsample : 1) * fb->pitches[i];
-+			offsets[i] += src_x / (i ? h_subsample : 1) * fb->format->cpp[i];
-+		}
-+
-+		break;
-+
-+	case DRM_FORMAT_MOD_BROADCOM_SAND128:
-+	case DRM_FORMAT_MOD_BROADCOM_SAND256: {
-+		uint32_t param = fourcc_mod_broadcom_param(fb->modifier);
-+		u32 components_per_word;
-+		u32 starting_offset;
-+		u32 fetch_count;
-+
-+		if (param > SCALER_TILE_HEIGHT_MASK) {
-+			DRM_DEBUG_KMS("SAND height too large (%d)\n",
-+				      param);
-+			return -EINVAL;
-+		}
-+
-+		if (fb->format->format == DRM_FORMAT_P030) {
-+			hvs_format = HVS_PIXEL_FORMAT_YCBCR_10BIT;
-+			tiling = SCALER6_CTL0_ADDR_MODE_128B;
-+		} else {
-+			hvs_format = HVS_PIXEL_FORMAT_YCBCR_YUV420_2PLANE;
-+
-+			switch (base_format_mod) {
-+			case DRM_FORMAT_MOD_BROADCOM_SAND128:
-+				tiling = SCALER6_CTL0_ADDR_MODE_128B;
-+				break;
-+			case DRM_FORMAT_MOD_BROADCOM_SAND256:
-+				tiling = SCALER6_CTL0_ADDR_MODE_256B;
-+				break;
-+			default:
-+				return -EINVAL;
-+			}
-+		}
-+
-+		/* Adjust the base pointer to the first pixel to be scanned
-+		 * out.
-+		 *
-+		 * For P030, y_ptr [31:4] is the 128bit word for the start pixel
-+		 * y_ptr [3:0] is the pixel (0-11) contained within that 128bit
-+		 * word that should be taken as the first pixel.
-+		 * Ditto uv_ptr [31:4] vs [3:0], however [3:0] contains the
-+		 * element within the 128bit word, eg for pixel 3 the value
-+		 * should be 6.
-+		 */
-+		for (i = 0; i < num_planes; i++) {
-+			u32 tile_w, tile, x_off, pix_per_tile;
-+
-+			if (fb->format->format == DRM_FORMAT_P030) {
-+				/*
-+				 * Spec says: bits [31:4] of the given address
-+				 * should point to the 128-bit word containing
-+				 * the desired starting pixel, and bits[3:0]
-+				 * should be between 0 and 11, indicating which
-+				 * of the 12-pixels in that 128-bit word is the
-+				 * first pixel to be used
-+				 */
-+				u32 remaining_pixels = src_x % 96;
-+				u32 aligned = remaining_pixels / 12;
-+				u32 last_bits = remaining_pixels % 12;
-+
-+				x_off = aligned * 16 + last_bits;
-+				tile_w = 128;
-+				pix_per_tile = 96;
-+			} else {
-+				switch (base_format_mod) {
-+				case DRM_FORMAT_MOD_BROADCOM_SAND128:
-+					tile_w = 128;
-+					break;
-+				case DRM_FORMAT_MOD_BROADCOM_SAND256:
-+					tile_w = 256;
-+					break;
-+				default:
-+					return -EINVAL;
-+				}
-+				pix_per_tile = tile_w / fb->format->cpp[0];
-+				x_off = (src_x % pix_per_tile) /
-+					(i ? h_subsample : 1) *
-+					fb->format->cpp[i];
-+			}
-+
-+			tile = src_x / pix_per_tile;
-+
-+			offsets[i] += param * tile_w * tile;
-+			offsets[i] += src_y / (i ? v_subsample : 1) * tile_w;
-+			offsets[i] += x_off & ~(i ? 1 : 0);
-+		}
-+
-+		components_per_word = fb->format->format == DRM_FORMAT_P030 ? 24 : 32;
-+		starting_offset = src_x % components_per_word;
-+		fetch_count = (width + starting_offset + components_per_word - 1) /
-+			components_per_word;
-+
-+		pitch0 = VC4_SET_FIELD(param, SCALER6_PTR2_PITCH) |
-+			 VC4_SET_FIELD(fetch_count - 1, SCALER6_PTR2_FETCH_COUNT);
-+		break;
-+	}
-+
-+	default:
-+		DRM_DEBUG_KMS("Unsupported FB tiling flag 0x%16llx",
-+			      (long long)fb->modifier);
-+		return -EINVAL;
-+	}
-+
-+	/* fetch an extra pixel if we don't actually line up with the left edge. */
-+	if ((vc4_state->src_x & 0xffff) && vc4_state->src_x < (state->fb->width << 16))
-+		width++;
-+
-+	/* same for the right side */
-+	if (((vc4_state->src_x + vc4_state->src_w[0]) & 0xffff) &&
-+	    vc4_state->src_x + vc4_state->src_w[0] < (state->fb->width << 16))
-+		width++;
-+
-+	/* now for the top */
-+	if ((vc4_state->src_y & 0xffff) && vc4_state->src_y < (state->fb->height << 16))
-+		height++;
-+
-+	/* and the bottom */
-+	if (((vc4_state->src_y + vc4_state->src_h[0]) & 0xffff) &&
-+	    vc4_state->src_y + vc4_state->src_h[0] < (state->fb->height << 16))
-+		height++;
-+
-+	/* for YUV444 hardware wants double the width, otherwise it doesn't
-+	 * fetch full width of chroma
-+	 */
-+	if (format->drm == DRM_FORMAT_YUV444 || format->drm == DRM_FORMAT_YVU444)
-+		width <<= 1;
-+
-+	/* Don't waste cycles mixing with plane alpha if the set alpha
-+	 * is opaque or there is no per-pixel alpha information.
-+	 * In any case we use the alpha property value as the fixed alpha.
-+	 */
-+	mix_plane_alpha = state->alpha != DRM_BLEND_ALPHA_OPAQUE &&
-+			  fb->format->has_alpha;
-+
-+	/* Control Word 0: Scaling Configuration & Element Validity*/
-+	vc4_dlist_write(vc4_state,
-+			SCALER6_CTL0_VALID |
-+			VC4_SET_FIELD(tiling, SCALER6_CTL0_ADDR_MODE) |
-+			VC4_SET_FIELD(0, SCALER6_CTL0_ALPHA_MASK) |
-+			(vc4_state->is_unity ? SCALER6_CTL0_UNITY : 0) |
-+			VC4_SET_FIELD(format->pixel_order_hvs5, SCALER6_CTL0_ORDERRGBA) |
-+			VC4_SET_FIELD(scl1, SCALER6_CTL0_SCL1_MODE) |
-+			VC4_SET_FIELD(scl0, SCALER6_CTL0_SCL0_MODE) |
-+			VC4_SET_FIELD(hvs_format, SCALER6_CTL0_PIXEL_FORMAT));
-+
-+	/* Position Word 0: Image Position */
-+	vc4_state->pos0_offset = vc4_state->dlist_count;
-+	vc4_dlist_write(vc4_state,
-+			VC4_SET_FIELD(vc4_state->crtc_y, SCALER6_POS0_START_Y) |
-+			(rotation & DRM_MODE_REFLECT_X ? SCALER6_POS0_HFLIP : 0) |
-+			VC4_SET_FIELD(vc4_state->crtc_x, SCALER6_POS0_START_X));
-+
-+	/* Control Word 2: Alpha Value & CSC */
-+	vc4_dlist_write(vc4_state,
-+			vc6_plane_get_csc_mode(vc4_state) |
-+			vc4_hvs5_get_alpha_blend_mode(state) |
-+			(mix_plane_alpha ? SCALER6_CTL2_ALPHA_MIX : 0) |
-+			VC4_SET_FIELD(state->alpha >> 4, SCALER5_CTL2_ALPHA));
-+
-+	/* Position Word 1: Scaled Image Dimensions */
-+	if (!vc4_state->is_unity)
-+		vc4_dlist_write(vc4_state,
-+				VC4_SET_FIELD(vc4_state->crtc_h - 1,
-+					      SCALER6_POS1_SCL_LINES) |
-+				VC4_SET_FIELD(vc4_state->crtc_w - 1,
-+					      SCALER6_POS1_SCL_WIDTH));
-+
-+	/* Position Word 2: Source Image Size */
-+	vc4_state->pos2_offset = vc4_state->dlist_count;
-+	vc4_dlist_write(vc4_state,
-+			VC4_SET_FIELD(height - 1,
-+				      SCALER6_POS2_SRC_LINES) |
-+			VC4_SET_FIELD(width - 1,
-+				      SCALER6_POS2_SRC_WIDTH));
-+
-+	/* Position Word 3: Context */
-+	vc4_dlist_write(vc4_state, 0xc0c0c0c0);
-+
-+	/*
-+	 * TODO: This only covers Raster Scan Order planes
-+	 */
-+	for (i = 0; i < num_planes; i++) {
-+		dma_addr_t paddr = drm_fb_dma_get_gem_addr(fb, state, i);
-+
-+		paddr += offsets[i];
-+
-+		/* Pointer Word 0 */
-+		vc4_state->ptr0_offset[i] = vc4_state->dlist_count;
-+		vc4_dlist_write(vc4_state,
-+				(rotation & DRM_MODE_REFLECT_Y ? SCALER6_PTR0_VFLIP : 0) |
-+				/*
-+				 * The UPM buffer will be allocated in
-+				 * vc6_plane_allocate_upm().
-+				 */
-+				VC4_SET_FIELD(upper_32_bits(paddr) & 0xf,
-+					      SCALER6_PTR0_UPPER_ADDR));
-+
-+		/* Pointer Word 1 */
-+		vc4_dlist_write(vc4_state, lower_32_bits(paddr));
-+
-+		/* Pointer Word 2 */
-+		if (base_format_mod != DRM_FORMAT_MOD_BROADCOM_SAND128 &&
-+		    base_format_mod != DRM_FORMAT_MOD_BROADCOM_SAND256) {
-+			vc4_dlist_write(vc4_state,
-+					VC4_SET_FIELD(fb->pitches[i],
-+						      SCALER6_PTR2_PITCH));
-+		} else {
-+			vc4_dlist_write(vc4_state, pitch0);
-+		}
-+	}
-+
-+	/*
-+	 * Palette Word 0
-+	 * TODO: We're not using the palette mode
-+	 */
-+
-+	/*
-+	 * Trans Word 0
-+	 * TODO: It's only relevant if we set the trans_rgb bit in the
-+	 * control word 0, and we don't at the moment.
-+	 */
-+
-+	vc4_state->lbm_offset = 0;
-+
-+	if (!vc4_state->is_unity || fb->format->is_yuv) {
-+		/*
-+		 * Reserve a slot for the LBM Base Address. The real value will
-+		 * be set when calling vc4_plane_allocate_lbm().
-+		 */
-+		if (vc4_state->y_scaling[0] != VC4_SCALING_NONE ||
-+		    vc4_state->y_scaling[1] != VC4_SCALING_NONE) {
-+			vc4_state->lbm_offset = vc4_state->dlist_count;
-+			vc4_dlist_counter_increment(vc4_state);
-+		}
-+
-+		if (vc4_state->x_scaling[0] != VC4_SCALING_NONE ||
-+		    vc4_state->x_scaling[1] != VC4_SCALING_NONE ||
-+		    vc4_state->y_scaling[0] != VC4_SCALING_NONE ||
-+		    vc4_state->y_scaling[1] != VC4_SCALING_NONE) {
-+			if (num_planes > 1)
-+				/*
-+				 * Emit Cb/Cr as channel 0 and Y as channel
-+				 * 1. This matches how we set up scl0/scl1
-+				 * above.
-+				 */
-+				vc4_write_scaling_parameters(state, 1);
-+
-+			vc4_write_scaling_parameters(state, 0);
-+		}
-+
-+		/*
-+		 * If any PPF setup was done, then all the kernel
-+		 * pointers get uploaded.
-+		 */
-+		if (vc4_state->x_scaling[0] == VC4_SCALING_PPF ||
-+		    vc4_state->y_scaling[0] == VC4_SCALING_PPF ||
-+		    vc4_state->x_scaling[1] == VC4_SCALING_PPF ||
-+		    vc4_state->y_scaling[1] == VC4_SCALING_PPF) {
-+			u32 kernel =
-+				VC4_SET_FIELD(vc4->hvs->mitchell_netravali_filter.start,
-+					      SCALER_PPF_KERNEL_OFFSET);
-+
-+			/* HPPF plane 0 */
-+			vc4_dlist_write(vc4_state, kernel);
-+			/* VPPF plane 0 */
-+			vc4_dlist_write(vc4_state, kernel);
-+			/* HPPF plane 1 */
-+			vc4_dlist_write(vc4_state, kernel);
-+			/* VPPF plane 1 */
-+				vc4_dlist_write(vc4_state, kernel);
-+		}
-+	}
-+
-+	vc4_dlist_write(vc4_state, SCALER6_CTL0_END);
-+
-+	vc4_state->dlist[0] |=
-+		VC4_SET_FIELD(vc4_state->dlist_count, SCALER6_CTL0_NEXT);
-+
-+	/* crtc_* are already clipped coordinates. */
-+	covers_screen = vc4_state->crtc_x == 0 && vc4_state->crtc_y == 0 &&
-+			vc4_state->crtc_w == state->crtc->mode.hdisplay &&
-+			vc4_state->crtc_h == state->crtc->mode.vdisplay;
-+
-+	/*
-+	 * Background fill might be necessary when the plane has per-pixel
-+	 * alpha content or a non-opaque plane alpha and could blend from the
-+	 * background or does not cover the entire screen.
-+	 */
-+	vc4_state->needs_bg_fill = fb->format->has_alpha || !covers_screen ||
-+				   state->alpha != DRM_BLEND_ALPHA_OPAQUE;
-+
-+	/*
-+	 * Flag the dlist as initialized to avoid checking it twice in case
-+	 * the async update check already called vc4_plane_mode_set() and
-+	 * decided to fallback to sync update because async update was not
-+	 * possible.
-+	 */
-+	vc4_state->dlist_initialized = 1;
-+
-+	vc4_plane_calc_load(state);
-+
-+	drm_dbg_driver(drm, "[PLANE:%d:%s] Computed DLIST size: %u\n",
-+		       plane->base.id, plane->name, vc4_state->dlist_count);
-+
-+	return 0;
-+}
-+
- /* If a modeset involves changing the setup of a plane, the atomic
-  * infrastructure will call this to validate a proposed plane setup.
-  * However, if a plane isn't getting updated, this (and the
-@@ -1365,6 +1984,7 @@ static int vc4_plane_mode_set(struct drm
- static int vc4_plane_atomic_check(struct drm_plane *plane,
- 				  struct drm_atomic_state *state)
- {
-+	struct vc4_dev *vc4 = to_vc4_dev(plane->dev);
- 	struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state,
- 										 plane);
- 	struct vc4_plane_state *vc4_state = to_vc4_plane_state(new_plane_state);
-@@ -1375,7 +1995,10 @@ static int vc4_plane_atomic_check(struct
- 	if (!plane_enabled(new_plane_state))
- 		return 0;
- 
--	ret = vc4_plane_mode_set(plane, new_plane_state);
-+	if (vc4->gen >= VC4_GEN_6)
-+		ret = vc6_plane_mode_set(plane, new_plane_state);
-+	else
-+		ret = vc4_plane_mode_set(plane, new_plane_state);
- 	if (ret)
- 		return ret;
- 
-@@ -1383,6 +2006,12 @@ static int vc4_plane_atomic_check(struct
- 	if (ret)
- 		return ret;
- 
-+	if (vc4->gen >= VC4_GEN_6) {
-+		ret = vc6_plane_allocate_upm(new_plane_state);
-+		if (ret)
-+			return ret;
-+	}
-+
- 	return 0;
- }
- 
-@@ -1713,7 +2342,7 @@ struct drm_plane *vc4_plane_init(struct
- 	};
- 
- 	for (i = 0; i < ARRAY_SIZE(hvs_formats); i++) {
--		if (!hvs_formats[i].hvs5_only || vc4->gen == VC4_GEN_5) {
-+		if (!hvs_formats[i].hvs5_only || vc4->gen >= VC4_GEN_5) {
- 			formats[num_formats] = hvs_formats[i].drm;
- 			num_formats++;
- 		}
-@@ -1728,7 +2357,7 @@ struct drm_plane *vc4_plane_init(struct
- 		return ERR_CAST(vc4_plane);
- 	plane = &vc4_plane->base;
- 
--	if (vc4->gen == VC4_GEN_5)
-+	if (vc4->gen >= VC4_GEN_5)
- 		drm_plane_helper_add(plane, &vc5_plane_helper_funcs);
- 	else
- 		drm_plane_helper_add(plane, &vc4_plane_helper_funcs);
---- a/drivers/gpu/drm/vc4/vc4_regs.h
-+++ b/drivers/gpu/drm/vc4/vc4_regs.h
-@@ -536,6 +536,130 @@
- 
- #define SCALER5_DLIST_START			0x00004000
- 
-+#define SCALER6_VERSION				0x00000000
-+#define SCALER6_CXM_SIZE			0x00000004
-+#define SCALER6_LBM_SIZE			0x00000008
-+#define SCALER6_UBM_SIZE			0x0000000c
-+#define SCALER6_COBA_SIZE			0x00000010
-+#define SCALER6_COB_SIZE			0x00000014
-+
-+#define SCALER6_CONTROL				0x00000020
-+# define SCALER6_CONTROL_HVS_EN			BIT(31)
-+# define SCALER6_CONTROL_PF_LINES_MASK		VC4_MASK(22, 18)
-+# define SCALER6_CONTROL_ABORT_ON_EMPTY		BIT(16)
-+# define SCALER6_CONTROL_DSP1_TARGET_MASK	VC4_MASK(13, 12)
-+# define SCALER6_CONTROL_MAX_REQS_MASK		VC4_MASK(7, 4)
-+
-+#define SCALER6_FETCHER_STATUS			0x00000024
-+#define SCALER6_FETCH_STATUS			0x00000028
-+#define SCALER6_HANDLE_ERROR			0x0000002c
-+
-+#define SCALER6_DISP0_CTRL0			0x00000030
-+#define SCALER6_DISPX_CTRL0(x)						\
-+	(SCALER6_DISP0_CTRL0 + ((x) * (SCALER6_DISP1_CTRL0 - SCALER6_DISP0_CTRL0)))
-+# define SCALER6_DISPX_CTRL0_ENB		BIT(31)
-+# define SCALER6_DISPX_CTRL0_RESET		BIT(30)
-+# define SCALER6_DISPX_CTRL0_FWIDTH_MASK	VC4_MASK(28, 16)
-+# define SCALER6_DISPX_CTRL0_ONESHOT		BIT(15)
-+# define SCALER6_DISPX_CTRL0_ONECTX_MASK	VC4_MASK(14, 13)
-+# define SCALER6_DISPX_CTRL0_LINES_MASK		VC4_MASK(12, 0)
-+
-+#define SCALER6_DISP0_CTRL1			0x00000034
-+#define SCALER6_DISPX_CTRL1(x)						\
-+	(SCALER6_DISP0_CTRL1 + ((x) * (SCALER6_DISP1_CTRL1 - SCALER6_DISP0_CTRL1)))
-+# define SCALER6_DISPX_CTRL1_BGENB		BIT(8)
-+# define SCALER6_DISPX_CTRL1_INTLACE		BIT(0)
-+
-+#define SCALER6_DISP0_BGND			0x00000038
-+#define SCALER6_DISPX_BGND(x)						\
-+	(SCALER6_DISP0_BGND + ((x) * (SCALER6_DISP1_BGND - SCALER6_DISP0_BGND)))
-+
-+#define SCALER6_DISP0_LPTRS			0x0000003c
-+#define SCALER6_DISPX_LPTRS(x)						\
-+	(SCALER6_DISP0_LPTRS + ((x) * (SCALER6_DISP1_LPTRS - SCALER6_DISP0_LPTRS)))
-+# define SCALER6_DISPX_LPTRS_HEADE_MASK		VC4_MASK(11, 0)
-+
-+#define SCALER6_DISP0_COB			0x00000040
-+#define SCALER6_DISPX_COB(x)						\
-+	(SCALER6_DISP0_COB + ((x) * (SCALER6_DISP1_COB - SCALER6_DISP0_COB)))
-+# define SCALER6_DISPX_COB_TOP_MASK		VC4_MASK(31, 16)
-+# define SCALER6_DISPX_COB_BASE_MASK		VC4_MASK(15, 0)
-+
-+#define SCALER6_DISP0_STATUS			0x00000044
-+
-+#define SCALER6_DISPX_STATUS(x)						\
-+	(SCALER6_DISP0_STATUS + ((x) * (SCALER6_DISP1_STATUS - SCALER6_DISP0_STATUS)))
-+# define SCALER6_DISPX_STATUS_EMPTY		BIT(22)
-+# define SCALER6_DISPX_STATUS_FRCNT_MASK	VC4_MASK(21, 16)
-+# define SCALER6_DISPX_STATUS_OFIELD		BIT(15)
-+# define SCALER6_DISPX_STATUS_MODE_MASK		VC4_MASK(14, 13)
-+# define SCALER6_DISPX_STATUS_MODE_DISABLED	0
-+# define SCALER6_DISPX_STATUS_MODE_INIT		1
-+# define SCALER6_DISPX_STATUS_MODE_RUN		2
-+# define SCALER6_DISPX_STATUS_MODE_EOF		3
-+# define SCALER6_DISPX_STATUS_YLINE_MASK	VC4_MASK(12, 0)
-+
-+#define SCALER6_DISP0_DL			0x00000048
-+
-+#define SCALER6_DISPX_DL(x)						\
-+	(SCALER6_DISP0_DL + ((x) * (SCALER6_DISP1_DL - SCALER6_DISP0_DL)))
-+# define SCALER6_DISPX_DL_LACT_MASK		VC4_MASK(11, 0)
-+
-+#define SCALER6_DISP0_RUN			0x0000004c
-+#define SCALER6_DISP1_CTRL0			0x00000050
-+#define SCALER6_DISP1_CTRL1			0x00000054
-+#define SCALER6_DISP1_BGND			0x00000058
-+#define SCALER6_DISP1_LPTRS			0x0000005c
-+#define SCALER6_DISP1_COB			0x00000060
-+#define SCALER6_DISP1_STATUS			0x00000064
-+#define SCALER6_DISP1_DL			0x00000068
-+#define SCALER6_DISP1_RUN			0x0000006c
-+#define SCALER6_DISP2_CTRL0			0x00000070
-+#define SCALER6_DISP2_CTRL1			0x00000074
-+#define SCALER6_DISP2_BGND			0x00000078
-+#define SCALER6_DISP2_LPTRS			0x0000007c
-+#define SCALER6_DISP2_COB			0x00000080
-+#define SCALER6_DISP2_STATUS			0x00000084
-+#define SCALER6_DISP2_DL			0x00000088
-+#define SCALER6_DISP2_RUN			0x0000008c
-+#define SCALER6_EOLN				0x00000090
-+#define SCALER6_DL_STATUS			0x00000094
-+#define SCALER6_BFG_MISC			0x0000009c
-+#define SCALER6_QOS0				0x000000a0
-+#define SCALER6_PROF0				0x000000a4
-+#define SCALER6_QOS1				0x000000a8
-+#define SCALER6_PROF1				0x000000ac
-+#define SCALER6_QOS2				0x000000b0
-+#define SCALER6_PROF2				0x000000b4
-+#define SCALER6_PRI_MAP0			0x000000b8
-+#define SCALER6_PRI_MAP1			0x000000bc
-+#define SCALER6_HISTCTRL			0x000000c0
-+#define SCALER6_HISTBIN0			0x000000c4
-+#define SCALER6_HISTBIN1			0x000000c8
-+#define SCALER6_HISTBIN2			0x000000cc
-+#define SCALER6_HISTBIN3			0x000000d0
-+#define SCALER6_HISTBIN4			0x000000d4
-+#define SCALER6_HISTBIN5			0x000000d8
-+#define SCALER6_HISTBIN6			0x000000dc
-+#define SCALER6_HISTBIN7			0x000000e0
-+#define SCALER6_HDR_CFG_REMAP			0x000000f4
-+#define SCALER6_COL_SPACE			0x000000f8
-+#define SCALER6_HVS_ID				0x000000fc
-+#define SCALER6_CFC1				0x00000100
-+#define SCALER6_DISP_UPM_ISO0			0x00000200
-+#define SCALER6_DISP_UPM_ISO1			0x00000204
-+#define SCALER6_DISP_UPM_ISO2			0x00000208
-+#define SCALER6_DISP_LBM_ISO0			0x0000020c
-+#define SCALER6_DISP_LBM_ISO1			0x00000210
-+#define SCALER6_DISP_LBM_ISO2			0x00000214
-+#define SCALER6_DISP_COB_ISO0			0x00000218
-+#define SCALER6_DISP_COB_ISO1			0x0000021c
-+#define SCALER6_DISP_COB_ISO2			0x00000220
-+#define SCALER6_BAD_COB				0x00000224
-+#define SCALER6_BAD_LBM				0x00000228
-+#define SCALER6_BAD_UPM				0x0000022c
-+#define SCALER6_BAD_AXI				0x00000230
-+
- # define VC4_HDMI_SW_RESET_FORMAT_DETECT	BIT(1)
- # define VC4_HDMI_SW_RESET_HDMI			BIT(0)
- 
-@@ -1131,4 +1255,61 @@ enum hvs_pixel_format {
- #define SCALER_PITCH0_TILE_WIDTH_R_MASK		VC4_MASK(6, 0)
- #define SCALER_PITCH0_TILE_WIDTH_R_SHIFT	0
- 
-+#define SCALER6_CTL0_END			BIT(31)
-+#define SCALER6_CTL0_VALID			BIT(30)
-+#define SCALER6_CTL0_NEXT_MASK			VC4_MASK(29, 24)
-+#define SCALER6_CTL0_RGB_TRANS			BIT(23)
-+#define SCALER6_CTL0_ADDR_MODE_MASK		VC4_MASK(22, 20)
-+#define SCALER6_CTL0_ADDR_MODE_LINEAR		0
-+#define SCALER6_CTL0_ADDR_MODE_128B		1
-+#define SCALER6_CTL0_ADDR_MODE_256B		2
-+#define SCALER6_CTL0_ADDR_MODE_MAP8		3
-+#define SCALER6_CTL0_ADDR_MODE_UIF		4
-+
-+#define SCALER6_CTL0_ALPHA_MASK_MASK		VC4_MASK(19, 18)
-+#define SCALER6_CTL0_UNITY			BIT(15)
-+#define SCALER6_CTL0_ORDERRGBA_MASK		VC4_MASK(14, 13)
-+#define SCALER6_CTL0_SCL1_MODE_MASK		VC4_MASK(10, 8)
-+#define SCALER6_CTL0_SCL0_MODE_MASK		VC4_MASK(7, 5)
-+#define SCALER6_CTL0_PIXEL_FORMAT_MASK		VC4_MASK(4, 0)
-+
-+#define SCALER6_POS0_START_Y_MASK		VC4_MASK(28, 16)
-+#define SCALER6_POS0_HFLIP			BIT(15)
-+#define SCALER6_POS0_START_X_MASK		VC4_MASK(12, 0)
-+
-+#define SCALER6_CTL2_ALPHA_MODE_MASK		VC4_MASK(31, 30)
-+#define SCALER6_CTL2_ALPHA_PREMULT		BIT(29)
-+#define SCALER6_CTL2_ALPHA_MIX			BIT(28)
-+#define SCALER6_CTL2_BFG			BIT(26)
-+#define SCALER6_CTL2_CSC_ENABLE			BIT(25)
-+#define SCALER6_CTL2_BRCM_CFC_CONTROL_MASK	VC4_MASK(18, 16)
-+#define SCALER6_CTL2_ALPHA_MASK			VC4_MASK(15, 4)
-+
-+#define SCALER6_POS1_SCL_LINES_MASK		VC4_MASK(28, 16)
-+#define SCALER6_POS1_SCL_WIDTH_MASK		VC4_MASK(12, 0)
-+
-+#define SCALER6_POS2_SRC_LINES_MASK		VC4_MASK(28, 16)
-+#define SCALER6_POS2_SRC_WIDTH_MASK		VC4_MASK(12, 0)
-+
-+#define SCALER6_PTR0_VFLIP			BIT(31)
-+#define SCALER6_PTR0_UPM_BASE_MASK		VC4_MASK(28, 16)
-+#define SCALER6_PTR0_UPM_HANDLE_MASK		VC4_MASK(14, 10)
-+#define SCALER6_PTR0_UPM_BUFF_SIZE_MASK		VC4_MASK(9, 8)
-+#define SCALER6_PTR0_UPM_BUFF_SIZE_16_LINES	3
-+#define SCALER6_PTR0_UPM_BUFF_SIZE_8_LINES	2
-+#define SCALER6_PTR0_UPM_BUFF_SIZE_4_LINES	1
-+#define SCALER6_PTR0_UPM_BUFF_SIZE_2_LINES	0
-+#define SCALER6_PTR0_UPPER_ADDR_MASK		VC4_MASK(7, 0)
-+
-+#define SCALER6_PTR2_ALPHA_BPP_MASK		VC4_MASK(31, 31)
-+#define SCALER6_PTR2_ALPHA_BPP_1BPP		1
-+#define SCALER6_PTR2_ALPHA_BPP_8BPP		0
-+#define SCALER6_PTR2_ALPHA_ORDER_MASK		VC4_MASK(30, 30)
-+#define SCALER6_PTR2_ALPHA_ORDER_MSB_TO_LSB	1
-+#define SCALER6_PTR2_ALPHA_ORDER_LSB_TO_MSB	0
-+#define SCALER6_PTR2_ALPHA_OFFS_MASK		VC4_MASK(29, 27)
-+#define SCALER6_PTR2_LSKIP_MASK			VC4_MASK(26, 24)
-+#define SCALER6_PTR2_PITCH_MASK			VC4_MASK(16, 0)
-+#define SCALER6_PTR2_FETCH_COUNT_MASK		VC4_MASK(26, 16)
-+
- #endif /* VC4_REGS_H */
diff --git a/target/linux/bcm27xx/patches-6.1/950-0964-drm-vc4-crtc-Add-support-for-BCM2712-PixelValves.patch b/target/linux/bcm27xx/patches-6.1/950-0964-drm-vc4-crtc-Add-support-for-BCM2712-PixelValves.patch
deleted file mode 100644
index 1870158e06..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0964-drm-vc4-crtc-Add-support-for-BCM2712-PixelValves.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From 000f1b7d4dc5b515c755ee25db301e26bded00e1 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 17 Feb 2023 15:33:23 +0100
-Subject: [PATCH] drm/vc4: crtc: Add support for BCM2712 PixelValves
-
-The PixelValves found on the BCM2712 are similar to the ones found in
-the previous generation.
-
-Compared to BCM2711, the pixelvalves only drive one HDMI controller each
-and HDMI1 PixelValve has a FIFO long enough to support 4k at 60Hz.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_crtc.c | 53 ++++++++++++++++++++++++++++++++--
- drivers/gpu/drm/vc4/vc4_drv.h  |  2 ++
- drivers/gpu/drm/vc4/vc4_regs.h |  5 ++++
- 3 files changed, 58 insertions(+), 2 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_crtc.c
-+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
-@@ -239,6 +239,11 @@ static u32 vc4_get_fifo_full_level(struc
- 	const struct vc4_crtc_data *crtc_data = vc4_crtc_to_vc4_crtc_data(vc4_crtc);
- 	const struct vc4_pv_data *pv_data = vc4_crtc_to_vc4_pv_data(vc4_crtc);
- 	struct vc4_dev *vc4 = to_vc4_dev(vc4_crtc->base.dev);
-+
-+	/*
-+	 * NOTE: Could we use register 0x68 (PV_HW_CFG1) to get the FIFO
-+	 * size?
-+	 */
- 	u32 fifo_len_bytes = pv_data->fifo_depth;
- 
- 	/*
-@@ -393,6 +398,12 @@ static void vc4_crtc_config_pv(struct dr
- 
- 	vc4_crtc_pixelvalve_reset(crtc);
- 
-+	/*
-+	 * NOTE: The BCM2712 has a H_OTE (Horizontal Odd Timing Enable)
-+	 * bit that, when set, will allow to specify the timings in
-+	 * pixels instead of cycles, thus allowing to specify odd
-+	 * timings.
-+	 */
- 	CRTC_WRITE(PV_HORZA,
- 		   VC4_SET_FIELD((mode->htotal - mode->hsync_end) * pixel_rep / ppc,
- 				 PV_HORZA_HBP) |
-@@ -462,11 +473,17 @@ static void vc4_crtc_config_pv(struct dr
- 	if (is_dsi)
- 		CRTC_WRITE(PV_HACT_ACT, mode->hdisplay * pixel_rep);
- 
--	if (vc4->gen == VC4_GEN_5)
-+	if (vc4->gen >= VC4_GEN_5)
- 		CRTC_WRITE(PV_MUX_CFG,
- 			   VC4_SET_FIELD(PV_MUX_CFG_RGB_PIXEL_MUX_MODE_NO_SWAP,
- 					 PV_MUX_CFG_RGB_PIXEL_MUX_MODE));
- 
-+	if (vc4->gen >= VC4_GEN_6)
-+		CRTC_WRITE(PV_PIPE_INIT_CTRL,
-+			   VC4_SET_FIELD(1, PV_PIPE_INIT_CTRL_PV_INIT_WIDTH) |
-+			   VC4_SET_FIELD(1, PV_PIPE_INIT_CTRL_PV_INIT_IDLE) |
-+			   PV_PIPE_INIT_CTRL_PV_INIT_EN);
-+
- 	CRTC_WRITE(PV_CONTROL, PV_CONTROL_FIFO_CLR |
- 		   vc4_crtc_get_fifo_full_level_bits(vc4_crtc, format) |
- 		   VC4_SET_FIELD(format, PV_CONTROL_FORMAT) |
-@@ -565,7 +582,11 @@ int vc4_crtc_disable_at_boot(struct drm_
- 	if (!(of_device_is_compatible(vc4_crtc->pdev->dev.of_node,
- 				      "brcm,bcm2711-pixelvalve2") ||
- 	      of_device_is_compatible(vc4_crtc->pdev->dev.of_node,
--				      "brcm,bcm2711-pixelvalve4")))
-+				      "brcm,bcm2711-pixelvalve4") ||
-+	      of_device_is_compatible(vc4_crtc->pdev->dev.of_node,
-+				      "brcm,bcm2712-pixelvalve0") ||
-+	      of_device_is_compatible(vc4_crtc->pdev->dev.of_node,
-+				      "brcm,bcm2712-pixelvalve1")))
- 		return 0;
- 
- 	if (!(CRTC_READ(PV_CONTROL) & PV_CONTROL_EN))
-@@ -1304,6 +1325,32 @@ const struct vc4_pv_data bcm2711_pv4_dat
- 	},
- };
- 
-+const struct vc4_pv_data bcm2712_pv0_data = {
-+	.base = {
-+		.debugfs_name = "crtc0_regs",
-+		.hvs_available_channels = BIT(0),
-+		.hvs_output = 0,
-+	},
-+	.fifo_depth = 64,
-+	.pixels_per_clock = 2,
-+	.encoder_types = {
-+		[0] = VC4_ENCODER_TYPE_HDMI0,
-+	},
-+};
-+
-+const struct vc4_pv_data bcm2712_pv1_data = {
-+	.base = {
-+		.debugfs_name = "crtc1_regs",
-+		.hvs_available_channels = BIT(1),
-+		.hvs_output = 1,
-+	},
-+	.fifo_depth = 64,
-+	.pixels_per_clock = 2,
-+	.encoder_types = {
-+		[0] = VC4_ENCODER_TYPE_HDMI1,
-+	},
-+};
-+
- static const struct of_device_id vc4_crtc_dt_match[] = {
- 	{ .compatible = "brcm,bcm2835-pixelvalve0", .data = &bcm2835_pv0_data },
- 	{ .compatible = "brcm,bcm2835-pixelvalve1", .data = &bcm2835_pv1_data },
-@@ -1313,6 +1360,8 @@ static const struct of_device_id vc4_crt
- 	{ .compatible = "brcm,bcm2711-pixelvalve2", .data = &bcm2711_pv2_data },
- 	{ .compatible = "brcm,bcm2711-pixelvalve3", .data = &bcm2711_pv3_data },
- 	{ .compatible = "brcm,bcm2711-pixelvalve4", .data = &bcm2711_pv4_data },
-+	{ .compatible = "brcm,bcm2712-pixelvalve0", .data = &bcm2712_pv0_data },
-+	{ .compatible = "brcm,bcm2712-pixelvalve1", .data = &bcm2712_pv1_data },
- 	{}
- };
- 
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -583,6 +583,8 @@ extern const struct vc4_pv_data bcm2711_
- extern const struct vc4_pv_data bcm2711_pv2_data;
- extern const struct vc4_pv_data bcm2711_pv3_data;
- extern const struct vc4_pv_data bcm2711_pv4_data;
-+extern const struct vc4_pv_data bcm2712_pv0_data;
-+extern const struct vc4_pv_data bcm2712_pv1_data;
- 
- struct vc5_gamma_entry {
- 	u32 x_c_terms;
---- a/drivers/gpu/drm/vc4/vc4_regs.h
-+++ b/drivers/gpu/drm/vc4/vc4_regs.h
-@@ -215,6 +215,11 @@
- # define PV_MUX_CFG_RGB_PIXEL_MUX_MODE_SHIFT	2
- # define PV_MUX_CFG_RGB_PIXEL_MUX_MODE_NO_SWAP	8
- 
-+#define PV_PIPE_INIT_CTRL			0x94
-+# define PV_PIPE_INIT_CTRL_PV_INIT_WIDTH_MASK	VC4_MASK(11, 8)
-+# define PV_PIPE_INIT_CTRL_PV_INIT_IDLE_MASK	VC4_MASK(7, 4)
-+# define PV_PIPE_INIT_CTRL_PV_INIT_EN		BIT(0)
-+
- #define SCALER_CHANNELS_COUNT			3
- 
- #define SCALER_DISPCTRL                         0x00000000
diff --git a/target/linux/bcm27xx/patches-6.1/950-0965-drm-vc4-hdmi-Add-support-for-BCM2712-HDMI-controller.patch b/target/linux/bcm27xx/patches-6.1/950-0965-drm-vc4-hdmi-Add-support-for-BCM2712-HDMI-controller.patch
deleted file mode 100644
index 7cb4e5661d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0965-drm-vc4-hdmi-Add-support-for-BCM2712-HDMI-controller.patch
+++ /dev/null
@@ -1,1057 +0,0 @@
-From 1bb54596ae2a9a36f4aa9f8f2ba941320f463811 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 17 Feb 2023 15:34:30 +0100
-Subject: [PATCH] drm/vc4: hdmi: Add support for BCM2712 HDMI controllers
-
-The HDMI controllers found in the BCM2712 are largely the ones found in
-the BCM2711 with a different PHY.
-
-There's some difference with how timings are split between registers,
-and HDMI1 is now able to run at 4k/60Hz.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_hdmi.c      |  82 +++-
- drivers/gpu/drm/vc4/vc4_hdmi.h      |   4 +
- drivers/gpu/drm/vc4/vc4_hdmi_phy.c  | 640 ++++++++++++++++++++++++++++
- drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 217 ++++++++++
- 4 files changed, 937 insertions(+), 6 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hdmi.c
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -1127,6 +1127,7 @@ static void vc4_hdmi_encoder_post_crtc_d
- {
- 	struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
- 	struct drm_device *drm = vc4_hdmi->connector.dev;
-+	struct vc4_dev *vc4 = to_vc4_dev(drm);
- 	unsigned long flags;
- 	int idx;
- 
-@@ -1143,14 +1144,25 @@ static void vc4_hdmi_encoder_post_crtc_d
- 
- 	HDMI_WRITE(HDMI_VID_CTL, HDMI_READ(HDMI_VID_CTL) | VC4_HD_VID_CTL_CLRRGB);
- 
-+	if (vc4->gen >= VC4_GEN_6)
-+		HDMI_WRITE(HDMI_VID_CTL, HDMI_READ(HDMI_VID_CTL) |
-+			   VC4_HD_VID_CTL_BLANKPIX);
-+
- 	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
- 
- 	mdelay(1);
- 
--	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
--	HDMI_WRITE(HDMI_VID_CTL,
--		   HDMI_READ(HDMI_VID_CTL) & ~VC4_HD_VID_CTL_ENABLE);
--	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
-+	/*
-+	 * TODO: This should work on BCM2712, but doesn't for some
-+	 * reason and result in a system lockup.
-+	 */
-+	if (vc4->gen < VC4_GEN_6) {
-+		spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
-+		HDMI_WRITE(HDMI_VID_CTL,
-+			   HDMI_READ(HDMI_VID_CTL) &
-+			   ~VC4_HD_VID_CTL_ENABLE);
-+		spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
-+	}
- 
- 	vc4_hdmi_disable_scrambling(encoder);
- 
-@@ -1757,7 +1769,6 @@ static void vc4_hdmi_encoder_pre_crtc_co
- 		goto err_put_runtime_pm;
- 	}
- 
--
- 	vc4_hdmi_cec_update_clk_div(vc4_hdmi);
- 
- 	if (tmds_char_rate > 297000000)
-@@ -1862,6 +1873,7 @@ static void vc4_hdmi_encoder_post_crtc_e
- 	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
- 
- 	HDMI_WRITE(HDMI_VID_CTL,
-+		   HDMI_READ(HDMI_VID_CTL) |
- 		   VC4_HD_VID_CTL_ENABLE |
- 		   VC4_HD_VID_CTL_CLRRGB |
- 		   VC4_HD_VID_CTL_UNDERFLOW_ENABLE |
-@@ -3796,7 +3808,9 @@ static int vc4_hdmi_bind(struct device *
- 		return ret;
- 
- 	if ((of_device_is_compatible(dev->of_node, "brcm,bcm2711-hdmi0") ||
--	     of_device_is_compatible(dev->of_node, "brcm,bcm2711-hdmi1")) &&
-+	     of_device_is_compatible(dev->of_node, "brcm,bcm2711-hdmi1") ||
-+	     of_device_is_compatible(dev->of_node, "brcm,bcm2712-hdmi0") ||
-+	     of_device_is_compatible(dev->of_node, "brcm,bcm2712-hdmi1")) &&
- 	    HDMI_READ(HDMI_VID_CTL) & VC4_HD_VID_CTL_ENABLE) {
- 		clk_prepare_enable(vc4_hdmi->pixel_clock);
- 		clk_prepare_enable(vc4_hdmi->hsm_clock);
-@@ -3931,10 +3945,66 @@ static const struct vc4_hdmi_variant bcm
- 	.hp_detect		= vc5_hdmi_hp_detect,
- };
- 
-+static const struct vc4_hdmi_variant bcm2712_hdmi0_variant = {
-+	.encoder_type		= VC4_ENCODER_TYPE_HDMI0,
-+	.debugfs_name		= "hdmi0_regs",
-+	.card_name		= "vc4-hdmi-0",
-+	.max_pixel_clock	= 600000000,
-+	.registers		= vc6_hdmi_hdmi0_fields,
-+	.num_registers		= ARRAY_SIZE(vc6_hdmi_hdmi0_fields),
-+	.phy_lane_mapping	= {
-+		PHY_LANE_0,
-+		PHY_LANE_1,
-+		PHY_LANE_2,
-+		PHY_LANE_CK,
-+	},
-+	.unsupported_odd_h_timings	= true,
-+	.external_irq_controller	= true,
-+
-+	.init_resources		= vc5_hdmi_init_resources,
-+	.csc_setup		= vc5_hdmi_csc_setup,
-+	.reset			= vc5_hdmi_reset,
-+	.set_timings		= vc5_hdmi_set_timings,
-+	.phy_init		= vc6_hdmi_phy_init,
-+	.phy_disable		= vc6_hdmi_phy_disable,
-+	.channel_map		= vc5_hdmi_channel_map,
-+	.supports_hdr		= true,
-+	.hp_detect		= vc5_hdmi_hp_detect,
-+};
-+
-+static const struct vc4_hdmi_variant bcm2712_hdmi1_variant = {
-+	.encoder_type		= VC4_ENCODER_TYPE_HDMI1,
-+	.debugfs_name		= "hdmi1_regs",
-+	.card_name		= "vc4-hdmi-1",
-+	.max_pixel_clock	= 600000000,
-+	.registers		= vc6_hdmi_hdmi1_fields,
-+	.num_registers		= ARRAY_SIZE(vc6_hdmi_hdmi1_fields),
-+	.phy_lane_mapping	= {
-+		PHY_LANE_0,
-+		PHY_LANE_1,
-+		PHY_LANE_2,
-+		PHY_LANE_CK,
-+	},
-+	.unsupported_odd_h_timings	= true,
-+	.external_irq_controller	= true,
-+
-+	.init_resources		= vc5_hdmi_init_resources,
-+	.csc_setup		= vc5_hdmi_csc_setup,
-+	.reset			= vc5_hdmi_reset,
-+	.set_timings		= vc5_hdmi_set_timings,
-+	.phy_init		= vc6_hdmi_phy_init,
-+	.phy_disable		= vc6_hdmi_phy_disable,
-+	.channel_map		= vc5_hdmi_channel_map,
-+	.supports_hdr		= true,
-+	.hp_detect		= vc5_hdmi_hp_detect,
-+};
-+
- static const struct of_device_id vc4_hdmi_dt_match[] = {
- 	{ .compatible = "brcm,bcm2835-hdmi", .data = &bcm2835_variant },
- 	{ .compatible = "brcm,bcm2711-hdmi0", .data = &bcm2711_hdmi0_variant },
- 	{ .compatible = "brcm,bcm2711-hdmi1", .data = &bcm2711_hdmi1_variant },
-+	{ .compatible = "brcm,bcm2712-hdmi0", .data = &bcm2712_hdmi0_variant },
-+	{ .compatible = "brcm,bcm2712-hdmi1", .data = &bcm2712_hdmi1_variant },
- 	{}
- };
- 
---- a/drivers/gpu/drm/vc4/vc4_hdmi.h
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
-@@ -284,4 +284,8 @@ void vc5_hdmi_phy_disable(struct vc4_hdm
- void vc5_hdmi_phy_rng_enable(struct vc4_hdmi *vc4_hdmi);
- void vc5_hdmi_phy_rng_disable(struct vc4_hdmi *vc4_hdmi);
- 
-+void vc6_hdmi_phy_init(struct vc4_hdmi *vc4_hdmi,
-+		       struct vc4_hdmi_connector_state *vc4_conn_state);
-+void vc6_hdmi_phy_disable(struct vc4_hdmi *vc4_hdmi);
-+
- #endif /* _VC4_HDMI_H_ */
---- a/drivers/gpu/drm/vc4/vc4_hdmi_phy.c
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c
-@@ -125,6 +125,48 @@
- #define VC4_HDMI_RM_FORMAT_SHIFT_SHIFT			24
- #define VC4_HDMI_RM_FORMAT_SHIFT_MASK			VC4_MASK(25, 24)
- 
-+#define VC6_HDMI_TX_PHY_HDMI_POWERUP_CTL_BG_PWRUP	BIT(8)
-+#define VC6_HDMI_TX_PHY_HDMI_POWERUP_CTL_LDO_PWRUP	BIT(7)
-+#define VC6_HDMI_TX_PHY_HDMI_POWERUP_CTL_BIAS_PWRUP	BIT(6)
-+#define VC6_HDMI_TX_PHY_HDMI_POWERUP_CTL_RNDGEN_PWRUP	BIT(4)
-+#define VC6_HDMI_TX_PHY_HDMI_POWERUP_CTL_TX_CK_PWRUP	BIT(3)
-+#define VC6_HDMI_TX_PHY_HDMI_POWERUP_CTL_TX_2_PWRUP	BIT(2)
-+#define VC6_HDMI_TX_PHY_HDMI_POWERUP_CTL_TX_1_PWRUP	BIT(1)
-+#define VC6_HDMI_TX_PHY_HDMI_POWERUP_CTL_TX_0_PWRUP	BIT(0)
-+
-+#define VC6_HDMI_TX_PHY_PLL_REFCLK_REFCLK_SEL_CMOS	BIT(13)
-+#define VC6_HDMI_TX_PHY_PLL_REFCLK_REFFRQ_MASK		VC4_MASK(9, 0)
-+
-+#define VC6_HDMI_TX_PHY_PLL_POST_KDIV_CLK0_SEL_MASK	VC4_MASK(3, 2)
-+#define VC6_HDMI_TX_PHY_PLL_POST_KDIV_KDIV_MASK		VC4_MASK(1, 0)
-+
-+#define VC6_HDMI_TX_PHY_PLL_VCOCLK_DIV_VCODIV_EN	BIT(10)
-+#define VC6_HDMI_TX_PHY_PLL_VCOCLK_DIV_VCODIV_MASK	VC4_MASK(9, 0)
-+
-+#define VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_EXT_CURRENT_CTL_MASK	VC4_MASK(31, 28)
-+#define VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_FFE_ENABLE_MASK		VC4_MASK(27, 27)
-+#define VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_SLEW_RATE_CTL_MASK	VC4_MASK(26, 26)
-+#define VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_FFE_POST_TAP_EN_MASK	VC4_MASK(25, 25)
-+#define VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_LDMOS_BIAS_CTL_MASK	VC4_MASK(24, 23)
-+#define VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_COM_MODE_LDMOS_EN_MASK	VC4_MASK(22, 22)
-+#define VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_EDGE_SEL_MASK		VC4_MASK(21, 21)
-+#define VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_EXT_CURRENT_SRC_HS_EN_MASK	VC4_MASK(20, 20)
-+#define VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_TERM_CTL_MASK		VC4_MASK(19, 18)
-+#define VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_EXT_CURRENT_SRC_EN_MASK	VC4_MASK(17, 17)
-+#define VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_INT_CURRENT_SRC_EN_MASK	VC4_MASK(16, 16)
-+#define VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_INT_CURRENT_CTL_MASK	VC4_MASK(15, 12)
-+#define VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_INT_CURRENT_SRC_HS_EN_MASK	VC4_MASK(11, 11)
-+#define VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_MAIN_TAP_CURRENT_SELECT_MASK	VC4_MASK(10, 8)
-+#define VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_POST_TAP_CURRENT_SELECT_MASK	VC4_MASK(7, 5)
-+#define VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_SLEW_CTL_SLOW_LOADING_MASK	VC4_MASK(4, 3)
-+#define VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_SLEW_CTL_SLOW_DRIVING_MASK	VC4_MASK(2, 1)
-+#define VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_FFE_PRE_TAP_EN_MASK	VC4_MASK(0, 0)
-+
-+#define VC6_HDMI_TX_PHY_PLL_RESET_CTL_PLL_PLLPOST_RESETB	BIT(1)
-+#define VC6_HDMI_TX_PHY_PLL_RESET_CTL_PLL_RESETB	BIT(0)
-+
-+#define VC6_HDMI_TX_PHY_PLL_POWERUP_CTL_PLL_PWRUP	BIT(0)
-+
- #define OSCILLATOR_FREQUENCY	54000000
- 
- void vc4_hdmi_phy_init(struct vc4_hdmi *vc4_hdmi,
-@@ -558,3 +600,601 @@ void vc5_hdmi_phy_rng_disable(struct vc4
- 		   VC4_HDMI_TX_PHY_POWERDOWN_CTL_RNDGEN_PWRDN);
- 	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
- }
-+
-+#define VC6_VCO_MIN_FREQ	(8ULL * 1000 * 1000 * 1000)
-+#define VC6_VCO_MAX_FREQ	(12ULL * 1000 * 1000 * 1000)
-+
-+static unsigned long long
-+vc6_phy_get_vco_freq(unsigned long long tmds_rate, unsigned int *vco_div)
-+{
-+	unsigned int min_div;
-+	unsigned int max_div;
-+	unsigned int div;
-+
-+	div = 0;
-+	while (tmds_rate * div * 10 < VC6_VCO_MIN_FREQ)
-+		div++;
-+	min_div = div;
-+
-+	while (tmds_rate * (div + 1) * 10 < VC6_VCO_MAX_FREQ)
-+		div++;
-+	max_div = div;
-+
-+	div = min_div + (max_div - min_div) / 2;
-+
-+	*vco_div = div;
-+	return tmds_rate * div * 10;
-+}
-+
-+struct vc6_phy_lane_settings {
-+	unsigned int ext_current_ctl:4;
-+	unsigned int ffe_enable:1;
-+	unsigned int slew_rate_ctl:1;
-+	unsigned int ffe_post_tap_en:1;
-+	unsigned int ldmos_bias_ctl:2;
-+	unsigned int com_mode_ldmos_en:1;
-+	unsigned int edge_sel:1;
-+	unsigned int ext_current_src_hs_en:1;
-+	unsigned int term_ctl:2;
-+	unsigned int ext_current_src_en:1;
-+	unsigned int int_current_src_en:1;
-+	unsigned int int_current_ctl:4;
-+	unsigned int int_current_src_hs_en:1;
-+	unsigned int main_tap_current_select:3;
-+	unsigned int post_tap_current_select:3;
-+	unsigned int slew_ctl_slow_loading:2;
-+	unsigned int slew_ctl_slow_driving:2;
-+	unsigned int ffe_pre_tap_en:1;
-+};
-+
-+struct vc6_phy_settings {
-+	unsigned long long min_rate;
-+	unsigned long long max_rate;
-+	struct vc6_phy_lane_settings channel[3];
-+	struct vc6_phy_lane_settings clock;
-+};
-+
-+static const struct vc6_phy_settings vc6_hdmi_phy_settings[] = {
-+	{
-+		0, 222000000,
-+		{
-+			{
-+				/* 200mA */
-+				.ext_current_ctl = 8,
-+
-+				/* 0.85V */
-+				.ldmos_bias_ctl = 1,
-+
-+				/* Enable External Current Source */
-+				.ext_current_src_en = 1,
-+
-+				/* 200mA */
-+				.int_current_ctl = 8,
-+
-+				/* 17.6 mA */
-+				.main_tap_current_select = 7,
-+			},
-+			{
-+				/* 200mA */
-+				.ext_current_ctl = 8,
-+
-+				/* 0.85V */
-+				.ldmos_bias_ctl = 1,
-+
-+				/* Enable External Current Source */
-+				.ext_current_src_en = 1,
-+
-+				/* 200mA */
-+				.int_current_ctl = 8,
-+
-+				/* 17.6 mA */
-+				.main_tap_current_select = 7,
-+			},
-+			{
-+				/* 200mA */
-+				.ext_current_ctl = 8,
-+
-+				/* 0.85V */
-+				.ldmos_bias_ctl = 1,
-+
-+				/* Enable External Current Source */
-+				.ext_current_src_en = 1,
-+
-+				/* 200mA */
-+				.int_current_ctl = 8,
-+
-+				/* 17.6 mA */
-+				.main_tap_current_select = 7,
-+			},
-+		},
-+		{
-+			/* 200mA */
-+			.ext_current_ctl = 8,
-+
-+			/* 0.85V */
-+			.ldmos_bias_ctl = 1,
-+
-+			/* Enable External Current Source */
-+			.ext_current_src_en = 1,
-+
-+			/* 200mA */
-+			.int_current_ctl = 8,
-+
-+			/* 17.6 mA */
-+			.main_tap_current_select = 7,
-+		},
-+	},
-+	{
-+		222000001, 297000000,
-+		{
-+			{
-+				/* 200mA and 180mA ?! */
-+				.ext_current_ctl = 12,
-+
-+				/* 0.85V */
-+				.ldmos_bias_ctl = 1,
-+
-+				/* 100 Ohm */
-+				.term_ctl = 1,
-+
-+				/* Enable External Current Source */
-+				.ext_current_src_en = 1,
-+
-+				/* Enable Internal Current Source */
-+				.int_current_src_en = 1,
-+			},
-+			{
-+				/* 200mA and 180mA ?! */
-+				.ext_current_ctl = 12,
-+
-+				/* 0.85V */
-+				.ldmos_bias_ctl = 1,
-+
-+				/* 100 Ohm */
-+				.term_ctl = 1,
-+
-+				/* Enable External Current Source */
-+				.ext_current_src_en = 1,
-+
-+				/* Enable Internal Current Source */
-+				.int_current_src_en = 1,
-+			},
-+			{
-+				/* 200mA and 180mA ?! */
-+				.ext_current_ctl = 12,
-+
-+				/* 0.85V */
-+				.ldmos_bias_ctl = 1,
-+
-+				/* 100 Ohm */
-+				.term_ctl = 1,
-+
-+				/* Enable External Current Source */
-+				.ext_current_src_en = 1,
-+
-+				/* Enable Internal Current Source */
-+				.int_current_src_en = 1,
-+			},
-+		},
-+		{
-+			/* 200mA and 180mA ?! */
-+			.ext_current_ctl = 12,
-+
-+			/* 0.85V */
-+			.ldmos_bias_ctl = 1,
-+
-+			/* 100 Ohm */
-+			.term_ctl = 1,
-+
-+			/* Enable External Current Source */
-+			.ext_current_src_en = 1,
-+
-+			/* Enable Internal Current Source */
-+			.int_current_src_en = 1,
-+
-+			/* Internal Current Source Half Swing Enable*/
-+			.int_current_src_hs_en = 1,
-+		},
-+	},
-+	{
-+		297000001, 597000044,
-+		{
-+			{
-+				/* 200mA */
-+				.ext_current_ctl = 8,
-+
-+				/* Normal Slew Rate Control */
-+				.slew_rate_ctl = 1,
-+
-+				/* 0.85V */
-+				.ldmos_bias_ctl = 1,
-+
-+				/* 50 Ohms */
-+				.term_ctl = 3,
-+
-+				/* Enable External Current Source */
-+				.ext_current_src_en = 1,
-+
-+				/* Enable Internal Current Source */
-+				.int_current_src_en = 1,
-+
-+				/* 200mA */
-+				.int_current_ctl = 8,
-+
-+				/* 17.6 mA */
-+				.main_tap_current_select = 7,
-+			},
-+			{
-+				/* 200mA */
-+				.ext_current_ctl = 8,
-+
-+				/* Normal Slew Rate Control */
-+				.slew_rate_ctl = 1,
-+
-+				/* 0.85V */
-+				.ldmos_bias_ctl = 1,
-+
-+				/* 50 Ohms */
-+				.term_ctl = 3,
-+
-+				/* Enable External Current Source */
-+				.ext_current_src_en = 1,
-+
-+				/* Enable Internal Current Source */
-+				.int_current_src_en = 1,
-+
-+				/* 200mA */
-+				.int_current_ctl = 8,
-+
-+				/* 17.6 mA */
-+				.main_tap_current_select = 7,
-+			},
-+			{
-+				/* 200mA */
-+				.ext_current_ctl = 8,
-+
-+				/* Normal Slew Rate Control */
-+				.slew_rate_ctl = 1,
-+
-+				/* 0.85V */
-+				.ldmos_bias_ctl = 1,
-+
-+				/* 50 Ohms */
-+				.term_ctl = 3,
-+
-+				/* Enable External Current Source */
-+				.ext_current_src_en = 1,
-+
-+				/* Enable Internal Current Source */
-+				.int_current_src_en = 1,
-+
-+				/* 200mA */
-+				.int_current_ctl = 8,
-+
-+				/* 17.6 mA */
-+				.main_tap_current_select = 7,
-+			},
-+		},
-+		{
-+			/* 200mA */
-+			.ext_current_ctl = 8,
-+
-+			/* Normal Slew Rate Control */
-+			.slew_rate_ctl = 1,
-+
-+			/* 0.85V */
-+			.ldmos_bias_ctl = 1,
-+
-+			/* External Current Source Half Swing Enable*/
-+			.ext_current_src_hs_en = 1,
-+
-+			/* 50 Ohms */
-+			.term_ctl = 3,
-+
-+			/* Enable External Current Source */
-+			.ext_current_src_en = 1,
-+
-+			/* Enable Internal Current Source */
-+			.int_current_src_en = 1,
-+
-+			/* 200mA */
-+			.int_current_ctl = 8,
-+
-+			/* Internal Current Source Half Swing Enable*/
-+			.int_current_src_hs_en = 1,
-+
-+			/* 17.6 mA */
-+			.main_tap_current_select = 7,
-+		},
-+	},
-+};
-+
-+static const struct vc6_phy_settings *
-+vc6_phy_get_settings(unsigned long long tmds_rate)
-+{
-+	unsigned int count = ARRAY_SIZE(vc6_hdmi_phy_settings);
-+	unsigned int i;
-+
-+	for (i = 0; i < count; i++) {
-+		const struct vc6_phy_settings *s = &vc6_hdmi_phy_settings[i];
-+
-+		if (tmds_rate >= s->min_rate && tmds_rate <= s->max_rate)
-+			return s;
-+	}
-+
-+	/*
-+	 * If the pixel clock exceeds our max setting, try the max
-+	 * setting anyway.
-+	 */
-+	return &vc6_hdmi_phy_settings[count - 1];
-+}
-+
-+static const struct vc6_phy_lane_settings *
-+vc6_phy_get_channel_settings(enum vc4_hdmi_phy_channel chan,
-+			     unsigned long long tmds_rate)
-+{
-+	const struct vc6_phy_settings *settings = vc6_phy_get_settings(tmds_rate);
-+
-+	if (chan == PHY_LANE_CK)
-+		return &settings->clock;
-+
-+	return &settings->channel[chan];
-+}
-+
-+static void vc6_hdmi_reset_phy(struct vc4_hdmi *vc4_hdmi)
-+{
-+	lockdep_assert_held(&vc4_hdmi->hw_lock);
-+
-+	HDMI_WRITE(HDMI_TX_PHY_RESET_CTL, 0);
-+	HDMI_WRITE(HDMI_TX_PHY_POWERUP_CTL, 0);
-+}
-+
-+void vc6_hdmi_phy_init(struct vc4_hdmi *vc4_hdmi,
-+		       struct vc4_hdmi_connector_state *conn_state)
-+{
-+	const struct vc6_phy_lane_settings *chan0_settings;
-+	const struct vc6_phy_lane_settings *chan1_settings;
-+	const struct vc6_phy_lane_settings *chan2_settings;
-+	const struct vc6_phy_lane_settings *clock_settings;
-+	const struct vc4_hdmi_variant *variant = vc4_hdmi->variant;
-+	unsigned long long pixel_freq = conn_state->tmds_char_rate;
-+	unsigned long long vco_freq;
-+	unsigned char word_sel;
-+	unsigned long flags;
-+	unsigned int vco_div;
-+
-+	vco_freq = vc6_phy_get_vco_freq(pixel_freq, &vco_div);
-+
-+	spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
-+
-+	vc6_hdmi_reset_phy(vc4_hdmi);
-+
-+	HDMI_WRITE(HDMI_TX_PHY_PLL_MISC_0, 0x810c6000);
-+	HDMI_WRITE(HDMI_TX_PHY_PLL_MISC_1, 0x00b8c451);
-+	HDMI_WRITE(HDMI_TX_PHY_PLL_MISC_2, 0x46402e31);
-+	HDMI_WRITE(HDMI_TX_PHY_PLL_MISC_3, 0x00b8c005);
-+	HDMI_WRITE(HDMI_TX_PHY_PLL_MISC_4, 0x42410261);
-+	HDMI_WRITE(HDMI_TX_PHY_PLL_MISC_5, 0xcc021001);
-+	HDMI_WRITE(HDMI_TX_PHY_PLL_MISC_6, 0xc8301c80);
-+	HDMI_WRITE(HDMI_TX_PHY_PLL_MISC_7, 0xb0804444);
-+	HDMI_WRITE(HDMI_TX_PHY_PLL_MISC_8, 0xf80f8000);
-+
-+	HDMI_WRITE(HDMI_TX_PHY_PLL_REFCLK,
-+		   VC6_HDMI_TX_PHY_PLL_REFCLK_REFCLK_SEL_CMOS |
-+		   VC4_SET_FIELD(54, VC6_HDMI_TX_PHY_PLL_REFCLK_REFFRQ));
-+
-+	HDMI_WRITE(HDMI_TX_PHY_RESET_CTL, 0x7f);
-+
-+	HDMI_WRITE(HDMI_RM_OFFSET,
-+		   VC4_HDMI_RM_OFFSET_ONLY |
-+		   VC4_SET_FIELD(phy_get_rm_offset(vco_freq),
-+				 VC4_HDMI_RM_OFFSET_OFFSET));
-+
-+	HDMI_WRITE(HDMI_TX_PHY_PLL_VCOCLK_DIV,
-+		   VC6_HDMI_TX_PHY_PLL_VCOCLK_DIV_VCODIV_EN |
-+		   VC4_SET_FIELD(vco_div,
-+				 VC6_HDMI_TX_PHY_PLL_VCOCLK_DIV_VCODIV));
-+
-+	HDMI_WRITE(HDMI_TX_PHY_PLL_CFG,
-+		   VC4_SET_FIELD(0, VC4_HDMI_TX_PHY_PLL_CFG_PDIV));
-+
-+	HDMI_WRITE(HDMI_TX_PHY_PLL_POST_KDIV,
-+		   VC4_SET_FIELD(2, VC6_HDMI_TX_PHY_PLL_POST_KDIV_CLK0_SEL) |
-+		   VC4_SET_FIELD(1, VC6_HDMI_TX_PHY_PLL_POST_KDIV_KDIV));
-+
-+	chan0_settings =
-+		vc6_phy_get_channel_settings(variant->phy_lane_mapping[PHY_LANE_0],
-+					     pixel_freq);
-+	HDMI_WRITE(HDMI_TX_PHY_CTL_0,
-+		   VC4_SET_FIELD(chan0_settings->ext_current_ctl,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_EXT_CURRENT_CTL) |
-+		   VC4_SET_FIELD(chan0_settings->ffe_enable,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_FFE_ENABLE) |
-+		   VC4_SET_FIELD(chan0_settings->slew_rate_ctl,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_SLEW_RATE_CTL) |
-+		   VC4_SET_FIELD(chan0_settings->ffe_post_tap_en,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_FFE_POST_TAP_EN) |
-+		   VC4_SET_FIELD(chan0_settings->ldmos_bias_ctl,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_LDMOS_BIAS_CTL) |
-+		   VC4_SET_FIELD(chan0_settings->com_mode_ldmos_en,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_COM_MODE_LDMOS_EN) |
-+		   VC4_SET_FIELD(chan0_settings->edge_sel,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_EDGE_SEL) |
-+		   VC4_SET_FIELD(chan0_settings->ext_current_src_hs_en,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_EXT_CURRENT_SRC_HS_EN) |
-+		   VC4_SET_FIELD(chan0_settings->term_ctl,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_TERM_CTL) |
-+		   VC4_SET_FIELD(chan0_settings->ext_current_src_en,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_EXT_CURRENT_SRC_EN) |
-+		   VC4_SET_FIELD(chan0_settings->int_current_src_en,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_INT_CURRENT_SRC_EN) |
-+		   VC4_SET_FIELD(chan0_settings->int_current_ctl,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_INT_CURRENT_CTL) |
-+		   VC4_SET_FIELD(chan0_settings->int_current_src_hs_en,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_INT_CURRENT_SRC_HS_EN) |
-+		   VC4_SET_FIELD(chan0_settings->main_tap_current_select,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_MAIN_TAP_CURRENT_SELECT) |
-+		   VC4_SET_FIELD(chan0_settings->post_tap_current_select,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_POST_TAP_CURRENT_SELECT) |
-+		   VC4_SET_FIELD(chan0_settings->slew_ctl_slow_loading,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_SLEW_CTL_SLOW_LOADING) |
-+		   VC4_SET_FIELD(chan0_settings->slew_ctl_slow_driving,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_SLEW_CTL_SLOW_DRIVING) |
-+		   VC4_SET_FIELD(chan0_settings->ffe_pre_tap_en,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_FFE_PRE_TAP_EN));
-+
-+	chan1_settings =
-+		vc6_phy_get_channel_settings(variant->phy_lane_mapping[PHY_LANE_1],
-+					     pixel_freq);
-+	HDMI_WRITE(HDMI_TX_PHY_CTL_1,
-+		   VC4_SET_FIELD(chan1_settings->ext_current_ctl,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_EXT_CURRENT_CTL) |
-+		   VC4_SET_FIELD(chan1_settings->ffe_enable,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_FFE_ENABLE) |
-+		   VC4_SET_FIELD(chan1_settings->slew_rate_ctl,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_SLEW_RATE_CTL) |
-+		   VC4_SET_FIELD(chan1_settings->ffe_post_tap_en,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_FFE_POST_TAP_EN) |
-+		   VC4_SET_FIELD(chan1_settings->ldmos_bias_ctl,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_LDMOS_BIAS_CTL) |
-+		   VC4_SET_FIELD(chan1_settings->com_mode_ldmos_en,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_COM_MODE_LDMOS_EN) |
-+		   VC4_SET_FIELD(chan1_settings->edge_sel,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_EDGE_SEL) |
-+		   VC4_SET_FIELD(chan1_settings->ext_current_src_hs_en,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_EXT_CURRENT_SRC_HS_EN) |
-+		   VC4_SET_FIELD(chan1_settings->term_ctl,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_TERM_CTL) |
-+		   VC4_SET_FIELD(chan1_settings->ext_current_src_en,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_EXT_CURRENT_SRC_EN) |
-+		   VC4_SET_FIELD(chan1_settings->int_current_src_en,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_INT_CURRENT_SRC_EN) |
-+		   VC4_SET_FIELD(chan1_settings->int_current_ctl,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_INT_CURRENT_CTL) |
-+		   VC4_SET_FIELD(chan1_settings->int_current_src_hs_en,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_INT_CURRENT_SRC_HS_EN) |
-+		   VC4_SET_FIELD(chan1_settings->main_tap_current_select,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_MAIN_TAP_CURRENT_SELECT) |
-+		   VC4_SET_FIELD(chan1_settings->post_tap_current_select,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_POST_TAP_CURRENT_SELECT) |
-+		   VC4_SET_FIELD(chan1_settings->slew_ctl_slow_loading,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_SLEW_CTL_SLOW_LOADING) |
-+		   VC4_SET_FIELD(chan1_settings->slew_ctl_slow_driving,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_SLEW_CTL_SLOW_DRIVING) |
-+		   VC4_SET_FIELD(chan1_settings->ffe_pre_tap_en,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_FFE_PRE_TAP_EN));
-+
-+	chan2_settings =
-+		vc6_phy_get_channel_settings(variant->phy_lane_mapping[PHY_LANE_2],
-+					     pixel_freq);
-+	HDMI_WRITE(HDMI_TX_PHY_CTL_2,
-+		   VC4_SET_FIELD(chan2_settings->ext_current_ctl,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_EXT_CURRENT_CTL) |
-+		   VC4_SET_FIELD(chan2_settings->ffe_enable,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_FFE_ENABLE) |
-+		   VC4_SET_FIELD(chan2_settings->slew_rate_ctl,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_SLEW_RATE_CTL) |
-+		   VC4_SET_FIELD(chan2_settings->ffe_post_tap_en,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_FFE_POST_TAP_EN) |
-+		   VC4_SET_FIELD(chan2_settings->ldmos_bias_ctl,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_LDMOS_BIAS_CTL) |
-+		   VC4_SET_FIELD(chan2_settings->com_mode_ldmos_en,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_COM_MODE_LDMOS_EN) |
-+		   VC4_SET_FIELD(chan2_settings->edge_sel,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_EDGE_SEL) |
-+		   VC4_SET_FIELD(chan2_settings->ext_current_src_hs_en,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_EXT_CURRENT_SRC_HS_EN) |
-+		   VC4_SET_FIELD(chan2_settings->term_ctl,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_TERM_CTL) |
-+		   VC4_SET_FIELD(chan2_settings->ext_current_src_en,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_EXT_CURRENT_SRC_EN) |
-+		   VC4_SET_FIELD(chan2_settings->int_current_src_en,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_INT_CURRENT_SRC_EN) |
-+		   VC4_SET_FIELD(chan2_settings->int_current_ctl,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_INT_CURRENT_CTL) |
-+		   VC4_SET_FIELD(chan2_settings->int_current_src_hs_en,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_INT_CURRENT_SRC_HS_EN) |
-+		   VC4_SET_FIELD(chan2_settings->main_tap_current_select,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_MAIN_TAP_CURRENT_SELECT) |
-+		   VC4_SET_FIELD(chan2_settings->post_tap_current_select,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_POST_TAP_CURRENT_SELECT) |
-+		   VC4_SET_FIELD(chan2_settings->slew_ctl_slow_loading,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_SLEW_CTL_SLOW_LOADING) |
-+		   VC4_SET_FIELD(chan2_settings->slew_ctl_slow_driving,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_SLEW_CTL_SLOW_DRIVING) |
-+		   VC4_SET_FIELD(chan2_settings->ffe_pre_tap_en,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_FFE_PRE_TAP_EN));
-+
-+	clock_settings =
-+		vc6_phy_get_channel_settings(variant->phy_lane_mapping[PHY_LANE_CK],
-+					     pixel_freq);
-+	HDMI_WRITE(HDMI_TX_PHY_CTL_CK,
-+		   VC4_SET_FIELD(clock_settings->ext_current_ctl,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_EXT_CURRENT_CTL) |
-+		   VC4_SET_FIELD(clock_settings->ffe_enable,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_FFE_ENABLE) |
-+		   VC4_SET_FIELD(clock_settings->slew_rate_ctl,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_SLEW_RATE_CTL) |
-+		   VC4_SET_FIELD(clock_settings->ffe_post_tap_en,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_FFE_POST_TAP_EN) |
-+		   VC4_SET_FIELD(clock_settings->ldmos_bias_ctl,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_LDMOS_BIAS_CTL) |
-+		   VC4_SET_FIELD(clock_settings->com_mode_ldmos_en,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_COM_MODE_LDMOS_EN) |
-+		   VC4_SET_FIELD(clock_settings->edge_sel,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_EDGE_SEL) |
-+		   VC4_SET_FIELD(clock_settings->ext_current_src_hs_en,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_EXT_CURRENT_SRC_HS_EN) |
-+		   VC4_SET_FIELD(clock_settings->term_ctl,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_TERM_CTL) |
-+		   VC4_SET_FIELD(clock_settings->ext_current_src_en,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_EXT_CURRENT_SRC_EN) |
-+		   VC4_SET_FIELD(clock_settings->int_current_src_en,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_INT_CURRENT_SRC_EN) |
-+		   VC4_SET_FIELD(clock_settings->int_current_ctl,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_INT_CURRENT_CTL) |
-+		   VC4_SET_FIELD(clock_settings->int_current_src_hs_en,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_INT_CURRENT_SRC_HS_EN) |
-+		   VC4_SET_FIELD(clock_settings->main_tap_current_select,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_MAIN_TAP_CURRENT_SELECT) |
-+		   VC4_SET_FIELD(clock_settings->post_tap_current_select,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_POST_TAP_CURRENT_SELECT) |
-+		   VC4_SET_FIELD(clock_settings->slew_ctl_slow_loading,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_SLEW_CTL_SLOW_LOADING) |
-+		   VC4_SET_FIELD(clock_settings->slew_ctl_slow_driving,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_SLEW_CTL_SLOW_DRIVING) |
-+		   VC4_SET_FIELD(clock_settings->ffe_pre_tap_en,
-+				 VC6_HDMI_TX_PHY_HDMI_CTRL_CHX_FFE_PRE_TAP_EN));
-+
-+	if (pixel_freq >= 340000000)
-+		word_sel = 3;
-+	else
-+		word_sel = 0;
-+	HDMI_WRITE(HDMI_TX_PHY_TMDS_CLK_WORD_SEL, word_sel);
-+
-+	HDMI_WRITE(HDMI_TX_PHY_POWERUP_CTL,
-+		   VC6_HDMI_TX_PHY_HDMI_POWERUP_CTL_BG_PWRUP |
-+		   VC6_HDMI_TX_PHY_HDMI_POWERUP_CTL_LDO_PWRUP |
-+		   VC6_HDMI_TX_PHY_HDMI_POWERUP_CTL_BIAS_PWRUP |
-+		   VC6_HDMI_TX_PHY_HDMI_POWERUP_CTL_TX_CK_PWRUP |
-+		   VC6_HDMI_TX_PHY_HDMI_POWERUP_CTL_TX_2_PWRUP |
-+		   VC6_HDMI_TX_PHY_HDMI_POWERUP_CTL_TX_1_PWRUP |
-+		   VC6_HDMI_TX_PHY_HDMI_POWERUP_CTL_TX_0_PWRUP);
-+
-+	HDMI_WRITE(HDMI_TX_PHY_PLL_POWERUP_CTL,
-+		   VC6_HDMI_TX_PHY_PLL_POWERUP_CTL_PLL_PWRUP);
-+
-+	HDMI_WRITE(HDMI_TX_PHY_PLL_RESET_CTL,
-+		   HDMI_READ(HDMI_TX_PHY_PLL_RESET_CTL) &
-+		   ~VC6_HDMI_TX_PHY_PLL_RESET_CTL_PLL_RESETB);
-+
-+	HDMI_WRITE(HDMI_TX_PHY_PLL_RESET_CTL,
-+		   HDMI_READ(HDMI_TX_PHY_PLL_RESET_CTL) |
-+		   VC6_HDMI_TX_PHY_PLL_RESET_CTL_PLL_RESETB);
-+
-+	spin_unlock_irqrestore(&vc4_hdmi->hw_lock, flags);
-+}
-+
-+void vc6_hdmi_phy_disable(struct vc4_hdmi *vc4_hdmi)
-+{
-+}
---- a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
-@@ -111,13 +111,30 @@ enum vc4_hdmi_field {
- 	HDMI_TX_PHY_CTL_1,
- 	HDMI_TX_PHY_CTL_2,
- 	HDMI_TX_PHY_CTL_3,
-+	HDMI_TX_PHY_CTL_CK,
- 	HDMI_TX_PHY_PLL_CALIBRATION_CONFIG_1,
- 	HDMI_TX_PHY_PLL_CALIBRATION_CONFIG_2,
- 	HDMI_TX_PHY_PLL_CALIBRATION_CONFIG_4,
- 	HDMI_TX_PHY_PLL_CFG,
-+	HDMI_TX_PHY_PLL_CFG_PDIV,
- 	HDMI_TX_PHY_PLL_CTL_0,
- 	HDMI_TX_PHY_PLL_CTL_1,
-+	HDMI_TX_PHY_PLL_MISC_0,
-+	HDMI_TX_PHY_PLL_MISC_1,
-+	HDMI_TX_PHY_PLL_MISC_2,
-+	HDMI_TX_PHY_PLL_MISC_3,
-+	HDMI_TX_PHY_PLL_MISC_4,
-+	HDMI_TX_PHY_PLL_MISC_5,
-+	HDMI_TX_PHY_PLL_MISC_6,
-+	HDMI_TX_PHY_PLL_MISC_7,
-+	HDMI_TX_PHY_PLL_MISC_8,
-+	HDMI_TX_PHY_PLL_POST_KDIV,
-+	HDMI_TX_PHY_PLL_POWERUP_CTL,
-+	HDMI_TX_PHY_PLL_REFCLK,
-+	HDMI_TX_PHY_PLL_RESET_CTL,
-+	HDMI_TX_PHY_PLL_VCOCLK_DIV,
- 	HDMI_TX_PHY_POWERDOWN_CTL,
-+	HDMI_TX_PHY_POWERUP_CTL,
- 	HDMI_TX_PHY_RESET_CTL,
- 	HDMI_TX_PHY_TMDS_CLK_WORD_SEL,
- 	HDMI_VEC_INTERFACE_CFG,
-@@ -383,6 +400,206 @@ static const struct vc4_hdmi_register __
- 
- 	VC5_RM_REG(HDMI_RM_CONTROL, 0x000),
- 	VC5_RM_REG(HDMI_RM_OFFSET, 0x018),
-+	VC5_RM_REG(HDMI_RM_FORMAT, 0x01c),
-+
-+	VC5_RAM_REG(HDMI_RAM_PACKET_START, 0x000),
-+
-+	VC5_CEC_REG(HDMI_CEC_CNTRL_1, 0x010),
-+	VC5_CEC_REG(HDMI_CEC_CNTRL_2, 0x014),
-+	VC5_CEC_REG(HDMI_CEC_CNTRL_3, 0x018),
-+	VC5_CEC_REG(HDMI_CEC_CNTRL_4, 0x01c),
-+	VC5_CEC_REG(HDMI_CEC_CNTRL_5, 0x020),
-+	VC5_CEC_REG(HDMI_CEC_TX_DATA_1, 0x028),
-+	VC5_CEC_REG(HDMI_CEC_TX_DATA_2, 0x02c),
-+	VC5_CEC_REG(HDMI_CEC_TX_DATA_3, 0x030),
-+	VC5_CEC_REG(HDMI_CEC_TX_DATA_4, 0x034),
-+	VC5_CEC_REG(HDMI_CEC_RX_DATA_1, 0x038),
-+	VC5_CEC_REG(HDMI_CEC_RX_DATA_2, 0x03c),
-+	VC5_CEC_REG(HDMI_CEC_RX_DATA_3, 0x040),
-+	VC5_CEC_REG(HDMI_CEC_RX_DATA_4, 0x044),
-+
-+	VC5_CSC_REG(HDMI_CSC_CTL, 0x000),
-+	VC5_CSC_REG(HDMI_CSC_12_11, 0x004),
-+	VC5_CSC_REG(HDMI_CSC_14_13, 0x008),
-+	VC5_CSC_REG(HDMI_CSC_22_21, 0x00c),
-+	VC5_CSC_REG(HDMI_CSC_24_23, 0x010),
-+	VC5_CSC_REG(HDMI_CSC_32_31, 0x014),
-+	VC5_CSC_REG(HDMI_CSC_34_33, 0x018),
-+	VC5_CSC_REG(HDMI_CSC_CHANNEL_CTL, 0x02c),
-+};
-+
-+static const struct vc4_hdmi_register __maybe_unused vc6_hdmi_hdmi0_fields[] = {
-+	VC4_HD_REG(HDMI_DVP_CTL, 0x0000),
-+	VC4_HD_REG(HDMI_MAI_CTL, 0x0010),
-+	VC4_HD_REG(HDMI_MAI_THR, 0x0014),
-+	VC4_HD_REG(HDMI_MAI_FMT, 0x0018),
-+	VC4_HD_REG(HDMI_MAI_DATA, 0x001c),
-+	VC4_HD_REG(HDMI_MAI_SMP, 0x0020),
-+	VC4_HD_REG(HDMI_VID_CTL, 0x0044),
-+	VC4_HD_REG(HDMI_FRAME_COUNT, 0x0060),
-+
-+	VC4_HDMI_REG(HDMI_FIFO_CTL, 0x07c),
-+	VC4_HDMI_REG(HDMI_AUDIO_PACKET_CONFIG, 0x0c0),
-+	VC4_HDMI_REG(HDMI_RAM_PACKET_CONFIG, 0x0c4),
-+	VC4_HDMI_REG(HDMI_RAM_PACKET_STATUS, 0x0cc),
-+	VC4_HDMI_REG(HDMI_CRP_CFG, 0x0d0),
-+	VC4_HDMI_REG(HDMI_CTS_0, 0x0d4),
-+	VC4_HDMI_REG(HDMI_CTS_1, 0x0d8),
-+	VC4_HDMI_REG(HDMI_SCHEDULER_CONTROL, 0x0e8),
-+	VC4_HDMI_REG(HDMI_HORZA, 0x0ec),
-+	VC4_HDMI_REG(HDMI_HORZB, 0x0f0),
-+	VC4_HDMI_REG(HDMI_VERTA0, 0x0f4),
-+	VC4_HDMI_REG(HDMI_VERTB0, 0x0f8),
-+	VC4_HDMI_REG(HDMI_VERTA1, 0x100),
-+	VC4_HDMI_REG(HDMI_VERTB1, 0x104),
-+	VC4_HDMI_REG(HDMI_MISC_CONTROL, 0x114),
-+	VC4_HDMI_REG(HDMI_MAI_CHANNEL_MAP, 0x0a4),
-+	VC4_HDMI_REG(HDMI_MAI_CONFIG, 0x0a8),
-+	VC4_HDMI_REG(HDMI_FORMAT_DET_1, 0x148),
-+	VC4_HDMI_REG(HDMI_FORMAT_DET_2, 0x14c),
-+	VC4_HDMI_REG(HDMI_FORMAT_DET_3, 0x150),
-+	VC4_HDMI_REG(HDMI_FORMAT_DET_4, 0x158),
-+	VC4_HDMI_REG(HDMI_FORMAT_DET_5, 0x15c),
-+	VC4_HDMI_REG(HDMI_FORMAT_DET_6, 0x160),
-+	VC4_HDMI_REG(HDMI_FORMAT_DET_7, 0x164),
-+	VC4_HDMI_REG(HDMI_FORMAT_DET_8, 0x168),
-+	VC4_HDMI_REG(HDMI_FORMAT_DET_9, 0x16c),
-+	VC4_HDMI_REG(HDMI_FORMAT_DET_10, 0x170),
-+	VC4_HDMI_REG(HDMI_DEEP_COLOR_CONFIG_1, 0x18c),
-+	VC4_HDMI_REG(HDMI_GCP_CONFIG, 0x194),
-+	VC4_HDMI_REG(HDMI_GCP_WORD_1, 0x198),
-+	VC4_HDMI_REG(HDMI_HOTPLUG, 0x1c8),
-+	VC4_HDMI_REG(HDMI_SCRAMBLER_CTL, 0x1e4),
-+
-+	VC5_DVP_REG(HDMI_CLOCK_STOP, 0x0bc),
-+	VC5_DVP_REG(HDMI_VEC_INTERFACE_CFG, 0x0f0),
-+	VC5_DVP_REG(HDMI_VEC_INTERFACE_XBAR, 0x0f4),
-+
-+	VC5_PHY_REG(HDMI_TX_PHY_RESET_CTL, 0x000),
-+	VC5_PHY_REG(HDMI_TX_PHY_POWERUP_CTL, 0x004),
-+	VC5_PHY_REG(HDMI_TX_PHY_CTL_0, 0x008),
-+	VC5_PHY_REG(HDMI_TX_PHY_CTL_1, 0x00c),
-+	VC5_PHY_REG(HDMI_TX_PHY_CTL_2, 0x010),
-+	VC5_PHY_REG(HDMI_TX_PHY_CTL_CK, 0x014),
-+	VC5_PHY_REG(HDMI_TX_PHY_PLL_REFCLK, 0x01c),
-+	VC5_PHY_REG(HDMI_TX_PHY_PLL_POST_KDIV, 0x028),
-+	VC5_PHY_REG(HDMI_TX_PHY_PLL_VCOCLK_DIV, 0x02c),
-+	VC5_PHY_REG(HDMI_TX_PHY_PLL_CFG, 0x044),
-+	VC5_PHY_REG(HDMI_TX_PHY_TMDS_CLK_WORD_SEL, 0x054),
-+	VC5_PHY_REG(HDMI_TX_PHY_PLL_MISC_0, 0x060),
-+	VC5_PHY_REG(HDMI_TX_PHY_PLL_MISC_1, 0x064),
-+	VC5_PHY_REG(HDMI_TX_PHY_PLL_MISC_2, 0x068),
-+	VC5_PHY_REG(HDMI_TX_PHY_PLL_MISC_3, 0x06c),
-+	VC5_PHY_REG(HDMI_TX_PHY_PLL_MISC_4, 0x070),
-+	VC5_PHY_REG(HDMI_TX_PHY_PLL_MISC_5, 0x074),
-+	VC5_PHY_REG(HDMI_TX_PHY_PLL_MISC_6, 0x078),
-+	VC5_PHY_REG(HDMI_TX_PHY_PLL_MISC_7, 0x07c),
-+	VC5_PHY_REG(HDMI_TX_PHY_PLL_MISC_8, 0x080),
-+	VC5_PHY_REG(HDMI_TX_PHY_PLL_RESET_CTL, 0x190),
-+	VC5_PHY_REG(HDMI_TX_PHY_PLL_POWERUP_CTL, 0x194),
-+
-+	VC5_RM_REG(HDMI_RM_CONTROL, 0x000),
-+	VC5_RM_REG(HDMI_RM_OFFSET, 0x018),
-+	VC5_RM_REG(HDMI_RM_FORMAT, 0x01c),
-+
-+	VC5_RAM_REG(HDMI_RAM_PACKET_START, 0x000),
-+
-+	VC5_CEC_REG(HDMI_CEC_CNTRL_1, 0x010),
-+	VC5_CEC_REG(HDMI_CEC_CNTRL_2, 0x014),
-+	VC5_CEC_REG(HDMI_CEC_CNTRL_3, 0x018),
-+	VC5_CEC_REG(HDMI_CEC_CNTRL_4, 0x01c),
-+	VC5_CEC_REG(HDMI_CEC_CNTRL_5, 0x020),
-+	VC5_CEC_REG(HDMI_CEC_TX_DATA_1, 0x028),
-+	VC5_CEC_REG(HDMI_CEC_TX_DATA_2, 0x02c),
-+	VC5_CEC_REG(HDMI_CEC_TX_DATA_3, 0x030),
-+	VC5_CEC_REG(HDMI_CEC_TX_DATA_4, 0x034),
-+	VC5_CEC_REG(HDMI_CEC_RX_DATA_1, 0x038),
-+	VC5_CEC_REG(HDMI_CEC_RX_DATA_2, 0x03c),
-+	VC5_CEC_REG(HDMI_CEC_RX_DATA_3, 0x040),
-+	VC5_CEC_REG(HDMI_CEC_RX_DATA_4, 0x044),
-+
-+	VC5_CSC_REG(HDMI_CSC_CTL, 0x000),
-+	VC5_CSC_REG(HDMI_CSC_12_11, 0x004),
-+	VC5_CSC_REG(HDMI_CSC_14_13, 0x008),
-+	VC5_CSC_REG(HDMI_CSC_22_21, 0x00c),
-+	VC5_CSC_REG(HDMI_CSC_24_23, 0x010),
-+	VC5_CSC_REG(HDMI_CSC_32_31, 0x014),
-+	VC5_CSC_REG(HDMI_CSC_34_33, 0x018),
-+	VC5_CSC_REG(HDMI_CSC_CHANNEL_CTL, 0x02c),
-+};
-+
-+static const struct vc4_hdmi_register __maybe_unused vc6_hdmi_hdmi1_fields[] = {
-+	VC4_HD_REG(HDMI_DVP_CTL, 0x0000),
-+	VC4_HD_REG(HDMI_MAI_CTL, 0x0030),
-+	VC4_HD_REG(HDMI_MAI_THR, 0x0034),
-+	VC4_HD_REG(HDMI_MAI_FMT, 0x0038),
-+	VC4_HD_REG(HDMI_MAI_DATA, 0x003c),
-+	VC4_HD_REG(HDMI_MAI_SMP, 0x0040),
-+	VC4_HD_REG(HDMI_VID_CTL, 0x0048),
-+	VC4_HD_REG(HDMI_FRAME_COUNT, 0x0064),
-+
-+	VC4_HDMI_REG(HDMI_FIFO_CTL, 0x07c),
-+	VC4_HDMI_REG(HDMI_AUDIO_PACKET_CONFIG, 0x0c0),
-+	VC4_HDMI_REG(HDMI_RAM_PACKET_CONFIG, 0x0c4),
-+	VC4_HDMI_REG(HDMI_RAM_PACKET_STATUS, 0x0cc),
-+	VC4_HDMI_REG(HDMI_CRP_CFG, 0x0d0),
-+	VC4_HDMI_REG(HDMI_CTS_0, 0x0d4),
-+	VC4_HDMI_REG(HDMI_CTS_1, 0x0d8),
-+	VC4_HDMI_REG(HDMI_SCHEDULER_CONTROL, 0x0e8),
-+	VC4_HDMI_REG(HDMI_HORZA, 0x0ec),
-+	VC4_HDMI_REG(HDMI_HORZB, 0x0f0),
-+	VC4_HDMI_REG(HDMI_VERTA0, 0x0f4),
-+	VC4_HDMI_REG(HDMI_VERTB0, 0x0f8),
-+	VC4_HDMI_REG(HDMI_VERTA1, 0x100),
-+	VC4_HDMI_REG(HDMI_VERTB1, 0x104),
-+	VC4_HDMI_REG(HDMI_MISC_CONTROL, 0x114),
-+	VC4_HDMI_REG(HDMI_MAI_CHANNEL_MAP, 0x0a4),
-+	VC4_HDMI_REG(HDMI_MAI_CONFIG, 0x0a8),
-+	VC4_HDMI_REG(HDMI_FORMAT_DET_1, 0x148),
-+	VC4_HDMI_REG(HDMI_FORMAT_DET_2, 0x14c),
-+	VC4_HDMI_REG(HDMI_FORMAT_DET_3, 0x150),
-+	VC4_HDMI_REG(HDMI_FORMAT_DET_4, 0x158),
-+	VC4_HDMI_REG(HDMI_FORMAT_DET_5, 0x15c),
-+	VC4_HDMI_REG(HDMI_FORMAT_DET_6, 0x160),
-+	VC4_HDMI_REG(HDMI_FORMAT_DET_7, 0x164),
-+	VC4_HDMI_REG(HDMI_FORMAT_DET_8, 0x168),
-+	VC4_HDMI_REG(HDMI_FORMAT_DET_9, 0x16c),
-+	VC4_HDMI_REG(HDMI_FORMAT_DET_10, 0x170),
-+	VC4_HDMI_REG(HDMI_DEEP_COLOR_CONFIG_1, 0x18c),
-+	VC4_HDMI_REG(HDMI_GCP_CONFIG, 0x194),
-+	VC4_HDMI_REG(HDMI_GCP_WORD_1, 0x198),
-+	VC4_HDMI_REG(HDMI_HOTPLUG, 0x1c8),
-+	VC4_HDMI_REG(HDMI_SCRAMBLER_CTL, 0x1e4),
-+
-+	VC5_DVP_REG(HDMI_CLOCK_STOP, 0x0bc),
-+	VC5_DVP_REG(HDMI_VEC_INTERFACE_CFG, 0x0f0),
-+	VC5_DVP_REG(HDMI_VEC_INTERFACE_XBAR, 0x0f4),
-+
-+	VC5_PHY_REG(HDMI_TX_PHY_RESET_CTL, 0x000),
-+	VC5_PHY_REG(HDMI_TX_PHY_POWERUP_CTL, 0x004),
-+	VC5_PHY_REG(HDMI_TX_PHY_CTL_0, 0x008),
-+	VC5_PHY_REG(HDMI_TX_PHY_CTL_1, 0x00c),
-+	VC5_PHY_REG(HDMI_TX_PHY_CTL_2, 0x010),
-+	VC5_PHY_REG(HDMI_TX_PHY_CTL_CK, 0x014),
-+	VC5_PHY_REG(HDMI_TX_PHY_PLL_REFCLK, 0x01c),
-+	VC5_PHY_REG(HDMI_TX_PHY_PLL_POST_KDIV, 0x028),
-+	VC5_PHY_REG(HDMI_TX_PHY_PLL_VCOCLK_DIV, 0x02c),
-+	VC5_PHY_REG(HDMI_TX_PHY_PLL_CFG, 0x044),
-+	VC5_PHY_REG(HDMI_TX_PHY_TMDS_CLK_WORD_SEL, 0x054),
-+	VC5_PHY_REG(HDMI_TX_PHY_PLL_MISC_0, 0x060),
-+	VC5_PHY_REG(HDMI_TX_PHY_PLL_MISC_1, 0x064),
-+	VC5_PHY_REG(HDMI_TX_PHY_PLL_MISC_2, 0x068),
-+	VC5_PHY_REG(HDMI_TX_PHY_PLL_MISC_3, 0x06c),
-+	VC5_PHY_REG(HDMI_TX_PHY_PLL_MISC_4, 0x070),
-+	VC5_PHY_REG(HDMI_TX_PHY_PLL_MISC_5, 0x074),
-+	VC5_PHY_REG(HDMI_TX_PHY_PLL_MISC_6, 0x078),
-+	VC5_PHY_REG(HDMI_TX_PHY_PLL_MISC_7, 0x07c),
-+	VC5_PHY_REG(HDMI_TX_PHY_PLL_MISC_8, 0x080),
-+	VC5_PHY_REG(HDMI_TX_PHY_PLL_RESET_CTL, 0x190),
-+	VC5_PHY_REG(HDMI_TX_PHY_PLL_POWERUP_CTL, 0x194),
-+
-+	VC5_RM_REG(HDMI_RM_CONTROL, 0x000),
-+	VC5_RM_REG(HDMI_RM_OFFSET, 0x018),
- 	VC5_RM_REG(HDMI_RM_FORMAT, 0x01c),
- 
- 	VC5_RAM_REG(HDMI_RAM_PACKET_START, 0x000),
diff --git a/target/linux/bcm27xx/patches-6.1/950-0966-drm-vc4-txp-Introduce-structure-to-deal-with-revisio.patch b/target/linux/bcm27xx/patches-6.1/950-0966-drm-vc4-txp-Introduce-structure-to-deal-with-revisio.patch
deleted file mode 100644
index c54ab0d360..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0966-drm-vc4-txp-Introduce-structure-to-deal-with-revisio.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From a68e8ffc3314612b0d00d491c8cdd61ae1d9af4e Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Tue, 25 Apr 2023 10:12:32 +0200
-Subject: [PATCH] drm/vc4: txp: Introduce structure to deal with revision
- differences
-
-The BCM2712 will have several TXP with small differences. Let's add a
-structure tied to the compatible to deal with those differences.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/tests/vc4_mock.c |  4 ++--
- drivers/gpu/drm/vc4/vc4_drv.h        |  6 +++++-
- drivers/gpu/drm/vc4/vc4_txp.c        | 23 ++++++++++++++++-------
- 3 files changed, 23 insertions(+), 10 deletions(-)
-
---- a/drivers/gpu/drm/vc4/tests/vc4_mock.c
-+++ b/drivers/gpu/drm/vc4/tests/vc4_mock.c
-@@ -51,7 +51,7 @@ struct vc4_mock_desc {
- 
- static const struct vc4_mock_desc vc4_mock =
- 	VC4_MOCK_DESC(
--		VC4_MOCK_CRTC_DESC(&vc4_txp_crtc_data,
-+		VC4_MOCK_CRTC_DESC(&vc4_txp_data.base,
- 				   VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_TXP,
- 							DRM_MODE_ENCODER_VIRTUAL,
- 							DRM_MODE_CONNECTOR_WRITEBACK)),
-@@ -77,7 +77,7 @@ static const struct vc4_mock_desc vc4_mo
- 
- static const struct vc4_mock_desc vc5_mock =
- 	VC4_MOCK_DESC(
--		VC4_MOCK_CRTC_DESC(&vc4_txp_crtc_data,
-+		VC4_MOCK_CRTC_DESC(&vc4_txp_data.base,
- 				   VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_TXP,
- 							DRM_MODE_ENCODER_VIRTUAL,
- 							DRM_MODE_CONNECTOR_WRITEBACK)),
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -561,7 +561,11 @@ struct vc4_crtc_data {
- 	int hvs_output;
- };
- 
--extern const struct vc4_crtc_data vc4_txp_crtc_data;
-+struct vc4_txp_data {
-+	struct vc4_crtc_data	base;
-+};
-+
-+extern const struct vc4_txp_data vc4_txp_data;
- 
- struct vc4_pv_data {
- 	struct vc4_crtc_data	base;
---- a/drivers/gpu/drm/vc4/vc4_txp.c
-+++ b/drivers/gpu/drm/vc4/vc4_txp.c
-@@ -159,6 +159,7 @@
- 
- struct vc4_txp {
- 	struct vc4_crtc	base;
-+	const struct vc4_txp_data *data;
- 
- 	struct platform_device *pdev;
- 
-@@ -488,17 +489,20 @@ static irqreturn_t vc4_txp_interrupt(int
- 	return IRQ_HANDLED;
- }
- 
--const struct vc4_crtc_data vc4_txp_crtc_data = {
--	.name = "txp",
--	.debugfs_name = "txp_regs",
--	.hvs_available_channels = BIT(2),
--	.hvs_output = 2,
-+const struct vc4_txp_data vc4_txp_data = {
-+	.base = {
-+		.name = "txp",
-+		.debugfs_name = "txp_regs",
-+		.hvs_available_channels = BIT(2),
-+		.hvs_output = 2,
-+	},
- };
- 
- static int vc4_txp_bind(struct device *dev, struct device *master, void *data)
- {
- 	struct platform_device *pdev = to_platform_device(dev);
- 	struct drm_device *drm = dev_get_drvdata(master);
-+	const struct vc4_txp_data *txp_data;
- 	struct vc4_encoder *vc4_encoder;
- 	struct drm_encoder *encoder;
- 	struct vc4_crtc *vc4_crtc;
-@@ -513,6 +517,11 @@ static int vc4_txp_bind(struct device *d
- 	if (!txp)
- 		return -ENOMEM;
- 
-+	txp_data = of_device_get_match_data(dev);
-+	if (!txp_data)
-+		return -ENODEV;
-+
-+	txp->data = txp_data;
- 	txp->pdev = pdev;
- 	txp->regs = vc4_ioremap_regs(pdev, 0);
- 	if (IS_ERR(txp->regs))
-@@ -523,7 +532,7 @@ static int vc4_txp_bind(struct device *d
- 	vc4_crtc->regset.regs = txp_regs;
- 	vc4_crtc->regset.nregs = ARRAY_SIZE(txp_regs);
- 
--	ret = vc4_crtc_init(drm, pdev, vc4_crtc, &vc4_txp_crtc_data,
-+	ret = vc4_crtc_init(drm, pdev, vc4_crtc, &txp_data->base,
- 			    &vc4_txp_crtc_funcs, &vc4_txp_crtc_helper_funcs, true);
- 	if (ret)
- 		return ret;
-@@ -584,7 +593,7 @@ static int vc4_txp_remove(struct platfor
- }
- 
- static const struct of_device_id vc4_txp_dt_match[] = {
--	{ .compatible = "brcm,bcm2835-txp" },
-+	{ .compatible = "brcm,bcm2835-txp", .data = &vc4_txp_data },
- 	{ /* sentinel */ },
- };
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0967-drm-vc4-txp-Rename-TXP-data-structure.patch b/target/linux/bcm27xx/patches-6.1/950-0967-drm-vc4-txp-Rename-TXP-data-structure.patch
deleted file mode 100644
index 9303f86734..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0967-drm-vc4-txp-Rename-TXP-data-structure.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 7d345345b70f00bf4c673a68da7d1cf0faf5cc47 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Tue, 25 Apr 2023 10:21:53 +0200
-Subject: [PATCH] drm/vc4: txp: Rename TXP data structure
-
-The TXP data structure has a name too generic for the multiple variants
-we'll have to support. Let's rename it to mention the SoC it applies to.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/tests/vc4_mock.c | 4 ++--
- drivers/gpu/drm/vc4/vc4_drv.h        | 2 +-
- drivers/gpu/drm/vc4/vc4_txp.c        | 4 ++--
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
---- a/drivers/gpu/drm/vc4/tests/vc4_mock.c
-+++ b/drivers/gpu/drm/vc4/tests/vc4_mock.c
-@@ -51,7 +51,7 @@ struct vc4_mock_desc {
- 
- static const struct vc4_mock_desc vc4_mock =
- 	VC4_MOCK_DESC(
--		VC4_MOCK_CRTC_DESC(&vc4_txp_data.base,
-+		VC4_MOCK_CRTC_DESC(&bcm2835_txp_data.base,
- 				   VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_TXP,
- 							DRM_MODE_ENCODER_VIRTUAL,
- 							DRM_MODE_CONNECTOR_WRITEBACK)),
-@@ -77,7 +77,7 @@ static const struct vc4_mock_desc vc4_mo
- 
- static const struct vc4_mock_desc vc5_mock =
- 	VC4_MOCK_DESC(
--		VC4_MOCK_CRTC_DESC(&vc4_txp_data.base,
-+		VC4_MOCK_CRTC_DESC(&bcm2835_txp_data.base,
- 				   VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_TXP,
- 							DRM_MODE_ENCODER_VIRTUAL,
- 							DRM_MODE_CONNECTOR_WRITEBACK)),
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -565,7 +565,7 @@ struct vc4_txp_data {
- 	struct vc4_crtc_data	base;
- };
- 
--extern const struct vc4_txp_data vc4_txp_data;
-+extern const struct vc4_txp_data bcm2835_txp_data;
- 
- struct vc4_pv_data {
- 	struct vc4_crtc_data	base;
---- a/drivers/gpu/drm/vc4/vc4_txp.c
-+++ b/drivers/gpu/drm/vc4/vc4_txp.c
-@@ -489,7 +489,7 @@ static irqreturn_t vc4_txp_interrupt(int
- 	return IRQ_HANDLED;
- }
- 
--const struct vc4_txp_data vc4_txp_data = {
-+const struct vc4_txp_data bcm2835_txp_data = {
- 	.base = {
- 		.name = "txp",
- 		.debugfs_name = "txp_regs",
-@@ -593,7 +593,7 @@ static int vc4_txp_remove(struct platfor
- }
- 
- static const struct of_device_id vc4_txp_dt_match[] = {
--	{ .compatible = "brcm,bcm2835-txp", .data = &vc4_txp_data },
-+	{ .compatible = "brcm,bcm2835-txp", .data = &bcm2835_txp_data },
- 	{ /* sentinel */ },
- };
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0968-drm-vc4-txp-Add-byte-enable-toggle-bit.patch b/target/linux/bcm27xx/patches-6.1/950-0968-drm-vc4-txp-Add-byte-enable-toggle-bit.patch
deleted file mode 100644
index cea9062b19..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0968-drm-vc4-txp-Add-byte-enable-toggle-bit.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From e8dbad6d506b6fac992fdf74a7e3a66a38e554c3 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Thu, 27 Apr 2023 09:30:33 +0200
-Subject: [PATCH] drm/vc4: txp: Add byte enable toggle bit
-
-The MOPLET doesn't have the BYTE_ENABLE field to set, but the TXP and
-MOP do, so let's add a boolean to control whether or not we need to set
-it.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_drv.h | 1 +
- drivers/gpu/drm/vc4/vc4_txp.c | 6 +++++-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -563,6 +563,7 @@ struct vc4_crtc_data {
- 
- struct vc4_txp_data {
- 	struct vc4_crtc_data	base;
-+	unsigned int has_byte_enable:1;
- };
- 
- extern const struct vc4_txp_data bcm2835_txp_data;
---- a/drivers/gpu/drm/vc4/vc4_txp.c
-+++ b/drivers/gpu/drm/vc4/vc4_txp.c
-@@ -291,6 +291,7 @@ static void vc4_txp_connector_atomic_com
- 	struct drm_connector_state *conn_state = drm_atomic_get_new_connector_state(state,
- 										    conn);
- 	struct vc4_txp *txp = connector_to_vc4_txp(conn);
-+	const struct vc4_txp_data *txp_data = txp->data;
- 	struct drm_gem_dma_object *gem;
- 	struct drm_display_mode *mode;
- 	struct drm_framebuffer *fb;
-@@ -313,9 +314,11 @@ static void vc4_txp_connector_atomic_com
- 		return;
- 
- 	ctrl = TXP_GO | TXP_EI |
--	       VC4_SET_FIELD(0xf, TXP_BYTE_ENABLE) |
- 	       VC4_SET_FIELD(txp_fmts[i], TXP_FORMAT);
- 
-+	if (txp_data->has_byte_enable)
-+		ctrl |= VC4_SET_FIELD(0xf, TXP_BYTE_ENABLE);
-+
- 	if (fb->format->has_alpha)
- 		ctrl |= TXP_ALPHA_ENABLE;
- 	else
-@@ -496,6 +499,7 @@ const struct vc4_txp_data bcm2835_txp_da
- 		.hvs_available_channels = BIT(2),
- 		.hvs_output = 2,
- 	},
-+	.has_byte_enable = true,
- };
- 
- static int vc4_txp_bind(struct device *dev, struct device *master, void *data)
diff --git a/target/linux/bcm27xx/patches-6.1/950-0969-drm-vc4-txp-Add-horizontal-and-vertical-size-offset-.patch b/target/linux/bcm27xx/patches-6.1/950-0969-drm-vc4-txp-Add-horizontal-and-vertical-size-offset-.patch
deleted file mode 100644
index 290473e834..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0969-drm-vc4-txp-Add-horizontal-and-vertical-size-offset-.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From a51e4acdab01540e1006e43f38e5befb40002de0 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Thu, 27 Apr 2023 09:47:54 +0200
-Subject: [PATCH] drm/vc4: txp: Add horizontal and vertical size offset toggle
- bit
-
-The new writeback controllers that can be found on the BCM2712 require
-to have their horizontal and vertical size reduced by one.
-
-Let's tie that behaviour to the compatible so we can support both the
-new and old controllers.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_drv.h |  1 +
- drivers/gpu/drm/vc4/vc4_txp.c | 14 ++++++++++++--
- 2 files changed, 13 insertions(+), 2 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -564,6 +564,7 @@ struct vc4_crtc_data {
- struct vc4_txp_data {
- 	struct vc4_crtc_data	base;
- 	unsigned int has_byte_enable:1;
-+	unsigned int size_minus_one:1;
- };
- 
- extern const struct vc4_txp_data bcm2835_txp_data;
---- a/drivers/gpu/drm/vc4/vc4_txp.c
-+++ b/drivers/gpu/drm/vc4/vc4_txp.c
-@@ -295,6 +295,8 @@ static void vc4_txp_connector_atomic_com
- 	struct drm_gem_dma_object *gem;
- 	struct drm_display_mode *mode;
- 	struct drm_framebuffer *fb;
-+	unsigned int hdisplay;
-+	unsigned int vdisplay;
- 	u32 ctrl;
- 	int idx;
- 	int i;
-@@ -334,9 +336,17 @@ static void vc4_txp_connector_atomic_com
- 	gem = drm_fb_dma_get_gem_obj(fb, 0);
- 	TXP_WRITE(TXP_DST_PTR, gem->dma_addr + fb->offsets[0]);
- 	TXP_WRITE(TXP_DST_PITCH, fb->pitches[0]);
-+
-+	hdisplay = mode->hdisplay ?: 1;
-+	vdisplay = mode->vdisplay ?: 1;
-+	if (txp_data->size_minus_one) {
-+		hdisplay -= 1;
-+		vdisplay -= 1;
-+	}
-+
- 	TXP_WRITE(TXP_DIM,
--		  VC4_SET_FIELD(mode->hdisplay, TXP_WIDTH) |
--		  VC4_SET_FIELD(mode->vdisplay, TXP_HEIGHT));
-+		  VC4_SET_FIELD(hdisplay, TXP_WIDTH) |
-+		  VC4_SET_FIELD(vdisplay, TXP_HEIGHT));
- 
- 	TXP_WRITE(TXP_DST_CTRL, ctrl);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0970-drm-vc4-txp-Handle-40-bits-DMA-Addresses.patch b/target/linux/bcm27xx/patches-6.1/950-0970-drm-vc4-txp-Handle-40-bits-DMA-Addresses.patch
deleted file mode 100644
index 5d1fbcb119..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0970-drm-vc4-txp-Handle-40-bits-DMA-Addresses.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From ddb9aa80692ed5d35e4ee4688c36789620f78c5c Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 14 Apr 2023 17:47:11 +0200
-Subject: [PATCH] drm/vc4: txp: Handle 40-bits DMA Addresses
-
-The BCM2712 MOP and MOPLET can handle addresses larger than 32bits
-through an extra register. We can easily support it and make it
-conditional based on the compatible through a boolean in our variant
-structure.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_drv.h |  1 +
- drivers/gpu/drm/vc4/vc4_txp.c | 10 +++++++++-
- 2 files changed, 10 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -565,6 +565,7 @@ struct vc4_txp_data {
- 	struct vc4_crtc_data	base;
- 	unsigned int has_byte_enable:1;
- 	unsigned int size_minus_one:1;
-+	unsigned int supports_40bit_addresses:1;
- };
- 
- extern const struct vc4_txp_data bcm2835_txp_data;
---- a/drivers/gpu/drm/vc4/vc4_txp.c
-+++ b/drivers/gpu/drm/vc4/vc4_txp.c
-@@ -145,6 +145,8 @@
- /* Number of lines received and committed to memory. */
- #define TXP_PROGRESS		0x10
- 
-+#define TXP_DST_PTR_HIGH	0x1c
-+
- #define TXP_READ(offset)								\
- 	({										\
- 		kunit_fail_current_test("Accessing a register in a unit test!\n");	\
-@@ -297,6 +299,7 @@ static void vc4_txp_connector_atomic_com
- 	struct drm_framebuffer *fb;
- 	unsigned int hdisplay;
- 	unsigned int vdisplay;
-+	dma_addr_t addr;
- 	u32 ctrl;
- 	int idx;
- 	int i;
-@@ -334,7 +337,12 @@ static void vc4_txp_connector_atomic_com
- 		return;
- 
- 	gem = drm_fb_dma_get_gem_obj(fb, 0);
--	TXP_WRITE(TXP_DST_PTR, gem->dma_addr + fb->offsets[0]);
-+	addr = gem->dma_addr + fb->offsets[0];
-+	TXP_WRITE(TXP_DST_PTR, lower_32_bits(addr));
-+
-+	if (txp_data->supports_40bit_addresses)
-+		TXP_WRITE(TXP_DST_PTR_HIGH, upper_32_bits(addr) & 0xff);
-+
- 	TXP_WRITE(TXP_DST_PITCH, fb->pitches[0]);
- 
- 	hdisplay = mode->hdisplay ?: 1;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0971-drm-vc4-txp-Move-the-encoder-type-in-the-variant-str.patch b/target/linux/bcm27xx/patches-6.1/950-0971-drm-vc4-txp-Move-the-encoder-type-in-the-variant-str.patch
deleted file mode 100644
index 0445c4f509..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0971-drm-vc4-txp-Move-the-encoder-type-in-the-variant-str.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 2e8f4fa23af4bb794e9b2284a53aa40bbfdd3cbb Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Thu, 27 Apr 2023 11:26:10 +0200
-Subject: [PATCH] drm/vc4: txp: Move the encoder type in the variant structure
-
-We'll have multiple TXP instances in the BCM2712, so we can't use a
-single encoder type anymore. Let's tie the encoder type to the
-compatible.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_drv.h | 1 +
- drivers/gpu/drm/vc4/vc4_txp.c | 3 ++-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -563,6 +563,7 @@ struct vc4_crtc_data {
- 
- struct vc4_txp_data {
- 	struct vc4_crtc_data	base;
-+	enum vc4_encoder_type encoder_type;
- 	unsigned int has_byte_enable:1;
- 	unsigned int size_minus_one:1;
- 	unsigned int supports_40bit_addresses:1;
---- a/drivers/gpu/drm/vc4/vc4_txp.c
-+++ b/drivers/gpu/drm/vc4/vc4_txp.c
-@@ -517,6 +517,7 @@ const struct vc4_txp_data bcm2835_txp_da
- 		.hvs_available_channels = BIT(2),
- 		.hvs_output = 2,
- 	},
-+	.encoder_type = VC4_ENCODER_TYPE_TXP,
- 	.has_byte_enable = true,
- };
- 
-@@ -560,7 +561,7 @@ static int vc4_txp_bind(struct device *d
- 		return ret;
- 
- 	vc4_encoder = &txp->encoder;
--	txp->encoder.type = VC4_ENCODER_TYPE_TXP;
-+	txp->encoder.type = txp_data->encoder_type;
- 
- 	encoder = &vc4_encoder->base;
- 	encoder->possible_crtcs = drm_crtc_mask(&vc4_crtc->base);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0972-drm-vc4-txp-Add-a-new-TXP-encoder-type.patch b/target/linux/bcm27xx/patches-6.1/950-0972-drm-vc4-txp-Add-a-new-TXP-encoder-type.patch
deleted file mode 100644
index f832fc1ed5..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0972-drm-vc4-txp-Add-a-new-TXP-encoder-type.patch
+++ /dev/null
@@ -1,475 +0,0 @@
-From 68a00ca7b1d7809ac7be736c02238c142e629127 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Thu, 27 Apr 2023 11:49:28 +0200
-Subject: [PATCH] drm/vc4: txp: Add a new TXP encoder type
-
-Starting with BCM2712, we'll have a two TXP. Let's follow the HDMI
-example and add two encoder types for TXP: TXP0 and TXP1.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/tests/vc4_mock.c          |   4 +-
- .../gpu/drm/vc4/tests/vc4_test_pv_muxing.c    | 106 +++++++++---------
- drivers/gpu/drm/vc4/vc4_drv.h                 |   3 +-
- drivers/gpu/drm/vc4/vc4_kms.c                 |   2 +-
- drivers/gpu/drm/vc4/vc4_txp.c                 |   2 +-
- 5 files changed, 59 insertions(+), 58 deletions(-)
-
---- a/drivers/gpu/drm/vc4/tests/vc4_mock.c
-+++ b/drivers/gpu/drm/vc4/tests/vc4_mock.c
-@@ -52,7 +52,7 @@ struct vc4_mock_desc {
- static const struct vc4_mock_desc vc4_mock =
- 	VC4_MOCK_DESC(
- 		VC4_MOCK_CRTC_DESC(&bcm2835_txp_data.base,
--				   VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_TXP,
-+				   VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_TXP0,
- 							DRM_MODE_ENCODER_VIRTUAL,
- 							DRM_MODE_CONNECTOR_WRITEBACK)),
- 		VC4_MOCK_PIXELVALVE_DESC(&bcm2835_pv0_data,
-@@ -78,7 +78,7 @@ static const struct vc4_mock_desc vc4_mo
- static const struct vc4_mock_desc vc5_mock =
- 	VC4_MOCK_DESC(
- 		VC4_MOCK_CRTC_DESC(&bcm2835_txp_data.base,
--				   VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_TXP,
-+				   VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_TXP0,
- 							DRM_MODE_ENCODER_VIRTUAL,
- 							DRM_MODE_CONNECTOR_WRITEBACK)),
- 		VC4_MOCK_PIXELVALVE_DESC(&bcm2711_pv0_data,
---- a/drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c
-+++ b/drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c
-@@ -91,7 +91,7 @@ static const struct encoder_constraint v
- 	ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_DSI0, 0),
- 	ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_HDMI0, 1),
- 	ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_VEC, 1),
--	ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_TXP, 2),
-+	ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_TXP0, 2),
- 	ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_DSI1, 2),
- };
- 
-@@ -99,7 +99,7 @@ static const struct encoder_constraint v
- 	ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_DPI, 0),
- 	ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_DSI0, 0),
- 	ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_VEC, 1),
--	ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_TXP, 0, 2),
-+	ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_TXP0, 0, 2),
- 	ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_DSI1, 0, 1, 2),
- 	ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_HDMI0, 0, 1, 2),
- 	ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_HDMI1, 0, 1, 2),
-@@ -208,7 +208,7 @@ static const struct pv_muxing_param vc4_
- 	VC4_PV_MUXING_TEST("1 output: DSI1",
- 			   VC4_ENCODER_TYPE_DSI1),
- 	VC4_PV_MUXING_TEST("1 output: TXP",
--			   VC4_ENCODER_TYPE_TXP),
-+			   VC4_ENCODER_TYPE_TXP0),
- 	VC4_PV_MUXING_TEST("2 outputs: DSI0, HDMI0",
- 			   VC4_ENCODER_TYPE_DSI0,
- 			   VC4_ENCODER_TYPE_HDMI0),
-@@ -220,7 +220,7 @@ static const struct pv_muxing_param vc4_
- 			   VC4_ENCODER_TYPE_DSI1),
- 	VC4_PV_MUXING_TEST("2 outputs: DSI0, TXP",
- 			   VC4_ENCODER_TYPE_DSI0,
--			   VC4_ENCODER_TYPE_TXP),
-+			   VC4_ENCODER_TYPE_TXP0),
- 	VC4_PV_MUXING_TEST("2 outputs: DPI, HDMI0",
- 			   VC4_ENCODER_TYPE_DPI,
- 			   VC4_ENCODER_TYPE_HDMI0),
-@@ -232,19 +232,19 @@ static const struct pv_muxing_param vc4_
- 			   VC4_ENCODER_TYPE_DSI1),
- 	VC4_PV_MUXING_TEST("2 outputs: DPI, TXP",
- 			   VC4_ENCODER_TYPE_DPI,
--			   VC4_ENCODER_TYPE_TXP),
-+			   VC4_ENCODER_TYPE_TXP0),
- 	VC4_PV_MUXING_TEST("2 outputs: HDMI0, DSI1",
- 			   VC4_ENCODER_TYPE_HDMI0,
- 			   VC4_ENCODER_TYPE_DSI1),
- 	VC4_PV_MUXING_TEST("2 outputs: HDMI0, TXP",
- 			   VC4_ENCODER_TYPE_HDMI0,
--			   VC4_ENCODER_TYPE_TXP),
-+			   VC4_ENCODER_TYPE_TXP0),
- 	VC4_PV_MUXING_TEST("2 outputs: VEC, DSI1",
- 			   VC4_ENCODER_TYPE_VEC,
- 			   VC4_ENCODER_TYPE_DSI1),
- 	VC4_PV_MUXING_TEST("2 outputs: VEC, TXP",
- 			   VC4_ENCODER_TYPE_VEC,
--			   VC4_ENCODER_TYPE_TXP),
-+			   VC4_ENCODER_TYPE_TXP0),
- 	VC4_PV_MUXING_TEST("3 outputs: DSI0, HDMI0, DSI1",
- 			   VC4_ENCODER_TYPE_DSI0,
- 			   VC4_ENCODER_TYPE_HDMI0,
-@@ -252,7 +252,7 @@ static const struct pv_muxing_param vc4_
- 	VC4_PV_MUXING_TEST("3 outputs: DSI0, HDMI0, TXP",
- 			   VC4_ENCODER_TYPE_DSI0,
- 			   VC4_ENCODER_TYPE_HDMI0,
--			   VC4_ENCODER_TYPE_TXP),
-+			   VC4_ENCODER_TYPE_TXP0),
- 	VC4_PV_MUXING_TEST("3 outputs: DSI0, VEC, DSI1",
- 			   VC4_ENCODER_TYPE_DSI0,
- 			   VC4_ENCODER_TYPE_VEC,
-@@ -260,7 +260,7 @@ static const struct pv_muxing_param vc4_
- 	VC4_PV_MUXING_TEST("3 outputs: DSI0, VEC, TXP",
- 			   VC4_ENCODER_TYPE_DSI0,
- 			   VC4_ENCODER_TYPE_VEC,
--			   VC4_ENCODER_TYPE_TXP),
-+			   VC4_ENCODER_TYPE_TXP0),
- 	VC4_PV_MUXING_TEST("3 outputs: DPI, HDMI0, DSI1",
- 			   VC4_ENCODER_TYPE_DPI,
- 			   VC4_ENCODER_TYPE_HDMI0,
-@@ -268,7 +268,7 @@ static const struct pv_muxing_param vc4_
- 	VC4_PV_MUXING_TEST("3 outputs: DPI, HDMI0, TXP",
- 			   VC4_ENCODER_TYPE_DPI,
- 			   VC4_ENCODER_TYPE_HDMI0,
--			   VC4_ENCODER_TYPE_TXP),
-+			   VC4_ENCODER_TYPE_TXP0),
- 	VC4_PV_MUXING_TEST("3 outputs: DPI, VEC, DSI1",
- 			   VC4_ENCODER_TYPE_DPI,
- 			   VC4_ENCODER_TYPE_VEC,
-@@ -276,7 +276,7 @@ static const struct pv_muxing_param vc4_
- 	VC4_PV_MUXING_TEST("3 outputs: DPI, VEC, TXP",
- 			   VC4_ENCODER_TYPE_DPI,
- 			   VC4_ENCODER_TYPE_VEC,
--			   VC4_ENCODER_TYPE_TXP),
-+			   VC4_ENCODER_TYPE_TXP0),
- };
- 
- KUNIT_ARRAY_PARAM(vc4_test_pv_muxing,
-@@ -288,7 +288,7 @@ static const struct pv_muxing_param vc4_
- 			   VC4_ENCODER_TYPE_DPI,
- 			   VC4_ENCODER_TYPE_DSI0),
- 	VC4_PV_MUXING_TEST("TXP/DSI1 Conflict",
--			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_TXP0,
- 			   VC4_ENCODER_TYPE_DSI1),
- 	VC4_PV_MUXING_TEST("HDMI0/VEC Conflict",
- 			   VC4_ENCODER_TYPE_HDMI0,
-@@ -297,22 +297,22 @@ static const struct pv_muxing_param vc4_
- 			   VC4_ENCODER_TYPE_DSI0,
- 			   VC4_ENCODER_TYPE_HDMI0,
- 			   VC4_ENCODER_TYPE_DSI1,
--			   VC4_ENCODER_TYPE_TXP),
-+			   VC4_ENCODER_TYPE_TXP0),
- 	VC4_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, DSI1, TXP",
- 			   VC4_ENCODER_TYPE_DSI0,
- 			   VC4_ENCODER_TYPE_VEC,
- 			   VC4_ENCODER_TYPE_DSI1,
--			   VC4_ENCODER_TYPE_TXP),
-+			   VC4_ENCODER_TYPE_TXP0),
- 	VC4_PV_MUXING_TEST("More than 3 outputs: DPI, HDMI0, DSI1, TXP",
- 			   VC4_ENCODER_TYPE_DPI,
- 			   VC4_ENCODER_TYPE_HDMI0,
- 			   VC4_ENCODER_TYPE_DSI1,
--			   VC4_ENCODER_TYPE_TXP),
-+			   VC4_ENCODER_TYPE_TXP0),
- 	VC4_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, DSI1, TXP",
- 			   VC4_ENCODER_TYPE_DPI,
- 			   VC4_ENCODER_TYPE_VEC,
- 			   VC4_ENCODER_TYPE_DSI1,
--			   VC4_ENCODER_TYPE_TXP),
-+			   VC4_ENCODER_TYPE_TXP0),
- };
- 
- KUNIT_ARRAY_PARAM(vc4_test_pv_muxing_invalid,
-@@ -343,7 +343,7 @@ static const struct pv_muxing_param vc5_
- 			   VC4_ENCODER_TYPE_HDMI1),
- 	VC5_PV_MUXING_TEST("2 outputs: DPI, TXP",
- 			   VC4_ENCODER_TYPE_DPI,
--			   VC4_ENCODER_TYPE_TXP),
-+			   VC4_ENCODER_TYPE_TXP0),
- 	VC5_PV_MUXING_TEST("2 outputs: DPI, VEC",
- 			   VC4_ENCODER_TYPE_DPI,
- 			   VC4_ENCODER_TYPE_VEC),
-@@ -361,7 +361,7 @@ static const struct pv_muxing_param vc5_
- 			   VC4_ENCODER_TYPE_HDMI1),
- 	VC5_PV_MUXING_TEST("2 outputs: DSI0, TXP",
- 			   VC4_ENCODER_TYPE_DSI0,
--			   VC4_ENCODER_TYPE_TXP),
-+			   VC4_ENCODER_TYPE_TXP0),
- 	VC5_PV_MUXING_TEST("2 outputs: DSI0, VEC",
- 			   VC4_ENCODER_TYPE_DSI0,
- 			   VC4_ENCODER_TYPE_VEC),
-@@ -373,7 +373,7 @@ static const struct pv_muxing_param vc5_
- 			   VC4_ENCODER_TYPE_VEC),
- 	VC5_PV_MUXING_TEST("2 outputs: DSI1, TXP",
- 			   VC4_ENCODER_TYPE_DSI1,
--			   VC4_ENCODER_TYPE_TXP),
-+			   VC4_ENCODER_TYPE_TXP0),
- 	VC5_PV_MUXING_TEST("2 outputs: DSI1, HDMI0",
- 			   VC4_ENCODER_TYPE_DSI1,
- 			   VC4_ENCODER_TYPE_HDMI0),
-@@ -385,7 +385,7 @@ static const struct pv_muxing_param vc5_
- 			   VC4_ENCODER_TYPE_VEC),
- 	VC5_PV_MUXING_TEST("2 outputs: HDMI0, TXP",
- 			   VC4_ENCODER_TYPE_HDMI0,
--			   VC4_ENCODER_TYPE_TXP),
-+			   VC4_ENCODER_TYPE_TXP0),
- 	VC5_PV_MUXING_TEST("2 outputs: HDMI0, HDMI1",
- 			   VC4_ENCODER_TYPE_HDMI0,
- 			   VC4_ENCODER_TYPE_HDMI1),
-@@ -394,14 +394,14 @@ static const struct pv_muxing_param vc5_
- 			   VC4_ENCODER_TYPE_VEC),
- 	VC5_PV_MUXING_TEST("2 outputs: HDMI1, TXP",
- 			   VC4_ENCODER_TYPE_HDMI1,
--			   VC4_ENCODER_TYPE_TXP),
-+			   VC4_ENCODER_TYPE_TXP0),
- 	VC5_PV_MUXING_TEST("2 outputs: TXP, VEC",
--			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_TXP0,
- 			   VC4_ENCODER_TYPE_VEC),
- 	VC5_PV_MUXING_TEST("3 outputs: DPI, VEC, TXP",
- 			   VC4_ENCODER_TYPE_DPI,
- 			   VC4_ENCODER_TYPE_VEC,
--			   VC4_ENCODER_TYPE_TXP),
-+			   VC4_ENCODER_TYPE_TXP0),
- 	VC5_PV_MUXING_TEST("3 outputs: DPI, VEC, DSI1",
- 			   VC4_ENCODER_TYPE_DPI,
- 			   VC4_ENCODER_TYPE_VEC,
-@@ -416,15 +416,15 @@ static const struct pv_muxing_param vc5_
- 			   VC4_ENCODER_TYPE_HDMI1),
- 	VC5_PV_MUXING_TEST("3 outputs: DPI, TXP, DSI1",
- 			   VC4_ENCODER_TYPE_DPI,
--			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_TXP0,
- 			   VC4_ENCODER_TYPE_DSI1),
- 	VC5_PV_MUXING_TEST("3 outputs: DPI, TXP, HDMI0",
- 			   VC4_ENCODER_TYPE_DPI,
--			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_TXP0,
- 			   VC4_ENCODER_TYPE_HDMI0),
- 	VC5_PV_MUXING_TEST("3 outputs: DPI, TXP, HDMI1",
- 			   VC4_ENCODER_TYPE_DPI,
--			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_TXP0,
- 			   VC4_ENCODER_TYPE_HDMI1),
- 	VC5_PV_MUXING_TEST("3 outputs: DPI, DSI1, HDMI0",
- 			   VC4_ENCODER_TYPE_DPI,
-@@ -441,7 +441,7 @@ static const struct pv_muxing_param vc5_
- 	VC5_PV_MUXING_TEST("3 outputs: DSI0, VEC, TXP",
- 			   VC4_ENCODER_TYPE_DSI0,
- 			   VC4_ENCODER_TYPE_VEC,
--			   VC4_ENCODER_TYPE_TXP),
-+			   VC4_ENCODER_TYPE_TXP0),
- 	VC5_PV_MUXING_TEST("3 outputs: DSI0, VEC, DSI1",
- 			   VC4_ENCODER_TYPE_DSI0,
- 			   VC4_ENCODER_TYPE_VEC,
-@@ -456,15 +456,15 @@ static const struct pv_muxing_param vc5_
- 			   VC4_ENCODER_TYPE_HDMI1),
- 	VC5_PV_MUXING_TEST("3 outputs: DSI0, TXP, DSI1",
- 			   VC4_ENCODER_TYPE_DSI0,
--			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_TXP0,
- 			   VC4_ENCODER_TYPE_DSI1),
- 	VC5_PV_MUXING_TEST("3 outputs: DSI0, TXP, HDMI0",
- 			   VC4_ENCODER_TYPE_DSI0,
--			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_TXP0,
- 			   VC4_ENCODER_TYPE_HDMI0),
- 	VC5_PV_MUXING_TEST("3 outputs: DSI0, TXP, HDMI1",
- 			   VC4_ENCODER_TYPE_DSI0,
--			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_TXP0,
- 			   VC4_ENCODER_TYPE_HDMI1),
- 	VC5_PV_MUXING_TEST("3 outputs: DSI0, DSI1, HDMI0",
- 			   VC4_ENCODER_TYPE_DSI0,
-@@ -491,17 +491,17 @@ static const struct pv_muxing_param vc5_
- 	VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, TXP, DSI1",
- 			   VC4_ENCODER_TYPE_DPI,
- 			   VC4_ENCODER_TYPE_VEC,
--			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_TXP0,
- 			   VC4_ENCODER_TYPE_DSI1),
- 	VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, TXP, HDMI0",
- 			   VC4_ENCODER_TYPE_DPI,
- 			   VC4_ENCODER_TYPE_VEC,
--			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_TXP0,
- 			   VC4_ENCODER_TYPE_HDMI0),
- 	VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, TXP, HDMI1",
- 			   VC4_ENCODER_TYPE_DPI,
- 			   VC4_ENCODER_TYPE_VEC,
--			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_TXP0,
- 			   VC4_ENCODER_TYPE_HDMI1),
- 	VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, DSI1, HDMI0",
- 			   VC4_ENCODER_TYPE_DPI,
-@@ -520,17 +520,17 @@ static const struct pv_muxing_param vc5_
- 			   VC4_ENCODER_TYPE_HDMI1),
- 	VC5_PV_MUXING_TEST("More than 3 outputs: DPI, TXP, DSI1, HDMI0",
- 			   VC4_ENCODER_TYPE_DPI,
--			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_TXP0,
- 			   VC4_ENCODER_TYPE_DSI1,
- 			   VC4_ENCODER_TYPE_HDMI0),
- 	VC5_PV_MUXING_TEST("More than 3 outputs: DPI, TXP, DSI1, HDMI1",
- 			   VC4_ENCODER_TYPE_DPI,
--			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_TXP0,
- 			   VC4_ENCODER_TYPE_DSI1,
- 			   VC4_ENCODER_TYPE_HDMI1),
- 	VC5_PV_MUXING_TEST("More than 3 outputs: DPI, TXP, HDMI0, HDMI1",
- 			   VC4_ENCODER_TYPE_DPI,
--			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_TXP0,
- 			   VC4_ENCODER_TYPE_HDMI0,
- 			   VC4_ENCODER_TYPE_HDMI1),
- 	VC5_PV_MUXING_TEST("More than 3 outputs: DPI, DSI1, HDMI0, HDMI1",
-@@ -541,19 +541,19 @@ static const struct pv_muxing_param vc5_
- 	VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, TXP, DSI1, HDMI0",
- 			   VC4_ENCODER_TYPE_DPI,
- 			   VC4_ENCODER_TYPE_VEC,
--			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_TXP0,
- 			   VC4_ENCODER_TYPE_DSI1,
- 			   VC4_ENCODER_TYPE_HDMI0),
- 	VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, TXP, DSI1, HDMI1",
- 			   VC4_ENCODER_TYPE_DPI,
- 			   VC4_ENCODER_TYPE_VEC,
--			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_TXP0,
- 			   VC4_ENCODER_TYPE_DSI1,
- 			   VC4_ENCODER_TYPE_HDMI1),
- 	VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, TXP, HDMI0, HDMI1",
- 			   VC4_ENCODER_TYPE_DPI,
- 			   VC4_ENCODER_TYPE_VEC,
--			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_TXP0,
- 			   VC4_ENCODER_TYPE_HDMI0,
- 			   VC4_ENCODER_TYPE_HDMI1),
- 	VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, DSI1, HDMI0, HDMI1",
-@@ -564,24 +564,24 @@ static const struct pv_muxing_param vc5_
- 			   VC4_ENCODER_TYPE_HDMI1),
- 	VC5_PV_MUXING_TEST("More than 3 outputs: DPI, TXP, DSI1, HDMI0, HDMI1",
- 			   VC4_ENCODER_TYPE_DPI,
--			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_TXP0,
- 			   VC4_ENCODER_TYPE_DSI1,
- 			   VC4_ENCODER_TYPE_HDMI0,
- 			   VC4_ENCODER_TYPE_HDMI1),
- 	VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, TXP, DSI1",
- 			   VC4_ENCODER_TYPE_DSI0,
- 			   VC4_ENCODER_TYPE_VEC,
--			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_TXP0,
- 			   VC4_ENCODER_TYPE_DSI1),
- 	VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, TXP, HDMI0",
- 			   VC4_ENCODER_TYPE_DSI0,
- 			   VC4_ENCODER_TYPE_VEC,
--			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_TXP0,
- 			   VC4_ENCODER_TYPE_HDMI0),
- 	VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, TXP, HDMI1",
- 			   VC4_ENCODER_TYPE_DSI0,
- 			   VC4_ENCODER_TYPE_VEC,
--			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_TXP0,
- 			   VC4_ENCODER_TYPE_HDMI1),
- 	VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, DSI1, HDMI0",
- 			   VC4_ENCODER_TYPE_DSI0,
-@@ -600,17 +600,17 @@ static const struct pv_muxing_param vc5_
- 			   VC4_ENCODER_TYPE_HDMI1),
- 	VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, TXP, DSI1, HDMI0",
- 			   VC4_ENCODER_TYPE_DSI0,
--			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_TXP0,
- 			   VC4_ENCODER_TYPE_DSI1,
- 			   VC4_ENCODER_TYPE_HDMI0),
- 	VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, TXP, DSI1, HDMI1",
- 			   VC4_ENCODER_TYPE_DSI0,
--			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_TXP0,
- 			   VC4_ENCODER_TYPE_DSI1,
- 			   VC4_ENCODER_TYPE_HDMI1),
- 	VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, TXP, HDMI0, HDMI1",
- 			   VC4_ENCODER_TYPE_DSI0,
--			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_TXP0,
- 			   VC4_ENCODER_TYPE_HDMI0,
- 			   VC4_ENCODER_TYPE_HDMI1),
- 	VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, DSI1, HDMI0, HDMI1",
-@@ -621,19 +621,19 @@ static const struct pv_muxing_param vc5_
- 	VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, TXP, DSI1, HDMI0",
- 			   VC4_ENCODER_TYPE_DSI0,
- 			   VC4_ENCODER_TYPE_VEC,
--			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_TXP0,
- 			   VC4_ENCODER_TYPE_DSI1,
- 			   VC4_ENCODER_TYPE_HDMI0),
- 	VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, TXP, DSI1, HDMI1",
- 			   VC4_ENCODER_TYPE_DSI0,
- 			   VC4_ENCODER_TYPE_VEC,
--			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_TXP0,
- 			   VC4_ENCODER_TYPE_DSI1,
- 			   VC4_ENCODER_TYPE_HDMI1),
- 	VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, TXP, HDMI0, HDMI1",
- 			   VC4_ENCODER_TYPE_DSI0,
- 			   VC4_ENCODER_TYPE_VEC,
--			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_TXP0,
- 			   VC4_ENCODER_TYPE_HDMI0,
- 			   VC4_ENCODER_TYPE_HDMI1),
- 	VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, DSI1, HDMI0, HDMI1",
-@@ -644,27 +644,27 @@ static const struct pv_muxing_param vc5_
- 			   VC4_ENCODER_TYPE_HDMI1),
- 	VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, TXP, DSI1, HDMI0, HDMI1",
- 			   VC4_ENCODER_TYPE_DSI0,
--			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_TXP0,
- 			   VC4_ENCODER_TYPE_DSI1,
- 			   VC4_ENCODER_TYPE_HDMI0,
- 			   VC4_ENCODER_TYPE_HDMI1),
- 	VC5_PV_MUXING_TEST("More than 3 outputs: VEC, TXP, DSI1, HDMI0, HDMI1",
- 			   VC4_ENCODER_TYPE_VEC,
--			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_TXP0,
- 			   VC4_ENCODER_TYPE_DSI1,
- 			   VC4_ENCODER_TYPE_HDMI0,
- 			   VC4_ENCODER_TYPE_HDMI1),
- 	VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, TXP, DSI1, HDMI0, HDMI1",
- 			   VC4_ENCODER_TYPE_DPI,
- 			   VC4_ENCODER_TYPE_VEC,
--			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_TXP0,
- 			   VC4_ENCODER_TYPE_DSI1,
- 			   VC4_ENCODER_TYPE_HDMI0,
- 			   VC4_ENCODER_TYPE_HDMI1),
- 	VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, TXP, DSI1, HDMI0, HDMI1",
- 			   VC4_ENCODER_TYPE_DSI0,
- 			   VC4_ENCODER_TYPE_VEC,
--			   VC4_ENCODER_TYPE_TXP,
-+			   VC4_ENCODER_TYPE_TXP0,
- 			   VC4_ENCODER_TYPE_DSI1,
- 			   VC4_ENCODER_TYPE_HDMI0,
- 			   VC4_ENCODER_TYPE_HDMI1),
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -511,7 +511,8 @@ enum vc4_encoder_type {
- 	VC4_ENCODER_TYPE_DSI1,
- 	VC4_ENCODER_TYPE_SMI,
- 	VC4_ENCODER_TYPE_DPI,
--	VC4_ENCODER_TYPE_TXP,
-+	VC4_ENCODER_TYPE_TXP0,
-+	VC4_ENCODER_TYPE_TXP1,
- };
- 
- struct vc4_encoder {
---- a/drivers/gpu/drm/vc4/vc4_kms.c
-+++ b/drivers/gpu/drm/vc4/vc4_kms.c
-@@ -359,7 +359,7 @@ static void vc6_hvs_pv_muxing_commit(str
- 			mux = 0;
- 			break;
- 
--		case VC4_ENCODER_TYPE_TXP:
-+		case VC4_ENCODER_TYPE_TXP0:
- 			mux = 2;
- 			break;
- 
---- a/drivers/gpu/drm/vc4/vc4_txp.c
-+++ b/drivers/gpu/drm/vc4/vc4_txp.c
-@@ -517,7 +517,7 @@ const struct vc4_txp_data bcm2835_txp_da
- 		.hvs_available_channels = BIT(2),
- 		.hvs_output = 2,
- 	},
--	.encoder_type = VC4_ENCODER_TYPE_TXP,
-+	.encoder_type = VC4_ENCODER_TYPE_TXP0,
- 	.has_byte_enable = true,
- };
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0973-drm-vc4-txp-Add-support-for-BCM2712-MOP.patch b/target/linux/bcm27xx/patches-6.1/950-0973-drm-vc4-txp-Add-support-for-BCM2712-MOP.patch
deleted file mode 100644
index aec0753408..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0973-drm-vc4-txp-Add-support-for-BCM2712-MOP.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 831c6e8c68a66678e8329a382823dc83c483dcc8 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Thu, 27 Apr 2023 09:30:49 +0200
-Subject: [PATCH] drm/vc4: txp: Add support for BCM2712 MOP
-
-The BCM2712 has an evolution of what used to be called TXP in the
-earlier SoCs, but is now called MOP.
-
-There's a few differences still, so we can add a new compatible to deal
-with them easily.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_txp.c | 18 +++++++++++++++++-
- 1 file changed, 17 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/vc4/vc4_txp.c
-+++ b/drivers/gpu/drm/vc4/vc4_txp.c
-@@ -388,6 +388,7 @@ static const struct drm_connector_funcs
- static void vc4_txp_encoder_disable(struct drm_encoder *encoder)
- {
- 	struct drm_device *drm = encoder->dev;
-+	struct vc4_dev *vc4 = to_vc4_dev(drm);
- 	struct vc4_txp *txp = encoder_to_vc4_txp(encoder);
- 	int idx;
- 
-@@ -406,7 +407,8 @@ static void vc4_txp_encoder_disable(stru
- 		WARN_ON(TXP_READ(TXP_DST_CTRL) & TXP_BUSY);
- 	}
- 
--	TXP_WRITE(TXP_DST_CTRL, TXP_POWERDOWN);
-+	if (vc4->gen < VC4_GEN_6)
-+		TXP_WRITE(TXP_DST_CTRL, TXP_POWERDOWN);
- 
- 	drm_dev_exit(idx);
- }
-@@ -510,6 +512,19 @@ static irqreturn_t vc4_txp_interrupt(int
- 	return IRQ_HANDLED;
- }
- 
-+const struct vc4_txp_data bcm2712_mop_data = {
-+	.base = {
-+		.name = "mop",
-+		.debugfs_name = "mop_regs",
-+		.hvs_available_channels = BIT(2),
-+		.hvs_output = 2,
-+	},
-+	.encoder_type = VC4_ENCODER_TYPE_TXP0,
-+	.has_byte_enable = true,
-+	.size_minus_one = true,
-+	.supports_40bit_addresses = true,
-+};
-+
- const struct vc4_txp_data bcm2835_txp_data = {
- 	.base = {
- 		.name = "txp",
-@@ -616,6 +631,7 @@ static int vc4_txp_remove(struct platfor
- }
- 
- static const struct of_device_id vc4_txp_dt_match[] = {
-+	{ .compatible = "brcm,bcm2712-mop", .data = &bcm2712_mop_data },
- 	{ .compatible = "brcm,bcm2835-txp", .data = &bcm2835_txp_data },
- 	{ /* sentinel */ },
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0974-drm-vc4-txp-Add-BCM2712-MOPLET-support.patch b/target/linux/bcm27xx/patches-6.1/950-0974-drm-vc4-txp-Add-BCM2712-MOPLET-support.patch
deleted file mode 100644
index b2a28bd144..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0974-drm-vc4-txp-Add-BCM2712-MOPLET-support.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From b239fc6a68fea2b073c4cb48884fbb697014ac2b Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Mon, 20 Feb 2023 17:16:01 +0100
-Subject: [PATCH] drm/vc4: txp: Add BCM2712 MOPLET support
-
-The BCM2712 features a simpler TXP called MOPLET. Let's add support for
-it.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_txp.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
---- a/drivers/gpu/drm/vc4/vc4_txp.c
-+++ b/drivers/gpu/drm/vc4/vc4_txp.c
-@@ -525,6 +525,18 @@ const struct vc4_txp_data bcm2712_mop_da
- 	.supports_40bit_addresses = true,
- };
- 
-+const struct vc4_txp_data bcm2712_moplet_data = {
-+	.base = {
-+		.name = "moplet",
-+		.debugfs_name = "moplet_regs",
-+		.hvs_available_channels = BIT(1),
-+		.hvs_output = 4,
-+	},
-+	.encoder_type = VC4_ENCODER_TYPE_TXP1,
-+	.size_minus_one = true,
-+	.supports_40bit_addresses = true,
-+};
-+
- const struct vc4_txp_data bcm2835_txp_data = {
- 	.base = {
- 		.name = "txp",
-@@ -632,6 +644,7 @@ static int vc4_txp_remove(struct platfor
- 
- static const struct of_device_id vc4_txp_dt_match[] = {
- 	{ .compatible = "brcm,bcm2712-mop", .data = &bcm2712_mop_data },
-+	{ .compatible = "brcm,bcm2712-moplet", .data = &bcm2712_moplet_data },
- 	{ .compatible = "brcm,bcm2835-txp", .data = &bcm2835_txp_data },
- 	{ /* sentinel */ },
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0975-drm-vc4-Add-additional-warn_on.patch b/target/linux/bcm27xx/patches-6.1/950-0975-drm-vc4-Add-additional-warn_on.patch
deleted file mode 100644
index 0fc95e5f6b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0975-drm-vc4-Add-additional-warn_on.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-From bb05ccd66342643b1cd9a0a48cec3ebdc3eed511 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Tue, 21 Feb 2023 14:38:32 +0100
-Subject: [PATCH] drm/vc4: Add additional warn_on
-
-Some code path in vc4 are conditional to a generation and cannot be
-executed on others. Let's put a WARN_ON if that ever happens.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_hvs.c   | 32 ++++++++++++++++++++++++++++++--
- drivers/gpu/drm/vc4/vc4_kms.c   |  6 ++++++
- drivers/gpu/drm/vc4/vc4_plane.c | 19 +++++++++++++++++++
- 3 files changed, 55 insertions(+), 2 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -417,12 +417,15 @@ static int vc4_hvs_upload_linear_kernel(
- static void vc4_hvs_lut_load(struct vc4_hvs *hvs,
- 			     struct vc4_crtc *vc4_crtc)
- {
--	struct drm_device *drm = &hvs->vc4->base;
-+	struct vc4_dev *vc4 = hvs->vc4;
-+	struct drm_device *drm = &vc4->base;
- 	struct drm_crtc *crtc = &vc4_crtc->base;
- 	struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc->state);
- 	int idx;
- 	u32 i;
- 
-+	WARN_ON_ONCE(vc4->gen > VC4_GEN_5);
-+
- 	if (!drm_dev_enter(drm, &idx))
- 		return;
- 
-@@ -758,6 +761,8 @@ u8 vc4_hvs_get_fifo_frame_count(struct v
- 	u8 field = 0;
- 	int idx;
- 
-+	WARN_ON_ONCE(vc4->gen > VC4_GEN_6);
-+
- 	if (!drm_dev_enter(drm, &idx))
- 		return 0;
- 
-@@ -791,6 +796,8 @@ int vc4_hvs_get_fifo_from_output(struct
- 	u32 reg;
- 	int ret;
- 
-+	WARN_ON_ONCE(vc4->gen > VC4_GEN_6);
-+
- 	switch (vc4->gen) {
- 	case VC4_GEN_4:
- 		return output;
-@@ -880,6 +887,8 @@ static int vc4_hvs_init_channel(struct v
- 	u32 dispctrl;
- 	int idx;
- 
-+	WARN_ON_ONCE(vc4->gen > VC4_GEN_5);
-+
- 	if (!drm_dev_enter(drm, &idx))
- 		return -ENODEV;
- 
-@@ -947,6 +956,8 @@ static int vc6_hvs_init_channel(struct v
- 	u32 disp_ctrl1;
- 	int idx;
- 
-+	WARN_ON_ONCE(vc4->gen != VC4_GEN_6);
-+
- 	if (!drm_dev_enter(drm, &idx))
- 		return -ENODEV;
- 
-@@ -972,9 +983,12 @@ static int vc6_hvs_init_channel(struct v
- 
- static void __vc4_hvs_stop_channel(struct vc4_hvs *hvs, unsigned int chan)
- {
--	struct drm_device *drm = &hvs->vc4->base;
-+	struct vc4_dev *vc4 = hvs->vc4;
-+	struct drm_device *drm = &vc4->base;
- 	int idx;
- 
-+	WARN_ON_ONCE(vc4->gen > VC4_GEN_5);
-+
- 	if (!drm_dev_enter(drm, &idx))
- 		return;
- 
-@@ -1007,6 +1021,8 @@ static void __vc6_hvs_stop_channel(struc
- 	struct drm_device *drm = &vc4->base;
- 	int idx;
- 
-+	WARN_ON_ONCE(vc4->gen != VC4_GEN_6);
-+
- 	if (!drm_dev_enter(drm, &idx))
- 		return;
- 
-@@ -1234,6 +1250,8 @@ void vc4_hvs_atomic_flush(struct drm_crt
- 	bool found = false;
- 	int idx;
- 
-+	WARN_ON_ONCE(vc4->gen > VC4_GEN_6);
-+
- 	if (!drm_dev_enter(dev, &idx)) {
- 		vc4_crtc_send_vblank(crtc);
- 		return;
-@@ -1324,6 +1342,8 @@ void vc4_hvs_atomic_flush(struct drm_crt
- 	if (crtc->state->color_mgmt_changed) {
- 		u32 dispbkgndx = HVS_READ(SCALER_DISPBKGNDX(channel));
- 
-+		WARN_ON_ONCE(vc4->gen > VC4_GEN_5);
-+
- 		if (crtc->state->gamma_lut) {
- 			if (vc4->gen == VC4_GEN_4) {
- 				vc4_hvs_update_gamma_lut(hvs, vc4_crtc);
-@@ -1363,6 +1383,8 @@ void vc4_hvs_mask_underrun(struct vc4_hv
- 	u32 dispctrl;
- 	int idx;
- 
-+	WARN_ON(vc4->gen > VC4_GEN_5);
-+
- 	if (!drm_dev_enter(drm, &idx))
- 		return;
- 
-@@ -1383,6 +1405,8 @@ void vc4_hvs_unmask_underrun(struct vc4_
- 	u32 dispctrl;
- 	int idx;
- 
-+	WARN_ON(vc4->gen > VC4_GEN_5);
-+
- 	if (!drm_dev_enter(drm, &idx))
- 		return;
- 
-@@ -1417,6 +1441,8 @@ static irqreturn_t vc4_hvs_irq_handler(i
- 	u32 status;
- 	u32 dspeislur;
- 
-+	WARN_ON(vc4->gen > VC4_GEN_5);
-+
- 	/*
- 	 * NOTE: We don't need to protect the register access using
- 	 * drm_dev_enter() there because the interrupt handler lifetime
-@@ -1466,6 +1492,8 @@ static irqreturn_t vc6_hvs_eof_irq_handl
- 	struct vc4_hvs *hvs = vc4->hvs;
- 	unsigned int i;
- 
-+	WARN_ON(vc4->gen < VC4_GEN_6);
-+
- 	for (i = 0; i < HVS_NUM_CHANNELS; i++) {
- 		if (!hvs->eof_irq[i].enabled)
- 			continue;
---- a/drivers/gpu/drm/vc4/vc4_kms.c
-+++ b/drivers/gpu/drm/vc4/vc4_kms.c
-@@ -147,6 +147,8 @@ vc4_ctm_commit(struct vc4_dev *vc4, stru
- 	if (vc4->firmware_kms)
- 		return;
- 
-+	WARN_ON_ONCE(vc4->gen > VC4_GEN_5);
-+
- 	if (ctm_state->fifo) {
- 		HVS_WRITE(SCALER_OLEDCOEF2,
- 			  VC4_SET_FIELD(vc4_ctm_s31_32_to_s0_9(ctm->matrix[0]),
-@@ -222,6 +224,8 @@ static void vc4_hvs_pv_muxing_commit(str
- 	struct drm_crtc *crtc;
- 	unsigned int i;
- 
-+	WARN_ON_ONCE(vc4->gen != VC4_GEN_4);
-+
- 	for_each_new_crtc_in_state(state, crtc, crtc_state, i) {
- 		struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
- 		struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc_state);
-@@ -265,6 +269,8 @@ static void vc5_hvs_pv_muxing_commit(str
- 	unsigned int i;
- 	u32 reg;
- 
-+	WARN_ON_ONCE(vc4->gen != VC4_GEN_5);
-+
- 	for_each_new_crtc_in_state(state, crtc, crtc_state, i) {
- 		struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc_state);
- 		struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
---- a/drivers/gpu/drm/vc4/vc4_plane.c
-+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -555,8 +555,11 @@ static int vc4_plane_setup_clipping_and_
- 
- static void vc4_write_tpz(struct vc4_plane_state *vc4_state, u32 src, u32 dst)
- {
-+	struct vc4_dev *vc4 = to_vc4_dev(vc4_state->base.plane->dev);
- 	u32 scale, recip;
- 
-+	WARN_ON_ONCE(vc4->gen > VC4_GEN_6);
-+
- 	scale = src / dst;
- 
- 	/* The specs note that while the reciprocal would be defined
-@@ -581,10 +584,13 @@ static void vc4_write_tpz(struct vc4_pla
- 
- static void vc4_write_ppf(struct vc4_plane_state *vc4_state, u32 src, u32 dst, u32 xy, int channel, int chroma_offset)
- {
-+	struct vc4_dev *vc4 = to_vc4_dev(vc4_state->base.plane->dev);
- 	u32 scale = src / dst;
- 	s32 offset, offset2;
- 	s32 phase;
- 
-+	WARN_ON_ONCE(vc4->gen > VC4_GEN_6);
-+
- 	/* Start the phase at 1/2 pixel from the 1st pixel at src_x.
- 	   1/4 pixel for YUV, plus the offset for chroma siting */
- 	if (channel) {
-@@ -801,8 +807,11 @@ static size_t vc6_upm_size(const struct
- static void vc4_write_scaling_parameters(struct drm_plane_state *state,
- 					 int channel)
- {
-+	struct vc4_dev *vc4 = to_vc4_dev(state->plane->dev);
- 	struct vc4_plane_state *vc4_state = to_vc4_plane_state(state);
- 
-+	WARN_ON_ONCE(vc4->gen > VC4_GEN_6);
-+
- 	/* Ch0 H-PPF Word 0: Scaling Parameters */
- 	if (vc4_state->x_scaling[channel] == VC4_SCALING_PPF) {
- 		vc4_write_ppf(vc4_state,
-@@ -1040,6 +1049,11 @@ static const u32 colorspace_coeffs[2][DR
- 
- static u32 vc4_hvs4_get_alpha_blend_mode(struct drm_plane_state *state)
- {
-+	struct drm_device *dev = state->state->dev;
-+	struct vc4_dev *vc4 = to_vc4_dev(dev);
-+
-+	WARN_ON_ONCE(vc4->gen != VC4_GEN_4);
-+
- 	if (!state->fb->format->has_alpha)
- 		return VC4_SET_FIELD(SCALER_POS2_ALPHA_MODE_FIXED,
- 				     SCALER_POS2_ALPHA_MODE);
-@@ -1061,6 +1075,11 @@ static u32 vc4_hvs4_get_alpha_blend_mode
- 
- static u32 vc4_hvs5_get_alpha_blend_mode(struct drm_plane_state *state)
- {
-+	struct drm_device *dev = state->state->dev;
-+	struct vc4_dev *vc4 = to_vc4_dev(dev);
-+
-+	WARN_ON_ONCE(vc4->gen != VC4_GEN_5 && vc4->gen != VC4_GEN_6);
-+
- 	if (!state->fb->format->has_alpha)
- 		return VC4_SET_FIELD(SCALER5_CTL2_ALPHA_MODE_FIXED,
- 				     SCALER5_CTL2_ALPHA_MODE);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0976-drm-vc4-tests-Switch-generation-mockup-to-a-switch.patch b/target/linux/bcm27xx/patches-6.1/950-0976-drm-vc4-tests-Switch-generation-mockup-to-a-switch.patch
deleted file mode 100644
index 0751d46536..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0976-drm-vc4-tests-Switch-generation-mockup-to-a-switch.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 336917ca87807b8a4bb08855b4dcb0477289c765 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 17 Feb 2023 13:35:16 +0100
-Subject: [PATCH] drm/vc4: tests: Switch generation mockup to a switch
-
-Testing whether the VideoCore generation we want to mock is vc5 or vc4
-worked so far, but will be difficult to extend to support BCM2712 (VC6).
-
-Convert to a switch.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/tests/vc4_mock.c | 18 ++++++++++++++++--
- 1 file changed, 16 insertions(+), 2 deletions(-)
-
---- a/drivers/gpu/drm/vc4/tests/vc4_mock.c
-+++ b/drivers/gpu/drm/vc4/tests/vc4_mock.c
-@@ -155,13 +155,27 @@ static int __build_mock(struct kunit *te
- 
- static struct vc4_dev *__mock_device(struct kunit *test, enum vc4_gen gen)
- {
-+	const struct vc4_mock_desc *desc;
-+	const struct drm_driver *drv;
- 	struct drm_device *drm;
--	const struct drm_driver *drv = (gen == VC4_GEN_5) ? &vc5_drm_driver : &vc4_drm_driver;
--	const struct vc4_mock_desc *desc = (gen == VC4_GEN_5) ? &vc5_mock : &vc4_mock;
- 	struct vc4_dev *vc4;
- 	struct device *dev;
- 	int ret;
- 
-+	switch (gen) {
-+	case VC4_GEN_4:
-+		drv = &vc4_drm_driver;
-+		desc = &vc4_mock;
-+		break;
-+	case VC4_GEN_5:
-+		drv = &vc5_drm_driver;
-+		desc = &vc5_mock;
-+		break;
-+
-+	default:
-+		return NULL;
-+	}
-+
- 	dev = drm_kunit_helper_alloc_device(test);
- 	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dev);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0977-drm-vc4-tests-Drop-drm-parameter-for-vc4_find_crtc_f.patch b/target/linux/bcm27xx/patches-6.1/950-0977-drm-vc4-tests-Drop-drm-parameter-for-vc4_find_crtc_f.patch
deleted file mode 100644
index 42c4be9b8b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0977-drm-vc4-tests-Drop-drm-parameter-for-vc4_find_crtc_f.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 70e906d3c688491e181446afa27bea32ce241d6a Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 24 Mar 2023 09:58:15 +0100
-Subject: [PATCH] drm/vc4: tests: Drop drm parameter for
- vc4_find_crtc_for_encoder
-
-The DRM device pointer and the DRM encoder pointer are redundant, since
-the latter is attached to the former and we can just follow the
-drm_encoder->dev pointer.
-
-Let's remove the drm_device pointer argument.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/tests/vc4_mock.h           | 2 +-
- drivers/gpu/drm/vc4/tests/vc4_mock_output.c    | 4 ++--
- drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
---- a/drivers/gpu/drm/vc4/tests/vc4_mock.h
-+++ b/drivers/gpu/drm/vc4/tests/vc4_mock.h
-@@ -7,9 +7,9 @@
- 
- static inline
- struct drm_crtc *vc4_find_crtc_for_encoder(struct kunit *test,
--					   struct drm_device *drm,
- 					   struct drm_encoder *encoder)
- {
-+	struct drm_device *drm = encoder->dev;
- 	struct drm_crtc *crtc;
- 
- 	KUNIT_ASSERT_EQ(test, hweight32(encoder->possible_crtcs), 1);
---- a/drivers/gpu/drm/vc4/tests/vc4_mock_output.c
-+++ b/drivers/gpu/drm/vc4/tests/vc4_mock_output.c
-@@ -77,7 +77,7 @@ int vc4_mock_atomic_add_output(struct ku
- 	encoder = vc4_find_encoder_by_type(drm, type);
- 	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, encoder);
- 
--	crtc = vc4_find_crtc_for_encoder(test, drm, encoder);
-+	crtc = vc4_find_crtc_for_encoder(test, encoder);
- 	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc);
- 
- 	output = container_of(encoder, struct vc4_dummy_output, encoder.base);
-@@ -115,7 +115,7 @@ int vc4_mock_atomic_del_output(struct ku
- 	encoder = vc4_find_encoder_by_type(drm, type);
- 	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, encoder);
- 
--	crtc = vc4_find_crtc_for_encoder(test, drm, encoder);
-+	crtc = vc4_find_crtc_for_encoder(test, encoder);
- 	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc);
- 
- 	crtc_state = drm_atomic_get_crtc_state(state, crtc);
---- a/drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c
-+++ b/drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c
-@@ -132,7 +132,7 @@ get_vc4_crtc_state_for_encoder(struct ku
- 	encoder = vc4_find_encoder_by_type(drm, type);
- 	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, encoder);
- 
--	crtc = vc4_find_crtc_for_encoder(test, drm, encoder);
-+	crtc = vc4_find_crtc_for_encoder(test, encoder);
- 	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc);
- 
- 	new_crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0978-drm-vc4-tests-Return-the-allocated-output.patch b/target/linux/bcm27xx/patches-6.1/950-0978-drm-vc4-tests-Return-the-allocated-output.patch
deleted file mode 100644
index 6f49d52f32..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0978-drm-vc4-tests-Return-the-allocated-output.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From 14e97c5765579eaab3c8372701750ffa30e4c7da Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 24 Mar 2023 10:02:59 +0100
-Subject: [PATCH] drm/vc4: tests: Return the allocated output
-
-Some tests will need to retrieve the output that was just allocated by
-vc4_mock_atomic_add_output().
-
-Instead of making them look them up in the DRM device, we can simply
-make vc4_mock_atomic_add_output() return an error pointer that holds the
-allocated output instead of the error code.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/tests/vc4_mock.h          |  7 ++--
- drivers/gpu/drm/vc4/tests/vc4_mock_output.c   |  9 +++--
- .../gpu/drm/vc4/tests/vc4_test_pv_muxing.c    | 37 +++++++++++--------
- 3 files changed, 30 insertions(+), 23 deletions(-)
-
---- a/drivers/gpu/drm/vc4/tests/vc4_mock.h
-+++ b/drivers/gpu/drm/vc4/tests/vc4_mock.h
-@@ -53,9 +53,10 @@ struct vc4_dummy_output *vc4_dummy_outpu
- struct vc4_dev *vc4_mock_device(struct kunit *test);
- struct vc4_dev *vc5_mock_device(struct kunit *test);
- 
--int vc4_mock_atomic_add_output(struct kunit *test,
--			       struct drm_atomic_state *state,
--			       enum vc4_encoder_type type);
-+struct vc4_dummy_output *
-+vc4_mock_atomic_add_output(struct kunit *test,
-+			   struct drm_atomic_state *state,
-+			   enum vc4_encoder_type type);
- int vc4_mock_atomic_del_output(struct kunit *test,
- 			       struct drm_atomic_state *state,
- 			       enum vc4_encoder_type type);
---- a/drivers/gpu/drm/vc4/tests/vc4_mock_output.c
-+++ b/drivers/gpu/drm/vc4/tests/vc4_mock_output.c
-@@ -61,9 +61,10 @@ static const struct drm_display_mode def
- 	DRM_SIMPLE_MODE(640, 480, 64, 48)
- };
- 
--int vc4_mock_atomic_add_output(struct kunit *test,
--			       struct drm_atomic_state *state,
--			       enum vc4_encoder_type type)
-+struct vc4_dummy_output *
-+vc4_mock_atomic_add_output(struct kunit *test,
-+			   struct drm_atomic_state *state,
-+			   enum vc4_encoder_type type)
- {
- 	struct drm_device *drm = state->dev;
- 	struct drm_connector_state *conn_state;
-@@ -96,7 +97,7 @@ int vc4_mock_atomic_add_output(struct ku
- 
- 	crtc_state->active = true;
- 
--	return 0;
-+	return output;
- }
- 
- int vc4_mock_atomic_del_output(struct kunit *test,
---- a/drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c
-+++ b/drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c
-@@ -683,10 +683,11 @@ static void drm_vc4_test_pv_muxing(struc
- 	int ret;
- 
- 	for (i = 0; i < params->nencoders; i++) {
-+		struct vc4_dummy_output *output;
- 		enum vc4_encoder_type enc_type = params->encoders[i];
- 
--		ret = vc4_mock_atomic_add_output(test, state, enc_type);
--		KUNIT_ASSERT_EQ(test, ret, 0);
-+		output = vc4_mock_atomic_add_output(test, state, enc_type);
-+		KUNIT_ASSERT_NOT_ERR_OR_NULL(test, output);
- 	}
- 
- 	ret = drm_atomic_check_only(state);
-@@ -712,10 +713,11 @@ static void drm_vc4_test_pv_muxing_inval
- 	int ret;
- 
- 	for (i = 0; i < params->nencoders; i++) {
-+		struct vc4_dummy_output *output;
- 		enum vc4_encoder_type enc_type = params->encoders[i];
- 
--		ret = vc4_mock_atomic_add_output(test, state, enc_type);
--		KUNIT_ASSERT_EQ(test, ret, 0);
-+		output = vc4_mock_atomic_add_output(test, state, enc_type);
-+		KUNIT_ASSERT_NOT_ERR_OR_NULL(test, output);
- 	}
- 
- 	ret = drm_atomic_check_only(state);
-@@ -804,6 +806,7 @@ static void drm_test_vc5_pv_muxing_bugs_
- {
- 	struct drm_modeset_acquire_ctx ctx;
- 	struct drm_atomic_state *state;
-+	struct vc4_dummy_output *output;
- 	struct vc4_crtc_state *new_vc4_crtc_state;
- 	struct vc4_hvs_state *new_hvs_state;
- 	unsigned int hdmi0_channel;
-@@ -823,8 +826,8 @@ static void drm_test_vc5_pv_muxing_bugs_
- 
- 	state->acquire_ctx = &ctx;
- 
--	ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI0);
--	KUNIT_ASSERT_EQ(test, ret, 0);
-+	output = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI0);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, output);
- 
- 	ret = drm_atomic_check_only(state);
- 	KUNIT_ASSERT_EQ(test, ret, 0);
-@@ -850,8 +853,8 @@ static void drm_test_vc5_pv_muxing_bugs_
- 
- 	state->acquire_ctx = &ctx;
- 
--	ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI1);
--	KUNIT_ASSERT_EQ(test, ret, 0);
-+	output = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI1);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, output);
- 
- 	ret = drm_atomic_check_only(state);
- 	KUNIT_ASSERT_EQ(test, ret, 0);
-@@ -880,6 +883,7 @@ static void drm_test_vc5_pv_muxing_bugs_
- {
- 	struct drm_modeset_acquire_ctx ctx;
- 	struct drm_atomic_state *state;
-+	struct vc4_dummy_output *output;
- 	struct vc4_crtc_state *new_vc4_crtc_state;
- 	struct vc4_hvs_state *new_hvs_state;
- 	unsigned int old_hdmi0_channel;
-@@ -899,11 +903,11 @@ static void drm_test_vc5_pv_muxing_bugs_
- 
- 	state->acquire_ctx = &ctx;
- 
--	ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI0);
--	KUNIT_ASSERT_EQ(test, ret, 0);
-+	output = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI0);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, output);
- 
--	ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI1);
--	KUNIT_ASSERT_EQ(test, ret, 0);
-+	output = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI1);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, output);
- 
- 	ret = drm_atomic_check_only(state);
- 	KUNIT_ASSERT_EQ(test, ret, 0);
-@@ -971,6 +975,7 @@ drm_test_vc5_pv_muxing_bugs_subsequent_c
- {
- 	struct drm_modeset_acquire_ctx ctx;
- 	struct drm_atomic_state *state;
-+	struct vc4_dummy_output *output;
- 	struct vc4_crtc_state *new_vc4_crtc_state;
- 	struct drm_device *drm;
- 	struct vc4_dev *vc4;
-@@ -987,8 +992,8 @@ drm_test_vc5_pv_muxing_bugs_subsequent_c
- 
- 	state->acquire_ctx = &ctx;
- 
--	ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI0);
--	KUNIT_ASSERT_EQ(test, ret, 0);
-+	output = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI0);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, output);
- 
- 	ret = drm_atomic_check_only(state);
- 	KUNIT_ASSERT_EQ(test, ret, 0);
-@@ -1003,8 +1008,8 @@ drm_test_vc5_pv_muxing_bugs_subsequent_c
- 
- 	state->acquire_ctx = &ctx;
- 
--	ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI1);
--	KUNIT_ASSERT_EQ(test, ret, 0);
-+	output = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI1);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, output);
- 
- 	ret = drm_atomic_check_only(state);
- 	KUNIT_ASSERT_EQ(test, ret, 0);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0979-drm-vc4-tests-Add-BCM2712-mock-driver.patch b/target/linux/bcm27xx/patches-6.1/950-0979-drm-vc4-tests-Add-BCM2712-mock-driver.patch
deleted file mode 100644
index 8c12375284..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0979-drm-vc4-tests-Add-BCM2712-mock-driver.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 04bec005b049604f862765b35ebd71c2a69b9e7c Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 17 Feb 2023 13:38:10 +0100
-Subject: [PATCH] drm/vc4: tests: Add BCM2712 mock driver
-
-The BCM2712 has a simpler pipeline that can only output to a writeback
-connector and two HDMI controllers.
-
-Let's allow our kunit tests to create a mock of that pipeline.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/tests/vc4_mock.c | 29 ++++++++++++++++++++++++++++
- drivers/gpu/drm/vc4/tests/vc4_mock.h |  1 +
- drivers/gpu/drm/vc4/vc4_drv.h        |  2 ++
- 3 files changed, 32 insertions(+)
-
---- a/drivers/gpu/drm/vc4/tests/vc4_mock.c
-+++ b/drivers/gpu/drm/vc4/tests/vc4_mock.c
-@@ -106,6 +106,26 @@ static const struct vc4_mock_desc vc5_mo
- 							      DRM_MODE_CONNECTOR_HDMIA)),
- );
- 
-+static const struct vc4_mock_desc vc6_mock =
-+	VC4_MOCK_DESC(
-+		VC4_MOCK_CRTC_DESC(&bcm2712_mop_data.base,
-+				   VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_TXP0,
-+							DRM_MODE_ENCODER_VIRTUAL,
-+							DRM_MODE_CONNECTOR_WRITEBACK)),
-+		VC4_MOCK_CRTC_DESC(&bcm2712_moplet_data.base,
-+				   VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_TXP1,
-+							DRM_MODE_ENCODER_VIRTUAL,
-+							DRM_MODE_CONNECTOR_WRITEBACK)),
-+		VC4_MOCK_PIXELVALVE_DESC(&bcm2712_pv0_data,
-+					 VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_HDMI0,
-+							      DRM_MODE_ENCODER_TMDS,
-+							      DRM_MODE_CONNECTOR_HDMIA)),
-+		VC4_MOCK_PIXELVALVE_DESC(&bcm2712_pv1_data,
-+					 VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_HDMI1,
-+							      DRM_MODE_ENCODER_TMDS,
-+							      DRM_MODE_CONNECTOR_HDMIA)),
-+);
-+
- static int __build_one_pipe(struct kunit *test, struct drm_device *drm,
- 			    const struct vc4_mock_pipe_desc *pipe)
- {
-@@ -171,6 +191,10 @@ static struct vc4_dev *__mock_device(str
- 		drv = &vc5_drm_driver;
- 		desc = &vc5_mock;
- 		break;
-+	case VC4_GEN_6:
-+		drv = &vc5_drm_driver;
-+		desc = &vc6_mock;
-+		break;
- 
- 	default:
- 		return NULL;
-@@ -212,3 +236,8 @@ struct vc4_dev *vc5_mock_device(struct k
- {
- 	return __mock_device(test, VC4_GEN_5);
- }
-+
-+struct vc4_dev *vc6_mock_device(struct kunit *test)
-+{
-+	return __mock_device(test, VC4_GEN_6);
-+}
---- a/drivers/gpu/drm/vc4/tests/vc4_mock.h
-+++ b/drivers/gpu/drm/vc4/tests/vc4_mock.h
-@@ -52,6 +52,7 @@ struct vc4_dummy_output *vc4_dummy_outpu
- 
- struct vc4_dev *vc4_mock_device(struct kunit *test);
- struct vc4_dev *vc5_mock_device(struct kunit *test);
-+struct vc4_dev *vc6_mock_device(struct kunit *test);
- 
- struct vc4_dummy_output *
- vc4_mock_atomic_add_output(struct kunit *test,
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -570,6 +570,8 @@ struct vc4_txp_data {
- 	unsigned int supports_40bit_addresses:1;
- };
- 
-+extern const struct vc4_txp_data bcm2712_mop_data;
-+extern const struct vc4_txp_data bcm2712_moplet_data;
- extern const struct vc4_txp_data bcm2835_txp_data;
- 
- struct vc4_pv_data {
diff --git a/target/linux/bcm27xx/patches-6.1/950-0980-drm-vc4-tests-Add-tests-for-BCM2712-PixelValve-Muxin.patch b/target/linux/bcm27xx/patches-6.1/950-0980-drm-vc4-tests-Add-tests-for-BCM2712-PixelValve-Muxin.patch
deleted file mode 100644
index 6c0db592c9..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0980-drm-vc4-tests-Add-tests-for-BCM2712-PixelValve-Muxin.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From 77c14764ae164b7969e65437a87aca25b30d8b80 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 14 Apr 2023 11:14:22 +0200
-Subject: [PATCH] drm/vc4: tests: Add tests for BCM2712 PixelValve Muxing
-
-The BCM2712 has a simpler pipeline than the BCM2711, and thus the muxing
-requirements are different. Create some tests to make sure we get proper
-muxing decisions.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- .../gpu/drm/vc4/tests/vc4_test_pv_muxing.c    | 81 +++++++++++++++++++
- 1 file changed, 81 insertions(+)
-
---- a/drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c
-+++ b/drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c
-@@ -105,6 +105,13 @@ static const struct encoder_constraint v
- 	ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_HDMI1, 0, 1, 2),
- };
- 
-+static const struct encoder_constraint vc6_encoder_constraints[] = {
-+	ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_HDMI0, 0),
-+	ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_HDMI1, 1),
-+	ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_TXP1, 1),
-+	ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_TXP0, 2),
-+};
-+
- static bool check_vc4_encoder_constraints(enum vc4_encoder_type type, unsigned int channel)
- {
- 	return __check_encoder_constraints(vc4_encoder_constraints,
-@@ -119,6 +126,13 @@ static bool check_vc5_encoder_constraint
- 					   type, channel);
- }
- 
-+static bool check_vc6_encoder_constraints(enum vc4_encoder_type type, unsigned int channel)
-+{
-+	return __check_encoder_constraints(vc6_encoder_constraints,
-+					   ARRAY_SIZE(vc6_encoder_constraints),
-+					   type, channel);
-+}
-+
- static struct vc4_crtc_state *
- get_vc4_crtc_state_for_encoder(struct kunit *test,
- 			       const struct drm_atomic_state *state,
-@@ -196,6 +210,9 @@ static void vc4_test_pv_muxing_desc(cons
- #define VC5_PV_MUXING_TEST(_name, ...)		\
- 	PV_MUXING_TEST(_name, vc5_mock_device, check_vc5_encoder_constraints, __VA_ARGS__)
- 
-+#define VC6_PV_MUXING_TEST(_name, ...)		\
-+	PV_MUXING_TEST(_name, vc6_mock_device, check_vc6_encoder_constraints, __VA_ARGS__)
-+
- static const struct pv_muxing_param vc4_test_pv_muxing_params[] = {
- 	VC4_PV_MUXING_TEST("1 output: DSI0",
- 			   VC4_ENCODER_TYPE_DSI0),
-@@ -674,6 +691,54 @@ KUNIT_ARRAY_PARAM(vc5_test_pv_muxing_inv
- 		  vc5_test_pv_muxing_invalid_params,
- 		  vc4_test_pv_muxing_desc);
- 
-+static const struct pv_muxing_param vc6_test_pv_muxing_params[] = {
-+	VC6_PV_MUXING_TEST("1 output: HDMI0",
-+			   VC4_ENCODER_TYPE_HDMI0),
-+	VC6_PV_MUXING_TEST("1 output: HDMI1",
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC6_PV_MUXING_TEST("1 output: MOPLET",
-+			   VC4_ENCODER_TYPE_TXP1),
-+	VC6_PV_MUXING_TEST("1 output: MOP",
-+			   VC4_ENCODER_TYPE_TXP0),
-+	VC6_PV_MUXING_TEST("2 outputs: HDMI0, HDMI1",
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_HDMI1),
-+	VC6_PV_MUXING_TEST("2 outputs: HDMI0, MOPLET",
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_TXP1),
-+	VC6_PV_MUXING_TEST("2 outputs: HDMI0, MOP",
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_TXP0),
-+	VC6_PV_MUXING_TEST("2 outputs: HDMI1, MOP",
-+			   VC4_ENCODER_TYPE_HDMI1,
-+			   VC4_ENCODER_TYPE_TXP0),
-+	VC6_PV_MUXING_TEST("2 outputs: MOPLET, MOP",
-+			   VC4_ENCODER_TYPE_TXP1,
-+			   VC4_ENCODER_TYPE_TXP0),
-+	VC6_PV_MUXING_TEST("3 outputs: HDMI0, HDMI1, MOP",
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_HDMI1,
-+			   VC4_ENCODER_TYPE_TXP0),
-+	VC6_PV_MUXING_TEST("3 outputs: HDMI0, MOPLET, MOP",
-+			   VC4_ENCODER_TYPE_HDMI0,
-+			   VC4_ENCODER_TYPE_TXP1,
-+			   VC4_ENCODER_TYPE_TXP0),
-+};
-+
-+KUNIT_ARRAY_PARAM(vc6_test_pv_muxing,
-+		  vc6_test_pv_muxing_params,
-+		  vc4_test_pv_muxing_desc);
-+
-+static const struct pv_muxing_param vc6_test_pv_muxing_invalid_params[] = {
-+	VC6_PV_MUXING_TEST("HDMI1/MOPLET Conflict",
-+			   VC4_ENCODER_TYPE_HDMI1,
-+			   VC4_ENCODER_TYPE_TXP1),
-+};
-+
-+KUNIT_ARRAY_PARAM(vc6_test_pv_muxing_invalid,
-+		  vc6_test_pv_muxing_invalid_params,
-+		  vc4_test_pv_muxing_desc);
-+
- static void drm_vc4_test_pv_muxing(struct kunit *test)
- {
- 	const struct pv_muxing_param *params = test->param_value;
-@@ -797,6 +862,21 @@ static struct kunit_suite vc5_pv_muxing_
- 	.test_cases = vc5_pv_muxing_tests,
- };
- 
-+static struct kunit_case vc6_pv_muxing_tests[] = {
-+	KUNIT_CASE_PARAM(drm_vc4_test_pv_muxing,
-+			 vc6_test_pv_muxing_gen_params),
-+	KUNIT_CASE_PARAM(drm_vc4_test_pv_muxing_invalid,
-+			 vc6_test_pv_muxing_invalid_gen_params),
-+	{}
-+};
-+
-+static struct kunit_suite vc6_pv_muxing_test_suite = {
-+	.name = "vc6-pv-muxing-combinations",
-+	.init = vc4_pv_muxing_test_init,
-+	.exit = vc4_pv_muxing_test_exit,
-+	.test_cases = vc6_pv_muxing_tests,
-+};
-+
- /* See
-  * https://lore.kernel.org/all/3e113525-aa89-b1e2-56b7-ca55bd41d057@samsung.com/
-  * and
-@@ -1040,5 +1120,6 @@ static struct kunit_suite vc5_pv_muxing_
- kunit_test_suites(
- 	&vc4_pv_muxing_test_suite,
- 	&vc5_pv_muxing_test_suite,
-+	&vc6_pv_muxing_test_suite,
- 	&vc5_pv_muxing_bugs_test_suite
- );
diff --git a/target/linux/bcm27xx/patches-6.1/950-0981-drm-vc4-fkms-Rename-plane-related-functions.patch b/target/linux/bcm27xx/patches-6.1/950-0981-drm-vc4-fkms-Rename-plane-related-functions.patch
deleted file mode 100644
index 455c64ad2e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0981-drm-vc4-fkms-Rename-plane-related-functions.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 3d849ab48cecab55862a4f2742f11937d66ba54b Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 14 Apr 2023 11:21:34 +0200
-Subject: [PATCH] drm/vc4: fkms: Rename plane related functions
-
-The name collide with the Full KMS functions that are going to be made
-public.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/vc4_firmware_kms.c | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-+++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-@@ -670,8 +670,8 @@ static int vc4_plane_to_mb(struct drm_pl
- 	return 0;
- }
- 
--static int vc4_plane_atomic_check(struct drm_plane *plane,
--				  struct drm_atomic_state *state)
-+static int vc4_fkms_plane_atomic_check(struct drm_plane *plane,
-+				       struct drm_atomic_state *state)
- {
- 	struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state,
- 										 plane);
-@@ -728,7 +728,7 @@ static int vc4_plane_atomic_async_check(
- }
- 
- /* Called during init to allocate the plane's atomic state. */
--static void vc4_plane_reset(struct drm_plane *plane)
-+static void vc4_fkms_plane_reset(struct drm_plane *plane)
- {
- 	struct vc4_plane_state *vc4_state;
- 
-@@ -788,7 +788,7 @@ static bool vc4_fkms_format_mod_supporte
- 	}
- }
- 
--static struct drm_plane_state *vc4_plane_duplicate_state(struct drm_plane *plane)
-+static struct drm_plane_state *vc4_fkms_plane_duplicate_state(struct drm_plane *plane)
- {
- 	struct vc4_plane_state *vc4_state;
- 
-@@ -809,8 +809,8 @@ static const struct drm_plane_funcs vc4_
- 	.disable_plane = drm_atomic_helper_disable_plane,
- 	.destroy = vc4_plane_destroy,
- 	.set_property = NULL,
--	.reset = vc4_plane_reset,
--	.atomic_duplicate_state = vc4_plane_duplicate_state,
-+	.reset = vc4_fkms_plane_reset,
-+	.atomic_duplicate_state = vc4_fkms_plane_duplicate_state,
- 	.atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
- 	.format_mod_supported = vc4_fkms_format_mod_supported,
- };
-@@ -818,7 +818,7 @@ static const struct drm_plane_funcs vc4_
- static const struct drm_plane_helper_funcs vc4_plane_helper_funcs = {
- 	.prepare_fb = drm_gem_plane_helper_prepare_fb,
- 	.cleanup_fb = NULL,
--	.atomic_check = vc4_plane_atomic_check,
-+	.atomic_check = vc4_fkms_plane_atomic_check,
- 	.atomic_update = vc4_plane_atomic_update,
- 	.atomic_disable = vc4_plane_atomic_disable,
- 	.atomic_async_check = vc4_plane_atomic_async_check,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0982-drm-vc4-tests-Use-custom-plane-state-for-mock.patch b/target/linux/bcm27xx/patches-6.1/950-0982-drm-vc4-tests-Use-custom-plane-state-for-mock.patch
deleted file mode 100644
index 0105753a91..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0982-drm-vc4-tests-Use-custom-plane-state-for-mock.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 14fe42ff341741d60ba338c401855dee7fb68754 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 14 Apr 2023 11:24:37 +0200
-Subject: [PATCH] drm/vc4: tests: Use custom plane state for mock
-
-The current mock planes were just using the regular drm_plane_state,
-while the driver expect struct vc4_plane_state that subclasses
-drm_plane_state.
-
-Hook the proper implementations of reset, duplicate_state, destroy and
-atomic_check to create vc4_plane_state.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/tests/vc4_mock_plane.c |  7 ++++---
- drivers/gpu/drm/vc4/vc4_drv.h              |  6 ++++++
- drivers/gpu/drm/vc4/vc4_plane.c            | 12 ++++++------
- 3 files changed, 16 insertions(+), 9 deletions(-)
-
---- a/drivers/gpu/drm/vc4/tests/vc4_mock_plane.c
-+++ b/drivers/gpu/drm/vc4/tests/vc4_mock_plane.c
-@@ -10,12 +10,13 @@
- #include "vc4_mock.h"
- 
- static const struct drm_plane_helper_funcs vc4_dummy_plane_helper_funcs = {
-+	.atomic_check = vc4_plane_atomic_check,
- };
- 
- static const struct drm_plane_funcs vc4_dummy_plane_funcs = {
--	.atomic_destroy_state	= drm_atomic_helper_plane_destroy_state,
--	.atomic_duplicate_state	= drm_atomic_helper_plane_duplicate_state,
--	.reset			= drm_atomic_helper_plane_reset,
-+	.atomic_destroy_state	= vc4_plane_destroy_state,
-+	.atomic_duplicate_state	= vc4_plane_duplicate_state,
-+	.reset			= vc4_plane_reset,
- };
- 
- static const uint32_t vc4_dummy_plane_formats[] = {
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -1145,6 +1145,12 @@ int vc4_kms_load(struct drm_device *dev)
- struct drm_plane *vc4_plane_init(struct drm_device *dev,
- 				 enum drm_plane_type type,
- 				 uint32_t possible_crtcs);
-+void vc4_plane_reset(struct drm_plane *plane);
-+void vc4_plane_destroy_state(struct drm_plane *plane,
-+			     struct drm_plane_state *state);
-+struct drm_plane_state *vc4_plane_duplicate_state(struct drm_plane *plane);
-+int vc4_plane_atomic_check(struct drm_plane *plane,
-+			   struct drm_atomic_state *state);
- int vc4_plane_create_additional_planes(struct drm_device *dev);
- u32 vc4_plane_write_dlist(struct drm_plane *plane, u32 __iomem *dlist);
- u32 vc4_plane_dlist_size(const struct drm_plane_state *state);
---- a/drivers/gpu/drm/vc4/vc4_plane.c
-+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -276,7 +276,7 @@ static bool plane_enabled(struct drm_pla
- 	return state->fb && !WARN_ON(!state->crtc);
- }
- 
--static struct drm_plane_state *vc4_plane_duplicate_state(struct drm_plane *plane)
-+struct drm_plane_state *vc4_plane_duplicate_state(struct drm_plane *plane)
- {
- 	struct vc4_plane_state *vc4_state;
- 	unsigned int i;
-@@ -312,8 +312,8 @@ static struct drm_plane_state *vc4_plane
- 	return &vc4_state->base;
- }
- 
--static void vc4_plane_destroy_state(struct drm_plane *plane,
--				    struct drm_plane_state *state)
-+void vc4_plane_destroy_state(struct drm_plane *plane,
-+			     struct drm_plane_state *state)
- {
- 	struct vc4_dev *vc4 = to_vc4_dev(plane->dev);
- 	struct vc4_hvs *hvs = vc4->hvs;
-@@ -348,7 +348,7 @@ static void vc4_plane_destroy_state(stru
- }
- 
- /* Called during init to allocate the plane's atomic state. */
--static void vc4_plane_reset(struct drm_plane *plane)
-+void vc4_plane_reset(struct drm_plane *plane)
- {
- 	struct vc4_plane_state *vc4_state;
- 
-@@ -2000,8 +2000,8 @@ static int vc6_plane_mode_set(struct drm
-  * compute the dlist here and have all active plane dlists get updated
-  * in the CRTC's flush.
-  */
--static int vc4_plane_atomic_check(struct drm_plane *plane,
--				  struct drm_atomic_state *state)
-+int vc4_plane_atomic_check(struct drm_plane *plane,
-+			   struct drm_atomic_state *state)
- {
- 	struct vc4_dev *vc4 = to_vc4_dev(plane->dev);
- 	struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0983-drm-vc4-tests-Add-function-to-lookup-a-plane-for-a-C.patch b/target/linux/bcm27xx/patches-6.1/950-0983-drm-vc4-tests-Add-function-to-lookup-a-plane-for-a-C.patch
deleted file mode 100644
index ebab218cf3..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0983-drm-vc4-tests-Add-function-to-lookup-a-plane-for-a-C.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 3320e449e40eeb49b601dcbbd4bd72b8cb8f3054 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 14 Apr 2023 11:26:58 +0200
-Subject: [PATCH] drm/vc4: tests: Add function to lookup a plane for a CRTC
-
-Some tests will need to find a plane to run a test on for a given CRTC.
-Let's create a small helper to do that.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/tests/vc4_mock.h | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
---- a/drivers/gpu/drm/vc4/tests/vc4_mock.h
-+++ b/drivers/gpu/drm/vc4/tests/vc4_mock.h
-@@ -21,6 +21,20 @@ struct drm_crtc *vc4_find_crtc_for_encod
- 	return NULL;
- }
- 
-+static inline
-+struct drm_plane *vc4_mock_find_plane_for_crtc(struct kunit *test,
-+					       struct drm_crtc *crtc)
-+{
-+	struct drm_device *drm = crtc->dev;
-+	struct drm_plane *plane;
-+
-+	drm_for_each_plane(plane, drm)
-+		if (plane->possible_crtcs & drm_crtc_mask(crtc))
-+			return plane;
-+
-+	return NULL;
-+}
-+
- struct vc4_dummy_plane {
- 	struct vc4_plane plane;
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0984-drm-vc4-tests-Add-helper-to-add-a-new-plane-to-a-sta.patch b/target/linux/bcm27xx/patches-6.1/950-0984-drm-vc4-tests-Add-helper-to-add-a-new-plane-to-a-sta.patch
deleted file mode 100644
index 7d230294fc..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0984-drm-vc4-tests-Add-helper-to-add-a-new-plane-to-a-sta.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From a2f912c44b98acb6c10c977db105e199011c09b5 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 14 Apr 2023 12:57:53 +0200
-Subject: [PATCH] drm/vc4: tests: Add helper to add a new plane to a state
-
-We'll start to add some tests for the plane state logic, so let's create
-a helper to add a plane to an existing atomic state.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/tests/vc4_mock.h       |  4 ++++
- drivers/gpu/drm/vc4/tests/vc4_mock_plane.c | 22 ++++++++++++++++++++++
- 2 files changed, 26 insertions(+)
-
---- a/drivers/gpu/drm/vc4/tests/vc4_mock.h
-+++ b/drivers/gpu/drm/vc4/tests/vc4_mock.h
-@@ -42,6 +42,10 @@ struct vc4_dummy_plane {
- struct vc4_dummy_plane *vc4_dummy_plane(struct kunit *test,
- 					struct drm_device *drm,
- 					enum drm_plane_type type);
-+struct drm_plane *
-+vc4_mock_atomic_add_plane(struct kunit *test,
-+			  struct drm_atomic_state *state,
-+			  struct drm_crtc *crtc);
- 
- struct vc4_dummy_crtc {
- 	struct vc4_crtc crtc;
---- a/drivers/gpu/drm/vc4/tests/vc4_mock_plane.c
-+++ b/drivers/gpu/drm/vc4/tests/vc4_mock_plane.c
-@@ -1,6 +1,7 @@
- // SPDX-License-Identifier: GPL-2.0
- 
- #include <drm/drm_atomic_state_helper.h>
-+#include <drm/drm_atomic_uapi.h>
- #include <drm/drm_fourcc.h>
- #include <drm/drm_modeset_helper_vtables.h>
- #include <drm/drm_plane.h>
-@@ -46,3 +47,24 @@ struct vc4_dummy_plane *vc4_dummy_plane(
- 
- 	return dummy_plane;
- }
-+
-+struct drm_plane *
-+vc4_mock_atomic_add_plane(struct kunit *test,
-+			  struct drm_atomic_state *state,
-+			  struct drm_crtc *crtc)
-+{
-+	struct drm_plane_state *plane_state;
-+	struct drm_plane *plane;
-+	int ret;
-+
-+	plane = vc4_mock_find_plane_for_crtc(test, crtc);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, plane);
-+
-+	plane_state = drm_atomic_get_plane_state(state, plane);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, plane_state);
-+
-+	ret = drm_atomic_set_crtc_for_plane(plane_state, crtc);
-+	KUNIT_EXPECT_EQ(test, ret, 0);
-+
-+	return plane;
-+}
diff --git a/target/linux/bcm27xx/patches-6.1/950-0985-drm-vc4-tests-Support-a-few-more-plane-formats.patch b/target/linux/bcm27xx/patches-6.1/950-0985-drm-vc4-tests-Support-a-few-more-plane-formats.patch
deleted file mode 100644
index 191181dbb6..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0985-drm-vc4-tests-Support-a-few-more-plane-formats.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 418d2e0e652c3870c29dd2e462f052a88fa027da Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 14 Apr 2023 12:59:05 +0200
-Subject: [PATCH] drm/vc4: tests: Support a few more plane formats
-
-We'll start testing our planes code in situations where we will use more
-than XRGB8888, so let's add a few common pixel formats.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/tests/vc4_mock_plane.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/gpu/drm/vc4/tests/vc4_mock_plane.c
-+++ b/drivers/gpu/drm/vc4/tests/vc4_mock_plane.c
-@@ -21,7 +21,10 @@ static const struct drm_plane_funcs vc4_
- };
- 
- static const uint32_t vc4_dummy_plane_formats[] = {
-+	DRM_FORMAT_ARGB8888,
- 	DRM_FORMAT_XRGB8888,
-+	DRM_FORMAT_YUV420,
-+	DRM_FORMAT_YUV422,
- };
- 
- struct vc4_dummy_plane *vc4_dummy_plane(struct kunit *test,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0986-drm-vc4-tests-Introduce-a-test-for-LBM-buffer-size.patch b/target/linux/bcm27xx/patches-6.1/950-0986-drm-vc4-tests-Introduce-a-test-for-LBM-buffer-size.patch
deleted file mode 100644
index 5902d141ef..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0986-drm-vc4-tests-Introduce-a-test-for-LBM-buffer-size.patch
+++ /dev/null
@@ -1,358 +0,0 @@
-From 39ae36d19bf6e59e3091f8f0ec6f4eac59aaf6f2 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime@cerno.tech>
-Date: Fri, 14 Apr 2023 13:43:32 +0200
-Subject: [PATCH] drm/vc4: tests: Introduce a test for LBM buffer size
-
-The BCM2712 comes with a different LBM size computation than the
-previous generations, so let's add the few examples provided as kunit
-tests to make sure we always satisfy those requirements.
-
-Signed-off-by: Maxime Ripard <maxime@cerno.tech>
----
- drivers/gpu/drm/vc4/Makefile                  |   3 +-
- drivers/gpu/drm/vc4/tests/vc4_test_lbm_size.c | 327 ++++++++++++++++++
- 2 files changed, 329 insertions(+), 1 deletion(-)
- create mode 100644 drivers/gpu/drm/vc4/tests/vc4_test_lbm_size.c
-
---- a/drivers/gpu/drm/vc4/Makefile
-+++ b/drivers/gpu/drm/vc4/Makefile
-@@ -31,7 +31,8 @@ vc4-$(CONFIG_DRM_VC4_KUNIT_TEST) += \
- 	tests/vc4_mock_crtc.o \
- 	tests/vc4_mock_output.o \
- 	tests/vc4_mock_plane.o \
--	tests/vc4_test_pv_muxing.o
-+	tests/vc4_test_pv_muxing.o \
-+	tests/vc4_test_lbm_size.o
- 
- vc4-$(CONFIG_DEBUG_FS) += vc4_debugfs.o
- 
---- /dev/null
-+++ b/drivers/gpu/drm/vc4/tests/vc4_test_lbm_size.c
-@@ -0,0 +1,327 @@
-+// SPDX-License-Identifier: GPL-2.0
-+
-+#include <drm/drm_atomic_helper.h>
-+#include <drm/drm_atomic_uapi.h>
-+#include <drm/drm_drv.h>
-+#include <drm/drm_fourcc.h>
-+#include <drm/drm_framebuffer.h>
-+#include <drm/drm_plane.h>
-+#include <drm/drm_kunit_helpers.h>
-+
-+#include "../../drm_crtc_internal.h"
-+#include "../../drm_internal.h"
-+
-+#include <kunit/test.h>
-+
-+#include "../vc4_drv.h"
-+
-+#include "vc4_mock.h"
-+
-+u32 vc4_lbm_size(struct drm_plane_state *state);
-+
-+struct vc4_lbm_size_priv {
-+	struct vc4_dev *vc4;
-+	struct drm_file *file;
-+	struct drm_modeset_acquire_ctx ctx;
-+	struct drm_atomic_state *state;
-+};
-+
-+struct vc4_lbm_size_param {
-+	unsigned int src_w, src_h;
-+	unsigned int crtc_w, crtc_h;
-+	bool forced_alpha;
-+	u32 fourcc;
-+	enum vc4_scaling_mode expected_x_scaling[2];
-+	enum vc4_scaling_mode expected_y_scaling[2];
-+	unsigned int expected_lbm_size;
-+};
-+
-+static const struct vc4_lbm_size_param vc4_test_lbm_size_params[] = {
-+	{
-+		.src_w = 256,
-+		.crtc_w = 256,
-+		.src_h = 256,
-+		.crtc_h = 512,
-+		.fourcc = DRM_FORMAT_ARGB8888,
-+		.expected_x_scaling = { VC4_SCALING_NONE, },
-+		.expected_y_scaling = { VC4_SCALING_PPF, },
-+		.expected_lbm_size = 32,
-+	},
-+	{
-+		.src_w = 256,
-+		.crtc_w = 179,
-+		.src_h = 256,
-+		.crtc_h = 512,
-+		.fourcc = DRM_FORMAT_ARGB8888,
-+		.expected_x_scaling = { VC4_SCALING_PPF, },
-+		.expected_y_scaling = { VC4_SCALING_PPF, },
-+		.expected_lbm_size = 23,
-+	},
-+	{
-+		.src_w = 256,
-+		.crtc_w = 256,
-+		.src_h = 256,
-+		.crtc_h = 512,
-+		.fourcc = DRM_FORMAT_XRGB8888,
-+		.expected_x_scaling = { VC4_SCALING_NONE, },
-+		.expected_y_scaling = { VC4_SCALING_PPF, },
-+		.expected_lbm_size = 24,
-+	},
-+	{
-+		.src_w = 100,
-+		.crtc_w = 73,
-+		.src_h = 100,
-+		.crtc_h = 73,
-+		.fourcc = DRM_FORMAT_XRGB8888,
-+		.expected_x_scaling = { VC4_SCALING_PPF, },
-+		.expected_y_scaling = { VC4_SCALING_PPF, },
-+		.expected_lbm_size = 8,
-+	},
-+	{
-+		.src_w = 256,
-+		.crtc_w = 256,
-+		.src_h = 256,
-+		.crtc_h = 512,
-+		.forced_alpha = true,
-+		.fourcc = DRM_FORMAT_ARGB8888,
-+		.expected_x_scaling = { VC4_SCALING_NONE, },
-+		.expected_y_scaling = { VC4_SCALING_PPF, },
-+		.expected_lbm_size = 24,
-+	},
-+	{
-+		.src_w = 100,
-+		.crtc_w = 73,
-+		.src_h = 100,
-+		.crtc_h = 73,
-+		.forced_alpha = true,
-+		.fourcc = DRM_FORMAT_ARGB8888,
-+		.expected_x_scaling = { VC4_SCALING_PPF, },
-+		.expected_y_scaling = { VC4_SCALING_PPF, },
-+		.expected_lbm_size = 8,
-+	},
-+	{
-+		.src_w = 256,
-+		.crtc_w = 94,
-+		.src_h = 256,
-+		.crtc_h = 94,
-+		.fourcc = DRM_FORMAT_ARGB8888,
-+		.expected_x_scaling = { VC4_SCALING_TPZ, },
-+		.expected_y_scaling = { VC4_SCALING_TPZ, },
-+		.expected_lbm_size = 6,
-+	},
-+
-+/*
-+ * TODO: Those tests reflect the LBM size calculation examples, but the
-+ * driver ends up taking different scaler filters decisions, and thus
-+ * doesn't end up with the same sizes. It would be valuable to have
-+ * those tests, but the driver doesn't take a bad decision either, so
-+ * it's not clear what we should do at this point.
-+ */
-+#if 0
-+	{
-+		.src_w = 320,
-+		.crtc_w = 320,
-+		.src_h = 320,
-+		.crtc_h = 320,
-+		.fourcc = DRM_FORMAT_YUV420,
-+		.expected_x_scaling = { VC4_SCALING_NONE, VC4_SCALING_NONE, },
-+		.expected_y_scaling = { VC4_SCALING_NONE, VC4_SCALING_PPF, },
-+		.expected_lbm_size = 10,
-+	},
-+	{
-+		.src_w = 512,
-+		.crtc_w = 512,
-+		.src_h = 512,
-+		.crtc_h = 256,
-+		.fourcc = DRM_FORMAT_YUV420,
-+		.expected_x_scaling = { VC4_SCALING_NONE, VC4_SCALING_NONE, },
-+		.expected_y_scaling = { VC4_SCALING_TPZ, VC4_SCALING_NONE, },
-+		.expected_lbm_size = 5,
-+	},
-+	{
-+		.src_w = 486,
-+		.crtc_w = 157,
-+		.src_h = 404,
-+		.crtc_h = 929,
-+		.fourcc = DRM_FORMAT_YUV422,
-+		.expected_x_scaling = { VC4_SCALING_PPF, VC4_SCALING_PPF, },
-+		.expected_y_scaling = { VC4_SCALING_PPF, VC4_SCALING_PPF, },
-+		.expected_lbm_size = 20,
-+	},
-+	{
-+		.src_w = 320,
-+		.crtc_w = 128,
-+		.src_h = 176,
-+		.crtc_h = 70,
-+		.fourcc = DRM_FORMAT_YUV420,
-+		.expected_x_scaling = { VC4_SCALING_TPZ, VC4_SCALING_TPZ, },
-+		.expected_y_scaling = { VC4_SCALING_TPZ, VC4_SCALING_TPZ, },
-+		.expected_lbm_size = 8,
-+	},
-+#endif
-+};
-+
-+static void vc4_test_lbm_size_desc(const struct vc4_lbm_size_param *t, char *desc)
-+{
-+	snprintf(desc, KUNIT_PARAM_DESC_SIZE,
-+		 "%ux%u to %ux%u %s(%p4cc)",
-+		 t->src_w, t->src_h,
-+		 t->crtc_w, t->crtc_h,
-+		 t->forced_alpha ? "with forced alpha " : "",
-+		 &t->fourcc);
-+}
-+
-+KUNIT_ARRAY_PARAM(vc4_test_lbm_size,
-+		  vc4_test_lbm_size_params,
-+		  vc4_test_lbm_size_desc);
-+
-+static void drm_vc4_test_vc4_lbm_size(struct kunit *test)
-+{
-+	const struct vc4_lbm_size_param *params = test->param_value;
-+	const struct vc4_lbm_size_priv *priv = test->priv;
-+	const struct drm_format_info *info;
-+	struct drm_mode_fb_cmd2 fb_req = { };
-+	struct drm_atomic_state *state = priv->state;
-+	struct vc4_plane_state *vc4_plane_state;
-+	struct drm_plane_state *plane_state;
-+	struct vc4_dummy_output *output;
-+	struct drm_framebuffer *fb;
-+	struct drm_plane *plane;
-+	struct drm_crtc *crtc;
-+	unsigned int i;
-+	int ret;
-+
-+	info = drm_format_info(params->fourcc);
-+	KUNIT_ASSERT_NOT_NULL(test, info);
-+
-+	output = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI0);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, output);
-+
-+	crtc = vc4_find_crtc_for_encoder(test, &output->encoder.base);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc);
-+
-+	plane = vc4_mock_atomic_add_plane(test, state, crtc);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, plane);
-+
-+	plane_state = drm_atomic_get_plane_state(state, plane);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, plane_state);
-+
-+	vc4_plane_state = to_vc4_plane_state(plane_state);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, vc4_plane_state);
-+
-+	fb_req.pixel_format = params->fourcc;
-+	fb_req.width = params->src_w;
-+	fb_req.height = params->src_h;
-+
-+	for (i = 0; i < info->num_planes; i++) {
-+		struct drm_mode_create_dumb dumb_args = { };
-+
-+		dumb_args.width = params->src_w;
-+		dumb_args.height = params->src_h;
-+		dumb_args.bpp = drm_format_info_bpp(info, i);
-+
-+		ret = drm_mode_create_dumb(state->dev, &dumb_args, priv->file);
-+		KUNIT_ASSERT_EQ(test, ret, 0);
-+
-+		fb_req.handles[i] = dumb_args.handle;
-+		fb_req.pitches[i] = dumb_args.pitch;
-+	}
-+
-+	fb = drm_internal_framebuffer_create(state->dev, &fb_req, priv->file);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, fb);
-+
-+	drm_atomic_set_fb_for_plane(plane_state, fb);
-+
-+	plane_state->src_x = 0;
-+	plane_state->src_y = 0;
-+	plane_state->src_h = params->src_h << 16;
-+	plane_state->src_w = params->src_w << 16;
-+
-+	plane_state->crtc_x = 0;
-+	plane_state->crtc_y = 0;
-+	plane_state->crtc_h = params->crtc_h;
-+	plane_state->crtc_w = params->crtc_w;
-+
-+	if (params->forced_alpha)
-+		plane_state->alpha = 128;
-+
-+	ret = drm_atomic_check_only(state);
-+	KUNIT_ASSERT_EQ(test, ret, 0);
-+
-+	KUNIT_EXPECT_EQ(test, vc4_plane_state->lbm.size, params->expected_lbm_size);
-+
-+	for (i = 0; i < 2; i++) {
-+		KUNIT_EXPECT_EQ(test,
-+				vc4_plane_state->x_scaling[i],
-+				params->expected_x_scaling[i]);
-+		KUNIT_EXPECT_EQ(test,
-+				vc4_plane_state->y_scaling[i],
-+				params->expected_y_scaling[i]);
-+	}
-+
-+	drm_framebuffer_put(fb);
-+
-+	for (i = 0; i < info->num_planes; i++)
-+		drm_mode_destroy_dumb(state->dev, fb_req.handles[i], priv->file);
-+}
-+
-+static struct kunit_case vc4_lbm_size_tests[] = {
-+	KUNIT_CASE_PARAM(drm_vc4_test_vc4_lbm_size,
-+			 vc4_test_lbm_size_gen_params),
-+	{}
-+};
-+
-+static int vc4_lbm_size_test_init(struct kunit *test)
-+{
-+	struct drm_atomic_state *state;
-+	struct vc4_lbm_size_priv *priv;
-+	struct drm_device *drm;
-+	struct vc4_dev *vc4;
-+
-+	priv = kunit_kzalloc(test, sizeof(*priv), GFP_KERNEL);
-+	KUNIT_ASSERT_NOT_NULL(test, priv);
-+	test->priv = priv;
-+
-+	vc4 = vc6_mock_device(test);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, vc4);
-+	priv->vc4 = vc4;
-+
-+	priv->file = drm_file_alloc(priv->vc4->base.primary);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv->file);
-+
-+	drm_modeset_acquire_init(&priv->ctx, 0);
-+
-+	drm = &vc4->base;
-+	state = drm_atomic_state_alloc(drm);
-+	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state);
-+
-+	state->acquire_ctx = &priv->ctx;
-+
-+	priv->state = state;
-+
-+	return 0;
-+}
-+
-+static void vc4_lbm_size_test_exit(struct kunit *test)
-+{
-+	struct vc4_lbm_size_priv *priv = test->priv;
-+	struct vc4_dev *vc4 = priv->vc4;
-+	struct drm_device *drm = &vc4->base;
-+	struct drm_atomic_state *state = priv->state;
-+
-+	drm_atomic_state_put(state);
-+	drm_modeset_drop_locks(&priv->ctx);
-+	drm_modeset_acquire_fini(&priv->ctx);
-+	drm_file_free(priv->file);
-+	drm_dev_unregister(drm);
-+	drm_kunit_helper_free_device(test, vc4->dev);
-+}
-+
-+static struct kunit_suite vc4_lbm_size_test_suite = {
-+	.name = "vc4-lbm-size",
-+	.init = vc4_lbm_size_test_init,
-+	.exit = vc4_lbm_size_test_exit,
-+	.test_cases = vc4_lbm_size_tests,
-+};
-+
-+kunit_test_suite(vc4_lbm_size_test_suite);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0987-drm-vc4-kms-Avoid-setting-core-and-disp-clocks-for-h.patch b/target/linux/bcm27xx/patches-6.1/950-0987-drm-vc4-kms-Avoid-setting-core-and-disp-clocks-for-h.patch
deleted file mode 100644
index f20b0cf3f8..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0987-drm-vc4-kms-Avoid-setting-core-and-disp-clocks-for-h.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 352d96c9e50012f2b5e5dde9933af8d570e7dc81 Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Mon, 17 Jul 2023 17:45:32 +0100
-Subject: [PATCH] drm/vc4: kms: Avoid setting core and disp clocks for hdmi
- modes
-
-On 2712, the firmware always runs these clock at a speed sufficient
-for dual 4kp60.
-
-The requests here prevent the gpu from going into its lowest voltage
-mode, so just skip the clock requests.
-
-With this applied the idle voltage on my pi 5 reduces from 0.7424V
-to 0.72V.
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/gpu/drm/vc4/vc4_kms.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_kms.c
-+++ b/drivers/gpu/drm/vc4/vc4_kms.c
-@@ -435,7 +435,7 @@ static void vc4_atomic_commit_tail(struc
- 		old_hvs_state->fifo_state[channel].pending_commit = NULL;
- 	}
- 
--	if (vc4->gen >= VC4_GEN_5 && !vc4->firmware_kms) {
-+	if (vc4->gen == VC4_GEN_5 && !vc4->firmware_kms) {
- 		unsigned long state_rate = max(old_hvs_state->core_clock_rate,
- 					       new_hvs_state->core_clock_rate);
- 		unsigned long core_rate = clamp_t(unsigned long, state_rate,
-@@ -489,7 +489,7 @@ static void vc4_atomic_commit_tail(struc
- 
- 	drm_atomic_helper_cleanup_planes(dev, state);
- 
--	if (vc4->gen >= VC4_GEN_5 && !vc4->firmware_kms) {
-+	if (vc4->gen == VC4_GEN_5 && !vc4->firmware_kms) {
- 		unsigned long core_rate = min_t(unsigned long,
- 						hvs->max_core_rate,
- 						new_hvs_state->core_clock_rate);
diff --git a/target/linux/bcm27xx/patches-6.1/950-0988-drm-vc4-Assign-LBM-memory-during-atomic_flush.patch b/target/linux/bcm27xx/patches-6.1/950-0988-drm-vc4-Assign-LBM-memory-during-atomic_flush.patch
deleted file mode 100644
index b489bbc7f7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0988-drm-vc4-Assign-LBM-memory-during-atomic_flush.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-From bb0839405b61da6e6ae7141f7433f6a121725e6f Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 31 Aug 2023 11:45:38 +0100
-Subject: [PATCH] drm/vc4: Assign LBM memory during atomic_flush.
-
-Avoid double buffering LBM allocations by making the
-allocation a single alloc per crtc at atomic_flush.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/tests/vc4_test_lbm_size.c |  2 +-
- drivers/gpu/drm/vc4/vc4_drv.h                 |  8 ++--
- drivers/gpu/drm/vc4/vc4_hvs.c                 | 47 ++++++++++++++++++-
- drivers/gpu/drm/vc4/vc4_plane.c               | 38 +++------------
- 4 files changed, 58 insertions(+), 37 deletions(-)
-
---- a/drivers/gpu/drm/vc4/tests/vc4_test_lbm_size.c
-+++ b/drivers/gpu/drm/vc4/tests/vc4_test_lbm_size.c
-@@ -248,7 +248,7 @@ static void drm_vc4_test_vc4_lbm_size(st
- 	ret = drm_atomic_check_only(state);
- 	KUNIT_ASSERT_EQ(test, ret, 0);
- 
--	KUNIT_EXPECT_EQ(test, vc4_plane_state->lbm.size, params->expected_lbm_size);
-+	KUNIT_EXPECT_EQ(test, vc4_plane_state->lbm_size, params->expected_lbm_size);
- 
- 	for (i = 0; i < 2; i++) {
- 		KUNIT_EXPECT_EQ(test,
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -437,6 +437,8 @@ struct vc4_plane_state {
- 	u32 dlist_size; /* Number of dwords allocated for the display list */
- 	u32 dlist_count; /* Number of used dwords in the display list. */
- 
-+	u32 lbm_size; /* LBM requirements for this plane */
-+
- 	/* Offset in the dlist to various words, for pageflip or
- 	 * cursor updates.
- 	 */
-@@ -462,9 +464,6 @@ struct vc4_plane_state {
- 	bool is_unity;
- 	bool is_yuv;
- 
--	/* Our allocation in LBM for temporary storage during scaling. */
--	struct drm_mm_node lbm;
--
- 	/* Our allocation in UPM for prefetching. */
- 	struct drm_mm_node upm[DRM_FORMAT_MAX_PLANES];
- 
-@@ -661,6 +660,9 @@ struct vc4_crtc {
- 	 * access to that value.
- 	 */
- 	unsigned int current_hvs_channel;
-+
-+	/* @lbm: Our allocation in LBM for temporary storage during scaling. */
-+	struct drm_mm_node lbm;
- };
- 
- static inline struct vc4_crtc *
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -1103,6 +1103,7 @@ int vc4_hvs_atomic_check(struct drm_crtc
- 	struct drm_plane *plane;
- 	const struct drm_plane_state *plane_state;
- 	u32 dlist_count = 0;
-+	u32 lbm_count = 0;
- 
- 	/* The pixelvalve can only feed one encoder (and encoders are
- 	 * 1:1 with connectors.)
-@@ -1111,6 +1112,8 @@ int vc4_hvs_atomic_check(struct drm_crtc
- 		return -EINVAL;
- 
- 	drm_atomic_crtc_state_for_each_plane_state(plane, plane_state, crtc_state) {
-+		const struct vc4_plane_state *vc4_plane_state =
-+						to_vc4_plane_state(plane_state);
- 		u32 plane_dlist_count = vc4_plane_dlist_size(plane_state);
- 
- 		drm_dbg_driver(dev, "[CRTC:%d:%s] Found [PLANE:%d:%s] with DLIST size: %u\n",
-@@ -1119,6 +1122,7 @@ int vc4_hvs_atomic_check(struct drm_crtc
- 			       plane_dlist_count);
- 
- 		dlist_count += plane_dlist_count;
-+		lbm_count += vc4_plane_state->lbm_size;
- 	}
- 
- 	dlist_count++; /* Account for SCALER_CTL0_END. */
-@@ -1132,6 +1136,8 @@ int vc4_hvs_atomic_check(struct drm_crtc
- 
- 	vc4_state->mm = alloc;
- 
-+	/* FIXME: Check total lbm allocation here */
-+
- 	return vc4_hvs_gamma_check(crtc, state);
- }
- 
-@@ -1246,7 +1252,10 @@ void vc4_hvs_atomic_flush(struct drm_crt
- 	bool debug_dump_regs = false;
- 	bool enable_bg_fill = false;
- 	u32 __iomem *dlist_start, *dlist_next;
-+	unsigned long irqflags;
- 	unsigned int zpos = 0;
-+	u32 lbm_offset = 0;
-+	u32 lbm_size = 0;
- 	bool found = false;
- 	int idx;
- 
-@@ -1265,6 +1274,35 @@ void vc4_hvs_atomic_flush(struct drm_crt
- 		vc4_hvs_dump_state(hvs);
- 	}
- 
-+	drm_atomic_crtc_for_each_plane(plane, crtc) {
-+		vc4_plane_state = to_vc4_plane_state(plane->state);
-+		lbm_size += vc4_plane_state->lbm_size;
-+	}
-+
-+	if (drm_mm_node_allocated(&vc4_crtc->lbm)) {
-+		spin_lock_irqsave(&vc4_crtc->irq_lock, irqflags);
-+		drm_mm_remove_node(&vc4_crtc->lbm);
-+		spin_unlock_irqrestore(&vc4_crtc->irq_lock, irqflags);
-+	}
-+
-+	if (lbm_size) {
-+		int ret;
-+
-+		spin_lock_irqsave(&vc4_crtc->irq_lock, irqflags);
-+		ret = drm_mm_insert_node_generic(&vc4->hvs->lbm_mm,
-+						 &vc4_crtc->lbm,
-+						 lbm_size, 1,
-+						 0, 0);
-+		spin_unlock_irqrestore(&vc4_crtc->irq_lock, irqflags);
-+
-+		if (ret) {
-+			pr_err("Failed to allocate LBM ret %d\n", ret);
-+			return;
-+		}
-+	}
-+
-+	lbm_offset = vc4_crtc->lbm.start;
-+
- 	dlist_start = vc4->hvs->dlist + vc4_state->mm->mm_node.start;
- 	dlist_next = dlist_start;
- 
-@@ -1276,6 +1314,8 @@ void vc4_hvs_atomic_flush(struct drm_crt
- 			if (plane->state->normalized_zpos != zpos)
- 				continue;
- 
-+			vc4_plane_state = to_vc4_plane_state(plane->state);
-+
- 			/* Is this the first active plane? */
- 			if (dlist_next == dlist_start) {
- 				/* We need to enable background fill when a plane
-@@ -1286,10 +1326,15 @@ void vc4_hvs_atomic_flush(struct drm_crt
- 				 * already needs it or all planes on top blend from
- 				 * the first or a lower plane.
- 				 */
--				vc4_plane_state = to_vc4_plane_state(plane->state);
- 				enable_bg_fill = vc4_plane_state->needs_bg_fill;
- 			}
- 
-+			if (vc4_plane_state->lbm_size) {
-+				vc4_plane_state->dlist[vc4_plane_state->lbm_offset] =
-+								lbm_offset;
-+				lbm_offset += vc4_plane_state->lbm_size;
-+			}
-+
- 			dlist_next += vc4_plane_write_dlist(plane, dlist_next);
- 
- 			found = true;
---- a/drivers/gpu/drm/vc4/vc4_plane.c
-+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -288,7 +288,6 @@ struct drm_plane_state *vc4_plane_duplic
- 	if (!vc4_state)
- 		return NULL;
- 
--	memset(&vc4_state->lbm, 0, sizeof(vc4_state->lbm));
- 	memset(&vc4_state->upm, 0, sizeof(vc4_state->upm));
- 
- 	for (i = 0; i < DRM_FORMAT_MAX_PLANES; i++)
-@@ -320,14 +319,6 @@ void vc4_plane_destroy_state(struct drm_
- 	struct vc4_plane_state *vc4_state = to_vc4_plane_state(state);
- 	unsigned int i;
- 
--	if (drm_mm_node_allocated(&vc4_state->lbm)) {
--		unsigned long irqflags;
--
--		spin_lock_irqsave(&hvs->mm_lock, irqflags);
--		drm_mm_remove_node(&vc4_state->lbm);
--		spin_unlock_irqrestore(&hvs->mm_lock, irqflags);
--	}
--
- 	for (i = 0; i < DRM_FORMAT_MAX_PLANES; i++) {
- 		unsigned long irqflags;
- 
-@@ -903,12 +894,13 @@ static int vc4_plane_allocate_lbm(struct
- 	struct vc4_dev *vc4 = to_vc4_dev(drm);
- 	struct drm_plane *plane = state->plane;
- 	struct vc4_plane_state *vc4_state = to_vc4_plane_state(state);
--	unsigned long irqflags;
- 	u32 lbm_size;
- 
- 	lbm_size = vc4_lbm_size(state);
--	if (!lbm_size)
-+	if (!lbm_size) {
-+		vc4_state->lbm_size = 0;
- 		return 0;
-+	}
- 
- 	/*
- 	 * NOTE: BCM2712 doesn't need to be aligned, since the size
-@@ -925,28 +917,10 @@ static int vc4_plane_allocate_lbm(struct
- 	if (WARN_ON(!vc4_state->lbm_offset))
- 		return -EINVAL;
- 
--	/* Allocate the LBM memory that the HVS will use for temporary
--	 * storage due to our scaling/format conversion.
-+	/* FIXME: Add loop here that ensures that the total LBM assigned in this
-+	 *  state is less than the total lbm size
- 	 */
--	if (!drm_mm_node_allocated(&vc4_state->lbm)) {
--		int ret;
--
--		spin_lock_irqsave(&vc4->hvs->mm_lock, irqflags);
--		ret = drm_mm_insert_node_generic(&vc4->hvs->lbm_mm,
--						 &vc4_state->lbm,
--						 lbm_size, 1,
--						 0, 0);
--		spin_unlock_irqrestore(&vc4->hvs->mm_lock, irqflags);
--
--		if (ret) {
--			drm_err(drm, "Failed to allocate LBM entry: %d\n", ret);
--			return ret;
--		}
--	} else {
--		WARN_ON_ONCE(lbm_size != vc4_state->lbm.size);
--	}
--
--	vc4_state->dlist[vc4_state->lbm_offset] = vc4_state->lbm.start;
-+	vc4_state->lbm_size = lbm_size;
- 
- 	return 0;
- }
diff --git a/target/linux/bcm27xx/patches-6.1/950-0989-drm-panel-simple-Alter-the-timing-for-the-Pi-7-DSI-d.patch b/target/linux/bcm27xx/patches-6.1/950-0989-drm-panel-simple-Alter-the-timing-for-the-Pi-7-DSI-d.patch
deleted file mode 100644
index 42f4266682..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0989-drm-panel-simple-Alter-the-timing-for-the-Pi-7-DSI-d.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From b1bd2f406eab321be642decd6aee6b6222aec62b Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 28 Jul 2023 17:40:27 +0100
-Subject: [PATCH] drm/panel: simple: Alter the timing for the Pi 7" DSI display
-
-vc4 has always fixed up the timing, so the values defined have
-never actually appeared on the wire.
-The display appears to want a slightly longer HFP, so extend
-the timings and recompute the clock to give the same frame rate.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/panel/panel-simple.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/drivers/gpu/drm/panel/panel-simple.c
-+++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -3244,11 +3244,11 @@ static const struct panel_desc qishenglo
- };
- 
- static const struct drm_display_mode raspberrypi_7inch_mode = {
--	.clock = 25979400 / 1000,
-+	.clock = 27777,
- 	.hdisplay = 800,
--	.hsync_start = 800 + 2,
--	.hsync_end = 800 + 2 + 2,
--	.htotal = 800 + 2 + 2 + 46,
-+	.hsync_start = 800 + 59,
-+	.hsync_end = 800 + 59 + 2,
-+	.htotal = 800 + 59 + 2 + 46,
- 	.vdisplay = 480,
- 	.vsync_start = 480 + 7,
- 	.vsync_end = 480 + 7 + 2,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0990-drm-panel-waveshare-Fix-up-timings-for-10.1-panel.patch b/target/linux/bcm27xx/patches-6.1/950-0990-drm-panel-waveshare-Fix-up-timings-for-10.1-panel.patch
deleted file mode 100644
index 0a4203fbc5..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0990-drm-panel-waveshare-Fix-up-timings-for-10.1-panel.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From c7cf33911d477fe55a91a9e4d84dad857b244ae3 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 28 Jul 2023 18:10:53 +0100
-Subject: [PATCH] drm/panel: waveshare: Fix up timings for 10.1" panel
-
-The 10.1" panel doesn't work with the timings defined. vc4
-will always have been fixing up the timing due to the limited
-integer divider, so compute the fixed up mode and use it
-directly.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/panel/panel-waveshare-dsi.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/drivers/gpu/drm/panel/panel-waveshare-dsi.c
-+++ b/drivers/gpu/drm/panel/panel-waveshare-dsi.c
-@@ -112,11 +112,11 @@ static const struct drm_display_mode ws_
-  * https://www.waveshare.com/product/raspberry-pi/displays/10.1inch-dsi-lcd-c.htm
-  */
- static const struct drm_display_mode ws_panel_10_1_mode = {
--	.clock = 76800,
-+	.clock = 83333,
- 	.hdisplay = 1280,
--	.hsync_start = 1280 + 40,
--	.hsync_end = 1280 + 40 + 20,
--	.htotal = 1280 + 40 + 20 + 40,
-+	.hsync_start = 1280 + 156,
-+	.hsync_end = 1280 + 156 + 20,
-+	.htotal = 1280 + 156 + 20 + 40,
- 	.vdisplay = 800,
- 	.vsync_start = 800 + 40,
- 	.vsync_end = 800 + 40 + 48,
diff --git a/target/linux/bcm27xx/patches-6.1/950-0991-media-i2c-imx477-Fix-locking-in-imx477_init_controls.patch b/target/linux/bcm27xx/patches-6.1/950-0991-media-i2c-imx477-Fix-locking-in-imx477_init_controls.patch
deleted file mode 100644
index 9d7869af9c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0991-media-i2c-imx477-Fix-locking-in-imx477_init_controls.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 72c25bbb761de2b2acd9f8b652d63e2a2f1caeed Mon Sep 17 00:00:00 2001
-From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
-Date: Mon, 11 Sep 2023 12:17:25 +0300
-Subject: [PATCH] media: i2c: imx477: Fix locking in imx477_init_controls()
-
-The driver does not lock the imx477 mutex when calling
-imx477_set_framing_limits(), leading to:
-
-WARNING: CPU: 3 PID: 426 at drivers/media/v4l2-core/v4l2-ctrls-api.c:934 __v4l2_ctrl_modify_range+0x1a0/0x210 [
-videodev]
-
-Fix this by taking the lock.
-
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
----
- drivers/media/i2c/imx477.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/media/i2c/imx477.c
-+++ b/drivers/media/i2c/imx477.c
-@@ -2069,9 +2069,13 @@ static int imx477_init_controls(struct i
- 
- 	imx477->sd.ctrl_handler = ctrl_hdlr;
- 
-+	mutex_lock(&imx477->mutex);
-+
- 	/* Setup exposure and frame/line length limits. */
- 	imx477_set_framing_limits(imx477);
- 
-+	mutex_unlock(&imx477->mutex);
-+
- 	return 0;
- 
- error:
diff --git a/target/linux/bcm27xx/patches-6.1/950-0994-overlays-Fix-vc4-kms-dsi-7inch.patch b/target/linux/bcm27xx/patches-6.1/950-0994-overlays-Fix-vc4-kms-dsi-7inch.patch
deleted file mode 100644
index 10339e2774..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0994-overlays-Fix-vc4-kms-dsi-7inch.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 2ff65ffbdeb0c8764985af19df2a687a126136f4 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Fri, 29 Sep 2023 16:55:28 +0100
-Subject: [PATCH] overlays: Fix vc4-kms-dsi-7inch
-
-Fix the touchscreen.
-
-See: https://github.com/raspberrypi/linux/issues/5619
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/edt-ft5406.dtsi          | 13 ++++---------
- .../boot/dts/overlays/vc4-kms-dsi-7inch-overlay.dts |  2 +-
- 2 files changed, 5 insertions(+), 10 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/edt-ft5406.dtsi
-+++ b/arch/arm/boot/dts/overlays/edt-ft5406.dtsi
-@@ -22,11 +22,13 @@
- 		};
- 	};
- 
--	fragment@12 {
--		target = <&i2cbus>;
-+	ts_i2c_frag: fragment@12 {
-+		target = <&i2c_csi_dsi>;
- 		__overlay__ {
- 			#address-cells = <1>;
- 			#size-cells = <0>;
-+			status = "okay";
-+
- 			ft5406: ts@38 {
- 				compatible = "edt,edt-ft5506";
- 				reg = <0x38>;
-@@ -37,13 +39,6 @@
- 		};
- 	};
- 
--	ts_i2c_frag: fragment@13 {
--		target = <&i2c_csi_dsi>;
--		i2cbus: __overlay__ {
--			status = "okay";
--		};
--	};
--
- 	__overrides__ {
- 		sizex = <&ft5406>,"touchscreen-size-x:0";
- 		sizey = <&ft5406>,"touchscreen-size-y:0";
---- a/arch/arm/boot/dts/overlays/vc4-kms-dsi-7inch-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/vc4-kms-dsi-7inch-overlay.dts
-@@ -119,6 +119,6 @@
- 		       <&panel_disp>, "reg:0=0",
- 		       <&reg_bridge>, "reg:0=0",
- 		       <&reg_bridge>, "regulator-name=bridge_reg_0";
--		disable_touch = <0>, "-10-11-12";
-+		disable_touch = <&ft5406>, "status=disabled";
- 	};
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-0996-ASoC-hdmi-codec-Fix-broken-channel-map-reporting.patch b/target/linux/bcm27xx/patches-6.1/950-0996-ASoC-hdmi-codec-Fix-broken-channel-map-reporting.patch
deleted file mode 100644
index c8fd2a2f90..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0996-ASoC-hdmi-codec-Fix-broken-channel-map-reporting.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From a1caea3c996f6bfa8c9568f521257f4e473285fb Mon Sep 17 00:00:00 2001
-From: Matthias Reichl <hias@horus.com>
-Date: Fri, 29 Sep 2023 21:50:28 +0200
-Subject: [PATCH] ASoC: hdmi-codec: Fix broken channel map reporting
-
-Commit b84b53149476b22cc3b8677b771fb4cf06d1d455 upstream.
-
-Commit 4e0871333661 ("ASoC: hdmi-codec: fix channel info for
-compressed formats") accidentally changed hcp->chmap_idx from
-ca_id, the CEA channel allocation ID, to idx, the index to
-the table of channel mappings ordered by preference.
-
-This resulted in wrong channel maps being reported to userspace,
-eg for 5.1 "FL,FR,LFE,FC" was reported instead of the expected
-"FL,FR,LFE,FC,RL,RR":
-
-~ # speaker-test -c 6 -t sine
-...
- 0 - Front Left
- 3 - Front Center
- 1 - Front Right
- 2 - LFE
- 4 - Unknown
- 5 - Unknown
-
-~ # amixer cget iface=PCM,name='Playback Channel Map' | grep ': values'
-  : values=3,4,8,7,0,0,0,0
-
-Switch this back to ca_id in case of PCM audio so the correct channel
-map is reported again and set it to HDMI_CODEC_CHMAP_IDX_UNKNOWN in
-case of non-PCM audio so the PCM channel map control returns "Unknown"
-channels (value 0).
-
-Fixes: 4e0871333661 ("ASoC: hdmi-codec: fix channel info for compressed formats")
-Cc: stable@vger.kernel.org
-Signed-off-by: Matthias Reichl <hias@horus.com>
-Link: https://lore.kernel.org/r/20230929195027.97136-1-hias@horus.com
-Signed-off-by: Mark Brown <broonie@kernel.org>
----
- sound/soc/codecs/hdmi-codec.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
---- a/sound/soc/codecs/hdmi-codec.c
-+++ b/sound/soc/codecs/hdmi-codec.c
-@@ -520,7 +520,10 @@ static int hdmi_codec_fill_codec_params(
- 	hp->sample_rate = sample_rate;
- 	hp->channels = channels;
- 
--	hcp->chmap_idx = idx;
-+	if (pcm_audio)
-+		hcp->chmap_idx = ca_id;
-+	else
-+		hcp->chmap_idx = HDMI_CODEC_CHMAP_IDX_UNKNOWN;
- 
- 	return 0;
- }
diff --git a/target/linux/bcm27xx/patches-6.1/950-0997-media-rp1-cfe-Fix-use-of-freed-memory-on-errors.patch b/target/linux/bcm27xx/patches-6.1/950-0997-media-rp1-cfe-Fix-use-of-freed-memory-on-errors.patch
deleted file mode 100644
index 7f1b505336..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0997-media-rp1-cfe-Fix-use-of-freed-memory-on-errors.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 3922bebc11fcc8459c798cfcb582828f9bbaa9e9 Mon Sep 17 00:00:00 2001
-From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
-Date: Thu, 28 Sep 2023 11:33:53 +0300
-Subject: [PATCH] media: rp1: cfe: Fix use of freed memory on errors
-
-cfe_probe_complete() calls cfe_put() on both success and fail code paths.
-This works for the success path, but causes the cfe_device struct to be
-freed, even if it will be used later in the teardown code.
-
-Fix this by making the ref handling a bit saner: Let the video nodes
-have the refs as they do now, but also keep a ref in the "main" driver,
-released only at cfe_remove() time. This way the driver does not depend
-on the video nodes keeping the refs.
-
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
----
- drivers/media/platform/raspberrypi/rp1_cfe/cfe.c | 9 ++-------
- 1 file changed, 2 insertions(+), 7 deletions(-)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-@@ -1837,17 +1837,10 @@ static int cfe_probe_complete(struct cfe
- 		goto unregister;
- 	}
- 
--	/*
--	 * Release the initial reference, all references are now owned by the
--	 * video devices.
--	 */
--	cfe_put(cfe);
- 	return 0;
- 
- unregister:
- 	cfe_unregister_nodes(cfe);
--	cfe_put(cfe);
--
- 	return ret;
- }
- 
-@@ -2129,6 +2122,8 @@ static int cfe_remove(struct platform_de
- 
- 	v4l2_device_unregister(&cfe->v4l2_dev);
- 
-+	cfe_put(cfe);
-+
- 	return 0;
- }
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-0998-media-rp1-cfe-Fix-width-height-in-cfe_start_channel.patch b/target/linux/bcm27xx/patches-6.1/950-0998-media-rp1-cfe-Fix-width-height-in-cfe_start_channel.patch
deleted file mode 100644
index d49856c32d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0998-media-rp1-cfe-Fix-width-height-in-cfe_start_channel.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 84c9958dd71b8a4dcf16cbf6fdb867c668652634 Mon Sep 17 00:00:00 2001
-From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
-Date: Wed, 27 Sep 2023 16:00:39 +0300
-Subject: [PATCH] media: rp1: cfe: Fix width & height in cfe_start_channel()
-
-The logic for handling width & height in cfe_start_channel() is somewhat
-odd and, afaics, broken. The code reads:
-
-bool start_fe = is_fe_enabled(cfe) &&
-                test_all_nodes(cfe, NODE_ENABLED, NODE_STREAMING);
-
-if (start_fe || is_image_output_node(node)) {
-        width = node->fmt.fmt.pix.width;
-        height = node->fmt.fmt.pix.height;
-}
-
-cfe_start_channel() is called for all video nodes that will be used. So
-this means that if, say, fe_stats is enabled as the last node, start_fe
-will be true, and width and height will be taken from fe_stats' node.
-The width and height will thus contain garbage, which then gets
-programmed to the csi2 registers.
-
-It seems that this often still works fine, though, probably if the width
-& height are large enough.
-
-Drop the above code, and instead get the width & height from the csi2
-subdev's sink pad for the csi2 channel that is used. For metadata the
-width & height will be 0 as before.
-
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
----
- drivers/media/platform/raspberrypi/rp1_cfe/cfe.c | 16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-@@ -763,20 +763,16 @@ static void cfe_start_channel(struct cfe
- 	struct v4l2_mbus_framefmt *source_fmt;
- 	const struct cfe_fmt *fmt;
- 	unsigned long flags;
--	unsigned int width = 0, height = 0;
- 	bool start_fe = is_fe_enabled(cfe) &&
- 			test_all_nodes(cfe, NODE_ENABLED, NODE_STREAMING);
- 
- 	cfe_dbg("%s: [%s]\n", __func__, node_desc[node->id].name);
- 
--	if (start_fe || is_image_output_node(node)) {
--		width = node->fmt.fmt.pix.width;
--		height = node->fmt.fmt.pix.height;
--	}
--
- 	state = v4l2_subdev_lock_and_get_active_state(&cfe->csi2.sd);
- 
- 	if (start_fe) {
-+		unsigned int width, height;
-+
- 		WARN_ON(!is_fe_enabled(cfe));
- 		cfe_dbg("%s: %s using csi2 channel %d\n",
- 			__func__, node_desc[FE_OUT0].name,
-@@ -785,6 +781,9 @@ static void cfe_start_channel(struct cfe
- 		source_fmt = v4l2_subdev_get_pad_format(&cfe->csi2.sd, state, cfe->fe_csi2_channel);
- 		fmt = find_format_by_code(source_fmt->code);
- 
-+		width = source_fmt->width;
-+		height = source_fmt->height;
-+
- 		/*
- 		 * Start the associated CSI2 Channel as well.
- 		 *
-@@ -800,6 +799,8 @@ static void cfe_start_channel(struct cfe
- 	}
- 
- 	if (is_csi2_node(node)) {
-+		unsigned int width = 0, height = 0;
-+
- 		u32 mode = CSI2_MODE_NORMAL;
- 
- 		source_fmt = v4l2_subdev_get_pad_format(&cfe->csi2.sd, state,
-@@ -807,6 +808,9 @@ static void cfe_start_channel(struct cfe
- 		fmt = find_format_by_code(source_fmt->code);
- 
- 		if (is_image_output_node(node)) {
-+			width = source_fmt->width;
-+			height = source_fmt->height;
-+
- 			if (node->fmt.fmt.pix.pixelformat ==
- 					fmt->remap[CFE_REMAP_16BIT])
- 				mode = CSI2_MODE_REMAP;
diff --git a/target/linux/bcm27xx/patches-6.1/950-0999-media-rp1-csi2-Fix-missing-reg-writes.patch b/target/linux/bcm27xx/patches-6.1/950-0999-media-rp1-csi2-Fix-missing-reg-writes.patch
deleted file mode 100644
index 2a3915b6e3..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-0999-media-rp1-csi2-Fix-missing-reg-writes.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 62e8ab88d2c230dad122aabe2ad0e227d7ceba40 Mon Sep 17 00:00:00 2001
-From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
-Date: Thu, 28 Sep 2023 10:42:22 +0300
-Subject: [PATCH] media: rp1: csi2: Fix missing reg writes
-
-The driver has two places where it writes a register based on a
-condition, and when that condition is false, the driver presumes that
-the register has the reset value. This is not a good idea, so fix those
-places to always write the register.
-
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
----
- drivers/media/platform/raspberrypi/rp1_cfe/csi2.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/csi2.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/csi2.c
-@@ -253,6 +253,7 @@ void csi2_start_channel(struct csi2_devi
- 		 */
- 		set_field(&ctrl, 0x3ff, LC_MASK);
- 		set_field(&ctrl, 0x00, CH_MODE_MASK);
-+		csi2_reg_write(csi2, CSI2_CH_FRAME_SIZE(channel), 0);
- 	}
- 
- 	set_field(&ctrl, dt, DT_MASK);
-@@ -277,8 +278,8 @@ void csi2_open_rx(struct csi2_device *cs
- {
- 	dphy_start(&csi2->dphy);
- 
--	if (!csi2->multipacket_line)
--		csi2_reg_write(csi2, CSI2_CTRL, EOP_IS_EOL);
-+	csi2_reg_write(csi2, CSI2_CTRL,
-+		       csi2->multipacket_line ? 0 : EOP_IS_EOL);
- }
- 
- void csi2_close_rx(struct csi2_device *csi2)
diff --git a/target/linux/bcm27xx/patches-6.1/950-1000-media-rp1-fe-Use-0-not-1-when-working-with-unsigned-.patch b/target/linux/bcm27xx/patches-6.1/950-1000-media-rp1-fe-Use-0-not-1-when-working-with-unsigned-.patch
deleted file mode 100644
index f468b7ac48..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1000-media-rp1-fe-Use-0-not-1-when-working-with-unsigned-.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 455c4ae2c70348a5842835d2f67f7cd8e665a2a6 Mon Sep 17 00:00:00 2001
-From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
-Date: Thu, 21 Sep 2023 16:03:07 +0300
-Subject: [PATCH] media: rp1: fe: Use ~0, not -1, when working with unsigned
- values
-
-Use ~0, not -1, when working with unsigned values (-1 is not unsigned).
-
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
----
- drivers/media/platform/raspberrypi/rp1_cfe/pisp_fe.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/pisp_fe.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/pisp_fe.c
-@@ -372,7 +372,7 @@ void pisp_fe_submit_job(struct pisp_fe_d
- void pisp_fe_start(struct pisp_fe_device *fe)
- {
- 	pisp_fe_reg_write(fe, FE_CONTROL, FE_CONTROL_RESET);
--	pisp_fe_reg_write(fe, FE_INT_STATUS, -1);
-+	pisp_fe_reg_write(fe, FE_INT_STATUS, ~0);
- 	pisp_fe_reg_write(fe, FE_INT_EN, FE_INT_EOF | FE_INT_SOF | FE_INT_LINES0 | FE_INT_LINES1);
- 	fe->inframe_count = 0;
- }
-@@ -383,7 +383,7 @@ void pisp_fe_stop(struct pisp_fe_device
- 	pisp_fe_reg_write(fe, FE_CONTROL, FE_CONTROL_ABORT);
- 	usleep_range(1000, 2000);
- 	WARN_ON(pisp_fe_reg_read(fe, FE_STATUS));
--	pisp_fe_reg_write(fe, FE_INT_STATUS, -1);
-+	pisp_fe_reg_write(fe, FE_INT_STATUS, ~0);
- }
- 
- static struct pisp_fe_device *to_pisp_fe_device(struct v4l2_subdev *subdev)
diff --git a/target/linux/bcm27xx/patches-6.1/950-1001-media-rp1-cfe-Fix-verbose-debug-print.patch b/target/linux/bcm27xx/patches-6.1/950-1001-media-rp1-cfe-Fix-verbose-debug-print.patch
deleted file mode 100644
index 3344c32d29..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1001-media-rp1-cfe-Fix-verbose-debug-print.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From bf1709d2cf2b57c4ea98b8363156835249ae02cc Mon Sep 17 00:00:00 2001
-From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
-Date: Fri, 22 Sep 2023 12:41:35 +0300
-Subject: [PATCH] media: rp1: cfe: Fix verbose debug print
-
-The debug print in cfe_schedule_next_csi2_job() is printed every frame,
-and should thus use cfe_dbg_irq() to avoid spamming, rather than cfe_dbg().
-
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
----
- drivers/media/platform/raspberrypi/rp1_cfe/cfe.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-@@ -518,8 +518,8 @@ static void cfe_schedule_next_csi2_job(s
- 		node->next_frm = buf;
- 		list_del(&buf->list);
- 
--		cfe_dbg("%s: [%s] buffer:%p\n",
--			__func__, node_desc[node->id].name, &buf->vb.vb2_buf);
-+		cfe_dbg_irq("%s: [%s] buffer:%p\n", __func__,
-+			    node_desc[node->id].name, &buf->vb.vb2_buf);
- 
- 		if (is_meta_node(node)) {
- 			size = node->fmt.fmt.meta.buffersize;
diff --git a/target/linux/bcm27xx/patches-6.1/950-1002-media-rp1-cfe-Rename-xxx_dbg_irq-to-xxx_dbg_verbose.patch b/target/linux/bcm27xx/patches-6.1/950-1002-media-rp1-cfe-Rename-xxx_dbg_irq-to-xxx_dbg_verbose.patch
deleted file mode 100644
index 14fa0447df..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1002-media-rp1-cfe-Rename-xxx_dbg_irq-to-xxx_dbg_verbose.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-From a1ea528e187ee045aeff929ff0f4b2e53fdd970f Mon Sep 17 00:00:00 2001
-From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
-Date: Wed, 4 Oct 2023 10:12:37 +0300
-Subject: [PATCH] media: rp1: cfe: Rename xxx_dbg_irq() to xxx_dbg_verbose()
-
-Rename the xxx_dbg_irq() macros to xxx_dbg_verbose(), as they can be
-used to verbose debugs outside irq context too.
-
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
----
- .../media/platform/raspberrypi/rp1_cfe/cfe.c  | 40 +++++++++----------
- .../media/platform/raspberrypi/rp1_cfe/cfe.h  |  2 +-
- .../media/platform/raspberrypi/rp1_cfe/csi2.c | 26 ++++++------
- .../platform/raspberrypi/rp1_cfe/pisp_fe.c    | 12 +++---
- 4 files changed, 40 insertions(+), 40 deletions(-)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-@@ -49,11 +49,11 @@
- #define CFE_MODULE_NAME	"rp1-cfe"
- #define CFE_VERSION	"1.0"
- 
--bool cfe_debug_irq;
-+bool cfe_debug_verbose;
- 
--#define cfe_dbg_irq(fmt, arg...)                              \
-+#define cfe_dbg_verbose(fmt, arg...)                          \
- 	do {                                                  \
--		if (cfe_debug_irq)                            \
-+		if (cfe_debug_verbose)                        \
- 			dev_dbg(&cfe->pdev->dev, fmt, ##arg); \
- 	} while (0)
- #define cfe_dbg(fmt, arg...) dev_dbg(&cfe->pdev->dev, fmt, ##arg)
-@@ -518,8 +518,8 @@ static void cfe_schedule_next_csi2_job(s
- 		node->next_frm = buf;
- 		list_del(&buf->list);
- 
--		cfe_dbg_irq("%s: [%s] buffer:%p\n", __func__,
--			    node_desc[node->id].name, &buf->vb.vb2_buf);
-+		cfe_dbg_verbose("%s: [%s] buffer:%p\n", __func__,
-+				node_desc[node->id].name, &buf->vb.vb2_buf);
- 
- 		if (is_meta_node(node)) {
- 			size = node->fmt.fmt.meta.buffersize;
-@@ -550,8 +550,8 @@ static void cfe_schedule_next_pisp_job(s
- 		buf = list_first_entry(&node->dma_queue, struct cfe_buffer,
- 				       list);
- 
--		cfe_dbg_irq("%s: [%s] buffer:%p\n", __func__,
--			    node_desc[node->id].name, &buf->vb.vb2_buf);
-+		cfe_dbg_verbose("%s: [%s] buffer:%p\n", __func__,
-+				node_desc[node->id].name, &buf->vb.vb2_buf);
- 
- 		node->next_frm = buf;
- 		vb2_bufs[node_desc[i].link_pad] = &buf->vb.vb2_buf;
-@@ -573,8 +573,8 @@ static bool cfe_check_job_ready(struct c
- 			continue;
- 
- 		if (list_empty(&node->dma_queue)) {
--			cfe_dbg_irq("%s: [%s] has no buffer, unable to schedule job\n",
--				    __func__, node_desc[i].name);
-+			cfe_dbg_verbose("%s: [%s] has no buffer, unable to schedule job\n",
-+				__func__, node_desc[i].name);
- 			return false;
- 		}
- 	}
-@@ -592,7 +592,7 @@ static void cfe_prepare_next_job(struct
- 	/* Flag if another job is ready after this. */
- 	cfe->job_ready = cfe_check_job_ready(cfe);
- 
--	cfe_dbg_irq("%s: end with scheduled job\n", __func__);
-+	cfe_dbg_verbose("%s: end with scheduled job\n", __func__);
- }
- 
- static void cfe_process_buffer_complete(struct cfe_node *node,
-@@ -600,8 +600,8 @@ static void cfe_process_buffer_complete(
- {
- 	struct cfe_device *cfe = node->cfe;
- 
--	cfe_dbg_irq("%s: [%s] buffer:%p\n", __func__, node_desc[node->id].name,
--		    &node->cur_frm->vb.vb2_buf);
-+	cfe_dbg_verbose("%s: [%s] buffer:%p\n", __func__,
-+			node_desc[node->id].name, &node->cur_frm->vb.vb2_buf);
- 
- 	node->cur_frm->vb.sequence = sequence;
- 	vb2_buffer_done(&node->cur_frm->vb.vb2_buf, VB2_BUF_STATE_DONE);
-@@ -621,8 +621,8 @@ static void cfe_sof_isr_handler(struct c
- {
- 	struct cfe_device *cfe = node->cfe;
- 
--	cfe_dbg_irq("%s: [%s] seq %u\n", __func__, node_desc[node->id].name,
--		    cfe->sequence);
-+	cfe_dbg_verbose("%s: [%s] seq %u\n", __func__, node_desc[node->id].name,
-+			cfe->sequence);
- 
- 	node->cur_frm = node->next_frm;
- 	node->next_frm = NULL;
-@@ -651,8 +651,8 @@ static void cfe_eof_isr_handler(struct c
- {
- 	struct cfe_device *cfe = node->cfe;
- 
--	cfe_dbg_irq("%s: [%s] seq %u\n", __func__, node_desc[node->id].name,
--		    cfe->sequence);
-+	cfe_dbg_verbose("%s: [%s] seq %u\n", __func__, node_desc[node->id].name,
-+			cfe->sequence);
- 
- 	if (node->cur_frm)
- 		cfe_process_buffer_complete(node, cfe->sequence);
-@@ -921,8 +921,8 @@ static int cfe_buffer_prepare(struct vb2
- 	struct cfe_buffer *buf = to_cfe_buffer(vb);
- 	unsigned long size;
- 
--	cfe_dbg_irq("%s: [%s] buffer:%p\n", __func__, node_desc[node->id].name,
--		    vb);
-+	cfe_dbg_verbose("%s: [%s] buffer:%p\n", __func__,
-+			node_desc[node->id].name, vb);
- 
- 	size = is_image_output_node(node) ? node->fmt.fmt.pix.sizeimage :
- 					    node->fmt.fmt.meta.buffersize;
-@@ -954,8 +954,8 @@ static void cfe_buffer_queue(struct vb2_
- 	struct cfe_buffer *buf = to_cfe_buffer(vb);
- 	unsigned long flags;
- 
--	cfe_dbg_irq("%s: [%s] buffer:%p\n", __func__, node_desc[node->id].name,
--		    vb);
-+	cfe_dbg_verbose("%s: [%s] buffer:%p\n", __func__,
-+			node_desc[node->id].name, vb);
- 
- 	spin_lock_irqsave(&cfe->state_lock, flags);
- 
---- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe.h
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe.h
-@@ -11,7 +11,7 @@
- #include <linux/media-bus-format.h>
- #include <linux/videodev2.h>
- 
--extern bool cfe_debug_irq;
-+extern bool cfe_debug_verbose;
- 
- enum cfe_remap_types {
- 	CFE_REMAP_16BIT,
---- a/drivers/media/platform/raspberrypi/rp1_cfe/csi2.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/csi2.c
-@@ -16,9 +16,9 @@
- #include "csi2.h"
- #include "cfe.h"
- 
--#define csi2_dbg_irq(fmt, arg...)                                 \
-+#define csi2_dbg_verbose(fmt, arg...)                             \
- 	do {                                                      \
--		if (cfe_debug_irq)                                \
-+		if (cfe_debug_verbose)                            \
- 			dev_dbg(csi2->v4l2_dev->dev, fmt, ##arg); \
- 	} while (0)
- #define csi2_dbg(fmt, arg...) dev_dbg(csi2->v4l2_dev->dev, fmt, ##arg)
-@@ -154,7 +154,7 @@ void csi2_isr(struct csi2_device *csi2,
- 	u32 status;
- 
- 	status = csi2_reg_read(csi2, CSI2_STATUS);
--	csi2_dbg_irq("ISR: STA: 0x%x\n", status);
-+	csi2_dbg_verbose("ISR: STA: 0x%x\n", status);
- 
- 	/* Write value back to clear the interrupts */
- 	csi2_reg_write(csi2, CSI2_STATUS, status);
-@@ -167,16 +167,16 @@ void csi2_isr(struct csi2_device *csi2,
- 
- 		dbg = csi2_reg_read(csi2, CSI2_CH_DEBUG(i));
- 
--		csi2_dbg_irq("ISR: [%u], %s%s%s%s%s frame: %u line: %u\n", i,
--			     (status & IRQ_FS(i)) ? "FS " : "",
--			     (status & IRQ_FE(i)) ? "FE " : "",
--			     (status & IRQ_FE_ACK(i)) ? "FE_ACK " : "",
--			     (status & IRQ_LE(i)) ? "LE " : "",
--			     (status & IRQ_LE_ACK(i)) ? "LE_ACK " : "",
--			     dbg >> 16,
--			     csi2->num_lines[i] ?
--				     ((dbg & 0xffff) % csi2->num_lines[i]) :
--				     0);
-+		csi2_dbg_verbose("ISR: [%u], %s%s%s%s%s frame: %u line: %u\n",
-+				 i, (status & IRQ_FS(i)) ? "FS " : "",
-+				 (status & IRQ_FE(i)) ? "FE " : "",
-+				 (status & IRQ_FE_ACK(i)) ? "FE_ACK " : "",
-+				 (status & IRQ_LE(i)) ? "LE " : "",
-+				 (status & IRQ_LE_ACK(i)) ? "LE_ACK " : "",
-+				 dbg >> 16,
-+				 csi2->num_lines[i] ?
-+					 ((dbg & 0xffff) % csi2->num_lines[i]) :
-+					 0);
- 
- 		sof[i] = !!(status & IRQ_FS(i));
- 		eof[i] = !!(status & IRQ_FE_ACK(i));
---- a/drivers/media/platform/raspberrypi/rp1_cfe/pisp_fe.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/pisp_fe.c
-@@ -114,9 +114,9 @@ static const struct pisp_fe_config_param
- 					sizeof(struct pisp_fe_output_config)         },
- };
- 
--#define pisp_fe_dbg_irq(fmt, arg...)                            \
-+#define pisp_fe_dbg_verbose(fmt, arg...)                        \
- 	do {                                                    \
--		if (cfe_debug_irq)                              \
-+		if (cfe_debug_verbose)                          \
- 			dev_dbg(fe->v4l2_dev->dev, fmt, ##arg); \
- 	} while (0)
- #define pisp_fe_dbg(fmt, arg...) dev_dbg(fe->v4l2_dev->dev, fmt, ##arg)
-@@ -202,9 +202,9 @@ void pisp_fe_isr(struct pisp_fe_device *
- 	int_status = pisp_fe_reg_read(fe, FE_INT_STATUS);
- 	pisp_fe_reg_write(fe, FE_INT_STATUS, int_status);
- 
--	pisp_fe_dbg_irq("%s: status 0x%x out 0x%x frame 0x%x error 0x%x int 0x%x\n",
--			__func__, status, out_status, frame_status, error_status,
--			int_status);
-+	pisp_fe_dbg_verbose("%s: status 0x%x out 0x%x frame 0x%x error 0x%x int 0x%x\n",
-+		__func__, status, out_status, frame_status, error_status,
-+		int_status);
- 
- 	/* We do not report interrupts for the input/stream pad. */
- 	for (i = 0; i < FE_NUM_PADS - 1; i++) {
-@@ -339,7 +339,7 @@ void pisp_fe_submit_job(struct pisp_fe_d
- 	 * sequence of relaxed writes which follow.
- 	 */
- 	status = pisp_fe_reg_read(fe, FE_STATUS);
--	pisp_fe_dbg_irq("%s: status = 0x%x\n", __func__, status);
-+	pisp_fe_dbg_verbose("%s: status = 0x%x\n", __func__, status);
- 	if (WARN_ON(status & FE_STATUS_QUEUED))
- 		return;
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1003-media-rp1-Add-back-reg-write-debug-prints.patch b/target/linux/bcm27xx/patches-6.1/950-1003-media-rp1-Add-back-reg-write-debug-prints.patch
deleted file mode 100644
index c86f7a3e17..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1003-media-rp1-Add-back-reg-write-debug-prints.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 8240f1328ead0152f116b385b3169f8f010a7869 Mon Sep 17 00:00:00 2001
-From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
-Date: Fri, 22 Sep 2023 12:39:33 +0300
-Subject: [PATCH] media: rp1: Add back reg write debug prints
-
-Add back debug prints in csi2 and pisp_fe reg_write() functions, but use
-the 'irq' variants to avoid spamming in normal situation.
-
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
----
- drivers/media/platform/raspberrypi/rp1_cfe/csi2.c    | 1 +
- drivers/media/platform/raspberrypi/rp1_cfe/pisp_fe.c | 2 ++
- 2 files changed, 3 insertions(+)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/csi2.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/csi2.c
-@@ -92,6 +92,7 @@ static inline u32 csi2_reg_read(struct c
- static inline void csi2_reg_write(struct csi2_device *csi2, u32 offset, u32 val)
- {
- 	writel(val, csi2->base + offset);
-+	csi2_dbg_verbose("csi2: write 0x%04x -> 0x%03x\n", val, offset);
- }
- 
- static inline void set_field(u32 *valp, u32 field, u32 mask)
---- a/drivers/media/platform/raspberrypi/rp1_cfe/pisp_fe.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/pisp_fe.c
-@@ -132,12 +132,14 @@ static inline void pisp_fe_reg_write(str
- 				     u32 val)
- {
- 	writel(val, fe->base + offset);
-+	pisp_fe_dbg_verbose("fe: write 0x%04x -> 0x%03x\n", val, offset);
- }
- 
- static inline void pisp_fe_reg_write_relaxed(struct pisp_fe_device *fe, u32 offset,
- 					     u32 val)
- {
- 	writel_relaxed(val, fe->base + offset);
-+	pisp_fe_dbg_verbose("fe: write 0x%04x -> 0x%03x\n", val, offset);
- }
- 
- static int pisp_regs_show(struct seq_file *s, void *data)
diff --git a/target/linux/bcm27xx/patches-6.1/950-1004-media-rp1-cfe-Add-verbose-debug-module-parameter.patch b/target/linux/bcm27xx/patches-6.1/950-1004-media-rp1-cfe-Add-verbose-debug-module-parameter.patch
deleted file mode 100644
index f44cb50d10..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1004-media-rp1-cfe-Add-verbose-debug-module-parameter.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f2553458c0c1942731447aac3878f51aa1b326a7 Mon Sep 17 00:00:00 2001
-From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
-Date: Wed, 4 Oct 2023 10:19:47 +0300
-Subject: [PATCH] media: rp1: cfe: Add verbose debug module parameter
-
-Expose the verbose debug flag as a module parameter.
-
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
----
- drivers/media/platform/raspberrypi/rp1_cfe/cfe.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-@@ -50,6 +50,8 @@
- #define CFE_VERSION	"1.0"
- 
- bool cfe_debug_verbose;
-+module_param_named(verbose_debug, cfe_debug_verbose, bool, 0644);
-+MODULE_PARM_DESC(verbose_debug, "verbose debugging messages");
- 
- #define cfe_dbg_verbose(fmt, arg...)                          \
- 	do {                                                  \
diff --git a/target/linux/bcm27xx/patches-6.1/950-1005-media-rp1-csi2-Track-CSI-2-errors.patch b/target/linux/bcm27xx/patches-6.1/950-1005-media-rp1-csi2-Track-CSI-2-errors.patch
deleted file mode 100644
index 9d8da81887..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1005-media-rp1-csi2-Track-CSI-2-errors.patch
+++ /dev/null
@@ -1,245 +0,0 @@
-From b19c2b5f88f141e58044e5d1012f867d46f74bf3 Mon Sep 17 00:00:00 2001
-From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
-Date: Thu, 21 Sep 2023 18:18:53 +0300
-Subject: [PATCH] media: rp1: csi2: Track CSI-2 errors
-
-Track the errors from the CSI-2 receiver: overflows and discards. These
-are recorded in a table which can be read by the userspace via debugfs.
-
-As tracking the errors may cause much more interrupt load, the tracking
-needs to be enabled with a module parameter.
-
-Note that the recording is not perfect: we only record the last
-discarded DT for each discard type, instead of recording all of them.
-This means that e.g. if the device is discarding two unmatched DTs, the
-debugfs file only shows the last one recorded. Recording all of them
-would need a more sophisticated recording system to avoid the need of a
-very large table, or dynamic allocation.
-
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
----
- .../media/platform/raspberrypi/rp1_cfe/csi2.c | 123 ++++++++++++++++++
- .../media/platform/raspberrypi/rp1_cfe/csi2.h |  16 +++
- 2 files changed, 139 insertions(+)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/csi2.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/csi2.c
-@@ -16,6 +16,10 @@
- #include "csi2.h"
- #include "cfe.h"
- 
-+static bool csi2_track_errors;
-+module_param_named(track_csi2_errors, csi2_track_errors, bool, 0);
-+MODULE_PARM_DESC(track_csi2_errors, "track csi-2 errors");
-+
- #define csi2_dbg_verbose(fmt, arg...)                             \
- 	do {                                                      \
- 		if (cfe_debug_verbose)                            \
-@@ -32,9 +36,28 @@
- #define CSI2_DISCARDS_INACTIVE	0x00c
- #define CSI2_DISCARDS_UNMATCHED	0x010
- #define CSI2_DISCARDS_LEN_LIMIT	0x014
-+
-+#define CSI2_DISCARDS_AMOUNT_SHIFT	0
-+#define CSI2_DISCARDS_AMOUNT_MASK	GENMASK(23, 0)
-+#define CSI2_DISCARDS_DT_SHIFT		24
-+#define CSI2_DISCARDS_DT_MASK		GENMASK(29, 24)
-+#define CSI2_DISCARDS_VC_SHIFT		30
-+#define CSI2_DISCARDS_VC_MASK		GENMASK(31, 30)
-+
- #define CSI2_LLEV_PANICS	0x018
- #define CSI2_ULEV_PANICS	0x01c
- #define CSI2_IRQ_MASK		0x020
-+#define CSI2_IRQ_MASK_IRQ_OVERFLOW		BIT(0)
-+#define CSI2_IRQ_MASK_IRQ_DISCARD_OVERFLOW	BIT(1)
-+#define CSI2_IRQ_MASK_IRQ_DISCARD_LENGTH_LIMIT	BIT(2)
-+#define CSI2_IRQ_MASK_IRQ_DISCARD_UNMATCHED	BIT(3)
-+#define CSI2_IRQ_MASK_IRQ_DISCARD_INACTIVE	BIT(4)
-+#define CSI2_IRQ_MASK_IRQ_ALL                                              \
-+	(CSI2_IRQ_MASK_IRQ_OVERFLOW | CSI2_IRQ_MASK_IRQ_DISCARD_OVERFLOW | \
-+	 CSI2_IRQ_MASK_IRQ_DISCARD_LENGTH_LIMIT |                          \
-+	 CSI2_IRQ_MASK_IRQ_DISCARD_UNMATCHED |                             \
-+	 CSI2_IRQ_MASK_IRQ_DISCARD_INACTIVE)
-+
- #define CSI2_CTRL		0x024
- #define CSI2_CH_CTRL(x)		((x) * 0x40 + 0x28)
- #define CSI2_CH_ADDR0(x)	((x) * 0x40 + 0x2c)
-@@ -149,6 +172,92 @@ static int csi2_regs_show(struct seq_fil
- 
- DEFINE_SHOW_ATTRIBUTE(csi2_regs);
- 
-+static int csi2_errors_show(struct seq_file *s, void *data)
-+{
-+	struct csi2_device *csi2 = s->private;
-+	unsigned long flags;
-+	u32 discards_table[DISCARDS_TABLE_NUM_VCS][DISCARDS_TABLE_NUM_ENTRIES];
-+	u32 discards_dt_table[DISCARDS_TABLE_NUM_ENTRIES];
-+	u32 overflows;
-+
-+	spin_lock_irqsave(&csi2->errors_lock, flags);
-+
-+	memcpy(discards_table, csi2->discards_table, sizeof(discards_table));
-+	memcpy(discards_dt_table, csi2->discards_dt_table,
-+	       sizeof(discards_dt_table));
-+	overflows = csi2->overflows;
-+
-+	csi2->overflows = 0;
-+	memset(csi2->discards_table, 0, sizeof(discards_table));
-+	memset(csi2->discards_dt_table, 0, sizeof(discards_dt_table));
-+
-+	spin_unlock_irqrestore(&csi2->errors_lock, flags);
-+
-+	seq_printf(s, "Overflows %u\n", overflows);
-+	seq_puts(s, "Discards:\n");
-+	seq_puts(s, "VC            OVLF        LEN  UNMATCHED   INACTIVE\n");
-+
-+	for (unsigned int vc = 0; vc < DISCARDS_TABLE_NUM_VCS; ++vc) {
-+		seq_printf(s, "%u       %10u %10u %10u %10u\n", vc,
-+			   discards_table[vc][DISCARDS_TABLE_OVERFLOW],
-+			   discards_table[vc][DISCARDS_TABLE_LENGTH_LIMIT],
-+			   discards_table[vc][DISCARDS_TABLE_UNMATCHED],
-+			   discards_table[vc][DISCARDS_TABLE_INACTIVE]);
-+	}
-+
-+	seq_printf(s, "Last DT %10u %10u %10u %10u\n",
-+		   discards_dt_table[DISCARDS_TABLE_OVERFLOW],
-+		   discards_dt_table[DISCARDS_TABLE_LENGTH_LIMIT],
-+		   discards_dt_table[DISCARDS_TABLE_UNMATCHED],
-+		   discards_dt_table[DISCARDS_TABLE_INACTIVE]);
-+
-+	return 0;
-+}
-+
-+DEFINE_SHOW_ATTRIBUTE(csi2_errors);
-+
-+static void csi2_isr_handle_errors(struct csi2_device *csi2, u32 status)
-+{
-+	spin_lock(&csi2->errors_lock);
-+
-+	if (status & IRQ_OVERFLOW)
-+		csi2->overflows++;
-+
-+	for (unsigned int i = 0; i < DISCARDS_TABLE_NUM_ENTRIES; ++i) {
-+		static const u32 discard_bits[] = {
-+			IRQ_DISCARD_OVERFLOW,
-+			IRQ_DISCARD_LEN_LIMIT,
-+			IRQ_DISCARD_UNMATCHED,
-+			IRQ_DISCARD_INACTIVE,
-+		};
-+		static const u8 discard_regs[] = {
-+			CSI2_DISCARDS_OVERFLOW,
-+			CSI2_DISCARDS_LEN_LIMIT,
-+			CSI2_DISCARDS_UNMATCHED,
-+			CSI2_DISCARDS_INACTIVE,
-+		};
-+		u32 amount;
-+		u8 dt, vc;
-+		u32 v;
-+
-+		if (!(status & discard_bits[i]))
-+			continue;
-+
-+		v = csi2_reg_read(csi2, discard_regs[i]);
-+		csi2_reg_write(csi2, discard_regs[i], 0);
-+
-+		amount = (v & CSI2_DISCARDS_AMOUNT_MASK) >>
-+			 CSI2_DISCARDS_AMOUNT_SHIFT;
-+		dt = (v & CSI2_DISCARDS_DT_MASK) >> CSI2_DISCARDS_DT_SHIFT;
-+		vc = (v & CSI2_DISCARDS_VC_MASK) >> CSI2_DISCARDS_VC_SHIFT;
-+
-+		csi2->discards_table[vc][i] += amount;
-+		csi2->discards_dt_table[i] = dt;
-+	}
-+
-+	spin_unlock(&csi2->errors_lock);
-+}
-+
- void csi2_isr(struct csi2_device *csi2, bool *sof, bool *eof, bool *lci)
- {
- 	unsigned int i;
-@@ -183,6 +292,9 @@ void csi2_isr(struct csi2_device *csi2,
- 		eof[i] = !!(status & IRQ_FE_ACK(i));
- 		lci[i] = !!(status & IRQ_LE_ACK(i));
- 	}
-+
-+	if (csi2_track_errors)
-+		csi2_isr_handle_errors(csi2, status);
- }
- 
- void csi2_set_buffer(struct csi2_device *csi2, unsigned int channel,
-@@ -277,6 +389,9 @@ void csi2_stop_channel(struct csi2_devic
- 
- void csi2_open_rx(struct csi2_device *csi2)
- {
-+	csi2_reg_write(csi2, CSI2_IRQ_MASK,
-+		       csi2_track_errors ? CSI2_IRQ_MASK_IRQ_ALL : 0);
-+
- 	dphy_start(&csi2->dphy);
- 
- 	csi2_reg_write(csi2, CSI2_CTRL,
-@@ -286,6 +401,8 @@ void csi2_open_rx(struct csi2_device *cs
- void csi2_close_rx(struct csi2_device *csi2)
- {
- 	dphy_stop(&csi2->dphy);
-+
-+	csi2_reg_write(csi2, CSI2_IRQ_MASK, 0);
- }
- 
- static struct csi2_device *to_csi2_device(struct v4l2_subdev *subdev)
-@@ -398,11 +515,17 @@ int csi2_init(struct csi2_device *csi2,
- {
- 	unsigned int i, ret;
- 
-+	spin_lock_init(&csi2->errors_lock);
-+
- 	csi2->dphy.dev = csi2->v4l2_dev->dev;
- 	dphy_probe(&csi2->dphy);
- 
- 	debugfs_create_file("csi2_regs", 0444, debugfs, csi2, &csi2_regs_fops);
- 
-+	if (csi2_track_errors)
-+		debugfs_create_file("csi2_errors", 0444, debugfs, csi2,
-+				    &csi2_errors_fops);
-+
- 	for (i = 0; i < CSI2_NUM_CHANNELS * 2; i++)
- 		csi2->pad[i].flags = i < CSI2_NUM_CHANNELS ?
- 				     MEDIA_PAD_FL_SINK : MEDIA_PAD_FL_SOURCE;
---- a/drivers/media/platform/raspberrypi/rp1_cfe/csi2.h
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/csi2.h
-@@ -17,6 +17,8 @@
- 
- #define CSI2_NUM_CHANNELS 4
- 
-+#define DISCARDS_TABLE_NUM_VCS 4
-+
- enum csi2_mode {
- 	CSI2_MODE_NORMAL,
- 	CSI2_MODE_REMAP,
-@@ -37,6 +39,14 @@ struct csi2_cfg {
- 	u32 buffer_size;
- };
- 
-+enum discards_table_index {
-+	DISCARDS_TABLE_OVERFLOW = 0,
-+	DISCARDS_TABLE_LENGTH_LIMIT,
-+	DISCARDS_TABLE_UNMATCHED,
-+	DISCARDS_TABLE_INACTIVE,
-+	DISCARDS_TABLE_NUM_ENTRIES,
-+};
-+
- struct csi2_device {
- 	/* Parent V4l2 device */
- 	struct v4l2_device *v4l2_dev;
-@@ -53,6 +63,12 @@ struct csi2_device {
- 
- 	struct media_pad pad[CSI2_NUM_CHANNELS * 2];
- 	struct v4l2_subdev sd;
-+
-+	/* lock for csi2 errors counters */
-+	spinlock_t errors_lock;
-+	u32 overflows;
-+	u32 discards_table[DISCARDS_TABLE_NUM_VCS][DISCARDS_TABLE_NUM_ENTRIES];
-+	u32 discards_dt_table[DISCARDS_TABLE_NUM_ENTRIES];
- };
- 
- void csi2_isr(struct csi2_device *csi2, bool *sof, bool *eof, bool *lci);
diff --git a/target/linux/bcm27xx/patches-6.1/950-1006-media-rp1-cfe-Drop-unused-field.patch b/target/linux/bcm27xx/patches-6.1/950-1006-media-rp1-cfe-Drop-unused-field.patch
deleted file mode 100644
index b53a5b6154..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1006-media-rp1-cfe-Drop-unused-field.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d6bd676b49cf10046665efde820b0cc00dc43994 Mon Sep 17 00:00:00 2001
-From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
-Date: Thu, 28 Sep 2023 17:04:07 +0300
-Subject: [PATCH] media: rp1: cfe: Drop unused field
-
-Drop 'sensor_embedded_data' field, as it is unused.
-
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
----
- drivers/media/platform/raspberrypi/rp1_cfe/cfe.c | 3 ---
- 1 file changed, 3 deletions(-)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-@@ -292,7 +292,6 @@ struct cfe_device {
- 	struct csi2_device csi2;
- 	struct pisp_fe_device fe;
- 
--	bool sensor_embedded_data;
- 	int fe_csi2_channel;
- 
- 	unsigned int sequence;
-@@ -1821,8 +1820,6 @@ static int cfe_probe_complete(struct cfe
- 
- 	cfe->v4l2_dev.notify = cfe_notify;
- 
--	cfe->sensor_embedded_data = (cfe->sensor->entity.num_pads >= 2);
--
- 	for (i = 0; i < NUM_NODES; i++) {
- 		ret = cfe_register_node(cfe, i);
- 		if (ret) {
diff --git a/target/linux/bcm27xx/patches-6.1/950-1007-media-rp1-csi2-Set-values-for-enum-csi2_mode.patch b/target/linux/bcm27xx/patches-6.1/950-1007-media-rp1-csi2-Set-values-for-enum-csi2_mode.patch
deleted file mode 100644
index 126ee2c493..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1007-media-rp1-csi2-Set-values-for-enum-csi2_mode.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From c56b53d62116b4672962124afab02f3beada4244 Mon Sep 17 00:00:00 2001
-From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
-Date: Fri, 29 Sep 2023 12:57:23 +0300
-Subject: [PATCH] media: rp1: csi2: Set values for enum csi2_mode
-
-Set hardcoded values for enum csi2_mode, as the values will be
-programmed to HW registers.
-
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
----
- drivers/media/platform/raspberrypi/rp1_cfe/csi2.h | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/csi2.h
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/csi2.h
-@@ -20,10 +20,10 @@
- #define DISCARDS_TABLE_NUM_VCS 4
- 
- enum csi2_mode {
--	CSI2_MODE_NORMAL,
--	CSI2_MODE_REMAP,
--	CSI2_MODE_COMPRESSED,
--	CSI2_MODE_FE_STREAMING
-+	CSI2_MODE_NORMAL = 0,
-+	CSI2_MODE_REMAP = 1,
-+	CSI2_MODE_COMPRESSED = 2,
-+	CSI2_MODE_FE_STREAMING = 3,
- };
- 
- enum csi2_compression_mode {
diff --git a/target/linux/bcm27xx/patches-6.1/950-1008-media-rp1-fe-Fix-default-mbus-code.patch b/target/linux/bcm27xx/patches-6.1/950-1008-media-rp1-fe-Fix-default-mbus-code.patch
deleted file mode 100644
index e4ea9e1d16..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1008-media-rp1-fe-Fix-default-mbus-code.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5edacf33de9e0349dd5a02ad684bfceae1d5565f Mon Sep 17 00:00:00 2001
-From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
-Date: Fri, 29 Sep 2023 13:29:15 +0300
-Subject: [PATCH] media: rp1: fe: Fix default mbus code
-
-When pisp_fe_pad_set_fmt() is given an mbus code that CFE does not
-support, it currently defaults to MEDIA_BUS_FMT_SBGGR10_1X10. This is
-not correct, as FE does not support SBGGR10.
-
-Set the default to MEDIA_BUS_FMT_SRGGB16_1X16 instead.
-
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
----
- drivers/media/platform/raspberrypi/rp1_cfe/pisp_fe.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/pisp_fe.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/pisp_fe.c
-@@ -437,7 +437,7 @@ static int pisp_fe_pad_set_fmt(struct v4
- 	case FE_OUTPUT1_PAD:
- 		cfe_fmt = find_format_by_code(format->format.code);
- 		if (!cfe_fmt || !(cfe_fmt->flags & CFE_FORMAT_FLAG_FE_OUT))
--			cfe_fmt = find_format_by_code(MEDIA_BUS_FMT_SBGGR10_1X10);
-+			cfe_fmt = find_format_by_code(MEDIA_BUS_FMT_SRGGB16_1X16);
- 
- 		format->format.code = cfe_fmt->code;
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1009-media-rp1-cfe-Fix-default-meta-format-s-field.patch b/target/linux/bcm27xx/patches-6.1/950-1009-media-rp1-cfe-Fix-default-meta-format-s-field.patch
deleted file mode 100644
index 2ac5e0e88a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1009-media-rp1-cfe-Fix-default-meta-format-s-field.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 47fd9528bc1d93dd07ce9baa19c736966b536bd9 Mon Sep 17 00:00:00 2001
-From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
-Date: Mon, 2 Oct 2023 14:38:07 +0300
-Subject: [PATCH] media: rp1: cfe: Fix default meta format's field
-
-Set default meta format's field to V4L2_FIELD_NONE, instead of zeroing
-it which indicates V4L2_FIELD_ANY. Metadata doesn't have fields, so NONE
-makes sense, and furthermore the default v4l2 link validation will check
-for matching fields, or that the sink field is NONE.
-
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
----
- drivers/media/platform/raspberrypi/rp1_cfe/cfe.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-@@ -110,6 +110,7 @@ const struct v4l2_mbus_framefmt cfe_defa
- 	.width = 8192,
- 	.height = 1,
- 	.code = MEDIA_BUS_FMT_SENSOR_DATA,
-+	.field = V4L2_FIELD_NONE,
- };
- 
- enum node_ids {
diff --git a/target/linux/bcm27xx/patches-6.1/950-1010-media-rp1-cfe-Fail-streaming-if-FE_CONFIG-node-is-no.patch b/target/linux/bcm27xx/patches-6.1/950-1010-media-rp1-cfe-Fail-streaming-if-FE_CONFIG-node-is-no.patch
deleted file mode 100644
index de469c3565..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1010-media-rp1-cfe-Fail-streaming-if-FE_CONFIG-node-is-no.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 3e2203b265ddd8630fea0fbb69b3a2ec1496f773 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Wed, 4 Oct 2023 09:39:59 +0100
-Subject: [PATCH] media: rp1: cfe: Fail streaming if FE_CONFIG node is not
- enabled
-
-When the FE is enabled, ensure that the FE_CONFIG node is enabled.
-Otherwise fail cfe_start_streaming() entirely.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/platform/raspberrypi/rp1_cfe/cfe.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-@@ -997,6 +997,14 @@ static int cfe_start_streaming(struct vb
- 		goto err_streaming;
- 	}
- 
-+	/* When using the Frontend, we must enable the FE_CONFIG node. */
-+	if (is_fe_enabled(cfe) &&
-+	    !check_state(cfe, NODE_ENABLED, cfe->node[FE_CONFIG].id)) {
-+		cfe_err("FE enabled, but FE_CONFIG node is not\n");
-+		ret = -EINVAL;
-+		goto err_streaming;
-+	}
-+
- 	ret = media_pipeline_start(&node->pad, &cfe->pipe);
- 	if (ret < 0) {
- 		cfe_err("Failed to start media pipeline: %d\n", ret);
diff --git a/target/linux/bcm27xx/patches-6.1/950-1011-media-i2c-Move-Kconfig-entry-for-IMX477-to-the-camer.patch b/target/linux/bcm27xx/patches-6.1/950-1011-media-i2c-Move-Kconfig-entry-for-IMX477-to-the-camer.patch
deleted file mode 100644
index 37e1a86e16..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1011-media-i2c-Move-Kconfig-entry-for-IMX477-to-the-camer.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 52811174f534824f5e5bcdb681f0c508aa335244 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Wed, 4 Oct 2023 11:09:10 +0100
-Subject: [PATCH] media: i2c: Move Kconfig entry for IMX477 to the camera
- sensor section
-
-It was accidentally placed in the audio decoder section.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/i2c/Kconfig | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
---- a/drivers/media/i2c/Kconfig
-+++ b/drivers/media/i2c/Kconfig
-@@ -270,6 +270,17 @@ config VIDEO_IMX412
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called imx412.
- 
-+config VIDEO_IMX477
-+	tristate "Sony IMX477 sensor support"
-+	depends on I2C && VIDEO_DEV
-+	select VIDEO_V4L2_SUBDEV_API
-+	help
-+	  This is a Video4Linux2 sensor driver for the Sony
-+	  IMX477 camera. Also supports the Sony IMX378.
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called imx477.
-+
- config VIDEO_IMX519
- 	tristate "Arducam IMX519 sensor support"
- 	depends on I2C && VIDEO_DEV
-@@ -1106,17 +1117,6 @@ config VIDEO_UDA1342
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called uda1342.
- 
--config VIDEO_IMX477
--	tristate "Sony IMX477 sensor support"
--	depends on I2C && VIDEO_DEV
--	select VIDEO_V4L2_SUBDEV_API
--	help
--	  This is a Video4Linux2 sensor driver for the Sony
--	  IMX477 camera. Also supports the Sony IMX378.
--
--	  To compile this driver as a module, choose M here: the
--	  module will be called imx477.
--
- config VIDEO_VP27SMPX
- 	tristate "Panasonic VP27's internal MPX"
- 	depends on VIDEO_DEV && I2C
diff --git a/target/linux/bcm27xx/patches-6.1/950-1013-drm-Look-for-an-alias-for-the-displays-to-use-as-the.patch b/target/linux/bcm27xx/patches-6.1/950-1013-drm-Look-for-an-alias-for-the-displays-to-use-as-the.patch
deleted file mode 100644
index 8de6c372c0..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1013-drm-Look-for-an-alias-for-the-displays-to-use-as-the.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 3aa1f2477545ea6298bc6f2d7ffae68f090af9b8 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 28 Sep 2023 18:27:09 +0100
-Subject: [PATCH] drm: Look for an alias for the displays to use as the DRM
- device name
-
-Allow DT aliases of eg DSI2 to force make DRM allocate the
-display with the requested name.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/drm_connector.c | 60 ++++++++++++++++++++++++++++++---
- 1 file changed, 56 insertions(+), 4 deletions(-)
-
---- a/drivers/gpu/drm/drm_connector.c
-+++ b/drivers/gpu/drm/drm_connector.c
-@@ -81,6 +81,7 @@ struct drm_conn_prop_enum_list {
- 	int type;
- 	const char *name;
- 	struct ida ida;
-+	int first_dyn_num;
- };
- 
- /*
-@@ -110,12 +111,41 @@ static struct drm_conn_prop_enum_list dr
- 	{ DRM_MODE_CONNECTOR_USB, "USB" },
- };
- 
-+#define MAX_DT_NODE_NAME_LEN	20
-+#define DT_DRM_NODE_PREFIX	"drm_"
-+
-+static void drm_connector_get_of_name(int type, char *node_name, int length)
-+{
-+	int i = 0;
-+
-+	strcpy(node_name, DT_DRM_NODE_PREFIX);
-+
-+	do {
-+		node_name[i + strlen(DT_DRM_NODE_PREFIX)] =
-+				tolower(drm_connector_enum_list[type].name[i]);
-+
-+	} while (drm_connector_enum_list[type].name[i++] &&
-+		 i < length);
-+
-+	node_name[length - 1] = '\0';
-+}
-+
- void drm_connector_ida_init(void)
- {
--	int i;
-+	int i, id;
-+	char node_name[MAX_DT_NODE_NAME_LEN];
- 
--	for (i = 0; i < ARRAY_SIZE(drm_connector_enum_list); i++)
-+	for (i = 0; i < ARRAY_SIZE(drm_connector_enum_list); i++) {
- 		ida_init(&drm_connector_enum_list[i].ida);
-+
-+		drm_connector_get_of_name(i, node_name, MAX_DT_NODE_NAME_LEN);
-+
-+		id = of_alias_get_highest_id(node_name);
-+		if (id > 0)
-+			drm_connector_enum_list[i].first_dyn_num = id + 1;
-+		else
-+			drm_connector_enum_list[i].first_dyn_num = 1;
-+	}
- }
- 
- void drm_connector_ida_destroy(void)
-@@ -222,7 +252,9 @@ static int __drm_connector_init(struct d
- 				struct i2c_adapter *ddc)
- {
- 	struct drm_mode_config *config = &dev->mode_config;
-+	char node_name[MAX_DT_NODE_NAME_LEN];
- 	int ret;
-+	int id;
- 	struct ida *connector_ida =
- 		&drm_connector_enum_list[connector_type].ida;
- 
-@@ -252,8 +284,28 @@ static int __drm_connector_init(struct d
- 	ret = 0;
- 
- 	connector->connector_type = connector_type;
--	connector->connector_type_id =
--		ida_alloc_min(connector_ida, 1, GFP_KERNEL);
-+	connector->connector_type_id = 0;
-+
-+	drm_connector_get_of_name(connector_type, node_name, MAX_DT_NODE_NAME_LEN);
-+	id = of_alias_get_id(dev->dev->of_node, node_name);
-+	if (id > 0) {
-+		/* Try and allocate the requested ID
-+		 * Valid range is 1 to 31, hence ignoring 0 as an error
-+		 */
-+		int type_id = ida_alloc_range(connector_ida, id, id, GFP_KERNEL);
-+
-+		if (type_id > 0)
-+			connector->connector_type_id = type_id;
-+		else
-+			drm_err(dev, "Failed to acquire type ID %d for interface type %s, ret %d\n",
-+				id, drm_connector_enum_list[connector_type].name,
-+				type_id);
-+	}
-+	if (!connector->connector_type_id)
-+		connector->connector_type_id =
-+				ida_alloc_min(connector_ida,
-+					      drm_connector_enum_list[connector_type].first_dyn_num,
-+					      GFP_KERNEL);
- 	if (connector->connector_type_id < 0) {
- 		ret = connector->connector_type_id;
- 		goto out_put_id;
diff --git a/target/linux/bcm27xx/patches-6.1/950-1014-dt-Add-DSI1-and-DSI2-aliases-to-2712.patch b/target/linux/bcm27xx/patches-6.1/950-1014-dt-Add-DSI1-and-DSI2-aliases-to-2712.patch
deleted file mode 100644
index 6d79cb6c4d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1014-dt-Add-DSI1-and-DSI2-aliases-to-2712.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 7ec42740a45b21bca859cde5b7cbe2f09ef3d586 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 28 Sep 2023 18:40:36 +0100
-Subject: [PATCH] dt: Add DSI1 and DSI2 aliases to 2712
-
-In order to keep the DRM names consistent as DSI-1 and DSI-2, add
-aliases to the Pi5 DT.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2712-rpi-5-b.dts | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/arch/arm/boot/dts/bcm2712-rpi-5-b.dts
-+++ b/arch/arm/boot/dts/bcm2712-rpi-5-b.dts
-@@ -785,6 +785,8 @@ spi10_cs_pins: &spi10_cs_gpio1 {};
- 		gpio4 = &pinctrl_aon;
- 		usb0 = &rp1_usb0;
- 		usb1 = &rp1_usb1;
-+		drm_dsi1 = &dsi0;
-+		drm_dsi2 = &dsi1;
- 	};
- 
- 	__overrides__ {
diff --git a/target/linux/bcm27xx/patches-6.1/950-1015-vc4-drm-Remove-the-clear-of-SCALER_DISPBKGND_FILL.patch b/target/linux/bcm27xx/patches-6.1/950-1015-vc4-drm-Remove-the-clear-of-SCALER_DISPBKGND_FILL.patch
deleted file mode 100644
index a4c8aeadd3..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1015-vc4-drm-Remove-the-clear-of-SCALER_DISPBKGND_FILL.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From e6e0631fdeb0cd7d4c50e629b4b298e0b76e885b Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Wed, 4 Oct 2023 16:02:39 +0100
-Subject: [PATCH] vc4/drm: Remove the clear of SCALER_DISPBKGND_FILL
-
-Since "drm/vc4: hvs: Support BCM2712 HVS" booting Pi4
-with dual 4kp30 displays connected fails with:
-vc4-drm gpu: [drm] *ERROR* [CRTC:107:pixelvalve-4] flip_done timed out
-
-It has been tracked down to the referenced commit adding a
-path to clear the SCALER_DISPBKGND_FILL when not required.
-
-Dual 4kp30 works with a core clock of 297MHz when background fill
-is enabled, but requires a higher value with it disabled.
-320MHz still fails, while 330MHz seems okay.
-
-Lets always enable background fill for Pi0-4.
-
-Fixes: e84da235223d ("drm/vc4: hvs: Support BCM2712 HVS")
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/gpu/drm/vc4/vc4_hvs.c | 20 +++++++++-----------
- 1 file changed, 9 insertions(+), 11 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -1349,27 +1349,25 @@ void vc4_hvs_atomic_flush(struct drm_crt
- 	WARN_ON(!vc4_state->mm);
- 	WARN_ON_ONCE(dlist_next - dlist_start != vc4_state->mm->mm_node.size);
- 
--	if (enable_bg_fill) {
-+	if (vc4->gen >= VC4_GEN_6) {
- 		/* This sets a black background color fill, as is the case
- 		 * with other DRM drivers.
- 		 */
--		if (vc4->gen >= VC4_GEN_6)
-+		if (enable_bg_fill)
- 			HVS_WRITE(SCALER6_DISPX_CTRL1(channel),
- 				  HVS_READ(SCALER6_DISPX_CTRL1(channel)) |
- 				  SCALER6_DISPX_CTRL1_BGENB);
- 		else
--			HVS_WRITE(SCALER_DISPBKGNDX(channel),
--				  HVS_READ(SCALER_DISPBKGNDX(channel)) |
--				  SCALER_DISPBKGND_FILL);
--	} else {
--		if (vc4->gen >= VC4_GEN_6)
- 			HVS_WRITE(SCALER6_DISPX_CTRL1(channel),
- 				  HVS_READ(SCALER6_DISPX_CTRL1(channel)) &
- 				  ~SCALER6_DISPX_CTRL1_BGENB);
--		else
--			HVS_WRITE(SCALER_DISPBKGNDX(channel),
--				  HVS_READ(SCALER_DISPBKGNDX(channel)) &
--				  ~SCALER_DISPBKGND_FILL);
-+	} else {
-+		/* we can actually run with a lower core clock when background
-+		 * fill is enabled on VC4_GEN_5 so leave it enabled always.
-+		 */
-+		HVS_WRITE(SCALER_DISPBKGNDX(channel),
-+			  HVS_READ(SCALER_DISPBKGNDX(channel)) |
-+			  SCALER_DISPBKGND_FILL);
- 	}
- 
- 	/* Only update DISPLIST if the CRTC was already running and is not
diff --git a/target/linux/bcm27xx/patches-6.1/950-1017-gpio-brcmstb-Use-dynamic-GPIO-base-numbers.patch b/target/linux/bcm27xx/patches-6.1/950-1017-gpio-brcmstb-Use-dynamic-GPIO-base-numbers.patch
deleted file mode 100644
index 9bf9e6d96d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1017-gpio-brcmstb-Use-dynamic-GPIO-base-numbers.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 450d617786926b27c25e930241efbd2e37d66bb8 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Fri, 6 Oct 2023 16:30:35 +0100
-Subject: [PATCH] gpio: brcmstb: Use dynamic GPIO base numbers
-
-Forcing a gpiochip to have a fixed base number now leads to a warning
-message. Remove the need to do so by calculating hwirq numbers based
-on bank numbers.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-Fixes: 3b0213d56eb7 ("gpio: Add GPIO support for Broadcom STB SoCs")
----
- drivers/gpio/gpio-brcmstb.c | 21 ++++++++++-----------
- 1 file changed, 10 insertions(+), 11 deletions(-)
-
---- a/drivers/gpio/gpio-brcmstb.c
-+++ b/drivers/gpio/gpio-brcmstb.c
-@@ -50,7 +50,6 @@ struct brcmstb_gpio_priv {
- 	struct irq_domain *irq_domain;
- 	struct irq_chip irq_chip;
- 	int parent_irq;
--	int gpio_base;
- 	int num_gpios;
- 	int parent_wake_irq;
- };
-@@ -92,7 +91,7 @@ brcmstb_gpio_get_active_irqs(struct brcm
- static int brcmstb_gpio_hwirq_to_offset(irq_hw_number_t hwirq,
- 					struct brcmstb_gpio_bank *bank)
- {
--	return hwirq - (bank->gc.base - bank->parent_priv->gpio_base);
-+	return hwirq - bank->id * 32;
- }
- 
- static void brcmstb_gpio_set_imask(struct brcmstb_gpio_bank *bank,
-@@ -117,8 +116,9 @@ static void brcmstb_gpio_set_imask(struc
- static int brcmstb_gpio_to_irq(struct gpio_chip *gc, unsigned offset)
- {
- 	struct brcmstb_gpio_priv *priv = brcmstb_gpio_gc_to_priv(gc);
-+	struct brcmstb_gpio_bank *bank = gpiochip_get_data(gc);
- 	/* gc_offset is relative to this gpio_chip; want real offset */
--	int hwirq = offset + (gc->base - priv->gpio_base);
-+	int hwirq = offset + bank->id * 32;
- 
- 	if (hwirq >= priv->num_gpios)
- 		return -ENXIO;
-@@ -263,7 +263,7 @@ static void brcmstb_gpio_irq_bank_handle
- {
- 	struct brcmstb_gpio_priv *priv = bank->parent_priv;
- 	struct irq_domain *domain = priv->irq_domain;
--	int hwbase = bank->gc.base - priv->gpio_base;
-+	int hwbase = bank->id * 32;
- 	unsigned long status;
- 
- 	while ((status = brcmstb_gpio_get_active_irqs(bank))) {
-@@ -414,7 +414,7 @@ static int brcmstb_gpio_of_xlate(struct
- 	if (WARN_ON(gpiospec->args_count < gc->of_gpio_n_cells))
- 		return -EINVAL;
- 
--	offset = gpiospec->args[0] - (gc->base - priv->gpio_base);
-+	offset = gpiospec->args[0] - bank->id * 32;
- 	if (offset >= gc->ngpio || offset < 0)
- 		return -EINVAL;
- 
-@@ -598,8 +598,8 @@ static int brcmstb_gpio_probe(struct pla
- 	const __be32 *p;
- 	u32 bank_width;
- 	int num_banks = 0;
-+	int num_gpios = 0;
- 	int err;
--	static int gpio_base;
- 	unsigned long flags = 0;
- 	bool need_wakeup_event = false;
- 
-@@ -614,7 +614,6 @@ static int brcmstb_gpio_probe(struct pla
- 	if (IS_ERR(reg_base))
- 		return PTR_ERR(reg_base);
- 
--	priv->gpio_base = gpio_base;
- 	priv->reg_base = reg_base;
- 	priv->pdev = pdev;
- 
-@@ -656,7 +655,7 @@ static int brcmstb_gpio_probe(struct pla
- 			dev_dbg(dev, "Width 0 found: Empty bank @ %d\n",
- 				num_banks);
- 			num_banks++;
--			gpio_base += MAX_GPIO_PER_BANK;
-+			num_gpios += MAX_GPIO_PER_BANK;
- 			continue;
- 		}
- 
-@@ -698,7 +697,7 @@ static int brcmstb_gpio_probe(struct pla
- 			err = -ENOMEM;
- 			goto fail;
- 		}
--		gc->base = gpio_base;
-+		gc->base = -1;
- 		gc->of_gpio_n_cells = 2;
- 		gc->of_xlate = brcmstb_gpio_of_xlate;
- 		/* not all ngpio lines are valid, will use bank width later */
-@@ -722,7 +721,7 @@ static int brcmstb_gpio_probe(struct pla
- 					bank->id);
- 			goto fail;
- 		}
--		gpio_base += gc->ngpio;
-+		num_gpios += gc->ngpio;
- 
- 		dev_dbg(dev, "bank=%d, base=%d, ngpio=%d, width=%d\n", bank->id,
- 			gc->base, gc->ngpio, bank->width);
-@@ -733,7 +732,7 @@ static int brcmstb_gpio_probe(struct pla
- 		num_banks++;
- 	}
- 
--	priv->num_gpios = gpio_base - priv->gpio_base;
-+	priv->num_gpios = num_gpios;
- 	if (priv->parent_irq > 0) {
- 		err = brcmstb_gpio_irq_setup(pdev, priv);
- 		if (err)
diff --git a/target/linux/bcm27xx/patches-6.1/950-1018-media-rpivid-Allow-use-of-iommu-in-rpivid.patch b/target/linux/bcm27xx/patches-6.1/950-1018-media-rpivid-Allow-use-of-iommu-in-rpivid.patch
deleted file mode 100644
index a6d199a8c7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1018-media-rpivid-Allow-use-of-iommu-in-rpivid.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 1770efc97981dbf756a18f5eb7615c4bafab665b Mon Sep 17 00:00:00 2001
-From: John Cox <jc@kynesim.co.uk>
-Date: Mon, 2 Oct 2023 15:12:52 +0100
-Subject: [PATCH] media/rpivid: Allow use of iommu in rpivid
-
-In order to use iommu on hevc set dma mask_and_coherent in probe.
-I am assured dma_set_mask_and_coherent is benign on Pi4 (which has
-no iommu) and it seems to be so in practice.
-Also adds a bit of debug to make internal buffer allocation failure
-easier to spot in future
-
-Signed-off-by: John Cox <jc@kynesim.co.uk>
----
- drivers/staging/media/rpivid/rpivid.c      |  7 +++++++
- drivers/staging/media/rpivid/rpivid_h265.c | 12 ++++++++++--
- 2 files changed, 17 insertions(+), 2 deletions(-)
-
---- a/drivers/staging/media/rpivid/rpivid.c
-+++ b/drivers/staging/media/rpivid/rpivid.c
-@@ -360,6 +360,13 @@ static int rpivid_probe(struct platform_
- 	snprintf(vfd->name, sizeof(vfd->name), "%s", rpivid_video_device.name);
- 	video_set_drvdata(vfd, dev);
- 
-+	ret = dma_set_mask_and_coherent(dev->dev, DMA_BIT_MASK(36));
-+	if (ret) {
-+		v4l2_err(&dev->v4l2_dev,
-+			 "Failed dma_set_mask_and_coherent\n");
-+		goto err_v4l2;
-+	}
-+
- 	dev->m2m_dev = v4l2_m2m_init(&rpivid_m2m_ops);
- 	if (IS_ERR(dev->m2m_dev)) {
- 		v4l2_err(&dev->v4l2_dev,
---- a/drivers/staging/media/rpivid/rpivid_h265.c
-+++ b/drivers/staging/media/rpivid/rpivid_h265.c
-@@ -2495,11 +2495,19 @@ static int rpivid_h265_start(struct rpiv
- 	for (i = 0; i != ARRAY_SIZE(ctx->pu_bufs); ++i) {
- 		// Don't actually need a kernel mapping here
- 		if (gptr_alloc(dev, ctx->pu_bufs + i, pu_alloc,
--			       DMA_ATTR_NO_KERNEL_MAPPING))
-+			       DMA_ATTR_NO_KERNEL_MAPPING)) {
-+			v4l2_err(&dev->v4l2_dev,
-+				 "Failed to alloc %#zx PU%d buffer\n",
-+				 pu_alloc, i);
- 			goto fail;
-+		}
- 		if (gptr_alloc(dev, ctx->coeff_bufs + i, coeff_alloc,
--			       DMA_ATTR_NO_KERNEL_MAPPING))
-+			       DMA_ATTR_NO_KERNEL_MAPPING)) {
-+			v4l2_err(&dev->v4l2_dev,
-+				 "Failed to alloc %#zx Coeff%d buffer\n",
-+				 pu_alloc, i);
- 			goto fail;
-+		}
- 	}
- 	aux_q_init(ctx);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1019-dts-bcm2712-Add-iommu-to-rpivid.patch b/target/linux/bcm27xx/patches-6.1/950-1019-dts-bcm2712-Add-iommu-to-rpivid.patch
deleted file mode 100644
index 9f7c8674fb..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1019-dts-bcm2712-Add-iommu-to-rpivid.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 10ff8ba24c68f704ecf5a58878617dfe149a14c6 Mon Sep 17 00:00:00 2001
-From: John Cox <jc@kynesim.co.uk>
-Date: Mon, 2 Oct 2023 15:15:13 +0100
-Subject: [PATCH] dts/bcm2712: Add iommu to rpivid
-
-Add iommu to rpivid so it can cope with scatter/gather
-
-Signed-off-by: John Cox <jc@kynesim.co.uk>
----
- arch/arm/boot/dts/bcm2712.dtsi | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/arch/arm/boot/dts/bcm2712.dtsi
-+++ b/arch/arm/boot/dts/bcm2712.dtsi
-@@ -1158,6 +1158,7 @@
- 			clocks = <&firmware_clocks 11>;
- 			clock-names = "hevc";
- 			status = "disabled";
-+			iommus = <&iommu2>;
- 		};
- 
- 		sdio1: mmc@fff000 {
diff --git a/target/linux/bcm27xx/patches-6.1/950-1020-drivers-media-rp1_cfe-Remove-PISP-specific-MBUS-form.patch b/target/linux/bcm27xx/patches-6.1/950-1020-drivers-media-rp1_cfe-Remove-PISP-specific-MBUS-form.patch
deleted file mode 100644
index fabc96e422..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1020-drivers-media-rp1_cfe-Remove-PISP-specific-MBUS-form.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From b5c3cc7fd9fca73352310e61092fb445b56a362a Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Tue, 10 Oct 2023 12:41:15 +0100
-Subject: [PATCH] drivers: media: rp1_cfe: Remove PISP specific MBUS formats
-
-Remove the MEDIA_BUS_FMT_PISP* format codcs entirely. For the image
-pad formats, use the 16-bit Bayer format mbus codes instead. For the
-config and stats pad formats, use MEDIA_BUS_FMT_FIXED.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- .../media/platform/raspberrypi/rp1_cfe/cfe_fmts.h  | 10 ++++++----
- .../media/platform/raspberrypi/rp1_cfe/pisp_fe.c   | 11 ++++-------
- include/uapi/linux/media-bus-format.h              | 14 --------------
- 3 files changed, 10 insertions(+), 25 deletions(-)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe_fmts.h
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe_fmts.h
-@@ -215,25 +215,25 @@ static const struct cfe_fmt formats[] =
- 	/* PiSP Compressed Mode 1 */
- 	{
- 		.fourcc = V4L2_PIX_FMT_PISP_COMP1_RGGB,
--		.code = MEDIA_BUS_FMT_PISP_COMP1_RGGB,
-+		.code = MEDIA_BUS_FMT_SRGGB16_1X16,
- 		.depth = 8,
- 		.flags = CFE_FORMAT_FLAG_FE_OUT,
- 	},
- 	{
- 		.fourcc = V4L2_PIX_FMT_PISP_COMP1_BGGR,
--		.code = MEDIA_BUS_FMT_PISP_COMP1_BGGR,
-+		.code = MEDIA_BUS_FMT_SBGGR16_1X16,
- 		.depth = 8,
- 		.flags = CFE_FORMAT_FLAG_FE_OUT,
- 	},
- 	{
- 		.fourcc = V4L2_PIX_FMT_PISP_COMP1_GBRG,
--		.code = MEDIA_BUS_FMT_PISP_COMP1_GBRG,
-+		.code = MEDIA_BUS_FMT_SGBRG16_1X16,
- 		.depth = 8,
- 		.flags = CFE_FORMAT_FLAG_FE_OUT,
- 	},
- 	{
- 		.fourcc = V4L2_PIX_FMT_PISP_COMP1_GRBG,
--		.code = MEDIA_BUS_FMT_PISP_COMP1_GRBG,
-+		.code = MEDIA_BUS_FMT_SGRBG16_1X16,
- 		.depth = 8,
- 		.flags = CFE_FORMAT_FLAG_FE_OUT,
- 	},
-@@ -283,10 +283,12 @@ static const struct cfe_fmt formats[] =
- 	/* Frontend formats */
- 	{
- 		.fourcc = V4L2_META_FMT_RPI_FE_CFG,
-+		.code = MEDIA_BUS_FMT_FIXED,
- 		.flags = CFE_FORMAT_FLAG_META_OUT,
- 	},
- 	{
- 		.fourcc = V4L2_META_FMT_RPI_FE_STATS,
-+		.code = MEDIA_BUS_FMT_FIXED,
- 		.flags = CFE_FORMAT_FLAG_META_CAP,
- 	},
- };
---- a/drivers/media/platform/raspberrypi/rp1_cfe/pisp_fe.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/pisp_fe.c
-@@ -404,7 +404,7 @@ static int pisp_fe_init_cfg(struct v4l2_
- 
- 	fmt = v4l2_subdev_get_pad_format(sd, state, FE_CONFIG_PAD);
- 	*fmt = cfe_default_meta_format;
--	fmt->code = MEDIA_BUS_FMT_PISP_FE_CONFIG;
-+	fmt->code = MEDIA_BUS_FMT_FIXED;
- 
- 	fmt = v4l2_subdev_get_pad_format(sd, state, FE_OUTPUT0_PAD);
- 	*fmt = cfe_default_format;
-@@ -416,7 +416,7 @@ static int pisp_fe_init_cfg(struct v4l2_
- 
- 	fmt = v4l2_subdev_get_pad_format(sd, state, FE_STATS_PAD);
- 	*fmt = cfe_default_meta_format;
--	fmt->code = MEDIA_BUS_FMT_PISP_FE_STATS;
-+	fmt->code = MEDIA_BUS_FMT_FIXED;
- 
- 	return 0;
- }
-@@ -443,12 +443,9 @@ static int pisp_fe_pad_set_fmt(struct v4
- 
- 		break;
- 
--	case FE_CONFIG_PAD:
--		format->format.code = MEDIA_BUS_FMT_PISP_FE_CONFIG;
--		break;
--
- 	case FE_STATS_PAD:
--		format->format.code = MEDIA_BUS_FMT_PISP_FE_STATS;
-+	case FE_CONFIG_PAD:
-+		format->format.code = MEDIA_BUS_FMT_FIXED;
- 		break;
- 	}
- 
---- a/include/uapi/linux/media-bus-format.h
-+++ b/include/uapi/linux/media-bus-format.h
-@@ -175,18 +175,4 @@
- /* Sensor ancillary metadata formats - next is 0x7002 */
- #define MEDIA_BUS_FMT_SENSOR_DATA		0x7002
- 
--/* PiSP Formats */
--#define MEDIA_BUS_FMT_PISP_COMP1_RGGB		0x8001
--#define MEDIA_BUS_FMT_PISP_COMP1_GRBG		0x8002
--#define MEDIA_BUS_FMT_PISP_COMP1_GBRG		0x8003
--#define MEDIA_BUS_FMT_PISP_COMP1_BGGR		0x8004
--#define MEDIA_BUS_FMT_PISP_COMP2_RGGB		0x8005
--#define MEDIA_BUS_FMT_PISP_COMP2_GRBG		0x8006
--#define MEDIA_BUS_FMT_PISP_COMP2_GBRG		0x8007
--#define MEDIA_BUS_FMT_PISP_COMP2_BGGR		0x8008
--
--#define MEDIA_BUS_FMT_PISP_FE_CONFIG		0x8100
--#define MEDIA_BUS_FMT_PISP_FE_STATS		0x8101
--#define MEDIA_BUS_FMT_PISP_BE_CONFIG		0x8200
--
- #endif /* __LINUX_MEDIA_BUS_FORMAT_H */
diff --git a/target/linux/bcm27xx/patches-6.1/950-1022-vc04_services-bcm2835-codec-Correct-alignment-requir.patch b/target/linux/bcm27xx/patches-6.1/950-1022-vc04_services-bcm2835-codec-Correct-alignment-requir.patch
deleted file mode 100644
index 313ca37738..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1022-vc04_services-bcm2835-codec-Correct-alignment-requir.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 9f4002165439d02a63760e68948246e3af764318 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 11 Oct 2023 15:05:38 +0100
-Subject: [PATCH] vc04_services: bcm2835-codec: Correct alignment requirements
- for YUYV
-
-The firmware wants the YUYV format stride alignment to be to a multiple
-of 32pixels / 64 bytes. The kernel driver was configuring it to a multiple
-of 16 pixels / 32 bytes, which then failed when it tried starting to
-stream.
-
-Correct the alignment requirements.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- .../vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c      | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-+++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-@@ -206,28 +206,28 @@ static const struct bcm2835_codec_fmt su
- 	}, {
- 		.fourcc			= V4L2_PIX_FMT_YUYV,
- 		.depth			= 16,
--		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.bytesperline_align	= { 64, 64, 64, 64, 64 },
- 		.flags			= 0,
- 		.mmal_fmt		= MMAL_ENCODING_YUYV,
- 		.size_multiplier_x2	= 2,
- 	}, {
- 		.fourcc			= V4L2_PIX_FMT_UYVY,
- 		.depth			= 16,
--		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.bytesperline_align	= { 64, 64, 64, 64, 64 },
- 		.flags			= 0,
- 		.mmal_fmt		= MMAL_ENCODING_UYVY,
- 		.size_multiplier_x2	= 2,
- 	}, {
- 		.fourcc			= V4L2_PIX_FMT_YVYU,
- 		.depth			= 16,
--		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.bytesperline_align	= { 64, 64, 64, 64, 64 },
- 		.flags			= 0,
- 		.mmal_fmt		= MMAL_ENCODING_YVYU,
- 		.size_multiplier_x2	= 2,
- 	}, {
- 		.fourcc			= V4L2_PIX_FMT_VYUY,
- 		.depth			= 16,
--		.bytesperline_align	= { 32, 32, 32, 32, 32 },
-+		.bytesperline_align	= { 64, 64, 64, 64, 64 },
- 		.flags			= 0,
- 		.mmal_fmt		= MMAL_ENCODING_VYUY,
- 		.size_multiplier_x2	= 2,
diff --git a/target/linux/bcm27xx/patches-6.1/950-1025-input-touchscreen-edt-ft5x06-Suppress-bogus-data-on-.patch b/target/linux/bcm27xx/patches-6.1/950-1025-input-touchscreen-edt-ft5x06-Suppress-bogus-data-on-.patch
deleted file mode 100644
index fe956c2ed4..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1025-input-touchscreen-edt-ft5x06-Suppress-bogus-data-on-.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From dd802fc03b1c71b4297e87068077bfcf9810300a Mon Sep 17 00:00:00 2001
-From: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
-Date: Wed, 11 Oct 2023 15:14:59 +0100
-Subject: [PATCH] input: touchscreen: edt-ft5x06: Suppress bogus data on
- startup
-
-When polled without the use of IRQ, FT5x06 registers may return
-undefined initial data, causing unwanted touches or event spamming.
-A simple way to filter this out is to suppress touches until the
-TD_STATUS register changes for the first time.
-
-Increase the delay before first polling to 300ms, to avoid
-transient I2C read flakiness that seems to occur after reset.
-
-Signed-off-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
----
- drivers/input/touchscreen/edt-ft5x06.c | 31 +++++++++++++++++++++++---
- 1 file changed, 28 insertions(+), 3 deletions(-)
-
---- a/drivers/input/touchscreen/edt-ft5x06.c
-+++ b/drivers/input/touchscreen/edt-ft5x06.c
-@@ -75,6 +75,8 @@
- #define EDT_DEFAULT_NUM_X		1024
- #define EDT_DEFAULT_NUM_Y		1024
- 
-+#define RESET_DELAY_MS			300	/* reset deassert to I2C */
-+#define FIRST_POLL_DELAY_MS		300	/* in addition to the above */
- #define POLL_INTERVAL_MS		17	/* 17ms = 60fps */
- 
- enum edt_pmode {
-@@ -134,6 +136,7 @@ struct edt_ft5x06_ts_data {
- 
- 	char name[EDT_NAME_LEN];
- 	char fw_version[EDT_NAME_LEN];
-+	int init_td_status;
- 
- 	struct edt_reg_addr reg_addr;
- 	enum edt_ver version;
-@@ -268,12 +271,33 @@ static irqreturn_t edt_ft5x06_ts_isr(int
- 		 * points.
- 		 */
- 		num_points = min(rdbuf[2] & 0xf, tsdata->max_support_points);
-+
-+		/* When polling FT5x06 without IRQ: initial register contents
-+		 * could be stale or undefined; discard all readings until
-+		 * TD_STATUS changes for the first time (or num_points is 0).
-+		 */
-+		if (tsdata->init_td_status) {
-+			if (tsdata->init_td_status < 0)
-+				tsdata->init_td_status = rdbuf[2];
-+
-+			if (num_points && rdbuf[2] == tsdata->init_td_status)
-+				goto out;
-+
-+			tsdata->init_td_status = 0;
-+		}
-+
- 		if (num_points) {
- 			datalen = tplen * num_points + crclen;
- 			cmd = offset;
- 			error = edt_ft5x06_ts_readwrite(tsdata->client,
- 							sizeof(cmd), &cmd,
- 							datalen, &rdbuf[offset]);
-+			if (error) {
-+				dev_err_ratelimited(dev,
-+						    "Unable to fetch data, error: %d\n",
-+						    error);
-+				goto out;
-+			}
- 		}
- 	}
- 
-@@ -1294,7 +1318,7 @@ static int edt_ft5x06_ts_probe(struct i2
- 	if (tsdata->reset_gpio) {
- 		usleep_range(5000, 6000);
- 		gpiod_set_value_cansleep(tsdata->reset_gpio, 0);
--		msleep(300);
-+		msleep(RESET_DELAY_MS);
- 	}
- 
- 	input = devm_input_allocate_device(&client->dev);
-@@ -1384,11 +1408,12 @@ static int edt_ft5x06_ts_probe(struct i2
- 			return error;
- 		}
- 	} else {
-+		tsdata->init_td_status = -1; /* filter bogus initial data */
- 		INIT_WORK(&tsdata->work_i2c_poll,
- 			  edt_ft5x06_ts_work_i2c_poll);
- 		timer_setup(&tsdata->timer, edt_ft5x06_ts_irq_poll_timer, 0);
--		tsdata->timer.expires = jiffies +
--					msecs_to_jiffies(POLL_INTERVAL_MS);
-+		tsdata->timer.expires =
-+			jiffies + msecs_to_jiffies(FIRST_POLL_DELAY_MS);
- 		add_timer(&tsdata->timer);
- 	}
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1029-overlays-mcp23017-allow-specification-of-the-i2c-bus.patch b/target/linux/bcm27xx/patches-6.1/950-1029-overlays-mcp23017-allow-specification-of-the-i2c-bus.patch
deleted file mode 100644
index 8cb35e1a79..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1029-overlays-mcp23017-allow-specification-of-the-i2c-bus.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 27f0e0e195568c06f21ce380f0736bdd219baf3c Mon Sep 17 00:00:00 2001
-From: Janis Streib <janis+github@dogcraft.de>
-Date: Sun, 15 Oct 2023 21:08:40 +0200
-Subject: [PATCH] overlays: mcp23017: allow specification of the i2c bus
-
-Analogous to i2c-rtc-overlay.dts
-
-See: https://github.com/raspberrypi/linux/pull/5650
----
- arch/arm/boot/dts/overlays/README             | 10 ++++++
- .../boot/dts/overlays/mcp23017-overlay.dts    | 36 +++++++++++++++++--
- 2 files changed, 44 insertions(+), 2 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -2810,6 +2810,16 @@ Params: gpiopin                 Gpio pin
- 
-         mcp23008                Configure an MCP23008 instead.
-         noints                  Disable the interrupt GPIO line.
-+        i2c0                    Choose the I2C0 bus on GPIOs 0&1
-+        i2c_csi_dsi             Choose the I2C0 bus on GPIOs 44&45
-+        i2c3                    Choose the I2C3 bus (configure with the i2c3
-+                                overlay - BCM2711 only)
-+        i2c4                    Choose the I2C4 bus (configure with the i2c4
-+                                overlay - BCM2711 only)
-+        i2c5                    Choose the I2C5 bus (configure with the i2c5
-+                                overlay - BCM2711 only)
-+        i2c6                    Choose the I2C6 bus (configure with the i2c6
-+                                overlay - BCM2711 only)
- 
- 
- Name:   mcp23s17
---- a/arch/arm/boot/dts/overlays/mcp23017-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/mcp23017-overlay.dts
-@@ -7,7 +7,7 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2c1>;
-+		target = <&i2cbus>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -24,7 +24,7 @@
- 	};
- 
- 	fragment@2 {
--		target = <&i2c1>;
-+		target = <&i2cbus>;
- 		__overlay__ {
- 			#address-cells = <1>;
- 			#size-cells = <0>;
-@@ -58,12 +58,44 @@
- 		};
- 	};
- 
-+	frag100: fragment@100 {
-+		target = <&i2c1>;
-+		i2cbus: __overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@101 { 
-+		target = <&i2c0if>; 
-+		__dormant__ { 
-+			status = "okay"; 
-+		}; 
-+	};
-+
-+	fragment@102 { 
-+		target = <&i2c0mux>; 
-+		__dormant__ { 
-+			status = "okay"; 
-+		}; 
-+	};
-+
- 	__overrides__ {
- 		gpiopin = <&mcp23017_pins>,"brcm,pins:0",
- 				<&mcp23017_irq>,"interrupts:0";
- 		addr = <&mcp23017>,"reg:0", <&mcp23017_pins>,"reg:0";
- 		mcp23008 = <0>,"=3";
- 		noints = <0>,"!1!4";
-+		i2c0 = <&frag100>, "target:0=",<&i2c0>;
-+		i2c_csi_dsi = <&frag100>, "target:0=",<&i2c_csi_dsi>,
-+			      <0>,"+101+102";
-+		i2c3 = <&frag100>, "target?=0",
-+		       <&frag100>, "target-path=i2c3";
-+		i2c4 = <&frag100>, "target?=0",
-+		       <&frag100>, "target-path=i2c4";
-+		i2c5 = <&frag100>, "target?=0",
-+		       <&frag100>, "target-path=i2c5";
-+		i2c6 = <&frag100>, "target?=0",
-+		       <&frag100>, "target-path=i2c6";
- 	};
- };
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1030-dts-bcm2712-Set-default-I2C-baudrates-to-100kHz.patch b/target/linux/bcm27xx/patches-6.1/950-1030-dts-bcm2712-Set-default-I2C-baudrates-to-100kHz.patch
deleted file mode 100644
index e9422f1daa..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1030-dts-bcm2712-Set-default-I2C-baudrates-to-100kHz.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 0339c8c61ca6b54c529f699e7bafd65cda9f3733 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 16 Oct 2023 09:06:25 +0100
-Subject: [PATCH] dts: bcm2712: Set default I2C baudrates to 100kHz
-
-The RP1 I2C interfaces were being left with their default clock rates,
-apparently 400kHz.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2712-rpi-5-b.dts | 2 ++
- arch/arm/boot/dts/bcm2712-rpi.dtsi    | 2 ++
- 2 files changed, 4 insertions(+)
-
---- a/arch/arm/boot/dts/bcm2712-rpi-5-b.dts
-+++ b/arch/arm/boot/dts/bcm2712-rpi-5-b.dts
-@@ -250,11 +250,13 @@ i2c0mux: &rp1_gpio {};
- i2c_csi_dsi0: &i2c6 { // Note: This is for MIPI0 connector only
- 	pinctrl-0 = <&rp1_i2c6_38_39>;
- 	pinctrl-names = "default";
-+	clock-frequency = <100000>;
- };
- 
- i2c_csi_dsi1: &i2c4 { // Note: This is for MIPI1 connector only
- 	pinctrl-0 = <&rp1_i2c4_40_41>;
- 	pinctrl-names = "default";
-+	clock-frequency = <100000>;
- };
- 
- i2c_csi_dsi: &i2c_csi_dsi1 { }; // An alias for compatibility
---- a/arch/arm/boot/dts/bcm2712-rpi.dtsi
-+++ b/arch/arm/boot/dts/bcm2712-rpi.dtsi
-@@ -204,11 +204,13 @@ uart4: &rp1_uart4 { };
- i2c_vc: &i2c0 {      // This is pins 27,28 on the header (not MIPI)
- 	pinctrl-0 = <&rp1_i2c0_0_1>;
- 	pinctrl-names = "default";
-+	clock-frequency = <100000>;
- };
- 
- i2c_arm: &i2c1 {
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&rp1_i2c1_2_3>;
-+	clock-frequency = <100000>;
- };
- 
- &i2c2 {
diff --git a/target/linux/bcm27xx/patches-6.1/950-1031-vc_mem-Add-the-DMA-memcpy-support-from-bcm2708_fb.patch b/target/linux/bcm27xx/patches-6.1/950-1031-vc_mem-Add-the-DMA-memcpy-support-from-bcm2708_fb.patch
deleted file mode 100644
index 23d428789f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1031-vc_mem-Add-the-DMA-memcpy-support-from-bcm2708_fb.patch
+++ /dev/null
@@ -1,345 +0,0 @@
-From 2a47ccf97c6a91bc56f8cfb387d47f59cc347dd5 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Sat, 14 Oct 2023 14:57:49 +0100
-Subject: [PATCH] vc_mem: Add the DMA memcpy support from bcm2708_fb
-
-bcm2708_fb is disabled by the vc4-kms-v3d overlay, which means that the
-DMA memcpy support it provides is not available to allow vclog to read
-the VC logs from the top 16MB on Pi 2 and Pi 3. Add the code to the
-vc_mem driver, which will still be enabled.
-
-It ought to be possible to do a proper DMA_MEM_TO_MEM copy via the
-generic DMA customer API, but that can be a later step.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/char/broadcom/vc_mem.c | 259 +++++++++++++++++++++++++++++++++
- 1 file changed, 259 insertions(+)
-
---- a/drivers/char/broadcom/vc_mem.c
-+++ b/drivers/char/broadcom/vc_mem.c
-@@ -23,9 +23,21 @@
- #include <linux/uaccess.h>
- #include <linux/dma-mapping.h>
- #include <linux/broadcom/vc_mem.h>
-+#include <linux/compat.h>
-+#include <linux/platform_data/dma-bcm2708.h>
-+#include <soc/bcm2835/raspberrypi-firmware.h>
- 
- #define DRIVER_NAME  "vc-mem"
- 
-+/* N.B. These use a different magic value for compatibility with bmc7208_fb */
-+#define VC_MEM_IOC_DMACOPY   _IOW('z', 0x22, struct vc_mem_dmacopy)
-+#define VC_MEM_IOC_DMACOPY32 _IOW('z', 0x22, struct vc_mem_dmacopy32)
-+
-+/* address with no aliases */
-+#define INTALIAS_NORMAL(x) ((x) & ~0xc0000000)
-+/* cache coherent but non-allocating in L1 and L2 */
-+#define INTALIAS_L1L2_NONALLOCATING(x) (((x) & ~0xc0000000) | 0x80000000)
-+
- /* Device (/dev) related variables */
- static dev_t vc_mem_devnum;
- static struct class *vc_mem_class;
-@@ -36,6 +48,20 @@ static int vc_mem_inited;
- static struct dentry *vc_mem_debugfs_entry;
- #endif
- 
-+struct vc_mem_dmacopy {
-+	void *dst;
-+	__u32 src;
-+	__u32 length;
-+};
-+
-+#ifdef CONFIG_COMPAT
-+struct vc_mem_dmacopy32 {
-+	compat_uptr_t dst;
-+	__u32 src;
-+	__u32 length;
-+};
-+#endif
-+
- /*
-  * Videocore memory addresses and size
-  *
-@@ -62,6 +88,20 @@ static uint phys_addr;
- static uint mem_size;
- static uint mem_base;
- 
-+struct vc_mem_dma {
-+	struct device *dev;
-+	int dma_chan;
-+	int dma_irq;
-+	void __iomem *dma_chan_base;
-+	wait_queue_head_t dma_waitq;
-+	void *cb_base;	/* DMA control blocks */
-+	dma_addr_t cb_handle;
-+};
-+
-+struct { u32 base, length; } gpu_mem;
-+static struct mutex dma_mutex;
-+static struct vc_mem_dma vc_mem_dma;
-+
- static int
- vc_mem_open(struct inode *inode, struct file *file)
- {
-@@ -99,6 +139,189 @@ vc_mem_get_current_size(void)
- }
- EXPORT_SYMBOL_GPL(vc_mem_get_current_size);
- 
-+static int
-+vc_mem_dma_init(void)
-+{
-+	struct vc_mem_dma *vcdma = &vc_mem_dma;
-+	struct platform_device *pdev;
-+	struct device_node *fwnode;
-+	struct rpi_firmware *fw;
-+	struct device *dev;
-+	u32 revision;
-+	int rc;
-+
-+	if (vcdma->dev)
-+		return 0;
-+
-+	fwnode = of_find_node_by_path("/system");
-+	rc = of_property_read_u32(fwnode, "linux,revision", &revision);
-+	revision = (revision >> 12) & 0xf;
-+	if (revision != 1 && revision != 2) {
-+		/* Only BCM2709 and BCM2710 may have logs where the ARMs
-+		 * can't see them.
-+		 */
-+		return -ENXIO;
-+	}
-+
-+	fwnode = rpi_firmware_find_node();
-+	if (!fwnode)
-+		return -ENXIO;
-+
-+	pdev = of_find_device_by_node(fwnode);
-+	dev = &pdev->dev;
-+
-+	rc = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32));
-+	if (rc)
-+		return rc;
-+
-+	fw = rpi_firmware_get(fwnode);
-+	if (!fw)
-+		return -ENXIO;
-+	rc = rpi_firmware_property(fw, RPI_FIRMWARE_GET_VC_MEMORY,
-+				   &gpu_mem, sizeof(gpu_mem));
-+	if (rc)
-+		return rc;
-+
-+	gpu_mem.base = INTALIAS_NORMAL(gpu_mem.base);
-+
-+	if (!gpu_mem.base || !gpu_mem.length) {
-+		dev_err(dev, "%s: unable to determine gpu memory (%x,%x)\n",
-+			__func__, gpu_mem.base, gpu_mem.length);
-+		return -EFAULT;
-+	}
-+
-+	vcdma->cb_base = dma_alloc_wc(dev, SZ_4K, &vcdma->cb_handle, GFP_KERNEL);
-+	if (!vcdma->cb_base) {
-+		dev_err(dev, "failed to allocate DMA CBs\n");
-+		return -ENOMEM;
-+	}
-+
-+	rc = bcm_dma_chan_alloc(BCM_DMA_FEATURE_BULK,
-+				&vcdma->dma_chan_base,
-+				&vcdma->dma_irq);
-+	if (rc < 0) {
-+		dev_err(dev, "failed to allocate a DMA channel\n");
-+		goto free_cb;
-+	}
-+
-+	vcdma->dma_chan = rc;
-+
-+	init_waitqueue_head(&vcdma->dma_waitq);
-+
-+	vcdma->dev = dev;
-+
-+	return 0;
-+
-+free_cb:
-+	dma_free_wc(dev, SZ_4K, vcdma->cb_base, vcdma->cb_handle);
-+
-+	return rc;
-+}
-+
-+static void
-+vc_mem_dma_uninit(void)
-+{
-+	struct vc_mem_dma *vcdma = &vc_mem_dma;
-+
-+	if (vcdma->dev) {
-+		bcm_dma_chan_free(vcdma->dma_chan);
-+		dma_free_wc(vcdma->dev, SZ_4K, vcdma->cb_base, vcdma->cb_handle);
-+		vcdma->dev = NULL;
-+	}
-+}
-+
-+static int dma_memcpy(struct vc_mem_dma *vcdma, dma_addr_t dst, dma_addr_t src,
-+		      int size)
-+{
-+	struct bcm2708_dma_cb *cb = vcdma->cb_base;
-+	int burst_size = (vcdma->dma_chan == 0) ? 8 : 2;
-+
-+	cb->info = BCM2708_DMA_BURST(burst_size) | BCM2708_DMA_S_WIDTH |
-+		   BCM2708_DMA_S_INC | BCM2708_DMA_D_WIDTH |
-+		   BCM2708_DMA_D_INC;
-+	cb->dst = dst;
-+	cb->src = src;
-+	cb->length = size;
-+	cb->stride = 0;
-+	cb->pad[0] = 0;
-+	cb->pad[1] = 0;
-+	cb->next = 0;
-+
-+	bcm_dma_start(vcdma->dma_chan_base, vcdma->cb_handle);
-+	bcm_dma_wait_idle(vcdma->dma_chan_base);
-+
-+	return 0;
-+}
-+
-+static long vc_mem_copy(struct vc_mem_dmacopy *ioparam)
-+{
-+	struct vc_mem_dma *vcdma = &vc_mem_dma;
-+	size_t size = PAGE_SIZE;
-+	const u32 dma_xfer_chunk = 256;
-+	u32 *buf = NULL;
-+	dma_addr_t bus_addr;
-+	long rc = 0;
-+	size_t offset;
-+
-+	/* restrict this to root user */
-+	if (!uid_eq(current_euid(), GLOBAL_ROOT_UID))
-+		return -EFAULT;
-+
-+	if (mutex_lock_interruptible(&dma_mutex))
-+		return -EINTR;
-+
-+	rc = vc_mem_dma_init();
-+	if (rc)
-+		goto out;
-+
-+	vcdma = &vc_mem_dma;
-+
-+	if (INTALIAS_NORMAL(ioparam->src) < gpu_mem.base ||
-+	    INTALIAS_NORMAL(ioparam->src) >= gpu_mem.base + gpu_mem.length) {
-+		pr_err("%s: invalid memory access %x (%x-%x)", __func__,
-+		       INTALIAS_NORMAL(ioparam->src), gpu_mem.base,
-+		       gpu_mem.base + gpu_mem.length);
-+		rc = -EFAULT;
-+		goto out;
-+	}
-+
-+	buf = dma_alloc_coherent(vcdma->dev, PAGE_ALIGN(size), &bus_addr,
-+				 GFP_ATOMIC);
-+	if (!buf) {
-+		rc = -ENOMEM;
-+		goto out;
-+	}
-+
-+	for (offset = 0; offset < ioparam->length; offset += size) {
-+		size_t remaining = ioparam->length - offset;
-+		size_t s = min(size, remaining);
-+		u8 *p = (u8 *)((uintptr_t)ioparam->src + offset);
-+		u8 *q = (u8 *)ioparam->dst + offset;
-+
-+		rc = dma_memcpy(vcdma, bus_addr,
-+				INTALIAS_L1L2_NONALLOCATING((u32)(uintptr_t)p),
-+				(s + dma_xfer_chunk - 1) & ~(dma_xfer_chunk - 1));
-+		if (rc) {
-+			dev_err(vcdma->dev, "dma_memcpy failed\n");
-+			break;
-+		}
-+		if (copy_to_user(q, buf, s) != 0) {
-+			pr_err("%s: copy_to_user failed\n", __func__);
-+			rc = -EFAULT;
-+			break;
-+		}
-+	}
-+
-+out:
-+	if (buf)
-+		dma_free_coherent(vcdma->dev, PAGE_ALIGN(size), buf,
-+				  bus_addr);
-+
-+	mutex_unlock(&dma_mutex);
-+
-+	return rc;
-+}
-+
- static long
- vc_mem_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
- {
-@@ -163,6 +386,21 @@ vc_mem_ioctl(struct file *file, unsigned
- 			}
- 			break;
- 		}
-+	case VC_MEM_IOC_DMACOPY:
-+		{
-+			struct vc_mem_dmacopy ioparam;
-+			/* Get the parameter data.
-+			 */
-+			if (copy_from_user
-+			    (&ioparam, (void *)arg, sizeof(ioparam))) {
-+				pr_err("%s: copy_from_user failed\n", __func__);
-+				rc = -EFAULT;
-+				break;
-+			}
-+
-+			rc = vc_mem_copy(&ioparam);
-+			break;
-+		}
- 	default:
- 		{
- 			return -ENOTTY;
-@@ -193,6 +431,24 @@ vc_mem_compat_ioctl(struct file *file, u
- 
- 		break;
- 
-+	case VC_MEM_IOC_DMACOPY32:
-+	{
-+		struct vc_mem_dmacopy32 param32;
-+		struct vc_mem_dmacopy param;
-+		/* Get the parameter data.
-+		 */
-+		if (copy_from_user(&param32, (void *)arg, sizeof(param32))) {
-+			pr_err("%s: copy_from_user failed\n", __func__);
-+			rc = -EFAULT;
-+			break;
-+		}
-+		param.dst = compat_ptr(param32.dst);
-+		param.src = param32.src;
-+		param.length = param32.length;
-+		rc = vc_mem_copy(&param);
-+		break;
-+	}
-+
- 	default:
- 		rc = vc_mem_ioctl(file, cmd, arg);
- 		break;
-@@ -330,6 +586,7 @@ vc_mem_init(void)
- 	vc_mem_debugfs_init(dev);
- #endif
- 
-+	mutex_init(&dma_mutex);
- 	vc_mem_inited = 1;
- 	return 0;
- 
-@@ -352,6 +609,7 @@ vc_mem_exit(void)
- {
- 	pr_debug("%s: called\n", __func__);
- 
-+	vc_mem_dma_uninit();
- 	if (vc_mem_inited) {
- #ifdef CONFIG_DEBUG_FS
- 		vc_mem_debugfs_deinit();
-@@ -360,6 +618,7 @@ vc_mem_exit(void)
- 		class_destroy(vc_mem_class);
- 		cdev_del(&vc_mem_cdev);
- 		unregister_chrdev_region(vc_mem_devnum, 1);
-+		vc_mem_inited = 0;
- 	}
- }
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1032-drm-vc4-Correct-address-offset-for-planes-with-src_-.patch b/target/linux/bcm27xx/patches-6.1/950-1032-drm-vc4-Correct-address-offset-for-planes-with-src_-.patch
deleted file mode 100644
index 32112f949b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1032-drm-vc4-Correct-address-offset-for-planes-with-src_-.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 6ab30a5dd3fb2ccbd918f147e91eb9bfe9849970 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Mon, 16 Oct 2023 12:13:38 +0100
-Subject: [PATCH] drm/vc4: Correct address offset for planes with src_[xy]
- offsets
-
-11cf37e741b4 switched to using drm_fb_dma_get_gem_addr instead of
-drm_fb_dma_get_gem_obj and adding fb->offset[].
-
-However the tiled formats need to compute the offset in a more
-involved manner than drm_fb_dma_get_gem_addr applies, and we
-were ending up with the offset for src_[xy] being applied twice.
-
-Switch back to using drm_fb_dma_get_gem_obj and fully computing
-the offsets ourselves.
-
-Fixes: 11cf37e741b4 ("drm/vc4: Move the buffer offset out of the vc4_plane_state")
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_plane.c | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_plane.c
-+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -1447,9 +1447,9 @@ static int vc4_plane_mode_set(struct drm
- 	vc4_state->ptr0_offset[0] = vc4_state->dlist_count;
- 
- 	for (i = 0; i < num_planes; i++) {
--		dma_addr_t paddr = drm_fb_dma_get_gem_addr(fb, state, i);
-+		struct drm_gem_dma_object *bo = drm_fb_dma_get_gem_obj(fb, i);
- 
--		vc4_dlist_write(vc4_state, paddr + offsets[i]);
-+		vc4_dlist_write(vc4_state, bo->dma_addr + fb->offsets[i] + offsets[i]);
- 	}
- 
- 	/* Pointer Context Word 0/1/2: Written by the HVS */
-@@ -1842,9 +1842,8 @@ static int vc6_plane_mode_set(struct drm
- 	 * TODO: This only covers Raster Scan Order planes
- 	 */
- 	for (i = 0; i < num_planes; i++) {
--		dma_addr_t paddr = drm_fb_dma_get_gem_addr(fb, state, i);
--
--		paddr += offsets[i];
-+		struct drm_gem_dma_object *bo = drm_fb_dma_get_gem_obj(fb, i);
-+		dma_addr_t paddr = bo->dma_addr + fb->offsets[i] + offsets[i];
- 
- 		/* Pointer Word 0 */
- 		vc4_state->ptr0_offset[i] = vc4_state->dlist_count;
diff --git a/target/linux/bcm27xx/patches-6.1/950-1033-drivers-media-rp1_cfe-Fix-link-validate-test-for-pix.patch b/target/linux/bcm27xx/patches-6.1/950-1033-drivers-media-rp1_cfe-Fix-link-validate-test-for-pix.patch
deleted file mode 100644
index 3e1d504da0..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1033-drivers-media-rp1_cfe-Fix-link-validate-test-for-pix.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From c14550658832026e82111f2a89b3f7bf567afc1c Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Tue, 17 Oct 2023 09:35:44 +0100
-Subject: [PATCH] drivers: media: rp1_cfe: Fix link validate test for pixel
- format
-
-Now that we have removed unique PISP media bus codes, the cfe format
-table has multiple entries with the same media bus code for 16-bit
-formats. The test in cfe_video_link_validate() did not account for this.
-Fix it by testing the media bus code and the V4L2 pixelformat 4cc
-together.
-
-As a drive-by, ensure we have a valid CSI2 datatype id when programming
-the hardware block.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- .../media/platform/raspberrypi/rp1_cfe/cfe.c  | 19 ++++++++++++++++---
- 1 file changed, 16 insertions(+), 3 deletions(-)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-@@ -786,6 +786,9 @@ static void cfe_start_channel(struct cfe
- 		width = source_fmt->width;
- 		height = source_fmt->height;
- 
-+		/* Must have a valid CSI2 datatype. */
-+		WARN_ON(!fmt->csi_dt);
-+
- 		/*
- 		 * Start the associated CSI2 Channel as well.
- 		 *
-@@ -809,6 +812,9 @@ static void cfe_start_channel(struct cfe
- 			node_desc[node->id].link_pad - CSI2_NUM_CHANNELS);
- 		fmt = find_format_by_code(source_fmt->code);
- 
-+		/* Must have a valid CSI2 datatype. */
-+		WARN_ON(!fmt->csi_dt);
-+
- 		if (is_image_output_node(node)) {
- 			width = source_fmt->width;
- 			height = source_fmt->height;
-@@ -1504,7 +1510,8 @@ static int cfe_video_link_validate(struc
- 
- 	if (is_image_output_node(node)) {
- 		struct v4l2_pix_format *pix_fmt = &node->fmt.fmt.pix;
--		const struct cfe_fmt *fmt;
-+		const struct cfe_fmt *fmt = NULL;
-+		unsigned int i;
- 
- 		if (source_fmt->width != pix_fmt->width ||
- 		    source_fmt->height != pix_fmt->height) {
-@@ -1516,8 +1523,14 @@ static int cfe_video_link_validate(struc
- 			goto out;
- 		}
- 
--		fmt = find_format_by_code(source_fmt->code);
--		if (!fmt || fmt->fourcc != pix_fmt->pixelformat) {
-+		for (i = 0; i < ARRAY_SIZE(formats); i++) {
-+			if (formats[i].code == source_fmt->code &&
-+			    formats[i].fourcc == pix_fmt->pixelformat) {
-+				fmt = &formats[i];
-+				break;
-+			}
-+		}
-+		if (!fmt) {
- 			cfe_err("Format mismatch!\n");
- 			ret = -EINVAL;
- 			goto out;
diff --git a/target/linux/bcm27xx/patches-6.1/950-1034-dts-bcm2712-Use-the-new-model-name.patch b/target/linux/bcm27xx/patches-6.1/950-1034-dts-bcm2712-Use-the-new-model-name.patch
deleted file mode 100644
index f30456835a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1034-dts-bcm2712-Use-the-new-model-name.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From b6bfece0d9ddf21e1526fead81340ef02f98f6ad Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 17 Oct 2023 17:28:11 +0100
-Subject: [PATCH] dts: bcm2712: Use the new model name
-
-"Model B" is no more - "Raspberry Pi 5" is the official name.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2712-rpi-5-b.dts | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/arm/boot/dts/bcm2712-rpi-5-b.dts
-+++ b/arch/arm/boot/dts/bcm2712-rpi-5-b.dts
-@@ -52,7 +52,7 @@
- 
- / {
- 	compatible = "raspberrypi,5-model-b", "brcm,bcm2712";
--	model = "Raspberry Pi 5 Model B";
-+	model = "Raspberry Pi 5";
- 
- 	/* Will be filled by the bootloader */
- 	memory@0 {
diff --git a/target/linux/bcm27xx/patches-6.1/950-1035-fbdev-Allow-client-to-request-a-particular-dev-fbN-n.patch b/target/linux/bcm27xx/patches-6.1/950-1035-fbdev-Allow-client-to-request-a-particular-dev-fbN-n.patch
deleted file mode 100644
index df87a1b757..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1035-fbdev-Allow-client-to-request-a-particular-dev-fbN-n.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 0c7fb448e0e0e47c2b3be64e438208682c6a5e61 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Mon, 9 Oct 2023 16:32:45 +0100
-Subject: [PATCH] fbdev: Allow client to request a particular /dev/fbN node
-
-Add a flag custom_fb_num to denote that the client has
-requested a specific fbdev node number via node.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/video/fbdev/core/fbmem.c | 24 +++++++++++++++++-------
- include/linux/fb.h               |  2 ++
- 2 files changed, 19 insertions(+), 7 deletions(-)
-
---- a/drivers/video/fbdev/core/fbmem.c
-+++ b/drivers/video/fbdev/core/fbmem.c
-@@ -52,6 +52,7 @@ static DEFINE_MUTEX(registration_lock);
- 
- struct fb_info *registered_fb[FB_MAX] __read_mostly;
- int num_registered_fb __read_mostly;
-+int min_dynamic_fb __read_mostly;
- #define for_each_registered_fb(i)		\
- 	for (i = 0; i < FB_MAX; i++)		\
- 		if (!registered_fb[i]) {} else
-@@ -1579,19 +1580,22 @@ static int do_register_framebuffer(struc
- 		return -ENXIO;
- 
- 	num_registered_fb++;
--	for (i = 0 ; i < FB_MAX; i++)
--		if (!registered_fb[i])
--			break;
--	fb_info->node = i;
-+	if (!fb_info->custom_fb_num || fb_info->node >= FB_MAX || registered_fb[fb_info->node]) {
-+		for (i = min_dynamic_fb ; i < FB_MAX; i++)
-+			if (!registered_fb[i])
-+				break;
-+		fb_info->node = i;
-+	}
- 	refcount_set(&fb_info->count, 1);
- 	mutex_init(&fb_info->lock);
- 	mutex_init(&fb_info->mm_lock);
- 
- 	fb_info->dev = device_create(fb_class, fb_info->device,
--				     MKDEV(FB_MAJOR, i), NULL, "fb%d", i);
-+				     MKDEV(FB_MAJOR, fb_info->node), NULL, "fb%d", fb_info->node);
- 	if (IS_ERR(fb_info->dev)) {
- 		/* Not fatal */
--		printk(KERN_WARNING "Unable to create device for framebuffer %d; errno = %ld\n", i, PTR_ERR(fb_info->dev));
-+		printk(KERN_WARNING "Unable to create device for framebuffer %d; errno = %ld\n",
-+		       fb_info->node, PTR_ERR(fb_info->dev));
- 		fb_info->dev = NULL;
- 	} else
- 		fb_init_device(fb_info);
-@@ -1624,7 +1628,7 @@ static int do_register_framebuffer(struc
- 
- 	fb_var_to_videomode(&mode, &fb_info->var);
- 	fb_add_videomode(&mode, &fb_info->modelist);
--	registered_fb[i] = fb_info;
-+	registered_fb[fb_info->node] = fb_info;
- 
- #ifdef CONFIG_GUMSTIX_AM200EPD
- 	{
-@@ -1719,6 +1723,12 @@ static int fb_aperture_acquire_for_platf
- 	return ret;
- }
- 
-+void fb_set_lowest_dynamic_fb(int min_fb_dev)
-+{
-+	min_dynamic_fb = min_fb_dev;
-+}
-+EXPORT_SYMBOL(fb_set_lowest_dynamic_fb);
-+
- /**
-  *	register_framebuffer - registers a frame buffer device
-  *	@fb_info: frame buffer info structure
---- a/include/linux/fb.h
-+++ b/include/linux/fb.h
-@@ -512,6 +512,7 @@ struct fb_info {
- 	} *apertures;
- 
- 	bool skip_vt_switch; /* no VT switch on suspend/resume required */
-+	bool custom_fb_num; /* Use value in node as the preferred node number */
- };
- 
- static inline struct apertures_struct *alloc_apertures(unsigned int max_num) {
-@@ -614,6 +615,7 @@ extern ssize_t fb_sys_write(struct fb_in
- 			    size_t count, loff_t *ppos);
- 
- /* drivers/video/fbmem.c */
-+extern void fb_set_lowest_dynamic_fb(int min_fb_dev);
- extern int register_framebuffer(struct fb_info *fb_info);
- extern void unregister_framebuffer(struct fb_info *fb_info);
- extern int fb_prepare_logo(struct fb_info *fb_info, int rotate);
diff --git a/target/linux/bcm27xx/patches-6.1/950-1036-drm-fb-helper-Look-up-preferred-fbdev-node-number-fr.patch b/target/linux/bcm27xx/patches-6.1/950-1036-drm-fb-helper-Look-up-preferred-fbdev-node-number-fr.patch
deleted file mode 100644
index 3e360be77b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1036-drm-fb-helper-Look-up-preferred-fbdev-node-number-fr.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 1216ea56c2e30aee4975b4dcce79ebd199afaf8f Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Mon, 9 Oct 2023 16:34:36 +0100
-Subject: [PATCH] drm/fb-helper: Look up preferred fbdev node number from DT
-
-For situations where there are multiple DRM cards in a system,
-add a query of DT for "drm_fb" designations for cards to set
-their preferred /dev/fbN designation.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/drm_fb_helper.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/drm_fb_helper.c
-+++ b/drivers/gpu/drm/drm_fb_helper.c
-@@ -1932,7 +1932,7 @@ __drm_fb_helper_initial_config_and_unloc
- 	struct drm_device *dev = fb_helper->dev;
- 	struct fb_info *info;
- 	unsigned int width, height;
--	int ret;
-+	int ret, id;
- 
- 	width = dev->mode_config.max_width;
- 	height = dev->mode_config.max_height;
-@@ -1967,6 +1967,15 @@ __drm_fb_helper_initial_config_and_unloc
- 	 * register the fbdev emulation instance in kernel_fb_helper_list. */
- 	mutex_unlock(&fb_helper->lock);
- 
-+	id = of_alias_get_highest_id("drm_fb");
-+	if (id >= 0)
-+		fb_set_lowest_dynamic_fb(id + 1);
-+
-+	id = of_alias_get_id(dev->dev->of_node, "drm_fb");
-+	if (id >= 0) {
-+		info->node = id;
-+		info->custom_fb_num = true;
-+	}
- 	ret = register_framebuffer(info);
- 	if (ret < 0)
- 		return ret;
diff --git a/target/linux/bcm27xx/patches-6.1/950-1037-dt-Add-overrides-for-drm-framebuffer-allocations-on-.patch b/target/linux/bcm27xx/patches-6.1/950-1037-dt-Add-overrides-for-drm-framebuffer-allocations-on-.patch
deleted file mode 100644
index 924c1b9f19..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1037-dt-Add-overrides-for-drm-framebuffer-allocations-on-.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 61b138adaeaddefe749f421a3b69c67d4a49a8e3 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 11 Oct 2023 11:03:51 +0100
-Subject: [PATCH] dt: Add overrides for drm framebuffer allocations on Pi5
-
-Adds dtparam overrides to the base Pi5 DT such that vc4,
-DSI0, DSI1, or DPI can be requested to be /dev/fb[012].
-No override is specified by default, so the order will be
-based on probe order (aka semi-random). Any device that
-doesn't have an override specified will be placed above
-all specified overrides. Having an fb1 or fb2 override but
-no fb0 one will result in no console via fbcon.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2712-rpi-5-b.dts | 12 ++++++++++++
- arch/arm/boot/dts/overlays/README     | 24 ++++++++++++++++++++++++
- 2 files changed, 36 insertions(+)
-
---- a/arch/arm/boot/dts/bcm2712-rpi-5-b.dts
-+++ b/arch/arm/boot/dts/bcm2712-rpi-5-b.dts
-@@ -824,5 +824,17 @@ spi10_cs_pins: &spi10_cs_gpio1 {};
- 		act_led_trigger = <&act_led>, "linux,default-trigger";
- 		pwr_led_activelow = <&pwr_led>, "gpios:8";
- 		pwr_led_trigger = <&pwr_led>, "linux,default-trigger";
-+		drm_fb0_rp1_dsi0 = <&aliases>, "drm_fb0=",&dsi0;
-+		drm_fb0_rp1_dsi1 = <&aliases>, "drm_fb0=",&dsi1;
-+		drm_fb0_rp1_dpi = <&aliases>, "drm_fb0=",&dpi;
-+		drm_fb0_vc4 = <&aliases>, "drm_fb0=",&vc4;
-+		drm_fb1_rp1_dsi0 = <&aliases>, "drm_fb1=",&dsi0;
-+		drm_fb1_rp1_dsi1 = <&aliases>, "drm_fb1=",&dsi1;
-+		drm_fb1_rp1_dpi = <&aliases>, "drm_fb1=",&dpi;
-+		drm_fb1_vc4 = <&aliases>, "drm_fb1=",&vc4;
-+		drm_fb2_rp1_dsi0 = <&aliases>, "drm_fb2=",&dsi0;
-+		drm_fb2_rp1_dsi1 = <&aliases>, "drm_fb2=",&dsi1;
-+		drm_fb2_rp1_dpi = <&aliases>, "drm_fb2=",&dpi;
-+		drm_fb2_vc4 = <&aliases>, "drm_fb2=",&vc4;
- 	};
- };
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -173,6 +173,30 @@ Params:
-         cooling_fan             Enables the Pi 5 cooling fan (enabled
-                                 automatically by the firmware)
- 
-+        drm_fb0_rp1_dpi         Assign /dev/fb0 to the RP1 DPI output
-+
-+        drm_fb0_rp1_dsi0        Assign /dev/fb0 to the RP1 DSI0 output
-+
-+        drm_fb0_rp1_dsi1        Assign /dev/fb0 to the RP1 DSI1 output
-+
-+        drm_fb0_vc4             Assign /dev/fb0 to the vc4 outputs
-+
-+        drm_fb1_rp1_dpi         Assign /dev/fb1 to the RP1 DPI output
-+
-+        drm_fb1_rp1_dsi0        Assign /dev/fb1 to the RP1 DSI0 output
-+
-+        drm_fb1_rp1_dsi1        Assign /dev/fb1 to the RP1 DSI1 output
-+
-+        drm_fb1_vc4             Assign /dev/fb1 to the vc4 outputs
-+
-+        drm_fb2_rp1_dpi         Assign /dev/fb2 to the RP1 DPI output
-+
-+        drm_fb2_rp1_dsi0        Assign /dev/fb2 to the RP1 DSI0 output
-+
-+        drm_fb2_rp1_dsi1        Assign /dev/fb2 to the RP1 DSI1 output
-+
-+        drm_fb2_vc4             Assign /dev/fb2 to the vc4 outputs
-+
-         eee                     Enable Energy Efficient Ethernet support for
-                                 compatible devices (default "on"). See also
-                                 "tx_lpi_timer". Pi3B+ only.
diff --git a/target/linux/bcm27xx/patches-6.1/950-1039-drm-connector-Change-DRM-card-alias-from-underscore-.patch b/target/linux/bcm27xx/patches-6.1/950-1039-drm-connector-Change-DRM-card-alias-from-underscore-.patch
deleted file mode 100644
index 57782d51c3..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1039-drm-connector-Change-DRM-card-alias-from-underscore-.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f429fc1a072d4bb35e622a1012a5a52914eba4e3 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 19 Oct 2023 10:34:58 +0100
-Subject: [PATCH] drm/connector: Change DRM card alias from underscore to
- hyphen
-
-Apparently aliases are only allowed lower case and hyphens,
-so swap the use of underscore to hyphen.
-
-Fixes: 3aa1f2477545 ("drm: Look for an alias for the displays to use as the DRM device name")
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/drm_connector.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/drm_connector.c
-+++ b/drivers/gpu/drm/drm_connector.c
-@@ -112,7 +112,7 @@ static struct drm_conn_prop_enum_list dr
- };
- 
- #define MAX_DT_NODE_NAME_LEN	20
--#define DT_DRM_NODE_PREFIX	"drm_"
-+#define DT_DRM_NODE_PREFIX	"drm-"
- 
- static void drm_connector_get_of_name(int type, char *node_name, int length)
- {
diff --git a/target/linux/bcm27xx/patches-6.1/950-1040-dt-Alter-alias-names-from-_-to-for-drm_dsiN.patch b/target/linux/bcm27xx/patches-6.1/950-1040-dt-Alter-alias-names-from-_-to-for-drm_dsiN.patch
deleted file mode 100644
index 0536924d05..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1040-dt-Alter-alias-names-from-_-to-for-drm_dsiN.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e33170e21494279801e9f17eeb910ec45ebd740c Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 19 Oct 2023 10:28:43 +0100
-Subject: [PATCH] dt: Alter alias names from _ to - for drm_dsiN
-
-Fixes: 7ec42740a45b ("dt: Add DSI1 and DSI2 aliases to 2712")
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2712-rpi-5-b.dts | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/arch/arm/boot/dts/bcm2712-rpi-5-b.dts
-+++ b/arch/arm/boot/dts/bcm2712-rpi-5-b.dts
-@@ -787,8 +787,8 @@ spi10_cs_pins: &spi10_cs_gpio1 {};
- 		gpio4 = &pinctrl_aon;
- 		usb0 = &rp1_usb0;
- 		usb1 = &rp1_usb1;
--		drm_dsi1 = &dsi0;
--		drm_dsi2 = &dsi1;
-+		drm-dsi1 = &dsi0;
-+		drm-dsi2 = &dsi1;
- 	};
- 
- 	__overrides__ {
diff --git a/target/linux/bcm27xx/patches-6.1/950-1041-drm-fb_helper-Change-query-for-FB-designation-from-d.patch b/target/linux/bcm27xx/patches-6.1/950-1041-drm-fb_helper-Change-query-for-FB-designation-from-d.patch
deleted file mode 100644
index 78e5b89be4..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1041-drm-fb_helper-Change-query-for-FB-designation-from-d.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0e9e925112fabdbd448e17947796317a6dbca96e Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 19 Oct 2023 10:32:04 +0100
-Subject: [PATCH] drm/fb_helper: Change query for FB designation from drm_fb to
- drm-fb
-
-Fixes: 1216ea56c2e3 ("drm/fb-helper: Look up preferred fbdev node number from DT")
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/drm_fb_helper.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/gpu/drm/drm_fb_helper.c
-+++ b/drivers/gpu/drm/drm_fb_helper.c
-@@ -1967,11 +1967,11 @@ __drm_fb_helper_initial_config_and_unloc
- 	 * register the fbdev emulation instance in kernel_fb_helper_list. */
- 	mutex_unlock(&fb_helper->lock);
- 
--	id = of_alias_get_highest_id("drm_fb");
-+	id = of_alias_get_highest_id("drm-fb");
- 	if (id >= 0)
- 		fb_set_lowest_dynamic_fb(id + 1);
- 
--	id = of_alias_get_id(dev->dev->of_node, "drm_fb");
-+	id = of_alias_get_id(dev->dev->of_node, "drm-fb");
- 	if (id >= 0) {
- 		info->node = id;
- 		info->custom_fb_num = true;
diff --git a/target/linux/bcm27xx/patches-6.1/950-1042-dt-Alter-alias-names-from-_-to-for-drm_fbN_-override.patch b/target/linux/bcm27xx/patches-6.1/950-1042-dt-Alter-alias-names-from-_-to-for-drm_fbN_-override.patch
deleted file mode 100644
index 42865dc7ff..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1042-dt-Alter-alias-names-from-_-to-for-drm_fbN_-override.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 87be94059193d0bc64d52a9535df4fb1891c72fe Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 19 Oct 2023 10:29:20 +0100
-Subject: [PATCH] dt: Alter alias names from _ to - for drm_fbN_* overrides
-
-Fixes: 61b138adaead ("dt: Add overrides for drm framebuffer allocations on Pi5")
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2712-rpi-5-b.dts | 24 ++++++++++++------------
- 1 file changed, 12 insertions(+), 12 deletions(-)
-
---- a/arch/arm/boot/dts/bcm2712-rpi-5-b.dts
-+++ b/arch/arm/boot/dts/bcm2712-rpi-5-b.dts
-@@ -824,17 +824,17 @@ spi10_cs_pins: &spi10_cs_gpio1 {};
- 		act_led_trigger = <&act_led>, "linux,default-trigger";
- 		pwr_led_activelow = <&pwr_led>, "gpios:8";
- 		pwr_led_trigger = <&pwr_led>, "linux,default-trigger";
--		drm_fb0_rp1_dsi0 = <&aliases>, "drm_fb0=",&dsi0;
--		drm_fb0_rp1_dsi1 = <&aliases>, "drm_fb0=",&dsi1;
--		drm_fb0_rp1_dpi = <&aliases>, "drm_fb0=",&dpi;
--		drm_fb0_vc4 = <&aliases>, "drm_fb0=",&vc4;
--		drm_fb1_rp1_dsi0 = <&aliases>, "drm_fb1=",&dsi0;
--		drm_fb1_rp1_dsi1 = <&aliases>, "drm_fb1=",&dsi1;
--		drm_fb1_rp1_dpi = <&aliases>, "drm_fb1=",&dpi;
--		drm_fb1_vc4 = <&aliases>, "drm_fb1=",&vc4;
--		drm_fb2_rp1_dsi0 = <&aliases>, "drm_fb2=",&dsi0;
--		drm_fb2_rp1_dsi1 = <&aliases>, "drm_fb2=",&dsi1;
--		drm_fb2_rp1_dpi = <&aliases>, "drm_fb2=",&dpi;
--		drm_fb2_vc4 = <&aliases>, "drm_fb2=",&vc4;
-+		drm_fb0_rp1_dsi0 = <&aliases>, "drm-fb0=",&dsi0;
-+		drm_fb0_rp1_dsi1 = <&aliases>, "drm-fb0=",&dsi1;
-+		drm_fb0_rp1_dpi = <&aliases>, "drm-fb0=",&dpi;
-+		drm_fb0_vc4 = <&aliases>, "drm-fb0=",&vc4;
-+		drm_fb1_rp1_dsi0 = <&aliases>, "drm-fb1=",&dsi0;
-+		drm_fb1_rp1_dsi1 = <&aliases>, "drm-fb1=",&dsi1;
-+		drm_fb1_rp1_dpi = <&aliases>, "drm-fb1=",&dpi;
-+		drm_fb1_vc4 = <&aliases>, "drm-fb1=",&vc4;
-+		drm_fb2_rp1_dsi0 = <&aliases>, "drm-fb2=",&dsi0;
-+		drm_fb2_rp1_dsi1 = <&aliases>, "drm-fb2=",&dsi1;
-+		drm_fb2_rp1_dpi = <&aliases>, "drm-fb2=",&dpi;
-+		drm_fb2_vc4 = <&aliases>, "drm-fb2=",&vc4;
- 	};
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-1044-Typo-in-overlays-README.patch b/target/linux/bcm27xx/patches-6.1/950-1044-Typo-in-overlays-README.patch
deleted file mode 100644
index 19720e8645..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1044-Typo-in-overlays-README.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From cb8a4adb586c5e926e415ac0dae3ffb4af30b0a9 Mon Sep 17 00:00:00 2001
-From: Andrew Scheller <andrew.scheller@raspberrypi.com>
-Date: Thu, 19 Oct 2023 14:13:36 +0100
-Subject: [PATCH] Typo in overlays README
-
-touchscreen-size-y for rpi-ft5406 defaults to 480, not 600
----
- arch/arm/boot/dts/overlays/README | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -3738,7 +3738,7 @@ Name:   rpi-ft5406
- Info:   Official Raspberry Pi display touchscreen
- Load:   dtoverlay=rpi-ft5406,<param>=<val>
- Params: touchscreen-size-x      Touchscreen X resolution (default 800)
--        touchscreen-size-y      Touchscreen Y resolution (default 600);
-+        touchscreen-size-y      Touchscreen Y resolution (default 480);
-         touchscreen-inverted-x  Invert touchscreen X coordinates (default 0);
-         touchscreen-inverted-y  Invert touchscreen Y coordinates (default 0);
-         touchscreen-swapped-x-y Swap X and Y cordinates (default 0);
diff --git a/target/linux/bcm27xx/patches-6.1/950-1045-dts-bcm2712-Add-the-krnbt-parameter.patch b/target/linux/bcm27xx/patches-6.1/950-1045-dts-bcm2712-Add-the-krnbt-parameter.patch
deleted file mode 100644
index 95940dd830..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1045-dts-bcm2712-Add-the-krnbt-parameter.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 4cb97982f88d8fb623ace5a9511198e442e993ba Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Fri, 20 Oct 2023 17:15:25 +0100
-Subject: [PATCH] dts: bcm2712: Add the krnbt parameter
-
-Add a Pi 5 implementation of the krnbt parameter, for symmetry and
-for tinkering purposes.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2712-rpi-5-b.dts | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/arch/arm/boot/dts/bcm2712-rpi-5-b.dts
-+++ b/arch/arm/boot/dts/bcm2712-rpi-5-b.dts
-@@ -809,6 +809,7 @@ spi10_cs_pins: &spi10_cs_gpio1 {};
- 		i2c_baudrate = <&i2c_arm>, "clock-frequency:0";
- 		i2c_arm_baudrate = <&i2c_arm>, "clock-frequency:0";
- 		i2c_vc_baudrate = <&i2c_vc>, "clock-frequency:0";
-+		krnbt = <&bluetooth>, "status";
- 		nvme = <&pciex1>, "status";
- 		pciex1 = <&pciex1>, "status";
- 		pciex1_gen = <&pciex1> , "max-link-speed:0";
diff --git a/target/linux/bcm27xx/patches-6.1/950-1047-drm-vc4_fkms-Fix-up-interrupt-handler-for-both-2835-.patch b/target/linux/bcm27xx/patches-6.1/950-1047-drm-vc4_fkms-Fix-up-interrupt-handler-for-both-2835-.patch
deleted file mode 100644
index 99b8426e1c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1047-drm-vc4_fkms-Fix-up-interrupt-handler-for-both-2835-.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 4137b49989ce710305e476d0bd1086d7d906ff50 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 20 Oct 2023 17:09:54 +0100
-Subject: [PATCH] drm/vc4_fkms: Fix up interrupt handler for both 2835/2711 and
- 2712
-
-2712 has switched from using the SMI peripheral to another interrupt
-source for the vsync interrupt, so handle both sources cleanly.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_firmware_kms.c | 48 ++++++++++++++++++++------
- 1 file changed, 38 insertions(+), 10 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-+++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-@@ -47,9 +47,15 @@ struct get_display_cfg {
- 	u32  max_pixel_clock[2];  //Max pixel clock for each display
- };
- 
-+enum vc4_fkms_revision {
-+	BCM2835_6_7,
-+	BCM2711,
-+	BCM2712,
-+};
-+
- struct vc4_fkms {
- 	struct get_display_cfg cfg;
--	bool bcm2711;
-+	enum vc4_fkms_revision revision;
- };
- 
- #define PLANES_PER_CRTC		8
-@@ -1149,7 +1155,7 @@ vc4_crtc_mode_valid(struct drm_crtc *crt
- 	/* Pi4 can't generate odd horizontal timings on HDMI, so reject modes
- 	 * that would set them.
- 	 */
--	if (fkms->bcm2711 &&
-+	if (fkms->revision >= BCM2711 &&
- 	    (vc4_crtc->display_number == 2 || vc4_crtc->display_number == 7) &&
- 	    !(mode->flags & DRM_MODE_FLAG_DBLCLK) &&
- 	    ((mode->hdisplay |				/* active */
-@@ -1267,6 +1273,20 @@ static irqreturn_t vc4_crtc_irq_handler(
- 	return ret;
- }
- 
-+static irqreturn_t vc4_crtc2712_irq_handler(int irq, void *data)
-+{
-+	struct vc4_crtc **crtc_list = data;
-+	int i;
-+
-+	for (i = 0; crtc_list[i]; i++) {
-+		if (crtc_list[i]->vblank_enabled)
-+			drm_crtc_handle_vblank(&crtc_list[i]->base);
-+		vc4_crtc_handle_page_flip(crtc_list[i]);
-+	}
-+
-+	return IRQ_HANDLED;
-+}
-+
- static int vc4_fkms_page_flip(struct drm_crtc *crtc,
- 			      struct drm_framebuffer *fb,
- 			      struct drm_pending_vblank_event *event,
-@@ -1352,9 +1372,12 @@ static const struct drm_crtc_helper_func
- };
- 
- static const struct of_device_id vc4_firmware_kms_dt_match[] = {
--	{ .compatible = "raspberrypi,rpi-firmware-kms" },
-+	{ .compatible = "raspberrypi,rpi-firmware-kms",
-+	  .data = (void *)BCM2835_6_7 },
- 	{ .compatible = "raspberrypi,rpi-firmware-kms-2711",
--	  .data = (void *)1 },
-+	  .data = (void *)BCM2711 },
-+	{ .compatible = "raspberrypi,rpi-firmware-kms-2712",
-+	  .data = (void *)BCM2712 },
- 	{}
- };
- 
-@@ -1924,8 +1947,7 @@ static int vc4_fkms_bind(struct device *
- 	match = of_match_device(vc4_firmware_kms_dt_match, dev);
- 	if (!match)
- 		return -ENODEV;
--	if (match->data)
--		fkms->bcm2711 = true;
-+	fkms->revision = (enum vc4_fkms_revision)match->data;
- 
- 	firmware_node = of_parse_phandle(dev->of_node, "brcm,firmware", 0);
- 	vc4->firmware = devm_rpi_firmware_get(&pdev->dev, firmware_node);
-@@ -1992,10 +2014,16 @@ static int vc4_fkms_bind(struct device *
- 		if (IS_ERR(crtc_list[0]->regs))
- 			DRM_ERROR("Oh dear, failed to map registers\n");
- 
--		writel(0, crtc_list[0]->regs + SMICS);
--		ret = devm_request_irq(dev, platform_get_irq(pdev, 0),
--				       vc4_crtc_irq_handler, 0,
--				       "vc4 firmware kms", crtc_list);
-+		if (fkms->revision >= BCM2712) {
-+			ret = devm_request_irq(dev, platform_get_irq(pdev, 0),
-+					       vc4_crtc2712_irq_handler, 0,
-+					       "vc4 firmware kms", crtc_list);
-+		} else {
-+			writel(0, crtc_list[0]->regs + SMICS);
-+			ret = devm_request_irq(dev, platform_get_irq(pdev, 0),
-+					       vc4_crtc_irq_handler, 0,
-+					       "vc4 firmware kms", crtc_list);
-+		}
- 		if (ret)
- 			DRM_ERROR("Oh dear, failed to register IRQ\n");
- 	} else {
diff --git a/target/linux/bcm27xx/patches-6.1/950-1048-dt-Switch-bcm2712-firmware-kms-node-to-using-the-271.patch b/target/linux/bcm27xx/patches-6.1/950-1048-dt-Switch-bcm2712-firmware-kms-node-to-using-the-271.patch
deleted file mode 100644
index 9dea2d0fff..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1048-dt-Switch-bcm2712-firmware-kms-node-to-using-the-271.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5a52cae54a05499a8487f392cf5dfc3d8a837e6f Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 20 Oct 2023 17:12:09 +0100
-Subject: [PATCH] dt: Switch bcm2712 firmware-kms node to using the 2712
- compatible
-
-With the new compatible to handle the interrupts correctly, switch
-the base dt to use it.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2712.dtsi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/arm/boot/dts/bcm2712.dtsi
-+++ b/arch/arm/boot/dts/bcm2712.dtsi
-@@ -103,7 +103,7 @@
- 		};
- 
- 		firmwarekms: firmwarekms@7d503000 {
--			compatible = "raspberrypi,rpi-firmware-kms";
-+			compatible = "raspberrypi,rpi-firmware-kms-2712";
- 			/* SUN_L2 interrupt reg */
- 			reg = <0x7d503000 0x18>;
- 			interrupt-parent = <&cpu_l2_irq>;
diff --git a/target/linux/bcm27xx/patches-6.1/950-1049-drivers-media-imx477-Disable-the-scaler.patch b/target/linux/bcm27xx/patches-6.1/950-1049-drivers-media-imx477-Disable-the-scaler.patch
deleted file mode 100644
index 841fa42440..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1049-drivers-media-imx477-Disable-the-scaler.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From f075893e9b0e241879998c0b12cf8af0ba7737da Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Mon, 23 Oct 2023 10:03:03 +0100
-Subject: [PATCH] drivers: media: imx477: Disable the scaler
-
-The horizontal scaler was enabled for the 2028x1520 and 2028x1080 modes,
-with a scale factor of 1. It caused a single column of bad pixels on the
-right edge of the image. Since scaling is not needed for these modes,
-disable it entirely.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/i2c/imx477.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/media/i2c/imx477.c
-+++ b/drivers/media/i2c/imx477.c
-@@ -632,7 +632,7 @@ static const struct imx477_reg mode_2028
- 	{0x9e9f, 0x00},
- 	{0xa2a9, 0x60},
- 	{0xa2b7, 0x00},
--	{0x0401, 0x01},
-+	{0x0401, 0x00},
- 	{0x0404, 0x00},
- 	{0x0405, 0x20},
- 	{0x0408, 0x00},
-@@ -733,7 +733,7 @@ static const struct imx477_reg mode_2028
- 	{0x9e9f, 0x00},
- 	{0xa2a9, 0x60},
- 	{0xa2b7, 0x00},
--	{0x0401, 0x01},
-+	{0x0401, 0x00},
- 	{0x0404, 0x00},
- 	{0x0405, 0x20},
- 	{0x0408, 0x00},
diff --git a/target/linux/bcm27xx/patches-6.1/950-1050-dt-Add-drm_fbN_vc4-overrides-for-Pi0-4.patch b/target/linux/bcm27xx/patches-6.1/950-1050-dt-Add-drm_fbN_vc4-overrides-for-Pi0-4.patch
deleted file mode 100644
index 77f30a345d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1050-dt-Add-drm_fbN_vc4-overrides-for-Pi0-4.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From eccaa8588fca9c9ec950664f1d5894bd826b57b0 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Mon, 23 Oct 2023 14:10:15 +0100
-Subject: [PATCH] dt: Add drm_fbN_vc4 overrides for Pi0-4
-
-Follows up '61b138adaead ("dt: Add overrides for drm framebuffer
-allocations on Pi5")' with an equivalent for Pi0-4.
-
-These will have no effect on most normal systems, but drm_fb0_vc4
-will stop SPI displays jumping in and claiming /dev/fb0.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- arch/arm/boot/dts/bcm270x-rpi.dtsi | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
---- a/arch/arm/boot/dts/bcm270x-rpi.dtsi
-+++ b/arch/arm/boot/dts/bcm270x-rpi.dtsi
-@@ -1,7 +1,7 @@
- /* Downstream modifications to bcm2835-rpi.dtsi */
- 
- / {
--	aliases {
-+	aliases: aliases {
- 		aux = &aux;
- 		sound = &sound;
- 		soc = &soc;
-@@ -98,6 +98,9 @@
- 		sdio_overclock = <&mmc>,"brcm,overclock-50:0",
- 				 <&mmcnr>,"brcm,overclock-50:0";
- 		axiperf      = <&axiperf>,"status";
-+		drm_fb0_vc4 = <&aliases>, "drm-fb0=",&vc4;
-+		drm_fb1_vc4 = <&aliases>, "drm-fb1=",&vc4;
-+		drm_fb2_vc4 = <&aliases>, "drm-fb2=",&vc4;
- 	};
- };
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1051-fixup-overlays-mcp23017-allow-specification-of-the-i.patch b/target/linux/bcm27xx/patches-6.1/950-1051-fixup-overlays-mcp23017-allow-specification-of-the-i.patch
deleted file mode 100644
index 5016e78778..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1051-fixup-overlays-mcp23017-allow-specification-of-the-i.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 3ed6d34d53e94ecbebc64c8fa3d1b6d3c41db8fb Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 24 Oct 2023 09:58:52 +0100
-Subject: [PATCH] fixup! overlays: mcp23017: allow specification of the i2c bus
-
-The incorrect fragment order (*) caused broke the interrupt usage, and
-while it was being fixed the lack of a reference to the pinctrl
-declaration was noticed.
-
-See: https://github.com/raspberrypi/linux/issues/5677
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
-
-(*) Ideally all fragments would appear in the file in the order in which
-they should be merged, but that is easy to forget and can be awkward, so
-the firmware merges all "intra" fragments (those that target other
-fragments in the overlay) before "inter" fragments (those that target
-the base DTB). However, intra fragments that target other intra
-fragments is a level of nesting too far for this logic to cope, so they
-must appear before the fragments they target.
----
- .../boot/dts/overlays/mcp23017-overlay.dts    | 42 ++++++++++---------
- 1 file changed, 22 insertions(+), 20 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/mcp23017-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/mcp23017-overlay.dts
-@@ -24,30 +24,13 @@
- 	};
- 
- 	fragment@2 {
--		target = <&i2cbus>;
--		__overlay__ {
--			#address-cells = <1>;
--			#size-cells = <0>;
--
--			mcp23017: mcp@20 {
--				compatible = "microchip,mcp23017";
--				reg = <0x20>;
--				gpio-controller;
--				#gpio-cells = <2>;
--
--				status = "okay";
--			};
--		};
--	};
--
--	fragment@3 {
- 		target = <&mcp23017>;
- 		__dormant__ {
- 			compatible = "microchip,mcp23008";
- 		};
- 	};
- 
--	fragment@4 {
-+	fragment@3 {
- 		target = <&mcp23017>;
- 		mcp23017_irq: __overlay__ {
- 			#interrupt-cells=<2>;
-@@ -58,6 +41,25 @@
- 		};
- 	};
- 
-+	fragment@4 {
-+		target = <&i2cbus>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			mcp23017: mcp@20 {
-+				compatible = "microchip,mcp23017";
-+				pinctrl-name = "default";
-+				pinctrl-0 = <&mcp23017_pins>;
-+				reg = <0x20>;
-+				gpio-controller;
-+				#gpio-cells = <2>;
-+
-+				status = "okay";
-+			};
-+		};
-+	};
-+
- 	frag100: fragment@100 {
- 		target = <&i2c1>;
- 		i2cbus: __overlay__ {
-@@ -83,8 +85,8 @@
- 		gpiopin = <&mcp23017_pins>,"brcm,pins:0",
- 				<&mcp23017_irq>,"interrupts:0";
- 		addr = <&mcp23017>,"reg:0", <&mcp23017_pins>,"reg:0";
--		mcp23008 = <0>,"=3";
--		noints = <0>,"!1!4";
-+		mcp23008 = <0>,"=2";
-+		noints = <0>,"!1!3";
- 		i2c0 = <&frag100>, "target:0=",<&i2c0>;
- 		i2c_csi_dsi = <&frag100>, "target:0=",<&i2c_csi_dsi>,
- 			      <0>,"+101+102";
diff --git a/target/linux/bcm27xx/patches-6.1/950-1052-drivers-media-pisp_be-Add-back-V4L2_PIX_FMT_RPI_BE-f.patch b/target/linux/bcm27xx/patches-6.1/950-1052-drivers-media-pisp_be-Add-back-V4L2_PIX_FMT_RPI_BE-f.patch
deleted file mode 100644
index 7fe0c50740..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1052-drivers-media-pisp_be-Add-back-V4L2_PIX_FMT_RPI_BE-f.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 8d53cc5b4b2a6f9baed7a0aa801a39ad9dce9bf8 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Thu, 26 Oct 2023 08:55:24 +0100
-Subject: [PATCH] drivers: media: pisp_be: Add back V4L2_PIX_FMT_RPI_BE format
-
-Add the opaque V4L2_PIX_FMT_RPI_BE format back to the format list as it
-is needed for the verification test suite. Also set the default format
-to YUV420 non-multiplanar.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/platform/raspberrypi/pisp_be/pisp_be.c     | 9 ++++++---
- .../media/platform/raspberrypi/pisp_be/pisp_be_formats.h | 5 +++++
- 2 files changed, 11 insertions(+), 3 deletions(-)
-
---- a/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c
-+++ b/drivers/media/platform/raspberrypi/pisp_be/pisp_be.c
-@@ -1230,8 +1230,11 @@ static int try_format(struct v4l2_format
- 		return verify_be_pix_format(f, node);
- 
- 	fmt = find_format(pixfmt);
--	if (!fmt)
--		fmt = find_format(V4L2_PIX_FMT_YUV420M);
-+	if (!fmt) {
-+		dev_dbg(pispbe->dev, "%s: [%s] Format not found, defaulting to YUV420\n",
-+			__func__, NODE_NAME(node));
-+		fmt = find_format(V4L2_PIX_FMT_YUV420);
-+	}
- 
- 	f->fmt.pix_mp.pixelformat = fmt->fourcc;
- 	f->fmt.pix_mp.num_planes = fmt->num_planes;
-@@ -1576,7 +1579,7 @@ static void node_set_default_format(stru
- 	} else {
- 		struct v4l2_format f = {0};
- 
--		f.fmt.pix_mp.pixelformat = V4L2_PIX_FMT_YUV420M;
-+		f.fmt.pix_mp.pixelformat = V4L2_PIX_FMT_YUV420;
- 		f.fmt.pix_mp.width = 1920;
- 		f.fmt.pix_mp.height = 1080;
- 		f.type = node->buf_type;
---- a/drivers/media/platform/raspberrypi/pisp_be/pisp_be_formats.h
-+++ b/drivers/media/platform/raspberrypi/pisp_be/pisp_be_formats.h
-@@ -457,6 +457,11 @@ static const struct pisp_be_format suppo
- 		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
- 		.colorspace_default = V4L2_COLORSPACE_RAW,
- 	},
-+	/* Opaque BE format for HW verification. */
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_RPI_BE,
-+		.align		    = 32,
-+	},
- };
- 
- static const struct pisp_be_format meta_out_supported_formats[] = {
diff --git a/target/linux/bcm27xx/patches-6.1/950-1053-dt-bindings-PCI-brcmstb-add-optional-property-brcm-t.patch b/target/linux/bcm27xx/patches-6.1/950-1053-dt-bindings-PCI-brcmstb-add-optional-property-brcm-t.patch
deleted file mode 100644
index 3ef42e7967..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1053-dt-bindings-PCI-brcmstb-add-optional-property-brcm-t.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From f1154884295a4bd00d6ebcaf01fa30141145903d Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.com>
-Date: Wed, 20 Sep 2023 10:04:15 +0100
-Subject: [PATCH] dt-bindings: PCI: brcmstb: add optional property -
- "brcm,tperst-clk-ms"
-
-This property can be used to delay deassertion of external fundamental
-reset, which may be useful for endpoints that require an extended time for
-internal setup to complete.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
-+++ b/Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
-@@ -77,6 +77,14 @@ properties:
-       minItems: 1
-       maxItems: 3
- 
-+  brcm,tperst-clk-ms:
-+    category: optional
-+    type: int
-+    description: u32 giving the number of milliseconds to extend
-+      the time between internal release of fundamental reset and
-+      the deassertion of the external PERST# pin. This has the
-+      effect of increasing the Tperst_clk phase of link init.
-+
- required:
-   - compatible
-   - reg
diff --git a/target/linux/bcm27xx/patches-6.1/950-1054-drivers-pci-brcmstb-optionally-extend-Tperst_clk-tim.patch b/target/linux/bcm27xx/patches-6.1/950-1054-drivers-pci-brcmstb-optionally-extend-Tperst_clk-tim.patch
deleted file mode 100644
index 021e210591..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1054-drivers-pci-brcmstb-optionally-extend-Tperst_clk-tim.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 4b0c6453808a662869a43c504913f3b7ed64486a Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.com>
-Date: Wed, 20 Sep 2023 13:01:11 +0100
-Subject: [PATCH] drivers: pci: brcmstb: optionally extend Tperst_clk time
- during link-up
-
-The RC has a feature that allows for manual control over the deassertion
-of the PERST# output pin, which allows the time between refclk active
-and reset deassert at the EP to be increased.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- drivers/pci/controller/pcie-brcmstb.c | 24 +++++++++++++++++++++++-
- 1 file changed, 23 insertions(+), 1 deletion(-)
-
---- a/drivers/pci/controller/pcie-brcmstb.c
-+++ b/drivers/pci/controller/pcie-brcmstb.c
-@@ -138,6 +138,7 @@
- 
- #define PCIE_MISC_HARD_PCIE_HARD_DEBUG	pcie->reg_offsets[PCIE_HARD_DEBUG]
- #define  PCIE_MISC_HARD_PCIE_HARD_DEBUG_CLKREQ_DEBUG_ENABLE_MASK	0x2
-+#define  PCIE_MISC_HARD_PCIE_HARD_DEBUG_PERST_ASSERT_MASK		0x8
- #define  PCIE_MISC_HARD_PCIE_HARD_DEBUG_SERDES_IDDQ_MASK		0x08000000
- #define  PCIE_BMIPS_MISC_HARD_PCIE_HARD_DEBUG_SERDES_IDDQ_MASK		0x00800000
- #define  PCIE_MISC_HARD_PCIE_HARD_DEBUG_CLKREQ_L1SS_ENABLE_MASK		0x00200000
-@@ -352,6 +353,7 @@ struct brcm_pcie {
- 	bool			(*rc_mode)(struct brcm_pcie *pcie);
- 	struct subdev_regulators *sr;
- 	bool			ep_wakeup_capable;
-+	u32			tperst_clk_ms;
- };
- 
- static inline bool is_bmips(const struct brcm_pcie *pcie)
-@@ -1388,9 +1390,28 @@ static int brcm_pcie_start_link(struct b
- 	u16 nlw, cls, lnksta;
- 	bool ssc_good = false;
- 	int ret, i;
-+	u32 tmp;
- 
- 	/* Unassert the fundamental reset */
--	pcie->perst_set(pcie, 0);
-+	if (pcie->tperst_clk_ms) {
-+		/*
-+		 * Increase Tperst_clk time by forcing PERST# output low while
-+		 * the internal reset is released, so the PLL generates stable
-+		 * refclk output further in advance of PERST# deassertion.
-+		 */
-+		tmp = readl(base + PCIE_MISC_HARD_PCIE_HARD_DEBUG);
-+		u32p_replace_bits(&tmp, 1, PCIE_MISC_HARD_PCIE_HARD_DEBUG_PERST_ASSERT_MASK);
-+		writel(tmp, base + PCIE_MISC_HARD_PCIE_HARD_DEBUG);
-+
-+		pcie->perst_set(pcie, 0);
-+		msleep(pcie->tperst_clk_ms);
-+
-+		tmp = readl(base + PCIE_MISC_HARD_PCIE_HARD_DEBUG);
-+		u32p_replace_bits(&tmp, 0, PCIE_MISC_HARD_PCIE_HARD_DEBUG_PERST_ASSERT_MASK);
-+		writel(tmp, base + PCIE_MISC_HARD_PCIE_HARD_DEBUG);
-+	} else {
-+		pcie->perst_set(pcie, 0);
-+	}
- 
- 	/*
- 	 * Wait for 100ms after PERST# deassertion; see PCIe CEM specification
-@@ -1923,6 +1944,7 @@ static int brcm_pcie_probe(struct platfo
- 	pcie->ssc = of_property_read_bool(np, "brcm,enable-ssc");
- 	pcie->l1ss = of_property_read_bool(np, "brcm,enable-l1ss");
- 	pcie->rcb_mps_mode = of_property_read_bool(np, "brcm,enable-mps-rcb");
-+	of_property_read_u32(np, "brcm,tperst-clk-ms", &pcie->tperst_clk_ms);
- 
- 	ret = clk_prepare_enable(pcie->clk);
- 	if (ret) {
diff --git a/target/linux/bcm27xx/patches-6.1/950-1055-arm-dt-add-dtparams-for-PCIe-reset-timing-override.patch b/target/linux/bcm27xx/patches-6.1/950-1055-arm-dt-add-dtparams-for-PCIe-reset-timing-override.patch
deleted file mode 100644
index a81d0383ac..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1055-arm-dt-add-dtparams-for-PCIe-reset-timing-override.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From db90a5e5fc2fbd843b29eb8110ed5e03604a2887 Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.com>
-Date: Wed, 20 Sep 2023 13:04:54 +0100
-Subject: [PATCH] arm: dt: add dtparams for PCIe reset timing override
-
-The Pi 5 variant gets two parameters so that the CM4-compatible
-name will also work on Pi 5.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2711-rpi-cm4.dts | 2 ++
- arch/arm/boot/dts/bcm2712-rpi-5-b.dts | 2 ++
- arch/arm/boot/dts/overlays/README     | 7 +++++++
- 3 files changed, 11 insertions(+)
-
---- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
-+++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
-@@ -446,5 +446,7 @@ i2c_csi_dsi0: &i2c0 {
- 		cam1_reg = <&cam1_reg>,"status";
- 		cam1_reg_gpio = <&cam1_reg>,"gpio:4",
- 				  <&cam1_reg>,"gpio:0=", <&gpio>;
-+
-+		pcie_tperst_clk_ms = <&pcie0>,"brcm,tperst-clk-ms:0";
- 	};
- };
---- a/arch/arm/boot/dts/bcm2712-rpi-5-b.dts
-+++ b/arch/arm/boot/dts/bcm2712-rpi-5-b.dts
-@@ -814,6 +814,8 @@ spi10_cs_pins: &spi10_cs_gpio1 {};
- 		pciex1 = <&pciex1>, "status";
- 		pciex1_gen = <&pciex1> , "max-link-speed:0";
- 		pciex1_no_l0s = <&pciex1>, "aspm-no-l0s?";
-+		pciex1_tperst_clk_ms = <&pciex1>, "brcm,tperst-clk-ms:0";
-+		pcie_tperst_clk_ms = <&pciex1>, "brcm,tperst-clk-ms:0";
- 		random = <&random>, "status";
- 		rtc_bbat_vchg = <&rpi_rtc>, "trickle-charge-microvolt:0";
- 		spi = <&spi0>, "status";
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -280,6 +280,10 @@ Params:
-                                 (2711 only, but not applicable on CM4S)
-                                 N.B. USB-A ports on 4B are subsequently disabled
- 
-+        pcie_tperst_clk_ms      Add N milliseconds between PCIe reference clock
-+                                activation and PERST# deassertion
-+                                (CM4 and 2712, default "0")
-+
-         pciex1                  Set to "on" to enable the external PCIe link
-                                 (2712 only, default "off")
- 
-@@ -290,6 +294,9 @@ Params:
-                                 PCIe link for devices that have broken
-                                 implementations (2712 only, default "off")
- 
-+        pciex1_tperst_clk_ms    Alias for pcie_tperst_clk_ms
-+                                (2712 only, default "0")
-+
-         spi                     Set to "on" to enable the spi interfaces
-                                 (default "off")
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1056-arm-dt-bcm2712-don-t-unconditionally-enable-MPS-read.patch b/target/linux/bcm27xx/patches-6.1/950-1056-arm-dt-bcm2712-don-t-unconditionally-enable-MPS-read.patch
deleted file mode 100644
index b08a5720d5..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1056-arm-dt-bcm2712-don-t-unconditionally-enable-MPS-read.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From cb013b6602de32c647ed08faf899596664a18635 Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.com>
-Date: Thu, 26 Oct 2023 13:47:54 +0100
-Subject: [PATCH] arm: dt: bcm2712: don't unconditionally enable MPS read
- completions
-
-RP1 supports it, but it's not a given that an arbitrary EP device
-on PCIE2 will. Migrate the property to the rp1_target fragment.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2712-rpi-5-b.dts | 1 +
- arch/arm/boot/dts/bcm2712.dtsi        | 1 -
- 2 files changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/arm/boot/dts/bcm2712-rpi-5-b.dts
-+++ b/arch/arm/boot/dts/bcm2712-rpi-5-b.dts
-@@ -160,6 +160,7 @@
- };
- 
- rp1_target: &pcie2 {
-+	brcm,enable-mps-rcb;
- 	brcm,vdm-qos-map = <0xbbaa9888>;
- 	aspm-no-l0s;
- 	status = "okay";
---- a/arch/arm/boot/dts/bcm2712.dtsi
-+++ b/arch/arm/boot/dts/bcm2712.dtsi
-@@ -1086,7 +1086,6 @@
- 				      0x00 0x00000000
- 				      0x10 0x00000000>;
- 
--			brcm,enable-mps-rcb;
- 			brcm,enable-l1ss;
- 			status = "disabled";
- 		};
diff --git a/target/linux/bcm27xx/patches-6.1/950-1057-drivers-media-imx477-Set-horizontal-binning-when-dis.patch b/target/linux/bcm27xx/patches-6.1/950-1057-drivers-media-imx477-Set-horizontal-binning-when-dis.patch
deleted file mode 100644
index e6122e1a6b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1057-drivers-media-imx477-Set-horizontal-binning-when-dis.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 8dcc16f0adc50f5cb8a11a6dde238131d0ca45a0 Mon Sep 17 00:00:00 2001
-From: David Plowman <david.plowman@raspberrypi.com>
-Date: Fri, 27 Oct 2023 12:14:22 +0100
-Subject: [PATCH] drivers: media: imx477: Set horizontal binning when disabling
- the scaler
-
-The horizontal scaler has been disabled but actually the sensor is not
-binning horizontally, resulting in images that are stretched 2x
-horizontally (missing the right half of the field of view completely).
-
-Therefore we must additionally set the horizontal binning mode. There
-is only marginal change in output quality and noise levels.
-
-Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
-Fixes: f075893e9b0e ("drivers: media: imx477: Disable the scaler")
----
- drivers/media/i2c/imx477.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/media/i2c/imx477.c
-+++ b/drivers/media/i2c/imx477.c
-@@ -607,7 +607,7 @@ static const struct imx477_reg mode_2028
- 	{0x0385, 0x01},
- 	{0x0387, 0x01},
- 	{0x0900, 0x01},
--	{0x0901, 0x12},
-+	{0x0901, 0x22},
- 	{0x0902, 0x02},
- 	{0x3140, 0x02},
- 	{0x3c00, 0x00},
-@@ -708,7 +708,7 @@ static const struct imx477_reg mode_2028
- 	{0x0385, 0x01},
- 	{0x0387, 0x01},
- 	{0x0900, 0x01},
--	{0x0901, 0x12},
-+	{0x0901, 0x22},
- 	{0x0902, 0x02},
- 	{0x3140, 0x02},
- 	{0x3c00, 0x00},
diff --git a/target/linux/bcm27xx/patches-6.1/950-1058-fixup-arch-arm64-Add-Revision-Serial-Model-to-cpuinf.patch b/target/linux/bcm27xx/patches-6.1/950-1058-fixup-arch-arm64-Add-Revision-Serial-Model-to-cpuinf.patch
deleted file mode 100644
index adedaf6d4b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1058-fixup-arch-arm64-Add-Revision-Serial-Model-to-cpuinf.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e641fd7a50987ad6b7ce1ab36189bc8817295e42 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 31 Oct 2023 16:34:56 +0000
-Subject: [PATCH] fixup! arch/arm64: Add Revision, Serial, Model to cpuinfo
-
-Delete the Hardware string, which is pointless and misleading.
-
-See: https://github.com/raspberrypi/bookworm-feedback/issues/129
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm64/kernel/cpuinfo.c | 2 --
- 1 file changed, 2 deletions(-)
-
---- a/arch/arm64/kernel/cpuinfo.c
-+++ b/arch/arm64/kernel/cpuinfo.c
-@@ -224,8 +224,6 @@ static int c_show(struct seq_file *m, vo
- 		seq_printf(m, "CPU revision\t: %d\n\n", MIDR_REVISION(midr));
- 	}
- 
--	seq_printf(m, "Hardware\t: BCM2835\n");
--
- 	np = of_find_node_by_path("/system");
- 	if (np) {
- 		if (!of_property_read_u32(np, "linux,revision", &revision))
diff --git a/target/linux/bcm27xx/patches-6.1/950-1060-dts-bcm2710-rpi-zero-2-w-Remove-WLAN-firmwares.patch b/target/linux/bcm27xx/patches-6.1/950-1060-dts-bcm2710-rpi-zero-2-w-Remove-WLAN-firmwares.patch
deleted file mode 100644
index 18c12cd10f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1060-dts-bcm2710-rpi-zero-2-w-Remove-WLAN-firmwares.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From e86c43b86179fba90a1d9dd5acb554767af6740f Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 12 Jun 2023 15:23:55 +0100
-Subject: [PATCH] dts: bcm2710-rpi-zero-2-w: Remove WLAN firmwares
-
-With careful use of qualified firmware names there is no need for the
-ability to override the device names based on Device Tree properties.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts | 13 -------------
- 1 file changed, 13 deletions(-)
-
---- a/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
-+++ b/arch/arm/boot/dts/bcm2710-rpi-zero-2-w.dts
-@@ -161,19 +161,6 @@
- 	brcmf: wifi@1 {
- 		reg = <1>;
- 		compatible = "brcm,bcm4329-fmac";
--
--		firmwares {
--			fw_43436p {
--				chipid = <43430>;
--				revmask = <4>;
--				fw_base = "brcm/brcmfmac43436-sdio";
--			};
--			fw_43436s {
--				chipid = <43430>;
--				revmask = <2>;
--				fw_base = "brcm/brcmfmac43436s-sdio";
--			};
--		};
- 	};
- };
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1061-drivers-media-cfe-Set-the-CSI-2-link-frequency-corre.patch b/target/linux/bcm27xx/patches-6.1/950-1061-drivers-media-cfe-Set-the-CSI-2-link-frequency-corre.patch
deleted file mode 100644
index d5aeae5333..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1061-drivers-media-cfe-Set-the-CSI-2-link-frequency-corre.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From a11312709f46b71bf320a9dcc8cf4e09056552cd Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Wed, 1 Nov 2023 13:25:54 +0000
-Subject: [PATCH] drivers: media: cfe: Set the CSI-2 link frequency correctly
-
-Use the sensor provided link frequency to set the DPHY timing parameters
-on stream_on. This replaces the hard-coded 999 MHz value currently being
-used. As a fallback, revert to the original 999 Mhz link frequency.
-
-As a drive-by, fix a 80-character line formatting error.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- .../media/platform/raspberrypi/rp1_cfe/cfe.c  | 63 +++++++++++++++++--
- 1 file changed, 58 insertions(+), 5 deletions(-)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-@@ -780,7 +780,8 @@ static void cfe_start_channel(struct cfe
- 			__func__, node_desc[FE_OUT0].name,
- 			cfe->fe_csi2_channel);
- 
--		source_fmt = v4l2_subdev_get_pad_format(&cfe->csi2.sd, state, cfe->fe_csi2_channel);
-+		source_fmt = v4l2_subdev_get_pad_format(&cfe->csi2.sd, state,
-+							cfe->fe_csi2_channel);
- 		fmt = find_format_by_code(source_fmt->code);
- 
- 		width = source_fmt->width;
-@@ -982,6 +983,59 @@ static void cfe_buffer_queue(struct vb2_
- 	spin_unlock_irqrestore(&cfe->state_lock, flags);
- }
- 
-+static u64 sensor_link_frequency(struct cfe_device *cfe)
-+{
-+	struct v4l2_mbus_framefmt *source_fmt;
-+	struct v4l2_subdev_state *state;
-+	struct media_entity *entity;
-+	struct v4l2_subdev *subdev;
-+	const struct cfe_fmt *fmt;
-+	struct media_pad *pad;
-+	s64 link_freq;
-+
-+	state = v4l2_subdev_lock_and_get_active_state(&cfe->csi2.sd);
-+	source_fmt = v4l2_subdev_get_pad_format(&cfe->csi2.sd, state, 0);
-+	fmt = find_format_by_code(source_fmt->code);
-+	v4l2_subdev_unlock_state(state);
-+
-+	/*
-+	 * Walk up the media graph to find either the sensor entity, or another
-+	 * entity that advertises the V4L2_CID_LINK_FREQ or V4L2_CID_PIXEL_RATE
-+	 * control through the subdev.
-+	 */
-+	entity = &cfe->csi2.sd.entity;
-+	while (1) {
-+		pad = &entity->pads[0];
-+		if (!(pad->flags & MEDIA_PAD_FL_SINK))
-+			goto err;
-+
-+		pad = media_pad_remote_pad_first(pad);
-+		if (!pad || !is_media_entity_v4l2_subdev(pad->entity))
-+			goto err;
-+
-+		entity = pad->entity;
-+		subdev = media_entity_to_v4l2_subdev(entity);
-+		if (entity->function == MEDIA_ENT_F_CAM_SENSOR ||
-+		    v4l2_ctrl_find(subdev->ctrl_handler, V4L2_CID_LINK_FREQ) ||
-+		    v4l2_ctrl_find(subdev->ctrl_handler, V4L2_CID_PIXEL_RATE))
-+			break;
-+	}
-+
-+	link_freq = v4l2_get_link_freq(subdev->ctrl_handler, fmt->depth,
-+				       cfe->csi2.active_data_lanes * 2);
-+	if (link_freq < 0)
-+		goto err;
-+
-+	/* x2 for DDR. */
-+	link_freq *= 2;
-+	cfe_info("Using a link frequency of %lld Hz\n", link_freq);
-+	return link_freq;
-+
-+err:
-+	cfe_err("Unable to determine sensor link frequency, using 999 MHz\n");
-+	return 999 * 1000000UL;
-+}
-+
- static int cfe_start_streaming(struct vb2_queue *vq, unsigned int count)
- {
- 	struct v4l2_mbus_config mbus_config = { 0 };
-@@ -1049,10 +1103,11 @@ static int cfe_start_streaming(struct vb
- 		goto err_disable_cfe;
- 	}
- 
--	cfe_dbg("Starting sensor streaming\n");
--
-+	cfe_dbg("Configuring CSI-2 block\n");
-+	cfe->csi2.dphy.dphy_freq = sensor_link_frequency(cfe) / 1000000UL;
- 	csi2_open_rx(&cfe->csi2);
- 
-+	cfe_dbg("Starting sensor streaming\n");
- 	cfe->sequence = 0;
- 	ret = v4l2_subdev_call(cfe->sensor, video, s_stream, 1);
- 	if (ret < 0) {
-@@ -1945,8 +2000,6 @@ static int of_cfe_connect_subdevs(struct
- 		}
- 	}
- 
--	/* TODO: Get the frequency from devicetree */
--	cfe->csi2.dphy.dphy_freq = 999;
- 	cfe->csi2.dphy.num_lanes = ep.bus.mipi_csi2.num_data_lanes;
- 	cfe->csi2.bus_flags = ep.bus.mipi_csi2.flags;
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1062-dts-bcm2712-rpi-5-b-Create-some-dummy-nodes.patch b/target/linux/bcm27xx/patches-6.1/950-1062-dts-bcm2712-rpi-5-b-Create-some-dummy-nodes.patch
deleted file mode 100644
index 722714d56a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1062-dts-bcm2712-rpi-5-b-Create-some-dummy-nodes.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From fb78b2617e70e58e03e0d50e674758fdd2a80d45 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 2 Nov 2023 10:39:11 +0000
-Subject: [PATCH] dts: bcm2712-rpi-5-b: Create some dummy nodes
-
-The kernel now treats multiple fragments targeting the same node as an
-error. For this reason, it is important that labels created just for
-compatibility with other systems (e.g. i2c0if and i2c0mux) are
-attached to unique nodes, not just tacked onto existing nodes.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2712-rpi-5-b.dts | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
---- a/arch/arm/boot/dts/bcm2712-rpi-5-b.dts
-+++ b/arch/arm/boot/dts/bcm2712-rpi-5-b.dts
-@@ -157,6 +157,12 @@
- 	dummy: dummy {
- 		// A target for unwanted overlay fragments
- 	};
-+
-+
-+	// A few extra labels to keep overlays happy
-+
-+	i2c0if: i2c0if {};
-+	i2c0mux: i2c0mux {};
- };
- 
- rp1_target: &pcie2 {
-@@ -243,11 +249,6 @@ aux: &dummy {};
- 
- #include "bcm2712-rpi.dtsi"
- 
--// A few extra labels to keep overlays happy
--
--i2c0if: &rp1_gpio {};
--i2c0mux: &rp1_gpio {};
--
- i2c_csi_dsi0: &i2c6 { // Note: This is for MIPI0 connector only
- 	pinctrl-0 = <&rp1_i2c6_38_39>;
- 	pinctrl-names = "default";
diff --git a/target/linux/bcm27xx/patches-6.1/950-1063-dts-rp1-Add-spi6-fix-spi1-address-cells.patch b/target/linux/bcm27xx/patches-6.1/950-1063-dts-rp1-Add-spi6-fix-spi1-address-cells.patch
deleted file mode 100644
index 41ab025555..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1063-dts-rp1-Add-spi6-fix-spi1-address-cells.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From cd66a0832351762b496bdce6f2f94a871d11484e Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 2 Nov 2023 13:12:55 +0000
-Subject: [PATCH] dts: rp1: Add spi6, fix spi1 #address-cells
-
-spi6 won't be useful on Pi 5 because it can't be enabled on the 40-pin
-header, but include it for completeness.
-
-Also fix the #address-cells value for spi1, otherwise the kernel will
-reject attempts to apply the, say, spi1-2cs overlay at runtime.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/rp1.dtsi | 17 ++++++++++++++++-
- 1 file changed, 16 insertions(+), 1 deletion(-)
-
---- a/arch/arm/boot/dts/rp1.dtsi
-+++ b/arch/arm/boot/dts/rp1.dtsi
-@@ -187,7 +187,7 @@
- 			interrupts = <RP1_INT_SPI1 IRQ_TYPE_LEVEL_HIGH>;
- 			clocks = <&rp1_clocks RP1_CLK_SYS>;
- 			clock-names = "ssi_clk";
--			#address-cells = <0>;
-+			#address-cells = <1>;
- 			#size-cells = <0>;
- 			num-cs = <2>;
- 			dmas = <&rp1_dma RP1_DMA_SPI1_TX>,
-@@ -262,6 +262,21 @@
- 			dma-names = "tx", "rx";
- 			status = "disabled";
- 		};
-+
-+		rp1_spi6: spi@68000 {
-+			reg = <0xc0 0x40068000  0x0 0x130>;
-+			compatible = "snps,dw-apb-ssi";
-+			interrupts = <RP1_INT_SPI6 IRQ_TYPE_LEVEL_HIGH>;
-+			clocks = <&rp1_clocks RP1_CLK_SYS>;
-+			clock-names = "ssi_clk";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			num-cs = <2>;
-+			dmas = <&rp1_dma RP1_DMA_SPI6_TX>,
-+			       <&rp1_dma RP1_DMA_SPI6_RX>;
-+			dma-names = "tx", "rx";
-+			status = "disabled";
-+		};
- 
- 		// SPI7 is a target/slave interface
- 		rp1_spi7: spi@6c000 {
diff --git a/target/linux/bcm27xx/patches-6.1/950-1064-overlays-uart-n-pi5-Add-the-pinctrl-0-property.patch b/target/linux/bcm27xx/patches-6.1/950-1064-overlays-uart-n-pi5-Add-the-pinctrl-0-property.patch
deleted file mode 100644
index b6e0c323db..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1064-overlays-uart-n-pi5-Add-the-pinctrl-0-property.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 17f135b742c4edb340afb365873c3a574f7e16cb Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 2 Nov 2023 17:05:46 +0000
-Subject: [PATCH] overlays: uart<n>-pi5: Add the pinctrl-0 property
-
-Without the pinctrl-0 property in the overlays, the UARTs may not be
-mapped correctly.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/uart0-pi5-overlay.dts | 1 +
- arch/arm/boot/dts/overlays/uart1-pi5-overlay.dts | 1 +
- arch/arm/boot/dts/overlays/uart2-pi5-overlay.dts | 1 +
- arch/arm/boot/dts/overlays/uart3-pi5-overlay.dts | 1 +
- arch/arm/boot/dts/overlays/uart4-pi5-overlay.dts | 1 +
- 5 files changed, 5 insertions(+)
-
---- a/arch/arm/boot/dts/overlays/uart0-pi5-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/uart0-pi5-overlay.dts
-@@ -8,6 +8,7 @@
- 		target = <&uart0>;
- 		frag0: __overlay__ {
- 			status = "okay";
-+			pinctrl-0 = <&uart0_pins>;
- 		};
- 	};
- 
---- a/arch/arm/boot/dts/overlays/uart1-pi5-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/uart1-pi5-overlay.dts
-@@ -8,6 +8,7 @@
- 		target = <&uart1>;
- 		frag0: __overlay__ {
- 			status = "okay";
-+			pinctrl-0 = <&uart1_pins>;
- 		};
- 	};
- 
---- a/arch/arm/boot/dts/overlays/uart2-pi5-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/uart2-pi5-overlay.dts
-@@ -8,6 +8,7 @@
- 		target = <&uart2>;
- 		frag0: __overlay__ {
- 			status = "okay";
-+			pinctrl-0 = <&uart2_pins>;
- 		};
- 	};
- 
---- a/arch/arm/boot/dts/overlays/uart3-pi5-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/uart3-pi5-overlay.dts
-@@ -8,6 +8,7 @@
- 		target = <&uart3>;
- 		frag0: __overlay__ {
- 			status = "okay";
-+			pinctrl-0 = <&uart3_pins>;
- 		};
- 	};
- 
---- a/arch/arm/boot/dts/overlays/uart4-pi5-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/uart4-pi5-overlay.dts
-@@ -8,6 +8,7 @@
- 		target = <&uart4>;
- 		frag0: __overlay__ {
- 			status = "okay";
-+			pinctrl-0 = <&uart4_pins>;
- 		};
- 	};
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1065-drivers-media-imx477-Add-V4L2_CID_LINK_FREQ-control.patch b/target/linux/bcm27xx/patches-6.1/950-1065-drivers-media-imx477-Add-V4L2_CID_LINK_FREQ-control.patch
deleted file mode 100644
index f0a652b520..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1065-drivers-media-imx477-Add-V4L2_CID_LINK_FREQ-control.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From c9a785d57c302d5f1d4de4e67fa57522e66c7882 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Mon, 6 Nov 2023 09:40:50 +0000
-Subject: [PATCH] drivers: media: imx477: Add V4L2_CID_LINK_FREQ control
-
-Add V4L2_CID_LINK_FREQ as a read-only control with a value of 450 Mhz.
-This will be used by the CFE driver to corretly setup the DPHY timing
-parameters in the CSI-2 block.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/i2c/imx477.c | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
---- a/drivers/media/i2c/imx477.c
-+++ b/drivers/media/i2c/imx477.c
-@@ -164,6 +164,10 @@ struct imx477_mode {
- 	struct imx477_reg_list reg_list;
- };
- 
-+static const s64 imx477_link_freq_menu[] = {
-+	IMX477_DEFAULT_LINK_FREQ,
-+};
-+
- static const struct imx477_reg mode_common_regs[] = {
- 	{0x0136, 0x18},
- 	{0x0137, 0x00},
-@@ -1110,6 +1114,7 @@ struct imx477 {
- 	struct v4l2_ctrl_handler ctrl_handler;
- 	/* V4L2 Controls */
- 	struct v4l2_ctrl *pixel_rate;
-+	struct v4l2_ctrl *link_freq;
- 	struct v4l2_ctrl *exposure;
- 	struct v4l2_ctrl *vflip;
- 	struct v4l2_ctrl *hflip;
-@@ -1997,6 +2002,15 @@ static int imx477_init_controls(struct i
- 					       IMX477_PIXEL_RATE, 1,
- 					       IMX477_PIXEL_RATE);
- 
-+	/* LINK_FREQ is also read only */
-+	imx477->link_freq =
-+		v4l2_ctrl_new_int_menu(ctrl_hdlr, &imx477_ctrl_ops,
-+				       V4L2_CID_LINK_FREQ,
-+				       ARRAY_SIZE(imx477_link_freq_menu) - 1, 0,
-+				       imx477_link_freq_menu);
-+	if (imx477->link_freq)
-+		imx477->link_freq->flags |= V4L2_CTRL_FLAG_READ_ONLY;
-+
- 	/*
- 	 * Create the controls here, but mode specific limits are setup
- 	 * in the imx477_set_framing_limits() call below.
diff --git a/target/linux/bcm27xx/patches-6.1/950-1066-drivers-media-imx477-Correctly-set-IMX477_PIXEL_RATE.patch b/target/linux/bcm27xx/patches-6.1/950-1066-drivers-media-imx477-Correctly-set-IMX477_PIXEL_RATE.patch
deleted file mode 100644
index f62fbbe13d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1066-drivers-media-imx477-Correctly-set-IMX477_PIXEL_RATE.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 46913ee0590ee0e3f607ab189be19a4d0ce785f2 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Mon, 6 Nov 2023 09:42:37 +0000
-Subject: [PATCH] drivers: media: imx477: Correctly set IMX477_PIXEL_RATE as a
- r/o control
-
-This control is meant to be read-only, mark it as such.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/i2c/imx477.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/media/i2c/imx477.c
-+++ b/drivers/media/i2c/imx477.c
-@@ -2001,6 +2001,8 @@ static int imx477_init_controls(struct i
- 					       IMX477_PIXEL_RATE,
- 					       IMX477_PIXEL_RATE, 1,
- 					       IMX477_PIXEL_RATE);
-+	if (imx477->pixel_rate)
-+		imx477->pixel_rate->flags |= V4L2_CTRL_FLAG_READ_ONLY;
- 
- 	/* LINK_FREQ is also read only */
- 	imx477->link_freq =
diff --git a/target/linux/bcm27xx/patches-6.1/950-1067-drm-vc4-Correct-logic-on-stopping-an-HVS-channel.patch b/target/linux/bcm27xx/patches-6.1/950-1067-drm-vc4-Correct-logic-on-stopping-an-HVS-channel.patch
deleted file mode 100644
index 948d79bfdb..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1067-drm-vc4-Correct-logic-on-stopping-an-HVS-channel.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 6e9f68bba01b9c36a77b68c4b3167c317da986da Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 26 Oct 2023 17:46:13 +0100
-Subject: [PATCH] drm/vc4: Correct logic on stopping an HVS channel
-
-When factoring out __vc4_hvs_stop_channel, the logic got inverted from
-	if (condition)
-	  // stop channel
-to
-	if (condition)
-	  goto out
-	//stop channel
-	out:
-and also changed the exact register writes used to stop the channel.
-
-Correct the logic so that the channel is actually stopped, and revert
-to the original register writes.
-
-Fixes: 6d01a106b4c8 ("drm/vc4: crtc: Move HVS init and close to a function")
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_hvs.c | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -992,13 +992,11 @@ static void __vc4_hvs_stop_channel(struc
- 	if (!drm_dev_enter(drm, &idx))
- 		return;
- 
--	if (HVS_READ(SCALER_DISPCTRLX(chan)) & SCALER_DISPCTRLX_ENABLE)
-+	if (!(HVS_READ(SCALER_DISPCTRLX(chan)) & SCALER_DISPCTRLX_ENABLE))
- 		goto out;
- 
--	HVS_WRITE(SCALER_DISPCTRLX(chan),
--		  HVS_READ(SCALER_DISPCTRLX(chan)) | SCALER_DISPCTRLX_RESET);
--	HVS_WRITE(SCALER_DISPCTRLX(chan),
--		  HVS_READ(SCALER_DISPCTRLX(chan)) & ~SCALER_DISPCTRLX_ENABLE);
-+	HVS_WRITE(SCALER_DISPCTRLX(chan), SCALER_DISPCTRLX_RESET);
-+	HVS_WRITE(SCALER_DISPCTRLX(chan), 0);
- 
- 	/* Once we leave, the scaler should be disabled and its fifo empty. */
- 	WARN_ON_ONCE(HVS_READ(SCALER_DISPCTRLX(chan)) & SCALER_DISPCTRLX_RESET);
-@@ -1026,7 +1024,7 @@ static void __vc6_hvs_stop_channel(struc
- 	if (!drm_dev_enter(drm, &idx))
- 		return;
- 
--	if (HVS_READ(SCALER6_DISPX_CTRL0(chan)) & SCALER6_DISPX_CTRL0_ENB)
-+	if (!(HVS_READ(SCALER6_DISPX_CTRL0(chan)) & SCALER6_DISPX_CTRL0_ENB))
- 		goto out;
- 
- 	HVS_WRITE(SCALER6_DISPX_CTRL0(chan),
diff --git a/target/linux/bcm27xx/patches-6.1/950-1068-drm-vc4-Drop-WARN-for-HVS-FIFOs-not-being-empty.patch b/target/linux/bcm27xx/patches-6.1/950-1068-drm-vc4-Drop-WARN-for-HVS-FIFOs-not-being-empty.patch
deleted file mode 100644
index 627f22c845..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1068-drm-vc4-Drop-WARN-for-HVS-FIFOs-not-being-empty.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 31c4c359aa2dbb1a7c095f0a6ef4e13cd46cfd14 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 26 Oct 2023 18:05:09 +0100
-Subject: [PATCH] drm/vc4: Drop WARN for HVS FIFOs not being empty
-
-The reset condition for the EMPTY flag in DISPSTATx is 0,
-so seeing as we've just reset the pipeline there is no
-guarantee that the flag will denote empty if it hasn't been
-enabled.
-
-Drop the WARN.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_hvs.c | 4 ----
- 1 file changed, 4 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -1005,10 +1005,6 @@ static void __vc4_hvs_stop_channel(struc
- 				   SCALER_DISPSTATX_MODE) !=
- 		     SCALER_DISPSTATX_MODE_DISABLED);
- 
--	WARN_ON_ONCE((HVS_READ(SCALER_DISPSTATX(chan)) &
--		      (SCALER_DISPSTATX_FULL | SCALER_DISPSTATX_EMPTY)) !=
--		     SCALER_DISPSTATX_EMPTY);
--
- out:
- 	drm_dev_exit(idx);
- }
diff --git a/target/linux/bcm27xx/patches-6.1/950-1069-drm-vc4-Free-all-stale-dlists-if-channel-is-disabled.patch b/target/linux/bcm27xx/patches-6.1/950-1069-drm-vc4-Free-all-stale-dlists-if-channel-is-disabled.patch
deleted file mode 100644
index ce03224c39..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1069-drm-vc4-Free-all-stale-dlists-if-channel-is-disabled.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 8b7078d1bbd8bb548cc97d5214adb828e9f0037c Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 26 Oct 2023 18:23:31 +0100
-Subject: [PATCH] drm/vc4: Free all stale dlists if channel is disabled
-
-The code handling freeing stale dlists had 2 issues:
-- it disabled the interrupt as soon as the first EOF interrupt
-  occurred, even if it didn't clear all stale allocations, thus
-  leading to stale entries
-- It didn't free stale entries from disabled channels, so eg
-  "kmstest -c 0" could leave a stale alloc on channel 1 floating
-  around.
-
-Keep the interrupt enabled whilst there are any outstanding
-allocs, and discard those on disabled channels. This second
-channel does require us to call vc4_hvs_stop_channel from
-vc4_crtc_atomic_disable so that the channel actually gets stopped.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_crtc.c |  2 ++
- drivers/gpu/drm/vc4/vc4_hvs.c  | 27 +++++++++++++++++++++++++--
- 2 files changed, 27 insertions(+), 2 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_crtc.c
-+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
-@@ -660,6 +660,8 @@ static void vc4_crtc_atomic_disable(stru
- 
- 	vc4_crtc_disable(crtc, encoder, state, old_vc4_state->assigned_channel);
- 
-+	vc4_hvs_atomic_disable(crtc, state);
-+
- 	/*
- 	 * Make sure we issue a vblank event after disabling the CRTC if
- 	 * someone was waiting it.
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -697,7 +697,8 @@ static void vc4_hvs_schedule_dlist_sweep
- 	if (!list_empty(&hvs->stale_dlist_entries))
- 		queue_work(system_unbound_wq, &hvs->free_dlist_work);
- 
--	vc4_hvs_irq_clear_eof(hvs, channel);
-+	if (list_empty(&hvs->stale_dlist_entries))
-+		vc4_hvs_irq_clear_eof(hvs, channel);
- 
- 	spin_unlock_irqrestore(&hvs->mm_lock, flags);
- }
-@@ -712,6 +713,27 @@ static bool vc4_hvs_frcnt_lte(u8 cnt1, u
- 	return (s8)((cnt1 << 2) - (cnt2 << 2)) <= 0;
- }
- 
-+bool vc4_hvs_check_channel_active(struct vc4_hvs *hvs, unsigned int fifo)
-+{
-+	struct vc4_dev *vc4 = hvs->vc4;
-+	struct drm_device *drm = &vc4->base;
-+	bool enabled = false;
-+	int idx;
-+
-+	WARN_ON_ONCE(vc4->gen > VC4_GEN_6);
-+
-+	if (!drm_dev_enter(drm, &idx))
-+		return 0;
-+
-+	if (vc4->gen >= VC4_GEN_6)
-+		enabled = HVS_READ(SCALER6_DISPX_CTRL0(fifo)) & SCALER6_DISPX_CTRL0_ENB;
-+	else
-+		enabled = HVS_READ(SCALER_DISPCTRLX(fifo)) & SCALER_DISPCTRLX_ENABLE;
-+
-+	drm_dev_exit(idx);
-+	return enabled;
-+}
-+
- /*
-  * Some atomic commits (legacy cursor updates, mostly) will not wait for
-  * the next vblank and will just return once the commit has been pushed
-@@ -746,7 +768,8 @@ static void vc4_hvs_dlist_free_work(stru
- 		u8 frcnt;
- 
- 		frcnt = vc4_hvs_get_fifo_frame_count(hvs, cur->channel);
--		if (!vc4_hvs_frcnt_lte(cur->target_frame_count, frcnt))
-+		if (vc4_hvs_check_channel_active(hvs, cur->channel) &&
-+		    !vc4_hvs_frcnt_lte(cur->target_frame_count, frcnt))
- 			continue;
- 
- 		vc4_hvs_free_dlist_entry_locked(hvs, cur);
diff --git a/target/linux/bcm27xx/patches-6.1/950-1070-drm-vc4-Add-hvs_dlist_allocs-debugfs-function.patch b/target/linux/bcm27xx/patches-6.1/950-1070-drm-vc4-Add-hvs_dlist_allocs-debugfs-function.patch
deleted file mode 100644
index b16489a12d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1070-drm-vc4-Add-hvs_dlist_allocs-debugfs-function.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 665e9810340abc37769b317445907bac1843dd64 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 27 Oct 2023 16:46:04 +0100
-Subject: [PATCH] drm/vc4: Add hvs_dlist_allocs debugfs function.
-
-Users are reporting running out of DLIST memory. Add a
-debugfs file to dump out all the allocations.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_hvs.c | 35 +++++++++++++++++++++++++++++++++++
- 1 file changed, 35 insertions(+)
-
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -347,6 +347,36 @@ static int vc5_hvs_debugfs_gamma(struct
- 	return 0;
- }
- 
-+static int vc4_hvs_debugfs_dlist_allocs(struct seq_file *m, void *data)
-+{
-+	struct drm_info_node *node = m->private;
-+	struct drm_device *dev = node->minor->dev;
-+	struct vc4_dev *vc4 = to_vc4_dev(dev);
-+	struct vc4_hvs *hvs = vc4->hvs;
-+	struct drm_printer p = drm_seq_file_printer(m);
-+	struct vc4_hvs_dlist_allocation *cur, *next;
-+	struct drm_mm_node *mm_node;
-+	unsigned long flags;
-+
-+	spin_lock_irqsave(&hvs->mm_lock, flags);
-+
-+	drm_printf(&p, "Allocated nodes:\n");
-+	list_for_each_entry(mm_node, drm_mm_nodes(&hvs->dlist_mm), node_list) {
-+		drm_printf(&p, "node [%08llx + %08llx]\n", mm_node->start, mm_node->size);
-+	}
-+
-+	drm_printf(&p, "Stale nodes:\n");
-+	list_for_each_entry_safe(cur, next, &hvs->stale_dlist_entries, node) {
-+		drm_printf(&p, "node [%08llx + %08llx] channel %u frcnt %u\n",
-+			   cur->mm_node.start, cur->mm_node.size, cur->channel,
-+			   cur->target_frame_count);
-+	}
-+
-+	spin_unlock_irqrestore(&hvs->mm_lock, flags);
-+
-+	return 0;
-+}
-+
- /* The filter kernel is composed of dwords each containing 3 9-bit
-  * signed integers packed next to each other.
-  */
-@@ -1602,6 +1632,11 @@ int vc4_hvs_debugfs_init(struct drm_mino
- 	if (ret)
- 		return ret;
- 
-+	ret = vc4_debugfs_add_file(minor, "hvs_dlist_allocs",
-+				   vc4_hvs_debugfs_dlist_allocs, NULL);
-+	if (ret)
-+		return ret;
-+
- 	ret = vc4_debugfs_add_regset32(minor, "hvs_regs",
- 				       &hvs->regset);
- 	if (ret)
diff --git a/target/linux/bcm27xx/patches-6.1/950-1071-drm-vc4-Log-the-size-of-the-dlist-allocation-that-wa.patch b/target/linux/bcm27xx/patches-6.1/950-1071-drm-vc4-Log-the-size-of-the-dlist-allocation-that-wa.patch
deleted file mode 100644
index aa38b182ba..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1071-drm-vc4-Log-the-size-of-the-dlist-allocation-that-wa.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 23ea21ef5f6efb3082c184843b35a2f8f2e4374c Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 31 Oct 2023 11:15:38 +0000
-Subject: [PATCH] drm/vc4: Log the size of the dlist allocation that was
- attempted
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_hvs.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -659,7 +659,8 @@ vc4_hvs_alloc_dlist_entry(struct vc4_hvs
- 				 dlist_count);
- 	spin_unlock_irqrestore(&hvs->mm_lock, flags);
- 	if (ret) {
--		drm_err(dev, "Failed to allocate DLIST entry: %d\n", ret);
-+		drm_err(dev, "Failed to allocate DLIST entry. Requested size=%zu. ret=%d\n",
-+			dlist_count, ret);
- 		return ERR_PTR(ret);
- 	}
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1072-drm-vc4-crtc-Support-odd-horizontal-timings-on-BCM27.patch b/target/linux/bcm27xx/patches-6.1/950-1072-drm-vc4-crtc-Support-odd-horizontal-timings-on-BCM27.patch
deleted file mode 100644
index a72e3b8e5b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1072-drm-vc4-crtc-Support-odd-horizontal-timings-on-BCM27.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From f9f480b04f1dc280bd4411477f5ee7336361367b Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Tue, 24 Oct 2023 16:20:42 +0100
-Subject: [PATCH] drm/vc4: crtc: Support odd horizontal timings on BCM2712
-
-BCM2711 runs pixelvalve at two pixels per clock cycle which results
-in an unfortunate limitation that odd horizontal timings are not
-possible. This is apparent on the standard DMT mode of 1366x768@60
-which cannot be driven with correct timing.
-
-BCM2712 defaults to the same behaviour, but has a mode to support
-odd timings. While internally it still runs at two pixels per clock,
-setting the PV_VCONTROL_ODD_TIMING bit makes it appear externally
-to behave as it is one pixel per clock.
-
-Switching to this mode fixes 1366x768@60 mode, and other custom
-resultions with odd horizontal timings.
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/gpu/drm/vc4/vc4_crtc.c | 12 ++++--------
- drivers/gpu/drm/vc4/vc4_hdmi.c |  4 ++--
- drivers/gpu/drm/vc4/vc4_regs.h |  1 +
- 3 files changed, 7 insertions(+), 10 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_crtc.c
-+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
-@@ -398,12 +398,6 @@ static void vc4_crtc_config_pv(struct dr
- 
- 	vc4_crtc_pixelvalve_reset(crtc);
- 
--	/*
--	 * NOTE: The BCM2712 has a H_OTE (Horizontal Odd Timing Enable)
--	 * bit that, when set, will allow to specify the timings in
--	 * pixels instead of cycles, thus allowing to specify odd
--	 * timings.
--	 */
- 	CRTC_WRITE(PV_HORZA,
- 		   VC4_SET_FIELD((mode->htotal - mode->hsync_end) * pixel_rep / ppc,
- 				 PV_HORZA_HBP) |
-@@ -448,6 +442,7 @@ static void vc4_crtc_config_pv(struct dr
- 		 */
- 		CRTC_WRITE(PV_V_CONTROL,
- 			   PV_VCONTROL_CONTINUOUS |
-+			   (vc4->gen >= VC4_GEN_6 ? PV_VCONTROL_ODD_TIMING : 0) |
- 			   (is_dsi ? PV_VCONTROL_DSI : 0) |
- 			   PV_VCONTROL_INTERLACE |
- 			   (odd_field_first
-@@ -459,6 +454,7 @@ static void vc4_crtc_config_pv(struct dr
- 	} else {
- 		CRTC_WRITE(PV_V_CONTROL,
- 			   PV_VCONTROL_CONTINUOUS |
-+			   (vc4->gen >= VC4_GEN_6 ? PV_VCONTROL_ODD_TIMING : 0) |
- 			   (is_dsi ? PV_VCONTROL_DSI : 0));
- 		CRTC_WRITE(PV_VSYNCD_EVEN, 0);
- 	}
-@@ -1334,7 +1330,7 @@ const struct vc4_pv_data bcm2712_pv0_dat
- 		.hvs_output = 0,
- 	},
- 	.fifo_depth = 64,
--	.pixels_per_clock = 2,
-+	.pixels_per_clock = 1,
- 	.encoder_types = {
- 		[0] = VC4_ENCODER_TYPE_HDMI0,
- 	},
-@@ -1347,7 +1343,7 @@ const struct vc4_pv_data bcm2712_pv1_dat
- 		.hvs_output = 1,
- 	},
- 	.fifo_depth = 64,
--	.pixels_per_clock = 2,
-+	.pixels_per_clock = 1,
- 	.encoder_types = {
- 		[0] = VC4_ENCODER_TYPE_HDMI1,
- 	},
---- a/drivers/gpu/drm/vc4/vc4_hdmi.c
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -3958,7 +3958,7 @@ static const struct vc4_hdmi_variant bcm
- 		PHY_LANE_2,
- 		PHY_LANE_CK,
- 	},
--	.unsupported_odd_h_timings	= true,
-+	.unsupported_odd_h_timings	= false,
- 	.external_irq_controller	= true,
- 
- 	.init_resources		= vc5_hdmi_init_resources,
-@@ -3985,7 +3985,7 @@ static const struct vc4_hdmi_variant bcm
- 		PHY_LANE_2,
- 		PHY_LANE_CK,
- 	},
--	.unsupported_odd_h_timings	= true,
-+	.unsupported_odd_h_timings	= false,
- 	.external_irq_controller	= true,
- 
- 	.init_resources		= vc5_hdmi_init_resources,
---- a/drivers/gpu/drm/vc4/vc4_regs.h
-+++ b/drivers/gpu/drm/vc4/vc4_regs.h
-@@ -155,6 +155,7 @@
- # define PV_CONTROL_EN				BIT(0)
- 
- #define PV_V_CONTROL				0x04
-+# define PV_VCONTROL_ODD_TIMING			BIT(29)
- # define PV_VCONTROL_ODD_DELAY_MASK		VC4_MASK(22, 6)
- # define PV_VCONTROL_ODD_DELAY_SHIFT		6
- # define PV_VCONTROL_ODD_FIRST			BIT(5)
diff --git a/target/linux/bcm27xx/patches-6.1/950-1073-spi-dw-dma-Get-the-last-DMA-scoop-out-of-the-FIFO.patch b/target/linux/bcm27xx/patches-6.1/950-1073-spi-dw-dma-Get-the-last-DMA-scoop-out-of-the-FIFO.patch
deleted file mode 100644
index caf8b1a462..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1073-spi-dw-dma-Get-the-last-DMA-scoop-out-of-the-FIFO.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 686fe776309fba5cad642c40177d39bf1fb320b2 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 7 Nov 2023 14:49:47 +0000
-Subject: [PATCH] spi: dw-dma: Get the last DMA scoop out of the FIFO
-
-With a DMA FIFO threshold greater than 1 (encoded as 0), it is possible
-for data in the FIFO to be inaccessible, causing the transfer to fail
-after a timeout. If the transfer includes a transmission, reduce the
-RX threshold when the TX completes, otherwise use 1 for the whole
-transfer (inefficient, but not catastrophic at SPI data rates).
-
-See: https://github.com/raspberrypi/linux/issues/5696
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/spi/spi-dw-dma.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
---- a/drivers/spi/spi-dw-dma.c
-+++ b/drivers/spi/spi-dw-dma.c
-@@ -275,8 +275,10 @@ static void dw_spi_dma_tx_done(void *arg
- 	struct dw_spi *dws = arg;
- 
- 	clear_bit(DW_SPI_TX_BUSY, &dws->dma_chan_busy);
--	if (test_bit(DW_SPI_RX_BUSY, &dws->dma_chan_busy))
-+	if (test_bit(DW_SPI_RX_BUSY, &dws->dma_chan_busy)) {
-+		dw_writel(dws, DW_SPI_DMARDLR, 0);
- 		return;
-+	}
- 
- 	complete(&dws->dma_completion);
- }
-@@ -602,6 +604,8 @@ static int dw_spi_dma_transfer(struct dw
- 
- 	nents = max(xfer->tx_sg.nents, xfer->rx_sg.nents);
- 
-+	dw_writel(dws, DW_SPI_DMARDLR, xfer->tx_buf ? (dws->rxburst - 1) : 0);
-+
- 	/*
- 	 * Execute normal DMA-based transfer (which submits the Rx and Tx SG
- 	 * lists directly to the DMA engine at once) if either full hardware
diff --git a/target/linux/bcm27xx/patches-6.1/950-1075-drivers-mmc-sdhci-add-SPURIOUS_INT_RESP-quirk.patch b/target/linux/bcm27xx/patches-6.1/950-1075-drivers-mmc-sdhci-add-SPURIOUS_INT_RESP-quirk.patch
deleted file mode 100644
index 2ab224df05..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1075-drivers-mmc-sdhci-add-SPURIOUS_INT_RESP-quirk.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 4d2261fe86ce08bbee3c000718000e9f86593d88 Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.com>
-Date: Wed, 8 Nov 2023 11:52:16 +0000
-Subject: [PATCH] drivers: mmc: sdhci: add SPURIOUS_INT_RESP quirk
-
-Certain controllers (dwc-mshc) generate timeout conditions separately to
-command-completion conditions, where the end result is interrupts are
-separated in time depending on the current SDCLK frequency.
-
-This causes spurious interrupts if SDCLK is slow compared to the CPU's
-ability to process and return from interrupt. This occurs during card
-probe with an empty slot where all commands that would generate a
-response time out.
-
-Add a quirk to squelch command response interrupts when a command
-timeout interrupt is received.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- drivers/mmc/host/sdhci.c | 11 +++++++++++
- drivers/mmc/host/sdhci.h |  3 +++
- 2 files changed, 14 insertions(+)
-
---- a/drivers/mmc/host/sdhci.c
-+++ b/drivers/mmc/host/sdhci.c
-@@ -1728,6 +1728,12 @@ static bool sdhci_send_command(struct sd
- 	if (host->use_external_dma)
- 		sdhci_external_dma_pre_transfer(host, cmd);
- 
-+	if (host->quirks2 & SDHCI_QUIRK2_SPURIOUS_INT_RESP) {
-+		host->ier |= SDHCI_INT_RESPONSE;
-+		sdhci_writel(host, host->ier, SDHCI_INT_ENABLE);
-+		sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE);
-+	}
-+
- 	sdhci_writew(host, SDHCI_MAKE_CMD(cmd->opcode, flags), SDHCI_COMMAND);
- 
- 	return true;
-@@ -3330,6 +3336,11 @@ static void sdhci_cmd_irq(struct sdhci_h
- 		if (intmask & SDHCI_INT_TIMEOUT) {
- 			host->cmd->error = -ETIMEDOUT;
- 			sdhci_err_stats_inc(host, CMD_TIMEOUT);
-+			if (host->quirks2 & SDHCI_QUIRK2_SPURIOUS_INT_RESP) {
-+				host->ier &= ~SDHCI_INT_RESPONSE;
-+				sdhci_writel(host, host->ier, SDHCI_INT_ENABLE);
-+				sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE);
-+			}
- 		} else {
- 			host->cmd->error = -EILSEQ;
- 			if (!mmc_op_tuning(host->cmd->opcode))
---- a/drivers/mmc/host/sdhci.h
-+++ b/drivers/mmc/host/sdhci.h
-@@ -486,6 +486,9 @@ struct sdhci_host {
- #define SDHCI_QUIRK2_NO_SDR50  (1<<20)
- #define SDHCI_QUIRK2_NO_SDR104	(1<<21)
- 
-+/* Command timeouts may generate a trailing INT_RESPONSE later */
-+#define SDHCI_QUIRK2_SPURIOUS_INT_RESP			(1<<31)
-+
- 	int irq;		/* Device IRQ */
- 	void __iomem *ioaddr;	/* Mapped address */
- 	phys_addr_t mapbase;	/* physical address base */
diff --git a/target/linux/bcm27xx/patches-6.1/950-1076-dt-bindings-mmc-sdhci-of-dwcmhsc-Add-Raspberry-Pi-RP.patch b/target/linux/bcm27xx/patches-6.1/950-1076-dt-bindings-mmc-sdhci-of-dwcmhsc-Add-Raspberry-Pi-RP.patch
deleted file mode 100644
index ffdc1b1c5d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1076-dt-bindings-mmc-sdhci-of-dwcmhsc-Add-Raspberry-Pi-RP.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From ebe13d0d4314255d226ba740e37a14172a8b9091 Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.com>
-Date: Wed, 8 Nov 2023 16:10:13 +0000
-Subject: [PATCH] dt-bindings: mmc: sdhci-of-dwcmhsc: Add Raspberry Pi RP1
- support
-
-The DWC MSHC controller on RP1 needs differentiating from the generic
-version.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- .../devicetree/bindings/mmc/snps,dwcmshc-sdhci.yaml          | 5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/Documentation/devicetree/bindings/mmc/snps,dwcmshc-sdhci.yaml
-+++ b/Documentation/devicetree/bindings/mmc/snps,dwcmshc-sdhci.yaml
-@@ -16,6 +16,7 @@ allOf:
- properties:
-   compatible:
-     enum:
-+      - raspberrypi,rp1-dwcmshc
-       - rockchip,rk3568-dwcmshc
-       - rockchip,rk3588-dwcmshc
-       - snps,dwcmshc-sdhci
-@@ -34,6 +35,8 @@ properties:
-       - description: axi clock for rockchip specified
-       - description: block clock for rockchip specified
-       - description: timer clock for rockchip specified
-+      - description: timeout clock for rp1 specified
-+      - description: sdio clock generator for rp1 specified
- 
- 
-   clock-names:
-@@ -44,6 +47,8 @@ properties:
-       - const: axi
-       - const: block
-       - const: timer
-+      - const: timeout
-+      - const: sdio
- 
-   rockchip,txclk-tapnum:
-     description: Specify the number of delay for tx sampling.
diff --git a/target/linux/bcm27xx/patches-6.1/950-1077-drivers-mmc-sdhci-of-dwcmshc-add-RP1-dt-ID-and-quirk.patch b/target/linux/bcm27xx/patches-6.1/950-1077-drivers-mmc-sdhci-of-dwcmshc-add-RP1-dt-ID-and-quirk.patch
deleted file mode 100644
index 54b719c6ec..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1077-drivers-mmc-sdhci-of-dwcmshc-add-RP1-dt-ID-and-quirk.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 80dd8795ca631ac692fd3079487aea6d934a829c Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.com>
-Date: Wed, 8 Nov 2023 16:12:59 +0000
-Subject: [PATCH] drivers: mmc: sdhci-of-dwcmshc: add RP1 dt ID and quirks
-
-Differentiate the RP1 variant of the Designware MSHC controller(s).
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- drivers/mmc/host/sdhci-of-dwcmshc.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
---- a/drivers/mmc/host/sdhci-of-dwcmshc.c
-+++ b/drivers/mmc/host/sdhci-of-dwcmshc.c
-@@ -373,6 +373,15 @@ static const struct sdhci_pltfm_data sdh
- };
- #endif
- 
-+static const struct sdhci_pltfm_data sdhci_dwcmshc_rp1_pdata = {
-+	.ops = &sdhci_dwcmshc_ops,
-+	.quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN |
-+		  SDHCI_QUIRK_BROKEN_CARD_DETECTION,
-+	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
-+		   SDHCI_QUIRK2_BROKEN_HS200 |
-+		   SDHCI_QUIRK2_SPURIOUS_INT_RESP,
-+};
-+
- static const struct sdhci_pltfm_data sdhci_dwcmshc_rk35xx_pdata = {
- 	.ops = &sdhci_dwcmshc_rk35xx_ops,
- 	.quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN |
-@@ -441,6 +450,10 @@ static void dwcmshc_rk35xx_postinit(stru
- 
- static const struct of_device_id sdhci_dwcmshc_dt_ids[] = {
- 	{
-+		.compatible = "raspberrypi,rp1-dwcmshc",
-+		.data = &sdhci_dwcmshc_rp1_pdata,
-+	},
-+	{
- 		.compatible = "rockchip,rk3588-dwcmshc",
- 		.data = &sdhci_dwcmshc_rk35xx_pdata,
- 	},
diff --git a/target/linux/bcm27xx/patches-6.1/950-1078-arm-dts-change-RP1-SDHCI-controller-compatible-strin.patch b/target/linux/bcm27xx/patches-6.1/950-1078-arm-dts-change-RP1-SDHCI-controller-compatible-strin.patch
deleted file mode 100644
index c708bf1f71..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1078-arm-dts-change-RP1-SDHCI-controller-compatible-strin.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 51cdff455e3c3df29764f71bc0c9dd0e099945d6 Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.com>
-Date: Wed, 8 Nov 2023 16:14:25 +0000
-Subject: [PATCH] arm: dts: change RP1 SDHCI controller compatible string
-
-Also add a sdio-pi5 overlay which enables mmc0 on GPIOs 22-27, as was
-possible with earlier models of Pi.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/Makefile           |  1 +
- arch/arm/boot/dts/overlays/README             |  7 ++++++
- arch/arm/boot/dts/overlays/overlay_map.dts    |  4 ++++
- .../boot/dts/overlays/sdio-pi5-overlay.dts    | 24 +++++++++++++++++++
- arch/arm/boot/dts/rp1.dtsi                    |  4 ++--
- 5 files changed, 38 insertions(+), 2 deletions(-)
- create mode 100644 arch/arm/boot/dts/overlays/sdio-pi5-overlay.dts
-
---- a/arch/arm/boot/dts/overlays/Makefile
-+++ b/arch/arm/boot/dts/overlays/Makefile
-@@ -225,6 +225,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
- 	sc16is752-spi1.dtbo \
- 	sdhost.dtbo \
- 	sdio.dtbo \
-+	sdio-pi5.dtbo \
- 	seeed-can-fd-hat-v1.dtbo \
- 	seeed-can-fd-hat-v2.dtbo \
- 	sh1106-spi.dtbo \
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -3932,6 +3932,13 @@ Info:   This overlay is now deprecated.
- Load:   <Deprecated>
- 
- 
-+Name:   sdio-pi5
-+Info:   Selects the rp1_mmc0 interface and enables it on GPIOs 22-27.
-+        Pi 5 only.
-+Load:   dtoverlay=sdio-pi5
-+Params: <None>
-+
-+
- Name:   sdtweak
- Info:   This overlay is now deprecated. Use the sd_* dtparams in the
-         base DTB, e.g. "dtoverlay=sdtweak,poll_once" becomes
---- a/arch/arm/boot/dts/overlays/overlay_map.dts
-+++ b/arch/arm/boot/dts/overlays/overlay_map.dts
-@@ -250,6 +250,10 @@
- 		deprecated = "use sdio,bus_width=1,gpios_22_25";
- 	};
- 
-+	sdio-pi5 {
-+		bcm2712;
-+	};
-+
- 	sdtweak {
- 		deprecated = "use 'dtparam=sd_poll_once' etc.";
- 	};
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/sdio-pi5-overlay.dts
-@@ -0,0 +1,24 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/* SDIO/SD/MMC on RP1 bank 0 */
-+
-+/{
-+	compatible = "brcm,bcm2712";
-+
-+	fragment@0 {
-+		target = <&rp1_mmc0>;
-+		frag0: __overlay__ {
-+			status = "okay";
-+			pinctrl-0 = <&rp1_sdio0_22_27>;
-+			pinctrl-names = "default";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&rp1_sdio_clk0>;
-+		frag1: __overlay__ {
-+			status = "okay";
-+		};
-+	};
-+};
---- a/arch/arm/boot/dts/rp1.dtsi
-+++ b/arch/arm/boot/dts/rp1.dtsi
-@@ -962,7 +962,7 @@
- 
- 		rp1_mmc0: mmc@180000 {
- 			reg = <0xc0 0x40180000  0x0 0x100>;
--			compatible = "snps,dwcmshc-sdhci";
-+			compatible = "raspberrypi,rp1-dwcmshc";
- 			interrupts = <RP1_INT_SDIO0 IRQ_TYPE_LEVEL_HIGH>;
- 			clocks = <&rp1_clocks RP1_CLK_SYS &sdhci_core
- 			          &rp1_clocks RP1_CLK_SDIO_TIMER
-@@ -978,7 +978,7 @@
- 
- 		rp1_mmc1: mmc@184000 {
- 			reg = <0xc0 0x40184000  0x0 0x100>;
--			compatible = "snps,dwcmshc-sdhci";
-+			compatible = "raspberrypi,rp1-dwcmshc";
- 			interrupts = <RP1_INT_SDIO1 IRQ_TYPE_LEVEL_HIGH>;
- 			clocks = <&rp1_clocks RP1_CLK_SYS &sdhci_core
- 			          &rp1_clocks RP1_CLK_SDIO_TIMER
diff --git a/target/linux/bcm27xx/patches-6.1/950-1079-ASoC-bcm-audioinjector_octo-Add-soundcard-owner.patch b/target/linux/bcm27xx/patches-6.1/950-1079-ASoC-bcm-audioinjector_octo-Add-soundcard-owner.patch
deleted file mode 100644
index aa025125e7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1079-ASoC-bcm-audioinjector_octo-Add-soundcard-owner.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 020ee5029ab0b11e47696f538418105ccfdb44de Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 8 Nov 2023 19:17:33 +0000
-Subject: [PATCH] ASoC: bcm: audioinjector_octo: Add soundcard "owner"
-
-See: https://github.com/raspberrypi/linux/issues/5697
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- sound/soc/bcm/audioinjector-octo-soundcard.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/sound/soc/bcm/audioinjector-octo-soundcard.c
-+++ b/sound/soc/bcm/audioinjector-octo-soundcard.c
-@@ -252,6 +252,7 @@ static const struct snd_soc_dapm_route a
- 
- static struct snd_soc_card snd_soc_audioinjector_octo = {
- 	.name = "audioinjector-octo-soundcard",
-+	.owner = THIS_MODULE,
- 	.dai_link = audioinjector_octo_dai,
- 	.num_links = ARRAY_SIZE(audioinjector_octo_dai),
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1080-drivers-media-imx708-Adjust-broken-line-correction-p.patch b/target/linux/bcm27xx/patches-6.1/950-1080-drivers-media-imx708-Adjust-broken-line-correction-p.patch
deleted file mode 100644
index 60f489c6c0..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1080-drivers-media-imx708-Adjust-broken-line-correction-p.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From f364e0eb8f973e1aa24a3c451d18e84247a8efcd Mon Sep 17 00:00:00 2001
-From: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
-Date: Wed, 8 Nov 2023 10:57:45 +0000
-Subject: [PATCH] drivers: media: imx708: Adjust broken line correction
- parameter
-
-In full-resolution mode, the LPF_INTENSITY_EN and LPF_INTENSITY
-registers control Quad Bayer Re-mosaic broken line correction.
-Expose this as a module parameter "qbc_adjust": zero disables
-the correction and values in the range 2 to 5 set its strength.
-
-There is a trade-off between coloured and monochrome patterns.
-The previous fixed value 4 could produce ladder/spots artefacts
-in coloured textures. The new default value 2 may suit a wider
-range of scenes.
-
-Signed-off-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
----
- drivers/media/i2c/imx708.c | 50 ++++++++++++++++++++++++++++++++------
- 1 file changed, 42 insertions(+), 8 deletions(-)
-
---- a/drivers/media/i2c/imx708.c
-+++ b/drivers/media/i2c/imx708.c
-@@ -20,6 +20,14 @@
- #include <media/v4l2-fwnode.h>
- #include <media/v4l2-mediabus.h>
- 
-+/*
-+ * Parameter to adjust Quad Bayer re-mosaic broken line correction
-+ * strength, used in full-resolution mode only. Set zero to disable.
-+ */
-+static int qbc_adjust = 2;
-+module_param(qbc_adjust, int, 0644);
-+MODULE_PARM_DESC(qbc_adjust, "Quad Bayer broken line correction strength [0,2-5]");
-+
- #define IMX708_REG_VALUE_08BIT		1
- #define IMX708_REG_VALUE_16BIT		2
- 
-@@ -99,11 +107,17 @@
- 
- /* HDR exposure ratio (long:med == med:short) */
- #define IMX708_HDR_EXPOSURE_RATIO       4
--#define IMX708_REG_MID_EXPOSURE	0x3116
--#define IMX708_REG_SHT_EXPOSURE	0x0224
-+#define IMX708_REG_MID_EXPOSURE		0x3116
-+#define IMX708_REG_SHT_EXPOSURE		0x0224
- #define IMX708_REG_MID_ANALOG_GAIN	0x3118
- #define IMX708_REG_SHT_ANALOG_GAIN	0x0216
- 
-+/* QBC Re-mosaic broken line correction registers */
-+#define IMX708_LPF_INTENSITY_EN		0xC428
-+#define IMX708_LPF_INTENSITY_ENABLED	0x00
-+#define IMX708_LPF_INTENSITY_DISABLED	0x01
-+#define IMX708_LPF_INTENSITY		0xC429
-+
- /*
-  * Metadata buffer holds a variety of data, all sent with the same VC/DT (0x12).
-  * It comprises two scanlines (of up to 5760 bytes each, for 4608 pixels)
-@@ -171,6 +185,9 @@ struct imx708_mode {
- 
- 	/* HDR flag, used for checking if the current mode is HDR */
- 	bool hdr;
-+
-+	/* Quad Bayer Re-mosaic flag */
-+	bool remosaic;
- };
- 
- /* Default PDAF pixel correction gains */
-@@ -363,8 +380,6 @@ static const struct imx708_reg mode_4608
- 	{0x341f, 0x20},
- 	{0x3420, 0x00},
- 	{0x3421, 0xd8},
--	{0xC428, 0x00},
--	{0xC429, 0x04},
- 	{0x3366, 0x00},
- 	{0x3367, 0x00},
- 	{0x3368, 0x00},
-@@ -677,7 +692,8 @@ static const struct imx708_mode supporte
- 		.pixel_rate = 595200000,
- 		.exposure_lines_min = 8,
- 		.exposure_lines_step = 1,
--		.hdr = false
-+		.hdr = false,
-+		.remosaic = true
- 	},
- 	{
- 		/* regular 2x2 binned. */
-@@ -699,7 +715,8 @@ static const struct imx708_mode supporte
- 		.pixel_rate = 585600000,
- 		.exposure_lines_min = 4,
- 		.exposure_lines_step = 2,
--		.hdr = false
-+		.hdr = false,
-+		.remosaic = false
- 	},
- 	{
- 		/* 2x2 binned and cropped for 720p. */
-@@ -721,7 +738,8 @@ static const struct imx708_mode supporte
- 		.pixel_rate = 566400000,
- 		.exposure_lines_min = 4,
- 		.exposure_lines_step = 2,
--		.hdr = false
-+		.hdr = false,
-+		.remosaic = false
- 	},
- };
- 
-@@ -746,7 +764,8 @@ static const struct imx708_mode supporte
- 		.pixel_rate = 777600000,
- 		.exposure_lines_min = 8 * IMX708_HDR_EXPOSURE_RATIO * IMX708_HDR_EXPOSURE_RATIO,
- 		.exposure_lines_step = 2 * IMX708_HDR_EXPOSURE_RATIO * IMX708_HDR_EXPOSURE_RATIO,
--		.hdr = true
-+		.hdr = true,
-+		.remosaic = false
- 	}
- };
- 
-@@ -1515,6 +1534,21 @@ static int imx708_start_streaming(struct
- 		return ret;
- 	}
- 
-+	/* Quad Bayer re-mosaic adjustments (for full-resolution mode only) */
-+	if (imx708->mode->remosaic && qbc_adjust > 0) {
-+		imx708_write_reg(imx708, IMX708_LPF_INTENSITY,
-+				 IMX708_REG_VALUE_08BIT, qbc_adjust);
-+		imx708_write_reg(imx708,
-+				 IMX708_LPF_INTENSITY_EN,
-+				 IMX708_REG_VALUE_08BIT,
-+				 IMX708_LPF_INTENSITY_ENABLED);
-+	} else {
-+		imx708_write_reg(imx708,
-+				 IMX708_LPF_INTENSITY_EN,
-+				 IMX708_REG_VALUE_08BIT,
-+				 IMX708_LPF_INTENSITY_DISABLED);
-+	}
-+
- 	/* Apply customized values from user */
- 	ret =  __v4l2_ctrl_handler_setup(imx708->sd.ctrl_handler);
- 	if (ret)
diff --git a/target/linux/bcm27xx/patches-6.1/950-1082-drivers-media-cfe-Don-t-confuse-MHz-and-Mbps.patch b/target/linux/bcm27xx/patches-6.1/950-1082-drivers-media-cfe-Don-t-confuse-MHz-and-Mbps.patch
deleted file mode 100644
index ea0ea396ba..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1082-drivers-media-cfe-Don-t-confuse-MHz-and-Mbps.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 65407c54fb4119e528b70b329448269657e0941e Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Wed, 8 Nov 2023 10:05:05 +0000
-Subject: [PATCH] drivers: media: cfe: Don't confuse MHz and Mbps
-
-The driver was interchaning these units when talking about link rate.
-Fix this to avoid confusion. Apart from the logging message change,
-there is no function change in this commit.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/platform/raspberrypi/rp1_cfe/cfe.c  |  8 ++++----
- drivers/media/platform/raspberrypi/rp1_cfe/dphy.c | 10 +++++-----
- drivers/media/platform/raspberrypi/rp1_cfe/dphy.h |  2 +-
- 3 files changed, 10 insertions(+), 10 deletions(-)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-@@ -983,7 +983,7 @@ static void cfe_buffer_queue(struct vb2_
- 	spin_unlock_irqrestore(&cfe->state_lock, flags);
- }
- 
--static u64 sensor_link_frequency(struct cfe_device *cfe)
-+static u64 sensor_link_rate(struct cfe_device *cfe)
- {
- 	struct v4l2_mbus_framefmt *source_fmt;
- 	struct v4l2_subdev_state *state;
-@@ -1028,11 +1028,11 @@ static u64 sensor_link_frequency(struct
- 
- 	/* x2 for DDR. */
- 	link_freq *= 2;
--	cfe_info("Using a link frequency of %lld Hz\n", link_freq);
-+	cfe_info("Using a link rate of %lld Mbps\n", link_freq / (1000 * 1000));
- 	return link_freq;
- 
- err:
--	cfe_err("Unable to determine sensor link frequency, using 999 MHz\n");
-+	cfe_err("Unable to determine sensor link rate, using 999 Mbps\n");
- 	return 999 * 1000000UL;
- }
- 
-@@ -1104,7 +1104,7 @@ static int cfe_start_streaming(struct vb
- 	}
- 
- 	cfe_dbg("Configuring CSI-2 block\n");
--	cfe->csi2.dphy.dphy_freq = sensor_link_frequency(cfe) / 1000000UL;
-+	cfe->csi2.dphy.dphy_rate = sensor_link_rate(cfe) / 1000000UL;
- 	csi2_open_rx(&cfe->csi2);
- 
- 	cfe_dbg("Starting sensor streaming\n");
---- a/drivers/media/platform/raspberrypi/rp1_cfe/dphy.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/dphy.c
-@@ -96,7 +96,7 @@ static uint8_t dphy_transaction(struct d
- 	return get_tstdout(dphy);
- }
- 
--static void dphy_set_hsfreqrange(struct dphy_data *dphy, uint32_t freq_mhz)
-+static void dphy_set_hsfreqrange(struct dphy_data *dphy, uint32_t mbps)
- {
- 	/* See Table 5-1 on page 65 of dphy databook */
- 	static const u16 hsfreqrange_table[][2] = {
-@@ -116,11 +116,11 @@ static void dphy_set_hsfreqrange(struct
- 	};
- 	unsigned int i;
- 
--	if (freq_mhz < 80 || freq_mhz > 1500)
--		dphy_err("DPHY: Frequency %u MHz out of range\n", freq_mhz);
-+	if (mbps < 80 || mbps > 1500)
-+		dphy_err("DPHY: Datarate %u Mbps out of range\n", mbps);
- 
- 	for (i = 0; i < ARRAY_SIZE(hsfreqrange_table) - 1; i++) {
--		if (freq_mhz <= hsfreqrange_table[i][0])
-+		if (mbps <= hsfreqrange_table[i][0])
- 			break;
- 	}
- 
-@@ -139,7 +139,7 @@ static void dphy_init(struct dphy_data *
- 	set_tstclr(dphy, 0);
- 	usleep_range(15, 20);
- 
--	dphy_set_hsfreqrange(dphy, dphy->dphy_freq);
-+	dphy_set_hsfreqrange(dphy, dphy->dphy_rate);
- 
- 	usleep_range(5, 10);
- 	dw_csi2_host_write(dphy, PHY_SHUTDOWNZ, 1);
---- a/drivers/media/platform/raspberrypi/rp1_cfe/dphy.h
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/dphy.h
-@@ -15,7 +15,7 @@ struct dphy_data {
- 
- 	void __iomem *base;
- 
--	u32 dphy_freq;
-+	u32 dphy_rate;
- 	u32 num_lanes;
- };
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1083-overlays-imx296-Fix-cam-port-override-for-regulators.patch b/target/linux/bcm27xx/patches-6.1/950-1083-overlays-imx296-Fix-cam-port-override-for-regulators.patch
deleted file mode 100644
index 1b6d2041f1..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1083-overlays-imx296-Fix-cam-port-override-for-regulators.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6137fb168c08bd8c41c8421bf26f09ed29479f08 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Wed, 15 Nov 2023 08:25:11 +0000
-Subject: [PATCH] overlays: imx296: Fix cam port override for regulators
-
-The override was missing/incorrect for the regulator labels.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/imx296-overlay.dts | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/arch/arm/boot/dts/overlays/imx296-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/imx296-overlay.dts
-@@ -97,8 +97,9 @@
- 		cam0 = <&i2c_frag>, "target:0=",<&i2c_csi_dsi0>,
- 		       <&csi_frag>, "target:0=",<&csi0>,
- 		       <&clk_frag>, "target:0=",<&cam0_clk>,
-+		       <&reg_frag>, "target:0=",<&cam0_reg>,
- 		       <&imx296>, "clocks:0=",<&cam0_clk>,
--		       <&imx296>, "VANA-supply:0=",<&cam0_reg>;
-+		       <&imx296>, "avdd-supply:0=",<&cam0_reg>;
- 		clock-frequency = <&clk_over>, "clock-frequency:0";
- 	};
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-1148-overlays-ov5647-Regularise-vcm-node-label-name.patch b/target/linux/bcm27xx/patches-6.1/950-1148-overlays-ov5647-Regularise-vcm-node-label-name.patch
deleted file mode 100644
index 28017989a9..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1148-overlays-ov5647-Regularise-vcm-node-label-name.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 7443b602cb503b42dd0ae8e957e26decb420d632 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 20 Nov 2023 10:15:15 +0000
-Subject: [PATCH] overlays: ov5647: Regularise vcm node label name
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/ov5647-overlay.dts | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/ov5647-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/ov5647-overlay.dts
-@@ -15,7 +15,7 @@
- 
- 			#include "ov5647.dtsi"
- 
--			vcm: ad5398@c {
-+			vcm_node: ad5398@c {
- 				compatible = "adi,ad5398";
- 				reg = <0x0c>;
- 				status = "disabled";
-@@ -78,8 +78,8 @@
- 		       <&clk_frag>, "target:0=",<&cam0_clk>,
- 		       <&cam_node>, "clocks:0=",<&cam0_clk>,
- 		       <&cam_node>, "avdd-supply:0=",<&cam0_reg>;
--		vcm = <&vcm>, "status=okay",
--		      <&cam_node>,"lens-focus:0=", <&vcm>;
-+		vcm = <&vcm_node>, "status=okay",
-+		       <&cam_node>,"lens-focus:0=", <&vcm_node>;
- 	};
- };
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1149-overlays-ov5647-cam0-mode-should-use-cam0_reg.patch b/target/linux/bcm27xx/patches-6.1/950-1149-overlays-ov5647-cam0-mode-should-use-cam0_reg.patch
deleted file mode 100644
index f079756133..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1149-overlays-ov5647-cam0-mode-should-use-cam0_reg.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d484bef133af9c87d64899fc1e1d0be2a7c7785b Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 20 Nov 2023 10:16:10 +0000
-Subject: [PATCH] overlays: ov5647: cam0 mode should use cam0_reg
-
-When the cam0 parameter is used, the vcm should be updated to refer to
-the cam0 regulator.
-
-See: https://github.com/raspberrypi/linux/issues/5722
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/ov5647-overlay.dts | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/arch/arm/boot/dts/overlays/ov5647-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/ov5647-overlay.dts
-@@ -77,7 +77,8 @@
- 		       <&reg_frag>, "target:0=",<&cam0_reg>,
- 		       <&clk_frag>, "target:0=",<&cam0_clk>,
- 		       <&cam_node>, "clocks:0=",<&cam0_clk>,
--		       <&cam_node>, "avdd-supply:0=",<&cam0_reg>;
-+		       <&cam_node>, "avdd-supply:0=",<&cam0_reg>,
-+		       <&vcm_node>, "VANA-supply:0=",<&cam0_reg>;
- 		vcm = <&vcm_node>, "status=okay",
- 		       <&cam_node>,"lens-focus:0=", <&vcm_node>;
- 	};
diff --git a/target/linux/bcm27xx/patches-6.1/950-1150-w1-Disable-kernel-log-spam.patch b/target/linux/bcm27xx/patches-6.1/950-1150-w1-Disable-kernel-log-spam.patch
deleted file mode 100644
index 457a0e9ec5..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1150-w1-Disable-kernel-log-spam.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0924b74687bd195b98f223814ff88b4227654e85 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 20 Nov 2023 14:46:14 +0000
-Subject: [PATCH] w1: Disable kernel log spam
-
-See: https://forums.raspberrypi.com/viewtopic.php?p=2159344
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/w1/w1.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/w1/w1.c
-+++ b/drivers/w1/w1.c
-@@ -742,8 +742,10 @@ int w1_attach_slave_device(struct w1_mas
- 	atomic_set(&sl->refcnt, 1);
- 	atomic_inc(&sl->master->refcnt);
- 	dev->slave_count++;
-+#if 0
- 	dev_info(&dev->dev, "Attaching one wire slave %02x.%012llx crc %02x\n",
- 		  rn->family, (unsigned long long)rn->id, rn->crc);
-+#endif
- 
- 	/* slave modules need to be loaded in a context with unlocked mutex */
- 	mutex_unlock(&dev->mutex);
diff --git a/target/linux/bcm27xx/patches-6.1/950-1151-include-uapi-mbus-Add-a-media-bus-format-enum-for-16.patch b/target/linux/bcm27xx/patches-6.1/950-1151-include-uapi-mbus-Add-a-media-bus-format-enum-for-16.patch
deleted file mode 100644
index b8933bcbb6..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1151-include-uapi-mbus-Add-a-media-bus-format-enum-for-16.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From be8ca764e0530ec8ac18ca03c49e3cda13562d3a Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Thu, 16 Nov 2023 14:21:05 +0000
-Subject: [PATCH] include: uapi: mbus: Add a media bus format enum for 16-bit
- mono output
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- include/uapi/linux/media-bus-format.h | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/include/uapi/linux/media-bus-format.h
-+++ b/include/uapi/linux/media-bus-format.h
-@@ -95,6 +95,7 @@
- #define MEDIA_BUS_FMT_YUYV12_2X12		0x201e
- #define MEDIA_BUS_FMT_YVYU12_2X12		0x201f
- #define MEDIA_BUS_FMT_Y14_1X14			0x202d
-+#define MEDIA_BUS_FMT_Y16_1X16			0x202e
- #define MEDIA_BUS_FMT_UYVY8_1X16		0x200f
- #define MEDIA_BUS_FMT_VYUY8_1X16		0x2010
- #define MEDIA_BUS_FMT_YUYV8_1X16		0x2011
diff --git a/target/linux/bcm27xx/patches-6.1/950-1152-include-uapi-v4l2-Add-additional-pixel-formats-for-u.patch b/target/linux/bcm27xx/patches-6.1/950-1152-include-uapi-v4l2-Add-additional-pixel-formats-for-u.patch
deleted file mode 100644
index 56855184be..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1152-include-uapi-v4l2-Add-additional-pixel-formats-for-u.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 9abab2e8e5cfbeae6e1b33cc3a5ed773e4e31774 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Thu, 16 Nov 2023 14:25:39 +0000
-Subject: [PATCH] include: uapi: v4l2: Add additional pixel formats for use
- with PiSP
-
-Add the following formats:
-
-- V4L2_PIX_FMT_RGB48/V4L2_PIX_FMT_BGR48
-  48-bit RGB where each colour sample is 16-bits.
-
-- V4L2_PIX_FMT_PISP_COMP1_MONO/V4L2_PIX_FMT_PISP_COMP2_MONO
-  16-bit to 8-bit pisp compressed monochrome pixel format.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/v4l2-core/v4l2-ioctl.c | 8 ++++++--
- include/uapi/linux/videodev2.h       | 6 ++++++
- 2 files changed, 12 insertions(+), 2 deletions(-)
-
---- a/drivers/media/v4l2-core/v4l2-ioctl.c
-+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
-@@ -1304,6 +1304,8 @@ static void v4l_fill_fmtdesc(struct v4l2
- 	case V4L2_PIX_FMT_BGRX32:	descr = "32-bit XBGR 8-8-8-8"; break;
- 	case V4L2_PIX_FMT_RGBA32:	descr = "32-bit RGBA 8-8-8-8"; break;
- 	case V4L2_PIX_FMT_RGBX32:	descr = "32-bit RGBX 8-8-8-8"; break;
-+	case V4L2_PIX_FMT_BGR48:	descr = "48-bit BGR 16-16-16"; break;
-+	case V4L2_PIX_FMT_RGB48:	descr = "48-bit RGB 16-16-16"; break;
- 	case V4L2_PIX_FMT_GREY:		descr = "8-bit Greyscale"; break;
- 	case V4L2_PIX_FMT_Y4:		descr = "4-bit Greyscale"; break;
- 	case V4L2_PIX_FMT_Y6:		descr = "6-bit Greyscale"; break;
-@@ -1510,11 +1512,13 @@ static void v4l_fill_fmtdesc(struct v4l2
- 		case V4L2_PIX_FMT_PISP_COMP1_RGGB:
- 		case V4L2_PIX_FMT_PISP_COMP1_GRBG:
- 		case V4L2_PIX_FMT_PISP_COMP1_GBRG:
--		case V4L2_PIX_FMT_PISP_COMP1_BGGR: descr = "PiSP Bayer Comp 1"; break;
-+		case V4L2_PIX_FMT_PISP_COMP1_BGGR:
-+		case V4L2_PIX_FMT_PISP_COMP1_MONO: descr = "PiSP Bayer Comp 1"; break;
- 		case V4L2_PIX_FMT_PISP_COMP2_RGGB:
- 		case V4L2_PIX_FMT_PISP_COMP2_GRBG:
- 		case V4L2_PIX_FMT_PISP_COMP2_GBRG:
--		case V4L2_PIX_FMT_PISP_COMP2_BGGR: descr = "PiSP Bayer Comp 2"; break;
-+		case V4L2_PIX_FMT_PISP_COMP2_BGGR:
-+		case V4L2_PIX_FMT_PISP_COMP2_MONO: descr = "PiSP Bayer Comp 2"; break;
- 		default:
- 			if (fmt->description[0])
- 				return;
---- a/include/uapi/linux/videodev2.h
-+++ b/include/uapi/linux/videodev2.h
-@@ -582,6 +582,10 @@ struct v4l2_pix_format {
- #define V4L2_PIX_FMT_ARGB32  v4l2_fourcc('B', 'A', '2', '4') /* 32  ARGB-8-8-8-8  */
- #define V4L2_PIX_FMT_XRGB32  v4l2_fourcc('B', 'X', '2', '4') /* 32  XRGB-8-8-8-8  */
- 
-+/* RGB formats (6 bytes per pixel) */
-+#define V4L2_PIX_FMT_BGR48 v4l2_fourcc('B', 'G', 'R', '6') /* 16  BGR-16-16-16 */
-+#define V4L2_PIX_FMT_RGB48 v4l2_fourcc('R', 'G', 'B', '6') /* 16  RGB-16-16-16 */
-+
- /* Grey formats */
- #define V4L2_PIX_FMT_GREY    v4l2_fourcc('G', 'R', 'E', 'Y') /*  8  Greyscale     */
- #define V4L2_PIX_FMT_Y4      v4l2_fourcc('Y', '0', '4', ' ') /*  4  Greyscale     */
-@@ -799,10 +803,12 @@ struct v4l2_pix_format {
- #define V4L2_PIX_FMT_PISP_COMP1_GRBG	v4l2_fourcc('P', 'C', '1', 'G')
- #define V4L2_PIX_FMT_PISP_COMP1_GBRG	v4l2_fourcc('P', 'C', '1', 'g')
- #define V4L2_PIX_FMT_PISP_COMP1_BGGR	v4l2_fourcc('P', 'C', '1', 'B')
-+#define V4L2_PIX_FMT_PISP_COMP1_MONO	v4l2_fourcc('P', 'C', '1', 'M')
- #define V4L2_PIX_FMT_PISP_COMP2_RGGB	v4l2_fourcc('P', 'C', '2', 'R')
- #define V4L2_PIX_FMT_PISP_COMP2_GRBG	v4l2_fourcc('P', 'C', '2', 'G')
- #define V4L2_PIX_FMT_PISP_COMP2_GBRG	v4l2_fourcc('P', 'C', '2', 'g')
- #define V4L2_PIX_FMT_PISP_COMP2_BGGR	v4l2_fourcc('P', 'C', '2', 'B')
-+#define V4L2_PIX_FMT_PISP_COMP2_MONO	v4l2_fourcc('P', 'C', '2', 'M')
- 
- /* SDR formats - used only for Software Defined Radio devices */
- #define V4L2_SDR_FMT_CU8          v4l2_fourcc('C', 'U', '0', '8') /* IQ u8 */
diff --git a/target/linux/bcm27xx/patches-6.1/950-1153-drivers-media-cfe-Add-16-bit-and-compressed-mono-for.patch b/target/linux/bcm27xx/patches-6.1/950-1153-drivers-media-cfe-Add-16-bit-and-compressed-mono-for.patch
deleted file mode 100644
index 607f23eeb3..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1153-drivers-media-cfe-Add-16-bit-and-compressed-mono-for.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 88d06a674009ad5b77234537527a800e6e0e88a3 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Thu, 16 Nov 2023 14:28:55 +0000
-Subject: [PATCH] drivers: media: cfe: Add 16-bit and compressed mono format
- support
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- .../media/platform/raspberrypi/rp1_cfe/cfe_fmts.h  | 14 ++++++++++----
- 1 file changed, 10 insertions(+), 4 deletions(-)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe_fmts.h
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe_fmts.h
-@@ -249,28 +249,34 @@ static const struct cfe_fmt formats[] =
- 		.code = MEDIA_BUS_FMT_Y10_1X10,
- 		.depth = 10,
- 		.csi_dt = 0x2b,
--		.remap = { V4L2_PIX_FMT_Y16 },
-+		.remap = { V4L2_PIX_FMT_Y16, V4L2_PIX_FMT_PISP_COMP1_MONO },
- 	},
- 	{
- 		.fourcc = V4L2_PIX_FMT_Y12P,
- 		.code = MEDIA_BUS_FMT_Y12_1X12,
- 		.depth = 12,
- 		.csi_dt = 0x2c,
--		.remap = { V4L2_PIX_FMT_Y16 },
-+		.remap = { V4L2_PIX_FMT_Y16, V4L2_PIX_FMT_PISP_COMP1_MONO },
- 	},
- 	{
- 		.fourcc = V4L2_PIX_FMT_Y14P,
- 		.code = MEDIA_BUS_FMT_Y14_1X14,
- 		.depth = 14,
- 		.csi_dt = 0x2d,
--		.remap = { V4L2_PIX_FMT_Y16 },
-+		.remap = { V4L2_PIX_FMT_Y16, V4L2_PIX_FMT_PISP_COMP1_MONO },
- 	},
- 	{
- 		.fourcc = V4L2_PIX_FMT_Y16,
-+		.code = MEDIA_BUS_FMT_Y16_1X16,
- 		.depth = 16,
- 		.flags = CFE_FORMAT_FLAG_FE_OUT,
- 	},
--
-+	{
-+		.fourcc = V4L2_PIX_FMT_PISP_COMP1_MONO,
-+		.code = MEDIA_BUS_FMT_Y16_1X16,
-+		.depth = 8,
-+		.flags = CFE_FORMAT_FLAG_FE_OUT,
-+	},
- 	/* Embedded data format */
- 	{
- 		.fourcc = V4L2_META_FMT_SENSOR_DATA,
diff --git a/target/linux/bcm27xx/patches-6.1/950-1154-drivers-media-pisp_be-Add-mono-and-48-bit-RGB-pixel-.patch b/target/linux/bcm27xx/patches-6.1/950-1154-drivers-media-pisp_be-Add-mono-and-48-bit-RGB-pixel-.patch
deleted file mode 100644
index 2ea4abd112..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1154-drivers-media-pisp_be-Add-mono-and-48-bit-RGB-pixel-.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 2affda8d2b172aa0fd22778983d983fc9522e621 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Thu, 16 Nov 2023 14:29:47 +0000
-Subject: [PATCH] drivers: media: pisp_be: Add mono and 48-bit RGB pixel format
- support
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- .../raspberrypi/pisp_be/pisp_be_formats.h     | 45 +++++++++++++++++++
- 1 file changed, 45 insertions(+)
-
---- a/drivers/media/platform/raspberrypi/pisp_be/pisp_be_formats.h
-+++ b/drivers/media/platform/raspberrypi/pisp_be/pisp_be_formats.h
-@@ -234,6 +234,24 @@ static const struct pisp_be_format suppo
- 		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
- 		.colorspace_default = V4L2_COLORSPACE_SRGB,
- 	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_RGB48,
-+		.align		    = 64,
-+		.bit_depth	    = 48,
-+		.plane_factor	    = { P3(1.0) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
-+		.colorspace_default = V4L2_COLORSPACE_SRGB,
-+	},
-+	{
-+		.fourcc		    = V4L2_PIX_FMT_BGR48,
-+		.align		    = 64,
-+		.bit_depth	    = 48,
-+		.plane_factor	    = { P3(1.0) },
-+		.num_planes	    = 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_ALL_SRGB,
-+		.colorspace_default = V4L2_COLORSPACE_SRGB,
-+	},
- 	/* Bayer formats - 8-bit */
- 	{
- 		.fourcc		    = V4L2_PIX_FMT_SRGGB8,
-@@ -457,6 +475,33 @@ static const struct pisp_be_format suppo
- 		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
- 		.colorspace_default = V4L2_COLORSPACE_RAW,
- 	},
-+	/* Greyscale Formats */
-+	{
-+		.fourcc		= V4L2_PIX_FMT_GREY,
-+		.bit_depth	= 8,
-+		.align		= 32,
-+		.num_planes	= 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
-+	},
-+	{
-+		.fourcc		= V4L2_PIX_FMT_Y16,
-+		.bit_depth	= 16,
-+		.align		= 32,
-+		.plane_factor	= { P3(1.0) },
-+		.num_planes	= 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
-+	},
-+	{
-+		.fourcc		= V4L2_PIX_FMT_PISP_COMP1_MONO,
-+		.bit_depth	= 8,
-+		.align		= 32,
-+		.plane_factor	= { P3(1.0) },
-+		.num_planes	= 1,
-+		.colorspace_mask    = V4L2_COLORSPACE_MASK_RAW,
-+		.colorspace_default = V4L2_COLORSPACE_RAW,
-+	},
- 	/* Opaque BE format for HW verification. */
- 	{
- 		.fourcc		    = V4L2_PIX_FMT_RPI_BE,
diff --git a/target/linux/bcm27xx/patches-6.1/950-1155-ASoC-dwc-Remove-check-in-set_bclk_ratio-handling.patch b/target/linux/bcm27xx/patches-6.1/950-1155-ASoC-dwc-Remove-check-in-set_bclk_ratio-handling.patch
deleted file mode 100644
index 88bb61a4c3..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1155-ASoC-dwc-Remove-check-in-set_bclk_ratio-handling.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 52545628c07be2fd1c9df598a17130d92f12da23 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 20 Nov 2023 15:17:34 +0000
-Subject: [PATCH] ASoC: dwc: Remove check in set_bclk_ratio handling
-
-A check added to dw_i2s_set_bclk_ratio that the data format is
-consistent with the ratio seems reasonable but breaks when the
-ratio is changed before the format. Remove the check - it is
-unnecessary.
-
-See: https://github.com/raspberrypi/linux/issues/5724
-Fixes: 9c6694c24f26 ("ASOC: dwc: Fix 16-bit audio handling")
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- sound/soc/dwc/dwc-i2s.c | 3 ---
- 1 file changed, 3 deletions(-)
-
---- a/sound/soc/dwc/dwc-i2s.c
-+++ b/sound/soc/dwc/dwc-i2s.c
-@@ -427,11 +427,8 @@ static int dw_i2s_set_bclk_ratio(struct
- 				 unsigned int ratio)
- {
- 	struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(cpu_dai);
--	struct i2s_clk_config_data *config = &dev->config;
- 
- 	dev_dbg(dev->dev, "%s(%d)\n", __func__, ratio);
--	if (ratio < config->data_width * 2)
--		return -EINVAL;
- 
- 	switch (ratio) {
- 	case 32:
diff --git a/target/linux/bcm27xx/patches-6.1/950-1159-overlays-README-Fix-cut-and-paste-errors.patch b/target/linux/bcm27xx/patches-6.1/950-1159-overlays-README-Fix-cut-and-paste-errors.patch
deleted file mode 100644
index 30cc82b0cd..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1159-overlays-README-Fix-cut-and-paste-errors.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 5a0aa24b8ff58ceaf98c62670156bef7f48ed32b Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 21 Nov 2023 15:08:38 +0000
-Subject: [PATCH] overlays: README: Fix cut-and-paste errors
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/README | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -1673,7 +1673,7 @@ Params: 24db_digital_gain       Allow ga
-                                 responsibility of the user to ensure that
-                                 the Digital volume control is set to a value
-                                 that does not result in clipping/distortion!)
--        slave                   Force DAC+ Pro into slave mode, using Pi as
-+        slave                   Force AMP100 into slave mode, using Pi as
-                                 master for bit clock and frame clock.
-         leds_off                If set to 'true' the onboard indicator LEDs
-                                 are switched off at all times.
-@@ -1713,7 +1713,7 @@ Params: 24db_digital_gain       Allow ga
-                                 responsibility of the user to ensure that
-                                 the Digital volume control is set to a value
-                                 that does not result in clipping/distortion!)
--        slave                   Force DAC+ Pro into slave mode, using Pi as
-+        slave                   Force DAC+ into slave mode, using Pi as
-                                 master for bit clock and frame clock.
-         leds_off                If set to 'true' the onboard indicator LEDs
-                                 are switched off at all times.
-@@ -1736,7 +1736,7 @@ Params: 24db_digital_gain       Allow ga
-                                 responsibility of the user to ensure that
-                                 the Digital volume control is set to a value
-                                 that does not result in clipping/distortion!)
--        slave                   Force DAC+ Pro into slave mode, using Pi as
-+        slave                   Force DAC+ADC into slave mode, using Pi as
-                                 master for bit clock and frame clock.
-         leds_off                If set to 'true' the onboard indicator LEDs
-                                 are switched off at all times.
diff --git a/target/linux/bcm27xx/patches-6.1/950-1160-media-i2c-ov7251-Switch-from-V4L2_CID_GAIN-to-V4L2_C.patch b/target/linux/bcm27xx/patches-6.1/950-1160-media-i2c-ov7251-Switch-from-V4L2_CID_GAIN-to-V4L2_C.patch
deleted file mode 100644
index 36565bf2d6..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1160-media-i2c-ov7251-Switch-from-V4L2_CID_GAIN-to-V4L2_C.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e60fbc34aa98b3ba2c9338ad628fc8d8137e9065 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 14 Nov 2023 18:36:19 +0000
-Subject: [PATCH] media/i2c: ov7251: Switch from V4L2_CID_GAIN to
- V4L2_CID_ANALOGUE_GAIN
-
-The mainline driver has implemented analogue gain using the control
-V4L2_CID_GAIN instead of V4L2_CID_ANALOGUE_GAIN.
-
-libcamera requires V4L2_CID_ANALOGUE_GAIN, and therefore fails.
-
-Update the driver to use V4L2_CID_ANALOGUE_GAIN.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/i2c/ov7251.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/media/i2c/ov7251.c
-+++ b/drivers/media/i2c/ov7251.c
-@@ -1063,7 +1063,7 @@ static int ov7251_s_ctrl(struct v4l2_ctr
- 	case V4L2_CID_EXPOSURE:
- 		ret = ov7251_set_exposure(ov7251, ctrl->val);
- 		break;
--	case V4L2_CID_GAIN:
-+	case V4L2_CID_ANALOGUE_GAIN:
- 		ret = ov7251_set_gain(ov7251, ctrl->val);
- 		break;
- 	case V4L2_CID_TEST_PATTERN:
-@@ -1588,7 +1588,7 @@ static int ov7251_init_ctrls(struct ov72
- 	ov7251->exposure = v4l2_ctrl_new_std(&ov7251->ctrls, &ov7251_ctrl_ops,
- 					     V4L2_CID_EXPOSURE, 1, 32, 1, 32);
- 	ov7251->gain = v4l2_ctrl_new_std(&ov7251->ctrls, &ov7251_ctrl_ops,
--					 V4L2_CID_GAIN, 16, 1023, 1, 16);
-+					 V4L2_CID_ANALOGUE_GAIN, 16, 1023, 1, 16);
- 	v4l2_ctrl_new_std_menu_items(&ov7251->ctrls, &ov7251_ctrl_ops,
- 				     V4L2_CID_TEST_PATTERN,
- 				     ARRAY_SIZE(ov7251_test_pattern_menu) - 1,
diff --git a/target/linux/bcm27xx/patches-6.1/950-1161-drm-vc4-Drop-planes-that-are-completely-off-screen.patch b/target/linux/bcm27xx/patches-6.1/950-1161-drm-vc4-Drop-planes-that-are-completely-off-screen.patch
deleted file mode 100644
index 8cdbb51d55..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1161-drm-vc4-Drop-planes-that-are-completely-off-screen.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 444884f7b62bfe5ef313dd1d47f81a40e695ab0b Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 17 Nov 2023 14:43:44 +0000
-Subject: [PATCH] drm/vc4: Drop planes that are completely off-screen
-
-It is permitted for a plane to be configured such that none
-of it is on-screen via either negative dest rectangle X,Y
-offset, or just an offset that is greater than the crtc
-dimensions.
-
-These planes were resized via drm_atomic_helper_check_plane_state
-such that the source rectangle had a zero width or height, but
-they still created a dlist entry even though they contributed
-no pixels. In the case of vc6_plane_mode_set, that it could result
-in negative values being written into registers, which caused
-incorrect behaviour.
-
-Drop planes that result in a source width or height of 0 pixels
-to avoid the incorrect rendering.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_plane.c | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
---- a/drivers/gpu/drm/vc4/vc4_plane.c
-+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -1108,6 +1108,12 @@ static int vc4_plane_mode_set(struct drm
- 	width = vc4_state->src_w[0] >> 16;
- 	height = vc4_state->src_h[0] >> 16;
- 
-+	if (!width || !height) {
-+		/* 0 source size probably means the plane is offscreen */
-+		vc4_state->dlist_initialized = 1;
-+		return 0;
-+	}
-+
- 	/* SCL1 is used for Cb/Cr scaling of planar formats.  For RGB
- 	 * and 4:4:4, scl1 should be set to scl0 so both channels of
- 	 * the scaler do the same thing.  For YUV, the Y plane needs
-@@ -1623,6 +1629,12 @@ static int vc6_plane_mode_set(struct drm
- 	width = vc4_state->src_w[0] >> 16;
- 	height = vc4_state->src_h[0] >> 16;
- 
-+	if (!width || !height) {
-+		/* 0 source size probably means the plane is offscreen */
-+		vc4_state->dlist_initialized = 1;
-+		return 0;
-+	}
-+
- 	/* SCL1 is used for Cb/Cr scaling of planar formats.  For RGB
- 	 * and 4:4:4, scl1 should be set to scl0 so both channels of
- 	 * the scaler do the same thing.  For YUV, the Y plane needs
-@@ -1994,6 +2006,9 @@ int vc4_plane_atomic_check(struct drm_pl
- 	if (ret)
- 		return ret;
- 
-+	if (!vc4_state->src_w[0] || !vc4_state->src_h[0])
-+		return 0;
-+
- 	ret = vc4_plane_allocate_lbm(new_plane_state);
- 	if (ret)
- 		return ret;
diff --git a/target/linux/bcm27xx/patches-6.1/950-1162-drm-bridge-display-connector-Select-DRM_KMS_HELPER.patch b/target/linux/bcm27xx/patches-6.1/950-1162-drm-bridge-display-connector-Select-DRM_KMS_HELPER.patch
deleted file mode 100644
index 270975e587..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1162-drm-bridge-display-connector-Select-DRM_KMS_HELPER.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 91ad217f93232fb3a0b52487fec67860fb29e93a Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 17 Nov 2023 14:50:11 +0000
-Subject: [PATCH] drm/bridge: display-connector: Select DRM_KMS_HELPER
-
-Commit 7cd70656d128 ("drm/bridge: display-connector: implement
-bus fmts callbacks") added use of drm_atomic_helper_bridge_*
-functions, but didn't select the dependency of DRM_KMS_HELPER.
-If nothing else selected that dependency it resulted in a
-build failure.
-
-Select the missing dependency.
-
-Fixes: 7cd70656d128 ("drm/bridge: display-connector: implement bus fmts callbacks")
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/bridge/Kconfig | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/gpu/drm/bridge/Kconfig
-+++ b/drivers/gpu/drm/bridge/Kconfig
-@@ -67,6 +67,7 @@ config DRM_CROS_EC_ANX7688
- config DRM_DISPLAY_CONNECTOR
- 	tristate "Display connector support"
- 	depends on OF
-+	select DRM_KMS_HELPER
- 	help
- 	  Driver for display connectors with support for DDC and hot-plug
- 	  detection. Most display controllers handle display connectors
diff --git a/target/linux/bcm27xx/patches-6.1/950-1163-drm-vc4-Free-the-dlist-alloc-immediately-if-it-never.patch b/target/linux/bcm27xx/patches-6.1/950-1163-drm-vc4-Free-the-dlist-alloc-immediately-if-it-never.patch
deleted file mode 100644
index 49359362fe..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1163-drm-vc4-Free-the-dlist-alloc-immediately-if-it-never.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 51712a6493bf8824419f51ca7950e7d88f48b699 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 22 Nov 2023 18:36:54 +0000
-Subject: [PATCH] drm: vc4: Free the dlist alloc immediately if it never hit
- the hw
-
-atomic_check creates a state, and allocates the dlist memory for
-it such that atomic_flush can not fail.
-
-On destroy that dlist allocation was being put in the stale list,
-even though it had never been programmed into the hardware,
-therefore doing lots of atomic_checks could consume all the dlist
-memory and fail.
-
-If the dlist has never been programmed into the hardware, then
-free it immediately.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_drv.h | 1 +
- drivers/gpu/drm/vc4/vc4_hvs.c | 6 +++++-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -696,6 +696,7 @@ struct vc4_hvs_dlist_allocation {
- 	struct drm_mm_node mm_node;
- 	unsigned int channel;
- 	u8 target_frame_count;
-+	bool dlist_programmed;
- };
- 
- struct vc4_crtc_state {
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -697,8 +697,11 @@ void vc4_hvs_mark_dlist_entry_stale(stru
- 	 * Kunit tests run with a mock device and we consider any hardware
- 	 * access a test failure. Let's free the dlist allocation right away if
- 	 * we're running under kunit, we won't risk a dlist corruption anyway.
-+	 *
-+	 * Likewise if the allocation was only checked and never programmed, we
-+	 * can destroy the allocation immediately.
- 	 */
--	if (kunit_get_current_test()) {
-+	if (kunit_get_current_test() || !alloc->dlist_programmed) {
- 		spin_lock_irqsave(&hvs->mm_lock, flags);
- 		vc4_hvs_free_dlist_entry_locked(hvs, alloc);
- 		spin_unlock_irqrestore(&hvs->mm_lock, flags);
-@@ -1201,6 +1204,7 @@ static void vc4_hvs_install_dlist(struct
- 		return;
- 
- 	WARN_ON(!vc4_state->mm);
-+	vc4_state->mm->dlist_programmed = true;
- 
- 	if (vc4->gen >= VC4_GEN_6)
- 		HVS_WRITE(SCALER6_DISPX_LPTRS(vc4_state->assigned_channel),
diff --git a/target/linux/bcm27xx/patches-6.1/950-1164-input-edt-ft5x06-Include-I2C-details-in-names-for-th.patch b/target/linux/bcm27xx/patches-6.1/950-1164-input-edt-ft5x06-Include-I2C-details-in-names-for-th.patch
deleted file mode 100644
index 131e502406..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1164-input-edt-ft5x06-Include-I2C-details-in-names-for-th.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 2a6c3115f4142e23ca10c984d7f65ac8fb901cc2 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 8 Nov 2023 15:50:39 +0000
-Subject: [PATCH] input: edt-ft5x06: Include I2C details in names for the
- devices
-
-libinput uses the input device name alone. If you have two
-identical input devices, then there is no way to differentiate
-between them, and in the case of touchscreens that means no
-way to associate them with the appropriate display device.
-
-Add the I2C bus and address to the start of the input device
-name so that the name is always unique within the system.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/input/touchscreen/edt-ft5x06.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
---- a/drivers/input/touchscreen/edt-ft5x06.c
-+++ b/drivers/input/touchscreen/edt-ft5x06.c
-@@ -67,6 +67,7 @@
- #define TOUCH_EVENT_RESERVED		0x03
- 
- #define EDT_NAME_LEN			23
-+#define EDT_NAME_PREFIX_LEN		8
- #define EDT_SWITCH_MODE_RETRIES		10
- #define EDT_SWITCH_MODE_DELAY		5 /* msec */
- #define EDT_RAW_DATA_RETRIES		100
-@@ -134,7 +135,7 @@ struct edt_ft5x06_ts_data {
- 	int max_support_points;
- 	unsigned int known_ids;
- 
--	char name[EDT_NAME_LEN];
-+	char name[EDT_NAME_PREFIX_LEN + EDT_NAME_LEN];
- 	char fw_version[EDT_NAME_LEN];
- 	int init_td_status;
- 
-@@ -965,6 +966,9 @@ static int edt_ft5x06_ts_identify(struct
- 	char *model_name = tsdata->name;
- 	char *fw_version = tsdata->fw_version;
- 
-+	snprintf(model_name, EDT_NAME_PREFIX_LEN, "%s ", dev_name(&client->dev));
-+	model_name += strlen(model_name);
-+
- 	/* see what we find if we assume it is a M06 *
- 	 * if we get less than EDT_NAME_LEN, we don't want
- 	 * to have garbage in there
diff --git a/target/linux/bcm27xx/patches-6.1/950-1165-input-goodix-Include-I2C-details-in-names-for-the-de.patch b/target/linux/bcm27xx/patches-6.1/950-1165-input-goodix-Include-I2C-details-in-names-for-the-de.patch
deleted file mode 100644
index 6bbe2208f4..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1165-input-goodix-Include-I2C-details-in-names-for-the-de.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From a420bbde05f8a6691b0c3e0830092e443365aaa7 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 8 Nov 2023 16:20:27 +0000
-Subject: [PATCH] input: goodix: Include I2C details in names for the devices
-
-libinput uses the input device name alone. If you have two
-identical input devices, then there is no way to differentiate
-between them, and in the case of touchscreens that means no
-way to associate them with the appropriate display device.
-
-Add the I2C bus and address to the start of the input device
-name so that the name is always unique within the system.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/input/touchscreen/goodix.c | 5 ++++-
- drivers/input/touchscreen/goodix.h | 3 +++
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
---- a/drivers/input/touchscreen/goodix.c
-+++ b/drivers/input/touchscreen/goodix.c
-@@ -1212,7 +1212,10 @@ static int goodix_configure_dev(struct g
- 		return -ENOMEM;
- 	}
- 
--	ts->input_dev->name = "Goodix Capacitive TouchScreen";
-+	snprintf(ts->name, GOODIX_NAME_MAX_LEN, "%s Goodix Capacitive TouchScreen",
-+		 dev_name(&ts->client->dev));
-+
-+	ts->input_dev->name = ts->name;
- 	ts->input_dev->phys = "input/ts";
- 	ts->input_dev->id.bustype = BUS_I2C;
- 	ts->input_dev->id.vendor = 0x0416;
---- a/drivers/input/touchscreen/goodix.h
-+++ b/drivers/input/touchscreen/goodix.h
-@@ -57,6 +57,8 @@
- #define GOODIX_CONFIG_MAX_LENGTH		240
- #define GOODIX_MAX_KEYS				7
- 
-+#define GOODIX_NAME_MAX_LEN			38
-+
- enum goodix_irq_pin_access_method {
- 	IRQ_PIN_ACCESS_NONE,
- 	IRQ_PIN_ACCESS_GPIO,
-@@ -91,6 +93,7 @@ struct goodix_ts_data {
- 	enum gpiod_flags gpiod_rst_flags;
- 	char id[GOODIX_ID_MAX_LEN + 1];
- 	char cfg_name[64];
-+	char name[GOODIX_NAME_MAX_LEN];
- 	u16 version;
- 	bool reset_controller_at_probe;
- 	bool load_cfg_from_disk;
diff --git a/target/linux/bcm27xx/patches-6.1/950-1166-drm-vc4-Block-swiotlb-bounce-buffers-being-imported-.patch b/target/linux/bcm27xx/patches-6.1/950-1166-drm-vc4-Block-swiotlb-bounce-buffers-being-imported-.patch
deleted file mode 100644
index c40b77c957..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1166-drm-vc4-Block-swiotlb-bounce-buffers-being-imported-.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From a984fda6b2c24dbf1ca21924f99c8f9418f5765e Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 22 Nov 2023 19:17:44 +0000
-Subject: [PATCH] drm: vc4: Block swiotlb bounce buffers being imported as
- dmabuf
-
-The dmabuf import already checks that the backing buffer is contiguous
-and rejects it if it isn't. vc4 also requires that the buffer is
-in the bottom 1GB of RAM, and this is all correctly defined via
-dma-ranges.
-
-However the kernel silently uses swiotlb to bounce dma buffers
-around if they are in the wrong region. This relies on dma sync
-functions to be called in order to copy the data to/from the
-bounce buffer.
-
-DRM is based on all memory allocations being coherent with the
-GPU so that any updates to a framebuffer will be acted on without
-the need for any additional update. This is fairly fundamentally
-incompatible with needing to call dma_sync_ to handle the bounce
-buffer copies, and therefore we have to detect and reject mappings
-that use bounce buffers.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_drv.c | 26 ++++++++++++++++++++++++--
- 1 file changed, 24 insertions(+), 2 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_drv.c
-+++ b/drivers/gpu/drm/vc4/vc4_drv.c
-@@ -29,6 +29,7 @@
- #include <linux/of_platform.h>
- #include <linux/platform_device.h>
- #include <linux/pm_runtime.h>
-+#include <linux/dma-direct.h>
- 
- #include <drm/drm_aperture.h>
- #include <drm/drm_atomic_helper.h>
-@@ -175,6 +176,19 @@ static void vc4_close(struct drm_device
- 	kfree(vc4file);
- }
- 
-+struct drm_gem_object *
-+vc4_prime_import_sg_table(struct drm_device *dev,
-+			  struct dma_buf_attachment *attach,
-+			  struct sg_table *sgt)
-+{
-+	phys_addr_t phys = dma_to_phys(dev->dev, sg_dma_address(sgt->sgl));
-+
-+	if (is_swiotlb_buffer(dev->dev, phys))
-+		return ERR_PTR(-EINVAL);
-+
-+	return drm_gem_dma_prime_import_sg_table(dev, attach, sgt);
-+}
-+
- DEFINE_DRM_GEM_FOPS(vc4_drm_fops);
- 
- static const struct drm_ioctl_desc vc4_drm_ioctls[] = {
-@@ -211,7 +225,11 @@ const struct drm_driver vc4_drm_driver =
- 
- 	.gem_create_object = vc4_create_object,
- 
--	DRM_GEM_DMA_DRIVER_OPS_WITH_DUMB_CREATE(vc4_bo_dumb_create),
-+	.dumb_create		= vc4_bo_dumb_create,
-+	.prime_handle_to_fd	= drm_gem_prime_handle_to_fd,
-+	.prime_fd_to_handle	= drm_gem_prime_fd_to_handle,
-+	.gem_prime_import_sg_table = vc4_prime_import_sg_table,
-+	.gem_prime_mmap		= drm_gem_prime_mmap,
- 
- 	.ioctls = vc4_drm_ioctls,
- 	.num_ioctls = ARRAY_SIZE(vc4_drm_ioctls),
-@@ -234,7 +252,11 @@ const struct drm_driver vc5_drm_driver =
- 	.debugfs_init = vc4_debugfs_init,
- #endif
- 
--	DRM_GEM_DMA_DRIVER_OPS_WITH_DUMB_CREATE(vc5_dumb_create),
-+	.dumb_create		= vc5_dumb_create,
-+	.prime_handle_to_fd	= drm_gem_prime_handle_to_fd,
-+	.prime_fd_to_handle	= drm_gem_prime_fd_to_handle,
-+	.gem_prime_import_sg_table = vc4_prime_import_sg_table,
-+	.gem_prime_mmap		= drm_gem_prime_mmap,
- 
- 	.fops = &vc4_drm_fops,
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1167-overlays-i2c-sensor-Add-adt7410-support.patch b/target/linux/bcm27xx/patches-6.1/950-1167-overlays-i2c-sensor-Add-adt7410-support.patch
deleted file mode 100644
index c7c9daba3f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1167-overlays-i2c-sensor-Add-adt7410-support.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 77a01f7da77446277139d8e9ce63f078cbe1ecfe Mon Sep 17 00:00:00 2001
-From: Kenny <aSmig+github@romhat.net>
-Date: Wed, 22 Nov 2023 16:22:37 -0800
-Subject: [PATCH] overlays: i2c-sensor: Add adt7410 support
-
-See https://github.com/raspberrypi/linux/pull/5738
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/README              | 12 ++++++++----
- .../boot/dts/overlays/i2c-sensor-common.dtsi   | 18 +++++++++++++++++-
- 2 files changed, 25 insertions(+), 5 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -2144,10 +2144,14 @@ Name:   i2c-sensor
- Info:   Adds support for a number of I2C barometric pressure, temperature,
-         light level and chemical sensors on i2c_arm
- Load:   dtoverlay=i2c-sensor,<param>=<val>
--Params: addr                    Set the address for the BH1750, BME280, BME680,
--                                BMP280, BMP380, CCS811, DS1621, HDC100X, JC42,
--                                LM75, MCP980x, MPU6050, MPU9250, MS5637, MS5803,
--                                MS5805, MS5837, MS8607, SHT3x or TMP102
-+Params: addr                    Set the address for the ADT7410, BH1750, BME280,
-+                                BME680, BMP280, BMP380, CCS811, DS1621, HDC100X,
-+                                JC42, LM75, MCP980x, MPU6050, MPU9250, MS5637,
-+                                MS5803, MS5805, MS5837, MS8607, SHT3x or TMP102
-+
-+        adt7410                 Select the Analog Devices ADT7410 and ADT7420
-+                                temperature sensors
-+                                Valid address 0x48-0x4b, default 0x48
- 
-         aht10                   Select the Aosong AHT10 temperature and humidity
-                                 sensor
---- a/arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi
-+++ b/arch/arm/boot/dts/overlays/i2c-sensor-common.dtsi
-@@ -508,6 +508,21 @@
- 		};
- 	};
- 
-+	fragment@34 {
-+		target = <&i2cbus>;
-+		__dormant__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			adt7410: adt7410@48 {
-+				compatible = "adi,adt7410", "adi,adt7420";
-+				reg = <0x48>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
- 	__overrides__ {
- 		bme280 = <0>,"+0";
- 		bmp085 = <0>,"+1";
-@@ -543,6 +558,7 @@
- 		mpu9250 = <0>,"+29";
- 		bno055 = <0>,"+31";
- 		sht4x = <0>,"+32";
-+		adt7410 = <0>,"+34";
- 
- 		addr =	<&bme280>,"reg:0", <&bmp280>,"reg:0", <&tmp102>,"reg:0",
- 			<&lm75>,"reg:0", <&hdc100x>,"reg:0", <&sht3x>,"reg:0",
-@@ -552,7 +568,7 @@
- 			<&ms5837>,"reg:0", <&ms8607>,"reg:0",
- 			<&mpu6050>,"reg:0", <&mpu9250>,"reg:0",
- 			<&bno055>,"reg:0", <&sht4x>,"reg:0",
--			<&bmp380>,"reg:0";
-+			<&bmp380>,"reg:0", <&adt7410>,"reg:0";
- 		int_pin = <&max30102>, "interrupts:0",
- 			<&mpu6050>, "interrupts:0",
- 			<&mpu9250>, "interrupts:0";
diff --git a/target/linux/bcm27xx/patches-6.1/950-1168-overlays-hat_map-Add-pisound-mapping.patch b/target/linux/bcm27xx/patches-6.1/950-1168-overlays-hat_map-Add-pisound-mapping.patch
deleted file mode 100644
index 2620a598f7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1168-overlays-hat_map-Add-pisound-mapping.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7c185b18a1c6a6cd6ab8805fef03a4a8c9931656 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Fri, 24 Nov 2023 13:57:09 +0000
-Subject: [PATCH] overlays: hat_map: Add pisound mapping
-
-See: https://github.com/raspberrypi/linux/issues/5741
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/hat_map.dts | 5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/arch/arm/boot/dts/overlays/hat_map.dts
-+++ b/arch/arm/boot/dts/overlays/hat_map.dts
-@@ -6,6 +6,11 @@
- 		overlay = "iqaudio-codec";
- 	};
- 
-+	pisound {
-+		uuid = [ a7ee5d28 da03 41f5 bbd7 20438a4bec5d ];
-+		overlay = "pisound";
-+	};
-+
- 	recalbox-rgbdual {
- 		uuid = [ 1c955808 681f 4bbc a2ef b7ea47cd388e ];
- 		overlay = "recalboxrgbdual";
diff --git a/target/linux/bcm27xx/patches-6.1/950-1169-drm-vc4-Set-TV-margins-on-the-composite-connector-st.patch b/target/linux/bcm27xx/patches-6.1/950-1169-drm-vc4-Set-TV-margins-on-the-composite-connector-st.patch
deleted file mode 100644
index 05da5d38c5..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1169-drm-vc4-Set-TV-margins-on-the-composite-connector-st.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From bc76ab2e772242d0d92d38b2a5648485ee1a1b44 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20B=C3=BCchler?= <michael.buechler@posteo.net>
-Date: Sun, 19 Nov 2023 01:22:20 +0100
-Subject: [PATCH] drm/vc4: Set TV margins on the composite connector state
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The Raspberry Pi bootloader can pass a set of margin values to the
-kernel cmdline as part of the video= option. These should result in
-black borders on the output to compensate for TVs where the visible area
-on the screen is smaller than the full extents of the video image.
-
-With the VC4 driver this currently works on an HDMI connector, but not
-on a composite video connector.
-
-The TV margins from the kernel cmdline are available in the
-drm_cmdline_mode structure of the composite video connector. Apply them
-to the connector state in the connector reset function. This is how it
-is implemented for the VC4 HDMI connector.
-
-Signed-off-by: Michael Büchler <michael.buechler@posteo.net>
----
- drivers/gpu/drm/vc4/vc4_vec.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/drivers/gpu/drm/vc4/vc4_vec.c
-+++ b/drivers/gpu/drm/vc4/vc4_vec.c
-@@ -436,6 +436,9 @@ static void vc4_vec_connector_reset(stru
- 	/* preserve TV standard */
- 	if (connector->state)
- 		connector->state->tv.mode = vc4_vec_get_default_mode(connector);
-+
-+	/* apply TV margins from the cmdline_mode */
-+	drm_atomic_helper_connector_tv_reset(connector);
- }
- 
- static int vc4_vec_connector_atomic_check(struct drm_connector *conn,
-@@ -483,6 +486,8 @@ static int vc4_vec_connector_init(struct
- 
- 	drm_connector_helper_add(connector, &vc4_vec_connector_helper_funcs);
- 
-+	drm_connector_attach_tv_margin_properties(connector);
-+
- 	drm_object_attach_property(&connector->base,
- 				   dev->mode_config.tv_mode_property,
- 				   vc4_vec_get_default_mode(connector));
diff --git a/target/linux/bcm27xx/patches-6.1/950-1170-drm-panel-jdi-lt070me05000-Add-prepare_upstream_firs.patch b/target/linux/bcm27xx/patches-6.1/950-1170-drm-panel-jdi-lt070me05000-Add-prepare_upstream_firs.patch
deleted file mode 100644
index 62e408b514..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1170-drm-panel-jdi-lt070me05000-Add-prepare_upstream_firs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 63d8c0f5185169058384142547655fc038aae0bf Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 9 Aug 2023 21:04:40 +0100
-Subject: [PATCH] drm: panel: jdi-lt070me05000: Add prepare_upstream_first flag
-
-The panel driver wants to send DCS commands from the prepare
-hook, therefore the DSI host wants to be pre_enabled first.
-Set the flag to achieve this.
-
-https://forums.raspberrypi.com/viewtopic.php?t=354708
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/gpu/drm/panel/panel-jdi-lt070me05000.c
-+++ b/drivers/gpu/drm/panel/panel-jdi-lt070me05000.c
-@@ -437,6 +437,7 @@ static int jdi_panel_add(struct jdi_pane
- 		return ret;
- 	}
- 
-+	jdi->base.prepare_upstream_first = true;
- 	drm_panel_init(&jdi->base, &jdi->dsi->dev, &jdi_panel_funcs,
- 		       DRM_MODE_CONNECTOR_DSI);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1172-drivers-media-cfe-Find-the-source-pads-on-the-sensor.patch b/target/linux/bcm27xx/patches-6.1/950-1172-drivers-media-cfe-Find-the-source-pads-on-the-sensor.patch
deleted file mode 100644
index e1f16d0171..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1172-drivers-media-cfe-Find-the-source-pads-on-the-sensor.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 76b1bbf3ec3be0afdc768863ab7e9bbd2734b97b Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Fri, 24 Nov 2023 14:29:57 +0000
-Subject: [PATCH] drivers: media: cfe: Find the source pads on the sensor
- entity
-
-The driver was assuming that pad 0 on the sensor entity was the
-appropriate source pad, but this isn't necessarily the case.
-With video-mux, it has the sink pads first, and then the source
-pad as the last one.
-
-Iterate through the sensor pads to find the relevant source pads.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/media/platform/raspberrypi/rp1_cfe/cfe.c | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-@@ -1826,7 +1826,7 @@ static void cfe_unregister_nodes(struct
- 
- static int cfe_link_node_pads(struct cfe_device *cfe)
- {
--	unsigned int i;
-+	unsigned int i, source_pad = 0;
- 	int ret;
- 
- 	for (i = 0; i < CSI2_NUM_CHANNELS; i++) {
-@@ -1835,14 +1835,23 @@ static int cfe_link_node_pads(struct cfe
- 		if (!check_state(cfe, NODE_REGISTERED, i))
- 			continue;
- 
--		if (i < cfe->sensor->entity.num_pads) {
-+		/* Find next source pad */
-+		while (source_pad < cfe->sensor->entity.num_pads &&
-+		       !(cfe->sensor->entity.pads[source_pad].flags &
-+							MEDIA_PAD_FL_SOURCE))
-+			source_pad++;
-+
-+		if (source_pad < cfe->sensor->entity.num_pads) {
- 			/* Sensor -> CSI2 */
--			ret = media_create_pad_link(&cfe->sensor->entity, i,
-+			ret = media_create_pad_link(&cfe->sensor->entity, source_pad,
- 						    &cfe->csi2.sd.entity, i,
- 						    MEDIA_LNK_FL_IMMUTABLE |
- 						    MEDIA_LNK_FL_ENABLED);
- 			if (ret)
- 				return ret;
-+
-+			/* Dealt with that source_pad, look at the next one next time */
-+			source_pad++;
- 		}
- 
- 		/* CSI2 channel # -> /dev/video# */
diff --git a/target/linux/bcm27xx/patches-6.1/950-1173-dtoverlays-Add-option-for-cam0-to-camera-mux-Nport-o.patch b/target/linux/bcm27xx/patches-6.1/950-1173-dtoverlays-Add-option-for-cam0-to-camera-mux-Nport-o.patch
deleted file mode 100644
index 09cdcc7928..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1173-dtoverlays-Add-option-for-cam0-to-camera-mux-Nport-o.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 08c5904ad00ffc54d37058ead19814f8a85f6f39 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Mon, 27 Nov 2023 14:50:58 +0000
-Subject: [PATCH] dtoverlays: Add option for cam0 to camera-mux-Nport overlays
-
-Seeing as the mux can be connected to either CAM/DISP1 or
-CAM/DISP0 on a Pi5, add a cam0 override to allow configuration
-of which is used. Default (as with all camera overlays) is CAM/DISP1.
-
-The overlay does NOT update the camera regulator used by all the
-sensors as doing so would be a nightmare. The Arducam mulitplexer
-boards these overlays are initially supporting seem to tie the
-regulator GPIO for all the sensors high anyway.
-If it was viewed as necessary, then creating an additional
-regulator that listed cam[01]_reg as the parent should work.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/README                       | 4 ++++
- arch/arm/boot/dts/overlays/camera-mux-2port-overlay.dts | 7 +++++--
- arch/arm/boot/dts/overlays/camera-mux-4port-overlay.dts | 7 +++++--
- 3 files changed, 14 insertions(+), 4 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -823,6 +823,8 @@ Params: cam0-arducam-64mp       Select A
-         cam1-ov9281             Select OV9281 for camera on port 1
-         cam1-imx290-clk-freq    Set clock frequency for an IMX290 on port 1
- 
-+        cam0                    Connect the mux to CAM0 port (default is CAM1)
-+
- 
- Name:   camera-mux-4port
- Info:   Configures a 4 port camera multiplexer
-@@ -878,6 +880,8 @@ Params: cam0-arducam-64mp       Select A
-         cam3-ov9281             Select OV9281 for camera on port 3
-         cam3-imx290-clk-freq    Set clock frequency for an IMX290 on port 3
- 
-+        cam0                    Connect the mux to CAM0 port (default is CAM1)
-+
- 
- Name:   cap1106
- Info:   Enables the ability to use the cap1106 touch sensor as a keyboard
---- a/arch/arm/boot/dts/overlays/camera-mux-2port-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/camera-mux-2port-overlay.dts
-@@ -77,7 +77,7 @@
- 	};
- 
- 	/* Mux define */
--	fragment@200 {
-+	i2c_frag: fragment@200 {
- 		target = <&i2c_csi_dsi>;
- 		__overlay__ {
- 			#address-cells = <1>;
-@@ -294,7 +294,7 @@
- 		};
- 	};
- 
--	fragment@201 {
-+	csi_frag: fragment@201 {
- 		target = <&csi1>;
- 		__overlay__ {
- 			status = "okay";
-@@ -501,5 +501,8 @@
- 				       <&imx290_0>,"clock-frequency:0";
- 		cam1-imx290-clk-freq = <&clk_imx290>,"clock-frequency:0",
- 				       <&imx290_1>,"clock-frequency:0";
-+
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_csi_dsi0>,
-+		       <&csi_frag>, "target:0=",<&csi0>;
- 	};
- };
---- a/arch/arm/boot/dts/overlays/camera-mux-4port-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/camera-mux-4port-overlay.dts
-@@ -135,7 +135,7 @@
- 	};
- 
- 	/* Mux define */
--	fragment@200 {
-+	i2c_frag: fragment@200 {
- 		target = <&i2c_csi_dsi>;
- 		__overlay__ {
- 			#address-cells = <1>;
-@@ -552,7 +552,7 @@
- 		};
- 	};
- 
--	fragment@201 {
-+	csi_frag: fragment@201 {
- 		target = <&csi1>;
- 		__overlay__ {
- 			status = "okay";
-@@ -872,5 +872,8 @@
- 				       <&imx290_2>,"clock-frequency:0";
- 		cam3-imx290-clk-freq = <&clk_imx290>,"clock-frequency:0",
- 				       <&imx290_3>,"clock-frequency:0";
-+
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_csi_dsi0>,
-+		       <&csi_frag>, "target:0=",<&csi0>;
- 	};
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-1174-ASoC-dwc-Permit-sample-rates-up-to-384kHz.patch b/target/linux/bcm27xx/patches-6.1/950-1174-ASoC-dwc-Permit-sample-rates-up-to-384kHz.patch
deleted file mode 100644
index 258b9de01c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1174-ASoC-dwc-Permit-sample-rates-up-to-384kHz.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6fac5d5ed6d023733ef7304afc88c8d89467a204 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 27 Nov 2023 12:16:04 +0000
-Subject: [PATCH] ASoC: dwc: Permit sample rates up to 384kHz
-
-The BCM2835 I2S block advertises clock rates up to 384kHz, and there's
-no reason why RP1's DWC I2S block shouldn't do the same.
-
-See: https://github.com/raspberrypi/linux/issues/5748
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- sound/soc/dwc/dwc-i2s.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/sound/soc/dwc/dwc-i2s.c
-+++ b/sound/soc/dwc/dwc-i2s.c
-@@ -667,7 +667,7 @@ static int dw_configure_dai_by_dt(struct
- 	if (WARN_ON(idx >= ARRAY_SIZE(bus_widths)))
- 		return -EINVAL;
- 
--	ret = dw_configure_dai(dev, dw_i2s_dai, SNDRV_PCM_RATE_8000_192000);
-+	ret = dw_configure_dai(dev, dw_i2s_dai, SNDRV_PCM_RATE_8000_384000);
- 	if (ret < 0)
- 		return ret;
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1176-ASoC-dwc-Fix-full-duplex-mode.patch b/target/linux/bcm27xx/patches-6.1/950-1176-ASoC-dwc-Fix-full-duplex-mode.patch
deleted file mode 100644
index f4b7098fae..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1176-ASoC-dwc-Fix-full-duplex-mode.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From cbc65d9c95088d1437a5a84c7d6628b8d27a86f1 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 28 Nov 2023 12:14:03 +0000
-Subject: [PATCH] ASoC: dwc: Fix full-duplex mode
-
-Configuration of the DMA register was carelessly zeroing bits that may
-used by a stream in the other direction. Preserve them instead.
-
-See: https://github.com/raspberrypi/linux/issues/5741
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- sound/soc/dwc/dwc-i2s.c | 20 +++++++++++++-------
- 1 file changed, 13 insertions(+), 7 deletions(-)
-
---- a/sound/soc/dwc/dwc-i2s.c
-+++ b/sound/soc/dwc/dwc-i2s.c
-@@ -189,10 +189,17 @@ static void dw_i2s_config(struct dw_i2s_
- {
- 	struct i2s_clk_config_data *config = &dev->config;
- 	u32 ch_reg;
--	u32 dmacr = 0;
-+	u32 dmacr;
- 
- 	i2s_disable_channels(dev, stream);
- 
-+	dmacr = i2s_read_reg(dev->i2s_base, DMACR);
-+
-+	if (stream == SNDRV_PCM_STREAM_PLAYBACK)
-+		dmacr &= ~(DMACR_DMAEN_TXCH0 * 0xf);
-+	else
-+		dmacr &= ~(DMACR_DMAEN_RXCH0 * 0xf);
-+
- 	for (ch_reg = 0; ch_reg < (config->chan_nr / 2); ch_reg++) {
- 		if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
- 			i2s_write_reg(dev->i2s_base, TCR(ch_reg),
-@@ -210,10 +217,6 @@ static void dw_i2s_config(struct dw_i2s_
- 			dmacr |= (DMACR_DMAEN_RXCH0 << ch_reg);
- 		}
- 	}
--	if (stream == SNDRV_PCM_STREAM_PLAYBACK)
--		dmacr |= DMACR_DMAEN_TX;
--	else if (stream == SNDRV_PCM_STREAM_CAPTURE)
--		dmacr |= DMACR_DMAEN_RX;
- 
- 	i2s_write_reg(dev->i2s_base, DMACR, dmacr);
- }
-@@ -319,10 +322,13 @@ static int dw_i2s_startup(struct snd_pcm
- 
- 	dw_i2s_config(dev, substream->stream);
- 	dmacr = i2s_read_reg(dev->i2s_base, DMACR);
--	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-+	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
- 		dma_data = &dev->play_dma_data;
--	else if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
-+		dmacr |= DMACR_DMAEN_TX;
-+	} else if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {
- 		dma_data = &dev->capture_dma_data;
-+		dmacr |= DMACR_DMAEN_RX;
-+	}
- 
- 	snd_soc_dai_set_dma_data(cpu_dai, substream, (void *)dma_data);
- 	i2s_write_reg(dev->i2s_base, DMACR, dmacr);
diff --git a/target/linux/bcm27xx/patches-6.1/950-1179-ASoC-pcm512x-Adds-bindings-for-TAS575x-devices.patch b/target/linux/bcm27xx/patches-6.1/950-1179-ASoC-pcm512x-Adds-bindings-for-TAS575x-devices.patch
deleted file mode 100644
index 8472c3e9e1..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1179-ASoC-pcm512x-Adds-bindings-for-TAS575x-devices.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From a7ac27fbac1aa3fb8316cf1ff6dd2f81109d46d2 Mon Sep 17 00:00:00 2001
-From: Joerg Schambacher <joerg.hifiberry@gmail.com>
-Date: Fri, 29 Sep 2023 17:05:55 +0200
-Subject: [PATCH] ASoC: pcm512x: Adds bindings for TAS575x devices
-
-commit 736b884a7b68c4eeb66dbf75b97c8ec9b9eeff7f upstream.
-
-The TAS5754/6 power amplifiers use the same pcm512x driver with
-only minor restictions described in the bindings document.
-
-Signed-off-by: Joerg Schambacher <joerg.hifiberry@gmail.com>
-Reviewed-by: Rob Herring <robh@kernel.org>
-Link: https://lore.kernel.org/r/20230929150555.405388-1-joerg.hifiberry@gmail.com
-Signed-off-by: Mark Brown <broonie@kernel.org>
----
- Documentation/devicetree/bindings/sound/pcm512x.txt | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
---- a/Documentation/devicetree/bindings/sound/pcm512x.txt
-+++ b/Documentation/devicetree/bindings/sound/pcm512x.txt
-@@ -1,12 +1,12 @@
--PCM512x audio CODECs
-+PCM512x and TAS575x audio CODECs/amplifiers
- 
- These devices support both I2C and SPI (configured with pin strapping
--on the board).
-+on the board). The TAS575x devices only support I2C.
- 
- Required properties:
- 
--  - compatible : One of "ti,pcm5121", "ti,pcm5122", "ti,pcm5141" or
--                 "ti,pcm5142"
-+  - compatible : One of "ti,pcm5121", "ti,pcm5122", "ti,pcm5141",
-+                 "ti,pcm5142", "ti,tas5754" or "ti,tas5756"
- 
-   - reg : the I2C address of the device for I2C, the chip select
-           number for SPI.
-@@ -25,6 +25,7 @@ Optional properties:
-     through <6>.  The device will be configured for clock input on the
-     given pll-in pin and PLL output on the given pll-out pin.  An
-     external connection from the pll-out pin to the SCLK pin is assumed.
-+    Caution: the TAS-desvices only support gpios 1,2 and 3
- 
- Examples:
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1180-ASoC-Adds-support-for-TAS575x-to-the-pcm512x-driver.patch b/target/linux/bcm27xx/patches-6.1/950-1180-ASoC-Adds-support-for-TAS575x-to-the-pcm512x-driver.patch
deleted file mode 100644
index 5009b225a3..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1180-ASoC-Adds-support-for-TAS575x-to-the-pcm512x-driver.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From a535dd07aff73f3a6eb40174ab5dc413d05f36a1 Mon Sep 17 00:00:00 2001
-From: Joerg Schambacher <joerg.hifiberry@gmail.com>
-Date: Fri, 29 Sep 2023 17:07:20 +0200
-Subject: [PATCH] ASoC: Adds support for TAS575x to the pcm512x driver
-
-commit 1f817805262c2c34142291da376d4932d3c493bc upstream.
-
-Enables the existing pcm512x driver to control the almost
-compatible TAS5754 and -76 amplifers. Both amplifiers support
-only an I2C interface and the internal PLL must be always
-on to provide necessary clocks to the amplifier section.
-Tested on TAS5756 with support from Andreas Arbesser-Krasser
-from Texas Instruments <a-krasser@ti.com>
-
-Signed-off-by: Joerg Schambacher <joerg.hifiberry@gmail.com>
-Link: https://lore.kernel.org/r/20230929150722.405415-1-joerg.hifiberry@gmail.com
-Signed-off-by: Mark Brown <broonie@kernel.org>
----
- sound/soc/codecs/pcm512x-i2c.c |  4 ++++
- sound/soc/codecs/pcm512x.c     | 36 +++++++++++++++++++++++++++++++---
- 2 files changed, 37 insertions(+), 3 deletions(-)
-
---- a/sound/soc/codecs/pcm512x-i2c.c
-+++ b/sound/soc/codecs/pcm512x-i2c.c
-@@ -39,6 +39,8 @@ static const struct i2c_device_id pcm512
- 	{ "pcm5122", },
- 	{ "pcm5141", },
- 	{ "pcm5142", },
-+	{ "tas5754", },
-+	{ "tas5756", },
- 	{ }
- };
- MODULE_DEVICE_TABLE(i2c, pcm512x_i2c_id);
-@@ -49,6 +51,8 @@ static const struct of_device_id pcm512x
- 	{ .compatible = "ti,pcm5122", },
- 	{ .compatible = "ti,pcm5141", },
- 	{ .compatible = "ti,pcm5142", },
-+	{ .compatible = "ti,tas5754", },
-+	{ .compatible = "ti,tas5756", },
- 	{ }
- };
- MODULE_DEVICE_TABLE(of, pcm512x_of_match);
---- a/sound/soc/codecs/pcm512x.c
-+++ b/sound/soc/codecs/pcm512x.c
-@@ -48,6 +48,7 @@ struct pcm512x_priv {
- 	int mute;
- 	struct mutex mutex;
- 	unsigned int bclk_ratio;
-+	int force_pll_on;
- };
- 
- /*
-@@ -1258,10 +1259,34 @@ static int pcm512x_hw_params(struct snd_
- 			return ret;
- 		}
- 
--		ret = regmap_update_bits(pcm512x->regmap, PCM512x_PLL_EN,
--					 PCM512x_PLLE, 0);
-+		if (!pcm512x->force_pll_on) {
-+			ret = regmap_update_bits(pcm512x->regmap,
-+						 PCM512x_PLL_EN, PCM512x_PLLE, 0);
-+		} else {
-+			/* provide minimum PLL config for TAS575x clocking
-+			 * and leave PLL enabled
-+			 */
-+			ret = regmap_write(pcm512x->regmap,
-+					   PCM512x_PLL_COEFF_0, 0x01);
-+			if (ret != 0) {
-+				dev_err(component->dev,
-+					"Failed to set pll coefficient: %d\n", ret);
-+				return ret;
-+			}
-+			ret = regmap_write(pcm512x->regmap,
-+					   PCM512x_PLL_COEFF_1, 0x04);
-+			if (ret != 0) {
-+				dev_err(component->dev,
-+					"Failed to set pll coefficient: %d\n", ret);
-+				return ret;
-+			}
-+			ret = regmap_write(pcm512x->regmap,
-+					   PCM512x_PLL_EN, 0x01);
-+			dev_dbg(component->dev, "Enabling PLL for TAS575x\n");
-+		}
-+
- 		if (ret != 0) {
--			dev_err(component->dev, "Failed to disable pll: %d\n", ret);
-+			dev_err(component->dev, "Failed to set pll mode: %d\n", ret);
- 			return ret;
- 		}
- 	}
-@@ -1659,6 +1684,11 @@ int pcm512x_probe(struct device *dev, st
- 			ret = -EINVAL;
- 			goto err_pm;
- 		}
-+
-+		if (!strcmp(np->name, "tas5756") ||
-+		    !strcmp(np->name, "tas5754"))
-+			pcm512x->force_pll_on = 1;
-+		dev_dbg(dev, "Device ID: %s\n", np->name);
- 	}
- #endif
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1182-drm-panel-add-panel-dsi.patch b/target/linux/bcm27xx/patches-6.1/950-1182-drm-panel-add-panel-dsi.patch
deleted file mode 100644
index a46d6d3f15..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1182-drm-panel-add-panel-dsi.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From 0a0084b8621682ad96d001e798aa239b11a3cf00 Mon Sep 17 00:00:00 2001
-From: Timon Skerutsch <kernel@diodes-delight.com>
-Date: Mon, 13 Nov 2023 22:53:12 +0100
-Subject: [PATCH] drm/panel: add panel-dsi
-
-Equivalent to panel-dpi for configuring a simple DSI panel with
-device tree side timings and bus settings.
-Motiviation is the same as for panel-dpi of wanting to support
-new simple panels without needing to patch the kernel.
-
-Signed-off-by: Timon Skerutsch <kernel@diodes-delight.com>
----
- drivers/gpu/drm/panel/panel-simple.c | 123 ++++++++++++++++++++++++++-
- 1 file changed, 122 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/panel/panel-simple.c
-+++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -40,6 +40,7 @@
- #include <drm/drm_edid.h>
- #include <drm/drm_mipi_dsi.h>
- #include <drm/drm_panel.h>
-+#include <drm/drm_of.h>
- 
- /**
-  * struct panel_desc - Describes a simple panel.
-@@ -4665,6 +4666,9 @@ static const struct panel_desc_dsi osd10
- 	.lanes = 4,
- };
- 
-+// for panels using generic panel-dsi binding
-+static struct panel_desc_dsi panel_dsi;
-+
- static const struct of_device_id dsi_of_match[] = {
- 	{
- 		.compatible = "auo,b080uan01",
-@@ -4688,14 +4692,118 @@ static const struct of_device_id dsi_of_
- 		.compatible = "osddisplays,osd101t2045-53ts",
- 		.data = &osd101t2045_53ts
- 	}, {
-+		/* Must be the last entry */
-+		.compatible = "panel-dsi",
-+		.data = &panel_dsi,
-+	}, {
- 		/* sentinel */
- 	}
- };
- MODULE_DEVICE_TABLE(of, dsi_of_match);
- 
-+
-+/* Checks for DSI panel definition in device-tree, analog to panel_dpi */
-+static int panel_dsi_dt_probe(struct device *dev,
-+			  struct panel_desc_dsi *desc_dsi)
-+{
-+	struct panel_desc *desc;
-+	struct display_timing *timing;
-+	const struct device_node *np;
-+	const char *dsi_color_format;
-+	const char *dsi_mode_flags;
-+	struct property *prop;
-+	int dsi_lanes, ret;
-+
-+	np = dev->of_node;
-+
-+	desc = devm_kzalloc(dev, sizeof(*desc), GFP_KERNEL);
-+	if (!desc)
-+		return -ENOMEM;
-+
-+	timing = devm_kzalloc(dev, sizeof(*timing), GFP_KERNEL);
-+	if (!timing)
-+		return -ENOMEM;
-+
-+	ret = of_get_display_timing(np, "panel-timing", timing);
-+	if (ret < 0) {
-+		dev_err(dev, "%pOF: no panel-timing node found for \"panel-dsi\" binding\n",
-+			np);
-+		return ret;
-+	}
-+
-+	desc->timings = timing;
-+	desc->num_timings = 1;
-+
-+	of_property_read_u32(np, "width-mm", &desc->size.width);
-+	of_property_read_u32(np, "height-mm", &desc->size.height);
-+
-+	dsi_lanes = drm_of_get_data_lanes_count_ep(np, 0, 0, 1, 4);
-+
-+	if (dsi_lanes < 0) {
-+		dev_err(dev, "%pOF: no or too many data-lanes defined", np);
-+		return dsi_lanes;
-+	}
-+
-+	desc_dsi->lanes = dsi_lanes;
-+
-+	of_property_read_string(np, "dsi-color-format", &dsi_color_format);
-+	if (!strcmp(dsi_color_format, "RGB888")) {
-+		desc_dsi->format = MIPI_DSI_FMT_RGB888;
-+		desc->bpc = 8;
-+	} else if (!strcmp(dsi_color_format, "RGB565")) {
-+		desc_dsi->format = MIPI_DSI_FMT_RGB565;
-+		desc->bpc = 6;
-+	} else if (!strcmp(dsi_color_format, "RGB666")) {
-+		desc_dsi->format = MIPI_DSI_FMT_RGB666;
-+		desc->bpc = 6;
-+	} else if (!strcmp(dsi_color_format, "RGB666_PACKED")) {
-+		desc_dsi->format = MIPI_DSI_FMT_RGB666_PACKED;
-+		desc->bpc = 6;
-+	} else {
-+		dev_err(dev, "%pOF: no valid dsi-color-format defined", np);
-+		return -EINVAL;
-+	}
-+
-+
-+	of_property_for_each_string(np, "mode", prop, dsi_mode_flags) {
-+		if (!strcmp(dsi_mode_flags, "MODE_VIDEO"))
-+			desc_dsi->flags |= MIPI_DSI_MODE_VIDEO;
-+		else if (!strcmp(dsi_mode_flags, "MODE_VIDEO_BURST"))
-+			desc_dsi->flags |= MIPI_DSI_MODE_VIDEO_BURST;
-+		else if (!strcmp(dsi_mode_flags, "MODE_VIDEO_SYNC_PULSE"))
-+			desc_dsi->flags |= MIPI_DSI_MODE_VIDEO_SYNC_PULSE;
-+		else if (!strcmp(dsi_mode_flags, "MODE_VIDEO_AUTO_VERT"))
-+			desc_dsi->flags |= MIPI_DSI_MODE_VIDEO_AUTO_VERT;
-+		else if (!strcmp(dsi_mode_flags, "MODE_VIDEO_HSE"))
-+			desc_dsi->flags |= MIPI_DSI_MODE_VIDEO_HSE;
-+		else if (!strcmp(dsi_mode_flags, "MODE_VIDEO_NO_HFP"))
-+			desc_dsi->flags |= MIPI_DSI_MODE_VIDEO_NO_HFP;
-+		else if (!strcmp(dsi_mode_flags, "MODE_VIDEO_NO_HBP"))
-+			desc_dsi->flags |= MIPI_DSI_MODE_VIDEO_NO_HBP;
-+		else if (!strcmp(dsi_mode_flags, "MODE_VIDEO_NO_HSA"))
-+			desc_dsi->flags |= MIPI_DSI_MODE_VIDEO_NO_HSA;
-+		else if (!strcmp(dsi_mode_flags, "MODE_VSYNC_FLUSH"))
-+			desc_dsi->flags |= MIPI_DSI_MODE_VSYNC_FLUSH;
-+		else if (!strcmp(dsi_mode_flags, "MODE_NO_EOT_PACKET"))
-+			desc_dsi->flags |= MIPI_DSI_MODE_NO_EOT_PACKET;
-+		else if (!strcmp(dsi_mode_flags, "CLOCK_NON_CONTINUOUS"))
-+			desc_dsi->flags |= MIPI_DSI_CLOCK_NON_CONTINUOUS;
-+		else if (!strcmp(dsi_mode_flags, "MODE_LPM"))
-+			desc_dsi->flags |= MIPI_DSI_MODE_LPM;
-+		else if (!strcmp(dsi_mode_flags, "HS_PKT_END_ALIGNED"))
-+			desc_dsi->flags |= MIPI_DSI_HS_PKT_END_ALIGNED;
-+	}
-+
-+	desc->connector_type = DRM_MODE_CONNECTOR_DSI;
-+	desc_dsi->desc = *desc;
-+
-+	return 0;
-+}
-+
- static int panel_simple_dsi_probe(struct mipi_dsi_device *dsi)
- {
- 	const struct panel_desc_dsi *desc;
-+	struct panel_desc_dsi *dt_desc;
- 	const struct of_device_id *id;
- 	int err;
- 
-@@ -4703,7 +4811,20 @@ static int panel_simple_dsi_probe(struct
- 	if (!id)
- 		return -ENODEV;
- 
--	desc = id->data;
-+	if (id->data == &panel_dsi) {
-+		/* Handle the generic panel-dsi binding */
-+		dt_desc = devm_kzalloc(&dsi->dev, sizeof(*dt_desc), GFP_KERNEL);
-+		if (!dt_desc)
-+			return -ENOMEM;
-+
-+		err = panel_dsi_dt_probe(&dsi->dev, dt_desc);
-+		if (err < 0)
-+			return err;
-+
-+		desc = dt_desc;
-+	} else {
-+		desc = id->data;
-+	}
- 
- 	err = panel_simple_probe(&dsi->dev, &desc->desc);
- 	if (err < 0)
diff --git a/target/linux/bcm27xx/patches-6.1/950-1183-dt-bindings-display-panel-dsi-bindings.patch b/target/linux/bcm27xx/patches-6.1/950-1183-dt-bindings-display-panel-dsi-bindings.patch
deleted file mode 100644
index c75ca8e8ac..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1183-dt-bindings-display-panel-dsi-bindings.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-From e14ceeadfa5b9d8a41e73edfa416bbe92dd5b20d Mon Sep 17 00:00:00 2001
-From: Timon Skerutsch <kernel@diodes-delight.com>
-Date: Mon, 13 Nov 2023 22:53:22 +0100
-Subject: [PATCH] dt-bindings: display: panel-dsi bindings
-
-Bindings for the panel-dsi specific additions to panel-simple.
-Allow for DSI specific bus settings and panel timing
-to be define in devicetree. Very similar to panel-dpi.
-
-Signed-off-by: Timon Skerutsch <kernel@diodes-delight.com>
----
- .../bindings/display/panel/panel-dsi.yaml     | 118 ++++++++++++++++++
- 1 file changed, 118 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/display/panel/panel-dsi.yaml
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/display/panel/panel-dsi.yaml
-@@ -0,0 +1,118 @@
-+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
-+%YAML 1.2
-+---
-+$id: http://devicetree.org/schemas/display/panel/panel-dsi.yaml#
-+$schema: http://devicetree.org/meta-schemas/core.yaml#
-+
-+title: Generic MIPI DSI Panel
-+
-+maintainers:
-+  - Timon Skerutsch <kernel@diodes-delight.com>
-+
-+allOf:
-+  - $ref: panel-common.yaml#
-+
-+properties:
-+  compatible:
-+    description:
-+      Shall contain a panel specific compatible and "panel-dsi"
-+      in that order.
-+    items:
-+      - {}
-+      - const: panel-dsi
-+
-+  dsi-color-format:
-+    description: |
-+      The color format used by the panel. Only DSI supported formats are allowed.
-+    enum:
-+      - RGB888
-+      - RGB666
-+      - RGB666_PACKED
-+      - RGB565
-+
-+  port:
-+    $ref: /schemas/graph.yaml#/$defs/port-base
-+    unevaluatedProperties: false
-+    description:
-+      Panel MIPI DSI input
-+
-+    properties:
-+      endpoint:
-+        $ref: /schemas/media/video-interfaces.yaml#
-+        unevaluatedProperties: false
-+
-+        properties:
-+          data-lanes: true
-+
-+        required:
-+          - data-lanes
-+
-+  mode:
-+    description: |
-+      DSI mode flags. See DSI Specs for details.
-+      These are driver independent features of the DSI bus.
-+    items:
-+      - const: MODE_VIDEO
-+      - const: MODE_VIDEO_BURST
-+      - const: MODE_VIDEO_SYNC_PULSE
-+      - const: MODE_VIDEO_AUTO_VERT
-+      - const: MODE_VIDEO_HSE
-+      - const: MODE_VIDEO_NO_HFP
-+      - const: MODE_VIDEO_NO_HBP
-+      - const: MODE_VIDEO_NO_HSA
-+      - const: MODE_VSYNC_FLUSH
-+      - const: MODE_NO_EOT_PACKET
-+      - const: CLOCK_NON_CONTINUOUS
-+      - const: MODE_LPM
-+      - const: HS_PKT_END_ALIGNED
-+
-+  reg: true
-+  backlight: true
-+  enable-gpios: true
-+  width-mm: true
-+  height-mm: true
-+  panel-timing: true
-+  power-supply: true
-+  reset-gpios: true
-+  ddc-i2c-bus: true
-+
-+required:
-+  - panel-timing
-+  - reg
-+  - power-supply
-+  - dsi-color-format
-+  - port
-+
-+additionalProperties: false
-+
-+examples:
-+  - |
-+    panel {
-+        compatible = "panel-mfgr,generic-dsi-panel","panel-dsi";
-+        power-supply = <&vcc_supply>;
-+        backlight = <&backlight>;
-+        dsi-color-format = "RGB888";
-+        reg = <0>;
-+        mode = "MODE_VIDEO", "MODE_VIDEO_BURST", "MODE_NO_EOT_PACKET";
-+
-+        port {
-+            panel_dsi_port: endpoint {
-+                data-lanes = <1 2>;
-+                remote-endpoint = <&dsi_out>;
-+            };
-+        };
-+
-+        panel-timing {
-+            clock-frequency = <9200000>;
-+            hactive = <800>;
-+            vactive = <480>;
-+            hfront-porch = <8>;
-+            hback-porch = <4>;
-+            hsync-len = <41>;
-+            vback-porch = <2>;
-+            vfront-porch = <4>;
-+            vsync-len = <10>;
-+        };
-+    };
-+
-+...
diff --git a/target/linux/bcm27xx/patches-6.1/950-1184-overlays-example-overlay-for-using-panel-dsi-on-RPi.patch b/target/linux/bcm27xx/patches-6.1/950-1184-overlays-example-overlay-for-using-panel-dsi-on-RPi.patch
deleted file mode 100644
index 28a82d596d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1184-overlays-example-overlay-for-using-panel-dsi-on-RPi.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From ccf75f2a6f4045484c4539f7d47264f8f6b8453c Mon Sep 17 00:00:00 2001
-From: Timon Skerutsch <kernel@diodes-delight.com>
-Date: Mon, 13 Nov 2023 22:52:35 +0100
-Subject: [PATCH] overlays: example overlay for using panel-dsi on RPi
-
-Analog to the generic panel-dpi overlay to use panel-dsi with dtparam
-to not require a panel specific overlay for simple use cases that
-do not require setting more niche DSI modes.
-
-Signed-off-by: Timon Skerutsch <kernel@diodes-delight.com>
----
- arch/arm/boot/dts/overlays/Makefile           |   1 +
- arch/arm/boot/dts/overlays/README             |  31 +++++
- .../overlays/vc4-kms-dsi-generic-overlay.dts  | 106 ++++++++++++++++++
- 3 files changed, 138 insertions(+)
- create mode 100644 arch/arm/boot/dts/overlays/vc4-kms-dsi-generic-overlay.dts
-
---- a/arch/arm/boot/dts/overlays/Makefile
-+++ b/arch/arm/boot/dts/overlays/Makefile
-@@ -293,6 +293,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
- 	vc4-kms-dpi-hyperpixel4sq.dtbo \
- 	vc4-kms-dpi-panel.dtbo \
- 	vc4-kms-dsi-7inch.dtbo \
-+	vc4-kms-dsi-generic.dtbo \
- 	vc4-kms-dsi-lt070me05000.dtbo \
- 	vc4-kms-dsi-lt070me05000-v2.dtbo \
- 	vc4-kms-dsi-waveshare-panel.dtbo \
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -4785,6 +4785,37 @@ Params: sizex                   Touchscr
-                                 the default DSI1 and i2c_csi_dsi).
- 
- 
-+Name:   vc4-kms-dsi-generic
-+Info:   Enable a generic DSI display under KMS.
-+        Default timings are for a 840x480 RGB888 panel.
-+        Requires vc4-kms-v3d to be loaded.
-+Load:   dtoverlay=vc4-kms-dsi-generic,<param>=<val>
-+Params: clock-frequency         Display clock frequency (Hz)
-+        hactive                 Horizontal active pixels
-+        hfp                     Horizontal front porch
-+        hsync                   Horizontal sync pulse width
-+        hbp                     Horizontal back porch
-+        vactive                 Vertical active lines
-+        vfp                     Vertical front porch
-+        vsync                   Vertical sync pulse width
-+        vbp                     Vertical back porch
-+        width-mm                Define the screen width in mm
-+        height-mm               Define the screen height in mm
-+        rgb565                  Change to RGB565 output
-+        rgb666                  Change to RGB666 output
-+        rgb666p                 Change to RGB666 output with pixel packing
-+        rgb888                  Change to RGB888 output, this is the default
-+        one-lane                Use one DSI lane for data transmission
-+                                This is the default
-+        two-lane                Use two DSI lanes for data transmission
-+        three-lane              Use three DSI lanes for data transmission
-+                                Only supported on Pi5 and CM
-+        four-lane               Use four DSI lanes for data transmission
-+                                Only supported on Pi5 and CM
-+        dsi0                    Switch DSI port to DSI0
-+                                Only supported on Pi5 and CM
-+
-+
- Name:   vc4-kms-dsi-lt070me05000
- Info:   Enable a JDI LT070ME05000 DSI display on DSI1.
-         Note that this is a 4 lane DSI device, so it will only work on a Compute
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/vc4-kms-dsi-generic-overlay.dts
-@@ -0,0 +1,106 @@
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	dsi_frag: fragment@0 {
-+		target = <&dsi1>;
-+		__overlay__{
-+			status = "okay";
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			port {
-+				dsi_out:endpoint {
-+					remote-endpoint = <&panel_dsi_port>;
-+				};
-+			};
-+			panel: panel-dsi-generic@0 {
-+				// See panel-dsi.yaml binding
-+				// Using dummy name for panel model
-+				compatible = "Generic,panel-dsi","panel-dsi";
-+				reg = <0>;
-+				power-supply = <0>;
-+				backlight = <0>;
-+				dsi-color-format = "RGB888";
-+				mode = "MODE_VIDEO";
-+				width-mm = <0>;
-+				height-mm = <0>;
-+
-+				port {
-+					panel_dsi_port: endpoint {
-+						data-lanes = <1>;
-+						remote-endpoint = <&dsi_out>;
-+					};
-+				};
-+
-+				timing: panel-timing {
-+					clock-frequency = <30000000>;
-+					hactive = <840>;
-+					vactive = <480>;
-+					hback-porch = <44>;
-+					hfront-porch = <46>;
-+					hsync-len = <2>;
-+					vback-porch = <18>;
-+					vfront-porch = <16>;
-+					vsync-len = <2>;
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&panel_dsi_port>;
-+		__dormant__ {
-+			data-lanes = <1>;
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&panel_dsi_port>;
-+		__dormant__ {
-+			data-lanes = <1 2>;
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&panel_dsi_port>;
-+		__dormant__ {
-+			data-lanes = <1 2 3>;
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&panel_dsi_port>;
-+		__dormant__ {
-+			data-lanes = <1 2 3 4>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		dsi0 = <&dsi_frag>, "target:0=",<&dsi0>;
-+
-+		clock-frequency = <&timing>, "clock-frequency:0";
-+		hactive = <&timing>, "hactive:0";
-+		hfp = <&timing>, "hfront-porch:0";
-+		hsync = <&timing>, "hsync-len:0";
-+		hbp = <&timing>, "hback-porch:0";
-+		vactive = <&timing>, "vactive:0";
-+		vfp = <&timing>, "vfront-porch:0";
-+		vsync = <&timing>, "vsync-len:0";
-+		vbp = <&timing>, "vback-porch:0";
-+
-+		width-mm = <&panel>, "width-mm:0";
-+		height-mm = <&panel>, "height-mm:0";
-+
-+		rgb565 = <&panel>, "dsi-color-format=RGB565";
-+		rgb666p = <&panel>, "dsi-color-format=RGB666_PACKED";
-+		rgb666 = <&panel>, "dsi-color-format=RGB666";
-+		rgb888 = <&panel>, "dsi-color-format=RGB888";
-+		one-lane = <0>,"+1";
-+		two-lane = <0>,"+2";
-+		three-lane = <0>,"+3";
-+		four-lane = <0>,"+4";
-+	};
-+
-+};
diff --git a/target/linux/bcm27xx/patches-6.1/950-1185-overlays-ADS1115-allow-specification-of-the-i2c-bus.patch b/target/linux/bcm27xx/patches-6.1/950-1185-overlays-ADS1115-allow-specification-of-the-i2c-bus.patch
deleted file mode 100644
index ef9328bd6f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1185-overlays-ADS1115-allow-specification-of-the-i2c-bus.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From a477a6351575aa173f9f82857f5797e384fbc704 Mon Sep 17 00:00:00 2001
-From: JinShil <slavo5150@yahoo.com>
-Date: Tue, 28 Nov 2023 17:05:44 +0900
-Subject: [PATCH] overlays: ADS1115: allow specification of the i2c bus
-
----
- arch/arm/boot/dts/overlays/README             | 10 +++
- .../arm/boot/dts/overlays/ads1115-overlay.dts | 80 +++++++++++++------
- 2 files changed, 66 insertions(+), 24 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -489,6 +489,16 @@ Params: addr                    I2C bus
-         cha_gain                Set the gain of the Programmable Gain
-                                 Amplifier for this channel. (Default 1 sets the
-                                 full scale of the channel to 4.096 Volts)
-+        i2c0                    Choose the I2C0 bus on GPIOs 0&1
-+        i2c_csi_dsi             Choose the I2C0 bus on GPIOs 44&45
-+        i2c3                    Choose the I2C3 bus (configure with the i2c3
-+                                overlay - BCM2711 only)
-+        i2c4                    Choose the I2C4 bus (configure with the i2c4
-+                                overlay - BCM2711 only)
-+        i2c5                    Choose the I2C5 bus (configure with the i2c5
-+                                overlay - BCM2711 only)
-+        i2c6                    Choose the I2C6 bus (configure with the i2c6
-+                                overlay - BCM2711 only)
- 
-         Channel parameters can be set for each enabled channel.
-         A maximum of 4 channels can be enabled (letters a thru d).
---- a/arch/arm/boot/dts/overlays/ads1115-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/ads1115-overlay.dts
-@@ -9,23 +9,6 @@
- 	compatible = "brcm,bcm2835";
- 
- 	fragment@0 {
--		target = <&i2c_arm>;
--		__overlay__ {
--			#address-cells = <1>;
--			#size-cells = <0>;
--			status = "okay";
--
--			ads1115: ads1115@48 {
--				compatible = "ti,ads1115";
--				status = "okay";
--				#address-cells = <1>;
--				#size-cells = <0>;
--				reg = <0x48>;
--			};
--		};
--	};
--
--	fragment@1 {
- 		target = <&ads1115>;
- 		__dormant__ {
- 			#address-cells = <1>;
-@@ -39,7 +22,7 @@
- 		};
- 	};
- 
--	fragment@2 {
-+	fragment@1 {
- 		target = <&ads1115>;
- 		__dormant__ {
- 			#address-cells = <1>;
-@@ -53,7 +36,7 @@
- 		};
- 	};
- 
--	fragment@3 {
-+	fragment@2 {
- 		target = <&ads1115>;
- 		__dormant__ {
- 			#address-cells = <1>;
-@@ -67,7 +50,7 @@
- 		};
- 	};
- 
--	fragment@4 {
-+	fragment@3 {
- 		target = <&ads1115>;
- 		__dormant__ {
- 			#address-cells = <1>;
-@@ -81,23 +64,72 @@
- 		};
- 	};
- 
-+	fragment@4 {
-+		target = <&i2cbus>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			ads1115: ads1115@48 {
-+				compatible = "ti,ads1115";
-+				status = "okay";
-+				#address-cells = <1>;
-+				#size-cells = <0>;
-+				reg = <0x48>;
-+			};
-+		};
-+	};
-+
-+	frag100: fragment@100 {
-+		target = <&i2c1>;
-+		i2cbus: __overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@101 {
-+		target = <&i2c0if>;
-+		__dormant__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@102 {
-+		target = <&i2c0mux>;
-+		__dormant__ {
-+			status = "okay";
-+		};
-+	};
-+
- 	__overrides__ {
- 		addr =            <&ads1115>,"reg:0";
--		cha_enable =      <0>,"=1";
-+		cha_enable =      <0>,"=0";
- 		cha_cfg =         <&channel_a>,"reg:0";
- 		cha_gain =        <&channel_a>,"ti,gain:0";
- 		cha_datarate =    <&channel_a>,"ti,datarate:0";
--		chb_enable =      <0>,"=2";
-+		chb_enable =      <0>,"=1";
- 		chb_cfg =         <&channel_b>,"reg:0";
- 		chb_gain =        <&channel_b>,"ti,gain:0";
- 		chb_datarate =    <&channel_b>,"ti,datarate:0";
--		chc_enable =      <0>,"=3";
-+		chc_enable =      <0>,"=2";
- 		chc_cfg =         <&channel_c>,"reg:0";
- 		chc_gain =        <&channel_c>,"ti,gain:0";
- 		chc_datarate =    <&channel_c>,"ti,datarate:0";
--		chd_enable =      <0>,"=4";
-+		chd_enable =      <0>,"=3";
- 		chd_cfg =         <&channel_d>,"reg:0";
- 		chd_gain =        <&channel_d>,"ti,gain:0";
- 		chd_datarate =    <&channel_d>,"ti,datarate:0";
-+		i2c0 = <&frag100>, "target:0=",<&i2c0>;
-+		i2c_csi_dsi = <&frag100>, "target:0=",<&i2c_csi_dsi>,
-+			      <0>,"+101+102";
-+		i2c3 = <&frag100>, "target?=0",
-+		       <&frag100>, "target-path=i2c3";
-+		i2c4 = <&frag100>, "target?=0",
-+		       <&frag100>, "target-path=i2c4";
-+		i2c5 = <&frag100>, "target?=0",
-+		       <&frag100>, "target-path=i2c5";
-+		i2c6 = <&frag100>, "target?=0",
-+		       <&frag100>, "target-path=i2c6";
- 	};
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-1186-dts-bcm2712-put-usb-under-axi-not-soc.patch b/target/linux/bcm27xx/patches-6.1/950-1186-dts-bcm2712-put-usb-under-axi-not-soc.patch
deleted file mode 100644
index b66265f5a1..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1186-dts-bcm2712-put-usb-under-axi-not-soc.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 82069a7a02632aa60fa5c69415bf891ede7d6fd4 Mon Sep 17 00:00:00 2001
-From: Jonathan Bell <jonathan@raspberrypi.com>
-Date: Tue, 5 Dec 2023 16:55:17 +0000
-Subject: [PATCH] dts: bcm2712: put usb under /axi not /soc
-
-On 2712, the DWC USB controller is no longer attached to the Videocore
-30-bit bus with its associated aliases, and can see the bottom 4GB of
-RAM directly.
-
-Ideally it should make use of IOMMU6 but for now software bounce buffers
-get it working.
-
-Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2712.dtsi | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
---- a/arch/arm/boot/dts/bcm2712.dtsi
-+++ b/arch/arm/boot/dts/bcm2712.dtsi
-@@ -133,19 +133,6 @@
- 			status = "disabled";
- 		};
- 
--		usb: usb@7c480000 {
--			compatible = "brcm,bcm2835-usb";
--			reg = <0x7c480000 0x10000>;
--			interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
--			#address-cells = <1>;
--			#size-cells = <0>;
--			clocks = <&clk_usb>;
--			clock-names = "otg";
--			phys = <&usbphy>;
--			phy-names = "usb2-phy";
--			status = "disabled";
--		};
--
- 		mop: mop@7c500000 {
- 			compatible = "brcm,bcm2712-mop";
- 			reg = <0x7c500000 0x20>;
-@@ -1145,6 +1132,19 @@
- 			reg = <0x10 0x00400018  0x0 0x18>;
- 		};
- 
-+		usb: usb@480000 {
-+			compatible = "brcm,bcm2835-usb";
-+			reg = <0x10 0x00480000 0x0 0x10000>;
-+			interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			clocks = <&clk_usb>;
-+			clock-names = "otg";
-+			phys = <&usbphy>;
-+			phy-names = "usb2-phy";
-+			status = "disabled";
-+		};
-+
- 		rpivid: codec@800000 {
- 			compatible = "raspberrypi,rpivid-vid-decoder";
- 			reg = <0x10 0x00800000  0x0 0x10000>, /* HEVC */
diff --git a/target/linux/bcm27xx/patches-6.1/950-1187-drm-vc4-Correct-HVS-muxing-setup-for-the-moplet.patch b/target/linux/bcm27xx/patches-6.1/950-1187-drm-vc4-Correct-HVS-muxing-setup-for-the-moplet.patch
deleted file mode 100644
index be02fd27fa..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1187-drm-vc4-Correct-HVS-muxing-setup-for-the-moplet.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 01139e4e9141d031c6f4f00371e5eb52fa78839e Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 5 Dec 2023 18:28:19 +0000
-Subject: [PATCH] drm/vc4: Correct HVS muxing setup for the moplet
-
-The moplet registers as VC4_ENCODER_TYPE_TXP1 and can be
-fed from mux output 2 of HVS channel 1.
-
-Correct the option which checked for VC4_ENCODER_TYPE_TXP0
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_kms.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/vc4/vc4_kms.c
-+++ b/drivers/gpu/drm/vc4/vc4_kms.c
-@@ -365,7 +365,7 @@ static void vc6_hvs_pv_muxing_commit(str
- 			mux = 0;
- 			break;
- 
--		case VC4_ENCODER_TYPE_TXP0:
-+		case VC4_ENCODER_TYPE_TXP1:
- 			mux = 2;
- 			break;
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1188-drm-vc4-Mop-and-moplet-have-different-register-offse.patch b/target/linux/bcm27xx/patches-6.1/950-1188-drm-vc4-Mop-and-moplet-have-different-register-offse.patch
deleted file mode 100644
index f1bb26a26b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1188-drm-vc4-Mop-and-moplet-have-different-register-offse.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From cc948130d3e1c70ef21ae9963b56e0d500cef70b Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 5 Dec 2023 18:29:34 +0000
-Subject: [PATCH] drm/vc4: Mop and moplet have different register offsets for
- high addr
-
-MOP uses register offset 0x24 for the high bits of the address,
-whilst Moplet uses 0x1c.
-
-Handle this difference between the block types.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_drv.h | 1 +
- drivers/gpu/drm/vc4/vc4_txp.c | 8 ++++++--
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -564,6 +564,7 @@ struct vc4_crtc_data {
- struct vc4_txp_data {
- 	struct vc4_crtc_data	base;
- 	enum vc4_encoder_type encoder_type;
-+	unsigned int high_addr_ptr_reg;
- 	unsigned int has_byte_enable:1;
- 	unsigned int size_minus_one:1;
- 	unsigned int supports_40bit_addresses:1;
---- a/drivers/gpu/drm/vc4/vc4_txp.c
-+++ b/drivers/gpu/drm/vc4/vc4_txp.c
-@@ -145,7 +145,8 @@
- /* Number of lines received and committed to memory. */
- #define TXP_PROGRESS		0x10
- 
--#define TXP_DST_PTR_HIGH	0x1c
-+#define TXP_DST_PTR_HIGH_MOPLET	0x1c
-+#define TXP_DST_PTR_HIGH_MOP	0x24
- 
- #define TXP_READ(offset)								\
- 	({										\
-@@ -338,10 +339,11 @@ static void vc4_txp_connector_atomic_com
- 
- 	gem = drm_fb_dma_get_gem_obj(fb, 0);
- 	addr = gem->dma_addr + fb->offsets[0];
-+
- 	TXP_WRITE(TXP_DST_PTR, lower_32_bits(addr));
- 
- 	if (txp_data->supports_40bit_addresses)
--		TXP_WRITE(TXP_DST_PTR_HIGH, upper_32_bits(addr) & 0xff);
-+		TXP_WRITE(txp_data->high_addr_ptr_reg, upper_32_bits(addr) & 0xff);
- 
- 	TXP_WRITE(TXP_DST_PITCH, fb->pitches[0]);
- 
-@@ -520,6 +522,7 @@ const struct vc4_txp_data bcm2712_mop_da
- 		.hvs_output = 2,
- 	},
- 	.encoder_type = VC4_ENCODER_TYPE_TXP0,
-+	.high_addr_ptr_reg = TXP_DST_PTR_HIGH_MOP,
- 	.has_byte_enable = true,
- 	.size_minus_one = true,
- 	.supports_40bit_addresses = true,
-@@ -533,6 +536,7 @@ const struct vc4_txp_data bcm2712_moplet
- 		.hvs_output = 4,
- 	},
- 	.encoder_type = VC4_ENCODER_TYPE_TXP1,
-+	.high_addr_ptr_reg = TXP_DST_PTR_HIGH_MOPLET,
- 	.size_minus_one = true,
- 	.supports_40bit_addresses = true,
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-1189-arm-dt-bcm2712-Correct-the-size-of-the-register-rang.patch b/target/linux/bcm27xx/patches-6.1/950-1189-arm-dt-bcm2712-Correct-the-size-of-the-register-rang.patch
deleted file mode 100644
index ece5c716e7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1189-arm-dt-bcm2712-Correct-the-size-of-the-register-rang.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 36593e2e27769d635ef18301f25b5e219a23949a Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Tue, 5 Dec 2023 18:31:25 +0000
-Subject: [PATCH] arm: dt: bcm2712: Correct the size of the register range for
- MOP
-
-The Mop covers 0x28 bytes of registers, so ensure the range is
-defined appropriately.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2712.dtsi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/arm/boot/dts/bcm2712.dtsi
-+++ b/arch/arm/boot/dts/bcm2712.dtsi
-@@ -135,7 +135,7 @@
- 
- 		mop: mop@7c500000 {
- 			compatible = "brcm,bcm2712-mop";
--			reg = <0x7c500000 0x20>;
-+			reg = <0x7c500000 0x28>;
- 			interrupt-parent = <&disp_intr>;
- 			interrupts = <1>;
- 			status = "disabled";
diff --git a/target/linux/bcm27xx/patches-6.1/950-1192-media-Add-MIPI-CCI-register-access-helper-functions.patch b/target/linux/bcm27xx/patches-6.1/950-1192-media-Add-MIPI-CCI-register-access-helper-functions.patch
deleted file mode 100644
index 3305e66986..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1192-media-Add-MIPI-CCI-register-access-helper-functions.patch
+++ /dev/null
@@ -1,388 +0,0 @@
-From ae0e1b70f675f6ac7966e427f0d8f57812dbc312 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Tue, 27 Jun 2023 14:51:04 +0200
-Subject: [PATCH] media: Add MIPI CCI register access helper functions
-
-The CSI2 specification specifies a standard method to access camera sensor
-registers called "Camera Control Interface (CCI)".
-
-This uses either 8 or 16 bit (big-endian wire order) register addresses
-and supports 8, 16, 24 or 32 bit (big-endian wire order) register widths.
-
-Currently a lot of Linux camera sensor drivers all have their own custom
-helpers for this, often copy and pasted from other drivers.
-
-Add a set of generic helpers for this so that all sensor drivers can
-switch to a single common implementation.
-
-These helpers take an extra optional "int *err" function parameter,
-this can be used to chain a bunch of register accesses together with
-only a single error check at the end, rather than needing to error
-check each individual register access. The first failing call will
-set the contents of err to a non 0 value and all other calls will
-then become no-ops.
-
-Link: https://lore.kernel.org/linux-media/59aefa7f-7bf9-6736-6040-39551329cd0a@redhat.com/
-
-Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
-Tested-by: Tommaso Merciai <tomm.merciai@gmail.com>
-Reviewed-by: Tommaso Merciai <tomm.merciai@gmail.com>
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
-Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
-(cherry picked from commit 613cbb91e9cee7cf5a61f0816d2acab7bc117407)
----
- Documentation/driver-api/media/v4l2-cci.rst  |   5 +
- Documentation/driver-api/media/v4l2-core.rst |   1 +
- drivers/media/v4l2-core/Kconfig              |   9 +
- drivers/media/v4l2-core/Makefile             |   1 +
- drivers/media/v4l2-core/v4l2-cci.c           | 166 +++++++++++++++++++
- include/media/v4l2-cci.h                     | 125 ++++++++++++++
- 6 files changed, 307 insertions(+)
- create mode 100644 Documentation/driver-api/media/v4l2-cci.rst
- create mode 100644 drivers/media/v4l2-core/v4l2-cci.c
- create mode 100644 include/media/v4l2-cci.h
-
---- /dev/null
-+++ b/Documentation/driver-api/media/v4l2-cci.rst
-@@ -0,0 +1,5 @@
-+.. SPDX-License-Identifier: GPL-2.0
-+
-+V4L2 CCI kAPI
-+^^^^^^^^^^^^^
-+.. kernel-doc:: include/media/v4l2-cci.h
---- a/Documentation/driver-api/media/v4l2-core.rst
-+++ b/Documentation/driver-api/media/v4l2-core.rst
-@@ -22,6 +22,7 @@ Video4Linux devices
-     v4l2-mem2mem
-     v4l2-async
-     v4l2-fwnode
-+    v4l2-cci
-     v4l2-rect
-     v4l2-tuner
-     v4l2-common
---- a/drivers/media/v4l2-core/Kconfig
-+++ b/drivers/media/v4l2-core/Kconfig
-@@ -74,6 +74,15 @@ config V4L2_FWNODE
- config V4L2_ASYNC
- 	tristate
- 
-+config V4L2_CCI
-+	tristate
-+
-+config V4L2_CCI_I2C
-+	tristate
-+	depends on I2C
-+	select REGMAP_I2C
-+	select V4L2_CCI
-+
- # Used by drivers that need Videobuf modules
- config VIDEOBUF_GEN
- 	tristate
---- a/drivers/media/v4l2-core/Makefile
-+++ b/drivers/media/v4l2-core/Makefile
-@@ -25,6 +25,7 @@ videodev-$(CONFIG_VIDEO_V4L2_I2C) += v4l
- # (e. g. LC_ALL=C sort Makefile)
- 
- obj-$(CONFIG_V4L2_ASYNC) += v4l2-async.o
-+obj-$(CONFIG_V4L2_CCI) += v4l2-cci.o
- obj-$(CONFIG_V4L2_FLASH_LED_CLASS) += v4l2-flash-led-class.o
- obj-$(CONFIG_V4L2_FWNODE) += v4l2-fwnode.o
- obj-$(CONFIG_V4L2_H264) += v4l2-h264.o
---- /dev/null
-+++ b/drivers/media/v4l2-core/v4l2-cci.c
-@@ -0,0 +1,166 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * MIPI Camera Control Interface (CCI) register access helpers.
-+ *
-+ * Copyright (C) 2023 Hans de Goede <hansg@kernel.org>
-+ */
-+
-+#include <linux/bitfield.h>
-+#include <linux/delay.h>
-+#include <linux/dev_printk.h>
-+#include <linux/module.h>
-+#include <linux/regmap.h>
-+#include <linux/types.h>
-+
-+#include <asm/unaligned.h>
-+
-+#include <media/v4l2-cci.h>
-+
-+int cci_read(struct regmap *map, u32 reg, u64 *val, int *err)
-+{
-+	unsigned int len;
-+	u8 buf[8];
-+	int ret;
-+
-+	if (err && *err)
-+		return *err;
-+
-+	len = FIELD_GET(CCI_REG_WIDTH_MASK, reg);
-+	reg = FIELD_GET(CCI_REG_ADDR_MASK, reg);
-+
-+	ret = regmap_bulk_read(map, reg, buf, len);
-+	if (ret) {
-+		dev_err(regmap_get_device(map), "Error reading reg 0x%4x: %d\n",
-+			reg, ret);
-+		goto out;
-+	}
-+
-+	switch (len) {
-+	case 1:
-+		*val = buf[0];
-+		break;
-+	case 2:
-+		*val = get_unaligned_be16(buf);
-+		break;
-+	case 3:
-+		*val = get_unaligned_be24(buf);
-+		break;
-+	case 4:
-+		*val = get_unaligned_be32(buf);
-+		break;
-+	case 8:
-+		*val = get_unaligned_be64(buf);
-+		break;
-+	default:
-+		dev_err(regmap_get_device(map), "Error invalid reg-width %u for reg 0x%04x\n",
-+			len, reg);
-+		ret = -EINVAL;
-+		break;
-+	}
-+
-+out:
-+	if (ret && err)
-+		*err = ret;
-+
-+	return ret;
-+}
-+EXPORT_SYMBOL_GPL(cci_read);
-+
-+int cci_write(struct regmap *map, u32 reg, u64 val, int *err)
-+{
-+	unsigned int len;
-+	u8 buf[8];
-+	int ret;
-+
-+	if (err && *err)
-+		return *err;
-+
-+	len = FIELD_GET(CCI_REG_WIDTH_MASK, reg);
-+	reg = FIELD_GET(CCI_REG_ADDR_MASK, reg);
-+
-+	switch (len) {
-+	case 1:
-+		buf[0] = val;
-+		break;
-+	case 2:
-+		put_unaligned_be16(val, buf);
-+		break;
-+	case 3:
-+		put_unaligned_be24(val, buf);
-+		break;
-+	case 4:
-+		put_unaligned_be32(val, buf);
-+		break;
-+	case 8:
-+		put_unaligned_be64(val, buf);
-+		break;
-+	default:
-+		dev_err(regmap_get_device(map), "Error invalid reg-width %u for reg 0x%04x\n",
-+			len, reg);
-+		ret = -EINVAL;
-+		goto out;
-+	}
-+
-+	ret = regmap_bulk_write(map, reg, buf, len);
-+	if (ret)
-+		dev_err(regmap_get_device(map), "Error writing reg 0x%4x: %d\n",
-+			reg, ret);
-+
-+out:
-+	if (ret && err)
-+		*err = ret;
-+
-+	return ret;
-+}
-+EXPORT_SYMBOL_GPL(cci_write);
-+
-+int cci_update_bits(struct regmap *map, u32 reg, u64 mask, u64 val, int *err)
-+{
-+	u64 readval;
-+	int ret;
-+
-+	ret = cci_read(map, reg, &readval, err);
-+	if (ret)
-+		return ret;
-+
-+	val = (readval & ~mask) | (val & mask);
-+
-+	return cci_write(map, reg, val, err);
-+}
-+EXPORT_SYMBOL_GPL(cci_update_bits);
-+
-+int cci_multi_reg_write(struct regmap *map, const struct cci_reg_sequence *regs,
-+			unsigned int num_regs, int *err)
-+{
-+	unsigned int i;
-+	int ret;
-+
-+	for (i = 0; i < num_regs; i++) {
-+		ret = cci_write(map, regs[i].reg, regs[i].val, err);
-+		if (ret)
-+			return ret;
-+	}
-+
-+	return 0;
-+}
-+EXPORT_SYMBOL_GPL(cci_multi_reg_write);
-+
-+#if IS_ENABLED(CONFIG_V4L2_CCI_I2C)
-+struct regmap *devm_cci_regmap_init_i2c(struct i2c_client *client,
-+					int reg_addr_bits)
-+{
-+	struct regmap_config config = {
-+		.reg_bits = reg_addr_bits,
-+		.val_bits = 8,
-+		.reg_format_endian = REGMAP_ENDIAN_BIG,
-+		.disable_locking = true,
-+	};
-+
-+	return devm_regmap_init_i2c(client, &config);
-+}
-+EXPORT_SYMBOL_GPL(devm_cci_regmap_init_i2c);
-+#endif
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Hans de Goede <hansg@kernel.org>");
-+MODULE_DESCRIPTION("MIPI Camera Control Interface (CCI) support");
---- /dev/null
-+++ b/include/media/v4l2-cci.h
-@@ -0,0 +1,125 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * MIPI Camera Control Interface (CCI) register access helpers.
-+ *
-+ * Copyright (C) 2023 Hans de Goede <hansg@kernel.org>
-+ */
-+#ifndef _V4L2_CCI_H
-+#define _V4L2_CCI_H
-+
-+#include <linux/types.h>
-+
-+struct i2c_client;
-+struct regmap;
-+
-+/**
-+ * struct cci_reg_sequence - An individual write from a sequence of CCI writes
-+ *
-+ * @reg: Register address, use CCI_REG#() macros to encode reg width
-+ * @val: Register value
-+ *
-+ * Register/value pairs for sequences of writes.
-+ */
-+struct cci_reg_sequence {
-+	u32 reg;
-+	u64 val;
-+};
-+
-+/*
-+ * Macros to define register address with the register width encoded
-+ * into the higher bits.
-+ */
-+#define CCI_REG_ADDR_MASK		GENMASK(15, 0)
-+#define CCI_REG_WIDTH_SHIFT		16
-+#define CCI_REG_WIDTH_MASK		GENMASK(19, 16)
-+
-+#define CCI_REG8(x)			((1 << CCI_REG_WIDTH_SHIFT) | (x))
-+#define CCI_REG16(x)			((2 << CCI_REG_WIDTH_SHIFT) | (x))
-+#define CCI_REG24(x)			((3 << CCI_REG_WIDTH_SHIFT) | (x))
-+#define CCI_REG32(x)			((4 << CCI_REG_WIDTH_SHIFT) | (x))
-+#define CCI_REG64(x)			((8 << CCI_REG_WIDTH_SHIFT) | (x))
-+
-+/**
-+ * cci_read() - Read a value from a single CCI register
-+ *
-+ * @map: Register map to read from
-+ * @reg: Register address to read, use CCI_REG#() macros to encode reg width
-+ * @val: Pointer to store read value
-+ * @err: Optional pointer to store errors, if a previous error is set
-+ *       then the read will be skipped
-+ *
-+ * Return: %0 on success or a negative error code on failure.
-+ */
-+int cci_read(struct regmap *map, u32 reg, u64 *val, int *err);
-+
-+/**
-+ * cci_write() - Write a value to a single CCI register
-+ *
-+ * @map: Register map to write to
-+ * @reg: Register address to write, use CCI_REG#() macros to encode reg width
-+ * @val: Value to be written
-+ * @err: Optional pointer to store errors, if a previous error is set
-+ *       then the write will be skipped
-+ *
-+ * Return: %0 on success or a negative error code on failure.
-+ */
-+int cci_write(struct regmap *map, u32 reg, u64 val, int *err);
-+
-+/**
-+ * cci_update_bits() - Perform a read/modify/write cycle on
-+ *                     a single CCI register
-+ *
-+ * @map: Register map to update
-+ * @reg: Register address to update, use CCI_REG#() macros to encode reg width
-+ * @mask: Bitmask to change
-+ * @val: New value for bitmask
-+ * @err: Optional pointer to store errors, if a previous error is set
-+ *       then the update will be skipped
-+ *
-+ * Note this uses read-modify-write to update the bits, atomicity with regards
-+ * to other cci_*() register access functions is NOT guaranteed.
-+ *
-+ * Return: %0 on success or a negative error code on failure.
-+ */
-+int cci_update_bits(struct regmap *map, u32 reg, u64 mask, u64 val, int *err);
-+
-+/**
-+ * cci_multi_reg_write() - Write multiple registers to the device
-+ *
-+ * @map: Register map to write to
-+ * @regs: Array of structures containing register-address, -value pairs to be
-+ *        written, register-addresses use CCI_REG#() macros to encode reg width
-+ * @num_regs: Number of registers to write
-+ * @err: Optional pointer to store errors, if a previous error is set
-+ *       then the write will be skipped
-+ *
-+ * Write multiple registers to the device where the set of register, value
-+ * pairs are supplied in any order, possibly not all in a single range.
-+ *
-+ * Use of the CCI_REG#() macros to encode reg width is mandatory.
-+ *
-+ * For raw lists of register-address, -value pairs with only 8 bit
-+ * wide writes regmap_multi_reg_write() can be used instead.
-+ *
-+ * Return: %0 on success or a negative error code on failure.
-+ */
-+int cci_multi_reg_write(struct regmap *map, const struct cci_reg_sequence *regs,
-+			unsigned int num_regs, int *err);
-+
-+#if IS_ENABLED(CONFIG_V4L2_CCI_I2C)
-+/**
-+ * devm_cci_regmap_init_i2c() - Create regmap to use with cci_*() register
-+ *                              access functions
-+ *
-+ * @client: i2c_client to create the regmap for
-+ * @reg_addr_bits: register address width to use (8 or 16)
-+ *
-+ * Note the memory for the created regmap is devm() managed, tied to the client.
-+ *
-+ * Return: %0 on success or a negative error code on failure.
-+ */
-+struct regmap *devm_cci_regmap_init_i2c(struct i2c_client *client,
-+					int reg_addr_bits);
-+#endif
-+
-+#endif
diff --git a/target/linux/bcm27xx/patches-6.1/950-1193-media-dt-bindings-Add-OmniVision-OV64A40.patch b/target/linux/bcm27xx/patches-6.1/950-1193-media-dt-bindings-Add-OmniVision-OV64A40.patch
deleted file mode 100644
index 649e8bc393..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1193-media-dt-bindings-Add-OmniVision-OV64A40.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 3d108604ca669b83bb4918c4f5f0a02ddef84972 Mon Sep 17 00:00:00 2001
-From: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
-Date: Sun, 1 Oct 2023 13:20:12 +0200
-Subject: [PATCH] media: dt-bindings: Add OmniVision OV64A40
-
-Add bindings for OmniVision OV64A40.
-
-Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
----
- .../bindings/media/i2c/ovti,ov64a40.yaml      | 98 +++++++++++++++++++
- 1 file changed, 98 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/media/i2c/ovti,ov64a40.yaml
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/media/i2c/ovti,ov64a40.yaml
-@@ -0,0 +1,98 @@
-+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
-+%YAML 1.2
-+---
-+$id: http://devicetree.org/schemas/media/i2c/ovti,ov64a40.yaml#
-+$schema: http://devicetree.org/meta-schemas/core.yaml#
-+
-+title: OmniVision OV64A40 Image Sensor
-+
-+maintainers:
-+  - Jacopo Mondi <jacopo.mondi@ideasonboard.com>
-+
-+allOf:
-+  - $ref: /schemas/media/video-interface-devices.yaml#
-+
-+properties:
-+  compatible:
-+    const: ovti,ov64a40
-+
-+  reg:
-+    maxItems: 1
-+
-+  clocks:
-+    maxItems: 1
-+
-+  avdd-supply:
-+    description: Analog voltage supply, 2.8 volts
-+
-+  dvdd-supply:
-+    description: Digital core voltage supply, 1.1 volts
-+
-+  dovdd-supply:
-+    description: Digital I/O voltage supply, 1.8 volts
-+
-+  powerdown-gpios:
-+    maxItems: 1
-+
-+  reset-gpios:
-+    maxItems: 1
-+
-+  port:
-+    $ref: /schemas/graph.yaml#/$defs/port-base
-+    additionalProperties: false
-+
-+    properties:
-+      endpoint:
-+        $ref: /schemas/media/video-interfaces.yaml#
-+        additionalProperties: false
-+
-+        properties:
-+          bus-type:
-+            enum:
-+              - 1 # MIPI CSI-2 C-PHY
-+              - 4 # MIPI CSI-2 D-PHY
-+          data-lanes: true
-+          link-frequencies: true
-+          clock-noncontinuous: true
-+          remote-endpoint: true
-+
-+required:
-+  - compatible
-+  - reg
-+  - clocks
-+  - port
-+
-+unevaluatedProperties: false
-+
-+examples:
-+  - |
-+      #include <dt-bindings/gpio/gpio.h>
-+
-+      i2c {
-+          #address-cells = <1>;
-+          #size-cells = <0>;
-+
-+          camera@36 {
-+              compatible = "ovti,ov64a40";
-+              reg = <0x36>;
-+              clocks = <&camera_clk>;
-+              dovdd-supply = <&vgen4_reg>;
-+              avdd-supply = <&vgen3_reg>;
-+              dvdd-supply = <&vgen2_reg>;
-+              powerdown-gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
-+              reset-gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
-+              rotation = <180>;
-+              orientation = <2>;
-+
-+              port {
-+                  endpoint {
-+                      remote-endpoint = <&mipi_csi2_in>;
-+                      bus-type = <4>;
-+                      data-lanes = <1 2 3 4>;
-+                      link-frequencies = /bits/ 64 <456000000>;
-+                  };
-+              };
-+          };
-+      };
-+
-+...
diff --git a/target/linux/bcm27xx/patches-6.1/950-1194-media-dt-bindings-i2c-Add-Rohm-BU64754-bindings.patch b/target/linux/bcm27xx/patches-6.1/950-1194-media-dt-bindings-i2c-Add-Rohm-BU64754-bindings.patch
deleted file mode 100644
index c11fbe2ec6..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1194-media-dt-bindings-i2c-Add-Rohm-BU64754-bindings.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 31c2999e543c245f7b96af3e73cd18e1036bfe7b Mon Sep 17 00:00:00 2001
-From: Kieran Bingham <kieran.bingham@ideasonboard.com>
-Date: Thu, 14 Sep 2023 17:03:24 +0100
-Subject: [PATCH] media: dt-bindings: i2c: Add Rohm BU64754 bindings
-
-Add YAML device tree bindings for the ROHM BU64754 VCM Motor Driver for
-Camera Autofocus.
-
-Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
-Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
----
- .../bindings/media/i2c/rohm,bu64754.yaml      | 48 +++++++++++++++++++
- MAINTAINERS                                   |  7 +++
- 2 files changed, 55 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/media/i2c/rohm,bu64754.yaml
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/media/i2c/rohm,bu64754.yaml
-@@ -0,0 +1,48 @@
-+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
-+# Copyright (C) 2023 Ideas on Board Oy.
-+%YAML 1.2
-+---
-+$id: http://devicetree.org/schemas/media/i2c/rohm,bu64754.yaml#
-+$schema: http://devicetree.org/meta-schemas/core.yaml#
-+
-+title: ROHM BU64754 Actuator Driver for Camera Autofocus
-+
-+maintainers:
-+  - Kieran Bingham <kieran.bingham@ideasonboard.com>
-+
-+description: |
-+  The BU64754GWZ is an actuator driver IC which can control the actuator
-+  position precisely using an internal Hall Sensor.
-+
-+properties:
-+  compatible:
-+    items:
-+      - enum:
-+          - rohm,bu64754
-+
-+  reg:
-+    maxItems: 1
-+
-+  vdd-supply:
-+    description:
-+      Definition of the regulator used as VDD power supply to the driver.
-+
-+required:
-+  - compatible
-+  - reg
-+
-+additionalProperties: false
-+
-+examples:
-+  - |
-+    i2c {
-+        #address-cells = <1>;
-+        #size-cells = <0>;
-+
-+        lens@76 {
-+            compatible = "rohm,bu64754";
-+            reg = <0x76>;
-+            vdd-supply = <&cam1_reg>;
-+        };
-+    };
-+...
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -17904,6 +17904,13 @@ S:	Maintained
- F:	Documentation/devicetree/bindings/iio/light/bh1750.yaml
- F:	drivers/iio/light/bh1750.c
- 
-+ROHM BU64754 MOTOR DRIVER FOR CAMERA AUTOFOCUS
-+M:	Kieran Bingham <kieran.bingham@ideasonboard.com>
-+L:	linux-media@vger.kernel.org
-+S:	Maintained
-+T:	git git://linuxtv.org/media_tree.git
-+F:	Documentation/devicetree/bindings/media/i2c/rohm,bu64754.yaml
-+
- ROHM MULTIFUNCTION BD9571MWV-M PMIC DEVICE DRIVERS
- M:	Marek Vasut <marek.vasut+renesas@gmail.com>
- L:	linux-kernel@vger.kernel.org
diff --git a/target/linux/bcm27xx/patches-6.1/950-1195-media-i2c-Add-driver-for-OmniVision-OV64A40.patch b/target/linux/bcm27xx/patches-6.1/950-1195-media-i2c-Add-driver-for-OmniVision-OV64A40.patch
deleted file mode 100644
index 01940e18e3..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1195-media-i2c-Add-driver-for-OmniVision-OV64A40.patch
+++ /dev/null
@@ -1,3763 +0,0 @@
-From 87e3fcaad3017bdc91a7a79d2d1c874422ef87b0 Mon Sep 17 00:00:00 2001
-From: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
-Date: Thu, 20 Jul 2023 11:44:40 +0200
-Subject: [PATCH] media: i2c: Add driver for OmniVision OV64A40
-
-Add a driver for the OmniVision OV64A40 image sensor.
-
-Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
----
- MAINTAINERS                 |    8 +
- drivers/media/i2c/Kconfig   |   14 +
- drivers/media/i2c/Makefile  |    1 +
- drivers/media/i2c/ov64a40.c | 3694 +++++++++++++++++++++++++++++++++++
- 4 files changed, 3717 insertions(+)
- create mode 100644 drivers/media/i2c/ov64a40.c
-
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -15330,6 +15330,14 @@ S:	Maintained
- T:	git git://linuxtv.org/media_tree.git
- F:	drivers/media/i2c/ov5695.c
- 
-+OMNIVISION OV64A40 SENSOR DRIVER
-+M:	Jacopo Mondi <jacopo.mondi@ideasonboard.com>
-+L:	linux-media@vger.kernel.org
-+S:	Maintained
-+T:	git git://linuxtv.org/media_tree.git
-+F:	Documentation/devicetree/bindings/media/i2c/ovti,ov64a40.yaml
-+F:	drivers/media/i2c/ov64a40.c
-+
- OMNIVISION OV7670 SENSOR DRIVER
- L:	linux-media@vger.kernel.org
- S:	Orphan
---- a/drivers/media/i2c/Kconfig
-+++ b/drivers/media/i2c/Kconfig
-@@ -631,6 +631,20 @@ config VIDEO_OV5695
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called ov5695.
- 
-+config VIDEO_OV64A40
-+	tristate "OmniVision OV64A40 sensor support"
-+	depends on I2C && VIDEO_DEV
-+	select MEDIA_CONTROLLER
-+	select VIDEO_V4L2_SUBDEV_API
-+	select V4L2_FWNODE
-+	select V4L2_CCI_I2C
-+	help
-+	  This is a Video4Linux2 sensor driver for the OmniVision
-+	  OV64A40 camera.
-+
-+	  To compile this driver as a module, choose M here: the
-+	  module will be called ov64a40.
-+
- config VIDEO_OV6650
- 	tristate "OmniVision OV6650 sensor support"
- 	depends on I2C && VIDEO_DEV
---- a/drivers/media/i2c/Makefile
-+++ b/drivers/media/i2c/Makefile
-@@ -96,6 +96,7 @@ obj-$(CONFIG_VIDEO_OV5670) += ov5670.o
- obj-$(CONFIG_VIDEO_OV5675) += ov5675.o
- obj-$(CONFIG_VIDEO_OV5693) += ov5693.o
- obj-$(CONFIG_VIDEO_OV5695) += ov5695.o
-+obj-$(CONFIG_VIDEO_OV64A40) += ov64a40.o
- obj-$(CONFIG_VIDEO_OV6650) += ov6650.o
- obj-$(CONFIG_VIDEO_OV7251) += ov7251.o
- obj-$(CONFIG_VIDEO_OV7640) += ov7640.o
---- /dev/null
-+++ b/drivers/media/i2c/ov64a40.c
-@@ -0,0 +1,3694 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * V4L2 sensor driver for OmniVision OV64A40
-+ *
-+ * Copyright (C) 2023 Ideas On Board Oy
-+ * Copyright (C) 2023 Arducam
-+ */
-+
-+#include <linux/clk.h>
-+#include <linux/delay.h>
-+#include <linux/gpio/consumer.h>
-+#include <linux/i2c.h>
-+#include <linux/mod_devicetable.h>
-+#include <linux/module.h>
-+#include <linux/pm_runtime.h>
-+#include <linux/regulator/consumer.h>
-+
-+#include <media/v4l2-cci.h>
-+#include <media/v4l2-ctrls.h>
-+#include <media/v4l2-device.h>
-+#include <media/v4l2-event.h>
-+#include <media/v4l2-fwnode.h>
-+#include <media/v4l2-mediabus.h>
-+#include <media/v4l2-subdev.h>
-+
-+#define OV64A40_XCLK_FREQ		24000000
-+
-+#define OV64A40_NATIVE_WIDTH		9286
-+#define OV64A40_NATIVE_HEIGHT		6976
-+#define OV64A40_PIXEL_ARRAY_TOP		0
-+#define OV64A40_PIXEL_ARRAY_LEFT	0
-+#define OV64A40_PIXEL_ARRAY_WIDTH	9248
-+#define OV64A40_PIXEL_ARRAY_HEIGHT	6944
-+
-+#define OV64A40_PIXEL_RATE		300000000
-+
-+#define OV64A40_LINK_FREQ_360M		360000000
-+#define OV64A40_LINK_FREQ_456M		456000000
-+
-+#define OV64A40_PLL1_PRE_DIV0		CCI_REG8(0x0301)
-+#define OV64A40_PLL1_PRE_DIV		CCI_REG8(0x0303)
-+#define OV64A40_PLL1_MULTIPLIER		CCI_REG16(0x0304)
-+#define OV64A40_PLL1_M_DIV		CCI_REG8(0x0307)
-+#define OV64A40_PLL2_SEL_BAK_SA1	CCI_REG8(0x0320)
-+#define OV64A40_PLL2_PRE_DIV		CCI_REG8(0x0323)
-+#define OV64A40_PLL2_MULTIPLIER		CCI_REG16(0x0324)
-+#define OV64A40_PLL2_PRE_DIV0		CCI_REG8(0x0326)
-+#define OV64A40_PLL2_DIVDAC		CCI_REG8(0x0329)
-+#define OV64A40_PLL2_DIVSP		CCI_REG8(0x032d)
-+#define OV64A40_PLL2_DACPREDIV		CCI_REG8(0x032e)
-+
-+/* TODO: validate vblank_min, it's not characterized in the datasheet. */
-+#define OV64A40_VBLANK_MIN		128
-+#define OV64A40_VTS_MAX			0xffffff
-+
-+#define OV64A40_REG_MEC_LONG_EXPO	CCI_REG24(0x3500)
-+#define OV64A40_EXPOSURE_MIN		16
-+#define OV64A40_EXPOSURE_MARGIN		32
-+
-+#define OV64A40_REG_MEC_LONG_GAIN	CCI_REG16(0x3508)
-+#define OV64A40_ANA_GAIN_MIN		0x80
-+#define OV64A40_ANA_GAIN_MAX		0x7ff
-+#define OV64A40_ANA_GAIN_DEFAULT	0x80
-+
-+#define OV64A40_REG_TIMING_CTRL0	CCI_REG16(0x3800)
-+#define OV64A40_REG_TIMING_CTRL2	CCI_REG16(0x3802)
-+#define OV64A40_REG_TIMING_CTRL4	CCI_REG16(0x3804)
-+#define OV64A40_REG_TIMING_CTRL6	CCI_REG16(0x3806)
-+#define OV64A40_REG_TIMING_CTRL8	CCI_REG16(0x3808)
-+#define OV64A40_REG_TIMING_CTRLA	CCI_REG16(0x380a)
-+#define OV64A40_REG_TIMING_CTRLC	CCI_REG16(0x380c)
-+#define OV64A40_REG_TIMING_CTRLE	CCI_REG16(0x380e)
-+#define OV64A40_REG_TIMING_CTRL10	CCI_REG16(0x3810)
-+#define OV64A40_REG_TIMING_CTRL12	CCI_REG16(0x3812)
-+
-+/*
-+ * Careful: a typo in the datasheet calls this register
-+ * OV64A40_REG_TIMING_CTRL20.
-+ */
-+#define OV64A40_REG_TIMING_CTRL14	CCI_REG8(0x3814)
-+#define OV64A40_REG_TIMING_CTRL15	CCI_REG8(0x3815)
-+#define OV64A40_ODD_INC_SHIFT		4
-+#define OV64A40_SKIPPING_CONFIG(_odd, _even) \
-+				(((_odd) << OV64A40_ODD_INC_SHIFT) | (_even))
-+
-+#define OV64A40_REG_TIMING_CTRL_20	CCI_REG8(0x3820)
-+#define OV64A40_TIMING_CTRL_20_VFLIP	BIT(2)
-+#define OV64A40_TIMING_CTRL_20_VBIN	BIT(1)
-+
-+#define OV64A40_REG_TIMING_CTRL_21	CCI_REG8(0x3821)
-+#define OV64A40_TIMING_CTRL_21_HBIN	BIT(4)
-+#define OV64A40_TIMING_CTRL_21_HFLIP	BIT(2)
-+#define OV64A40_TIMING_CTRL_21_DSPEED	BIT(0)
-+#define OV64A40_TIMING_CTRL_21_HBIN_CONF \
-+					(OV64A40_TIMING_CTRL_21_HBIN | \
-+					 OV64A40_TIMING_CTRL_21_DSPEED)
-+
-+#define OV64A40_REG_TIMINGS_VTS_HIGH	CCI_REG8(0x3840)
-+#define OV64A40_REG_TIMINGS_VTS_MID	CCI_REG8(0x380e)
-+#define OV64A40_REG_TIMINGS_VTS_LOW	CCI_REG8(0x380f)
-+
-+/* The test pattern control is weirdly named PRE_ISP_2325_D2V2_TOP_1 in TRM. */
-+#define OV64A40_REG_TEST_PATTERN	CCI_REG8(0x50c1)
-+#define OV64A40_TEST_PATTERN_DISABLED	0x00
-+#define OV64A40_TEST_PATTERN_TYPE1	BIT(0)
-+#define OV64A40_TEST_PATTERN_TYPE2	(BIT(4) | BIT(0))
-+#define OV64A40_TEST_PATTERN_TYPE3	(BIT(5) | BIT(0))
-+#define OV64A40_TEST_PATTERN_TYPE4	(BIT(5) | BIT(4) | BIT(0))
-+
-+#define OV64A40_REG_CHIP_ID		CCI_REG24(0x300a)
-+#define OV64A40_CHIP_ID			0x566441
-+
-+#define OV64A40_REG_SMIA		CCI_REG8(0x0100)
-+#define OV64A40_REG_SMIA_STREAMING	BIT(0)
-+
-+enum ov64a40_link_freq_ids {
-+	OV64A40_LINK_FREQ_456M_ID,
-+	OV64A40_LINK_FREQ_360M_ID,
-+	OV64A40_NUM_LINK_FREQ,
-+};
-+
-+static const char * const ov64a40_supply_names[] = {
-+	/* Supplies can be enabled in any order */
-+	"avdd",		/* Analog (2.8V) supply */
-+	"dovdd",	/* Digital Core (1.8V) supply */
-+	"dvdd",		/* IF (1.1V) supply */
-+};
-+
-+static const char * const ov64a40_test_pattern_menu[] = {
-+	"Disabled",
-+	"Type1",
-+	"Type2",
-+	"Type3",
-+	"Type4",
-+};
-+
-+static const int ov64a40_test_pattern_val[] = {
-+	OV64A40_TEST_PATTERN_DISABLED,
-+	OV64A40_TEST_PATTERN_TYPE1,
-+	OV64A40_TEST_PATTERN_TYPE2,
-+	OV64A40_TEST_PATTERN_TYPE3,
-+	OV64A40_TEST_PATTERN_TYPE4,
-+};
-+
-+static const unsigned int ov64a40_mbus_codes[] = {
-+	MEDIA_BUS_FMT_SBGGR10_1X10,
-+	MEDIA_BUS_FMT_SGRBG10_1X10,
-+	MEDIA_BUS_FMT_SGBRG10_1X10,
-+	MEDIA_BUS_FMT_SRGGB10_1X10,
-+};
-+
-+static const struct cci_reg_sequence ov64a40_init[] = {
-+	{ CCI_REG8(0x0103), 0x01 }, { CCI_REG8(0x0301), 0x88 },
-+	{ CCI_REG8(0x0304), 0x00 }, { CCI_REG8(0x0305), 0x96 },
-+	{ CCI_REG8(0x0306), 0x03 }, { CCI_REG8(0x0307), 0x00 },
-+	{ CCI_REG8(0x0345), 0x2c }, { CCI_REG8(0x034a), 0x02 },
-+	{ CCI_REG8(0x034b), 0x02 }, { CCI_REG8(0x0350), 0xc0 },
-+	{ CCI_REG8(0x0360), 0x09 }, { CCI_REG8(0x3012), 0x31 },
-+	{ CCI_REG8(0x3015), 0xf0 }, { CCI_REG8(0x3017), 0xf0 },
-+	{ CCI_REG8(0x301d), 0xf6 }, { CCI_REG8(0x301e), 0xf1 },
-+	{ CCI_REG8(0x3022), 0xf0 }, { CCI_REG8(0x3400), 0x08 },
-+	{ CCI_REG8(0x3608), 0x41 }, { CCI_REG8(0x3421), 0x02 },
-+	{ CCI_REG8(0x3500), 0x00 }, { CCI_REG8(0x3501), 0x00 },
-+	{ CCI_REG8(0x3502), 0x18 }, { CCI_REG8(0x3504), 0x0c },
-+	{ CCI_REG8(0x3508), 0x01 }, { CCI_REG8(0x3509), 0x00 },
-+	{ CCI_REG8(0x350a), 0x01 }, { CCI_REG8(0x350b), 0x00 },
-+	{ CCI_REG8(0x350b), 0x00 }, { CCI_REG8(0x3540), 0x00 },
-+	{ CCI_REG8(0x3541), 0x00 }, { CCI_REG8(0x3542), 0x08 },
-+	{ CCI_REG8(0x3548), 0x01 }, { CCI_REG8(0x3549), 0xa0 },
-+	{ CCI_REG8(0x3549), 0x00 }, { CCI_REG8(0x3549), 0x00 },
-+	{ CCI_REG8(0x3549), 0x00 }, { CCI_REG8(0x3580), 0x00 },
-+	{ CCI_REG8(0x3581), 0x00 }, { CCI_REG8(0x3582), 0x04 },
-+	{ CCI_REG8(0x3588), 0x01 }, { CCI_REG8(0x3589), 0xf0 },
-+	{ CCI_REG8(0x3589), 0x00 }, { CCI_REG8(0x3589), 0x00 },
-+	{ CCI_REG8(0x3589), 0x00 }, { CCI_REG8(0x360d), 0x83 },
-+	{ CCI_REG8(0x3616), 0xa0 }, { CCI_REG8(0x3617), 0x31 },
-+	{ CCI_REG8(0x3623), 0x10 }, { CCI_REG8(0x3633), 0x03 },
-+	{ CCI_REG8(0x3634), 0x03 }, { CCI_REG8(0x3635), 0x77 },
-+	{ CCI_REG8(0x3640), 0x19 }, { CCI_REG8(0x3641), 0x80 },
-+	{ CCI_REG8(0x364d), 0x0f }, { CCI_REG8(0x3680), 0x80 },
-+	{ CCI_REG8(0x3682), 0x00 }, { CCI_REG8(0x3683), 0x00 },
-+	{ CCI_REG8(0x3684), 0x07 }, { CCI_REG8(0x3688), 0x01 },
-+	{ CCI_REG8(0x3689), 0x08 }, { CCI_REG8(0x368a), 0x26 },
-+	{ CCI_REG8(0x368b), 0xc8 }, { CCI_REG8(0x368e), 0x70 },
-+	{ CCI_REG8(0x368f), 0x00 }, { CCI_REG8(0x3692), 0x04 },
-+	{ CCI_REG8(0x3693), 0x00 }, { CCI_REG8(0x3696), 0xd1 },
-+	{ CCI_REG8(0x3697), 0xe0 }, { CCI_REG8(0x3698), 0x80 },
-+	{ CCI_REG8(0x3699), 0x2b }, { CCI_REG8(0x369a), 0x00 },
-+	{ CCI_REG8(0x369d), 0x00 }, { CCI_REG8(0x369e), 0x14 },
-+	{ CCI_REG8(0x369f), 0x20 }, { CCI_REG8(0x36a5), 0x80 },
-+	{ CCI_REG8(0x36a6), 0x00 }, { CCI_REG8(0x36a7), 0x00 },
-+	{ CCI_REG8(0x36a8), 0x00 }, { CCI_REG8(0x36b5), 0x17 },
-+	{ CCI_REG8(0x3701), 0x30 }, { CCI_REG8(0x3706), 0x2b },
-+	{ CCI_REG8(0x3709), 0x8d }, { CCI_REG8(0x370b), 0x4f },
-+	{ CCI_REG8(0x3711), 0x00 }, { CCI_REG8(0x3712), 0x01 },
-+	{ CCI_REG8(0x3713), 0x00 }, { CCI_REG8(0x3720), 0x08 },
-+	{ CCI_REG8(0x3727), 0x22 }, { CCI_REG8(0x3728), 0x01 },
-+	{ CCI_REG8(0x375e), 0x00 }, { CCI_REG8(0x3760), 0x08 },
-+	{ CCI_REG8(0x3761), 0x10 }, { CCI_REG8(0x3762), 0x08 },
-+	{ CCI_REG8(0x3765), 0x10 }, { CCI_REG8(0x3766), 0x18 },
-+	{ CCI_REG8(0x376a), 0x08 }, { CCI_REG8(0x376b), 0x00 },
-+	{ CCI_REG8(0x376d), 0x1b }, { CCI_REG8(0x3791), 0x2b },
-+	{ CCI_REG8(0x3793), 0x2b }, { CCI_REG8(0x3795), 0x2b },
-+	{ CCI_REG8(0x3797), 0x4f }, { CCI_REG8(0x3799), 0x4f },
-+	{ CCI_REG8(0x379b), 0x4f }, { CCI_REG8(0x37a0), 0x22 },
-+	{ CCI_REG8(0x37da), 0x04 }, { CCI_REG8(0x37f9), 0x02 },
-+	{ CCI_REG8(0x37fa), 0x02 }, { CCI_REG8(0x37fb), 0x02 },
-+	{ CCI_REG8(0x3814), 0x11 }, { CCI_REG8(0x3815), 0x11 },
-+	{ CCI_REG8(0x3820), 0x40 }, { CCI_REG8(0x3821), 0x04 },
-+	{ CCI_REG8(0x3822), 0x00 }, { CCI_REG8(0x3823), 0x04 },
-+	{ CCI_REG8(0x3827), 0x08 }, { CCI_REG8(0x3828), 0x00 },
-+	{ CCI_REG8(0x382a), 0x81 }, { CCI_REG8(0x382e), 0x70 },
-+	{ CCI_REG8(0x3837), 0x10 }, { CCI_REG8(0x3839), 0x00 },
-+	{ CCI_REG8(0x383b), 0x00 }, { CCI_REG8(0x383c), 0x00 },
-+	{ CCI_REG8(0x383d), 0x10 }, { CCI_REG8(0x383f), 0x00 },
-+	{ CCI_REG8(0x384c), 0x02 }, { CCI_REG8(0x384d), 0x8c },
-+	{ CCI_REG8(0x3852), 0x00 }, { CCI_REG8(0x3856), 0x10 },
-+	{ CCI_REG8(0x3857), 0x10 }, { CCI_REG8(0x3858), 0x20 },
-+	{ CCI_REG8(0x3859), 0x20 }, { CCI_REG8(0x3894), 0x00 },
-+	{ CCI_REG8(0x3895), 0x00 }, { CCI_REG8(0x3896), 0x00 },
-+	{ CCI_REG8(0x3897), 0x00 }, { CCI_REG8(0x3900), 0x40 },
-+	{ CCI_REG8(0x3aed), 0x6e }, { CCI_REG8(0x3af1), 0x73 },
-+	{ CCI_REG8(0x3d86), 0x12 }, { CCI_REG8(0x3d87), 0x30 },
-+	{ CCI_REG8(0x3d8c), 0xab }, { CCI_REG8(0x3d8d), 0xb0 },
-+	{ CCI_REG8(0x3f00), 0x12 }, { CCI_REG8(0x3f00), 0x12 },
-+	{ CCI_REG8(0x3f00), 0x12 }, { CCI_REG8(0x3f01), 0x03 },
-+	{ CCI_REG8(0x4009), 0x01 }, { CCI_REG8(0x400e), 0xc6 },
-+	{ CCI_REG8(0x400f), 0x00 }, { CCI_REG8(0x4010), 0x28 },
-+	{ CCI_REG8(0x4011), 0x01 }, { CCI_REG8(0x4012), 0x0c },
-+	{ CCI_REG8(0x4015), 0x00 }, { CCI_REG8(0x4016), 0x1f },
-+	{ CCI_REG8(0x4017), 0x00 }, { CCI_REG8(0x4018), 0x07 },
-+	{ CCI_REG8(0x401a), 0x40 }, { CCI_REG8(0x4028), 0x01 },
-+	{ CCI_REG8(0x4504), 0x00 }, { CCI_REG8(0x4506), 0x01 },
-+	{ CCI_REG8(0x4508), 0x00 }, { CCI_REG8(0x4509), 0x35 },
-+	{ CCI_REG8(0x450a), 0x08 }, { CCI_REG8(0x450c), 0x00 },
-+	{ CCI_REG8(0x450d), 0x20 }, { CCI_REG8(0x450e), 0x00 },
-+	{ CCI_REG8(0x450f), 0x20 }, { CCI_REG8(0x451e), 0x00 },
-+	{ CCI_REG8(0x451f), 0x00 }, { CCI_REG8(0x4523), 0x00 },
-+	{ CCI_REG8(0x4526), 0x00 }, { CCI_REG8(0x4527), 0x18 },
-+	{ CCI_REG8(0x4580), 0x01 }, { CCI_REG8(0x4583), 0x00 },
-+	{ CCI_REG8(0x4584), 0x00 }, { CCI_REG8(0x45c0), 0xa1 },
-+	{ CCI_REG8(0x4602), 0x08 }, { CCI_REG8(0x4603), 0x05 },
-+	{ CCI_REG8(0x4606), 0x12 }, { CCI_REG8(0x4607), 0x30 },
-+	{ CCI_REG8(0x460b), 0x00 }, { CCI_REG8(0x460d), 0x00 },
-+	{ CCI_REG8(0x4640), 0x00 }, { CCI_REG8(0x4641), 0x24 },
-+	{ CCI_REG8(0x4643), 0x08 }, { CCI_REG8(0x4645), 0x14 },
-+	{ CCI_REG8(0x4648), 0x0a }, { CCI_REG8(0x4649), 0x06 },
-+	{ CCI_REG8(0x464a), 0x00 }, { CCI_REG8(0x464b), 0x30 },
-+	{ CCI_REG8(0x4800), 0x04 }, { CCI_REG8(0x4802), 0x02 },
-+	{ CCI_REG8(0x480b), 0x10 }, { CCI_REG8(0x480c), 0x80 },
-+	{ CCI_REG8(0x480e), 0x04 }, { CCI_REG8(0x480f), 0x32 },
-+	{ CCI_REG8(0x481b), 0x12 }, { CCI_REG8(0x4833), 0x30 },
-+	{ CCI_REG8(0x4837), 0x08 }, { CCI_REG8(0x484b), 0x27 },
-+	{ CCI_REG8(0x4850), 0x42 }, { CCI_REG8(0x4851), 0xaa },
-+	{ CCI_REG8(0x4860), 0x01 }, { CCI_REG8(0x4861), 0xec },
-+	{ CCI_REG8(0x4862), 0x25 }, { CCI_REG8(0x4888), 0x00 },
-+	{ CCI_REG8(0x4889), 0x03 }, { CCI_REG8(0x488c), 0x60 },
-+	{ CCI_REG8(0x4910), 0x28 }, { CCI_REG8(0x4911), 0x01 },
-+	{ CCI_REG8(0x4912), 0x0c }, { CCI_REG8(0x491a), 0x40 },
-+	{ CCI_REG8(0x4915), 0x00 }, { CCI_REG8(0x4916), 0x0f },
-+	{ CCI_REG8(0x4917), 0x00 }, { CCI_REG8(0x4918), 0x07 },
-+	{ CCI_REG8(0x4a10), 0x28 }, { CCI_REG8(0x4a11), 0x01 },
-+	{ CCI_REG8(0x4a12), 0x0c }, { CCI_REG8(0x4a1a), 0x40 },
-+	{ CCI_REG8(0x4a15), 0x00 }, { CCI_REG8(0x4a16), 0x0f },
-+	{ CCI_REG8(0x4a17), 0x00 }, { CCI_REG8(0x4a18), 0x07 },
-+	{ CCI_REG8(0x4d00), 0x04 }, { CCI_REG8(0x4d01), 0x5a },
-+	{ CCI_REG8(0x4d02), 0xbb }, { CCI_REG8(0x4d03), 0x84 },
-+	{ CCI_REG8(0x4d04), 0xd1 }, { CCI_REG8(0x4d05), 0x68 },
-+	{ CCI_REG8(0xc4fa), 0x10 }, { CCI_REG8(0x3b56), 0x0a },
-+	{ CCI_REG8(0x3b57), 0x0a }, { CCI_REG8(0x3b58), 0x0c },
-+	{ CCI_REG8(0x3b59), 0x10 }, { CCI_REG8(0x3a1d), 0x30 },
-+	{ CCI_REG8(0x3a1e), 0x30 }, { CCI_REG8(0x3a21), 0x30 },
-+	{ CCI_REG8(0x3a22), 0x30 }, { CCI_REG8(0x3992), 0x02 },
-+	{ CCI_REG8(0x399e), 0x02 }, { CCI_REG8(0x39fb), 0x30 },
-+	{ CCI_REG8(0x39fc), 0x30 }, { CCI_REG8(0x39fd), 0x30 },
-+	{ CCI_REG8(0x39fe), 0x30 }, { CCI_REG8(0x3a6d), 0x83 },
-+	{ CCI_REG8(0x3a5e), 0x83 }, { CCI_REG8(0xc500), 0x12 },
-+	{ CCI_REG8(0xc501), 0x12 }, { CCI_REG8(0xc502), 0x12 },
-+	{ CCI_REG8(0xc503), 0x12 }, { CCI_REG8(0xc505), 0x12 },
-+	{ CCI_REG8(0xc506), 0x12 }, { CCI_REG8(0xc507), 0x12 },
-+	{ CCI_REG8(0xc508), 0x12 }, { CCI_REG8(0x3a77), 0x12 },
-+	{ CCI_REG8(0x3a73), 0x12 }, { CCI_REG8(0x3a7b), 0x12 },
-+	{ CCI_REG8(0x3a7f), 0x12 }, { CCI_REG8(0x3b2e), 0x13 },
-+	{ CCI_REG8(0x3b29), 0x13 }, { CCI_REG8(0xc439), 0x13 },
-+	{ CCI_REG8(0xc469), 0x13 }, { CCI_REG8(0xc41c), 0x89 },
-+	{ CCI_REG8(0x3618), 0x80 }, { CCI_REG8(0xc514), 0x51 },
-+	{ CCI_REG8(0xc515), 0x2c }, { CCI_REG8(0xc516), 0x16 },
-+	{ CCI_REG8(0xc517), 0x0d }, { CCI_REG8(0x3615), 0x7f },
-+	{ CCI_REG8(0x3632), 0x99 }, { CCI_REG8(0x3642), 0x00 },
-+	{ CCI_REG8(0x3645), 0x80 }, { CCI_REG8(0x3702), 0x2a },
-+	{ CCI_REG8(0x3703), 0x2a }, { CCI_REG8(0x3708), 0x2f },
-+	{ CCI_REG8(0x3721), 0x15 }, { CCI_REG8(0x3744), 0x28 },
-+	{ CCI_REG8(0x3991), 0x0c }, { CCI_REG8(0x371d), 0x24 },
-+	{ CCI_REG8(0x371f), 0x0c }, { CCI_REG8(0x374b), 0x03 },
-+	{ CCI_REG8(0x37d0), 0x00 }, { CCI_REG8(0x391d), 0x55 },
-+	{ CCI_REG8(0x391e), 0x52 }, { CCI_REG8(0x399d), 0x0c },
-+	{ CCI_REG8(0x3a2f), 0x01 }, { CCI_REG8(0x3a30), 0x01 },
-+	{ CCI_REG8(0x3a31), 0x01 }, { CCI_REG8(0x3a32), 0x01 },
-+	{ CCI_REG8(0x3a34), 0x01 }, { CCI_REG8(0x3a35), 0x01 },
-+	{ CCI_REG8(0x3a36), 0x01 }, { CCI_REG8(0x3a37), 0x01 },
-+	{ CCI_REG8(0x3a43), 0x01 }, { CCI_REG8(0x3a44), 0x01 },
-+	{ CCI_REG8(0x3a45), 0x01 }, { CCI_REG8(0x3a46), 0x01 },
-+	{ CCI_REG8(0x3a48), 0x01 }, { CCI_REG8(0x3a49), 0x01 },
-+	{ CCI_REG8(0x3a4a), 0x01 }, { CCI_REG8(0x3a4b), 0x01 },
-+	{ CCI_REG8(0x3a50), 0x14 }, { CCI_REG8(0x3a54), 0x14 },
-+	{ CCI_REG8(0x3a60), 0x20 }, { CCI_REG8(0x3a6f), 0x20 },
-+	{ CCI_REG8(0x3ac5), 0x01 }, { CCI_REG8(0x3ac6), 0x01 },
-+	{ CCI_REG8(0x3ac7), 0x01 }, { CCI_REG8(0x3ac8), 0x01 },
-+	{ CCI_REG8(0x3ac9), 0x01 }, { CCI_REG8(0x3aca), 0x01 },
-+	{ CCI_REG8(0x3acb), 0x01 }, { CCI_REG8(0x3acc), 0x01 },
-+	{ CCI_REG8(0x3acd), 0x01 }, { CCI_REG8(0x3ace), 0x01 },
-+	{ CCI_REG8(0x3acf), 0x01 }, { CCI_REG8(0x3ad0), 0x01 },
-+	{ CCI_REG8(0x3ad1), 0x01 }, { CCI_REG8(0x3ad2), 0x01 },
-+	{ CCI_REG8(0x3ad3), 0x01 }, { CCI_REG8(0x3ad4), 0x01 },
-+	{ CCI_REG8(0x3add), 0x1f }, { CCI_REG8(0x3adf), 0x24 },
-+	{ CCI_REG8(0x3aef), 0x1f }, { CCI_REG8(0x3af0), 0x24 },
-+	{ CCI_REG8(0x3b92), 0x08 }, { CCI_REG8(0x3b93), 0x08 },
-+	{ CCI_REG8(0x3b94), 0x08 }, { CCI_REG8(0x3b95), 0x08 },
-+	{ CCI_REG8(0x3be7), 0x1e }, { CCI_REG8(0x3be8), 0x26 },
-+	{ CCI_REG8(0xc44a), 0x20 }, { CCI_REG8(0xc44c), 0x20 },
-+	{ CCI_REG8(0xc483), 0x00 }, { CCI_REG8(0xc484), 0x00 },
-+	{ CCI_REG8(0xc485), 0x00 }, { CCI_REG8(0xc486), 0x00 },
-+	{ CCI_REG8(0xc487), 0x01 }, { CCI_REG8(0xc488), 0x01 },
-+	{ CCI_REG8(0xc489), 0x01 }, { CCI_REG8(0xc48a), 0x01 },
-+	{ CCI_REG8(0xc4c1), 0x00 }, { CCI_REG8(0xc4c2), 0x00 },
-+	{ CCI_REG8(0xc4c3), 0x00 }, { CCI_REG8(0xc4c4), 0x00 },
-+	{ CCI_REG8(0xc4c6), 0x10 }, { CCI_REG8(0xc4c7), 0x10 },
-+	{ CCI_REG8(0xc4c8), 0x10 }, { CCI_REG8(0xc4c9), 0x10 },
-+	{ CCI_REG8(0xc4ca), 0x10 }, { CCI_REG8(0xc4cb), 0x10 },
-+	{ CCI_REG8(0xc4cc), 0x10 }, { CCI_REG8(0xc4cd), 0x10 },
-+	{ CCI_REG8(0xc4ea), 0x07 }, { CCI_REG8(0xc4eb), 0x07 },
-+	{ CCI_REG8(0xc4ec), 0x07 }, { CCI_REG8(0xc4ed), 0x07 },
-+	{ CCI_REG8(0xc4ee), 0x07 }, { CCI_REG8(0xc4f6), 0x10 },
-+	{ CCI_REG8(0xc4f7), 0x10 }, { CCI_REG8(0xc4f8), 0x10 },
-+	{ CCI_REG8(0xc4f9), 0x10 }, { CCI_REG8(0xc518), 0x0e },
-+	{ CCI_REG8(0xc519), 0x0e }, { CCI_REG8(0xc51a), 0x0e },
-+	{ CCI_REG8(0xc51b), 0x0e }, { CCI_REG8(0xc51c), 0x0e },
-+	{ CCI_REG8(0xc51d), 0x0e }, { CCI_REG8(0xc51e), 0x0e },
-+	{ CCI_REG8(0xc51f), 0x0e }, { CCI_REG8(0xc520), 0x0e },
-+	{ CCI_REG8(0xc521), 0x0e }, { CCI_REG8(0xc522), 0x0e },
-+	{ CCI_REG8(0xc523), 0x0e }, { CCI_REG8(0xc524), 0x0e },
-+	{ CCI_REG8(0xc525), 0x0e }, { CCI_REG8(0xc526), 0x0e },
-+	{ CCI_REG8(0xc527), 0x0e }, { CCI_REG8(0xc528), 0x0e },
-+	{ CCI_REG8(0xc529), 0x0e }, { CCI_REG8(0xc52a), 0x0e },
-+	{ CCI_REG8(0xc52b), 0x0e }, { CCI_REG8(0xc52c), 0x0e },
-+	{ CCI_REG8(0xc52d), 0x0e }, { CCI_REG8(0xc52e), 0x0e },
-+	{ CCI_REG8(0xc52f), 0x0e }, { CCI_REG8(0xc530), 0x0e },
-+	{ CCI_REG8(0xc531), 0x0e }, { CCI_REG8(0xc532), 0x0e },
-+	{ CCI_REG8(0xc533), 0x0e }, { CCI_REG8(0xc534), 0x0e },
-+	{ CCI_REG8(0xc535), 0x0e }, { CCI_REG8(0xc536), 0x0e },
-+	{ CCI_REG8(0xc537), 0x0e }, { CCI_REG8(0xc538), 0x0e },
-+	{ CCI_REG8(0xc539), 0x0e }, { CCI_REG8(0xc53a), 0x0e },
-+	{ CCI_REG8(0xc53b), 0x0e }, { CCI_REG8(0xc53c), 0x0e },
-+	{ CCI_REG8(0xc53d), 0x0e }, { CCI_REG8(0xc53e), 0x0e },
-+	{ CCI_REG8(0xc53f), 0x0e }, { CCI_REG8(0xc540), 0x0e },
-+	{ CCI_REG8(0xc541), 0x0e }, { CCI_REG8(0xc542), 0x0e },
-+	{ CCI_REG8(0xc543), 0x0e }, { CCI_REG8(0xc544), 0x0e },
-+	{ CCI_REG8(0xc545), 0x0e }, { CCI_REG8(0xc546), 0x0e },
-+	{ CCI_REG8(0xc547), 0x0e }, { CCI_REG8(0xc548), 0x0e },
-+	{ CCI_REG8(0xc549), 0x0e }, { CCI_REG8(0xc57f), 0x22 },
-+	{ CCI_REG8(0xc580), 0x22 }, { CCI_REG8(0xc581), 0x22 },
-+	{ CCI_REG8(0xc582), 0x22 }, { CCI_REG8(0xc583), 0x22 },
-+	{ CCI_REG8(0xc584), 0x22 }, { CCI_REG8(0xc585), 0x22 },
-+	{ CCI_REG8(0xc586), 0x22 }, { CCI_REG8(0xc587), 0x22 },
-+	{ CCI_REG8(0xc588), 0x22 }, { CCI_REG8(0xc589), 0x22 },
-+	{ CCI_REG8(0xc58a), 0x22 }, { CCI_REG8(0xc58b), 0x22 },
-+	{ CCI_REG8(0xc58c), 0x22 }, { CCI_REG8(0xc58d), 0x22 },
-+	{ CCI_REG8(0xc58e), 0x22 }, { CCI_REG8(0xc58f), 0x22 },
-+	{ CCI_REG8(0xc590), 0x22 }, { CCI_REG8(0xc591), 0x22 },
-+	{ CCI_REG8(0xc592), 0x22 }, { CCI_REG8(0xc598), 0x22 },
-+	{ CCI_REG8(0xc599), 0x22 }, { CCI_REG8(0xc59a), 0x22 },
-+	{ CCI_REG8(0xc59b), 0x22 }, { CCI_REG8(0xc59c), 0x22 },
-+	{ CCI_REG8(0xc59d), 0x22 }, { CCI_REG8(0xc59e), 0x22 },
-+	{ CCI_REG8(0xc59f), 0x22 }, { CCI_REG8(0xc5a0), 0x22 },
-+	{ CCI_REG8(0xc5a1), 0x22 }, { CCI_REG8(0xc5a2), 0x22 },
-+	{ CCI_REG8(0xc5a3), 0x22 }, { CCI_REG8(0xc5a4), 0x22 },
-+	{ CCI_REG8(0xc5a5), 0x22 }, { CCI_REG8(0xc5a6), 0x22 },
-+	{ CCI_REG8(0xc5a7), 0x22 }, { CCI_REG8(0xc5a8), 0x22 },
-+	{ CCI_REG8(0xc5a9), 0x22 }, { CCI_REG8(0xc5aa), 0x22 },
-+	{ CCI_REG8(0xc5ab), 0x22 }, { CCI_REG8(0xc5b1), 0x2a },
-+	{ CCI_REG8(0xc5b2), 0x2a }, { CCI_REG8(0xc5b3), 0x2a },
-+	{ CCI_REG8(0xc5b4), 0x2a }, { CCI_REG8(0xc5b5), 0x2a },
-+	{ CCI_REG8(0xc5b6), 0x2a }, { CCI_REG8(0xc5b7), 0x2a },
-+	{ CCI_REG8(0xc5b8), 0x2a }, { CCI_REG8(0xc5b9), 0x2a },
-+	{ CCI_REG8(0xc5ba), 0x2a }, { CCI_REG8(0xc5bb), 0x2a },
-+	{ CCI_REG8(0xc5bc), 0x2a }, { CCI_REG8(0xc5bd), 0x2a },
-+	{ CCI_REG8(0xc5be), 0x2a }, { CCI_REG8(0xc5bf), 0x2a },
-+	{ CCI_REG8(0xc5c0), 0x2a }, { CCI_REG8(0xc5c1), 0x2a },
-+	{ CCI_REG8(0xc5c2), 0x2a }, { CCI_REG8(0xc5c3), 0x2a },
-+	{ CCI_REG8(0xc5c4), 0x2a }, { CCI_REG8(0xc5ca), 0x2a },
-+	{ CCI_REG8(0xc5cb), 0x2a }, { CCI_REG8(0xc5cc), 0x2a },
-+	{ CCI_REG8(0xc5cd), 0x2a }, { CCI_REG8(0xc5ce), 0x2a },
-+	{ CCI_REG8(0xc5cf), 0x2a }, { CCI_REG8(0xc5d0), 0x2a },
-+	{ CCI_REG8(0xc5d1), 0x2a }, { CCI_REG8(0xc5d2), 0x2a },
-+	{ CCI_REG8(0xc5d3), 0x2a }, { CCI_REG8(0xc5d4), 0x2a },
-+	{ CCI_REG8(0xc5d5), 0x2a }, { CCI_REG8(0xc5d6), 0x2a },
-+	{ CCI_REG8(0xc5d7), 0x2a }, { CCI_REG8(0xc5d8), 0x2a },
-+	{ CCI_REG8(0xc5d9), 0x2a }, { CCI_REG8(0xc5da), 0x2a },
-+	{ CCI_REG8(0xc5db), 0x2a }, { CCI_REG8(0xc5dc), 0x2a },
-+	{ CCI_REG8(0xc5dd), 0x2a }, { CCI_REG8(0xc5e8), 0x22 },
-+	{ CCI_REG8(0xc5ea), 0x22 }, { CCI_REG8(0x4540), 0x12 },
-+	{ CCI_REG8(0x4541), 0x30 }, { CCI_REG8(0x3d86), 0x12 },
-+	{ CCI_REG8(0x3d87), 0x30 }, { CCI_REG8(0x4606), 0x12 },
-+	{ CCI_REG8(0x4607), 0x30 }, { CCI_REG8(0x4648), 0x0a },
-+	{ CCI_REG8(0x4649), 0x06 }, { CCI_REG8(0x3220), 0x12 },
-+	{ CCI_REG8(0x3221), 0x30 }, { CCI_REG8(0x40c2), 0x12 },
-+	{ CCI_REG8(0x49c2), 0x12 }, { CCI_REG8(0x4ac2), 0x12 },
-+	{ CCI_REG8(0x40c3), 0x30 }, { CCI_REG8(0x49c3), 0x30 },
-+	{ CCI_REG8(0x4ac3), 0x30 }, { CCI_REG8(0x36b0), 0x12 },
-+	{ CCI_REG8(0x36b1), 0x30 }, { CCI_REG8(0x45cb), 0x12 },
-+	{ CCI_REG8(0x45cc), 0x30 }, { CCI_REG8(0x4585), 0x12 },
-+	{ CCI_REG8(0x4586), 0x30 }, { CCI_REG8(0x36b2), 0x12 },
-+	{ CCI_REG8(0x36b3), 0x30 }, { CCI_REG8(0x5a40), 0x75 },
-+	{ CCI_REG8(0x5a41), 0x75 }, { CCI_REG8(0x5a42), 0x75 },
-+	{ CCI_REG8(0x5a43), 0x75 }, { CCI_REG8(0x5a44), 0x75 },
-+	{ CCI_REG8(0x5a45), 0x75 }, { CCI_REG8(0x5a46), 0x75 },
-+	{ CCI_REG8(0x5a47), 0x75 }, { CCI_REG8(0x5a48), 0x75 },
-+	{ CCI_REG8(0x5a49), 0x75 }, { CCI_REG8(0x5a4a), 0x75 },
-+	{ CCI_REG8(0x5a4b), 0x75 }, { CCI_REG8(0x5a4c), 0x75 },
-+	{ CCI_REG8(0x5a4d), 0x75 }, { CCI_REG8(0x5a4e), 0x75 },
-+	{ CCI_REG8(0x5a4f), 0x75 }, { CCI_REG8(0x5a50), 0x75 },
-+	{ CCI_REG8(0x5a51), 0x75 }, { CCI_REG8(0x5a52), 0x75 },
-+	{ CCI_REG8(0x5a53), 0x75 }, { CCI_REG8(0x5a54), 0x75 },
-+	{ CCI_REG8(0x5a55), 0x75 }, { CCI_REG8(0x5a56), 0x75 },
-+	{ CCI_REG8(0x5a57), 0x75 }, { CCI_REG8(0x5a58), 0x75 },
-+	{ CCI_REG8(0x5a59), 0x75 }, { CCI_REG8(0x5a5a), 0x75 },
-+	{ CCI_REG8(0x5a5b), 0x75 }, { CCI_REG8(0x5a5c), 0x75 },
-+	{ CCI_REG8(0x5a5d), 0x75 }, { CCI_REG8(0x5a5e), 0x75 },
-+	{ CCI_REG8(0x5a5f), 0x75 }, { CCI_REG8(0x5a60), 0x75 },
-+	{ CCI_REG8(0x5a61), 0x75 }, { CCI_REG8(0x5a62), 0x75 },
-+	{ CCI_REG8(0x5a63), 0x75 }, { CCI_REG8(0x5a64), 0x75 },
-+	{ CCI_REG8(0x5a65), 0x75 }, { CCI_REG8(0x5a66), 0x75 },
-+	{ CCI_REG8(0x5a67), 0x75 }, { CCI_REG8(0x5a68), 0x75 },
-+	{ CCI_REG8(0x5a69), 0x75 }, { CCI_REG8(0x5a6a), 0x75 },
-+	{ CCI_REG8(0x5a6b), 0x75 }, { CCI_REG8(0x5a6c), 0x75 },
-+	{ CCI_REG8(0x5a6d), 0x75 }, { CCI_REG8(0x5a6e), 0x75 },
-+	{ CCI_REG8(0x5a6f), 0x75 }, { CCI_REG8(0x5a70), 0x75 },
-+	{ CCI_REG8(0x5a71), 0x75 }, { CCI_REG8(0x5a72), 0x75 },
-+	{ CCI_REG8(0x5a73), 0x75 }, { CCI_REG8(0x5a74), 0x75 },
-+	{ CCI_REG8(0x5a75), 0x75 }, { CCI_REG8(0x5a76), 0x75 },
-+	{ CCI_REG8(0x5a77), 0x75 }, { CCI_REG8(0x5a78), 0x75 },
-+	{ CCI_REG8(0x5a79), 0x75 }, { CCI_REG8(0x5a7a), 0x75 },
-+	{ CCI_REG8(0x5a7b), 0x75 }, { CCI_REG8(0x5a7c), 0x75 },
-+	{ CCI_REG8(0x5a7d), 0x75 }, { CCI_REG8(0x5a7e), 0x75 },
-+	{ CCI_REG8(0x5a7f), 0x75 }, { CCI_REG8(0x5a80), 0x75 },
-+	{ CCI_REG8(0x5a81), 0x75 }, { CCI_REG8(0x5a82), 0x75 },
-+	{ CCI_REG8(0x5a83), 0x75 }, { CCI_REG8(0x5a84), 0x75 },
-+	{ CCI_REG8(0x5a85), 0x75 }, { CCI_REG8(0x5a86), 0x75 },
-+	{ CCI_REG8(0x5a87), 0x75 }, { CCI_REG8(0x5a88), 0x75 },
-+	{ CCI_REG8(0x5a89), 0x75 }, { CCI_REG8(0x5a8a), 0x75 },
-+	{ CCI_REG8(0x5a8b), 0x75 }, { CCI_REG8(0x5a8c), 0x75 },
-+	{ CCI_REG8(0x5a8d), 0x75 }, { CCI_REG8(0x5a8e), 0x75 },
-+	{ CCI_REG8(0x5a8f), 0x75 }, { CCI_REG8(0x5a90), 0x75 },
-+	{ CCI_REG8(0x5a91), 0x75 }, { CCI_REG8(0x5a92), 0x75 },
-+	{ CCI_REG8(0x5a93), 0x75 }, { CCI_REG8(0x5a94), 0x75 },
-+	{ CCI_REG8(0x5a95), 0x75 }, { CCI_REG8(0x5a96), 0x75 },
-+	{ CCI_REG8(0x5a97), 0x75 }, { CCI_REG8(0x5a98), 0x75 },
-+	{ CCI_REG8(0x5a99), 0x75 }, { CCI_REG8(0x5a9a), 0x75 },
-+	{ CCI_REG8(0x5a9b), 0x75 }, { CCI_REG8(0x5a9c), 0x75 },
-+	{ CCI_REG8(0x5a9d), 0x75 }, { CCI_REG8(0x5a9e), 0x75 },
-+	{ CCI_REG8(0x5a9f), 0x75 }, { CCI_REG8(0x5aa0), 0x75 },
-+	{ CCI_REG8(0x5aa1), 0x75 }, { CCI_REG8(0x5aa2), 0x75 },
-+	{ CCI_REG8(0x5aa3), 0x75 }, { CCI_REG8(0x5aa4), 0x75 },
-+	{ CCI_REG8(0x5aa5), 0x75 }, { CCI_REG8(0x5aa6), 0x75 },
-+	{ CCI_REG8(0x5aa7), 0x75 }, { CCI_REG8(0x5aa8), 0x75 },
-+	{ CCI_REG8(0x5aa9), 0x75 }, { CCI_REG8(0x5aaa), 0x75 },
-+	{ CCI_REG8(0x5aab), 0x75 }, { CCI_REG8(0x5aac), 0x75 },
-+	{ CCI_REG8(0x5aad), 0x75 }, { CCI_REG8(0x5aae), 0x75 },
-+	{ CCI_REG8(0x5aaf), 0x75 }, { CCI_REG8(0x5ab0), 0x75 },
-+	{ CCI_REG8(0x5ab1), 0x75 }, { CCI_REG8(0x5ab2), 0x75 },
-+	{ CCI_REG8(0x5ab3), 0x75 }, { CCI_REG8(0x5ab4), 0x75 },
-+	{ CCI_REG8(0x5ab5), 0x75 }, { CCI_REG8(0x5ab6), 0x75 },
-+	{ CCI_REG8(0x5ab7), 0x75 }, { CCI_REG8(0x5ab8), 0x75 },
-+	{ CCI_REG8(0x5ab9), 0x75 }, { CCI_REG8(0x5aba), 0x75 },
-+	{ CCI_REG8(0x5abb), 0x75 }, { CCI_REG8(0x5abc), 0x75 },
-+	{ CCI_REG8(0x5abd), 0x75 }, { CCI_REG8(0x5abe), 0x75 },
-+	{ CCI_REG8(0x5abf), 0x75 }, { CCI_REG8(0x5ac0), 0x75 },
-+	{ CCI_REG8(0x5ac1), 0x75 }, { CCI_REG8(0x5ac2), 0x75 },
-+	{ CCI_REG8(0x5ac3), 0x75 }, { CCI_REG8(0x5ac4), 0x75 },
-+	{ CCI_REG8(0x5ac5), 0x75 }, { CCI_REG8(0x5ac6), 0x75 },
-+	{ CCI_REG8(0x5ac7), 0x75 }, { CCI_REG8(0x5ac8), 0x75 },
-+	{ CCI_REG8(0x5ac9), 0x75 }, { CCI_REG8(0x5aca), 0x75 },
-+	{ CCI_REG8(0x5acb), 0x75 }, { CCI_REG8(0x5acc), 0x75 },
-+	{ CCI_REG8(0x5acd), 0x75 }, { CCI_REG8(0x5ace), 0x75 },
-+	{ CCI_REG8(0x5acf), 0x75 }, { CCI_REG8(0x5ad0), 0x75 },
-+	{ CCI_REG8(0x5ad1), 0x75 }, { CCI_REG8(0x5ad2), 0x75 },
-+	{ CCI_REG8(0x5ad3), 0x75 }, { CCI_REG8(0x5ad4), 0x75 },
-+	{ CCI_REG8(0x5ad5), 0x75 }, { CCI_REG8(0x5ad6), 0x75 },
-+	{ CCI_REG8(0x5ad7), 0x75 }, { CCI_REG8(0x5ad8), 0x75 },
-+	{ CCI_REG8(0x5ad9), 0x75 }, { CCI_REG8(0x5ada), 0x75 },
-+	{ CCI_REG8(0x5adb), 0x75 }, { CCI_REG8(0x5adc), 0x75 },
-+	{ CCI_REG8(0x5add), 0x75 }, { CCI_REG8(0x5ade), 0x75 },
-+	{ CCI_REG8(0x5adf), 0x75 }, { CCI_REG8(0x5ae0), 0x75 },
-+	{ CCI_REG8(0x5ae1), 0x75 }, { CCI_REG8(0x5ae2), 0x75 },
-+	{ CCI_REG8(0x5ae3), 0x75 }, { CCI_REG8(0x5ae4), 0x75 },
-+	{ CCI_REG8(0x5ae5), 0x75 }, { CCI_REG8(0x5ae6), 0x75 },
-+	{ CCI_REG8(0x5ae7), 0x75 }, { CCI_REG8(0x5ae8), 0x75 },
-+	{ CCI_REG8(0x5ae9), 0x75 }, { CCI_REG8(0x5aea), 0x75 },
-+	{ CCI_REG8(0x5aeb), 0x75 }, { CCI_REG8(0x5aec), 0x75 },
-+	{ CCI_REG8(0x5aed), 0x75 }, { CCI_REG8(0x5aee), 0x75 },
-+	{ CCI_REG8(0x5aef), 0x75 }, { CCI_REG8(0x5af0), 0x75 },
-+	{ CCI_REG8(0x5af1), 0x75 }, { CCI_REG8(0x5af2), 0x75 },
-+	{ CCI_REG8(0x5af3), 0x75 }, { CCI_REG8(0x5af4), 0x75 },
-+	{ CCI_REG8(0x5af5), 0x75 }, { CCI_REG8(0x5af6), 0x75 },
-+	{ CCI_REG8(0x5af7), 0x75 }, { CCI_REG8(0x5af8), 0x75 },
-+	{ CCI_REG8(0x5af9), 0x75 }, { CCI_REG8(0x5afa), 0x75 },
-+	{ CCI_REG8(0x5afb), 0x75 }, { CCI_REG8(0x5afc), 0x75 },
-+	{ CCI_REG8(0x5afd), 0x75 }, { CCI_REG8(0x5afe), 0x75 },
-+	{ CCI_REG8(0x5aff), 0x75 }, { CCI_REG8(0x5b00), 0x75 },
-+	{ CCI_REG8(0x5b01), 0x75 }, { CCI_REG8(0x5b02), 0x75 },
-+	{ CCI_REG8(0x5b03), 0x75 }, { CCI_REG8(0x5b04), 0x75 },
-+	{ CCI_REG8(0x5b05), 0x75 }, { CCI_REG8(0x5b06), 0x75 },
-+	{ CCI_REG8(0x5b07), 0x75 }, { CCI_REG8(0x5b08), 0x75 },
-+	{ CCI_REG8(0x5b09), 0x75 }, { CCI_REG8(0x5b0a), 0x75 },
-+	{ CCI_REG8(0x5b0b), 0x75 }, { CCI_REG8(0x5b0c), 0x75 },
-+	{ CCI_REG8(0x5b0d), 0x75 }, { CCI_REG8(0x5b0e), 0x75 },
-+	{ CCI_REG8(0x5b0f), 0x75 }, { CCI_REG8(0x5b10), 0x75 },
-+	{ CCI_REG8(0x5b11), 0x75 }, { CCI_REG8(0x5b12), 0x75 },
-+	{ CCI_REG8(0x5b13), 0x75 }, { CCI_REG8(0x5b14), 0x75 },
-+	{ CCI_REG8(0x5b15), 0x75 }, { CCI_REG8(0x5b16), 0x75 },
-+	{ CCI_REG8(0x5b17), 0x75 }, { CCI_REG8(0x5b18), 0x75 },
-+	{ CCI_REG8(0x5b19), 0x75 }, { CCI_REG8(0x5b1a), 0x75 },
-+	{ CCI_REG8(0x5b1b), 0x75 }, { CCI_REG8(0x5b1c), 0x75 },
-+	{ CCI_REG8(0x5b1d), 0x75 }, { CCI_REG8(0x5b1e), 0x75 },
-+	{ CCI_REG8(0x5b1f), 0x75 }, { CCI_REG8(0x5b20), 0x75 },
-+	{ CCI_REG8(0x5b21), 0x75 }, { CCI_REG8(0x5b22), 0x75 },
-+	{ CCI_REG8(0x5b23), 0x75 }, { CCI_REG8(0x5b24), 0x75 },
-+	{ CCI_REG8(0x5b25), 0x75 }, { CCI_REG8(0x5b26), 0x75 },
-+	{ CCI_REG8(0x5b27), 0x75 }, { CCI_REG8(0x5b28), 0x75 },
-+	{ CCI_REG8(0x5b29), 0x75 }, { CCI_REG8(0x5b2a), 0x75 },
-+	{ CCI_REG8(0x5b2b), 0x75 }, { CCI_REG8(0x5b2c), 0x75 },
-+	{ CCI_REG8(0x5b2d), 0x75 }, { CCI_REG8(0x5b2e), 0x75 },
-+	{ CCI_REG8(0x5b2f), 0x75 }, { CCI_REG8(0x5b30), 0x75 },
-+	{ CCI_REG8(0x5b31), 0x75 }, { CCI_REG8(0x5b32), 0x75 },
-+	{ CCI_REG8(0x5b33), 0x75 }, { CCI_REG8(0x5b34), 0x75 },
-+	{ CCI_REG8(0x5b35), 0x75 }, { CCI_REG8(0x5b36), 0x75 },
-+	{ CCI_REG8(0x5b37), 0x75 }, { CCI_REG8(0x5b38), 0x75 },
-+	{ CCI_REG8(0x5b39), 0x75 }, { CCI_REG8(0x5b3a), 0x75 },
-+	{ CCI_REG8(0x5b3b), 0x75 }, { CCI_REG8(0x5b3c), 0x75 },
-+	{ CCI_REG8(0x5b3d), 0x75 }, { CCI_REG8(0x5b3e), 0x75 },
-+	{ CCI_REG8(0x5b3f), 0x75 }, { CCI_REG8(0x5b40), 0x75 },
-+	{ CCI_REG8(0x5b41), 0x75 }, { CCI_REG8(0x5b42), 0x75 },
-+	{ CCI_REG8(0x5b43), 0x75 }, { CCI_REG8(0x5b44), 0x75 },
-+	{ CCI_REG8(0x5b45), 0x75 }, { CCI_REG8(0x5b46), 0x75 },
-+	{ CCI_REG8(0x5b47), 0x75 }, { CCI_REG8(0x5b48), 0x75 },
-+	{ CCI_REG8(0x5b49), 0x75 }, { CCI_REG8(0x5b4a), 0x75 },
-+	{ CCI_REG8(0x5b4b), 0x75 }, { CCI_REG8(0x5b4c), 0x75 },
-+	{ CCI_REG8(0x5b4d), 0x75 }, { CCI_REG8(0x5b4e), 0x75 },
-+	{ CCI_REG8(0x5b4f), 0x75 }, { CCI_REG8(0x5b50), 0x75 },
-+	{ CCI_REG8(0x5b51), 0x75 }, { CCI_REG8(0x5b52), 0x75 },
-+	{ CCI_REG8(0x5b53), 0x75 }, { CCI_REG8(0x5b54), 0x75 },
-+	{ CCI_REG8(0x5b55), 0x75 }, { CCI_REG8(0x5b56), 0x75 },
-+	{ CCI_REG8(0x5b57), 0x75 }, { CCI_REG8(0x5b58), 0x75 },
-+	{ CCI_REG8(0x5b59), 0x75 }, { CCI_REG8(0x5b5a), 0x75 },
-+	{ CCI_REG8(0x5b5b), 0x75 }, { CCI_REG8(0x5b5c), 0x75 },
-+	{ CCI_REG8(0x5b5d), 0x75 }, { CCI_REG8(0x5b5e), 0x75 },
-+	{ CCI_REG8(0x5b5f), 0x75 }, { CCI_REG8(0x5b80), 0x75 },
-+	{ CCI_REG8(0x5b81), 0x75 }, { CCI_REG8(0x5b82), 0x75 },
-+	{ CCI_REG8(0x5b83), 0x75 }, { CCI_REG8(0x5b84), 0x75 },
-+	{ CCI_REG8(0x5b85), 0x75 }, { CCI_REG8(0x5b86), 0x75 },
-+	{ CCI_REG8(0x5b87), 0x75 }, { CCI_REG8(0x5b88), 0x75 },
-+	{ CCI_REG8(0x5b89), 0x75 }, { CCI_REG8(0x5b8a), 0x75 },
-+	{ CCI_REG8(0x5b8b), 0x75 }, { CCI_REG8(0x5b8c), 0x75 },
-+	{ CCI_REG8(0x5b8d), 0x75 }, { CCI_REG8(0x5b8e), 0x75 },
-+	{ CCI_REG8(0x5b8f), 0x75 }, { CCI_REG8(0x5b90), 0x75 },
-+	{ CCI_REG8(0x5b91), 0x75 }, { CCI_REG8(0x5b92), 0x75 },
-+	{ CCI_REG8(0x5b93), 0x75 }, { CCI_REG8(0x5b94), 0x75 },
-+	{ CCI_REG8(0x5b95), 0x75 }, { CCI_REG8(0x5b96), 0x75 },
-+	{ CCI_REG8(0x5b97), 0x75 }, { CCI_REG8(0x5b98), 0x75 },
-+	{ CCI_REG8(0x5b99), 0x75 }, { CCI_REG8(0x5b9a), 0x75 },
-+	{ CCI_REG8(0x5b9b), 0x75 }, { CCI_REG8(0x5b9c), 0x75 },
-+	{ CCI_REG8(0x5b9d), 0x75 }, { CCI_REG8(0x5b9e), 0x75 },
-+	{ CCI_REG8(0x5b9f), 0x75 }, { CCI_REG8(0x5ba0), 0x75 },
-+	{ CCI_REG8(0x5ba1), 0x75 }, { CCI_REG8(0x5ba2), 0x75 },
-+	{ CCI_REG8(0x5ba3), 0x75 }, { CCI_REG8(0x5ba4), 0x75 },
-+	{ CCI_REG8(0x5ba5), 0x75 }, { CCI_REG8(0x5ba6), 0x75 },
-+	{ CCI_REG8(0x5ba7), 0x75 }, { CCI_REG8(0x5ba8), 0x75 },
-+	{ CCI_REG8(0x5ba9), 0x75 }, { CCI_REG8(0x5baa), 0x75 },
-+	{ CCI_REG8(0x5bab), 0x75 }, { CCI_REG8(0x5bac), 0x75 },
-+	{ CCI_REG8(0x5bad), 0x75 }, { CCI_REG8(0x5bae), 0x75 },
-+	{ CCI_REG8(0x5baf), 0x75 }, { CCI_REG8(0x5bb0), 0x75 },
-+	{ CCI_REG8(0x5bb1), 0x75 }, { CCI_REG8(0x5bb2), 0x75 },
-+	{ CCI_REG8(0x5bb3), 0x75 }, { CCI_REG8(0x5bb4), 0x75 },
-+	{ CCI_REG8(0x5bb5), 0x75 }, { CCI_REG8(0x5bb6), 0x75 },
-+	{ CCI_REG8(0x5bb7), 0x75 }, { CCI_REG8(0x5bb8), 0x75 },
-+	{ CCI_REG8(0x5bb9), 0x75 }, { CCI_REG8(0x5bba), 0x75 },
-+	{ CCI_REG8(0x5bbb), 0x75 }, { CCI_REG8(0x5bbc), 0x75 },
-+	{ CCI_REG8(0x5bbd), 0x75 }, { CCI_REG8(0x5bbe), 0x75 },
-+	{ CCI_REG8(0x5bbf), 0x75 }, { CCI_REG8(0x5bc0), 0x75 },
-+	{ CCI_REG8(0x5bc1), 0x75 }, { CCI_REG8(0x5bc2), 0x75 },
-+	{ CCI_REG8(0x5bc3), 0x75 }, { CCI_REG8(0x5bc4), 0x75 },
-+	{ CCI_REG8(0x5bc5), 0x75 }, { CCI_REG8(0x5bc6), 0x75 },
-+	{ CCI_REG8(0x5bc7), 0x75 }, { CCI_REG8(0x5bc8), 0x75 },
-+	{ CCI_REG8(0x5bc9), 0x75 }, { CCI_REG8(0x5bca), 0x75 },
-+	{ CCI_REG8(0x5bcb), 0x75 }, { CCI_REG8(0x5bcc), 0x75 },
-+	{ CCI_REG8(0x5bcd), 0x75 }, { CCI_REG8(0x5bce), 0x75 },
-+	{ CCI_REG8(0x5bcf), 0x75 }, { CCI_REG8(0x5bd0), 0x75 },
-+	{ CCI_REG8(0x5bd1), 0x75 }, { CCI_REG8(0x5bd2), 0x75 },
-+	{ CCI_REG8(0x5bd3), 0x75 }, { CCI_REG8(0x5bd4), 0x75 },
-+	{ CCI_REG8(0x5bd5), 0x75 }, { CCI_REG8(0x5bd6), 0x75 },
-+	{ CCI_REG8(0x5bd7), 0x75 }, { CCI_REG8(0x5bd8), 0x75 },
-+	{ CCI_REG8(0x5bd9), 0x75 }, { CCI_REG8(0x5bda), 0x75 },
-+	{ CCI_REG8(0x5bdb), 0x75 }, { CCI_REG8(0x5bdc), 0x75 },
-+	{ CCI_REG8(0x5bdd), 0x75 }, { CCI_REG8(0x5bde), 0x75 },
-+	{ CCI_REG8(0x5bdf), 0x75 }, { CCI_REG8(0x5be0), 0x75 },
-+	{ CCI_REG8(0x5be1), 0x75 }, { CCI_REG8(0x5be2), 0x75 },
-+	{ CCI_REG8(0x5be3), 0x75 }, { CCI_REG8(0x5be4), 0x75 },
-+	{ CCI_REG8(0x5be5), 0x75 }, { CCI_REG8(0x5be6), 0x75 },
-+	{ CCI_REG8(0x5be7), 0x75 }, { CCI_REG8(0x5be8), 0x75 },
-+	{ CCI_REG8(0x5be9), 0x75 }, { CCI_REG8(0x5bea), 0x75 },
-+	{ CCI_REG8(0x5beb), 0x75 }, { CCI_REG8(0x5bec), 0x75 },
-+	{ CCI_REG8(0x5bed), 0x75 }, { CCI_REG8(0x5bee), 0x75 },
-+	{ CCI_REG8(0x5bef), 0x75 }, { CCI_REG8(0x5bf0), 0x75 },
-+	{ CCI_REG8(0x5bf1), 0x75 }, { CCI_REG8(0x5bf2), 0x75 },
-+	{ CCI_REG8(0x5bf3), 0x75 }, { CCI_REG8(0x5bf4), 0x75 },
-+	{ CCI_REG8(0x5bf5), 0x75 }, { CCI_REG8(0x5bf6), 0x75 },
-+	{ CCI_REG8(0x5bf7), 0x75 }, { CCI_REG8(0x5bf8), 0x75 },
-+	{ CCI_REG8(0x5bf9), 0x75 }, { CCI_REG8(0x5bfa), 0x75 },
-+	{ CCI_REG8(0x5bfb), 0x75 }, { CCI_REG8(0x5bfc), 0x75 },
-+	{ CCI_REG8(0x5bfd), 0x75 }, { CCI_REG8(0x5bfe), 0x75 },
-+	{ CCI_REG8(0x5bff), 0x75 }, { CCI_REG8(0x5c00), 0x75 },
-+	{ CCI_REG8(0x5c01), 0x75 }, { CCI_REG8(0x5c02), 0x75 },
-+	{ CCI_REG8(0x5c03), 0x75 }, { CCI_REG8(0x5c04), 0x75 },
-+	{ CCI_REG8(0x5c05), 0x75 }, { CCI_REG8(0x5c06), 0x75 },
-+	{ CCI_REG8(0x5c07), 0x75 }, { CCI_REG8(0x5c08), 0x75 },
-+	{ CCI_REG8(0x5c09), 0x75 }, { CCI_REG8(0x5c0a), 0x75 },
-+	{ CCI_REG8(0x5c0b), 0x75 }, { CCI_REG8(0x5c0c), 0x75 },
-+	{ CCI_REG8(0x5c0d), 0x75 }, { CCI_REG8(0x5c0e), 0x75 },
-+	{ CCI_REG8(0x5c0f), 0x75 }, { CCI_REG8(0x5c10), 0x75 },
-+	{ CCI_REG8(0x5c11), 0x75 }, { CCI_REG8(0x5c12), 0x75 },
-+	{ CCI_REG8(0x5c13), 0x75 }, { CCI_REG8(0x5c14), 0x75 },
-+	{ CCI_REG8(0x5c15), 0x75 }, { CCI_REG8(0x5c16), 0x75 },
-+	{ CCI_REG8(0x5c17), 0x75 }, { CCI_REG8(0x5c18), 0x75 },
-+	{ CCI_REG8(0x5c19), 0x75 }, { CCI_REG8(0x5c1a), 0x75 },
-+	{ CCI_REG8(0x5c1b), 0x75 }, { CCI_REG8(0x5c1c), 0x75 },
-+	{ CCI_REG8(0x5c1d), 0x75 }, { CCI_REG8(0x5c1e), 0x75 },
-+	{ CCI_REG8(0x5c1f), 0x75 }, { CCI_REG8(0x5c20), 0x75 },
-+	{ CCI_REG8(0x5c21), 0x75 }, { CCI_REG8(0x5c22), 0x75 },
-+	{ CCI_REG8(0x5c23), 0x75 }, { CCI_REG8(0x5c24), 0x75 },
-+	{ CCI_REG8(0x5c25), 0x75 }, { CCI_REG8(0x5c26), 0x75 },
-+	{ CCI_REG8(0x5c27), 0x75 }, { CCI_REG8(0x5c28), 0x75 },
-+	{ CCI_REG8(0x5c29), 0x75 }, { CCI_REG8(0x5c2a), 0x75 },
-+	{ CCI_REG8(0x5c2b), 0x75 }, { CCI_REG8(0x5c2c), 0x75 },
-+	{ CCI_REG8(0x5c2d), 0x75 }, { CCI_REG8(0x5c2e), 0x75 },
-+	{ CCI_REG8(0x5c2f), 0x75 }, { CCI_REG8(0x5c30), 0x75 },
-+	{ CCI_REG8(0x5c31), 0x75 }, { CCI_REG8(0x5c32), 0x75 },
-+	{ CCI_REG8(0x5c33), 0x75 }, { CCI_REG8(0x5c34), 0x75 },
-+	{ CCI_REG8(0x5c35), 0x75 }, { CCI_REG8(0x5c36), 0x75 },
-+	{ CCI_REG8(0x5c37), 0x75 }, { CCI_REG8(0x5c38), 0x75 },
-+	{ CCI_REG8(0x5c39), 0x75 }, { CCI_REG8(0x5c3a), 0x75 },
-+	{ CCI_REG8(0x5c3b), 0x75 }, { CCI_REG8(0x5c3c), 0x75 },
-+	{ CCI_REG8(0x5c3d), 0x75 }, { CCI_REG8(0x5c3e), 0x75 },
-+	{ CCI_REG8(0x5c3f), 0x75 }, { CCI_REG8(0x5c40), 0x75 },
-+	{ CCI_REG8(0x5c41), 0x75 }, { CCI_REG8(0x5c42), 0x75 },
-+	{ CCI_REG8(0x5c43), 0x75 }, { CCI_REG8(0x5c44), 0x75 },
-+	{ CCI_REG8(0x5c45), 0x75 }, { CCI_REG8(0x5c46), 0x75 },
-+	{ CCI_REG8(0x5c47), 0x75 }, { CCI_REG8(0x5c48), 0x75 },
-+	{ CCI_REG8(0x5c49), 0x75 }, { CCI_REG8(0x5c4a), 0x75 },
-+	{ CCI_REG8(0x5c4b), 0x75 }, { CCI_REG8(0x5c4c), 0x75 },
-+	{ CCI_REG8(0x5c4d), 0x75 }, { CCI_REG8(0x5c4e), 0x75 },
-+	{ CCI_REG8(0x5c4f), 0x75 }, { CCI_REG8(0x5c50), 0x75 },
-+	{ CCI_REG8(0x5c51), 0x75 }, { CCI_REG8(0x5c52), 0x75 },
-+	{ CCI_REG8(0x5c53), 0x75 }, { CCI_REG8(0x5c54), 0x75 },
-+	{ CCI_REG8(0x5c55), 0x75 }, { CCI_REG8(0x5c56), 0x75 },
-+	{ CCI_REG8(0x5c57), 0x75 }, { CCI_REG8(0x5c58), 0x75 },
-+	{ CCI_REG8(0x5c59), 0x75 }, { CCI_REG8(0x5c5a), 0x75 },
-+	{ CCI_REG8(0x5c5b), 0x75 }, { CCI_REG8(0x5c5c), 0x75 },
-+	{ CCI_REG8(0x5c5d), 0x75 }, { CCI_REG8(0x5c5e), 0x75 },
-+	{ CCI_REG8(0x5c5f), 0x75 }, { CCI_REG8(0x5c60), 0x75 },
-+	{ CCI_REG8(0x5c61), 0x75 }, { CCI_REG8(0x5c62), 0x75 },
-+	{ CCI_REG8(0x5c63), 0x75 }, { CCI_REG8(0x5c64), 0x75 },
-+	{ CCI_REG8(0x5c65), 0x75 }, { CCI_REG8(0x5c66), 0x75 },
-+	{ CCI_REG8(0x5c67), 0x75 }, { CCI_REG8(0x5c68), 0x75 },
-+	{ CCI_REG8(0x5c69), 0x75 }, { CCI_REG8(0x5c6a), 0x75 },
-+	{ CCI_REG8(0x5c6b), 0x75 }, { CCI_REG8(0x5c6c), 0x75 },
-+	{ CCI_REG8(0x5c6d), 0x75 }, { CCI_REG8(0x5c6e), 0x75 },
-+	{ CCI_REG8(0x5c6f), 0x75 }, { CCI_REG8(0x5c70), 0x75 },
-+	{ CCI_REG8(0x5c71), 0x75 }, { CCI_REG8(0x5c72), 0x75 },
-+	{ CCI_REG8(0x5c73), 0x75 }, { CCI_REG8(0x5c74), 0x75 },
-+	{ CCI_REG8(0x5c75), 0x75 }, { CCI_REG8(0x5c76), 0x75 },
-+	{ CCI_REG8(0x5c77), 0x75 }, { CCI_REG8(0x5c78), 0x75 },
-+	{ CCI_REG8(0x5c79), 0x75 }, { CCI_REG8(0x5c7a), 0x75 },
-+	{ CCI_REG8(0x5c7b), 0x75 }, { CCI_REG8(0x5c7c), 0x75 },
-+	{ CCI_REG8(0x5c7d), 0x75 }, { CCI_REG8(0x5c7e), 0x75 },
-+	{ CCI_REG8(0x5c7f), 0x75 }, { CCI_REG8(0x5c80), 0x75 },
-+	{ CCI_REG8(0x5c81), 0x75 }, { CCI_REG8(0x5c82), 0x75 },
-+	{ CCI_REG8(0x5c83), 0x75 }, { CCI_REG8(0x5c84), 0x75 },
-+	{ CCI_REG8(0x5c85), 0x75 }, { CCI_REG8(0x5c86), 0x75 },
-+	{ CCI_REG8(0x5c87), 0x75 }, { CCI_REG8(0x5c88), 0x75 },
-+	{ CCI_REG8(0x5c89), 0x75 }, { CCI_REG8(0x5c8a), 0x75 },
-+	{ CCI_REG8(0x5c8b), 0x75 }, { CCI_REG8(0x5c8c), 0x75 },
-+	{ CCI_REG8(0x5c8d), 0x75 }, { CCI_REG8(0x5c8e), 0x75 },
-+	{ CCI_REG8(0x5c8f), 0x75 }, { CCI_REG8(0x5c90), 0x75 },
-+	{ CCI_REG8(0x5c91), 0x75 }, { CCI_REG8(0x5c92), 0x75 },
-+	{ CCI_REG8(0x5c93), 0x75 }, { CCI_REG8(0x5c94), 0x75 },
-+	{ CCI_REG8(0x5c95), 0x75 }, { CCI_REG8(0x5c96), 0x75 },
-+	{ CCI_REG8(0x5c97), 0x75 }, { CCI_REG8(0x5c98), 0x75 },
-+	{ CCI_REG8(0x5c99), 0x75 }, { CCI_REG8(0x5c9a), 0x75 },
-+	{ CCI_REG8(0x5c9b), 0x75 }, { CCI_REG8(0x5c9c), 0x75 },
-+	{ CCI_REG8(0x5c9d), 0x75 }, { CCI_REG8(0x5c9e), 0x75 },
-+	{ CCI_REG8(0x5c9f), 0x75 }, { CCI_REG8(0x5ca0), 0x75 },
-+	{ CCI_REG8(0x5ca1), 0x75 }, { CCI_REG8(0x5ca2), 0x75 },
-+	{ CCI_REG8(0x5ca3), 0x75 }, { CCI_REG8(0x5ca4), 0x75 },
-+	{ CCI_REG8(0x5ca5), 0x75 }, { CCI_REG8(0x5ca6), 0x75 },
-+	{ CCI_REG8(0x5ca7), 0x75 }, { CCI_REG8(0x5ca8), 0x75 },
-+	{ CCI_REG8(0x5ca9), 0x75 }, { CCI_REG8(0x5caa), 0x75 },
-+	{ CCI_REG8(0x5cab), 0x75 }, { CCI_REG8(0x5cac), 0x75 },
-+	{ CCI_REG8(0x5cad), 0x75 }, { CCI_REG8(0x5cae), 0x75 },
-+	{ CCI_REG8(0x5caf), 0x75 }, { CCI_REG8(0x5cb0), 0x75 },
-+	{ CCI_REG8(0x5cb1), 0x75 }, { CCI_REG8(0x5cb2), 0x75 },
-+	{ CCI_REG8(0x5cb3), 0x75 }, { CCI_REG8(0x5cb4), 0x75 },
-+	{ CCI_REG8(0x5cb5), 0x75 }, { CCI_REG8(0x5cb6), 0x75 },
-+	{ CCI_REG8(0x5cb7), 0x75 }, { CCI_REG8(0x5cb8), 0x75 },
-+	{ CCI_REG8(0x5cb9), 0x75 }, { CCI_REG8(0x5cba), 0x75 },
-+	{ CCI_REG8(0x5cbb), 0x75 }, { CCI_REG8(0x5cbc), 0x75 },
-+	{ CCI_REG8(0x5cbd), 0x75 }, { CCI_REG8(0x5cbe), 0x75 },
-+	{ CCI_REG8(0x5cbf), 0x75 }, { CCI_REG8(0x5cc0), 0x75 },
-+	{ CCI_REG8(0x5cc1), 0x75 }, { CCI_REG8(0x5cc2), 0x75 },
-+	{ CCI_REG8(0x5cc3), 0x75 }, { CCI_REG8(0x5cc4), 0x75 },
-+	{ CCI_REG8(0x5cc5), 0x75 }, { CCI_REG8(0x5cc6), 0x75 },
-+	{ CCI_REG8(0x5cc7), 0x75 }, { CCI_REG8(0x5cc8), 0x75 },
-+	{ CCI_REG8(0x5cc9), 0x75 }, { CCI_REG8(0x5cca), 0x75 },
-+	{ CCI_REG8(0x5ccb), 0x75 }, { CCI_REG8(0x5ccc), 0x75 },
-+	{ CCI_REG8(0x5ccd), 0x75 }, { CCI_REG8(0x5cce), 0x75 },
-+	{ CCI_REG8(0x5ccf), 0x75 }, { CCI_REG8(0x5cd0), 0x75 },
-+	{ CCI_REG8(0x5cd1), 0x75 }, { CCI_REG8(0x5cd2), 0x75 },
-+	{ CCI_REG8(0x5cd3), 0x75 }, { CCI_REG8(0x5cd4), 0x75 },
-+	{ CCI_REG8(0x5cd5), 0x75 }, { CCI_REG8(0x5cd6), 0x75 },
-+	{ CCI_REG8(0x5cd7), 0x75 }, { CCI_REG8(0x5cd8), 0x75 },
-+	{ CCI_REG8(0x5cd9), 0x75 }, { CCI_REG8(0x5cda), 0x75 },
-+	{ CCI_REG8(0x5cdb), 0x75 }, { CCI_REG8(0x5cdc), 0x75 },
-+	{ CCI_REG8(0x5cdd), 0x75 }, { CCI_REG8(0x5cde), 0x75 },
-+	{ CCI_REG8(0x5cdf), 0x75 }, { CCI_REG8(0x5ce0), 0x75 },
-+	{ CCI_REG8(0x5ce1), 0x75 }, { CCI_REG8(0x5ce2), 0x75 },
-+	{ CCI_REG8(0x5ce3), 0x75 }, { CCI_REG8(0x5ce4), 0x75 },
-+	{ CCI_REG8(0x5ce5), 0x75 }, { CCI_REG8(0x5ce6), 0x75 },
-+	{ CCI_REG8(0x5ce7), 0x75 }, { CCI_REG8(0x5ce8), 0x75 },
-+	{ CCI_REG8(0x5ce9), 0x75 }, { CCI_REG8(0x5cea), 0x75 },
-+	{ CCI_REG8(0x5ceb), 0x75 }, { CCI_REG8(0x5cec), 0x75 },
-+	{ CCI_REG8(0x5ced), 0x75 }, { CCI_REG8(0x5cee), 0x75 },
-+	{ CCI_REG8(0x5cef), 0x75 }, { CCI_REG8(0x5cf0), 0x75 },
-+	{ CCI_REG8(0x5cf1), 0x75 }, { CCI_REG8(0x5cf2), 0x75 },
-+	{ CCI_REG8(0x5cf3), 0x75 }, { CCI_REG8(0x5cf4), 0x75 },
-+	{ CCI_REG8(0x5cf5), 0x75 }, { CCI_REG8(0x5cf6), 0x75 },
-+	{ CCI_REG8(0x5cf7), 0x75 }, { CCI_REG8(0x5cf8), 0x75 },
-+	{ CCI_REG8(0x5cf9), 0x75 }, { CCI_REG8(0x5cfa), 0x75 },
-+	{ CCI_REG8(0x5cfb), 0x75 }, { CCI_REG8(0x5cfc), 0x75 },
-+	{ CCI_REG8(0x5cfd), 0x75 }, { CCI_REG8(0x5cfe), 0x75 },
-+	{ CCI_REG8(0x5cff), 0x75 }, { CCI_REG8(0x5d00), 0x75 },
-+	{ CCI_REG8(0x5d01), 0x75 }, { CCI_REG8(0x5d02), 0x75 },
-+	{ CCI_REG8(0x5d03), 0x75 }, { CCI_REG8(0x5d04), 0x75 },
-+	{ CCI_REG8(0x5d05), 0x75 }, { CCI_REG8(0x5d06), 0x75 },
-+	{ CCI_REG8(0x5d07), 0x75 }, { CCI_REG8(0x5d08), 0x75 },
-+	{ CCI_REG8(0x5d09), 0x75 }, { CCI_REG8(0x5d0a), 0x75 },
-+	{ CCI_REG8(0x5d0b), 0x75 }, { CCI_REG8(0x5d0c), 0x75 },
-+	{ CCI_REG8(0x5d0d), 0x75 }, { CCI_REG8(0x5d0e), 0x75 },
-+	{ CCI_REG8(0x5d0f), 0x75 }, { CCI_REG8(0x5d10), 0x75 },
-+	{ CCI_REG8(0x5d11), 0x75 }, { CCI_REG8(0x5d12), 0x75 },
-+	{ CCI_REG8(0x5d13), 0x75 }, { CCI_REG8(0x5d14), 0x75 },
-+	{ CCI_REG8(0x5d15), 0x75 }, { CCI_REG8(0x5d16), 0x75 },
-+	{ CCI_REG8(0x5d17), 0x75 }, { CCI_REG8(0x5d18), 0x75 },
-+	{ CCI_REG8(0x5d19), 0x75 }, { CCI_REG8(0x5d1a), 0x75 },
-+	{ CCI_REG8(0x5d1b), 0x75 }, { CCI_REG8(0x5d1c), 0x75 },
-+	{ CCI_REG8(0x5d1d), 0x75 }, { CCI_REG8(0x5d1e), 0x75 },
-+	{ CCI_REG8(0x5d1f), 0x75 }, { CCI_REG8(0x5d20), 0x75 },
-+	{ CCI_REG8(0x5d21), 0x75 }, { CCI_REG8(0x5d22), 0x75 },
-+	{ CCI_REG8(0x5d23), 0x75 }, { CCI_REG8(0x5d24), 0x75 },
-+	{ CCI_REG8(0x5d25), 0x75 }, { CCI_REG8(0x5d26), 0x75 },
-+	{ CCI_REG8(0x5d27), 0x75 }, { CCI_REG8(0x5d28), 0x75 },
-+	{ CCI_REG8(0x5d29), 0x75 }, { CCI_REG8(0x5d2a), 0x75 },
-+	{ CCI_REG8(0x5d2b), 0x75 }, { CCI_REG8(0x5d2c), 0x75 },
-+	{ CCI_REG8(0x5d2d), 0x75 }, { CCI_REG8(0x5d2e), 0x75 },
-+	{ CCI_REG8(0x5d2f), 0x75 }, { CCI_REG8(0x5d30), 0x75 },
-+	{ CCI_REG8(0x5d31), 0x75 }, { CCI_REG8(0x5d32), 0x75 },
-+	{ CCI_REG8(0x5d33), 0x75 }, { CCI_REG8(0x5d34), 0x75 },
-+	{ CCI_REG8(0x5d35), 0x75 }, { CCI_REG8(0x5d36), 0x75 },
-+	{ CCI_REG8(0x5d37), 0x75 }, { CCI_REG8(0x5d38), 0x75 },
-+	{ CCI_REG8(0x5d39), 0x75 }, { CCI_REG8(0x5d3a), 0x75 },
-+	{ CCI_REG8(0x5d3b), 0x75 }, { CCI_REG8(0x5d3c), 0x75 },
-+	{ CCI_REG8(0x5d3d), 0x75 }, { CCI_REG8(0x5d3e), 0x75 },
-+	{ CCI_REG8(0x5d3f), 0x75 }, { CCI_REG8(0x5d40), 0x75 },
-+	{ CCI_REG8(0x5d41), 0x75 }, { CCI_REG8(0x5d42), 0x75 },
-+	{ CCI_REG8(0x5d43), 0x75 }, { CCI_REG8(0x5d44), 0x75 },
-+	{ CCI_REG8(0x5d45), 0x75 }, { CCI_REG8(0x5d46), 0x75 },
-+	{ CCI_REG8(0x5d47), 0x75 }, { CCI_REG8(0x5d48), 0x75 },
-+	{ CCI_REG8(0x5d49), 0x75 }, { CCI_REG8(0x5d4a), 0x75 },
-+	{ CCI_REG8(0x5d4b), 0x75 }, { CCI_REG8(0x5d4c), 0x75 },
-+	{ CCI_REG8(0x5d4d), 0x75 }, { CCI_REG8(0x5d4e), 0x75 },
-+	{ CCI_REG8(0x5d4f), 0x75 }, { CCI_REG8(0x5d50), 0x75 },
-+	{ CCI_REG8(0x5d51), 0x75 }, { CCI_REG8(0x5d52), 0x75 },
-+	{ CCI_REG8(0x5d53), 0x75 }, { CCI_REG8(0x5d54), 0x75 },
-+	{ CCI_REG8(0x5d55), 0x75 }, { CCI_REG8(0x5d56), 0x75 },
-+	{ CCI_REG8(0x5d57), 0x75 }, { CCI_REG8(0x5d58), 0x75 },
-+	{ CCI_REG8(0x5d59), 0x75 }, { CCI_REG8(0x5d5a), 0x75 },
-+	{ CCI_REG8(0x5d5b), 0x75 }, { CCI_REG8(0x5d5c), 0x75 },
-+	{ CCI_REG8(0x5d5d), 0x75 }, { CCI_REG8(0x5d5e), 0x75 },
-+	{ CCI_REG8(0x5d5f), 0x75 }, { CCI_REG8(0x5d60), 0x75 },
-+	{ CCI_REG8(0x5d61), 0x75 }, { CCI_REG8(0x5d62), 0x75 },
-+	{ CCI_REG8(0x5d63), 0x75 }, { CCI_REG8(0x5d64), 0x75 },
-+	{ CCI_REG8(0x5d65), 0x75 }, { CCI_REG8(0x5d66), 0x75 },
-+	{ CCI_REG8(0x5d67), 0x75 }, { CCI_REG8(0x5d68), 0x75 },
-+	{ CCI_REG8(0x5d69), 0x75 }, { CCI_REG8(0x5d6a), 0x75 },
-+	{ CCI_REG8(0x5d6b), 0x75 }, { CCI_REG8(0x5d6c), 0x75 },
-+	{ CCI_REG8(0x5d6d), 0x75 }, { CCI_REG8(0x5d6e), 0x75 },
-+	{ CCI_REG8(0x5d6f), 0x75 }, { CCI_REG8(0x5d70), 0x75 },
-+	{ CCI_REG8(0x5d71), 0x75 }, { CCI_REG8(0x5d72), 0x75 },
-+	{ CCI_REG8(0x5d73), 0x75 }, { CCI_REG8(0x5d74), 0x75 },
-+	{ CCI_REG8(0x5d75), 0x75 }, { CCI_REG8(0x5d76), 0x75 },
-+	{ CCI_REG8(0x5d77), 0x75 }, { CCI_REG8(0x5d78), 0x75 },
-+	{ CCI_REG8(0x5d79), 0x75 }, { CCI_REG8(0x5d7a), 0x75 },
-+	{ CCI_REG8(0x5d7b), 0x75 }, { CCI_REG8(0x5d7c), 0x75 },
-+	{ CCI_REG8(0x5d7d), 0x75 }, { CCI_REG8(0x5d7e), 0x75 },
-+	{ CCI_REG8(0x5d7f), 0x75 }, { CCI_REG8(0x5d80), 0x75 },
-+	{ CCI_REG8(0x5d81), 0x75 }, { CCI_REG8(0x5d82), 0x75 },
-+	{ CCI_REG8(0x5d83), 0x75 }, { CCI_REG8(0x5d84), 0x75 },
-+	{ CCI_REG8(0x5d85), 0x75 }, { CCI_REG8(0x5d86), 0x75 },
-+	{ CCI_REG8(0x5d87), 0x75 }, { CCI_REG8(0x5d88), 0x75 },
-+	{ CCI_REG8(0x5d89), 0x75 }, { CCI_REG8(0x5d8a), 0x75 },
-+	{ CCI_REG8(0x5d8b), 0x75 }, { CCI_REG8(0x5d8c), 0x75 },
-+	{ CCI_REG8(0x5d8d), 0x75 }, { CCI_REG8(0x5d8e), 0x75 },
-+	{ CCI_REG8(0x5d8f), 0x75 }, { CCI_REG8(0x5d90), 0x75 },
-+	{ CCI_REG8(0x5d91), 0x75 }, { CCI_REG8(0x5d92), 0x75 },
-+	{ CCI_REG8(0x5d93), 0x75 }, { CCI_REG8(0x5d94), 0x75 },
-+	{ CCI_REG8(0x5d95), 0x75 }, { CCI_REG8(0x5d96), 0x75 },
-+	{ CCI_REG8(0x5d97), 0x75 }, { CCI_REG8(0x5d98), 0x75 },
-+	{ CCI_REG8(0x5d99), 0x75 }, { CCI_REG8(0x5d9a), 0x75 },
-+	{ CCI_REG8(0x5d9b), 0x75 }, { CCI_REG8(0x5d9c), 0x75 },
-+	{ CCI_REG8(0x5d9d), 0x75 }, { CCI_REG8(0x5d9e), 0x75 },
-+	{ CCI_REG8(0x5d9f), 0x75 }, { CCI_REG8(0x5da0), 0x75 },
-+	{ CCI_REG8(0x5da1), 0x75 }, { CCI_REG8(0x5da2), 0x75 },
-+	{ CCI_REG8(0x5da3), 0x75 }, { CCI_REG8(0x5da4), 0x75 },
-+	{ CCI_REG8(0x5da5), 0x75 }, { CCI_REG8(0x5da6), 0x75 },
-+	{ CCI_REG8(0x5da7), 0x75 }, { CCI_REG8(0x5da8), 0x75 },
-+	{ CCI_REG8(0x5da9), 0x75 }, { CCI_REG8(0x5daa), 0x75 },
-+	{ CCI_REG8(0x5dab), 0x75 }, { CCI_REG8(0x5dac), 0x75 },
-+	{ CCI_REG8(0x5dad), 0x75 }, { CCI_REG8(0x5dae), 0x75 },
-+	{ CCI_REG8(0x5daf), 0x75 }, { CCI_REG8(0x5db0), 0x75 },
-+	{ CCI_REG8(0x5db1), 0x75 }, { CCI_REG8(0x5db2), 0x75 },
-+	{ CCI_REG8(0x5db3), 0x75 }, { CCI_REG8(0x5db4), 0x75 },
-+	{ CCI_REG8(0x5db5), 0x75 }, { CCI_REG8(0x5db6), 0x75 },
-+	{ CCI_REG8(0x5db7), 0x75 }, { CCI_REG8(0x5db8), 0x75 },
-+	{ CCI_REG8(0x5db9), 0x75 }, { CCI_REG8(0x5dba), 0x75 },
-+	{ CCI_REG8(0x5dbb), 0x75 }, { CCI_REG8(0x5dbc), 0x75 },
-+	{ CCI_REG8(0x5dbd), 0x75 }, { CCI_REG8(0x5dbe), 0x75 },
-+	{ CCI_REG8(0x5dbf), 0x75 }, { CCI_REG8(0x5dc0), 0x75 },
-+	{ CCI_REG8(0x5dc1), 0x75 }, { CCI_REG8(0x5dc2), 0x75 },
-+	{ CCI_REG8(0x5dc3), 0x75 }, { CCI_REG8(0x5dc4), 0x75 },
-+	{ CCI_REG8(0x5dc5), 0x75 }, { CCI_REG8(0x5dc6), 0x75 },
-+	{ CCI_REG8(0x5dc7), 0x75 }, { CCI_REG8(0x5dc8), 0x75 },
-+	{ CCI_REG8(0x5dc9), 0x75 }, { CCI_REG8(0x5dca), 0x75 },
-+	{ CCI_REG8(0x5dcb), 0x75 }, { CCI_REG8(0x5dcc), 0x75 },
-+	{ CCI_REG8(0x5dcd), 0x75 }, { CCI_REG8(0x5dce), 0x75 },
-+	{ CCI_REG8(0x5dcf), 0x75 }, { CCI_REG8(0x5dd0), 0x75 },
-+	{ CCI_REG8(0x5dd1), 0x75 }, { CCI_REG8(0x5dd2), 0x75 },
-+	{ CCI_REG8(0x5dd3), 0x75 }, { CCI_REG8(0x5dd4), 0x75 },
-+	{ CCI_REG8(0x5dd5), 0x75 }, { CCI_REG8(0x5dd6), 0x75 },
-+	{ CCI_REG8(0x5dd7), 0x75 }, { CCI_REG8(0x5dd8), 0x75 },
-+	{ CCI_REG8(0x5dd9), 0x75 }, { CCI_REG8(0x5dda), 0x75 },
-+	{ CCI_REG8(0x5ddb), 0x75 }, { CCI_REG8(0x5ddc), 0x75 },
-+	{ CCI_REG8(0x5ddd), 0x75 }, { CCI_REG8(0x5dde), 0x75 },
-+	{ CCI_REG8(0x5ddf), 0x75 }, { CCI_REG8(0x5de0), 0x75 },
-+	{ CCI_REG8(0x5de1), 0x75 }, { CCI_REG8(0x5de2), 0x75 },
-+	{ CCI_REG8(0x5de3), 0x75 }, { CCI_REG8(0x5de4), 0x75 },
-+	{ CCI_REG8(0x5de5), 0x75 }, { CCI_REG8(0x5de6), 0x75 },
-+	{ CCI_REG8(0x5de7), 0x75 }, { CCI_REG8(0x5de8), 0x75 },
-+	{ CCI_REG8(0x5de9), 0x75 }, { CCI_REG8(0x5dea), 0x75 },
-+	{ CCI_REG8(0x5deb), 0x75 }, { CCI_REG8(0x5dec), 0x75 },
-+	{ CCI_REG8(0x5ded), 0x75 }, { CCI_REG8(0x5dee), 0x75 },
-+	{ CCI_REG8(0x5def), 0x75 }, { CCI_REG8(0x5df0), 0x75 },
-+	{ CCI_REG8(0x5df1), 0x75 }, { CCI_REG8(0x5df2), 0x75 },
-+	{ CCI_REG8(0x5df3), 0x75 }, { CCI_REG8(0x5df4), 0x75 },
-+	{ CCI_REG8(0x5df5), 0x75 }, { CCI_REG8(0x5df6), 0x75 },
-+	{ CCI_REG8(0x5df7), 0x75 }, { CCI_REG8(0x5df8), 0x75 },
-+	{ CCI_REG8(0x5df9), 0x75 }, { CCI_REG8(0x5dfa), 0x75 },
-+	{ CCI_REG8(0x5dfb), 0x75 }, { CCI_REG8(0x5dfc), 0x75 },
-+	{ CCI_REG8(0x5dfd), 0x75 }, { CCI_REG8(0x5dfe), 0x75 },
-+	{ CCI_REG8(0x5dff), 0x75 }, { CCI_REG8(0x5e00), 0x75 },
-+	{ CCI_REG8(0x5e01), 0x75 }, { CCI_REG8(0x5e02), 0x75 },
-+	{ CCI_REG8(0x5e03), 0x75 }, { CCI_REG8(0x5e04), 0x75 },
-+	{ CCI_REG8(0x5e05), 0x75 }, { CCI_REG8(0x5e06), 0x75 },
-+	{ CCI_REG8(0x5e07), 0x75 }, { CCI_REG8(0x5e08), 0x75 },
-+	{ CCI_REG8(0x5e09), 0x75 }, { CCI_REG8(0x5e0a), 0x75 },
-+	{ CCI_REG8(0x5e0b), 0x75 }, { CCI_REG8(0x5e0c), 0x75 },
-+	{ CCI_REG8(0x5e0d), 0x75 }, { CCI_REG8(0x5e0e), 0x75 },
-+	{ CCI_REG8(0x5e0f), 0x75 }, { CCI_REG8(0x5e10), 0x75 },
-+	{ CCI_REG8(0x5e11), 0x75 }, { CCI_REG8(0x5e12), 0x75 },
-+	{ CCI_REG8(0x5e13), 0x75 }, { CCI_REG8(0x5e14), 0x75 },
-+	{ CCI_REG8(0x5e15), 0x75 }, { CCI_REG8(0x5e16), 0x75 },
-+	{ CCI_REG8(0x5e17), 0x75 }, { CCI_REG8(0x5e18), 0x75 },
-+	{ CCI_REG8(0x5e19), 0x75 }, { CCI_REG8(0x5e1a), 0x75 },
-+	{ CCI_REG8(0x5e1b), 0x75 }, { CCI_REG8(0x5e1c), 0x75 },
-+	{ CCI_REG8(0x5e1d), 0x75 }, { CCI_REG8(0x5e1e), 0x75 },
-+	{ CCI_REG8(0x5e1f), 0x75 }, { CCI_REG8(0x5e20), 0x75 },
-+	{ CCI_REG8(0x5e21), 0x75 }, { CCI_REG8(0x5e22), 0x75 },
-+	{ CCI_REG8(0x5e23), 0x75 }, { CCI_REG8(0x5e24), 0x75 },
-+	{ CCI_REG8(0x5e25), 0x75 }, { CCI_REG8(0x5e26), 0x75 },
-+	{ CCI_REG8(0x5e27), 0x75 }, { CCI_REG8(0x5e28), 0x75 },
-+	{ CCI_REG8(0x5e29), 0x75 }, { CCI_REG8(0x5e2a), 0x75 },
-+	{ CCI_REG8(0x5e2b), 0x75 }, { CCI_REG8(0x5e2c), 0x75 },
-+	{ CCI_REG8(0x5e2d), 0x75 }, { CCI_REG8(0x5e2e), 0x75 },
-+	{ CCI_REG8(0x5e2f), 0x75 }, { CCI_REG8(0x5e30), 0x75 },
-+	{ CCI_REG8(0x5e31), 0x75 }, { CCI_REG8(0x5e32), 0x75 },
-+	{ CCI_REG8(0x5e33), 0x75 }, { CCI_REG8(0x5e34), 0x75 },
-+	{ CCI_REG8(0x5e35), 0x75 }, { CCI_REG8(0x5e36), 0x75 },
-+	{ CCI_REG8(0x5e37), 0x75 }, { CCI_REG8(0x5e38), 0x75 },
-+	{ CCI_REG8(0x5e39), 0x75 }, { CCI_REG8(0x5e3a), 0x75 },
-+	{ CCI_REG8(0x5e3b), 0x75 }, { CCI_REG8(0x5e3c), 0x75 },
-+	{ CCI_REG8(0x5e3d), 0x75 }, { CCI_REG8(0x5e3e), 0x75 },
-+	{ CCI_REG8(0x5e3f), 0x75 }, { CCI_REG8(0x5e40), 0x75 },
-+	{ CCI_REG8(0x5e41), 0x75 }, { CCI_REG8(0x5e42), 0x75 },
-+	{ CCI_REG8(0x5e43), 0x75 }, { CCI_REG8(0x5e44), 0x75 },
-+	{ CCI_REG8(0x5e45), 0x75 }, { CCI_REG8(0x5e46), 0x75 },
-+	{ CCI_REG8(0x5e47), 0x75 }, { CCI_REG8(0x5e48), 0x75 },
-+	{ CCI_REG8(0x5e49), 0x75 }, { CCI_REG8(0x5e4a), 0x75 },
-+	{ CCI_REG8(0x5e4b), 0x75 }, { CCI_REG8(0x5e4c), 0x75 },
-+	{ CCI_REG8(0x5e4d), 0x75 }, { CCI_REG8(0x5e4e), 0x75 },
-+	{ CCI_REG8(0x5e4f), 0x75 }, { CCI_REG8(0x5e50), 0x75 },
-+	{ CCI_REG8(0x5e51), 0x75 }, { CCI_REG8(0x5e52), 0x75 },
-+	{ CCI_REG8(0x5e53), 0x75 }, { CCI_REG8(0x5e54), 0x75 },
-+	{ CCI_REG8(0x5e55), 0x75 }, { CCI_REG8(0x5e56), 0x75 },
-+	{ CCI_REG8(0x5e57), 0x75 }, { CCI_REG8(0x5e58), 0x75 },
-+	{ CCI_REG8(0x5e59), 0x75 }, { CCI_REG8(0x5e5a), 0x75 },
-+	{ CCI_REG8(0x5e5b), 0x75 }, { CCI_REG8(0x5e5c), 0x75 },
-+	{ CCI_REG8(0x5e5d), 0x75 }, { CCI_REG8(0x5e5e), 0x75 },
-+	{ CCI_REG8(0x5e5f), 0x75 }, { CCI_REG8(0x5e60), 0x75 },
-+	{ CCI_REG8(0x5e61), 0x75 }, { CCI_REG8(0x5e62), 0x75 },
-+	{ CCI_REG8(0x5e63), 0x75 }, { CCI_REG8(0x5e64), 0x75 },
-+	{ CCI_REG8(0x5e65), 0x75 }, { CCI_REG8(0x5e66), 0x75 },
-+	{ CCI_REG8(0x5e67), 0x75 }, { CCI_REG8(0x5e68), 0x75 },
-+	{ CCI_REG8(0x5e69), 0x75 }, { CCI_REG8(0x5e6a), 0x75 },
-+	{ CCI_REG8(0x5e6b), 0x75 }, { CCI_REG8(0x5e6c), 0x75 },
-+	{ CCI_REG8(0x5e6d), 0x75 }, { CCI_REG8(0x5e6e), 0x75 },
-+	{ CCI_REG8(0x5e6f), 0x75 }, { CCI_REG8(0x5e70), 0x75 },
-+	{ CCI_REG8(0x5e71), 0x75 }, { CCI_REG8(0x5e72), 0x75 },
-+	{ CCI_REG8(0x5e73), 0x75 }, { CCI_REG8(0x5e74), 0x75 },
-+	{ CCI_REG8(0x5e75), 0x75 }, { CCI_REG8(0x5e76), 0x75 },
-+	{ CCI_REG8(0x5e77), 0x75 }, { CCI_REG8(0x5e78), 0x75 },
-+	{ CCI_REG8(0x5e79), 0x75 }, { CCI_REG8(0x5e7a), 0x75 },
-+	{ CCI_REG8(0x5e7b), 0x75 }, { CCI_REG8(0x5e7c), 0x75 },
-+	{ CCI_REG8(0x5e7d), 0x75 }, { CCI_REG8(0x5e7e), 0x75 },
-+	{ CCI_REG8(0x5e7f), 0x75 }, { CCI_REG8(0x5e80), 0x75 },
-+	{ CCI_REG8(0x5e81), 0x75 }, { CCI_REG8(0x5e82), 0x75 },
-+	{ CCI_REG8(0x5e83), 0x75 }, { CCI_REG8(0x5e84), 0x75 },
-+	{ CCI_REG8(0x5e85), 0x75 }, { CCI_REG8(0x5e86), 0x75 },
-+	{ CCI_REG8(0x5e87), 0x75 }, { CCI_REG8(0x5e88), 0x75 },
-+	{ CCI_REG8(0x5e89), 0x75 }, { CCI_REG8(0x5e8a), 0x75 },
-+	{ CCI_REG8(0x5e8b), 0x75 }, { CCI_REG8(0x5e8c), 0x75 },
-+	{ CCI_REG8(0x5e8d), 0x75 }, { CCI_REG8(0x5e8e), 0x75 },
-+	{ CCI_REG8(0x5e8f), 0x75 }, { CCI_REG8(0x5e90), 0x75 },
-+	{ CCI_REG8(0x5e91), 0x75 }, { CCI_REG8(0x5e92), 0x75 },
-+	{ CCI_REG8(0x5e93), 0x75 }, { CCI_REG8(0x5e94), 0x75 },
-+	{ CCI_REG8(0x5e95), 0x75 }, { CCI_REG8(0x5e96), 0x75 },
-+	{ CCI_REG8(0x5e97), 0x75 }, { CCI_REG8(0x5e98), 0x75 },
-+	{ CCI_REG8(0x5e99), 0x75 }, { CCI_REG8(0x5e9a), 0x75 },
-+	{ CCI_REG8(0x5e9b), 0x75 }, { CCI_REG8(0x5e9c), 0x75 },
-+	{ CCI_REG8(0x5e9d), 0x75 }, { CCI_REG8(0x5e9e), 0x75 },
-+	{ CCI_REG8(0x5e9f), 0x75 }, { CCI_REG8(0x5ea0), 0x75 },
-+	{ CCI_REG8(0x5ea1), 0x75 }, { CCI_REG8(0x5ea2), 0x75 },
-+	{ CCI_REG8(0x5ea3), 0x75 }, { CCI_REG8(0x5ea4), 0x75 },
-+	{ CCI_REG8(0x5ea5), 0x75 }, { CCI_REG8(0x5ea6), 0x75 },
-+	{ CCI_REG8(0x5ea7), 0x75 }, { CCI_REG8(0x5ea8), 0x75 },
-+	{ CCI_REG8(0x5ea9), 0x75 }, { CCI_REG8(0x5eaa), 0x75 },
-+	{ CCI_REG8(0x5eab), 0x75 }, { CCI_REG8(0x5eac), 0x75 },
-+	{ CCI_REG8(0x5ead), 0x75 }, { CCI_REG8(0x5eae), 0x75 },
-+	{ CCI_REG8(0x5eaf), 0x75 }, { CCI_REG8(0x5eb0), 0x75 },
-+	{ CCI_REG8(0x5eb1), 0x75 }, { CCI_REG8(0x5eb2), 0x75 },
-+	{ CCI_REG8(0x5eb3), 0x75 }, { CCI_REG8(0x5eb4), 0x75 },
-+	{ CCI_REG8(0x5eb5), 0x75 }, { CCI_REG8(0x5eb6), 0x75 },
-+	{ CCI_REG8(0x5eb7), 0x75 }, { CCI_REG8(0x5eb8), 0x75 },
-+	{ CCI_REG8(0x5eb9), 0x75 }, { CCI_REG8(0x5eba), 0x75 },
-+	{ CCI_REG8(0x5ebb), 0x75 }, { CCI_REG8(0x5ebc), 0x75 },
-+	{ CCI_REG8(0x5ebd), 0x75 }, { CCI_REG8(0x5ebe), 0x75 },
-+	{ CCI_REG8(0x5ebf), 0x75 }, { CCI_REG8(0x5ec0), 0x75 },
-+	{ CCI_REG8(0x5ec1), 0x75 }, { CCI_REG8(0x5ec2), 0x75 },
-+	{ CCI_REG8(0x5ec3), 0x75 }, { CCI_REG8(0x5ec4), 0x75 },
-+	{ CCI_REG8(0x5ec5), 0x75 }, { CCI_REG8(0x5ec6), 0x75 },
-+	{ CCI_REG8(0x5ec7), 0x75 }, { CCI_REG8(0x5ec8), 0x75 },
-+	{ CCI_REG8(0x5ec9), 0x75 }, { CCI_REG8(0x5eca), 0x75 },
-+	{ CCI_REG8(0x5ecb), 0x75 }, { CCI_REG8(0x5ecc), 0x75 },
-+	{ CCI_REG8(0x5ecd), 0x75 }, { CCI_REG8(0x5ece), 0x75 },
-+	{ CCI_REG8(0x5ecf), 0x75 }, { CCI_REG8(0x5ed0), 0x75 },
-+	{ CCI_REG8(0x5ed1), 0x75 }, { CCI_REG8(0x5ed2), 0x75 },
-+	{ CCI_REG8(0x5ed3), 0x75 }, { CCI_REG8(0x5ed4), 0x75 },
-+	{ CCI_REG8(0x5ed5), 0x75 }, { CCI_REG8(0x5ed6), 0x75 },
-+	{ CCI_REG8(0x5ed7), 0x75 }, { CCI_REG8(0x5ed8), 0x75 },
-+	{ CCI_REG8(0x5ed9), 0x75 }, { CCI_REG8(0x5eda), 0x75 },
-+	{ CCI_REG8(0x5edb), 0x75 }, { CCI_REG8(0x5edc), 0x75 },
-+	{ CCI_REG8(0x5edd), 0x75 }, { CCI_REG8(0x5ede), 0x75 },
-+	{ CCI_REG8(0x5edf), 0x75 }, { CCI_REG8(0xfff9), 0x08 },
-+	{ CCI_REG8(0x1570), 0x00 }, { CCI_REG8(0x15d0), 0x00 },
-+	{ CCI_REG8(0x15a0), 0x02 }, { CCI_REG8(0x15a1), 0x00 },
-+	{ CCI_REG8(0x15a2), 0x02 }, { CCI_REG8(0x15a3), 0x76 },
-+	{ CCI_REG8(0x15a4), 0x03 }, { CCI_REG8(0x15a5), 0x08 },
-+	{ CCI_REG8(0x15a6), 0x00 }, { CCI_REG8(0x15a7), 0x60 },
-+	{ CCI_REG8(0x15a8), 0x01 }, { CCI_REG8(0x15a9), 0x00 },
-+	{ CCI_REG8(0x15aa), 0x02 }, { CCI_REG8(0x15ab), 0x00 },
-+	{ CCI_REG8(0x1600), 0x02 }, { CCI_REG8(0x1601), 0x00 },
-+	{ CCI_REG8(0x1602), 0x02 }, { CCI_REG8(0x1603), 0x76 },
-+	{ CCI_REG8(0x1604), 0x03 }, { CCI_REG8(0x1605), 0x08 },
-+	{ CCI_REG8(0x1606), 0x00 }, { CCI_REG8(0x1607), 0x60 },
-+	{ CCI_REG8(0x1608), 0x01 }, { CCI_REG8(0x1609), 0x00 },
-+	{ CCI_REG8(0x160a), 0x02 }, { CCI_REG8(0x160b), 0x00 },
-+	{ CCI_REG8(0x1633), 0x03 }, { CCI_REG8(0x1634), 0x01 },
-+	{ CCI_REG8(0x163c), 0x3a }, { CCI_REG8(0x163d), 0x01 },
-+	{ CCI_REG8(0x1648), 0x32 }, { CCI_REG8(0x1658), 0x01 },
-+	{ CCI_REG8(0x1659), 0x01 }, { CCI_REG8(0x165f), 0x01 },
-+	{ CCI_REG8(0x1677), 0x01 }, { CCI_REG8(0x1690), 0x08 },
-+	{ CCI_REG8(0x1691), 0x00 }, { CCI_REG8(0x1692), 0x20 },
-+	{ CCI_REG8(0x1693), 0x00 }, { CCI_REG8(0x1694), 0x10 },
-+	{ CCI_REG8(0x1695), 0x14 }, { CCI_REG8(0x1696), 0x10 },
-+	{ CCI_REG8(0x1697), 0x0e }, { CCI_REG8(0x1730), 0x01 },
-+	{ CCI_REG8(0x1732), 0x00 }, { CCI_REG8(0x1733), 0x10 },
-+	{ CCI_REG8(0x1734), 0x01 }, { CCI_REG8(0x1735), 0x00 },
-+	{ CCI_REG8(0x1748), 0x01 }, { CCI_REG8(0xfff9), 0x06 },
-+	{ CCI_REG8(0x5000), 0xff }, { CCI_REG8(0x5001), 0x3d },
-+	{ CCI_REG8(0x5002), 0xf5 }, { CCI_REG8(0x5004), 0x80 },
-+	{ CCI_REG8(0x5006), 0x04 }, { CCI_REG8(0x5061), 0x20 },
-+	{ CCI_REG8(0x5063), 0x20 }, { CCI_REG8(0x5064), 0x24 },
-+	{ CCI_REG8(0x5065), 0x00 }, { CCI_REG8(0x5066), 0x1b },
-+	{ CCI_REG8(0x5067), 0x00 }, { CCI_REG8(0x5068), 0x03 },
-+	{ CCI_REG8(0x5069), 0x10 }, { CCI_REG8(0x506a), 0x20 },
-+	{ CCI_REG8(0x506b), 0x04 }, { CCI_REG8(0x506c), 0x04 },
-+	{ CCI_REG8(0x506d), 0x0c }, { CCI_REG8(0x506e), 0x0c },
-+	{ CCI_REG8(0x506f), 0x04 }, { CCI_REG8(0x5070), 0x0c },
-+	{ CCI_REG8(0x5071), 0x14 }, { CCI_REG8(0x5072), 0x1c },
-+	{ CCI_REG8(0x5073), 0x01 }, { CCI_REG8(0x5074), 0x01 },
-+	{ CCI_REG8(0x5075), 0xbe }, { CCI_REG8(0x5083), 0x00 },
-+	{ CCI_REG8(0x5114), 0x03 }, { CCI_REG8(0x51b0), 0x00 },
-+	{ CCI_REG8(0x51b3), 0x0e }, { CCI_REG8(0x51b5), 0x02 },
-+	{ CCI_REG8(0x51b6), 0x00 }, { CCI_REG8(0x51b7), 0x00 },
-+	{ CCI_REG8(0x51b8), 0x00 }, { CCI_REG8(0x51b9), 0x70 },
-+	{ CCI_REG8(0x51ba), 0x00 }, { CCI_REG8(0x51bb), 0x10 },
-+	{ CCI_REG8(0x51bc), 0x00 }, { CCI_REG8(0x51bd), 0x00 },
-+	{ CCI_REG8(0x51d2), 0xff }, { CCI_REG8(0x51d3), 0x1c },
-+	{ CCI_REG8(0x5250), 0x34 }, { CCI_REG8(0x5251), 0x00 },
-+	{ CCI_REG8(0x525b), 0x00 }, { CCI_REG8(0x525d), 0x00 },
-+	{ CCI_REG8(0x527a), 0x00 }, { CCI_REG8(0x527b), 0x38 },
-+	{ CCI_REG8(0x527c), 0x00 }, { CCI_REG8(0x527d), 0x4b },
-+	{ CCI_REG8(0x5286), 0x1b }, { CCI_REG8(0x5287), 0x40 },
-+	{ CCI_REG8(0x5290), 0x00 }, { CCI_REG8(0x5291), 0x50 },
-+	{ CCI_REG8(0x5292), 0x00 }, { CCI_REG8(0x5293), 0x50 },
-+	{ CCI_REG8(0x5294), 0x00 }, { CCI_REG8(0x5295), 0x50 },
-+	{ CCI_REG8(0x5296), 0x00 }, { CCI_REG8(0x5297), 0x50 },
-+	{ CCI_REG8(0x5298), 0x00 }, { CCI_REG8(0x5299), 0x50 },
-+	{ CCI_REG8(0x529a), 0x01 }, { CCI_REG8(0x529b), 0x00 },
-+	{ CCI_REG8(0x529c), 0x01 }, { CCI_REG8(0x529d), 0x00 },
-+	{ CCI_REG8(0x529e), 0x00 }, { CCI_REG8(0x529f), 0x50 },
-+	{ CCI_REG8(0x52a0), 0x00 }, { CCI_REG8(0x52a1), 0x50 },
-+	{ CCI_REG8(0x52a2), 0x01 }, { CCI_REG8(0x52a3), 0x00 },
-+	{ CCI_REG8(0x52a4), 0x01 }, { CCI_REG8(0x52a5), 0x00 },
-+	{ CCI_REG8(0x52a6), 0x00 }, { CCI_REG8(0x52a7), 0x50 },
-+	{ CCI_REG8(0x52a8), 0x00 }, { CCI_REG8(0x52a9), 0x50 },
-+	{ CCI_REG8(0x52aa), 0x00 }, { CCI_REG8(0x52ab), 0x50 },
-+	{ CCI_REG8(0x52ac), 0x00 }, { CCI_REG8(0x52ad), 0x50 },
-+	{ CCI_REG8(0x52ae), 0x00 }, { CCI_REG8(0x52af), 0x50 },
-+	{ CCI_REG8(0x52b0), 0x00 }, { CCI_REG8(0x52b1), 0x50 },
-+	{ CCI_REG8(0x52b2), 0x00 }, { CCI_REG8(0x52b3), 0x50 },
-+	{ CCI_REG8(0x52b4), 0x00 }, { CCI_REG8(0x52b5), 0x50 },
-+	{ CCI_REG8(0x52b6), 0x00 }, { CCI_REG8(0x52b7), 0x50 },
-+	{ CCI_REG8(0x52b8), 0x00 }, { CCI_REG8(0x52b9), 0x50 },
-+	{ CCI_REG8(0x52ba), 0x01 }, { CCI_REG8(0x52bb), 0x00 },
-+	{ CCI_REG8(0x52bc), 0x01 }, { CCI_REG8(0x52bd), 0x00 },
-+	{ CCI_REG8(0x52be), 0x00 }, { CCI_REG8(0x52bf), 0x50 },
-+	{ CCI_REG8(0x52c0), 0x00 }, { CCI_REG8(0x52c1), 0x50 },
-+	{ CCI_REG8(0x52c2), 0x01 }, { CCI_REG8(0x52c3), 0x00 },
-+	{ CCI_REG8(0x52c4), 0x01 }, { CCI_REG8(0x52c5), 0x00 },
-+	{ CCI_REG8(0x52c6), 0x00 }, { CCI_REG8(0x52c7), 0x50 },
-+	{ CCI_REG8(0x52c8), 0x00 }, { CCI_REG8(0x52c9), 0x50 },
-+	{ CCI_REG8(0x52ca), 0x00 }, { CCI_REG8(0x52cb), 0x50 },
-+	{ CCI_REG8(0x52cc), 0x00 }, { CCI_REG8(0x52cd), 0x50 },
-+	{ CCI_REG8(0x52ce), 0x00 }, { CCI_REG8(0x52cf), 0x50 },
-+	{ CCI_REG8(0x52f0), 0x04 }, { CCI_REG8(0x52f1), 0x03 },
-+	{ CCI_REG8(0x52f2), 0x02 }, { CCI_REG8(0x52f3), 0x01 },
-+	{ CCI_REG8(0x52f4), 0x08 }, { CCI_REG8(0x52f5), 0x07 },
-+	{ CCI_REG8(0x52f6), 0x06 }, { CCI_REG8(0x52f7), 0x05 },
-+	{ CCI_REG8(0x52f8), 0x0c }, { CCI_REG8(0x52f9), 0x0b },
-+	{ CCI_REG8(0x52fa), 0x0a }, { CCI_REG8(0x52fb), 0x09 },
-+	{ CCI_REG8(0x52fc), 0x10 }, { CCI_REG8(0x52fd), 0x0f },
-+	{ CCI_REG8(0x52fe), 0x0e }, { CCI_REG8(0x52ff), 0x0d },
-+	{ CCI_REG8(0x5300), 0x14 }, { CCI_REG8(0x5301), 0x13 },
-+	{ CCI_REG8(0x5302), 0x12 }, { CCI_REG8(0x5303), 0x11 },
-+	{ CCI_REG8(0x5304), 0x18 }, { CCI_REG8(0x5305), 0x17 },
-+	{ CCI_REG8(0x5306), 0x16 }, { CCI_REG8(0x5307), 0x15 },
-+	{ CCI_REG8(0x5308), 0x1c }, { CCI_REG8(0x5309), 0x1b },
-+	{ CCI_REG8(0x530a), 0x1a }, { CCI_REG8(0x530b), 0x19 },
-+	{ CCI_REG8(0x530c), 0x20 }, { CCI_REG8(0x530d), 0x1f },
-+	{ CCI_REG8(0x530e), 0x1e }, { CCI_REG8(0x530f), 0x1d },
-+	{ CCI_REG8(0x5310), 0x03 }, { CCI_REG8(0x5311), 0xe8 },
-+	{ CCI_REG8(0x5331), 0x0a }, { CCI_REG8(0x5332), 0x43 },
-+	{ CCI_REG8(0x5333), 0x45 }, { CCI_REG8(0x5353), 0x09 },
-+	{ CCI_REG8(0x5354), 0x00 }, { CCI_REG8(0x5414), 0x03 },
-+	{ CCI_REG8(0x54b0), 0x10 }, { CCI_REG8(0x54b3), 0x0e },
-+	{ CCI_REG8(0x54b5), 0x02 }, { CCI_REG8(0x54b6), 0x00 },
-+	{ CCI_REG8(0x54b7), 0x00 }, { CCI_REG8(0x54b8), 0x00 },
-+	{ CCI_REG8(0x54b9), 0x70 }, { CCI_REG8(0x54ba), 0x00 },
-+	{ CCI_REG8(0x54bb), 0x10 }, { CCI_REG8(0x54bc), 0x00 },
-+	{ CCI_REG8(0x54bd), 0x00 }, { CCI_REG8(0x54d2), 0xff },
-+	{ CCI_REG8(0x54d3), 0x1c }, { CCI_REG8(0x5510), 0x03 },
-+	{ CCI_REG8(0x5511), 0xe8 }, { CCI_REG8(0x5550), 0x6c },
-+	{ CCI_REG8(0x5551), 0x00 }, { CCI_REG8(0x557a), 0x00 },
-+	{ CCI_REG8(0x557b), 0x38 }, { CCI_REG8(0x557c), 0x00 },
-+	{ CCI_REG8(0x557d), 0x4b }, { CCI_REG8(0x5590), 0x00 },
-+	{ CCI_REG8(0x5591), 0x50 }, { CCI_REG8(0x5592), 0x00 },
-+	{ CCI_REG8(0x5593), 0x50 }, { CCI_REG8(0x5594), 0x00 },
-+	{ CCI_REG8(0x5595), 0x50 }, { CCI_REG8(0x5596), 0x00 },
-+	{ CCI_REG8(0x5597), 0x50 }, { CCI_REG8(0x5598), 0x00 },
-+	{ CCI_REG8(0x5599), 0x50 }, { CCI_REG8(0x559a), 0x01 },
-+	{ CCI_REG8(0x559b), 0x00 }, { CCI_REG8(0x559c), 0x01 },
-+	{ CCI_REG8(0x559d), 0x00 }, { CCI_REG8(0x559e), 0x00 },
-+	{ CCI_REG8(0x559f), 0x50 }, { CCI_REG8(0x55a0), 0x00 },
-+	{ CCI_REG8(0x55a1), 0x50 }, { CCI_REG8(0x55a2), 0x01 },
-+	{ CCI_REG8(0x55a3), 0x00 }, { CCI_REG8(0x55a4), 0x01 },
-+	{ CCI_REG8(0x55a5), 0x00 }, { CCI_REG8(0x55a6), 0x00 },
-+	{ CCI_REG8(0x55a7), 0x50 }, { CCI_REG8(0x55a8), 0x00 },
-+	{ CCI_REG8(0x55a9), 0x50 }, { CCI_REG8(0x55aa), 0x00 },
-+	{ CCI_REG8(0x55ab), 0x50 }, { CCI_REG8(0x55ac), 0x00 },
-+	{ CCI_REG8(0x55ad), 0x50 }, { CCI_REG8(0x55ae), 0x00 },
-+	{ CCI_REG8(0x55af), 0x50 }, { CCI_REG8(0x55b0), 0x00 },
-+	{ CCI_REG8(0x55b1), 0x50 }, { CCI_REG8(0x55b2), 0x00 },
-+	{ CCI_REG8(0x55b3), 0x50 }, { CCI_REG8(0x55b4), 0x00 },
-+	{ CCI_REG8(0x55b5), 0x50 }, { CCI_REG8(0x55b6), 0x00 },
-+	{ CCI_REG8(0x55b7), 0x50 }, { CCI_REG8(0x55b8), 0x00 },
-+	{ CCI_REG8(0x55b9), 0x50 }, { CCI_REG8(0x55ba), 0x01 },
-+	{ CCI_REG8(0x55bb), 0x00 }, { CCI_REG8(0x55bc), 0x01 },
-+	{ CCI_REG8(0x55bd), 0x00 }, { CCI_REG8(0x55be), 0x00 },
-+	{ CCI_REG8(0x55bf), 0x50 }, { CCI_REG8(0x55c0), 0x00 },
-+	{ CCI_REG8(0x55c1), 0x50 }, { CCI_REG8(0x55c2), 0x01 },
-+	{ CCI_REG8(0x55c3), 0x00 }, { CCI_REG8(0x55c4), 0x01 },
-+	{ CCI_REG8(0x55c5), 0x00 }, { CCI_REG8(0x55c6), 0x00 },
-+	{ CCI_REG8(0x55c7), 0x50 }, { CCI_REG8(0x55c8), 0x00 },
-+	{ CCI_REG8(0x55c9), 0x50 }, { CCI_REG8(0x55ca), 0x00 },
-+	{ CCI_REG8(0x55cb), 0x50 }, { CCI_REG8(0x55cc), 0x00 },
-+	{ CCI_REG8(0x55cd), 0x50 }, { CCI_REG8(0x55ce), 0x00 },
-+	{ CCI_REG8(0x55cf), 0x50 }, { CCI_REG8(0x55f0), 0x04 },
-+	{ CCI_REG8(0x55f1), 0x03 }, { CCI_REG8(0x55f2), 0x02 },
-+	{ CCI_REG8(0x55f3), 0x01 }, { CCI_REG8(0x55f4), 0x08 },
-+	{ CCI_REG8(0x55f5), 0x07 }, { CCI_REG8(0x55f6), 0x06 },
-+	{ CCI_REG8(0x55f7), 0x05 }, { CCI_REG8(0x55f8), 0x0c },
-+	{ CCI_REG8(0x55f9), 0x0b }, { CCI_REG8(0x55fa), 0x0a },
-+	{ CCI_REG8(0x55fb), 0x09 }, { CCI_REG8(0x55fc), 0x10 },
-+	{ CCI_REG8(0x55fd), 0x0f }, { CCI_REG8(0x55fe), 0x0e },
-+	{ CCI_REG8(0x55ff), 0x0d }, { CCI_REG8(0x5600), 0x14 },
-+	{ CCI_REG8(0x5601), 0x13 }, { CCI_REG8(0x5602), 0x12 },
-+	{ CCI_REG8(0x5603), 0x11 }, { CCI_REG8(0x5604), 0x18 },
-+	{ CCI_REG8(0x5605), 0x17 }, { CCI_REG8(0x5606), 0x16 },
-+	{ CCI_REG8(0x5607), 0x15 }, { CCI_REG8(0x5608), 0x1c },
-+	{ CCI_REG8(0x5609), 0x1b }, { CCI_REG8(0x560a), 0x1a },
-+	{ CCI_REG8(0x560b), 0x19 }, { CCI_REG8(0x560c), 0x20 },
-+	{ CCI_REG8(0x560d), 0x1f }, { CCI_REG8(0x560e), 0x1e },
-+	{ CCI_REG8(0x560f), 0x1d }, { CCI_REG8(0x5631), 0x02 },
-+	{ CCI_REG8(0x5632), 0x42 }, { CCI_REG8(0x5633), 0x24 },
-+	{ CCI_REG8(0x5653), 0x09 }, { CCI_REG8(0x5654), 0x00 },
-+	{ CCI_REG8(0x5714), 0x03 }, { CCI_REG8(0x57b0), 0x10 },
-+	{ CCI_REG8(0x57b3), 0x0e }, { CCI_REG8(0x57b5), 0x02 },
-+	{ CCI_REG8(0x57b6), 0x00 }, { CCI_REG8(0x57b7), 0x00 },
-+	{ CCI_REG8(0x57b8), 0x00 }, { CCI_REG8(0x57b9), 0x70 },
-+	{ CCI_REG8(0x57ba), 0x00 }, { CCI_REG8(0x57bb), 0x10 },
-+	{ CCI_REG8(0x57bc), 0x00 }, { CCI_REG8(0x57bd), 0x00 },
-+	{ CCI_REG8(0x57d2), 0xff }, { CCI_REG8(0x57d3), 0x1c },
-+	{ CCI_REG8(0x5810), 0x03 }, { CCI_REG8(0x5811), 0xe8 },
-+	{ CCI_REG8(0x5850), 0x6c }, { CCI_REG8(0x5851), 0x00 },
-+	{ CCI_REG8(0x587a), 0x00 }, { CCI_REG8(0x587b), 0x38 },
-+	{ CCI_REG8(0x587c), 0x00 }, { CCI_REG8(0x587d), 0x4b },
-+	{ CCI_REG8(0x5890), 0x00 }, { CCI_REG8(0x5891), 0x50 },
-+	{ CCI_REG8(0x5892), 0x00 }, { CCI_REG8(0x5893), 0x50 },
-+	{ CCI_REG8(0x5894), 0x00 }, { CCI_REG8(0x5895), 0x50 },
-+	{ CCI_REG8(0x5896), 0x00 }, { CCI_REG8(0x5897), 0x50 },
-+	{ CCI_REG8(0x5898), 0x00 }, { CCI_REG8(0x5899), 0x50 },
-+	{ CCI_REG8(0x589a), 0x01 }, { CCI_REG8(0x589b), 0x00 },
-+	{ CCI_REG8(0x589c), 0x01 }, { CCI_REG8(0x589d), 0x00 },
-+	{ CCI_REG8(0x589e), 0x00 }, { CCI_REG8(0x589f), 0x50 },
-+	{ CCI_REG8(0x58a0), 0x00 }, { CCI_REG8(0x58a1), 0x50 },
-+	{ CCI_REG8(0x58a2), 0x01 }, { CCI_REG8(0x58a3), 0x00 },
-+	{ CCI_REG8(0x58a4), 0x01 }, { CCI_REG8(0x58a5), 0x00 },
-+	{ CCI_REG8(0x58a6), 0x00 }, { CCI_REG8(0x58a7), 0x50 },
-+	{ CCI_REG8(0x58a8), 0x00 }, { CCI_REG8(0x58a9), 0x50 },
-+	{ CCI_REG8(0x58aa), 0x00 }, { CCI_REG8(0x58ab), 0x50 },
-+	{ CCI_REG8(0x58ac), 0x00 }, { CCI_REG8(0x58ad), 0x50 },
-+	{ CCI_REG8(0x58ae), 0x00 }, { CCI_REG8(0x58af), 0x50 },
-+	{ CCI_REG8(0x58b0), 0x00 }, { CCI_REG8(0x58b1), 0x50 },
-+	{ CCI_REG8(0x58b2), 0x00 }, { CCI_REG8(0x58b3), 0x50 },
-+	{ CCI_REG8(0x58b4), 0x00 }, { CCI_REG8(0x58b5), 0x50 },
-+	{ CCI_REG8(0x58b6), 0x00 }, { CCI_REG8(0x58b7), 0x50 },
-+	{ CCI_REG8(0x58b8), 0x00 }, { CCI_REG8(0x58b9), 0x50 },
-+	{ CCI_REG8(0x58ba), 0x01 }, { CCI_REG8(0x58bb), 0x00 },
-+	{ CCI_REG8(0x58bc), 0x01 }, { CCI_REG8(0x58bd), 0x00 },
-+	{ CCI_REG8(0x58be), 0x00 }, { CCI_REG8(0x58bf), 0x50 },
-+	{ CCI_REG8(0x58c0), 0x00 }, { CCI_REG8(0x58c1), 0x50 },
-+	{ CCI_REG8(0x58c2), 0x01 }, { CCI_REG8(0x58c3), 0x00 },
-+	{ CCI_REG8(0x58c4), 0x01 }, { CCI_REG8(0x58c5), 0x00 },
-+	{ CCI_REG8(0x58c6), 0x00 }, { CCI_REG8(0x58c7), 0x50 },
-+	{ CCI_REG8(0x58c8), 0x00 }, { CCI_REG8(0x58c9), 0x50 },
-+	{ CCI_REG8(0x58ca), 0x00 }, { CCI_REG8(0x58cb), 0x50 },
-+	{ CCI_REG8(0x58cc), 0x00 }, { CCI_REG8(0x58cd), 0x50 },
-+	{ CCI_REG8(0x58ce), 0x00 }, { CCI_REG8(0x58cf), 0x50 },
-+	{ CCI_REG8(0x58f0), 0x04 }, { CCI_REG8(0x58f1), 0x03 },
-+	{ CCI_REG8(0x58f2), 0x02 }, { CCI_REG8(0x58f3), 0x01 },
-+	{ CCI_REG8(0x58f4), 0x08 }, { CCI_REG8(0x58f5), 0x07 },
-+	{ CCI_REG8(0x58f6), 0x06 }, { CCI_REG8(0x58f7), 0x05 },
-+	{ CCI_REG8(0x58f8), 0x0c }, { CCI_REG8(0x58f9), 0x0b },
-+	{ CCI_REG8(0x58fa), 0x0a }, { CCI_REG8(0x58fb), 0x09 },
-+	{ CCI_REG8(0x58fc), 0x10 }, { CCI_REG8(0x58fd), 0x0f },
-+	{ CCI_REG8(0x58fe), 0x0e }, { CCI_REG8(0x58ff), 0x0d },
-+	{ CCI_REG8(0x5900), 0x14 }, { CCI_REG8(0x5901), 0x13 },
-+	{ CCI_REG8(0x5902), 0x12 }, { CCI_REG8(0x5903), 0x11 },
-+	{ CCI_REG8(0x5904), 0x18 }, { CCI_REG8(0x5905), 0x17 },
-+	{ CCI_REG8(0x5906), 0x16 }, { CCI_REG8(0x5907), 0x15 },
-+	{ CCI_REG8(0x5908), 0x1c }, { CCI_REG8(0x5909), 0x1b },
-+	{ CCI_REG8(0x590a), 0x1a }, { CCI_REG8(0x590b), 0x19 },
-+	{ CCI_REG8(0x590c), 0x20 }, { CCI_REG8(0x590d), 0x1f },
-+	{ CCI_REG8(0x590e), 0x1e }, { CCI_REG8(0x590f), 0x1d },
-+	{ CCI_REG8(0x5931), 0x02 }, { CCI_REG8(0x5932), 0x42 },
-+	{ CCI_REG8(0x5933), 0x24 }, { CCI_REG8(0x5953), 0x09 },
-+	{ CCI_REG8(0x5954), 0x00 }, { CCI_REG8(0x5989), 0x84 },
-+	{ CCI_REG8(0x59c3), 0x04 }, { CCI_REG8(0x59c4), 0x24 },
-+	{ CCI_REG8(0x59c5), 0x40 }, { CCI_REG8(0x59c6), 0x1b },
-+	{ CCI_REG8(0x59c7), 0x40 }, { CCI_REG8(0x5a02), 0x0f },
-+	{ CCI_REG8(0x5f00), 0x29 }, { CCI_REG8(0x5f2d), 0x28 },
-+	{ CCI_REG8(0x5f2e), 0x28 }, { CCI_REG8(0x6801), 0x11 },
-+	{ CCI_REG8(0x6802), 0x3f }, { CCI_REG8(0x6803), 0xe7 },
-+	{ CCI_REG8(0x6825), 0x0f }, { CCI_REG8(0x6826), 0x20 },
-+	{ CCI_REG8(0x6827), 0x00 }, { CCI_REG8(0x6829), 0x16 },
-+	{ CCI_REG8(0x682b), 0xb3 }, { CCI_REG8(0x682c), 0x01 },
-+	{ CCI_REG8(0x6832), 0xff }, { CCI_REG8(0x6833), 0xff },
-+	{ CCI_REG8(0x6898), 0x80 }, { CCI_REG8(0x6899), 0x80 },
-+	{ CCI_REG8(0x689b), 0x40 }, { CCI_REG8(0x689c), 0x20 },
-+	{ CCI_REG8(0x689d), 0x20 }, { CCI_REG8(0x689e), 0x80 },
-+	{ CCI_REG8(0x689f), 0x60 }, { CCI_REG8(0x68a0), 0x40 },
-+	{ CCI_REG8(0x68a4), 0x40 }, { CCI_REG8(0x68a5), 0x20 },
-+	{ CCI_REG8(0x68a6), 0x00 }, { CCI_REG8(0x68b6), 0x80 },
-+	{ CCI_REG8(0x68b7), 0x80 }, { CCI_REG8(0x68b8), 0x80 },
-+	{ CCI_REG8(0x68bc), 0x80 }, { CCI_REG8(0x68bd), 0x80 },
-+	{ CCI_REG8(0x68be), 0x80 }, { CCI_REG8(0x68bf), 0x40 },
-+	{ CCI_REG8(0x68c2), 0x80 }, { CCI_REG8(0x68c3), 0x80 },
-+	{ CCI_REG8(0x68c4), 0x60 }, { CCI_REG8(0x68c5), 0x30 },
-+	{ CCI_REG8(0x6918), 0x80 }, { CCI_REG8(0x6919), 0x80 },
-+	{ CCI_REG8(0x691b), 0x40 }, { CCI_REG8(0x691c), 0x20 },
-+	{ CCI_REG8(0x691d), 0x20 }, { CCI_REG8(0x691e), 0x80 },
-+	{ CCI_REG8(0x691f), 0x60 }, { CCI_REG8(0x6920), 0x40 },
-+	{ CCI_REG8(0x6924), 0x40 }, { CCI_REG8(0x6925), 0x20 },
-+	{ CCI_REG8(0x6926), 0x00 }, { CCI_REG8(0x6936), 0x40 },
-+	{ CCI_REG8(0x6937), 0x40 }, { CCI_REG8(0x6938), 0x20 },
-+	{ CCI_REG8(0x6939), 0x20 }, { CCI_REG8(0x693a), 0x10 },
-+	{ CCI_REG8(0x693b), 0x10 }, { CCI_REG8(0x693c), 0x20 },
-+	{ CCI_REG8(0x693d), 0x20 }, { CCI_REG8(0x693e), 0x10 },
-+	{ CCI_REG8(0x693f), 0x10 }, { CCI_REG8(0x6940), 0x00 },
-+	{ CCI_REG8(0x6941), 0x00 }, { CCI_REG8(0x6942), 0x08 },
-+	{ CCI_REG8(0x6943), 0x08 }, { CCI_REG8(0x6944), 0x00 },
-+	{ CCI_REG8(0x69c2), 0x07 }, { CCI_REG8(0x6a20), 0x01 },
-+	{ CCI_REG8(0x6a23), 0x10 }, { CCI_REG8(0x6a26), 0x3d },
-+	{ CCI_REG8(0x6a27), 0x3e }, { CCI_REG8(0x6a38), 0x02 },
-+	{ CCI_REG8(0x6a39), 0x20 }, { CCI_REG8(0x6a3a), 0x02 },
-+	{ CCI_REG8(0x6a3b), 0x84 }, { CCI_REG8(0x6a3e), 0x02 },
-+	{ CCI_REG8(0x6a3f), 0x20 }, { CCI_REG8(0x6a47), 0x3b },
-+	{ CCI_REG8(0x6a63), 0x04 }, { CCI_REG8(0x6a65), 0x00 },
-+	{ CCI_REG8(0x6a67), 0x0f }, { CCI_REG8(0x6b22), 0x07 },
-+	{ CCI_REG8(0x6b23), 0xc2 }, { CCI_REG8(0x6b2f), 0x00 },
-+	{ CCI_REG8(0x6b60), 0x1f }, { CCI_REG8(0x6bd2), 0x5a },
-+	{ CCI_REG8(0x6c20), 0x50 }, { CCI_REG8(0x6c60), 0x50 },
-+	{ CCI_REG8(0x6c61), 0x06 }, { CCI_REG8(0x7318), 0x04 },
-+	{ CCI_REG8(0x7319), 0x01 }, { CCI_REG8(0x731a), 0x04 },
-+	{ CCI_REG8(0x731b), 0x01 }, { CCI_REG8(0x731c), 0x00 },
-+	{ CCI_REG8(0x731d), 0x00 }, { CCI_REG8(0x731e), 0x04 },
-+	{ CCI_REG8(0x731f), 0x01 }, { CCI_REG8(0x7320), 0x04 },
-+	{ CCI_REG8(0x7321), 0x00 }, { CCI_REG8(0x7322), 0x04 },
-+	{ CCI_REG8(0x7323), 0x00 }, { CCI_REG8(0x7324), 0x04 },
-+	{ CCI_REG8(0x7325), 0x00 }, { CCI_REG8(0x7326), 0x04 },
-+	{ CCI_REG8(0x7327), 0x00 }, { CCI_REG8(0x7600), 0x00 },
-+	{ CCI_REG8(0x7601), 0x00 }, { CCI_REG8(0x7602), 0x10 },
-+	{ CCI_REG8(0x7603), 0x00 }, { CCI_REG8(0x7604), 0x00 },
-+	{ CCI_REG8(0x7605), 0x00 }, { CCI_REG8(0x7606), 0x10 },
-+	{ CCI_REG8(0x7607), 0x00 }, { CCI_REG8(0x7608), 0x00 },
-+	{ CCI_REG8(0x7609), 0x00 }, { CCI_REG8(0x760a), 0x10 },
-+	{ CCI_REG8(0x760b), 0x00 }, { CCI_REG8(0x760c), 0x00 },
-+	{ CCI_REG8(0x760d), 0x00 }, { CCI_REG8(0x760e), 0x10 },
-+	{ CCI_REG8(0x760f), 0x00 }, { CCI_REG8(0x7610), 0x00 },
-+	{ CCI_REG8(0x7611), 0x00 }, { CCI_REG8(0x7612), 0x10 },
-+	{ CCI_REG8(0x7613), 0x00 }, { CCI_REG8(0x7614), 0x00 },
-+	{ CCI_REG8(0x7615), 0x00 }, { CCI_REG8(0x7616), 0x10 },
-+	{ CCI_REG8(0x7617), 0x00 }, { CCI_REG8(0x7618), 0x00 },
-+	{ CCI_REG8(0x7619), 0x00 }, { CCI_REG8(0x761a), 0x10 },
-+	{ CCI_REG8(0x761b), 0x00 }, { CCI_REG8(0x761c), 0x00 },
-+	{ CCI_REG8(0x761d), 0x00 }, { CCI_REG8(0x761e), 0x10 },
-+	{ CCI_REG8(0x761f), 0x00 }, { CCI_REG8(0x7620), 0x00 },
-+	{ CCI_REG8(0x7621), 0x00 }, { CCI_REG8(0x7622), 0x10 },
-+	{ CCI_REG8(0x7623), 0x00 }, { CCI_REG8(0x7624), 0x00 },
-+	{ CCI_REG8(0x7625), 0x00 }, { CCI_REG8(0x7626), 0x10 },
-+	{ CCI_REG8(0x7627), 0x00 }, { CCI_REG8(0x7628), 0x00 },
-+	{ CCI_REG8(0x7629), 0x00 }, { CCI_REG8(0x762a), 0x10 },
-+	{ CCI_REG8(0x762b), 0x00 }, { CCI_REG8(0x762c), 0x00 },
-+	{ CCI_REG8(0x762d), 0x00 }, { CCI_REG8(0x762e), 0x10 },
-+	{ CCI_REG8(0x762f), 0x00 }, { CCI_REG8(0x7630), 0x00 },
-+	{ CCI_REG8(0x7631), 0x00 }, { CCI_REG8(0x7632), 0x10 },
-+	{ CCI_REG8(0x7633), 0x00 }, { CCI_REG8(0x7634), 0x00 },
-+	{ CCI_REG8(0x7635), 0x00 }, { CCI_REG8(0x7636), 0x10 },
-+	{ CCI_REG8(0x7637), 0x00 }, { CCI_REG8(0x7638), 0x00 },
-+	{ CCI_REG8(0x7639), 0x00 }, { CCI_REG8(0x763a), 0x10 },
-+	{ CCI_REG8(0x763b), 0x00 }, { CCI_REG8(0x763c), 0x00 },
-+	{ CCI_REG8(0x763d), 0x00 }, { CCI_REG8(0x763e), 0x10 },
-+	{ CCI_REG8(0x763f), 0x00 }, { CCI_REG8(0x7640), 0x00 },
-+	{ CCI_REG8(0x7641), 0x00 }, { CCI_REG8(0x7642), 0x10 },
-+	{ CCI_REG8(0x7643), 0x00 }, { CCI_REG8(0x7644), 0x00 },
-+	{ CCI_REG8(0x7645), 0x00 }, { CCI_REG8(0x7646), 0x10 },
-+	{ CCI_REG8(0x7647), 0x00 }, { CCI_REG8(0x7648), 0x00 },
-+	{ CCI_REG8(0x7649), 0x00 }, { CCI_REG8(0x764a), 0x10 },
-+	{ CCI_REG8(0x764b), 0x00 }, { CCI_REG8(0x764c), 0x00 },
-+	{ CCI_REG8(0x764d), 0x00 }, { CCI_REG8(0x764e), 0x10 },
-+	{ CCI_REG8(0x764f), 0x00 }, { CCI_REG8(0x7650), 0x00 },
-+	{ CCI_REG8(0x7651), 0x00 }, { CCI_REG8(0x7652), 0x10 },
-+	{ CCI_REG8(0x7653), 0x00 }, { CCI_REG8(0x7654), 0x00 },
-+	{ CCI_REG8(0x7655), 0x00 }, { CCI_REG8(0x7656), 0x10 },
-+	{ CCI_REG8(0x7657), 0x00 }, { CCI_REG8(0x7658), 0x00 },
-+	{ CCI_REG8(0x7659), 0x00 }, { CCI_REG8(0x765a), 0x10 },
-+	{ CCI_REG8(0x765b), 0x00 }, { CCI_REG8(0x765c), 0x00 },
-+	{ CCI_REG8(0x765d), 0x00 }, { CCI_REG8(0x765e), 0x10 },
-+	{ CCI_REG8(0x765f), 0x00 }, { CCI_REG8(0x7660), 0x00 },
-+	{ CCI_REG8(0x7661), 0x00 }, { CCI_REG8(0x7662), 0x10 },
-+	{ CCI_REG8(0x7663), 0x00 }, { CCI_REG8(0x7664), 0x00 },
-+	{ CCI_REG8(0x7665), 0x00 }, { CCI_REG8(0x7666), 0x10 },
-+	{ CCI_REG8(0x7667), 0x00 }, { CCI_REG8(0x7668), 0x00 },
-+	{ CCI_REG8(0x7669), 0x00 }, { CCI_REG8(0x766a), 0x10 },
-+	{ CCI_REG8(0x766b), 0x00 }, { CCI_REG8(0x766c), 0x00 },
-+	{ CCI_REG8(0x766d), 0x00 }, { CCI_REG8(0x766e), 0x10 },
-+	{ CCI_REG8(0x766f), 0x00 }, { CCI_REG8(0x7670), 0x00 },
-+	{ CCI_REG8(0x7671), 0x00 }, { CCI_REG8(0x7672), 0x10 },
-+	{ CCI_REG8(0x7673), 0x00 }, { CCI_REG8(0x7674), 0x00 },
-+	{ CCI_REG8(0x7675), 0x00 }, { CCI_REG8(0x7676), 0x10 },
-+	{ CCI_REG8(0x7677), 0x00 }, { CCI_REG8(0x7678), 0x00 },
-+	{ CCI_REG8(0x7679), 0x00 }, { CCI_REG8(0x767a), 0x10 },
-+	{ CCI_REG8(0x767b), 0x00 }, { CCI_REG8(0x767c), 0x00 },
-+	{ CCI_REG8(0x767d), 0x00 }, { CCI_REG8(0x767e), 0x10 },
-+	{ CCI_REG8(0x767f), 0x00 }, { CCI_REG8(0x7680), 0x00 },
-+	{ CCI_REG8(0x7681), 0x00 }, { CCI_REG8(0x7682), 0x10 },
-+	{ CCI_REG8(0x7683), 0x00 }, { CCI_REG8(0x7684), 0x00 },
-+	{ CCI_REG8(0x7685), 0x00 }, { CCI_REG8(0x7686), 0x10 },
-+	{ CCI_REG8(0x7687), 0x00 }, { CCI_REG8(0x7688), 0x00 },
-+	{ CCI_REG8(0x7689), 0x00 }, { CCI_REG8(0x768a), 0x10 },
-+	{ CCI_REG8(0x768b), 0x00 }, { CCI_REG8(0x768c), 0x00 },
-+	{ CCI_REG8(0x768d), 0x00 }, { CCI_REG8(0x768e), 0x10 },
-+	{ CCI_REG8(0x768f), 0x00 }, { CCI_REG8(0x7690), 0x00 },
-+	{ CCI_REG8(0x7691), 0x00 }, { CCI_REG8(0x7692), 0x10 },
-+	{ CCI_REG8(0x7693), 0x00 }, { CCI_REG8(0x7694), 0x00 },
-+	{ CCI_REG8(0x7695), 0x00 }, { CCI_REG8(0x7696), 0x10 },
-+	{ CCI_REG8(0x7697), 0x00 }, { CCI_REG8(0x7698), 0x00 },
-+	{ CCI_REG8(0x7699), 0x00 }, { CCI_REG8(0x769a), 0x10 },
-+	{ CCI_REG8(0x769b), 0x00 }, { CCI_REG8(0x769c), 0x00 },
-+	{ CCI_REG8(0x769d), 0x00 }, { CCI_REG8(0x769e), 0x10 },
-+	{ CCI_REG8(0x769f), 0x00 }, { CCI_REG8(0x76a0), 0x00 },
-+	{ CCI_REG8(0x76a1), 0x00 }, { CCI_REG8(0x76a2), 0x10 },
-+	{ CCI_REG8(0x76a3), 0x00 }, { CCI_REG8(0x76a4), 0x00 },
-+	{ CCI_REG8(0x76a5), 0x00 }, { CCI_REG8(0x76a6), 0x10 },
-+	{ CCI_REG8(0x76a7), 0x00 }, { CCI_REG8(0x76a8), 0x00 },
-+	{ CCI_REG8(0x76a9), 0x00 }, { CCI_REG8(0x76aa), 0x10 },
-+	{ CCI_REG8(0x76ab), 0x00 }, { CCI_REG8(0x76ac), 0x00 },
-+	{ CCI_REG8(0x76ad), 0x00 }, { CCI_REG8(0x76ae), 0x10 },
-+	{ CCI_REG8(0x76af), 0x00 }, { CCI_REG8(0x76b0), 0x00 },
-+	{ CCI_REG8(0x76b1), 0x00 }, { CCI_REG8(0x76b2), 0x10 },
-+	{ CCI_REG8(0x76b3), 0x00 }, { CCI_REG8(0x76b4), 0x00 },
-+	{ CCI_REG8(0x76b5), 0x00 }, { CCI_REG8(0x76b6), 0x10 },
-+	{ CCI_REG8(0x76b7), 0x00 }, { CCI_REG8(0x76b8), 0x00 },
-+	{ CCI_REG8(0x76b9), 0x00 }, { CCI_REG8(0x76ba), 0x10 },
-+	{ CCI_REG8(0x76bb), 0x00 }, { CCI_REG8(0x76bc), 0x00 },
-+	{ CCI_REG8(0x76bd), 0x00 }, { CCI_REG8(0x76be), 0x10 },
-+	{ CCI_REG8(0x76bf), 0x00 }, { CCI_REG8(0x76c0), 0x00 },
-+	{ CCI_REG8(0x76c1), 0x00 }, { CCI_REG8(0x76c2), 0x10 },
-+	{ CCI_REG8(0x76c3), 0x00 }, { CCI_REG8(0x76c4), 0x00 },
-+	{ CCI_REG8(0x76c5), 0x00 }, { CCI_REG8(0x76c6), 0x10 },
-+	{ CCI_REG8(0x76c7), 0x00 }, { CCI_REG8(0x76c8), 0x00 },
-+	{ CCI_REG8(0x76c9), 0x00 }, { CCI_REG8(0x76ca), 0x10 },
-+	{ CCI_REG8(0x76cb), 0x00 }, { CCI_REG8(0x76cc), 0x00 },
-+	{ CCI_REG8(0x76cd), 0x00 }, { CCI_REG8(0x76ce), 0x10 },
-+	{ CCI_REG8(0x76cf), 0x00 }, { CCI_REG8(0x76d0), 0x00 },
-+	{ CCI_REG8(0x76d1), 0x00 }, { CCI_REG8(0x76d2), 0x10 },
-+	{ CCI_REG8(0x76d3), 0x00 }, { CCI_REG8(0x76d4), 0x00 },
-+	{ CCI_REG8(0x76d5), 0x00 }, { CCI_REG8(0x76d6), 0x10 },
-+	{ CCI_REG8(0x76d7), 0x00 }, { CCI_REG8(0x76d8), 0x00 },
-+	{ CCI_REG8(0x76d9), 0x00 }, { CCI_REG8(0x76da), 0x10 },
-+	{ CCI_REG8(0x76db), 0x00 }, { CCI_REG8(0x76dc), 0x00 },
-+	{ CCI_REG8(0x76dd), 0x00 }, { CCI_REG8(0x76de), 0x10 },
-+	{ CCI_REG8(0x76df), 0x00 }, { CCI_REG8(0x76e0), 0x00 },
-+	{ CCI_REG8(0x76e1), 0x00 }, { CCI_REG8(0x76e2), 0x10 },
-+	{ CCI_REG8(0x76e3), 0x00 }, { CCI_REG8(0x76e4), 0x00 },
-+	{ CCI_REG8(0x76e5), 0x00 }, { CCI_REG8(0x76e6), 0x10 },
-+	{ CCI_REG8(0x76e7), 0x00 }, { CCI_REG8(0x76e8), 0x00 },
-+	{ CCI_REG8(0x76e9), 0x00 }, { CCI_REG8(0x76ea), 0x10 },
-+	{ CCI_REG8(0x76eb), 0x00 }, { CCI_REG8(0x76ec), 0x00 },
-+	{ CCI_REG8(0x76ed), 0x00 }, { CCI_REG8(0x76ee), 0x10 },
-+	{ CCI_REG8(0x76ef), 0x00 }, { CCI_REG8(0x76f0), 0x00 },
-+	{ CCI_REG8(0x76f1), 0x00 }, { CCI_REG8(0x76f2), 0x10 },
-+	{ CCI_REG8(0x76f3), 0x00 }, { CCI_REG8(0x76f4), 0x00 },
-+	{ CCI_REG8(0x76f5), 0x00 }, { CCI_REG8(0x76f6), 0x10 },
-+	{ CCI_REG8(0x76f7), 0x00 }, { CCI_REG8(0x76f8), 0x00 },
-+	{ CCI_REG8(0x76f9), 0x00 }, { CCI_REG8(0x76fa), 0x10 },
-+	{ CCI_REG8(0x76fb), 0x00 }, { CCI_REG8(0x76fc), 0x00 },
-+	{ CCI_REG8(0x76fd), 0x00 }, { CCI_REG8(0x76fe), 0x10 },
-+	{ CCI_REG8(0x76ff), 0x00 }, { CCI_REG8(0x7700), 0x00 },
-+	{ CCI_REG8(0x7701), 0x00 }, { CCI_REG8(0x7702), 0x10 },
-+	{ CCI_REG8(0x7703), 0x00 }, { CCI_REG8(0x7704), 0x00 },
-+	{ CCI_REG8(0x7705), 0x00 }, { CCI_REG8(0x7706), 0x10 },
-+	{ CCI_REG8(0x7707), 0x00 }, { CCI_REG8(0x7708), 0x00 },
-+	{ CCI_REG8(0x7709), 0x00 }, { CCI_REG8(0x770a), 0x10 },
-+	{ CCI_REG8(0x770b), 0x00 }, { CCI_REG8(0x770c), 0x00 },
-+	{ CCI_REG8(0x770d), 0x00 }, { CCI_REG8(0x770e), 0x10 },
-+	{ CCI_REG8(0x770f), 0x00 }, { CCI_REG8(0x7710), 0x00 },
-+	{ CCI_REG8(0x7711), 0x00 }, { CCI_REG8(0x7712), 0x10 },
-+	{ CCI_REG8(0x7713), 0x00 }, { CCI_REG8(0x7714), 0x00 },
-+	{ CCI_REG8(0x7715), 0x00 }, { CCI_REG8(0x7716), 0x10 },
-+	{ CCI_REG8(0x7717), 0x00 }, { CCI_REG8(0x7718), 0x00 },
-+	{ CCI_REG8(0x7719), 0x00 }, { CCI_REG8(0x771a), 0x10 },
-+	{ CCI_REG8(0x771b), 0x00 }, { CCI_REG8(0x771c), 0x00 },
-+	{ CCI_REG8(0x771d), 0x00 }, { CCI_REG8(0x771e), 0x10 },
-+	{ CCI_REG8(0x771f), 0x00 }, { CCI_REG8(0x7720), 0x00 },
-+	{ CCI_REG8(0x7721), 0x00 }, { CCI_REG8(0x7722), 0x10 },
-+	{ CCI_REG8(0x7723), 0x00 }, { CCI_REG8(0x7724), 0x00 },
-+	{ CCI_REG8(0x7725), 0x00 }, { CCI_REG8(0x7726), 0x10 },
-+	{ CCI_REG8(0x7727), 0x00 }, { CCI_REG8(0x7728), 0x00 },
-+	{ CCI_REG8(0x7729), 0x00 }, { CCI_REG8(0x772a), 0x10 },
-+	{ CCI_REG8(0x772b), 0x00 }, { CCI_REG8(0x772c), 0x00 },
-+	{ CCI_REG8(0x772d), 0x00 }, { CCI_REG8(0x772e), 0x10 },
-+	{ CCI_REG8(0x772f), 0x00 }, { CCI_REG8(0x7730), 0x00 },
-+	{ CCI_REG8(0x7731), 0x00 }, { CCI_REG8(0x7732), 0x10 },
-+	{ CCI_REG8(0x7733), 0x00 }, { CCI_REG8(0x7734), 0x00 },
-+	{ CCI_REG8(0x7735), 0x00 }, { CCI_REG8(0x7736), 0x10 },
-+	{ CCI_REG8(0x7737), 0x00 }, { CCI_REG8(0x7738), 0x00 },
-+	{ CCI_REG8(0x7739), 0x00 }, { CCI_REG8(0x773a), 0x10 },
-+	{ CCI_REG8(0x773b), 0x00 }, { CCI_REG8(0x773c), 0x00 },
-+	{ CCI_REG8(0x773d), 0x00 }, { CCI_REG8(0x773e), 0x10 },
-+	{ CCI_REG8(0x773f), 0x00 }, { CCI_REG8(0x7740), 0x00 },
-+	{ CCI_REG8(0x7741), 0x00 }, { CCI_REG8(0x7742), 0x10 },
-+	{ CCI_REG8(0x7743), 0x00 }, { CCI_REG8(0x3421), 0x02 },
-+	{ CCI_REG8(0x37d0), 0x00 }, { CCI_REG8(0x3632), 0x99 },
-+	{ CCI_REG8(0xc518), 0x1f }, { CCI_REG8(0xc519), 0x1f },
-+	{ CCI_REG8(0xc51a), 0x1f }, { CCI_REG8(0xc51b), 0x1f },
-+	{ CCI_REG8(0xc51c), 0x1f }, { CCI_REG8(0xc51d), 0x1f },
-+	{ CCI_REG8(0xc51e), 0x1f }, { CCI_REG8(0xc51f), 0x1f },
-+	{ CCI_REG8(0xc520), 0x1f }, { CCI_REG8(0xc521), 0x1f },
-+	{ CCI_REG8(0x3616), 0xa0 }, { CCI_REG8(0x3615), 0xc5 },
-+	{ CCI_REG8(0xc4c1), 0x02 }, { CCI_REG8(0xc4c2), 0x02 },
-+	{ CCI_REG8(0xc4c3), 0x03 }, { CCI_REG8(0xc4c4), 0x03 },
-+	{ CCI_REG8(0xc4f6), 0x0a }, { CCI_REG8(0xc4f7), 0x0a },
-+	{ CCI_REG8(0xc4f8), 0x0a }, { CCI_REG8(0xc4f9), 0x0a },
-+	{ CCI_REG8(0xc4fa), 0x0a }, { CCI_REG8(0xc4c6), 0x0a },
-+	{ CCI_REG8(0xc4c7), 0x0a }, { CCI_REG8(0xc4c8), 0x0a },
-+	{ CCI_REG8(0xc4c9), 0x0a }, { CCI_REG8(0xc4ca), 0x14 },
-+	{ CCI_REG8(0xc4cb), 0x14 }, { CCI_REG8(0xc4cc), 0x14 },
-+	{ CCI_REG8(0xc4cd), 0x14 }, { CCI_REG8(0x3b92), 0x05 },
-+	{ CCI_REG8(0x3b93), 0x05 }, { CCI_REG8(0x3b94), 0x05 },
-+	{ CCI_REG8(0x3b95), 0x05 }, { CCI_REG8(0x3623), 0x10 },
-+	{ CCI_REG8(0xc522), 0x18 }, { CCI_REG8(0xc523), 0x12 },
-+	{ CCI_REG8(0xc524), 0x0e }, { CCI_REG8(0xc525), 0x0b },
-+	{ CCI_REG8(0xc526), 0x18 }, { CCI_REG8(0xc527), 0x12 },
-+	{ CCI_REG8(0xc528), 0x0c }, { CCI_REG8(0xc529), 0x08 },
-+	{ CCI_REG8(0xc52a), 0x18 }, { CCI_REG8(0xc52b), 0x12 },
-+	{ CCI_REG8(0xc52c), 0x0e }, { CCI_REG8(0xc52d), 0x0b },
-+	{ CCI_REG8(0xc52e), 0x18 }, { CCI_REG8(0xc52f), 0x12 },
-+	{ CCI_REG8(0xc530), 0x0e }, { CCI_REG8(0xc531), 0x0b },
-+	{ CCI_REG8(0xc532), 0x18 }, { CCI_REG8(0xc533), 0x12 },
-+	{ CCI_REG8(0xc534), 0x0e }, { CCI_REG8(0xc535), 0x0b },
-+	{ CCI_REG8(0xc536), 0x18 }, { CCI_REG8(0xc537), 0x12 },
-+	{ CCI_REG8(0xc538), 0x0e }, { CCI_REG8(0xc539), 0x0b },
-+	{ CCI_REG8(0xc53a), 0x18 }, { CCI_REG8(0xc53b), 0x12 },
-+	{ CCI_REG8(0xc53c), 0x0c }, { CCI_REG8(0xc53d), 0x08 },
-+	{ CCI_REG8(0xc53e), 0x18 }, { CCI_REG8(0xc53f), 0x12 },
-+	{ CCI_REG8(0xc540), 0x0e }, { CCI_REG8(0xc541), 0x0b },
-+	{ CCI_REG8(0xc542), 0x18 }, { CCI_REG8(0xc543), 0x12 },
-+	{ CCI_REG8(0xc544), 0x0e }, { CCI_REG8(0xc545), 0x0b },
-+	{ CCI_REG8(0xc546), 0x18 }, { CCI_REG8(0xc547), 0x12 },
-+	{ CCI_REG8(0xc548), 0x0e }, { CCI_REG8(0xc549), 0x0b },
-+	{ CCI_REG8(0x3701), 0x18 }, { CCI_REG8(0x3702), 0x38 },
-+	{ CCI_REG8(0x3703), 0x72 }, { CCI_REG8(0x3708), 0x26 },
-+	{ CCI_REG8(0x3709), 0xe6 }, { CCI_REG8(0x3a1d), 0x18 },
-+	{ CCI_REG8(0x3a1e), 0x18 }, { CCI_REG8(0x3a21), 0x18 },
-+	{ CCI_REG8(0x3a22), 0x18 }, { CCI_REG8(0x39fb), 0x18 },
-+	{ CCI_REG8(0x39fc), 0x18 }, { CCI_REG8(0x39fd), 0x18 },
-+	{ CCI_REG8(0x39fe), 0x18 }, { CCI_REG8(0xc44a), 0x08 },
-+	{ CCI_REG8(0xc44c), 0x08 }, { CCI_REG8(0xc5e8), 0x0a },
-+	{ CCI_REG8(0xc5ea), 0x0a }, { CCI_REG8(0x391d), 0x54 },
-+	{ CCI_REG8(0x391e), 0xca }, { CCI_REG8(0x3991), 0x0c },
-+	{ CCI_REG8(0x399d), 0x0c }, { CCI_REG8(0x3744), 0x24 },
-+	{ CCI_REG8(0x374b), 0x0c }, { CCI_REG8(0x3be7), 0x1e },
-+	{ CCI_REG8(0x3be8), 0x26 }, { CCI_REG8(0x3a50), 0x14 },
-+	{ CCI_REG8(0x3a54), 0x14 }, { CCI_REG8(0x3add), 0x1f },
-+	{ CCI_REG8(0x3adf), 0x24 }, { CCI_REG8(0x3aef), 0x1f },
-+	{ CCI_REG8(0x3af0), 0x24 }, { CCI_REG8(0xc57f), 0x30 },
-+	{ CCI_REG8(0xc580), 0x30 }, { CCI_REG8(0xc581), 0x30 },
-+	{ CCI_REG8(0xc582), 0x30 }, { CCI_REG8(0xc583), 0x30 },
-+	{ CCI_REG8(0xc584), 0x30 }, { CCI_REG8(0xc585), 0x30 },
-+	{ CCI_REG8(0xc586), 0x30 }, { CCI_REG8(0xc587), 0x30 },
-+	{ CCI_REG8(0xc588), 0x30 }, { CCI_REG8(0xc589), 0x30 },
-+	{ CCI_REG8(0xc58a), 0x30 }, { CCI_REG8(0xc58b), 0x30 },
-+	{ CCI_REG8(0xc58c), 0x30 }, { CCI_REG8(0xc58d), 0x30 },
-+	{ CCI_REG8(0xc58e), 0x30 }, { CCI_REG8(0xc58f), 0x30 },
-+	{ CCI_REG8(0xc590), 0x30 }, { CCI_REG8(0xc591), 0x30 },
-+	{ CCI_REG8(0xc592), 0x30 }, { CCI_REG8(0xc598), 0x30 },
-+	{ CCI_REG8(0xc599), 0x30 }, { CCI_REG8(0xc59a), 0x30 },
-+	{ CCI_REG8(0xc59b), 0x30 }, { CCI_REG8(0xc59c), 0x30 },
-+	{ CCI_REG8(0xc59d), 0x30 }, { CCI_REG8(0xc59e), 0x30 },
-+	{ CCI_REG8(0xc59f), 0x30 }, { CCI_REG8(0xc5a0), 0x30 },
-+	{ CCI_REG8(0xc5a1), 0x30 }, { CCI_REG8(0xc5a2), 0x30 },
-+	{ CCI_REG8(0xc5a3), 0x30 }, { CCI_REG8(0xc5a4), 0x30 },
-+	{ CCI_REG8(0xc5a5), 0x30 }, { CCI_REG8(0xc5a6), 0x30 },
-+	{ CCI_REG8(0xc5a7), 0x30 }, { CCI_REG8(0xc5a8), 0x30 },
-+	{ CCI_REG8(0xc5a9), 0x30 }, { CCI_REG8(0xc5aa), 0x30 },
-+	{ CCI_REG8(0xc5ab), 0x30 }, { CCI_REG8(0xc5b1), 0x38 },
-+	{ CCI_REG8(0xc5b2), 0x38 }, { CCI_REG8(0xc5b3), 0x38 },
-+	{ CCI_REG8(0xc5b4), 0x38 }, { CCI_REG8(0xc5b5), 0x38 },
-+	{ CCI_REG8(0xc5b6), 0x38 }, { CCI_REG8(0xc5b7), 0x38 },
-+	{ CCI_REG8(0xc5b8), 0x38 }, { CCI_REG8(0xc5b9), 0x38 },
-+	{ CCI_REG8(0xc5ba), 0x38 }, { CCI_REG8(0xc5bb), 0x38 },
-+	{ CCI_REG8(0xc5bc), 0x38 }, { CCI_REG8(0xc5bd), 0x38 },
-+	{ CCI_REG8(0xc5be), 0x38 }, { CCI_REG8(0xc5bf), 0x38 },
-+	{ CCI_REG8(0xc5c0), 0x38 }, { CCI_REG8(0xc5c1), 0x38 },
-+	{ CCI_REG8(0xc5c2), 0x38 }, { CCI_REG8(0xc5c3), 0x38 },
-+	{ CCI_REG8(0xc5c4), 0x38 }, { CCI_REG8(0xc5ca), 0x38 },
-+	{ CCI_REG8(0xc5cb), 0x38 }, { CCI_REG8(0xc5cc), 0x38 },
-+	{ CCI_REG8(0xc5cd), 0x38 }, { CCI_REG8(0xc5ce), 0x38 },
-+	{ CCI_REG8(0xc5cf), 0x38 }, { CCI_REG8(0xc5d0), 0x38 },
-+	{ CCI_REG8(0xc5d1), 0x38 }, { CCI_REG8(0xc5d2), 0x38 },
-+	{ CCI_REG8(0xc5d3), 0x38 }, { CCI_REG8(0xc5d4), 0x38 },
-+	{ CCI_REG8(0xc5d5), 0x38 }, { CCI_REG8(0xc5d6), 0x38 },
-+	{ CCI_REG8(0xc5d7), 0x38 }, { CCI_REG8(0xc5d8), 0x38 },
-+	{ CCI_REG8(0xc5d9), 0x38 }, { CCI_REG8(0xc5da), 0x38 },
-+	{ CCI_REG8(0xc5db), 0x38 }, { CCI_REG8(0xc5dc), 0x38 },
-+	{ CCI_REG8(0xc5dd), 0x38 }, { CCI_REG8(0x3a60), 0x68 },
-+	{ CCI_REG8(0x3a6f), 0x68 }, { CCI_REG8(0x3a5e), 0xdc },
-+	{ CCI_REG8(0x3a6d), 0xdc }, { CCI_REG8(0x3aed), 0x6e },
-+	{ CCI_REG8(0x3af1), 0x73 }, { CCI_REG8(0x3992), 0x02 },
-+	{ CCI_REG8(0x399e), 0x02 }, { CCI_REG8(0x371d), 0x17 },
-+	{ CCI_REG8(0x371f), 0x08 }, { CCI_REG8(0x3721), 0xc9 },
-+	{ CCI_REG8(0x401e), 0x00 }, { CCI_REG8(0x401f), 0xf8 },
-+	{ CCI_REG8(0x3642), 0x00 }, { CCI_REG8(0x3641), 0x7f },
-+	{ CCI_REG8(0x3ac5), 0x0c }, { CCI_REG8(0x3ac6), 0x09 },
-+	{ CCI_REG8(0x3ac7), 0x06 }, { CCI_REG8(0x3ac8), 0x02 },
-+	{ CCI_REG8(0x3ac9), 0x0c }, { CCI_REG8(0x3aca), 0x09 },
-+	{ CCI_REG8(0x3acb), 0x06 }, { CCI_REG8(0x3acc), 0x02 },
-+	{ CCI_REG8(0x3acd), 0x0c }, { CCI_REG8(0x3ace), 0x09 },
-+	{ CCI_REG8(0x3acf), 0x07 }, { CCI_REG8(0x3ad0), 0x04 },
-+	{ CCI_REG8(0x3ad1), 0x0c }, { CCI_REG8(0x3ad2), 0x09 },
-+	{ CCI_REG8(0x3ad3), 0x07 }, { CCI_REG8(0x3ad4), 0x04 },
-+	{ CCI_REG8(0xc483), 0x0c }, { CCI_REG8(0xc484), 0x0c },
-+	{ CCI_REG8(0xc485), 0x0c }, { CCI_REG8(0xc486), 0x0c },
-+	{ CCI_REG8(0x3a2f), 0x0c }, { CCI_REG8(0x3a30), 0x09 },
-+	{ CCI_REG8(0x3a31), 0x06 }, { CCI_REG8(0x3a32), 0x02 },
-+	{ CCI_REG8(0x3a34), 0x0c }, { CCI_REG8(0x3a35), 0x09 },
-+	{ CCI_REG8(0x3a36), 0x07 }, { CCI_REG8(0x3a37), 0x04 },
-+	{ CCI_REG8(0x3a43), 0x0c }, { CCI_REG8(0x3a44), 0x09 },
-+	{ CCI_REG8(0x3a45), 0x06 }, { CCI_REG8(0x3a46), 0x02 },
-+	{ CCI_REG8(0x3a48), 0x0c }, { CCI_REG8(0x3a49), 0x09 },
-+	{ CCI_REG8(0x3a4a), 0x07 }, { CCI_REG8(0x3a4b), 0x04 },
-+	{ CCI_REG8(0xc487), 0x0c }, { CCI_REG8(0xc488), 0x0c },
-+	{ CCI_REG8(0xc489), 0x0c }, { CCI_REG8(0xc48a), 0x0c },
-+	{ CCI_REG8(0x3645), 0xbd }, { CCI_REG8(0x373f), 0x00 },
-+	{ CCI_REG8(0x374f), 0x10 }, { CCI_REG8(0x3743), 0xc6 },
-+	{ CCI_REG8(0x3717), 0x82 }, { CCI_REG8(0x3732), 0x07 },
-+	{ CCI_REG8(0x3731), 0x16 }, { CCI_REG8(0x3730), 0x16 },
-+	{ CCI_REG8(0x3828), 0x07 }, { CCI_REG8(0x3714), 0x68 },
-+	{ CCI_REG8(0x371d), 0x02 }, { CCI_REG8(0x371f), 0x02 },
-+	{ CCI_REG8(0x37e0), 0x00 }, { CCI_REG8(0x37e1), 0x03 },
-+	{ CCI_REG8(0x37e2), 0x07 }, { CCI_REG8(0x3734), 0x3e },
-+	{ CCI_REG8(0x3736), 0x02 }, { CCI_REG8(0x37e4), 0x36 },
-+	{ CCI_REG8(0x37e9), 0x1c }, { CCI_REG8(0x37ea), 0x01 },
-+	{ CCI_REG8(0x37eb), 0x0a }, { CCI_REG8(0x37ec), 0x1c },
-+	{ CCI_REG8(0x37ed), 0x01 }, { CCI_REG8(0x37ee), 0x36 },
-+	{ CCI_REG8(0x373b), 0x1c }, { CCI_REG8(0x373c), 0x02 },
-+	{ CCI_REG8(0x37bb), 0x1c }, { CCI_REG8(0x37bc), 0x02 },
-+	{ CCI_REG8(0x37b8), 0x0c }, { CCI_REG8(0x371c), 0x01 },
-+	{ CCI_REG8(0x371e), 0x11 }, { CCI_REG8(0x371d), 0x01 },
-+	{ CCI_REG8(0x371f), 0x01 }, { CCI_REG8(0x3721), 0x01 },
-+	{ CCI_REG8(0x3725), 0x12 }, { CCI_REG8(0x37e3), 0x06 },
-+	{ CCI_REG8(0x37dd), 0x86 }, { CCI_REG8(0x37db), 0x0a },
-+	{ CCI_REG8(0x37dc), 0x14 }, { CCI_REG8(0x3727), 0x20 },
-+	{ CCI_REG8(0x37b2), 0x80 }, { CCI_REG8(0x37da), 0x04 },
-+	{ CCI_REG8(0x37df), 0x01 }, { CCI_REG8(0x3731), 0x11 },
-+	{ CCI_REG8(0x37dd), 0x86 }, { CCI_REG8(0x37df), 0x01 },
-+	{ CCI_REG8(0x37da), 0x03 }, { CCI_REG8(0x37b2), 0x80 },
-+	{ CCI_REG8(0x3727), 0x20 }, { CCI_REG8(0x4883), 0x26 },
-+	{ CCI_REG8(0x488b), 0x88 }, { CCI_REG8(0x3d85), 0x1f },
-+	{ CCI_REG8(0x3d81), 0x01 }, { CCI_REG8(0x3d84), 0x40 },
-+	{ CCI_REG8(0x3d88), 0x00 }, { CCI_REG8(0x3d89), 0x00 },
-+	{ CCI_REG8(0x3d8a), 0x0b }, { CCI_REG8(0x3d8b), 0xff },
-+	{ CCI_REG8(0x4d00), 0x05 }, { CCI_REG8(0x4d01), 0xc4 },
-+	{ CCI_REG8(0x4d02), 0xa3 }, { CCI_REG8(0x4d03), 0x8c },
-+	{ CCI_REG8(0x4d04), 0xfb }, { CCI_REG8(0x4d05), 0xed },
-+	{ CCI_REG8(0x4010), 0x28 }, { CCI_REG8(0x4030), 0x00 },
-+	{ CCI_REG8(0x4031), 0x00 }, { CCI_REG8(0x4032), 0x00 },
-+	{ CCI_REG8(0x4033), 0x00 }, { CCI_REG8(0x4034), 0x00 },
-+	{ CCI_REG8(0x4035), 0x00 }, { CCI_REG8(0x4036), 0x00 },
-+	{ CCI_REG8(0x4037), 0x00 }, { CCI_REG8(0x4040), 0x00 },
-+	{ CCI_REG8(0x4041), 0x00 }, { CCI_REG8(0x4042), 0x00 },
-+	{ CCI_REG8(0x4043), 0x00 }, { CCI_REG8(0x4044), 0x00 },
-+	{ CCI_REG8(0x4045), 0x00 }, { CCI_REG8(0x4046), 0x00 },
-+	{ CCI_REG8(0x4047), 0x00 }, { CCI_REG8(0x3400), 0x00 },
-+	{ CCI_REG8(0x3421), 0x23 }, { CCI_REG8(0x3422), 0xfc },
-+	{ CCI_REG8(0x3423), 0x07 }, { CCI_REG8(0x3424), 0x01 },
-+	{ CCI_REG8(0x3425), 0x04 }, { CCI_REG8(0x3426), 0x50 },
-+	{ CCI_REG8(0x3427), 0x55 }, { CCI_REG8(0x3428), 0x15 },
-+	{ CCI_REG8(0x3429), 0x00 }, { CCI_REG8(0x3025), 0x03 },
-+	{ CCI_REG8(0x3053), 0x00 }, { CCI_REG8(0x3054), 0x00 },
-+	{ CCI_REG8(0x3055), 0x00 }, { CCI_REG8(0x3056), 0x00 },
-+	{ CCI_REG8(0x3057), 0x00 }, { CCI_REG8(0x3058), 0x00 },
-+	{ CCI_REG8(0x305c), 0x00 }, { CCI_REG8(0x340c), 0x1f },
-+	{ CCI_REG8(0x340d), 0x00 }, { CCI_REG8(0x3501), 0x01 },
-+	{ CCI_REG8(0x3542), 0x48 }, { CCI_REG8(0x3582), 0x24 },
-+	{ CCI_REG8(0x3015), 0xf1 }, { CCI_REG8(0x3018), 0xf2 },
-+	{ CCI_REG8(0x301c), 0xf2 }, { CCI_REG8(0x301d), 0xf6 },
-+	{ CCI_REG8(0x301e), 0xf1 }, { CCI_REG8(0x0100), 0x01 },
-+	{ CCI_REG8(0xfff9), 0x08 }, { CCI_REG8(0x3900), 0xcd },
-+	{ CCI_REG8(0x3901), 0xcd }, { CCI_REG8(0x3902), 0xcd },
-+	{ CCI_REG8(0x3903), 0xcd }, { CCI_REG8(0x3904), 0xcd },
-+	{ CCI_REG8(0x3905), 0xcd }, { CCI_REG8(0x3906), 0xcd },
-+	{ CCI_REG8(0x3907), 0xcd }, { CCI_REG8(0x3908), 0xcd },
-+	{ CCI_REG8(0x3909), 0xcd }, { CCI_REG8(0x390a), 0xcd },
-+	{ CCI_REG8(0x390b), 0xcd }, { CCI_REG8(0x390c), 0xcd },
-+	{ CCI_REG8(0x390d), 0xcd }, { CCI_REG8(0x390e), 0xcd },
-+	{ CCI_REG8(0x390f), 0xcd }, { CCI_REG8(0x3910), 0xcd },
-+	{ CCI_REG8(0x3911), 0xcd }, { CCI_REG8(0x3912), 0xcd },
-+	{ CCI_REG8(0x3913), 0xcd }, { CCI_REG8(0x3914), 0xcd },
-+	{ CCI_REG8(0x3915), 0xcd }, { CCI_REG8(0x3916), 0xcd },
-+	{ CCI_REG8(0x3917), 0xcd }, { CCI_REG8(0x3918), 0xcd },
-+	{ CCI_REG8(0x3919), 0xcd }, { CCI_REG8(0x391a), 0xcd },
-+	{ CCI_REG8(0x391b), 0xcd }, { CCI_REG8(0x391c), 0xcd },
-+	{ CCI_REG8(0x391d), 0xcd }, { CCI_REG8(0x391e), 0xcd },
-+	{ CCI_REG8(0x391f), 0xcd }, { CCI_REG8(0x3920), 0xcd },
-+	{ CCI_REG8(0x3921), 0xcd }, { CCI_REG8(0x3922), 0xcd },
-+	{ CCI_REG8(0x3923), 0xcd }, { CCI_REG8(0x3924), 0xcd },
-+	{ CCI_REG8(0x3925), 0xcd }, { CCI_REG8(0x3926), 0xcd },
-+	{ CCI_REG8(0x3927), 0xcd }, { CCI_REG8(0x3928), 0xcd },
-+	{ CCI_REG8(0x3929), 0xcd }, { CCI_REG8(0x392a), 0xcd },
-+	{ CCI_REG8(0x392b), 0xcd }, { CCI_REG8(0x392c), 0xcd },
-+	{ CCI_REG8(0x392d), 0xcd }, { CCI_REG8(0x392e), 0xcd },
-+	{ CCI_REG8(0x392f), 0xcd }, { CCI_REG8(0x3930), 0xcd },
-+	{ CCI_REG8(0x3931), 0xcd }, { CCI_REG8(0x3932), 0xcd },
-+	{ CCI_REG8(0x3933), 0xcd }, { CCI_REG8(0x3934), 0xcd },
-+	{ CCI_REG8(0x3935), 0xcd }, { CCI_REG8(0x3936), 0xcd },
-+	{ CCI_REG8(0x3937), 0xcd }, { CCI_REG8(0x3938), 0xcd },
-+	{ CCI_REG8(0x3939), 0xcd }, { CCI_REG8(0x393a), 0xcd },
-+	{ CCI_REG8(0x393b), 0xcd }, { CCI_REG8(0x393c), 0xcd },
-+	{ CCI_REG8(0x393d), 0xcd }, { CCI_REG8(0x393e), 0xcd },
-+	{ CCI_REG8(0x393f), 0xcd }, { CCI_REG8(0x3940), 0xcd },
-+	{ CCI_REG8(0x3941), 0xcd }, { CCI_REG8(0x3942), 0xcd },
-+	{ CCI_REG8(0x3943), 0xcd }, { CCI_REG8(0x3944), 0xcd },
-+	{ CCI_REG8(0x3945), 0xcd }, { CCI_REG8(0x3946), 0xcd },
-+	{ CCI_REG8(0x3947), 0xcd }, { CCI_REG8(0x3948), 0xcd },
-+	{ CCI_REG8(0x3949), 0xcd }, { CCI_REG8(0x394a), 0xcd },
-+	{ CCI_REG8(0x394b), 0xcd }, { CCI_REG8(0x394c), 0xcd },
-+	{ CCI_REG8(0x394d), 0xcd }, { CCI_REG8(0x394e), 0xcd },
-+	{ CCI_REG8(0x394f), 0xcd }, { CCI_REG8(0x3950), 0xcd },
-+	{ CCI_REG8(0x3951), 0xcd }, { CCI_REG8(0x3952), 0xcd },
-+	{ CCI_REG8(0x3953), 0xcd }, { CCI_REG8(0x3954), 0xcd },
-+	{ CCI_REG8(0x3955), 0xcd }, { CCI_REG8(0x3956), 0xcd },
-+	{ CCI_REG8(0x3957), 0xcd }, { CCI_REG8(0x3958), 0xcd },
-+	{ CCI_REG8(0x3959), 0xcd }, { CCI_REG8(0x395a), 0xcd },
-+	{ CCI_REG8(0x395b), 0xcd }, { CCI_REG8(0x395c), 0xcd },
-+	{ CCI_REG8(0x395d), 0xcd }, { CCI_REG8(0x395e), 0xcd },
-+	{ CCI_REG8(0x395f), 0xcd }, { CCI_REG8(0x3960), 0xcd },
-+	{ CCI_REG8(0x3961), 0xcd }, { CCI_REG8(0x3962), 0xcd },
-+	{ CCI_REG8(0x3963), 0xcd }, { CCI_REG8(0x3964), 0xcd },
-+	{ CCI_REG8(0x3965), 0xcd }, { CCI_REG8(0x3966), 0xcd },
-+	{ CCI_REG8(0x3967), 0xcd }, { CCI_REG8(0x3968), 0xcd },
-+	{ CCI_REG8(0x3969), 0xcd }, { CCI_REG8(0x396a), 0xcd },
-+	{ CCI_REG8(0x396b), 0xcd }, { CCI_REG8(0x396c), 0xcd },
-+	{ CCI_REG8(0x396d), 0xcd }, { CCI_REG8(0x396e), 0xcd },
-+	{ CCI_REG8(0x396f), 0xcd }, { CCI_REG8(0x3970), 0xcd },
-+	{ CCI_REG8(0x3971), 0xcd }, { CCI_REG8(0x3972), 0xcd },
-+	{ CCI_REG8(0x3973), 0xcd }, { CCI_REG8(0x3974), 0xcd },
-+	{ CCI_REG8(0x3975), 0xcd }, { CCI_REG8(0x3976), 0xcd },
-+	{ CCI_REG8(0x3977), 0xcd }, { CCI_REG8(0x3978), 0xcd },
-+	{ CCI_REG8(0x3979), 0xcd }, { CCI_REG8(0x397a), 0xcd },
-+	{ CCI_REG8(0x397b), 0xcd }, { CCI_REG8(0x397c), 0xcd },
-+	{ CCI_REG8(0x397d), 0xcd }, { CCI_REG8(0x397e), 0xcd },
-+	{ CCI_REG8(0x397f), 0xcd }, { CCI_REG8(0x3980), 0xcd },
-+	{ CCI_REG8(0x3981), 0xcd }, { CCI_REG8(0x3982), 0xcd },
-+	{ CCI_REG8(0x3983), 0xcd }, { CCI_REG8(0x3984), 0xcd },
-+	{ CCI_REG8(0x3985), 0xcd }, { CCI_REG8(0x3986), 0xcd },
-+	{ CCI_REG8(0x3987), 0xcd }, { CCI_REG8(0x3988), 0xcd },
-+	{ CCI_REG8(0x3989), 0xcd }, { CCI_REG8(0x398a), 0xcd },
-+	{ CCI_REG8(0x398b), 0xcd }, { CCI_REG8(0x398c), 0xcd },
-+	{ CCI_REG8(0x398d), 0xcd }, { CCI_REG8(0x398e), 0xcd },
-+	{ CCI_REG8(0x398f), 0xcd }, { CCI_REG8(0x3990), 0xcd },
-+	{ CCI_REG8(0x3991), 0xcd }, { CCI_REG8(0x3992), 0xcd },
-+	{ CCI_REG8(0x3993), 0xcd }, { CCI_REG8(0x3994), 0xcd },
-+	{ CCI_REG8(0x3995), 0xcd }, { CCI_REG8(0x3996), 0xcd },
-+	{ CCI_REG8(0x3997), 0xcd }, { CCI_REG8(0x3998), 0xcd },
-+	{ CCI_REG8(0x3999), 0xcd }, { CCI_REG8(0x399a), 0xcd },
-+	{ CCI_REG8(0x399b), 0xcd }, { CCI_REG8(0x399c), 0xcd },
-+	{ CCI_REG8(0x399d), 0xcd }, { CCI_REG8(0x399e), 0xcd },
-+	{ CCI_REG8(0x399f), 0xcd }, { CCI_REG8(0x39a0), 0xcd },
-+	{ CCI_REG8(0x39a1), 0xcd }, { CCI_REG8(0x39a2), 0xcd },
-+	{ CCI_REG8(0x39a3), 0xcd }, { CCI_REG8(0x39a4), 0xcd },
-+	{ CCI_REG8(0x39a5), 0xcd }, { CCI_REG8(0x39a6), 0xcd },
-+	{ CCI_REG8(0x39a7), 0xcd }, { CCI_REG8(0x39a8), 0xcd },
-+	{ CCI_REG8(0x39a9), 0xcd }, { CCI_REG8(0x39aa), 0xcd },
-+	{ CCI_REG8(0x39ab), 0xcd }, { CCI_REG8(0x39ac), 0xcd },
-+	{ CCI_REG8(0x39ad), 0xcd }, { CCI_REG8(0x39ae), 0xcd },
-+	{ CCI_REG8(0x39af), 0xcd }, { CCI_REG8(0x39b0), 0xcd },
-+	{ CCI_REG8(0x39b1), 0xcd }, { CCI_REG8(0x39b2), 0xcd },
-+	{ CCI_REG8(0x39b3), 0xcd }, { CCI_REG8(0x39b4), 0xcd },
-+	{ CCI_REG8(0x39b5), 0xcd }, { CCI_REG8(0x39b6), 0xcd },
-+	{ CCI_REG8(0x39b7), 0xcd }, { CCI_REG8(0x39b8), 0xcd },
-+	{ CCI_REG8(0x39b9), 0xcd }, { CCI_REG8(0x39ba), 0xcd },
-+	{ CCI_REG8(0x39bb), 0xcd }, { CCI_REG8(0x39bc), 0xcd },
-+	{ CCI_REG8(0x39bd), 0xcd }, { CCI_REG8(0x39be), 0xcd },
-+	{ CCI_REG8(0x39bf), 0xcd }, { CCI_REG8(0x39c0), 0xcd },
-+	{ CCI_REG8(0x39c1), 0xcd }, { CCI_REG8(0x39c2), 0xcd },
-+	{ CCI_REG8(0x39c3), 0xcd }, { CCI_REG8(0x39c4), 0xcd },
-+	{ CCI_REG8(0x39c5), 0xcd }, { CCI_REG8(0x39c6), 0xcd },
-+	{ CCI_REG8(0x39c7), 0xcd }, { CCI_REG8(0x39c8), 0xcd },
-+	{ CCI_REG8(0x39c9), 0xcd }, { CCI_REG8(0x39ca), 0xcd },
-+	{ CCI_REG8(0x39cb), 0xcd }, { CCI_REG8(0x39cc), 0xcd },
-+	{ CCI_REG8(0x39cd), 0xcd }, { CCI_REG8(0x39ce), 0xcd },
-+	{ CCI_REG8(0x39cf), 0xcd }, { CCI_REG8(0x39d0), 0xcd },
-+	{ CCI_REG8(0x39d1), 0xcd }, { CCI_REG8(0x39d2), 0xcd },
-+	{ CCI_REG8(0x39d3), 0xcd }, { CCI_REG8(0x39d4), 0xcd },
-+	{ CCI_REG8(0x39d5), 0xcd }, { CCI_REG8(0x39d6), 0xcd },
-+	{ CCI_REG8(0x39d7), 0xcd }, { CCI_REG8(0x39d8), 0xcd },
-+	{ CCI_REG8(0x39d9), 0xcd }, { CCI_REG8(0x39da), 0xcd },
-+	{ CCI_REG8(0x39db), 0xcd }, { CCI_REG8(0x39dc), 0xcd },
-+	{ CCI_REG8(0x39dd), 0xcd }, { CCI_REG8(0x39de), 0xcd },
-+	{ CCI_REG8(0x39df), 0xcd }, { CCI_REG8(0x39e0), 0xcd },
-+	{ CCI_REG8(0x39e1), 0x40 }, { CCI_REG8(0x39e2), 0x40 },
-+	{ CCI_REG8(0x39e3), 0x40 }, { CCI_REG8(0x39e4), 0x40 },
-+	{ CCI_REG8(0x39e5), 0x40 }, { CCI_REG8(0x39e6), 0x40 },
-+	{ CCI_REG8(0x39e7), 0x40 }, { CCI_REG8(0x39e8), 0x40 },
-+	{ CCI_REG8(0x39e9), 0x40 }, { CCI_REG8(0x39ea), 0x40 },
-+	{ CCI_REG8(0x39eb), 0x40 }, { CCI_REG8(0x39ec), 0x40 },
-+	{ CCI_REG8(0x39ed), 0x40 }, { CCI_REG8(0x39ee), 0x40 },
-+	{ CCI_REG8(0x39ef), 0x40 }, { CCI_REG8(0x39f0), 0x40 },
-+	{ CCI_REG8(0x39f1), 0x40 }, { CCI_REG8(0x39f2), 0x40 },
-+	{ CCI_REG8(0x39f3), 0x40 }, { CCI_REG8(0x39f4), 0x40 },
-+	{ CCI_REG8(0x39f5), 0x40 }, { CCI_REG8(0x39f6), 0x40 },
-+	{ CCI_REG8(0x39f7), 0x40 }, { CCI_REG8(0x39f8), 0x40 },
-+	{ CCI_REG8(0x39f9), 0x40 }, { CCI_REG8(0x39fa), 0x40 },
-+	{ CCI_REG8(0x39fb), 0x40 }, { CCI_REG8(0x39fc), 0x40 },
-+	{ CCI_REG8(0x39fd), 0x40 }, { CCI_REG8(0x39fe), 0x40 },
-+	{ CCI_REG8(0x39ff), 0x40 }, { CCI_REG8(0x3a00), 0x40 },
-+	{ CCI_REG8(0x3a01), 0x40 }, { CCI_REG8(0x3a02), 0x40 },
-+	{ CCI_REG8(0x3a03), 0x40 }, { CCI_REG8(0x3a04), 0x40 },
-+	{ CCI_REG8(0x3a05), 0x40 }, { CCI_REG8(0x3a06), 0x40 },
-+	{ CCI_REG8(0x3a07), 0x40 }, { CCI_REG8(0x3a08), 0x40 },
-+	{ CCI_REG8(0x3a09), 0x40 }, { CCI_REG8(0x3a0a), 0x40 },
-+	{ CCI_REG8(0x3a0b), 0x40 }, { CCI_REG8(0x3a0c), 0x40 },
-+	{ CCI_REG8(0x3a0d), 0x40 }, { CCI_REG8(0x3a0e), 0x40 },
-+	{ CCI_REG8(0x3a0f), 0x40 }, { CCI_REG8(0x3a10), 0x40 },
-+	{ CCI_REG8(0x3a11), 0x40 }, { CCI_REG8(0x3a12), 0x40 },
-+	{ CCI_REG8(0x3a13), 0x40 }, { CCI_REG8(0x3a14), 0x40 },
-+	{ CCI_REG8(0x3a15), 0x40 }, { CCI_REG8(0x3a16), 0x40 },
-+	{ CCI_REG8(0x3a17), 0x40 }, { CCI_REG8(0x3a18), 0x40 },
-+	{ CCI_REG8(0x3a19), 0x40 }, { CCI_REG8(0x3a1a), 0x40 },
-+	{ CCI_REG8(0x3a1b), 0x40 }, { CCI_REG8(0x3a1c), 0x40 },
-+	{ CCI_REG8(0x3a1d), 0x40 }, { CCI_REG8(0x3a1e), 0x40 },
-+	{ CCI_REG8(0x3a1f), 0x40 }, { CCI_REG8(0x3a20), 0x40 },
-+	{ CCI_REG8(0x3a21), 0x40 }, { CCI_REG8(0x3a22), 0x40 },
-+	{ CCI_REG8(0x3a23), 0x40 }, { CCI_REG8(0x3a24), 0x40 },
-+	{ CCI_REG8(0x3a25), 0x40 }, { CCI_REG8(0x3a26), 0x40 },
-+	{ CCI_REG8(0x3a27), 0x40 }, { CCI_REG8(0x3a28), 0x40 },
-+	{ CCI_REG8(0x3a29), 0x40 }, { CCI_REG8(0x3a2a), 0x40 },
-+	{ CCI_REG8(0x3a2b), 0x40 }, { CCI_REG8(0x3a2c), 0x40 },
-+	{ CCI_REG8(0x3a2d), 0x40 }, { CCI_REG8(0x3a2e), 0x40 },
-+	{ CCI_REG8(0x3a2f), 0x40 }, { CCI_REG8(0x3a30), 0x40 },
-+	{ CCI_REG8(0x3a31), 0x40 }, { CCI_REG8(0x3a32), 0x40 },
-+	{ CCI_REG8(0x3a33), 0x40 }, { CCI_REG8(0x3a34), 0x40 },
-+	{ CCI_REG8(0x3a35), 0x40 }, { CCI_REG8(0x3a36), 0x40 },
-+	{ CCI_REG8(0x3a37), 0x40 }, { CCI_REG8(0x3a38), 0x40 },
-+	{ CCI_REG8(0x3a39), 0x40 }, { CCI_REG8(0x3a3a), 0x40 },
-+	{ CCI_REG8(0x3a3b), 0xcd }, { CCI_REG8(0x3a3c), 0xcd },
-+	{ CCI_REG8(0x3a3d), 0xcd }, { CCI_REG8(0x3a3e), 0xcd },
-+	{ CCI_REG8(0x3a3f), 0xcd }, { CCI_REG8(0x3a40), 0xcd },
-+	{ CCI_REG8(0x3a41), 0xcd }, { CCI_REG8(0x3a42), 0xcd },
-+	{ CCI_REG8(0x3a43), 0xcd }, { CCI_REG8(0x3a44), 0xcd },
-+	{ CCI_REG8(0x3a45), 0xcd }, { CCI_REG8(0x3a46), 0xcd },
-+	{ CCI_REG8(0x3a47), 0xcd }, { CCI_REG8(0x3a48), 0xcd },
-+	{ CCI_REG8(0x3a49), 0xcd }, { CCI_REG8(0x3a4a), 0xcd },
-+	{ CCI_REG8(0x3a4b), 0xcd }, { CCI_REG8(0x3a4c), 0xcd },
-+	{ CCI_REG8(0x3a4d), 0xcd }, { CCI_REG8(0x3a4e), 0xcd },
-+	{ CCI_REG8(0x3a4f), 0xcd }, { CCI_REG8(0x3a50), 0xcd },
-+	{ CCI_REG8(0x3a51), 0xcd }, { CCI_REG8(0x3a52), 0xcd },
-+	{ CCI_REG8(0x3a53), 0xcd }, { CCI_REG8(0x3a54), 0xcd },
-+	{ CCI_REG8(0x3a55), 0xcd }, { CCI_REG8(0x3a56), 0xcd },
-+	{ CCI_REG8(0x3a57), 0xcd }, { CCI_REG8(0x3a58), 0xcd },
-+	{ CCI_REG8(0x3a59), 0xcd }, { CCI_REG8(0x3a5a), 0xcd },
-+	{ CCI_REG8(0x3a5b), 0xcd }, { CCI_REG8(0x3a5c), 0xcd },
-+	{ CCI_REG8(0x3a5d), 0xcd }, { CCI_REG8(0x3a5e), 0xcd },
-+	{ CCI_REG8(0x3a5f), 0xcd }, { CCI_REG8(0x3a60), 0xcd },
-+	{ CCI_REG8(0x3a61), 0xcd }, { CCI_REG8(0x3a62), 0xcd },
-+	{ CCI_REG8(0x3a63), 0xcd }, { CCI_REG8(0x3a64), 0xcd },
-+	{ CCI_REG8(0x3a65), 0xcd }, { CCI_REG8(0x3a66), 0xcd },
-+	{ CCI_REG8(0x3a67), 0xcd }, { CCI_REG8(0x3a68), 0xcd },
-+	{ CCI_REG8(0x3a69), 0xcd }, { CCI_REG8(0x3a6a), 0xcd },
-+	{ CCI_REG8(0x3a6b), 0xcd }, { CCI_REG8(0x3a6c), 0xcd },
-+	{ CCI_REG8(0x3a6d), 0xcd }, { CCI_REG8(0x3a6e), 0xcd },
-+	{ CCI_REG8(0x3a6f), 0xcd }, { CCI_REG8(0x3a70), 0xcd },
-+	{ CCI_REG8(0x3a71), 0xcd }, { CCI_REG8(0x3a72), 0xcd },
-+	{ CCI_REG8(0x3a73), 0xcd }, { CCI_REG8(0x3a74), 0xcd },
-+	{ CCI_REG8(0x3a75), 0xcd }, { CCI_REG8(0x3a76), 0xcd },
-+	{ CCI_REG8(0x3a77), 0xcd }, { CCI_REG8(0x3a78), 0xcd },
-+	{ CCI_REG8(0x3a79), 0xcd }, { CCI_REG8(0x3a7a), 0xcd },
-+	{ CCI_REG8(0x3a7b), 0xcd }, { CCI_REG8(0x3a7c), 0xcd },
-+	{ CCI_REG8(0x3a7d), 0xcd }, { CCI_REG8(0x3a7e), 0xcd },
-+	{ CCI_REG8(0x3a7f), 0xcd }, { CCI_REG8(0x3a80), 0xcd },
-+	{ CCI_REG8(0x3a81), 0xcd }, { CCI_REG8(0x3a82), 0xcd },
-+	{ CCI_REG8(0x3a83), 0xcd }, { CCI_REG8(0x3a84), 0xcd },
-+	{ CCI_REG8(0x3a85), 0xcd }, { CCI_REG8(0x3a86), 0xcd },
-+	{ CCI_REG8(0x3a87), 0xcd }, { CCI_REG8(0x3a88), 0xcd },
-+	{ CCI_REG8(0x3a89), 0xcd }, { CCI_REG8(0x3a8a), 0xcd },
-+	{ CCI_REG8(0x3a8b), 0xcd }, { CCI_REG8(0x3a8c), 0xcd },
-+	{ CCI_REG8(0x3a8d), 0xcd }, { CCI_REG8(0x3a8e), 0xcd },
-+	{ CCI_REG8(0x3a8f), 0xcd }, { CCI_REG8(0x3a90), 0xcd },
-+	{ CCI_REG8(0x3a91), 0xcd }, { CCI_REG8(0x3a92), 0xcd },
-+	{ CCI_REG8(0x3a93), 0xcd }, { CCI_REG8(0x3a94), 0xcd },
-+	{ CCI_REG8(0x3a95), 0x40 }, { CCI_REG8(0x3a96), 0x40 },
-+	{ CCI_REG8(0x3a97), 0x40 }, { CCI_REG8(0x3a98), 0x40 },
-+	{ CCI_REG8(0x3a99), 0x40 }, { CCI_REG8(0x3a9a), 0x40 },
-+	{ CCI_REG8(0x3a9b), 0x40 }, { CCI_REG8(0x3a9c), 0x40 },
-+	{ CCI_REG8(0x3a9d), 0x40 }, { CCI_REG8(0x3a9e), 0x40 },
-+	{ CCI_REG8(0x3a9f), 0x40 }, { CCI_REG8(0x3aa0), 0x40 },
-+	{ CCI_REG8(0x3aa1), 0x40 }, { CCI_REG8(0x3aa2), 0x40 },
-+	{ CCI_REG8(0x3aa3), 0x40 }, { CCI_REG8(0x3aa4), 0x40 },
-+	{ CCI_REG8(0x3aa5), 0x40 }, { CCI_REG8(0x3aa6), 0x40 },
-+	{ CCI_REG8(0x3aa7), 0x40 }, { CCI_REG8(0x3aa8), 0x40 },
-+	{ CCI_REG8(0x3aa9), 0x40 }, { CCI_REG8(0x3aaa), 0x40 },
-+	{ CCI_REG8(0x3aab), 0x40 }, { CCI_REG8(0x3aac), 0x40 },
-+	{ CCI_REG8(0x3aad), 0x40 }, { CCI_REG8(0x3aae), 0x40 },
-+	{ CCI_REG8(0x3aaf), 0x40 }, { CCI_REG8(0x3ab0), 0x40 },
-+	{ CCI_REG8(0x3ab1), 0x40 }, { CCI_REG8(0x3ab2), 0x40 },
-+	{ CCI_REG8(0x3ab3), 0x40 }, { CCI_REG8(0x3ab4), 0x40 },
-+	{ CCI_REG8(0x3ab5), 0x40 }, { CCI_REG8(0x3ab6), 0x40 },
-+	{ CCI_REG8(0x3ab7), 0x40 }, { CCI_REG8(0x3ab8), 0x40 },
-+	{ CCI_REG8(0x3ab9), 0x40 }, { CCI_REG8(0x3aba), 0x40 },
-+	{ CCI_REG8(0x3abb), 0x40 }, { CCI_REG8(0x3abc), 0x40 },
-+	{ CCI_REG8(0x3abd), 0x40 }, { CCI_REG8(0x3abe), 0x40 },
-+	{ CCI_REG8(0x3abf), 0x40 }, { CCI_REG8(0x3ac0), 0x40 },
-+	{ CCI_REG8(0x3ac1), 0x40 }, { CCI_REG8(0x3ac2), 0x40 },
-+	{ CCI_REG8(0x3ac3), 0x40 }, { CCI_REG8(0x3ac4), 0x40 },
-+	{ CCI_REG8(0x3ac5), 0x40 }, { CCI_REG8(0x3ac6), 0x40 },
-+	{ CCI_REG8(0x3ac7), 0x40 }, { CCI_REG8(0x3ac8), 0x40 },
-+	{ CCI_REG8(0x3ac9), 0x40 }, { CCI_REG8(0x3aca), 0x40 },
-+	{ CCI_REG8(0x3acb), 0x40 }, { CCI_REG8(0x3acc), 0x40 },
-+	{ CCI_REG8(0x3acd), 0x40 }, { CCI_REG8(0x3ace), 0x40 },
-+	{ CCI_REG8(0x3acf), 0x40 }, { CCI_REG8(0x3ad0), 0x40 },
-+	{ CCI_REG8(0x3ad1), 0x40 }, { CCI_REG8(0x3ad2), 0x40 },
-+	{ CCI_REG8(0x3ad3), 0x40 }, { CCI_REG8(0x3ad4), 0x40 },
-+	{ CCI_REG8(0x3ad5), 0x40 }, { CCI_REG8(0x3ad6), 0x40 },
-+	{ CCI_REG8(0x3ad7), 0x40 }, { CCI_REG8(0x3ad8), 0x40 },
-+	{ CCI_REG8(0x3ad9), 0x40 }, { CCI_REG8(0x3ada), 0x40 },
-+	{ CCI_REG8(0x3adb), 0x40 }, { CCI_REG8(0x3adc), 0x40 },
-+	{ CCI_REG8(0x3add), 0x40 }, { CCI_REG8(0x3ade), 0x40 },
-+	{ CCI_REG8(0x3adf), 0x40 }, { CCI_REG8(0x3ae0), 0x40 },
-+	{ CCI_REG8(0x3ae1), 0x40 }, { CCI_REG8(0x3ae2), 0x40 },
-+	{ CCI_REG8(0x3ae3), 0x40 }, { CCI_REG8(0x3ae4), 0x40 },
-+	{ CCI_REG8(0x3ae5), 0x40 }, { CCI_REG8(0x3ae6), 0x40 },
-+	{ CCI_REG8(0x3ae7), 0x40 }, { CCI_REG8(0x3ae8), 0x40 },
-+	{ CCI_REG8(0x3ae9), 0x40 }, { CCI_REG8(0x3aea), 0x40 },
-+	{ CCI_REG8(0x3aeb), 0x40 }, { CCI_REG8(0x3aec), 0x40 },
-+	{ CCI_REG8(0x3aed), 0x40 }, { CCI_REG8(0x3aee), 0x40 },
-+	{ CCI_REG8(0x3aef), 0xcd }, { CCI_REG8(0x3af0), 0xcd },
-+	{ CCI_REG8(0x3af1), 0xcd }, { CCI_REG8(0x3af2), 0xcd },
-+	{ CCI_REG8(0x3af3), 0xcd }, { CCI_REG8(0x3af4), 0xcd },
-+	{ CCI_REG8(0x3af5), 0xcd }, { CCI_REG8(0x3af6), 0xcd },
-+	{ CCI_REG8(0x3af7), 0xcd }, { CCI_REG8(0x3af8), 0xcd },
-+	{ CCI_REG8(0x3af9), 0xcd }, { CCI_REG8(0x3afa), 0xcd },
-+	{ CCI_REG8(0x3afb), 0xcd }, { CCI_REG8(0x3afc), 0xcd },
-+	{ CCI_REG8(0x3afd), 0xcd }, { CCI_REG8(0x3afe), 0xcd },
-+	{ CCI_REG8(0x3aff), 0xcd }, { CCI_REG8(0x3b00), 0xcd },
-+	{ CCI_REG8(0x3b01), 0xcd }, { CCI_REG8(0x3b02), 0xcd },
-+	{ CCI_REG8(0x3b03), 0xcd }, { CCI_REG8(0x3b04), 0xcd },
-+	{ CCI_REG8(0x3b05), 0xcd }, { CCI_REG8(0x3b06), 0xcd },
-+	{ CCI_REG8(0x3b07), 0xcd }, { CCI_REG8(0x3b08), 0xcd },
-+	{ CCI_REG8(0x3b09), 0xcd }, { CCI_REG8(0x3b0a), 0xcd },
-+	{ CCI_REG8(0x3b0b), 0xcd }, { CCI_REG8(0x3b0c), 0xcd },
-+	{ CCI_REG8(0x3b0d), 0xcd }, { CCI_REG8(0x3b0e), 0xcd },
-+	{ CCI_REG8(0x3b0f), 0xcd }, { CCI_REG8(0x3b10), 0xcd },
-+	{ CCI_REG8(0x3b11), 0xcd }, { CCI_REG8(0x3b12), 0xcd },
-+	{ CCI_REG8(0x3b13), 0xcd }, { CCI_REG8(0x3b14), 0xcd },
-+	{ CCI_REG8(0x3b15), 0xcd }, { CCI_REG8(0x3b16), 0xcd },
-+	{ CCI_REG8(0x3b17), 0xcd }, { CCI_REG8(0x3b18), 0xcd },
-+	{ CCI_REG8(0x3b19), 0xcd }, { CCI_REG8(0x3b1a), 0xcd },
-+	{ CCI_REG8(0x3b1b), 0xcd }, { CCI_REG8(0x3b1c), 0xcd },
-+	{ CCI_REG8(0x3b1d), 0xcd }, { CCI_REG8(0x3b1e), 0xcd },
-+	{ CCI_REG8(0x3b1f), 0xcd }, { CCI_REG8(0x3b20), 0xcd },
-+	{ CCI_REG8(0x3b21), 0xcd }, { CCI_REG8(0x3b22), 0xcd },
-+	{ CCI_REG8(0x3b23), 0xcd }, { CCI_REG8(0x3b24), 0xcd },
-+	{ CCI_REG8(0x3b25), 0xcd }, { CCI_REG8(0x3b26), 0xcd },
-+	{ CCI_REG8(0x3b27), 0xcd }, { CCI_REG8(0x3b28), 0xcd },
-+	{ CCI_REG8(0x3b29), 0xcd }, { CCI_REG8(0x3b2a), 0xcd },
-+	{ CCI_REG8(0x3b2b), 0xcd }, { CCI_REG8(0x3b2c), 0xcd },
-+	{ CCI_REG8(0x3b2d), 0xcd }, { CCI_REG8(0x3b2e), 0xcd },
-+	{ CCI_REG8(0x3b2f), 0xcd }, { CCI_REG8(0x3b30), 0xcd },
-+	{ CCI_REG8(0x3b31), 0xcd }, { CCI_REG8(0x3b32), 0xcd },
-+	{ CCI_REG8(0x3b33), 0xcd }, { CCI_REG8(0x3b34), 0xcd },
-+	{ CCI_REG8(0x3b35), 0xcd }, { CCI_REG8(0x3b36), 0xcd },
-+	{ CCI_REG8(0x3b37), 0xcd }, { CCI_REG8(0x3b38), 0xcd },
-+	{ CCI_REG8(0x3b39), 0xcd }, { CCI_REG8(0x3b3a), 0xcd },
-+	{ CCI_REG8(0x3b3b), 0xcd }, { CCI_REG8(0x3b3c), 0xcd },
-+	{ CCI_REG8(0x3b3d), 0xcd }, { CCI_REG8(0x3b3e), 0xcd },
-+	{ CCI_REG8(0x3b3f), 0xcd }, { CCI_REG8(0x3b40), 0xcd },
-+	{ CCI_REG8(0x3b41), 0xcd }, { CCI_REG8(0x3b42), 0xcd },
-+	{ CCI_REG8(0x3b43), 0xcd }, { CCI_REG8(0x3b44), 0xcd },
-+	{ CCI_REG8(0x3b45), 0xcd }, { CCI_REG8(0x3b46), 0xcd },
-+	{ CCI_REG8(0x3b47), 0xcd }, { CCI_REG8(0x3b48), 0xcd },
-+	{ CCI_REG8(0x3b49), 0xcd }, { CCI_REG8(0x3b4a), 0xcd },
-+	{ CCI_REG8(0x3b4b), 0xcd }, { CCI_REG8(0x3b4c), 0xcd },
-+	{ CCI_REG8(0x3b4d), 0xcd }, { CCI_REG8(0x3b4e), 0xcd },
-+	{ CCI_REG8(0x3b4f), 0xcd }, { CCI_REG8(0x3b50), 0xcd },
-+	{ CCI_REG8(0x3b51), 0xcd }, { CCI_REG8(0x3b52), 0xcd },
-+	{ CCI_REG8(0x3b53), 0xcd }, { CCI_REG8(0x3b54), 0xcd },
-+	{ CCI_REG8(0x3b55), 0xcd }, { CCI_REG8(0x3b56), 0xcd },
-+	{ CCI_REG8(0x3b57), 0xcd }, { CCI_REG8(0x3b58), 0xcd },
-+	{ CCI_REG8(0x3b59), 0xcd }, { CCI_REG8(0x3b5a), 0xcd },
-+	{ CCI_REG8(0x3b5b), 0xcd }, { CCI_REG8(0x3b5c), 0xcd },
-+	{ CCI_REG8(0x3b5d), 0xcd }, { CCI_REG8(0x3b5e), 0xcd },
-+	{ CCI_REG8(0x3b5f), 0xcd }, { CCI_REG8(0x3b60), 0xcd },
-+	{ CCI_REG8(0x3b61), 0xcd }, { CCI_REG8(0x3b62), 0xcd },
-+	{ CCI_REG8(0x3b63), 0xcd }, { CCI_REG8(0x3b64), 0xcd },
-+	{ CCI_REG8(0x3b65), 0xcd }, { CCI_REG8(0x3b66), 0xcd },
-+	{ CCI_REG8(0x3b67), 0xcd }, { CCI_REG8(0x3b68), 0xcd },
-+	{ CCI_REG8(0x3b69), 0xcd }, { CCI_REG8(0x3b6a), 0xcd },
-+	{ CCI_REG8(0x3b6b), 0xcd }, { CCI_REG8(0x3b6c), 0xcd },
-+	{ CCI_REG8(0x3b6d), 0xcd }, { CCI_REG8(0x3b6e), 0xcd },
-+	{ CCI_REG8(0x3b6f), 0xcd }, { CCI_REG8(0x3b70), 0xcd },
-+	{ CCI_REG8(0x3b71), 0xcd }, { CCI_REG8(0x3b72), 0xcd },
-+	{ CCI_REG8(0x3b73), 0xcd }, { CCI_REG8(0x3b74), 0xcd },
-+	{ CCI_REG8(0x3b75), 0xcd }, { CCI_REG8(0x3b76), 0xcd },
-+	{ CCI_REG8(0x3b77), 0xcd }, { CCI_REG8(0x3b78), 0xcd },
-+	{ CCI_REG8(0x3b79), 0xcd }, { CCI_REG8(0x3b7a), 0xcd },
-+	{ CCI_REG8(0x3b7b), 0xcd }, { CCI_REG8(0x3b7c), 0xcd },
-+	{ CCI_REG8(0x3b7d), 0xcd }, { CCI_REG8(0x3b7e), 0xcd },
-+	{ CCI_REG8(0x3b7f), 0xcd }, { CCI_REG8(0x3b80), 0xcd },
-+	{ CCI_REG8(0x3b81), 0xcd }, { CCI_REG8(0x3b82), 0xcd },
-+	{ CCI_REG8(0x3b83), 0xcd }, { CCI_REG8(0x3b84), 0xcd },
-+	{ CCI_REG8(0x3b85), 0xcd }, { CCI_REG8(0x3b86), 0xcd },
-+	{ CCI_REG8(0x3b87), 0xcd }, { CCI_REG8(0x3b88), 0xcd },
-+	{ CCI_REG8(0x3b89), 0xcd }, { CCI_REG8(0x3b8a), 0xcd },
-+	{ CCI_REG8(0x3b8b), 0xcd }, { CCI_REG8(0x3b8c), 0xcd },
-+	{ CCI_REG8(0x3b8d), 0xcd }, { CCI_REG8(0x3b8e), 0xcd },
-+	{ CCI_REG8(0x3b8f), 0xcd }, { CCI_REG8(0x3b90), 0xcd },
-+	{ CCI_REG8(0x3b91), 0xcd }, { CCI_REG8(0x3b92), 0xcd },
-+	{ CCI_REG8(0x3b93), 0xcd }, { CCI_REG8(0x3b94), 0xcd },
-+	{ CCI_REG8(0x3b95), 0xcd }, { CCI_REG8(0x3b96), 0xcd },
-+	{ CCI_REG8(0x3b97), 0xcd }, { CCI_REG8(0x3b98), 0xcd },
-+	{ CCI_REG8(0x3b99), 0xcd }, { CCI_REG8(0x3b9a), 0xcd },
-+	{ CCI_REG8(0x3b9b), 0xcd }, { CCI_REG8(0x3b9c), 0xcd },
-+	{ CCI_REG8(0x3b9d), 0xcd }, { CCI_REG8(0x3b9e), 0xcd },
-+	{ CCI_REG8(0x3b9f), 0xcd }, { CCI_REG8(0x3ba0), 0xcd },
-+	{ CCI_REG8(0x3ba1), 0xcd }, { CCI_REG8(0x3ba2), 0xcd },
-+	{ CCI_REG8(0x3ba3), 0xcd }, { CCI_REG8(0x3ba4), 0xcd },
-+	{ CCI_REG8(0x3ba5), 0xcd }, { CCI_REG8(0x3ba6), 0xcd },
-+	{ CCI_REG8(0x3ba7), 0xcd }, { CCI_REG8(0x3ba8), 0xcd },
-+	{ CCI_REG8(0x3ba9), 0xcd }, { CCI_REG8(0x3baa), 0xcd },
-+	{ CCI_REG8(0x3bab), 0xcd }, { CCI_REG8(0x3bac), 0xcd },
-+	{ CCI_REG8(0x3bad), 0xcd }, { CCI_REG8(0x3bae), 0xcd },
-+	{ CCI_REG8(0x3baf), 0xcd }, { CCI_REG8(0x3bb0), 0xcd },
-+	{ CCI_REG8(0x3bb1), 0xcd }, { CCI_REG8(0x3bb2), 0xcd },
-+	{ CCI_REG8(0x3bb3), 0xcd }, { CCI_REG8(0x3bb4), 0xcd },
-+	{ CCI_REG8(0x3bb5), 0xcd }, { CCI_REG8(0x3bb6), 0xcd },
-+	{ CCI_REG8(0x3bb7), 0xcd }, { CCI_REG8(0x3bb8), 0xcd },
-+	{ CCI_REG8(0x3bb9), 0xcd }, { CCI_REG8(0x3bba), 0xcd },
-+	{ CCI_REG8(0x3bbb), 0xcd }, { CCI_REG8(0x3bbc), 0xcd },
-+	{ CCI_REG8(0x3bbd), 0xcd }, { CCI_REG8(0x3bbe), 0xcd },
-+	{ CCI_REG8(0x3bbf), 0xcd }, { CCI_REG8(0x3bc0), 0xcd },
-+	{ CCI_REG8(0x3bc1), 0xcd }, { CCI_REG8(0x3bc2), 0xcd },
-+	{ CCI_REG8(0x3bc3), 0xcd }, { CCI_REG8(0x3bc4), 0xcd },
-+	{ CCI_REG8(0x3bc5), 0xcd }, { CCI_REG8(0x3bc6), 0xcd },
-+	{ CCI_REG8(0x3bc7), 0xcd }, { CCI_REG8(0x3bc8), 0xcd },
-+	{ CCI_REG8(0x3bc9), 0xcd }, { CCI_REG8(0x3bca), 0xcd },
-+	{ CCI_REG8(0x3bcb), 0xcd }, { CCI_REG8(0x3bcc), 0xcd },
-+	{ CCI_REG8(0x3bcd), 0xcd }, { CCI_REG8(0x3bce), 0xcd },
-+	{ CCI_REG8(0x3bcf), 0xcd }, { CCI_REG8(0x3bd0), 0xcd },
-+	{ CCI_REG8(0x3bd1), 0xcd }, { CCI_REG8(0x3bd2), 0xcd },
-+	{ CCI_REG8(0x3bd3), 0xcd }, { CCI_REG8(0x3bd4), 0xcd },
-+	{ CCI_REG8(0x3bd5), 0xcd }, { CCI_REG8(0x3bd6), 0xcd },
-+	{ CCI_REG8(0x3bd7), 0xcd }, { CCI_REG8(0x3bd8), 0xcd },
-+	{ CCI_REG8(0x3bd9), 0xcd }, { CCI_REG8(0x3bda), 0xcd },
-+	{ CCI_REG8(0x3bdb), 0xcd }, { CCI_REG8(0x3bdc), 0xcd },
-+	{ CCI_REG8(0x3bdd), 0xcd }, { CCI_REG8(0x3bde), 0xcd },
-+	{ CCI_REG8(0x3bdf), 0xcd }, { CCI_REG8(0x3be0), 0xcd },
-+	{ CCI_REG8(0x3be1), 0xcd }, { CCI_REG8(0x3be2), 0xcd },
-+	{ CCI_REG8(0x3be3), 0xcd }, { CCI_REG8(0x3be4), 0xcd },
-+	{ CCI_REG8(0x3be5), 0xcd }, { CCI_REG8(0x3be6), 0xcd },
-+	{ CCI_REG8(0x3be7), 0xcd }, { CCI_REG8(0x3be8), 0xcd },
-+	{ CCI_REG8(0x3be9), 0xcd }, { CCI_REG8(0x3bea), 0xcd },
-+	{ CCI_REG8(0x3beb), 0xcd }, { CCI_REG8(0x3bec), 0xcd },
-+	{ CCI_REG8(0x3bed), 0xcd }, { CCI_REG8(0x3bee), 0xcd },
-+	{ CCI_REG8(0x3bef), 0xcd }, { CCI_REG8(0x3bf0), 0xcd },
-+	{ CCI_REG8(0x3bf1), 0xcd }, { CCI_REG8(0x3bf2), 0xcd },
-+	{ CCI_REG8(0x3bf3), 0xcd }, { CCI_REG8(0x3bf4), 0xcd },
-+	{ CCI_REG8(0x3bf5), 0xcd }, { CCI_REG8(0x3bf6), 0xcd },
-+	{ CCI_REG8(0x3bf7), 0xcd }, { CCI_REG8(0x3bf8), 0xcd },
-+	{ CCI_REG8(0x3bf9), 0xcd }, { CCI_REG8(0x3bfa), 0xcd },
-+	{ CCI_REG8(0x3bfb), 0xcd }, { CCI_REG8(0x3bfc), 0xcd },
-+	{ CCI_REG8(0x3bfd), 0xcd }, { CCI_REG8(0x3bfe), 0xcd },
-+	{ CCI_REG8(0x3bff), 0xcd }, { CCI_REG8(0x3c00), 0xcd },
-+	{ CCI_REG8(0x3c01), 0xcd }, { CCI_REG8(0x3c02), 0xcd },
-+	{ CCI_REG8(0x3c03), 0xcd }, { CCI_REG8(0x3c04), 0xcd },
-+	{ CCI_REG8(0x3c05), 0xcd }, { CCI_REG8(0x3c06), 0xcd },
-+	{ CCI_REG8(0x3c07), 0xcd }, { CCI_REG8(0x3c08), 0xcd },
-+	{ CCI_REG8(0x3c09), 0xcd }, { CCI_REG8(0x3c0a), 0xcd },
-+	{ CCI_REG8(0x3c0b), 0xcd }, { CCI_REG8(0x3c0c), 0xcd },
-+	{ CCI_REG8(0x3c0d), 0xcd }, { CCI_REG8(0x3c0e), 0xcd },
-+	{ CCI_REG8(0x3c0f), 0xcd }, { CCI_REG8(0x3c10), 0xcd },
-+	{ CCI_REG8(0x3c11), 0xcd }, { CCI_REG8(0x3c12), 0xcd },
-+	{ CCI_REG8(0x3c13), 0xcd }, { CCI_REG8(0x3c14), 0xcd },
-+	{ CCI_REG8(0x3c15), 0xcd }, { CCI_REG8(0x3c16), 0xcd },
-+	{ CCI_REG8(0x3c17), 0xcd }, { CCI_REG8(0x3c18), 0xcd },
-+	{ CCI_REG8(0x3c19), 0xcd }, { CCI_REG8(0x3c1a), 0xcd },
-+	{ CCI_REG8(0x3c1b), 0xcd }, { CCI_REG8(0x3c1c), 0xcd },
-+	{ CCI_REG8(0x3c1d), 0xcd }, { CCI_REG8(0x3c1e), 0xcd },
-+	{ CCI_REG8(0x3c1f), 0xcd }, { CCI_REG8(0x3c20), 0xcd },
-+	{ CCI_REG8(0x3c21), 0xcd }, { CCI_REG8(0x3c22), 0xcd },
-+	{ CCI_REG8(0x3c23), 0xcd }, { CCI_REG8(0x3c24), 0xcd },
-+	{ CCI_REG8(0x3c25), 0xcd }, { CCI_REG8(0x3c26), 0xcd },
-+	{ CCI_REG8(0x3c27), 0xcd }, { CCI_REG8(0x3c28), 0xcd },
-+	{ CCI_REG8(0x3c29), 0xcd }, { CCI_REG8(0x3c2a), 0xcd },
-+	{ CCI_REG8(0x3c2b), 0xcd }, { CCI_REG8(0x3c2c), 0xcd },
-+	{ CCI_REG8(0x3c2d), 0xcd }, { CCI_REG8(0x3c2e), 0xcd },
-+	{ CCI_REG8(0x3c2f), 0xcd }, { CCI_REG8(0x3c30), 0xcd },
-+	{ CCI_REG8(0x3c31), 0xcd }, { CCI_REG8(0x3c32), 0xcd },
-+	{ CCI_REG8(0x3c33), 0xcd }, { CCI_REG8(0x3c34), 0xcd },
-+	{ CCI_REG8(0x3c35), 0xcd }, { CCI_REG8(0x3c36), 0xcd },
-+	{ CCI_REG8(0x3c37), 0xcd }, { CCI_REG8(0x3c38), 0xcd },
-+	{ CCI_REG8(0x3c39), 0xcd }, { CCI_REG8(0x3c3a), 0xcd },
-+	{ CCI_REG8(0x3c3b), 0xcd }, { CCI_REG8(0x3c3c), 0xcd },
-+	{ CCI_REG8(0x3c3d), 0xcd }, { CCI_REG8(0x3c3e), 0xcd },
-+	{ CCI_REG8(0x3c3f), 0xcd }, { CCI_REG8(0x3c40), 0xcd },
-+	{ CCI_REG8(0x3c41), 0xcd }, { CCI_REG8(0x3c42), 0xcd },
-+	{ CCI_REG8(0x3c43), 0xcd }, { CCI_REG8(0x3c44), 0xcd },
-+	{ CCI_REG8(0x3c45), 0xcd }, { CCI_REG8(0x3c46), 0xcd },
-+	{ CCI_REG8(0x3c47), 0xcd }, { CCI_REG8(0x3c48), 0xcd },
-+	{ CCI_REG8(0x3c49), 0xcd }, { CCI_REG8(0x3c4a), 0xcd },
-+	{ CCI_REG8(0x3c4b), 0xcd }, { CCI_REG8(0x3c4c), 0xcd },
-+	{ CCI_REG8(0x3c4d), 0xcd }, { CCI_REG8(0x3c4e), 0xcd },
-+	{ CCI_REG8(0x3c4f), 0xcd }, { CCI_REG8(0x3c50), 0xcd },
-+	{ CCI_REG8(0x3c51), 0xcd }, { CCI_REG8(0x3c52), 0xcd },
-+	{ CCI_REG8(0x3c53), 0xcd }, { CCI_REG8(0x3c54), 0xcd },
-+	{ CCI_REG8(0x3c55), 0xcd }, { CCI_REG8(0x3c56), 0xcd },
-+	{ CCI_REG8(0x3c57), 0xcd }, { CCI_REG8(0x3c58), 0xcd },
-+	{ CCI_REG8(0x3c59), 0xcd }, { CCI_REG8(0x3c5a), 0xcd },
-+	{ CCI_REG8(0x3c5b), 0xcd }, { CCI_REG8(0x3c5c), 0xcd },
-+	{ CCI_REG8(0x3c5d), 0xcd }, { CCI_REG8(0x3c5e), 0xcd },
-+	{ CCI_REG8(0x3c5f), 0xcd }, { CCI_REG8(0x3c60), 0xcd },
-+	{ CCI_REG8(0x3c61), 0xcd }, { CCI_REG8(0x3c62), 0xcd },
-+	{ CCI_REG8(0x3c63), 0xcd }, { CCI_REG8(0x3c64), 0xcd },
-+	{ CCI_REG8(0x3c65), 0xcd }, { CCI_REG8(0x3c66), 0xcd },
-+	{ CCI_REG8(0x3c67), 0xcd }, { CCI_REG8(0x3c68), 0xcd },
-+	{ CCI_REG8(0x3c69), 0xcd }, { CCI_REG8(0x3c6a), 0xcd },
-+	{ CCI_REG8(0x3c6b), 0xcd }, { CCI_REG8(0x3c6c), 0xcd },
-+	{ CCI_REG8(0x3c6d), 0xcd }, { CCI_REG8(0x3c6e), 0xcd },
-+	{ CCI_REG8(0x3c6f), 0xcd }, { CCI_REG8(0x3c70), 0xcd },
-+	{ CCI_REG8(0x3c71), 0xcd }, { CCI_REG8(0x3c72), 0xcd },
-+	{ CCI_REG8(0x3c73), 0xcd }, { CCI_REG8(0x3c74), 0xcd },
-+	{ CCI_REG8(0x3c75), 0xcd }, { CCI_REG8(0x3c76), 0xcd },
-+	{ CCI_REG8(0x3c77), 0xcd }, { CCI_REG8(0x3c78), 0xcd },
-+	{ CCI_REG8(0x3c79), 0xcd }, { CCI_REG8(0x3c7a), 0xcd },
-+	{ CCI_REG8(0x3c7b), 0xcd }, { CCI_REG8(0x3c7c), 0xcd },
-+	{ CCI_REG8(0x3c7d), 0xcd }, { CCI_REG8(0x3c7e), 0xcd },
-+	{ CCI_REG8(0x3c7f), 0xcd }, { CCI_REG8(0x3c80), 0xcd },
-+	{ CCI_REG8(0x3c81), 0xcd }, { CCI_REG8(0x3c82), 0xcd },
-+	{ CCI_REG8(0x3c83), 0xcd }, { CCI_REG8(0x3c84), 0xcd },
-+	{ CCI_REG8(0x3c85), 0xcd }, { CCI_REG8(0x3c86), 0xcd },
-+	{ CCI_REG8(0x3c87), 0xcd }, { CCI_REG8(0x3c88), 0xcd },
-+	{ CCI_REG8(0x3c89), 0xcd }, { CCI_REG8(0x3c8a), 0xcd },
-+	{ CCI_REG8(0x3c8b), 0xcd }, { CCI_REG8(0x3c8c), 0xcd },
-+	{ CCI_REG8(0x3c8d), 0xcd }, { CCI_REG8(0x3c8e), 0xcd },
-+	{ CCI_REG8(0x3c8f), 0xcd }, { CCI_REG8(0x3c90), 0xcd },
-+	{ CCI_REG8(0x3c91), 0xcd }, { CCI_REG8(0x3c92), 0xcd },
-+	{ CCI_REG8(0x3c93), 0xcd }, { CCI_REG8(0x3c94), 0xcd },
-+	{ CCI_REG8(0x3c95), 0xcd }, { CCI_REG8(0x3c96), 0xcd },
-+	{ CCI_REG8(0x3c97), 0xcd }, { CCI_REG8(0x3c98), 0xcd },
-+	{ CCI_REG8(0x3c99), 0xcd }, { CCI_REG8(0x3c9a), 0xcd },
-+	{ CCI_REG8(0x3c9b), 0xcd }, { CCI_REG8(0x3c9c), 0xcd },
-+	{ CCI_REG8(0x3c9d), 0xcd }, { CCI_REG8(0x3c9e), 0xcd },
-+	{ CCI_REG8(0x3c9f), 0xcd }, { CCI_REG8(0x3ca0), 0xcd },
-+	{ CCI_REG8(0x3ca1), 0xcd }, { CCI_REG8(0x3ca2), 0xcd },
-+	{ CCI_REG8(0x3ca3), 0xcd }, { CCI_REG8(0x3ca4), 0xcd },
-+	{ CCI_REG8(0x3ca5), 0xcd }, { CCI_REG8(0x3ca6), 0xcd },
-+	{ CCI_REG8(0x3ca7), 0xcd }, { CCI_REG8(0x3ca8), 0xcd },
-+	{ CCI_REG8(0x3ca9), 0xcd }, { CCI_REG8(0x3caa), 0xcd },
-+	{ CCI_REG8(0x3cab), 0xcd }, { CCI_REG8(0x3cac), 0xcd },
-+	{ CCI_REG8(0x3cad), 0xcd }, { CCI_REG8(0x3cae), 0xcd },
-+	{ CCI_REG8(0x3caf), 0xcd }, { CCI_REG8(0x3cb0), 0xcd },
-+	{ CCI_REG8(0x3cb1), 0x40 }, { CCI_REG8(0x3cb2), 0x40 },
-+	{ CCI_REG8(0x3cb3), 0x40 }, { CCI_REG8(0x3cb4), 0x40 },
-+	{ CCI_REG8(0x3cb5), 0x40 }, { CCI_REG8(0x3cb6), 0x40 },
-+	{ CCI_REG8(0x3cb7), 0x40 }, { CCI_REG8(0x3cb8), 0x40 },
-+	{ CCI_REG8(0x3cb9), 0x40 }, { CCI_REG8(0x3cba), 0x40 },
-+	{ CCI_REG8(0x3cbb), 0x40 }, { CCI_REG8(0x3cbc), 0x40 },
-+	{ CCI_REG8(0x3cbd), 0x40 }, { CCI_REG8(0x3cbe), 0x40 },
-+	{ CCI_REG8(0x3cbf), 0x40 }, { CCI_REG8(0x3cc0), 0x40 },
-+	{ CCI_REG8(0x3cc1), 0x40 }, { CCI_REG8(0x3cc2), 0x40 },
-+	{ CCI_REG8(0x3cc3), 0x40 }, { CCI_REG8(0x3cc4), 0x40 },
-+	{ CCI_REG8(0x3cc5), 0x40 }, { CCI_REG8(0x3cc6), 0x40 },
-+	{ CCI_REG8(0x3cc7), 0x40 }, { CCI_REG8(0x3cc8), 0x40 },
-+	{ CCI_REG8(0x3cc9), 0x40 }, { CCI_REG8(0x3cca), 0x40 },
-+	{ CCI_REG8(0x3ccb), 0x40 }, { CCI_REG8(0x3ccc), 0x40 },
-+	{ CCI_REG8(0x3ccd), 0x40 }, { CCI_REG8(0x3cce), 0x40 },
-+	{ CCI_REG8(0x3ccf), 0x40 }, { CCI_REG8(0x3cd0), 0x40 },
-+	{ CCI_REG8(0x3cd1), 0x40 }, { CCI_REG8(0x3cd2), 0x40 },
-+	{ CCI_REG8(0x3cd3), 0x40 }, { CCI_REG8(0x3cd4), 0x40 },
-+	{ CCI_REG8(0x3cd5), 0x40 }, { CCI_REG8(0x3cd6), 0x40 },
-+	{ CCI_REG8(0x3cd7), 0x40 }, { CCI_REG8(0x3cd8), 0x40 },
-+	{ CCI_REG8(0x3cd9), 0x40 }, { CCI_REG8(0x3cda), 0x40 },
-+	{ CCI_REG8(0x3cdb), 0x40 }, { CCI_REG8(0x3cdc), 0x40 },
-+	{ CCI_REG8(0x3cdd), 0x40 }, { CCI_REG8(0x3cde), 0x40 },
-+	{ CCI_REG8(0x3cdf), 0x40 }, { CCI_REG8(0x3ce0), 0x40 },
-+	{ CCI_REG8(0x3ce1), 0x40 }, { CCI_REG8(0x3ce2), 0x40 },
-+	{ CCI_REG8(0x3ce3), 0x40 }, { CCI_REG8(0x3ce4), 0x40 },
-+	{ CCI_REG8(0x3ce5), 0x40 }, { CCI_REG8(0x3ce6), 0x40 },
-+	{ CCI_REG8(0x3ce7), 0x40 }, { CCI_REG8(0x3ce8), 0x40 },
-+	{ CCI_REG8(0x3ce9), 0x40 }, { CCI_REG8(0x3cea), 0x40 },
-+	{ CCI_REG8(0x3ceb), 0x40 }, { CCI_REG8(0x3cec), 0x40 },
-+	{ CCI_REG8(0x3ced), 0x40 }, { CCI_REG8(0x3cee), 0x40 },
-+	{ CCI_REG8(0x3cef), 0x40 }, { CCI_REG8(0x3cf0), 0x40 },
-+	{ CCI_REG8(0x3cf1), 0x40 }, { CCI_REG8(0x3cf2), 0x40 },
-+	{ CCI_REG8(0x3cf3), 0x40 }, { CCI_REG8(0x3cf4), 0x40 },
-+	{ CCI_REG8(0x3cf5), 0x40 }, { CCI_REG8(0x3cf6), 0x40 },
-+	{ CCI_REG8(0x3cf7), 0x40 }, { CCI_REG8(0x3cf8), 0x40 },
-+	{ CCI_REG8(0x3cf9), 0x40 }, { CCI_REG8(0x3cfa), 0x40 },
-+	{ CCI_REG8(0x3cfb), 0x40 }, { CCI_REG8(0x3cfc), 0x40 },
-+	{ CCI_REG8(0x3cfd), 0x40 }, { CCI_REG8(0x3cfe), 0x40 },
-+	{ CCI_REG8(0x3cff), 0x40 }, { CCI_REG8(0x3d00), 0x40 },
-+	{ CCI_REG8(0x3d01), 0x40 }, { CCI_REG8(0x3d02), 0x40 },
-+	{ CCI_REG8(0x3d03), 0x40 }, { CCI_REG8(0x3d04), 0x40 },
-+	{ CCI_REG8(0x3d05), 0x40 }, { CCI_REG8(0x3d06), 0x40 },
-+	{ CCI_REG8(0x3d07), 0x40 }, { CCI_REG8(0x3d08), 0x40 },
-+	{ CCI_REG8(0x3d09), 0x40 }, { CCI_REG8(0x3d0a), 0x40 },
-+	{ CCI_REG8(0x3d0b), 0xcd }, { CCI_REG8(0x3d0c), 0xcd },
-+	{ CCI_REG8(0x3d0d), 0xcd }, { CCI_REG8(0x3d0e), 0xcd },
-+	{ CCI_REG8(0x3d0f), 0xcd }, { CCI_REG8(0x3d10), 0xcd },
-+	{ CCI_REG8(0x3d11), 0xcd }, { CCI_REG8(0x3d12), 0xcd },
-+	{ CCI_REG8(0x3d13), 0xcd }, { CCI_REG8(0x3d14), 0xcd },
-+	{ CCI_REG8(0x3d15), 0xcd }, { CCI_REG8(0x3d16), 0xcd },
-+	{ CCI_REG8(0x3d17), 0xcd }, { CCI_REG8(0x3d18), 0xcd },
-+	{ CCI_REG8(0x3d19), 0xcd }, { CCI_REG8(0x3d1a), 0xcd },
-+	{ CCI_REG8(0x3d1b), 0xcd }, { CCI_REG8(0x3d1c), 0xcd },
-+	{ CCI_REG8(0x3d1d), 0xcd }, { CCI_REG8(0x3d1e), 0xcd },
-+	{ CCI_REG8(0x3d1f), 0xcd }, { CCI_REG8(0x3d20), 0xcd },
-+	{ CCI_REG8(0x3d21), 0xcd }, { CCI_REG8(0x3d22), 0xcd },
-+	{ CCI_REG8(0x3d23), 0xcd }, { CCI_REG8(0x3d24), 0xcd },
-+	{ CCI_REG8(0x3d25), 0xcd }, { CCI_REG8(0x3d26), 0xcd },
-+	{ CCI_REG8(0x3d27), 0xcd }, { CCI_REG8(0x3d28), 0xcd },
-+	{ CCI_REG8(0x3d29), 0xcd }, { CCI_REG8(0x3d2a), 0xcd },
-+	{ CCI_REG8(0x3d2b), 0xcd }, { CCI_REG8(0x3d2c), 0xcd },
-+	{ CCI_REG8(0x3d2d), 0xcd }, { CCI_REG8(0x3d2e), 0xcd },
-+	{ CCI_REG8(0x3d2f), 0xcd }, { CCI_REG8(0x3d30), 0xcd },
-+	{ CCI_REG8(0x3d31), 0xcd }, { CCI_REG8(0x3d32), 0xcd },
-+	{ CCI_REG8(0x3d33), 0xcd }, { CCI_REG8(0x3d34), 0xcd },
-+	{ CCI_REG8(0x3d35), 0xcd }, { CCI_REG8(0x3d36), 0xcd },
-+	{ CCI_REG8(0x3d37), 0xcd }, { CCI_REG8(0x3d38), 0xcd },
-+	{ CCI_REG8(0x3d39), 0xcd }, { CCI_REG8(0x3d3a), 0xcd },
-+	{ CCI_REG8(0x3d3b), 0xcd }, { CCI_REG8(0x3d3c), 0xcd },
-+	{ CCI_REG8(0x3d3d), 0xcd }, { CCI_REG8(0x3d3e), 0xcd },
-+	{ CCI_REG8(0x3d3f), 0xcd }, { CCI_REG8(0x3d40), 0xcd },
-+	{ CCI_REG8(0x3d41), 0xcd }, { CCI_REG8(0x3d42), 0xcd },
-+	{ CCI_REG8(0x3d43), 0xcd }, { CCI_REG8(0x3d44), 0xcd },
-+	{ CCI_REG8(0x3d45), 0xcd }, { CCI_REG8(0x3d46), 0xcd },
-+	{ CCI_REG8(0x3d47), 0xcd }, { CCI_REG8(0x3d48), 0xcd },
-+	{ CCI_REG8(0x3d49), 0xcd }, { CCI_REG8(0x3d4a), 0xcd },
-+	{ CCI_REG8(0x3d4b), 0xcd }, { CCI_REG8(0x3d4c), 0xcd },
-+	{ CCI_REG8(0x3d4d), 0xcd }, { CCI_REG8(0x3d4e), 0xcd },
-+	{ CCI_REG8(0x3d4f), 0xcd }, { CCI_REG8(0x3d50), 0xcd },
-+	{ CCI_REG8(0x3d51), 0xcd }, { CCI_REG8(0x3d52), 0xcd },
-+	{ CCI_REG8(0x3d53), 0xcd }, { CCI_REG8(0x3d54), 0xcd },
-+	{ CCI_REG8(0x3d55), 0xcd }, { CCI_REG8(0x3d56), 0xcd },
-+	{ CCI_REG8(0x3d57), 0xcd }, { CCI_REG8(0x3d58), 0xcd },
-+	{ CCI_REG8(0x3d59), 0xcd }, { CCI_REG8(0x3d5a), 0xcd },
-+	{ CCI_REG8(0x3d5b), 0xcd }, { CCI_REG8(0x3d5c), 0xcd },
-+	{ CCI_REG8(0x3d5d), 0xcd }, { CCI_REG8(0x3d5e), 0xcd },
-+	{ CCI_REG8(0x3d5f), 0xcd }, { CCI_REG8(0x3d60), 0xcd },
-+	{ CCI_REG8(0x3d61), 0xcd }, { CCI_REG8(0x3d62), 0xcd },
-+	{ CCI_REG8(0x3d63), 0xcd }, { CCI_REG8(0x3d64), 0xcd },
-+	{ CCI_REG8(0x3d65), 0x40 }, { CCI_REG8(0x3d66), 0x40 },
-+	{ CCI_REG8(0x3d67), 0x40 }, { CCI_REG8(0x3d68), 0x40 },
-+	{ CCI_REG8(0x3d69), 0x40 }, { CCI_REG8(0x3d6a), 0x40 },
-+	{ CCI_REG8(0x3d6b), 0x40 }, { CCI_REG8(0x3d6c), 0x40 },
-+	{ CCI_REG8(0x3d6d), 0x40 }, { CCI_REG8(0x3d6e), 0x40 },
-+	{ CCI_REG8(0x3d6f), 0x40 }, { CCI_REG8(0x3d70), 0x40 },
-+	{ CCI_REG8(0x3d71), 0x40 }, { CCI_REG8(0x3d72), 0x40 },
-+	{ CCI_REG8(0x3d73), 0x40 }, { CCI_REG8(0x3d74), 0x40 },
-+	{ CCI_REG8(0x3d75), 0x40 }, { CCI_REG8(0x3d76), 0x40 },
-+	{ CCI_REG8(0x3d77), 0x40 }, { CCI_REG8(0x3d78), 0x40 },
-+	{ CCI_REG8(0x3d79), 0x40 }, { CCI_REG8(0x3d7a), 0x40 },
-+	{ CCI_REG8(0x3d7b), 0x40 }, { CCI_REG8(0x3d7c), 0x40 },
-+	{ CCI_REG8(0x3d7d), 0x40 }, { CCI_REG8(0x3d7e), 0x40 },
-+	{ CCI_REG8(0x3d7f), 0x40 }, { CCI_REG8(0x3d80), 0x40 },
-+	{ CCI_REG8(0x3d81), 0x40 }, { CCI_REG8(0x3d82), 0x40 },
-+	{ CCI_REG8(0x3d83), 0x40 }, { CCI_REG8(0x3d84), 0x40 },
-+	{ CCI_REG8(0x3d85), 0x40 }, { CCI_REG8(0x3d86), 0x40 },
-+	{ CCI_REG8(0x3d87), 0x40 }, { CCI_REG8(0x3d88), 0x40 },
-+	{ CCI_REG8(0x3d89), 0x40 }, { CCI_REG8(0x3d8a), 0x40 },
-+	{ CCI_REG8(0x3d8b), 0x40 }, { CCI_REG8(0x3d8c), 0x40 },
-+	{ CCI_REG8(0x3d8d), 0x40 }, { CCI_REG8(0x3d8e), 0x40 },
-+	{ CCI_REG8(0x3d8f), 0x40 }, { CCI_REG8(0x3d90), 0x40 },
-+	{ CCI_REG8(0x3d91), 0x40 }, { CCI_REG8(0x3d92), 0x40 },
-+	{ CCI_REG8(0x3d93), 0x40 }, { CCI_REG8(0x3d94), 0x40 },
-+	{ CCI_REG8(0x3d95), 0x40 }, { CCI_REG8(0x3d96), 0x40 },
-+	{ CCI_REG8(0x3d97), 0x40 }, { CCI_REG8(0x3d98), 0x40 },
-+	{ CCI_REG8(0x3d99), 0x40 }, { CCI_REG8(0x3d9a), 0x40 },
-+	{ CCI_REG8(0x3d9b), 0x40 }, { CCI_REG8(0x3d9c), 0x40 },
-+	{ CCI_REG8(0x3d9d), 0x40 }, { CCI_REG8(0x3d9e), 0x40 },
-+	{ CCI_REG8(0x3d9f), 0x40 }, { CCI_REG8(0x3da0), 0x40 },
-+	{ CCI_REG8(0x3da1), 0x40 }, { CCI_REG8(0x3da2), 0x40 },
-+	{ CCI_REG8(0x3da3), 0x40 }, { CCI_REG8(0x3da4), 0x40 },
-+	{ CCI_REG8(0x3da5), 0x40 }, { CCI_REG8(0x3da6), 0x40 },
-+	{ CCI_REG8(0x3da7), 0x40 }, { CCI_REG8(0x3da8), 0x40 },
-+	{ CCI_REG8(0x3da9), 0x40 }, { CCI_REG8(0x3daa), 0x40 },
-+	{ CCI_REG8(0x3dab), 0x40 }, { CCI_REG8(0x3dac), 0x40 },
-+	{ CCI_REG8(0x3dad), 0x40 }, { CCI_REG8(0x3dae), 0x40 },
-+	{ CCI_REG8(0x3daf), 0x40 }, { CCI_REG8(0x3db0), 0x40 },
-+	{ CCI_REG8(0x3db1), 0x40 }, { CCI_REG8(0x3db2), 0x40 },
-+	{ CCI_REG8(0x3db3), 0x40 }, { CCI_REG8(0x3db4), 0x40 },
-+	{ CCI_REG8(0x3db5), 0x40 }, { CCI_REG8(0x3db6), 0x40 },
-+	{ CCI_REG8(0x3db7), 0x40 }, { CCI_REG8(0x3db8), 0x40 },
-+	{ CCI_REG8(0x3db9), 0x40 }, { CCI_REG8(0x3dba), 0x40 },
-+	{ CCI_REG8(0x3dbb), 0x40 }, { CCI_REG8(0x3dbc), 0x40 },
-+	{ CCI_REG8(0x3dbd), 0x40 }, { CCI_REG8(0x3dbe), 0x40 },
-+	{ CCI_REG8(0x3dbf), 0xcd }, { CCI_REG8(0x3dc0), 0xcd },
-+	{ CCI_REG8(0x3dc1), 0xcd }, { CCI_REG8(0x3dc2), 0xcd },
-+	{ CCI_REG8(0x3dc3), 0xcd }, { CCI_REG8(0x3dc4), 0xcd },
-+	{ CCI_REG8(0x3dc5), 0xcd }, { CCI_REG8(0x3dc6), 0xcd },
-+	{ CCI_REG8(0x3dc7), 0xcd }, { CCI_REG8(0x3dc8), 0xcd },
-+	{ CCI_REG8(0x3dc9), 0xcd }, { CCI_REG8(0x3dca), 0xcd },
-+	{ CCI_REG8(0x3dcb), 0xcd }, { CCI_REG8(0x3dcc), 0xcd },
-+	{ CCI_REG8(0x3dcd), 0xcd }, { CCI_REG8(0x3dce), 0xcd },
-+	{ CCI_REG8(0x3dcf), 0xcd }, { CCI_REG8(0x3dd0), 0xcd },
-+	{ CCI_REG8(0x3dd1), 0xcd }, { CCI_REG8(0x3dd2), 0xcd },
-+	{ CCI_REG8(0x3dd3), 0xcd }, { CCI_REG8(0x3dd4), 0xcd },
-+	{ CCI_REG8(0x3dd5), 0xcd }, { CCI_REG8(0x3dd6), 0xcd },
-+	{ CCI_REG8(0x3dd7), 0xcd }, { CCI_REG8(0x3dd8), 0xcd },
-+	{ CCI_REG8(0x3dd9), 0xcd }, { CCI_REG8(0x3dda), 0xcd },
-+	{ CCI_REG8(0x3ddb), 0xcd }, { CCI_REG8(0x3ddc), 0xcd },
-+	{ CCI_REG8(0x3ddd), 0xcd }, { CCI_REG8(0x3dde), 0xcd },
-+	{ CCI_REG8(0x3ddf), 0xcd }, { CCI_REG8(0x3de0), 0xcd },
-+	{ CCI_REG8(0x3de1), 0xcd }, { CCI_REG8(0x3de2), 0xcd },
-+	{ CCI_REG8(0x3de3), 0xcd }, { CCI_REG8(0x3de4), 0xcd },
-+	{ CCI_REG8(0x3de5), 0xcd }, { CCI_REG8(0x3de6), 0xcd },
-+	{ CCI_REG8(0x3de7), 0xcd }, { CCI_REG8(0x3de8), 0xcd },
-+	{ CCI_REG8(0x3de9), 0xcd }, { CCI_REG8(0x3dea), 0xcd },
-+	{ CCI_REG8(0x3deb), 0xcd }, { CCI_REG8(0x3dec), 0xcd },
-+	{ CCI_REG8(0x3ded), 0xcd }, { CCI_REG8(0x3dee), 0xcd },
-+	{ CCI_REG8(0x3def), 0xcd }, { CCI_REG8(0x3df0), 0xcd },
-+	{ CCI_REG8(0x3df1), 0xcd }, { CCI_REG8(0x3df2), 0xcd },
-+	{ CCI_REG8(0x3df3), 0xcd }, { CCI_REG8(0x3df4), 0xcd },
-+	{ CCI_REG8(0x3df5), 0xcd }, { CCI_REG8(0x3df6), 0xcd },
-+	{ CCI_REG8(0x3df7), 0xcd }, { CCI_REG8(0x3df8), 0xcd },
-+	{ CCI_REG8(0x3df9), 0xcd }, { CCI_REG8(0x3dfa), 0xcd },
-+	{ CCI_REG8(0x3dfb), 0xcd }, { CCI_REG8(0x3dfc), 0xcd },
-+	{ CCI_REG8(0x3dfd), 0xcd }, { CCI_REG8(0x3dfe), 0xcd },
-+	{ CCI_REG8(0x3dff), 0xcd }, { CCI_REG8(0x3e00), 0xcd },
-+	{ CCI_REG8(0x3e01), 0xcd }, { CCI_REG8(0x3e02), 0xcd },
-+	{ CCI_REG8(0x3e03), 0xcd }, { CCI_REG8(0x3e04), 0xcd },
-+	{ CCI_REG8(0x3e05), 0xcd }, { CCI_REG8(0x3e06), 0xcd },
-+	{ CCI_REG8(0x3e07), 0xcd }, { CCI_REG8(0x3e08), 0xcd },
-+	{ CCI_REG8(0x3e09), 0xcd }, { CCI_REG8(0x3e0a), 0xcd },
-+	{ CCI_REG8(0x3e0b), 0xcd }, { CCI_REG8(0x3e0c), 0xcd },
-+	{ CCI_REG8(0x3e0d), 0xcd }, { CCI_REG8(0x3e0e), 0xcd },
-+	{ CCI_REG8(0x3e0f), 0xcd }, { CCI_REG8(0x3e10), 0xcd },
-+	{ CCI_REG8(0x3e11), 0xcd }, { CCI_REG8(0x3e12), 0xcd },
-+	{ CCI_REG8(0x3e13), 0xcd }, { CCI_REG8(0x3e14), 0xcd },
-+	{ CCI_REG8(0x3e15), 0xcd }, { CCI_REG8(0x3e16), 0xcd },
-+	{ CCI_REG8(0x3e17), 0xcd }, { CCI_REG8(0x3e18), 0xcd },
-+	{ CCI_REG8(0x3e19), 0xcd }, { CCI_REG8(0x3e1a), 0xcd },
-+	{ CCI_REG8(0x3e1b), 0xcd }, { CCI_REG8(0x3e1c), 0xcd },
-+	{ CCI_REG8(0x3e1d), 0xcd }, { CCI_REG8(0x3e1e), 0xcd },
-+	{ CCI_REG8(0x3e1f), 0xcd }, { CCI_REG8(0x3e20), 0xcd },
-+	{ CCI_REG8(0x3e21), 0xcd }, { CCI_REG8(0x3e22), 0xcd },
-+	{ CCI_REG8(0x3e23), 0xcd }, { CCI_REG8(0x3e24), 0xcd },
-+	{ CCI_REG8(0x3e25), 0xcd }, { CCI_REG8(0x3e26), 0xcd },
-+	{ CCI_REG8(0x3e27), 0xcd }, { CCI_REG8(0x3e28), 0xcd },
-+	{ CCI_REG8(0x3e29), 0xcd }, { CCI_REG8(0x3e2a), 0xcd },
-+	{ CCI_REG8(0x3e2b), 0xcd }, { CCI_REG8(0x3e2c), 0xcd },
-+	{ CCI_REG8(0x3e2d), 0xcd }, { CCI_REG8(0x3e2e), 0xcd },
-+	{ CCI_REG8(0x3e2f), 0xcd }, { CCI_REG8(0x3e30), 0xcd },
-+	{ CCI_REG8(0x3e31), 0xcd }, { CCI_REG8(0x3e32), 0xcd },
-+	{ CCI_REG8(0x3e33), 0xcd }, { CCI_REG8(0x3e34), 0xcd },
-+	{ CCI_REG8(0x3e35), 0xcd }, { CCI_REG8(0x3e36), 0xcd },
-+	{ CCI_REG8(0x3e37), 0xcd }, { CCI_REG8(0x3e38), 0xcd },
-+	{ CCI_REG8(0x3e39), 0xcd }, { CCI_REG8(0x3e3a), 0xcd },
-+	{ CCI_REG8(0x3e3b), 0xcd }, { CCI_REG8(0x3e3c), 0xcd },
-+	{ CCI_REG8(0x3e3d), 0xcd }, { CCI_REG8(0x3e3e), 0xcd },
-+	{ CCI_REG8(0x3e3f), 0xcd }, { CCI_REG8(0x3e40), 0xcd },
-+	{ CCI_REG8(0x3e41), 0xcd }, { CCI_REG8(0x3e42), 0xcd },
-+	{ CCI_REG8(0x3e43), 0xcd }, { CCI_REG8(0x3e44), 0xcd },
-+	{ CCI_REG8(0x3e45), 0xcd }, { CCI_REG8(0x3e46), 0xcd },
-+	{ CCI_REG8(0x3e47), 0xcd }, { CCI_REG8(0x3e48), 0xcd },
-+	{ CCI_REG8(0x3e49), 0xcd }, { CCI_REG8(0x3e4a), 0xcd },
-+	{ CCI_REG8(0x3e4b), 0xcd }, { CCI_REG8(0x3e4c), 0xcd },
-+	{ CCI_REG8(0x3e4d), 0xcd }, { CCI_REG8(0x3e4e), 0xcd },
-+	{ CCI_REG8(0x3e4f), 0xcd }, { CCI_REG8(0x3e50), 0xcd },
-+	{ CCI_REG8(0x3e51), 0xcd }, { CCI_REG8(0x3e52), 0xcd },
-+	{ CCI_REG8(0x3e53), 0xcd }, { CCI_REG8(0x3e54), 0xcd },
-+	{ CCI_REG8(0x3e55), 0xcd }, { CCI_REG8(0x3e56), 0xcd },
-+	{ CCI_REG8(0x3e57), 0xcd }, { CCI_REG8(0x3e58), 0xcd },
-+	{ CCI_REG8(0x3e59), 0xcd }, { CCI_REG8(0x3e5a), 0xcd },
-+	{ CCI_REG8(0x3e5b), 0xcd }, { CCI_REG8(0x3e5c), 0xcd },
-+	{ CCI_REG8(0x3e5d), 0xcd }, { CCI_REG8(0x3e5e), 0xcd },
-+	{ CCI_REG8(0x3e5f), 0xcd }, { CCI_REG8(0x3e60), 0xcd },
-+	{ CCI_REG8(0x3e61), 0xcd }, { CCI_REG8(0x3e62), 0xcd },
-+	{ CCI_REG8(0x3e63), 0xcd }, { CCI_REG8(0x3e64), 0xcd },
-+	{ CCI_REG8(0x3e65), 0xcd }, { CCI_REG8(0x3e66), 0xcd },
-+	{ CCI_REG8(0x3e67), 0xcd }, { CCI_REG8(0x3e68), 0xcd },
-+	{ CCI_REG8(0x3e69), 0xcd }, { CCI_REG8(0x3e6a), 0xcd },
-+	{ CCI_REG8(0x3e6b), 0xcd }, { CCI_REG8(0x3e6c), 0xcd },
-+	{ CCI_REG8(0x3e6d), 0xcd }, { CCI_REG8(0x3e6e), 0xcd },
-+	{ CCI_REG8(0x3e6f), 0xcd }, { CCI_REG8(0x3e70), 0xcd },
-+	{ CCI_REG8(0x3e71), 0xcd }, { CCI_REG8(0x3e72), 0xcd },
-+	{ CCI_REG8(0x3e73), 0xcd }, { CCI_REG8(0x3e74), 0xcd },
-+	{ CCI_REG8(0x3e75), 0xcd }, { CCI_REG8(0x3e76), 0xcd },
-+	{ CCI_REG8(0x3e77), 0xcd }, { CCI_REG8(0x3e78), 0xcd },
-+	{ CCI_REG8(0x3e79), 0xcd }, { CCI_REG8(0x3e7a), 0xcd },
-+	{ CCI_REG8(0x3e7b), 0xcd }, { CCI_REG8(0x3e7c), 0xcd },
-+	{ CCI_REG8(0x3e7d), 0xcd }, { CCI_REG8(0x3e7e), 0xcd },
-+	{ CCI_REG8(0x3e7f), 0xcd }, { CCI_REG8(0x3e80), 0xcd },
-+	{ CCI_REG8(0x3e81), 0xcd }, { CCI_REG8(0x3e82), 0xcd },
-+	{ CCI_REG8(0x3e83), 0xcd }, { CCI_REG8(0x3e84), 0xcd },
-+	{ CCI_REG8(0x3e85), 0xcd }, { CCI_REG8(0x3e86), 0xcd },
-+	{ CCI_REG8(0x3e87), 0xcd }, { CCI_REG8(0x3e88), 0xcd },
-+	{ CCI_REG8(0x3e89), 0xcd }, { CCI_REG8(0x3e8a), 0xcd },
-+	{ CCI_REG8(0x3e8b), 0xcd }, { CCI_REG8(0x3e8c), 0xcd },
-+	{ CCI_REG8(0x3e8d), 0xcd }, { CCI_REG8(0x3e8e), 0xcd },
-+	{ CCI_REG8(0x3e8f), 0xcd }, { CCI_REG8(0x3e90), 0xcd },
-+	{ CCI_REG8(0x3e91), 0xcd }, { CCI_REG8(0x3e92), 0xcd },
-+	{ CCI_REG8(0x3e93), 0xcd }, { CCI_REG8(0x3e94), 0xcd },
-+	{ CCI_REG8(0x3e95), 0xcd }, { CCI_REG8(0x3e96), 0xcd },
-+	{ CCI_REG8(0x3e97), 0xcd }, { CCI_REG8(0x3e98), 0xcd },
-+	{ CCI_REG8(0x3e99), 0xcd }, { CCI_REG8(0x3e9a), 0xcd },
-+	{ CCI_REG8(0x3e9b), 0xcd }, { CCI_REG8(0x3e9c), 0xcd },
-+	{ CCI_REG8(0x3e9d), 0xcd }, { CCI_REG8(0x3e9e), 0xcd },
-+	{ CCI_REG8(0x3e9f), 0xcd }, { CCI_REG8(0xfff9), 0x06 },
-+	{ CCI_REG8(0xc03f), 0x01 }, { CCI_REG8(0xc03e), 0x08 },
-+	{ CCI_REG8(0xc02c), 0xff }, { CCI_REG8(0xc005), 0x06 },
-+	{ CCI_REG8(0xc006), 0x30 }, { CCI_REG8(0xc007), 0xc0 },
-+	{ CCI_REG8(0xc027), 0x01 }, { CCI_REG8(0x30c0), 0x05 },
-+	{ CCI_REG8(0x30c1), 0x9f }, { CCI_REG8(0x30c2), 0x06 },
-+	{ CCI_REG8(0x30c3), 0x5f }, { CCI_REG8(0x30c4), 0x80 },
-+	{ CCI_REG8(0x30c5), 0x08 }, { CCI_REG8(0x30c6), 0x39 },
-+	{ CCI_REG8(0x30c7), 0x00 }, { CCI_REG8(0xc046), 0x20 },
-+	{ CCI_REG8(0xc043), 0x01 }, { CCI_REG8(0xc04b), 0x01 },
-+	{ CCI_REG8(0x0102), 0x01 }, { CCI_REG8(0x0100), 0x00 },
-+	{ CCI_REG8(0x0102), 0x00 }, { CCI_REG8(0x3015), 0xf0 },
-+	{ CCI_REG8(0x3018), 0xf0 }, { CCI_REG8(0x301c), 0xf0 },
-+	{ CCI_REG8(0x301d), 0xf6 }, { CCI_REG8(0x301e), 0xf1 }
-+};
-+
-+static const struct cci_reg_sequence ov64a40_9248x6944[] = {
-+	{ CCI_REG8(0x0305), 0x98 }, { CCI_REG8(0x0306), 0x04 },
-+	{ CCI_REG8(0x0307), 0x01 }, { CCI_REG8(0x4837), 0x1a },
-+	{ CCI_REG8(0x4888), 0x10 }, { CCI_REG8(0x4860), 0x00 },
-+	{ CCI_REG8(0x4850), 0x43 }, { CCI_REG8(0x480C), 0x92 },
-+	{ CCI_REG8(0x5001), 0x21 }
-+};
-+
-+static const struct cci_reg_sequence ov64a40_8000x6000[] = {
-+	{ CCI_REG8(0x0305), 0x98 }, { CCI_REG8(0x0306), 0x04 },
-+	{ CCI_REG8(0x0307), 0x01 }, { CCI_REG8(0x4837), 0x1a },
-+	{ CCI_REG8(0x4888), 0x10 }, { CCI_REG8(0x4860), 0x00 },
-+	{ CCI_REG8(0x4850), 0x43 }, { CCI_REG8(0x480C), 0x92 },
-+	{ CCI_REG8(0x5001), 0x21 }
-+};
-+
-+static const struct cci_reg_sequence ov64a40_4624_3472[] = {
-+	{ CCI_REG8(0x034b), 0x02 }, { CCI_REG8(0x3504), 0x08 },
-+	{ CCI_REG8(0x360d), 0x82 }, { CCI_REG8(0x368a), 0x2e },
-+	{ CCI_REG8(0x3712), 0x50 }, { CCI_REG8(0x3822), 0x00 },
-+	{ CCI_REG8(0x3827), 0x40 }, { CCI_REG8(0x383d), 0x08 },
-+	{ CCI_REG8(0x383f), 0x00 }, { CCI_REG8(0x384c), 0x02 },
-+	{ CCI_REG8(0x384d), 0xba }, { CCI_REG8(0x3852), 0x00 },
-+	{ CCI_REG8(0x3856), 0x08 }, { CCI_REG8(0x3857), 0x08 },
-+	{ CCI_REG8(0x3858), 0x10 }, { CCI_REG8(0x3859), 0x10 },
-+	{ CCI_REG8(0x4016), 0x0f }, { CCI_REG8(0x4018), 0x03 },
-+	{ CCI_REG8(0x4504), 0x1e }, { CCI_REG8(0x4523), 0x41 },
-+	{ CCI_REG8(0x45c0), 0x01 }, { CCI_REG8(0x4641), 0x12 },
-+	{ CCI_REG8(0x4643), 0x0c }, { CCI_REG8(0x4915), 0x02 },
-+	{ CCI_REG8(0x4916), 0x1d }, { CCI_REG8(0x4a15), 0x02 },
-+	{ CCI_REG8(0x4a16), 0x1d }, { CCI_REG8(0x3703), 0x72 },
-+	{ CCI_REG8(0x3709), 0xe6 }, { CCI_REG8(0x3a60), 0x68 },
-+	{ CCI_REG8(0x3a6f), 0x68 }, { CCI_REG8(0x3a5e), 0xdc },
-+	{ CCI_REG8(0x3a6d), 0xdc }, { CCI_REG8(0x3721), 0xc9 },
-+	{ CCI_REG8(0x5250), 0x06 }, { CCI_REG8(0x527a), 0x00 },
-+	{ CCI_REG8(0x527b), 0x65 }, { CCI_REG8(0x527c), 0x00 },
-+	{ CCI_REG8(0x527d), 0x82 }, { CCI_REG8(0x5280), 0x24 },
-+	{ CCI_REG8(0x5281), 0x40 }, { CCI_REG8(0x5282), 0x1b },
-+	{ CCI_REG8(0x5283), 0x40 }, { CCI_REG8(0x5284), 0x24 },
-+	{ CCI_REG8(0x5285), 0x40 }, { CCI_REG8(0x5286), 0x1b },
-+	{ CCI_REG8(0x5287), 0x40 }, { CCI_REG8(0x5200), 0x24 },
-+	{ CCI_REG8(0x5201), 0x40 }, { CCI_REG8(0x5202), 0x1b },
-+	{ CCI_REG8(0x5203), 0x40 }, { CCI_REG8(0x481b), 0x35 },
-+	{ CCI_REG8(0x4862), 0x25 }, { CCI_REG8(0x3400), 0x00 },
-+	{ CCI_REG8(0x3421), 0x23 }, { CCI_REG8(0x3422), 0xfc },
-+	{ CCI_REG8(0x3423), 0x07 }, { CCI_REG8(0x3424), 0x01 },
-+	{ CCI_REG8(0x3425), 0x04 }, { CCI_REG8(0x3426), 0x50 },
-+	{ CCI_REG8(0x3427), 0x55 }, { CCI_REG8(0x3428), 0x15 },
-+	{ CCI_REG8(0x3429), 0x00 }, { CCI_REG8(0x3025), 0x03 },
-+	{ CCI_REG8(0x5250), 0x06 }, { CCI_REG8(0x0305), 0x98 },
-+	{ CCI_REG8(0x0306), 0x04 }, { CCI_REG8(0x0307), 0x01 },
-+	{ CCI_REG8(0x4837), 0x1a }, { CCI_REG8(0x4888), 0x10 },
-+	{ CCI_REG8(0x4860), 0x00 }, { CCI_REG8(0x4850), 0x43 },
-+	{ CCI_REG8(0x480C), 0x92 }, { CCI_REG8(0x5001), 0x21 }
-+};
-+
-+static const struct cci_reg_sequence ov64a40_3840x2160[] = {
-+	{ CCI_REG8(0x034a), 0x05 }, { CCI_REG8(0x034b), 0x05 },
-+	{ CCI_REG8(0x3504), 0x08 }, { CCI_REG8(0x360d), 0x82 },
-+	{ CCI_REG8(0x368a), 0x2e }, { CCI_REG8(0x3712), 0x50 },
-+	{ CCI_REG8(0x3822), 0x00 }, { CCI_REG8(0x3827), 0x40 },
-+	{ CCI_REG8(0x383d), 0x08 }, { CCI_REG8(0x383f), 0x00 },
-+	{ CCI_REG8(0x384c), 0x02 }, { CCI_REG8(0x384d), 0xba },
-+	{ CCI_REG8(0x3852), 0x00 }, { CCI_REG8(0x3856), 0x08 },
-+	{ CCI_REG8(0x3857), 0x08 }, { CCI_REG8(0x3858), 0x10 },
-+	{ CCI_REG8(0x3859), 0x10 }, { CCI_REG8(0x4016), 0x0f },
-+	{ CCI_REG8(0x4018), 0x03 }, { CCI_REG8(0x4504), 0x1e },
-+	{ CCI_REG8(0x4523), 0x41 }, { CCI_REG8(0x45c0), 0x01 },
-+	{ CCI_REG8(0x4641), 0x12 }, { CCI_REG8(0x4643), 0x0c },
-+	{ CCI_REG8(0x4915), 0x02 }, { CCI_REG8(0x4916), 0x1d },
-+	{ CCI_REG8(0x4a15), 0x02 }, { CCI_REG8(0x4a16), 0x1d },
-+	{ CCI_REG8(0x3703), 0x72 }, { CCI_REG8(0x3709), 0xe6 },
-+	{ CCI_REG8(0x3a60), 0x68 }, { CCI_REG8(0x3a6f), 0x68 },
-+	{ CCI_REG8(0x3a5e), 0xdc }, { CCI_REG8(0x3a6d), 0xdc },
-+	{ CCI_REG8(0x3721), 0xc9 }, { CCI_REG8(0x5250), 0x06 },
-+	{ CCI_REG8(0x527a), 0x00 }, { CCI_REG8(0x527b), 0x65 },
-+	{ CCI_REG8(0x527c), 0x00 }, { CCI_REG8(0x527d), 0x82 },
-+	{ CCI_REG8(0x5280), 0x24 }, { CCI_REG8(0x5281), 0x40 },
-+	{ CCI_REG8(0x5282), 0x1b }, { CCI_REG8(0x5283), 0x40 },
-+	{ CCI_REG8(0x5284), 0x24 }, { CCI_REG8(0x5285), 0x40 },
-+	{ CCI_REG8(0x5286), 0x1b }, { CCI_REG8(0x5287), 0x40 },
-+	{ CCI_REG8(0x5200), 0x24 }, { CCI_REG8(0x5201), 0x40 },
-+	{ CCI_REG8(0x5202), 0x1b }, { CCI_REG8(0x5203), 0x40 },
-+	{ CCI_REG8(0x481b), 0x35 }, { CCI_REG8(0x4862), 0x25 },
-+	{ CCI_REG8(0x3400), 0x00 }, { CCI_REG8(0x3421), 0x23 },
-+	{ CCI_REG8(0x3422), 0xfc }, { CCI_REG8(0x3423), 0x07 },
-+	{ CCI_REG8(0x3424), 0x01 }, { CCI_REG8(0x3425), 0x04 },
-+	{ CCI_REG8(0x3426), 0x50 }, { CCI_REG8(0x3427), 0x55 },
-+	{ CCI_REG8(0x3428), 0x15 }, { CCI_REG8(0x3429), 0x00 },
-+	{ CCI_REG8(0x3025), 0x03 }, { CCI_REG8(0x5250), 0x06 },
-+	{ CCI_REG8(0x0305), 0x98 }, { CCI_REG8(0x0306), 0x04 },
-+	{ CCI_REG8(0x0345), 0x90 }, { CCI_REG8(0x0307), 0x01 },
-+	{ CCI_REG8(0x4837), 0x1a }, { CCI_REG8(0x4888), 0x10 },
-+	{ CCI_REG8(0x4860), 0x00 }, { CCI_REG8(0x4850), 0x43 },
-+	{ CCI_REG8(0x480C), 0x92 }, { CCI_REG8(0x5001), 0x21 },
-+	{ CCI_REG8(0x5000), 0x01 }
-+};
-+
-+static const struct cci_reg_sequence ov64a40_2312_1736[] = {
-+	{ CCI_REG8(0x034b), 0x02 }, { CCI_REG8(0x3504), 0x08 },
-+	{ CCI_REG8(0x360d), 0x82 }, { CCI_REG8(0x368a), 0x2e },
-+	{ CCI_REG8(0x3712), 0x00 }, { CCI_REG8(0x3822), 0x08 },
-+	{ CCI_REG8(0x3827), 0x40 }, { CCI_REG8(0x383d), 0x04 },
-+	{ CCI_REG8(0x383f), 0x00 }, { CCI_REG8(0x384c), 0x01 },
-+	{ CCI_REG8(0x384d), 0x12 }, { CCI_REG8(0x3852), 0x00 },
-+	{ CCI_REG8(0x3856), 0x04 }, { CCI_REG8(0x3857), 0x04 },
-+	{ CCI_REG8(0x3858), 0x08 }, { CCI_REG8(0x3859), 0x08 },
-+	{ CCI_REG8(0x4016), 0x07 }, { CCI_REG8(0x4018), 0x01 },
-+	{ CCI_REG8(0x4504), 0x00 }, { CCI_REG8(0x4523), 0x00 },
-+	{ CCI_REG8(0x45c0), 0x01 }, { CCI_REG8(0x4641), 0x24 },
-+	{ CCI_REG8(0x4643), 0x0c }, { CCI_REG8(0x4837), 0x0b },
-+	{ CCI_REG8(0x4915), 0x02 }, { CCI_REG8(0x4916), 0x1d },
-+	{ CCI_REG8(0x4a15), 0x02 }, { CCI_REG8(0x4a16), 0x1d },
-+	{ CCI_REG8(0x5000), 0x55 }, { CCI_REG8(0x5001), 0x00 },
-+	{ CCI_REG8(0x5002), 0x35 }, { CCI_REG8(0x5004), 0xc0 },
-+	{ CCI_REG8(0x5068), 0x02 }, { CCI_REG8(0x3703), 0x6a },
-+	{ CCI_REG8(0x3709), 0xa3 }, { CCI_REG8(0x3a60), 0x60 },
-+	{ CCI_REG8(0x3a6f), 0x60 }, { CCI_REG8(0x3a5e), 0x99 },
-+	{ CCI_REG8(0x3a6d), 0x99 }, { CCI_REG8(0x3721), 0xc1 },
-+	{ CCI_REG8(0x5250), 0x06 }, { CCI_REG8(0x527a), 0x00 },
-+	{ CCI_REG8(0x527b), 0x65 }, { CCI_REG8(0x527c), 0x00 },
-+	{ CCI_REG8(0x527d), 0x82 }, { CCI_REG8(0x5280), 0x24 },
-+	{ CCI_REG8(0x5281), 0x40 }, { CCI_REG8(0x5282), 0x1b },
-+	{ CCI_REG8(0x5283), 0x40 }, { CCI_REG8(0x5284), 0x24 },
-+	{ CCI_REG8(0x5285), 0x40 }, { CCI_REG8(0x5286), 0x1b },
-+	{ CCI_REG8(0x5287), 0x40 }, { CCI_REG8(0x5200), 0x24 },
-+	{ CCI_REG8(0x5201), 0x40 }, { CCI_REG8(0x5202), 0x1b },
-+	{ CCI_REG8(0x5203), 0x40 }, { CCI_REG8(0x3684), 0x05 },
-+	{ CCI_REG8(0x481b), 0x20 }, { CCI_REG8(0x51b0), 0x38 },
-+	{ CCI_REG8(0x51b3), 0x0e }, { CCI_REG8(0x51b5), 0x04 },
-+	{ CCI_REG8(0x51b6), 0x00 }, { CCI_REG8(0x51b7), 0x00 },
-+	{ CCI_REG8(0x51b9), 0x70 }, { CCI_REG8(0x51bb), 0x10 },
-+	{ CCI_REG8(0x51bc), 0x00 }, { CCI_REG8(0x51bd), 0x00 },
-+	{ CCI_REG8(0x51b0), 0x38 }, { CCI_REG8(0x54b0), 0x38 },
-+	{ CCI_REG8(0x54b3), 0x0e }, { CCI_REG8(0x54b5), 0x04 },
-+	{ CCI_REG8(0x54b6), 0x00 }, { CCI_REG8(0x54b7), 0x00 },
-+	{ CCI_REG8(0x54b9), 0x70 }, { CCI_REG8(0x54bb), 0x10 },
-+	{ CCI_REG8(0x54bc), 0x00 }, { CCI_REG8(0x54bd), 0x00 },
-+	{ CCI_REG8(0x57b0), 0x38 }, { CCI_REG8(0x57b3), 0x0e },
-+	{ CCI_REG8(0x57b5), 0x04 }, { CCI_REG8(0x57b6), 0x00 },
-+	{ CCI_REG8(0x57b7), 0x00 }, { CCI_REG8(0x57b9), 0x70 },
-+	{ CCI_REG8(0x57bb), 0x10 }, { CCI_REG8(0x57bc), 0x00 },
-+	{ CCI_REG8(0x57bd), 0x00 }, { CCI_REG8(0x0305), 0x98 },
-+	{ CCI_REG8(0x0306), 0x04 }, { CCI_REG8(0x0307), 0x01 },
-+	{ CCI_REG8(0x4837), 0x1a }, { CCI_REG8(0x4888), 0x10 },
-+	{ CCI_REG8(0x4860), 0x00 }, { CCI_REG8(0x4850), 0x43 },
-+	{ CCI_REG8(0x480C), 0x92 }
-+};
-+
-+static const struct cci_reg_sequence ov64a40_1920x1080[] = {
-+	{ CCI_REG8(0x034b), 0x02 }, { CCI_REG8(0x3504), 0x08 },
-+	{ CCI_REG8(0x360d), 0x82 }, { CCI_REG8(0x368a), 0x2e },
-+	{ CCI_REG8(0x3712), 0x00 }, { CCI_REG8(0x3822), 0x08 },
-+	{ CCI_REG8(0x3827), 0x40 }, { CCI_REG8(0x383d), 0x04 },
-+	{ CCI_REG8(0x383f), 0x00 }, { CCI_REG8(0x384c), 0x01 },
-+	{ CCI_REG8(0x384d), 0x12 }, { CCI_REG8(0x3852), 0x00 },
-+	{ CCI_REG8(0x3856), 0x04 }, { CCI_REG8(0x3857), 0x04 },
-+	{ CCI_REG8(0x3858), 0x08 }, { CCI_REG8(0x3859), 0x08 },
-+	{ CCI_REG8(0x4016), 0x07 }, { CCI_REG8(0x4018), 0x01 },
-+	{ CCI_REG8(0x4504), 0x00 }, { CCI_REG8(0x4523), 0x00 },
-+	{ CCI_REG8(0x45c0), 0x01 }, { CCI_REG8(0x4641), 0x24 },
-+	{ CCI_REG8(0x4643), 0x0c }, { CCI_REG8(0x4837), 0x0b },
-+	{ CCI_REG8(0x4915), 0x02 }, { CCI_REG8(0x4916), 0x1d },
-+	{ CCI_REG8(0x4a15), 0x02 }, { CCI_REG8(0x4a16), 0x1d },
-+	{ CCI_REG8(0x5000), 0x55 }, { CCI_REG8(0x5001), 0x00 },
-+	{ CCI_REG8(0x5002), 0x35 }, { CCI_REG8(0x5004), 0xc0 },
-+	{ CCI_REG8(0x5068), 0x02 }, { CCI_REG8(0x3703), 0x6a },
-+	{ CCI_REG8(0x3709), 0xa3 }, { CCI_REG8(0x3a60), 0x60 },
-+	{ CCI_REG8(0x3a6f), 0x60 }, { CCI_REG8(0x3a5e), 0x99 },
-+	{ CCI_REG8(0x3a6d), 0x99 }, { CCI_REG8(0x3721), 0xc1 },
-+	{ CCI_REG8(0x5250), 0x06 }, { CCI_REG8(0x527a), 0x00 },
-+	{ CCI_REG8(0x527b), 0x65 }, { CCI_REG8(0x527c), 0x00 },
-+	{ CCI_REG8(0x527d), 0x82 }, { CCI_REG8(0x5280), 0x24 },
-+	{ CCI_REG8(0x5281), 0x40 }, { CCI_REG8(0x5282), 0x1b },
-+	{ CCI_REG8(0x5283), 0x40 }, { CCI_REG8(0x5284), 0x24 },
-+	{ CCI_REG8(0x5285), 0x40 }, { CCI_REG8(0x5286), 0x1b },
-+	{ CCI_REG8(0x5287), 0x40 }, { CCI_REG8(0x5200), 0x24 },
-+	{ CCI_REG8(0x5201), 0x40 }, { CCI_REG8(0x5202), 0x1b },
-+	{ CCI_REG8(0x5203), 0x40 }, { CCI_REG8(0x3684), 0x05 },
-+	{ CCI_REG8(0x481b), 0x20 }, { CCI_REG8(0x51b0), 0x38 },
-+	{ CCI_REG8(0x51b3), 0x0e }, { CCI_REG8(0x51b5), 0x04 },
-+	{ CCI_REG8(0x51b6), 0x00 }, { CCI_REG8(0x51b7), 0x00 },
-+	{ CCI_REG8(0x51b9), 0x70 }, { CCI_REG8(0x51bb), 0x10 },
-+	{ CCI_REG8(0x51bc), 0x00 }, { CCI_REG8(0x51bd), 0x00 },
-+	{ CCI_REG8(0x51b0), 0x38 }, { CCI_REG8(0x54b0), 0x38 },
-+	{ CCI_REG8(0x54b3), 0x0e }, { CCI_REG8(0x54b5), 0x04 },
-+	{ CCI_REG8(0x54b6), 0x00 }, { CCI_REG8(0x54b7), 0x00 },
-+	{ CCI_REG8(0x54b9), 0x70 }, { CCI_REG8(0x54bb), 0x10 },
-+	{ CCI_REG8(0x54bc), 0x00 }, { CCI_REG8(0x54bd), 0x00 },
-+	{ CCI_REG8(0x57b0), 0x38 }, { CCI_REG8(0x57b3), 0x0e },
-+	{ CCI_REG8(0x57b5), 0x04 }, { CCI_REG8(0x57b6), 0x00 },
-+	{ CCI_REG8(0x57b7), 0x00 }, { CCI_REG8(0x57b9), 0x70 },
-+	{ CCI_REG8(0x57bb), 0x10 }, { CCI_REG8(0x57bc), 0x00 },
-+	{ CCI_REG8(0x57bd), 0x00 }, { CCI_REG8(0x0305), 0x98 },
-+	{ CCI_REG8(0x0306), 0x04 }, { CCI_REG8(0x0307), 0x01 },
-+	{ CCI_REG8(0x4837), 0x1a }, { CCI_REG8(0x4888), 0x10 },
-+	{ CCI_REG8(0x4860), 0x00 }, { CCI_REG8(0x4850), 0x43 },
-+	{ CCI_REG8(0x480C), 0x92 }
-+};
-+
-+/* 456MHz MIPI link frequency with 24MHz input clock. */
-+static const struct cci_reg_sequence ov64a40_pll_config[] = {
-+	{ OV64A40_PLL1_PRE_DIV0, 0x88 },
-+	{ OV64A40_PLL1_PRE_DIV, 0x02 },
-+	{ OV64A40_PLL1_MULTIPLIER, 0x0098 },
-+	{ OV64A40_PLL1_M_DIV, 0x01 },
-+	{ OV64A40_PLL2_SEL_BAK_SA1, 0x00 },
-+	{ OV64A40_PLL2_PRE_DIV, 0x12 },
-+	{ OV64A40_PLL2_MULTIPLIER, 0x0190 },
-+	{ OV64A40_PLL2_PRE_DIV0, 0xd7 },
-+	{ OV64A40_PLL2_DIVSP, 0x00 },
-+	{ OV64A40_PLL2_DIVDAC, 0x00 },
-+	{ OV64A40_PLL2_DACPREDIV, 0x00 }
-+};
-+
-+struct ov64a40_reglist {
-+	unsigned int num_regs;
-+	const struct cci_reg_sequence *regvals;
-+};
-+
-+struct ov64a40_subsampling {
-+	unsigned int x_odd_inc;
-+	unsigned int x_even_inc;
-+	unsigned int y_odd_inc;
-+	unsigned int y_even_inc;
-+	bool vbin;
-+	bool hbin;
-+};
-+
-+static struct ov64a40_mode {
-+	unsigned int width;
-+	unsigned int height;
-+	struct ov64a40_timings {
-+		unsigned int vts;
-+		unsigned int ppl;
-+	} timings_default[OV64A40_NUM_LINK_FREQ];
-+	const struct ov64a40_reglist reglist;
-+	struct v4l2_rect analogue_crop;
-+	struct v4l2_rect digital_crop;
-+	struct ov64a40_subsampling subsampling;
-+} ov64a40_modes[] = {
-+	/* Full resolution */
-+	{
-+		.width = 9248,
-+		.height = 6944,
-+		.timings_default = {
-+			/* 2.6 FPS */
-+			[OV64A40_LINK_FREQ_456M_ID] = {
-+				.vts = 7072,
-+				.ppl = 4072,
-+			},
-+			/* 2 FPS */
-+			[OV64A40_LINK_FREQ_360M_ID] = {
-+				.vts = 7072,
-+				.ppl = 5248,
-+			},
-+		},
-+		.reglist = {
-+			.num_regs = ARRAY_SIZE(ov64a40_9248x6944),
-+			.regvals = ov64a40_9248x6944,
-+		},
-+		.analogue_crop = {
-+			.left = 0,
-+			.top = 0,
-+			.width = 9279,
-+			.height = 6975,
-+		},
-+		.digital_crop = {
-+			.left = 17,
-+			.top = 16,
-+			.width = 9248,
-+			.height = 6944,
-+		},
-+		.subsampling = {
-+			.x_odd_inc = 1,
-+			.x_even_inc = 1,
-+			.y_odd_inc = 1,
-+			.y_even_inc = 1,
-+			.vbin = false,
-+			.hbin = false,
-+		},
-+	},
-+	/* Analogue crop + digital crop */
-+	{
-+		.width = 8000,
-+		.height = 6000,
-+		.timings_default = {
-+			/* 3.0 FPS */
-+			[OV64A40_LINK_FREQ_456M_ID] = {
-+				.vts = 6400,
-+				.ppl = 3848,
-+			},
-+			/* 2.5 FPS */
-+			[OV64A40_LINK_FREQ_360M_ID] = {
-+				.vts = 6304,
-+				.ppl = 4736,
-+			},
-+		},
-+		.reglist = {
-+			.num_regs = ARRAY_SIZE(ov64a40_8000x6000),
-+			.regvals = ov64a40_8000x6000,
-+		},
-+		.analogue_crop = {
-+			.left = 624,
-+			.top = 472,
-+			.width = 8047,
-+			.height = 6031,
-+		},
-+		.digital_crop = {
-+			.left = 17,
-+			.top = 16,
-+			.width = 8000,
-+			.height = 6000,
-+		},
-+		.subsampling = {
-+			.x_odd_inc = 1,
-+			.x_even_inc = 1,
-+			.y_odd_inc = 1,
-+			.y_even_inc = 1,
-+			.vbin = false,
-+			.hbin = false,
-+		},
-+	},
-+	/* 2x2 downscaled */
-+	{
-+		.width = 4624,
-+		.height = 3472,
-+		.timings_default = {
-+			/* 10 FPS */
-+			[OV64A40_LINK_FREQ_456M_ID] = {
-+				.vts = 3533,
-+				.ppl = 2112,
-+			},
-+			/* 7 FPS */
-+			[OV64A40_LINK_FREQ_360M_ID] = {
-+				.vts = 3939,
-+				.ppl = 2720,
-+			},
-+		},
-+		.reglist = {
-+			.num_regs = ARRAY_SIZE(ov64a40_4624_3472),
-+			.regvals = ov64a40_4624_3472,
-+		},
-+		.analogue_crop = {
-+			.left = 0,
-+			.top = 0,
-+			.width = 9279,
-+			.height = 6975,
-+		},
-+		.digital_crop = {
-+			.left = 9,
-+			.top = 8,
-+			.width = 4624,
-+			.height = 3472,
-+		},
-+		.subsampling = {
-+			.x_odd_inc = 3,
-+			.x_even_inc = 1,
-+			.y_odd_inc = 1,
-+			.y_even_inc = 1,
-+			.vbin = true,
-+			.hbin = false,
-+		},
-+	},
-+	/* Analogue crop + 2x2 downscale + digital crop */
-+	{
-+		.width = 3840,
-+		.height = 2160,
-+		.timings_default = {
-+			/* 20 FPS */
-+			[OV64A40_LINK_FREQ_456M_ID] = {
-+				.vts = 2218,
-+				.ppl = 1690,
-+			},
-+			/* 15 FPS */
-+			[OV64A40_LINK_FREQ_360M_ID] = {
-+				.vts = 2270,
-+				.ppl = 2202,
-+			},
-+		},
-+		.reglist = {
-+			.num_regs = ARRAY_SIZE(ov64a40_3840x2160),
-+			.regvals = ov64a40_3840x2160,
-+		},
-+		.analogue_crop = {
-+			.left = 784,
-+			.top = 1312,
-+			.width = 7711,
-+			.height = 4351,
-+		},
-+		.digital_crop = {
-+			.left = 9,
-+			.top = 8,
-+			.width = 3840,
-+			.height = 2160,
-+		},
-+		.subsampling = {
-+			.x_odd_inc = 3,
-+			.x_even_inc = 1,
-+			.y_odd_inc = 1,
-+			.y_even_inc = 1,
-+			.vbin = true,
-+			.hbin = false,
-+		},
-+	},
-+	/* 4x4 downscaled */
-+	{
-+		.width = 2312,
-+		.height = 1736,
-+		.timings_default = {
-+			/* 30 FPS */
-+			[OV64A40_LINK_FREQ_456M_ID] = {
-+				.vts = 1998,
-+				.ppl = 1248,
-+			},
-+			/* 25 FPS */
-+			[OV64A40_LINK_FREQ_360M_ID] = {
-+				.vts = 1994,
-+				.ppl = 1504,
-+			},
-+		},
-+		.reglist = {
-+			.num_regs = ARRAY_SIZE(ov64a40_2312_1736),
-+			.regvals = ov64a40_2312_1736,
-+		},
-+		.analogue_crop = {
-+			.left = 0,
-+			.top = 0,
-+			.width = 9279,
-+			.height = 6975,
-+		},
-+		.digital_crop = {
-+			.left = 5,
-+			.top = 4,
-+			.width = 2312,
-+			.height = 1736,
-+		},
-+		.subsampling = {
-+			.x_odd_inc = 3,
-+			.x_even_inc = 1,
-+			.y_odd_inc = 3,
-+			.y_even_inc = 1,
-+			.vbin = true,
-+			.hbin = true,
-+		},
-+	},
-+	/* Analogue crop + 4x4 downscale + digital crop */
-+	{
-+		.width = 1920,
-+		.height = 1080,
-+		.timings_default = {
-+			/* 60 FPS */
-+			[OV64A40_LINK_FREQ_456M_ID] = {
-+				.vts = 1397,
-+				.ppl = 880,
-+			},
-+			/* 45 FPS */
-+			[OV64A40_LINK_FREQ_360M_ID] = {
-+				.vts = 1216,
-+				.ppl = 1360,
-+			},
-+		},
-+		.reglist = {
-+			.num_regs = ARRAY_SIZE(ov64a40_1920x1080),
-+			.regvals = ov64a40_1920x1080,
-+		},
-+		.analogue_crop = {
-+			.left = 784,
-+			.top = 1312,
-+			.width = 7711,
-+			.height = 4351,
-+		},
-+		.digital_crop = {
-+			.left = 7,
-+			.top = 6,
-+			.width = 1920,
-+			.height = 1080,
-+		},
-+		.subsampling = {
-+			.x_odd_inc = 3,
-+			.x_even_inc = 1,
-+			.y_odd_inc = 3,
-+			.y_even_inc = 1,
-+			.vbin = true,
-+			.hbin = true,
-+		},
-+	},
-+};
-+
-+struct ov64a40 {
-+	struct device *dev;
-+
-+	struct v4l2_subdev sd;
-+	struct media_pad pad;
-+
-+	struct regmap *cci;
-+
-+	struct ov64a40_mode *mode;
-+
-+	struct clk *xclk;
-+
-+	struct gpio_desc *reset_gpio;
-+	struct regulator_bulk_data supplies[ARRAY_SIZE(ov64a40_supply_names)];
-+
-+	s64 *link_frequencies;
-+	unsigned int num_link_frequencies;
-+
-+	struct v4l2_ctrl_handler ctrl_handler;
-+	struct v4l2_ctrl *exposure;
-+	struct v4l2_ctrl *link_freq;
-+	struct v4l2_ctrl *vblank;
-+	struct v4l2_ctrl *hblank;
-+	struct v4l2_ctrl *vflip;
-+	struct v4l2_ctrl *hflip;
-+};
-+
-+static inline struct ov64a40 *sd_to_ov64a40(struct v4l2_subdev *sd)
-+{
-+	return container_of(sd, struct ov64a40, sd);
-+}
-+
-+static const struct ov64a40_timings *
-+ov64a40_get_timings(struct ov64a40 *ov64a40, unsigned int link_freq_index)
-+{
-+	s64 link_freq = ov64a40->link_frequencies[link_freq_index];
-+	unsigned int timings_index = link_freq == OV64A40_LINK_FREQ_360M
-+				   ? OV64A40_LINK_FREQ_360M_ID
-+				   : OV64A40_LINK_FREQ_456M_ID;
-+
-+	return &ov64a40->mode->timings_default[timings_index];
-+}
-+
-+static int ov64a40_program_geometry(struct ov64a40 *ov64a40)
-+{
-+	struct ov64a40_mode *mode = ov64a40->mode;
-+	struct v4l2_rect *anacrop = &mode->analogue_crop;
-+	struct v4l2_rect *digicrop = &mode->digital_crop;
-+	const struct ov64a40_timings *timings;
-+	int ret = 0;
-+
-+	/* Analogue crop. */
-+	cci_write(ov64a40->cci, OV64A40_REG_TIMING_CTRL0,
-+		  anacrop->left, &ret);
-+	cci_write(ov64a40->cci, OV64A40_REG_TIMING_CTRL2,
-+		  anacrop->top, &ret);
-+	cci_write(ov64a40->cci, OV64A40_REG_TIMING_CTRL4,
-+		  anacrop->width + anacrop->left, &ret);
-+	cci_write(ov64a40->cci, OV64A40_REG_TIMING_CTRL6,
-+		  anacrop->height + anacrop->top, &ret);
-+
-+	/* ISP windowing. */
-+	cci_write(ov64a40->cci, OV64A40_REG_TIMING_CTRL10,
-+		  digicrop->left, &ret);
-+	cci_write(ov64a40->cci, OV64A40_REG_TIMING_CTRL12,
-+		  digicrop->top, &ret);
-+	cci_write(ov64a40->cci, OV64A40_REG_TIMING_CTRL8,
-+		  digicrop->width, &ret);
-+	cci_write(ov64a40->cci, OV64A40_REG_TIMING_CTRLA,
-+		  digicrop->height, &ret);
-+
-+	/* Total timings. */
-+	timings = ov64a40_get_timings(ov64a40, ov64a40->link_freq->cur.val);
-+	cci_write(ov64a40->cci, OV64A40_REG_TIMING_CTRLC, timings->ppl, &ret);
-+	cci_write(ov64a40->cci, OV64A40_REG_TIMING_CTRLE, timings->vts, &ret);
-+
-+	return ret;
-+}
-+
-+static int ov64a40_program_subsampling(struct ov64a40 *ov64a40)
-+{
-+	struct ov64a40_subsampling *subsampling = &ov64a40->mode->subsampling;
-+	int ret = 0;
-+
-+	/* Skipping configuration */
-+	cci_write(ov64a40->cci, OV64A40_REG_TIMING_CTRL14,
-+		  OV64A40_SKIPPING_CONFIG(subsampling->x_odd_inc,
-+					  subsampling->x_even_inc), &ret);
-+	cci_write(ov64a40->cci, OV64A40_REG_TIMING_CTRL15,
-+		  OV64A40_SKIPPING_CONFIG(subsampling->y_odd_inc,
-+					  subsampling->y_even_inc), &ret);
-+
-+	/* Binning configuration */
-+	cci_update_bits(ov64a40->cci, OV64A40_REG_TIMING_CTRL_20,
-+			OV64A40_TIMING_CTRL_20_VBIN,
-+			subsampling->vbin ? OV64A40_TIMING_CTRL_20_VBIN : 0,
-+			&ret);
-+	cci_update_bits(ov64a40->cci, OV64A40_REG_TIMING_CTRL_21,
-+			OV64A40_TIMING_CTRL_21_HBIN_CONF,
-+			subsampling->hbin ?
-+			OV64A40_TIMING_CTRL_21_HBIN_CONF : 0, &ret);
-+
-+	return ret;
-+}
-+
-+static int ov64a40_start_streaming(struct ov64a40 *ov64a40,
-+				   struct v4l2_subdev_state *state)
-+{
-+	const struct ov64a40_reglist *reglist = &ov64a40->mode->reglist;
-+	const struct ov64a40_timings *timings;
-+	unsigned long delay;
-+	int ret;
-+
-+	ret = pm_runtime_resume_and_get(ov64a40->dev);
-+	if (ret < 0)
-+		return ret;
-+
-+	ret = cci_multi_reg_write(ov64a40->cci, ov64a40_init,
-+				  ARRAY_SIZE(ov64a40_init), NULL);
-+	if (ret)
-+		goto error_power_off;
-+
-+	ret = cci_multi_reg_write(ov64a40->cci, reglist->regvals,
-+				  reglist->num_regs, NULL);
-+	if (ret)
-+		goto error_power_off;
-+
-+	ret = ov64a40_program_geometry(ov64a40);
-+	if (ret)
-+		goto error_power_off;
-+
-+	ret = ov64a40_program_subsampling(ov64a40);
-+	if (ret)
-+		goto error_power_off;
-+
-+	ret =  __v4l2_ctrl_handler_setup(&ov64a40->ctrl_handler);
-+	if (ret)
-+		goto error_power_off;
-+
-+	ret = cci_write(ov64a40->cci, OV64A40_REG_SMIA,
-+			OV64A40_REG_SMIA_STREAMING, NULL);
-+	if (ret)
-+		goto error_power_off;
-+
-+	/* Link frequency and flips cannot change while streaming. */
-+	__v4l2_ctrl_grab(ov64a40->link_freq, true);
-+	__v4l2_ctrl_grab(ov64a40->vflip, true);
-+	__v4l2_ctrl_grab(ov64a40->hflip, true);
-+
-+	/* delay: max(4096 xclk pulses, 150usec) + exposure time */
-+	timings = ov64a40_get_timings(ov64a40, ov64a40->link_freq->cur.val);
-+	delay = DIV_ROUND_UP(4096, OV64A40_XCLK_FREQ / 1000 / 1000);
-+	delay = max(delay, 150ul);
-+
-+	/* The sensor has an internal x4 multiplier on the line length. */
-+	delay += DIV_ROUND_UP(timings->ppl * 4 * ov64a40->exposure->cur.val,
-+			      OV64A40_PIXEL_RATE / 1000 / 1000);
-+	fsleep(delay);
-+
-+	return 0;
-+
-+error_power_off:
-+	pm_runtime_mark_last_busy(ov64a40->dev);
-+	pm_runtime_put_autosuspend(ov64a40->dev);
-+
-+	return ret;
-+}
-+
-+static int ov64a40_stop_streaming(struct ov64a40 *ov64a40,
-+				  struct v4l2_subdev_state *state)
-+{
-+	cci_update_bits(ov64a40->cci, OV64A40_REG_SMIA, BIT(0), 0, NULL);
-+	pm_runtime_mark_last_busy(ov64a40->dev);
-+	pm_runtime_put_autosuspend(ov64a40->dev);
-+
-+	__v4l2_ctrl_grab(ov64a40->link_freq, false);
-+	__v4l2_ctrl_grab(ov64a40->vflip, false);
-+	__v4l2_ctrl_grab(ov64a40->hflip, false);
-+
-+	return 0;
-+}
-+
-+static int ov64a40_set_stream(struct v4l2_subdev *sd, int enable)
-+{
-+	struct ov64a40 *ov64a40 = sd_to_ov64a40(sd);
-+	struct v4l2_subdev_state *state;
-+	int ret;
-+
-+	state = v4l2_subdev_lock_and_get_active_state(sd);
-+	if (enable)
-+		ret = ov64a40_start_streaming(ov64a40, state);
-+	else
-+		ret = ov64a40_stop_streaming(ov64a40, state);
-+	v4l2_subdev_unlock_state(state);
-+
-+	return ret;
-+}
-+
-+static const struct v4l2_subdev_video_ops ov64a40_video_ops = {
-+	.s_stream = ov64a40_set_stream,
-+};
-+
-+static u32 ov64a40_mbus_code(struct ov64a40 *ov64a40)
-+{
-+	unsigned int index = ov64a40->hflip->val << 1 | ov64a40->vflip->val;
-+
-+	return ov64a40_mbus_codes[index];
-+}
-+
-+static void ov64a40_update_pad_fmt(struct ov64a40 *ov64a40,
-+				   struct ov64a40_mode *mode,
-+				   struct v4l2_mbus_framefmt *fmt)
-+{
-+	fmt->code = ov64a40_mbus_code(ov64a40);
-+	fmt->width = mode->width;
-+	fmt->height = mode->height;
-+	fmt->field = V4L2_FIELD_NONE;
-+	fmt->colorspace = V4L2_COLORSPACE_RAW;
-+	fmt->quantization = V4L2_QUANTIZATION_FULL_RANGE;
-+	fmt->xfer_func = V4L2_XFER_FUNC_NONE;
-+	fmt->ycbcr_enc = V4L2_YCBCR_ENC_601;
-+}
-+
-+static int ov64a40_init_cfg(struct v4l2_subdev *sd,
-+			    struct v4l2_subdev_state *state)
-+{
-+	struct ov64a40 *ov64a40 = sd_to_ov64a40(sd);
-+	struct v4l2_mbus_framefmt *format;
-+	struct v4l2_rect *crop;
-+
-+	format = v4l2_subdev_get_pad_format(sd, state, 0);
-+	ov64a40_update_pad_fmt(ov64a40, &ov64a40_modes[0], format);
-+
-+	crop = v4l2_subdev_get_pad_crop(sd, state, 0);
-+	crop->top = OV64A40_PIXEL_ARRAY_TOP;
-+	crop->left = OV64A40_PIXEL_ARRAY_LEFT;
-+	crop->width = OV64A40_PIXEL_ARRAY_WIDTH;
-+	crop->height = OV64A40_PIXEL_ARRAY_HEIGHT;
-+
-+	return 0;
-+}
-+
-+static int ov64a40_enum_mbus_code(struct v4l2_subdev *sd,
-+				  struct v4l2_subdev_state *sd_state,
-+				  struct v4l2_subdev_mbus_code_enum *code)
-+{
-+	struct ov64a40 *ov64a40 = sd_to_ov64a40(sd);
-+
-+	if (code->index)
-+		return -EINVAL;
-+
-+	code->code = ov64a40_mbus_code(ov64a40);
-+
-+	return 0;
-+}
-+
-+static int ov64a40_enum_frame_size(struct v4l2_subdev *sd,
-+				   struct v4l2_subdev_state *sd_state,
-+				   struct v4l2_subdev_frame_size_enum *fse)
-+{
-+	struct ov64a40 *ov64a40 = sd_to_ov64a40(sd);
-+	struct ov64a40_mode *mode;
-+	u32 code;
-+
-+	if (fse->index >= ARRAY_SIZE(ov64a40_modes))
-+		return -EINVAL;
-+
-+	code = ov64a40_mbus_code(ov64a40);
-+	if (fse->code != code)
-+		return -EINVAL;
-+
-+	mode = &ov64a40_modes[fse->index];
-+	fse->min_width = mode->width;
-+	fse->max_width = mode->width;
-+	fse->min_height = mode->height;
-+	fse->max_height = mode->height;
-+
-+	return 0;
-+}
-+
-+static int ov64a40_get_selection(struct v4l2_subdev *sd,
-+				 struct v4l2_subdev_state *sd_state,
-+				 struct v4l2_subdev_selection *sel)
-+{
-+	switch (sel->target) {
-+	case V4L2_SEL_TGT_CROP:
-+		sel->r = *v4l2_subdev_get_pad_crop(sd, sd_state, 0);
-+
-+		return 0;
-+
-+	case V4L2_SEL_TGT_NATIVE_SIZE:
-+		sel->r.top = 0;
-+		sel->r.left = 0;
-+		sel->r.width = OV64A40_NATIVE_WIDTH;
-+		sel->r.height = OV64A40_NATIVE_HEIGHT;
-+
-+		return 0;
-+
-+	case V4L2_SEL_TGT_CROP_DEFAULT:
-+	case V4L2_SEL_TGT_CROP_BOUNDS:
-+		sel->r.top = OV64A40_PIXEL_ARRAY_TOP;
-+		sel->r.left = OV64A40_PIXEL_ARRAY_LEFT;
-+		sel->r.width = OV64A40_PIXEL_ARRAY_WIDTH;
-+		sel->r.height = OV64A40_PIXEL_ARRAY_HEIGHT;
-+
-+		return 0;
-+	}
-+
-+	return -EINVAL;
-+}
-+
-+static int ov64a40_set_format(struct v4l2_subdev *sd,
-+			      struct v4l2_subdev_state *sd_state,
-+			      struct v4l2_subdev_format *fmt)
-+{
-+	struct ov64a40 *ov64a40 = sd_to_ov64a40(sd);
-+	struct v4l2_mbus_framefmt *format;
-+	struct ov64a40_mode *mode;
-+
-+	mode = v4l2_find_nearest_size(ov64a40_modes,
-+				      ARRAY_SIZE(ov64a40_modes),
-+				      width, height,
-+				      fmt->format.width, fmt->format.height);
-+
-+	ov64a40_update_pad_fmt(ov64a40, mode, &fmt->format);
-+
-+	format = v4l2_subdev_get_pad_format(sd, sd_state, 0);
-+	if (ov64a40->mode == mode && format->code == fmt->format.code)
-+		return 0;
-+
-+	if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
-+		const struct ov64a40_timings *timings;
-+		int vblank_max, vblank_def;
-+		int hblank_val;
-+		int exp_max;
-+
-+		ov64a40->mode = mode;
-+		*v4l2_subdev_get_pad_crop(sd, sd_state, 0) = mode->analogue_crop;
-+
-+		/* Update control limits according to the new mode. */
-+		timings = ov64a40_get_timings(ov64a40,
-+					      ov64a40->link_freq->cur.val);
-+		vblank_max = OV64A40_VTS_MAX - mode->height;
-+		vblank_def = timings->vts - mode->height;
-+		__v4l2_ctrl_modify_range(ov64a40->vblank, OV64A40_VBLANK_MIN,
-+					 vblank_max, 1, vblank_def);
-+		__v4l2_ctrl_s_ctrl(ov64a40->vblank, vblank_def);
-+
-+		exp_max = timings->vts - OV64A40_EXPOSURE_MARGIN;
-+		__v4l2_ctrl_modify_range(ov64a40->exposure,
-+					 OV64A40_EXPOSURE_MIN, exp_max,
-+					 1, OV64A40_EXPOSURE_MIN);
-+
-+		hblank_val = timings->ppl * 4 - mode->width;
-+		__v4l2_ctrl_modify_range(ov64a40->hblank,
-+					 hblank_val, hblank_val, 1, hblank_val);
-+	}
-+
-+	*format = fmt->format;
-+
-+	return 0;
-+}
-+
-+static const struct v4l2_subdev_pad_ops ov64a40_pad_ops = {
-+	.init_cfg = ov64a40_init_cfg,
-+	.enum_mbus_code = ov64a40_enum_mbus_code,
-+	.enum_frame_size = ov64a40_enum_frame_size,
-+	.get_fmt = v4l2_subdev_get_fmt,
-+	.set_fmt = ov64a40_set_format,
-+	.get_selection = ov64a40_get_selection,
-+};
-+
-+static const struct v4l2_subdev_core_ops ov64a40_core_ops = {
-+	.subscribe_event = v4l2_ctrl_subdev_subscribe_event,
-+	.unsubscribe_event = v4l2_event_subdev_unsubscribe,
-+};
-+
-+static const struct v4l2_subdev_ops ov64a40_subdev_ops = {
-+	.core = &ov64a40_core_ops,
-+	.video = &ov64a40_video_ops,
-+	.pad = &ov64a40_pad_ops,
-+};
-+
-+static int ov64a40_power_on(struct device *dev)
-+{
-+	struct v4l2_subdev *sd = dev_get_drvdata(dev);
-+	struct ov64a40 *ov64a40 = sd_to_ov64a40(sd);
-+	int ret;
-+
-+	ret = clk_prepare_enable(ov64a40->xclk);
-+	if (ret)
-+		return ret;
-+
-+	ret = regulator_bulk_enable(ARRAY_SIZE(ov64a40_supply_names),
-+				    ov64a40->supplies);
-+	if (ret) {
-+		clk_disable_unprepare(ov64a40->xclk);
-+		dev_err(dev, "Failed to enable regulators: %d\n", ret);
-+		return ret;
-+	}
-+
-+	gpiod_set_value_cansleep(ov64a40->reset_gpio, 0);
-+
-+	fsleep(5000);
-+
-+	return 0;
-+}
-+
-+static int ov64a40_power_off(struct device *dev)
-+{
-+	struct v4l2_subdev *sd = dev_get_drvdata(dev);
-+	struct ov64a40 *ov64a40 = sd_to_ov64a40(sd);
-+
-+	gpiod_set_value_cansleep(ov64a40->reset_gpio, 1);
-+	regulator_bulk_disable(ARRAY_SIZE(ov64a40_supply_names),
-+			       ov64a40->supplies);
-+	clk_disable_unprepare(ov64a40->xclk);
-+
-+	return 0;
-+}
-+
-+static int ov64a40_link_freq_config(struct ov64a40 *ov64a40, int link_freq_id)
-+{
-+	s64 link_frequency;
-+	int ret = 0;
-+
-+	/* Default 456MHz with 24MHz input clock. */
-+	cci_multi_reg_write(ov64a40->cci, ov64a40_pll_config,
-+			    ARRAY_SIZE(ov64a40_pll_config), &ret);
-+
-+	/* Decrease the PLL1 multiplier to obtain 360MHz mipi link frequency. */
-+	link_frequency = ov64a40->link_frequencies[link_freq_id];
-+	if (link_frequency == OV64A40_LINK_FREQ_360M)
-+		cci_write(ov64a40->cci, OV64A40_PLL1_MULTIPLIER, 0x0078, &ret);
-+
-+	return ret;
-+}
-+
-+static int ov64a40_set_ctrl(struct v4l2_ctrl *ctrl)
-+{
-+	struct ov64a40 *ov64a40 = container_of(ctrl->handler, struct ov64a40,
-+					       ctrl_handler);
-+	int pm_status;
-+	int ret = 0;
-+
-+	if (ctrl->id == V4L2_CID_VBLANK) {
-+		int exp_max = ov64a40->mode->height + ctrl->val
-+			    - OV64A40_EXPOSURE_MARGIN;
-+		int exp_val = min(ov64a40->exposure->cur.val, exp_max);
-+
-+		__v4l2_ctrl_modify_range(ov64a40->exposure,
-+					 ov64a40->exposure->minimum,
-+					 exp_max, 1, exp_val);
-+	}
-+
-+	pm_status = pm_runtime_get_if_active(ov64a40->dev, true);
-+	if (!pm_status)
-+		return 0;
-+
-+	switch (ctrl->id) {
-+	case V4L2_CID_EXPOSURE:
-+		ret = cci_write(ov64a40->cci, OV64A40_REG_MEC_LONG_EXPO,
-+				ctrl->val, NULL);
-+		break;
-+	case V4L2_CID_ANALOGUE_GAIN:
-+		ret = cci_write(ov64a40->cci, OV64A40_REG_MEC_LONG_GAIN,
-+				ctrl->val << 1, NULL);
-+		break;
-+	case V4L2_CID_VBLANK: {
-+		int vts = ctrl->val + ov64a40->mode->height;
-+
-+		cci_write(ov64a40->cci, OV64A40_REG_TIMINGS_VTS_LOW, vts, &ret);
-+		cci_write(ov64a40->cci, OV64A40_REG_TIMINGS_VTS_MID,
-+			  (vts >> 8), &ret);
-+		cci_write(ov64a40->cci, OV64A40_REG_TIMINGS_VTS_HIGH,
-+			  (vts >> 16), &ret);
-+		break;
-+	}
-+	case V4L2_CID_VFLIP:
-+		ret = cci_update_bits(ov64a40->cci, OV64A40_REG_TIMING_CTRL_20,
-+				      OV64A40_TIMING_CTRL_20_VFLIP,
-+				      ctrl->val << 2,
-+				      NULL);
-+		break;
-+	case V4L2_CID_HFLIP:
-+		ret = cci_update_bits(ov64a40->cci, OV64A40_REG_TIMING_CTRL_21,
-+				      OV64A40_TIMING_CTRL_21_HFLIP,
-+				      ctrl->val ? 0
-+						: OV64A40_TIMING_CTRL_21_HFLIP,
-+				      NULL);
-+		break;
-+	case V4L2_CID_TEST_PATTERN:
-+		ret = cci_write(ov64a40->cci, OV64A40_REG_TEST_PATTERN,
-+				ov64a40_test_pattern_val[ctrl->val], NULL);
-+		break;
-+	case V4L2_CID_LINK_FREQ:
-+		ret = ov64a40_link_freq_config(ov64a40, ctrl->val);
-+		break;
-+	default:
-+		dev_err(ov64a40->dev, "Unhandled control: %#x\n", ctrl->id);
-+		ret = -EINVAL;
-+		break;
-+	}
-+
-+	if (pm_status > 0) {
-+		pm_runtime_mark_last_busy(ov64a40->dev);
-+		pm_runtime_put_autosuspend(ov64a40->dev);
-+	}
-+
-+	return ret;
-+}
-+
-+static const struct v4l2_ctrl_ops ov64a40_ctrl_ops = {
-+	.s_ctrl = ov64a40_set_ctrl,
-+};
-+
-+static int ov64a40_init_controls(struct ov64a40 *ov64a40)
-+{
-+	int exp_max, hblank_val, vblank_max, vblank_def;
-+	struct v4l2_ctrl_handler *hdlr = &ov64a40->ctrl_handler;
-+	struct v4l2_fwnode_device_properties props;
-+	const struct ov64a40_timings *timings;
-+	int ret;
-+
-+	ret = v4l2_ctrl_handler_init(hdlr, 11);
-+	if (ret)
-+		return ret;
-+
-+	v4l2_ctrl_new_std(hdlr, &ov64a40_ctrl_ops, V4L2_CID_PIXEL_RATE,
-+			  OV64A40_PIXEL_RATE, OV64A40_PIXEL_RATE,  1,
-+			  OV64A40_PIXEL_RATE);
-+
-+	ov64a40->link_freq =
-+		v4l2_ctrl_new_int_menu(hdlr, &ov64a40_ctrl_ops,
-+				       V4L2_CID_LINK_FREQ,
-+				       ov64a40->num_link_frequencies - 1,
-+				       0, ov64a40->link_frequencies);
-+
-+	v4l2_ctrl_new_std_menu_items(hdlr, &ov64a40_ctrl_ops,
-+				     V4L2_CID_TEST_PATTERN,
-+				     ARRAY_SIZE(ov64a40_test_pattern_menu) - 1,
-+				     0, 0, ov64a40_test_pattern_menu);
-+
-+	timings = ov64a40_get_timings(ov64a40, 0);
-+	exp_max = timings->vts - OV64A40_EXPOSURE_MARGIN;
-+	ov64a40->exposure = v4l2_ctrl_new_std(hdlr, &ov64a40_ctrl_ops,
-+					      V4L2_CID_EXPOSURE,
-+					      OV64A40_EXPOSURE_MIN, exp_max, 1,
-+					      OV64A40_EXPOSURE_MIN);
-+
-+	hblank_val = timings->ppl * 4 - ov64a40->mode->width;
-+	ov64a40->hblank = v4l2_ctrl_new_std(hdlr, &ov64a40_ctrl_ops,
-+					    V4L2_CID_HBLANK, hblank_val,
-+					    hblank_val, 1, hblank_val);
-+	if (ov64a40->hblank)
-+		ov64a40->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
-+
-+	vblank_def = timings->vts - ov64a40->mode->height;
-+	vblank_max = OV64A40_VTS_MAX - ov64a40->mode->height;
-+	ov64a40->vblank = v4l2_ctrl_new_std(hdlr, &ov64a40_ctrl_ops,
-+					    V4L2_CID_VBLANK, OV64A40_VBLANK_MIN,
-+					    vblank_max, 1, vblank_def);
-+
-+	v4l2_ctrl_new_std(hdlr, &ov64a40_ctrl_ops, V4L2_CID_ANALOGUE_GAIN,
-+			  OV64A40_ANA_GAIN_MIN, OV64A40_ANA_GAIN_MAX, 1,
-+			  OV64A40_ANA_GAIN_DEFAULT);
-+
-+	ov64a40->hflip = v4l2_ctrl_new_std(hdlr, &ov64a40_ctrl_ops,
-+					   V4L2_CID_HFLIP, 0, 1, 1, 0);
-+	if (ov64a40->hflip)
-+		ov64a40->hflip->flags |= V4L2_CTRL_FLAG_MODIFY_LAYOUT;
-+
-+	ov64a40->vflip = v4l2_ctrl_new_std(hdlr, &ov64a40_ctrl_ops,
-+					   V4L2_CID_VFLIP, 0, 1, 1, 0);
-+	if (ov64a40->vflip)
-+		ov64a40->vflip->flags |= V4L2_CTRL_FLAG_MODIFY_LAYOUT;
-+
-+	if (hdlr->error) {
-+		ret = hdlr->error;
-+		dev_err(ov64a40->dev, "control init failed: %d\n", ret);
-+		goto error_free_hdlr;
-+	}
-+
-+	ret = v4l2_fwnode_device_parse(ov64a40->dev, &props);
-+	if (ret)
-+		goto error_free_hdlr;
-+
-+	ret = v4l2_ctrl_new_fwnode_properties(hdlr, &ov64a40_ctrl_ops,
-+					      &props);
-+	if (ret)
-+		goto error_free_hdlr;
-+
-+	ov64a40->sd.ctrl_handler = hdlr;
-+
-+	return 0;
-+
-+error_free_hdlr:
-+	v4l2_ctrl_handler_free(hdlr);
-+	return ret;
-+}
-+
-+static int ov64a40_identify(struct ov64a40 *ov64a40)
-+{
-+	int ret;
-+	u64 id;
-+
-+	ret = cci_read(ov64a40->cci, OV64A40_REG_CHIP_ID, &id, NULL);
-+	if (ret) {
-+		dev_err(ov64a40->dev, "Failed to read chip id: %d\n", ret);
-+		return ret;
-+	}
-+
-+	if (id != OV64A40_CHIP_ID) {
-+		dev_err(ov64a40->dev, "chip id mismatch: %#llx\n", id);
-+		return -ENODEV;
-+	}
-+
-+	dev_dbg(ov64a40->dev, "OV64A40 chip identified: %#llx\n", id);
-+
-+	return 0;
-+}
-+
-+static int ov64a40_parse_dt(struct ov64a40 *ov64a40)
-+{
-+	struct v4l2_fwnode_endpoint v4l2_fwnode = {
-+		.bus_type = V4L2_MBUS_CSI2_DPHY
-+	};
-+	struct fwnode_handle *endpoint;
-+	int ret = -EINVAL;
-+	unsigned int i;
-+
-+	endpoint = fwnode_graph_get_next_endpoint(dev_fwnode(ov64a40->dev),
-+						  NULL);
-+	if (!endpoint) {
-+		dev_err(ov64a40->dev, "Failed to find endpoint\n");
-+		return -EINVAL;
-+	}
-+
-+	if (v4l2_fwnode_endpoint_alloc_parse(endpoint, &v4l2_fwnode)) {
-+		dev_err(ov64a40->dev, "Failed to parse endpoint\n");
-+		goto error_put_fwnode;
-+
-+	}
-+
-+	if (v4l2_fwnode.bus.mipi_csi2.num_data_lanes != 2) {
-+		dev_err(ov64a40->dev, "Unsupported number of data lanes: %u\n",
-+			v4l2_fwnode.bus.mipi_csi2.num_data_lanes);
-+		goto error_free_fwnode;
-+	}
-+
-+	if (!v4l2_fwnode.nr_of_link_frequencies) {
-+		dev_warn(ov64a40->dev, "no link frequencies defined\n");
-+		goto error_free_fwnode;
-+	}
-+
-+	if (v4l2_fwnode.nr_of_link_frequencies > 2) {
-+		dev_warn(ov64a40->dev,
-+			 "Unsupported number of link frequencies\n");
-+		goto error_free_fwnode;
-+	}
-+
-+	ov64a40->link_frequencies =
-+		devm_kcalloc(ov64a40->dev, v4l2_fwnode.nr_of_link_frequencies,
-+			     sizeof(v4l2_fwnode.link_frequencies[0]),
-+			     GFP_KERNEL);
-+	if (!ov64a40->link_frequencies)  {
-+		ret = -ENOMEM;
-+		goto error_free_fwnode;
-+	}
-+	ov64a40->num_link_frequencies = v4l2_fwnode.nr_of_link_frequencies;
-+
-+	for (i = 0; i < v4l2_fwnode.nr_of_link_frequencies; ++i) {
-+		if (v4l2_fwnode.link_frequencies[i] != OV64A40_LINK_FREQ_360M &&
-+		    v4l2_fwnode.link_frequencies[i] != OV64A40_LINK_FREQ_456M) {
-+			dev_err(ov64a40->dev,
-+				"Unsupported link frequency %lld\n",
-+				v4l2_fwnode.link_frequencies[i]);
-+			goto error_free_fwnode;
-+		}
-+
-+		ov64a40->link_frequencies[i] = v4l2_fwnode.link_frequencies[i];
-+	}
-+
-+	v4l2_fwnode_endpoint_free(&v4l2_fwnode);
-+
-+	/* Register the subdev on the endpoint, so don't put it yet. */
-+	ov64a40->sd.fwnode = endpoint;
-+
-+	return 0;
-+
-+error_free_fwnode:
-+	v4l2_fwnode_endpoint_free(&v4l2_fwnode);
-+error_put_fwnode:
-+	fwnode_handle_put(endpoint);
-+	return ret;
-+}
-+
-+static int ov64a40_get_regulators(struct ov64a40 *ov64a40)
-+{
-+	struct i2c_client *client = v4l2_get_subdevdata(&ov64a40->sd);
-+	unsigned int i;
-+
-+	for (i = 0; i < ARRAY_SIZE(ov64a40_supply_names); i++)
-+		ov64a40->supplies[i].supply = ov64a40_supply_names[i];
-+
-+	return devm_regulator_bulk_get(&client->dev,
-+				       ARRAY_SIZE(ov64a40_supply_names),
-+				       ov64a40->supplies);
-+}
-+
-+static int ov64a40_probe(struct i2c_client *client)
-+{
-+	struct ov64a40 *ov64a40;
-+	u32 xclk_freq;
-+	int ret;
-+
-+	ov64a40 = devm_kzalloc(&client->dev, sizeof(*ov64a40), GFP_KERNEL);
-+	if (!ov64a40)
-+		return -ENOMEM;
-+
-+	ov64a40->dev = &client->dev;
-+	v4l2_i2c_subdev_init(&ov64a40->sd, client, &ov64a40_subdev_ops);
-+
-+	ov64a40->cci = devm_cci_regmap_init_i2c(client, 16);
-+	if (IS_ERR(ov64a40->cci)) {
-+		dev_err(&client->dev, "Failed to initialize CCI\n");
-+		return PTR_ERR(ov64a40->cci);
-+	}
-+
-+	ov64a40->xclk = devm_clk_get(&client->dev, NULL);
-+	if (!ov64a40->xclk)
-+		return dev_err_probe(&client->dev, PTR_ERR(ov64a40->xclk),
-+				     "Failed to get clock\n");
-+
-+	xclk_freq = clk_get_rate(ov64a40->xclk);
-+	if (xclk_freq != OV64A40_XCLK_FREQ) {
-+		dev_err(&client->dev, "Unsupported xclk frequency %u\n",
-+			xclk_freq);
-+		return -EINVAL;
-+	}
-+
-+	ret = ov64a40_get_regulators(ov64a40);
-+	if (ret)
-+		return ret;
-+
-+	ov64a40->reset_gpio = devm_gpiod_get_optional(&client->dev, "reset",
-+						      GPIOD_OUT_LOW);
-+	if (IS_ERR(ov64a40->reset_gpio))
-+		return dev_err_probe(&client->dev, PTR_ERR(ov64a40->reset_gpio),
-+				     "Failed to get reset gpio\n");
-+
-+	ret = ov64a40_parse_dt(ov64a40);
-+	if (ret)
-+		return ret;
-+
-+	ret = ov64a40_power_on(&client->dev);
-+	if (ret)
-+		goto error_put_fwnode;
-+
-+	ret = ov64a40_identify(ov64a40);
-+	if (ret)
-+		goto error_poweroff;
-+
-+	ov64a40->mode = &ov64a40_modes[0];
-+
-+	pm_runtime_set_active(&client->dev);
-+	pm_runtime_get_noresume(&client->dev);
-+	pm_runtime_enable(&client->dev);
-+	pm_runtime_set_autosuspend_delay(&client->dev, 1000);
-+	pm_runtime_use_autosuspend(&client->dev);
-+
-+	ret = ov64a40_init_controls(ov64a40);
-+	if (ret)
-+		goto error_poweroff;
-+
-+	/* Initialize subdev */
-+	ov64a40->sd.flags = V4L2_SUBDEV_FL_HAS_DEVNODE
-+			  | V4L2_SUBDEV_FL_HAS_EVENTS;
-+	ov64a40->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR;
-+
-+	ov64a40->pad.flags = MEDIA_PAD_FL_SOURCE;
-+	ret = media_entity_pads_init(&ov64a40->sd.entity, 1, &ov64a40->pad);
-+	if (ret) {
-+		dev_err(&client->dev, "failed to init entity pads: %d\n", ret);
-+		goto error_handler_free;
-+	}
-+
-+	ov64a40->sd.state_lock = ov64a40->ctrl_handler.lock;
-+	ret = v4l2_subdev_init_finalize(&ov64a40->sd);
-+	if (ret < 0) {
-+		dev_err(&client->dev, "subdev init error: %d\n", ret);
-+		goto error_media_entity;
-+	}
-+
-+	ret = v4l2_async_register_subdev_sensor(&ov64a40->sd);
-+	if (ret < 0) {
-+		dev_err(&client->dev,
-+			"failed to register sensor sub-device: %d\n", ret);
-+		goto error_subdev_cleanup;
-+	}
-+
-+	pm_runtime_mark_last_busy(&client->dev);
-+	pm_runtime_put_autosuspend(&client->dev);
-+
-+	return 0;
-+
-+error_subdev_cleanup:
-+	v4l2_subdev_cleanup(&ov64a40->sd);
-+error_media_entity:
-+	media_entity_cleanup(&ov64a40->sd.entity);
-+error_handler_free:
-+	v4l2_ctrl_handler_free(ov64a40->sd.ctrl_handler);
-+error_poweroff:
-+	ov64a40_power_off(&client->dev);
-+	pm_runtime_set_suspended(&client->dev);
-+error_put_fwnode:
-+	fwnode_handle_put(ov64a40->sd.fwnode);
-+
-+	return ret;
-+}
-+
-+static void ov64a40_remove(struct i2c_client *client)
-+{
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct ov64a40 *ov64a40 = sd_to_ov64a40(sd);
-+
-+	v4l2_async_unregister_subdev(sd);
-+	fwnode_handle_put(ov64a40->sd.fwnode);
-+	v4l2_subdev_cleanup(sd);
-+	media_entity_cleanup(&sd->entity);
-+	v4l2_ctrl_handler_free(sd->ctrl_handler);
-+
-+	pm_runtime_disable(&client->dev);
-+	if (!pm_runtime_status_suspended(&client->dev))
-+		ov64a40_power_off(&client->dev);
-+	pm_runtime_set_suspended(&client->dev);
-+}
-+
-+static const struct of_device_id ov64a40_of_ids[] = {
-+	{ .compatible = "ovti,ov64a40" },
-+	{ /* sentinel */ }
-+};
-+MODULE_DEVICE_TABLE(of, ov64a40_of_ids);
-+
-+static const struct dev_pm_ops ov64a40_pm_ops = {
-+	SET_RUNTIME_PM_OPS(ov64a40_power_off, ov64a40_power_on, NULL)
-+};
-+
-+static struct i2c_driver ov64a40_i2c_driver = {
-+	.driver	= {
-+		.name = "ov64a40",
-+		.of_match_table	= ov64a40_of_ids,
-+		.pm = &ov64a40_pm_ops,
-+	},
-+	.probe_new = ov64a40_probe,
-+	.remove	= ov64a40_remove,
-+};
-+
-+module_i2c_driver(ov64a40_i2c_driver);
-+
-+MODULE_AUTHOR("Jacopo Mondi <jacopo.mondi@ideasonboard.com>");
-+MODULE_DESCRIPTION("OmniVision OV64A40 sensor driver");
-+MODULE_LICENSE("GPL");
diff --git a/target/linux/bcm27xx/patches-6.1/950-1196-media-i2c-Add-ROHM-BU64754-Camera-Autofocus-Actuator.patch b/target/linux/bcm27xx/patches-6.1/950-1196-media-i2c-Add-ROHM-BU64754-Camera-Autofocus-Actuator.patch
deleted file mode 100644
index a50617ee56..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1196-media-i2c-Add-ROHM-BU64754-Camera-Autofocus-Actuator.patch
+++ /dev/null
@@ -1,368 +0,0 @@
-From 97ec6aeb265df0bfe7193f00c249b38873fb0fb7 Mon Sep 17 00:00:00 2001
-From: Kieran Bingham <kieran.bingham@ideasonboard.com>
-Date: Wed, 13 Sep 2023 17:53:54 +0100
-Subject: [PATCH] media: i2c: Add ROHM BU64754 Camera Autofocus Actuator
-
-Add support for the ROHM BU64754 Motor Driver for Camera Autofocus. A
-V4L2 Subdevice is registered and provides a single
-V4L2_CID_FOCUS_ABSOLUTE control.
-
-Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
-Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
----
- drivers/media/i2c/Kconfig   |  13 ++
- drivers/media/i2c/Makefile  |   1 +
- drivers/media/i2c/bu64754.c | 315 ++++++++++++++++++++++++++++++++++++
- 3 files changed, 329 insertions(+)
- create mode 100644 drivers/media/i2c/bu64754.c
-
---- a/drivers/media/i2c/Kconfig
-+++ b/drivers/media/i2c/Kconfig
-@@ -917,6 +917,19 @@ config VIDEO_AK7375
- 	  capability. This is designed for linear control of
- 	  voice coil motors, controlled via I2C serial interface.
- 
-+config VIDEO_BU64754
-+	tristate "BU64754 Motor Driver for Camera Autofocus"
-+	depends on I2C && VIDEO_DEV
-+	select MEDIA_CONTROLLER
-+	select VIDEO_V4L2_SUBDEV_API
-+	select V4L2_ASYNC
-+	select V4L2_CCI_I2C
-+	help
-+	  This is a driver for the BU64754 Motor Driver for Camera
-+	  Autofocus. The BU64754GWZ is an actuator driver IC which
-+	  can be controlled the actuator position precisely using
-+	  with internal Hall Sensor.
-+
- config VIDEO_DW9714
- 	tristate "DW9714 lens voice coil support"
- 	depends on I2C && VIDEO_DEV
---- a/drivers/media/i2c/Makefile
-+++ b/drivers/media/i2c/Makefile
-@@ -26,6 +26,7 @@ obj-$(CONFIG_VIDEO_ARDUCAM_PIVARIETY) +=
- obj-$(CONFIG_VIDEO_BT819) += bt819.o
- obj-$(CONFIG_VIDEO_BT856) += bt856.o
- obj-$(CONFIG_VIDEO_BT866) += bt866.o
-+obj-$(CONFIG_VIDEO_BU64754) += bu64754.o
- obj-$(CONFIG_VIDEO_CCS) += ccs/
- obj-$(CONFIG_VIDEO_CCS_PLL) += ccs-pll.o
- obj-$(CONFIG_VIDEO_CS3308) += cs3308.o
---- /dev/null
-+++ b/drivers/media/i2c/bu64754.c
-@@ -0,0 +1,315 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * The BU64754GWZ is an actuator driver IC which can control the
-+ * actuator position precisely using an internal Hall Sensor.
-+ */
-+
-+#include <linux/delay.h>
-+#include <linux/i2c.h>
-+#include <linux/module.h>
-+#include <linux/pm_runtime.h>
-+#include <linux/regulator/consumer.h>
-+
-+#include <media/v4l2-cci.h>
-+#include <media/v4l2-ctrls.h>
-+#include <media/v4l2-device.h>
-+
-+#define BU64754_REG_ACTIVE	CCI_REG16(0x07)
-+#define BU64754_ACTIVE_MODE	0x8080
-+
-+#define BU64754_REG_SERVE	CCI_REG16(0xd9)
-+#define BU64754_SERVE_ON	0x0404
-+
-+#define BU64754_REG_POSITION	CCI_REG16(0x45)
-+#define BU64753_POSITION_MAX	1023 /* 0x3ff */
-+#define BU64753_POSITION_STEPS	1
-+
-+#define BU64754_POWER_ON_DELAY	800 /* uS : t1, t3 */
-+
-+struct bu64754 {
-+	struct device *dev;
-+
-+	struct v4l2_ctrl_handler ctrls_vcm;
-+	struct v4l2_subdev sd;
-+	struct regmap *cci;
-+
-+	u16 current_val;
-+	struct regulator *vdd;
-+	struct notifier_block notifier;
-+};
-+
-+static inline struct bu64754 *sd_to_bu64754(struct v4l2_subdev *subdev)
-+{
-+	return container_of(subdev, struct bu64754, sd);
-+}
-+
-+static int bu64754_set(struct bu64754 *bu64754, u16 position)
-+{
-+	int ret;
-+
-+	position &= 0x3ff; /* BU64753_POSITION_MAX */
-+	ret = cci_write(bu64754->cci, BU64754_REG_POSITION, position, NULL);
-+	if (ret) {
-+		dev_err(bu64754->dev, "Set position failed ret=%d\n", ret);
-+		return ret;
-+	}
-+
-+	return 0;
-+}
-+
-+static int bu64754_active(struct bu64754 *bu64754)
-+{
-+	int ret;
-+
-+	/* Power on */
-+	ret = cci_write(bu64754->cci, BU64754_REG_ACTIVE, BU64754_ACTIVE_MODE, NULL);
-+	if (ret < 0) {
-+		dev_err(bu64754->dev, "Failed to set active mode ret = %d\n",
-+			ret);
-+		return ret;
-+	}
-+
-+	/* Serve on */
-+	ret = cci_write(bu64754->cci, BU64754_REG_SERVE, BU64754_SERVE_ON, NULL);
-+	if (ret < 0) {
-+		dev_err(bu64754->dev, "Failed to enable serve ret = %d\n",
-+			ret);
-+		return ret;
-+	}
-+
-+	return bu64754_set(bu64754, bu64754->current_val);
-+}
-+
-+static int bu64754_standby(struct bu64754 *bu64754)
-+{
-+	int ret;
-+
-+	ret = cci_write(bu64754->cci, BU64754_REG_ACTIVE, 0, NULL);
-+	if (ret < 0)
-+		dev_err(bu64754->dev, "Failed to enter standby mode ret = %d\n",
-+			ret);
-+
-+	return ret;
-+}
-+
-+static int bu64754_regulator_event(struct notifier_block *nb,
-+				   unsigned long action, void *data)
-+{
-+	struct bu64754 *bu64754 = container_of(nb, struct bu64754, notifier);
-+
-+	if (action & REGULATOR_EVENT_ENABLE) {
-+		/*
-+		 * Initialisation delay between VDD low->high and availability
-+		 * i2c operation.
-+		 */
-+		usleep_range(BU64754_POWER_ON_DELAY,
-+			     BU64754_POWER_ON_DELAY + 100);
-+
-+		bu64754_active(bu64754);
-+	} else if (action & REGULATOR_EVENT_PRE_DISABLE) {
-+		bu64754_standby(bu64754);
-+	}
-+
-+	return 0;
-+}
-+
-+static int bu64754_set_ctrl(struct v4l2_ctrl *ctrl)
-+{
-+	struct bu64754 *bu64754 = container_of(ctrl->handler,
-+		struct bu64754, ctrls_vcm);
-+
-+	if (ctrl->id == V4L2_CID_FOCUS_ABSOLUTE) {
-+		bu64754->current_val = ctrl->val;
-+		return bu64754_set(bu64754, ctrl->val);
-+	}
-+
-+	return -EINVAL;
-+}
-+
-+static const struct v4l2_ctrl_ops bu64754_vcm_ctrl_ops = {
-+	.s_ctrl = bu64754_set_ctrl,
-+};
-+
-+static int bu64754_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
-+{
-+	return pm_runtime_resume_and_get(sd->dev);
-+}
-+
-+static int bu64754_close(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
-+{
-+	pm_runtime_put(sd->dev);
-+	return 0;
-+}
-+
-+static const struct v4l2_subdev_internal_ops bu64754_int_ops = {
-+	.open = bu64754_open,
-+	.close = bu64754_close,
-+};
-+
-+static const struct v4l2_subdev_ops bu64754_ops = { };
-+
-+static void bu64754_subdev_cleanup(struct bu64754 *bu64754)
-+{
-+	v4l2_async_unregister_subdev(&bu64754->sd);
-+	v4l2_ctrl_handler_free(&bu64754->ctrls_vcm);
-+	media_entity_cleanup(&bu64754->sd.entity);
-+}
-+
-+static int bu64754_init_controls(struct bu64754 *bu64754)
-+{
-+	struct v4l2_ctrl_handler *hdl = &bu64754->ctrls_vcm;
-+	const struct v4l2_ctrl_ops *ops = &bu64754_vcm_ctrl_ops;
-+
-+	v4l2_ctrl_handler_init(hdl, 1);
-+
-+	v4l2_ctrl_new_std(hdl, ops, V4L2_CID_FOCUS_ABSOLUTE,
-+			  0, BU64753_POSITION_MAX, BU64753_POSITION_STEPS,
-+			  0);
-+
-+	bu64754->current_val = 0;
-+
-+	bu64754->sd.ctrl_handler = hdl;
-+	if (hdl->error) {
-+		dev_err(bu64754->dev, "%s fail error: 0x%x\n",
-+			__func__, hdl->error);
-+		return hdl->error;
-+	}
-+
-+	return 0;
-+}
-+
-+static int bu64754_probe(struct i2c_client *client)
-+{
-+	struct bu64754 *bu64754;
-+	int ret;
-+
-+	bu64754 = devm_kzalloc(&client->dev, sizeof(*bu64754), GFP_KERNEL);
-+	if (!bu64754)
-+		return -ENOMEM;
-+
-+	bu64754->dev = &client->dev;
-+
-+	bu64754->cci = devm_cci_regmap_init_i2c(client, 8);
-+	if (IS_ERR(bu64754->cci)) {
-+		dev_err(bu64754->dev, "Failed to initialize CCI\n");
-+		return PTR_ERR(bu64754->cci);
-+	}
-+
-+	bu64754->vdd = devm_regulator_get_optional(&client->dev, "vdd");
-+	if (IS_ERR(bu64754->vdd)) {
-+		if (PTR_ERR(bu64754->vdd) != -ENODEV)
-+			return PTR_ERR(bu64754->vdd);
-+
-+		bu64754->vdd = NULL;
-+	} else {
-+		bu64754->notifier.notifier_call = bu64754_regulator_event;
-+
-+		ret = regulator_register_notifier(bu64754->vdd,
-+						  &bu64754->notifier);
-+		if (ret) {
-+			dev_err(bu64754->dev,
-+				"could not register regulator notifier\n");
-+			return ret;
-+		}
-+	}
-+
-+	v4l2_i2c_subdev_init(&bu64754->sd, client, &bu64754_ops);
-+	bu64754->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
-+	bu64754->sd.internal_ops = &bu64754_int_ops;
-+	bu64754->sd.entity.function = MEDIA_ENT_F_LENS;
-+
-+	ret = bu64754_init_controls(bu64754);
-+	if (ret)
-+		goto err_cleanup;
-+
-+	ret = media_entity_pads_init(&bu64754->sd.entity, 0, NULL);
-+	if (ret < 0)
-+		goto err_cleanup;
-+
-+	bu64754->sd.entity.function = MEDIA_ENT_F_LENS;
-+
-+	ret = v4l2_async_register_subdev(&bu64754->sd);
-+	if (ret < 0)
-+		goto err_cleanup;
-+
-+	if (!bu64754->vdd)
-+		pm_runtime_set_active(&client->dev);
-+
-+	pm_runtime_enable(&client->dev);
-+	pm_runtime_idle(&client->dev);
-+
-+	return 0;
-+
-+err_cleanup:
-+	v4l2_ctrl_handler_free(&bu64754->ctrls_vcm);
-+	media_entity_cleanup(&bu64754->sd.entity);
-+
-+	return ret;
-+}
-+
-+static void bu64754_remove(struct i2c_client *client)
-+{
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct bu64754 *bu64754 = sd_to_bu64754(sd);
-+
-+	if (bu64754->vdd)
-+		regulator_unregister_notifier(bu64754->vdd,
-+					      &bu64754->notifier);
-+
-+	pm_runtime_disable(&client->dev);
-+
-+	bu64754_subdev_cleanup(bu64754);
-+}
-+
-+static int __maybe_unused bu64754_vcm_suspend(struct device *dev)
-+{
-+	struct i2c_client *client = to_i2c_client(dev);
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct bu64754 *bu64754 = sd_to_bu64754(sd);
-+
-+	if (bu64754->vdd)
-+		return regulator_disable(bu64754->vdd);
-+
-+	return bu64754_standby(bu64754);
-+}
-+
-+static int  __maybe_unused bu64754_vcm_resume(struct device *dev)
-+{
-+	struct i2c_client *client = to_i2c_client(dev);
-+	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-+	struct bu64754 *bu64754 = sd_to_bu64754(sd);
-+
-+	if (bu64754->vdd)
-+		return regulator_enable(bu64754->vdd);
-+
-+	return bu64754_active(bu64754);
-+}
-+
-+static const struct of_device_id bu64754_of_table[] = {
-+	{ .compatible = "rohm,bu64754", },
-+	{ /* sentinel */ }
-+};
-+
-+MODULE_DEVICE_TABLE(of, bu64754_of_table);
-+
-+static const struct dev_pm_ops bu64754_pm_ops = {
-+	SET_SYSTEM_SLEEP_PM_OPS(bu64754_vcm_suspend, bu64754_vcm_resume)
-+	SET_RUNTIME_PM_OPS(bu64754_vcm_suspend, bu64754_vcm_resume, NULL)
-+};
-+
-+static struct i2c_driver bu64754_i2c_driver = {
-+	.driver = {
-+		.name = "bu64754",
-+		.pm = &bu64754_pm_ops,
-+		.of_match_table = bu64754_of_table,
-+	},
-+	.probe_new = bu64754_probe,
-+	.remove = bu64754_remove,
-+};
-+
-+module_i2c_driver(bu64754_i2c_driver);
-+
-+MODULE_AUTHOR("Kieran Bingham");
-+MODULE_DESCRIPTION("BU64754 VCM driver");
-+MODULE_LICENSE("GPL");
-+
diff --git a/target/linux/bcm27xx/patches-6.1/950-1197-overlays-Add-overlay-for-the-OV64A40-Arducam-Camera-.patch b/target/linux/bcm27xx/patches-6.1/950-1197-overlays-Add-overlay-for-the-OV64A40-Arducam-Camera-.patch
deleted file mode 100644
index d3ee0dc68e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1197-overlays-Add-overlay-for-the-OV64A40-Arducam-Camera-.patch
+++ /dev/null
@@ -1,426 +0,0 @@
-From 7f67a45ee7c008c3d8e45fde6fa9c4287fb3bc9e Mon Sep 17 00:00:00 2001
-From: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
-Date: Thu, 20 Jul 2023 13:18:34 +0200
-Subject: [PATCH] overlays: Add overlay for the OV64A40 Arducam Camera Module
-
-Arducam have integrated an Omnivision OV64A40 with a ROHM BU64754 VCM
-with a Raspberry Pi compatible cable pinout.
-
-Provide an overlay to support the module.
-
-Also add support to the camera mux overlays.
-
-Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
-Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
----
- arch/arm/boot/dts/overlays/Makefile           |  1 +
- arch/arm/boot/dts/overlays/README             | 25 +++++
- .../dts/overlays/camera-mux-2port-overlay.dts | 32 +++++++
- .../dts/overlays/camera-mux-4port-overlay.dts | 64 +++++++++++++
- .../arm/boot/dts/overlays/ov64a40-overlay.dts | 91 +++++++++++++++++++
- arch/arm/boot/dts/overlays/ov64a40.dtsi       | 34 +++++++
- 6 files changed, 247 insertions(+)
- create mode 100644 arch/arm/boot/dts/overlays/ov64a40-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/ov64a40.dtsi
-
---- a/arch/arm/boot/dts/overlays/Makefile
-+++ b/arch/arm/boot/dts/overlays/Makefile
-@@ -175,6 +175,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
- 	mz61581.dtbo \
- 	ov2311.dtbo \
- 	ov5647.dtbo \
-+	ov64a40.dtbo \
- 	ov7251.dtbo \
- 	ov9281.dtbo \
- 	papirus.dtbo \
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -817,6 +817,7 @@ Params: cam0-arducam-64mp       Select A
-         cam0-imx708             Select IMX708 for camera on port 0
-         cam0-ov2311             Select OV2311 for camera on port 0
-         cam0-ov5647             Select OV5647 for camera on port 0
-+        cam0-ov64a40            Select OV64A40 for camera on port 0
-         cam0-ov7251             Select OV7251 for camera on port 0
-         cam0-ov9281             Select OV9281 for camera on port 0
-         cam0-imx290-clk-freq    Set clock frequency for an IMX290 on port 0
-@@ -829,6 +830,7 @@ Params: cam0-arducam-64mp       Select A
-         cam1-imx708             Select IMX708 for camera on port 1
-         cam1-ov2311             Select OV2311 for camera on port 1
-         cam1-ov5647             Select OV5647 for camera on port 1
-+        cam1-ov64a40            Select OV64A40 for camera on port 1
-         cam1-ov7251             Select OV7251 for camera on port 1
-         cam1-ov9281             Select OV9281 for camera on port 1
-         cam1-imx290-clk-freq    Set clock frequency for an IMX290 on port 1
-@@ -850,6 +852,7 @@ Params: cam0-arducam-64mp       Select A
-         cam0-imx708             Select IMX708 for camera on port 0
-         cam0-ov2311             Select OV2311 for camera on port 0
-         cam0-ov5647             Select OV5647 for camera on port 0
-+        cam0-ov64a40            Select OV64A40 for camera on port 0
-         cam0-ov7251             Select OV7251 for camera on port 0
-         cam0-ov9281             Select OV9281 for camera on port 0
-         cam0-imx290-clk-freq    Set clock frequency for an IMX290 on port 0
-@@ -862,6 +865,7 @@ Params: cam0-arducam-64mp       Select A
-         cam1-imx708             Select IMX708 for camera on port 1
-         cam1-ov2311             Select OV2311 for camera on port 1
-         cam1-ov5647             Select OV5647 for camera on port 1
-+        cam1-ov64a40            Select OV64A40 for camera on port 1
-         cam1-ov7251             Select OV7251 for camera on port 1
-         cam1-ov9281             Select OV9281 for camera on port 1
-         cam1-imx290-clk-freq    Set clock frequency for an IMX290 on port 1
-@@ -874,6 +878,7 @@ Params: cam0-arducam-64mp       Select A
-         cam2-imx708             Select IMX708 for camera on port 2
-         cam2-ov2311             Select OV2311 for camera on port 2
-         cam2-ov5647             Select OV5647 for camera on port 2
-+        cam2-ov64a40            Select OV64A40 for camera on port 2
-         cam2-ov7251             Select OV7251 for camera on port 2
-         cam2-ov9281             Select OV9281 for camera on port 2
-         cam2-imx290-clk-freq    Set clock frequency for an IMX290 on port 2
-@@ -886,6 +891,7 @@ Params: cam0-arducam-64mp       Select A
-         cam3-imx708             Select IMX708 for camera on port 3
-         cam3-ov2311             Select OV2311 for camera on port 3
-         cam3-ov5647             Select OV5647 for camera on port 3
-+        cam3-ov64a40            Select OV64A40 for camera on port 3
-         cam3-ov7251             Select OV7251 for camera on port 3
-         cam3-ov9281             Select OV9281 for camera on port 3
-         cam3-imx290-clk-freq    Set clock frequency for an IMX290 on port 3
-@@ -3222,6 +3228,25 @@ Params: rotation                Mounting
-         vcm                     Configure a VCM focus drive on the sensor.
- 
- 
-+Name:   ov64a40
-+Info:   Arducam OV64A40 camera module.
-+        Uses Unicam 1, which is the standard camera connector on most Pi
-+        variants.
-+Load:   dtoverlay=ov64a40,<param>=<val>
-+Params: rotation                Mounting rotation of the camera sensor (0 or
-+                                180, default 0)
-+        orientation             Sensor orientation (0 = front, 1 = rear,
-+                                2 = external, default external)
-+        media-controller        Configure use of Media Controller API for
-+                                configuring the sensor (default on)
-+        cam0                    Adopt the default configuration for CAM0 on a
-+                                Compute Module (CSI0, i2c_vc, and cam0_reg).
-+        vcm                     Select lens driver state. Default is enabled,
-+                                but vcm=off will disable.
-+        link-frequency          Allowable link frequency values to use in Hz:
-+                                456000000 (default), 360000000
-+
-+
- Name:   ov7251
- Info:   Omnivision OV7251 camera module.
-         Uses Unicam 1, which is the standard camera connector on most Pi
---- a/arch/arm/boot/dts/overlays/camera-mux-2port-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/camera-mux-2port-overlay.dts
-@@ -189,6 +189,16 @@
- 					#undef cam_node
- 					#undef cam_endpoint
- 					#undef cam1_clk
-+
-+					#define cam_node ov64a40_0
-+					#define cam_endpoint ov64a40_0_ep
-+					#define vcm_node ov64a40_0_vcm
-+					#define cam1_clk clk_24mhz
-+					#include "ov64a40.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef vcm_node
-+					#undef cam1_clk
- 				};
- 
- 				i2c@1 {
-@@ -289,6 +299,16 @@
- 					#undef cam_node
- 					#undef cam_endpoint
- 					#undef cam1_clk
-+
-+					#define cam_node ov64a40_1
-+					#define cam_endpoint ov64a40_1_ep
-+					#define vcm_node ov64a40_1_vcm
-+					#define cam1_clk clk_24mhz
-+					#include "ov64a40.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef vcm_node
-+					#undef cam1_clk
- 				};
- 			};
- 		};
-@@ -450,6 +470,12 @@
- 		cam0-ov2311 = <&mux_in0>, "remote-endpoint:0=",<&ov2311_0_ep>,
- 			      <&ov2311_0_ep>, "remote-endpoint:0=",<&mux_in0>,
- 			      <&ov2311_0>, "status=okay";
-+		cam0-ov64a40 = <&mux_in0>, "remote-endpoint:0=",<&ov64a40_0_ep>,
-+			      <&ov64a40_0_ep>, "remote-endpoint:0=",<&mux_in0>,
-+			      <&mux_in0>, "clock-noncontinuous?",
-+			      <&ov64a40_0>, "status=okay",
-+			      <&ov64a40_0_vcm>, "status=okay",
-+			      <&ov64a40_0>,"lens-focus:0=", <&ov64a40_0_vcm>;
- 
- 		cam1-arducam-64mp = <&mux_in1>, "remote-endpoint:0=",<&arducam_64mp_1_ep>,
- 				    <&arducam_64mp_1_ep>, "remote-endpoint:0=",<&mux_in1>,
-@@ -496,6 +522,12 @@
- 		cam1-ov2311 = <&mux_in1>, "remote-endpoint:0=",<&ov2311_1_ep>,
- 			      <&ov2311_1_ep>, "remote-endpoint:0=",<&mux_in1>,
- 			      <&ov2311_1>, "status=okay";
-+		cam1-ov64a40 = <&mux_in1>, "remote-endpoint:0=",<&ov64a40_1_ep>,
-+			      <&ov64a40_1_ep>, "remote-endpoint:0=",<&mux_in1>,
-+			      <&mux_in1>, "clock-noncontinuous?",
-+			      <&ov64a40_1>, "status=okay",
-+			      <&ov64a40_1_vcm>, "status=okay",
-+			      <&ov64a40_1>,"lens-focus:0=", <&ov64a40_1_vcm>;
- 
- 		cam0-imx290-clk-freq = <&clk_imx290>,"clock-frequency:0",
- 				       <&imx290_0>,"clock-frequency:0";
---- a/arch/arm/boot/dts/overlays/camera-mux-4port-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/camera-mux-4port-overlay.dts
-@@ -247,6 +247,16 @@
- 					#undef cam_node
- 					#undef cam_endpoint
- 					#undef cam1_clk
-+
-+					#define cam_node ov64a40_0
-+					#define cam_endpoint ov64a40_0_ep
-+					#define vcm_node ov64a40_0_vcm
-+					#define cam1_clk clk_24mhz
-+					#include "ov64a40.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef vcm_node
-+					#undef cam1_clk
- 				};
- 
- 				i2c@1 {
-@@ -347,6 +357,16 @@
- 					#undef cam_node
- 					#undef cam_endpoint
- 					#undef cam1_clk
-+
-+					#define cam_node ov64a40_1
-+					#define cam_endpoint ov64a40_1_ep
-+					#define vcm_node ov64a40_1_vcm
-+					#define cam1_clk clk_24mhz
-+					#include "ov64a40.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef vcm_node
-+					#undef cam1_clk
- 				};
- 
- 				i2c@2 {
-@@ -447,6 +467,16 @@
- 					#undef cam_node
- 					#undef cam_endpoint
- 					#undef cam1_clk
-+
-+					#define cam_node ov64a40_2
-+					#define cam_endpoint ov64a40_2_ep
-+					#define vcm_node ov64a40_2_vcm
-+					#define cam1_clk clk_24mhz
-+					#include "ov64a40.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef vcm_node
-+					#undef cam1_clk
- 				};
- 
- 				i2c@3 {
-@@ -547,6 +577,16 @@
- 					#undef cam_node
- 					#undef cam_endpoint
- 					#undef cam1_clk
-+
-+					#define cam_node ov64a40_3
-+					#define cam_endpoint ov64a40_3_ep
-+					#define vcm_node ov64a40_3_vcm
-+					#define cam1_clk clk_24mhz
-+					#include "ov64a40.dtsi"
-+					#undef cam_node
-+					#undef cam_endpoint
-+					#undef vcm_node
-+					#undef cam1_clk
- 				};
- 			};
- 		};
-@@ -725,6 +765,12 @@
- 		cam0-ov2311 = <&mux_in0>, "remote-endpoint:0=",<&ov2311_0_ep>,
- 			      <&ov2311_0_ep>, "remote-endpoint:0=",<&mux_in0>,
- 			      <&ov2311_0>, "status=okay";
-+		cam0-ov64a40 = <&mux_in0>, "remote-endpoint:0=",<&ov64a40_0_ep>,
-+			      <&ov64a40_0_ep>, "remote-endpoint:0=",<&mux_in0>,
-+			      <&mux_in0>, "clock-noncontinuous?",
-+			      <&ov64a40_0>, "status=okay",
-+			      <&ov64a40_0_vcm>, "status=okay",
-+			      <&ov64a40_0>,"lens-focus:0=", <&ov64a40_0_vcm>;
- 
- 		cam1-arducam-64mp = <&mux_in1>, "remote-endpoint:0=",<&arducam_64mp_1_ep>,
- 				    <&arducam_64mp_1_ep>, "remote-endpoint:0=",<&mux_in1>,
-@@ -771,6 +817,12 @@
- 		cam1-ov2311 = <&mux_in1>, "remote-endpoint:0=",<&ov2311_1_ep>,
- 			      <&ov2311_1_ep>, "remote-endpoint:0=",<&mux_in1>,
- 			      <&ov2311_1>, "status=okay";
-+		cam1-ov64a40 = <&mux_in1>, "remote-endpoint:0=",<&ov64a40_1_ep>,
-+			      <&ov64a40_1_ep>, "remote-endpoint:0=",<&mux_in1>,
-+			      <&mux_in1>, "clock-noncontinuous?",
-+			      <&ov64a40_1>, "status=okay",
-+			      <&ov64a40_1_vcm>, "status=okay",
-+			      <&ov64a40_1>,"lens-focus:0=", <&ov64a40_1_vcm>;
- 
- 		cam2-arducam-64mp = <&mux_in2>, "remote-endpoint:0=",<&arducam_64mp_2_ep>,
- 				    <&arducam_64mp_2_ep>, "remote-endpoint:0=",<&mux_in2>,
-@@ -817,6 +869,12 @@
- 		cam2-ov2311 = <&mux_in2>, "remote-endpoint:0=",<&ov2311_2_ep>,
- 			      <&ov2311_2_ep>, "remote-endpoint:0=",<&mux_in2>,
- 			      <&ov2311_2>, "status=okay";
-+		cam2-ov64a40 = <&mux_in2>, "remote-endpoint:0=",<&ov64a40_2_ep>,
-+			      <&ov64a40_2_ep>, "remote-endpoint:0=",<&mux_in2>,
-+			      <&mux_in2>, "clock-noncontinuous?",
-+			      <&ov64a40_2>, "status=okay",
-+			      <&ov64a40_2_vcm>, "status=okay",
-+			      <&ov64a40_2>,"lens-focus:0=", <&ov64a40_2_vcm>;
- 
- 		cam3-arducam-64mp = <&mux_in3>, "remote-endpoint:0=",<&arducam_64mp_3_ep>,
- 				    <&arducam_64mp_3_ep>, "remote-endpoint:0=",<&mux_in3>,
-@@ -863,6 +921,12 @@
- 		cam3-ov2311 = <&mux_in3>, "remote-endpoint:0=",<&ov2311_3_ep>,
- 			      <&ov2311_3_ep>, "remote-endpoint:0=",<&mux_in3>,
- 			      <&ov2311_3>, "status=okay";
-+		cam3-ov64a40 = <&mux_in3>, "remote-endpoint:0=",<&ov64a40_3_ep>,
-+			      <&ov64a40_3_ep>, "remote-endpoint:0=",<&mux_in3>,
-+			      <&mux_in3>, "clock-noncontinuous?",
-+			      <&ov64a40_3>, "status=okay",
-+			      <&ov64a40_3_vcm>, "status=okay",
-+			      <&ov64a40_3>,"lens-focus:0=", <&ov64a40_3_vcm>;
- 
- 		cam0-imx290-clk-freq = <&clk_imx290>,"clock-frequency:0",
- 				       <&imx290_0>,"clock-frequency:0";
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/ov64a40-overlay.dts
-@@ -0,0 +1,91 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+// Definitions for OV64A40 camera module on VC I2C bus
-+/dts-v1/;
-+/plugin/;
-+
-+/{
-+	compatible = "brcm,bcm2835";
-+
-+	i2c_frag: fragment@0 {
-+		target = <&i2c_csi_dsi>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			#include "ov64a40.dtsi"
-+		};
-+	};
-+
-+	csi_frag: fragment@1 {
-+		target = <&csi1>;
-+		csi: __overlay__ {
-+			status = "okay";
-+			brcm,media-controller;
-+
-+			port{
-+				csi_ep: endpoint{
-+					remote-endpoint = <&cam_endpoint>;
-+					clock-lanes = <0>;
-+					data-lanes = <1 2>;
-+				};
-+			};
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c0if>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	clk_frag: fragment@3 {
-+		target = <&cam1_clk>;
-+		__overlay__ {
-+			clock-frequency = <24000000>;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&i2c0mux>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@5 {
-+		target = <&cam_node>;
-+		__overlay__ {
-+			lens-focus = <&vcm_node>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		rotation = <&cam_node>,"rotation:0";
-+		orientation = <&cam_node>,"orientation:0";
-+		media-controller = <&csi>,"brcm,media-controller?";
-+		cam0 = <&i2c_frag>, "target:0=",<&i2c_csi_dsi0>,
-+		       <&csi_frag>, "target:0=",<&csi0>,
-+		       <&clk_frag>, "target:0=",<&cam0_clk>,
-+		       <&cam_node>, "clocks:0=",<&cam0_clk>,
-+		       <&cam_node>, "avdd-supply:0=",<&cam0_reg>,
-+		       <&vcm_node>, "vdd-supply:0=",<&cam0_reg>;
-+		vcm = <&vcm_node>, "status",
-+		      <0>, "=5";
-+		link-frequency = <&cam_endpoint>,"link-frequencies#0";
-+	};
-+};
-+
-+&cam_node {
-+	status = "okay";
-+};
-+
-+&cam_endpoint {
-+	remote-endpoint = <&csi_ep>;
-+};
-+
-+&vcm_node {
-+	status = "okay";
-+};
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/ov64a40.dtsi
-@@ -0,0 +1,34 @@
-+// Fragment that configures an OV64A40
-+
-+cam_node: ov64a40@36 {
-+	compatible = "ovti,ov64a40";
-+	reg = <0x36>;
-+	status = "disabled";
-+
-+	clocks = <&cam1_clk>;
-+	clock-names = "xclk";
-+
-+	avdd-supply = <&cam1_reg>;	/* 2.8v */
-+	dovdd-supply = <&cam_dummy_reg>;/* 1.8v */
-+	dvdd-supply = <&cam_dummy_reg>;	/* 1.1v */
-+
-+	rotation = <180>;
-+	orientation = <2>;
-+
-+	port {
-+		cam_endpoint: endpoint {
-+			bus-type = <4>;
-+			clock-lanes = <0>;
-+			data-lanes = <1 2>;
-+			link-frequencies =
-+				/bits/ 64 <456000000>;
-+		};
-+	};
-+};
-+
-+vcm_node: bu64754@76 {
-+	compatible = "rohm,bu64754";
-+	reg = <0x76>;
-+	status = "disabled";
-+	vdd-supply = <&cam1_reg>;
-+};
diff --git a/target/linux/bcm27xx/patches-6.1/950-1199-media-rp1-cfe-Fix-verbose-debug-print.patch b/target/linux/bcm27xx/patches-6.1/950-1199-media-rp1-cfe-Fix-verbose-debug-print.patch
deleted file mode 100644
index 8ff96cc568..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1199-media-rp1-cfe-Fix-verbose-debug-print.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8ef68aadaa3aa29bc2661ab44db4ddc50e77cef5 Mon Sep 17 00:00:00 2001
-From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
-Date: Wed, 4 Oct 2023 11:25:16 +0300
-Subject: [PATCH] media: rp1: cfe: Fix verbose debug print
-
-Switch a debug print from cfe_dbg() to cfe_dbg_verbose() as it will be
-printed often while streaming.
-
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
----
- drivers/media/platform/raspberrypi/rp1_cfe/cfe.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-@@ -975,8 +975,8 @@ static void cfe_buffer_queue(struct vb2_
- 
- 	if (!cfe->job_queued && cfe->job_ready &&
- 	    test_all_nodes(cfe, NODE_ENABLED, NODE_STREAMING)) {
--		cfe_dbg("Preparing job immediately for channel %u\n",
--			node->id);
-+		cfe_dbg_verbose("Preparing job immediately for channel %u\n",
-+				node->id);
- 		cfe_prepare_next_job(cfe);
- 	}
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1200-media-rp1-cfe-Expose-find_format_by_pix.patch b/target/linux/bcm27xx/patches-6.1/950-1200-media-rp1-cfe-Expose-find_format_by_pix.patch
deleted file mode 100644
index f263648af2..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1200-media-rp1-cfe-Expose-find_format_by_pix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From d978e784f433346d3676b5de805b3cea36b835c4 Mon Sep 17 00:00:00 2001
-From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
-Date: Fri, 29 Sep 2023 16:23:58 +0300
-Subject: [PATCH] media: rp1: cfe: Expose find_format_by_pix()
-
-Make find_format_by_pix() accessible to other files in the driver.
-
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
----
- drivers/media/platform/raspberrypi/rp1_cfe/cfe.c | 2 +-
- drivers/media/platform/raspberrypi/rp1_cfe/cfe.h | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-@@ -461,7 +461,7 @@ const struct cfe_fmt *find_format_by_cod
- 	return NULL;
- }
- 
--static const struct cfe_fmt *find_format_by_pix(u32 pixelformat)
-+const struct cfe_fmt *find_format_by_pix(u32 pixelformat)
- {
- 	unsigned int i;
- 
---- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe.h
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe.h
-@@ -36,5 +36,6 @@ extern const struct v4l2_mbus_framefmt c
- extern const struct v4l2_mbus_framefmt cfe_default_meta_format;
- 
- const struct cfe_fmt *find_format_by_code(u32 code);
-+const struct cfe_fmt *find_format_by_pix(u32 pixelformat);
- 
- #endif
diff --git a/target/linux/bcm27xx/patches-6.1/950-1201-media-rp1-cfe-Add-missing-remaps.patch b/target/linux/bcm27xx/patches-6.1/950-1201-media-rp1-cfe-Add-missing-remaps.patch
deleted file mode 100644
index d6dadb6f27..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1201-media-rp1-cfe-Add-missing-remaps.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From cbed711f05a228d0f8f54b1b01f43d4d6489eccc Mon Sep 17 00:00:00 2001
-From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
-Date: Fri, 29 Sep 2023 16:24:14 +0300
-Subject: [PATCH] media: rp1: cfe: Add missing remaps
-
-8-bit bayer formats are missing remap definitions. Add them.
-
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
----
- drivers/media/platform/raspberrypi/rp1_cfe/cfe_fmts.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe_fmts.h
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe_fmts.h
-@@ -85,24 +85,28 @@ static const struct cfe_fmt formats[] =
- 		.code = MEDIA_BUS_FMT_SBGGR8_1X8,
- 		.depth = 8,
- 		.csi_dt = 0x2a,
-+		.remap = { V4L2_PIX_FMT_SBGGR16, V4L2_PIX_FMT_PISP_COMP1_BGGR },
- 	},
- 	{
- 		.fourcc = V4L2_PIX_FMT_SGBRG8,
- 		.code = MEDIA_BUS_FMT_SGBRG8_1X8,
- 		.depth = 8,
- 		.csi_dt = 0x2a,
-+		.remap = { V4L2_PIX_FMT_SGBRG16, V4L2_PIX_FMT_PISP_COMP1_GBRG },
- 	},
- 	{
- 		.fourcc = V4L2_PIX_FMT_SGRBG8,
- 		.code = MEDIA_BUS_FMT_SGRBG8_1X8,
- 		.depth = 8,
- 		.csi_dt = 0x2a,
-+		.remap = { V4L2_PIX_FMT_SGRBG16, V4L2_PIX_FMT_PISP_COMP1_GRBG },
- 	},
- 	{
- 		.fourcc = V4L2_PIX_FMT_SRGGB8,
- 		.code = MEDIA_BUS_FMT_SRGGB8_1X8,
- 		.depth = 8,
- 		.csi_dt = 0x2a,
-+		.remap = { V4L2_PIX_FMT_SRGGB16, V4L2_PIX_FMT_PISP_COMP1_RGGB },
- 	},
- 	{
- 		.fourcc = V4L2_PIX_FMT_SBGGR10P,
diff --git a/target/linux/bcm27xx/patches-6.1/950-1202-media-rp1-cfe-Add-missing-compressed-remaps.patch b/target/linux/bcm27xx/patches-6.1/950-1202-media-rp1-cfe-Add-missing-compressed-remaps.patch
deleted file mode 100644
index 92d7db369c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1202-media-rp1-cfe-Add-missing-compressed-remaps.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 93c40564b94367c6ce072d66479af58afa3f08e0 Mon Sep 17 00:00:00 2001
-From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
-Date: Fri, 29 Sep 2023 17:14:31 +0300
-Subject: [PATCH] media: rp1: cfe: Add missing compressed remaps
-
-16-bit bayer formats are missing compressed remap definitions. Add them.
-
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
----
- drivers/media/platform/raspberrypi/rp1_cfe/cfe_fmts.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe_fmts.h
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe_fmts.h
-@@ -197,24 +197,28 @@ static const struct cfe_fmt formats[] =
- 		.code = MEDIA_BUS_FMT_SBGGR16_1X16,
- 		.depth = 16,
- 		.flags = CFE_FORMAT_FLAG_FE_OUT,
-+		.remap = { V4L2_PIX_FMT_SBGGR16, V4L2_PIX_FMT_PISP_COMP1_BGGR },
- 	},
- 	{
- 		.fourcc = V4L2_PIX_FMT_SGBRG16,
- 		.code = MEDIA_BUS_FMT_SGBRG16_1X16,
- 		.depth = 16,
- 		.flags = CFE_FORMAT_FLAG_FE_OUT,
-+		.remap = { V4L2_PIX_FMT_SGBRG16, V4L2_PIX_FMT_PISP_COMP1_GBRG },
- 	},
- 	{
- 		.fourcc = V4L2_PIX_FMT_SGRBG16,
- 		.code = MEDIA_BUS_FMT_SGRBG16_1X16,
- 		.depth = 16,
- 		.flags = CFE_FORMAT_FLAG_FE_OUT,
-+		.remap = { V4L2_PIX_FMT_SGRBG16, V4L2_PIX_FMT_PISP_COMP1_GRBG },
- 	},
- 	{
- 		.fourcc = V4L2_PIX_FMT_SRGGB16,
- 		.code = MEDIA_BUS_FMT_SRGGB16_1X16,
- 		.depth = 16,
- 		.flags = CFE_FORMAT_FLAG_FE_OUT,
-+		.remap = { V4L2_PIX_FMT_SRGGB16, V4L2_PIX_FMT_PISP_COMP1_RGGB },
- 	},
- 	/* PiSP Compressed Mode 1 */
- 	{
diff --git a/target/linux/bcm27xx/patches-6.1/950-1203-media-rp1-cfe-Add-cfe_find_16bit_code-and-cfe_find_c.patch b/target/linux/bcm27xx/patches-6.1/950-1203-media-rp1-cfe-Add-cfe_find_16bit_code-and-cfe_find_c.patch
deleted file mode 100644
index 42c3b6f42b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1203-media-rp1-cfe-Add-cfe_find_16bit_code-and-cfe_find_c.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 2e0e1d7b493dffe7baa763d499e51ba42f0bad19 Mon Sep 17 00:00:00 2001
-From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
-Date: Fri, 29 Sep 2023 17:14:11 +0300
-Subject: [PATCH] media: rp1: cfe: Add cfe_find_16bit_code() and
- cfe_find_compressed_code()
-
-Add helper functions which, given an mbus code, return the 16-bit
-remapped mbus code or the compressed mbus code.
-
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
----
- .../media/platform/raspberrypi/rp1_cfe/cfe.c  | 40 +++++++++++++++++++
- .../media/platform/raspberrypi/rp1_cfe/cfe.h  |  2 +
- 2 files changed, 42 insertions(+)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-@@ -473,6 +473,46 @@ const struct cfe_fmt *find_format_by_pix
- 	return NULL;
- }
- 
-+/*
-+ * Given the mbus code, find the 16 bit remapped code. Returns 0 if no remap
-+ * possible.
-+ */
-+u32 cfe_find_16bit_code(u32 code)
-+{
-+	const struct cfe_fmt *cfe_fmt;
-+
-+	cfe_fmt = find_format_by_code(code);
-+
-+	if (!cfe_fmt || !cfe_fmt->remap[CFE_REMAP_16BIT])
-+		return 0;
-+
-+	cfe_fmt = find_format_by_pix(cfe_fmt->remap[CFE_REMAP_16BIT]);
-+	if (!cfe_fmt)
-+		return 0;
-+
-+	return cfe_fmt->code;
-+}
-+
-+/*
-+ * Given the mbus code, find the 8 bit compressed code. Returns 0 if no remap
-+ * possible.
-+ */
-+u32 cfe_find_compressed_code(u32 code)
-+{
-+	const struct cfe_fmt *cfe_fmt;
-+
-+	cfe_fmt = find_format_by_code(code);
-+
-+	if (!cfe_fmt || !cfe_fmt->remap[CFE_REMAP_COMPRESSED])
-+		return 0;
-+
-+	cfe_fmt = find_format_by_pix(cfe_fmt->remap[CFE_REMAP_COMPRESSED]);
-+	if (!cfe_fmt)
-+		return 0;
-+
-+	return cfe_fmt->code;
-+}
-+
- static int cfe_calc_format_size_bpl(struct cfe_device *cfe,
- 				    const struct cfe_fmt *fmt,
- 				    struct v4l2_format *f)
---- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe.h
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe.h
-@@ -37,5 +37,7 @@ extern const struct v4l2_mbus_framefmt c
- 
- const struct cfe_fmt *find_format_by_code(u32 code);
- const struct cfe_fmt *find_format_by_pix(u32 pixelformat);
-+u32 cfe_find_16bit_code(u32 code);
-+u32 cfe_find_compressed_code(u32 code);
- 
- #endif
diff --git a/target/linux/bcm27xx/patches-6.1/950-1204-media-rp1-csi2-Fix-csi2_pad_set_fmt.patch b/target/linux/bcm27xx/patches-6.1/950-1204-media-rp1-csi2-Fix-csi2_pad_set_fmt.patch
deleted file mode 100644
index d9b8d264d3..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1204-media-rp1-csi2-Fix-csi2_pad_set_fmt.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From eaa8a0ae14a1ca797c1896e9dafbefa1fa51a617 Mon Sep 17 00:00:00 2001
-From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
-Date: Fri, 29 Sep 2023 16:25:10 +0300
-Subject: [PATCH] media: rp1: csi2: Fix csi2_pad_set_fmt()
-
-The CSI-2 subdev's set_fmt currently allows setting the source and sink
-pad formats quite freely. This is not right, as the CSI-2 block can only
-do one of the following when processing the stream: 1) pass through as
-is, 2) expand to 16-bits, 3) compress.
-
-The csi2_pad_set_fmt() should take this into account, and only allow
-changing the source side mbus code, compared to the sink side format.
-
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
----
- .../media/platform/raspberrypi/rp1_cfe/csi2.c | 61 +++++++++++++++----
- 1 file changed, 48 insertions(+), 13 deletions(-)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/csi2.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/csi2.c
-@@ -438,25 +438,60 @@ static int csi2_pad_set_fmt(struct v4l2_
- 			    struct v4l2_subdev_state *state,
- 			    struct v4l2_subdev_format *format)
- {
--	struct v4l2_mbus_framefmt *fmt;
--	const struct cfe_fmt *cfe_fmt;
--
--	/* TODO: format validation */
-+	if (format->pad < CSI2_NUM_CHANNELS) {
-+		/*
-+		 * Store the sink pad format and propagate it to the source pad.
-+		 */
-+
-+		struct v4l2_mbus_framefmt *fmt;
-+
-+		fmt = v4l2_subdev_get_pad_format(sd, state, format->pad);
-+		if (!fmt)
-+			return -EINVAL;
- 
--	cfe_fmt = find_format_by_code(format->format.code);
--	if (!cfe_fmt)
--		cfe_fmt = find_format_by_code(MEDIA_BUS_FMT_SBGGR10_1X10);
-+		*fmt = format->format;
- 
--	format->format.code = cfe_fmt->code;
-+		fmt = v4l2_subdev_get_pad_format(sd, state,
-+			format->pad + CSI2_NUM_CHANNELS);
-+		if (!fmt)
-+			return -EINVAL;
- 
--	fmt = v4l2_subdev_get_pad_format(sd, state, format->pad);
--	*fmt = format->format;
-+		format->format.field = V4L2_FIELD_NONE;
- 
--	if (format->pad < CSI2_NUM_CHANNELS) {
--		/* Propagate to the source pad */
--		fmt = v4l2_subdev_get_pad_format(sd, state,
--						 format->pad + CSI2_NUM_CHANNELS);
- 		*fmt = format->format;
-+	} else {
-+		/*
-+		 * Only allow changing the source pad mbus code.
-+		 */
-+
-+		struct v4l2_mbus_framefmt *sink_fmt, *source_fmt;
-+		u32 sink_code;
-+		u32 code;
-+
-+		sink_fmt = v4l2_subdev_get_pad_format(sd, state,
-+			format->pad - CSI2_NUM_CHANNELS);
-+		if (!sink_fmt)
-+			return -EINVAL;
-+
-+		source_fmt = v4l2_subdev_get_pad_format(sd, state, format->pad);
-+		if (!source_fmt)
-+			return -EINVAL;
-+
-+		sink_code = sink_fmt->code;
-+		code = format->format.code;
-+
-+		/*
-+		 * If the source code from the user does not match the code in
-+		 * the sink pad, check that the source code matches either the
-+		 * 16-bit version or the compressed version of the sink code.
-+		 */
-+
-+		if (code != sink_code &&
-+		    (code == cfe_find_16bit_code(sink_code) ||
-+		     code == cfe_find_compressed_code(sink_code)))
-+			source_fmt->code = code;
-+
-+		format->format.code = source_fmt->code;
- 	}
- 
- 	return 0;
diff --git a/target/linux/bcm27xx/patches-6.1/950-1205-media-rp1-fe-Fix-pisp_fe_pad_set_fmt.patch b/target/linux/bcm27xx/patches-6.1/950-1205-media-rp1-fe-Fix-pisp_fe_pad_set_fmt.patch
deleted file mode 100644
index 202fe2946d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1205-media-rp1-fe-Fix-pisp_fe_pad_set_fmt.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 214e8134842a338215831f2efa6d730f413c5ec4 Mon Sep 17 00:00:00 2001
-From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
-Date: Fri, 29 Sep 2023 17:15:20 +0300
-Subject: [PATCH] media: rp1: fe: Fix pisp_fe_pad_set_fmt()
-
-pisp_fe_pad_set_fmt() allows setting the pad formats quite freely. This
-is not correct, and the function should only allow formats as supported
-by the hardware. Fix this by:
-
-Allow no format changes for FE_CONFIG_PAD and FE_STATS_PAD. They should
-always be the hardcoded initial ones.
-
-Allow setting FE_STREAM_PAD freely (but the mbus code must be
-supported), and propagate the format to the FE_OUTPUT0_PAD and
-FE_OUTPUT1_PAD pads.
-
-Allow changing the mbus code for FE_OUTPUT0_PAD and FE_OUTPUT1_PAD pads
-only if the mbus code is the compressed version of the sink side code.
-
-TODO: FE supports scaling and cropping. This should be represented here
-too?
-
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
----
- .../platform/raspberrypi/rp1_cfe/pisp_fe.c    | 59 +++++++++++++++----
- 1 file changed, 48 insertions(+), 11 deletions(-)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/pisp_fe.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/pisp_fe.c
-@@ -433,26 +433,63 @@ static int pisp_fe_pad_set_fmt(struct v4
- 
- 	switch (format->pad) {
- 	case FE_STREAM_PAD:
--	case FE_OUTPUT0_PAD:
--	case FE_OUTPUT1_PAD:
- 		cfe_fmt = find_format_by_code(format->format.code);
- 		if (!cfe_fmt || !(cfe_fmt->flags & CFE_FORMAT_FLAG_FE_OUT))
- 			cfe_fmt = find_format_by_code(MEDIA_BUS_FMT_SRGGB16_1X16);
- 
- 		format->format.code = cfe_fmt->code;
-+		format->format.field = V4L2_FIELD_NONE;
- 
--		break;
-+		fmt = v4l2_subdev_get_pad_format(sd, state, FE_STREAM_PAD);
-+		*fmt = format->format;
- 
--	case FE_STATS_PAD:
--	case FE_CONFIG_PAD:
--		format->format.code = MEDIA_BUS_FMT_FIXED;
--		break;
--	}
-+		fmt = v4l2_subdev_get_pad_format(sd, state, FE_OUTPUT0_PAD);
-+		*fmt = format->format;
-+
-+		fmt = v4l2_subdev_get_pad_format(sd, state, FE_OUTPUT1_PAD);
-+		*fmt = format->format;
-+
-+		return 0;
- 
--	fmt = v4l2_subdev_get_pad_format(sd, state, format->pad);
--	*fmt = format->format;
-+	case FE_OUTPUT0_PAD:
-+	case FE_OUTPUT1_PAD: {
-+		/*
-+		 * TODO: we should allow scaling and cropping by allowing the
-+		 * user to set the size here.
-+		 */
-+		struct v4l2_mbus_framefmt *sink_fmt, *source_fmt;
-+		u32 sink_code;
-+		u32 code;
-+
-+		sink_fmt = v4l2_subdev_get_pad_format(sd, state, FE_STREAM_PAD);
-+		if (!sink_fmt)
-+			return -EINVAL;
-+
-+		source_fmt = v4l2_subdev_get_pad_format(sd, state, format->pad);
-+		if (!source_fmt)
-+			return -EINVAL;
-+
-+		sink_code = sink_fmt->code;
-+		code = format->format.code;
-+
-+		/*
-+		 * If the source code from the user does not match the code in
-+		 * the sink pad, check that the source code matches the
-+		 * compressed version of the sink code.
-+		 */
-+
-+		if (code != sink_code &&
-+		    code == cfe_find_compressed_code(sink_code))
-+			source_fmt->code = code;
-+
-+		return 0;
-+	}
- 
--	return 0;
-+	case FE_CONFIG_PAD:
-+	case FE_STATS_PAD:
-+	default:
-+		return v4l2_subdev_get_fmt(sd, state, format);
-+	}
- }
- 
- static int pisp_fe_link_validate(struct v4l2_subdev *sd,
diff --git a/target/linux/bcm27xx/patches-6.1/950-1206-media-rp1-csi2-Use-get_frame_desc-to-get-CSI-2-VC-an.patch b/target/linux/bcm27xx/patches-6.1/950-1206-media-rp1-csi2-Use-get_frame_desc-to-get-CSI-2-VC-an.patch
deleted file mode 100644
index bd5789a1b3..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1206-media-rp1-csi2-Use-get_frame_desc-to-get-CSI-2-VC-an.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 425a6b752c38b50c97220db37a67b18b281f56e5 Mon Sep 17 00:00:00 2001
-From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
-Date: Thu, 21 Sep 2023 15:28:20 +0300
-Subject: [PATCH] media: rp1: csi2: Use get_frame_desc to get CSI-2 VC and DT
-
-Use get_frame_desc pad op for asking the CSI-2 VC and DT from the source
-device driver, instead of hardcoding to VC 0, and getting the DT from a
-formats table. To keep backward compatibility with sources that do not
-implement get_frame_desc, implement a fallback mechanism that always
-uses VC 0, and gets the DT from the formats table, based on the CSI2's
-sink pad's format.
-
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
----
- .../media/platform/raspberrypi/rp1_cfe/cfe.c  |  4 +-
- .../media/platform/raspberrypi/rp1_cfe/csi2.c | 75 ++++++++++++++++++-
- .../media/platform/raspberrypi/rp1_cfe/csi2.h |  2 +-
- 3 files changed, 77 insertions(+), 4 deletions(-)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-@@ -838,7 +838,7 @@ static void cfe_start_channel(struct cfe
- 		 * this is handled by the CSI2 AUTO_ARM mode.
- 		 */
- 		csi2_start_channel(&cfe->csi2, cfe->fe_csi2_channel,
--				   fmt->csi_dt, CSI2_MODE_FE_STREAMING,
-+				   CSI2_MODE_FE_STREAMING,
- 				   true, false, width, height);
- 		csi2_set_buffer(&cfe->csi2, cfe->fe_csi2_channel, 0, 0, -1);
- 		pisp_fe_start(&cfe->fe);
-@@ -872,7 +872,7 @@ static void cfe_start_channel(struct cfe
- 			}
- 		}
- 		/* Unconditionally start this CSI2 channel. */
--		csi2_start_channel(&cfe->csi2, node->id, fmt->csi_dt,
-+		csi2_start_channel(&cfe->csi2, node->id,
- 				   mode,
- 				   /* Auto arm */
- 				   false,
---- a/drivers/media/platform/raspberrypi/rp1_cfe/csi2.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/csi2.c
-@@ -324,12 +324,84 @@ void csi2_set_compression(struct csi2_de
- 	csi2_reg_write(csi2, CSI2_CH_COMP_CTRL(channel), compression);
- }
- 
-+static int csi2_get_vc_dt_fallback(struct csi2_device *csi2,
-+				   unsigned int channel, u8 *vc, u8 *dt)
-+{
-+	struct v4l2_subdev *sd = &csi2->sd;
-+	struct v4l2_subdev_state *state;
-+	struct v4l2_mbus_framefmt *fmt;
-+	const struct cfe_fmt *cfe_fmt;
-+
-+	state = v4l2_subdev_get_locked_active_state(sd);
-+
-+	/* Without Streams API, the channel number matches the sink pad */
-+	fmt = v4l2_subdev_get_pad_format(sd, state, channel);
-+	if (!fmt)
-+		return -EINVAL;
-+
-+	cfe_fmt = find_format_by_code(fmt->code);
-+	if (!cfe_fmt)
-+		return -EINVAL;
-+
-+	*vc = 0;
-+	*dt = cfe_fmt->csi_dt;
-+
-+	return 0;
-+}
-+
-+static int csi2_get_vc_dt(struct csi2_device *csi2, unsigned int channel,
-+			  u8 *vc, u8 *dt)
-+{
-+	struct v4l2_mbus_frame_desc remote_desc;
-+	const struct media_pad *remote_pad;
-+	struct v4l2_subdev *source_sd;
-+	int ret;
-+
-+	/* Without Streams API, the channel number matches the sink pad */
-+	remote_pad = media_pad_remote_pad_first(&csi2->pad[channel]);
-+	if (!remote_pad)
-+		return -EPIPE;
-+
-+	source_sd = media_entity_to_v4l2_subdev(remote_pad->entity);
-+
-+	ret = v4l2_subdev_call(source_sd, pad, get_frame_desc,
-+			       remote_pad->index, &remote_desc);
-+	if (ret == -ENOIOCTLCMD) {
-+		csi2_dbg("source does not support get_frame_desc, use fallback\n");
-+		return csi2_get_vc_dt_fallback(csi2, channel, vc, dt);
-+	} else if (ret) {
-+		csi2_err("Failed to get frame descriptor\n");
-+		return ret;
-+	}
-+
-+	if (remote_desc.type != V4L2_MBUS_FRAME_DESC_TYPE_CSI2) {
-+		csi2_err("Frame descriptor does not describe CSI-2 link");
-+		return -EINVAL;
-+	}
-+
-+	if (remote_desc.num_entries != 1) {
-+		csi2_err("Frame descriptor does not have a single entry");
-+		return -EINVAL;
-+	}
-+
-+	*vc = remote_desc.entry[0].bus.csi2.vc;
-+	*dt = remote_desc.entry[0].bus.csi2.dt;
-+
-+	return 0;
-+}
-+
- void csi2_start_channel(struct csi2_device *csi2, unsigned int channel,
--			u16 dt, enum csi2_mode mode, bool auto_arm,
-+			enum csi2_mode mode, bool auto_arm,
- 			bool pack_bytes, unsigned int width,
- 			unsigned int height)
- {
- 	u32 ctrl;
-+	int ret;
-+	u8 vc, dt;
-+
-+	ret = csi2_get_vc_dt(csi2, channel, &vc, &dt);
-+	if (ret)
-+		return;
- 
- 	csi2_dbg("%s [%u]\n", __func__, channel);
- 
-@@ -369,6 +441,7 @@ void csi2_start_channel(struct csi2_devi
- 		csi2_reg_write(csi2, CSI2_CH_FRAME_SIZE(channel), 0);
- 	}
- 
-+	set_field(&ctrl, vc, VC_MASK);
- 	set_field(&ctrl, dt, DT_MASK);
- 	csi2_reg_write(csi2, CSI2_CH_CTRL(channel), ctrl);
- 	csi2->num_lines[channel] = height;
---- a/drivers/media/platform/raspberrypi/rp1_cfe/csi2.h
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/csi2.h
-@@ -79,7 +79,7 @@ void csi2_set_compression(struct csi2_de
- 			  enum csi2_compression_mode mode, unsigned int shift,
- 			  unsigned int offset);
- void csi2_start_channel(struct csi2_device *csi2, unsigned int channel,
--			u16 dt, enum csi2_mode mode, bool auto_arm,
-+			enum csi2_mode mode, bool auto_arm,
- 			bool pack_bytes, unsigned int width,
- 			unsigned int height);
- void csi2_stop_channel(struct csi2_device *csi2, unsigned int channel);
diff --git a/target/linux/bcm27xx/patches-6.1/950-1207-media-rp1-cfe-Add-is_image_node.patch b/target/linux/bcm27xx/patches-6.1/950-1207-media-rp1-cfe-Add-is_image_node.patch
deleted file mode 100644
index ad589d79cf..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1207-media-rp1-cfe-Add-is_image_node.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 2b6570e66f2769110311593f52f88dba3271a278 Mon Sep 17 00:00:00 2001
-From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
-Date: Fri, 22 Sep 2023 13:47:10 +0300
-Subject: [PATCH] media: rp1: cfe: Add is_image_node()
-
-The hardware supports streaming from memory (in addition to streaming
-from the CSI-2 RX), but the driver does not support this at the moment.
-
-There are multiple places in the driver which uses
-is_image_output_node(), even if the "output" part is not relevant. Thus,
-in a minor preparation for the possible support for streaming from
-memory, and to make it more obvious that the pieces of code are not
-about the "output", add is_image_node() which will return true for both
-input and output video nodes.
-
-While at it, reformat also the metadata related macros to fit inside 80
-columns.
-
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
----
- .../media/platform/raspberrypi/rp1_cfe/cfe.c  | 28 +++++++++++--------
- 1 file changed, 17 insertions(+), 11 deletions(-)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-@@ -199,13 +199,20 @@ static const struct node_description nod
- 
- #define is_fe_node(node) (((node)->id) >= FE_OUT0)
- #define is_csi2_node(node) (!is_fe_node(node))
--#define is_image_output_node(node)                                               \
-+
-+#define is_image_output_node(node) \
- 	(node_desc[(node)->id].buf_type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
--#define is_meta_output_node(node)                                                \
-+#define is_image_input_node(node) \
-+	(node_desc[(node)->id].buf_type == V4L2_BUF_TYPE_VIDEO_OUTPUT)
-+#define is_image_node(node) \
-+	(is_image_output_node(node) || is_image_input_node(node))
-+
-+#define is_meta_output_node(node) \
- 	(node_desc[(node)->id].buf_type == V4L2_BUF_TYPE_META_CAPTURE)
--#define is_meta_input_node(node)                                                 \
-+#define is_meta_input_node(node) \
- 	(node_desc[(node)->id].buf_type == V4L2_BUF_TYPE_META_OUTPUT)
--#define is_meta_node(node) (is_meta_output_node(node) || is_meta_input_node(node))
-+#define is_meta_node(node) \
-+	(is_meta_output_node(node) || is_meta_input_node(node))
- 
- /* To track state across all nodes. */
- #define NUM_STATES		5
-@@ -426,7 +433,7 @@ static int format_show(struct seq_file *
- 		seq_printf(s, "\nNode %u (%s) state: 0x%lx\n", i,
- 			   node_desc[i].name, state);
- 
--		if (is_image_output_node(node))
-+		if (is_image_node(node))
- 			seq_printf(s, "format: " V4L2_FOURCC_CONV " 0x%x\n"
- 				      "resolution: %ux%u\nbpl: %u\nsize: %u\n",
- 				   V4L2_FOURCC_CONV_ARGS(node->fmt.fmt.pix.pixelformat),
-@@ -940,9 +947,8 @@ static int cfe_queue_setup(struct vb2_qu
- {
- 	struct cfe_node *node = vb2_get_drv_priv(vq);
- 	struct cfe_device *cfe = node->cfe;
--	unsigned int size = is_image_output_node(node) ?
--					  node->fmt.fmt.pix.sizeimage :
--					  node->fmt.fmt.meta.buffersize;
-+	unsigned int size = is_image_node(node) ? node->fmt.fmt.pix.sizeimage :
-+						  node->fmt.fmt.meta.buffersize;
- 
- 	cfe_dbg("%s: [%s]\n", __func__, node_desc[node->id].name);
- 
-@@ -973,8 +979,8 @@ static int cfe_buffer_prepare(struct vb2
- 	cfe_dbg_verbose("%s: [%s] buffer:%p\n", __func__,
- 			node_desc[node->id].name, vb);
- 
--	size = is_image_output_node(node) ? node->fmt.fmt.pix.sizeimage :
--					    node->fmt.fmt.meta.buffersize;
-+	size = is_image_node(node) ? node->fmt.fmt.pix.sizeimage :
-+				     node->fmt.fmt.meta.buffersize;
- 	if (vb2_plane_size(vb, 0) < size) {
- 		cfe_err("data will not fit into plane (%lu < %lu)\n",
- 			vb2_plane_size(vb, 0), size);
-@@ -1757,7 +1763,7 @@ static int cfe_register_node(struct cfe_
- 	node->cfe = cfe;
- 	node->id = id;
- 
--	if (is_image_output_node(node)) {
-+	if (is_image_node(node)) {
- 		fmt = find_format_by_code(cfe_default_format.code);
- 		if (!fmt) {
- 			cfe_err("Failed to find format code\n");
diff --git a/target/linux/bcm27xx/patches-6.1/950-1208-media-rp1-cfe-Dual-purpose-video-nodes.patch b/target/linux/bcm27xx/patches-6.1/950-1208-media-rp1-cfe-Dual-purpose-video-nodes.patch
deleted file mode 100644
index f68aa3975d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1208-media-rp1-cfe-Dual-purpose-video-nodes.patch
+++ /dev/null
@@ -1,621 +0,0 @@
-From c54b8d2fc79c684deacc81a94f6baa1cb56c62be Mon Sep 17 00:00:00 2001
-From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
-Date: Wed, 27 Sep 2023 17:18:09 +0300
-Subject: [PATCH] media: rp1: cfe: Dual purpose video nodes
-
-The RP1 CSI-2 DMA can capture both video and metadata just fine, but at
-the moment the video nodes are only set to support either video or
-metadata.
-
-Make the changes to support both video and metadata. This mostly means
-tracking both video format and metadata format separately for each video
-node, and using vb2_queue_change_type() to change the vb2 queue type
-when needed.
-
-Briefly, this means that the user can get/set both video and meta
-formats to a single video node. The vb2 queue buffer type will be
-changed when the user calls REQBUFS or CREATE_BUFS ioctls. This buffer
-type will be then used as the "mode" for the video node when the user
-starts the streaming, and based on that either the video or the meta
-format will be used.
-
-A bunch of macros are added (node_supports_xxx()), which tell if a node
-can support a particular mode, whereas the existing macros
-(is_xxx_node()) will tell if the node is currently in a particular mode.
-Note that the latter will only work correctly between the start of the
-streaming and the end of the streaming, and thus should be only used in
-those code paths.
-
-However, as the userspace (libcamera) does not support dual purpose
-video nodes, for the time being let's keep the second video node as
-V4L2_CAP_META_CAPTURE only to keep the userspace working.
-
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
----
- .../media/platform/raspberrypi/rp1_cfe/cfe.c  | 271 ++++++++++++------
- 1 file changed, 182 insertions(+), 89 deletions(-)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-@@ -116,7 +116,7 @@ const struct v4l2_mbus_framefmt cfe_defa
- enum node_ids {
- 	/* CSI2 HW output nodes first. */
- 	CSI2_CH0,
--	CSI2_CH1_EMBEDDED,
-+	CSI2_CH1,
- 	CSI2_CH2,
- 	CSI2_CH3,
- 	/* FE only nodes from here on. */
-@@ -130,8 +130,7 @@ enum node_ids {
- struct node_description {
- 	unsigned int id;
- 	const char *name;
--	enum v4l2_buf_type buf_type;
--	unsigned int cap;
-+	unsigned int caps;
- 	unsigned int pad_flags;
- 	unsigned int link_pad;
- };
-@@ -140,58 +139,55 @@ struct node_description {
- static const struct node_description node_desc[NUM_NODES] = {
- 	[CSI2_CH0] = {
- 		.name = "csi2_ch0",
--		.buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
--		.cap = V4L2_CAP_VIDEO_CAPTURE,
-+		.caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_META_CAPTURE,
- 		.pad_flags = MEDIA_PAD_FL_SINK | MEDIA_PAD_FL_MUST_CONNECT,
- 		.link_pad = CSI2_NUM_CHANNELS + 0
- 	},
--	/* This node is assigned for the embedded data channel! */
--	[CSI2_CH1_EMBEDDED] = {
-+	/*
-+	 * TODO: This node should be named "csi2_ch1" and the caps should be set
-+	 * to both video and meta capture. However, to keep compatibility with
-+	 * the current libcamera, keep the name as "embedded" and support
-+	 * only meta capture.
-+	 */
-+	[CSI2_CH1] = {
- 		.name = "embedded",
--		.buf_type = V4L2_BUF_TYPE_META_CAPTURE,
--		.cap = V4L2_CAP_META_CAPTURE,
-+		.caps = V4L2_CAP_META_CAPTURE,
- 		.pad_flags = MEDIA_PAD_FL_SINK | MEDIA_PAD_FL_MUST_CONNECT,
- 		.link_pad = CSI2_NUM_CHANNELS + 1
- 	},
- 	[CSI2_CH2] = {
- 		.name = "csi2_ch2",
--		.buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
--		.cap = V4L2_CAP_META_CAPTURE,
-+		.caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_META_CAPTURE,
- 		.pad_flags = MEDIA_PAD_FL_SINK | MEDIA_PAD_FL_MUST_CONNECT,
- 		.link_pad = CSI2_NUM_CHANNELS + 2
- 	},
- 	[CSI2_CH3] = {
- 		.name = "csi2_ch3",
--		.buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
--		.cap = V4L2_CAP_META_CAPTURE,
-+		.caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_META_CAPTURE,
- 		.pad_flags = MEDIA_PAD_FL_SINK | MEDIA_PAD_FL_MUST_CONNECT,
- 		.link_pad = CSI2_NUM_CHANNELS + 3
- 	},
- 	[FE_OUT0] = {
- 		.name = "fe_image0",
--		.buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
--		.cap = V4L2_CAP_VIDEO_CAPTURE,
-+		.caps = V4L2_CAP_VIDEO_CAPTURE,
- 		.pad_flags = MEDIA_PAD_FL_SINK | MEDIA_PAD_FL_MUST_CONNECT,
- 		.link_pad = FE_OUTPUT0_PAD
- 	},
- 	[FE_OUT1] = {
- 		.name = "fe_image1",
--		.buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE,
--		.cap = V4L2_CAP_VIDEO_CAPTURE,
-+		.caps = V4L2_CAP_VIDEO_CAPTURE,
- 		.pad_flags = MEDIA_PAD_FL_SINK | MEDIA_PAD_FL_MUST_CONNECT,
- 		.link_pad = FE_OUTPUT1_PAD
- 	},
- 	[FE_STATS] = {
- 		.name = "fe_stats",
--		.buf_type = V4L2_BUF_TYPE_META_CAPTURE,
--		.cap = V4L2_CAP_META_CAPTURE,
-+		.caps = V4L2_CAP_META_CAPTURE,
- 		.pad_flags = MEDIA_PAD_FL_SINK | MEDIA_PAD_FL_MUST_CONNECT,
- 		.link_pad = FE_STATS_PAD
- 	},
- 	[FE_CONFIG] = {
- 		.name = "fe_config",
--		.buf_type = V4L2_BUF_TYPE_META_OUTPUT,
--		.cap = V4L2_CAP_META_OUTPUT,
-+		.caps = V4L2_CAP_META_OUTPUT,
- 		.pad_flags = MEDIA_PAD_FL_SOURCE | MEDIA_PAD_FL_MUST_CONNECT,
- 		.link_pad = FE_CONFIG_PAD
- 	},
-@@ -200,17 +196,29 @@ static const struct node_description nod
- #define is_fe_node(node) (((node)->id) >= FE_OUT0)
- #define is_csi2_node(node) (!is_fe_node(node))
- 
-+#define node_supports_image_output(node) \
-+	(!!(node_desc[(node)->id].caps & V4L2_CAP_VIDEO_CAPTURE))
-+#define node_supports_meta_output(node) \
-+	(!!(node_desc[(node)->id].caps & V4L2_CAP_META_CAPTURE))
-+#define node_supports_image_input(node) \
-+	(!!(node_desc[(node)->id].caps & V4L2_CAP_VIDEO_OUTPUT))
-+#define node_supports_meta_input(node) \
-+	(!!(node_desc[(node)->id].caps & V4L2_CAP_META_OUTPUT))
-+#define node_supports_image(node) \
-+	(node_supports_image_output(node) || node_supports_image_input(node))
-+#define node_supports_meta(node) \
-+	(node_supports_meta_output(node) || node_supports_meta_input(node))
-+
- #define is_image_output_node(node) \
--	(node_desc[(node)->id].buf_type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
-+	((node)->buffer_queue.type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
- #define is_image_input_node(node) \
--	(node_desc[(node)->id].buf_type == V4L2_BUF_TYPE_VIDEO_OUTPUT)
-+	((node)->buffer_queue.type == V4L2_BUF_TYPE_VIDEO_OUTPUT)
- #define is_image_node(node) \
- 	(is_image_output_node(node) || is_image_input_node(node))
--
- #define is_meta_output_node(node) \
--	(node_desc[(node)->id].buf_type == V4L2_BUF_TYPE_META_CAPTURE)
-+	((node)->buffer_queue.type == V4L2_BUF_TYPE_META_CAPTURE)
- #define is_meta_input_node(node) \
--	(node_desc[(node)->id].buf_type == V4L2_BUF_TYPE_META_OUTPUT)
-+	((node)->buffer_queue.type == V4L2_BUF_TYPE_META_OUTPUT)
- #define is_meta_node(node) \
- 	(is_meta_output_node(node) || is_meta_input_node(node))
- 
-@@ -250,7 +258,9 @@ struct cfe_node {
- 	/* Pointer pointing to next v4l2_buffer */
- 	struct cfe_buffer *next_frm;
- 	/* Used to store current pixel format */
--	struct v4l2_format fmt;
-+	struct v4l2_format vid_fmt;
-+	/* Used to store current meta format */
-+	struct v4l2_format meta_fmt;
- 	/* Buffer queue used in video-buf */
- 	struct vb2_queue buffer_queue;
- 	/* Queue of filled frames */
-@@ -433,20 +443,21 @@ static int format_show(struct seq_file *
- 		seq_printf(s, "\nNode %u (%s) state: 0x%lx\n", i,
- 			   node_desc[i].name, state);
- 
--		if (is_image_node(node))
-+		if (node_supports_image(node))
- 			seq_printf(s, "format: " V4L2_FOURCC_CONV " 0x%x\n"
- 				      "resolution: %ux%u\nbpl: %u\nsize: %u\n",
--				   V4L2_FOURCC_CONV_ARGS(node->fmt.fmt.pix.pixelformat),
--				   node->fmt.fmt.pix.pixelformat,
--				   node->fmt.fmt.pix.width,
--				   node->fmt.fmt.pix.height,
--				   node->fmt.fmt.pix.bytesperline,
--				   node->fmt.fmt.pix.sizeimage);
--		else
-+				   V4L2_FOURCC_CONV_ARGS(node->vid_fmt.fmt.pix.pixelformat),
-+				   node->vid_fmt.fmt.pix.pixelformat,
-+				   node->vid_fmt.fmt.pix.width,
-+				   node->vid_fmt.fmt.pix.height,
-+				   node->vid_fmt.fmt.pix.bytesperline,
-+				   node->vid_fmt.fmt.pix.sizeimage);
-+
-+		if (node_supports_meta(node))
- 			seq_printf(s, "format: " V4L2_FOURCC_CONV " 0x%x\nsize: %u\n",
--				   V4L2_FOURCC_CONV_ARGS(node->fmt.fmt.meta.dataformat),
--				   node->fmt.fmt.meta.dataformat,
--				   node->fmt.fmt.meta.buffersize);
-+				   V4L2_FOURCC_CONV_ARGS(node->meta_fmt.fmt.meta.dataformat),
-+				   node->meta_fmt.fmt.meta.dataformat,
-+				   node->meta_fmt.fmt.meta.buffersize);
- 	}
- 
- 	return 0;
-@@ -571,11 +582,11 @@ static void cfe_schedule_next_csi2_job(s
- 				node_desc[node->id].name, &buf->vb.vb2_buf);
- 
- 		if (is_meta_node(node)) {
--			size = node->fmt.fmt.meta.buffersize;
-+			size = node->meta_fmt.fmt.meta.buffersize;
- 			stride = 0;
- 		} else {
--			size = node->fmt.fmt.pix.sizeimage;
--			stride = node->fmt.fmt.pix.bytesperline;
-+			size = node->vid_fmt.fmt.pix.sizeimage;
-+			stride = node->vid_fmt.fmt.pix.bytesperline;
- 		}
- 
- 		addr = vb2_dma_contig_plane_dma_addr(&buf->vb.vb2_buf, 0);
-@@ -867,10 +878,10 @@ static void cfe_start_channel(struct cfe
- 			width = source_fmt->width;
- 			height = source_fmt->height;
- 
--			if (node->fmt.fmt.pix.pixelformat ==
-+			if (node->vid_fmt.fmt.pix.pixelformat ==
- 					fmt->remap[CFE_REMAP_16BIT])
- 				mode = CSI2_MODE_REMAP;
--			else if (node->fmt.fmt.pix.pixelformat ==
-+			else if (node->vid_fmt.fmt.pix.pixelformat ==
- 					fmt->remap[CFE_REMAP_COMPRESSED]) {
- 				mode = CSI2_MODE_COMPRESSED;
- 				csi2_set_compression(&cfe->csi2, node->id,
-@@ -884,7 +895,7 @@ static void cfe_start_channel(struct cfe
- 				   /* Auto arm */
- 				   false,
- 				   /* Pack bytes */
--				   node->id == CSI2_CH1_EMBEDDED ? true : false,
-+				   is_meta_node(node) ? true : false,
- 				   width, height);
- 	}
- 
-@@ -947,10 +958,11 @@ static int cfe_queue_setup(struct vb2_qu
- {
- 	struct cfe_node *node = vb2_get_drv_priv(vq);
- 	struct cfe_device *cfe = node->cfe;
--	unsigned int size = is_image_node(node) ? node->fmt.fmt.pix.sizeimage :
--						  node->fmt.fmt.meta.buffersize;
-+	unsigned int size = is_image_node(node) ? node->vid_fmt.fmt.pix.sizeimage :
-+						  node->meta_fmt.fmt.meta.buffersize;
- 
--	cfe_dbg("%s: [%s]\n", __func__, node_desc[node->id].name);
-+	cfe_dbg("%s: [%s] type:%u\n", __func__, node_desc[node->id].name,
-+		node->buffer_queue.type);
- 
- 	if (vq->num_buffers + *nbuffers < 3)
- 		*nbuffers = 3 - vq->num_buffers;
-@@ -979,8 +991,8 @@ static int cfe_buffer_prepare(struct vb2
- 	cfe_dbg_verbose("%s: [%s] buffer:%p\n", __func__,
- 			node_desc[node->id].name, vb);
- 
--	size = is_image_node(node) ? node->fmt.fmt.pix.sizeimage :
--				     node->fmt.fmt.meta.buffersize;
-+	size = is_image_node(node) ? node->vid_fmt.fmt.pix.sizeimage :
-+				     node->meta_fmt.fmt.meta.buffersize;
- 	if (vb2_plane_size(vb, 0) < size) {
- 		cfe_err("data will not fit into plane (%lu < %lu)\n",
- 			vb2_plane_size(vb, 0), size);
-@@ -995,8 +1007,8 @@ static int cfe_buffer_prepare(struct vb2
- 
- 		memcpy(&b->config, addr, sizeof(struct pisp_fe_config));
- 		return pisp_fe_validate_config(&cfe->fe, &b->config,
--					       &cfe->node[FE_OUT0].fmt,
--					       &cfe->node[FE_OUT1].fmt);
-+					       &cfe->node[FE_OUT0].vid_fmt,
-+					       &cfe->node[FE_OUT1].vid_fmt);
- 	}
- 
- 	return 0;
-@@ -1256,7 +1268,7 @@ static int cfe_enum_fmt_vid_cap(struct f
- 	struct cfe_device *cfe = node->cfe;
- 	unsigned int i, j;
- 
--	if (!is_image_output_node(node))
-+	if (!node_supports_image_output(node))
- 		return -EINVAL;
- 
- 	cfe_dbg("%s: [%s]\n", __func__, node_desc[node->id].name);
-@@ -1292,10 +1304,10 @@ static int cfe_g_fmt(struct file *file,
- 
- 	cfe_dbg("%s: [%s]\n", __func__, node_desc[node->id].name);
- 
--	if (f->type != node->buffer_queue.type)
-+	if (!node_supports_image(node))
- 		return -EINVAL;
- 
--	*f = node->fmt;
-+	*f = node->vid_fmt;
- 
- 	return 0;
- }
-@@ -1310,7 +1322,7 @@ static int try_fmt_vid_cap(struct cfe_no
- 		f->fmt.pix.width, f->fmt.pix.height,
- 		V4L2_FOURCC_CONV_ARGS(f->fmt.pix.pixelformat));
- 
--	if (!is_image_output_node(node))
-+	if (!node_supports_image_output(node))
- 		return -EINVAL;
- 
- 	/*
-@@ -1351,11 +1363,11 @@ static int cfe_s_fmt_vid_cap(struct file
- 	if (ret)
- 		return ret;
- 
--	node->fmt = *f;
-+	node->vid_fmt = *f;
- 
- 	cfe_dbg("%s: Set %ux%u, V4L2 pix " V4L2_FOURCC_CONV "\n", __func__,
--		node->fmt.fmt.pix.width, node->fmt.fmt.pix.height,
--		V4L2_FOURCC_CONV_ARGS(node->fmt.fmt.pix.pixelformat));
-+		node->vid_fmt.fmt.pix.width, node->vid_fmt.fmt.pix.height,
-+		V4L2_FOURCC_CONV_ARGS(node->vid_fmt.fmt.pix.pixelformat));
- 
- 	return 0;
- }
-@@ -1379,11 +1391,11 @@ static int cfe_enum_fmt_meta(struct file
- 
- 	cfe_dbg("%s: [%s]\n", __func__, node_desc[node->id].name);
- 
--	if (!is_meta_node(node) || f->index != 0)
-+	if (!node_supports_meta(node) || f->index != 0)
- 		return -EINVAL;
- 
- 	switch (node->id) {
--	case CSI2_CH1_EMBEDDED:
-+	case CSI2_CH0...CSI2_CH3:
- 		f->pixelformat = V4L2_META_FMT_SENSOR_DATA;
- 		return 0;
- 	case FE_STATS:
-@@ -1399,8 +1411,11 @@ static int cfe_enum_fmt_meta(struct file
- 
- static int try_fmt_meta(struct cfe_node *node, struct v4l2_format *f)
- {
-+	if (!node_supports_meta(node))
-+		return -EINVAL;
-+
- 	switch (node->id) {
--	case CSI2_CH1_EMBEDDED:
-+	case CSI2_CH0...CSI2_CH3:
- 		f->fmt.meta.dataformat = V4L2_META_FMT_SENSOR_DATA;
- 		if (!f->fmt.meta.buffersize)
- 			f->fmt.meta.buffersize = DEFAULT_EMBEDDED_SIZE;
-@@ -1422,6 +1437,21 @@ static int try_fmt_meta(struct cfe_node
- 	return -EINVAL;
- }
- 
-+static int cfe_g_fmt_meta(struct file *file, void *priv, struct v4l2_format *f)
-+{
-+	struct cfe_node *node = video_drvdata(file);
-+	struct cfe_device *cfe = node->cfe;
-+
-+	cfe_dbg("%s: [%s]\n", __func__, node_desc[node->id].name);
-+
-+	if (!node_supports_meta(node))
-+		return -EINVAL;
-+
-+	*f = node->meta_fmt;
-+
-+	return 0;
-+}
-+
- static int cfe_s_fmt_meta(struct file *file, void *priv, struct v4l2_format *f)
- {
- 	struct cfe_node *node = video_drvdata(file);
-@@ -1434,17 +1464,17 @@ static int cfe_s_fmt_meta(struct file *f
- 	if (vb2_is_busy(q))
- 		return -EBUSY;
- 
--	if (f->type != node->buffer_queue.type)
-+	if (!node_supports_meta(node))
- 		return -EINVAL;
- 
- 	ret = try_fmt_meta(node, f);
- 	if (ret)
- 		return ret;
- 
--	node->fmt = *f;
-+	node->meta_fmt = *f;
- 
- 	cfe_dbg("%s: Set " V4L2_FOURCC_CONV "\n", __func__,
--		V4L2_FOURCC_CONV_ARGS(node->fmt.fmt.meta.dataformat));
-+		V4L2_FOURCC_CONV_ARGS(node->meta_fmt.fmt.meta.dataformat));
- 
- 	return 0;
- }
-@@ -1491,6 +1521,52 @@ static int cfe_enum_framesizes(struct fi
- 	return 0;
- }
- 
-+static int cfe_vb2_ioctl_reqbufs(struct file *file, void *priv,
-+				 struct v4l2_requestbuffers *p)
-+{
-+	struct video_device *vdev = video_devdata(file);
-+	struct cfe_node *node = video_get_drvdata(vdev);
-+	struct cfe_device *cfe = node->cfe;
-+	int ret;
-+
-+	cfe_dbg("%s: [%s] type:%u\n", __func__, node_desc[node->id].name,
-+		p->type);
-+
-+	if (p->type != V4L2_BUF_TYPE_VIDEO_CAPTURE &&
-+	    p->type != V4L2_BUF_TYPE_META_CAPTURE &&
-+	    p->type != V4L2_BUF_TYPE_META_OUTPUT)
-+		return -EINVAL;
-+
-+	ret = vb2_queue_change_type(vdev->queue, p->type);
-+	if (ret)
-+		return ret;
-+
-+	return vb2_ioctl_reqbufs(file, priv, p);
-+}
-+
-+static int cfe_vb2_ioctl_create_bufs(struct file *file, void *priv,
-+				     struct v4l2_create_buffers *p)
-+{
-+	struct video_device *vdev = video_devdata(file);
-+	struct cfe_node *node = video_get_drvdata(vdev);
-+	struct cfe_device *cfe = node->cfe;
-+	int ret;
-+
-+	cfe_dbg("%s: [%s] type:%u\n", __func__, node_desc[node->id].name,
-+		p->format.type);
-+
-+	if (p->format.type != V4L2_BUF_TYPE_VIDEO_CAPTURE &&
-+	    p->format.type != V4L2_BUF_TYPE_META_CAPTURE &&
-+	    p->format.type != V4L2_BUF_TYPE_META_OUTPUT)
-+		return -EINVAL;
-+
-+	ret = vb2_queue_change_type(vdev->queue, p->format.type);
-+	if (ret)
-+		return ret;
-+
-+	return vb2_ioctl_create_bufs(file, priv, p);
-+}
-+
- static int cfe_subscribe_event(struct v4l2_fh *fh,
- 			       const struct v4l2_event_subscription *sub)
- {
-@@ -1498,12 +1574,13 @@ static int cfe_subscribe_event(struct v4
- 
- 	switch (sub->type) {
- 	case V4L2_EVENT_FRAME_SYNC:
--		if (!is_image_output_node(node))
-+		if (!node_supports_image_output(node))
- 			break;
- 
- 		return v4l2_event_subscribe(fh, sub, 2, NULL);
- 	case V4L2_EVENT_SOURCE_CHANGE:
--		if (is_meta_input_node(node))
-+		if (!node_supports_image_output(node) &&
-+		    !node_supports_meta_output(node))
- 			break;
- 
- 		return v4l2_event_subscribe(fh, sub, 4, NULL);
-@@ -1520,19 +1597,19 @@ static const struct v4l2_ioctl_ops cfe_i
- 	.vidioc_try_fmt_vid_cap = cfe_try_fmt_vid_cap,
- 
- 	.vidioc_enum_fmt_meta_cap = cfe_enum_fmt_meta,
--	.vidioc_g_fmt_meta_cap = cfe_g_fmt,
-+	.vidioc_g_fmt_meta_cap = cfe_g_fmt_meta,
- 	.vidioc_s_fmt_meta_cap = cfe_s_fmt_meta,
- 	.vidioc_try_fmt_meta_cap = cfe_try_fmt_meta,
- 
- 	.vidioc_enum_fmt_meta_out = cfe_enum_fmt_meta,
--	.vidioc_g_fmt_meta_out = cfe_g_fmt,
-+	.vidioc_g_fmt_meta_out = cfe_g_fmt_meta,
- 	.vidioc_s_fmt_meta_out = cfe_s_fmt_meta,
- 	.vidioc_try_fmt_meta_out = cfe_try_fmt_meta,
- 
- 	.vidioc_enum_framesizes = cfe_enum_framesizes,
- 
--	.vidioc_reqbufs = vb2_ioctl_reqbufs,
--	.vidioc_create_bufs = vb2_ioctl_create_bufs,
-+	.vidioc_reqbufs = cfe_vb2_ioctl_reqbufs,
-+	.vidioc_create_bufs = cfe_vb2_ioctl_create_bufs,
- 	.vidioc_prepare_buf = vb2_ioctl_prepare_buf,
- 	.vidioc_querybuf = vb2_ioctl_querybuf,
- 	.vidioc_qbuf = vb2_ioctl_qbuf,
-@@ -1610,7 +1687,7 @@ static int cfe_video_link_validate(struc
- 	}
- 
- 	if (is_image_output_node(node)) {
--		struct v4l2_pix_format *pix_fmt = &node->fmt.fmt.pix;
-+		struct v4l2_pix_format *pix_fmt = &node->vid_fmt.fmt.pix;
- 		const struct cfe_fmt *fmt = NULL;
- 		unsigned int i;
- 
-@@ -1636,8 +1713,8 @@ static int cfe_video_link_validate(struc
- 			ret = -EINVAL;
- 			goto out;
- 		}
--	} else if (node->id == CSI2_CH1_EMBEDDED) {
--		struct v4l2_meta_format *meta_fmt = &node->fmt.fmt.meta;
-+	} else if (is_csi2_node(node) && is_meta_output_node(node)) {
-+		struct v4l2_meta_format *meta_fmt = &node->meta_fmt.fmt.meta;
- 
- 		if (source_fmt->width * source_fmt->height !=
- 							meta_fmt->buffersize ||
-@@ -1698,15 +1775,17 @@ static int cfe_video_link_notify(struct
- 
- 	if (link->source->entity != csi2)
- 		return 0;
--	if (link->sink->index != 0)
-+	if (link->sink->entity != fe)
- 		return 0;
--	if (link->source->index == node_desc[CSI2_CH1_EMBEDDED].link_pad)
-+	if (link->sink->index != 0)
- 		return 0;
- 
- 	cfe->fe_csi2_channel = -1;
--	if (link->sink->entity == fe && (link->flags & MEDIA_LNK_FL_ENABLED)) {
-+	if (link->flags & MEDIA_LNK_FL_ENABLED) {
- 		if (link->source->index == node_desc[CSI2_CH0].link_pad)
- 			cfe->fe_csi2_channel = CSI2_CH0;
-+		else if (link->source->index == node_desc[CSI2_CH1].link_pad)
-+			cfe->fe_csi2_channel = CSI2_CH1;
- 		else if (link->source->index == node_desc[CSI2_CH2].link_pad)
- 			cfe->fe_csi2_channel = CSI2_CH2;
- 		else if (link->source->index == node_desc[CSI2_CH3].link_pad)
-@@ -1763,30 +1842,42 @@ static int cfe_register_node(struct cfe_
- 	node->cfe = cfe;
- 	node->id = id;
- 
--	if (is_image_node(node)) {
-+	if (node_supports_image(node)) {
-+		if (node_supports_image_output(node))
-+			node->vid_fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+		else
-+			node->vid_fmt.type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
-+
- 		fmt = find_format_by_code(cfe_default_format.code);
- 		if (!fmt) {
- 			cfe_err("Failed to find format code\n");
- 			return -EINVAL;
- 		}
- 
--		node->fmt.fmt.pix.pixelformat = fmt->fourcc;
--		v4l2_fill_pix_format(&node->fmt.fmt.pix, &cfe_default_format);
-+		node->vid_fmt.fmt.pix.pixelformat = fmt->fourcc;
-+		v4l2_fill_pix_format(&node->vid_fmt.fmt.pix, &cfe_default_format);
- 
--		ret = try_fmt_vid_cap(node, &node->fmt);
-+		ret = try_fmt_vid_cap(node, &node->vid_fmt);
- 		if (ret)
- 			return ret;
--	} else {
--		ret = try_fmt_meta(node, &node->fmt);
-+	}
-+
-+	if (node_supports_meta(node)) {
-+		if (node_supports_meta_output(node))
-+			node->meta_fmt.type = V4L2_BUF_TYPE_META_CAPTURE;
-+		else
-+			node->meta_fmt.type = V4L2_BUF_TYPE_META_OUTPUT;
-+
-+		ret = try_fmt_meta(node, &node->meta_fmt);
- 		if (ret)
- 			return ret;
- 	}
--	node->fmt.type = node_desc[id].buf_type;
- 
- 	mutex_init(&node->lock);
- 
- 	q = &node->buffer_queue;
--	q->type = node_desc[id].buf_type;
-+	q->type = node_supports_image(node) ? node->vid_fmt.type :
-+					      node->meta_fmt.type;
- 	q->io_modes = VB2_MMAP | VB2_DMABUF;
- 	q->drv_priv = node;
- 	q->ops = &cfe_video_qops;
-@@ -1812,11 +1903,13 @@ static int cfe_register_node(struct cfe_
- 	vdev->ioctl_ops = &cfe_ioctl_ops;
- 	vdev->entity.ops = &cfe_media_entity_ops;
- 	vdev->v4l2_dev = &cfe->v4l2_dev;
--	vdev->vfl_dir = (is_image_output_node(node) || is_meta_output_node(node))
--				? VFL_DIR_RX : VFL_DIR_TX;
-+	vdev->vfl_dir = (node_supports_image_output(node) ||
-+			 node_supports_meta_output(node)) ?
-+				VFL_DIR_RX :
-+				VFL_DIR_TX;
- 	vdev->queue = q;
- 	vdev->lock = &node->lock;
--	vdev->device_caps = node_desc[id].cap;
-+	vdev->device_caps = node_desc[id].caps;
- 	vdev->device_caps |= V4L2_CAP_STREAMING | V4L2_CAP_IO_MC;
- 
- 	/* Define the device names */
-@@ -1829,7 +1922,7 @@ static int cfe_register_node(struct cfe_
- 	node->pad.flags = node_desc[id].pad_flags;
- 	media_entity_pads_init(&vdev->entity, 1, &node->pad);
- 
--	if (is_meta_node(node)) {
-+	if (!node_supports_image(node)) {
- 		v4l2_disable_ioctl(&node->video_dev,
- 				   VIDIOC_ENUM_FRAMEINTERVALS);
- 		v4l2_disable_ioctl(&node->video_dev,
-@@ -1907,7 +2000,7 @@ static int cfe_link_node_pads(struct cfe
- 		if (ret)
- 			return ret;
- 
--		if (node->id != CSI2_CH1_EMBEDDED) {
-+		if (node_supports_image(node)) {
- 			/* CSI2 channel # -> FE Input */
- 			ret = media_create_pad_link(&cfe->csi2.sd.entity,
- 						    node_desc[i].link_pad,
diff --git a/target/linux/bcm27xx/patches-6.1/950-1209-media-rp1-Drop-LE-handling.patch b/target/linux/bcm27xx/patches-6.1/950-1209-media-rp1-Drop-LE-handling.patch
deleted file mode 100644
index 1d6e396f1c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1209-media-rp1-Drop-LE-handling.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From dad296088dffbaf55c1e61cbdc3f7cb1eb504ca6 Mon Sep 17 00:00:00 2001
-From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
-Date: Tue, 16 May 2023 15:51:54 +0300
-Subject: [PATCH] media: rp1: Drop LE handling
-
-The driver registers for line-end interrupts, but never uses them. This
-just causes extra interrupt load, with more complexity in the driver.
-
-Drop the LE handling. It can easily be added back if later needed.
-
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
----
- .../media/platform/raspberrypi/rp1_cfe/cfe.c  |  6 ++--
- .../media/platform/raspberrypi/rp1_cfe/csi2.c | 28 ++++---------------
- .../media/platform/raspberrypi/rp1_cfe/csi2.h |  2 +-
- 3 files changed, 10 insertions(+), 26 deletions(-)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-@@ -734,13 +734,13 @@ static irqreturn_t cfe_isr(int irq, void
- {
- 	struct cfe_device *cfe = dev;
- 	unsigned int i;
--	bool sof[NUM_NODES] = {0}, eof[NUM_NODES] = {0}, lci[NUM_NODES] = {0};
-+	bool sof[NUM_NODES] = {0}, eof[NUM_NODES] = {0};
- 	u32 sts;
- 
- 	sts = cfg_reg_read(cfe, MIPICFG_INTS);
- 
- 	if (sts & MIPICFG_INT_CSI_DMA)
--		csi2_isr(&cfe->csi2, sof, eof, lci);
-+		csi2_isr(&cfe->csi2, sof, eof);
- 
- 	if (sts & MIPICFG_INT_PISP_FE)
- 		pisp_fe_isr(&cfe->fe, sof + CSI2_NUM_CHANNELS,
-@@ -757,7 +757,7 @@ static irqreturn_t cfe_isr(int irq, void
- 		 * generate interrupts even though the node is not streaming.
- 		 */
- 		if (!check_state(cfe, NODE_STREAMING, i) ||
--		    !(sof[i] || eof[i] || lci[i]))
-+		    !(sof[i] || eof[i]))
- 			continue;
- 
- 		/*
---- a/drivers/media/platform/raspberrypi/rp1_cfe/csi2.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/csi2.c
-@@ -258,7 +258,7 @@ static void csi2_isr_handle_errors(struc
- 	spin_unlock(&csi2->errors_lock);
- }
- 
--void csi2_isr(struct csi2_device *csi2, bool *sof, bool *eof, bool *lci)
-+void csi2_isr(struct csi2_device *csi2, bool *sof, bool *eof)
- {
- 	unsigned int i;
- 	u32 status;
-@@ -290,7 +290,6 @@ void csi2_isr(struct csi2_device *csi2,
- 
- 		sof[i] = !!(status & IRQ_FS(i));
- 		eof[i] = !!(status & IRQ_FE_ACK(i));
--		lci[i] = !!(status & IRQ_LE_ACK(i));
- 	}
- 
- 	if (csi2_track_errors)
-@@ -405,16 +404,12 @@ void csi2_start_channel(struct csi2_devi
- 
- 	csi2_dbg("%s [%u]\n", __func__, channel);
- 
--	/*
--	 * Disable the channel, but ensure N != 0!  Otherwise we end up with a
--	 * spurious LE + LE_ACK interrupt when re-enabling the channel.
--	 */
--	csi2_reg_write(csi2, CSI2_CH_CTRL(channel), 0x100 << __ffs(LC_MASK));
-+	csi2_reg_write(csi2, CSI2_CH_CTRL(channel), 0);
- 	csi2_reg_write(csi2, CSI2_CH_DEBUG(channel), 0);
- 	csi2_reg_write(csi2, CSI2_STATUS, IRQ_CH_MASK(channel));
- 
--	/* Enable channel and FS/FE/LE interrupts. */
--	ctrl = DMA_EN | IRQ_EN_FS | IRQ_EN_FE_ACK | IRQ_EN_LE_ACK | PACK_LINE;
-+	/* Enable channel and FS/FE interrupts. */
-+	ctrl = DMA_EN | IRQ_EN_FS | IRQ_EN_FE_ACK | PACK_LINE;
- 	/* PACK_BYTES ensures no striding for embedded data. */
- 	if (pack_bytes)
- 		ctrl |= PACK_BYTES;
-@@ -423,21 +418,11 @@ void csi2_start_channel(struct csi2_devi
- 		ctrl |= AUTO_ARM;
- 
- 	if (width && height) {
--		int line_int_freq = height >> 2;
--
--		line_int_freq = min(max(0x80, line_int_freq), 0x3ff);
--		set_field(&ctrl, line_int_freq, LC_MASK);
- 		set_field(&ctrl, mode, CH_MODE_MASK);
- 		csi2_reg_write(csi2, CSI2_CH_FRAME_SIZE(channel),
- 			       (height << 16) | width);
- 	} else {
--		/*
--		 * Do not disable line interrupts for the embedded data channel,
--		 * set it to the maximum value.  This avoids spamming the ISR
--		 * with spurious line interrupts.
--		 */
--		set_field(&ctrl, 0x3ff, LC_MASK);
--		set_field(&ctrl, 0x00, CH_MODE_MASK);
-+		set_field(&ctrl, 0x0, CH_MODE_MASK);
- 		csi2_reg_write(csi2, CSI2_CH_FRAME_SIZE(channel), 0);
- 	}
- 
-@@ -452,8 +437,7 @@ void csi2_stop_channel(struct csi2_devic
- 	csi2_dbg("%s [%u]\n", __func__, channel);
- 
- 	/* Channel disable.  Use FORCE to allow stopping mid-frame. */
--	csi2_reg_write(csi2, CSI2_CH_CTRL(channel),
--		       (0x100 << __ffs(LC_MASK)) | FORCE);
-+	csi2_reg_write(csi2, CSI2_CH_CTRL(channel), FORCE);
- 	/* Latch the above change by writing to the ADDR0 register. */
- 	csi2_reg_write(csi2, CSI2_CH_ADDR0(channel), 0);
- 	/* Write this again, the HW needs it! */
---- a/drivers/media/platform/raspberrypi/rp1_cfe/csi2.h
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/csi2.h
-@@ -71,7 +71,7 @@ struct csi2_device {
- 	u32 discards_dt_table[DISCARDS_TABLE_NUM_ENTRIES];
- };
- 
--void csi2_isr(struct csi2_device *csi2, bool *sof, bool *eof, bool *lci);
-+void csi2_isr(struct csi2_device *csi2, bool *sof, bool *eof);
- void csi2_set_buffer(struct csi2_device *csi2, unsigned int channel,
- 		     dma_addr_t dmaaddr, unsigned int stride,
- 		     unsigned int size);
diff --git a/target/linux/bcm27xx/patches-6.1/950-1210-media-rp1-csi2-Use-standard-link_validate.patch b/target/linux/bcm27xx/patches-6.1/950-1210-media-rp1-csi2-Use-standard-link_validate.patch
deleted file mode 100644
index a3836150dc..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1210-media-rp1-csi2-Use-standard-link_validate.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From b6316a8450d3cb99b7599175d59b1b7f710770f5 Mon Sep 17 00:00:00 2001
-From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
-Date: Tue, 3 Oct 2023 13:59:02 +0300
-Subject: [PATCH] media: rp1: csi2: Use standard link_validate
-
-The current csi2_link_validate() skips some important checks. Let's
-rather use the standard v4l2_subdev_link_validate_default() as the
-link_validate hook.
-
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
----
- .../media/platform/raspberrypi/rp1_cfe/csi2.c | 41 +------------------
- 1 file changed, 1 insertion(+), 40 deletions(-)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/csi2.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/csi2.c
-@@ -462,11 +462,6 @@ void csi2_close_rx(struct csi2_device *c
- 	csi2_reg_write(csi2, CSI2_IRQ_MASK, 0);
- }
- 
--static struct csi2_device *to_csi2_device(struct v4l2_subdev *subdev)
--{
--	return container_of(subdev, struct csi2_device, sd);
--}
--
- static int csi2_init_cfg(struct v4l2_subdev *sd,
- 			 struct v4l2_subdev_state *state)
- {
-@@ -554,45 +549,11 @@ static int csi2_pad_set_fmt(struct v4l2_
- 	return 0;
- }
- 
--static int csi2_link_validate(struct v4l2_subdev *sd, struct media_link *link,
--			      struct v4l2_subdev_format *source_fmt,
--			      struct v4l2_subdev_format *sink_fmt)
--{
--	struct csi2_device *csi2 = to_csi2_device(sd);
--
--	csi2_dbg("%s: link \"%s\":%u -> \"%s\":%u\n", __func__,
--		 link->source->entity->name, link->source->index,
--		 link->sink->entity->name, link->sink->index);
--
--	if ((link->source->entity == &csi2->sd.entity &&
--	     link->source->index == 1) ||
--	    (link->sink->entity == &csi2->sd.entity &&
--	     link->sink->index == 1)) {
--		csi2_dbg("Ignore metadata pad for now\n");
--		return 0;
--	}
--
--	/* The width, height and code must match. */
--	if (source_fmt->format.width != sink_fmt->format.width ||
--	    source_fmt->format.width != sink_fmt->format.width ||
--	    source_fmt->format.code != sink_fmt->format.code) {
--		csi2_err("%s: format does not match (source %ux%u 0x%x, sink %ux%u 0x%x)\n",
--			 __func__,
--			 source_fmt->format.width, source_fmt->format.height,
--			 source_fmt->format.code,
--			 sink_fmt->format.width, sink_fmt->format.height,
--			 sink_fmt->format.code);
--		return -EPIPE;
--	}
--
--	return 0;
--}
--
- static const struct v4l2_subdev_pad_ops csi2_subdev_pad_ops = {
- 	.init_cfg = csi2_init_cfg,
- 	.get_fmt = v4l2_subdev_get_fmt,
- 	.set_fmt = csi2_pad_set_fmt,
--	.link_validate = csi2_link_validate,
-+	.link_validate = v4l2_subdev_link_validate_default,
- };
- 
- static const struct media_entity_operations csi2_entity_ops = {
diff --git a/target/linux/bcm27xx/patches-6.1/950-1211-media-rp1-fe-Use-standard-link_validate.patch b/target/linux/bcm27xx/patches-6.1/950-1211-media-rp1-fe-Use-standard-link_validate.patch
deleted file mode 100644
index d36ea5bd52..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1211-media-rp1-fe-Use-standard-link_validate.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 0eeb351222adbc5b534c86f7815ee787babc3485 Mon Sep 17 00:00:00 2001
-From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
-Date: Tue, 3 Oct 2023 14:34:43 +0300
-Subject: [PATCH] media: rp1: fe: Use standard link_validate
-
-The current pisp_fe_link_validate() skips some important checks. Let's
-rather use the standard v4l2_subdev_link_validate_default() as the
-link_validate hook.
-
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
----
- .../platform/raspberrypi/rp1_cfe/pisp_fe.c    | 36 +------------------
- 1 file changed, 1 insertion(+), 35 deletions(-)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/pisp_fe.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/pisp_fe.c
-@@ -388,11 +388,6 @@ void pisp_fe_stop(struct pisp_fe_device
- 	pisp_fe_reg_write(fe, FE_INT_STATUS, ~0);
- }
- 
--static struct pisp_fe_device *to_pisp_fe_device(struct v4l2_subdev *subdev)
--{
--	return container_of(subdev, struct pisp_fe_device, sd);
--}
--
- static int pisp_fe_init_cfg(struct v4l2_subdev *sd,
- 			    struct v4l2_subdev_state *state)
- {
-@@ -492,40 +487,11 @@ static int pisp_fe_pad_set_fmt(struct v4
- 	}
- }
- 
--static int pisp_fe_link_validate(struct v4l2_subdev *sd,
--				 struct media_link *link,
--				 struct v4l2_subdev_format *source_fmt,
--				 struct v4l2_subdev_format *sink_fmt)
--{
--	struct pisp_fe_device *fe = to_pisp_fe_device(sd);
--
--	pisp_fe_dbg("%s: link \"%s\":%u -> \"%s\":%u\n", __func__,
--		    link->source->entity->name, link->source->index,
--		    link->sink->entity->name, link->sink->index);
--
--	/* The width, height and code must match. */
--	if (source_fmt->format.width != sink_fmt->format.width ||
--	    source_fmt->format.width != sink_fmt->format.width ||
--	    source_fmt->format.code != sink_fmt->format.code) {
--		pisp_fe_err("%s: format does not match (source %ux%u 0x%x, sink %ux%u 0x%x)\n",
--			    __func__,
--			     source_fmt->format.width,
--			     source_fmt->format.height,
--			     source_fmt->format.code,
--			     sink_fmt->format.width,
--			     sink_fmt->format.height,
--			     sink_fmt->format.code);
--		return -EPIPE;
--	}
--
--	return 0;
--}
--
- static const struct v4l2_subdev_pad_ops pisp_fe_subdev_pad_ops = {
- 	.init_cfg = pisp_fe_init_cfg,
- 	.get_fmt = v4l2_subdev_get_fmt,
- 	.set_fmt = pisp_fe_pad_set_fmt,
--	.link_validate = pisp_fe_link_validate,
-+	.link_validate = v4l2_subdev_link_validate_default,
- };
- 
- static const struct media_entity_operations pisp_fe_entity_ops = {
diff --git a/target/linux/bcm27xx/patches-6.1/950-1212-media-rp1-cfe-Improve-link-validation-for-metadata.patch b/target/linux/bcm27xx/patches-6.1/950-1212-media-rp1-cfe-Improve-link-validation-for-metadata.patch
deleted file mode 100644
index d85a90aac1..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1212-media-rp1-cfe-Improve-link-validation-for-metadata.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From e0f52ccfe1e383622fb30708acd38921e84fbff4 Mon Sep 17 00:00:00 2001
-From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
-Date: Tue, 3 Oct 2023 14:29:44 +0300
-Subject: [PATCH] media: rp1: cfe: Improve link validation for metadata
-
-Improve the link validation for metadata by:
-- Allowing capture buffers that are larger than the incoming frame
-  (instead of requiring exact match).
-
-- Instead of assuming that a metadata unit ("pixel") is 8 bits, use
-  find_format_by_code() to get the format and use the bit depth from
-  there. E.g. bit depth for RAW10 metadata will be 10 bits, when we
-  move to the upstream metadata formats.
-
-Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
----
- .../media/platform/raspberrypi/rp1_cfe/cfe.c  | 32 +++++++++++++------
- 1 file changed, 22 insertions(+), 10 deletions(-)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-@@ -1715,17 +1715,29 @@ static int cfe_video_link_validate(struc
- 		}
- 	} else if (is_csi2_node(node) && is_meta_output_node(node)) {
- 		struct v4l2_meta_format *meta_fmt = &node->meta_fmt.fmt.meta;
-+		const struct cfe_fmt *fmt;
-+		u32 source_size;
- 
--		if (source_fmt->width * source_fmt->height !=
--							meta_fmt->buffersize ||
--		    source_fmt->code != MEDIA_BUS_FMT_SENSOR_DATA) {
--			cfe_err("WARNING: Wrong metadata width/height/code %ux%u %08x (remote pad set to %ux%u %08x)\n",
--				meta_fmt->buffersize, 1,
--				MEDIA_BUS_FMT_SENSOR_DATA,
--				source_fmt->width,
--				source_fmt->height,
--				source_fmt->code);
--			/* TODO: this should throw an error eventually */
-+		fmt = find_format_by_code(source_fmt->code);
-+		if (!fmt || fmt->fourcc != meta_fmt->dataformat) {
-+			cfe_err("Metadata format mismatch!\n");
-+			ret = -EINVAL;
-+			goto out;
-+		}
-+
-+		source_size = DIV_ROUND_UP(source_fmt->width * source_fmt->height * fmt->depth, 8);
-+
-+		if (source_fmt->code != MEDIA_BUS_FMT_SENSOR_DATA) {
-+			cfe_err("Bad metadata mbus format\n");
-+			ret = -EINVAL;
-+			goto out;
-+		}
-+
-+		if (source_size > meta_fmt->buffersize) {
-+			cfe_err("Metadata buffer too small: %u < %u\n",
-+				meta_fmt->buffersize, source_size);
-+			ret = -EINVAL;
-+			goto out;
- 		}
- 	}
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1214-drivers-pinctrl-bcm-Kconfig-Fix-BCM2712-help.patch b/target/linux/bcm27xx/patches-6.1/950-1214-drivers-pinctrl-bcm-Kconfig-Fix-BCM2712-help.patch
deleted file mode 100644
index c3e4140fa2..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1214-drivers-pinctrl-bcm-Kconfig-Fix-BCM2712-help.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 046d03c87ecce5db074eae6ffa2d5298c5f7d5a7 Mon Sep 17 00:00:00 2001
-From: Leon Anavi <leon.anavi@konsulko.com>
-Date: Tue, 12 Dec 2023 13:53:37 +0200
-Subject: [PATCH] drivers/pinctrl/bcm/Kconfig: Fix BCM2712 help
-
-Replace "Broadcom BCM2835 GPIO" with "Broadcom BCM2712 PINCONF"
-in the help message. This work was sponsored by GOVCERT.LU.
-
-Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
----
- drivers/pinctrl/bcm/Kconfig | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/pinctrl/bcm/Kconfig
-+++ b/drivers/pinctrl/bcm/Kconfig
-@@ -10,7 +10,7 @@ config PINCTRL_BCM2712
- 	select PINCONF
- 	select GENERIC_PINCONF
- 	help
--	   Say Y here to enable the Broadcom BCM2835 GPIO driver.
-+	   Say Y here to enable the Broadcom BCM2712 PINCONF driver.
- 
- config PINCTRL_BCM281XX
- 	bool "Broadcom BCM281xx pinctrl driver"
diff --git a/target/linux/bcm27xx/patches-6.1/950-1216-drivers-gpu-drm-panel-fix-waveshare-panel-software-r.patch b/target/linux/bcm27xx/patches-6.1/950-1216-drivers-gpu-drm-panel-fix-waveshare-panel-software-r.patch
deleted file mode 100644
index aeb63589fc..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1216-drivers-gpu-drm-panel-fix-waveshare-panel-software-r.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From a6872b25f18fe46ef9979f9d4a3635a9c3966afd Mon Sep 17 00:00:00 2001
-From: eng33 <eng33@waveshare.com>
-Date: Mon, 11 Dec 2023 15:06:45 +0800
-Subject: [PATCH] drivers/gpu/drm/panel:fix waveshare panel software
- restart/shutdown display is abnormal Fixed the screen stays white when the
- user restarts or shuts down
-
-Signed-off-by: eng33 <eng33@waveshare.com>
----
- drivers/gpu/drm/panel/panel-waveshare-dsi.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/drivers/gpu/drm/panel/panel-waveshare-dsi.c
-+++ b/drivers/gpu/drm/panel/panel-waveshare-dsi.c
-@@ -362,9 +362,18 @@ static void ws_panel_remove(struct i2c_c
- {
- 	struct ws_panel *ts = i2c_get_clientdata(i2c);
- 
-+	ws_panel_disable(&ts->base);
-+
- 	drm_panel_remove(&ts->base);
- }
- 
-+static void ws_panel_shutdown(struct i2c_client *i2c)
-+{
-+	struct ws_panel *ts = i2c_get_clientdata(i2c);
-+
-+	ws_panel_disable(&ts->base);
-+}
-+
- static const struct of_device_id ws_panel_of_ids[] = {
- 	{
- 		.compatible = "waveshare,2.8inch-panel",
-@@ -403,6 +412,7 @@ static struct i2c_driver ws_panel_driver
- 	},
- 	.probe = ws_panel_probe,
- 	.remove = ws_panel_remove,
-+	.shutdown = ws_panel_shutdown,
- };
- module_i2c_driver(ws_panel_driver);
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1217-firmware-psci-Pass-given-partition-number-through.patch b/target/linux/bcm27xx/patches-6.1/950-1217-firmware-psci-Pass-given-partition-number-through.patch
deleted file mode 100644
index 7feeb224d1..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1217-firmware-psci-Pass-given-partition-number-through.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 6988ae7c909dc342322a82daaa3a95b78d038305 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 11 Dec 2023 16:58:07 +0000
-Subject: [PATCH] firmware/psci: Pass given partition number through
-
-Pi 5 uses BL31 as its armstub file, so the reset goes via PSCI. Parse
-any "reboot" parameter as a partition number to reboot into.
-N.B. This code path is only used if reboot mode has been set to warm
-or soft.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/firmware/psci/psci.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
---- a/drivers/firmware/psci/psci.c
-+++ b/drivers/firmware/psci/psci.c
-@@ -314,7 +314,14 @@ static int psci_sys_reset(struct notifie
- 		 * reset_type[30:0] = 0 (SYSTEM_WARM_RESET)
- 		 * cookie = 0 (ignored by the implementation)
- 		 */
--		invoke_psci_fn(PSCI_FN_NATIVE(1_1, SYSTEM_RESET2), 0, 0, 0);
-+		// Allow extra arguments separated by spaces after
-+		// the partition number.
-+		unsigned long val;
-+		u8 partition = 0;
-+
-+		if (data && sscanf(data, "%lu", &val) == 1 && val < 63)
-+			partition = val;
-+		invoke_psci_fn(PSCI_FN_NATIVE(1_1, SYSTEM_RESET2), 0, partition, 0);
- 	} else {
- 		invoke_psci_fn(PSCI_0_2_FN_SYSTEM_RESET, 0, 0, 0);
- 	}
diff --git a/target/linux/bcm27xx/patches-6.1/950-1218-dts-bcm2712-rpi-5-b-Enable-warm-reboot-mode.patch b/target/linux/bcm27xx/patches-6.1/950-1218-dts-bcm2712-rpi-5-b-Enable-warm-reboot-mode.patch
deleted file mode 100644
index 8bcf587e6d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1218-dts-bcm2712-rpi-5-b-Enable-warm-reboot-mode.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 5d87d7f91cb4f1d0f391f6fe9dd0524b363b78e3 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 11 Dec 2023 17:00:56 +0000
-Subject: [PATCH] dts: bcm2712-rpi-5-b: Enable warm reboot mode
-
-Switch to warm reboot mode so that the partition number is preserved.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2712-rpi-5-b.dts | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/arm/boot/dts/bcm2712-rpi-5-b.dts
-+++ b/arch/arm/boot/dts/bcm2712-rpi-5-b.dts
-@@ -428,7 +428,7 @@ dpi_16bit_gpio2:        &rp1_dpi_16bit_g
- 
- / {
- 	chosen: chosen {
--		bootargs = "coherent_pool=1M 8250.nr_uarts=1 pci=pcie_bus_safe snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1";
-+		bootargs = "reboot=w coherent_pool=1M 8250.nr_uarts=1 pci=pcie_bus_safe snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1";
- 		stdout-path = "serial10:115200n8";
- 	};
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1222-drivers-media-i2c-imx296-imx477-Configure-tigger_mod.patch b/target/linux/bcm27xx/patches-6.1/950-1222-drivers-media-i2c-imx296-imx477-Configure-tigger_mod.patch
deleted file mode 100644
index be1eb5611e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1222-drivers-media-i2c-imx296-imx477-Configure-tigger_mod.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 083f39e40d980b47ab12b451d40b9f935bb22a5b Mon Sep 17 00:00:00 2001
-From: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
-Date: Wed, 6 Dec 2023 14:27:57 +0000
-Subject: [PATCH] drivers: media: i2c: imx296,imx477: Configure tigger_mode
- every time
-
-Don't assume the camera has been reset each time we start streaming,
-but always write registers relating to trigger_mode, even in mode 0.
-
-IMX477: Stop driving XVS on stop streaming, to avoid spurious pulses.
-
-Signed-off-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
----
- drivers/media/i2c/imx296.c |  9 +++++----
- drivers/media/i2c/imx477.c | 29 ++++++++++++++---------------
- 2 files changed, 19 insertions(+), 19 deletions(-)
-
---- a/drivers/media/i2c/imx296.c
-+++ b/drivers/media/i2c/imx296.c
-@@ -650,10 +650,11 @@ static int imx296_stream_on(struct imx29
- 	imx296_write(sensor, IMX296_CTRL00, 0, &ret);
- 	usleep_range(2000, 5000);
- 
--	if (trigger_mode == 1) {
--		imx296_write(sensor, IMX296_CTRL0B, IMX296_CTRL0B_TRIGEN, &ret);
--		imx296_write(sensor, IMX296_LOWLAGTRG,  IMX296_LOWLAGTRG_FAST, &ret);
--	}
-+	/* external trigger mode: 0=normal, 1=triggered */
-+	imx296_write(sensor, IMX296_CTRL0B,
-+		     (trigger_mode == 1) ? IMX296_CTRL0B_TRIGEN : 0, &ret);
-+	imx296_write(sensor, IMX296_LOWLAGTRG,
-+		     (trigger_mode == 1) ? IMX296_LOWLAGTRG_FAST : 0, &ret);
- 
- 	imx296_write(sensor, IMX296_CTRL0A, 0, &ret);
- 
---- a/drivers/media/i2c/imx477.c
-+++ b/drivers/media/i2c/imx477.c
-@@ -1742,26 +1742,21 @@ static int imx477_start_streaming(struct
- 	imx477_write_reg(imx477, 0x0b05, IMX477_REG_VALUE_08BIT, !!dpc_enable);
- 	imx477_write_reg(imx477, 0x0b06, IMX477_REG_VALUE_08BIT, !!dpc_enable);
- 
--	/* Set vsync trigger mode */
--	if (trigger_mode != 0) {
--		/* trigger_mode == 1 for source, 2 for sink */
--		const u32 val = (trigger_mode == 1) ? 1 : 0;
--
--		imx477_write_reg(imx477, IMX477_REG_MC_MODE,
--				 IMX477_REG_VALUE_08BIT, 1);
--		imx477_write_reg(imx477, IMX477_REG_MS_SEL,
--				 IMX477_REG_VALUE_08BIT, val);
--		imx477_write_reg(imx477, IMX477_REG_XVS_IO_CTRL,
--				 IMX477_REG_VALUE_08BIT, val);
--		imx477_write_reg(imx477, IMX477_REG_EXTOUT_EN,
--				 IMX477_REG_VALUE_08BIT, val);
--	}
--
- 	/* Apply customized values from user */
- 	ret =  __v4l2_ctrl_handler_setup(imx477->sd.ctrl_handler);
- 	if (ret)
- 		return ret;
- 
-+	/* Set vsync trigger mode: 0=standalone, 1=source, 2=sink */
-+	imx477_write_reg(imx477, IMX477_REG_MC_MODE,
-+			 IMX477_REG_VALUE_08BIT, (trigger_mode > 0) ? 1 : 0);
-+	imx477_write_reg(imx477, IMX477_REG_MS_SEL,
-+			 IMX477_REG_VALUE_08BIT, (trigger_mode <= 1) ? 1 : 0);
-+	imx477_write_reg(imx477, IMX477_REG_XVS_IO_CTRL,
-+			 IMX477_REG_VALUE_08BIT, (trigger_mode == 1) ? 1 : 0);
-+	imx477_write_reg(imx477, IMX477_REG_EXTOUT_EN,
-+			 IMX477_REG_VALUE_08BIT, (trigger_mode == 1) ? 1 : 0);
-+
- 	/* set stream on register */
- 	return imx477_write_reg(imx477, IMX477_REG_MODE_SELECT,
- 				IMX477_REG_VALUE_08BIT, IMX477_MODE_STREAMING);
-@@ -1778,6 +1773,10 @@ static void imx477_stop_streaming(struct
- 			       IMX477_REG_VALUE_08BIT, IMX477_MODE_STANDBY);
- 	if (ret)
- 		dev_err(&client->dev, "%s failed to set stream\n", __func__);
-+
-+	/* Stop driving XVS out (there is still a weak pull-up) */
-+	imx477_write_reg(imx477, IMX477_REG_EXTOUT_EN,
-+			 IMX477_REG_VALUE_08BIT, 0);
- }
- 
- static int imx477_set_stream(struct v4l2_subdev *sd, int enable)
diff --git a/target/linux/bcm27xx/patches-6.1/950-1223-overlays-Add-always-on-parameter-to-imx477-and-imx29.patch b/target/linux/bcm27xx/patches-6.1/950-1223-overlays-Add-always-on-parameter-to-imx477-and-imx29.patch
deleted file mode 100644
index d705df6f40..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1223-overlays-Add-always-on-parameter-to-imx477-and-imx29.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 3ed57f25f3074f6abfe570fc11aa7d370fdc499a Mon Sep 17 00:00:00 2001
-From: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
-Date: Wed, 6 Dec 2023 14:38:03 +0000
-Subject: [PATCH] overlays: Add "always-on" parameter to imx477 and imx296
-
-Leave the camera's power supplies up, to prevent the camera
-clamping its 1.8V digital I/Os to ground. This may be useful
-when synchronizing multiple camera systems using XVS or XTRIG.
-
-Signed-off-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/README                  | 6 ++++++
- arch/arm/boot/dts/overlays/imx296-overlay.dts      | 9 +++++++++
- arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi | 9 +++++++++
- 3 files changed, 24 insertions(+)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -2520,6 +2520,8 @@ Params: rotation                Mounting
-         clock-frequency         Sets the clock frequency to match that used on
-                                 the board, which should be one of 54000000
-                                 (the default), 37125000 or 74250000.
-+        always-on               Leave the regulator powered up, to stop the
-+                                camera clamping I/Os such as XTRIG to 0V.
- 
- 
- Name:   imx327
-@@ -2558,6 +2560,8 @@ Params: rotation                Mounting
-                                 configuring the sensor (default on)
-         cam0                    Adopt the default configuration for CAM0 on a
-                                 Compute Module (CSI0, i2c_vc, and cam0_reg).
-+        always-on               Leave the regulator powered up, to stop the
-+                                camera clamping I/Os such as XVS to 0V.
- 
- 
- Name:   imx462
-@@ -2596,6 +2600,8 @@ Params: rotation                Mounting
-                                 configuring the sensor (default on)
-         cam0                    Adopt the default configuration for CAM0 on a
-                                 Compute Module (CSI0, i2c_vc, and cam0_reg).
-+        always-on               Leave the regulator powered up, to stop the
-+                                camera clamping I/Os such as XVS to 0V.
- 
- 
- Name:   imx519
---- a/arch/arm/boot/dts/overlays/imx296-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/imx296-overlay.dts
-@@ -37,6 +37,13 @@
- 		};
- 	};
- 
-+	reg_alwayson_frag: fragment@99 {
-+		target = <&cam1_reg>;
-+		__dormant__ {
-+			regulator-always-on;
-+		};
-+	};
-+
- 	i2c_frag: fragment@100 {
- 		target = <&i2c_csi_dsi>;
- 		__overlay__ {
-@@ -98,8 +105,10 @@
- 		       <&csi_frag>, "target:0=",<&csi0>,
- 		       <&clk_frag>, "target:0=",<&cam0_clk>,
- 		       <&reg_frag>, "target:0=",<&cam0_reg>,
-+		       <&reg_alwayson_frag>, "target:0=",<&cam0_reg>,
- 		       <&imx296>, "clocks:0=",<&cam0_clk>,
- 		       <&imx296>, "avdd-supply:0=",<&cam0_reg>;
- 		clock-frequency = <&clk_over>, "clock-frequency:0";
-+		always-on = <0>, "+99";
- 	};
- };
---- a/arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi
-+++ b/arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi
-@@ -33,6 +33,13 @@
- 		};
- 	};
- 
-+	reg_alwayson_frag: fragment@99 {
-+		target = <&cam1_reg>;
-+		__dormant__ {
-+			regulator-always-on;
-+		};
-+	};
-+
- 	i2c_frag: fragment@100 {
- 		target = <&i2c_csi_dsi>;
- 		__overlay__ {
-@@ -69,8 +76,10 @@
- 		       <&csi_frag>, "target:0=",<&csi0>,
- 		       <&clk_frag>, "target:0=",<&cam0_clk>,
- 		       <&reg_frag>, "target:0=",<&cam0_reg>,
-+		       <&reg_alwayson_frag>, "target:0=",<&cam0_reg>,
- 		       <&cam_node>, "clocks:0=",<&cam0_clk>,
- 		       <&cam_node>, "VANA-supply:0=",<&cam0_reg>;
-+		always-on = <0>, "+99";
- 	};
- };
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1224-input-edt-ft5x06-Correct-prefix-length-in-snprintf.patch b/target/linux/bcm27xx/patches-6.1/950-1224-input-edt-ft5x06-Correct-prefix-length-in-snprintf.patch
deleted file mode 100644
index 6fb8fc0b95..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1224-input-edt-ft5x06-Correct-prefix-length-in-snprintf.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e0ecfaf1abfd5ef63ceec7606352020a80a2742b Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Mon, 18 Dec 2023 11:49:36 +0000
-Subject: [PATCH] input: edt-ft5x06: Correct prefix length in snprintf
-
-snprintf takes the length of the array that we can print into,
-and has to fit the NULL terminator in there too.
-Printing the prefix is generally "12-3456 " which is 8 desired
-characters (the length of EDT_NAME_PREFIX_LEN) and the NULL.
-The space is therefore being truncated to fit the NULL in.
-
-Increase the length snprintf is allowed to use.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/input/touchscreen/edt-ft5x06.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/input/touchscreen/edt-ft5x06.c
-+++ b/drivers/input/touchscreen/edt-ft5x06.c
-@@ -966,7 +966,7 @@ static int edt_ft5x06_ts_identify(struct
- 	char *model_name = tsdata->name;
- 	char *fw_version = tsdata->fw_version;
- 
--	snprintf(model_name, EDT_NAME_PREFIX_LEN, "%s ", dev_name(&client->dev));
-+	snprintf(model_name, EDT_NAME_PREFIX_LEN + 1, "%s ", dev_name(&client->dev));
- 	model_name += strlen(model_name);
- 
- 	/* see what we find if we assume it is a M06 *
diff --git a/target/linux/bcm27xx/patches-6.1/950-1225-ARM-dts-bcm2712-rpi-5-b-Allow-RTC-to-be-disabled.patch b/target/linux/bcm27xx/patches-6.1/950-1225-ARM-dts-bcm2712-rpi-5-b-Allow-RTC-to-be-disabled.patch
deleted file mode 100644
index 5a3e6df555..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1225-ARM-dts-bcm2712-rpi-5-b-Allow-RTC-to-be-disabled.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From da5fd98469edd797ed77d9a8690a608c6b54f9e6 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 19 Dec 2023 14:55:21 +0000
-Subject: [PATCH] ARM: dts: bcm2712-rpi-5-b: Allow RTC to be disabled
-
-Add a dtparam "rtc", so that "dtparam=rtc=off" can be used to disable
-the Pi 5's onboard RTC.
-
-See: https://forums.raspberrypi.com/viewtopic.php?t=361813
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2712-rpi-5-b.dts | 1 +
- arch/arm/boot/dts/overlays/README     | 3 +++
- 2 files changed, 4 insertions(+)
-
---- a/arch/arm/boot/dts/bcm2712-rpi-5-b.dts
-+++ b/arch/arm/boot/dts/bcm2712-rpi-5-b.dts
-@@ -819,6 +819,7 @@ spi10_cs_pins: &spi10_cs_gpio1 {};
- 		pciex1_tperst_clk_ms = <&pciex1>, "brcm,tperst-clk-ms:0";
- 		pcie_tperst_clk_ms = <&pciex1>, "brcm,tperst-clk-ms:0";
- 		random = <&random>, "status";
-+		rtc = <&rpi_rtc>, "status";
- 		rtc_bbat_vchg = <&rpi_rtc>, "trickle-charge-microvolt:0";
- 		spi = <&spi0>, "status";
- 		suspend = <&pwr_key>, "linux,code:0=205";
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -307,6 +307,9 @@ Params:
-         random                  Set to "on" to enable the hardware random
-                                 number generator (default "on")
- 
-+        rtc                     Set to "off" to disable the onboard Real Time
-+                                Clock (2712 only, default "on")
-+
-         rtc_bbat_vchg           Set the RTC backup battery charging voltage in
-                                 microvolts. If set to 0 or not specified, the
-                                 trickle charger is disabled.
diff --git a/target/linux/bcm27xx/patches-6.1/950-1228-drivers-media-pisp_be-pisp_fe-Update-UAPI-header-lic.patch b/target/linux/bcm27xx/patches-6.1/950-1228-drivers-media-pisp_be-pisp_fe-Update-UAPI-header-lic.patch
deleted file mode 100644
index fc77e4d1cf..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1228-drivers-media-pisp_be-pisp_fe-Update-UAPI-header-lic.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 74c6c159c2b499bdf3c39961bd40eb9243624226 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Wed, 29 Nov 2023 13:09:05 +0000
-Subject: [PATCH] drivers: media: pisp_be: pisp_fe: Update UAPI header licenses
-
-Update the license tags on the pisp UAPI header files with the
-"Linux-syscall-note" clause.  Also replace the "GPL-2.0" tag with the
-preferred "GPL-2.0-only" tag.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/platform/raspberrypi/pisp_be/pisp_be_config.h  | 2 +-
- drivers/media/platform/raspberrypi/rp1_cfe/pisp_common.h     | 2 +-
- drivers/media/platform/raspberrypi/rp1_cfe/pisp_fe_config.h  | 2 +-
- drivers/media/platform/raspberrypi/rp1_cfe/pisp_statistics.h | 2 +-
- drivers/media/platform/raspberrypi/rp1_cfe/pisp_types.h      | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
---- a/drivers/media/platform/raspberrypi/pisp_be/pisp_be_config.h
-+++ b/drivers/media/platform/raspberrypi/pisp_be/pisp_be_config.h
-@@ -1,4 +1,4 @@
--/* SPDX-License-Identifier: GPL-2.0-only */
-+/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
- /*
-  * PiSP Back End configuration definitions.
-  *
---- a/drivers/media/platform/raspberrypi/rp1_cfe/pisp_common.h
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/pisp_common.h
-@@ -1,4 +1,4 @@
--/* SPDX-License-Identifier: GPL-2.0 */
-+/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
- /*
-  * RP1 PiSP common definitions.
-  *
---- a/drivers/media/platform/raspberrypi/rp1_cfe/pisp_fe_config.h
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/pisp_fe_config.h
-@@ -1,4 +1,4 @@
--/* SPDX-License-Identifier: GPL-2.0 */
-+/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
- /*
-  * RP1 PiSP Front End Driver Configuration structures
-  *
---- a/drivers/media/platform/raspberrypi/rp1_cfe/pisp_statistics.h
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/pisp_statistics.h
-@@ -1,4 +1,4 @@
--/* SPDX-License-Identifier: GPL-2.0 */
-+/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
- /*
-  * RP1 PiSP Front End statistics definitions
-  *
---- a/drivers/media/platform/raspberrypi/rp1_cfe/pisp_types.h
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/pisp_types.h
-@@ -1,4 +1,4 @@
--/* SPDX-License-Identifier: GPL-2.0 */
-+/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
- /*
-  * RP1 PiSP Front End image definitions.
-  *
diff --git a/target/linux/bcm27xx/patches-6.1/950-1229-drivers-media-cfe-Add-more-robust-ISR-handlers.patch b/target/linux/bcm27xx/patches-6.1/950-1229-drivers-media-cfe-Add-more-robust-ISR-handlers.patch
deleted file mode 100644
index b79cad417f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1229-drivers-media-cfe-Add-more-robust-ISR-handlers.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-From 6fb7a0b4c1dd6cf5b12ec2b2c197dcf8e58cd2b9 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Mon, 18 Dec 2023 09:52:45 +0000
-Subject: [PATCH] drivers: media: cfe: Add more robust ISR handlers
-
-Update the ISR logic to be more robust to sensors in problematic states
-where interrupts may start arriving overlapped and/or missing.
-
-1) Test for cur_frame in the FE handler, and if present, dequeue it in
-an error state so that it does not get orphaned.
-
-2) Move the sequence counter and timestamp variables to the node
-structures.  This allows the ISR to track channels running ahead when
-interrupts arrive unordered.
-
-3) Add a test to ensure we don't have a spurios (but harmlesS) call to
-the FE handler in some circumstances.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- .../media/platform/raspberrypi/rp1_cfe/cfe.c  | 92 ++++++++++---------
- 1 file changed, 49 insertions(+), 43 deletions(-)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-@@ -272,6 +272,8 @@ struct cfe_node {
- 	/* Pointer to the parent handle */
- 	struct cfe_device *cfe;
- 	struct media_pad pad;
-+	unsigned int fs_count;
-+	u64 ts;
- };
- 
- struct cfe_device {
-@@ -311,9 +313,6 @@ struct cfe_device {
- 	struct pisp_fe_device fe;
- 
- 	int fe_csi2_channel;
--
--	unsigned int sequence;
--	u64 ts;
- };
- 
- static inline bool is_fe_enabled(struct cfe_device *cfe)
-@@ -393,17 +392,6 @@ static bool test_all_nodes(struct cfe_de
- 	return true;
- }
- 
--static void clear_all_nodes(struct cfe_device *cfe, unsigned long precond,
--			    unsigned long state)
--{
--	unsigned int i;
--
--	for (i = 0; i < NUM_NODES; i++) {
--		if (check_state(cfe, precond, i))
--			clear_state(cfe, state, i);
--	}
--}
--
- static int mipi_cfg_regs_show(struct seq_file *s, void *data)
- {
- 	struct cfe_device *cfe = s->private;
-@@ -656,22 +644,22 @@ static void cfe_prepare_next_job(struct
- }
- 
- static void cfe_process_buffer_complete(struct cfe_node *node,
--					unsigned int sequence)
-+					enum vb2_buffer_state state)
- {
- 	struct cfe_device *cfe = node->cfe;
- 
- 	cfe_dbg_verbose("%s: [%s] buffer:%p\n", __func__,
- 			node_desc[node->id].name, &node->cur_frm->vb.vb2_buf);
- 
--	node->cur_frm->vb.sequence = sequence;
--	vb2_buffer_done(&node->cur_frm->vb.vb2_buf, VB2_BUF_STATE_DONE);
-+	node->cur_frm->vb.sequence = node->fs_count - 1;
-+	vb2_buffer_done(&node->cur_frm->vb.vb2_buf, state);
- }
- 
- static void cfe_queue_event_sof(struct cfe_node *node)
- {
- 	struct v4l2_event event = {
- 		.type = V4L2_EVENT_FRAME_SYNC,
--		.u.frame_sync.frame_sequence = node->cfe->sequence,
-+		.u.frame_sync.frame_sequence = node->fs_count - 1,
- 	};
- 
- 	v4l2_event_queue(&node->video_dev, &event);
-@@ -680,28 +668,53 @@ static void cfe_queue_event_sof(struct c
- static void cfe_sof_isr_handler(struct cfe_node *node)
- {
- 	struct cfe_device *cfe = node->cfe;
-+	bool matching_fs = true;
-+	unsigned int i;
- 
- 	cfe_dbg_verbose("%s: [%s] seq %u\n", __func__, node_desc[node->id].name,
--			cfe->sequence);
--
--	node->cur_frm = node->next_frm;
--	node->next_frm = NULL;
-+			node->fs_count);
- 
- 	/*
--	 * If this is the first node to see a frame start,  sample the
--	 * timestamp to use for all frames across all channels.
-+	 * If the sensor is producing unexpected frame event ordering over a
-+	 * sustained period of time, guard against the possibility of coming
-+	 * here and orphaning the cur_frm if it's not been dequeued already.
-+	 * Unfortunately, there is not enough hardware state to tell if this
-+	 * may have occurred.
- 	 */
--	if (!test_any_node(cfe, NODE_STREAMING | FS_INT))
--		cfe->ts = ktime_get_ns();
-+	if (WARN(node->cur_frm, "%s: [%s] Orphanded frame at seq %u\n",
-+		 __func__, node_desc[node->id].name, node->fs_count))
-+		cfe_process_buffer_complete(node, VB2_BUF_STATE_ERROR);
- 
--	set_state(cfe, FS_INT, node->id);
-+	node->cur_frm = node->next_frm;
-+	node->next_frm = NULL;
-+	node->fs_count++;
- 
--	/* If all nodes have seen a frame start, we can queue another job. */
--	if (test_all_nodes(cfe, NODE_STREAMING, FS_INT))
-+	node->ts = ktime_get_ns();
-+	for (i = 0; i < NUM_NODES; i++) {
-+		if (!check_state(cfe, NODE_STREAMING, i) || i == node->id)
-+			continue;
-+		/*
-+		 * This checks if any other node has seen a FS. If yes, use the
-+		 * same timestamp, eventually across all node buffers.
-+		 */
-+		if (cfe->node[i].fs_count >= node->fs_count)
-+			node->ts = cfe->node[i].ts;
-+		/*
-+		 * This checks if all other node have seen a matching FS. If
-+		 * yes, we can flag another job to be queued.
-+		 */
-+		if (matching_fs && cfe->node[i].fs_count != node->fs_count)
-+			matching_fs = false;
-+	}
-+
-+	if (matching_fs)
- 		cfe->job_queued = false;
- 
- 	if (node->cur_frm)
--		node->cur_frm->vb.vb2_buf.timestamp = cfe->ts;
-+		node->cur_frm->vb.vb2_buf.timestamp = node->ts;
-+
-+	set_state(cfe, FS_INT, node->id);
-+	clear_state(cfe, FE_INT, node->id);
- 
- 	if (is_image_output_node(node))
- 		cfe_queue_event_sof(node);
-@@ -712,22 +725,14 @@ static void cfe_eof_isr_handler(struct c
- 	struct cfe_device *cfe = node->cfe;
- 
- 	cfe_dbg_verbose("%s: [%s] seq %u\n", __func__, node_desc[node->id].name,
--			cfe->sequence);
-+			node->fs_count - 1);
- 
- 	if (node->cur_frm)
--		cfe_process_buffer_complete(node, cfe->sequence);
-+		cfe_process_buffer_complete(node, VB2_BUF_STATE_DONE);
- 
- 	node->cur_frm = NULL;
- 	set_state(cfe, FE_INT, node->id);
--
--	/*
--	 * If all nodes have seen a frame end, we can increment
--	 * the sequence counter now.
--	 */
--	if (test_all_nodes(cfe, NODE_STREAMING, FE_INT)) {
--		cfe->sequence++;
--		clear_all_nodes(cfe, NODE_STREAMING, FE_INT | FS_INT);
--	}
-+	clear_state(cfe, FS_INT, node->id);
- }
- 
- static irqreturn_t cfe_isr(int irq, void *dev)
-@@ -794,7 +799,8 @@ static irqreturn_t cfe_isr(int irq, void
- 			 * frame first before the FS handler for the current
- 			 * frame.
- 			 */
--			if (check_state(cfe, FS_INT, node->id)) {
-+			if (check_state(cfe, FS_INT, node->id) &&
-+			    !check_state(cfe, FE_INT, node->id)) {
- 				cfe_dbg("%s: [%s] Handling missing previous FE interrupt\n",
- 					__func__, node_desc[node->id].name);
- 				cfe_eof_isr_handler(node);
-@@ -1131,6 +1137,7 @@ static int cfe_start_streaming(struct vb
- 
- 	clear_state(cfe, FS_INT | FE_INT, node->id);
- 	set_state(cfe, NODE_STREAMING, node->id);
-+	node->fs_count = 0;
- 	cfe_start_channel(node);
- 
- 	if (!test_all_nodes(cfe, NODE_ENABLED, NODE_STREAMING)) {
-@@ -1166,7 +1173,6 @@ static int cfe_start_streaming(struct vb
- 	csi2_open_rx(&cfe->csi2);
- 
- 	cfe_dbg("Starting sensor streaming\n");
--	cfe->sequence = 0;
- 	ret = v4l2_subdev_call(cfe->sensor, video, s_stream, 1);
- 	if (ret < 0) {
- 		cfe_err("stream on failed in subdev\n");
diff --git a/target/linux/bcm27xx/patches-6.1/950-1231-ASoC-dwc-Defer-bclk_ratio-handling-to-hw_params.patch b/target/linux/bcm27xx/patches-6.1/950-1231-ASoC-dwc-Defer-bclk_ratio-handling-to-hw_params.patch
deleted file mode 100644
index c187507545..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1231-ASoC-dwc-Defer-bclk_ratio-handling-to-hw_params.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From dfc04900c40eb14f9364d56e96db2cc3340a1f21 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 3 Jan 2024 14:43:43 +0000
-Subject: [PATCH] ASoC: dwc: Defer bclk_ratio handling to hw_params
-
-bclk_ratio is only a factor in clock producer mode, and needs to
-override the default value of num_channels * sample_size.
-Move the bclk_ratio handling into the hw_params method, only latching
-the value in set_bclk_ratio, to address both of those matters.
-
-See: https://github.com/raspberrypi/linux/issues/5817
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- sound/soc/dwc/dwc-i2s.c | 38 +++++++++++++++++++++-----------------
- sound/soc/dwc/local.h   |  1 +
- 2 files changed, 22 insertions(+), 17 deletions(-)
-
---- a/sound/soc/dwc/dwc-i2s.c
-+++ b/sound/soc/dwc/dwc-i2s.c
-@@ -263,6 +263,25 @@ static int dw_i2s_hw_params(struct snd_p
- 		return -EINVAL;
- 	}
- 
-+	if ((dev->capability & DW_I2S_MASTER) && dev->bclk_ratio) {
-+		switch (dev->bclk_ratio) {
-+		case 32:
-+			dev->ccr = 0x00;
-+			break;
-+
-+		case 48:
-+			dev->ccr = 0x08;
-+			break;
-+
-+		case 64:
-+			dev->ccr = 0x10;
-+			break;
-+
-+		default:
-+			return -EINVAL;
-+		}
-+	}
-+
- 	config->chan_nr = params_channels(params);
- 
- 	switch (config->chan_nr) {
-@@ -436,23 +455,7 @@ static int dw_i2s_set_bclk_ratio(struct
- 
- 	dev_dbg(dev->dev, "%s(%d)\n", __func__, ratio);
- 
--	switch (ratio) {
--	case 32:
--		dev->ccr = 0x00;
--		break;
--
--	case 48:
--		dev->ccr = 0x08;
--		break;
--
--	case 64:
--		dev->ccr = 0x10;
--		break;
--	default:
--		return -EINVAL;
--	}
--
--	i2s_write_reg(dev->i2s_base, CCR, dev->ccr);
-+	dev->bclk_ratio = ratio;
- 
- 	return 0;
- }
-@@ -746,6 +749,7 @@ static int dw_i2s_probe(struct platform_
- 		}
- 	}
- 
-+	dev->bclk_ratio = 0;
- 	dev->i2s_reg_comp1 = I2S_COMP_PARAM_1;
- 	dev->i2s_reg_comp2 = I2S_COMP_PARAM_2;
- 	if (pdata) {
---- a/sound/soc/dwc/local.h
-+++ b/sound/soc/dwc/local.h
-@@ -107,6 +107,7 @@ struct dw_i2s_dev {
- 	unsigned int quirks;
- 	unsigned int i2s_reg_comp1;
- 	unsigned int i2s_reg_comp2;
-+	unsigned int bclk_ratio;
- 	struct device *dev;
- 	u32 ccr;
- 	u32 xfer_resolution;
diff --git a/target/linux/bcm27xx/patches-6.1/950-1232-drm-vc4-Fix-reading-of-frame-count-on-GEN5-Pi4.patch b/target/linux/bcm27xx/patches-6.1/950-1232-drm-vc4-Fix-reading-of-frame-count-on-GEN5-Pi4.patch
deleted file mode 100644
index 4374e24244..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1232-drm-vc4-Fix-reading-of-frame-count-on-GEN5-Pi4.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From d5066442e39dd9bf4ba6431ffb3f99e3d5085d3f Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 4 Jan 2024 12:02:43 +0000
-Subject: [PATCH] drm/vc4: Fix reading of frame count on GEN5 / Pi4
-
-The frame count values moved within registers DISPSTAT1 and
-DISPSTAT2 with GEN5, so update the accessor function to
-accommodate that.
-
-Fixes: b51cd7ad143d ("drm/vc4: hvs: Fix frame count register readout")
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_hvs.c  | 23 +++++++++++++++++++++--
- drivers/gpu/drm/vc4/vc4_regs.h |  6 ++++++
- 2 files changed, 27 insertions(+), 2 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -823,10 +823,28 @@ u8 vc4_hvs_get_fifo_frame_count(struct v
- 	if (!drm_dev_enter(drm, &idx))
- 		return 0;
- 
--	if (vc4->gen >= VC4_GEN_6) {
-+	switch (vc4->gen) {
-+	case VC4_GEN_6:
- 		field = VC4_GET_FIELD(HVS_READ(SCALER6_DISPX_STATUS(fifo)),
- 				      SCALER6_DISPX_STATUS_FRCNT);
--	} else {
-+		break;
-+	case VC4_GEN_5:
-+		switch (fifo) {
-+		case 0:
-+			field = VC4_GET_FIELD(HVS_READ(SCALER_DISPSTAT1),
-+					      SCALER5_DISPSTAT1_FRCNT0);
-+			break;
-+		case 1:
-+			field = VC4_GET_FIELD(HVS_READ(SCALER_DISPSTAT1),
-+					      SCALER5_DISPSTAT1_FRCNT1);
-+			break;
-+		case 2:
-+			field = VC4_GET_FIELD(HVS_READ(SCALER_DISPSTAT2),
-+					      SCALER5_DISPSTAT2_FRCNT2);
-+			break;
-+		}
-+		break;
-+	case VC4_GEN_4:
- 		switch (fifo) {
- 		case 0:
- 			field = VC4_GET_FIELD(HVS_READ(SCALER_DISPSTAT1),
-@@ -841,6 +859,7 @@ u8 vc4_hvs_get_fifo_frame_count(struct v
- 					      SCALER_DISPSTAT2_FRCNT2);
- 			break;
- 		}
-+		break;
- 	}
- 
- 	drm_dev_exit(idx);
---- a/drivers/gpu/drm/vc4/vc4_regs.h
-+++ b/drivers/gpu/drm/vc4/vc4_regs.h
-@@ -424,6 +424,10 @@
- # define SCALER_DISPSTAT1_FRCNT0_SHIFT		18
- # define SCALER_DISPSTAT1_FRCNT1_MASK		VC4_MASK(17, 12)
- # define SCALER_DISPSTAT1_FRCNT1_SHIFT		12
-+# define SCALER5_DISPSTAT1_FRCNT0_MASK		VC4_MASK(25, 20)
-+# define SCALER5_DISPSTAT1_FRCNT0_SHIFT		20
-+# define SCALER5_DISPSTAT1_FRCNT1_MASK		VC4_MASK(19, 14)
-+# define SCALER5_DISPSTAT1_FRCNT1_SHIFT		14
- 
- #define SCALER_DISPSTATX(x)			(SCALER_DISPSTAT0 +        \
- 						 (x) * (SCALER_DISPSTAT1 - \
-@@ -442,6 +446,8 @@
- #define SCALER_DISPSTAT2                        0x00000068
- # define SCALER_DISPSTAT2_FRCNT2_MASK		VC4_MASK(17, 12)
- # define SCALER_DISPSTAT2_FRCNT2_SHIFT		12
-+# define SCALER5_DISPSTAT2_FRCNT2_MASK		VC4_MASK(19, 14)
-+# define SCALER5_DISPSTAT2_FRCNT2_SHIFT		14
- 
- #define SCALER_DISPBASE2                        0x0000006c
- #define SCALER_DISPALPHA2                       0x00000070
diff --git a/target/linux/bcm27xx/patches-6.1/950-1233-ARM-dts-bcm2712-rpi-5-b-Add-eth_ledx-parameters.patch b/target/linux/bcm27xx/patches-6.1/950-1233-ARM-dts-bcm2712-rpi-5-b-Add-eth_ledx-parameters.patch
deleted file mode 100644
index f0c6efa362..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1233-ARM-dts-bcm2712-rpi-5-b-Add-eth_ledx-parameters.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From eeb5969ae34df16024f39a77496a44ae94bfab13 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 4 Jan 2024 13:56:39 +0000
-Subject: [PATCH] ARM: dts: bcm2712-rpi-5-b: Add eth_ledx parameters
-
-Include the dtparams controlling the Ethernet jack LEDs, as used on
-other Pis.
-
-See: https://github.com/raspberrypi/linux/issues/5825
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2712-rpi-5-b.dts | 2 ++
- arch/arm/boot/dts/overlays/README     | 6 +++---
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
---- a/arch/arm/boot/dts/bcm2712-rpi-5-b.dts
-+++ b/arch/arm/boot/dts/bcm2712-rpi-5-b.dts
-@@ -830,6 +830,8 @@ spi10_cs_pins: &spi10_cs_gpio1 {};
- 		act_led_trigger = <&act_led>, "linux,default-trigger";
- 		pwr_led_activelow = <&pwr_led>, "gpios:8";
- 		pwr_led_trigger = <&pwr_led>, "linux,default-trigger";
-+		eth_led0 = <&phy1>,"led-modes:0";
-+		eth_led1 = <&phy1>,"led-modes:4";
- 		drm_fb0_rp1_dsi0 = <&aliases>, "drm-fb0=",&dsi0;
- 		drm_fb0_rp1_dsi1 = <&aliases>, "drm-fb0=",&dsi1;
- 		drm_fb0_rp1_dpi = <&aliases>, "drm-fb0=",&dpi;
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -207,7 +207,7 @@ Params:
-                                 0 means never downshift (default 2). Pi3B+ only.
- 
-         eth_led0                Set mode of LED0 - amber on Pi3B+ (default "1"),
--                                green on Pi4 (default "0").
-+                                green on Pi4/5 (default "0").
-                                 The legal values are:
- 
-                                 Pi3B+
-@@ -217,7 +217,7 @@ Params:
-                                 4=link100/1000/activity  5=link10/1000/activity
-                                 6=link10/100/activity    14=off    15=on
- 
--                                Pi4
-+                                Pi4/5
- 
-                                 0=Speed/Activity         1=Speed
-                                 2=Flash activity         3=FDX
-@@ -226,7 +226,7 @@ Params:
-                                 8=Link                   9=Activity
- 
-         eth_led1                Set mode of LED1 - green on Pi3B+ (default "6"),
--                                amber on Pi4 (default "8"). See eth_led0 for
-+                                amber on Pi4/5 (default "8"). See eth_led0 for
-                                 legal values.
- 
-         eth_max_speed           Set the maximum speed a link is allowed
diff --git a/target/linux/bcm27xx/patches-6.1/950-1234-ARM-dts-bcm2712-rpi-5-b-Add-fan-speed-dtparams.patch b/target/linux/bcm27xx/patches-6.1/950-1234-ARM-dts-bcm2712-rpi-5-b-Add-fan-speed-dtparams.patch
deleted file mode 100644
index da2345fdf7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1234-ARM-dts-bcm2712-rpi-5-b-Add-fan-speed-dtparams.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 2c085a1ff40521ab89d8f1894757aa83b59b4607 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 4 Jan 2024 12:09:10 +0000
-Subject: [PATCH] ARM: dts: bcm2712-rpi-5-b: Add fan speed dtparams
-
-Add dtparams for adjusting the Pi 5 cooling fan speeds and temperature
-thresholds.
-
-See: https://github.com/raspberrypi/linux/issues/5820
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/bcm2712-rpi-5-b.dts | 13 +++++++++++++
- arch/arm/boot/dts/overlays/README     | 25 +++++++++++++++++++++++++
- 2 files changed, 38 insertions(+)
-
---- a/arch/arm/boot/dts/bcm2712-rpi-5-b.dts
-+++ b/arch/arm/boot/dts/bcm2712-rpi-5-b.dts
-@@ -844,5 +844,18 @@ spi10_cs_pins: &spi10_cs_gpio1 {};
- 		drm_fb2_rp1_dsi1 = <&aliases>, "drm-fb2=",&dsi1;
- 		drm_fb2_rp1_dpi = <&aliases>, "drm-fb2=",&dpi;
- 		drm_fb2_vc4 = <&aliases>, "drm-fb2=",&vc4;
-+
-+		fan_temp0 = <&cpu_tepid>,"temperature:0";
-+		fan_temp1 = <&cpu_warm>,"temperature:0";
-+		fan_temp2 = <&cpu_hot>,"temperature:0";
-+		fan_temp3 = <&cpu_vhot>,"temperature:0";
-+		fan_temp0_hyst = <&cpu_tepid>,"hysteresis:0";
-+		fan_temp1_hyst = <&cpu_warm>,"hysteresis:0";
-+		fan_temp2_hyst = <&cpu_hot>,"hysteresis:0";
-+		fan_temp3_hyst = <&cpu_vhot>,"hysteresis:0";
-+		fan_temp0_speed = <&fan>, "cooling-levels:4";
-+		fan_temp1_speed = <&fan>, "cooling-levels:8";
-+		fan_temp2_speed = <&fan>, "cooling-levels:12";
-+		fan_temp3_speed = <&fan>, "cooling-levels:16";
- 	};
- };
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -233,6 +233,31 @@ Params:
-                                 to negotiate. Legal values are 10, 100 and
-                                 1000 (default 1000). Pi3B+ only.
- 
-+        fan_temp0               Temperature threshold (in millicelcius) for
-+                                1st cooling level (default 50000). Pi5 only.
-+        fan_temp0_hyst          Temperature hysteresis (in millicelcius) for
-+                                1st cooling level (default 5000). Pi5 only.
-+        fan_temp0_speed         Fan PWM setting for 1st cooling level (0-255,
-+                                default 75). Pi5 only.
-+        fan_temp1               Temperature threshold (in millicelcius) for
-+                                2nd cooling level (default 60000). Pi5 only.
-+        fan_temp1_hyst          Temperature hysteresis (in millicelcius) for
-+                                2nd cooling level (default 5000). Pi5 only.
-+        fan_temp1_speed         Fan PWM setting for 2nd cooling level (0-255,
-+                                default 125). Pi5 only.
-+        fan_temp2               Temperature threshold (in millicelcius) for
-+                                3rd cooling level (default 67500). Pi5 only.
-+        fan_temp2_hyst          Temperature hysteresis (in millicelcius) for
-+                                3rd cooling level (default 5000). Pi5 only.
-+        fan_temp2_speed         Fan PWM setting for 3rd cooling level (0-255,
-+                                default 175). Pi5 only.
-+        fan_temp3               Temperature threshold (in millicelcius) for
-+                                4th cooling level (default 75000). Pi5 only.
-+        fan_temp3_hyst          Temperature hysteresis (in millicelcius) for
-+                                4th cooling level (default 5000). Pi5 only.
-+        fan_temp3_speed         Fan PWM setting for 4th cooling level (0-255,
-+                                default 250). Pi5 only.
-+
-         hdmi                    Set to "off" to disable the HDMI interface
-                                 (default "on")
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1236-spi-bcm2835-Support-spi0-0cs-and-SPI_NO_CS-mode.patch b/target/linux/bcm27xx/patches-6.1/950-1236-spi-bcm2835-Support-spi0-0cs-and-SPI_NO_CS-mode.patch
deleted file mode 100644
index 6039363a40..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1236-spi-bcm2835-Support-spi0-0cs-and-SPI_NO_CS-mode.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 5d9075ed7e73dc6ccebf78710c78f39ddc2dd78e Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Mon, 8 Jan 2024 11:42:57 +0000
-Subject: [PATCH] spi: bcm2835: Support spi0-0cs and SPI_NO_CS mode
-
-The forced conversion of native CS lines into software CS lines is done
-whether or not the controller has been given any CS lines to use. This
-breaks the use of the spi0-0cs overlay to prevent SPI from claiming any
-CS lines, particularly with spidev which doesn't pass in the SPI_NO_CS
-flag at creation.
-
-Use the presence of an empty cs-gpios property as an indication that no
-CS lines should be used, bypassing the native CS conversion code.
-
-See: https://github.com/raspberrypi/linux/issues/5835
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/spi/spi-bcm2835.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/drivers/spi/spi-bcm2835.c
-+++ b/drivers/spi/spi-bcm2835.c
-@@ -1222,6 +1222,7 @@ static int bcm2835_spi_setup(struct spi_
- 	struct bcm2835_spi *bs = spi_controller_get_devdata(ctlr);
- 	struct bcm2835_spidev *slv = spi_get_ctldata(spi);
- 	struct gpio_chip *chip;
-+	int len;
- 	int ret;
- 	u32 cs;
- 
-@@ -1287,6 +1288,10 @@ static int bcm2835_spi_setup(struct spi_
- 		goto err_cleanup;
- 	}
- 
-+	/* Skip forced CS conversion if controller has an empty cs-gpios property */
-+	if (of_find_property(ctlr->dev.of_node, "cs-gpios", &len) && len == 0)
-+		return 0;
-+
- 	/*
- 	 * Translate native CS to GPIO
- 	 *
diff --git a/target/linux/bcm27xx/patches-6.1/950-1237-drivers-media-imx519-Add-V4L2_CID_LINK_FREQ-control.patch b/target/linux/bcm27xx/patches-6.1/950-1237-drivers-media-imx519-Add-V4L2_CID_LINK_FREQ-control.patch
deleted file mode 100644
index 889ddd77dc..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1237-drivers-media-imx519-Add-V4L2_CID_LINK_FREQ-control.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 55ed8cded4af6530276b26f567601bed868ae8f5 Mon Sep 17 00:00:00 2001
-From: Lee Jackson <lee.jackson@arducam.com>
-Date: Wed, 10 Jan 2024 08:52:54 +0800
-Subject: [PATCH] drivers: media: imx519: Add V4L2_CID_LINK_FREQ control
-
-Add V4L2_CID_LINK_FREQ as a read-only control with a value of 408 Mhz.
-This will be used by the CFE driver to corretly setup the DPHY timing
-parameters in the CSI-2 block.
-
-Signed-off-by: Lee Jackson <lee.jackson@arducam.com>
----
- drivers/media/i2c/imx519.c | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
---- a/drivers/media/i2c/imx519.c
-+++ b/drivers/media/i2c/imx519.c
-@@ -145,6 +145,10 @@ struct imx519_mode {
- 	struct imx519_reg_list reg_list;
- };
- 
-+static const s64 imx519_link_freq_menu[] = {
-+	IMX519_DEFAULT_LINK_FREQ,
-+};
-+
- static const struct imx519_reg mode_common_regs[] = {
- 	{0x0100, 0x00},
- 	{0x0136, 0x18},
-@@ -1819,6 +1823,7 @@ static int imx519_init_controls(struct i
- 	struct v4l2_ctrl_handler *ctrl_hdlr;
- 	struct i2c_client *client = v4l2_get_subdevdata(&imx519->sd);
- 	struct v4l2_fwnode_device_properties props;
-+	struct v4l2_ctrl *link_freq;
- 	unsigned int i;
- 	int ret;
- 
-@@ -1837,6 +1842,15 @@ static int imx519_init_controls(struct i
- 					       IMX519_PIXEL_RATE, 1,
- 					       IMX519_PIXEL_RATE);
- 
-+	/* LINK_FREQ is also read only */
-+	link_freq =
-+		v4l2_ctrl_new_int_menu(ctrl_hdlr, &imx519_ctrl_ops,
-+				       V4L2_CID_LINK_FREQ,
-+				       ARRAY_SIZE(imx519_link_freq_menu) - 1, 0,
-+				       imx519_link_freq_menu);
-+	if (link_freq)
-+		link_freq->flags |= V4L2_CTRL_FLAG_READ_ONLY;
-+
- 	/*
- 	 * Create the controls here, but mode specific limits are setup
- 	 * in the imx519_set_framing_limits() call below.
diff --git a/target/linux/bcm27xx/patches-6.1/950-1238-drivers-media-arducam_64mp-Add-V4L2_CID_LINK_FREQ-co.patch b/target/linux/bcm27xx/patches-6.1/950-1238-drivers-media-arducam_64mp-Add-V4L2_CID_LINK_FREQ-co.patch
deleted file mode 100644
index df353ffc31..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1238-drivers-media-arducam_64mp-Add-V4L2_CID_LINK_FREQ-co.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 5e339e1502c9be0f624398cf774e5880a6d1a677 Mon Sep 17 00:00:00 2001
-From: Lee Jackson <lee.jackson@arducam.com>
-Date: Wed, 10 Jan 2024 09:06:16 +0800
-Subject: [PATCH] drivers: media: arducam_64mp: Add V4L2_CID_LINK_FREQ control
-
-Add V4L2_CID_LINK_FREQ as a read-only control with a value of 456 Mhz.
-This will be used by the CFE driver to corretly setup the DPHY timing
-parameters in the CSI-2 block.
-
-Signed-off-by: Lee Jackson <lee.jackson@arducam.com>
----
- drivers/media/i2c/arducam_64mp.c | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
---- a/drivers/media/i2c/arducam_64mp.c
-+++ b/drivers/media/i2c/arducam_64mp.c
-@@ -143,6 +143,10 @@ struct arducam_64mp_mode {
- 	struct arducam_64mp_reg_list reg_list;
- };
- 
-+static const s64 arducam_64mp_link_freq_menu[] = {
-+	ARDUCAM_64MP_DEFAULT_LINK_FREQ,
-+};
-+
- static const struct arducam_64mp_reg mode_common_regs[] = {
- 	{0x0100, 0x00},
- 	{0x0136, 0x18},
-@@ -2272,9 +2276,11 @@ static int arducam_64mp_init_controls(st
- 	struct v4l2_ctrl_handler *ctrl_hdlr;
- 	struct i2c_client *client = v4l2_get_subdevdata(&arducam_64mp->sd);
- 	struct v4l2_fwnode_device_properties props;
-+	struct v4l2_ctrl *link_freq;
- 	unsigned int i;
- 	int ret;
- 	u8 test_pattern_max;
-+	u8 link_freq_max;
- 
- 	ctrl_hdlr = &arducam_64mp->ctrl_handler;
- 	ret = v4l2_ctrl_handler_init(ctrl_hdlr, 16);
-@@ -2292,6 +2298,16 @@ static int arducam_64mp_init_controls(st
- 						     ARDUCAM_64MP_PIXEL_RATE, 1,
- 						     ARDUCAM_64MP_PIXEL_RATE);
- 
-+	/* LINK_FREQ is also read only */
-+	link_freq_max = ARRAY_SIZE(arducam_64mp_link_freq_menu) - 1;
-+	link_freq =
-+		v4l2_ctrl_new_int_menu(ctrl_hdlr, &arducam_64mp_ctrl_ops,
-+				       V4L2_CID_LINK_FREQ,
-+				       link_freq_max, 0,
-+				       arducam_64mp_link_freq_menu);
-+	if (link_freq)
-+		link_freq->flags |= V4L2_CTRL_FLAG_READ_ONLY;
-+
- 	/*
- 	 * Create the controls here, but mode specific limits are setup
- 	 * in the arducam_64mp_set_framing_limits() call below.
diff --git a/target/linux/bcm27xx/patches-6.1/950-1239-drivers-gpu-drm-panel-Modify-the-DSI-mode-to-fix-the.patch b/target/linux/bcm27xx/patches-6.1/950-1239-drivers-gpu-drm-panel-Modify-the-DSI-mode-to-fix-the.patch
deleted file mode 100644
index e106b0609a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1239-drivers-gpu-drm-panel-Modify-the-DSI-mode-to-fix-the.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7af1e18d2e90ec64f7cb78cdb5163b63b9fbb056 Mon Sep 17 00:00:00 2001
-From: eng33 <eng33@waveshare.com>
-Date: Wed, 3 Jan 2024 11:45:04 +0800
-Subject: [PATCH]  drivers/gpu/drm/panel:Modify the DSI mode to fix the problem
- that 7.9inch cannot be displayed
-
-Signed-off-by: eng33 <eng33@waveshare.com>
----
- drivers/gpu/drm/panel/panel-waveshare-dsi.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
---- a/drivers/gpu/drm/panel/panel-waveshare-dsi.c
-+++ b/drivers/gpu/drm/panel/panel-waveshare-dsi.c
-@@ -340,9 +340,8 @@ static int ws_panel_probe(struct i2c_cli
- 	 */
- 	drm_panel_add(&ts->base);
- 
--	ts->dsi->mode_flags = (MIPI_DSI_MODE_VIDEO |
--			   MIPI_DSI_MODE_VIDEO_SYNC_PULSE |
--			   MIPI_DSI_MODE_LPM);
-+	ts->dsi->mode_flags =  MIPI_DSI_MODE_VIDEO_HSE | MIPI_DSI_MODE_VIDEO |
-+			   MIPI_DSI_CLOCK_NON_CONTINUOUS;
- 	ts->dsi->format = MIPI_DSI_FMT_RGB888;
- 	ts->dsi->lanes = 2;
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1240-drivers-gpu-drm-panel-Modified-the-timing-of-11.9inc.patch b/target/linux/bcm27xx/patches-6.1/950-1240-drivers-gpu-drm-panel-Modified-the-timing-of-11.9inc.patch
deleted file mode 100644
index 0f04b21137..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1240-drivers-gpu-drm-panel-Modified-the-timing-of-11.9inc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From aec3f9b6058448c54b74349f16b21185148a8c6e Mon Sep 17 00:00:00 2001
-From: eng33 <eng33@waveshare.com>
-Date: Wed, 3 Jan 2024 11:46:50 +0800
-Subject: [PATCH]  drivers/gpu/drm/panel:Modified the timing of 11.9inch to fix
- the issue that 11.9inch was displayed abnormally
-
-Signed-off-by: eng33 <eng33@waveshare.com>
----
- drivers/gpu/drm/panel/panel-waveshare-dsi.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/panel/panel-waveshare-dsi.c
-+++ b/drivers/gpu/drm/panel/panel-waveshare-dsi.c
-@@ -131,7 +131,7 @@ static const struct drm_display_mode ws_
- 	.hdisplay = 320,
- 	.hsync_start = 320 + 60,
- 	.hsync_end = 320 + 60 + 60,
--	.htotal = 320 + 60 + 60 + 120,
-+	.htotal = 320 + 60 + 60 + 60,
- 	.vdisplay = 1480,
- 	.vsync_start = 1480 + 60,
- 	.vsync_end = 1480 + 60 + 60,
diff --git a/target/linux/bcm27xx/patches-6.1/950-1241-drm-vc4-Add-2712-support-to-vc4_plane_async_set_fb.patch b/target/linux/bcm27xx/patches-6.1/950-1241-drm-vc4-Add-2712-support-to-vc4_plane_async_set_fb.patch
deleted file mode 100644
index c13eb354fb..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1241-drm-vc4-Add-2712-support-to-vc4_plane_async_set_fb.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From a14da0fdb0e052a672c269df7f18c9de698bd827 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 4 Jan 2024 15:02:42 +0000
-Subject: [PATCH] drm/vc4: Add 2712 support to vc4_plane_async_set_fb
-
-vc4_plane_async_set_fb directly overwrites the plane address in
-the dlist entry, but hadn't been updated for the GEN6 / 2712
-dlist format, corrupting the address in the process.
-
-Add support for the 2712 dlist format to the function.
-
-Fixes: 1ab1fbbb7e76 ("drm/vc4: hvs: Support BCM2712 HVS")
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_plane.c | 46 +++++++++++++++++++++++----------
- 1 file changed, 33 insertions(+), 13 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_plane.c
-+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -1865,7 +1865,7 @@ static int vc6_plane_mode_set(struct drm
- 				 * The UPM buffer will be allocated in
- 				 * vc6_plane_allocate_upm().
- 				 */
--				VC4_SET_FIELD(upper_32_bits(paddr) & 0xf,
-+				VC4_SET_FIELD(upper_32_bits(paddr) & 0xff,
- 					      SCALER6_PTR0_UPPER_ADDR));
- 
- 		/* Pointer Word 1 */
-@@ -2068,7 +2068,8 @@ void vc4_plane_async_set_fb(struct drm_p
- {
- 	struct vc4_plane_state *vc4_state = to_vc4_plane_state(plane->state);
- 	struct drm_gem_dma_object *bo = drm_fb_dma_get_gem_obj(fb, 0);
--	uint32_t addr;
-+	struct vc4_dev *vc4 = to_vc4_dev(plane->dev);
-+	dma_addr_t dma_addr = bo->dma_addr + fb->offsets[0];
- 	int idx;
- 
- 	if (!drm_dev_enter(plane->dev, &idx))
-@@ -2078,19 +2079,38 @@ void vc4_plane_async_set_fb(struct drm_p
- 	 * because this is only called on the primary plane.
- 	 */
- 	WARN_ON_ONCE(plane->state->crtc_x < 0 || plane->state->crtc_y < 0);
--	addr = bo->dma_addr + fb->offsets[0];
- 
--	/* Write the new address into the hardware immediately.  The
--	 * scanout will start from this address as soon as the FIFO
--	 * needs to refill with pixels.
--	 */
--	writel(addr, &vc4_state->hw_dlist[vc4_state->ptr0_offset[0]]);
-+	if (vc4->gen == VC4_GEN_6) {
-+		u32 value;
- 
--	/* Also update the CPU-side dlist copy, so that any later
--	 * atomic updates that don't do a new modeset on our plane
--	 * also use our updated address.
--	 */
--	vc4_state->dlist[vc4_state->ptr0_offset[0]] = addr;
-+		value = vc4_state->dlist[vc4_state->ptr0_offset[0]] &
-+					~SCALER6_PTR0_UPPER_ADDR_MASK;
-+		value |= VC4_SET_FIELD(upper_32_bits(dma_addr) & 0xff,
-+				       SCALER6_PTR0_UPPER_ADDR);
-+
-+		writel(value, &vc4_state->hw_dlist[vc4_state->ptr0_offset[0]]);
-+		vc4_state->dlist[vc4_state->ptr0_offset[0]] = value;
-+
-+		value = lower_32_bits(dma_addr);
-+		writel(value, &vc4_state->hw_dlist[vc4_state->ptr0_offset[0] + 1]);
-+		vc4_state->dlist[vc4_state->ptr0_offset[0] + 1] = value;
-+	} else {
-+		u32 addr;
-+
-+		addr = (u32)dma_addr;
-+
-+		/* Write the new address into the hardware immediately.  The
-+		 * scanout will start from this address as soon as the FIFO
-+		 * needs to refill with pixels.
-+		 */
-+		writel(addr, &vc4_state->hw_dlist[vc4_state->ptr0_offset[0]]);
-+
-+		/* Also update the CPU-side dlist copy, so that any later
-+		 * atomic updates that don't do a new modeset on our plane
-+		 * also use our updated address.
-+		 */
-+		vc4_state->dlist[vc4_state->ptr0_offset[0]] = addr;
-+	}
- 
- 	drm_dev_exit(idx);
- }
diff --git a/target/linux/bcm27xx/patches-6.1/950-1242-drm-vc4-Fix-atomic_async_check-to-call-the-right-mod.patch b/target/linux/bcm27xx/patches-6.1/950-1242-drm-vc4-Fix-atomic_async_check-to-call-the-right-mod.patch
deleted file mode 100644
index 683c4a46ff..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1242-drm-vc4-Fix-atomic_async_check-to-call-the-right-mod.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From bfe927647253ab3a86be16320baa1579518c6786 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 17 Jan 2024 17:00:35 +0000
-Subject: [PATCH] drm/vc4: Fix atomic_async_check to call the right mode_set
- function
-
-vc4_plane_atomic_async_check was always calling vc4_plane_mode_set
-to validate and generate the dlist for the check. If async_check
-decided it had to fall back to a sync commit, then this GEN4/5
-dlist could get used on GEN6.
-
-Call either vc4_plane_mode_set or vc6_plane_mode_set as appropriate.
-
-Fixes: 1ab1fbbb7e76 ("drm/vc4: hvs: Support BCM2712 HVS")
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_plane.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/vc4/vc4_plane.c
-+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -2194,11 +2194,15 @@ static int vc4_plane_atomic_async_check(
- {
- 	struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state,
- 										 plane);
-+	struct vc4_dev *vc4 = to_vc4_dev(plane->dev);
- 	struct vc4_plane_state *old_vc4_state, *new_vc4_state;
- 	int ret;
- 	u32 i;
- 
--	ret = vc4_plane_mode_set(plane, new_plane_state);
-+	if (vc4->gen >= VC4_GEN_6)
-+		ret = vc6_plane_mode_set(plane, new_plane_state);
-+	else
-+		ret = vc4_plane_mode_set(plane, new_plane_state);
- 	if (ret)
- 		return ret;
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1244-drm-rp1-rp1-vec-Allow-non-standard-modes-with-variou.patch b/target/linux/bcm27xx/patches-6.1/950-1244-drm-rp1-rp1-vec-Allow-non-standard-modes-with-variou.patch
deleted file mode 100644
index fb20dfe94d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1244-drm-rp1-rp1-vec-Allow-non-standard-modes-with-variou.patch
+++ /dev/null
@@ -1,343 +0,0 @@
-From 04b88e1a8b867b045bc90d997e8e0260b00dbb15 Mon Sep 17 00:00:00 2001
-From: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
-Date: Thu, 11 Jan 2024 12:13:03 +0000
-Subject: [PATCH] drm: rp1: rp1-vec: Allow non-standard modes with various
- crops
-
-Tweak sync timings in the advertised modelines.
-
-Accept other, custom modes, provided they fit within the active
-area of one of the existing hardware-supported TV modes.
-
-Instead of always padding symmetrically, try to respect the user's
-[hv]sync_start values, allowing the image to be shifted around
-the screen (to fine-tune overscan correction).
-
-Signed-off-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
----
- drivers/gpu/drm/rp1/rp1-vec/rp1_vec.c    | 66 ++++++++++++---------
- drivers/gpu/drm/rp1/rp1-vec/rp1_vec_hw.c | 74 ++++++++++++++++++------
- 2 files changed, 96 insertions(+), 44 deletions(-)
-
---- a/drivers/gpu/drm/rp1/rp1-vec/rp1_vec.c
-+++ b/drivers/gpu/drm/rp1/rp1-vec/rp1_vec.c
-@@ -19,7 +19,6 @@
- #include <linux/list.h>
- #include <linux/platform_device.h>
- #include <linux/clk.h>
--#include <linux/printk.h>
- #include <linux/console.h>
- #include <linux/debugfs.h>
- #include <linux/uaccess.h>
-@@ -208,26 +207,26 @@ static void rp1vec_connector_destroy(str
- static const struct drm_display_mode rp1vec_modes[4] = {
- 	{ /* Full size 525/60i with Rec.601 pixel rate */
- 		DRM_MODE("720x480i", DRM_MODE_TYPE_DRIVER, 13500,
--			 720, 720 + 14, 720 + 14 + 64, 858, 0,
--			 480, 480 + 7, 480 + 7 + 6, 525, 0,
-+			 720, 720 + 16, 720 + 16 + 64, 858, 0,
-+			 480, 480 + 6, 480 + 6 + 6, 525, 0,
- 			 DRM_MODE_FLAG_INTERLACE)
- 	},
- 	{ /* Cropped and horizontally squashed to be TV-safe */
- 		DRM_MODE("704x432i", DRM_MODE_TYPE_DRIVER, 15429,
--			 704, 704 + 72, 704 + 72 + 72, 980, 0,
--			 432, 432 + 31, 432 + 31 + 6, 525, 0,
-+			 704, 704 + 76, 704 + 76 + 72, 980, 0,
-+			 432, 432 + 30, 432 + 30 + 6, 525, 0,
- 			 DRM_MODE_FLAG_INTERLACE)
- 	},
- 	{ /* Full size 625/50i with Rec.601 pixel rate */
- 		DRM_MODE("720x576i", DRM_MODE_TYPE_DRIVER, 13500,
- 			 720, 720 + 20, 720 + 20 + 64, 864, 0,
--			 576, 576 + 4, 576 + 4 + 6, 625, 0,
-+			 576, 576 + 5, 576 + 5 + 5, 625, 0,
- 			 DRM_MODE_FLAG_INTERLACE)
- 	},
- 	{ /* Cropped and squashed, for square(ish) pixels */
- 		DRM_MODE("704x512i", DRM_MODE_TYPE_DRIVER, 15429,
- 			 704, 704 + 80, 704 + 80 + 72, 987, 0,
--			 512, 512 + 36, 512 + 36 + 6, 625, 0,
-+			 512, 512 + 37, 512 + 37 + 5, 625, 0,
- 			 DRM_MODE_FLAG_INTERLACE)
- 	}
- };
-@@ -298,27 +297,42 @@ static enum drm_mode_status rp1vec_mode_
- 					      const struct drm_display_mode *mode)
- {
- 	/*
--	 * Check the mode roughly matches one of our standard modes
--	 * (optionally half-height and progressive). Ignore H/V sync
--	 * timings which for interlaced TV are approximate at best.
-+	 * Check the mode roughly matches something we can generate.
-+	 * The hardware driver is very prescriptive about pixel clocks,
-+	 * line and frame durations, but we'll tolerate rounding errors.
-+	 * Within each hardware mode, allow image size and position to vary
-+	 * (to fine-tune overscan correction or emulate retro devices).
-+	 * Don't check sync timings here: the HW driver will sanitize them.
- 	 */
--	int i, prog;
- 
--	prog = !(mode->flags & DRM_MODE_FLAG_INTERLACE);
--
--	for (i = 0; i < ARRAY_SIZE(rp1vec_modes); i++) {
--		const struct drm_display_mode *ref = rp1vec_modes + i;
-+	int prog = !(mode->flags & DRM_MODE_FLAG_INTERLACE);
-+	int vtotal_full = mode->vtotal << prog;
-+	int vdisplay_full = mode->vdisplay << prog;
-+
-+	/* Reject very small frames */
-+	if (vtotal_full < 256 || mode->hdisplay < 256)
-+		return MODE_BAD;
-+
-+	/* Check lines, frame period (ms) and vertical size limit */
-+	if (vtotal_full >= 524 && vtotal_full <= 526 &&
-+	    mode->htotal * vtotal_full > 33 * mode->clock &&
-+	    mode->htotal * vtotal_full < 34 * mode->clock &&
-+	    vdisplay_full <= 480)
-+		goto vgood;
-+	if (vtotal_full >= 624 && vtotal_full <= 626 &&
-+	    mode->htotal * vtotal_full > 39 * mode->clock &&
-+	    mode->htotal * vtotal_full < 41 * mode->clock &&
-+	    vdisplay_full <= 576)
-+		goto vgood;
-+	return MODE_BAD;
- 
--		if (mode->hdisplay == ref->hdisplay           &&
--		    mode->vdisplay == (ref->vdisplay >> prog) &&
--		    mode->clock + 2 >= ref->clock             &&
--		    mode->clock <= ref->clock + 2             &&
--		    mode->htotal + 2 >= ref->htotal           &&
--		    mode->htotal <= ref->htotal + 2           &&
--		    mode->vtotal + 2 >= (ref->vtotal >> prog) &&
--		    mode->vtotal <= (ref->vtotal >> prog) + 2)
--			return MODE_OK;
--	}
-+vgood:
-+	/* Check pixel rate (kHz) and horizontal size limit */
-+	if (mode->clock == 13500 && mode->hdisplay <= 720)
-+		return MODE_OK;
-+	if (mode->clock >= 15428 && mode->clock <= 15429 &&
-+	    mode->hdisplay <= 800)
-+		return MODE_OK;
- 	return MODE_BAD;
- }
- 
-@@ -440,7 +454,7 @@ static int rp1vec_platform_probe(struct
- 	ret = drmm_mode_config_init(drm);
- 	if (ret)
- 		goto err_free_drm;
--	drm->mode_config.max_width  = 768;
-+	drm->mode_config.max_width  = 800;
- 	drm->mode_config.max_height = 576;
- 	drm->mode_config.fb_base    = 0;
- 	drm->mode_config.preferred_depth = 32;
---- a/drivers/gpu/drm/rp1/rp1-vec/rp1_vec_hw.c
-+++ b/drivers/gpu/drm/rp1/rp1-vec/rp1_vec_hw.c
-@@ -11,7 +11,6 @@
- #include <linux/delay.h>
- #include <linux/interrupt.h>
- #include <linux/platform_device.h>
--#include <linux/printk.h>
- #include <drm/drm_fourcc.h>
- #include <drm/drm_print.h>
- #include <drm/drm_vblank.h>
-@@ -82,13 +81,13 @@ static const struct rp1vec_ipixfmt my_fo
- /*
-  * Hardware mode descriptions (@ 108 MHz clock rate).
-  * These rely largely on "canned" register settings.
-- * TODO: Port the generating software from FP to integer,
-- * or better factorize the differences between modes.
-  */
- 
- struct rp1vec_hwmode {
--	u16  total_cols;	/* active columns, plus padding for filter context  */
-+	u16  total_cols;	/* max active columns incl. padding and windowing   */
- 	u16  rows_per_field;	/* active lines per field (including partial ones)  */
-+	u16  ref_hfp;		/* nominal (hsync_start - hdisplay) when max width  */
-+	u16  ref_vfp;		/* nominal (vsync_start - vdisplay) when max height */
- 	bool interlaced;	/* set for interlaced				    */
- 	bool first_field_odd;	/* set for interlaced and 30fps			    */
- 	u32  yuv_scaling;	/* three 10-bit fields {Y, U, V} in 2.8 format	    */
-@@ -103,6 +102,8 @@ static const struct rp1vec_hwmode rp1vec
- 			{
- 				.total_cols = 724,
- 				.rows_per_field = 240,
-+				.ref_hfp = 12,
-+				.ref_vfp = 2,
- 				.interlaced = false,
- 				.first_field_odd = false,
- 				.yuv_scaling = 0x1071d0cf,
-@@ -118,6 +119,8 @@ static const struct rp1vec_hwmode rp1vec
- 			}, {
- 				.total_cols = 815,
- 				.rows_per_field = 240,
-+				.ref_hfp = 16,
-+				.ref_vfp = 2,
- 				.interlaced = false,
- 				.first_field_odd = false,
- 				.yuv_scaling = 0x1c131962,
-@@ -135,6 +138,8 @@ static const struct rp1vec_hwmode rp1vec
- 			{
- 				.total_cols = 724,
- 				.rows_per_field = 243,
-+				.ref_hfp = 12,
-+				.ref_vfp = 3,
- 				.interlaced = true,
- 				.first_field_odd = true,
- 				.yuv_scaling = 0x1071d0cf,
-@@ -150,6 +155,8 @@ static const struct rp1vec_hwmode rp1vec
- 			}, {
- 				.total_cols = 815,
- 				.rows_per_field = 243,
-+				.ref_hfp = 16,
-+				.ref_vfp = 3,
- 				.interlaced = true,
- 				.first_field_odd = true,
- 				.yuv_scaling = 0x1c131962,
-@@ -170,6 +177,8 @@ static const struct rp1vec_hwmode rp1vec
- 			{
- 				.total_cols = 724,
- 				.rows_per_field = 288,
-+				.ref_hfp = 16,
-+				.ref_vfp = 2,
- 				.interlaced = false,
- 				.first_field_odd = false,
- 				.yuv_scaling = 0x11c1f8e0,
-@@ -185,6 +194,8 @@ static const struct rp1vec_hwmode rp1vec
- 			}, {
- 				.total_cols = 804,
- 				.rows_per_field = 288,
-+				.ref_hfp = 24,
-+				.ref_vfp = 2,
- 				.interlaced = false,
- 				.first_field_odd = false,
- 				.yuv_scaling = 0x1e635d7f,
-@@ -202,6 +213,8 @@ static const struct rp1vec_hwmode rp1vec
- 			{
- 				.total_cols = 724,
- 				.rows_per_field = 288,
-+				.ref_hfp = 16,
-+				.ref_vfp = 5,
- 				.interlaced = true,
- 				.first_field_odd = false,
- 				.yuv_scaling = 0x11c1f8e0,
-@@ -217,6 +230,8 @@ static const struct rp1vec_hwmode rp1vec
- 			}, {
- 				.total_cols = 804,
- 				.rows_per_field = 288,
-+				.ref_hfp = 24,
-+				.ref_vfp = 5,
- 				.interlaced = true,
- 				.first_field_odd = false,
- 				.yuv_scaling = 0x1e635d7f,
-@@ -237,6 +252,8 @@ static const struct rp1vec_hwmode rp1vec
- 			{
- 				.total_cols = 724,
- 				.rows_per_field = 240,
-+				.ref_hfp = 12,
-+				.ref_vfp = 2,
- 				.interlaced = false,
- 				.first_field_odd = false,
- 				.yuv_scaling = 0x11c1f8e0,
-@@ -252,6 +269,8 @@ static const struct rp1vec_hwmode rp1vec
- 			}, {
- 				.total_cols = 815,
- 				.rows_per_field = 240,
-+				.ref_hfp = 16,
-+				.ref_vfp = 2,
- 				.interlaced = false,
- 				.first_field_odd = false,
- 				.yuv_scaling = 0x1e635d7f,
-@@ -269,6 +288,8 @@ static const struct rp1vec_hwmode rp1vec
- 			{
- 				.total_cols = 724,
- 				.rows_per_field = 243,
-+				.ref_hfp = 12,
-+				.ref_vfp = 3,
- 				.interlaced = true,
- 				.first_field_odd = true,
- 				.yuv_scaling = 0x11c1f8e0,
-@@ -284,6 +305,8 @@ static const struct rp1vec_hwmode rp1vec
- 			}, {
- 				.total_cols = 815,
- 				.rows_per_field = 243,
-+				.ref_hfp = 16,
-+				.ref_vfp = 3,
- 				.interlaced = true,
- 				.first_field_odd = true,
- 				.yuv_scaling = 0x1e635d7f,
-@@ -308,11 +331,11 @@ void rp1vec_hw_setup(struct rp1_vec *vec
- {
- 	unsigned int i, mode_family, mode_ilaced, mode_narrow;
- 	const struct rp1vec_hwmode *hwm;
--	unsigned int w, h;
-+	int w, h, hpad, vpad;
- 
- 	/* Pick the appropriate "base" mode, which we may modify */
- 	mode_ilaced = !!(mode->flags & DRM_MODE_FLAG_INTERLACE);
--	if (mode->vtotal > 263 * (1 + mode_ilaced))
-+	if (mode->vtotal >= 272 * (1 + mode_ilaced))
- 		mode_family = 1;
- 	else
- 		mode_family = (tvstd == RP1VEC_TVSTD_PAL_M || tvstd == RP1VEC_TVSTD_PAL60) ? 2 : 0;
-@@ -326,13 +349,28 @@ void rp1vec_hw_setup(struct rp1_vec *vec
- 		tvstd, rp1vec_tvstd_names[tvstd]);
- 
- 	w = mode->hdisplay;
--	h = mode->vdisplay;
--	if (mode_ilaced)
--		h >>= 1;
-+	h = mode->vdisplay >> mode_ilaced;
- 	if (w > hwm->total_cols)
- 		w = hwm->total_cols;
- 	if (h > hwm->rows_per_field)
--		w = hwm->rows_per_field;
-+		h = hwm->rows_per_field;
-+
-+	/*
-+	 * Add padding so a framebuffer with the given dimensions and
-+	 * [hv]sync_start can be displayed in the chosen hardware mode.
-+	 *
-+	 *          |<----- mode->hsync_start ----->|
-+	 *          |<------ w ------>|             |
-+	 *          |                 |         >|--|<  ref_hfp
-+	 *                            |<- hpad ->|
-+	 * |<------------ total_cols ----------->|
-+	 *  ________FRAMEBUFFERCONTENTS__________
-+	 * '                                     `--\____/-<\/\/\>-'
-+	 */
-+	hpad = max(0, mode->hsync_start - hwm->ref_hfp - w);
-+	hpad = min(hpad, hwm->total_cols - w);
-+	vpad = max(0, ((mode->vsync_start - hwm->ref_vfp) >> mode_ilaced) - h);
-+	vpad = min(vpad, hwm->rows_per_field - h);
- 
- 	/* Configure the hardware */
- 	VEC_WRITE(VEC_APB_TIMEOUT, 0x38);
-@@ -347,18 +385,18 @@ void rp1vec_hw_setup(struct rp1_vec *vec
- 		  BITS(VEC_DMA_AREA_ROWS_PER_FIELD_MINUS1, h - 1));
- 	VEC_WRITE(VEC_YUV_SCALING, hwm->yuv_scaling);
- 	VEC_WRITE(VEC_BACK_PORCH,
--		  BITS(VEC_BACK_PORCH_HBP_MINUS1, (hwm->total_cols - w - 1) >> 1) |
--		  BITS(VEC_BACK_PORCH_VBP_MINUS1, (hwm->rows_per_field - h - 1) >> 1));
-+		  BITS(VEC_BACK_PORCH_HBP_MINUS1, hwm->total_cols - w - hpad - 1) |
-+		  BITS(VEC_BACK_PORCH_VBP_MINUS1, hwm->rows_per_field - h - vpad - 1));
- 	VEC_WRITE(VEC_FRONT_PORCH,
--		  BITS(VEC_FRONT_PORCH_HFP_MINUS1, (hwm->total_cols - w - 2) >> 1) |
--		  BITS(VEC_FRONT_PORCH_VFP_MINUS1, (hwm->rows_per_field - h - 2) >> 1));
-+		  BITS(VEC_FRONT_PORCH_HFP_MINUS1, hpad - 1) |
-+		  BITS(VEC_FRONT_PORCH_VFP_MINUS1, vpad - 1));
- 	VEC_WRITE(VEC_MODE,
- 		  BITS(VEC_MODE_HIGH_WATER, 0xE0)			  |
- 		  BITS(VEC_MODE_ALIGN16, !((w | mode->hdisplay) & 15))	  |
--		  BITS(VEC_MODE_VFP_EN, (hwm->rows_per_field > h + 1))	  |
--		  BITS(VEC_MODE_VBP_EN, (hwm->rows_per_field > h))	  |
--		  BITS(VEC_MODE_HFP_EN, (hwm->total_cols > w + 1))          |
--		  BITS(VEC_MODE_HBP_EN, (hwm->total_cols > w))		  |
-+		  BITS(VEC_MODE_VFP_EN, (vpad > 0))			  |
-+		  BITS(VEC_MODE_VBP_EN, (hwm->rows_per_field > h + vpad)) |
-+		  BITS(VEC_MODE_HFP_EN, (hpad > 0))			  |
-+		  BITS(VEC_MODE_HBP_EN, (hwm->total_cols > w + hpad))	  |
- 		  BITS(VEC_MODE_FIELDS_PER_FRAME_MINUS1, hwm->interlaced) |
- 		  BITS(VEC_MODE_FIRST_FIELD_ODD, hwm->first_field_odd));
- 	for (i = 0; i < ARRAY_SIZE(hwm->back_end_regs); ++i) {
diff --git a/target/linux/bcm27xx/patches-6.1/950-1245-ARM-pl011-Add-rs485-to-the-RP1-support.patch b/target/linux/bcm27xx/patches-6.1/950-1245-ARM-pl011-Add-rs485-to-the-RP1-support.patch
deleted file mode 100644
index c94619c914..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1245-ARM-pl011-Add-rs485-to-the-RP1-support.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From ab8ba584f91576c41d921076221ceb48e2930ae0 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 18 Jan 2024 11:08:03 +0000
-Subject: [PATCH] ARM: pl011: Add rs485 to the RP1 support
-
-pl011_axi_probe, added for RP1 support, lacks the rs485 additions that
-appeared during its development.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/tty/serial/amba-pl011.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/tty/serial/amba-pl011.c
-+++ b/drivers/tty/serial/amba-pl011.c
-@@ -3026,6 +3026,8 @@ static int pl011_axi_probe(struct platfo
- 	uap->port.iotype = vendor->access_32b ? UPIO_MEM32 : UPIO_MEM;
- 	uap->port.irq = irq;
- 	uap->port.ops = &amba_pl011_pops;
-+	uap->port.rs485_config = pl011_rs485_config;
-+	uap->port.rs485_supported = pl011_rs485_supported;
- 
- 	snprintf(uap->type, sizeof(uap->type), "PL011 AXI");
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1246-fixup-irqchip-irq-bcm2712-mip-Support-for-2712-s-MIP.patch b/target/linux/bcm27xx/patches-6.1/950-1246-fixup-irqchip-irq-bcm2712-mip-Support-for-2712-s-MIP.patch
deleted file mode 100644
index 8fc8d0c768..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1246-fixup-irqchip-irq-bcm2712-mip-Support-for-2712-s-MIP.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 3bb5880ab3dd31f75c07c3c33bf29c5d469b28f3 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 18 Jan 2024 15:41:21 +0000
-Subject: [PATCH] fixup! irqchip: irq-bcm2712-mip: Support for 2712's MIP
-
-Use irq_domain_add_hierarchy so that the root pointer is initialised
-correctly. Failure to do so leads to (at least) lockdep warnings when
-they are enabled.
-
-See: https://github.com/raspberrypi/linux/issues/5866
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/irqchip/irq-bcm2712-mip.c | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
---- a/drivers/irqchip/irq-bcm2712-mip.c
-+++ b/drivers/irqchip/irq-bcm2712-mip.c
-@@ -209,16 +209,14 @@ static int mip_init_domains(struct mip_p
- 		return -ENXIO;
- 	}
- 
--	middle_domain = irq_domain_add_tree(NULL,
--					    &mip_irq_domain_ops,
--					    priv);
-+	middle_domain = irq_domain_add_hierarchy(gic_domain, 0, 0, NULL,
-+						 &mip_irq_domain_ops,
-+						 priv);
- 	if (!middle_domain) {
- 		pr_err("Failed to create the MIP middle domain\n");
- 		return -ENOMEM;
- 	}
- 
--	middle_domain->parent = gic_domain;
--
- 	msi_domain = pci_msi_create_irq_domain(of_node_to_fwnode(node),
- 					       &mip_msi_domain_info,
- 					       middle_domain);
diff --git a/target/linux/bcm27xx/patches-6.1/950-1247-drm-vc4-Optimise-vc4_hvs_dlist_free_work-to-only-rea.patch b/target/linux/bcm27xx/patches-6.1/950-1247-drm-vc4-Optimise-vc4_hvs_dlist_free_work-to-only-rea.patch
deleted file mode 100644
index 1e2893381d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1247-drm-vc4-Optimise-vc4_hvs_dlist_free_work-to-only-rea.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From d8e53e0b83c947123c38c81d2fb5162c86d26fb5 Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Thu, 4 Jan 2024 12:39:33 +0000
-Subject: [PATCH 1247/1295] drm/vc4: Optimise vc4_hvs_dlist_free_work to only
- read frcnt and active once
-
-vc4_hvs_dlist_free_work was iterating through the list of stale
-dlist entries and reading the frame count and active flags from
-the hardware for each one.
-
-Read the frame count and active flags once, and then use the
-cached value in the loop.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_hvs.c | 15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -796,14 +796,19 @@ static void vc4_hvs_dlist_free_work(stru
- 	struct vc4_hvs *hvs = container_of(work, struct vc4_hvs, free_dlist_work);
- 	struct vc4_hvs_dlist_allocation *cur, *next;
- 	unsigned long flags;
-+	bool active[3];
-+	u8 frcnt[3];
-+	int i;
-+
- 
- 	spin_lock_irqsave(&hvs->mm_lock, flags);
-+	for (i = 0; i < 3; i++) {
-+		frcnt[i] = vc4_hvs_get_fifo_frame_count(hvs, i);
-+		active[i] = vc4_hvs_check_channel_active(hvs, i);
-+	}
- 	list_for_each_entry_safe(cur, next, &hvs->stale_dlist_entries, node) {
--		u8 frcnt;
--
--		frcnt = vc4_hvs_get_fifo_frame_count(hvs, cur->channel);
--		if (vc4_hvs_check_channel_active(hvs, cur->channel) &&
--		    !vc4_hvs_frcnt_lte(cur->target_frame_count, frcnt))
-+		if (active[cur->channel] &&
-+		    !vc4_hvs_frcnt_lte(cur->target_frame_count, frcnt[cur->channel]))
- 			continue;
- 
- 		vc4_hvs_free_dlist_entry_locked(hvs, cur);
diff --git a/target/linux/bcm27xx/patches-6.1/950-1248-drm-vc4-Flush-stale-dlist-entries-if-allocation-fail.patch b/target/linux/bcm27xx/patches-6.1/950-1248-drm-vc4-Flush-stale-dlist-entries-if-allocation-fail.patch
deleted file mode 100644
index 27497483da..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1248-drm-vc4-Flush-stale-dlist-entries-if-allocation-fail.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From c0d4ab94e37991db311b0d4e955a349e359fc73a Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.com>
-Date: Wed, 17 Jan 2024 18:36:11 +0000
-Subject: [PATCH 1248/1295] drm/vc4: Flush stale dlist entries if allocation
- fails
-
-This is largely for debug at present.
-For reasons unknown we are not getting the end of frame interrupts
-that should trigger a sweep of stale dlist entries.
-
-On allocation failure clear out ALL stale entries, and retry the
-allocation. Log the interrupt status so we have debug regarding
-whether the HVS believes the interrupt is enabled.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
----
- drivers/gpu/drm/vc4/vc4_hvs.c | 27 ++++++++++++++++++++++++---
- 1 file changed, 24 insertions(+), 3 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hvs.c
-+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -634,6 +634,9 @@ static void vc4_hvs_irq_clear_eof(struct
- 	hvs->eof_irq[channel].enabled = false;
- }
- 
-+static void vc4_hvs_free_dlist_entry_locked(struct vc4_hvs *hvs,
-+					    struct vc4_hvs_dlist_allocation *alloc);
-+
- static struct vc4_hvs_dlist_allocation *
- vc4_hvs_alloc_dlist_entry(struct vc4_hvs *hvs,
- 			  unsigned int channel,
-@@ -642,6 +645,7 @@ vc4_hvs_alloc_dlist_entry(struct vc4_hvs
- 	struct vc4_dev *vc4 = hvs->vc4;
- 	struct drm_device *dev = &vc4->base;
- 	struct vc4_hvs_dlist_allocation *alloc;
-+	struct vc4_hvs_dlist_allocation *cur, *next;
- 	unsigned long flags;
- 	int ret;
- 
-@@ -659,9 +663,26 @@ vc4_hvs_alloc_dlist_entry(struct vc4_hvs
- 				 dlist_count);
- 	spin_unlock_irqrestore(&hvs->mm_lock, flags);
- 	if (ret) {
--		drm_err(dev, "Failed to allocate DLIST entry. Requested size=%zu. ret=%d\n",
--			dlist_count, ret);
--		return ERR_PTR(ret);
-+		drm_err(dev, "Failed to allocate DLIST entry. Requested size=%zu. ret=%d. DISPCTRL is %08x\n",
-+			dlist_count, ret, HVS_READ(SCALER_DISPCTRL));
-+
-+		/* This should never happen as stale entries should get released
-+		 * as the frame counter interrupt triggers.
-+		 * However we've seen this fail for reasons currently unknown.
-+		 * Free all stale entries now so we should be able to complete
-+		 * this allocation.
-+		 */
-+		spin_lock_irqsave(&hvs->mm_lock, flags);
-+		list_for_each_entry_safe(cur, next, &hvs->stale_dlist_entries, node) {
-+			vc4_hvs_free_dlist_entry_locked(hvs, cur);
-+		}
-+
-+		ret = drm_mm_insert_node(&hvs->dlist_mm, &alloc->mm_node,
-+					 dlist_count);
-+		spin_unlock_irqrestore(&hvs->mm_lock, flags);
-+
-+		if (ret)
-+			return ERR_PTR(ret);
- 	}
- 
- 	alloc->channel = channel;
diff --git a/target/linux/bcm27xx/patches-6.1/950-1249-Pisound-Don-t-export-the-button-GPIO-via-sysfs-GPIO-.patch b/target/linux/bcm27xx/patches-6.1/950-1249-Pisound-Don-t-export-the-button-GPIO-via-sysfs-GPIO-.patch
deleted file mode 100644
index 73f308bba3..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1249-Pisound-Don-t-export-the-button-GPIO-via-sysfs-GPIO-.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From cd62562b276b5724d1c75ea1465937a5bd9037db Mon Sep 17 00:00:00 2001
-From: Giedrius <giedrius@blokas.io>
-Date: Fri, 19 Jan 2024 10:55:55 +0000
-Subject: [PATCH 1249/1295] Pisound: Don't export the button GPIO via sysfs
- GPIO class.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Giedrius Trainavičius <giedrius@blokas.io>
----
- sound/soc/bcm/pisound.c | 9 +--------
- 1 file changed, 1 insertion(+), 8 deletions(-)
-
---- a/sound/soc/bcm/pisound.c
-+++ b/sound/soc/bcm/pisound.c
-@@ -857,7 +857,6 @@ static int pisnd_ctl_uninit(void)
- 
- static struct gpio_desc *osr0, *osr1, *osr2;
- static struct gpio_desc *reset;
--static struct gpio_desc *button;
- 
- static int pisnd_hw_params(
- 	struct snd_pcm_substream *substream,
-@@ -1016,8 +1015,6 @@ static int pisnd_init_gpio(struct device
- 
- 	reset = gpiod_get_index(dev, "reset", 0, GPIOD_ASIS);
- 
--	button = gpiod_get_index(dev, "button", 0, GPIOD_ASIS);
--
- 	gpiod_direction_output(osr0,  1);
- 	gpiod_direction_output(osr1,  1);
- 	gpiod_direction_output(osr2,  1);
-@@ -1029,8 +1026,6 @@ static int pisnd_init_gpio(struct device
- 	gpiod_set_value(osr2,  false);
- 	gpiod_set_value(reset,  true);
- 
--	gpiod_export(button, false);
--
- 	return 0;
- }
- 
-@@ -1039,11 +1034,9 @@ static int pisnd_uninit_gpio(void)
- 	int i;
- 
- 	struct gpio_desc **gpios[] = {
--		&osr0, &osr1, &osr2, &reset, &button,
-+		&osr0, &osr1, &osr2, &reset,
- 	};
- 
--	gpiod_unexport(button);
--
- 	for (i = 0; i < ARRAY_SIZE(gpios); ++i) {
- 		if (*gpios[i] == NULL) {
- 			printd("weird, GPIO[%d] is NULL already\n", i);
diff --git a/target/linux/bcm27xx/patches-6.1/950-1250-Pisound-Read-out-the-SPI-speed-to-use-from-the-Devic.patch b/target/linux/bcm27xx/patches-6.1/950-1250-Pisound-Read-out-the-SPI-speed-to-use-from-the-Devic.patch
deleted file mode 100644
index 5da78175b1..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1250-Pisound-Read-out-the-SPI-speed-to-use-from-the-Devic.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 273139b285f7a1a825eb689943626a0172b8802b Mon Sep 17 00:00:00 2001
-From: Giedrius <giedrius@blokas.io>
-Date: Mon, 22 Jan 2024 13:26:58 +0000
-Subject: [PATCH 1250/1295] Pisound: Read out the SPI speed to use from the
- Device Tree.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Giedrius Trainavičius <giedrius@blokas.io>
----
- sound/soc/bcm/pisound.c | 31 ++++++++++++++++++++++++++-----
- 1 file changed, 26 insertions(+), 5 deletions(-)
-
---- a/sound/soc/bcm/pisound.c
-+++ b/sound/soc/bcm/pisound.c
-@@ -1,6 +1,6 @@
- /*
-  * Pisound Linux kernel module.
-- * Copyright (C) 2016-2020  Vilniaus Blokas UAB, https://blokas.io/pisound
-+ * Copyright (C) 2016-2024  Vilniaus Blokas UAB, https://blokas.io/pisound
-  *
-  * This program is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU General Public License
-@@ -142,14 +142,14 @@ static void pisnd_input_trigger(struct s
- 	}
- }
- 
--static struct snd_rawmidi_ops pisnd_output_ops = {
-+static const struct snd_rawmidi_ops pisnd_output_ops = {
- 	.open = pisnd_output_open,
- 	.close = pisnd_output_close,
- 	.trigger = pisnd_output_trigger,
- 	.drain = pisnd_output_drain,
- };
- 
--static struct snd_rawmidi_ops pisnd_input_ops = {
-+static const struct snd_rawmidi_ops pisnd_input_ops = {
- 	.open = pisnd_input_open,
- 	.close = pisnd_input_close,
- 	.trigger = pisnd_input_trigger,
-@@ -226,6 +226,7 @@ static char g_id[25];
- enum { MAX_VERSION_STR_LEN = 6 };
- static char g_fw_version[MAX_VERSION_STR_LEN];
- static char g_hw_version[MAX_VERSION_STR_LEN];
-+static u32 g_spi_speed_hz;
- 
- static uint8_t g_ledFlashDuration;
- static bool    g_ledFlashDurationChanged;
-@@ -329,7 +330,7 @@ static void spi_transfer(const uint8_t *
- 	transfer.tx_buf = txbuf;
- 	transfer.rx_buf = rxbuf;
- 	transfer.len = len;
--	transfer.speed_hz = 150000;
-+	transfer.speed_hz = g_spi_speed_hz;
- 	transfer.delay.value = 10;
- 	transfer.delay.unit = SPI_DELAY_UNIT_USECS;
- 
-@@ -646,6 +647,26 @@ static int pisnd_spi_init(struct device
- 	memset(g_fw_version, 0, sizeof(g_fw_version));
- 	memset(g_hw_version, 0, sizeof(g_hw_version));
- 
-+	g_spi_speed_hz = 150000;
-+	if (dev->of_node) {
-+		struct device_node *spi_node;
-+
-+		spi_node = of_parse_phandle(
-+			dev->of_node,
-+			"spi-controller",
-+			0
-+			);
-+
-+		if (spi_node) {
-+			ret = of_property_read_u32(spi_node, "spi-speed-hz", &g_spi_speed_hz);
-+			if (ret != 0)
-+				printe("Failed reading spi-speed-hz! (%d)\n", ret);
-+
-+			of_node_put(spi_node);
-+		}
-+	}
-+	printi("Using SPI speed: %u\n", g_spi_speed_hz);
-+
- 	spi = pisnd_spi_find_device();
- 
- 	if (spi != NULL) {
-@@ -950,7 +971,7 @@ static int pisnd_startup(struct snd_pcm_
- 	return 0;
- }
- 
--static struct snd_soc_ops pisnd_ops = {
-+static const struct snd_soc_ops pisnd_ops = {
- 	.startup = pisnd_startup,
- 	.hw_params = pisnd_hw_params,
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-1251-Pisound-Set-the-spi-speed-hz-for-Pisound-in-the-Devi.patch b/target/linux/bcm27xx/patches-6.1/950-1251-Pisound-Set-the-spi-speed-hz-for-Pisound-in-the-Devi.patch
deleted file mode 100644
index b0ddd8f5ab..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1251-Pisound-Set-the-spi-speed-hz-for-Pisound-in-the-Devi.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From 92123f0abd5e24c150b54c56261813ced432ac87 Mon Sep 17 00:00:00 2001
-From: Giedrius <giedrius@blokas.io>
-Date: Mon, 22 Jan 2024 13:29:24 +0000
-Subject: [PATCH 1251/1295] Pisound: Set the spi-speed-hz for Pisound in the
- Device Tree overlay, and specify spi-speed-hz override for Pi 5.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Giedrius Trainavičius <giedrius@blokas.io>
----
- arch/arm/boot/dts/overlays/Makefile           |  1 +
- arch/arm/boot/dts/overlays/README             |  8 ++++-
- arch/arm/boot/dts/overlays/overlay_map.dts    | 10 ++++++
- .../arm/boot/dts/overlays/pisound-overlay.dts |  4 ++-
- .../boot/dts/overlays/pisound-pi5-overlay.dts | 31 +++++++++++++++++++
- 5 files changed, 52 insertions(+), 2 deletions(-)
- create mode 100644 arch/arm/boot/dts/overlays/pisound-pi5-overlay.dts
-
---- a/arch/arm/boot/dts/overlays/Makefile
-+++ b/arch/arm/boot/dts/overlays/Makefile
-@@ -192,6 +192,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
- 	piscreen.dtbo \
- 	piscreen2r.dtbo \
- 	pisound.dtbo \
-+	pisound-pi5.dtbo \
- 	pitft22.dtbo \
- 	pitft28-capacitive.dtbo \
- 	pitft28-resistive.dtbo \
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -3486,11 +3486,17 @@ Params: speed                   Display
- 
- 
- Name:   pisound
--Info:   Configures the Blokas Labs pisound card
-+Info:   Configures the Blokas Labs Pisound card
- Load:   dtoverlay=pisound
- Params: <None>
- 
- 
-+Name:   pisound-pi5
-+Info:   Pi 5 specific overlay override for Blokas Labs Pisound card, see pisound
-+Load:   dtoverlay=pisound-pi5
-+Params: <None>
-+
-+
- Name:   pitft22
- Info:   Adafruit PiTFT 2.2" screen
- Load:   dtoverlay=pitft22,<param>=<val>
---- a/arch/arm/boot/dts/overlays/overlay_map.dts
-+++ b/arch/arm/boot/dts/overlays/overlay_map.dts
-@@ -203,6 +203,16 @@
- 		renamed = "miniuart-bt";
- 	};
- 
-+	pisound {
-+		bcm2835;
-+		bcm2711;
-+		bcm2712 = "pisound-pi5";
-+	};
-+
-+	pisound-pi5 {
-+		bcm2712;
-+	};
-+
- 	pwm1 {
- 		bcm2711;
- 	};
---- a/arch/arm/boot/dts/overlays/pisound-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/pisound-overlay.dts
-@@ -1,6 +1,6 @@
- /*
-  * Pisound Linux kernel module.
-- * Copyright (C) 2016-2017  Vilniaus Blokas UAB, https://blokas.io/pisound
-+ * Copyright (C) 2016-2024  Vilniaus Blokas UAB, https://blokas.io/pisound
-  *
-  * This program is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU General Public License
-@@ -56,6 +56,7 @@
- 				compatible = "blokaslabs,pisound-spi";
- 				reg = <0>;
- 				spi-max-frequency = <1000000>;
-+				spi-speed-hz = <150000>;
- 			};
- 		};
- 	};
-@@ -76,6 +77,7 @@
- 		__overlay__ {
- 			compatible = "blokaslabs,pisound";
- 			i2s-controller = <&i2s_clk_consumer>;
-+			spi-controller = <&pisound_spi>;
- 			status = "okay";
- 
- 			pinctrl-names = "default";
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/pisound-pi5-overlay.dts
-@@ -0,0 +1,31 @@
-+/*
-+ * Pisound Linux kernel module.
-+ * Copyright (C) 2016-2024  Vilniaus Blokas UAB, https://blokas.io/pisound
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; version 2 of the
-+ * License.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+#include "pisound-overlay.dts"
-+
-+&pisound_spi {
-+	spi-speed-hz = <100000>;
-+};
-+
-+/ {
-+	compatible = "brcm,bcm2712";
-+};
diff --git a/target/linux/bcm27xx/patches-6.1/950-1252-Improvement-on-backup-switchover-mode-overlay-value-.patch b/target/linux/bcm27xx/patches-6.1/950-1252-Improvement-on-backup-switchover-mode-overlay-value-.patch
deleted file mode 100644
index 9fabd9fd13..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1252-Improvement-on-backup-switchover-mode-overlay-value-.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From f85acc3d0fb33ce5c92578dca7b1345915f744ff Mon Sep 17 00:00:00 2001
-From: Tiago Freire <41837236+tiagofreire-pt@users.noreply.github.com>
-Date: Tue, 23 Jan 2024 12:10:24 +0000
-Subject: [PATCH 1252/1295] Improvement on backup-switchover-mode overlay value
- definitions (#5884)
-
-For the RV3028 RTC, the definitions for its `backup-switchover-mode` overlay
-were not intelligible neither complete/exhaustive.
-
-Accordingly to the https://github.com/raspberrypi/linux/issues/2912#issuecomment-477670051
-these one here proposed should be correct.
-
-`/boot/config.txt` should be as a configuration example, for rv3028, on a
- Uputronics GPS Extension HAT:
-
-    # For GPS Expansion Board from Uputronics
-    dtparam=i2c_arm=on
-    dtoverlay=i2c-rtc,rv3028,backup-switchover-mode=3
-    dtoverlay=pps-gpio,gpiopin=18
-    init_uart_baud=115200
-
-From my tests (`sudo rmmod rtc_rv3028 && sudo i2cget -y 1 0x52 0x37`):
-
-`Default from factory`: `0x10`
-`Mode 0`: `0x10`
-`Mode 1`: `0x14`
-`Mode 2`: `0x18`
-`Mode 3`: `0x1c`
-
-`Mode 3`: `0x1c` is consistent with the manufacturer configuration script: http://store.uputronics.com/files/configure-rv3028.sh
----
- arch/arm/boot/dts/overlays/README | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -2106,7 +2106,13 @@ Params: abx80x                  Select o
-                                 source
- 
-         backup-switchover-mode  Backup power supply switch mode. Must be 0 for
--                                off or 1 for Vdd < VBackup (RV3028, RV3032)
-+                                "Switchover disabled", 1 for "Direct Switching"
-+                                (if Vdd < VBackup), 2 for "Standby
-+                                Mode" (if Vdd < Vbackup,
-+                                does not draw current) or 3 for
-+                                "Level Switching" (if Vdd < Vbackup
-+                                and Vdd < Vddsw and Vbackup > Vddsw)
-+                                (RV3028, RV3032)
- 
- 
- Name:   i2c-rtc-gpio
diff --git a/target/linux/bcm27xx/patches-6.1/950-1253-Harmonizing-the-improvement-on-backup-switchover-mod.patch b/target/linux/bcm27xx/patches-6.1/950-1253-Harmonizing-the-improvement-on-backup-switchover-mod.patch
deleted file mode 100644
index b5fe17b959..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1253-Harmonizing-the-improvement-on-backup-switchover-mod.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f2ada4aa6b1d214c67b7efe874a408be9b4eaf3f Mon Sep 17 00:00:00 2001
-From: Tiago Freire <41837236+tiagofreire-pt@users.noreply.github.com>
-Date: Wed, 24 Jan 2024 10:03:03 +0000
-Subject: [PATCH 1253/1295] Harmonizing the improvement on
- backup-switchover-mode overlay value definitions
-
-On the followup of https://github.com/raspberrypi/linux/pull/5884, I missed a second duplicate definition. Now, harmonized the entire document.
-
-Signed-off-by: Tiago Freire <41837236+tiagofreire-pt@users.noreply.github.com>
----
- arch/arm/boot/dts/overlays/README | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -2184,7 +2184,13 @@ Params: abx80x                  Select o
-                                 source
- 
-         backup-switchover-mode  Backup power supply switch mode. Must be 0 for
--                                off or 1 for Vdd < VBackup (RV3028, RV3032)
-+                                "Switchover disabled", 1 for "Direct Switching"
-+                                (if Vdd < VBackup), 2 for "Standby
-+                                Mode" (if Vdd < Vbackup,
-+                                does not draw current) or 3 for
-+                                "Level Switching" (if Vdd < Vbackup
-+                                and Vdd < Vddsw and Vbackup > Vddsw)
-+                                (RV3028, RV3032)
- 
-         i2c_gpio_sda            GPIO used for I2C data (default "23")
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1254-Add-pcie-32bit-dma-overlay-pi5-to-enable-32bit-DMA-o.patch b/target/linux/bcm27xx/patches-6.1/950-1254-Add-pcie-32bit-dma-overlay-pi5-to-enable-32bit-DMA-o.patch
deleted file mode 100644
index 2127d2ca4f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1254-Add-pcie-32bit-dma-overlay-pi5-to-enable-32bit-DMA-o.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 1cdbd99f402b76c61632d09a49b20ce90af0cc72 Mon Sep 17 00:00:00 2001
-From: Rodrigo Rosmaninho <quico.rosmaninho@gmail.com>
-Date: Tue, 23 Jan 2024 18:50:19 +0000
-Subject: [PATCH 1254/1295] Add pcie-32bit-dma-overlay-pi5 to enable 32bit DMA
- on the Pi 5's external PCIe
-
-Changes dma-ranges in the pcie1 component of the bcm2712 dts in order to ensure that the DMA addressing space is 32bits, at the expense of having to bounce buffers.
-
-Signed-off-by: Rodrigo Rosmaninho <r.rosmaninho@ua.pt>
----
- arch/arm/boot/dts/overlays/Makefile           |  1 +
- arch/arm/boot/dts/overlays/README             |  6 +++++
- arch/arm/boot/dts/overlays/overlay_map.dts    |  5 ++++
- .../overlays/pcie-32bit-dma-pi5-overlay.dts   | 26 +++++++++++++++++++
- 4 files changed, 38 insertions(+)
- create mode 100644 arch/arm/boot/dts/overlays/pcie-32bit-dma-pi5-overlay.dts
-
---- a/arch/arm/boot/dts/overlays/Makefile
-+++ b/arch/arm/boot/dts/overlays/Makefile
-@@ -182,6 +182,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
- 	pca953x.dtbo \
- 	pcf857x.dtbo \
- 	pcie-32bit-dma.dtbo \
-+	pcie-32bit-dma-pi5.dtbo \
- 	pibell.dtbo \
- 	pifacedigital.dtbo \
- 	pifi-40.dtbo \
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -3388,6 +3388,12 @@ Load:   dtoverlay=pcie-32bit-dma
- Params: <None>
- 
- 
-+Name:   pcie-32bit-dma-pi5
-+Info:   Force PCIe config to support 32bit DMA addresses at the expense of
-+        having to bounce buffers (on the Pi 5).
-+Load:   dtoverlay=pcie-32bit-dma-pi5
-+Params: <None>
-+
- [ The pcf2127-rtc overlay has been deleted. See i2c-rtc. ]
- 
- 
---- a/arch/arm/boot/dts/overlays/overlay_map.dts
-+++ b/arch/arm/boot/dts/overlays/overlay_map.dts
-@@ -185,6 +185,11 @@
- 
- 	pcie-32bit-dma {
- 		bcm2711;
-+		bcm2712 = "pcie-32bit-dma-pi5";
-+	};
-+
-+	pcie-32bit-dma-pi5 {
-+		bcm2712;
- 	};
- 
- 	pi3-act-led {
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/pcie-32bit-dma-pi5-overlay.dts
-@@ -0,0 +1,26 @@
-+/*
-+ * pcie-32bit-dma-pi5-overlay.dts
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2712";
-+
-+	fragment@0 {
-+		target = <&pcie1>;
-+		__overlay__ {
-+			/*
-+			 * The size of the range is rounded up to a power of 2,
-+			 * so the range ends up being 0-4GB, and the MSI vector
-+			 * gets pushed beyond 4GB.
-+			 */
-+			#address-cells = <3>;
-+			#size-cells = <2>;
-+			dma-ranges = <0x02000000 0x0 0x00000000 0x0 0x00000000
-+				      0x0 0x80000000>;
-+		};
-+	};
-+
-+};
diff --git a/target/linux/bcm27xx/patches-6.1/950-1257-i2c-designware-Use-SCL-rise-and-fall-times-in-DT.patch b/target/linux/bcm27xx/patches-6.1/950-1257-i2c-designware-Use-SCL-rise-and-fall-times-in-DT.patch
deleted file mode 100644
index 3aa719cc80..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1257-i2c-designware-Use-SCL-rise-and-fall-times-in-DT.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From b660279cc83aff2018cecfc3fb55757a8d64f607 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 16 Jan 2024 15:54:22 +0000
-Subject: [PATCH 1257/1295] i2c: designware: Use SCL rise and fall times in DT
-
-Calculate the HCNT and LCNT values for all modes using the rise and
-fall times of SCL, the aim being a 50/50 mark/space ratio.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/i2c/busses/i2c-designware-master.c | 26 ++++++++++++++++++++++
- 1 file changed, 26 insertions(+)
-
---- a/drivers/i2c/busses/i2c-designware-master.c
-+++ b/drivers/i2c/busses/i2c-designware-master.c
-@@ -16,6 +16,7 @@
- #include <linux/i2c.h>
- #include <linux/interrupt.h>
- #include <linux/io.h>
-+#include <linux/math64.h>
- #include <linux/module.h>
- #include <linux/pm_runtime.h>
- #include <linux/regmap.h>
-@@ -37,6 +38,22 @@ static void i2c_dw_configure_fifo_master
- 	regmap_write(dev->map, DW_IC_CON, dev->master_cfg);
- }
- 
-+static u16 clock_calc(struct dw_i2c_dev *dev, bool want_high)
-+{
-+	struct i2c_timings *t = &dev->timings;
-+	u32 wanted_speed = t->bus_freq_hz;
-+	u32 clk_khz = i2c_dw_clk_rate(dev);
-+	u32 extra_ns = want_high ? t->scl_fall_ns : t->scl_rise_ns;
-+	u32 extra_cycles = (u32)div_u64((u64)clk_khz * extra_ns, 1000000);
-+	u32 period = div_u64((u64)clk_khz * 1000 + wanted_speed - 1, wanted_speed);
-+	u32 cycles = (period + want_high)/2 - extra_cycles;
-+
-+	if (cycles > 0xffff)
-+		cycles = 0xffff;
-+
-+	return (u16)cycles;
-+}
-+
- static int i2c_dw_set_timings_master(struct dw_i2c_dev *dev)
- {
- 	u32 comp_param1;
-@@ -44,6 +61,7 @@ static int i2c_dw_set_timings_master(str
- 	struct i2c_timings *t = &dev->timings;
- 	const char *fp_str = "";
- 	u32 ic_clk;
-+	u32 hcnt, lcnt;
- 	int ret;
- 
- 	ret = i2c_dw_acquire_lock(dev);
-@@ -59,6 +77,9 @@ static int i2c_dw_set_timings_master(str
- 	sda_falling_time = t->sda_fall_ns ?: 300; /* ns */
- 	scl_falling_time = t->scl_fall_ns ?: 300; /* ns */
- 
-+	hcnt = clock_calc(dev, true);
-+	lcnt = clock_calc(dev, false);
-+
- 	/* Calculate SCL timing parameters for standard mode if not set */
- 	if (!dev->ss_hcnt || !dev->ss_lcnt) {
- 		ic_clk = i2c_dw_clk_rate(dev);
-@@ -74,6 +95,8 @@ static int i2c_dw_set_timings_master(str
- 					scl_falling_time,
- 					0);	/* No offset */
- 	}
-+	dev->ss_hcnt = hcnt;
-+	dev->ss_lcnt = lcnt;
- 	dev_dbg(dev->dev, "Standard Mode HCNT:LCNT = %d:%d\n",
- 		dev->ss_hcnt, dev->ss_lcnt);
- 
-@@ -124,6 +147,8 @@ static int i2c_dw_set_timings_master(str
- 					scl_falling_time,
- 					0);	/* No offset */
- 	}
-+	dev->fs_hcnt = hcnt;
-+	dev->fs_lcnt = lcnt;
- 	dev_dbg(dev->dev, "Fast Mode%s HCNT:LCNT = %d:%d\n",
- 		fp_str, dev->fs_hcnt, dev->fs_lcnt);
- 
-@@ -152,6 +177,8 @@ static int i2c_dw_set_timings_master(str
- 						scl_falling_time,
- 						0);	/* No offset */
- 		}
-+		dev->hs_hcnt = hcnt;
-+		dev->hs_lcnt = lcnt;
- 		dev_dbg(dev->dev, "High Speed Mode HCNT:LCNT = %d:%d\n",
- 			dev->hs_hcnt, dev->hs_lcnt);
- 	}
diff --git a/target/linux/bcm27xx/patches-6.1/950-1258-i2c-designware-Support-non-standard-bus-speeds.patch b/target/linux/bcm27xx/patches-6.1/950-1258-i2c-designware-Support-non-standard-bus-speeds.patch
deleted file mode 100644
index fc24d508e0..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1258-i2c-designware-Support-non-standard-bus-speeds.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 6868dba87e2765042ac376a4a8427b9b981cd410 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 16 Jan 2024 16:03:14 +0000
-Subject: [PATCH 1258/1295] i2c: designware: Support non-standard bus speeds
-
-Add support for non-standard bus speeds by treating them as detuned
-versions of the slowest standard speed not less than the requested
-speed.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/i2c/busses/i2c-designware-common.c | 27 ++++++++++++++++++++++
- drivers/i2c/busses/i2c-designware-core.h   |  1 +
- drivers/i2c/busses/i2c-designware-master.c |  2 +-
- 3 files changed, 29 insertions(+), 1 deletion(-)
-
---- a/drivers/i2c/busses/i2c-designware-common.c
-+++ b/drivers/i2c/busses/i2c-designware-common.c
-@@ -318,6 +318,9 @@ void i2c_dw_adjust_bus_speed(struct dw_i
- {
- 	u32 acpi_speed = i2c_dw_acpi_round_bus_speed(dev->dev);
- 	struct i2c_timings *t = &dev->timings;
-+	u32 wanted_speed;
-+	u32 legal_speed = 0;
-+	int i;
- 
- 	/*
- 	 * Find bus speed from the "clock-frequency" device property, ACPI
-@@ -329,6 +332,30 @@ void i2c_dw_adjust_bus_speed(struct dw_i
- 		t->bus_freq_hz = max(t->bus_freq_hz, acpi_speed);
- 	else
- 		t->bus_freq_hz = I2C_MAX_FAST_MODE_FREQ;
-+
-+	wanted_speed = t->bus_freq_hz;
-+
-+	/* For unsupported speeds, scale down the lowest speed which is faster. */
-+	for (i = 0; i < ARRAY_SIZE(supported_speeds); i++) {
-+		/* supported speeds is in decreasing order */
-+		if (wanted_speed == supported_speeds[i]) {
-+			legal_speed = 0;
-+			break;
-+		}
-+		if (wanted_speed > supported_speeds[i])
-+			break;
-+
-+		legal_speed = supported_speeds[i];
-+	}
-+
-+	if (legal_speed) {
-+		/*
-+		 * Pretend this was the requested speed, but preserve the preferred
-+		 * speed so the clock counts can be scaled.
-+		 */
-+		t->bus_freq_hz = legal_speed;
-+		dev->wanted_bus_speed = wanted_speed;
-+	}
- }
- EXPORT_SYMBOL_GPL(i2c_dw_adjust_bus_speed);
- 
---- a/drivers/i2c/busses/i2c-designware-core.h
-+++ b/drivers/i2c/busses/i2c-designware-core.h
-@@ -287,6 +287,7 @@ struct dw_i2c_dev {
- 	u16			fp_lcnt;
- 	u16			hs_hcnt;
- 	u16			hs_lcnt;
-+	u32			wanted_bus_speed;
- 	int			(*acquire_lock)(void);
- 	void			(*release_lock)(void);
- 	int			semaphore_idx;
---- a/drivers/i2c/busses/i2c-designware-master.c
-+++ b/drivers/i2c/busses/i2c-designware-master.c
-@@ -41,7 +41,7 @@ static void i2c_dw_configure_fifo_master
- static u16 clock_calc(struct dw_i2c_dev *dev, bool want_high)
- {
- 	struct i2c_timings *t = &dev->timings;
--	u32 wanted_speed = t->bus_freq_hz;
-+	u32 wanted_speed = dev->wanted_bus_speed ?: t->bus_freq_hz;
- 	u32 clk_khz = i2c_dw_clk_rate(dev);
- 	u32 extra_ns = want_high ? t->scl_fall_ns : t->scl_rise_ns;
- 	u32 extra_cycles = (u32)div_u64((u64)clk_khz * extra_ns, 1000000);
diff --git a/target/linux/bcm27xx/patches-6.1/950-1259-ARM-dts-rp1-Add-I2C-timings.patch b/target/linux/bcm27xx/patches-6.1/950-1259-ARM-dts-rp1-Add-I2C-timings.patch
deleted file mode 100644
index adf7cc25bc..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1259-ARM-dts-rp1-Add-I2C-timings.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 4c7a8e9e40d915c61df188d6b9f82836b616bd4f Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Tue, 16 Jan 2024 16:05:18 +0000
-Subject: [PATCH 1259/1295] ARM: dts: rp1: Add I2C timings
-
-Add SCL rise and fall times, to allow the derivation of timings at
-arbitrary speeds.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/rp1.dtsi | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
---- a/arch/arm/boot/dts/rp1.dtsi
-+++ b/arch/arm/boot/dts/rp1.dtsi
-@@ -305,6 +305,8 @@
- 			compatible = "snps,designware-i2c";
- 			interrupts = <RP1_INT_I2C0 IRQ_TYPE_LEVEL_HIGH>;
- 			clocks = <&rp1_clocks RP1_CLK_SYS>;
-+			i2c-scl-rising-time-ns = <65>;
-+			i2c-scl-falling-time-ns = <100>;
- 			status = "disabled";
- 		};
- 
-@@ -313,6 +315,8 @@
- 			compatible = "snps,designware-i2c";
- 			interrupts = <RP1_INT_I2C1 IRQ_TYPE_LEVEL_HIGH>;
- 			clocks = <&rp1_clocks RP1_CLK_SYS>;
-+			i2c-scl-rising-time-ns = <65>;
-+			i2c-scl-falling-time-ns = <100>;
- 			status = "disabled";
- 		};
- 
-@@ -321,6 +325,8 @@
- 			compatible = "snps,designware-i2c";
- 			interrupts = <RP1_INT_I2C2 IRQ_TYPE_LEVEL_HIGH>;
- 			clocks = <&rp1_clocks RP1_CLK_SYS>;
-+			i2c-scl-rising-time-ns = <65>;
-+			i2c-scl-falling-time-ns = <100>;
- 			status = "disabled";
- 		};
- 
-@@ -329,6 +335,8 @@
- 			compatible = "snps,designware-i2c";
- 			interrupts = <RP1_INT_I2C3 IRQ_TYPE_LEVEL_HIGH>;
- 			clocks = <&rp1_clocks RP1_CLK_SYS>;
-+			i2c-scl-rising-time-ns = <65>;
-+			i2c-scl-falling-time-ns = <100>;
- 			status = "disabled";
- 		};
- 
-@@ -337,6 +345,8 @@
- 			compatible = "snps,designware-i2c";
- 			interrupts = <RP1_INT_I2C4 IRQ_TYPE_LEVEL_HIGH>;
- 			clocks = <&rp1_clocks RP1_CLK_SYS>;
-+			i2c-scl-rising-time-ns = <65>;
-+			i2c-scl-falling-time-ns = <100>;
- 			status = "disabled";
- 		};
- 
-@@ -345,6 +355,8 @@
- 			compatible = "snps,designware-i2c";
- 			interrupts = <RP1_INT_I2C5 IRQ_TYPE_LEVEL_HIGH>;
- 			clocks = <&rp1_clocks RP1_CLK_SYS>;
-+			i2c-scl-rising-time-ns = <65>;
-+			i2c-scl-falling-time-ns = <100>;
- 			status = "disabled";
- 		};
- 
-@@ -353,6 +365,8 @@
- 			compatible = "snps,designware-i2c";
- 			interrupts = <RP1_INT_I2C6 IRQ_TYPE_LEVEL_HIGH>;
- 			clocks = <&rp1_clocks RP1_CLK_SYS>;
-+			i2c-scl-rising-time-ns = <65>;
-+			i2c-scl-falling-time-ns = <100>;
- 			status = "disabled";
- 		};
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1260-iommu-bcm2712-don-t-allow-building-as-module.patch b/target/linux/bcm27xx/patches-6.1/950-1260-iommu-bcm2712-don-t-allow-building-as-module.patch
deleted file mode 100644
index 98790267f6..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1260-iommu-bcm2712-don-t-allow-building-as-module.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 86450c7dc4df99c3b16677cb00c2d3caf01a40f6 Mon Sep 17 00:00:00 2001
-From: Ratchanan Srirattanamet <peathot@hotmail.com>
-Date: Tue, 30 Jan 2024 14:09:00 +0700
-Subject: [PATCH 1260/1295] iommu/bcm2712: don't allow building as module
-
-Since bcm2712-iommu{,-cache}.c doesn't have usual module descriptors
-such as `MODULE_LICENSE`, configuring this as 'M' fails the build with
-`ERROR: modpost: missing MODULE_LICENSE() in <...>/bcm2712-iommu.o`.
-Since it seems like the code is not intended to be built as a module
-anyway (it registers the driver with `builtin_platform_driver()`), don't
-allow building this code as a module.
-
-Signed-off-by: Ratchanan Srirattanamet <peathot@hotmail.com>
----
- drivers/iommu/Kconfig | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/iommu/Kconfig
-+++ b/drivers/iommu/Kconfig
-@@ -507,7 +507,7 @@ config SPRD_IOMMU
- 	  Say Y here if you want to use the multimedia devices listed above.
- 
- config BCM2712_IOMMU
--       tristate "BCM2712 IOMMU driver"
-+       bool "BCM2712 IOMMU driver"
-        depends on ARM64 && ARCH_BCM
-        select IOMMU_API
-        help
diff --git a/target/linux/bcm27xx/patches-6.1/950-1261-drm-rp1-depends-on-instead-of-select-MFD_RP1.patch b/target/linux/bcm27xx/patches-6.1/950-1261-drm-rp1-depends-on-instead-of-select-MFD_RP1.patch
deleted file mode 100644
index 9e6755b378..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1261-drm-rp1-depends-on-instead-of-select-MFD_RP1.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 57695002a68bdd4c077ea2173b64aeee6e1ef24f Mon Sep 17 00:00:00 2001
-From: Ratchanan Srirattanamet <peathot@hotmail.com>
-Date: Fri, 26 Jan 2024 18:49:42 +0700
-Subject: [PATCH 1261/1295] drm/rp1: depends on, instead of select, MFD_RP1
-
-According to kconfig-language.txt [1], select should be used only for
-"non-visible symbols ... and for symbols with no dependencies". Since
-MFD_RP1 both is visible and has a dependency, "select" should not be
-used and "depends on" should be used instead.
-
-In particular, this fixes the build of this kernel tree on NixOS, where
-its kernel config system will try to answer 'M' to as many config as
-possible.
-
-[1] https://www.kernel.org/doc/html/latest/kbuild/kconfig-language.html
-
-Signed-off-by: Ratchanan Srirattanamet <peathot@hotmail.com>
----
- drivers/gpu/drm/rp1/rp1-dpi/Kconfig | 3 +--
- drivers/gpu/drm/rp1/rp1-dsi/Kconfig | 3 +--
- drivers/gpu/drm/rp1/rp1-vec/Kconfig | 3 +--
- 3 files changed, 3 insertions(+), 6 deletions(-)
-
---- a/drivers/gpu/drm/rp1/rp1-dpi/Kconfig
-+++ b/drivers/gpu/drm/rp1/rp1-dpi/Kconfig
-@@ -1,8 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0-only
- config DRM_RP1_DPI
- 	tristate "DRM Support for RP1 DPI"
--	depends on DRM
--	select MFD_RP1
-+	depends on DRM && MFD_RP1
- 	select DRM_GEM_DMA_HELPER
- 	select DRM_KMS_HELPER
- 	select DRM_VRAM_HELPER
---- a/drivers/gpu/drm/rp1/rp1-dsi/Kconfig
-+++ b/drivers/gpu/drm/rp1/rp1-dsi/Kconfig
-@@ -1,8 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0-only
- config DRM_RP1_DSI
- 	tristate "DRM Support for RP1 DSI"
--	depends on DRM
--	select MFD_RP1
-+	depends on DRM && MFD_RP1
- 	select DRM_GEM_DMA_HELPER
- 	select DRM_KMS_HELPER
- 	select DRM_MIPI_DSI
---- a/drivers/gpu/drm/rp1/rp1-vec/Kconfig
-+++ b/drivers/gpu/drm/rp1/rp1-vec/Kconfig
-@@ -1,8 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0-only
- config DRM_RP1_VEC
- 	tristate "DRM Support for RP1 VEC"
--	depends on DRM
--	select MFD_RP1
-+	depends on DRM && MFD_RP1
- 	select DRM_GEM_DMA_HELPER
- 	select DRM_KMS_HELPER
- 	select DRM_VRAM_HELPER
diff --git a/target/linux/bcm27xx/patches-6.1/950-1262-Update-touch-PiTFT-overlays.patch b/target/linux/bcm27xx/patches-6.1/950-1262-Update-touch-PiTFT-overlays.patch
deleted file mode 100644
index 43c275fde1..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1262-Update-touch-PiTFT-overlays.patch
+++ /dev/null
@@ -1,435 +0,0 @@
-From 1c2a93ce0e1cf6d278cf565346183d7592cfbb24 Mon Sep 17 00:00:00 2001
-From: Melissa LeBlanc-Williams <melissa@adafruit.com>
-Date: Fri, 26 Jan 2024 14:41:42 -0800
-Subject: [PATCH 1262/1295] Update touch PiTFT overlays
-
-Expose the invert and swap touch parameters on 2.8" and 3.5" resistive touchscreens. Add
-the DRM parameter to the PiTFT 2.2" and 2.8" Capacitive overlay in the same
-way it is on the resistive overlays. Change the DRM driver to `adafruit,yx240qv29`
-because the rotations are consistent with the FBTFT Driver. Fix the override size parameters
-on the 2.8" capacitive PiTFT.
-
-Signed-off-by: Melissa LeBlanc-Williams <melissa@adafruit.com>
----
- arch/arm/boot/dts/overlays/README             |  20 +++
- .../arm/boot/dts/overlays/pitft22-overlay.dts | 102 +++++++-------
- .../overlays/pitft28-capacitive-overlay.dts   | 132 +++++++++---------
- .../overlays/pitft28-resistive-overlay.dts    |  12 +-
- .../overlays/pitft35-resistive-overlay.dts    |  10 +-
- 5 files changed, 156 insertions(+), 120 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -3526,6 +3526,10 @@ Params: speed                   Display
- 
-         debug                   Debug output level {0-7}
- 
-+        drm                     Force the use of the mi0283qt DRM driver (by
-+                                default the ili9340 framebuffer driver will
-+                                be used in preference if available)
-+
- 
- Name:   pitft28-capacitive
- Info:   Adafruit PiTFT 2.8" capacitive touch screen
-@@ -3538,6 +3542,10 @@ Params: speed                   Display
- 
-         debug                   Debug output level {0-7}
- 
-+        drm                     Force the use of the mi0283qt DRM driver (by
-+                                default the ili9340 framebuffer driver will
-+                                be used in preference if available)
-+
-         touch-sizex             Touchscreen size x (default 240)
- 
-         touch-sizey             Touchscreen size y (default 320)
-@@ -3564,6 +3572,12 @@ Params: speed                   Display
-                                 default the ili9340 framebuffer driver will
-                                 be used in preference if available)
- 
-+        touch-invx              Touchscreen inverted x axis
-+
-+        touch-invy              Touchscreen inverted y axis
-+
-+        touch-swapxy            Touchscreen swapped x y axis
-+
- 
- Name:   pitft35-resistive
- Info:   Adafruit PiTFT 3.5" resistive touch screen
-@@ -3580,6 +3594,12 @@ Params: speed                   Display
-                                 default the fb_hx8357d framebuffer driver will
-                                 be used in preference if available)
- 
-+        touch-invx              Touchscreen inverted x axis
-+
-+        touch-invy              Touchscreen inverted y axis
-+
-+        touch-swapxy            Touchscreen swapped x y axis
-+
- 
- Name:   pps-gpio
- Info:   Configures the pps-gpio (pulse-per-second time signal via GPIO).
---- a/arch/arm/boot/dts/overlays/pitft22-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/pitft22-overlay.dts
-@@ -7,63 +7,65 @@
- /plugin/;
- 
- / {
--        compatible = "brcm,bcm2835";
-+	compatible = "brcm,bcm2835";
- 
--        fragment@0 {
--                target = <&spidev0>;
--                __overlay__ {
--                        status = "disabled";
--                };
-+	fragment@0 {
-+		target = <&spidev0>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-         };
- 
--        fragment@1 {
--                target = <&spidev1>;
--                __overlay__ {
--                        status = "disabled";
--                };
--        };
--
--        fragment@2 {
--                target = <&gpio>;
--                __overlay__ {
--                        pitft_pins: pitft_pins {
--                                brcm,pins = <25>;
--                                brcm,function = <1>; /* out */
--                                brcm,pull = <0>; /* none */
--                        };
--                };
--        };
--
--        fragment@3 {
--                target = <&spi0>;
--                __overlay__ {
--                        /* needed to avoid dtc warning */
--                        #address-cells = <1>;
--                        #size-cells = <0>;
--                        status = "okay";
--
--                        pitft: pitft@0{
--                                compatible = "ilitek,ili9340";
--                                reg = <0>;
--                                pinctrl-names = "default";
--                                pinctrl-0 = <&pitft_pins>;
--
--                                spi-max-frequency = <32000000>;
--                                rotate = <90>;
--                                fps = <25>;
--                                bgr;
--                                buswidth = <8>;
--                                dc-gpios = <&gpio 25 0>;
--                                debug = <0>;
--                        };
--
--                };
--        };
--
--        __overrides__ {
--                speed =   <&pitft>,"spi-max-frequency:0";
--                rotate =  <&pitft>,"rotate:0";
--                fps =     <&pitft>,"fps:0";
--                debug =   <&pitft>,"debug:0";
--        };
-+	fragment@1 {
-+		target = <&spidev1>;
-+		__overlay__ {
-+			status = "disabled";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			pitft_pins: pitft_pins {
-+				brcm,pins = <25>;
-+				brcm,function = <1>; /* out */
-+				brcm,pull = <0>; /* none */
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			pitft: pitft@0{
-+				compatible = "ilitek,ili9340";
-+				reg = <0>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&pitft_pins>;
-+
-+				spi-max-frequency = <32000000>;
-+				rotate = <90>;
-+				fps = <25>;
-+				bgr;
-+				buswidth = <8>;
-+				dc-gpios = <&gpio 25 0>;
-+				debug = <0>;
-+			};
-+
-+		};
-+	};
-+
-+	__overrides__ {
-+		speed =   <&pitft>,"spi-max-frequency:0";
-+		rotate =  <&pitft>,"rotate:0", /* fbtft */
-+				<&pitft>,"rotation:0"; /* drm */
-+		fps =     <&pitft>,"fps:0";
-+		debug =   <&pitft>,"debug:0";
-+		drm =     <&pitft>,"compatible=adafruit,yx240qv29";
-+	};
- };
---- a/arch/arm/boot/dts/overlays/pitft28-capacitive-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/pitft28-capacitive-overlay.dts
-@@ -7,14 +7,14 @@
- /plugin/;
- 
- / {
--        compatible = "brcm,bcm2835";
-+	compatible = "brcm,bcm2835";
- 
--        fragment@0 {
--                target = <&spi0>;
--                __overlay__ {
--                        status = "okay";
--                };
--        };
-+	fragment@0 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
- 
- 	fragment@1 {
- 		target = <&spidev0>;
-@@ -23,69 +23,71 @@
- 		};
- 	};
- 
--        fragment@2 {
--                target = <&gpio>;
--                __overlay__ {
--                        pitft_pins: pitft_pins {
--                                brcm,pins = <24 25>;
--                                brcm,function = <0 1>; /* in out */
--                                brcm,pull = <2 0>; /* pullup none */
--                        };
--                };
--        };
--
--        fragment@3 {
--                target = <&spi0>;
--                __overlay__ {
--                        /* needed to avoid dtc warning */
--                        #address-cells = <1>;
--                        #size-cells = <0>;
--
--                        pitft: pitft@0{
--                                compatible = "ilitek,ili9340";
--                                reg = <0>;
--                                pinctrl-names = "default";
--                                pinctrl-0 = <&pitft_pins>;
--
--                                spi-max-frequency = <32000000>;
--                                rotate = <90>;
--                                fps = <25>;
--                                bgr;
--                                buswidth = <8>;
--                                dc-gpios = <&gpio 25 0>;
--                                debug = <0>;
--                        };
--                };
--        };
--
--        fragment@4 {
--                target = <&i2c1>;
--                __overlay__ {
--                        /* needed to avoid dtc warning */
--                        #address-cells = <1>;
--                        #size-cells = <0>;
--
--                        ft6236: ft6236@38 {
--                                compatible = "focaltech,ft6236";
--                                reg = <0x38>;
--
--                                interrupt-parent = <&gpio>;
--                                interrupts = <24 2>;
--                                touchscreen-size-x = <240>;
--                                touchscreen-size-y = <320>;
--                        };
--                };
--        };
--
--        __overrides__ {
--                speed =   <&pitft>,"spi-max-frequency:0";
--                rotate =  <&pitft>,"rotate:0";
--                fps =     <&pitft>,"fps:0";
--                debug =   <&pitft>,"debug:0";
--                touch-sizex = <&ft6236>,"touchscreen-size-x?";
--                touch-sizey = <&ft6236>,"touchscreen-size-y?";
--                touch-invx  = <&ft6236>,"touchscreen-inverted-x?";
--                touch-invy  = <&ft6236>,"touchscreen-inverted-y?";
--                touch-swapxy = <&ft6236>,"touchscreen-swapped-x-y?";
--        };
-+	fragment@2 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			pitft_pins: pitft_pins {
-+				brcm,pins = <24 25>;
-+				brcm,function = <0 1>; /* in out */
-+				brcm,pull = <2 0>; /* pullup none */
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&spi0>;
-+		__overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			pitft: pitft@0{
-+				compatible = "ilitek,ili9340";
-+				reg = <0>;
-+				pinctrl-names = "default";
-+				pinctrl-0 = <&pitft_pins>;
-+
-+				spi-max-frequency = <32000000>;
-+				rotate = <90>;
-+				fps = <25>;
-+				bgr;
-+				buswidth = <8>;
-+				dc-gpios = <&gpio 25 0>;
-+				debug = <0>;
-+			};
-+		};
-+	};
-+
-+	fragment@4 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			/* needed to avoid dtc warning */
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			ft6236: ft6236@38 {
-+				compatible = "focaltech,ft6236";
-+				reg = <0x38>;
-+
-+				interrupt-parent = <&gpio>;
-+				interrupts = <24 2>;
-+				touchscreen-size-x = <240>;
-+				touchscreen-size-y = <320>;
-+			};
-+		};
-+	};
-+
-+	__overrides__ {
-+		speed =   <&pitft>,"spi-max-frequency:0";
-+		rotate =  <&pitft>,"rotate:0", /* fbtft */
-+				<&pitft>,"rotation:0"; /* drm */
-+		fps =     <&pitft>,"fps:0";
-+		debug =   <&pitft>,"debug:0";
-+		drm =     <&pitft>,"compatible=adafruit,yx240qv29";
-+		touch-sizex = <&ft6236>,"touchscreen-size-x:0";
-+		touch-sizey = <&ft6236>,"touchscreen-size-y:0";
-+		touch-invx  = <&ft6236>,"touchscreen-inverted-x?";
-+		touch-invy  = <&ft6236>,"touchscreen-inverted-y?";
-+		touch-swapxy = <&ft6236>,"touchscreen-swapped-x-y?";
-+	};
- };
---- a/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts
-@@ -49,7 +49,7 @@
- 			#size-cells = <0>;
- 
- 			pitft: pitft@0{
--				compatible = "ilitek,ili9340", "multi-inno,mi0283qt";
-+				compatible = "ilitek,ili9340";
- 				reg = <0>;
- 				pinctrl-names = "default";
- 				pinctrl-0 = <&pitft_pins>;
-@@ -64,6 +64,9 @@
- 			};
- 
- 			pitft_ts@1 {
-+				/* needed to avoid dtc warning */
-+				#address-cells = <1>;
-+				#interrupt-cells = <1>;
- 				compatible = "st,stmpe610";
- 				reg = <1>;
- 
-@@ -72,7 +75,7 @@
- 				interrupt-parent = <&gpio>;
- 				interrupt-controller;
- 
--				stmpe_touchscreen {
-+				stmpe_touchscreen: stmpe_touchscreen {
- 					compatible = "st,stmpe-ts";
- 					st,sample-time = <4>;
- 					st,mod-12b = <1>;
-@@ -115,6 +118,9 @@
- 			  <&pitft>,"rotation:0"; /* drm */
- 		fps =     <&pitft>,"fps:0";
- 		debug =   <&pitft>,"debug:0";
--		drm =     <&pitft>,"compatible=multi-inno,mi0283qt";
-+		drm =     <&pitft>,"compatible=adafruit,yx240qv29";
-+		touch-invx  = <&stmpe_touchscreen>,"touchscreen-inverted-x?";
-+		touch-invy  = <&stmpe_touchscreen>,"touchscreen-inverted-y?";
-+		touch-swapxy = <&stmpe_touchscreen>,"touchscreen-swapped-x-y?";
- 	};
- };
---- a/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts
-@@ -49,7 +49,7 @@
- 			#size-cells = <0>;
- 
- 			pitft: pitft@0{
--				compatible = "himax,hx8357d", "adafruit,yx350hv15";
-+				compatible = "himax,hx8357d";
- 				reg = <0>;
- 				pinctrl-names = "default";
- 				pinctrl-0 = <&pitft_pins>;
-@@ -64,6 +64,9 @@
- 			};
- 
- 			pitft_ts@1 {
-+				/* needed to avoid dtc warning */
-+				#address-cells = <1>;
-+				#interrupt-cells = <1>;
- 				compatible = "st,stmpe610";
- 				reg = <1>;
- 
-@@ -72,7 +75,7 @@
- 				interrupt-parent = <&gpio>;
- 				interrupt-controller;
- 
--				stmpe_touchscreen {
-+				stmpe_touchscreen: stmpe_touchscreen {
- 					compatible = "st,stmpe-ts";
- 					st,sample-time = <4>;
- 					st,mod-12b = <1>;
-@@ -117,5 +120,8 @@
- 		debug =   <&pitft>,"debug:0";
- 		drm =     <&pitft>,"compatible=adafruit,yx350hv15",
- 			  <&pitft>,"backlight:0=",<&backlight>;
-+		touch-invx  = <&stmpe_touchscreen>,"touchscreen-inverted-x?";
-+		touch-invy  = <&stmpe_touchscreen>,"touchscreen-inverted-y?";
-+		touch-swapxy = <&stmpe_touchscreen>,"touchscreen-swapped-x-y?";
- 	};
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-1263-ARM-dts-rp1-Boost-the-I2C-drive-strength.patch b/target/linux/bcm27xx/patches-6.1/950-1263-ARM-dts-rp1-Boost-the-I2C-drive-strength.patch
deleted file mode 100644
index 55ce6523db..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1263-ARM-dts-rp1-Boost-the-I2C-drive-strength.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From ea9b088747d379256e2582dd5c29638bf4ff9928 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 31 Jan 2024 17:20:07 +0000
-Subject: [PATCH 1263/1295] ARM: dts: rp1: Boost the I2C drive strength
-
-Boosting the drive strength on I2C pins allows SCL to achieve safe
-voltage swings, even at 1MHz.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/rp1.dtsi | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
---- a/arch/arm/boot/dts/rp1.dtsi
-+++ b/arch/arm/boot/dts/rp1.dtsi
-@@ -650,66 +650,79 @@
- 			rp1_i2c4_34_35: rp1_i2c4_34_35 {
- 				function = "i2c4";
- 				pins = "gpio34", "gpio35";
-+				drive-strength = <12>;
- 				bias-pull-up;
- 			};
- 			rp1_i2c6_38_39: rp1_i2c6_38_39 {
- 				function = "i2c6";
- 				pins = "gpio38", "gpio39";
-+				drive-strength = <12>;
- 				bias-pull-up;
- 			};
- 			rp1_i2c4_40_41: rp1_i2c4_40_41 {
- 				function = "i2c4";
- 				pins = "gpio40", "gpio41";
-+				drive-strength = <12>;
- 				bias-pull-up;
- 			};
- 			rp1_i2c5_44_45: rp1_i2c5_44_45 {
- 				function = "i2c5";
- 				pins = "gpio44", "gpio45";
-+				drive-strength = <12>;
- 				bias-pull-up;
- 			};
- 			rp1_i2c0_0_1: rp1_i2c0_0_1 {
- 				function = "i2c0";
- 				pins = "gpio0", "gpio1";
-+				drive-strength = <12>;
- 				bias-pull-up;
- 			};
- 			rp1_i2c0_8_9: rp1_i2c0_8_9 {
- 				function = "i2c0";
- 				pins = "gpio8", "gpio9";
-+				drive-strength = <12>;
- 				bias-pull-up;
- 			};
- 			rp1_i2c1_2_3: rp1_i2c1_2_3 {
- 				function = "i2c1";
- 				pins = "gpio2", "gpio3";
-+				drive-strength = <12>;
- 				bias-pull-up;
- 			};
- 			rp1_i2c1_10_11: rp1_i2c1_10_11 {
- 				function = "i2c1";
- 				pins = "gpio10", "gpio11";
-+				drive-strength = <12>;
- 				bias-pull-up;
- 			};
- 			rp1_i2c2_4_5: rp1_i2c2_4_5 {
- 				function = "i2c2";
- 				pins = "gpio4", "gpio5";
-+				drive-strength = <12>;
- 				bias-pull-up;
- 			};
- 			rp1_i2c2_12_13: rp1_i2c2_12_13 {
- 				function = "i2c2";
- 				pins = "gpio12", "gpio13";
-+				drive-strength = <12>;
- 				bias-pull-up;
- 			};
- 			rp1_i2c3_6_7: rp1_i2c3_6_7 {
- 				function = "i2c3";
- 				pins = "gpio6", "gpio7";
-+				drive-strength = <12>;
- 				bias-pull-up;
- 			};
- 			rp1_i2c3_14_15: rp1_i2c3_14_15 {
- 				function = "i2c3";
- 				pins = "gpio14", "gpio15";
-+				drive-strength = <12>;
- 				bias-pull-up;
- 			};
- 			rp1_i2c3_22_23: rp1_i2c3_22_23 {
- 				function = "i2c3";
- 				pins = "gpio22", "gpio23";
-+				drive-strength = <12>;
- 				bias-pull-up;
- 			};
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1264-ARM-dts-rp1-Add-a-safe-I2C-SDA-hold-time.patch b/target/linux/bcm27xx/patches-6.1/950-1264-ARM-dts-rp1-Add-a-safe-I2C-SDA-hold-time.patch
deleted file mode 100644
index 7052239224..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1264-ARM-dts-rp1-Add-a-safe-I2C-SDA-hold-time.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 15dedc2ad5a9073b8639881680672214f605a5c6 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 31 Jan 2024 17:44:02 +0000
-Subject: [PATCH 1264/1295] ARM: dts: rp1: Add a safe I2C SDA hold time
-
-Failing to set a reasonable SDA hold time can cause SDA to change too
-close to the falling edge of SCL. 300ns is the recommended minimum
-interval between the two at 100kHz and 400kHz, and also seems to
-work at 1MHz, so use that.
-
-See: https://github.com/raspberrypi/linux/issues/5914
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/rp1.dtsi | 7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/arch/arm/boot/dts/rp1.dtsi
-+++ b/arch/arm/boot/dts/rp1.dtsi
-@@ -307,6 +307,7 @@
- 			clocks = <&rp1_clocks RP1_CLK_SYS>;
- 			i2c-scl-rising-time-ns = <65>;
- 			i2c-scl-falling-time-ns = <100>;
-+			i2c-sda-hold-time-ns = <300>;
- 			status = "disabled";
- 		};
- 
-@@ -317,6 +318,7 @@
- 			clocks = <&rp1_clocks RP1_CLK_SYS>;
- 			i2c-scl-rising-time-ns = <65>;
- 			i2c-scl-falling-time-ns = <100>;
-+			i2c-sda-hold-time-ns = <300>;
- 			status = "disabled";
- 		};
- 
-@@ -327,6 +329,7 @@
- 			clocks = <&rp1_clocks RP1_CLK_SYS>;
- 			i2c-scl-rising-time-ns = <65>;
- 			i2c-scl-falling-time-ns = <100>;
-+			i2c-sda-hold-time-ns = <300>;
- 			status = "disabled";
- 		};
- 
-@@ -337,6 +340,7 @@
- 			clocks = <&rp1_clocks RP1_CLK_SYS>;
- 			i2c-scl-rising-time-ns = <65>;
- 			i2c-scl-falling-time-ns = <100>;
-+			i2c-sda-hold-time-ns = <300>;
- 			status = "disabled";
- 		};
- 
-@@ -347,6 +351,7 @@
- 			clocks = <&rp1_clocks RP1_CLK_SYS>;
- 			i2c-scl-rising-time-ns = <65>;
- 			i2c-scl-falling-time-ns = <100>;
-+			i2c-sda-hold-time-ns = <300>;
- 			status = "disabled";
- 		};
- 
-@@ -357,6 +362,7 @@
- 			clocks = <&rp1_clocks RP1_CLK_SYS>;
- 			i2c-scl-rising-time-ns = <65>;
- 			i2c-scl-falling-time-ns = <100>;
-+			i2c-sda-hold-time-ns = <300>;
- 			status = "disabled";
- 		};
- 
-@@ -367,6 +373,7 @@
- 			clocks = <&rp1_clocks RP1_CLK_SYS>;
- 			i2c-scl-rising-time-ns = <65>;
- 			i2c-scl-falling-time-ns = <100>;
-+			i2c-sda-hold-time-ns = <300>;
- 			status = "disabled";
- 		};
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1265-ASoC-DACplus-fix-16bit-sample-support-in-clock-consu.patch b/target/linux/bcm27xx/patches-6.1/950-1265-ASoC-DACplus-fix-16bit-sample-support-in-clock-consu.patch
deleted file mode 100644
index ba1b3edda5..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1265-ASoC-DACplus-fix-16bit-sample-support-in-clock-consu.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 89bd4e64da3345c2764a42875b99c96fa8931967 Mon Sep 17 00:00:00 2001
-From: Joerg Schambacher <joerg@hifiberry.com>
-Date: Thu, 1 Feb 2024 17:32:44 +0100
-Subject: [PATCH 1265/1295] ASoC: DACplus - fix 16bit sample support in clock
- consumer mode
-
-The former code did not adjust the physical sample width when
-in clock consumer mode and has taken the fixed 32 bit default.
-This has caused the audio to be played at half its frequency due to
-the fixed bclk_ratio of 64.
-
-Signed-off-by: Joerg Schambacher <joerg@hifiberry.com>
----
- sound/soc/bcm/hifiberry_dacplus.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
---- a/sound/soc/bcm/hifiberry_dacplus.c
-+++ b/sound/soc/bcm/hifiberry_dacplus.c
-@@ -279,13 +279,11 @@ static int snd_rpi_hifiberry_dacplus_hw_
- 	int ret = 0;
- 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
- 	int channels = params_channels(params);
--	int width = 32;
-+	int width = snd_pcm_format_physical_width(params_format(params));
- 
- 	if (snd_rpi_hifiberry_is_dacpro) {
- 		struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
- 
--		width = snd_pcm_format_physical_width(params_format(params));
--
- 		snd_rpi_hifiberry_dacplus_set_sclk(component,
- 			params_rate(params));
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1266-ASoC-adds-support-for-AMP4-Pro-to-the-DAC-Plus-drive.patch b/target/linux/bcm27xx/patches-6.1/950-1266-ASoC-adds-support-for-AMP4-Pro-to-the-DAC-Plus-drive.patch
deleted file mode 100644
index 84251f2800..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1266-ASoC-adds-support-for-AMP4-Pro-to-the-DAC-Plus-drive.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From d58c054ba30b313bacbb7d19f559ecb4e3bb5c76 Mon Sep 17 00:00:00 2001
-From: Joerg Schambacher <joerg@hifiberry.com>
-Date: Fri, 19 Jan 2024 10:58:39 +0100
-Subject: [PATCH 1266/1295] ASoC: adds support for AMP4 Pro to the DAC Plus
- driver
-
-The AMP4 Pro is a I2S master mode capable amplifier with
-clean onboard clock generators.
-We can share the card driver between TAS575x amplifiers
-and the PCM512x DACs as they are SW compatible.
-From a HW perspective though we need to limit the sample
-rates to the standard audio rates to avoid running the
-onboard clocks through the PLL. Using the PLL would require
-even a different HW.
-DAI/stream name are also set accordingly to allow the user
-a convenient identification of the soundcard
-
-Needs the pcm512x driver with TAS575x support (already in
-upstream kernel).
-
-Signed-off-by: Joerg Schambacher <joerg@hifiberry.com>
----
- sound/soc/bcm/hifiberry_dacplus.c | 41 ++++++++++++++++++++++++++++---
- 1 file changed, 38 insertions(+), 3 deletions(-)
-
---- a/sound/soc/bcm/hifiberry_dacplus.c
-+++ b/sound/soc/bcm/hifiberry_dacplus.c
-@@ -58,10 +58,21 @@ static bool leds_off;
- static bool auto_mute;
- static int mute_ext_ctl;
- static int mute_ext;
-+static bool tas_device;
- static struct gpio_desc *snd_mute_gpio;
- static struct gpio_desc *snd_reset_gpio;
- static struct snd_soc_card snd_rpi_hifiberry_dacplus;
- 
-+static const u32 master_dai_rates[] = {
-+	44100, 48000, 88200, 96000,
-+	176400, 192000, 352800, 384000,
-+};
-+
-+static const struct snd_pcm_hw_constraint_list constraints_master = {
-+	.count = ARRAY_SIZE(master_dai_rates),
-+	.list  = master_dai_rates,
-+};
-+
- static int snd_rpi_hifiberry_dacplus_mute_set(int mute)
- {
- 	gpiod_set_value_cansleep(snd_mute_gpio, mute);
-@@ -197,8 +208,13 @@ static int snd_rpi_hifiberry_dacplus_ini
- 	if (snd_rpi_hifiberry_is_dacpro) {
- 		struct snd_soc_dai_link *dai = rtd->dai_link;
- 
--		dai->name = "HiFiBerry DAC+ Pro";
--		dai->stream_name = "HiFiBerry DAC+ Pro HiFi";
-+		if (tas_device) {
-+			dai->name = "HiFiBerry AMP4 Pro";
-+			dai->stream_name = "HiFiBerry AMP4 Pro HiFi";
-+		} else {
-+			dai->name = "HiFiBerry DAC+ Pro";
-+			dai->stream_name = "HiFiBerry DAC+ Pro HiFi";
-+		}
- 		dai->dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
- 			| SND_SOC_DAIFMT_CBM_CFM;
- 
-@@ -303,6 +319,18 @@ static int snd_rpi_hifiberry_dacplus_sta
- {
- 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
- 	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
-+	int ret;
-+
-+	if (tas_device && !slave) {
-+		ret = snd_pcm_hw_constraint_list(substream->runtime, 0,
-+					  SNDRV_PCM_HW_PARAM_RATE,
-+					  &constraints_master);
-+		if (ret < 0) {
-+			dev_err(rtd->card->dev,
-+				"Cannot apply constraints for sample rates\n");
-+			return ret;
-+		}
-+	}
- 
- 	if (auto_mute)
- 		gpiod_set_value_cansleep(snd_mute_gpio, 0);
-@@ -324,7 +352,7 @@ static void snd_rpi_hifiberry_dacplus_sh
- }
- 
- /* machine stream operations */
--static struct snd_soc_ops snd_rpi_hifiberry_dacplus_ops = {
-+static const struct snd_soc_ops snd_rpi_hifiberry_dacplus_ops = {
- 	.hw_params = snd_rpi_hifiberry_dacplus_hw_params,
- 	.startup = snd_rpi_hifiberry_dacplus_startup,
- 	.shutdown = snd_rpi_hifiberry_dacplus_shutdown,
-@@ -394,6 +422,7 @@ static int snd_rpi_hifiberry_dacplus_pro
- 	struct snd_soc_card *card = &snd_rpi_hifiberry_dacplus;
- 	int len;
- 	struct device_node *tpa_node;
-+	struct device_node *tas_node;
- 	struct property *tpa_prop;
- 	struct of_changeset ocs;
- 	struct property *pp;
-@@ -430,6 +459,12 @@ static int snd_rpi_hifiberry_dacplus_pro
- 		}
- 	}
- 
-+	tas_node = of_find_compatible_node(NULL, NULL, "ti,tas5756");
-+	if (tas_node) {
-+		tas_device = true;
-+		dev_info(&pdev->dev, "TAS5756 device found!\n");
-+	};
-+
- 	snd_rpi_hifiberry_dacplus.dev = &pdev->dev;
- 	if (pdev->dev.of_node) {
- 		struct device_node *i2s_node;
diff --git a/target/linux/bcm27xx/patches-6.1/950-1267-DT-overlays-adds-support-for-Hifiberry-AMP4-Pro.patch b/target/linux/bcm27xx/patches-6.1/950-1267-DT-overlays-adds-support-for-Hifiberry-AMP4-Pro.patch
deleted file mode 100644
index 49429bca06..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1267-DT-overlays-adds-support-for-Hifiberry-AMP4-Pro.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From 98ac9b84709dc01ee936b6fe79eaac5e3a4aa6e7 Mon Sep 17 00:00:00 2001
-From: Joerg Schambacher <joerg@hifiberry.com>
-Date: Fri, 19 Jan 2024 10:44:22 +0100
-Subject: [PATCH 1267/1295] DT-overlays: adds support for Hifiberry AMP4 Pro
-
-The AMP4 Pro uses a TI TAS5756 amplifier in master mode
-and requires the DAC Plus card driver and the
-pcm512x component driver with TAS support.
-
-Signed-off-by: Joerg Schambacher <joerg@hifiberry.com>
----
- arch/arm/boot/dts/overlays/Makefile           |  1 +
- arch/arm/boot/dts/overlays/README             | 28 +++++++++
- .../overlays/hifiberry-amp4pro-overlay.dts    | 63 +++++++++++++++++++
- 3 files changed, 92 insertions(+)
- create mode 100644 arch/arm/boot/dts/overlays/hifiberry-amp4pro-overlay.dts
-
---- a/arch/arm/boot/dts/overlays/Makefile
-+++ b/arch/arm/boot/dts/overlays/Makefile
-@@ -86,6 +86,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
- 	hifiberry-amp.dtbo \
- 	hifiberry-amp100.dtbo \
- 	hifiberry-amp3.dtbo \
-+	hifiberry-amp4pro.dtbo \
- 	hifiberry-dac.dtbo \
- 	hifiberry-dacplus.dtbo \
- 	hifiberry-dacplusadc.dtbo \
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -1738,6 +1738,34 @@ Load:   dtoverlay=hifiberry-amp3
- Params: <None>
- 
- 
-+Name:   hifiberry-amp4pro
-+Info:   Configures the HifiBerry AMP4 Pro audio card
-+Load:   dtoverlay=hifiberry-amp4pro,<param>=<val>
-+Params: 24db_digital_gain       Allow gain to be applied via the TAS5756
-+                                Digital volume control. Enable with
-+                                "dtoverlay=hifiberry-amp4pro,24db_digital_gain"
-+                                (The default behaviour is that the Digital
-+                                volume control is limited to a maximum of
-+                                0dB. ie. it can attenuate but not provide
-+                                gain. For most users, this will be desired
-+                                as it will prevent clipping. By appending
-+                                the 24dB_digital_gain parameter, the Digital
-+                                volume control will allow up to 24dB of
-+                                gain. If this parameter is enabled, it is the
-+                                responsibility of the user to ensure that
-+                                the Digital volume control is set to a value
-+                                that does not result in clipping/distortion!)
-+        slave                   Force the amp into slave mode, using Pi as
-+                                master for bit clock and frame clock.
-+        leds_off                If set to 'true' the onboard indicator LEDs
-+                                are switched off at all times.
-+        auto_mute               If set to 'true' the amplifier is automatically
-+                                muted when it is not playing.
-+        mute_ext_ctl            The amplifier's HW mute control is enabled
-+                                in ALSA mixer and set to <val>.
-+                                Will be overwritten by ALSA user settings.
-+
-+
- Name:   hifiberry-dac
- Info:   Configures the HifiBerry DAC audio cards
- Load:   dtoverlay=hifiberry-dac
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/hifiberry-amp4pro-overlay.dts
-@@ -0,0 +1,63 @@
-+// Definitions for HiFiBerry AMP4PRO
-+/dts-v1/;
-+/plugin/;
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target-path = "/";
-+		__overlay__ {
-+			dacpro_osc: dacpro_osc {
-+				compatible = "hifiberry,dacpro-clk";
-+				#clock-cells = <0>;
-+			};
-+		};
-+	};
-+
-+	frag1: fragment@1 {
-+		target = <&i2s_clk_consumer>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			tas5756@4d {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,tas5756";
-+				reg = <0x4d>;
-+				clocks = <&dacpro_osc>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&sound>;
-+		hifiberry_dacplus: __overlay__ {
-+			compatible = "hifiberry,hifiberry-dacplus";
-+			i2s-controller = <&i2s_clk_consumer>;
-+			status = "okay";
-+			mute-gpio = <&gpio 4 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+
-+	__overrides__ {
-+		24db_digital_gain =
-+			<&hifiberry_dacplus>,"hifiberry-amp4,24db_digital_gain?";
-+		leds_off = <&hifiberry_dacplus>,"hifiberry-amp4,leds_off?";
-+		mute_ext_ctl = <&hifiberry_dacplus>,"hifiberry-amp4,mute_ext_ctl:0";
-+		auto_mute = <&hifiberry_dacplus>,"hifiberry-amp4,auto_mute?";
-+		slave = <&hifiberry_dacplus>,"hifiberry-dacplus,slave?",
-+			<&frag1>,"target:0=",<&i2s_clk_producer>,
-+			<&hifiberry_dacplus>,"i2s-controller:0=",<&i2s_clk_producer>;
-+	};
-+};
diff --git a/target/linux/bcm27xx/patches-6.1/950-1268-ASoC-DACplusADCPro-fix-16bit-sample-support-in-clock.patch b/target/linux/bcm27xx/patches-6.1/950-1268-ASoC-DACplusADCPro-fix-16bit-sample-support-in-clock.patch
deleted file mode 100644
index f608e5ee7d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1268-ASoC-DACplusADCPro-fix-16bit-sample-support-in-clock.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From ba86793796525f8276fafbaf9d31d5156a2cfcb5 Mon Sep 17 00:00:00 2001
-From: Joerg Schambacher <joerg@hifiberry.com>
-Date: Fri, 2 Feb 2024 08:51:06 +0100
-Subject: [PATCH 1268/1295] ASoC: DACplusADCPro - fix 16bit sample support in
- clock consumer mode
-
-The former code did not adjust the physical sample width when in
-clock consumer mode and has taken the fixed 32 bit default. This
-has caused the audio to be played at half its frequency due to
-the fixed bclk_ratio of 64.
-
-Problem appears only on PI5 as on the former PIs the I2S module
-did simply run at fixed 64x rate.
-
-Signed-off-by: Joerg Schambacher <joerg@hifiberry.com>
----
- sound/soc/bcm/hifiberry_dacplusadcpro.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
---- a/sound/soc/bcm/hifiberry_dacplusadcpro.c
-+++ b/sound/soc/bcm/hifiberry_dacplusadcpro.c
-@@ -383,15 +383,13 @@ static int snd_rpi_hifiberry_dacplusadcp
- 	int ret = 0;
- 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
- 	int channels = params_channels(params);
--	int width = 32;
-+	int width = snd_pcm_format_physical_width(params_format(params));
- 	struct snd_soc_component *dac = asoc_rtd_to_codec(rtd, 0)->component;
- 	struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0);
- 	struct snd_soc_dai_driver *drv = dai->driver;
- 	const struct snd_soc_dai_ops *ops = drv->ops;
- 
- 	if (snd_rpi_hifiberry_is_dacpro) {
--		width = snd_pcm_format_physical_width(params_format(params));
--
- 		snd_rpi_hifiberry_dacplusadcpro_set_sclk(dac,
- 			params_rate(params));
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1269-overlays-Correct-some-compatible-strings.patch b/target/linux/bcm27xx/patches-6.1/950-1269-overlays-Correct-some-compatible-strings.patch
deleted file mode 100644
index f29e20d7bf..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1269-overlays-Correct-some-compatible-strings.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 707f6e221946ec2025e8f0e2fedf92016ed8a5b7 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Fri, 2 Feb 2024 14:08:14 +0000
-Subject: [PATCH 1269/1295] overlays: Correct some compatible strings
-
-More thorough overlay testing has identified some Pi 4-specific
-overlays that has "brcm,bcm2835" compatible strings. Correct them.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/midi-uart2-overlay.dts  | 2 +-
- arch/arm/boot/dts/overlays/midi-uart3-overlay.dts  | 2 +-
- arch/arm/boot/dts/overlays/midi-uart4-overlay.dts  | 2 +-
- arch/arm/boot/dts/overlays/midi-uart5-overlay.dts  | 2 +-
- arch/arm/boot/dts/overlays/ramoops-pi4-overlay.dts | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/midi-uart2-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/midi-uart2-overlay.dts
-@@ -12,7 +12,7 @@
-  */
- 
- /{
--        compatible = "brcm,bcm2835";
-+        compatible = "brcm,bcm2711";
- 
-         fragment@0 {
-                 target-path = "/";
---- a/arch/arm/boot/dts/overlays/midi-uart3-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/midi-uart3-overlay.dts
-@@ -12,7 +12,7 @@
-  */
- 
- /{
--        compatible = "brcm,bcm2835";
-+        compatible = "brcm,bcm2711";
- 
-         fragment@0 {
-                 target-path = "/";
---- a/arch/arm/boot/dts/overlays/midi-uart4-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/midi-uart4-overlay.dts
-@@ -12,7 +12,7 @@
-  */
- 
- /{
--        compatible = "brcm,bcm2835";
-+        compatible = "brcm,bcm2711";
- 
-         fragment@0 {
-                 target-path = "/";
---- a/arch/arm/boot/dts/overlays/midi-uart5-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/midi-uart5-overlay.dts
-@@ -12,7 +12,7 @@
-  */
- 
- /{
--        compatible = "brcm,bcm2835";
-+        compatible = "brcm,bcm2711";
- 
-         fragment@0 {
-                 target-path = "/";
---- a/arch/arm/boot/dts/overlays/ramoops-pi4-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/ramoops-pi4-overlay.dts
-@@ -2,7 +2,7 @@
- /plugin/;
- 
- / {
--	compatible = "brcm,bcm2835";
-+	compatible = "brcm,bcm2711";
- 
- 	fragment@0 {
- 		target = <&rmem>;
diff --git a/target/linux/bcm27xx/patches-6.1/950-1270-overlays-Delete-deprecated-overlay-mpu6050.patch b/target/linux/bcm27xx/patches-6.1/950-1270-overlays-Delete-deprecated-overlay-mpu6050.patch
deleted file mode 100644
index 3f1864f4ec..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1270-overlays-Delete-deprecated-overlay-mpu6050.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 223d1247c0b0c0659a65949b6b9c3de53fd14223 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Fri, 2 Feb 2024 14:14:47 +0000
-Subject: [PATCH 1270/1295] overlays: Delete deprecated overlay mpu6050
-
-The mpu6050 overlay has been deprecated for a year (when we were still
-shipping rpi-5.15.y). Delete it.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/Makefile           |  1 -
- .../arm/boot/dts/overlays/mpu6050-overlay.dts | 29 -------------------
- 2 files changed, 30 deletions(-)
- delete mode 100644 arch/arm/boot/dts/overlays/mpu6050-overlay.dts
-
---- a/arch/arm/boot/dts/overlays/Makefile
-+++ b/arch/arm/boot/dts/overlays/Makefile
-@@ -172,7 +172,6 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
- 	mipi-dbi-spi.dtbo \
- 	mlx90640.dtbo \
- 	mmc.dtbo \
--	mpu6050.dtbo \
- 	mz61581.dtbo \
- 	ov2311.dtbo \
- 	ov5647.dtbo \
---- a/arch/arm/boot/dts/overlays/mpu6050-overlay.dts
-+++ /dev/null
-@@ -1,29 +0,0 @@
--// Definitions for MPU6050
--/dts-v1/;
--/plugin/;
--
--/ {
--        compatible = "brcm,bcm2835";
--
--        fragment@0 {
--                target = <&i2c1>;
--                __overlay__ {
--                        #address-cells = <1>;
--                        #size-cells = <0>;
--                        status = "okay";
--                        clock-frequency = <400000>;
--
--                        mpu6050: mpu6050@68 {
--                                compatible = "invensense,mpu6050";
--                                reg = <0x68>;
--                                interrupt-parent = <&gpio>;
--                                interrupts = <4 1>;
--                        };
--                };
--        };
--
--        __overrides__ {
--                interrupt = <&mpu6050>,"interrupts:0";
--                addr = <&mpu6050>,"reg:0";
--        };
--};
diff --git a/target/linux/bcm27xx/patches-6.1/950-1271-drivers-media-cfe-Increase-default-size-of-embedded-.patch b/target/linux/bcm27xx/patches-6.1/950-1271-drivers-media-cfe-Increase-default-size-of-embedded-.patch
deleted file mode 100644
index 90cfdc4ebe..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1271-drivers-media-cfe-Increase-default-size-of-embedded-.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From beba81b0b77268f72d717ab8ec98afe11a176ee0 Mon Sep 17 00:00:00 2001
-From: Naushir Patuck <naush@raspberrypi.com>
-Date: Mon, 5 Feb 2024 12:12:17 +0000
-Subject: [PATCH 1271/1295] drivers: media: cfe: Increase default size of
- embedded buffer
-
-Increase the size of the default embedded buffer to 16k. This is done to
-match what is advertised by the IMX219 driver and workaround a problem
-where the embedded stream is not actually used. Without full streams API
-support, the media pipeline validation will fail in these circumstances.
-
-Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
----
- drivers/media/platform/raspberrypi/rp1_cfe/cfe.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-+++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
-@@ -93,7 +93,7 @@ MODULE_PARM_DESC(verbose_debug, "verbose
- #define MIN_WIDTH 16
- #define MIN_HEIGHT 16
- /* Default size of the embedded buffer */
--#define DEFAULT_EMBEDDED_SIZE 8192
-+#define DEFAULT_EMBEDDED_SIZE 16384
- 
- const struct v4l2_mbus_framefmt cfe_default_format = {
- 	.width = 640,
-@@ -107,7 +107,7 @@ const struct v4l2_mbus_framefmt cfe_defa
- };
- 
- const struct v4l2_mbus_framefmt cfe_default_meta_format = {
--	.width = 8192,
-+	.width = DEFAULT_EMBEDDED_SIZE,
- 	.height = 1,
- 	.code = MEDIA_BUS_FMT_SENSOR_DATA,
- 	.field = V4L2_FIELD_NONE,
diff --git a/target/linux/bcm27xx/patches-6.1/950-1274-serial-sc16is7xx-Don-t-spin-if-no-data-received.patch b/target/linux/bcm27xx/patches-6.1/950-1274-serial-sc16is7xx-Don-t-spin-if-no-data-received.patch
deleted file mode 100644
index e469b44880..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1274-serial-sc16is7xx-Don-t-spin-if-no-data-received.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 58c600f728f2787e905eff2f678fa9cf09694004 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Fri, 2 Feb 2024 15:41:29 +0000
-Subject: [PATCH 1274/1295] serial: sc16is7xx: Don't spin if no data received
-
-There are multiple causes of interrupts, errors being one, and only the
-receipt of data warrants continued polling.
-
-See: https://github.com/raspberrypi/linux/issues/2676
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/tty/serial/sc16is7xx.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/tty/serial/sc16is7xx.c
-+++ b/drivers/tty/serial/sc16is7xx.c
-@@ -762,6 +762,8 @@ static bool sc16is7xx_port_irq(struct sc
- 
- 		if (rxlen)
- 			sc16is7xx_handle_rx(port, rxlen, iir);
-+		else
-+			rc = false;
- 		break;
- 		/* CTSRTS interrupt comes only when CTS goes inactive */
- 	case SC16IS7XX_IIR_CTSRTS_SRC:
diff --git a/target/linux/bcm27xx/patches-6.1/950-1276-Impliment-driver-support-for-Interlude-Audio-Digital.patch b/target/linux/bcm27xx/patches-6.1/950-1276-Impliment-driver-support-for-Interlude-Audio-Digital.patch
deleted file mode 100644
index ff638aed61..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1276-Impliment-driver-support-for-Interlude-Audio-Digital.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-From fb21611efd7cd916646d9ab2988c3af08f139761 Mon Sep 17 00:00:00 2001
-From: Ben Payne <ben@bluerocksoft.com>
-Date: Tue, 13 Feb 2024 14:55:14 -0800
-Subject: [PATCH 1276/1295] Impliment driver support for Interlude Audio
- Digital Hat
-
-Implementing driver support for
-Interlude audio's WM8805 based digital hat
-by leveraging existing drivers
----
- sound/soc/bcm/rpi-wm8804-soundcard.c | 139 +++++++++++++++++++++++++++
- 1 file changed, 139 insertions(+)
-
---- a/sound/soc/bcm/rpi-wm8804-soundcard.c
-+++ b/sound/soc/bcm/rpi-wm8804-soundcard.c
-@@ -34,6 +34,7 @@
- #include <linux/gpio/consumer.h>
- #include <linux/platform_device.h>
- #include <linux/module.h>
-+#include <linux/delay.h>
- 
- #include <sound/core.h>
- #include <sound/pcm.h>
-@@ -65,6 +66,10 @@ struct snd_rpi_wm8804_drvdata {
- static struct gpio_desc *snd_clk44gpio;
- static struct gpio_desc *snd_clk48gpio;
- static int wm8804_samplerate = 0;
-+static struct gpio_desc *led_gpio_1;
-+static struct gpio_desc *led_gpio_2;
-+static struct gpio_desc *led_gpio_3;
-+static struct gpio_desc *custom_reset;
- 
- /* Forward declarations */
- static struct snd_soc_dai_link snd_allo_digione_dai[];
-@@ -74,6 +79,37 @@ static struct snd_soc_card snd_rpi_wm880
- #define CLK_44EN_RATE 22579200UL
- #define CLK_48EN_RATE 24576000UL
- 
-+static const char * const wm8805_input_select_text[] = {
-+	"Rx 0",
-+	"Rx 1",
-+	"Rx 2",
-+	"Rx 3",
-+	"Rx 4",
-+	"Rx 5",
-+	"Rx 6",
-+	"Rx 7"
-+};
-+
-+static const unsigned int wm8805_input_channel_select_value[] = {
-+	0, 1, 2, 3, 4, 5, 6, 7
-+};
-+
-+static const struct soc_enum wm8805_input_channel_sel[] = {
-+	SOC_VALUE_ENUM_SINGLE(WM8804_PLL6, 0, 7, ARRAY_SIZE(wm8805_input_select_text),
-+	wm8805_input_select_text, wm8805_input_channel_select_value),
-+};
-+
-+static const struct snd_kcontrol_new wm8805_input_controls_card[] = {
-+	SOC_ENUM("Select Input Channel", wm8805_input_channel_sel[0]),
-+};
-+
-+static int wm8805_add_input_controls(struct snd_soc_component *component)
-+{
-+	snd_soc_add_component_controls(component, wm8805_input_controls_card,
-+	ARRAY_SIZE(wm8805_input_controls_card));
-+	return 0;
-+}
-+
- static unsigned int snd_rpi_wm8804_enable_clock(unsigned int samplerate)
- {
- 	switch (samplerate) {
-@@ -187,6 +223,53 @@ static struct snd_soc_ops snd_rpi_wm8804
- 	.hw_params = snd_rpi_wm8804_hw_params,
- };
- 
-+static int snd_interlude_audio_hw_params(struct snd_pcm_substream *substream,
-+		struct snd_pcm_hw_params *params)
-+{
-+	int ret = snd_rpi_wm8804_hw_params(substream, params);
-+	int samplerate = params_rate(params);
-+
-+	switch (samplerate) {
-+	case 44100:
-+		gpiod_set_value_cansleep(led_gpio_1, 1);
-+		gpiod_set_value_cansleep(led_gpio_2, 0);
-+		gpiod_set_value_cansleep(led_gpio_3, 0);
-+		break;
-+	case 48000:
-+		gpiod_set_value_cansleep(led_gpio_1, 1);
-+		gpiod_set_value_cansleep(led_gpio_2, 0);
-+		gpiod_set_value_cansleep(led_gpio_3, 0);
-+		break;
-+	case 88200:
-+		gpiod_set_value_cansleep(led_gpio_1, 0);
-+		gpiod_set_value_cansleep(led_gpio_2, 1);
-+		gpiod_set_value_cansleep(led_gpio_3, 0);
-+		break;
-+	case 96000:
-+		gpiod_set_value_cansleep(led_gpio_1, 0);
-+		gpiod_set_value_cansleep(led_gpio_2, 1);
-+		gpiod_set_value_cansleep(led_gpio_3, 0);
-+		break;
-+	case 176400:
-+		gpiod_set_value_cansleep(led_gpio_1, 0);
-+		gpiod_set_value_cansleep(led_gpio_2, 0);
-+		gpiod_set_value_cansleep(led_gpio_3, 1);
-+		break;
-+	case 192000:
-+		gpiod_set_value_cansleep(led_gpio_1, 0);
-+		gpiod_set_value_cansleep(led_gpio_2, 0);
-+		gpiod_set_value_cansleep(led_gpio_3, 1);
-+		break;
-+	default:
-+		break;
-+	}
-+	return ret;
-+}
-+
-+const struct snd_soc_ops interlude_audio_digital_dai_ops = {
-+	.hw_params = snd_interlude_audio_hw_params,
-+};
-+
- SND_SOC_DAILINK_DEFS(justboom_digi,
- 	DAILINK_COMP_ARRAY(COMP_EMPTY()),
- 	DAILINK_COMP_ARRAY(COMP_EMPTY()),
-@@ -287,6 +370,60 @@ static struct snd_rpi_wm8804_drvdata drv
- 	.probe     = snd_hifiberry_digi_probe,
- };
- 
-+SND_SOC_DAILINK_DEFS(interlude_audio_digital,
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()),
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()),
-+	DAILINK_COMP_ARRAY(COMP_EMPTY()));
-+
-+static int snd_interlude_audio_init(struct snd_soc_pcm_runtime *rtd)
-+{
-+	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
-+	int ret;
-+
-+	ret = wm8805_add_input_controls(component);
-+	if (ret != 0)
-+		pr_err("failed to add input controls");
-+
-+	return 0;
-+}
-+
-+
-+static struct snd_soc_dai_link snd_interlude_audio_digital_dai[] = {
-+{
-+	.name        = "Interlude Audio Digital",
-+	.stream_name = "Interlude Audio Digital HiFi",
-+	.init        = snd_interlude_audio_init,
-+	.ops		 = &interlude_audio_digital_dai_ops,
-+	SND_SOC_DAILINK_REG(interlude_audio_digital),
-+},
-+};
-+
-+
-+static int snd_interlude_audio_digital_probe(struct platform_device *pdev)
-+{
-+	if (IS_ERR(snd_clk44gpio) || IS_ERR(snd_clk48gpio))
-+		return 0;
-+
-+	custom_reset = devm_gpiod_get(&pdev->dev, "reset", GPIOD_OUT_LOW);
-+	gpiod_set_value_cansleep(custom_reset, 0);
-+	mdelay(10);
-+	gpiod_set_value_cansleep(custom_reset, 1);
-+
-+	snd_interlude_audio_digital_dai->name = "Interlude Audio Digital";
-+	snd_interlude_audio_digital_dai->stream_name = "Interlude Audio Digital HiFi";
-+	led_gpio_1 = devm_gpiod_get(&pdev->dev, "led1", GPIOD_OUT_LOW);
-+	led_gpio_2 = devm_gpiod_get(&pdev->dev, "led2", GPIOD_OUT_LOW);
-+	led_gpio_3 = devm_gpiod_get(&pdev->dev, "led3", GPIOD_OUT_LOW);
-+	return 0;
-+}
-+
-+
-+static struct snd_rpi_wm8804_drvdata drvdata_interlude_audio_digital = {
-+	.card_name = "snd_IA_Digital_Hat",
-+	.dai       = snd_interlude_audio_digital_dai,
-+	.probe     = snd_interlude_audio_digital_probe,
-+};
-+
- static const struct of_device_id snd_rpi_wm8804_of_match[] = {
- 	{ .compatible = "justboom,justboom-digi",
- 		.data = (void *) &drvdata_justboom_digi },
-@@ -296,6 +433,8 @@ static const struct of_device_id snd_rpi
- 		.data = (void *) &drvdata_allo_digione },
- 	{ .compatible = "hifiberry,hifiberry-digi",
- 		.data = (void *) &drvdata_hifiberry_digi },
-+	{ .compatible = "interludeaudio,interludeaudio-digital",
-+		.data = (void *) &drvdata_interlude_audio_digital },
- 	{},
- };
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1277-Add-overlays-needed-for-Interlude-Audio-Digital-and-.patch b/target/linux/bcm27xx/patches-6.1/950-1277-Add-overlays-needed-for-Interlude-Audio-Digital-and-.patch
deleted file mode 100644
index 2c4196ad4d..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1277-Add-overlays-needed-for-Interlude-Audio-Digital-and-.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-From d787ecf50d7a6ec32f8e1afcb8559600396c0f45 Mon Sep 17 00:00:00 2001
-From: Ben Payne <ben@bluerocksoft.com>
-Date: Tue, 13 Feb 2024 14:56:28 -0800
-Subject: [PATCH 1277/1295] Add overlays needed for Interlude Audio Digital and
- Analog hats
-
-Adding 2 new overlays for use with
-Interlude Audio's Digital and Analog hats
-adding descriptions for both in README
-adding changes to Makefile to include both DT's
----
- arch/arm/boot/dts/overlays/Makefile           |  2 +
- arch/arm/boot/dts/overlays/README             | 12 +++
- .../interludeaudio-analog-overlay.dts         | 73 +++++++++++++++++++
- .../interludeaudio-digital-overlay.dts        | 49 +++++++++++++
- 4 files changed, 136 insertions(+)
- create mode 100644 arch/arm/boot/dts/overlays/interludeaudio-analog-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/interludeaudio-digital-overlay.dts
-
---- a/arch/arm/boot/dts/overlays/Makefile
-+++ b/arch/arm/boot/dts/overlays/Makefile
-@@ -131,6 +131,8 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
- 	imx477.dtbo \
- 	imx519.dtbo \
- 	imx708.dtbo \
-+	interludeaudio-analog.dtbo \
-+	interludeaudio-digital.dtbo \
- 	iqaudio-codec.dtbo \
- 	iqaudio-dac.dtbo \
- 	iqaudio-dacplus.dtbo \
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -2708,6 +2708,18 @@ Params: rotation                Mounting
-                                 450000000 (default), 447000000, 453000000.
- 
- 
-+Name:   interludeaudio-analog
-+Info:   Configures Interlude Audio Analog Hat audio card
-+Load:   dtoverlay=interludeaudio-analog,<param>=<val>
-+Params: gpiopin                 GPIO pin for codec reset
-+
-+
-+Name:   interludeaudio-digital
-+Info:   Configures Interlude Audio Digital Hat audio card
-+Load:   dtoverlay=interludeaudio-digital
-+Params: <None>
-+
-+
- Name:   iqaudio-codec
- Info:   Configures the IQaudio Codec audio card
- Load:   dtoverlay=iqaudio-codec
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/interludeaudio-analog-overlay.dts
-@@ -0,0 +1,73 @@
-+// Definitions for Interlude audio analog hat
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "simple-audio-card";
-+			i2s-controller = <&i2s_clk_consumer>;
-+			status = "okay";
-+
-+			simple-audio-card,name = "snd_IA_Analog_Hat";
-+
-+			simple-audio-card,widgets =
-+				"Line", "Line In",
-+				"Line", "Line Out";
-+
-+			simple-audio-card,routing =
-+				"Line Out","AOUTA+",
-+				"Line Out","AOUTA-",
-+				"Line Out","AOUTB+",
-+				"Line Out","AOUTB-",
-+				"AINA","Line In",
-+				"AINB","Line In";
-+
-+			simple-audio-card,format = "i2s";
-+
-+			simple-audio-card,bitclock-master = <&sound_master>;
-+			simple-audio-card,frame-master = <&sound_master>;
-+
-+			simple-audio-card,cpu {
-+				sound-dai = <&i2s>;
-+				dai-tdm-slot-num = <2>;
-+				dai-tdm-slot-width = <32>;
-+			};
-+
-+			sound_master: simple-audio-card,codec {
-+				sound-dai = <&cs4271>;
-+				system-clock-frequency = <24576000>;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2s_clk_consumer>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			cs4271: cs4271@10 {
-+				#sound-dai-cells = <0>;
-+				compatible = "cirrus,cs4271";
-+				reg = <0x10>;
-+				status = "okay";
-+				reset-gpio = <&gpio 24 0>; /* Pin 26, active high */
-+			};
-+		};
-+	};
-+	__overrides__ {
-+		gpiopin = <&cs4271>,"reset-gpio:4";
-+	};
-+};
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/interludeaudio-digital-overlay.dts
-@@ -0,0 +1,49 @@
-+// Definitions for Interlude Audio Digital Hat
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target = <&i2s_clk_consumer>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			wm8804@3b {
-+				#sound-dai-cells = <0>;
-+				compatible = "wlf,wm8804";
-+				reg = <0x3b>;
-+				PVDD-supply = <&vdd_3v3_reg>;
-+				DVDD-supply = <&vdd_3v3_reg>;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+
-+	fragment@2 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "interludeaudio,interludeaudio-digital";
-+			i2s-controller = <&i2s_clk_consumer>;
-+			status = "okay";
-+			clock44-gpio = <&gpio 22 0>;
-+			clock48-gpio = <&gpio 27 0>;
-+			led1-gpio = <&gpio 13 0>;
-+			led2-gpio = <&gpio 12 0>;
-+			led3-gpio = <&gpio 6 0>;
-+			reset-gpio = <&gpio 23 0>;
-+		};
-+	};
-+
-+};
diff --git a/target/linux/bcm27xx/patches-6.1/950-1279-drm-v3d-Enable-V3D-to-use-different-PAGE_SIZE.patch b/target/linux/bcm27xx/patches-6.1/950-1279-drm-v3d-Enable-V3D-to-use-different-PAGE_SIZE.patch
deleted file mode 100644
index 39d4ce9067..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1279-drm-v3d-Enable-V3D-to-use-different-PAGE_SIZE.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From eb06d31da3e2025a2e578d8de9843e24b68137a6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ma=C3=ADra=20Canal?= <mcanal@igalia.com>
-Date: Tue, 13 Feb 2024 15:26:44 -0300
-Subject: [PATCH 1279/1295] drm/v3d: Enable V3D to use different PAGE_SIZE
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Currently, the V3D driver uses PAGE_SHIFT over the assumption that
-PAGE_SHIFT = 12, as the PAGE_SIZE = 4KB. But, the RPi 5 is using
-PAGE_SIZE = 16KB, so the MMU PAGE_SHIFT is different than the system's
-PAGE_SHIFT.
-
-Enable V3D to be used in system's with any PAGE_SIZE by making sure that
-everything MMU-related uses the MMU page shift.
-
-Signed-off-by: Maíra Canal <mcanal@igalia.com>
----
- drivers/gpu/drm/v3d/v3d_bo.c      | 12 ++++++------
- drivers/gpu/drm/v3d/v3d_debugfs.c |  2 +-
- drivers/gpu/drm/v3d/v3d_drv.h     |  2 ++
- drivers/gpu/drm/v3d/v3d_irq.c     |  2 +-
- drivers/gpu/drm/v3d/v3d_mmu.c     |  2 --
- 5 files changed, 10 insertions(+), 10 deletions(-)
-
---- a/drivers/gpu/drm/v3d/v3d_bo.c
-+++ b/drivers/gpu/drm/v3d/v3d_bo.c
-@@ -37,7 +37,7 @@ void v3d_free_object(struct drm_gem_obje
- 
- 	mutex_lock(&v3d->bo_lock);
- 	v3d->bo_stats.num_allocated--;
--	v3d->bo_stats.pages_allocated -= obj->size >> PAGE_SHIFT;
-+	v3d->bo_stats.pages_allocated -= obj->size >> V3D_MMU_PAGE_SHIFT;
- 	mutex_unlock(&v3d->bo_lock);
- 
- 	spin_lock(&v3d->mm_lock);
-@@ -106,8 +106,8 @@ v3d_bo_create_finish(struct drm_gem_obje
- 	 * lifetime of the BO.
- 	 */
- 	ret = drm_mm_insert_node_generic(&v3d->mm, &bo->node,
--					 obj->size >> PAGE_SHIFT,
--					 GMP_GRANULARITY >> PAGE_SHIFT, 0, 0);
-+					 obj->size >> V3D_MMU_PAGE_SHIFT,
-+					 GMP_GRANULARITY >> V3D_MMU_PAGE_SHIFT, 0, 0);
- 	spin_unlock(&v3d->mm_lock);
- 	if (ret)
- 		return ret;
-@@ -115,7 +115,7 @@ v3d_bo_create_finish(struct drm_gem_obje
- 	/* Track stats for /debug/dri/n/bo_stats. */
- 	mutex_lock(&v3d->bo_lock);
- 	v3d->bo_stats.num_allocated++;
--	v3d->bo_stats.pages_allocated += obj->size >> PAGE_SHIFT;
-+	v3d->bo_stats.pages_allocated += obj->size >> V3D_MMU_PAGE_SHIFT;
- 	mutex_unlock(&v3d->bo_lock);
- 
- 	v3d_mmu_insert_ptes(bo);
-@@ -183,7 +183,7 @@ int v3d_create_bo_ioctl(struct drm_devic
- 	if (IS_ERR(bo))
- 		return PTR_ERR(bo);
- 
--	args->offset = bo->node.start << PAGE_SHIFT;
-+	args->offset = bo->node.start << V3D_MMU_PAGE_SHIFT;
- 
- 	ret = drm_gem_handle_create(file_priv, &bo->base.base, &args->handle);
- 	drm_gem_object_put(&bo->base.base);
-@@ -228,7 +228,7 @@ int v3d_get_bo_offset_ioctl(struct drm_d
- 	}
- 	bo = to_v3d_bo(gem_obj);
- 
--	args->offset = bo->node.start << PAGE_SHIFT;
-+	args->offset = bo->node.start << V3D_MMU_PAGE_SHIFT;
- 
- 	drm_gem_object_put(gem_obj);
- 	return 0;
---- a/drivers/gpu/drm/v3d/v3d_debugfs.c
-+++ b/drivers/gpu/drm/v3d/v3d_debugfs.c
-@@ -220,7 +220,7 @@ static int v3d_debugfs_bo_stats(struct s
- 	seq_printf(m, "allocated bos:          %d\n",
- 		   v3d->bo_stats.num_allocated);
- 	seq_printf(m, "allocated bo size (kb): %ld\n",
--		   (long)v3d->bo_stats.pages_allocated << (PAGE_SHIFT - 10));
-+		   (long)v3d->bo_stats.pages_allocated << (V3D_MMU_PAGE_SHIFT - 10));
- 	mutex_unlock(&v3d->bo_lock);
- 
- 	return 0;
---- a/drivers/gpu/drm/v3d/v3d_drv.h
-+++ b/drivers/gpu/drm/v3d/v3d_drv.h
-@@ -19,6 +19,8 @@ struct reset_control;
- 
- #define GMP_GRANULARITY (128 * 1024)
- 
-+#define V3D_MMU_PAGE_SHIFT 12
-+
- #define V3D_MAX_QUEUES (V3D_CACHE_CLEAN + 1)
- 
- static inline char *
---- a/drivers/gpu/drm/v3d/v3d_irq.c
-+++ b/drivers/gpu/drm/v3d/v3d_irq.c
-@@ -70,7 +70,7 @@ v3d_overflow_mem_work(struct work_struct
- 	list_add_tail(&bo->unref_head, &v3d->bin_job->render->unref_list);
- 	spin_unlock_irqrestore(&v3d->job_lock, irqflags);
- 
--	V3D_CORE_WRITE(0, V3D_PTB_BPOA, bo->node.start << PAGE_SHIFT);
-+	V3D_CORE_WRITE(0, V3D_PTB_BPOA, bo->node.start << V3D_MMU_PAGE_SHIFT);
- 	V3D_CORE_WRITE(0, V3D_PTB_BPOS, obj->size);
- 
- out:
---- a/drivers/gpu/drm/v3d/v3d_mmu.c
-+++ b/drivers/gpu/drm/v3d/v3d_mmu.c
-@@ -21,8 +21,6 @@
- #include "v3d_drv.h"
- #include "v3d_regs.h"
- 
--#define V3D_MMU_PAGE_SHIFT 12
--
- /* Note: All PTEs for the 1MB superpage must be filled with the
-  * superpage bit set.
-  */
diff --git a/target/linux/bcm27xx/patches-6.1/950-1280-overlays-adau1977-adc-Replace-use-of-i2c-label.patch b/target/linux/bcm27xx/patches-6.1/950-1280-overlays-adau1977-adc-Replace-use-of-i2c-label.patch
deleted file mode 100644
index bb28d9369e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1280-overlays-adau1977-adc-Replace-use-of-i2c-label.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From aa00918b9562daa3b776600f48d8264b20fd54f6 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Sun, 18 Feb 2024 15:31:50 +0000
-Subject: [PATCH 1280/1295] overlays: adau1977-adc: Replace use of i2c label
-
-The label 'i2c' is no longer created by the firmware - i2c_arm or
-i2c1 should be used instead. Replace the last occurrence of &i2c with
-&i2c1.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts
-@@ -6,7 +6,7 @@
- 	compatible = "brcm,bcm2835";
-     
- 	fragment@0 {
--        	target = <&i2c>;
-+		target = <&i2c1>;
-         	
- 		__overlay__ {
- 			#address-cells = <1>;
diff --git a/target/linux/bcm27xx/patches-6.1/950-1281-Add-IQaudio-CodecZero-to-hat_map.dts.patch b/target/linux/bcm27xx/patches-6.1/950-1281-Add-IQaudio-CodecZero-to-hat_map.dts.patch
deleted file mode 100644
index 399c293e1f..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1281-Add-IQaudio-CodecZero-to-hat_map.dts.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From afd5f659b0453e4c710ce5cf74c577563ff16239 Mon Sep 17 00:00:00 2001
-From: Andrew Scheller <andrew.scheller@raspberrypi.com>
-Date: Tue, 20 Feb 2024 17:53:03 +0000
-Subject: [PATCH 1281/1295] Add IQaudio CodecZero to hat_map.dts
-
-Fixes https://github.com/raspberrypi/Pi-Codec/issues/9
----
- arch/arm/boot/dts/overlays/hat_map.dts | 5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/arch/arm/boot/dts/overlays/hat_map.dts
-+++ b/arch/arm/boot/dts/overlays/hat_map.dts
-@@ -6,6 +6,11 @@
- 		overlay = "iqaudio-codec";
- 	};
- 
-+	iqaudio-pi-codeczero {
-+		uuid = [ e15c739c 877d 4e29 ab36 4dc73c21127c ];
-+		overlay = "iqaudio-codec";
-+	};
-+
- 	pisound {
- 		uuid = [ a7ee5d28 da03 41f5 bbd7 20438a4bec5d ];
- 		overlay = "pisound";
diff --git a/target/linux/bcm27xx/patches-6.1/950-1282-ASOc-Add-HiFiBerry-DAC8X-to-the-simple-card-driver.patch b/target/linux/bcm27xx/patches-6.1/950-1282-ASOc-Add-HiFiBerry-DAC8X-to-the-simple-card-driver.patch
deleted file mode 100644
index dadd8123be..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1282-ASOc-Add-HiFiBerry-DAC8X-to-the-simple-card-driver.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From d4acd8b7ea890c01453cdcf9b04a999ca04dfd2a Mon Sep 17 00:00:00 2001
-From: j-schambacher <joerg@hifiberry.com>
-Date: Wed, 28 Feb 2024 11:25:14 +0100
-Subject: [PATCH 1282/1295] ASOc: Add HiFiBerry DAC8X to the simple card driver
-
-Defines the settings for the 8 channel version of the standard
-DAC by overwriting the number of channels in the DAI defs.
-It can run in 8ch mode only on PI5 using the 4 lane data output
-of the designware I2S0 module.
-
-Signed-off-by: j-schambacher <joerg@hifiberry.com>
----
- sound/soc/bcm/Kconfig                |  5 +++--
- sound/soc/bcm/rpi-simple-soundcard.c | 33 ++++++++++++++++++++++++++++
- 2 files changed, 36 insertions(+), 2 deletions(-)
-
---- a/sound/soc/bcm/Kconfig
-+++ b/sound/soc/bcm/Kconfig
-@@ -40,11 +40,12 @@ config SND_BCM2708_SOC_GOOGLEVOICEHAT_SO
-           Say Y or M if you want to add support for voiceHAT soundcard.
- 
- config SND_BCM2708_SOC_HIFIBERRY_DAC
--        tristate "Support for HifiBerry DAC"
-+        tristate "Support for HifiBerry DAC and DAC8X"
-         select SND_SOC_PCM5102A
-         select SND_RPI_SIMPLE_SOUNDCARD
-         help
--         Say Y or M if you want to add support for HifiBerry DAC.
-+         Say Y or M if you want to add support for HifiBerry DAC and DAC8X.
-+         Note: DAC8X only works on PI5
- 
- config SND_BCM2708_SOC_HIFIBERRY_DACPLUS
-         tristate "Support for HifiBerry DAC+"
---- a/sound/soc/bcm/rpi-simple-soundcard.c
-+++ b/sound/soc/bcm/rpi-simple-soundcard.c
-@@ -316,6 +316,37 @@ static struct snd_rpi_simple_drvdata drv
- 	.dai       = snd_hifiberry_dac_dai,
- };
- 
-+static int hifiberry_dac8x_init(struct snd_soc_pcm_runtime *rtd)
-+{
-+	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
-+
-+	/* override the defaults to reflect 4 x PCM5102A on the card
-+	 * and limit the sample rate to 192ksps
-+	 */
-+	codec_dai->driver->playback.channels_max = 8;
-+	codec_dai->driver->playback.rates = SNDRV_PCM_RATE_8000_192000;
-+
-+	return 0;
-+}
-+
-+static struct snd_soc_dai_link snd_hifiberry_dac8x_dai[] = {
-+	{
-+		.name           = "HifiBerry DAC8x",
-+		.stream_name    = "HifiBerry DAC8x HiFi",
-+		.dai_fmt        = SND_SOC_DAIFMT_I2S |
-+					SND_SOC_DAIFMT_NB_NF |
-+					SND_SOC_DAIFMT_CBS_CFS,
-+		.init           = hifiberry_dac8x_init,
-+		SND_SOC_DAILINK_REG(hifiberry_dac),
-+	},
-+};
-+
-+static struct snd_rpi_simple_drvdata drvdata_hifiberry_dac8x = {
-+	.card_name = "snd_rpi_hifiberry_dac8x",
-+	.dai       = snd_hifiberry_dac8x_dai,
-+	.fixed_bclk_ratio = 64,
-+};
-+
- SND_SOC_DAILINK_DEFS(dionaudio_kiwi,
- 	DAILINK_COMP_ARRAY(COMP_EMPTY()),
- 	DAILINK_COMP_ARRAY(COMP_CODEC("pcm1794a-codec", "pcm1794a-hifi")),
-@@ -417,6 +448,8 @@ static const struct of_device_id snd_rpi
- 		.data = (void *) &drvdata_hifiberry_amp3 },
- 	{ .compatible = "hifiberry,hifiberry-dac",
- 		.data = (void *) &drvdata_hifiberry_dac },
-+	{ .compatible = "hifiberry,hifiberry-dac8x",
-+		.data = (void *) &drvdata_hifiberry_dac8x },
- 	{ .compatible = "dionaudio,dionaudio-kiwi",
- 		.data = (void *) &drvdata_dionaudio_kiwi },
- 	{ .compatible = "rpi,rpi-dac", &drvdata_rpi_dac},
diff --git a/target/linux/bcm27xx/patches-6.1/950-1283-Overlays-Add-definitions-for-HiFiBerry-8-channel-DAC.patch b/target/linux/bcm27xx/patches-6.1/950-1283-Overlays-Add-definitions-for-HiFiBerry-8-channel-DAC.patch
deleted file mode 100644
index b383b744e7..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1283-Overlays-Add-definitions-for-HiFiBerry-8-channel-DAC.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 813135a7ff3f0c2b91dc06a5b3f8deac15570466 Mon Sep 17 00:00:00 2001
-From: j-schambacher <joerg@hifiberry.com>
-Date: Wed, 28 Feb 2024 11:34:05 +0100
-Subject: [PATCH 1283/1295] Overlays: Add definitions for HiFiBerry 8 channel
- DAC8X
-
-Dedicated overlay claiming all 4 data lanes of the designware
-I2S0 module to drive 4x PCM5102. THe devices share BCLK and
-LRCLK, therefore all outputs will always run at the same
-samplerate and format.
-
-Compatible only with PI5!
-
-Signed-off-by: j-schambacher <joerg@hifiberry.com>
----
- arch/arm/boot/dts/overlays/Makefile           |  1 +
- arch/arm/boot/dts/overlays/README             |  6 +++
- .../dts/overlays/hifiberry-dac8x-overlay.dts  | 50 +++++++++++++++++++
- arch/arm/boot/dts/overlays/overlay_map.dts    |  4 ++
- 4 files changed, 61 insertions(+)
- create mode 100644 arch/arm/boot/dts/overlays/hifiberry-dac8x-overlay.dts
-
---- a/arch/arm/boot/dts/overlays/Makefile
-+++ b/arch/arm/boot/dts/overlays/Makefile
-@@ -88,6 +88,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
- 	hifiberry-amp3.dtbo \
- 	hifiberry-amp4pro.dtbo \
- 	hifiberry-dac.dtbo \
-+	hifiberry-dac8x.dtbo \
- 	hifiberry-dacplus.dtbo \
- 	hifiberry-dacplusadc.dtbo \
- 	hifiberry-dacplusadcpro.dtbo \
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -1772,6 +1772,12 @@ Load:   dtoverlay=hifiberry-dac
- Params: <None>
- 
- 
-+Name:   hifiberry-dac8x
-+Info:   Configures the HifiBerry DAC8X audio cards (only on PI5)
-+Load:   dtoverlay=hifiberry-dac8x
-+Params: <None>
-+
-+
- Name:   hifiberry-dacplus
- Info:   Configures the HifiBerry DAC+ audio card
- Load:   dtoverlay=hifiberry-dacplus,<param>=<val>
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/hifiberry-dac8x-overlay.dts
-@@ -0,0 +1,50 @@
-+// Definitions for HiFiBerry DAC8x
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2712";
-+
-+	fragment@0 {
-+		target = <&gpio>;
-+		__overlay__ {
-+			rp1_i2s0_dac8x: rp1_i2s0_dac8x {
-+				function = "i2s0";
-+				pins = "gpio18", "gpio19", "gpio21",
-+				       "gpio23", "gpio25", "gpio27";
-+				bias-disable;
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2s_clk_producer>;
-+		__overlay__ {
-+			pinctrl-names = "default";
-+			pinctrl-0 = <&rp1_i2s0_dac8x>;
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target-path = "/";
-+		__overlay__ {
-+			pcm5102a-codec {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,pcm5102a";
-+				status = "okay";
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&sound>;
-+		__overlay__ {
-+			compatible = "hifiberry,hifiberry-dac8x";
-+			i2s-controller = <&i2s_clk_producer>;
-+			status = "okay";
-+		};
-+	};
-+
-+};
---- a/arch/arm/boot/dts/overlays/overlay_map.dts
-+++ b/arch/arm/boot/dts/overlays/overlay_map.dts
-@@ -48,6 +48,10 @@
- 		bcm2712;
- 	};
- 
-+	hifiberry-dac8x {
-+		bcm2712;
-+	};
-+
- 	highperi {
- 		bcm2711;
- 	};
diff --git a/target/linux/bcm27xx/patches-6.1/950-1285-vc4-hvs-Fix-lbm-size-calculation-for-yuv-6012.patch b/target/linux/bcm27xx/patches-6.1/950-1285-vc4-hvs-Fix-lbm-size-calculation-for-yuv-6012.patch
deleted file mode 100644
index cb4681909e..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1285-vc4-hvs-Fix-lbm-size-calculation-for-yuv-6012.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From c0169f2c197d005aff8acfbc618de6e7f6b1ab94 Mon Sep 17 00:00:00 2001
-From: Florian Wesch <fw@dividuum.de>
-Date: Tue, 5 Mar 2024 15:17:56 +0100
-Subject: [PATCH 1285/1295] vc4/hvs: Fix lbm size calculation for yuv (#6012)
-
-The code was reducing the number of components by one when we were not
-blending with alpha. But that only makes sense if the components include
-alpha.
-
-For YUV, we were reducing the number of components for Y from one to zero
-which resulted in no lbm space being allocated.
-
-Fixes: https://github.com/raspberrypi/linux/issues/5912
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
-Co-authored-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/gpu/drm/vc4/vc4_plane.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/vc4/vc4_plane.c
-+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -733,7 +733,7 @@ static unsigned int vc4_lbm_channel_size
- 	if (!components)
- 		return 0;
- 
--	if (state->alpha != DRM_BLEND_ALPHA_OPAQUE)
-+	if (state->alpha != DRM_BLEND_ALPHA_OPAQUE && info->has_alpha)
- 		components -= 1;
- 
- 	words = width * wpc * components;
diff --git a/target/linux/bcm27xx/patches-6.1/950-1286-Driver-add-waveshare-4inch-dsi-lcd-C-driver.patch b/target/linux/bcm27xx/patches-6.1/950-1286-Driver-add-waveshare-4inch-dsi-lcd-C-driver.patch
deleted file mode 100644
index 4bda41a791..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1286-Driver-add-waveshare-4inch-dsi-lcd-C-driver.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 50da59d237df59b38c5e3c375b3df8fabbda1069 Mon Sep 17 00:00:00 2001
-From: Eng33 <eng33@waveshare.net>
-Date: Fri, 8 Mar 2024 18:36:37 +0800
-Subject: [PATCH 1286/1295] Driver:add waveshare 4inch dsi lcd (C) driver
-
-Signed-off-by: Eng33 <eng33@waveshare.net>
----
- drivers/gpu/drm/panel/panel-waveshare-dsi.c | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
---- a/drivers/gpu/drm/panel/panel-waveshare-dsi.c
-+++ b/drivers/gpu/drm/panel/panel-waveshare-dsi.c
-@@ -138,6 +138,18 @@ static const struct drm_display_mode ws_
- 	.vtotal = 1480 + 60 + 60 + 60,
- };
- 
-+static const struct drm_display_mode ws_panel_4_mode = {
-+	.clock = 50000,
-+	.hdisplay = 720,
-+	.hsync_start = 720 + 32,
-+	.hsync_end = 720 + 32 + 200,
-+	.htotal = 720 + 32 + 200 + 120,
-+	.vdisplay = 720,
-+	.vsync_start = 720 + 8,
-+	.vsync_end = 720 + 8 + 4,
-+	.vtotal = 720 + 8 + 4 + 16,
-+};
-+
- static struct ws_panel *panel_to_ts(struct drm_panel *panel)
- {
- 	return container_of(panel, struct ws_panel, base);
-@@ -399,6 +411,9 @@ static const struct of_device_id ws_pane
- 		.compatible = "waveshare,11.9inch-panel",
- 		.data = &ws_panel_11_9_mode,
- 	}, {
-+		.compatible = "waveshare,4inch-panel",
-+		.data = &ws_panel_4_mode,
-+	}, {
- 		/* sentinel */
- 	}
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-1287-Dtoverlay-add-waveshare-4inch-dsi-lcd-C-dtoverlay.patch b/target/linux/bcm27xx/patches-6.1/950-1287-Dtoverlay-add-waveshare-4inch-dsi-lcd-C-dtoverlay.patch
deleted file mode 100644
index 605ad842cf..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1287-Dtoverlay-add-waveshare-4inch-dsi-lcd-C-dtoverlay.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From bb2f912c94d11a0f0b5f13c91793fa9f79eb92aa Mon Sep 17 00:00:00 2001
-From: Eng33 <eng33@waveshare.net>
-Date: Fri, 8 Mar 2024 18:37:03 +0800
-Subject: [PATCH 1287/1295] Dtoverlay:add waveshare 4inch dsi lcd (C) dtoverlay
-
-Signed-off-by: Eng33 <eng33@waveshare.net>
----
- .../boot/dts/overlays/vc4-kms-dsi-waveshare-panel-overlay.dts  | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/arch/arm/boot/dts/overlays/vc4-kms-dsi-waveshare-panel-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/vc4-kms-dsi-waveshare-panel-overlay.dts
-@@ -112,6 +112,9 @@
- 				   <&touch>, "touchscreen-size-y:0=1480",
- 				   <&touch>, "touchscreen-inverted-x?",
- 				   <&touch>, "touchscreen-swapped-x-y?";
-+		4_0_inchC = <&panel>, "compatible=waveshare,4inch-panel",
-+				   <&touch>, "touchscreen-size-x:0=720",
-+				   <&touch>, "touchscreen-size-y:0=720";
- 		i2c1 = <&i2c_frag>, "target:0=",<&i2c1>,
- 		       <0>, "-3-4+5";
- 		disable_touch = <&touch>, "status=disabled";
diff --git a/target/linux/bcm27xx/patches-6.1/950-1288-Dtoverlay-fix-waveshare-11.9inch-touch-orientation-e.patch b/target/linux/bcm27xx/patches-6.1/950-1288-Dtoverlay-fix-waveshare-11.9inch-touch-orientation-e.patch
deleted file mode 100644
index 868c162cc4..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1288-Dtoverlay-fix-waveshare-11.9inch-touch-orientation-e.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 29cc64d7d94f9a6ee0e97e8009b832514d2525e0 Mon Sep 17 00:00:00 2001
-From: Eng33 <eng33@waveshare.net>
-Date: Fri, 8 Mar 2024 18:38:33 +0800
-Subject: [PATCH 1288/1295] Dtoverlay:fix waveshare 11.9inch touch orientation
- error
-
-Signed-off-by: Eng33 <eng33@waveshare.net>
----
- .../boot/dts/overlays/vc4-kms-dsi-waveshare-panel-overlay.dts   | 2 --
- 1 file changed, 2 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/vc4-kms-dsi-waveshare-panel-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/vc4-kms-dsi-waveshare-panel-overlay.dts
-@@ -108,8 +108,6 @@
- 				   <&touch>, "touchscreen-inverted-x?",
- 				   <&touch>, "touchscreen-swapped-x-y?";
- 		11_9_inch = <&panel>, "compatible=waveshare,11.9inch-panel",
--				   <&touch>, "touchscreen-size-x:0=320",
--				   <&touch>, "touchscreen-size-y:0=1480",
- 				   <&touch>, "touchscreen-inverted-x?",
- 				   <&touch>, "touchscreen-swapped-x-y?";
- 		4_0_inchC = <&panel>, "compatible=waveshare,4inch-panel",
diff --git a/target/linux/bcm27xx/patches-6.1/950-1289-Dtoverlay-Add-waveshare-4inch-dsi-lcd-C-parameters-t.patch b/target/linux/bcm27xx/patches-6.1/950-1289-Dtoverlay-Add-waveshare-4inch-dsi-lcd-C-parameters-t.patch
deleted file mode 100644
index ea72100e52..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1289-Dtoverlay-Add-waveshare-4inch-dsi-lcd-C-parameters-t.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 8db8a2b856a24dd30b201c9af3238cedaf5f0c58 Mon Sep 17 00:00:00 2001
-From: Eng33 <eng33@waveshare.net>
-Date: Mon, 11 Mar 2024 10:00:23 +0800
-Subject: [PATCH 1289/1295] Dtoverlay:Add waveshare 4inch dsi lcd (C)
- parameters to the README
-
-Signed-off-by: Eng33 <eng33@waveshare.net>
----
- arch/arm/boot/dts/overlays/README | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -5011,6 +5011,7 @@ Load:   dtoverlay=vc4-kms-dsi-waveshare-
- Params: 2_8_inch                2.8" 480x640
-         3_4_inch                3.4" 800x800 round
-         4_0_inch                4.0" 480x800
-+        4_0_inchC               4.0" 720x720
-         7_0_inchC               7.0" C 1024x600
-         7_9_inch                7.9" 400x1280
-         8_0_inch                8.0" 1280x800
diff --git a/target/linux/bcm27xx/patches-6.1/950-1290-Overlays-Add-specific-clk-producer-consumer-overlays.patch b/target/linux/bcm27xx/patches-6.1/950-1290-Overlays-Add-specific-clk-producer-consumer-overlays.patch
deleted file mode 100644
index 477276a59a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1290-Overlays-Add-specific-clk-producer-consumer-overlays.patch
+++ /dev/null
@@ -1,223 +0,0 @@
-From 9e31e8ce44ef11cabcb1b95830e1fdd8a9655ad3 Mon Sep 17 00:00:00 2001
-From: j-schambacher <joerg@hifiberry.com>
-Date: Mon, 11 Mar 2024 15:32:28 +0100
-Subject: [PATCH 1290/1295] Overlays:Add specific clk-producer/-consumer
- overlays for Hifiberry DAC+
-
-As the easy switching of the I2S module bewteen clock producer/consumer
-on the PI5 is not possible, two specific DT-overlays are introduced.
-The DAC+PRO boards with onboard clocks use the -PRO overlay, the boards
-without oscillators the -STD version.
-The "hifiberry-dacplus,slave" parameter in the -STD overlay disables
-the automatic clock detection inside the hifiberry-dacplus driver.
-
-The former hifiberry-dacplus overlay is kept for compatibility but
-will be deprecated.
-
-Signed-off-by: j-schambacher <joerg@hifiberry.com>
----
- arch/arm/boot/dts/overlays/Makefile           |  2 +
- arch/arm/boot/dts/overlays/README             | 42 ++++++++++++
- .../hifiberry-dacplus-pro-overlay.dts         | 64 ++++++++++++++++++
- .../hifiberry-dacplus-std-overlay.dts         | 65 +++++++++++++++++++
- 4 files changed, 173 insertions(+)
- create mode 100644 arch/arm/boot/dts/overlays/hifiberry-dacplus-pro-overlay.dts
- create mode 100644 arch/arm/boot/dts/overlays/hifiberry-dacplus-std-overlay.dts
-
---- a/arch/arm/boot/dts/overlays/Makefile
-+++ b/arch/arm/boot/dts/overlays/Makefile
-@@ -90,6 +90,8 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
- 	hifiberry-dac.dtbo \
- 	hifiberry-dac8x.dtbo \
- 	hifiberry-dacplus.dtbo \
-+	hifiberry-dacplus-pro.dtbo \
-+	hifiberry-dacplus-std.dtbo \
- 	hifiberry-dacplusadc.dtbo \
- 	hifiberry-dacplusadcpro.dtbo \
- 	hifiberry-dacplusdsp.dtbo \
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -1801,6 +1801,48 @@ Params: 24db_digital_gain       Allow ga
-                                 are switched off at all times.
- 
- 
-+Name:   hifiberry-dacplus-pro
-+Info:   Configures the HifiBerry DAC+ PRO audio card (onboard clocks)
-+Load:   dtoverlay=hifiberry-dacplus-pro,<param>=<val>
-+Params: 24db_digital_gain       Allow gain to be applied via the PCM512x codec
-+                                Digital volume control. Enable with
-+                                "dtoverlay=hifiberry-dacplus,24db_digital_gain"
-+                                (The default behaviour is that the Digital
-+                                volume control is limited to a maximum of
-+                                0dB. ie. it can attenuate but not provide
-+                                gain. For most users, this will be desired
-+                                as it will prevent clipping. By appending
-+                                the 24dB_digital_gain parameter, the Digital
-+                                volume control will allow up to 24dB of
-+                                gain. If this parameter is enabled, it is the
-+                                responsibility of the user to ensure that
-+                                the Digital volume control is set to a value
-+                                that does not result in clipping/distortion!)
-+        leds_off                If set to 'true' the onboard indicator LEDs
-+                                are switched off at all times.
-+
-+
-+Name:   hifiberry-dacplus-std
-+Info:   Configures the HifiBerry DAC+ standard audio card (no onboard clocks)
-+Load:   dtoverlay=hifiberry-dacplus-std,<param>=<val>
-+Params: 24db_digital_gain       Allow gain to be applied via the PCM512x codec
-+                                Digital volume control. Enable with
-+                                "dtoverlay=hifiberry-dacplus,24db_digital_gain"
-+                                (The default behaviour is that the Digital
-+                                volume control is limited to a maximum of
-+                                0dB. ie. it can attenuate but not provide
-+                                gain. For most users, this will be desired
-+                                as it will prevent clipping. By appending
-+                                the 24dB_digital_gain parameter, the Digital
-+                                volume control will allow up to 24dB of
-+                                gain. If this parameter is enabled, it is the
-+                                responsibility of the user to ensure that
-+                                the Digital volume control is set to a value
-+                                that does not result in clipping/distortion!)
-+        leds_off                If set to 'true' the onboard indicator LEDs
-+                                are switched off at all times.
-+
-+
- Name:   hifiberry-dacplusadc
- Info:   Configures the HifiBerry DAC+ADC audio card
- Load:   dtoverlay=hifiberry-dacplusadc,<param>=<val>
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/hifiberry-dacplus-pro-overlay.dts
-@@ -0,0 +1,64 @@
-+// Definitions for HiFiBerry DAC+ PRO, with onboard clocks
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target-path = "/";
-+		__overlay__ {
-+			dacpro_osc: dacpro_osc {
-+				compatible = "hifiberry,dacpro-clk";
-+				#clock-cells = <0>;
-+			};
-+		};
-+	};
-+
-+	frag1: fragment@1 {
-+		target = <&i2s_clk_consumer>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			pcm5122@4d {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,pcm5122";
-+				reg = <0x4d>;
-+				clocks = <&dacpro_osc>;
-+				AVDD-supply = <&vdd_3v3_reg>;
-+				DVDD-supply = <&vdd_3v3_reg>;
-+				CPVDD-supply = <&vdd_3v3_reg>;
-+				status = "okay";
-+			};
-+			hpamp: hpamp@60 {
-+				compatible = "ti,tpa6130a2";
-+				reg = <0x60>;
-+				status = "disabled";
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&sound>;
-+		hifiberry_dacplus: __overlay__ {
-+			compatible = "hifiberry,hifiberry-dacplus";
-+			i2s-controller = <&i2s_clk_consumer>;
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		24db_digital_gain =
-+			<&hifiberry_dacplus>,"hifiberry,24db_digital_gain?";
-+		leds_off = <&hifiberry_dacplus>,"hifiberry-dacplus,leds_off?";
-+	};
-+};
---- /dev/null
-+++ b/arch/arm/boot/dts/overlays/hifiberry-dacplus-std-overlay.dts
-@@ -0,0 +1,65 @@
-+// Definitions for HiFiBerry DAC+ Standard w/o onboard clocks
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+	compatible = "brcm,bcm2835";
-+
-+	fragment@0 {
-+		target-path = "/";
-+		__overlay__ {
-+			dacpro_osc: dacpro_osc {
-+				compatible = "hifiberry,dacpro-clk";
-+				#clock-cells = <0>;
-+			};
-+		};
-+	};
-+
-+	fragment@1 {
-+		target = <&i2s_clk_producer>;
-+		__overlay__ {
-+			status = "okay";
-+		};
-+	};
-+
-+	fragment@2 {
-+		target = <&i2c1>;
-+		__overlay__ {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+			status = "okay";
-+
-+			pcm5122@4d {
-+				#sound-dai-cells = <0>;
-+				compatible = "ti,pcm5122";
-+				reg = <0x4d>;
-+				clocks = <&dacpro_osc>;
-+				AVDD-supply = <&vdd_3v3_reg>;
-+				DVDD-supply = <&vdd_3v3_reg>;
-+				CPVDD-supply = <&vdd_3v3_reg>;
-+				status = "okay";
-+			};
-+			hpamp: hpamp@60 {
-+				compatible = "ti,tpa6130a2";
-+				reg = <0x60>;
-+				status = "disabled";
-+			};
-+		};
-+	};
-+
-+	fragment@3 {
-+		target = <&sound>;
-+		hifiberry_dacplus: __overlay__ {
-+			compatible = "hifiberry,hifiberry-dacplus";
-+			i2s-controller = <&i2s_clk_producer>;
-+			hifiberry-dacplus,slave;
-+			status = "okay";
-+		};
-+	};
-+
-+	__overrides__ {
-+		24db_digital_gain =
-+			<&hifiberry_dacplus>,"hifiberry,24db_digital_gain?";
-+		leds_off = <&hifiberry_dacplus>,"hifiberry-dacplus,leds_off?";
-+	};
-+};
diff --git a/target/linux/bcm27xx/patches-6.1/950-1291-overlays-hat_map-Add-Hifiberry-cards.patch b/target/linux/bcm27xx/patches-6.1/950-1291-overlays-hat_map-Add-Hifiberry-cards.patch
deleted file mode 100644
index 2e25c3c302..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1291-overlays-hat_map-Add-Hifiberry-cards.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From fae2848e87c2696d1eeaeb3f449ad871874b699f Mon Sep 17 00:00:00 2001
-From: j-schambacher <joerg@hifiberry.com>
-Date: Tue, 12 Mar 2024 10:59:48 +0100
-Subject: [PATCH 1291/1295] overlays:hat_map: Add Hifiberry cards
-
-Adds all available Hifberry cards' UUIDs to the hat_map file.
-
-Signed-off-by: j-schambacher <joerg@hifiberry.com>
----
- arch/arm/boot/dts/overlays/hat_map.dts | 75 ++++++++++++++++++++++++++
- 1 file changed, 75 insertions(+)
-
---- a/arch/arm/boot/dts/overlays/hat_map.dts
-+++ b/arch/arm/boot/dts/overlays/hat_map.dts
-@@ -1,6 +1,81 @@
- /dts-v1/;
- 
- / {
-+	hifiberry-amp100-1 {
-+		uuid = [ 5eb863b8 12f9 41ad 978f 4cee1b3eca62 ];
-+		overlay = "hifiberry-amp100";
-+	};
-+
-+	hifiberry-amp100-2 {
-+		uuid = [ b1a57dbe 8b52 447f 939e 1baf72157d79 ];
-+		overlay = "hifiberry-amp100";
-+	};
-+
-+	hifiberry-amp4pro {
-+		uuid = [ 3619722a c92d 4092 95bd 493a2903e933 ];
-+		overlay = "hifiberry-amp4pro";
-+	};
-+
-+	hifiberry-amp4 {
-+		uuid = [ fcb6ec42 a182 419d a314 7eeae416f608 ];
-+		overlay = "hifiberry-dacplus-std";
-+	};
-+
-+	hifiberry-dac2proadc {
-+		uuid = [ 30660215 dbb2 4c57 953f 099370b63e2e ];
-+		overlay = "hifiberry-dacplusadcpro";
-+	};
-+
-+	hifiberry-dac2hd {
-+		uuid = [ 482ad277 5586 480c 88e7 85ae89c4e501 ];
-+		overlay = "hifiberry-dacplushd";
-+	};
-+
-+	hifiberry-dac2pro {
-+		uuid = [ ebf9cfc4 6d77 4880 89fd 353690467dfc ];
-+		overlay = "hifiberry-dacplus-pro";
-+	};
-+
-+	hifiberry-dac8x {
-+		uuid = [ f65985f9 5354 4457 ae3b 3da39ba2cf6d ];
-+		overlay = "hifiberry-dac8x";
-+	};
-+
-+	hifiberry-dacplus-amp2-1 {
-+		uuid = [ 81cac43d 27c6 4a1e a0b2 c70b4e608ab6 ];
-+		overlay = "hifiberry-dacplus-std";
-+	};
-+
-+	hifiberry-dacplus-amp2-2 {
-+		uuid = [ ef586afc 2efa 47a0 be2e 95a7d952fe98 ];
-+		overlay = "hifiberry-dacplus-std";
-+	};
-+
-+	hifiberry-digiplus-pro {
-+		uuid = [ 2154f80b 0f92 45e4 96db c1643ec2b46b ];
-+		overlay = "hifiberry-digi-pro";
-+	};
-+
-+	hifiberry-dacplusadcpro {
-+		uuid = [ 36e3d3da 1ed9 468b aea3 cd165f6820f0 ];
-+		overlay = "hifiberry-dacplusadcpro";
-+	};
-+
-+	hifiberry-digi2pro {
-+		uuid = [ 5af941bb 4dcf 4eac 82a8 e36e84fcabef ];
-+		overlay = "hifiberry-digi-pro";
-+	};
-+
-+	hifiberry-digi2standard {
-+		uuid = [ 7c980a0e 9d15 40af 9f40 bddfbd3aee8c ];
-+		overlay = "hifiberry-digi";
-+	};
-+
-+	hifiberry-dsp2x4 {
-+		uuid = [ 8f287583 429d 4206 a751 862264bbda63 ];
-+		overlay = "hifiberry-dacplus-dsp";
-+	};
-+
- 	iqaudio-pi-codecplus {
- 		uuid = [ dc1c9594 c1ab 4c6c acda a88dc59a3c5b ];
- 		overlay = "iqaudio-codec";
diff --git a/target/linux/bcm27xx/patches-6.1/950-1292-ASoC-Fix-16bit-sample-support-for-Hifiberry-DACplusA.patch b/target/linux/bcm27xx/patches-6.1/950-1292-ASoC-Fix-16bit-sample-support-for-Hifiberry-DACplusA.patch
deleted file mode 100644
index 95c954ab5c..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1292-ASoC-Fix-16bit-sample-support-for-Hifiberry-DACplusA.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f87bf7dfa65cce1d46800c0769351fef59abba55 Mon Sep 17 00:00:00 2001
-From: j-schambacher <joerg@hifiberry.com>
-Date: Wed, 13 Mar 2024 10:31:18 +0100
-Subject: [PATCH 1292/1295] ASoC: Fix 16bit sample support for Hifiberry
- DACplusADC
-
-Same issue as #5919.
-'width' needs to be set independent of clocking mode.
-
-Signed-off-by: j-schambacher <joerg@hifiberry.com>
----
- sound/soc/bcm/hifiberry_dacplusadc.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
---- a/sound/soc/bcm/hifiberry_dacplusadc.c
-+++ b/sound/soc/bcm/hifiberry_dacplusadc.c
-@@ -229,13 +229,11 @@ static int snd_rpi_hifiberry_dacplusadc_
- 	int ret = 0;
- 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
- 	int channels = params_channels(params);
--	int width = 32;
-+	int width = snd_pcm_format_width(params_format(params));
- 
- 	if (snd_rpi_hifiberry_is_dacpro) {
- 		struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
- 
--		width = snd_pcm_format_physical_width(params_format(params));
--
- 		snd_rpi_hifiberry_dacplusadc_set_sclk(component,
- 			params_rate(params));
- 
diff --git a/target/linux/bcm27xx/patches-6.1/950-1293-overlays-Sets-i2s_clk_producer-as-default-for-Hifibe.patch b/target/linux/bcm27xx/patches-6.1/950-1293-overlays-Sets-i2s_clk_producer-as-default-for-Hifibe.patch
deleted file mode 100644
index f1b39eb540..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1293-overlays-Sets-i2s_clk_producer-as-default-for-Hifibe.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 5d1972f99f893ac9394d2a795a3b21385b9e34a5 Mon Sep 17 00:00:00 2001
-From: j-schambacher <joerg@hifiberry.com>
-Date: Wed, 13 Mar 2024 10:11:27 +0100
-Subject: [PATCH 1293/1295] overlays: Sets i2s_clk_producer as default for
- Hifiberry DACplusADC
-
-As we have never released a (standard) DACplusADC board with onboard
-clocks, we can simply use a fixed setup avoiding incompatibilities
-with Pi5 during driver init. Setting 'hifiberry-dacplusadc,slave' in
-the overlays disables the failing clock probing mechanism.
-
-Removes 'slave' parameter description from README which is still
-supported but not needed.
-
-Signed-off-by: j-schambacher <joerg@hifiberry.com>
----
- arch/arm/boot/dts/overlays/README                    |  4 +---
- .../dts/overlays/hifiberry-dacplusadc-overlay.dts    | 12 +++++-------
- 2 files changed, 6 insertions(+), 10 deletions(-)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -1773,7 +1773,7 @@ Params: <None>
- 
- 
- Name:   hifiberry-dac8x
--Info:   Configures the HifiBerry DAC8X audio cards (only on PI5)
-+Info:   Configures the HifiBerry DAC8X audio cards (only on Pi5)
- Load:   dtoverlay=hifiberry-dac8x
- Params: <None>
- 
-@@ -1860,8 +1860,6 @@ Params: 24db_digital_gain       Allow ga
-                                 responsibility of the user to ensure that
-                                 the Digital volume control is set to a value
-                                 that does not result in clipping/distortion!)
--        slave                   Force DAC+ADC into slave mode, using Pi as
--                                master for bit clock and frame clock.
-         leds_off                If set to 'true' the onboard indicator LEDs
-                                 are switched off at all times.
- 
---- a/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts
-@@ -1,4 +1,4 @@
--// Definitions for HiFiBerry DAC+ADC
-+// Definitions for HiFiBerry DAC+ADC, no onboard clocks
- /dts-v1/;
- /plugin/;
- 
-@@ -15,8 +15,8 @@
- 		};
- 	};
- 
--	frag1: fragment@1 {
--		target = <&i2s_clk_consumer>;
-+	fragment@1 {
-+		target = <&i2s_clk_producer>;
- 		__overlay__ {
- 			status = "okay";
- 		};
-@@ -58,7 +58,8 @@
- 		target = <&sound>;
- 		hifiberry_dacplusadc: __overlay__ {
- 			compatible = "hifiberry,hifiberry-dacplusadc";
--			i2s-controller = <&i2s_clk_consumer>;
-+			i2s-controller = <&i2s_clk_producer>;
-+			hifiberry-dacplusadc,slave;
- 			status = "okay";
- 		};
- 	};
-@@ -66,9 +67,6 @@
- 	__overrides__ {
- 		24db_digital_gain =
- 			<&hifiberry_dacplusadc>,"hifiberry,24db_digital_gain?";
--		slave = <&hifiberry_dacplusadc>,"hifiberry-dacplusadc,slave?",
--			<&frag1>,"target:0=",<&i2s_clk_producer>,
--			<&hifiberry_dacplusadc>,"i2s-controller:0=",<&i2s_clk_producer>;
- 		leds_off = <&hifiberry_dacplusadc>,"hifiberry-dacplusadc,leds_off?";
- 	};
- };
diff --git a/target/linux/bcm27xx/patches-6.1/950-1294-imx477-make-trigger-mode-more-configurable.patch b/target/linux/bcm27xx/patches-6.1/950-1294-imx477-make-trigger-mode-more-configurable.patch
deleted file mode 100644
index 584782d25a..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1294-imx477-make-trigger-mode-more-configurable.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From f4102d30e760482e9f2fc94dcf8ce223afef3230 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Erik=20Bot=C3=B6?= <erik.boto@gmail.com>
-Date: Fri, 9 Feb 2024 18:37:46 +0100
-Subject: [PATCH 1294/1295] imx477: make trigger-mode more configurable
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Allow trigger-mode to be overridden using device tree so that it can be
-set per camera. Previously the mode could only be changed using a module
-parameter, which would then affect all cameras.
-
-Signed-off-by: Erik Botö <erik.boto@gmail.com>
----
- drivers/media/i2c/imx477.c | 19 ++++++++++++++-----
- 1 file changed, 14 insertions(+), 5 deletions(-)
-
---- a/drivers/media/i2c/imx477.c
-+++ b/drivers/media/i2c/imx477.c
-@@ -1124,6 +1124,9 @@ struct imx477 {
- 	/* Current mode */
- 	const struct imx477_mode *mode;
- 
-+	/* Trigger mode */
-+	int trigger_mode_of;
-+
- 	/*
- 	 * Mutex for serialized access:
- 	 * Protect sensor module set pad format and start/stop streaming safely.
-@@ -1711,7 +1714,7 @@ static int imx477_start_streaming(struct
- 	struct i2c_client *client = v4l2_get_subdevdata(&imx477->sd);
- 	const struct imx477_reg_list *reg_list;
- 	const struct imx477_reg_list *extra_regs;
--	int ret;
-+	int ret, tm;
- 
- 	if (!imx477->common_regs_written) {
- 		ret = imx477_write_regs(imx477, mode_common_regs,
-@@ -1748,14 +1751,15 @@ static int imx477_start_streaming(struct
- 		return ret;
- 
- 	/* Set vsync trigger mode: 0=standalone, 1=source, 2=sink */
-+	tm = (imx477->trigger_mode_of >= 0) ? imx477->trigger_mode_of : trigger_mode;
- 	imx477_write_reg(imx477, IMX477_REG_MC_MODE,
--			 IMX477_REG_VALUE_08BIT, (trigger_mode > 0) ? 1 : 0);
-+			 IMX477_REG_VALUE_08BIT, (tm > 0) ? 1 : 0);
- 	imx477_write_reg(imx477, IMX477_REG_MS_SEL,
--			 IMX477_REG_VALUE_08BIT, (trigger_mode <= 1) ? 1 : 0);
-+			 IMX477_REG_VALUE_08BIT, (tm <= 1) ? 1 : 0);
- 	imx477_write_reg(imx477, IMX477_REG_XVS_IO_CTRL,
--			 IMX477_REG_VALUE_08BIT, (trigger_mode == 1) ? 1 : 0);
-+			 IMX477_REG_VALUE_08BIT, (tm == 1) ? 1 : 0);
- 	imx477_write_reg(imx477, IMX477_REG_EXTOUT_EN,
--			 IMX477_REG_VALUE_08BIT, (trigger_mode == 1) ? 1 : 0);
-+			 IMX477_REG_VALUE_08BIT, (tm == 1) ? 1 : 0);
- 
- 	/* set stream on register */
- 	return imx477_write_reg(imx477, IMX477_REG_MODE_SELECT,
-@@ -2187,6 +2191,7 @@ static int imx477_probe(struct i2c_clien
- 	struct imx477 *imx477;
- 	const struct of_device_id *match;
- 	int ret;
-+	u32 tm_of;
- 
- 	imx477 = devm_kzalloc(&client->dev, sizeof(*imx477), GFP_KERNEL);
- 	if (!imx477)
-@@ -2204,6 +2209,10 @@ static int imx477_probe(struct i2c_clien
- 	if (imx477_check_hwcfg(dev))
- 		return -EINVAL;
- 
-+	/* Default the trigger mode from OF to -1, which means invalid */
-+	ret = of_property_read_u32(dev->of_node, "trigger-mode", &tm_of);
-+	imx477->trigger_mode_of = (ret == 0) ? tm_of : -1;
-+
- 	/* Get system clock (xclk) */
- 	imx477->xclk = devm_clk_get(dev, NULL);
- 	if (IS_ERR(imx477->xclk)) {
diff --git a/target/linux/bcm27xx/patches-6.1/950-1295-imx477-Update-device-tree-overlays-to-support-trigge.patch b/target/linux/bcm27xx/patches-6.1/950-1295-imx477-Update-device-tree-overlays-to-support-trigge.patch
deleted file mode 100644
index d9df79412b..0000000000
--- a/target/linux/bcm27xx/patches-6.1/950-1295-imx477-Update-device-tree-overlays-to-support-trigge.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From d02bd251d7f85e3aec02e5752df2f44a35961360 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Erik=20Bot=C3=B6?= <erik.boto@gmail.com>
-Date: Fri, 9 Feb 2024 18:41:24 +0100
-Subject: [PATCH 1295/1295] imx477: Update device tree overlays to support
- trigger-mode
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Also create generic overrides in camera-mux-N-port, that can be extended
-to configure vsync modes for cameras supporting this.
-
-Example usages (to be combined with camera_auto_detect=0):
-dtoverlay=imx477,cam0,sync-source
-dtoverlay=imx477,sync-sink
-dtoverlay=camera-mux-2port,cam1-imx477,cam1-sync-sink
-dtoverlay=camera-mux-4port,cam3-imx477,cam3-sync-sink
-
-Signed-off-by: Erik Botö <erik.boto@gmail.com>
----
- arch/arm/boot/dts/overlays/README                | 16 ++++++++++++++++
- .../dts/overlays/camera-mux-2port-overlay.dts    |  5 +++++
- .../dts/overlays/camera-mux-4port-overlay.dts    |  9 +++++++++
- arch/arm/boot/dts/overlays/imx378-overlay.dts    |  7 +++++++
- arch/arm/boot/dts/overlays/imx477-overlay.dts    |  7 +++++++
- 5 files changed, 44 insertions(+)
-
---- a/arch/arm/boot/dts/overlays/README
-+++ b/arch/arm/boot/dts/overlays/README
-@@ -862,6 +862,10 @@ Params: cam0-arducam-64mp       Select A
-         cam1-ov7251             Select OV7251 for camera on port 1
-         cam1-ov9281             Select OV9281 for camera on port 1
-         cam1-imx290-clk-freq    Set clock frequency for an IMX290 on port 1
-+        cam0-sync-source        Set camera on port 0 as vsync source
-+        cam0-sync-sink          Set camera on port 0 as vsync sink
-+        cam1-sync-source        Set camera on port 1 as vsync source
-+        cam1-sync-sink          Set camera on port 1 as vsync sink
- 
-         cam0                    Connect the mux to CAM0 port (default is CAM1)
- 
-@@ -923,6 +927,14 @@ Params: cam0-arducam-64mp       Select A
-         cam3-ov7251             Select OV7251 for camera on port 3
-         cam3-ov9281             Select OV9281 for camera on port 3
-         cam3-imx290-clk-freq    Set clock frequency for an IMX290 on port 3
-+        cam0-sync-source        Set camera on port 0 as vsync source
-+        cam0-sync-sink          Set camera on port 0 as vsync sink
-+        cam1-sync-source        Set camera on port 1 as vsync source
-+        cam1-sync-sink          Set camera on port 1 as vsync sink
-+        cam2-sync-source        Set camera on port 2 as vsync source
-+        cam2-sync-sink          Set camera on port 2 as vsync sink
-+        cam3-sync-source        Set camera on port 3 as vsync source
-+        cam3-sync-sink          Set camera on port 3 as vsync sink
- 
-         cam0                    Connect the mux to CAM0 port (default is CAM1)
- 
-@@ -2676,6 +2688,8 @@ Params: rotation                Mounting
-                                 Compute Module (CSI0, i2c_vc, and cam0_reg).
-         always-on               Leave the regulator powered up, to stop the
-                                 camera clamping I/Os such as XVS to 0V.
-+        sync-source             Configure as vsync source
-+        sync-sink               Configure as vsync sink
- 
- 
- Name:   imx462
-@@ -2716,6 +2730,8 @@ Params: rotation                Mounting
-                                 Compute Module (CSI0, i2c_vc, and cam0_reg).
-         always-on               Leave the regulator powered up, to stop the
-                                 camera clamping I/Os such as XVS to 0V.
-+        sync-source             Configure as vsync source
-+        sync-sink               Configure as vsync sink
- 
- 
- Name:   imx519
---- a/arch/arm/boot/dts/overlays/camera-mux-2port-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/camera-mux-2port-overlay.dts
-@@ -536,5 +536,10 @@
- 
- 		cam0 = <&i2c_frag>, "target:0=",<&i2c_csi_dsi0>,
- 		       <&csi_frag>, "target:0=",<&csi0>;
-+
-+		cam0-sync-source = <&imx477_0>, "trigger-mode:0=1";
-+		cam0-sync-sink = <&imx477_0>, "trigger-mode:0=2";
-+		cam1-sync-source = <&imx477_1>, "trigger-mode:0=1";
-+		cam1-sync-sink = <&imx477_1>, "trigger-mode:0=2";
- 	};
- };
---- a/arch/arm/boot/dts/overlays/camera-mux-4port-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/camera-mux-4port-overlay.dts
-@@ -939,5 +939,14 @@
- 
- 		cam0 = <&i2c_frag>, "target:0=",<&i2c_csi_dsi0>,
- 		       <&csi_frag>, "target:0=",<&csi0>;
-+
-+		cam0-sync-source = <&imx477_0>, "trigger-mode:0=1";
-+		cam0-sync-sink = <&imx477_0>, "trigger-mode:0=2";
-+		cam1-sync-source = <&imx477_1>, "trigger-mode:0=1";
-+		cam1-sync-sink = <&imx477_1>, "trigger-mode:0=2";
-+		cam2-sync-source = <&imx477_2>, "trigger-mode:0=1";
-+		cam2-sync-sink = <&imx477_2>, "trigger-mode:0=2";
-+		cam3-sync-source = <&imx477_3>, "trigger-mode:0=1";
-+		cam3-sync-sink = <&imx477_3>, "trigger-mode:0=2";
- 	};
- };
---- a/arch/arm/boot/dts/overlays/imx378-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/imx378-overlay.dts
-@@ -8,3 +8,10 @@
- &cam_node {
- 	compatible = "sony,imx378";
- };
-+
-+/{
-+	__overrides__ {
-+		sync-sink = <&cam_node>,"trigger-mode:0=2";
-+		sync-source = <&cam_node>,"trigger-mode:0=1";
-+	};
-+};
---- a/arch/arm/boot/dts/overlays/imx477-overlay.dts
-+++ b/arch/arm/boot/dts/overlays/imx477-overlay.dts
-@@ -8,3 +8,10 @@
- &cam_node {
- 	compatible = "sony,imx477";
- };
-+
-+/{
-+	__overrides__ {
-+		sync-sink = <&cam_node>,"trigger-mode:0=2";
-+		sync-source = <&cam_node>,"trigger-mode:0=1";
-+	};
-+};
diff --git a/target/linux/bcm27xx/patches-6.1/960-hwrng-iproc-set-quality-to-1000.patch b/target/linux/bcm27xx/patches-6.1/960-hwrng-iproc-set-quality-to-1000.patch
deleted file mode 100644
index cabe36ba71..0000000000
--- a/target/linux/bcm27xx/patches-6.1/960-hwrng-iproc-set-quality-to-1000.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d3e5e7f3a4e6f61e8c380b9a610212267ee72dbd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
-Date: Sat, 20 Feb 2021 19:24:50 +0100
-Subject: [PATCH] hwrng: iproc: set quality to 1000
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This allows khwrngd to make use of iproc-rng200.
-
-Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
----
- drivers/char/hw_random/iproc-rng200.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/char/hw_random/iproc-rng200.c
-+++ b/drivers/char/hw_random/iproc-rng200.c
-@@ -253,6 +253,7 @@ static int iproc_rng200_probe(struct pla
- 
- 	priv->rng.name = pdev->name;
- 	priv->rng.cleanup = iproc_rng200_cleanup;
-+	priv->rng.quality = 1000;
- 
- 	if (of_device_is_compatible(dev->of_node, "brcm,bcm2711-rng200")) {
- 		priv->rng.init = bcm2711_rng200_init;
diff --git a/target/linux/bcm27xx/patches-6.1/961-1-mfd-rp1-Support-interrupt-CPU-affinity.patch b/target/linux/bcm27xx/patches-6.1/961-1-mfd-rp1-Support-interrupt-CPU-affinity.patch
deleted file mode 100644
index 3d0aa360bf..0000000000
--- a/target/linux/bcm27xx/patches-6.1/961-1-mfd-rp1-Support-interrupt-CPU-affinity.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 877cf6ae71c8eb9315014b3b379d9519ae6401b4 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 3 Apr 2024 23:15:28 +0100
-Subject: [PATCH 1/5] mfd: rp1: Support interrupt CPU affinity
-
-See: https://github.com/raspberrypi/linux/issues/6077
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/mfd/rp1.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
---- a/drivers/mfd/rp1.c
-+++ b/drivers/mfd/rp1.c
-@@ -141,11 +141,20 @@ static int rp1_irq_set_type(struct irq_d
- 	return ret;
- }
- 
-+static int rp1_irq_set_affinity(struct irq_data *irqd, const struct cpumask *dest, bool force)
-+{
-+	struct rp1_dev *rp1 = irqd->domain->host_data;
-+	struct irq_data *pcie_irqd = rp1->pcie_irqds[irqd->hwirq];
-+
-+	return msi_domain_set_affinity(pcie_irqd, dest, force);
-+}
-+
- static struct irq_chip rp1_irq_chip = {
- 	.name            = "rp1_irq_chip",
- 	.irq_mask        = rp1_mask_irq,
- 	.irq_unmask      = rp1_unmask_irq,
- 	.irq_set_type    = rp1_irq_set_type,
-+	.irq_set_affinity = rp1_irq_set_affinity,
- };
- 
- static void rp1_chained_handle_irq(struct irq_desc *desc)
diff --git a/target/linux/bcm27xx/patches-6.1/961-2-pinctrl-rp1-Use-the-correct-per-bank-GPIO-base.patch b/target/linux/bcm27xx/patches-6.1/961-2-pinctrl-rp1-Use-the-correct-per-bank-GPIO-base.patch
deleted file mode 100644
index 213df3f7fb..0000000000
--- a/target/linux/bcm27xx/patches-6.1/961-2-pinctrl-rp1-Use-the-correct-per-bank-GPIO-base.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From d11b1d7f7df4bd1a5ab4df35b2a5c8569f2eacbe Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 4 Apr 2024 10:47:46 +0100
-Subject: [PATCH 2/5] pinctrl: rp1: Use the correct per-bank GPIO base
-
-The GPIO start for each bank - min_gpio - must be used in the IRQ
-handler.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/pinctrl/pinctrl-rp1.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/pinctrl/pinctrl-rp1.c
-+++ b/drivers/pinctrl/pinctrl-rp1.c
-@@ -781,12 +781,12 @@ static void rp1_gpio_irq_handler(struct
- 
- 	ints = readl(pc->gpio_base + bank->ints_offset);
- 	for_each_set_bit(b, &ints, 32) {
--		struct rp1_pin_info *pin = rp1_get_pin(chip, b);
-+		struct rp1_pin_info *pin = rp1_get_pin(chip, bank->min_gpio + b);
- 
- 		writel(RP1_GPIO_CTRL_IRQRESET,
- 		       pin->gpio + RP1_SET_OFFSET + RP1_GPIO_CTRL);
- 		generic_handle_irq(irq_linear_revmap(pc->gpio_chip.irq.domain,
--						     bank->gpio_offset + b));
-+						     bank->min_gpio + b));
- 	}
- 
- 	chained_irq_exit(host_chip, desc);
diff --git a/target/linux/bcm27xx/patches-6.1/961-3-pinctrl-rp1-Allow-legacy-brcm-pins-on-all-banks.patch b/target/linux/bcm27xx/patches-6.1/961-3-pinctrl-rp1-Allow-legacy-brcm-pins-on-all-banks.patch
deleted file mode 100644
index 4550188cb4..0000000000
--- a/target/linux/bcm27xx/patches-6.1/961-3-pinctrl-rp1-Allow-legacy-brcm-pins-on-all-banks.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From d81e2fafab376d3975c46c5f477945384a38524d Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 4 Apr 2024 10:50:32 +0100
-Subject: [PATCH 3/5] pinctrl: rp1: Allow legacy brcm,pins on all banks
-
-Support the use of the brcm,pins property for GPIOs in banks 1 and 2,
-but only for inputs and outputs - no other legacy mapping.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/pinctrl/pinctrl-rp1.c | 18 ++++++++++--------
- 1 file changed, 10 insertions(+), 8 deletions(-)
-
---- a/drivers/pinctrl/pinctrl-rp1.c
-+++ b/drivers/pinctrl/pinctrl-rp1.c
-@@ -981,7 +981,16 @@ static int rp1_pctl_legacy_map_func(stru
- 		return -EINVAL;
- 	}
- 
--	func = legacy_fsel_map[pin][fnum];
-+	if (pin < ARRAY_SIZE(legacy_fsel_map)) {
-+		func = legacy_fsel_map[pin][fnum];
-+	} else if (fnum < 2) {
-+		func = func_gpio;
-+	} else {
-+		dev_err(pc->dev, "%pOF: invalid brcm,pins value %d\n",
-+			np, pin);
-+		return -EINVAL;
-+	}
-+
- 	if (func == func_invalid) {
- 		dev_err(pc->dev, "%pOF: brcm,function %d not supported on pin %d\n",
- 			np, fnum, pin);
-@@ -1104,13 +1113,6 @@ static int rp1_pctl_dt_node_to_map(struc
- 		err = of_property_read_u32_index(np, "brcm,pins", i, &pin);
- 		if (err)
- 			goto out;
--		if (pin >= ARRAY_SIZE(legacy_fsel_map)) {
--			dev_err(pc->dev, "%pOF: invalid brcm,pins value %d\n",
--				np, pin);
--			err = -EINVAL;
--			goto out;
--		}
--
- 		if (num_funcs) {
- 			err = of_property_read_u32_index(np, "brcm,function",
- 							 (num_funcs > 1) ? i : 0,
diff --git a/target/linux/bcm27xx/patches-6.1/961-4-pinctrl-rp1-Support-interrupt-CPU-affinity.patch b/target/linux/bcm27xx/patches-6.1/961-4-pinctrl-rp1-Support-interrupt-CPU-affinity.patch
deleted file mode 100644
index 6d418626dc..0000000000
--- a/target/linux/bcm27xx/patches-6.1/961-4-pinctrl-rp1-Support-interrupt-CPU-affinity.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 086480cc43b9d967647b237a84623b27b8850a64 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Wed, 3 Apr 2024 23:16:47 +0100
-Subject: [PATCH 4/5] pinctrl: rp1: Support interrupt CPU affinity
-
-See: https://github.com/raspberrypi/linux/issues/6077
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/pinctrl/pinctrl-rp1.c | 24 ++++++++++++++++++++++++
- 1 file changed, 24 insertions(+)
-
---- a/drivers/pinctrl/pinctrl-rp1.c
-+++ b/drivers/pinctrl/pinctrl-rp1.c
-@@ -894,6 +894,29 @@ static void rp1_gpio_irq_ack(struct irq_
- 	writel(RP1_GPIO_CTRL_IRQRESET, pin->gpio + RP1_SET_OFFSET + RP1_GPIO_CTRL);
- }
- 
-+static int rp1_gpio_irq_set_affinity(struct irq_data *data, const struct cpumask *dest, bool force)
-+{
-+	struct gpio_chip *chip = irq_data_get_irq_chip_data(data);
-+	struct rp1_pinctrl *pc = gpiochip_get_data(chip);
-+	const struct rp1_iobank_desc *bank;
-+	struct irq_data *parent_data = NULL;
-+	int i;
-+
-+	for (i = 0; i < 3; i++) {
-+		bank = &rp1_iobanks[i];
-+		if (data->hwirq >= bank->min_gpio &&
-+		    data->hwirq < bank->min_gpio + bank->num_gpios) {
-+			parent_data = irq_get_irq_data(pc->irq[i]);
-+			break;
-+		}
-+	}
-+
-+	if (parent_data && parent_data->chip->irq_set_affinity)
-+		return parent_data->chip->irq_set_affinity(parent_data, dest, force);
-+
-+	return -EINVAL;
-+}
-+
- static struct irq_chip rp1_gpio_irq_chip = {
- 	.name = MODULE_NAME,
- 	.irq_enable = rp1_gpio_irq_enable,
-@@ -902,6 +925,7 @@ static struct irq_chip rp1_gpio_irq_chip
- 	.irq_ack = rp1_gpio_irq_ack,
- 	.irq_mask = rp1_gpio_irq_disable,
- 	.irq_unmask = rp1_gpio_irq_enable,
-+	.irq_set_affinity = rp1_gpio_irq_set_affinity,
- 	.flags = IRQCHIP_IMMUTABLE,
- };
- 
diff --git a/target/linux/bcm27xx/patches-6.1/961-5-pinctrl-rp1-Clear-events-when-setting-IRQ-type.patch b/target/linux/bcm27xx/patches-6.1/961-5-pinctrl-rp1-Clear-events-when-setting-IRQ-type.patch
deleted file mode 100644
index afb3d965bd..0000000000
--- a/target/linux/bcm27xx/patches-6.1/961-5-pinctrl-rp1-Clear-events-when-setting-IRQ-type.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ba9f37cecf19e4d2b5cc7186d054735e3cc7a4a2 Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.com>
-Date: Thu, 4 Apr 2024 11:52:33 +0100
-Subject: [PATCH 5/5] pinctrl: rp1: Clear events when setting IRQ type
-
-When setting the interrupt type, it is unlikely that any latched events
-are of interest, so clear them.
-
-Signed-off-by: Phil Elwell <phil@raspberrypi.com>
----
- drivers/pinctrl/pinctrl-rp1.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
---- a/drivers/pinctrl/pinctrl-rp1.c
-+++ b/drivers/pinctrl/pinctrl-rp1.c
-@@ -848,10 +848,13 @@ static int rp1_irq_set_type(struct rp1_p
- 		return -EINVAL;
- 	}
- 
--	/* Clear them all */
-+	/* Clear the event enables */
- 	writel(RP1_INT_MASK << RP1_GPIO_EVENTS_SHIFT_RAW,
- 	       pin->gpio + RP1_CLR_OFFSET + RP1_GPIO_CTRL);
--	/* Set those that are needed */
-+	/* Clear any latched events */
-+	writel(RP1_GPIO_CTRL_IRQRESET,
-+		pin->gpio + RP1_SET_OFFSET + RP1_GPIO_CTRL);
-+	/* Enable the events that are needed */
- 	writel(irq_flags << RP1_GPIO_EVENTS_SHIFT_RAW,
- 	       pin->gpio + RP1_SET_OFFSET + RP1_GPIO_CTRL);
- 	pin->irq_type = type;
-- 
2.30.2